- Fixed all the new warnings tossed out by GCC 4.3.
SVN r1047 (trunk)
This commit is contained in:
parent
9c6e40e192
commit
bb689ba3c9
16 changed files with 42 additions and 30 deletions
|
|
@ -323,16 +323,16 @@ static FStrifeDialogueNode *ReadRetailNode (FileReader *lump, DWORD &prevSpeaker
|
|||
node->Dialogue = ncopystring (speech.Dialogue);
|
||||
|
||||
// The speaker's portrait, if any.
|
||||
speech.Backdrop[8] = 0;
|
||||
speech.Dialogue[0] = 0; //speech.Backdrop[8] = 0;
|
||||
node->Backdrop = TexMan.CheckForTexture (speech.Backdrop, FTexture::TEX_MiscPatch);
|
||||
|
||||
// The speaker's voice for this node, if any.
|
||||
speech.Sound[8] = 0;
|
||||
speech.Backdrop[0] = 0; //speech.Sound[8] = 0;
|
||||
sprintf (fullsound, "svox/%s", speech.Sound);
|
||||
node->SpeakerVoice = fullsound;
|
||||
|
||||
// The speaker's name, if any.
|
||||
speech.Name[16] = 0;
|
||||
speech.Sound[0] = 0; //speech.Name[16] = 0;
|
||||
node->SpeakerName = ncopystring (speech.Name);
|
||||
|
||||
// The item the speaker should drop when killed.
|
||||
|
|
@ -406,7 +406,7 @@ static FStrifeDialogueNode *ReadTeaserNode (FileReader *lump, DWORD &prevSpeaker
|
|||
}
|
||||
|
||||
// The speaker's name, if any.
|
||||
speech.Name[16] = 0;
|
||||
speech.Dialogue[0] = 0; //speech.Name[16] = 0;
|
||||
node->SpeakerName = ncopystring (speech.Name);
|
||||
|
||||
// The item the speaker should drop when killed.
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue