fiddlerwoaroof/crawl - Change JZCODQCOUBBBPPR4TLOAPIB4BQLDY3ORTJXTWEQSUJVJ7DMK7FVAC

Fix [ 1902141 ] Documentation wrong

changed number comments on a few enums
added a few COMPILE_CHECKs so they'll get caught Other:
Fix COMPILE_CHECK macro so it doesn't cause a warning in gcc.
Replace ASSERT(…) with COMPILE_CHECK(…) where possible.

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

Created by pauldubois on March 1, 2008

JZCODQCOUBBBPPR4TLOAPIB4BQLDY3ORTJXTWEQSUJVJ7DMK7FVAC

Dependencies

In channels

main

Change contents

Replacement in crawl-ref/source/religion.cc at line 1668 [5.804403]

B:BD[4.3091] → [4.3091:3162]

	  "Servant Kill Living", "Servant Kill Undead", "Servant Kill Demon",

[4.3091]

[6.1676]

          "Servant Kill Living", "Servant Kill Undead", "Servant Kill Demon",

Replacement in crawl-ref/source/religion.cc at line 1675 [5.804403]

B:BD[5.840476] → [7.497:550]

        ASSERT(ARRAYSIZE(conducts) == NUM_CONDUCTS);

[5.840476]

[8.190327]

        COMPILE_CHECK(ARRAYSIZE(conducts) == NUM_CONDUCTS, c1);

Deletion in crawl-ref/source/newgame.cc at line 731 [5.1132300]
B:BD[9.6945] → [9.6945:7078]
∅:D[9.7112] → [5.1146514:1146515]
B:BD[5.1146514] → [5.1146514:1146515]
```
    //jmf: NEW ASSERTS: we ought to do a *lot* of these
    ASSERT(NUM_SPELLS < SPELL_NO_SPELL);
    ASSERT(NUM_JOBS < JOB_UNKNOWN);
```
Insertion in crawl-ref/source/mutation.cc at line 992 [5.1263003]
[5.1294530]
[10.3582]
```
COMPILE_CHECK(ARRAYSIZE(mutation_defs) == NUM_MUTATIONS, c1);
```
Deletion in crawl-ref/source/mutation.cc at line 998 [5.1263003]
B:BD[10.3645] → [10.3645:3700]
```
    ASSERT(ARRAYSIZE(mutation_defs) == NUM_MUTATIONS);
```

Replacement in crawl-ref/source/mon-util.cc at line 1499 [5.1699344]

B:BD[3.13583] → [3.13583:13676]

    ASSERT(ARRAYSIZE(drac_colour_names) ==
           MONS_PALE_DRACONIAN - MONS_DRACONIAN);

[3.13583]

[3.13676]

    COMPILE_CHECK(ARRAYSIZE(drac_colour_names) ==
                  MONS_PALE_DRACONIAN - MONS_DRACONIAN, c1);

Replacement in crawl-ref/source/mon-util.cc at line 1508 [5.1699344]

B:BD[3.13899] → [3.13899:13992]

    ASSERT(ARRAYSIZE(drac_colour_names) ==
           MONS_PALE_DRACONIAN - MONS_DRACONIAN);

[3.13899]

[3.13992]

    COMPILE_CHECK(ARRAYSIZE(drac_colour_names) ==
                  MONS_PALE_DRACONIAN - MONS_DRACONIAN, c1);

Replacement in crawl-ref/source/mon-util.cc at line 5204 [5.1699344]

B:BD[11.27912] → [11.27912:28009]

    ASSERT(NUM_ENCHANTMENTS ==
           (sizeof(enchant_names) / sizeof(*enchant_names)) - 1);

[11.27912]

[11.28009]

    COMPILE_CHECK(ARRAYSIZE(enchant_names) == NUM_ENCHANTMENTS+1, c1);

Replacement in crawl-ref/source/luadgn.cc at line 1115 [13.1232]

B:BD[12.14419] → [12.14419:14483]

    ASSERT(ARRAYSIZE(dngn_feature_names) == NUM_REAL_FEATURES);

