zdoom/raze-gles
0
0
Fork 0
mirror of https://github.com/ZDoom/raze-gles.git synced 2024-12-28 20:40:47 +00:00
Code Issues Projects Releases Packages Wiki Activity

Duke3D: Remove KEEPINSYNC comments referencing LUA code

Browse source 
# Conflicts:
#	source/duke3d/src/_functio.h
#	source/duke3d/src/duke3d.h
#	source/duke3d/src/game.h
#	source/duke3d/src/global.h
This commit is contained in:
NY00123 2020-05-17 22:08:43 +03:00 committed by Christoph Oelckers
parent ec11d22caf
commit a54d408d59
8 changed files with 2 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
source/duke3d/src/actors.h
View file

@ -40,7 +40,6 @@ BEGIN_DUKE_NS
#define ACTOR_MAXFALLINGZVEL 6144 #define ACTOR_MAXFALLINGZVEL 6144
#define ACTOR_ONWATER_ADDZ (24<<8) #define ACTOR_ONWATER_ADDZ (24<<8)
// KEEPINSYNC lunatic/con_lang.lua
#define STAT_DEFAULT 0 #define STAT_DEFAULT 0
#define STAT_ACTOR 1 #define STAT_ACTOR 1
#define STAT_ZOMBIEACTOR 2 #define STAT_ZOMBIEACTOR 2
@ -298,7 +297,6 @@ typedef struct
} tiledata_t; } tiledata_t;
// KEEPINSYNC lunatic/con_lang.lua
enum sflags_t enum sflags_t
{ {
SFLAG_SHADOW = 0x00000001, SFLAG_SHADOW = 0x00000001,

1
source/duke3d/src/duke3d.h
View file

@ -58,7 +58,6 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
#define RECSYNCBUFSIZ 2520 //2520 is the (LCM of 1-8)*3 #define RECSYNCBUFSIZ 2520 //2520 is the (LCM of 1-8)*3
#define MOVEFIFOSIZ 2 #define MOVEFIFOSIZ 2
// KEEPINSYNC lunatic/con_lang.lua
#define MAXLEVELS 64 #define MAXLEVELS 64
#define MAXGAMETYPES 16 #define MAXGAMETYPES 16

2
source/duke3d/src/events_defs.h
View file

@ -5,7 +5,7 @@
BEGIN_DUKE_NS BEGIN_DUKE_NS
// the order of these can't be changed or else compatibility with EDuke 2.0 mods will break // 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 // KEEPINSYNC with EventNames[]
enum GameEvent_t { enum GameEvent_t {
EVENT_INIT, // 0 EVENT_INIT, // 0
EVENT_ENTERLEVEL, EVENT_ENTERLEVEL,

3
source/duke3d/src/gamedef.cpp
View file

@ -861,7 +861,7 @@ char const *VM_GetKeywordForID(int32_t id)
return "<unknown instruction>"; return "<unknown instruction>";
} }
// KEEPINSYNC with enum GameEvent_t and lunatic/con_lang.lua // KEEPINSYNC with enum GameEvent_t
const char *EventNames[MAXEVENTS] = const char *EventNames[MAXEVENTS] =
{ {
"EVENT_INIT", "EVENT_INIT",
@ -5676,7 +5676,6 @@ static void C_AddDefinition(const char *lLabel,int32_t lValue,int32_t lType)
labelcode[g_labelCnt++] = lValue; labelcode[g_labelCnt++] = lValue;
} }
// KEEPINSYNC lunatic/con_lang.lua
static void C_AddDefaultDefinitions(void) static void C_AddDefaultDefinitions(void)
{ {
for (int i=0; i<MAXEVENTS; i++) for (int i=0; i<MAXEVENTS; i++)

4
source/duke3d/src/gamedef.h
View file

@ -189,7 +189,6 @@ extern const tokenmap_t iter_tokens[];
extern char const * VM_GetKeywordForID(int32_t id); extern char const * VM_GetKeywordForID(int32_t id);
// KEEPINSYNC lunatic/con_lang.lua
enum SystemString_t { enum SystemString_t {
STR_MAPNAME, STR_MAPNAME,
STR_MAPFILENAME, STR_MAPFILENAME,
@ -750,7 +749,6 @@ enum PalDataLabel_t
PALDATA_END PALDATA_END
}; };
// KEEPINSYNC lunatic/con_lang.lua
enum ProjectileLabel_t enum ProjectileLabel_t
{ {
PROJ_WORKSLIKE, // 0 PROJ_WORKSLIKE, // 0
@ -1342,8 +1340,6 @@ enum IterationTypes_t
\ \
TRANSFORM(CON_END) TRANSFORM(CON_END)
// KEEPINSYNC with the keyword list in lunatic/con_lang.lua
#define ENUM_TRANSFORM(ENUM_CONST) ENUM_CONST #define ENUM_TRANSFORM(ENUM_CONST) ENUM_CONST
#define COMMA , #define COMMA ,
enum ScriptKeywords_t enum ScriptKeywords_t

1
source/duke3d/src/global.h
View file

@ -41,7 +41,6 @@ BEGIN_DUKE_NS
#endif #endif
#define MAXINTERPOLATIONS MAXSPRITES #define MAXINTERPOLATIONS MAXSPRITES
// KEEPINSYNC lunatic/con_lang.lua
// duke3d global soup :( // duke3d global soup :(

4
source/duke3d/src/player.h
View file

@ -138,7 +138,6 @@ typedef struct {
// * char --> int8_t // * char --> int8_t
// Need to carefully think about implications! // Need to carefully think about implications!
// TODO: rearrange this if the opportunity arises! // TODO: rearrange this if the opportunity arises!
// KEEPINSYNC lunatic/_defs_game.lua
typedef struct { typedef struct {
vec3_t pos, opos; vec3_t pos, opos;
vec3_t vel, npos; vec3_t vel, npos;
@ -210,7 +209,6 @@ typedef struct {
int8_t padding_[1]; int8_t padding_[1];
} DukePlayer_t; } DukePlayer_t;
// KEEPINSYNC lunatic/_defs_game.lua
typedef struct typedef struct
{ {
DukePlayer_t *ps; DukePlayer_t *ps;
@ -237,7 +235,6 @@ typedef struct
} playerdata_t; } playerdata_t;
#pragma pack(pop) #pragma pack(pop)
// KEEPINSYNC lunatic/con_lang.lua
typedef struct typedef struct
{ {
// NOTE: the member names must be identical to aplWeapon* suffixes. // NOTE: the member names must be identical to aplWeapon* suffixes.
@ -299,7 +296,6 @@ typedef struct {
int32_t userdata; // 4b int32_t userdata; // 4b
} projectile_t; } projectile_t;
// KEEPINSYNC lunatic/_defs_game.lua
typedef struct { typedef struct {
int32_t cur, count; // "cur" is the only member that is *used* int32_t cur, count; // "cur" is the only member that is *used*
int32_t gunposx, lookhalfang; // weapon_xoffset, ps->look_ang>>1 int32_t gunposx, lookhalfang; // weapon_xoffset, ps->look_ang>>1

1
source/duke3d/src/sounds.h
View file

@ -35,7 +35,6 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
BEGIN_DUKE_NS BEGIN_DUKE_NS
// KEEPINSYNC lunatic/con_lang.lua
#define MAXSOUNDS 4096 #define MAXSOUNDS 4096
#define LOUDESTVOLUME 111 #define LOUDESTVOLUME 111