summaryrefslogtreecommitdiff
path: root/src/modules
diff options
context:
space:
mode:
authorDusan Durech <dusan@debian.debian>2009-04-12 23:00:24 +0200
committerDusan Durech <dusan@debian.debian>2009-04-12 23:00:24 +0200
commit0287f62578cb4aa643649a9d62dc753586b16b30 (patch)
tree7f6e2721d71ab2824b7d163a5b878d390ddb7918 /src/modules
parent5876841408bf307d78d254b5ca355c61044e9e72 (diff)
fix bad preFixs
Diffstat (limited to 'src/modules')
-rw-r--r--src/modules/modAI.c4
-rw-r--r--src/modules/modMove.c14
-rw-r--r--src/modules/modPipe.c10
-rw-r--r--src/modules/modTeleport.c8
-rw-r--r--src/modules/modWall.c2
5 files changed, 19 insertions, 19 deletions
diff --git a/src/modules/modAI.c b/src/modules/modAI.c
index e8b5172..f084933 100644
--- a/src/modules/modAI.c
+++ b/src/modules/modAI.c
@@ -263,7 +263,7 @@ static void tux_eventAI(tux_t * tux)
moveAlternative(this, w * 2);
- if (export_fce->fce_arena__is_free_space(arena, this->x, this->y, w, h) == 1) {
+ if (export_fce->fce_arena_is_free_space(arena, this->x, this->y, w, h) == 1) {
forkAlternative(listFork, this, 2 * w, 2 * h);
countFork++;
continue;
@@ -281,7 +281,7 @@ static void tux_eventAI(tux_t * tux)
break;
}
- if (export_fce->fce_arena__is_free_space(arena, this->x, this->y, w, h) == 0) {
+ if (export_fce->fce_arena_is_free_space(arena, this->x, this->y, w, h) == 0) {
//forkAlternative(listFork, this, w*2, h*2);
list_del_item(listAlternative, my_index, destroyAlternative);
my_index--;
diff --git a/src/modules/modMove.c b/src/modules/modMove.c
index deaf71e..552e6bd 100644
--- a/src/modules/modMove.c
+++ b/src/modules/modMove.c
@@ -29,7 +29,7 @@ static void move_tux(tux_t * tux, int x, int y, int w, int h)
int dist_x = 0, dist_y = 0; // no warnning
if (tux->bonus == BONUS_GHOST ||
- export_fce->fce_netMultiplayer_get_game_type() == NET_GAME_TYPE_CLIENT)
+ export_fce->fce_net_multiplayer_get_game_type() == NET_GAME_TYPE_CLIENT)
return;
switch (tux->position) {
case TUX_UP:
@@ -53,14 +53,14 @@ static void move_tux(tux_t * tux, int x, int y, int w, int h)
break;
}
if (export_fce->
- fce_arena__is_free_space(export_fce->fce_arena_get_current(), dist_x, dist_y,
+ fce_arena_is_free_space(export_fce->fce_arena_get_current(), dist_x, dist_y,
TUX_WIDTH, TUX_HEIGHT)) {
space_move_object(export_fce->fce_arena_get_current()->spaceTux, tux,
dist_x, dist_y);
#ifndef PUBLIC_SERVER
//sound_play("teleport", SOUND_GROUP_BASE);
#endif
- if (export_fce->fce_netMultiplayer_get_game_type() == NET_GAME_TYPE_SERVER) {
+ if (export_fce->fce_net_multiplayer_get_game_type() == NET_GAME_TYPE_SERVER) {
char msg[STR_PROTO_SIZE];
sprintf(msg, "movetux %d %d %d", tux->id, dist_x, dist_y);
if (tux->bonus == BONUS_HIDDEN)
@@ -159,7 +159,7 @@ move_shot(shot_t * shot, int position, int src_x, int src_y,
space_move_object(export_fce->fce_arena_get_current()->spaceShot, shot,
new_x, new_y);
- if (export_fce->fce_netMultiplayer_get_game_type() == NET_GAME_TYPE_SERVER) {
+ if (export_fce->fce_net_multiplayer_get_game_type() == NET_GAME_TYPE_SERVER) {
char msg[STR_PROTO_SIZE];
sprintf(msg, "moveshot %d %d %d %d %d %d",
@@ -172,8 +172,8 @@ move_shot(shot_t * shot, int position, int src_x, int src_y,
int init(export_fce_t * p)
{
export_fce = p;
- export_fce->fce_shareFunction_add("move_tux", (void *) move_tux);
- export_fce->fce_shareFunction_add("move_shot", (void *) move_shot);
+ export_fce->fce_share_function_add("move_tux", (void *) move_tux);
+ export_fce->fce_share_function_add("move_shot", (void *) move_shot);
return 0;
}
@@ -247,7 +247,7 @@ void cmdArena(char *line)
void recvMsg(char *msg)
{
- if (export_fce->fce_netMultiplayer_get_game_type() == NET_GAME_TYPE_SERVER)
+ if (export_fce->fce_net_multiplayer_get_game_type() == NET_GAME_TYPE_SERVER)
return;
if (strncmp(msg, "movetux", 7) == 0)
diff --git a/src/modules/modPipe.c b/src/modules/modPipe.c
index 455bdce..1759fc5 100644
--- a/src/modules/modPipe.c
+++ b/src/modules/modPipe.c
@@ -210,7 +210,7 @@ int init(export_fce_t * p)
return -1;
}
- if ((fce_move_shot = export_fce->fce_shareFunction_get("move_shot")) == NULL) {
+ if ((fce_move_shot = export_fce->fce_share_function_get("move_shot")) == NULL) {
return -1;
}
@@ -277,11 +277,11 @@ static void action_eventpipe(space_t * space, pipe_t * pipe, shot_t * shot)
}
if (negPosition(shot->position) == pipe->position &&
- export_fce->fce_netMultiplayer_get_game_type() != NET_GAME_TYPE_CLIENT) {
+ export_fce->fce_net_multiplayer_get_game_type() != NET_GAME_TYPE_CLIENT) {
moveShotFromPipe(shot, pipe);
} else {
if (shot->gun == GUN_BOMBBALL &&
- export_fce->fce_netMultiplayer_get_game_type() != NET_GAME_TYPE_CLIENT) {
+ export_fce->fce_net_multiplayer_get_game_type() != NET_GAME_TYPE_CLIENT) {
export_fce->fce_shot_bound_bombBall(shot);
} else {
//space_del_with_item(arena->spaceShot, shot, export_fce->fce_shot_destroy);
@@ -323,7 +323,7 @@ action_eventshot(space_t * space, shot_t * shot, space_t * p_spacePipe)
shot->y, shot->w, shot->h);
if (shot->del == TRUE) {
- if (netMultiplayer_get_game_type() == NET_GAME_TYPE_SERVER) {
+ if (net_multiplayer_get_game_type() == NET_GAME_TYPE_SERVER) {
proto_send_del_server(PROTO_SEND_ALL, NULL, shot->id);
}
@@ -338,7 +338,7 @@ int event()
}
// na skusku
- if (export_fce->fce_netMultiplayer_get_game_type() == NET_GAME_TYPE_CLIENT) {
+ if (export_fce->fce_net_multiplayer_get_game_type() == NET_GAME_TYPE_CLIENT) {
return 0;
}
diff --git a/src/modules/modTeleport.c b/src/modules/modTeleport.c
index b7079ee..4d3a9ca 100644
--- a/src/modules/modTeleport.c
+++ b/src/modules/modTeleport.c
@@ -204,7 +204,7 @@ static void teleportTux(tux_t * tux, teleport_t * teleport)
teleport_t *distTeleport;
if (tux->bonus == BONUS_GHOST ||
- export_fce->fce_netMultiplayer_get_game_type() == NET_GAME_TYPE_CLIENT) {
+ export_fce->fce_net_multiplayer_get_game_type() == NET_GAME_TYPE_CLIENT) {
return;
}
@@ -236,11 +236,11 @@ int init(export_fce_t * p)
return -1;
}
- if ((fce_move_tux = export_fce->fce_shareFunction_get("move_tux")) == NULL) {
+ if ((fce_move_tux = export_fce->fce_share_function_get("move_tux")) == NULL) {
return -1;
}
- if ((fce_move_shot = export_fce->fce_shareFunction_get("move_shot")) == NULL) {
+ if ((fce_move_shot = export_fce->fce_share_function_get("move_shot")) == NULL) {
return -1;
}
@@ -316,7 +316,7 @@ int event()
return 0;
}
- if (export_fce->fce_netMultiplayer_get_game_type() == NET_GAME_TYPE_CLIENT) {
+ if (export_fce->fce_net_multiplayer_get_game_type() == NET_GAME_TYPE_CLIENT) {
return 0;
}
diff --git a/src/modules/modWall.c b/src/modules/modWall.c
index b6fb54e..966edcd 100644
--- a/src/modules/modWall.c
+++ b/src/modules/modWall.c
@@ -285,7 +285,7 @@ static void action_eventwall(space_t * space, wall_t * wall, shot_t * shot)
}
if (shot->gun == GUN_BOMBBALL) {
- if (export_fce->fce_netMultiplayer_get_game_type() != NET_GAME_TYPE_CLIENT) {
+ if (export_fce->fce_net_multiplayer_get_game_type() != NET_GAME_TYPE_CLIENT) {
export_fce->fce_shot_bound_bombBall(shot);
}