[Scummvm-cvs-logs] SF.net SVN: scummvm: [24826] scummvm/trunk/engines/touche

cyx at users.sourceforge.net cyx at users.sourceforge.net
Sat Dec 9 20:08:49 CET 2006


Revision: 24826
          http://scummvm.svn.sourceforge.net/scummvm/?rev=24826&view=rev
Author:   cyx
Date:     2006-12-09 11:07:40 -0800 (Sat, 09 Dec 2006)

Log Message:
-----------
force mouse cursor display if first script is different from 90 (startup script number)

Modified Paths:
--------------
    scummvm/trunk/engines/touche/touche.cpp
    scummvm/trunk/engines/touche/touche.h

Modified: scummvm/trunk/engines/touche/touche.cpp
===================================================================
--- scummvm/trunk/engines/touche/touche.cpp	2006-12-09 18:57:27 UTC (rev 24825)
+++ scummvm/trunk/engines/touche/touche.cpp	2006-12-09 19:07:40 UTC (rev 24826)
@@ -138,7 +138,7 @@
 	_currentEpisodeNum = 0;
 	_newEpisodeNum = ConfMan.getInt("boot_param");
 	if (_newEpisodeNum == 0) {
-		_newEpisodeNum = 90;
+		_newEpisodeNum = kStartupEpisode;
 	}
 
 	_newMusicNum = 0;
@@ -232,10 +232,6 @@
 void ToucheEngine::mainLoop() {
 	restart();
 
-	_inp_leftMouseButtonPressed = false;
-	_inp_rightMouseButtonPressed = false;
-	showCursor(false);
-
 	setPalette(0, 255, 0, 0, 0);
 
 	readConfigurationSettings();
@@ -245,6 +241,10 @@
 		_newEpisodeNum = _currentEpisodeNum;
 	}
 
+	_inp_leftMouseButtonPressed = false;
+	_inp_rightMouseButtonPressed = false;
+	showCursor(_newEpisodeNum != kStartupEpisode);
+
 	const int cycleDelay = 1000 / (1193180 / 32768);
 	uint32 frameTimeStamp = _system->getMillis();
 	_sleepCycles = 0;

Modified: scummvm/trunk/engines/touche/touche.h
===================================================================
--- scummvm/trunk/engines/touche/touche.h	2006-12-09 18:57:27 UTC (rev 24825)
+++ scummvm/trunk/engines/touche/touche.h	2006-12-09 19:07:40 UTC (rev 24826)
@@ -316,7 +316,8 @@
 enum {
 	kScreenWidth = 640,
 	kScreenHeight = 400,
-	kRoomHeight = 352
+	kRoomHeight = 352,
+	kStartupEpisode = 90
 };
 
 class MidiPlayer;


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




More information about the Scummvm-git-logs mailing list