2008-03-19 09:53:23 +00:00
|
|
|
/*
|
|
|
|
** p_converstation.cpp
|
|
|
|
** Implements Strife style conversation dialogs
|
|
|
|
**
|
|
|
|
**---------------------------------------------------------------------------
|
|
|
|
** Copyright 2004-2008 Randy Heit
|
|
|
|
** All rights reserved.
|
|
|
|
**
|
|
|
|
** Redistribution and use in source and binary forms, with or without
|
|
|
|
** modification, are permitted provided that the following conditions
|
|
|
|
** are met:
|
|
|
|
**
|
|
|
|
** 1. Redistributions of source code must retain the above copyright
|
|
|
|
** notice, this list of conditions and the following disclaimer.
|
|
|
|
** 2. Redistributions in binary form must reproduce the above copyright
|
|
|
|
** notice, this list of conditions and the following disclaimer in the
|
|
|
|
** documentation and/or other materials provided with the distribution.
|
|
|
|
** 3. The name of the author may not be used to endorse or promote products
|
|
|
|
** derived from this software without specific prior written permission.
|
|
|
|
**
|
|
|
|
** THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
|
|
|
|
** IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
|
|
|
|
** OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
|
|
|
|
** IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
|
|
|
|
** INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
|
|
|
|
** NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
|
|
|
|
** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
|
|
|
|
** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
|
|
|
|
** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
|
|
|
|
** THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
|
|
|
**---------------------------------------------------------------------------
|
|
|
|
**
|
|
|
|
*/
|
|
|
|
|
2006-02-24 04:48:15 +00:00
|
|
|
#include <assert.h>
|
|
|
|
|
|
|
|
#include "actor.h"
|
|
|
|
#include "r_data.h"
|
|
|
|
#include "p_conversation.h"
|
|
|
|
#include "w_wad.h"
|
|
|
|
#include "cmdlib.h"
|
|
|
|
#include "s_sound.h"
|
|
|
|
#include "m_menu.h"
|
|
|
|
#include "v_text.h"
|
|
|
|
#include "v_video.h"
|
|
|
|
#include "m_random.h"
|
|
|
|
#include "gi.h"
|
|
|
|
#include "templates.h"
|
|
|
|
#include "a_strifeglobal.h"
|
|
|
|
#include "a_keys.h"
|
|
|
|
#include "p_enemy.h"
|
2006-05-11 12:11:59 +00:00
|
|
|
#include "gstrings.h"
|
2006-04-14 12:58:52 +00:00
|
|
|
#include "sound/i_music.h"
|
2008-05-08 08:06:26 +00:00
|
|
|
#include "p_setup.h"
|
2008-09-14 23:54:38 +00:00
|
|
|
#include "d_net.h"
|
|
|
|
#include "g_level.h"
|
|
|
|
#include "d_event.h"
|
2006-02-24 04:48:15 +00:00
|
|
|
|
|
|
|
// The conversations as they exist inside a SCRIPTxx lump.
|
|
|
|
struct Response
|
|
|
|
{
|
|
|
|
SDWORD GiveType;
|
|
|
|
SDWORD Item[3];
|
|
|
|
SDWORD Count[3];
|
|
|
|
char Reply[32];
|
|
|
|
char Yes[80];
|
|
|
|
SDWORD Link;
|
|
|
|
DWORD Log;
|
|
|
|
char No[80];
|
|
|
|
};
|
|
|
|
|
|
|
|
struct Speech
|
|
|
|
{
|
|
|
|
DWORD SpeakerType;
|
|
|
|
SDWORD DropType;
|
|
|
|
SDWORD ItemCheck[3];
|
|
|
|
SDWORD Link;
|
|
|
|
char Name[16];
|
|
|
|
char Sound[8];
|
|
|
|
char Backdrop[8];
|
|
|
|
char Dialogue[320];
|
|
|
|
Response Responses[5];
|
|
|
|
};
|
|
|
|
|
|
|
|
// The Teaser version of the game uses an older version of the structure
|
|
|
|
struct TeaserSpeech
|
|
|
|
{
|
|
|
|
DWORD SpeakerType;
|
|
|
|
SDWORD DropType;
|
|
|
|
DWORD VoiceNumber;
|
|
|
|
char Name[16];
|
|
|
|
char Dialogue[320];
|
|
|
|
Response Responses[5];
|
|
|
|
};
|
|
|
|
|
|
|
|
static FRandom pr_randomspeech("RandomSpeech");
|
|
|
|
|
2006-05-10 02:40:43 +00:00
|
|
|
void GiveSpawner (player_t *player, const PClass *type);
|
2006-02-24 04:48:15 +00:00
|
|
|
|
|
|
|
TArray<FStrifeDialogueNode *> StrifeDialogues;
|
|
|
|
|
|
|
|
// There were 344 types in Strife, and Strife conversations refer
|
|
|
|
// to their index in the mobjinfo table. This table indexes all
|
|
|
|
// the Strife actor types in the order Strife had them and is
|
|
|
|
// initialized as part of the actor's setup in infodefaults.cpp.
|
2006-06-11 11:28:48 +00:00
|
|
|
const PClass *StrifeTypes[1001];
|
2006-02-24 04:48:15 +00:00
|
|
|
|
|
|
|
static menu_t ConversationMenu;
|
|
|
|
static TArray<menuitem_t> ConversationItems;
|
|
|
|
static int ConversationPauseTic;
|
|
|
|
static bool ShowGold;
|
|
|
|
|
|
|
|
static void LoadScriptFile (const char *name);
|
2008-05-08 08:06:26 +00:00
|
|
|
static void LoadScriptFile(FileReader *lump, int numnodes);
|
|
|
|
static FStrifeDialogueNode *ReadRetailNode (FileReader *lump, DWORD &prevSpeakerType);
|
|
|
|
static FStrifeDialogueNode *ReadTeaserNode (FileReader *lump, DWORD &prevSpeakerType);
|
2006-02-24 04:48:15 +00:00
|
|
|
static void ParseReplies (FStrifeDialogueReply **replyptr, Response *responses);
|
|
|
|
static void DrawConversationMenu ();
|
|
|
|
static void PickConversationReply ();
|
|
|
|
static void CleanupConversationMenu ();
|
2006-07-29 01:26:24 +00:00
|
|
|
static void ConversationMenuEscaped ();
|
2006-02-24 04:48:15 +00:00
|
|
|
|
|
|
|
static FStrifeDialogueNode *CurNode, *PrevNode;
|
2006-08-31 00:16:12 +00:00
|
|
|
static FBrokenLines *DialogueLines;
|
2008-03-26 08:29:02 +00:00
|
|
|
|
|
|
|
static bool Conversation_TakeStuff;
|
2006-02-24 04:48:15 +00:00
|
|
|
|
|
|
|
#define NUM_RANDOM_LINES 10
|
|
|
|
#define NUM_RANDOM_GOODBYES 3
|
|
|
|
|
|
|
|
//============================================================================
|
|
|
|
//
|
|
|
|
// GetStrifeType
|
|
|
|
//
|
2006-05-10 02:40:43 +00:00
|
|
|
// Given an item type number, returns the corresponding PClass.
|
2006-02-24 04:48:15 +00:00
|
|
|
//
|
|
|
|
//============================================================================
|
|
|
|
|
2006-05-10 02:40:43 +00:00
|
|
|
static const PClass *GetStrifeType (int typenum)
|
2006-02-24 04:48:15 +00:00
|
|
|
{
|
2006-06-11 11:28:48 +00:00
|
|
|
if (typenum > 0 && typenum < 1001)
|
2006-02-24 04:48:15 +00:00
|
|
|
{
|
|
|
|
return StrifeTypes[typenum];
|
|
|
|
}
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
|
|
|
|
//============================================================================
|
|
|
|
//
|
|
|
|
// P_LoadStrifeConversations
|
|
|
|
//
|
|
|
|
// Loads the SCRIPT00 and SCRIPTxx files for a corresponding map.
|
|
|
|
//
|
|
|
|
//============================================================================
|
|
|
|
|
2008-05-08 08:06:26 +00:00
|
|
|
void P_LoadStrifeConversations (MapData *map, const char *mapname)
|
2006-02-24 04:48:15 +00:00
|
|
|
{
|
2008-05-08 08:06:26 +00:00
|
|
|
if (map->Size(ML_CONVERSATION) > 0)
|
2006-02-24 04:48:15 +00:00
|
|
|
{
|
2008-05-08 08:06:26 +00:00
|
|
|
LoadScriptFile ("SCRIPT00");
|
|
|
|
map->Seek(ML_CONVERSATION);
|
|
|
|
LoadScriptFile (map->file, map->Size(ML_CONVERSATION));
|
2006-02-24 04:48:15 +00:00
|
|
|
}
|
2008-05-08 08:06:26 +00:00
|
|
|
else
|
|
|
|
{
|
|
|
|
if (strnicmp (mapname, "MAP", 3) != 0)
|
|
|
|
{
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
char scriptname[9] = { 'S','C','R','I','P','T',mapname[3],mapname[4],0 };
|
2006-02-24 04:48:15 +00:00
|
|
|
|
2008-05-08 08:06:26 +00:00
|
|
|
LoadScriptFile ("SCRIPT00");
|
|
|
|
LoadScriptFile (scriptname);
|
|
|
|
}
|
2006-02-24 04:48:15 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
//============================================================================
|
|
|
|
//
|
|
|
|
// P_FreeStrifeConversations
|
|
|
|
//
|
|
|
|
//============================================================================
|
|
|
|
|
|
|
|
void P_FreeStrifeConversations ()
|
|
|
|
{
|
|
|
|
FStrifeDialogueNode *node;
|
|
|
|
|
|
|
|
while (StrifeDialogues.Pop (node))
|
|
|
|
{
|
|
|
|
delete node;
|
|
|
|
}
|
|
|
|
|
|
|
|
for (int i = 0; i < 344; ++i)
|
|
|
|
{
|
|
|
|
if (StrifeTypes[i] != NULL)
|
|
|
|
{
|
2006-05-11 12:11:59 +00:00
|
|
|
AActor * ac = GetDefaultByType (StrifeTypes[i]);
|
|
|
|
if (ac != NULL) ac->Conversation = NULL;
|
2006-02-24 04:48:15 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
CurNode = NULL;
|
|
|
|
PrevNode = NULL;
|
|
|
|
}
|
|
|
|
|
|
|
|
//============================================================================
|
|
|
|
//
|
|
|
|
// ncopystring
|
|
|
|
//
|
|
|
|
// If the string has no content, returns NULL. Otherwise, returns a copy.
|
|
|
|
//
|
|
|
|
//============================================================================
|
|
|
|
|
|
|
|
static char *ncopystring (const char *string)
|
|
|
|
{
|
|
|
|
if (string == NULL || string[0] == 0)
|
|
|
|
{
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
return copystring (string);
|
|
|
|
}
|
|
|
|
|
|
|
|
//============================================================================
|
|
|
|
//
|
|
|
|
// LoadScriptFile
|
|
|
|
//
|
|
|
|
// Loads a SCRIPTxx file and converts it into a more useful internal format.
|
|
|
|
//
|
|
|
|
//============================================================================
|
|
|
|
|
|
|
|
static void LoadScriptFile (const char *name)
|
|
|
|
{
|
|
|
|
int lumpnum = Wads.CheckNumForName (name);
|
2008-05-08 08:06:26 +00:00
|
|
|
FileReader *lump;
|
2006-02-24 04:48:15 +00:00
|
|
|
|
|
|
|
if (lumpnum < 0)
|
|
|
|
{
|
|
|
|
return;
|
|
|
|
}
|
2008-05-08 08:06:26 +00:00
|
|
|
lump = Wads.ReopenLumpNum (lumpnum);
|
|
|
|
|
|
|
|
LoadScriptFile(lump, Wads.LumpLength(lumpnum));
|
2008-05-22 19:35:38 +00:00
|
|
|
delete lump;
|
2008-05-08 08:06:26 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
static void LoadScriptFile(FileReader *lump, int numnodes)
|
|
|
|
{
|
|
|
|
int i;
|
|
|
|
DWORD prevSpeakerType;
|
|
|
|
FStrifeDialogueNode *node;
|
2006-02-24 04:48:15 +00:00
|
|
|
|
|
|
|
if (!(gameinfo.flags & GI_SHAREWARE))
|
|
|
|
{
|
|
|
|
// Strife scripts are always a multiple of 1516 bytes because each entry
|
|
|
|
// is exactly 1516 bytes long.
|
|
|
|
if (numnodes % 1516 != 0)
|
|
|
|
{
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
numnodes /= 1516;
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
// And the teaser version has 1488-byte entries.
|
|
|
|
if (numnodes % 1488 != 0)
|
|
|
|
{
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
numnodes /= 1488;
|
|
|
|
}
|
|
|
|
|
|
|
|
prevSpeakerType = 0;
|
|
|
|
|
|
|
|
for (i = 0; i < numnodes; ++i)
|
|
|
|
{
|
|
|
|
if (!(gameinfo.flags & GI_SHAREWARE))
|
|
|
|
{
|
|
|
|
node = ReadRetailNode (lump, prevSpeakerType);
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
node = ReadTeaserNode (lump, prevSpeakerType);
|
|
|
|
}
|
|
|
|
StrifeDialogues.Push (node);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
//============================================================================
|
|
|
|
//
|
|
|
|
// ReadRetailNode
|
|
|
|
//
|
|
|
|
// Converts a single dialogue node from the Retail version of Strife.
|
|
|
|
//
|
|
|
|
//============================================================================
|
|
|
|
|
2008-05-08 08:06:26 +00:00
|
|
|
static FStrifeDialogueNode *ReadRetailNode (FileReader *lump, DWORD &prevSpeakerType)
|
2006-02-24 04:48:15 +00:00
|
|
|
{
|
|
|
|
FStrifeDialogueNode *node;
|
|
|
|
Speech speech;
|
|
|
|
char fullsound[16];
|
2006-05-10 02:40:43 +00:00
|
|
|
const PClass *type;
|
2006-02-24 04:48:15 +00:00
|
|
|
int j;
|
|
|
|
|
|
|
|
node = new FStrifeDialogueNode;
|
|
|
|
|
|
|
|
lump->Read (&speech, sizeof(speech));
|
|
|
|
|
|
|
|
// Byte swap all the ints in the original data
|
|
|
|
speech.SpeakerType = LittleLong(speech.SpeakerType);
|
|
|
|
speech.DropType = LittleLong(speech.DropType);
|
|
|
|
speech.Link = LittleLong(speech.Link);
|
|
|
|
|
|
|
|
// Assign the first instance of a conversation as the default for its
|
|
|
|
// actor, so newly spawned actors will use this conversation by default.
|
|
|
|
type = GetStrifeType (speech.SpeakerType);
|
|
|
|
node->SpeakerType = type;
|
|
|
|
if (prevSpeakerType != speech.SpeakerType)
|
|
|
|
{
|
|
|
|
if (type != NULL)
|
|
|
|
{
|
|
|
|
GetDefaultByType (type)->Conversation = node;
|
|
|
|
}
|
|
|
|
prevSpeakerType = speech.SpeakerType;
|
|
|
|
}
|
|
|
|
|
|
|
|
// Convert the rest of the data to our own internal format.
|
|
|
|
node->Dialogue = ncopystring (speech.Dialogue);
|
|
|
|
|
|
|
|
// The speaker's portrait, if any.
|
2008-06-25 22:16:04 +00:00
|
|
|
speech.Dialogue[0] = 0; //speech.Backdrop[8] = 0;
|
2008-01-26 23:20:34 +00:00
|
|
|
node->Backdrop = TexMan.CheckForTexture (speech.Backdrop, FTexture::TEX_MiscPatch);
|
2006-02-24 04:48:15 +00:00
|
|
|
|
|
|
|
// The speaker's voice for this node, if any.
|
2008-06-25 22:16:04 +00:00
|
|
|
speech.Backdrop[0] = 0; //speech.Sound[8] = 0;
|
About a week's worth of changes here. As a heads-up, I wouldn't be
surprised if this doesn't build in Linux right now. The CMakeLists.txt
were checked with MinGW and NMake, but how they fair under Linux is an
unknown to me at this time.
- Converted most sprintf (and all wsprintf) calls to either mysnprintf or
FStrings, depending on the situation.
- Changed the strings in the wbstartstruct to be FStrings.
- Changed myvsnprintf() to output nothing if count is greater than INT_MAX.
This is so that I can use a series of mysnprintf() calls and advance the
pointer for each one. Once the pointer goes beyond the end of the buffer,
the count will go negative, but since it's an unsigned type it will be
seen as excessively huge instead. This should not be a problem, as there's
no reason for ZDoom to be using text buffers larger than 2 GB anywhere.
- Ripped out the disabled bit from FGameConfigFile::MigrateOldConfig().
- Changed CalcMapName() to return an FString instead of a pointer to a static
buffer.
- Changed startmap in d_main.cpp into an FString.
- Changed CheckWarpTransMap() to take an FString& as the first argument.
- Changed d_mapname in g_level.cpp into an FString.
- Changed DoSubstitution() in ct_chat.cpp to place the substitutions in an
FString.
- Fixed: The MAPINFO parser wrote into the string buffer to construct a map
name when given a Hexen map number. This was fine with the old scanner
code, but only a happy coincidence prevents it from crashing with the new
code
- Added the 'B' conversion specifier to StringFormat::VWorker() for printing
binary numbers.
- Added CMake support for building with MinGW, MSYS, and NMake. Linux support
is probably broken until I get around to booting into Linux again. Niceties
provided over the existing Makefiles they're replacing:
* All command-line builds can use the same build system, rather than having
a separate one for MinGW and another for Linux.
* Microsoft's NMake tool is supported as a target.
* Progress meters.
* Parallel makes work from a fresh checkout without needing to be primed
first with a single-threaded make.
* Porting to other architectures should be simplified, whenever that day
comes.
- Replaced the makewad tool with zipdir. This handles the dependency tracking
itself instead of generating an external makefile to do it, since I couldn't
figure out how to generate a makefile with an external tool and include it
with a CMake-generated makefile. Where makewad used a master list of files
to generate the package file, zipdir just zips the entire contents of one or
more directories.
- Added the gdtoa package from netlib's fp library so that ZDoom's printf-style
formatting can be entirely independant of the CRT.
SVN r1082 (trunk)
2008-07-23 04:57:26 +00:00
|
|
|
mysnprintf (fullsound, countof(fullsound), "svox/%s", speech.Sound);
|
2008-06-15 02:25:09 +00:00
|
|
|
node->SpeakerVoice = fullsound;
|
2006-02-24 04:48:15 +00:00
|
|
|
|
|
|
|
// The speaker's name, if any.
|
2008-06-25 22:16:04 +00:00
|
|
|
speech.Sound[0] = 0; //speech.Name[16] = 0;
|
2006-02-24 04:48:15 +00:00
|
|
|
node->SpeakerName = ncopystring (speech.Name);
|
|
|
|
|
|
|
|
// The item the speaker should drop when killed.
|
|
|
|
node->DropType = GetStrifeType (speech.DropType);
|
|
|
|
|
|
|
|
// Items you need to have to make the speaker use a different node.
|
|
|
|
for (j = 0; j < 3; ++j)
|
|
|
|
{
|
|
|
|
node->ItemCheck[j] = GetStrifeType (speech.ItemCheck[j]);
|
|
|
|
}
|
|
|
|
node->ItemCheckNode = speech.Link;
|
|
|
|
node->Children = NULL;
|
|
|
|
|
|
|
|
ParseReplies (&node->Children, &speech.Responses[0]);
|
|
|
|
|
|
|
|
return node;
|
|
|
|
}
|
|
|
|
|
|
|
|
//============================================================================
|
|
|
|
//
|
|
|
|
// ReadTeaserNode
|
|
|
|
//
|
|
|
|
// Converts a single dialogue node from the Teaser version of Strife.
|
|
|
|
//
|
|
|
|
//============================================================================
|
|
|
|
|
2008-05-08 08:06:26 +00:00
|
|
|
static FStrifeDialogueNode *ReadTeaserNode (FileReader *lump, DWORD &prevSpeakerType)
|
2006-02-24 04:48:15 +00:00
|
|
|
{
|
|
|
|
FStrifeDialogueNode *node;
|
|
|
|
TeaserSpeech speech;
|
|
|
|
char fullsound[16];
|
2006-05-10 02:40:43 +00:00
|
|
|
const PClass *type;
|
2006-02-24 04:48:15 +00:00
|
|
|
int j;
|
|
|
|
|
|
|
|
node = new FStrifeDialogueNode;
|
|
|
|
|
|
|
|
lump->Read (&speech, sizeof(speech));
|
|
|
|
|
|
|
|
// Byte swap all the ints in the original data
|
|
|
|
speech.SpeakerType = LittleLong(speech.SpeakerType);
|
|
|
|
speech.DropType = LittleLong(speech.DropType);
|
|
|
|
|
|
|
|
// Assign the first instance of a conversation as the default for its
|
|
|
|
// actor, so newly spawned actors will use this conversation by default.
|
|
|
|
type = GetStrifeType (speech.SpeakerType);
|
|
|
|
node->SpeakerType = type;
|
|
|
|
if (prevSpeakerType != speech.SpeakerType)
|
|
|
|
{
|
|
|
|
if (type != NULL)
|
|
|
|
{
|
|
|
|
GetDefaultByType (type)->Conversation = node;
|
|
|
|
}
|
|
|
|
prevSpeakerType = speech.SpeakerType;
|
|
|
|
}
|
|
|
|
|
|
|
|
// Convert the rest of the data to our own internal format.
|
|
|
|
node->Dialogue = ncopystring (speech.Dialogue);
|
|
|
|
|
|
|
|
// The Teaser version doesn't have portraits.
|
2008-06-15 18:36:26 +00:00
|
|
|
node->Backdrop.SetInvalid();
|
2006-02-24 04:48:15 +00:00
|
|
|
|
|
|
|
// The speaker's voice for this node, if any.
|
|
|
|
if (speech.VoiceNumber != 0)
|
|
|
|
{
|
About a week's worth of changes here. As a heads-up, I wouldn't be
surprised if this doesn't build in Linux right now. The CMakeLists.txt
were checked with MinGW and NMake, but how they fair under Linux is an
unknown to me at this time.
- Converted most sprintf (and all wsprintf) calls to either mysnprintf or
FStrings, depending on the situation.
- Changed the strings in the wbstartstruct to be FStrings.
- Changed myvsnprintf() to output nothing if count is greater than INT_MAX.
This is so that I can use a series of mysnprintf() calls and advance the
pointer for each one. Once the pointer goes beyond the end of the buffer,
the count will go negative, but since it's an unsigned type it will be
seen as excessively huge instead. This should not be a problem, as there's
no reason for ZDoom to be using text buffers larger than 2 GB anywhere.
- Ripped out the disabled bit from FGameConfigFile::MigrateOldConfig().
- Changed CalcMapName() to return an FString instead of a pointer to a static
buffer.
- Changed startmap in d_main.cpp into an FString.
- Changed CheckWarpTransMap() to take an FString& as the first argument.
- Changed d_mapname in g_level.cpp into an FString.
- Changed DoSubstitution() in ct_chat.cpp to place the substitutions in an
FString.
- Fixed: The MAPINFO parser wrote into the string buffer to construct a map
name when given a Hexen map number. This was fine with the old scanner
code, but only a happy coincidence prevents it from crashing with the new
code
- Added the 'B' conversion specifier to StringFormat::VWorker() for printing
binary numbers.
- Added CMake support for building with MinGW, MSYS, and NMake. Linux support
is probably broken until I get around to booting into Linux again. Niceties
provided over the existing Makefiles they're replacing:
* All command-line builds can use the same build system, rather than having
a separate one for MinGW and another for Linux.
* Microsoft's NMake tool is supported as a target.
* Progress meters.
* Parallel makes work from a fresh checkout without needing to be primed
first with a single-threaded make.
* Porting to other architectures should be simplified, whenever that day
comes.
- Replaced the makewad tool with zipdir. This handles the dependency tracking
itself instead of generating an external makefile to do it, since I couldn't
figure out how to generate a makefile with an external tool and include it
with a CMake-generated makefile. Where makewad used a master list of files
to generate the package file, zipdir just zips the entire contents of one or
more directories.
- Added the gdtoa package from netlib's fp library so that ZDoom's printf-style
formatting can be entirely independant of the CRT.
SVN r1082 (trunk)
2008-07-23 04:57:26 +00:00
|
|
|
mysnprintf (fullsound, countof(fullsound), "svox/voc%u", speech.VoiceNumber);
|
2008-06-15 02:25:09 +00:00
|
|
|
node->SpeakerVoice = fullsound;
|
2006-02-24 04:48:15 +00:00
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
node->SpeakerVoice = 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
// The speaker's name, if any.
|
2008-06-25 22:16:04 +00:00
|
|
|
speech.Dialogue[0] = 0; //speech.Name[16] = 0;
|
2006-02-24 04:48:15 +00:00
|
|
|
node->SpeakerName = ncopystring (speech.Name);
|
|
|
|
|
|
|
|
// The item the speaker should drop when killed.
|
|
|
|
node->DropType = GetStrifeType (speech.DropType);
|
|
|
|
|
|
|
|
// Items you need to have to make the speaker use a different node.
|
|
|
|
for (j = 0; j < 3; ++j)
|
|
|
|
{
|
|
|
|
node->ItemCheck[j] = NULL;
|
|
|
|
}
|
|
|
|
node->ItemCheckNode = 0;
|
|
|
|
node->Children = NULL;
|
|
|
|
|
|
|
|
ParseReplies (&node->Children, &speech.Responses[0]);
|
|
|
|
|
|
|
|
return node;
|
|
|
|
}
|
|
|
|
|
|
|
|
//============================================================================
|
|
|
|
//
|
|
|
|
// ParseReplies
|
|
|
|
//
|
|
|
|
// Convert PC responses. Rather than being stored inside the main node, they
|
|
|
|
// hang off it as a singly-linked list, so no space is wasted on replies that
|
|
|
|
// don't even matter.
|
|
|
|
//
|
|
|
|
//============================================================================
|
|
|
|
|
|
|
|
static void ParseReplies (FStrifeDialogueReply **replyptr, Response *responses)
|
|
|
|
{
|
|
|
|
FStrifeDialogueReply *reply;
|
|
|
|
int j, k;
|
|
|
|
|
|
|
|
// Byte swap first.
|
|
|
|
for (j = 0; j < 5; ++j)
|
|
|
|
{
|
|
|
|
responses[j].GiveType = LittleLong(responses[j].GiveType);
|
|
|
|
responses[j].Link = LittleLong(responses[j].Link);
|
|
|
|
responses[j].Log = LittleLong(responses[j].Log);
|
|
|
|
for (k = 0; k < 3; ++k)
|
|
|
|
{
|
|
|
|
responses[j].Item[k] = LittleLong(responses[j].Item[k]);
|
|
|
|
responses[j].Count[k] = LittleLong(responses[j].Count[k]);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
for (j = 0; j < 5; ++j)
|
|
|
|
{
|
|
|
|
Response *rsp = &responses[j];
|
|
|
|
|
|
|
|
// If the reply has no text and goes nowhere, then it doesn't
|
|
|
|
// need to be remembered.
|
|
|
|
if (rsp->Reply[0] == 0 && rsp->Link == 0)
|
|
|
|
{
|
|
|
|
continue;
|
|
|
|
}
|
|
|
|
reply = new FStrifeDialogueReply;
|
|
|
|
|
|
|
|
// The next node to use when this reply is chosen.
|
|
|
|
reply->NextNode = rsp->Link;
|
|
|
|
|
|
|
|
// The message to record in the log for this reply.
|
|
|
|
reply->LogNumber = rsp->Log;
|
|
|
|
|
|
|
|
// The item to receive when this reply is used.
|
|
|
|
reply->GiveType = GetStrifeType (rsp->GiveType);
|
|
|
|
|
|
|
|
// Do you need anything special for this reply to succeed?
|
|
|
|
for (k = 0; k < 3; ++k)
|
|
|
|
{
|
|
|
|
reply->ItemCheck[k] = GetStrifeType (rsp->Item[k]);
|
|
|
|
reply->ItemCheckAmount[k] = rsp->Count[k];
|
|
|
|
}
|
|
|
|
|
|
|
|
// ReplyLines is calculated when the menu is shown. It is just Reply
|
|
|
|
// with word wrap turned on.
|
|
|
|
reply->ReplyLines = NULL;
|
|
|
|
|
|
|
|
// If the first item check has a positive amount required, then
|
|
|
|
// add that to the reply string. Otherwise, use the reply as-is.
|
|
|
|
if (rsp->Count[0] > 0)
|
|
|
|
{
|
|
|
|
char moneystr[128];
|
|
|
|
|
About a week's worth of changes here. As a heads-up, I wouldn't be
surprised if this doesn't build in Linux right now. The CMakeLists.txt
were checked with MinGW and NMake, but how they fair under Linux is an
unknown to me at this time.
- Converted most sprintf (and all wsprintf) calls to either mysnprintf or
FStrings, depending on the situation.
- Changed the strings in the wbstartstruct to be FStrings.
- Changed myvsnprintf() to output nothing if count is greater than INT_MAX.
This is so that I can use a series of mysnprintf() calls and advance the
pointer for each one. Once the pointer goes beyond the end of the buffer,
the count will go negative, but since it's an unsigned type it will be
seen as excessively huge instead. This should not be a problem, as there's
no reason for ZDoom to be using text buffers larger than 2 GB anywhere.
- Ripped out the disabled bit from FGameConfigFile::MigrateOldConfig().
- Changed CalcMapName() to return an FString instead of a pointer to a static
buffer.
- Changed startmap in d_main.cpp into an FString.
- Changed CheckWarpTransMap() to take an FString& as the first argument.
- Changed d_mapname in g_level.cpp into an FString.
- Changed DoSubstitution() in ct_chat.cpp to place the substitutions in an
FString.
- Fixed: The MAPINFO parser wrote into the string buffer to construct a map
name when given a Hexen map number. This was fine with the old scanner
code, but only a happy coincidence prevents it from crashing with the new
code
- Added the 'B' conversion specifier to StringFormat::VWorker() for printing
binary numbers.
- Added CMake support for building with MinGW, MSYS, and NMake. Linux support
is probably broken until I get around to booting into Linux again. Niceties
provided over the existing Makefiles they're replacing:
* All command-line builds can use the same build system, rather than having
a separate one for MinGW and another for Linux.
* Microsoft's NMake tool is supported as a target.
* Progress meters.
* Parallel makes work from a fresh checkout without needing to be primed
first with a single-threaded make.
* Porting to other architectures should be simplified, whenever that day
comes.
- Replaced the makewad tool with zipdir. This handles the dependency tracking
itself instead of generating an external makefile to do it, since I couldn't
figure out how to generate a makefile with an external tool and include it
with a CMake-generated makefile. Where makewad used a master list of files
to generate the package file, zipdir just zips the entire contents of one or
more directories.
- Added the gdtoa package from netlib's fp library so that ZDoom's printf-style
formatting can be entirely independant of the CRT.
SVN r1082 (trunk)
2008-07-23 04:57:26 +00:00
|
|
|
mysnprintf (moneystr, countof(moneystr), "%s for %u", rsp->Reply, rsp->Count[0]);
|
2006-02-24 04:48:15 +00:00
|
|
|
reply->Reply = copystring (moneystr);
|
|
|
|
reply->NeedsGold = true;
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
reply->Reply = copystring (rsp->Reply);
|
|
|
|
reply->NeedsGold = false;
|
|
|
|
}
|
|
|
|
|
|
|
|
// QuickYes messages are shown when you meet the item checks.
|
|
|
|
// QuickNo messages are shown when you don't.
|
|
|
|
if (rsp->Yes[0] == '_' && rsp->Yes[1] == 0)
|
|
|
|
{
|
|
|
|
reply->QuickYes = NULL;
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
reply->QuickYes = ncopystring (rsp->Yes);
|
|
|
|
}
|
|
|
|
if (reply->ItemCheck[0] != 0)
|
|
|
|
{
|
|
|
|
reply->QuickNo = ncopystring (rsp->No);
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
reply->QuickNo = NULL;
|
|
|
|
}
|
|
|
|
reply->Next = *replyptr;
|
|
|
|
*replyptr = reply;
|
|
|
|
replyptr = &reply->Next;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
//============================================================================
|
|
|
|
//
|
|
|
|
// FStrifeDialogueNode :: ~FStrifeDialogueNode
|
|
|
|
//
|
|
|
|
//============================================================================
|
|
|
|
|
|
|
|
FStrifeDialogueNode::~FStrifeDialogueNode ()
|
|
|
|
{
|
|
|
|
if (SpeakerName != NULL) delete[] SpeakerName;
|
|
|
|
if (Dialogue != NULL) delete[] Dialogue;
|
|
|
|
FStrifeDialogueReply *tokill = Children;
|
|
|
|
while (tokill != NULL)
|
|
|
|
{
|
|
|
|
FStrifeDialogueReply *next = tokill->Next;
|
|
|
|
delete tokill;
|
|
|
|
tokill = next;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
//============================================================================
|
|
|
|
//
|
|
|
|
// FStrifeDialogueReply :: ~FStrifeDialogueReply
|
|
|
|
//
|
|
|
|
//============================================================================
|
|
|
|
|
|
|
|
FStrifeDialogueReply::~FStrifeDialogueReply ()
|
|
|
|
{
|
|
|
|
if (Reply != NULL) delete[] Reply;
|
|
|
|
if (QuickYes != NULL) delete[] QuickYes;
|
|
|
|
if (QuickNo != NULL) delete[] QuickNo;
|
|
|
|
if (ReplyLines != NULL) V_FreeBrokenLines (ReplyLines);
|
|
|
|
}
|
|
|
|
|
|
|
|
//============================================================================
|
|
|
|
//
|
|
|
|
// FindNode
|
|
|
|
//
|
|
|
|
// Returns the index that matches the given conversation node.
|
|
|
|
//
|
|
|
|
//============================================================================
|
|
|
|
|
|
|
|
static int FindNode (const FStrifeDialogueNode *node)
|
|
|
|
{
|
|
|
|
int rootnode = 0;
|
|
|
|
|
|
|
|
while (StrifeDialogues[rootnode] != node)
|
|
|
|
{
|
|
|
|
rootnode++;
|
|
|
|
}
|
|
|
|
return rootnode;
|
|
|
|
}
|
|
|
|
|
|
|
|
//============================================================================
|
|
|
|
//
|
|
|
|
// CheckStrifeItem
|
|
|
|
//
|
|
|
|
// Checks if you have an item. A NULL itemtype is always considered to be
|
|
|
|
// present.
|
|
|
|
//
|
|
|
|
//============================================================================
|
|
|
|
|
2008-03-26 08:29:02 +00:00
|
|
|
static bool CheckStrifeItem (player_t *player, const PClass *itemtype, int amount=-1)
|
2006-02-24 04:48:15 +00:00
|
|
|
{
|
|
|
|
AInventory *item;
|
|
|
|
|
|
|
|
if (itemtype == NULL || amount == 0)
|
|
|
|
return true;
|
|
|
|
|
2008-03-26 08:29:02 +00:00
|
|
|
item = player->ConversationPC->FindInventory (itemtype);
|
2006-02-24 04:48:15 +00:00
|
|
|
if (item == NULL)
|
|
|
|
return false;
|
|
|
|
|
|
|
|
return amount < 0 || item->Amount >= amount;
|
|
|
|
}
|
|
|
|
|
|
|
|
//============================================================================
|
|
|
|
//
|
|
|
|
// TakeStrifeItem
|
|
|
|
//
|
|
|
|
// Takes away some of an item, unless that item is special and should not
|
|
|
|
// be removed.
|
|
|
|
//
|
|
|
|
//============================================================================
|
|
|
|
|
2008-03-26 08:29:02 +00:00
|
|
|
static void TakeStrifeItem (player_t *player, const PClass *itemtype, int amount)
|
2006-02-24 04:48:15 +00:00
|
|
|
{
|
|
|
|
if (itemtype == NULL || amount == 0)
|
|
|
|
return;
|
|
|
|
|
|
|
|
// Don't take quest items.
|
2006-05-10 02:40:43 +00:00
|
|
|
if (itemtype->IsDescendantOf (PClass::FindClass(NAME_QuestItem)))
|
2006-02-24 04:48:15 +00:00
|
|
|
return;
|
|
|
|
|
|
|
|
// Don't take keys
|
|
|
|
if (itemtype->IsDescendantOf (RUNTIME_CLASS(AKey)))
|
|
|
|
return;
|
|
|
|
|
|
|
|
// Don't take the sigil
|
|
|
|
if (itemtype == RUNTIME_CLASS(ASigil))
|
|
|
|
return;
|
|
|
|
|
2008-03-26 08:29:02 +00:00
|
|
|
Net_WriteByte (DEM_CONVERSATION);
|
|
|
|
Net_WriteByte (CONV_TAKEINVENTORY);
|
|
|
|
Net_WriteString (itemtype->TypeName.GetChars ());
|
|
|
|
Net_WriteWord (amount);
|
2006-02-24 04:48:15 +00:00
|
|
|
}
|
|
|
|
|
2006-04-14 12:58:52 +00:00
|
|
|
CUSTOM_CVAR(Float, dlg_musicvolume, 1.0f, CVAR_ARCHIVE)
|
|
|
|
{
|
|
|
|
if (self < 0.f) self = 0.f;
|
|
|
|
else if (self > 1.f) self = 1.f;
|
|
|
|
}
|
|
|
|
|
2006-02-24 04:48:15 +00:00
|
|
|
//============================================================================
|
|
|
|
//
|
|
|
|
// P_StartConversation
|
|
|
|
//
|
|
|
|
// Begins a conversation between a PC and NPC.
|
|
|
|
//
|
|
|
|
//============================================================================
|
|
|
|
|
2006-07-29 01:26:24 +00:00
|
|
|
void P_StartConversation (AActor *npc, AActor *pc, bool facetalker, bool saveangle)
|
2006-02-24 04:48:15 +00:00
|
|
|
{
|
2006-07-29 01:26:24 +00:00
|
|
|
AActor *oldtarget;
|
2006-02-24 04:48:15 +00:00
|
|
|
FStrifeDialogueReply *reply;
|
|
|
|
menuitem_t item;
|
|
|
|
const char *toSay;
|
|
|
|
int i, j;
|
|
|
|
|
2008-03-26 08:29:02 +00:00
|
|
|
// [CW] If an NPC is talking to a PC already, then don't let
|
2008-03-29 22:59:41 +00:00
|
|
|
// anyone else talk to the NPC.
|
2008-03-26 08:29:02 +00:00
|
|
|
for (i = 0; i < MAXPLAYERS; i++)
|
|
|
|
{
|
|
|
|
if (!playeringame[i] || pc->player == &players[i])
|
|
|
|
continue;
|
|
|
|
|
|
|
|
if (npc == players[i].ConversationNPC)
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
2006-02-24 04:48:15 +00:00
|
|
|
pc->momx = pc->momy = 0; // Stop moving
|
|
|
|
pc->player->momx = pc->player->momy = 0;
|
|
|
|
|
2008-03-26 08:29:02 +00:00
|
|
|
pc->player->ConversationPC = pc;
|
|
|
|
pc->player->ConversationNPC = npc;
|
2006-02-24 04:48:15 +00:00
|
|
|
|
|
|
|
CurNode = npc->Conversation;
|
|
|
|
|
|
|
|
if (pc->player == &players[consoleplayer])
|
|
|
|
{
|
2008-07-23 19:39:01 +00:00
|
|
|
S_Sound (CHAN_VOICE | CHAN_UI, gameinfo.chatSound, 1, ATTN_NONE);
|
2006-02-24 04:48:15 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
npc->reactiontime = 2;
|
2008-03-26 08:29:02 +00:00
|
|
|
pc->player->ConversationFaceTalker = facetalker;
|
2006-07-29 01:26:24 +00:00
|
|
|
if (saveangle)
|
2006-02-24 04:48:15 +00:00
|
|
|
{
|
2008-03-26 08:29:02 +00:00
|
|
|
pc->player->ConversationNPCAngle = npc->angle;
|
2006-02-24 04:48:15 +00:00
|
|
|
}
|
2006-07-29 01:26:24 +00:00
|
|
|
oldtarget = npc->target;
|
|
|
|
npc->target = pc;
|
2006-06-03 12:30:11 +00:00
|
|
|
if (facetalker)
|
|
|
|
{
|
|
|
|
A_FaceTarget (npc);
|
|
|
|
pc->angle = R_PointToAngle2 (pc->x, pc->y, npc->x, npc->y);
|
|
|
|
}
|
2006-07-29 01:26:24 +00:00
|
|
|
if ((npc->flags & MF_FRIENDLY) || (npc->flags4 & MF4_NOHATEPLAYERS))
|
|
|
|
{
|
|
|
|
npc->target = oldtarget;
|
|
|
|
}
|
2006-02-24 04:48:15 +00:00
|
|
|
|
|
|
|
// Check if we should jump to another node
|
|
|
|
while (CurNode->ItemCheck[0] != NULL)
|
|
|
|
{
|
2008-03-26 08:29:02 +00:00
|
|
|
if (CheckStrifeItem (pc->player, CurNode->ItemCheck[0]) &&
|
|
|
|
CheckStrifeItem (pc->player, CurNode->ItemCheck[1]) &&
|
|
|
|
CheckStrifeItem (pc->player, CurNode->ItemCheck[2]))
|
2006-02-24 04:48:15 +00:00
|
|
|
{
|
2008-03-26 08:29:02 +00:00
|
|
|
int root = FindNode (pc->player->ConversationNPC->GetDefault()->Conversation);
|
2006-02-24 04:48:15 +00:00
|
|
|
CurNode = StrifeDialogues[root + CurNode->ItemCheckNode - 1];
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
if (CurNode->SpeakerVoice != 0)
|
|
|
|
{
|
2008-03-26 08:29:02 +00:00
|
|
|
I_SetMusicVolume (dlg_musicvolume);
|
2008-06-15 02:25:09 +00:00
|
|
|
S_Sound (npc, CHAN_VOICE|CHAN_NOPAUSE, CurNode->SpeakerVoice, 1, ATTN_NORM);
|
2006-02-24 04:48:15 +00:00
|
|
|
}
|
|
|
|
|
2008-03-26 08:29:02 +00:00
|
|
|
if (pc->player != &players[consoleplayer])
|
|
|
|
return;
|
|
|
|
|
2006-02-24 04:48:15 +00:00
|
|
|
// Set up the menu
|
|
|
|
ConversationMenu.PreDraw = DrawConversationMenu;
|
2006-07-29 01:26:24 +00:00
|
|
|
ConversationMenu.EscapeHandler = ConversationMenuEscaped;
|
2006-02-24 04:48:15 +00:00
|
|
|
|
|
|
|
// Format the speaker's message.
|
|
|
|
toSay = CurNode->Dialogue;
|
|
|
|
if (strncmp (toSay, "RANDOM_", 7) == 0)
|
|
|
|
{
|
2006-05-11 12:11:59 +00:00
|
|
|
FString dlgtext;
|
|
|
|
|
|
|
|
dlgtext.Format("TXT_%s_%02d", toSay, 1+(pr_randomspeech() % NUM_RANDOM_LINES));
|
|
|
|
toSay = GStrings[dlgtext.GetChars()];
|
|
|
|
if (toSay==NULL) toSay = "Go away!"; // Ok, it's lame - but it doesn't look like an error to the player. ;)
|
2006-02-24 04:48:15 +00:00
|
|
|
}
|
2006-09-19 23:25:51 +00:00
|
|
|
DialogueLines = V_BreakLines (screen->Font, screen->GetWidth()/CleanXfac-24*2, toSay);
|
2006-02-24 04:48:15 +00:00
|
|
|
|
|
|
|
// Fill out the possible choices
|
|
|
|
ShowGold = false;
|
|
|
|
item.type = numberedmore;
|
|
|
|
item.e.mfunc = PickConversationReply;
|
|
|
|
for (reply = CurNode->Children, i = 1; reply != NULL; reply = reply->Next)
|
|
|
|
{
|
|
|
|
if (reply->Reply == NULL)
|
|
|
|
{
|
|
|
|
continue;
|
|
|
|
}
|
|
|
|
ShowGold |= reply->NeedsGold;
|
2006-09-19 23:25:51 +00:00
|
|
|
reply->ReplyLines = V_BreakLines (screen->Font, 320-50-10, reply->Reply);
|
2006-08-31 00:16:12 +00:00
|
|
|
for (j = 0; reply->ReplyLines[j].Width >= 0; ++j)
|
2006-02-24 04:48:15 +00:00
|
|
|
{
|
2006-08-31 00:16:12 +00:00
|
|
|
item.label = reply->ReplyLines[j].Text.LockBuffer();
|
2006-02-24 04:48:15 +00:00
|
|
|
item.b.position = j == 0 ? i : 0;
|
|
|
|
item.c.extra = reply;
|
|
|
|
ConversationItems.Push (item);
|
|
|
|
}
|
|
|
|
++i;
|
|
|
|
}
|
2006-05-11 12:11:59 +00:00
|
|
|
char goodbye[25];
|
About a week's worth of changes here. As a heads-up, I wouldn't be
surprised if this doesn't build in Linux right now. The CMakeLists.txt
were checked with MinGW and NMake, but how they fair under Linux is an
unknown to me at this time.
- Converted most sprintf (and all wsprintf) calls to either mysnprintf or
FStrings, depending on the situation.
- Changed the strings in the wbstartstruct to be FStrings.
- Changed myvsnprintf() to output nothing if count is greater than INT_MAX.
This is so that I can use a series of mysnprintf() calls and advance the
pointer for each one. Once the pointer goes beyond the end of the buffer,
the count will go negative, but since it's an unsigned type it will be
seen as excessively huge instead. This should not be a problem, as there's
no reason for ZDoom to be using text buffers larger than 2 GB anywhere.
- Ripped out the disabled bit from FGameConfigFile::MigrateOldConfig().
- Changed CalcMapName() to return an FString instead of a pointer to a static
buffer.
- Changed startmap in d_main.cpp into an FString.
- Changed CheckWarpTransMap() to take an FString& as the first argument.
- Changed d_mapname in g_level.cpp into an FString.
- Changed DoSubstitution() in ct_chat.cpp to place the substitutions in an
FString.
- Fixed: The MAPINFO parser wrote into the string buffer to construct a map
name when given a Hexen map number. This was fine with the old scanner
code, but only a happy coincidence prevents it from crashing with the new
code
- Added the 'B' conversion specifier to StringFormat::VWorker() for printing
binary numbers.
- Added CMake support for building with MinGW, MSYS, and NMake. Linux support
is probably broken until I get around to booting into Linux again. Niceties
provided over the existing Makefiles they're replacing:
* All command-line builds can use the same build system, rather than having
a separate one for MinGW and another for Linux.
* Microsoft's NMake tool is supported as a target.
* Progress meters.
* Parallel makes work from a fresh checkout without needing to be primed
first with a single-threaded make.
* Porting to other architectures should be simplified, whenever that day
comes.
- Replaced the makewad tool with zipdir. This handles the dependency tracking
itself instead of generating an external makefile to do it, since I couldn't
figure out how to generate a makefile with an external tool and include it
with a CMake-generated makefile. Where makewad used a master list of files
to generate the package file, zipdir just zips the entire contents of one or
more directories.
- Added the gdtoa package from netlib's fp library so that ZDoom's printf-style
formatting can be entirely independant of the CRT.
SVN r1082 (trunk)
2008-07-23 04:57:26 +00:00
|
|
|
mysnprintf(goodbye, countof(goodbye), "TXT_RANDOMGOODBYE_%d", 1+(pr_randomspeech() % NUM_RANDOM_GOODBYES));
|
2006-05-11 12:11:59 +00:00
|
|
|
item.label = (char*)GStrings[goodbye];
|
|
|
|
if (item.label == NULL) item.label = "Bye.";
|
2006-02-24 04:48:15 +00:00
|
|
|
item.b.position = i;
|
|
|
|
item.c.extra = NULL;
|
|
|
|
ConversationItems.Push (item);
|
|
|
|
|
|
|
|
// Determine where the top of the reply list should be positioned.
|
|
|
|
i = (gameinfo.gametype & GAME_Raven) ? 9 : 8;
|
|
|
|
ConversationMenu.y = MIN<int> (140, 192 - ConversationItems.Size() * i);
|
2006-08-31 00:16:12 +00:00
|
|
|
for (i = 0; DialogueLines[i].Width >= 0; ++i)
|
2006-02-24 04:48:15 +00:00
|
|
|
{ }
|
|
|
|
i = 44 + i * 10;
|
|
|
|
if (ConversationMenu.y - 100 < i - screen->GetHeight() / CleanYfac / 2)
|
|
|
|
{
|
|
|
|
ConversationMenu.y = i - screen->GetHeight() / CleanYfac / 2 + 100;
|
|
|
|
}
|
|
|
|
ConversationMenu.indent = 50;
|
|
|
|
|
|
|
|
// Finish setting up the menu
|
|
|
|
ConversationMenu.items = &ConversationItems[0];
|
|
|
|
ConversationMenu.numitems = ConversationItems.Size();
|
|
|
|
if (CurNode != PrevNode)
|
|
|
|
{ // Only reset the selection if showing a different menu.
|
|
|
|
ConversationMenu.lastOn = 0;
|
|
|
|
PrevNode = CurNode;
|
|
|
|
}
|
|
|
|
ConversationMenu.DontDim = true;
|
|
|
|
|
|
|
|
// And open the menu
|
|
|
|
M_StartControlPanel (false);
|
|
|
|
OptionsActive = true;
|
|
|
|
menuactive = MENU_OnNoPause;
|
|
|
|
ConversationPauseTic = gametic + 20;
|
|
|
|
M_SwitchMenu (&ConversationMenu);
|
|
|
|
}
|
|
|
|
|
|
|
|
//============================================================================
|
|
|
|
//
|
|
|
|
// P_ResumeConversation
|
|
|
|
//
|
|
|
|
// Resumes a conversation that was interrupted by a slideshow.
|
|
|
|
//
|
|
|
|
//============================================================================
|
|
|
|
|
|
|
|
void P_ResumeConversation ()
|
|
|
|
{
|
2008-03-26 08:29:02 +00:00
|
|
|
for (int i = 0; i < MAXPLAYERS; i++)
|
2006-02-24 04:48:15 +00:00
|
|
|
{
|
2008-03-26 08:29:02 +00:00
|
|
|
if (!playeringame[i])
|
|
|
|
continue;
|
|
|
|
|
|
|
|
player_t *p = &players[i];
|
|
|
|
|
|
|
|
if (p->ConversationPC != NULL && p->ConversationNPC != NULL)
|
|
|
|
{
|
|
|
|
P_StartConversation (p->ConversationNPC, p->ConversationPC, p->ConversationFaceTalker, false);
|
|
|
|
}
|
2006-02-24 04:48:15 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
//============================================================================
|
|
|
|
//
|
|
|
|
// DrawConversationMenu
|
|
|
|
//
|
|
|
|
//============================================================================
|
|
|
|
|
|
|
|
static void DrawConversationMenu ()
|
|
|
|
{
|
|
|
|
const char *speakerName;
|
|
|
|
int i, x, y, linesize;
|
|
|
|
|
2008-03-26 08:29:02 +00:00
|
|
|
player_t *cp = &players[consoleplayer];
|
|
|
|
|
2006-02-24 04:48:15 +00:00
|
|
|
assert (DialogueLines != NULL);
|
|
|
|
assert (CurNode != NULL);
|
|
|
|
|
|
|
|
if (CurNode == NULL)
|
|
|
|
{
|
|
|
|
M_ClearMenus ();
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
2008-03-29 22:59:41 +00:00
|
|
|
// [CW] Freeze the game depending on MAPINFO options.
|
|
|
|
if (ConversationPauseTic < gametic && !multiplayer && !(level.flags & LEVEL_CONV_SINGLE_UNFREEZE))
|
2006-02-24 04:48:15 +00:00
|
|
|
{
|
|
|
|
menuactive = MENU_On;
|
|
|
|
}
|
|
|
|
|
2008-06-15 18:36:26 +00:00
|
|
|
if (CurNode->Backdrop.isValid())
|
2006-02-24 04:48:15 +00:00
|
|
|
{
|
|
|
|
screen->DrawTexture (TexMan(CurNode->Backdrop), 0, 0, DTA_320x200, true, TAG_DONE);
|
|
|
|
}
|
|
|
|
x = 16 * screen->GetWidth() / 320;
|
|
|
|
y = 16 * screen->GetHeight() / 200;
|
|
|
|
linesize = 10 * CleanYfac;
|
|
|
|
|
|
|
|
// Who is talking to you?
|
|
|
|
if (CurNode->SpeakerName != NULL)
|
|
|
|
{
|
|
|
|
speakerName = CurNode->SpeakerName;
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
2008-03-26 08:29:02 +00:00
|
|
|
speakerName = cp->ConversationNPC->GetClass()->Meta.GetMetaString (AMETA_StrifeName);
|
2006-02-24 04:48:15 +00:00
|
|
|
if (speakerName == NULL)
|
|
|
|
{
|
|
|
|
speakerName = "Person";
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
// Dim the screen behind the dialogue (but only if there is no backdrop).
|
2008-06-15 18:36:26 +00:00
|
|
|
if (!CurNode->Backdrop.isValid())
|
2006-02-24 04:48:15 +00:00
|
|
|
{
|
2006-08-31 00:16:12 +00:00
|
|
|
for (i = 0; DialogueLines[i].Width >= 0; ++i)
|
2006-02-24 04:48:15 +00:00
|
|
|
{ }
|
|
|
|
screen->Dim (0, 0.45f, 14 * screen->GetWidth() / 320, 13 * screen->GetHeight() / 200,
|
|
|
|
308 * screen->GetWidth() / 320 - 14 * screen->GetWidth () / 320,
|
|
|
|
speakerName == NULL ? linesize * i + 6 * CleanYfac
|
|
|
|
: linesize * i + 6 * CleanYfac + linesize * 3/2);
|
|
|
|
}
|
|
|
|
|
|
|
|
// Dim the screen behind the PC's choices.
|
|
|
|
screen->Dim (0, 0.45f, (24-160) * CleanXfac + screen->GetWidth()/2,
|
|
|
|
(ConversationMenu.y - 2 - 100) * CleanYfac + screen->GetHeight()/2,
|
|
|
|
272 * CleanXfac,
|
|
|
|
MIN(ConversationMenu.numitems * (gameinfo.gametype & GAME_Raven ? 9 : 8) + 4,
|
|
|
|
200 - ConversationMenu.y) * CleanYfac);
|
|
|
|
|
|
|
|
if (speakerName != NULL)
|
|
|
|
{
|
|
|
|
screen->DrawText (CR_WHITE, x, y, speakerName,
|
|
|
|
DTA_CleanNoMove, true, TAG_DONE);
|
|
|
|
y += linesize * 3 / 2;
|
|
|
|
}
|
|
|
|
x = 24 * screen->GetWidth() / 320;
|
2006-08-31 00:16:12 +00:00
|
|
|
for (i = 0; DialogueLines[i].Width >= 0; ++i)
|
2006-02-24 04:48:15 +00:00
|
|
|
{
|
2006-08-31 00:16:12 +00:00
|
|
|
screen->DrawText (CR_UNTRANSLATED, x, y, DialogueLines[i].Text,
|
2006-02-24 04:48:15 +00:00
|
|
|
DTA_CleanNoMove, true, TAG_DONE);
|
|
|
|
y += linesize;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (ShowGold)
|
|
|
|
{
|
2008-03-26 08:29:02 +00:00
|
|
|
AInventory *coin = cp->ConversationPC->FindInventory (RUNTIME_CLASS(ACoin));
|
2006-02-24 04:48:15 +00:00
|
|
|
char goldstr[32];
|
|
|
|
|
About a week's worth of changes here. As a heads-up, I wouldn't be
surprised if this doesn't build in Linux right now. The CMakeLists.txt
were checked with MinGW and NMake, but how they fair under Linux is an
unknown to me at this time.
- Converted most sprintf (and all wsprintf) calls to either mysnprintf or
FStrings, depending on the situation.
- Changed the strings in the wbstartstruct to be FStrings.
- Changed myvsnprintf() to output nothing if count is greater than INT_MAX.
This is so that I can use a series of mysnprintf() calls and advance the
pointer for each one. Once the pointer goes beyond the end of the buffer,
the count will go negative, but since it's an unsigned type it will be
seen as excessively huge instead. This should not be a problem, as there's
no reason for ZDoom to be using text buffers larger than 2 GB anywhere.
- Ripped out the disabled bit from FGameConfigFile::MigrateOldConfig().
- Changed CalcMapName() to return an FString instead of a pointer to a static
buffer.
- Changed startmap in d_main.cpp into an FString.
- Changed CheckWarpTransMap() to take an FString& as the first argument.
- Changed d_mapname in g_level.cpp into an FString.
- Changed DoSubstitution() in ct_chat.cpp to place the substitutions in an
FString.
- Fixed: The MAPINFO parser wrote into the string buffer to construct a map
name when given a Hexen map number. This was fine with the old scanner
code, but only a happy coincidence prevents it from crashing with the new
code
- Added the 'B' conversion specifier to StringFormat::VWorker() for printing
binary numbers.
- Added CMake support for building with MinGW, MSYS, and NMake. Linux support
is probably broken until I get around to booting into Linux again. Niceties
provided over the existing Makefiles they're replacing:
* All command-line builds can use the same build system, rather than having
a separate one for MinGW and another for Linux.
* Microsoft's NMake tool is supported as a target.
* Progress meters.
* Parallel makes work from a fresh checkout without needing to be primed
first with a single-threaded make.
* Porting to other architectures should be simplified, whenever that day
comes.
- Replaced the makewad tool with zipdir. This handles the dependency tracking
itself instead of generating an external makefile to do it, since I couldn't
figure out how to generate a makefile with an external tool and include it
with a CMake-generated makefile. Where makewad used a master list of files
to generate the package file, zipdir just zips the entire contents of one or
more directories.
- Added the gdtoa package from netlib's fp library so that ZDoom's printf-style
formatting can be entirely independant of the CRT.
SVN r1082 (trunk)
2008-07-23 04:57:26 +00:00
|
|
|
mysnprintf (goldstr, countof(goldstr), "%d", coin != NULL ? coin->Amount : 0);
|
2006-02-24 04:48:15 +00:00
|
|
|
screen->DrawText (CR_GRAY, 21, 191, goldstr, DTA_320x200, true,
|
|
|
|
DTA_FillColor, 0, DTA_Alpha, HR_SHADOW, TAG_DONE);
|
|
|
|
screen->DrawTexture (TexMan(((AInventory *)GetDefaultByType (RUNTIME_CLASS(ACoin)))->Icon),
|
|
|
|
3, 190, DTA_320x200, true,
|
|
|
|
DTA_FillColor, 0, DTA_Alpha, HR_SHADOW, TAG_DONE);
|
|
|
|
screen->DrawText (CR_GRAY, 20, 190, goldstr, DTA_320x200, true, TAG_DONE);
|
|
|
|
screen->DrawTexture (TexMan(((AInventory *)GetDefaultByType (RUNTIME_CLASS(ACoin)))->Icon),
|
|
|
|
2, 189, DTA_320x200, true, TAG_DONE);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
//============================================================================
|
|
|
|
//
|
|
|
|
// PickConversationReply
|
|
|
|
//
|
|
|
|
//============================================================================
|
|
|
|
|
|
|
|
static void PickConversationReply ()
|
|
|
|
{
|
|
|
|
const char *replyText = NULL;
|
|
|
|
FStrifeDialogueReply *reply = (FStrifeDialogueReply *)ConversationItems[ConversationMenu.lastOn].c.extra;
|
|
|
|
int i;
|
2008-03-26 08:29:02 +00:00
|
|
|
player_t *cp = &players[consoleplayer];
|
|
|
|
|
|
|
|
Conversation_TakeStuff = false;
|
2006-02-24 04:48:15 +00:00
|
|
|
|
|
|
|
M_ClearMenus ();
|
|
|
|
CleanupConversationMenu ();
|
|
|
|
if (reply == NULL)
|
|
|
|
{
|
2008-03-26 08:29:02 +00:00
|
|
|
Net_WriteByte (DEM_CONVERSATION);
|
|
|
|
Net_WriteByte (CONV_NPCANGLE);
|
2006-02-24 04:48:15 +00:00
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
|
|
|
// Check if you have the requisite items for this choice
|
|
|
|
for (i = 0; i < 3; ++i)
|
|
|
|
{
|
2008-03-26 08:29:02 +00:00
|
|
|
if (!CheckStrifeItem (cp, reply->ItemCheck[i], reply->ItemCheckAmount[i]))
|
2006-02-24 04:48:15 +00:00
|
|
|
{
|
|
|
|
// No, you don't. Say so and let the NPC animate negatively.
|
|
|
|
if (reply->QuickNo)
|
|
|
|
{
|
|
|
|
Printf ("%s\n", reply->QuickNo);
|
|
|
|
}
|
2008-03-26 08:29:02 +00:00
|
|
|
Net_WriteByte (DEM_CONVERSATION);
|
|
|
|
Net_WriteByte (CONV_ANIMATE);
|
|
|
|
Net_WriteByte (2);
|
|
|
|
|
|
|
|
Net_WriteByte (DEM_CONVERSATION);
|
|
|
|
Net_WriteByte (CONV_NPCANGLE);
|
2006-02-24 04:48:15 +00:00
|
|
|
return;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
// Yay, you do! Let the NPC animate affirmatively.
|
2008-03-26 08:29:02 +00:00
|
|
|
Net_WriteByte (DEM_CONVERSATION);
|
|
|
|
Net_WriteByte (CONV_ANIMATE);
|
|
|
|
Net_WriteByte (1);
|
2006-02-24 04:48:15 +00:00
|
|
|
|
|
|
|
// If this reply gives you something, then try to receive it.
|
2008-03-26 08:29:02 +00:00
|
|
|
Conversation_TakeStuff = true;
|
2006-02-24 04:48:15 +00:00
|
|
|
if (reply->GiveType != NULL)
|
|
|
|
{
|
2006-04-13 16:52:24 +00:00
|
|
|
if (reply->GiveType->IsDescendantOf(RUNTIME_CLASS(AInventory)))
|
2006-02-24 04:48:15 +00:00
|
|
|
{
|
2006-04-13 16:52:24 +00:00
|
|
|
if (reply->GiveType->IsDescendantOf(RUNTIME_CLASS(AWeapon)))
|
2006-04-11 16:27:41 +00:00
|
|
|
{
|
2008-03-26 08:29:02 +00:00
|
|
|
if (cp->mo->FindInventory(reply->GiveType) != NULL)
|
2006-04-13 16:52:24 +00:00
|
|
|
{
|
2008-03-26 08:29:02 +00:00
|
|
|
Conversation_TakeStuff = false;
|
2006-04-13 16:52:24 +00:00
|
|
|
}
|
2006-04-11 16:27:41 +00:00
|
|
|
}
|
2006-04-13 16:52:24 +00:00
|
|
|
|
2008-03-26 08:29:02 +00:00
|
|
|
if (Conversation_TakeStuff)
|
2006-04-11 16:27:41 +00:00
|
|
|
{
|
2008-03-26 08:29:02 +00:00
|
|
|
Net_WriteByte (DEM_CONVERSATION);
|
|
|
|
Net_WriteByte (CONV_GIVEINVENTORY);
|
|
|
|
Net_WriteString (reply->GiveType->TypeName.GetChars ());
|
2006-04-11 16:27:41 +00:00
|
|
|
}
|
2008-03-26 08:29:02 +00:00
|
|
|
|
|
|
|
if (reply->GiveType->IsDescendantOf (RUNTIME_CLASS (ASlideshowStarter)))
|
|
|
|
gameaction = ga_slideshow;
|
2006-02-24 04:48:15 +00:00
|
|
|
}
|
2006-04-13 16:52:24 +00:00
|
|
|
else
|
|
|
|
{
|
|
|
|
// Trying to give a non-inventory item.
|
2008-03-26 08:29:02 +00:00
|
|
|
Conversation_TakeStuff = false;
|
2006-05-10 02:40:43 +00:00
|
|
|
Printf("Attempting to give non-inventory item %s\n", reply->GiveType->TypeName.GetChars());
|
2006-04-13 16:52:24 +00:00
|
|
|
}
|
2006-02-24 04:48:15 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
// Take away required items if the give was successful or none was needed.
|
2008-03-26 08:29:02 +00:00
|
|
|
if (Conversation_TakeStuff)
|
2006-02-24 04:48:15 +00:00
|
|
|
{
|
|
|
|
for (i = 0; i < 3; ++i)
|
|
|
|
{
|
2008-03-26 08:29:02 +00:00
|
|
|
TakeStrifeItem (&players[consoleplayer], reply->ItemCheck[i], reply->ItemCheckAmount[i]);
|
2006-02-24 04:48:15 +00:00
|
|
|
}
|
|
|
|
replyText = reply->QuickYes;
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
replyText = "You seem to have enough!";
|
|
|
|
}
|
|
|
|
|
|
|
|
// Update the quest log, if needed.
|
2008-03-26 08:29:02 +00:00
|
|
|
if (reply->LogNumber != 0)
|
2006-02-24 04:48:15 +00:00
|
|
|
{
|
2008-03-26 08:29:02 +00:00
|
|
|
cp->SetLogNumber (reply->LogNumber);
|
2006-02-24 04:48:15 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
if (replyText != NULL)
|
|
|
|
{
|
|
|
|
Printf ("%s\n", replyText);
|
|
|
|
}
|
|
|
|
|
|
|
|
// Does this reply alter the speaker's conversation node? If NextNode is positive,
|
2008-03-26 08:29:02 +00:00
|
|
|
// the next time they talk, they will show the new node. If it is negative, then they
|
2006-02-24 04:48:15 +00:00
|
|
|
// will show the new node right away without terminating the dialogue.
|
|
|
|
if (reply->NextNode != 0)
|
|
|
|
{
|
2008-03-26 08:29:02 +00:00
|
|
|
int rootnode = FindNode (cp->ConversationNPC->GetDefault()->Conversation);
|
2006-02-24 04:48:15 +00:00
|
|
|
if (reply->NextNode < 0)
|
|
|
|
{
|
2008-03-26 08:29:02 +00:00
|
|
|
cp->ConversationNPC->Conversation = StrifeDialogues[rootnode - reply->NextNode - 1];
|
2006-02-24 04:48:15 +00:00
|
|
|
if (gameaction != ga_slideshow)
|
|
|
|
{
|
2008-03-26 08:29:02 +00:00
|
|
|
P_StartConversation (cp->ConversationNPC, cp->mo, cp->ConversationFaceTalker, false);
|
2006-02-24 04:48:15 +00:00
|
|
|
return;
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
2008-03-26 08:29:02 +00:00
|
|
|
S_StopSound (cp->ConversationNPC, CHAN_VOICE);
|
2006-02-24 04:48:15 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
2008-03-26 08:29:02 +00:00
|
|
|
cp->ConversationNPC->Conversation = StrifeDialogues[rootnode + reply->NextNode - 1];
|
2006-02-24 04:48:15 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2008-03-26 08:29:02 +00:00
|
|
|
Net_WriteByte (DEM_CONVERSATION);
|
|
|
|
Net_WriteByte (CONV_NPCANGLE);
|
|
|
|
|
2008-03-29 22:59:41 +00:00
|
|
|
// [CW] Set these to NULL because we're not using to them
|
|
|
|
// anymore. However, this can interfere with slideshows
|
|
|
|
// so we don't set them to NULL in that case.
|
2008-03-26 08:29:02 +00:00
|
|
|
if (gameaction != ga_slideshow)
|
|
|
|
{
|
|
|
|
Net_WriteByte (DEM_CONVERSATION);
|
|
|
|
Net_WriteByte (CONV_SETNULL);
|
|
|
|
}
|
|
|
|
|
|
|
|
I_SetMusicVolume (1.f);
|
2006-02-24 04:48:15 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
//============================================================================
|
|
|
|
//
|
|
|
|
// CleanupConversationMenu
|
|
|
|
//
|
|
|
|
// Release the resources used to create the most recent conversation menu.
|
|
|
|
//
|
|
|
|
//============================================================================
|
|
|
|
|
|
|
|
void CleanupConversationMenu ()
|
|
|
|
{
|
|
|
|
FStrifeDialogueReply *reply;
|
|
|
|
|
|
|
|
if (CurNode != NULL)
|
|
|
|
{
|
|
|
|
for (reply = CurNode->Children; reply != NULL; reply = reply->Next)
|
|
|
|
{
|
|
|
|
if (reply->ReplyLines != NULL)
|
|
|
|
{
|
|
|
|
V_FreeBrokenLines (reply->ReplyLines);
|
|
|
|
reply->ReplyLines = NULL;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
CurNode = NULL;
|
|
|
|
}
|
|
|
|
if (DialogueLines != NULL)
|
|
|
|
{
|
|
|
|
V_FreeBrokenLines (DialogueLines);
|
|
|
|
DialogueLines = NULL;
|
|
|
|
}
|
|
|
|
ConversationItems.Clear ();
|
2008-03-26 08:29:02 +00:00
|
|
|
I_SetMusicVolume (1.f);
|
2006-02-24 04:48:15 +00:00
|
|
|
}
|
|
|
|
|
2006-07-29 01:26:24 +00:00
|
|
|
//============================================================================
|
|
|
|
//
|
|
|
|
// ConversationMenuEscaped
|
|
|
|
//
|
2008-03-26 08:29:02 +00:00
|
|
|
// Called when the user presses escape to leave the conversation menu.
|
2006-07-29 01:26:24 +00:00
|
|
|
//
|
|
|
|
//============================================================================
|
|
|
|
|
|
|
|
void ConversationMenuEscaped ()
|
|
|
|
{
|
|
|
|
CleanupConversationMenu ();
|
2008-03-26 08:29:02 +00:00
|
|
|
|
|
|
|
Net_WriteByte (DEM_CONVERSATION);
|
|
|
|
Net_WriteByte (CONV_NPCANGLE);
|
|
|
|
|
|
|
|
Net_WriteByte (DEM_CONVERSATION);
|
|
|
|
Net_WriteByte (CONV_SETNULL);
|
|
|
|
}
|
|
|
|
|
|
|
|
//============================================================================
|
|
|
|
//
|
|
|
|
// P_ConversationCommand
|
|
|
|
//
|
|
|
|
// Complete a conversation command.
|
|
|
|
//
|
|
|
|
//============================================================================
|
|
|
|
|
|
|
|
void P_ConversationCommand (int player, BYTE **stream)
|
|
|
|
{
|
|
|
|
int type = ReadByte (stream);
|
|
|
|
|
|
|
|
switch (type)
|
|
|
|
{
|
|
|
|
case CONV_NPCANGLE:
|
|
|
|
players[player].ConversationNPC->angle = players[player].ConversationNPCAngle;
|
|
|
|
break;
|
|
|
|
|
|
|
|
case CONV_ANIMATE:
|
|
|
|
players[player].ConversationNPC->ConversationAnimation (ReadByte (stream));
|
|
|
|
break;
|
|
|
|
|
|
|
|
case CONV_GIVEINVENTORY:
|
|
|
|
{
|
|
|
|
AInventory *item = static_cast<AInventory *> (Spawn (ReadString (stream), 0, 0, 0, NO_REPLACE));
|
|
|
|
// Items given here should not count as items!
|
|
|
|
if (item->flags & MF_COUNTITEM)
|
|
|
|
{
|
|
|
|
level.total_items--;
|
|
|
|
item->flags &= ~MF_COUNTITEM;
|
|
|
|
}
|
2008-08-08 10:24:08 +00:00
|
|
|
if (item->GetClass()->TypeName == NAME_FlameThrower)
|
2008-03-26 08:29:02 +00:00
|
|
|
{
|
|
|
|
// The flame thrower gives less ammo when given in a dialog
|
|
|
|
static_cast<AWeapon*>(item)->AmmoGive1 = 40;
|
|
|
|
}
|
|
|
|
item->flags |= MF_DROPPED;
|
2008-09-13 22:08:41 +00:00
|
|
|
if (!item->CallTryPickup (players[player].mo))
|
2008-03-26 08:29:02 +00:00
|
|
|
{
|
|
|
|
item->Destroy ();
|
|
|
|
Conversation_TakeStuff = false;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
break;
|
|
|
|
|
|
|
|
case CONV_TAKEINVENTORY:
|
|
|
|
{
|
|
|
|
AInventory *item = players[player].ConversationPC->FindInventory (PClass::FindClass (ReadString (stream)));
|
|
|
|
|
|
|
|
if (item != NULL)
|
|
|
|
{
|
|
|
|
item->Amount -= ReadWord (stream);
|
|
|
|
if (item->Amount <= 0)
|
|
|
|
{
|
|
|
|
item->Destroy ();
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
break;
|
|
|
|
|
|
|
|
case CONV_SETNULL:
|
2008-04-06 09:24:41 +00:00
|
|
|
players[player].ConversationFaceTalker = false;
|
2008-03-26 08:29:02 +00:00
|
|
|
players[player].ConversationNPC = NULL;
|
|
|
|
players[player].ConversationPC = NULL;
|
2008-04-06 09:24:41 +00:00
|
|
|
players[player].ConversationNPCAngle = 0;
|
2008-03-26 08:29:02 +00:00
|
|
|
break;
|
|
|
|
|
|
|
|
default:
|
|
|
|
break;
|
|
|
|
}
|
2006-07-29 01:26:24 +00:00
|
|
|
}
|