fiddlerwoaroof/crawl - Change QEEJFAETO6B2J4IWDIDCJ5UNIFNNHHG22IWF2CUJRTJJBNE47CWQC

Fixes to compile with Visual C++. Moved direct.cc and direct.h to directn.* to avoid conflict with VC++ direct.h header.

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

Created by dshaligram on April 19, 2008

QEEJFAETO6B2J4IWDIDCJ5UNIFNNHHG22IWF2CUJRTJJBNE47CWQC

Dependencies

In channels

main

Change contents

Replacement in crawl-ref/source/xom.cc at line 189 [15.3]
∅:D[14.205] → [15.4329:4379]
B:BD[15.4329] → [15.4329:4379]
```
    const int nxomspells = ARRAYSIZE(xom_spells);
```
[14.205]
[16.4]
```
    const int nxomspells = ARRAYSZ(xom_spells);
```
Replacement in crawl-ref/source/view.cc at line 49 [19.16817]
∅:D[17.49] → [18.1491:1511]
B:BD[18.1491] → [18.1491:1511]
```
#include "direct.h"
```
[17.49]
[20.26]
```
#include "directn.h"
```
Replacement in crawl-ref/source/view.cc at line 4948 [19.16817]
B:BD[20.2725] → [21.444:498]
```
// Moved from direct.h, where they didn't need to be.
```
[20.2725]
[21.498]
```
// Moved from directn.h, where they didn't need to be.
```
Replacement in crawl-ref/source/travel.cc at line 22 [24.39949]
∅:D[22.152] → [23.952:972]
B:BD[18.85912] → [23.952:972]
```
#include "direct.h"
```
[22.152]
[25.534]
```
#include "directn.h"
```
Replacement in crawl-ref/source/traps.cc at line 23 [27.5308]
∅:D[26.156] → [27.5709:5729]
∅:D[28.866] → [27.5709:5729]
B:BD[27.5709] → [27.5709:5729]
```
#include "direct.h"
```
[26.156]
[27.5729]
```
#include "directn.h"
```

Replacement in crawl-ref/source/transfor.cc at line 176 [19.143977]

B:BD[29.1812] → [29.1812:1890]

                                       default_rem + ARRAYSIZE(default_rem));

[29.1812]

[19.148233]

                                       default_rem + ARRAYSZ(default_rem));

Replacement in crawl-ref/source/tile2.cc at line 17 [30.13289]
B:BD[30.13409] → [30.13409:13429]
```
#include "direct.h"
```
[30.13409]
[30.13429]
```
#include "directn.h"
```
Replacement in crawl-ref/source/tile1.cc at line 12 [30.96318]
∅:D[31.158] → [30.96375:96395]
B:BD[30.96375] → [30.96375:96395]
```
#include "direct.h"
```
[31.158]
[30.96395]
```
#include "directn.h"
```
Replacement in crawl-ref/source/terrain.cc at line 20 [27.26938]
B:BD[27.27349] → [32.236:256]
```
#include "direct.h"
```
[27.27349]
[27.27349]
```
#include "directn.h"
```

Replacement in crawl-ref/source/terrain.cc at line 257 [27.26938]

B:BD[33.922] → [33.922:1010]

    const unsigned int idx = MIN((unsigned int)door_size*2, ARRAYSIZE(descriptions)-2);

[33.922]

[33.1010]

    const unsigned int idx = MIN((unsigned int)door_size*2, ARRAYSZ(descriptions)-2);

Replacement in crawl-ref/source/stuff.cc at line 19 [19.224557]
∅:D[34.1448] → [18.103861:103881]
B:BD[19.224937] → [18.103861:103881]
```
#include "direct.h"
```
[34.1448]
[35.136]
```
#include "directn.h"
```
Replacement in crawl-ref/source/state.cc at line 17 [36.1546]
B:BD[36.1854] → [36.1854:1874]
```
#include "direct.h"
```
[36.1854]
[36.1874]
```
#include "directn.h"
```
Replacement in crawl-ref/source/stash.cc at line 16 [24.147324]
B:BD[24.147522] → [37.2002:2022]
```
#include "direct.h"
```
[24.147522]
[27.44811]
```
#include "directn.h"
```
Replacement in crawl-ref/source/spl-util.h at line 19 [19.242902]
B:BD[19.243315] → [19.243315:243358]
```
#include "direct.h"  // just for DIR_NONE 
```
[19.243315]
[27.44916]
```
#include "directn.h"  // just for DIR_NONE 
```
Replacement in crawl-ref/source/spl-util.cc at line 27 [19.245665]
∅:D[27.45702] → [19.246388:246408]
B:BD[19.246388] → [19.246388:246408]
```
#include "direct.h"
```
[27.45702]
[19.246408]
```
#include "directn.h"
```

Replacement in crawl-ref/source/spl-cast.cc at line 3679 [19.293070]

B:BD[38.1240] → [38.1240:1304]

    for ( unsigned int i = 0; i < ARRAYSIZE(breakpoints); ++i )

[38.1240]

[38.1310]

    for ( unsigned int i = 0; i < ARRAYSZ(breakpoints); ++i )

Replacement in crawl-ref/source/spells4.cc at line 30 [19.436250]
B:BD[19.436818] → [19.436818:436838]
```
#include "direct.h"
```
[19.436818]
[19.436838]
```
#include "directn.h"
```

Replacement in crawl-ref/source/spells4.cc at line 753 [19.436250]

B:BD[39.8967] → [39.8967:9025]

    for ( unsigned int i = 0; i < ARRAYSIZE(types); ++i )

[39.8967]

