[Scummvm-cvs-logs] CVS: scummvm/queen command.h,1.13,1.14 command.cpp,1.42,1.43
Gregory Montoir
cyx at users.sourceforge.net
Sun Dec 14 12:25:02 CET 2003
- Previous message: [Scummvm-cvs-logs] CVS: scummvm/sword2 interpreter.cpp,1.31,1.32 interpreter.h,1.11,1.12 logic.h,1.23,1.24 speech.cpp,1.53,1.54
- Next message: [Scummvm-cvs-logs] CVS: scummvm/scumm dialogs.cpp,1.94,1.95 dialogs.h,1.34,1.35 scumm.h,1.332,1.333 scummvm.cpp,2.503,2.504
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Update of /cvsroot/scummvm/scummvm/queen
In directory sc8-pr-cvs1:/tmp/cvs-serv13868
Modified Files:
command.h command.cpp
Log Message:
don't call Command::changeObjectState() on items
Index: command.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/queen/command.h,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -d -r1.13 -r1.14
--- command.h 13 Dec 2003 20:05:28 -0000 1.13
+++ command.h 14 Dec 2003 20:24:28 -0000 1.14
@@ -134,7 +134,7 @@
//! speak description of selected object
void lookAtSelectedObject();
- //! get the current objects under the cursor
+ //! get the current object under the cursor
void lookForCurrentObject();
//! get the current icon panel under the cursor (inventory item or verb)
Index: command.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/queen/command.cpp,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -d -r1.42 -r1.43
--- command.cpp 14 Dec 2003 14:47:00 -0000 1.42
+++ command.cpp 14 Dec 2003 20:24:29 -0000 1.43
@@ -442,7 +442,9 @@
break;
}
- changeObjectState(_state.selAction, _state.subject[0], com->song, cutDone);
+ if (_state.subject[0] > 0) {
+ changeObjectState(_state.selAction, _state.subject[0], com->song, cutDone);
+ }
// execute.c l.533-548
// FIXME: useless test, as .dog has already been played
- Previous message: [Scummvm-cvs-logs] CVS: scummvm/sword2 interpreter.cpp,1.31,1.32 interpreter.h,1.11,1.12 logic.h,1.23,1.24 speech.cpp,1.53,1.54
- Next message: [Scummvm-cvs-logs] CVS: scummvm/scumm dialogs.cpp,1.94,1.95 dialogs.h,1.34,1.35 scumm.h,1.332,1.333 scummvm.cpp,2.503,2.504
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the Scummvm-git-logs
mailing list