summaryrefslogtreecommitdiff
path: root/src/server
diff options
context:
space:
mode:
Diffstat (limited to 'src/server')
-rw-r--r--src/server/highScore.c20
-rw-r--r--src/server/highScore.h6
-rw-r--r--src/server/publicServer.c56
-rw-r--r--src/server/publicServer.h10
-rw-r--r--src/server/serverConfigFile.c4
5 files changed, 48 insertions, 48 deletions
diff --git a/src/server/highScore.c b/src/server/highScore.c
index affd28f..50e6a13 100644
--- a/src/server/highScore.c
+++ b/src/server/highScore.c
@@ -11,16 +11,16 @@
static textFile_t *textFile;
-void highScore_init(char *file)
+void high_score_init(char *file)
{
int i;
- textFile = textFile_load(file);
+ textFile = text_file_load(file);
if (textFile == NULL) {
fprintf(stderr, _("I am unable to load: \"%s\"!\n"), file);
fprintf(stderr, _("Creating: \"%s\"\n"), file);
- textFile = textFile_new(file);
+ textFile = text_file_new(file);
} else {
DEBUG_MSG(_("Scorefile: \"%s\"\n"), file);
@@ -36,7 +36,7 @@ void highScore_init(char *file)
list_add(textFile->text, strdup("no_name 0"));
}
- textFile_save(textFile);
+ text_file_save(textFile);
}
int table_add(char *name, int score)
@@ -61,8 +61,8 @@ int table_add(char *name, int score)
sprintf(new, "%s %d", name, score);
list_ins(textFile->text, i, strdup(new));
list_del_item(textFile->text, HIGHSCORE_MAX_PLAYERS, free);
- //textFile_print(textFile);
- textFile_save(textFile);
+ //text_file_print(textFile);
+ text_file_save(textFile);
return 0;
}
@@ -71,7 +71,7 @@ int table_add(char *name, int score)
return -1;
}
-char *highScore_get_table(int index)
+char *high_score_get_table(int index)
{
if (textFile != NULL && index >= 0 && index < textFile->text->count) {
return (char *) textFile->text->list[index];
@@ -80,10 +80,10 @@ char *highScore_get_table(int index)
return NULL;
}
-void highScore_quit()
+void high_score_quit()
{
if (textFile != NULL) {
- textFile_save(textFile);
- textFile_destroy(textFile);
+ text_file_save(textFile);
+ text_file_destroy(textFile);
}
}
diff --git a/src/server/highScore.h b/src/server/highScore.h
index 7326d6d..8c90db5 100644
--- a/src/server/highScore.h
+++ b/src/server/highScore.h
@@ -5,9 +5,9 @@
# define HIGHSCORE_MAX_PLAYERS 100
-extern void highScore_init(char *file);
+extern void high_score_init(char *file);
extern int table_add(char *name, int score);
-extern char *highScore_get_table(int index);
-extern void highScore_quit();
+extern char *high_score_get_table(int index);
+extern void high_score_quit();
#endif
diff --git a/src/server/publicServer.c b/src/server/publicServer.c
index 475c47d..5a89f42 100644
--- a/src/server/publicServer.c
+++ b/src/server/publicServer.c
@@ -51,7 +51,7 @@ void word_inc_round()
{
}
-char *publicServer_get_setting(char *env, char *param, char *default_val)
+char *public_server_get_setting(char *env, char *param, char *default_val)
{
return getParamElse(param, server_configFile_get_value(env, default_val));
}
@@ -161,7 +161,7 @@ static int registerPublicServer()
register_head *head = (register_head *) str;
head->cmd = 'p';
- head->port = atoi(publicServer_get_setting("PORT4", "--port4", "6800"));
+ head->port = atoi(public_server_get_setting("PORT4", "--port4", "6800"));
head->ip = 0; // TODO
/* send request for server list */
@@ -186,7 +186,7 @@ static int registerPublicServer()
return 0;
}
-static int publicServer_initNetwork()
+static int public_server_initNetwork()
{
char ip4[STR_IP_SIZE];
char ip6[STR_IP_SIZE];
@@ -197,8 +197,8 @@ static int publicServer_initNetwork()
ret = -1;
- strcpy(ip4, publicServer_get_setting("IP4", "--ip4", "none"));
- strcpy(ip6, publicServer_get_setting("IP6", "--ip6", "none"));
+ strcpy(ip4, public_server_get_setting("IP4", "--ip4", "none"));
+ strcpy(ip6, public_server_get_setting("IP6", "--ip6", "none"));
p_ip4 = ip4;
@@ -212,68 +212,68 @@ static int publicServer_initNetwork()
p_ip6 = NULL;
}
- port4 = atoi(publicServer_get_setting("PORT4", "--port4", "6800"));
- port6 = atoi(publicServer_get_setting("PORT6", "--port6", "6800"));
+ port4 = atoi(public_server_get_setting("PORT4", "--port4", "6800"));
+ port6 = atoi(public_server_get_setting("PORT6", "--port6", "6800"));
//ret = initNetMulitplayerPublicServer(p_ip4, port4, p_ip6, port6);
- ret = netMultiplayer_init_for_game_server(p_ip4, port4, p_ip6, port6);
+ ret = net_multiplayer_init_for_game_server(p_ip4, port4, p_ip6, port6);
return ret;
}
static void load_arena()
{
- choice_arenaFile = arenaFile_get_file_format_net_name(publicServer_get_setting("ARENA", "--arena", "FAGN"));
+ choice_arenaFile = arena_file_get_file_format_net_name(public_server_get_setting("ARENA", "--arena", "FAGN"));
if (choice_arenaFile == NULL) {
- fprintf(stderr, _("I dont load arena %s!\n"), publicServer_get_setting("ARENA", "--arena", "FAGN"));
+ fprintf(stderr, _("I dont load arena %s!\n"), public_server_get_setting("ARENA", "--arena", "FAGN"));
exit(-1);
}
- arena = arenaFile_get_arena(choice_arenaFile);
+ arena = arena_file_get_arena(choice_arenaFile);
arena_set_current(arena);
}
-int publicServer_init()
+int public_server_init()
{
int ret;
int i;
id_init_list();
module_init();
- arenaFile_init();
+ arena_file_init();
tux_init();
item_init();
shot_init();
server_configFile_init();
- ret = log_init(publicServer_get_setting("LOG_FILE", "--log-file", "/tmp/tuxanci-server.log"));
+ ret = log_init(public_server_get_setting("LOG_FILE", "--log-file", "/tmp/tuxanci-server.log"));
if (ret < 0) {
fprintf(stderr, _("I was unable to open config file!\n"));
return -1;
}
- highScore_init(publicServer_get_setting("SCORE_FILE", "--score-file", "/tmp/highscore.txt"));
+ high_score_init(public_server_get_setting("SCORE_FILE", "--score-file", "/tmp/highscore.txt"));
load_arena();
- for (i = 0; i < atoi(publicServer_get_setting("ITEM", "--item", "10")); i++) {
+ for (i = 0; i < atoi(public_server_get_setting("ITEM", "--item", "10")); i++) {
item_add_new_item(arena->spaceItem, ID_UNKNOWN);
}
isSignalEnd = FALSE;
- ret = publicServer_initNetwork();
+ ret = public_server_initNetwork();
if (ret < 0) {
printf(_("Unable to initialize network socket!\n"));
return -1;
}
- server_set_max_clients(atoi (publicServer_get_setting("MAX_CLIENTS", "--max-clients", "32")));
+ server_set_max_clients(atoi (public_server_get_setting("MAX_CLIENTS", "--max-clients", "32")));
if (registerPublicServer() < 0) {
printf(_("Unable to contact MasterServer!)\n"));
@@ -282,7 +282,7 @@ int publicServer_init()
return 0;
}
-arenaFile_t *choiceArena_get()
+arenaFile_t *choice_arena_get()
{
return choice_arenaFile;
}
@@ -292,10 +292,10 @@ void eventPublicServer()
static my_time_t lastActive = 0;
my_time_t interval;
- netMultiplayer_event();
+ net_multiplayer_event();
if (isSignalEnd == TRUE) {
- publicServer_quit();
+ public_server_quit();
}
if (lastActive == 0) {
@@ -321,36 +321,36 @@ void my_handler_quit(int n)
isSignalEnd = TRUE;
}
-void publicServer_quit()
+void public_server_quit()
{
DEBUG_MSG(_("Quitting public server\n"));
- netMultiplayer_quit();
+ net_multiplayer_quit();
arena_destroy(arena);
tux_quit();
item_quiy();
shot_quit();
- arenaFile_quit();
+ arena_file_quit();
server_configFile_quit();
module_quit();
id_quit_list();
- highScore_quit();
+ high_score_quit();
log_quit();
exit(0);
}
-int publicServer_start()
+int public_server_start()
{
#ifndef __WIN32__
signal(SIGINT, my_handler_quit);
signal(SIGTERM, my_handler_quit);
signal(SIGQUIT, my_handler_quit);
#endif
- if (publicServer_init() < 0) {
- publicServer_quit();
+ if (public_server_init() < 0) {
+ public_server_quit();
return -1;
}
diff --git a/src/server/publicServer.h b/src/server/publicServer.h
index 4a102a8..64ab1b8 100644
--- a/src/server/publicServer.h
+++ b/src/server/publicServer.h
@@ -8,13 +8,13 @@
# define WORLD_COUNT_ROUND_UNLIMITED -1
-extern char *publicServer_get_setting(char *env, char *param, char *default_val);
+extern char *public_server_get_setting(char *env, char *param, char *default_val);
extern void word_inc_round();
-extern int publicServer_init();
-extern arenaFile_t *choiceArena_get();
+extern int public_server_init();
+extern arenaFile_t *choice_arena_get();
extern void eventPublicServer();
extern void my_handler_quit(int n);
-extern void publicServer_quit();
-extern int publicServer_start();
+extern void public_server_quit();
+extern int public_server_start();
#endif
diff --git a/src/server/serverConfigFile.c b/src/server/serverConfigFile.c
index e1331ab..8458de2 100644
--- a/src/server/serverConfigFile.c
+++ b/src/server/serverConfigFile.c
@@ -40,7 +40,7 @@ void server_configFile_init()
printf(_("Loading configuration from: \"%s\"\n"),
getParamElse("--config-file", SERVER_CONFIG));
- serverTextFile = textFile_load(configFile);
+ serverTextFile = text_file_load(configFile);
if (serverTextFile == NULL) {
fprintf(stderr,
@@ -95,6 +95,6 @@ char *server_configFile_get_value(char *env, char *s)
void server_configFile_quit()
{
if (serverTextFile != NULL) {
- textFile_destroy(serverTextFile);
+ text_file_destroy(serverTextFile);
}
}
generated by cgit v1.2.3 (git 2.46.0) at 2026-09-13 15:21:26 +0000