change framegroups parsing so the final EOL is optional

[xonotic/darkplaces.git] / model_shared.c

diff --git a/model_shared.c b/model_shared.c
index 296d799ed6508bd382eb239fd1eb79f51533f32c..1ebd90cd7308093cdca2a3f9db0521aa9761cd02 100644 (file)
--- a/model_shared.c
+++ b/model_shared.c
@@ -239,80 +239,70 @@ typedef void (*mod_framegroupify_parsegroups_t) (unsigned int i, int start, int
 static int Mod_FrameGroupify_ParseGroups(const char *buf, mod_framegroupify_parsegroups_t cb, void *pass)
 {
        const char *bufptr;
-       const char *name;
        int start, len;
        float fps;
        unsigned int i;
        qboolean loop;
+       char name[64];
 
        bufptr = buf;
        i = 0;
-       for(;;)
+       while(bufptr)
        {
                // an anim scene!
-               if (!COM_ParseToken_Simple(&bufptr, true, false, false))
-                       break;
+
+               // REQUIRED: fetch start
+               COM_ParseToken_Simple(&bufptr, true, false, true);
+               if (!bufptr)
+                       break; // end of file
                if (!strcmp(com_token, "\n"))
                        continue; // empty line
                start = atoi(com_token);
-               if (!COM_ParseToken_Simple(&bufptr, true, false, false))
-                       break;
-               if (!strcmp(com_token, "\n"))
+
+               // REQUIRED: fetch length
+               COM_ParseToken_Simple(&bufptr, true, false, true);
+               if (!bufptr || !strcmp(com_token, "\n"))
                {
                        Con_Printf("framegroups file: missing number of frames\n");
                        continue;
                }
                len = atoi(com_token);
-               if (!COM_ParseToken_Simple(&bufptr, true, false, false))
-                       break;
-               // we default to looping as it's usually wanted, so to NOT loop you append a 0
-               if (strcmp(com_token, "\n") && strcmp(com_token, "//"))
+
+               // OPTIONAL args start
+               COM_ParseToken_Simple(&bufptr, true, false, true);
+
+               // OPTIONAL: fetch fps
+               fps = 20;
+               if (bufptr && strcmp(com_token, "\n"))
                {
                        fps = atof(com_token);
-                       if (!COM_ParseToken_Simple(&bufptr, true, false, false))
-                               break;
-                       if (strcmp(com_token, "\n") && strcmp(com_token, "//"))
-                               loop = atoi(com_token) != 0;
-                       else
-                               loop = true;
-               }
-               else
-               {
-                       fps = 20;
-                       loop = true;
+                       COM_ParseToken_Simple(&bufptr, true, false, true);
                }
 
-               if (strcmp(com_token, "\n") && strcmp(com_token, "//"))
+               // OPTIONAL: fetch loopflag
+               loop = true;
+               if (bufptr && strcmp(com_token, "\n"))
                {
-                       while (COM_ParseToken_Simple(&bufptr, true, false, false)) // fetch newline
-                       {
-                               if (strcmp(com_token, "\n") && strcmp(com_token, "//"))
-                                       Con_Printf("framegroups file: extra data (%s) found, skipped\n", com_token);
-                               else
-                                       break;
-                       }
+                       loop = (atoi(com_token) != 0);
+                       COM_ParseToken_Simple(&bufptr, true, false, true);
                }
 
-               name = NULL;
-               if(!strcmp(com_token, "//"))
+               // OPTIONAL: fetch name
+               name[0] = 0;
+               if (bufptr && strcmp(com_token, "\n"))
                {
-                       if (COM_ParseToken_Simple(&bufptr, true, false, false))
-                       {
-                               if(strcmp(com_token, "\n"))
-                               {
-                                       name = com_token;
-                                       // skip to EOL
-                                       while (*bufptr && !(*bufptr == '\n' || *bufptr == '\r'))
-                                               bufptr++;
-                                       while (*bufptr && (*bufptr == '\n' || *bufptr == '\r'))
-                                               bufptr++;
-                               }
-                       }
+                       strlcpy(name, com_token, sizeof(name));
+                       COM_ParseToken_Simple(&bufptr, true, false, true);
                }
+
+               // OPTIONAL: remaining unsupported tokens (eat them)
+               while (bufptr && strcmp(com_token, "\n"))
+                       COM_ParseToken_Simple(&bufptr, true, false, true);
+
                //Con_Printf("data: %d %d %d %f %d (%s)\n", i, start, len, fps, loop, name);
 
                if(cb)
-                       cb(i, start, len, fps, loop, name, pass);
+                       cb(i, start, len, fps, loop, (name[0] ? name : NULL), pass);
                ++i;
        }