diff --git a/Makefile b/Makefile index 0895f9f67..826f04344 100644 --- a/Makefile +++ b/Makefile @@ -124,12 +124,12 @@ all-src: make-objdir $(OBJ) # UNIX-TARGET freecraft: $(OBJ) - $(CCLD) -o freecraft $^ $(FREECRAFT_LIBS) -I. $(CFLAGS) + $(CCLD) -o freecraft $^ $(STRATAGUS_LIBS) -I. $(CFLAGS) # WIN32-TARGET freecraft.exe: $(OBJ) etlib/$(OBJDIR)/getopt.$(OE) \ src/$(OBJDIR)/freecraftrc.$(OE) - $(CCLD) -o freecraft$(EXE) $^ -lSDLmain $(FREECRAFT_LIBS) -I. $(CFLAGS) + $(CCLD) -o freecraft$(EXE) $^ -lSDLmain $(STRATAGUS_LIBS) -I. $(CFLAGS) strip: @if [ -f freecraft ]; then strip freecraft; fi @@ -141,7 +141,7 @@ src/$(OBJDIR)/freecraftrc.$(OE): src/freecraft.rc echo:: @-echo CFLAGS: $(CFLAGS) - @-echo LIBS: $(FREECRAFT_LIBS) + @-echo LIBS: $(STRATAGUS_LIBS) clean:: for i in $(MODULES_ALL); do \ diff --git a/Rules.make.in b/Rules.make.in index 680223c32..8cf9db951 100644 --- a/Rules.make.in +++ b/Rules.make.in @@ -33,7 +33,7 @@ VERSION= '-DVERSION="1.18"' TOOLLIBS=$(XLDFLAGS) -lpng -lz -lm @THREAD_LIBS@ -L/usr/local/lib @STATIC_LDFLAGS@ -FREECRAFT_LIBS= -lpng -lz -lm \ +STRATAGUS_LIBS= -lpng -lz -lm \ @VIDEO_LIBS@ @THREAD_LIBS@ $(CCLLIB) $(COMP_LIBS) \ $(ARTSCLIB) @FLAC_LIBS@ @OGG_LIBS@ @MAD_LIBS@ @CDAUDIO_LIBS@ \ @STATIC_LDFLAGS@ -lz -lm -L/usr/local/lib diff --git a/contrib/installer/make-linux-installer.sh b/contrib/installer/make-linux-installer.sh index 2cc821929..a562550ed 100755 --- a/contrib/installer/make-linux-installer.sh +++ b/contrib/installer/make-linux-installer.sh @@ -151,7 +151,7 @@ else echo "*** NOTE: you will need to 'cd \$DIR/freecraft' before running ./freecraft ***" fi mkdir -p ~/.freecraft -echo "THIS FILE REQUIRED FOR FREECRAFT UNINSTALLATION, DO NOT REMOVE" > ~/.freecraft/freecraft.inst +echo "THIS FILE REQUIRED FOR STRATAGUS UNINSTALLATION, DO NOT REMOVE" > ~/.freecraft/freecraft.inst echo "\$DIR/freecraft \$STARTDIR/freecraft" >> ~/.freecraft/freecraft.inst if [ -d /tmp/cdrom.tmp ]; then umount /tmp/cdrom.tmp; rm -rf /tmp/cdrom.tmp; fi echo diff --git a/doc/datadir.html b/doc/datadir.html index e24dcf8fe..42e40f7f6 100644 --- a/doc/datadir.html +++ b/doc/datadir.html @@ -33,7 +33,7 @@ Proposal for the new FreeCraft data directory structure: {building} : Replace with a building name: goldmine, farm, ... {race-campaign} : Replace with a name of a campaign of a race: human-exp, ... -$FREECRAFT_LIBRARY_PATH/data +$STRATAGUS_LIBRARY_PATH/data | Contains all data files for the FreeCraft game engine. | }-- data/campaigns diff --git a/doc/graphics/tileset.html b/doc/graphics/tileset.html index 4976f4dd8..b60bbcb8b 100644 --- a/doc/graphics/tileset.html +++ b/doc/graphics/tileset.html @@ -24,7 +24,7 @@ The freecraft playfield is build with tiles each with the size of 32x32 pixels.

Tileset graphic file format

The graphic data for tiles are stored in the directory: - $FREECRAFTHOME/data/graphic/tileset.

+ $STRATAGUSHOME/data/graphic/tileset.

Fantasy warfare summer tileset

@@ -73,7 +73,7 @@ The graphic data for tiles are stored in the directory: The tiles are stored in the map with this numbers.

