- added Shadow Warrior files to CMake project - not compiled yet.

source/CMakeLists.txt

@@ -959,6 +959,84 @@ set (PCH_SOURCES
 	blood/src/warp.cpp
 	blood/src/weapon.cpp
 	
+	sw/src/actor.cpp
+	sw/src/ai.cpp
+	sw/src/anim.cpp
+	sw/src/bldscript.cpp
+	sw/src/border.cpp
+	sw/src/break.cpp
+	sw/src/brooms.cpp
+	sw/src/bunny.cpp
+	sw/src/cache.cpp
+	sw/src/cheats.cpp
+	sw/src/colormap.cpp
+	sw/src/common.cpp
+	sw/src/config.cpp
+	sw/src/console.cpp
+	sw/src/coolg.cpp
+	sw/src/coolie.cpp
+	sw/src/copysect.cpp
+	sw/src/demo.cpp
+	sw/src/draw.cpp
+	sw/src/eel.cpp
+	sw/src/game.cpp
+	sw/src/girlninj.cpp
+	sw/src/goro.cpp
+	sw/src/grpscan.cpp
+	sw/src/hornet.cpp
+	sw/src/interp.cpp
+	sw/src/interpsh.cpp
+	sw/src/inv.cpp
+	sw/src/jbhlp.cpp
+	sw/src/jplayer.cpp
+	sw/src/jsector.cpp
+	sw/src/jweapon.cpp
+	sw/src/lava.cpp
+	sw/src/light.cpp
+	sw/src/mclip.cpp
+	sw/src/mdastr.cpp
+	sw/src/menus.cpp
+	sw/src/miscactr.cpp
+	sw/src/morph.cpp
+	sw/src/network.cpp
+	sw/src/ninja.cpp
+	sw/src/panel.cpp
+	sw/src/player.cpp
+	sw/src/predict.cpp
+	sw/src/quake.cpp
+	sw/src/ripper.cpp
+	sw/src/ripper2.cpp
+	sw/src/rooms.cpp
+	sw/src/rotator.cpp
+	sw/src/rts.cpp
+	sw/src/save.cpp
+	sw/src/saveable.cpp
+	sw/src/scrip2.cpp
+	sw/src/sector.cpp
+	sw/src/serp.cpp
+	sw/src/setup.cpp
+	sw/src/skel.cpp
+	sw/src/skull.cpp
+	sw/src/slidor.cpp
+	sw/src/sounds.cpp
+	sw/src/spike.cpp
+	sw/src/sprite.cpp
+	sw/src/startgtk.game.cpp
+	sw/src/startwin.game.cpp
+	sw/src/sumo.cpp
+	sw/src/swconfig.cpp
+	sw/src/sync.cpp
+	sw/src/text.cpp
+	sw/src/track.cpp
+	sw/src/vator.cpp
+	sw/src/vis.cpp
+	sw/src/wallmove.cpp
+	sw/src/warp.cpp
+	sw/src/weapon.cpp
+	sw/src/zilla.cpp
+	sw/src/zombie.cpp
+	
+
 	common/utility/m_argv.cpp
 	common/utility/files.cpp
 	common/utility/files_decompress.cpp

source/common/ns.h

@@ -11,7 +11,7 @@
 #define BEGIN_BLD_NS namespace Blood {
 #define END_BLD_NS }
 
-#define BEGIN_SW_NS namespace Blood {
+#define BEGIN_SW_NS namespace ShadowWarrior {
 #define END_SW_NS }
 
 #else

source/sw/src/_functio.h

@@ -34,6 +34,9 @@ Prepared for public release: 03/28/2005 - Charlie Wiederhold, 3D Realms
 
 #ifndef function_private_
 #define function_private_
+
+BEGIN_SW_NS
+
 const char *gamefunctions[] =
 {
     "Move_Forward",
@@ -381,4 +384,5 @@ static const char *joystickdigitaldefaults[] =
     "",
     "",
 };
+END_SW_NS
 #endif

source/sw/src/_rts.h

@@ -51,6 +51,7 @@ Prepared for public release: 03/21/2003 - Charlie Wiederhold, 3D Realms
 
 #ifndef rts_private__
 #define rts_private__
+BEGIN_SW_NS
 
 //===============
 //   TYPES
@@ -76,4 +77,6 @@ typedef struct
     char name[8];
 } filelump_t;
 
+END_SW_NS
+
 #endif

source/sw/src/actor.cpp

@@ -23,6 +23,9 @@ Original Source: 1997 - Frank Maddin and Jim Norwood
 Prepared for public release: 03/28/2005 - Charlie Wiederhold, 3D Realms
 */
 //-------------------------------------------------------------------------
+
+#include "ns.h"
+
 #include "build.h"
 
 #include "keys.h"
@@ -34,6 +37,8 @@ Prepared for public release: 03/28/2005 - Charlie Wiederhold, 3D Realms
 #include "sprite.h"
 #include "actor.h"
 
+BEGIN_SW_NS
+
 extern int jump_grav;
 
 extern STATE s_DebrisNinja[];
@@ -1017,3 +1022,5 @@ saveable_module saveable_actor =
     // data
     NULL,0
 };
+
+END_SW_NS

source/sw/src/actor.h

@@ -1,3 +1,5 @@
+#pragma once
+BEGIN_SW_NS
 int DoBeginJump(short SpriteNum);
 int DoJump(short SpriteNum);
 int DoBeginFall(short SpriteNum);
@@ -6,3 +8,4 @@ void KeepActorOnFloor(short SpriteNum);
 int DoActorSlide(short SpriteNum);
 int DoActorSectorDamage(short SpriteNum);
 int DoScaleSprite(short SpriteNum);
+END_SW_NS

source/sw/src/ai.cpp

@@ -23,6 +23,8 @@ Original Source: 1997 - Frank Maddin and Jim Norwood
 Prepared for public release: 03/28/2005 - Charlie Wiederhold, 3D Realms
 */
 //-------------------------------------------------------------------------
+#include "ns.h"
+
 #include "build.h"
 #include "common.h"
 
@@ -39,6 +41,8 @@ Prepared for public release: 03/28/2005 - Charlie Wiederhold, 3D Realms
 
 #include "network.h"
 
+BEGIN_SW_NS
+
 SWBOOL PlayerTakeDamage(PLAYERp, short);
 ANIMATOR InitActorRunToward;
 SWBOOL FAF_Sector(short);
@@ -2229,3 +2233,4 @@ saveable_module saveable_ai =
     saveable_ai_data,
     SIZ(saveable_ai_data)
 };
+END_SW_NS

source/sw/src/ai.h

@@ -27,6 +27,7 @@ Prepared for public release: 03/28/2005 - Charlie Wiederhold, 3D Realms
 #ifndef AI_H
 
 #define AI_H
+BEGIN_SW_NS
 
 // Call functions based on a random range value
 typedef struct
@@ -163,4 +164,6 @@ DoActorExtra6Noise;
 
 void DoActorSetSpeed(short SpriteNum, uint8_t speed);
 
+END_SW_NS
+
 #endif

source/sw/src/ambient.h

@@ -23,6 +23,7 @@ Original Source: 1997 - Frank Maddin and Jim Norwood
 Prepared for public release: 03/28/2005 - Charlie Wiederhold, 3D Realms
 */
 //-------------------------------------------------------------------------
+BEGIN_SW_NS
 
 #ifdef AMBIENT_TABLE
 #define AMB_ENTRY(name, diginame, ambient_flags, maxtics) {name, diginame, ambient_flags, maxtics},
@@ -213,3 +214,4 @@ AMB_ENTRY(81,   DIGI_SHIPBELL,          AMB_INTERMIT,  AMB_30)
 AMB_ENTRY(82,   DIGI_FOGHORN,           AMB_INTERMIT,  AMB_120)
 
 #undef AMB_ENTRY
+END_SW_NS

source/sw/src/anim.cpp

@@ -23,6 +23,8 @@ Original Source: 1997 - Frank Maddin and Jim Norwood
 Prepared for public release: 03/28/2005 - Charlie Wiederhold, 3D Realms
 */
 //-------------------------------------------------------------------------
+
+#include "ns.h"
 #include "build.h"
 #include "cache1d.h"
 
@@ -46,6 +48,8 @@ Prepared for public release: 03/28/2005 - Charlie Wiederhold, 3D Realms
 #include "animlib.h"
 #include "anim.h"
 
+BEGIN_SW_NS
+
 #define MAX_ANMS 10
 anim_t *anm_ptr[MAX_ANMS];
 
@@ -387,3 +391,4 @@ ENDOFANIMLOOP:
     ANIM_FreeAnim();
     walock[ANIM_TILE(ANIMnum)] = 1;
 }
+END_SW_NS

source/sw/src/anim.h

@@ -23,6 +23,7 @@ Original Source: 1997 - Frank Maddin and Jim Norwood
 Prepared for public release: 03/28/2005 - Charlie Wiederhold, 3D Realms
 */
 //-------------------------------------------------------------------------
+BEGIN_SW_NS
 
 #define ANIM_INTRO 0
 #define ANIM_SERP 1
@@ -31,3 +32,4 @@ Prepared for public release: 03/28/2005 - Charlie Wiederhold, 3D Realms
 
 unsigned char *LoadAnm(short anim_num);
 void playanm(short anim_num);
