projects
/
rocksndiamonds.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
rnd-20060816-2-src
[rocksndiamonds.git]
/
src
/
game.c
diff --git
a/src/game.c
b/src/game.c
index aa9fa6f4d27b3e07483d5a6cc55c414ecbe872d3..4e4c901c990286248b043614b2716d243a3d822e 100644
(file)
--- a/
src/game.c
+++ b/
src/game.c
@@
-2634,12
+2634,12
@@
void InitGame()
StopAnimation();
StopAnimation();
- if (do_fading)
- FadeOutField(TITLE_SCREEN_FADE_DELAY, TITLE_SCREEN_POST_DELAY);
-
if (!game.restart_level)
CloseDoor(DOOR_CLOSE_1);
if (!game.restart_level)
CloseDoor(DOOR_CLOSE_1);
+ if (do_fading)
+ FadeOut(REDRAW_FIELD);
+
/* !!! FIX THIS (START) !!! */
if (level.game_engine_type == GAME_ENGINE_TYPE_EM)
{
/* !!! FIX THIS (START) !!! */
if (level.game_engine_type == GAME_ENGINE_TYPE_EM)
{
@@
-2666,7
+2666,7
@@
void InitGame()
/* !!! FIX THIS (END) !!! */
if (do_fading)
/* !!! FIX THIS (END) !!! */
if (do_fading)
- FadeIn
Field(TITLE_SCREEN_FADE_DELAY
);
+ FadeIn
(REDRAW_FIELD
);
if (!game.restart_level)
{
if (!game.restart_level)
{
@@
-3059,11
+3059,11
@@
void GameEnd()
if (!local_player->LevelSolved_SaveScore)
{
if (!local_player->LevelSolved_SaveScore)
{
- FadeOut
Field(TITLE_SCREEN_FADE_DELAY, TITLE_SCREEN_POST_DELAY
);
+ FadeOut
(REDRAW_FIELD
);
game_status = GAME_MODE_MAIN;
game_status = GAME_MODE_MAIN;
- Draw
MainMenuExt(TITLE_SCREEN_FADE_DELAY,
REDRAW_FIELD);
+ Draw
AndFadeInMainMenu(
REDRAW_FIELD);
return;
}
return;
}
@@
-3093,7
+3093,7
@@
void GameEnd()
}
else
{
}
else
{
- FadeOut
Field(TITLE_SCREEN_FADE_DELAY, TITLE_SCREEN_POST_DELAY
);
+ FadeOut
(REDRAW_FIELD
);
game_status = GAME_MODE_MAIN;
game_status = GAME_MODE_MAIN;
@@
-3103,7
+3103,7
@@
void GameEnd()
TapeErase();
}
TapeErase();
}
- Draw
MainMenuExt(TITLE_SCREEN_FADE_DELAY,
REDRAW_FIELD);
+ Draw
AndFadeInMainMenu(
REDRAW_FIELD);
}
local_player->LevelSolved_SaveScore = FALSE;
}
local_player->LevelSolved_SaveScore = FALSE;
@@
-13434,11
+13434,11
@@
void RequestQuitGame(boolean ask_if_really_quit)
}
else
{
}
else
{
- FadeOut
Field(TITLE_SCREEN_FADE_DELAY, TITLE_SCREEN_POST_DELAY
);
+ FadeOut
(REDRAW_FIELD
);
game_status = GAME_MODE_MAIN;
game_status = GAME_MODE_MAIN;
- Draw
MainMenuExt(TITLE_SCREEN_FADE_DELAY,
REDRAW_FIELD);
+ Draw
AndFadeInMainMenu(
REDRAW_FIELD);
}
}
}
}
}
}