Changed: Do not warn about missing sound lumps whilst parsing DEDs, i…

…nstead, warn at sample cache time.
skyjake · May 12, 2011 · 24ffab4 · 24ffab4
1 parent 5ecce18
commit 24ffab4
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 8 deletions.
diff --git a/doomsday/engine/portable/src/def_main.c b/doomsday/engine/portable/src/def_main.c
@@ -1108,7 +1108,7 @@ void Def_Read(void)
 
         strcpy(si->id, snd->id);
         strcpy(si->lumpName, snd->lumpName);
-        si->lumpNum = (strlen(snd->lumpName) > 0? W_CheckLumpNumForName(snd->lumpName) : -1);
+        si->lumpNum = (strlen(snd->lumpName) > 0? W_CheckLumpNumForName2(snd->lumpName, true) : -1);
         strcpy(si->name, snd->name);
         k = Def_GetSoundNum(snd->link);
         si->link = (k >= 0 ? sounds + k : 0);

diff --git a/doomsday/engine/portable/src/s_cache.c b/doomsday/engine/portable/src/s_cache.c
@@ -596,12 +596,8 @@ static sfxsample_t* cacheSample(int id, const sfxinfo_t* info)
         // Try loading from the lump.
         if(info->lumpNum < 0)
         {
-            if(verbose)
-            {
-                Con_Message("Sfx_Cache: Sound '%s' has a missing lump \"%s\".\n", info->id, info->lumpName);
-                Con_Message("  Verifying... The lump number is %i.\n", W_CheckLumpNumForName(info->lumpName));
-            }
-
+            Con_Message("Warning:Sfx_Cache: Failed to locate lump resource '%s' for sound '%s'.\n",
+                info->lumpName, info->id);
             return NULL;
         }
 
@@ -623,7 +619,7 @@ static sfxsample_t* cacheSample(int id, const sfxinfo_t* info)
             if(NULL == data)
             {
                 // Abort...
-                Con_Message("Sfx_Cache: WAV data in lump \"%s\" is bad.\n", info->lumpName);
+                Con_Message("Warning:Sfx_Cache: Unknown WAV format in lump '%s', aborting.\n", info->lumpName);
                 return NULL;
             }