diff -ur ScummVM-cvs20030301/scummvm/scumm/saveload.cpp ScummVM-cvs20030301+hack/scummvm/scumm/saveload.cpp
old
|
new
|
|
243 | 243 | MKLINE(ObjectData, y_pos, sleInt16, VER_V8), |
244 | 244 | MKLINE(ObjectData, width, sleUint16, VER_V8), |
245 | 245 | MKLINE(ObjectData, height, sleUint16, VER_V8), |
246 | | MKLINE(ObjectData, actordir, sleByte, VER_V8), |
| 246 | MK_OBSOLETE(ObjectData, actordir, sleByte, VER_V8, VER_V16), |
| 247 | MKLINE(ObjectData, actordir, sleUint32, VER_V17), |
247 | 248 | MKLINE(ObjectData, parentstate, sleByte, VER_V8), |
248 | 249 | MKLINE(ObjectData, parent, sleByte, VER_V8), |
249 | 250 | MKLINE(ObjectData, state, sleByte, VER_V8), |
diff -ur ScummVM-cvs20030301/scummvm/scumm/saveload.h ScummVM-cvs20030301+hack/scummvm/scumm/saveload.h
old
|
new
|
|
35 | 35 | VER_V13, |
36 | 36 | VER_V14, |
37 | 37 | VER_V15, |
38 | | VER_V16 |
| 38 | VER_V16, |
| 39 | VER_V17 |
39 | 40 | }; |
40 | 41 | |
41 | | #define CURRENT_VER VER_V16 |
| 42 | #define CURRENT_VER VER_V17 |
42 | 43 | |
43 | 44 | |
44 | 45 | // To work around a warning in GCC 3.2 (and 3.1 ?) regarding non-POD types, |
diff -ur ScummVM-cvs20030301/scummvm/scumm/scumm.h ScummVM-cvs20030301+hack/scummvm/scumm/scumm.h
old
|
new
|
|
89 | 89 | int16 y_pos; |
90 | 90 | uint16 width; |
91 | 91 | uint16 height; |
92 | | byte actordir; |
| 92 | uint32 actordir; |
93 | 93 | byte parent; |
94 | 94 | byte parentstate; |
95 | 95 | byte state; |