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

[eriktorbjorn at users.sourceforge.net]

Revision: 21744
Author:   eriktorbjorn
Date:     2006-04-09 23:51:20 -0700 (Sun, 09 Apr 2006)
ViewCVS:  http://svn.sourceforge.net/scummvm/?rev=21744&view=rev

Log Message:
-----------
Merged o_vga_reset() into o1_killAnimate().

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 06:40:15 UTC (rev 21743)
+++ scummvm/trunk/engines/simon/items.cpp	2006-04-10 06:51:20 UTC (rev 21744)
@@ -870,7 +870,9 @@
 
 void SimonEngine::o1_killAnimate() {
 	// 100: vga reset
-	o_vga_reset();
+	_lockWord |= 0x8000;
+	vc27_resetSprite();
+	_lockWord &= ~0x8000;
 }
 
 void SimonEngine::o1_defWindow() {

Modified: scummvm/trunk/engines/simon/simon.cpp
===================================================================
--- scummvm/trunk/engines/simon/simon.cpp	2006-04-10 06:40:15 UTC (rev 21743)
+++ scummvm/trunk/engines/simon/simon.cpp	2006-04-10 06:51:20 UTC (rev 21744)
@@ -2863,12 +2863,6 @@
 	}
 }
 
-void SimonEngine::o_vga_reset() {
-	_lockWord |= 0x8000;
-	vc27_resetSprite();
-	_lockWord &= ~0x8000;
-}
-
 bool SimonEngine::itemIsSiblingOf(uint16 a) {
 	Item *item;
 

Modified: scummvm/trunk/engines/simon/simon.h
===================================================================
--- scummvm/trunk/engines/simon/simon.h	2006-04-10 06:40:15 UTC (rev 21743)
+++ scummvm/trunk/engines/simon/simon.h	2006-04-10 06:51:20 UTC (rev 21744)
@@ -557,7 +557,6 @@
 	void o_kill_sprite_simon1(uint a);
 	void o_kill_sprite_simon2(uint a, uint b);
 
-	void o_vga_reset();
 	void changeWindow(uint a);
 	void o_unk_103();
 	void closeWindow(uint a);


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