From 03daa19ec574dcab59e89566a8062b60b16a8325 Mon Sep 17 00:00:00 2001 From: xHire Date: Sat, 25 Oct 2008 11:58:43 +0200 Subject: Translated all game into Czech + some small fixes Updated scripts Correction: "Height Score" -> "High Score" Set right file permissions --- src/CMakeLists.txt | 2 +- src/base/buffer.c | 0 src/base/buffer.h | 0 src/base/director.c | 0 src/base/homeDirector.c | 0 src/base/homeDirector.h | 0 src/base/list.c | 0 src/base/list.h | 0 src/base/modules.c | 0 src/base/myTimer.c | 2 +- src/base/net_multiplayer.c | 6 +-- src/base/proto.c | 4 +- src/base/server.c | 2 +- src/base/tcp_server.c | 2 +- src/base/textFile.c | 0 src/base/textFile.h | 0 src/base/udp_server.c | 2 +- src/client/font.c | 0 src/client/font.h | 0 src/client/image.c | 0 src/client/image.h | 0 src/client/interface.c | 0 src/client/interface.h | 0 src/client/layer.c | 0 src/client/layer.h | 0 src/client/screen.c | 2 +- src/modules/modAI.c | 0 src/modules/modBasic.c | 0 src/modules/modMove.c | 0 src/modules/modPipe.c | 0 src/modules/modTeleport.c | 0 src/modules/modWall.c | 0 src/net/tcp.c | 0 src/screen/screen_setting.c | 8 ++-- src/screen/screen_table.c | 4 +- src/server/heightScore.c | 95 --------------------------------------------- src/server/heightScore.h | 13 ------- src/server/highScore.c | 95 +++++++++++++++++++++++++++++++++++++++++++++ src/server/highScore.h | 13 +++++++ src/server/publicServer.c | 8 ++-- 40 files changed, 129 insertions(+), 129 deletions(-) mode change 100755 => 100644 src/base/buffer.c mode change 100755 => 100644 src/base/buffer.h mode change 100755 => 100644 src/base/director.c mode change 100755 => 100644 src/base/homeDirector.c mode change 100755 => 100644 src/base/homeDirector.h mode change 100755 => 100644 src/base/list.c mode change 100755 => 100644 src/base/list.h mode change 100755 => 100644 src/base/modules.c mode change 100755 => 100644 src/base/textFile.c mode change 100755 => 100644 src/base/textFile.h mode change 100755 => 100644 src/client/font.c mode change 100755 => 100644 src/client/font.h mode change 100755 => 100644 src/client/image.c mode change 100755 => 100644 src/client/image.h mode change 100755 => 100644 src/client/interface.c mode change 100755 => 100644 src/client/interface.h mode change 100755 => 100644 src/client/layer.c mode change 100755 => 100644 src/client/layer.h mode change 100755 => 100644 src/modules/modAI.c mode change 100755 => 100644 src/modules/modBasic.c mode change 100755 => 100644 src/modules/modMove.c mode change 100755 => 100644 src/modules/modPipe.c mode change 100755 => 100644 src/modules/modTeleport.c mode change 100755 => 100644 src/modules/modWall.c mode change 100755 => 100644 src/net/tcp.c delete mode 100644 src/server/heightScore.c delete mode 100644 src/server/heightScore.h create mode 100644 src/server/highScore.c create mode 100644 src/server/highScore.h (limited to 'src') diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 08eab44..7f809df 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -72,7 +72,7 @@ SET ( SRC_audio SET ( SRC_server ${WORKDIR}/server/log ${WORKDIR}/server/serverConfigFile - ${WORKDIR}/server/heightScore ${WORKDIR}/server/publicServer + ${WORKDIR}/server/highScore ${WORKDIR}/server/publicServer ) ############################################################################### # AUDIO CHECK diff --git a/src/base/buffer.c b/src/base/buffer.c old mode 100755 new mode 100644 diff --git a/src/base/buffer.h b/src/base/buffer.h old mode 100755 new mode 100644 diff --git a/src/base/director.c b/src/base/director.c old mode 100755 new mode 100644 diff --git a/src/base/homeDirector.c b/src/base/homeDirector.c old mode 100755 new mode 100644 diff --git a/src/base/homeDirector.h b/src/base/homeDirector.h old mode 100755 new mode 100644 diff --git a/src/base/list.c b/src/base/list.c old mode 100755 new mode 100644 diff --git a/src/base/list.h b/src/base/list.h old mode 100755 new mode 100644 diff --git a/src/base/modules.c b/src/base/modules.c old mode 100755 new mode 100644 diff --git a/src/base/myTimer.c b/src/base/myTimer.c index 0121a5f..fa2ba12 100644 --- a/src/base/myTimer.c +++ b/src/base/myTimer.c @@ -123,7 +123,7 @@ eventTimer(list_t * listTimer) } break; default: - assert(!_("Timer is really wierdly set!")); + assert(!_("Timer is really weirdly set!")); break; } } diff --git a/src/base/net_multiplayer.c b/src/base/net_multiplayer.c index ef0deab..bfd4f94 100644 --- a/src/base/net_multiplayer.c +++ b/src/base/net_multiplayer.c @@ -85,7 +85,7 @@ initNetMuliplayer(int type, char *ip, int port, int proto) break; #endif default: - assert(!_("Variable netGameType has a really wierd value!")); + assert(!_("Variable netGameType has a really weird value!")); break; } @@ -109,7 +109,7 @@ eventNetMultiplayer() break; #endif default: - assert(!_("Variable netGameType has a really wierd value!")); + assert(!_("Variable netGameType has a really weird value!")); break; } } @@ -131,7 +131,7 @@ quitNetMultiplayer() break; #endif default: - assert(!_("Variable netGameType has a really wierd value!")); + assert(!_("Variable netGameType has a really weird value!")); break; } diff --git a/src/base/proto.c b/src/base/proto.c index c54c092..7c510c5 100644 --- a/src/base/proto.c +++ b/src/base/proto.c @@ -33,7 +33,7 @@ #endif #ifdef PUBLIC_SERVER -#include "heightScore.h" +#include "highScore.h" #include "publicServer.h" #include "serverConfigFile.h" #endif @@ -298,7 +298,7 @@ proto_recv_listscore_server(client_t * client, char *msg) recv_count = sscanf(msg, "%s %d", cmd, &max); if (recv_count != 2) { - max = HEIGHTSCORE_MAX_PLAYERS; + max = HIGHSCORE_MAX_PLAYERS; } proto_send_listscore_server(PROTO_SEND_ONE, client, max); diff --git a/src/base/server.c b/src/base/server.c index ac7bfc0..cc4cff2 100644 --- a/src/base/server.c +++ b/src/base/server.c @@ -37,7 +37,7 @@ #ifdef PUBLIC_SERVER #include "publicServer.h" -#include "heightScore.h" +#include "highScore.h" #endif diff --git a/src/base/tcp_server.c b/src/base/tcp_server.c index 14d1794..f1f93c4 100644 --- a/src/base/tcp_server.c +++ b/src/base/tcp_server.c @@ -35,7 +35,7 @@ #ifdef PUBLIC_SERVER #include "publicServer.h" -#include "heightScore.h" +#include "highScore.h" #include "log.h" #endif diff --git a/src/base/textFile.c b/src/base/textFile.c old mode 100755 new mode 100644 diff --git a/src/base/textFile.h b/src/base/textFile.h old mode 100755 new mode 100644 diff --git a/src/base/udp_server.c b/src/base/udp_server.c index 16fe722..7656ff1 100644 --- a/src/base/udp_server.c +++ b/src/base/udp_server.c @@ -35,7 +35,7 @@ #ifdef PUBLIC_SERVER #include "publicServer.h" -#include "heightScore.h" +#include "highScore.h" #include "log.h" #endif diff --git a/src/client/font.c b/src/client/font.c old mode 100755 new mode 100644 diff --git a/src/client/font.h b/src/client/font.h old mode 100755 new mode 100644 diff --git a/src/client/image.c b/src/client/image.c old mode 100755 new mode 100644 diff --git a/src/client/image.h b/src/client/image.h old mode 100755 new mode 100644 diff --git a/src/client/interface.c b/src/client/interface.c old mode 100755 new mode 100644 diff --git a/src/client/interface.h b/src/client/interface.h old mode 100755 new mode 100644 diff --git a/src/client/layer.c b/src/client/layer.c old mode 100755 new mode 100644 diff --git a/src/client/layer.h b/src/client/layer.h old mode 100755 new mode 100644 diff --git a/src/client/screen.c b/src/client/screen.c index 89fa5ef..f9f1f2f 100644 --- a/src/client/screen.c +++ b/src/client/screen.c @@ -114,7 +114,7 @@ switchScreen() if (currentScreen != NULL) { #ifdef DEBUG - printf(_("Stopping screen:\" %s\"\n"), currentScreen->name); + printf(_("Stopping screen: \"%s\"\n"), currentScreen->name); #endif currentScreen->fce_stop(); } diff --git a/src/modules/modAI.c b/src/modules/modAI.c old mode 100755 new mode 100644 diff --git a/src/modules/modBasic.c b/src/modules/modBasic.c old mode 100755 new mode 100644 diff --git a/src/modules/modMove.c b/src/modules/modMove.c old mode 100755 new mode 100644 diff --git a/src/modules/modPipe.c b/src/modules/modPipe.c old mode 100755 new mode 100644 diff --git a/src/modules/modTeleport.c b/src/modules/modTeleport.c old mode 100755 new mode 100644 diff --git a/src/modules/modWall.c b/src/modules/modWall.c old mode 100755 new mode 100644 diff --git a/src/net/tcp.c b/src/net/tcp.c old mode 100755 new mode 100644 diff --git a/src/screen/screen_setting.c b/src/screen/screen_setting.c index 78e2936..22e524c 100644 --- a/src/screen/screen_setting.c +++ b/src/screen/screen_setting.c @@ -217,14 +217,14 @@ initSettingFile() configFile = loadTextFile(path); if (configFile == NULL) { - fprintf(stderr, _("I am unable to load: \"%s\" !\n"), path); + fprintf(stderr, _("I am unable to load: \"%s\"!\n"), path); fprintf(stderr, _("Creating: \"%s\"\n"), path); configFile = newTextFile(path); } if (configFile == NULL) { - fprintf(stderr, _("I was unable to create: \"%s\" !\n"), path); + fprintf(stderr, _("I was unable to create: \"%s\"!\n"), path); return; } @@ -384,11 +384,11 @@ initScreenSetting() newWidgetCheck(label_sound->x + label_sound->w + 10, WINDOW_SIZE_Y - 80, isSoundActive(), eventWidget); label_ai = - newWidgetLabel("AI:", check_sound->x + WIDGET_CHECK_WIDTH + 10, + newWidgetLabel(_("AI:"), check_sound->x + WIDGET_CHECK_WIDTH + 10, WINDOW_SIZE_Y - 85, WIDGET_LABEL_LEFT); #else label_ai = - newWidgetLabel("AI:", 100, WINDOW_SIZE_Y - 85, WIDGET_LABEL_LEFT); + newWidgetLabel(_("AI:"), 100, WINDOW_SIZE_Y - 85, WIDGET_LABEL_LEFT); #endif check_ai = diff --git a/src/screen/screen_table.c b/src/screen/screen_table.c index 5eea4d2..1a5ffcd 100644 --- a/src/screen/screen_table.c +++ b/src/screen/screen_table.c @@ -152,7 +152,7 @@ loadHighscoreFile() textFile = loadTextFile(path); if (textFile == NULL) { - fprintf(stderr, _("I am unable to load: \"%s\" !\n"), path); + fprintf(stderr, _("I am unable to load: \"%s\"!\n"), path); fprintf(stderr, _("Creating: \"%s\"\n"), path); textFile = newTextFile(path); } @@ -161,7 +161,7 @@ loadHighscoreFile() } if (textFile == NULL) { - fprintf(stderr, _("I was unable to create: \"%s\" !\n"), path); + fprintf(stderr, _("I was unable to create: \"%s\"!\n"), path); return; } diff --git a/src/server/heightScore.c b/src/server/heightScore.c deleted file mode 100644 index 7689d3f..0000000 --- a/src/server/heightScore.c +++ /dev/null @@ -1,95 +0,0 @@ - -#include -#include -#include -#include - -#include "main.h" -#include "list.h" -#include "textFile.h" -#include "heightScore.h" - -static textFile_t *textFile; - -void -initHeightScore(char *file) -{ - int i; - - textFile = loadTextFile(file); - - if (textFile == NULL) { - fprintf(stderr, _("I am unable to load: \"%s\" !\n"), file); - fprintf(stderr, _("Creating: \"%s\"\n"), file); - textFile = newTextFile(file); - } - else { -#ifdef DEBUG - printf(_("Scorefile: \"%s\"\n"), file); -#endif - return; - } - - if (textFile == NULL) { - fprintf(stderr, _("I was unable to create: \"%s\" !\n"), file); - return; - } - - for (i = 0; i < HEIGHTSCORE_MAX_PLAYERS; i++) { - addList(textFile->text, strdup("no_name 0")); - } - - saveTextFile(textFile); -} - -int -addPlayerInHighScore(char *name, int score) -{ - int i; - - if (score <= 0) { - return -1; // Ha ha ha - } - - for (i = 0; i < HEIGHTSCORE_MAX_PLAYERS; i++) { - char *line; - char thisName[STR_NAME_SIZE]; - int thisCore; - - line = (char *) textFile->text->list[i]; - sscanf(line, "%s %d", thisName, &thisCore); - - if (score >= thisCore) { - char new[STR_SIZE]; - - sprintf(new, "%s %d", name, score); - insList(textFile->text, i, strdup(new)); - delListItem(textFile->text, HEIGHTSCORE_MAX_PLAYERS, free); - //printTextFile(textFile); - saveTextFile(textFile); - - return 0; - } - } - - return -1; -} - -char * -getTableItem(int index) -{ - if (textFile != NULL && index >= 0 && index < textFile->text->count) { - return (char *) textFile->text->list[index]; - } - - return NULL; -} - -void -quitHeightScore() -{ - if (textFile != NULL) { - saveTextFile(textFile); - destroyTextFile(textFile); - } -} diff --git a/src/server/heightScore.h b/src/server/heightScore.h deleted file mode 100644 index 4748264..0000000 --- a/src/server/heightScore.h +++ /dev/null @@ -1,13 +0,0 @@ - -#ifndef HEIGHT_SCORE_H - -#define HEIGHT_SCORE_H - -#define HEIGHTSCORE_MAX_PLAYERS 100 - -extern void initHeightScore(char *file); -extern int addPlayerInHighScore(char *name, int score); -extern char *getTableItem(int index); -extern void quitHeightScore(); - -#endif diff --git a/src/server/highScore.c b/src/server/highScore.c new file mode 100644 index 0000000..1ae7001 --- /dev/null +++ b/src/server/highScore.c @@ -0,0 +1,95 @@ + +#include +#include +#include +#include + +#include "main.h" +#include "list.h" +#include "textFile.h" +#include "highScore.h" + +static textFile_t *textFile; + +void +initHighScore(char *file) +{ + int i; + + textFile = loadTextFile(file); + + if (textFile == NULL) { + fprintf(stderr, _("I am unable to load: \"%s\"!\n"), file); + fprintf(stderr, _("Creating: \"%s\"\n"), file); + textFile = newTextFile(file); + } + else { +#ifdef DEBUG + printf(_("Scorefile: \"%s\"\n"), file); +#endif + return; + } + + if (textFile == NULL) { + fprintf(stderr, _("I was unable to create: \"%s\"!\n"), file); + return; + } + + for (i = 0; i < HIGHSCORE_MAX_PLAYERS; i++) { + addList(textFile->text, strdup("no_name 0")); + } + + saveTextFile(textFile); +} + +int +addPlayerInHighScore(char *name, int score) +{ + int i; + + if (score <= 0) { + return -1; // Ha ha ha + } + + for (i = 0; i < HIGHSCORE_MAX_PLAYERS; i++) { + char *line; + char thisName[STR_NAME_SIZE]; + int thisCore; + + line = (char *) textFile->text->list[i]; + sscanf(line, "%s %d", thisName, &thisCore); + + if (score >= thisCore) { + char new[STR_SIZE]; + + sprintf(new, "%s %d", name, score); + insList(textFile->text, i, strdup(new)); + delListItem(textFile->text, HIGHSCORE_MAX_PLAYERS, free); + //printTextFile(textFile); + saveTextFile(textFile); + + return 0; + } + } + + return -1; +} + +char * +getTableItem(int index) +{ + if (textFile != NULL && index >= 0 && index < textFile->text->count) { + return (char *) textFile->text->list[index]; + } + + return NULL; +} + +void +quitHighScore() +{ + if (textFile != NULL) { + saveTextFile(textFile); + destroyTextFile(textFile); + } +} diff --git a/src/server/highScore.h b/src/server/highScore.h new file mode 100644 index 0000000..56850f2 --- /dev/null +++ b/src/server/highScore.h @@ -0,0 +1,13 @@ + +#ifndef HIGH_SCORE_H + +#define HIGH_SCORE_H + +#define HIGHSCORE_MAX_PLAYERS 100 + +extern void initHighScore(char *file); +extern int addPlayerInHighScore(char *name, int score); +extern char *getTableItem(int index); +extern void quitHighScore(); + +#endif diff --git a/src/server/publicServer.c b/src/server/publicServer.c index 2f25568..4944115 100644 --- a/src/server/publicServer.c +++ b/src/server/publicServer.c @@ -34,7 +34,7 @@ #include "publicServer.h" #include "serverConfigFile.h" -#include "heightScore.h" +#include "highScore.h" #include "log.h" #include "dns.h" @@ -260,8 +260,8 @@ initPublicServer() return -1; } - initHeightScore(getSetting - ("SCORE_FILE", "--score-file", "/tmp/heightscore")); + initHighScore(getSetting + ("SCORE_FILE", "--score-file", "/tmp/highscore")); loadArena(); @@ -349,7 +349,7 @@ quitPublicServer() quitServerConfigFile(); quitModule(); quitListID(); - quitHeightScore(); + quitHighScore(); quitLog(); exit(0); -- cgit v1.2.3