summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/CMakeLists.txt2
-rw-r--r--[-rwxr-xr-x]src/base/buffer.c0
-rw-r--r--[-rwxr-xr-x]src/base/buffer.h0
-rw-r--r--[-rwxr-xr-x]src/base/director.c0
-rw-r--r--[-rwxr-xr-x]src/base/homeDirector.c0
-rw-r--r--[-rwxr-xr-x]src/base/homeDirector.h0
-rw-r--r--[-rwxr-xr-x]src/base/list.c0
-rw-r--r--[-rwxr-xr-x]src/base/list.h0
-rw-r--r--[-rwxr-xr-x]src/base/modules.c0
-rw-r--r--src/base/myTimer.c2
-rw-r--r--src/base/net_multiplayer.c6
-rw-r--r--src/base/proto.c4
-rw-r--r--src/base/server.c2
-rw-r--r--src/base/tcp_server.c2
-rw-r--r--[-rwxr-xr-x]src/base/textFile.c0
-rw-r--r--[-rwxr-xr-x]src/base/textFile.h0
-rw-r--r--src/base/udp_server.c2
-rw-r--r--[-rwxr-xr-x]src/client/font.c0
-rw-r--r--[-rwxr-xr-x]src/client/font.h0
-rw-r--r--[-rwxr-xr-x]src/client/image.c0
-rw-r--r--[-rwxr-xr-x]src/client/image.h0
-rw-r--r--[-rwxr-xr-x]src/client/interface.c0
-rw-r--r--[-rwxr-xr-x]src/client/interface.h0
-rw-r--r--[-rwxr-xr-x]src/client/layer.c0
-rw-r--r--[-rwxr-xr-x]src/client/layer.h0
-rw-r--r--src/client/screen.c2
-rw-r--r--[-rwxr-xr-x]src/modules/modAI.c0
-rw-r--r--[-rwxr-xr-x]src/modules/modBasic.c0
-rw-r--r--[-rwxr-xr-x]src/modules/modMove.c0
-rw-r--r--[-rwxr-xr-x]src/modules/modPipe.c0
-rw-r--r--[-rwxr-xr-x]src/modules/modTeleport.c0
-rw-r--r--[-rwxr-xr-x]src/modules/modWall.c0
-rw-r--r--[-rwxr-xr-x]src/net/tcp.c0
-rw-r--r--src/screen/screen_setting.c8
-rw-r--r--src/screen/screen_table.c4
-rw-r--r--src/server/heightScore.h13
-rw-r--r--src/server/highScore.c (renamed from src/server/heightScore.c)16
-rw-r--r--src/server/highScore.h13
-rw-r--r--src/server/publicServer.c8
39 files changed, 42 insertions, 42 deletions
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
index e09b7f2..e09b7f2 100755..100644
--- a/src/base/buffer.c
+++ b/src/base/buffer.c
diff --git a/src/base/buffer.h b/src/base/buffer.h
index 8c2e3ce..8c2e3ce 100755..100644
--- a/src/base/buffer.h
+++ b/src/base/buffer.h
diff --git a/src/base/director.c b/src/base/director.c
index eea7ea4..eea7ea4 100755..100644
--- a/src/base/director.c
+++ b/src/base/director.c
diff --git a/src/base/homeDirector.c b/src/base/homeDirector.c
index 81d34c5..81d34c5 100755..100644
--- a/src/base/homeDirector.c
+++ b/src/base/homeDirector.c
diff --git a/src/base/homeDirector.h b/src/base/homeDirector.h
index e4133ee..e4133ee 100755..100644
--- a/src/base/homeDirector.h
+++ b/src/base/homeDirector.h
diff --git a/src/base/list.c b/src/base/list.c
index 1a5a449..1a5a449 100755..100644
--- a/src/base/list.c
+++ b/src/base/list.c
diff --git a/src/base/list.h b/src/base/list.h
index e532cb2..e532cb2 100755..100644
--- a/src/base/list.h
+++ b/src/base/list.h
diff --git a/src/base/modules.c b/src/base/modules.c
index 6248e8a..6248e8a 100755..100644
--- a/src/base/modules.c
+++ b/src/base/modules.c
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
index 4b93d5c..4b93d5c 100755..100644
--- a/src/base/textFile.c
+++ b/src/base/textFile.c
diff --git a/src/base/textFile.h b/src/base/textFile.h
index 9dd0d33..9dd0d33 100755..100644
--- a/src/base/textFile.h
+++ b/src/base/textFile.h
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
index faf46ea..faf46ea 100755..100644
--- a/src/client/font.c
+++ b/src/client/font.c
diff --git a/src/client/font.h b/src/client/font.h
index 28f7373..28f7373 100755..100644
--- a/src/client/font.h
+++ b/src/client/font.h
diff --git a/src/client/image.c b/src/client/image.c
index 3ed4403..3ed4403 100755..100644
--- a/src/client/image.c
+++ b/src/client/image.c
diff --git a/src/client/image.h b/src/client/image.h
index 5b637b2..5b637b2 100755..100644
--- a/src/client/image.h
+++ b/src/client/image.h
diff --git a/src/client/interface.c b/src/client/interface.c
index 94a9fdb..94a9fdb 100755..100644
--- a/src/client/interface.c
+++ b/src/client/interface.c
diff --git a/src/client/interface.h b/src/client/interface.h
index 95bef25..95bef25 100755..100644
--- a/src/client/interface.h
+++ b/src/client/interface.h
diff --git a/src/client/layer.c b/src/client/layer.c
index 1c8e8d1..1c8e8d1 100755..100644
--- a/src/client/layer.c
+++ b/src/client/layer.c
diff --git a/src/client/layer.h b/src/client/layer.h
index ece1d01..ece1d01 100755..100644
--- a/src/client/layer.h
+++ b/src/client/layer.h
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
index b29e141..b29e141 100755..100644
--- a/src/modules/modAI.c
+++ b/src/modules/modAI.c
diff --git a/src/modules/modBasic.c b/src/modules/modBasic.c
index bf37fcb..bf37fcb 100755..100644
--- a/src/modules/modBasic.c
+++ b/src/modules/modBasic.c
diff --git a/src/modules/modMove.c b/src/modules/modMove.c
index 854b5bb..854b5bb 100755..100644
--- a/src/modules/modMove.c
+++ b/src/modules/modMove.c
diff --git a/src/modules/modPipe.c b/src/modules/modPipe.c
index fef68a1..fef68a1 100755..100644
--- a/src/modules/modPipe.c
+++ b/src/modules/modPipe.c
diff --git a/src/modules/modTeleport.c b/src/modules/modTeleport.c
index 3c136cb..3c136cb 100755..100644
--- a/src/modules/modTeleport.c
+++ b/src/modules/modTeleport.c
diff --git a/src/modules/modWall.c b/src/modules/modWall.c
index 66954d9..66954d9 100755..100644
--- a/src/modules/modWall.c
+++ b/src/modules/modWall.c
diff --git a/src/net/tcp.c b/src/net/tcp.c
index 44a080b..44a080b 100755..100644
--- a/src/net/tcp.c
+++ b/src/net/tcp.c
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.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/heightScore.c b/src/server/highScore.c
index 7689d3f..1ae7001 100644
--- a/src/server/heightScore.c
+++ b/src/server/highScore.c
@@ -7,19 +7,19 @@
#include "main.h"
#include "list.h"
#include "textFile.h"
-#include "heightScore.h"
+#include "highScore.h"
static textFile_t *textFile;
void
-initHeightScore(char *file)
+initHighScore(char *file)
{
int i;
textFile = loadTextFile(file);
if (textFile == NULL) {
- fprintf(stderr, _("I am unable to load: \"%s\" !\n"), file);
+ fprintf(stderr, _("I am unable to load: \"%s\"!\n"), file);
fprintf(stderr, _("Creating: \"%s\"\n"), file);
textFile = newTextFile(file);
}
@@ -31,11 +31,11 @@ initHeightScore(char *file)
}
if (textFile == NULL) {
- fprintf(stderr, _("I was unable to create: \"%s\" !\n"), file);
+ fprintf(stderr, _("I was unable to create: \"%s\"!\n"), file);
return;
}
- for (i = 0; i < HEIGHTSCORE_MAX_PLAYERS; i++) {
+ for (i = 0; i < HIGHSCORE_MAX_PLAYERS; i++) {
addList(textFile->text, strdup("no_name 0"));
}
@@ -51,7 +51,7 @@ addPlayerInHighScore(char *name, int score)
return -1; // Ha ha ha
}
- for (i = 0; i < HEIGHTSCORE_MAX_PLAYERS; i++) {
+ for (i = 0; i < HIGHSCORE_MAX_PLAYERS; i++) {
char *line;
char thisName[STR_NAME_SIZE];
int thisCore;
@@ -64,7 +64,7 @@ addPlayerInHighScore(char *name, int score)
sprintf(new, "%s %d", name, score);
insList(textFile->text, i, strdup(new));
- delListItem(textFile->text, HEIGHTSCORE_MAX_PLAYERS, free);
+ delListItem(textFile->text, HIGHSCORE_MAX_PLAYERS, free);
//printTextFile(textFile);
saveTextFile(textFile);
@@ -86,7 +86,7 @@ getTableItem(int index)
}
void
-quitHeightScore()
+quitHighScore()
{
if (textFile != NULL) {
saveTextFile(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);
generated by cgit v1.2.3 (git 2.46.0) at 2026-09-13 08:36:59 +0000