diff options
| author | James Haley | 2014-11-01 19:09:20 -0500 |
|---|---|---|
| committer | James Haley | 2014-11-01 19:09:20 -0500 |
| commit | 6f1356bbbff01e2055815ed527f9e9af84029674 (patch) | |
| tree | 8ecfa122d323de2af2162e47086e4ab8c0953571 /src | |
| parent | 12ecb4550e46ffdc28248be185738a88be033afd (diff) | |
| download | chocolate-doom-6f1356bbbff01e2055815ed527f9e9af84029674.tar.gz chocolate-doom-6f1356bbbff01e2055815ed527f9e9af84029674.tar.bz2 chocolate-doom-6f1356bbbff01e2055815ed527f9e9af84029674.zip | |
Revert "Automap accuracy fixes"
This reverts commit 12ecb4550e46ffdc28248be185738a88be033afd.
Diffstat (limited to 'src')
| -rw-r--r-- | src/doom/am_map.c | 20 | ||||
| -rw-r--r-- | src/strife/d_englsh.h | 2 |
2 files changed, 5 insertions, 17 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 { diff --git a/src/strife/d_englsh.h b/src/strife/d_englsh.h index 0f78f21a..9d58e7d9 100644 --- a/src/strife/d_englsh.h +++ b/src/strife/d_englsh.h @@ -227,7 +227,7 @@ #define AMSTR_GRIDOFF "Grid OFF" #define AMSTR_MARKEDSPOT "Marked Spot" -#define AMSTR_MARKSCLEARED "Last Mark Cleared" // [STRIFE] +#define AMSTR_MARKSCLEARED "All Marks Cleared" // // ST_stuff.C |