[12.14419]

[12.14483]

    COMPILE_CHECK(ARRAYSIZE(dngn_feature_names) == NUM_REAL_FEATURES, c1);

Replacement in crawl-ref/source/luadgn.cc at line 1130 [13.1232]

B:BD[14.2422] → [14.2422:2486]

    ASSERT(ARRAYSIZE(dngn_feature_names) == NUM_REAL_FEATURES);

[14.2422]

[14.2486]

    COMPILE_CHECK(ARRAYSIZE(dngn_feature_names) == NUM_REAL_FEATURES, c1);

Replacement in crawl-ref/source/itemname.cc at line 1297 [5.2667494]

B:BD[8.712802] → [8.712802:712918]

            ASSERT( sizeof(potion_qualifiers) / sizeof(*potion_qualifiers)
                        == PDQ_NQUALS );

[8.712802]

[8.712918]

            COMPILE_CHECK( ARRAYSIZE(potion_qualifiers) == PDQ_NQUALS, c1 );

Replacement in crawl-ref/source/itemname.cc at line 1304 [5.2667494]

B:BD[8.713158] → [8.713158:713270]

            ASSERT( sizeof(potion_colours) / sizeof(*potion_colours)
                        == PDC_NCOLOURS );

[8.713158]

[5.2706481]

            COMPILE_CHECK( ARRAYSIZE(potion_colours) == PDC_NCOLOURS, c1 );

Replacement in crawl-ref/source/item_use.cc at line 3656 [5.2781507]

B:BD[5.2847190] → [15.2124:2184]

        ASSERT( ARRAYSIZE(weights) == ARRAYSIZE(effects) );

[5.2847190]

[16.2189]

        COMPILE_CHECK( ARRAYSIZE(weights) == ARRAYSIZE(effects), c1 );

Insertion in crawl-ref/source/enum.h at line 1511 [5.3287960]

[5.3332580]

    // 90
    //
    //
    //
    //
    // 95
    //
    //

Replacement in crawl-ref/source/enum.h at line 1596 [5.3287960]

B:BD[5.3334619] → [5.3334619:3334687]

    MONS_HILL_GIANT,
    MONS_QUEEN_ANT,                    //  175

[5.3334619]

[5.3334687]

    MONS_HILL_GIANT,                   //  175
    MONS_QUEEN_ANT,

Replacement in crawl-ref/source/enum.h at line 1601 [5.3287960]

B:BD[5.3334755] → [5.3334755:3334823]

    MONS_SPINY_FROG,
    MONS_BLINK_FROG,                   //  180

[5.3334755]

[5.3334823]

    MONS_SPINY_FROG,                   //  180
    MONS_BLINK_FROG,

Replacement in crawl-ref/source/enum.h at line 1604 [5.3287960]
B:BD[5.3334849] → [5.3334849:3334896]
```
    MONS_SMALL_SNAKE,                  //  182
```
[5.3334849]
[5.3334896]
```
    MONS_SMALL_SNAKE,
```
Replacement in crawl-ref/source/enum.h at line 1612 [5.3287960]
B:BD[5.3335129] → [5.3335129:3335158]
```
    MONS_BLACK_BEAR,  // 189
```
[5.3335129]
[5.3335158]
```
    MONS_BLACK_BEAR,                   //  190
```
Replacement in crawl-ref/source/enum.h at line 1616 [5.3287960]
B:BD[17.9900] → [17.9900:9929]
```
    MONS_MERMAID,     // 193
```
[17.9900]
[5.3335212]
```
    MONS_MERMAID,                      //  194
```

Replacement in crawl-ref/source/enum.h at line 1717 [5.3287960]

B:BD[8.921876] → [8.921876:921950]

    MONS_YELLOW_DRACONIAN,
    MONS_GREEN_DRACONIAN,               // 315

[8.921876]

[8.921950]

    MONS_YELLOW_DRACONIAN,              //  315
    MONS_GREEN_DRACONIAN,

Replacement in crawl-ref/source/enum.h at line 1722 [5.3287960]

