TakeV/dxx-rebirth
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Mark powerup_basic as printf-like

Browse source
This commit is contained in:
Kp 2012-07-01 04:39:04 +00:00
parent 4f63b346e6
commit ae2d94309a
3 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
main/gauges.c
View file

@ -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 );
}

4
main/powerup.c
View file

@ -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:

2
main/powerup.h
View file

@ -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