summaryrefslogtreecommitdiff
path: root/src/base
diff options
context:
space:
mode:
authorDusan Durech <dusan.d@Centrum.sk>2009-06-15 14:49:04 +0200
committerDusan Durech <dusan.d@Centrum.sk>2009-06-15 14:49:04 +0200
commit9b7a6f66182020913cd9b5b1205634dabbcf081e (patch)
tree1d21745d28f559a1c1f13be4bdaaf8ef0cc7ba56 /src/base
parent20def950be569ed6c6e9887f80dc3beca27765d8 (diff)
add widget container, hi is use in mainMenu and small diff
Diffstat (limited to 'src/base')
-rw-r--r--src/base/item.c1
-rw-r--r--src/base/main.h5
-rw-r--r--src/base/tux.c3
3 files changed, 7 insertions, 2 deletions
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);
}