[Scummvm-cvs-logs] SF.net SVN: scummvm: [26479] scummvm/trunk/engines/agos/vga_ww.cpp

[kirben at users.sourceforge.net]

Revision: 26479
          http://scummvm.svn.sourceforge.net/scummvm/?rev=26479&view=rev
Author:   kirben
Date:     2007-04-14 17:21:42 -0700 (Sat, 14 Apr 2007)

Log Message:
-----------
Cleanup.

Modified Paths:
--------------
    scummvm/trunk/engines/agos/vga_ww.cpp

Modified: scummvm/trunk/engines/agos/vga_ww.cpp
===================================================================
--- scummvm/trunk/engines/agos/vga_ww.cpp	2007-04-15 00:12:09 UTC (rev 26478)
+++ scummvm/trunk/engines/agos/vga_ww.cpp	2007-04-15 00:21:42 UTC (rev 26479)
@@ -191,10 +191,9 @@
 		}
 
 		if (getGameType() == GType_SIMON1) {
-			uint16 params[5];						/* parameters to vc10_draw */
 			VgaSprite *vsp;
 			VgaPointersEntry *vpe;
-			const byte *vcPtrOrg = _vcPtr;
+			VC10_state state;
 
 			vsp = _vgaSprites;
 			while (vsp->id != 0) {
@@ -208,14 +207,14 @@
 					_curVgaFile2 = vpe->vgaFile2;
 					_windowNum = vsp->windowNum;
 
-					params[0] = READ_BE_UINT16(&vsp->image);
-					params[1] = READ_BE_UINT16(&vsp->palette);
-					params[2] = READ_BE_UINT16(&vsp->x);
-					params[3] = READ_BE_UINT16(&vsp->y);
-					params[4] = READ_BE_UINT16(&vsp->flags);
-					_vcPtr = (byte *)params;
-					vc10_draw();
+					state.image = vsp->image;
+					state.palette = (vsp->palette & 15) * 16;
+					state.x = vsp->x;
+					state.y = vsp->y;
+					state.flags = vsp->flags;
 
+					drawImage_init(&state);
+
 					_windowNum = palmode;
 					_curVgaFile1 = old_file_1;
 					_curVgaFile2 = old_file_2;
@@ -223,7 +222,6 @@
 				}
 				vsp++;
 			}
-			_vcPtr = vcPtrOrg;
 		}
 
 		// Allow one section of Simon the Sorcerer 1 introduction to be displayed


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