[Scummvm-cvs-logs] SF.net SVN: scummvm:[55515] scummvm/trunk/engines/gob

drmccoy at users.sourceforge.net drmccoy at users.sourceforge.net
Tue Jan 25 03:50:57 CET 2011


Revision: 55515
          http://scummvm.svn.sourceforge.net/scummvm/?rev=55515&view=rev
Author:   drmccoy
Date:     2011-01-25 02:50:56 +0000 (Tue, 25 Jan 2011)

Log Message:
-----------
GOB: o7_draw0x44 is o7_displayWarning

Modified Paths:
--------------
    scummvm/trunk/engines/gob/inter.h
    scummvm/trunk/engines/gob/inter_v7.cpp

Modified: scummvm/trunk/engines/gob/inter.h
===================================================================
--- scummvm/trunk/engines/gob/inter.h	2011-01-25 02:50:26 UTC (rev 55514)
+++ scummvm/trunk/engines/gob/inter.h	2011-01-25 02:50:56 UTC (rev 55515)
@@ -595,7 +595,7 @@
 
 	void o7_draw0x0C();
 	void o7_draw0x0D();
-	void o7_draw0x44();
+	void o7_displayWarning();
 	void o7_draw0x45();
 	void o7_draw0x57();
 	void o7_draw0x89();

Modified: scummvm/trunk/engines/gob/inter_v7.cpp
===================================================================
--- scummvm/trunk/engines/gob/inter_v7.cpp	2011-01-25 02:50:26 UTC (rev 55514)
+++ scummvm/trunk/engines/gob/inter_v7.cpp	2011-01-25 02:50:56 UTC (rev 55515)
@@ -46,7 +46,7 @@
 
 	OPCODEDRAW(0x0C, o7_draw0x0C);
 	OPCODEDRAW(0x0D, o7_draw0x0D);
-	OPCODEDRAW(0x44, o7_draw0x44);
+	OPCODEDRAW(0x44, o7_displayWarning);
 	OPCODEDRAW(0x45, o7_draw0x45);
 	OPCODEDRAW(0x57, o7_draw0x57);
 	OPCODEDRAW(0x89, o7_draw0x89);
@@ -83,20 +83,19 @@
 	warning("Addy Stub Draw 0x0D: \"%s\", %d", str0.c_str(), expr0);
 }
 
-void Inter_v7::o7_draw0x44() {
+void Inter_v7::o7_displayWarning() {
 	_vm->_game->_script->evalExpr(0);
-	Common::String str0 = _vm->_game->_script->getResultStr();
+	Common::String caption = _vm->_game->_script->getResultStr();
 	_vm->_game->_script->evalExpr(0);
-	Common::String str1 = _vm->_game->_script->getResultStr();
+	Common::String text = _vm->_game->_script->getResultStr();
 	_vm->_game->_script->evalExpr(0);
-	Common::String str2 = _vm->_game->_script->getResultStr();
+	Common::String source = _vm->_game->_script->getResultStr();
 	_vm->_game->_script->evalExpr(0);
-	Common::String str3 = _vm->_game->_script->getResultStr();
+	Common::String msg =  _vm->_game->_script->getResultStr();
 	_vm->_game->_script->evalExpr(0);
-	Common::String str4 = _vm->_game->_script->getResultStr();
+	Common::String param = _vm->_game->_script->getResultStr();
 
-	warning("Addy Stub Draw 0x44: \"%s\", \"%s\", \"%s\", \"%s\", \"%s\"",
-			str0.c_str(), str1.c_str(), str2.c_str(), str3.c_str(), str4.c_str());
+	warning("%s: %s (%s)", source.c_str(), msg.c_str(), param.c_str());
 }
 
 void Inter_v7::o7_draw0x45() {


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