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

peres001 at users.sourceforge.net peres001 at users.sourceforge.net
Sun Mar 18 10:09:10 CET 2007


Revision: 26194
          http://scummvm.svn.sourceforge.net/scummvm/?rev=26194&view=rev
Author:   peres001
Date:     2007-03-18 02:09:02 -0700 (Sun, 18 Mar 2007)

Log Message:
-----------
more formatting

Modified Paths:
--------------
    scummvm/trunk/engines/parallaction/dialogue.cpp

Modified: scummvm/trunk/engines/parallaction/dialogue.cpp
===================================================================
--- scummvm/trunk/engines/parallaction/dialogue.cpp	2007-03-18 09:06:22 UTC (rev 26193)
+++ scummvm/trunk/engines/parallaction/dialogue.cpp	2007-03-18 09:09:02 UTC (rev 26194)
@@ -470,26 +470,10 @@
 	_answerBalloonY[i] = 2000;
 
 	if (numAvailableAnswers == 1) {
-
-		_vm->_gfx->displayWrappedString(
-			q->_answers[_di],
-			_answerBalloonX[_di],
-			_answerBalloonY[_di],
-			MAX_BALLOON_WIDTH,
-			0
-		);
-
+		_vm->_gfx->displayWrappedString(q->_answers[_di], _answerBalloonX[_di], _answerBalloonY[_di], MAX_BALLOON_WIDTH, 0);
 		cnv->_data0 = _vm->_char._talk._array[q->_answer_moods[_di] & 0xF];
 //		cnv->_data1 = _vm->_char._talk.field_8[q->_answer_moods[_di] & 0xF];
-
-		_vm->_gfx->flatBlitCnv(
-			cnv,
-			ANSWER_CHARACTER_X,
-			ANSWER_CHARACTER_Y,
-			Gfx::kBitFront,
-			cnv->_data1
-		);
-
+		_vm->_gfx->flatBlitCnv(cnv, ANSWER_CHARACTER_X,	ANSWER_CHARACTER_Y, Gfx::kBitFront,	cnv->_data1);
 		waitUntilLeftClick();
 		return _di;
 	}
@@ -503,39 +487,16 @@
 		_si = getHoverAnswer(_mousePos._x, _mousePos._y, q);
 
 		if (_si != v2) {
-			if (v2 != -1) {
-				_vm->_gfx->displayWrappedString(
-					q->_answers[v2],
-					_answerBalloonX[v2],
-					_answerBalloonY[v2],
-					MAX_BALLOON_WIDTH,
-					3
-				);
-			}
+			if (v2 != -1)
+				_vm->_gfx->displayWrappedString(q->_answers[v2], _answerBalloonX[v2], _answerBalloonY[v2], MAX_BALLOON_WIDTH, 3);
 
-			_vm->_gfx->displayWrappedString(
-				q->_answers[_si],
-				_answerBalloonX[_si],
-				_answerBalloonY[_si],
-				MAX_BALLOON_WIDTH,
-				0
-			);
-
+			_vm->_gfx->displayWrappedString(q->_answers[_si], _answerBalloonX[_si],	_answerBalloonY[_si], MAX_BALLOON_WIDTH, 0);
 			cnv->_data0 = _vm->_char._talk._array[q->_answer_moods[_si] & 0xF];
 //			cnv->_data1 = _vm->_char._talk.field_8[q->_answer_moods[_si] & 0xF];
-
-			_vm->_gfx->flatBlitCnv(
-				cnv,
-				ANSWER_CHARACTER_X,
-				ANSWER_CHARACTER_Y,
-				Gfx::kBitFront,
-				cnv->_data1
-			);
-
+			_vm->_gfx->flatBlitCnv(cnv, ANSWER_CHARACTER_X, ANSWER_CHARACTER_Y, Gfx::kBitFront, cnv->_data1);
 		}
 
 		g_system->delayMillis(30);
-
 		v2 = _si;
 	}
 


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