fiddlerwoaroof/crawl - Change O2A7I25VYURCVDZEGRMFCP6X6DEYT4EB3TZESZSDCDDJE2U7QYVAC

Restored 0.2's character combinations, fixed crash when killing a monster using Pain.

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

Created by dshaligram on October 1, 2007

O2A7I25VYURCVDZEGRMFCP6X6DEYT4EB3TZESZSDCDDJE2U7QYVAC

Dependencies

In channels

main

Change contents

Deletion in crawl-ref/source/newgame.cc at line 927 [3.1132300]

B:BD[3.1154709] → [2.180:269]

        if (player_genus(GENPC_DRACONIAN, speci))
            return false;

Deletion in crawl-ref/source/newgame.cc at line 931 [3.1132300]

B:BD[3.1154795] → [2.270:345]

        case SP_MUMMY:
        case SP_GREY_ELF:
        case SP_DEEP_ELF:

Deletion in crawl-ref/source/newgame.cc at line 983 [3.1132300]

B:BD[3.1155914] → [2.452:528]

            return false;
        if (player_genus(GENPC_DRACONIAN, speci))

Deletion in crawl-ref/source/newgame.cc at line 993 [3.1132300]
B:BD[3.1156146] → [2.529:581]
```
        case SP_HIGH_ELF:
        case SP_GREY_ELF:
```
Deletion in crawl-ref/source/newgame.cc at line 1012 [3.1132300]
B:BD[3.1156593] → [2.582:614]
```
        case SP_MOUNTAIN_DWARF:
```
Deletion in crawl-ref/source/newgame.cc at line 1026 [3.1132300]
B:BD[3.1156907] → [3.1156907:1156930]
```
        case SP_GHOUL:
```
Deletion in crawl-ref/source/newgame.cc at line 1063 [3.1132300]
B:BD[3.1157660] → [2.666:689]
```
        case SP_MUMMY:
```
Deletion in crawl-ref/source/newgame.cc at line 1068 [3.1132300]
B:BD[3.1157781] → [2.690:716]
```
        case SP_HIGH_ELF:
```
Deletion in crawl-ref/source/newgame.cc at line 1148 [3.1132300]
B:BD[3.1159551] → [2.857:889]
```
        case SP_MOUNTAIN_DWARF:
```
Deletion in crawl-ref/source/newgame.cc at line 1168 [3.1132300]
B:BD[3.1160004] → [2.890:922]
```
        case SP_MOUNTAIN_DWARF:
```
Deletion in crawl-ref/source/newgame.cc at line 1174 [3.1132300]
B:BD[3.1160094] → [3.1160094:1160170]
```
        if (player_genus(GENPC_DRACONIAN, speci))
            return false;
```
Deletion in crawl-ref/source/newgame.cc at line 1180 [3.1132300]
B:BD[3.1160293] → [3.1160293:1160319]
```
        case SP_GREY_ELF:
```
Deletion in crawl-ref/source/newgame.cc at line 1181 [3.1132300]
B:BD[3.1160345] → [3.1160345:1160369]
```
        case SP_KOBOLD:
```
Deletion in crawl-ref/source/newgame.cc at line 1182 [3.1132300]
B:BD[3.1160395] → [3.1160395:1160417]
```
        case SP_NAGA:
```
Deletion in crawl-ref/source/newgame.cc at line 1186 [3.1132300]
B:BD[3.1160513] → [2.923:948]
```
        case SP_CENTAUR:
```
Deletion in crawl-ref/source/newgame.cc at line 1193 [3.1132300]
B:BD[3.1160650] → [3.1160650:1160726]
```
            return false;
        if (player_genus(GENPC_DRACONIAN, speci))
```
Deletion in crawl-ref/source/newgame.cc at line 1200 [3.1132300]
B:BD[3.1160875] → [3.1160875:1160901]
```
        case SP_GREY_ELF:
```
Deletion in crawl-ref/source/newgame.cc at line 1201 [3.1132300]
B:BD[3.1160927] → [3.1160927:1160953]
```
        case SP_HILL_ORC:
```
Deletion in crawl-ref/source/newgame.cc at line 1202 [3.1132300]
B:BD[3.1160976] → [3.1160976:1161000]
```
        case SP_KOBOLD:
```
Deletion in crawl-ref/source/newgame.cc at line 1203 [3.1132300]
B:BD[3.1161026] → [3.1161026:1161048]
```
        case SP_NAGA:
```
Deletion in crawl-ref/source/newgame.cc at line 1206 [3.1132300]
B:BD[3.1161119] → [2.949:974]
```
        case SP_CENTAUR:
```
Deletion in crawl-ref/source/newgame.cc at line 1213 [3.1132300]
B:BD[3.1161248] → [3.1161248:1161274]
B:BD[3.1161274] → [2.975:1025]
```
            return false;
        if (player_genus(GENPC_DRACONIAN, speci))
```
Deletion in crawl-ref/source/newgame.cc at line 1218 [3.1132300]
B:BD[3.1161399] → [3.1161399:1161422]
```
        case SP_GNOME:
```
Deletion in crawl-ref/source/newgame.cc at line 1224 [3.1132300]
B:BD[2.1049] → [2.1049:1075]
```
        case SP_HIGH_ELF:
```
Deletion in crawl-ref/source/newgame.cc at line 1242 [3.1132300]
B:BD[3.1161959] → [3.1161959:1161983]
```
        case SP_KOBOLD:
```
Deletion in crawl-ref/source/newgame.cc at line 1243 [3.1132300]
B:BD[3.1162009] → [3.1162009:1162031]
```
        case SP_NAGA:
```
Deletion in crawl-ref/source/newgame.cc at line 1247 [3.1132300]
B:BD[3.1162127] → [2.1076:1101]
```
        case SP_CENTAUR:
```
Deletion in crawl-ref/source/newgame.cc at line 1264 [3.1132300]
B:BD[3.1162516] → [3.1162516:1162540]
```
        case SP_KOBOLD:
```
Deletion in crawl-ref/source/newgame.cc at line 1270 [3.1132300]
B:BD[3.1162684] → [2.1102:1127]
```
        case SP_CENTAUR:
```
Deletion in crawl-ref/source/newgame.cc at line 1299 [3.1132300]
B:BD[3.1163457] → [3.1163457:1163483]
B:BD[3.1163483] → [2.1128:1178]
```
            return false;
        if (player_genus(GENPC_DRACONIAN, speci))
```
Deletion in crawl-ref/source/newgame.cc at line 1323 [3.1132300]
B:BD[3.1164035] → [3.1164035:1164061]
B:BD[3.1164061] → [2.1205:1255]
```
            return false;
        if (player_genus(GENPC_DRACONIAN, speci))
```

