Ticket #8648: Simplify_AGIPAL.diff

File Simplify_AGIPAL.diff, 8.1 KB (added by SF/mthreepwood, 17 years ago)

Patch for removing GF_AGIPAL Flag

  • agi.h

     
    107107        GF_AGDS =        (1 << 1),
    108108        GF_AGI256 =      (1 << 2),
    109109        GF_AGI256_2 =    (1 << 3),
    110         GF_AGIPAL =      (1 << 4),
    111         GF_MACGOLDRUSH = (1 << 5),
    112         GF_FANMADE =     (1 << 6),
    113         GF_ESC_MENU =    (1 << 7),
    114         GF_MANHUNTER =   (1 << 8),
    115         GF_SQ1 =         (1 << 9)
     110        GF_MACGOLDRUSH = (1 << 4),
     111        GF_FANMADE =     (1 << 5),
     112        GF_ESC_MENU =    (1 << 6),
     113        GF_MANHUNTER =   (1 << 7),
     114        GF_SQ1 =         (1 << 8)
    116115};
    117116
    118117struct AGIGameDescription;

  • cycle.cpp

     
    305305        if (getFeatures() & GF_AGIMOUSE)
    306306                report("Using AGI Mouse 1.0 protocol\n");
    307307
    308         if (getFeatures() & GF_AGIPAL)
    309                 debug(1, "Running AGIPAL game");
    310 
    311308        report("Running AGI script.\n");
    312309
    313310        setflag(fEnteredCli, false);

  • detection.cpp

     
    15101510        FANMADE("AGI Mouse Demo 0.60 demo 2", "cc49d8b88ed6faf4f53ce92c84e0fe1b"),
    15111511        FANMADE("AGI Mouse Demo 0.70", "3497c291e4afb6f758e61740678a2aec"),
    15121512        FANMADE_F("AGI Mouse Demo 1.00", "20397f0bf0ef936f416bb321fb768fc7", GF_AGIMOUSE),
    1513         FANMADE_F("AGI Mouse Demo 1.10", "f4ad396b496d6167635ad0b410312ab8", GF_AGIMOUSE|GF_AGIPAL),
     1513        FANMADE_F("AGI Mouse Demo 1.10", "f4ad396b496d6167635ad0b410312ab8", GF_AGIMOUSE),
    15141514        FANMADE("AGI Piano (v1.0)", "8778b3d89eb93c1d50a70ef06ef10310"),
    15151515        FANMADE("AGI Quest (v1.46-TJ0)", "1cf1a5307c1a0a405f5039354f679814"),
    15161516        FANMADE_I("tetris", "", "7a874e2db2162e7a4ce31c9130248d8a"),
    15171517        FANMADE_V("AGI Trek (Demo)", "c02882b8a8245b629c91caf7eb78eafe", 0x2440),
    15181518        FANMADE("AGI256 Demo", "79261ac143b2e2773b2753674733b0d5"),
    15191519        FANMADE("AGI256-2 Demo", "3cad9b3aff1467cebf0c5c5b110985c5"),
    1520         FANMADE_LF("Abrah: L'orphelin de l'espace (v1.2)", "b7b6d1539e14d5a26fa3088288e1badc", Common::FR_FRA, GF_AGIPAL),
     1520        FANMADE_L("Abrah: L'orphelin de l'espace (v1.2)", "b7b6d1539e14d5a26fa3088288e1badc", Common::FR_FRA),
    15211521        FANMADE("Acidopolis", "7017db1a4b726d0d59e65e9020f7d9f7"),
    15221522        FANMADE("Agent 0055 (v1.0)", "c2b34a0c77acb05482781dda32895f24"),
    15231523        FANMADE("Agent 06 vs. The Super Nazi", "136f89ca9f117c617e88a85119777529"),
    … …  
    15461546        FANMADE("Coco Coq (English) - Coco Coq In Grostesteing's Base (v.1.0.3)", "97631f8e710544a58bd6da9e780f9320"),
    15471547        FANMADE_L("Coco Coq (French) - Coco Coq Dans la Base de Grostesteing (v1.0.2)", "ef579ebccfe5e356f9a557eb3b2d8649", Common::FR_FRA),
    15481548        FANMADE("Corby's Murder Mystery (v1.0)", "4ebe62ac24c5a8c7b7898c8eb070efe5"),
    1549         FANMADE_F("DG: The AGIMouse Adventure (English v1.1)", "efe453b92bc1487ea69fbebede4d5f26", GF_AGIMOUSE|GF_AGIPAL),
    1550         FANMADE_LF("DG: The AGIMouse Adventure (French v1.1)", "eb3d17ca466d672cbb95947e8d6e846a", Common::FR_FRA, GF_AGIMOUSE|GF_AGIPAL),
     1549        FANMADE_F("DG: The AGIMouse Adventure (English v1.1)", "efe453b92bc1487ea69fbebede4d5f26", GF_AGIMOUSE),
     1550        FANMADE_LF("DG: The AGIMouse Adventure (French v1.1)", "eb3d17ca466d672cbb95947e8d6e846a", Common::FR_FRA, GF_AGIMOUSE),
    15511551        FANMADE("DG: The Adventure Game (English v1.1)", "0d6376d493fa7a21ec4da1a063e12b25"),
    15521552        FANMADE_L("DG: The Adventure Game (French v1.1)", "258bdb3bb8e61c92b71f2f456cc69e23", Common::FR_FRA),
    15531553        FANMADE("Dashiki (16 Colors)", "9b2c7b9b0283ab9f12bedc0cb6770a07"),
    … …  
    16081608        FANMADE("Jiggy Jiggy Uh! Uh!", "bc331588a71e7a1c8840f6cc9b9487e4"),
    16091609        FANMADE("Jimmy In: The Alien Attack (v0.1)", "a4e9db0564a494728de7873684a4307c"),
    16101610        FANMADE("Joe McMuffin In \"What's Cooking, Doc\" (v1.0)", "8a3de7e61a99cb605fa6d233dd91c8e1"),
    1611         FANMADE_LFV("Jolimie, le Village Maudit (v0.5)", "21818501636b3cb8ad5de5c1a66de5c2", Common::FR_FRA, GF_AGIMOUSE|GF_AGIPAL, 0x2936),
    1612         FANMADE_LFV("Jolimie, le Village Maudit (v1.1)", "68d7aef1161bb5972fe03efdf29ccb7f", Common::FR_FRA, GF_AGIMOUSE|GF_AGIPAL, 0x2936),
     1611        FANMADE_LFV("Jolimie, le Village Maudit (v0.5)", "21818501636b3cb8ad5de5c1a66de5c2", Common::FR_FRA, GF_AGIMOUSE, 0x2936),
     1612        FANMADE_LFV("Jolimie, le Village Maudit (v1.1)", "68d7aef1161bb5972fe03efdf29ccb7f", Common::FR_FRA, GF_AGIMOUSE, 0x2936),
    16131613        FANMADE("Journey Of Chef", "aa0a0b5a6364801ae65fdb96d6741df5"),
    16141614        FANMADE("Jukebox (v1.0)", "c4b9c5528cc67f6ba777033830de7751"),
    16151615        FANMADE("Justin Quest (v1.0 in development)", "103050989da7e0ffdc1c5e1793a4e1ec"),
    … …  
    16281628        FANMADE("Naturette 1 (English v1.2)", "0a75884e7f010974a230bdf269651117"),
    16291629        FANMADE("Naturette 1 (English v1.3)", "f15bbf999ac55ebd404aa1eb84f7c1d9"),
    16301630        FANMADE_L("Naturette 1 (French v1.2)", "d3665622cc41aeb9c7ecf4fa43f20e53", Common::FR_FRA),
    1631         FANMADE_F("Naturette 2: Daughter of the Moon (v1.0)", "bdf76a45621c7f56d1c9d40292c6137a", GF_AGIMOUSE|GF_AGIPAL),
     1631        FANMADE_F("Naturette 2: Daughter of the Moon (v1.0)", "bdf76a45621c7f56d1c9d40292c6137a", GF_AGIMOUSE),
    16321632        FANMADE_F("Naturette 3: Adventure in Treeworld (v1.0a)", "6dbb0e7fc75fec442e6d9e5a06f1530e", GF_AGIMOUSE),
    16331633        FANMADE_F("Naturette 4: From a Planet to Another Planet (Not Finished)", "13be8cd9cf35aeff0a39b8757057fbc8", GF_AGIMOUSE),
    16341634        FANMADE("New AGI Hangman Test", "d69c0e9050ccc29fd662b74d9fc73a15"),
    16351635        FANMADE("Nick's Quest - In Pursuit of QuakeMovie (v2.1 Gold)", "e29cbf9222551aee40397fabc83eeca0"),
    1636         FANMADE_F("Open Mic Night (v0.1)", "70000a2f67aac27d1133d019df70246d", GF_AGIMOUSE|GF_AGIPAL),
     1636        FANMADE_F("Open Mic Night (v0.1)", "70000a2f67aac27d1133d019df70246d", GF_AGIMOUSE),
    16371637        FANMADE("Operation: Recon", "0679ce8405411866ccffc8a6743370d0"),
    16381638        FANMADE("Patrick's Quest (Demo v1.0)", "f254f5b894b98fec5f92acc07fb62841"),
    16391639        FANMADE("Phantasmagoria", "87d20c1c11aee99a4baad3797b63146b"),
    … …  
    16761676        FANMADE("Save Santa (v1.0)", "4644f6beb5802081772f14be56ae196c"),
    16771677        FANMADE("Save Santa (v1.3)", "f8afdb6efc5af5e7c0228b44633066af"),
    16781678        FANMADE("Schiller", "ade39dea968c959cfebe1cf935d653e9"),
    1679         FANMADE_IF("serguei1", "(v1.0)", "b86725f067e456e10cdbdf5f58e01dec", GF_AGIMOUSE|GF_AGIPAL),
    1680         FANMADE_IF("serguei1", "v1.1 2002 Sep 5", "91975c1fb4b13b0f9a8e9ff74731030d", GF_AGIMOUSE|GF_AGIPAL),
    1681         FANMADE_IF("serguei1", "v1.1 2003 Apr 10", "91975c1fb4b13b0f9a8e9ff74731030d", GF_AGIMOUSE|GF_AGIPAL),
     1679        FANMADE_IF("serguei1", "(v1.0)", "b86725f067e456e10cdbdf5f58e01dec", GF_AGIMOUSE),
     1680        FANMADE_IF("serguei1", "v1.1 2002 Sep 5", "91975c1fb4b13b0f9a8e9ff74731030d", GF_AGIMOUSE),
     1681        FANMADE_IF("serguei1", "v1.1 2003 Apr 10", "91975c1fb4b13b0f9a8e9ff74731030d", GF_AGIMOUSE),
    16821682        FANMADE_IF("serguei2", "v0.1.1 Demo", "906ccbc2ddedb29b63141acc6d10cd28", GF_AGIMOUSE),
    16831683        FANMADE("Shifty (v1.0)", "2a07984d27b938364bf6bd243ac75080"),
    16841684        FANMADE_F("Sliding Tile Game (v1.00)", "949bfff5d8a81c3139152eed4d84ca75", GF_AGIMOUSE),
    … …  
    16941694        FANMADE("Speeder Bike Challenge (v1.0)", "2deb25bab379285ca955df398d96c1e7"),
    16951695        FANMADE("Star Commander 1 - The Escape (v1.0)", "a7806f01e6fa14ebc029faa58f263750"),
    16961696        FANMADE("Star Pilot: Bigger Fish", "8cb26f8e1c045b75c6576c839d4a0172"),
    1697         FANMADE_F("Street Quest (Demo)", "cf2aa94a7eb78dce6892c37f03e310d6", GF_AGIPAL),
     1697        FANMADE("Street Quest (Demo)", "cf2aa94a7eb78dce6892c37f03e310d6"),
    16981698        FANMADE("Tales of the Tiki", "8103c9c87e3964690a14a3d0d83f7ddc"),
    16991699        FANMADE("Tex McPhilip 1 - Quest For The Papacy", "3c74b9a24b51aa8020ac82bee3132266"),
    17001700        FANMADE("Tex McPhilip 2 - Road To Divinity (v1.5)", "7387e8df854440bc26620ca0ea43af9a"),

  • graphics.cpp

     
    392392        char filename[15];
    393393        sprintf(filename, "pal.%d", p0);
    394394
     395        if (!Common::File::exists(filename))
     396                return;
     397
    395398        Common::File agipal;
    396399        if (!agipal.open(filename))
    397400                error("Couldn't open AGIPAL palette file '%s'", filename);

  • op_cmd.cpp

     
    12301230        /* AGIPAL uses shake.screen values between 101 and 109 to
    12311231         * set the palette.
    12321232         */
    1233         if ((g_agi->getFeatures() & GF_AGIPAL) && p0 >= 101 && p0 < 110) {
     1233        if (p0 >= 101 && p0 < 110) {
    12341234                g_gfx->setAGIPal(p0);
    12351235                return;
    12361236        }