+END_SW_NS

source/sw/src/bldscript.cpp

@@ -26,6 +26,7 @@ Prepared for public release: 03/28/2005 - Charlie Wiederhold, 3D Realms
 */
 //-------------------------------------------------------------------------
 
+#include "ns.h"
 // scriplib.c
 #include "build.h"
 #include "editor.h"
@@ -38,6 +39,7 @@ Prepared for public release: 03/28/2005 - Charlie Wiederhold, 3D Realms
 
 #define PATHSEPERATOR   '\\'
 
+BEGIN_SW_NS
 
 //#define COMPUTE_TOTALS	1
 
@@ -641,3 +643,4 @@ void LogUserTime( SWBOOL bIsLoggingIn )
 
 }
 */
+END_SW_NS

source/sw/src/border.cpp

@@ -23,6 +23,8 @@ Original Source: 1997 - Frank Maddin and Jim Norwood
 Prepared for public release: 03/28/2005 - Charlie Wiederhold, 3D Realms
 */
 //-------------------------------------------------------------------------
+#include "ns.h"
+
 #include "build.h"
 
 #include "keys.h"
@@ -34,6 +36,8 @@ Prepared for public release: 03/28/2005 - Charlie Wiederhold, 3D Realms
 #include "network.h"
 #include "text.h"
 
+BEGIN_SW_NS
+
 #define BAR_HEIGHT 48
 #define XDIM 320
 #define YDIM 200
@@ -582,3 +586,4 @@ SetRedrawScreen(PLAYERp pp)
     RedrawScreen = TRUE;
 }
 
+END_SW_NS

source/sw/src/bots.h

@@ -30,6 +30,7 @@ Prepared for public release: 03/28/2005 - Charlie Wiederhold, 3D Realms
 #ifndef BOTS_H
 #define BOTS_H
 
+BEGIN_SW_NS
 
 // BOT DEFINITIONS AND STRUCTURES
 
@@ -106,4 +107,6 @@ typedef struct BOT_BRAIN
 extern NODETREE BOT_TREELIST[25][50]; // There can be up to 50 of each item
 // with a cooresponding search tree for each
 
+END_SW_NS
+
 #endif

source/sw/src/break.cpp

@@ -23,6 +23,7 @@ Original Source: 1997 - Frank Maddin and Jim Norwood
 Prepared for public release: 03/28/2005 - Charlie Wiederhold, 3D Realms
 */
 //-------------------------------------------------------------------------
+#include "ns.h"
 #include "build.h"
 
 #include "keys.h"
@@ -37,6 +38,8 @@ Prepared for public release: 03/28/2005 - Charlie Wiederhold, 3D Realms
 
 #include "break.h"
 
+BEGIN_SW_NS
+
 BREAK_INFOp GlobBreakInfo;
 
 static int SectorOfWall(short theline);
@@ -1135,3 +1138,4 @@ static void DoWallBreakSpriteMatch(short match)
         }
     }
 }
+END_SW_NS

source/sw/src/break.h

@@ -27,6 +27,8 @@ Prepared for public release: 03/28/2005 - Charlie Wiederhold, 3D Realms
 #ifndef BREAK_PUBLIC_
 #define BREAK_PUBLIC_
 
+BEGIN_SW_NS
+
 #define BF_TOUGH (BIT(0))
 #define BF_KILL  (BIT(1))
 #define BF_BURN  (BIT(2))
@@ -52,4 +54,6 @@ SWBOOL CheckBreakToughness(BREAK_INFOp break_info, short ID);
 int WallBreakPosition(short hit_wall, short *sectnum, int *x, int *y, int *z, short *ang);
 void SortBreakInfo(void);
 
+END_SW_NS
+
 #endif

source/sw/src/brooms.cpp

@@ -25,6 +25,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 Prepared for public release: 03/28/2005 - Charlie Wiederhold, 3D Realms
 */
 //-------------------------------------------------------------------------
+#include "ns.h"
 
 #include "build.h"
 #include "editor.h"
@@ -33,6 +34,7 @@ Prepared for public release: 03/28/2005 - Charlie Wiederhold, 3D Realms
 #include "names2.h"
 #include "game.h"
 
+BEGIN_SW_NS
 
 extern int qsetmode;
 
@@ -731,3 +733,4 @@ DrawOverlapRoom(int tx, int ty, int tz, short tang, int thoriz, short tsectnum)
         }
     }
 }
+END_SW_NS

source/sw/src/bunny.cpp

@@ -23,6 +23,8 @@ Original Source: 1997 - Frank Maddin and Jim Norwood
 Prepared for public release: 03/28/2005 - Charlie Wiederhold, 3D Realms
 */
 //-------------------------------------------------------------------------
+#include "ns.h"
+
 #include "build.h"
 
 #include "keys.h"
@@ -37,6 +39,8 @@ Prepared for public release: 03/28/2005 - Charlie Wiederhold, 3D Realms
 #include "weapon.h"
 #include "track.h"
 
+BEGIN_SW_NS
+
 short Bunny_Count = 0;
 ANIMATOR DoActorMoveJump;
 ANIMATOR DoBunnyMoveJump;
@@ -1628,3 +1632,4 @@ saveable_module saveable_bunny =
     saveable_bunny_data,
     SIZ(saveable_bunny_data)
 };
+END_SW_NS

source/sw/src/cache.cpp

@@ -28,6 +28,7 @@ Prepared for public release: 03/28/2005 - Charlie Wiederhold, 3D Realms
 Removed sounds that were causing "Could
 not load" error messages.
 ****************************************/
+#include "ns.h"
 
 #include "build.h"
 
@@ -42,6 +43,8 @@ not load" error messages.
 #include "sounds.h"
 #include "network.h"
 
+BEGIN_SW_NS
+
 // Run the game with the -CACHEPRINT option and redirect to a file.
 // It will save out the tile and sound number every time one caches.
 //
@@ -726,3 +729,4 @@ precache(void)
 }
 
 
+END_SW_NS

source/sw/src/cache.h

@@ -24,6 +24,8 @@ Prepared for public release: 03/28/2005 - Charlie Wiederhold, 3D Realms
 */
 //-------------------------------------------------------------------------
 
+BEGIN_SW_NS
+
 #define CACHE_NONE          0       // don't use this - this is for ken
 #define CACHE_LOCK_MAX      255
 #define CACHE_LOCK_START    200
@@ -38,3 +40,4 @@ void PreCacheRange(short start_pic, short end_pic);
 void DoTheCache(void);
 void precache(void);
 
+END_SW_NS

source/sw/src/cheats.cpp

@@ -23,6 +23,8 @@ Original Source: 1997 - Frank Maddin and Jim Norwood
 Prepared for public release: 03/28/2005 - Charlie Wiederhold, 3D Realms
 */
 //-------------------------------------------------------------------------
+#include "ns.h"
+
 #include "build.h"
 
 #include "keys.h"
@@ -36,6 +38,7 @@ Prepared for public release: 03/28/2005 - Charlie Wiederhold, 3D Realms
 #include "function.h"
 //#include "inv.h"
 
+BEGIN_SW_NS
 
 SWBOOL CheatInputMode = FALSE;
 char CheatInputString[256];
@@ -470,3 +473,4 @@ void CheatInput(void)
     }
 
 */
+END_SW_NS

source/sw/src/colormap.cpp

@@ -23,12 +23,16 @@ Original Source: 1997 - Frank Maddin and Jim Norwood
 Prepared for public release: 03/28/2005 - Charlie Wiederhold, 3D Realms
 */
 //-------------------------------------------------------------------------
+#include "ns.h"
+
 #include "build.h"
 
 #include "keys.h"
 #include "pal.h"
 #include "game.h"
 
+BEGIN_SW_NS
+
 short f_c = 3;
 static char tempbuf[256];
 unsigned char DefaultPalette[256 * 32];
@@ -465,3 +469,4 @@ void GetPaletteFromVESA(unsigned char *pal)
     }
     //    fprintf(stderr,"GetPaletteFromVESA() called\n");
 }
+END_SW_NS

source/sw/src/colormap.h

@@ -1,6 +1,8 @@
 #ifndef colormap_public_
 #define colormap_public_
 
+BEGIN_SW_NS
+
 extern unsigned char DefaultPalette[];
 
 void MapColors(short num,COLOR_MAP cm,short create);
@@ -10,4 +12,6 @@ void set_pal(unsigned char *pal);
 void GetPaletteFromVESA(unsigned char *pal);
 void InitPalette(void);
 
+END_SW_NS
+
 #endif

source/sw/src/common.cpp

@@ -1,8 +1,11 @@
+#include "ns.h"
 
 #include "build.h"
 
 #include "common_game.h"
 
+BEGIN_SW_NS
+
 static const char *defaultgrpfilename = "sw.grp";
 static const char *defaultdeffilename = "sw.def";
 
@@ -47,3 +50,4 @@ void SW_InitMultiPsky(void)
     defaultsky->lognumtiles = 1;
     defaultsky->horizfrac = 8192;
 }
+END_SW_NS

source/sw/src/common_game.h

@@ -34,9 +34,7 @@ Prepared for public release: 03/28/2005 - Charlie Wiederhold, 3D Realms
 
 #ifndef common_public_
 #define common_public_
