projects
/
rocksndiamonds.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
added setup option to always play native BD caves with random colors
[rocksndiamonds.git]
/
src
/
game_sp
/
MainGameLoop.c
diff --git
a/src/game_sp/MainGameLoop.c
b/src/game_sp/MainGameLoop.c
index 72d0e283a79f234860d7532ad584cf68b86cac48..39580a30f6ea5f81dbf22eccef16657f2850ca4c 100644
(file)
--- a/
src/game_sp/MainGameLoop.c
+++ b/
src/game_sp/MainGameLoop.c
@@
-25,7
+25,7
@@
void subMainGameLoop_Init(void)
RedDiskReleasePhase = 0; // (re-)enable red disk release
}
RedDiskReleasePhase = 0; // (re-)enable red disk release
}
-void subMainGameLoop_Main(byte action
, boolean warp_mode
)
+void subMainGameLoop_Main(byte action)
{
// ---------------------------------------------------------------------------
// --------------------- START OF GAME-BUSY LOOP -----------------------------
{
// ---------------------------------------------------------------------------
// --------------------- START OF GAME-BUSY LOOP -----------------------------
@@
-66,6
+66,10
@@
void subMainGameLoop_Main(byte action, boolean warp_mode)
// ---------------------- END OF GAME-BUSY LOOP ------------------------------
// ---------------------------------------------------------------------------
// ---------------------- END OF GAME-BUSY LOOP ------------------------------
// ---------------------------------------------------------------------------
+ // if the game is not won when reaching this point, then it is lost
+ if (!game_sp.level_solved)
+ game_sp.game_over = TRUE;
+
LeadOutCounter = LeadOutCounter - 1; // do more lead-out after quit
if (LeadOutCounter != 0) // lead-out not ready: more
LeadOutCounter = LeadOutCounter - 1; // do more lead-out after quit
if (LeadOutCounter != 0) // lead-out not ready: more
@@
-73,10
+77,6
@@
void subMainGameLoop_Main(byte action, boolean warp_mode)
// lead-out done: exit now
// ---------------------- END OF GAME-BUSY LOOP (including lead-out) ---------
// lead-out done: exit now
// ---------------------- END OF GAME-BUSY LOOP (including lead-out) ---------
-
- // if the game is not won when reaching this point, then it is lost
- if (!game_sp.LevelSolved)
- game_sp.GameOver = TRUE;
}
void subCalculateScreenScrollPos(void)
}
void subCalculateScreenScrollPos(void)
@@
-99,7
+99,7
@@
void subCalculateScreenScrollPos(void)
{
subGetRandomNumber();
{
subGetRandomNumber();
- //
printf("::: ExplosionShake [%d]\n
", FrameCounter);
+ //
Debug("game:playing:SP", "ExplosionShake [%d]
", FrameCounter);
}
ScreenScrollXPos = MurphyScreenXPos - (SCR_FIELDX / 2) * TILESIZE;
}
ScreenScrollXPos = MurphyScreenXPos - (SCR_FIELDX / 2) * TILESIZE;