From 9b7a6f66182020913cd9b5b1205634dabbcf081e Mon Sep 17 00:00:00 2001 From: Dusan Durech Date: Mon, 15 Jun 2009 14:49:04 +0200 Subject: add widget container, hi is use in mainMenu and small diff --- src/base/item.c | 1 - src/base/main.h | 5 +++++ src/base/tux.c | 3 ++- 3 files changed, 7 insertions(+), 2 deletions(-) (limited to 'src/base') diff --git a/src/base/item.c b/src/base/item.c index 6bf1a67..0a3a58f 100644 --- a/src/base/item.c +++ b/src/base/item.c @@ -427,7 +427,6 @@ static void tux_event_tux_is_deadWithItem(tux_t *tux, item_t *item) } } - world_inc_round(); tux_event_tux_is_dead(tux); } diff --git a/src/base/main.h b/src/base/main.h index fb23218..12efa80 100644 --- a/src/base/main.h +++ b/src/base/main.h @@ -27,6 +27,11 @@ #define UNUSED(var) if (0 && var) {} +#define FATAL(msg,arg...) \ + do{ \ + fprintf(stderr, msg, ##arg); \ + abort(0); \ + }while(0) extern char *getParam(char *s); extern char *getParamElse(char *s1, char *s2); diff --git a/src/base/tux.c b/src/base/tux.c index b41d63e..bed47fc 100644 --- a/src/base/tux.c +++ b/src/base/tux.c @@ -308,6 +308,8 @@ void tux_event_tux_is_dead(tux_t *tux) return; } + world_inc_round(); + #ifndef NO_SOUND sound_play("dead", SOUND_GROUP_BASE); #endif /* NO_SOUND */ @@ -359,7 +361,6 @@ static void tux_event_tux_is_deadWIthShot(tux_t *tux, shot_t *shot) } - world_inc_round(); tux_event_tux_is_dead(tux); } -- cgit v1.2.3