-#ifdef __cplusplus
+BEGIN_SW_NS
-extern "C" {
-#endif
 
 //****************************************************************************
 //
@@ -143,7 +141,5 @@ void clearGrpNamePtr(void);
 
 void SW_InitMultiPsky(void);
 
-#ifdef __cplusplus
+END_SW_NS
-};
-#endif
 #endif

source/sw/src/config.cpp

@@ -23,6 +23,8 @@ Original Source: 1997 - Frank Maddin and Jim Norwood
 Prepared for public release: 03/28/2005 - Charlie Wiederhold, 3D Realms
 */
 //-------------------------------------------------------------------------
+#include "ns.h"
+
 #include "build.h"
 #include "baselayer.h"
 #include "osd.h"
@@ -49,6 +51,8 @@ Prepared for public release: 03/28/2005 - Charlie Wiederhold, 3D Realms
 # include "sdl_inc.h"
 #endif
 
+BEGIN_SW_NS
+
 extern void ReadGameSetup(int32_t scripthandle);
 extern void WriteGameSetup(int32_t scripthandle);
 
@@ -753,3 +757,4 @@ void CONFIG_WriteSetup(void)
     SCRIPT_Free(scripthandle);
 }
 
+END_SW_NS

source/sw/src/config.h

@@ -33,9 +33,7 @@ Prepared for public release: 03/28/2005 - Charlie Wiederhold, 3D Realms
 #include "keyboard.h"
 #include "control.h"
 
-#ifdef __cplusplus
+BEGIN_SW_NS
-extern "C" {
-#endif
 
 #define SETUPNAMEPARM "SETUPFILE"
 
@@ -132,7 +130,5 @@ int32_t CONFIG_FunctionNameToNum(const char *func);
 const char *CONFIG_AnalogNumToName(int32_t func);
 int32_t CONFIG_AnalogNameToNum(const char *func);
 
-#ifdef __cplusplus
+END_SW_NS
-};
-#endif
 #endif

source/sw/src/console.cpp

@@ -28,6 +28,8 @@ Prepared for public release: 03/28/2005 - Charlie Wiederhold, 3D Realms
 // Handles all argument storing and user console variable modifications.
 // Copyright (c) 1996 by Jim Norwood
 
+#include "ns.h"
+
 #include "build.h"
 
 #include "mytypes.h"
@@ -55,6 +57,8 @@ Prepared for public release: 03/28/2005 - Charlie Wiederhold, 3D Realms
 #include "text.h"
 #include "jsector.h"
 
+BEGIN_SW_NS
+
 // DEFINES ///////////////////////////////////////////////////////////////////////////////////
 #define MAX_USER_ARGS           100
 #define MAX_CONSOLE_COMMANDS    100
@@ -1422,3 +1426,4 @@ void CON_DumpSoundList(void)
 
 }
 
+END_SW_NS

source/sw/src/coolg.cpp

@@ -23,6 +23,8 @@ Original Source: 1997 - Frank Maddin and Jim Norwood
 Prepared for public release: 03/28/2005 - Charlie Wiederhold, 3D Realms
 */
 //-------------------------------------------------------------------------
+#include "ns.h"
+
 #include "build.h"
 
 #include "keys.h"
@@ -35,6 +37,8 @@ Prepared for public release: 03/28/2005 - Charlie Wiederhold, 3D Realms
 #include "weapon.h"
 #include "track.h"
 
+BEGIN_SW_NS
+
 ANIMATOR DoCoolgCircle,InitCoolgCircle;
 
 DECISION CoolgBattle[] =
@@ -994,3 +998,4 @@ saveable_module saveable_coolg =
     saveable_coolg_data,
     SIZ(saveable_coolg_data)
 };
+END_SW_NS

source/sw/src/coolie.cpp

@@ -23,6 +23,8 @@ Original Source: 1997 - Frank Maddin and Jim Norwood
 Prepared for public release: 03/28/2005 - Charlie Wiederhold, 3D Realms
 */
 //-------------------------------------------------------------------------
+#include "ns.h"
+
 #include "build.h"
 
 #include "keys.h"
@@ -36,6 +38,8 @@ Prepared for public release: 03/28/2005 - Charlie Wiederhold, 3D Realms
 #include "track.h"
 #include "weapon.h"
 
+BEGIN_SW_NS
+
 ANIMATOR InitCoolieCharge;
 
 DECISION CoolieBattle[] =
@@ -734,3 +738,4 @@ saveable_module saveable_coolie =
     saveable_coolie_data,
     SIZ(saveable_coolie_data)
 };
+END_SW_NS

source/sw/src/copysect.cpp

@@ -23,6 +23,8 @@ Original Source: 1997 - Frank Maddin and Jim Norwood
 Prepared for public release: 03/28/2005 - Charlie Wiederhold, 3D Realms
 */
 //-------------------------------------------------------------------------
+#include "ns.h"
+
 #include "build.h"
 
 #include "names2.h"
@@ -32,6 +34,8 @@ Prepared for public release: 03/28/2005 - Charlie Wiederhold, 3D Realms
 #include "sprite.h"
 #include "track.h"
 
+BEGIN_SW_NS
+
 void CopySectorWalls(short dest_sectnum, short src_sectnum)
 {
     short dest_wall_num, src_wall_num, start_wall;
@@ -236,3 +240,4 @@ void CopySectorMatch(short match)
     }
 
 }
+END_SW_NS

source/sw/src/damage.h

@@ -23,6 +23,7 @@ Original Source: 1997 - Frank Maddin and Jim Norwood
 Prepared for public release: 03/28/2005 - Charlie Wiederhold, 3D Realms
 */
 //-------------------------------------------------------------------------
+BEGIN_SW_NS
 
 #ifdef DAMAGE_TABLE
 #define DAMAGE_ENTRY(id, init_func, damage_lo, damage_hi, radius, max_ammo, min_ammo, with_weapon) \
