shithub: choc

Download patch

ref: 6f1356bbbff01e2055815ed527f9e9af84029674
parent: 12ecb4550e46ffdc28248be185738a88be033afd
author: James Haley <[email protected]>
date: Sat Nov 1 15:09:20 EDT 2014 

Revert "Automap accuracy fixes"

This reverts commit 12ecb4550e46ffdc28248be185738a88be033afd.


--- a/src/doom/am_map.c
+++ b/src/doom/am_map.c
@@ -344,8 +344,7 @@
 {
     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 @@
             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 @@
             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
         {
--- 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