[39.9025]

    for ( unsigned int i = 0; i < ARRAYSZ(types); ++i )

Replacement in crawl-ref/source/spells3.cc at line 30 [19.531613]
B:BD[19.532155] → [19.532155:532175]
```
#include "direct.h"
```
[19.532155]
[19.532175]
```
#include "directn.h"
```

Replacement in crawl-ref/source/spells3.cc at line 758 [19.531613]

B:BD[40.807] → [2.156:232]

            for (unsigned int i = 0; i < ARRAYSIZE(safe_to_overwrite); ++i)

[40.807]

[19.553048]

            for (unsigned int i = 0; i < ARRAYSZ(safe_to_overwrite); ++i)

Replacement in crawl-ref/source/spells2.cc at line 35 [19.569242]
∅:D[41.54] → [19.570166:570186]
B:BD[19.570166] → [19.570166:570186]
```
#include "direct.h"
```
[41.54]
[18.148738]
```
#include "directn.h"
```
Replacement in crawl-ref/source/spells1.h at line 19 [19.611815]
B:BD[19.612111] → [19.612111:612131]
```
#include "direct.h"
```
[19.612111]
[19.612131]
```
#include "directn.h"
```
Replacement in crawl-ref/source/spells1.cc at line 32 [19.616635]
B:BD[19.617410] → [19.617410:617430]
```
#include "direct.h"
```
[19.617410]
[42.37]
```
#include "directn.h"
```
Replacement in crawl-ref/source/spells1.cc at line 908 [19.616635]
∅:D[43.384] → [44.2678:2739]
∅:D[45.965] → [44.2678:2739]
B:BD[19.632013] → [44.2678:2739]
```
    for ( unsigned int i = 0; i < ARRAYSIZE(dur_list); ++i )
```
[43.384]
[44.2739]
```
    for ( unsigned int i = 0; i < ARRAYSZ(dur_list); ++i )
```

Replacement in crawl-ref/source/religion.cc at line 969 [19.804403]

B:BD[6.2838] → [6.2838:2892]

            followers[random2(ARRAYSIZE(followers))];

[6.2838]

[6.2892]

            followers[random2(ARRAYSZ(followers))];

Replacement in crawl-ref/source/religion.cc at line 2212 [19.804403]

B:BD[19.840476] → [46.2574:2638]

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

[19.840476]

[47.3111]

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

Insertion in crawl-ref/source/quiver.cc at line 20 [49.3828]
[48.4349]
[49.4255]
```
#include <algorithm>
```

Replacement in crawl-ref/source/quiver.cc at line 37 [49.3828]

B:BD[49.4742] → [49.4742:4808]

    COMPILE_CHECK(ARRAYSIZE(m_last_used_of_type) == NUM_AMMO, a);

[49.4742]

[49.4808]

    COMPILE_CHECK(ARRAYSZ(m_last_used_of_type) == NUM_AMMO, a);

Replacement in crawl-ref/source/quiver.cc at line 297 [49.3828]
B:BD[48.5268] → [13.2528:2591]
```
static const short QUIVER_COOKIE = static_cast<short>(0xb015);
```
[48.5268]
[48.5311]
```
static const short QUIVER_COOKIE = short(0xb015);
```

Replacement in crawl-ref/source/quiver.cc at line 304 [49.3828]

B:BD[48.5480] → [48.5480:5536]

    marshallLong(outf, ARRAYSIZE(m_last_used_of_type));

[48.5480]

[12.10635]

    marshallLong(outf, ARRAYSZ(m_last_used_of_type));

Replacement in crawl-ref/source/quiver.cc at line 306 [49.3828]

B:BD[12.10636] → [12.10636:10706]

    for (unsigned int i = 0; i < ARRAYSIZE(m_last_used_of_type); i++)

[12.10636]

[48.5599]

    for (unsigned int i = 0; i < ARRAYSZ(m_last_used_of_type); i++)

Replacement in crawl-ref/source/quiver.cc at line 320 [49.3828]
∅:D[12.10762] → [48.6014:6067]
B:BD[48.6014] → [48.6014:6067]
```
    ASSERT(count <= ARRAYSIZE(m_last_used_of_type));
```
[12.10762]
[12.10763]
```
    ASSERT(count <= ARRAYSZ(m_last_used_of_type));
```

Replacement in crawl-ref/source/quiver.cc at line 333 [49.3828]

∅:D[12.10841] → [48.6416:6536]

B:BD[48.6416] → [48.6416:6536]

B:BD[48.6536] → [12.10842:10912]

    COMPILE_CHECK(ARRAYSIZE(m_last_used_of_type) ==
                  ARRAYSIZE(you.m_quiver->m_last_used_of_type), a);
    for (unsigned int i = 0; i < ARRAYSIZE(m_last_used_of_type); i++)

[12.10841]

[48.6593]

    COMPILE_CHECK(ARRAYSZ(m_last_used_of_type) ==
                  ARRAYSZ(you.m_quiver->m_last_used_of_type), a);
    for (unsigned int i = 0; i < ARRAYSZ(m_last_used_of_type); i++)

Replacement in crawl-ref/source/quiver.cc at line 345 [49.3828]

B:BD[48.6761] → [12.10913:10983]

    for (unsigned int i = 0; i < ARRAYSIZE(m_last_used_of_type); i++)

[48.6761]

[48.6818]

    for (unsigned int i = 0; i < ARRAYSZ(m_last_used_of_type); i++)

