fiddlerwoaroof/crawl - Change MOT3YZFRY3JG2MH3GN2VD6IY3IJSAXJUXMXS222TXWKRFCENOCDQC

Build fixes to build cleanly on OS X; switch from makefile.lnx to

makefile.osx in the master makefile to build.

Note that this checkin adds comments to the start of each modified file tagging the file as modified by Crawl Reference; the license requires this, so we should be careful to stick with it.

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

Created by nlanza on August 1, 2005

MOT3YZFRY3JG2MH3GN2VD6IY3IJSAXJUXMXS222TXWKRFCENOCDQC

Dependencies

[2] K2CS6TCX2NDVL2ASEHGP4J4K4IJ6FP3ANNKTSIWVG43HPYSBX6ZQC

In channels

main

Change contents

Insertion in trunk/source/spl-cast.cc at line 5 [2.293070]
[2.293186]
[2.293186]
```
 *
 *  Modified for Crawl Reference by $Author$ on $Date$
```
Deletion in trunk/source/spl-cast.cc at line 17 [2.293070]
B:BD[2.293544] → [2.293544:293566]
```
#include "spl-cast.h"
```
Insertion in trunk/source/spl-cast.cc at line 23 [2.293070]
[2.293646]
[2.293646]
```
#include "spl-cast.h"
```
Insertion in trunk/source/spells2.h at line 5 [2.562867]
[2.562988]
[2.562988]
```
 *
 *  Modified for Crawl Reference by $Author$ on $Date$
```

Replacement in trunk/source/spells2.h at line 56 [2.562867]

B:BD[2.564727] → [2.564727:564815]

int summon_elemental(int pow, unsigned char restricted_type, unsigned char unfriendly);

[2.564727]

[2.564815]

int summon_elemental(int pow, int restricted_type, unsigned char unfriendly);

Insertion in trunk/source/spells2.cc at line 5 [2.569242]
[2.569363]
[2.569363]
```
 *
 *  Modified for Crawl Reference by $Author$ on $Date$
```
Replacement in trunk/source/spells2.cc at line 1088 [2.569242]
B:BD[2.598601] → [2.598601:598662]
```
int summon_elemental(int pow, unsigned char restricted_type,
```
[2.598601]
[2.598662]
```
int summon_elemental(int pow, int restricted_type,
```
Insertion in trunk/source/skills2.h at line 5 [2.643583]
[2.643691]
[2.643691]
```
 *
 *  Modified for Crawl Reference by $Author$ on $Date$
```
Replacement in trunk/source/skills2.h at line 73 [2.643583]
B:BD[2.646285] → [2.646285:646331]
```
int species_skills(char skill, char species);
```
[2.646285]
[2.646331]
```
int species_skills(int skill, int species);
```
Insertion in trunk/source/skills2.cc at line 5 [2.647133]
[2.647241]
[2.647241]
```
 *
 *  Modified for Crawl Reference by $Author$ on $Date$
```
Replacement in trunk/source/skills2.cc at line 2263 [2.647133]
B:BD[2.741689] → [2.741689:741734]
```
int species_skills(char skill, char species)
```
[2.741689]
[2.741734]
```
int species_skills(int skill, int species)
```
Insertion in trunk/source/religion.cc at line 5 [2.804403]
[2.804515]
[2.804515]
```
 *
 *  Modified for Crawl Reference by $Author$ on $Date$
```

Replacement in trunk/source/religion.cc at line 58 [2.804403]

B:BD[2.805812] → [2.805812:806351]

    {" glows silver and disappears."},
    {" glows a brilliant golden colour and disappears."},
    {" rots away in an instant."},
    {" crumbles to dust."},
    {" is eaten by a bug."},    /* Xom - no sacrifices */
    {" explodes into nothingness."},
    {" is consumed in a burst of flame."},
    {" is consumed in a roaring column of flame."},
    {" glows faintly for a moment, then is gone."},
    {" is consumed in a roaring column of flame."},
    {" glows with a rainbow of weird colours and disappears."},
    {" evaporates."}

[2.805812]

[2.806351]

    " glows silver and disappears.",
    " glows a brilliant golden colour and disappears.",
    " rots away in an instant.",
    " crumbles to dust.",
    " is eaten by a bug.",    /* Xom - no sacrifices */
    " explodes into nothingness.",
    " is consumed in a burst of flame.",
    " is consumed in a roaring column of flame.",
    " glows faintly for a moment, then is gone.",
    " is consumed in a roaring column of flame.",
    " glows with a rainbow of weird colours and disappears.",
    " evaporates."

