fiddlerwoaroof/crawl - Change JJCHVUDSWKDHVKOYATOUV7RLXAMVMTL6FFFVR7OBW57OCD7MW3PQC

[1941246] Cleaning up wininit.txt issues:

Crawl no longer croaks when not finding the file.
Deleted file from repository for the sake of convenience.
Fixed default sizes so that &amp;~ no longer wraps strangely.

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

Created by ennewalker on April 18, 2008

JJCHVUDSWKDHVKOYATOUV7RLXAMVMTL6FFFVR7OBW57OCD7MW3PQC

Dependencies

In channels

main

Change contents

File deletion: wininit.txt

BF:BFD[3.1] → [4.419:454]

BF:BFD[4.454] → [4.2:2]

B:BD[4.2] → [4.3:212]

∅:D[5.40] → [4.250:418]

B:BD[4.250] → [4.250:418]

B:BD[4.212] → [5.2:40]

Text:DngnX=19
Text:DngnY=17
Text:MapPx=4
Text:MsgX=73
Text:MsgY=10
Text:WindowTop=54
Text:WindowLeft=121
Text:FontName=8x13
Text:FontSize=19
Tile:DngnX=19
Tile:DngnY=17
Tile:MapPx=4
Tile:MsgX=73
Tile:MsgY=10
Tile:FontName=8x13
Tile:FontSize=16
Iso:DngnX=17
Iso:DngnY=17
Iso:MapPx=1
Iso:MsgX=40
Iso:MsgY=8
Iso:WindowTop=10
Iso:WindowLeft=73
Iso:FontName=8x16
Iso:FontSize=24
Tile:WindowTop=64
Tile:WindowLeft=273

Deletion in crawl-ref/source/tile2.cc at line 41 [4.13289]
B:BD[4.13844] → [4.13844:13872]
```
extern img_type TileIsoImg;
```
Replacement in crawl-ref/source/libgui.cc at line 80 [4.5793336]
B:BD[4.5795183] → [4.5795183:5795213]
```
img_type TileImg, TileIsoImg;
```
[4.5795183]
[4.5795213]
```
img_type TileImg;
```

Replacement in crawl-ref/source/libgui.cc at line 99 [4.5793336]

B:BD[4.5795703] → [4.5795703:5795797]

static int map_px = 3;
static int msg_x = 80, msg_y = 8;
static int dngn_x = 17, dngn_y = 17;

[4.5795703]

[4.5795797]

static int map_px = 4;
static int msg_x = 77, msg_y = 10;
static int dngn_x = 19, dngn_y = 17;

Replacement in crawl-ref/source/libgui.cc at line 107 [4.5793336]
B:BD[4.5795897] → [4.5795897:5795946]
```
static char font_name[MAX_PREF_CHAR+1] = "8x16";
```
[4.5795897]
[4.5795946]
```
static char font_name[MAX_PREF_CHAR+1] = "8x13";
```

Replacement in crawl-ref/source/libgui.cc at line 119 [4.5793336]

B:BD[4.5796190] → [4.5796190:5796339]

B:BD[4.5796339] → [2.34890:34921]

#define PREF_MODE_TEXT 0
#define PREF_MODE_TILE 1
#define PREF_MODE_ISO  2
#define PREF_MODE_NUM  3
static const char *pref_mode_name[PREF_MODE_NUM]
   = { "Text", "Tile", "Iso"};

[4.5796190]

[4.5796369]

#define PREF_MODE_TILE 0
#define PREF_MODE_NUM  1
static const char *pref_mode_name[PREF_MODE_NUM] = { "Tile"};

Replacement in crawl-ref/source/libgui.cc at line 151 [4.5793336]

B:BD[4.5797141] → [4.5797141:5797253]

    {"FONT     ", "FontName", 'S', font_name, 0,0,  0},
    {"FONT SIZE", "FontSize", 'I', &font_size, 8,24, 7}

[4.5797141]

[4.5797253]

    {"FONT     ", "FontName", 'S', font_name, 0, 0,  0},
    {"FONT SIZE", "FontSize", 'I', &font_size, 8, 24, 7}

Replacement in crawl-ref/source/libgui.cc at line 154 [4.5793336]

B:BD[4.5797271] → [4.5797271:5797401]

    ,{"DOS FONT", "DosFontName", 'S', dos_font_name, 0,0,  1},
    {"DOS FONT SIZE", "DosFontSize", 'I', &dos_font_size, 8,24, 8}

[4.5797271]

[4.5797401]

    ,{"DOS FONT", "DosFontName", 'S', dos_font_name, 0, 0, 1},
    {"DOS FONT SIZE", "DosFontSize", 'I', &dos_font_size, 8, 24, 8}

Deletion in crawl-ref/source/libgui.cc at line 688 [4.5793336]
B:BD[2.35957] → [2.35957:36009]
```
    if (TileIsoImg)
        ImgDestroy(TileIsoImg);
```

Replacement in crawl-ref/source/libgui.cc at line 727 [4.5793336]

B:BD[4.5812669] → [4.5812669:5812736]

    std::string winTxtString = datafile_path(baseTxt, true, true);

[4.5812669]

[4.5812736]

    std::string winTxtString = datafile_path(baseTxt, false, true);

Insertion in crawl-ref/source/libgui.cc at line 780 [4.5793336]
[4.5814452]
[4.5814452]
```
    if (!win_main)
        return;
```

[1941246] Cleaning up wininit.txt issues:

Dependencies

In channels

Change contents

File deletion: wininit.txt

Deletion in crawl-ref/source/tile2.cc at line 41 [4.13289]

Replacement in crawl-ref/source/libgui.cc at line 80 [4.5793336]

Replacement in crawl-ref/source/libgui.cc at line 99 [4.5793336]

Replacement in crawl-ref/source/libgui.cc at line 107 [4.5793336]

Replacement in crawl-ref/source/libgui.cc at line 119 [4.5793336]

Replacement in crawl-ref/source/libgui.cc at line 151 [4.5793336]

Replacement in crawl-ref/source/libgui.cc at line 154 [4.5793336]

Deletion in crawl-ref/source/libgui.cc at line 688 [4.5793336]

Replacement in crawl-ref/source/libgui.cc at line 727 [4.5793336]

Insertion in crawl-ref/source/libgui.cc at line 780 [4.5793336]