Replacement in crawl-ref/source/overmap.cc at line 32 [19.1070017]
∅:D[50.2148] → [51.1433:1453]
∅:D[52.2902] → [51.1433:1453]
B:BD[19.1070738] → [51.1433:1453]
```
#include "direct.h"
```
[50.2148]
[27.56630]
```
#include "directn.h"
```
Replacement in crawl-ref/source/output.cc at line 29 [19.1088282]
B:BD[53.1156] → [27.57534:57554]
```
#include "direct.h"
```
[53.1156]
[54.59]
```
#include "directn.h"
```

Replacement in crawl-ref/source/newgame.cc at line 195 [19.1132300]

B:BD[55.7810] → [56.4902:4977]

    if (index < 0 || (unsigned int) index >= ARRAYSIZE(old_species_order))

[55.7810]

[56.4977]

    if (index < 0 || (unsigned int) index >= ARRAYSZ(old_species_order))

Replacement in crawl-ref/source/newgame.cc at line 249 [19.1132300]

B:BD[56.7020] → [56.7020:7092]

    if (index < 0 || (unsigned int) index >= ARRAYSIZE(old_jobs_order))

[56.7020]

[56.7098]

    if (index < 0 || (unsigned int) index >= ARRAYSZ(old_jobs_order))

Replacement in crawl-ref/source/newgame.cc at line 267 [19.1132300]

B:BD[57.4144] → [57.4144:4214]

    COMPILE_CHECK(ARRAYSIZE(Species_Abbrev_List) == NUM_SPECIES, c1);

[57.4144]

[8.8717]

    COMPILE_CHECK(ARRAYSZ(Species_Abbrev_List) == NUM_SPECIES, c1);

Replacement in crawl-ref/source/newgame.cc at line 269 [19.1132300]
∅:D[8.8718] → [57.4219:4283]
B:BD[57.4219] → [57.4219:4283]
```
    for (unsigned i = 0; i < ARRAYSIZE(old_species_order); i++)
```
[8.8718]
[57.4283]
```
    for (unsigned i = 0; i < ARRAYSZ(old_species_order); i++)
```
Replacement in crawl-ref/source/newgame.cc at line 295 [19.1132300]
B:BD[57.4929] → [57.4929:4984]
```
    for (i = 0; i < ARRAYSIZE(old_species_order); i++)
```
[57.4929]
[57.4984]
```
    for (i = 0; i < ARRAYSZ(old_species_order); i++)
```

Replacement in crawl-ref/source/newgame.cc at line 326 [19.1132300]

B:BD[58.2994] → [58.2994:3064]

    COMPILE_CHECK(ARRAYSIZE(Species_Abbrev_List) == NUM_SPECIES, c1);

[58.2994]

[58.3064]

    COMPILE_CHECK(ARRAYSZ(Species_Abbrev_List) == NUM_SPECIES, c1);

Replacement in crawl-ref/source/newgame.cc at line 354 [19.1132300]

B:BD[57.6437] → [57.6437:6502]

    COMPILE_CHECK(ARRAYSIZE(Class_Abbrev_List) == NUM_JOBS, c1);

[57.6437]

[8.8719]

    COMPILE_CHECK(ARRAYSZ(Class_Abbrev_List) == NUM_JOBS, c1);

Replacement in crawl-ref/source/newgame.cc at line 357 [19.1132300]
∅:D[58.3380] → [57.6572:6637]
B:BD[57.6572] → [57.6572:6637]
```
    for (unsigned int i = 0; i < ARRAYSIZE(old_jobs_order); i++)
```
[58.3380]
[57.6637]
```
    for (unsigned int i = 0; i < ARRAYSZ(old_jobs_order); i++)
```

Replacement in crawl-ref/source/newgame.cc at line 397 [19.1132300]

B:BD[57.7277] → [58.3853:3918]

    COMPILE_CHECK(ARRAYSIZE(Class_Name_List)   == NUM_JOBS, c1);

[57.7277]

[8.8723]

    COMPILE_CHECK(ARRAYSZ(Class_Name_List)   == NUM_JOBS, c1);

Replacement in crawl-ref/source/newgame.cc at line 408 [19.1132300]
∅:D[58.3946] → [57.7453:7518]
B:BD[57.7453] → [57.7453:7518]
```
    for (unsigned int i = 0; i < ARRAYSIZE(old_jobs_order); i++)
```
[58.3946]
[57.7518]
```
    for (unsigned int i = 0; i < ARRAYSZ(old_jobs_order); i++)
```

Replacement in crawl-ref/source/newgame.cc at line 3140 [19.1132300]

B:BD[56.10635] → [56.10635:10703]

    COMPILE_CHECK(ARRAYSIZE(old_species_order) <= NUM_SPECIES, c1);

[56.10635]

[8.9525]

    COMPILE_CHECK(ARRAYSZ(old_species_order) <= NUM_SPECIES, c1);

Replacement in crawl-ref/source/newgame.cc at line 3143 [19.1132300]

B:BD[56.10762] → [56.10762:10847]

    COMPILE_CHECK(ARRAYSIZE(old_species_order) == ARRAYSIZE(new_species_order), c2);

[56.10762]

[56.10847]

    COMPILE_CHECK(ARRAYSZ(old_species_order) == ARRAYSZ(new_species_order), c2);

Replacement in crawl-ref/source/newgame.cc at line 3145 [19.1132300]
B:BD[56.10848] → [56.10848:10906]
```
    const int num_species = ARRAYSIZE(old_species_order);
```
[56.10848]
[56.10906]
```
    const int num_species = ARRAYSZ(old_species_order);
```

Replacement in crawl-ref/source/newgame.cc at line 3389 [19.1132300]