Insertion in trunk/source/ouch.cc at line 5 [2.1104358]
[2.1104486]
[2.1104486]
```
 *
 *  Modified for Crawl Reference by $Author$ on $Date$
```
Deletion in trunk/source/ouch.cc at line 28 [2.1104358]
B:BD[2.1105596] → [2.1105596:1105614]
```
#include "ouch.h"
```
Insertion in trunk/source/ouch.cc at line 58 [2.1104358]
[2.1106001]
[2.1106001]
```
#include "ouch.h"
```
Insertion in trunk/source/mutation.h at line 5 [2.1260415]
[2.1260535]
[2.1260535]
```
 *
 *  Modified for Crawl Reference by $Author$ on $Date$
```
Replacement in trunk/source/mutation.h at line 37 [2.1260415]
B:BD[2.1261532] → [2.1261532:1261575]
```
bool delete_mutation(char which_mutation);
```
[2.1261532]
[2.1261575]
```
bool delete_mutation(int which_mutation);
```

Replacement in trunk/source/mutation.h at line 45 [2.1260415]

B:BD[2.1261854] → [2.1261854:1261917]

const char *mutation_name( char which_mutat, int level = -1 );

[2.1261854]

[2.1261917]

const char *mutation_name( int which_mutat, int level = -1 );

Insertion in trunk/source/mutation.cc at line 5 [2.1263003]
[2.1263123]
[2.1263123]
```
 *
 *  Modified for Crawl Reference by $Author$ on $Date$
```
Replacement in trunk/source/mutation.cc at line 1111 [2.1263003]
B:BD[2.1300430] → [2.1300430:1300463]
```
    char mutat = which_mutation;
```
[2.1300430]
[2.1300463]
```
    int  mutat = which_mutation;
```
Replacement in trunk/source/mutation.cc at line 1603 [2.1263003]
B:BD[2.1314573] → [2.1314573:1314615]
```
bool delete_mutation(char which_mutation)
```
[2.1314573]
[2.1314615]
```
bool delete_mutation(int which_mutation)
```
Replacement in trunk/source/mutation.cc at line 1605 [2.1263003]
B:BD[2.1314617] → [2.1314617:1314650]
```
    char mutat = which_mutation;
```
[2.1314617]
[2.1314650]
```
    int mutat = which_mutation;
```
Replacement in trunk/source/mutation.cc at line 1808 [2.1263003]
B:BD[2.1320660] → [2.1320660:1320717]
```
const char *mutation_name( char which_mutat, int level )
```
[2.1320660]
[2.1320717]
```
const char *mutation_name(int which_mutat, int level )
```
Insertion in trunk/source/mon-util.h at line 5 [2.1682293]
[2.1682403]
[2.1682403]
```
 *
 *  Modified for Crawl Reference by $Author$ on $Date$
```
Replacement in trunk/source/mon-util.h at line 208 [2.1682293]
B:BD[2.1689689] → [2.1689689:1689719]
```
char mons_shouts(int mclass);
```
[2.1689689]
[2.1689719]
```
int mons_shouts(int mclass);
```
Insertion in trunk/source/mon-util.cc at line 5 [2.1699344]
[2.1699455]
[2.1699455]
```
 *
 *  Modified for Crawl Reference by $Author$ on $Date$
```
Replacement in trunk/source/mon-util.cc at line 264 [2.1699344]
B:BD[2.1705647] → [2.1705647:1705672]
```
char mons_shouts(int mc)
```
[2.1705647]
[2.1705672]
```
int mons_shouts(int mc)
```
Insertion in trunk/source/makefile.osx at line 2 [2.2431088]
[2.2431133]
[2.2431133]
```
#
# Modified for Crawl Reference by $Author$ on $Date$
#
```

Replacement in trunk/source/makefile.osx at line 22 [2.2431088]

B:BD[2.2431439] → [2.2431439:2431545]

            -Wwrite-strings -Wstrict-prototypes -Wmissing-prototypes \
            -Wmissing-declarations

[2.2431439]

[2.2431545]

            -Wwrite-strings

Deletion in trunk/source/makefile.osx at line 24 [2.2431088]
B:BD[2.2431546] → [2.2431546:2431577]
```
LDFLAGS = -L/sw/lib -L/usr/lib
```

Replacement in trunk/source/makefile.osx at line 29 [2.2431088]

B:BD[2.2431679] → [2.2431679:2431743]

# Include for Fink's version of curses
INCLUDES = -I/sw/include

[2.2431679]

[2.2431743]

# Include/library for Fink's version of curses
# INCLUDES += -I/sw/include
# LDFLAGS  += -L/sw/lib

Insertion in trunk/source/makefile at line 1 [2.2455714]
[2.2455714]
[2.2455715]
```
#
# Modified for Crawl Reference by $Author$ on $Date$
#
```
Insertion in trunk/source/makefile at line 12 [2.2455714]
[2.2455872]
[2.2455872]
```
#MAKEFILE = makefile.osx
```
Replacement in trunk/source/makefile at line 16 [2.2455714]
B:BD[2.2455992] → [2.2455992:2456002]
```
OTHER=-j2
```
[2.2455992]
[2.2456002]
```
#OTHER=-j2
```
Insertion in trunk/source/libutil.cc at line 4 [2.2494093]
[2.2494188]
[2.2494188]
```
 *
 *  Modified for Crawl Reference by $Author$ on $Date$
```
Insertion in trunk/source/libutil.cc at line 16 [2.2494093]
[2.2494347]
[2.2494347]
```
#include <string.h>
```
Insertion in trunk/source/liblinux.cc at line 5 [2.2550041]
[2.2550153]
[2.2550153]
```
 *
 *  Modified for Crawl Reference by $Author$ on $Date$
```

