zdoom/gzdoom
0
0
Fork 0
mirror of https://github.com/ZDoom/gzdoom.git synced 2024-11-18 02:12:00 +00:00
Code Issues Projects Releases Packages Wiki Activity
gzdoom/src/info.cpp

737 lines
20 KiB
C++
Raw Normal View History

Directory restructuring to make it easier to version projects that don't build zdoom.exe. SVN r4 (trunk)
2006-02-24 04:48:15 +00:00
/*
** info.cpp
** Keeps track of available actors and their states
**
**---------------------------------------------------------------------------
Guess what. It's not 2005 anymore. SVN r184 (trunk)
2006-06-11 01:37:00 +00:00
** Copyright 1998-2006 Randy Heit
Directory restructuring to make it easier to version projects that don't build zdoom.exe. SVN r4 (trunk)
2006-02-24 04:48:15 +00:00
** 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.
**---------------------------------------------------------------------------
**
** This is completely different from Doom's info.c.
**
*/
- rewrote p_local.h so that it doesn't pull in the entire bunch of headers. This was to resolve some circular dependencies with the portal code. The most notable changees: * FTextureID was moved from textures.h to doomtype.h because it is frequently needed in files that don't want to do anything with actual textures. * split off the parts from p_maputl into a separate header. * consolidated all blockmap related data into p_blockmap.h * split off the polyobject parts into po_man.h
2016-02-15 01:14:34 +00:00
#include "doomstat.h"
Directory restructuring to make it easier to version projects that don't build zdoom.exe. SVN r4 (trunk)
2006-02-24 04:48:15 +00:00
#include "info.h"
#include "m_fixed.h"
#include "c_dispatch.h"
- Cleaned up some include dependencies. SVN r1224 (trunk)
2008-09-14 23:54:38 +00:00
#include "d_net.h"
- Added Boom's stairbuilding fix when one step couldn't be built due to an active thinker in the sector. This is compatibility optioned with COMPAT_STAIRINDEX. Also added a compatibility setting for Eternal Doom MAP25 which relies on Doom's original broken behavior. - added a few sanity checks for duplicate actor names in DECORATE. ZDoom will now print more warnings and all crash cases should be properly handled but since this is still an error this will not work properly in all circumstances. For example, if you have a duplicate name all classes that inherit from the original definition will not survive a savegame if they reference a state belonging to that class at the point of saving. - Print 'tried to register class more than once' in red to highlight it. - fixed: actors may not replace themselves. SVN r2158 (trunk)
2010-02-13 08:56:08 +00:00
#include "v_text.h"
Directory restructuring to make it easier to version projects that don't build zdoom.exe. SVN r4 (trunk)
2006-02-24 04:48:15 +00:00
#include "gi.h"
- Make the autosegs read-only. - Derive PClass from dobject.cpp. This has one major ramification: Since the PClass is not allocated until runtime, you cannot initialize any static/global data structures with pointers to PClasses using RUNTIME_CLASS. Attempting to do so will just initialize with a NULL pointer. Instead, you can initialize using the address of the pointer returned by RUNTIME_CLASS and dereference that. By the time you have an opportunity to dereference it, it will no longer be NULL. - Sync CmakeLists.txt. - Random fixes for problems GCC spotted. SVN r1852 (scripting)
2009-09-17 01:36:14 +00:00
#include "vm.h"
Directory restructuring to make it easier to version projects that don't build zdoom.exe. SVN r4 (trunk)
2006-02-24 04:48:15 +00:00
#include "actor.h"
#include "r_state.h"
#include "i_system.h"
#include "p_local.h"
- Fixed: The global WeaponSection string was never freed. It has been replaced with an FString now. - Fixed: The music strings in the default level info were never freed and caused memory leaks when used repeatedly. - Fixed: The intermusic string in the level info was never freed. - Fixed: The default fire obituary should only be printed if the damage came from the environment. If it comes from a monster the monster specific obituary should be used instead. - Added custom damage types from the floating point test release. - Changed Pain Elemental's massacre check. Now A_PainDie checks for the damage type and doesn't spawn anything if it is NAME_Massacre. A_PainDie can also be used by other actors so a more generalized approach is needed than hard coding it into the Pain Elemental. - Converted a few of Doom's monsters to DECORATE because I couldn't test the first version of the custom state code with the corpses inheriting from them. - Added custom states from last year's floating point test release and fixed some bugs I found in that code. Unfortunately it wasn't all salvageable and it was easier to recreate some parts from scratch. SVN r368 (trunk)
2006-10-31 14:53:21 +00:00
#include "templates.h"
- Changed ACS's SetActorState so that it isn't limited to only one sublabel. This change also enables the implicit mapping of the old special death state names. SVN r515 (trunk)
2007-04-22 09:06:29 +00:00
#include "cmdlib.h"
- Added Gez's actor replacement per skill submission. SVN r1681 (trunk)
2009-06-26 17:17:52 +00:00
#include "g_level.h"
- Added tracking of time spent specifically in running action functions. I feel kind of stupid about this now. I spent three days trying to figure out why the VC++ debug version was so slow. It turns out I had a conditional breakpoint set in a high-traffic area. D'oh! The rest of this stuff should get merged into trunk: - Fixed: Writing to debugfile uses the standard fprintf, which does not understand %td on VC++. - Fixed: Instead of crashing when a sprite has been scaled to 0, just don't draw it. SVN r3896 (scripting)
2012-10-21 03:46:17 +00:00
#include "stats.h"
Use action function return value to make state jumps happen - The A_Jump family of action functions now return the state to jump to (NULL if no jump is to be taken) instead of jumping directly. It is the caller's responsibility to handle the jump. This will make it possible to use their results in if statements and do something other than jump. - DECORATE return statements can now return the result of a function (but not any random expression--it must be a function call). To make a jump happen from inside a multi-action block, you must return the value of an A_Jump function. e.g.: { return A_Jump(128, "SomeState"); } - The VMFunction class now contains its prototype instead of storing it at a higher level in PFunction. This is so that FState::CallAction can easily tell if a function returns a state. - Removed the FxTailable class because with explicit return statements, it's not useful anymore.
2016-02-19 02:39:40 +00:00
#include "thingdef/thingdef.h"
- rewrote p_local.h so that it doesn't pull in the entire bunch of headers. This was to resolve some circular dependencies with the portal code. The most notable changees: * FTextureID was moved from textures.h to doomtype.h because it is frequently needed in files that don't want to do anything with actual textures. * split off the parts from p_maputl into a separate header. * consolidated all blockmap related data into p_blockmap.h * split off the polyobject parts into po_man.h
2016-02-15 01:14:34 +00:00
#include "d_player.h"
Directory restructuring to make it easier to version projects that don't build zdoom.exe. SVN r4 (trunk)
2006-02-24 04:48:15 +00:00
- Added NULL checks to all places where class names are passed as DECORATE parameters. - All DECORATE parameters are passed as expressions now. This change allows for compile time checks of all class names being used in DECORATE so many incorrect definitions may output warnings now. - Changed DECORATE sound and color parameters to use expressions. - Changed: S_StopChannel now resets the actor's sound flags. The previous bug made me think that delaying this until FMod calls the end of sound callback may simply be too late. SVN r1276 (trunk)
2008-10-25 17:38:00 +00:00
extern void LoadActors ();
- init bot specific actor properties righr after parsing DECORATE, not when spawning the first bot (which is too late.) SVN r3032 (trunk)
2010-12-12 21:09:16 +00:00
extern void InitBotStuff();
- move static AM color initialization into the AM_StaticInit function. - move D_LoadWadSettings to keysections.cpp. - made some more data reloadable. - data structures filled by P_SetupLevel should be cleared before loading the level. They can remain non-empty in case of an error. There's probably more to fix here... - fixed: MidiDevices and MusicAliases were not cleared before reloading local SNDINFOs. - fixed signed/unsigned warnings in AddSwitchPair for real (GCC really allows -1u? MSVC prints a warning for that.) SVN r3036 (trunk)
2010-12-14 00:50:02 +00:00
extern void ClearStrifeTypes();
Directory restructuring to make it easier to version projects that don't build zdoom.exe. SVN r4 (trunk)
2006-02-24 04:48:15 +00:00
- Standardized use of PClassActor::AllActorClasses for iterating over all classes of actors instead of PClass::m_Types (now PClass::AllClasses). - Removed ClassIndex from PClass. It was only needed by FArchive, and maps take care of the problem just as well. - Moved PClass into a larger type system (which is likely to change some/lots once I try and actually use it and have a better feel for what I need from it). SVN r2281 (scripting)
2010-04-16 02:57:51 +00:00
TArray<PClassActor *> PClassActor::AllActorClasses;
- Fixed: pr_statetics must be named, since it's critical to sync. SVN r3962 (trunk)
2012-11-10 03:36:30 +00:00
FRandom FState::pr_statetics("StateTics");
- Standardized use of PClassActor::AllActorClasses for iterating over all classes of actors instead of PClass::m_Types (now PClass::AllClasses). - Removed ClassIndex from PClass. It was only needed by FArchive, and maps take care of the problem just as well. - Moved PClass into a larger type system (which is likely to change some/lots once I try and actually use it and have a better feel for what I need from it). SVN r2281 (scripting)
2010-04-16 02:57:51 +00:00
- Added tracking of time spent specifically in running action functions. I feel kind of stupid about this now. I spent three days trying to figure out why the VC++ debug version was so slow. It turns out I had a conditional breakpoint set in a high-traffic area. D'oh! The rest of this stuff should get merged into trunk: - Fixed: Writing to debugfile uses the standard fprintf, which does not understand %td on VC++. - Fixed: Instead of crashing when a sprite has been scaled to 0, just don't draw it. SVN r3896 (scripting)
2012-10-21 03:46:17 +00:00
cycle_t ActionCycles;
- some refactoring of olddecorations.cpp to move some repeated code into a subfunction.
2016-02-10 13:38:08 +00:00
void FState::SetAction(const char *name)
{
ActionFunc = FindGlobalActionFunction(name)->Variants[0].Implementation;
}
Use action function return value to make state jumps happen - The A_Jump family of action functions now return the state to jump to (NULL if no jump is to be taken) instead of jumping directly. It is the caller's responsibility to handle the jump. This will make it possible to use their results in if statements and do something other than jump. - DECORATE return statements can now return the result of a function (but not any random expression--it must be a function call). To make a jump happen from inside a multi-action block, you must return the value of an A_Jump function. e.g.: { return A_Jump(128, "SomeState"); } - The VMFunction class now contains its prototype instead of storing it at a higher level in PFunction. This is so that FState::CallAction can easily tell if a function returns a state. - Removed the FxTailable class because with explicit return statements, it's not useful anymore.
2016-02-19 02:39:40 +00:00
bool FState::CallAction(AActor *self, AActor *stateowner, FState **stateret)
- Make the autosegs read-only. - Derive PClass from dobject.cpp. This has one major ramification: Since the PClass is not allocated until runtime, you cannot initialize any static/global data structures with pointers to PClasses using RUNTIME_CLASS. Attempting to do so will just initialize with a NULL pointer. Instead, you can initialize using the address of the pointer returned by RUNTIME_CLASS and dereference that. By the time you have an opportunity to dereference it, it will no longer be NULL. - Sync CmakeLists.txt. - Random fixes for problems GCC spotted. SVN r1852 (scripting)
2009-09-17 01:36:14 +00:00
{
if (ActionFunc != NULL)
{
- Added tracking of time spent specifically in running action functions. I feel kind of stupid about this now. I spent three days trying to figure out why the VC++ debug version was so slow. It turns out I had a conditional breakpoint set in a high-traffic area. D'oh! The rest of this stuff should get merged into trunk: - Fixed: Writing to debugfile uses the standard fprintf, which does not understand %td on VC++. - Fixed: Instead of crashing when a sprite has been scaled to 0, just don't draw it. SVN r3896 (scripting)
2012-10-21 03:46:17 +00:00
ActionCycles.Clock();
Use action function return value to make state jumps happen - The A_Jump family of action functions now return the state to jump to (NULL if no jump is to be taken) instead of jumping directly. It is the caller's responsibility to handle the jump. This will make it possible to use their results in if statements and do something other than jump. - DECORATE return statements can now return the result of a function (but not any random expression--it must be a function call). To make a jump happen from inside a multi-action block, you must return the value of an A_Jump function. e.g.: { return A_Jump(128, "SomeState"); } - The VMFunction class now contains its prototype instead of storing it at a higher level in PFunction. This is so that FState::CallAction can easily tell if a function returns a state. - Removed the FxTailable class because with explicit return statements, it's not useful anymore.
2016-02-19 02:39:40 +00:00
- Added tracking of time spent specifically in running action functions. I feel kind of stupid about this now. I spent three days trying to figure out why the VC++ debug version was so slow. It turns out I had a conditional breakpoint set in a high-traffic area. D'oh! The rest of this stuff should get merged into trunk: - Fixed: Writing to debugfile uses the standard fprintf, which does not understand %td on VC++. - Fixed: Instead of crashing when a sprite has been scaled to 0, just don't draw it. SVN r3896 (scripting)
2012-10-21 03:46:17 +00:00
static VMFrameStack stack;
- Changed state calls to use the VM's standard return value mechanism. StateCallData has been removed as a result, so now action functions take a minimum of three parameters rather than four. SVN r3770 (scripting)
2012-07-17 05:31:41 +00:00
VMValue params[3] = { self, stateowner, VMValue(this, ATAG_STATE) };
Use action function return value to make state jumps happen - The A_Jump family of action functions now return the state to jump to (NULL if no jump is to be taken) instead of jumping directly. It is the caller's responsibility to handle the jump. This will make it possible to use their results in if statements and do something other than jump. - DECORATE return statements can now return the result of a function (but not any random expression--it must be a function call). To make a jump happen from inside a multi-action block, you must return the value of an A_Jump function. e.g.: { return A_Jump(128, "SomeState"); } - The VMFunction class now contains its prototype instead of storing it at a higher level in PFunction. This is so that FState::CallAction can easily tell if a function returns a state. - Removed the FxTailable class because with explicit return statements, it's not useful anymore.
2016-02-19 02:39:40 +00:00
// If the function returns a state, store it at *stateret.
// If it doesn't return a state but stateret is non-NULL, we need
// to set *stateret to NULL.
if (stateret != NULL)
{
*stateret = NULL;
if (ActionFunc->Proto == NULL ||
ActionFunc->Proto->ReturnTypes.Size() == 0 ||
ActionFunc->Proto->ReturnTypes[0] != TypeState)
{
stateret = NULL;
}
}
if (stateret == NULL)
{
stack.Call(ActionFunc, params, countof(params), NULL, 0, NULL);
}
else
{
VMReturn ret;
ret.PointerAt((void **)stateret);
stack.Call(ActionFunc, params, countof(params), &ret, 1, NULL);
}
- Added tracking of time spent specifically in running action functions. I feel kind of stupid about this now. I spent three days trying to figure out why the VC++ debug version was so slow. It turns out I had a conditional breakpoint set in a high-traffic area. D'oh! The rest of this stuff should get merged into trunk: - Fixed: Writing to debugfile uses the standard fprintf, which does not understand %td on VC++. - Fixed: Instead of crashing when a sprite has been scaled to 0, just don't draw it. SVN r3896 (scripting)
2012-10-21 03:46:17 +00:00
ActionCycles.Unclock();
- Make the autosegs read-only. - Derive PClass from dobject.cpp. This has one major ramification: Since the PClass is not allocated until runtime, you cannot initialize any static/global data structures with pointers to PClasses using RUNTIME_CLASS. Attempting to do so will just initialize with a NULL pointer. Instead, you can initialize using the address of the pointer returned by RUNTIME_CLASS and dereference that. By the time you have an opportunity to dereference it, it will no longer be NULL. - Sync CmakeLists.txt. - Random fixes for problems GCC spotted. SVN r1852 (scripting)
2009-09-17 01:36:14 +00:00
return true;
}
else
{
return false;
}
}
- Added Gez's actor replacement per skill submission. SVN r1681 (trunk)
2009-06-26 17:17:52 +00:00
- Fixed: The global WeaponSection string was never freed. It has been replaced with an FString now. - Fixed: The music strings in the default level info were never freed and caused memory leaks when used repeatedly. - Fixed: The intermusic string in the level info was never freed. - Fixed: The default fire obituary should only be printed if the damage came from the environment. If it comes from a monster the monster specific obituary should be used instead. - Added custom damage types from the floating point test release. - Changed Pain Elemental's massacre check. Now A_PainDie checks for the damage type and doesn't spawn anything if it is NAME_Massacre. A_PainDie can also be used by other actors so a more generalized approach is needed than hard coding it into the Pain Elemental. - Converted a few of Doom's monsters to DECORATE because I couldn't test the first version of the custom state code with the corpses inheriting from them. - Added custom states from last year's floating point test release and fixed some bugs I found in that code. Unfortunately it wasn't all salvageable and it was easier to recreate some parts from scratch. SVN r368 (trunk)
2006-10-31 14:53:21 +00:00
//==========================================================================
//
//
//==========================================================================
- separated all voxel related resource maintenance code from r_things.cpp and r_data.cpp into its own file. SVN r3246 (trunk)
2011-07-04 20:22:55 +00:00
int GetSpriteIndex(const char * spritename, bool add)
- Generalized Hexen's class-based spawning to be a property of the player class so now it is available in all games. - Replaced the call to A_FlameSnd in the HereticPlayer's burn death sequence with A_FireScream and defined *burndeath for Heretic. - Added Grubber's custom player class support. SVN r250 (trunk)
2006-07-13 10:17:56 +00:00
{
- Fixed: The save percentage for Doom's green armor was slightly too low which caused roundoff errors that made it less than 1/3 effective. - Added support for "RRGGBB" strings to V_GetColor. - Fixed: Desaturation maps for the TEXTURES lump were calculated incorrectly. - Changed GetSpriteIndex to cache the last used sprite name so that the code using this function doesn't have to do it itself. - Moved some more code for the state parser into p_states.cpp. - Fixed: TDeletingArray should not try to delete NULL pointers. SVN r1312 (trunk)
2008-12-07 12:11:59 +00:00
static char lastsprite[5];
static int lastindex;
- Fixed: SNDINFO must be loaded before the textures. However, this required some changes to the MAPINFO parser which tried to access the texture manager to check if the level name patches exist. That check had to be moved to where the intermission screen is set up. - Fixed: 'bloodcolor' ignored the first parameter value when given a list of integers. Please note that this creates an incompatibility between old and new versions so if you want to create something that works with both 2.2.0 and current versions better use the string format version for the color parameter! - Rewrote the DECORATE property parser so that the parser is completely separated from the property handlers. This should allow reuse of all the handler code for a new format if Doomscript requires one. - Fixed: PClass::InitializeActorInfo copied too many bytes if a subclass's defaults were larger than the parent's. - Moved A_ChangeFlag to thingdef_codeptr.cpp. - Moved translation related code from thingdef_properties.cpp to r_translate.cpp and rewrote the translation parser to use FScanner instead of strtol. - replaced DECORATE's 'alpha default' by 'defaultalpha' for consistency. Since this was never used outside zdoom.pk3 it's not critical. - Removed support for game specific pickup messages because the only thing this was ever used for - Raven's invulnerability item - has already been split up into a Heretic and Hexen version. SVN r1240 (trunk)
2008-09-21 18:02:38 +00:00
// Make sure that the string is upper case and 4 characters long
- State parser fixes. SVN r1255 (trunk)
2008-10-05 18:45:05 +00:00
char upper[5]={0,0,0,0,0};
- Fixed: SNDINFO must be loaded before the textures. However, this required some changes to the MAPINFO parser which tried to access the texture manager to check if the level name patches exist. That check had to be moved to where the intermission screen is set up. - Fixed: 'bloodcolor' ignored the first parameter value when given a list of integers. Please note that this creates an incompatibility between old and new versions so if you want to create something that works with both 2.2.0 and current versions better use the string format version for the color parameter! - Rewrote the DECORATE property parser so that the parser is completely separated from the property handlers. This should allow reuse of all the handler code for a new format if Doomscript requires one. - Fixed: PClass::InitializeActorInfo copied too many bytes if a subclass's defaults were larger than the parent's. - Moved A_ChangeFlag to thingdef_codeptr.cpp. - Moved translation related code from thingdef_properties.cpp to r_translate.cpp and rewrote the translation parser to use FScanner instead of strtol. - replaced DECORATE's 'alpha default' by 'defaultalpha' for consistency. Since this was never used outside zdoom.pk3 it's not critical. - Removed support for game specific pickup messages because the only thing this was ever used for - Raven's invulnerability item - has already been split up into a Heretic and Hexen version. SVN r1240 (trunk)
2008-09-21 18:02:38 +00:00
for (int i = 0; spritename[i] != 0 && i < 4; i++)
{
upper[i] = toupper (spritename[i]);
}
- Fixed: The save percentage for Doom's green armor was slightly too low which caused roundoff errors that made it less than 1/3 effective. - Added support for "RRGGBB" strings to V_GetColor. - Fixed: Desaturation maps for the TEXTURES lump were calculated incorrectly. - Changed GetSpriteIndex to cache the last used sprite name so that the code using this function doesn't have to do it itself. - Moved some more code for the state parser into p_states.cpp. - Fixed: TDeletingArray should not try to delete NULL pointers. SVN r1312 (trunk)
2008-12-07 12:11:59 +00:00
// cache the name so if the next one is the same the function doesn't have to perform a search.
if (!strcmp(upper, lastsprite))
{
return lastindex;
}
strcpy(lastsprite, upper);
- Generalized Hexen's class-based spawning to be a property of the player class so now it is available in all games. - Replaced the call to A_FlameSnd in the HereticPlayer's burn death sequence with A_FireScream and defined *burndeath for Heretic. - Added Grubber's custom player class support. SVN r250 (trunk)
2006-07-13 10:17:56 +00:00
for (unsigned i = 0; i < sprites.Size (); ++i)
{
- Fixed: The save percentage for Doom's green armor was slightly too low which caused roundoff errors that made it less than 1/3 effective. - Added support for "RRGGBB" strings to V_GetColor. - Fixed: Desaturation maps for the TEXTURES lump were calculated incorrectly. - Changed GetSpriteIndex to cache the last used sprite name so that the code using this function doesn't have to do it itself. - Moved some more code for the state parser into p_states.cpp. - Fixed: TDeletingArray should not try to delete NULL pointers. SVN r1312 (trunk)
2008-12-07 12:11:59 +00:00
if (strcmp (sprites[i].name, upper) == 0)
- Generalized Hexen's class-based spawning to be a property of the player class so now it is available in all games. - Replaced the call to A_FlameSnd in the HereticPlayer's burn death sequence with A_FireScream and defined *burndeath for Heretic. - Added Grubber's custom player class support. SVN r250 (trunk)
2006-07-13 10:17:56 +00:00
{
- Fixed: The save percentage for Doom's green armor was slightly too low which caused roundoff errors that made it less than 1/3 effective. - Added support for "RRGGBB" strings to V_GetColor. - Fixed: Desaturation maps for the TEXTURES lump were calculated incorrectly. - Changed GetSpriteIndex to cache the last used sprite name so that the code using this function doesn't have to do it itself. - Moved some more code for the state parser into p_states.cpp. - Fixed: TDeletingArray should not try to delete NULL pointers. SVN r1312 (trunk)
2008-12-07 12:11:59 +00:00
return (lastindex = (int)i);
- Generalized Hexen's class-based spawning to be a property of the player class so now it is available in all games. - Replaced the call to A_FlameSnd in the HereticPlayer's burn death sequence with A_FireScream and defined *burndeath for Heretic. - Added Grubber's custom player class support. SVN r250 (trunk)
2006-07-13 10:17:56 +00:00
}
}
- separated all voxel related resource maintenance code from r_things.cpp and r_data.cpp into its own file. SVN r3246 (trunk)
2011-07-04 20:22:55 +00:00
if (!add)
{
return (lastindex = -1);
}
- Generalized Hexen's class-based spawning to be a property of the player class so now it is available in all games. - Replaced the call to A_FlameSnd in the HereticPlayer's burn death sequence with A_FireScream and defined *burndeath for Heretic. - Added Grubber's custom player class support. SVN r250 (trunk)
2006-07-13 10:17:56 +00:00
spritedef_t temp;
- Fixed: SNDINFO must be loaded before the textures. However, this required some changes to the MAPINFO parser which tried to access the texture manager to check if the level name patches exist. That check had to be moved to where the intermission screen is set up. - Fixed: 'bloodcolor' ignored the first parameter value when given a list of integers. Please note that this creates an incompatibility between old and new versions so if you want to create something that works with both 2.2.0 and current versions better use the string format version for the color parameter! - Rewrote the DECORATE property parser so that the parser is completely separated from the property handlers. This should allow reuse of all the handler code for a new format if Doomscript requires one. - Fixed: PClass::InitializeActorInfo copied too many bytes if a subclass's defaults were larger than the parent's. - Moved A_ChangeFlag to thingdef_codeptr.cpp. - Moved translation related code from thingdef_properties.cpp to r_translate.cpp and rewrote the translation parser to use FScanner instead of strtol. - replaced DECORATE's 'alpha default' by 'defaultalpha' for consistency. Since this was never used outside zdoom.pk3 it's not critical. - Removed support for game specific pickup messages because the only thing this was ever used for - Raven's invulnerability item - has already been split up into a Heretic and Hexen version. SVN r1240 (trunk)
2008-09-21 18:02:38 +00:00
strcpy (temp.name, upper);
- Generalized Hexen's class-based spawning to be a property of the player class so now it is available in all games. - Replaced the call to A_FlameSnd in the HereticPlayer's burn death sequence with A_FireScream and defined *burndeath for Heretic. - Added Grubber's custom player class support. SVN r250 (trunk)
2006-07-13 10:17:56 +00:00
temp.numframes = 0;
temp.spriteframes = 0;
- Fixed: The save percentage for Doom's green armor was slightly too low which caused roundoff errors that made it less than 1/3 effective. - Added support for "RRGGBB" strings to V_GetColor. - Fixed: Desaturation maps for the TEXTURES lump were calculated incorrectly. - Changed GetSpriteIndex to cache the last used sprite name so that the code using this function doesn't have to do it itself. - Moved some more code for the state parser into p_states.cpp. - Fixed: TDeletingArray should not try to delete NULL pointers. SVN r1312 (trunk)
2008-12-07 12:11:59 +00:00
return (lastindex = (int)sprites.Push (temp));
- Generalized Hexen's class-based spawning to be a property of the player class so now it is available in all games. - Replaced the call to A_FlameSnd in the HereticPlayer's burn death sequence with A_FireScream and defined *burndeath for Heretic. - Added Grubber's custom player class support. SVN r250 (trunk)
2006-07-13 10:17:56 +00:00
}
- Removed the old meta data system. All meta data is now stored in subclasses of PClass. This should simplify scripting, since it means that meta fields can be treated (mostly) the same as normal fields. SVN r2242 (scripting)
2010-03-25 20:38:00 +00:00
IMPLEMENT_POINTY_CLASS(PClassActor)
DECLARE_POINTER(DropItems)
END_POINTERS
- Generalized Hexen's class-based spawning to be a property of the player class so now it is available in all games. - Replaced the call to A_FlameSnd in the HereticPlayer's burn death sequence with A_FireScream and defined *burndeath for Heretic. - Added Grubber's custom player class support. SVN r250 (trunk)
2006-07-13 10:17:56 +00:00
- Fixed: The global WeaponSection string was never freed. It has been replaced with an FString now. - Fixed: The music strings in the default level info were never freed and caused memory leaks when used repeatedly. - Fixed: The intermusic string in the level info was never freed. - Fixed: The default fire obituary should only be printed if the damage came from the environment. If it comes from a monster the monster specific obituary should be used instead. - Added custom damage types from the floating point test release. - Changed Pain Elemental's massacre check. Now A_PainDie checks for the damage type and doesn't spawn anything if it is NAME_Massacre. A_PainDie can also be used by other actors so a more generalized approach is needed than hard coding it into the Pain Elemental. - Converted a few of Doom's monsters to DECORATE because I couldn't test the first version of the custom state code with the corpses inheriting from them. - Added custom states from last year's floating point test release and fixed some bugs I found in that code. Unfortunately it wasn't all salvageable and it was easier to recreate some parts from scratch. SVN r368 (trunk)
2006-10-31 14:53:21 +00:00
//==========================================================================
//
- Removed the third parameter from dumpclasses when it was restricted it to Actors, because I have no idea what that was all about. - Got rid of FActorInfo and merged it into a new PClassActor. SVN r2240 (scripting)
2010-03-24 02:49:37 +00:00
// PClassActor :: StaticInit STATIC
- Fixed: The global WeaponSection string was never freed. It has been replaced with an FString now. - Fixed: The music strings in the default level info were never freed and caused memory leaks when used repeatedly. - Fixed: The intermusic string in the level info was never freed. - Fixed: The default fire obituary should only be printed if the damage came from the environment. If it comes from a monster the monster specific obituary should be used instead. - Added custom damage types from the floating point test release. - Changed Pain Elemental's massacre check. Now A_PainDie checks for the damage type and doesn't spawn anything if it is NAME_Massacre. A_PainDie can also be used by other actors so a more generalized approach is needed than hard coding it into the Pain Elemental. - Converted a few of Doom's monsters to DECORATE because I couldn't test the first version of the custom state code with the corpses inheriting from them. - Added custom states from last year's floating point test release and fixed some bugs I found in that code. Unfortunately it wasn't all salvageable and it was easier to recreate some parts from scratch. SVN r368 (trunk)
2006-10-31 14:53:21 +00:00
//
//==========================================================================
- Removed the third parameter from dumpclasses when it was restricted it to Actors, because I have no idea what that was all about. - Got rid of FActorInfo and merged it into a new PClassActor. SVN r2240 (scripting)
2010-03-24 02:49:37 +00:00
void PClassActor::StaticInit()
Directory restructuring to make it easier to version projects that don't build zdoom.exe. SVN r4 (trunk)
2006-02-24 04:48:15 +00:00
{
- changed some data init code to delete the data it wants to initialize first. - The 'savebuffer' variable still existed? - Changed AInventory::Destroy to NULL SendItemUse and SendItemDrop if they point to the destroyed object. Although unlikely it can't be ruled out completely that this can happen with delayed CCMDs. - fixed: Starting a new game did not clear the hub statistics array. SVN r3034 (trunk)
2010-12-13 10:02:45 +00:00
sprites.Clear();
Directory restructuring to make it easier to version projects that don't build zdoom.exe. SVN r4 (trunk)
2006-02-24 04:48:15 +00:00
if (sprites.Size() == 0)
{
spritedef_t temp;
// Sprite 0 is always TNT1
memcpy (temp.name, "TNT1", 5);
temp.numframes = 0;
temp.spriteframes = 0;
sprites.Push (temp);
// Sprite 1 is always ----
memcpy (temp.name, "----", 5);
sprites.Push (temp);
- Merged SetState and SetStateNF into a single function. - Added new sprite #### and frame character # to specify the behavior of sprite ---- on a per-sprite and per-frame basis respectively. SVN r2291 (trunk)
2010-04-19 02:46:50 +00:00
// Sprite 2 is always ####
memcpy (temp.name, "####", 5);
sprites.Push (temp);
Directory restructuring to make it easier to version projects that don't build zdoom.exe. SVN r4 (trunk)
2006-02-24 04:48:15 +00:00
}
- added an errorlog option. This cuts down on as much message noise as possible, outputs everything to a file specified as a parameter and then quits immediately, allowing this to run from a batch that's supposed to check a larger list of files for errors. Multiple outputs get appended if the file already exists.
2016-02-09 13:20:49 +00:00
if (!batchrun) Printf ("LoadActors: Load actor definitions.\n");
- move static AM color initialization into the AM_StaticInit function. - move D_LoadWadSettings to keysections.cpp. - made some more data reloadable. - data structures filled by P_SetupLevel should be cleared before loading the level. They can remain non-empty in case of an error. There's probably more to fix here... - fixed: MidiDevices and MusicAliases were not cleared before reloading local SNDINFOs. - fixed signed/unsigned warnings in AddSwitchPair for real (GCC really allows -1u? MSVC prints a warning for that.) SVN r3036 (trunk)
2010-12-14 00:50:02 +00:00
ClearStrifeTypes();
- Added NULL checks to all places where class names are passed as DECORATE parameters. - All DECORATE parameters are passed as expressions now. This change allows for compile time checks of all class names being used in DECORATE so many incorrect definitions may output warnings now. - Changed DECORATE sound and color parameters to use expressions. - Changed: S_StopChannel now resets the actor's sound flags. The previous bug made me think that delaying this until FMod calls the end of sound callback may simply be too late. SVN r1276 (trunk)
2008-10-25 17:38:00 +00:00
LoadActors ();
- init bot specific actor properties righr after parsing DECORATE, not when spawning the first bot (which is too late.) SVN r3032 (trunk)
2010-12-12 21:09:16 +00:00
InitBotStuff();
Directory restructuring to make it easier to version projects that don't build zdoom.exe. SVN r4 (trunk)
2006-02-24 04:48:15 +00:00
}
- Fixed: The global WeaponSection string was never freed. It has been replaced with an FString now. - Fixed: The music strings in the default level info were never freed and caused memory leaks when used repeatedly. - Fixed: The intermusic string in the level info was never freed. - Fixed: The default fire obituary should only be printed if the damage came from the environment. If it comes from a monster the monster specific obituary should be used instead. - Added custom damage types from the floating point test release. - Changed Pain Elemental's massacre check. Now A_PainDie checks for the damage type and doesn't spawn anything if it is NAME_Massacre. A_PainDie can also be used by other actors so a more generalized approach is needed than hard coding it into the Pain Elemental. - Converted a few of Doom's monsters to DECORATE because I couldn't test the first version of the custom state code with the corpses inheriting from them. - Added custom states from last year's floating point test release and fixed some bugs I found in that code. Unfortunately it wasn't all salvageable and it was easier to recreate some parts from scratch. SVN r368 (trunk)
2006-10-31 14:53:21 +00:00
//==========================================================================
//
- Removed the third parameter from dumpclasses when it was restricted it to Actors, because I have no idea what that was all about. - Got rid of FActorInfo and merged it into a new PClassActor. SVN r2240 (scripting)
2010-03-24 02:49:37 +00:00
// PClassActor :: StaticSetActorNums STATIC
//
Directory restructuring to make it easier to version projects that don't build zdoom.exe. SVN r4 (trunk)
2006-02-24 04:48:15 +00:00
// Called after Dehacked patches are applied
- Fixed: The global WeaponSection string was never freed. It has been replaced with an FString now. - Fixed: The music strings in the default level info were never freed and caused memory leaks when used repeatedly. - Fixed: The intermusic string in the level info was never freed. - Fixed: The default fire obituary should only be printed if the damage came from the environment. If it comes from a monster the monster specific obituary should be used instead. - Added custom damage types from the floating point test release. - Changed Pain Elemental's massacre check. Now A_PainDie checks for the damage type and doesn't spawn anything if it is NAME_Massacre. A_PainDie can also be used by other actors so a more generalized approach is needed than hard coding it into the Pain Elemental. - Converted a few of Doom's monsters to DECORATE because I couldn't test the first version of the custom state code with the corpses inheriting from them. - Added custom states from last year's floating point test release and fixed some bugs I found in that code. Unfortunately it wasn't all salvageable and it was easier to recreate some parts from scratch. SVN r368 (trunk)
2006-10-31 14:53:21 +00:00
//
//==========================================================================
- Removed the third parameter from dumpclasses when it was restricted it to Actors, because I have no idea what that was all about. - Got rid of FActorInfo and merged it into a new PClassActor. SVN r2240 (scripting)
2010-03-24 02:49:37 +00:00
void PClassActor::StaticSetActorNums()
Directory restructuring to make it easier to version projects that don't build zdoom.exe. SVN r4 (trunk)
2006-02-24 04:48:15 +00:00
{
- Standardized use of PClassActor::AllActorClasses for iterating over all classes of actors instead of PClass::m_Types (now PClass::AllClasses). - Removed ClassIndex from PClass. It was only needed by FArchive, and maps take care of the problem just as well. - Moved PClass into a larger type system (which is likely to change some/lots once I try and actually use it and have a better feel for what I need from it). SVN r2281 (scripting)
2010-04-16 02:57:51 +00:00
for (unsigned int i = 0; i < PClassActor::AllActorClasses.Size(); ++i)
Directory restructuring to make it easier to version projects that don't build zdoom.exe. SVN r4 (trunk)
2006-02-24 04:48:15 +00:00
{
- Standardized use of PClassActor::AllActorClasses for iterating over all classes of actors instead of PClass::m_Types (now PClass::AllClasses). - Removed ClassIndex from PClass. It was only needed by FArchive, and maps take care of the problem just as well. - Moved PClass into a larger type system (which is likely to change some/lots once I try and actually use it and have a better feel for what I need from it). SVN r2281 (scripting)
2010-04-16 02:57:51 +00:00
static_cast<PClassActor *>(PClassActor::AllActorClasses[i])->RegisterIDs();
- Removed the third parameter from dumpclasses when it was restricted it to Actors, because I have no idea what that was all about. - Got rid of FActorInfo and merged it into a new PClassActor. SVN r2240 (scripting)
2010-03-24 02:49:37 +00:00
}
}
//==========================================================================
//
// PClassActor Constructor
//
//==========================================================================
PClassActor::PClassActor()
{
GameFilter = GAME_Any;
SpawnID = 0;
DoomEdNum = -1;
OwnedStates = NULL;
NumOwnedStates = 0;
Replacement = NULL;
Replacee = NULL;
StateList = NULL;
DamageFactors = NULL;
PainChances = NULL;
- Removed the old meta data system. All meta data is now stored in subclasses of PClass. This should simplify scripting, since it means that meta fields can be treated (mostly) the same as normal fields. SVN r2242 (scripting)
2010-03-25 20:38:00 +00:00
DeathHeight = -1;
BurnHeight = -1;
GibHealth = INT_MIN;
WoundHealth = 6;
PoisonDamage = 0;
FastSpeed = FIXED_MIN;
RDFactor = FRACUNIT;
CameraHeight = FIXED_MIN;
DropItems = NULL;
DontHurtShooter = false;
ExplosionRadius = -1;
MeleeDamage = 0;
- Standardized use of PClassActor::AllActorClasses for iterating over all classes of actors instead of PClass::m_Types (now PClass::AllClasses). - Removed ClassIndex from PClass. It was only needed by FArchive, and maps take care of the problem just as well. - Moved PClass into a larger type system (which is likely to change some/lots once I try and actually use it and have a better feel for what I need from it). SVN r2281 (scripting)
2010-04-16 02:57:51 +00:00
// Record this in the master list.
AllActorClasses.Push(this);
- Removed the third parameter from dumpclasses when it was restricted it to Actors, because I have no idea what that was all about. - Got rid of FActorInfo and merged it into a new PClassActor. SVN r2240 (scripting)
2010-03-24 02:49:37 +00:00
}
//==========================================================================
//
// PClassActor Destructor
//
//==========================================================================
PClassActor::~PClassActor()
{
if (OwnedStates != NULL)
{
delete[] OwnedStates;
}
if (DamageFactors != NULL)
{
delete DamageFactors;
}
if (PainChances != NULL)
{
delete PainChances;
}
if (StateList != NULL)
{
StateList->Destroy();
M_Free(StateList);
Directory restructuring to make it easier to version projects that don't build zdoom.exe. SVN r4 (trunk)
2006-02-24 04:48:15 +00:00
}
}
- Removed the old meta data system. All meta data is now stored in subclasses of PClass. This should simplify scripting, since it means that meta fields can be treated (mostly) the same as normal fields. SVN r2242 (scripting)
2010-03-25 20:38:00 +00:00
//==========================================================================
//
// PClassActor :: Derive
//
//==========================================================================
- split up PClass::Derive and its child functions because part of them is also needed when initializing an inherited native class with the properties of its parent - but calling the base version in PClass is not possible. - moved a few AActor properties out of the EXE so that I could easily test if it works.
2016-02-09 23:17:00 +00:00
void PClassActor::DeriveData(PClass *newclass)
- Removed the old meta data system. All meta data is now stored in subclasses of PClass. This should simplify scripting, since it means that meta fields can be treated (mostly) the same as normal fields. SVN r2242 (scripting)
2010-03-25 20:38:00 +00:00
{
assert(newclass->IsKindOf(RUNTIME_CLASS(PClassActor)));
PClassActor *newa = static_cast<PClassActor *>(newclass);
newa->Obituary = Obituary;
newa->HitObituary = HitObituary;
newa->DeathHeight = DeathHeight;
newa->BurnHeight = BurnHeight;
newa->BloodColor = BloodColor;
newa->GibHealth = GibHealth;
newa->WoundHealth = WoundHealth;
newa->PoisonDamage = PoisonDamage;
newa->FastSpeed = FastSpeed;
newa->RDFactor = RDFactor;
newa->CameraHeight = CameraHeight;
newa->HowlSound = HowlSound;
newa->BloodType = BloodType;
newa->BloodType2 = BloodType2;
newa->BloodType3 = BloodType3;
newa->DropItems = DropItems;
newa->DontHurtShooter = DontHurtShooter;
newa->ExplosionRadius = ExplosionRadius;
newa->ExplosionDamage = ExplosionDamage;
newa->MeleeDamage = MeleeDamage;
newa->MeleeSound = MeleeSound;
newa->MissileName = MissileName;
newa->MissileHeight = MissileHeight;
- cleaned up the class data organization: * moved RestrictedToPlayerClass and ForbiddenToPlayerClass arrays to AInventory. * moved all copy-from-parent code into DeriveData functions.
2016-02-09 23:46:51 +00:00
newa->VisibleToPlayerClass = VisibleToPlayerClass;
if (DamageFactors != NULL)
{
// copy damage factors from parent
newa->DamageFactors = new DmgFactors;
*newa->DamageFactors = *DamageFactors;
}
if (PainChances != NULL)
{
// copy pain chances from parent
newa->PainChances = new PainChanceList;
*newa->PainChances = *PainChances;
}
- Removed the old meta data system. All meta data is now stored in subclasses of PClass. This should simplify scripting, since it means that meta fields can be treated (mostly) the same as normal fields. SVN r2242 (scripting)
2010-03-25 20:38:00 +00:00
}
- Fixed: The global WeaponSection string was never freed. It has been replaced with an FString now. - Fixed: The music strings in the default level info were never freed and caused memory leaks when used repeatedly. - Fixed: The intermusic string in the level info was never freed. - Fixed: The default fire obituary should only be printed if the damage came from the environment. If it comes from a monster the monster specific obituary should be used instead. - Added custom damage types from the floating point test release. - Changed Pain Elemental's massacre check. Now A_PainDie checks for the damage type and doesn't spawn anything if it is NAME_Massacre. A_PainDie can also be used by other actors so a more generalized approach is needed than hard coding it into the Pain Elemental. - Converted a few of Doom's monsters to DECORATE because I couldn't test the first version of the custom state code with the corpses inheriting from them. - Added custom states from last year's floating point test release and fixed some bugs I found in that code. Unfortunately it wasn't all salvageable and it was easier to recreate some parts from scratch. SVN r368 (trunk)
2006-10-31 14:53:21 +00:00
//==========================================================================
//
- Removed the third parameter from dumpclasses when it was restricted it to Actors, because I have no idea what that was all about. - Got rid of FActorInfo and merged it into a new PClassActor. SVN r2240 (scripting)
2010-03-24 02:49:37 +00:00
// PClassActor :: PropagateMark
- Fixed: The global WeaponSection string was never freed. It has been replaced with an FString now. - Fixed: The music strings in the default level info were never freed and caused memory leaks when used repeatedly. - Fixed: The intermusic string in the level info was never freed. - Fixed: The default fire obituary should only be printed if the damage came from the environment. If it comes from a monster the monster specific obituary should be used instead. - Added custom damage types from the floating point test release. - Changed Pain Elemental's massacre check. Now A_PainDie checks for the damage type and doesn't spawn anything if it is NAME_Massacre. A_PainDie can also be used by other actors so a more generalized approach is needed than hard coding it into the Pain Elemental. - Converted a few of Doom's monsters to DECORATE because I couldn't test the first version of the custom state code with the corpses inheriting from them. - Added custom states from last year's floating point test release and fixed some bugs I found in that code. Unfortunately it wasn't all salvageable and it was easier to recreate some parts from scratch. SVN r368 (trunk)
2006-10-31 14:53:21 +00:00
//
//==========================================================================
- Removed the third parameter from dumpclasses when it was restricted it to Actors, because I have no idea what that was all about. - Got rid of FActorInfo and merged it into a new PClassActor. SVN r2240 (scripting)
2010-03-24 02:49:37 +00:00
size_t PClassActor::PropagateMark()
Directory restructuring to make it easier to version projects that don't build zdoom.exe. SVN r4 (trunk)
2006-02-24 04:48:15 +00:00
{
- Removed the third parameter from dumpclasses when it was restricted it to Actors, because I have no idea what that was all about. - Got rid of FActorInfo and merged it into a new PClassActor. SVN r2240 (scripting)
2010-03-24 02:49:37 +00:00
// Mark state functions
for (int i = 0; i < NumOwnedStates; ++i)
{
if (OwnedStates[i].ActionFunc != NULL)
{
GC::Mark(OwnedStates[i].ActionFunc);
}
}
- Added a RETI instruction for returning 15-bit signed immediate values. - Changed Actor's Damage property into an actual function. All access to the damage property must now be done through GetMissileDamage. actor->GetMissileDamage(0, 1) is equivalent to the former actor->Damage, for the case where actor->Damage was not an expression. (I suppose I will probably need to make a thunk for DECORATE expressions that want to read it.) - Cleaned up some decorate expression evaluation functions that are no longer used. SVN r3919 (scripting)
2012-10-28 04:36:52 +00:00
// Mark damage function
- Added a NULL Defaults check to PClassActor::PropagateMark(). SVN r3921 (scripting)
2012-10-29 00:42:58 +00:00
if (Defaults != NULL)
{
GC::Mark(((AActor *)Defaults)->Damage);
}
- Added a RETI instruction for returning 15-bit signed immediate values. - Changed Actor's Damage property into an actual function. All access to the damage property must now be done through GetMissileDamage. actor->GetMissileDamage(0, 1) is equivalent to the former actor->Damage, for the case where actor->Damage was not an expression. (I suppose I will probably need to make a thunk for DECORATE expressions that want to read it.) - Cleaned up some decorate expression evaluation functions that are no longer used. SVN r3919 (scripting)
2012-10-28 04:36:52 +00:00
- Removed the third parameter from dumpclasses when it was restricted it to Actors, because I have no idea what that was all about. - Got rid of FActorInfo and merged it into a new PClassActor. SVN r2240 (scripting)
2010-03-24 02:49:37 +00:00
// marked += ActorInfo->NumOwnedStates * sizeof(FState);
return Super::PropagateMark();
}
//==========================================================================
//
// PClassActor :: InitializeNativeDefaults
//
// This is used by DECORATE to assign ActorInfos to internal classes
//
//==========================================================================
void PClassActor::InitializeNativeDefaults()
{
Symbols.SetParentTable(&ParentClass->Symbols);
assert(Defaults == NULL);
- Fixed alloc/dealloc mismatch in PClass code. The function 'PClassActor::InitializeNativeDefault' is the only one which didn't allocate the 'Defaults' member variable with M_Malloc. Reported by the Address Sanitizer.
2016-02-05 02:03:34 +00:00
Defaults = (BYTE *)M_Malloc(Size);
- Removed the third parameter from dumpclasses when it was restricted it to Actors, because I have no idea what that was all about. - Got rid of FActorInfo and merged it into a new PClassActor. SVN r2240 (scripting)
2010-03-24 02:49:37 +00:00
if (ParentClass->Defaults != NULL)
{
memcpy(Defaults, ParentClass->Defaults, ParentClass->Size);
if (Size > ParentClass->Size)
{
memset(Defaults + ParentClass->Size, 0, Size - ParentClass->Size);
}
}
else
{
memset (Defaults, 0, Size);
}
}
//==========================================================================
//
// PClassActor :: RegisterIDs
//
// Registers this class's SpawnID and DoomEdNum in the appropriate tables.
//
//==========================================================================
void PClassActor::RegisterIDs()
{
PClassActor *cls = PClass::FindActor(TypeName);
- Added Boom's stairbuilding fix when one step couldn't be built due to an active thinker in the sector. This is compatibility optioned with COMPAT_STAIRINDEX. Also added a compatibility setting for Eternal Doom MAP25 which relies on Doom's original broken behavior. - added a few sanity checks for duplicate actor names in DECORATE. ZDoom will now print more warnings and all crash cases should be properly handled but since this is still an error this will not work properly in all circumstances. For example, if you have a duplicate name all classes that inherit from the original definition will not survive a savegame if they reference a state belonging to that class at the point of saving. - Print 'tried to register class more than once' in red to highlight it. - fixed: actors may not replace themselves. SVN r2158 (trunk)
2010-02-13 08:56:08 +00:00
- Removed the third parameter from dumpclasses when it was restricted it to Actors, because I have no idea what that was all about. - Got rid of FActorInfo and merged it into a new PClassActor. SVN r2240 (scripting)
2010-03-24 02:49:37 +00:00
if (cls == NULL)
{
Printf(TEXTCOLOR_RED"The actor '%s' has been hidden by a non-actor of the same name\n", TypeName.GetChars());
return;
}
- move conversation ID definition to MAPINFO as well. Uses the newly added filter feature to handle the teaser differences.
2015-04-04 22:31:15 +00:00
// Conversation IDs have never been filtered by game so we cannot start doing that.
if (ConversationID > 0)
{
StrifeTypes[ConversationID] = cls;
Merge branch 'master' into scripting Conflicts: src/p_effect.cpp src/p_effect.h src/p_local.h src/p_map.cpp src/thingdef/thingdef_codeptr.cpp wadsrc/static/actors/actor.txt wadsrc/static/actors/shared/inventory.txt zdoom.vcproj
2015-04-28 12:45:13 +00:00
if (cls != this)
- move conversation ID definition to MAPINFO as well. Uses the newly added filter feature to handle the teaser differences.
2015-04-04 22:31:15 +00:00
{
Printf(TEXTCOLOR_RED"Conversation ID %d refers to hidden class type '%s'\n", SpawnID, cls->TypeName.GetChars());
}
}
Directory restructuring to make it easier to version projects that don't build zdoom.exe. SVN r4 (trunk)
2006-02-24 04:48:15 +00:00
if (GameFilter == GAME_Any || (GameFilter & gameinfo.gametype))
{
- Ensure that only actor with positive SpawnIDs get added to the SpawnableThings map, so there will be no conflicts with recently-added named arguments for spawnable things on UDMF maps. - Change the SpawnableThings array into a map, so there is no longer any particular upper limit on an actor's SpawnID. Also fixes a possible exploit, since an actor's SpawnID was never checked to make sure it was within range. SVN r3959 (trunk)
2012-11-09 23:53:58 +00:00
if (SpawnID > 0)
Directory restructuring to make it easier to version projects that don't build zdoom.exe. SVN r4 (trunk)
2006-02-24 04:48:15 +00:00
{
- Added Boom's stairbuilding fix when one step couldn't be built due to an active thinker in the sector. This is compatibility optioned with COMPAT_STAIRINDEX. Also added a compatibility setting for Eternal Doom MAP25 which relies on Doom's original broken behavior. - added a few sanity checks for duplicate actor names in DECORATE. ZDoom will now print more warnings and all crash cases should be properly handled but since this is still an error this will not work properly in all circumstances. For example, if you have a duplicate name all classes that inherit from the original definition will not survive a savegame if they reference a state belonging to that class at the point of saving. - Print 'tried to register class more than once' in red to highlight it. - fixed: actors may not replace themselves. SVN r2158 (trunk)
2010-02-13 08:56:08 +00:00
SpawnableThings[SpawnID] = cls;
- Removed the third parameter from dumpclasses when it was restricted it to Actors, because I have no idea what that was all about. - Got rid of FActorInfo and merged it into a new PClassActor. SVN r2240 (scripting)
2010-03-24 02:49:37 +00:00
if (cls != this)
- Added Boom's stairbuilding fix when one step couldn't be built due to an active thinker in the sector. This is compatibility optioned with COMPAT_STAIRINDEX. Also added a compatibility setting for Eternal Doom MAP25 which relies on Doom's original broken behavior. - added a few sanity checks for duplicate actor names in DECORATE. ZDoom will now print more warnings and all crash cases should be properly handled but since this is still an error this will not work properly in all circumstances. For example, if you have a duplicate name all classes that inherit from the original definition will not survive a savegame if they reference a state belonging to that class at the point of saving. - Print 'tried to register class more than once' in red to highlight it. - fixed: actors may not replace themselves. SVN r2158 (trunk)
2010-02-13 08:56:08 +00:00
{
Printf(TEXTCOLOR_RED"Spawn ID %d refers to hidden class type '%s'\n", SpawnID, cls->TypeName.GetChars());
}
Directory restructuring to make it easier to version projects that don't build zdoom.exe. SVN r4 (trunk)
2006-02-24 04:48:15 +00:00
}
if (DoomEdNum != -1)
{
- set editor numbers through MAPINFO. The DECORATE way still works ans will override any definition made in MAPINFO. - use a standard TMap for finding editor numbers
2015-04-03 14:51:45 +00:00
FDoomEdEntry *oldent = DoomEdMap.CheckKey(DoomEdNum);
if (oldent != NULL && oldent->Special == -2)
{
Printf(TEXTCOLOR_RED"Editor number %d defined twice for classes '%s' and '%s'\n", DoomEdNum, cls->TypeName.GetChars(), oldent->Type->TypeName.GetChars());
}
FDoomEdEntry ent;
memset(&ent, 0, sizeof(ent));
ent.Type = cls;
ent.Special = -2; // use -2 instead of -1 so that we can recognize DECORATE defined entries and print a warning message if duplicates occur.
DoomEdMap.Insert(DoomEdNum, ent);
- Removed the third parameter from dumpclasses when it was restricted it to Actors, because I have no idea what that was all about. - Got rid of FActorInfo and merged it into a new PClassActor. SVN r2240 (scripting)
2010-03-24 02:49:37 +00:00
if (cls != this)
- Added Boom's stairbuilding fix when one step couldn't be built due to an active thinker in the sector. This is compatibility optioned with COMPAT_STAIRINDEX. Also added a compatibility setting for Eternal Doom MAP25 which relies on Doom's original broken behavior. - added a few sanity checks for duplicate actor names in DECORATE. ZDoom will now print more warnings and all crash cases should be properly handled but since this is still an error this will not work properly in all circumstances. For example, if you have a duplicate name all classes that inherit from the original definition will not survive a savegame if they reference a state belonging to that class at the point of saving. - Print 'tried to register class more than once' in red to highlight it. - fixed: actors may not replace themselves. SVN r2158 (trunk)
2010-02-13 08:56:08 +00:00
{
Printf(TEXTCOLOR_RED"Editor number %d refers to hidden class type '%s'\n", DoomEdNum, cls->TypeName.GetChars());
}
Directory restructuring to make it easier to version projects that don't build zdoom.exe. SVN r4 (trunk)
2006-02-24 04:48:15 +00:00
}
}
}
- Fixed: The global WeaponSection string was never freed. It has been replaced with an FString now. - Fixed: The music strings in the default level info were never freed and caused memory leaks when used repeatedly. - Fixed: The intermusic string in the level info was never freed. - Fixed: The default fire obituary should only be printed if the damage came from the environment. If it comes from a monster the monster specific obituary should be used instead. - Added custom damage types from the floating point test release. - Changed Pain Elemental's massacre check. Now A_PainDie checks for the damage type and doesn't spawn anything if it is NAME_Massacre. A_PainDie can also be used by other actors so a more generalized approach is needed than hard coding it into the Pain Elemental. - Converted a few of Doom's monsters to DECORATE because I couldn't test the first version of the custom state code with the corpses inheriting from them. - Added custom states from last year's floating point test release and fixed some bugs I found in that code. Unfortunately it wasn't all salvageable and it was easier to recreate some parts from scratch. SVN r368 (trunk)
2006-10-31 14:53:21 +00:00
//==========================================================================
//
- Removed the third parameter from dumpclasses when it was restricted it to Actors, because I have no idea what that was all about. - Got rid of FActorInfo and merged it into a new PClassActor. SVN r2240 (scripting)
2010-03-24 02:49:37 +00:00
// PClassActor :: GetReplacement
- Fixed: The global WeaponSection string was never freed. It has been replaced with an FString now. - Fixed: The music strings in the default level info were never freed and caused memory leaks when used repeatedly. - Fixed: The intermusic string in the level info was never freed. - Fixed: The default fire obituary should only be printed if the damage came from the environment. If it comes from a monster the monster specific obituary should be used instead. - Added custom damage types from the floating point test release. - Changed Pain Elemental's massacre check. Now A_PainDie checks for the damage type and doesn't spawn anything if it is NAME_Massacre. A_PainDie can also be used by other actors so a more generalized approach is needed than hard coding it into the Pain Elemental. - Converted a few of Doom's monsters to DECORATE because I couldn't test the first version of the custom state code with the corpses inheriting from them. - Added custom states from last year's floating point test release and fixed some bugs I found in that code. Unfortunately it wasn't all salvageable and it was easier to recreate some parts from scratch. SVN r368 (trunk)
2006-10-31 14:53:21 +00:00
//
//==========================================================================
- Removed the third parameter from dumpclasses when it was restricted it to Actors, because I have no idea what that was all about. - Got rid of FActorInfo and merged it into a new PClassActor. SVN r2240 (scripting)
2010-03-24 02:49:37 +00:00
PClassActor *PClassActor::GetReplacement(bool lookskill)
- Added actor replacement for DECORATE. This works at a higher level than using duplicate DoomEdNums and will affect all attempts to spawn the replaced actor. However, because this happens for all spawns and not just at map load, the replacing actor must be compatible with the replaced actor, which means that an actor can only serve as a replacement for one of its baseclasses. For example, if you want to use a modified imp, you can use this DECORATE: actor MyImp : DoomImp replaces DoompImp { // Put changed properties here } - New: The IWAD dialog now remembers the last IWAD you picked and automatically highlights it the next time you run the game. This also applies if you check "Don't ask me this again": The IWAD selected will be the one that gets automatically loaded, not the one located first. (Using the -iwad parameter will not change the default IWAD.) In addition, you can now bring the dialog up even if you disable it by holding down SHIFT during startup. - Changed ExtractFilePath() and ExtractFileBase() to return FStrings instead of writing to a provided output buffer. ExtractFileBase() can also optionally keep the file's extension in the result. - Removed the -heapsize parameter entirely. The informational message should no longer be needed. - Removed -maxdemo parameter. There's no point to having it around since the demo buffer grows automatically. SVN r238 (trunk)
2006-07-08 02:17:35 +00:00
{
- Added Gez's MageWandMissile customization patch but moved the new functionality into the FastProjectile base class and removed the native MageWandMissile class, using the generic functionality instead. - Fixed: GetReplacement and GetReplacee always checked the skill definitions, even if they weren't supposed to be used. It was also missing a range check for 'gameskill'. SVN r1894 (trunk)
2009-10-03 17:07:11 +00:00
FName skillrepname;
if (lookskill && AllSkills.Size() > (unsigned)gameskill)
- Update for skill replacement. SVN r1682 (trunk)
2009-06-26 21:06:49 +00:00
{
- Removed the third parameter from dumpclasses when it was restricted it to Actors, because I have no idea what that was all about. - Got rid of FActorInfo and merged it into a new PClassActor. SVN r2240 (scripting)
2010-03-24 02:49:37 +00:00
skillrepname = AllSkills[gameskill].GetReplacement(TypeName);
- Added Gez's MageWandMissile customization patch but moved the new functionality into the FastProjectile base class and removed the native MageWandMissile class, using the generic functionality instead. - Fixed: GetReplacement and GetReplacee always checked the skill definitions, even if they weren't supposed to be used. It was also missing a range check for 'gameskill'. SVN r1894 (trunk)
2009-10-03 17:07:11 +00:00
if (skillrepname != NAME_None && PClass::FindClass(skillrepname) == NULL)
{
Printf("Warning: incorrect actor name in definition of skill %s: \n"
"class %s is replaced by non-existent class %s\n"
"Skill replacement will be ignored for this actor.\n",
AllSkills[gameskill].Name.GetChars(),
- Removed the third parameter from dumpclasses when it was restricted it to Actors, because I have no idea what that was all about. - Got rid of FActorInfo and merged it into a new PClassActor. SVN r2240 (scripting)
2010-03-24 02:49:37 +00:00
TypeName.GetChars(), skillrepname.GetChars());
AllSkills[gameskill].SetReplacement(TypeName, NAME_None);
- Added Gez's MageWandMissile customization patch but moved the new functionality into the FastProjectile base class and removed the native MageWandMissile class, using the generic functionality instead. - Fixed: GetReplacement and GetReplacee always checked the skill definitions, even if they weren't supposed to be used. It was also missing a range check for 'gameskill'. SVN r1894 (trunk)
2009-10-03 17:07:11 +00:00
AllSkills[gameskill].SetReplacedBy(skillrepname, NAME_None);
lookskill = false; skillrepname = NAME_None;
}
- Update for skill replacement. SVN r1682 (trunk)
2009-06-26 21:06:49 +00:00
}
- Added Gez's actor replacement per skill submission. SVN r1681 (trunk)
2009-06-26 17:17:52 +00:00
if (Replacement == NULL && (!lookskill || skillrepname == NAME_None))
- Added actor replacement for DECORATE. This works at a higher level than using duplicate DoomEdNums and will affect all attempts to spawn the replaced actor. However, because this happens for all spawns and not just at map load, the replacing actor must be compatible with the replaced actor, which means that an actor can only serve as a replacement for one of its baseclasses. For example, if you want to use a modified imp, you can use this DECORATE: actor MyImp : DoomImp replaces DoompImp { // Put changed properties here } - New: The IWAD dialog now remembers the last IWAD you picked and automatically highlights it the next time you run the game. This also applies if you check "Don't ask me this again": The IWAD selected will be the one that gets automatically loaded, not the one located first. (Using the -iwad parameter will not change the default IWAD.) In addition, you can now bring the dialog up even if you disable it by holding down SHIFT during startup. - Changed ExtractFilePath() and ExtractFileBase() to return FStrings instead of writing to a provided output buffer. ExtractFileBase() can also optionally keep the file's extension in the result. - Removed the -heapsize parameter entirely. The informational message should no longer be needed. - Removed -maxdemo parameter. There's no point to having it around since the demo buffer grows automatically. SVN r238 (trunk)
2006-07-08 02:17:35 +00:00
{
return this;
}
// The Replacement field is temporarily NULLed to prevent
// potential infinite recursion.
- Removed the third parameter from dumpclasses when it was restricted it to Actors, because I have no idea what that was all about. - Got rid of FActorInfo and merged it into a new PClassActor. SVN r2240 (scripting)
2010-03-24 02:49:37 +00:00
PClassActor *savedrep = Replacement;
- Added actor replacement for DECORATE. This works at a higher level than using duplicate DoomEdNums and will affect all attempts to spawn the replaced actor. However, because this happens for all spawns and not just at map load, the replacing actor must be compatible with the replaced actor, which means that an actor can only serve as a replacement for one of its baseclasses. For example, if you want to use a modified imp, you can use this DECORATE: actor MyImp : DoomImp replaces DoompImp { // Put changed properties here } - New: The IWAD dialog now remembers the last IWAD you picked and automatically highlights it the next time you run the game. This also applies if you check "Don't ask me this again": The IWAD selected will be the one that gets automatically loaded, not the one located first. (Using the -iwad parameter will not change the default IWAD.) In addition, you can now bring the dialog up even if you disable it by holding down SHIFT during startup. - Changed ExtractFilePath() and ExtractFileBase() to return FStrings instead of writing to a provided output buffer. ExtractFileBase() can also optionally keep the file's extension in the result. - Removed the -heapsize parameter entirely. The informational message should no longer be needed. - Removed -maxdemo parameter. There's no point to having it around since the demo buffer grows automatically. SVN r238 (trunk)
2006-07-08 02:17:35 +00:00
Replacement = NULL;
- Removed the third parameter from dumpclasses when it was restricted it to Actors, because I have no idea what that was all about. - Got rid of FActorInfo and merged it into a new PClassActor. SVN r2240 (scripting)
2010-03-24 02:49:37 +00:00
PClassActor *rep = savedrep;
- Added Gez's actor replacement per skill submission. SVN r1681 (trunk)
2009-06-26 17:17:52 +00:00
// Handle skill-based replacement here. It has precedence on DECORATE replacement
// in that the skill replacement is applied first, followed by DECORATE replacement
// on the actor indicated by the skill replacement.
- Update for skill replacement. SVN r1682 (trunk)
2009-06-26 21:06:49 +00:00
if (lookskill && (skillrepname != NAME_None))
- Added Gez's actor replacement per skill submission. SVN r1681 (trunk)
2009-06-26 17:17:52 +00:00
{
- Removed the third parameter from dumpclasses when it was restricted it to Actors, because I have no idea what that was all about. - Got rid of FActorInfo and merged it into a new PClassActor. SVN r2240 (scripting)
2010-03-24 02:49:37 +00:00
rep = PClass::FindActor(skillrepname);
- Added Gez's actor replacement per skill submission. SVN r1681 (trunk)
2009-06-26 17:17:52 +00:00
}
// Now handle DECORATE replacement chain
// Skill replacements are not recursive, contrarily to DECORATE replacements
rep = rep->GetReplacement(false);
// Reset the temporarily NULLed field
- Added actor replacement for DECORATE. This works at a higher level than using duplicate DoomEdNums and will affect all attempts to spawn the replaced actor. However, because this happens for all spawns and not just at map load, the replacing actor must be compatible with the replaced actor, which means that an actor can only serve as a replacement for one of its baseclasses. For example, if you want to use a modified imp, you can use this DECORATE: actor MyImp : DoomImp replaces DoompImp { // Put changed properties here } - New: The IWAD dialog now remembers the last IWAD you picked and automatically highlights it the next time you run the game. This also applies if you check "Don't ask me this again": The IWAD selected will be the one that gets automatically loaded, not the one located first. (Using the -iwad parameter will not change the default IWAD.) In addition, you can now bring the dialog up even if you disable it by holding down SHIFT during startup. - Changed ExtractFilePath() and ExtractFileBase() to return FStrings instead of writing to a provided output buffer. ExtractFileBase() can also optionally keep the file's extension in the result. - Removed the -heapsize parameter entirely. The informational message should no longer be needed. - Removed -maxdemo parameter. There's no point to having it around since the demo buffer grows automatically. SVN r238 (trunk)
2006-07-08 02:17:35 +00:00
Replacement = savedrep;
return rep;
}
- Fixed: The global WeaponSection string was never freed. It has been replaced with an FString now. - Fixed: The music strings in the default level info were never freed and caused memory leaks when used repeatedly. - Fixed: The intermusic string in the level info was never freed. - Fixed: The default fire obituary should only be printed if the damage came from the environment. If it comes from a monster the monster specific obituary should be used instead. - Added custom damage types from the floating point test release. - Changed Pain Elemental's massacre check. Now A_PainDie checks for the damage type and doesn't spawn anything if it is NAME_Massacre. A_PainDie can also be used by other actors so a more generalized approach is needed than hard coding it into the Pain Elemental. - Converted a few of Doom's monsters to DECORATE because I couldn't test the first version of the custom state code with the corpses inheriting from them. - Added custom states from last year's floating point test release and fixed some bugs I found in that code. Unfortunately it wasn't all salvageable and it was easier to recreate some parts from scratch. SVN r368 (trunk)
2006-10-31 14:53:21 +00:00
//==========================================================================
//
- Removed the third parameter from dumpclasses when it was restricted it to Actors, because I have no idea what that was all about. - Got rid of FActorInfo and merged it into a new PClassActor. SVN r2240 (scripting)
2010-03-24 02:49:37 +00:00
// PClassActor :: GetReplacee
- Fixed: The global WeaponSection string was never freed. It has been replaced with an FString now. - Fixed: The music strings in the default level info were never freed and caused memory leaks when used repeatedly. - Fixed: The intermusic string in the level info was never freed. - Fixed: The default fire obituary should only be printed if the damage came from the environment. If it comes from a monster the monster specific obituary should be used instead. - Added custom damage types from the floating point test release. - Changed Pain Elemental's massacre check. Now A_PainDie checks for the damage type and doesn't spawn anything if it is NAME_Massacre. A_PainDie can also be used by other actors so a more generalized approach is needed than hard coding it into the Pain Elemental. - Converted a few of Doom's monsters to DECORATE because I couldn't test the first version of the custom state code with the corpses inheriting from them. - Added custom states from last year's floating point test release and fixed some bugs I found in that code. Unfortunately it wasn't all salvageable and it was easier to recreate some parts from scratch. SVN r368 (trunk)
2006-10-31 14:53:21 +00:00
//
//==========================================================================
- Removed the third parameter from dumpclasses when it was restricted it to Actors, because I have no idea what that was all about. - Got rid of FActorInfo and merged it into a new PClassActor. SVN r2240 (scripting)
2010-03-24 02:49:37 +00:00
PClassActor *PClassActor::GetReplacee(bool lookskill)
- Added replacement handling to A_BossDeath. SVN r260 (trunk)
2006-07-16 15:00:10 +00:00
{
- Added Gez's MageWandMissile customization patch but moved the new functionality into the FastProjectile base class and removed the native MageWandMissile class, using the generic functionality instead. - Fixed: GetReplacement and GetReplacee always checked the skill definitions, even if they weren't supposed to be used. It was also missing a range check for 'gameskill'. SVN r1894 (trunk)
2009-10-03 17:07:11 +00:00
FName skillrepname;
if (lookskill && AllSkills.Size() > (unsigned)gameskill)
- More things from Gez's experimental build: * info CCMD to print extended actor information (not fully implemented yet) * summonmbf CCMD. * Beta BFG code pointer (but not the related missiles yet.) * PowerInvisibility enhancements. * ScoreItem with one significant change: Added a score variable that can be checked through ACS and DECORATE. The engine itself will do nothing with it. * Nailgun option for A_Explode. * A_PrintBold and A_Log. * A_SetSpecial. SVN r1819 (trunk)
2009-09-14 19:44:14 +00:00
{
- Removed the third parameter from dumpclasses when it was restricted it to Actors, because I have no idea what that was all about. - Got rid of FActorInfo and merged it into a new PClassActor. SVN r2240 (scripting)
2010-03-24 02:49:37 +00:00
skillrepname = AllSkills[gameskill].GetReplacedBy(TypeName);
- Added Gez's MageWandMissile customization patch but moved the new functionality into the FastProjectile base class and removed the native MageWandMissile class, using the generic functionality instead. - Fixed: GetReplacement and GetReplacee always checked the skill definitions, even if they weren't supposed to be used. It was also missing a range check for 'gameskill'. SVN r1894 (trunk)
2009-10-03 17:07:11 +00:00
if (skillrepname != NAME_None && PClass::FindClass(skillrepname) == NULL)
{
Printf("Warning: incorrect actor name in definition of skill %s: \n"
"non-existent class %s is replaced by class %s\n"
"Skill replacement will be ignored for this actor.\n",
AllSkills[gameskill].Name.GetChars(),
- Removed the third parameter from dumpclasses when it was restricted it to Actors, because I have no idea what that was all about. - Got rid of FActorInfo and merged it into a new PClassActor. SVN r2240 (scripting)
2010-03-24 02:49:37 +00:00
skillrepname.GetChars(), TypeName.GetChars());
AllSkills[gameskill].SetReplacedBy(TypeName, NAME_None);
- Added Gez's MageWandMissile customization patch but moved the new functionality into the FastProjectile base class and removed the native MageWandMissile class, using the generic functionality instead. - Fixed: GetReplacement and GetReplacee always checked the skill definitions, even if they weren't supposed to be used. It was also missing a range check for 'gameskill'. SVN r1894 (trunk)
2009-10-03 17:07:11 +00:00
AllSkills[gameskill].SetReplacement(skillrepname, NAME_None);
lookskill = false;
}
- Update for skill replacement. SVN r1682 (trunk)
2009-06-26 21:06:49 +00:00
}
- Added Gez's actor replacement per skill submission. SVN r1681 (trunk)
2009-06-26 17:17:52 +00:00
if (Replacee == NULL && (!lookskill || skillrepname == NAME_None))
- Added replacement handling to A_BossDeath. SVN r260 (trunk)
2006-07-16 15:00:10 +00:00
{
return this;
}
// The Replacee field is temporarily NULLed to prevent
// potential infinite recursion.
- Removed the third parameter from dumpclasses when it was restricted it to Actors, because I have no idea what that was all about. - Got rid of FActorInfo and merged it into a new PClassActor. SVN r2240 (scripting)
2010-03-24 02:49:37 +00:00
PClassActor *savedrep = Replacee;
- Added replacement handling to A_BossDeath. SVN r260 (trunk)
2006-07-16 15:00:10 +00:00
Replacee = NULL;
- Removed the third parameter from dumpclasses when it was restricted it to Actors, because I have no idea what that was all about. - Got rid of FActorInfo and merged it into a new PClassActor. SVN r2240 (scripting)
2010-03-24 02:49:37 +00:00
PClassActor *rep = savedrep;
- More things from Gez's experimental build: * info CCMD to print extended actor information (not fully implemented yet) * summonmbf CCMD. * Beta BFG code pointer (but not the related missiles yet.) * PowerInvisibility enhancements. * ScoreItem with one significant change: Added a score variable that can be checked through ACS and DECORATE. The engine itself will do nothing with it. * Nailgun option for A_Explode. * A_PrintBold and A_Log. * A_SetSpecial. SVN r1819 (trunk)
2009-09-14 19:44:14 +00:00
if (lookskill && (skillrepname != NAME_None) && (PClass::FindClass(skillrepname) != NULL))
{
- Removed the third parameter from dumpclasses when it was restricted it to Actors, because I have no idea what that was all about. - Got rid of FActorInfo and merged it into a new PClassActor. SVN r2240 (scripting)
2010-03-24 02:49:37 +00:00
rep = PClass::FindActor(skillrepname);
- More things from Gez's experimental build: * info CCMD to print extended actor information (not fully implemented yet) * summonmbf CCMD. * Beta BFG code pointer (but not the related missiles yet.) * PowerInvisibility enhancements. * ScoreItem with one significant change: Added a score variable that can be checked through ACS and DECORATE. The engine itself will do nothing with it. * Nailgun option for A_Explode. * A_PrintBold and A_Log. * A_SetSpecial. SVN r1819 (trunk)
2009-09-14 19:44:14 +00:00
}
- Removed the third parameter from dumpclasses when it was restricted it to Actors, because I have no idea what that was all about. - Got rid of FActorInfo and merged it into a new PClassActor. SVN r2240 (scripting)
2010-03-24 02:49:37 +00:00
rep = rep->GetReplacee(false);
Replacee = savedrep;
- Added replacement handling to A_BossDeath. SVN r260 (trunk)
2006-07-16 15:00:10 +00:00
return rep;
}
- Added and fixed Boss death submission for random spawner. - Added functions to FActorInfo that can set the damage factors and pain chances to reduce the chance of new errors when working with these features. - Fixed: The handling of the deprecated FIRERESIST flag didn't work. There were 3 problems: * Actor defaults have no class information so HandleDeprecatedFlags needs to be passed a pointer to the ActorInfo. * The DamageFactors list is only created when needed so the code needs to check if it already exists. * damage factors are stored as fixed_t but this set a float. - Added a traditional Strife color set for the automap. SVN r1183 (trunk)
2008-08-23 08:48:19 +00:00
//==========================================================================
//
- Removed the third parameter from dumpclasses when it was restricted it to Actors, because I have no idea what that was all about. - Got rid of FActorInfo and merged it into a new PClassActor. SVN r2240 (scripting)
2010-03-24 02:49:37 +00:00
// PClassActor :: SetDamageFactor
- Added and fixed Boss death submission for random spawner. - Added functions to FActorInfo that can set the damage factors and pain chances to reduce the chance of new errors when working with these features. - Fixed: The handling of the deprecated FIRERESIST flag didn't work. There were 3 problems: * Actor defaults have no class information so HandleDeprecatedFlags needs to be passed a pointer to the ActorInfo. * The DamageFactors list is only created when needed so the code needs to check if it already exists. * damage factors are stored as fixed_t but this set a float. - Added a traditional Strife color set for the automap. SVN r1183 (trunk)
2008-08-23 08:48:19 +00:00
//
//==========================================================================
- Removed the third parameter from dumpclasses when it was restricted it to Actors, because I have no idea what that was all about. - Got rid of FActorInfo and merged it into a new PClassActor. SVN r2240 (scripting)
2010-03-24 02:49:37 +00:00
void PClassActor::SetDamageFactor(FName type, fixed_t factor)
- Added and fixed Boss death submission for random spawner. - Added functions to FActorInfo that can set the damage factors and pain chances to reduce the chance of new errors when working with these features. - Fixed: The handling of the deprecated FIRERESIST flag didn't work. There were 3 problems: * Actor defaults have no class information so HandleDeprecatedFlags needs to be passed a pointer to the ActorInfo. * The DamageFactors list is only created when needed so the code needs to check if it already exists. * damage factors are stored as fixed_t but this set a float. - Added a traditional Strife color set for the automap. SVN r1183 (trunk)
2008-08-23 08:48:19 +00:00
{
- Keep all damage factors in the table, even those that are 1.0. - 256 is a valid pain chance, so clamp to that, not 255. SVN r2237 (trunk)
2010-03-22 21:18:54 +00:00
if (DamageFactors == NULL)
- Added and fixed Boss death submission for random spawner. - Added functions to FActorInfo that can set the damage factors and pain chances to reduce the chance of new errors when working with these features. - Fixed: The handling of the deprecated FIRERESIST flag didn't work. There were 3 problems: * Actor defaults have no class information so HandleDeprecatedFlags needs to be passed a pointer to the ActorInfo. * The DamageFactors list is only created when needed so the code needs to check if it already exists. * damage factors are stored as fixed_t but this set a float. - Added a traditional Strife color set for the automap. SVN r1183 (trunk)
2008-08-23 08:48:19 +00:00
{
- Keep all damage factors in the table, even those that are 1.0. - 256 is a valid pain chance, so clamp to that, not 255. SVN r2237 (trunk)
2010-03-22 21:18:54 +00:00
DamageFactors = new DmgFactors;
- Added and fixed Boss death submission for random spawner. - Added functions to FActorInfo that can set the damage factors and pain chances to reduce the chance of new errors when working with these features. - Fixed: The handling of the deprecated FIRERESIST flag didn't work. There were 3 problems: * Actor defaults have no class information so HandleDeprecatedFlags needs to be passed a pointer to the ActorInfo. * The DamageFactors list is only created when needed so the code needs to check if it already exists. * damage factors are stored as fixed_t but this set a float. - Added a traditional Strife color set for the automap. SVN r1183 (trunk)
2008-08-23 08:48:19 +00:00
}
- Keep all damage factors in the table, even those that are 1.0. - 256 is a valid pain chance, so clamp to that, not 255. SVN r2237 (trunk)
2010-03-22 21:18:54 +00:00
DamageFactors->Insert(type, factor);
- Added and fixed Boss death submission for random spawner. - Added functions to FActorInfo that can set the damage factors and pain chances to reduce the chance of new errors when working with these features. - Fixed: The handling of the deprecated FIRERESIST flag didn't work. There were 3 problems: * Actor defaults have no class information so HandleDeprecatedFlags needs to be passed a pointer to the ActorInfo. * The DamageFactors list is only created when needed so the code needs to check if it already exists. * damage factors are stored as fixed_t but this set a float. - Added a traditional Strife color set for the automap. SVN r1183 (trunk)
2008-08-23 08:48:19 +00:00
}
//==========================================================================
//
- Removed the third parameter from dumpclasses when it was restricted it to Actors, because I have no idea what that was all about. - Got rid of FActorInfo and merged it into a new PClassActor. SVN r2240 (scripting)
2010-03-24 02:49:37 +00:00
// PClassActor :: SetPainChance
- Added and fixed Boss death submission for random spawner. - Added functions to FActorInfo that can set the damage factors and pain chances to reduce the chance of new errors when working with these features. - Fixed: The handling of the deprecated FIRERESIST flag didn't work. There were 3 problems: * Actor defaults have no class information so HandleDeprecatedFlags needs to be passed a pointer to the ActorInfo. * The DamageFactors list is only created when needed so the code needs to check if it already exists. * damage factors are stored as fixed_t but this set a float. - Added a traditional Strife color set for the automap. SVN r1183 (trunk)
2008-08-23 08:48:19 +00:00
//
//==========================================================================
- Removed the third parameter from dumpclasses when it was restricted it to Actors, because I have no idea what that was all about. - Got rid of FActorInfo and merged it into a new PClassActor. SVN r2240 (scripting)
2010-03-24 02:49:37 +00:00
void PClassActor::SetPainChance(FName type, int chance)
- Added and fixed Boss death submission for random spawner. - Added functions to FActorInfo that can set the damage factors and pain chances to reduce the chance of new errors when working with these features. - Fixed: The handling of the deprecated FIRERESIST flag didn't work. There were 3 problems: * Actor defaults have no class information so HandleDeprecatedFlags needs to be passed a pointer to the ActorInfo. * The DamageFactors list is only created when needed so the code needs to check if it already exists. * damage factors are stored as fixed_t but this set a float. - Added a traditional Strife color set for the automap. SVN r1183 (trunk)
2008-08-23 08:48:19 +00:00
{
if (chance >= 0)
{
- Removed the third parameter from dumpclasses when it was restricted it to Actors, because I have no idea what that was all about. - Got rid of FActorInfo and merged it into a new PClassActor. SVN r2240 (scripting)
2010-03-24 02:49:37 +00:00
if (PainChances == NULL)
{
PainChances = new PainChanceList;
}
- Keep all damage factors in the table, even those that are 1.0. - 256 is a valid pain chance, so clamp to that, not 255. SVN r2237 (trunk)
2010-03-22 21:18:54 +00:00
PainChances->Insert(type, MIN(chance, 256));
- Added and fixed Boss death submission for random spawner. - Added functions to FActorInfo that can set the damage factors and pain chances to reduce the chance of new errors when working with these features. - Fixed: The handling of the deprecated FIRERESIST flag didn't work. There were 3 problems: * Actor defaults have no class information so HandleDeprecatedFlags needs to be passed a pointer to the ActorInfo. * The DamageFactors list is only created when needed so the code needs to check if it already exists. * damage factors are stored as fixed_t but this set a float. - Added a traditional Strife color set for the automap. SVN r1183 (trunk)
2008-08-23 08:48:19 +00:00
}
- Removed the third parameter from dumpclasses when it was restricted it to Actors, because I have no idea what that was all about. - Got rid of FActorInfo and merged it into a new PClassActor. SVN r2240 (scripting)
2010-03-24 02:49:37 +00:00
else if (PainChances != NULL)
- Added and fixed Boss death submission for random spawner. - Added functions to FActorInfo that can set the damage factors and pain chances to reduce the chance of new errors when working with these features. - Fixed: The handling of the deprecated FIRERESIST flag didn't work. There were 3 problems: * Actor defaults have no class information so HandleDeprecatedFlags needs to be passed a pointer to the ActorInfo. * The DamageFactors list is only created when needed so the code needs to check if it already exists. * damage factors are stored as fixed_t but this set a float. - Added a traditional Strife color set for the automap. SVN r1183 (trunk)
2008-08-23 08:48:19 +00:00
{
- Removed the third parameter from dumpclasses when it was restricted it to Actors, because I have no idea what that was all about. - Got rid of FActorInfo and merged it into a new PClassActor. SVN r2240 (scripting)
2010-03-24 02:49:37 +00:00
PainChances->Remove(type);
- Added and fixed Boss death submission for random spawner. - Added functions to FActorInfo that can set the damage factors and pain chances to reduce the chance of new errors when working with these features. - Fixed: The handling of the deprecated FIRERESIST flag didn't work. There were 3 problems: * Actor defaults have no class information so HandleDeprecatedFlags needs to be passed a pointer to the ActorInfo. * The DamageFactors list is only created when needed so the code needs to check if it already exists. * damage factors are stored as fixed_t but this set a float. - Added a traditional Strife color set for the automap. SVN r1183 (trunk)
2008-08-23 08:48:19 +00:00
}
}
- added DavidPH's damage type specific damage color submission. SVN r3220 (trunk)
2011-06-06 22:23:43 +00:00
- fixed: It is not guaranteed that the class object that is created by FindClassTentative actually matches the real object that is required later, so it needs to be replaced wherever it could be referenced once the real object is created. - removed some unneeded code from earlier attempts to fix the class type resolving issue.
2016-02-09 22:08:51 +00:00
//==========================================================================
//
// PClassActor :: ReplaceClassRef
//
//==========================================================================
void PClassActor::ReplaceClassRef(PClass *oldclass, PClass *newclass)
{
for (unsigned i = 0; i < VisibleToPlayerClass.Size(); i++)
{
if (VisibleToPlayerClass[i] == oldclass)
VisibleToPlayerClass[i] = static_cast<PClassPlayerPawn*>(newclass);
}
AActor *def = (AActor*)Defaults;
if (def != NULL)
{
if (def->TeleFogSourceType == oldclass) def->TeleFogSourceType = static_cast<PClassActor *>(newclass);
if (def->TeleFogDestType == oldclass) def->TeleFogDestType = static_cast<PClassActor *>(newclass);
}
}
- Fixed: Armor did not use damagefactor "Normal" as a fallback factor. SVN r3469 (trunk)
2012-03-23 01:20:45 +00:00
//==========================================================================
//
// DmgFactors :: CheckFactor
//
// Checks for the existance of a certain damage type. If that type does not
// exist, the damage factor for type 'None' will be returned, if present.
//
//==========================================================================
fixed_t *DmgFactors::CheckFactor(FName type)
{
fixed_t *pdf = CheckKey(type);
if (pdf == NULL && type != NAME_None)
{
pdf = CheckKey(NAME_None);
}
return pdf;
}
- Added Karate Chris's patch to optionally specify an angle offset for summoning. - Added Karate Chris's fix for Serpent Staff vampirism on teammates. - Locks and teleporters now take precedence over one-sidedness for automap coloring. SVN r1317 (trunk)
2008-12-16 01:23:44 +00:00
static void SummonActor (int command, int command2, FCommandLine argv)
Directory restructuring to make it easier to version projects that don't build zdoom.exe. SVN r4 (trunk)
2006-02-24 04:48:15 +00:00
{
if (CheckCheatmode ())
return;
if (argv.argc() > 1)
{
- Update scripting branch to trunk. SVN r3758 (scripting)
2012-07-14 03:04:41 +00:00
PClassActor *type = PClass::FindActor(argv[1]);
Directory restructuring to make it easier to version projects that don't build zdoom.exe. SVN r4 (trunk)
2006-02-24 04:48:15 +00:00
if (type == NULL)
{
- Update scripting branch to trunk. SVN r3758 (scripting)
2012-07-14 03:04:41 +00:00
Printf ("Unknown actor '%s'\n", argv[1]);
Directory restructuring to make it easier to version projects that don't build zdoom.exe. SVN r4 (trunk)
2006-02-24 04:48:15 +00:00
return;
}
- Added Karate Chris's patch to optionally specify an angle offset for summoning. - Added Karate Chris's fix for Serpent Staff vampirism on teammates. - Locks and teleporters now take precedence over one-sidedness for automap coloring. SVN r1317 (trunk)
2008-12-16 01:23:44 +00:00
Net_WriteByte (argv.argc() > 2 ? command2 : command);
- Backported the classnames-are-names changes from the FP code. SVN r97 (trunk)
2006-05-10 02:40:43 +00:00
Net_WriteString (type->TypeName.GetChars());
- Added Karate Chris's patch to optionally specify an angle offset for summoning. - Added Karate Chris's fix for Serpent Staff vampirism on teammates. - Locks and teleporters now take precedence over one-sidedness for automap coloring. SVN r1317 (trunk)
2008-12-16 01:23:44 +00:00
- Update scripting branch to trunk. SVN r3758 (scripting)
2012-07-14 03:04:41 +00:00
if (argv.argc () > 2)
{
- Added kgsws's SummonActor enhancement and bumped netgame and demo versions because this submission changes an existing command. SVN r1749 (trunk)
2009-08-03 20:40:45 +00:00
Net_WriteWord (atoi (argv[2])); // angle
- Update scripting branch to trunk. SVN r3758 (scripting)
2012-07-14 03:04:41 +00:00
Net_WriteWord ((argv.argc() > 3) ? atoi(argv[3]) : 0); // TID
Net_WriteByte ((argv.argc() > 4) ? atoi(argv[4]) : 0); // special
for (int i = 5; i < 10; i++)
{ // args[5]
Net_WriteLong((i < argv.argc()) ? atoi(argv[i]) : 0);
- Added kgsws's SummonActor enhancement and bumped netgame and demo versions because this submission changes an existing command. SVN r1749 (trunk)
2009-08-03 20:40:45 +00:00
}
}
Directory restructuring to make it easier to version projects that don't build zdoom.exe. SVN r4 (trunk)
2006-02-24 04:48:15 +00:00
}
}
- Added Karate Chris's patch to optionally specify an angle offset for summoning. - Added Karate Chris's fix for Serpent Staff vampirism on teammates. - Locks and teleporters now take precedence over one-sidedness for automap coloring. SVN r1317 (trunk)
2008-12-16 01:23:44 +00:00
CCMD (summon)
Directory restructuring to make it easier to version projects that don't build zdoom.exe. SVN r4 (trunk)
2006-02-24 04:48:15 +00:00
{
- Added Karate Chris's patch to optionally specify an angle offset for summoning. - Added Karate Chris's fix for Serpent Staff vampirism on teammates. - Locks and teleporters now take precedence over one-sidedness for automap coloring. SVN r1317 (trunk)
2008-12-16 01:23:44 +00:00
SummonActor (DEM_SUMMON, DEM_SUMMON2, argv);
}
Directory restructuring to make it easier to version projects that don't build zdoom.exe. SVN r4 (trunk)
2006-02-24 04:48:15 +00:00
- Added Karate Chris's patch to optionally specify an angle offset for summoning. - Added Karate Chris's fix for Serpent Staff vampirism on teammates. - Locks and teleporters now take precedence over one-sidedness for automap coloring. SVN r1317 (trunk)
2008-12-16 01:23:44 +00:00
CCMD (summonfriend)
{
SummonActor (DEM_SUMMONFRIEND, DEM_SUMMONFRIEND2, argv);
Directory restructuring to make it easier to version projects that don't build zdoom.exe. SVN r4 (trunk)
2006-02-24 04:48:15 +00:00
}
- Added a summonfoe CCMD, which is analagous to summonfriend but forces the summoned creature to be hostile instead. SVN r453 (trunk)
2007-01-16 03:04:00 +00:00
- More things from Gez's experimental build: * info CCMD to print extended actor information (not fully implemented yet) * summonmbf CCMD. * Beta BFG code pointer (but not the related missiles yet.) * PowerInvisibility enhancements. * ScoreItem with one significant change: Added a score variable that can be checked through ACS and DECORATE. The engine itself will do nothing with it. * Nailgun option for A_Explode. * A_PrintBold and A_Log. * A_SetSpecial. SVN r1819 (trunk)
2009-09-14 19:44:14 +00:00
CCMD (summonmbf)
{
SummonActor (DEM_SUMMONMBF, DEM_SUMMONFRIEND2, argv);
}
- Added a summonfoe CCMD, which is analagous to summonfriend but forces the summoned creature to be hostile instead. SVN r453 (trunk)
2007-01-16 03:04:00 +00:00
CCMD (summonfoe)
{
- Added Karate Chris's patch to optionally specify an angle offset for summoning. - Added Karate Chris's fix for Serpent Staff vampirism on teammates. - Locks and teleporters now take precedence over one-sidedness for automap coloring. SVN r1317 (trunk)
2008-12-16 01:23:44 +00:00
SummonActor (DEM_SUMMONFOE, DEM_SUMMONFOE2, argv);
- Added a summonfoe CCMD, which is analagous to summonfriend but forces the summoned creature to be hostile instead. SVN r453 (trunk)
2007-01-16 03:04:00 +00:00
}
- added FDARI's Default/global damagetype properties submission. SVN r3523 (trunk)
2012-04-07 12:11:17 +00:00
// Damage type defaults / global settings
TMap<FName, DamageTypeDefinition> GlobalDamageDefinitions;
- reverted a few of Zzombo's changes.
2015-02-07 16:02:46 +00:00
void DamageTypeDefinition::Apply(FName type)
- added FDARI's Default/global damagetype properties submission. SVN r3523 (trunk)
2012-04-07 12:11:17 +00:00
{
GlobalDamageDefinitions[type] = *this;
}
- reverted a few of Zzombo's changes.
2015-02-07 16:02:46 +00:00
DamageTypeDefinition *DamageTypeDefinition::Get(FName type)
- added FDARI's Default/global damagetype properties submission. SVN r3523 (trunk)
2012-04-07 12:11:17 +00:00
{
return GlobalDamageDefinitions.CheckKey(type);
}
- reverted a few of Zzombo's changes.
2015-02-07 16:02:46 +00:00
bool DamageTypeDefinition::IgnoreArmor(FName type)
- added FDARI's Default/global damagetype properties submission. SVN r3523 (trunk)
2012-04-07 12:11:17 +00:00
{
DamageTypeDefinition *dtd = Get(type);
if (dtd) return dtd->NoArmor;
return false;
}
//==========================================================================
//
// DamageTypeDefinition :: ApplyMobjDamageFactor
//
// Calculates mobj damage based on original damage, defined damage factors
// and damage type.
//
// If the specific damage type is not defined, the damage factor for
// type 'None' will be used (with 1.0 as a default value).
//
// Globally declared damage types may override or multiply the damage
// factor when 'None' is used as a fallback in this function.
//
//==========================================================================
- reverted a few of Zzombo's changes.
2015-02-07 16:02:46 +00:00
int DamageTypeDefinition::ApplyMobjDamageFactor(int damage, FName type, DmgFactors const * const factors)
- added FDARI's Default/global damagetype properties submission. SVN r3523 (trunk)
2012-04-07 12:11:17 +00:00
{
if (factors)
{
// If the actor has named damage factors, look for a specific factor
fixed_t const *pdf = factors->CheckKey(type);
if (pdf) return FixedMul(damage, *pdf); // type specific damage type
// If this was nonspecific damage, don't fall back to nonspecific search
if (type == NAME_None) return damage;
}
// If this was nonspecific damage, don't fall back to nonspecific search
else if (type == NAME_None)
{
return damage;
}
else
{
// Normal is unsupplied / 1.0, so there's no difference between modifying and overriding
DamageTypeDefinition *dtd = Get(type);
return dtd ? FixedMul(damage, dtd->DefaultFactor) : damage;
}
{
fixed_t const *pdf = factors->CheckKey(NAME_None);
- added FDARI*s damagetype fix SVN r3533 (trunk)
2012-04-07 15:29:47 +00:00
DamageTypeDefinition *dtd = Get(type);
- added FDARI's Default/global damagetype properties submission. SVN r3523 (trunk)
2012-04-07 12:11:17 +00:00
// Here we are looking for modifications to untyped damage
// If the calling actor defines untyped damage factor, that is contained in "pdf".
if (pdf) // normal damage available
{
if (dtd)
{
if (dtd->ReplaceFactor) return FixedMul(damage, dtd->DefaultFactor); // use default instead of untyped factor
return FixedMul(damage, FixedMul(*pdf, dtd->DefaultFactor)); // use default as modification of untyped factor
}
return FixedMul(damage, *pdf); // there was no default, so actor default is used
}
- added FDARI*s damagetype fix SVN r3533 (trunk)
2012-04-07 15:29:47 +00:00
else if (dtd)
{
return FixedMul(damage, dtd->DefaultFactor); // implicit untyped factor 1.0 does not need to be applied/replaced explicitly
}
- added FDARI's Default/global damagetype properties submission. SVN r3523 (trunk)
2012-04-07 12:11:17 +00:00
}
return damage;
}
Reference in a new issue Copy permalink