Load music for GCW0 and skip txt files (#292)

cxong · Sep 2, 2014 · d1959a9 · d1959a9 · carstene1ns · Sep 2, 2014
1 parent 4506ca8
commit d1959a9
Showing 1 changed file with 6 additions and 2 deletions.
diff --git a/src/cdogs/gamedata.c b/src/cdogs/gamedata.c
@@ -292,12 +292,10 @@ void FreeSongs(struct SongDef **songList)
 
 void LoadSongs(void)
 {
-#ifndef __GCWZERO__
 	debug(D_NORMAL, "loading game music %s\n", CDOGS_GAME_MUSIC_DIR);
 	LoadSongList(&gGameSongs, CDOGS_GAME_MUSIC_DIR);
 	debug(D_NORMAL, "loading menu music %s\n", CDOGS_MENU_MUSIC_DIR);
 	LoadSongList(&gMenuSongs, CDOGS_MENU_MUSIC_DIR);
-#endif
 }
 
 void LoadSongList(struct SongDef **songList, const char *dirPath)
@@ -326,6 +324,12 @@ void LoadSongList(struct SongDef **songList, const char *dirPath)
 			debug(D_VERBOSE, "not a regular file %s\n", file.name);
 			continue;
 		}
+		if (strcmp(file.extension, "txt") == 0 ||
+			strcmp(file.extension, "TXT") == 0)
+		{
+			debug(D_VERBOSE, "Skipping text file %s\n", file.name);
+			continue;
+		}
 
 		m = Mix_LoadMUS(file.path);
 		if (m == NULL)