Replacement in trunk/source/liblinux.cc at line 230 [2.2550041]

B:BD[2.2555816] → [2.2555816:2557040]

    key_to_command_table['a'] = CMD_USE_ABILITY;
    key_to_command_table['b'] = CMD_MOVE_DOWN_LEFT;
    key_to_command_table['c'] = CMD_CLOSE_DOOR;
    key_to_command_table['d'] = CMD_DROP;
    key_to_command_table['e'] = CMD_EAT;
    key_to_command_table['f'] = CMD_FIRE;
    key_to_command_table['g'] = CMD_PICKUP;
    key_to_command_table['h'] = CMD_MOVE_LEFT;
    key_to_command_table['i'] = CMD_DISPLAY_INVENTORY;
    key_to_command_table['j'] = CMD_MOVE_DOWN;
    key_to_command_table['k'] = CMD_MOVE_UP;
    key_to_command_table['l'] = CMD_MOVE_RIGHT;
    key_to_command_table['m'] = CMD_DISPLAY_SKILLS;
    key_to_command_table['n'] = CMD_MOVE_DOWN_RIGHT;
    key_to_command_table['o'] = CMD_OPEN_DOOR;
    key_to_command_table['p'] = CMD_PRAY;
    key_to_command_table['q'] = CMD_QUAFF;
    key_to_command_table['r'] = CMD_READ;
    key_to_command_table['s'] = CMD_SEARCH;
    key_to_command_table['t'] = CMD_THROW;
    key_to_command_table['u'] = CMD_MOVE_UP_RIGHT;
    key_to_command_table['v'] = CMD_EXAMINE_OBJECT;
    key_to_command_table['w'] = CMD_WIELD_WEAPON;
    key_to_command_table['x'] = CMD_LOOK_AROUND;
    key_to_command_table['y'] = CMD_MOVE_UP_LEFT;
    key_to_command_table['z'] = CMD_ZAP_WAND;

[2.2555816]

[2.2557040]

    key_to_command_table[(int) 'a'] = CMD_USE_ABILITY;
    key_to_command_table[(int) 'b'] = CMD_MOVE_DOWN_LEFT;
    key_to_command_table[(int) 'c'] = CMD_CLOSE_DOOR;
    key_to_command_table[(int) 'd'] = CMD_DROP;
    key_to_command_table[(int) 'e'] = CMD_EAT;
    key_to_command_table[(int) 'f'] = CMD_FIRE;
    key_to_command_table[(int) 'g'] = CMD_PICKUP;
    key_to_command_table[(int) 'h'] = CMD_MOVE_LEFT;
    key_to_command_table[(int) 'i'] = CMD_DISPLAY_INVENTORY;
    key_to_command_table[(int) 'j'] = CMD_MOVE_DOWN;
    key_to_command_table[(int) 'k'] = CMD_MOVE_UP;
    key_to_command_table[(int) 'l'] = CMD_MOVE_RIGHT;
    key_to_command_table[(int) 'm'] = CMD_DISPLAY_SKILLS;
    key_to_command_table[(int) 'n'] = CMD_MOVE_DOWN_RIGHT;
    key_to_command_table[(int) 'o'] = CMD_OPEN_DOOR;
    key_to_command_table[(int) 'p'] = CMD_PRAY;
    key_to_command_table[(int) 'q'] = CMD_QUAFF;
    key_to_command_table[(int) 'r'] = CMD_READ;
    key_to_command_table[(int) 's'] = CMD_SEARCH;
    key_to_command_table[(int) 't'] = CMD_THROW;
    key_to_command_table[(int) 'u'] = CMD_MOVE_UP_RIGHT;
    key_to_command_table[(int) 'v'] = CMD_EXAMINE_OBJECT;
    key_to_command_table[(int) 'w'] = CMD_WIELD_WEAPON;
    key_to_command_table[(int) 'x'] = CMD_LOOK_AROUND;
    key_to_command_table[(int) 'y'] = CMD_MOVE_UP_LEFT;
    key_to_command_table[(int) 'z'] = CMD_ZAP_WAND;

Replacement in trunk/source/liblinux.cc at line 258 [2.2550041]

