projects
/
rocksndiamonds.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
added generic solution for naming conventions of extra graphic definitions
[rocksndiamonds.git]
/
src
/
game.c
diff --git
a/src/game.c
b/src/game.c
index cc6bcdfc33e33cedb876ec0bd0cb63d3f821c5b1..fb6691a72849769c94eacd0015a628acb54ca1af 100644
(file)
--- a/
src/game.c
+++ b/
src/game.c
@@
-2446,7
+2446,7
@@
void DisplayGameControlValues()
/* redraw game control buttons */
RedrawGameButtons();
/* redraw game control buttons */
RedrawGameButtons();
-
game_status = GAME_MODE_PSEUDO_PANEL
;
+
SetGameStatus(GAME_MODE_PSEUDO_PANEL)
;
for (i = 0; i < NUM_GAME_PANEL_CONTROLS; i++)
{
for (i = 0; i < NUM_GAME_PANEL_CONTROLS; i++)
{
@@
-2574,7
+2574,7
@@
void DisplayGameControlValues()
redraw_mask |= REDRAW_DOOR_1;
}
redraw_mask |= REDRAW_DOOR_1;
}
-
game_status = GAME_MODE_PLAYING
;
+
SetGameStatus(GAME_MODE_PLAYING)
;
}
void UpdateAndDisplayGameControlValues()
}
void UpdateAndDisplayGameControlValues()
@@
-3097,11
+3097,11
@@
void InitGame()
// required here to update video display before fading (FIX THIS)
DrawMaskedBorder(REDRAW_DOOR_2);
// required here to update video display before fading (FIX THIS)
DrawMaskedBorder(REDRAW_DOOR_2);
- game_status = GAME_MODE_PLAYING;
-
if (!game.restart_level)
CloseDoor(DOOR_CLOSE_1);
if (!game.restart_level)
CloseDoor(DOOR_CLOSE_1);
+ SetGameStatus(GAME_MODE_PLAYING);
+
/* needed if different viewport properties defined for playing */
ChangeViewportPropertiesIfNeeded();
/* needed if different viewport properties defined for playing */
ChangeViewportPropertiesIfNeeded();
@@
-3113,12
+3113,16
@@
void InitGame()
if (CheckIfGlobalBorderHasChanged())
fade_mask = REDRAW_ALL;
if (CheckIfGlobalBorderHasChanged())
fade_mask = REDRAW_ALL;
- Fade
Out(fade_mask
);
+ Fade
SoundsAndMusic(
);
- OpenDoor(GetDoorState() | DOOR_NO_DELAY | DOOR_FORCE_REDRAW);
+ ExpireSoundLoops(TRUE);
+
+ FadeOut(fade_mask);
ClearField();
ClearField();
+ OpenDoor(GetDoorState() | DOOR_NO_DELAY | DOOR_FORCE_REDRAW);
+
DrawCompleteVideoDisplay();
InitGameEngine();
DrawCompleteVideoDisplay();
InitGameEngine();
@@
-4422,7
+4426,7
@@
void GameEnd()
if (level_editor_test_game)
{
if (level_editor_test_game)
{
-
game_status = GAME_MODE_MAIN
;
+
SetGameStatus(GAME_MODE_MAIN)
;
DrawMainMenu();
DrawMainMenu();
@@
-4431,7
+4435,7
@@
void GameEnd()
if (!local_player->LevelSolved_SaveScore)
{
if (!local_player->LevelSolved_SaveScore)
{
-
game_status = GAME_MODE_MAIN
;
+
SetGameStatus(GAME_MODE_MAIN)
;
DrawMainMenu();
DrawMainMenu();
@@
-4450,7
+4454,7
@@
void GameEnd()
if ((hi_pos = NewHiScore()) >= 0)
{
if ((hi_pos = NewHiScore()) >= 0)
{
-
game_status = GAME_MODE_SCORES
;
+
SetGameStatus(GAME_MODE_SCORES)
;
DrawHallOfFame(hi_pos);
DrawHallOfFame(hi_pos);
@@
-4462,7
+4466,7
@@
void GameEnd()
}
else
{
}
else
{
-
game_status = GAME_MODE_MAIN
;
+
SetGameStatus(GAME_MODE_MAIN)
;
if (raise_level)
{
if (raise_level)
{
@@
-14470,7
+14474,7
@@
void RequestQuitGameExt(boolean skip_request, boolean quick_quit, char *message)
if (quick_quit)
FadeSkipNextFadeIn();
if (quick_quit)
FadeSkipNextFadeIn();
-
game_status = GAME_MODE_MAIN
;
+
SetGameStatus(GAME_MODE_MAIN)
;
DrawMainMenu();
}
DrawMainMenu();
}
@@
-14851,47
+14855,47
@@
static struct
} gamebutton_info[NUM_GAME_BUTTONS] =
{
{
} gamebutton_info[NUM_GAME_BUTTONS] =
{
{
- IMG_G
AME_BUTTON_GFX
_STOP, &game.button.stop,
+ IMG_G
FX_GAME_BUTTON
_STOP, &game.button.stop,
GAME_CTRL_ID_STOP, "stop game"
},
{
GAME_CTRL_ID_STOP, "stop game"
},
{
- IMG_G
AME_BUTTON_GFX
_PAUSE, &game.button.pause,
+ IMG_G
FX_GAME_BUTTON
_PAUSE, &game.button.pause,
GAME_CTRL_ID_PAUSE, "pause game"
},
{
GAME_CTRL_ID_PAUSE, "pause game"
},
{
- IMG_G
AME_BUTTON_GFX
_PLAY, &game.button.play,
+ IMG_G
FX_GAME_BUTTON
_PLAY, &game.button.play,
GAME_CTRL_ID_PLAY, "play game"
},
{
GAME_CTRL_ID_PLAY, "play game"
},
{
- IMG_G
AME_BUTTON_GFX
_UNDO, &game.button.undo,
+ IMG_G
FX_GAME_BUTTON
_UNDO, &game.button.undo,
GAME_CTRL_ID_UNDO, "undo step"
},
{
GAME_CTRL_ID_UNDO, "undo step"
},
{
- IMG_G
AME_BUTTON_GFX
_REDO, &game.button.redo,
+ IMG_G
FX_GAME_BUTTON
_REDO, &game.button.redo,
GAME_CTRL_ID_REDO, "redo step"
},
{
GAME_CTRL_ID_REDO, "redo step"
},
{
- IMG_G
AME_BUTTON_GFX
_SAVE, &game.button.save,
+ IMG_G
FX_GAME_BUTTON
_SAVE, &game.button.save,
GAME_CTRL_ID_SAVE, "save game"
},
{
GAME_CTRL_ID_SAVE, "save game"
},
{
- IMG_G
AME_BUTTON_GFX
_PAUSE2, &game.button.pause2,
+ IMG_G
FX_GAME_BUTTON
_PAUSE2, &game.button.pause2,
GAME_CTRL_ID_PAUSE2, "pause game"
},
{
GAME_CTRL_ID_PAUSE2, "pause game"
},
{
- IMG_G
AME_BUTTON_GFX
_LOAD, &game.button.load,
+ IMG_G
FX_GAME_BUTTON
_LOAD, &game.button.load,
GAME_CTRL_ID_LOAD, "load game"
},
{
GAME_CTRL_ID_LOAD, "load game"
},
{
- IMG_G
AME_BUTTON_GFX
_SOUND_MUSIC, &game.button.sound_music,
+ IMG_G
FX_GAME_BUTTON
_SOUND_MUSIC, &game.button.sound_music,
SOUND_CTRL_ID_MUSIC, "background music on/off"
},
{
SOUND_CTRL_ID_MUSIC, "background music on/off"
},
{
- IMG_G
AME_BUTTON_GFX
_SOUND_LOOPS, &game.button.sound_loops,
+ IMG_G
FX_GAME_BUTTON
_SOUND_LOOPS, &game.button.sound_loops,
SOUND_CTRL_ID_LOOPS, "sound loops on/off"
},
{
SOUND_CTRL_ID_LOOPS, "sound loops on/off"
},
{
- IMG_G
AME_BUTTON_GFX
_SOUND_SIMPLE, &game.button.sound_simple,
+ IMG_G
FX_GAME_BUTTON
_SOUND_SIMPLE, &game.button.sound_simple,
SOUND_CTRL_ID_SIMPLE, "normal sounds on/off"
}
};
SOUND_CTRL_ID_SIMPLE, "normal sounds on/off"
}
};