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

peres001 at users.sourceforge.net peres001 at users.sourceforge.net
Sun Jan 6 21:51:06 CET 2008


Revision: 30314
          http://scummvm.svn.sourceforge.net/scummvm/?rev=30314&view=rev
Author:   peres001
Date:     2008-01-06 12:51:05 -0800 (Sun, 06 Jan 2008)

Log Message:
-----------
Removed now useless functions.

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	2008-01-06 20:46:03 UTC (rev 30313)
+++ scummvm/trunk/engines/parallaction/graphics.cpp	2008-01-06 20:51:05 UTC (rev 30314)
@@ -234,30 +234,7 @@
 	}
 };
 
-void Gfx::drawBalloon(const Common::Rect& r, uint16 winding) {
-//	printf("Gfx::drawBalloon(%i, %i, %i, %i, %i)...", left, top, width, height, winding);
 
-	Common::Rect q = r;
-
-	// draws balloon
-	q.right += 5;
-	floodFill(kBitFront, q, 0);
-	q.grow(-1);
-	floodFill(kBitFront, q, 1);
-
-	// draws tail
-	// TODO: this bitmap tail should only be used for Dos games. Amiga should use a polygon fill.
-	winding = (winding == 0 ? 1 : 0);
-	Common::Rect s(BALLOON_TAIL_WIDTH, BALLOON_TAIL_HEIGHT);
-	s.moveTo(r.left + (r.width()+5)/2 - 5, r.bottom - 1);
-	flatBlit(s, _resBalloonTail[winding], _buffers[kBitFront], 2);
-
-	return;
-}
-
-
-
-
 void Gfx::setPalette(Palette pal) {
 	byte sysPal[256*4];
 
@@ -705,62 +682,7 @@
 	displayString(x, y, text, 1);
 }
 
-bool Gfx::displayWrappedString(char *text, uint16 x, uint16 y, byte color, int16 wrapwidth) {
 
-	uint16 lines = 0;
-	bool rv = false;
-	uint16 linewidth = 0;
-
-	uint16 rx = x + 10;
-	uint16 ry = y + 4;
-
-	char token[40];
-
-	if (wrapwidth == -1)
-		wrapwidth = _vm->_screenWidth;
-
-	while (strlen(text) > 0) {
-
-		text = parseNextToken(text, token, 40, "   ", true);
-
-		if (!scumm_stricmp(token, "%p")) {
-			lines++;
-			rx = x + 10;
-			ry = y + 4 + lines*10;	// y
-
-			strcpy(token, "> .......");
-			strncpy(token+2, _password, strlen(_password));
-			rv = true;
-		} else {
-
-			linewidth += getStringWidth(token);
-
-			if (linewidth > wrapwidth) {
-				// wrap line
-				lines++;
-				rx = x + 10;			// x
-				ry = y + 4 + lines*10;	// y
-				linewidth = getStringWidth(token);
-			}
-
-			if (!scumm_stricmp(token, "%s")) {
-				sprintf(token, "%d", _score);
-			}
-
-		}
-
-		displayString(rx, ry, token, color);
-
-		rx += getStringWidth(token) + getStringWidth(" ");
-		linewidth += getStringWidth(" ");
-
-		text = Common::ltrim(text);
-	}
-
-	return rv;
-
-}
-
 uint16 Gfx::getStringWidth(const char *text) {
 	return _font->getStringWidth(text);
 }

Modified: scummvm/trunk/engines/parallaction/graphics.h
===================================================================
--- scummvm/trunk/engines/parallaction/graphics.h	2008-01-06 20:46:03 UTC (rev 30313)
+++ scummvm/trunk/engines/parallaction/graphics.h	2008-01-06 20:51:05 UTC (rev 30314)
@@ -243,10 +243,8 @@
 public:
 
 	// balloons and text
-	void drawBalloon(const Common::Rect& r, uint16 arg_8);
 	void displayString(uint16 x, uint16 y, const char *text, byte color);
 	void displayCenteredString(uint16 y, const char *text);
-	bool displayWrappedString(char *text, uint16 x, uint16 y, byte color, int16 wrapwidth = -1);
 	uint16 getStringWidth(const char *text);
 	void getStringExtent(char *text, uint16 maxwidth, int16* width, int16* height);
 


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