[Scummvm-cvs-logs] CVS: scummvm/scumm object.cpp,1.234,1.235 scumm.cpp,1.467,1.468 scumm.h,1.605,1.606
kirben
kirben at users.sourceforge.net
Wed Apr 27 07:33:03 CEST 2005
- Previous message: [Scummvm-cvs-logs] CVS: scummvm/scumm intern.h,2.465,2.466 script_v100he.cpp,2.137,2.138 script_v72he.cpp,2.274,2.275 script_v80he.cpp,2.102,2.103 script_v90he.cpp,2.239,2.240
- Next message: [Scummvm-cvs-logs] CVS: scummvm/scumm script_v100he.cpp,2.138,2.139 script_v72he.cpp,2.275,2.276 script_v80he.cpp,2.103,2.104
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Update of /cvsroot/scummvm/scummvm/scumm
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv8507/scumm
Modified Files:
object.cpp scumm.cpp scumm.h
Log Message:
Rename function.
Index: object.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/object.cpp,v
retrieving revision 1.234
retrieving revision 1.235
diff -u -d -r1.234 -r1.235
--- object.cpp 25 Apr 2005 03:45:37 -0000 1.234
+++ object.cpp 27 Apr 2005 14:30:20 -0000 1.235
@@ -815,7 +815,7 @@
od->fl_object_index = 0;
}
-void ScummEngine::fixObjectFlags() {
+void ScummEngine::updateObjectStates() {
int i;
ObjectData *od = &_objs[1];
for (i = 1; i < _numLocalObjects; i++, od++) {
Index: scumm.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/scumm.cpp,v
retrieving revision 1.467
retrieving revision 1.468
diff -u -d -r1.467 -r1.468
--- scumm.cpp 27 Apr 2005 05:05:09 -0000 1.467
+++ scumm.cpp 27 Apr 2005 14:30:21 -0000 1.468
@@ -2088,7 +2088,7 @@
} else {
walkActors();
moveCamera();
- fixObjectFlags();
+ updateObjectStates();
if (_version > 3)
CHARSET_1();
Index: scumm.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/scumm.h,v
retrieving revision 1.605
retrieving revision 1.606
diff -u -d -r1.605 -r1.606
--- scumm.h 27 Apr 2005 07:57:28 -0000 1.605
+++ scumm.h 27 Apr 2005 14:30:32 -0000 1.606
@@ -744,7 +744,7 @@
int findFlObjectSlot();
int findLocalObjectSlot();
void addObjectToInventory(uint obj, uint room);
- void fixObjectFlags();
+ void updateObjectStates();
public:
bool getClass(int obj, int cls) const; // Used in actor.cpp, hence public
protected:
- Previous message: [Scummvm-cvs-logs] CVS: scummvm/scumm intern.h,2.465,2.466 script_v100he.cpp,2.137,2.138 script_v72he.cpp,2.274,2.275 script_v80he.cpp,2.102,2.103 script_v90he.cpp,2.239,2.240
- Next message: [Scummvm-cvs-logs] CVS: scummvm/scumm script_v100he.cpp,2.138,2.139 script_v72he.cpp,2.275,2.276 script_v80he.cpp,2.103,2.104
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the Scummvm-git-logs
mailing list