B:BD[2.2557059] → [2.2557059:2558328]

    key_to_command_table['A'] = CMD_DISPLAY_MUTATIONS;
    key_to_command_table['B'] = CMD_RUN_DOWN_LEFT;
    key_to_command_table['C'] = CMD_EXPERIENCE_CHECK;
    key_to_command_table['D'] = CMD_BUTCHER;
    key_to_command_table['E'] = CMD_EVOKE;
    key_to_command_table['F'] = CMD_NO_CMD;
    key_to_command_table['G'] = CMD_NO_CMD;
    key_to_command_table['H'] = CMD_RUN_LEFT;
    key_to_command_table['I'] = CMD_OBSOLETE_INVOKE;
    key_to_command_table['J'] = CMD_RUN_DOWN;
    key_to_command_table['K'] = CMD_RUN_UP;
    key_to_command_table['L'] = CMD_RUN_RIGHT;
    key_to_command_table['M'] = CMD_MEMORISE_SPELL;
    key_to_command_table['N'] = CMD_RUN_DOWN_RIGHT;
    key_to_command_table['O'] = CMD_DISPLAY_OVERMAP;
    key_to_command_table['P'] = CMD_WEAR_JEWELLERY;
    key_to_command_table['Q'] = CMD_QUIT;
    key_to_command_table['R'] = CMD_REMOVE_JEWELLERY;
    key_to_command_table['S'] = CMD_SAVE_GAME;
    key_to_command_table['T'] = CMD_REMOVE_ARMOUR;
    key_to_command_table['U'] = CMD_RUN_UP_RIGHT;
    key_to_command_table['V'] = CMD_GET_VERSION;
    key_to_command_table['W'] = CMD_WEAR_ARMOUR;
    key_to_command_table['X'] = CMD_DISPLAY_MAP;
    key_to_command_table['Y'] = CMD_RUN_UP_LEFT;
    key_to_command_table['Z'] = CMD_CAST_SPELL;

[2.2557059]

[2.2558328]

    key_to_command_table[(int) 'A'] = CMD_DISPLAY_MUTATIONS;
    key_to_command_table[(int) 'B'] = CMD_RUN_DOWN_LEFT;
    key_to_command_table[(int) 'C'] = CMD_EXPERIENCE_CHECK;
    key_to_command_table[(int) 'D'] = CMD_BUTCHER;
    key_to_command_table[(int) 'E'] = CMD_EVOKE;
    key_to_command_table[(int) 'F'] = CMD_NO_CMD;
    key_to_command_table[(int) 'G'] = CMD_NO_CMD;
    key_to_command_table[(int) 'H'] = CMD_RUN_LEFT;
    key_to_command_table[(int) 'I'] = CMD_OBSOLETE_INVOKE;
    key_to_command_table[(int) 'J'] = CMD_RUN_DOWN;
    key_to_command_table[(int) 'K'] = CMD_RUN_UP;
    key_to_command_table[(int) 'L'] = CMD_RUN_RIGHT;
    key_to_command_table[(int) 'M'] = CMD_MEMORISE_SPELL;
    key_to_command_table[(int) 'N'] = CMD_RUN_DOWN_RIGHT;
    key_to_command_table[(int) 'O'] = CMD_DISPLAY_OVERMAP;
    key_to_command_table[(int) 'P'] = CMD_WEAR_JEWELLERY;
    key_to_command_table[(int) 'Q'] = CMD_QUIT;
    key_to_command_table[(int) 'R'] = CMD_REMOVE_JEWELLERY;
    key_to_command_table[(int) 'S'] = CMD_SAVE_GAME;
    key_to_command_table[(int) 'T'] = CMD_REMOVE_ARMOUR;
    key_to_command_table[(int) 'U'] = CMD_RUN_UP_RIGHT;
    key_to_command_table[(int) 'V'] = CMD_GET_VERSION;
    key_to_command_table[(int) 'W'] = CMD_WEAR_ARMOUR;
    key_to_command_table[(int) 'X'] = CMD_DISPLAY_MAP;
    key_to_command_table[(int) 'Y'] = CMD_RUN_UP_LEFT;
    key_to_command_table[(int) 'Z'] = CMD_CAST_SPELL;

Replacement in trunk/source/liblinux.cc at line 286 [2.2550041]

B:BD[2.2558344] → [2.2558344:2558533]

    key_to_command_table[ CONTROL('A') ] = CMD_TOGGLE_AUTOPICKUP;
    key_to_command_table[ CONTROL('B') ] = CMD_OPEN_DOOR_DOWN_LEFT;
    key_to_command_table[ CONTROL('C') ] = CMD_NO_CMD;

[2.2558344]

[2.2558533]

    key_to_command_table[ (int) CONTROL('A') ] = CMD_TOGGLE_AUTOPICKUP;
    key_to_command_table[ (int) CONTROL('B') ] = CMD_OPEN_DOOR_DOWN_LEFT;
    key_to_command_table[ (int) CONTROL('C') ] = CMD_NO_CMD;

Replacement in trunk/source/liblinux.cc at line 291 [2.2550041]

B:BD[2.2558568] → [2.2558568:2558629]

    key_to_command_table[ CONTROL('D') ] = CMD_DESTROY_ITEM;

[2.2558568]

[2.2558629]

    key_to_command_table[ (int) CONTROL('D') ] = CMD_DESTROY_ITEM;

Replacement in trunk/source/liblinux.cc at line 293 [2.2550041]
B:BD[2.2558635] → [2.2558635:2558690]
```
    key_to_command_table[ CONTROL('D') ] = CMD_NO_CMD;
```
[2.2558635]
[2.2558690]
```
    key_to_command_table[ (int) CONTROL('D') ] = CMD_NO_CMD;
```

