mirror of
https://github.com/ZDoom/qzdoom.git
synced 2024-11-24 13:01:47 +00:00
- Fixed: Multiple-choice sound sequences could not be assigned IDs for use
with polyobjects and the sound sequence selector things. SVN r311 (trunk)
This commit is contained in:
parent
cf3b1bfd6e
commit
1b879c61c2
2 changed files with 22 additions and 10 deletions
|
@ -1,3 +1,7 @@
|
|||
August 25, 2006
|
||||
- Fixed: Multiple-choice sound sequences could not be assigned IDs for use
|
||||
with polyobjects and the sound sequence selector things.
|
||||
|
||||
August 24, 2006
|
||||
- Removed the 64 seg limit for polyobjects defined with Polyobj_ExplicitLine.
|
||||
- Polyobj_StartLine and Polyobj_ExplicitLine can now set a line's ID. This is
|
||||
|
|
|
@ -57,13 +57,14 @@ typedef enum
|
|||
SS_STRING_END,
|
||||
SS_STRING_STOPSOUND,
|
||||
SS_STRING_ATTENUATION,
|
||||
SS_STRING_DOOR,
|
||||
SS_STRING_PLATFORM,
|
||||
SS_STRING_ENVIRONMENT,
|
||||
SS_STRING_NOSTOPCUTOFF,
|
||||
SS_STRING_SLOT,
|
||||
SS_STRING_RANDOMSEQUENCE,
|
||||
SS_STRING_RESTART,
|
||||
// These must be last and in the same order as they appear in seqtype_t
|
||||
SS_STRING_PLATFORM,
|
||||
SS_STRING_DOOR,
|
||||
SS_STRING_ENVIRONMENT
|
||||
} ssstrings_t;
|
||||
|
||||
typedef enum
|
||||
|
@ -190,13 +191,14 @@ static const char *SSStrings[] = {
|
|||
"end",
|
||||
"stopsound",
|
||||
"attenuation",
|
||||
"door",
|
||||
"platform",
|
||||
"environment",
|
||||
"nostopcutoff",
|
||||
"slot",
|
||||
"randomsequence",
|
||||
"restart",
|
||||
// These must be last and in the same order as they appear in seqtype_t
|
||||
"platform",
|
||||
"door",
|
||||
"environment",
|
||||
NULL
|
||||
};
|
||||
static const char *Attenuations[] = {
|
||||
|
@ -529,11 +531,17 @@ void S_ParseSndSeq (int levellump)
|
|||
else
|
||||
{ // Add a selection
|
||||
SC_UnGet();
|
||||
SC_MustGetNumber();
|
||||
if (SC_CheckNumber())
|
||||
{
|
||||
ScriptTemp.Push (sc_Number);
|
||||
SC_MustGetString();
|
||||
ScriptTemp.Push (FName(sc_String));
|
||||
}
|
||||
else
|
||||
{
|
||||
AssignTranslations (curseq, seqtype_t(SC_MustMatchString (SSStrings + SS_STRING_PLATFORM)));
|
||||
}
|
||||
}
|
||||
continue;
|
||||
}
|
||||
switch (SC_MustMatchString (SSStrings))
|
||||
|
|
Loading…
Reference in a new issue