@@ -106,3 +107,4 @@ DAMAGE_ENTRY(MAX_WEAPONS,         NULL,                10,    20,   0, -1, -1, -
 
 #undef DAMAGE_ENTRY
 #undef DAMAGE_ENTRY_WPN
+END_SW_NS

source/sw/src/demo.cpp

@@ -24,6 +24,7 @@ Prepared for public release: 03/28/2005 - Charlie Wiederhold, 3D Realms
 */
 //-------------------------------------------------------------------------
 
+#include "ns.h"
 //#define MAIN
 //#define QUIET
 #include "build.h"
@@ -43,6 +44,7 @@ Prepared for public release: 03/28/2005 - Charlie Wiederhold, 3D Realms
 #include "player.h"
 #include "menus.h"
 
+BEGIN_SW_NS
 
 DFILE DemoFileIn = DF_ERR;
 FILE *DemoFileOut;
@@ -654,3 +656,4 @@ ScenePlayBack(void)
 
 
 
+END_SW_NS

source/sw/src/demo.h

@@ -23,6 +23,7 @@ Original Source: 1997 - Frank Maddin and Jim Norwood
 Prepared for public release: 03/28/2005 - Charlie Wiederhold, 3D Realms
 */
 //-------------------------------------------------------------------------
+BEGIN_SW_NS
 
 extern FILE *DemoFile;
 extern SWBOOL DemoPlaying;
@@ -74,3 +75,4 @@ void ScenePlayBack(void);
 void DemoRecordSetup(void);
 void DemoDebugWrite(void);
 void DemoWriteBuffer(void);
+END_SW_NS

source/sw/src/digi.h

@@ -23,6 +23,7 @@ Original Source: 1997 - Frank Maddin and Jim Norwood
 Prepared for public release: 03/28/2005 - Charlie Wiederhold, 3D Realms
 */
 //-------------------------------------------------------------------------
+BEGIN_SW_NS
 
 #ifdef DIGI_TABLE
 #define DIGI_ENTRY(name, id, id_num, pri, pitch_lo, pitch_hi, voc_num, voc_dist, voc_flags) { name, NULL, 0, pitch_lo, pitch_hi, pri, voc_num, voc_dist, voc_flags, 0,0},
@@ -990,3 +991,4 @@ DIGI_ENTRY("ZC9.VOC",     DIGI_ZC9,               624,      PRI_PLAYERVOICE, 0,
 DIGI_ENTRY("Z16043.VOC",  DIGI_Z16043,            625,      PRI_PLAYERVOICE, 0,      0, 0, DIST_NORMAL, VF_NORMAL)
 
 #undef DIGI_ENTRY
+END_SW_NS

source/sw/src/draw.cpp

@@ -23,6 +23,8 @@ Original Source: 1997 - Frank Maddin and Jim Norwood
 Prepared for public release: 03/28/2005 - Charlie Wiederhold, 3D Realms
 */
 //-------------------------------------------------------------------------
+#include "ns.h"
+
 #define QUIET
 #include "build.h"
 #include "pragmas.h"
@@ -55,6 +57,8 @@ Prepared for public release: 03/28/2005 - Charlie Wiederhold, 3D Realms
 #include "sector.h"
 #include "config.h"
 
+BEGIN_SW_NS
+
 static int OverlapDraw = FALSE;
 extern SWBOOL QuitFlag, LocationInfo, ConPanel, SpriteInfo, PauseKeySet;
 extern SWBOOL Voxel;
@@ -2718,3 +2722,4 @@ ScreenSaveSetup(PLAYERp pp)
 
 
 
+END_SW_NS

source/sw/src/eel.cpp

@@ -23,6 +23,8 @@ Original Source: 1997 - Frank Maddin and Jim Norwood
 Prepared for public release: 03/28/2005 - Charlie Wiederhold, 3D Realms
 */
 //-------------------------------------------------------------------------
+#include "ns.h"
+
 #include "build.h"
 
 #include "keys.h"
@@ -34,6 +36,7 @@ Prepared for public release: 03/28/2005 - Charlie Wiederhold, 3D Realms
 #include "weapon.h"
 #include "track.h"
 
+BEGIN_SW_NS
 
 DECISION EelBattle[] =
 {
@@ -680,3 +683,4 @@ saveable_module saveable_eel =
     saveable_eel_data,
     SIZ(saveable_eel_data)
 };
+END_SW_NS

source/sw/src/function.h

@@ -34,6 +34,7 @@ Prepared for public release: 03/28/2005 - Charlie Wiederhold, 3D Realms
 
 #ifndef function_public_
 #define function_public_
+BEGIN_SW_NS
 
 #define NUMGAMEFUNCTIONS 51
 
@@ -93,4 +94,6 @@ enum
     gamefunc_Show_Menu,
     gamefunc_Show_Console,
 };
+END_SW_NS
+
 #endif

source/sw/src/game.cpp

@@ -24,6 +24,7 @@ Prepared for public release: 03/28/2005 - Charlie Wiederhold, 3D Realms
 */
 //-------------------------------------------------------------------------
 
+#include "ns.h"
 // CTW NOTE
 /*
 Known remaining issues:
@@ -94,6 +95,8 @@ Things required to make savegames work:
 
 #include "crc32.h"
 
+BEGIN_SW_NS
+
 const char* AppProperName = "VoidSW";
 const char* AppTechnicalName = "voidsw";
 
@@ -5992,3 +5995,4 @@ saveable_module saveable_build =
 };
 
 // vim:ts=4:sw=4:expandtab:
+END_SW_NS

source/sw/src/game.h

@@ -41,6 +41,8 @@ Prepared for public release: 03/28/2005 - Charlie Wiederhold, 3D Realms
 #include "sounds.h"
 #include "settings.h"
 
+BEGIN_SW_NS
+
 //#define SW_SHAREWARE 1     // This determines whether game is shareware compile or not!
 extern char isShareware, useDarts;
 #define SW_SHAREWARE (isShareware)
@@ -2384,3 +2386,5 @@ void SetSpikeActive(short SpriteNum);   // spike.c
 int COVERinsertsprite(short sectnum, short statnum);   //returns (short)spritenum;
 
 void AudioUpdate(void); // stupid
+
+END_SW_NS

source/sw/src/gamedefs.h

@@ -34,9 +34,7 @@ Prepared for public release: 03/28/2005 - Charlie Wiederhold, 3D Realms
 
 #ifndef gamedefs_public_
 #define gamedefs_public_
-#ifdef __cplusplus
+BEGIN_SW_NS
-extern "C" {
-#endif
 
 //****************************************************************************
 //
@@ -215,8 +213,6 @@ enum
 };
 
 
-#ifdef __cplusplus
+END_SW_NS
-};
-#endif
 #endif
 

source/sw/src/girlninj.cpp

@@ -23,6 +23,8 @@ Original Source: 1997 - Frank Maddin and Jim Norwood
 Prepared for public release: 03/28/2005 - Charlie Wiederhold, 3D Realms
 */
 //-------------------------------------------------------------------------
+#include "ns.h"
+
 #include "build.h"
 
 #include "keys.h"
@@ -38,6 +40,8 @@ Prepared for public release: 03/28/2005 - Charlie Wiederhold, 3D Realms
 #include "track.h"
 #include "sprite.h"
 
+BEGIN_SW_NS
+
 int DoHariKariBlood(short SpriteNum);
 //int InitActorMoveCloser(short SpriteNum);
 
@@ -930,3 +934,4 @@ saveable_module saveable_girlninj =
     saveable_girlninj_data,
     SIZ(saveable_girlninj_data)
 };
+END_SW_NS

source/sw/src/goro.cpp

@@ -23,6 +23,8 @@ Original Source: 1997 - Frank Maddin and Jim Norwood
 Prepared for public release: 03/28/2005 - Charlie Wiederhold, 3D Realms
 */
 //-------------------------------------------------------------------------
+#include "ns.h"
+
 #include "build.h"
 
 #include "keys.h"
@@ -33,6 +35,8 @@ Prepared for public release: 03/28/2005 - Charlie Wiederhold, 3D Realms
 #include "actor.h"
 #include "track.h"
 
+BEGIN_SW_NS
+
 #define GORO_PAIN_R0 GORO_STAND_R0
 #define GORO_PAIN_R1 GORO_STAND_R1
 #define GORO_PAIN_R2 GORO_STAND_R2
@@ -617,3 +621,4 @@ saveable_module saveable_goro =
     saveable_goro_data,
     SIZ(saveable_goro_data)
 };
+END_SW_NS

source/sw/src/grpscan.cpp

@@ -21,6 +21,8 @@
  */
 //-------------------------------------------------------------------------
 
+#include "ns.h"
+
 #include "build.h"
 #include "baselayer.h"
 
@@ -30,6 +32,8 @@
 
 #include "grpscan.h"
 
+BEGIN_SW_NS
+
 internalgrpfile grpfiles[numgrpfiles] =
 {
     { "Registered Version",     0x7545319Fu, 47536148 },
@@ -210,3 +214,4 @@ void FreeGroups(void)
     }
 }
 
+END_SW_NS

source/sw/src/grpscan.h

@@ -24,6 +24,8 @@
 #ifndef grpscan_h__
 #define grpscan_h__
 
+BEGIN_SW_NS
+
 // List of internally-known GRP files
 #define numgrpfiles 3
 struct internalgrpfile
@@ -46,4 +48,6 @@ extern grpfile *foundgrps;
 int ScanGroups(void);
 void FreeGroups(void);
 
+END_SW_NS
+
 #endif

source/sw/src/hornet.cpp

@@ -23,6 +23,8 @@ Original Source: 1997 - Frank Maddin and Jim Norwood
 Prepared for public release: 03/28/2005 - Charlie Wiederhold, 3D Realms
 */
 //-------------------------------------------------------------------------
+#include "ns.h"
+
 #include "build.h"
 
 #include "keys.h"
@@ -35,6 +37,8 @@ Prepared for public release: 03/28/2005 - Charlie Wiederhold, 3D Realms
 #include "track.h"
 #include "sprite.h"
 
+BEGIN_SW_NS
+
 ANIMATOR DoHornetCircle, InitHornetCircle;
 
 
@@ -673,3 +677,4 @@ saveable_module saveable_hornet =
     saveable_hornet_data,
     SIZ(saveable_hornet_data)
 };
+END_SW_NS

source/sw/src/interp.cpp

@@ -24,11 +24,15 @@ Prepared for public release: 03/28/2005 - Charlie Wiederhold, 3D Realms
 */
 //-------------------------------------------------------------------------
 
+#include "ns.h"
+
 #include "compat.h"
 #include "pragmas.h"
 
 #include "interp.h"
 
+BEGIN_SW_NS
+
 #define MAXINTERPOLATIONS 1024
 int numinterpolations = 0, startofdynamicinterpolations = 0;
 int oldipos[MAXINTERPOLATIONS];
@@ -107,3 +111,4 @@ void restoreinterpolations(void)                 // Stick at end of drawscreen
     for (i = numinterpolations - 1; i >= 0; i--)
         *curipos[i] = bakipos[i];
 }
+END_SW_NS

source/sw/src/interp.h

@@ -23,6 +23,7 @@ Original Source: 1997 - Frank Maddin and Jim Norwood
 Prepared for public release: 03/28/2005 - Charlie Wiederhold, 3D Realms
 */
 //-------------------------------------------------------------------------
+BEGIN_SW_NS
 
 #define SHORT_MAXINTERPOLATIONS 256
 extern short short_numinterpolations, short_startofdynamicinterpolations;
@@ -41,3 +42,4 @@ void stopinterpolation(int *posptr);
 void updateinterpolations(void);
 void dointerpolations(int smoothratio);
 void restoreinterpolations(void);
+END_SW_NS

source/sw/src/interpsh.cpp

@@ -24,11 +24,15 @@ Prepared for public release: 03/28/2005 - Charlie Wiederhold, 3D Realms
 */
 //-------------------------------------------------------------------------
 
+#include "ns.h"
+
 #include "compat.h"
 #include "pragmas.h"
 
 #include "interp.h"
 
+BEGIN_SW_NS
+
 #define SHORT_MAXINTERPOLATIONS 256
 short short_numinterpolations = 0, short_startofdynamicinterpolations = 0;
 short short_oldipos[SHORT_MAXINTERPOLATIONS];
@@ -107,3 +111,4 @@ void short_restoreinterpolations(void)                 // Stick at end of drawsc
     for (i = short_numinterpolations - 1; i >= 0; i--)
         *short_curipos[i] = short_bakipos[i];
 }
+END_SW_NS

source/sw/src/inv.cpp