Replacement in trunk/source/liblinux.cc at line 296 [2.2550041]

B:BD[2.2558698] → [2.2558698:2560005]

    key_to_command_table[ CONTROL('E') ] = CMD_NO_CMD;
    key_to_command_table[ CONTROL('F') ] = CMD_NO_CMD;
    key_to_command_table[ CONTROL('G') ] = CMD_NO_CMD;
    key_to_command_table[ CONTROL('H') ] = CMD_OPEN_DOOR_LEFT;
    key_to_command_table[ CONTROL('I') ] = CMD_NO_CMD;
    key_to_command_table[ CONTROL('J') ] = CMD_OPEN_DOOR_DOWN;
    key_to_command_table[ CONTROL('K') ] = CMD_OPEN_DOOR_UP;
    key_to_command_table[ CONTROL('L') ] = CMD_OPEN_DOOR_RIGHT;
    key_to_command_table[ CONTROL('M') ] = CMD_NO_CMD;
    key_to_command_table[ CONTROL('N') ] = CMD_OPEN_DOOR_DOWN_RIGHT;
    key_to_command_table[ CONTROL('O') ] = CMD_NO_CMD;
    key_to_command_table[ CONTROL('P') ] = CMD_REPLAY_MESSAGES;
    key_to_command_table[ CONTROL('Q') ] = CMD_NO_CMD;
    key_to_command_table[ CONTROL('R') ] = CMD_REDRAW_SCREEN;
    key_to_command_table[ CONTROL('S') ] = CMD_NO_CMD;
    key_to_command_table[ CONTROL('T') ] = CMD_NO_CMD;
    key_to_command_table[ CONTROL('U') ] = CMD_OPEN_DOOR_UP_LEFT;
    key_to_command_table[ CONTROL('V') ] = CMD_NO_CMD;
    key_to_command_table[ CONTROL('W') ] = CMD_NO_CMD;
    key_to_command_table[ CONTROL('X') ] = CMD_SAVE_GAME_NOW;
    key_to_command_table[ CONTROL('Y') ] = CMD_OPEN_DOOR_UP_RIGHT;
    key_to_command_table[ CONTROL('Z') ] = CMD_SUSPEND_GAME;

[2.2558698]

[2.2560005]

    key_to_command_table[ (int) CONTROL('E') ] = CMD_NO_CMD;
    key_to_command_table[ (int) CONTROL('F') ] = CMD_NO_CMD;
    key_to_command_table[ (int) CONTROL('G') ] = CMD_NO_CMD;
    key_to_command_table[ (int) CONTROL('H') ] = CMD_OPEN_DOOR_LEFT;
    key_to_command_table[ (int) CONTROL('I') ] = CMD_NO_CMD;
    key_to_command_table[ (int) CONTROL('J') ] = CMD_OPEN_DOOR_DOWN;
    key_to_command_table[ (int) CONTROL('K') ] = CMD_OPEN_DOOR_UP;
    key_to_command_table[ (int) CONTROL('L') ] = CMD_OPEN_DOOR_RIGHT;
    key_to_command_table[ (int) CONTROL('M') ] = CMD_NO_CMD;
    key_to_command_table[ (int) CONTROL('N') ] = CMD_OPEN_DOOR_DOWN_RIGHT;
    key_to_command_table[ (int) CONTROL('O') ] = CMD_NO_CMD;
    key_to_command_table[ (int) CONTROL('P') ] = CMD_REPLAY_MESSAGES;
    key_to_command_table[ (int) CONTROL('Q') ] = CMD_NO_CMD;
    key_to_command_table[ (int) CONTROL('R') ] = CMD_REDRAW_SCREEN;
    key_to_command_table[ (int) CONTROL('S') ] = CMD_NO_CMD;
    key_to_command_table[ (int) CONTROL('T') ] = CMD_NO_CMD;
    key_to_command_table[ (int) CONTROL('U') ] = CMD_OPEN_DOOR_UP_LEFT;
    key_to_command_table[ (int) CONTROL('V') ] = CMD_NO_CMD;
    key_to_command_table[ (int) CONTROL('W') ] = CMD_NO_CMD;
    key_to_command_table[ (int) CONTROL('X') ] = CMD_SAVE_GAME_NOW;
    key_to_command_table[ (int) CONTROL('Y') ] = CMD_OPEN_DOOR_UP_RIGHT;
    key_to_command_table[ (int) CONTROL('Z') ] = CMD_SUSPEND_GAME;

Replacement in trunk/source/liblinux.cc at line 320 [2.2550041]

