projects
/
rocksndiamonds.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
cd6f67f
)
cleanup of state changes before/after fading in/out (more generic approach)
author
Holger Schemel
<info@artsoft.org>
Tue, 22 Mar 2016 09:01:51 +0000
(10:01 +0100)
committer
Holger Schemel
<info@artsoft.org>
Tue, 22 Mar 2016 09:01:51 +0000
(10:01 +0100)
src/tools.c
patch
|
blob
|
history
diff --git
a/src/tools.c
b/src/tools.c
index b3938f5bde87ec6bdfb8ea2243d6ceb0dde3189d..cff76238c3b2f2c6db6fd6e6460aa885010e6951 100644
(file)
--- a/
src/tools.c
+++ b/
src/tools.c
@@
-682,12
+682,11
@@
static void FadeExt(int fade_mask, int fade_mode, int fade_type)
redraw_mask &= ~fade_mask;
}
redraw_mask &= ~fade_mask;
}
-static void Set
AnimStatus_BeforeFadingOut
()
+static void Set
ScreenStates_BeforeFadingIn
()
{
{
- global.anim_status = GAME_MODE_PSEUDO_FADING;
}
}
-static void Set
AnimStatu
s_AfterFadingIn()
+static void Set
ScreenState
s_AfterFadingIn()
{
global.anim_status = global.anim_status_next;
{
global.anim_status = global.anim_status_next;
@@
-696,8
+695,20
@@
static void SetAnimStatus_AfterFadingIn()
BackToFront();
}
BackToFront();
}
+static void SetScreenStates_BeforeFadingOut()
+{
+ global.anim_status = GAME_MODE_PSEUDO_FADING;
+}
+
+static void SetScreenStates_AfterFadingOut()
+{
+ global.border_status = game_status;
+}
+
void FadeIn(int fade_mask)
{
void FadeIn(int fade_mask)
{
+ SetScreenStates_BeforeFadingIn();
+
#if 1
DrawMaskedBorder(REDRAW_ALL);
#endif
#if 1
DrawMaskedBorder(REDRAW_ALL);
#endif
@@
-712,12
+723,12
@@
void FadeIn(int fade_mask)
FADE_SXSIZE = FULL_SXSIZE;
FADE_SYSIZE = FULL_SYSIZE;
FADE_SXSIZE = FULL_SXSIZE;
FADE_SYSIZE = FULL_SYSIZE;
- Set
AnimStatu
s_AfterFadingIn();
+ Set
ScreenState
s_AfterFadingIn();
}
void FadeOut(int fade_mask)
{
}
void FadeOut(int fade_mask)
{
- Set
AnimStatu
s_BeforeFadingOut();
+ Set
ScreenState
s_BeforeFadingOut();
#if 0
DrawMaskedBorder(REDRAW_ALL);
#if 0
DrawMaskedBorder(REDRAW_ALL);
@@
-728,7
+739,7
@@
void FadeOut(int fade_mask)
else
FadeExt(fade_mask, FADE_MODE_FADE_OUT, FADE_TYPE_FADE_OUT);
else
FadeExt(fade_mask, FADE_MODE_FADE_OUT, FADE_TYPE_FADE_OUT);
-
global.border_status = game_status
;
+
SetScreenStates_AfterFadingOut()
;
}
static void FadeSetLeaveNext(struct TitleFadingInfo fading_leave, boolean set)
}
static void FadeSetLeaveNext(struct TitleFadingInfo fading_leave, boolean set)