diff --git a/Descent3/Briefing.cpp b/Descent3/Briefing.cpp index 67846bb1..fa4b2ee5 100644 --- a/Descent3/Briefing.cpp +++ b/Descent3/Briefing.cpp @@ -247,7 +247,7 @@ static int skipped_screens; static bool IsMissionMaskOK(uint32_t set, uint32_t unset); static void ReplaceHotTag(char *string, int tag); -static bool ParseForHotTags(char *src, char **dest); +static bool ParseForHotTags(const char *src, char **dest); static bool PlayBriefing(tTelComInfo *tcs); static void PBAddTextEffect(TCTEXTDESC* desc, char *text, char *description, int id); static void PBAddBmpEffect(TCBMPDESC* desc, char *description); @@ -297,7 +297,7 @@ void ReplaceHotTag(char *string, int tag) { // returns true if there were hot tags and it had to allocate memory for dest (so it needs to be freed) #define MEMORY_BLOCK 50 -bool ParseForHotTags(char *src, char **dest) { +bool ParseForHotTags(const char *src, char **dest) { bool ret = false; const char *curr_ptr = src; char *dest_ptr; diff --git a/Descent3/room.h b/Descent3/room.h index df071443..c6c49da1 100644 --- a/Descent3/room.h +++ b/Descent3/room.h @@ -560,7 +560,7 @@ static inline int GetFacePhysicsFlags(const room *rp, const face *fp) { // Computes a bounding sphere for the current room // Parameters: center - filled in with the center point of the sphere -// rp - the room were bounding +// rp - the room we're bounding // Returns: the radius of the bounding sphere float ComputeRoomBoundingSphere(vector *center, room *rp); diff --git a/editor/ObjCScript.cpp b/editor/ObjCScript.cpp index d1cb5e91..c89597a3 100644 --- a/editor/ObjCScript.cpp +++ b/editor/ObjCScript.cpp @@ -143,7 +143,7 @@ char *Level_script_source = NULL; //Table of scripts within script file tScriptName Script_names[MAX_SCRIPTS]; -#if 0 // LGT: MAX_SCREVTS undefined +#define MAX_SCREVTS 15 // INCREMENT MAX_SCREVTS in ObjCScript when you add a new event! char *Script_evt_names[MAX_SCREVTS] = { "EVT_AI_FRAME", @@ -163,6 +163,7 @@ char *Script_evt_names[MAX_SCREVTS] = { "EVT_CLIENT_DESTROY", }; +#if 0 // LGT - EVT_X undefined uint16_t Script_evt_ids[MAX_SCREVTS] = { EVT_AI_FRAME, EVT_AI_NOTIFY, diff --git a/editor/ScriptWizard.cpp b/editor/ScriptWizard.cpp index e3832afa..346e675f 100644 --- a/editor/ScriptWizard.cpp +++ b/editor/ScriptWizard.cpp @@ -109,6 +109,7 @@ static char THIS_FILE[] = __FILE__; #endif +#define MAX_SCREVTS 15 ///////////////////////////////////////////////////////////////////////////// // CScriptWizard dialog @@ -616,9 +617,8 @@ void CScriptWizard::UpdateEventListbox() scrlistbox->GetText(m_CurScriptSel, scrname); id = FindScriptIDFromName(scrname); - // LGT- MAX_SCREVTS undefined - // for (i = 0; i < MAX_SCREVTS; i++) - // listbox->AddString(Script_evt_names[i]); + for (i = 0; i < MAX_SCREVTS; i++) + listbox->AddString(Script_evt_names[i]); listbox->SetCurSel(m_CurEventSel); } diff --git a/netgames/dmfc/dmfccfg.cpp b/netgames/dmfc/dmfccfg.cpp index 8cc30036..2bb8631a 100644 --- a/netgames/dmfc/dmfccfg.cpp +++ b/netgames/dmfc/dmfccfg.cpp @@ -48,8 +48,6 @@ * $NoKeywords: $ */ -#include - #include "gamedll_header.h" #include "DMFC.h" #include "dmfcinternal.h"