diff --git a/source/common/rts.cpp b/source/common/rts.cpp index 5ce19f36d..7c464cb58 100644 --- a/source/common/rts.cpp +++ b/source/common/rts.cpp @@ -40,6 +40,7 @@ #include "m_swap.h" #include "s_soundinternal.h" +const char* G_DefaultRtsFile(void); struct WadInfo { @@ -67,6 +68,7 @@ struct LumpInfoInternal static FString RTSName; static TArray RTSFile; static TArray LumpInfo; +static bool checked; void RTS_Init(const char *filename) @@ -80,6 +82,11 @@ void RTS_Init(const char *filename) bool RTS_IsInitialized() { if (LumpInfo.Size() > 0) return true; + if (RTSName.IsEmpty() && !checked) + { + RTSName = G_DefaultRtsFile(); + checked = true; + } if (RTSName.IsEmpty()) return false; auto fr = fileSystem.OpenFileReader(RTSName, 0); RTSName = ""; // don't try ever again. diff --git a/source/common/searchpaths.cpp b/source/common/searchpaths.cpp index 7afb7ed0b..dd10c4e8d 100644 --- a/source/common/searchpaths.cpp +++ b/source/common/searchpaths.cpp @@ -969,6 +969,35 @@ const char* G_ConFile(void) return userConfig.DefaultCon.IsNotEmpty() ? userConfig.DefaultCon.GetChars() : G_DefaultConFile(); } +const char* G_DefaultRtsFile(void) +{ + if (g_gameType & GAMEFLAG_DUKE) + return "DUKE.RTS"; + else if (g_gameType & GAMEFLAG_WW2GI) + return "WW2GI.RTS"; + else if (g_gameType & GAMEFLAG_NAPALM) + { + if (!fileSystem.FileExists("NAPALM.RTS") && fileSystem.FileExists("NAM.RTS")) + return "NAM.RTS"; + else + return "NAPALM.RTS"; + } + else if (g_gameType & GAMEFLAG_NAM) + { + if (!fileSystem.FileExists("NAM.RTS") && fileSystem.FileExists("NAPALM.RTS")) + return "NAPALM.RTS"; + else + return "NAM.RTS"; + } + else if (g_gameType & GAMEFLAG_RRALL) + return "REDNECK.RTS"; + else if (g_gameType & GAMEFLAG_SW) + return "SW.RTS"; + + return ""; +} + + #if 0 // Should this be added to the game data collector? diff --git a/source/duke3d/src/common.cpp b/source/duke3d/src/common.cpp index ff6be1845..18f3cf829 100644 --- a/source/duke3d/src/common.cpp +++ b/source/duke3d/src/common.cpp @@ -15,7 +15,7 @@ #include "common.h" -#include "common_game.h" +#include "dukerr/common_game.h" BEGIN_DUKE_NS diff --git a/source/duke3d/src/common_game.h b/source/duke3d/src/common_game.h deleted file mode 100644 index 335e1a315..000000000 --- a/source/duke3d/src/common_game.h +++ /dev/null @@ -1,71 +0,0 @@ -// -// Definitions of common game-only data structures/functions -// (and declarations of data appearing in both) -// for EDuke32 and Mapster32 -// - -#ifndef EDUKE32_COMMON_GAME_H_ -#define EDUKE32_COMMON_GAME_H_ - -#include "gamecontrol.h" - -BEGIN_DUKE_NS - - -#define DUKE (g_gameType & GAMEFLAG_DUKE) -#define NAM (g_gameType & GAMEFLAG_NAM) -#define NAPALM (g_gameType & GAMEFLAG_NAPALM) -#define WW2GI (g_gameType & GAMEFLAG_WW2GI) -#define NAM_WW2GI (g_gameType & (GAMEFLAG_NAM|GAMEFLAG_WW2GI)) -#define SHAREWARE (g_gameType & GAMEFLAG_SHAREWARE) -#define DUKEBETA ((g_gameType & GAMEFLAG_DUKEBETA) == GAMEFLAG_DUKEBETA) -#define FURY (g_gameType & GAMEFLAG_FURY) - -enum Games_t { - GAME_DUKE = 0, - GAME_NAM, - GAME_NAPALM, - GAME_WW2GI, - GAMECOUNT -}; - -typedef enum basepal_ { - BASEPAL = 0, - WATERPAL, - SLIMEPAL, - DREALMSPAL, - TITLEPAL, - ENDINGPAL, // 5 - ANIMPAL, - BASEPALCOUNT -} basepal_t; - -#include "v_text.h" - -extern int loaddefinitions_game(const char *fn, int32_t preload); - -////////// - -extern void G_InitMultiPsky(int CLOUDYOCEAN__DYN, int MOONSKY1__DYN, int BIGORBIT1__DYN, int LA__DYN); -extern void G_SetupGlobalPsky(void); - -////////// - -extern void G_LoadLookups(void); - -////////// - -static inline void Duke_ApplySpritePropertiesToTSprite(tspriteptr_t tspr, uspriteptr_t spr) -{ - EDUKE32_STATIC_ASSERT(CSTAT_SPRITE_RESERVED1 >> 9 == TSPR_FLAGS_DRAW_LAST); - EDUKE32_STATIC_ASSERT(CSTAT_SPRITE_RESERVED4 >> 11 == TSPR_FLAGS_NO_SHADOW); - EDUKE32_STATIC_ASSERT(CSTAT_SPRITE_RESERVED5 >> 11 == TSPR_FLAGS_INVISIBLE_WITH_SHADOW); - - auto const cstat = spr->cstat; - tspr->clipdist |= ((cstat & CSTAT_SPRITE_RESERVED1) >> 9) | ((cstat & (CSTAT_SPRITE_RESERVED4 | CSTAT_SPRITE_RESERVED5)) >> 11); -} - -void Duke_CommonCleanup(void); - -END_DUKE_NS -#endif diff --git a/source/duke3d/src/duke3d.h b/source/duke3d/src/duke3d.h index b293dc9d0..c668fb82c 100644 --- a/source/duke3d/src/duke3d.h +++ b/source/duke3d/src/duke3d.h @@ -107,7 +107,7 @@ EDUKE32_STATIC_ASSERT(7 <= MAXTILES-MAXUSERTILES); //#define DEBUG_VALGRIND_NO_SMC #include "actors.h" -#include "common_game.h" +#include "dukerr/common_game.h" #include "config.h" #include "gamecontrol.h" #include "game.h" @@ -116,11 +116,11 @@ EDUKE32_STATIC_ASSERT(7 <= MAXTILES-MAXUSERTILES); #include "gamevars.h" #include "global.h" #include "inv.h" -#include "macros.h" +#include "dukerr/macros.h" #include "dukerr/namesdyn.h" #include "network.h" #include "player.h" -#include "quotes.h" +#include "dukerr/quotes.h" #include "rts.h" #include "sector.h" #include "sounds.h" diff --git a/source/duke3d/src/game.cpp b/source/duke3d/src/game.cpp index 0da3d91ff..5d49e82f8 100644 --- a/source/duke3d/src/game.cpp +++ b/source/duke3d/src/game.cpp @@ -66,6 +66,13 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. BEGIN_DUKE_NS +extern void G_InitMultiPsky(int CLOUDYOCEAN__DYN, int MOONSKY1__DYN, int BIGORBIT1__DYN, int LA__DYN); +extern void G_LoadLookups(void); + +////////// + + + int32_t g_quitDeadline = 0; int32_t g_cameraDistance = 0, g_cameraClock = 0; @@ -78,10 +85,6 @@ int32_t vote_map = -1, vote_episode = -1; int32_t g_Debug = 0; -#ifndef EDUKE32_STANDALONE -static const char *defaultrtsfilename[GAMECOUNT] = { "DUKE.RTS", "NAM.RTS", "NAPALM.RTS", "WW2GI.RTS" }; -#endif - int32_t g_Shareware = 0; int32_t tempwallptr; @@ -96,32 +99,6 @@ int32_t g_levelTextTime = 0; extern char forcegl; #endif -const char *G_DefaultRtsFile(void) -{ -#ifndef EDUKE32_STANDALONE - if (DUKE) - return defaultrtsfilename[GAME_DUKE]; - else if (WW2GI) - return defaultrtsfilename[GAME_WW2GI]; - else if (NAPALM) - { - if (!fileSystem.FileExists(defaultrtsfilename[GAME_NAPALM]) && fileSystem.FileExists(defaultrtsfilename[GAME_NAM])) - return defaultrtsfilename[GAME_NAM]; // NAM/NAPALM Sharing - else - return defaultrtsfilename[GAME_NAPALM]; - } - else if (NAM) - { - if (!fileSystem.FileExists(defaultrtsfilename[GAME_NAM]) && fileSystem.FileExists(defaultrtsfilename[GAME_NAPALM])) - return defaultrtsfilename[GAME_NAPALM]; // NAM/NAPALM Sharing - else - return defaultrtsfilename[GAME_NAM]; - } -#endif - - return ""; -} - enum gametokens { T_INCLUDE = 0, @@ -219,6 +196,16 @@ int32_t A_CheckInventorySprite(spritetype *s) } +static inline void Duke_ApplySpritePropertiesToTSprite(tspriteptr_t tspr, uspriteptr_t spr) +{ + EDUKE32_STATIC_ASSERT(CSTAT_SPRITE_RESERVED1 >> 9 == TSPR_FLAGS_DRAW_LAST); + EDUKE32_STATIC_ASSERT(CSTAT_SPRITE_RESERVED4 >> 11 == TSPR_FLAGS_NO_SHADOW); + EDUKE32_STATIC_ASSERT(CSTAT_SPRITE_RESERVED5 >> 11 == TSPR_FLAGS_INVISIBLE_WITH_SHADOW); + + auto const cstat = spr->cstat; + tspr->clipdist |= ((cstat & CSTAT_SPRITE_RESERVED1) >> 9) | ((cstat & (CSTAT_SPRITE_RESERVED4 | CSTAT_SPRITE_RESERVED5)) >> 11); +} + void G_GameExit(const char *msg) { diff --git a/source/duke3d/src/game.h b/source/duke3d/src/game.h index 70b68cc7b..7bac2fd86 100644 --- a/source/duke3d/src/game.h +++ b/source/duke3d/src/game.h @@ -205,8 +205,6 @@ static inline int Menu_HaveUserMap(void) return (boardfilename[0] != 0 && m_level_number == 7 && ud.m_volume_number == 0); } -extern const char *G_DefaultRtsFile(void); - #ifdef LEGACY_ROR extern char ror_protectedsectors[MAXSECTORS]; #endif diff --git a/source/duke3d/src/gamedef.cpp b/source/duke3d/src/gamedef.cpp index 2a9dc5338..9e94d5ac7 100644 --- a/source/duke3d/src/gamedef.cpp +++ b/source/duke3d/src/gamedef.cpp @@ -27,7 +27,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. #include "cheats.h" #include "common.h" -#include "common_game.h" +#include "dukerr/common_game.h" #include "m_crc32.h" #include "duke3d.h" #include "gameexec.h" diff --git a/source/duke3d/src/gamedef.h b/source/duke3d/src/gamedef.h index 5e5819b04..bed0074eb 100644 --- a/source/duke3d/src/gamedef.h +++ b/source/duke3d/src/gamedef.h @@ -30,7 +30,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. #include "cheats.h" #include "common.h" // tokenlist #include "player.h" // projectile_t -#include "events_defs.h" +#include "dukerr/events_defs.h" BEGIN_DUKE_NS diff --git a/source/duke3d/src/gameexec.h b/source/duke3d/src/gameexec.h index 8f90c7007..838d699c8 100644 --- a/source/duke3d/src/gameexec.h +++ b/source/duke3d/src/gameexec.h @@ -24,7 +24,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. #define gameexec_h_ #include "build.h" -#include "events_defs.h" +#include "dukerr/events_defs.h" #include "gamedef.h" // vmstate_t #include "sector.h" // mapstate_t #include "zstring.h" diff --git a/source/duke3d/src/global.h b/source/duke3d/src/global.h index b4b1261fa..bcf962901 100644 --- a/source/duke3d/src/global.h +++ b/source/duke3d/src/global.h @@ -27,7 +27,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. #include "compat.h" #include "duke3d.h" #include "mmulti.h" -#include "quotes.h" +#include "dukerr/quotes.h" #include "sector.h" #include "sounds.h" #include "menu/menu.h" diff --git a/source/duke3d/src/keys.h b/source/duke3d/src/keys.h deleted file mode 100644 index 90fede7cd..000000000 --- a/source/duke3d/src/keys.h +++ /dev/null @@ -1,152 +0,0 @@ -//------------------------------------------------------------------------- -/* -Copyright (C) 2010 EDuke32 developers and contributors - -This file is part of EDuke32. - -EDuke32 is free software; you can redistribute it and/or -modify it under the terms of the GNU General Public License version 2 -as published by the Free Software Foundation. - -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. -*/ -//------------------------------------------------------------------------- - -#ifndef KEYS_H - -#define KEYS_H - -BEGIN_DUKE_NS - - #define NUM_CODES 128 - - #define ESC 0x1B - #define ENTER 0x0D - - #define KEYSC_ESC 0x01 - #define KEYSC_1 0x02 - #define KEYSC_2 0x03 - #define KEYSC_3 0x04 - #define KEYSC_4 0x05 - #define KEYSC_5 0x06 - #define KEYSC_6 0x07 - #define KEYSC_7 0x08 - #define KEYSC_8 0x09 - #define KEYSC_9 0x0a - #define KEYSC_0 0x0b - #define KEYSC_DASH 0x0c - #define KEYSC_EQUAL 0x0d - - #define KEYSC_BS 0x0e - #define KEYSC_TAB 0x0f - #define KEYSC_Q 0x10 - #define KEYSC_W 0x11 - #define KEYSC_E 0x12 - #define KEYSC_R 0x13 - #define KEYSC_T 0x14 - #define KEYSC_Y 0x15 - #define KEYSC_U 0x16 - #define KEYSC_I 0x17 - #define KEYSC_O 0x18 - #define KEYSC_P 0x19 - #define KEYSC_LBRACK 0x1a - #define KEYSC_RBRACK 0x1b - #define KEYSC_ENTER 0x1c - - #define KEYSC_LCTRL 0x1d - #define KEYSC_A 0x1e - #define KEYSC_S 0x1f - #define KEYSC_D 0x20 - #define KEYSC_F 0x21 - #define KEYSC_G 0x22 - #define KEYSC_H 0x23 - #define KEYSC_J 0x24 - #define KEYSC_K 0x25 - #define KEYSC_L 0x26 - #define KEYSC_SEMI 0x27 - #define KEYSC_QUOTE 0x28 - #define KEYSC_BQUOTE 0x29 - #define KEYSC_TILDE 0x29 - - #define KEYSC_LSHIFT 0x2a - #define KEYSC_BSLASH 0x2b - #define KEYSC_Z 0x2c - #define KEYSC_X 0x2d - #define KEYSC_C 0x2e - #define KEYSC_V 0x2f - #define KEYSC_B 0x30 - #define KEYSC_N 0x31 - #define KEYSC_M 0x32 - #define KEYSC_COMMA 0x33 - #define KEYSC_PERIOD 0x34 - #define KEYSC_SLASH 0x35 - #define KEYSC_RSHIFT 0x36 - #define KEYSC_gSTAR 0x37 - - #define KEYSC_LALT 0x38 - #define KEYSC_SPACE 0x39 - #define KEYSC_CAPS 0x3a - - #define KEYSC_F1 0x3b - #define KEYSC_F2 0x3c - #define KEYSC_F3 0x3d - #define KEYSC_F4 0x3e - #define KEYSC_F5 0x3f - #define KEYSC_F6 0x40 - #define KEYSC_F7 0x41 - #define KEYSC_F8 0x42 - #define KEYSC_F9 0x43 - #define KEYSC_F10 0x44 - - #define KEYSC_gNUM 0x45 - #define KEYSC_SCROLL 0x46 - - #define KEYSC_gHOME 0x47 - #define KEYSC_gUP 0x48 - #define KEYSC_gPGUP 0x49 - #define KEYSC_gMINUS 0x4a - #define KEYSC_gLEFT 0x4b - #define KEYSC_gKP5 0x4c - #define KEYSC_gRIGHT 0x4d - #define KEYSC_gPLUS 0x4e - #define KEYSC_gEND 0x4f - #define KEYSC_gDOWN 0x50 - #define KEYSC_gPGDN 0x51 - #define KEYSC_gINS 0x52 - #define KEYSC_gDEL 0x53 - - #define KEYSC_F11 0x57 - #define KEYSC_F12 0x58 - - #define KEYSC_gENTER 0x9C - #define KEYSC_RCTRL 0x9D - #define KEYSC_gSLASH 0xB5 - #define KEYSC_RALT 0xB8 - #define KEYSC_PRTSCN 0xB7 - #define KEYSC_PAUSE 0xC5 - #define KEYSC_HOME 0xC7 - #define KEYSC_UP 0xC8 - #define KEYSC_PGUP 0xC9 - #define KEYSC_LEFT 0xCB - #define KEYSC_RIGHT 0xCD - #define KEYSC_END 0xCF - #define KEYSC_DOWN 0xD0 - #define KEYSC_PGDN 0xD1 - #define KEYSC_INSERT 0xD2 - #define KEYSC_DELETE 0xD3 - - #define asc_Esc 27 - #define asc_Enter 13 - #define asc_Space 32 - -END_DUKE_NS - -#endif diff --git a/source/duke3d/src/macros.h b/source/duke3d/src/macros.h deleted file mode 100644 index 05084c269..000000000 --- a/source/duke3d/src/macros.h +++ /dev/null @@ -1,197 +0,0 @@ -//------------------------------------------------------------------------- -/* -Copyright (C) 2010 EDuke32 developers and contributors - -This file is part of EDuke32. - -EDuke32 is free software; you can redistribute it and/or -modify it under the terms of the GNU General Public License version 2 -as published by the Free Software Foundation. - -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. -*/ -//------------------------------------------------------------------------- - -#ifndef EDUKE32_MACROS_H_ -#define EDUKE32_MACROS_H_ - -#include "mmulti.h" - -BEGIN_DUKE_NS - - -// Macros, some from SW source - -#define BGSTRETCH (hud_bgstretch ? 1024 : 0) - -#ifndef EDUKE32_STANDALONE -#define RANDOMSCRAP(s, i) A_InsertSprite(s->sectnum,s->x+(krand()&255)-128,s->y+(krand()&255)-128,s->z-ZOFFSET3-(krand()&8191),\ - SCRAP6+(krand()&15),-8,48,48,krand()&2047,(krand()&63)+64,-512-(krand()&2047),i,5) -#endif - -#define GTFLAGS(x) (g_gametypeFlags[ud.coop] & x) - -#define TRAVERSE_SPRITE_SECT(l, o, n) (o) = (l); ((o) != -1) && ((n) = nextspritesect[o]); (o) = (n) -#define TRAVERSE_SPRITE_STAT(l, o, n) (o) = (l); ((o) != -1) && ((n) = nextspritestat[o]); (o) = (n) -#define TRAVERSE_CONNECT(i) i = 0; i != -1; i = connectpoint2[i] - -#define TEST(flags,mask) ((flags) & (mask)) -#define SET(flags,mask) ((flags) |= (mask)) -#define RESET(flags,mask) ((flags) &= ~(mask)) -#define FLIP(flags,mask) ((flags) ^= (mask)) - -// mask definitions - -#define BIT(shift) (1u<<(shift)) - -#define TEST_SYNC_KEY(bits, sync_num) (!!TEST((bits), BIT(sync_num))) - -#ifndef EDUKE32_STANDALONE -#define AFLAMABLE(X) (X==BOX||X==TREE1||X==TREE2||X==TIRE||X==CONE) -#else -#define AFLAMABLE(X) (0) -#endif -#define rnd(X) ((krand()>>8)>=(255-(X))) - -// -// NETWORK - REDEFINABLE SHARED (SYNC) KEYS BIT POSITIONS -// - -#define SK_JUMP 0 -#define SK_CROUCH 1 -#define SK_FIRE 2 -#define SK_AIM_UP 3 -#define SK_AIM_DOWN 4 -#define SK_RUN 5 -#define SK_LOOK_LEFT 6 -#define SK_LOOK_RIGHT 7 -// weapons take up 4 bits... -#define SK_WEAPON_BITS 8 -#define SK_WEAPON_BITS1 9 -#define SK_WEAPON_BITS2 10 -#define SK_WEAPON_BITS3 11 -#define SK_STEROIDS 12 -#define SK_LOOK_UP 13 -#define SK_LOOK_DOWN 14 -#define SK_NIGHTVISION 15 -#define SK_MEDKIT 16 -#define SK_MULTIFLAG 17 -#define SK_CENTER_VIEW 18 -#define SK_HOLSTER 19 -#define SK_INV_LEFT 20 -#define SK_PAUSE 21 -#define SK_QUICK_KICK 22 -#define SK_AIMMODE 23 -#define SK_HOLODUKE 24 -#define SK_JETPACK 25 -#define SK_GAMEQUIT 26 -#define SK_INV_RIGHT 27 -#define SK_TURNAROUND 28 -#define SK_OPEN 29 -#define SK_INVENTORY 30 -#define SK_ESCAPE 31 - -// rotatesprite flags -#define ROTATE_SPRITE_TRANSLUCENT (BIT(0)) -#define ROTATE_SPRITE_VIEW_CLIP (BIT(1)) // clip to view -#define ROTATE_SPRITE_YFLIP (BIT(2)) -#define ROTATE_SPRITE_IGNORE_START_MOST (BIT(3)) // don't clip to startumost -#define ROTATE_SPRITE_SCREEN_CLIP (BIT(1)|BIT(3)) // use window -#define ROTATE_SPRITE_CORNER (BIT(4)) // place sprite from upper left corner -#define ROTATE_SPRITE_TRANS_FLIP (BIT(5)) -#define ROTATE_SPRITE_NON_MASK (BIT(6)) // non masked sprites -#define ROTATE_SPRITE_ALL_PAGES (BIT(7)) // copies to all pages - -#define RS_SCALE BIT(16) - -// system defines for status bits -#define CEILING_STAT_PLAX BIT(0) -#define CEILING_STAT_SLOPE BIT(1) -#define CEILING_STAT_SWAPXY BIT(2) -#define CEILING_STAT_SMOOSH BIT(3) -#define CEILING_STAT_XFLIP BIT(4) -#define CEILING_STAT_YFLIP BIT(5) -#define CEILING_STAT_RELATIVE BIT(6) -#define CEILING_STAT_TYPE_MASK (BIT(7)|BIT(8)) -#define CEILING_STAT_MASKED BIT(7) -#define CEILING_STAT_TRANS BIT(8) -#define CEILING_STAT_TRANS_FLIP (BIT(7)|BIT(8)) -#define CEILING_STAT_FAF_BLOCK_HITSCAN BIT(15) - -#define FLOOR_STAT_PLAX BIT(0) -#define FLOOR_STAT_SLOPE BIT(1) -#define FLOOR_STAT_SWAPXY BIT(2) -#define FLOOR_STAT_SMOOSH BIT(3) -#define FLOOR_STAT_XFLIP BIT(4) -#define FLOOR_STAT_YFLIP BIT(5) -#define FLOOR_STAT_RELATIVE BIT(6) -#define FLOOR_STAT_TYPE_MASK (BIT(7)|BIT(8)) -#define FLOOR_STAT_MASKED BIT(7) -#define FLOOR_STAT_TRANS BIT(8) -#define FLOOR_STAT_TRANS_FLIP (BIT(7)|BIT(8)) -#define FLOOR_STAT_FAF_BLOCK_HITSCAN BIT(15) - - -//cstat, bit 0: 1 = Blocking sprite (use with clipmove, getzrange) "B" -// bit 1: 1 = 50/50 transluscence, 0 = normal "T" -// bit 2: 1 = x-flipped, 0 = normal "F" -// bit 3: 1 = y-flipped, 0 = normal "F" -// bits 5-4: 00 = FACE sprite (default) "R" -// 01 = WALL sprite (like masked walls) -// 10 = FLOOR sprite (parallel to ceilings&floors) -// 11 = SPIN sprite (face sprite that can spin 2draw style - not done yet) -// bit 6: 1 = 1-sided sprite, 0 = normal "1" -// bit 7: 1 = Real centered centering, 0 = foot center "C" -// bit 8: 1 = Blocking sprite (use with hitscan) "H" -// bit 9: reserved -// bit 10: reserved -// bit 11: 1 = determine shade based only on its own shade member (see CON's spritenoshade command), i.e. -// don't take over shade from parallaxed ceiling/nonparallaxed floor -// (NOTE: implemented on the game side) -// bit 12: reserved -// bit 13: reserved -// bit 14: reserved -// bit 15: 1 = Invisible sprite, 0 = not invisible -#define CSTAT_SPRITE_NOSHADE BIT(11) -#define CSTAT_SPRITE_BREAKABLE (CSTAT_SPRITE_BLOCK_HITSCAN) - -#define SP(i) sprite[i].yvel -#define SX(i) sprite[i].x -#define SY(i) sprite[i].y -#define SZ(i) sprite[i].z -#define SS(i) sprite[i].shade -#define PN(i) sprite[i].picnum -#define SA(i) sprite[i].ang -//#define SV sprite[i].xvel -//#define ZV sprite[i].zvel -//#define RX sprite[i].xrepeat -//#define RY sprite[i].yrepeat -#define OW(i) sprite[i].owner -#define CS(i) sprite[i].cstat -#define SH(i) sprite[i].extra -//#define CX sprite[i].xoffset -//#define CY sprite[i].yoffset -//#define CD sprite[i].clipdist -//#define PL sprite[i].pal -#define SLT(i) sprite[i].lotag -#define SHT(i) sprite[i].hitag -#define SECT(i) sprite[i].sectnum - -#define T1(i) actor[i].t_data[0] -#define T2(i) actor[i].t_data[1] -#define T3(i) actor[i].t_data[2] -#define T4(i) actor[i].t_data[3] -#define T5(i) actor[i].t_data[4] -#define T6(i) actor[i].t_data[5] - -END_DUKE_NS - -#endif diff --git a/source/duke3d/src/premap.cpp b/source/duke3d/src/premap.cpp index 4b09873e6..8cd104293 100644 --- a/source/duke3d/src/premap.cpp +++ b/source/duke3d/src/premap.cpp @@ -37,6 +37,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. BEGIN_DUKE_NS +extern void G_SetupGlobalPsky(void); + static uint8_t precachehightile[2][(MAXTILES+7)>>3]; static int32_t g_precacheCount; diff --git a/source/duke3d/src/sector.h b/source/duke3d/src/sector.h index 5f274cbf7..d80f4e70d 100644 --- a/source/duke3d/src/sector.h +++ b/source/duke3d/src/sector.h @@ -25,7 +25,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. #include "actors.h" // actor_t #include "gamevars.h" -#include "macros.h" +#include "dukerr/macros.h" #include "dukerr/namesdyn.h" // for G_GetForcefieldPicnum() #include "player.h" // playerspawn_t diff --git a/source/rr/src/common_game.h b/source/dukerr/common_game.h similarity index 64% rename from source/rr/src/common_game.h rename to source/dukerr/common_game.h index 9919ba050..205bed9f4 100644 --- a/source/rr/src/common_game.h +++ b/source/dukerr/common_game.h @@ -9,7 +9,7 @@ #include "gamecontrol.h" -BEGIN_RR_NS +BEGIN_DUKERR_NS #define DUKE (g_gameType & GAMEFLAG_DUKE) @@ -21,18 +21,8 @@ BEGIN_RR_NS #define NAM_WW2GI (g_gameType & (GAMEFLAG_NAM|GAMEFLAG_WW2GI)) #define SHAREWARE (g_gameType & GAMEFLAG_SHAREWARE) #define DEER (g_gameType & GAMEFLAG_DEER) -//#define DUKEBETA ((g_gameType & GAMEFLAG_DUKEBETA) == GAMEFLAG_DUKEBETA) -//#define IONMAIDEN (g_gameType & GAMEFLAG_IONMAIDEN) - -enum Games_t { - GAME_DUKE = 0, - GAME_RR, - GAME_RRRA, - GAME_NAM, - GAME_NAPALM, - //GAME_WW2GI, - GAMECOUNT -}; +#define DUKEBETA ((g_gameType & GAMEFLAG_DUKEBETA) == GAMEFLAG_DUKEBETA) +#define FURY (g_gameType & GAMEFLAG_FURY) typedef enum basepal_ { BASEPAL = 0, @@ -49,17 +39,6 @@ typedef enum basepal_ { #include "v_text.h" -extern int loaddefinitions_game(const char *fn, int32_t preload); - -////////// - -extern void G_InitMultiPsky(int CLOUDYOCEAN__DYN, int MOONSKY1__DYN, int BIGORBIT1__DYN, int LA__DYN); -extern void G_SetupGlobalPsky(void); - -////////// - -extern void G_LoadLookups(void); - ////////// END_RR_NS diff --git a/source/duke3d/src/events_defs.h b/source/dukerr/events_defs.h similarity index 97% rename from source/duke3d/src/events_defs.h rename to source/dukerr/events_defs.h index 2ab9b2749..463f1de1e 100644 --- a/source/duke3d/src/events_defs.h +++ b/source/dukerr/events_defs.h @@ -2,7 +2,7 @@ #ifndef EDUKE32_EVENTS_DEFS_H_ #define EDUKE32_EVENTS_DEFS_H_ -BEGIN_DUKE_NS +BEGIN_DUKERR_NS // the order of these can't be changed or else compatibility with EDuke 2.0 mods will break // KEEPINSYNC with EventNames[] and lunatic/con_lang.lua @@ -46,6 +46,7 @@ enum GameEvent_t { EVENT_USEMEDKIT, EVENT_USEJETPACK, EVENT_TURNAROUND, + // The following are EDuke32 only. EVENT_DISPLAYWEAPON, EVENT_FIREWEAPON, // 40 EVENT_SELECTWEAPON, @@ -167,9 +168,10 @@ enum GameEvent_t { #ifdef LUNATIC EVENT_ANIMATEALLSPRITES, #endif - MAXEVENTS + MAXEVENTS, + MAXEVENTS_RR = EVENT_DISPLAYWEAPON }; -END_DUKE_NS +END_DUKERR_NS #endif diff --git a/source/rr/src/macros.h b/source/dukerr/macros.h similarity index 99% rename from source/rr/src/macros.h rename to source/dukerr/macros.h index 0a60ae583..45f1f4756 100644 --- a/source/rr/src/macros.h +++ b/source/dukerr/macros.h @@ -25,7 +25,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. #include "mmulti.h" -BEGIN_RR_NS +BEGIN_DUKERR_NS // Macros, some from SW source @@ -207,6 +207,6 @@ static FORCE_INLINE int32_t krand2(void) #define T5(i) actor[i].t_data[4] #define T6(i) actor[i].t_data[5] -END_RR_NS +END_DUKERR_NS #endif diff --git a/source/duke3d/src/quotes.h b/source/dukerr/quotes.h similarity index 100% rename from source/duke3d/src/quotes.h rename to source/dukerr/quotes.h diff --git a/source/dukerr/soundsdyn.cpp b/source/dukerr/soundsdyn.cpp index 562b9d496..ee3dcfe5c 100644 --- a/source/dukerr/soundsdyn.cpp +++ b/source/dukerr/soundsdyn.cpp @@ -369,11 +369,11 @@ void G_InitDynamicSounds(void) Bmemset(DynamicSoundMap, 0, sizeof(DynamicSoundMap)); - for (auto & i : g_dynSoundList) + for (int i = 0; g_dynSoundList[i].staticval >= 0; i++) #ifdef DYNSOUNDREMAP_ENABLE - DynamicSoundMap[*(i.dynvalptr)] = i.staticval; + DynamicSoundMap[*(g_dynSoundList[i].dynvalptr)] = g_dynSoundList[i].staticval; #else - DynamicSoundMap[i.staticval] = i.staticval; + DynamicSoundMap[g_dynSoundList[i].staticval] = g_dynSoundList[i].staticval; #endif } diff --git a/source/rr/src/common.cpp b/source/rr/src/common.cpp index 4ad9d1f6c..721fa0723 100644 --- a/source/rr/src/common.cpp +++ b/source/rr/src/common.cpp @@ -14,7 +14,7 @@ #include "common.h" -#include "common_game.h" +#include "dukerr/common_game.h" BEGIN_RR_NS diff --git a/source/rr/src/duke3d.h b/source/rr/src/duke3d.h index 9ab09f448..3d70e27d5 100644 --- a/source/rr/src/duke3d.h +++ b/source/rr/src/duke3d.h @@ -109,21 +109,20 @@ EDUKE32_STATIC_ASSERT(7 <= MAXTILES-MAXUSERTILES); END_RR_NS #include "actors.h" -#include "common_game.h" +#include "dukerr/common_game.h" #include "config.h" #include "gamecontrol.h" #include "game.h" #include "gamedef.h" -#include "gamedefs.h" #include "gameexec.h" #include "gamevars.h" #include "global.h" #include "inv.h" -#include "macros.h" +#include "dukerr/macros.h" #include "dukerr/namesdyn.h" #include "net.h" #include "player.h" -#include "quotes.h" +#include "dukerr/quotes.h" #include "rts.h" #include "text.h" #include "sector.h" diff --git a/source/rr/src/events_defs.h b/source/rr/src/events_defs.h deleted file mode 100644 index 377a4c231..000000000 --- a/source/rr/src/events_defs.h +++ /dev/null @@ -1,51 +0,0 @@ - -#ifndef EDUKE32_EVENTS_DEFS_H_ -#define EDUKE32_EVENTS_DEFS_H_ - -// the order of these can't be changed or else compatibility with EDuke 2.0 mods will break -// KEEPINSYNC with EventNames[] and lunatic/con_lang.lua -enum GameEvent_t { - EVENT_INIT, // 0 - EVENT_ENTERLEVEL, - EVENT_RESETWEAPONS, - EVENT_RESETINVENTORY, - EVENT_HOLSTER, - EVENT_LOOKLEFT, // 5 - EVENT_LOOKRIGHT, - EVENT_SOARUP, - EVENT_SOARDOWN, - EVENT_CROUCH, - EVENT_JUMP, // 10 - EVENT_RETURNTOCENTER, - EVENT_LOOKUP, - EVENT_LOOKDOWN, - EVENT_AIMUP, - EVENT_FIRE, // 15 - EVENT_CHANGEWEAPON, - EVENT_GETSHOTRANGE, - EVENT_GETAUTOAIMANGLE, - EVENT_GETLOADTILE, - EVENT_CHEATGETSTEROIDS, // 20 - EVENT_CHEATGETHEAT, - EVENT_CHEATGETBOOT, - EVENT_CHEATGETSHIELD, - EVENT_CHEATGETSCUBA, - EVENT_CHEATGETHOLODUKE, // 25 - EVENT_CHEATGETJETPACK, - EVENT_CHEATGETFIRSTAID, - EVENT_QUICKKICK, - EVENT_INVENTORY, - EVENT_USENIGHTVISION, // 30 - EVENT_USESTEROIDS, - EVENT_INVENTORYLEFT, - EVENT_INVENTORYRIGHT, - EVENT_HOLODUKEON, - EVENT_HOLODUKEOFF, // 35 - EVENT_USEMEDKIT, - EVENT_USEJETPACK, - EVENT_TURNAROUND, - MAXEVENTS, - EVENT_AIMDOWN = EVENT_AIMUP, -}; - -#endif diff --git a/source/rr/src/game.cpp b/source/rr/src/game.cpp index 6e1f37afb..8d508a7e2 100644 --- a/source/rr/src/game.cpp +++ b/source/rr/src/game.cpp @@ -63,6 +63,9 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. BEGIN_RR_NS +extern void G_InitMultiPsky(int CLOUDYOCEAN__DYN, int MOONSKY1__DYN, int BIGORBIT1__DYN, int LA__DYN); +extern void G_LoadLookups(void); + int32_t g_quitDeadline = 0; @@ -76,8 +79,6 @@ int32_t vote_map = -1, vote_episode = -1; int32_t g_Debug = 0; -const char *defaultrtsfilename[GAMECOUNT] = { "DUKE.RTS", "REDNECK.RTS", "REDNECK.RTS", "NAM.RTS", "NAPALM.RTS" }; - int32_t g_Shareware = 0; int32_t tempwallptr; @@ -94,30 +95,6 @@ int32_t g_levelTextTime = 0; extern char forcegl; #endif -const char *G_DefaultRtsFile(void) -{ - if (DUKE) - return defaultrtsfilename[GAME_DUKE]; - else if (NAPALM) - { - if (!fileSystem.FileExists(defaultrtsfilename[GAME_NAPALM]) && fileSystem.FileExists(defaultrtsfilename[GAME_NAM])) - return defaultrtsfilename[GAME_NAM]; // NAM/NAPALM Sharing - else - return defaultrtsfilename[GAME_NAPALM]; - } - else if (NAM) - { - if (!fileSystem.FileExists(defaultrtsfilename[GAME_NAM]) && fileSystem.FileExists(defaultrtsfilename[GAME_NAPALM])) - return defaultrtsfilename[GAME_NAPALM]; // NAM/NAPALM Sharing - else - return defaultrtsfilename[GAME_NAM]; - } - else if (RR) - return defaultrtsfilename[GAME_RR]; - - return defaultrtsfilename[0]; -} - enum gametokens { T_INCLUDE = 0, diff --git a/source/rr/src/game.h b/source/rr/src/game.h index bf4a51a21..10ddddfe1 100644 --- a/source/rr/src/game.h +++ b/source/rr/src/game.h @@ -27,7 +27,6 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. #endif #include "fix16.h" -#include "gamedefs.h" #include "gamedef.h" #include "net.h" #include "mmulti.h" @@ -200,9 +199,6 @@ static inline int Menu_HaveUserMap(void) return (boardfilename[0] != 0 && m_level_number == 7 && ud.m_volume_number == 0); } -extern const char *defaultrtsfilename[GAMECOUNT]; -extern const char *G_DefaultRtsFile(void); - #ifdef LEGACY_ROR extern char ror_protectedsectors[MAXSECTORS]; #endif diff --git a/source/rr/src/gamedef.cpp b/source/rr/src/gamedef.cpp index ef49f7cae..01bae6554 100644 --- a/source/rr/src/gamedef.cpp +++ b/source/rr/src/gamedef.cpp @@ -28,7 +28,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. #include "gameexec.h" #include "savegame.h" #include "common.h" -#include "common_game.h" +#include "dukerr/common_game.h" #include "cheats.h" #include "m_argv.h" @@ -63,7 +63,7 @@ static int32_t g_numBraces = 0; static int32_t C_ParseCommand(int32_t loop); static int32_t C_SetScriptSize(int32_t size); -static intptr_t apScriptGameEventEnd[MAXEVENTS]; +static intptr_t apScriptGameEventEnd[MAXEVENTS_RR]; static intptr_t g_parsingActorPtr; static intptr_t g_scriptEventOffset; static char *textptr; @@ -1729,7 +1729,7 @@ static int32_t C_ParseCommand(int32_t loop) g_currentEvent = j; //Bsprintf(g_szBuf,"Adding Event for %d at %lX",j, g_parsingEventPtr); //AddLog(g_szBuf); - if (EDUKE32_PREDICT_FALSE((unsigned)j > MAXEVENTS-1)) + if (EDUKE32_PREDICT_FALSE((unsigned)j > MAXEVENTS_RR-1)) { initprintf("%s:%d: error: invalid event ID.\n",g_scriptFileName,g_lineNumber); g_errorCnt++; diff --git a/source/rr/src/gamedef.h b/source/rr/src/gamedef.h index 7a93438f8..1fe52368c 100644 --- a/source/rr/src/gamedef.h +++ b/source/rr/src/gamedef.h @@ -28,6 +28,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. #include "cheats.h" #include "common.h" // tokenlist #include "player.h" // projectile_t +#include "dukerr/events_defs.h" BEGIN_RR_NS @@ -80,8 +81,7 @@ extern int32_t g_weaponVarID; // var ID of "WEAPON" extern int32_t g_worksLikeVarID; // var ID of "WORKSLIKE" extern int32_t g_zRangeVarID; // var ID of "ZRANGE" -#include "events_defs.h" -extern intptr_t apScriptEvents[MAXEVENTS]; +extern intptr_t apScriptEvents[MAXEVENTS_RR]; extern char g_scriptFileName[BMAX_PATH]; diff --git a/source/rr/src/gamedefs.h b/source/rr/src/gamedefs.h deleted file mode 100644 index e69de29bb..000000000 diff --git a/source/rr/src/gameexec.cpp b/source/rr/src/gameexec.cpp index 64068e736..380a21516 100644 --- a/source/rr/src/gameexec.cpp +++ b/source/rr/src/gameexec.cpp @@ -130,7 +130,7 @@ static void VM_DeleteSprite(int const spriteNum, int const playerNum) A_DeleteSprite(spriteNum); } -intptr_t apScriptEvents[MAXEVENTS]; +intptr_t apScriptEvents[MAXEVENTS_RR]; static uspritetype dummy_sprite; static actor_t dummy_actor; diff --git a/source/rr/src/global.h b/source/rr/src/global.h index 305b29e32..9fdb2ae21 100644 --- a/source/rr/src/global.h +++ b/source/rr/src/global.h @@ -27,7 +27,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. #include "compat.h" #include "duke3d.h" #include "mmulti.h" -#include "quotes.h" +#include "dukerr/quotes.h" #include "sector.h" #include "sounds.h" diff --git a/source/rr/src/keys.h b/source/rr/src/keys.h deleted file mode 100644 index 06f06fbf6..000000000 --- a/source/rr/src/keys.h +++ /dev/null @@ -1,153 +0,0 @@ -//------------------------------------------------------------------------- -/* -Copyright (C) 2010 EDuke32 developers and contributors - -This file is part of EDuke32. - -EDuke32 is free software; you can redistribute it and/or -modify it under the terms of the GNU General Public License version 2 -as published by the Free Software Foundation. - -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. -*/ -//------------------------------------------------------------------------- - -#ifndef KEYS_H - -BEGIN_RR_NS - - -#define KEYS_H - - #define NUM_CODES 128 - - #define ESC 0x1B - #define ENTER 0x0D - - #define KEYSC_ESC 0x01 - #define KEYSC_1 0x02 - #define KEYSC_2 0x03 - #define KEYSC_3 0x04 - #define KEYSC_4 0x05 - #define KEYSC_5 0x06 - #define KEYSC_6 0x07 - #define KEYSC_7 0x08 - #define KEYSC_8 0x09 - #define KEYSC_9 0x0a - #define KEYSC_0 0x0b - #define KEYSC_DASH 0x0c - #define KEYSC_EQUAL 0x0d - - #define KEYSC_BS 0x0e - #define KEYSC_TAB 0x0f - #define KEYSC_Q 0x10 - #define KEYSC_W 0x11 - #define KEYSC_E 0x12 - #define KEYSC_R 0x13 - #define KEYSC_T 0x14 - #define KEYSC_Y 0x15 - #define KEYSC_U 0x16 - #define KEYSC_I 0x17 - #define KEYSC_O 0x18 - #define KEYSC_P 0x19 - #define KEYSC_LBRACK 0x1a - #define KEYSC_RBRACK 0x1b - #define KEYSC_ENTER 0x1c - - #define KEYSC_LCTRL 0x1d - #define KEYSC_A 0x1e - #define KEYSC_S 0x1f - #define KEYSC_D 0x20 - #define KEYSC_F 0x21 - #define KEYSC_G 0x22 - #define KEYSC_H 0x23 - #define KEYSC_J 0x24 - #define KEYSC_K 0x25 - #define KEYSC_L 0x26 - #define KEYSC_SEMI 0x27 - #define KEYSC_QUOTE 0x28 - #define KEYSC_BQUOTE 0x29 - #define KEYSC_TILDE 0x29 - - #define KEYSC_LSHIFT 0x2a - #define KEYSC_BSLASH 0x2b - #define KEYSC_Z 0x2c - #define KEYSC_X 0x2d - #define KEYSC_C 0x2e - #define KEYSC_V 0x2f - #define KEYSC_B 0x30 - #define KEYSC_N 0x31 - #define KEYSC_M 0x32 - #define KEYSC_COMMA 0x33 - #define KEYSC_PERIOD 0x34 - #define KEYSC_SLASH 0x35 - #define KEYSC_RSHIFT 0x36 - #define KEYSC_gSTAR 0x37 - - #define KEYSC_LALT 0x38 - #define KEYSC_SPACE 0x39 - #define KEYSC_CAPS 0x3a - - #define KEYSC_F1 0x3b - #define KEYSC_F2 0x3c - #define KEYSC_F3 0x3d - #define KEYSC_F4 0x3e - #define KEYSC_F5 0x3f - #define KEYSC_F6 0x40 - #define KEYSC_F7 0x41 - #define KEYSC_F8 0x42 - #define KEYSC_F9 0x43 - #define KEYSC_F10 0x44 - - #define KEYSC_gNUM 0x45 - #define KEYSC_SCROLL 0x46 - - #define KEYSC_gHOME 0x47 - #define KEYSC_gUP 0x48 - #define KEYSC_gPGUP 0x49 - #define KEYSC_gMINUS 0x4a - #define KEYSC_gLEFT 0x4b - #define KEYSC_gKP5 0x4c - #define KEYSC_gRIGHT 0x4d - #define KEYSC_gPLUS 0x4e - #define KEYSC_gEND 0x4f - #define KEYSC_gDOWN 0x50 - #define KEYSC_gPGDN 0x51 - #define KEYSC_gINS 0x52 - #define KEYSC_gDEL 0x53 - - #define KEYSC_F11 0x57 - #define KEYSC_F12 0x58 - - #define KEYSC_gENTER 0x9C - #define KEYSC_RCTRL 0x9D - #define KEYSC_gSLASH 0xB5 - #define KEYSC_RALT 0xB8 - #define KEYSC_PRTSCN 0xB7 - #define KEYSC_PAUSE 0xC5 - #define KEYSC_HOME 0xC7 - #define KEYSC_UP 0xC8 - #define KEYSC_PGUP 0xC9 - #define KEYSC_LEFT 0xCB - #define KEYSC_RIGHT 0xCD - #define KEYSC_END 0xCF - #define KEYSC_DOWN 0xD0 - #define KEYSC_PGDN 0xD1 - #define KEYSC_INSERT 0xD2 - #define KEYSC_DELETE 0xD3 - - #define asc_Esc 27 - #define asc_Enter 13 - #define asc_Space 32 - -END_RR_NS - -#endif diff --git a/source/rr/src/player.cpp b/source/rr/src/player.cpp index 8c9dd49ce..efb36d1e8 100644 --- a/source/rr/src/player.cpp +++ b/source/rr/src/player.cpp @@ -8765,7 +8765,7 @@ HORIZONLY:; } else if (TEST_SYNC_KEY(playerBits, SK_AIM_DOWN) && (!RRRA || !pPlayer->on_motorcycle)) { - if (VM_OnEvent(EVENT_AIMDOWN,pPlayer->i,playerNum) == 0) + if (VM_OnEvent(/*EVENT_AIMDOWN*/EVENT_AIMUP,pPlayer->i,playerNum) == 0) // changed to allow the constant to be reused in EDuke. { pPlayer->q16horiz -= fix16_from_int(6<<(int)(TEST_SYNC_KEY(playerBits, SK_RUN))); centerHoriz++; diff --git a/source/rr/src/premap.cpp b/source/rr/src/premap.cpp index 0ce6d9675..6c51408ad 100644 --- a/source/rr/src/premap.cpp +++ b/source/rr/src/premap.cpp @@ -36,6 +36,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. BEGIN_RR_NS +extern void G_SetupGlobalPsky(void); + static int32_t g_whichPalForPlayer = 9; static uint8_t precachehightile[2][MAXTILES>>3]; diff --git a/source/rr/src/quotes.h b/source/rr/src/quotes.h deleted file mode 100644 index 46858c821..000000000 --- a/source/rr/src/quotes.h +++ /dev/null @@ -1,97 +0,0 @@ -//------------------------------------------------------------------------- -/* -Copyright (C) 2011 EDuke32 developers and contributors - -This file is part of EDuke32. - -EDuke32 is free software; you can redistribute it and/or -modify it under the terms of the GNU General Public License version 2 -as published by the Free Software Foundation. - -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. -*/ -//------------------------------------------------------------------------- - -#ifndef quotes_h_ -#define quotes_h_ - -#include "quotemgr.h" - -#define OBITQUOTEINDEX (MAXQUOTES-128) -#define SUICIDEQUOTEINDEX (MAXQUOTES-32) - -#define QUOTE_SHOW_MAP_OFF 1 -#define QUOTE_ACTIVATED 2 -#define QUOTE_MEDKIT 3 -#define QUOTE_LOCKED 4 -#define QUOTE_CHEAT_EVERYTHING 5 -#define QUOTE_BOOTS 6 -#define QUOTE_WASTED 7 -#define QUOTE_UNLOCKED 8 -#define QUOTE_FOUND_SECRET 9 -#define QUOTE_SQUISHED 10 -#define QUOTE_USED_STEROIDS 12 -#define QUOTE_DEAD 13 -#define QUOTE_DEACTIVATED 15 -#define QUOTE_CHEAT_GODMODE_ON 17 -#define QUOTE_CHEAT_GODMODE_OFF 18 -#define QUOTE_CROSSHAIR_OFF 21 -#define QUOTE_CHEATS_DISABLED 22 -#define QUOTE_MESSAGES_ON 23 -#define QUOTE_MESSAGES_OFF 24 -#define QUOTE_MUSIC 26 -#define QUOTE_CHEAT_STEROIDS 37 -#define QUOTE_F1HELP 40 -#define QUOTE_MOUSE_AIMING_OFF 44 -#define QUOTE_HOLODUKE_ON 47 -#define QUOTE_HOLODUKE_OFF 48 -#define QUOTE_HOLODUKE_NOT_FOUND 49 -#define QUOTE_JETPACK_NOT_FOUND 50 -#define QUOTE_JETPACK_ON 52 -#define QUOTE_JETPACK_OFF 53 -#define QUOTE_NEED_BLUE_KEY 70 -#define QUOTE_NEED_RED_KEY 71 -#define QUOTE_NEED_YELLOW_KEY 72 -#define QUOTE_WEAPON_LOWERED 73 -#define QUOTE_WEAPON_RAISED 74 -#define QUOTE_BOOTS_ON 75 -#define QUOTE_SCUBA_ON 76 -#define QUOTE_CHEAT_ALLEN 79 -#define QUOTE_MIGHTY_FOOT 80 -#define QUOTE_WEAPON_MODE_OFF 82 -#define QUOTE_MAP_FOLLOW_OFF 83 -#define QUOTE_RUN_MODE_OFF 85 -#define QUOTE_JETPACK 88 -#define QUOTE_SCUBA 89 -#define QUOTE_STEROIDS 90 -#define QUOTE_HOLODUKE 91 -#define QUOTE_CHEAT_TODD 99 -#define QUOTE_CHEAT_UNLOCK 100 -#define QUOTE_NVG 101 -#define QUOTE_WEREGONNAFRYYOURASS 102 -#define QUOTE_SCREEN_SAVED 103 -#define QUOTE_CHEAT_BETA 105 -#define QUOTE_NVG_OFF 107 -#define QUOTE_VIEW_MODE_OFF 109 -#define QUOTE_SHOW_MAP_ON 111 -#define QUOTE_CHEAT_NOCLIP 113 -#define QUOTE_SAVE_BAD_VERSION 114 -#define QUOTE_RESERVED 115 -#define QUOTE_RESERVED2 116 -#define QUOTE_RESERVED3 117 -#define QUOTE_SAVE_DEAD 118 -#define QUOTE_CHEAT_ALL_WEAPONS 119 -#define QUOTE_CHEAT_ALL_INV 120 -#define QUOTE_CHEAT_ALL_KEYS 121 -#define QUOTE_RESERVED4 122 -#define QUOTE_SAVE_BAD_PLAYERS 124 - -#endif diff --git a/source/rr/src/sector.h b/source/rr/src/sector.h index b947387b0..8aedecad6 100644 --- a/source/rr/src/sector.h +++ b/source/rr/src/sector.h @@ -25,7 +25,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. #include "actors.h" // actor_t #include "gamevars.h" -#include "macros.h" +#include "dukerr/macros.h" #include "dukerr/namesdyn.h" // for G_GetForcefieldPicnum() #include "player.h" // playerspawn_t diff --git a/source/sw/src/common_game.h b/source/sw/src/common_game.h index 6b4b207b3..ad3485d4f 100644 --- a/source/sw/src/common_game.h +++ b/source/sw/src/common_game.h @@ -78,38 +78,6 @@ BEGIN_SW_NS #define DEFAULTSOCKETNUMBER 0x8849 -// Default RTS file - -#define DEFAULTRTSFILE "sw.rts" - -// Default RTS path - -#define DEFAULTRTSPATH ".\\" - -// Default UserLevel path - -#define DEFAULTLEVELPATH ".\\" - -// Default External Control file - -#define DEFAULTCONTROLFILE "EXTERNAL.EXE" - -// Default Help file - -#define DEFAULTHELPFILE "SWHELP.EXE" - -// RTS extension - -#define RTSEXTENSION "RTS" - -// MAP extension - -#define MAPEXTENSION "MAP" - -// Default Player name - -#define DEFAULTPLAYERNAME "KATO" - // Default Macros #define MACRO1 "Burn baby burn..."