B:BD[2.2560030] → [2.2560030:2560785]

    key_to_command_table['.'] = CMD_MOVE_NOWHERE;
    key_to_command_table['<'] = CMD_GO_UPSTAIRS;
    key_to_command_table['>'] = CMD_GO_DOWNSTAIRS;
    key_to_command_table['@'] = CMD_DISPLAY_CHARACTER_STATUS;
    key_to_command_table[','] = CMD_PICKUP;
    key_to_command_table[';'] = CMD_INSPECT_FLOOR;
    key_to_command_table['!'] = CMD_SHOUT;
    key_to_command_table['^'] = CMD_DISPLAY_RELIGION;
    key_to_command_table['#'] = CMD_CHARACTER_DUMP;
    key_to_command_table['='] = CMD_ADJUST_INVENTORY;
    key_to_command_table['?'] = CMD_DISPLAY_COMMANDS;
    key_to_command_table['`'] = CMD_MACRO_ADD;
    key_to_command_table['~'] = CMD_MACRO_SAVE;
    key_to_command_table['&'] = CMD_WIZARD;
    key_to_command_table['"'] = CMD_LIST_JEWELLERY;

[2.2560030]

[2.2560785]

    key_to_command_table[(int) '.'] = CMD_MOVE_NOWHERE;
    key_to_command_table[(int) '<'] = CMD_GO_UPSTAIRS;
    key_to_command_table[(int) '>'] = CMD_GO_DOWNSTAIRS;
    key_to_command_table[(int) '@'] = CMD_DISPLAY_CHARACTER_STATUS;
    key_to_command_table[(int) ','] = CMD_PICKUP;
    key_to_command_table[(int) ';'] = CMD_INSPECT_FLOOR;
    key_to_command_table[(int) '!'] = CMD_SHOUT;
    key_to_command_table[(int) '^'] = CMD_DISPLAY_RELIGION;
    key_to_command_table[(int) '#'] = CMD_CHARACTER_DUMP;
    key_to_command_table[(int) '='] = CMD_ADJUST_INVENTORY;
    key_to_command_table[(int) '?'] = CMD_DISPLAY_COMMANDS;
    key_to_command_table[(int) '`'] = CMD_MACRO_ADD;
    key_to_command_table[(int) '~'] = CMD_MACRO_SAVE;
    key_to_command_table[(int) '&'] = CMD_WIZARD;
    key_to_command_table[(int) '"'] = CMD_LIST_JEWELLERY;

Replacement in trunk/source/liblinux.cc at line 339 [2.2550041]

B:BD[2.2560925] → [2.2560925:2561023]

    key_to_command_table['['] = CMD_LIST_ARMOUR;
    key_to_command_table[']'] = CMD_LIST_ARMOUR;

[2.2560925]

[2.2561023]

    key_to_command_table[(int) '['] = CMD_LIST_ARMOUR;
    key_to_command_table[(int) ']'] = CMD_LIST_ARMOUR;

Replacement in trunk/source/liblinux.cc at line 345 [2.2550041]

B:BD[2.2561193] → [2.2561193:2561293]

    key_to_command_table[')'] = CMD_LIST_WEAPONS;
    key_to_command_table['('] = CMD_LIST_WEAPONS;

[2.2561193]

[2.2561293]

    key_to_command_table[(int) ')'] = CMD_LIST_WEAPONS;
    key_to_command_table[(int) '('] = CMD_LIST_WEAPONS;

Replacement in trunk/source/liblinux.cc at line 348 [2.2550041]

B:BD[2.2561294] → [2.2561294:2561404]

    key_to_command_table['\\'] = CMD_DISPLAY_KNOWN_OBJECTS;
    key_to_command_table['\''] = CMD_WEAPON_SWAP;

[2.2561294]

[2.2561404]

    key_to_command_table[(int) '\\'] = CMD_DISPLAY_KNOWN_OBJECTS;
    key_to_command_table[(int) '\''] = CMD_WEAPON_SWAP;

Replacement in trunk/source/liblinux.cc at line 352 [2.2550041]

B:BD[2.2561419] → [2.2561419:2561854]

    key_to_command_table['1'] = CMD_MOVE_DOWN_LEFT;
    key_to_command_table['2'] = CMD_MOVE_DOWN;
    key_to_command_table['3'] = CMD_MOVE_DOWN_RIGHT;
    key_to_command_table['4'] = CMD_MOVE_LEFT;
    key_to_command_table['5'] = CMD_REST;
    key_to_command_table['6'] = CMD_MOVE_RIGHT;
    key_to_command_table['7'] = CMD_MOVE_UP_LEFT;
    key_to_command_table['8'] = CMD_MOVE_UP;
    key_to_command_table['9'] = CMD_MOVE_UP_RIGHT;

[2.2561419]

[2.2561854]

    key_to_command_table[(int) '1'] = CMD_MOVE_DOWN_LEFT;
    key_to_command_table[(int) '2'] = CMD_MOVE_DOWN;
    key_to_command_table[(int) '3'] = CMD_MOVE_DOWN_RIGHT;
    key_to_command_table[(int) '4'] = CMD_MOVE_LEFT;
    key_to_command_table[(int) '5'] = CMD_REST;
    key_to_command_table[(int) '6'] = CMD_MOVE_RIGHT;
    key_to_command_table[(int) '7'] = CMD_MOVE_UP_LEFT;
    key_to_command_table[(int) '8'] = CMD_MOVE_UP;
    key_to_command_table[(int) '9'] = CMD_MOVE_UP_RIGHT;