Deletion in crawl-ref/source/newgame.cc at line 1344 [3.1132300]

B:BD[3.1164512] → [2.1282:1358]

            return false;
        if (player_genus(GENPC_DRACONIAN, speci))

Deletion in crawl-ref/source/newgame.cc at line 1398 [3.1132300]
B:BD[3.1165725] → [2.1359:1413]
```
        case SP_HILL_ORC:
        case SP_SLUDGE_ELF:
```

Deletion in crawl-ref/source/newgame.cc at line 1406 [3.1132300]

B:BD[3.1165870] → [2.1414:1490]

        if (player_genus(GENPC_DRACONIAN, speci))
            return false;

Deletion in crawl-ref/source/newgame.cc at line 1416 [3.1132300]
B:BD[3.1166163] → [3.1166163:1166216]
```
        case SP_MERFOLK:
        case SP_SLUDGE_ELF:
```
Deletion in crawl-ref/source/newgame.cc at line 1437 [3.1132300]
B:BD[3.1166718] → [2.1491:1517]
```
        case SP_HILL_ORC:
```
Deletion in crawl-ref/source/newgame.cc at line 1455 [3.1132300]
B:BD[3.1167115] → [2.1518:1570]
```
        case SP_HIGH_ELF:
        case SP_DEEP_ELF:
```
Replacement in crawl-ref/source/beam.cc at line 3679 [3.4128068]
B:BD[3.4235666] → [3.4235666:4235694]
```
        switch(ench_result)
```
[3.4235666]
[3.4235694]
```
        if (mon->alive())
```
Insertion in crawl-ref/source/beam.cc at line 3681 [3.4128068]
[3.4235704]
[3.4235704]
```
            switch (ench_result)
            {
```
Insertion in crawl-ref/source/beam.cc at line 3694 [3.4128068]
[3.4236078]
[3.4236078]
```
            }
```

