diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index f167c3222..96918eccd 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -658,8 +658,10 @@ add_definitions(-DOPNMIDI_DISABLE_GX_EMULATOR) # Project files should be aware of the header files. We can GLOB these since # there's generally a new cpp for every header so this file will get changed file( GLOB HEADER_FILES - fragglescript/*.h playsim/*.h + playsim/bots/*.h + playsim/fragglescript/*.h + playsim/mapthinkers/*.h g_statusbar/*.h gamedata/*.h gamedata/resourcefiles/*.h @@ -929,11 +931,11 @@ endif() set (PCH_SOURCES am_map.cpp - b_bot.cpp - b_func.cpp - b_game.cpp - b_move.cpp - b_think.cpp + playsim/bots/b_bot.cpp + playsim/bots/b_func.cpp + playsim/bots/b_game.cpp + playsim/bots/b_move.cpp + playsim/bots/b_think.cpp bbannouncer.cpp c_bind.cpp c_cmds.cpp @@ -967,25 +969,25 @@ set (PCH_SOURCES m_joy.cpp m_misc.cpp p_acs.cpp - p_actionfunctions.cpp + playsim/p_actionfunctions.cpp p_conversation.cpp - p_destructible.cpp - p_effect.cpp - p_enemy.cpp - p_interaction.cpp - p_lnspec.cpp - p_map.cpp - p_maputl.cpp - p_mobj.cpp + playsim/p_destructible.cpp + playsim/p_effect.cpp + playsim/p_enemy.cpp + playsim/p_interaction.cpp + playsim/p_lnspec.cpp + playsim/p_map.cpp + playsim/p_maputl.cpp + playsim/p_mobj.cpp p_openmap.cpp - p_pspr.cpp + playsim/p_pspr.cpp p_saveg.cpp p_setup.cpp - p_spec.cpp + playsim/p_spec.cpp p_states.cpp - p_things.cpp + playsim/p_things.cpp p_tick.cpp - p_user.cpp + playsim/p_user.cpp r_utility.cpp r_sky.cpp r_videoscale.cpp @@ -1016,26 +1018,26 @@ set (PCH_SOURCES gamedata/p_terrain.cpp gamedata/statistics.cpp gamedata/teaminfo.cpp + playsim/mapthinkers/a_decalfx.cpp + playsim/mapthinkers/a_doors.cpp + playsim/mapthinkers/a_lightning.cpp + playsim/mapthinkers/a_quake.cpp + playsim/mapthinkers/a_ceiling.cpp + playsim/mapthinkers/a_floor.cpp + playsim/mapthinkers/a_lights.cpp + playsim/mapthinkers/a_lighttransfer.cpp + playsim/mapthinkers/a_pillar.cpp + playsim/mapthinkers/a_plats.cpp + playsim/mapthinkers/a_pusher.cpp + playsim/mapthinkers/a_scroll.cpp + playsim/mapthinkers/dsectoreffect.cpp playsim/a_pickups.cpp playsim/a_action.cpp playsim/a_decals.cpp - playsim/a_decalfx.cpp - playsim/a_doors.cpp playsim/a_dynlight.cpp playsim/a_flashfader.cpp - playsim/a_lightning.cpp playsim/a_morph.cpp - playsim/a_quake.cpp playsim/a_specialspot.cpp - playsim/a_ceiling.cpp - playsim/a_floor.cpp - playsim/a_lights.cpp - playsim/a_lighttransfer.cpp - playsim/a_pillar.cpp - playsim/a_plats.cpp - playsim/a_pusher.cpp - playsim/a_scroll.cpp - playsim/dsectoreffect.cpp playsim/p_secnodes.cpp playsim/p_sectors.cpp playsim/p_sight.cpp @@ -1164,15 +1166,15 @@ set (PCH_SOURCES gamedata/p_xlat.cpp gamedata/xlat/parse_xlat.cpp gamedata/xlat/parsecontext.cpp - fragglescript/t_func.cpp - fragglescript/t_load.cpp - fragglescript/t_oper.cpp - fragglescript/t_parse.cpp - fragglescript/t_prepro.cpp - fragglescript/t_script.cpp - fragglescript/t_spec.cpp - fragglescript/t_variable.cpp - fragglescript/t_cmd.cpp + playsim/fragglescript/t_func.cpp + playsim/fragglescript/t_load.cpp + playsim/fragglescript/t_oper.cpp + playsim/fragglescript/t_parse.cpp + playsim/fragglescript/t_prepro.cpp + playsim/fragglescript/t_script.cpp + playsim/fragglescript/t_spec.cpp + playsim/fragglescript/t_variable.cpp + playsim/fragglescript/t_cmd.cpp intermission/intermission.cpp intermission/intermission_parse.cpp r_data/colormaps.cpp @@ -1376,6 +1378,8 @@ target_link_libraries( zdoom ${ZDOOM_LIBS} gdtoa dumb lzma ) include_directories( . g_statusbar playsim + playsim/bots + playsim/mapthinkers gamedata gamedata/textures gamedata/fonts @@ -1500,7 +1504,6 @@ source_group("Audio Files\\Third-party" REGULAR_EXPRESSION "^${CMAKE_CURRENT_SOU source_group("External\\Math" REGULAR_EXPRESSION "^${CMAKE_CURRENT_SOURCE_DIR}/math/.+") source_group("External\\RapidJSON" REGULAR_EXPRESSION "^${CMAKE_CURRENT_SOURCE_DIR}/rapidjson/.+") source_group("External\\SFMT" REGULAR_EXPRESSION "^${CMAKE_CURRENT_SOURCE_DIR}/sfmt/.+") -source_group("FraggleScript" REGULAR_EXPRESSION "^${CMAKE_CURRENT_SOURCE_DIR}/fragglescript/.+") source_group("Game Data" REGULAR_EXPRESSION "^${CMAKE_CURRENT_SOURCE_DIR}/gamedata/.+") source_group("Game Data\\Resource Files" REGULAR_EXPRESSION "^${CMAKE_CURRENT_SOURCE_DIR}/gamedata/resourcefiles/.+") source_group("Game Data\\Fonts" REGULAR_EXPRESSION "^${CMAKE_CURRENT_SOURCE_DIR}/gamedata/fonts/.+") @@ -1513,6 +1516,10 @@ source_group("Game Data\\Textures\\Formats" REGULAR_EXPRESSION "^${CMAKE_CURRENT source_group("Intermission" REGULAR_EXPRESSION "^${CMAKE_CURRENT_SOURCE_DIR}/intermission/.+") source_group("Map Loader" REGULAR_EXPRESSION "^${CMAKE_CURRENT_SOURCE_DIR}/maploader/.+") source_group("Menu" REGULAR_EXPRESSION "^${CMAKE_CURRENT_SOURCE_DIR}/menu/.+") +source_group("Playsim" REGULAR_EXPRESSION "^${CMAKE_CURRENT_SOURCE_DIR}/playsim/.+") +source_group("Playsim\\Bots" REGULAR_EXPRESSION "^${CMAKE_CURRENT_SOURCE_DIR}/playsim/bots/.+") +source_group("Playsim\\FraggleScript" REGULAR_EXPRESSION "^${CMAKE_CURRENT_SOURCE_DIR}/playsim/fragglescript/.+") +source_group("Playsim\\Map Thinkers" REGULAR_EXPRESSION "^${CMAKE_CURRENT_SOURCE_DIR}/playsim/mapthinkers/.+") source_group("Rendering" REGULAR_EXPRESSION "^${CMAKE_CURRENT_SOURCE_DIR}/rendering/.+") source_group("Rendering\\2D" REGULAR_EXPRESSION "^${CMAKE_CURRENT_SOURCE_DIR}/rendering/2d/.+") source_group("Rendering\\Hardware Renderer" REGULAR_EXPRESSION "^${CMAKE_CURRENT_SOURCE_DIR}/gl/.+") @@ -1574,7 +1581,6 @@ source_group("Utility\\Node Builder" REGULAR_EXPRESSION "^${CMAKE_CURRENT_SOURCE source_group("Utility\\Math" REGULAR_EXPRESSION "^${CMAKE_CURRENT_SOURCE_DIR}/utility/math/.+") source_group("Utility\\RapidJSON" REGULAR_EXPRESSION "^${CMAKE_CURRENT_SOURCE_DIR}/utility/rapidjson/.+") source_group("Utility\\SFMT" REGULAR_EXPRESSION "^${CMAKE_CURRENT_SOURCE_DIR}/utility/sfmt/.+") -source_group("Shared Game" REGULAR_EXPRESSION "^${CMAKE_CURRENT_SOURCE_DIR}/playsim/.+") source_group("Statusbar" REGULAR_EXPRESSION "^${CMAKE_CURRENT_SOURCE_DIR}/g_statusbar/.+") source_group("Versioning" FILES version.h win32/zdoom.rc) 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) diff --git a/src/actor.h b/src/playsim/actor.h similarity index 100% rename from src/actor.h rename to src/playsim/actor.h diff --git a/src/actorinlines.h b/src/playsim/actorinlines.h similarity index 100% rename from src/actorinlines.h rename to src/playsim/actorinlines.h diff --git a/src/b_bot.cpp b/src/playsim/bots/b_bot.cpp similarity index 100% rename from src/b_bot.cpp rename to src/playsim/bots/b_bot.cpp diff --git a/src/b_bot.h b/src/playsim/bots/b_bot.h similarity index 100% rename from src/b_bot.h rename to src/playsim/bots/b_bot.h diff --git a/src/b_func.cpp b/src/playsim/bots/b_func.cpp similarity index 100% rename from src/b_func.cpp rename to src/playsim/bots/b_func.cpp diff --git a/src/b_game.cpp b/src/playsim/bots/b_game.cpp similarity index 100% rename from src/b_game.cpp rename to src/playsim/bots/b_game.cpp diff --git a/src/b_move.cpp b/src/playsim/bots/b_move.cpp similarity index 100% rename from src/b_move.cpp rename to src/playsim/bots/b_move.cpp diff --git a/src/b_think.cpp b/src/playsim/bots/b_think.cpp similarity index 100% rename from src/b_think.cpp rename to src/playsim/bots/b_think.cpp diff --git a/src/fragglescript/t_cmd.cpp b/src/playsim/fragglescript/t_cmd.cpp similarity index 100% rename from src/fragglescript/t_cmd.cpp rename to src/playsim/fragglescript/t_cmd.cpp diff --git a/src/fragglescript/t_fs.h b/src/playsim/fragglescript/t_fs.h similarity index 100% rename from src/fragglescript/t_fs.h rename to src/playsim/fragglescript/t_fs.h diff --git a/src/fragglescript/t_func.cpp b/src/playsim/fragglescript/t_func.cpp similarity index 100% rename from src/fragglescript/t_func.cpp rename to src/playsim/fragglescript/t_func.cpp diff --git a/src/fragglescript/t_load.cpp b/src/playsim/fragglescript/t_load.cpp similarity index 100% rename from src/fragglescript/t_load.cpp rename to src/playsim/fragglescript/t_load.cpp diff --git a/src/fragglescript/t_oper.cpp b/src/playsim/fragglescript/t_oper.cpp similarity index 100% rename from src/fragglescript/t_oper.cpp rename to src/playsim/fragglescript/t_oper.cpp diff --git a/src/fragglescript/t_parse.cpp b/src/playsim/fragglescript/t_parse.cpp similarity index 100% rename from src/fragglescript/t_parse.cpp rename to src/playsim/fragglescript/t_parse.cpp diff --git a/src/fragglescript/t_prepro.cpp b/src/playsim/fragglescript/t_prepro.cpp similarity index 100% rename from src/fragglescript/t_prepro.cpp rename to src/playsim/fragglescript/t_prepro.cpp diff --git a/src/fragglescript/t_script.cpp b/src/playsim/fragglescript/t_script.cpp similarity index 100% rename from src/fragglescript/t_script.cpp rename to src/playsim/fragglescript/t_script.cpp diff --git a/src/fragglescript/t_script.h b/src/playsim/fragglescript/t_script.h similarity index 100% rename from src/fragglescript/t_script.h rename to src/playsim/fragglescript/t_script.h diff --git a/src/fragglescript/t_spec.cpp b/src/playsim/fragglescript/t_spec.cpp similarity index 100% rename from src/fragglescript/t_spec.cpp rename to src/playsim/fragglescript/t_spec.cpp diff --git a/src/fragglescript/t_variable.cpp b/src/playsim/fragglescript/t_variable.cpp similarity index 100% rename from src/fragglescript/t_variable.cpp rename to src/playsim/fragglescript/t_variable.cpp diff --git a/src/playsim/a_ceiling.cpp b/src/playsim/mapthinkers/a_ceiling.cpp similarity index 100% rename from src/playsim/a_ceiling.cpp rename to src/playsim/mapthinkers/a_ceiling.cpp diff --git a/src/playsim/a_ceiling.h b/src/playsim/mapthinkers/a_ceiling.h similarity index 100% rename from src/playsim/a_ceiling.h rename to src/playsim/mapthinkers/a_ceiling.h diff --git a/src/playsim/a_decalfx.cpp b/src/playsim/mapthinkers/a_decalfx.cpp similarity index 100% rename from src/playsim/a_decalfx.cpp rename to src/playsim/mapthinkers/a_decalfx.cpp diff --git a/src/playsim/a_decalfx.h b/src/playsim/mapthinkers/a_decalfx.h similarity index 100% rename from src/playsim/a_decalfx.h rename to src/playsim/mapthinkers/a_decalfx.h diff --git a/src/playsim/a_doors.cpp b/src/playsim/mapthinkers/a_doors.cpp similarity index 100% rename from src/playsim/a_doors.cpp rename to src/playsim/mapthinkers/a_doors.cpp diff --git a/src/playsim/a_doors.h b/src/playsim/mapthinkers/a_doors.h similarity index 100% rename from src/playsim/a_doors.h rename to src/playsim/mapthinkers/a_doors.h diff --git a/src/playsim/a_floor.cpp b/src/playsim/mapthinkers/a_floor.cpp similarity index 100% rename from src/playsim/a_floor.cpp rename to src/playsim/mapthinkers/a_floor.cpp diff --git a/src/playsim/a_floor.h b/src/playsim/mapthinkers/a_floor.h similarity index 100% rename from src/playsim/a_floor.h rename to src/playsim/mapthinkers/a_floor.h diff --git a/src/playsim/a_lightning.cpp b/src/playsim/mapthinkers/a_lightning.cpp similarity index 100% rename from src/playsim/a_lightning.cpp rename to src/playsim/mapthinkers/a_lightning.cpp diff --git a/src/playsim/a_lightning.h b/src/playsim/mapthinkers/a_lightning.h similarity index 100% rename from src/playsim/a_lightning.h rename to src/playsim/mapthinkers/a_lightning.h diff --git a/src/playsim/a_lights.cpp b/src/playsim/mapthinkers/a_lights.cpp similarity index 100% rename from src/playsim/a_lights.cpp rename to src/playsim/mapthinkers/a_lights.cpp diff --git a/src/playsim/a_lights.h b/src/playsim/mapthinkers/a_lights.h similarity index 100% rename from src/playsim/a_lights.h rename to src/playsim/mapthinkers/a_lights.h diff --git a/src/playsim/a_lighttransfer.cpp b/src/playsim/mapthinkers/a_lighttransfer.cpp similarity index 100% rename from src/playsim/a_lighttransfer.cpp rename to src/playsim/mapthinkers/a_lighttransfer.cpp diff --git a/src/playsim/a_lighttransfer.h b/src/playsim/mapthinkers/a_lighttransfer.h similarity index 100% rename from src/playsim/a_lighttransfer.h rename to src/playsim/mapthinkers/a_lighttransfer.h diff --git a/src/playsim/a_pillar.cpp b/src/playsim/mapthinkers/a_pillar.cpp similarity index 100% rename from src/playsim/a_pillar.cpp rename to src/playsim/mapthinkers/a_pillar.cpp diff --git a/src/playsim/a_pillar.h b/src/playsim/mapthinkers/a_pillar.h similarity index 100% rename from src/playsim/a_pillar.h rename to src/playsim/mapthinkers/a_pillar.h diff --git a/src/playsim/a_plats.cpp b/src/playsim/mapthinkers/a_plats.cpp similarity index 100% rename from src/playsim/a_plats.cpp rename to src/playsim/mapthinkers/a_plats.cpp diff --git a/src/playsim/a_plats.h b/src/playsim/mapthinkers/a_plats.h similarity index 100% rename from src/playsim/a_plats.h rename to src/playsim/mapthinkers/a_plats.h diff --git a/src/playsim/a_pusher.cpp b/src/playsim/mapthinkers/a_pusher.cpp similarity index 100% rename from src/playsim/a_pusher.cpp rename to src/playsim/mapthinkers/a_pusher.cpp diff --git a/src/playsim/a_pusher.h b/src/playsim/mapthinkers/a_pusher.h similarity index 100% rename from src/playsim/a_pusher.h rename to src/playsim/mapthinkers/a_pusher.h diff --git a/src/playsim/a_quake.cpp b/src/playsim/mapthinkers/a_quake.cpp similarity index 100% rename from src/playsim/a_quake.cpp rename to src/playsim/mapthinkers/a_quake.cpp diff --git a/src/playsim/a_scroll.cpp b/src/playsim/mapthinkers/a_scroll.cpp similarity index 100% rename from src/playsim/a_scroll.cpp rename to src/playsim/mapthinkers/a_scroll.cpp diff --git a/src/playsim/a_scroll.h b/src/playsim/mapthinkers/a_scroll.h similarity index 100% rename from src/playsim/a_scroll.h rename to src/playsim/mapthinkers/a_scroll.h diff --git a/src/playsim/dsectoreffect.cpp b/src/playsim/mapthinkers/dsectoreffect.cpp similarity index 100% rename from src/playsim/dsectoreffect.cpp rename to src/playsim/mapthinkers/dsectoreffect.cpp diff --git a/src/playsim/dsectoreffect.h b/src/playsim/mapthinkers/dsectoreffect.h similarity index 100% rename from src/playsim/dsectoreffect.h rename to src/playsim/mapthinkers/dsectoreffect.h diff --git a/src/p_spec_thinkers.h b/src/playsim/mapthinkers/p_spec_thinkers.h similarity index 100% rename from src/p_spec_thinkers.h rename to src/playsim/mapthinkers/p_spec_thinkers.h diff --git a/src/p_actionfunctions.cpp b/src/playsim/p_actionfunctions.cpp similarity index 99% rename from src/p_actionfunctions.cpp rename to src/playsim/p_actionfunctions.cpp index 114fd3f7e..ccc1a104e 100644 --- a/src/p_actionfunctions.cpp +++ b/src/playsim/p_actionfunctions.cpp @@ -54,7 +54,7 @@ #include "a_sharedglobal.h" #include "v_font.h" #include "doomstat.h" -#include "g_shared/a_specialspot.h" +#include "a_specialspot.h" #include "actorptrselect.h" #include "p_trace.h" #include "p_setup.h" diff --git a/src/p_destructible.cpp b/src/playsim/p_destructible.cpp old mode 100755 new mode 100644 similarity index 100% rename from src/p_destructible.cpp rename to src/playsim/p_destructible.cpp diff --git a/src/p_destructible.h b/src/playsim/p_destructible.h old mode 100755 new mode 100644 similarity index 100% rename from src/p_destructible.h rename to src/playsim/p_destructible.h diff --git a/src/p_effect.cpp b/src/playsim/p_effect.cpp similarity index 100% rename from src/p_effect.cpp rename to src/playsim/p_effect.cpp diff --git a/src/p_effect.h b/src/playsim/p_effect.h similarity index 100% rename from src/p_effect.h rename to src/playsim/p_effect.h diff --git a/src/p_enemy.cpp b/src/playsim/p_enemy.cpp similarity index 100% rename from src/p_enemy.cpp rename to src/playsim/p_enemy.cpp diff --git a/src/p_enemy.h b/src/playsim/p_enemy.h similarity index 100% rename from src/p_enemy.h rename to src/playsim/p_enemy.h diff --git a/src/p_interaction.cpp b/src/playsim/p_interaction.cpp similarity index 100% rename from src/p_interaction.cpp rename to src/playsim/p_interaction.cpp diff --git a/src/p_linetracedata.h b/src/playsim/p_linetracedata.h similarity index 100% rename from src/p_linetracedata.h rename to src/playsim/p_linetracedata.h diff --git a/src/p_lnspec.cpp b/src/playsim/p_lnspec.cpp similarity index 100% rename from src/p_lnspec.cpp rename to src/playsim/p_lnspec.cpp diff --git a/src/p_lnspec.h b/src/playsim/p_lnspec.h similarity index 100% rename from src/p_lnspec.h rename to src/playsim/p_lnspec.h diff --git a/src/p_local.h b/src/playsim/p_local.h similarity index 100% rename from src/p_local.h rename to src/playsim/p_local.h diff --git a/src/p_map.cpp b/src/playsim/p_map.cpp similarity index 100% rename from src/p_map.cpp rename to src/playsim/p_map.cpp diff --git a/src/p_maputl.cpp b/src/playsim/p_maputl.cpp similarity index 100% rename from src/p_maputl.cpp rename to src/playsim/p_maputl.cpp diff --git a/src/p_maputl.h b/src/playsim/p_maputl.h similarity index 100% rename from src/p_maputl.h rename to src/playsim/p_maputl.h diff --git a/src/p_mobj.cpp b/src/playsim/p_mobj.cpp similarity index 100% rename from src/p_mobj.cpp rename to src/playsim/p_mobj.cpp diff --git a/src/p_pspr.cpp b/src/playsim/p_pspr.cpp similarity index 100% rename from src/p_pspr.cpp rename to src/playsim/p_pspr.cpp diff --git a/src/p_pspr.h b/src/playsim/p_pspr.h similarity index 100% rename from src/p_pspr.h rename to src/playsim/p_pspr.h diff --git a/src/p_spec.cpp b/src/playsim/p_spec.cpp similarity index 100% rename from src/p_spec.cpp rename to src/playsim/p_spec.cpp diff --git a/src/p_spec.h b/src/playsim/p_spec.h similarity index 100% rename from src/p_spec.h rename to src/playsim/p_spec.h diff --git a/src/p_things.cpp b/src/playsim/p_things.cpp similarity index 100% rename from src/p_things.cpp rename to src/playsim/p_things.cpp diff --git a/src/p_user.cpp b/src/playsim/p_user.cpp similarity index 100% rename from src/p_user.cpp rename to src/playsim/p_user.cpp diff --git a/src/serializer.cpp b/src/serializer.cpp index eada141d9..9d86c8cb2 100644 --- a/src/serializer.cpp +++ b/src/serializer.cpp @@ -52,7 +52,7 @@ #include "p_conversation.h" #include "dsectoreffect.h" #include "d_player.h" -#include "g_shared/a_sharedglobal.h" +#include "a_sharedglobal.h" #include "po_man.h" #include "v_font.h" #include "doomerrors.h"