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

Don't call automap_process_input() if autmap_key_command() returns 1 preventing input mess; Fixed two compiler warnings regarding set but unused variables

Browse source
This commit is contained in:
zicodxx 2011-05-07 13:29:21 +02:00
parent 836cae5456
commit 456bf90d81
2 changed files with 7 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
CHANGELOG.txt
View file

@ -5,6 +5,7 @@ D1X-Rebirth Changelog
arch/carbon/conf.h: Enabled Tracker support for Mac OS
RELEASE-NOTES.txt, README.txt, SConstruct, arch/carbon/conf.h: Changed version from 0.56 to 0.57; Added first draft for RELEASE-NOTES.txt; updated docs
main/endlevel.c: Taken out Render_depth reduction of Endlevel sequence in Software rendering build; Fixed two compiler warnings regarding set but unused variables
main/automap.c: Don't call automap_process_input() if autmap_key_command() returns 1 preventing input mess; Fixed two compiler warnings regarding set but unused variables
20110505
--------

12
main/automap.c
View file

@ -519,8 +519,12 @@ int automap_handler(window *wind, d_event *event, automap *am)
break;
case EVENT_KEY_COMMAND:
case EVENT_KEY_RELEASE:
automap_process_input(wind, event, am);
return automap_key_command(wind, event, am);
{
int kret = automap_key_command(wind, event, am);
if (!kret)
automap_process_input(wind, event, am);
return kret;
}
case EVENT_WINDOW_DRAW:
draw_automap(am);
@ -908,7 +912,6 @@ void add_segment_edges(automap *am, segment *seg)
int sn;
int segnum = seg-Segments;
int hidden_flag;
int ttype,trigger_num;
for (sn=0;sn<MAX_SIDES_PER_SEGMENT;sn++) {
short vertex_list[4];
@ -938,9 +941,6 @@ void add_segment_edges(automap *am, segment *seg)
if (seg->sides[sn].wall_num > -1) {
trigger_num = Walls[seg->sides[sn].wall_num].trigger;
ttype = Triggers[trigger_num].type;
switch( Walls[seg->sides[sn].wall_num].type ) {
case WALL_DOOR:
if (Walls[seg->sides[sn].wall_num].keys == KEY_BLUE) {