Ticket #8181: cmi-direction-break-savegame.diff

File cmi-direction-break-savegame.diff, 1.7 KB (added by eriktorbjorn, 18 years ago)

Alternative version of patch #1 (needs new savegame version)

  • scummvm/scumm/saveload.cpp

    diff -ur ScummVM-cvs20030301/scummvm/scumm/saveload.cpp ScummVM-cvs20030301+hack/scummvm/scumm/saveload.cpp
    old new  
    243243                MKLINE(ObjectData, y_pos, sleInt16, VER_V8),
    244244                MKLINE(ObjectData, width, sleUint16, VER_V8),
    245245                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),
    247248                MKLINE(ObjectData, parentstate, sleByte, VER_V8),
    248249                MKLINE(ObjectData, parent, sleByte, VER_V8),
    249250                MKLINE(ObjectData, state, sleByte, VER_V8),
  • scummvm/scumm/saveload.h

    diff -ur ScummVM-cvs20030301/scummvm/scumm/saveload.h ScummVM-cvs20030301+hack/scummvm/scumm/saveload.h
    old new  
    3535        VER_V13,
    3636        VER_V14,
    3737        VER_V15,
    38         VER_V16
     38        VER_V16,
     39        VER_V17
    3940};
    4041
    41 #define CURRENT_VER VER_V16
     42#define CURRENT_VER VER_V17
    4243
    4344
    4445// To work around a warning in GCC 3.2 (and 3.1 ?) regarding non-POD types,
  • scummvm/scumm/scumm.h

    diff -ur ScummVM-cvs20030301/scummvm/scumm/scumm.h ScummVM-cvs20030301+hack/scummvm/scumm/scumm.h
    old new  
    8989        int16 y_pos;
    9090        uint16 width;
    9191        uint16 height;
    92         byte actordir;
     92        uint32 actordir;
    9393        byte parent;
    9494        byte parentstate;
    9595        byte state;