summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--CMakeLists.txt4
-rw-r--r--README2
-rw-r--r--ci2
-rw-r--r--config.h2
-rw-r--r--data/lang/fr.lang6
-rw-r--r--data/tuxanci.desktop6
-rw-r--r--packaging/gentoo/tuxanci-9999.ebuild2
-rwxr-xr-xpackaging/linux/build.sh2
-rwxr-xr-xpackaging/source/source.sh2
-rw-r--r--src/CMakeLists.txt8
-rwxr-xr-xsrc/base/homeDirector.h2
-rw-r--r--src/base/path.h12
-rw-r--r--src/base/proto.c6
-rwxr-xr-xsrc/client/interface.h2
-rw-r--r--src/screen/screen_setting.c2
15 files changed, 30 insertions, 30 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 75c9a4a..39aece4 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -7,9 +7,9 @@
# !! pri zmene zdrojovych souboru se podivejte co je treba delat do souboru !!
# !! CMakeLists.txt v adresari src !!
-SET ( APPNAME "tuxanci-ng")
+SET ( APPNAME "tuxanci")
IF ( Server )
- SET ( APPNAME "tuxanci-ng-server" )
+ SET ( APPNAME "tuxanci-server" )
ENDIF ( Server )
MESSAGE ( "<******************************>" )
MESSAGE ( "Configure for ${APPNAME} Started" )
diff --git a/README b/README
index ad85bc5..a65443c 100644
--- a/README
+++ b/README
@@ -107,7 +107,7 @@ GAME USAGE
(eg.: "$ cd tuxanci/bin && ./tuxanci").
For client we create some configuration files in $HOME. There is created
- ".tuxanci-ng" directory and in there are pretty explaining .conf files.
+ ".tuxanci" directory and in there are pretty explaining .conf files.
For server we create directory /etc/tuxanci/server.conf where you could
do some changes for it (again pretty selfexplaining).
diff --git a/ci b/ci
index a2f7f39..f0f6128 100644
--- a/ci
+++ b/ci
@@ -1,6 +1,6 @@
#!/bin/sh
svn up || exit 1
-echo "#define TUXANCI_NG_VERSION \"svn$(( `svn info | grep Revision |awk -F ': ' '{print $2}'` + 1 ))\"" > ./config.h
+echo "#define TUXANCI_VERSION \"svn$(( `svn info | grep Revision |awk -F ': ' '{print $2}'` + 1 ))\"" > ./config.h
if [ $# -eq "0" ]; then
svn ci
exit 0
diff --git a/config.h b/config.h
index 1c6d208..2bde9bc 100644
--- a/config.h
+++ b/config.h
@@ -1 +1 @@
-#define TUXANCI_NG_VERSION "svn181"
+#define TUXANCI_VERSION "svn182"
diff --git a/data/lang/fr.lang b/data/lang/fr.lang
index d11973b..03f5943 100644
--- a/data/lang/fr.lang
+++ b/data/lang/fr.lang
@@ -1,11 +1,11 @@
###
# French translation file
-# Author: Svatava Šrůtková
+# Author: dummie
###
# about the author of this translation
-AUTHOR Svatava Šrůtková
-AUTHOR_EMAIL none
+AUTHOR dummie
+AUTHOR_EMAIL svatavasrutkova@centrum.cz
AUTHOR_JABBER none
diff --git a/data/tuxanci.desktop b/data/tuxanci.desktop
index 08e390b..c0a3dc4 100644
--- a/data/tuxanci.desktop
+++ b/data/tuxanci.desktop
@@ -1,9 +1,9 @@
[Desktop Entry]
-Name=tuxanci-ng
+Name=tuxanci
Comment=game tuxanci next generation
-Exec=/usr/bin/tuxanci-ng
+Exec=/usr/bin/tuxanci
Terminal=false
Type=Application
-Icon=/usr/share/tuxanci-ng/image/tuxanci.ico
+Icon=/usr/share/tuxanci/image/tuxanci.ico
Encoding=UTF-8
Categories=Game
diff --git a/packaging/gentoo/tuxanci-9999.ebuild b/packaging/gentoo/tuxanci-9999.ebuild
index 125b72f..3c958ce 100644
--- a/packaging/gentoo/tuxanci-9999.ebuild
+++ b/packaging/gentoo/tuxanci-9999.ebuild
@@ -33,7 +33,7 @@ src_unpack() {
-e "s:PATH_DIR\tPREFIX:PATH_DIR:" src/base/path.h \
|| die "sed config.h failed!"
sed -i \
- -e "s:share/tuxanci-ng:${GAMES_DATADIR}/tuxanci-ng:" src/base/path.h \
+ -e "s:share/tuxanci:${GAMES_DATADIR}/tuxanci-ng:" src/base/path.h \
|| die "sed config.h failed!"
sed -i \
-e "s:CMAKE_INSTALL_DATADIR share/:CMAKE_INSTALL_DATADIR /usr/share/games/:" CMakeLists.txt \
diff --git a/packaging/linux/build.sh b/packaging/linux/build.sh
index c075d70..3e5ab46 100755
--- a/packaging/linux/build.sh
+++ b/packaging/linux/build.sh
@@ -33,7 +33,7 @@ echo "* Fetching files from SVN"
svn export $SVN $BUILD_DIR >> pkgs/"${log}" || ( echo $error; exit 1 )
echo "* Configuring"
-echo "#define TUXANCI_NG_VERSION \"${VERSION}\"" > $BUILD_DIR/config.h || ( echo $error; exit 1 )
+echo "#define TUXANCI_VERSION \"${VERSION}\"" > $BUILD_DIR/config.h || ( echo $error; exit 1 )
echo "* Compiling"
prevdir=`pwd`
diff --git a/packaging/source/source.sh b/packaging/source/source.sh
index c875f47..972bc00 100755
--- a/packaging/source/source.sh
+++ b/packaging/source/source.sh
@@ -22,7 +22,7 @@ echo "* Fetching files from SVN"
svn export $SVN pkgs/tuxanci-0.20.0-src >> pkgs/src.log || `echo $error; exit 1`
echo "* Configuring"
-echo "#define TUXANCI_NG_VERSION \"${VERSION}\"" > $INSTALL_DIR/config.h || `echo $error; exit 1`
+echo "#define TUXANCI_VERSION \"${VERSION}\"" > $INSTALL_DIR/config.h || `echo $error; exit 1`
rm -fv $INSTALL_DIR/ci >> pkgs/src.log || `echo $error; exit 1`
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 38d623e..ede12bd 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -83,8 +83,8 @@ IF ( NOT Server ) # server nebo klient
ADD_DEFINITIONS ( -DNO_SOUND )
MESSAGE ( STATUS "<******************************>" )
ENDIF ( NOT NO_Audio )
- ADD_EXECUTABLE ( tuxanci-ng ${SRC_compile} )
- SET (TUX_BIN "tuxanci-ng")
+ ADD_EXECUTABLE ( tuxanci ${SRC_compile} )
+ SET (TUX_BIN "tuxanci")
ELSE ( NOT Server )
# kontrola libdl
IF ( NOT Win )
@@ -96,8 +96,8 @@ ELSE ( NOT Server )
MESSAGE ( STATUS "<******************************>" )
INCLUDE_DIRECTORIES ( ${WORKDIR}/server )
SET ( SRC_compile ${SRC_base} ${SRC_server} )
- ADD_EXECUTABLE ( tuxanci-ng-server ${SRC_compile} )
- SET (TUX_BIN "tuxanci-ng-server")
+ ADD_EXECUTABLE ( tuxanci-server ${SRC_compile} )
+ SET (TUX_BIN "tuxanci-server")
ENDIF ( NOT Server )
ADD_SUBDIRECTORY ( modules )
INSTALL ( TARGETS ${TUX_BIN} RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}/${APPNAME} )
diff --git a/src/base/homeDirector.h b/src/base/homeDirector.h
index 85f8172..c8b1114 100755
--- a/src/base/homeDirector.h
+++ b/src/base/homeDirector.h
@@ -5,7 +5,7 @@
#include "main.h"
-#define HOMEDIRECTOR_NAME ".tuxanci-ng"
+#define HOMEDIRECTOR_NAME ".tuxanci"
extern void createHomeDirector();
extern char *getHomeDirector();
diff --git a/src/base/path.h b/src/base/path.h
index 294e634..f547f69 100644
--- a/src/base/path.h
+++ b/src/base/path.h
@@ -14,20 +14,20 @@
#endif
#ifndef PUBLIC_SERVER
- #define PATH_DIR PREFIX "/share/tuxanci-ng/"
+ #define PATH_DIR PREFIX "/share/tuxanci/"
#ifndef __WIN32__
- #define PATH_MODULES PREFIX "/lib/tuxanci-ng/"
+ #define PATH_MODULES PREFIX "/lib/tuxanci/"
#else
#define PATH_MODULES PREFIX "/bin/"
#endif
#else
- #define PATH_DIR PREFIX "/share/tuxanci-ng-server/"
+ #define PATH_DIR PREFIX "/share/tuxanci-server/"
#ifndef __WIN32__
- #define PATH_MODULES PREFIX "/lib/tuxanci-ng-server/"
- #define SERVER_CONFIG "/etc/tuxanci-ng-server/server.conf"
+ #define PATH_MODULES PREFIX "/lib/tuxanci-server/"
+ #define SERVER_CONFIG "/etc/tuxanci-server/server.conf"
#else
#define PATH_MODULES PREFIX "/bin/"
- #define SERVER_CONFIG PREFIX "/etc/tuxanci-ng-server/server.conf"
+ #define SERVER_CONFIG PREFIX "/etc/tuxanci-server/server.conf"
#endif
#endif
diff --git a/src/base/proto.c b/src/base/proto.c
index 453398f..e95ca4e 100644
--- a/src/base/proto.c
+++ b/src/base/proto.c
@@ -77,7 +77,7 @@ void proto_send_hello_client(char *name)
{
char msg[STR_PROTO_SIZE];
- sprintf(msg, "hello %s %s\n", TUXANCI_NG_VERSION, name);
+ sprintf(msg, "hello %s %s\n", TUXANCI_VERSION, name);
sendServer(msg);
}
@@ -96,7 +96,7 @@ void proto_recv_hello_server(client_t *client, char *msg)
sscanf(msg, "%s %s %s", cmd, version, name);
- if( strncmp(version, TUXANCI_NG_VERSION, strlen(TUXANCI_NG_VERSION)) != 0 )
+ if( strncmp(version, TUXANCI_VERSION, strlen(TUXANCI_VERSION)) != 0 )
{
proto_send_error_server(PROTO_SEND_ONE, client, PROTO_ERROR_CODE_BAD_VERSION);
eventMsgInCheckFront(client);
@@ -137,7 +137,7 @@ void proto_send_status_server(int type, client_t *client)
name = getServerConfigFileValue("NAME", "noname");
#endif
- version = TUXANCI_NG_VERSION;
+ version = TUXANCI_VERSION;
clients = getCurrentArena()->spaceTux->list->count;
maxclients = getServerMaxClients();
uptime = (unsigned int)getUpdateServer();
diff --git a/src/client/interface.h b/src/client/interface.h
index c0311ee..90fc2f8 100755
--- a/src/client/interface.h
+++ b/src/client/interface.h
@@ -19,7 +19,7 @@
#define SDL_SUBSYSTEMS SDL_INIT_VIDEO|SDL_INIT_TIMER|SDL_DOUBLEBUF
//napis na okne
-#define WINDOW_TITLE "Tuxanci next generation " TUXANCI_NG_VERSION
+#define WINDOW_TITLE "Tuxanci next generation " TUXANCI_VERSION
#define WIN_BPP 0
#define USR_EVT_TIMER 0
diff --git a/src/screen/screen_setting.c b/src/screen/screen_setting.c
index 8115842..ade0d96 100644
--- a/src/screen/screen_setting.c
+++ b/src/screen/screen_setting.c
@@ -213,7 +213,7 @@ static void initSettingFile()
char path[STR_PATH_SIZE];
char val[STR_SIZE];
- sprintf(path, "%s/tuxanci-ng.conf", getHomeDirector());
+ sprintf(path, "%s/tuxanci.conf", getHomeDirector());
configFile = loadTextFile(path);
generated by cgit v1.2.3 (git 2.46.0) at 2026-09-13 06:25:00 +0000