[Scummvm-cvs-logs] SF.net SVN: scummvm:[44770] scummvm/trunk/engines/sci/engine

[thebluegr at users.sourceforge.net]

Revision: 44770
          http://scummvm.svn.sourceforge.net/scummvm/?rev=44770&view=rev
Author:   thebluegr
Date:     2009-10-08 07:25:18 +0000 (Thu, 08 Oct 2009)

Log Message:
-----------
Removed the unused game_time variable, and fixed the incorrect calculation of start_game_time when restoring a game

Modified Paths:
--------------
    scummvm/trunk/engines/sci/engine/savegame.cpp
    scummvm/trunk/engines/sci/engine/state.cpp
    scummvm/trunk/engines/sci/engine/state.h

Modified: scummvm/trunk/engines/sci/engine/savegame.cpp
===================================================================
--- scummvm/trunk/engines/sci/engine/savegame.cpp	2009-10-07 23:34:24 UTC (rev 44769)
+++ scummvm/trunk/engines/sci/engine/savegame.cpp	2009-10-08 07:25:18 UTC (rev 44770)
@@ -521,9 +521,6 @@
 		}
 	}
 */
-	// Calculate the time spent with this game
-	s->game_time = (g_system->getMillis() - s->game_start_time) / 1000;
-
 	Common::Serializer ser(0, fh);
 	sync_SavegameMetadata(ser, meta);
 	s->saveLoadWithSerializer(ser);		// FIXME: Error handling?
@@ -774,7 +771,7 @@
 
 	// Time state:
 	retval->last_wait_time = g_system->getMillis();
-	retval->game_start_time = g_system->getMillis() - retval->game_time * 1000;
+	retval->game_start_time = g_system->getMillis();
 
 	// static parser information:
 

Modified: scummvm/trunk/engines/sci/engine/state.cpp
===================================================================
--- scummvm/trunk/engines/sci/engine/state.cpp	2009-10-07 23:34:24 UTC (rev 44769)
+++ scummvm/trunk/engines/sci/engine/state.cpp	2009-10-08 07:25:18 UTC (rev 44770)
@@ -49,8 +49,6 @@
 	status_bar_foreground = 0;
 	status_bar_background = 0;
 
-	game_time = 0;
-
 	port = 0;
 
 	memset(ega_colors, 0, sizeof(ega_colors));

Modified: scummvm/trunk/engines/sci/engine/state.h
===================================================================
--- scummvm/trunk/engines/sci/engine/state.h	2009-10-07 23:34:24 UTC (rev 44769)
+++ scummvm/trunk/engines/sci/engine/state.h	2009-10-08 07:25:18 UTC (rev 44770)
@@ -200,8 +200,6 @@
 
 	int status_bar_foreground, status_bar_background;
 
-	long game_time; /**< Counted at 60 ticks per second, reset during start time */
-
 	GfxPort *port; /**< The currently active port */
 
 	gfx_color_t ega_colors[16]; /**< The 16 EGA colors- for SCI0(1) */


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.