[Scummvm-cvs-logs] SF.net SVN: scummvm:[41916] scummvm/trunk/engines/kyra

[athrxx at users.sourceforge.net]

Revision: 41916
          http://scummvm.svn.sourceforge.net/scummvm/?rev=41916&view=rev
Author:   athrxx
Date:     2009-06-27 12:36:12 +0000 (Sat, 27 Jun 2009)

Log Message:
-----------
LOL: cleanup

Modified Paths:
--------------
    scummvm/trunk/engines/kyra/lol.cpp
    scummvm/trunk/engines/kyra/text_lol.cpp
    scummvm/trunk/engines/kyra/text_lol.h

Modified: scummvm/trunk/engines/kyra/lol.cpp
===================================================================
--- scummvm/trunk/engines/kyra/lol.cpp	2009-06-27 12:26:26 UTC (rev 41915)
+++ scummvm/trunk/engines/kyra/lol.cpp	2009-06-27 12:36:12 UTC (rev 41916)
@@ -850,9 +850,6 @@
 
 	_loadSuppFilesFlag = 1;
 
-	_txt->setAnimParameters("<MORE>", 10, 31, 0);
-	_txt->setAnimFlag(true);
-
 	_sound->loadSfxFile("LORESFX");
 
 	setMouseCursorToItemInHand();

Modified: scummvm/trunk/engines/kyra/text_lol.cpp
===================================================================
--- scummvm/trunk/engines/kyra/text_lol.cpp	2009-06-27 12:26:26 UTC (rev 41915)
+++ scummvm/trunk/engines/kyra/text_lol.cpp	2009-06-27 12:36:12 UTC (rev 41916)
@@ -33,8 +33,8 @@
 namespace Kyra {
 
 TextDisplayer_LoL::TextDisplayer_LoL(LoLEngine *vm, Screen_LoL *screen) : _vm(vm), _screen(screen),
-	_scriptParameter(0), _animWidth(0), _animColor1(0), _animColor2(0), _animFlag(true), _lineCount(0),
-	_printFlag(false), _lineWidth(0), _numCharsTotal(0), _numCharsLeft(0), _numCharsPrinted(0) {
+	_scriptParameter(0), _lineCount(0),	_printFlag(false), _lineWidth(0), _numCharsTotal(0),
+	_numCharsLeft(0), _numCharsPrinted(0) {
 
 	memset(_stringParameters, 0, 15 * sizeof(char *));
 	_buffer = new char[600];
@@ -138,7 +138,7 @@
 	_textDimData[dim].line = 0;
 }
 
-void TextDisplayer_LoL::setAnimParameters(const char *str, int x, uint8 col1, uint8 col2) {
+/*void TextDisplayer_LoL::setAnimParameters(const char *str, int x, uint8 col1, uint8 col2) {
 	static const char defaultStr[] = "<MORE>";
 
 	if (str) {
@@ -152,7 +152,7 @@
 		_animColor1 = 0;
 		_animColor2 = 0;
 	}
-}
+}*/
 
 void TextDisplayer_LoL::printDialogueText(int dim, char *str, EMCState *script, const uint16 *paramList, int16 paramIndex) {
 	int oldDim = 0;
@@ -496,7 +496,7 @@
 	int lines = (sd->h - _screen->_charOffset) / fh;
 
 	while (_textDimData[sdx].line >= lines) {
-		if (lines <= _lineCount && _animFlag) {
+		if (lines <= _lineCount) {
 			_lineCount = 0;
 			textPageBreak();
 			_numCharsPrinted = 0;
@@ -521,8 +521,8 @@
 	char c = 0;
 
 	if ((lw + _textDimData[sdx].column) > w) {
-		if ((lines - 1) <= _lineCount && _animFlag)
-			w -= (_animWidth * (_screen->getFontWidth() + _screen->_charWidth));
+		if ((lines - 1) <= _lineCount)
+			w -= (10 * (_screen->getFontWidth() + _screen->_charWidth));
 
 		w -= _textDimData[sdx].column;
 

Modified: scummvm/trunk/engines/kyra/text_lol.h
===================================================================
--- scummvm/trunk/engines/kyra/text_lol.h	2009-06-27 12:26:26 UTC (rev 41915)
+++ scummvm/trunk/engines/kyra/text_lol.h	2009-06-27 12:36:12 UTC (rev 41916)
@@ -40,9 +40,6 @@
 	TextDisplayer_LoL(LoLEngine *vm, Screen_LoL *screen);
 	~TextDisplayer_LoL();
 
-	void setAnimParameters(const char *str, int x, uint8 col1, uint8 col2);
-	void setAnimFlag(bool flag) { _animFlag = flag; }
-
 	void setupField(bool mode);
 	void expandField();
 
@@ -80,12 +77,6 @@
 	uint32 _numCharsLeft;
 	uint32 _numCharsPrinted;
 
-	const char *_animString;
-	int16 _animWidth;
-	uint8 _animColor1;
-	uint8 _animColor2;
-
-	bool _animFlag;
 	bool _printFlag;
 
 	LoLEngine *_vm;


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