Replacement in trunk/source/liblinux.cc at line 387 [2.2550041]

B:BD[2.2562798] → [2.2562798:2562872]

    key_to_command_table['*'] = '*';
    key_to_command_table['/'] = '/';

[2.2562798]

[2.2562872]

    key_to_command_table[(int) '*'] = '*';
    key_to_command_table[(int) '/'] = '/';

Replacement in trunk/source/itemname.h at line 22 [2.2661173]
B:BD[2.2661689] → [2.2661689:2661729]
```
char get_ident_type(char cla, char ty);
```
[2.2661689]
[2.2661729]
```
char get_ident_type(char cla, int ty);
```

Replacement in trunk/source/itemname.h at line 147 [2.2661173]

B:BD[2.2667132] → [2.2667132:2667208]

void set_ident_type( char cla, char ty, char setting, bool force = false );

[2.2667132]

[2.2667208]

void set_ident_type( char cla, int ty, char setting, bool force = false );

Insertion in trunk/source/itemname.cc at line 5 [2.2667494]
[2.2667589]
[2.2667589]
```
 *
 *  Modified for Crawl Reference by $Author$ on $Date$
```
Replacement in trunk/source/itemname.cc at line 2087 [2.2667494]
B:BD[2.2745577] → [2.2745577:2745601]
```
    char x = 0, jx = 0;
```
[2.2745577]
[2.2745601]
```
    int x = 0, jx = 0;
```
Replacement in trunk/source/itemname.cc at line 2101 [2.2667494]
B:BD[2.2745811] → [2.2745811:2745834]
```
    char i = 0, j = 0;
```
[2.2745811]
[2.2745834]
```
    int i = 0, j = 0;
```

Replacement in trunk/source/itemname.cc at line 2114 [2.2667494]

B:BD[2.2746022] → [2.2746022:2746089]

void set_ident_type( char cla, char ty, char setting, bool force )

[2.2746022]

[2.2746089]

void set_ident_type( char cla, int ty, char setting, bool force )

Replacement in trunk/source/itemname.cc at line 2147 [2.2667494]
B:BD[2.2746740] → [2.2746740:2746779]
```
char get_ident_type(char cla, char ty)
```
[2.2746740]
[2.2746779]
```
char get_ident_type(char cla, int ty)
```

Replacement in trunk/source/itemname.cc at line 2876 [2.2667494]

B:BD[2.2770991] → [2.2770991:2771076]

    char len;
    char i = 0;
    char nexty = 0;
    char j = 0;
    char igo = 0;

[2.2770991]

[2.2771076]

    int len;
    int i = 0;
    int nexty = 0;
    int j = 0;

Deletion in trunk/source/itemname.cc at line 2956 [2.2667494]
B:BD[2.2772593] → [2.2772593:2772630]
```
          hello:
            igo++;
```
Insertion in trunk/source/itemname.cc at line 2958 [2.2667494]
[2.2772641]
[2.2772641]
```
        hello:
```
Insertion in trunk/source/files.cc at line 5 [2.3084589]
[2.3084729]
[2.3084729]
```
 *
 *  Modified for Crawl Reference by $Author$ on $Date$
```

Replacement in trunk/source/files.cc at line 466 [2.3084589]

B:BD[2.3097447] → [2.3097447:3097501]

        char majorVersion;
        char minorVersion;

[2.3097447]

[2.3097501]

        char majorVersion = 0;
        char minorVersion = 0;

Replacement in trunk/source/files.cc at line 1127 [2.3084589]
B:BD[2.3117672] → [2.3117672:3117718]
```
    char majorVersion;
    char minorVersion;
```
[2.3117672]
[2.3117718]
```
    char majorVersion = 0;
    char minorVersion = 0;
```
Insertion in trunk/source/dungeon.cc at line 5 [2.3429798]
[2.3429917]
[2.3429917]
```
 *
 *  Modified for Crawl Reference by $Author$ on $Date$
```

Replacement in trunk/source/dungeon.cc at line 5148 [2.3429798]

B:BD[2.3598515] → [2.3598515:3598577]

    char roomsss = 10 + random2(90);
    char which_room = 0;

[2.3598515]

[2.3598577]

    int roomsss = 10 + random2(90);
    int which_room = 0;

Replacement in trunk/source/dungeon.cc at line 6952 [2.3429798]
B:BD[2.3652196] → [2.3652196:3652233]
```
    char roomsss = 30 + random2(90);
```
[2.3652196]
[2.3652233]
```
    int roomsss = 30 + random2(90);
```
Replacement in trunk/source/dungeon.cc at line 6959 [2.3429798]
B:BD[2.3652380] → [2.3652380:3652405]
```
    char which_room = 0;
```
[2.3652380]
[2.3652405]
```
    int which_room = 0;
```

Build fixes to build cleanly on OS X; switch from makefile.lnx to

Dependencies

In channels

Change contents

