diff --git a/.cvsignore b/.cvsignore
index d0f070cbc..5a22c79cc 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1,8 +1,8 @@
Rules.make
-freecraft
-freecraft.exe
+stratagus
+stratagus.exe
gmon.out
-save_file_of_freecraft.ccl
+save_file_of_stratagus.ccl
.cvsignore
Rules.make.WIN32
core
@@ -20,11 +20,11 @@ Debug
Release
include
lib
-freecraft.opt
-freecraft.dsp
-freecraft.dsw
-freecraft.plg
-freecraft.ncb
+stratagus.opt
+stratagus.dsp
+stratagus.dsw
+stratagus.plg
+stratagus.ncb
startool.dsp
startool.plg
startool___Win32_Debug
diff --git a/Makefile b/Makefile
index 826f04344..e09ae5b48 100644
--- a/Makefile
+++ b/Makefile
@@ -6,17 +6,17 @@
## \/ \/ \/ \/ \/
## ______________________ ______________________
## T H E W A R B E G I N S
-## FreeCraft - A free fantasy real time strategy game engine
+## Stratagus - A free fantasy real time strategy game engine
##
## Makefile - The make file.
##
## (c) Copyright 1998-2003 by Lutz Sammer and Nehal Mistry
##
-## FreeCraft is free software; you can redistribute it and/or modify
+## Stratagus is free software; you can redistribute it and/or modify
## it under the terms of the GNU General Public License as published
## by the Free Software Foundation; only version 2 of the License.
##
-## FreeCraft is distributed in the hope that it will be useful,
+## Stratagus is distributed in the hope that it will be useful,
## but WITHOUT ANY WARRANTY; without even the implied warranty of
## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
## GNU General Public License for more details.
@@ -37,7 +37,7 @@ CROSSDIR = /usr/local/cross
INCLUDE_DIRS = src/include src/movie/vp31/include etlib
-MODULES = src/action src/ai src/beos src/clone src/editor src/freecraft src/game src/libmodplug src/map \
+MODULES = src/action src/ai src/beos src/clone src/editor src/stratagus src/game src/libmodplug src/map \
src/missile src/movie src/movie/vp31 src/network src/pathfinder src/siod src/sound src/ui src/unit \
src/video etlib
@@ -67,7 +67,7 @@ OBJ_ALL = $(OBJ) $(OBJ_TOOLS)
.PHONY: make-objdir all-src
-all: all-src freecraft$(EXE) tools
+all: all-src stratagus$(EXE) tools
make-objdir:
@for i in $(MODULES); do \
@@ -87,7 +87,7 @@ help:
@-echo "make doc make source documention with doxygen"
@-echo "make doc++ make source documention with doc++"
@-echo "make lockver NAME="version" label current version with symbolic name"
- @-echo "make strip strip freecraft and/or freecraft.exe"
+ @-echo "make strip strip stratagus and/or stratagus.exe"
@-echo "make tags create ctags"
@-echo "make depend create dependencies"
@-echo "make dist create distribution"
@@ -105,15 +105,15 @@ cycle::
@$(MAKE) all
run::
- @$(MAKE) && ./freecraft
+ @$(MAKE) && ./stratagus
runp::
- @$(MAKE) && ./freecraft && if [ -e gmon.sum ]; then \
- gprof -s freecraft gmon.out gmon.sum; \
+ @$(MAKE) && ./stratagus && if [ -e gmon.sum ]; then \
+ gprof -s stratagus gmon.out gmon.sum; \
else mv gmon.out gmon.sum; fi
doc::
- doxygen contrib/doxygen-freecraft.cfg
+ doxygen contrib/doxygen-stratagus.cfg
doc++::
@$(MAKE) -C src RULESFILE=$(RULESFILE) doc
@@ -123,21 +123,21 @@ doc++::
all-src: make-objdir $(OBJ)
# UNIX-TARGET
-freecraft: $(OBJ)
- $(CCLD) -o freecraft $^ $(STRATAGUS_LIBS) -I. $(CFLAGS)
+stratagus: $(OBJ)
+ $(CCLD) -o stratagus $^ $(STRATAGUS_LIBS) -I. $(CFLAGS)
# WIN32-TARGET
-freecraft.exe: $(OBJ) etlib/$(OBJDIR)/getopt.$(OE) \
- src/$(OBJDIR)/freecraftrc.$(OE)
- $(CCLD) -o freecraft$(EXE) $^ -lSDLmain $(STRATAGUS_LIBS) -I. $(CFLAGS)
+stratagus.exe: $(OBJ) etlib/$(OBJDIR)/getopt.$(OE) \
+ src/$(OBJDIR)/stratagusrc.$(OE)
+ $(CCLD) -o stratagus$(EXE) $^ -lSDLmain $(STRATAGUS_LIBS) -I. $(CFLAGS)
strip:
- @if [ -f freecraft ]; then strip freecraft; fi
- @if [ -f freecraft.exe ]; then $(CROSSDIR)/i386-mingw32msvc/bin/strip freecraft.exe; fi
+ @if [ -f stratagus ]; then strip stratagus; fi
+ @if [ -f stratagus.exe ]; then $(CROSSDIR)/i386-mingw32msvc/bin/strip stratagus.exe; fi
-src/$(OBJDIR)/freecraftrc.$(OE): src/freecraft.rc
+src/$(OBJDIR)/stratagusrc.$(OE): src/stratagus.rc
if [ ! -d src/$(OBJDIR) ]; then mkdir src/$(OBJDIR); fi
- windres --include-dir contrib -o src/$(OBJDIR)/freecraftrc.$(OE) src/freecraft.rc
+ windres --include-dir contrib -o src/$(OBJDIR)/stratagusrc.$(OE) src/stratagus.rc
echo::
@-echo CFLAGS: $(CFLAGS)
@@ -153,13 +153,13 @@ distclean: clean
for i in $(MODULES_ALL); do \
[ $(OBJDIR) == "." ] || $(RM) -rf $$i/$(OBJDIR); \
$(RM) $$i/.#* $$i/*~; done
- $(RM) freecraft$(EXE) gmon.sum .depend .#* *~ stderr.txt stdout.txt
+ $(RM) stratagus$(EXE) gmon.sum .depend .#* *~ stderr.txt stdout.txt
$(RM) -r srcdoc/*
@echo
lockver:
$(LOCKVER) Makefile $(RULESFILE) .indent.pro \
- contrib/doxygen-freecraft.cfg \
+ contrib/doxygen-stratagus.cfg \
$(CCLS) $(DOCS) $(SRC_ALL) src/beos/beos.cpp $(HDRS) Makefile
for i in $(MODULES_ALL); do $(LOCKVER) Module.make; done
@@ -220,11 +220,11 @@ DOCS = README doc/index.html doc/install.html \
doc/ccl/icon.html doc/ccl/tileset.html doc/ccl/unittype.html \
doc/ccl/research.html doc/graphic/* \
doc/trigger.txt doc/vp32_opensource_license_9-6-01.txt \
- debian/freecraft.6 doc/ccl/ccl-index.html doc/ccl/game.html \
+ debian/stratagus.6 doc/ccl/ccl-index.html doc/ccl/game.html \
doc/ccl/icon.html doc/ccl/sound.html doc/ccl/triggers.html \
doc/ccl/ui.html
-PICS = contrib/freecraft.png contrib/freecraft.ico
+PICS = contrib/stratagus.png contrib/stratagus.ico
PUDS = contrib/puds/single/*.txt contrib/puds/single/*.pud.gz \
contrib/puds/multi/*.txt contrib/puds/multi/*.pud.gz
@@ -233,7 +233,7 @@ CCLS = data/ccl/units.ccl data/ccl/human/units.ccl data/ccl/orc/units.ccl \
data/ccl/constructions.ccl data/ccl/human/constructions.ccl \
data/ccl/orc/constructions.ccl \
data/ccl/missiles.ccl data/ccl/icons.ccl \
- data/ccl/sound.ccl data/ccl/freecraft.ccl \
+ data/ccl/sound.ccl data/ccl/stratagus.ccl \
data/ccl/ui.ccl data/ccl/human/ui.ccl data/ccl/orc/ui.ccl \
data/ccl/upgrade.ccl data/ccl/human/upgrade.ccl \
data/ccl/orc/upgrade.ccl \
@@ -255,19 +255,19 @@ CONTRIB = contrib/cross.png contrib/red_cross.png \
contrib/health2.png contrib/mana2.png \
contrib/ore,stone,coal.png contrib/food.png contrib/score.png \
contrib/music/toccata.mod.gz \
- contrib/FreeCraft-beos.proj.gz \
+ contrib/Stratagus-beos.proj.gz \
contrib/msvc.zip contrib/macosx.tgz contrib/stdint.h \
contrib/campaigns/*/*.cm
MISC += Makefile Rules.make.orig setup \
- contrib/doxygen-freecraft.cfg contrib/doxygen-header.html \
+ contrib/doxygen-stratagus.cfg contrib/doxygen-header.html \
.indent.pro Rules.make.in configure.in configure \
$(CONTRIB) \
\
- src/freecraft.rc data/default.cm
+ src/stratagus.rc data/default.cm
mydate = $(shell date +%y%m%d)
-distdir = freecraft-$(mydate)
+distdir = stratagus-$(mydate)
distlist:
@echo $(SRC_ALL) $(HDRS) src/beos/beos.cpp > $(DISTLIST)
@@ -288,7 +288,7 @@ dist: distlist
for i in `cat $(DISTLIST)`; do echo $$i; done | cpio -pdml --quiet $(distdir)
chmod -R a+rX $(distdir)
tar czhf $(distdir)-src.tar.gz $(distdir)
- echo "(c) 2003 by the FreeCraft Project http://FreeCraft.Org" | \
+ echo "(c) 2003 by the Stratagus Project http://Stratagus.Org" | \
zip -zq9r $(distdir)-src.zip $(distdir)
$(RM) $(DISTLIST)
$(RM) -r $(distdir)
@@ -301,7 +301,7 @@ bin-dist: all
echo $(CONTRIB) >>$(DISTLIST)
echo $(CCLS) >>$(DISTLIST)
echo $(DOCS) >>$(DISTLIST)
- echo freecraft$(EXE) >>$(DISTLIST)
+ echo stratagus$(EXE) >>$(DISTLIST)
echo tools/wartool$(EXE) >>$(DISTLIST)
rm -rf $(distdir)
mkdir $(distdir)
@@ -309,9 +309,9 @@ bin-dist: all
for i in `cat $(DISTLIST)`; do echo $$i; done | cpio -pdml --quiet $(distdir)
cp tools/build.sh $(distdir)
chmod -R a+rX $(distdir)
- strip -s -R .comment $(distdir)/freecraft$(EXE)
+ strip -s -R .comment $(distdir)/stratagus$(EXE)
strip -s -R .comment $(distdir)/tools/wartool$(EXE)
- tar czhf freecraft-$(mydate)-linux.tar.gz $(distdir)
+ tar czhf stratagus-$(mydate)-linux.tar.gz $(distdir)
$(RM) $(DISTLIST)
$(RM) -r $(distdir)
@@ -325,7 +325,7 @@ win32-bin-dist2: win32
@echo $(CCLS) >>$(DISTLIST)
@echo $(DOCS) >>$(DISTLIST)
@echo doc/README-SDL.txt >>$(DISTLIST)
- @echo freecraft$(EXE) >>$(DISTLIST)
+ @echo stratagus$(EXE) >>$(DISTLIST)
@echo tools/wartool$(EXE) >>$(DISTLIST)
@rm -rf $(distdir)
@mkdir $(distdir)
@@ -333,13 +333,13 @@ win32-bin-dist2: win32
@for i in `cat $(DISTLIST)`; do echo $$i; done | cpio -pdml --quiet $(distdir)
@cp tools/build.bat $(distdir)
@chmod -R a+rX $(distdir)
- @strip -s -R .comment $(distdir)/freecraft$(EXE)
+ @strip -s -R .comment $(distdir)/stratagus$(EXE)
@strip -s -R .comment $(distdir)/tools/wartool$(EXE)
- @echo "(c) 2003 by the FreeCraft Project http://FreeCraft.Org" | \
- zip -zq9r freecraft-$(mydate)-win32bin.zip $(distdir)
+ @echo "(c) 2003 by the Stratagus Project http://Stratagus.Org" | \
+ zip -zq9r stratagus-$(mydate)-win32bin.zip $(distdir)
@$(RM) $(DISTLIST)
@$(RM) -r $(distdir)
- du -h freecraft-$(mydate)-win32bin.zip
+ du -h stratagus-$(mydate)-win32bin.zip
win32-bin-dist: win32
@export PATH=$(CROSSDIR)/i386-mingw32msvc/bin:$(CROSSDIR)/bin:$$PATH; \
@@ -347,7 +347,7 @@ win32-bin-dist: win32
#----------------------------------------------------------------------------
-difffile= freecraft-`date +%y%m%d`.diff
+difffile= stratagus-`date +%y%m%d`.diff
diff:
@$(RM) $(difffile)
@$(RM) $(DISTLIST)
@@ -364,7 +364,7 @@ buildit: tools
buildclean:
rm -rf data/*.rgb data/*.gimp data/puds data/sound data/graphic \
data/interface data/campaigns data/text data/health.png data/mana.png \
- data/default.pud.gz data/freecraft.png
+ data/default.pud.gz data/stratagus.png
rm -rf data/graphics data/sounds data/texts data/music data/videos
release:
@@ -404,30 +404,30 @@ win32distclean:
# INSTALL/UNINSTALL
##############################################################################
-install: all install-freecraft install-tools
+install: all install-stratagus install-tools
-install-freecraft:
- @echo installing freecraft
- mkdir -p $(PREFIX)/lib/games/freecraft
+install-stratagus:
+ @echo installing stratagus
+ mkdir -p $(PREFIX)/lib/games/stratagus
mkdir -p /var/lib/games
- install -m 755 freecraft $(PREFIX)/lib/games/freecraft
- cp -R data $(PREFIX)/lib/games/freecraft
- echo "$(PREFIX)/lib/games/freecraft/freecraft \
- -d $(PREFIX)/lib/games/freecraft/data "\$$\@" | tee /var/lib/games/freecraft.log" \
- >$(PREFIX)/bin/freecraft
- chmod +x $(PREFIX)/bin/freecraft
- @echo installation of freecraft complete
+ install -m 755 stratagus $(PREFIX)/lib/games/stratagus
+ cp -R data $(PREFIX)/lib/games/stratagus
+ echo "$(PREFIX)/lib/games/stratagus/stratagus \
+ -d $(PREFIX)/lib/games/stratagus/data "\$$\@" | tee /var/lib/games/stratagus.log" \
+ >$(PREFIX)/bin/stratagus
+ chmod +x $(PREFIX)/bin/stratagus
+ @echo installation of stratagus complete
install-tools: all
- @echo installing freecraft tools
- mkdir -p $(PREFIX)/lib/games/freecraft/tools
- install -m 755 tools/wartool $(PREFIX)/lib/games/freecraft/tools
- install -m 755 tools/build.sh $(PREFIX)/lib/games/freecraft/tools
- @echo installation of freecraft tools complete
+ @echo installing stratagus tools
+ mkdir -p $(PREFIX)/lib/games/stratagus/tools
+ install -m 755 tools/wartool $(PREFIX)/lib/games/stratagus/tools
+ install -m 755 tools/build.sh $(PREFIX)/lib/games/stratagus/tools
+ @echo installation of stratagus tools complete
uninstall:
- @echo uninstalling freecraft and freecraft tools
- rm -rf $(PREFIX)/lib/games/freecraft
- rm $(PREFIX)/bin/freecraft
+ @echo uninstalling stratagus and stratagus tools
+ rm -rf $(PREFIX)/lib/games/stratagus
+ rm $(PREFIX)/bin/stratagus
@echo uninstallation complete
diff --git a/README b/README
index a42704616..5fc34c9c7 100644
--- a/README
+++ b/README
@@ -7,8 +7,8 @@
\/ \/ \/ \/ \/
______________________ ______________________
T H E W A R B E G I N S
- FreeCraft - A free fantasy real time strategy game engine
+ Stratagus - A free fantasy real time strategy game engine
Read 'doc/index.html' for general information and license information.
-Read 'doc/install.html' for FreeCraft installation instructions.
-Read 'doc/ChangeLog.html' for the FreeCraft changelog.
+Read 'doc/install.html' for Stratagus installation instructions.
+Read 'doc/ChangeLog.html' for the Stratagus changelog.
diff --git a/Rules.make.in b/Rules.make.in
index 8cf9db951..eaa65adf3 100644
--- a/Rules.make.in
+++ b/Rules.make.in
@@ -6,7 +6,7 @@
## \/ \/ \/ \/ \/
## ______________________ ______________________
## T H E W A R B E G I N S
-## FreeCraft - A free fantasy real time strategy game engine
+## Stratagus - A free fantasy real time strategy game engine
##
# Compile commands
diff --git a/Rules.make.orig b/Rules.make.orig
index cac5dbf9b..87ccdf113 100644
--- a/Rules.make.orig
+++ b/Rules.make.orig
@@ -6,17 +6,17 @@
## \/ \/ \/ \/ \/
## ______________________ ______________________
## T H E W A R B E G I N S
-## FreeCraft - A free fantasy real time strategy game engine
+## Stratagus - A free fantasy real time strategy game engine
##
## Rules.make - Make RULES (GNU MAKE) (included from Makefile).
##
## (c) Copyright 1998-2002 by Lutz Sammer
##
-## FreeCraft is free software; you can redistribute it and/or modify
+## Stratagus is free software; you can redistribute it and/or modify
## it under the terms of the GNU General Public License as published
## by the Free Software Foundation; only version 2 of the License.
##
-## FreeCraft is distributed in the hope that it will be useful,
+## Stratagus is distributed in the hope that it will be useful,
## but WITHOUT ANY WARRANTY; without even the implied warranty of
## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
## GNU General Public License for more details.
@@ -175,7 +175,7 @@ VERSION= '-DVERSION="1.18pre1"'
# Libraries needed to build tools
TOOLLIBS=$(XLDFLAGS) -lpng -lz -lm $(THREADLIB)
-# Libraries needed to build freecraft
+# Libraries needed to build stratagus
CLONELIBS=$(XLDFLAGS) -lpng -lz -lm $(FLACLIB) $(OGGLIB) $(MP3LIB) \
$(THREADLIB) $(CCLLIB) $(VIDEOLIB) $(ZLIBS) #-lefence
@@ -183,14 +183,14 @@ DISTLIST=$(TOPDIR)/distlist
TAGS=$(TOPDIR)/src/tags
# LINUX
-OUTFILE=$(TOPDIR)/freecraft
+OUTFILE=$(TOPDIR)/stratagus
ARCH=linux
OE=o
EXE=
OBJDIR=.
# WIN32
-#OUTFILE=$(TOPDIR)/freecraft$(EXE)
+#OUTFILE=$(TOPDIR)/stratagus$(EXE)
#ARCH=win32
#OE=o
#EXE=.exe
diff --git a/configure.in b/configure.in
index 04a934815..d54e9cfb8 100644
--- a/configure.in
+++ b/configure.in
@@ -8,13 +8,13 @@ AC_CHECK_HEADERS(zlib.h,, AC_MSG_ERROR(could not find zlib.h))
AC_CHECK_HEADERS(png.h,, AC_MSG_ERROR(could not find png.h))
EXE=
-OUTFILE="\$(TOPDIR)/freecraft\$(EXE)"
+OUTFILE="\$(TOPDIR)/stratagus\$(EXE)"
OE=o
OBJDIR=obj
if test "`uname -a | grep -is cygwin`" -o "`uname -a | grep -is mingw`"; then
WIN32=1
EXE=.exe
- OUTFILE="\$(TOPDIR)/freecraft\$(EXE)"
+ OUTFILE="\$(TOPDIR)/stratagus\$(EXE)"
ARCH=win32
OBJDIR=winobj
PLATFORM="-DUSE_WIN32"
@@ -43,7 +43,7 @@ AC_ARG_ENABLE(win32,
if test "$enable_win32" = "yes"; then
WIN32=1
EXE=.exe
- OUTFILE="\$(TOPDIR)/freecraft\$(EXE)"
+ OUTFILE="\$(TOPDIR)/stratagus\$(EXE)"
ARCH=win32
OBJDIR=winobj
PLATFORM="-DUSE_WIN32"
diff --git a/contrib/doxygen-header.html b/contrib/doxygen-header.html
index 0a412f875..6be7cecb6 100644
--- a/contrib/doxygen-header.html
+++ b/contrib/doxygen-header.html
@@ -12,6 +12,6 @@
\/ \/ \/ \/ \/
______________________ ______________________
T H E W A R B E G I N S
- FreeCraft - A free fantasy real time strategy game engine
-(C) Copyright 2001-2003 by The FreeCraft Project. Distributed under the
+ Stratagus - A free fantasy real time strategy game engine
+(C) Copyright 2001-2003 by The Stratagus Project. Distributed under the
"GNU General Public License"
diff --git a/contrib/doxygen-stratagus.cfg b/contrib/doxygen-stratagus.cfg
index 9a9c630e0..79290369d 100644
--- a/contrib/doxygen-stratagus.cfg
+++ b/contrib/doxygen-stratagus.cfg
@@ -16,7 +16,7 @@
# The PROJECT_NAME tag is a single word (or a sequence of words surrounded
# by quotes) that should identify the project.
-PROJECT_NAME = FreeCraft-Engine
+PROJECT_NAME = Stratagus-Engine
# The PROJECT_NUMBER tag can be used to enter a project or revision number.
# This could be handy for archiving the generated documentation or
diff --git a/contrib/installer/make-linux-installer.sh b/contrib/installer/make-linux-installer.sh
index a562550ed..a1d57e1eb 100755
--- a/contrib/installer/make-linux-installer.sh
+++ b/contrib/installer/make-linux-installer.sh
@@ -1,9 +1,9 @@
#!/bin/bash
-BINFILE=./freecraft-030311-linux.tar.gz
-INSTALLERNAME=./freecraft-$(date +%y%m%d)-linux-installer.sh
+BINFILE=./stratagus-030311-linux.tar.gz
+INSTALLERNAME=./stratagus-$(date +%y%m%d)-linux-installer.sh
FCMPVER=030311
-FCMPONLINE=http://telia.dl.sf.net/freecraft/fcmp-$FCMPVER.tar.gz
+FCMPONLINE=http://telia.dl.sf.net/stratagus/fcmp-$FCMPVER.tar.gz
FCMPLOCAL=fcmp-$FCDATE.tar.gz
FCMPFILE=./fcmp-$FCDATE.tar.gz
@@ -24,20 +24,20 @@ if [ "\`id -u\`" != "0" ]; then
fi
echo;
echo "=================================="
-echo "Welcome to the FreeCraft installer"
+echo "Welcome to the Stratagus installer"
echo "=================================="
echo
-echo -n "Would you like to [i]nstall or [u]ninstall FreeCraft? (i) "
+echo -n "Would you like to [i]nstall or [u]ninstall Stratagus? (i) "
read -n1 -s OPTION
echo
echo
if [ "\$OPTION" = "u" ] || [ "\$OPTION" = "U" ]; then
- if [ ! -f ~/.freecraft/freecraft.inst ] || [ "\`cat ~/.freecraft/freecraft.inst | grep -iv REMOVE\`" = "" ]; then
- echo "Cannot uninstall: FreeCraft does not appear to be installed."
+ if [ ! -f ~/.stratagus/stratagus.inst ] || [ "\`cat ~/.stratagus/stratagus.inst | grep -iv REMOVE\`" = "" ]; then
+ echo "Cannot uninstall: Stratagus does not appear to be installed."
echo
exit
fi
- FILES=\`cat ~/.freecraft/freecraft.inst | grep -iv REMOVE\`
+ FILES=\`cat ~/.stratagus/stratagus.inst | grep -iv REMOVE\`
echo "The following files/directories will be removed:"
echo
echo "\$FILES"
@@ -49,13 +49,13 @@ if [ "\$OPTION" = "u" ] || [ "\$OPTION" = "U" ]; then
echo
echo -n "Removing..."
rm -rf \$FILES
- rm ~/.freecraft/freecraft.inst
+ rm ~/.stratagus/stratagus.inst
echo "Done"
echo
fi
exit
fi
-echo "Where would you like to install the 'freecraft' directory? "
+echo "Where would you like to install the 'stratagus' directory? "
echo -n "( \$DEFAULTDIR ) "
read DIR
if [ "\$DIR" = "" ]; then
@@ -87,14 +87,14 @@ if [ "\$DATA" = "o" ] || [ "\$DATA" = "O" ]; then
echo
echo "Error: data not found, make sure your cdrom is mounted."
echo "Installation NOT complete."
- rm -rf \$DIR/freecraft
+ rm -rf \$DIR/stratagus
echo
exit
fi
echo -n "Please wait while data is being extracted, this will take several minutes..."
echo
- mv \$DIR/freecraft/data \$DIR/freecraft/data.wc2
- sh \$DIR/freecraft/tools/build.sh -o \$DIR/freecraft/data.wc2 -C \$DIR/freecraft/contrib -p \$CDROM/data -T \$DIR/freecraft/tools
+ mv \$DIR/stratagus/data \$DIR/stratagus/data.wc2
+ sh \$DIR/stratagus/tools/build.sh -o \$DIR/stratagus/data.wc2 -C \$DIR/stratagus/contrib -p \$CDROM/data -T \$DIR/stratagus/tools
else
DATADIR=data
echo
@@ -111,26 +111,26 @@ else
echo
echo "Error: file not found."
echo "Installation NOT complete."
- rm -rf \$DIR/freecraft
+ rm -rf \$DIR/stratagus
echo
exit
fi
echo -n "PLEASE WAIT"
- tar -zxvf \$FCMPLOCATION -C \$DIR/freecraft >/dev/null
+ tar -zxvf \$FCMPLOCATION -C \$DIR/stratagus >/dev/null
echo
else
echo
echo -n "PLEASE WAIT - DOWNLOADING"
if [ "\`whereis curl | cut -f2 -d:\`" = "" ]; then
- wget -nv -O - $FCMPONLINE | tar -zxv -C \$DIR/freecraft
+ wget -nv -O - $FCMPONLINE | tar -zxv -C \$DIR/stratagus
else
- curl -s $FCMPONLINE | tar -zxv -C \$DIR/freecraft
+ curl -s $FCMPONLINE | tar -zxv -C \$DIR/stratagus
fi
fi
echo
fi;
echo
-echo "Where would you like to put the 'freecraft' startup script?"
+echo "Where would you like to put the 'stratagus' startup script?"
echo -n "( \$DEFAULTSTARTDIR ) "
read STARTDIR
if [ "\$STARTDIR" = "" ]; then
@@ -141,32 +141,32 @@ STARTDIR=\`pwd\`
cd \$CURDIR
mkdir -p \$STARTDIR
if [ "\`dirname \$STARTDIR/x\`" = "\`dirname \$DIR/x\`" ]; then
- STARTDIR=\$STARTDIR/freecraft
+ STARTDIR=\$STARTDIR/stratagus
fi
if [ "\`dirname \$STARTDIR\`" != "\`dirname \$DIR/x\`" ]; then
- echo "\$DIR/freecraft/freecraft -d \$DIR/freecraft/\$DATADIR" > \$STARTDIR/freecraft
- chmod +x \$STARTDIR/freecraft
+ echo "\$DIR/stratagus/stratagus -d \$DIR/stratagus/\$DATADIR" > \$STARTDIR/stratagus
+ chmod +x \$STARTDIR/stratagus
else
echo
- echo "*** NOTE: you will need to 'cd \$DIR/freecraft' before running ./freecraft ***"
+ echo "*** NOTE: you will need to 'cd \$DIR/stratagus' before running ./stratagus ***"
fi
-mkdir -p ~/.freecraft
-echo "THIS FILE REQUIRED FOR STRATAGUS UNINSTALLATION, DO NOT REMOVE" > ~/.freecraft/freecraft.inst
-echo "\$DIR/freecraft \$STARTDIR/freecraft" >> ~/.freecraft/freecraft.inst
+mkdir -p ~/.stratagus
+echo "THIS FILE REQUIRED FOR STRATAGUS UNINSTALLATION, DO NOT REMOVE" > ~/.stratagus/stratagus.inst
+echo "\$DIR/stratagus \$STARTDIR/stratagus" >> ~/.stratagus/stratagus.inst
if [ -d /tmp/cdrom.tmp ]; then umount /tmp/cdrom.tmp; rm -rf /tmp/cdrom.tmp; fi
echo
-echo "Congratulations! Installation of FreeCraft is complete."
+echo "Congratulations! Installation of Stratagus is complete."
echo
echo "To start the game, type the following command:"
echo
-echo "\$STARTDIR/freecraft"
+echo "\$STARTDIR/stratagus"
echo
echo -n "Would you like to start the game now? (n) "
read -n1 -s START
echo
if [ "\$START" = "y" ] || [ "\$START" = "Y" ]; then
cd \$STARTDIR
- \$STARTDIR/freecraft
+ \$STARTDIR/stratagus
fi;
exit;
EOF
@@ -182,7 +182,7 @@ fi
mkdir .installer
tar -zxf $BINFILE -C .installer
-mv .installer/`ls .installer | grep freecraft` .installer/freecraft
+mv .installer/`ls .installer | grep stratagus` .installer/stratagus
cd .installer
tar -hcO * | gzip -c >> ../$INSTALLERNAME
diff --git a/contrib/installer/stratagus.nsi b/contrib/installer/stratagus.nsi
index dea4a310c..b0bec501f 100644
--- a/contrib/installer/stratagus.nsi
+++ b/contrib/installer/stratagus.nsi
@@ -1,14 +1,14 @@
; The name of the installer
-Name "FreeCraft"
+Name "Stratagus"
-OutFile "freecraft-030311-win32.exe"
-Icon "freecraft.ico"
+OutFile "stratagus-030311-win32.exe"
+Icon "stratagus.ico"
-InstallDir $PROGRAMFILES\FreeCraft
+InstallDir $PROGRAMFILES\Stratagus
-DirText "FreeCraft will be installed to the specified location"
+DirText "Stratagus will be installed to the specified location"
-ComponentText "This will install FreeCraft. Select what you want installed."
+ComponentText "This will install Stratagus. Select what you want installed."
EnabledBitmap bitmap1.bmp
DisabledBitmap bitmap2.bmp
InstType "WC2"
@@ -18,7 +18,7 @@ InstType "Base Only"
Section "Base (required)"
SectionIn RO
SetOutPath $INSTDIR
- File /r "C:\projects\freecraft-030311\*.*"
+ File /r "C:\projects\stratagus-030311\*.*"
WriteUninstaller $INSTDIR\uninst.exe
SectionEnd
@@ -35,19 +35,19 @@ SectionEnd
Section "Start Menu Shortcuts"
SectionIn 1
SectionIn 2
- CreateDirectory "$SMPROGRAMS\FreeCraft"
+ CreateDirectory "$SMPROGRAMS\Stratagus"
StrCmp $1 "1" 0 NoWC2Shortcut
- CreateShortCut "$SMPROGRAMS\FreeCraft\FreeCraft (WC2).lnk" "$INSTDIR\freecraft.exe" ""
- CreateShortCut "$SMPROGRAMS\FreeCraft\Edit build.bat.lnk" "notepad.exe" "$INSTDIR\build.bat" ""
- CreateShortCut "$SMPROGRAMS\FreeCraft\Run build.bat.lnk" "$INSTDIR\build.bat" ""
+ CreateShortCut "$SMPROGRAMS\Stratagus\Stratagus (WC2).lnk" "$INSTDIR\stratagus.exe" ""
+ CreateShortCut "$SMPROGRAMS\Stratagus\Edit build.bat.lnk" "notepad.exe" "$INSTDIR\build.bat" ""
+ CreateShortCut "$SMPROGRAMS\Stratagus\Run build.bat.lnk" "$INSTDIR\build.bat" ""
NoWC2Shortcut:
- CreateShortCut "$SMPROGRAMS\FreeCraft\Uninstall FreeCraft.lnk" "$INSTDIR\uninst.exe" ""
+ CreateShortCut "$SMPROGRAMS\Stratagus\Uninstall Stratagus.lnk" "$INSTDIR\uninst.exe" ""
SectionEnd
-Uninstalltext "This will uninstall FreeCraft."
+Uninstalltext "This will uninstall Stratagus."
Section "Uninstall"
- RMDir /r $SMPROGRAMS\FreeCraft
+ RMDir /r $SMPROGRAMS\Stratagus
RMDir /r $INSTDIR
SectionEnd
diff --git a/contrib/stratagus-beos.proj.gz b/contrib/stratagus-beos.proj.gz
index 6260c4ba6..19517fda3 100644
Binary files a/contrib/stratagus-beos.proj.gz and b/contrib/stratagus-beos.proj.gz differ
diff --git a/doc/ChangeLog.html b/doc/ChangeLog.html
index e6fc5afbd..cd6ccacf3 100644
--- a/doc/ChangeLog.html
+++ b/doc/ChangeLog.html
@@ -6,23 +6,23 @@
---- (c) Copyright 1998-2003 by Lutz Sammer
----- FreeCraft is free software; you can redistribute it and/or modify
+---- Stratagus is free software; you can redistribute it and/or modify
---- it under the terms of the GNU General Public License as published by
---- the Free Software Foundation; only version 2 of the License.
----- FreeCraft is distributed in the hope that it will be useful,
+---- Stratagus is distributed in the hope that it will be useful,
---- but WITHOUT ANY WARRANTY; without even the implied warranty of
---- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
---- GNU General Public License for more details.
-->
- ChangeLog: FreeCraft Version 1.18
+ChangeLog: Stratagus Version 1.18
Current
@@ -197,7 +197,7 @@
{race} : Replace with a race name: human, orc, alliance or mythical.. @@ -34,7 +34,7 @@ Proposal for the new FreeCraft data directory structure: {race-campaign} : Replace with a name of a campaign of a race: human-exp, ... $STRATAGUS_LIBRARY_PATH/data -| Contains all data files for the FreeCraft game engine. +| Contains all data files for the Stratagus game engine. | }-- data/campaigns | | Contains all available campaigns. @@ -272,7 +272,7 @@ Proposal for the new FreeCraft data directory structure:
+This file should give you some information to help with development of Stratagus.
-
- The source to the FreeCraft engine. The source is licenced +
+ The source to the Stratagus engine. The source is licenced under the GNU General Public License. This module is needed for development. -
+
A collection of free media (free sounds, music, videos, graphics, animations and models), licensed under the GNU General Public License. -
- A map editor for FreeCraft. This is obsolete now as FreeCraft +
+ A map editor for Stratagus. This is obsolete now as Stratagus has an internal editor.
For example:
-cvs -d:pserver:anonymous@cvs.freecraft.sourceforge.net:/cvsroot/freecraft login
+cvs -d:pserver:anonymous@cvs.stratagus.sourceforge.net:/cvsroot/stratagus login
"When prompted for a password for anonymous, simply press the Enter key."
-cvs -z3 -d:pserver:anonymous@cvs.freecraft.sourceforge.net:/cvsroot/freecraft co freecraft
+cvs -z3 -d:pserver:anonymous@cvs.stratagus.sourceforge.net:/cvsroot/stratagus co stratagus
This is done only once. To update your CVS directory, go into the module directory and type 'cvs -z3 -q update -dP'.
@@ -96,16 +96,16 @@ the module directory and type 'cvs -z3 -q update -dP'.
You may put these flags in your ~/.cvsrc file so that you only need to type 'cvs update', the cvs (1) man page will show you how. -
+documentation for Stratagus.
You need either DoxyGen or @@ -166,17 +166,17 @@ Please read the doxygen/doc++ documentation. // \/ \/ \/ \/ \/ // ______________________ ______________________ // T H E W A R B E G I N S -// FreeCraft - A free fantasy real time strategy game engine +// Stratagus - A free fantasy real time strategy game engine // /**@name {filename}.c - {One line description of this file} */ // // (c) Copyright 2003 by {insert your name here} // -// FreeCraft is free software; you can redistribute it and/or modify +// Stratagus is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License as published // by the Free Software Foundation; only version 2 of the License. // -// FreeCraft is distributed in the hope that it will be useful, +// Stratagus is distributed in the hope that it will be useful, // but WITHOUT ANY WARRANTY; without even the implied warranty of // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the // GNU General Public License for more details. @@ -191,7 +191,7 @@ Please read the doxygen/doc++ documentation. #include <stdio.h> -#include "freecraft.h" +#include "stratagus.h" // More game includes. @@ -233,7 +233,7 @@ and always update the copyright year if required.
+included in the main Stratagus source.
Follow these steps:
@@ -250,10 +250,10 @@ Once you have the fcmp module, go into the 'fcmp' directory, and edit the location variables if necessary in 'buildfcmp.sh'. Then run the 'buildfcmp.sh' script and it will create a working data.fcmp directory.
-Please read the FreeCraft data directory description. +Please read the Stratagus data directory description.
Q: gzseek already defined or undefined.
A: You have an incompatible libpng version, install the latest version.
@@ -39,15 +39,15 @@ For any questions not mentioned here, please visit A: This should be fixed in the latest stable release, if it still happens, compile in SDL video mode or add -DSLOW_INPUT to DFLAGS in Rules.make.
- Q: Does FreeCraft work with ALSA?
- A: Yes, if you compiled SDL with alsa support and you compiled freecraft
+ Q: Does Stratagus work with ALSA?
+ A: Yes, if you compiled SDL with alsa support and you compiled stratagus
using SDL video mode.
- Q: Does FreeCraft work with the W*rcr*ft 2 BNE version?
+ Q: Does Stratagus work with the W*rcr*ft 2 BNE version?
A: No. The file format of this version is currently not supported.
- Q: What W*rcr*ft 2 CD's do work with FreeCraft?
+ Q: What W*rcr*ft 2 CD's do work with Stratagus?
A: If you have any trouble with extracting, please contact us.
Also if you have a CD not listed here, please send us the test results.
@@ -61,30 +61,30 @@ For any questions not mentioned here, please visit
- Q: Can I use FreeCraft to join in a W*rcr*ft 2 network game?
- A: Sorry, FreeCraft use its own network protocol.
+ Q: Can I use Stratagus to join in a W*rcr*ft 2 network game?
+ A: Sorry, Stratagus use its own network protocol.
The protocol needs the exact same code executed on all machines,
and it is not possible to have this with the original WC2,
- therefore you can only connect to a FreeCraft server.
+ therefore you can only connect to a Stratagus server.
Q: What about other RTS games?
A: St*rcr*ft and W*rcr*ft 1 support is in development. T*ber*an Sun
may be added in the distant future. For the old C&C games, you can
use freecnc.
- Q: What ports does the FreeCraft network protocol use?
- A: 6660 by default, you may start freecraft with '-Pxxxx' flag to
+ Q: What ports does the Stratagus network protocol use?
+ A: 6660 by default, you may start stratagus with '-Pxxxx' flag to
use port xxxx instead.
- Q: Does freecraft support internet/metaserver play?
+ Q: Does stratagus support internet/metaserver play?
A: Not yet, but this is a planned feature and may be added for 1.19
Q: I get only a black window after I have installed it on windows.
What have I done wrong?
- A: Install FreeCraft to the C: drive. This has solved the problem for
+ A: Install Stratagus to the C: drive. This has solved the problem for
everybody who has had this bug.
- Q: I have installed the windows version, when I start FreeCraft I get
+ Q: I have installed the windows version, when I start Stratagus I get
only the splash screen and the game stops, but consumes 100% CPU. What
have I done wrong?
A: Please wait for a couple of minutes for the game to start. There are
@@ -97,7 +97,7 @@ For any questions not mentioned here, please visit
support team. :)
@@ -72,11 +72,11 @@ should be taken into account when creating a tileset:
- The newest version of FreeCraft can always be found here: - http://freecraft.sourceforge.net + The newest version of Stratagus can always be found here: + http://stratagus.sourceforge.net
- Our sourceforge project page is: - http://sourceforge.net/projects/freecraft + Our sourceforge project page is: + http://sourceforge.net/projects/stratagus
- Documentation on the FreeCraft scripting language (Scheme, implemented with SIOD) + out with Stratagus development
+ Documentation on the Stratagus scripting language (Scheme, implemented with SIOD) can be found at ../src/siod/siod.html
Information about creating sounds and graphics can be found in the @@ -55,7 +55,7 @@
SIOD see SIOD.txt
@@ -95,7 +95,7 @@ For more credits please see data/ccl/credits.ccl.
+
@@ -78,12 +78,12 @@
-
tar -zxvf freecraft-DATE.tar.gz+
tar -zxvf stratagus-DATE.tar.gz
@@ -92,21 +92,21 @@
+
+ emVC++ project and + emVC++ workbench for Stratagus.
NOTE: You will need to execute this - script from within your root freecraft directory or + script from within your root stratagus directory or you will run into problems. It will take some time to extract everything.
Download FcMP from the download page and extract it to
- the freecraft root directory (where the freecraft
+ the stratagus root directory (where the stratagus
binary exists).
NOTE if you extract to a different directory,
you will need to specify the directory by passing '-d DIR' flag
- when you run the freecraft binary, by default the binary
+ when you run the stratagus binary, by default the binary
looks for 'data' in the current directory.
If you are using the CVS engine, you may need to checkout the 'fcmp' module from CVS. Then edit the locations at the top of 'buildfcmp.sh' and run it, this will create a working FcMP dir called: 'data.fcmp' , you may then rename this to - '$FCDIR/data' where $FCDIR is the directory where the freecraft - binary exists, or run freecraft with the '-d' option.
+ '$FCDIR/data' where $FCDIR is the directory where the stratagus + binary exists, or run stratagus with the '-d' option.
- You may now go into the toplevel freecraft dir and run the binary. Remember, - if the data dir is not './data', you will need to run freecraft with + You may now go into the toplevel stratagus dir and run the binary. Remember, + if the data dir is not './data', you will need to run stratagus with the '-d' option.
@@ -61,12 +61,12 @@
(make-sound "farm-selected" "human/buildings/farm.wav")
Note how the '.gz' suffix isn't needed in the ccl entry, - the FreeCraft engine detects this automatically.
+ the Stratagus engine detects this automatically.
You may look through the ccl file for more examples.
___________ _________ _____ __ @@ -30,12 +30,12 @@ \/ \/ \/ \/ \/ ______________________ ______________________ T H E W A R B E G I N S - FreeCraft - A free fantasy real time strategy game engine + Stratagus - A free fantasy real time strategy game engine-
(C) Copyright 2002-2003 by The FreeCraft Project. Distributed under the +
(C) Copyright 2002-2003 by The Stratagus Project. Distributed under the "GNU General Public License"