B:BD[8.922027] → [3.18993:19066]

    MONS_PALE_DRACONIAN,                // Should always be last colour.

[8.922027]

[3.19066]

    MONS_PALE_DRACONIAN,                //  320 Should always be last colour.

Replacement in crawl-ref/source/enum.h at line 1729 [5.3287960]

B:BD[8.922180] → [8.922180:922259]

    MONS_DRACONIAN_ANNIHILATOR,
    MONS_DRACONIAN_KNIGHT,              // 325

[8.922180]

[8.922259]

    MONS_DRACONIAN_ANNIHILATOR,         //  325
    MONS_DRACONIAN_KNIGHT,

Replacement in crawl-ref/source/enum.h at line 1736 [5.3287960]
B:BD[18.14953] → [18.14953:14984]
```
    MONS_DEEP_ELF_BLADEMASTER,
```
[18.14953]
[18.14984]
```
    MONS_DEEP_ELF_BLADEMASTER,         //  330
```
Replacement in crawl-ref/source/enum.h at line 1769 [5.3287960]
B:BD[5.3338667] → [5.3338667:3338722]
```
    MONS_BALL_LIGHTNING, // replacing the dorgi -- bwr
```
[5.3338667]
[5.3338722]
```
    MONS_BALL_LIGHTNING, // replacing the dorgi -- bwr  380
```
Replacement in crawl-ref/source/enum.h at line 1772 [5.3287960]
B:BD[5.3338857] → [5.3338857:3338863]
```
    
```
[5.3338857]
[5.3338863]
```
    // 383
    // 384
```

Replacement in crawl-ref/source/enum.h at line 2322 [5.3287960]

B:BD[5.3361295] → [5.3361295:3361361]

    SP_DEEP_ELF,                       //    5
    SP_SLUDGE_ELF,

[5.3361295]

[5.3361380]

    SP_DEEP_ELF,
    SP_SLUDGE_ELF,                     //    5

Replacement in crawl-ref/source/enum.h at line 2326 [5.3287960]
B:BD[5.3361420] → [5.3361420:3361467]
```
    SP_HILL_ORC,                       //   10
```
[5.3361420]
[5.3361467]
```
    SP_HILL_ORC,
```
Replacement in crawl-ref/source/enum.h at line 2328 [5.3287960]
B:BD[5.3361482] → [5.3361482:3361496]
```
    SP_MUMMY,
```
[5.3361482]
[5.3361496]
```
    SP_MUMMY,                          //   10
```
Replacement in crawl-ref/source/enum.h at line 2331 [5.3287960]
B:BD[5.3361523] → [5.3361523:3361570]
```
    SP_OGRE,                           //   15
```
[5.3361523]
[5.3361570]
```
    SP_OGRE,
```
Replacement in crawl-ref/source/enum.h at line 2336 [5.3287960]
B:BD[5.3361648] → [5.3361648:3361695]
```
    SP_GREEN_DRACONIAN,                //   20
```
[5.3361648]
[5.3361695]
```
    SP_GREEN_DRACONIAN,
```
Replacement in crawl-ref/source/enum.h at line 2338 [5.3287960]
B:BD[5.3361720] → [5.3361720:3361743]
```
    SP_GREY_DRACONIAN,
```
[5.3361720]
[5.3361743]
```
    SP_GREY_DRACONIAN,                 //   20
```
Replacement in crawl-ref/source/enum.h at line 2341 [5.3287960]
B:BD[5.3361792] → [5.3361792:3361839]
```
    SP_MOTTLED_DRACONIAN,              //   25
```
[5.3361792]
[5.3361839]
```
    SP_MOTTLED_DRACONIAN,
```
Replacement in crawl-ref/source/enum.h at line 2346 [5.3287960]
∅:D[8.929052] → [5.3361931:3361978]
B:BD[5.3361931] → [5.3361931:3361978]
```
    SP_CENTAUR,                        //   30
```
[8.929052]
[5.3361978]
```
    SP_CENTAUR,
```
Replacement in crawl-ref/source/enum.h at line 2348 [5.3287960]
B:BD[5.3361994] → [5.3361994:3362011]
```
    SP_SPRIGGAN,
```
[5.3361994]
[5.3362011]
```
    SP_SPRIGGAN,                       //   30
```
Replacement in crawl-ref/source/enum.h at line 2351 [5.3287960]
B:BD[5.3362047] → [5.3362047:3362094]
```
    SP_GHOUL,                          //   35
```
[5.3362047]
[5.3362094]
```
    SP_GHOUL,
```
Replacement in crawl-ref/source/enum.h at line 2353 [5.3287960]
B:BD[5.3362108] → [5.3362108:3362124]
```
    SP_MERFOLK,
```
[5.3362108]
[2.357]
```
    SP_MERFOLK,                        //   35
```
Insertion in crawl-ref/source/enum.h at line 2383 [5.3287960]
[5.3362781]
[5.3362781]
```
    // 19
```
Insertion in crawl-ref/source/enum.h at line 2459 [5.3287960]
[5.3365032]
[5.3365032]
Replacement in crawl-ref/source/enum.h at line 2541 [5.3287960]
B:BD[5.3367556] → [5.3367556:3367610]
```
    SPELL_EVAPORATE,    // turn a potion into a cloud
```
[5.3367478]
[5.3367610]
```
    SPELL_EVAPORATE,    // turn a potion into a cloud 190
```

