fiddlerwoaroof/crawl - Change 677XWEUOX2NO2ANPHIRM72UOZVX4ZNHSOYALWL6MUCF65QEAPUBAC

Added DGL_NAMED_MACRO_FILE option to make life easier for dgamelaunch to keep

user macro files distinct (paxed).

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

Created by dshaligram on April 1, 2007

677XWEUOX2NO2ANPHIRM72UOZVX4ZNHSOYALWL6MUCF65QEAPUBAC

Dependencies

In channels

main

Change contents

Replacement in crawl-ref/source/macro.cc at line 181 [4.2457534]

B:BD[3.364] → [3.364:369]

[3.364]

[3.369]


#ifdef DGL_NAMED_MACRO_FILE
    return (dir + strip_filename_unsafe_chars(you.your_name) + "-macro.txt");
#else

Insertion in crawl-ref/source/macro.cc at line 186 [4.2457534]
[3.401]
[4.2459302]
```
#endif    
```
Deletion in crawl-ref/source/acr.cc at line 2875 [4.4397395]
∅:D[5.1163] → [6.208:209]
B:BD[6.208] → [6.208:209]
B:BD[6.227] → [6.227:264]
```
    // Load macros
    macro_init();
```
Insertion in crawl-ref/source/acr.cc at line 2891 [4.4397395]
[4.4470263]
[4.4470263]
```
    
    // Load macros
    macro_init();
```

Insertion in crawl-ref/source/AppHdr.h at line 228 [4.4573713]

[2.2554]

[7.27978]

    // Uses <playername>-macro.txt as the macro file if uncommented.
    // #define DGL_NAMED_MACRO_FILE