@@ -24,6 +24,8 @@ Prepared for public release: 03/28/2005 - Charlie Wiederhold, 3D Realms
 */
 //-------------------------------------------------------------------------
 
+#include "ns.h"
+
 #undef MAIN
 #include "build.h"
 
@@ -36,6 +38,8 @@ Prepared for public release: 03/28/2005 - Charlie Wiederhold, 3D Realms
 #include "colormap.h"
 #include "player.h"
 
+BEGIN_SW_NS
+
 //#define SAVE_EXTERN
 //#include "_save.h"
 //#undef SAVE_EXTERN
@@ -1148,3 +1152,4 @@ PlayerUpdateInventoryState(PLAYERp pp)
         InventoryDisplayString(pp, x, y, 0, ds);
     }
 }
+END_SW_NS

source/sw/src/inv.h

@@ -23,6 +23,7 @@ Original Source: 1997 - Frank Maddin and Jim Norwood
 Prepared for public release: 03/28/2005 - Charlie Wiederhold, 3D Realms
 */
 //-------------------------------------------------------------------------
+BEGIN_SW_NS
 
 enum InventoryNames
 {
@@ -59,3 +60,4 @@ void UpdateMiniBar(PLAYERp pp);
 void InventoryKeys(PLAYERp pp);
 void UseInventoryRepairKit(PLAYERp pp);
 void InventoryTimer(PLAYERp pp);
+END_SW_NS

source/sw/src/jbhlp.cpp

@@ -26,6 +26,8 @@ Prepared for public release: 03/28/2005 - Charlie Wiederhold, 3D Realms
 */
 //-------------------------------------------------------------------------
 
+#include "ns.h"
+
 #include "build.h"
 #include "editor.h"
 #include "cache1d.h"
@@ -34,6 +36,7 @@ Prepared for public release: 03/28/2005 - Charlie Wiederhold, 3D Realms
 #include "names2.h"
 #include "game.h"
 
+BEGIN_SW_NS
 
 #define M_RED 12
 #define M_BLUE 9
@@ -219,3 +222,4 @@ void ContextHelp(short spritenum)
 }
 
 
+END_SW_NS

source/sw/src/jplayer.cpp

@@ -26,6 +26,7 @@ Prepared for public release: 03/28/2005 - Charlie Wiederhold, 3D Realms
 
 // JPLAYER.C
 // Copyright (c) 1996 by Jim Norwood
+#include "ns.h"
 
 #include "build.h"
 
@@ -52,6 +53,8 @@ Prepared for public release: 03/28/2005 - Charlie Wiederhold, 3D Realms
 
 #include "bots.h"
 
+BEGIN_SW_NS
+
 SWBOOL WeaponOK(PLAYERp pp);
 
 #define MAXANGVEL 80
@@ -898,3 +901,4 @@ void computergetinput(int snum, SW_PACKET *syn)
     */
 }
 
+END_SW_NS

source/sw/src/jsector.cpp

@@ -26,6 +26,7 @@ Prepared for public release: 03/28/2005 - Charlie Wiederhold, 3D Realms
 
 // JSECTOR.C
 // This is all Jim's programming having to do with sectors.
+#include "ns.h"
 
 #include "build.h"
 
@@ -45,6 +46,7 @@ Prepared for public release: 03/28/2005 - Charlie Wiederhold, 3D Realms
 #include "pal.h"
 #include "parent.h"
 
+BEGIN_SW_NS
 
 // V A R I A B L E   D E C L A R A T I O N S //////////////////////////////////////////////////////
 
@@ -1474,3 +1476,4 @@ UnlockKeyLock(short key_num, short hit_sprite)
 
     }
 }
+END_SW_NS

source/sw/src/jsector.h

@@ -29,6 +29,8 @@ Prepared for public release: 03/28/2005 - Charlie Wiederhold, 3D Realms
 
 #include "reserve.h"
 
+BEGIN_SW_NS
+
 #define MAXMIRRORDIST       3300    // At this distance, or less, the magic mirrors activate.
 #define MAXMIRRORMONSTERS   4       // Max monsters any one magic mirror can spawn
 
@@ -77,4 +79,6 @@ void JS_UnInitLockouts(void);
 void JS_ProcessEchoSpot(void);
 void JS_SpriteSetup(void);
 
+END_SW_NS
+
 #endif

source/sw/src/jweapon.cpp

@@ -23,6 +23,8 @@ Original Source: 1997 - Frank Maddin and Jim Norwood
 Prepared for public release: 03/28/2005 - Charlie Wiederhold, 3D Realms
 */
 //-------------------------------------------------------------------------
+#include "ns.h"
+
 #include "build.h"
 #include "common.h"
 
@@ -44,6 +46,8 @@ Prepared for public release: 03/28/2005 - Charlie Wiederhold, 3D Realms
 #include "sector.h"
 #include "actor.h"
 
+BEGIN_SW_NS
+
 ANIMATOR NullAnimator,DoSuicide;
 ANIMATOR DoBloodSpray;
 int SpawnFlashBombOnActor(int16_t enemy);
@@ -2614,3 +2618,4 @@ saveable_module saveable_jweapon =
     saveable_jweapon_data,
     SIZ(saveable_jweapon_data)
 };
+END_SW_NS

source/sw/src/lava.cpp

@@ -23,6 +23,8 @@ Original Source: 1997 - Frank Maddin and Jim Norwood
 Prepared for public release: 03/28/2005 - Charlie Wiederhold, 3D Realms
 */
 //-------------------------------------------------------------------------
+#include "ns.h"
+
 #include "build.h"
 
 #include "keys.h"
@@ -34,6 +36,8 @@ Prepared for public release: 03/28/2005 - Charlie Wiederhold, 3D Realms
 #include "actor.h"
 #include "track.h"
 
+BEGIN_SW_NS
+
 DECISION LavaBattle[] =
 {
     {600,   InitActorMoveCloser         },
@@ -567,3 +571,4 @@ saveable_module saveable_lava =
     saveable_lava_data,
     SIZ(saveable_lava_data)
 };
+END_SW_NS

source/sw/src/light.cpp

@@ -23,12 +23,16 @@ Original Source: 1997 - Frank Maddin and Jim Norwood
 Prepared for public release: 03/28/2005 - Charlie Wiederhold, 3D Realms
 */
 //-------------------------------------------------------------------------
+#include "ns.h"
+
 #include "build.h"
 
 #include "names2.h"
 #include "game.h"
 #include "light.h"
 
+BEGIN_SW_NS
+
 /* #define LIGHT_Match(sp)         (SP_TAG2((sp)))                      */
 /* #define LIGHT_Type(sp)          (SP_TAG3((sp)))                      */
 /* #define LIGHT_MaxTics(sp)       (SP_TAG4((sp)))                      */
@@ -424,3 +428,4 @@ void DoLighting(void)
         }
     }
 }
+END_SW_NS

source/sw/src/light.h

@@ -23,6 +23,7 @@ Original Source: 1997 - Frank Maddin and Jim Norwood
 Prepared for public release: 03/28/2005 - Charlie Wiederhold, 3D Realms
 */
 //-------------------------------------------------------------------------
+BEGIN_SW_NS
 
 
 void SectorLightShade(SPRITEp sp, short intensity);
@@ -52,3 +53,4 @@ void DoLighting(void);
 #define LIGHT_DiffuseMult(sp) (SP_TAG4((sp)))
 
 enum LightTypes {LIGHT_CONSTANT, LIGHT_FLICKER, LIGHT_FADE, LIGHT_FLICKER_ON, LIGHT_FADE_TO_ON_OFF};
+END_SW_NS

source/sw/src/lists.h

@@ -28,6 +28,8 @@ Prepared for public release: 03/28/2005 - Charlie Wiederhold, 3D Realms
 
 #define LISTS_H
 
+BEGIN_SW_NS
+
 /********************************************************************/
 
 typedef
@@ -64,6 +66,8 @@ typedef
 
 #define EMPTY(list)          (((LIST) list)->Next == (LIST) list)
 
+END_SW_NS
+
 #endif
 
 

source/sw/src/mclip.cpp

@@ -23,6 +23,8 @@ Original Source: 1997 - Frank Maddin and Jim Norwood
 Prepared for public release: 03/28/2005 - Charlie Wiederhold, 3D Realms
 */
 //-------------------------------------------------------------------------
+#include "ns.h"
+
 #include "build.h"
 #include "common.h"
 
@@ -35,6 +37,8 @@ Prepared for public release: 03/28/2005 - Charlie Wiederhold, 3D Realms
 #include "player.h"
 #include "mclip.h"
 
