projects
/
rocksndiamonds.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
rnd-20100315-2-src
[rocksndiamonds.git]
/
src
/
game_sp
/
main.c
diff --git
a/src/game_sp/main.c
b/src/game_sp/main.c
index f30aa0dbbb5e8cd8f4c743f7c58064a6e62720ce..a5ca525e4dd8a79ff062fcbfe4ccf287dadd0330 100644
(file)
--- a/
src/game_sp/main.c
+++ b/
src/game_sp/main.c
@@
-6,7
+6,6
@@
struct GameInfo_SP game_sp;
struct LevelInfo_SP native_sp_level;
struct GameInfo_SP game_sp;
struct LevelInfo_SP native_sp_level;
-
int GfxElementLast[SP_MAX_PLAYFIELD_WIDTH][SP_MAX_PLAYFIELD_HEIGHT];
int GfxGraphicLast[SP_MAX_PLAYFIELD_WIDTH][SP_MAX_PLAYFIELD_HEIGHT];
int GfxGraphic[SP_MAX_PLAYFIELD_WIDTH][SP_MAX_PLAYFIELD_HEIGHT];
int GfxElementLast[SP_MAX_PLAYFIELD_WIDTH][SP_MAX_PLAYFIELD_HEIGHT];
int GfxGraphicLast[SP_MAX_PLAYFIELD_WIDTH][SP_MAX_PLAYFIELD_HEIGHT];
int GfxGraphic[SP_MAX_PLAYFIELD_WIDTH][SP_MAX_PLAYFIELD_HEIGHT];
@@
-22,6
+21,11
@@
void InitGameEngine_SP()
game_sp.LevelSolved = FALSE;
game_sp.GameOver = FALSE;
game_sp.LevelSolved = FALSE;
game_sp.GameOver = FALSE;
+ game_sp.time_played = 0;
+ game_sp.infotrons_still_needed = native_sp_level.header.InfotronsNeeded;
+ game_sp.red_disk_count = 0;
+ game_sp.score = 0;
+
menBorder.Checked = setup.sp_show_border_elements;
for (x = 0; x < SP_MAX_PLAYFIELD_WIDTH; x++)
menBorder.Checked = setup.sp_show_border_elements;
for (x = 0; x < SP_MAX_PLAYFIELD_WIDTH; x++)
@@
-37,34
+41,11
@@
void InitGameEngine_SP()
InitScrollPlayfield();
InitScrollPlayfield();
-#if 0
- printf(":A: %d, %d [%d, %d]\n",
- mScrollX, mScrollY, mScrollX_last, mScrollY_last);
-#endif
-
-#if 1
menPlay_Click();
menPlay_Click();
-#else
- menPlayDemo_Click();
-#endif
-
-#if 0
- printf(":B: %d, %d [%d, %d]\n",
- mScrollX, mScrollY, mScrollX_last, mScrollY_last);
-#endif
-}
-
-#if 0
-void BlitScreenToBitmap_SP(Bitmap *target_bitmap)
-{
- DDScrollBuffer_Blt_Ext(target_bitmap);
}
}
-#endif
void RedrawPlayfield_SP(boolean force_redraw)
{
void RedrawPlayfield_SP(boolean force_redraw)
{
- // subDisplayLevel();
-
if (force_redraw)
RestorePlayfield();
if (force_redraw)
RestorePlayfield();
@@
-73,15
+54,28
@@
void RedrawPlayfield_SP(boolean force_redraw)
BackToFront_SP();
}
BackToFront_SP();
}
+void DrawGameDoorValues_SP()
+{
+ game_sp.time_played = TimerVar / setup.game_frame_delay;
+ game_sp.infotrons_still_needed = InfotronsNeeded;
+ game_sp.red_disk_count = RedDiskCount;
+ game_sp.score = 0; // (currently no score in Supaplex engine)
+}
+
void GameActions_SP(byte action[MAX_PLAYERS], boolean warp_mode)
{
byte single_player_action = action[0];
int x, y;
void GameActions_SP(byte action[MAX_PLAYERS], boolean warp_mode)
{
byte single_player_action = action[0];
int x, y;
+ UpdateEngineValues(mScrollX / TILEX, mScrollY / TILEY);
+
subMainGameLoop_Main(single_player_action, warp_mode);
RedrawPlayfield_SP(FALSE);
subMainGameLoop_Main(single_player_action, warp_mode);
RedrawPlayfield_SP(FALSE);
+ if (!warp_mode) /* do not redraw values in warp mode */
+ DrawGameDoorValues_SP();
+
for (x = DisplayMinX; x <= DisplayMaxX; x++)
for (y = DisplayMinY; y <= DisplayMaxY; y++)
GfxFrame[x][y]++;
for (x = DisplayMinX; x <= DisplayMaxX; x++)
for (y = DisplayMinY; y <= DisplayMaxY; y++)
GfxFrame[x][y]++;