Ticket #8246: merge.patch

File merge.patch, 3.1 KB (added by Kirben, 17 years ago)

Merge targets

  • scumm/resource_v2.cpp

    RCS file: /cvsroot/scummvm/scummvm/scumm/resource_v2.cpp,v
    retrieving revision 1.20
    diff -u -r1.20 resource_v2.cpp
     
    2727void Scumm_v2::readClassicIndexFile() {
    2828        int i;
    2929
    30         if (_gameId == GID_MANIAC64) {
     30        _features |= GF_AFTER_V1;
     31        if (_gameId == GID_MANIAC) {
    3132                _numGlobalObjects = 800;
    3233                _numRooms = 55;
    3334                _numCostumes = 35;
    3435                _numScripts = 200;
    3536                _numSounds = 100;
    36         } else if (_gameId == GID_ZAK64) {
     37        } else if (_gameId == GID_ZAK) {
    3738                _numGlobalObjects = 775;
    3839                _numRooms = 61;
    3940                _numCostumes = 37;
  • scumm/script_v2.cpp

    RCS file: /cvsroot/scummvm/scummvm/scumm/script_v2.cpp,v
    retrieving revision 2.132
    diff -u -r2.132 script_v2.cpp
     
    12451245        _userPut = 1;
    12461246        _cursor.state = 1;
    12471247       
    1248         if (_gameId == GID_MANIAC || _gameId == GID_MANIAC64) {
     1248        if (_gameId == GID_MANIAC) {
    12491249                camera._mode = (byte) vm.cutSceneData[3];
    12501250                if (camera._mode == CM_FOLLOW_ACTOR) {
    12511251                        actorFollowCamera(VAR(VAR_EGO));
  • scumm/scumm.h

    RCS file: /cvsroot/scummvm/scummvm/scumm/scumm.h,v
    retrieving revision 1.243
    diff -u -r1.243 scumm.h
     
    182182        GID_CMI,
    183183        GID_MANIAC,
    184184        GID_ZAK,
    185         GID_MANIAC64,
    186         GID_ZAK64,
    187185        GID_PUTTDEMO
    188186};
    189187
  • scumm/scummvm.cpp

    RCS file: /cvsroot/scummvm/scummvm/scumm/scummvm.cpp,v
    retrieving revision 2.218
    diff -u -r2.218 scummvm.cpp
     
    8484extern uint16 _debugLevel;
    8585
    8686static const VersionSettings scumm_settings[] = {
    87         /* Scumm Version 1 */
    88         {"maniac64",      "Maniac Mansion (C64)", GID_MANIAC64, 1, 0, 0,
    89          GF_AFTER_V1 | GF_AFTER_V2 | GF_SMALL_HEADER | GF_USE_KEY | GF_SMALL_NAMES | GF_16COLOR | GF_OLD_BUNDLE | GF_NO_SCALLING, "00.LFL"},
    90         {"zak64",         "Zak McKracken and the Alien Mindbenders (C64)", GID_ZAK64, 1, 0, 0,
    91          GF_AFTER_V1 | GF_AFTER_V2 | GF_SMALL_HEADER | GF_USE_KEY | GF_SMALL_NAMES | GF_16COLOR | GF_OLD_BUNDLE | GF_NO_SCALLING, "00.LFL"},
    92 
    93         /* Scumm Version 2 */
     87        /* Scumm Version 1/2 */
    9488        {"maniac", "Maniac Mansion", GID_MANIAC, 2, 0, 0,
    9589         GF_AFTER_V2 | GF_SMALL_HEADER | GF_USE_KEY | GF_SMALL_NAMES | GF_16COLOR | GF_OLD_BUNDLE | GF_NO_SCALLING, "00.LFL"},
    9690        {"zak",         "Zak McKracken and the Alien Mindbenders",      GID_ZAK,     2, 0, 0,
     
    24402434                _numActors = 80;
    24412435        else if ((_features & GF_AFTER_V7) || (_gameId == GID_SAMNMAX))
    24422436                _numActors = 30;
    2443         else if (_gameId == GID_MANIAC || _gameId == GID_MANIAC64)
     2437        else if (_gameId == GID_MANIAC)
    24442438                _numActors = 25;
    24452439        else
    24462440                _numActors = 13;