[Scummvm-cvs-logs] CVS: scummvm/backends/ps2 systemps2.cpp,1.5,1.6
Robert Göffringmann
lavosspawn at users.sourceforge.net
Fri May 13 12:54:10 CEST 2005
Update of /cvsroot/scummvm/scummvm/backends/ps2
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23368/backends/ps2
Modified Files:
systemps2.cpp
Log Message:
fixed time().
Index: systemps2.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/backends/ps2/systemps2.cpp,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- systemps2.cpp 11 May 2005 07:31:44 -0000 1.5
+++ systemps2.cpp 13 May 2005 19:51:12 -0000 1.6
@@ -702,22 +702,23 @@
if (configIsDaylightSavingEnabled())
gmtOfs += 60;
- g_timeSecs = (FROM_BCD(cdClock.hour) * 60 + FROM_BCD(cdClock.minute)) * 60 + FROM_BCD(cdClock.second);
-
- g_timeSecs -= 9 * 60 * 60; // minus 9 hours, JST -> GMT conversion
- g_timeSecs += gmtOfs * 60; // GMT -> timezone the user selected
+ int timeSecs = (FROM_BCD(cdClock.hour) * 60 + FROM_BCD(cdClock.minute)) * 60 + FROM_BCD(cdClock.second);
+ timeSecs -= 9 * 60 * 60; // minus 9 hours, JST -> GMT conversion
+ timeSecs += gmtOfs * 60; // GMT -> timezone the user selected
g_day = FROM_BCD(cdClock.day);
g_month = FROM_BCD(cdClock.month);
g_year = FROM_BCD(cdClock.year);
- if (g_timeSecs < 0) {
+ if (timeSecs < 0) {
buildNewDate(-1);
- g_timeSecs += SECONDS_PER_DAY;
- } else if (g_timeSecs >= SECONDS_PER_DAY) {
+ timeSecs += SECONDS_PER_DAY;
+ } else if (timeSecs >= SECONDS_PER_DAY) {
buildNewDate(+1);
- g_timeSecs -= SECONDS_PER_DAY;
+ timeSecs -= SECONDS_PER_DAY;
}
+
+ g_timeSecs = (uint32)timeSecs;
}
sioprintf("Time: %d:%02d:%02d - %d.%d.%4d", g_timeSecs / (60 * 60), (g_timeSecs / 60) % 60, g_timeSecs % 60,
More information about the Scummvm-git-logs
mailing list