OrdinaryMagician/vkdoom_m
OrdinaryMagician/vkdoom_m
1
Fork 0
Code Activity

- Removed the 8-character limit on endpic names from the parser. (Though it

Browse source 
might still be present in the texture manager; I don't remember.)
- Fixed: EndSequence needs a proper constructor.
- Some more GCC warning removals.



SVN r1021 (trunk)
This commit is contained in:
Randy Heit 2008-06-05 04:30:18 +00:00
commit a4dc93fb91
7 changed files with 29 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

28
src/g_level.cpp
View file

@ -111,6 +111,14 @@ static FRandom pr_classchoice ("RandomPlayerClassChoice");
TArray<EndSequence> EndSequences;
EndSequence::EndSequence()
{
EndType = END_Pic;
Advanced = false;
MusicLooping = false;
PlayTheEnd = false;
}
extern bool timingdemo;
// Start time for timing demos
@ -897,7 +905,6 @@ static void ParseMapInfoLower (FScanner &sc,
EndSequence newSeq;
bool useseq = false;
memset(&newSeq, 0, sizeof(newSeq));
sc.MustGetString ();
if (IsNum (sc.String))
{
@ -926,18 +933,15 @@ static void ParseMapInfoLower (FScanner &sc,
{
sc.MustGetString();
newSeq.EndType = END_Pic;
strncpy (newSeq.PicName, sc.String, 8);
newSeq.PicName[8] = 0;
newSeq.PicName = sc.String;
}
else if (sc.Compare("hscroll"))
{
newSeq.EndType = END_Bunny;
sc.MustGetString();
strncpy (newSeq.PicName, sc.String, 8);
newSeq.PicName[8] = 0;
newSeq.PicName = sc.String;
sc.MustGetString();
strncpy (newSeq.PicName2, sc.String, 8);
newSeq.PicName2[8] = 0;
newSeq.PicName2 = sc.String;
if (sc.CheckNumber())
newSeq.PlayTheEnd = !!sc.Number;
}
@ -945,11 +949,9 @@ static void ParseMapInfoLower (FScanner &sc,
{
newSeq.EndType = END_Demon;
sc.MustGetString();
strncpy (newSeq.PicName, sc.String, 8);
newSeq.PicName[8] = 0;
newSeq.PicName = sc.String;
sc.MustGetString();
strncpy (newSeq.PicName2, sc.String, 8);
newSeq.PicName2[8] = 0;
newSeq.PicName2 = sc.String;
}
else if (sc.Compare("cast"))
{
@ -987,8 +989,7 @@ static void ParseMapInfoLower (FScanner &sc,
{
sc.MustGetString ();
newSeq.EndType = END_Pic;
strncpy (newSeq.PicName, sc.String, 8);
newSeq.PicName[8] = 0;
newSeq.PicName = sc.String;
useseq = true;
}
else if (sc.Compare ("endbunny"))
@ -1372,7 +1373,6 @@ static void SetEndSequence (char *nextmap, int type)
{
EndSequence newseq;
newseq.EndType = type;
memset (newseq.PicName, 0, sizeof(newseq.PicName));
seqnum = (int)EndSequences.Push (newseq);
}
strcpy (nextmap, "enDSeQ");