diff options
Diffstat (limited to 'src/doom/am_map.c')
-rw-r--r-- | src/doom/am_map.c | 20 |
1 files changed, 4 insertions, 16 deletions
diff --git a/src/doom/am_map.c b/src/doom/am_map.c index ee1df195..d3d504e3 100644 --- a/src/doom/am_map.c +++ b/src/doom/am_map.c @@ -344,8 +344,7 @@ void AM_addMark(void) { markpoints[markpointnum].x = m_x + m_w/2; markpoints[markpointnum].y = m_y + m_h/2; - //markpointnum = (markpointnum + 1) % AM_NUMMARKPOINTS; - ++markpointnum; // haleyjd 20141101 [STRIFE]: does not wrap around + markpointnum = (markpointnum + 1) % AM_NUMMARKPOINTS; } @@ -673,8 +672,6 @@ AM_Responder else plr->message = DEH_String(AMSTR_FOLLOWOFF); } - // haleyjd 20141101 [STRIFE]: grid is not supported - /* else if (key == key_map_grid) { grid = !grid; @@ -683,26 +680,17 @@ AM_Responder else plr->message = DEH_String(AMSTR_GRIDOFF); } - */ else if (key == key_map_mark) { - // haleyjd 20141101 [STRIFE]: if full, mark 10 is replaced - if(markpointnum == AM_NUMMARKPOINTS) - --markpointnum; M_snprintf(buffer, sizeof(buffer), "%s %d", - DEH_String(AMSTR_MARKEDSPOT), markpointnum + 1); // [STRIFE]: +1 + DEH_String(AMSTR_MARKEDSPOT), markpointnum); plr->message = buffer; AM_addMark(); } else if (key == key_map_clearmark) { - // haleyjd 20141101 [STRIFE]: modified to only clear last mark - if(markpointnum > 0) - { - markpoints[markpointnum - 1].x = -1; - --markpointnum; - plr->message = DEH_String(AMSTR_MARKSCLEARED); - } + AM_clearMarks(); + plr->message = DEH_String(AMSTR_MARKSCLEARED); } else { |