[Scummvm-cvs-logs] SF.net SVN: scummvm: [22601] scummvm/trunk/engines/agi

aquadran at users.sourceforge.net aquadran at users.sourceforge.net
Wed May 24 01:57:07 CEST 2006


Revision: 22601
Author:   aquadran
Date:     2006-05-24 01:56:40 -0700 (Wed, 24 May 2006)
ViewCVS:  http://svn.sourceforge.net/scummvm/?rev=22601&view=rev

Log Message:
-----------
strip one level of func

Modified Paths:
--------------
    scummvm/trunk/engines/agi/graphics.cpp
    scummvm/trunk/engines/agi/graphics.h
Modified: scummvm/trunk/engines/agi/graphics.cpp
===================================================================
--- scummvm/trunk/engines/agi/graphics.cpp	2006-05-24 08:23:12 UTC (rev 22600)
+++ scummvm/trunk/engines/agi/graphics.cpp	2006-05-24 08:56:40 UTC (rev 22601)
@@ -151,7 +151,7 @@
 	uint8 *b, *c = NULL;
 
 	if (console.y <= y) {
-		gfx_putpixels(x, y, w, p);
+		memcpy(screen + x + y * 320, p, w);
 		return;
 	}
 
@@ -162,7 +162,7 @@
 		*b++ = *c ? *c : *p + 16;
 	}
 
-	gfx_putpixels(x, y, w, _b);
+	memcpy(screen + x + y * 320, p, w);
 }
 
 static void init_console() {
@@ -434,11 +434,6 @@
 	g_system->setPalette(pal, 0, 32);
 }
 
-void gfx_putpixels(int x, int y, int w, uint8 *p) {
-	uint8 *p0 = screen + x + y * 320;
-	memcpy(p0, p, w);
-}
-
 /* put a block onto the screen */
 void gfx_putblock(int x1, int y1, int x2, int y2) {
 	if (x1 >= GFX_WIDTH)

Modified: scummvm/trunk/engines/agi/graphics.h
===================================================================
--- scummvm/trunk/engines/agi/graphics.h	2006-05-24 08:23:12 UTC (rev 22600)
+++ scummvm/trunk/engines/agi/graphics.h	2006-05-24 08:56:40 UTC (rev 22601)
@@ -42,7 +42,6 @@
 extern uint8 layer1_data[];
 extern uint8 layer2_data[];
 
-void gfx_putpixels(int x, int y, int w, uint8 * p);
 void gfx_putblock(int x1, int y1, int x2, int y2);
 
 void put_text_character(int, int, int, unsigned int, int, int);


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