projects
/
rocksndiamonds.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
1adcaa7
)
changed variable name
author
Holger Schemel
<info@artsoft.org>
Tue, 30 Oct 2018 19:15:42 +0000
(20:15 +0100)
committer
Holger Schemel
<info@artsoft.org>
Tue, 30 Oct 2018 19:15:42 +0000
(20:15 +0100)
src/game.c
patch
|
blob
|
history
src/game_sp/DoGameStuff.c
patch
|
blob
|
history
src/game_sp/MainGameLoop.c
patch
|
blob
|
history
src/game_sp/Murphy.c
patch
|
blob
|
history
src/game_sp/export.h
patch
|
blob
|
history
src/game_sp/main.c
patch
|
blob
|
history
diff --git
a/src/game.c
b/src/game.c
index 2fb1b686c7ae07a5482a68cc21e459993164d4b1..a780952b9749960b09146a81745a8dbf496be539 100644
(file)
--- a/
src/game.c
+++ b/
src/game.c
@@
-11134,17
+11134,17
@@
static void CheckLevelSolved(void)
}
else if (level.game_engine_type == GAME_ENGINE_TYPE_SP)
{
}
else if (level.game_engine_type == GAME_ENGINE_TYPE_SP)
{
- if (game_sp.
LevelS
olved &&
- !game_sp.
GameOver)
// game won
+ if (game_sp.
level_s
olved &&
+ !game_sp.
game_over)
// game won
{
PlayerWins(local_player);
{
PlayerWins(local_player);
- game_sp.
GameO
ver = TRUE;
+ game_sp.
game_o
ver = TRUE;
AllPlayersGone = TRUE;
}
AllPlayersGone = TRUE;
}
- if (game_sp.
GameOver)
// game lost
+ if (game_sp.
game_over)
// game lost
AllPlayersGone = TRUE;
}
else if (level.game_engine_type == GAME_ENGINE_TYPE_MM)
AllPlayersGone = TRUE;
}
else if (level.game_engine_type == GAME_ENGINE_TYPE_MM)
@@
-15043,7
+15043,7
@@
boolean checkGameFailed(void)
if (level.game_engine_type == GAME_ENGINE_TYPE_EM)
return (level.native_em_level->lev->home > 0);
else if (level.game_engine_type == GAME_ENGINE_TYPE_SP)
if (level.game_engine_type == GAME_ENGINE_TYPE_EM)
return (level.native_em_level->lev->home > 0);
else if (level.game_engine_type == GAME_ENGINE_TYPE_SP)
- return (game_sp.
GameOver && !game_sp.LevelS
olved);
+ return (game_sp.
game_over && !game_sp.level_s
olved);
else if (level.game_engine_type == GAME_ENGINE_TYPE_MM)
return (game_mm.game_over && !game_mm.level_solved);
else // GAME_ENGINE_TYPE_RND
else if (level.game_engine_type == GAME_ENGINE_TYPE_MM)
return (game_mm.game_over && !game_mm.level_solved);
else // GAME_ENGINE_TYPE_RND
diff --git
a/src/game_sp/DoGameStuff.c
b/src/game_sp/DoGameStuff.c
index fbea5551834612c87b0b0da70146a652ba7987c8..79b102d6dbfd8307df3e0f283b463cf116d929cd 100644
(file)
--- a/
src/game_sp/DoGameStuff.c
+++ b/
src/game_sp/DoGameStuff.c
@@
-71,8
+71,8
@@
void subDoGameStuff(void)
if (KillMurphyFlag == 1 || MurphyMoveCounter == 0)
{
if (LeadOutCounter == 0 &&
if (KillMurphyFlag == 1 || MurphyMoveCounter == 0)
{
if (LeadOutCounter == 0 &&
- !game_sp.
LevelS
olved &&
- !game_sp.
GameO
ver)
+ !game_sp.
level_s
olved &&
+ !game_sp.
game_o
ver)
{
KillMurphyFlag = 0; // no more "kill Murphy"
ExplodeFieldSP(MurphyExplodePos); // Explode
{
KillMurphyFlag = 0; // no more "kill Murphy"
ExplodeFieldSP(MurphyExplodePos); // Explode
diff --git
a/src/game_sp/MainGameLoop.c
b/src/game_sp/MainGameLoop.c
index 72d0e283a79f234860d7532ad584cf68b86cac48..e1a20b102466cfcf641c694ffa8bfc9b5125b15a 100644
(file)
--- a/
src/game_sp/MainGameLoop.c
+++ b/
src/game_sp/MainGameLoop.c
@@
-75,8
+75,8
@@
void subMainGameLoop_Main(byte action, boolean warp_mode)
// ---------------------- END OF GAME-BUSY LOOP (including lead-out) ---------
// if the game is not won when reaching this point, then it is lost
// ---------------------- 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.
LevelS
olved)
- game_sp.
GameO
ver = TRUE;
+ if (!game_sp.
level_s
olved)
+ game_sp.
game_o
ver = TRUE;
}
void subCalculateScreenScrollPos(void)
}
void subCalculateScreenScrollPos(void)
diff --git
a/src/game_sp/Murphy.c
b/src/game_sp/Murphy.c
index c0a148fd909df8866a04ef7e3a03f220f6318d8e..39826cbc83c81dda90b87693570fca5b4923b1b4 100644
(file)
--- a/
src/game_sp/Murphy.c
+++ b/
src/game_sp/Murphy.c
@@
-962,7
+962,7
@@
loc_g_6756:
if (LowByte(InfotronsNeeded) != 0)
return;
if (LowByte(InfotronsNeeded) != 0)
return;
- game_sp.
LevelS
olved = TRUE;
+ game_sp.
level_s
olved = TRUE;
subSoundFX(*si, fiExit, actPassing);
subSoundFX(*si, fiExit, actPassing);
diff --git
a/src/game_sp/export.h
b/src/game_sp/export.h
index 1ac2d311d4b40cbd6ab90ea0b4b4d47e3f00ba61..787bb45b9d7a1bfda4e2b07b505812c257675ae7 100644
(file)
--- a/
src/game_sp/export.h
+++ b/
src/game_sp/export.h
@@
-91,8
+91,8
@@
struct GlobalInfo_SP
struct GameInfo_SP
{
struct GameInfo_SP
{
- boolean
LevelS
olved;
- boolean
GameO
ver;
+ boolean
level_s
olved;
+ boolean
game_o
ver;
// needed for updating panel
int time_played;
// needed for updating panel
int time_played;
diff --git
a/src/game_sp/main.c
b/src/game_sp/main.c
index 02eeea93507dcec10d11302a2b938890af7e1d79..2a79f6da6ae1566f9736d1c738948abc682c7c06 100644
(file)
--- a/
src/game_sp/main.c
+++ b/
src/game_sp/main.c
@@
-18,8
+18,8
@@
void InitGameEngine_SP(void)
gfx.anim_random_frame = -1; // (use simple, ad-hoc random numbers)
gfx.anim_random_frame = -1; // (use simple, ad-hoc random numbers)
- game_sp.
LevelS
olved = FALSE;
- game_sp.
GameO
ver = FALSE;
+ game_sp.
level_s
olved = FALSE;
+ game_sp.
game_o
ver = FALSE;
game_sp.time_played = 0;
game_sp.infotrons_still_needed = native_sp_level.header.InfotronsNeeded;
game_sp.time_played = 0;
game_sp.infotrons_still_needed = native_sp_level.header.InfotronsNeeded;