Restored 0.2's character combinations, fixed crash when killing a monster using Pain.

Dependencies

In channels

Change contents

Deletion in crawl-ref/source/newgame.cc at line 927 [3.1132300]

Deletion in crawl-ref/source/newgame.cc at line 931 [3.1132300]

Deletion in crawl-ref/source/newgame.cc at line 983 [3.1132300]

Deletion in crawl-ref/source/newgame.cc at line 993 [3.1132300]

Deletion in crawl-ref/source/newgame.cc at line 1012 [3.1132300]

Deletion in crawl-ref/source/newgame.cc at line 1026 [3.1132300]

Deletion in crawl-ref/source/newgame.cc at line 1063 [3.1132300]

Deletion in crawl-ref/source/newgame.cc at line 1068 [3.1132300]

Deletion in crawl-ref/source/newgame.cc at line 1148 [3.1132300]

Deletion in crawl-ref/source/newgame.cc at line 1168 [3.1132300]

Deletion in crawl-ref/source/newgame.cc at line 1174 [3.1132300]

Deletion in crawl-ref/source/newgame.cc at line 1180 [3.1132300]

Deletion in crawl-ref/source/newgame.cc at line 1181 [3.1132300]

Deletion in crawl-ref/source/newgame.cc at line 1182 [3.1132300]

Deletion in crawl-ref/source/newgame.cc at line 1186 [3.1132300]

Deletion in crawl-ref/source/newgame.cc at line 1193 [3.1132300]

Deletion in crawl-ref/source/newgame.cc at line 1200 [3.1132300]

Deletion in crawl-ref/source/newgame.cc at line 1201 [3.1132300]

Deletion in crawl-ref/source/newgame.cc at line 1202 [3.1132300]

Deletion in crawl-ref/source/newgame.cc at line 1203 [3.1132300]

Deletion in crawl-ref/source/newgame.cc at line 1206 [3.1132300]

Deletion in crawl-ref/source/newgame.cc at line 1213 [3.1132300]

Deletion in crawl-ref/source/newgame.cc at line 1218 [3.1132300]

Deletion in crawl-ref/source/newgame.cc at line 1224 [3.1132300]

Deletion in crawl-ref/source/newgame.cc at line 1242 [3.1132300]

Deletion in crawl-ref/source/newgame.cc at line 1243 [3.1132300]

Deletion in crawl-ref/source/newgame.cc at line 1247 [3.1132300]

Deletion in crawl-ref/source/newgame.cc at line 1264 [3.1132300]

Deletion in crawl-ref/source/newgame.cc at line 1270 [3.1132300]

Deletion in crawl-ref/source/newgame.cc at line 1299 [3.1132300]

Deletion in crawl-ref/source/newgame.cc at line 1323 [3.1132300]

Deletion in crawl-ref/source/newgame.cc at line 1344 [3.1132300]

Deletion in crawl-ref/source/newgame.cc at line 1398 [3.1132300]

Deletion in crawl-ref/source/newgame.cc at line 1406 [3.1132300]

Deletion in crawl-ref/source/newgame.cc at line 1416 [3.1132300]

Deletion in crawl-ref/source/newgame.cc at line 1437 [3.1132300]

Deletion in crawl-ref/source/newgame.cc at line 1455 [3.1132300]

Replacement in crawl-ref/source/beam.cc at line 3679 [3.4128068]

Insertion in crawl-ref/source/beam.cc at line 3681 [3.4128068]

Insertion in crawl-ref/source/beam.cc at line 3694 [3.4128068]