From 9045615a7afa9196d758992706d60c5d6d691ea3 Mon Sep 17 00:00:00 2001 From: Christoph Oelckers Date: Sun, 14 Jul 2019 13:24:18 +0200 Subject: [PATCH] - renamed g_shared folder to playsim. --- src/CMakeLists.txt | 74 +++++++++---------- src/{g_shared => playsim}/a_action.cpp | 0 src/{g_shared => playsim}/a_ceiling.cpp | 0 src/{g_shared => playsim}/a_ceiling.h | 0 src/{g_shared => playsim}/a_decalfx.cpp | 0 src/{g_shared => playsim}/a_decalfx.h | 0 src/{g_shared => playsim}/a_decals.cpp | 0 src/{g_shared => playsim}/a_doors.cpp | 0 src/{g_shared => playsim}/a_doors.h | 0 src/{g_shared => playsim}/a_dynlight.cpp | 0 src/{g_shared => playsim}/a_dynlight.h | 0 src/{g_shared => playsim}/a_flashfader.cpp | 0 src/{g_shared => playsim}/a_floor.cpp | 0 src/{g_shared => playsim}/a_floor.h | 0 src/{g_shared => playsim}/a_lightning.cpp | 0 src/{g_shared => playsim}/a_lightning.h | 0 src/{g_shared => playsim}/a_lights.cpp | 0 src/{g_shared => playsim}/a_lights.h | 0 src/{g_shared => playsim}/a_lighttransfer.cpp | 0 src/{g_shared => playsim}/a_lighttransfer.h | 0 src/{g_shared => playsim}/a_morph.cpp | 0 src/{g_shared => playsim}/a_morph.h | 0 src/{g_shared => playsim}/a_pickups.cpp | 0 src/{g_shared => playsim}/a_pickups.h | 0 src/{g_shared => playsim}/a_pillar.cpp | 0 src/{g_shared => playsim}/a_pillar.h | 0 src/{g_shared => playsim}/a_plats.cpp | 0 src/{g_shared => playsim}/a_plats.h | 0 src/{g_shared => playsim}/a_pusher.cpp | 0 src/{g_shared => playsim}/a_pusher.h | 0 src/{g_shared => playsim}/a_quake.cpp | 0 src/{g_shared => playsim}/a_scroll.cpp | 0 src/{g_shared => playsim}/a_scroll.h | 0 src/{g_shared => playsim}/a_sharedglobal.h | 0 src/{g_shared => playsim}/a_specialspot.cpp | 0 src/{g_shared => playsim}/a_specialspot.h | 0 src/{g_shared => playsim}/actorptrselect.cpp | 0 src/{g_shared => playsim}/actorptrselect.h | 0 src/{g_shared => playsim}/dsectoreffect.cpp | 0 src/{g_shared => playsim}/dsectoreffect.h | 0 src/{g_shared => playsim}/dthinker.cpp | 0 src/{g_shared => playsim}/dthinker.h | 0 src/{g_shared => playsim}/p_3dfloors.cpp | 0 src/{g_shared => playsim}/p_3dfloors.h | 0 src/{g_shared => playsim}/p_3dmidtex.cpp | 0 src/{g_shared => playsim}/p_3dmidtex.h | 0 src/{g_shared => playsim}/p_checkposition.h | 0 src/{g_shared => playsim}/p_linkedsectors.cpp | 0 src/{g_shared => playsim}/p_secnodes.cpp | 0 src/{g_shared => playsim}/p_sectors.cpp | 0 src/{g_shared => playsim}/p_sight.cpp | 0 src/{g_shared => playsim}/p_switch.cpp | 0 src/{g_shared => playsim}/p_tags.cpp | 0 src/{g_shared => playsim}/p_tags.h | 0 src/{g_shared => playsim}/p_teleport.cpp | 0 src/{g_shared => playsim}/p_trace.cpp | 0 src/{g_shared => playsim}/p_trace.h | 0 src/{g_shared => playsim}/po_man.cpp | 0 src/{g_shared => playsim}/po_man.h | 0 src/{g_shared => playsim}/portal.cpp | 0 src/{g_shared => playsim}/portal.h | 0 src/{g_shared => playsim}/statnums.h | 0 62 files changed, 37 insertions(+), 37 deletions(-) rename src/{g_shared => playsim}/a_action.cpp (100%) rename src/{g_shared => playsim}/a_ceiling.cpp (100%) rename src/{g_shared => playsim}/a_ceiling.h (100%) rename src/{g_shared => playsim}/a_decalfx.cpp (100%) rename src/{g_shared => playsim}/a_decalfx.h (100%) rename src/{g_shared => playsim}/a_decals.cpp (100%) rename src/{g_shared => playsim}/a_doors.cpp (100%) rename src/{g_shared => playsim}/a_doors.h (100%) rename src/{g_shared => playsim}/a_dynlight.cpp (100%) rename src/{g_shared => playsim}/a_dynlight.h (100%) rename src/{g_shared => playsim}/a_flashfader.cpp (100%) rename src/{g_shared => playsim}/a_floor.cpp (100%) rename src/{g_shared => playsim}/a_floor.h (100%) rename src/{g_shared => playsim}/a_lightning.cpp (100%) rename src/{g_shared => playsim}/a_lightning.h (100%) rename src/{g_shared => playsim}/a_lights.cpp (100%) rename src/{g_shared => playsim}/a_lights.h (100%) rename src/{g_shared => playsim}/a_lighttransfer.cpp (100%) rename src/{g_shared => playsim}/a_lighttransfer.h (100%) rename src/{g_shared => playsim}/a_morph.cpp (100%) rename src/{g_shared => playsim}/a_morph.h (100%) rename src/{g_shared => playsim}/a_pickups.cpp (100%) rename src/{g_shared => playsim}/a_pickups.h (100%) rename src/{g_shared => playsim}/a_pillar.cpp (100%) rename src/{g_shared => playsim}/a_pillar.h (100%) rename src/{g_shared => playsim}/a_plats.cpp (100%) rename src/{g_shared => playsim}/a_plats.h (100%) rename src/{g_shared => playsim}/a_pusher.cpp (100%) rename src/{g_shared => playsim}/a_pusher.h (100%) rename src/{g_shared => playsim}/a_quake.cpp (100%) rename src/{g_shared => playsim}/a_scroll.cpp (100%) rename src/{g_shared => playsim}/a_scroll.h (100%) rename src/{g_shared => playsim}/a_sharedglobal.h (100%) rename src/{g_shared => playsim}/a_specialspot.cpp (100%) rename src/{g_shared => playsim}/a_specialspot.h (100%) rename src/{g_shared => playsim}/actorptrselect.cpp (100%) rename src/{g_shared => playsim}/actorptrselect.h (100%) rename src/{g_shared => playsim}/dsectoreffect.cpp (100%) rename src/{g_shared => playsim}/dsectoreffect.h (100%) rename src/{g_shared => playsim}/dthinker.cpp (100%) rename src/{g_shared => playsim}/dthinker.h (100%) rename src/{g_shared => playsim}/p_3dfloors.cpp (100%) rename src/{g_shared => playsim}/p_3dfloors.h (100%) rename src/{g_shared => playsim}/p_3dmidtex.cpp (100%) rename src/{g_shared => playsim}/p_3dmidtex.h (100%) rename src/{g_shared => playsim}/p_checkposition.h (100%) rename src/{g_shared => playsim}/p_linkedsectors.cpp (100%) rename src/{g_shared => playsim}/p_secnodes.cpp (100%) rename src/{g_shared => playsim}/p_sectors.cpp (100%) rename src/{g_shared => playsim}/p_sight.cpp (100%) rename src/{g_shared => playsim}/p_switch.cpp (100%) rename src/{g_shared => playsim}/p_tags.cpp (100%) rename src/{g_shared => playsim}/p_tags.h (100%) rename src/{g_shared => playsim}/p_teleport.cpp (100%) rename src/{g_shared => playsim}/p_trace.cpp (100%) rename src/{g_shared => playsim}/p_trace.h (100%) rename src/{g_shared => playsim}/po_man.cpp (100%) rename src/{g_shared => playsim}/po_man.h (100%) rename src/{g_shared => playsim}/portal.cpp (100%) rename src/{g_shared => playsim}/portal.h (100%) rename src/{g_shared => playsim}/statnums.h (100%) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 0bb16f39e..f167c3222 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -659,7 +659,7 @@ add_definitions(-DOPNMIDI_DISABLE_GX_EMULATOR) # there's generally a new cpp for every header so this file will get changed file( GLOB HEADER_FILES fragglescript/*.h - g_shared/*.h + playsim/*.h g_statusbar/*.h gamedata/*.h gamedata/resourcefiles/*.h @@ -1016,40 +1016,40 @@ set (PCH_SOURCES gamedata/p_terrain.cpp gamedata/statistics.cpp gamedata/teaminfo.cpp - g_shared/a_pickups.cpp - g_shared/a_action.cpp - g_shared/a_decals.cpp - g_shared/a_decalfx.cpp - g_shared/a_doors.cpp - g_shared/a_dynlight.cpp - g_shared/a_flashfader.cpp - g_shared/a_lightning.cpp - g_shared/a_morph.cpp - g_shared/a_quake.cpp - g_shared/a_specialspot.cpp - g_shared/a_ceiling.cpp - g_shared/a_floor.cpp - g_shared/a_lights.cpp - g_shared/a_lighttransfer.cpp - g_shared/a_pillar.cpp - g_shared/a_plats.cpp - g_shared/a_pusher.cpp - g_shared/a_scroll.cpp - g_shared/dsectoreffect.cpp - g_shared/p_secnodes.cpp - g_shared/p_sectors.cpp - g_shared/p_sight.cpp - g_shared/p_switch.cpp - g_shared/p_tags.cpp - g_shared/p_teleport.cpp - g_shared/actorptrselect.cpp - g_shared/dthinker.cpp - g_shared/p_3dfloors.cpp - g_shared/p_3dmidtex.cpp - g_shared/p_linkedsectors.cpp - g_shared/p_trace.cpp - g_shared/po_man.cpp - g_shared/portal.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 + playsim/p_switch.cpp + playsim/p_tags.cpp + playsim/p_teleport.cpp + playsim/actorptrselect.cpp + playsim/dthinker.cpp + playsim/p_3dfloors.cpp + playsim/p_3dmidtex.cpp + playsim/p_linkedsectors.cpp + playsim/p_trace.cpp + playsim/po_man.cpp + playsim/portal.cpp g_statusbar/hudmessages.cpp g_statusbar/shared_hud.cpp g_statusbar/sbarinfo.cpp @@ -1375,7 +1375,7 @@ target_link_libraries( zdoom ${ZDOOM_LIBS} gdtoa dumb lzma ) include_directories( . g_statusbar - g_shared + playsim gamedata gamedata/textures gamedata/fonts @@ -1574,7 +1574,7 @@ 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}/g_shared/.+") +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/g_shared/a_action.cpp b/src/playsim/a_action.cpp similarity index 100% rename from src/g_shared/a_action.cpp rename to src/playsim/a_action.cpp diff --git a/src/g_shared/a_ceiling.cpp b/src/playsim/a_ceiling.cpp similarity index 100% rename from src/g_shared/a_ceiling.cpp rename to src/playsim/a_ceiling.cpp diff --git a/src/g_shared/a_ceiling.h b/src/playsim/a_ceiling.h similarity index 100% rename from src/g_shared/a_ceiling.h rename to src/playsim/a_ceiling.h diff --git a/src/g_shared/a_decalfx.cpp b/src/playsim/a_decalfx.cpp similarity index 100% rename from src/g_shared/a_decalfx.cpp rename to src/playsim/a_decalfx.cpp diff --git a/src/g_shared/a_decalfx.h b/src/playsim/a_decalfx.h similarity index 100% rename from src/g_shared/a_decalfx.h rename to src/playsim/a_decalfx.h diff --git a/src/g_shared/a_decals.cpp b/src/playsim/a_decals.cpp similarity index 100% rename from src/g_shared/a_decals.cpp rename to src/playsim/a_decals.cpp diff --git a/src/g_shared/a_doors.cpp b/src/playsim/a_doors.cpp similarity index 100% rename from src/g_shared/a_doors.cpp rename to src/playsim/a_doors.cpp diff --git a/src/g_shared/a_doors.h b/src/playsim/a_doors.h similarity index 100% rename from src/g_shared/a_doors.h rename to src/playsim/a_doors.h diff --git a/src/g_shared/a_dynlight.cpp b/src/playsim/a_dynlight.cpp similarity index 100% rename from src/g_shared/a_dynlight.cpp rename to src/playsim/a_dynlight.cpp diff --git a/src/g_shared/a_dynlight.h b/src/playsim/a_dynlight.h similarity index 100% rename from src/g_shared/a_dynlight.h rename to src/playsim/a_dynlight.h diff --git a/src/g_shared/a_flashfader.cpp b/src/playsim/a_flashfader.cpp similarity index 100% rename from src/g_shared/a_flashfader.cpp rename to src/playsim/a_flashfader.cpp diff --git a/src/g_shared/a_floor.cpp b/src/playsim/a_floor.cpp similarity index 100% rename from src/g_shared/a_floor.cpp rename to src/playsim/a_floor.cpp diff --git a/src/g_shared/a_floor.h b/src/playsim/a_floor.h similarity index 100% rename from src/g_shared/a_floor.h rename to src/playsim/a_floor.h diff --git a/src/g_shared/a_lightning.cpp b/src/playsim/a_lightning.cpp similarity index 100% rename from src/g_shared/a_lightning.cpp rename to src/playsim/a_lightning.cpp diff --git a/src/g_shared/a_lightning.h b/src/playsim/a_lightning.h similarity index 100% rename from src/g_shared/a_lightning.h rename to src/playsim/a_lightning.h diff --git a/src/g_shared/a_lights.cpp b/src/playsim/a_lights.cpp similarity index 100% rename from src/g_shared/a_lights.cpp rename to src/playsim/a_lights.cpp diff --git a/src/g_shared/a_lights.h b/src/playsim/a_lights.h similarity index 100% rename from src/g_shared/a_lights.h rename to src/playsim/a_lights.h diff --git a/src/g_shared/a_lighttransfer.cpp b/src/playsim/a_lighttransfer.cpp similarity index 100% rename from src/g_shared/a_lighttransfer.cpp rename to src/playsim/a_lighttransfer.cpp diff --git a/src/g_shared/a_lighttransfer.h b/src/playsim/a_lighttransfer.h similarity index 100% rename from src/g_shared/a_lighttransfer.h rename to src/playsim/a_lighttransfer.h diff --git a/src/g_shared/a_morph.cpp b/src/playsim/a_morph.cpp similarity index 100% rename from src/g_shared/a_morph.cpp rename to src/playsim/a_morph.cpp diff --git a/src/g_shared/a_morph.h b/src/playsim/a_morph.h similarity index 100% rename from src/g_shared/a_morph.h rename to src/playsim/a_morph.h diff --git a/src/g_shared/a_pickups.cpp b/src/playsim/a_pickups.cpp similarity index 100% rename from src/g_shared/a_pickups.cpp rename to src/playsim/a_pickups.cpp diff --git a/src/g_shared/a_pickups.h b/src/playsim/a_pickups.h similarity index 100% rename from src/g_shared/a_pickups.h rename to src/playsim/a_pickups.h diff --git a/src/g_shared/a_pillar.cpp b/src/playsim/a_pillar.cpp similarity index 100% rename from src/g_shared/a_pillar.cpp rename to src/playsim/a_pillar.cpp diff --git a/src/g_shared/a_pillar.h b/src/playsim/a_pillar.h similarity index 100% rename from src/g_shared/a_pillar.h rename to src/playsim/a_pillar.h diff --git a/src/g_shared/a_plats.cpp b/src/playsim/a_plats.cpp similarity index 100% rename from src/g_shared/a_plats.cpp rename to src/playsim/a_plats.cpp diff --git a/src/g_shared/a_plats.h b/src/playsim/a_plats.h similarity index 100% rename from src/g_shared/a_plats.h rename to src/playsim/a_plats.h diff --git a/src/g_shared/a_pusher.cpp b/src/playsim/a_pusher.cpp similarity index 100% rename from src/g_shared/a_pusher.cpp rename to src/playsim/a_pusher.cpp diff --git a/src/g_shared/a_pusher.h b/src/playsim/a_pusher.h similarity index 100% rename from src/g_shared/a_pusher.h rename to src/playsim/a_pusher.h diff --git a/src/g_shared/a_quake.cpp b/src/playsim/a_quake.cpp similarity index 100% rename from src/g_shared/a_quake.cpp rename to src/playsim/a_quake.cpp diff --git a/src/g_shared/a_scroll.cpp b/src/playsim/a_scroll.cpp similarity index 100% rename from src/g_shared/a_scroll.cpp rename to src/playsim/a_scroll.cpp diff --git a/src/g_shared/a_scroll.h b/src/playsim/a_scroll.h similarity index 100% rename from src/g_shared/a_scroll.h rename to src/playsim/a_scroll.h diff --git a/src/g_shared/a_sharedglobal.h b/src/playsim/a_sharedglobal.h similarity index 100% rename from src/g_shared/a_sharedglobal.h rename to src/playsim/a_sharedglobal.h diff --git a/src/g_shared/a_specialspot.cpp b/src/playsim/a_specialspot.cpp similarity index 100% rename from src/g_shared/a_specialspot.cpp rename to src/playsim/a_specialspot.cpp diff --git a/src/g_shared/a_specialspot.h b/src/playsim/a_specialspot.h similarity index 100% rename from src/g_shared/a_specialspot.h rename to src/playsim/a_specialspot.h diff --git a/src/g_shared/actorptrselect.cpp b/src/playsim/actorptrselect.cpp similarity index 100% rename from src/g_shared/actorptrselect.cpp rename to src/playsim/actorptrselect.cpp diff --git a/src/g_shared/actorptrselect.h b/src/playsim/actorptrselect.h similarity index 100% rename from src/g_shared/actorptrselect.h rename to src/playsim/actorptrselect.h diff --git a/src/g_shared/dsectoreffect.cpp b/src/playsim/dsectoreffect.cpp similarity index 100% rename from src/g_shared/dsectoreffect.cpp rename to src/playsim/dsectoreffect.cpp diff --git a/src/g_shared/dsectoreffect.h b/src/playsim/dsectoreffect.h similarity index 100% rename from src/g_shared/dsectoreffect.h rename to src/playsim/dsectoreffect.h diff --git a/src/g_shared/dthinker.cpp b/src/playsim/dthinker.cpp similarity index 100% rename from src/g_shared/dthinker.cpp rename to src/playsim/dthinker.cpp diff --git a/src/g_shared/dthinker.h b/src/playsim/dthinker.h similarity index 100% rename from src/g_shared/dthinker.h rename to src/playsim/dthinker.h diff --git a/src/g_shared/p_3dfloors.cpp b/src/playsim/p_3dfloors.cpp similarity index 100% rename from src/g_shared/p_3dfloors.cpp rename to src/playsim/p_3dfloors.cpp diff --git a/src/g_shared/p_3dfloors.h b/src/playsim/p_3dfloors.h similarity index 100% rename from src/g_shared/p_3dfloors.h rename to src/playsim/p_3dfloors.h diff --git a/src/g_shared/p_3dmidtex.cpp b/src/playsim/p_3dmidtex.cpp similarity index 100% rename from src/g_shared/p_3dmidtex.cpp rename to src/playsim/p_3dmidtex.cpp diff --git a/src/g_shared/p_3dmidtex.h b/src/playsim/p_3dmidtex.h similarity index 100% rename from src/g_shared/p_3dmidtex.h rename to src/playsim/p_3dmidtex.h diff --git a/src/g_shared/p_checkposition.h b/src/playsim/p_checkposition.h similarity index 100% rename from src/g_shared/p_checkposition.h rename to src/playsim/p_checkposition.h diff --git a/src/g_shared/p_linkedsectors.cpp b/src/playsim/p_linkedsectors.cpp similarity index 100% rename from src/g_shared/p_linkedsectors.cpp rename to src/playsim/p_linkedsectors.cpp diff --git a/src/g_shared/p_secnodes.cpp b/src/playsim/p_secnodes.cpp similarity index 100% rename from src/g_shared/p_secnodes.cpp rename to src/playsim/p_secnodes.cpp diff --git a/src/g_shared/p_sectors.cpp b/src/playsim/p_sectors.cpp similarity index 100% rename from src/g_shared/p_sectors.cpp rename to src/playsim/p_sectors.cpp diff --git a/src/g_shared/p_sight.cpp b/src/playsim/p_sight.cpp similarity index 100% rename from src/g_shared/p_sight.cpp rename to src/playsim/p_sight.cpp diff --git a/src/g_shared/p_switch.cpp b/src/playsim/p_switch.cpp similarity index 100% rename from src/g_shared/p_switch.cpp rename to src/playsim/p_switch.cpp diff --git a/src/g_shared/p_tags.cpp b/src/playsim/p_tags.cpp similarity index 100% rename from src/g_shared/p_tags.cpp rename to src/playsim/p_tags.cpp diff --git a/src/g_shared/p_tags.h b/src/playsim/p_tags.h similarity index 100% rename from src/g_shared/p_tags.h rename to src/playsim/p_tags.h diff --git a/src/g_shared/p_teleport.cpp b/src/playsim/p_teleport.cpp similarity index 100% rename from src/g_shared/p_teleport.cpp rename to src/playsim/p_teleport.cpp diff --git a/src/g_shared/p_trace.cpp b/src/playsim/p_trace.cpp similarity index 100% rename from src/g_shared/p_trace.cpp rename to src/playsim/p_trace.cpp diff --git a/src/g_shared/p_trace.h b/src/playsim/p_trace.h similarity index 100% rename from src/g_shared/p_trace.h rename to src/playsim/p_trace.h diff --git a/src/g_shared/po_man.cpp b/src/playsim/po_man.cpp similarity index 100% rename from src/g_shared/po_man.cpp rename to src/playsim/po_man.cpp diff --git a/src/g_shared/po_man.h b/src/playsim/po_man.h similarity index 100% rename from src/g_shared/po_man.h rename to src/playsim/po_man.h diff --git a/src/g_shared/portal.cpp b/src/playsim/portal.cpp similarity index 100% rename from src/g_shared/portal.cpp rename to src/playsim/portal.cpp diff --git a/src/g_shared/portal.h b/src/playsim/portal.h similarity index 100% rename from src/g_shared/portal.h rename to src/playsim/portal.h diff --git a/src/g_shared/statnums.h b/src/playsim/statnums.h similarity index 100% rename from src/g_shared/statnums.h rename to src/playsim/statnums.h