2006-02-24 04:48:15 +00:00
|
|
|
/*
|
|
|
|
** dobject.cpp
|
|
|
|
** Implements the base class DObject, which most other classes derive from
|
|
|
|
**
|
|
|
|
**---------------------------------------------------------------------------
|
|
|
|
** Copyright 1998-2005 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.
|
|
|
|
**---------------------------------------------------------------------------
|
|
|
|
**
|
|
|
|
*/
|
|
|
|
|
|
|
|
#include <stdlib.h>
|
|
|
|
#include <string.h>
|
|
|
|
|
|
|
|
#include "cmdlib.h"
|
|
|
|
#include "actor.h"
|
|
|
|
#include "dobject.h"
|
|
|
|
#include "m_alloc.h"
|
|
|
|
#include "doomstat.h" // Ideally, DObjects can be used independant of Doom.
|
|
|
|
#include "d_player.h" // See p_user.cpp to find out why this doesn't work.
|
|
|
|
#include "g_game.h" // Needed for bodyque.
|
|
|
|
#include "c_dispatch.h"
|
|
|
|
#include "i_system.h"
|
|
|
|
#include "r_state.h"
|
|
|
|
#include "stats.h"
|
|
|
|
|
|
|
|
#include "autosegs.h"
|
|
|
|
|
2006-05-10 02:40:43 +00:00
|
|
|
PClass DObject::_StaticType;
|
|
|
|
ClassReg DObject::RegistrationInfo =
|
2006-02-24 04:48:15 +00:00
|
|
|
{
|
2006-05-10 02:40:43 +00:00
|
|
|
&DObject::_StaticType, // MyClass
|
|
|
|
"DObject", // Name
|
|
|
|
NULL, // ParentType
|
|
|
|
sizeof(DObject), // SizeOf
|
|
|
|
NULL, // Pointers
|
|
|
|
&DObject::InPlaceConstructor // ConstructNative
|
2006-02-24 04:48:15 +00:00
|
|
|
};
|
2006-05-10 02:40:43 +00:00
|
|
|
_DECLARE_TI(DObject)
|
2006-02-24 04:48:15 +00:00
|
|
|
|
|
|
|
static cycle_t StaleCycles;
|
|
|
|
static int StaleCount;
|
|
|
|
|
|
|
|
FMetaTable::~FMetaTable ()
|
|
|
|
{
|
|
|
|
FreeMeta ();
|
|
|
|
}
|
|
|
|
|
|
|
|
FMetaTable::FMetaTable (const FMetaTable &other)
|
|
|
|
{
|
|
|
|
Meta = NULL;
|
|
|
|
CopyMeta (&other);
|
|
|
|
}
|
|
|
|
|
|
|
|
FMetaTable &FMetaTable::operator = (const FMetaTable &other)
|
|
|
|
{
|
|
|
|
CopyMeta (&other);
|
|
|
|
return *this;
|
|
|
|
}
|
|
|
|
|
|
|
|
void FMetaTable::FreeMeta ()
|
|
|
|
{
|
|
|
|
while (Meta != NULL)
|
|
|
|
{
|
|
|
|
FMetaData *meta = Meta;
|
|
|
|
|
|
|
|
switch (meta->Type)
|
|
|
|
{
|
|
|
|
case META_String:
|
2006-05-09 03:40:15 +00:00
|
|
|
delete[] meta->Value.String;
|
2006-02-24 04:48:15 +00:00
|
|
|
break;
|
|
|
|
default:
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
Meta = meta->Next;
|
|
|
|
delete meta;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
void FMetaTable::CopyMeta (const FMetaTable *other)
|
|
|
|
{
|
|
|
|
const FMetaData *meta_src;
|
|
|
|
FMetaData **meta_dest;
|
|
|
|
|
|
|
|
FreeMeta ();
|
|
|
|
|
|
|
|
meta_src = other->Meta;
|
|
|
|
meta_dest = &Meta;
|
|
|
|
while (meta_src != NULL)
|
|
|
|
{
|
|
|
|
FMetaData *newmeta = new FMetaData (meta_src->Type, meta_src->ID);
|
|
|
|
switch (meta_src->Type)
|
|
|
|
{
|
|
|
|
case META_String:
|
|
|
|
newmeta->Value.String = copystring (meta_src->Value.String);
|
|
|
|
break;
|
|
|
|
default:
|
|
|
|
newmeta->Value = meta_src->Value;
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
*meta_dest = newmeta;
|
|
|
|
meta_dest = &newmeta->Next;
|
|
|
|
meta_src = meta_src->Next;
|
|
|
|
}
|
|
|
|
*meta_dest = NULL;
|
|
|
|
}
|
|
|
|
|
|
|
|
FMetaData *FMetaTable::FindMeta (EMetaType type, DWORD id) const
|
|
|
|
{
|
|
|
|
FMetaData *meta = Meta;
|
|
|
|
|
|
|
|
while (meta != NULL)
|
|
|
|
{
|
|
|
|
if (meta->ID == id && meta->Type == type)
|
|
|
|
{
|
|
|
|
return meta;
|
|
|
|
}
|
|
|
|
meta = meta->Next;
|
|
|
|
}
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
|
|
|
|
FMetaData *FMetaTable::FindMetaDef (EMetaType type, DWORD id)
|
|
|
|
{
|
|
|
|
FMetaData *meta = FindMeta (type, id);
|
|
|
|
if (meta == NULL)
|
|
|
|
{
|
|
|
|
meta = new FMetaData (type, id);
|
|
|
|
meta->Next = Meta;
|
|
|
|
meta->Value.String = NULL;
|
|
|
|
Meta = meta;
|
|
|
|
}
|
|
|
|
return meta;
|
|
|
|
}
|
|
|
|
|
|
|
|
void FMetaTable::SetMetaInt (DWORD id, int parm)
|
|
|
|
{
|
|
|
|
FMetaData *meta = FindMetaDef (META_Int, id);
|
|
|
|
meta->Value.Int = parm;
|
|
|
|
}
|
|
|
|
|
2006-03-03 03:57:01 +00:00
|
|
|
int FMetaTable::GetMetaInt (DWORD id, int def) const
|
2006-02-24 04:48:15 +00:00
|
|
|
{
|
|
|
|
FMetaData *meta = FindMeta (META_Int, id);
|
2006-03-03 03:57:01 +00:00
|
|
|
return meta != NULL ? meta->Value.Int : def;
|
2006-02-24 04:48:15 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
void FMetaTable::SetMetaFixed (DWORD id, fixed_t parm)
|
|
|
|
{
|
|
|
|
FMetaData *meta = FindMetaDef (META_Fixed, id);
|
|
|
|
meta->Value.Fixed = parm;
|
|
|
|
}
|
|
|
|
|
2006-03-03 03:57:01 +00:00
|
|
|
fixed_t FMetaTable::GetMetaFixed (DWORD id, fixed_t def) const
|
2006-02-24 04:48:15 +00:00
|
|
|
{
|
|
|
|
FMetaData *meta = FindMeta (META_Fixed, id);
|
2006-03-03 03:57:01 +00:00
|
|
|
return meta != NULL ? meta->Value.Fixed : def;
|
2006-02-24 04:48:15 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
void FMetaTable::SetMetaString (DWORD id, const char *parm)
|
|
|
|
{
|
|
|
|
FMetaData *meta = FindMetaDef (META_String, id);
|
|
|
|
ReplaceString (&meta->Value.String, parm);
|
|
|
|
}
|
|
|
|
|
|
|
|
const char *FMetaTable::GetMetaString (DWORD id) const
|
|
|
|
{
|
|
|
|
FMetaData *meta = FindMeta (META_String, id);
|
|
|
|
return meta != NULL ? meta->Value.String : NULL;
|
|
|
|
}
|
|
|
|
|
|
|
|
CCMD (dumpclasses)
|
|
|
|
{
|
2006-05-10 02:40:43 +00:00
|
|
|
// This is by no means speed-optimized. But it's an informational console
|
|
|
|
// command that will be executed infrequently, so I don't mind.
|
|
|
|
struct DumpInfo
|
|
|
|
{
|
|
|
|
const PClass *Type;
|
|
|
|
DumpInfo *Next;
|
|
|
|
DumpInfo *Children;
|
|
|
|
|
|
|
|
static DumpInfo *FindType (DumpInfo *root, const PClass *type)
|
|
|
|
{
|
|
|
|
if (root == NULL)
|
|
|
|
{
|
|
|
|
return root;
|
|
|
|
}
|
|
|
|
if (root->Type == type)
|
|
|
|
{
|
|
|
|
return root;
|
|
|
|
}
|
|
|
|
if (root->Next != NULL)
|
|
|
|
{
|
|
|
|
return FindType (root->Next, type);
|
|
|
|
}
|
|
|
|
if (root->Children != NULL)
|
|
|
|
{
|
|
|
|
return FindType (root->Children, type);
|
|
|
|
}
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
|
|
|
|
static DumpInfo *AddType (DumpInfo **root, const PClass *type)
|
|
|
|
{
|
|
|
|
DumpInfo *info, *parentInfo;
|
|
|
|
|
|
|
|
if (*root == NULL)
|
|
|
|
{
|
|
|
|
info = new DumpInfo;
|
|
|
|
info->Type = type;
|
|
|
|
info->Next = NULL;
|
|
|
|
info->Children = *root;
|
|
|
|
*root = info;
|
|
|
|
return info;
|
|
|
|
}
|
|
|
|
if (type->ParentClass == (*root)->Type)
|
|
|
|
{
|
|
|
|
parentInfo = *root;
|
|
|
|
}
|
|
|
|
else if (type == (*root)->Type)
|
|
|
|
{
|
|
|
|
return *root;
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
parentInfo = FindType (*root, type->ParentClass);
|
|
|
|
if (parentInfo == NULL)
|
|
|
|
{
|
|
|
|
parentInfo = AddType (root, type->ParentClass);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
// Has this type already been added?
|
|
|
|
for (info = parentInfo->Children; info != NULL; info = info->Next)
|
|
|
|
{
|
|
|
|
if (info->Type == type)
|
|
|
|
{
|
|
|
|
return info;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
info = new DumpInfo;
|
|
|
|
info->Type = type;
|
|
|
|
info->Next = parentInfo->Children;
|
|
|
|
info->Children = NULL;
|
|
|
|
parentInfo->Children = info;
|
|
|
|
return info;
|
|
|
|
}
|
|
|
|
|
|
|
|
static void PrintTree (DumpInfo *root, int level)
|
|
|
|
{
|
|
|
|
Printf ("%*c%s\n", level, ' ', root->Type->TypeName.GetChars());
|
|
|
|
if (root->Children != NULL)
|
|
|
|
{
|
|
|
|
PrintTree (root->Children, level + 2);
|
|
|
|
}
|
|
|
|
if (root->Next != NULL)
|
|
|
|
{
|
|
|
|
PrintTree (root->Next, level);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
static void FreeTree (DumpInfo *root)
|
|
|
|
{
|
|
|
|
if (root->Children != NULL)
|
|
|
|
{
|
|
|
|
FreeTree (root->Children);
|
|
|
|
}
|
|
|
|
if (root->Next != NULL)
|
|
|
|
{
|
|
|
|
FreeTree (root->Next);
|
|
|
|
}
|
|
|
|
delete root;
|
|
|
|
}
|
|
|
|
};
|
|
|
|
|
2006-02-24 04:48:15 +00:00
|
|
|
int i;
|
|
|
|
int shown, omitted;
|
2006-05-10 02:40:43 +00:00
|
|
|
DumpInfo *tree = NULL;
|
|
|
|
const PClass *root = NULL;
|
2006-02-24 04:48:15 +00:00
|
|
|
bool showall = true;
|
|
|
|
|
|
|
|
if (argv.argc() > 1)
|
|
|
|
{
|
2006-05-10 02:40:43 +00:00
|
|
|
root = PClass::FindClass (argv[1]);
|
2006-02-24 04:48:15 +00:00
|
|
|
if (root == NULL)
|
|
|
|
{
|
|
|
|
Printf ("Class '%s' not found\n", argv[1]);
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
if (stricmp (argv[1], "Actor") == 0)
|
|
|
|
{
|
|
|
|
if (argv.argc() < 3 || stricmp (argv[2], "all") != 0)
|
|
|
|
{
|
|
|
|
showall = false;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
shown = omitted = 0;
|
2006-05-10 02:40:43 +00:00
|
|
|
DumpInfo::AddType (&tree, root != NULL ? root : RUNTIME_CLASS(DObject));
|
|
|
|
for (i = 0; i < PClass::m_Types.Size(); i++)
|
2006-02-24 04:48:15 +00:00
|
|
|
{
|
2006-05-10 02:40:43 +00:00
|
|
|
PClass *cls = PClass::m_Types[i];
|
2006-02-24 04:48:15 +00:00
|
|
|
if (root == NULL ||
|
2006-05-10 02:40:43 +00:00
|
|
|
(cls->IsDescendantOf (root) &&
|
|
|
|
(showall || cls == root ||
|
|
|
|
cls->ActorInfo != root->ActorInfo)))
|
2006-02-24 04:48:15 +00:00
|
|
|
{
|
2006-05-10 02:40:43 +00:00
|
|
|
DumpInfo::AddType (&tree, cls);
|
|
|
|
// Printf (" %s\n", PClass::m_Types[i]->Name + 1);
|
2006-02-24 04:48:15 +00:00
|
|
|
shown++;
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
omitted++;
|
|
|
|
}
|
|
|
|
}
|
2006-05-10 02:40:43 +00:00
|
|
|
DumpInfo::PrintTree (tree, 2);
|
|
|
|
DumpInfo::FreeTree (tree);
|
2006-02-24 04:48:15 +00:00
|
|
|
Printf ("%d classes shown, %d omitted\n", shown, omitted);
|
|
|
|
}
|
|
|
|
|
2006-05-06 23:43:44 +00:00
|
|
|
TArray<DObject *> DObject::Objects (TArray<DObject *>::NoInit);
|
|
|
|
TArray<size_t> DObject::FreeIndices (TArray<size_t>::NoInit);
|
|
|
|
TArray<DObject *> DObject::ToDestroy (TArray<DObject *>::NoInit);
|
2006-02-24 04:48:15 +00:00
|
|
|
bool DObject::Inactive;
|
|
|
|
|
2006-05-10 02:40:43 +00:00
|
|
|
void DObject::InPlaceConstructor (void *mem)
|
|
|
|
{
|
|
|
|
new ((EInPlace *)mem) DObject;
|
|
|
|
}
|
|
|
|
|
2006-02-24 04:48:15 +00:00
|
|
|
DObject::DObject ()
|
|
|
|
: ObjectFlags(0), Class(0)
|
|
|
|
{
|
|
|
|
if (FreeIndices.Pop (Index))
|
2006-05-10 02:40:43 +00:00
|
|
|
Objects[Index] = this;
|
2006-02-24 04:48:15 +00:00
|
|
|
else
|
|
|
|
Index = Objects.Push (this);
|
|
|
|
}
|
|
|
|
|
2006-05-10 02:40:43 +00:00
|
|
|
DObject::DObject (PClass *inClass)
|
2006-02-24 04:48:15 +00:00
|
|
|
: ObjectFlags(0), Class(inClass)
|
|
|
|
{
|
|
|
|
if (FreeIndices.Pop (Index))
|
2006-05-10 02:40:43 +00:00
|
|
|
Objects[Index] = this;
|
2006-02-24 04:48:15 +00:00
|
|
|
else
|
|
|
|
Index = Objects.Push (this);
|
|
|
|
}
|
|
|
|
|
|
|
|
DObject::~DObject ()
|
|
|
|
{
|
|
|
|
if (!Inactive)
|
|
|
|
{
|
|
|
|
if (!(ObjectFlags & OF_MassDestruction))
|
|
|
|
{
|
|
|
|
RemoveFromArray ();
|
|
|
|
DestroyScan (this);
|
|
|
|
}
|
|
|
|
else if (!(ObjectFlags & OF_Cleanup))
|
|
|
|
{
|
|
|
|
// object is queued for deletion, but is not being deleted
|
|
|
|
// by the destruction process, so remove it from the
|
|
|
|
// ToDestroy array and do other necessary stuff.
|
|
|
|
unsigned int i;
|
|
|
|
|
|
|
|
for (i = ToDestroy.Size() - 1; i-- > 0; )
|
|
|
|
{
|
|
|
|
if (ToDestroy[i] == this)
|
|
|
|
{
|
|
|
|
ToDestroy[i] = NULL;
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
DestroyScan (this);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
void DObject::Destroy ()
|
|
|
|
{
|
|
|
|
if (!Inactive)
|
|
|
|
{
|
|
|
|
if (!(ObjectFlags & OF_MassDestruction))
|
|
|
|
{
|
|
|
|
RemoveFromArray ();
|
|
|
|
ObjectFlags |= OF_MassDestruction;
|
|
|
|
ToDestroy.Push (this);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
else
|
|
|
|
delete this;
|
|
|
|
}
|
|
|
|
|
|
|
|
void DObject::BeginFrame ()
|
|
|
|
{
|
|
|
|
StaleCycles = 0;
|
|
|
|
StaleCount = 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
void DObject::EndFrame ()
|
|
|
|
{
|
|
|
|
clock (StaleCycles);
|
|
|
|
if (ToDestroy.Size ())
|
|
|
|
{
|
|
|
|
StaleCount += (int)ToDestroy.Size ();
|
|
|
|
DestroyScan ();
|
|
|
|
//Printf ("Destroyed %d objects\n", ToDestroy.Size());
|
|
|
|
|
|
|
|
DObject *obj;
|
|
|
|
while (ToDestroy.Pop (obj))
|
|
|
|
{
|
|
|
|
if (obj)
|
|
|
|
{
|
|
|
|
obj->ObjectFlags |= OF_Cleanup;
|
|
|
|
delete obj;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
unclock (StaleCycles);
|
|
|
|
}
|
|
|
|
|
|
|
|
void DObject::RemoveFromArray ()
|
|
|
|
{
|
|
|
|
if (Objects.Size() == Index + 1)
|
|
|
|
{
|
|
|
|
DObject *dummy;
|
|
|
|
Objects.Pop (dummy);
|
|
|
|
}
|
|
|
|
else if (Objects.Size() > Index)
|
|
|
|
{
|
2006-05-10 02:40:43 +00:00
|
|
|
Objects[Index] = NULL;
|
2006-02-24 04:48:15 +00:00
|
|
|
FreeIndices.Push (Index);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
void DObject::PointerSubstitution (DObject *old, DObject *notOld)
|
|
|
|
{
|
|
|
|
unsigned int i, highest;
|
|
|
|
highest = Objects.Size ();
|
|
|
|
|
|
|
|
for (i = 0; i <= highest; i++)
|
|
|
|
{
|
|
|
|
DObject *current = i < highest ? Objects[i] : &bglobal;
|
|
|
|
if (current)
|
|
|
|
{
|
2006-05-10 02:40:43 +00:00
|
|
|
const PClass *info = current->GetClass();
|
2006-02-24 04:48:15 +00:00
|
|
|
const size_t *offsets = info->FlatPointers;
|
|
|
|
if (offsets == NULL)
|
|
|
|
{
|
2006-05-10 02:40:43 +00:00
|
|
|
const_cast<PClass *>(info)->BuildFlatPointers();
|
2006-02-24 04:48:15 +00:00
|
|
|
offsets = info->FlatPointers;
|
|
|
|
}
|
|
|
|
while (*offsets != ~(size_t)0)
|
|
|
|
{
|
|
|
|
if (*(DObject **)((BYTE *)current + *offsets) == old)
|
|
|
|
{
|
|
|
|
*(DObject **)((BYTE *)current + *offsets) = notOld;
|
|
|
|
}
|
|
|
|
offsets++;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
for (i = 0; i < BODYQUESIZE; ++i)
|
|
|
|
{
|
|
|
|
if (bodyque[i] == old)
|
|
|
|
{
|
|
|
|
bodyque[i] = static_cast<AActor *>(notOld);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
// This is an ugly hack, but it's the best I can do for now.
|
|
|
|
for (i = 0; i < MAXPLAYERS; i++)
|
|
|
|
{
|
|
|
|
if (playeringame[i])
|
|
|
|
players[i].FixPointers (old, notOld);
|
|
|
|
}
|
- Fixed compilation with mingw again.
- Added multiple-choice sound sequences. These overcome one of the major
deficiences of the Hexen-inherited SNDSEQ system while still being Hexen
compatible: Custom door sounds can now use different opening and closing
sequences, for both normal and blazing speeds.
- Added a serializer for TArray.
- Added a countof macro to doomtype.h. See the1's blog to find out why
it's implemented the way it is.
<http://blogs.msdn.com/the1/articles/210011.aspx>
- Added a new method to FRandom for getting random numbers larger than 255,
which lets me:
- Fixed: SNDSEQ delayrand commands could delay for no more than 255 tics.
- Fixed: If you're going to have sector_t.SoundTarget, then they need to
be included in the pointer cleanup scans.
- Ported back newer name code from 2.1.
- Fixed: Using -warp with only one parameter in Doom and Heretic to
select a map on episode 1 no longer worked.
- New: Loading a multiplayer save now restores the players based on
their names rather than on their connection order. Using connection
order was sensible when -net was the only way to start a network game,
but with -host/-join, it's not so nice. Also, if there aren't enough
players in the save, then the extra players will be spawned normally,
so you can continue a saved game with more players than you started it
with.
- Added some new SNDSEQ commands to make it possible to define Heretic's
ambient sounds in SNDSEQ: volumerel, volumerand, slot, randomsequence,
delayonce, and restart. With these, it is basically possible to obsolete
all of the $ambient SNDINFO commands.
- Fixed: Sound sequences would only execute one command each time they were
ticked.
- Fixed: No bounds checking was done on the volume sound sequences played at.
- Fixed: The tic parameter to playloop was useless and caused it to
act like a redundant playrepeat. I have removed all the logic that
caused playloop to play repeating sounds, and now it acts like an
infinite sequence of play/delay commands until the sequence is
stopped.
- Fixed: Sound sequences were ticked every frame, not every tic, so all
the delay commands were timed incorrectly and varied depending on your
framerate. Since this is useful for restarting looping sounds that got
cut off, I have not changed this. Instead, the delay commands now
record the tic when execution should resume, not the number of tics
left to delay.
SVN r57 (trunk)
2006-04-21 01:22:55 +00:00
|
|
|
|
|
|
|
for (i = 0; i < numsectors; ++i)
|
|
|
|
{
|
|
|
|
if (sectors[i].SoundTarget == old)
|
|
|
|
{
|
|
|
|
sectors[i].SoundTarget = static_cast<AActor *>(notOld);
|
|
|
|
}
|
|
|
|
}
|
2006-02-24 04:48:15 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
// Search for references to a single object and NULL them.
|
|
|
|
// It should not be listed in ToDestroy.
|
|
|
|
void DObject::DestroyScan (DObject *obj)
|
|
|
|
{
|
|
|
|
PointerSubstitution (obj, NULL);
|
|
|
|
}
|
|
|
|
|
|
|
|
// Search for references to all objects scheduled for
|
|
|
|
// destruction and NULL them.
|
|
|
|
void DObject::DestroyScan ()
|
|
|
|
{
|
|
|
|
unsigned int i, highest;
|
|
|
|
int j, destroycount;
|
|
|
|
DObject **destroybase;
|
|
|
|
destroycount = (int)ToDestroy.Size ();
|
|
|
|
if (destroycount == 0)
|
|
|
|
return;
|
|
|
|
destroybase = &ToDestroy[0] + destroycount;
|
|
|
|
destroycount = -destroycount;
|
|
|
|
highest = Objects.Size ();
|
|
|
|
|
|
|
|
for (i = 0; i <= highest; i++)
|
|
|
|
{
|
|
|
|
DObject *current = i < highest ? Objects[i] : &bglobal;
|
|
|
|
if (current)
|
|
|
|
{
|
2006-05-10 02:40:43 +00:00
|
|
|
const PClass *info = current->GetClass();
|
2006-02-24 04:48:15 +00:00
|
|
|
const size_t *offsets = info->FlatPointers;
|
|
|
|
if (offsets == NULL)
|
|
|
|
{
|
2006-05-10 02:40:43 +00:00
|
|
|
const_cast<PClass *>(info)->BuildFlatPointers();
|
2006-02-24 04:48:15 +00:00
|
|
|
offsets = info->FlatPointers;
|
|
|
|
}
|
|
|
|
while (*offsets != ~(size_t)0)
|
|
|
|
{
|
|
|
|
j = destroycount;
|
|
|
|
do
|
|
|
|
{
|
|
|
|
if (*(DObject **)((BYTE *)current + *offsets) == *(destroybase + j))
|
|
|
|
{
|
|
|
|
*(DObject **)((BYTE *)current + *offsets) = NULL;
|
|
|
|
}
|
|
|
|
} while (++j);
|
|
|
|
offsets++;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
j = destroycount;
|
|
|
|
do
|
|
|
|
{
|
|
|
|
for (i = 0; i < BODYQUESIZE; ++i)
|
|
|
|
{
|
|
|
|
if (bodyque[i] == *(destroybase + j))
|
|
|
|
{
|
|
|
|
bodyque[i] = NULL;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
} while (++j);
|
|
|
|
|
|
|
|
// This is an ugly hack, but it's the best I can do for now.
|
|
|
|
for (i = 0; i < MAXPLAYERS; i++)
|
|
|
|
{
|
|
|
|
if (playeringame[i])
|
|
|
|
{
|
|
|
|
j = destroycount;
|
|
|
|
do
|
|
|
|
{
|
|
|
|
players[i].FixPointers (*(destroybase + j), NULL);
|
|
|
|
} while (++j);
|
|
|
|
}
|
|
|
|
}
|
- Fixed compilation with mingw again.
- Added multiple-choice sound sequences. These overcome one of the major
deficiences of the Hexen-inherited SNDSEQ system while still being Hexen
compatible: Custom door sounds can now use different opening and closing
sequences, for both normal and blazing speeds.
- Added a serializer for TArray.
- Added a countof macro to doomtype.h. See the1's blog to find out why
it's implemented the way it is.
<http://blogs.msdn.com/the1/articles/210011.aspx>
- Added a new method to FRandom for getting random numbers larger than 255,
which lets me:
- Fixed: SNDSEQ delayrand commands could delay for no more than 255 tics.
- Fixed: If you're going to have sector_t.SoundTarget, then they need to
be included in the pointer cleanup scans.
- Ported back newer name code from 2.1.
- Fixed: Using -warp with only one parameter in Doom and Heretic to
select a map on episode 1 no longer worked.
- New: Loading a multiplayer save now restores the players based on
their names rather than on their connection order. Using connection
order was sensible when -net was the only way to start a network game,
but with -host/-join, it's not so nice. Also, if there aren't enough
players in the save, then the extra players will be spawned normally,
so you can continue a saved game with more players than you started it
with.
- Added some new SNDSEQ commands to make it possible to define Heretic's
ambient sounds in SNDSEQ: volumerel, volumerand, slot, randomsequence,
delayonce, and restart. With these, it is basically possible to obsolete
all of the $ambient SNDINFO commands.
- Fixed: Sound sequences would only execute one command each time they were
ticked.
- Fixed: No bounds checking was done on the volume sound sequences played at.
- Fixed: The tic parameter to playloop was useless and caused it to
act like a redundant playrepeat. I have removed all the logic that
caused playloop to play repeating sounds, and now it acts like an
infinite sequence of play/delay commands until the sequence is
stopped.
- Fixed: Sound sequences were ticked every frame, not every tic, so all
the delay commands were timed incorrectly and varied depending on your
framerate. Since this is useful for restarting looping sounds that got
cut off, I have not changed this. Instead, the delay commands now
record the tic when execution should resume, not the number of tics
left to delay.
SVN r57 (trunk)
2006-04-21 01:22:55 +00:00
|
|
|
|
|
|
|
for (i = 0; i < numsectors; ++i)
|
|
|
|
{
|
|
|
|
j = destroycount;
|
|
|
|
do
|
|
|
|
{
|
|
|
|
if (sectors[i].SoundTarget == *(destroybase + j))
|
|
|
|
{
|
|
|
|
sectors[i].SoundTarget = NULL;
|
|
|
|
}
|
|
|
|
} while (++j);
|
|
|
|
}
|
2006-02-24 04:48:15 +00:00
|
|
|
}
|
|
|
|
|
2006-05-12 03:14:40 +00:00
|
|
|
void DObject::StaticShutdown ()
|
2006-02-24 04:48:15 +00:00
|
|
|
{
|
|
|
|
Inactive = true;
|
|
|
|
}
|
|
|
|
|
|
|
|
void DObject::Serialize (FArchive &arc)
|
|
|
|
{
|
|
|
|
ObjectFlags |= OF_SerialSuccess;
|
|
|
|
}
|
|
|
|
|
|
|
|
void DObject::CheckIfSerialized () const
|
|
|
|
{
|
|
|
|
if (!(ObjectFlags & OF_SerialSuccess))
|
|
|
|
{
|
|
|
|
I_Error (
|
|
|
|
"BUG: %s::Serialize\n"
|
|
|
|
"(or one of its superclasses) needs to call\n"
|
|
|
|
"Super::Serialize\n",
|
2006-05-10 02:40:43 +00:00
|
|
|
StaticType()->TypeName.GetChars());
|
2006-02-24 04:48:15 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
ADD_STAT (destroys, out)
|
|
|
|
{
|
|
|
|
sprintf (out, "Pointer fixing: %d in %04.1f ms",
|
|
|
|
StaleCount, SecondsPerCycle * (double)StaleCycles * 1000);
|
|
|
|
}
|