libcommon|HexLex: HexLex no longer accesses the DED definition database

If DED definition lookup is necessary for translating a parsed value then this should be implemented in the parser instead.
skyjake · Jan 25, 2014 · 2c8a931 · 2c8a931
1 parent 933c905
commit 2c8a931
Show file tree

Hide file tree

Showing 5 changed files with 27 additions and 33 deletions.
diff --git a/doomsday/plugins/common/include/hexlex.h b/doomsday/plugins/common/include/hexlex.h
@@ -74,10 +74,8 @@ class HexLex
      */
     Str const *token();
 
-    Str const *readString();
     int readNumber();
-
-    int readSoundIndex();
+    Str const *readString();
     Uri *readUri(char const *defaultScheme = "");
 
     /**

diff --git a/doomsday/plugins/common/src/hexlex.cpp b/doomsday/plugins/common/src/hexlex.cpp
@@ -222,11 +222,6 @@ Uri *HexLex::readUri(char const *defaultScheme)
     return uri;
 }
 
-int HexLex::readSoundIndex()
-{
-    return Def_Get(DD_DEF_SOUND_BY_NAME, Str_Text(readString()), 0);
-}
-
 void HexLex::unreadToken()
 {
     if(_readPos == 0)

diff --git a/doomsday/plugins/common/src/p_sound.cpp b/doomsday/plugins/common/src/p_sound.cpp
@@ -151,7 +151,7 @@ void SndInfoParser(Str const *path)
 
             // string(sound-id) string(lump-name | '?')
             // A sound definition.
-            int const soundIndex = lexer.readSoundIndex();
+            int const soundIndex = Def_Get(DD_DEF_SOUND_BY_NAME, Str_Text(lexer.readString()), 0);
             Str const *lumpName  = lexer.readString();
 
             if(soundIndex)

diff --git a/doomsday/plugins/hexen/src/p_mapinfo.cpp b/doomsday/plugins/hexen/src/p_mapinfo.cpp
@@ -52,32 +52,32 @@ static void setMusicCDTrack(char const *musicId, int track)
 void MapInfoParser(Str const *path)
 {
     mapInfos.clear();
-    uint logicalMapIndex = 0;
-
-    // Prepare a default-configured definition, for one-shot initialization.
-    mapinfo_t defMapInfo;
-
-    defMapInfo.map             = -1; // Unknown.
-    defMapInfo.cluster         = 0;
-    defMapInfo.warpTrans       = 0;
-    defMapInfo.nextMap         = 0; // Always go to map 0 if not specified.
-    defMapInfo.cdTrack         = 1;
-    defMapInfo.sky1Material    = Materials_ResolveUriCString(gameMode == hexen_demo || gameMode == hexen_betademo? "Textures:SKY2" : "Textures:SKY1");
-    defMapInfo.sky2Material    = defMapInfo.sky1Material;
-    defMapInfo.sky1ScrollDelta = 0;
-    defMapInfo.sky2ScrollDelta = 0;
-    defMapInfo.doubleSky       = false;
-    defMapInfo.lightning       = false;
-    defMapInfo.fadeTable       = W_GetLumpNumForName("COLORMAP");
-    strcpy(defMapInfo.title, "DEVELOPMENT MAP"); // Unknown.
-    strcpy(defMapInfo.songLump, "DEFSONG"); // Unknown.
 
     AutoStr *script = M_ReadFileIntoString(path, 0);
 
     if(script && !Str_IsEmpty(script))
     {
         App_Log(DE2_RES_VERBOSE, "Parsing \"%s\"...", F_PrettyPath(Str_Text(path)));
 
+        // Prepare a default-configured definition, for one-shot initialization.
+        mapinfo_t defMapInfo;
+        defMapInfo.map             = -1; // Unknown.
+        defMapInfo.cluster         = 0;
+        defMapInfo.warpTrans       = 0;
+        defMapInfo.nextMap         = 0; // Always go to map 0 if not specified.
+        defMapInfo.cdTrack         = 1;
+        defMapInfo.sky1Material    = Materials_ResolveUriCString(gameMode == hexen_demo || gameMode == hexen_betademo? "Textures:SKY2" : "Textures:SKY1");
+        defMapInfo.sky2Material    = defMapInfo.sky1Material;
+        defMapInfo.sky1ScrollDelta = 0;
+        defMapInfo.sky2ScrollDelta = 0;
+        defMapInfo.doubleSky       = false;
+        defMapInfo.lightning       = false;
+        defMapInfo.fadeTable       = W_GetLumpNumForName("COLORMAP");
+        strcpy(defMapInfo.title, "DEVELOPMENT MAP"); // Unknown.
+        strcpy(defMapInfo.songLump, "DEFSONG"); // Unknown.
+
+        uint logicalMapIndex = 0;
+
         HexLex lexer(script, path);
 
         while(lexer.readToken())

diff --git a/doomsday/plugins/hexen/src/sn_sonix.cpp b/doomsday/plugins/hexen/src/sn_sonix.cpp
@@ -192,15 +192,15 @@ void SndSeqParser(Str const *path)
             verifySequencePtr(tempDataStart, tempDataPtr);
 
             *tempDataPtr++ = SS_CMD_PLAYREPEAT;
-            *tempDataPtr++ = lexer.readSoundIndex();
+            *tempDataPtr++ = Def_Get(DD_DEF_SOUND_BY_NAME, Str_Text(lexer.readString()), 0);
             continue;
         }
         if(!Str_CompareIgnoreCase(lexer.token(), "playtime"))
         {
             verifySequencePtr(tempDataStart, tempDataPtr);
 
             *tempDataPtr++ = SS_CMD_PLAY;
-            *tempDataPtr++ = lexer.readSoundIndex();
+            *tempDataPtr++ = Def_Get(DD_DEF_SOUND_BY_NAME, Str_Text(lexer.readString()), 0);
             *tempDataPtr++ = SS_CMD_DELAY;
             *tempDataPtr++ = lexer.readNumber();
             continue;
@@ -210,7 +210,7 @@ void SndSeqParser(Str const *path)
             verifySequencePtr(tempDataStart, tempDataPtr);
 
             *tempDataPtr++ = SS_CMD_PLAY;
-            *tempDataPtr++ = lexer.readSoundIndex();
+            *tempDataPtr++ = Def_Get(DD_DEF_SOUND_BY_NAME, Str_Text(lexer.readString()), 0);
             *tempDataPtr++ = SS_CMD_WAITUNTILDONE;
             continue;
         }
@@ -219,7 +219,7 @@ void SndSeqParser(Str const *path)
             verifySequencePtr(tempDataStart, tempDataPtr);
 
             *tempDataPtr++ = SS_CMD_PLAY;
-            *tempDataPtr++ = lexer.readSoundIndex();
+            *tempDataPtr++ = Def_Get(DD_DEF_SOUND_BY_NAME, Str_Text(lexer.readString()), 0);
             continue;
         }
         if(!Str_CompareIgnoreCase(lexer.token(), "delayrand"))
@@ -249,7 +249,8 @@ void SndSeqParser(Str const *path)
         }
         if(!Str_CompareIgnoreCase(lexer.token(), "stopsound"))
         {
-            SequenceTranslate[seqCommmandIndex].stopSound = lexer.readSoundIndex();
+            SequenceTranslate[seqCommmandIndex].stopSound =
+                    Def_Get(DD_DEF_SOUND_BY_NAME, Str_Text(lexer.readString()), 0);
             *tempDataPtr++ = SS_CMD_STOPSOUND;
             continue;
         }