fiddlerwoaroof/crawl - Change L2BH25YQXSIQ7B66SXO7Q3IWUFVX7HTERRJZ5ZJJZS54ZETVFP6AC

Moved all option files to settings directory.

Crawl loads init.txt from data file path if it can't find any other .crawlrc.

makefile changes to copy settings directory to install dir. Tested only on Linux/tty.

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

Created by dshaligram on May 26, 2008

L2BH25YQXSIQ7B66SXO7Q3IWUFVX7HTERRJZ5ZJJZS54ZETVFP6AC

Dependencies

In channels

main

Change contents

File deletion: macro.txt, macro.txt

BF:BFD[5.1] → [5.6611:6644]

BF:BFD[5.6644] → [6.4596386:4596386]

BFD:BFD[6.4] → [6.4596865:4596898]

BF:BFD[6.4596898] → [6.4596386:4596386]

B:BD[6.4596386] → [6.4596387:4596864]

K:\033[1S~\015
A:H\1L8\4
K:\033[1~\015
A:B\1L8\4
K:\033[2S~\015
A:y\1L8\4
K:\033[3S~\015
A:J\1L8\4
K:\033[4S~\015
A:N\1L8\4
K:\033[4~\015
A:H\1L8\4
K:\033[5S~\015
A:b\1L8\4
K:\033[5~\015
A:5\1L8\4
K:\033[6S~\015
A:u\1L8\4
K:\033[6~\015
A:L\1L8\4
K:\033[7S~\015
A:n\1L8\4
K:\033[8S~\015
A:Y\1L8\4
K:\033[9S~\015
A:K\1L8\4
K:\033[A\015
A:U\1L8\4
K:\033[B\015
A:k\1L8\4
K:\033[C\015
A:j\1L8\4
K:\033[D\015
A:l\1L8\4
K:\033[G\015
A:h\1L8\4
K:\0345\015
A:.\1L8\4

Replacement in crawl-ref/source/makefile_tiles.mgw at line 58 [7.5750607]
B:BD[7.5751835] → [7.5751835:5751846]
```
LDFLAGS = 
```
[7.5751835]
[7.5751846]
```
LDFLAGS =
```
Insertion in crawl-ref/source/makefile_tiles.mgw at line 177 [7.5750607]
[3.2632]
[7.5754394]
```
		mkdir $(INSTALLDIR)\settings 2>null || echo "">nul
```
Insertion in crawl-ref/source/makefile_tiles.mgw at line 183 [7.5750607]
[3.2689]
[8.2674]
```
		copy /y ..\settings\* $(INSTALLDIR)\settings
```
Replacement in crawl-ref/source/makefile_tiles.mgw at line 205 [7.5750607]
B:BD[7.5755123] → [7.5755123:5755149]
```
		$(DELETE) $(OPATH)\*.o 
```
[7.5755123]
[7.5755149]
```
		$(DELETE) $(OPATH)\*.o
```
Replacement in crawl-ref/source/makefile_tiles.mgw at line 211 [7.5750607]
B:BD[7.5755269] → [7.5755269:5755318]
```
		$(DELETE) scores 
		$(DELETE) $(OPATH)\scores 
```
[7.5755269]
[7.5755318]
```
		$(DELETE) scores
		$(DELETE) $(OPATH)\scores
```
Replacement in crawl-ref/source/makefile_tiles.mgw at line 235 [7.5750607]
B:BD[7.5755863] → [7.5755863:5755895]
```
		${CXX} ${CFLAGS} -o $@ -c $< 
```
[7.5755863]
[7.5755895]
```
		${CXX} ${CFLAGS} -o $@ -c $<
```
Replacement in crawl-ref/source/makefile.x11 at line 30 [7.5756330]
B:BD[7.5757108] → [7.5757108:5757150]
```
# The user:group to install the game as. 
```
[7.5757108]
[7.5757150]
```
# The user:group to install the game as.
```

Insertion in crawl-ref/source/makefile.x11 at line 234 [7.5756330]

[7.5761999]

ifeq ($(DATADIR),)
	$(error DATADIR not set! Set DATADIR and run make clean install again)
endif

Deletion in crawl-ref/source/makefile.x11 at line 241 [7.5756330]
B:BD[7.5762162] → [7.5762162:5762259]
```
ifeq ($(DATADIR),)
	$(error DATADIR not set! Set DATADIR and run make clean install again)
endif
```
Insertion in crawl-ref/source/makefile.x11 at line 251 [7.5756330]
[3.2880]
[7.5762412]
```
	mkdir -p $(DATADIR)/settings
	cp ../settings/* $(DATADIR)/settings/
```
Replacement in crawl-ref/source/makefile.unix at line 39 [10.604320]
B:BD[9.25622] → [9.25622:25664]
```
# The user:group to install the game as. 
```
[9.25622]
[2.230]
```
# The user:group to install the game as.
```

Insertion in crawl-ref/source/makefile.unix at line 228 [10.604320]

[10.606903]

[11.344]

ifeq ($(DATADIR),)
	$(error DATADIR not set! Set DATADIR and run make clean install again)
endif

Deletion in crawl-ref/source/makefile.unix at line 235 [10.604320]
B:BD[10.606973] → [10.606973:607070]
```
ifeq ($(DATADIR),)
	$(error DATADIR not set! Set DATADIR and run make clean install again)
endif
```
Insertion in crawl-ref/source/makefile.unix at line 245 [10.604320]
[3.3071]
[11.393]
```
	mkdir -p $(DATADIR)/settings
	cp ../settings/* $(DATADIR)/settings/
```
Replacement in crawl-ref/source/makefile.mgw at line 56 [12.272908]
∅:D[10.610587] → [12.273351:273362]
B:BD[12.273351] → [12.273351:273362]
```
LDFLAGS = 
```
[10.610587]
[10.610588]
```
LDFLAGS =
```
Insertion in crawl-ref/source/makefile.mgw at line 134 [12.272908]
[3.3132]
[13.102]
```
		mkdir $(INSTALLDIR)\settings 2>null || echo "">nul
```
Replacement in crawl-ref/source/makefile.mgw at line 140 [12.272908]
∅:D[14.301] → [13.140:176]
∅:D[15.353] → [13.140:176]
∅:D[16.582] → [13.140:176]
∅:D[3.3189] → [13.140:176]
B:BD[13.140] → [13.140:176]
```
		copy /y ..\init.txt $(INSTALLDIR)
```
[3.3189]
[12.273538]
```
		copy /y ..\settings\* $(INSTALLDIR)\settings
		copy /y ..\init.txt   $(INSTALLDIR)
```
Replacement in crawl-ref/source/makefile.mgw at line 160 [12.272908]
∅:D[17.116] → [10.612468:612494]
∅:D[18.986750] → [10.612468:612494]
∅:D[19.2241329] → [10.612468:612494]
B:BD[12.273574] → [10.612468:612494]
```
		$(DELETE) $(OPATH)\*.o 
```
[19.2241329]
[10.612494]
```
		$(DELETE) $(OPATH)\*.o
```
Replacement in crawl-ref/source/makefile.mgw at line 166 [12.272908]
∅:D[10.612573] → [12.273634:273654]
B:BD[12.273634] → [12.273634:273654]
B:BD[12.273654] → [10.612574:612603]
```
		$(DELETE) scores 
		$(DELETE) $(OPATH)\scores 
```
[10.612573]
[10.612603]
```
		$(DELETE) scores
		$(DELETE) $(OPATH)\scores
```
Replacement in crawl-ref/source/makefile.mgw at line 190 [12.272908]
B:BD[10.613063] → [10.613063:613095]
```
		${CXX} ${CFLAGS} -o $@ -c $< 
```
[10.613063]
[10.613095]
```
		${CXX} ${CFLAGS} -o $@ -c $<
```

Replacement in crawl-ref/source/initfile.cc at line 1136 [6.2957258]

B:BD[4.4633] → [4.4633:4650]

    return ("");

[4.4633]

[4.4650]

    // Last attempt: pick up init.txt from datafile_path, which will
    // also search the settings/ directory.
    return (datafile_path("init.txt", false, false));

File addition: settings (d--x------)
[5.1]
File move: init.txt → init.txt
BF:BFD[5.1] → [5.7069:7101]
BF:BF[5.7101] → [6.4830895:4830895]
[0.3846]
[6.4830895]
File move: 034_monster_glyphs.txt → 034_monster_glyphs.txt
BF:BFD[5.7174] → [20.3237:3283]
BF:BF[20.3283] → [21.7946:7946]
[0.3846]
[21.7946]
File move: 034_command_keys.txt → 034_command_keys.txt
BF:BFD[5.7174] → [20.3951:3995]
BF:BF[20.3995] → [20.3285:3285]
[0.3846]
[20.3285]

Moved all option files to settings directory.

Dependencies

In channels

Change contents

File deletion: macro.txt, macro.txt

Replacement in crawl-ref/source/makefile_tiles.mgw at line 58 [7.5750607]

Insertion in crawl-ref/source/makefile_tiles.mgw at line 177 [7.5750607]

Insertion in crawl-ref/source/makefile_tiles.mgw at line 183 [7.5750607]

Replacement in crawl-ref/source/makefile_tiles.mgw at line 205 [7.5750607]

Replacement in crawl-ref/source/makefile_tiles.mgw at line 211 [7.5750607]

Replacement in crawl-ref/source/makefile_tiles.mgw at line 235 [7.5750607]

Replacement in crawl-ref/source/makefile.x11 at line 30 [7.5756330]

Insertion in crawl-ref/source/makefile.x11 at line 234 [7.5756330]

Deletion in crawl-ref/source/makefile.x11 at line 241 [7.5756330]

Insertion in crawl-ref/source/makefile.x11 at line 251 [7.5756330]

Replacement in crawl-ref/source/makefile.unix at line 39 [10.604320]

Insertion in crawl-ref/source/makefile.unix at line 228 [10.604320]

Deletion in crawl-ref/source/makefile.unix at line 235 [10.604320]

Insertion in crawl-ref/source/makefile.unix at line 245 [10.604320]

Replacement in crawl-ref/source/makefile.mgw at line 56 [12.272908]

Insertion in crawl-ref/source/makefile.mgw at line 134 [12.272908]

Replacement in crawl-ref/source/makefile.mgw at line 140 [12.272908]

Replacement in crawl-ref/source/makefile.mgw at line 160 [12.272908]

Replacement in crawl-ref/source/makefile.mgw at line 166 [12.272908]

Replacement in crawl-ref/source/makefile.mgw at line 190 [12.272908]

Replacement in crawl-ref/source/initfile.cc at line 1136 [6.2957258]

File addition: settings (d--x------)

File move: init.txt → init.txt

File move: 034_monster_glyphs.txt → 034_monster_glyphs.txt

File move: 034_command_keys.txt → 034_command_keys.txt