B:BD[56.13705] → [56.13705:13767]

    COMPILE_CHECK(ARRAYSIZE(old_jobs_order) <= NUM_JOBS, c1);

[56.13705]

[56.13767]

    COMPILE_CHECK(ARRAYSZ(old_jobs_order) <= NUM_JOBS, c1);

Replacement in crawl-ref/source/newgame.cc at line 3392 [19.1132300]

B:BD[56.13822] → [56.13822:13901]

    COMPILE_CHECK(ARRAYSIZE(old_jobs_order) == ARRAYSIZE(new_jobs_order), c2);

[56.13822]

[56.13901]

    COMPILE_CHECK(ARRAYSZ(old_jobs_order) == ARRAYSZ(new_jobs_order), c2);

Replacement in crawl-ref/source/newgame.cc at line 3394 [19.1132300]
B:BD[56.13902] → [56.13902:13957]
```
    const int num_classes = ARRAYSIZE(old_jobs_order);
```
[56.13902]
[56.13957]
```
    const int num_classes = ARRAYSZ(old_jobs_order);
```

Replacement in crawl-ref/source/mutation.cc at line 997 [19.1263003]

B:BD[46.2663] → [46.2663:2725]

COMPILE_CHECK(ARRAYSIZE(mutation_defs) == NUM_MUTATIONS, c1);

[46.2663]

[59.3582]

COMPILE_CHECK(ARRAYSZ(mutation_defs) == NUM_MUTATIONS, c1);

Replacement in crawl-ref/source/mutation.cc at line 1003 [19.1263003]

B:BD[59.3701] → [59.3701:3761]

    for (unsigned i = 0; i < ARRAYSIZE(mutation_defs); ++i)

[59.3701]

[59.3761]

    for (unsigned i = 0; i < ARRAYSZ(mutation_defs); ++i)

Replacement in crawl-ref/source/mon-util.cc at line 83 [19.1699344]
B:BD[19.1700469] → [39.10703:10742]
```
#define MONDATASIZE ARRAYSIZE(mondata)
```
[19.1700469]
[19.1700535]
```
#define MONDATASIZE ARRAYSZ(mondata)
```
Replacement in crawl-ref/source/mon-util.cc at line 1512 [19.1699344]
B:BD[60.13583] → [46.2741:2791]
```
    COMPILE_CHECK(ARRAYSIZE(drac_colour_names) ==
```
[60.13583]
[46.2791]
```
    COMPILE_CHECK(ARRAYSZ(drac_colour_names) ==
```
Replacement in crawl-ref/source/mon-util.cc at line 1522 [19.1699344]
B:BD[60.13899] → [61.32253:32300]
```
    COMPILE_CHECK(ARRAYSIZE(drac_colour_names)
```
[60.13899]
[61.32300]
```
    COMPILE_CHECK(ARRAYSZ(drac_colour_names)
```
Replacement in crawl-ref/source/mon-util.cc at line 1525 [19.1699344]
∅:D[46.2964] → [60.13992:14056]
∅:D[11.11252] → [60.13992:14056]
∅:D[61.32385] → [60.13992:14056]
B:BD[60.13992] → [60.13992:14056]
```
    for (unsigned i = 0; i < ARRAYSIZE(drac_colour_names); ++i)
```
[11.11252]
[60.14056]
```
    for (unsigned i = 0; i < ARRAYSZ(drac_colour_names); ++i)
```

Replacement in crawl-ref/source/mon-util.cc at line 4152 [19.1699344]

B:BD[62.9114] → [63.341:407]

        for (unsigned int i = 0; i < ARRAYSIZE(mspell_list); ++i)

[62.9114]

[62.9244]

        for (unsigned int i = 0; i < ARRAYSZ(mspell_list); ++i)

Replacement in crawl-ref/source/mon-util.cc at line 5454 [19.1699344]

B:BD[64.27912] → [46.2965:3036]

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

[64.27912]

[11.11955]

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

Replacement in crawl-ref/source/misc.cc at line 48 [19.1933596]
B:BD[19.1934200] → [36.10012:10032]
```
#include "direct.h"
```
[19.1934200]
[65.3146]
```
#include "directn.h"
```
Replacement in crawl-ref/source/misc.cc at line 50 [19.1933596]
B:BD[65.3168] → [27.72191:72211]
```
#include "direct.h"
```
[65.3168]
[27.72211]
```
#include "directn.h"
```

Replacement in crawl-ref/source/mgrow.cc at line 85 [66.2647]

B:BD[66.5345] → [66.5345:5400]

    for (unsigned i = 0; i < ARRAYSIZE(mon_grow); ++i)

[66.5345]

[66.5400]

    for (unsigned i = 0; i < ARRAYSZ(mon_grow); ++i)

Replacement in crawl-ref/source/mapmark.cc at line 17 [65.13502]
∅:D[50.6558] → [65.13731:13751]
B:BD[65.13731] → [65.13731:13751]
```
#include "direct.h"
```
[50.6558]
[65.13751]
```
#include "directn.h"
```
Replacement in crawl-ref/source/mapdef.cc at line 18 [18.594797]
B:BD[67.3815] → [67.3815:3835]
```
#include "direct.h"
```
[67.3815]
[68.11466]
```
#include "directn.h"
```
Insertion in crawl-ref/source/mapdef.cc at line 1429 [18.594797]
[69.265]
[70.240]
```
    fixup();
```

Replacement in crawl-ref/source/mapdef.cc at line 1723 [18.594797]

B:BD[18.601602] → [18.601602:601704]

    // Minivaults are padded out with floor tiles, normal maps are
    // padded out with rock walls.

