summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/base/msg.h2
-rw-r--r--src/client/control.c31
-rw-r--r--src/client/control.h9
-rw-r--r--src/screen/world.c72
-rw-r--r--src/widget/widget_label.c2
5 files changed, 59 insertions, 57 deletions
diff --git a/src/base/msg.h b/src/base/msg.h
index 65e3ff3..95a189b 100644
--- a/src/base/msg.h
+++ b/src/base/msg.h
@@ -14,7 +14,7 @@
#endif /* DEBUG */
#define warning(msg,arg...) fprintf(stderr, "%s ", _("[Warning]")); fprintf(stderr, _(msg) "\n", ##arg)
-#define error(msg,arg...) fprintf(stderr, "%s ", _("[Error]"))); fprintf(stderr, _(msg) "\n", ##arg)
+#define error(msg,arg...) fprintf(stderr, "%s ", _("[Error]")); fprintf(stderr, _(msg) "\n", ##arg)
#define fatal(msg,arg...) \
{ \
fprintf(stderr, "%s ", _("[Fatal]")); fprintf(stderr, _(msg) "\n", ##arg); \
diff --git a/src/client/control.c b/src/client/control.c
index 342dba5..737762c 100644
--- a/src/client/control.c
+++ b/src/client/control.c
@@ -5,8 +5,8 @@
#include "main.h"
#include "control.h"
-control_t* control_new(SDLKey arg_up, SDLKey arg_right, SDLKey arg_left, SDLKey arg_down,
- SDLKey arg_shot, SDLKey arg_switch)
+control_t* control_new(SDLKey arg_up, SDLKey arg_right, SDLKey arg_left,
+ SDLKey arg_down, SDLKey arg_shot, SDLKey arg_switch)
{
control_t *tmp;
@@ -24,7 +24,7 @@ control_t* control_new(SDLKey arg_up, SDLKey arg_right, SDLKey arg_left, SDLKey
int control_get_key_route(control_t *my_control)
{
- Uint8 *mapa;
+ Uint8 *map;
SDLKey ret_key;
int z;
int i;
@@ -33,23 +33,22 @@ int control_get_key_route(control_t *my_control)
ret_key = CONTROL_NONE;
- mapa = SDL_GetKeyState(NULL);
+ map = SDL_GetKeyState(NULL);
- for (i = 0; i<CONTROL_KEY_COUNT_ROUTE; i++) {
- if (mapa[my_control->key[i]] == SDL_PRESSED) {
+ for (i = 0; i < CONTROL_KEY_COUNT_ROUTE; i++) {
+ if (map[my_control->key[i]] == SDL_PRESSED) {
my_control->count[i]++;
- }
- else {
+ } else {
my_control->count[i] = 0;
}
}
z = INT_MAX;
- for (i = 0; i<CONTROL_KEY_COUNT_ROUTE; i++) {
- if ( my_control->count[i] > 0 &&
- my_control->count[i] < z &&
- mapa[my_control->key[i]] == SDL_PRESSED ) {
+ for (i = 0; i < CONTROL_KEY_COUNT_ROUTE; i++) {
+ if (my_control->count[i] > 0 &&
+ my_control->count[i] < z &&
+ map[my_control->key[i]] == SDL_PRESSED) {
z = my_control->count[i];
ret_key = i;
}
@@ -60,20 +59,20 @@ int control_get_key_route(control_t *my_control)
int control_get_key_action(control_t *my_control)
{
- Uint8 *mapa;
+ Uint8 *map;
SDLKey ret_key;
assert(my_control != NULL);
ret_key = CONTROL_NONE;
- mapa = SDL_GetKeyState(NULL);
+ map = SDL_GetKeyState(NULL);
- if (mapa[my_control->key[CONTROL_SHOT]] == SDL_PRESSED) {
+ if (map[my_control->key[CONTROL_SHOT]] == SDL_PRESSED) {
return CONTROL_SHOT;
}
- if (mapa[my_control->key[CONTROL_SWITCH]] == SDL_PRESSED) {
+ if (map[my_control->key[CONTROL_SWITCH]] == SDL_PRESSED) {
return CONTROL_SWITCH;
}
diff --git a/src/client/control.h b/src/client/control.h
index ff479ab..4103f33 100644
--- a/src/client/control.h
+++ b/src/client/control.h
@@ -12,17 +12,16 @@
#define CONTROL_KEY_COUNT_ROUTE 4
#define CONTROL_KEY_COUNT 6
-typedef struct control_struct
-{
+typedef struct control_struct {
SDLKey key[CONTROL_KEY_COUNT];
int count[CONTROL_KEY_COUNT];
} control_t;
extern control_t* control_new(SDLKey arg_up, SDLKey arg_right,
- SDLKey arg_left, SDLKey arg_down,
- SDLKey arg_shot, SDLKey arg_switch);
+ SDLKey arg_left, SDLKey arg_down,
+ SDLKey arg_shot, SDLKey arg_switch);
extern int control_get_key_route(control_t *my_control);
extern int control_get_key_action(control_t *my_control);
extern void control_destroy(control_t *my_control);
-#endif
+#endif /* CONTROL_H */
diff --git a/src/screen/world.c b/src/screen/world.c
index 97b0d38..42f0990 100644
--- a/src/screen/world.c
+++ b/src/screen/world.c
@@ -33,7 +33,7 @@
#ifndef NO_SOUND
#include "music.h"
#include "sound.h"
-#endif
+#endif /* NO_SOUND */
#include "screen.h"
#include "world.h"
@@ -79,7 +79,7 @@ void world_set_arena(arenaFile_t *arenaFile)
#ifndef NO_SOUND
music_play(arena->music, MUSIC_GROUP_USER);
-#endif
+#endif /* NO_SOUND */
}
void world_do_end()
@@ -109,7 +109,7 @@ void world_inc_round()
/*printf("count %d ending\n", count);*/
#ifndef NO_SOUND
sound_play("end", SOUND_GROUP_BASE);
-#endif
+#endif /* NO_SOUND */
timer_add_task(arena_get_current()->listTimer, TIMER_ONE, timer_endArena, NULL, TIMER_END_ARENA);
}
}
@@ -149,12 +149,14 @@ void prepareArena()
tux = tux_new();
- control_tux_right = control_new(key_table_get_key(KEY_TUX_RIGHT_MOVE_UP),
- key_table_get_key(KEY_TUX_RIGHT_MOVE_RIGHT),
- key_table_get_key(KEY_TUX_RIGHT_MOVE_LEFT),
- key_table_get_key(KEY_TUX_RIGHT_MOVE_DOWN),
- key_table_get_key(KEY_TUX_RIGHT_SWITCH_WEAPON),
- key_table_get_key(KEY_TUX_RIGHT_SHOOT));
+ control_tux_right = control_new(
+ key_table_get_key(KEY_TUX_RIGHT_MOVE_UP),
+ key_table_get_key(KEY_TUX_RIGHT_MOVE_RIGHT),
+ key_table_get_key(KEY_TUX_RIGHT_MOVE_LEFT),
+ key_table_get_key(KEY_TUX_RIGHT_MOVE_DOWN),
+ key_table_get_key(KEY_TUX_RIGHT_SWITCH_WEAPON),
+ key_table_get_key(KEY_TUX_RIGHT_SHOOT)
+ );
tux->control = TUX_CONTROL_KEYBOARD_RIGHT;
tuxWithControlRightKeyboard = tux;
@@ -164,12 +166,14 @@ void prepareArena()
tux = tux_new();
- control_tux_left = control_new(key_table_get_key(KEY_TUX_LEFT_MOVE_UP),
- key_table_get_key(KEY_TUX_LEFT_MOVE_RIGHT),
- key_table_get_key(KEY_TUX_LEFT_MOVE_LEFT),
- key_table_get_key(KEY_TUX_LEFT_MOVE_DOWN),
- key_table_get_key(KEY_TUX_LEFT_SWITCH_WEAPON),
- key_table_get_key(KEY_TUX_LEFT_SHOOT));
+ control_tux_left = control_new(
+ key_table_get_key(KEY_TUX_LEFT_MOVE_UP),
+ key_table_get_key(KEY_TUX_LEFT_MOVE_RIGHT),
+ key_table_get_key(KEY_TUX_LEFT_MOVE_LEFT),
+ key_table_get_key(KEY_TUX_LEFT_MOVE_DOWN),
+ key_table_get_key(KEY_TUX_LEFT_SWITCH_WEAPON),
+ key_table_get_key(KEY_TUX_LEFT_SHOOT)
+ );
tux->control = TUX_CONTROL_KEYBOARD_LEFT;
tuxWithControlLeftKeyboard = tux;
@@ -195,12 +199,14 @@ void prepareArena()
tux = tux_new();
- control_tux_right = control_new(key_table_get_key(KEY_TUX_RIGHT_MOVE_UP),
- key_table_get_key(KEY_TUX_RIGHT_MOVE_RIGHT),
- key_table_get_key(KEY_TUX_RIGHT_MOVE_LEFT),
- key_table_get_key(KEY_TUX_RIGHT_MOVE_DOWN),
- key_table_get_key(KEY_TUX_RIGHT_SWITCH_WEAPON),
- key_table_get_key(KEY_TUX_RIGHT_SHOOT));
+ control_tux_right = control_new(
+ key_table_get_key(KEY_TUX_RIGHT_MOVE_UP),
+ key_table_get_key(KEY_TUX_RIGHT_MOVE_RIGHT),
+ key_table_get_key(KEY_TUX_RIGHT_MOVE_LEFT),
+ key_table_get_key(KEY_TUX_RIGHT_MOVE_DOWN),
+ key_table_get_key(KEY_TUX_RIGHT_SWITCH_WEAPON),
+ key_table_get_key(KEY_TUX_RIGHT_SHOOT)
+ );
tux->control = TUX_CONTROL_KEYBOARD_RIGHT;
tuxWithControlRightKeyboard = tux;
@@ -244,36 +250,34 @@ static void netAction(tux_t *tux, int action)
static void control_keyboard(tux_t *tux, control_t *control)
{
- switch (control_get_key_route(control))
- {
+ switch (control_get_key_route(control)) {
case CONTROL_UP:
netAction(tux, TUX_UP);
tux_action(tux, TUX_UP);
- break;
+ break;
case CONTROL_RIGHT:
netAction(tux, TUX_RIGHT);
tux_action(tux, TUX_RIGHT);
- break;
+ break;
case CONTROL_LEFT:
netAction(tux, TUX_LEFT);
tux_action(tux, TUX_LEFT);
- break;
+ break;
case CONTROL_DOWN:
netAction(tux, TUX_DOWN);
tux_action(tux, TUX_DOWN);
- break;
+ break;
}
- switch (control_get_key_action(control))
- {
+ switch (control_get_key_action(control)) {
case CONTROL_SHOT:
netAction(tux, TUX_SHOT);
tux_action(tux, TUX_SHOT);
- break;
+ break;
case CONTROL_SWITCH:
netAction(tux, TUX_SWITCH_GUN);
tux_action(tux, TUX_SWITCH_GUN);
- break;
+ break;
}
}
@@ -465,12 +469,12 @@ void stoptWorld()
#ifndef NO_SOUND
music_stop();
-#endif
+#endif /* NO_SOUND */
image_del_all_image_in_group(IMAGE_GROUP_USER);
#ifndef NO_SOUND
music_del_all_in_group(MUSIC_GROUP_USER);
-#endif
+#endif /* NO_SOUND */
module_quit();
chat_quit();
id_quit_list();
@@ -499,7 +503,7 @@ void world_init()
sound_add("item_gun.ogg", "item_gun", SOUND_GROUP_BASE);
sound_add("switch_gun.ogg", "switch_gun", SOUND_GROUP_BASE);
sound_add("end.ogg", "end", SOUND_GROUP_BASE);
-#endif
+#endif /* NO_SOUND */
isScreenWorldInit = TRUE;
}
diff --git a/src/widget/widget_label.c b/src/widget/widget_label.c
index 3129c07..171d2e0 100644
--- a/src/widget/widget_label.c
+++ b/src/widget/widget_label.c
@@ -39,7 +39,7 @@ void label_draw(widget_t *widget)
font_draw(p->text, widget->x - p->w / 2, widget->y + p->h / 2, COLOR_WHITE);
break;
default:
- assert(!_("[Error] Unknown dimension for label placement."));
+ assert(!_("[Error] Unknown dimension for label placement"));
break;
}
}
generated by cgit v1.2.3 (git 2.46.0) at 2026-09-13 11:17:08 +0000