OrdinaryMagician/vkdoom_m
OrdinaryMagician/vkdoom_m
1
Fork 0
Code Activity

- Removed -bpal parameter. Blood's blood.pal is loaded from blood.rff, and

Browse source 
its tiles are loaded from the same directory.
- RFF files now load their entire directories into the lumplist.
- Added char * and const char * type coversions for FString, so FStrings can be
  freely passed to functions expecting C strings. (Except varargs functions,
  which still require manually fetching the C string out of it.)
- Renamed the name class to FName.
- Renamed the string class to FString to emphasize that it is not std::string.


SVN r74 (trunk)
This commit is contained in:
Randy Heit 2006-05-03 22:45:01 +00:00
commit ea3b76815d
45 changed files with 526 additions and 410 deletions
Download patch file Download diff file Expand all files Collapse all files

26
src/s_sndseq.cpp
View file

@ -150,9 +150,9 @@ private:
static void AssignTranslations (int seq, seqtype_t type);
static void AssignHexenTranslations (void);
static void AddSequence (int curseq, name seqname, name slot, int stopsound, const TArray<DWORD> &ScriptTemp);
static void AddSequence (int curseq, FName seqname, FName slot, int stopsound, const TArray<DWORD> &ScriptTemp);
static int FindSequence (const char *searchname);
static int FindSequence (name seqname);
static int FindSequence (FName seqname);
static bool TwiddleSeqNum (int &sequence, seqtype_t type);
// PUBLIC DATA DEFINITIONS -------------------------------------------------
@ -265,7 +265,7 @@ void DSeqNode::Serialize (FArchive &arc)
}
else
{
name seqName;
FName seqName;
int delayTics = 0, id;
float volume;
int atten = ATTN_NORM;
@ -336,7 +336,7 @@ void DSeqNode::AddChoice (int seqnum, seqtype_t type)
}
}
name DSeqNode::GetSequenceName () const
FName DSeqNode::GetSequenceName () const
{
return Sequences[m_Sequence]->SeqName;
}
@ -435,8 +435,8 @@ void S_ParseSndSeq (int levellump)
TArray<DWORD> ScriptTemp;
int lastlump, lump;
char seqtype = ':';
name seqname;
name slot;
FName seqname;
FName slot;
int stopsound;
int delaybase;
float volumebase;
@ -519,7 +519,7 @@ void S_ParseSndSeq (int levellump)
SC_MustGetNumber();
ScriptTemp.Push (sc_Number);
SC_MustGetString();
ScriptTemp.Push (name(sc_String));
ScriptTemp.Push (FName(sc_String));
}
continue;
}
@ -646,13 +646,13 @@ void S_ParseSndSeq (int levellump)
AssignHexenTranslations ();
}
static void AddSequence (int curseq, name seqname, name slot, int stopsound, const TArray<DWORD> &ScriptTemp)
static void AddSequence (int curseq, FName seqname, FName slot, int stopsound, const TArray<DWORD> &ScriptTemp)
{
Sequences[curseq] = (FSoundSequence *)Malloc (sizeof(FSoundSequence) + sizeof(DWORD)*ScriptTemp.Size());
Sequences[curseq]->SeqName = seqname;
Sequences[curseq]->Slot = slot;
Sequences[curseq]->StopSound = stopsound;
memcpy (Sequences[curseq]->Script, &ScriptTemp[0], sizeof(int)*ScriptTemp.Size());
memcpy (Sequences[curseq]->Script, &ScriptTemp[0], sizeof(DWORD)*ScriptTemp.Size());
Sequences[curseq]->Script[ScriptTemp.Size()] = MakeCommand(SS_CMD_END, 0);
}
@ -801,7 +801,7 @@ DSeqNode *SN_StartSequence (AActor *actor, const char *seqname, int modenum)
return NULL;
}
DSeqNode *SN_StartSequence (AActor *actor, name seqname, int modenum)
DSeqNode *SN_StartSequence (AActor *actor, FName seqname, int modenum)
{
int seqnum = FindSequence (seqname);
if (seqnum >= 0)
@ -833,7 +833,7 @@ DSeqNode *SN_StartSequence (polyobj_t *poly, const char *seqname, int modenum)
static int FindSequence (const char *searchname)
{
name seqname (searchname, true);
FName seqname (searchname, true);
if (seqname != NAME_None)
{
@ -842,7 +842,7 @@ static int FindSequence (const char *searchname)
return -1;
}
static int FindSequence (name seqname)
static int FindSequence (FName seqname)
{
int i;
@ -1163,7 +1163,7 @@ ptrdiff_t SN_GetSequenceOffset (int sequence, SDWORD *sequencePtr)
//
//==========================================================================
name SN_GetSequenceSlot (int sequence, seqtype_t type)
FName SN_GetSequenceSlot (int sequence, seqtype_t type)
{
if (TwiddleSeqNum (sequence, type))
{