+BEGIN_SW_NS
+
 #if 0
 int MultiClipMove(PLAYERp pp, int z, int floor_dist)
 {
@@ -560,3 +564,4 @@ short RectClipTurn(PLAYERp pp, short new_ang, int *qx, int *qy, int *ox, int *oy
 
     return FALSE;
 }
+END_SW_NS

source/sw/src/mclip.h

@@ -23,6 +23,7 @@ Original Source: 1997 - Frank Maddin and Jim Norwood
 Prepared for public release: 03/28/2005 - Charlie Wiederhold, 3D Realms
 */
 //-------------------------------------------------------------------------
+BEGIN_SW_NS
 
 #define RECT_CLIP 1
 
@@ -33,3 +34,4 @@ int RectClipMove(PLAYERp pp, int *qx, int *qy);
 int testpointinquad(int x, int y, int *qx, int *qy);
 //short RectClipTurn(PLAYERp pp, short new_ang, int z, int floor_dist, int *qx, int *qy);
 short RectClipTurn(PLAYERp pp, short new_ang, int *qx, int *qy, int *ox, int *oy);
+END_SW_NS

source/sw/src/mdastr.cpp

@@ -23,6 +23,8 @@ Original Source: 1997 - Frank Maddin and Jim Norwood
 Prepared for public release: 03/28/2005 - Charlie Wiederhold, 3D Realms
 */
 //-------------------------------------------------------------------------
+#include "ns.h"
+
 #include "build.h"
 
 #include "mytypes.h"
@@ -31,6 +33,8 @@ Prepared for public release: 03/28/2005 - Charlie Wiederhold, 3D Realms
 //#include "panel.h"
 #include "game.h"
 
+BEGIN_SW_NS
+
 // macros this function needs
 //#define MK_FP(seg,ofs)       ((void _seg *)(seg)+(void near *)(ofs))
 //#define PokeByte(a,b,c)      (*((char far *)MK_FP((a),(b)))=(char)(c))
@@ -80,3 +84,4 @@ PokeStringMono(uint8_t Attr, uint8_t* String)
 }
 //#endif
 
+END_SW_NS

source/sw/src/menus.cpp

@@ -23,6 +23,8 @@ Original Source: 1997 - Frank Maddin and Jim Norwood
 Prepared for public release: 03/28/2005 - Charlie Wiederhold, 3D Realms
 */
 //-------------------------------------------------------------------------
+#include "ns.h"
+
 #include "build.h"
 #include "osd.h"
 
@@ -53,6 +55,8 @@ Prepared for public release: 03/28/2005 - Charlie Wiederhold, 3D Realms
 #include "colormap.h"
 #include "config.h"
 
+BEGIN_SW_NS
+
 //#define PLOCK_VERSION TRUE
 
 
@@ -5295,3 +5299,4 @@ void ResetPalette(PLAYERp pp)
 // vim:ts=4:sw=4:enc=utf-8:
 
 
+END_SW_NS

source/sw/src/menus.h

@@ -30,6 +30,8 @@ Prepared for public release: 03/28/2005 - Charlie Wiederhold, 3D Realms
 #ifndef MENUS_PUBLIC_
 #define MENUS_PUBLIC_
 
+BEGIN_SW_NS
+
 #define MENU_SHADE_DEFAULT 0
 #define MENU_SHADE_INACTIVE 20
 
@@ -340,4 +342,6 @@ typedef struct
     int x,y;
 } VMODE;
 
+END_SW_NS
+
 #endif

source/sw/src/mfile.h

@@ -27,6 +27,8 @@ Prepared for public release: 03/28/2005 - Charlie Wiederhold, 3D Realms
 #include "compat.h"
 #include "cache1d.h"
 
+BEGIN_SW_NS
+
 typedef BFILE* MFILE_WRITE;
 typedef int32_t MFILE_READ;
 #define MREAD(ptr, size, num,handle) kdfread((ptr),(size),(num),(handle))
@@ -37,3 +39,4 @@ typedef int32_t MFILE_READ;
 #define MCLOSE_READ(handle) kclose(handle)
 #define MOPEN_WRITE_ERR 0
 #define MOPEN_READ_ERR -1
+END_SW_NS

source/sw/src/miscactr.cpp

@@ -23,6 +23,8 @@ Original Source: 1997 - Frank Maddin and Jim Norwood
 Prepared for public release: 03/28/2005 - Charlie Wiederhold, 3D Realms
 */
 //-------------------------------------------------------------------------
+#include "ns.h"
+
 #include "build.h"
 
 #include "keys.h"
@@ -37,6 +39,7 @@ Prepared for public release: 03/28/2005 - Charlie Wiederhold, 3D Realms
 #include "sector.h"
 #include "sprite.h"
 
+BEGIN_SW_NS
 
 ANIMATOR NullToiletGirl;
 
@@ -2211,3 +2214,4 @@ saveable_module saveable_miscactr =
     saveable_miscactr_data,
     SIZ(saveable_miscactr_data)
 };
+END_SW_NS

source/sw/src/morph.cpp

@@ -23,6 +23,8 @@ Original Source: 1997 - Frank Maddin and Jim Norwood
 Prepared for public release: 03/28/2005 - Charlie Wiederhold, 3D Realms
 */
 //-------------------------------------------------------------------------
+#include "ns.h"
+
 #include "build.h"
 
 #include "names2.h"
@@ -34,6 +36,8 @@ Prepared for public release: 03/28/2005 - Charlie Wiederhold, 3D Realms
 #include "player.h"
 #include "game.h"
 
+BEGIN_SW_NS
+
 void ScaleSectorObject(SECTOR_OBJECTp);
 
 short
@@ -586,3 +590,4 @@ saveable_module saveable_morph =
     // data
     NULL,0
 };
+END_SW_NS

source/sw/src/mytypes.h

@@ -30,6 +30,8 @@ Prepared for public release: 03/28/2005 - Charlie Wiederhold, 3D Realms
 
 #include "compat.h"
 
+BEGIN_SW_NS
+
 #define OFF     0
 #define ON     (!OFF)
 
@@ -153,5 +155,7 @@ typedef unsigned char SWBOOL;
 
 #define BETWEEN(x,low,high) (((x) >= (low)) && ((x) <= (high)))
 
+END_SW_NS
+
 #endif
 

source/sw/src/names2.h

@@ -29,6 +29,8 @@ Prepared for public release: 03/28/2005 - Charlie Wiederhold, 3D Realms
 
 #include "names.h"
 
+BEGIN_SW_NS
+
 // Rotation info
 
 //      4
@@ -1246,4 +1248,6 @@ enum STAT_ENUMS
 #define SCROLL 516
 #define SCROLL_FIRE 524
 
+END_SW_NS
+
 #endif

source/sw/src/network.cpp

@@ -23,6 +23,8 @@ Original Source: 1997 - Frank Maddin and Jim Norwood
 Prepared for public release: 03/28/2005 - Charlie Wiederhold, 3D Realms
 */
 //-------------------------------------------------------------------------
+#include "ns.h"
+
 #include "build.h"
 #include "baselayer.h"
 #include "mmulti.h"
@@ -39,6 +41,7 @@ Prepared for public release: 03/28/2005 - Charlie Wiederhold, 3D Realms
 #include "text.h"
 #include "menus.h"
 
+BEGIN_SW_NS
 
 /*
 SYNC BUG NOTES:
@@ -1624,3 +1627,4 @@ getpackets(void)
         }
     }
 }
+END_SW_NS

source/sw/src/network.h

@@ -23,6 +23,7 @@ Original Source: 1997 - Frank Maddin and Jim Norwood
 Prepared for public release: 03/28/2005 - Charlie Wiederhold, 3D Realms
 */
 //-------------------------------------------------------------------------
+BEGIN_SW_NS
 
 #define PACKET_TYPE_MASTER_TO_SLAVE                 0
 #define PACKET_TYPE_SLAVE_TO_MASTER                 1
@@ -204,3 +205,4 @@ void SW_SendMessage(short pnum,const char *text);
 void PauseGame(void);
 void ResumeGame(void);
 
+END_SW_NS

source/sw/src/ninja.cpp

@@ -23,6 +23,8 @@ Original Source: 1997 - Frank Maddin and Jim Norwood
 Prepared for public release: 03/28/2005 - Charlie Wiederhold, 3D Realms
 */
 //-------------------------------------------------------------------------
+#include "ns.h"
+
 #include "build.h"
 
 #include "keys.h"
@@ -40,6 +42,8 @@ Prepared for public release: 03/28/2005 - Charlie Wiederhold, 3D Realms
 #include "ninja.h"
 #include "sprite.h"
 
+BEGIN_SW_NS
+
 /*
 
  !AIC - Decision tables used in mostly ai.c DoActorActionDecide().
@@ -2604,3 +2608,4 @@ saveable_module saveable_ninja =
     SIZ(saveable_ninja_data)
 };
 
+END_SW_NS

source/sw/src/ninja.h

@@ -27,6 +27,8 @@ Prepared for public release: 03/28/2005 - Charlie Wiederhold, 3D Realms
 #ifndef NINJA_H
 #define NINJA_H
 
+BEGIN_SW_NS
+
 #define NINJA_NORMAL_SPEED          60
 #define NINJA_RUN_AWAY_SPEED        130
 #define NINJA_FIND_PLAYER_SPEED     100
@@ -39,4 +41,6 @@ void PlayerPanelSetup(void);
 void PlayerDeathReset(PLAYERp pp);
 void SpawnPlayerUnderSprite(PLAYERp pp);
 
+END_SW_NS
+
 #endif

source/sw/src/panel.cpp

@@ -24,6 +24,8 @@ Prepared for public release: 03/28/2005 - Charlie Wiederhold, 3D Realms
 */
 //-------------------------------------------------------------------------
 
+#include "ns.h"
+
 #undef MAIN
 #include "build.h"
 #include "common.h"
