[Scummvm-cvs-logs] CVS: scummvm/sword2 build_display.cpp,1.46,1.47 console.cpp,1.32,1.33 debug.cpp,1.28,1.29 sword2.cpp,1.82,1.83 sword2.h,1.37,1.38
Torbj?rn Andersson
eriktorbjorn at users.sourceforge.net
Tue Nov 11 02:32:03 CET 2003
- Previous message: [Scummvm-cvs-logs] CVS: scummvm/sword2/driver driver96.h,1.58,1.59 menu.cpp,1.21,1.22 misc.cpp,1.14,1.15 palette.cpp,1.24,1.25 render.cpp,1.41,1.42
- Next message: [Scummvm-cvs-logs] CVS: tools simon2mp3.c,1.25,1.26 util.c,1.4,1.5
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Update of /cvsroot/scummvm/scummvm/sword2
In directory sc8-pr-cvs1:/tmp/cvs-serv25104
Modified Files:
build_display.cpp console.cpp debug.cpp sword2.cpp sword2.h
Log Message:
Removed SVM_timeGetTime(). We may as well call get_msecs() directly.
Index: build_display.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sword2/build_display.cpp,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -d -r1.46 -r1.47
--- build_display.cpp 11 Nov 2003 07:43:02 -0000 1.46
+++ build_display.cpp 11 Nov 2003 10:30:20 -0000 1.47
@@ -173,11 +173,11 @@
// update our fps reading
_frameCount++;
- if (SVM_timeGetTime() > _cycleTime) {
+ if (_system->get_msecs() > _cycleTime) {
_fps = _frameCount;
debug(2, "FPS: %d", _fps);
_frameCount = 0;
- _cycleTime = SVM_timeGetTime() + 1000;
+ _cycleTime = _system->get_msecs() + 1000;
}
// Check if we've got time to render the screen again
@@ -255,7 +255,7 @@
g_graphics->waitForFade();
- uint32 targetTime = SVM_timeGetTime() + (time * 1000);
+ uint32 targetTime = _system->get_msecs() + (time * 1000);
// Keep the message there even when the user task swaps.
rv = g_graphics->drawSprite(&spriteInfo);
Index: console.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sword2/console.cpp,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -d -r1.32 -r1.33
--- console.cpp 11 Nov 2003 07:43:02 -0000 1.32
+++ console.cpp 11 Nov 2003 10:30:20 -0000 1.33
@@ -466,9 +466,9 @@
bool Debugger::Cmd_TimeOn(int argc, const char **argv) {
if (argc == 2)
- _startTime = SVM_timeGetTime() - atoi(argv[1]) * 1000;
+ _startTime = g_system->get_msecs() - atoi(argv[1]) * 1000;
else if (_startTime == 0)
- _startTime = SVM_timeGetTime();
+ _startTime = g_system->get_msecs();
_displayTime = true;
DebugPrintf("Timer display on\n");
return true;
Index: debug.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sword2/debug.cpp,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -d -r1.28 -r1.29
--- debug.cpp 11 Nov 2003 07:43:02 -0000 1.28
+++ debug.cpp 11 Nov 2003 10:30:20 -0000 1.29
@@ -120,7 +120,7 @@
// debug info at top of screen - enabled/disabled as one complete unit
if (_displayTime) {
- int32 time = SVM_timeGetTime();
+ int32 time = g_system->get_msecs();
if ((time - _startTime) / 1000 >= 10000)
_startTime = time;
Index: sword2.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sword2/sword2.cpp,v
retrieving revision 1.82
retrieving revision 1.83
diff -u -d -r1.82 -r1.83
--- sword2.cpp 11 Nov 2003 07:43:02 -0000 1.82
+++ sword2.cpp 11 Nov 2003 10:30:21 -0000 1.83
@@ -477,8 +477,8 @@
// FIXME: Move this to some better place?
-void Sword2Engine::sleepUntil(int32 time) {
- while ((int32) SVM_timeGetTime() < time) {
+void Sword2Engine::sleepUntil(uint32 time) {
+ while (_system->get_msecs() < time) {
// Make sure menu animations and fades don't suffer
_graphics->processMenu();
_graphics->updateDisplay();
Index: sword2.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sword2/sword2.h,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -d -r1.37 -r1.38
--- sword2.h 11 Nov 2003 07:43:02 -0000 1.37
+++ sword2.h 11 Nov 2003 10:30:21 -0000 1.38
@@ -364,7 +364,7 @@
void gameCycle(void);
void closeGame(void);
- void sleepUntil(int32 time);
+ void sleepUntil(uint32 time);
uint32 readFile(const char *name, mem **membloc, uint32 uid);
- Previous message: [Scummvm-cvs-logs] CVS: scummvm/sword2/driver driver96.h,1.58,1.59 menu.cpp,1.21,1.22 misc.cpp,1.14,1.15 palette.cpp,1.24,1.25 render.cpp,1.41,1.42
- Next message: [Scummvm-cvs-logs] CVS: tools simon2mp3.c,1.25,1.26 util.c,1.4,1.5
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the Scummvm-git-logs
mailing list