zdoom/gzdoom
0
0
Fork 0
mirror of https://github.com/ZDoom/gzdoom.git synced 2024-11-11 15:21:51 +00:00
Code Issues Projects Releases Packages Wiki Activity

- started with cleanup and separation of DECORATE code.

Browse source 
* everything related to scripting is now placed in a subdirectory 'scripting', which itself is separated into DECORATE, ZSCRIPT, the VM and code generation.
 * a few items have been moved to different headers so that the DECORATE parser definitions can mostly be kept local. The only exception at the moment is the flags interface on which 3 source files depend.
This commit is contained in:
Christoph Oelckers 2016-10-12 19:22:33 +02:00
parent 6a8ab9a4d3
commit b1a83bfd26
132 changed files with 234 additions and 198 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

70
src/CMakeLists.txt
View file

@ -752,8 +752,8 @@ add_custom_command( OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/xlat_parser.c ${CMAKE_CUR
DEPENDS lemon ${CMAKE_CURRENT_SOURCE_DIR}/xlat/xlat_parser.y )
add_custom_command( OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/zcc-parse.c ${CMAKE_CURRENT_BINARY_DIR}/zcc-parse.h
COMMAND lemon -C${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/zscript/zcc-parse.lemon
DEPENDS lemon ${CMAKE_CURRENT_SOURCE_DIR}/zscript/zcc-parse.lemon )
COMMAND lemon -C${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/scripting/zscript/zcc-parse.lemon
DEPENDS lemon ${CMAKE_CURRENT_SOURCE_DIR}/scripting/zscript/zcc-parse.lemon )
add_custom_command( OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/sc_man_scanner.h
COMMAND re2c --no-generation-date -s -o ${CMAKE_CURRENT_BINARY_DIR}/sc_man_scanner.h ${CMAKE_CURRENT_SOURCE_DIR}/sc_man_scanner.re
@ -819,9 +819,9 @@ file( GLOB HEADER_FILES
sfmt/*.h
sound/*.h
textures/*.h
thingdef/*.h
scripting/*.h
scripting/vm/*.h
xlat/*.h
zscript/*.h
*.h
)
@ -910,7 +910,7 @@ set( NOT_COMPILED_SOURCE_FILES
xlat/xlat_parser.y
xlat_parser.c
xlat_parser.h
zscript/zcc-parse.lemon
scripting/zscript/zcc-parse.lemon
zcc-parse.c
zcc-parse.h
@ -1226,14 +1226,6 @@ set (PCH_SOURCES
textures/texturemanager.cpp
textures/tgatexture.cpp
textures/warptexture.cpp
thingdef/olddecorations.cpp
thingdef/thingdef.cpp
thingdef/thingdef_data.cpp
thingdef/thingdef_exp.cpp
thingdef/thingdef_expression.cpp
thingdef/thingdef_parse.cpp
thingdef/thingdef_properties.cpp
thingdef/thingdef_states.cpp
xlat/parse_xlat.cpp
fragglescript/t_func.cpp
fragglescript/t_load.cpp
@ -1248,15 +1240,23 @@ set (PCH_SOURCES
r_data/voxels.cpp
r_data/renderstyle.cpp
r_data/r_interpolate.cpp
scripting/thingdef.cpp
scripting/thingdef_data.cpp
scripting/thingdef_properties.cpp
scripting/codegeneration/thingdef_expression.cpp
scripting/decorate/olddecorations.cpp
scripting/decorate/thingdef_exp.cpp
scripting/decorate/thingdef_parse.cpp
scripting/decorate/thingdef_states.cpp
scripting/vm/vmbuilder.cpp
scripting/vm/vmdisasm.cpp
scripting/vm/vmexec.cpp
scripting/vm/vmframe.cpp
scripting/zscript/ast.cpp
scripting/zscript/zcc_compile.cpp
scripting/zscript/zcc_expr.cpp
scripting/zscript/zcc_parser.cpp
sfmt/SFMT.cpp
zscript/ast.cpp
zscript/vmbuilder.cpp
zscript/vmdisasm.cpp
zscript/vmexec.cpp
zscript/vmframe.cpp
zscript/zcc_compile.cpp
zscript/zcc_expr.cpp
zscript/zcc_parser.cpp
)
enable_precompiled_headers( g_pch.h PCH_SOURCES )
@ -1316,11 +1316,11 @@ include_directories( .
oplsynth
sound
textures
thingdef
timidity
wildmidi
xlat
zscript
scripting
scripting/vm
../gdtoa
../dumb/include
${CMAKE_BINARY_DIR}/gdtoa
@ -1428,7 +1428,9 @@ source_group("Audio Files\\Timidity\\Headers" REGULAR_EXPRESSION "^${CMAKE_CURRE
source_group("Audio Files\\Timidity\\Source" REGULAR_EXPRESSION "^${CMAKE_CURRENT_SOURCE_DIR}/timidity/.+\\.cpp$")
source_group("Audio Files\\WildMidi\\Headers" REGULAR_EXPRESSION "^${CMAKE_CURRENT_SOURCE_DIR}/wildmidi/.+\\.h$")
source_group("Audio Files\\WildMidi\\Source" REGULAR_EXPRESSION "^${CMAKE_CURRENT_SOURCE_DIR}/wildmidi/.+\\.cpp$")
source_group("Decorate++" REGULAR_EXPRESSION "^${CMAKE_CURRENT_SOURCE_DIR}/thingdef/.+")
source_group("External\\Math" REGULAR_EXPRESSION "^${CMAKE_CURRENT_SOURCE_DIR}/math/.+")
source_group("External\\RapidJSON" REGULAR_EXPRESSION "^${CMAKE_CURRENT_SOURCE_DIR}/rapidjson/.+")
source_group("Externak\\SFMT" REGULAR_EXPRESSION "^${CMAKE_CURRENT_SOURCE_DIR}/sfmt/.+")
source_group("FraggleScript" REGULAR_EXPRESSION "^${CMAKE_CURRENT_SOURCE_DIR}/fragglescript/.+")
source_group("Games\\Doom Game" REGULAR_EXPRESSION "^${CMAKE_CURRENT_SOURCE_DIR}/g_doom/.+")
source_group("Games\\Heretic Game" REGULAR_EXPRESSION "^${CMAKE_CURRENT_SOURCE_DIR}/g_heretic/.+")
@ -1436,9 +1438,7 @@ source_group("Games\\Hexen Game" REGULAR_EXPRESSION "^${CMAKE_CURRENT_SOURCE_DIR
source_group("Games\\Raven Shared" REGULAR_EXPRESSION "^${CMAKE_CURRENT_SOURCE_DIR}/g_raven/.+")
source_group("Games\\Strife Game" REGULAR_EXPRESSION "^${CMAKE_CURRENT_SOURCE_DIR}/g_strife/.+")
source_group("Intermission" REGULAR_EXPRESSION "^${CMAKE_CURRENT_SOURCE_DIR}/intermission/.+")
source_group("Math" REGULAR_EXPRESSION "^${CMAKE_CURRENT_SOURCE_DIR}/math/.+")
source_group("Menu" REGULAR_EXPRESSION "^${CMAKE_CURRENT_SOURCE_DIR}/menu/.+")
source_group("RapidJSON" REGULAR_EXPRESSION "^${CMAKE_CURRENT_SOURCE_DIR}/rapidjson/.+")
source_group("Render Core\\Render Headers" REGULAR_EXPRESSION "^${CMAKE_CURRENT_SOURCE_DIR}/r_.+\\.h$")
source_group("Render Core\\Render Sources" REGULAR_EXPRESSION "^${CMAKE_CURRENT_SOURCE_DIR}/r_.+\\.cpp$")
source_group("Render Data\\Resource Headers" REGULAR_EXPRESSION "^${CMAKE_CURRENT_SOURCE_DIR}/r_data/.+\\.h$")
@ -1446,15 +1446,17 @@ source_group("Render Data\\Resource Sources" REGULAR_EXPRESSION "^${CMAKE_CURREN
source_group("Render Data\\Textures" REGULAR_EXPRESSION "^${CMAKE_CURRENT_SOURCE_DIR}/textures/.+")
source_group("Render Interface" FILES r_defs.h r_renderer.h r_sky.cpp r_sky.h r_state.h r_utility.cpp r_utility.h)
source_group("Resource Files" REGULAR_EXPRESSION "^${CMAKE_CURRENT_SOURCE_DIR}/resourcefiles/.+")
source_group("POSIX Files" REGULAR_EXPRESSION "^${CMAKE_CURRENT_SOURCE_DIR}/posix/.+")
source_group("Cocoa Files" REGULAR_EXPRESSION "^${CMAKE_CURRENT_SOURCE_DIR}/posix/cocoa/.+")
source_group("OS X Files" REGULAR_EXPRESSION "^${CMAKE_CURRENT_SOURCE_DIR}/posix/osx/.+")
source_group("Unix Files" REGULAR_EXPRESSION "^${CMAKE_CURRENT_SOURCE_DIR}/posix/unix/.+")
source_group("SDL Files" REGULAR_EXPRESSION "^${CMAKE_CURRENT_SOURCE_DIR}/posix/sdl/.+")
source_group("SFMT" REGULAR_EXPRESSION "^${CMAKE_CURRENT_SOURCE_DIR}/sfmt/.+")
source_group("Platforms\\POSIX Files" REGULAR_EXPRESSION "^${CMAKE_CURRENT_SOURCE_DIR}/posix/.+")
source_group("Platforms\\Cocoa Files" REGULAR_EXPRESSION "^${CMAKE_CURRENT_SOURCE_DIR}/posix/cocoa/.+")
source_group("Platforms\\OS X Files" REGULAR_EXPRESSION "^${CMAKE_CURRENT_SOURCE_DIR}/posix/osx/.+")
source_group("Platforms\\Unix Files" REGULAR_EXPRESSION "^${CMAKE_CURRENT_SOURCE_DIR}/posix/unix/.+")
source_group("Platforms\\SDL Files" REGULAR_EXPRESSION "^${CMAKE_CURRENT_SOURCE_DIR}/posix/sdl/.+")
source_group("Platforms\\Win32 Files" REGULAR_EXPRESSION "^${CMAKE_CURRENT_SOURCE_DIR}/win32/.+")
source_group("Scripting\\Decorate" REGULAR_EXPRESSION "^${CMAKE_CURRENT_SOURCE_DIR}/scripting/decorate/.+")
source_group("Scripting\\ZScript" REGULAR_EXPRESSION "^${CMAKE_CURRENT_SOURCE_DIR}/scripting/zscript/.+" FILES ${CMAKE_CURRENT_BINARY_DIR}/zcc-parse.c ${CMAKE_CURRENT_BINARY_DIR}/zcc-parse.h)
source_group("Scripting\\Code Generation" REGULAR_EXPRESSION "^${CMAKE_CURRENT_SOURCE_DIR}/scripting/codegeneration/.+")
source_group("Scripting\\VM" REGULAR_EXPRESSION "^${CMAKE_CURRENT_SOURCE_DIR}/scripting/vm/.+")
source_group("Shared Game" REGULAR_EXPRESSION "^${CMAKE_CURRENT_SOURCE_DIR}/g_shared/.+")
source_group("Versioning" FILES version.h win32/zdoom.rc)
source_group("Win32 Files" REGULAR_EXPRESSION "^${CMAKE_CURRENT_SOURCE_DIR}/win32/.+")
source_group("Xlat" REGULAR_EXPRESSION "^${CMAKE_CURRENT_SOURCE_DIR}/xlat/.+" FILES ${CMAKE_CURRENT_BINARY_DIR}/xlat_parser.c ${CMAKE_CURRENT_BINARY_DIR}/xlat_parser.h)
source_group("ZScript" REGULAR_EXPRESSION "^${CMAKE_CURRENT_SOURCE_DIR}/zscript/.+" FILES ${CMAKE_CURRENT_BINARY_DIR}/zcc-parse.c ${CMAKE_CURRENT_BINARY_DIR}/zcc-parse.h)
source_group("Source Files" FILES ${CMAKE_CURRENT_BINARY_DIR}/sc_man_scanner.h sc_man_scanner.re)

3
src/d_dehacked.cpp
View file

@ -70,6 +70,9 @@
#include "doomerrors.h"
#include "p_effect.h"
#include "serializer.h"
#include "vm.h"
#include "thingdef.h"
#include "info.h"
#include "vmbuilder.h"
// [SO] Just the way Randy said to do it :)

1
src/d_main.cpp
View file

@ -109,6 +109,7 @@
#include "p_local.h"
#include "autosegs.h"
#include "fragglescript/t_fs.h"
#include "vm.h"
EXTERN_CVAR(Bool, hud_althud)
void DrawHUD();

1
src/dobjgc.cpp
View file

@ -77,6 +77,7 @@
#include "r_utility.h"
#include "menu/menu.h"
#include "intermission/intermission.h"
#include "vm.h"
// MACROS ------------------------------------------------------------------

1
src/dobjtype.h
View file

@ -68,7 +68,6 @@ struct StateCallData;
class VMFrameStack;
struct VMValue;
struct VMReturn;
typedef int (*actionf_p)(VMFrameStack *stack, VMValue *param, int numparam, VMReturn *ret, int numret);/*(VM_ARGS)*/
class VMFunction;
// A VM function ------------------------------------------------------------

2
src/g_doom/a_arachnotron.cpp
View file

@ -4,7 +4,7 @@
#include "p_local.h"
#include "p_enemy.h"
#include "a_action.h"
#include "thingdef/thingdef.h"
#include "vm.h"
*/
DEFINE_ACTION_FUNCTION(AActor, A_BspiAttack)

2
src/g_doom/a_archvile.cpp
View file

@ -6,7 +6,7 @@
#include "p_enemy.h"
#include "gstrings.h"
#include "a_action.h"
#include "thingdef/thingdef.h"
#include "vm.h"
*/
//

2
src/g_doom/a_bossbrain.cpp
View file

@ -7,7 +7,7 @@
#include "s_sound.h"
#include "statnums.h"
#include "a_specialspot.h"
#include "thingdef/thingdef.h"
#include "vm.h"
#include "doomstat.h"
#include "g_level.h"
*/

2
src/g_doom/a_cacodemon.cpp
View file

@ -7,7 +7,7 @@
#include "gstrings.h"
#include "a_action.h"
#include "s_sound.h"
#include "thingdef/thingdef.h"
#include "vm.h"
*/
static FRandom pr_headattack ("HeadAttack");

2
src/g_doom/a_cyberdemon.cpp
View file

@ -4,7 +4,7 @@
#include "s_sound.h"
#include "p_enemy.h"
#include "a_action.h"
#include "thingdef/thingdef.h"
#include "vm.h"
*/
DEFINE_ACTION_FUNCTION(AActor, A_CyberAttack)

2
src/g_doom/a_demon.cpp
View file

@ -6,7 +6,7 @@
#include "p_enemy.h"
#include "gstrings.h"
#include "a_action.h"
#include "thingdef/thingdef.h"
#include "vm.h"
*/
static FRandom pr_sargattack ("SargAttack");

2
src/g_doom/a_doomimp.cpp
View file

@ -7,7 +7,7 @@
#include "p_enemy.h"
#include "gstrings.h"
#include "a_action.h"
#include "thingdef/thingdef.h"
#include "vm.h"
*/
static FRandom pr_troopattack ("TroopAttack");

3
src/g_doom/a_doommisc.cpp
View file

@ -7,7 +7,7 @@
#include "gi.h"
#include "doomstat.h"
#include "gstrings.h"
#include "thingdef/thingdef.h"
#include "vm.h"
#include "g_level.h"
#include "p_enemy.h"
#include "a_doomglobal.h"
@ -19,6 +19,7 @@
#include "p_maputl.h"
#include "serializer.h"
#include "g_shared/a_pickups.h"
#include "vm.h"
// Include all the other Doom stuff here to reduce compile time
#include "a_arachnotron.cpp"

2
src/g_doom/a_doomweaps.cpp
View file

@ -11,7 +11,7 @@
#include "p_effect.h"
#include "gi.h"
#include "templates.h"
#include "thingdef/thingdef.h"
#include "vm.h"
#include "doomstat.h"
*/

2
src/g_doom/a_fatso.cpp
View file

@ -7,7 +7,7 @@
#include "p_enemy.h"
#include "gstrings.h"
#include "a_action.h"
#include "thingdef/thingdef.h"
#include "vm.h"
*/
//

2
src/g_doom/a_keen.cpp
View file

@ -5,7 +5,7 @@
#include "p_spec.h"
#include "p_enemy.h"
#include "a_action.h"
#include "thingdef/thingdef.h"
#include "vm.h"
*/
//

2
src/g_doom/a_lostsoul.cpp
View file

@ -9,7 +9,7 @@
#include "gi.h"
#include "gstrings.h"
#include "a_action.h"
#include "thingdef/thingdef.h"
#include "vm.h"
*/
FRandom pr_oldsoul ("BetaLostSoul");

2
src/g_doom/a_painelemental.cpp
View file

@ -6,7 +6,7 @@
#include "a_action.h"
#include "templates.h"
#include "m_bbox.h"
#include "thingdef/thingdef.h"
#include "vm.h"
#include "doomstat.h"
*/

2
src/g_doom/a_possessed.cpp
View file

@ -7,7 +7,7 @@
#include "p_enemy.h"
#include "gstrings.h"
#include "a_action.h"
#include "thingdef/thingdef.h"
#include "vm.h"
*/
static FRandom pr_posattack ("PosAttack");

2
src/g_doom/a_revenant.cpp
View file

@ -8,7 +8,7 @@
#include "p_enemy.h"
#include "gstrings.h"
#include "a_action.h"
#include "thingdef/thingdef.h"
#include "vm.h"
#include "g_level.h"
*/

2
src/g_doom/a_scriptedmarine.cpp
View file

@ -7,7 +7,7 @@
#include "a_doomglobal.h"
#include "s_sound.h"
#include "r_data/r_translate.h"
#include "thingdef/thingdef.h"
#include "vm.h"
#include "g_level.h"
*/

2
src/g_doom/a_spidermaster.cpp
View file

@ -6,7 +6,7 @@
#include "p_local.h"
#include "p_enemy.h"
#include "a_action.h"
#include "thingdef/thingdef.h"
#include "vm.h"
*/
static FRandom pr_spidrefire ("SpidRefire");

2
src/g_heretic/a_chicken.cpp
View file

@ -11,7 +11,7 @@
#include "p_enemy.h"
#include "d_event.h"
#include "gstrings.h"
#include "thingdef/thingdef.h"
#include "vm.h"
*/
void P_UpdateBeak (AActor *actor);

2
src/g_heretic/a_dsparil.cpp
View file

@ -9,7 +9,7 @@
#include "a_sharedglobal.h"
#include "gstrings.h"
#include "a_specialspot.h"
#include "thingdef/thingdef.h"
#include "vm.h"
#include "g_level.h"
*/

2
src/g_heretic/a_hereticartifacts.cpp
View file

@ -5,7 +5,7 @@
#include "gstrings.h"
#include "p_local.h"
#include "s_sound.h"
#include "thingdef/thingdef.h"
#include "vm.h"
*/
// Tome of power ------------------------------------------------------------

2
src/g_heretic/a_hereticimp.cpp
View file

@ -6,7 +6,7 @@
#include "s_sound.h"
#include "p_local.h"
#include "gstrings.h"
#include "thingdef/thingdef.h"
#include "vm.h"
*/
static FRandom pr_impmsatk ("ImpMsAttack");

3
src/g_heretic/a_hereticmisc.cpp
View file

@ -6,7 +6,7 @@
#include "p_local.h"
#include "s_sound.h"
#include "gstrings.h"
#include "thingdef/thingdef.h"
#include "vm.h"
#include "p_enemy.h"
#include "a_specialspot.h"
#include "g_level.h"
@ -18,6 +18,7 @@
#include "a_morph.h"
#include "p_spec.h"
#include "serializer.h"
#include "vm.h"
// Include all the other Heretic stuff here to reduce compile time
#include "a_chicken.cpp"

2
src/g_heretic/a_hereticweaps.cpp
View file

@ -11,7 +11,7 @@
#include "gstrings.h"
#include "gi.h"
#include "r_data/r_translate.h"
#include "thingdef/thingdef.h"
#include "vm.h"
#include "doomstat.h"
*/

2
src/g_heretic/a_ironlich.cpp
View file

@ -7,7 +7,7 @@
#include "p_enemy.h"
#include "a_action.h"
#include "gstrings.h"
#include "thingdef/thingdef.h"
#include "vm.h"
#include "g_level.h"
*/

2
src/g_heretic/a_knight.cpp
View file

@ -7,7 +7,7 @@
#include "a_action.h"
#include "a_sharedglobal.h"
#include "gstrings.h"
#include "thingdef/thingdef.h"
#include "vm.h"
*/
static FRandom pr_dripblood ("DripBlood");

2
src/g_heretic/a_wizard.cpp
View file

@ -7,7 +7,7 @@
#include "p_enemy.h"
#include "a_action.h"
#include "gstrings.h"
#include "thingdef/thingdef.h"
#include "vm.h"
*/
static FRandom pr_wizatk3 ("WizAtk3");

2
src/g_hexen/a_bats.cpp
View file

@ -4,7 +4,7 @@
#include "m_random.h"
#include "p_local.h"
#include "s_sound.h"
#include "thingdef/thingdef.h"
#include "vm.h"
*/
static FRandom pr_batspawn ("BatSpawn");

2
src/g_hexen/a_bishop.cpp
View file

@ -6,7 +6,7 @@
#include "a_action.h"
#include "m_random.h"
#include "a_hexenglobal.h"
#include "thingdef/thingdef.h"
#include "vm.h"
*/
static FRandom pr_boom ("BishopBoom");

2
src/g_hexen/a_centaur.cpp
View file

@ -3,7 +3,7 @@
#include "p_enemy.h"
#include "a_action.h"
#include "m_random.h"
#include "thingdef/thingdef.h"
#include "vm.h"
*/
static FRandom pr_centaurdefend ("CentaurDefend");

2
src/g_hexen/a_clericflame.cpp
View file

@ -10,7 +10,7 @@
#include "p_pspr.h"
#include "gstrings.h"
#include "a_hexenglobal.h"
#include "thingdef/thingdef.h"
#include "vm.h"
*/
const double FLAMESPEED = 0.45;

2
src/g_hexen/a_clericholy.cpp
View file

@ -7,7 +7,7 @@
#include "a_hexenglobal.h"
#include "gstrings.h"
#include "a_weaponpiece.h"
#include "thingdef/thingdef.h"
#include "vm.h"
#include "g_level.h"
#include "doomstat.h"
*/

2
src/g_hexen/a_clericmace.cpp
View file

@ -2,7 +2,7 @@
#include "m_random.h"
#include "p_local.h"
#include "a_hexenglobal.h"
#include "thingdef/thingdef.h"
#include "vm.h"
*/
static FRandom pr_maceatk ("CMaceAttack");

2
src/g_hexen/a_clericstaff.cpp
View file

@ -10,7 +10,7 @@
#include "p_pspr.h"
#include "gstrings.h"
#include "a_hexenglobal.h"
#include "thingdef/thingdef.h"
#include "vm.h"
*/
static FRandom pr_staffcheck ("CStaffCheck");

2
src/g_hexen/a_dragon.cpp
View file

@ -6,7 +6,7 @@
#include "a_action.h"
#include "m_random.h"
#include "s_sound.h"
#include "thingdef/thingdef.h"
#include "vm.h"
*/
static FRandom pr_dragonseek ("DragonSeek");

4
src/g_hexen/a_fighteraxe.cpp
View file

@ -10,9 +10,11 @@
#include "p_pspr.h"
#include "gstrings.h"
#include "a_hexenglobal.h"
#include "thingdef/thingdef.h"
#include "vm.h"
*/
DECLARE_ACTION(A_Raise)
#define AXERANGE (2.25 * MELEERANGE)
static FRandom pr_axeatk ("FAxeAtk");

2
src/g_hexen/a_fighterhammer.cpp
View file

@ -10,7 +10,7 @@
#include "p_pspr.h"
#include "gstrings.h"
#include "a_hexenglobal.h"
#include "thingdef/thingdef.h"
#include "vm.h"
*/
const double HAMMER_RANGE = 1.5 * MELEERANGE;

2
src/g_hexen/a_fighterplayer.cpp
View file

@ -8,7 +8,7 @@
#include "p_local.h"
#include "a_action.h"
#include "a_hexenglobal.h"
#include "thingdef/thingdef.h"
#include "vm.h"
*/
IMPLEMENT_CLASS (AFighterWeapon)

2
src/g_hexen/a_fighterquietus.cpp
View file

@ -10,7 +10,7 @@
#include "gstrings.h"
#include "a_hexenglobal.h"
#include "a_weaponpiece.h"
#include "thingdef/thingdef.h"
#include "vm.h"
*/
static FRandom pr_quietusdrop ("QuietusDrop");

2
src/g_hexen/a_firedemon.cpp
View file

@ -6,7 +6,7 @@
#include "p_enemy.h"
#include "a_action.h"
#include "m_random.h"
#include "thingdef/thingdef.h"
#include "vm.h"
*/
#define FIREDEMON_ATTACK_RANGE (64*8.)

2
src/g_hexen/a_flechette.cpp
View file

@ -10,7 +10,7 @@
#include "a_action.h"
#include "a_hexenglobal.h"
#include "w_wad.h"
#include "thingdef/thingdef.h"
#include "vm.h"
#include "g_level.h"
*/

2
src/g_hexen/a_fog.cpp
View file

@ -1,7 +1,7 @@
/*
#include "m_random.h"
#include "p_local.h"
#include "thingdef/thingdef.h"
#include "vm.h"
*/
static FRandom pr_fogspawn ("FogSpawn");

2
src/g_hexen/a_heresiarch.cpp
View file

@ -7,7 +7,7 @@
#include "m_random.h"
#include "a_hexenglobal.h"
#include "i_system.h"
#include "thingdef/thingdef.h"
#include "vm.h"
#include "g_level.h"
*/

3
src/g_hexen/a_hexenmisc.cpp
View file

@ -7,7 +7,7 @@
#include "a_sharedglobal.h"
#include "a_hexenglobal.h"
#include "i_system.h"
#include "thingdef/thingdef.h"
#include "vm.h"
#include "gi.h"
#include "g_level.h"
#include "p_enemy.h"
@ -24,6 +24,7 @@
#include "p_maputl.h"
#include "p_spec.h"
#include "serializer.h"
#include "vm.h"
// Include all the Hexen stuff here to reduce compile time
#include "a_bats.cpp"

2
src/g_hexen/a_hexenspecialdecs.cpp
View file

@ -11,7 +11,7 @@
#include "p_local.h"
#include "p_lnspec.h"
#include "a_hexenglobal.h"
#include "thingdef/thingdef.h"
#include "vm.h"
#include "g_level.h"
#include "doomstat.h"
*/

2
src/g_hexen/a_iceguy.cpp
View file

@ -6,7 +6,7 @@
#include "p_enemy.h"
#include "a_action.h"
#include "m_random.h"
#include "thingdef/thingdef.h"
#include "vm.h"
*/
static FRandom pr_iceguylook ("IceGuyLook");

2
src/g_hexen/a_korax.cpp
View file

@ -25,7 +25,7 @@
#include "a_action.h"
#include "m_random.h"
#include "i_system.h"
#include "thingdef/thingdef.h"
#include "vm.h"
#include "g_level.h"
*/

2
src/g_hexen/a_magecone.cpp
View file

@ -10,7 +10,7 @@
#include "p_pspr.h"
#include "gstrings.h"
#include "a_hexenglobal.h"
#include "thingdef/thingdef.h"
#include "vm.h"
*/
const int SHARDSPAWN_LEFT = 1;

2
src/g_hexen/a_magelightning.cpp
View file

@ -10,7 +10,7 @@
#include "p_pspr.h"
#include "gstrings.h"
#include "a_hexenglobal.h"
#include "thingdef/thingdef.h"
#include "vm.h"
#include "g_level.h"
*/

2
src/g_hexen/a_magestaff.cpp
View file

@ -7,7 +7,7 @@
#include "a_hexenglobal.h"
#include "gstrings.h"
#include "a_weaponpiece.h"
#include "thingdef/thingdef.h"
#include "vm.h"
#include "doomstat.h"
*/

2
src/g_hexen/a_pig.cpp
View file

@ -11,7 +11,7 @@
#include "p_enemy.h"
#include "d_event.h"
#include "gstrings.h"
#include "thingdef/thingdef.h"
#include "vm.h"
*/
static FRandom pr_snoutattack ("SnoutAttack");

2
src/g_hexen/a_serpent.cpp
View file

@ -7,7 +7,7 @@
#include "a_action.h"
#include "m_random.h"
#include "p_terrain.h"
#include "thingdef/thingdef.h"
#include "vm.h"
*/
static FRandom pr_serpentchase ("SerpentChase");

2
src/g_hexen/a_spike.cpp
View file

@ -7,7 +7,7 @@
#include "a_sharedglobal.h"
#include "s_sound.h"
#include "m_bbox.h"
#include "thingdef/thingdef.h"
#include "vm.h"
*/
static FRandom pr_thrustraise ("ThrustRaise");

2
src/g_hexen/a_summon.cpp
View file

@ -6,7 +6,7 @@
#include "p_local.h"
#include "s_sound.h"
#include "ravenshared.h"
#include "thingdef/thingdef.h"
#include "vm.h"
#include "g_level.h"
*/

2
src/g_hexen/a_teleportother.cpp
View file

@ -7,7 +7,7 @@
#include "s_sound.h"
#include "p_lnspec.h"
#include "m_random.h"
#include "thingdef/thingdef.h"
#include "vm.h"
#include "g_level.h"
#include "doomstat.h"
*/

2
src/g_hexen/a_wraith.cpp
View file

@ -7,7 +7,7 @@
#include "a_action.h"
#include "m_random.h"
#include "a_sharedglobal.h"
#include "thingdef/thingdef.h"
#include "vm.h"
*/
static FRandom pr_stealhealth ("StealHealth");

3
src/g_raven/a_minotaur.cpp
View file

@ -8,12 +8,13 @@
#include "a_action.h"
#include "gi.h"
#include "w_wad.h"
#include "thingdef/thingdef.h"
#include "vm.h"
#include "g_level.h"
#include "doomstat.h"
#include "a_pickups.h"
#include "d_player.h"
#include "serializer.h"
#include "vm.h"
#define MAULATORTICS (25*35)

2
src/g_shared/a_action.cpp
View file

@ -1,5 +1,5 @@
#include "actor.h"
#include "thingdef/thingdef.h"
#include "vm.h"
#include "p_conversation.h"
#include "p_lnspec.h"
#include "a_action.h"

2
src/g_shared/a_bridge.cpp
View file

@ -2,7 +2,7 @@
#include "info.h"
#include "gi.h"
#include "m_random.h"
#include "thingdef/thingdef.h"
#include "vm.h"
static FRandom pr_orbit ("Orbit");

2
src/g_shared/a_pickups.cpp
View file

@ -14,7 +14,7 @@
#include "a_strifeglobal.h"
#include "a_morph.h"
#include "a_specialspot.h"
#include "thingdef/thingdef.h"
#include "vm.h"
#include "g_level.h"
#include "g_game.h"
#include "doomstat.h"

2
src/g_shared/a_randomspawner.cpp
View file

@ -14,7 +14,7 @@
#include "statnums.h"
#include "gstrings.h"
#include "a_action.h"
#include "thingdef/thingdef.h"
#include "vm.h"
#include "v_text.h"
#include "doomstat.h"
#include "doomdata.h"

2
src/g_shared/a_specialspot.cpp
View file

@ -37,7 +37,7 @@
#include "p_local.h"
#include "statnums.h"
#include "i_system.h"
#include "thingdef/thingdef.h"
#include "vm.h"
#include "doomstat.h"
#include "serializer.h"
#include "a_pickups.h"

2
src/g_shared/a_weapons.cpp
View file

@ -13,7 +13,7 @@
#include "cmdlib.h"
#include "templates.h"
#include "sbar.h"
#include "thingdef/thingdef.h"
#include "vm.h"
#include "doomstat.h"
#include "g_level.h"
#include "d_net.h"

1
src/g_shared/sbarinfo.cpp
View file

@ -57,6 +57,7 @@
#include "p_acs.h"
#include "gstrings.h"
#include "version.h"
#include "cmdlib.h"
#define ARTIFLASH_OFFSET (statusBar->invBarOffset+6)
enum

1
src/g_shared/shared_hud.cpp
View file

@ -52,6 +52,7 @@
#include "d_net.h"
#include "d_player.h"
#include "r_utility.h"
#include "cmdlib.h"
#include <time.h>

1
src/g_shared/shared_sbar.cpp
View file

@ -54,6 +54,7 @@
#include "serializer.h"
#include "gstrings.h"
#include "r_utility.h"
#include "cmdlib.h"
#include "../version.h"

2
src/g_strife/a_acolyte.cpp
View file

@ -7,7 +7,7 @@
#include "s_sound.h"
#include "a_strifeglobal.h"
#include "doomdata.h"
#include "thingdef/thingdef.h"
#include "vm.h"
#include "doomstat.h"
*/

2
src/g_strife/a_alienspectres.cpp
View file

@ -9,7 +9,7 @@
#include "a_strifeglobal.h"
#include "c_console.h"
#include "gstrings.h"
#include "thingdef/thingdef.h"
#include "vm.h"
#include "doomstat.h"
*/

2
src/g_strife/a_crusader.cpp
View file

@ -6,7 +6,7 @@
#include "p_enemy.h"
#include "s_sound.h"
#include "a_strifeglobal.h"
#include "thingdef/thingdef.h"
#include "vm.h"
*/
static bool CrusaderCheckRange (AActor *self)

2
src/g_strife/a_entityboss.cpp
View file

@ -6,7 +6,7 @@
#include "p_enemy.h"
#include "s_sound.h"
#include "a_strifeglobal.h"
#include "thingdef/thingdef.h"
#include "vm.h"
#include "g_level.h"
*/

2
src/g_strife/a_inquisitor.cpp
View file

@ -5,7 +5,7 @@
#include "p_local.h"
#include "p_enemy.h"
#include "s_sound.h"
#include "thingdef/thingdef.h"
#include "vm.h"
*/
static FRandom pr_inq ("Inquisitor");

2
src/g_strife/a_loremaster.cpp
View file

@ -5,7 +5,7 @@
#include "m_random.h"
#include "p_local.h"
#include "s_sound.h"
#include "thingdef/thingdef.h"
#include "vm.h"
*/
// Loremaster (aka Priest) --------------------------------------------------

2
src/g_strife/a_oracle.cpp
View file

@ -4,7 +4,7 @@
#include "a_strifeglobal.h"
#include "p_enemy.h"
#include "r_defs.h"
#include "thingdef/thingdef.h"
#include "vm.h"
*/

2
src/g_strife/a_programmer.cpp
View file

@ -6,7 +6,7 @@
#include "p_enemy.h"
#include "s_sound.h"
#include "a_strifeglobal.h"
#include "thingdef/thingdef.h"
#include "vm.h"
#include "g_level.h"
#include "doomstat.h"
*/

2
src/g_strife/a_reaver.cpp
View file

@ -6,7 +6,7 @@
#include "m_random.h"
#include "p_local.h"
#include "a_strifeglobal.h"
#include "thingdef/thingdef.h"
#include "vm.h"
*/
static FRandom pr_reaverattack ("ReaverAttack");

2
src/g_strife/a_rebels.cpp
View file

@ -8,7 +8,7 @@
#include "gi.h"
#include "a_sharedglobal.h"
#include "a_strifeglobal.h"
#include "thingdef/thingdef.h"
#include "vm.h"
#include "doomstat.h"
*/

2
src/g_strife/a_sentinel.cpp
View file

@ -4,7 +4,7 @@
#include "a_action.h"
#include "p_local.h"
#include "m_random.h"
#include "thingdef/thingdef.h"
#include "vm.h"
*/
static FRandom pr_sentinelrefire ("SentinelRefire");

2
src/g_strife/a_spectral.cpp
View file

@ -6,7 +6,7 @@
#include "s_sound.h"
#include "m_random.h"
#include "a_strifeglobal.h"
#include "thingdef/thingdef.h"
#include "vm.h"
*/
class ASpectralMonster : public AActor

2
src/g_strife/a_stalker.cpp
View file

@ -5,7 +5,7 @@
#include "p_local.h"
#include "p_enemy.h"
#include "s_sound.h"
#include "thingdef/thingdef.h"
#include "vm.h"
*/
static FRandom pr_stalker ("Stalker");

2
src/g_strife/a_strifeitems.cpp
View file

@ -13,7 +13,7 @@
#include "a_keys.h"
#include "c_console.h"
#include "templates.h"
#include "thingdef/thingdef.h"
#include "vm.h"
#include "g_level.h"
#include "doomstat.h"
*/

3
src/g_strife/a_strifestuff.cpp
View file

@ -10,7 +10,7 @@
#include "p_enemy.h"
#include "p_lnspec.h"
#include "c_console.h"
#include "thingdef/thingdef.h"
#include "vm.h"
#include "doomstat.h"
#include "gstrings.h"
#include "a_keys.h"
@ -21,6 +21,7 @@
#include "serializer.h"
#include "p_spec.h"
#include "portal.h"
#include "vm.h"
// Include all the other Strife stuff here to reduce compile time
#include "a_acolyte.cpp"

2
src/g_strife/a_strifeweapons.cpp
View file

@ -6,7 +6,7 @@
#include "s_sound.h"
#include "p_enemy.h"
#include "templates.h"
#include "thingdef/thingdef.h"
#include "vm.h"
#include "doomstat.h"
*/

2
src/g_strife/a_templar.cpp
View file

@ -6,7 +6,7 @@
#include "p_enemy.h"
#include "s_sound.h"
#include "a_strifeglobal.h"
#include "thingdef/thingdef.h"
#include "vm.h"
*/
static FRandom pr_templar ("Templar");

4
src/g_strife/a_thingstoblowup.cpp
View file

@ -6,8 +6,8 @@
#include "p_enemy.h"
#include "a_action.h"
#include "gstrings.h"
#include "thingdef/thingdef.h"
#include "thingdef/thingdef.h"
#include "vm.h"
#include "vm.h"
#include "doomstat.h"
*/

1
src/g_strife/strife_sbar.cpp
View file

@ -17,6 +17,7 @@
#include "g_level.h"
#include "colormatcher.h"
#include "v_palette.h"
#include "cmdlib.h"
// Number of tics to move the popscreen up and down.
#define POP_TIME (TICRATE/8)

2
src/info.cpp
View file

@ -52,7 +52,7 @@
#include "cmdlib.h"
#include "g_level.h"
#include "stats.h"
#include "thingdef/thingdef.h"
#include "vm.h"
#include "d_player.h"
extern void LoadActors ();

12
src/info.h
View file

@ -54,6 +54,18 @@ class FScanner;
struct FActorInfo;
class FIntCVar;
enum EStateDefineFlags
{
SDF_NEXT = 0,
SDF_STATE = 1,
SDF_STOP = 2,
SDF_WAIT = 3,
SDF_LABEL = 4,
SDF_INDEX = 5,
SDF_MASK = 7,
SDF_DEHACKED = 8, // Identify a state as having been modified by a dehacked lump
};
enum EStateType
{
STATE_Actor,

1
src/menu/menudef.cpp
View file

@ -50,6 +50,7 @@
#include "m_joy.h"
#include "gi.h"
#include "i_sound.h"
#include "cmdlib.h"
#include "optionmenuitems.h"

1
src/menu/menuinput.cpp
View file

@ -40,6 +40,7 @@
#include "d_gui.h"
#include "v_font.h"
#include "v_palette.h"
#include "cmdlib.h"
// [TP] New #includes
#include "v_text.h"

1
src/menu/messagebox.cpp
View file

@ -32,6 +32,7 @@
**
*/
#include <ctype.h>
#include "menu/menu.h"
#include "d_event.h"
#include "d_gui.h"

1
src/p_acs.cpp
View file

@ -83,6 +83,7 @@
#include "a_morph.h"
#include "i_music.h"
#include "serializer.h"
#include "thingdef.h"
#include "g_shared/a_pickups.h"

4
src/p_actionfunctions.cpp
View file

@ -61,7 +61,7 @@
#include "c_console.h"
#include "doomerrors.h"
#include "a_sharedglobal.h"
#include "thingdef/thingdef.h"
#include "vm.h"
#include "v_video.h"
#include "v_font.h"
#include "doomstat.h"
@ -77,6 +77,8 @@
#include "p_maputl.h"
#include "p_spec.h"
#include "templates.h"
#include "vm.h"
#include "thingdef.h"
#include "math/cmath.h"
AActor *SingleActorFromTID(int tid, AActor *defactor);

3
src/p_enemy.cpp
View file

@ -43,7 +43,7 @@
#include "p_enemy.h"
#include "a_sharedglobal.h"
#include "a_action.h"
#include "thingdef/thingdef.h"
#include "vm.h"
#include "d_dehacked.h"
#include "g_level.h"
#include "r_utility.h"
@ -53,6 +53,7 @@
#include "p_spec.h"
#include "p_checkposition.h"
#include "math/cmath.h"
#include "vm.h"
#include "gi.h"

3
src/p_enemy.h
View file

@ -1,7 +1,8 @@
#ifndef __P_ENEMY_H__
#define __P_ENEMY_H__
#include "thingdef/thingdef.h"
#include "vm.h"
#include "vectors.h"
struct sector_t;
class AActor;

3
src/p_mobj.cpp
View file

@ -53,7 +53,7 @@
#include "a_action.h"
#include "a_keys.h"
#include "p_conversation.h"
#include "thingdef/thingdef.h"
#include "vm.h"
#include "g_game.h"
#include "teaminfo.h"
#include "r_data/r_translate.h"
@ -71,6 +71,7 @@
#include "p_checkposition.h"
#include "serializer.h"
#include "r_utility.h"
#include "thingdef.h"
// MACROS ------------------------------------------------------------------

2
src/p_pspr.cpp
View file

@ -25,7 +25,7 @@
#include "gi.h"
#include "p_pspr.h"
#include "templates.h"
#include "thingdef/thingdef.h"
#include "vm.h"
#include "g_level.h"
#include "d_player.h"
#include "serializer.h"

Some files were not shown because too many files have changed in this diff Show more