diff options
| author | Matthew Hoops | 2012-09-12 20:18:13 -0400 |
|---|---|---|
| committer | Matthew Hoops | 2012-09-12 20:18:13 -0400 |
| commit | d5ed8b1901b88e361a2a420a9daf586f6089a36b (patch) | |
| tree | d19e4dd7baf33b7447d69d8ad8d3c25732a69698 /engines/cine/object.cpp | |
| parent | ff51a7661d7a2cb296b987edfc3d81727160e627 (diff) | |
| parent | 8808393b3a3428df2946d7967e52aba084c8ffe5 (diff) | |
| download | scummvm-rg350-d5ed8b1901b88e361a2a420a9daf586f6089a36b.tar.gz scummvm-rg350-d5ed8b1901b88e361a2a420a9daf586f6089a36b.tar.bz2 scummvm-rg350-d5ed8b1901b88e361a2a420a9daf586f6089a36b.zip | |
Merge remote branch 'upstream/master' into pegasus
Conflicts:
AUTHORS
Diffstat (limited to 'engines/cine/object.cpp')
| -rw-r--r-- | engines/cine/object.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/engines/cine/object.cpp b/engines/cine/object.cpp index afd95c04b0..a75828abb1 100644 --- a/engines/cine/object.cpp +++ b/engines/cine/object.cpp @@ -59,7 +59,7 @@ void loadObject(char *pObjectName) { assert(numEntry <= NUM_MAX_OBJECT); for (i = 0; i < numEntry; i++) { - if (g_cine->_objectTable[i].costume != -2 && g_cine->_objectTable[i].costume != -3) { // flag is keep ? + if (g_cine->_objectTable[i].costume != -2 && g_cine->_objectTable[i].costume != -3) { // flag is keep? Common::MemoryReadStream readS(ptr, entrySize); g_cine->_objectTable[i].x = readS.readSint16BE(); |