[Scummvm-cvs-logs] CVS: scummvm/bs2/driver driver96.h,1.30,1.31 palette.cpp,1.13,1.14
Torbj?rn Andersson
eriktorbjorn at users.sourceforge.net
Tue Sep 9 05:15:06 CEST 2003
- Previous message: [Scummvm-cvs-logs] CVS: scummvm/bs2 controls.cpp,1.12,1.13
- Next message: [Scummvm-cvs-logs] CVS: scummvm/bs2 build_display.cpp,1.17,1.18 debug.cpp,1.7,1.8 layers.cpp,1.4,1.5 resman.cpp,1.18,1.19
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Update of /cvsroot/scummvm/scummvm/bs2/driver
In directory sc8-pr-cvs1:/tmp/cvs-serv26984/driver
Modified Files:
driver96.h palette.cpp
Log Message:
Added a WaitForFade() function, to replace numerous while-loops scattered
througout the code.
Index: driver96.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/bs2/driver/driver96.h,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -d -r1.30 -r1.31
--- driver96.h 8 Sep 2003 06:38:16 -0000 1.30
+++ driver96.h 9 Sep 2003 12:14:08 -0000 1.31
@@ -1421,6 +1421,7 @@
extern int32 FadeDown(float time);
extern uint8 GetFadeStatus(void);
extern int32 DimPalette(void);
+extern void WaitForFade(void);
//-----------------------------------------------------------------------------
//-----------------------------------------------------------------------------
Index: palette.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/bs2/driver/palette.cpp,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -d -r1.13 -r1.14
--- palette.cpp 27 Aug 2003 07:01:05 -0000 1.13
+++ palette.cpp 9 Sep 2003 12:14:08 -0000 1.14
@@ -312,6 +312,13 @@
return fadeStatus;
}
+void WaitForFade(void) {
+ while (GetFadeStatus() != RDFADE_NONE && GetFadeStatus() != RDFADE_BLACK) {
+ ServiceWindows();
+ g_system->delay_msecs(20);
+ }
+}
+
void FadeServer() {
static int32 previousTime = 0;
const byte *newPalette = (const byte *) fadePalette;
- Previous message: [Scummvm-cvs-logs] CVS: scummvm/bs2 controls.cpp,1.12,1.13
- Next message: [Scummvm-cvs-logs] CVS: scummvm/bs2 build_display.cpp,1.17,1.18 debug.cpp,1.7,1.8 layers.cpp,1.4,1.5 resman.cpp,1.18,1.19
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the Scummvm-git-logs
mailing list