shithub: choc

Info  •  Files  •  Log  •  Branches

Merge pull request #1162 from jmtd/count-scrollers

Report number of scrollers when there are too many

--- a/src/doom/p_spec.c

+++ b/src/doom/p_spec.c

@@ -1369,7 +1369,20 @@

 short		numlinespecials;

 line_t*		linespeciallist[MAXLINEANIMS];

+static unsigned int NumScrollers()

+{

+    unsigned int i, scrollers = 0;

+    for (i = 0; i < numlines; i++)

+    {

+        if (48 == lines[i].special)

+        {

+            scrollers++;

+        }

+    }

+    return scrollers;

+}

+

 // Parses command line parameters.

 void P_SpawnSpecials (void)

 {

@@ -1463,8 +1476,8 @@

 	  case 48:

             if (numlinespecials >= MAXLINEANIMS)

             {

-                I_Error("Too many scrolling wall linedefs! "

-                        "(Vanilla limit is 64)");

+                I_Error("Too many scrolling wall linedefs (%d)! "

+                        "(Vanilla limit is 64)", NumScrollers());

             }

 	    // EFFECT FIRSTCOL SCROLL+

 	    linespeciallist[numlinespecials] = &lines[i];