The mapping from the map tile number to the graphic tile number is stored -in the file $FREECRAFTHOME/data/ccl/tileset.ccl.

+in the file $STRATAGUSHOME/data/ccl/tileset.ccl.

The tiles in the map are numbered from 0 to 0x9DF (2527). diff --git a/doc/scripts/unittype.html b/doc/scripts/unittype.html index e05439cd5..63d4b94f1 100644 --- a/doc/scripts/unittype.html +++ b/doc/scripts/unittype.html @@ -182,11 +182,11 @@ Define unit stats. Define the unit types in game it is based on the UDTA.

The default unit types are defined in - $FREECRAFT_LIBRARY/data/units.ccl and + $STRATAGUS_LIBRARY/data/units.ccl and - $FREECRAFT_LIBRARY/data/human/units.ccl and + $STRATAGUS_LIBRARY/data/human/units.ccl and - $FREECRAFT_LIBRARY/data/orc/units.ccl. This could also be defined in + $STRATAGUS_LIBRARY/data/orc/units.ccl. This could also be defined in own levels.

Syntax

diff --git a/setup b/setup index c0616f776..23ea42bc3 100755 --- a/setup +++ b/setup @@ -694,7 +694,7 @@ case $ANSWER in echo "SDLCD = -DUSE_SDLCD" >> $RULESFILE if [ "$USESDL" != "1" ]; then echo "SDLCD = $SDLCD \$(shell $SDL_CONFIG --cflags)" >> $RULESFILE - echo "FREECRAFT_LIBS = \$(shell $SDL_CONFIG --libs)" >> $RULESFILE + echo "STRATAGUS_LIBS = \$(shell $SDL_CONFIG --libs)" >> $RULESFILE fi ;; [iI]) @@ -1038,7 +1038,7 @@ if [ "$BEOS" != 1 ] ; then echo "TOOLLIBS=\$(XLDFLAGS) -lpng -lz -lm \$(THREADLIB)" >> $RULESFILE # Libraries needed to build freecraft - echo "FREECRAFT_LIBS=$FREECRAFT_LIBS \$(XLDFLAGS) -lpng -lz -lm \\" >> $RULESFILE + echo "STRATAGUS_LIBS=$STRATAGUS_LIBS \$(XLDFLAGS) -lpng -lz -lm \\" >> $RULESFILE echo " \$(THREADLIB) \$(CCLLIB) \$(VIDEOLIB) \$(ZLIBS) \\" >> $RULESFILE echo " \$(ARTSCLIB) \$(FLACLIB) \$(OGGLIB) \$(MP3LIB) \\" >> $RULESFILE echo " $EXTRA_LDFLAGS -lz -lm" >> $RULESFILE @@ -1047,7 +1047,7 @@ if [ "$BEOS" != 1 ] ; then echo "TOOLLIBS=\$(XLDFLAGS) -lpng -lz \$(THREADLIB)" >> $RULESFILE # Libraries needed to build freecraft - echo "FREECRAFT_LIBS=\$(XLDFLAGS) -lpng -lz \\" >> $RULESFILE + echo "STRATAGUS_LIBS=\$(XLDFLAGS) -lpng -lz \\" >> $RULESFILE echo " \$(THREADLIB) \$(CCLLIB) \$(VIDEOLIB) \$(ZLIBS)" >> $RULESFILE fi else @@ -1055,7 +1055,7 @@ else echo "TOOLLIBS=\$(XLDFLAGS) -lpng -lz \$(THREADLIB)" >> $RULESFILE # Libraries needed to build freecraft - echo "FREECRAFT_LIBS=\$(XLDFLAGS) -lpng -lz \\" >> $RULESFILE + echo "STRATAGUS_LIBS=\$(XLDFLAGS) -lpng -lz \\" >> $RULESFILE echo " \$(THREADLIB) \$(CCLLIB) \$(VIDEOLIB) \$(ZLIBS)" >> $RULESFILE fi diff --git a/src/include/stratagus.h b/src/include/stratagus.h index 486ef78ca..37dd17dfc 100644 --- a/src/include/stratagus.h +++ b/src/include/stratagus.h @@ -23,8 +23,8 @@ // // $Id$ -#ifndef __FREECRAFT_H__ -#define __FREECRAFT_H__ +#ifndef __STRATAGUS_H__ +#define __STRATAGUS_H__ //@{ @@ -317,11 +317,11 @@ /// Text string: Name, Version, Copyright extern char NameLine[]; -#ifndef FREECRAFT_LIB_PATH -#define FREECRAFT_LIB_PATH "data" /// Where to find the data files +#ifndef STRATAGUS_LIB_PATH +#define STRATAGUS_LIB_PATH "data" /// Where to find the data files #endif -#ifndef FREECRAFT_HOME_PATH -#define FREECRAFT_HOME_PATH ".freecraft"/// Data files in user home dir +#ifndef STRATAGUS_HOME_PATH +#define STRATAGUS_HOME_PATH ".freecraft"/// Data files in user home dir #endif #define MAGIC_FOR_NEW_UNITS 33 /// How many percent of max mana for new units @@ -557,4 +557,4 @@ extern long isqrt(long num); //@} -#endif // !__FREECRAFT_H__ +#endif // !__STRATAGUS_H__ diff --git a/src/network/commands.cpp b/src/network/commands.cpp index dfba6c607..0e6777fa5 100644 --- a/src/network/commands.cpp +++ b/src/network/commands.cpp @@ -113,7 +113,7 @@ global void CommandLog(const char* name,const Unit* unit,int flag, strcat(buf,"/logs"); mkdir(buf); #else - sprintf(buf,"%s/%s",getenv("HOME"),FREECRAFT_HOME_PATH); + sprintf(buf,"%s/%s",getenv("HOME"),STRATAGUS_HOME_PATH); mkdir(buf,0777); strcat(buf,"/"); strcat(buf,GameName); diff --git a/src/stratagus/iolib.cpp b/src/stratagus/iolib.cpp index 1d797e769..70f8a28e7 100644 --- a/src/stratagus/iolib.cpp +++ b/src/stratagus/iolib.cpp @@ -434,24 +434,24 @@ global char* LibraryFileName(const char* file,char* buffer) // // In user home directory // - sprintf(buffer,"%s/%s/%s/%s",s,FREECRAFT_HOME_PATH,GameName,file); + sprintf(buffer,"%s/%s/%s/%s",s,STRATAGUS_HOME_PATH,GameName,file); if( !access(buffer,R_OK) ) { return buffer; } #ifdef USE_ZLIB // gzip or bzip2 in user home directory - sprintf(buffer,"%s/%s/%s/%s.gz",s,FREECRAFT_HOME_PATH,GameName,file); + sprintf(buffer,"%s/%s/%s/%s.gz",s,STRATAGUS_HOME_PATH,GameName,file); if( !access(buffer,R_OK) ) { return buffer; } #endif #ifdef USE_BZ2LIB - sprintf(buffer,"%s/%s/%s/%s.bz2",s,FREECRAFT_HOME_PATH,GameName,file); + sprintf(buffer,"%s/%s/%s/%s.bz2",s,STRATAGUS_HOME_PATH,GameName,file); if( !access(buffer,R_OK) ) { return buffer; } #endif #ifdef USE_ZZIPLIB - sprintf(buffer,"%s/%s/%s/%s",s,FREECRAFT_HOME_PATH,GameName,file); + sprintf(buffer,"%s/%s/%s/%s",s,STRATAGUS_HOME_PATH,GameName,file); if( (zp=zzip_open(buffer,O_RDONLY|O_BINARY)) ) { zzip_close(zp); return buffer; diff --git a/src/stratagus/script.cpp b/src/stratagus/script.cpp index 436624676..23eefdff5 100644 --- a/src/stratagus/script.cpp +++ b/src/stratagus/script.cpp @@ -516,10 +516,10 @@ local SCM CclGetFreeCraftHomePath(void) char* buf; cp=getenv("HOME"); - buf=alloca(strlen(cp)+strlen(GameName)+sizeof(FREECRAFT_HOME_PATH)+3); + buf=alloca(strlen(cp)+strlen(GameName)+sizeof(STRATAGUS_HOME_PATH)+3); strcpy(buf,cp); strcat(buf,"/"); - strcat(buf,FREECRAFT_HOME_PATH); + strcat(buf,STRATAGUS_HOME_PATH); strcat(buf,"/"); strcat(buf,GameName); @@ -531,7 +531,7 @@ local SCM CclGetFreeCraftHomePath(void) */ local SCM CclGetFreeCraftLibraryPath(void) { - return gh_str02scm(FREECRAFT_LIB_PATH); + return gh_str02scm(STRATAGUS_LIB_PATH); } /*............................................................................ @@ -802,7 +802,7 @@ local void LoadPreferences1(void) #ifdef USE_WIN32 strcpy(buf,"preferences1.ccl"); #else - sprintf(buf,"%s/%s/preferences1.ccl",getenv("HOME"),FREECRAFT_HOME_PATH); + sprintf(buf,"%s/%s/preferences1.ccl",getenv("HOME"),STRATAGUS_HOME_PATH); #endif fd=fopen(buf,"r"); @@ -823,7 +823,7 @@ local void LoadPreferences2(void) #ifdef USE_WIN32 sprintf(buf,"%s/preferences2.ccl",GameName); #else - sprintf(buf,"%s/%s/%s/preferences2.ccl",getenv("HOME"),FREECRAFT_HOME_PATH,GameName); + sprintf(buf,"%s/%s/%s/preferences2.ccl",getenv("HOME"),STRATAGUS_HOME_PATH,GameName); #endif fd=fopen(buf,"r"); @@ -849,7 +849,7 @@ global void SavePreferences(void) #ifdef USE_WIN32 strcpy(buf,"preferences1.ccl"); #else - sprintf(buf,"%s/%s",getenv("HOME"),FREECRAFT_HOME_PATH); + sprintf(buf,"%s/%s",getenv("HOME"),STRATAGUS_HOME_PATH); mkdir(buf,0777); strcat(buf,"/preferences1.ccl"); #endif @@ -875,7 +875,7 @@ global void SavePreferences(void) #ifdef USE_WIN32 sprintf(buf,"%s/preferences2.ccl",GameName); #else - sprintf(buf,"%s/%s/%s/preferences2.ccl",getenv("HOME"),FREECRAFT_HOME_PATH,GameName); + sprintf(buf,"%s/%s/%s/preferences2.ccl",getenv("HOME"),STRATAGUS_HOME_PATH,GameName); #endif fd=fopen(buf,"w"); diff --git a/src/stratagus/stratagus.cpp b/src/stratagus/stratagus.cpp index e158e4a61..a7bcc18ff 100644 --- a/src/stratagus/stratagus.cpp +++ b/src/stratagus/stratagus.cpp @@ -1405,7 +1405,7 @@ global int main(int argc,char** argv) // Setup some defaults. // #ifndef __APPLE__ - FreeCraftLibPath=FREECRAFT_LIB_PATH; + FreeCraftLibPath=STRATAGUS_LIB_PATH; #endif CclStartFile="ccl/freecraft.ccl"; EditorStartFile="ccl/editor.ccl"; diff --git a/src/ui/menus.cpp b/src/ui/menus.cpp index 71dbc0364..1d4c7c998 100644 --- a/src/ui/menus.cpp +++ b/src/ui/menus.cpp @@ -923,7 +923,7 @@ local void CreateSaveDir(void) #else strcpy(TempPathBuf,getenv("HOME")); strcat(TempPathBuf,"/"); - strcat(TempPathBuf,FREECRAFT_HOME_PATH); + strcat(TempPathBuf,STRATAGUS_HOME_PATH); mkdir(TempPathBuf,0777); strcat(TempPathBuf,"/"); strcat(TempPathBuf,GameName); @@ -2352,7 +2352,7 @@ local void SaveReplayOk(void) #ifdef WIN32 sprintf(TempPathBuf, "%s/logs/",GameName); #else - sprintf(TempPathBuf, "%s/%s/%s", getenv("HOME"), FREECRAFT_HOME_PATH,GameName); + sprintf(TempPathBuf, "%s/%s/%s", getenv("HOME"), STRATAGUS_HOME_PATH,GameName); strcat(TempPathBuf, "/logs/"); #endif ptr = TempPathBuf + strlen(TempPathBuf); @@ -6609,7 +6609,7 @@ local void ReplayGameMenu(void) sprintf(ScenSelectPath, "%s/logs",GameName); #else - sprintf(TempPathBuf,"%s/%s",getenv("HOME"),FREECRAFT_HOME_PATH); + sprintf(TempPathBuf,"%s/%s",getenv("HOME"),STRATAGUS_HOME_PATH); mkdir(TempPathBuf,0777); strcat(TempPathBuf,"/"); strcat(TempPathBuf,GameName); @@ -6617,7 +6617,7 @@ local void ReplayGameMenu(void) strcat(TempPathBuf,"/logs"); mkdir(TempPathBuf,0777); - sprintf(ScenSelectPath,"%s/%s/%s/logs", getenv("HOME"), FREECRAFT_HOME_PATH,GameName); + sprintf(ScenSelectPath,"%s/%s/%s/logs", getenv("HOME"), STRATAGUS_HOME_PATH,GameName); #endif *ScenSelectDisplayPath = '\0';