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

kirben at users.sourceforge.net kirben at users.sourceforge.net
Fri Oct 27 15:28:42 CEST 2006


Revision: 24533
          http://svn.sourceforge.net/scummvm/?rev=24533&view=rev
Author:   kirben
Date:     2006-10-27 06:28:32 -0700 (Fri, 27 Oct 2006)

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

Modified Paths:
--------------
    scummvm/trunk/engines/agos/agos.h
    scummvm/trunk/engines/agos/charset.cpp
    scummvm/trunk/engines/agos/input.cpp
    scummvm/trunk/engines/agos/script.cpp
    scummvm/trunk/engines/agos/string.cpp
    scummvm/trunk/engines/agos/window.cpp

Modified: scummvm/trunk/engines/agos/agos.h
===================================================================
--- scummvm/trunk/engines/agos/agos.h	2006-10-27 13:08:25 UTC (rev 24532)
+++ scummvm/trunk/engines/agos/agos.h	2006-10-27 13:28:32 UTC (rev 24533)
@@ -821,7 +821,7 @@
 	void permitInput();
 
 	uint getFeebleFontSize(byte chr);
-	void justifyStart(uint a, uint b);
+	void justifyStart();
 	void justifyOutPut(byte chr);
 
 	void loadZone(uint zoneNum);

Modified: scummvm/trunk/engines/agos/charset.cpp
===================================================================
--- scummvm/trunk/engines/agos/charset.cpp	2006-10-27 13:08:25 UTC (rev 24532)
+++ scummvm/trunk/engines/agos/charset.cpp	2006-10-27 13:28:32 UTC (rev 24533)
@@ -314,10 +314,7 @@
 		openTextWindow();
 		if (!_showMessageFlag) {
 			_windowArray[0] = _textWindow;
-			if (getGameType() == GType_FF || getGameType() == GType_PP)
-				justifyStart(_textWindow->textColumn, _textWindow->width);
-			else
-				justifyStart(_textWindow->textLength, _textWindow->textMaxLength);
+			justifyStart();
 		}
 		_showMessageFlag = true;
 		_fcsData1[_curWindow] = 1;
@@ -327,9 +324,14 @@
 		justifyOutPut(*str);
 }
 
-void AGOSEngine::justifyStart(uint a, uint b) {
-	_printCharCurPos = a;
-	_printCharMaxPos = b;
+void AGOSEngine::justifyStart() {
+	if (getGameType() == GType_FF || getGameType() == GType_PP) {
+		_printCharCurPos = _textWindow->textColumn;
+		_printCharMaxPos = _textWindow->width;
+	} else {
+		_printCharCurPos = _textWindow->textLength;
+		_printCharMaxPos = _textWindow->textMaxLength;
+	}
 	_printCharPixelCount = 0;
 	_numLettersToPrint = 0;
 	_newLines = 0;

Modified: scummvm/trunk/engines/agos/input.cpp
===================================================================
--- scummvm/trunk/engines/agos/input.cpp	2006-10-27 13:08:25 UTC (rev 24532)
+++ scummvm/trunk/engines/agos/input.cpp	2006-10-27 13:28:32 UTC (rev 24533)
@@ -432,10 +432,7 @@
 		_curWindow = 0;
 		if (_windowArray[0] != 0) {
 			_textWindow = _windowArray[0];
-			if (getGameType() == GType_FF || getGameType() == GType_PP)
-				justifyStart(_textWindow->textColumn, _textWindow->width);
-			else
-				justifyStart(_textWindow->textLength, _textWindow->textMaxLength);
+			justifyStart();
 		}
 		_mortalFlag = false;
 	}

Modified: scummvm/trunk/engines/agos/script.cpp
===================================================================
--- scummvm/trunk/engines/agos/script.cpp	2006-10-27 13:08:25 UTC (rev 24532)
+++ scummvm/trunk/engines/agos/script.cpp	2006-10-27 13:28:32 UTC (rev 24533)
@@ -667,10 +667,7 @@
 
 	if (num == _curWindow) {
 		_textWindow = _windowArray[num];
-		if (getGameType() == GType_FF || getGameType() == GType_PP)
-			justifyStart(_textWindow->textColumn, _textWindow->width);
-		else
-			justifyStart(_textWindow->textLength, _textWindow->textMaxLength);
+		justifyStart();
 	}
 }
 

Modified: scummvm/trunk/engines/agos/string.cpp
===================================================================
--- scummvm/trunk/engines/agos/string.cpp	2006-10-27 13:08:25 UTC (rev 24532)
+++ scummvm/trunk/engines/agos/string.cpp	2006-10-27 13:28:32 UTC (rev 24533)
@@ -726,7 +726,7 @@
 	_textWindow->textRow = 0;
 	_textWindow->textColumnOffset = 0;
 	_textWindow->textLength = 0;
-	justifyStart(_textWindow->textLength, _textWindow->textMaxLength);
+	justifyStart();
 	waitForSync(99);
 	BoxBufferPtr = _boxBuffer;
 	while (*BoxBufferPtr)

Modified: scummvm/trunk/engines/agos/window.cpp
===================================================================
--- scummvm/trunk/engines/agos/window.cpp	2006-10-27 13:08:25 UTC (rev 24532)
+++ scummvm/trunk/engines/agos/window.cpp	2006-10-27 13:28:32 UTC (rev 24533)
@@ -78,11 +78,7 @@
 	_curWindow = a;
 	justifyOutPut(0);
 	_textWindow = _windowArray[a];
-
-	if (getGameType() == GType_FF || getGameType() == GType_PP)
-		justifyStart(_textWindow->textColumn, _textWindow->width);
-	else
-		justifyStart(_textWindow->textLength, _textWindow->textMaxLength);
+	justifyStart();
 }
 
 void AGOSEngine::closeWindow(uint a) {


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