[18.601602]

[71.951]

    // Pad out lines that are shorter than max.

Replacement in crawl-ref/source/makefile.obj at line 19 [72.79]
∅:D[65.25314] → [72.210:221]
B:BD[72.210] → [72.210:221]
```
direct.o \
```
[65.25314]
[72.221]
```
directn.o \
```
Replacement in crawl-ref/source/luadgn.cc at line 17 [74.1232]
∅:D[73.4423] → [50.13272:13292]
B:BD[74.1453] → [50.13272:13292]
```
#include "direct.h"
```
[73.4423]
[27.73722]
```
#include "directn.h"
```

Replacement in crawl-ref/source/luadgn.cc at line 1123 [74.1232]

B:BD[75.14419] → [46.3075:3150]

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

[75.14419]

[75.14483]

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

Replacement in crawl-ref/source/luadgn.cc at line 1127 [74.1232]

B:BD[75.14536] → [75.14536:14601]

    for (unsigned i = 0; i < ARRAYSIZE(dngn_feature_names); ++i)

[75.14536]

[75.14601]

    for (unsigned i = 0; i < ARRAYSZ(dngn_feature_names); ++i)

Replacement in crawl-ref/source/luadgn.cc at line 1138 [74.1232]

B:BD[76.2422] → [46.3151:3226]

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

[76.2422]

[76.2486]

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

Replacement in crawl-ref/source/luadgn.cc at line 1142 [74.1232]

B:BD[75.14731] → [76.2535:2600]

    for (unsigned i = 0; i < ARRAYSIZE(dngn_feature_names); ++i)

[75.14731]

[76.2600]

    for (unsigned i = 0; i < ARRAYSZ(dngn_feature_names); ++i)

Replacement in crawl-ref/source/luadgn.cc at line 1153 [74.1232]
∅:D[10.3382] → [75.14832:14879]
B:BD[75.14832] → [75.14832:14879]
```
    if (feat >= ARRAYSIZE(dngn_feature_names))
```
[10.3382]
[75.14879]
```
    if (feat >= ARRAYSZ(dngn_feature_names))
```

Replacement in crawl-ref/source/luadgn.cc at line 1181 [74.1232]

B:BD[50.14711] → [50.14711:14778]

    for (unsigned i = 0; i < ARRAYSIZE(dgn_event_type_names); ++i)

[50.14711]

[50.14778]

    for (unsigned i = 0; i < ARRAYSZ(dgn_event_type_names); ++i)

Replacement in crawl-ref/source/luadgn.cc at line 1192 [74.1232]
∅:D[10.3384] → [50.15044:15111]
B:BD[50.15044] → [50.15044:15111]
```
    for (unsigned i = 1; i < ARRAYSIZE(dgn_event_type_names); ++i)
```
[10.3384]
[50.15111]
```
    for (unsigned i = 1; i < ARRAYSZ(dgn_event_type_names); ++i)
```
Replacement in crawl-ref/source/libw32c.cc at line 61 [19.2476860]
B:BD[19.2479114] → [77.4166:4183]
```
#undef ARRAYSIZE
```
[19.2479114]
[78.319]
```
#undef ARRAYSZ
```
Replacement in crawl-ref/source/libutil.cc at line 16 [19.2494093]
B:BD[24.324245] → [30.5789036:5789056]
```
#include "direct.h"
```
[24.324245]
[18.621660]
```
#include "directn.h"
```
Replacement in crawl-ref/source/libutil.cc at line 29 [19.2494093]
B:BD[30.5789106] → [5.2668:2689]
```
    #undef ARRAYSIZE
```
[30.5789106]
[24.324330]
```
    #undef ARRAYSZ
```
Replacement in crawl-ref/source/libgui.cc at line 22 [30.5793336]
B:BD[30.5793898] → [30.5793898:5793918]
```
#include "direct.h"
```
[30.5793898]
[30.5793918]
```
#include "directn.h"
```
Replacement in crawl-ref/source/items.cc at line 45 [19.2584728]
B:BD[65.27305] → [79.269:289]
```
#include "direct.h"
```
[65.27305]
[19.2585592]
```
#include "directn.h"
```

Replacement in crawl-ref/source/itemname.cc at line 1299 [19.2667494]

B:BD[18.712802] → [46.3258:3335]

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

[18.712802]

[18.712918]

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

Replacement in crawl-ref/source/itemname.cc at line 1306 [19.2667494]

B:BD[18.713158] → [46.3336:3412]

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

[18.713158]

[19.2706481]

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

Replacement in crawl-ref/source/item_use.cc at line 45 [19.2781507]
B:BD[19.2782879] → [19.2782879:2782899]
```
#include "direct.h"
```
[19.2782879]
[19.2782899]
```
#include "directn.h"
```

Replacement in crawl-ref/source/item_use.cc at line 3589 [19.2781507]

B:BD[19.2847190] → [46.3415:3486]

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

[19.2847190]

[80.2189]

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

Replacement in crawl-ref/source/item_use.cc at line 3592 [19.2781507]

B:BD[80.2267] → [80.2267:2342]

                                           weights + ARRAYSIZE(weights))];

[80.2267]

[19.2848732]

                                           weights + ARRAYSZ(weights))];

Replacement in crawl-ref/source/it_use3.cc at line 28 [19.2870456]
B:BD[19.2871041] → [19.2871041:2871061]
```
#include "direct.h"
```
[19.2871041]
[19.2871061]
```
#include "directn.h"
```

Replacement in crawl-ref/source/invent.cc at line 520 [19.2920632]

