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

Avoid -Wformat-nonliteral for trigger message; Reflect plurality in light trigger messages - patches by Kp

Browse source
This commit is contained in:
zicodxx 2013-01-03 17:00:40 +01:00
parent c9bb823af6
commit a6dead2a51
2 changed files with 11 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
CHANGELOG.txt
View file

@ -12,6 +12,7 @@ arch/include/joy.h, arch/sdl/event.c, arch/sdl/joy.c: Moved joy_*_handler declar
editor/group.c, editor/medwall.c, editor/segment.c, main/gameseg.h, main/wall.h: Declared wall_close_door_num in wall.h; Declared validate_segment_side in gameseg.h - patches by Kp
include/3d.h, main/gameseq.h, main/weapon.h: Removed redundant/obsolete declarations - patch by Kp
main/kconfig.h: Moved large control_info arrays to end - patch by Kp
main/switch.c: Avoid -Wformat-nonliteral for trigger message; Reflect plurality in light trigger messages - patches by Kp
20121102
--------

20
main/switch.c
View file

@ -301,17 +301,17 @@ int do_change_walls(sbyte trigger_num)
return ret;
}
void print_trigger_message (int pnum,int trig,int shot,char *message)
#define print_trigger_message(pnum,trig,shot,message) \
((void)((__print_trigger_message(pnum,trig,shot)) && \
(HUD_init_message(HM_DEFAULT, message, "s" + ((Triggers[trig].num_links>1)?0:1)))))
static int __print_trigger_message(int pnum,int trig,int shot)
{
char *pl; //points to 's' or nothing for plural word
if (pnum!=Player_num)
return;
pl = (Triggers[trig].num_links>1)?"s":"";
return 0;
if (!(Triggers[trig].flags & TF_NO_MESSAGE) && shot)
HUD_init_message(HM_DEFAULT, message,pl);
return 1;
return 0;
}
@ -530,12 +530,12 @@ int check_trigger_sub(int trigger_num, int pnum,int shot)
case TT_LIGHT_OFF:
if (do_light_off(trigger_num))
print_trigger_message (pnum,trigger_num,shot,"Lights off!");
print_trigger_message (pnum,trigger_num,shot,"Light%s off!");
break;
case TT_LIGHT_ON:
if (do_light_on(trigger_num))
print_trigger_message (pnum,trigger_num,shot,"Lights on!");
print_trigger_message (pnum,trigger_num,shot,"Light%s on!");
break;