[Scummvm-cvs-logs] SF.net SVN: scummvm:[35739] scummvm/trunk/engines/parallaction

[peres001 at users.sourceforge.net]

Revision: 35739
          http://scummvm.svn.sourceforge.net/scummvm/?rev=35739&view=rev
Author:   peres001
Date:     2009-01-05 14:07:26 +0000 (Mon, 05 Jan 2009)

Log Message:
-----------
Deleted unused declarations, sorted others, and removed some dead code.

Modified Paths:
--------------
    scummvm/trunk/engines/parallaction/graphics.cpp
    scummvm/trunk/engines/parallaction/graphics.h

Modified: scummvm/trunk/engines/parallaction/graphics.cpp
===================================================================
--- scummvm/trunk/engines/parallaction/graphics.cpp	2009-01-05 09:49:57 UTC (rev 35738)
+++ scummvm/trunk/engines/parallaction/graphics.cpp	2009-01-05 14:07:26 UTC (rev 35739)
@@ -600,8 +600,6 @@
 
 
 uint Gfx::createLabel(Font *font, const char *text, byte color) {
-	assert(_labels.size() < MAX_NUM_LABELS);
-
 	Graphics::Surface *cnv = new Graphics::Surface;
 
 	uint w, h;

Modified: scummvm/trunk/engines/parallaction/graphics.h
===================================================================
--- scummvm/trunk/engines/parallaction/graphics.h	2009-01-05 09:49:57 UTC (rev 35738)
+++ scummvm/trunk/engines/parallaction/graphics.h	2009-01-05 14:07:26 UTC (rev 35739)
@@ -512,9 +512,11 @@
 	void freeLocationObjects();
 	void showGfxObj(GfxObj* obj, bool visible);
 	void clearGfxObjects(uint filter);
+	void loadGfxObjMask(const char *name, GfxObj *obj);
 	void sortScene();
+    void blt(const Common::Rect& r, byte *data, Graphics::Surface *surf, uint16 z, uint scale, byte transparentColor);
+	void unpackBlt(const Common::Rect& r, byte *data, uint size, Graphics::Surface *surf, uint16 z, uint scale, byte transparentColor);
 
-
 	// labels
 	void showFloatingLabel(uint label);
 	void hideFloatingLabel();
@@ -551,6 +553,8 @@
 	void setProjectorProgram(int16 *data);
 	int16 *_nextProjectorPos;
 
+	int getScrollPos();
+	void setScrollPos(int scrollX);
 
 	// init
 	Gfx(Parallaction* vm);
@@ -573,8 +577,6 @@
 	// BRA specific
 	Palette				_backupPal;
 
-	// frame data stored in programmable variables
-	int32 				getRenderMode(const char *type);
 
 	Graphics::Surface	*lockScreen();
 	void				unlockScreen();
@@ -588,13 +590,6 @@
 	int					_scrollPos;
 	int					_minScroll, _maxScroll;
 
-	// overlay mode enables drawing of graphics with automatic screen-to-game coordinate translation
-	bool				_overlayMode;
-	void				drawOverlay(Graphics::Surface &surf);
-
-public:
-
-	#define MAX_NUM_LABELS	20
 	#define NO_FLOATING_LABEL	1000
 
 	GfxObjArray	_labels;
@@ -603,27 +598,22 @@
 
 	uint _floatingLabel;
 
-	void drawInventory();
-	void updateFloatingLabel();
-	void drawList(Graphics::Surface &surface, GfxObjArray &list);
+	// overlay mode enables drawing of graphics with automatic screen-to-game coordinate translation
+	bool				_overlayMode;
+	void				drawOverlay(Graphics::Surface &surf);
+	void 				drawInventory();
 
+	void drawList(Graphics::Surface &surface, GfxObjArray &list);
+	void updateFloatingLabel();
 	void copyRect(const Common::Rect &r, Graphics::Surface &src, Graphics::Surface &dst);
-
-	int getScrollPos();
-	void setScrollPos(int scrollX);
-
-	// low level text and patches
 	void drawText(Font *font, Graphics::Surface* surf, uint16 x, uint16 y, const char *text, byte color);
-
 	void drawGfxObject(GfxObj *obj, Graphics::Surface &surf);
-    void blt(const Common::Rect& r, byte *data, Graphics::Surface *surf, uint16 z, uint scale, byte transparentColor);
-	void unpackBlt(const Common::Rect& r, byte *data, uint size, Graphics::Surface *surf, uint16 z, uint scale, byte transparentColor);
-
 	void bltMaskScale(const Common::Rect& r, byte *data, Graphics::Surface *surf, uint16 z, uint scale, byte transparentColor);
 	void bltMaskNoScale(const Common::Rect& r, byte *data, Graphics::Surface *surf, uint16 z, byte transparentColor);
 	void bltNoMaskNoScale(const Common::Rect& r, byte *data, Graphics::Surface *surf, byte transparentColor);
 
-	void loadGfxObjMask(const char *name, GfxObj *obj);
+public:
+
 };
 
 


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