[Scummvm-cvs-logs] SF.net SVN: scummvm:[52963] scummvm/trunk/engines/hugo

[strangerke at users.sourceforge.net]

Revision: 52963
          http://scummvm.svn.sourceforge.net/scummvm/?rev=52963&view=rev
Author:   strangerke
Date:     2010-10-01 09:13:47 +0000 (Fri, 01 Oct 2010)

Log Message:
-----------
HUGO: Remove viewport variables from _config

Modified Paths:
--------------
    scummvm/trunk/engines/hugo/engine.cpp
    scummvm/trunk/engines/hugo/game.h

Modified: scummvm/trunk/engines/hugo/engine.cpp
===================================================================
--- scummvm/trunk/engines/hugo/engine.cpp	2010-10-01 06:16:24 UTC (rev 52962)
+++ scummvm/trunk/engines/hugo/engine.cpp	2010-10-01 09:13:47 UTC (rev 52963)
@@ -110,9 +110,6 @@
 // Initialize default config values.  Must be done before Initialize().
 // Reset needed to save config.cx,cy which get splatted during OnFileNew()
 void HugoEngine::initConfig(inst_t action) {
-	static int16 cx, cy;                    // Save window size, pos
-	int16        i;
-
 	debugC(1, kDebugEngine, "initConfig(%d)", action);
 
 	switch (action) {
@@ -121,24 +118,15 @@
 		_config.soundFl = true;                     // Sound state initially on
 		_config.turboFl = false;                    // Turbo state initially off
 		_config.backgroundMusicFl = false;          // No music when inactive
-		_config.cx = VIEW_DX * 2;                   // Window view size
-		_config.cy = VIEW_DY * 2;
-
 		_config.musicVolume = 85;                   // Music volume %
 		_config.soundVolume = 100;                  // Sound volume %
 		initPlaylist(_config.playlist);             // Initialize default tune playlist
 
 		file().readBootFile();    // Read startup structure
-
-		cx = _config.cx;                            // Save these around OnFileNew()
-		cy = _config.cy;
 		break;
 	case RESET:
-		_config.cx = cx;                            // Restore cx, cy
-		_config.cy = cy;
-
 		// Find first tune and play it
-		for (i = 0; i < MAX_TUNES; i++)
+		for (int16 i = 0; i < MAX_TUNES; i++)
 			if (_config.playlist[i]) {
 				sound().playMusic(i);
 				break;
@@ -151,6 +139,7 @@
 		break;
 	}
 }
+
 void HugoEngine::initialize() {
 	debugC(1, kDebugEngine, "initialize");
 

Modified: scummvm/trunk/engines/hugo/game.h
===================================================================
--- scummvm/trunk/engines/hugo/game.h	2010-10-01 06:16:24 UTC (rev 52962)
+++ scummvm/trunk/engines/hugo/game.h	2010-10-01 09:13:47 UTC (rev 52963)
@@ -817,8 +817,6 @@
 	bool musicFl;                                   // State of Music button/menu item
 	bool soundFl;                                   // State of Sound button/menu item
 	bool turboFl;                                   // State of Turbo button/menu item
-//	int16 wx, wy;                                    // Position of viewport
-	int16 cx, cy;                                   // Size of viewport
 	bool  backgroundMusicFl;                        // Continue music when task inactive
 	byte  musicVolume;                              // Music volume percentage
 	byte  soundVolume;                              // Sound volume percentage


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