summaryrefslogtreecommitdiff
path: root/src/base
diff options
context:
space:
mode:
Diffstat (limited to 'src/base')
-rw-r--r--src/base/arena.c14
-rw-r--r--src/base/arenaFile.c8
-rw-r--r--src/base/checkFront.c2
-rw-r--r--src/base/checkFront.h2
-rw-r--r--src/base/item.c2
-rw-r--r--src/base/path.h28
-rw-r--r--src/base/proto.c16
-rw-r--r--src/base/server.c2
-rw-r--r--src/base/serverSendMsg.c4
-rw-r--r--src/base/tux.c4
10 files changed, 55 insertions, 27 deletions
diff --git a/src/base/arena.c b/src/base/arena.c
index 08ee226..868d6bb 100644
--- a/src/base/arena.c
+++ b/src/base/arena.c
@@ -82,7 +82,7 @@ void arena_init()
void arena_quit()
{
- unhot_key_register(SDLK_F3);
+ hot_key_unregister(SDLK_F3);
}
#endif
@@ -284,7 +284,7 @@ void drawSplitArena(arena_t * arena)
{
tux_t *tux = NULL;
- tux = word_get_control_tux(TUX_CONTROL_KEYBOARD_RIGHT);
+ tux = world_get_control_tux(TUX_CONTROL_KEYBOARD_RIGHT);
if (tux != NULL) {
switch (splitType) {
@@ -297,7 +297,7 @@ void drawSplitArena(arena_t * arena)
}
}
- tux = word_get_control_tux(TUX_CONTROL_KEYBOARD_LEFT);
+ tux = world_get_control_tux(TUX_CONTROL_KEYBOARD_LEFT);
if (tux != NULL) {
drawSplitArenaForTux(arena, tux, 0, 0);
@@ -319,7 +319,7 @@ void drawSimpleArena(arena_t * arena)
int screen_x, screen_y;
tux_t *tux = NULL;
- tux = word_get_control_tux(TUX_CONTROL_KEYBOARD_RIGHT);
+ tux = world_get_control_tux(TUX_CONTROL_KEYBOARD_RIGHT);
if (tux == NULL) {
return;
@@ -340,8 +340,8 @@ void arena_draw(arena_t * arena)
tux_t *tux1;
tux_t *tux2;
- tux1 = word_get_control_tux(TUX_CONTROL_KEYBOARD_RIGHT);
- tux2 = word_get_control_tux(TUX_CONTROL_KEYBOARD_LEFT);
+ tux1 = world_get_control_tux(TUX_CONTROL_KEYBOARD_RIGHT);
+ tux2 = world_get_control_tux(TUX_CONTROL_KEYBOARD_LEFT);
if (isTuxNear(tux1, tux2)) {
drawCenterArena(arena, (tux1->x + tux2->x) / 2, (tux1->y + tux2->y) / 2);
@@ -355,7 +355,7 @@ void arena_draw(arena_t * arena)
if (isBigArena(arena)) {
tux_t *tux = NULL;
- tux = word_get_control_tux(TUX_CONTROL_KEYBOARD_RIGHT);
+ tux = world_get_control_tux(TUX_CONTROL_KEYBOARD_RIGHT);
if (tux == NULL) {
return;
diff --git a/src/base/arenaFile.c b/src/base/arenaFile.c
index 4e6ef6f..45ba4ac 100644
--- a/src/base/arenaFile.c
+++ b/src/base/arenaFile.c
@@ -189,7 +189,7 @@ int arena_file_get_count()
return listArenaFile->count;
}
-static char *arena_file_get_arenaStatus(textFile_t * ts, char *s)
+static char *arena_file_get_status(textFile_t * ts, char *s)
{
int len;
int i;
@@ -212,7 +212,7 @@ char *arena_file_get_name(arenaFile_t * arenaFile)
{
char *ret;
- ret = arena_file_get_arenaStatus(arenaFile->map, "name");
+ ret = arena_file_get_status(arenaFile->map, "name");
return (ret != NULL ? ret : "arena_no_name");
}
@@ -220,7 +220,7 @@ char *arena_file_get_net_name(arenaFile_t * arenaFile)
{
char *ret;
- ret = arena_file_get_arenaStatus(arenaFile->map, "netName");
+ ret = arena_file_get_status(arenaFile->map, "netName");
return (ret != NULL ? ret : "arena_no_net_name");
}
@@ -242,7 +242,7 @@ arenaFile_t *arena_file_get_file_format_net_name(char *s)
char *arena_file_get_image(arenaFile_t * arenaFile)
{
- return arena_file_get_arenaStatus(arenaFile->map, "screen");
+ return arena_file_get_status(arenaFile->map, "screen");
}
arenaFile_t *arena_file_get(int n)
diff --git a/src/base/checkFront.c b/src/base/checkFront.c
index 47adda2..6c44580 100644
--- a/src/base/checkFront.c
+++ b/src/base/checkFront.c
@@ -48,7 +48,7 @@ list_t *check_front_new()
return list_new();
}
-void check_front_add_msg(list_t * list, char *msg, int type, int id)
+void check_front_msg_add(list_t * list, char *msg, int type, int id)
{
if (type == CHECK_FRONT_TYPE_CHECK)
id_inc(id);
diff --git a/src/base/checkFront.h b/src/base/checkFront.h
index 2fc73b0..cde6cfd 100644
--- a/src/base/checkFront.h
+++ b/src/base/checkFront.h
@@ -13,7 +13,7 @@
# include "server.h"
extern list_t *check_front_new();
-extern void check_front_add_msg(list_t * list, char *msg, int type, int id);
+extern void check_front_msg_add(list_t * list, char *msg, int type, int id);
extern void check_front_event(client_t * client);
extern void check_front_del_msg(list_t * listCheckFront, int id);
extern void check_front_destroy(list_t * p);
diff --git a/src/base/item.c b/src/base/item.c
index 7abdde4..b7299c5 100644
--- a/src/base/item.c
+++ b/src/base/item.c
@@ -418,7 +418,7 @@ static void tux_event_tux_is_deadWithItem(tux_t * tux, item_t * item)
}
}
- word_inc_round();
+ world_inc_round();
tux_event_tux_is_dead(tux);
}
diff --git a/src/base/path.h b/src/base/path.h
new file mode 100644
index 0000000..155d0ac
--- /dev/null
+++ b/src/base/path.h
@@ -0,0 +1,28 @@
+
+#ifndef PATH_H
+/* #undef USE_MAGICK */
+ #define TUXANCI_VERSION "0.21.99"
+ #define PATH_H
+ #define PREFIX "/usr/local"
+ #ifdef PUBLIC_SERVER
+ #define APPNAME "tuxanci-server"
+ #define SERVER_CONFIG "/etc" "/" APPNAME "/server.conf"
+ #else
+ #define APPNAME "tuxanci"
+ #endif
+ #define PATH_DIR "/usr/local/share" "/" APPNAME "/"
+ // windows bug
+ #ifndef __WIN32__
+ #define PATH_MODULES "/usr/local/lib" "/" APPNAME "/"
+ #else
+ #define PATH_MODULES PREFIX
+ #endif
+ #define PATH_IMAGE PATH_DIR "images/"
+ #define PATH_ARENA PATH_DIR "arena/"
+ #define PATH_SOUND PATH_DIR "sound/"
+ #define PATH_MUSIC PATH_DIR "music/"
+ #define PATH_LOCALE "/usr/local/share/locale" "/"
+ #define PATH_DOC "/usr/local/share/doc/tuxanci" "/"
+ #define PACKAGE "tuxanci"
+ #include "main.h"
+#endif
diff --git a/src/base/proto.c b/src/base/proto.c
index 326e92d..3038cd8 100644
--- a/src/base/proto.c
+++ b/src/base/proto.c
@@ -68,15 +68,15 @@ void proto_recv_error_client(char *msg)
switch (errorcode) {
case PROTO_ERROR_CODE_BAD_VERSION:
analyze_set_msg(_("Version of your client isn't supported by the server."));
- word_do_end();
+ world_do_end();
break;
case PROTO_ERROR_CODE_TIMEOUT:
analyze_set_msg(_("The timeout of ping from server is out"));
- word_do_end();
+ world_do_end();
break;
case PROTO_ERROR_LIMIT_MAX_CLIENT:
analyze_set_msg(_("The maximum amount of connected players has been exceeded!"));
- word_do_end();
+ world_do_end();
break;
}
}
@@ -117,7 +117,7 @@ static void sendInfoCreateClient(client_t * client)
proto_send_init_server(PROTO_SEND_ONE, client, client);
#ifndef PUBLIC_SERVER
- proto_send_newtux_server(PROTO_SEND_ONE, client, word_get_control_tux(TUX_CONTROL_KEYBOARD_RIGHT));
+ proto_send_newtux_server(PROTO_SEND_ONE, client, world_get_control_tux(TUX_CONTROL_KEYBOARD_RIGHT));
#endif
for (i = 0; i < listClient->count; i++) {
@@ -372,7 +372,7 @@ void proto_recv_init_client(char *msg)
return;
}
- word_set_arena(arena_file_get_file_format_net_name(arena_name));
+ world_set_arena(arena_file_get_file_format_net_name(arena_name));
arena = arena_get_current();
arena->max_countRound = n;
@@ -382,9 +382,9 @@ void proto_recv_init_client(char *msg)
tux->x = x;
tux->y = y;
tux->control = TUX_CONTROL_KEYBOARD_RIGHT;
- word_set_control_tux(tux, TUX_CONTROL_KEYBOARD_RIGHT);
+ world_set_control_tux(tux, TUX_CONTROL_KEYBOARD_RIGHT);
- public_server_get_settingNameRight(tux->name);
+ public_server_get_setting_name_right(tux->name);
space_add(arena->spaceTux, tux);
}
@@ -964,7 +964,7 @@ void proto_recv_end_client(char *msg)
{
assert(msg != NULL);
- word_do_end();
+ world_do_end();
}
#endif
diff --git a/src/base/server.c b/src/base/server.c
index 16162d0..bbaf71d 100644
--- a/src/base/server.c
+++ b/src/base/server.c
@@ -191,7 +191,7 @@ static void eventPeriodicSyncClient(void *p_nothink)
int i;
#ifndef PUBLIC_SERVER
- proto_send_newtux_server(PROTO_SEND_ALL_SEES_TUX, NULL, word_get_control_tux(TUX_CONTROL_KEYBOARD_RIGHT));
+ proto_send_newtux_server(PROTO_SEND_ALL_SEES_TUX, NULL, world_get_control_tux(TUX_CONTROL_KEYBOARD_RIGHT));
#endif
for (i = 0; i < listClient->count; i++) {
diff --git a/src/base/serverSendMsg.c b/src/base/serverSendMsg.c
index b1a9559..c6c9a0a 100644
--- a/src/base/serverSendMsg.c
+++ b/src/base/serverSendMsg.c
@@ -20,7 +20,7 @@ static void addMsgClient(client_t * p, char *msg, int type, int id)
assert(msg != NULL);
if (p->status != NET_STATUS_ZOMBIE) {
- check_front_add_msg(p->listSendMsg, msg, type, id);
+ check_front_msg_add(p->listSendMsg, msg, type, id);
}
}
@@ -128,7 +128,7 @@ void send_msg_to_client(int type, client_t * client, char *msg, int type2, int i
if (client != NULL) {
addMsgAllClientSeesTux(msg, client->tux, type2, id);
} else {
- addMsgAllClientSeesTux(msg, word_get_control_tux(TUX_CONTROL_KEYBOARD_RIGHT), type2, id);
+ addMsgAllClientSeesTux(msg, world_get_control_tux(TUX_CONTROL_KEYBOARD_RIGHT), type2, id);
}
#endif
#ifdef PUBLIC_SERVER
diff --git a/src/base/tux.c b/src/base/tux.c
index aafc4fd..5a10c7a 100644
--- a/src/base/tux.c
+++ b/src/base/tux.c
@@ -362,7 +362,7 @@ static void tux_event_tux_is_deadWIthShot(tux_t * tux, shot_t * shot)
}
- word_inc_round();
+ world_inc_round();
tux_event_tux_is_dead(tux);
}
@@ -660,7 +660,7 @@ void tux_event(tux_t * tux)
arena = arena_get_current();
#ifndef PUBLIC_SERVER
- word_tux_control(tux);
+ world_tux_control(tux);
#endif
pickUpGun(tux);
eventBonus(tux);
generated by cgit v1.2.3 (git 2.46.0) at 2026-09-13 07:39:18 +0000