@@ -43,6 +45,8 @@ Prepared for public release: 03/28/2005 - Charlie Wiederhold, 3D Realms
 #include "weapon.h"
 #include "fx_man.h"
 
+BEGIN_SW_NS
+
 //#define UK_VERSION TRUE
 
 #define PANF_UZI_XFLIP (BIT(21))
@@ -8073,3 +8077,4 @@ saveable_module saveable_panel =
     SIZ(saveable_panel_data)
 };
 
+END_SW_NS

source/sw/src/panel.h

@@ -31,6 +31,8 @@ Prepared for public release: 03/28/2005 - Charlie Wiederhold, 3D Realms
 #include "mytypes.h"
 #include "game.h"
 
+BEGIN_SW_NS
+
 #define FRAG_BAR 2920
 
 #define PRI_FRONT_MAX   250
@@ -198,4 +200,6 @@ void InitChops(PLAYERp pp);
 void ChopsSetRetract(PLAYERp pp);
 void PlayerUpdateTimeLimit(PLAYERp pp);
 
+END_SW_NS
+
 #endif

source/sw/src/parent.h

@@ -27,6 +27,8 @@ Prepared for public release: 03/28/2005 - Charlie Wiederhold, 3D Realms
 #ifndef PARENT_PUBLIC_
 #define PARENT_PUBLIC_
 
+BEGIN_SW_NS
+
 #define INVISTILE 6145
 
 typedef struct TILE_INFO_TYPE
@@ -65,4 +67,7 @@ extern OrgTileList orgsectorceilinglist;       // The list containing orginal se
 // ceiling pics
 extern OrgTileList orgsectorfloorlist;         // The list containing orginal sector
 // floor pics
+
+END_SW_NS
+
 #endif

source/sw/src/parse.h

@@ -25,6 +25,7 @@ Prepared for public release: 03/28/2005 - Charlie Wiederhold, 3D Realms
 //-------------------------------------------------------------------------
 
 // scriplib.h
+BEGIN_SW_NS
 
 #define MAXTOKEN    255
 
@@ -47,3 +48,4 @@ void ExtractFileBase(char *path, char *dest);
 
 int ParseNum(char *str);
 
+END_SW_NS

source/sw/src/player.cpp

@@ -23,6 +23,8 @@ Original Source: 1997 - Frank Maddin and Jim Norwood
 Prepared for public release: 03/28/2005 - Charlie Wiederhold, 3D Realms
 */
 //-------------------------------------------------------------------------
+#include "ns.h"
+
 #include "build.h"
 #include "common.h"
 
@@ -64,6 +66,7 @@ Prepared for public release: 03/28/2005 - Charlie Wiederhold, 3D Realms
 #include "track.h"
 #include "interp.h"
 
+BEGIN_SW_NS
 
 #define SO_DRIVE_SOUND 2
 #define SO_IDLE_SOUND 1
@@ -8537,3 +8540,4 @@ saveable_module saveable_player =
     saveable_player_data,
     SIZ(saveable_player_data)
 };
+END_SW_NS

source/sw/src/player.h

@@ -119,6 +119,8 @@ Prepared for public release: 03/28/2005 - Charlie Wiederhold, 3D Realms
 #define PLAYER_NINJA_XREPEAT (47)
 #define PLAYER_NINJA_YREPEAT (33)
 
+BEGIN_SW_NS
+
 int SetVisHigh(void);
 int SetVisNorm(void);
 void DoWeapon(void);
@@ -142,4 +144,6 @@ void PlaySOsound(short sectnum,short sound_num);
 void DoSpawnTeleporterEffectPlace(SPRITEp sp);
 void FindMainSector(SECTOR_OBJECTp sop);
 
+END_SW_NS
+
 #endif

source/sw/src/predict.cpp

@@ -24,6 +24,7 @@ Prepared for public release: 03/28/2005 - Charlie Wiederhold, 3D Realms
 */
 //-------------------------------------------------------------------------
 
+#include "ns.h"
 //#define MAIN
 #define QUIET
 #include "build.h"
@@ -41,6 +42,8 @@ Prepared for public release: 03/28/2005 - Charlie Wiederhold, 3D Realms
 #include "network.h"
 //#include "symutil.h"
 
+BEGIN_SW_NS
+
 SWBOOL PredictionOn = TRUE;
 SWBOOL Prediction = FALSE;
 PLAYER PredictPlayer;
@@ -226,3 +229,4 @@ CorrectPrediction(int actualfifoplc)
     }
 }
 
+END_SW_NS

source/sw/src/quake.cpp

@@ -23,6 +23,8 @@ Original Source: 1997 - Frank Maddin and Jim Norwood
 Prepared for public release: 03/28/2005 - Charlie Wiederhold, 3D Realms
 */
 //-------------------------------------------------------------------------
+#include "ns.h"
+
 #include "build.h"
 #include "common.h"
 
@@ -34,6 +36,8 @@ Prepared for public release: 03/28/2005 - Charlie Wiederhold, 3D Realms
 #include "quake.h"
 #include "sprite.h"
 
+BEGIN_SW_NS
+
 #define QUAKE_Match(sp) (SP_TAG2(sp))
 #define QUAKE_Zamt(sp) (SP_TAG3(sp))
 #define QUAKE_Radius(sp) (SP_TAG4(sp))
@@ -367,3 +371,4 @@ saveable_module saveable_quake =
     NULL,0
 };
 
+END_SW_NS

source/sw/src/quake.h

@@ -23,6 +23,7 @@ Original Source: 1997 - Frank Maddin and Jim Norwood
 Prepared for public release: 03/28/2005 - Charlie Wiederhold, 3D Realms
 */
 //-------------------------------------------------------------------------
+BEGIN_SW_NS
 
 void DoQuakeMatch(short match);
 void ProcessQuakeOn(void);
@@ -37,3 +38,4 @@ int SetNuclearQuake(int16_t Weapon);
 int SetSumoQuake(int16_t SpriteNum);
 int SetSumoFartQuake(int16_t SpriteNum);
 
+END_SW_NS

source/sw/src/ripper.cpp

@@ -23,6 +23,8 @@ Original Source: 1997 - Frank Maddin and Jim Norwood
 Prepared for public release: 03/28/2005 - Charlie Wiederhold, 3D Realms
 */
 //-------------------------------------------------------------------------
+#include "ns.h"
+
 #include "build.h"
 
 #include "keys.h"
@@ -36,6 +38,8 @@ Prepared for public release: 03/28/2005 - Charlie Wiederhold, 3D Realms
 #include "sprite.h"
 #include "track.h"
 
+BEGIN_SW_NS
+
 ANIMATOR InitRipperHang;
 ANIMATOR DoActorMoveJump;
 ANIMATOR DoRipperMoveJump;
@@ -1421,3 +1425,4 @@ saveable_module saveable_ripper =
     saveable_ripper_data,
     SIZ(saveable_ripper_data)
 };
+END_SW_NS

source/sw/src/ripper2.cpp

@@ -23,6 +23,7 @@ Original Source: 1997 - Frank Maddin and Jim Norwood
 Prepared for public release: 03/28/2005 - Charlie Wiederhold, 3D Realms
 */
 //-------------------------------------------------------------------------
+#include "ns.h"
 #include "build.h"
 
 #include "keys.h"
@@ -37,6 +38,8 @@ Prepared for public release: 03/28/2005 - Charlie Wiederhold, 3D Realms
 #include "track.h"
 #include "fx_man.h"
 
+BEGIN_SW_NS
+
 ANIMATOR InitRipper2Hang;
 ANIMATOR DoActorMoveJump;
 ANIMATOR DoRipper2MoveJump;
@@ -1464,3 +1467,4 @@ saveable_module saveable_ripper2 =
     saveable_ripper2_data,
     SIZ(saveable_ripper2_data)
 };
+END_SW_NS

source/sw/src/rooms.cpp

@@ -23,6 +23,7 @@ Original Source: 1997 - Frank Maddin and Jim Norwood
 Prepared for public release: 03/28/2005 - Charlie Wiederhold, 3D Realms
 */
 //-------------------------------------------------------------------------
+#include "ns.h"
 #include "build.h"
 
 #include "names2.h"
@@ -30,6 +31,8 @@ Prepared for public release: 03/28/2005 - Charlie Wiederhold, 3D Realms
 #include "game.h"
 #include "warp.h"
 
+BEGIN_SW_NS
+
 void _ErrMsg(const char *strFile, unsigned uLine, const char *format, ...);
 void FAF_DrawRooms(int posx, int posy, int posz, short ang, int horiz, short cursectnum);
 
@@ -1148,3 +1151,4 @@ DrawOverlapRoom(int tx, int ty, int tz, short tang, int thoriz, short tsectnum)
     }
 }
 
+END_SW_NS

source/sw/src/rotator.cpp

@@ -23,6 +23,7 @@ Original Source: 1997 - Frank Maddin and Jim Norwood
 Prepared for public release: 03/28/2005 - Charlie Wiederhold, 3D Realms
 */
 //-------------------------------------------------------------------------
+#include "ns.h"
 #include "build.h"
 
 #include "names2.h"
@@ -35,6 +36,8 @@ Prepared for public release: 03/28/2005 - Charlie Wiederhold, 3D Realms
 #include "interp.h"
 #include "sprite.h"
 
