fiddlerwoaroof/crawl - Change 4Q5OYUKF2SGF7WHMIVYFZVXXDCFUCYY534VLOGKWYRSPYKRXMVDAC

Jellies now resist acid spit (adapted jlewis' patch).

On Windows and DOS, prompt for a newline after printing an error message and exiting, since users on those systems seem to run executables by double-clicking on them, and cannot see error messages because the console disappears when the game exits.

git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@1198 c06c8d41-db1a-0410-9941-cceddc491573

Created by dshaligram on April 3, 2007

4Q5OYUKF2SGF7WHMIVYFZVXXDCFUCYY534VLOGKWYRSPYKRXMVDAC

Dependencies

In channels

main

Change contents

Insertion in crawl-ref/source/stuff.cc at line 378 [4.224557]

[3.725]

    }
#if defined(WIN32CONSOLE) || defined(DOS)
    if (exit_code)
    {
        fprintf(stderr, "Hit Enter to continue...\n");
        getchar();

Insertion in crawl-ref/source/stuff.cc at line 386 [4.224557]
[3.731]
[3.731]
```
#endif
```
Replacement in crawl-ref/source/mon-util.h at line 274 [4.1682293]
B:BD[5.463959] → [5.463959:463960]
[5.463959]
[5.463960]
```
int mons_res_acid( const monsters *mon );
```

Insertion in crawl-ref/source/mon-util.cc at line 797 [4.1699344]

[5.472278]

}
int mons_res_acid( const monsters *mon )
{
    const unsigned long f = get_mons_resists(mon);
    return ((f & MR_RES_ACID) != 0);

Replacement in crawl-ref/source/mon-util.cc at line 809 [4.1699344]
B:BD[4.1711149] → [5.472325:472367]
```
    int u = 0, f = get_mons_resists(mon);
```
[4.1711149]
[4.1711199]
```
    unsigned long u = 0, f = get_mons_resists(mon);
```
Replacement in crawl-ref/source/mon-data.h at line 559 [4.1826214]
∅:D[2.12203] → [5.496790:496825]
B:BD[5.496790] → [5.496790:496825]
```
    MR_RES_POISON | MR_RES_ASPHYX,
```
[2.12203]
[5.496825]
```
    MR_RES_POISON | MR_RES_ASPHYX | MR_RES_ACID,
```
Replacement in crawl-ref/source/mon-data.h at line 2879 [4.1826214]
∅:D[2.18858] → [5.519738:519773]
B:BD[5.519738] → [5.519738:519773]
```
    MR_RES_POISON | MR_RES_ASPHYX,
```
[2.18858]
[5.519773]
```
    MR_RES_POISON | MR_RES_ASPHYX | MR_RES_ACID,
```

Replacement in crawl-ref/source/mon-data.h at line 2891 [4.1826214]

B:BD[5.519863] → [5.519863:519940]

    MR_RES_POISON | MR_RES_COLD | MR_VUL_FIRE | MR_RES_ELEC | MR_RES_ASPHYX,

[5.519863]

[5.519940]

    MR_RES_POISON | MR_RES_COLD | MR_VUL_FIRE | MR_RES_ELEC | MR_RES_ASPHYX
         | MR_RES_ACID,

Replacement in crawl-ref/source/mon-data.h at line 2904 [4.1826214]
B:BD[5.520040] → [5.520040:520089]
```
    MR_RES_POISON | MR_RES_COLD | MR_RES_ASPHYX,
```
[5.520040]
[5.520089]
```
    MR_RES_POISON | MR_RES_COLD | MR_RES_ASPHYX | MR_RES_ACID,
```
Replacement in crawl-ref/source/mon-data.h at line 2916 [4.1826214]
∅:D[2.19036] → [5.520198:520233]
B:BD[5.520198] → [5.520198:520233]
```
    MR_RES_POISON | MR_RES_ASPHYX,
```
[2.19036]
[5.520233]
```
    MR_RES_POISON | MR_RES_ASPHYX | MR_RES_ACID,
```
Replacement in crawl-ref/source/mon-data.h at line 2928 [4.1826214]
∅:D[2.19122] → [5.520322:520357]
B:BD[5.520322] → [5.520322:520357]
```
    MR_RES_POISON | MR_RES_ASPHYX,
```
[2.19122]
[5.520357]
```
    MR_RES_POISON | MR_RES_ASPHYX | MR_RES_ACID,
```
Replacement in crawl-ref/source/mon-data.h at line 3397 [4.1826214]
B:BD[5.525935] → [5.525935:525970]
```
    MR_RES_POISON | MR_RES_ASPHYX,
```
[5.525935]
[5.525970]
```
    MR_RES_POISON | MR_RES_ASPHYX | MR_RES_ACID,
```
Insertion in crawl-ref/source/enum.h at line 1811 [4.3287960]
[5.920637]
[5.920637]
```
// now saved in an unsigned long.
```
Insertion in crawl-ref/source/enum.h at line 1827 [4.3287960]
[5.921137]
[5.921137]
```
    MR_RES_ACID          = (1<< 6),
```

Replacement in crawl-ref/source/enum.h at line 1830 [4.3287960]

B:BD[5.921161] → [5.921161:921305]

    MR_VUL_ELEC          = (1<< 6),
    MR_VUL_POISON        = (1<< 7),
    MR_VUL_FIRE          = (1<< 8),
    MR_VUL_COLD          = (1<< 9),

[5.921161]

[5.921305]

    MR_VUL_ELEC          = (1<< 7),
    MR_VUL_POISON        = (1<< 8),
    MR_VUL_FIRE          = (1<< 9),
    MR_VUL_COLD          = (1<<10),

Replacement in crawl-ref/source/enum.h at line 1837 [4.3287960]

B:BD[5.921414] → [5.921414:921522]

    MR_RES_PIERCE        = (1<<10),
    MR_RES_SLICE         = (1<<11),
    MR_RES_BLUDGEON      = (1<<12),

[5.921414]

[5.921522]

    MR_RES_PIERCE        = (1<<11),
    MR_RES_SLICE         = (1<<12),
    MR_RES_BLUDGEON      = (1<<13),

Replacement in crawl-ref/source/enum.h at line 1841 [4.3287960]

B:BD[5.921523] → [5.921523:921630]

    MR_VUL_PIERCE        = (1<<13),
    MR_VUL_SLICE         = (1<<14),
    MR_VUL_BLUDGEON      = (1<<15)

[5.921523]

[4.3329920]

    MR_VUL_PIERCE        = (1<<14),
    MR_VUL_SLICE         = (1<<15),
    MR_VUL_BLUDGEON      = (1<<16)

Insertion in crawl-ref/source/beam.cc at line 1575 [4.4128068]

[4.4181851]

    case BEAM_ACID:
        if (mons_res_acid(monster))
        {
            if (doFlavouredEffects)
                simple_monster_message(monster, " appears unharmed.");

Insertion in crawl-ref/source/beam.cc at line 1581 [4.4128068]
[4.4181852]
[4.4181852]
```
            hurted = 0;
        }
        break;
```

Jellies now resist acid spit (adapted jlewis' patch).

Dependencies

In channels

Change contents

Insertion in crawl-ref/source/stuff.cc at line 378 [4.224557]

Insertion in crawl-ref/source/stuff.cc at line 386 [4.224557]

Replacement in crawl-ref/source/mon-util.h at line 274 [4.1682293]

Insertion in crawl-ref/source/mon-util.cc at line 797 [4.1699344]

Replacement in crawl-ref/source/mon-util.cc at line 809 [4.1699344]

Replacement in crawl-ref/source/mon-data.h at line 559 [4.1826214]

Replacement in crawl-ref/source/mon-data.h at line 2879 [4.1826214]

Replacement in crawl-ref/source/mon-data.h at line 2891 [4.1826214]

Replacement in crawl-ref/source/mon-data.h at line 2904 [4.1826214]

Replacement in crawl-ref/source/mon-data.h at line 2916 [4.1826214]

Replacement in crawl-ref/source/mon-data.h at line 2928 [4.1826214]

Replacement in crawl-ref/source/mon-data.h at line 3397 [4.1826214]

Insertion in crawl-ref/source/enum.h at line 1811 [4.3287960]

Insertion in crawl-ref/source/enum.h at line 1827 [4.3287960]

Replacement in crawl-ref/source/enum.h at line 1830 [4.3287960]

Replacement in crawl-ref/source/enum.h at line 1837 [4.3287960]

Replacement in crawl-ref/source/enum.h at line 1841 [4.3287960]

Insertion in crawl-ref/source/beam.cc at line 1575 [4.4128068]

Insertion in crawl-ref/source/beam.cc at line 1581 [4.4128068]