[Scummvm-cvs-logs] CVS: scummvm/bs2/driver d_draw.h,1.11,1.12 render.cpp,1.36,1.37 _console.cpp,1.9,NONE _console.h,1.4,NONE

Torbj?rn Andersson eriktorbjorn at users.sourceforge.net
Sun Oct 26 07:47:03 CET 2003


Update of /cvsroot/scummvm/scummvm/bs2/driver
In directory sc8-pr-cvs1:/tmp/cvs-serv17024/driver

Modified Files:
	d_draw.h render.cpp 
Removed Files:
	_console.cpp _console.h 
Log Message:
Enable the debug console. Actually, what I've done is to adapt the debug
console from the SCUMM engine. I decided that would be easier than to clean
up the original console code.

Unfortunately there's a bunch of code that I just copied - a pretty lousy
form of code-reusal. It'd be nice if the console could be made part of the
Engine class, or something like that.

Most of the debug commands seem to be working. Some aren't relevant for
ScummVM, and some are a bit obscure so I'm not quite sure what they're
supposed to be doing.


Index: d_draw.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/bs2/driver/d_draw.h,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- d_draw.h	15 Oct 2003 06:40:31 -0000	1.11
+++ d_draw.h	26 Oct 2003 15:42:49 -0000	1.12
@@ -153,7 +153,6 @@
 	void clearIconArea(int menu, int pocket, Common::Rect *r);
 
 	void decompressMouse(uint8 *decomp, uint8 *comp, int width, int height, int pitch, int xOff = 0, int yOff = 0);
-	void drawMouse(void);
 
 	uint8 getMatch(uint8 r, uint8 g, uint8 b);
 	void fadeServer(void);
@@ -214,6 +213,8 @@
 	int32 setLuggageAnim(uint8 *la, int32 size);
 	int32 animateMouse(void);
 
+	void drawMouse(void);
+
 	void resetRenderEngine(void);
 
 	void setScrollTarget(int16 sx, int16 sy);
@@ -225,10 +226,8 @@
 	int32 initialiseBackgroundLayer(_parallax *p);
 	void closeBackgroundLayer(void);
 
-#ifdef _SWORD2_DEBUG
 	void plotPoint(uint16 x, uint16 y, uint8 colour);
 	void drawLine(int16 x1, int16 y1, int16 x2, int16 y2, uint8 colour);
-#endif
 
 	int32 createSurface(_spriteInfo *s, uint8 **surface);
 	void drawSurface(_spriteInfo *s, uint8 *surface, Common::Rect *clipRect = NULL);

Index: render.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/bs2/driver/render.cpp,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -d -r1.36 -r1.37
--- render.cpp	15 Oct 2003 06:40:31 -0000	1.36
+++ render.cpp	26 Oct 2003 15:42:49 -0000	1.37
@@ -328,7 +328,6 @@
 	}
 }
 
-#ifdef _SWORD2_DEBUG
 /**
  * Plots a point relative to the top left corner of the screen. This is only
  * used for debugging.
@@ -513,7 +512,6 @@
 		}
 	}
 }
-#endif
 
 /**
  * This function tells the driver the size of the background screen for the

--- _console.cpp DELETED ---

--- _console.h DELETED ---





More information about the Scummvm-git-logs mailing list