Insertion in trunk/source/spl-cast.cc at line 5 [2.293070]

Deletion in trunk/source/spl-cast.cc at line 17 [2.293070]

Insertion in trunk/source/spl-cast.cc at line 23 [2.293070]

Insertion in trunk/source/spells2.h at line 5 [2.562867]

Replacement in trunk/source/spells2.h at line 56 [2.562867]

Insertion in trunk/source/spells2.cc at line 5 [2.569242]

Replacement in trunk/source/spells2.cc at line 1088 [2.569242]

Insertion in trunk/source/skills2.h at line 5 [2.643583]

Replacement in trunk/source/skills2.h at line 73 [2.643583]

Insertion in trunk/source/skills2.cc at line 5 [2.647133]

Replacement in trunk/source/skills2.cc at line 2263 [2.647133]

Insertion in trunk/source/religion.cc at line 5 [2.804403]

Replacement in trunk/source/religion.cc at line 58 [2.804403]

Insertion in trunk/source/ouch.cc at line 5 [2.1104358]

Deletion in trunk/source/ouch.cc at line 28 [2.1104358]

Insertion in trunk/source/ouch.cc at line 58 [2.1104358]

Insertion in trunk/source/mutation.h at line 5 [2.1260415]

Replacement in trunk/source/mutation.h at line 37 [2.1260415]

Replacement in trunk/source/mutation.h at line 45 [2.1260415]

Insertion in trunk/source/mutation.cc at line 5 [2.1263003]

Replacement in trunk/source/mutation.cc at line 1111 [2.1263003]

Replacement in trunk/source/mutation.cc at line 1603 [2.1263003]

Replacement in trunk/source/mutation.cc at line 1605 [2.1263003]

Replacement in trunk/source/mutation.cc at line 1808 [2.1263003]

Insertion in trunk/source/mon-util.h at line 5 [2.1682293]

Replacement in trunk/source/mon-util.h at line 208 [2.1682293]

Insertion in trunk/source/mon-util.cc at line 5 [2.1699344]

Replacement in trunk/source/mon-util.cc at line 264 [2.1699344]

Insertion in trunk/source/makefile.osx at line 2 [2.2431088]

Replacement in trunk/source/makefile.osx at line 22 [2.2431088]

Deletion in trunk/source/makefile.osx at line 24 [2.2431088]

Replacement in trunk/source/makefile.osx at line 29 [2.2431088]

Insertion in trunk/source/makefile at line 1 [2.2455714]

Insertion in trunk/source/makefile at line 12 [2.2455714]

Replacement in trunk/source/makefile at line 16 [2.2455714]

Insertion in trunk/source/libutil.cc at line 4 [2.2494093]

Insertion in trunk/source/libutil.cc at line 16 [2.2494093]

Insertion in trunk/source/liblinux.cc at line 5 [2.2550041]

Replacement in trunk/source/liblinux.cc at line 230 [2.2550041]

Replacement in trunk/source/liblinux.cc at line 258 [2.2550041]

Replacement in trunk/source/liblinux.cc at line 286 [2.2550041]

Replacement in trunk/source/liblinux.cc at line 291 [2.2550041]

Replacement in trunk/source/liblinux.cc at line 293 [2.2550041]

Replacement in trunk/source/liblinux.cc at line 296 [2.2550041]

Replacement in trunk/source/liblinux.cc at line 320 [2.2550041]

Replacement in trunk/source/liblinux.cc at line 339 [2.2550041]

Replacement in trunk/source/liblinux.cc at line 345 [2.2550041]

Replacement in trunk/source/liblinux.cc at line 348 [2.2550041]

Replacement in trunk/source/liblinux.cc at line 352 [2.2550041]

Replacement in trunk/source/liblinux.cc at line 387 [2.2550041]

Replacement in trunk/source/itemname.h at line 22 [2.2661173]

Replacement in trunk/source/itemname.h at line 147 [2.2661173]

Insertion in trunk/source/itemname.cc at line 5 [2.2667494]

Replacement in trunk/source/itemname.cc at line 2087 [2.2667494]

Replacement in trunk/source/itemname.cc at line 2101 [2.2667494]

Replacement in trunk/source/itemname.cc at line 2114 [2.2667494]

Replacement in trunk/source/itemname.cc at line 2147 [2.2667494]

Replacement in trunk/source/itemname.cc at line 2876 [2.2667494]

Deletion in trunk/source/itemname.cc at line 2956 [2.2667494]

Insertion in trunk/source/itemname.cc at line 2958 [2.2667494]

Insertion in trunk/source/files.cc at line 5 [2.3084589]

Replacement in trunk/source/files.cc at line 466 [2.3084589]

Replacement in trunk/source/files.cc at line 1127 [2.3084589]

Insertion in trunk/source/dungeon.cc at line 5 [2.3429798]

Replacement in trunk/source/dungeon.cc at line 5148 [2.3429798]

Replacement in trunk/source/dungeon.cc at line 6952 [2.3429798]

Replacement in trunk/source/dungeon.cc at line 6959 [2.3429798]