Further cleanup

skyjake · Oct 30, 2011 · 78256b0 · 78256b0
1 parent 1725e6e
commit 78256b0
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 13 deletions.
diff --git a/doomsday/engine/portable/include/p_materialmanager.h b/doomsday/engine/portable/include/p_materialmanager.h
@@ -218,6 +218,9 @@ const ded_decor_t*  Materials_DecorationDef(material_t* material);
 /// @return  (Particle) Generator definition associated with @a material else @c NULL.
 const ded_ptcgen_t* Materials_PtcGenDef(material_t* material);
 
+/// @return  @c true iff @a material is linked to the identified @a animGroupNum.
+boolean Materials_IsMaterialInAnimGroup(material_t* material, int animGroupNum);
+
 /**
  * Create a new animation group.
  * @return  Logical (unique) identifier reference associated with the new group.
@@ -234,12 +237,6 @@ int Materials_CreateAnimGroup(int flags);
  */
 void Materials_AddAnimGroupFrame(int animGroupNum, material_t* material, int tics, int randomTics);
 
-/// @return  @c true iff @a material is linked to the identified @a animGroupNum.
-boolean Materials_MaterialLinkedToAnimGroup(int animGroupNum, material_t* material);
-
-/// Clear all group-animation translations for @a material.
-void Materials_ClearTranslation(material_t* material);
-
 /// \todo Refactor; does not fit the current design.
 boolean Materials_IsPrecacheAnimGroup(int animGroupNum);
 

diff --git a/doomsday/engine/portable/src/def_main.c b/doomsday/engine/portable/src/def_main.c
@@ -566,8 +566,8 @@ ded_ptcgen_t* Def_GetGenerator(materialnum_t matNum, boolean hasExternal, boolea
                         if(Materials_IsPrecacheAnimGroup(g))
                             continue; // Precache groups don't apply.
 
-                        if(Materials_MaterialLinkedToAnimGroup(g, defMat) &&
-                           Materials_MaterialLinkedToAnimGroup(g, mat))
+                        if(Materials_IsMaterialInAnimGroup(defMat, g) &&
+                           Materials_IsMaterialInAnimGroup(mat, g))
                         {
                             // Both are in this group! This def will do.
                             return def;

diff --git a/doomsday/engine/portable/src/p_materialmanager.c b/doomsday/engine/portable/src/p_materialmanager.c
@@ -1756,7 +1756,7 @@ static void printMaterials(materialnamespaceid_t namespaceId, const char* like)
     Con_Printf("Found %lu %s.\n", (unsigned long) printTotal, printTotal == 1? "Material" : "Materials");
 }
 
-boolean Materials_MaterialLinkedToAnimGroup(int groupNum, material_t* mat)
+boolean Materials_IsMaterialInAnimGroup(material_t* mat, int groupNum)
 {
     animgroup_t* group = getAnimGroup(groupNum);
     if(NULL != group)
@@ -1848,9 +1848,9 @@ static int clearVariantTranslationWorker(materialvariant_t* variant, void* param
     return 0; // Continue iteration.
 }
 
-void Materials_ClearTranslation(material_t* mat)
+static void Materials_ClearTranslation(material_t* mat)
 {
-    errorIfNotInited("Materials::ClearTranslation");
+    assert(initedOk);
     Material_IterateVariants(mat, clearVariantTranslationWorker, NULL);
 }
 

diff --git a/doomsday/engine/portable/src/p_particle.c b/doomsday/engine/portable/src/p_particle.c
@@ -1645,8 +1645,8 @@ void P_UpdateParticleGens(void)
                             if(Materials_IsPrecacheAnimGroup(g))
                                 continue; // Precache groups don't apply.
 
-                            if(Materials_MaterialLinkedToAnimGroup(g, defMat) &&
-                               Materials_MaterialLinkedToAnimGroup(g, mat))
+                            if(Materials_IsMaterialInAnimGroup(defMat, g) &&
+                               Materials_IsMaterialInAnimGroup(mat, g))
                             {
                                 // Both are in this group! This def will do.
                                 found = true;