- move static AM color initialization into the AM_StaticInit function.
- move D_LoadWadSettings to keysections.cpp. - made some more data reloadable. - data structures filled by P_SetupLevel should be cleared before loading the level. They can remain non-empty in case of an error. There's probably more to fix here... - fixed: MidiDevices and MusicAliases were not cleared before reloading local SNDINFOs. - fixed signed/unsigned warnings in AddSwitchPair for real (GCC really allows -1u? MSVC prints a warning for that.) SVN r3036 (trunk)
This commit is contained in:
parent
ee20d0ea7a
commit
f0f17e531c
23 changed files with 134 additions and 107 deletions
|
|
@ -857,6 +857,8 @@ static void S_ClearSoundData()
|
|||
PlayerSounds.Clear();
|
||||
DefPlayerClass = 0;
|
||||
DefPlayerClassName = "";
|
||||
MusicAliases.Clear();
|
||||
MidiDevices.Clear();
|
||||
}
|
||||
|
||||
//==========================================================================
|
||||
|
|
@ -867,10 +869,11 @@ static void S_ClearSoundData()
|
|||
// Also registers Blood SFX files and Strife's voices.
|
||||
//==========================================================================
|
||||
|
||||
void S_ParseSndInfo ()
|
||||
void S_ParseSndInfo (bool redefine)
|
||||
{
|
||||
int lump;
|
||||
|
||||
if (!redefine) SavedPlayerSounds.Clear(); // clear skin sounds only for initial parsing.
|
||||
atterm (S_ClearSoundData);
|
||||
S_ClearSoundData(); // remove old sound data first!
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue