[Scummvm-cvs-logs] SF.net SVN: scummvm: [21750] scummvm/trunk/engines/simon

eriktorbjorn at users.sourceforge.net eriktorbjorn at users.sourceforge.net
Mon Apr 10 00:22:02 CEST 2006


Revision: 21750
Author:   eriktorbjorn
Date:     2006-04-10 00:21:44 -0700 (Mon, 10 Apr 2006)
ViewCVS:  http://svn.sourceforge.net/scummvm/?rev=21750&view=rev

Log Message:
-----------
Merged o_loadBeard() and o_unloadBeard() into o1_loadBeard() and
o1_unloadBeard().

Modified Paths:
--------------
    scummvm/trunk/engines/simon/items.cpp
    scummvm/trunk/engines/simon/simon.h
    scummvm/trunk/engines/simon/vga.cpp
Modified: scummvm/trunk/engines/simon/items.cpp
===================================================================
--- scummvm/trunk/engines/simon/items.cpp	2006-04-10 07:17:06 UTC (rev 21749)
+++ scummvm/trunk/engines/simon/items.cpp	2006-04-10 07:21:44 UTC (rev 21750)
@@ -1376,12 +1376,22 @@
 
 void SimonEngine::o1_loadBeard() {
 	// 182: load beard
-	o_loadBeard();
+	if (_beardLoaded == false) {
+		_beardLoaded = true;
+		_lockWord |= 0x8000;
+		read_vga_from_datfile_1(328);
+		_lockWord &= ~0x8000;
+	}
 }
 
 void SimonEngine::o1_unloadBeard() {
 	// 183: unload beard
-	o_unloadBeard();
+	if (_beardLoaded == true) {
+		_beardLoaded = false;
+		_lockWord |= 0x8000;
+		read_vga_from_datfile_1(23);
+		_lockWord &= ~0x8000;
+	}
 }
 
 void SimonEngine::o1_unloadZone() {

Modified: scummvm/trunk/engines/simon/simon.h
===================================================================
--- scummvm/trunk/engines/simon/simon.h	2006-04-10 07:17:06 UTC (rev 21749)
+++ scummvm/trunk/engines/simon/simon.h	2006-04-10 07:21:44 UTC (rev 21750)
@@ -587,8 +587,6 @@
 	void o_pathfind(int x, int y, uint var_1, uint var_2);
 	void o_mouseOn();
 	void o_mouseOff();
-	void o_loadBeard();
-	void o_unloadBeard();
 	void o_unloadZone(uint a);
 	void o_unfreezeBottom();
 	void o_fadeToBlack();

Modified: scummvm/trunk/engines/simon/vga.cpp
===================================================================
--- scummvm/trunk/engines/simon/vga.cpp	2006-04-10 07:17:06 UTC (rev 21749)
+++ scummvm/trunk/engines/simon/vga.cpp	2006-04-10 07:21:44 UTC (rev 21750)
@@ -224,26 +224,6 @@
 		fprintf(_dumpFile, "; skipped\n");
 }
 
-void SimonEngine::o_unloadBeard() {
-	// Simon1 Only
-	if (_beardLoaded == true) {
-		_beardLoaded = false;
-		_lockWord |= 0x8000;
-		read_vga_from_datfile_1(23);
-		_lockWord &= ~0x8000;
-	}
-}
-
-void SimonEngine::o_loadBeard() {
-	// Simon1 Only
-	if (_beardLoaded == false) {
-		_beardLoaded = true;
-		_lockWord |= 0x8000;
-		read_vga_from_datfile_1(328);
-		_lockWord &= ~0x8000;
-	}
-}
-
 // VGA Script commands
 void SimonEngine::vc1_fadeOut() {
 	/* dummy opcode */


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