Techwizz/Gobligine
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

replaced s/FREECRAFT/STRATAGUS

Browse source
This commit is contained in:
ingo 2003-07-03 15:34:53 +00:00
parent 75dc2b5775
commit 09511c134f
13 changed files with 39 additions and 39 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
Makefile
View file

@ -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 \

2
Rules.make.in
View file

@ -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

2
contrib/installer/make-linux-installer.sh
View file

@ -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

2
doc/datadir.html
View file

@ -33,7 +33,7 @@ Proposal for the new FreeCraft data directory structure:
<i>{building}</i> : Replace with a building name: goldmine, farm, ...
<i>{race-campaign}</i> : Replace with a name of a campaign of a race: human-exp, ...
<b>$FREECRAFT_LIBRARY_PATH/data</b>
<b>$STRATAGUS_LIBRARY_PATH/data</b>
| Contains all data files for the FreeCraft game engine.
|
}-- <b>data/campaigns</b>

4
doc/graphics/tileset.html
View file

@ -24,7 +24,7 @@ The freecraft playfield is build with tiles each with the size of 32x32 pixels.
<h2>Tileset graphic file format</h2>
The graphic data for tiles are stored in the directory:
$FREECRAFTHOME/data/graphic/tileset.<p>
$STRATAGUSHOME/data/graphic/tileset.<p>
<h3>Fantasy warfare summer tileset</h3>
@ -73,7 +73,7 @@ The graphic data for tiles are stored in the directory:
The tiles are stored in the map with this numbers.<p>
The mapping from the map tile number to the graphic tile number is stored
in the file $FREECRAFTHOME/data/ccl/tileset.ccl.<p>
in the file $STRATAGUSHOME/data/ccl/tileset.ccl.<p>
The tiles in the map are numbered from 0 to 0x9DF (2527).

6
doc/scripts/unittype.html
View file

@ -182,11 +182,11 @@ Define unit stats.
Define the unit types in game it is based on the UDTA.<p>
The default unit types are defined in <a href="../../data/ccl/units.ccl">
$FREECRAFT_LIBRARY/data/units.ccl</a> and
$STRATAGUS_LIBRARY/data/units.ccl</a> and
<a href="../../data/ccl/human/units.ccl">
$FREECRAFT_LIBRARY/data/human/units.ccl</a> and
$STRATAGUS_LIBRARY/data/human/units.ccl</a> and
<a href="../../data/ccl/orc/units.ccl">
$FREECRAFT_LIBRARY/data/orc/units.ccl</a>. This could also be defined in
$STRATAGUS_LIBRARY/data/orc/units.ccl</a>. This could also be defined in
own levels. <p>
<h4>Syntax</h4>

8
setup
View file

@ -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

14
src/include/stratagus.h
View file

@ -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__

2
src/network/commands.cpp
View file

@ -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);

8
src/stratagus/iolib.cpp
View file

@ -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;

14
src/stratagus/script.cpp
View file

@ -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");

2
src/stratagus/stratagus.cpp
View file

@ -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";

8
src/ui/menus.cpp
View file

@ -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';