Cleanup|libdoomsday: DED Flag definition's text member ("Info") removed

This was not being used for anything (any more?).
skyjake · May 6, 2014 · d7ff0e3 · d7ff0e3
1 parent c4fef0b
commit d7ff0e3
Show file tree

Hide file tree

Showing 4 changed files with 3 additions and 23 deletions.
diff --git a/doomsday/client/src/def_main.cpp b/doomsday/client/src/def_main.cpp
@@ -415,11 +415,6 @@ ded_ptcgen_t* Def_GetDamageGenerator(int mobjType)
     return 0;
 }
 
-const char* Def_GetFlagTextByPrefixVal(const char* prefix, int val)
-{
-    return defs.getFlagTextByPrefixVal(prefix, val);
-}
-
 #undef Def_EvalFlags
 int Def_EvalFlags(char *ptr)
 {

diff --git a/doomsday/libdoomsday/include/doomsday/defs/ded.h b/doomsday/libdoomsday/include/doomsday/defs/ded.h
@@ -100,7 +100,6 @@ typedef struct {
 
 typedef struct {
     ded_stringid_t  id;
-    ded_string_t    text;
     int             value;
 } ded_flag_t;
 
@@ -762,8 +761,6 @@ struct LIBDOOMSDAY_PUBLIC ded_s {
 
     ded_flag_t *getFlag(char const *flag) const;
 
-    const char* getFlagTextByPrefixVal(const char* prefix, int val) const;
-
     int evalFlags2(char const *ptr) const;
 
     int getTextNumForName(const char* name) const;
@@ -818,7 +815,7 @@ extern "C" {
 void            DED_Init(ded_t* ded);
 void            DED_Clear(ded_t* ded);
 
-int             DED_AddFlag(ded_t* ded, char const* name, char const* text, int value);
+int             DED_AddFlag(ded_t* ded, char const* name, int value);
 int             DED_AddMobj(ded_t* ded, char const* idStr);
 int             DED_AddState(ded_t* ded, char const* id);
 int             DED_AddSprite(ded_t* ded, char const* name);

diff --git a/doomsday/libdoomsday/src/defs/ded.cpp b/doomsday/libdoomsday/src/defs/ded.cpp
@@ -452,12 +452,11 @@ void DED_RemoveMobj(ded_t* ded, int index)
     DED_DelEntry(index, (void**) &ded->mobjs, &ded->count.mobjs, sizeof(ded_mobj_t));
 }
 
-int DED_AddFlag(ded_t* ded, char const* name, char const* text, int value)
+int DED_AddFlag(ded_t* ded, char const* name, int value)
 {
     ded_flag_t* fl = (ded_flag_t *) DED_NewEntry((void**) &ded->flags, &ded->count.flags, sizeof(ded_flag_t));
 
     strcpy(fl->id, name);
-    strcpy(fl->text, text);
     fl->value = value;
     return fl - ded->flags;
 }
@@ -992,16 +991,6 @@ ded_flag_t *ded_s::getFlag(char const *flag) const
     return 0;
 }
 
-const char* ded_s::getFlagTextByPrefixVal(const char* prefix, int val) const
-{
-    for(int i = count.flags.num - 1; i >= 0; i--)
-    {
-        if(!qstrnicmp(flags[i].id, prefix, strlen(prefix)) && flags[i].value == val)
-            return flags[i].text;
-    }
-    return 0;
-}
-
 int ded_s::evalFlags2(char const *ptr) const
 {
     LOG_AS("Def_EvalFlags");

diff --git a/doomsday/libdoomsday/src/defs/dedparser.cpp b/doomsday/libdoomsday/src/defs/dedparser.cpp
@@ -824,14 +824,13 @@ DENG2_PIMPL(DEDParser)
             if(ISTOKEN("Flag"))
             {
                 // A new flag.
-                idx = DED_AddFlag(ded, "", "", 0);
+                idx = DED_AddFlag(ded, "", 0);
                 FINDBEGIN;
                 for(;;)
                 {
                     READLABEL;
                     RV_STR("ID", ded->flags[idx].id)
                     RV_UINT("Value", ded->flags[idx].value)
-                    RV_STR("Info", ded->flags[idx].text)
                     RV_END
                     CHECKSC;
                 }