OrdinaryMagician/vkdoom_m
OrdinaryMagician/vkdoom_m
1
Fork 0
Code Activity

- more of the same.

Browse source
This commit is contained in:
Christoph Oelckers 2017-03-08 15:52:09 +01:00
commit 6c6bab73ad
10 changed files with 146 additions and 146 deletions
Download patch file Download diff file Expand all files Collapse all files

22
src/s_advsound.cpp
View file

@ -79,15 +79,15 @@ struct FRandomSoundList
}
}
WORD *Sounds; // A list of sounds that can result for the following id
WORD SfxHead; // The sound id used to reference this list
WORD NumSounds;
uint16_t *Sounds; // A list of sounds that can result for the following id
uint16_t SfxHead; // The sound id used to reference this list
uint16_t NumSounds;
};
struct FPlayerClassLookup
{
FString Name;
WORD ListIndex[3]; // indices into PlayerSounds (0xffff means empty)
uint16_t ListIndex[3]; // indices into PlayerSounds (0xffff means empty)
};
// Used to lookup a sound like "*grunt". This contains all player sounds for
@ -1070,7 +1070,7 @@ void S_AddLocalSndInfo(int lump)
static void S_AddSNDINFO (int lump)
{
bool skipToEndIf;
TArray<WORD> list;
TArray<uint16_t> list;
FScanner sc(lump);
skipToEndIf = false;
@ -1395,7 +1395,7 @@ static void S_AddSNDINFO (int lump)
sc.MustGetStringName ("{");
while (sc.GetString () && !sc.Compare ("}"))
{
WORD sfxto = S_FindSoundTentative (sc.String);
uint16_t sfxto = S_FindSoundTentative (sc.String);
if (sfxto == random.SfxHead)
{
Printf("Definition of random sound '%s' refers to itself recursively.", sc.String);
@ -1410,11 +1410,11 @@ static void S_AddSNDINFO (int lump)
}
else if (list.Size() > 1)
{ // Only add non-empty random lists
random.NumSounds = (WORD)list.Size();
S_sfx[random.SfxHead].link = (WORD)S_rnd.Push (random);
random.NumSounds = (uint16_t)list.Size();
S_sfx[random.SfxHead].link = (uint16_t)S_rnd.Push (random);
S_sfx[random.SfxHead].bRandomHeader = true;
S_rnd[S_sfx[random.SfxHead].link].Sounds = new WORD[random.NumSounds];
memcpy (S_rnd[S_sfx[random.SfxHead].link].Sounds, &list[0], sizeof(WORD)*random.NumSounds);
S_rnd[S_sfx[random.SfxHead].link].Sounds = new uint16_t[random.NumSounds];
memcpy (S_rnd[S_sfx[random.SfxHead].link].Sounds, &list[0], sizeof(uint16_t)*random.NumSounds);
S_sfx[random.SfxHead].NearLimit = -1;
}
}
@ -1700,7 +1700,7 @@ static int S_AddPlayerGender (int classnum, int gender)
if (index == 0xffff)
{
index = PlayerSounds.Reserve (1);
PlayerClassLookups[classnum].ListIndex[gender] = (WORD)index;
PlayerClassLookups[classnum].ListIndex[gender] = (uint16_t)index;
}
return index;
}