From ae2d94309afed63fa4c8632acffe8bd8202f1577 Mon Sep 17 00:00:00 2001 From: Kp Date: Sun, 1 Jul 2012 04:39:04 +0000 Subject: [PATCH] Mark powerup_basic as printf-like --- main/gauges.c | 2 +- main/powerup.c | 4 ++-- main/powerup.h | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/main/gauges.c b/main/gauges.c index 8fe9effe0..d931d7713 100644 --- a/main/gauges.c +++ b/main/gauges.c @@ -1527,7 +1527,7 @@ void add_points_to_score(int points) if (Players[Player_num].score/EXTRA_SHIP_SCORE != prev_score/EXTRA_SHIP_SCORE) { int snd; Players[Player_num].lives += Players[Player_num].score/EXTRA_SHIP_SCORE - prev_score/EXTRA_SHIP_SCORE; - powerup_basic(20, 20, 20, 0, TXT_EXTRA_LIFE); + powerup_basic(20, 20, 20, 0, "%s", TXT_EXTRA_LIFE); if ((snd=Powerup_info[POW_EXTRA_LIFE].hit_sound) > -1 ) digi_play_sample( snd, F1_0 ); } diff --git a/main/powerup.c b/main/powerup.c index d004d539c..5d487f0ca 100644 --- a/main/powerup.c +++ b/main/powerup.c @@ -128,7 +128,7 @@ void draw_powerup(object *obj) } -void powerup_basic(int redadd, int greenadd, int blueadd, int score, char *format, ...) +void powerup_basic(int redadd, int greenadd, int blueadd, int score, const char *format, ...) { char text[120]; va_list args; @@ -264,7 +264,7 @@ int do_powerup(object *obj) switch (obj->id) { case POW_EXTRA_LIFE: Players[Player_num].lives++; - powerup_basic(15, 15, 15, 0, TXT_EXTRA_LIFE); + powerup_basic(15, 15, 15, 0, "%s", TXT_EXTRA_LIFE); used=1; break; case POW_ENERGY: diff --git a/main/powerup.h b/main/powerup.h index 26f6010f3..c7dd69af1 100644 --- a/main/powerup.h +++ b/main/powerup.h @@ -118,7 +118,7 @@ extern void diminish_towards_max(void); extern void do_megawow_powerup(int quantity); -extern void powerup_basic(int redadd, int greenadd, int blueadd, int score, char *format, ...); +extern void powerup_basic(int redadd, int greenadd, int blueadd, int score, const char *format, ...) __attribute_gcc_format((printf, 5, 6)); /* * reads n powerup_type_info structs from a PHYSFS_file