API: Enhanced Def_Get() - 'out' argument now optional for Finale defs

skyjake · Jul 12, 2012 · 135b396 · 135b396
1 parent dc018d8
commit 135b396
Showing 1 changed file with 24 additions and 15 deletions.
diff --git a/doomsday/engine/portable/src/def_main.c b/doomsday/engine/portable/src/def_main.c
@@ -1790,45 +1790,54 @@ int Def_Get(int type, const char* id, void* out)
         {
             if(stricmp(defs.finales[i].id, id)) continue;
 
-            fin->before = defs.finales[i].before;
-            fin->after  = defs.finales[i].after;
-            fin->script = defs.finales[i].script;
+            if(fin)
+            {
+                fin->before = defs.finales[i].before;
+                fin->after  = defs.finales[i].after;
+                fin->script = defs.finales[i].script;
+            }
             return true;
         }
-        return false;
-      }
+        return false; }
+
     case DD_DEF_FINALE_BEFORE: {
         finalescript_t* fin = (finalescript_t*) out;
         Uri* uri = Uri_NewWithPath2(id, RC_NULL);
         for(i = defs.count.finales.num - 1; i >= 0; i--)
         {
             if(!defs.finales[i].before || !Uri_Equality(defs.finales[i].before, uri)) continue;
 
-            fin->before = defs.finales[i].before;
-            fin->after  = defs.finales[i].after;
-            fin->script = defs.finales[i].script;
+            if(fin)
+            {
+                fin->before = defs.finales[i].before;
+                fin->after  = defs.finales[i].after;
+                fin->script = defs.finales[i].script;
+            }
             Uri_Delete(uri);
             return true;
         }
         Uri_Delete(uri);
-        return false;
-      }
+        return false; }
+
     case DD_DEF_FINALE_AFTER: {
         finalescript_t* fin = (finalescript_t*) out;
         Uri* uri = Uri_NewWithPath2(id, RC_NULL);
         for(i = defs.count.finales.num - 1; i >= 0; i--)
         {
             if(!defs.finales[i].after || !Uri_Equality(defs.finales[i].after, uri)) continue;
 
-            fin->before = defs.finales[i].before;
-            fin->after  = defs.finales[i].after;
-            fin->script = defs.finales[i].script;
+            if(fin)
+            {
+                fin->before = defs.finales[i].before;
+                fin->after  = defs.finales[i].after;
+                fin->script = defs.finales[i].script;
+            }
             Uri_Delete(uri);
             return true;
         }
         Uri_Delete(uri);
-        return false;
-      }
+        return false; }
+
     case DD_DEF_LINE_TYPE: {
         int typeId = strtol(id, (char **)NULL, 10);
         for(i = defs.count.lineTypes.num - 1; i >= 0; i--)