+BEGIN_SW_NS
+
 short DoRotatorMatch(PLAYERp pp, short match, SWBOOL);
 SWBOOL TestRotatorMatchActive(short match);
 void InterpSectorSprites(short sectnum, SWBOOL state);
@@ -466,3 +469,4 @@ saveable_module saveable_rotator =
     NULL,0
 };
 
+END_SW_NS

source/sw/src/rts.cpp

@@ -24,6 +24,7 @@ Prepared for public release: 03/28/2005 - Charlie Wiederhold, 3D Realms
 */
 //-------------------------------------------------------------------------
 
+#include "ns.h"
 // rts.c
 
 #include "build.h"
@@ -35,6 +36,8 @@ Prepared for public release: 03/28/2005 - Charlie Wiederhold, 3D Realms
 #include "rts.h"
 #include "cache.h"
 
+BEGIN_SW_NS
+
 char ValidPtr(void *ptr);
 void *AllocMem(int size);
 void *CallocMem(int size, int num);
@@ -339,3 +342,4 @@ void *RTS_GetSound(int32_t lump)
     return (void *)lumpcache[lump];
 }
 #endif
+END_SW_NS

source/sw/src/rts.h

@@ -58,6 +58,8 @@ Prepared for public release: 03/21/2003 - Charlie Wiederhold, 3D Realms
 #ifndef rts_public__
 #define rts_public__
 
+BEGIN_SW_NS
+
 /*
 ====================
 =
@@ -108,4 +110,7 @@ char *RTS_GetSoundName(int32_t i);
 ====================
 */
 void *RTS_GetSound(int32_t lump);
+
+END_SW_NS
+
 #endif

source/sw/src/save.cpp

@@ -24,6 +24,8 @@ Prepared for public release: 03/28/2005 - Charlie Wiederhold, 3D Realms
 */
 //-------------------------------------------------------------------------
 
+#include "ns.h"
+
 #define MAIN
 #define QUIET
 #include "build.h"
@@ -57,6 +59,7 @@ Prepared for public release: 03/28/2005 - Charlie Wiederhold, 3D Realms
 #include "saveable.h"
 
 //void TimerFunc(task * Task);
+BEGIN_SW_NS
 
 /*
 //////////////////////////////////////////////////////////////////////////////
@@ -1325,3 +1328,4 @@ ScreenLoad(MFILE_READ fin)
     renderRestoreTarget();
 }
 
+END_SW_NS

source/sw/src/saveable.cpp

@@ -21,9 +21,13 @@
  */
 //-------------------------------------------------------------------------
 
+#include "ns.h"
+
 #include "compat.h"
 #include "saveable.h"
 
+BEGIN_SW_NS
+
 #define maxModules 35
 
 static saveable_module *saveablemodules[maxModules];
@@ -165,3 +169,4 @@ int Saveable_RestoreDataSym(saveddatasym *sym, void **ptr)
 
     return 0;
 }
+END_SW_NS

source/sw/src/saveable.h

@@ -24,6 +24,8 @@
 #ifndef SAVEABLE_H
 #define SAVEABLE_H
 
+BEGIN_SW_NS
+
 typedef void *saveable_code;
 
 typedef struct
@@ -67,4 +69,6 @@ int Saveable_FindDataSym(void *ptr, saveddatasym *sym);
 int Saveable_RestoreCodeSym(savedcodesym *sym, void **ptr);
 int Saveable_RestoreDataSym(saveddatasym *sym, void **ptr);
 
+END_SW_NS
+
 #endif

source/sw/src/scrip2.cpp

@@ -24,6 +24,7 @@ Prepared for public release: 03/28/2005 - Charlie Wiederhold, 3D Realms
 */
 //-------------------------------------------------------------------------
 
+#include "ns.h"
 // scriplib.c
 #include "build.h"
 #include "cache1d.h"
@@ -38,6 +39,8 @@ Prepared for public release: 03/28/2005 - Charlie Wiederhold, 3D Realms
 #include "jsector.h"
 #include "parent.h"
 
+BEGIN_SW_NS
+
 #define PATHSEPERATOR   '\\'
 
 //#define COMPUTE_TOTALS    1
@@ -993,3 +996,4 @@ void LoadCustomInfoFromScript(const char *filename)
     scriptfile_clearsymbols();
 }
 
+END_SW_NS

source/sw/src/sector.cpp

@@ -23,6 +23,7 @@ Original Source: 1997 - Frank Maddin and Jim Norwood
 Prepared for public release: 03/28/2005 - Charlie Wiederhold, 3D Realms
 */
 //-------------------------------------------------------------------------
+#include "ns.h"
 #include "build.h"
 #include "common.h"
 
@@ -46,6 +47,8 @@ Prepared for public release: 03/28/2005 - Charlie Wiederhold, 3D Realms
 #include "light.h"
 #include "text.h"
 
+BEGIN_SW_NS
+
 #define LAVASIZ 128
 #define LAVALOGSIZ 7
 #define LAVAMAXDROPS 32
@@ -3584,3 +3587,4 @@ saveable_module saveable_sector =
 };
 
 
+END_SW_NS

source/sw/src/sector.h

@@ -27,6 +27,7 @@ Prepared for public release: 03/28/2005 - Charlie Wiederhold, 3D Realms
 
 #define SECTOR_H
 
+BEGIN_SW_NS
 
 void SectorSetup(void);
 DOOR_AUTO_CLOSEp SetDoorAutoClose(short SectorNum, short Type);
@@ -77,4 +78,6 @@ void WeaponExplodeSectorInRange(short weapon);
 void initlava(void);
 void movelava(char *dapic);
 
+END_SW_NS
+
 #endif

source/sw/src/serp.cpp

@@ -23,6 +23,7 @@ Original Source: 1997 - Frank Maddin and Jim Norwood
 Prepared for public release: 03/28/2005 - Charlie Wiederhold, 3D Realms
 */
 //-------------------------------------------------------------------------
+#include "ns.h"
 #include "build.h"
 
 #include "keys.h"
@@ -34,6 +35,8 @@ Prepared for public release: 03/28/2005 - Charlie Wiederhold, 3D Realms
 #include "track.h"
 #include "sector.h"
 
+BEGIN_SW_NS
+
 extern uint8_t RedBookSong[40];
 extern short BossSpriteNum[3];
 
@@ -884,3 +887,4 @@ saveable_module saveable_serp =
     SIZ(saveable_serp_data)
 };
 
+END_SW_NS

source/sw/src/settings.h

@@ -27,6 +27,7 @@ Prepared for public release: 03/28/2005 - Charlie Wiederhold, 3D Realms
 #include "gamedefs.h"
 // Only ad to the end. These currently have to be in this order because of the
 // way they are initilized.
+BEGIN_SW_NS
 
 typedef struct
 {
@@ -74,3 +75,4 @@ typedef struct
 extern const GAME_SET gs_defaults;
 extern GAME_SET gs;
 
+END_SW_NS

source/sw/src/setup.cpp

@@ -23,6 +23,7 @@ Original Source: 1997 - Frank Maddin and Jim Norwood
 Prepared for public release: 03/28/2005 - Charlie Wiederhold, 3D Realms
 */
 //-------------------------------------------------------------------------
+#include "ns.h"
 #include "build.h"
 
 #include "keys.h"
@@ -42,6 +43,8 @@ Prepared for public release: 03/28/2005 - Charlie Wiederhold, 3D Realms
 
 #include "rts.h"
 
+BEGIN_SW_NS
+
 /*
 ===================
 
@@ -401,3 +404,4 @@ void main()
     ShutDown();
 }
 #endif
+END_SW_NS

source/sw/src/skel.cpp

@@ -23,6 +23,7 @@ Original Source: 1997 - Frank Maddin and Jim Norwood
 Prepared for public release: 03/28/2005 - Charlie Wiederhold, 3D Realms
 */
 //-------------------------------------------------------------------------
+#include "ns.h"
 #include "build.h"
 
 #include "keys.h"
@@ -33,6 +34,8 @@ Prepared for public release: 03/28/2005 - Charlie Wiederhold, 3D Realms
 #include "actor.h"
 #include "track.h"
 
+BEGIN_SW_NS
+
 DECISION SkelBattle[] =
 {
     {600,   InitActorMoveCloser         },
@@ -691,3 +694,4 @@ saveable_module saveable_skel =
     saveable_skel_data,
     SIZ(saveable_skel_data)
 };
+END_SW_NS

source/sw/src/skull.cpp

@@ -23,6 +23,7 @@ Original Source: 1997 - Frank Maddin and Jim Norwood
 Prepared for public release: 03/28/2005 - Charlie Wiederhold, 3D Realms
 */
 //-------------------------------------------------------------------------
+#include "ns.h"
 #include "build.h"
 
 #include "keys.h"
@@ -33,6 +34,8 @@ Prepared for public release: 03/28/2005 - Charlie Wiederhold, 3D Realms
 #include "weapon.h"
 #include "actor.h"
 
+BEGIN_SW_NS
+
 int InitSpriteGrenade(short SpriteNum);
 int InitSpriteChemBomb(short SpriteNum);
 int InitFlashBomb(short SpriteNum);
@@ -972,3 +975,4 @@ saveable_module saveable_skull =
     saveable_skull_data,
     SIZ(saveable_skull_data)
 };
+END_SW_NS