[Scummvm-cvs-logs] SF.net SVN: scummvm:[39233] scummvm/trunk/engines/agos/verb.cpp
Kirben at users.sourceforge.net
Kirben at users.sourceforge.net
Sun Mar 8 15:39:08 CET 2009
Revision: 39233
http://scummvm.svn.sourceforge.net/scummvm/?rev=39233&view=rev
Author: Kirben
Date: 2009-03-08 14:39:04 +0000 (Sun, 08 Mar 2009)
Log Message:
-----------
Correct more errors in hitBox8().
Modified Paths:
--------------
scummvm/trunk/engines/agos/verb.cpp
Modified: scummvm/trunk/engines/agos/verb.cpp
===================================================================
--- scummvm/trunk/engines/agos/verb.cpp 2009-03-08 14:37:41 UTC (rev 39232)
+++ scummvm/trunk/engines/agos/verb.cpp 2009-03-08 14:39:04 UTC (rev 39233)
@@ -1119,8 +1119,8 @@
hitBox5(ha);
else if (ha->flags & kOBFRoomBox)
hitBox6(ha);
- } else if (_videoLockOut & 10) {
- hitBox8(ha);
+ else if (_videoLockOut & 10)
+ hitBox8(ha);
}
} else {
_hitCalled = 0;
@@ -1229,12 +1229,12 @@
}
void AGOSEngine_PN::hitBox8(HitArea *ha) {
- char *msgPtr;
+ char *msgPtr, *tmpPtr;
if (_intputCounter || _mouseString)
return;
- if (ha == 0 || _dragStore == ha)
+ if (_dragStore == ha)
return;
uint16 num = ha->msg1 & ~0x8000;
@@ -1246,16 +1246,8 @@
_mouseString1 = _inMessage;
msgPtr = getMessage(_objectName1, _dragStore->msg1);
-
- char *tmpPtr = _placeMessage;
- while (*msgPtr != 0) {
- if (*msgPtr != 13)
- *tmpPtr++ = *msgPtr;
- msgPtr++;
- }
- *tmpPtr = 0;
-
- sprintf(_placeMessage, "put %s", _placeMessage);
+ *(tmpPtr = strchr(msgPtr, 13)) = 0;
+ sprintf(_placeMessage, "put %s", msgPtr);
_mouseString = _placeMessage;
}
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