Provide default values for the %s and %l replacements in replay names

git-svn-id: https://s.snth.net/svn/neverball/trunk@3384 78b8d119-cf0a-0410-b17c-f493084dd1d7

diff --git a/ball/demo.c b/ball/demo.c
index 77b0c05..f3092a5 100644 (file)
--- a/ball/demo.c
+++ b/ball/demo.c
@@ -194,6 +194,12 @@ const char *demo_format_name(const char *fmt,
     if (!fmt)
         return NULL;
 
+    if (!set)
+        set = "none";
+
+    if (!level)
+        level = "00";
+
     memset(name, 0, sizeof (name));
     space_left = MAXSTRLEN(name);
 
@@ -208,19 +214,13 @@ const char *demo_format_name(const char *fmt,
             switch (*fmt)
             {
             case 's':
-                if (set)
-                {
-                    strncat(name, set, space_left);
-                    space_left -= strlen(set);
-                }
+                strncat(name, set, space_left);
+                space_left -= strlen(set);
                 break;
 
             case 'l':
-                if (level)
-                {
-                    strncat(name, level, space_left);
-                    space_left -= strlen(level);
-                }
+                strncat(name, level, space_left);
+                space_left -= strlen(level);
                 break;
 
             case '%':