B:BD[81.10181] → [81.10181:10242]

        for (unsigned ci = 0; ci < ARRAYSIZE(cmp_map); ++ci)

[81.10181]

[81.10242]

        for (unsigned ci = 0; ci < ARRAYSZ(cmp_map); ++ci)

Replacement in crawl-ref/source/initfile.cc at line 28 [19.2957258]
B:BD[18.785053] → [82.524:544]
```
#include "direct.h"
```
[18.785053]
[24.390989]
```
#include "directn.h"
```

Replacement in crawl-ref/source/initfile.cc at line 146 [19.2957258]

B:BD[18.785709] → [3.870:936]

    ASSERT(ARRAYSIZE(element_cols) == (EC_RANDOM - EC_FIRE) + 1);

[18.785709]

[3.936]

    ASSERT(ARRAYSZ(element_cols) == (EC_RANDOM - EC_FIRE) + 1);

Replacement in crawl-ref/source/initfile.cc at line 2414 [19.2957258]
B:BD[83.7614] → [83.7614:7649]
∅:D[84.1338] → [24.421774:421812]
∅:D[85.4506] → [24.421774:421812]
∅:D[83.7649] → [24.421774:421812]
B:BD[24.421774] → [24.421774:421812]
```
    else BOOL_OPTION(trap_prompt);
    else if (key == "stash_tracking")
```
[83.7614]
[24.421812]
```
    
	BOOL_OPTION(trap_prompt);
	else if (key == "stash_tracking")
```

Replacement in crawl-ref/source/initfile.cc at line 3106 [19.2957258]

B:BD[81.12811] → [81.12811:12874]

    for (unsigned mi = 0; mi < ARRAYSIZE(menu_type_map); ++mi)

[81.12811]

[81.12874]

    for (unsigned mi = 0; mi < ARRAYSZ(menu_type_map); ++mi)

Deletion in crawl-ref/source/files.cc at line 55 [19.3084589]
B:BD[86.341] → [77.6743:6908]
∅:D[86.341] → [18.857045:857065]
∅:D[87.5353] → [18.857045:857065]
∅:D[77.6908] → [18.857045:857065]
B:BD[19.3085813] → [18.857045:857065]
B:BD[18.857065] → [87.5354:5361]
∅:D[87.5361] → [24.432453:432454]
∅:D[18.857065] → [24.432453:432454]
B:BD[24.432453] → [24.432453:432454]
```
#if _MSC_VER
// # include <direct.h> conflicts with crawl's header.  Yes this sucks
# include <c:/Program Files/Microsoft Visual Studio 8/VC/include/direct.h>
#else
#include <dirent.h>
#endif
```
Replacement in crawl-ref/source/files.cc at line 61 [19.3084589]
B:BD[19.3085938] → [27.93299:93319]
```
#include "direct.h"
```
[19.3085938]
[19.3085938]
```
#include "directn.h"
```

Insertion in crawl-ref/source/files.cc at line 96 [19.3084589]

[4.294]

#if _MSC_VER
#include <direct.h>
#define WIN32_LEAN_AND_MEAN
#include <windows.h>
#else
#include <dirent.h>
#endif

Insertion in crawl-ref/source/files.cc at line 227 [19.3084589]

