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

[eriktorbjorn at users.sourceforge.net]

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

Log Message:
-----------
Merged o_set_video_mode() into o1_picture().

Modified Paths:
--------------
    scummvm/trunk/engines/simon/items.cpp
    scummvm/trunk/engines/simon/simon.cpp
    scummvm/trunk/engines/simon/simon.h
Modified: scummvm/trunk/engines/simon/items.cpp
===================================================================
--- scummvm/trunk/engines/simon/items.cpp	2006-04-10 07:02:28 UTC (rev 21746)
+++ scummvm/trunk/engines/simon/items.cpp	2006-04-10 07:09:03 UTC (rev 21747)
@@ -842,8 +842,16 @@
 
 void SimonEngine::o1_picture() {
 	// 96
-	uint val = getVarOrWord();
-	o_set_video_mode(getVarOrByte(), val);
+	uint vga_res = getVarOrWord();
+	uint mode = getVarOrByte();
+
+	if (mode == 4)
+		vc29_stopAllSounds();
+
+	if (_lockWord & 0x10)
+		error("o1_picture: _lockWord & 0x10");
+
+	set_video_mode_internal(mode, vga_res);
 }
 
 void SimonEngine::o1_loadZone() {

Modified: scummvm/trunk/engines/simon/simon.cpp
===================================================================
--- scummvm/trunk/engines/simon/simon.cpp	2006-04-10 07:02:28 UTC (rev 21746)
+++ scummvm/trunk/engines/simon/simon.cpp	2006-04-10 07:09:03 UTC (rev 21747)
@@ -2306,16 +2306,6 @@
 	vpe->vgaFile2 = NULL;
 }
 
-void SimonEngine::o_set_video_mode(uint mode, uint vga_res) {
-	if (mode == 4)
-		vc29_stopAllSounds();
-
-	if (_lockWord & 0x10)
-		error("o_set_video_mode_ex: _lockWord & 0x10");
-
-	set_video_mode_internal(mode, vga_res);
-}
-
 void SimonEngine::set_video_mode_internal(uint mode, uint vga_res_id) {
 	uint num, num_lines;
 	VgaPointersEntry *vpe;

Modified: scummvm/trunk/engines/simon/simon.h
===================================================================
--- scummvm/trunk/engines/simon/simon.h	2006-04-10 07:02:28 UTC (rev 21746)
+++ scummvm/trunk/engines/simon/simon.h	2006-04-10 07:09:03 UTC (rev 21747)
@@ -692,7 +692,6 @@
 
 	void handleVerbClicked(uint verb);
 
-	void o_set_video_mode(uint mode, uint vga_res);
 	void set_video_mode_internal(uint mode, uint vga_res_id);
 
 	void o_loadZone(uint vga_res);


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