From 9060abbafda4d30481bcd3e77b3f1396cb827928 Mon Sep 17 00:00:00 2001 From: Christoph Oelckers Date: Thu, 6 Aug 2020 00:18:45 +0200 Subject: [PATCH] - 8 more SW headers gone. --- source/sw/src/actor.cpp | 3 +- source/sw/src/border.cpp | 2 +- source/sw/src/bunny.cpp | 3 +- source/sw/src/cheats.cpp | 2 +- source/sw/src/console.cpp | 5 +-- source/sw/src/coolg.cpp | 3 +- source/sw/src/coolie.cpp | 3 +- source/sw/src/copysect.cpp | 2 +- source/sw/src/d_menu.cpp | 3 +- source/sw/src/draw.cpp | 2 -- source/sw/src/eel.cpp | 3 +- source/sw/src/game.cpp | 3 +- source/sw/src/girlninj.cpp | 3 +- source/sw/src/goro.cpp | 3 +- source/sw/src/hornet.cpp | 3 +- source/sw/src/inv.cpp | 1 - source/sw/src/jplayer.cpp | 3 -- source/sw/src/jweapon.cpp | 3 +- source/sw/src/lava.cpp | 3 +- source/sw/src/menus.cpp | 2 -- source/sw/src/misc.h | 63 ++++++++++++++++++++++++++++++++++++++ source/sw/src/miscactr.cpp | 3 +- source/sw/src/network.cpp | 1 - source/sw/src/ninja.cpp | 3 +- source/sw/src/osdcmds.cpp | 1 - source/sw/src/panel.cpp | 4 +-- source/sw/src/player.cpp | 7 ----- source/sw/src/ripper.cpp | 3 +- source/sw/src/ripper2.cpp | 3 +- source/sw/src/rooms.cpp | 3 +- source/sw/src/rotator.cpp | 3 +- source/sw/src/save.cpp | 2 -- source/sw/src/savedef.h | 27 ---------------- source/sw/src/sector.cpp | 5 ++- source/sw/src/serp.cpp | 3 +- source/sw/src/skel.cpp | 3 +- source/sw/src/skull.cpp | 3 +- source/sw/src/slidor.cpp | 3 +- source/sw/src/slidor.h | 42 ------------------------- source/sw/src/sounds.cpp | 2 +- source/sw/src/sprite.cpp | 6 ++-- source/sw/src/sumo.cpp | 3 +- source/sw/src/sw_strs.h | 49 ----------------------------- source/sw/src/text.cpp | 2 +- source/sw/src/text.h | 49 ----------------------------- source/sw/src/track.cpp | 2 +- source/sw/src/track.h | 15 --------- source/sw/src/trigger.h | 30 ------------------ source/sw/src/vator.cpp | 2 +- source/sw/src/vis.h | 31 ------------------- source/sw/src/warp.cpp | 4 +-- source/sw/src/warp.h | 33 -------------------- source/sw/src/weapon.cpp | 6 ++-- source/sw/src/zilla.cpp | 3 +- source/sw/src/zombie.cpp | 3 +- 55 files changed, 104 insertions(+), 373 deletions(-) delete mode 100644 source/sw/src/savedef.h delete mode 100644 source/sw/src/slidor.h delete mode 100644 source/sw/src/sw_strs.h delete mode 100644 source/sw/src/text.h delete mode 100644 source/sw/src/track.h delete mode 100644 source/sw/src/trigger.h delete mode 100644 source/sw/src/vis.h delete mode 100644 source/sw/src/warp.h diff --git a/source/sw/src/actor.cpp b/source/sw/src/actor.cpp index e78fc6d52..6427a4494 100644 --- a/source/sw/src/actor.cpp +++ b/source/sw/src/actor.cpp @@ -34,11 +34,10 @@ Prepared for public release: 03/28/2005 - Charlie Wiederhold, 3D Realms #include "names2.h" #include "panel.h" -#include "game.h" +#include "misc.h" #include "tags.h" #include "weapon.h" #include "sprite.h" -#include "actor.h" BEGIN_SW_NS diff --git a/source/sw/src/border.cpp b/source/sw/src/border.cpp index 0699fb2eb..140539afe 100644 --- a/source/sw/src/border.cpp +++ b/source/sw/src/border.cpp @@ -33,7 +33,7 @@ Prepared for public release: 03/28/2005 - Charlie Wiederhold, 3D Realms #include "game.h" #include "common_game.h" #include "network.h" -#include "text.h" +#include "misc.h" #include "menus.h" BEGIN_SW_NS diff --git a/source/sw/src/bunny.cpp b/source/sw/src/bunny.cpp index a96b8c648..f92452efc 100644 --- a/source/sw/src/bunny.cpp +++ b/source/sw/src/bunny.cpp @@ -33,9 +33,8 @@ Prepared for public release: 03/28/2005 - Charlie Wiederhold, 3D Realms #include "ai.h" #include "pal.h" #include "sprite.h" -#include "actor.h" #include "weapon.h" -#include "track.h" +#include "misc.h" BEGIN_SW_NS diff --git a/source/sw/src/cheats.cpp b/source/sw/src/cheats.cpp index 480e01c76..fe00ef3ba 100644 --- a/source/sw/src/cheats.cpp +++ b/source/sw/src/cheats.cpp @@ -40,7 +40,7 @@ Prepared for public release: 03/28/2005 - Charlie Wiederhold, 3D Realms #include "panel.h" #include "game.h" #include "mytypes.h" -#include "text.h" +#include "misc.h" #include "gamecontrol.h" #include "gstrings.h" diff --git a/source/sw/src/console.cpp b/source/sw/src/console.cpp index 991eeaef2..aacfc80c2 100644 --- a/source/sw/src/console.cpp +++ b/source/sw/src/console.cpp @@ -39,20 +39,17 @@ Prepared for public release: 03/28/2005 - Charlie Wiederhold, 3D Realms #include "tags.h" #include "player.h" #include "lists.h" -#include "warp.h" #include "quake.h" #include "common_game.h" #include "gamecontrol.h" -#include "trigger.h" -#include "savedef.h" #include "menus.h" #include "network.h" #include "pal.h" #include "weapon.h" -#include "text.h" +#include "misc.h" #include "jsector.h" BEGIN_SW_NS diff --git a/source/sw/src/coolg.cpp b/source/sw/src/coolg.cpp index c6c02c536..e5c1ba61c 100644 --- a/source/sw/src/coolg.cpp +++ b/source/sw/src/coolg.cpp @@ -32,9 +32,8 @@ Prepared for public release: 03/28/2005 - Charlie Wiederhold, 3D Realms #include "tags.h" #include "ai.h" #include "sprite.h" -#include "actor.h" #include "weapon.h" -#include "track.h" +#include "misc.h" BEGIN_SW_NS diff --git a/source/sw/src/coolie.cpp b/source/sw/src/coolie.cpp index 8989a2c8b..450e302c1 100644 --- a/source/sw/src/coolie.cpp +++ b/source/sw/src/coolie.cpp @@ -32,8 +32,7 @@ Prepared for public release: 03/28/2005 - Charlie Wiederhold, 3D Realms #include "tags.h" #include "ai.h" #include "sprite.h" -#include "actor.h" -#include "track.h" +#include "misc.h" #include "weapon.h" BEGIN_SW_NS diff --git a/source/sw/src/copysect.cpp b/source/sw/src/copysect.cpp index 7578a3bd8..90e21f39c 100644 --- a/source/sw/src/copysect.cpp +++ b/source/sw/src/copysect.cpp @@ -32,7 +32,7 @@ Prepared for public release: 03/28/2005 - Charlie Wiederhold, 3D Realms #include "tags.h" #include "weapon.h" #include "sprite.h" -#include "track.h" +#include "misc.h" #include "interpso.h" BEGIN_SW_NS diff --git a/source/sw/src/d_menu.cpp b/source/sw/src/d_menu.cpp index 4f3501411..44af30c2f 100644 --- a/source/sw/src/d_menu.cpp +++ b/source/sw/src/d_menu.cpp @@ -32,7 +32,6 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. #include "player.h" #include "jsector.h" #include "menus.h" -#include "sw_strs.h" #include "pal.h" #include "demo.h" #include "keydef.h" @@ -40,7 +39,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. #include "gamecontrol.h" #include "gamedefs.h" #include "network.h" -#include "text.h" +#include "misc.h" #include "version.h" #include "network.h" diff --git a/source/sw/src/draw.cpp b/source/sw/src/draw.cpp index 494e208ab..010e4c3ed 100644 --- a/source/sw/src/draw.cpp +++ b/source/sw/src/draw.cpp @@ -34,7 +34,6 @@ Prepared for public release: 03/28/2005 - Charlie Wiederhold, 3D Realms #include "panel.h" #include "game.h" #include "quake.h" -#include "vis.h" #include "jsector.h" @@ -49,7 +48,6 @@ Prepared for public release: 03/28/2005 - Charlie Wiederhold, 3D Realms #include "misc.h" #include "reserve.h" -#include "text.h" #include "menus.h" #include "interp.h" #include "interpso.h" diff --git a/source/sw/src/eel.cpp b/source/sw/src/eel.cpp index 812911511..6fdfe6acb 100644 --- a/source/sw/src/eel.cpp +++ b/source/sw/src/eel.cpp @@ -31,9 +31,8 @@ Prepared for public release: 03/28/2005 - Charlie Wiederhold, 3D Realms #include "game.h" #include "tags.h" #include "ai.h" -#include "actor.h" #include "weapon.h" -#include "track.h" +#include "misc.h" BEGIN_SW_NS diff --git a/source/sw/src/game.cpp b/source/sw/src/game.cpp index 260b027eb..28a1c958c 100644 --- a/source/sw/src/game.cpp +++ b/source/sw/src/game.cpp @@ -79,9 +79,8 @@ Things required to make savegames work: #include "break.h" #include "ninja.h" #include "light.h" -#include "track.h" +#include "misc.h" #include "jsector.h" -#include "text.h" #include "common.h" #include "common_game.h" diff --git a/source/sw/src/girlninj.cpp b/source/sw/src/girlninj.cpp index ca9f79d39..db6a4b5c0 100644 --- a/source/sw/src/girlninj.cpp +++ b/source/sw/src/girlninj.cpp @@ -35,8 +35,7 @@ Prepared for public release: 03/28/2005 - Charlie Wiederhold, 3D Realms #include "pal.h" #include "player.h" #include "network.h" -#include "actor.h" -#include "track.h" +#include "misc.h" #include "sprite.h" BEGIN_SW_NS diff --git a/source/sw/src/goro.cpp b/source/sw/src/goro.cpp index cfa822dc9..7dffea481 100644 --- a/source/sw/src/goro.cpp +++ b/source/sw/src/goro.cpp @@ -31,8 +31,7 @@ Prepared for public release: 03/28/2005 - Charlie Wiederhold, 3D Realms #include "tags.h" #include "game.h" #include "ai.h" -#include "actor.h" -#include "track.h" +#include "misc.h" BEGIN_SW_NS diff --git a/source/sw/src/hornet.cpp b/source/sw/src/hornet.cpp index 0a8d639ba..aa7c340db 100644 --- a/source/sw/src/hornet.cpp +++ b/source/sw/src/hornet.cpp @@ -31,9 +31,8 @@ Prepared for public release: 03/28/2005 - Charlie Wiederhold, 3D Realms #include "game.h" #include "tags.h" #include "ai.h" -#include "actor.h" #include "weapon.h" -#include "track.h" +#include "misc.h" #include "sprite.h" BEGIN_SW_NS diff --git a/source/sw/src/inv.cpp b/source/sw/src/inv.cpp index c215a6b56..1d71eea07 100644 --- a/source/sw/src/inv.cpp +++ b/source/sw/src/inv.cpp @@ -33,7 +33,6 @@ Prepared for public release: 03/28/2005 - Charlie Wiederhold, 3D Realms #include "panel.h" #include "game.h" #include "pal.h" -#include "text.h" #include "misc.h" #include "player.h" diff --git a/source/sw/src/jplayer.cpp b/source/sw/src/jplayer.cpp index 8e6e8274c..f2830f730 100644 --- a/source/sw/src/jplayer.cpp +++ b/source/sw/src/jplayer.cpp @@ -37,14 +37,11 @@ Prepared for public release: 03/28/2005 - Charlie Wiederhold, 3D Realms #include "tags.h" #include "player.h" #include "lists.h" -#include "warp.h" #include "quake.h" #include "common_game.h" #include "gamecontrol.h" -#include "trigger.h" -#include "savedef.h" #include "menus.h" #include "network.h" #include "pal.h" diff --git a/source/sw/src/jweapon.cpp b/source/sw/src/jweapon.cpp index 49ba856da..b32eb71fd 100644 --- a/source/sw/src/jweapon.cpp +++ b/source/sw/src/jweapon.cpp @@ -30,7 +30,7 @@ Prepared for public release: 03/28/2005 - Charlie Wiederhold, 3D Realms #include "names2.h" #include "panel.h" -#include "game.h" +#include "misc.h" #include "tags.h" #include "common_game.h" #include "break.h" @@ -43,7 +43,6 @@ Prepared for public release: 03/28/2005 - Charlie Wiederhold, 3D Realms #include "sprite.h" #include "sector.h" -#include "actor.h" BEGIN_SW_NS diff --git a/source/sw/src/lava.cpp b/source/sw/src/lava.cpp index 807180c54..ac1003f0d 100644 --- a/source/sw/src/lava.cpp +++ b/source/sw/src/lava.cpp @@ -32,8 +32,7 @@ Prepared for public release: 03/28/2005 - Charlie Wiederhold, 3D Realms #include "game.h" #include "tags.h" #include "ai.h" -#include "actor.h" -#include "track.h" +#include "misc.h" BEGIN_SW_NS diff --git a/source/sw/src/menus.cpp b/source/sw/src/menus.cpp index a62af7b1f..13634a014 100644 --- a/source/sw/src/menus.cpp +++ b/source/sw/src/menus.cpp @@ -37,7 +37,6 @@ Prepared for public release: 03/28/2005 - Charlie Wiederhold, 3D Realms #include "player.h" #include "jsector.h" #include "menus.h" -#include "sw_strs.h" #include "pal.h" #include "demo.h" @@ -46,7 +45,6 @@ Prepared for public release: 03/28/2005 - Charlie Wiederhold, 3D Realms #include "gamecontrol.h" #include "gamedefs.h" #include "network.h" -#include "text.h" #include "version.h" #include "network.h" diff --git a/source/sw/src/misc.h b/source/sw/src/misc.h index 132e15b97..8d1649017 100644 --- a/source/sw/src/misc.h +++ b/source/sw/src/misc.h @@ -49,4 +49,67 @@ void MapColors(short num,COLOR_MAP cm,short create); void InitPalette(void); int32_t CONFIG_ReadSetup(void); +SWBOOL WarpPlaneSectorInfo(short sectnum, SPRITEp* sp_ceiling, SPRITEp* sp_floor); +SPRITEp WarpPlane(int32_t* x, int32_t* y, int32_t* z, int16_t* sectnum); +SPRITEp WarpToArea(SPRITEp sp_from, int32_t* x, int32_t* y, int32_t* z, int16_t* sectnum); +SWBOOL WarpSectorInfo(short sectnum, SPRITEp* sp_warp); +SPRITEp Warp(int32_t* x, int32_t* y, int32_t* z, int16_t* sectnum); + +void ProcessVisOn(void); +void VisViewChange(PLAYERp pp, int* vis); +int SpawnVis(short Parent, short sectnum, int x, int y, int z, int amt); + +enum TriggerType { TRIGGER_TYPE_REMOTE_SO }; + +int ActorFollowTrack(short SpriteNum, short locktics); +void ActorLeaveTrack(short SpriteNum); +void RefreshPoints(SECTOR_OBJECTp sop, int nx, int ny, SWBOOL dynamic); +void TrackSetup(void); +void PlaceSectorObject(SECTOR_OBJECTp sop, int newx, int newy); +void PlaceSectorObjectsOnTracks(void); +void PlaceActorsOnTracks(void); +void SetupSectorObject(short sectnum, short tag); +void PostSetupSectorObject(void); +void VehicleSetSmoke(SECTOR_OBJECTp sop, ANIMATORp animator); +void CollapseSectorObject(SECTOR_OBJECTp sop, int nx, int ny); +void KillSectorObjectSprites(SECTOR_OBJECTp sop); +void MoveSectorObjects(SECTOR_OBJECTp sop, short locktics); + +#define TEXT_INFO_TIME (3) +#define TEXT_INFO_Y (40) +#define TEXT_INFO_YOFF (10) +inline int TEXT_INFO_LINE(int line) { return (TEXT_INFO_Y + ((line)*TEXT_INFO_YOFF)); } + +void DisplayFragNames(PLAYERp pp); +void DisplayMiniBarSmString(PLAYERp pp, short xs, short ys, short pal, const char* buffer); +void DisplaySmString(PLAYERp pp, short xs, short ys, short pal, const char* buffer); +void DisplayMiniBarNumber(short xs, short ys, int number); +void DisplaySummaryString(PLAYERp pp, short xs, short ys, short color, short shade, const char* buffer); +void DisplayPanelNumber(PLAYERp pp, short xs, short ys, int number); +void PutStringInfo(PLAYERp pp, const char* string); +void PutStringInfoLine(PLAYERp pp, const char* string); +void PutStringInfoLine2(PLAYERp pp, const char* string); +void pClearTextLine(PLAYERp pp, int y); +void pMenuClearTextLine(PLAYERp pp); + +void StringTimer(PANEL_SPRITEp psp); + +short DoSlidorMatch(PLAYERp pp, short match, SWBOOL); +SWBOOL TestSlidorMatchActive(short match); +void InterpSectorSprites(short sectnum, SWBOOL state); + +typedef void INTERP_FUNC(int*); +typedef INTERP_FUNC* INTERP_FUNCp; + +void SetSlidorActive(short SpriteNum); +void DoSlidorInterp(short, INTERP_FUNCp); + +int DoBeginJump(short SpriteNum); +int DoJump(short SpriteNum); +int DoBeginFall(short SpriteNum); +int DoFall(short SpriteNum); +void KeepActorOnFloor(short SpriteNum); +int DoActorSlide(short SpriteNum); +int DoActorSectorDamage(short SpriteNum); +int DoScaleSprite(short SpriteNum); END_SW_NS diff --git a/source/sw/src/miscactr.cpp b/source/sw/src/miscactr.cpp index 2b746c224..88b905ea1 100644 --- a/source/sw/src/miscactr.cpp +++ b/source/sw/src/miscactr.cpp @@ -29,11 +29,10 @@ Prepared for public release: 03/28/2005 - Charlie Wiederhold, 3D Realms #include "names2.h" #include "panel.h" -#include "game.h" +#include "misc.h" #include "tags.h" #include "ai.h" #include "quake.h" -#include "actor.h" #include "sector.h" #include "sprite.h" diff --git a/source/sw/src/network.cpp b/source/sw/src/network.cpp index eb233579c..70fa8d390 100644 --- a/source/sw/src/network.cpp +++ b/source/sw/src/network.cpp @@ -39,7 +39,6 @@ Prepared for public release: 03/28/2005 - Charlie Wiederhold, 3D Realms #include "demo.h" #include "weapon.h" -#include "text.h" #include "menus.h" #include "printf.h" diff --git a/source/sw/src/ninja.cpp b/source/sw/src/ninja.cpp index 9924ab365..e409141e1 100644 --- a/source/sw/src/ninja.cpp +++ b/source/sw/src/ninja.cpp @@ -42,8 +42,7 @@ Prepared for public release: 03/28/2005 - Charlie Wiederhold, 3D Realms #include "player.h" #include "network.h" #include "weapon.h" -#include "track.h" -#include "actor.h" +#include "misc.h" #include "ninja.h" #include "sprite.h" diff --git a/source/sw/src/osdcmds.cpp b/source/sw/src/osdcmds.cpp index eb9f87578..3f959c77b 100644 --- a/source/sw/src/osdcmds.cpp +++ b/source/sw/src/osdcmds.cpp @@ -33,7 +33,6 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. #include "panel.h" #include "game.h" #include "mytypes.h" -#include "text.h" #include "gamecontrol.h" #include "gstrings.h" diff --git a/source/sw/src/panel.cpp b/source/sw/src/panel.cpp index 47089bd50..be2bf73f9 100644 --- a/source/sw/src/panel.cpp +++ b/source/sw/src/panel.cpp @@ -33,12 +33,10 @@ Prepared for public release: 03/28/2005 - Charlie Wiederhold, 3D Realms #include "names2.h" #include "panel.h" #include "lists.h" -#include "game.h" +#include "misc.h" #include "common_game.h" #include "network.h" #include "pal.h" -#include "vis.h" -#include "text.h" #include "player.h" #include "v_2ddrawer.h" diff --git a/source/sw/src/player.cpp b/source/sw/src/player.cpp index cd73d1b46..91c28bc72 100644 --- a/source/sw/src/player.cpp +++ b/source/sw/src/player.cpp @@ -35,15 +35,11 @@ Prepared for public release: 03/28/2005 - Charlie Wiederhold, 3D Realms #include "tags.h" #include "player.h" #include "lists.h" -#include "warp.h" #include "quake.h" -#include "text.h" #include "common_game.h" #include "gamecontrol.h" -#include "trigger.h" -#include "savedef.h" #include "menus.h" #include "network.h" #include "pal.h" @@ -56,10 +52,7 @@ Prepared for public release: 03/28/2005 - Charlie Wiederhold, 3D Realms #include "break.h" #include "jsector.h" #include "sector.h" -#include "actor.h" #include "misc.h" -#include "vis.h" -#include "track.h" #include "interp.h" #include "interpso.h" #include "menu.h" diff --git a/source/sw/src/ripper.cpp b/source/sw/src/ripper.cpp index f3547c71c..a5fb09db0 100644 --- a/source/sw/src/ripper.cpp +++ b/source/sw/src/ripper.cpp @@ -33,9 +33,8 @@ Prepared for public release: 03/28/2005 - Charlie Wiederhold, 3D Realms #include "tags.h" #include "ai.h" #include "pal.h" -#include "actor.h" #include "sprite.h" -#include "track.h" +#include "misc.h" BEGIN_SW_NS diff --git a/source/sw/src/ripper2.cpp b/source/sw/src/ripper2.cpp index 478f1d565..63c5f5127 100644 --- a/source/sw/src/ripper2.cpp +++ b/source/sw/src/ripper2.cpp @@ -32,9 +32,8 @@ Prepared for public release: 03/28/2005 - Charlie Wiederhold, 3D Realms #include "tags.h" #include "ai.h" #include "pal.h" -#include "actor.h" #include "sprite.h" -#include "track.h" +#include "misc.h" BEGIN_SW_NS diff --git a/source/sw/src/rooms.cpp b/source/sw/src/rooms.cpp index e5dd3447c..8c2c3668b 100644 --- a/source/sw/src/rooms.cpp +++ b/source/sw/src/rooms.cpp @@ -28,8 +28,7 @@ Prepared for public release: 03/28/2005 - Charlie Wiederhold, 3D Realms #include "names2.h" #include "panel.h" -#include "game.h" -#include "warp.h" +#include "misc.h" BEGIN_SW_NS diff --git a/source/sw/src/rotator.cpp b/source/sw/src/rotator.cpp index 76cd14410..ea637a486 100644 --- a/source/sw/src/rotator.cpp +++ b/source/sw/src/rotator.cpp @@ -28,11 +28,10 @@ Prepared for public release: 03/28/2005 - Charlie Wiederhold, 3D Realms #include "names2.h" #include "panel.h" -#include "game.h" +#include "misc.h" #include "network.h" #include "tags.h" #include "sector.h" -#include "text.h" #include "interp.h" #include "sprite.h" #include "quotemgr.h" diff --git a/source/sw/src/save.cpp b/source/sw/src/save.cpp index 9eba78568..3482c769f 100644 --- a/source/sw/src/save.cpp +++ b/source/sw/src/save.cpp @@ -39,8 +39,6 @@ Prepared for public release: 03/28/2005 - Charlie Wiederhold, 3D Realms #include "interpso.h" #include "network.h" -//#include "save.h" -#include "savedef.h" #include "jsector.h" #include "parent.h" #include "reserve.h" diff --git a/source/sw/src/savedef.h b/source/sw/src/savedef.h deleted file mode 100644 index c3e14bacf..000000000 --- a/source/sw/src/savedef.h +++ /dev/null @@ -1,27 +0,0 @@ -//------------------------------------------------------------------------- -/* -Copyright (C) 1997, 2005 - 3D Realms Entertainment - -This file is part of Shadow Warrior version 1.2 - -Shadow Warrior is free software; you can redistribute it and/or -modify it under the terms of the GNU General Public License -as published by the Free Software Foundation; either version 2 -of the License, or (at your option) any later version. - -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. - -See the GNU General Public License for more details. - -You should have received a copy of the GNU General Public License -along with this program; if not, write to the Free Software -Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - -Original Source: 1997 - Frank Maddin and Jim Norwood -Prepared for public release: 03/28/2005 - Charlie Wiederhold, 3D Realms -*/ -//------------------------------------------------------------------------- - -#define SAVE_VALIDATE FALSE diff --git a/source/sw/src/sector.cpp b/source/sw/src/sector.cpp index c54ef9e95..081a51326 100644 --- a/source/sw/src/sector.cpp +++ b/source/sw/src/sector.cpp @@ -29,7 +29,7 @@ Prepared for public release: 03/28/2005 - Charlie Wiederhold, 3D Realms #include "names2.h" #include "panel.h" -#include "game.h" +#include "misc.h" #include "tags.h" #include "sector.h" #include "player.h" @@ -40,11 +40,10 @@ Prepared for public release: 03/28/2005 - Charlie Wiederhold, 3D Realms #include "network.h" #include "break.h" -#include "track.h" +#include "misc.h" #include "sprite.h" #include "common_game.h" #include "light.h" -#include "text.h" #include "gstrings.h" #include "secrets.h" diff --git a/source/sw/src/serp.cpp b/source/sw/src/serp.cpp index 86717087e..bba1e6395 100644 --- a/source/sw/src/serp.cpp +++ b/source/sw/src/serp.cpp @@ -30,8 +30,7 @@ Prepared for public release: 03/28/2005 - Charlie Wiederhold, 3D Realms #include "game.h" #include "tags.h" #include "ai.h" -#include "actor.h" -#include "track.h" +#include "misc.h" #include "sector.h" #include "gamecontrol.h" #include "mapinfo.h" diff --git a/source/sw/src/skel.cpp b/source/sw/src/skel.cpp index 2770062c5..902af431f 100644 --- a/source/sw/src/skel.cpp +++ b/source/sw/src/skel.cpp @@ -30,8 +30,7 @@ Prepared for public release: 03/28/2005 - Charlie Wiederhold, 3D Realms #include "game.h" #include "tags.h" #include "ai.h" -#include "actor.h" -#include "track.h" +#include "misc.h" BEGIN_SW_NS diff --git a/source/sw/src/skull.cpp b/source/sw/src/skull.cpp index 3a352cfb4..1c6209ef1 100644 --- a/source/sw/src/skull.cpp +++ b/source/sw/src/skull.cpp @@ -27,11 +27,10 @@ Prepared for public release: 03/28/2005 - Charlie Wiederhold, 3D Realms #include "build.h" #include "names2.h" -#include "game.h" +#include "misc.h" #include "tags.h" #include "ai.h" #include "weapon.h" -#include "actor.h" BEGIN_SW_NS diff --git a/source/sw/src/slidor.cpp b/source/sw/src/slidor.cpp index 927adbd37..8a281b4bb 100644 --- a/source/sw/src/slidor.cpp +++ b/source/sw/src/slidor.cpp @@ -31,10 +31,9 @@ Prepared for public release: 03/28/2005 - Charlie Wiederhold, 3D Realms #include "game.h" #include "network.h" #include "tags.h" -#include "slidor.h" #include "sector.h" #include "interp.h" -#include "text.h" +#include "misc.h" #include "sprite.h" #include "quotemgr.h" diff --git a/source/sw/src/slidor.h b/source/sw/src/slidor.h deleted file mode 100644 index 6d7b7eadb..000000000 --- a/source/sw/src/slidor.h +++ /dev/null @@ -1,42 +0,0 @@ -//------------------------------------------------------------------------- -/* -Copyright (C) 1997, 2005 - 3D Realms Entertainment - -This file is part of Shadow Warrior version 1.2 - -Shadow Warrior is free software; you can redistribute it and/or -modify it under the terms of the GNU General Public License -as published by the Free Software Foundation; either version 2 -of the License, or (at your option) any later version. - -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. - -See the GNU General Public License for more details. - -You should have received a copy of the GNU General Public License -along with this program; if not, write to the Free Software -Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - -Original Source: 1997 - Frank Maddin and Jim Norwood -Prepared for public release: 03/28/2005 - Charlie Wiederhold, 3D Realms -*/ -//------------------------------------------------------------------------- - -#ifndef SLIDOR_PUBLIC_ -#define SLIDOR_PUBLIC_ -BEGIN_SW_NS - -short DoSlidorMatch(PLAYERp pp, short match, SWBOOL); -SWBOOL TestSlidorMatchActive(short match); -void InterpSectorSprites(short sectnum, SWBOOL state); - -typedef void INTERP_FUNC (int *); -typedef INTERP_FUNC *INTERP_FUNCp; - -void SetSlidorActive(short SpriteNum); -void DoSlidorInterp(short, INTERP_FUNCp); - -END_SW_NS -#endif diff --git a/source/sw/src/sounds.cpp b/source/sw/src/sounds.cpp index df339e51a..858a8f2c9 100644 --- a/source/sw/src/sounds.cpp +++ b/source/sw/src/sounds.cpp @@ -39,7 +39,7 @@ Prepared for public release: 03/28/2005 - Charlie Wiederhold, 3D Realms #include "network.h" #include "misc.h" -#include "text.h" +#include "misc.h" #include "rts.h" #include "menus.h" #include "menu.h" diff --git a/source/sw/src/sprite.cpp b/source/sw/src/sprite.cpp index d3466761a..e64ec7f1e 100644 --- a/source/sw/src/sprite.cpp +++ b/source/sw/src/sprite.cpp @@ -28,10 +28,9 @@ Prepared for public release: 03/28/2005 - Charlie Wiederhold, 3D Realms #include "names2.h" #include "panel.h" -#include "game.h" +#include "misc.h" #include "tags.h" #include "ai.h" -#include "warp.h" #include "light.h" #include "break.h" #include "network.h" @@ -44,8 +43,7 @@ Prepared for public release: 03/28/2005 - Charlie Wiederhold, 3D Realms #include "sprite.h" #include "weapon.h" #include "jsector.h" -#include "text.h" -#include "slidor.h" +#include "misc.h" #include "player.h" #include "quotemgr.h" #include "v_text.h" diff --git a/source/sw/src/sumo.cpp b/source/sw/src/sumo.cpp index 4b920cff8..0df1ce1d5 100644 --- a/source/sw/src/sumo.cpp +++ b/source/sw/src/sumo.cpp @@ -32,8 +32,7 @@ Prepared for public release: 03/28/2005 - Charlie Wiederhold, 3D Realms #include "tags.h" #include "ai.h" #include "quake.h" -#include "actor.h" -#include "track.h" +#include "misc.h" #include "weapon.h" #include "sector.h" #include "gamecontrol.h" diff --git a/source/sw/src/sw_strs.h b/source/sw/src/sw_strs.h deleted file mode 100644 index de34b52df..000000000 --- a/source/sw/src/sw_strs.h +++ /dev/null @@ -1,49 +0,0 @@ -//------------------------------------------------------------------------- -/* -Copyright (C) 1997, 2005 - 3D Realms Entertainment - -This file is part of Shadow Warrior version 1.2 - -Shadow Warrior is free software; you can redistribute it and/or -modify it under the terms of the GNU General Public License -as published by the Free Software Foundation; either version 2 -of the License, or (at your option) any later version. - -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. - -See the GNU General Public License for more details. - -You should have received a copy of the GNU General Public License -along with this program; if not, write to the Free Software -Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - -Original Source: 1997 - Frank Maddin and Jim Norwood -Prepared for public release: 03/28/2005 - Charlie Wiederhold, 3D Realms -*/ -//------------------------------------------------------------------------- - -#define S_INAGAME "YOU ARE IN A GAME!" -#define S_PRESSKEY "PRESS ANY KEY WHEN READY" -#define S_MESSAGEON "GAME MESSAGES ARE NOW ON" -#define S_MESSAGEOFF "GAME MESSAGES ARE NOW OFF" - -#define S_QUITYN "PRESS (Y) TO QUIT, (N) TO FIGHT ON." -#define S_QUIT1 "CONFUCIOUS SAY, 'HE WHO QUITS," -#define S_QUIT1A "TOTALLY SUCKS!'" -#define S_QUIT2 "GO AHEAD, LEAVE, BUT WHILE YOU'RE" -#define S_QUIT2A "GONE, EVIL WILL BE TAKING OVER!" -#define S_QUIT3 "ALL OF JAPAN IS COUNTING ON YOU!" -#define S_QUIT3A "ONLY A LOSER COULD LET THEM DOWN." -#define S_QUIT4 "THIS IS TOO MUCH! NOW WHERE" -#define S_QUIT4A "DID I PUT THOSE CHEAT CODES?" -#define S_QUIT5 "PRESS (Y) TO RUN HOME TO MOMMY," -#define S_QUIT5A "(N) TO BE A MAN." -#define S_QUIT6 "YOU DO KNOW, THAT WHILE YOU'RE" -#define S_QUIT6A "AWAY, WE'LL BE RESTOCKING MT. FUJI" -#define S_QUIT6B "WITH A MILLION NEW MONSTERS?" -#define S_QUIT7 "COME BACK ANY TIME, WE ARE ALWAYS" -#define S_QUIT7A "LOOKING FOR A SACK OF RIPPER CHOW!" -#define S_QUIT8 "LET'S MAKE A STEALTHY EXIT TO DOS!" - diff --git a/source/sw/src/text.cpp b/source/sw/src/text.cpp index 95df86d02..4375588df 100644 --- a/source/sw/src/text.cpp +++ b/source/sw/src/text.cpp @@ -33,7 +33,7 @@ Prepared for public release: 03/28/2005 - Charlie Wiederhold, 3D Realms #include "game.h" #include "common_game.h" #include "pal.h" -#include "text.h" +#include "misc.h" #include "menus.h" #include "network.h" diff --git a/source/sw/src/text.h b/source/sw/src/text.h deleted file mode 100644 index 066f98131..000000000 --- a/source/sw/src/text.h +++ /dev/null @@ -1,49 +0,0 @@ -//------------------------------------------------------------------------- -/* -Copyright (C) 1997, 2005 - 3D Realms Entertainment - -This file is part of Shadow Warrior version 1.2 - -Shadow Warrior is free software; you can redistribute it and/or -modify it under the terms of the GNU General Public License -as published by the Free Software Foundation; either version 2 -of the License, or (at your option) any later version. - -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. - -See the GNU General Public License for more details. - -You should have received a copy of the GNU General Public License -along with this program; if not, write to the Free Software -Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - -Original Source: 1997 - Frank Maddin and Jim Norwood -Prepared for public release: 03/28/2005 - Charlie Wiederhold, 3D Realms -*/ -//------------------------------------------------------------------------- - -BEGIN_SW_NS -#define TEXT_INFO_TIME (3) -#define TEXT_INFO_X (16) -//#define TEXT_INFO_Y (20) -#define TEXT_INFO_Y (40) -#define TEXT_INFO_YOFF (10) -#define TEXT_INFO_LINE(line) (TEXT_INFO_Y + ((line) * TEXT_INFO_YOFF)) -//#define TEXT_INFO_LINE(line) (TEXT_INFO_Y + ((line) * TEXT_INFO_YOFF) + GlobalInfoLineOffset) - -void DisplayFragNames(PLAYERp pp); -void DisplayMiniBarSmString(PLAYERp pp,short xs,short ys, short pal, const char *buffer); -void DisplaySmString(PLAYERp pp, short xs, short ys, short pal, const char *buffer); -void DisplayMiniBarNumber(short xs,short ys,int number); -void DisplaySummaryString(PLAYERp pp,short xs,short ys,short color,short shade,const char *buffer); -void DisplayPanelNumber(PLAYERp pp,short xs,short ys,int number); -void PutStringInfo(PLAYERp pp, const char *string); -void PutStringInfoLine(PLAYERp pp, const char *string); -void PutStringInfoLine2(PLAYERp pp, const char *string); -void pClearTextLine(PLAYERp pp,int y); -void pMenuClearTextLine(PLAYERp pp); - -void StringTimer(PANEL_SPRITEp psp); -END_SW_NS diff --git a/source/sw/src/track.cpp b/source/sw/src/track.cpp index ab3245d71..58312ccd4 100644 --- a/source/sw/src/track.cpp +++ b/source/sw/src/track.cpp @@ -36,7 +36,7 @@ Prepared for public release: 03/28/2005 - Charlie Wiederhold, 3D Realms #include "interpso.h" #include "network.h" #include "sprite.h" -#include "track.h" +#include "misc.h" #include "weapon.h" BEGIN_SW_NS diff --git a/source/sw/src/track.h b/source/sw/src/track.h deleted file mode 100644 index 295b5b827..000000000 --- a/source/sw/src/track.h +++ /dev/null @@ -1,15 +0,0 @@ -BEGIN_SW_NS -int ActorFollowTrack(short SpriteNum,short locktics); -void ActorLeaveTrack(short SpriteNum); -void RefreshPoints(SECTOR_OBJECTp sop,int nx,int ny,SWBOOL dynamic); -void TrackSetup(void); -void PlaceSectorObject(SECTOR_OBJECTp sop,int newx,int newy); -void PlaceSectorObjectsOnTracks(void); -void PlaceActorsOnTracks(void); -void SetupSectorObject(short sectnum,short tag); -void PostSetupSectorObject(void); -void VehicleSetSmoke(SECTOR_OBJECTp sop,ANIMATORp animator); -void CollapseSectorObject(SECTOR_OBJECTp sop,int nx,int ny); -void KillSectorObjectSprites(SECTOR_OBJECTp sop); -void MoveSectorObjects(SECTOR_OBJECTp sop,short locktics); -END_SW_NS diff --git a/source/sw/src/trigger.h b/source/sw/src/trigger.h deleted file mode 100644 index 0cd05c7e6..000000000 --- a/source/sw/src/trigger.h +++ /dev/null @@ -1,30 +0,0 @@ -//------------------------------------------------------------------------- -/* -Copyright (C) 1997, 2005 - 3D Realms Entertainment - -This file is part of Shadow Warrior version 1.2 - -Shadow Warrior is free software; you can redistribute it and/or -modify it under the terms of the GNU General Public License -as published by the Free Software Foundation; either version 2 -of the License, or (at your option) any later version. - -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. - -See the GNU General Public License for more details. - -You should have received a copy of the GNU General Public License -along with this program; if not, write to the Free Software -Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - -Original Source: 1997 - Frank Maddin and Jim Norwood -Prepared for public release: 03/28/2005 - Charlie Wiederhold, 3D Realms -*/ -//------------------------------------------------------------------------- - -BEGIN_SW_NS - -enum TriggerType {TRIGGER_TYPE_REMOTE_SO}; -END_SW_NS diff --git a/source/sw/src/vator.cpp b/source/sw/src/vator.cpp index 920ee4237..50afe02f8 100644 --- a/source/sw/src/vator.cpp +++ b/source/sw/src/vator.cpp @@ -33,7 +33,7 @@ Prepared for public release: 03/28/2005 - Charlie Wiederhold, 3D Realms #include "tags.h" #include "sector.h" #include "interp.h" -#include "text.h" +#include "misc.h" #include "sprite.h" #include "weapon.h" #include "quotemgr.h" diff --git a/source/sw/src/vis.h b/source/sw/src/vis.h deleted file mode 100644 index fcbba7d8f..000000000 --- a/source/sw/src/vis.h +++ /dev/null @@ -1,31 +0,0 @@ -//------------------------------------------------------------------------- -/* -Copyright (C) 1997, 2005 - 3D Realms Entertainment - -This file is part of Shadow Warrior version 1.2 - -Shadow Warrior is free software; you can redistribute it and/or -modify it under the terms of the GNU General Public License -as published by the Free Software Foundation; either version 2 -of the License, or (at your option) any later version. - -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. - -See the GNU General Public License for more details. - -You should have received a copy of the GNU General Public License -along with this program; if not, write to the Free Software -Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - -Original Source: 1997 - Frank Maddin and Jim Norwood -Prepared for public release: 03/28/2005 - Charlie Wiederhold, 3D Realms -*/ -//------------------------------------------------------------------------- -BEGIN_SW_NS - -void ProcessVisOn(void); -void VisViewChange(PLAYERp pp, int *vis); -int SpawnVis(short Parent, short sectnum, int x, int y, int z, int amt); -END_SW_NS diff --git a/source/sw/src/warp.cpp b/source/sw/src/warp.cpp index fb9633f44..fa76a57eb 100644 --- a/source/sw/src/warp.cpp +++ b/source/sw/src/warp.cpp @@ -28,9 +28,7 @@ Prepared for public release: 03/28/2005 - Charlie Wiederhold, 3D Realms #include "names2.h" #include "panel.h" -#include "game.h" - -#include "warp.h" +#include "misc.h" BEGIN_SW_NS diff --git a/source/sw/src/warp.h b/source/sw/src/warp.h deleted file mode 100644 index b5a85ab67..000000000 --- a/source/sw/src/warp.h +++ /dev/null @@ -1,33 +0,0 @@ -//------------------------------------------------------------------------- -/* -Copyright (C) 1997, 2005 - 3D Realms Entertainment - -This file is part of Shadow Warrior version 1.2 - -Shadow Warrior is free software; you can redistribute it and/or -modify it under the terms of the GNU General Public License -as published by the Free Software Foundation; either version 2 -of the License, or (at your option) any later version. - -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. - -See the GNU General Public License for more details. - -You should have received a copy of the GNU General Public License -along with this program; if not, write to the Free Software -Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - -Original Source: 1997 - Frank Maddin and Jim Norwood -Prepared for public release: 03/28/2005 - Charlie Wiederhold, 3D Realms -*/ -//------------------------------------------------------------------------- - -BEGIN_SW_NS -SWBOOL WarpPlaneSectorInfo(short sectnum, SPRITEp *sp_ceiling, SPRITEp *sp_floor); -SPRITEp WarpPlane(int32_t* x, int32_t* y, int32_t* z, int16_t* sectnum); -SPRITEp WarpToArea(SPRITEp sp_from, int32_t* x, int32_t* y, int32_t* z, int16_t* sectnum); -SWBOOL WarpSectorInfo(short sectnum, SPRITEp *sp_warp); -SPRITEp Warp(int32_t* x, int32_t* y, int32_t* z, int16_t* sectnum); -END_SW_NS diff --git a/source/sw/src/weapon.cpp b/source/sw/src/weapon.cpp index c2c6943e6..f869529de 100644 --- a/source/sw/src/weapon.cpp +++ b/source/sw/src/weapon.cpp @@ -29,7 +29,7 @@ Prepared for public release: 03/28/2005 - Charlie Wiederhold, 3D Realms #include "names2.h" #include "panel.h" -#include "game.h" +#include "misc.h" #include "interp.h" #include "interpso.h" #include "tags.h" @@ -38,15 +38,13 @@ Prepared for public release: 03/28/2005 - Charlie Wiederhold, 3D Realms #include "quake.h" #include "network.h" #include "pal.h" -#include "vis.h" #include "ai.h" #include "weapon.h" #include "anim.h" #include "sector.h" #include "sprite.h" -#include "actor.h" -#include "track.h" +#include "misc.h" #include "player.h" #include "gstrings.h" diff --git a/source/sw/src/zilla.cpp b/source/sw/src/zilla.cpp index ee8327f60..f26db1a35 100644 --- a/source/sw/src/zilla.cpp +++ b/source/sw/src/zilla.cpp @@ -32,8 +32,7 @@ Prepared for public release: 03/28/2005 - Charlie Wiederhold, 3D Realms #include "tags.h" #include "ai.h" #include "quake.h" -#include "actor.h" -#include "track.h" +#include "misc.h" #include "gamecontrol.h" #include "mapinfo.h" diff --git a/source/sw/src/zombie.cpp b/source/sw/src/zombie.cpp index dc64ca9b5..0b8b334bf 100644 --- a/source/sw/src/zombie.cpp +++ b/source/sw/src/zombie.cpp @@ -36,8 +36,7 @@ Prepared for public release: 03/28/2005 - Charlie Wiederhold, 3D Realms #include "network.h" #include "sprite.h" #include "weapon.h" -#include "actor.h" -#include "track.h" +#include "misc.h" BEGIN_SW_NS