Replacement in crawl-ref/source/enum.h at line 2545 [5.3287960]

B:BD[5.3367835] → [5.3367835:3367913]

    SPELL_SANDBLAST,     // mini-frag; can use stones for material comp   195

[5.3367835]

[5.3367913]

    SPELL_SANDBLAST,     // mini-frag; can use stones for material comp

Replacement in crawl-ref/source/enum.h at line 2550 [5.3287960]
B:BD[8.929144] → [8.929144:929190]
∅:D[8.929190] → [5.3368284:3368306]
B:BD[5.3368284] → [5.3368284:3368306]
```
    SPELL_STONESKIN,                   // 200
    SPELL_SIMULACRUM,
```
[8.929144]
[8.929191]
```
    SPELL_STONESKIN,
    SPELL_SIMULACRUM,                  //  200
```

Replacement in crawl-ref/source/debug.h at line 39 [5.4011741]

B:BD[5.4012774] → [5.4012774:4012862]

#define COMPILE_CHECK(p)                        {struct _CC {char a[(p) ? 1 : -1];};} 0

[5.4012774]

[5.4012862]

#define COMPILE_CHECK(expr, tag) typedef char compile_check_ ## tag[(expr) ? 1 : -1]

Replacement in crawl-ref/source/debug.h at line 41 [5.4011741]
B:BD[5.4012868] → [5.4012868:4012893]
```
#define COMPILE_CHECK(p)
```
[5.4012868]
[5.4012893]
```
#define COMPILE_CHECK(expr, tag)
```
Insertion in crawl-ref/source/acr.cc at line 191 [5.4397395]
[19.10228]
[5.4402708]
```
static void compile_time_asserts();
```

Insertion in crawl-ref/source/acr.cc at line 204 [5.4397395]

[5.4402856]

[5.4403144]

    compile_time_asserts();     // just to quiet "unused static function" warning

Insertion in crawl-ref/source/acr.cc at line 4365 [5.4397395]