[18.859056]

}
static bool _is_good_filename(const std::string &s)
{
    return (s != "." && s != "..");

Insertion in crawl-ref/source/files.cc at line 240 [19.3084589]

[19.3090181]

[18.859297]

#ifdef _MSC_VER
    WIN32_FIND_DATA lData;
    HANDLE hFind = FindFirstFile(dirname.c_str(), &lData);
    if (hFind != INVALID_HANDLE_VALUE)
    {
        if (_is_good_filename(lData.cFileName))
            files.push_back(lData.cFileName);
        while (FindNextFile(hFind, &lData))
            files.push_back(lData.cFileName);
        FindClose(hFind);
    }
#else // non-MS VC++ compilers

Insertion in crawl-ref/source/files.cc at line 266 [19.3084589]
[18.859586]
[18.859586]
```
#endif
```

Insertion in crawl-ref/source/files.cc at line 346 [19.3084589]

[18.859862]

#ifdef _MSC_VER
    DWORD lAttr = GetFileAttributes(dir.c_str());
    return (lAttr != INVALID_FILE_ATTRIBUTES 
            && (lAttr & FILE_ATTRIBUTE_DIRECTORY));
#else

Insertion in crawl-ref/source/files.cc at line 357 [19.3084589]
[18.859980]
[18.859980]
```
#endif
```
Replacement in crawl-ref/source/effects.cc at line 28 [19.3382105]
∅:D[79.501] → [19.3382432:3382452]
∅:D[88.3104] → [19.3382432:3382452]
∅:D[89.11095] → [19.3382432:3382452]
B:BD[19.3382432] → [19.3382432:3382452]
```
#include "direct.h"
```
[89.11095]
[79.502]
```
#include "directn.h"
```
Replacement in crawl-ref/source/dungeon.cc at line 42 [19.3429798]
B:BD[19.3431051] → [18.948476:948496]
```
#include "direct.h"
```
[19.3431051]
[19.3431051]
```
#include "directn.h"
```
File move: direct.h → directn.h
BF:BFD[90.24] → [90.5256:5288]
BF:BF[90.5288] → [19.3696722:3696722]
[90.24]
[19.3696722]
Replacement in crawl-ref/source/directn.h at line 2 [19.3696722]
B:BD[19.3696726] → [91.10072:10097]
```
 *  File:       direct.h
```
[19.3696726]
[19.3696752]
```
 *  File:       directn.h
```
File move: direct.cc → directn.cc
BF:BFD[90.24] → [90.5290:5323]
BF:BF[90.5323] → [19.3697945:3697945]
[90.24]
[19.3697945]
Replacement in crawl-ref/source/directn.cc at line 20 [19.3697945]
B:BD[19.3698534] → [19.3698534:3698554]
```
#include "direct.h"
```
[19.3698534]
[92.38561]
```
#include "directn.h"
```

Replacement in crawl-ref/source/describe.cc at line 263 [19.3736416]

B:BD[93.3057] → [93.3057:3122]

            for ( unsigned i = 0; i < ARRAYSIZE(propanns); ++i )

[93.3057]

[93.3122]

            for ( unsigned i = 0; i < ARRAYSZ(propanns); ++i )

Replacement in crawl-ref/source/describe.cc at line 274 [19.3736416]

B:BD[94.5266] → [95.418:475]

    for ( unsigned i = 0; i < ARRAYSIZE(propanns); ++i )

[94.5266]

[96.5894]

    for ( unsigned i = 0; i < ARRAYSZ(propanns); ++i )

Replacement in crawl-ref/source/describe.cc at line 404 [19.3736416]
B:BD[19.3741153] → [95.2876:2934]
```
    for ( unsigned i = 0; i < ARRAYSIZE(propdescs); ++i )
```
[19.3741153]
[19.3741184]
```
    for ( unsigned i = 0; i < ARRAYSZ(propdescs); ++i )
```

Replacement in crawl-ref/source/defines.h at line 302 [19.3982910]

B:BD[15.55648] → [15.55648:55696]

B:BD[15.55696] → [97.2846:2899]

#define ARRAYSIZE(x) (sizeof(x) / sizeof(x[0]))
#define RANDOM_ELEMENT(x) (x[random2(ARRAYSIZE(x))])

[15.55648]

[15.55696]

#define ARRAYSZ(x) (sizeof(x) / sizeof(x[0]))
#define RANDOM_ELEMENT(x) (x[random2(ARRAYSZ(x))])

Replacement in crawl-ref/source/decks.cc at line 822 [19.3987460]
B:BD[7.4727] → [7.4727:4763]
```
    if ( coinflip() < already_seen)
```
[7.4727]
[98.54256]
```
    if ( already_seen && random2(2) < already_seen )
```

Replacement in crawl-ref/source/decks.cc at line 2007 [19.3987460]

B:BD[99.25572] → [9.2921:2987]

    for ( unsigned int i = 0; i < ARRAYSIZE(bad_mutations); ++i )

[99.25572]

[9.2987]

    for ( unsigned int i = 0; i < ARRAYSZ(bad_mutations); ++i )

Replacement in crawl-ref/source/decks.cc at line 2018 [19.3987460]

B:BD[99.25833] → [99.25833:25899]

    for ( unsigned int i = 0; i < ARRAYSIZE(bad_mutations); ++i )

[99.25833]

[99.25905]

    for ( unsigned int i = 0; i < ARRAYSZ(bad_mutations); ++i )

Replacement in crawl-ref/source/debug.cc at line 46 [19.4016436]
B:BD[18.1024457] → [100.590:610]
```
#include "direct.h"
```
[18.1024457]
[19.4017200]
```
#include "directn.h"
```
Replacement in crawl-ref/source/database.cc at line 185 [34.13932]
B:BD[101.6816] → [12.23962:24019]
```
    for (unsigned int i = 0; i < ARRAYSIZE(AllDBs); i++)
```
[101.6816]
[101.6871]
```
    for (unsigned int i = 0; i < ARRAYSZ(AllDBs); i++)
```
Replacement in crawl-ref/source/database.cc at line 191 [34.13932]
B:BD[102.3276] → [12.24020:24077]
```
    for (unsigned int i = 0; i < ARRAYSIZE(AllDBs); i++)
```
[102.3276]
[101.6953]
```
    for (unsigned int i = 0; i < ARRAYSZ(AllDBs); i++)
```

Replacement in crawl-ref/source/command.cc at line 100 [19.4082507]

B:BD[103.479] → [103.479:551]

         comma_separated_line(features, features + ARRAYSIZE(features))

[103.479]

[103.551]

         comma_separated_line(features, features + ARRAYSZ(features))

Replacement in crawl-ref/source/cio.h at line 15 [104.10469]
B:BD[104.10749] → [27.101675:101695]
```
#include "direct.h"
```
[104.10749]
[104.10749]
```
#include "directn.h"
```
Replacement in crawl-ref/source/acr.cc at line 86 [19.4397395]
B:BD[19.4400069] → [19.4400069:4400089]
```
#include "direct.h"
```
[19.4400069]
[19.4400089]
```
#include "directn.h"
```

Fixes to compile with Visual C++. Moved direct.cc and direct.h to directn.* to avoid conflict with VC++ direct.h header.

Dependencies

In channels

Change contents

Replacement in crawl-ref/source/xom.cc at line 189 [15.3]

Replacement in crawl-ref/source/view.cc at line 49 [19.16817]

Replacement in crawl-ref/source/view.cc at line 4948 [19.16817]

Replacement in crawl-ref/source/travel.cc at line 22 [24.39949]

Replacement in crawl-ref/source/traps.cc at line 23 [27.5308]

Replacement in crawl-ref/source/transfor.cc at line 176 [19.143977]

Replacement in crawl-ref/source/tile2.cc at line 17 [30.13289]

Replacement in crawl-ref/source/tile1.cc at line 12 [30.96318]

Replacement in crawl-ref/source/terrain.cc at line 20 [27.26938]

Replacement in crawl-ref/source/terrain.cc at line 257 [27.26938]

Replacement in crawl-ref/source/stuff.cc at line 19 [19.224557]

Replacement in crawl-ref/source/state.cc at line 17 [36.1546]

Replacement in crawl-ref/source/stash.cc at line 16 [24.147324]

Replacement in crawl-ref/source/spl-util.h at line 19 [19.242902]

Replacement in crawl-ref/source/spl-util.cc at line 27 [19.245665]

Replacement in crawl-ref/source/spl-cast.cc at line 3679 [19.293070]

Replacement in crawl-ref/source/spells4.cc at line 30 [19.436250]

Replacement in crawl-ref/source/spells4.cc at line 753 [19.436250]

Replacement in crawl-ref/source/spells3.cc at line 30 [19.531613]

Replacement in crawl-ref/source/spells3.cc at line 758 [19.531613]

Replacement in crawl-ref/source/spells2.cc at line 35 [19.569242]

Replacement in crawl-ref/source/spells1.h at line 19 [19.611815]

Replacement in crawl-ref/source/spells1.cc at line 32 [19.616635]

Replacement in crawl-ref/source/spells1.cc at line 908 [19.616635]

Replacement in crawl-ref/source/religion.cc at line 969 [19.804403]

Replacement in crawl-ref/source/religion.cc at line 2212 [19.804403]

Insertion in crawl-ref/source/quiver.cc at line 20 [49.3828]

Replacement in crawl-ref/source/quiver.cc at line 37 [49.3828]

Replacement in crawl-ref/source/quiver.cc at line 297 [49.3828]

Replacement in crawl-ref/source/quiver.cc at line 304 [49.3828]

Replacement in crawl-ref/source/quiver.cc at line 306 [49.3828]

Replacement in crawl-ref/source/quiver.cc at line 320 [49.3828]

Replacement in crawl-ref/source/quiver.cc at line 333 [49.3828]

Replacement in crawl-ref/source/quiver.cc at line 345 [49.3828]

Replacement in crawl-ref/source/overmap.cc at line 32 [19.1070017]

Replacement in crawl-ref/source/output.cc at line 29 [19.1088282]

Replacement in crawl-ref/source/newgame.cc at line 195 [19.1132300]

Replacement in crawl-ref/source/newgame.cc at line 249 [19.1132300]

Replacement in crawl-ref/source/newgame.cc at line 267 [19.1132300]

Replacement in crawl-ref/source/newgame.cc at line 269 [19.1132300]

Replacement in crawl-ref/source/newgame.cc at line 295 [19.1132300]

Replacement in crawl-ref/source/newgame.cc at line 326 [19.1132300]

Replacement in crawl-ref/source/newgame.cc at line 354 [19.1132300]

Replacement in crawl-ref/source/newgame.cc at line 357 [19.1132300]

Replacement in crawl-ref/source/newgame.cc at line 397 [19.1132300]

Replacement in crawl-ref/source/newgame.cc at line 408 [19.1132300]

Replacement in crawl-ref/source/newgame.cc at line 3140 [19.1132300]

Replacement in crawl-ref/source/newgame.cc at line 3143 [19.1132300]

Replacement in crawl-ref/source/newgame.cc at line 3145 [19.1132300]

Replacement in crawl-ref/source/newgame.cc at line 3389 [19.1132300]

Replacement in crawl-ref/source/newgame.cc at line 3392 [19.1132300]

Replacement in crawl-ref/source/newgame.cc at line 3394 [19.1132300]

Replacement in crawl-ref/source/mutation.cc at line 997 [19.1263003]

Replacement in crawl-ref/source/mutation.cc at line 1003 [19.1263003]

Replacement in crawl-ref/source/mon-util.cc at line 83 [19.1699344]

Replacement in crawl-ref/source/mon-util.cc at line 1512 [19.1699344]

Replacement in crawl-ref/source/mon-util.cc at line 1522 [19.1699344]

Replacement in crawl-ref/source/mon-util.cc at line 1525 [19.1699344]

Replacement in crawl-ref/source/mon-util.cc at line 4152 [19.1699344]

Replacement in crawl-ref/source/mon-util.cc at line 5454 [19.1699344]

Replacement in crawl-ref/source/misc.cc at line 48 [19.1933596]

Replacement in crawl-ref/source/misc.cc at line 50 [19.1933596]

Replacement in crawl-ref/source/mgrow.cc at line 85 [66.2647]

Replacement in crawl-ref/source/mapmark.cc at line 17 [65.13502]

Replacement in crawl-ref/source/mapdef.cc at line 18 [18.594797]

Insertion in crawl-ref/source/mapdef.cc at line 1429 [18.594797]

Replacement in crawl-ref/source/mapdef.cc at line 1723 [18.594797]

Replacement in crawl-ref/source/makefile.obj at line 19 [72.79]

Replacement in crawl-ref/source/luadgn.cc at line 17 [74.1232]

Replacement in crawl-ref/source/luadgn.cc at line 1123 [74.1232]

Replacement in crawl-ref/source/luadgn.cc at line 1127 [74.1232]

Replacement in crawl-ref/source/luadgn.cc at line 1138 [74.1232]

Replacement in crawl-ref/source/luadgn.cc at line 1142 [74.1232]

Replacement in crawl-ref/source/luadgn.cc at line 1153 [74.1232]

Replacement in crawl-ref/source/luadgn.cc at line 1181 [74.1232]

Replacement in crawl-ref/source/luadgn.cc at line 1192 [74.1232]