zdoom
/
raze-gles
mirror of https://github.com/ZDoom/raze-gles.git
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Blood: prefix the new maphack tokens with md 

# Conflicts:
#	source/duke3d/src/lunatic/con_lang.lua
#	source/rr/src/lunatic/con_lang.lua
This commit is contained in:
CommonLoon102 2020-01-11 15:56:14 +01:00 committed by Christoph Oelckers
parent bc4a4bea23
commit 851a82c01f
3 changed files with 45 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

66
source/build/src/mhk.cpp
View File

@ -46,12 +46,12 @@ int32_t engineLoadMHK(const char *filename)
T_NOANIM, T_NOANIM,
T_PITCH, T_PITCH,
T_ROLL, T_ROLL,
T_PIVOTXOFF, T_MDPIVOTXOFF,
T_PIVOTYOFF, T_MDPIVOTYOFF,
T_PIVOTZOFF, T_MDPIVOTZOFF,
T_POSITIONXOFF, T_MDPOSITIONXOFF,
T_POSITIONYOFF, T_MDPOSITIONYOFF,
T_POSITIONZOFF, T_MDPOSITIONZOFF,
T_AWAY1, T_AWAY1,
T_AWAY2, T_AWAY2,
T_LIGHT, T_LIGHT,
@ -70,21 +70,21 @@ int32_t engineLoadMHK(const char *filename)
{ "nomdanim", T_NOANIM }, { "nomdanim", T_NOANIM },
{ "pitch", T_PITCH }, { "pitch", T_PITCH },
{ "roll", T_ROLL }, { "roll", T_ROLL },
{ "mdxoff", T_PIVOTXOFF }, { "mdxoff", T_MDPIVOTXOFF },
{ "mdyoff", T_PIVOTYOFF }, { "mdyoff", T_MDPIVOTYOFF },
{ "mdzoff", T_PIVOTZOFF }, { "mdzoff", T_MDPIVOTZOFF },
{ "pivxoff", T_PIVOTXOFF }, { "mdpivxoff", T_MDPIVOTXOFF },
{ "pivyoff", T_PIVOTYOFF }, { "mdpivyoff", T_MDPIVOTYOFF },
{ "pivzoff", T_PIVOTZOFF }, { "mdpivzoff", T_MDPIVOTZOFF },
{ "pivotxoff", T_PIVOTXOFF }, { "mdpivotxoff", T_MDPIVOTXOFF },
{ "pivotyoff", T_PIVOTYOFF }, { "mdpivotyoff", T_MDPIVOTYOFF },
{ "pivotzoff", T_PIVOTZOFF }, { "mdpivotzoff", T_MDPIVOTZOFF },
{ "posxoff", T_POSITIONXOFF }, { "mdposxoff", T_MDPOSITIONXOFF },
{ "posyoff", T_POSITIONYOFF }, { "mdposyoff", T_MDPOSITIONYOFF },
{ "poszoff", T_POSITIONZOFF }, { "mdposzoff", T_MDPOSITIONZOFF },
{ "positionxoff", T_POSITIONXOFF }, { "mdpositionxoff", T_MDPOSITIONXOFF },
{ "positionyoff", T_POSITIONYOFF }, { "mdpositionyoff", T_MDPOSITIONYOFF },
{ "positionzoff", T_POSITIONZOFF }, { "mdpositionzoff", T_MDPOSITIONZOFF },
{ "away1", T_AWAY1 }, { "away1", T_AWAY1 },
{ "away2", T_AWAY2 }, { "away2", T_AWAY2 },
{ "light", T_LIGHT }, { "light", T_LIGHT },
@ -212,7 +212,7 @@ int32_t engineLoadMHK(const char *filename)
spriteext[whichsprite].roll = (int16_t) roll; spriteext[whichsprite].roll = (int16_t) roll;
} }
break; break;
case T_PIVOTXOFF: // pivxoff <xx> case T_MDPIVOTXOFF: // mdpivxoff <xx>
{ {
int32_t i; int32_t i;
if (scriptfile_getnumber(script, &i)) break; if (scriptfile_getnumber(script, &i)) break;
@ -220,14 +220,14 @@ int32_t engineLoadMHK(const char *filename)
if (whichsprite < 0) if (whichsprite < 0)
{ {
// no sprite directive preceeding // no sprite directive preceeding
initprintf("Ignoring mdxoff/pivxoff directive because of absent/invalid sprite number on line %s:%d\n", initprintf("Ignoring mdxoff/mdpivxoff directive because of absent/invalid sprite number on line %s:%d\n",
script->filename, scriptfile_getlinum(script, cmdtokptr)); script->filename, scriptfile_getlinum(script, cmdtokptr));
break; break;
} }
spriteext[whichsprite].pivot_offset.x = i; spriteext[whichsprite].pivot_offset.x = i;
} }
break; break;
case T_PIVOTYOFF: // pivyoff <xx> case T_MDPIVOTYOFF: // mdpivyoff <xx>
{ {
int32_t i; int32_t i;
if (scriptfile_getnumber(script, &i)) break; if (scriptfile_getnumber(script, &i)) break;
@ -235,14 +235,14 @@ int32_t engineLoadMHK(const char *filename)
if (whichsprite < 0) if (whichsprite < 0)
{ {
// no sprite directive preceeding // no sprite directive preceeding
initprintf("Ignoring mdyoff/pivyoff directive because of absent/invalid sprite number on line %s:%d\n", initprintf("Ignoring mdyoff/mdpivyoff directive because of absent/invalid sprite number on line %s:%d\n",
script->filename, scriptfile_getlinum(script, cmdtokptr)); script->filename, scriptfile_getlinum(script, cmdtokptr));
break; break;
} }
spriteext[whichsprite].pivot_offset.y = i; spriteext[whichsprite].pivot_offset.y = i;
} }
break; break;
case T_PIVOTZOFF: // pivzoff <xx> case T_MDPIVOTZOFF: // mdpivzoff <xx>
{ {
int32_t i; int32_t i;
if (scriptfile_getnumber(script, &i)) break; if (scriptfile_getnumber(script, &i)) break;
@ -250,14 +250,14 @@ int32_t engineLoadMHK(const char *filename)
if (whichsprite < 0) if (whichsprite < 0)
{ {
// no sprite directive preceeding // no sprite directive preceeding
initprintf("Ignoring mdzoff/pivzoff directive because of absent/invalid sprite number on line %s:%d\n", initprintf("Ignoring mdzoff/mdpivzoff directive because of absent/invalid sprite number on line %s:%d\n",
script->filename, scriptfile_getlinum(script, cmdtokptr)); script->filename, scriptfile_getlinum(script, cmdtokptr));
break; break;
} }
spriteext[whichsprite].pivot_offset.z = i; spriteext[whichsprite].pivot_offset.z = i;
} }
break; break;
case T_POSITIONXOFF: // posxoff <xx> case T_MDPOSITIONXOFF: // mdposxoff <xx>
{ {
int32_t i; int32_t i;
if (scriptfile_getnumber(script, &i)) break; if (scriptfile_getnumber(script, &i)) break;
@ -265,14 +265,14 @@ int32_t engineLoadMHK(const char *filename)
if (whichsprite < 0) if (whichsprite < 0)
{ {
// no sprite directive preceeding // no sprite directive preceeding
initprintf("Ignoring posxoff directive because of absent/invalid sprite number on line %s:%d\n", initprintf("Ignoring mdposxoff directive because of absent/invalid sprite number on line %s:%d\n",
script->filename, scriptfile_getlinum(script, cmdtokptr)); script->filename, scriptfile_getlinum(script, cmdtokptr));
break; break;
} }
spriteext[whichsprite].position_offset.x = i; spriteext[whichsprite].position_offset.x = i;
} }
break; break;
case T_POSITIONYOFF: // posyoff <xx> case T_MDPOSITIONYOFF: // mdposyoff <xx>
{ {
int32_t i; int32_t i;
if (scriptfile_getnumber(script, &i)) break; if (scriptfile_getnumber(script, &i)) break;
@ -280,14 +280,14 @@ int32_t engineLoadMHK(const char *filename)
if (whichsprite < 0) if (whichsprite < 0)
{ {
// no sprite directive preceeding // no sprite directive preceeding
initprintf("Ignoring posyoff directive because of absent/invalid sprite number on line %s:%d\n", initprintf("Ignoring mdposyoff directive because of absent/invalid sprite number on line %s:%d\n",
script->filename, scriptfile_getlinum(script, cmdtokptr)); script->filename, scriptfile_getlinum(script, cmdtokptr));
break; break;
} }
spriteext[whichsprite].position_offset.y = i; spriteext[whichsprite].position_offset.y = i;
} }
break; break;
case T_POSITIONZOFF: // poszoff <xx> case T_MDPOSITIONZOFF: // mdposzoff <xx>
{ {
int32_t i; int32_t i;
if (scriptfile_getnumber(script, &i)) break; if (scriptfile_getnumber(script, &i)) break;
@ -295,7 +295,7 @@ int32_t engineLoadMHK(const char *filename)
if (whichsprite < 0) if (whichsprite < 0)
{ {
// no sprite directive preceeding // no sprite directive preceeding
initprintf("Ignoring poszoff directive because of absent/invalid sprite number on line %s:%d\n", initprintf("Ignoring mdposzoff directive because of absent/invalid sprite number on line %s:%d\n",
script->filename, scriptfile_getlinum(script, cmdtokptr)); script->filename, scriptfile_getlinum(script, cmdtokptr));
break; break;
} }

12
source/duke3d/src/gamedef.h
View File

@ -737,12 +737,12 @@ enum ActorLabel_t
ACTOR_ANGOFF = ACTOR_SPRITEEXT_BEGIN, ACTOR_ANGOFF = ACTOR_SPRITEEXT_BEGIN,
ACTOR_PITCH, ACTOR_PITCH,
ACTOR_ROLL, ACTOR_ROLL,
ACTOR_PIVOTXOFF, ACTOR_MDPIVOTXOFF,
ACTOR_PIVOTYOFF, ACTOR_MDPIVOTYOFF,
ACTOR_PIVOTZOFF, ACTOR_MDPIVOTZOFF,
ACTOR_POSITIONXOFF, ACTOR_MDPOSITIONXOFF,
ACTOR_POSITIONYOFF, ACTOR_MDPOSITIONYOFF,
ACTOR_POSITIONZOFF, ACTOR_MDPOSITIONZOFF,
ACTOR_MDFLAGS, ACTOR_MDFLAGS,
ACTOR_XPANNING, ACTOR_XPANNING,
ACTOR_YPANNING, ACTOR_YPANNING,

12
source/duke3d/src/gamestructures.cpp
View File

@ -305,12 +305,12 @@ const memberlabel_t ActorLabels[]=
LABEL_SETUP(spriteext, pitch, ACTOR_PITCH), LABEL_SETUP(spriteext, pitch, ACTOR_PITCH),
LABEL_SETUP(spriteext, roll, ACTOR_ROLL), LABEL_SETUP(spriteext, roll, ACTOR_ROLL),
LABEL_SETUP_UNMATCHED(spriteext, pivot_offset.x, "mdxoff", ACTOR_PIVOTXOFF), LABEL_SETUP_UNMATCHED(spriteext, pivot_offset.x, "mdxoff", ACTOR_MDPIVOTXOFF),
LABEL_SETUP_UNMATCHED(spriteext, pivot_offset.y, "mdyoff", ACTOR_PIVOTYOFF), LABEL_SETUP_UNMATCHED(spriteext, pivot_offset.y, "mdyoff", ACTOR_MDPIVOTYOFF),
LABEL_SETUP_UNMATCHED(spriteext, pivot_offset.z, "mdzoff", ACTOR_PIVOTZOFF), LABEL_SETUP_UNMATCHED(spriteext, pivot_offset.z, "mdzoff", ACTOR_MDPIVOTZOFF),
LABEL_SETUP_UNMATCHED(spriteext, position_offset.x, "posxoff", ACTOR_POSITIONXOFF), LABEL_SETUP_UNMATCHED(spriteext, position_offset.x, "mdposxoff", ACTOR_MDPOSITIONXOFF),
LABEL_SETUP_UNMATCHED(spriteext, position_offset.y, "posyoff", ACTOR_POSITIONYOFF), LABEL_SETUP_UNMATCHED(spriteext, position_offset.y, "mdposyoff", ACTOR_MDPOSITIONYOFF),
LABEL_SETUP_UNMATCHED(spriteext, position_offset.z, "poszoff", ACTOR_POSITIONZOFF), LABEL_SETUP_UNMATCHED(spriteext, position_offset.z, "mdposzoff", ACTOR_MDPOSITIONZOFF),
LABEL_SETUP_UNMATCHED(spriteext, flags, "mdflags", ACTOR_MDFLAGS), LABEL_SETUP_UNMATCHED(spriteext, flags, "mdflags", ACTOR_MDFLAGS),
LABEL_SETUP(spriteext, xpanning, ACTOR_XPANNING), LABEL_SETUP(spriteext, xpanning, ACTOR_XPANNING),