[20.41511]

}
void compile_time_asserts()
{
    // Check that the numbering comments in enum.h haven't been
    // disturbed accidentally.
    COMPILE_CHECK(SK_UNARMED_COMBAT == 19       , c1);
    COMPILE_CHECK(SK_EVOCATIONS == 39           , c2);
    COMPILE_CHECK(SP_MERFOLK == 35              , c3);
    COMPILE_CHECK(SPELL_BOLT_OF_MAGMA == 18     , c4);
    COMPILE_CHECK(SPELL_POISON_ARROW == 94      , c5);
    COMPILE_CHECK(SPELL_SUMMON_MUSHROOMS == 221 , c6);
    //jmf: NEW ASSERTS: we ought to do a *lot* of these
    COMPILE_CHECK(NUM_SPELLS < SPELL_NO_SPELL   , c7);
    COMPILE_CHECK(NUM_JOBS < JOB_UNKNOWN        , c8);

Fix [ 1902141 ] Documentation wrong

Dependencies

In channels

Change contents

Replacement in crawl-ref/source/religion.cc at line 1668 [5.804403]

Replacement in crawl-ref/source/religion.cc at line 1675 [5.804403]

Deletion in crawl-ref/source/newgame.cc at line 731 [5.1132300]

Insertion in crawl-ref/source/mutation.cc at line 992 [5.1263003]

Deletion in crawl-ref/source/mutation.cc at line 998 [5.1263003]

Replacement in crawl-ref/source/mon-util.cc at line 1499 [5.1699344]

Replacement in crawl-ref/source/mon-util.cc at line 1508 [5.1699344]

Replacement in crawl-ref/source/mon-util.cc at line 5204 [5.1699344]

Replacement in crawl-ref/source/luadgn.cc at line 1115 [13.1232]

Replacement in crawl-ref/source/luadgn.cc at line 1130 [13.1232]

Replacement in crawl-ref/source/itemname.cc at line 1297 [5.2667494]

Replacement in crawl-ref/source/itemname.cc at line 1304 [5.2667494]

Replacement in crawl-ref/source/item_use.cc at line 3656 [5.2781507]

Insertion in crawl-ref/source/enum.h at line 1511 [5.3287960]

Replacement in crawl-ref/source/enum.h at line 1596 [5.3287960]

Replacement in crawl-ref/source/enum.h at line 1601 [5.3287960]

Replacement in crawl-ref/source/enum.h at line 1604 [5.3287960]

Replacement in crawl-ref/source/enum.h at line 1612 [5.3287960]

Replacement in crawl-ref/source/enum.h at line 1616 [5.3287960]

Replacement in crawl-ref/source/enum.h at line 1717 [5.3287960]

Replacement in crawl-ref/source/enum.h at line 1722 [5.3287960]

Replacement in crawl-ref/source/enum.h at line 1729 [5.3287960]

Replacement in crawl-ref/source/enum.h at line 1736 [5.3287960]

Replacement in crawl-ref/source/enum.h at line 1769 [5.3287960]

Replacement in crawl-ref/source/enum.h at line 1772 [5.3287960]

Replacement in crawl-ref/source/enum.h at line 2322 [5.3287960]

Replacement in crawl-ref/source/enum.h at line 2326 [5.3287960]

Replacement in crawl-ref/source/enum.h at line 2328 [5.3287960]

Replacement in crawl-ref/source/enum.h at line 2331 [5.3287960]

Replacement in crawl-ref/source/enum.h at line 2336 [5.3287960]

Replacement in crawl-ref/source/enum.h at line 2338 [5.3287960]

Replacement in crawl-ref/source/enum.h at line 2341 [5.3287960]

Replacement in crawl-ref/source/enum.h at line 2346 [5.3287960]

Replacement in crawl-ref/source/enum.h at line 2348 [5.3287960]

Replacement in crawl-ref/source/enum.h at line 2351 [5.3287960]

Replacement in crawl-ref/source/enum.h at line 2353 [5.3287960]

Insertion in crawl-ref/source/enum.h at line 2383 [5.3287960]

Insertion in crawl-ref/source/enum.h at line 2459 [5.3287960]

Replacement in crawl-ref/source/enum.h at line 2541 [5.3287960]

Replacement in crawl-ref/source/enum.h at line 2545 [5.3287960]

Replacement in crawl-ref/source/enum.h at line 2550 [5.3287960]

Replacement in crawl-ref/source/debug.h at line 39 [5.4011741]

Replacement in crawl-ref/source/debug.h at line 41 [5.4011741]

Insertion in crawl-ref/source/acr.cc at line 191 [5.4397395]

Insertion in crawl-ref/source/acr.cc at line 204 [5.4397395]

Insertion in crawl-ref/source/acr.cc at line 4365 [5.4397395]