diff --git a/appveyor.yml b/appveyor.yml
index 8a20986cf3815a5cacecd62771ec50a367cdad9e..d5f76c344c33d5b1f0469956e06ee3390dd4ab62 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -1,4 +1,4 @@
-version: 2.2.8.{branch}-{build}
+version: 2.2.9.{branch}-{build}
os: MinGW
environment:
diff --git a/extras/conf/SRB2-22.cfg b/extras/conf/SRB2-22.cfg
index a0d40cdf0003dcc9f8ed81b0812825a625f6048a..3fd4b6ccdc0f6b24f1533d912daf234042dd870e 100644
--- a/extras/conf/SRB2-22.cfg
+++ b/extras/conf/SRB2-22.cfg
@@ -746,13 +746,13 @@ linedeftypes
20
{
- title = "First Line";
+ title = "PolyObject First Line";
prefix = "(20)";
}
22
{
- title = "Parameters";
+ title = "PolyObject Parameters";
prefix = "(22)";
flags8text = "[3] Set translucency by X offset";
flags32text = "[5] Render outer sides only";
@@ -765,19 +765,19 @@ linedeftypes
30
{
- title = "Waving Flag";
+ title = "PolyObject Waving Flag";
prefix = "(30)";
}
31
{
- title = "Displacement by Front Sector";
+ title = "Move PolyObject by Front Sector Displacement";
prefix = "(31)";
}
32
{
- title = "Angular Displacement by Front Sector";
+ title = "Rotate PolyObject by Front Sector Displacement";
prefix = "(32)";
flags64text = "[6] Don't turn players";
flags512text = "[9] Turn all objects";
@@ -2498,35 +2498,35 @@ linedeftypes
480
{
- title = "Door Slide";
+ title = "PolyObject Door Slide";
prefix = "(480)";
flags8text = "[3] Set delay by backside sector";
}
481
{
- title = "Door Swing";
+ title = "PolyObject Door Swing";
prefix = "(481)";
flags8text = "[3] Set delay by backside sector";
}
482
{
- title = "Move";
+ title = "Move PolyObject";
prefix = "(482)";
flags8text = "[3] Set delay by backside sector";
}
483
{
- title = "Move, Override";
+ title = "Move PolyObject, Override";
prefix = "(483)";
flags8text = "[3] Set delay by backside sector";
}
484
{
- title = "Rotate Right";
+ title = "Rotate PolyObject Right";
prefix = "(484)";
flags8text = "[3] Set delay by backside sector";
flags64text = "[6] Don't turn players";
@@ -2535,7 +2535,7 @@ linedeftypes
485
{
- title = "Rotate Right, Override";
+ title = "Rotate PolyObject Right, Override";
prefix = "(485)";
flags8text = "[3] Set delay by backside sector";
flags64text = "[6] Don't turn players";
@@ -2544,7 +2544,7 @@ linedeftypes
486
{
- title = "Rotate Left";
+ title = "Rotate PolyObject Left";
prefix = "(486)";
flags8text = "[3] Set delay by backside sector";
flags64text = "[6] Don't turn players";
@@ -2553,7 +2553,7 @@ linedeftypes
487
{
- title = "Rotate Left, Override";
+ title = "Rotate PolyObject Left, Override";
prefix = "(487)";
flags8text = "[3] Set delay by backside sector";
flags64text = "[6] Don't turn players";
@@ -2562,7 +2562,7 @@ linedeftypes
488
{
- title = "Move by Waypoints";
+ title = "Move PolyObject by Waypoints";
prefix = "(488)";
flags8text = "[3] Set delay by backside sector";
flags32text = "[5] Reverse order";
@@ -2573,7 +2573,7 @@ linedeftypes
489
{
- title = "Turn Invisible, Intangible";
+ title = "Turn PolyObject Invisible, Intangible";
prefix = "(489)";
flags8text = "[3] Set delay by backside sector";
flags64text = "[6] Only invisible";
@@ -2581,7 +2581,7 @@ linedeftypes
490
{
- title = "Turn Visible, Tangible";
+ title = "Turn PolyObject Visible, Tangible";
prefix = "(490)";
flags8text = "[3] Set delay by backside sector";
flags64text = "[6] Only visible";
@@ -2589,7 +2589,7 @@ linedeftypes
491
{
- title = "Set Translucency";
+ title = "Set PolyObject Translucency";
prefix = "(491)";
flags8text = "[3] Set delay by backside sector";
flags16text = "[4] Set raw alpha by Front X";
@@ -2598,7 +2598,7 @@ linedeftypes
492
{
- title = "Fade Translucency";
+ title = "Fade PolyObject Translucency";
prefix = "(492)";
flags8text = "[3] Set delay by backside sector";
flags16text = "[4] Set raw alpha by Front X";
@@ -3393,6 +3393,7 @@ thingtypes
width = 8;
height = 28;
angletext = "Jump strength";
+ fixedrotation = 1;
}
103
{
@@ -3431,6 +3432,7 @@ thingtypes
width = 12;
height = 64;
angletext = "Firing delay";
+ fixedrotation = 1;
}
122
{
@@ -3547,9 +3549,10 @@ thingtypes
{
title = "Pterabyte Spawner";
sprite = "PTERA2A8";
- width = 16;
- height = 16;
- parametertext = "No. Pterabytes";
+ width = 24;
+ height = 48;
+ parametertext = "Spawns +1";
+ arrow = 0;
}
136
{
@@ -3771,6 +3774,7 @@ thingtypes
height = 16;
sprite = "internal:capsule";
angletext = "Tag";
+ fixedrotation = 1;
}
292
{
@@ -3781,11 +3785,13 @@ thingtypes
flags8text = "[8] Sea Egg shooting point";
sprite = "internal:eggmanway";
angletext = "No. (Sea Egg)";
+ fixedrotation = 1;
flagsvaluetext = "No. (Brak)";
parametertext = "Next";
}
293
{
+ arrow = 0;
title = "Metal Sonic Gather Point";
sprite = "internal:metal";
width = 8;
@@ -3793,6 +3799,7 @@ thingtypes
}
294
{
+ arrow = 0;
title = "Fang Waypoint";
flags8text = "[8] Center waypoint";
sprite = "internal:eggmanway";
@@ -3820,79 +3827,79 @@ thingtypes
301
{
title = "Bounce Ring";
- sprite = "internal:RNGBA0";
+ sprite = "RNGBA0";
}
302
{
title = "Rail Ring";
- sprite = "internal:RNGRA0";
+ sprite = "RNGRA0";
}
303
{
title = "Infinity Ring";
- sprite = "internal:RNGIA0";
+ sprite = "RNGIA0";
}
304
{
title = "Automatic Ring";
- sprite = "internal:RNGAA0";
+ sprite = "RNGAA0";
}
305
{
title = "Explosion Ring";
- sprite = "internal:RNGEA0";
+ sprite = "RNGEA0";
}
306
{
title = "Scatter Ring";
- sprite = "internal:RNGSA0";
+ sprite = "RNGSA0";
}
307
{
title = "Grenade Ring";
- sprite = "internal:RNGGA0";
+ sprite = "RNGGA0";
}
308
{
title = "CTF Team Ring (Red)";
- sprite = "internal:RRNGA0";
+ sprite = "internal:TRNGA0r";
width = 16;
}
309
{
title = "CTF Team Ring (Blue)";
- sprite = "internal:BRNGA0";
+ sprite = "internal:TRNGA0b";
width = 16;
}
330
{
title = "Bounce Ring Panel";
- sprite = "internal:PIKBA0";
+ sprite = "PIKBA0";
}
331
{
title = "Rail Ring Panel";
- sprite = "internal:PIKRA0";
+ sprite = "PIKRA0";
}
332
{
title = "Automatic Ring Panel";
- sprite = "internal:PIKAA0";
+ sprite = "PIKAA0";
}
333
{
title = "Explosion Ring Panel";
- sprite = "internal:PIKEA0";
+ sprite = "PIKEA0";
}
334
{
title = "Scatter Ring Panel";
- sprite = "internal:PIKSA0";
+ sprite = "PIKSA0";
}
335
{
title = "Grenade Ring Panel";
- sprite = "internal:PIKGA0";
+ sprite = "PIKGA0";
}
}
@@ -3986,6 +3993,7 @@ thingtypes
flags8height = 24;
flags8text = "[8] Float";
angletext = "Tag";
+ fixedrotation = 1;
}
}
@@ -4000,6 +4008,7 @@ thingtypes
flags4text = "[4] Random (Strong)";
flags8text = "[8] Random (Weak)";
angletext = "Tag";
+ fixedrotation = 1;
400
{
@@ -4131,6 +4140,7 @@ thingtypes
height = 44;
flags1text = "[1] Run linedef executor on pop";
angletext = "Tag";
+ fixedrotation = 1;
431
{
@@ -4228,6 +4238,7 @@ thingtypes
height = 128;
flags4text = "[4] Respawn at center";
angletext = "Angle/Order";
+ fixedrotation = 1;
parametertext = "Order";
}
520
@@ -4259,7 +4270,7 @@ thingtypes
flags1text = "[1] Start retracted";
flags4text = "[4] Retractable";
flags8text = "[8] Intangible";
- parametertext = "Initial delay";
+ parametertext = "Start delay";
}
523
{
@@ -4271,7 +4282,8 @@ thingtypes
flags4text = "[4] Retractable";
flags8text = "[8] Intangible";
angletext = "Retraction interval";
- parametertext = "Initial delay";
+ fixedrotation = 1;
+ parametertext = "Start delay";
}
1130
{
@@ -4320,6 +4332,7 @@ thingtypes
flags4text = "[4] Invisible";
flags8text = "[8] No distance check";
angletext = "Lift height";
+ fixedrotation = 1;
}
541
{
@@ -4335,6 +4348,7 @@ thingtypes
width = 32;
height = 64;
angletext = "Strength";
+ fixedrotation = 1;
}
543
{
@@ -4344,6 +4358,7 @@ thingtypes
height = 64;
flags8text = "[8] Respawn";
angletext = "Color";
+ fixedrotation = 1;
}
550
{
@@ -4617,6 +4632,9 @@ thingtypes
title = "Slope Vertex";
sprite = "internal:vertexslope";
angletext = "Tag";
+ fixedrotation = 1;
+ parametertext = "Absolute?";
+ flagsvaluetext = "Absolute Z";
}
751
@@ -4638,6 +4656,7 @@ thingtypes
title = "Zoom Tube Waypoint";
sprite = "internal:zoom";
angletext = "Order";
+ fixedrotation = 1;
}
754
@@ -4647,6 +4666,7 @@ thingtypes
flags8text = "[8] Push using XYZ";
sprite = "GWLGA0";
angletext = "Radius";
+ fixedrotation = 1;
}
755
{
@@ -4655,6 +4675,7 @@ thingtypes
flags8text = "[8] Pull using XYZ";
sprite = "GWLRA0";
angletext = "Radius";
+ fixedrotation = 1;
}
756
{
@@ -4663,6 +4684,7 @@ thingtypes
width = 32;
height = 16;
angletext = "Tag";
+ fixedrotation = 1;
}
757
{
@@ -4671,6 +4693,7 @@ thingtypes
width = 8;
height = 16;
angletext = "Tag";
+ fixedrotation = 1;
}
758
{
@@ -4681,21 +4704,24 @@ thingtypes
{
title = "PolyObject Anchor";
sprite = "internal:polyanchor";
- angletext = "ID";
+ angletext = "Tag";
+ fixedrotation = 1;
}
761
{
title = "PolyObject Spawn Point";
sprite = "internal:polycenter";
- angletext = "ID";
+ angletext = "Tag";
+ fixedrotation = 1;
}
762
{
title = "PolyObject Spawn Point (Crush)";
sprite = "internal:polycentercrush";
- angletext = "ID";
+ angletext = "Tag";
+ fixedrotation = 1;
}
780
{
@@ -4703,6 +4729,7 @@ thingtypes
sprite = "internal:skyb";
flags4text = "[4] In-map centerpoint";
parametertext = "ID";
+ fixedrotation = 1;
}
}
@@ -4897,6 +4924,7 @@ thingtypes
height = 16;
hangs = 1;
angletext = "Dripping interval";
+ fixedrotation = 1;
}
1003
{
@@ -4953,7 +4981,7 @@ thingtypes
1011
{
title = "Stalagmite (DSZ2)";
- sprite = "DSTGA0";
+ sprite = "DSTGB0";
width = 8;
height = 116;
flags4text = "[4] Double size";
@@ -5038,6 +5066,8 @@ thingtypes
flags4text = "[4] No sounds";
flags8text = "[8] Double size";
angletext = "Tag";
+ parametertext = "Spokes";
+ fixedrotation = 1;
}
1105
{
@@ -5048,6 +5078,8 @@ thingtypes
flags4text = "[4] No sounds";
flags8text = "[8] Double size";
angletext = "Tag";
+ parametertext = "Spokes";
+ fixedrotation = 1;
}
1106
{
@@ -5058,6 +5090,8 @@ thingtypes
flags4text = "[4] No sounds";
flags8text = "[8] Red spring";
angletext = "Tag";
+ parametertext = "Spokes";
+ fixedrotation = 1;
}
1107
{
@@ -5067,6 +5101,8 @@ thingtypes
height = 34;
flags8text = "[8] Double size";
angletext = "Tag";
+ parametertext = "Spokes";
+ fixedrotation = 1;
}
1108
{
@@ -5086,6 +5122,8 @@ thingtypes
flags4text = "[4] No sounds";
flags8text = "[8] Double size";
angletext = "Tag";
+ parametertext = "Spokes";
+ fixedrotation = 1;
}
1110
{
@@ -5095,6 +5133,8 @@ thingtypes
height = 34;
flags4text = "[4] No sounds";
angletext = "Tag";
+ parametertext = "Spokes";
+ fixedrotation = 1;
}
1111
{
@@ -5224,6 +5264,7 @@ thingtypes
sprite = "EGR1A1";
width = 20;
height = 72;
+ arrow = 1;
}
1128
{
@@ -5272,6 +5313,7 @@ thingtypes
width = 8;
height = 16;
angletext = "Tag";
+ fixedrotation = 1;
}
1203
{
@@ -5342,6 +5384,7 @@ thingtypes
sprite = "WWSGAR";
width = 22;
height = 64;
+ arrow = 1;
}
1213
{
@@ -5349,6 +5392,7 @@ thingtypes
sprite = "WWS2AR";
width = 22;
height = 64;
+ arrow = 1;
}
1214
{
@@ -5356,6 +5400,7 @@ thingtypes
sprite = "WWS3ALAR";
width = 16;
height = 192;
+ arrow = 1;
}
1215
{
@@ -5371,6 +5416,7 @@ thingtypes
sprite = "BARRA1";
width = 24;
height = 63;
+ arrow = 1;
}
1217
{
@@ -5392,6 +5438,7 @@ thingtypes
sprite = "MCRTCLFR";
width = 22;
height = 32;
+ arrow = 1;
}
1220
{
@@ -5399,6 +5446,7 @@ thingtypes
sprite = "MCRTIR";
width = 32;
height = 32;
+ arrow = 1;
}
1221
{
@@ -5406,6 +5454,7 @@ thingtypes
sprite = "SALDARAL";
width = 96;
height = 160;
+ arrow = 1;
flags8text = "[8] Allow non-minecart players";
}
1222
@@ -5467,6 +5516,7 @@ thingtypes
height = 40;
flags8text = "[8] Waves vertically";
angletext = "On/Off time";
+ fixedrotation = 1;
parametertext = "Strength";
}
1301
@@ -5477,6 +5527,7 @@ thingtypes
height = 40;
flags8text = "[8] Shoot downwards";
angletext = "On/Off time";
+ fixedrotation = 1;
parametertext = "Strength";
}
1302
@@ -5500,6 +5551,7 @@ thingtypes
width = 30;
height = 32;
angletext = "Initial delay";
+ fixedrotation = 1;
flags8text = "[8] Double size";
}
1305
@@ -5537,6 +5589,7 @@ thingtypes
sprite = "WVINALAR";
width = 1;
height = 288;
+ arrow = 1;
}
1310
{
@@ -5544,6 +5597,7 @@ thingtypes
sprite = "WVINBLBR";
width = 1;
height = 288;
+ arrow = 1;
}
}
@@ -5901,6 +5955,7 @@ thingtypes
width = 8;
height = 4096;
sprite = "UNKNA0";
+ fixedrotation = 1;
1700
{
@@ -5959,6 +6014,7 @@ thingtypes
flags4text = "[4] Align player to top";
flags8text = "[8] Die upon time up";
angletext = "Time limit";
+ fixedrotation = 1;
parametertext = "Height";
}
1704
@@ -5971,6 +6027,7 @@ thingtypes
unflippable = true;
flagsvaluetext = "Pitch";
angletext = "Yaw";
+ fixedrotation = 1;
}
1705
{
@@ -5983,6 +6040,7 @@ thingtypes
centerHitbox = true;
flagsvaluetext = "Height";
angletext = "Pitch/Yaw";
+ fixedrotation = 1;
}
1706
{
@@ -6104,6 +6162,7 @@ thingtypes
width = 8;
height = 16;
angletext = "Jump strength";
+ fixedrotation = 1;
}
1806
{
@@ -6336,6 +6395,7 @@ thingtypes
width = 18;
height = 28;
angletext = "Initial delay";
+ fixedrotation = 1;
}
2001
{
@@ -6459,6 +6519,7 @@ thingtypes
sprite = "XMS6A0";
width = 52;
height = 106;
+ hangs = 1;
}
}
@@ -6472,6 +6533,7 @@ thingtypes
flags4text = "[4] No movement";
flags8text = "[8] Hop";
angletext = "Radius";
+ fixedrotation = 1;
2200
{
diff --git a/src/Makefile.d/features.mk b/src/Makefile.d/features.mk
index abdc342b7bb8c0f1ba06c5eca2027ad54b9b4642..46194390d70f1f4c8b2f186f6ebf5542c4e228f9 100644
--- a/src/Makefile.d/features.mk
+++ b/src/Makefile.d/features.mk
@@ -9,7 +9,6 @@ passthru_opts+=\
# build with debugging information
ifdef DEBUGMODE
-MOBJCONSISTANCY=1
PACKETDROP=1
opts+=-DPARANOIA -DRANGECHECK
endif
diff --git a/src/Sourcefile b/src/Sourcefile
index 9f27f2810fcd02c81d41ad740e798b912f6936cd..d0f08edd845dff59ab0a827dd4392b7af6d99a15 100644
--- a/src/Sourcefile
+++ b/src/Sourcefile
@@ -5,6 +5,9 @@ d_net.c
d_netfil.c
d_netcmd.c
dehacked.c
+deh_soc.c
+deh_lua.c
+deh_tables.c
z_zone.c
f_finale.c
f_wipe.c
@@ -26,6 +29,7 @@ m_cond.c
m_fixed.c
m_menu.c
m_misc.c
+m_perfstats.c
m_random.c
m_queue.c
info.c
@@ -58,9 +62,12 @@ r_sky.c
r_splats.c
r_things.c
r_textures.c
+r_patch.c
+r_patchrotation.c
r_picformats.c
r_portal.c
screen.c
+taglist.c
v_video.c
s_sound.c
sounds.c
@@ -83,5 +90,7 @@ lua_playerlib.c
lua_skinlib.c
lua_thinkerlib.c
lua_maplib.c
+lua_taglib.c
+lua_polyobjlib.c
lua_blockmaplib.c
lua_hudlib.c
diff --git a/src/android/i_cdmus.c b/src/android/i_cdmus.c
index 426bc5dc9ebdbf130614725e96fadbba42f6dd2c..12063745b3fa9adef15155d780664eee4dd4a2aa 100644
--- a/src/android/i_cdmus.c
+++ b/src/android/i_cdmus.c
@@ -8,8 +8,8 @@
UINT8 cdaudio_started = 0;
-consvar_t cd_volume = {"cd_volume","18",CV_SAVE,soundvolume_cons_t, NULL, 0, NULL, NULL, 0, 0, NULL};
-consvar_t cdUpdate = {"cd_update","1",CV_SAVE, NULL, NULL, 0, NULL, NULL, 0, 0, NULL};
+consvar_t cd_volume = CVAR_INIT ("cd_volume","18",CV_SAVE,soundvolume_cons_t, NULL);
+consvar_t cdUpdate = CVAR_INIT ("cd_update","1",CV_SAVE, NULL, NULL);
void I_InitCD(void){}
diff --git a/src/android/i_video.c b/src/android/i_video.c
index 1909cd71afbb5e2acf1efdfd5a218b44cef09316..bf0decb74118385ff2b776d8d470e5ea3a03a2ba 100644
--- a/src/android/i_video.c
+++ b/src/android/i_video.c
@@ -9,6 +9,7 @@
#include "utils/Log.h"
rendermode_t rendermode = render_soft;
+rendermode_t chosenrendermode = render_none;
boolean highcolor = false;
@@ -16,7 +17,7 @@ boolean allow_fullscreen = false;
-consvar_t cv_vidwait = {"vid_wait", "On", CV_SAVE, CV_OnOff, NULL, 0, NULL, NULL, 0, 0, NULL};
+consvar_t cv_vidwait = CVAR_INIT ("vid_wait", "On", CV_SAVE, CV_OnOff, NULL);
void I_StartupGraphics(void){}
void I_ShutdownGraphics(void){}
@@ -52,8 +53,15 @@ INT32 VID_SetMode(INT32 modenum)
return 0;
}
-void VID_CheckRenderer(void) {}
-void VID_CheckGLLoaded(rendermode_t oldrender) {}
+boolean VID_CheckRenderer(void)
+{
+ return false;
+}
+
+void VID_CheckGLLoaded(rendermode_t oldrender)
+{
+ (void)oldrender;
+}
const char *VID_GetModeName(INT32 modenum)
{
diff --git a/src/blua/lcode.c b/src/blua/lcode.c
index 5c7fed4541a4442d9d40691663965250de434619..fd4aaff24c33ae99e936497bac797d9bce95b061 100644
--- a/src/blua/lcode.c
+++ b/src/blua/lcode.c
@@ -686,6 +686,15 @@ static void codearith (FuncState *fs, OpCode op, expdesc *e1, expdesc *e2) {
}
+static void codeunaryarith (FuncState *fs, OpCode op, expdesc *e) {
+ expdesc e2;
+ e2.t = e2.f = NO_JUMP; e2.k = VKNUM; e2.u.nval = 0;
+ if (op == OP_LEN || !isnumeral(e))
+ luaK_exp2anyreg(fs, e); /* cannot operate on non-numeric constants */
+ codearith(fs, op, e, &e2);
+}
+
+
static void codecomp (FuncState *fs, OpCode op, int cond, expdesc *e1,
expdesc *e2) {
int o1 = luaK_exp2RK(fs, e1);
@@ -703,27 +712,11 @@ static void codecomp (FuncState *fs, OpCode op, int cond, expdesc *e1,
void luaK_prefix (FuncState *fs, UnOpr op, expdesc *e) {
- expdesc e2;
- e2.t = e2.f = NO_JUMP; e2.k = VKNUM; e2.u.nval = 0;
switch (op) {
- case OPR_MINUS: {
- if (!isnumeral(e))
- luaK_exp2anyreg(fs, e); /* cannot operate on non-numeric constants */
- codearith(fs, OP_UNM, e, &e2);
- break;
- }
- case OPR_BNOT: {
- if (e->k == VK)
- luaK_exp2anyreg(fs, e); /* cannot operate on non-numeric constants */
- codearith(fs, OP_BNOT, e, &e2);
- break;
- }
+ case OPR_MINUS: codeunaryarith(fs, OP_UNM, e); break;
+ case OPR_BNOT: codeunaryarith(fs, OP_BNOT, e); break;
case OPR_NOT: codenot(fs, e); break;
- case OPR_LEN: {
- luaK_exp2anyreg(fs, e); /* cannot operate on constants */
- codearith(fs, OP_LEN, e, &e2);
- break;
- }
+ case OPR_LEN: codeunaryarith(fs, OP_LEN, e); break;
default: lua_assert(0);
}
}
diff --git a/src/blua/liolib.c b/src/blua/liolib.c
index a055aad3f600a4482502da148467bfe622751fe3..5eec97fb4b7b4e5e4f47637b34b0444c1750a334 100644
--- a/src/blua/liolib.c
+++ b/src/blua/liolib.c
@@ -277,6 +277,9 @@ void Got_LuaFile(UINT8 **cp, INT32 playernum)
if (!luafiletransfers)
I_Error("No Lua file transfer\n");
+ lua_settop(gL, 0); // Just in case...
+ lua_pushcfunction(gL, LUA_GetErrorMessage);
+
// Retrieve the callback and push it on the stack
lua_pushfstring(gL, FMT_FILECALLBACKID, luafiletransfers->id);
lua_gettable(gL, LUA_REGISTRYINDEX);
@@ -304,7 +307,8 @@ void Got_LuaFile(UINT8 **cp, INT32 playernum)
lua_pushstring(gL, luafiletransfers->filename);
// Call the callback
- LUA_Call(gL, 2);
+ LUA_Call(gL, 2, 0, 1);
+ lua_settop(gL, 0);
if (success)
{
diff --git a/src/command.c b/src/command.c
index f2a9813e21507095b44a9b95647fcb5d918c41cb..d73cde5c299a2d66dd4e7f42269d2bd267ee71c0 100644
--- a/src/command.c
+++ b/src/command.c
@@ -79,7 +79,7 @@ CV_PossibleValue_t CV_Natural[] = {{1, "MIN"}, {999999999, "MAX"}, {0, NULL}};
// First implementation is 26 (2.1.21), so earlier configs default at 25 (2.1.20)
// Also set CV_HIDEN during runtime, after config is loaded
static boolean execversion_enabled = false;
-consvar_t cv_execversion = {"execversion","25",CV_CALL,CV_Unsigned, CV_EnforceExecVersion, 0, NULL, NULL, 0, 0, NULL};
+consvar_t cv_execversion = CVAR_INIT ("execversion","25",CV_CALL,CV_Unsigned, CV_EnforceExecVersion);
// for default joyaxis detection
static boolean joyaxis_default = false;
@@ -165,6 +165,8 @@ void COM_BufAddTextEx(const char *ptext, int flags)
*/
void COM_BufInsertTextEx(const char *ptext, int flags)
{
+ const INT32 old_wait = com_wait;
+
char *temp = NULL;
size_t templen;
@@ -176,10 +178,14 @@ void COM_BufInsertTextEx(const char *ptext, int flags)
VS_Clear(&com_text);
}
+ com_wait = 0;
+
// add the entire text of the file (or alias)
COM_BufAddTextEx(ptext, flags);
COM_BufExecute(); // do it right away
+ com_wait += old_wait;
+
// add the copied off data
if (templen)
{
@@ -560,7 +566,7 @@ static boolean COM_Exists(const char *com_name)
* \param partial The partial name of the command (potentially).
* \param skips Number of commands to skip.
* \return The complete command name, or NULL.
- * \sa CV_CompleteVar
+ * \sa CV_CompleteAlias, CV_CompleteVar
*/
const char *COM_CompleteCommand(const char *partial, INT32 skips)
{
@@ -581,6 +587,32 @@ const char *COM_CompleteCommand(const char *partial, INT32 skips)
return NULL;
}
+/** Completes the name of an alias.
+ *
+ * \param partial The partial name of the alias (potentially).
+ * \param skips Number of aliases to skip.
+ * \return The complete alias name, or NULL.
+ * \sa CV_CompleteCommand, CV_CompleteVar
+ */
+const char *COM_CompleteAlias(const char *partial, INT32 skips)
+{
+ cmdalias_t *a;
+ size_t len;
+
+ len = strlen(partial);
+
+ if (!len)
+ return NULL;
+
+ // check functions
+ for (a = com_alias; a; a = a->next)
+ if (!strncmp(partial, a->name, len))
+ if (!skips--)
+ return a->name;
+
+ return NULL;
+}
+
/** Parses a single line of text into arguments and tries to execute it.
* The text can come from the command buffer, a remote client, or stdin.
*
@@ -875,6 +907,9 @@ static void COM_Help_f(void)
CONS_Printf(" Current value: %s\n", cvar->string);
else
CONS_Printf(" Current value: %d\n", cvar->value);
+
+ if (cvar->revert.v.string != NULL && strcmp(cvar->revert.v.string, cvar->string) != 0)
+ CONS_Printf(" Value before netgame: %s\n", cvar->revert.v.string);
}
else
{
@@ -1280,6 +1315,7 @@ void CV_RegisterVar(consvar_t *variable)
consvar_vars = variable;
}
variable->string = variable->zstring = NULL;
+ memset(&variable->revert, 0, sizeof variable->revert);
variable->changed = 0; // new variable has not been modified by the user
#ifdef PARANOIA
@@ -1321,7 +1357,7 @@ static const char *CV_StringValue(const char *var_name)
* \param partial The partial name of the variable (potentially).
* \param skips Number of variables to skip.
* \return The complete variable name, or NULL.
- * \sa COM_CompleteCommand
+ * \sa COM_CompleteCommand, CV_CompleteAlias
*/
const char *CV_CompleteVar(char *partial, INT32 skips)
{
@@ -1392,6 +1428,23 @@ static void Setvalue(consvar_t *var, const char *valstr, boolean stealth)
for (i = MAXVAL+1; var->PossibleValue[i].strvalue; i++)
if (v == var->PossibleValue[i].value || !stricmp(var->PossibleValue[i].strvalue, valstr))
{
+ if (client && execversion_enabled)
+ {
+ if (var->revert.allocated)
+ {
+ Z_Free(var->revert.v.string);
+ var->revert.allocated = false; // the below value is not allocated in zone memory, don't try to free it!
+ }
+
+ var->revert.v.const_munge = var->PossibleValue[i].strvalue;
+
+ return;
+ }
+
+ // free the old value string
+ Z_Free(var->zstring);
+ var->zstring = NULL;
+
var->value = var->PossibleValue[i].value;
var->string = var->PossibleValue[i].strvalue;
goto finish;
@@ -1452,12 +1505,31 @@ static void Setvalue(consvar_t *var, const char *valstr, boolean stealth)
// ...or not.
goto badinput;
found:
+ if (client && execversion_enabled)
+ {
+ var->revert.v.const_munge = var->PossibleValue[i].strvalue;
+ return;
+ }
+
var->value = var->PossibleValue[i].value;
var->string = var->PossibleValue[i].strvalue;
goto finish;
}
}
+ if (client && execversion_enabled)
+ {
+ if (var->revert.allocated)
+ {
+ Z_Free(var->revert.v.string);
+ // Z_StrDup creates a new zone memory block, so we can keep the allocated flag on
+ }
+
+ var->revert.v.string = Z_StrDup(valstr);
+
+ return;
+ }
+
// free the old value string
Z_Free(var->zstring);
@@ -1505,7 +1577,7 @@ finish:
}
var->flags |= CV_MODIFIED;
// raise 'on change' code
- LUA_CVarChanged(var->name); // let consolelib know what cvar this is.
+ LUA_CVarChanged(var); // let consolelib know what cvar this is.
if (var->flags & CV_CALL && !stealth)
var->func();
@@ -1676,8 +1748,19 @@ static void CV_LoadVars(UINT8 **p,
serverloading = true;
for (cvar = consvar_vars; cvar; cvar = cvar->next)
+ {
if (cvar->flags & CV_NETVAR)
+ {
+ if (client && cvar->revert.v.string == NULL)
+ {
+ cvar->revert.v.const_munge = cvar->string;
+ cvar->revert.allocated = ( cvar->zstring != NULL );
+ cvar->zstring = NULL;/* don't free this */
+ }
+
Setvalue(cvar, cvar->defaultvalue, true);
+ }
+ }
count = READUINT16(*p);
while (count--)
@@ -1691,6 +1774,27 @@ static void CV_LoadVars(UINT8 **p,
serverloading = false;
}
+void CV_RevertNetVars(void)
+{
+ consvar_t * cvar;
+
+ for (cvar = consvar_vars; cvar; cvar = cvar->next)
+ {
+ if (cvar->revert.v.string != NULL)
+ {
+ Setvalue(cvar, cvar->revert.v.string, false);
+
+ if (cvar->revert.allocated)
+ {
+ Z_Free(cvar->revert.v.string);
+ cvar->revert.allocated = false; // no value being held now
+ }
+
+ cvar->revert.v.string = NULL;
+ }
+ }
+}
+
void CV_LoadNetVars(UINT8 **p)
{
CV_LoadVars(p, ReadNetVar);
@@ -1764,6 +1868,14 @@ static void CV_SetCVar(consvar_t *var, const char *value, boolean stealth)
// send the value of the variable
UINT8 buf[128];
UINT8 *p = buf;
+
+ // Loading from a config in a netgame? Set revert value.
+ if (client && execversion_enabled)
+ {
+ Setvalue(var, value, true);
+ return;
+ }
+
if (!(server || (addedtogame && IsPlayerAdmin(consoleplayer))))
{
CONS_Printf(M_GetText("Only the server or admin can change: %s %s\n"), var->name, var->string);
@@ -2297,18 +2409,43 @@ void CV_SaveVariables(FILE *f)
{
char stringtowrite[MAXTEXTCMD+1];
- // Silly hack for Min/Max vars
- if (!strcmp(cvar->string, "MAX") || !strcmp(cvar->string, "MIN"))
+ const char * string;
+
+ if (cvar->revert.v.string != NULL)
{
- if (cvar->flags & CV_FLOAT)
- sprintf(stringtowrite, "%f", FIXED_TO_FLOAT(cvar->value));
- else
- sprintf(stringtowrite, "%d", cvar->value);
+ string = cvar->revert.v.string;
}
else
- strcpy(stringtowrite, cvar->string);
+ {
+ string = cvar->string;
+ }
+
+ // Silly hack for Min/Max vars
+#define MINVAL 0
+#define MAXVAL 1
+ if (
+ cvar->PossibleValue != NULL &&
+ cvar->PossibleValue[0].strvalue &&
+ stricmp(cvar->PossibleValue[0].strvalue, "MIN") == 0
+ ){ // bounded cvar
+ int which = stricmp(string, "MAX") == 0;
+
+ if (which || stricmp(string, "MIN") == 0)
+ {
+ INT32 value = cvar->PossibleValue[which].value;
+
+ if (cvar->flags & CV_FLOAT)
+ sprintf(stringtowrite, "%f", FIXED_TO_FLOAT(value));
+ else
+ sprintf(stringtowrite, "%d", value);
+
+ string = stringtowrite;
+ }
+ }
+#undef MINVAL
+#undef MAXVAL
- fprintf(f, "%s \"%s\"\n", cvar->name, stringtowrite);
+ fprintf(f, "%s \"%s\"\n", cvar->name, string);
}
}
diff --git a/src/command.h b/src/command.h
index b39153a659802cb4fbb54d489e5bdc883f02dbe5..d4033e6efe963db1523b709de045012f3c381900 100644
--- a/src/command.h
+++ b/src/command.h
@@ -49,6 +49,8 @@ size_t COM_FirstOption(void);
// match existing command or NULL
const char *COM_CompleteCommand(const char *partial, INT32 skips);
+const char *COM_CompleteAlias(const char *partial, INT32 skips);
+
// insert at queu (at end of other command)
#define COM_BufAddText(s) COM_BufAddTextEx(s, 0)
void COM_BufAddTextEx(const char *btext, int flags);
@@ -138,12 +140,26 @@ typedef struct consvar_s //NULL, NULL, 0, NULL, NULL |, 0, NULL, NULL, 0, 0, NUL
const char *string; // value in string
char *zstring; // Either NULL or same as string.
// If non-NULL, must be Z_Free'd later.
+ struct
+ {
+ char allocated; // whether to Z_Free
+ union
+ {
+ char * string;
+ const char * const_munge;
+ } v;
+ } revert; // value of netvar before joining netgame
+
UINT16 netid; // used internaly : netid for send end receive
// used only with CV_NETVAR
char changed; // has variable been changed by the user? 0 = no, 1 = yes
struct consvar_s *next;
} consvar_t;
+/* name, defaultvalue, flags, PossibleValue, func */
+#define CVAR_INIT( ... ) \
+{ __VA_ARGS__, 0, NULL, NULL, {0, {NULL}}, 0U, (char)0, NULL }
+
#ifdef OLD22DEMOCOMPAT
typedef struct old_demo_var old_demo_var_t;
@@ -202,6 +218,9 @@ void CV_SaveVars(UINT8 **p, boolean in_demo);
#define CV_SaveNetVars(p) CV_SaveVars(p, false)
void CV_LoadNetVars(UINT8 **p);
+// then revert after leaving a netgame
+void CV_RevertNetVars(void);
+
#define CV_SaveDemoVars(p) CV_SaveVars(p, true)
void CV_LoadDemoVars(UINT8 **p);
diff --git a/src/config.h.in b/src/config.h.in
index a6f43a7d7b6ab1df4f2abc00e110b97c4290a0cd..db794cccc82a59eb378f53f9adaa4d5d1bd3cb20 100644
--- a/src/config.h.in
+++ b/src/config.h.in
@@ -34,12 +34,13 @@
* Last updated 2020 / 07 / 10 - v2.2.6 - player.dta & patch.pk3
* Last updated 2020 / 09 / 27 - v2.2.7 - patch.pk3
* Last updated 2020 / 10 / 02 - v2.2.8 - patch.pk3
+ * Last updated 2021 / 05 / 06 - v2.2.9 - patch.pk3 & zones.pk3
*/
#define ASSET_HASH_SRB2_PK3 "0277c9416756627004e83cbb5b2e3e28"
-#define ASSET_HASH_ZONES_PK3 "f7e88afb6af7996a834c7d663144bead"
+#define ASSET_HASH_ZONES_PK3 "f8f3e2b5deacf40f14e36686a07d44bb"
#define ASSET_HASH_PLAYER_DTA "49dad7b24634c89728cc3e0b689e12bb"
#ifdef USE_PATCH_DTA
-#define ASSET_HASH_PATCH_PK3 "466cdf60075262b3f5baa5e07f0999e8"
+#define ASSET_HASH_PATCH_PK3 "7d467a883f7887b3c311798ee2f56b6a"
#endif
#endif
diff --git a/src/console.c b/src/console.c
index f3b0aa6034db0ad11f83a3f6beebb4dbfbdf0e11..1560220f6ecc257cd6cacd20cc25fb83534e152c 100644
--- a/src/console.c
+++ b/src/console.c
@@ -56,7 +56,8 @@ I_mutex con_mutex;
#endif/*HAVE_THREADS*/
static boolean con_started = false; // console has been initialised
- boolean con_startup = false; // true at game startup, screen need refreshing
+ boolean con_startup = false; // true at game startup
+ boolean con_refresh = false; // screen needs refreshing
static boolean con_forcepic = true; // at startup toggle console translucency when first off
boolean con_recalc; // set true when screen size has changed
@@ -124,22 +125,22 @@ static void CONS_backcolor_Change(void);
static char con_buffer[CON_BUFFERSIZE];
// how many seconds the hud messages lasts on the screen
-static consvar_t cons_msgtimeout = {"con_hudtime", "5", CV_SAVE, CV_Unsigned, NULL, 0, NULL, NULL, 0, 0, NULL};
+static consvar_t cons_msgtimeout = CVAR_INIT ("con_hudtime", "5", CV_SAVE, CV_Unsigned, NULL);
// number of lines displayed on the HUD
-static consvar_t cons_hudlines = {"con_hudlines", "5", CV_CALL|CV_SAVE, CV_Unsigned, CONS_hudlines_Change, 0, NULL, NULL, 0, 0, NULL};
+static consvar_t cons_hudlines = CVAR_INIT ("con_hudlines", "5", CV_CALL|CV_SAVE, CV_Unsigned, CONS_hudlines_Change);
// number of lines console move per frame
// (con_speed needs a limit, apparently)
static CV_PossibleValue_t speed_cons_t[] = {{0, "MIN"}, {64, "MAX"}, {0, NULL}};
-static consvar_t cons_speed = {"con_speed", "8", CV_SAVE, speed_cons_t, NULL, 0, NULL, NULL, 0, 0, NULL};
+static consvar_t cons_speed = CVAR_INIT ("con_speed", "8", CV_SAVE, speed_cons_t, NULL);
// percentage of screen height to use for console
-static consvar_t cons_height = {"con_height", "50", CV_SAVE, CV_Unsigned, NULL, 0, NULL, NULL, 0, 0, NULL};
+static consvar_t cons_height = CVAR_INIT ("con_height", "50", CV_SAVE, CV_Unsigned, NULL);
static CV_PossibleValue_t backpic_cons_t[] = {{0, "translucent"}, {1, "picture"}, {0, NULL}};
// whether to use console background picture, or translucent mode
-static consvar_t cons_backpic = {"con_backpic", "translucent", CV_SAVE, backpic_cons_t, NULL, 0, NULL, NULL, 0, 0, NULL};
+static consvar_t cons_backpic = CVAR_INIT ("con_backpic", "translucent", CV_SAVE, backpic_cons_t, NULL);
static CV_PossibleValue_t backcolor_cons_t[] = {{0, "White"}, {1, "Black"}, {2, "Sepia"},
{3, "Brown"}, {4, "Pink"}, {5, "Raspberry"},
@@ -151,7 +152,7 @@ static CV_PossibleValue_t backcolor_cons_t[] = {{0, "White"}, {1, "Black"}, {
{0, NULL}};
-consvar_t cons_backcolor = {"con_backcolor", "Green", CV_CALL|CV_SAVE, backcolor_cons_t, CONS_backcolor_Change, 0, NULL, NULL, 0, 0, NULL};
+consvar_t cons_backcolor = CVAR_INIT ("con_backcolor", "Green", CV_CALL|CV_SAVE, backcolor_cons_t, CONS_backcolor_Change);
static void CON_Print(char *msg);
@@ -359,30 +360,48 @@ static void CON_SetupColormaps(void)
for (i = 0; i < (256*15); i++, ++memorysrc)
*memorysrc = (UINT8)(i & 0xFF); // remap each color to itself...
-#define colset(map, a, b, c) \
- map[1] = (UINT8)a;\
- map[3] = (UINT8)b;\
- map[9] = (UINT8)c
-
- colset(magentamap, 177, 178, 184);
- colset(yellowmap, 82, 73, 66);
- colset(lgreenmap, 97, 98, 106);
- colset(bluemap, 146, 147, 155);
- colset(redmap, 210, 32, 39);
- colset(graymap, 6, 8, 14);
- colset(orangemap, 51, 52, 57);
- colset(skymap, 129, 130, 133);
- colset(purplemap, 160, 161, 163);
- colset(aquamap, 120, 121, 123);
- colset(peridotmap, 88, 188, 190);
- colset(azuremap, 144, 145, 170);
- colset(brownmap, 219, 221, 224);
- colset(rosymap, 200, 201, 203);
- colset(invertmap, 27, 26, 22);
- invertmap[26] = (UINT8)3;
+#define colset(map, a, b, c, d, e, f, g, h, i, j, k, l, m, n, o, p) \
+ map[0x0] = (UINT8)a;\
+ map[0x1] = (UINT8)b;\
+ map[0x2] = (UINT8)c;\
+ map[0x3] = (UINT8)d;\
+ map[0x4] = (UINT8)e;\
+ map[0x5] = (UINT8)f;\
+ map[0x6] = (UINT8)g;\
+ map[0x7] = (UINT8)h;\
+ map[0x8] = (UINT8)i;\
+ map[0x9] = (UINT8)j;\
+ map[0xA] = (UINT8)k;\
+ map[0xB] = (UINT8)l;\
+ map[0xC] = (UINT8)m;\
+ map[0xD] = (UINT8)n;\
+ map[0xE] = (UINT8)o;\
+ map[0xF] = (UINT8)p;
+
+ // Tried to keep the colors vanilla while adding some shades in between them ~SonicX8000
+
+ // 0x1 0x3 0x9 0xF
+ colset(magentamap, 177, 177, 178, 178, 178, 180, 180, 180, 182, 182, 182, 182, 184, 184, 184, 185);
+ colset(yellowmap, 82, 82, 73, 73, 73, 64, 64, 64, 66, 66, 66, 66, 67, 67, 67, 68);
+ colset(lgreenmap, 96, 96, 98, 98, 98, 101, 101, 101, 104, 104, 104, 104, 106, 106, 106, 107);
+ colset(bluemap, 146, 146, 147, 147, 147, 149, 149, 149, 152, 152, 152, 152, 155, 155, 155, 157);
+ colset(redmap, 32, 32, 33, 33, 33, 35, 35, 35, 39, 39, 39, 39, 42, 42, 42, 44);
+ colset(graymap, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23);
+ colset(orangemap, 50, 50, 52, 52, 52, 54, 54, 54, 56, 56, 56, 56, 59, 59, 59, 60);
+ colset(skymap, 129, 129, 130, 130, 130, 131, 131, 131, 133, 133, 133, 133, 135, 135, 135, 136);
+ colset(purplemap, 160, 160, 161, 161, 161, 162, 162, 162, 163, 163, 163, 163, 164, 164, 164, 165);
+ colset(aquamap, 120, 120, 121, 121, 121, 122, 122, 122, 123, 123, 123, 123, 124, 124, 124, 125);
+ colset(peridotmap, 72, 72, 188, 188, 189, 189, 189, 189, 190, 190, 190, 190, 191, 191, 191, 94);
+ colset(azuremap, 144, 144, 145, 145, 145, 146, 146, 146, 170, 170, 170, 170, 171, 171, 171, 172);
+ colset(brownmap, 219, 219, 221, 221, 221, 222, 222, 222, 224, 224, 224, 224, 227, 227, 227, 229);
+ colset(rosymap, 200, 200, 201, 201, 201, 202, 202, 202, 203, 203, 203, 203, 204, 204, 204, 205);
#undef colset
+ // Yeah just straight up invert it like a normal person
+ for (i = 0x00; i <= 0x1F; i++)
+ invertmap[0x1F - i] = i;
+
// Init back colormap
CON_SetupBackColormap();
}
@@ -439,7 +458,8 @@ void CON_Init(void)
Lock_state();
con_started = true;
- con_startup = true; // need explicit screen refresh until we are in Doom loop
+ con_startup = true;
+ con_refresh = true; // needs explicit screen refresh until we are in the main game loop
consoletoggle = false;
Unlock_state();
@@ -457,7 +477,8 @@ void CON_Init(void)
Lock_state();
con_started = true;
- con_startup = false; // need explicit screen refresh until we are in Doom loop
+ con_startup = false;
+ con_refresh = false; // disable explicit screen refresh
consoletoggle = true;
Unlock_state();
@@ -805,6 +826,12 @@ static void CON_InputDelSelection(void)
Lock_state();
+ if (!input_cur)
+ {
+ Unlock_state();
+ return;
+ }
+
if (input_cur > input_sel)
{
start = input_sel;
@@ -870,9 +897,14 @@ boolean CON_Responder(event_t *ev)
// sequential completions a la 4dos
static char completion[80];
- static INT32 comskips, varskips;
- const char *cmd = "";
+ static INT32 skips;
+
+ static INT32 com_skips;
+ static INT32 var_skips;
+ static INT32 alias_skips;
+
+ const char *cmd = NULL;
INT32 key;
if (chat_on)
@@ -1007,7 +1039,6 @@ boolean CON_Responder(event_t *ev)
if (!input_len || input_len >= 40 || strchr(inputlines[inputline], ' '))
return true;
strcpy(completion, inputlines[inputline]);
- comskips = varskips = 0;
}
len = strlen(completion);
@@ -1023,6 +1054,14 @@ boolean CON_Responder(event_t *ev)
CONS_Printf(" \x83" "%s" "\x80" "%s\n", completion, cmd+len);
if (i == 0) CONS_Printf(" (none)\n");
+ //and finally aliases
+ CONS_Printf("Aliases:\n");
+ for (i = 0, cmd = COM_CompleteAlias(completion, i); cmd; cmd = COM_CompleteAlias(completion, ++i))
+ CONS_Printf(" \x83" "%s" "\x80" "%s\n", completion, cmd+len);
+ if (i == 0) CONS_Printf(" (none)\n");
+
+ completion[0] = 0;
+
return true;
}
// ---
@@ -1091,43 +1130,64 @@ boolean CON_Responder(event_t *ev)
if (!input_len || input_len >= 40 || strchr(inputlines[inputline], ' '))
return true;
strcpy(completion, inputlines[inputline]);
- comskips = varskips = 0;
+ skips = 0;
+ com_skips = 0;
+ var_skips = 0;
+ alias_skips = 0;
}
else
{
if (shiftdown)
{
- if (comskips < 0)
- {
- if (--varskips < 0)
- comskips = -comskips - 2;
- }
- else if (comskips > 0) comskips--;
+ if (skips > 0)
+ skips--;
}
else
{
- if (comskips < 0) varskips++;
- else comskips++;
+ skips++;
+ }
+ }
+
+ if (skips <= com_skips)
+ {
+ cmd = COM_CompleteCommand(completion, skips);
+
+ if (cmd && skips == com_skips)
+ {
+ com_skips ++;
+ var_skips ++;
+ alias_skips++;
}
}
- if (comskips >= 0)
+ if (!cmd && skips <= var_skips)
{
- cmd = COM_CompleteCommand(completion, comskips);
- if (!cmd) // dirty: make sure if comskips is zero, to have a neg value
- comskips = -comskips - 1;
+ cmd = CV_CompleteVar(completion, skips - com_skips);
+
+ if (cmd && skips == var_skips)
+ {
+ var_skips ++;
+ alias_skips++;
+ }
+ }
+
+ if (!cmd && skips <= alias_skips)
+ {
+ cmd = COM_CompleteAlias(completion, skips - var_skips);
+
+ if (cmd && skips == alias_skips)
+ {
+ alias_skips++;
+ }
}
- if (comskips < 0)
- cmd = CV_CompleteVar(completion, varskips);
if (cmd)
+ {
CON_InputSetString(va("%s ", cmd));
+ }
else
{
- if (comskips > 0)
- comskips--;
- else if (varskips > 0)
- varskips--;
+ skips--;
}
return true;
@@ -1243,10 +1303,6 @@ boolean CON_Responder(event_t *ev)
if (key < 32 || key > 127)
return true;
- // add key to cmd line here
- if (key >= 'A' && key <= 'Z' && !(shiftdown ^ capslock)) //this is only really necessary for dedicated servers
- key = key + 'a' - 'A';
-
if (input_sel != input_cur)
CON_InputDelSelection();
CON_InputAddChar(key);
@@ -1405,7 +1461,7 @@ void CONS_Printf(const char *fmt, ...)
{
va_list argptr;
static char *txt = NULL;
- boolean startup;
+ boolean refresh;
if (txt == NULL)
txt = malloc(8192);
@@ -1427,26 +1483,15 @@ void CONS_Printf(const char *fmt, ...)
// make sure new text is visible
con_scrollup = 0;
- startup = con_startup;
+ refresh = con_refresh;
Unlock_state();
// if not in display loop, force screen update
- if (startup && (!setrenderneeded))
+ if (refresh)
{
-#ifdef _WINDOWS
- patch_t *con_backpic = W_CachePatchName("CONSBACK", PU_PATCH);
-
- // Jimita: CON_DrawBackpic just called V_DrawScaledPatch
- V_DrawScaledPatch(0, 0, 0, con_backpic);
-
- W_UnlockCachedPatch(con_backpic);
- I_LoadingScreen(txt); // Win32/OS2 only
-#else
- // here we display the console text
- CON_Drawer();
+ CON_Drawer(); // here we display the console text
I_FinishUpdate(); // page flip or blit buffer
-#endif
}
}
@@ -1508,7 +1553,7 @@ void CONS_Debug(INT32 debugflags, const char *fmt, ...)
//
void CONS_Error(const char *msg)
{
-#ifdef RPC_NO_WINDOWS_H
+#if defined(RPC_NO_WINDOWS_H) && defined(_WINDOWS)
if (!graphics_started)
{
MessageBoxA(vid.WndParent, msg, "SRB2 Warning", MB_OK);
@@ -1657,7 +1702,7 @@ static void CON_DrawHudlines(void)
;//charwidth = 4 * con_scalefactor;
else
{
- //charwidth = SHORT(hu_font['A'-HU_FONTSTART]->width) * con_scalefactor;
+ //charwidth = (hu_font['A'-HU_FONTSTART]->width) * con_scalefactor;
V_DrawCharacter(x, y, (INT32)(*p) | charflags | cv_constextsize.value | V_NOSCALESTART, true);
}
}
@@ -1686,8 +1731,8 @@ static void CON_DrawBackpic(void)
if (piclump == LUMPERROR)
piclump = W_GetNumForName("MISSING");
- // Cache the Software patch.
- con_backpic = W_CacheSoftwarePatchNum(piclump, PU_PATCH);
+ // Cache the patch.
+ con_backpic = W_CachePatchNum(piclump, PU_PATCH);
// Center the backpic, and draw a vertically cropped patch.
w = (con_backpic->width * vid.dupx);
@@ -1698,7 +1743,7 @@ static void CON_DrawBackpic(void)
// then fill the sides with a solid color.
if (x > 0)
{
- column_t *column = (column_t *)((UINT8 *)(con_backpic) + LONG(con_backpic->columnofs[0]));
+ column_t *column = (column_t *)((UINT8 *)(con_backpic->columns) + (con_backpic->columnofs[0]));
if (!column->topdelta)
{
UINT8 *source = (UINT8 *)(column) + 3;
@@ -1710,8 +1755,7 @@ static void CON_DrawBackpic(void)
}
}
- // Cache the patch normally.
- con_backpic = W_CachePatchNum(piclump, PU_PATCH);
+ // Draw the patch.
V_DrawCroppedPatch(x << FRACBITS, 0, FRACUNIT, V_NOSCALESTART, con_backpic,
0, ( BASEVIDHEIGHT - h ), BASEVIDWIDTH, h);
@@ -1796,9 +1840,6 @@ void CON_Drawer(void)
return;
}
- if (needpatchrecache)
- HU_LoadGraphics();
-
if (con_recalc)
{
CON_RecalcSize();
diff --git a/src/console.h b/src/console.h
index c8dd9e3de4485b3ce75eb5b1ecef05237e889f95..0296f4f6e658e82a01d78a2ae05f636d90e411ed 100644
--- a/src/console.h
+++ b/src/console.h
@@ -25,8 +25,12 @@ extern I_mutex con_mutex;
// set true when screen size has changed, to adapt console
extern boolean con_recalc;
+// console being displayed at game startup
extern boolean con_startup;
+// needs explicit screen refresh until we are in the main game loop
+extern boolean con_refresh;
+
// top clip value for view render: do not draw part of view hidden by console
extern INT32 con_clipviewtop;
diff --git a/src/d_clisrv.c b/src/d_clisrv.c
index 36e607d45731034dae3ca7efc0a5c6c42cad15ad..911a91355d94694beb1c788e90a8085d7d94636f 100644
--- a/src/d_clisrv.c
+++ b/src/d_clisrv.c
@@ -44,6 +44,7 @@
#include "lua_script.h"
#include "lua_hook.h"
#include "md5.h"
+#include "m_perfstats.h"
#ifndef NONET
// cl loading screen
@@ -83,6 +84,8 @@ char playeraddress[MAXPLAYERS][64];
// The actual timeout will be longer depending on the savegame length
tic_t jointimeout = (10*TICRATE);
static boolean sendingsavegame[MAXNETNODES]; // Are we sending the savegame?
+static boolean resendingsavegame[MAXNETNODES]; // Are we resending the savegame?
+static tic_t savegameresendcooldown[MAXNETNODES]; // How long before we can resend again?
static tic_t freezetimeout[MAXNETNODES]; // Until when can this node freeze the server before getting a timeout?
// Incremented by cv_joindelay when a client joins, decremented each tic.
@@ -106,15 +109,8 @@ static tic_t maketic;
static INT16 consistancy[BACKUPTICS];
-// Resynching shit!
-static UINT32 resynch_score[MAXNETNODES]; // "score" for kicking -- if this gets too high then cfail kick
-static UINT16 resynch_delay[MAXNETNODES]; // delay time before the player can be considered to have desynched
-static UINT32 resynch_status[MAXNETNODES]; // 0 bit means synched for that player, 1 means possibly desynched
-static UINT8 resynch_sent[MAXNETNODES][MAXPLAYERS]; // what synch packets have we attempted to send to the player
-static UINT8 resynch_inprogress[MAXNETNODES];
-static UINT8 resynch_local_inprogress = false; // WE are desynched and getting packets to fix it.
static UINT8 player_joining = false;
-UINT8 hu_resynching = 0;
+UINT8 hu_redownloadinggamestate = 0;
UINT8 adminpassmd5[16];
boolean adminpasswordset = false;
@@ -125,6 +121,7 @@ static ticcmd_t localcmds2;
static boolean cl_packetmissed;
// here it is for the secondary local player (splitscreen)
static UINT8 mynode; // my address pointofview server
+static boolean cl_redownloadinggamestate = false;
static UINT8 localtextcmd[MAXTEXTCMD];
static UINT8 localtextcmd2[MAXTEXTCMD]; // splitscreen
@@ -157,10 +154,10 @@ ticcmd_t netcmds[BACKUPTICS][MAXPLAYERS];
static textcmdtic_t *textcmds[TEXTCMD_HASH_SIZE] = {NULL};
-consvar_t cv_showjoinaddress = {"showjoinaddress", "Off", CV_SAVE, CV_OnOff, NULL, 0, NULL, NULL, 0, 0, NULL};
+consvar_t cv_showjoinaddress = CVAR_INIT ("showjoinaddress", "Off", CV_SAVE|CV_NETVAR, CV_OnOff, NULL);
static CV_PossibleValue_t playbackspeed_cons_t[] = {{1, "MIN"}, {10, "MAX"}, {0, NULL}};
-consvar_t cv_playbackspeed = {"playbackspeed", "1", 0, playbackspeed_cons_t, NULL, 0, NULL, NULL, 0, 0, NULL};
+consvar_t cv_playbackspeed = CVAR_INIT ("playbackspeed", "1", 0, playbackspeed_cons_t, NULL);
static inline void *G_DcpyTiccmd(void* dest, const ticcmd_t* src, const size_t n)
{
@@ -508,603 +505,6 @@ void ReadLmpExtraData(UINT8 **demo_pointer, INT32 playernum)
// end extra data function for lmps
// -----------------------------------------------------------------
-// -----------------------------------------------------------------
-// resynch player data
-// -----------------------------------------------------------------
-static inline void resynch_write_player(resynch_pak *rsp, const size_t i)
-{
- size_t j;
-
- rsp->playernum = (UINT8)i;
-
- // Do not send anything visual related.
- // Only send data that we need to know for physics.
- rsp->playerstate = (UINT8)players[i].playerstate; //playerstate_t
- rsp->pflags = (UINT32)LONG(players[i].pflags); //pflags_t
- rsp->panim = (UINT8)players[i].panim; //panim_t
-
- rsp->angleturn = (INT16)SHORT(players[i].angleturn);
- rsp->oldrelangleturn = (INT16)SHORT(players[i].oldrelangleturn);
-
- rsp->aiming = (angle_t)LONG(players[i].aiming);
- rsp->currentweapon = LONG(players[i].currentweapon);
- rsp->ringweapons = LONG(players[i].ringweapons);
-
- rsp->ammoremoval = (UINT16)SHORT(players[i].ammoremoval);
- rsp->ammoremovaltimer = (tic_t)LONG(players[i].ammoremovaltimer);
- rsp->ammoremovalweapon = LONG(players[i].ammoremovalweapon);
-
- for (j = 0; j < NUMPOWERS; ++j)
- rsp->powers[j] = (UINT16)SHORT(players[i].powers[j]);
-
- // Score is resynched in the rspfirm resync packet
- rsp->rings = SHORT(players[i].rings);
- rsp->spheres = SHORT(players[i].spheres);
- rsp->lives = players[i].lives;
- rsp->continues = players[i].continues;
- rsp->scoreadd = players[i].scoreadd;
- rsp->xtralife = players[i].xtralife;
- rsp->pity = players[i].pity;
-
- rsp->skincolor = players[i].skincolor;
- rsp->skin = LONG(players[i].skin);
- rsp->availabilities = LONG(players[i].availabilities);
- // Just in case Lua does something like
- // modify these at runtime
- rsp->camerascale = (fixed_t)LONG(players[i].camerascale);
- rsp->shieldscale = (fixed_t)LONG(players[i].shieldscale);
- rsp->normalspeed = (fixed_t)LONG(players[i].normalspeed);
- rsp->runspeed = (fixed_t)LONG(players[i].runspeed);
- rsp->thrustfactor = players[i].thrustfactor;
- rsp->accelstart = players[i].accelstart;
- rsp->acceleration = players[i].acceleration;
- rsp->charability = players[i].charability;
- rsp->charability2 = players[i].charability2;
- rsp->charflags = (UINT32)LONG(players[i].charflags);
- rsp->thokitem = (UINT32)LONG(players[i].thokitem); //mobjtype_t
- rsp->spinitem = (UINT32)LONG(players[i].spinitem); //mobjtype_t
- rsp->revitem = (UINT32)LONG(players[i].revitem); //mobjtype_t
- rsp->followitem = (UINT32)LONG(players[i].followitem); //mobjtype_t
- rsp->actionspd = (fixed_t)LONG(players[i].actionspd);
- rsp->mindash = (fixed_t)LONG(players[i].mindash);
- rsp->maxdash = (fixed_t)LONG(players[i].maxdash);
- rsp->jumpfactor = (fixed_t)LONG(players[i].jumpfactor);
- rsp->playerheight = (fixed_t)LONG(players[i].height);
- rsp->playerspinheight = (fixed_t)LONG(players[i].spinheight);
-
- rsp->speed = (fixed_t)LONG(players[i].speed);
- rsp->secondjump = players[i].secondjump;
- rsp->fly1 = players[i].fly1;
- rsp->glidetime = (tic_t)LONG(players[i].glidetime);
- rsp->climbing = players[i].climbing;
- rsp->deadtimer = players[i].deadtimer;
- rsp->exiting = (tic_t)LONG(players[i].exiting);
- rsp->homing = players[i].homing;
- rsp->dashmode = (tic_t)LONG(players[i].dashmode);
- rsp->skidtime = (tic_t)LONG(players[i].skidtime);
- rsp->cmomx = (fixed_t)LONG(players[i].cmomx);
- rsp->cmomy = (fixed_t)LONG(players[i].cmomy);
- rsp->rmomx = (fixed_t)LONG(players[i].rmomx);
- rsp->rmomy = (fixed_t)LONG(players[i].rmomy);
-
- rsp->weapondelay = LONG(players[i].weapondelay);
- rsp->tossdelay = LONG(players[i].tossdelay);
-
- rsp->starpostx = SHORT(players[i].starpostx);
- rsp->starposty = SHORT(players[i].starposty);
- rsp->starpostz = SHORT(players[i].starpostz);
- rsp->starpostnum = LONG(players[i].starpostnum);
- rsp->starposttime = (tic_t)LONG(players[i].starposttime);
- rsp->starpostangle = (angle_t)LONG(players[i].starpostangle);
- rsp->starpostscale = (fixed_t)LONG(players[i].starpostscale);
-
- rsp->maxlink = LONG(players[i].maxlink);
- rsp->dashspeed = (fixed_t)LONG(players[i].dashspeed);
- rsp->angle_pos = (angle_t)LONG(players[i].angle_pos);
- rsp->old_angle_pos = (angle_t)LONG(players[i].old_angle_pos);
- rsp->bumpertime = (tic_t)LONG(players[i].bumpertime);
- rsp->flyangle = LONG(players[i].flyangle);
- rsp->drilltimer = (tic_t)LONG(players[i].drilltimer);
- rsp->linkcount = LONG(players[i].linkcount);
- rsp->linktimer = (tic_t)LONG(players[i].linktimer);
- rsp->anotherflyangle = LONG(players[i].anotherflyangle);
- rsp->nightstime = (tic_t)LONG(players[i].nightstime);
- rsp->drillmeter = LONG(players[i].drillmeter);
- rsp->drilldelay = players[i].drilldelay;
- rsp->bonustime = players[i].bonustime;
- rsp->mare = players[i].mare;
- rsp->lastsidehit = SHORT(players[i].lastsidehit);
- rsp->lastlinehit = SHORT(players[i].lastlinehit);
-
- rsp->losstime = (tic_t)LONG(players[i].losstime);
- rsp->timeshit = players[i].timeshit;
- rsp->onconveyor = LONG(players[i].onconveyor);
-
- rsp->hasmo = false;
- //Transfer important mo information if the player has a body.
- //This lets us resync players even if they are dead.
- if (!players[i].mo)
- return;
- rsp->hasmo = true;
-
- rsp->health = LONG(players[i].mo->health);
- rsp->angle = (angle_t)LONG(players[i].mo->angle);
- rsp->rollangle = (angle_t)LONG(players[i].mo->rollangle);
- rsp->x = LONG(players[i].mo->x);
- rsp->y = LONG(players[i].mo->y);
- rsp->z = LONG(players[i].mo->z);
- rsp->momx = LONG(players[i].mo->momx);
- rsp->momy = LONG(players[i].mo->momy);
- rsp->momz = LONG(players[i].mo->momz);
- rsp->friction = LONG(players[i].mo->friction);
- rsp->movefactor = LONG(players[i].mo->movefactor);
-
- rsp->sprite = (spritenum_t)LONG(players[i].mo->sprite);
- rsp->frame = LONG(players[i].mo->frame);
- rsp->sprite2 = players[i].mo->sprite2;
- rsp->anim_duration = SHORT(players[i].mo->anim_duration);
- rsp->tics = LONG(players[i].mo->tics);
- rsp->statenum = (statenum_t)LONG(players[i].mo->state-states); // :(
- rsp->eflags = (UINT16)SHORT(players[i].mo->eflags);
- rsp->flags = LONG(players[i].mo->flags);
- rsp->flags2 = LONG(players[i].mo->flags2);
-
- rsp->radius = LONG(players[i].mo->radius);
- rsp->height = LONG(players[i].mo->height);
- rsp->scale = LONG(players[i].mo->scale);
- rsp->destscale = LONG(players[i].mo->destscale);
- rsp->scalespeed = LONG(players[i].mo->scalespeed);
-}
-
-static void resynch_read_player(resynch_pak *rsp)
-{
- INT32 i = rsp->playernum, j;
- mobj_t *savedmo = players[i].mo;
-
- // Do not send anything visual related.
- // Only send data that we need to know for physics.
- players[i].playerstate = (UINT8)rsp->playerstate; //playerstate_t
- players[i].pflags = (UINT32)LONG(rsp->pflags); //pflags_t
- players[i].panim = (UINT8)rsp->panim; //panim_t
-
- players[i].angleturn = (INT16)SHORT(rsp->angleturn);
- players[i].oldrelangleturn = (INT16)SHORT(rsp->oldrelangleturn);
-
- players[i].aiming = (angle_t)LONG(rsp->aiming);
- players[i].currentweapon = LONG(rsp->currentweapon);
- players[i].ringweapons = LONG(rsp->ringweapons);
-
- players[i].ammoremoval = (UINT16)SHORT(rsp->ammoremoval);
- players[i].ammoremovaltimer = (tic_t)LONG(rsp->ammoremovaltimer);
- players[i].ammoremovalweapon = LONG(rsp->ammoremovalweapon);
-
- for (j = 0; j < NUMPOWERS; ++j)
- players[i].powers[j] = (UINT16)SHORT(rsp->powers[j]);
-
- // Score is resynched in the rspfirm resync packet
- players[i].rings = SHORT(rsp->rings);
- players[i].spheres = SHORT(rsp->spheres);
- players[i].lives = rsp->lives;
- players[i].continues = rsp->continues;
- players[i].scoreadd = rsp->scoreadd;
- players[i].xtralife = rsp->xtralife;
- players[i].pity = rsp->pity;
-
- players[i].skincolor = rsp->skincolor;
- players[i].skin = LONG(rsp->skin);
- players[i].availabilities = LONG(rsp->availabilities);
- // Just in case Lua does something like
- // modify these at runtime
- players[i].camerascale = (fixed_t)LONG(rsp->camerascale);
- players[i].shieldscale = (fixed_t)LONG(rsp->shieldscale);
- players[i].normalspeed = (fixed_t)LONG(rsp->normalspeed);
- players[i].runspeed = (fixed_t)LONG(rsp->runspeed);
- players[i].thrustfactor = rsp->thrustfactor;
- players[i].accelstart = rsp->accelstart;
- players[i].acceleration = rsp->acceleration;
- players[i].charability = rsp->charability;
- players[i].charability2 = rsp->charability2;
- players[i].charflags = (UINT32)LONG(rsp->charflags);
- players[i].thokitem = (UINT32)LONG(rsp->thokitem); //mobjtype_t
- players[i].spinitem = (UINT32)LONG(rsp->spinitem); //mobjtype_t
- players[i].revitem = (UINT32)LONG(rsp->revitem); //mobjtype_t
- players[i].followitem = (UINT32)LONG(rsp->followitem); //mobjtype_t
- players[i].actionspd = (fixed_t)LONG(rsp->actionspd);
- players[i].mindash = (fixed_t)LONG(rsp->mindash);
- players[i].maxdash = (fixed_t)LONG(rsp->maxdash);
- players[i].jumpfactor = (fixed_t)LONG(rsp->jumpfactor);
- players[i].height = (fixed_t)LONG(rsp->playerheight);
- players[i].spinheight = (fixed_t)LONG(rsp->playerspinheight);
-
- players[i].speed = (fixed_t)LONG(rsp->speed);
- players[i].secondjump = rsp->secondjump;
- players[i].fly1 = rsp->fly1;
- players[i].glidetime = (tic_t)LONG(rsp->glidetime);
- players[i].climbing = rsp->climbing;
- players[i].deadtimer = rsp->deadtimer;
- players[i].exiting = (tic_t)LONG(rsp->exiting);
- players[i].homing = rsp->homing;
- players[i].dashmode = (tic_t)LONG(rsp->dashmode);
- players[i].skidtime = (tic_t)LONG(rsp->skidtime);
- players[i].cmomx = (fixed_t)LONG(rsp->cmomx);
- players[i].cmomy = (fixed_t)LONG(rsp->cmomy);
- players[i].rmomx = (fixed_t)LONG(rsp->rmomx);
- players[i].rmomy = (fixed_t)LONG(rsp->rmomy);
-
- players[i].weapondelay = LONG(rsp->weapondelay);
- players[i].tossdelay = LONG(rsp->tossdelay);
-
- players[i].starpostx = SHORT(rsp->starpostx);
- players[i].starposty = SHORT(rsp->starposty);
- players[i].starpostz = SHORT(rsp->starpostz);
- players[i].starpostnum = LONG(rsp->starpostnum);
- players[i].starposttime = (tic_t)LONG(rsp->starposttime);
- players[i].starpostangle = (angle_t)LONG(rsp->starpostangle);
- players[i].starpostscale = (fixed_t)LONG(rsp->starpostscale);
-
- players[i].maxlink = LONG(rsp->maxlink);
- players[i].dashspeed = (fixed_t)LONG(rsp->dashspeed);
- players[i].angle_pos = (angle_t)LONG(rsp->angle_pos);
- players[i].old_angle_pos = (angle_t)LONG(rsp->old_angle_pos);
- players[i].bumpertime = (tic_t)LONG(rsp->bumpertime);
- players[i].flyangle = LONG(rsp->flyangle);
- players[i].drilltimer = (tic_t)LONG(rsp->drilltimer);
- players[i].linkcount = LONG(rsp->linkcount);
- players[i].linktimer = (tic_t)LONG(rsp->linktimer);
- players[i].anotherflyangle = LONG(rsp->anotherflyangle);
- players[i].nightstime = (tic_t)LONG(rsp->nightstime);
- players[i].drillmeter = LONG(rsp->drillmeter);
- players[i].drilldelay = rsp->drilldelay;
- players[i].bonustime = rsp->bonustime;
- players[i].mare = rsp->mare;
- players[i].lastsidehit = SHORT(rsp->lastsidehit);
- players[i].lastlinehit = SHORT(rsp->lastlinehit);
-
- players[i].losstime = (tic_t)LONG(rsp->losstime);
- players[i].timeshit = rsp->timeshit;
- players[i].onconveyor = LONG(rsp->onconveyor);
-
- //We get a packet for each player in game.
- if (!playeringame[i])
- return;
-
- //...but keep old mo even if it is corrupt or null!
- players[i].mo = savedmo;
-
- //Transfer important mo information if they have a valid mo.
- if (!rsp->hasmo)
- return;
-
- //server thinks player has a body.
- //Give them a new body that can be then manipulated by the server's info.
- if (!players[i].mo) //client thinks it has no body.
- P_SpawnPlayer(i);
-
- //At this point, the player should have a body, whether they were respawned or not.
- P_UnsetThingPosition(players[i].mo);
- players[i].mo->angle = (angle_t)LONG(rsp->angle);
- players[i].mo->rollangle = (angle_t)LONG(rsp->rollangle);
- players[i].mo->eflags = (UINT16)SHORT(rsp->eflags);
- players[i].mo->flags = LONG(rsp->flags);
- players[i].mo->flags2 = LONG(rsp->flags2);
- players[i].mo->friction = LONG(rsp->friction);
- players[i].mo->health = LONG(rsp->health);
- players[i].mo->momx = LONG(rsp->momx);
- players[i].mo->momy = LONG(rsp->momy);
- players[i].mo->momz = LONG(rsp->momz);
- players[i].mo->movefactor = LONG(rsp->movefactor);
-
- // Don't use P_SetMobjStateNF to restore state, write/read all the values manually!
- // This should stop those stupid console errors, hopefully.
- // -- Monster Iestyn
- players[i].mo->sprite = (spritenum_t)LONG(rsp->sprite);
- players[i].mo->frame = LONG(rsp->frame);
- players[i].mo->sprite2 = rsp->sprite2;
- players[i].mo->anim_duration = SHORT(rsp->anim_duration);
- players[i].mo->tics = LONG(rsp->tics);
- players[i].mo->state = &states[LONG(rsp->statenum)];
-
- players[i].mo->x = LONG(rsp->x);
- players[i].mo->y = LONG(rsp->y);
- players[i].mo->z = LONG(rsp->z);
- players[i].mo->radius = LONG(rsp->radius);
- players[i].mo->height = LONG(rsp->height);
- // P_SetScale is redundant for this, as all related variables are already restored properly.
- players[i].mo->scale = LONG(rsp->scale);
- players[i].mo->destscale = LONG(rsp->destscale);
- players[i].mo->scalespeed = LONG(rsp->scalespeed);
-
- // And finally, SET THE MOBJ SKIN damn it.
- if ((players[i].powers[pw_carry] == CR_NIGHTSMODE) && (skins[players[i].skin].sprites[SPR2_NFLY].numframes == 0))
- {
- players[i].mo->skin = &skins[DEFAULTNIGHTSSKIN];
- players[i].mo->color = skins[DEFAULTNIGHTSSKIN].prefcolor; // this will be corrected by thinker to super flash
- }
- else
- {
- players[i].mo->skin = &skins[players[i].skin];
- players[i].mo->color = players[i].skincolor; // this will be corrected by thinker to super flash/mario star
- }
-
- P_SetThingPosition(players[i].mo);
-}
-
-static inline void resynch_write_ctf(resynchend_pak *rst)
-{
- mobj_t *mflag;
- UINT8 i, j;
-
- for (i = 0, mflag = redflag; i < 2; ++i, mflag = blueflag)
- {
- rst->flagx[i] = rst->flagy[i] = rst->flagz[i] = 0;
- rst->flagloose[i] = rst->flagflags[i] = 0;
- rst->flagplayer[i] = -1;
-
- if (!mflag)
- {
- // Should be held by a player
- for (j = 0; j < MAXPLAYERS; ++j)
- {
- // GF_REDFLAG is 1, GF_BLUEFLAG is 2
- // redflag handling is i=0, blueflag is i=1
- // so check for gotflag == (i+1)
- if (!playeringame[j] || players[j].gotflag != (i+1))
- continue;
- rst->flagplayer[i] = (SINT8)j;
- break;
- }
- if (j == MAXPLAYERS) // fine, no I_Error
- {
- CONS_Alert(CONS_ERROR, "One of the flags has gone completely missing...\n");
- rst->flagplayer[i] = -2;
- }
- continue;
- }
-
- rst->flagx[i] = (fixed_t)LONG(mflag->x);
- rst->flagy[i] = (fixed_t)LONG(mflag->y);
- rst->flagz[i] = (fixed_t)LONG(mflag->z);
- rst->flagflags[i] = LONG(mflag->flags2);
- rst->flagloose[i] = LONG(mflag->fuse); // Dropped or not?
- }
-}
-
-static inline void resynch_read_ctf(resynchend_pak *p)
-{
- UINT8 i;
-
- for (i = 0; i < MAXPLAYERS; ++i)
- players[i].gotflag = 0;
-
- // Red flag
- if (p->flagplayer[0] == -2)
- ; // The server doesn't even know what happened to it...
- else if (p->flagplayer[0] != -1) // Held by a player
- {
- if (!playeringame[p->flagplayer[0]])
- I_Error("Invalid red flag player %d who isn't in the game!", (INT32)p->flagplayer[0]);
- players[p->flagplayer[0]].gotflag = GF_REDFLAG;
- if (redflag)
- {
- P_RemoveMobj(redflag);
- redflag = NULL;
- }
- }
- else
- {
- if (!redflag)
- redflag = P_SpawnMobj(0,0,0,MT_REDFLAG);
-
- P_UnsetThingPosition(redflag);
- redflag->x = (fixed_t)LONG(p->flagx[0]);
- redflag->y = (fixed_t)LONG(p->flagy[0]);
- redflag->z = (fixed_t)LONG(p->flagz[0]);
- redflag->flags2 = LONG(p->flagflags[0]);
- redflag->fuse = LONG(p->flagloose[0]);
- P_SetThingPosition(redflag);
- }
-
- // Blue flag
- if (p->flagplayer[1] == -2)
- ; // The server doesn't even know what happened to it...
- else if (p->flagplayer[1] != -1) // Held by a player
- {
- if (!playeringame[p->flagplayer[1]])
- I_Error("Invalid blue flag player %d who isn't in the game!", (INT32)p->flagplayer[1]);
- players[p->flagplayer[1]].gotflag = GF_BLUEFLAG;
- if (blueflag)
- {
- P_RemoveMobj(blueflag);
- blueflag = NULL;
- }
- }
- else
- {
- if (!blueflag)
- blueflag = P_SpawnMobj(0,0,0,MT_BLUEFLAG);
-
- P_UnsetThingPosition(blueflag);
- blueflag->x = (fixed_t)LONG(p->flagx[1]);
- blueflag->y = (fixed_t)LONG(p->flagy[1]);
- blueflag->z = (fixed_t)LONG(p->flagz[1]);
- blueflag->flags2 = LONG(p->flagflags[1]);
- blueflag->fuse = LONG(p->flagloose[1]);
- P_SetThingPosition(blueflag);
- }
-}
-
-static inline void resynch_write_others(resynchend_pak *rst)
-{
- UINT8 i;
-
- rst->ingame = 0;
- rst->outofcoop = 0;
-
- for (i = 0; i < MAXPLAYERS; ++i)
- {
- if (!playeringame[i])
- {
- rst->ctfteam[i] = 0;
- rst->score[i] = 0;
- rst->numboxes[i] = 0;
- rst->totalring[i] = 0;
- rst->realtime[i] = 0;
- rst->laps[i] = 0;
- continue;
- }
-
- if (!players[i].spectator)
- rst->ingame |= (1<<i);
- if (players[i].outofcoop)
- rst->outofcoop |= (1<<i);
- rst->ctfteam[i] = (INT32)LONG(players[i].ctfteam);
- rst->score[i] = (UINT32)LONG(players[i].score);
- rst->numboxes[i] = SHORT(players[i].numboxes);
- rst->totalring[i] = SHORT(players[i].totalring);
- rst->realtime[i] = (tic_t)LONG(players[i].realtime);
- rst->laps[i] = players[i].laps;
- }
-
- // endian safeness
- rst->ingame = (UINT32)LONG(rst->ingame);
-}
-
-static inline void resynch_read_others(resynchend_pak *p)
-{
- UINT8 i;
- UINT32 loc_ingame = (UINT32)LONG(p->ingame);
- UINT32 loc_outofcoop = (UINT32)LONG(p->outofcoop);
-
- for (i = 0; i < MAXPLAYERS; ++i)
- {
- // We don't care if they're in the game or not, just write all the data.
- players[i].spectator = !(loc_ingame & (1<<i));
- players[i].outofcoop = (loc_outofcoop & (1<<i));
- players[i].ctfteam = (INT32)LONG(p->ctfteam[i]); // no, 0 does not mean spectator, at least not in Match
- players[i].score = (UINT32)LONG(p->score[i]);
- players[i].numboxes = SHORT(p->numboxes[i]);
- players[i].totalring = SHORT(p->totalring[i]);
- players[i].realtime = (tic_t)LONG(p->realtime[i]);
- players[i].laps = p->laps[i];
- }
-}
-
-static void SV_InitResynchVars(INT32 node)
-{
- resynch_delay[node] = TICRATE; // initial one second delay
- resynch_score[node] = 0; // clean slate
- resynch_status[node] = 0x00;
- resynch_inprogress[node] = false;
- memset(resynch_sent[node], 0, MAXPLAYERS);
-}
-
-static void SV_RequireResynch(INT32 node)
-{
- INT32 i;
-
- resynch_delay[node] = 10; // Delay before you can fail sync again
- resynch_score[node] += 200; // Add score for initial desynch
- resynch_status[node] = 0xFFFFFFFF; // No players assumed synched
- resynch_inprogress[node] = true; // so we know to send a PT_RESYNCHEND after sync
-
- // Initial setup
- memset(resynch_sent[node], 0, MAXPLAYERS);
- for (i = 0; i < MAXPLAYERS; ++i)
- {
- if (!playeringame[i]) // Player not in game so just drop it from required synch
- resynch_status[node] &= ~(1<<i);
- else if (playernode[i] == node); // instantly update THEIR position
- else // Send at random times based on num players
- resynch_sent[node][i] = M_RandomKey(D_NumPlayers()>>1)+1;
- }
-}
-
-static void SV_SendResynch(INT32 node)
-{
- INT32 i, j;
-
- if (!nodeingame[node])
- {
- // player left during resynch
- // so obviously we don't need to do any of this anymore
- resynch_inprogress[node] = false;
- return;
- }
-
- // resynched?
- if (!resynch_status[node])
- {
- // you are now synched
- resynch_inprogress[node] = false;
-
- netbuffer->packettype = PT_RESYNCHEND;
-
- netbuffer->u.resynchend.randomseed = P_GetRandSeed();
- if (gametyperules & GTR_TEAMFLAGS)
- resynch_write_ctf(&netbuffer->u.resynchend);
- resynch_write_others(&netbuffer->u.resynchend);
-
- HSendPacket(node, true, 0, (sizeof(resynchend_pak)));
- return;
- }
-
- netbuffer->packettype = PT_RESYNCHING;
- for (i = 0, j = 0; i < MAXPLAYERS; ++i)
- {
- // if already synched don't bother
- if (!(resynch_status[node] & 1<<i))
- continue;
-
- // waiting for a reply or just waiting in general
- if (resynch_sent[node][i])
- {
- --resynch_sent[node][i];
- continue;
- }
-
- resynch_write_player(&netbuffer->u.resynchpak, i);
- HSendPacket(node, false, 0, (sizeof(resynch_pak)));
-
- resynch_sent[node][i] = TICRATE;
- resynch_score[node] += 2; // penalty for send
-
- if (++j > 3)
- break;
- }
-
- if (resynch_score[node] > (unsigned)cv_resynchattempts.value*250)
- {
- SendKick(nodetoplayer[node], KICK_MSG_CON_FAIL | KICK_MSG_KEEP_BODY);
- resynch_score[node] = 0;
- }
-}
-
-static void CL_AcknowledgeResynch(resynch_pak *rsp)
-{
- resynch_read_player(rsp);
-
- netbuffer->packettype = PT_RESYNCHGET;
- netbuffer->u.resynchgot = rsp->playernum;
- HSendPacket(servernode, true, 0, sizeof(UINT8));
-}
-
-static void SV_AcknowledgeResynchAck(INT32 node, UINT8 rsg)
-{
- if (rsg >= MAXPLAYERS)
- resynch_score[node] += 16384; // lol.
- else
- {
- resynch_status[node] &= ~(1<<rsg);
- --resynch_score[node]; // unpenalize
- }
-
- // Don't let resynch cause a timeout
- freezetimeout[node] = I_GetTime() + connectiontimeout;
-}
-// -----------------------------------------------------------------
-// end resynch
-// -----------------------------------------------------------------
-
static INT16 Consistancy(void);
typedef enum
@@ -1122,40 +522,6 @@ static void GetPackets(void);
static cl_mode_t cl_mode = CL_SEARCHING;
-// Player name send/load
-
-static void CV_SavePlayerNames(UINT8 **p)
-{
- INT32 i = 0;
- // Players in game only.
- for (; i < MAXPLAYERS; ++i)
- {
- if (!playeringame[i])
- {
- WRITEUINT8(*p, 0);
- continue;
- }
- WRITESTRING(*p, player_names[i]);
- }
-}
-
-static void CV_LoadPlayerNames(UINT8 **p)
-{
- INT32 i = 0;
- char tmp_name[MAXPLAYERNAME+1];
- tmp_name[MAXPLAYERNAME] = 0;
-
- for (; i < MAXPLAYERS; ++i)
- {
- READSTRING(*p, tmp_name);
- if (tmp_name[0] == 0)
- continue;
- if (tmp_name[MAXPLAYERNAME]) // overflow detected
- I_Error("Received bad server config packet when trying to join");
- memcpy(player_names[i], tmp_name, MAXPLAYERNAME+1);
- }
-}
-
#ifndef NONET
#define SNAKE_SPEED 5
@@ -1974,8 +1340,6 @@ static void SV_SendPlayerInfo(INT32 node)
*/
static boolean SV_SendServerConfig(INT32 node)
{
- INT32 i;
- UINT8 *p, *op;
boolean waspacketsent;
netbuffer->packettype = PT_SERVERCFG;
@@ -1991,32 +1355,10 @@ static boolean SV_SendServerConfig(INT32 node)
netbuffer->u.servercfg.gametype = (UINT8)gametype;
netbuffer->u.servercfg.modifiedgame = (UINT8)modifiedgame;
- // we fill these structs with FFs so that any players not in game get sent as 0xFFFF
- // which is nice and easy for us to detect
- memset(netbuffer->u.servercfg.playerskins, 0xFF, sizeof(netbuffer->u.servercfg.playerskins));
- memset(netbuffer->u.servercfg.playercolor, 0xFF, sizeof(netbuffer->u.servercfg.playercolor));
- memset(netbuffer->u.servercfg.playeravailabilities, 0xFF, sizeof(netbuffer->u.servercfg.playeravailabilities));
-
- memset(netbuffer->u.servercfg.adminplayers, -1, sizeof(netbuffer->u.servercfg.adminplayers));
-
- for (i = 0; i < MAXPLAYERS; i++)
- {
- netbuffer->u.servercfg.adminplayers[i] = (SINT8)adminplayers[i];
-
- if (!playeringame[i])
- continue;
- netbuffer->u.servercfg.playerskins[i] = (UINT8)players[i].skin;
- netbuffer->u.servercfg.playercolor[i] = (UINT16)players[i].skincolor;
- netbuffer->u.servercfg.playeravailabilities[i] = (UINT32)LONG(players[i].availabilities);
- }
-
memcpy(netbuffer->u.servercfg.server_context, server_context, 8);
- op = p = netbuffer->u.servercfg.varlengthinputs;
- CV_SavePlayerNames(&p);
- CV_SaveNetVars(&p);
{
- const size_t len = sizeof (serverconfig_pak) + (size_t)(p - op);
+ const size_t len = sizeof (serverconfig_pak);
#ifdef DEBUGFILE
if (debugfile)
@@ -2049,7 +1391,17 @@ static boolean SV_SendServerConfig(INT32 node)
#ifndef NONET
#define SAVEGAMESIZE (768*1024)
-static void SV_SendSaveGame(INT32 node)
+static boolean SV_ResendingSavegameToAnyone(void)
+{
+ INT32 i;
+
+ for (i = 0; i < MAXNETNODES; i++)
+ if (resendingsavegame[i])
+ return true;
+ return false;
+}
+
+static void SV_SendSaveGame(INT32 node, boolean resending)
{
size_t length, compressedlen;
UINT8 *savebuffer;
@@ -2067,7 +1419,7 @@ static void SV_SendSaveGame(INT32 node)
// Leave room for the uncompressed length.
save_p = savebuffer + sizeof(UINT32);
- P_SaveNetGame();
+ P_SaveNetGame(resending);
length = save_p - savebuffer;
if (length > SAVEGAMESIZE)
@@ -2119,7 +1471,7 @@ static void SV_SendSaveGame(INT32 node)
#ifdef DUMPCONSISTENCY
#define TMPSAVENAME "badmath.sav"
-static consvar_t cv_dumpconsistency = {"dumpconsistency", "Off", CV_NETVAR, CV_OnOff, NULL, 0, NULL, NULL, 0, 0, NULL};
+static consvar_t cv_dumpconsistency = CVAR_INIT ("dumpconsistency", "Off", CV_SAVE|CV_NETVAR, CV_OnOff, NULL);
static void SV_SavedGame(void)
{
@@ -2140,7 +1492,7 @@ static void SV_SavedGame(void)
return;
}
- P_SaveNetGame();
+ P_SaveNetGame(false);
length = save_p - savebuffer;
if (length > SAVEGAMESIZE)
@@ -2163,7 +1515,7 @@ static void SV_SavedGame(void)
#define TMPSAVENAME "$$$.sav"
-static void CL_LoadReceivedSavegame(void)
+static void CL_LoadReceivedSavegame(boolean reloading)
{
UINT8 *savebuffer = NULL;
size_t length, decompressedlen;
@@ -2199,7 +1551,7 @@ static void CL_LoadReceivedSavegame(void)
automapactive = false;
// load a base level
- if (P_LoadNetGame())
+ if (P_LoadNetGame(reloading))
{
const UINT8 actnum = mapheaderinfo[gamemap-1]->actnum;
CONS_Printf(M_GetText("Map is now \"%s"), G_BuildMapName(gamemap));
@@ -2216,11 +1568,6 @@ static void CL_LoadReceivedSavegame(void)
else
{
CONS_Alert(CONS_ERROR, M_GetText("Can't load the level!\n"));
- Z_Free(savebuffer);
- save_p = NULL;
- if (unlink(tmpsave) == -1)
- CONS_Alert(CONS_ERROR, M_GetText("Can't delete %s\n"), tmpsave);
- return;
}
// done
@@ -2230,6 +1577,43 @@ static void CL_LoadReceivedSavegame(void)
CONS_Alert(CONS_ERROR, M_GetText("Can't delete %s\n"), tmpsave);
consistancy[gametic%BACKUPTICS] = Consistancy();
CON_ToggleOff();
+
+ // Tell the server we have received and reloaded the gamestate
+ // so they know they can resume the game
+ netbuffer->packettype = PT_RECEIVEDGAMESTATE;
+ HSendPacket(servernode, true, 0, 0);
+}
+
+static void CL_ReloadReceivedSavegame(void)
+{
+ INT32 i;
+
+ for (i = 0; i < MAXPLAYERS; i++)
+ {
+ LUA_InvalidatePlayer(&players[i]);
+ sprintf(player_names[i], "Player %d", i + 1);
+ }
+
+ CL_LoadReceivedSavegame(true);
+
+ if (neededtic < gametic)
+ neededtic = gametic;
+ maketic = neededtic;
+
+ ticcmd_oldangleturn[0] = players[consoleplayer].oldrelangleturn;
+ P_ForceLocalAngle(&players[consoleplayer], (angle_t)(players[consoleplayer].angleturn << 16));
+ if (splitscreen)
+ {
+ ticcmd_oldangleturn[1] = players[secondarydisplayplayer].oldrelangleturn;
+ P_ForceLocalAngle(&players[secondarydisplayplayer], (angle_t)(players[secondarydisplayplayer].angleturn << 16));
+ }
+
+ camera.subsector = R_PointInSubsector(camera.x, camera.y);
+ camera2.subsector = R_PointInSubsector(camera2.x, camera2.y);
+
+ cl_redownloadinggamestate = false;
+
+ CONS_Printf(M_GetText("Game state reloaded\n"));
}
#endif
@@ -2647,7 +2031,7 @@ static boolean CL_ServerConnectionTicker(const char *tmpsave, tic_t *oldtic, tic
if (fileneeded[0].status == FS_FOUND)
{
// Gamestate is now handled within CL_LoadReceivedSavegame()
- CL_LoadReceivedSavegame();
+ CL_LoadReceivedSavegame(false);
cl_mode = CL_CONNECTED;
} // don't break case continue to CL_CONNECTED
else
@@ -2869,11 +2253,15 @@ void D_SaveBan(void)
size_t i;
banreason_t *reasonlist = reasonhead;
const char *address, *mask;
+ const char *path = va("%s"PATHSEP"%s", srb2home, "ban.txt");
if (!reasonhead)
+ {
+ remove(path);
return;
+ }
- f = fopen(va("%s"PATHSEP"%s", srb2home, "ban.txt"), "w");
+ f = fopen(path, "w");
if (!f)
{
@@ -2917,16 +2305,14 @@ static void Ban_Add(const char *reason)
reasontail = reasonlist;
}
-static void Command_ClearBans(void)
+static void Ban_Clear(void)
{
banreason_t *temp;
- if (!I_ClearBans)
- return;
-
I_ClearBans();
- D_SaveBan();
+
reasontail = NULL;
+
while (reasonhead)
{
temp = reasonhead->next;
@@ -2936,6 +2322,15 @@ static void Command_ClearBans(void)
}
}
+static void Command_ClearBans(void)
+{
+ if (!I_ClearBans)
+ return;
+
+ Ban_Clear();
+ D_SaveBan();
+}
+
static void Ban_Load_File(boolean warning)
{
FILE *f;
@@ -2943,6 +2338,9 @@ static void Ban_Load_File(boolean warning)
const char *address, *mask;
char buffer[MAX_WADPATH];
+ if (!I_ClearBans)
+ return;
+
f = fopen(va("%s"PATHSEP"%s", srb2home, "ban.txt"), "r");
if (!f)
@@ -2952,13 +2350,7 @@ static void Ban_Load_File(boolean warning)
return;
}
- if (I_ClearBans)
- Command_ClearBans();
- else
- {
- fclose(f);
- return;
- }
+ Ban_Clear();
for (i=0; fgets(buffer, (int)sizeof(buffer), f); i++)
{
@@ -3110,10 +2502,14 @@ static void CL_RemovePlayer(INT32 playernum, kickreason_t reason)
}
count--;
- spheres = players[playernum].spheres;
- rings = players[playernum].rings;
- sincrement = spheres/count;
- rincrement = rings/count;
+ sincrement = spheres = players[playernum].spheres;
+ rincrement = rings = players[playernum].rings;
+
+ if (count)
+ {
+ sincrement /= count;
+ rincrement /= count;
+ }
for (i = 0; i < MAXPLAYERS; i++)
{
@@ -3203,11 +2599,11 @@ void CL_Reset(void)
multiplayer = false;
servernode = 0;
server = true;
- resynch_local_inprogress = false;
doomcom->numnodes = 1;
doomcom->numslots = 1;
SV_StopServer();
SV_ResetServer();
+ CV_RevertNetVars();
// make sure we don't leave any fileneeded gunk over from a failed join
fileneedednum = 0;
@@ -3631,8 +3027,7 @@ static void Got_KickCmd(UINT8 **p, INT32 playernum)
if (pnum == consoleplayer)
{
- if (Playing())
- LUAh_GameQuit();
+ LUAh_GameQuit(false);
#ifdef DUMPCONSISTENCY
if (msg == KICK_MSG_CON_FAIL) SV_SavedGame();
#endif
@@ -3674,30 +3069,58 @@ static void Got_KickCmd(UINT8 **p, INT32 playernum)
CL_RemovePlayer(pnum, kickreason);
}
+static void Command_ResendGamestate(void)
+{
+ SINT8 playernum;
+
+ if (COM_Argc() == 1)
+ {
+ CONS_Printf(M_GetText("resendgamestate <playername/playernum>: resend the game state to a player\n"));
+ return;
+ }
+ else if (client)
+ {
+ CONS_Printf(M_GetText("Only the server can use this.\n"));
+ return;
+ }
+
+ playernum = nametonum(COM_Argv(1));
+ if (playernum == -1 || playernum == 0)
+ return;
+
+ // Send a PT_WILLRESENDGAMESTATE packet to the client so they know what's going on
+ netbuffer->packettype = PT_WILLRESENDGAMESTATE;
+ if (!HSendPacket(playernode[playernum], true, 0, 0))
+ {
+ CONS_Alert(CONS_ERROR, M_GetText("A problem occured, please try again.\n"));
+ return;
+ }
+}
+
static CV_PossibleValue_t netticbuffer_cons_t[] = {{0, "MIN"}, {3, "MAX"}, {0, NULL}};
-consvar_t cv_netticbuffer = {"netticbuffer", "1", CV_SAVE, netticbuffer_cons_t, NULL, 0, NULL, NULL, 0, 0, NULL};
+consvar_t cv_netticbuffer = CVAR_INIT ("netticbuffer", "1", CV_SAVE, netticbuffer_cons_t, NULL);
-consvar_t cv_allownewplayer = {"allowjoin", "On", CV_NETVAR, CV_OnOff, NULL, 0, NULL, NULL, 0, 0, NULL };
-consvar_t cv_joinnextround = {"joinnextround", "Off", CV_NETVAR, CV_OnOff, NULL, 0, NULL, NULL, 0, 0, NULL}; /// \todo not done
+consvar_t cv_allownewplayer = CVAR_INIT ("allowjoin", "On", CV_SAVE|CV_NETVAR, CV_OnOff, NULL);
+consvar_t cv_joinnextround = CVAR_INIT ("joinnextround", "Off", CV_SAVE|CV_NETVAR, CV_OnOff, NULL); /// \todo not done
static CV_PossibleValue_t maxplayers_cons_t[] = {{2, "MIN"}, {32, "MAX"}, {0, NULL}};
-consvar_t cv_maxplayers = {"maxplayers", "8", CV_SAVE, maxplayers_cons_t, NULL, 0, NULL, NULL, 0, 0, NULL};
+consvar_t cv_maxplayers = CVAR_INIT ("maxplayers", "8", CV_SAVE|CV_NETVAR, maxplayers_cons_t, NULL);
static CV_PossibleValue_t joindelay_cons_t[] = {{1, "MIN"}, {3600, "MAX"}, {0, "Off"}, {0, NULL}};
-consvar_t cv_joindelay = {"joindelay", "10", CV_SAVE, joindelay_cons_t, NULL, 0, NULL, NULL, 0, 0, NULL};
+consvar_t cv_joindelay = CVAR_INIT ("joindelay", "10", CV_SAVE|CV_NETVAR, joindelay_cons_t, NULL);
static CV_PossibleValue_t rejointimeout_cons_t[] = {{1, "MIN"}, {60 * FRACUNIT, "MAX"}, {0, "Off"}, {0, NULL}};
-consvar_t cv_rejointimeout = {"rejointimeout", "Off", CV_SAVE|CV_FLOAT, rejointimeout_cons_t, NULL, 0, NULL, NULL, 0, 0, NULL};
+consvar_t cv_rejointimeout = CVAR_INIT ("rejointimeout", "2", CV_SAVE|CV_NETVAR|CV_FLOAT, rejointimeout_cons_t, NULL);
static CV_PossibleValue_t resynchattempts_cons_t[] = {{1, "MIN"}, {20, "MAX"}, {0, "No"}, {0, NULL}};
-consvar_t cv_resynchattempts = {"resynchattempts", "10", CV_SAVE, resynchattempts_cons_t, NULL, 0, NULL, NULL, 0, 0, NULL };
-consvar_t cv_blamecfail = {"blamecfail", "Off", CV_SAVE, CV_OnOff, NULL, 0, NULL, NULL, 0, 0, NULL };
+consvar_t cv_resynchattempts = CVAR_INIT ("resynchattempts", "10", CV_SAVE|CV_NETVAR, resynchattempts_cons_t, NULL);
+consvar_t cv_blamecfail = CVAR_INIT ("blamecfail", "Off", CV_SAVE|CV_NETVAR, CV_OnOff, NULL);
// max file size to send to a player (in kilobytes)
static CV_PossibleValue_t maxsend_cons_t[] = {{0, "MIN"}, {51200, "MAX"}, {0, NULL}};
-consvar_t cv_maxsend = {"maxsend", "4096", CV_SAVE, maxsend_cons_t, NULL, 0, NULL, NULL, 0, 0, NULL};
-consvar_t cv_noticedownload = {"noticedownload", "Off", CV_SAVE, CV_OnOff, NULL, 0, NULL, NULL, 0, 0, NULL};
+consvar_t cv_maxsend = CVAR_INIT ("maxsend", "4096", CV_SAVE|CV_NETVAR, maxsend_cons_t, NULL);
+consvar_t cv_noticedownload = CVAR_INIT ("noticedownload", "Off", CV_SAVE|CV_NETVAR, CV_OnOff, NULL);
// Speed of file downloading (in packets per tic)
static CV_PossibleValue_t downloadspeed_cons_t[] = {{0, "MIN"}, {32, "MAX"}, {0, NULL}};
-consvar_t cv_downloadspeed = {"downloadspeed", "16", CV_SAVE, downloadspeed_cons_t, NULL, 0, NULL, NULL, 0, 0, NULL};
+consvar_t cv_downloadspeed = CVAR_INIT ("downloadspeed", "16", CV_SAVE|CV_NETVAR, downloadspeed_cons_t, NULL);
static void Got_AddPlayer(UINT8 **p, INT32 playernum);
@@ -3717,6 +3140,7 @@ void D_ClientServerInit(void)
COM_AddCommand("reloadbans", Command_ReloadBan);
COM_AddCommand("connect", Command_connect);
COM_AddCommand("nodes", Command_Nodes);
+ COM_AddCommand("resendgamestate", Command_ResendGamestate);
#ifdef PACKETDROP
COM_AddCommand("drop", Command_Drop);
COM_AddCommand("droprate", Command_Droprate);
@@ -3748,14 +3172,18 @@ void D_ClientServerInit(void)
static void ResetNode(INT32 node)
{
nodeingame[node] = false;
- nodetoplayer[node] = -1;
- nodetoplayer2[node] = -1;
+ nodewaiting[node] = 0;
+
nettics[node] = gametic;
supposedtics[node] = gametic;
- nodewaiting[node] = 0;
+
+ nodetoplayer[node] = -1;
+ nodetoplayer2[node] = -1;
playerpernode[node] = 0;
+
sendingsavegame[node] = false;
- SV_InitResynchVars(node);
+ resendingsavegame[node] = false;
+ savegameresendcooldown[node] = 0;
}
void SV_ResetServer(void)
@@ -3789,6 +3217,7 @@ void SV_ResetServer(void)
mynode = 0;
cl_packetmissed = false;
+ cl_redownloadinggamestate = false;
if (dedicated)
{
@@ -4258,12 +3687,6 @@ static void HandleConnect(SINT8 node)
#endif
SV_AddNode(node);
- /// \note Wait what???
- /// What if the gamestate takes more than one second to get downloaded?
- /// Or if a lagspike happens?
- // you get a free second before desynch checks. use it wisely.
- SV_InitResynchVars(node);
-
if (cv_joinnextround.value && gameaction == ga_nothing)
G_SetGamestate(GS_WAITINGPLAYERS);
if (!SV_SendServerConfig(node))
@@ -4285,7 +3708,7 @@ static void HandleConnect(SINT8 node)
{
if ((gamestate == GS_LEVEL || gamestate == GS_INTERMISSION) && newnode)
{
- SV_SendSaveGame(node); // send a complete game state
+ SV_SendSaveGame(node, false); // send a complete game state
DEBFILE("send savegame\n");
}
SV_AddWaitingPlayers(names[0], names[1]);
@@ -4304,8 +3727,7 @@ static void HandleConnect(SINT8 node)
static void HandleShutdown(SINT8 node)
{
(void)node;
- if (Playing())
- LUAh_GameQuit();
+ LUAh_GameQuit(false);
D_QuitNetGame();
CL_Reset();
D_StartTitle();
@@ -4320,8 +3742,7 @@ static void HandleShutdown(SINT8 node)
static void HandleTimeout(SINT8 node)
{
(void)node;
- if (Playing())
- LUAh_GameQuit();
+ LUAh_GameQuit(false);
D_QuitNetGame();
CL_Reset();
D_StartTitle();
@@ -4352,6 +3773,43 @@ static void HandleServerInfo(SINT8 node)
}
#endif
+static void PT_WillResendGamestate(void)
+{
+ char tmpsave[256];
+
+ if (server || cl_redownloadinggamestate)
+ return;
+
+ // Send back a PT_CANRECEIVEGAMESTATE packet to the server
+ // so they know they can start sending the game state
+ netbuffer->packettype = PT_CANRECEIVEGAMESTATE;
+ if (!HSendPacket(servernode, true, 0, 0))
+ return;
+
+ CONS_Printf(M_GetText("Reloading game state...\n"));
+
+ sprintf(tmpsave, "%s" PATHSEP TMPSAVENAME, srb2home);
+
+ // Don't get a corrupt savegame error because tmpsave already exists
+ if (FIL_FileExists(tmpsave) && unlink(tmpsave) == -1)
+ I_Error("Can't delete %s\n", tmpsave);
+
+ CL_PrepareDownloadSaveGame(tmpsave);
+
+ cl_redownloadinggamestate = true;
+}
+
+static void PT_CanReceiveGamestate(SINT8 node)
+{
+ if (client || sendingsavegame[node])
+ return;
+
+ CONS_Printf(M_GetText("Resending game state to %s...\n"), player_names[nodetoplayer[node]]);
+
+ SV_SendSaveGame(node, true); // Resend a complete game state
+ resendingsavegame[node] = true;
+}
+
/** Handles a packet received from a node that isn't in game
*
* \param node The packet sender
@@ -4442,9 +3900,6 @@ static void HandlePacketFromAwayNode(SINT8 node)
case PT_SERVERCFG: // Positive response of client join request
{
- INT32 j;
- UINT8 *scp;
-
if (server && serverrunning && node != servernode)
{ // but wait I thought I'm the server?
Net_CloseConnection(node);
@@ -4460,8 +3915,6 @@ static void HandlePacketFromAwayNode(SINT8 node)
maketic = gametic = neededtic = (tic_t)LONG(netbuffer->u.servercfg.gametic);
G_SetGametype(netbuffer->u.servercfg.gametype);
modifiedgame = netbuffer->u.servercfg.modifiedgame;
- for (j = 0; j < MAXPLAYERS; j++)
- adminplayers[j] = netbuffer->u.servercfg.adminplayers[j];
memcpy(server_context, netbuffer->u.servercfg.server_context, 8);
}
@@ -4480,23 +3933,6 @@ static void HandlePacketFromAwayNode(SINT8 node)
#endif
DEBFILE(va("Server accept join gametic=%u mynode=%d\n", gametic, mynode));
- memset(playeringame, 0, sizeof(playeringame));
- for (j = 0; j < MAXPLAYERS; j++)
- {
- if (netbuffer->u.servercfg.playerskins[j] == 0xFF
- && netbuffer->u.servercfg.playercolor[j] == 0xFFFF
- && netbuffer->u.servercfg.playeravailabilities[j] == 0xFFFFFFFF)
- continue; // not in game
-
- playeringame[j] = true;
- players[j].availabilities = (UINT32)LONG(netbuffer->u.servercfg.playeravailabilities[j]);
- SetPlayerSkinByNum(j, (INT32)netbuffer->u.servercfg.playerskins[j]);
- players[j].skincolor = netbuffer->u.servercfg.playercolor[j];
- }
-
- scp = netbuffer->u.servercfg.varlengthinputs;
- CV_LoadPlayerNames(&scp);
- CV_LoadNetVars(&scp);
#ifndef NONET
/// \note Wait. What if a Lua script uses some global custom variables synched with the NetVars hook?
/// Shouldn't them be downloaded even at intermission time?
@@ -4596,11 +4032,6 @@ static void HandlePacketFromPlayer(SINT8 node)
switch (netbuffer->packettype)
{
// -------------------------------------------- SERVER RECEIVE ----------
- case PT_RESYNCHGET:
- if (client)
- break;
- SV_AcknowledgeResynchAck(node, netbuffer->u.resynchgot);
- break;
case PT_CLIENTCMD:
case PT_CLIENT2CMD:
case PT_CLIENTMIS:
@@ -4610,10 +4041,6 @@ static void HandlePacketFromPlayer(SINT8 node)
if (client)
break;
- // Ignore tics from those not synched
- if (resynch_inprogress[node] && nettics[node] == gametic)
- break;
-
// To save bytes, only the low byte of tic numbers are sent
// Use ExpandTics to figure out what the rest of the bytes are
realstart = ExpandTics(netbuffer->u.clientpak.client_tic, node);
@@ -4640,9 +4067,6 @@ static void HandlePacketFromPlayer(SINT8 node)
|| netbuffer->packettype == PT_NODEKEEPALIVEMIS)
break;
- // If a client sends a ticcmd it should mean they are done receiving the savegame
- sendingsavegame[node] = false;
-
// As long as clients send valid ticcmds, the server can keep running, so reset the timeout
/// \todo Use a separate cvar for that kind of timeout?
freezetimeout[node] = I_GetTime() + connectiontimeout;
@@ -4667,21 +4091,20 @@ static void HandlePacketFromPlayer(SINT8 node)
G_MoveTiccmd(&netcmds[maketic%BACKUPTICS][(UINT8)nodetoplayer2[node]],
&netbuffer->u.client2pak.cmd2, 1);
- // A delay before we check resynching
- // Used on join or just after a synch fail
- if (resynch_delay[node])
- {
- --resynch_delay[node];
- break;
- }
// Check player consistancy during the level
- if (realstart <= gametic && realstart > gametic - BACKUPTICS+1 && gamestate == GS_LEVEL
- && consistancy[realstart%BACKUPTICS] != SHORT(netbuffer->u.clientpak.consistancy))
+ if (realstart <= gametic && realstart + BACKUPTICS - 1 > gametic && gamestate == GS_LEVEL
+ && consistancy[realstart%BACKUPTICS] != SHORT(netbuffer->u.clientpak.consistancy)
+ && !resendingsavegame[node] && savegameresendcooldown[node] <= I_GetTime()
+ && !SV_ResendingSavegameToAnyone())
{
- SV_RequireResynch(node);
-
- if (cv_resynchattempts.value && resynch_score[node] <= (unsigned)cv_resynchattempts.value*250)
+ if (cv_resynchattempts.value)
{
+ // Tell the client we are about to resend them the gamestate
+ netbuffer->packettype = PT_WILLRESENDGAMESTATE;
+ HSendPacket(node, true, 0, 0);
+
+ resendingsavegame[node] = true;
+
if (cv_blamecfail.value)
CONS_Printf(M_GetText("Synch failure for player %d (%s); expected %hd, got %hd\n"),
netconsole+1, player_names[netconsole],
@@ -4701,8 +4124,6 @@ static void HandlePacketFromPlayer(SINT8 node)
break;
}
}
- else if (resynch_score[node])
- --resynch_score[node];
break;
case PT_TEXTCMD2: // splitscreen special
netconsole = nodetoplayer2[node];
@@ -4828,6 +4249,9 @@ static void HandlePacketFromPlayer(SINT8 node)
Net_CloseConnection(node);
nodeingame[node] = false;
break;
+ case PT_CANRECEIVEGAMESTATE:
+ PT_CanReceiveGamestate(node);
+ break;
case PT_ASKLUAFILE:
if (server && luafiletransfers && luafiletransfers->nodestatus[node] == LFTNS_ASKED)
AddLuaFileToSendQueue(node, luafiletransfers->realfilename);
@@ -4836,25 +4260,12 @@ static void HandlePacketFromPlayer(SINT8 node)
if (server && luafiletransfers && luafiletransfers->nodestatus[node] == LFTNS_SENDING)
SV_HandleLuaFileSent(node);
break;
-// -------------------------------------------- CLIENT RECEIVE ----------
- case PT_RESYNCHEND:
- // Only accept PT_RESYNCHEND from the server.
- if (node != servernode)
- {
- CONS_Alert(CONS_WARNING, M_GetText("%s received from non-host %d\n"), "PT_RESYNCHEND", node);
- if (server)
- SendKick(netconsole, KICK_MSG_CON_FAIL | KICK_MSG_KEEP_BODY);
- break;
- }
- resynch_local_inprogress = false;
-
- P_SetRandSeed(netbuffer->u.resynchend.randomseed);
-
- if (gametyperules & GTR_TEAMFLAGS)
- resynch_read_ctf(&netbuffer->u.resynchend);
- resynch_read_others(&netbuffer->u.resynchend);
-
+ case PT_RECEIVEDGAMESTATE:
+ sendingsavegame[node] = false;
+ resendingsavegame[node] = false;
+ savegameresendcooldown[node] = I_GetTime() + 5 * TICRATE;
break;
+// -------------------------------------------- CLIENT RECEIVE ----------
case PT_SERVERTICS:
// Only accept PT_SERVERTICS from the server.
if (node != servernode)
@@ -4915,18 +4326,6 @@ static void HandlePacketFromPlayer(SINT8 node)
"IRC or Discord so it can be fixed.\n", (INT32)realstart, (INT32)realend, (INT32)neededtic);*/
}
break;
- case PT_RESYNCHING:
- // Only accept PT_RESYNCHING from the server.
- if (node != servernode)
- {
- CONS_Alert(CONS_WARNING, M_GetText("%s received from non-host %d\n"), "PT_RESYNCHING", node);
- if (server)
- SendKick(netconsole, KICK_MSG_CON_FAIL | KICK_MSG_KEEP_BODY);
- break;
- }
- resynch_local_inprogress = true;
- CL_AcknowledgeResynch(&netbuffer->u.resynchpak);
- break;
case PT_PING:
// Only accept PT_PING from the server.
if (node != servernode)
@@ -4971,6 +4370,9 @@ static void HandlePacketFromPlayer(SINT8 node)
if (server)
PT_FileReceived();
break;
+ case PT_WILLRESENDGAMESTATE:
+ PT_WillResendGamestate();
+ break;
case PT_SENDINGLUAFILE:
if (client)
CL_PrepareDownloadLuaFile();
@@ -5073,70 +4475,73 @@ static INT16 Consistancy(void)
ret += P_GetRandSeed();
#ifdef MOBJCONSISTANCY
- for (th = thlist[THINK_MOBJ].next; th != &thlist[THINK_MOBJ]; th = th->next)
+ if (gamestate == GS_LEVEL)
{
- if (th->function.acp1 == (actionf_p1)P_RemoveThinkerDelayed)
- continue;
+ for (th = thlist[THINK_MOBJ].next; th != &thlist[THINK_MOBJ]; th = th->next)
+ {
+ if (th->function.acp1 == (actionf_p1)P_RemoveThinkerDelayed)
+ continue;
- mo = (mobj_t *)th;
+ mo = (mobj_t *)th;
- if (mo->flags & (MF_SPECIAL | MF_SOLID | MF_PUSHABLE | MF_BOSS | MF_MISSILE | MF_SPRING | MF_MONITOR | MF_FIRE | MF_ENEMY | MF_PAIN | MF_STICKY))
- {
- ret -= mo->type;
- ret += mo->x;
- ret -= mo->y;
- ret += mo->z;
- ret -= mo->momx;
- ret += mo->momy;
- ret -= mo->momz;
- ret += mo->angle;
- ret -= mo->flags;
- ret += mo->flags2;
- ret -= mo->eflags;
- if (mo->target)
- {
- ret += mo->target->type;
- ret -= mo->target->x;
- ret += mo->target->y;
- ret -= mo->target->z;
- ret += mo->target->momx;
- ret -= mo->target->momy;
- ret += mo->target->momz;
- ret -= mo->target->angle;
- ret += mo->target->flags;
- ret -= mo->target->flags2;
- ret += mo->target->eflags;
- ret -= mo->target->state - states;
- ret += mo->target->tics;
- ret -= mo->target->sprite;
- ret += mo->target->frame;
- }
- else
- ret ^= 0x3333;
- if (mo->tracer && mo->tracer->type != MT_OVERLAY)
+ if (mo->flags & (MF_SPECIAL | MF_SOLID | MF_PUSHABLE | MF_BOSS | MF_MISSILE | MF_SPRING | MF_MONITOR | MF_FIRE | MF_ENEMY | MF_PAIN | MF_STICKY))
{
- ret += mo->tracer->type;
- ret -= mo->tracer->x;
- ret += mo->tracer->y;
- ret -= mo->tracer->z;
- ret += mo->tracer->momx;
- ret -= mo->tracer->momy;
- ret += mo->tracer->momz;
- ret -= mo->tracer->angle;
- ret += mo->tracer->flags;
- ret -= mo->tracer->flags2;
- ret += mo->tracer->eflags;
- ret -= mo->tracer->state - states;
- ret += mo->tracer->tics;
- ret -= mo->tracer->sprite;
- ret += mo->tracer->frame;
+ ret -= mo->type;
+ ret += mo->x;
+ ret -= mo->y;
+ ret += mo->z;
+ ret -= mo->momx;
+ ret += mo->momy;
+ ret -= mo->momz;
+ ret += mo->angle;
+ ret -= mo->flags;
+ ret += mo->flags2;
+ ret -= mo->eflags;
+ if (mo->target)
+ {
+ ret += mo->target->type;
+ ret -= mo->target->x;
+ ret += mo->target->y;
+ ret -= mo->target->z;
+ ret += mo->target->momx;
+ ret -= mo->target->momy;
+ ret += mo->target->momz;
+ ret -= mo->target->angle;
+ ret += mo->target->flags;
+ ret -= mo->target->flags2;
+ ret += mo->target->eflags;
+ ret -= mo->target->state - states;
+ ret += mo->target->tics;
+ ret -= mo->target->sprite;
+ ret += mo->target->frame;
+ }
+ else
+ ret ^= 0x3333;
+ if (mo->tracer && mo->tracer->type != MT_OVERLAY)
+ {
+ ret += mo->tracer->type;
+ ret -= mo->tracer->x;
+ ret += mo->tracer->y;
+ ret -= mo->tracer->z;
+ ret += mo->tracer->momx;
+ ret -= mo->tracer->momy;
+ ret += mo->tracer->momz;
+ ret -= mo->tracer->angle;
+ ret += mo->tracer->flags;
+ ret -= mo->tracer->flags2;
+ ret += mo->tracer->eflags;
+ ret -= mo->tracer->state - states;
+ ret += mo->tracer->tics;
+ ret -= mo->tracer->sprite;
+ ret += mo->tracer->frame;
+ }
+ else
+ ret ^= 0xAAAA;
+ ret -= mo->state - states;
+ ret += mo->tics;
+ ret -= mo->sprite;
+ ret += mo->frame;
}
- else
- ret ^= 0xAAAA;
- ret -= mo->state - states;
- ret += mo->tics;
- ret -= mo->sprite;
- ret += mo->frame;
}
}
#endif
@@ -5428,7 +4833,7 @@ void TryRunTics(tic_t realtics)
if (player_joining)
return;
- if (neededtic > gametic && !resynch_local_inprogress)
+ if (neededtic > gametic)
{
if (advancedemo)
{
@@ -5443,14 +4848,14 @@ void TryRunTics(tic_t realtics)
{
DEBFILE(va("============ Running tic %d (local %d)\n", gametic, localgametic));
- rs_tictime = I_GetTimeMicros();
+ ps_tictime = I_GetPreciseTime();
G_Ticker((gametic % NEWTICRATERATIO) == 0);
ExtraDataTicker();
gametic++;
consistancy[gametic%BACKUPTICS] = Consistancy();
- rs_tictime = I_GetTimeMicros() - rs_tictime;
+ ps_tictime = I_GetPreciseTime() - ps_tictime;
// Leave a certain amount of tics present in the net buffer as long as we've ran at least one tic this frame.
if (client && gamestate == GS_LEVEL && leveltime > 3 && neededtic <= gametic + cv_netticbuffer.value)
@@ -5594,9 +4999,12 @@ void NetUpdate(void)
if (client)
{
- if (!resynch_local_inprogress)
- CL_SendClientCmd(); // Send tic cmd
- hu_resynching = resynch_local_inprogress;
+ // If the client just finished redownloading the game state, load it
+ if (cl_redownloadinggamestate && fileneeded[0].status == FS_FOUND)
+ CL_ReloadReceivedSavegame();
+
+ CL_SendClientCmd(); // Send tic cmd
+ hu_redownloadinggamestate = cl_redownloadinggamestate;
}
else
{
@@ -5604,46 +5012,33 @@ void NetUpdate(void)
{
INT32 counts;
- hu_resynching = false;
+ hu_redownloadinggamestate = false;
firstticstosend = gametic;
for (i = 0; i < MAXNETNODES; i++)
if (nodeingame[i] && nettics[i] < firstticstosend)
+ {
firstticstosend = nettics[i];
+ if (maketic + 1 >= nettics[i] + BACKUPTICS)
+ Net_ConnectionTimeout(i);
+ }
+
// Don't erase tics not acknowledged
counts = realtics;
- for (i = 0; i < MAXNETNODES; ++i)
- if (resynch_inprogress[i])
- {
- if (!nodeingame[i] || nettics[i] == gametic)
- {
- SV_SendResynch(i);
- counts = -666;
- }
- else
- counts = 0; // Let the client catch up with the server
- }
-
- // Do not make tics while resynching
- if (counts != -666)
- {
- if (maketic + counts >= firstticstosend + BACKUPTICS)
- counts = firstticstosend+BACKUPTICS-maketic-1;
+ if (maketic + counts >= firstticstosend + BACKUPTICS)
+ counts = firstticstosend+BACKUPTICS-maketic-1;
- for (i = 0; i < counts; i++)
- SV_Maketic(); // Create missed tics and increment maketic
+ for (i = 0; i < counts; i++)
+ SV_Maketic(); // Create missed tics and increment maketic
- for (; tictoclear < firstticstosend; tictoclear++) // Clear only when acknowledged
- D_Clearticcmd(tictoclear); // Clear the maketic the new tic
+ for (; tictoclear < firstticstosend; tictoclear++) // Clear only when acknowledged
+ D_Clearticcmd(tictoclear); // Clear the maketic the new tic
- SV_SendTics();
+ SV_SendTics();
- neededtic = maketic; // The server is a client too
- }
- else
- hu_resynching = true;
+ neededtic = maketic; // The server is a client too
}
}
diff --git a/src/d_clisrv.h b/src/d_clisrv.h
index adc8a7cc9b090cf4bf5d5881f08070bf34ba1093..3d67525dacc65dd6c79d18c544cb7ff9fdffebac 100644
--- a/src/d_clisrv.h
+++ b/src/d_clisrv.h
@@ -64,8 +64,10 @@ typedef enum
PT_REQUESTFILE, // Client requests a file transfer
PT_ASKINFOVIAMS, // Packet from the MS requesting info be sent to new client.
// If this ID changes, update masterserver definition.
- PT_RESYNCHEND, // Player is now resynched and is being requested to remake the gametic
- PT_RESYNCHGET, // Player got resynch packet
+
+ PT_WILLRESENDGAMESTATE, // Hey Client, I am about to resend you the gamestate!
+ PT_CANRECEIVEGAMESTATE, // Okay Server, I'm ready to receive it, you can go ahead.
+ PT_RECEIVEDGAMESTATE, // Thank you Server, I am ready to play again!
PT_SENDINGLUAFILE, // Server telling a client Lua needs to open a file
PT_ASKLUAFILE, // Client telling the server they don't have the file
@@ -85,8 +87,6 @@ typedef enum
PT_TEXTCMD2, // Splitscreen text commands.
PT_CLIENTJOIN, // Client wants to join; used in start game.
PT_NODETIMEOUT, // Packet sent to self if the connection times out.
- PT_RESYNCHING, // Packet sent to resync players.
- // Blocks game advance until synched.
PT_LOGIN, // Login attempt from the client.
@@ -139,168 +139,6 @@ typedef struct
ticcmd_t cmds[45]; // Normally [BACKUPTIC][MAXPLAYERS] but too large
} ATTRPACK servertics_pak;
-// Sent to client when all consistency data
-// for players has been restored
-typedef struct
-{
- UINT32 randomseed;
-
- // CTF flag stuff
- SINT8 flagplayer[2];
- INT32 flagloose[2];
- INT32 flagflags[2];
- fixed_t flagx[2];
- fixed_t flagy[2];
- fixed_t flagz[2];
-
- UINT32 ingame; // Spectator bit for each player
- UINT32 outofcoop; // outofcoop bit for each player
- INT32 ctfteam[MAXPLAYERS]; // Which team? (can't be 1 bit, since in regular Match there are no teams)
-
- // Resynch game scores and the like all at once
- UINT32 score[MAXPLAYERS]; // Everyone's score
- INT16 numboxes[MAXPLAYERS];
- INT16 totalring[MAXPLAYERS];
- tic_t realtime[MAXPLAYERS];
- UINT8 laps[MAXPLAYERS];
-} ATTRPACK resynchend_pak;
-
-typedef struct
-{
- // Player stuff
- UINT8 playernum;
-
- // Do not send anything visual related.
- // Only send data that we need to know for physics.
- UINT8 playerstate; // playerstate_t
- UINT32 pflags; // pflags_t
- UINT8 panim; // panim_t
-
- INT16 angleturn;
- INT16 oldrelangleturn;
-
- angle_t aiming;
- INT32 currentweapon;
- INT32 ringweapons;
- UINT16 ammoremoval;
- tic_t ammoremovaltimer;
- INT32 ammoremovalweapon;
- UINT16 powers[NUMPOWERS];
-
- // Score is resynched in the confirm resync packet
- INT16 rings;
- INT16 spheres;
- SINT8 lives;
- SINT8 continues;
- UINT8 scoreadd;
- SINT8 xtralife;
- SINT8 pity;
-
- UINT16 skincolor;
- INT32 skin;
- UINT32 availabilities;
- // Just in case Lua does something like
- // modify these at runtime
- fixed_t camerascale;
- fixed_t shieldscale;
- fixed_t normalspeed;
- fixed_t runspeed;
- UINT8 thrustfactor;
- UINT8 accelstart;
- UINT8 acceleration;
- UINT8 charability;
- UINT8 charability2;
- UINT32 charflags;
- UINT32 thokitem; // mobjtype_t
- UINT32 spinitem; // mobjtype_t
- UINT32 revitem; // mobjtype_t
- UINT32 followitem; // mobjtype_t
- fixed_t actionspd;
- fixed_t mindash;
- fixed_t maxdash;
- fixed_t jumpfactor;
- fixed_t playerheight;
- fixed_t playerspinheight;
-
- fixed_t speed;
- UINT8 secondjump;
- UINT8 fly1;
- tic_t glidetime;
- UINT8 climbing;
- INT32 deadtimer;
- tic_t exiting;
- UINT8 homing;
- tic_t dashmode;
- tic_t skidtime;
- fixed_t cmomx;
- fixed_t cmomy;
- fixed_t rmomx;
- fixed_t rmomy;
-
- INT32 weapondelay;
- INT32 tossdelay;
-
- INT16 starpostx;
- INT16 starposty;
- INT16 starpostz;
- INT32 starpostnum;
- tic_t starposttime;
- angle_t starpostangle;
- fixed_t starpostscale;
-
- INT32 maxlink;
- fixed_t dashspeed;
- angle_t angle_pos;
- angle_t old_angle_pos;
- tic_t bumpertime;
- INT32 flyangle;
- tic_t drilltimer;
- INT32 linkcount;
- tic_t linktimer;
- INT32 anotherflyangle;
- tic_t nightstime;
- INT32 drillmeter;
- UINT8 drilldelay;
- UINT8 bonustime;
- UINT8 mare;
- INT16 lastsidehit, lastlinehit;
-
- tic_t losstime;
- UINT8 timeshit;
- INT32 onconveyor;
-
- //player->mo stuff
- UINT8 hasmo; // Boolean
-
- INT32 health;
- angle_t angle;
- angle_t rollangle;
- fixed_t x;
- fixed_t y;
- fixed_t z;
- fixed_t momx;
- fixed_t momy;
- fixed_t momz;
- fixed_t friction;
- fixed_t movefactor;
-
- spritenum_t sprite;
- UINT32 frame;
- UINT8 sprite2;
- UINT16 anim_duration;
- INT32 tics;
- statenum_t statenum;
- UINT32 flags;
- UINT32 flags2;
- UINT16 eflags;
-
- fixed_t radius;
- fixed_t height;
- fixed_t scale;
- fixed_t destscale;
- fixed_t scalespeed;
-} ATTRPACK resynch_pak;
-
typedef struct
{
UINT8 version; // Different versions don't work
@@ -314,18 +152,10 @@ typedef struct
UINT8 clientnode;
UINT8 gamestate;
- // 0xFF == not in game; else player skin num
- UINT8 playerskins[MAXPLAYERS];
- UINT16 playercolor[MAXPLAYERS];
- UINT32 playeravailabilities[MAXPLAYERS];
-
UINT8 gametype;
UINT8 modifiedgame;
- SINT8 adminplayers[MAXPLAYERS]; // Needs to be signed
char server_context[8]; // Unique context id, generated at server startup.
-
- UINT8 varlengthinputs[0]; // Playernames and netvars
} ATTRPACK serverconfig_pak;
typedef struct
@@ -462,9 +292,6 @@ typedef struct
client2cmd_pak client2pak; // 200 bytes
servertics_pak serverpak; // 132495 bytes (more around 360, no?)
serverconfig_pak servercfg; // 773 bytes
- resynchend_pak resynchend; //
- resynch_pak resynchpak; //
- UINT8 resynchgot; //
UINT8 textcmd[MAXTEXTCMD+1]; // 66049 bytes (wut??? 64k??? More like 257 bytes...)
filetx_pak filetxpak; // 139 bytes
fileack_pak fileack;
@@ -606,7 +433,7 @@ UINT8 GetFreeXCmdSize(void);
void D_MD5PasswordPass(const UINT8 *buffer, size_t len, const char *salt, void *dest);
-extern UINT8 hu_resynching;
+extern UINT8 hu_redownloadinggamestate;
extern UINT8 adminpassmd5[16];
extern boolean adminpasswordset;
diff --git a/src/d_main.c b/src/d_main.c
index d1a41401819e71ed9c0e131548c9991888f2a61a..61510d5903e2ec5ed89085839ffa50daa11628bb 100644
--- a/src/d_main.c
+++ b/src/d_main.c
@@ -61,12 +61,13 @@
#include "p_local.h" // chasecam
#include "mserv.h" // ms_RoomId
#include "m_misc.h" // screenshot functionality
-#include "dehacked.h" // Dehacked list test
+#include "deh_tables.h" // Dehacked list test
#include "m_cond.h" // condition initialization
#include "fastcmp.h"
#include "keys.h"
#include "filesrch.h" // refreshdirmenu, mainwadstally
#include "g_input.h" // tutorial mode control scheming
+#include "m_perfstats.h"
#ifdef CMAKECONFIG
#include "config.h"
@@ -106,8 +107,6 @@ boolean devparm = false; // started game with -devparm
boolean singletics = false; // timedemo
boolean lastdraw = false;
-static void D_CheckRendererState(void);
-
postimg_t postimgtype = postimg_none;
INT32 postimgparam;
postimg_t postimgtype2 = postimg_none;
@@ -236,7 +235,6 @@ INT16 wipetypepost = -1;
static void D_Display(void)
{
- INT32 setrenderstillneeded = 0;
boolean forcerefresh = false;
static boolean wipe = false;
INT32 wipedefindex = 0;
@@ -259,48 +257,28 @@ static void D_Display(void)
// create plane polygons, if necessary.
// 3. Functions related to switching video
// modes (resolution) are called.
- // 4. Patch data is freed from memory,
- // and recached if necessary.
- // 5. The frame is ready to be drawn!
-
- // stop movie if needs to change renderer
- if (setrenderneeded && (moviemode == MM_APNG))
- M_StopMovie();
+ // 4. The frame is ready to be drawn!
- // check for change of renderer or screen size (video mode)
+ // Check for change of renderer or screen size (video mode)
if ((setrenderneeded || setmodeneeded) && !wipe)
- {
- if (setrenderneeded)
- {
- CONS_Debug(DBG_RENDER, "setrenderneeded set (%d)\n", setrenderneeded);
- setrenderstillneeded = setrenderneeded;
- }
SCR_SetMode(); // change video mode
- }
- if (vid.recalc || setrenderstillneeded)
- {
+ // Recalc the screen
+ if (vid.recalc)
SCR_Recalc(); // NOTE! setsizeneeded is set by SCR_Recalc()
-#ifdef HWRENDER
- // Shoot! The screen texture was flushed!
- if ((rendermode == render_opengl) && (gamestate == GS_INTERMISSION))
- usebuffer = false;
-#endif
- }
+ // View morph
if (rendermode == render_soft && !splitscreen)
R_CheckViewMorph();
- // change the view size if needed
- if (setsizeneeded || setrenderstillneeded)
+ // Change the view size if needed
+ // Set by changing video mode or renderer
+ if (setsizeneeded)
{
R_ExecuteSetViewSize();
forcerefresh = true; // force background redraw
}
- // Lactozilla: Renderer switching
- D_CheckRendererState();
-
// draw buffered stuff to screen
// Used only by linux GGI version
I_UpdateNoBlit();
@@ -435,7 +413,7 @@ static void D_Display(void)
if (!automapactive && !dedicated && cv_renderview.value)
{
- rs_rendercalltime = I_GetTimeMicros();
+ ps_rendercalltime = I_GetPreciseTime();
if (players[displayplayer].mo || players[displayplayer].playerstate == PST_DEAD)
{
topleft = screens[0] + viewwindowy*vid.width + viewwindowx;
@@ -482,7 +460,7 @@ static void D_Display(void)
if (postimgtype2)
V_DoPostProcessor(1, postimgtype2, postimgparam2);
}
- rs_rendercalltime = I_GetTimeMicros() - rs_rendercalltime;
+ ps_rendercalltime = I_GetPreciseTime() - ps_rendercalltime;
}
if (lastdraw)
@@ -496,7 +474,7 @@ static void D_Display(void)
lastdraw = false;
}
- rs_uitime = I_GetTimeMicros();
+ ps_uitime = I_GetPreciseTime();
if (gamestate == GS_LEVEL)
{
@@ -509,7 +487,7 @@ static void D_Display(void)
}
else
{
- rs_uitime = I_GetTimeMicros();
+ ps_uitime = I_GetPreciseTime();
}
}
@@ -529,7 +507,7 @@ static void D_Display(void)
else
py = viewwindowy + 4;
patch = W_CachePatchName("M_PAUSE", PU_PATCH);
- V_DrawScaledPatch(viewwindowx + (BASEVIDWIDTH - SHORT(patch->width))/2, py, 0, patch);
+ V_DrawScaledPatch(viewwindowx + (BASEVIDWIDTH - patch->width)/2, py, 0, patch);
#else
INT32 y = ((automapactive) ? (32) : (BASEVIDHEIGHT/2));
M_DrawTextBox((BASEVIDWIDTH/2) - (60), y - (16), 13, 2);
@@ -551,7 +529,7 @@ static void D_Display(void)
CON_Drawer();
- rs_uitime = I_GetTimeMicros() - rs_uitime;
+ ps_uitime = I_GetPreciseTime() - ps_uitime;
//
// wipe update
@@ -632,111 +610,15 @@ static void D_Display(void)
V_DrawRightAlignedString(BASEVIDWIDTH, BASEVIDHEIGHT-ST_HEIGHT-10, V_YELLOWMAP, s);
}
- if (cv_renderstats.value)
+ if (cv_perfstats.value)
{
- char s[50];
- int frametime = I_GetTimeMicros() - rs_prevframetime;
- int divisor = 1;
- rs_prevframetime = I_GetTimeMicros();
-
- if (rs_rendercalltime > 10000) divisor = 1000;
-
- snprintf(s, sizeof s - 1, "ft %d", frametime / divisor);
- V_DrawThinString(30, 10, V_MONOSPACE | V_YELLOWMAP, s);
- snprintf(s, sizeof s - 1, "rtot %d", rs_rendercalltime / divisor);
- V_DrawThinString(30, 20, V_MONOSPACE | V_YELLOWMAP, s);
- snprintf(s, sizeof s - 1, "bsp %d", rs_bsptime / divisor);
- V_DrawThinString(30, 30, V_MONOSPACE | V_YELLOWMAP, s);
- snprintf(s, sizeof s - 1, "nbsp %d", rs_numbspcalls);
- V_DrawThinString(80, 10, V_MONOSPACE | V_BLUEMAP, s);
- snprintf(s, sizeof s - 1, "nspr %d", rs_numsprites);
- V_DrawThinString(80, 20, V_MONOSPACE | V_BLUEMAP, s);
- snprintf(s, sizeof s - 1, "nnod %d", rs_numdrawnodes);
- V_DrawThinString(80, 30, V_MONOSPACE | V_BLUEMAP, s);
- snprintf(s, sizeof s - 1, "npob %d", rs_numpolyobjects);
- V_DrawThinString(80, 40, V_MONOSPACE | V_BLUEMAP, s);
- if (rendermode == render_opengl) // OpenGL specific stats
- {
-#ifdef HWRENDER
- snprintf(s, sizeof s - 1, "nsrt %d", rs_hw_nodesorttime / divisor);
- V_DrawThinString(30, 40, V_MONOSPACE | V_YELLOWMAP, s);
- snprintf(s, sizeof s - 1, "ndrw %d", rs_hw_nodedrawtime / divisor);
- V_DrawThinString(30, 50, V_MONOSPACE | V_YELLOWMAP, s);
- snprintf(s, sizeof s - 1, "ssrt %d", rs_hw_spritesorttime / divisor);
- V_DrawThinString(30, 60, V_MONOSPACE | V_YELLOWMAP, s);
- snprintf(s, sizeof s - 1, "sdrw %d", rs_hw_spritedrawtime / divisor);
- V_DrawThinString(30, 70, V_MONOSPACE | V_YELLOWMAP, s);
- snprintf(s, sizeof s - 1, "ui %d", rs_uitime / divisor);
- V_DrawThinString(30, 80, V_MONOSPACE | V_YELLOWMAP, s);
- snprintf(s, sizeof s - 1, "fin %d", rs_swaptime / divisor);
- V_DrawThinString(30, 90, V_MONOSPACE | V_YELLOWMAP, s);
- snprintf(s, sizeof s - 1, "tic %d", rs_tictime / divisor);
- V_DrawThinString(30, 105, V_MONOSPACE | V_GRAYMAP, s);
- if (cv_glbatching.value)
- {
- snprintf(s, sizeof s - 1, "bsrt %d", rs_hw_batchsorttime / divisor);
- V_DrawThinString(80, 55, V_MONOSPACE | V_REDMAP, s);
- snprintf(s, sizeof s - 1, "bdrw %d", rs_hw_batchdrawtime / divisor);
- V_DrawThinString(80, 65, V_MONOSPACE | V_REDMAP, s);
-
- snprintf(s, sizeof s - 1, "npol %d", rs_hw_numpolys);
- V_DrawThinString(130, 10, V_MONOSPACE | V_PURPLEMAP, s);
- snprintf(s, sizeof s - 1, "ndc %d", rs_hw_numcalls);
- V_DrawThinString(130, 20, V_MONOSPACE | V_PURPLEMAP, s);
- snprintf(s, sizeof s - 1, "nshd %d", rs_hw_numshaders);
- V_DrawThinString(130, 30, V_MONOSPACE | V_PURPLEMAP, s);
- snprintf(s, sizeof s - 1, "nvrt %d", rs_hw_numverts);
- V_DrawThinString(130, 40, V_MONOSPACE | V_PURPLEMAP, s);
- snprintf(s, sizeof s - 1, "ntex %d", rs_hw_numtextures);
- V_DrawThinString(185, 10, V_MONOSPACE | V_PURPLEMAP, s);
- snprintf(s, sizeof s - 1, "npf %d", rs_hw_numpolyflags);
- V_DrawThinString(185, 20, V_MONOSPACE | V_PURPLEMAP, s);
- snprintf(s, sizeof s - 1, "ncol %d", rs_hw_numcolors);
- V_DrawThinString(185, 30, V_MONOSPACE | V_PURPLEMAP, s);
- }
-#endif
- }
- else // software specific stats
- {
- snprintf(s, sizeof s - 1, "prtl %d", rs_sw_portaltime / divisor);
- V_DrawThinString(30, 40, V_MONOSPACE | V_YELLOWMAP, s);
- snprintf(s, sizeof s - 1, "plns %d", rs_sw_planetime / divisor);
- V_DrawThinString(30, 50, V_MONOSPACE | V_YELLOWMAP, s);
- snprintf(s, sizeof s - 1, "mskd %d", rs_sw_maskedtime / divisor);
- V_DrawThinString(30, 60, V_MONOSPACE | V_YELLOWMAP, s);
- snprintf(s, sizeof s - 1, "ui %d", rs_uitime / divisor);
- V_DrawThinString(30, 70, V_MONOSPACE | V_YELLOWMAP, s);
- snprintf(s, sizeof s - 1, "fin %d", rs_swaptime / divisor);
- V_DrawThinString(30, 80, V_MONOSPACE | V_YELLOWMAP, s);
- snprintf(s, sizeof s - 1, "tic %d", rs_tictime / divisor);
- V_DrawThinString(30, 95, V_MONOSPACE | V_GRAYMAP, s);
- }
+ M_DrawPerfStats();
}
- rs_swaptime = I_GetTimeMicros();
+ ps_swaptime = I_GetPreciseTime();
I_FinishUpdate(); // page flip or blit buffer
- rs_swaptime = I_GetTimeMicros() - rs_swaptime;
+ ps_swaptime = I_GetPreciseTime() - ps_swaptime;
}
-
- needpatchflush = false;
- needpatchrecache = false;
-}
-
-// Check the renderer's state
-// after a possible renderer switch.
-void D_CheckRendererState(void)
-{
- // flush all patches from memory
- if (needpatchflush)
- {
- Z_FlushCachedPatches();
- needpatchflush = false;
- }
-
- // some patches have been freed,
- // so cache them again
- if (needpatchrecache)
- R_ReloadHUDGraphics();
}
// =========================================================================
@@ -763,12 +645,15 @@ void D_SRB2Loop(void)
oldentertics = I_GetTime();
// end of loading screen: CONS_Printf() will no more call FinishUpdate()
+ con_refresh = false;
con_startup = false;
// make sure to do a d_display to init mode _before_ load a level
SCR_SetMode(); // change video mode
SCR_Recalc();
+ chosenrendermode = render_none;
+
// Check and print which version is executed.
// Use this as the border between setup and the main game loop being entered.
CONS_Printf(
@@ -1113,7 +998,7 @@ static void IdentifyVersion(void)
#define MUSICTEST(str) \
{\
const char *musicpath = va(pandf,srb2waddir,str);\
- int ms = W_VerifyNMUSlumps(musicpath); \
+ int ms = W_VerifyNMUSlumps(musicpath, false); \
if (ms == 1) \
D_AddFile(startupwadfiles, musicpath); \
else if (ms == 0) \
@@ -1160,7 +1045,7 @@ void D_SRB2Main(void)
// Print GPL notice for our console users (Linux)
CONS_Printf(
"\n\nSonic Robo Blast 2\n"
- "Copyright (C) 1998-2020 by Sonic Team Junior\n\n"
+ "Copyright (C) 1998-2021 by Sonic Team Junior\n\n"
"This program comes with ABSOLUTELY NO WARRANTY.\n\n"
"This is free software, and you are welcome to redistribute it\n"
"and/or modify it under the terms of the GNU General Public License\n"
@@ -1187,7 +1072,7 @@ void D_SRB2Main(void)
G_LoadGameSettings();
// Test Dehacked lists
- DEH_Check();
+ DEH_TableCheck();
// Netgame URL special case: change working dir to EXE folder.
ChangeDirForUrlHandler();
@@ -1302,11 +1187,7 @@ void D_SRB2Main(void)
const char *s = M_GetNextParm();
if (s) // Check for NULL?
- {
- if (!W_VerifyNMUSlumps(s))
- G_SetGameModified(true);
D_AddFile(startuppwads, s);
- }
}
}
}
@@ -1413,24 +1294,6 @@ void D_SRB2Main(void)
// set user default mode or mode set at cmdline
SCR_CheckDefaultMode();
- // Lactozilla: Does the render mode need to change?
- if ((setrenderneeded != 0) && (setrenderneeded != rendermode))
- {
- CONS_Printf(M_GetText("Switching the renderer...\n"));
- Z_PreparePatchFlush();
-
- // set needpatchflush / needpatchrecache true for D_CheckRendererState
- needpatchflush = true;
- needpatchrecache = true;
-
- // Set cv_renderer to the new render mode
- VID_CheckRenderer();
- SCR_ChangeRendererCVars(rendermode);
-
- // check the renderer's state
- D_CheckRendererState();
- }
-
wipegamestate = gamestate;
savedata.lives = 0; // flag this as not-used
@@ -1589,6 +1452,12 @@ void D_SRB2Main(void)
ultimatemode = true;
}
+ if (M_CheckParm("-splitscreen"))
+ {
+ autostart = true;
+ splitscreen = true;
+ }
+
// rei/miru: bootmap (Idea: starts the game on a predefined map)
if (bootmap && !(M_CheckParm("-warp") && M_IsNextParm()))
{
@@ -1667,7 +1536,7 @@ void D_SRB2Main(void)
{
levelstarttic = gametic;
G_SetGamestate(GS_LEVEL);
- if (!P_LoadLevel(false))
+ if (!P_LoadLevel(false, false))
I_Quit(); // fail so reset game stuff
}
}
diff --git a/src/d_net.c b/src/d_net.c
index 2823ce2191ebcde53dc1c2a21d1a8ff9e03bef08..d534b1b081360da6f7274f33e14cb178c1d2f632 100644
--- a/src/d_net.c
+++ b/src/d_net.c
@@ -798,8 +798,9 @@ static const char *packettypename[NUMPACKETTYPE] =
"REQUESTFILE",
"ASKINFOVIAMS",
- "RESYNCHEND",
- "RESYNCHGET",
+ "WILLRESENDGAMESTATE",
+ "CANRECEIVEGAMESTATE",
+ "RECEIVEDGAMESTATE",
"SENDINGLUAFILE",
"ASKLUAFILE",
@@ -813,7 +814,6 @@ static const char *packettypename[NUMPACKETTYPE] =
"TEXTCMD2",
"CLIENTJOIN",
"NODETIMEOUT",
- "RESYNCHING",
"LOGIN",
"PING"
};
diff --git a/src/d_netcmd.c b/src/d_netcmd.c
index 4208e4c4f400686df62b575f2a667a39c6377931..09f9d46514b12bc7e987fecbd3cf2f81e95fc88b 100644
--- a/src/d_netcmd.c
+++ b/src/d_netcmd.c
@@ -197,186 +197,182 @@ static CV_PossibleValue_t matchboxes_cons_t[] = {{0, "Normal"}, {1, "Mystery"},
static CV_PossibleValue_t chances_cons_t[] = {{0, "MIN"}, {9, "MAX"}, {0, NULL}};
static CV_PossibleValue_t pause_cons_t[] = {{0, "Server"}, {1, "All"}, {0, NULL}};
-consvar_t cv_showinputjoy = {"showinputjoy", "Off", 0, CV_OnOff, NULL, 0, NULL, NULL, 0, 0, NULL};
+consvar_t cv_showinputjoy = CVAR_INIT ("showinputjoy", "Off", 0, CV_OnOff, NULL);
#ifdef NETGAME_DEVMODE
-static consvar_t cv_fishcake = {"fishcake", "Off", CV_CALL|CV_NOSHOWHELP|CV_RESTRICT, CV_OnOff, Fishcake_OnChange, 0, NULL, NULL, 0, 0, NULL};
+static consvar_t cv_fishcake = CVAR_INIT ("fishcake", "Off", CV_CALL|CV_NOSHOWHELP|CV_RESTRICT, CV_OnOff, Fishcake_OnChange);
#endif
-static consvar_t cv_dummyconsvar = {"dummyconsvar", "Off", CV_CALL|CV_NOSHOWHELP, CV_OnOff,
- DummyConsvar_OnChange, 0, NULL, NULL, 0, 0, NULL};
+static consvar_t cv_dummyconsvar = CVAR_INIT ("dummyconsvar", "Off", CV_CALL|CV_NOSHOWHELP, CV_OnOff, DummyConsvar_OnChange);
-consvar_t cv_restrictskinchange = {"restrictskinchange", "Yes", CV_NETVAR|CV_CHEAT, CV_YesNo, NULL, 0, NULL, NULL, 0, 0, NULL};
-consvar_t cv_allowteamchange = {"allowteamchange", "Yes", CV_NETVAR, CV_YesNo, NULL, 0, NULL, NULL, 0, 0, NULL};
+consvar_t cv_restrictskinchange = CVAR_INIT ("restrictskinchange", "Yes", CV_SAVE|CV_NETVAR|CV_CHEAT, CV_YesNo, NULL);
+consvar_t cv_allowteamchange = CVAR_INIT ("allowteamchange", "Yes", CV_SAVE|CV_NETVAR, CV_YesNo, NULL);
-consvar_t cv_startinglives = {"startinglives", "3", CV_NETVAR|CV_CHEAT, startingliveslimit_cons_t, NULL, 0, NULL, NULL, 0, 0, NULL};
+consvar_t cv_startinglives = CVAR_INIT ("startinglives", "3", CV_SAVE|CV_NETVAR|CV_CHEAT, startingliveslimit_cons_t, NULL);
static CV_PossibleValue_t respawntime_cons_t[] = {{1, "MIN"}, {30, "MAX"}, {0, "Off"}, {0, NULL}};
-consvar_t cv_respawntime = {"respawndelay", "3", CV_NETVAR|CV_CHEAT, respawntime_cons_t, NULL, 0, NULL, NULL, 0, 0, NULL};
+consvar_t cv_respawntime = CVAR_INIT ("respawndelay", "3", CV_SAVE|CV_NETVAR|CV_CHEAT, respawntime_cons_t, NULL);
-consvar_t cv_competitionboxes = {"competitionboxes", "Mystery", CV_NETVAR|CV_CHEAT, competitionboxes_cons_t, NULL, 0, NULL, NULL, 0, 0, NULL};
+consvar_t cv_competitionboxes = CVAR_INIT ("competitionboxes", "Mystery", CV_SAVE|CV_NETVAR|CV_CHEAT, competitionboxes_cons_t, NULL);
-#ifdef SEENAMES
static CV_PossibleValue_t seenames_cons_t[] = {{0, "Off"}, {1, "Colorless"}, {2, "Team"}, {3, "Ally/Foe"}, {0, NULL}};
-consvar_t cv_seenames = {"seenames", "Ally/Foe", CV_SAVE, seenames_cons_t, 0, 0, NULL, NULL, 0, 0, NULL};
-consvar_t cv_allowseenames = {"allowseenames", "Yes", CV_NETVAR, CV_YesNo, NULL, 0, NULL, NULL, 0, 0, NULL};
-#endif
+consvar_t cv_seenames = CVAR_INIT ("seenames", "Ally/Foe", CV_SAVE, seenames_cons_t, 0);
+consvar_t cv_allowseenames = CVAR_INIT ("allowseenames", "Yes", CV_SAVE|CV_NETVAR, CV_YesNo, NULL);
// names
-consvar_t cv_playername = {"name", "Sonic", CV_SAVE|CV_CALL|CV_NOINIT, NULL, Name_OnChange, 0, NULL, NULL, 0, 0, NULL};
-consvar_t cv_playername2 = {"name2", "Tails", CV_SAVE|CV_CALL|CV_NOINIT, NULL, Name2_OnChange, 0, NULL, NULL, 0, 0, NULL};
+consvar_t cv_playername = CVAR_INIT ("name", "Sonic", CV_SAVE|CV_CALL|CV_NOINIT, NULL, Name_OnChange);
+consvar_t cv_playername2 = CVAR_INIT ("name2", "Tails", CV_SAVE|CV_CALL|CV_NOINIT, NULL, Name2_OnChange);
// player colors
UINT16 lastgoodcolor = SKINCOLOR_BLUE, lastgoodcolor2 = SKINCOLOR_BLUE;
-consvar_t cv_playercolor = {"color", "Blue", CV_CALL|CV_NOINIT, Color_cons_t, Color_OnChange, 0, NULL, NULL, 0, 0, NULL};
-consvar_t cv_playercolor2 = {"color2", "Orange", CV_CALL|CV_NOINIT, Color_cons_t, Color2_OnChange, 0, NULL, NULL, 0, 0, NULL};
+consvar_t cv_playercolor = CVAR_INIT ("color", "Blue", CV_CALL|CV_NOINIT, Color_cons_t, Color_OnChange);
+consvar_t cv_playercolor2 = CVAR_INIT ("color2", "Orange", CV_CALL|CV_NOINIT, Color_cons_t, Color2_OnChange);
// player's skin, saved for commodity, when using a favorite skins wad..
-consvar_t cv_skin = {"skin", DEFAULTSKIN, CV_CALL|CV_NOINIT, NULL, Skin_OnChange, 0, NULL, NULL, 0, 0, NULL};
-consvar_t cv_skin2 = {"skin2", DEFAULTSKIN2, CV_CALL|CV_NOINIT, NULL, Skin2_OnChange, 0, NULL, NULL, 0, 0, NULL};
+consvar_t cv_skin = CVAR_INIT ("skin", DEFAULTSKIN, CV_CALL|CV_NOINIT, NULL, Skin_OnChange);
+consvar_t cv_skin2 = CVAR_INIT ("skin2", DEFAULTSKIN2, CV_CALL|CV_NOINIT, NULL, Skin2_OnChange);
// saved versions of the above six
-consvar_t cv_defaultplayercolor = {"defaultcolor", "Blue", CV_SAVE, Color_cons_t, NULL, 0, NULL, NULL, 0, 0, NULL};
-consvar_t cv_defaultplayercolor2 = {"defaultcolor2", "Orange", CV_SAVE, Color_cons_t, NULL, 0, NULL, NULL, 0, 0, NULL};
-consvar_t cv_defaultskin = {"defaultskin", DEFAULTSKIN, CV_SAVE, NULL, NULL, 0, NULL, NULL, 0, 0, NULL};
-consvar_t cv_defaultskin2 = {"defaultskin2", DEFAULTSKIN2, CV_SAVE, NULL, NULL, 0, NULL, NULL, 0, 0, NULL};
+consvar_t cv_defaultplayercolor = CVAR_INIT ("defaultcolor", "Blue", CV_SAVE, Color_cons_t, NULL);
+consvar_t cv_defaultplayercolor2 = CVAR_INIT ("defaultcolor2", "Orange", CV_SAVE, Color_cons_t, NULL);
+consvar_t cv_defaultskin = CVAR_INIT ("defaultskin", DEFAULTSKIN, CV_SAVE, NULL, NULL);
+consvar_t cv_defaultskin2 = CVAR_INIT ("defaultskin2", DEFAULTSKIN2, CV_SAVE, NULL, NULL);
-consvar_t cv_skipmapcheck = {"skipmapcheck", "Off", CV_SAVE, CV_OnOff, NULL, 0, NULL, NULL, 0, 0, NULL};
+consvar_t cv_skipmapcheck = CVAR_INIT ("skipmapcheck", "Off", CV_SAVE, CV_OnOff, NULL);
INT32 cv_debug;
-consvar_t cv_usemouse = {"use_mouse", "On", CV_SAVE|CV_CALL,usemouse_cons_t, I_StartupMouse, 0, NULL, NULL, 0, 0, NULL};
-consvar_t cv_usemouse2 = {"use_mouse2", "Off", CV_SAVE|CV_CALL,usemouse_cons_t, I_StartupMouse2, 0, NULL, NULL, 0, 0, NULL};
+consvar_t cv_usemouse = CVAR_INIT ("use_mouse", "On", CV_SAVE|CV_CALL,usemouse_cons_t, I_StartupMouse);
+consvar_t cv_usemouse2 = CVAR_INIT ("use_mouse2", "Off", CV_SAVE|CV_CALL,usemouse_cons_t, I_StartupMouse2);
-consvar_t cv_usejoystick = {"use_gamepad", "1", CV_SAVE|CV_CALL, usejoystick_cons_t,
- I_InitJoystick, 0, NULL, NULL, 0, 0, NULL};
-consvar_t cv_usejoystick2 = {"use_gamepad2", "2", CV_SAVE|CV_CALL, usejoystick_cons_t,
- I_InitJoystick2, 0, NULL, NULL, 0, 0, NULL};
+consvar_t cv_usejoystick = CVAR_INIT ("use_gamepad", "1", CV_SAVE|CV_CALL, usejoystick_cons_t, I_InitJoystick);
+consvar_t cv_usejoystick2 = CVAR_INIT ("use_gamepad2", "2", CV_SAVE|CV_CALL, usejoystick_cons_t, I_InitJoystick2);
#if (defined (LJOYSTICK) || defined (HAVE_SDL))
#ifdef LJOYSTICK
-consvar_t cv_joyport = {"padport", "/dev/js0", CV_SAVE, joyport_cons_t, NULL, 0, NULL, NULL, 0, 0, NULL};
-consvar_t cv_joyport2 = {"padport2", "/dev/js0", CV_SAVE, joyport_cons_t, NULL, 0, NULL, NULL, 0, 0, NULL}; //Alam: for later
+consvar_t cv_joyport = CVAR_INIT ("padport", "/dev/js0", CV_SAVE, joyport_cons_t, NULL);
+consvar_t cv_joyport2 = CVAR_INIT ("padport2", "/dev/js0", CV_SAVE, joyport_cons_t, NULL); //Alam: for later
#endif
-consvar_t cv_joyscale = {"padscale", "1", CV_SAVE|CV_CALL, NULL, I_JoyScale, 0, NULL, NULL, 0, 0, NULL};
-consvar_t cv_joyscale2 = {"padscale2", "1", CV_SAVE|CV_CALL, NULL, I_JoyScale2, 0, NULL, NULL, 0, 0, NULL};
+consvar_t cv_joyscale = CVAR_INIT ("padscale", "1", CV_SAVE|CV_CALL, NULL, I_JoyScale);
+consvar_t cv_joyscale2 = CVAR_INIT ("padscale2", "1", CV_SAVE|CV_CALL, NULL, I_JoyScale2);
#else
-consvar_t cv_joyscale = {"padscale", "1", CV_SAVE|CV_HIDEN, NULL, NULL, 0, NULL, NULL, 0, 0, NULL}; //Alam: Dummy for save
-consvar_t cv_joyscale2 = {"padscale2", "1", CV_SAVE|CV_HIDEN, NULL, NULL, 0, NULL, NULL, 0, 0, NULL}; //Alam: Dummy for save
+consvar_t cv_joyscale = CVAR_INIT ("padscale", "1", CV_SAVE|CV_HIDEN, NULL, NULL); //Alam: Dummy for save
+consvar_t cv_joyscale2 = CVAR_INIT ("padscale2", "1", CV_SAVE|CV_HIDEN, NULL, NULL); //Alam: Dummy for save
#endif
#if (defined (__unix__) && !defined (MSDOS)) || defined(__APPLE__) || defined (UNIXCOMMON)
-consvar_t cv_mouse2port = {"mouse2port", "/dev/gpmdata", CV_SAVE, mouse2port_cons_t, NULL, 0, NULL, NULL, 0, 0, NULL};
-consvar_t cv_mouse2opt = {"mouse2opt", "0", CV_SAVE, NULL, NULL, 0, NULL, NULL, 0, 0, NULL};
+consvar_t cv_mouse2port = CVAR_INIT ("mouse2port", "/dev/gpmdata", CV_SAVE, mouse2port_cons_t, NULL);
+consvar_t cv_mouse2opt = CVAR_INIT ("mouse2opt", "0", CV_SAVE, NULL, NULL);
#else
-consvar_t cv_mouse2port = {"mouse2port", "COM2", CV_SAVE, mouse2port_cons_t, NULL, 0, NULL, NULL, 0, 0, NULL};
+consvar_t cv_mouse2port = CVAR_INIT ("mouse2port", "COM2", CV_SAVE, mouse2port_cons_t, NULL);
#endif
-consvar_t cv_matchboxes = {"matchboxes", "Normal", CV_NETVAR|CV_CHEAT, matchboxes_cons_t, NULL, 0, NULL, NULL, 0, 0, NULL};
-consvar_t cv_specialrings = {"specialrings", "On", CV_NETVAR, CV_OnOff, NULL, 0, NULL, NULL, 0, 0, NULL};
-consvar_t cv_powerstones = {"powerstones", "On", CV_NETVAR, CV_OnOff, NULL, 0, NULL, NULL, 0, 0, NULL};
-
-consvar_t cv_recycler = {"tv_recycler", "5", CV_NETVAR|CV_CHEAT, chances_cons_t, NULL, 0, NULL, NULL, 0, 0, NULL};
-consvar_t cv_teleporters = {"tv_teleporter", "5", CV_NETVAR|CV_CHEAT, chances_cons_t, NULL, 0, NULL, NULL, 0, 0, NULL};
-consvar_t cv_superring = {"tv_superring", "5", CV_NETVAR|CV_CHEAT, chances_cons_t, NULL, 0, NULL, NULL, 0, 0, NULL};
-consvar_t cv_supersneakers = {"tv_supersneaker", "5", CV_NETVAR|CV_CHEAT, chances_cons_t, NULL, 0, NULL, NULL, 0, 0, NULL};
-consvar_t cv_invincibility = {"tv_invincibility", "5", CV_NETVAR|CV_CHEAT, chances_cons_t, NULL, 0, NULL, NULL, 0, 0, NULL};
-consvar_t cv_jumpshield = {"tv_jumpshield", "5", CV_NETVAR|CV_CHEAT, chances_cons_t, NULL, 0, NULL, NULL, 0, 0, NULL};
-consvar_t cv_watershield = {"tv_watershield", "5", CV_NETVAR|CV_CHEAT, chances_cons_t, NULL, 0, NULL, NULL, 0, 0, NULL};
-consvar_t cv_ringshield = {"tv_ringshield", "5", CV_NETVAR|CV_CHEAT, chances_cons_t, NULL, 0, NULL, NULL, 0, 0, NULL};
-consvar_t cv_forceshield = {"tv_forceshield", "5", CV_NETVAR|CV_CHEAT, chances_cons_t, NULL, 0, NULL, NULL, 0, 0, NULL};
-consvar_t cv_bombshield = {"tv_bombshield", "5", CV_NETVAR|CV_CHEAT, chances_cons_t, NULL, 0, NULL, NULL, 0, 0, NULL};
-consvar_t cv_1up = {"tv_1up", "5", CV_NETVAR|CV_CHEAT, chances_cons_t, NULL, 0, NULL, NULL, 0, 0, NULL};
-consvar_t cv_eggmanbox = {"tv_eggman", "5", CV_NETVAR|CV_CHEAT, chances_cons_t, NULL, 0, NULL, NULL, 0, 0, NULL};
-
-consvar_t cv_ringslinger = {"ringslinger", "No", CV_NETVAR|CV_NOSHOWHELP|CV_CALL|CV_CHEAT, CV_YesNo,
- Ringslinger_OnChange, 0, NULL, NULL, 0, 0, NULL};
-consvar_t cv_gravity = {"gravity", "0.5", CV_RESTRICT|CV_FLOAT|CV_CALL, NULL, Gravity_OnChange, 0, NULL, NULL, 0, 0, NULL};
-
-consvar_t cv_soundtest = {"soundtest", "0", CV_CALL, NULL, SoundTest_OnChange, 0, NULL, NULL, 0, 0, NULL};
+consvar_t cv_matchboxes = CVAR_INIT ("matchboxes", "Normal", CV_SAVE|CV_NETVAR|CV_CHEAT, matchboxes_cons_t, NULL);
+consvar_t cv_specialrings = CVAR_INIT ("specialrings", "On", CV_SAVE|CV_NETVAR, CV_OnOff, NULL);
+consvar_t cv_powerstones = CVAR_INIT ("powerstones", "On", CV_SAVE|CV_NETVAR, CV_OnOff, NULL);
+
+consvar_t cv_recycler = CVAR_INIT ("tv_recycler", "5", CV_SAVE|CV_NETVAR|CV_CHEAT, chances_cons_t, NULL);
+consvar_t cv_teleporters = CVAR_INIT ("tv_teleporter", "5", CV_SAVE|CV_NETVAR|CV_CHEAT, chances_cons_t, NULL);
+consvar_t cv_superring = CVAR_INIT ("tv_superring", "5", CV_SAVE|CV_NETVAR|CV_CHEAT, chances_cons_t, NULL);
+consvar_t cv_supersneakers = CVAR_INIT ("tv_supersneaker", "5", CV_SAVE|CV_NETVAR|CV_CHEAT, chances_cons_t, NULL);
+consvar_t cv_invincibility = CVAR_INIT ("tv_invincibility", "5", CV_SAVE|CV_NETVAR|CV_CHEAT, chances_cons_t, NULL);
+consvar_t cv_jumpshield = CVAR_INIT ("tv_jumpshield", "5", CV_SAVE|CV_NETVAR|CV_CHEAT, chances_cons_t, NULL);
+consvar_t cv_watershield = CVAR_INIT ("tv_watershield", "5", CV_SAVE|CV_NETVAR|CV_CHEAT, chances_cons_t, NULL);
+consvar_t cv_ringshield = CVAR_INIT ("tv_ringshield", "5", CV_SAVE|CV_NETVAR|CV_CHEAT, chances_cons_t, NULL);
+consvar_t cv_forceshield = CVAR_INIT ("tv_forceshield", "5", CV_SAVE|CV_NETVAR|CV_CHEAT, chances_cons_t, NULL);
+consvar_t cv_bombshield = CVAR_INIT ("tv_bombshield", "5", CV_SAVE|CV_NETVAR|CV_CHEAT, chances_cons_t, NULL);
+consvar_t cv_1up = CVAR_INIT ("tv_1up", "5", CV_SAVE|CV_NETVAR|CV_CHEAT, chances_cons_t, NULL);
+consvar_t cv_eggmanbox = CVAR_INIT ("tv_eggman", "5", CV_SAVE|CV_NETVAR|CV_CHEAT, chances_cons_t, NULL);
+
+consvar_t cv_ringslinger = CVAR_INIT ("ringslinger", "No", CV_NETVAR|CV_NOSHOWHELP|CV_CALL|CV_CHEAT, CV_YesNo, Ringslinger_OnChange);
+consvar_t cv_gravity = CVAR_INIT ("gravity", "0.5", CV_RESTRICT|CV_FLOAT|CV_CALL, NULL, Gravity_OnChange);
+
+consvar_t cv_soundtest = CVAR_INIT ("soundtest", "0", CV_CALL, NULL, SoundTest_OnChange);
static CV_PossibleValue_t minitimelimit_cons_t[] = {{15, "MIN"}, {9999, "MAX"}, {0, NULL}};
-consvar_t cv_countdowntime = {"countdowntime", "60", CV_NETVAR|CV_CHEAT, minitimelimit_cons_t, NULL, 0, NULL, NULL, 0, 0, NULL};
+consvar_t cv_countdowntime = CVAR_INIT ("countdowntime", "60", CV_SAVE|CV_NETVAR|CV_CHEAT, minitimelimit_cons_t, NULL);
-consvar_t cv_touchtag = {"touchtag", "Off", CV_NETVAR, CV_OnOff, NULL, 0, NULL, NULL, 0, 0, NULL};
-consvar_t cv_hidetime = {"hidetime", "30", CV_NETVAR|CV_CALL, minitimelimit_cons_t, Hidetime_OnChange, 0, NULL, NULL, 0, 0, NULL};
+consvar_t cv_touchtag = CVAR_INIT ("touchtag", "Off", CV_SAVE|CV_NETVAR, CV_OnOff, NULL);
+consvar_t cv_hidetime = CVAR_INIT ("hidetime", "30", CV_SAVE|CV_NETVAR|CV_CALL, minitimelimit_cons_t, Hidetime_OnChange);
-consvar_t cv_autobalance = {"autobalance", "Off", CV_NETVAR|CV_CALL, CV_OnOff, AutoBalance_OnChange, 0, NULL, NULL, 0, 0, NULL};
-consvar_t cv_teamscramble = {"teamscramble", "Off", CV_NETVAR|CV_CALL|CV_NOINIT, teamscramble_cons_t, TeamScramble_OnChange, 0, NULL, NULL, 0, 0, NULL};
-consvar_t cv_scrambleonchange = {"scrambleonchange", "Off", CV_NETVAR, teamscramble_cons_t, NULL, 0, NULL, NULL, 0, 0, NULL};
+consvar_t cv_autobalance = CVAR_INIT ("autobalance", "Off", CV_SAVE|CV_NETVAR|CV_CALL, CV_OnOff, AutoBalance_OnChange);
+consvar_t cv_teamscramble = CVAR_INIT ("teamscramble", "Off", CV_SAVE|CV_NETVAR|CV_CALL|CV_NOINIT, teamscramble_cons_t, TeamScramble_OnChange);
+consvar_t cv_scrambleonchange = CVAR_INIT ("scrambleonchange", "Off", CV_SAVE|CV_NETVAR, teamscramble_cons_t, NULL);
-consvar_t cv_friendlyfire = {"friendlyfire", "Off", CV_NETVAR, CV_OnOff, NULL, 0, NULL, NULL, 0, 0, NULL};
-consvar_t cv_itemfinder = {"itemfinder", "Off", CV_CALL, CV_OnOff, ItemFinder_OnChange, 0, NULL, NULL, 0, 0, NULL};
+consvar_t cv_friendlyfire = CVAR_INIT ("friendlyfire", "Off", CV_SAVE|CV_NETVAR, CV_OnOff, NULL);
+consvar_t cv_itemfinder = CVAR_INIT ("itemfinder", "Off", CV_CALL, CV_OnOff, ItemFinder_OnChange);
// Scoring type options
-consvar_t cv_overtime = {"overtime", "Yes", CV_NETVAR, CV_YesNo, NULL, 0, NULL, NULL, 0, 0, NULL};
+consvar_t cv_overtime = CVAR_INIT ("overtime", "Yes", CV_SAVE|CV_NETVAR, CV_YesNo, NULL);
-consvar_t cv_rollingdemos = {"rollingdemos", "On", CV_SAVE, CV_OnOff, NULL, 0, NULL, NULL, 0, 0, NULL};
+consvar_t cv_rollingdemos = CVAR_INIT ("rollingdemos", "On", CV_SAVE, CV_OnOff, NULL);
static CV_PossibleValue_t timetic_cons_t[] = {{0, "Classic"}, {1, "Centiseconds"}, {2, "Mania"}, {3, "Tics"}, {0, NULL}};
-consvar_t cv_timetic = {"timerres", "Classic", CV_SAVE, timetic_cons_t, NULL, 0, NULL, NULL, 0, 0, NULL};
+consvar_t cv_timetic = CVAR_INIT ("timerres", "Classic", CV_SAVE, timetic_cons_t, NULL);
static CV_PossibleValue_t powerupdisplay_cons_t[] = {{0, "Never"}, {1, "First-person only"}, {2, "Always"}, {0, NULL}};
-consvar_t cv_powerupdisplay = {"powerupdisplay", "First-person only", CV_SAVE, powerupdisplay_cons_t, NULL, 0, NULL, NULL, 0, 0, NULL};
+consvar_t cv_powerupdisplay = CVAR_INIT ("powerupdisplay", "First-person only", CV_SAVE, powerupdisplay_cons_t, NULL);
static CV_PossibleValue_t pointlimit_cons_t[] = {{1, "MIN"}, {MAXSCORE, "MAX"}, {0, "None"}, {0, NULL}};
-consvar_t cv_pointlimit = {"pointlimit", "None", CV_NETVAR|CV_CALL|CV_NOINIT, pointlimit_cons_t,
- PointLimit_OnChange, 0, NULL, NULL, 0, 0, NULL};
+consvar_t cv_pointlimit = CVAR_INIT ("pointlimit", "None", CV_SAVE|CV_NETVAR|CV_CALL|CV_NOINIT, pointlimit_cons_t, PointLimit_OnChange);
static CV_PossibleValue_t timelimit_cons_t[] = {{1, "MIN"}, {30, "MAX"}, {0, "None"}, {0, NULL}};
-consvar_t cv_timelimit = {"timelimit", "None", CV_NETVAR|CV_CALL|CV_NOINIT, timelimit_cons_t,
- TimeLimit_OnChange, 0, NULL, NULL, 0, 0, NULL};
+consvar_t cv_timelimit = CVAR_INIT ("timelimit", "None", CV_SAVE|CV_NETVAR|CV_CALL|CV_NOINIT, timelimit_cons_t, TimeLimit_OnChange);
static CV_PossibleValue_t numlaps_cons_t[] = {{1, "MIN"}, {50, "MAX"}, {0, NULL}};
-consvar_t cv_numlaps = {"numlaps", "4", CV_NETVAR|CV_CALL|CV_NOINIT, numlaps_cons_t,
- NumLaps_OnChange, 0, NULL, NULL, 0, 0, NULL};
+consvar_t cv_numlaps = CVAR_INIT ("numlaps", "4", CV_NETVAR|CV_CALL|CV_NOINIT, numlaps_cons_t, NumLaps_OnChange);
static CV_PossibleValue_t basenumlaps_cons_t[] = {{1, "MIN"}, {50, "MAX"}, {0, "Map default"}, {0, NULL}};
-consvar_t cv_basenumlaps = {"basenumlaps", "Map default", CV_NETVAR|CV_CALL|CV_CHEAT, basenumlaps_cons_t, BaseNumLaps_OnChange, 0, NULL, NULL, 0, 0, NULL};
+consvar_t cv_basenumlaps = CVAR_INIT ("basenumlaps", "Map default", CV_SAVE|CV_NETVAR|CV_CALL|CV_CHEAT, basenumlaps_cons_t, BaseNumLaps_OnChange);
// Point and time limits for every gametype
INT32 pointlimits[NUMGAMETYPES];
INT32 timelimits[NUMGAMETYPES];
// log elemental hazards -- not a netvar, is local to current player
-consvar_t cv_hazardlog = {"hazardlog", "Yes", 0, CV_YesNo, NULL, 0, NULL, NULL, 0, 0, NULL};
+consvar_t cv_hazardlog = CVAR_INIT ("hazardlog", "Yes", 0, CV_YesNo, NULL);
-consvar_t cv_forceskin = {"forceskin", "None", CV_NETVAR|CV_CALL|CV_CHEAT, NULL, ForceSkin_OnChange, 0, NULL, NULL, 0, 0, NULL};
-consvar_t cv_downloading = {"downloading", "On", 0, CV_OnOff, NULL, 0, NULL, NULL, 0, 0, NULL};
-consvar_t cv_allowexitlevel = {"allowexitlevel", "No", CV_NETVAR, CV_YesNo, NULL, 0, NULL, NULL, 0, 0, NULL};
+consvar_t cv_forceskin = CVAR_INIT ("forceskin", "None", CV_NETVAR|CV_CALL|CV_CHEAT, NULL, ForceSkin_OnChange);
+consvar_t cv_downloading = CVAR_INIT ("downloading", "On", 0, CV_OnOff, NULL);
+consvar_t cv_allowexitlevel = CVAR_INIT ("allowexitlevel", "No", CV_SAVE|CV_NETVAR, CV_YesNo, NULL);
-consvar_t cv_killingdead = {"killingdead", "Off", CV_NETVAR, CV_OnOff, NULL, 0, NULL, NULL, 0, 0, NULL};
+consvar_t cv_killingdead = CVAR_INIT ("killingdead", "Off", CV_NETVAR, CV_OnOff, NULL);
-consvar_t cv_netstat = {"netstat", "Off", 0, CV_OnOff, NULL, 0, NULL, NULL, 0, 0, NULL}; // show bandwidth statistics
+consvar_t cv_netstat = CVAR_INIT ("netstat", "Off", 0, CV_OnOff, NULL); // show bandwidth statistics
static CV_PossibleValue_t nettimeout_cons_t[] = {{TICRATE/7, "MIN"}, {60*TICRATE, "MAX"}, {0, NULL}};
-consvar_t cv_nettimeout = {"nettimeout", "350", CV_CALL|CV_SAVE, nettimeout_cons_t, NetTimeout_OnChange, 0, NULL, NULL, 0, 0, NULL};
+consvar_t cv_nettimeout = CVAR_INIT ("nettimeout", "350", CV_CALL|CV_SAVE, nettimeout_cons_t, NetTimeout_OnChange);
static CV_PossibleValue_t jointimeout_cons_t[] = {{5*TICRATE, "MIN"}, {60*TICRATE, "MAX"}, {0, NULL}};
-consvar_t cv_jointimeout = {"jointimeout", "350", CV_CALL|CV_SAVE, jointimeout_cons_t, JoinTimeout_OnChange, 0, NULL, NULL, 0, 0, NULL};
-consvar_t cv_maxping = {"maxping", "0", CV_SAVE, CV_Unsigned, NULL, 0, NULL, NULL, 0, 0, NULL};
+consvar_t cv_jointimeout = CVAR_INIT ("jointimeout", "350", CV_CALL|CV_SAVE|CV_NETVAR, jointimeout_cons_t, JoinTimeout_OnChange);
+consvar_t cv_maxping = CVAR_INIT ("maxping", "0", CV_SAVE|CV_NETVAR, CV_Unsigned, NULL);
static CV_PossibleValue_t pingtimeout_cons_t[] = {{8, "MIN"}, {120, "MAX"}, {0, NULL}};
-consvar_t cv_pingtimeout = {"pingtimeout", "10", CV_SAVE, pingtimeout_cons_t, NULL, 0, NULL, NULL, 0, 0, NULL};
+consvar_t cv_pingtimeout = CVAR_INIT ("pingtimeout", "10", CV_SAVE|CV_NETVAR, pingtimeout_cons_t, NULL);
// show your ping on the HUD next to framerate. Defaults to warning only (shows up if your ping is > maxping)
static CV_PossibleValue_t showping_cons_t[] = {{0, "Off"}, {1, "Always"}, {2, "Warning"}, {0, NULL}};
-consvar_t cv_showping = {"showping", "Warning", CV_SAVE, showping_cons_t, NULL, 0, NULL, NULL, 0, 0, NULL};
+consvar_t cv_showping = CVAR_INIT ("showping", "Warning", CV_SAVE, showping_cons_t, NULL);
// Intermission time Tails 04-19-2002
static CV_PossibleValue_t inttime_cons_t[] = {{0, "MIN"}, {3600, "MAX"}, {0, NULL}};
-consvar_t cv_inttime = {"inttime", "10", CV_NETVAR, inttime_cons_t, NULL, 0, NULL, NULL, 0, 0, NULL};
+consvar_t cv_inttime = CVAR_INIT ("inttime", "10", CV_SAVE|CV_NETVAR, inttime_cons_t, NULL);
static CV_PossibleValue_t coopstarposts_cons_t[] = {{0, "Per-player"}, {1, "Shared"}, {2, "Teamwork"}, {0, NULL}};
-consvar_t cv_coopstarposts = {"coopstarposts", "Per-player", CV_NETVAR|CV_CALL, coopstarposts_cons_t, CoopStarposts_OnChange, 0, NULL, NULL, 0, 0, NULL};
+consvar_t cv_coopstarposts = CVAR_INIT ("coopstarposts", "Per-player", CV_SAVE|CV_NETVAR|CV_CALL, coopstarposts_cons_t, CoopStarposts_OnChange);
static CV_PossibleValue_t cooplives_cons_t[] = {{0, "Infinite"}, {1, "Per-player"}, {2, "Avoid Game Over"}, {3, "Single pool"}, {0, NULL}};
-consvar_t cv_cooplives = {"cooplives", "Avoid Game Over", CV_NETVAR|CV_CALL|CV_CHEAT, cooplives_cons_t, CoopLives_OnChange, 0, NULL, NULL, 0, 0, NULL};
+consvar_t cv_cooplives = CVAR_INIT ("cooplives", "Avoid Game Over", CV_SAVE|CV_NETVAR|CV_CALL|CV_CHEAT, cooplives_cons_t, CoopLives_OnChange);
static CV_PossibleValue_t advancemap_cons_t[] = {{0, "Off"}, {1, "Next"}, {2, "Random"}, {0, NULL}};
-consvar_t cv_advancemap = {"advancemap", "Next", CV_NETVAR, advancemap_cons_t, NULL, 0, NULL, NULL, 0, 0, NULL};
+consvar_t cv_advancemap = CVAR_INIT ("advancemap", "Next", CV_SAVE|CV_NETVAR, advancemap_cons_t, NULL);
static CV_PossibleValue_t playersforexit_cons_t[] = {{0, "One"}, {1, "1/4"}, {2, "Half"}, {3, "3/4"}, {4, "All"}, {0, NULL}};
-consvar_t cv_playersforexit = {"playersforexit", "All", CV_NETVAR, playersforexit_cons_t, NULL, 0, NULL, NULL, 0, 0, NULL};
+consvar_t cv_playersforexit = CVAR_INIT ("playersforexit", "All", CV_SAVE|CV_NETVAR, playersforexit_cons_t, NULL);
+
+consvar_t cv_exitmove = CVAR_INIT ("exitmove", "On", CV_SAVE|CV_NETVAR|CV_CALL, CV_OnOff, ExitMove_OnChange);
-consvar_t cv_exitmove = {"exitmove", "On", CV_NETVAR|CV_CALL, CV_OnOff, ExitMove_OnChange, 0, NULL, NULL, 0, 0, NULL};
+consvar_t cv_runscripts = CVAR_INIT ("runscripts", "Yes", 0, CV_YesNo, NULL);
-consvar_t cv_runscripts = {"runscripts", "Yes", 0, CV_YesNo, NULL, 0, NULL, NULL, 0, 0, NULL};
+consvar_t cv_pause = CVAR_INIT ("pausepermission", "Server", CV_SAVE|CV_NETVAR, pause_cons_t, NULL);
+consvar_t cv_mute = CVAR_INIT ("mute", "Off", CV_NETVAR|CV_CALL, CV_OnOff, Mute_OnChange);
-consvar_t cv_pause = {"pausepermission", "Server", CV_NETVAR, pause_cons_t, NULL, 0, NULL, NULL, 0, 0, NULL};
-consvar_t cv_mute = {"mute", "Off", CV_NETVAR|CV_CALL, CV_OnOff, Mute_OnChange, 0, NULL, NULL, 0, 0, NULL};
+consvar_t cv_sleep = CVAR_INIT ("cpusleep", "1", CV_SAVE, sleeping_cons_t, NULL);
-consvar_t cv_sleep = {"cpusleep", "1", CV_SAVE, sleeping_cons_t, NULL, -1, NULL, NULL, 0, 0, NULL};
+static CV_PossibleValue_t perfstats_cons_t[] = {
+ {0, "Off"}, {1, "Rendering"}, {2, "Logic"}, {3, "ThinkFrame"}, {0, NULL}};
+consvar_t cv_perfstats = CVAR_INIT ("perfstats", "Off", 0, perfstats_cons_t, NULL);
+consvar_t cv_freedemocamera = CVAR_INIT("freedemocamera", "Off", CV_SAVE, CV_OnOff, NULL);
char timedemo_name[256];
boolean timedemo_csv;
@@ -599,9 +595,7 @@ void D_RegisterServerCommands(void)
CV_RegisterVar(&cv_pingtimeout);
CV_RegisterVar(&cv_showping);
-#ifdef SEENAMES
- CV_RegisterVar(&cv_allowseenames);
-#endif
+ CV_RegisterVar(&cv_allowseenames);
CV_RegisterVar(&cv_dummyconsvar);
}
@@ -672,16 +666,13 @@ void D_RegisterClientCommands(void)
CV_RegisterVar(&cv_zlib_strategya);
CV_RegisterVar(&cv_zlib_window_bitsa);
CV_RegisterVar(&cv_apng_delay);
+ CV_RegisterVar(&cv_apng_downscale);
// GIF variables
CV_RegisterVar(&cv_gif_optimize);
CV_RegisterVar(&cv_gif_downscale);
CV_RegisterVar(&cv_gif_dynamicdelay);
CV_RegisterVar(&cv_gif_localcolortable);
-#ifdef WALLSPLATS
- CV_RegisterVar(&cv_splats);
-#endif
-
// register these so it is saved to config
CV_RegisterVar(&cv_playername);
CV_RegisterVar(&cv_playercolor);
@@ -696,9 +687,7 @@ void D_RegisterClientCommands(void)
CV_RegisterVar(&cv_defaultplayercolor2);
CV_RegisterVar(&cv_defaultskin2);
-#ifdef SEENAMES
CV_RegisterVar(&cv_seenames);
-#endif
CV_RegisterVar(&cv_rollingdemos);
CV_RegisterVar(&cv_netstat);
CV_RegisterVar(&cv_netticbuffer);
@@ -871,6 +860,8 @@ void D_RegisterClientCommands(void)
CV_RegisterVar(&cv_soundtest);
+ CV_RegisterVar(&cv_perfstats);
+
// ingame object placing
COM_AddCommand("objectplace", Command_ObjectPlace_f);
COM_AddCommand("writethings", Command_Writethings_f);
@@ -881,6 +872,8 @@ void D_RegisterClientCommands(void)
// CV_RegisterVar(&cv_grid);
// CV_RegisterVar(&cv_snapto);
+ CV_RegisterVar(&cv_freedemocamera);
+
// add cheat commands
COM_AddCommand("noclip", Command_CheatNoClip_f);
COM_AddCommand("god", Command_CheatGod_f);
@@ -2137,7 +2130,7 @@ static void Command_Pause(void)
if (cv_pause.value || server || (IsPlayerAdmin(consoleplayer)))
{
- if (modeattacking || !(gamestate == GS_LEVEL || gamestate == GS_INTERMISSION))
+ if (modeattacking || !(gamestate == GS_LEVEL || gamestate == GS_INTERMISSION) || (marathonmode && gamestate == GS_INTERMISSION))
{
CONS_Printf(M_GetText("You can't pause here.\n"));
return;
@@ -3248,97 +3241,136 @@ static void Got_RunSOCcmd(UINT8 **cp, INT32 playernum)
*/
static void Command_Addfile(void)
{
- const char *fn, *p;
- char buf[256];
- char *buf_p = buf;
- INT32 i;
- int musiconly; // W_VerifyNMUSlumps isn't boolean
+ size_t argc = COM_Argc(); // amount of arguments total
+ size_t curarg; // current argument index
- if (COM_Argc() != 2)
+ const char *addedfiles[argc]; // list of filenames already processed
+ size_t numfilesadded = 0; // the amount of filenames processed
+
+ if (argc < 2)
{
- CONS_Printf(M_GetText("addfile <wadfile.wad>: load wad file\n"));
+ CONS_Printf(M_GetText("addfile <filename.pk3/wad/lua/soc> [filename2...] [...]: Load add-ons\n"));
return;
}
- else
- fn = COM_Argv(1);
- // Disallow non-printing characters and semicolons.
- for (i = 0; fn[i] != '\0'; i++)
- if (!isprint(fn[i]) || fn[i] == ';')
- return;
+ // start at one to skip command name
+ for (curarg = 1; curarg < argc; curarg++)
+ {
+ const char *fn, *p;
+ char buf[256];
+ char *buf_p = buf;
+ INT32 i;
+ size_t ii;
+ int musiconly; // W_VerifyNMUSlumps isn't boolean
+ boolean fileadded = false;
- musiconly = W_VerifyNMUSlumps(fn);
+ fn = COM_Argv(curarg);
- if (!musiconly)
- {
- // ... But only so long as they contain nothing more then music and sprites.
- if (netgame && !(server || IsPlayerAdmin(consoleplayer)))
+ // For the amount of filenames previously processed...
+ for (ii = 0; ii < numfilesadded; ii++)
{
- CONS_Printf(M_GetText("Only the server or a remote admin can use this.\n"));
- return;
+ // If this is one of them, don't try to add it.
+ if (!strcmp(fn, addedfiles[ii]))
+ {
+ fileadded = true;
+ break;
+ }
}
- G_SetGameModified(multiplayer);
- }
- // Add file on your client directly if it is trivial, or you aren't in a netgame.
- if (!(netgame || multiplayer) || musiconly)
- {
- P_AddWadFile(fn);
- return;
- }
+ // If we've added this one, skip to the next one.
+ if (fileadded)
+ {
+ CONS_Alert(CONS_WARNING, M_GetText("Already processed %s, skipping\n"), fn);
+ continue;
+ }
- p = fn+strlen(fn);
- while(--p >= fn)
- if (*p == '\\' || *p == '/' || *p == ':')
- break;
- ++p;
+ // Disallow non-printing characters and semicolons.
+ for (i = 0; fn[i] != '\0'; i++)
+ if (!isprint(fn[i]) || fn[i] == ';')
+ return;
- // check total packet size and no of files currently loaded
- // See W_LoadWadFile in w_wad.c
- if ((numwadfiles >= MAX_WADFILES)
- || ((packetsizetally + nameonlylength(fn) + 22) > MAXFILENEEDED*sizeof(UINT8)))
- {
- CONS_Alert(CONS_ERROR, M_GetText("Too many files loaded to add %s\n"), fn);
- return;
- }
+ musiconly = W_VerifyNMUSlumps(fn, false);
- WRITESTRINGN(buf_p,p,240);
+ if (musiconly == -1)
+ {
+ addedfiles[numfilesadded++] = fn;
+ continue;
+ }
- // calculate and check md5
- {
- UINT8 md5sum[16];
-#ifdef NOMD5
- memset(md5sum,0,16);
-#else
- FILE *fhandle;
+ if (!musiconly)
+ {
+ // ... But only so long as they contain nothing more then music and sprites.
+ if (netgame && !(server || IsPlayerAdmin(consoleplayer)))
+ {
+ CONS_Printf(M_GetText("Only the server or a remote admin can use this.\n"));
+ continue;
+ }
+ G_SetGameModified(multiplayer);
+ }
- if ((fhandle = W_OpenWadFile(&fn, true)) != NULL)
+ // Add file on your client directly if it is trivial, or you aren't in a netgame.
+ if (!(netgame || multiplayer) || musiconly)
{
- tic_t t = I_GetTime();
- CONS_Debug(DBG_SETUP, "Making MD5 for %s\n",fn);
- md5_stream(fhandle, md5sum);
- CONS_Debug(DBG_SETUP, "MD5 calc for %s took %f second\n", fn, (float)(I_GetTime() - t)/TICRATE);
- fclose(fhandle);
+ P_AddWadFile(fn);
+ addedfiles[numfilesadded++] = fn;
+ continue;
}
- else // file not found
+
+ p = fn+strlen(fn);
+ while(--p >= fn)
+ if (*p == '\\' || *p == '/' || *p == ':')
+ break;
+ ++p;
+
+ // check total packet size and no of files currently loaded
+ // See W_LoadWadFile in w_wad.c
+ if ((numwadfiles >= MAX_WADFILES)
+ || ((packetsizetally + nameonlylength(fn) + 22) > MAXFILENEEDED*sizeof(UINT8)))
+ {
+ CONS_Alert(CONS_ERROR, M_GetText("Too many files loaded to add %s\n"), fn);
return;
+ }
+
+ WRITESTRINGN(buf_p,p,240);
- for (i = 0; i < numwadfiles; i++)
+ // calculate and check md5
{
- if (!memcmp(wadfiles[i]->md5sum, md5sum, 16))
+ UINT8 md5sum[16];
+#ifdef NOMD5
+ memset(md5sum,0,16);
+#else
+ FILE *fhandle;
+
+ if ((fhandle = W_OpenWadFile(&fn, true)) != NULL)
{
- CONS_Alert(CONS_ERROR, M_GetText("%s is already loaded\n"), fn);
- return;
+ tic_t t = I_GetTime();
+ CONS_Debug(DBG_SETUP, "Making MD5 for %s\n",fn);
+ md5_stream(fhandle, md5sum);
+ CONS_Debug(DBG_SETUP, "MD5 calc for %s took %f second\n", fn, (float)(I_GetTime() - t)/TICRATE);
+ fclose(fhandle);
+ }
+ else // file not found
+ continue;
+
+ for (i = 0; i < numwadfiles; i++)
+ {
+ if (!memcmp(wadfiles[i]->md5sum, md5sum, 16))
+ {
+ CONS_Alert(CONS_ERROR, M_GetText("%s is already loaded\n"), fn);
+ continue;
+ }
}
- }
#endif
- WRITEMEM(buf_p, md5sum, 16);
- }
+ WRITEMEM(buf_p, md5sum, 16);
+ }
- if (IsPlayerAdmin(consoleplayer) && (!server)) // Request to add file
- SendNetXCmd(XD_REQADDFILE, buf, buf_p - buf);
- else
- SendNetXCmd(XD_ADDFILE, buf, buf_p - buf);
+ addedfiles[numfilesadded++] = fn;
+
+ if (IsPlayerAdmin(consoleplayer) && (!server)) // Request to add file
+ SendNetXCmd(XD_REQADDFILE, buf, buf_p - buf);
+ else
+ SendNetXCmd(XD_ADDFILE, buf, buf_p - buf);
+ }
}
static void Got_RequestAddfilecmd(UINT8 **cp, INT32 playernum)
@@ -3575,8 +3607,7 @@ static void Command_Playintro_f(void)
*/
FUNCNORETURN static ATTRNORETURN void Command_Quit_f(void)
{
- if (Playing())
- LUAh_GameQuit();
+ LUAh_GameQuit(true);
I_Quit();
}
@@ -4238,8 +4269,7 @@ void Command_ExitGame_f(void)
{
INT32 i;
- if (Playing())
- LUAh_GameQuit();
+ LUAh_GameQuit(false);
D_QuitNetGame();
CL_Reset();
diff --git a/src/d_netcmd.h b/src/d_netcmd.h
index 897c28968e7a42662ad04b533942005fb70f91d2..ac39626a4e381a454ce0c81e51aa604f70840fed 100644
--- a/src/d_netcmd.h
+++ b/src/d_netcmd.h
@@ -31,9 +31,7 @@ extern consvar_t cv_defaultskin;
extern consvar_t cv_defaultplayercolor2;
extern consvar_t cv_defaultskin2;
-#ifdef SEENAMES
extern consvar_t cv_seenames, cv_allowseenames;
-#endif
extern consvar_t cv_usemouse;
extern consvar_t cv_usejoystick;
extern consvar_t cv_usejoystick2;
@@ -75,9 +73,6 @@ extern consvar_t cv_teamscramble;
extern consvar_t cv_scrambleonchange;
extern consvar_t cv_netstat;
-#ifdef WALLSPLATS
-extern consvar_t cv_splats;
-#endif
extern consvar_t cv_countdowntime;
extern consvar_t cv_runscripts;
@@ -114,11 +109,15 @@ extern consvar_t cv_skipmapcheck;
extern consvar_t cv_sleep;
+extern consvar_t cv_perfstats;
+
extern char timedemo_name[256];
extern boolean timedemo_csv;
extern char timedemo_csv_id[256];
extern boolean timedemo_quit;
+extern consvar_t cv_freedemocamera;
+
typedef enum
{
XD_NAMEANDCOLOR = 1,
diff --git a/src/d_netfil.c b/src/d_netfil.c
index 8f661bb5fb26f8f341ba77daa379b77c25fa6dbc..50dc2ba6084d5aa9d90e3d36dc931f5ee1cb2fe7 100644
--- a/src/d_netfil.c
+++ b/src/d_netfil.c
@@ -562,7 +562,7 @@ static void SV_PrepareSendLuaFileToNextNode(void)
// Find a client to send the file to
for (i = 1; i < MAXNETNODES; i++)
- if (nodeingame[i] && luafiletransfers->nodestatus[i] == LFTNS_WAITING) // Node waiting
+ if (luafiletransfers->nodestatus[i] == LFTNS_WAITING) // Node waiting
{
// Tell the client we're about to send them the file
netbuffer->packettype = PT_SENDINGLUAFILE;
@@ -570,6 +570,7 @@ static void SV_PrepareSendLuaFileToNextNode(void)
I_Error("Failed to send a PT_SENDINGLUAFILE packet\n"); // !!! Todo: Handle failure a bit better lol
luafiletransfers->nodestatus[i] = LFTNS_ASKED;
+ luafiletransfers->nodetimeouts[i] = I_GetTime() + 30 * TICRATE;
return;
}
@@ -588,7 +589,7 @@ void SV_PrepareSendLuaFile(void)
// Set status to "waiting" for everyone
for (i = 0; i < MAXNETNODES; i++)
- luafiletransfers->nodestatus[i] = LFTNS_WAITING;
+ luafiletransfers->nodestatus[i] = (nodeingame[i] ? LFTNS_WAITING : LFTNS_NONE);
if (FIL_ReadFileOK(luafiletransfers->realfilename))
{
@@ -649,12 +650,14 @@ void RemoveAllLuaFileTransfers(void)
void SV_AbortLuaFileTransfer(INT32 node)
{
- if (luafiletransfers
- && (luafiletransfers->nodestatus[node] == LFTNS_ASKED
- || luafiletransfers->nodestatus[node] == LFTNS_SENDING))
+ if (luafiletransfers)
{
- luafiletransfers->nodestatus[node] = LFTNS_WAITING;
- SV_PrepareSendLuaFileToNextNode();
+ if (luafiletransfers->nodestatus[node] == LFTNS_ASKED
+ || luafiletransfers->nodestatus[node] == LFTNS_SENDING)
+ {
+ SV_PrepareSendLuaFileToNextNode();
+ }
+ luafiletransfers->nodestatus[node] = LFTNS_NONE;
}
}
@@ -928,6 +931,22 @@ void FileSendTicker(void)
filetx_t *f;
INT32 packetsent, ram, i, j;
+ // If someone is taking too long to download, kick them with a timeout
+ // to prevent blocking the rest of the server...
+ if (luafiletransfers)
+ {
+ for (i = 1; i < MAXNETNODES; i++)
+ {
+ luafiletransfernodestatus_t status = luafiletransfers->nodestatus[i];
+
+ if (status != LFTNS_NONE && status != LFTNS_WAITING && status != LFTNS_SENT
+ && I_GetTime() > luafiletransfers->nodetimeouts[i])
+ {
+ Net_ConnectionTimeout(i);
+ }
+ }
+ }
+
if (!filestosend) // No file to send
return;
diff --git a/src/d_netfil.h b/src/d_netfil.h
index 1b399be75f31ae472de43c65cce64f24a8202376..158149477716cf2daf97c8d16b2298c164676de7 100644
--- a/src/d_netfil.h
+++ b/src/d_netfil.h
@@ -85,10 +85,11 @@ boolean PT_RequestFile(INT32 node);
typedef enum
{
+ LFTNS_NONE, // This node is not connected
LFTNS_WAITING, // This node is waiting for the server to send the file
- LFTNS_ASKED, // The server has told the node they're ready to send the file
+ LFTNS_ASKED, // The server has told the node they're ready to send the file
LFTNS_SENDING, // The server is sending the file to this node
- LFTNS_SENT // The node already has the file
+ LFTNS_SENT // The node already has the file
} luafiletransfernodestatus_t;
typedef struct luafiletransfer_s
@@ -99,6 +100,7 @@ typedef struct luafiletransfer_s
INT32 id; // Callback ID
boolean ongoing;
luafiletransfernodestatus_t nodestatus[MAXNETNODES];
+ tic_t nodetimeouts[MAXNETNODES];
struct luafiletransfer_s *next;
} luafiletransfer_t;
diff --git a/src/d_player.h b/src/d_player.h
index bd33ebae57666e402b8f81b94a14abb1726f952e..2e7afed882ccf4b1ca1966b7439785aadf4a993a 100644
--- a/src/d_player.h
+++ b/src/d_player.h
@@ -51,6 +51,9 @@ typedef enum
SF_NONIGHTSSUPER = 1<<15, // Disable super colors for NiGHTS (if you have SF_SUPER)
SF_NOSUPERSPRITES = 1<<16, // Don't use super sprites while super
SF_NOSUPERJUMPBOOST = 1<<17, // Disable the jump boost given while super (i.e. Knuckles)
+ SF_CANBUSTWALLS = 1<<18, // Can naturally bust walls on contact? (i.e. Knuckles)
+ SF_NOSHIELDABILITY = 1<<19, // Disable shield abilities
+
// free up to and including 1<<31
} skinflags_t;
diff --git a/src/deh_lua.c b/src/deh_lua.c
new file mode 100644
index 0000000000000000000000000000000000000000..e6a436421cc14096bb1bc02689455a48df499dc1
--- /dev/null
+++ b/src/deh_lua.c
@@ -0,0 +1,697 @@
+// SONIC ROBO BLAST 2
+//-----------------------------------------------------------------------------
+// Copyright (C) 1998-2000 by DooM Legacy Team.
+// Copyright (C) 1999-2020 by Sonic Team Junior.
+//
+// This program is free software distributed under the
+// terms of the GNU General Public License, version 2.
+// See the 'LICENSE' file for more details.
+//-----------------------------------------------------------------------------
+/// \file deh_lua.c
+/// \brief Lua SOC library
+
+#include "g_game.h"
+#include "s_sound.h"
+#include "z_zone.h"
+#include "m_menu.h"
+#include "m_misc.h"
+#include "p_local.h"
+#include "st_stuff.h"
+#include "fastcmp.h"
+#include "lua_script.h"
+#include "lua_libs.h"
+
+#include "dehacked.h"
+#include "deh_lua.h"
+#include "deh_tables.h"
+
+#ifdef MUSICSLOT_COMPATIBILITY
+#include "deh_soc.h" // for get_mus
+#endif
+
+// freeslot takes a name (string only!)
+// and allocates it to the appropriate free slot.
+// Returns the slot number allocated for it or nil if failed.
+// ex. freeslot("MT_MYTHING","S_MYSTATE1","S_MYSTATE2")
+// TODO: Error checking! @.@; There's currently no way to know which ones failed and why!
+//
+static inline int lib_freeslot(lua_State *L)
+{
+ int n = lua_gettop(L);
+ int r = 0; // args returned
+ char *s, *type,*word;
+
+ if (!lua_lumploading)
+ return luaL_error(L, "This function cannot be called from within a hook or coroutine!");
+
+ while (n-- > 0)
+ {
+ s = Z_StrDup(luaL_checkstring(L,1));
+ type = strtok(s, "_");
+ if (type)
+ strupr(type);
+ else {
+ Z_Free(s);
+ return luaL_error(L, "Unknown enum type in '%s'\n", luaL_checkstring(L, 1));
+ }
+
+ word = strtok(NULL, "\n");
+ if (word)
+ strupr(word);
+ else {
+ Z_Free(s);
+ return luaL_error(L, "Missing enum name in '%s'\n", luaL_checkstring(L, 1));
+ }
+ if (fastcmp(type, "SFX")) {
+ sfxenum_t sfx;
+ strlwr(word);
+ CONS_Printf("Sound sfx_%s allocated.\n",word);
+ sfx = S_AddSoundFx(word, false, 0, false);
+ if (sfx != sfx_None) {
+ lua_pushinteger(L, sfx);
+ r++;
+ } else
+ CONS_Alert(CONS_WARNING, "Ran out of free SFX slots!\n");
+ }
+ else if (fastcmp(type, "SPR"))
+ {
+ char wad;
+ spritenum_t j;
+ lua_getfield(L, LUA_REGISTRYINDEX, "WAD");
+ wad = (char)lua_tointeger(L, -1);
+ lua_pop(L, 1);
+ for (j = SPR_FIRSTFREESLOT; j <= SPR_LASTFREESLOT; j++)
+ {
+ if (used_spr[(j-SPR_FIRSTFREESLOT)/8] & (1<<(j%8)))
+ {
+ if (!sprnames[j][4] && memcmp(sprnames[j],word,4)==0)
+ sprnames[j][4] = wad;
+ continue; // Already allocated, next.
+ }
+ // Found a free slot!
+ CONS_Printf("Sprite SPR_%s allocated.\n",word);
+ strncpy(sprnames[j],word,4);
+ //sprnames[j][4] = 0;
+ used_spr[(j-SPR_FIRSTFREESLOT)/8] |= 1<<(j%8); // Okay, this sprite slot has been named now.
+ lua_pushinteger(L, j);
+ r++;
+ break;
+ }
+ if (j > SPR_LASTFREESLOT)
+ CONS_Alert(CONS_WARNING, "Ran out of free sprite slots!\n");
+ }
+ else if (fastcmp(type, "S"))
+ {
+ statenum_t i;
+ for (i = 0; i < NUMSTATEFREESLOTS; i++)
+ if (!FREE_STATES[i]) {
+ CONS_Printf("State S_%s allocated.\n",word);
+ FREE_STATES[i] = Z_Malloc(strlen(word)+1, PU_STATIC, NULL);
+ strcpy(FREE_STATES[i],word);
+ lua_pushinteger(L, S_FIRSTFREESLOT + i);
+ r++;
+ break;
+ }
+ if (i == NUMSTATEFREESLOTS)
+ CONS_Alert(CONS_WARNING, "Ran out of free State slots!\n");
+ }
+ else if (fastcmp(type, "MT"))
+ {
+ mobjtype_t i;
+ for (i = 0; i < NUMMOBJFREESLOTS; i++)
+ if (!FREE_MOBJS[i]) {
+ CONS_Printf("MobjType MT_%s allocated.\n",word);
+ FREE_MOBJS[i] = Z_Malloc(strlen(word)+1, PU_STATIC, NULL);
+ strcpy(FREE_MOBJS[i],word);
+ lua_pushinteger(L, MT_FIRSTFREESLOT + i);
+ r++;
+ break;
+ }
+ if (i == NUMMOBJFREESLOTS)
+ CONS_Alert(CONS_WARNING, "Ran out of free MobjType slots!\n");
+ }
+ else if (fastcmp(type, "SKINCOLOR"))
+ {
+ skincolornum_t i;
+ for (i = 0; i < NUMCOLORFREESLOTS; i++)
+ if (!FREE_SKINCOLORS[i]) {
+ CONS_Printf("Skincolor SKINCOLOR_%s allocated.\n",word);
+ FREE_SKINCOLORS[i] = Z_Malloc(strlen(word)+1, PU_STATIC, NULL);
+ strcpy(FREE_SKINCOLORS[i],word);
+ M_AddMenuColor(numskincolors++);
+ lua_pushinteger(L, SKINCOLOR_FIRSTFREESLOT + i);
+ r++;
+ break;
+ }
+ if (i == NUMCOLORFREESLOTS)
+ CONS_Alert(CONS_WARNING, "Ran out of free skincolor slots!\n");
+ }
+ else if (fastcmp(type, "SPR2"))
+ {
+ // Search if we already have an SPR2 by that name...
+ playersprite_t i;
+ for (i = SPR2_FIRSTFREESLOT; i < free_spr2; i++)
+ if (memcmp(spr2names[i],word,4) == 0)
+ break;
+ // We don't, so allocate a new one.
+ if (i >= free_spr2) {
+ if (free_spr2 < NUMPLAYERSPRITES)
+ {
+ CONS_Printf("Sprite SPR2_%s allocated.\n",word);
+ strncpy(spr2names[free_spr2],word,4);
+ spr2defaults[free_spr2] = 0;
+ lua_pushinteger(L, free_spr2);
+ r++;
+ spr2names[free_spr2++][4] = 0;
+ } else
+ CONS_Alert(CONS_WARNING, "Ran out of free SPR2 slots!\n");
+ }
+ }
+ else if (fastcmp(type, "TOL"))
+ {
+ // Search if we already have a typeoflevel by that name...
+ int i;
+ for (i = 0; TYPEOFLEVEL[i].name; i++)
+ if (fastcmp(word, TYPEOFLEVEL[i].name))
+ break;
+
+ // We don't, so allocate a new one.
+ if (TYPEOFLEVEL[i].name == NULL) {
+ if (lastcustomtol == (UINT32)MAXTOL) // Unless you have way too many, since they're flags.
+ CONS_Alert(CONS_WARNING, "Ran out of free typeoflevel slots!\n");
+ else {
+ CONS_Printf("TypeOfLevel TOL_%s allocated.\n",word);
+ G_AddTOL(lastcustomtol, word);
+ lua_pushinteger(L, lastcustomtol);
+ lastcustomtol <<= 1;
+ r++;
+ }
+ }
+ }
+ Z_Free(s);
+ lua_remove(L, 1);
+ continue;
+ }
+ return r;
+}
+
+// Wrapper for ALL A_Action functions.
+// Arguments: mobj_t actor, int var1, int var2
+static int action_call(lua_State *L)
+{
+ //actionf_t *action = lua_touserdata(L,lua_upvalueindex(1));
+ actionf_t *action = *((actionf_t **)luaL_checkudata(L, 1, META_ACTION));
+ mobj_t *actor = *((mobj_t **)luaL_checkudata(L, 2, META_MOBJ));
+ var1 = (INT32)luaL_optinteger(L, 3, 0);
+ var2 = (INT32)luaL_optinteger(L, 4, 0);
+ if (!actor)
+ return LUA_ErrInvalid(L, "mobj_t");
+ action->acp1(actor);
+ return 0;
+}
+
+// Hardcoded A_Action name to call for super() or NULL if super() would be invalid.
+// Set in lua_infolib.
+const char *superactions[MAXRECURSION];
+UINT8 superstack = 0;
+
+static int lib_dummysuper(lua_State *L)
+{
+ return luaL_error(L, "Can't call super() outside of hardcode-replacing A_Action functions being called by state changes!"); // convoluted, I know. @_@;;
+}
+
+static inline int lib_getenum(lua_State *L)
+{
+ const char *word, *p;
+ fixed_t i;
+ boolean mathlib = lua_toboolean(L, lua_upvalueindex(1));
+ if (lua_type(L,2) != LUA_TSTRING)
+ return 0;
+ word = lua_tostring(L,2);
+ if (strlen(word) == 1) { // Assume sprite frame if length 1.
+ if (*word >= 'A' && *word <= '~')
+ {
+ lua_pushinteger(L, *word-'A');
+ return 1;
+ }
+ if (mathlib) return luaL_error(L, "constant '%s' could not be parsed.\n", word);
+ return 0;
+ }
+ else if (fastncmp("MF_", word, 3)) {
+ p = word+3;
+ for (i = 0; MOBJFLAG_LIST[i]; i++)
+ if (fastcmp(p, MOBJFLAG_LIST[i])) {
+ lua_pushinteger(L, ((lua_Integer)1<<i));
+ return 1;
+ }
+ if (mathlib) return luaL_error(L, "mobjflag '%s' could not be found.\n", word);
+ return 0;
+ }
+ else if (fastncmp("MF2_", word, 4)) {
+ p = word+4;
+ for (i = 0; MOBJFLAG2_LIST[i]; i++)
+ if (fastcmp(p, MOBJFLAG2_LIST[i])) {
+ lua_pushinteger(L, ((lua_Integer)1<<i));
+ return 1;
+ }
+ if (mathlib) return luaL_error(L, "mobjflag2 '%s' could not be found.\n", word);
+ return 0;
+ }
+ else if (fastncmp("MFE_", word, 4)) {
+ p = word+4;
+ for (i = 0; MOBJEFLAG_LIST[i]; i++)
+ if (fastcmp(p, MOBJEFLAG_LIST[i])) {
+ lua_pushinteger(L, ((lua_Integer)1<<i));
+ return 1;
+ }
+ if (mathlib) return luaL_error(L, "mobjeflag '%s' could not be found.\n", word);
+ return 0;
+ }
+ else if (fastncmp("MTF_", word, 4)) {
+ p = word+4;
+ for (i = 0; i < 4; i++)
+ if (MAPTHINGFLAG_LIST[i] && fastcmp(p, MAPTHINGFLAG_LIST[i])) {
+ lua_pushinteger(L, ((lua_Integer)1<<i));
+ return 1;
+ }
+ if (mathlib) return luaL_error(L, "mapthingflag '%s' could not be found.\n", word);
+ return 0;
+ }
+ else if (fastncmp("PF_", word, 3)) {
+ p = word+3;
+ for (i = 0; PLAYERFLAG_LIST[i]; i++)
+ if (fastcmp(p, PLAYERFLAG_LIST[i])) {
+ lua_pushinteger(L, ((lua_Integer)1<<i));
+ return 1;
+ }
+ if (fastcmp(p, "FULLSTASIS"))
+ {
+ lua_pushinteger(L, (lua_Integer)PF_FULLSTASIS);
+ return 1;
+ }
+ else if (fastcmp(p, "USEDOWN")) // Remove case when 2.3 nears release...
+ {
+ lua_pushinteger(L, (lua_Integer)PF_SPINDOWN);
+ return 1;
+ }
+ if (mathlib) return luaL_error(L, "playerflag '%s' could not be found.\n", word);
+ return 0;
+ }
+ else if (fastncmp("GT_", word, 3)) {
+ p = word;
+ for (i = 0; Gametype_ConstantNames[i]; i++)
+ if (fastcmp(p, Gametype_ConstantNames[i])) {
+ lua_pushinteger(L, i);
+ return 1;
+ }
+ if (mathlib) return luaL_error(L, "gametype '%s' could not be found.\n", word);
+ return 0;
+ }
+ else if (fastncmp("GTR_", word, 4)) {
+ p = word+4;
+ for (i = 0; GAMETYPERULE_LIST[i]; i++)
+ if (fastcmp(p, GAMETYPERULE_LIST[i])) {
+ lua_pushinteger(L, ((lua_Integer)1<<i));
+ return 1;
+ }
+ if (mathlib) return luaL_error(L, "game type rule '%s' could not be found.\n", word);
+ return 0;
+ }
+ else if (fastncmp("TOL_", word, 4)) {
+ p = word+4;
+ for (i = 0; TYPEOFLEVEL[i].name; i++)
+ if (fastcmp(p, TYPEOFLEVEL[i].name)) {
+ lua_pushinteger(L, TYPEOFLEVEL[i].flag);
+ return 1;
+ }
+ if (mathlib) return luaL_error(L, "typeoflevel '%s' could not be found.\n", word);
+ return 0;
+ }
+ else if (fastncmp("ML_", word, 3)) {
+ p = word+3;
+ for (i = 0; i < 16; i++)
+ if (ML_LIST[i] && fastcmp(p, ML_LIST[i])) {
+ lua_pushinteger(L, ((lua_Integer)1<<i));
+ return 1;
+ }
+ if (mathlib) return luaL_error(L, "linedef flag '%s' could not be found.\n", word);
+ return 0;
+ }
+ else if (fastncmp("S_",word,2)) {
+ p = word+2;
+ for (i = 0; i < NUMSTATEFREESLOTS; i++) {
+ if (!FREE_STATES[i])
+ break;
+ if (fastcmp(p, FREE_STATES[i])) {
+ lua_pushinteger(L, S_FIRSTFREESLOT+i);
+ return 1;
+ }
+ }
+ for (i = 0; i < S_FIRSTFREESLOT; i++)
+ if (fastcmp(p, STATE_LIST[i]+2)) {
+ lua_pushinteger(L, i);
+ return 1;
+ }
+ return luaL_error(L, "state '%s' does not exist.\n", word);
+ }
+ else if (fastncmp("MT_",word,3)) {
+ p = word+3;
+ for (i = 0; i < NUMMOBJFREESLOTS; i++) {
+ if (!FREE_MOBJS[i])
+ break;
+ if (fastcmp(p, FREE_MOBJS[i])) {
+ lua_pushinteger(L, MT_FIRSTFREESLOT+i);
+ return 1;
+ }
+ }
+ for (i = 0; i < MT_FIRSTFREESLOT; i++)
+ if (fastcmp(p, MOBJTYPE_LIST[i]+3)) {
+ lua_pushinteger(L, i);
+ return 1;
+ }
+ return luaL_error(L, "mobjtype '%s' does not exist.\n", word);
+ }
+ else if (fastncmp("SPR_",word,4)) {
+ p = word+4;
+ for (i = 0; i < NUMSPRITES; i++)
+ if (!sprnames[i][4] && fastncmp(p,sprnames[i],4)) {
+ lua_pushinteger(L, i);
+ return 1;
+ }
+ if (mathlib) return luaL_error(L, "sprite '%s' could not be found.\n", word);
+ return 0;
+ }
+ else if (fastncmp("SPR2_",word,5)) {
+ p = word+5;
+ for (i = 0; i < (fixed_t)free_spr2; i++)
+ if (!spr2names[i][4])
+ {
+ // special 3-char cases, e.g. SPR2_RUN
+ // the spr2names entry will have "_" on the end, as in "RUN_"
+ if (spr2names[i][3] == '_' && !p[3]) {
+ if (fastncmp(p,spr2names[i],3)) {
+ lua_pushinteger(L, i);
+ return 1;
+ }
+ }
+ else if (fastncmp(p,spr2names[i],4)) {
+ lua_pushinteger(L, i);
+ return 1;
+ }
+ }
+ if (mathlib) return luaL_error(L, "player sprite '%s' could not be found.\n", word);
+ return 0;
+ }
+ else if (!mathlib && fastncmp("sfx_",word,4)) {
+ p = word+4;
+ for (i = 0; i < NUMSFX; i++)
+ if (S_sfx[i].name && fastcmp(p, S_sfx[i].name)) {
+ lua_pushinteger(L, i);
+ return 1;
+ }
+ return 0;
+ }
+ else if (mathlib && fastncmp("SFX_",word,4)) { // SOCs are ALL CAPS!
+ p = word+4;
+ for (i = 0; i < NUMSFX; i++)
+ if (S_sfx[i].name && fasticmp(p, S_sfx[i].name)) {
+ lua_pushinteger(L, i);
+ return 1;
+ }
+ return luaL_error(L, "sfx '%s' could not be found.\n", word);
+ }
+ else if (mathlib && fastncmp("DS",word,2)) {
+ p = word+2;
+ for (i = 0; i < NUMSFX; i++)
+ if (S_sfx[i].name && fasticmp(p, S_sfx[i].name)) {
+ lua_pushinteger(L, i);
+ return 1;
+ }
+ if (mathlib) return luaL_error(L, "sfx '%s' could not be found.\n", word);
+ return 0;
+ }
+#ifdef MUSICSLOT_COMPATIBILITY
+ else if (!mathlib && fastncmp("mus_",word,4)) {
+ p = word+4;
+ if ((i = get_mus(p, false)) == 0)
+ return 0;
+ lua_pushinteger(L, i);
+ return 1;
+ }
+ else if (mathlib && fastncmp("MUS_",word,4)) { // SOCs are ALL CAPS!
+ p = word+4;
+ if ((i = get_mus(p, false)) == 0)
+ return luaL_error(L, "music '%s' could not be found.\n", word);
+ lua_pushinteger(L, i);
+ return 1;
+ }
+ else if (mathlib && (fastncmp("O_",word,2) || fastncmp("D_",word,2))) {
+ p = word+2;
+ if ((i = get_mus(p, false)) == 0)
+ return luaL_error(L, "music '%s' could not be found.\n", word);
+ lua_pushinteger(L, i);
+ return 1;
+ }
+#endif
+ else if (!mathlib && fastncmp("pw_",word,3)) {
+ p = word+3;
+ for (i = 0; i < NUMPOWERS; i++)
+ if (fasticmp(p, POWERS_LIST[i])) {
+ lua_pushinteger(L, i);
+ return 1;
+ }
+ return 0;
+ }
+ else if (mathlib && fastncmp("PW_",word,3)) { // SOCs are ALL CAPS!
+ p = word+3;
+ for (i = 0; i < NUMPOWERS; i++)
+ if (fastcmp(p, POWERS_LIST[i])) {
+ lua_pushinteger(L, i);
+ return 1;
+ }
+ return luaL_error(L, "power '%s' could not be found.\n", word);
+ }
+ else if (fastncmp("HUD_",word,4)) {
+ p = word+4;
+ for (i = 0; i < NUMHUDITEMS; i++)
+ if (fastcmp(p, HUDITEMS_LIST[i])) {
+ lua_pushinteger(L, i);
+ return 1;
+ }
+ if (mathlib) return luaL_error(L, "huditem '%s' could not be found.\n", word);
+ return 0;
+ }
+ else if (fastncmp("SKINCOLOR_",word,10)) {
+ p = word+10;
+ for (i = 0; i < NUMCOLORFREESLOTS; i++) {
+ if (!FREE_SKINCOLORS[i])
+ break;
+ if (fastcmp(p, FREE_SKINCOLORS[i])) {
+ lua_pushinteger(L, SKINCOLOR_FIRSTFREESLOT+i);
+ return 1;
+ }
+ }
+ for (i = 0; i < SKINCOLOR_FIRSTFREESLOT; i++)
+ if (fastcmp(p, COLOR_ENUMS[i])) {
+ lua_pushinteger(L, i);
+ return 1;
+ }
+ return luaL_error(L, "skincolor '%s' could not be found.\n", word);
+ }
+ else if (fastncmp("GRADE_",word,6))
+ {
+ p = word+6;
+ for (i = 0; NIGHTSGRADE_LIST[i]; i++)
+ if (*p == NIGHTSGRADE_LIST[i])
+ {
+ lua_pushinteger(L, i);
+ return 1;
+ }
+ if (mathlib) return luaL_error(L, "NiGHTS grade '%s' could not be found.\n", word);
+ return 0;
+ }
+ else if (fastncmp("MN_",word,3)) {
+ p = word+3;
+ for (i = 0; i < NUMMENUTYPES; i++)
+ if (fastcmp(p, MENUTYPES_LIST[i])) {
+ lua_pushinteger(L, i);
+ return 1;
+ }
+ if (mathlib) return luaL_error(L, "menutype '%s' could not be found.\n", word);
+ return 0;
+ }
+ else if (!mathlib && fastncmp("A_",word,2)) {
+ char *caps;
+ // Try to get a Lua action first.
+ /// \todo Push a closure that sets superactions[] and superstack.
+ lua_getfield(L, LUA_REGISTRYINDEX, LREG_ACTIONS);
+ // actions are stored in all uppercase.
+ caps = Z_StrDup(word);
+ strupr(caps);
+ lua_getfield(L, -1, caps);
+ Z_Free(caps);
+ if (!lua_isnil(L, -1))
+ return 1; // Success! :D That was easy.
+ // Welp, that failed.
+ lua_pop(L, 2); // pop nil and LREG_ACTIONS
+
+ // Hardcoded actions as callable Lua functions!
+ // Retrieving them from this metatable allows them to be case-insensitive!
+ for (i = 0; actionpointers[i].name; i++)
+ if (fasticmp(word, actionpointers[i].name)) {
+ // We push the actionf_t* itself as userdata!
+ LUA_PushUserdata(L, &actionpointers[i].action, META_ACTION);
+ return 1;
+ }
+ return 0;
+ }
+ else if (!mathlib && fastcmp("super",word))
+ {
+ if (!superstack)
+ {
+ lua_pushcfunction(L, lib_dummysuper);
+ return 1;
+ }
+ for (i = 0; actionpointers[i].name; i++)
+ if (fasticmp(superactions[superstack-1], actionpointers[i].name)) {
+ LUA_PushUserdata(L, &actionpointers[i].action, META_ACTION);
+ return 1;
+ }
+ return 0;
+ }
+
+ if (fastcmp(word, "BT_USE")) // Remove case when 2.3 nears release...
+ {
+ lua_pushinteger(L, (lua_Integer)BT_SPIN);
+ return 1;
+ }
+
+ for (i = 0; INT_CONST[i].n; i++)
+ if (fastcmp(word,INT_CONST[i].n)) {
+ lua_pushinteger(L, INT_CONST[i].v);
+ return 1;
+ }
+
+ if (mathlib) return luaL_error(L, "constant '%s' could not be parsed.\n", word);
+
+ // DYNAMIC variables too!!
+ // Try not to add anything that would break netgames or timeattack replays here.
+ // You know, like consoleplayer, displayplayer, secondarydisplayplayer, or gametime.
+ return LUA_PushGlobals(L, word);
+}
+
+int LUA_EnumLib(lua_State *L)
+{
+ if (lua_gettop(L) == 0)
+ lua_pushboolean(L, 0);
+
+ // Set the global metatable
+ lua_createtable(L, 0, 1);
+ lua_pushvalue(L, 1); // boolean passed to LUA_EnumLib as first argument.
+ lua_pushcclosure(L, lib_getenum, 1);
+ lua_setfield(L, -2, "__index");
+ lua_setmetatable(L, LUA_GLOBALSINDEX);
+ return 0;
+}
+
+// getActionName(action) -> return action's string name
+static int lib_getActionName(lua_State *L)
+{
+ if (lua_isuserdata(L, 1)) // arg 1 is built-in action, expect action userdata
+ {
+ actionf_t *action = *((actionf_t **)luaL_checkudata(L, 1, META_ACTION));
+ const char *name = NULL;
+ if (!action)
+ return luaL_error(L, "not a valid action?");
+ name = LUA_GetActionName(action);
+ if (!name) // that can't be right?
+ return luaL_error(L, "no name string could be found for this action");
+ lua_pushstring(L, name);
+ return 1;
+ }
+ else if (lua_isfunction(L, 1)) // arg 1 is a function (either C or Lua)
+ {
+ lua_settop(L, 1); // set top of stack to 1 (removing any extra args, which there shouldn't be)
+ // get the name for this action, if possible.
+ lua_getfield(L, LUA_REGISTRYINDEX, LREG_ACTIONS);
+ lua_pushnil(L);
+ // Lua stack at this point:
+ // 1 ... -2 -1
+ // arg ... LREG_ACTIONS nil
+ while (lua_next(L, -2))
+ {
+ // Lua stack at this point:
+ // 1 ... -3 -2 -1
+ // arg ... LREG_ACTIONS "A_ACTION" function
+ if (lua_rawequal(L, -1, 1)) // is this the same as the arg?
+ {
+ // make sure the key (i.e. "A_ACTION") is a string first
+ // (note: we don't use lua_isstring because it also returns true for numbers)
+ if (lua_type(L, -2) == LUA_TSTRING)
+ {
+ lua_pushvalue(L, -2); // push "A_ACTION" string to top of stack
+ return 1;
+ }
+ lua_pop(L, 2); // pop the name and function
+ break; // probably should have succeeded but we didn't, so end the loop
+ }
+ lua_pop(L, 1);
+ }
+ lua_pop(L, 1); // pop LREG_ACTIONS
+ return 0; // return nothing (don't error)
+ }
+
+ return luaL_typerror(L, 1, "action userdata or Lua function");
+}
+
+
+
+int LUA_SOCLib(lua_State *L)
+{
+ lua_register(L,"freeslot",lib_freeslot);
+ lua_register(L,"getActionName",lib_getActionName);
+
+ luaL_newmetatable(L, META_ACTION);
+ lua_pushcfunction(L, action_call);
+ lua_setfield(L, -2, "__call");
+ lua_pop(L, 1);
+
+ return 0;
+}
+
+const char *LUA_GetActionName(void *action)
+{
+ actionf_t *act = (actionf_t *)action;
+ size_t z;
+ for (z = 0; actionpointers[z].name; z++)
+ {
+ if (actionpointers[z].action.acv == act->acv)
+ return actionpointers[z].name;
+ }
+ return NULL;
+}
+
+void LUA_SetActionByName(void *state, const char *actiontocompare)
+{
+ state_t *st = (state_t *)state;
+ size_t z;
+ for (z = 0; actionpointers[z].name; z++)
+ {
+ if (fasticmp(actiontocompare, actionpointers[z].name))
+ {
+ st->action = actionpointers[z].action;
+ st->action.acv = actionpointers[z].action.acv; // assign
+ st->action.acp1 = actionpointers[z].action.acp1;
+ return;
+ }
+ }
+}
+
+enum actionnum LUA_GetActionNumByName(const char *actiontocompare)
+{
+ size_t z;
+ for (z = 0; actionpointers[z].name; z++)
+ if (fasticmp(actiontocompare, actionpointers[z].name))
+ return z;
+ return z;
+}
diff --git a/src/deh_lua.h b/src/deh_lua.h
new file mode 100644
index 0000000000000000000000000000000000000000..cd927b9fd51bb98f3d6674dd129d9df29726ae33
--- /dev/null
+++ b/src/deh_lua.h
@@ -0,0 +1,21 @@
+// SONIC ROBO BLAST 2
+//-----------------------------------------------------------------------------
+// Copyright (C) 1998-2000 by DooM Legacy Team.
+// Copyright (C) 1999-2020 by Sonic Team Junior.
+//
+// This program is free software distributed under the
+// terms of the GNU General Public License, version 2.
+// See the 'LICENSE' file for more details.
+//-----------------------------------------------------------------------------
+/// \file deh_lua.h
+/// \brief Lua SOC library
+
+#ifndef __DEH_LUA_H__
+#define __DEH_LUA_H__
+
+boolean LUA_SetLuaAction(void *state, const char *actiontocompare);
+const char *LUA_GetActionName(void *action);
+void LUA_SetActionByName(void *state, const char *actiontocompare);
+enum actionnum LUA_GetActionNumByName(const char *actiontocompare);
+
+#endif
diff --git a/src/deh_soc.c b/src/deh_soc.c
new file mode 100644
index 0000000000000000000000000000000000000000..5b12ea1b0b9b0339890b094516e0593e252d6556
--- /dev/null
+++ b/src/deh_soc.c
@@ -0,0 +1,4527 @@
+// SONIC ROBO BLAST 2
+//-----------------------------------------------------------------------------
+// Copyright (C) 1998-2000 by DooM Legacy Team.
+// Copyright (C) 1999-2020 by Sonic Team Junior.
+//
+// This program is free software distributed under the
+// terms of the GNU General Public License, version 2.
+// See the 'LICENSE' file for more details.
+//-----------------------------------------------------------------------------
+/// \file deh_soc.c
+/// \brief Load SOC file and change tables and text
+
+#include "doomdef.h"
+#include "d_main.h" // for srb2home
+#include "g_game.h"
+#include "sounds.h"
+#include "info.h"
+#include "d_think.h"
+#include "m_argv.h"
+#include "z_zone.h"
+#include "w_wad.h"
+#include "y_inter.h"
+#include "m_menu.h"
+#include "m_misc.h"
+#include "f_finale.h"
+#include "st_stuff.h"
+#include "i_system.h"
+#include "p_setup.h"
+#include "r_data.h"
+#include "r_textures.h"
+#include "r_draw.h"
+#include "r_picformats.h"
+#include "r_things.h" // R_Char2Frame
+#include "r_sky.h"
+#include "fastcmp.h"
+#include "lua_script.h" // Reluctantly included for LUA_EvalMath
+#include "d_clisrv.h"
+
+#ifdef HWRENDER
+#include "hardware/hw_light.h"
+#endif
+
+#include "m_cond.h"
+
+#include "dehacked.h"
+#include "deh_soc.h"
+#include "deh_lua.h" // included due to some LUA_SetLuaAction hack smh
+#include "deh_tables.h"
+
+// Loops through every constant and operation in word and performs its calculations, returning the final value.
+fixed_t get_number(const char *word)
+{
+ return LUA_EvalMath(word);
+
+ /*// DESPERATELY NEEDED: Order of operations support! :x
+ fixed_t i = find_const(&word);
+ INT32 o;
+ while(*word) {
+ o = operation_pad(&word);
+ if (o != -1)
+ i = OPERATIONS[o].v(i,find_const(&word));
+ else
+ break;
+ }
+ return i;*/
+}
+
+#define PARAMCHECK(n) do { if (!params[n]) { deh_warning("Too few parameters, need %d", n); return; }} while (0)
+
+/* ======================================================================== */
+// Load a dehacked file format
+/* ======================================================================== */
+/* a sample to see
+ Thing 1 (Player) { // MT_PLAYER
+INT32 doomednum; ID # = 3232 -1, // doomednum
+INT32 spawnstate; Initial frame = 32 "PLAY", // spawnstate
+INT32 spawnhealth; Hit points = 3232 100, // spawnhealth
+INT32 seestate; First moving frame = 32 "PLAY_RUN1", // seestate
+INT32 seesound; Alert sound = 32 sfx_None, // seesound
+INT32 reactiontime; Reaction time = 3232 0, // reactiontime
+INT32 attacksound; Attack sound = 32 sfx_None, // attacksound
+INT32 painstate; Injury frame = 32 "PLAY_PAIN", // painstate
+INT32 painchance; Pain chance = 3232 255, // painchance
+INT32 painsound; Pain sound = 32 sfx_plpain, // painsound
+INT32 meleestate; Close attack frame = 32 "NULL", // meleestate
+INT32 missilestate; Far attack frame = 32 "PLAY_ATK1", // missilestate
+INT32 deathstate; Death frame = 32 "PLAY_DIE1", // deathstate
+INT32 xdeathstate; Exploding frame = 32 "PLAY_XDIE1", // xdeathstate
+INT32 deathsound; Death sound = 32 sfx_pldeth, // deathsound
+INT32 speed; Speed = 3232 0, // speed
+INT32 radius; Width = 211812352 16*FRACUNIT, // radius
+INT32 height; Height = 211812352 56*FRACUNIT, // height
+INT32 dispoffset; DispOffset = 0 0, // dispoffset
+INT32 mass; Mass = 3232 100, // mass
+INT32 damage; Missile damage = 3232 0, // damage
+INT32 activesound; Action sound = 32 sfx_None, // activesound
+INT32 flags; Bits = 3232 MF_SOLID|MF_SHOOTABLE|MF_DROPOFF|MF_PICKUP|MF_NOTDMATCH,
+INT32 raisestate; Respawn frame = 32 S_NULL // raisestate
+ }, */
+
+#ifdef HWRENDER
+static INT32 searchvalue(const char *s)
+{
+ while (s[0] != '=' && s[0])
+ s++;
+ if (s[0] == '=')
+ return atoi(&s[1]);
+ else
+ {
+ deh_warning("No value found");
+ return 0;
+ }
+}
+
+static float searchfvalue(const char *s)
+{
+ while (s[0] != '=' && s[0])
+ s++;
+ if (s[0] == '=')
+ return (float)atof(&s[1]);
+ else
+ {
+ deh_warning("No value found");
+ return 0;
+ }
+}
+#endif
+
+// These are for clearing all of various things
+void clear_conditionsets(void)
+{
+ UINT8 i;
+ for (i = 0; i < MAXCONDITIONSETS; ++i)
+ M_ClearConditionSet(i+1);
+}
+
+void clear_levels(void)
+{
+ INT16 i;
+
+ // This is potentially dangerous but if we're resetting these headers,
+ // we may as well try to save some memory, right?
+ for (i = 0; i < NUMMAPS; ++i)
+ {
+ if (!mapheaderinfo[i] || i == (tutorialmap-1))
+ continue;
+
+ // Custom map header info
+ // (no need to set num to 0, we're freeing the entire header shortly)
+ Z_Free(mapheaderinfo[i]->customopts);
+
+ P_DeleteFlickies(i);
+ P_DeleteGrades(i);
+
+ Z_Free(mapheaderinfo[i]);
+ mapheaderinfo[i] = NULL;
+ }
+
+ // Realloc the one for the current gamemap as a safeguard
+ P_AllocMapHeader(gamemap-1);
+}
+
+static boolean findFreeSlot(INT32 *num)
+{
+ // Send the character select entry to a free slot.
+ while (*num < MAXSKINS && (description[*num].used))
+ *num = *num+1;
+
+ // No more free slots. :(
+ if (*num >= MAXSKINS)
+ return false;
+
+ // Redesign your logo. (See M_DrawSetupChoosePlayerMenu in m_menu.c...)
+ description[*num].picname[0] = '\0';
+ description[*num].nametag[0] = '\0';
+ description[*num].displayname[0] = '\0';
+ description[*num].oppositecolor = SKINCOLOR_NONE;
+ description[*num].tagtextcolor = SKINCOLOR_NONE;
+ description[*num].tagoutlinecolor = SKINCOLOR_NONE;
+
+ // Found one! ^_^
+ return (description[*num].used = true);
+}
+
+// Reads a player.
+// For modifying the character select screen
+void readPlayer(MYFILE *f, INT32 num)
+{
+ char *s = Z_Malloc(MAXLINELEN, PU_STATIC, NULL);
+ char *word;
+ char *word2;
+ char *displayname = ZZ_Alloc(MAXLINELEN+1);
+ INT32 i;
+ boolean slotfound = false;
+
+ #define SLOTFOUND \
+ if (!slotfound && (slotfound = findFreeSlot(&num)) == false) \
+ goto done;
+
+ displayname[MAXLINELEN] = '\0';
+
+ do
+ {
+ if (myfgets(s, MAXLINELEN, f))
+ {
+ if (s[0] == '\n')
+ break;
+
+ for (i = 0; i < MAXLINELEN-3; i++)
+ {
+ char *tmp;
+ if (s[i] == '=')
+ {
+ tmp = &s[i+2];
+ strncpy(displayname, tmp, SKINNAMESIZE);
+ break;
+ }
+ }
+
+ word = strtok(s, " ");
+ if (word)
+ strupr(word);
+ else
+ break;
+
+ if (fastcmp(word, "PLAYERTEXT"))
+ {
+ char *playertext = NULL;
+
+ SLOTFOUND
+
+ for (i = 0; i < MAXLINELEN-3; i++)
+ {
+ if (s[i] == '=')
+ {
+ playertext = &s[i+2];
+ break;
+ }
+ }
+ if (playertext)
+ {
+ strcpy(description[num].notes, playertext);
+ strcat(description[num].notes, myhashfgets(playertext, sizeof (description[num].notes), f));
+ }
+ else
+ strcpy(description[num].notes, "");
+
+ // For some reason, cutting the string did not work above. Most likely due to strcpy or strcat...
+ // It works down here, though.
+ {
+ INT32 numline = 0;
+ for (i = 0; (size_t)i < sizeof(description[num].notes)-1; i++)
+ {
+ if (numline < 20 && description[num].notes[i] == '\n')
+ numline++;
+
+ if (numline >= 20 || description[num].notes[i] == '\0' || description[num].notes[i] == '#')
+ break;
+ }
+ }
+ description[num].notes[strlen(description[num].notes)-1] = '\0';
+ description[num].notes[i] = '\0';
+ continue;
+ }
+
+ word2 = strtok(NULL, " = ");
+ if (word2)
+ strupr(word2);
+ else
+ break;
+
+ if (word2[strlen(word2)-1] == '\n')
+ word2[strlen(word2)-1] = '\0';
+ i = atoi(word2);
+
+ if (fastcmp(word, "PICNAME"))
+ {
+ SLOTFOUND
+ strncpy(description[num].picname, word2, 8);
+ }
+ // new character select
+ else if (fastcmp(word, "DISPLAYNAME"))
+ {
+ SLOTFOUND
+ // replace '#' with line breaks
+ // (also remove any '\n')
+ {
+ char *cur = NULL;
+
+ // remove '\n'
+ cur = strchr(displayname, '\n');
+ if (cur)
+ *cur = '\0';
+
+ // turn '#' into '\n'
+ cur = strchr(displayname, '#');
+ while (cur)
+ {
+ *cur = '\n';
+ cur = strchr(cur, '#');
+ }
+ }
+ // copy final string
+ strncpy(description[num].displayname, displayname, SKINNAMESIZE);
+ }
+ else if (fastcmp(word, "OPPOSITECOLOR") || fastcmp(word, "OPPOSITECOLOUR"))
+ {
+ SLOTFOUND
+ description[num].oppositecolor = (UINT16)get_number(word2);
+ }
+ else if (fastcmp(word, "NAMETAG") || fastcmp(word, "TAGNAME"))
+ {
+ SLOTFOUND
+ strncpy(description[num].nametag, word2, 8);
+ }
+ else if (fastcmp(word, "TAGTEXTCOLOR") || fastcmp(word, "TAGTEXTCOLOUR"))
+ {
+ SLOTFOUND
+ description[num].tagtextcolor = (UINT16)get_number(word2);
+ }
+ else if (fastcmp(word, "TAGOUTLINECOLOR") || fastcmp(word, "TAGOUTLINECOLOUR"))
+ {
+ SLOTFOUND
+ description[num].tagoutlinecolor = (UINT16)get_number(word2);
+ }
+ else if (fastcmp(word, "STATUS"))
+ {
+ /*
+ You MAY disable previous entries if you so desire...
+ But try to enable something that's already enabled and you will be sent to a free slot.
+
+ Because of this, you are allowed to edit any previous entries you like, but only if you
+ signal that you are purposely doing so by disabling and then reenabling the slot.
+ */
+ if (i && !slotfound && (slotfound = findFreeSlot(&num)) == false)
+ goto done;
+
+ description[num].used = (!!i);
+ }
+ else if (fastcmp(word, "SKINNAME"))
+ {
+ // Send to free slot.
+ SLOTFOUND
+ strlcpy(description[num].skinname, word2, sizeof description[num].skinname);
+ strlwr(description[num].skinname);
+ }
+ else
+ deh_warning("readPlayer %d: unknown word '%s'", num, word);
+ }
+ } while (!myfeof(f)); // finish when the line is empty
+ #undef SLOTFOUND
+done:
+ Z_Free(displayname);
+ Z_Free(s);
+}
+
+// TODO: Figure out how to do undolines for this....
+// TODO: Warnings for running out of freeslots
+void readfreeslots(MYFILE *f)
+{
+ char *s = Z_Malloc(MAXLINELEN, PU_STATIC, NULL);
+ char *word,*type;
+ char *tmp;
+ int i;
+
+ do
+ {
+ if (myfgets(s, MAXLINELEN, f))
+ {
+ if (s[0] == '\n')
+ break;
+
+ tmp = strchr(s, '#');
+ if (tmp)
+ *tmp = '\0';
+ if (s == tmp)
+ continue; // Skip comment lines, but don't break.
+
+ type = strtok(s, "_");
+ if (type)
+ strupr(type);
+ else
+ break;
+
+ word = strtok(NULL, "\n");
+ if (word)
+ strupr(word);
+ else
+ break;
+
+ // TODO: Check for existing freeslot mobjs/states/etc. and make errors.
+ // TODO: Out-of-slots warnings/errors.
+ // TODO: Name too long (truncated) warnings.
+ if (fastcmp(type, "SFX"))
+ S_AddSoundFx(word, false, 0, false);
+ else if (fastcmp(type, "SPR"))
+ {
+ for (i = SPR_FIRSTFREESLOT; i <= SPR_LASTFREESLOT; i++)
+ {
+ if (used_spr[(i-SPR_FIRSTFREESLOT)/8] & (1<<(i%8)))
+ {
+ if (!sprnames[i][4] && memcmp(sprnames[i],word,4)==0)
+ sprnames[i][4] = (char)f->wad;
+ continue; // Already allocated, next.
+ }
+ // Found a free slot!
+ strncpy(sprnames[i],word,4);
+ //sprnames[i][4] = 0;
+ used_spr[(i-SPR_FIRSTFREESLOT)/8] |= 1<<(i%8); // Okay, this sprite slot has been named now.
+ break;
+ }
+ }
+ else if (fastcmp(type, "S"))
+ {
+ for (i = 0; i < NUMSTATEFREESLOTS; i++)
+ if (!FREE_STATES[i]) {
+ FREE_STATES[i] = Z_Malloc(strlen(word)+1, PU_STATIC, NULL);
+ strcpy(FREE_STATES[i],word);
+ break;
+ }
+ }
+ else if (fastcmp(type, "MT"))
+ {
+ for (i = 0; i < NUMMOBJFREESLOTS; i++)
+ if (!FREE_MOBJS[i]) {
+ FREE_MOBJS[i] = Z_Malloc(strlen(word)+1, PU_STATIC, NULL);
+ strcpy(FREE_MOBJS[i],word);
+ break;
+ }
+ }
+ else if (fastcmp(type, "SKINCOLOR"))
+ {
+ for (i = 0; i < NUMCOLORFREESLOTS; i++)
+ if (!FREE_SKINCOLORS[i]) {
+ FREE_SKINCOLORS[i] = Z_Malloc(strlen(word)+1, PU_STATIC, NULL);
+ strcpy(FREE_SKINCOLORS[i],word);
+ M_AddMenuColor(numskincolors++);
+ break;
+ }
+ }
+ else if (fastcmp(type, "SPR2"))
+ {
+ // Search if we already have an SPR2 by that name...
+ for (i = SPR2_FIRSTFREESLOT; i < (int)free_spr2; i++)
+ if (memcmp(spr2names[i],word,4) == 0)
+ break;
+ // We found it? (Two mods using the same SPR2 name?) Then don't allocate another one.
+ if (i < (int)free_spr2)
+ continue;
+ // Copy in the spr2 name and increment free_spr2.
+ if (free_spr2 < NUMPLAYERSPRITES) {
+ strncpy(spr2names[free_spr2],word,4);
+ spr2defaults[free_spr2] = 0;
+ spr2names[free_spr2++][4] = 0;
+ } else
+ deh_warning("Ran out of free SPR2 slots!\n");
+ }
+ else if (fastcmp(type, "TOL"))
+ {
+ // Search if we already have a typeoflevel by that name...
+ for (i = 0; TYPEOFLEVEL[i].name; i++)
+ if (fastcmp(word, TYPEOFLEVEL[i].name))
+ break;
+
+ // We found it? Then don't allocate another one.
+ if (TYPEOFLEVEL[i].name)
+ continue;
+
+ // We don't, so freeslot it.
+ if (lastcustomtol == (UINT32)MAXTOL) // Unless you have way too many, since they're flags.
+ deh_warning("Ran out of free typeoflevel slots!\n");
+ else
+ {
+ G_AddTOL(lastcustomtol, word);
+ lastcustomtol <<= 1;
+ }
+ }
+ else
+ deh_warning("Freeslots: unknown enum class '%s' for '%s_%s'", type, type, word);
+ }
+ } while (!myfeof(f)); // finish when the line is empty
+
+ Z_Free(s);
+}
+
+void readthing(MYFILE *f, INT32 num)
+{
+ char *s = Z_Malloc(MAXLINELEN, PU_STATIC, NULL);
+ char *word, *word2;
+ char *tmp;
+
+ do
+ {
+ if (myfgets(s, MAXLINELEN, f))
+ {
+ if (s[0] == '\n')
+ break;
+
+ tmp = strchr(s, '#');
+ if (tmp)
+ *tmp = '\0';
+ if (s == tmp)
+ continue; // Skip comment lines, but don't break.
+
+ word = strtok(s, " ");
+ if (word)
+ strupr(word);
+ else
+ break;
+
+ word2 = strtok(NULL, " = ");
+ if (word2)
+ strupr(word2);
+ else
+ break;
+ if (word2[strlen(word2)-1] == '\n')
+ word2[strlen(word2)-1] = '\0';
+
+ if (fastcmp(word, "MAPTHINGNUM") || fastcmp(word, "DOOMEDNUM"))
+ {
+ mobjinfo[num].doomednum = (INT32)atoi(word2);
+ }
+ else if (fastcmp(word, "SPAWNSTATE"))
+ {
+ mobjinfo[num].spawnstate = get_number(word2);
+ }
+ else if (fastcmp(word, "SPAWNHEALTH"))
+ {
+ mobjinfo[num].spawnhealth = (INT32)get_number(word2);
+ }
+ else if (fastcmp(word, "SEESTATE"))
+ {
+ mobjinfo[num].seestate = get_number(word2);
+ }
+ else if (fastcmp(word, "SEESOUND"))
+ {
+ mobjinfo[num].seesound = get_number(word2);
+ }
+ else if (fastcmp(word, "REACTIONTIME"))
+ {
+ mobjinfo[num].reactiontime = (INT32)get_number(word2);
+ }
+ else if (fastcmp(word, "ATTACKSOUND"))
+ {
+ mobjinfo[num].attacksound = get_number(word2);
+ }
+ else if (fastcmp(word, "PAINSTATE"))
+ {
+ mobjinfo[num].painstate = get_number(word2);
+ }
+ else if (fastcmp(word, "PAINCHANCE"))
+ {
+ mobjinfo[num].painchance = (INT32)get_number(word2);
+ }
+ else if (fastcmp(word, "PAINSOUND"))
+ {
+ mobjinfo[num].painsound = get_number(word2);
+ }
+ else if (fastcmp(word, "MELEESTATE"))
+ {
+ mobjinfo[num].meleestate = get_number(word2);
+ }
+ else if (fastcmp(word, "MISSILESTATE"))
+ {
+ mobjinfo[num].missilestate = get_number(word2);
+ }
+ else if (fastcmp(word, "DEATHSTATE"))
+ {
+ mobjinfo[num].deathstate = get_number(word2);
+ }
+ else if (fastcmp(word, "DEATHSOUND"))
+ {
+ mobjinfo[num].deathsound = get_number(word2);
+ }
+ else if (fastcmp(word, "XDEATHSTATE"))
+ {
+ mobjinfo[num].xdeathstate = get_number(word2);
+ }
+ else if (fastcmp(word, "SPEED"))
+ {
+ mobjinfo[num].speed = get_number(word2);
+ }
+ else if (fastcmp(word, "RADIUS"))
+ {
+ mobjinfo[num].radius = get_number(word2);
+ }
+ else if (fastcmp(word, "HEIGHT"))
+ {
+ mobjinfo[num].height = get_number(word2);
+ }
+ else if (fastcmp(word, "DISPOFFSET"))
+ {
+ mobjinfo[num].dispoffset = get_number(word2);
+ }
+ else if (fastcmp(word, "MASS"))
+ {
+ mobjinfo[num].mass = (INT32)get_number(word2);
+ }
+ else if (fastcmp(word, "DAMAGE"))
+ {
+ mobjinfo[num].damage = (INT32)get_number(word2);
+ }
+ else if (fastcmp(word, "ACTIVESOUND"))
+ {
+ mobjinfo[num].activesound = get_number(word2);
+ }
+ else if (fastcmp(word, "FLAGS"))
+ {
+ mobjinfo[num].flags = (INT32)get_number(word2);
+ }
+ else if (fastcmp(word, "RAISESTATE"))
+ {
+ mobjinfo[num].raisestate = get_number(word2);
+ }
+ else
+ deh_warning("Thing %d: unknown word '%s'", num, word);
+ }
+ } while (!myfeof(f)); // finish when the line is empty
+
+ Z_Free(s);
+}
+
+void readskincolor(MYFILE *f, INT32 num)
+{
+ char *s = Z_Malloc(MAXLINELEN, PU_STATIC, NULL);
+ char *word = s;
+ char *word2;
+ char *tmp;
+
+ Color_cons_t[num].value = num;
+
+ do
+ {
+ if (myfgets(s, MAXLINELEN, f))
+ {
+ if (s[0] == '\n')
+ break;
+
+ // First remove trailing newline, if there is one
+ tmp = strchr(s, '\n');
+ if (tmp)
+ *tmp = '\0';
+
+ tmp = strchr(s, '#');
+ if (tmp)
+ *tmp = '\0';
+ if (s == tmp)
+ continue; // Skip comment lines, but don't break.
+
+ // Get the part before the " = "
+ tmp = strchr(s, '=');
+ if (tmp)
+ *(tmp-1) = '\0';
+ else
+ break;
+ strupr(word);
+
+ // Now get the part after
+ word2 = tmp += 2;
+
+ if (fastcmp(word, "NAME"))
+ {
+ size_t namesize = sizeof(skincolors[num].name);
+ char truncword[namesize];
+ UINT16 dupecheck;
+
+ deh_strlcpy(truncword, word2, namesize, va("Skincolor %d: name", num)); // truncate here to check for dupes
+ dupecheck = R_GetColorByName(truncword);
+ if (truncword[0] != '\0' && (!stricmp(truncword, skincolors[SKINCOLOR_NONE].name) || (dupecheck && dupecheck != num)))
+ {
+ size_t lastchar = strlen(truncword);
+ char oldword[lastchar+1];
+ char dupenum = '1';
+
+ strlcpy(oldword, truncword, lastchar+1);
+ lastchar--;
+ if (lastchar == namesize-2) // exactly max length, replace last character with 0
+ truncword[lastchar] = '0';
+ else // append 0
+ {
+ strcat(truncword, "0");
+ lastchar++;
+ }
+
+ while (R_GetColorByName(truncword))
+ {
+ truncword[lastchar] = dupenum;
+ if (dupenum == '9')
+ dupenum = 'A';
+ else if (dupenum == 'Z') // give up :?
+ break;
+ else
+ dupenum++;
+ }
+
+ deh_warning("Skincolor %d: name %s is a duplicate of another skincolor's name - renamed to %s", num, oldword, truncword);
+ }
+
+ strlcpy(skincolors[num].name, truncword, namesize); // already truncated
+ }
+ else if (fastcmp(word, "RAMP"))
+ {
+ UINT8 i;
+ tmp = strtok(word2,",");
+ for (i = 0; i < COLORRAMPSIZE; i++) {
+ skincolors[num].ramp[i] = (UINT8)get_number(tmp);
+ if ((tmp = strtok(NULL,",")) == NULL)
+ break;
+ }
+ skincolor_modified[num] = true;
+ }
+ else if (fastcmp(word, "INVCOLOR"))
+ {
+ UINT16 v = (UINT16)get_number(word2);
+ if (v < numskincolors)
+ skincolors[num].invcolor = v;
+ else
+ skincolors[num].invcolor = SKINCOLOR_GREEN;
+ }
+ else if (fastcmp(word, "INVSHADE"))
+ {
+ skincolors[num].invshade = get_number(word2)%COLORRAMPSIZE;
+ }
+ else if (fastcmp(word, "CHATCOLOR"))
+ {
+ skincolors[num].chatcolor = get_number(word2);
+ }
+ else if (fastcmp(word, "ACCESSIBLE"))
+ {
+ if (num > FIRSTSUPERCOLOR)
+ skincolors[num].accessible = (boolean)(atoi(word2) || word2[0] == 'T' || word2[0] == 'Y');
+ }
+ else
+ deh_warning("Skincolor %d: unknown word '%s'", num, word);
+ }
+ } while (!myfeof(f)); // finish when the line is empty
+
+ Z_Free(s);
+}
+
+#ifdef HWRENDER
+void readlight(MYFILE *f, INT32 num)
+{
+ char *s = Z_Malloc(MAXLINELEN, PU_STATIC, NULL);
+ char *word;
+ char *tmp;
+ INT32 value;
+ float fvalue;
+
+ do
+ {
+ if (myfgets(s, MAXLINELEN, f))
+ {
+ if (s[0] == '\n')
+ break;
+
+ tmp = strchr(s, '#');
+ if (tmp)
+ *tmp = '\0';
+ if (s == tmp)
+ continue; // Skip comment lines, but don't break.
+
+ fvalue = searchfvalue(s);
+ value = searchvalue(s);
+
+ word = strtok(s, " ");
+ if (word)
+ strupr(word);
+ else
+ break;
+
+ if (fastcmp(word, "TYPE"))
+ {
+ lspr[num].type = (UINT16)value;
+ }
+ else if (fastcmp(word, "OFFSETX"))
+ {
+ lspr[num].light_xoffset = fvalue;
+ }
+ else if (fastcmp(word, "OFFSETY"))
+ {
+ lspr[num].light_yoffset = fvalue;
+ }
+ else if (fastcmp(word, "CORONACOLOR"))
+ {
+ lspr[num].corona_color = value;
+ }
+ else if (fastcmp(word, "CORONARADIUS"))
+ {
+ lspr[num].corona_radius = fvalue;
+ }
+ else if (fastcmp(word, "DYNAMICCOLOR"))
+ {
+ lspr[num].dynamic_color = value;
+ }
+ else if (fastcmp(word, "DYNAMICRADIUS"))
+ {
+ lspr[num].dynamic_radius = fvalue;
+
+ /// \note Update the sqrradius! unnecessary?
+ lspr[num].dynamic_sqrradius = fvalue * fvalue;
+ }
+ else
+ deh_warning("Light %d: unknown word '%s'", num, word);
+ }
+ } while (!myfeof(f)); // finish when the line is empty
+
+ Z_Free(s);
+}
+#endif // HWRENDER
+
+static void readspriteframe(MYFILE *f, spriteinfo_t *sprinfo, UINT8 frame)
+{
+ char *s = Z_Malloc(MAXLINELEN, PU_STATIC, NULL);
+ char *word, *word2;
+ char *tmp;
+ INT32 value;
+ char *lastline;
+
+ do
+ {
+ lastline = f->curpos;
+ if (myfgets(s, MAXLINELEN, f))
+ {
+ if (s[0] == '\n')
+ break;
+
+ // First remove trailing newline, if there is one
+ tmp = strchr(s, '\n');
+ if (tmp)
+ *tmp = '\0';
+
+ tmp = strchr(s, '#');
+ if (tmp)
+ *tmp = '\0';
+ if (s == tmp)
+ continue; // Skip comment lines, but don't break.
+
+ // Set / reset word
+ word = s;
+ while ((*word == '\t') || (*word == ' '))
+ word++;
+
+ // Get the part before the " = "
+ tmp = strchr(s, '=');
+ if (tmp)
+ {
+ *(tmp-1) = '\0';
+ // Now get the part after
+ word2 = tmp += 2;
+ }
+ else
+ {
+ // Get the part before the " "
+ tmp = strchr(s, ' ');
+ if (tmp)
+ {
+ *tmp = '\0';
+ // Now get the part after
+ tmp++;
+ word2 = tmp;
+ }
+ else
+ break;
+ }
+ strupr(word);
+ value = atoi(word2); // used for numerical settings
+
+ if (fastcmp(word, "XPIVOT"))
+ sprinfo->pivot[frame].x = value;
+ else if (fastcmp(word, "YPIVOT"))
+ sprinfo->pivot[frame].y = value;
+ else if (fastcmp(word, "ROTAXIS"))
+ sprinfo->pivot[frame].rotaxis = value;
+ else
+ {
+ f->curpos = lastline;
+ break;
+ }
+ }
+ } while (!myfeof(f)); // finish when the line is empty
+ Z_Free(s);
+}
+
+void readspriteinfo(MYFILE *f, INT32 num, boolean sprite2)
+{
+ char *s = Z_Malloc(MAXLINELEN, PU_STATIC, NULL);
+ char *word, *word2;
+ char *tmp;
+#ifdef HWRENDER
+ INT32 value;
+#endif
+ char *lastline;
+ INT32 skinnumbers[MAXSKINS];
+ INT32 foundskins = 0;
+
+ // allocate a spriteinfo
+ spriteinfo_t *info = Z_Calloc(sizeof(spriteinfo_t), PU_STATIC, NULL);
+ info->available = true;
+
+ do
+ {
+ lastline = f->curpos;
+ if (myfgets(s, MAXLINELEN, f))
+ {
+ if (s[0] == '\n')
+ break;
+
+ // First remove trailing newline, if there is one
+ tmp = strchr(s, '\n');
+ if (tmp)
+ *tmp = '\0';
+
+ tmp = strchr(s, '#');
+ if (tmp)
+ *tmp = '\0';
+ if (s == tmp)
+ continue; // Skip comment lines, but don't break.
+
+ // Set / reset word
+ word = s;
+ while ((*word == '\t') || (*word == ' '))
+ word++;
+
+ // Get the part before the " = "
+ tmp = strchr(s, '=');
+ if (tmp)
+ {
+ *(tmp-1) = '\0';
+ // Now get the part after
+ word2 = tmp += 2;
+ }
+ else
+ {
+ // Get the part before the " "
+ tmp = strchr(s, ' ');
+ if (tmp)
+ {
+ *tmp = '\0';
+ // Now get the part after
+ tmp++;
+ word2 = tmp;
+ }
+ else
+ break;
+ }
+ strupr(word);
+#ifdef HWRENDER
+ value = atoi(word2); // used for numerical settings
+
+ if (fastcmp(word, "LIGHTTYPE"))
+ {
+ if (sprite2)
+ deh_warning("Sprite2 %s: invalid word '%s'", spr2names[num], word);
+ else
+ {
+ INT32 oldvar;
+ for (oldvar = 0; t_lspr[num] != &lspr[oldvar]; oldvar++)
+ ;
+ t_lspr[num] = &lspr[value];
+ }
+ }
+ else
+#endif
+ if (fastcmp(word, "SKIN"))
+ {
+ INT32 skinnum = -1;
+ if (!sprite2)
+ {
+ deh_warning("Sprite %s: %s keyword found outside of SPRITE2INFO block, ignoring", spr2names[num], word);
+ continue;
+ }
+
+ // make lowercase
+ strlwr(word2);
+ skinnum = R_SkinAvailable(word2);
+ if (skinnum == -1)
+ {
+ deh_warning("Sprite2 %s: unknown skin %s", spr2names[num], word2);
+ break;
+ }
+
+ skinnumbers[foundskins] = skinnum;
+ foundskins++;
+ }
+ else if (fastcmp(word, "DEFAULT"))
+ {
+ if (!sprite2)
+ {
+ deh_warning("Sprite %s: %s keyword found outside of SPRITE2INFO block, ignoring", spr2names[num], word);
+ continue;
+ }
+ if (num < (INT32)free_spr2 && num >= (INT32)SPR2_FIRSTFREESLOT)
+ spr2defaults[num] = get_number(word2);
+ else
+ {
+ deh_warning("Sprite2 %s: out of range (%d - %d), ignoring", spr2names[num], SPR2_FIRSTFREESLOT, free_spr2-1);
+ continue;
+ }
+ }
+ else if (fastcmp(word, "FRAME"))
+ {
+ UINT8 frame = R_Char2Frame(word2[0]);
+ // frame number too high
+ if (frame >= 64)
+ {
+ if (sprite2)
+ deh_warning("Sprite2 %s: invalid frame %s", spr2names[num], word2);
+ else
+ deh_warning("Sprite %s: invalid frame %s", sprnames[num], word2);
+ break;
+ }
+
+ // read sprite frame and store it in the spriteinfo_t struct
+ readspriteframe(f, info, frame);
+ if (sprite2)
+ {
+ INT32 i;
+ if (!foundskins)
+ {
+ deh_warning("Sprite2 %s: no skins specified", spr2names[num]);
+ break;
+ }
+ for (i = 0; i < foundskins; i++)
+ {
+ size_t skinnum = skinnumbers[i];
+ skin_t *skin = &skins[skinnum];
+ spriteinfo_t *sprinfo = skin->sprinfo;
+ M_Memcpy(&sprinfo[num], info, sizeof(spriteinfo_t));
+ }
+ }
+ else
+ M_Memcpy(&spriteinfo[num], info, sizeof(spriteinfo_t));
+ }
+ else
+ {
+ //deh_warning("Sprite %s: unknown word '%s'", sprnames[num], word);
+ f->curpos = lastline;
+ break;
+ }
+ }
+ } while (!myfeof(f)); // finish when the line is empty
+
+ Z_Free(s);
+ Z_Free(info);
+}
+
+void readsprite2(MYFILE *f, INT32 num)
+{
+ char *s = Z_Malloc(MAXLINELEN, PU_STATIC, NULL);
+ char *word, *word2;
+ char *tmp;
+
+ do
+ {
+ if (myfgets(s, MAXLINELEN, f))
+ {
+ if (s[0] == '\n')
+ break;
+
+ tmp = strchr(s, '#');
+ if (tmp)
+ *tmp = '\0';
+ if (s == tmp)
+ continue; // Skip comment lines, but don't break.
+
+ word = strtok(s, " ");
+ if (word)
+ strupr(word);
+ else
+ break;
+
+ word2 = strtok(NULL, " = ");
+ if (word2)
+ strupr(word2);
+ else
+ break;
+ if (word2[strlen(word2)-1] == '\n')
+ word2[strlen(word2)-1] = '\0';
+
+ if (fastcmp(word, "DEFAULT"))
+ spr2defaults[num] = get_number(word2);
+ else
+ deh_warning("Sprite2 %s: unknown word '%s'", spr2names[num], word);
+ }
+ } while (!myfeof(f)); // finish when the line is empty
+
+ Z_Free(s);
+}
+
+// copypasted from readPlayer :]
+void readgametype(MYFILE *f, char *gtname)
+{
+ char *s = Z_Malloc(MAXLINELEN, PU_STATIC, NULL);
+ char *word;
+ char *word2, *word2lwr = NULL;
+ char *tmp;
+ INT32 i, j;
+
+ INT16 newgtidx = 0;
+ UINT32 newgtrules = 0;
+ UINT32 newgttol = 0;
+ INT32 newgtpointlimit = 0;
+ INT32 newgttimelimit = 0;
+ UINT8 newgtleftcolor = 0;
+ UINT8 newgtrightcolor = 0;
+ INT16 newgtrankingstype = -1;
+ int newgtinttype = 0;
+ char gtdescription[441];
+ char gtconst[MAXLINELEN];
+
+ // Empty strings.
+ gtdescription[0] = '\0';
+ gtconst[0] = '\0';
+
+ do
+ {
+ if (myfgets(s, MAXLINELEN, f))
+ {
+ if (s[0] == '\n')
+ break;
+
+ word = strtok(s, " ");
+ if (word)
+ strupr(word);
+ else
+ break;
+
+ if (fastcmp(word, "DESCRIPTION"))
+ {
+ char *descr = NULL;
+
+ for (i = 0; i < MAXLINELEN-3; i++)
+ {
+ if (s[i] == '=')
+ {
+ descr = &s[i+2];
+ break;
+ }
+ }
+ if (descr)
+ {
+ strcpy(gtdescription, descr);
+ strcat(gtdescription, myhashfgets(descr, sizeof (gtdescription), f));
+ }
+ else
+ strcpy(gtdescription, "");
+
+ // For some reason, cutting the string did not work above. Most likely due to strcpy or strcat...
+ // It works down here, though.
+ {
+ INT32 numline = 0;
+ for (i = 0; (size_t)i < sizeof(gtdescription)-1; i++)
+ {
+ if (numline < 20 && gtdescription[i] == '\n')
+ numline++;
+
+ if (numline >= 20 || gtdescription[i] == '\0' || gtdescription[i] == '#')
+ break;
+ }
+ }
+ gtdescription[strlen(gtdescription)-1] = '\0';
+ gtdescription[i] = '\0';
+ continue;
+ }
+
+ word2 = strtok(NULL, " = ");
+ if (word2)
+ {
+ if (!word2lwr)
+ word2lwr = Z_Malloc(MAXLINELEN, PU_STATIC, NULL);
+ strcpy(word2lwr, word2);
+ strupr(word2);
+ }
+ else
+ break;
+
+ if (word2[strlen(word2)-1] == '\n')
+ word2[strlen(word2)-1] = '\0';
+ i = atoi(word2);
+
+ // Game type rules
+ if (fastcmp(word, "RULES"))
+ {
+ // GTR_
+ newgtrules = (UINT32)get_number(word2);
+ }
+ // Identifier
+ else if (fastcmp(word, "IDENTIFIER"))
+ {
+ // GT_
+ strncpy(gtconst, word2, MAXLINELEN);
+ }
+ // Point and time limits
+ else if (fastcmp(word, "DEFAULTPOINTLIMIT"))
+ newgtpointlimit = (INT32)i;
+ else if (fastcmp(word, "DEFAULTTIMELIMIT"))
+ newgttimelimit = (INT32)i;
+ // Level platter
+ else if (fastcmp(word, "HEADERCOLOR") || fastcmp(word, "HEADERCOLOUR"))
+ newgtleftcolor = newgtrightcolor = (UINT8)get_number(word2);
+ else if (fastcmp(word, "HEADERLEFTCOLOR") || fastcmp(word, "HEADERLEFTCOLOUR"))
+ newgtleftcolor = (UINT8)get_number(word2);
+ else if (fastcmp(word, "HEADERRIGHTCOLOR") || fastcmp(word, "HEADERRIGHTCOLOUR"))
+ newgtrightcolor = (UINT8)get_number(word2);
+ // Rankings type
+ else if (fastcmp(word, "RANKINGTYPE"))
+ {
+ // Case insensitive
+ newgtrankingstype = (int)get_number(word2);
+ }
+ // Intermission type
+ else if (fastcmp(word, "INTERMISSIONTYPE"))
+ {
+ // Case sensitive
+ newgtinttype = (int)get_number(word2lwr);
+ }
+ // Type of level
+ else if (fastcmp(word, "TYPEOFLEVEL"))
+ {
+ if (i) // it's just a number
+ newgttol = (UINT32)i;
+ else
+ {
+ UINT32 tol = 0;
+ tmp = strtok(word2,",");
+ do {
+ for (i = 0; TYPEOFLEVEL[i].name; i++)
+ if (fasticmp(tmp, TYPEOFLEVEL[i].name))
+ break;
+ if (!TYPEOFLEVEL[i].name)
+ deh_warning("readgametype %s: unknown typeoflevel flag %s\n", gtname, tmp);
+ tol |= TYPEOFLEVEL[i].flag;
+ } while((tmp = strtok(NULL,",")) != NULL);
+ newgttol = tol;
+ }
+ }
+ // The SOC probably provided gametype rules as words,
+ // instead of using the RULES keyword.
+ // Like for example "NOSPECTATORSPAWN = TRUE".
+ // This is completely valid, and looks better anyway.
+ else
+ {
+ UINT32 wordgt = 0;
+ for (j = 0; GAMETYPERULE_LIST[j]; j++)
+ if (fastcmp(word, GAMETYPERULE_LIST[j])) {
+ wordgt |= (1<<j);
+ if (i || word2[0] == 'T' || word2[0] == 'Y')
+ newgtrules |= wordgt;
+ break;
+ }
+ if (!wordgt)
+ deh_warning("readgametype %s: unknown word '%s'", gtname, word);
+ }
+ }
+ } while (!myfeof(f)); // finish when the line is empty
+
+ // Free strings.
+ Z_Free(s);
+ if (word2lwr)
+ Z_Free(word2lwr);
+
+ // Ran out of gametype slots
+ if (gametypecount == NUMGAMETYPEFREESLOTS)
+ {
+ CONS_Alert(CONS_WARNING, "Ran out of free gametype slots!\n");
+ return;
+ }
+
+ // Add the new gametype
+ newgtidx = G_AddGametype(newgtrules);
+ G_AddGametypeTOL(newgtidx, newgttol);
+ G_SetGametypeDescription(newgtidx, gtdescription, newgtleftcolor, newgtrightcolor);
+
+ // Not covered by G_AddGametype alone.
+ if (newgtrankingstype == -1)
+ newgtrankingstype = newgtidx;
+ gametyperankings[newgtidx] = newgtrankingstype;
+ intermissiontypes[newgtidx] = newgtinttype;
+ pointlimits[newgtidx] = newgtpointlimit;
+ timelimits[newgtidx] = newgttimelimit;
+
+ // Write the new gametype name.
+ Gametype_Names[newgtidx] = Z_StrDup((const char *)gtname);
+
+ // Write the constant name.
+ if (gtconst[0] == '\0')
+ strncpy(gtconst, gtname, MAXLINELEN);
+ G_AddGametypeConstant(newgtidx, (const char *)gtconst);
+
+ // Update gametype_cons_t accordingly.
+ G_UpdateGametypeSelections();
+
+ CONS_Printf("Added gametype %s\n", Gametype_Names[newgtidx]);
+}
+
+void readlevelheader(MYFILE *f, INT32 num)
+{
+ char *s = Z_Malloc(MAXLINELEN, PU_STATIC, NULL);
+ char *word;
+ char *word2;
+ //char *word3; // Non-uppercase version of word2
+ char *tmp;
+ INT32 i;
+
+ // Reset all previous map header information
+ P_AllocMapHeader((INT16)(num-1));
+
+ do
+ {
+ if (myfgets(s, MAXLINELEN, f))
+ {
+ if (s[0] == '\n')
+ break;
+
+ // First remove trailing newline, if there is one
+ tmp = strchr(s, '\n');
+ if (tmp)
+ *tmp = '\0';
+
+ tmp = strchr(s, '#');
+ if (tmp)
+ *tmp = '\0';
+ if (s == tmp)
+ continue; // Skip comment lines, but don't break.
+
+ // Set / reset word, because some things (Lua.) move it
+ word = s;
+
+ // Get the part before the " = "
+ tmp = strchr(s, '=');
+ if (tmp)
+ *(tmp-1) = '\0';
+ else
+ break;
+ strupr(word);
+
+ // Now get the part after
+ word2 = tmp += 2;
+ i = atoi(word2); // used for numerical settings
+
+
+ if (fastcmp(word, "LEVELNAME"))
+ {
+ deh_strlcpy(mapheaderinfo[num-1]->lvlttl, word2,
+ sizeof(mapheaderinfo[num-1]->lvlttl), va("Level header %d: levelname", num));
+ strlcpy(mapheaderinfo[num-1]->selectheading, word2, sizeof(mapheaderinfo[num-1]->selectheading)); // not deh_ so only complains once
+ continue;
+ }
+ // CHEAP HACK: move this over here for lowercase subtitles
+ if (fastcmp(word, "SUBTITLE"))
+ {
+ deh_strlcpy(mapheaderinfo[num-1]->subttl, word2,
+ sizeof(mapheaderinfo[num-1]->subttl), va("Level header %d: subtitle", num));
+ continue;
+ }
+
+ // Lua custom options also go above, contents may be case sensitive.
+ if (fastncmp(word, "LUA.", 4))
+ {
+ UINT8 j;
+ customoption_t *modoption;
+
+ // Note: we actualy strlwr word here, so things are made a little easier for Lua
+ strlwr(word);
+ word += 4; // move past "lua."
+
+ // ... and do a simple name sanity check; the name must start with a letter
+ if (*word < 'a' || *word > 'z')
+ {
+ deh_warning("Level header %d: invalid custom option name \"%s\"", num, word);
+ continue;
+ }
+
+ // Sanity limit of 128 params
+ if (mapheaderinfo[num-1]->numCustomOptions == 128)
+ {
+ deh_warning("Level header %d: too many custom parameters", num);
+ continue;
+ }
+ j = mapheaderinfo[num-1]->numCustomOptions++;
+
+ mapheaderinfo[num-1]->customopts =
+ Z_Realloc(mapheaderinfo[num-1]->customopts,
+ sizeof(customoption_t) * mapheaderinfo[num-1]->numCustomOptions, PU_STATIC, NULL);
+
+ // Newly allocated
+ modoption = &mapheaderinfo[num-1]->customopts[j];
+
+ strncpy(modoption->option, word, 31);
+ modoption->option[31] = '\0';
+ strncpy(modoption->value, word2, 255);
+ modoption->value[255] = '\0';
+ continue;
+ }
+
+ // Now go to uppercase
+ strupr(word2);
+
+ // List of flickies that are be freed in this map
+ if (fastcmp(word, "FLICKYLIST") || fastcmp(word, "ANIMALLIST"))
+ {
+ if (fastcmp(word2, "NONE"))
+ P_DeleteFlickies(num-1);
+ else if (fastcmp(word2, "DEMO"))
+ P_SetDemoFlickies(num-1);
+ else if (fastcmp(word2, "ALL"))
+ {
+ mobjtype_t tmpflickies[MAXFLICKIES];
+
+ for (mapheaderinfo[num-1]->numFlickies = 0;
+ ((mapheaderinfo[num-1]->numFlickies < MAXFLICKIES) && FLICKYTYPES[mapheaderinfo[num-1]->numFlickies].type);
+ mapheaderinfo[num-1]->numFlickies++)
+ tmpflickies[mapheaderinfo[num-1]->numFlickies] = FLICKYTYPES[mapheaderinfo[num-1]->numFlickies].type;
+
+ if (mapheaderinfo[num-1]->numFlickies) // just in case...
+ {
+ size_t newsize = sizeof(mobjtype_t) * mapheaderinfo[num-1]->numFlickies;
+ mapheaderinfo[num-1]->flickies = Z_Realloc(mapheaderinfo[num-1]->flickies, newsize, PU_STATIC, NULL);
+ M_Memcpy(mapheaderinfo[num-1]->flickies, tmpflickies, newsize);
+ }
+ }
+ else
+ {
+ mobjtype_t tmpflickies[MAXFLICKIES];
+ mapheaderinfo[num-1]->numFlickies = 0;
+ tmp = strtok(word2,",");
+ // get up to the first MAXFLICKIES flickies
+ do {
+ if (mapheaderinfo[num-1]->numFlickies == MAXFLICKIES) // never going to get above that number
+ {
+ deh_warning("Level header %d: too many flickies\n", num);
+ break;
+ }
+
+ if (fastncmp(tmp, "MT_", 3)) // support for specified mobjtypes...
+ {
+ i = get_mobjtype(tmp);
+ if (!i)
+ {
+ //deh_warning("Level header %d: unknown flicky mobj type %s\n", num, tmp); -- no need for this line as get_mobjtype complains too
+ continue;
+ }
+ tmpflickies[mapheaderinfo[num-1]->numFlickies] = i;
+ }
+ else // ...or a quick, limited selection of default flickies!
+ {
+ for (i = 0; FLICKYTYPES[i].name; i++)
+ if (fastcmp(tmp, FLICKYTYPES[i].name))
+ break;
+
+ if (!FLICKYTYPES[i].name)
+ {
+ deh_warning("Level header %d: unknown flicky selection %s\n", num, tmp);
+ continue;
+ }
+ tmpflickies[mapheaderinfo[num-1]->numFlickies] = FLICKYTYPES[i].type;
+ }
+ mapheaderinfo[num-1]->numFlickies++;
+ } while ((tmp = strtok(NULL,",")) != NULL);
+
+ if (mapheaderinfo[num-1]->numFlickies)
+ {
+ size_t newsize = sizeof(mobjtype_t) * mapheaderinfo[num-1]->numFlickies;
+ mapheaderinfo[num-1]->flickies = Z_Realloc(mapheaderinfo[num-1]->flickies, newsize, PU_STATIC, NULL);
+ // now we add them to the list!
+ M_Memcpy(mapheaderinfo[num-1]->flickies, tmpflickies, newsize);
+ }
+ else
+ deh_warning("Level header %d: no valid flicky types found\n", num);
+ }
+ }
+
+ // NiGHTS grades
+ else if (fastncmp(word, "GRADES", 6))
+ {
+ UINT8 mare = (UINT8)atoi(word + 6);
+
+ if (mare <= 0 || mare > 8)
+ {
+ deh_warning("Level header %d: unknown word '%s'", num, word);
+ continue;
+ }
+
+ P_AddGradesForMare((INT16)(num-1), mare-1, word2);
+ }
+
+ // Strings that can be truncated
+ else if (fastcmp(word, "SELECTHEADING"))
+ {
+ deh_strlcpy(mapheaderinfo[num-1]->selectheading, word2,
+ sizeof(mapheaderinfo[num-1]->selectheading), va("Level header %d: selectheading", num));
+ }
+ else if (fastcmp(word, "SCRIPTNAME"))
+ {
+ deh_strlcpy(mapheaderinfo[num-1]->scriptname, word2,
+ sizeof(mapheaderinfo[num-1]->scriptname), va("Level header %d: scriptname", num));
+ }
+ else if (fastcmp(word, "RUNSOC"))
+ {
+ deh_strlcpy(mapheaderinfo[num-1]->runsoc, word2,
+ sizeof(mapheaderinfo[num-1]->runsoc), va("Level header %d: runsoc", num));
+ }
+ else if (fastcmp(word, "ACT"))
+ {
+ if (i >= 0 && i <= 99) // 0 for no act number
+ mapheaderinfo[num-1]->actnum = (UINT8)i;
+ else
+ deh_warning("Level header %d: invalid act number %d", num, i);
+ }
+ else if (fastcmp(word, "NEXTLEVEL"))
+ {
+ if (fastcmp(word2, "TITLE")) i = 1100;
+ else if (fastcmp(word2, "EVALUATION")) i = 1101;
+ else if (fastcmp(word2, "CREDITS")) i = 1102;
+ else if (fastcmp(word2, "ENDING")) i = 1103;
+ else
+ // Support using the actual map name,
+ // i.e., Nextlevel = AB, Nextlevel = FZ, etc.
+
+ // Convert to map number
+ if (word2[0] >= 'A' && word2[0] <= 'Z' && word2[2] == '\0')
+ i = M_MapNumber(word2[0], word2[1]);
+
+ mapheaderinfo[num-1]->nextlevel = (INT16)i;
+ }
+ else if (fastcmp(word, "MARATHONNEXT"))
+ {
+ if (fastcmp(word2, "TITLE")) i = 1100;
+ else if (fastcmp(word2, "EVALUATION")) i = 1101;
+ else if (fastcmp(word2, "CREDITS")) i = 1102;
+ else if (fastcmp(word2, "ENDING")) i = 1103;
+ else
+ // Support using the actual map name,
+ // i.e., MarathonNext = AB, MarathonNext = FZ, etc.
+
+ // Convert to map number
+ if (word2[0] >= 'A' && word2[0] <= 'Z' && word2[2] == '\0')
+ i = M_MapNumber(word2[0], word2[1]);
+
+ mapheaderinfo[num-1]->marathonnext = (INT16)i;
+ }
+ else if (fastcmp(word, "TYPEOFLEVEL"))
+ {
+ if (i) // it's just a number
+ mapheaderinfo[num-1]->typeoflevel = (UINT32)i;
+ else
+ {
+ UINT32 tol = 0;
+ tmp = strtok(word2,",");
+ do {
+ for (i = 0; TYPEOFLEVEL[i].name; i++)
+ if (fastcmp(tmp, TYPEOFLEVEL[i].name))
+ break;
+ if (!TYPEOFLEVEL[i].name)
+ deh_warning("Level header %d: unknown typeoflevel flag %s\n", num, tmp);
+ tol |= TYPEOFLEVEL[i].flag;
+ } while((tmp = strtok(NULL,",")) != NULL);
+ mapheaderinfo[num-1]->typeoflevel = tol;
+ }
+ }
+ else if (fastcmp(word, "KEYWORDS"))
+ {
+ deh_strlcpy(mapheaderinfo[num-1]->keywords, word2,
+ sizeof(mapheaderinfo[num-1]->keywords), va("Level header %d: keywords", num));
+ }
+ else if (fastcmp(word, "MUSIC"))
+ {
+ if (fastcmp(word2, "NONE"))
+ mapheaderinfo[num-1]->musname[0] = 0; // becomes empty string
+ else
+ {
+ deh_strlcpy(mapheaderinfo[num-1]->musname, word2,
+ sizeof(mapheaderinfo[num-1]->musname), va("Level header %d: music", num));
+ }
+ }
+#ifdef MUSICSLOT_COMPATIBILITY
+ else if (fastcmp(word, "MUSICSLOT"))
+ {
+ i = get_mus(word2, true);
+ if (i && i <= 1035)
+ snprintf(mapheaderinfo[num-1]->musname, 7, "%sM", G_BuildMapName(i));
+ else if (i && i <= 1050)
+ strncpy(mapheaderinfo[num-1]->musname, compat_special_music_slots[i - 1036], 7);
+ else
+ mapheaderinfo[num-1]->musname[0] = 0; // becomes empty string
+ mapheaderinfo[num-1]->musname[6] = 0;
+ }
+#endif
+ else if (fastcmp(word, "MUSICTRACK"))
+ mapheaderinfo[num-1]->mustrack = ((UINT16)i - 1);
+ else if (fastcmp(word, "MUSICPOS"))
+ mapheaderinfo[num-1]->muspos = (UINT32)get_number(word2);
+ else if (fastcmp(word, "MUSICINTERFADEOUT"))
+ mapheaderinfo[num-1]->musinterfadeout = (UINT32)get_number(word2);
+ else if (fastcmp(word, "MUSICINTER"))
+ deh_strlcpy(mapheaderinfo[num-1]->musintername, word2,
+ sizeof(mapheaderinfo[num-1]->musintername), va("Level header %d: intermission music", num));
+ else if (fastcmp(word, "MUSICPOSTBOSS"))
+ deh_strlcpy(mapheaderinfo[num-1]->muspostbossname, word2,
+ sizeof(mapheaderinfo[num-1]->muspostbossname), va("Level header %d: post-boss music", num));
+ else if (fastcmp(word, "MUSICPOSTBOSSTRACK"))
+ mapheaderinfo[num-1]->muspostbosstrack = ((UINT16)i - 1);
+ else if (fastcmp(word, "MUSICPOSTBOSSPOS"))
+ mapheaderinfo[num-1]->muspostbosspos = (UINT32)get_number(word2);
+ else if (fastcmp(word, "MUSICPOSTBOSSFADEIN"))
+ mapheaderinfo[num-1]->muspostbossfadein = (UINT32)get_number(word2);
+ else if (fastcmp(word, "FORCERESETMUSIC"))
+ {
+ // This is a weird one because "FALSE"/"NO" could either apply to "leave to default preference" (cv_resetmusic)
+ // or "force off". Let's assume it means "force off", and let an unspecified value mean "default preference"
+ if (fastcmp(word2, "OFF") || word2[0] == 'F' || word2[0] == 'N') i = 0;
+ else if (fastcmp(word2, "ON") || word2[0] == 'T' || word2[0] == 'Y') i = 1;
+ else i = -1; // (fastcmp(word2, "DEFAULT"))
+
+ if (i >= -1 && i <= 1) // -1 to force off, 1 to force on, 0 to honor default.
+ // This behavior can be disabled with cv_resetmusicbyheader
+ mapheaderinfo[num-1]->musforcereset = (SINT8)i;
+ else
+ deh_warning("Level header %d: invalid forceresetmusic option %d", num, i);
+ }
+ else if (fastcmp(word, "FORCECHARACTER"))
+ {
+ strlcpy(mapheaderinfo[num-1]->forcecharacter, word2, SKINNAMESIZE+1);
+ strlwr(mapheaderinfo[num-1]->forcecharacter); // skin names are lowercase
+ }
+ else if (fastcmp(word, "WEATHER"))
+ mapheaderinfo[num-1]->weather = (UINT8)get_number(word2);
+ else if (fastcmp(word, "SKYNUM"))
+ mapheaderinfo[num-1]->skynum = (INT16)i;
+ else if (fastcmp(word, "INTERSCREEN"))
+ strncpy(mapheaderinfo[num-1]->interscreen, word2, 8);
+ else if (fastcmp(word, "PRECUTSCENENUM"))
+ mapheaderinfo[num-1]->precutscenenum = (UINT8)i;
+ else if (fastcmp(word, "CUTSCENENUM"))
+ mapheaderinfo[num-1]->cutscenenum = (UINT8)i;
+ else if (fastcmp(word, "COUNTDOWN"))
+ mapheaderinfo[num-1]->countdown = (INT16)i;
+ else if (fastcmp(word, "PALETTE"))
+ mapheaderinfo[num-1]->palette = (UINT16)i;
+ else if (fastcmp(word, "NUMLAPS"))
+ mapheaderinfo[num-1]->numlaps = (UINT8)i;
+ else if (fastcmp(word, "UNLOCKABLE"))
+ {
+ if (i >= 0 && i <= MAXUNLOCKABLES) // 0 for no unlock required, anything else requires something
+ mapheaderinfo[num-1]->unlockrequired = (SINT8)i - 1;
+ else
+ deh_warning("Level header %d: invalid unlockable number %d", num, i);
+ }
+ else if (fastcmp(word, "LEVELSELECT"))
+ mapheaderinfo[num-1]->levelselect = (UINT8)i;
+ else if (fastcmp(word, "SKYBOXSCALE"))
+ mapheaderinfo[num-1]->skybox_scalex = mapheaderinfo[num-1]->skybox_scaley = mapheaderinfo[num-1]->skybox_scalez = (INT16)i;
+ else if (fastcmp(word, "SKYBOXSCALEX"))
+ mapheaderinfo[num-1]->skybox_scalex = (INT16)i;
+ else if (fastcmp(word, "SKYBOXSCALEY"))
+ mapheaderinfo[num-1]->skybox_scaley = (INT16)i;
+ else if (fastcmp(word, "SKYBOXSCALEZ"))
+ mapheaderinfo[num-1]->skybox_scalez = (INT16)i;
+
+ else if (fastcmp(word, "BONUSTYPE"))
+ {
+ if (fastcmp(word2, "NONE")) i = -1;
+ else if (fastcmp(word2, "NORMAL")) i = 0;
+ else if (fastcmp(word2, "BOSS")) i = 1;
+ else if (fastcmp(word2, "ERZ3")) i = 2;
+ else if (fastcmp(word2, "NIGHTS")) i = 3;
+ else if (fastcmp(word2, "NIGHTSLINK")) i = 4;
+
+ if (i >= -1 && i <= 4) // -1 for no bonus. Max is 4.
+ mapheaderinfo[num-1]->bonustype = (SINT8)i;
+ else
+ deh_warning("Level header %d: invalid bonus type number %d", num, i);
+ }
+
+ // Title card
+ else if (fastcmp(word, "TITLECARDZIGZAG"))
+ {
+ deh_strlcpy(mapheaderinfo[num-1]->ltzzpatch, word2,
+ sizeof(mapheaderinfo[num-1]->ltzzpatch), va("Level header %d: title card zigzag patch name", num));
+ }
+ else if (fastcmp(word, "TITLECARDZIGZAGTEXT"))
+ {
+ deh_strlcpy(mapheaderinfo[num-1]->ltzztext, word2,
+ sizeof(mapheaderinfo[num-1]->ltzztext), va("Level header %d: title card zigzag text patch name", num));
+ }
+ else if (fastcmp(word, "TITLECARDACTDIAMOND"))
+ {
+ deh_strlcpy(mapheaderinfo[num-1]->ltactdiamond, word2,
+ sizeof(mapheaderinfo[num-1]->ltactdiamond), va("Level header %d: title card act diamond patch name", num));
+ }
+
+ else if (fastcmp(word, "MAXBONUSLIVES"))
+ mapheaderinfo[num-1]->maxbonuslives = (SINT8)i;
+ else if (fastcmp(word, "LEVELFLAGS"))
+ mapheaderinfo[num-1]->levelflags = (UINT16)i;
+ else if (fastcmp(word, "MENUFLAGS"))
+ mapheaderinfo[num-1]->menuflags = (UINT8)i;
+
+ // Individual triggers for level flags, for ease of use (and 2.0 compatibility)
+ else if (fastcmp(word, "SCRIPTISFILE"))
+ {
+ if (i || word2[0] == 'T' || word2[0] == 'Y')
+ mapheaderinfo[num-1]->levelflags |= LF_SCRIPTISFILE;
+ else
+ mapheaderinfo[num-1]->levelflags &= ~LF_SCRIPTISFILE;
+ }
+ else if (fastcmp(word, "SPEEDMUSIC"))
+ {
+ if (i || word2[0] == 'T' || word2[0] == 'Y')
+ mapheaderinfo[num-1]->levelflags |= LF_SPEEDMUSIC;
+ else
+ mapheaderinfo[num-1]->levelflags &= ~LF_SPEEDMUSIC;
+ }
+ else if (fastcmp(word, "NOSSMUSIC"))
+ {
+ if (i || word2[0] == 'T' || word2[0] == 'Y')
+ mapheaderinfo[num-1]->levelflags |= LF_NOSSMUSIC;
+ else
+ mapheaderinfo[num-1]->levelflags &= ~LF_NOSSMUSIC;
+ }
+ else if (fastcmp(word, "NORELOAD"))
+ {
+ if (i || word2[0] == 'T' || word2[0] == 'Y')
+ mapheaderinfo[num-1]->levelflags |= LF_NORELOAD;
+ else
+ mapheaderinfo[num-1]->levelflags &= ~LF_NORELOAD;
+ }
+ else if (fastcmp(word, "NOZONE"))
+ {
+ if (i || word2[0] == 'T' || word2[0] == 'Y')
+ mapheaderinfo[num-1]->levelflags |= LF_NOZONE;
+ else
+ mapheaderinfo[num-1]->levelflags &= ~LF_NOZONE;
+ }
+ else if (fastcmp(word, "SAVEGAME"))
+ {
+ if (i || word2[0] == 'T' || word2[0] == 'Y')
+ mapheaderinfo[num-1]->levelflags |= LF_SAVEGAME;
+ else
+ mapheaderinfo[num-1]->levelflags &= ~LF_SAVEGAME;
+ }
+ else if (fastcmp(word, "MIXNIGHTSCOUNTDOWN"))
+ {
+ if (i || word2[0] == 'T' || word2[0] == 'Y')
+ mapheaderinfo[num-1]->levelflags |= LF_MIXNIGHTSCOUNTDOWN;
+ else
+ mapheaderinfo[num-1]->levelflags &= ~LF_MIXNIGHTSCOUNTDOWN;
+ }
+ else if (fastcmp(word, "WARNINGTITLE"))
+ {
+ if (i || word2[0] == 'T' || word2[0] == 'Y')
+ mapheaderinfo[num-1]->levelflags |= LF_WARNINGTITLE;
+ else
+ mapheaderinfo[num-1]->levelflags &= ~LF_WARNINGTITLE;
+ }
+ else if (fastcmp(word, "NOTITLECARD"))
+ {
+ if (i || word2[0] == 'T' || word2[0] == 'Y')
+ mapheaderinfo[num-1]->levelflags |= LF_NOTITLECARD;
+ else
+ mapheaderinfo[num-1]->levelflags &= ~LF_NOTITLECARD;
+ }
+ else if (fastcmp(word, "SHOWTITLECARDFOR"))
+ {
+ mapheaderinfo[num-1]->levelflags |= LF_NOTITLECARD;
+ tmp = strtok(word2,",");
+ do {
+ if (fastcmp(tmp, "FIRST"))
+ mapheaderinfo[num-1]->levelflags &= ~LF_NOTITLECARDFIRST;
+ else if (fastcmp(tmp, "RESPAWN"))
+ mapheaderinfo[num-1]->levelflags &= ~LF_NOTITLECARDRESPAWN;
+ else if (fastcmp(tmp, "RECORDATTACK"))
+ mapheaderinfo[num-1]->levelflags &= ~LF_NOTITLECARDRECORDATTACK;
+ else if (fastcmp(tmp, "ALL"))
+ mapheaderinfo[num-1]->levelflags &= ~LF_NOTITLECARD;
+ else if (!fastcmp(tmp, "NONE"))
+ deh_warning("Level header %d: unknown titlecard show option %s\n", num, tmp);
+
+ } while((tmp = strtok(NULL,",")) != NULL);
+ }
+
+ // Individual triggers for menu flags
+ else if (fastcmp(word, "HIDDEN"))
+ {
+ if (i || word2[0] == 'T' || word2[0] == 'Y')
+ mapheaderinfo[num-1]->menuflags |= LF2_HIDEINMENU;
+ else
+ mapheaderinfo[num-1]->menuflags &= ~LF2_HIDEINMENU;
+ }
+ else if (fastcmp(word, "HIDEINSTATS"))
+ {
+ if (i || word2[0] == 'T' || word2[0] == 'Y')
+ mapheaderinfo[num-1]->menuflags |= LF2_HIDEINSTATS;
+ else
+ mapheaderinfo[num-1]->menuflags &= ~LF2_HIDEINSTATS;
+ }
+ else if (fastcmp(word, "RECORDATTACK") || fastcmp(word, "TIMEATTACK"))
+ { // TIMEATTACK is an accepted alias
+ if (i || word2[0] == 'T' || word2[0] == 'Y')
+ mapheaderinfo[num-1]->menuflags |= LF2_RECORDATTACK;
+ else
+ mapheaderinfo[num-1]->menuflags &= ~LF2_RECORDATTACK;
+ }
+ else if (fastcmp(word, "NIGHTSATTACK"))
+ {
+ if (i || word2[0] == 'T' || word2[0] == 'Y')
+ mapheaderinfo[num-1]->menuflags |= LF2_NIGHTSATTACK;
+ else
+ mapheaderinfo[num-1]->menuflags &= LF2_NIGHTSATTACK;
+ }
+ else if (fastcmp(word, "NOVISITNEEDED"))
+ {
+ if (i || word2[0] == 'T' || word2[0] == 'Y')
+ mapheaderinfo[num-1]->menuflags |= LF2_NOVISITNEEDED;
+ else
+ mapheaderinfo[num-1]->menuflags &= ~LF2_NOVISITNEEDED;
+ }
+ else if (fastcmp(word, "WIDEICON"))
+ {
+ if (i || word2[0] == 'T' || word2[0] == 'Y')
+ mapheaderinfo[num-1]->menuflags |= LF2_WIDEICON;
+ else
+ mapheaderinfo[num-1]->menuflags &= ~LF2_WIDEICON;
+ }
+ else if (fastcmp(word, "STARTRINGS"))
+ mapheaderinfo[num-1]->startrings = (UINT16)i;
+ else if (fastcmp(word, "SPECIALSTAGETIME"))
+ mapheaderinfo[num-1]->sstimer = i;
+ else if (fastcmp(word, "SPECIALSTAGESPHERES"))
+ mapheaderinfo[num-1]->ssspheres = i;
+ else if (fastcmp(word, "GRAVITY"))
+ mapheaderinfo[num-1]->gravity = FLOAT_TO_FIXED(atof(word2));
+ else
+ deh_warning("Level header %d: unknown word '%s'", num, word);
+ }
+ } while (!myfeof(f)); // finish when the line is empty
+
+ Z_Free(s);
+}
+
+static void readcutscenescene(MYFILE *f, INT32 num, INT32 scenenum)
+{
+ char *s = Z_Calloc(MAXLINELEN, PU_STATIC, NULL);
+ char *word;
+ char *word2;
+ INT32 i;
+ UINT16 usi;
+ UINT8 picid;
+
+ do
+ {
+ if (myfgets(s, MAXLINELEN, f))
+ {
+ if (s[0] == '\n')
+ break;
+
+ word = strtok(s, " ");
+ if (word)
+ strupr(word);
+ else
+ break;
+
+ if (fastcmp(word, "SCENETEXT"))
+ {
+ char *scenetext = NULL;
+ char *buffer;
+ const int bufferlen = 4096;
+
+ for (i = 0; i < MAXLINELEN; i++)
+ {
+ if (s[i] == '=')
+ {
+ scenetext = &s[i+2];
+ break;
+ }
+ }
+
+ if (!scenetext)
+ {
+ Z_Free(cutscenes[num]->scene[scenenum].text);
+ cutscenes[num]->scene[scenenum].text = NULL;
+ continue;
+ }
+
+ for (i = 0; i < MAXLINELEN; i++)
+ {
+ if (s[i] == '\0')
+ {
+ s[i] = '\n';
+ s[i+1] = '\0';
+ break;
+ }
+ }
+
+ buffer = Z_Malloc(4096, PU_STATIC, NULL);
+ strcpy(buffer, scenetext);
+
+ strcat(buffer,
+ myhashfgets(scenetext, bufferlen
+ - strlen(buffer) - 1, f));
+
+ // A cutscene overwriting another one...
+ Z_Free(cutscenes[num]->scene[scenenum].text);
+
+ cutscenes[num]->scene[scenenum].text = Z_StrDup(buffer);
+
+ Z_Free(buffer);
+
+ continue;
+ }
+
+ word2 = strtok(NULL, " = ");
+ if (word2)
+ strupr(word2);
+ else
+ break;
+
+ if (word2[strlen(word2)-1] == '\n')
+ word2[strlen(word2)-1] = '\0';
+ i = atoi(word2);
+ usi = (UINT16)i;
+
+
+ if (fastcmp(word, "NUMBEROFPICS"))
+ {
+ cutscenes[num]->scene[scenenum].numpics = (UINT8)i;
+ }
+ else if (fastncmp(word, "PIC", 3))
+ {
+ picid = (UINT8)atoi(word + 3);
+ if (picid > 8 || picid == 0)
+ {
+ deh_warning("CutSceneScene %d: unknown word '%s'", num, word);
+ continue;
+ }
+ --picid;
+
+ if (fastcmp(word+4, "NAME"))
+ {
+ strncpy(cutscenes[num]->scene[scenenum].picname[picid], word2, 8);
+ }
+ else if (fastcmp(word+4, "HIRES"))
+ {
+ cutscenes[num]->scene[scenenum].pichires[picid] = (UINT8)(i || word2[0] == 'T' || word2[0] == 'Y');
+ }
+ else if (fastcmp(word+4, "DURATION"))
+ {
+ cutscenes[num]->scene[scenenum].picduration[picid] = usi;
+ }
+ else if (fastcmp(word+4, "XCOORD"))
+ {
+ cutscenes[num]->scene[scenenum].xcoord[picid] = usi;
+ }
+ else if (fastcmp(word+4, "YCOORD"))
+ {
+ cutscenes[num]->scene[scenenum].ycoord[picid] = usi;
+ }
+ else
+ deh_warning("CutSceneScene %d: unknown word '%s'", num, word);
+ }
+ else if (fastcmp(word, "MUSIC"))
+ {
+ strncpy(cutscenes[num]->scene[scenenum].musswitch, word2, 7);
+ cutscenes[num]->scene[scenenum].musswitch[6] = 0;
+ }
+#ifdef MUSICSLOT_COMPATIBILITY
+ else if (fastcmp(word, "MUSICSLOT"))
+ {
+ i = get_mus(word2, true);
+ if (i && i <= 1035)
+ snprintf(cutscenes[num]->scene[scenenum].musswitch, 7, "%sM", G_BuildMapName(i));
+ else if (i && i <= 1050)
+ strncpy(cutscenes[num]->scene[scenenum].musswitch, compat_special_music_slots[i - 1036], 7);
+ else
+ cutscenes[num]->scene[scenenum].musswitch[0] = 0; // becomes empty string
+ cutscenes[num]->scene[scenenum].musswitch[6] = 0;
+ }
+#endif
+ else if (fastcmp(word, "MUSICTRACK"))
+ {
+ cutscenes[num]->scene[scenenum].musswitchflags = ((UINT16)i) & MUSIC_TRACKMASK;
+ }
+ else if (fastcmp(word, "MUSICPOS"))
+ {
+ cutscenes[num]->scene[scenenum].musswitchposition = (UINT32)get_number(word2);
+ }
+ else if (fastcmp(word, "MUSICLOOP"))
+ {
+ cutscenes[num]->scene[scenenum].musicloop = (UINT8)(i || word2[0] == 'T' || word2[0] == 'Y');
+ }
+ else if (fastcmp(word, "TEXTXPOS"))
+ {
+ cutscenes[num]->scene[scenenum].textxpos = usi;
+ }
+ else if (fastcmp(word, "TEXTYPOS"))
+ {
+ cutscenes[num]->scene[scenenum].textypos = usi;
+ }
+ else if (fastcmp(word, "FADEINID"))
+ {
+ cutscenes[num]->scene[scenenum].fadeinid = (UINT8)i;
+ }
+ else if (fastcmp(word, "FADEOUTID"))
+ {
+ cutscenes[num]->scene[scenenum].fadeoutid = (UINT8)i;
+ }
+ else if (fastcmp(word, "FADECOLOR"))
+ {
+ cutscenes[num]->scene[scenenum].fadecolor = (UINT8)i;
+ }
+ else
+ deh_warning("CutSceneScene %d: unknown word '%s'", num, word);
+ }
+ } while (!myfeof(f)); // finish when the line is empty
+
+ Z_Free(s);
+}
+
+void readcutscene(MYFILE *f, INT32 num)
+{
+ char *s = Z_Malloc(MAXLINELEN, PU_STATIC, NULL);
+ char *word;
+ char *word2;
+ char *tmp;
+ INT32 value;
+
+ // Allocate memory for this cutscene if we don't yet have any
+ if (!cutscenes[num])
+ cutscenes[num] = Z_Calloc(sizeof (cutscene_t), PU_STATIC, NULL);
+
+ do
+ {
+ if (myfgets(s, MAXLINELEN, f))
+ {
+ if (s[0] == '\n')
+ break;
+
+ tmp = strchr(s, '#');
+ if (tmp)
+ *tmp = '\0';
+ if (s == tmp)
+ continue; // Skip comment lines, but don't break.
+
+ word = strtok(s, " ");
+ if (word)
+ strupr(word);
+ else
+ break;
+
+ word2 = strtok(NULL, " ");
+ if (word2)
+ value = atoi(word2);
+ else
+ {
+ deh_warning("No value for token %s", word);
+ continue;
+ }
+
+ if (fastcmp(word, "NUMSCENES"))
+ {
+ cutscenes[num]->numscenes = value;
+ }
+ else if (fastcmp(word, "SCENE"))
+ {
+ if (1 <= value && value <= 128)
+ {
+ readcutscenescene(f, num, value - 1);
+ }
+ else
+ deh_warning("Scene number %d out of range (1 - 128)", value);
+
+ }
+ else
+ deh_warning("Cutscene %d: unknown word '%s', Scene <num> expected.", num, word);
+ }
+ } while (!myfeof(f)); // finish when the line is empty
+
+ Z_Free(s);
+}
+
+static void readtextpromptpage(MYFILE *f, INT32 num, INT32 pagenum)
+{
+ char *s = Z_Calloc(MAXLINELEN, PU_STATIC, NULL);
+ char *word;
+ char *word2;
+ INT32 i;
+ UINT16 usi;
+ UINT8 picid;
+
+ do
+ {
+ if (myfgets(s, MAXLINELEN, f))
+ {
+ if (s[0] == '\n')
+ break;
+
+ word = strtok(s, " ");
+ if (word)
+ strupr(word);
+ else
+ break;
+
+ if (fastcmp(word, "PAGETEXT"))
+ {
+ char *pagetext = NULL;
+ char *buffer;
+ const int bufferlen = 4096;
+
+ for (i = 0; i < MAXLINELEN; i++)
+ {
+ if (s[i] == '=')
+ {
+ pagetext = &s[i+2];
+ break;
+ }
+ }
+
+ if (!pagetext)
+ {
+ Z_Free(textprompts[num]->page[pagenum].text);
+ textprompts[num]->page[pagenum].text = NULL;
+ continue;
+ }
+
+ for (i = 0; i < MAXLINELEN; i++)
+ {
+ if (s[i] == '\0')
+ {
+ s[i] = '\n';
+ s[i+1] = '\0';
+ break;
+ }
+ }
+
+ buffer = Z_Malloc(4096, PU_STATIC, NULL);
+ strcpy(buffer, pagetext);
+
+ // \todo trim trailing whitespace before the #
+ // and also support # at the end of a PAGETEXT with no line break
+
+ strcat(buffer,
+ myhashfgets(pagetext, bufferlen
+ - strlen(buffer) - 1, f));
+
+ // A text prompt overwriting another one...
+ Z_Free(textprompts[num]->page[pagenum].text);
+
+ textprompts[num]->page[pagenum].text = Z_StrDup(buffer);
+
+ Z_Free(buffer);
+
+ continue;
+ }
+
+ word2 = strtok(NULL, " = ");
+ if (word2)
+ strupr(word2);
+ else
+ break;
+
+ if (word2[strlen(word2)-1] == '\n')
+ word2[strlen(word2)-1] = '\0';
+ i = atoi(word2);
+ usi = (UINT16)i;
+
+ // copypasta from readcutscenescene
+ if (fastcmp(word, "NUMBEROFPICS"))
+ {
+ textprompts[num]->page[pagenum].numpics = (UINT8)i;
+ }
+ else if (fastcmp(word, "PICMODE"))
+ {
+ UINT8 picmode = 0; // PROMPT_PIC_PERSIST
+ if (usi == 1 || word2[0] == 'L') picmode = PROMPT_PIC_LOOP;
+ else if (usi == 2 || word2[0] == 'D' || word2[0] == 'H') picmode = PROMPT_PIC_DESTROY;
+ textprompts[num]->page[pagenum].picmode = picmode;
+ }
+ else if (fastcmp(word, "PICTOLOOP"))
+ textprompts[num]->page[pagenum].pictoloop = (UINT8)i;
+ else if (fastcmp(word, "PICTOSTART"))
+ textprompts[num]->page[pagenum].pictostart = (UINT8)i;
+ else if (fastcmp(word, "PICSMETAPAGE"))
+ {
+ if (usi && usi <= textprompts[num]->numpages)
+ {
+ UINT8 metapagenum = usi - 1;
+
+ textprompts[num]->page[pagenum].numpics = textprompts[num]->page[metapagenum].numpics;
+ textprompts[num]->page[pagenum].picmode = textprompts[num]->page[metapagenum].picmode;
+ textprompts[num]->page[pagenum].pictoloop = textprompts[num]->page[metapagenum].pictoloop;
+ textprompts[num]->page[pagenum].pictostart = textprompts[num]->page[metapagenum].pictostart;
+
+ for (picid = 0; picid < MAX_PROMPT_PICS; picid++)
+ {
+ strncpy(textprompts[num]->page[pagenum].picname[picid], textprompts[num]->page[metapagenum].picname[picid], 8);
+ textprompts[num]->page[pagenum].pichires[picid] = textprompts[num]->page[metapagenum].pichires[picid];
+ textprompts[num]->page[pagenum].picduration[picid] = textprompts[num]->page[metapagenum].picduration[picid];
+ textprompts[num]->page[pagenum].xcoord[picid] = textprompts[num]->page[metapagenum].xcoord[picid];
+ textprompts[num]->page[pagenum].ycoord[picid] = textprompts[num]->page[metapagenum].ycoord[picid];
+ }
+ }
+ }
+ else if (fastncmp(word, "PIC", 3))
+ {
+ picid = (UINT8)atoi(word + 3);
+ if (picid > MAX_PROMPT_PICS || picid == 0)
+ {
+ deh_warning("textpromptscene %d: unknown word '%s'", num, word);
+ continue;
+ }
+ --picid;
+
+ if (fastcmp(word+4, "NAME"))
+ {
+ strncpy(textprompts[num]->page[pagenum].picname[picid], word2, 8);
+ }
+ else if (fastcmp(word+4, "HIRES"))
+ {
+ textprompts[num]->page[pagenum].pichires[picid] = (UINT8)(i || word2[0] == 'T' || word2[0] == 'Y');
+ }
+ else if (fastcmp(word+4, "DURATION"))
+ {
+ textprompts[num]->page[pagenum].picduration[picid] = usi;
+ }
+ else if (fastcmp(word+4, "XCOORD"))
+ {
+ textprompts[num]->page[pagenum].xcoord[picid] = usi;
+ }
+ else if (fastcmp(word+4, "YCOORD"))
+ {
+ textprompts[num]->page[pagenum].ycoord[picid] = usi;
+ }
+ else
+ deh_warning("textpromptscene %d: unknown word '%s'", num, word);
+ }
+ else if (fastcmp(word, "MUSIC"))
+ {
+ strncpy(textprompts[num]->page[pagenum].musswitch, word2, 7);
+ textprompts[num]->page[pagenum].musswitch[6] = 0;
+ }
+#ifdef MUSICSLOT_COMPATIBILITY
+ else if (fastcmp(word, "MUSICSLOT"))
+ {
+ i = get_mus(word2, true);
+ if (i && i <= 1035)
+ snprintf(textprompts[num]->page[pagenum].musswitch, 7, "%sM", G_BuildMapName(i));
+ else if (i && i <= 1050)
+ strncpy(textprompts[num]->page[pagenum].musswitch, compat_special_music_slots[i - 1036], 7);
+ else
+ textprompts[num]->page[pagenum].musswitch[0] = 0; // becomes empty string
+ textprompts[num]->page[pagenum].musswitch[6] = 0;
+ }
+#endif
+ else if (fastcmp(word, "MUSICTRACK"))
+ {
+ textprompts[num]->page[pagenum].musswitchflags = ((UINT16)i) & MUSIC_TRACKMASK;
+ }
+ else if (fastcmp(word, "MUSICLOOP"))
+ {
+ textprompts[num]->page[pagenum].musicloop = (UINT8)(i || word2[0] == 'T' || word2[0] == 'Y');
+ }
+ // end copypasta from readcutscenescene
+ else if (fastcmp(word, "NAME"))
+ {
+ if (*word2 != '\0')
+ {
+ INT32 j;
+
+ // HACK: Add yellow control char now
+ // so the drawing function doesn't call it repeatedly
+ char name[34];
+ name[0] = '\x82'; // color yellow
+ name[1] = 0;
+ strncat(name, word2, 33);
+ name[33] = 0;
+
+ // Replace _ with ' '
+ for (j = 0; j < 32 && name[j]; j++)
+ {
+ if (name[j] == '_')
+ name[j] = ' ';
+ }
+
+ strncpy(textprompts[num]->page[pagenum].name, name, 32);
+ }
+ else
+ *textprompts[num]->page[pagenum].name = '\0';
+ }
+ else if (fastcmp(word, "ICON"))
+ strncpy(textprompts[num]->page[pagenum].iconname, word2, 8);
+ else if (fastcmp(word, "ICONALIGN"))
+ textprompts[num]->page[pagenum].rightside = (i || word2[0] == 'R');
+ else if (fastcmp(word, "ICONFLIP"))
+ textprompts[num]->page[pagenum].iconflip = (i || word2[0] == 'T' || word2[0] == 'Y');
+ else if (fastcmp(word, "LINES"))
+ textprompts[num]->page[pagenum].lines = usi;
+ else if (fastcmp(word, "BACKCOLOR"))
+ {
+ INT32 backcolor;
+ if (i == 0 || fastcmp(word2, "WHITE")) backcolor = 0;
+ else if (i == 1 || fastcmp(word2, "GRAY") || fastcmp(word2, "GREY") ||
+ fastcmp(word2, "BLACK")) backcolor = 1;
+ else if (i == 2 || fastcmp(word2, "SEPIA")) backcolor = 2;
+ else if (i == 3 || fastcmp(word2, "BROWN")) backcolor = 3;
+ else if (i == 4 || fastcmp(word2, "PINK")) backcolor = 4;
+ else if (i == 5 || fastcmp(word2, "RASPBERRY")) backcolor = 5;
+ else if (i == 6 || fastcmp(word2, "RED")) backcolor = 6;
+ else if (i == 7 || fastcmp(word2, "CREAMSICLE")) backcolor = 7;
+ else if (i == 8 || fastcmp(word2, "ORANGE")) backcolor = 8;
+ else if (i == 9 || fastcmp(word2, "GOLD")) backcolor = 9;
+ else if (i == 10 || fastcmp(word2, "YELLOW")) backcolor = 10;
+ else if (i == 11 || fastcmp(word2, "EMERALD")) backcolor = 11;
+ else if (i == 12 || fastcmp(word2, "GREEN")) backcolor = 12;
+ else if (i == 13 || fastcmp(word2, "CYAN") || fastcmp(word2, "AQUA")) backcolor = 13;
+ else if (i == 14 || fastcmp(word2, "STEEL")) backcolor = 14;
+ else if (i == 15 || fastcmp(word2, "PERIWINKLE")) backcolor = 15;
+ else if (i == 16 || fastcmp(word2, "BLUE")) backcolor = 16;
+ else if (i == 17 || fastcmp(word2, "PURPLE")) backcolor = 17;
+ else if (i == 18 || fastcmp(word2, "LAVENDER")) backcolor = 18;
+ else if (i >= 256 && i < 512) backcolor = i; // non-transparent palette index
+ else if (i < 0) backcolor = INT32_MAX; // CONS_BACKCOLOR user-configured
+ else backcolor = 1; // default gray
+ textprompts[num]->page[pagenum].backcolor = backcolor;
+ }
+ else if (fastcmp(word, "ALIGN"))
+ {
+ UINT8 align = 0; // left
+ if (usi == 1 || word2[0] == 'R') align = 1;
+ else if (usi == 2 || word2[0] == 'C' || word2[0] == 'M') align = 2;
+ textprompts[num]->page[pagenum].align = align;
+ }
+ else if (fastcmp(word, "VERTICALALIGN"))
+ {
+ UINT8 align = 0; // top
+ if (usi == 1 || word2[0] == 'B') align = 1;
+ else if (usi == 2 || word2[0] == 'C' || word2[0] == 'M') align = 2;
+ textprompts[num]->page[pagenum].verticalalign = align;
+ }
+ else if (fastcmp(word, "TEXTSPEED"))
+ textprompts[num]->page[pagenum].textspeed = get_number(word2);
+ else if (fastcmp(word, "TEXTSFX"))
+ textprompts[num]->page[pagenum].textsfx = get_number(word2);
+ else if (fastcmp(word, "HIDEHUD"))
+ {
+ UINT8 hidehud = 0;
+ if ((word2[0] == 'F' && (word2[1] == 'A' || !word2[1])) || word2[0] == 'N') hidehud = 0; // false
+ else if (usi == 1 || word2[0] == 'T' || word2[0] == 'Y') hidehud = 1; // true (hide appropriate HUD elements)
+ else if (usi == 2 || word2[0] == 'A' || (word2[0] == 'F' && word2[1] == 'O')) hidehud = 2; // force (hide all HUD elements)
+ textprompts[num]->page[pagenum].hidehud = hidehud;
+ }
+ else if (fastcmp(word, "METAPAGE"))
+ {
+ if (usi && usi <= textprompts[num]->numpages)
+ {
+ UINT8 metapagenum = usi - 1;
+
+ strncpy(textprompts[num]->page[pagenum].name, textprompts[num]->page[metapagenum].name, 32);
+ strncpy(textprompts[num]->page[pagenum].iconname, textprompts[num]->page[metapagenum].iconname, 8);
+ textprompts[num]->page[pagenum].rightside = textprompts[num]->page[metapagenum].rightside;
+ textprompts[num]->page[pagenum].iconflip = textprompts[num]->page[metapagenum].iconflip;
+ textprompts[num]->page[pagenum].lines = textprompts[num]->page[metapagenum].lines;
+ textprompts[num]->page[pagenum].backcolor = textprompts[num]->page[metapagenum].backcolor;
+ textprompts[num]->page[pagenum].align = textprompts[num]->page[metapagenum].align;
+ textprompts[num]->page[pagenum].verticalalign = textprompts[num]->page[metapagenum].verticalalign;
+ textprompts[num]->page[pagenum].textspeed = textprompts[num]->page[metapagenum].textspeed;
+ textprompts[num]->page[pagenum].textsfx = textprompts[num]->page[metapagenum].textsfx;
+ textprompts[num]->page[pagenum].hidehud = textprompts[num]->page[metapagenum].hidehud;
+
+ // music: don't copy, else each page change may reset the music
+ }
+ }
+ else if (fastcmp(word, "TAG"))
+ strncpy(textprompts[num]->page[pagenum].tag, word2, 33);
+ else if (fastcmp(word, "NEXTPROMPT"))
+ textprompts[num]->page[pagenum].nextprompt = usi;
+ else if (fastcmp(word, "NEXTPAGE"))
+ textprompts[num]->page[pagenum].nextpage = usi;
+ else if (fastcmp(word, "NEXTTAG"))
+ strncpy(textprompts[num]->page[pagenum].nexttag, word2, 33);
+ else if (fastcmp(word, "TIMETONEXT"))
+ textprompts[num]->page[pagenum].timetonext = get_number(word2);
+ else
+ deh_warning("PromptPage %d: unknown word '%s'", num, word);
+ }
+ } while (!myfeof(f)); // finish when the line is empty
+
+ Z_Free(s);
+}
+
+void readtextprompt(MYFILE *f, INT32 num)
+{
+ char *s = Z_Malloc(MAXLINELEN, PU_STATIC, NULL);
+ char *word;
+ char *word2;
+ char *tmp;
+ INT32 value;
+
+ // Allocate memory for this prompt if we don't yet have any
+ if (!textprompts[num])
+ textprompts[num] = Z_Calloc(sizeof (textprompt_t), PU_STATIC, NULL);
+
+ do
+ {
+ if (myfgets(s, MAXLINELEN, f))
+ {
+ if (s[0] == '\n')
+ break;
+
+ tmp = strchr(s, '#');
+ if (tmp)
+ *tmp = '\0';
+ if (s == tmp)
+ continue; // Skip comment lines, but don't break.
+
+ word = strtok(s, " ");
+ if (word)
+ strupr(word);
+ else
+ break;
+
+ word2 = strtok(NULL, " ");
+ if (word2)
+ value = atoi(word2);
+ else
+ {
+ deh_warning("No value for token %s", word);
+ continue;
+ }
+
+ if (fastcmp(word, "NUMPAGES"))
+ {
+ textprompts[num]->numpages = min(max(value, 0), MAX_PAGES);
+ }
+ else if (fastcmp(word, "PAGE"))
+ {
+ if (1 <= value && value <= MAX_PAGES)
+ {
+ textprompts[num]->page[value - 1].backcolor = 1; // default to gray
+ textprompts[num]->page[value - 1].hidehud = 1; // hide appropriate HUD elements
+ readtextpromptpage(f, num, value - 1);
+ }
+ else
+ deh_warning("Page number %d out of range (1 - %d)", value, MAX_PAGES);
+
+ }
+ else
+ deh_warning("Prompt %d: unknown word '%s', Page <num> expected.", num, word);
+ }
+ } while (!myfeof(f)); // finish when the line is empty
+
+ Z_Free(s);
+}
+
+void readmenu(MYFILE *f, INT32 num)
+{
+ char *s = Z_Malloc(MAXLINELEN, PU_STATIC, NULL);
+ char *word = s;
+ char *word2;
+ char *tmp;
+ INT32 value;
+
+ do
+ {
+ if (myfgets(s, MAXLINELEN, f))
+ {
+ if (s[0] == '\n')
+ break;
+
+ // First remove trailing newline, if there is one
+ tmp = strchr(s, '\n');
+ if (tmp)
+ *tmp = '\0';
+
+ tmp = strchr(s, '#');
+ if (tmp)
+ *tmp = '\0';
+ if (s == tmp)
+ continue; // Skip comment lines, but don't break.
+
+ // Get the part before the " = "
+ tmp = strchr(s, '=');
+ if (tmp)
+ *(tmp-1) = '\0';
+ else
+ break;
+ strupr(word);
+
+ // Now get the part after
+ word2 = (tmp += 2);
+ strupr(word2);
+
+ value = atoi(word2); // used for numerical settings
+
+ if (fastcmp(word, "BACKGROUNDNAME"))
+ {
+ strncpy(menupres[num].bgname, word2, 8);
+ titlechanged = true;
+ }
+ else if (fastcmp(word, "HIDEBACKGROUND"))
+ {
+ menupres[num].bghide = (boolean)(value || word2[0] == 'T' || word2[0] == 'Y');
+ titlechanged = true;
+ }
+ else if (fastcmp(word, "BACKGROUNDCOLOR"))
+ {
+ menupres[num].bgcolor = get_number(word2);
+ titlechanged = true;
+ }
+ else if (fastcmp(word, "HIDETITLEPICS") || fastcmp(word, "HIDEPICS") || fastcmp(word, "TITLEPICSHIDE"))
+ {
+ // true by default, except MM_MAIN
+ menupres[num].hidetitlepics = (boolean)(value || word2[0] == 'T' || word2[0] == 'Y');
+ titlechanged = true;
+ }
+ else if (fastcmp(word, "TITLEPICSMODE"))
+ {
+ if (fastcmp(word2, "USER"))
+ menupres[num].ttmode = TTMODE_USER;
+ else if (fastcmp(word2, "ALACROIX"))
+ menupres[num].ttmode = TTMODE_ALACROIX;
+ else if (fastcmp(word2, "HIDE") || fastcmp(word2, "HIDDEN") || fastcmp(word2, "NONE"))
+ {
+ menupres[num].ttmode = TTMODE_USER;
+ menupres[num].ttname[0] = 0;
+ menupres[num].hidetitlepics = true;
+ }
+ else // if (fastcmp(word2, "OLD") || fastcmp(word2, "SSNTAILS"))
+ menupres[num].ttmode = TTMODE_OLD;
+ titlechanged = true;
+ }
+ else if (fastcmp(word, "TITLEPICSSCALE"))
+ {
+ // Don't handle Alacroix special case here; see Maincfg section.
+ menupres[num].ttscale = max(1, min(8, (UINT8)get_number(word2)));
+ titlechanged = true;
+ }
+ else if (fastcmp(word, "TITLEPICSNAME"))
+ {
+ strncpy(menupres[num].ttname, word2, 9);
+ titlechanged = true;
+ }
+ else if (fastcmp(word, "TITLEPICSX"))
+ {
+ menupres[num].ttx = (INT16)get_number(word2);
+ titlechanged = true;
+ }
+ else if (fastcmp(word, "TITLEPICSY"))
+ {
+ menupres[num].tty = (INT16)get_number(word2);
+ titlechanged = true;
+ }
+ else if (fastcmp(word, "TITLEPICSLOOP"))
+ {
+ menupres[num].ttloop = (INT16)get_number(word2);
+ titlechanged = true;
+ }
+ else if (fastcmp(word, "TITLEPICSTICS"))
+ {
+ menupres[num].tttics = (UINT16)get_number(word2);
+ titlechanged = true;
+ }
+ else if (fastcmp(word, "TITLESCROLLSPEED") || fastcmp(word, "TITLESCROLLXSPEED")
+ || fastcmp(word, "SCROLLSPEED") || fastcmp(word, "SCROLLXSPEED"))
+ {
+ menupres[num].titlescrollxspeed = get_number(word2);
+ titlechanged = true;
+ }
+ else if (fastcmp(word, "TITLESCROLLYSPEED") || fastcmp(word, "SCROLLYSPEED"))
+ {
+ menupres[num].titlescrollyspeed = get_number(word2);
+ titlechanged = true;
+ }
+ else if (fastcmp(word, "MUSIC"))
+ {
+ strncpy(menupres[num].musname, word2, 7);
+ menupres[num].musname[6] = 0;
+ titlechanged = true;
+ }
+#ifdef MUSICSLOT_COMPATIBILITY
+ else if (fastcmp(word, "MUSICSLOT"))
+ {
+ value = get_mus(word2, true);
+ if (value && value <= 1035)
+ snprintf(menupres[num].musname, 7, "%sM", G_BuildMapName(value));
+ else if (value && value <= 1050)
+ strncpy(menupres[num].musname, compat_special_music_slots[value - 1036], 7);
+ else
+ menupres[num].musname[0] = 0; // becomes empty string
+ menupres[num].musname[6] = 0;
+ titlechanged = true;
+ }
+#endif
+ else if (fastcmp(word, "MUSICTRACK"))
+ {
+ menupres[num].mustrack = ((UINT16)value - 1);
+ titlechanged = true;
+ }
+ else if (fastcmp(word, "MUSICLOOP"))
+ {
+ // true by default except MM_MAIN
+ menupres[num].muslooping = (value || word2[0] == 'T' || word2[0] == 'Y');
+ titlechanged = true;
+ }
+ else if (fastcmp(word, "NOMUSIC"))
+ {
+ menupres[num].musstop = (value || word2[0] == 'T' || word2[0] == 'Y');
+ titlechanged = true;
+ }
+ else if (fastcmp(word, "IGNOREMUSIC"))
+ {
+ menupres[num].musignore = (value || word2[0] == 'T' || word2[0] == 'Y');
+ titlechanged = true;
+ }
+ else if (fastcmp(word, "FADESTRENGTH"))
+ {
+ // one-based, <= 0 means use default value. 1-32
+ menupres[num].fadestrength = get_number(word2)-1;
+ titlechanged = true;
+ }
+ else if (fastcmp(word, "NOENTERBUBBLE"))
+ {
+ menupres[num].enterbubble = !(value || word2[0] == 'T' || word2[0] == 'Y');
+ titlechanged = true;
+ }
+ else if (fastcmp(word, "NOEXITBUBBLE"))
+ {
+ menupres[num].exitbubble = !(value || word2[0] == 'T' || word2[0] == 'Y');
+ titlechanged = true;
+ }
+ else if (fastcmp(word, "ENTERTAG"))
+ {
+ menupres[num].entertag = get_number(word2);
+ titlechanged = true;
+ }
+ else if (fastcmp(word, "EXITTAG"))
+ {
+ menupres[num].exittag = get_number(word2);
+ titlechanged = true;
+ }
+ else if (fastcmp(word, "ENTERWIPE"))
+ {
+ menupres[num].enterwipe = get_number(word2);
+ titlechanged = true;
+ }
+ else if (fastcmp(word, "EXITWIPE"))
+ {
+ menupres[num].exitwipe = get_number(word2);
+ titlechanged = true;
+ }
+ }
+ } while (!myfeof(f)); // finish when the line is empty
+
+ Z_Free(s);
+}
+
+void readhuditem(MYFILE *f, INT32 num)
+{
+ char *s = Z_Malloc(MAXLINELEN, PU_STATIC, NULL);
+ char *word = s;
+ char *word2;
+ char *tmp;
+ INT32 i;
+
+ do
+ {
+ if (myfgets(s, MAXLINELEN, f))
+ {
+ if (s[0] == '\n')
+ break;
+
+ // First remove trailing newline, if there is one
+ tmp = strchr(s, '\n');
+ if (tmp)
+ *tmp = '\0';
+
+ tmp = strchr(s, '#');
+ if (tmp)
+ *tmp = '\0';
+ if (s == tmp)
+ continue; // Skip comment lines, but don't break.
+
+ // Get the part before the " = "
+ tmp = strchr(s, '=');
+ if (tmp)
+ *(tmp-1) = '\0';
+ else
+ break;
+ strupr(word);
+
+ // Now get the part after
+ word2 = tmp += 2;
+ strupr(word2);
+
+ i = atoi(word2); // used for numerical settings
+
+ if (fastcmp(word, "X"))
+ {
+ hudinfo[num].x = i;
+ }
+ else if (fastcmp(word, "Y"))
+ {
+ hudinfo[num].y = i;
+ }
+ else if (fastcmp(word, "F"))
+ {
+ hudinfo[num].f = i;
+ }
+ else
+ deh_warning("Level header %d: unknown word '%s'", num, word);
+ }
+ } while (!myfeof(f)); // finish when the line is empty
+
+ Z_Free(s);
+}
+
+void readframe(MYFILE *f, INT32 num)
+{
+ char *s = Z_Malloc(MAXLINELEN, PU_STATIC, NULL);
+ char *word1;
+ char *word2 = NULL;
+ char *tmp;
+
+ do
+ {
+ if (myfgets(s, MAXLINELEN, f))
+ {
+ if (s[0] == '\n')
+ break;
+
+ tmp = strchr(s, '#');
+ if (tmp)
+ *tmp = '\0';
+ if (s == tmp)
+ continue; // Skip comment lines, but don't break.
+
+ word1 = strtok(s, " ");
+ if (word1)
+ strupr(word1);
+ else
+ break;
+
+ word2 = strtok(NULL, " = ");
+ if (word2)
+ strupr(word2);
+ else
+ break;
+ if (word2[strlen(word2)-1] == '\n')
+ word2[strlen(word2)-1] = '\0';
+
+ if (fastcmp(word1, "SPRITENUMBER") || fastcmp(word1, "SPRITENAME"))
+ {
+ states[num].sprite = get_sprite(word2);
+ }
+ else if (fastcmp(word1, "SPRITESUBNUMBER") || fastcmp(word1, "SPRITEFRAME"))
+ {
+ states[num].frame = (INT32)get_number(word2); // So the FF_ flags get calculated
+ }
+ else if (fastcmp(word1, "DURATION"))
+ {
+ states[num].tics = (INT32)get_number(word2); // So TICRATE can be used
+ }
+ else if (fastcmp(word1, "NEXT"))
+ {
+ states[num].nextstate = get_state(word2);
+ }
+ else if (fastcmp(word1, "VAR1"))
+ {
+ states[num].var1 = (INT32)get_number(word2);
+ }
+ else if (fastcmp(word1, "VAR2"))
+ {
+ states[num].var2 = (INT32)get_number(word2);
+ }
+ else if (fastcmp(word1, "ACTION"))
+ {
+ size_t z;
+ boolean found = false;
+ char actiontocompare[32];
+
+ memset(actiontocompare, 0x00, sizeof(actiontocompare));
+ strlcpy(actiontocompare, word2, sizeof (actiontocompare));
+ strupr(actiontocompare);
+
+ for (z = 0; z < 32; z++)
+ {
+ if (actiontocompare[z] == '\n' || actiontocompare[z] == '\r')
+ {
+ actiontocompare[z] = '\0';
+ break;
+ }
+ }
+
+ for (z = 0; actionpointers[z].name; z++)
+ {
+ if (actionpointers[z].action.acv == states[num].action.acv)
+ break;
+ }
+
+ z = 0;
+ found = LUA_SetLuaAction(&states[num], actiontocompare);
+ if (!found)
+ while (actionpointers[z].name)
+ {
+ if (fastcmp(actiontocompare, actionpointers[z].name))
+ {
+ states[num].action = actionpointers[z].action;
+ states[num].action.acv = actionpointers[z].action.acv; // assign
+ states[num].action.acp1 = actionpointers[z].action.acp1;
+ found = true;
+ break;
+ }
+ z++;
+ }
+
+ if (!found)
+ deh_warning("Unknown action %s", actiontocompare);
+ }
+ else
+ deh_warning("Frame %d: unknown word '%s'", num, word1);
+ }
+ } while (!myfeof(f));
+
+ Z_Free(s);
+}
+
+void readsound(MYFILE *f, INT32 num)
+{
+ char *s = Z_Malloc(MAXLINELEN, PU_STATIC, NULL);
+ char *word;
+ char *word2;
+ char *tmp;
+ INT32 value;
+
+ do
+ {
+ if (myfgets(s, MAXLINELEN, f))
+ {
+ if (s[0] == '\n')
+ break;
+
+ tmp = strchr(s, '#');
+ if (tmp)
+ *tmp = '\0';
+ if (s == tmp)
+ continue; // Skip comment lines, but don't break.
+
+ word = strtok(s, " ");
+ if (word)
+ strupr(word);
+ else
+ break;
+
+ word2 = strtok(NULL, " ");
+ if (word2)
+ value = atoi(word2);
+ else
+ {
+ deh_warning("No value for token %s", word);
+ continue;
+ }
+
+ if (fastcmp(word, "SINGULAR"))
+ {
+ S_sfx[num].singularity = value;
+ }
+ else if (fastcmp(word, "PRIORITY"))
+ {
+ S_sfx[num].priority = value;
+ }
+ else if (fastcmp(word, "FLAGS"))
+ {
+ S_sfx[num].pitch = value;
+ }
+ else if (fastcmp(word, "CAPTION") || fastcmp(word, "DESCRIPTION"))
+ {
+ deh_strlcpy(S_sfx[num].caption, word2,
+ sizeof(S_sfx[num].caption), va("Sound effect %d: caption", num));
+ }
+ else
+ deh_warning("Sound %d : unknown word '%s'",num,word);
+ }
+ } while (!myfeof(f));
+
+ Z_Free(s);
+}
+
+/** Checks if a game data file name for a mod is good.
+ * "Good" means that it contains only alphanumerics, _, and -;
+ * ends in ".dat"; has at least one character before the ".dat";
+ * and is not "gamedata.dat" (tested case-insensitively).
+ *
+ * Assumption: that gamedata.dat is the only .dat file that will
+ * ever be treated specially by the game.
+ *
+ * Note: Check for the tail ".dat" case-insensitively since at
+ * present, we get passed the filename in all uppercase.
+ *
+ * \param s Filename string to check.
+ * \return True if the filename is good.
+ * \sa readmaincfg()
+ * \author Graue <graue@oceanbase.org>
+ */
+static boolean GoodDataFileName(const char *s)
+{
+ const char *p;
+ const char *tail = ".dat";
+
+ for (p = s; *p != '\0'; p++)
+ if (!isalnum(*p) && *p != '_' && *p != '-' && *p != '.')
+ return false;
+
+ p = s + strlen(s) - strlen(tail);
+ if (p <= s) return false; // too short
+ if (!fasticmp(p, tail)) return false; // doesn't end in .dat
+ if (fasticmp(s, "gamedata.dat")) return false;
+
+ return true;
+}
+
+void reademblemdata(MYFILE *f, INT32 num)
+{
+ char *s = Z_Malloc(MAXLINELEN, PU_STATIC, NULL);
+ char *word = s;
+ char *word2;
+ char *tmp;
+ INT32 value;
+
+ memset(&emblemlocations[num-1], 0, sizeof(emblem_t));
+
+ do
+ {
+ if (myfgets(s, MAXLINELEN, f))
+ {
+ if (s[0] == '\n')
+ break;
+
+ // First remove trailing newline, if there is one
+ tmp = strchr(s, '\n');
+ if (tmp)
+ *tmp = '\0';
+
+ tmp = strchr(s, '#');
+ if (tmp)
+ *tmp = '\0';
+ if (s == tmp)
+ continue; // Skip comment lines, but don't break.
+
+ // Get the part before the " = "
+ tmp = strchr(s, '=');
+ if (tmp)
+ *(tmp-1) = '\0';
+ else
+ break;
+ strupr(word);
+
+ // Now get the part after
+ word2 = tmp += 2;
+ value = atoi(word2); // used for numerical settings
+
+ // Up here to allow lowercase in hints
+ if (fastcmp(word, "HINT"))
+ {
+ while ((tmp = strchr(word2, '\\')))
+ *tmp = '\n';
+ deh_strlcpy(emblemlocations[num-1].hint, word2, sizeof (emblemlocations[num-1].hint), va("Emblem %d: hint", num));
+ continue;
+ }
+ strupr(word2);
+
+ if (fastcmp(word, "TYPE"))
+ {
+ if (fastcmp(word2, "GLOBAL"))
+ emblemlocations[num-1].type = ET_GLOBAL;
+ else if (fastcmp(word2, "SKIN"))
+ emblemlocations[num-1].type = ET_SKIN;
+ else if (fastcmp(word2, "SCORE"))
+ emblemlocations[num-1].type = ET_SCORE;
+ else if (fastcmp(word2, "TIME"))
+ emblemlocations[num-1].type = ET_TIME;
+ else if (fastcmp(word2, "RINGS"))
+ emblemlocations[num-1].type = ET_RINGS;
+ else if (fastcmp(word2, "MAP"))
+ emblemlocations[num-1].type = ET_MAP;
+ else if (fastcmp(word2, "NGRADE"))
+ emblemlocations[num-1].type = ET_NGRADE;
+ else if (fastcmp(word2, "NTIME"))
+ emblemlocations[num-1].type = ET_NTIME;
+ else
+ emblemlocations[num-1].type = (UINT8)value;
+ }
+ else if (fastcmp(word, "TAG"))
+ emblemlocations[num-1].tag = (INT16)value;
+ else if (fastcmp(word, "MAPNUM"))
+ {
+ // Support using the actual map name,
+ // i.e., Level AB, Level FZ, etc.
+
+ // Convert to map number
+ if (word2[0] >= 'A' && word2[0] <= 'Z')
+ value = M_MapNumber(word2[0], word2[1]);
+
+ emblemlocations[num-1].level = (INT16)value;
+ }
+ else if (fastcmp(word, "SPRITE"))
+ {
+ if (word2[0] >= 'A' && word2[0] <= 'Z')
+ value = word2[0];
+ else
+ value += 'A'-1;
+
+ if (value < 'A' || value > 'Z')
+ deh_warning("Emblem %d: sprite must be from A - Z (1 - 26)", num);
+ else
+ emblemlocations[num-1].sprite = (UINT8)value;
+ }
+ else if (fastcmp(word, "COLOR"))
+ emblemlocations[num-1].color = get_number(word2);
+ else if (fastcmp(word, "VAR"))
+ emblemlocations[num-1].var = get_number(word2);
+ else
+ deh_warning("Emblem %d: unknown word '%s'", num, word);
+ }
+ } while (!myfeof(f));
+
+ // Default sprite and color definitions for lazy people like me
+ if (!emblemlocations[num-1].sprite) switch (emblemlocations[num-1].type)
+ {
+ case ET_RINGS:
+ emblemlocations[num-1].sprite = 'R'; break;
+ case ET_SCORE: case ET_NGRADE:
+ emblemlocations[num-1].sprite = 'S'; break;
+ case ET_TIME: case ET_NTIME:
+ emblemlocations[num-1].sprite = 'T'; break;
+ default:
+ emblemlocations[num-1].sprite = 'A'; break;
+ }
+ if (!emblemlocations[num-1].color) switch (emblemlocations[num-1].type)
+ {
+ case ET_RINGS:
+ emblemlocations[num-1].color = SKINCOLOR_GOLD; break;
+ case ET_SCORE:
+ emblemlocations[num-1].color = SKINCOLOR_BROWN; break;
+ case ET_NGRADE:
+ emblemlocations[num-1].color = SKINCOLOR_TEAL; break;
+ case ET_TIME: case ET_NTIME:
+ emblemlocations[num-1].color = SKINCOLOR_GREY; break;
+ default:
+ emblemlocations[num-1].color = SKINCOLOR_BLUE; break;
+ }
+
+ Z_Free(s);
+}
+
+void readextraemblemdata(MYFILE *f, INT32 num)
+{
+ char *s = Z_Malloc(MAXLINELEN, PU_STATIC, NULL);
+ char *word = s;
+ char *word2;
+ char *tmp;
+ INT32 value;
+
+ memset(&extraemblems[num-1], 0, sizeof(extraemblem_t));
+
+ do
+ {
+ if (myfgets(s, MAXLINELEN, f))
+ {
+ if (s[0] == '\n')
+ break;
+
+ // First remove trailing newline, if there is one
+ tmp = strchr(s, '\n');
+ if (tmp)
+ *tmp = '\0';
+
+ tmp = strchr(s, '#');
+ if (tmp)
+ *tmp = '\0';
+ if (s == tmp)
+ continue; // Skip comment lines, but don't break.
+
+ // Get the part before the " = "
+ tmp = strchr(s, '=');
+ if (tmp)
+ *(tmp-1) = '\0';
+ else
+ break;
+ strupr(word);
+
+ // Now get the part after
+ word2 = tmp += 2;
+
+ value = atoi(word2); // used for numerical settings
+
+ if (fastcmp(word, "NAME"))
+ deh_strlcpy(extraemblems[num-1].name, word2,
+ sizeof (extraemblems[num-1].name), va("Extra emblem %d: name", num));
+ else if (fastcmp(word, "OBJECTIVE"))
+ deh_strlcpy(extraemblems[num-1].description, word2,
+ sizeof (extraemblems[num-1].description), va("Extra emblem %d: objective", num));
+ else if (fastcmp(word, "CONDITIONSET"))
+ extraemblems[num-1].conditionset = (UINT8)value;
+ else if (fastcmp(word, "SHOWCONDITIONSET"))
+ extraemblems[num-1].showconditionset = (UINT8)value;
+ else
+ {
+ strupr(word2);
+ if (fastcmp(word, "SPRITE"))
+ {
+ if (word2[0] >= 'A' && word2[0] <= 'Z')
+ value = word2[0];
+ else
+ value += 'A'-1;
+
+ if (value < 'A' || value > 'Z')
+ deh_warning("Emblem %d: sprite must be from A - Z (1 - 26)", num);
+ else
+ extraemblems[num-1].sprite = (UINT8)value;
+ }
+ else if (fastcmp(word, "COLOR"))
+ extraemblems[num-1].color = get_number(word2);
+ else
+ deh_warning("Extra emblem %d: unknown word '%s'", num, word);
+ }
+ }
+ } while (!myfeof(f));
+
+ if (!extraemblems[num-1].sprite)
+ extraemblems[num-1].sprite = 'X';
+ if (!extraemblems[num-1].color)
+ extraemblems[num-1].color = SKINCOLOR_BLUE;
+
+ Z_Free(s);
+}
+
+void readunlockable(MYFILE *f, INT32 num)
+{
+ char *s = Z_Malloc(MAXLINELEN, PU_STATIC, NULL);
+ char *word = s;
+ char *word2;
+ char *tmp;
+ INT32 i;
+
+ memset(&unlockables[num], 0, sizeof(unlockable_t));
+ unlockables[num].objective[0] = '/';
+
+ do
+ {
+ if (myfgets(s, MAXLINELEN, f))
+ {
+ if (s[0] == '\n')
+ break;
+
+ // First remove trailing newline, if there is one
+ tmp = strchr(s, '\n');
+ if (tmp)
+ *tmp = '\0';
+
+ tmp = strchr(s, '#');
+ if (tmp)
+ *tmp = '\0';
+ if (s == tmp)
+ continue; // Skip comment lines, but don't break.
+
+ // Get the part before the " = "
+ tmp = strchr(s, '=');
+ if (tmp)
+ *(tmp-1) = '\0';
+ else
+ break;
+ strupr(word);
+
+ // Now get the part after
+ word2 = tmp += 2;
+
+ i = atoi(word2); // used for numerical settings
+
+ if (fastcmp(word, "NAME"))
+ deh_strlcpy(unlockables[num].name, word2,
+ sizeof (unlockables[num].name), va("Unlockable %d: name", num));
+ else if (fastcmp(word, "OBJECTIVE"))
+ deh_strlcpy(unlockables[num].objective, word2,
+ sizeof (unlockables[num].objective), va("Unlockable %d: objective", num));
+ else
+ {
+ strupr(word2);
+ if (fastcmp(word, "HEIGHT"))
+ unlockables[num].height = (UINT16)i;
+ else if (fastcmp(word, "CONDITIONSET"))
+ unlockables[num].conditionset = (UINT8)i;
+ else if (fastcmp(word, "SHOWCONDITIONSET"))
+ unlockables[num].showconditionset = (UINT8)i;
+ else if (fastcmp(word, "NOCECHO"))
+ unlockables[num].nocecho = (UINT8)(i || word2[0] == 'T' || word2[0] == 'Y');
+ else if (fastcmp(word, "NOCHECKLIST"))
+ unlockables[num].nochecklist = (UINT8)(i || word2[0] == 'T' || word2[0] == 'Y');
+ else if (fastcmp(word, "TYPE"))
+ {
+ if (fastcmp(word2, "NONE"))
+ unlockables[num].type = SECRET_NONE;
+ else if (fastcmp(word2, "ITEMFINDER"))
+ unlockables[num].type = SECRET_ITEMFINDER;
+ else if (fastcmp(word2, "EMBLEMHINTS"))
+ unlockables[num].type = SECRET_EMBLEMHINTS;
+ else if (fastcmp(word2, "PANDORA"))
+ unlockables[num].type = SECRET_PANDORA;
+ else if (fastcmp(word2, "CREDITS"))
+ unlockables[num].type = SECRET_CREDITS;
+ else if (fastcmp(word2, "RECORDATTACK"))
+ unlockables[num].type = SECRET_RECORDATTACK;
+ else if (fastcmp(word2, "NIGHTSMODE"))
+ unlockables[num].type = SECRET_NIGHTSMODE;
+ else if (fastcmp(word2, "HEADER"))
+ unlockables[num].type = SECRET_HEADER;
+ else if (fastcmp(word2, "LEVELSELECT"))
+ unlockables[num].type = SECRET_LEVELSELECT;
+ else if (fastcmp(word2, "WARP"))
+ unlockables[num].type = SECRET_WARP;
+ else if (fastcmp(word2, "SOUNDTEST"))
+ unlockables[num].type = SECRET_SOUNDTEST;
+ else
+ unlockables[num].type = (INT16)i;
+ }
+ else if (fastcmp(word, "VAR"))
+ {
+ // Support using the actual map name,
+ // i.e., Level AB, Level FZ, etc.
+
+ // Convert to map number
+ if (word2[0] >= 'A' && word2[0] <= 'Z')
+ i = M_MapNumber(word2[0], word2[1]);
+
+ unlockables[num].variable = (INT16)i;
+ }
+ else
+ deh_warning("Unlockable %d: unknown word '%s'", num+1, word);
+ }
+ }
+ } while (!myfeof(f)); // finish when the line is empty
+
+ Z_Free(s);
+}
+
+static void readcondition(UINT8 set, UINT32 id, char *word2)
+{
+ INT32 i;
+ char *params[4]; // condition, requirement, extra info, extra info
+ char *spos;
+
+ conditiontype_t ty;
+ INT32 re;
+ INT16 x1 = 0, x2 = 0;
+
+ INT32 offset = 0;
+
+ spos = strtok(word2, " ");
+
+ for (i = 0; i < 4; ++i)
+ {
+ if (spos != NULL)
+ {
+ params[i] = spos;
+ spos = strtok(NULL, " ");
+ }
+ else
+ params[i] = NULL;
+ }
+
+ if (!params[0])
+ {
+ deh_warning("condition line is empty");
+ return;
+ }
+
+ if (fastcmp(params[0], "PLAYTIME"))
+ {
+ PARAMCHECK(1);
+ ty = UC_PLAYTIME;
+ re = atoi(params[1]);
+ }
+ else if (fastcmp(params[0], "GAMECLEAR")
+ || (++offset && fastcmp(params[0], "ALLEMERALDS"))
+ || (++offset && fastcmp(params[0], "ULTIMATECLEAR")))
+ {
+ ty = UC_GAMECLEAR + offset;
+ re = (params[1]) ? atoi(params[1]) : 1;
+ }
+ else if ((offset=0) || fastcmp(params[0], "OVERALLSCORE")
+ || (++offset && fastcmp(params[0], "OVERALLTIME"))
+ || (++offset && fastcmp(params[0], "OVERALLRINGS")))
+ {
+ PARAMCHECK(1);
+ ty = UC_OVERALLSCORE + offset;
+ re = atoi(params[1]);
+ }
+ else if ((offset=0) || fastcmp(params[0], "MAPVISITED")
+ || (++offset && fastcmp(params[0], "MAPBEATEN"))
+ || (++offset && fastcmp(params[0], "MAPALLEMERALDS"))
+ || (++offset && fastcmp(params[0], "MAPULTIMATE"))
+ || (++offset && fastcmp(params[0], "MAPPERFECT")))
+ {
+ PARAMCHECK(1);
+ ty = UC_MAPVISITED + offset;
+
+ // Convert to map number if it appears to be one
+ if (params[1][0] >= 'A' && params[1][0] <= 'Z')
+ re = M_MapNumber(params[1][0], params[1][1]);
+ else
+ re = atoi(params[1]);
+
+ if (re < 0 || re >= NUMMAPS)
+ {
+ deh_warning("Level number %d out of range (1 - %d)", re, NUMMAPS);
+ return;
+ }
+ }
+ else if ((offset=0) || fastcmp(params[0], "MAPSCORE")
+ || (++offset && fastcmp(params[0], "MAPTIME"))
+ || (++offset && fastcmp(params[0], "MAPRINGS")))
+ {
+ PARAMCHECK(2);
+ ty = UC_MAPSCORE + offset;
+ re = atoi(params[2]);
+
+ // Convert to map number if it appears to be one
+ if (params[1][0] >= 'A' && params[1][0] <= 'Z')
+ x1 = (INT16)M_MapNumber(params[1][0], params[1][1]);
+ else
+ x1 = (INT16)atoi(params[1]);
+
+ if (x1 < 0 || x1 >= NUMMAPS)
+ {
+ deh_warning("Level number %d out of range (1 - %d)", re, NUMMAPS);
+ return;
+ }
+ }
+ else if ((offset=0) || fastcmp(params[0], "NIGHTSSCORE")
+ || (++offset && fastcmp(params[0], "NIGHTSTIME"))
+ || (++offset && fastcmp(params[0], "NIGHTSGRADE")))
+ {
+ PARAMCHECK(2); // one optional one
+
+ ty = UC_NIGHTSSCORE + offset;
+ i = (params[3] ? 3 : 2);
+ if (fastncmp("GRADE_",params[i],6))
+ {
+ char *p = params[i]+6;
+ for (re = 0; NIGHTSGRADE_LIST[re]; re++)
+ if (*p == NIGHTSGRADE_LIST[re])
+ break;
+ if (!NIGHTSGRADE_LIST[re])
+ {
+ deh_warning("Invalid NiGHTS grade %s\n", params[i]);
+ return;
+ }
+ }
+ else
+ re = atoi(params[i]);
+
+ // Convert to map number if it appears to be one
+ if (params[1][0] >= 'A' && params[1][0] <= 'Z')
+ x1 = (INT16)M_MapNumber(params[1][0], params[1][1]);
+ else
+ x1 = (INT16)atoi(params[1]);
+
+ if (x1 < 0 || x1 >= NUMMAPS)
+ {
+ deh_warning("Level number %d out of range (1 - %d)", re, NUMMAPS);
+ return;
+ }
+
+ // Mare number (0 for overall)
+ if (params[3]) // Only if we actually got 3 params (so the second one == mare and not requirement)
+ x2 = (INT16)atoi(params[2]);
+ else
+ x2 = 0;
+
+ }
+ else if (fastcmp(params[0], "TRIGGER"))
+ {
+ PARAMCHECK(1);
+ ty = UC_TRIGGER;
+ re = atoi(params[1]);
+
+ // constrained by 32 bits
+ if (re < 0 || re > 31)
+ {
+ deh_warning("Trigger ID %d out of range (0 - 31)", re);
+ return;
+ }
+ }
+ else if (fastcmp(params[0], "TOTALEMBLEMS"))
+ {
+ PARAMCHECK(1);
+ ty = UC_TOTALEMBLEMS;
+ re = atoi(params[1]);
+ }
+ else if (fastcmp(params[0], "EMBLEM"))
+ {
+ PARAMCHECK(1);
+ ty = UC_EMBLEM;
+ re = atoi(params[1]);
+
+ if (re <= 0 || re > MAXEMBLEMS)
+ {
+ deh_warning("Emblem %d out of range (1 - %d)", re, MAXEMBLEMS);
+ return;
+ }
+ }
+ else if (fastcmp(params[0], "EXTRAEMBLEM"))
+ {
+ PARAMCHECK(1);
+ ty = UC_EXTRAEMBLEM;
+ re = atoi(params[1]);
+
+ if (re <= 0 || re > MAXEXTRAEMBLEMS)
+ {
+ deh_warning("Extra emblem %d out of range (1 - %d)", re, MAXEXTRAEMBLEMS);
+ return;
+ }
+ }
+ else if (fastcmp(params[0], "CONDITIONSET"))
+ {
+ PARAMCHECK(1);
+ ty = UC_CONDITIONSET;
+ re = atoi(params[1]);
+
+ if (re <= 0 || re > MAXCONDITIONSETS)
+ {
+ deh_warning("Condition set %d out of range (1 - %d)", re, MAXCONDITIONSETS);
+ return;
+ }
+ }
+ else
+ {
+ deh_warning("Invalid condition name %s", params[0]);
+ return;
+ }
+
+ M_AddRawCondition(set, (UINT8)id, ty, re, x1, x2);
+}
+
+void readconditionset(MYFILE *f, UINT8 setnum)
+{
+ char *s = Z_Malloc(MAXLINELEN, PU_STATIC, NULL);
+ char *word = s;
+ char *word2;
+ char *tmp;
+ UINT8 id;
+ UINT8 previd = 0;
+
+ M_ClearConditionSet(setnum);
+
+ do
+ {
+ if (myfgets(s, MAXLINELEN, f))
+ {
+ if (s[0] == '\n')
+ break;
+
+ // First remove trailing newline, if there is one
+ tmp = strchr(s, '\n');
+ if (tmp)
+ *tmp = '\0';
+
+ tmp = strchr(s, '#');
+ if (tmp)
+ *tmp = '\0';
+ if (s == tmp)
+ continue; // Skip comment lines, but don't break.
+
+ // Get the part before the " = "
+ tmp = strchr(s, '=');
+ if (tmp)
+ *(tmp-1) = '\0';
+ else
+ break;
+ strupr(word);
+
+ // Now get the part after
+ word2 = tmp += 2;
+ strupr(word2);
+
+ if (fastncmp(word, "CONDITION", 9))
+ {
+ id = (UINT8)atoi(word + 9);
+ if (id == 0)
+ {
+ deh_warning("Condition set %d: unknown word '%s'", setnum, word);
+ continue;
+ }
+ else if (previd > id)
+ {
+ // out of order conditions can cause problems, so enforce proper order
+ deh_warning("Condition set %d: conditions are out of order, ignoring this line", setnum);
+ continue;
+ }
+ previd = id;
+
+ readcondition(setnum, id, word2);
+ }
+ else
+ deh_warning("Condition set %d: unknown word '%s'", setnum, word);
+ }
+ } while (!myfeof(f)); // finish when the line is empty
+
+ Z_Free(s);
+}
+
+void readmaincfg(MYFILE *f)
+{
+ char *s = Z_Malloc(MAXLINELEN, PU_STATIC, NULL);
+ char *word = s;
+ char *word2;
+ char *tmp;
+ INT32 value;
+
+ do
+ {
+ if (myfgets(s, MAXLINELEN, f))
+ {
+ if (s[0] == '\n')
+ break;
+
+ // First remove trailing newline, if there is one
+ tmp = strchr(s, '\n');
+ if (tmp)
+ *tmp = '\0';
+
+ tmp = strchr(s, '#');
+ if (tmp)
+ *tmp = '\0';
+ if (s == tmp)
+ continue; // Skip comment lines, but don't break.
+
+ // Get the part before the " = "
+ tmp = strchr(s, '=');
+ if (tmp)
+ *(tmp-1) = '\0';
+ else
+ break;
+ strupr(word);
+
+ // Now get the part after
+ word2 = tmp += 2;
+ strupr(word2);
+
+ value = atoi(word2); // used for numerical settings
+
+ if (fastcmp(word, "EXECCFG"))
+ {
+ if (strchr(word2, '.'))
+ COM_BufAddText(va("exec %s\n", word2));
+ else
+ {
+ lumpnum_t lumpnum;
+ char newname[9];
+
+ strncpy(newname, word2, 8);
+
+ newname[8] = '\0';
+
+ lumpnum = W_CheckNumForName(newname);
+
+ if (lumpnum == LUMPERROR || W_LumpLength(lumpnum) == 0)
+ CONS_Debug(DBG_SETUP, "SOC Error: script lump %s not found/not valid.\n", newname);
+ else
+ COM_BufInsertText(W_CacheLumpNum(lumpnum, PU_CACHE));
+ }
+ }
+
+ else if (fastcmp(word, "SPSTAGE_START"))
+ {
+ // Support using the actual map name,
+ // i.e., Level AB, Level FZ, etc.
+
+ // Convert to map number
+ if (word2[0] >= 'A' && word2[0] <= 'Z')
+ value = M_MapNumber(word2[0], word2[1]);
+ else
+ value = get_number(word2);
+
+ spstage_start = spmarathon_start = (INT16)value;
+ }
+ else if (fastcmp(word, "SPMARATHON_START"))
+ {
+ // Support using the actual map name,
+ // i.e., Level AB, Level FZ, etc.
+
+ // Convert to map number
+ if (word2[0] >= 'A' && word2[0] <= 'Z')
+ value = M_MapNumber(word2[0], word2[1]);
+ else
+ value = get_number(word2);
+
+ spmarathon_start = (INT16)value;
+ }
+ else if (fastcmp(word, "SSTAGE_START"))
+ {
+ // Support using the actual map name,
+ // i.e., Level AB, Level FZ, etc.
+
+ // Convert to map number
+ if (word2[0] >= 'A' && word2[0] <= 'Z')
+ value = M_MapNumber(word2[0], word2[1]);
+ else
+ value = get_number(word2);
+
+ sstage_start = (INT16)value;
+ sstage_end = (INT16)(sstage_start+7); // 7 special stages total plus one weirdo
+ }
+ else if (fastcmp(word, "SMPSTAGE_START"))
+ {
+ // Support using the actual map name,
+ // i.e., Level AB, Level FZ, etc.
+
+ // Convert to map number
+ if (word2[0] >= 'A' && word2[0] <= 'Z')
+ value = M_MapNumber(word2[0], word2[1]);
+ else
+ value = get_number(word2);
+
+ smpstage_start = (INT16)value;
+ smpstage_end = (INT16)(smpstage_start+6); // 7 special stages total
+ }
+ else if (fastcmp(word, "REDTEAM"))
+ {
+ skincolor_redteam = (UINT16)get_number(word2);
+ }
+ else if (fastcmp(word, "BLUETEAM"))
+ {
+ skincolor_blueteam = (UINT16)get_number(word2);
+ }
+ else if (fastcmp(word, "REDRING"))
+ {
+ skincolor_redring = (UINT16)get_number(word2);
+ }
+ else if (fastcmp(word, "BLUERING"))
+ {
+ skincolor_bluering = (UINT16)get_number(word2);
+ }
+ else if (fastcmp(word, "INVULNTICS"))
+ {
+ invulntics = (UINT16)get_number(word2);
+ }
+ else if (fastcmp(word, "SNEAKERTICS"))
+ {
+ sneakertics = (UINT16)get_number(word2);
+ }
+ else if (fastcmp(word, "FLASHINGTICS"))
+ {
+ flashingtics = (UINT16)get_number(word2);
+ }
+ else if (fastcmp(word, "TAILSFLYTICS"))
+ {
+ tailsflytics = (UINT16)get_number(word2);
+ }
+ else if (fastcmp(word, "UNDERWATERTICS"))
+ {
+ underwatertics = (UINT16)get_number(word2);
+ }
+ else if (fastcmp(word, "SPACETIMETICS"))
+ {
+ spacetimetics = (UINT16)get_number(word2);
+ }
+ else if (fastcmp(word, "EXTRALIFETICS"))
+ {
+ extralifetics = (UINT16)get_number(word2);
+ }
+ else if (fastcmp(word, "NIGHTSLINKTICS"))
+ {
+ nightslinktics = (UINT16)get_number(word2);
+ }
+ else if (fastcmp(word, "GAMEOVERTICS"))
+ {
+ gameovertics = get_number(word2);
+ }
+ else if (fastcmp(word, "AMMOREMOVALTICS"))
+ {
+ ammoremovaltics = get_number(word2);
+ }
+ else if (fastcmp(word, "INTROTOPLAY"))
+ {
+ introtoplay = (UINT8)get_number(word2);
+ // range check, you morons.
+ if (introtoplay > 128)
+ introtoplay = 128;
+ introchanged = true;
+ }
+ else if (fastcmp(word, "CREDITSCUTSCENE"))
+ {
+ creditscutscene = (UINT8)get_number(word2);
+ // range check, you morons.
+ if (creditscutscene > 128)
+ creditscutscene = 128;
+ }
+ else if (fastcmp(word, "USEBLACKROCK"))
+ {
+ useBlackRock = (UINT8)(value || word2[0] == 'T' || word2[0] == 'Y');
+ }
+ else if (fastcmp(word, "LOOPTITLE"))
+ {
+ looptitle = (value || word2[0] == 'T' || word2[0] == 'Y');
+ titlechanged = true;
+ }
+ else if (fastcmp(word, "TITLEMAP"))
+ {
+ // Support using the actual map name,
+ // i.e., Level AB, Level FZ, etc.
+
+ // Convert to map number
+ if (word2[0] >= 'A' && word2[0] <= 'Z')
+ value = M_MapNumber(word2[0], word2[1]);
+ else
+ value = get_number(word2);
+
+ titlemap = (INT16)value;
+ titlechanged = true;
+ }
+ else if (fastcmp(word, "HIDETITLEPICS") || fastcmp(word, "TITLEPICSHIDE"))
+ {
+ hidetitlepics = (boolean)(value || word2[0] == 'T' || word2[0] == 'Y');
+ titlechanged = true;
+ }
+ else if (fastcmp(word, "TITLEPICSMODE"))
+ {
+ if (fastcmp(word2, "USER"))
+ ttmode = TTMODE_USER;
+ else if (fastcmp(word2, "ALACROIX"))
+ ttmode = TTMODE_ALACROIX;
+ else if (fastcmp(word2, "HIDE") || fastcmp(word2, "HIDDEN") || fastcmp(word2, "NONE"))
+ {
+ ttmode = TTMODE_USER;
+ ttname[0] = 0;
+ hidetitlepics = true;
+ }
+ else // if (fastcmp(word2, "OLD") || fastcmp(word2, "SSNTAILS"))
+ ttmode = TTMODE_OLD;
+ titlechanged = true;
+ }
+ else if (fastcmp(word, "TITLEPICSSCALE"))
+ {
+ ttscale = max(1, min(8, (UINT8)get_number(word2)));
+ titlechanged = true;
+ }
+ else if (fastcmp(word, "TITLEPICSSCALESAVAILABLE"))
+ {
+ // SPECIAL CASE for Alacroix: Comma-separated list of resolutions that are available
+ // for gfx loading.
+ ttavailable[0] = ttavailable[1] = ttavailable[2] = ttavailable[3] =\
+ ttavailable[4] = ttavailable[5] = false;
+
+ if (strstr(word2, "1") != NULL)
+ ttavailable[0] = true;
+ if (strstr(word2, "2") != NULL)
+ ttavailable[1] = true;
+ if (strstr(word2, "3") != NULL)
+ ttavailable[2] = true;
+ if (strstr(word2, "4") != NULL)
+ ttavailable[3] = true;
+ if (strstr(word2, "5") != NULL)
+ ttavailable[4] = true;
+ if (strstr(word2, "6") != NULL)
+ ttavailable[5] = true;
+ titlechanged = true;
+ }
+ else if (fastcmp(word, "TITLEPICSNAME"))
+ {
+ strncpy(ttname, word2, 9);
+ titlechanged = true;
+ }
+ else if (fastcmp(word, "TITLEPICSX"))
+ {
+ ttx = (INT16)get_number(word2);
+ titlechanged = true;
+ }
+ else if (fastcmp(word, "TITLEPICSY"))
+ {
+ tty = (INT16)get_number(word2);
+ titlechanged = true;
+ }
+ else if (fastcmp(word, "TITLEPICSLOOP"))
+ {
+ ttloop = (INT16)get_number(word2);
+ titlechanged = true;
+ }
+ else if (fastcmp(word, "TITLEPICSTICS"))
+ {
+ tttics = (UINT16)get_number(word2);
+ titlechanged = true;
+ }
+ else if (fastcmp(word, "TITLESCROLLSPEED") || fastcmp(word, "TITLESCROLLXSPEED"))
+ {
+ titlescrollxspeed = get_number(word2);
+ titlechanged = true;
+ }
+ else if (fastcmp(word, "TITLESCROLLYSPEED"))
+ {
+ titlescrollyspeed = get_number(word2);
+ titlechanged = true;
+ }
+ else if (fastcmp(word, "DISABLESPEEDADJUST"))
+ {
+ disableSpeedAdjust = (value || word2[0] == 'T' || word2[0] == 'Y');
+ }
+ else if (fastcmp(word, "NUMDEMOS"))
+ {
+ numDemos = (UINT8)get_number(word2);
+ titlechanged = true;
+ }
+ else if (fastcmp(word, "DEMODELAYTIME"))
+ {
+ demoDelayTime = get_number(word2);
+ titlechanged = true;
+ }
+ else if (fastcmp(word, "DEMOIDLETIME"))
+ {
+ demoIdleTime = get_number(word2);
+ titlechanged = true;
+ }
+ else if (fastcmp(word, "USE1UPSOUND"))
+ {
+ use1upSound = (UINT8)(value || word2[0] == 'T' || word2[0] == 'Y');
+ }
+ else if (fastcmp(word, "MAXXTRALIFE"))
+ {
+ maxXtraLife = (UINT8)get_number(word2);
+ }
+ else if (fastcmp(word, "USECONTINUES"))
+ {
+ useContinues = (UINT8)(value || word2[0] == 'T' || word2[0] == 'Y');
+ }
+
+ else if (fastcmp(word, "GAMEDATA"))
+ {
+ size_t filenamelen;
+
+ // Check the data filename so that mods
+ // can't write arbitrary files.
+ if (!GoodDataFileName(word2))
+ I_Error("Maincfg: bad data file name '%s'\n", word2);
+
+ G_SaveGameData();
+ strlcpy(gamedatafilename, word2, sizeof (gamedatafilename));
+ strlwr(gamedatafilename);
+ savemoddata = true;
+
+ // Also save a time attack folder
+ filenamelen = strlen(gamedatafilename)-4; // Strip off the extension
+ strncpy(timeattackfolder, gamedatafilename, min(filenamelen, sizeof (timeattackfolder)));
+ timeattackfolder[min(filenamelen, sizeof (timeattackfolder) - 1)] = '\0';
+
+ strcpy(savegamename, timeattackfolder);
+ strlcat(savegamename, "%u.ssg", sizeof(savegamename));
+ // can't use sprintf since there is %u in savegamename
+ strcatbf(savegamename, srb2home, PATHSEP);
+
+ strcpy(liveeventbackup, va("live%s.bkp", timeattackfolder));
+ strcatbf(liveeventbackup, srb2home, PATHSEP);
+
+ gamedataadded = true;
+ titlechanged = true;
+ }
+ else if (fastcmp(word, "RESETDATA"))
+ {
+ P_ResetData(value);
+ titlechanged = true;
+ }
+ else if (fastcmp(word, "CUSTOMVERSION"))
+ {
+ strlcpy(customversionstring, word2, sizeof (customversionstring));
+ //titlechanged = true;
+ }
+ else if (fastcmp(word, "BOOTMAP"))
+ {
+ // Support using the actual map name,
+ // i.e., Level AB, Level FZ, etc.
+
+ // Convert to map number
+ if (word2[0] >= 'A' && word2[0] <= 'Z')
+ value = M_MapNumber(word2[0], word2[1]);
+ else
+ value = get_number(word2);
+
+ bootmap = (INT16)value;
+ //titlechanged = true;
+ }
+ else if (fastcmp(word, "STARTCHAR"))
+ {
+ startchar = (INT16)value;
+ char_on = -1;
+ }
+ else if (fastcmp(word, "TUTORIALMAP"))
+ {
+ // Support using the actual map name,
+ // i.e., Level AB, Level FZ, etc.
+
+ // Convert to map number
+ if (word2[0] >= 'A' && word2[0] <= 'Z')
+ value = M_MapNumber(word2[0], word2[1]);
+ else
+ value = get_number(word2);
+
+ tutorialmap = (INT16)value;
+ }
+ else
+ deh_warning("Maincfg: unknown word '%s'", word);
+ }
+ } while (!myfeof(f));
+
+ Z_Free(s);
+}
+
+void readwipes(MYFILE *f)
+{
+ char *s = Z_Malloc(MAXLINELEN, PU_STATIC, NULL);
+ char *word = s;
+ char *pword = word;
+ char *word2;
+ char *tmp;
+ INT32 value;
+ INT32 wipeoffset;
+
+ do
+ {
+ if (myfgets(s, MAXLINELEN, f))
+ {
+ if (s[0] == '\n')
+ break;
+
+ // First remove trailing newline, if there is one
+ tmp = strchr(s, '\n');
+ if (tmp)
+ *tmp = '\0';
+
+ tmp = strchr(s, '#');
+ if (tmp)
+ *tmp = '\0';
+ if (s == tmp)
+ continue; // Skip comment lines, but don't break.
+
+ // Get the part before the " = "
+ tmp = strchr(s, '=');
+ if (tmp)
+ *(tmp-1) = '\0';
+ else
+ break;
+ strupr(word);
+
+ // Now get the part after
+ word2 = tmp += 2;
+ value = atoi(word2); // used for numerical settings
+
+ if (value < -1 || value > 99)
+ {
+ deh_warning("Wipes: bad value '%s'", word2);
+ continue;
+ }
+ else if (value == -1)
+ value = UINT8_MAX;
+
+ // error catching
+ wipeoffset = -1;
+
+ if (fastncmp(word, "LEVEL_", 6))
+ {
+ pword = word + 6;
+ if (fastcmp(pword, "TOBLACK"))
+ wipeoffset = wipe_level_toblack;
+ else if (fastcmp(pword, "FINAL"))
+ wipeoffset = wipe_level_final;
+ }
+ else if (fastncmp(word, "INTERMISSION_", 13))
+ {
+ pword = word + 13;
+ if (fastcmp(pword, "TOBLACK"))
+ wipeoffset = wipe_intermission_toblack;
+ else if (fastcmp(pword, "FINAL"))
+ wipeoffset = wipe_intermission_final;
+ }
+ else if (fastncmp(word, "SPECINTER_", 10))
+ {
+ pword = word + 10;
+ if (fastcmp(pword, "TOBLACK"))
+ wipeoffset = wipe_specinter_toblack;
+ else if (fastcmp(pword, "FINAL"))
+ wipeoffset = wipe_specinter_final;
+ }
+ else if (fastncmp(word, "MULTINTER_", 10))
+ {
+ pword = word + 10;
+ if (fastcmp(pword, "TOBLACK"))
+ wipeoffset = wipe_multinter_toblack;
+ else if (fastcmp(pword, "FINAL"))
+ wipeoffset = wipe_multinter_final;
+ }
+ else if (fastncmp(word, "CONTINUING_", 11))
+ {
+ pword = word + 11;
+ if (fastcmp(pword, "TOBLACK"))
+ wipeoffset = wipe_continuing_toblack;
+ else if (fastcmp(pword, "FINAL"))
+ wipeoffset = wipe_continuing_final;
+ }
+ else if (fastncmp(word, "TITLESCREEN_", 12))
+ {
+ pword = word + 12;
+ if (fastcmp(pword, "TOBLACK"))
+ wipeoffset = wipe_titlescreen_toblack;
+ else if (fastcmp(pword, "FINAL"))
+ wipeoffset = wipe_titlescreen_final;
+ }
+ else if (fastncmp(word, "TIMEATTACK_", 11))
+ {
+ pword = word + 11;
+ if (fastcmp(pword, "TOBLACK"))
+ wipeoffset = wipe_timeattack_toblack;
+ else if (fastcmp(pword, "FINAL"))
+ wipeoffset = wipe_timeattack_final;
+ }
+ else if (fastncmp(word, "CREDITS_", 8))
+ {
+ pword = word + 8;
+ if (fastcmp(pword, "TOBLACK"))
+ wipeoffset = wipe_credits_toblack;
+ else if (fastcmp(pword, "FINAL"))
+ wipeoffset = wipe_credits_final;
+ else if (fastcmp(pword, "INTERMEDIATE"))
+ wipeoffset = wipe_credits_intermediate;
+ }
+ else if (fastncmp(word, "EVALUATION_", 11))
+ {
+ pword = word + 11;
+ if (fastcmp(pword, "TOBLACK"))
+ wipeoffset = wipe_evaluation_toblack;
+ else if (fastcmp(pword, "FINAL"))
+ wipeoffset = wipe_evaluation_final;
+ }
+ else if (fastncmp(word, "GAMEEND_", 8))
+ {
+ pword = word + 8;
+ if (fastcmp(pword, "TOBLACK"))
+ wipeoffset = wipe_gameend_toblack;
+ else if (fastcmp(pword, "FINAL"))
+ wipeoffset = wipe_gameend_final;
+ }
+ else if (fastncmp(word, "SPECLEVEL_", 10))
+ {
+ pword = word + 10;
+ if (fastcmp(pword, "TOWHITE"))
+ wipeoffset = wipe_speclevel_towhite;
+ }
+
+ if (wipeoffset < 0)
+ {
+ deh_warning("Wipes: unknown word '%s'", word);
+ continue;
+ }
+
+ if (value == UINT8_MAX
+ && (wipeoffset <= wipe_level_toblack || wipeoffset >= wipe_speclevel_towhite))
+ {
+ // Cannot disable non-toblack wipes
+ // (or the level toblack wipe, or the special towhite wipe)
+ deh_warning("Wipes: can't disable wipe of type '%s'", word);
+ continue;
+ }
+
+ wipedefs[wipeoffset] = (UINT8)value;
+ }
+ } while (!myfeof(f));
+
+ Z_Free(s);
+}
+
+mobjtype_t get_mobjtype(const char *word)
+{ // Returns the value of MT_ enumerations
+ mobjtype_t i;
+ if (*word >= '0' && *word <= '9')
+ return atoi(word);
+ if (fastncmp("MT_",word,3))
+ word += 3; // take off the MT_
+ for (i = 0; i < NUMMOBJFREESLOTS; i++) {
+ if (!FREE_MOBJS[i])
+ break;
+ if (fastcmp(word, FREE_MOBJS[i]))
+ return MT_FIRSTFREESLOT+i;
+ }
+ for (i = 0; i < MT_FIRSTFREESLOT; i++)
+ if (fastcmp(word, MOBJTYPE_LIST[i]+3))
+ return i;
+ deh_warning("Couldn't find mobjtype named 'MT_%s'",word);
+ return MT_NULL;
+}
+
+statenum_t get_state(const char *word)
+{ // Returns the value of S_ enumerations
+ statenum_t i;
+ if (*word >= '0' && *word <= '9')
+ return atoi(word);
+ if (fastncmp("S_",word,2))
+ word += 2; // take off the S_
+ for (i = 0; i < NUMSTATEFREESLOTS; i++) {
+ if (!FREE_STATES[i])
+ break;
+ if (fastcmp(word, FREE_STATES[i]))
+ return S_FIRSTFREESLOT+i;
+ }
+ for (i = 0; i < S_FIRSTFREESLOT; i++)
+ if (fastcmp(word, STATE_LIST[i]+2))
+ return i;
+ deh_warning("Couldn't find state named 'S_%s'",word);
+ return S_NULL;
+}
+
+skincolornum_t get_skincolor(const char *word)
+{ // Returns the value of SKINCOLOR_ enumerations
+ skincolornum_t i;
+ if (*word >= '0' && *word <= '9')
+ return atoi(word);
+ if (fastncmp("SKINCOLOR_",word,10))
+ word += 10; // take off the SKINCOLOR_
+ for (i = 0; i < NUMCOLORFREESLOTS; i++) {
+ if (!FREE_SKINCOLORS[i])
+ break;
+ if (fastcmp(word, FREE_SKINCOLORS[i]))
+ return SKINCOLOR_FIRSTFREESLOT+i;
+ }
+ for (i = 0; i < SKINCOLOR_FIRSTFREESLOT; i++)
+ if (fastcmp(word, COLOR_ENUMS[i]))
+ return i;
+ deh_warning("Couldn't find skincolor named 'SKINCOLOR_%s'",word);
+ return SKINCOLOR_GREEN;
+}
+
+spritenum_t get_sprite(const char *word)
+{ // Returns the value of SPR_ enumerations
+ spritenum_t i;
+ if (*word >= '0' && *word <= '9')
+ return atoi(word);
+ if (fastncmp("SPR_",word,4))
+ word += 4; // take off the SPR_
+ for (i = 0; i < NUMSPRITES; i++)
+ if (!sprnames[i][4] && memcmp(word,sprnames[i],4)==0)
+ return i;
+ deh_warning("Couldn't find sprite named 'SPR_%s'",word);
+ return SPR_NULL;
+}
+
+playersprite_t get_sprite2(const char *word)
+{ // Returns the value of SPR2_ enumerations
+ playersprite_t i;
+ if (*word >= '0' && *word <= '9')
+ return atoi(word);
+ if (fastncmp("SPR2_",word,5))
+ word += 5; // take off the SPR2_
+ for (i = 0; i < NUMPLAYERSPRITES; i++)
+ if (!spr2names[i][4] && memcmp(word,spr2names[i],4)==0)
+ return i;
+ deh_warning("Couldn't find sprite named 'SPR2_%s'",word);
+ return SPR2_STND;
+}
+
+sfxenum_t get_sfx(const char *word)
+{ // Returns the value of SFX_ enumerations
+ sfxenum_t i;
+ if (*word >= '0' && *word <= '9')
+ return atoi(word);
+ if (fastncmp("SFX_",word,4))
+ word += 4; // take off the SFX_
+ else if (fastncmp("DS",word,2))
+ word += 2; // take off the DS
+ for (i = 0; i < NUMSFX; i++)
+ if (S_sfx[i].name && fasticmp(word, S_sfx[i].name))
+ return i;
+ deh_warning("Couldn't find sfx named 'SFX_%s'",word);
+ return sfx_None;
+}
+
+#ifdef MUSICSLOT_COMPATIBILITY
+UINT16 get_mus(const char *word, UINT8 dehacked_mode)
+{ // Returns the value of MUS_ enumerations
+ UINT16 i;
+ char lumptmp[4];
+
+ if (*word >= '0' && *word <= '9')
+ return atoi(word);
+ if (!word[2] && toupper(word[0]) >= 'A' && toupper(word[0]) <= 'Z')
+ return (UINT16)M_MapNumber(word[0], word[1]);
+
+ if (fastncmp("MUS_",word,4))
+ word += 4; // take off the MUS_
+ else if (fastncmp("O_",word,2) || fastncmp("D_",word,2))
+ word += 2; // take off the O_ or D_
+
+ strncpy(lumptmp, word, 4);
+ lumptmp[3] = 0;
+ if (fasticmp("MAP",lumptmp))
+ {
+ word += 3;
+ if (toupper(word[0]) >= 'A' && toupper(word[0]) <= 'Z')
+ return (UINT16)M_MapNumber(word[0], word[1]);
+ else if ((i = atoi(word)))
+ return i;
+
+ word -= 3;
+ if (dehacked_mode)
+ deh_warning("Couldn't find music named 'MUS_%s'",word);
+ return 0;
+ }
+ for (i = 0; compat_special_music_slots[i][0]; ++i)
+ if (fasticmp(word, compat_special_music_slots[i]))
+ return i + 1036;
+ if (dehacked_mode)
+ deh_warning("Couldn't find music named 'MUS_%s'",word);
+ return 0;
+}
+#endif
+
+hudnum_t get_huditem(const char *word)
+{ // Returns the value of HUD_ enumerations
+ hudnum_t i;
+ if (*word >= '0' && *word <= '9')
+ return atoi(word);
+ if (fastncmp("HUD_",word,4))
+ word += 4; // take off the HUD_
+ for (i = 0; i < NUMHUDITEMS; i++)
+ if (fastcmp(word, HUDITEMS_LIST[i]))
+ return i;
+ deh_warning("Couldn't find huditem named 'HUD_%s'",word);
+ return HUD_LIVES;
+}
+
+menutype_t get_menutype(const char *word)
+{ // Returns the value of MN_ enumerations
+ menutype_t i;
+ if (*word >= '0' && *word <= '9')
+ return atoi(word);
+ if (fastncmp("MN_",word,3))
+ word += 3; // take off the MN_
+ for (i = 0; i < NUMMENUTYPES; i++)
+ if (fastcmp(word, MENUTYPES_LIST[i]))
+ return i;
+ deh_warning("Couldn't find menutype named 'MN_%s'",word);
+ return MN_NONE;
+}
+
+/*static INT16 get_gametype(const char *word)
+{ // Returns the value of GT_ enumerations
+ INT16 i;
+ if (*word >= '0' && *word <= '9')
+ return atoi(word);
+ if (fastncmp("GT_",word,3))
+ word += 3; // take off the GT_
+ for (i = 0; i < NUMGAMETYPES; i++)
+ if (fastcmp(word, Gametype_ConstantNames[i]+3))
+ return i;
+ deh_warning("Couldn't find gametype named 'GT_%s'",word);
+ return GT_COOP;
+}
+
+static powertype_t get_power(const char *word)
+{ // Returns the value of pw_ enumerations
+ powertype_t i;
+ if (*word >= '0' && *word <= '9')
+ return atoi(word);
+ if (fastncmp("PW_",word,3))
+ word += 3; // take off the pw_
+ for (i = 0; i < NUMPOWERS; i++)
+ if (fastcmp(word, POWERS_LIST[i]))
+ return i;
+ deh_warning("Couldn't find power named 'pw_%s'",word);
+ return pw_invulnerability;
+}*/
+
+/// \todo Make ANY of this completely over-the-top math craziness obey the order of operations.
+static fixed_t op_mul(fixed_t a, fixed_t b) { return a*b; }
+static fixed_t op_div(fixed_t a, fixed_t b) { return a/b; }
+static fixed_t op_add(fixed_t a, fixed_t b) { return a+b; }
+static fixed_t op_sub(fixed_t a, fixed_t b) { return a-b; }
+static fixed_t op_or(fixed_t a, fixed_t b) { return a|b; }
+static fixed_t op_and(fixed_t a, fixed_t b) { return a&b; }
+static fixed_t op_lshift(fixed_t a, fixed_t b) { return a<<b; }
+static fixed_t op_rshift(fixed_t a, fixed_t b) { return a>>b; }
+
+struct {
+ const char c;
+ fixed_t (*v)(fixed_t,fixed_t);
+} OPERATIONS[] = {
+ {'*',op_mul},
+ {'/',op_div},
+ {'+',op_add},
+ {'-',op_sub},
+ {'|',op_or},
+ {'&',op_and},
+ {'<',op_lshift},
+ {'>',op_rshift},
+ {0,NULL}
+};
+
+// Returns the full word, cut at the first symbol or whitespace
+/*static char *read_word(const char *line)
+{
+ // Part 1: You got the start of the word, now find the end.
+ const char *p;
+ INT32 i;
+ for (p = line+1; *p; p++) {
+ if (*p == ' ' || *p == '\t')
+ break;
+ for (i = 0; OPERATIONS[i].c; i++)
+ if (*p == OPERATIONS[i].c) {
+ i = -1;
+ break;
+ }
+ if (i == -1)
+ break;
+ }
+
+ // Part 2: Make a copy of the word and return it.
+ {
+ size_t len = (p-line);
+ char *word = malloc(len+1);
+ M_Memcpy(word,line,len);
+ word[len] = '\0';
+ return word;
+ }
+}
+
+static INT32 operation_pad(const char **word)
+{ // Brings word the next operation and returns the operation number.
+ INT32 i;
+ for (; **word; (*word)++) {
+ if (**word == ' ' || **word == '\t')
+ continue;
+ for (i = 0; OPERATIONS[i].c; i++)
+ if (**word == OPERATIONS[i].c)
+ {
+ if ((**word == '<' && *(*word+1) == '<') || (**word == '>' && *(*word+1) == '>')) (*word)++; // These operations are two characters long.
+ else if (**word == '<' || **word == '>') continue; // ... do not accept one character long.
+ (*word)++;
+ return i;
+ }
+ deh_warning("Unknown operation '%c'",**word);
+ return -1;
+ }
+ return -1;
+}
+
+static void const_warning(const char *type, const char *word)
+{
+ deh_warning("Couldn't find %s named '%s'",type,word);
+}
+
+static fixed_t find_const(const char **rword)
+{ // Finds the value of constants and returns it, bringing word to the next operation.
+ INT32 i;
+ fixed_t r;
+ char *word = read_word(*rword);
+ *rword += strlen(word);
+ if ((*word >= '0' && *word <= '9') || *word == '-') { // Parse a number
+ r = atoi(word);
+ free(word);
+ return r;
+ }
+ if (!*(word+1) && // Turn a single A-z symbol into numbers, like sprite frames.
+ ((*word >= 'A' && *word <= 'Z') || (*word >= 'a' && *word <= 'z'))) {
+ r = R_Char2Frame(*word);
+ free(word);
+ return r;
+ }
+ if (fastncmp("MF_", word, 3)) {
+ char *p = word+3;
+ for (i = 0; MOBJFLAG_LIST[i]; i++)
+ if (fastcmp(p, MOBJFLAG_LIST[i])) {
+ free(word);
+ return (1<<i);
+ }
+
+ // Not found error
+ const_warning("mobj flag",word);
+ free(word);
+ return 0;
+ }
+ else if (fastncmp("MF2_", word, 4)) {
+ char *p = word+4;
+ for (i = 0; MOBJFLAG2_LIST[i]; i++)
+ if (fastcmp(p, MOBJFLAG2_LIST[i])) {
+ free(word);
+ return (1<<i);
+ }
+
+ // Not found error
+ const_warning("mobj flag2",word);
+ free(word);
+ return 0;
+ }
+ else if (fastncmp("MFE_", word, 4)) {
+ char *p = word+4;
+ for (i = 0; MOBJEFLAG_LIST[i]; i++)
+ if (fastcmp(p, MOBJEFLAG_LIST[i])) {
+ free(word);
+ return (1<<i);
+ }
+
+ // Not found error
+ const_warning("mobj eflag",word);
+ free(word);
+ return 0;
+ }
+ else if (fastncmp("PF_", word, 3)) {
+ char *p = word+3;
+ for (i = 0; PLAYERFLAG_LIST[i]; i++)
+ if (fastcmp(p, PLAYERFLAG_LIST[i])) {
+ free(word);
+ return (1<<i);
+ }
+ if (fastcmp(p, "FULLSTASIS"))
+ return PF_FULLSTASIS;
+
+ // Not found error
+ const_warning("player flag",word);
+ free(word);
+ return 0;
+ }
+ else if (fastncmp("S_",word,2)) {
+ r = get_state(word);
+ free(word);
+ return r;
+ }
+ else if (fastncmp("SKINCOLOR_",word,10)) {
+ r = get_skincolor(word);
+ free(word);
+ return r;
+ }
+ else if (fastncmp("MT_",word,3)) {
+ r = get_mobjtype(word);
+ free(word);
+ return r;
+ }
+ else if (fastncmp("SPR_",word,4)) {
+ r = get_sprite(word);
+ free(word);
+ return r;
+ }
+ else if (fastncmp("SFX_",word,4) || fastncmp("DS",word,2)) {
+ r = get_sfx(word);
+ free(word);
+ return r;
+ }
+#ifdef MUSICSLOT_COMPATIBILITY
+ else if (fastncmp("MUS_",word,4) || fastncmp("O_",word,2)) {
+ r = get_mus(word, true);
+ free(word);
+ return r;
+ }
+#endif
+ else if (fastncmp("PW_",word,3)) {
+ r = get_power(word);
+ free(word);
+ return r;
+ }
+ else if (fastncmp("MN_",word,3)) {
+ r = get_menutype(word);
+ free(word);
+ return r;
+ }
+ else if (fastncmp("GT_",word,3)) {
+ r = get_gametype(word);
+ free(word);
+ return r;
+ }
+ else if (fastncmp("GTR_", word, 4)) {
+ char *p = word+4;
+ for (i = 0; GAMETYPERULE_LIST[i]; i++)
+ if (fastcmp(p, GAMETYPERULE_LIST[i])) {
+ free(word);
+ return (1<<i);
+ }
+
+ // Not found error
+ const_warning("game type rule",word);
+ free(word);
+ return 0;
+ }
+ else if (fastncmp("TOL_", word, 4)) {
+ char *p = word+4;
+ for (i = 0; TYPEOFLEVEL[i].name; i++)
+ if (fastcmp(p, TYPEOFLEVEL[i].name)) {
+ free(word);
+ return TYPEOFLEVEL[i].flag;
+ }
+
+ // Not found error
+ const_warning("typeoflevel",word);
+ free(word);
+ return 0;
+ }
+ else if (fastncmp("HUD_",word,4)) {
+ r = get_huditem(word);
+ free(word);
+ return r;
+ }
+ else if (fastncmp("GRADE_",word,6))
+ {
+ char *p = word+6;
+ for (i = 0; NIGHTSGRADE_LIST[i]; i++)
+ if (*p == NIGHTSGRADE_LIST[i])
+ {
+ free(word);
+ return i;
+ }
+ const_warning("NiGHTS grade",word);
+ free(word);
+ return 0;
+ }
+ for (i = 0; INT_CONST[i].n; i++)
+ if (fastcmp(word,INT_CONST[i].n)) {
+ free(word);
+ return INT_CONST[i].v;
+ }
+
+ // Not found error.
+ const_warning("constant",word);
+ free(word);
+ return 0;
+}*/
diff --git a/src/deh_soc.h b/src/deh_soc.h
new file mode 100644
index 0000000000000000000000000000000000000000..2bcb52e709e9ef1003753fdf68ee6647af9c3e60
--- /dev/null
+++ b/src/deh_soc.h
@@ -0,0 +1,89 @@
+// SONIC ROBO BLAST 2
+//-----------------------------------------------------------------------------
+// Copyright (C) 1998-2000 by DooM Legacy Team.
+// Copyright (C) 1999-2020 by Sonic Team Junior.
+//
+// This program is free software distributed under the
+// terms of the GNU General Public License, version 2.
+// See the 'LICENSE' file for more details.
+//-----------------------------------------------------------------------------
+/// \file deh_soc.h
+/// \brief Load SOC file and change tables and text
+
+#ifndef __DEH_SOC_H__
+#define __DEH_SOC_H__
+
+#include "doomdef.h"
+#include "g_game.h"
+#include "sounds.h"
+#include "info.h"
+#include "d_think.h"
+#include "m_argv.h"
+#include "z_zone.h"
+#include "w_wad.h"
+#include "m_menu.h"
+#include "m_misc.h"
+#include "f_finale.h"
+#include "st_stuff.h"
+#include "i_system.h"
+#include "p_setup.h"
+#include "r_data.h"
+#include "r_textures.h"
+#include "r_draw.h"
+#include "r_picformats.h"
+#include "r_things.h" // R_Char2Frame
+#include "r_sky.h"
+#include "fastcmp.h"
+#include "lua_script.h" // Reluctantly included for LUA_EvalMath
+#include "d_clisrv.h"
+
+#ifdef HWRENDER
+#include "hardware/hw_light.h"
+#endif
+
+#include "info.h"
+#include "dehacked.h"
+#include "doomdef.h" // MUSICSLOT_COMPATIBILITY, HWRENDER
+
+// Crazy word-reading stuff
+/// \todo Put these in a seperate file or something.
+mobjtype_t get_mobjtype(const char *word);
+statenum_t get_state(const char *word);
+spritenum_t get_sprite(const char *word);
+playersprite_t get_sprite2(const char *word);
+sfxenum_t get_sfx(const char *word);
+#ifdef MUSICSLOT_COMPATIBILITY
+UINT16 get_mus(const char *word, UINT8 dehacked_mode);
+#endif
+hudnum_t get_huditem(const char *word);
+menutype_t get_menutype(const char *word);
+//INT16 get_gametype(const char *word);
+//powertype_t get_power(const char *word);
+skincolornum_t get_skincolor(const char *word);
+
+void readwipes(MYFILE *f);
+void readmaincfg(MYFILE *f);
+void readconditionset(MYFILE *f, UINT8 setnum);
+void readunlockable(MYFILE *f, INT32 num);
+void readextraemblemdata(MYFILE *f, INT32 num);
+void reademblemdata(MYFILE *f, INT32 num);
+void readsound(MYFILE *f, INT32 num);
+void readframe(MYFILE *f, INT32 num);
+void readhuditem(MYFILE *f, INT32 num);
+void readmenu(MYFILE *f, INT32 num);
+void readtextprompt(MYFILE *f, INT32 num);
+void readcutscene(MYFILE *f, INT32 num);
+void readlevelheader(MYFILE *f, INT32 num);
+void readgametype(MYFILE *f, char *gtname);
+void readsprite2(MYFILE *f, INT32 num);
+void readspriteinfo(MYFILE *f, INT32 num, boolean sprite2);
+#ifdef HWRENDER
+void readlight(MYFILE *f, INT32 num);
+#endif
+void readskincolor(MYFILE *f, INT32 num);
+void readthing(MYFILE *f, INT32 num);
+void readfreeslots(MYFILE *f);
+void readPlayer(MYFILE *f, INT32 num);
+void clear_levels(void);
+void clear_conditionsets(void);
+#endif
diff --git a/src/deh_tables.c b/src/deh_tables.c
new file mode 100644
index 0000000000000000000000000000000000000000..dd6d7d69ff722bedd843456a4b5a7963889a1269
--- /dev/null
+++ b/src/deh_tables.c
@@ -0,0 +1,5483 @@
+// SONIC ROBO BLAST 2
+//-----------------------------------------------------------------------------
+// Copyright (C) 1998-2000 by DooM Legacy Team.
+// Copyright (C) 1999-2020 by Sonic Team Junior.
+//
+// This program is free software distributed under the
+// terms of the GNU General Public License, version 2.
+// See the 'LICENSE' file for more details.
+//-----------------------------------------------------------------------------
+/// \file deh_tables.c
+/// \brief Define DeHackEd tables.
+
+#include "doomdef.h" // Constants
+#include "s_sound.h" // Sound constants
+#include "info.h" // Mobj, state, sprite, etc constants
+#include "m_menu.h" // Menu constants
+#include "y_inter.h" // Intermission constants
+#include "p_local.h" // some more constants
+#include "r_draw.h" // Colormap constants
+#include "lua_script.h" // Lua stuff
+#include "m_cond.h" // Emblem constants
+#include "v_video.h" // video flags (for lua)
+#include "i_sound.h" // musictype_t (for lua)
+#include "g_state.h" // gamestate_t (for lua)
+
+#include "deh_tables.h"
+
+char *FREE_STATES[NUMSTATEFREESLOTS];
+char *FREE_MOBJS[NUMMOBJFREESLOTS];
+char *FREE_SKINCOLORS[NUMCOLORFREESLOTS];
+UINT8 used_spr[(NUMSPRITEFREESLOTS / 8) + 1]; // Bitwise flag for sprite freeslot in use! I would use ceil() here if I could, but it only saves 1 byte of memory anyway.
+
+const char NIGHTSGRADE_LIST[] = {
+ 'F', // GRADE_F
+ 'E', // GRADE_E
+ 'D', // GRADE_D
+ 'C', // GRADE_C
+ 'B', // GRADE_B
+ 'A', // GRADE_A
+ 'S', // GRADE_S
+ '\0'
+};
+
+struct flickytypes_s FLICKYTYPES[] = {
+ {"BLUEBIRD", MT_FLICKY_01}, // Flicky (Flicky)
+ {"RABBIT", MT_FLICKY_02}, // Pocky (1)
+ {"CHICKEN", MT_FLICKY_03}, // Cucky (1)
+ {"SEAL", MT_FLICKY_04}, // Rocky (1)
+ {"PIG", MT_FLICKY_05}, // Picky (1)
+ {"CHIPMUNK", MT_FLICKY_06}, // Ricky (1)
+ {"PENGUIN", MT_FLICKY_07}, // Pecky (1)
+ {"FISH", MT_FLICKY_08}, // Nicky (CD)
+ {"RAM", MT_FLICKY_09}, // Flocky (CD)
+ {"PUFFIN", MT_FLICKY_10}, // Wicky (CD)
+ {"COW", MT_FLICKY_11}, // Macky (SRB2)
+ {"RAT", MT_FLICKY_12}, // Micky (2)
+ {"BEAR", MT_FLICKY_13}, // Becky (2)
+ {"DOVE", MT_FLICKY_14}, // Docky (CD)
+ {"CAT", MT_FLICKY_15}, // Nyannyan (Flicky)
+ {"CANARY", MT_FLICKY_16}, // Lucky (CD)
+ {"a", 0}, // End of normal flickies - a lower case character so will never fastcmp valid with uppercase tmp
+ //{"FLICKER", MT_FLICKER}, // Flacky (SRB2)
+ {"SPIDER", MT_SECRETFLICKY_01}, // Sticky (SRB2)
+ {"BAT", MT_SECRETFLICKY_02}, // Backy (SRB2)
+ {"SEED", MT_SEED}, // Seed (CD)
+ {NULL, 0}
+};
+
+// IMPORTANT!
+// DO NOT FORGET TO SYNC THIS LIST WITH THE ACTIONNUM ENUM IN INFO.H
+actionpointer_t actionpointers[] =
+{
+ {{A_Explode}, "A_EXPLODE"},
+ {{A_Pain}, "A_PAIN"},
+ {{A_Fall}, "A_FALL"},
+ {{A_MonitorPop}, "A_MONITORPOP"},
+ {{A_GoldMonitorPop}, "A_GOLDMONITORPOP"},
+ {{A_GoldMonitorRestore}, "A_GOLDMONITORRESTORE"},
+ {{A_GoldMonitorSparkle}, "A_GOLDMONITORSPARKLE"},
+ {{A_Look}, "A_LOOK"},
+ {{A_Chase}, "A_CHASE"},
+ {{A_FaceStabChase}, "A_FACESTABCHASE"},
+ {{A_FaceStabRev}, "A_FACESTABREV"},
+ {{A_FaceStabHurl}, "A_FACESTABHURL"},
+ {{A_FaceStabMiss}, "A_FACESTABMISS"},
+ {{A_StatueBurst}, "A_STATUEBURST"},
+ {{A_FaceTarget}, "A_FACETARGET"},
+ {{A_FaceTracer}, "A_FACETRACER"},
+ {{A_Scream}, "A_SCREAM"},
+ {{A_BossDeath}, "A_BOSSDEATH"},
+ {{A_CustomPower}, "A_CUSTOMPOWER"},
+ {{A_GiveWeapon}, "A_GIVEWEAPON"},
+ {{A_RingBox}, "A_RINGBOX"},
+ {{A_Invincibility}, "A_INVINCIBILITY"},
+ {{A_SuperSneakers}, "A_SUPERSNEAKERS"},
+ {{A_BunnyHop}, "A_BUNNYHOP"},
+ {{A_BubbleSpawn}, "A_BUBBLESPAWN"},
+ {{A_FanBubbleSpawn}, "A_FANBUBBLESPAWN"},
+ {{A_BubbleRise}, "A_BUBBLERISE"},
+ {{A_BubbleCheck}, "A_BUBBLECHECK"},
+ {{A_AwardScore}, "A_AWARDSCORE"},
+ {{A_ExtraLife}, "A_EXTRALIFE"},
+ {{A_GiveShield}, "A_GIVESHIELD"},
+ {{A_GravityBox}, "A_GRAVITYBOX"},
+ {{A_ScoreRise}, "A_SCORERISE"},
+ {{A_AttractChase}, "A_ATTRACTCHASE"},
+ {{A_DropMine}, "A_DROPMINE"},
+ {{A_FishJump}, "A_FISHJUMP"},
+ {{A_ThrownRing}, "A_THROWNRING"},
+ {{A_SetSolidSteam}, "A_SETSOLIDSTEAM"},
+ {{A_UnsetSolidSteam}, "A_UNSETSOLIDSTEAM"},
+ {{A_SignSpin}, "A_SIGNSPIN"},
+ {{A_SignPlayer}, "A_SIGNPLAYER"},
+ {{A_OverlayThink}, "A_OVERLAYTHINK"},
+ {{A_JetChase}, "A_JETCHASE"},
+ {{A_JetbThink}, "A_JETBTHINK"},
+ {{A_JetgThink}, "A_JETGTHINK"},
+ {{A_JetgShoot}, "A_JETGSHOOT"},
+ {{A_ShootBullet}, "A_SHOOTBULLET"},
+ {{A_MinusDigging}, "A_MINUSDIGGING"},
+ {{A_MinusPopup}, "A_MINUSPOPUP"},
+ {{A_MinusCheck}, "A_MINUSCHECK"},
+ {{A_ChickenCheck}, "A_CHICKENCHECK"},
+ {{A_MouseThink}, "A_MOUSETHINK"},
+ {{A_DetonChase}, "A_DETONCHASE"},
+ {{A_CapeChase}, "A_CAPECHASE"},
+ {{A_RotateSpikeBall}, "A_ROTATESPIKEBALL"},
+ {{A_SlingAppear}, "A_SLINGAPPEAR"},
+ {{A_UnidusBall}, "A_UNIDUSBALL"},
+ {{A_RockSpawn}, "A_ROCKSPAWN"},
+ {{A_SetFuse}, "A_SETFUSE"},
+ {{A_CrawlaCommanderThink}, "A_CRAWLACOMMANDERTHINK"},
+ {{A_SmokeTrailer}, "A_SMOKETRAILER"},
+ {{A_RingExplode}, "A_RINGEXPLODE"},
+ {{A_OldRingExplode}, "A_OLDRINGEXPLODE"},
+ {{A_MixUp}, "A_MIXUP"},
+ {{A_RecyclePowers}, "A_RECYCLEPOWERS"},
+ {{A_Boss1Chase}, "A_BOSS1CHASE"},
+ {{A_FocusTarget}, "A_FOCUSTARGET"},
+ {{A_Boss2Chase}, "A_BOSS2CHASE"},
+ {{A_Boss2Pogo}, "A_BOSS2POGO"},
+ {{A_BossZoom}, "A_BOSSZOOM"},
+ {{A_BossScream}, "A_BOSSSCREAM"},
+ {{A_Boss2TakeDamage}, "A_BOSS2TAKEDAMAGE"},
+ {{A_Boss7Chase}, "A_BOSS7CHASE"},
+ {{A_GoopSplat}, "A_GOOPSPLAT"},
+ {{A_Boss2PogoSFX}, "A_BOSS2POGOSFX"},
+ {{A_Boss2PogoTarget}, "A_BOSS2POGOTARGET"},
+ {{A_BossJetFume}, "A_BOSSJETFUME"},
+ {{A_EggmanBox}, "A_EGGMANBOX"},
+ {{A_TurretFire}, "A_TURRETFIRE"},
+ {{A_SuperTurretFire}, "A_SUPERTURRETFIRE"},
+ {{A_TurretStop}, "A_TURRETSTOP"},
+ {{A_JetJawRoam}, "A_JETJAWROAM"},
+ {{A_JetJawChomp}, "A_JETJAWCHOMP"},
+ {{A_PointyThink}, "A_POINTYTHINK"},
+ {{A_CheckBuddy}, "A_CHECKBUDDY"},
+ {{A_HoodFire}, "A_HOODFIRE"},
+ {{A_HoodThink}, "A_HOODTHINK"},
+ {{A_HoodFall}, "A_HOODFALL"},
+ {{A_ArrowBonks}, "A_ARROWBONKS"},
+ {{A_SnailerThink}, "A_SNAILERTHINK"},
+ {{A_SharpChase}, "A_SHARPCHASE"},
+ {{A_SharpSpin}, "A_SHARPSPIN"},
+ {{A_SharpDecel}, "A_SHARPDECEL"},
+ {{A_CrushstaceanWalk}, "A_CRUSHSTACEANWALK"},
+ {{A_CrushstaceanPunch}, "A_CRUSHSTACEANPUNCH"},
+ {{A_CrushclawAim}, "A_CRUSHCLAWAIM"},
+ {{A_CrushclawLaunch}, "A_CRUSHCLAWLAUNCH"},
+ {{A_VultureVtol}, "A_VULTUREVTOL"},
+ {{A_VultureCheck}, "A_VULTURECHECK"},
+ {{A_VultureHover}, "A_VULTUREHOVER"},
+ {{A_VultureBlast}, "A_VULTUREBLAST"},
+ {{A_VultureFly}, "A_VULTUREFLY"},
+ {{A_SkimChase}, "A_SKIMCHASE"},
+ {{A_1upThinker}, "A_1UPTHINKER"},
+ {{A_SkullAttack}, "A_SKULLATTACK"},
+ {{A_LobShot}, "A_LOBSHOT"},
+ {{A_FireShot}, "A_FIRESHOT"},
+ {{A_SuperFireShot}, "A_SUPERFIRESHOT"},
+ {{A_BossFireShot}, "A_BOSSFIRESHOT"},
+ {{A_Boss7FireMissiles}, "A_BOSS7FIREMISSILES"},
+ {{A_Boss1Laser}, "A_BOSS1LASER"},
+ {{A_Boss4Reverse}, "A_BOSS4REVERSE"},
+ {{A_Boss4SpeedUp}, "A_BOSS4SPEEDUP"},
+ {{A_Boss4Raise}, "A_BOSS4RAISE"},
+ {{A_SparkFollow}, "A_SPARKFOLLOW"},
+ {{A_BuzzFly}, "A_BUZZFLY"},
+ {{A_GuardChase}, "A_GUARDCHASE"},
+ {{A_EggShield}, "A_EGGSHIELD"},
+ {{A_SetReactionTime}, "A_SETREACTIONTIME"},
+ {{A_Boss1Spikeballs}, "A_BOSS1SPIKEBALLS"},
+ {{A_Boss3TakeDamage}, "A_BOSS3TAKEDAMAGE"},
+ {{A_Boss3Path}, "A_BOSS3PATH"},
+ {{A_Boss3ShockThink}, "A_BOSS3SHOCKTHINK"},
+ {{A_LinedefExecute}, "A_LINEDEFEXECUTE"},
+ {{A_PlaySeeSound}, "A_PLAYSEESOUND"},
+ {{A_PlayAttackSound}, "A_PLAYATTACKSOUND"},
+ {{A_PlayActiveSound}, "A_PLAYACTIVESOUND"},
+ {{A_SpawnObjectAbsolute}, "A_SPAWNOBJECTABSOLUTE"},
+ {{A_SpawnObjectRelative}, "A_SPAWNOBJECTRELATIVE"},
+ {{A_ChangeAngleRelative}, "A_CHANGEANGLERELATIVE"},
+ {{A_ChangeAngleAbsolute}, "A_CHANGEANGLEABSOLUTE"},
+ {{A_RollAngle}, "A_ROLLANGLE"},
+ {{A_ChangeRollAngleRelative},"A_CHANGEROLLANGLERELATIVE"},
+ {{A_ChangeRollAngleAbsolute},"A_CHANGEROLLANGLEABSOLUTE"},
+ {{A_PlaySound}, "A_PLAYSOUND"},
+ {{A_FindTarget}, "A_FINDTARGET"},
+ {{A_FindTracer}, "A_FINDTRACER"},
+ {{A_SetTics}, "A_SETTICS"},
+ {{A_SetRandomTics}, "A_SETRANDOMTICS"},
+ {{A_ChangeColorRelative}, "A_CHANGECOLORRELATIVE"},
+ {{A_ChangeColorAbsolute}, "A_CHANGECOLORABSOLUTE"},
+ {{A_Dye}, "A_DYE"},
+ {{A_MoveRelative}, "A_MOVERELATIVE"},
+ {{A_MoveAbsolute}, "A_MOVEABSOLUTE"},
+ {{A_Thrust}, "A_THRUST"},
+ {{A_ZThrust}, "A_ZTHRUST"},
+ {{A_SetTargetsTarget}, "A_SETTARGETSTARGET"},
+ {{A_SetObjectFlags}, "A_SETOBJECTFLAGS"},
+ {{A_SetObjectFlags2}, "A_SETOBJECTFLAGS2"},
+ {{A_RandomState}, "A_RANDOMSTATE"},
+ {{A_RandomStateRange}, "A_RANDOMSTATERANGE"},
+ {{A_DualAction}, "A_DUALACTION"},
+ {{A_RemoteAction}, "A_REMOTEACTION"},
+ {{A_ToggleFlameJet}, "A_TOGGLEFLAMEJET"},
+ {{A_OrbitNights}, "A_ORBITNIGHTS"},
+ {{A_GhostMe}, "A_GHOSTME"},
+ {{A_SetObjectState}, "A_SETOBJECTSTATE"},
+ {{A_SetObjectTypeState}, "A_SETOBJECTTYPESTATE"},
+ {{A_KnockBack}, "A_KNOCKBACK"},
+ {{A_PushAway}, "A_PUSHAWAY"},
+ {{A_RingDrain}, "A_RINGDRAIN"},
+ {{A_SplitShot}, "A_SPLITSHOT"},
+ {{A_MissileSplit}, "A_MISSILESPLIT"},
+ {{A_MultiShot}, "A_MULTISHOT"},
+ {{A_InstaLoop}, "A_INSTALOOP"},
+ {{A_Custom3DRotate}, "A_CUSTOM3DROTATE"},
+ {{A_SearchForPlayers}, "A_SEARCHFORPLAYERS"},
+ {{A_CheckRandom}, "A_CHECKRANDOM"},
+ {{A_CheckTargetRings}, "A_CHECKTARGETRINGS"},
+ {{A_CheckRings}, "A_CHECKRINGS"},
+ {{A_CheckTotalRings}, "A_CHECKTOTALRINGS"},
+ {{A_CheckHealth}, "A_CHECKHEALTH"},
+ {{A_CheckRange}, "A_CHECKRANGE"},
+ {{A_CheckHeight}, "A_CHECKHEIGHT"},
+ {{A_CheckTrueRange}, "A_CHECKTRUERANGE"},
+ {{A_CheckThingCount}, "A_CHECKTHINGCOUNT"},
+ {{A_CheckAmbush}, "A_CHECKAMBUSH"},
+ {{A_CheckCustomValue}, "A_CHECKCUSTOMVALUE"},
+ {{A_CheckCusValMemo}, "A_CHECKCUSVALMEMO"},
+ {{A_SetCustomValue}, "A_SETCUSTOMVALUE"},
+ {{A_UseCusValMemo}, "A_USECUSVALMEMO"},
+ {{A_RelayCustomValue}, "A_RELAYCUSTOMVALUE"},
+ {{A_CusValAction}, "A_CUSVALACTION"},
+ {{A_ForceStop}, "A_FORCESTOP"},
+ {{A_ForceWin}, "A_FORCEWIN"},
+ {{A_SpikeRetract}, "A_SPIKERETRACT"},
+ {{A_InfoState}, "A_INFOSTATE"},
+ {{A_Repeat}, "A_REPEAT"},
+ {{A_SetScale}, "A_SETSCALE"},
+ {{A_RemoteDamage}, "A_REMOTEDAMAGE"},
+ {{A_HomingChase}, "A_HOMINGCHASE"},
+ {{A_TrapShot}, "A_TRAPSHOT"},
+ {{A_VileTarget}, "A_VILETARGET"},
+ {{A_VileAttack}, "A_VILEATTACK"},
+ {{A_VileFire}, "A_VILEFIRE"},
+ {{A_BrakChase}, "A_BRAKCHASE"},
+ {{A_BrakFireShot}, "A_BRAKFIRESHOT"},
+ {{A_BrakLobShot}, "A_BRAKLOBSHOT"},
+ {{A_NapalmScatter}, "A_NAPALMSCATTER"},
+ {{A_SpawnFreshCopy}, "A_SPAWNFRESHCOPY"},
+ {{A_FlickySpawn}, "A_FLICKYSPAWN"},
+ {{A_FlickyCenter}, "A_FLICKYCENTER"},
+ {{A_FlickyAim}, "A_FLICKYAIM"},
+ {{A_FlickyFly}, "A_FLICKYFLY"},
+ {{A_FlickySoar}, "A_FLICKYSOAR"},
+ {{A_FlickyCoast}, "A_FLICKYCOAST"},
+ {{A_FlickyHop}, "A_FLICKYHOP"},
+ {{A_FlickyFlounder}, "A_FLICKYFLOUNDER"},
+ {{A_FlickyCheck}, "A_FLICKYCHECK"},
+ {{A_FlickyHeightCheck}, "A_FLICKYHEIGHTCHECK"},
+ {{A_FlickyFlutter}, "A_FLICKYFLUTTER"},
+ {{A_FlameParticle}, "A_FLAMEPARTICLE"},
+ {{A_FadeOverlay}, "A_FADEOVERLAY"},
+ {{A_Boss5Jump}, "A_BOSS5JUMP"},
+ {{A_LightBeamReset}, "A_LIGHTBEAMRESET"},
+ {{A_MineExplode}, "A_MINEEXPLODE"},
+ {{A_MineRange}, "A_MINERANGE"},
+ {{A_ConnectToGround}, "A_CONNECTTOGROUND"},
+ {{A_SpawnParticleRelative}, "A_SPAWNPARTICLERELATIVE"},
+ {{A_MultiShotDist}, "A_MULTISHOTDIST"},
+ {{A_WhoCaresIfYourSonIsABee},"A_WHOCARESIFYOURSONISABEE"},
+ {{A_ParentTriesToSleep}, "A_PARENTTRIESTOSLEEP"},
+ {{A_CryingToMomma}, "A_CRYINGTOMOMMA"},
+ {{A_CheckFlags2}, "A_CHECKFLAGS2"},
+ {{A_Boss5FindWaypoint}, "A_BOSS5FINDWAYPOINT"},
+ {{A_DoNPCSkid}, "A_DONPCSKID"},
+ {{A_DoNPCPain}, "A_DONPCPAIN"},
+ {{A_PrepareRepeat}, "A_PREPAREREPEAT"},
+ {{A_Boss5ExtraRepeat}, "A_BOSS5EXTRAREPEAT"},
+ {{A_Boss5Calm}, "A_BOSS5CALM"},
+ {{A_Boss5CheckOnGround}, "A_BOSS5CHECKONGROUND"},
+ {{A_Boss5CheckFalling}, "A_BOSS5CHECKFALLING"},
+ {{A_Boss5PinchShot}, "A_BOSS5PINCHSHOT"},
+ {{A_Boss5MakeItRain}, "A_BOSS5MAKEITRAIN"},
+ {{A_Boss5MakeJunk}, "A_BOSS5MAKEJUNK"},
+ {{A_LookForBetter}, "A_LOOKFORBETTER"},
+ {{A_Boss5BombExplode}, "A_BOSS5BOMBEXPLODE"},
+ {{A_DustDevilThink}, "A_DUSTDEVILTHINK"},
+ {{A_TNTExplode}, "A_TNTEXPLODE"},
+ {{A_DebrisRandom}, "A_DEBRISRANDOM"},
+ {{A_TrainCameo}, "A_TRAINCAMEO"},
+ {{A_TrainCameo2}, "A_TRAINCAMEO2"},
+ {{A_CanarivoreGas}, "A_CANARIVOREGAS"},
+ {{A_KillSegments}, "A_KILLSEGMENTS"},
+ {{A_SnapperSpawn}, "A_SNAPPERSPAWN"},
+ {{A_SnapperThinker}, "A_SNAPPERTHINKER"},
+ {{A_SaloonDoorSpawn}, "A_SALOONDOORSPAWN"},
+ {{A_MinecartSparkThink}, "A_MINECARTSPARKTHINK"},
+ {{A_ModuloToState}, "A_MODULOTOSTATE"},
+ {{A_LavafallRocks}, "A_LAVAFALLROCKS"},
+ {{A_LavafallLava}, "A_LAVAFALLLAVA"},
+ {{A_FallingLavaCheck}, "A_FALLINGLAVACHECK"},
+ {{A_FireShrink}, "A_FIRESHRINK"},
+ {{A_SpawnPterabytes}, "A_SPAWNPTERABYTES"},
+ {{A_PterabyteHover}, "A_PTERABYTEHOVER"},
+ {{A_RolloutSpawn}, "A_ROLLOUTSPAWN"},
+ {{A_RolloutRock}, "A_ROLLOUTROCK"},
+ {{A_DragonbomberSpawn}, "A_DRAGONBOMBERSPAWN"},
+ {{A_DragonWing}, "A_DRAGONWING"},
+ {{A_DragonSegment}, "A_DRAGONSEGMENT"},
+ {{A_ChangeHeight}, "A_CHANGEHEIGHT"},
+ {{NULL}, "NONE"},
+
+ // This NULL entry must be the last in the list
+ {{NULL}, NULL},
+};
+
+////////////////////////////////////////////////////////////////////////////////
+// CRAZY LIST OF STATE NAMES AND ALL FROM HERE DOWN
+// TODO: Make this all a seperate file or something, like part of info.c??
+// TODO: Read the list from a text lump in a WAD as necessary instead
+// or something, don't just keep it all in memory like this.
+// TODO: Make the lists public so we can start using actual mobj
+// and state names in warning and error messages! :D
+
+// RegEx to generate this from info.h: ^\tS_([^,]+), --> \t"S_\1",
+// I am leaving the prefixes solely for clarity to programmers,
+// because sadly no one remembers this place while searching for full state names.
+const char *const STATE_LIST[] = { // array length left dynamic for sanity testing later.
+ "S_NULL",
+ "S_UNKNOWN",
+ "S_INVISIBLE", // state for invisible sprite
+
+ "S_SPAWNSTATE",
+ "S_SEESTATE",
+ "S_MELEESTATE",
+ "S_MISSILESTATE",
+ "S_DEATHSTATE",
+ "S_XDEATHSTATE",
+ "S_RAISESTATE",
+
+ // Thok
+ "S_THOK",
+
+ // Player
+ "S_PLAY_STND",
+ "S_PLAY_WAIT",
+ "S_PLAY_WALK",
+ "S_PLAY_SKID",
+ "S_PLAY_RUN",
+ "S_PLAY_DASH",
+ "S_PLAY_PAIN",
+ "S_PLAY_STUN",
+ "S_PLAY_DEAD",
+ "S_PLAY_DRWN",
+ "S_PLAY_ROLL",
+ "S_PLAY_GASP",
+ "S_PLAY_JUMP",
+ "S_PLAY_SPRING",
+ "S_PLAY_FALL",
+ "S_PLAY_EDGE",
+ "S_PLAY_RIDE",
+
+ // CA2_SPINDASH
+ "S_PLAY_SPINDASH",
+
+ // CA_FLY/SWIM
+ "S_PLAY_FLY",
+ "S_PLAY_SWIM",
+ "S_PLAY_FLY_TIRED",
+
+ // CA_GLIDEANDCLIMB
+ "S_PLAY_GLIDE",
+ "S_PLAY_GLIDE_LANDING",
+ "S_PLAY_CLING",
+ "S_PLAY_CLIMB",
+
+ // CA_FLOAT/CA_SLOWFALL
+ "S_PLAY_FLOAT",
+ "S_PLAY_FLOAT_RUN",
+
+ // CA_BOUNCE
+ "S_PLAY_BOUNCE",
+ "S_PLAY_BOUNCE_LANDING",
+
+ // CA2_GUNSLINGER
+ "S_PLAY_FIRE",
+ "S_PLAY_FIRE_FINISH",
+
+ // CA_TWINSPIN
+ "S_PLAY_TWINSPIN",
+
+ // CA2_MELEE
+ "S_PLAY_MELEE",
+ "S_PLAY_MELEE_FINISH",
+ "S_PLAY_MELEE_LANDING",
+
+ // SF_SUPER
+ "S_PLAY_SUPER_TRANS1",
+ "S_PLAY_SUPER_TRANS2",
+ "S_PLAY_SUPER_TRANS3",
+ "S_PLAY_SUPER_TRANS4",
+ "S_PLAY_SUPER_TRANS5",
+ "S_PLAY_SUPER_TRANS6",
+
+ // technically the player goes here but it's an infinite tic state
+ "S_OBJPLACE_DUMMY",
+
+ // 1-Up Box Sprites overlay (uses player sprite)
+ "S_PLAY_BOX1",
+ "S_PLAY_BOX2",
+ "S_PLAY_ICON1",
+ "S_PLAY_ICON2",
+ "S_PLAY_ICON3",
+
+ // Level end sign overlay (uses player sprite)
+ "S_PLAY_SIGN",
+
+ // NiGHTS character (uses player sprite)
+ "S_PLAY_NIGHTS_TRANS1",
+ "S_PLAY_NIGHTS_TRANS2",
+ "S_PLAY_NIGHTS_TRANS3",
+ "S_PLAY_NIGHTS_TRANS4",
+ "S_PLAY_NIGHTS_TRANS5",
+ "S_PLAY_NIGHTS_TRANS6",
+ "S_PLAY_NIGHTS_STAND",
+ "S_PLAY_NIGHTS_FLOAT",
+ "S_PLAY_NIGHTS_FLY",
+ "S_PLAY_NIGHTS_DRILL",
+ "S_PLAY_NIGHTS_STUN",
+ "S_PLAY_NIGHTS_PULL",
+ "S_PLAY_NIGHTS_ATTACK",
+
+ // c:
+ "S_TAILSOVERLAY_STAND",
+ "S_TAILSOVERLAY_0DEGREES",
+ "S_TAILSOVERLAY_PLUS30DEGREES",
+ "S_TAILSOVERLAY_PLUS60DEGREES",
+ "S_TAILSOVERLAY_MINUS30DEGREES",
+ "S_TAILSOVERLAY_MINUS60DEGREES",
+ "S_TAILSOVERLAY_RUN",
+ "S_TAILSOVERLAY_FLY",
+ "S_TAILSOVERLAY_TIRE",
+ "S_TAILSOVERLAY_PAIN",
+ "S_TAILSOVERLAY_GASP",
+ "S_TAILSOVERLAY_EDGE",
+ "S_TAILSOVERLAY_DASH",
+
+ // [:
+ "S_JETFUMEFLASH",
+
+ // Blue Crawla
+ "S_POSS_STND",
+ "S_POSS_RUN1",
+ "S_POSS_RUN2",
+ "S_POSS_RUN3",
+ "S_POSS_RUN4",
+ "S_POSS_RUN5",
+ "S_POSS_RUN6",
+
+ // Red Crawla
+ "S_SPOS_STND",
+ "S_SPOS_RUN1",
+ "S_SPOS_RUN2",
+ "S_SPOS_RUN3",
+ "S_SPOS_RUN4",
+ "S_SPOS_RUN5",
+ "S_SPOS_RUN6",
+
+ // Greenflower Fish
+ "S_FISH1",
+ "S_FISH2",
+ "S_FISH3",
+ "S_FISH4",
+
+ // Buzz (Gold)
+ "S_BUZZLOOK1",
+ "S_BUZZLOOK2",
+ "S_BUZZFLY1",
+ "S_BUZZFLY2",
+
+ // Buzz (Red)
+ "S_RBUZZLOOK1",
+ "S_RBUZZLOOK2",
+ "S_RBUZZFLY1",
+ "S_RBUZZFLY2",
+
+ // Jetty-Syn Bomber
+ "S_JETBLOOK1",
+ "S_JETBLOOK2",
+ "S_JETBZOOM1",
+ "S_JETBZOOM2",
+
+ // Jetty-Syn Gunner
+ "S_JETGLOOK1",
+ "S_JETGLOOK2",
+ "S_JETGZOOM1",
+ "S_JETGZOOM2",
+ "S_JETGSHOOT1",
+ "S_JETGSHOOT2",
+
+ // Crawla Commander
+ "S_CCOMMAND1",
+ "S_CCOMMAND2",
+ "S_CCOMMAND3",
+ "S_CCOMMAND4",
+
+ // Deton
+ "S_DETON1",
+ "S_DETON2",
+ "S_DETON3",
+ "S_DETON4",
+ "S_DETON5",
+ "S_DETON6",
+ "S_DETON7",
+ "S_DETON8",
+ "S_DETON9",
+ "S_DETON10",
+ "S_DETON11",
+ "S_DETON12",
+ "S_DETON13",
+ "S_DETON14",
+ "S_DETON15",
+
+ // Skim Mine Dropper
+ "S_SKIM1",
+ "S_SKIM2",
+ "S_SKIM3",
+ "S_SKIM4",
+
+ // THZ Turret
+ "S_TURRET",
+ "S_TURRETFIRE",
+ "S_TURRETSHOCK1",
+ "S_TURRETSHOCK2",
+ "S_TURRETSHOCK3",
+ "S_TURRETSHOCK4",
+ "S_TURRETSHOCK5",
+ "S_TURRETSHOCK6",
+ "S_TURRETSHOCK7",
+ "S_TURRETSHOCK8",
+ "S_TURRETSHOCK9",
+
+ // Popup Turret
+ "S_TURRETLOOK",
+ "S_TURRETSEE",
+ "S_TURRETPOPUP1",
+ "S_TURRETPOPUP2",
+ "S_TURRETPOPUP3",
+ "S_TURRETPOPUP4",
+ "S_TURRETPOPUP5",
+ "S_TURRETPOPUP6",
+ "S_TURRETPOPUP7",
+ "S_TURRETPOPUP8",
+ "S_TURRETSHOOT",
+ "S_TURRETPOPDOWN1",
+ "S_TURRETPOPDOWN2",
+ "S_TURRETPOPDOWN3",
+ "S_TURRETPOPDOWN4",
+ "S_TURRETPOPDOWN5",
+ "S_TURRETPOPDOWN6",
+ "S_TURRETPOPDOWN7",
+ "S_TURRETPOPDOWN8",
+
+ // Spincushion
+ "S_SPINCUSHION_LOOK",
+ "S_SPINCUSHION_CHASE1",
+ "S_SPINCUSHION_CHASE2",
+ "S_SPINCUSHION_CHASE3",
+ "S_SPINCUSHION_CHASE4",
+ "S_SPINCUSHION_AIM1",
+ "S_SPINCUSHION_AIM2",
+ "S_SPINCUSHION_AIM3",
+ "S_SPINCUSHION_AIM4",
+ "S_SPINCUSHION_AIM5",
+ "S_SPINCUSHION_SPIN1",
+ "S_SPINCUSHION_SPIN2",
+ "S_SPINCUSHION_SPIN3",
+ "S_SPINCUSHION_SPIN4",
+ "S_SPINCUSHION_STOP1",
+ "S_SPINCUSHION_STOP2",
+ "S_SPINCUSHION_STOP3",
+ "S_SPINCUSHION_STOP4",
+
+ // Crushstacean
+ "S_CRUSHSTACEAN_ROAM1",
+ "S_CRUSHSTACEAN_ROAM2",
+ "S_CRUSHSTACEAN_ROAM3",
+ "S_CRUSHSTACEAN_ROAM4",
+ "S_CRUSHSTACEAN_ROAMPAUSE",
+ "S_CRUSHSTACEAN_PUNCH1",
+ "S_CRUSHSTACEAN_PUNCH2",
+ "S_CRUSHCLAW_AIM",
+ "S_CRUSHCLAW_OUT",
+ "S_CRUSHCLAW_STAY",
+ "S_CRUSHCLAW_IN",
+ "S_CRUSHCLAW_WAIT",
+ "S_CRUSHCHAIN",
+
+ // Banpyura
+ "S_BANPYURA_ROAM1",
+ "S_BANPYURA_ROAM2",
+ "S_BANPYURA_ROAM3",
+ "S_BANPYURA_ROAM4",
+ "S_BANPYURA_ROAMPAUSE",
+ "S_CDIAG1",
+ "S_CDIAG2",
+ "S_CDIAG3",
+ "S_CDIAG4",
+ "S_CDIAG5",
+ "S_CDIAG6",
+ "S_CDIAG7",
+ "S_CDIAG8",
+
+ // Jet Jaw
+ "S_JETJAW_ROAM1",
+ "S_JETJAW_ROAM2",
+ "S_JETJAW_ROAM3",
+ "S_JETJAW_ROAM4",
+ "S_JETJAW_ROAM5",
+ "S_JETJAW_ROAM6",
+ "S_JETJAW_ROAM7",
+ "S_JETJAW_ROAM8",
+ "S_JETJAW_CHOMP1",
+ "S_JETJAW_CHOMP2",
+ "S_JETJAW_CHOMP3",
+ "S_JETJAW_CHOMP4",
+ "S_JETJAW_CHOMP5",
+ "S_JETJAW_CHOMP6",
+ "S_JETJAW_CHOMP7",
+ "S_JETJAW_CHOMP8",
+ "S_JETJAW_CHOMP9",
+ "S_JETJAW_CHOMP10",
+ "S_JETJAW_CHOMP11",
+ "S_JETJAW_CHOMP12",
+ "S_JETJAW_CHOMP13",
+ "S_JETJAW_CHOMP14",
+ "S_JETJAW_CHOMP15",
+ "S_JETJAW_CHOMP16",
+ "S_JETJAW_SOUND",
+
+ // Snailer
+ "S_SNAILER1",
+ "S_SNAILER_FLICKY",
+
+ // Vulture
+ "S_VULTURE_STND",
+ "S_VULTURE_DRIFT",
+ "S_VULTURE_ZOOM1",
+ "S_VULTURE_ZOOM2",
+ "S_VULTURE_STUNNED",
+
+ // Pointy
+ "S_POINTY1",
+ "S_POINTYBALL1",
+
+ // Robo-Hood
+ "S_ROBOHOOD_LOOK",
+ "S_ROBOHOOD_STAND",
+ "S_ROBOHOOD_FIRE1",
+ "S_ROBOHOOD_FIRE2",
+ "S_ROBOHOOD_JUMP1",
+ "S_ROBOHOOD_JUMP2",
+ "S_ROBOHOOD_JUMP3",
+
+ // Castlebot Facestabber
+ "S_FACESTABBER_STND1",
+ "S_FACESTABBER_STND2",
+ "S_FACESTABBER_STND3",
+ "S_FACESTABBER_STND4",
+ "S_FACESTABBER_STND5",
+ "S_FACESTABBER_STND6",
+ "S_FACESTABBER_CHARGE1",
+ "S_FACESTABBER_CHARGE2",
+ "S_FACESTABBER_CHARGE3",
+ "S_FACESTABBER_CHARGE4",
+ "S_FACESTABBER_PAIN",
+ "S_FACESTABBER_DIE1",
+ "S_FACESTABBER_DIE2",
+ "S_FACESTABBER_DIE3",
+ "S_FACESTABBERSPEAR",
+
+ // Egg Guard
+ "S_EGGGUARD_STND",
+ "S_EGGGUARD_WALK1",
+ "S_EGGGUARD_WALK2",
+ "S_EGGGUARD_WALK3",
+ "S_EGGGUARD_WALK4",
+ "S_EGGGUARD_MAD1",
+ "S_EGGGUARD_MAD2",
+ "S_EGGGUARD_MAD3",
+ "S_EGGGUARD_RUN1",
+ "S_EGGGUARD_RUN2",
+ "S_EGGGUARD_RUN3",
+ "S_EGGGUARD_RUN4",
+
+ // Egg Shield for Egg Guard
+ "S_EGGSHIELD",
+ "S_EGGSHIELDBREAK",
+
+ // Green Snapper
+ "S_SNAPPER_SPAWN",
+ "S_SNAPPER_SPAWN2",
+ "S_GSNAPPER_STND",
+ "S_GSNAPPER1",
+ "S_GSNAPPER2",
+ "S_GSNAPPER3",
+ "S_GSNAPPER4",
+ "S_SNAPPER_XPLD",
+ "S_SNAPPER_LEG",
+ "S_SNAPPER_LEGRAISE",
+ "S_SNAPPER_HEAD",
+
+ // Minus
+ "S_MINUS_INIT",
+ "S_MINUS_STND",
+ "S_MINUS_DIGGING1",
+ "S_MINUS_DIGGING2",
+ "S_MINUS_DIGGING3",
+ "S_MINUS_DIGGING4",
+ "S_MINUS_BURST0",
+ "S_MINUS_BURST1",
+ "S_MINUS_BURST2",
+ "S_MINUS_BURST3",
+ "S_MINUS_BURST4",
+ "S_MINUS_BURST5",
+ "S_MINUS_POPUP",
+ "S_MINUS_AERIAL1",
+ "S_MINUS_AERIAL2",
+ "S_MINUS_AERIAL3",
+ "S_MINUS_AERIAL4",
+
+ // Minus dirt
+ "S_MINUSDIRT1",
+ "S_MINUSDIRT2",
+ "S_MINUSDIRT3",
+ "S_MINUSDIRT4",
+ "S_MINUSDIRT5",
+ "S_MINUSDIRT6",
+ "S_MINUSDIRT7",
+
+ // Spring Shell
+ "S_SSHELL_STND",
+ "S_SSHELL_RUN1",
+ "S_SSHELL_RUN2",
+ "S_SSHELL_RUN3",
+ "S_SSHELL_RUN4",
+ "S_SSHELL_SPRING1",
+ "S_SSHELL_SPRING2",
+ "S_SSHELL_SPRING3",
+ "S_SSHELL_SPRING4",
+
+ // Spring Shell (yellow)
+ "S_YSHELL_STND",
+ "S_YSHELL_RUN1",
+ "S_YSHELL_RUN2",
+ "S_YSHELL_RUN3",
+ "S_YSHELL_RUN4",
+ "S_YSHELL_SPRING1",
+ "S_YSHELL_SPRING2",
+ "S_YSHELL_SPRING3",
+ "S_YSHELL_SPRING4",
+
+ // Unidus
+ "S_UNIDUS_STND",
+ "S_UNIDUS_RUN",
+ "S_UNIDUS_BALL",
+
+ // Canarivore
+ "S_CANARIVORE_LOOK",
+ "S_CANARIVORE_AWAKEN1",
+ "S_CANARIVORE_AWAKEN2",
+ "S_CANARIVORE_AWAKEN3",
+ "S_CANARIVORE_GAS1",
+ "S_CANARIVORE_GAS2",
+ "S_CANARIVORE_GAS3",
+ "S_CANARIVORE_GAS4",
+ "S_CANARIVORE_GAS5",
+ "S_CANARIVORE_GASREPEAT",
+ "S_CANARIVORE_CLOSE1",
+ "S_CANARIVORE_CLOSE2",
+ "S_CANARIVOREGAS_1",
+ "S_CANARIVOREGAS_2",
+ "S_CANARIVOREGAS_3",
+ "S_CANARIVOREGAS_4",
+ "S_CANARIVOREGAS_5",
+ "S_CANARIVOREGAS_6",
+ "S_CANARIVOREGAS_7",
+ "S_CANARIVOREGAS_8",
+
+ // Pyre Fly
+ "S_PYREFLY_FLY",
+ "S_PYREFLY_BURN",
+ "S_PYREFIRE1",
+ "S_PYREFIRE2",
+
+ // Pterabyte
+ "S_PTERABYTESPAWNER",
+ "S_PTERABYTEWAYPOINT",
+ "S_PTERABYTE_FLY1",
+ "S_PTERABYTE_FLY2",
+ "S_PTERABYTE_FLY3",
+ "S_PTERABYTE_FLY4",
+ "S_PTERABYTE_SWOOPDOWN",
+ "S_PTERABYTE_SWOOPUP",
+
+ // Dragonbomber
+ "S_DRAGONBOMBER",
+ "S_DRAGONWING1",
+ "S_DRAGONWING2",
+ "S_DRAGONWING3",
+ "S_DRAGONWING4",
+ "S_DRAGONTAIL_LOADED",
+ "S_DRAGONTAIL_EMPTY",
+ "S_DRAGONTAIL_EMPTYLOOP",
+ "S_DRAGONTAIL_RELOAD",
+ "S_DRAGONMINE",
+ "S_DRAGONMINE_LAND1",
+ "S_DRAGONMINE_LAND2",
+ "S_DRAGONMINE_SLOWFLASH1",
+ "S_DRAGONMINE_SLOWFLASH2",
+ "S_DRAGONMINE_SLOWLOOP",
+ "S_DRAGONMINE_FASTFLASH1",
+ "S_DRAGONMINE_FASTFLASH2",
+ "S_DRAGONMINE_FASTLOOP",
+
+ // Boss Explosion
+ "S_BOSSEXPLODE",
+
+ // S3&K Boss Explosion
+ "S_SONIC3KBOSSEXPLOSION1",
+ "S_SONIC3KBOSSEXPLOSION2",
+ "S_SONIC3KBOSSEXPLOSION3",
+ "S_SONIC3KBOSSEXPLOSION4",
+ "S_SONIC3KBOSSEXPLOSION5",
+ "S_SONIC3KBOSSEXPLOSION6",
+
+ "S_JETFUME1",
+
+ // Boss 1
+ "S_EGGMOBILE_STND",
+ "S_EGGMOBILE_ROFL",
+ "S_EGGMOBILE_LATK1",
+ "S_EGGMOBILE_LATK2",
+ "S_EGGMOBILE_LATK3",
+ "S_EGGMOBILE_LATK4",
+ "S_EGGMOBILE_LATK5",
+ "S_EGGMOBILE_LATK6",
+ "S_EGGMOBILE_LATK7",
+ "S_EGGMOBILE_LATK8",
+ "S_EGGMOBILE_LATK9",
+ "S_EGGMOBILE_RATK1",
+ "S_EGGMOBILE_RATK2",
+ "S_EGGMOBILE_RATK3",
+ "S_EGGMOBILE_RATK4",
+ "S_EGGMOBILE_RATK5",
+ "S_EGGMOBILE_RATK6",
+ "S_EGGMOBILE_RATK7",
+ "S_EGGMOBILE_RATK8",
+ "S_EGGMOBILE_RATK9",
+ "S_EGGMOBILE_PANIC1",
+ "S_EGGMOBILE_PANIC2",
+ "S_EGGMOBILE_PANIC3",
+ "S_EGGMOBILE_PANIC4",
+ "S_EGGMOBILE_PANIC5",
+ "S_EGGMOBILE_PANIC6",
+ "S_EGGMOBILE_PANIC7",
+ "S_EGGMOBILE_PANIC8",
+ "S_EGGMOBILE_PANIC9",
+ "S_EGGMOBILE_PANIC10",
+ "S_EGGMOBILE_PANIC11",
+ "S_EGGMOBILE_PANIC12",
+ "S_EGGMOBILE_PANIC13",
+ "S_EGGMOBILE_PANIC14",
+ "S_EGGMOBILE_PANIC15",
+ "S_EGGMOBILE_PAIN",
+ "S_EGGMOBILE_PAIN2",
+ "S_EGGMOBILE_DIE1",
+ "S_EGGMOBILE_DIE2",
+ "S_EGGMOBILE_DIE3",
+ "S_EGGMOBILE_DIE4",
+ "S_EGGMOBILE_FLEE1",
+ "S_EGGMOBILE_FLEE2",
+ "S_EGGMOBILE_BALL",
+ "S_EGGMOBILE_TARGET",
+
+ "S_BOSSEGLZ1",
+ "S_BOSSEGLZ2",
+
+ // Boss 2
+ "S_EGGMOBILE2_STND",
+ "S_EGGMOBILE2_POGO1",
+ "S_EGGMOBILE2_POGO2",
+ "S_EGGMOBILE2_POGO3",
+ "S_EGGMOBILE2_POGO4",
+ "S_EGGMOBILE2_POGO5",
+ "S_EGGMOBILE2_POGO6",
+ "S_EGGMOBILE2_POGO7",
+ "S_EGGMOBILE2_PAIN",
+ "S_EGGMOBILE2_PAIN2",
+ "S_EGGMOBILE2_DIE1",
+ "S_EGGMOBILE2_DIE2",
+ "S_EGGMOBILE2_DIE3",
+ "S_EGGMOBILE2_DIE4",
+ "S_EGGMOBILE2_FLEE1",
+ "S_EGGMOBILE2_FLEE2",
+
+ "S_BOSSTANK1",
+ "S_BOSSTANK2",
+ "S_BOSSSPIGOT",
+
+ // Boss 2 Goop
+ "S_GOOP1",
+ "S_GOOP2",
+ "S_GOOP3",
+ "S_GOOPTRAIL",
+
+ // Boss 3
+ "S_EGGMOBILE3_STND",
+ "S_EGGMOBILE3_SHOCK",
+ "S_EGGMOBILE3_ATK1",
+ "S_EGGMOBILE3_ATK2",
+ "S_EGGMOBILE3_ATK3A",
+ "S_EGGMOBILE3_ATK3B",
+ "S_EGGMOBILE3_ATK3C",
+ "S_EGGMOBILE3_ATK3D",
+ "S_EGGMOBILE3_ATK4",
+ "S_EGGMOBILE3_ATK5",
+ "S_EGGMOBILE3_ROFL",
+ "S_EGGMOBILE3_PAIN",
+ "S_EGGMOBILE3_PAIN2",
+ "S_EGGMOBILE3_DIE1",
+ "S_EGGMOBILE3_DIE2",
+ "S_EGGMOBILE3_DIE3",
+ "S_EGGMOBILE3_DIE4",
+ "S_EGGMOBILE3_FLEE1",
+ "S_EGGMOBILE3_FLEE2",
+
+ // Boss 3 Pinch
+ "S_FAKEMOBILE_INIT",
+ "S_FAKEMOBILE",
+ "S_FAKEMOBILE_ATK1",
+ "S_FAKEMOBILE_ATK2",
+ "S_FAKEMOBILE_ATK3A",
+ "S_FAKEMOBILE_ATK3B",
+ "S_FAKEMOBILE_ATK3C",
+ "S_FAKEMOBILE_ATK3D",
+ "S_FAKEMOBILE_DIE1",
+ "S_FAKEMOBILE_DIE2",
+
+ "S_BOSSSEBH1",
+ "S_BOSSSEBH2",
+
+ // Boss 3 Shockwave
+ "S_SHOCKWAVE1",
+ "S_SHOCKWAVE2",
+
+ // Boss 4
+ "S_EGGMOBILE4_STND",
+ "S_EGGMOBILE4_LATK1",
+ "S_EGGMOBILE4_LATK2",
+ "S_EGGMOBILE4_LATK3",
+ "S_EGGMOBILE4_LATK4",
+ "S_EGGMOBILE4_LATK5",
+ "S_EGGMOBILE4_LATK6",
+ "S_EGGMOBILE4_RATK1",
+ "S_EGGMOBILE4_RATK2",
+ "S_EGGMOBILE4_RATK3",
+ "S_EGGMOBILE4_RATK4",
+ "S_EGGMOBILE4_RATK5",
+ "S_EGGMOBILE4_RATK6",
+ "S_EGGMOBILE4_RAISE1",
+ "S_EGGMOBILE4_RAISE2",
+ "S_EGGMOBILE4_PAIN1",
+ "S_EGGMOBILE4_PAIN2",
+ "S_EGGMOBILE4_DIE1",
+ "S_EGGMOBILE4_DIE2",
+ "S_EGGMOBILE4_DIE3",
+ "S_EGGMOBILE4_DIE4",
+ "S_EGGMOBILE4_FLEE1",
+ "S_EGGMOBILE4_FLEE2",
+ "S_EGGMOBILE4_MACE",
+ "S_EGGMOBILE4_MACE_DIE1",
+ "S_EGGMOBILE4_MACE_DIE2",
+ "S_EGGMOBILE4_MACE_DIE3",
+
+ // Boss 4 jet flame
+ "S_JETFLAME",
+
+ // Boss 4 Spectator Eggrobo
+ "S_EGGROBO1_STND",
+ "S_EGGROBO1_BSLAP1",
+ "S_EGGROBO1_BSLAP2",
+ "S_EGGROBO1_PISSED",
+
+ // Boss 4 Spectator Eggrobo jet flame
+ "S_EGGROBOJET",
+
+ // Boss 5
+ "S_FANG_SETUP",
+ "S_FANG_INTRO0",
+ "S_FANG_INTRO1",
+ "S_FANG_INTRO2",
+ "S_FANG_INTRO3",
+ "S_FANG_INTRO4",
+ "S_FANG_INTRO5",
+ "S_FANG_INTRO6",
+ "S_FANG_INTRO7",
+ "S_FANG_INTRO8",
+ "S_FANG_INTRO9",
+ "S_FANG_INTRO10",
+ "S_FANG_INTRO11",
+ "S_FANG_INTRO12",
+ "S_FANG_CLONE1",
+ "S_FANG_CLONE2",
+ "S_FANG_CLONE3",
+ "S_FANG_CLONE4",
+ "S_FANG_IDLE0",
+ "S_FANG_IDLE1",
+ "S_FANG_IDLE2",
+ "S_FANG_IDLE3",
+ "S_FANG_IDLE4",
+ "S_FANG_IDLE5",
+ "S_FANG_IDLE6",
+ "S_FANG_IDLE7",
+ "S_FANG_IDLE8",
+ "S_FANG_PAIN1",
+ "S_FANG_PAIN2",
+ "S_FANG_PATHINGSTART1",
+ "S_FANG_PATHINGSTART2",
+ "S_FANG_PATHING",
+ "S_FANG_BOUNCE1",
+ "S_FANG_BOUNCE2",
+ "S_FANG_BOUNCE3",
+ "S_FANG_BOUNCE4",
+ "S_FANG_FALL1",
+ "S_FANG_FALL2",
+ "S_FANG_CHECKPATH1",
+ "S_FANG_CHECKPATH2",
+ "S_FANG_PATHINGCONT1",
+ "S_FANG_PATHINGCONT2",
+ "S_FANG_PATHINGCONT3",
+ "S_FANG_SKID1",
+ "S_FANG_SKID2",
+ "S_FANG_SKID3",
+ "S_FANG_CHOOSEATTACK",
+ "S_FANG_FIRESTART1",
+ "S_FANG_FIRESTART2",
+ "S_FANG_FIRE1",
+ "S_FANG_FIRE2",
+ "S_FANG_FIRE3",
+ "S_FANG_FIRE4",
+ "S_FANG_FIREREPEAT",
+ "S_FANG_LOBSHOT0",
+ "S_FANG_LOBSHOT1",
+ "S_FANG_LOBSHOT2",
+ "S_FANG_WAIT1",
+ "S_FANG_WAIT2",
+ "S_FANG_WALLHIT",
+ "S_FANG_PINCHPATHINGSTART1",
+ "S_FANG_PINCHPATHINGSTART2",
+ "S_FANG_PINCHPATHING",
+ "S_FANG_PINCHBOUNCE0",
+ "S_FANG_PINCHBOUNCE1",
+ "S_FANG_PINCHBOUNCE2",
+ "S_FANG_PINCHBOUNCE3",
+ "S_FANG_PINCHBOUNCE4",
+ "S_FANG_PINCHFALL0",
+ "S_FANG_PINCHFALL1",
+ "S_FANG_PINCHFALL2",
+ "S_FANG_PINCHSKID1",
+ "S_FANG_PINCHSKID2",
+ "S_FANG_PINCHLOBSHOT0",
+ "S_FANG_PINCHLOBSHOT1",
+ "S_FANG_PINCHLOBSHOT2",
+ "S_FANG_PINCHLOBSHOT3",
+ "S_FANG_PINCHLOBSHOT4",
+ "S_FANG_DIE1",
+ "S_FANG_DIE2",
+ "S_FANG_DIE3",
+ "S_FANG_DIE4",
+ "S_FANG_DIE5",
+ "S_FANG_DIE6",
+ "S_FANG_DIE7",
+ "S_FANG_DIE8",
+ "S_FANG_FLEEPATHING1",
+ "S_FANG_FLEEPATHING2",
+ "S_FANG_FLEEBOUNCE1",
+ "S_FANG_FLEEBOUNCE2",
+ "S_FANG_KO",
+
+ "S_BROKENROBOTRANDOM",
+ "S_BROKENROBOTA",
+ "S_BROKENROBOTB",
+ "S_BROKENROBOTC",
+ "S_BROKENROBOTD",
+ "S_BROKENROBOTE",
+ "S_BROKENROBOTF",
+
+ "S_ALART1",
+ "S_ALART2",
+
+ "S_VWREF",
+ "S_VWREB",
+
+ "S_PROJECTORLIGHT1",
+ "S_PROJECTORLIGHT2",
+ "S_PROJECTORLIGHT3",
+ "S_PROJECTORLIGHT4",
+ "S_PROJECTORLIGHT5",
+
+ "S_FBOMB1",
+ "S_FBOMB2",
+ "S_FBOMB_EXPL1",
+ "S_FBOMB_EXPL2",
+ "S_FBOMB_EXPL3",
+ "S_FBOMB_EXPL4",
+ "S_FBOMB_EXPL5",
+ "S_FBOMB_EXPL6",
+ "S_TNTDUST_1",
+ "S_TNTDUST_2",
+ "S_TNTDUST_3",
+ "S_TNTDUST_4",
+ "S_TNTDUST_5",
+ "S_TNTDUST_6",
+ "S_TNTDUST_7",
+ "S_TNTDUST_8",
+ "S_FSGNA",
+ "S_FSGNB",
+ "S_FSGNC",
+ "S_FSGND",
+
+ // Black Eggman (Boss 7)
+ "S_BLACKEGG_STND",
+ "S_BLACKEGG_STND2",
+ "S_BLACKEGG_WALK1",
+ "S_BLACKEGG_WALK2",
+ "S_BLACKEGG_WALK3",
+ "S_BLACKEGG_WALK4",
+ "S_BLACKEGG_WALK5",
+ "S_BLACKEGG_WALK6",
+ "S_BLACKEGG_SHOOT1",
+ "S_BLACKEGG_SHOOT2",
+ "S_BLACKEGG_PAIN1",
+ "S_BLACKEGG_PAIN2",
+ "S_BLACKEGG_PAIN3",
+ "S_BLACKEGG_PAIN4",
+ "S_BLACKEGG_PAIN5",
+ "S_BLACKEGG_PAIN6",
+ "S_BLACKEGG_PAIN7",
+ "S_BLACKEGG_PAIN8",
+ "S_BLACKEGG_PAIN9",
+ "S_BLACKEGG_PAIN10",
+ "S_BLACKEGG_PAIN11",
+ "S_BLACKEGG_PAIN12",
+ "S_BLACKEGG_PAIN13",
+ "S_BLACKEGG_PAIN14",
+ "S_BLACKEGG_PAIN15",
+ "S_BLACKEGG_PAIN16",
+ "S_BLACKEGG_PAIN17",
+ "S_BLACKEGG_PAIN18",
+ "S_BLACKEGG_PAIN19",
+ "S_BLACKEGG_PAIN20",
+ "S_BLACKEGG_PAIN21",
+ "S_BLACKEGG_PAIN22",
+ "S_BLACKEGG_PAIN23",
+ "S_BLACKEGG_PAIN24",
+ "S_BLACKEGG_PAIN25",
+ "S_BLACKEGG_PAIN26",
+ "S_BLACKEGG_PAIN27",
+ "S_BLACKEGG_PAIN28",
+ "S_BLACKEGG_PAIN29",
+ "S_BLACKEGG_PAIN30",
+ "S_BLACKEGG_PAIN31",
+ "S_BLACKEGG_PAIN32",
+ "S_BLACKEGG_PAIN33",
+ "S_BLACKEGG_PAIN34",
+ "S_BLACKEGG_PAIN35",
+ "S_BLACKEGG_HITFACE1",
+ "S_BLACKEGG_HITFACE2",
+ "S_BLACKEGG_HITFACE3",
+ "S_BLACKEGG_HITFACE4",
+ "S_BLACKEGG_DIE1",
+ "S_BLACKEGG_DIE2",
+ "S_BLACKEGG_DIE3",
+ "S_BLACKEGG_DIE4",
+ "S_BLACKEGG_DIE5",
+ "S_BLACKEGG_MISSILE1",
+ "S_BLACKEGG_MISSILE2",
+ "S_BLACKEGG_MISSILE3",
+ "S_BLACKEGG_GOOP",
+ "S_BLACKEGG_JUMP1",
+ "S_BLACKEGG_JUMP2",
+ "S_BLACKEGG_DESTROYPLAT1",
+ "S_BLACKEGG_DESTROYPLAT2",
+ "S_BLACKEGG_DESTROYPLAT3",
+
+ "S_BLACKEGG_HELPER", // Collision helper
+
+ "S_BLACKEGG_GOOP1",
+ "S_BLACKEGG_GOOP2",
+ "S_BLACKEGG_GOOP3",
+ "S_BLACKEGG_GOOP4",
+ "S_BLACKEGG_GOOP5",
+ "S_BLACKEGG_GOOP6",
+ "S_BLACKEGG_GOOP7",
+
+ "S_BLACKEGG_MISSILE",
+
+ // New Very-Last-Minute 2.1 Brak Eggman (Cy-Brak-demon)
+ "S_CYBRAKDEMON_IDLE",
+ "S_CYBRAKDEMON_WALK1",
+ "S_CYBRAKDEMON_WALK2",
+ "S_CYBRAKDEMON_WALK3",
+ "S_CYBRAKDEMON_WALK4",
+ "S_CYBRAKDEMON_WALK5",
+ "S_CYBRAKDEMON_WALK6",
+ "S_CYBRAKDEMON_CHOOSE_ATTACK1",
+ "S_CYBRAKDEMON_MISSILE_ATTACK1", // Aim
+ "S_CYBRAKDEMON_MISSILE_ATTACK2", // Fire
+ "S_CYBRAKDEMON_MISSILE_ATTACK3", // Aim
+ "S_CYBRAKDEMON_MISSILE_ATTACK4", // Fire
+ "S_CYBRAKDEMON_MISSILE_ATTACK5", // Aim
+ "S_CYBRAKDEMON_MISSILE_ATTACK6", // Fire
+ "S_CYBRAKDEMON_FLAME_ATTACK1", // Reset
+ "S_CYBRAKDEMON_FLAME_ATTACK2", // Aim
+ "S_CYBRAKDEMON_FLAME_ATTACK3", // Fire
+ "S_CYBRAKDEMON_FLAME_ATTACK4", // Loop
+ "S_CYBRAKDEMON_CHOOSE_ATTACK2",
+ "S_CYBRAKDEMON_VILE_ATTACK1",
+ "S_CYBRAKDEMON_VILE_ATTACK2",
+ "S_CYBRAKDEMON_VILE_ATTACK3",
+ "S_CYBRAKDEMON_VILE_ATTACK4",
+ "S_CYBRAKDEMON_VILE_ATTACK5",
+ "S_CYBRAKDEMON_VILE_ATTACK6",
+ "S_CYBRAKDEMON_NAPALM_ATTACK1",
+ "S_CYBRAKDEMON_NAPALM_ATTACK2",
+ "S_CYBRAKDEMON_NAPALM_ATTACK3",
+ "S_CYBRAKDEMON_FINISH_ATTACK1", // If just attacked, remove MF2_FRET w/out going back to spawnstate
+ "S_CYBRAKDEMON_FINISH_ATTACK2", // Force a delay between attacks so you don't get bombarded with them back-to-back
+ "S_CYBRAKDEMON_PAIN1",
+ "S_CYBRAKDEMON_PAIN2",
+ "S_CYBRAKDEMON_PAIN3",
+ "S_CYBRAKDEMON_DIE1",
+ "S_CYBRAKDEMON_DIE2",
+ "S_CYBRAKDEMON_DIE3",
+ "S_CYBRAKDEMON_DIE4",
+ "S_CYBRAKDEMON_DIE5",
+ "S_CYBRAKDEMON_DIE6",
+ "S_CYBRAKDEMON_DIE7",
+ "S_CYBRAKDEMON_DIE8",
+ "S_CYBRAKDEMON_DEINVINCIBLERIZE",
+ "S_CYBRAKDEMON_INVINCIBLERIZE",
+
+ "S_CYBRAKDEMONMISSILE",
+ "S_CYBRAKDEMONMISSILE_EXPLODE1",
+ "S_CYBRAKDEMONMISSILE_EXPLODE2",
+ "S_CYBRAKDEMONMISSILE_EXPLODE3",
+
+ "S_CYBRAKDEMONFLAMESHOT_FLY1",
+ "S_CYBRAKDEMONFLAMESHOT_FLY2",
+ "S_CYBRAKDEMONFLAMESHOT_FLY3",
+ "S_CYBRAKDEMONFLAMESHOT_DIE",
+
+ "S_CYBRAKDEMONFLAMEREST",
+
+ "S_CYBRAKDEMONELECTRICBARRIER_INIT1",
+ "S_CYBRAKDEMONELECTRICBARRIER_INIT2",
+ "S_CYBRAKDEMONELECTRICBARRIER_PLAYSOUND",
+ "S_CYBRAKDEMONELECTRICBARRIER1",
+ "S_CYBRAKDEMONELECTRICBARRIER2",
+ "S_CYBRAKDEMONELECTRICBARRIER3",
+ "S_CYBRAKDEMONELECTRICBARRIER4",
+ "S_CYBRAKDEMONELECTRICBARRIER5",
+ "S_CYBRAKDEMONELECTRICBARRIER6",
+ "S_CYBRAKDEMONELECTRICBARRIER7",
+ "S_CYBRAKDEMONELECTRICBARRIER8",
+ "S_CYBRAKDEMONELECTRICBARRIER9",
+ "S_CYBRAKDEMONELECTRICBARRIER10",
+ "S_CYBRAKDEMONELECTRICBARRIER11",
+ "S_CYBRAKDEMONELECTRICBARRIER12",
+ "S_CYBRAKDEMONELECTRICBARRIER13",
+ "S_CYBRAKDEMONELECTRICBARRIER14",
+ "S_CYBRAKDEMONELECTRICBARRIER15",
+ "S_CYBRAKDEMONELECTRICBARRIER16",
+ "S_CYBRAKDEMONELECTRICBARRIER17",
+ "S_CYBRAKDEMONELECTRICBARRIER18",
+ "S_CYBRAKDEMONELECTRICBARRIER19",
+ "S_CYBRAKDEMONELECTRICBARRIER20",
+ "S_CYBRAKDEMONELECTRICBARRIER21",
+ "S_CYBRAKDEMONELECTRICBARRIER22",
+ "S_CYBRAKDEMONELECTRICBARRIER23",
+ "S_CYBRAKDEMONELECTRICBARRIER24",
+ "S_CYBRAKDEMONELECTRICBARRIER_DIE1",
+ "S_CYBRAKDEMONELECTRICBARRIER_DIE2",
+ "S_CYBRAKDEMONELECTRICBARRIER_DIE3",
+ "S_CYBRAKDEMONELECTRICBARRIER_SPARK_RANDOMCHECK",
+ "S_CYBRAKDEMONELECTRICBARRIER_SPARK_RANDOMSUCCESS",
+ "S_CYBRAKDEMONELECTRICBARRIER_SPARK_RANDOMCHOOSE",
+ "S_CYBRAKDEMONELECTRICBARRIER_SPARK_RANDOM1",
+ "S_CYBRAKDEMONELECTRICBARRIER_SPARK_RANDOM2",
+ "S_CYBRAKDEMONELECTRICBARRIER_SPARK_RANDOM3",
+ "S_CYBRAKDEMONELECTRICBARRIER_SPARK_RANDOM4",
+ "S_CYBRAKDEMONELECTRICBARRIER_SPARK_RANDOM5",
+ "S_CYBRAKDEMONELECTRICBARRIER_SPARK_RANDOM6",
+ "S_CYBRAKDEMONELECTRICBARRIER_SPARK_RANDOM7",
+ "S_CYBRAKDEMONELECTRICBARRIER_SPARK_RANDOM8",
+ "S_CYBRAKDEMONELECTRICBARRIER_SPARK_RANDOM9",
+ "S_CYBRAKDEMONELECTRICBARRIER_SPARK_RANDOM10",
+ "S_CYBRAKDEMONELECTRICBARRIER_SPARK_RANDOM11",
+ "S_CYBRAKDEMONELECTRICBARRIER_SPARK_RANDOM12",
+ "S_CYBRAKDEMONELECTRICBARRIER_SPARK_RANDOMFAIL",
+ "S_CYBRAKDEMONELECTRICBARRIER_SPARK_RANDOMLOOP",
+ "S_CYBRAKDEMONELECTRICBARRIER_REVIVE1",
+ "S_CYBRAKDEMONELECTRICBARRIER_REVIVE2",
+ "S_CYBRAKDEMONELECTRICBARRIER_REVIVE3",
+
+ "S_CYBRAKDEMONTARGETRETICULE1",
+ "S_CYBRAKDEMONTARGETRETICULE2",
+ "S_CYBRAKDEMONTARGETRETICULE3",
+ "S_CYBRAKDEMONTARGETRETICULE4",
+ "S_CYBRAKDEMONTARGETRETICULE5",
+ "S_CYBRAKDEMONTARGETRETICULE6",
+ "S_CYBRAKDEMONTARGETRETICULE7",
+ "S_CYBRAKDEMONTARGETRETICULE8",
+ "S_CYBRAKDEMONTARGETRETICULE9",
+ "S_CYBRAKDEMONTARGETRETICULE10",
+ "S_CYBRAKDEMONTARGETRETICULE11",
+ "S_CYBRAKDEMONTARGETRETICULE12",
+ "S_CYBRAKDEMONTARGETRETICULE13",
+ "S_CYBRAKDEMONTARGETRETICULE14",
+
+ "S_CYBRAKDEMONTARGETDOT",
+
+ "S_CYBRAKDEMONNAPALMBOMBLARGE_FLY1",
+ "S_CYBRAKDEMONNAPALMBOMBLARGE_FLY2",
+ "S_CYBRAKDEMONNAPALMBOMBLARGE_FLY3",
+ "S_CYBRAKDEMONNAPALMBOMBLARGE_FLY4",
+ "S_CYBRAKDEMONNAPALMBOMBLARGE_DIE1", // Explode
+ "S_CYBRAKDEMONNAPALMBOMBLARGE_DIE2", // Outer ring
+ "S_CYBRAKDEMONNAPALMBOMBLARGE_DIE3", // Center
+ "S_CYBRAKDEMONNAPALMBOMBLARGE_DIE4", // Sound
+
+ "S_CYBRAKDEMONNAPALMBOMBSMALL",
+ "S_CYBRAKDEMONNAPALMBOMBSMALL_DIE1", // Explode
+ "S_CYBRAKDEMONNAPALMBOMBSMALL_DIE2", // Outer ring
+ "S_CYBRAKDEMONNAPALMBOMBSMALL_DIE3", // Inner ring
+ "S_CYBRAKDEMONNAPALMBOMBSMALL_DIE4", // Center
+ "S_CYBRAKDEMONNAPALMBOMBSMALL_DIE5", // Sound
+
+ "S_CYBRAKDEMONNAPALMFLAME_FLY1",
+ "S_CYBRAKDEMONNAPALMFLAME_FLY2",
+ "S_CYBRAKDEMONNAPALMFLAME_FLY3",
+ "S_CYBRAKDEMONNAPALMFLAME_FLY4",
+ "S_CYBRAKDEMONNAPALMFLAME_FLY5",
+ "S_CYBRAKDEMONNAPALMFLAME_FLY6",
+ "S_CYBRAKDEMONNAPALMFLAME_DIE",
+
+ "S_CYBRAKDEMONVILEEXPLOSION1",
+ "S_CYBRAKDEMONVILEEXPLOSION2",
+ "S_CYBRAKDEMONVILEEXPLOSION3",
+
+ // Metal Sonic (Race)
+ "S_METALSONIC_RACE",
+ // Metal Sonic (Battle)
+ "S_METALSONIC_FLOAT",
+ "S_METALSONIC_VECTOR",
+ "S_METALSONIC_STUN",
+ "S_METALSONIC_RAISE",
+ "S_METALSONIC_GATHER",
+ "S_METALSONIC_DASH",
+ "S_METALSONIC_BOUNCE",
+ "S_METALSONIC_BADBOUNCE",
+ "S_METALSONIC_SHOOT",
+ "S_METALSONIC_PAIN",
+ "S_METALSONIC_DEATH1",
+ "S_METALSONIC_DEATH2",
+ "S_METALSONIC_DEATH3",
+ "S_METALSONIC_DEATH4",
+ "S_METALSONIC_FLEE1",
+ "S_METALSONIC_FLEE2",
+
+ "S_MSSHIELD_F1",
+ "S_MSSHIELD_F2",
+
+ // Ring
+ "S_RING",
+
+ // Blue Sphere for special stages
+ "S_BLUESPHERE",
+ "S_BLUESPHEREBONUS",
+ "S_BLUESPHERESPARK",
+
+ // Bomb Sphere
+ "S_BOMBSPHERE1",
+ "S_BOMBSPHERE2",
+ "S_BOMBSPHERE3",
+ "S_BOMBSPHERE4",
+
+ // NiGHTS Chip
+ "S_NIGHTSCHIP",
+ "S_NIGHTSCHIPBONUS",
+
+ // NiGHTS Star
+ "S_NIGHTSSTAR",
+ "S_NIGHTSSTARXMAS",
+
+ // Gravity Wells for special stages
+ "S_GRAVWELLGREEN",
+ "S_GRAVWELLRED",
+
+ // Individual Team Rings
+ "S_TEAMRING",
+
+ // Special Stage Token
+ "S_TOKEN",
+
+ // CTF Flags
+ "S_REDFLAG",
+ "S_BLUEFLAG",
+
+ // Emblem
+ "S_EMBLEM1",
+ "S_EMBLEM2",
+ "S_EMBLEM3",
+ "S_EMBLEM4",
+ "S_EMBLEM5",
+ "S_EMBLEM6",
+ "S_EMBLEM7",
+ "S_EMBLEM8",
+ "S_EMBLEM9",
+ "S_EMBLEM10",
+ "S_EMBLEM11",
+ "S_EMBLEM12",
+ "S_EMBLEM13",
+ "S_EMBLEM14",
+ "S_EMBLEM15",
+ "S_EMBLEM16",
+ "S_EMBLEM17",
+ "S_EMBLEM18",
+ "S_EMBLEM19",
+ "S_EMBLEM20",
+ "S_EMBLEM21",
+ "S_EMBLEM22",
+ "S_EMBLEM23",
+ "S_EMBLEM24",
+ "S_EMBLEM25",
+ "S_EMBLEM26",
+
+ // Chaos Emeralds
+ "S_CEMG1",
+ "S_CEMG2",
+ "S_CEMG3",
+ "S_CEMG4",
+ "S_CEMG5",
+ "S_CEMG6",
+ "S_CEMG7",
+
+ // Emerald hunt shards
+ "S_SHRD1",
+ "S_SHRD2",
+ "S_SHRD3",
+
+ // Bubble Source
+ "S_BUBBLES1",
+ "S_BUBBLES2",
+ "S_BUBBLES3",
+ "S_BUBBLES4",
+
+ // Level End Sign
+ "S_SIGN",
+ "S_SIGNSPIN1",
+ "S_SIGNSPIN2",
+ "S_SIGNSPIN3",
+ "S_SIGNSPIN4",
+ "S_SIGNSPIN5",
+ "S_SIGNSPIN6",
+ "S_SIGNPLAYER",
+ "S_SIGNSLOW",
+ "S_SIGNSTOP",
+ "S_SIGNBOARD",
+ "S_EGGMANSIGN",
+ "S_CLEARSIGN",
+
+ // Spike Ball
+ "S_SPIKEBALL1",
+ "S_SPIKEBALL2",
+ "S_SPIKEBALL3",
+ "S_SPIKEBALL4",
+ "S_SPIKEBALL5",
+ "S_SPIKEBALL6",
+ "S_SPIKEBALL7",
+ "S_SPIKEBALL8",
+
+ // Elemental Shield's Spawn
+ "S_SPINFIRE1",
+ "S_SPINFIRE2",
+ "S_SPINFIRE3",
+ "S_SPINFIRE4",
+ "S_SPINFIRE5",
+ "S_SPINFIRE6",
+
+ "S_TEAM_SPINFIRE1",
+ "S_TEAM_SPINFIRE2",
+ "S_TEAM_SPINFIRE3",
+ "S_TEAM_SPINFIRE4",
+ "S_TEAM_SPINFIRE5",
+ "S_TEAM_SPINFIRE6",
+
+ // Spikes
+ "S_SPIKE1",
+ "S_SPIKE2",
+ "S_SPIKE3",
+ "S_SPIKE4",
+ "S_SPIKE5",
+ "S_SPIKE6",
+ "S_SPIKED1",
+ "S_SPIKED2",
+
+ // Wall spikes
+ "S_WALLSPIKE1",
+ "S_WALLSPIKE2",
+ "S_WALLSPIKE3",
+ "S_WALLSPIKE4",
+ "S_WALLSPIKE5",
+ "S_WALLSPIKE6",
+ "S_WALLSPIKEBASE",
+ "S_WALLSPIKED1",
+ "S_WALLSPIKED2",
+
+ // Starpost
+ "S_STARPOST_IDLE",
+ "S_STARPOST_FLASH",
+ "S_STARPOST_STARTSPIN",
+ "S_STARPOST_SPIN",
+ "S_STARPOST_ENDSPIN",
+
+ // Big floating mine
+ "S_BIGMINE_IDLE",
+ "S_BIGMINE_ALERT1",
+ "S_BIGMINE_ALERT2",
+ "S_BIGMINE_ALERT3",
+ "S_BIGMINE_SET1",
+ "S_BIGMINE_SET2",
+ "S_BIGMINE_SET3",
+ "S_BIGMINE_BLAST1",
+ "S_BIGMINE_BLAST2",
+ "S_BIGMINE_BLAST3",
+ "S_BIGMINE_BLAST4",
+ "S_BIGMINE_BLAST5",
+
+ // Cannon Launcher
+ "S_CANNONLAUNCHER1",
+ "S_CANNONLAUNCHER2",
+ "S_CANNONLAUNCHER3",
+
+ // Monitor Miscellany
+ "S_BOXSPARKLE1",
+ "S_BOXSPARKLE2",
+ "S_BOXSPARKLE3",
+ "S_BOXSPARKLE4",
+
+ "S_BOX_FLICKER",
+ "S_BOX_POP1",
+ "S_BOX_POP2",
+
+ "S_GOLDBOX_FLICKER",
+ "S_GOLDBOX_OFF1",
+ "S_GOLDBOX_OFF2",
+ "S_GOLDBOX_OFF3",
+ "S_GOLDBOX_OFF4",
+ "S_GOLDBOX_OFF5",
+ "S_GOLDBOX_OFF6",
+ "S_GOLDBOX_OFF7",
+
+ // Monitor States (one per box)
+ "S_MYSTERY_BOX",
+ "S_RING_BOX",
+ "S_PITY_BOX",
+ "S_ATTRACT_BOX",
+ "S_FORCE_BOX",
+ "S_ARMAGEDDON_BOX",
+ "S_WHIRLWIND_BOX",
+ "S_ELEMENTAL_BOX",
+ "S_SNEAKERS_BOX",
+ "S_INVULN_BOX",
+ "S_1UP_BOX",
+ "S_EGGMAN_BOX",
+ "S_MIXUP_BOX",
+ "S_GRAVITY_BOX",
+ "S_RECYCLER_BOX",
+ "S_SCORE1K_BOX",
+ "S_SCORE10K_BOX",
+ "S_FLAMEAURA_BOX",
+ "S_BUBBLEWRAP_BOX",
+ "S_THUNDERCOIN_BOX",
+
+ // Gold Repeat Monitor States (one per box)
+ "S_PITY_GOLDBOX",
+ "S_ATTRACT_GOLDBOX",
+ "S_FORCE_GOLDBOX",
+ "S_ARMAGEDDON_GOLDBOX",
+ "S_WHIRLWIND_GOLDBOX",
+ "S_ELEMENTAL_GOLDBOX",
+ "S_SNEAKERS_GOLDBOX",
+ "S_INVULN_GOLDBOX",
+ "S_EGGMAN_GOLDBOX",
+ "S_GRAVITY_GOLDBOX",
+ "S_FLAMEAURA_GOLDBOX",
+ "S_BUBBLEWRAP_GOLDBOX",
+ "S_THUNDERCOIN_GOLDBOX",
+
+ // Team Ring Boxes (these are special)
+ "S_RING_REDBOX1",
+ "S_RING_REDBOX2",
+ "S_REDBOX_POP1",
+ "S_REDBOX_POP2",
+
+ "S_RING_BLUEBOX1",
+ "S_RING_BLUEBOX2",
+ "S_BLUEBOX_POP1",
+ "S_BLUEBOX_POP2",
+
+ // Box Icons -- 2 states each, animation and action
+ "S_RING_ICON1",
+ "S_RING_ICON2",
+
+ "S_PITY_ICON1",
+ "S_PITY_ICON2",
+
+ "S_ATTRACT_ICON1",
+ "S_ATTRACT_ICON2",
+
+ "S_FORCE_ICON1",
+ "S_FORCE_ICON2",
+
+ "S_ARMAGEDDON_ICON1",
+ "S_ARMAGEDDON_ICON2",
+
+ "S_WHIRLWIND_ICON1",
+ "S_WHIRLWIND_ICON2",
+
+ "S_ELEMENTAL_ICON1",
+ "S_ELEMENTAL_ICON2",
+
+ "S_SNEAKERS_ICON1",
+ "S_SNEAKERS_ICON2",
+
+ "S_INVULN_ICON1",
+ "S_INVULN_ICON2",
+
+ "S_1UP_ICON1",
+ "S_1UP_ICON2",
+
+ "S_EGGMAN_ICON1",
+ "S_EGGMAN_ICON2",
+
+ "S_MIXUP_ICON1",
+ "S_MIXUP_ICON2",
+
+ "S_GRAVITY_ICON1",
+ "S_GRAVITY_ICON2",
+
+ "S_RECYCLER_ICON1",
+ "S_RECYCLER_ICON2",
+
+ "S_SCORE1K_ICON1",
+ "S_SCORE1K_ICON2",
+
+ "S_SCORE10K_ICON1",
+ "S_SCORE10K_ICON2",
+
+ "S_FLAMEAURA_ICON1",
+ "S_FLAMEAURA_ICON2",
+
+ "S_BUBBLEWRAP_ICON1",
+ "S_BUBBLEWRAP_ICON2",
+
+ "S_THUNDERCOIN_ICON1",
+ "S_THUNDERCOIN_ICON2",
+
+ // ---
+
+ "S_ROCKET",
+
+ "S_LASER",
+ "S_LASER2",
+ "S_LASERFLASH",
+
+ "S_LASERFLAME1",
+ "S_LASERFLAME2",
+ "S_LASERFLAME3",
+ "S_LASERFLAME4",
+ "S_LASERFLAME5",
+
+ "S_TORPEDO",
+
+ "S_ENERGYBALL1",
+ "S_ENERGYBALL2",
+
+ // Skim Mine, also used by Jetty-Syn bomber
+ "S_MINE1",
+ "S_MINE_BOOM1",
+ "S_MINE_BOOM2",
+ "S_MINE_BOOM3",
+ "S_MINE_BOOM4",
+
+ // Jetty-Syn Bullet
+ "S_JETBULLET1",
+ "S_JETBULLET2",
+
+ "S_TURRETLASER",
+ "S_TURRETLASEREXPLODE1",
+ "S_TURRETLASEREXPLODE2",
+
+ // Cannonball
+ "S_CANNONBALL1",
+
+ // Arrow
+ "S_ARROW",
+ "S_ARROWBONK",
+
+ // Glaregoyle Demon fire
+ "S_DEMONFIRE",
+
+ // The letter
+ "S_LETTER",
+
+ // GFZ flowers
+ "S_GFZFLOWERA",
+ "S_GFZFLOWERB",
+ "S_GFZFLOWERC",
+
+ "S_BLUEBERRYBUSH",
+ "S_BERRYBUSH",
+ "S_BUSH",
+
+ // Trees (both GFZ and misc)
+ "S_GFZTREE",
+ "S_GFZBERRYTREE",
+ "S_GFZCHERRYTREE",
+ "S_CHECKERTREE",
+ "S_CHECKERSUNSETTREE",
+ "S_FHZTREE", // Frozen Hillside
+ "S_FHZPINKTREE",
+ "S_POLYGONTREE",
+ "S_BUSHTREE",
+ "S_BUSHREDTREE",
+ "S_SPRINGTREE",
+
+ // THZ flowers
+ "S_THZFLOWERA", // THZ1 Steam flower
+ "S_THZFLOWERB", // THZ1 Spin flower (red)
+ "S_THZFLOWERC", // THZ1 Spin flower (yellow)
+
+ // THZ Steam Whistle tree/bush
+ "S_THZTREE",
+ "S_THZTREEBRANCH1",
+ "S_THZTREEBRANCH2",
+ "S_THZTREEBRANCH3",
+ "S_THZTREEBRANCH4",
+ "S_THZTREEBRANCH5",
+ "S_THZTREEBRANCH6",
+ "S_THZTREEBRANCH7",
+ "S_THZTREEBRANCH8",
+ "S_THZTREEBRANCH9",
+ "S_THZTREEBRANCH10",
+ "S_THZTREEBRANCH11",
+ "S_THZTREEBRANCH12",
+ "S_THZTREEBRANCH13",
+
+ // THZ Alarm
+ "S_ALARM1",
+
+ // Deep Sea Gargoyle
+ "S_GARGOYLE",
+ "S_BIGGARGOYLE",
+
+ // DSZ Seaweed
+ "S_SEAWEED1",
+ "S_SEAWEED2",
+ "S_SEAWEED3",
+ "S_SEAWEED4",
+ "S_SEAWEED5",
+ "S_SEAWEED6",
+
+ // Dripping Water
+ "S_DRIPA1",
+ "S_DRIPA2",
+ "S_DRIPA3",
+ "S_DRIPA4",
+ "S_DRIPB1",
+ "S_DRIPC1",
+ "S_DRIPC2",
+
+ // Coral
+ "S_CORAL1",
+ "S_CORAL2",
+ "S_CORAL3",
+ "S_CORAL4",
+ "S_CORAL5",
+
+ // Blue Crystal
+ "S_BLUECRYSTAL1",
+
+ // Kelp,
+ "S_KELP",
+
+ // Animated algae
+ "S_ANIMALGAETOP1",
+ "S_ANIMALGAETOP2",
+ "S_ANIMALGAESEG",
+
+ // DSZ Stalagmites
+ "S_DSZSTALAGMITE",
+ "S_DSZ2STALAGMITE",
+
+ // DSZ Light beam
+ "S_LIGHTBEAM1",
+ "S_LIGHTBEAM2",
+ "S_LIGHTBEAM3",
+ "S_LIGHTBEAM4",
+ "S_LIGHTBEAM5",
+ "S_LIGHTBEAM6",
+ "S_LIGHTBEAM7",
+ "S_LIGHTBEAM8",
+ "S_LIGHTBEAM9",
+ "S_LIGHTBEAM10",
+ "S_LIGHTBEAM11",
+ "S_LIGHTBEAM12",
+
+ // CEZ Chain
+ "S_CEZCHAIN",
+
+ // Flame
+ "S_FLAME",
+ "S_FLAMEPARTICLE",
+ "S_FLAMEREST",
+
+ // Eggman Statue
+ "S_EGGSTATUE1",
+
+ // CEZ hidden sling
+ "S_SLING1",
+ "S_SLING2",
+
+ // CEZ maces and chains
+ "S_SMALLMACECHAIN",
+ "S_BIGMACECHAIN",
+ "S_SMALLMACE",
+ "S_BIGMACE",
+ "S_SMALLGRABCHAIN",
+ "S_BIGGRABCHAIN",
+
+ // Yellow spring on a ball
+ "S_YELLOWSPRINGBALL",
+ "S_YELLOWSPRINGBALL2",
+ "S_YELLOWSPRINGBALL3",
+ "S_YELLOWSPRINGBALL4",
+ "S_YELLOWSPRINGBALL5",
+
+ // Red spring on a ball
+ "S_REDSPRINGBALL",
+ "S_REDSPRINGBALL2",
+ "S_REDSPRINGBALL3",
+ "S_REDSPRINGBALL4",
+ "S_REDSPRINGBALL5",
+
+ // Small Firebar
+ "S_SMALLFIREBAR1",
+ "S_SMALLFIREBAR2",
+ "S_SMALLFIREBAR3",
+ "S_SMALLFIREBAR4",
+ "S_SMALLFIREBAR5",
+ "S_SMALLFIREBAR6",
+ "S_SMALLFIREBAR7",
+ "S_SMALLFIREBAR8",
+ "S_SMALLFIREBAR9",
+ "S_SMALLFIREBAR10",
+ "S_SMALLFIREBAR11",
+ "S_SMALLFIREBAR12",
+ "S_SMALLFIREBAR13",
+ "S_SMALLFIREBAR14",
+ "S_SMALLFIREBAR15",
+ "S_SMALLFIREBAR16",
+
+ // Big Firebar
+ "S_BIGFIREBAR1",
+ "S_BIGFIREBAR2",
+ "S_BIGFIREBAR3",
+ "S_BIGFIREBAR4",
+ "S_BIGFIREBAR5",
+ "S_BIGFIREBAR6",
+ "S_BIGFIREBAR7",
+ "S_BIGFIREBAR8",
+ "S_BIGFIREBAR9",
+ "S_BIGFIREBAR10",
+ "S_BIGFIREBAR11",
+ "S_BIGFIREBAR12",
+ "S_BIGFIREBAR13",
+ "S_BIGFIREBAR14",
+ "S_BIGFIREBAR15",
+ "S_BIGFIREBAR16",
+
+ "S_CEZFLOWER",
+ "S_CEZPOLE",
+ "S_CEZBANNER1",
+ "S_CEZBANNER2",
+ "S_PINETREE",
+ "S_CEZBUSH1",
+ "S_CEZBUSH2",
+ "S_CANDLE",
+ "S_CANDLEPRICKET",
+ "S_FLAMEHOLDER",
+ "S_FIRETORCH",
+ "S_WAVINGFLAG",
+ "S_WAVINGFLAGSEG1",
+ "S_WAVINGFLAGSEG2",
+ "S_CRAWLASTATUE",
+ "S_FACESTABBERSTATUE",
+ "S_SUSPICIOUSFACESTABBERSTATUE_WAIT",
+ "S_SUSPICIOUSFACESTABBERSTATUE_BURST1",
+ "S_SUSPICIOUSFACESTABBERSTATUE_BURST2",
+ "S_BRAMBLES",
+
+ // Big Tumbleweed
+ "S_BIGTUMBLEWEED",
+ "S_BIGTUMBLEWEED_ROLL1",
+ "S_BIGTUMBLEWEED_ROLL2",
+ "S_BIGTUMBLEWEED_ROLL3",
+ "S_BIGTUMBLEWEED_ROLL4",
+ "S_BIGTUMBLEWEED_ROLL5",
+ "S_BIGTUMBLEWEED_ROLL6",
+ "S_BIGTUMBLEWEED_ROLL7",
+ "S_BIGTUMBLEWEED_ROLL8",
+
+ // Little Tumbleweed
+ "S_LITTLETUMBLEWEED",
+ "S_LITTLETUMBLEWEED_ROLL1",
+ "S_LITTLETUMBLEWEED_ROLL2",
+ "S_LITTLETUMBLEWEED_ROLL3",
+ "S_LITTLETUMBLEWEED_ROLL4",
+ "S_LITTLETUMBLEWEED_ROLL5",
+ "S_LITTLETUMBLEWEED_ROLL6",
+ "S_LITTLETUMBLEWEED_ROLL7",
+ "S_LITTLETUMBLEWEED_ROLL8",
+
+ // Cacti
+ "S_CACTI1",
+ "S_CACTI2",
+ "S_CACTI3",
+ "S_CACTI4",
+ "S_CACTI5",
+ "S_CACTI6",
+ "S_CACTI7",
+ "S_CACTI8",
+ "S_CACTI9",
+ "S_CACTI10",
+ "S_CACTI11",
+ "S_CACTITINYSEG",
+ "S_CACTISMALLSEG",
+
+ // Warning signs
+ "S_ARIDSIGN_CAUTION",
+ "S_ARIDSIGN_CACTI",
+ "S_ARIDSIGN_SHARPTURN",
+
+ // Oil lamp
+ "S_OILLAMP",
+ "S_OILLAMPFLARE",
+
+ // TNT barrel
+ "S_TNTBARREL_STND1",
+ "S_TNTBARREL_EXPL1",
+ "S_TNTBARREL_EXPL2",
+ "S_TNTBARREL_EXPL3",
+ "S_TNTBARREL_EXPL4",
+ "S_TNTBARREL_EXPL5",
+ "S_TNTBARREL_EXPL6",
+ "S_TNTBARREL_EXPL7",
+ "S_TNTBARREL_FLYING",
+
+ // TNT proximity shell
+ "S_PROXIMITY_TNT",
+ "S_PROXIMITY_TNT_TRIGGER1",
+ "S_PROXIMITY_TNT_TRIGGER2",
+ "S_PROXIMITY_TNT_TRIGGER3",
+ "S_PROXIMITY_TNT_TRIGGER4",
+ "S_PROXIMITY_TNT_TRIGGER5",
+ "S_PROXIMITY_TNT_TRIGGER6",
+ "S_PROXIMITY_TNT_TRIGGER7",
+ "S_PROXIMITY_TNT_TRIGGER8",
+ "S_PROXIMITY_TNT_TRIGGER9",
+ "S_PROXIMITY_TNT_TRIGGER10",
+ "S_PROXIMITY_TNT_TRIGGER11",
+ "S_PROXIMITY_TNT_TRIGGER12",
+ "S_PROXIMITY_TNT_TRIGGER13",
+ "S_PROXIMITY_TNT_TRIGGER14",
+ "S_PROXIMITY_TNT_TRIGGER15",
+ "S_PROXIMITY_TNT_TRIGGER16",
+ "S_PROXIMITY_TNT_TRIGGER17",
+ "S_PROXIMITY_TNT_TRIGGER18",
+ "S_PROXIMITY_TNT_TRIGGER19",
+ "S_PROXIMITY_TNT_TRIGGER20",
+ "S_PROXIMITY_TNT_TRIGGER21",
+ "S_PROXIMITY_TNT_TRIGGER22",
+ "S_PROXIMITY_TNT_TRIGGER23",
+
+ // Dust devil
+ "S_DUSTDEVIL",
+ "S_DUSTLAYER1",
+ "S_DUSTLAYER2",
+ "S_DUSTLAYER3",
+ "S_DUSTLAYER4",
+ "S_DUSTLAYER5",
+ "S_ARIDDUST1",
+ "S_ARIDDUST2",
+ "S_ARIDDUST3",
+
+ // Minecart
+ "S_MINECART_IDLE",
+ "S_MINECART_DTH1",
+ "S_MINECARTEND",
+ "S_MINECARTSEG_FRONT",
+ "S_MINECARTSEG_BACK",
+ "S_MINECARTSEG_LEFT",
+ "S_MINECARTSEG_RIGHT",
+ "S_MINECARTSIDEMARK1",
+ "S_MINECARTSIDEMARK2",
+ "S_MINECARTSPARK",
+
+ // Saloon door
+ "S_SALOONDOOR",
+ "S_SALOONDOORCENTER",
+
+ // Train cameo
+ "S_TRAINCAMEOSPAWNER_1",
+ "S_TRAINCAMEOSPAWNER_2",
+ "S_TRAINCAMEOSPAWNER_3",
+ "S_TRAINCAMEOSPAWNER_4",
+ "S_TRAINCAMEOSPAWNER_5",
+ "S_TRAINPUFFMAKER",
+
+ // Train
+ "S_TRAINDUST",
+ "S_TRAINSTEAM",
+
+ // Flame jet
+ "S_FLAMEJETSTND",
+ "S_FLAMEJETSTART",
+ "S_FLAMEJETSTOP",
+ "S_FLAMEJETFLAME1",
+ "S_FLAMEJETFLAME2",
+ "S_FLAMEJETFLAME3",
+ "S_FLAMEJETFLAME4",
+ "S_FLAMEJETFLAME5",
+ "S_FLAMEJETFLAME6",
+ "S_FLAMEJETFLAME7",
+ "S_FLAMEJETFLAME8",
+ "S_FLAMEJETFLAME9",
+
+ // Spinning flame jets
+ "S_FJSPINAXISA1", // Counter-clockwise
+ "S_FJSPINAXISA2",
+ "S_FJSPINAXISB1", // Clockwise
+ "S_FJSPINAXISB2",
+
+ // Blade's flame
+ "S_FLAMEJETFLAMEB1",
+ "S_FLAMEJETFLAMEB2",
+ "S_FLAMEJETFLAMEB3",
+
+ // Lavafall
+ "S_LAVAFALL_DORMANT",
+ "S_LAVAFALL_TELL",
+ "S_LAVAFALL_SHOOT",
+ "S_LAVAFALL_LAVA1",
+ "S_LAVAFALL_LAVA2",
+ "S_LAVAFALL_LAVA3",
+ "S_LAVAFALLROCK",
+
+ // Rollout Rock
+ "S_ROLLOUTSPAWN",
+ "S_ROLLOUTROCK",
+
+ // RVZ scenery
+ "S_BIGFERNLEAF",
+ "S_BIGFERN1",
+ "S_BIGFERN2",
+ "S_JUNGLEPALM",
+ "S_TORCHFLOWER",
+ "S_WALLVINE_LONG",
+ "S_WALLVINE_SHORT",
+
+ // Glaregoyles
+ "S_GLAREGOYLE",
+ "S_GLAREGOYLE_CHARGE",
+ "S_GLAREGOYLE_BLINK",
+ "S_GLAREGOYLE_HOLD",
+ "S_GLAREGOYLE_FIRE",
+ "S_GLAREGOYLE_LOOP",
+ "S_GLAREGOYLE_COOLDOWN",
+ "S_GLAREGOYLEUP",
+ "S_GLAREGOYLEUP_CHARGE",
+ "S_GLAREGOYLEUP_BLINK",
+ "S_GLAREGOYLEUP_HOLD",
+ "S_GLAREGOYLEUP_FIRE",
+ "S_GLAREGOYLEUP_LOOP",
+ "S_GLAREGOYLEUP_COOLDOWN",
+ "S_GLAREGOYLEDOWN",
+ "S_GLAREGOYLEDOWN_CHARGE",
+ "S_GLAREGOYLEDOWN_BLINK",
+ "S_GLAREGOYLEDOWN_HOLD",
+ "S_GLAREGOYLEDOWN_FIRE",
+ "S_GLAREGOYLEDOWN_LOOP",
+ "S_GLAREGOYLEDOWN_COOLDOWN",
+ "S_GLAREGOYLELONG",
+ "S_GLAREGOYLELONG_CHARGE",
+ "S_GLAREGOYLELONG_BLINK",
+ "S_GLAREGOYLELONG_HOLD",
+ "S_GLAREGOYLELONG_FIRE",
+ "S_GLAREGOYLELONG_LOOP",
+ "S_GLAREGOYLELONG_COOLDOWN",
+
+ // ATZ's Red Crystal/Target
+ "S_TARGET_IDLE",
+ "S_TARGET_HIT1",
+ "S_TARGET_HIT2",
+ "S_TARGET_RESPAWN",
+ "S_TARGET_ALLDONE",
+
+ // ATZ's green flame
+ "S_GREENFLAME",
+
+ // ATZ Blue Gargoyle
+ "S_BLUEGARGOYLE",
+
+ // Stalagmites
+ "S_STG0",
+ "S_STG1",
+ "S_STG2",
+ "S_STG3",
+ "S_STG4",
+ "S_STG5",
+ "S_STG6",
+ "S_STG7",
+ "S_STG8",
+ "S_STG9",
+
+ // Xmas-specific stuff
+ "S_XMASPOLE",
+ "S_CANDYCANE",
+ "S_SNOWMAN", // normal
+ "S_SNOWMANHAT", // with hat + scarf
+ "S_LAMPPOST1", // normal
+ "S_LAMPPOST2", // with snow
+ "S_HANGSTAR",
+ "S_MISTLETOE",
+ // Xmas GFZ bushes
+ "S_XMASBLUEBERRYBUSH",
+ "S_XMASBERRYBUSH",
+ "S_XMASBUSH",
+ // FHZ
+ "S_FHZICE1",
+ "S_FHZICE2",
+ "S_ROSY_IDLE1",
+ "S_ROSY_IDLE2",
+ "S_ROSY_IDLE3",
+ "S_ROSY_IDLE4",
+ "S_ROSY_JUMP",
+ "S_ROSY_WALK",
+ "S_ROSY_HUG",
+ "S_ROSY_PAIN",
+ "S_ROSY_STND",
+ "S_ROSY_UNHAPPY",
+
+ // Halloween Scenery
+ // Pumpkins
+ "S_JACKO1",
+ "S_JACKO1OVERLAY_1",
+ "S_JACKO1OVERLAY_2",
+ "S_JACKO1OVERLAY_3",
+ "S_JACKO1OVERLAY_4",
+ "S_JACKO2",
+ "S_JACKO2OVERLAY_1",
+ "S_JACKO2OVERLAY_2",
+ "S_JACKO2OVERLAY_3",
+ "S_JACKO2OVERLAY_4",
+ "S_JACKO3",
+ "S_JACKO3OVERLAY_1",
+ "S_JACKO3OVERLAY_2",
+ "S_JACKO3OVERLAY_3",
+ "S_JACKO3OVERLAY_4",
+ // Dr Seuss Trees
+ "S_HHZTREE_TOP",
+ "S_HHZTREE_TRUNK",
+ "S_HHZTREE_LEAF",
+ // Mushroom
+ "S_HHZSHROOM_1",
+ "S_HHZSHROOM_2",
+ "S_HHZSHROOM_3",
+ "S_HHZSHROOM_4",
+ "S_HHZSHROOM_5",
+ "S_HHZSHROOM_6",
+ "S_HHZSHROOM_7",
+ "S_HHZSHROOM_8",
+ "S_HHZSHROOM_9",
+ "S_HHZSHROOM_10",
+ "S_HHZSHROOM_11",
+ "S_HHZSHROOM_12",
+ "S_HHZSHROOM_13",
+ "S_HHZSHROOM_14",
+ "S_HHZSHROOM_15",
+ "S_HHZSHROOM_16",
+ // Misc
+ "S_HHZGRASS",
+ "S_HHZTENT1",
+ "S_HHZTENT2",
+ "S_HHZSTALAGMITE_TALL",
+ "S_HHZSTALAGMITE_SHORT",
+
+ // Botanic Serenity's loads of scenery states
+ "S_BSZTALLFLOWER_RED",
+ "S_BSZTALLFLOWER_PURPLE",
+ "S_BSZTALLFLOWER_BLUE",
+ "S_BSZTALLFLOWER_CYAN",
+ "S_BSZTALLFLOWER_YELLOW",
+ "S_BSZTALLFLOWER_ORANGE",
+ "S_BSZFLOWER_RED",
+ "S_BSZFLOWER_PURPLE",
+ "S_BSZFLOWER_BLUE",
+ "S_BSZFLOWER_CYAN",
+ "S_BSZFLOWER_YELLOW",
+ "S_BSZFLOWER_ORANGE",
+ "S_BSZSHORTFLOWER_RED",
+ "S_BSZSHORTFLOWER_PURPLE",
+ "S_BSZSHORTFLOWER_BLUE",
+ "S_BSZSHORTFLOWER_CYAN",
+ "S_BSZSHORTFLOWER_YELLOW",
+ "S_BSZSHORTFLOWER_ORANGE",
+ "S_BSZTULIP_RED",
+ "S_BSZTULIP_PURPLE",
+ "S_BSZTULIP_BLUE",
+ "S_BSZTULIP_CYAN",
+ "S_BSZTULIP_YELLOW",
+ "S_BSZTULIP_ORANGE",
+ "S_BSZCLUSTER_RED",
+ "S_BSZCLUSTER_PURPLE",
+ "S_BSZCLUSTER_BLUE",
+ "S_BSZCLUSTER_CYAN",
+ "S_BSZCLUSTER_YELLOW",
+ "S_BSZCLUSTER_ORANGE",
+ "S_BSZBUSH_RED",
+ "S_BSZBUSH_PURPLE",
+ "S_BSZBUSH_BLUE",
+ "S_BSZBUSH_CYAN",
+ "S_BSZBUSH_YELLOW",
+ "S_BSZBUSH_ORANGE",
+ "S_BSZVINE_RED",
+ "S_BSZVINE_PURPLE",
+ "S_BSZVINE_BLUE",
+ "S_BSZVINE_CYAN",
+ "S_BSZVINE_YELLOW",
+ "S_BSZVINE_ORANGE",
+ "S_BSZSHRUB",
+ "S_BSZCLOVER",
+ "S_BIG_PALMTREE_TRUNK",
+ "S_BIG_PALMTREE_TOP",
+ "S_PALMTREE_TRUNK",
+ "S_PALMTREE_TOP",
+
+ "S_DBALL1",
+ "S_DBALL2",
+ "S_DBALL3",
+ "S_DBALL4",
+ "S_DBALL5",
+ "S_DBALL6",
+ "S_EGGSTATUE2",
+
+ // Shield Orb
+ "S_ARMA1",
+ "S_ARMA2",
+ "S_ARMA3",
+ "S_ARMA4",
+ "S_ARMA5",
+ "S_ARMA6",
+ "S_ARMA7",
+ "S_ARMA8",
+ "S_ARMA9",
+ "S_ARMA10",
+ "S_ARMA11",
+ "S_ARMA12",
+ "S_ARMA13",
+ "S_ARMA14",
+ "S_ARMA15",
+ "S_ARMA16",
+
+ "S_ARMF1",
+ "S_ARMF2",
+ "S_ARMF3",
+ "S_ARMF4",
+ "S_ARMF5",
+ "S_ARMF6",
+ "S_ARMF7",
+ "S_ARMF8",
+ "S_ARMF9",
+ "S_ARMF10",
+ "S_ARMF11",
+ "S_ARMF12",
+ "S_ARMF13",
+ "S_ARMF14",
+ "S_ARMF15",
+ "S_ARMF16",
+ "S_ARMF17",
+ "S_ARMF18",
+ "S_ARMF19",
+ "S_ARMF20",
+ "S_ARMF21",
+ "S_ARMF22",
+ "S_ARMF23",
+ "S_ARMF24",
+ "S_ARMF25",
+ "S_ARMF26",
+ "S_ARMF27",
+ "S_ARMF28",
+ "S_ARMF29",
+ "S_ARMF30",
+ "S_ARMF31",
+ "S_ARMF32",
+
+ "S_ARMB1",
+ "S_ARMB2",
+ "S_ARMB3",
+ "S_ARMB4",
+ "S_ARMB5",
+ "S_ARMB6",
+ "S_ARMB7",
+ "S_ARMB8",
+ "S_ARMB9",
+ "S_ARMB10",
+ "S_ARMB11",
+ "S_ARMB12",
+ "S_ARMB13",
+ "S_ARMB14",
+ "S_ARMB15",
+ "S_ARMB16",
+ "S_ARMB17",
+ "S_ARMB18",
+ "S_ARMB19",
+ "S_ARMB20",
+ "S_ARMB21",
+ "S_ARMB22",
+ "S_ARMB23",
+ "S_ARMB24",
+ "S_ARMB25",
+ "S_ARMB26",
+ "S_ARMB27",
+ "S_ARMB28",
+ "S_ARMB29",
+ "S_ARMB30",
+ "S_ARMB31",
+ "S_ARMB32",
+
+ "S_WIND1",
+ "S_WIND2",
+ "S_WIND3",
+ "S_WIND4",
+ "S_WIND5",
+ "S_WIND6",
+ "S_WIND7",
+ "S_WIND8",
+
+ "S_MAGN1",
+ "S_MAGN2",
+ "S_MAGN3",
+ "S_MAGN4",
+ "S_MAGN5",
+ "S_MAGN6",
+ "S_MAGN7",
+ "S_MAGN8",
+ "S_MAGN9",
+ "S_MAGN10",
+ "S_MAGN11",
+ "S_MAGN12",
+ "S_MAGN13",
+
+ "S_FORC1",
+ "S_FORC2",
+ "S_FORC3",
+ "S_FORC4",
+ "S_FORC5",
+ "S_FORC6",
+ "S_FORC7",
+ "S_FORC8",
+ "S_FORC9",
+ "S_FORC10",
+
+ "S_FORC11",
+ "S_FORC12",
+ "S_FORC13",
+ "S_FORC14",
+ "S_FORC15",
+ "S_FORC16",
+ "S_FORC17",
+ "S_FORC18",
+ "S_FORC19",
+ "S_FORC20",
+
+ "S_FORC21",
+
+ "S_ELEM1",
+ "S_ELEM2",
+ "S_ELEM3",
+ "S_ELEM4",
+ "S_ELEM5",
+ "S_ELEM6",
+ "S_ELEM7",
+ "S_ELEM8",
+ "S_ELEM9",
+ "S_ELEM10",
+ "S_ELEM11",
+ "S_ELEM12",
+
+ "S_ELEM13",
+ "S_ELEM14",
+
+ "S_ELEMF1",
+ "S_ELEMF2",
+ "S_ELEMF3",
+ "S_ELEMF4",
+ "S_ELEMF5",
+ "S_ELEMF6",
+ "S_ELEMF7",
+ "S_ELEMF8",
+ "S_ELEMF9",
+ "S_ELEMF10",
+
+ "S_PITY1",
+ "S_PITY2",
+ "S_PITY3",
+ "S_PITY4",
+ "S_PITY5",
+ "S_PITY6",
+ "S_PITY7",
+ "S_PITY8",
+ "S_PITY9",
+ "S_PITY10",
+ "S_PITY11",
+ "S_PITY12",
+
+ "S_FIRS1",
+ "S_FIRS2",
+ "S_FIRS3",
+ "S_FIRS4",
+ "S_FIRS5",
+ "S_FIRS6",
+ "S_FIRS7",
+ "S_FIRS8",
+ "S_FIRS9",
+
+ "S_FIRS10",
+ "S_FIRS11",
+
+ "S_FIRSB1",
+ "S_FIRSB2",
+ "S_FIRSB3",
+ "S_FIRSB4",
+ "S_FIRSB5",
+ "S_FIRSB6",
+ "S_FIRSB7",
+ "S_FIRSB8",
+ "S_FIRSB9",
+
+ "S_FIRSB10",
+
+ "S_BUBS1",
+ "S_BUBS2",
+ "S_BUBS3",
+ "S_BUBS4",
+ "S_BUBS5",
+ "S_BUBS6",
+ "S_BUBS7",
+ "S_BUBS8",
+ "S_BUBS9",
+
+ "S_BUBS10",
+ "S_BUBS11",
+
+ "S_BUBSB1",
+ "S_BUBSB2",
+ "S_BUBSB3",
+ "S_BUBSB4",
+
+ "S_BUBSB5",
+ "S_BUBSB6",
+
+ "S_ZAPS1",
+ "S_ZAPS2",
+ "S_ZAPS3",
+ "S_ZAPS4",
+ "S_ZAPS5",
+ "S_ZAPS6",
+ "S_ZAPS7",
+ "S_ZAPS8",
+ "S_ZAPS9",
+ "S_ZAPS10",
+ "S_ZAPS11",
+ "S_ZAPS12",
+ "S_ZAPS13", // blank frame
+ "S_ZAPS14",
+ "S_ZAPS15",
+ "S_ZAPS16",
+
+ "S_ZAPSB1", // blank frame
+ "S_ZAPSB2",
+ "S_ZAPSB3",
+ "S_ZAPSB4",
+ "S_ZAPSB5",
+ "S_ZAPSB6",
+ "S_ZAPSB7",
+ "S_ZAPSB8",
+ "S_ZAPSB9",
+ "S_ZAPSB10",
+ "S_ZAPSB11", // blank frame
+
+ //Thunder spark
+ "S_THUNDERCOIN_SPARK",
+
+ // Invincibility Sparkles
+ "S_IVSP",
+
+ // Super Sonic Spark
+ "S_SSPK1",
+ "S_SSPK2",
+ "S_SSPK3",
+ "S_SSPK4",
+ "S_SSPK5",
+
+ // Flicky-sized bubble
+ "S_FLICKY_BUBBLE",
+
+ // Bluebird
+ "S_FLICKY_01_OUT",
+ "S_FLICKY_01_FLAP1",
+ "S_FLICKY_01_FLAP2",
+ "S_FLICKY_01_FLAP3",
+ "S_FLICKY_01_STAND",
+ "S_FLICKY_01_CENTER",
+
+ // Rabbit
+ "S_FLICKY_02_OUT",
+ "S_FLICKY_02_AIM",
+ "S_FLICKY_02_HOP",
+ "S_FLICKY_02_UP",
+ "S_FLICKY_02_DOWN",
+ "S_FLICKY_02_STAND",
+ "S_FLICKY_02_CENTER",
+
+ // Chicken
+ "S_FLICKY_03_OUT",
+ "S_FLICKY_03_AIM",
+ "S_FLICKY_03_HOP",
+ "S_FLICKY_03_UP",
+ "S_FLICKY_03_FLAP1",
+ "S_FLICKY_03_FLAP2",
+ "S_FLICKY_03_STAND",
+ "S_FLICKY_03_CENTER",
+
+ // Seal
+ "S_FLICKY_04_OUT",
+ "S_FLICKY_04_AIM",
+ "S_FLICKY_04_HOP",
+ "S_FLICKY_04_UP",
+ "S_FLICKY_04_DOWN",
+ "S_FLICKY_04_SWIM1",
+ "S_FLICKY_04_SWIM2",
+ "S_FLICKY_04_SWIM3",
+ "S_FLICKY_04_SWIM4",
+ "S_FLICKY_04_STAND",
+ "S_FLICKY_04_CENTER",
+
+ // Pig
+ "S_FLICKY_05_OUT",
+ "S_FLICKY_05_AIM",
+ "S_FLICKY_05_HOP",
+ "S_FLICKY_05_UP",
+ "S_FLICKY_05_DOWN",
+ "S_FLICKY_05_STAND",
+ "S_FLICKY_05_CENTER",
+
+ // Chipmunk
+ "S_FLICKY_06_OUT",
+ "S_FLICKY_06_AIM",
+ "S_FLICKY_06_HOP",
+ "S_FLICKY_06_UP",
+ "S_FLICKY_06_DOWN",
+ "S_FLICKY_06_STAND",
+ "S_FLICKY_06_CENTER",
+
+ // Penguin
+ "S_FLICKY_07_OUT",
+ "S_FLICKY_07_AIML",
+ "S_FLICKY_07_HOPL",
+ "S_FLICKY_07_UPL",
+ "S_FLICKY_07_DOWNL",
+ "S_FLICKY_07_AIMR",
+ "S_FLICKY_07_HOPR",
+ "S_FLICKY_07_UPR",
+ "S_FLICKY_07_DOWNR",
+ "S_FLICKY_07_SWIM1",
+ "S_FLICKY_07_SWIM2",
+ "S_FLICKY_07_SWIM3",
+ "S_FLICKY_07_STAND",
+ "S_FLICKY_07_CENTER",
+
+ // Fish
+ "S_FLICKY_08_OUT",
+ "S_FLICKY_08_AIM",
+ "S_FLICKY_08_HOP",
+ "S_FLICKY_08_FLAP1",
+ "S_FLICKY_08_FLAP2",
+ "S_FLICKY_08_FLAP3",
+ "S_FLICKY_08_FLAP4",
+ "S_FLICKY_08_SWIM1",
+ "S_FLICKY_08_SWIM2",
+ "S_FLICKY_08_SWIM3",
+ "S_FLICKY_08_SWIM4",
+ "S_FLICKY_08_STAND",
+ "S_FLICKY_08_CENTER",
+
+ // Ram
+ "S_FLICKY_09_OUT",
+ "S_FLICKY_09_AIM",
+ "S_FLICKY_09_HOP",
+ "S_FLICKY_09_UP",
+ "S_FLICKY_09_DOWN",
+ "S_FLICKY_09_STAND",
+ "S_FLICKY_09_CENTER",
+
+ // Puffin
+ "S_FLICKY_10_OUT",
+ "S_FLICKY_10_FLAP1",
+ "S_FLICKY_10_FLAP2",
+ "S_FLICKY_10_STAND",
+ "S_FLICKY_10_CENTER",
+
+ // Cow
+ "S_FLICKY_11_OUT",
+ "S_FLICKY_11_AIM",
+ "S_FLICKY_11_RUN1",
+ "S_FLICKY_11_RUN2",
+ "S_FLICKY_11_RUN3",
+ "S_FLICKY_11_STAND",
+ "S_FLICKY_11_CENTER",
+
+ // Rat
+ "S_FLICKY_12_OUT",
+ "S_FLICKY_12_AIM",
+ "S_FLICKY_12_RUN1",
+ "S_FLICKY_12_RUN2",
+ "S_FLICKY_12_RUN3",
+ "S_FLICKY_12_STAND",
+ "S_FLICKY_12_CENTER",
+
+ // Bear
+ "S_FLICKY_13_OUT",
+ "S_FLICKY_13_AIM",
+ "S_FLICKY_13_HOP",
+ "S_FLICKY_13_UP",
+ "S_FLICKY_13_DOWN",
+ "S_FLICKY_13_STAND",
+ "S_FLICKY_13_CENTER",
+
+ // Dove
+ "S_FLICKY_14_OUT",
+ "S_FLICKY_14_FLAP1",
+ "S_FLICKY_14_FLAP2",
+ "S_FLICKY_14_FLAP3",
+ "S_FLICKY_14_STAND",
+ "S_FLICKY_14_CENTER",
+
+ // Cat
+ "S_FLICKY_15_OUT",
+ "S_FLICKY_15_AIM",
+ "S_FLICKY_15_HOP",
+ "S_FLICKY_15_UP",
+ "S_FLICKY_15_DOWN",
+ "S_FLICKY_15_STAND",
+ "S_FLICKY_15_CENTER",
+
+ // Canary
+ "S_FLICKY_16_OUT",
+ "S_FLICKY_16_FLAP1",
+ "S_FLICKY_16_FLAP2",
+ "S_FLICKY_16_FLAP3",
+ "S_FLICKY_16_STAND",
+ "S_FLICKY_16_CENTER",
+
+ // Spider
+ "S_SECRETFLICKY_01_OUT",
+ "S_SECRETFLICKY_01_AIM",
+ "S_SECRETFLICKY_01_HOP",
+ "S_SECRETFLICKY_01_UP",
+ "S_SECRETFLICKY_01_DOWN",
+ "S_SECRETFLICKY_01_STAND",
+ "S_SECRETFLICKY_01_CENTER",
+
+ // Bat
+ "S_SECRETFLICKY_02_OUT",
+ "S_SECRETFLICKY_02_FLAP1",
+ "S_SECRETFLICKY_02_FLAP2",
+ "S_SECRETFLICKY_02_FLAP3",
+ "S_SECRETFLICKY_02_STAND",
+ "S_SECRETFLICKY_02_CENTER",
+
+ // Fan
+ "S_FAN",
+ "S_FAN2",
+ "S_FAN3",
+ "S_FAN4",
+ "S_FAN5",
+
+ // Steam Riser
+ "S_STEAM1",
+ "S_STEAM2",
+ "S_STEAM3",
+ "S_STEAM4",
+ "S_STEAM5",
+ "S_STEAM6",
+ "S_STEAM7",
+ "S_STEAM8",
+
+ // Bumpers
+ "S_BUMPER",
+ "S_BUMPERHIT",
+
+ // Balloons
+ "S_BALLOON",
+ "S_BALLOONPOP1",
+ "S_BALLOONPOP2",
+ "S_BALLOONPOP3",
+ "S_BALLOONPOP4",
+ "S_BALLOONPOP5",
+ "S_BALLOONPOP6",
+
+ // Yellow Spring
+ "S_YELLOWSPRING",
+ "S_YELLOWSPRING2",
+ "S_YELLOWSPRING3",
+ "S_YELLOWSPRING4",
+ "S_YELLOWSPRING5",
+
+ // Red Spring
+ "S_REDSPRING",
+ "S_REDSPRING2",
+ "S_REDSPRING3",
+ "S_REDSPRING4",
+ "S_REDSPRING5",
+
+ // Blue Spring
+ "S_BLUESPRING",
+ "S_BLUESPRING2",
+ "S_BLUESPRING3",
+ "S_BLUESPRING4",
+ "S_BLUESPRING5",
+
+ // Yellow Diagonal Spring
+ "S_YDIAG1",
+ "S_YDIAG2",
+ "S_YDIAG3",
+ "S_YDIAG4",
+ "S_YDIAG5",
+ "S_YDIAG6",
+ "S_YDIAG7",
+ "S_YDIAG8",
+
+ // Red Diagonal Spring
+ "S_RDIAG1",
+ "S_RDIAG2",
+ "S_RDIAG3",
+ "S_RDIAG4",
+ "S_RDIAG5",
+ "S_RDIAG6",
+ "S_RDIAG7",
+ "S_RDIAG8",
+
+ // Blue Diagonal Spring
+ "S_BDIAG1",
+ "S_BDIAG2",
+ "S_BDIAG3",
+ "S_BDIAG4",
+ "S_BDIAG5",
+ "S_BDIAG6",
+ "S_BDIAG7",
+ "S_BDIAG8",
+
+ // Yellow Side Spring
+ "S_YHORIZ1",
+ "S_YHORIZ2",
+ "S_YHORIZ3",
+ "S_YHORIZ4",
+ "S_YHORIZ5",
+ "S_YHORIZ6",
+ "S_YHORIZ7",
+ "S_YHORIZ8",
+
+ // Red Side Spring
+ "S_RHORIZ1",
+ "S_RHORIZ2",
+ "S_RHORIZ3",
+ "S_RHORIZ4",
+ "S_RHORIZ5",
+ "S_RHORIZ6",
+ "S_RHORIZ7",
+ "S_RHORIZ8",
+
+ // Blue Side Spring
+ "S_BHORIZ1",
+ "S_BHORIZ2",
+ "S_BHORIZ3",
+ "S_BHORIZ4",
+ "S_BHORIZ5",
+ "S_BHORIZ6",
+ "S_BHORIZ7",
+ "S_BHORIZ8",
+
+ // Booster
+ "S_BOOSTERSOUND",
+ "S_YELLOWBOOSTERROLLER",
+ "S_YELLOWBOOSTERSEG_LEFT",
+ "S_YELLOWBOOSTERSEG_RIGHT",
+ "S_YELLOWBOOSTERSEG_FACE",
+ "S_REDBOOSTERROLLER",
+ "S_REDBOOSTERSEG_LEFT",
+ "S_REDBOOSTERSEG_RIGHT",
+ "S_REDBOOSTERSEG_FACE",
+
+ // Rain
+ "S_RAIN1",
+ "S_RAINRETURN",
+
+ // Snowflake
+ "S_SNOW1",
+ "S_SNOW2",
+ "S_SNOW3",
+
+ // Water Splish
+ "S_SPLISH1",
+ "S_SPLISH2",
+ "S_SPLISH3",
+ "S_SPLISH4",
+ "S_SPLISH5",
+ "S_SPLISH6",
+ "S_SPLISH7",
+ "S_SPLISH8",
+ "S_SPLISH9",
+
+ // Lava Splish
+ "S_LAVASPLISH",
+
+ // added water splash
+ "S_SPLASH1",
+ "S_SPLASH2",
+ "S_SPLASH3",
+
+ // lava/slime damage burn smoke
+ "S_SMOKE1",
+ "S_SMOKE2",
+ "S_SMOKE3",
+ "S_SMOKE4",
+ "S_SMOKE5",
+
+ // Bubbles
+ "S_SMALLBUBBLE",
+ "S_MEDIUMBUBBLE",
+ "S_LARGEBUBBLE1",
+ "S_LARGEBUBBLE2",
+ "S_EXTRALARGEBUBBLE", // breathable
+
+ "S_POP1", // Extra Large bubble goes POP!
+
+ "S_WATERZAP",
+
+ // Spindash dust
+ "S_SPINDUST1",
+ "S_SPINDUST2",
+ "S_SPINDUST3",
+ "S_SPINDUST4",
+ "S_SPINDUST_BUBBLE1",
+ "S_SPINDUST_BUBBLE2",
+ "S_SPINDUST_BUBBLE3",
+ "S_SPINDUST_BUBBLE4",
+ "S_SPINDUST_FIRE1",
+ "S_SPINDUST_FIRE2",
+ "S_SPINDUST_FIRE3",
+ "S_SPINDUST_FIRE4",
+
+ "S_FOG1",
+ "S_FOG2",
+ "S_FOG3",
+ "S_FOG4",
+ "S_FOG5",
+ "S_FOG6",
+ "S_FOG7",
+ "S_FOG8",
+ "S_FOG9",
+ "S_FOG10",
+ "S_FOG11",
+ "S_FOG12",
+ "S_FOG13",
+ "S_FOG14",
+
+ "S_SEED",
+
+ "S_PARTICLE",
+
+ // Score Logos
+ "S_SCRA", // 100
+ "S_SCRB", // 200
+ "S_SCRC", // 500
+ "S_SCRD", // 1000
+ "S_SCRE", // 10000
+ "S_SCRF", // 400 (mario)
+ "S_SCRG", // 800 (mario)
+ "S_SCRH", // 2000 (mario)
+ "S_SCRI", // 4000 (mario)
+ "S_SCRJ", // 8000 (mario)
+ "S_SCRK", // 1UP (mario)
+ "S_SCRL", // 10
+
+ // Drowning Timer Numbers
+ "S_ZERO1",
+ "S_ONE1",
+ "S_TWO1",
+ "S_THREE1",
+ "S_FOUR1",
+ "S_FIVE1",
+
+ "S_ZERO2",
+ "S_ONE2",
+ "S_TWO2",
+ "S_THREE2",
+ "S_FOUR2",
+ "S_FIVE2",
+
+ "S_FLIGHTINDICATOR",
+
+ "S_LOCKON1",
+ "S_LOCKON2",
+ "S_LOCKON3",
+ "S_LOCKON4",
+ "S_LOCKONINF1",
+ "S_LOCKONINF2",
+ "S_LOCKONINF3",
+ "S_LOCKONINF4",
+
+ // Tag Sign
+ "S_TTAG",
+
+ // Got Flag Sign
+ "S_GOTFLAG",
+
+ // Finish flag
+ "S_FINISHFLAG",
+
+ "S_CORK",
+ "S_LHRT",
+
+ // Red Ring
+ "S_RRNG1",
+ "S_RRNG2",
+ "S_RRNG3",
+ "S_RRNG4",
+ "S_RRNG5",
+ "S_RRNG6",
+ "S_RRNG7",
+
+ // Weapon Ring Ammo
+ "S_BOUNCERINGAMMO",
+ "S_RAILRINGAMMO",
+ "S_INFINITYRINGAMMO",
+ "S_AUTOMATICRINGAMMO",
+ "S_EXPLOSIONRINGAMMO",
+ "S_SCATTERRINGAMMO",
+ "S_GRENADERINGAMMO",
+
+ // Weapon pickup
+ "S_BOUNCEPICKUP",
+ "S_BOUNCEPICKUPFADE1",
+ "S_BOUNCEPICKUPFADE2",
+ "S_BOUNCEPICKUPFADE3",
+ "S_BOUNCEPICKUPFADE4",
+ "S_BOUNCEPICKUPFADE5",
+ "S_BOUNCEPICKUPFADE6",
+ "S_BOUNCEPICKUPFADE7",
+ "S_BOUNCEPICKUPFADE8",
+
+ "S_RAILPICKUP",
+ "S_RAILPICKUPFADE1",
+ "S_RAILPICKUPFADE2",
+ "S_RAILPICKUPFADE3",
+ "S_RAILPICKUPFADE4",
+ "S_RAILPICKUPFADE5",
+ "S_RAILPICKUPFADE6",
+ "S_RAILPICKUPFADE7",
+ "S_RAILPICKUPFADE8",
+
+ "S_AUTOPICKUP",
+ "S_AUTOPICKUPFADE1",
+ "S_AUTOPICKUPFADE2",
+ "S_AUTOPICKUPFADE3",
+ "S_AUTOPICKUPFADE4",
+ "S_AUTOPICKUPFADE5",
+ "S_AUTOPICKUPFADE6",
+ "S_AUTOPICKUPFADE7",
+ "S_AUTOPICKUPFADE8",
+
+ "S_EXPLODEPICKUP",
+ "S_EXPLODEPICKUPFADE1",
+ "S_EXPLODEPICKUPFADE2",
+ "S_EXPLODEPICKUPFADE3",
+ "S_EXPLODEPICKUPFADE4",
+ "S_EXPLODEPICKUPFADE5",
+ "S_EXPLODEPICKUPFADE6",
+ "S_EXPLODEPICKUPFADE7",
+ "S_EXPLODEPICKUPFADE8",
+
+ "S_SCATTERPICKUP",
+ "S_SCATTERPICKUPFADE1",
+ "S_SCATTERPICKUPFADE2",
+ "S_SCATTERPICKUPFADE3",
+ "S_SCATTERPICKUPFADE4",
+ "S_SCATTERPICKUPFADE5",
+ "S_SCATTERPICKUPFADE6",
+ "S_SCATTERPICKUPFADE7",
+ "S_SCATTERPICKUPFADE8",
+
+ "S_GRENADEPICKUP",
+ "S_GRENADEPICKUPFADE1",
+ "S_GRENADEPICKUPFADE2",
+ "S_GRENADEPICKUPFADE3",
+ "S_GRENADEPICKUPFADE4",
+ "S_GRENADEPICKUPFADE5",
+ "S_GRENADEPICKUPFADE6",
+ "S_GRENADEPICKUPFADE7",
+ "S_GRENADEPICKUPFADE8",
+
+ // Thrown Weapon Rings
+ "S_THROWNBOUNCE1",
+ "S_THROWNBOUNCE2",
+ "S_THROWNBOUNCE3",
+ "S_THROWNBOUNCE4",
+ "S_THROWNBOUNCE5",
+ "S_THROWNBOUNCE6",
+ "S_THROWNBOUNCE7",
+ "S_THROWNINFINITY1",
+ "S_THROWNINFINITY2",
+ "S_THROWNINFINITY3",
+ "S_THROWNINFINITY4",
+ "S_THROWNINFINITY5",
+ "S_THROWNINFINITY6",
+ "S_THROWNINFINITY7",
+ "S_THROWNAUTOMATIC1",
+ "S_THROWNAUTOMATIC2",
+ "S_THROWNAUTOMATIC3",
+ "S_THROWNAUTOMATIC4",
+ "S_THROWNAUTOMATIC5",
+ "S_THROWNAUTOMATIC6",
+ "S_THROWNAUTOMATIC7",
+ "S_THROWNEXPLOSION1",
+ "S_THROWNEXPLOSION2",
+ "S_THROWNEXPLOSION3",
+ "S_THROWNEXPLOSION4",
+ "S_THROWNEXPLOSION5",
+ "S_THROWNEXPLOSION6",
+ "S_THROWNEXPLOSION7",
+ "S_THROWNGRENADE1",
+ "S_THROWNGRENADE2",
+ "S_THROWNGRENADE3",
+ "S_THROWNGRENADE4",
+ "S_THROWNGRENADE5",
+ "S_THROWNGRENADE6",
+ "S_THROWNGRENADE7",
+ "S_THROWNGRENADE8",
+ "S_THROWNGRENADE9",
+ "S_THROWNGRENADE10",
+ "S_THROWNGRENADE11",
+ "S_THROWNGRENADE12",
+ "S_THROWNGRENADE13",
+ "S_THROWNGRENADE14",
+ "S_THROWNGRENADE15",
+ "S_THROWNGRENADE16",
+ "S_THROWNGRENADE17",
+ "S_THROWNGRENADE18",
+ "S_THROWNSCATTER",
+
+ "S_RINGEXPLODE",
+
+ "S_COIN1",
+ "S_COIN2",
+ "S_COIN3",
+ "S_COINSPARKLE1",
+ "S_COINSPARKLE2",
+ "S_COINSPARKLE3",
+ "S_COINSPARKLE4",
+ "S_GOOMBA1",
+ "S_GOOMBA1B",
+ "S_GOOMBA2",
+ "S_GOOMBA3",
+ "S_GOOMBA4",
+ "S_GOOMBA5",
+ "S_GOOMBA6",
+ "S_GOOMBA7",
+ "S_GOOMBA8",
+ "S_GOOMBA9",
+ "S_GOOMBA_DEAD",
+ "S_BLUEGOOMBA1",
+ "S_BLUEGOOMBA1B",
+ "S_BLUEGOOMBA2",
+ "S_BLUEGOOMBA3",
+ "S_BLUEGOOMBA4",
+ "S_BLUEGOOMBA5",
+ "S_BLUEGOOMBA6",
+ "S_BLUEGOOMBA7",
+ "S_BLUEGOOMBA8",
+ "S_BLUEGOOMBA9",
+ "S_BLUEGOOMBA_DEAD",
+
+ // Mario-specific stuff
+ "S_FIREFLOWER1",
+ "S_FIREFLOWER2",
+ "S_FIREFLOWER3",
+ "S_FIREFLOWER4",
+ "S_FIREBALL",
+ "S_FIREBALLTRAIL1",
+ "S_FIREBALLTRAIL2",
+ "S_SHELL",
+ "S_PUMA_START1",
+ "S_PUMA_START2",
+ "S_PUMA_UP1",
+ "S_PUMA_UP2",
+ "S_PUMA_UP3",
+ "S_PUMA_DOWN1",
+ "S_PUMA_DOWN2",
+ "S_PUMA_DOWN3",
+ "S_PUMATRAIL1",
+ "S_PUMATRAIL2",
+ "S_PUMATRAIL3",
+ "S_PUMATRAIL4",
+ "S_HAMMER",
+ "S_KOOPA1",
+ "S_KOOPA2",
+ "S_KOOPAFLAME1",
+ "S_KOOPAFLAME2",
+ "S_KOOPAFLAME3",
+ "S_AXE1",
+ "S_AXE2",
+ "S_AXE3",
+ "S_MARIOBUSH1",
+ "S_MARIOBUSH2",
+ "S_TOAD",
+
+ // Nights-specific stuff
+ "S_NIGHTSDRONE_MAN1",
+ "S_NIGHTSDRONE_MAN2",
+ "S_NIGHTSDRONE_SPARKLING1",
+ "S_NIGHTSDRONE_SPARKLING2",
+ "S_NIGHTSDRONE_SPARKLING3",
+ "S_NIGHTSDRONE_SPARKLING4",
+ "S_NIGHTSDRONE_SPARKLING5",
+ "S_NIGHTSDRONE_SPARKLING6",
+ "S_NIGHTSDRONE_SPARKLING7",
+ "S_NIGHTSDRONE_SPARKLING8",
+ "S_NIGHTSDRONE_SPARKLING9",
+ "S_NIGHTSDRONE_SPARKLING10",
+ "S_NIGHTSDRONE_SPARKLING11",
+ "S_NIGHTSDRONE_SPARKLING12",
+ "S_NIGHTSDRONE_SPARKLING13",
+ "S_NIGHTSDRONE_SPARKLING14",
+ "S_NIGHTSDRONE_SPARKLING15",
+ "S_NIGHTSDRONE_SPARKLING16",
+ "S_NIGHTSDRONE_GOAL1",
+ "S_NIGHTSDRONE_GOAL2",
+ "S_NIGHTSDRONE_GOAL3",
+ "S_NIGHTSDRONE_GOAL4",
+
+ "S_NIGHTSPARKLE1",
+ "S_NIGHTSPARKLE2",
+ "S_NIGHTSPARKLE3",
+ "S_NIGHTSPARKLE4",
+ "S_NIGHTSPARKLESUPER1",
+ "S_NIGHTSPARKLESUPER2",
+ "S_NIGHTSPARKLESUPER3",
+ "S_NIGHTSPARKLESUPER4",
+ "S_NIGHTSLOOPHELPER",
+
+ // NiGHTS bumper
+ "S_NIGHTSBUMPER1",
+ "S_NIGHTSBUMPER2",
+ "S_NIGHTSBUMPER3",
+ "S_NIGHTSBUMPER4",
+ "S_NIGHTSBUMPER5",
+ "S_NIGHTSBUMPER6",
+ "S_NIGHTSBUMPER7",
+ "S_NIGHTSBUMPER8",
+ "S_NIGHTSBUMPER9",
+ "S_NIGHTSBUMPER10",
+ "S_NIGHTSBUMPER11",
+ "S_NIGHTSBUMPER12",
+
+ "S_HOOP",
+ "S_HOOP_XMASA",
+ "S_HOOP_XMASB",
+
+ "S_NIGHTSCORE10",
+ "S_NIGHTSCORE20",
+ "S_NIGHTSCORE30",
+ "S_NIGHTSCORE40",
+ "S_NIGHTSCORE50",
+ "S_NIGHTSCORE60",
+ "S_NIGHTSCORE70",
+ "S_NIGHTSCORE80",
+ "S_NIGHTSCORE90",
+ "S_NIGHTSCORE100",
+ "S_NIGHTSCORE10_2",
+ "S_NIGHTSCORE20_2",
+ "S_NIGHTSCORE30_2",
+ "S_NIGHTSCORE40_2",
+ "S_NIGHTSCORE50_2",
+ "S_NIGHTSCORE60_2",
+ "S_NIGHTSCORE70_2",
+ "S_NIGHTSCORE80_2",
+ "S_NIGHTSCORE90_2",
+ "S_NIGHTSCORE100_2",
+
+ // NiGHTS Paraloop Powerups
+ "S_NIGHTSSUPERLOOP",
+ "S_NIGHTSDRILLREFILL",
+ "S_NIGHTSHELPER",
+ "S_NIGHTSEXTRATIME",
+ "S_NIGHTSLINKFREEZE",
+ "S_EGGCAPSULE",
+
+ // Orbiting Chaos Emeralds
+ "S_ORBITEM1",
+ "S_ORBITEM2",
+ "S_ORBITEM3",
+ "S_ORBITEM4",
+ "S_ORBITEM5",
+ "S_ORBITEM6",
+ "S_ORBITEM7",
+ "S_ORBITEM8",
+ "S_ORBIDYA1",
+ "S_ORBIDYA2",
+ "S_ORBIDYA3",
+ "S_ORBIDYA4",
+ "S_ORBIDYA5",
+
+ // "Flicky" helper
+ "S_NIGHTOPIANHELPER1",
+ "S_NIGHTOPIANHELPER2",
+ "S_NIGHTOPIANHELPER3",
+ "S_NIGHTOPIANHELPER4",
+ "S_NIGHTOPIANHELPER5",
+ "S_NIGHTOPIANHELPER6",
+ "S_NIGHTOPIANHELPER7",
+ "S_NIGHTOPIANHELPER8",
+ "S_NIGHTOPIANHELPER9",
+
+ // Nightopian
+ "S_PIAN0",
+ "S_PIAN1",
+ "S_PIAN2",
+ "S_PIAN3",
+ "S_PIAN4",
+ "S_PIAN5",
+ "S_PIAN6",
+ "S_PIANSING",
+
+ // Shleep
+ "S_SHLEEP1",
+ "S_SHLEEP2",
+ "S_SHLEEP3",
+ "S_SHLEEP4",
+ "S_SHLEEPBOUNCE1",
+ "S_SHLEEPBOUNCE2",
+ "S_SHLEEPBOUNCE3",
+
+ // Secret badniks and hazards, shhhh
+ "S_PENGUINATOR_LOOK",
+ "S_PENGUINATOR_WADDLE1",
+ "S_PENGUINATOR_WADDLE2",
+ "S_PENGUINATOR_WADDLE3",
+ "S_PENGUINATOR_WADDLE4",
+ "S_PENGUINATOR_SLIDE1",
+ "S_PENGUINATOR_SLIDE2",
+ "S_PENGUINATOR_SLIDE3",
+ "S_PENGUINATOR_SLIDE4",
+ "S_PENGUINATOR_SLIDE5",
+
+ "S_POPHAT_LOOK",
+ "S_POPHAT_SHOOT1",
+ "S_POPHAT_SHOOT2",
+ "S_POPHAT_SHOOT3",
+ "S_POPHAT_SHOOT4",
+ "S_POPSHOT",
+ "S_POPSHOT_TRAIL",
+
+ "S_HIVEELEMENTAL_LOOK",
+ "S_HIVEELEMENTAL_PREPARE1",
+ "S_HIVEELEMENTAL_PREPARE2",
+ "S_HIVEELEMENTAL_SHOOT1",
+ "S_HIVEELEMENTAL_SHOOT2",
+ "S_HIVEELEMENTAL_DORMANT",
+ "S_HIVEELEMENTAL_PAIN",
+ "S_HIVEELEMENTAL_DIE1",
+ "S_HIVEELEMENTAL_DIE2",
+ "S_HIVEELEMENTAL_DIE3",
+
+ "S_BUMBLEBORE_SPAWN",
+ "S_BUMBLEBORE_LOOK1",
+ "S_BUMBLEBORE_LOOK2",
+ "S_BUMBLEBORE_FLY1",
+ "S_BUMBLEBORE_FLY2",
+ "S_BUMBLEBORE_RAISE",
+ "S_BUMBLEBORE_FALL1",
+ "S_BUMBLEBORE_FALL2",
+ "S_BUMBLEBORE_STUCK1",
+ "S_BUMBLEBORE_STUCK2",
+ "S_BUMBLEBORE_DIE",
+
+ "S_BUGGLEIDLE",
+ "S_BUGGLEFLY",
+
+ "S_SMASHSPIKE_FLOAT",
+ "S_SMASHSPIKE_EASE1",
+ "S_SMASHSPIKE_EASE2",
+ "S_SMASHSPIKE_FALL",
+ "S_SMASHSPIKE_STOMP1",
+ "S_SMASHSPIKE_STOMP2",
+ "S_SMASHSPIKE_RISE1",
+ "S_SMASHSPIKE_RISE2",
+
+ "S_CACO_LOOK",
+ "S_CACO_WAKE1",
+ "S_CACO_WAKE2",
+ "S_CACO_WAKE3",
+ "S_CACO_WAKE4",
+ "S_CACO_ROAR",
+ "S_CACO_CHASE",
+ "S_CACO_CHASE_REPEAT",
+ "S_CACO_RANDOM",
+ "S_CACO_PREPARE_SOUND",
+ "S_CACO_PREPARE1",
+ "S_CACO_PREPARE2",
+ "S_CACO_PREPARE3",
+ "S_CACO_SHOOT_SOUND",
+ "S_CACO_SHOOT1",
+ "S_CACO_SHOOT2",
+ "S_CACO_CLOSE",
+ "S_CACO_DIE_FLAGS",
+ "S_CACO_DIE_GIB1",
+ "S_CACO_DIE_GIB2",
+ "S_CACO_DIE_SCREAM",
+ "S_CACO_DIE_SHATTER",
+ "S_CACO_DIE_FALL",
+ "S_CACOSHARD_RANDOMIZE",
+ "S_CACOSHARD1_1",
+ "S_CACOSHARD1_2",
+ "S_CACOSHARD2_1",
+ "S_CACOSHARD2_2",
+ "S_CACOFIRE1",
+ "S_CACOFIRE2",
+ "S_CACOFIRE3",
+ "S_CACOFIRE_EXPLODE1",
+ "S_CACOFIRE_EXPLODE2",
+ "S_CACOFIRE_EXPLODE3",
+ "S_CACOFIRE_EXPLODE4",
+
+ "S_SPINBOBERT_MOVE_FLIPUP",
+ "S_SPINBOBERT_MOVE_UP",
+ "S_SPINBOBERT_MOVE_FLIPDOWN",
+ "S_SPINBOBERT_MOVE_DOWN",
+ "S_SPINBOBERT_FIRE_MOVE",
+ "S_SPINBOBERT_FIRE_GHOST",
+ "S_SPINBOBERT_FIRE_TRAIL1",
+ "S_SPINBOBERT_FIRE_TRAIL2",
+ "S_SPINBOBERT_FIRE_TRAIL3",
+
+ "S_HANGSTER_LOOK",
+ "S_HANGSTER_SWOOP1",
+ "S_HANGSTER_SWOOP2",
+ "S_HANGSTER_ARC1",
+ "S_HANGSTER_ARC2",
+ "S_HANGSTER_ARC3",
+ "S_HANGSTER_FLY1",
+ "S_HANGSTER_FLY2",
+ "S_HANGSTER_FLY3",
+ "S_HANGSTER_FLY4",
+ "S_HANGSTER_FLYREPEAT",
+ "S_HANGSTER_ARCUP1",
+ "S_HANGSTER_ARCUP2",
+ "S_HANGSTER_ARCUP3",
+ "S_HANGSTER_RETURN1",
+ "S_HANGSTER_RETURN2",
+ "S_HANGSTER_RETURN3",
+
+ "S_CRUMBLE1",
+ "S_CRUMBLE2",
+
+ // Spark
+ "S_SPRK1",
+ "S_SPRK2",
+ "S_SPRK3",
+
+ // Robot Explosion
+ "S_XPLD_FLICKY",
+ "S_XPLD1",
+ "S_XPLD2",
+ "S_XPLD3",
+ "S_XPLD4",
+ "S_XPLD5",
+ "S_XPLD6",
+ "S_XPLD_EGGTRAP",
+
+ // Underwater Explosion
+ "S_WPLD1",
+ "S_WPLD2",
+ "S_WPLD3",
+ "S_WPLD4",
+ "S_WPLD5",
+ "S_WPLD6",
+
+ "S_DUST1",
+ "S_DUST2",
+ "S_DUST3",
+ "S_DUST4",
+
+ "S_ROCKSPAWN",
+
+ "S_ROCKCRUMBLEA",
+ "S_ROCKCRUMBLEB",
+ "S_ROCKCRUMBLEC",
+ "S_ROCKCRUMBLED",
+ "S_ROCKCRUMBLEE",
+ "S_ROCKCRUMBLEF",
+ "S_ROCKCRUMBLEG",
+ "S_ROCKCRUMBLEH",
+ "S_ROCKCRUMBLEI",
+ "S_ROCKCRUMBLEJ",
+ "S_ROCKCRUMBLEK",
+ "S_ROCKCRUMBLEL",
+ "S_ROCKCRUMBLEM",
+ "S_ROCKCRUMBLEN",
+ "S_ROCKCRUMBLEO",
+ "S_ROCKCRUMBLEP",
+
+ // Level debris
+ "S_GFZDEBRIS",
+ "S_BRICKDEBRIS",
+ "S_WOODDEBRIS",
+ "S_REDBRICKDEBRIS",
+ "S_BLUEBRICKDEBRIS",
+ "S_YELLOWBRICKDEBRIS",
+
+ "S_NAMECHECK",
+};
+
+// RegEx to generate this from info.h: ^\tMT_([^,]+), --> \t"MT_\1",
+// I am leaving the prefixes solely for clarity to programmers,
+// because sadly no one remembers this place while searching for full state names.
+const char *const MOBJTYPE_LIST[] = { // array length left dynamic for sanity testing later.
+ "MT_NULL",
+ "MT_UNKNOWN",
+
+ "MT_THOK", // Thok! mobj
+ "MT_PLAYER",
+ "MT_TAILSOVERLAY", // c:
+ "MT_METALJETFUME",
+
+ // Enemies
+ "MT_BLUECRAWLA", // Crawla (Blue)
+ "MT_REDCRAWLA", // Crawla (Red)
+ "MT_GFZFISH", // SDURF
+ "MT_GOLDBUZZ", // Buzz (Gold)
+ "MT_REDBUZZ", // Buzz (Red)
+ "MT_JETTBOMBER", // Jetty-Syn Bomber
+ "MT_JETTGUNNER", // Jetty-Syn Gunner
+ "MT_CRAWLACOMMANDER", // Crawla Commander
+ "MT_DETON", // Deton
+ "MT_SKIM", // Skim mine dropper
+ "MT_TURRET", // Industrial Turret
+ "MT_POPUPTURRET", // Pop-Up Turret
+ "MT_SPINCUSHION", // Spincushion
+ "MT_CRUSHSTACEAN", // Crushstacean
+ "MT_CRUSHCLAW", // Big meaty claw
+ "MT_CRUSHCHAIN", // Chain
+ "MT_BANPYURA", // Banpyura
+ "MT_BANPSPRING", // Banpyura spring
+ "MT_JETJAW", // Jet Jaw
+ "MT_SNAILER", // Snailer
+ "MT_VULTURE", // BASH
+ "MT_POINTY", // Pointy
+ "MT_POINTYBALL", // Pointy Ball
+ "MT_ROBOHOOD", // Robo-Hood
+ "MT_FACESTABBER", // Castlebot Facestabber
+ "MT_FACESTABBERSPEAR", // Castlebot Facestabber spear aura
+ "MT_EGGGUARD", // Egg Guard
+ "MT_EGGSHIELD", // Egg Guard's shield
+ "MT_GSNAPPER", // Green Snapper
+ "MT_SNAPPER_LEG", // Green Snapper leg
+ "MT_SNAPPER_HEAD", // Green Snapper head
+ "MT_MINUS", // Minus
+ "MT_MINUSDIRT", // Minus dirt
+ "MT_SPRINGSHELL", // Spring Shell
+ "MT_YELLOWSHELL", // Spring Shell (yellow)
+ "MT_UNIDUS", // Unidus
+ "MT_UNIBALL", // Unidus Ball
+ "MT_CANARIVORE", // Canarivore
+ "MT_CANARIVORE_GAS", // Canarivore gas
+ "MT_PYREFLY", // Pyre Fly
+ "MT_PYREFLY_FIRE", // Pyre Fly fire
+ "MT_PTERABYTESPAWNER", // Pterabyte spawner
+ "MT_PTERABYTEWAYPOINT", // Pterabyte waypoint
+ "MT_PTERABYTE", // Pterabyte
+ "MT_DRAGONBOMBER", // Dragonbomber
+ "MT_DRAGONWING", // Dragonbomber wing
+ "MT_DRAGONTAIL", // Dragonbomber tail segment
+ "MT_DRAGONMINE", // Dragonbomber mine
+
+ // Generic Boss Items
+ "MT_BOSSEXPLODE",
+ "MT_SONIC3KBOSSEXPLODE",
+ "MT_BOSSFLYPOINT",
+ "MT_EGGTRAP",
+ "MT_BOSS3WAYPOINT",
+ "MT_BOSS9GATHERPOINT",
+ "MT_BOSSJUNK",
+
+ // Boss 1
+ "MT_EGGMOBILE",
+ "MT_JETFUME1",
+ "MT_EGGMOBILE_BALL",
+ "MT_EGGMOBILE_TARGET",
+ "MT_EGGMOBILE_FIRE",
+
+ // Boss 2
+ "MT_EGGMOBILE2",
+ "MT_EGGMOBILE2_POGO",
+ "MT_GOOP",
+ "MT_GOOPTRAIL",
+
+ // Boss 3
+ "MT_EGGMOBILE3",
+ "MT_FAKEMOBILE",
+ "MT_SHOCKWAVE",
+
+ // Boss 4
+ "MT_EGGMOBILE4",
+ "MT_EGGMOBILE4_MACE",
+ "MT_JETFLAME",
+ "MT_EGGROBO1",
+ "MT_EGGROBO1JET",
+
+ // Boss 5
+ "MT_FANG",
+ "MT_BROKENROBOT",
+ "MT_VWREF",
+ "MT_VWREB",
+ "MT_PROJECTORLIGHT",
+ "MT_FBOMB",
+ "MT_TNTDUST", // also used by barrel
+ "MT_FSGNA",
+ "MT_FSGNB",
+ "MT_FANGWAYPOINT",
+
+ // Black Eggman (Boss 7)
+ "MT_BLACKEGGMAN",
+ "MT_BLACKEGGMAN_HELPER",
+ "MT_BLACKEGGMAN_GOOPFIRE",
+ "MT_BLACKEGGMAN_MISSILE",
+
+ // New Very-Last-Minute 2.1 Brak Eggman (Cy-Brak-demon)
+ "MT_CYBRAKDEMON",
+ "MT_CYBRAKDEMON_ELECTRIC_BARRIER",
+ "MT_CYBRAKDEMON_MISSILE",
+ "MT_CYBRAKDEMON_FLAMESHOT",
+ "MT_CYBRAKDEMON_FLAMEREST",
+ "MT_CYBRAKDEMON_TARGET_RETICULE",
+ "MT_CYBRAKDEMON_TARGET_DOT",
+ "MT_CYBRAKDEMON_NAPALM_BOMB_LARGE",
+ "MT_CYBRAKDEMON_NAPALM_BOMB_SMALL",
+ "MT_CYBRAKDEMON_NAPALM_FLAMES",
+ "MT_CYBRAKDEMON_VILE_EXPLOSION",
+
+ // Metal Sonic (Boss 9)
+ "MT_METALSONIC_RACE",
+ "MT_METALSONIC_BATTLE",
+ "MT_MSSHIELD_FRONT",
+ "MT_MSGATHER",
+
+ // Collectible Items
+ "MT_RING",
+ "MT_FLINGRING", // Lost ring
+ "MT_BLUESPHERE", // Blue sphere for special stages
+ "MT_FLINGBLUESPHERE", // Lost blue sphere
+ "MT_BOMBSPHERE",
+ "MT_REDTEAMRING", //Rings collectable by red team.
+ "MT_BLUETEAMRING", //Rings collectable by blue team.
+ "MT_TOKEN", // Special Stage token for special stage
+ "MT_REDFLAG", // Red CTF Flag
+ "MT_BLUEFLAG", // Blue CTF Flag
+ "MT_EMBLEM",
+ "MT_EMERALD1",
+ "MT_EMERALD2",
+ "MT_EMERALD3",
+ "MT_EMERALD4",
+ "MT_EMERALD5",
+ "MT_EMERALD6",
+ "MT_EMERALD7",
+ "MT_EMERHUNT", // Emerald Hunt
+ "MT_EMERALDSPAWN", // Emerald spawner w/ delay
+ "MT_FLINGEMERALD", // Lost emerald
+
+ // Springs and others
+ "MT_FAN",
+ "MT_STEAM",
+ "MT_BUMPER",
+ "MT_BALLOON",
+
+ "MT_YELLOWSPRING",
+ "MT_REDSPRING",
+ "MT_BLUESPRING",
+ "MT_YELLOWDIAG",
+ "MT_REDDIAG",
+ "MT_BLUEDIAG",
+ "MT_YELLOWHORIZ",
+ "MT_REDHORIZ",
+ "MT_BLUEHORIZ",
+
+ "MT_BOOSTERSEG",
+ "MT_BOOSTERROLLER",
+ "MT_YELLOWBOOSTER",
+ "MT_REDBOOSTER",
+
+ // Interactive Objects
+ "MT_BUBBLES", // Bubble source
+ "MT_SIGN", // Level end sign
+ "MT_SPIKEBALL", // Spike Ball
+ "MT_SPINFIRE",
+ "MT_SPIKE",
+ "MT_WALLSPIKE",
+ "MT_WALLSPIKEBASE",
+ "MT_STARPOST",
+ "MT_BIGMINE",
+ "MT_BLASTEXECUTOR",
+ "MT_CANNONLAUNCHER",
+
+ // Monitor miscellany
+ "MT_BOXSPARKLE",
+
+ // Monitor boxes -- regular
+ "MT_RING_BOX",
+ "MT_PITY_BOX",
+ "MT_ATTRACT_BOX",
+ "MT_FORCE_BOX",
+ "MT_ARMAGEDDON_BOX",
+ "MT_WHIRLWIND_BOX",
+ "MT_ELEMENTAL_BOX",
+ "MT_SNEAKERS_BOX",
+ "MT_INVULN_BOX",
+ "MT_1UP_BOX",
+ "MT_EGGMAN_BOX",
+ "MT_MIXUP_BOX",
+ "MT_MYSTERY_BOX",
+ "MT_GRAVITY_BOX",
+ "MT_RECYCLER_BOX",
+ "MT_SCORE1K_BOX",
+ "MT_SCORE10K_BOX",
+ "MT_FLAMEAURA_BOX",
+ "MT_BUBBLEWRAP_BOX",
+ "MT_THUNDERCOIN_BOX",
+
+ // Monitor boxes -- repeating (big) boxes
+ "MT_PITY_GOLDBOX",
+ "MT_ATTRACT_GOLDBOX",
+ "MT_FORCE_GOLDBOX",
+ "MT_ARMAGEDDON_GOLDBOX",
+ "MT_WHIRLWIND_GOLDBOX",
+ "MT_ELEMENTAL_GOLDBOX",
+ "MT_SNEAKERS_GOLDBOX",
+ "MT_INVULN_GOLDBOX",
+ "MT_EGGMAN_GOLDBOX",
+ "MT_GRAVITY_GOLDBOX",
+ "MT_FLAMEAURA_GOLDBOX",
+ "MT_BUBBLEWRAP_GOLDBOX",
+ "MT_THUNDERCOIN_GOLDBOX",
+
+ // Monitor boxes -- special
+ "MT_RING_REDBOX",
+ "MT_RING_BLUEBOX",
+
+ // Monitor icons
+ "MT_RING_ICON",
+ "MT_PITY_ICON",
+ "MT_ATTRACT_ICON",
+ "MT_FORCE_ICON",
+ "MT_ARMAGEDDON_ICON",
+ "MT_WHIRLWIND_ICON",
+ "MT_ELEMENTAL_ICON",
+ "MT_SNEAKERS_ICON",
+ "MT_INVULN_ICON",
+ "MT_1UP_ICON",
+ "MT_EGGMAN_ICON",
+ "MT_MIXUP_ICON",
+ "MT_GRAVITY_ICON",
+ "MT_RECYCLER_ICON",
+ "MT_SCORE1K_ICON",
+ "MT_SCORE10K_ICON",
+ "MT_FLAMEAURA_ICON",
+ "MT_BUBBLEWRAP_ICON",
+ "MT_THUNDERCOIN_ICON",
+
+ // Projectiles
+ "MT_ROCKET",
+ "MT_LASER",
+ "MT_TORPEDO",
+ "MT_TORPEDO2", // silent
+ "MT_ENERGYBALL",
+ "MT_MINE", // Skim/Jetty-Syn mine
+ "MT_JETTBULLET", // Jetty-Syn Bullet
+ "MT_TURRETLASER",
+ "MT_CANNONBALL", // Cannonball
+ "MT_CANNONBALLDECOR", // Decorative/still cannonball
+ "MT_ARROW", // Arrow
+ "MT_DEMONFIRE", // Glaregoyle fire
+
+ // The letter
+ "MT_LETTER",
+
+ // Greenflower Scenery
+ "MT_GFZFLOWER1",
+ "MT_GFZFLOWER2",
+ "MT_GFZFLOWER3",
+
+ "MT_BLUEBERRYBUSH",
+ "MT_BERRYBUSH",
+ "MT_BUSH",
+
+ // Trees (both GFZ and misc)
+ "MT_GFZTREE",
+ "MT_GFZBERRYTREE",
+ "MT_GFZCHERRYTREE",
+ "MT_CHECKERTREE",
+ "MT_CHECKERSUNSETTREE",
+ "MT_FHZTREE", // Frozen Hillside
+ "MT_FHZPINKTREE",
+ "MT_POLYGONTREE",
+ "MT_BUSHTREE",
+ "MT_BUSHREDTREE",
+ "MT_SPRINGTREE",
+
+ // Techno Hill Scenery
+ "MT_THZFLOWER1",
+ "MT_THZFLOWER2",
+ "MT_THZFLOWER3",
+ "MT_THZTREE", // Steam whistle tree/bush
+ "MT_THZTREEBRANCH", // branch of said tree
+ "MT_ALARM",
+
+ // Deep Sea Scenery
+ "MT_GARGOYLE", // Deep Sea Gargoyle
+ "MT_BIGGARGOYLE", // Deep Sea Gargoyle (Big)
+ "MT_SEAWEED", // DSZ Seaweed
+ "MT_WATERDRIP", // Dripping Water source
+ "MT_WATERDROP", // Water drop from dripping water
+ "MT_CORAL1", // Coral
+ "MT_CORAL2",
+ "MT_CORAL3",
+ "MT_CORAL4",
+ "MT_CORAL5",
+ "MT_BLUECRYSTAL", // Blue Crystal
+ "MT_KELP", // Kelp
+ "MT_ANIMALGAETOP", // Animated algae top
+ "MT_ANIMALGAESEG", // Animated algae segment
+ "MT_DSZSTALAGMITE", // Deep Sea 1 Stalagmite
+ "MT_DSZ2STALAGMITE", // Deep Sea 2 Stalagmite
+ "MT_LIGHTBEAM", // DSZ Light beam
+
+ // Castle Eggman Scenery
+ "MT_CHAIN", // CEZ Chain
+ "MT_FLAME", // Flame (has corona)
+ "MT_FLAMEPARTICLE",
+ "MT_EGGSTATUE", // Eggman Statue
+ "MT_MACEPOINT", // Mace rotation point
+ "MT_CHAINMACEPOINT", // Combination of chains and maces point
+ "MT_SPRINGBALLPOINT", // Spring ball point
+ "MT_CHAINPOINT", // Mace chain
+ "MT_HIDDEN_SLING", // Spin mace chain (activatable)
+ "MT_FIREBARPOINT", // Firebar
+ "MT_CUSTOMMACEPOINT", // Custom mace
+ "MT_SMALLMACECHAIN", // Small Mace Chain
+ "MT_BIGMACECHAIN", // Big Mace Chain
+ "MT_SMALLMACE", // Small Mace
+ "MT_BIGMACE", // Big Mace
+ "MT_SMALLGRABCHAIN", // Small Grab Chain
+ "MT_BIGGRABCHAIN", // Big Grab Chain
+ "MT_YELLOWSPRINGBALL", // Yellow spring on a ball
+ "MT_REDSPRINGBALL", // Red spring on a ball
+ "MT_SMALLFIREBAR", // Small Firebar
+ "MT_BIGFIREBAR", // Big Firebar
+ "MT_CEZFLOWER", // Flower
+ "MT_CEZPOLE1", // Pole (with red banner)
+ "MT_CEZPOLE2", // Pole (with blue banner)
+ "MT_CEZBANNER1", // Banner (red)
+ "MT_CEZBANNER2", // Banner (blue)
+ "MT_PINETREE", // Pine Tree
+ "MT_CEZBUSH1", // Bush 1
+ "MT_CEZBUSH2", // Bush 2
+ "MT_CANDLE", // Candle
+ "MT_CANDLEPRICKET", // Candle pricket
+ "MT_FLAMEHOLDER", // Flame holder
+ "MT_FIRETORCH", // Fire torch
+ "MT_WAVINGFLAG1", // Waving flag (red)
+ "MT_WAVINGFLAG2", // Waving flag (blue)
+ "MT_WAVINGFLAGSEG1", // Waving flag segment (red)
+ "MT_WAVINGFLAGSEG2", // Waving flag segment (blue)
+ "MT_CRAWLASTATUE", // Crawla statue
+ "MT_FACESTABBERSTATUE", // Facestabber statue
+ "MT_SUSPICIOUSFACESTABBERSTATUE", // :eggthinking:
+ "MT_BRAMBLES", // Brambles
+
+ // Arid Canyon Scenery
+ "MT_BIGTUMBLEWEED",
+ "MT_LITTLETUMBLEWEED",
+ "MT_CACTI1", // Tiny Red Flower Cactus
+ "MT_CACTI2", // Small Red Flower Cactus
+ "MT_CACTI3", // Tiny Blue Flower Cactus
+ "MT_CACTI4", // Small Blue Flower Cactus
+ "MT_CACTI5", // Prickly Pear
+ "MT_CACTI6", // Barrel Cactus
+ "MT_CACTI7", // Tall Barrel Cactus
+ "MT_CACTI8", // Armed Cactus
+ "MT_CACTI9", // Ball Cactus
+ "MT_CACTI10", // Tiny Cactus
+ "MT_CACTI11", // Small Cactus
+ "MT_CACTITINYSEG", // Tiny Cactus Segment
+ "MT_CACTISMALLSEG", // Small Cactus Segment
+ "MT_ARIDSIGN_CAUTION", // Caution Sign
+ "MT_ARIDSIGN_CACTI", // Cacti Sign
+ "MT_ARIDSIGN_SHARPTURN", // Sharp Turn Sign
+ "MT_OILLAMP",
+ "MT_TNTBARREL",
+ "MT_PROXIMITYTNT",
+ "MT_DUSTDEVIL",
+ "MT_DUSTLAYER",
+ "MT_ARIDDUST",
+ "MT_MINECART",
+ "MT_MINECARTSEG",
+ "MT_MINECARTSPAWNER",
+ "MT_MINECARTEND",
+ "MT_MINECARTENDSOLID",
+ "MT_MINECARTSIDEMARK",
+ "MT_MINECARTSPARK",
+ "MT_SALOONDOOR",
+ "MT_SALOONDOORCENTER",
+ "MT_TRAINCAMEOSPAWNER",
+ "MT_TRAINSEG",
+ "MT_TRAINDUSTSPAWNER",
+ "MT_TRAINSTEAMSPAWNER",
+ "MT_MINECARTSWITCHPOINT",
+
+ // Red Volcano Scenery
+ "MT_FLAMEJET",
+ "MT_VERTICALFLAMEJET",
+ "MT_FLAMEJETFLAME",
+
+ "MT_FJSPINAXISA", // Counter-clockwise
+ "MT_FJSPINAXISB", // Clockwise
+
+ "MT_FLAMEJETFLAMEB", // Blade's flame
+
+ "MT_LAVAFALL",
+ "MT_LAVAFALL_LAVA",
+ "MT_LAVAFALLROCK",
+
+ "MT_ROLLOUTSPAWN",
+ "MT_ROLLOUTROCK",
+
+ "MT_BIGFERNLEAF",
+ "MT_BIGFERN",
+ "MT_JUNGLEPALM",
+ "MT_TORCHFLOWER",
+ "MT_WALLVINE_LONG",
+ "MT_WALLVINE_SHORT",
+
+ // Dark City Scenery
+
+ // Egg Rock Scenery
+
+ // Azure Temple Scenery
+ "MT_GLAREGOYLE",
+ "MT_GLAREGOYLEUP",
+ "MT_GLAREGOYLEDOWN",
+ "MT_GLAREGOYLELONG",
+ "MT_TARGET", // AKA Red Crystal
+ "MT_GREENFLAME",
+ "MT_BLUEGARGOYLE",
+
+ // Stalagmites
+ "MT_STALAGMITE0",
+ "MT_STALAGMITE1",
+ "MT_STALAGMITE2",
+ "MT_STALAGMITE3",
+ "MT_STALAGMITE4",
+ "MT_STALAGMITE5",
+ "MT_STALAGMITE6",
+ "MT_STALAGMITE7",
+ "MT_STALAGMITE8",
+ "MT_STALAGMITE9",
+
+ // Christmas Scenery
+ "MT_XMASPOLE",
+ "MT_CANDYCANE",
+ "MT_SNOWMAN", // normal
+ "MT_SNOWMANHAT", // with hat + scarf
+ "MT_LAMPPOST1", // normal
+ "MT_LAMPPOST2", // with snow
+ "MT_HANGSTAR",
+ "MT_MISTLETOE",
+ // Xmas GFZ bushes
+ "MT_XMASBLUEBERRYBUSH",
+ "MT_XMASBERRYBUSH",
+ "MT_XMASBUSH",
+ // FHZ
+ "MT_FHZICE1",
+ "MT_FHZICE2",
+ "MT_ROSY",
+ "MT_CDLHRT",
+
+ // Halloween Scenery
+ // Pumpkins
+ "MT_JACKO1",
+ "MT_JACKO2",
+ "MT_JACKO3",
+ // Dr Seuss Trees
+ "MT_HHZTREE_TOP",
+ "MT_HHZTREE_PART",
+ // Misc
+ "MT_HHZSHROOM",
+ "MT_HHZGRASS",
+ "MT_HHZTENTACLE1",
+ "MT_HHZTENTACLE2",
+ "MT_HHZSTALAGMITE_TALL",
+ "MT_HHZSTALAGMITE_SHORT",
+
+ // Botanic Serenity scenery
+ "MT_BSZTALLFLOWER_RED",
+ "MT_BSZTALLFLOWER_PURPLE",
+ "MT_BSZTALLFLOWER_BLUE",
+ "MT_BSZTALLFLOWER_CYAN",
+ "MT_BSZTALLFLOWER_YELLOW",
+ "MT_BSZTALLFLOWER_ORANGE",
+ "MT_BSZFLOWER_RED",
+ "MT_BSZFLOWER_PURPLE",
+ "MT_BSZFLOWER_BLUE",
+ "MT_BSZFLOWER_CYAN",
+ "MT_BSZFLOWER_YELLOW",
+ "MT_BSZFLOWER_ORANGE",
+ "MT_BSZSHORTFLOWER_RED",
+ "MT_BSZSHORTFLOWER_PURPLE",
+ "MT_BSZSHORTFLOWER_BLUE",
+ "MT_BSZSHORTFLOWER_CYAN",
+ "MT_BSZSHORTFLOWER_YELLOW",
+ "MT_BSZSHORTFLOWER_ORANGE",
+ "MT_BSZTULIP_RED",
+ "MT_BSZTULIP_PURPLE",
+ "MT_BSZTULIP_BLUE",
+ "MT_BSZTULIP_CYAN",
+ "MT_BSZTULIP_YELLOW",
+ "MT_BSZTULIP_ORANGE",
+ "MT_BSZCLUSTER_RED",
+ "MT_BSZCLUSTER_PURPLE",
+ "MT_BSZCLUSTER_BLUE",
+ "MT_BSZCLUSTER_CYAN",
+ "MT_BSZCLUSTER_YELLOW",
+ "MT_BSZCLUSTER_ORANGE",
+ "MT_BSZBUSH_RED",
+ "MT_BSZBUSH_PURPLE",
+ "MT_BSZBUSH_BLUE",
+ "MT_BSZBUSH_CYAN",
+ "MT_BSZBUSH_YELLOW",
+ "MT_BSZBUSH_ORANGE",
+ "MT_BSZVINE_RED",
+ "MT_BSZVINE_PURPLE",
+ "MT_BSZVINE_BLUE",
+ "MT_BSZVINE_CYAN",
+ "MT_BSZVINE_YELLOW",
+ "MT_BSZVINE_ORANGE",
+ "MT_BSZSHRUB",
+ "MT_BSZCLOVER",
+ "MT_BIG_PALMTREE_TRUNK",
+ "MT_BIG_PALMTREE_TOP",
+ "MT_PALMTREE_TRUNK",
+ "MT_PALMTREE_TOP",
+
+ // Misc scenery
+ "MT_DBALL",
+ "MT_EGGSTATUE2",
+
+ // Powerup Indicators
+ "MT_ELEMENTAL_ORB", // Elemental shield mobj
+ "MT_ATTRACT_ORB", // Attract shield mobj
+ "MT_FORCE_ORB", // Force shield mobj
+ "MT_ARMAGEDDON_ORB", // Armageddon shield mobj
+ "MT_WHIRLWIND_ORB", // Whirlwind shield mobj
+ "MT_PITY_ORB", // Pity shield mobj
+ "MT_FLAMEAURA_ORB", // Flame shield mobj
+ "MT_BUBBLEWRAP_ORB", // Bubble shield mobj
+ "MT_THUNDERCOIN_ORB", // Thunder shield mobj
+ "MT_THUNDERCOIN_SPARK", // Thunder spark
+ "MT_IVSP", // Invincibility sparkles
+ "MT_SUPERSPARK", // Super Sonic Spark
+
+ // Flickies
+ "MT_FLICKY_01", // Bluebird
+ "MT_FLICKY_01_CENTER",
+ "MT_FLICKY_02", // Rabbit
+ "MT_FLICKY_02_CENTER",
+ "MT_FLICKY_03", // Chicken
+ "MT_FLICKY_03_CENTER",
+ "MT_FLICKY_04", // Seal
+ "MT_FLICKY_04_CENTER",
+ "MT_FLICKY_05", // Pig
+ "MT_FLICKY_05_CENTER",
+ "MT_FLICKY_06", // Chipmunk
+ "MT_FLICKY_06_CENTER",
+ "MT_FLICKY_07", // Penguin
+ "MT_FLICKY_07_CENTER",
+ "MT_FLICKY_08", // Fish
+ "MT_FLICKY_08_CENTER",
+ "MT_FLICKY_09", // Ram
+ "MT_FLICKY_09_CENTER",
+ "MT_FLICKY_10", // Puffin
+ "MT_FLICKY_10_CENTER",
+ "MT_FLICKY_11", // Cow
+ "MT_FLICKY_11_CENTER",
+ "MT_FLICKY_12", // Rat
+ "MT_FLICKY_12_CENTER",
+ "MT_FLICKY_13", // Bear
+ "MT_FLICKY_13_CENTER",
+ "MT_FLICKY_14", // Dove
+ "MT_FLICKY_14_CENTER",
+ "MT_FLICKY_15", // Cat
+ "MT_FLICKY_15_CENTER",
+ "MT_FLICKY_16", // Canary
+ "MT_FLICKY_16_CENTER",
+ "MT_SECRETFLICKY_01", // Spider
+ "MT_SECRETFLICKY_01_CENTER",
+ "MT_SECRETFLICKY_02", // Bat
+ "MT_SECRETFLICKY_02_CENTER",
+ "MT_SEED",
+
+ // Environmental Effects
+ "MT_RAIN", // Rain
+ "MT_SNOWFLAKE", // Snowflake
+ "MT_SPLISH", // Water splish!
+ "MT_LAVASPLISH", // Lava splish!
+ "MT_SMOKE",
+ "MT_SMALLBUBBLE", // small bubble
+ "MT_MEDIUMBUBBLE", // medium bubble
+ "MT_EXTRALARGEBUBBLE", // extra large bubble
+ "MT_WATERZAP",
+ "MT_SPINDUST", // Spindash dust
+ "MT_TFOG",
+ "MT_PARTICLE",
+ "MT_PARTICLEGEN", // For fans, etc.
+
+ // Game Indicators
+ "MT_SCORE", // score logo
+ "MT_DROWNNUMBERS", // Drowning Timer
+ "MT_GOTEMERALD", // Chaos Emerald (intangible)
+ "MT_LOCKON", // Target
+ "MT_LOCKONINF", // In-level Target
+ "MT_TAG", // Tag Sign
+ "MT_GOTFLAG", // Got Flag sign
+ "MT_FINISHFLAG", // Finish flag
+
+ // Ambient Sounds
+ "MT_AWATERA", // Ambient Water Sound 1
+ "MT_AWATERB", // Ambient Water Sound 2
+ "MT_AWATERC", // Ambient Water Sound 3
+ "MT_AWATERD", // Ambient Water Sound 4
+ "MT_AWATERE", // Ambient Water Sound 5
+ "MT_AWATERF", // Ambient Water Sound 6
+ "MT_AWATERG", // Ambient Water Sound 7
+ "MT_AWATERH", // Ambient Water Sound 8
+ "MT_RANDOMAMBIENT",
+ "MT_RANDOMAMBIENT2",
+ "MT_MACHINEAMBIENCE",
+
+ "MT_CORK",
+ "MT_LHRT",
+
+ // Ring Weapons
+ "MT_REDRING",
+ "MT_BOUNCERING",
+ "MT_RAILRING",
+ "MT_INFINITYRING",
+ "MT_AUTOMATICRING",
+ "MT_EXPLOSIONRING",
+ "MT_SCATTERRING",
+ "MT_GRENADERING",
+
+ "MT_BOUNCEPICKUP",
+ "MT_RAILPICKUP",
+ "MT_AUTOPICKUP",
+ "MT_EXPLODEPICKUP",
+ "MT_SCATTERPICKUP",
+ "MT_GRENADEPICKUP",
+
+ "MT_THROWNBOUNCE",
+ "MT_THROWNINFINITY",
+ "MT_THROWNAUTOMATIC",
+ "MT_THROWNSCATTER",
+ "MT_THROWNEXPLOSION",
+ "MT_THROWNGRENADE",
+
+ // Mario-specific stuff
+ "MT_COIN",
+ "MT_FLINGCOIN",
+ "MT_GOOMBA",
+ "MT_BLUEGOOMBA",
+ "MT_FIREFLOWER",
+ "MT_FIREBALL",
+ "MT_FIREBALLTRAIL",
+ "MT_SHELL",
+ "MT_PUMA",
+ "MT_PUMATRAIL",
+ "MT_HAMMER",
+ "MT_KOOPA",
+ "MT_KOOPAFLAME",
+ "MT_AXE",
+ "MT_MARIOBUSH1",
+ "MT_MARIOBUSH2",
+ "MT_TOAD",
+
+ // NiGHTS Stuff
+ "MT_AXIS",
+ "MT_AXISTRANSFER",
+ "MT_AXISTRANSFERLINE",
+ "MT_NIGHTSDRONE",
+ "MT_NIGHTSDRONE_MAN",
+ "MT_NIGHTSDRONE_SPARKLING",
+ "MT_NIGHTSDRONE_GOAL",
+ "MT_NIGHTSPARKLE",
+ "MT_NIGHTSLOOPHELPER",
+ "MT_NIGHTSBUMPER", // NiGHTS Bumper
+ "MT_HOOP",
+ "MT_HOOPCOLLIDE", // Collision detection for NiGHTS hoops
+ "MT_HOOPCENTER", // Center of a hoop
+ "MT_NIGHTSCORE",
+ "MT_NIGHTSCHIP", // NiGHTS Chip
+ "MT_FLINGNIGHTSCHIP", // Lost NiGHTS Chip
+ "MT_NIGHTSSTAR", // NiGHTS Star
+ "MT_FLINGNIGHTSSTAR", // Lost NiGHTS Star
+ "MT_NIGHTSSUPERLOOP",
+ "MT_NIGHTSDRILLREFILL",
+ "MT_NIGHTSHELPER",
+ "MT_NIGHTSEXTRATIME",
+ "MT_NIGHTSLINKFREEZE",
+ "MT_EGGCAPSULE",
+ "MT_IDEYAANCHOR",
+ "MT_NIGHTOPIANHELPER", // the actual helper object that orbits you
+ "MT_PIAN", // decorative singing friend
+ "MT_SHLEEP", // almost-decorative sleeping enemy
+
+ // Secret badniks and hazards, shhhh
+ "MT_PENGUINATOR",
+ "MT_POPHAT",
+ "MT_POPSHOT",
+ "MT_POPSHOT_TRAIL",
+
+ "MT_HIVEELEMENTAL",
+ "MT_BUMBLEBORE",
+
+ "MT_BUGGLE",
+
+ "MT_SMASHINGSPIKEBALL",
+ "MT_CACOLANTERN",
+ "MT_CACOSHARD",
+ "MT_CACOFIRE",
+ "MT_SPINBOBERT",
+ "MT_SPINBOBERT_FIRE1",
+ "MT_SPINBOBERT_FIRE2",
+ "MT_HANGSTER",
+
+ // Utility Objects
+ "MT_TELEPORTMAN",
+ "MT_ALTVIEWMAN",
+ "MT_CRUMBLEOBJ", // Sound generator for crumbling platform
+ "MT_TUBEWAYPOINT",
+ "MT_PUSH",
+ "MT_PULL",
+ "MT_GHOST",
+ "MT_OVERLAY",
+ "MT_ANGLEMAN",
+ "MT_POLYANCHOR",
+ "MT_POLYSPAWN",
+
+ // Skybox objects
+ "MT_SKYBOX",
+
+ // Debris
+ "MT_SPARK", //spark
+ "MT_EXPLODE", // Robot Explosion
+ "MT_UWEXPLODE", // Underwater Explosion
+ "MT_DUST",
+ "MT_ROCKSPAWNER",
+ "MT_FALLINGROCK",
+ "MT_ROCKCRUMBLE1",
+ "MT_ROCKCRUMBLE2",
+ "MT_ROCKCRUMBLE3",
+ "MT_ROCKCRUMBLE4",
+ "MT_ROCKCRUMBLE5",
+ "MT_ROCKCRUMBLE6",
+ "MT_ROCKCRUMBLE7",
+ "MT_ROCKCRUMBLE8",
+ "MT_ROCKCRUMBLE9",
+ "MT_ROCKCRUMBLE10",
+ "MT_ROCKCRUMBLE11",
+ "MT_ROCKCRUMBLE12",
+ "MT_ROCKCRUMBLE13",
+ "MT_ROCKCRUMBLE14",
+ "MT_ROCKCRUMBLE15",
+ "MT_ROCKCRUMBLE16",
+
+ // Level debris
+ "MT_GFZDEBRIS",
+ "MT_BRICKDEBRIS",
+ "MT_WOODDEBRIS",
+ "MT_REDBRICKDEBRIS",
+ "MT_BLUEBRICKDEBRIS",
+ "MT_YELLOWBRICKDEBRIS",
+
+ "MT_NAMECHECK",
+};
+
+const char *const MOBJFLAG_LIST[] = {
+ "SPECIAL",
+ "SOLID",
+ "SHOOTABLE",
+ "NOSECTOR",
+ "NOBLOCKMAP",
+ "PAPERCOLLISION",
+ "PUSHABLE",
+ "BOSS",
+ "SPAWNCEILING",
+ "NOGRAVITY",
+ "AMBIENT",
+ "SLIDEME",
+ "NOCLIP",
+ "FLOAT",
+ "BOXICON",
+ "MISSILE",
+ "SPRING",
+ "BOUNCE",
+ "MONITOR",
+ "NOTHINK",
+ "FIRE",
+ "NOCLIPHEIGHT",
+ "ENEMY",
+ "SCENERY",
+ "PAIN",
+ "STICKY",
+ "NIGHTSITEM",
+ "NOCLIPTHING",
+ "GRENADEBOUNCE",
+ "RUNSPAWNFUNC",
+ NULL
+};
+
+// \tMF2_(\S+).*// (.+) --> \t"\1", // \2
+const char *const MOBJFLAG2_LIST[] = {
+ "AXIS", // It's a NiGHTS axis! (For faster checking)
+ "TWOD", // Moves like it's in a 2D level
+ "DONTRESPAWN", // Don't respawn this object!
+ "DONTDRAW", // Don't generate a vissprite
+ "AUTOMATIC", // Thrown ring has automatic properties
+ "RAILRING", // Thrown ring has rail properties
+ "BOUNCERING", // Thrown ring has bounce properties
+ "EXPLOSION", // Thrown ring has explosive properties
+ "SCATTER", // Thrown ring has scatter properties
+ "BEYONDTHEGRAVE", // Source of this missile has died and has since respawned.
+ "SLIDEPUSH", // MF_PUSHABLE that pushes continuously.
+ "CLASSICPUSH", // Drops straight down when object has negative momz.
+ "INVERTAIMABLE", // Flips whether it's targetable by A_LookForEnemies (enemies no, decoys yes)
+ "INFLOAT", // Floating to a height for a move, don't auto float to target's height.
+ "DEBRIS", // Splash ring from explosion ring
+ "NIGHTSPULL", // Attracted from a paraloop
+ "JUSTATTACKED", // can be pushed by other moving mobjs
+ "FIRING", // turret fire
+ "SUPERFIRE", // Firing something with Super Sonic-stopping properties. Or, if mobj has MF_MISSILE, this is the actual fire from it.
+ "SHADOW", // Fuzzy draw, makes targeting harder.
+ "STRONGBOX", // Flag used for "strong" random monitors.
+ "OBJECTFLIP", // Flag for objects that always have flipped gravity.
+ "SKULLFLY", // Special handling: skull in flight.
+ "FRET", // Flashing from a previous hit
+ "BOSSNOTRAP", // No Egg Trap after boss
+ "BOSSFLEE", // Boss is fleeing!
+ "BOSSDEAD", // Boss is dead! (Not necessarily fleeing, if a fleeing point doesn't exist.)
+ "AMBUSH", // Alternate behaviour typically set by MTF_AMBUSH
+ "LINKDRAW", // Draw vissprite of mobj immediately before/after tracer's vissprite (dependent on dispoffset and position)
+ "SHIELD", // Thinker calls P_AddShield/P_ShieldLook (must be partnered with MF_SCENERY to use)
+ "SPLAT", // Object is a splat
+ NULL
+};
+
+const char *const MOBJEFLAG_LIST[] = {
+ "ONGROUND", // The mobj stands on solid floor (not on another mobj or in air)
+ "JUSTHITFLOOR", // The mobj just hit the floor while falling, this is cleared on next frame
+ "TOUCHWATER", // The mobj stands in a sector with water, and touches the surface
+ "UNDERWATER", // The mobj stands in a sector with water, and his waist is BELOW the water surface
+ "JUSTSTEPPEDDOWN", // used for ramp sectors
+ "VERTICALFLIP", // Vertically flip sprite/allow upside-down physics
+ "GOOWATER", // Goo water
+ "TOUCHLAVA", // The mobj is touching a lava block
+ "PUSHED", // Mobj was already pushed this tic
+ "SPRUNG", // Mobj was already sprung this tic
+ "APPLYPMOMZ", // Platform movement
+ "TRACERANGLE", // Compute and trigger on mobj angle relative to tracer
+ NULL
+};
+
+const char *const MAPTHINGFLAG_LIST[4] = {
+ "EXTRA", // Extra flag for objects.
+ "OBJECTFLIP", // Reverse gravity flag for objects.
+ "OBJECTSPECIAL", // Special flag used with certain objects.
+ "AMBUSH" // Deaf monsters/do not react to sound.
+};
+
+const char *const PLAYERFLAG_LIST[] = {
+
+ // Cvars
+ "FLIPCAM", // Flip camera angle with gravity flip prefrence.
+ "ANALOGMODE", // Analog mode?
+ "DIRECTIONCHAR", // Directional character sprites?
+ "AUTOBRAKE", // Autobrake?
+
+ // Cheats
+ "GODMODE",
+ "NOCLIP",
+ "INVIS",
+
+ // True if button down last tic.
+ "ATTACKDOWN",
+ "SPINDOWN",
+ "JUMPDOWN",
+ "WPNDOWN",
+
+ // Unmoving states
+ "STASIS", // Player is not allowed to move
+ "JUMPSTASIS", // and that includes jumping.
+ // (we don't include FULLSTASIS here I guess because it's just those two together...?)
+
+ // Applying autobrake?
+ "APPLYAUTOBRAKE",
+
+ // Character action status
+ "STARTJUMP",
+ "JUMPED",
+ "NOJUMPDAMAGE",
+
+ "SPINNING",
+ "STARTDASH",
+
+ "THOKKED",
+ "SHIELDABILITY",
+ "GLIDING",
+ "BOUNCING",
+
+ // Sliding (usually in water) like Labyrinth/Oil Ocean
+ "SLIDING",
+
+ // NiGHTS stuff
+ "TRANSFERTOCLOSEST",
+ "DRILLING",
+
+ // Gametype-specific stuff
+ "GAMETYPEOVER", // Race time over, or H&S out-of-game
+ "TAGIT", // The player is it! For Tag Mode
+
+ /*** misc ***/
+ "FORCESTRAFE", // Translate turn inputs into strafe inputs
+ "CANCARRY", // Can carry?
+ "FINISHED",
+
+ NULL // stop loop here.
+};
+
+const char *const GAMETYPERULE_LIST[] = {
+ "CAMPAIGN",
+ "RINGSLINGER",
+ "SPECTATORS",
+ "LIVES",
+ "TEAMS",
+ "FIRSTPERSON",
+ "POWERSTONES",
+ "TEAMFLAGS",
+ "FRIENDLY",
+ "SPECIALSTAGES",
+ "EMERALDTOKENS",
+ "EMERALDHUNT",
+ "RACE",
+ "TAG",
+ "POINTLIMIT",
+ "TIMELIMIT",
+ "OVERTIME",
+ "HURTMESSAGES",
+ "FRIENDLYFIRE",
+ "STARTCOUNTDOWN",
+ "HIDEFROZEN",
+ "BLINDFOLDED",
+ "RESPAWNDELAY",
+ "PITYSHIELD",
+ "DEATHPENALTY",
+ "NOSPECTATORSPAWN",
+ "DEATHMATCHSTARTS",
+ "SPAWNINVUL",
+ "SPAWNENEMIES",
+ "ALLOWEXIT",
+ "NOTITLECARD",
+ "CUTSCENES",
+ NULL
+};
+
+// Linedef flags
+const char *const ML_LIST[16] = {
+ "IMPASSIBLE",
+ "BLOCKMONSTERS",
+ "TWOSIDED",
+ "DONTPEGTOP",
+ "DONTPEGBOTTOM",
+ "EFFECT1",
+ "NOCLIMB",
+ "EFFECT2",
+ "EFFECT3",
+ "EFFECT4",
+ "EFFECT5",
+ "NOSONIC",
+ "NOTAILS",
+ "NOKNUX",
+ "BOUNCY",
+ "TFERLINE"
+};
+
+const char *COLOR_ENUMS[] = {
+ "NONE", // SKINCOLOR_NONE,
+
+ // Greyscale ranges
+ "WHITE", // SKINCOLOR_WHITE,
+ "BONE", // SKINCOLOR_BONE,
+ "CLOUDY", // SKINCOLOR_CLOUDY,
+ "GREY", // SKINCOLOR_GREY,
+ "SILVER", // SKINCOLOR_SILVER,
+ "CARBON", // SKINCOLOR_CARBON,
+ "JET", // SKINCOLOR_JET,
+ "BLACK", // SKINCOLOR_BLACK,
+
+ // Desaturated
+ "AETHER", // SKINCOLOR_AETHER,
+ "SLATE", // SKINCOLOR_SLATE,
+ "BLUEBELL", // SKINCOLOR_BLUEBELL,
+ "PINK", // SKINCOLOR_PINK,
+ "YOGURT", // SKINCOLOR_YOGURT,
+ "BROWN", // SKINCOLOR_BROWN,
+ "BRONZE", // SKINCOLOR_BRONZE,
+ "TAN", // SKINCOLOR_TAN,
+ "BEIGE", // SKINCOLOR_BEIGE,
+ "MOSS", // SKINCOLOR_MOSS,
+ "AZURE", // SKINCOLOR_AZURE,
+ "LAVENDER", // SKINCOLOR_LAVENDER,
+
+ // Viv's vivid colours (toast 21/07/17)
+ "RUBY", // SKINCOLOR_RUBY,
+ "SALMON", // SKINCOLOR_SALMON,
+ "RED", // SKINCOLOR_RED,
+ "CRIMSON", // SKINCOLOR_CRIMSON,
+ "FLAME", // SKINCOLOR_FLAME,
+ "KETCHUP", // SKINCOLOR_KETCHUP,
+ "PEACHY", // SKINCOLOR_PEACHY,
+ "QUAIL", // SKINCOLOR_QUAIL,
+ "SUNSET", // SKINCOLOR_SUNSET,
+ "COPPER", // SKINCOLOR_COPPER,
+ "APRICOT", // SKINCOLOR_APRICOT,
+ "ORANGE", // SKINCOLOR_ORANGE,
+ "RUST", // SKINCOLOR_RUST,
+ "GOLD", // SKINCOLOR_GOLD,
+ "SANDY", // SKINCOLOR_SANDY,
+ "YELLOW", // SKINCOLOR_YELLOW,
+ "OLIVE", // SKINCOLOR_OLIVE,
+ "LIME", // SKINCOLOR_LIME,
+ "PERIDOT", // SKINCOLOR_PERIDOT,
+ "APPLE", // SKINCOLOR_APPLE,
+ "GREEN", // SKINCOLOR_GREEN,
+ "FOREST", // SKINCOLOR_FOREST,
+ "EMERALD", // SKINCOLOR_EMERALD,
+ "MINT", // SKINCOLOR_MINT,
+ "SEAFOAM", // SKINCOLOR_SEAFOAM,
+ "AQUA", // SKINCOLOR_AQUA,
+ "TEAL", // SKINCOLOR_TEAL,
+ "WAVE", // SKINCOLOR_WAVE,
+ "CYAN", // SKINCOLOR_CYAN,
+ "SKY", // SKINCOLOR_SKY,
+ "CERULEAN", // SKINCOLOR_CERULEAN,
+ "ICY", // SKINCOLOR_ICY,
+ "SAPPHIRE", // SKINCOLOR_SAPPHIRE,
+ "CORNFLOWER", // SKINCOLOR_CORNFLOWER,
+ "BLUE", // SKINCOLOR_BLUE,
+ "COBALT", // SKINCOLOR_COBALT,
+ "VAPOR", // SKINCOLOR_VAPOR,
+ "DUSK", // SKINCOLOR_DUSK,
+ "PASTEL", // SKINCOLOR_PASTEL,
+ "PURPLE", // SKINCOLOR_PURPLE,
+ "BUBBLEGUM", // SKINCOLOR_BUBBLEGUM,
+ "MAGENTA", // SKINCOLOR_MAGENTA,
+ "NEON", // SKINCOLOR_NEON,
+ "VIOLET", // SKINCOLOR_VIOLET,
+ "LILAC", // SKINCOLOR_LILAC,
+ "PLUM", // SKINCOLOR_PLUM,
+ "RASPBERRY", // SKINCOLOR_RASPBERRY,
+ "ROSY", // SKINCOLOR_ROSY,
+
+ // Super special awesome Super flashing colors!
+ "SUPERSILVER1", // SKINCOLOR_SUPERSILVER1
+ "SUPERSILVER2", // SKINCOLOR_SUPERSILVER2,
+ "SUPERSILVER3", // SKINCOLOR_SUPERSILVER3,
+ "SUPERSILVER4", // SKINCOLOR_SUPERSILVER4,
+ "SUPERSILVER5", // SKINCOLOR_SUPERSILVER5,
+
+ "SUPERRED1", // SKINCOLOR_SUPERRED1
+ "SUPERRED2", // SKINCOLOR_SUPERRED2,
+ "SUPERRED3", // SKINCOLOR_SUPERRED3,
+ "SUPERRED4", // SKINCOLOR_SUPERRED4,
+ "SUPERRED5", // SKINCOLOR_SUPERRED5,
+
+ "SUPERORANGE1", // SKINCOLOR_SUPERORANGE1
+ "SUPERORANGE2", // SKINCOLOR_SUPERORANGE2,
+ "SUPERORANGE3", // SKINCOLOR_SUPERORANGE3,
+ "SUPERORANGE4", // SKINCOLOR_SUPERORANGE4,
+ "SUPERORANGE5", // SKINCOLOR_SUPERORANGE5,
+
+ "SUPERGOLD1", // SKINCOLOR_SUPERGOLD1
+ "SUPERGOLD2", // SKINCOLOR_SUPERGOLD2,
+ "SUPERGOLD3", // SKINCOLOR_SUPERGOLD3,
+ "SUPERGOLD4", // SKINCOLOR_SUPERGOLD4,
+ "SUPERGOLD5", // SKINCOLOR_SUPERGOLD5,
+
+ "SUPERPERIDOT1", // SKINCOLOR_SUPERPERIDOT1
+ "SUPERPERIDOT2", // SKINCOLOR_SUPERPERIDOT2,
+ "SUPERPERIDOT3", // SKINCOLOR_SUPERPERIDOT3,
+ "SUPERPERIDOT4", // SKINCOLOR_SUPERPERIDOT4,
+ "SUPERPERIDOT5", // SKINCOLOR_SUPERPERIDOT5,
+
+ "SUPERSKY1", // SKINCOLOR_SUPERSKY1
+ "SUPERSKY2", // SKINCOLOR_SUPERSKY2,
+ "SUPERSKY3", // SKINCOLOR_SUPERSKY3,
+ "SUPERSKY4", // SKINCOLOR_SUPERSKY4,
+ "SUPERSKY5", // SKINCOLOR_SUPERSKY5,
+
+ "SUPERPURPLE1", // SKINCOLOR_SUPERPURPLE1,
+ "SUPERPURPLE2", // SKINCOLOR_SUPERPURPLE2,
+ "SUPERPURPLE3", // SKINCOLOR_SUPERPURPLE3,
+ "SUPERPURPLE4", // SKINCOLOR_SUPERPURPLE4,
+ "SUPERPURPLE5", // SKINCOLOR_SUPERPURPLE5,
+
+ "SUPERRUST1", // SKINCOLOR_SUPERRUST1
+ "SUPERRUST2", // SKINCOLOR_SUPERRUST2,
+ "SUPERRUST3", // SKINCOLOR_SUPERRUST3,
+ "SUPERRUST4", // SKINCOLOR_SUPERRUST4,
+ "SUPERRUST5", // SKINCOLOR_SUPERRUST5,
+
+ "SUPERTAN1", // SKINCOLOR_SUPERTAN1
+ "SUPERTAN2", // SKINCOLOR_SUPERTAN2,
+ "SUPERTAN3", // SKINCOLOR_SUPERTAN3,
+ "SUPERTAN4", // SKINCOLOR_SUPERTAN4,
+ "SUPERTAN5" // SKINCOLOR_SUPERTAN5,
+};
+
+const char *const POWERS_LIST[] = {
+ "INVULNERABILITY",
+ "SNEAKERS",
+ "FLASHING",
+ "SHIELD",
+ "CARRY",
+ "TAILSFLY", // tails flying
+ "UNDERWATER", // underwater timer
+ "SPACETIME", // In space, no one can hear you spin!
+ "EXTRALIFE", // Extra Life timer
+ "PUSHING",
+ "JUSTSPRUNG",
+ "NOAUTOBRAKE",
+
+ "SUPER", // Are you super?
+ "GRAVITYBOOTS", // gravity boots
+
+ // Weapon ammunition
+ "INFINITYRING",
+ "AUTOMATICRING",
+ "BOUNCERING",
+ "SCATTERRING",
+ "GRENADERING",
+ "EXPLOSIONRING",
+ "RAILRING",
+
+ // Power Stones
+ "EMERALDS", // stored like global 'emeralds' variable
+
+ // NiGHTS powerups
+ "NIGHTS_SUPERLOOP",
+ "NIGHTS_HELPER",
+ "NIGHTS_LINKFREEZE",
+
+ //for linedef exec 427
+ "NOCONTROL",
+
+ //for dyes
+ "DYE",
+
+ "JUSTLAUNCHED",
+
+ "IGNORELATCH"
+};
+
+const char *const HUDITEMS_LIST[] = {
+ "LIVES",
+
+ "RINGS",
+ "RINGSNUM",
+ "RINGSNUMTICS",
+
+ "SCORE",
+ "SCORENUM",
+
+ "TIME",
+ "MINUTES",
+ "TIMECOLON",
+ "SECONDS",
+ "TIMETICCOLON",
+ "TICS",
+
+ "SS_TOTALRINGS",
+
+ "GETRINGS",
+ "GETRINGSNUM",
+ "TIMELEFT",
+ "TIMELEFTNUM",
+ "TIMEUP",
+ "HUNTPICS",
+ "POWERUPS"
+};
+
+const char *const MENUTYPES_LIST[] = {
+ "NONE",
+
+ "MAIN",
+
+ // Single Player
+ "SP_MAIN",
+
+ "SP_LOAD",
+ "SP_PLAYER",
+
+ "SP_LEVELSELECT",
+ "SP_LEVELSTATS",
+
+ "SP_TIMEATTACK",
+ "SP_TIMEATTACK_LEVELSELECT",
+ "SP_GUESTREPLAY",
+ "SP_REPLAY",
+ "SP_GHOST",
+
+ "SP_NIGHTSATTACK",
+ "SP_NIGHTS_LEVELSELECT",
+ "SP_NIGHTS_GUESTREPLAY",
+ "SP_NIGHTS_REPLAY",
+ "SP_NIGHTS_GHOST",
+
+ // Multiplayer
+ "MP_MAIN",
+ "MP_SPLITSCREEN", // SplitServer
+ "MP_SERVER",
+ "MP_CONNECT",
+ "MP_ROOM",
+ "MP_PLAYERSETUP", // MP_PlayerSetupDef shared with SPLITSCREEN if #defined NONET
+ "MP_SERVER_OPTIONS",
+
+ // Options
+ "OP_MAIN",
+
+ "OP_P1CONTROLS",
+ "OP_CHANGECONTROLS", // OP_ChangeControlsDef shared with P2
+ "OP_P1MOUSE",
+ "OP_P1JOYSTICK",
+ "OP_JOYSTICKSET", // OP_JoystickSetDef shared with P2
+ "OP_P1CAMERA",
+
+ "OP_P2CONTROLS",
+ "OP_P2MOUSE",
+ "OP_P2JOYSTICK",
+ "OP_P2CAMERA",
+
+ "OP_PLAYSTYLE",
+
+ "OP_VIDEO",
+ "OP_VIDEOMODE",
+ "OP_COLOR",
+ "OP_OPENGL",
+ "OP_OPENGL_LIGHTING",
+
+ "OP_SOUND",
+
+ "OP_SERVER",
+ "OP_MONITORTOGGLE",
+
+ "OP_DATA",
+ "OP_ADDONS",
+ "OP_SCREENSHOTS",
+ "OP_ERASEDATA",
+
+ // Extras
+ "SR_MAIN",
+ "SR_PANDORA",
+ "SR_LEVELSELECT",
+ "SR_UNLOCKCHECKLIST",
+ "SR_EMBLEMHINT",
+ "SR_PLAYER",
+ "SR_SOUNDTEST",
+
+ // Addons (Part of MISC, but let's make it our own)
+ "AD_MAIN",
+
+ // MISC
+ // "MESSAGE",
+ // "SPAUSE",
+
+ // "MPAUSE",
+ // "SCRAMBLETEAM",
+ // "CHANGETEAM",
+ // "CHANGELEVEL",
+
+ // "MAPAUSE",
+ // "HELP",
+
+ "SPECIAL"
+};
+
+struct int_const_s const INT_CONST[] = {
+ // If a mod removes some variables here,
+ // please leave the names in-tact and just set
+ // the value to 0 or something.
+
+ // integer type limits, from doomtype.h
+ // INT64 and UINT64 limits not included, they're too big for most purposes anyway
+ // signed
+ {"INT8_MIN",INT8_MIN},
+ {"INT16_MIN",INT16_MIN},
+ {"INT32_MIN",INT32_MIN},
+ {"INT8_MAX",INT8_MAX},
+ {"INT16_MAX",INT16_MAX},
+ {"INT32_MAX",INT32_MAX},
+ // unsigned
+ {"UINT8_MAX",UINT8_MAX},
+ {"UINT16_MAX",UINT16_MAX},
+ {"UINT32_MAX",UINT32_MAX},
+
+ // fixed_t constants, from m_fixed.h
+ {"FRACUNIT",FRACUNIT},
+ {"FU" ,FRACUNIT},
+ {"FRACBITS",FRACBITS},
+
+ // doomdef.h constants
+ {"TICRATE",TICRATE},
+ {"MUSICRATE",MUSICRATE},
+ {"RING_DIST",RING_DIST},
+ {"PUSHACCEL",PUSHACCEL},
+ {"MODID",MODID}, // I don't know, I just thought it would be cool for a wad to potentially know what mod it was loaded into.
+ {"MODVERSION",MODVERSION}, // or what version of the mod this is.
+ {"CODEBASE",CODEBASE}, // or what release of SRB2 this is.
+ {"NEWTICRATE",NEWTICRATE}, // TICRATE*NEWTICRATERATIO
+ {"NEWTICRATERATIO",NEWTICRATERATIO},
+
+ // Special linedef executor tag numbers!
+ {"LE_PINCHPHASE",LE_PINCHPHASE}, // A boss entered pinch phase (and, in most cases, is preparing their pinch phase attack!)
+ {"LE_ALLBOSSESDEAD",LE_ALLBOSSESDEAD}, // All bosses in the map are dead (Egg capsule raise)
+ {"LE_BOSSDEAD",LE_BOSSDEAD}, // A boss in the map died (Chaos mode boss tally)
+ {"LE_BOSS4DROP",LE_BOSS4DROP}, // CEZ boss dropped its cage
+ {"LE_BRAKVILEATACK",LE_BRAKVILEATACK}, // Brak's doing his LOS attack, oh noes
+ {"LE_TURRET",LE_TURRET}, // THZ turret
+ {"LE_BRAKPLATFORM",LE_BRAKPLATFORM}, // v2.0 Black Eggman destroys platform
+ {"LE_CAPSULE2",LE_CAPSULE2}, // Egg Capsule
+ {"LE_CAPSULE1",LE_CAPSULE1}, // Egg Capsule
+ {"LE_CAPSULE0",LE_CAPSULE0}, // Egg Capsule
+ {"LE_KOOPA",LE_KOOPA}, // Distant cousin to Gay Bowser
+ {"LE_AXE",LE_AXE}, // MKB Axe object
+ {"LE_PARAMWIDTH",LE_PARAMWIDTH}, // If an object that calls LinedefExecute has a nonzero parameter value, this times the parameter will be subtracted. (Mostly for the purpose of coexisting bosses...)
+
+ /// \todo Get all this stuff into its own sections, maybe. Maybe.
+
+ // Frame settings
+ {"FF_FRAMEMASK",FF_FRAMEMASK},
+ {"FF_SPR2SUPER",FF_SPR2SUPER},
+ {"FF_SPR2ENDSTATE",FF_SPR2ENDSTATE},
+ {"FF_SPR2MIDSTART",FF_SPR2MIDSTART},
+ {"FF_ANIMATE",FF_ANIMATE},
+ {"FF_RANDOMANIM",FF_RANDOMANIM},
+ {"FF_GLOBALANIM",FF_GLOBALANIM},
+ {"FF_FULLBRIGHT",FF_FULLBRIGHT},
+ {"FF_VERTICALFLIP",FF_VERTICALFLIP},
+ {"FF_HORIZONTALFLIP",FF_HORIZONTALFLIP},
+ {"FF_PAPERSPRITE",FF_PAPERSPRITE},
+ {"FF_TRANSMASK",FF_TRANSMASK},
+ {"FF_TRANSSHIFT",FF_TRANSSHIFT},
+ // new preshifted translucency (used in source)
+ {"FF_TRANS10",FF_TRANS10},
+ {"FF_TRANS20",FF_TRANS20},
+ {"FF_TRANS30",FF_TRANS30},
+ {"FF_TRANS40",FF_TRANS40},
+ {"FF_TRANS50",FF_TRANS50},
+ {"FF_TRANS60",FF_TRANS60},
+ {"FF_TRANS70",FF_TRANS70},
+ {"FF_TRANS80",FF_TRANS80},
+ {"FF_TRANS90",FF_TRANS90},
+ // compatibility
+ // Transparency for SOCs is pre-shifted
+ {"TR_TRANS10",tr_trans10<<FF_TRANSSHIFT},
+ {"TR_TRANS20",tr_trans20<<FF_TRANSSHIFT},
+ {"TR_TRANS30",tr_trans30<<FF_TRANSSHIFT},
+ {"TR_TRANS40",tr_trans40<<FF_TRANSSHIFT},
+ {"TR_TRANS50",tr_trans50<<FF_TRANSSHIFT},
+ {"TR_TRANS60",tr_trans60<<FF_TRANSSHIFT},
+ {"TR_TRANS70",tr_trans70<<FF_TRANSSHIFT},
+ {"TR_TRANS80",tr_trans80<<FF_TRANSSHIFT},
+ {"TR_TRANS90",tr_trans90<<FF_TRANSSHIFT},
+ // Transparency for Lua is not, unless capitalized as above.
+ {"tr_trans10",tr_trans10},
+ {"tr_trans20",tr_trans20},
+ {"tr_trans30",tr_trans30},
+ {"tr_trans40",tr_trans40},
+ {"tr_trans50",tr_trans50},
+ {"tr_trans60",tr_trans60},
+ {"tr_trans70",tr_trans70},
+ {"tr_trans80",tr_trans80},
+ {"tr_trans90",tr_trans90},
+ {"NUMTRANSMAPS",NUMTRANSMAPS},
+
+ // Alpha styles (blend modes)
+ {"AST_COPY",AST_COPY},
+ {"AST_TRANSLUCENT",AST_TRANSLUCENT},
+ {"AST_ADD",AST_ADD},
+ {"AST_SUBTRACT",AST_SUBTRACT},
+ {"AST_REVERSESUBTRACT",AST_REVERSESUBTRACT},
+ {"AST_MODULATE",AST_MODULATE},
+ {"AST_OVERLAY",AST_OVERLAY},
+
+ // Render flags
+ {"RF_HORIZONTALFLIP",RF_HORIZONTALFLIP},
+ {"RF_VERTICALFLIP",RF_VERTICALFLIP},
+ {"RF_ABSOLUTEOFFSETS",RF_ABSOLUTEOFFSETS},
+ {"RF_FLIPOFFSETS",RF_FLIPOFFSETS},
+ {"RF_SPLATMASK",RF_SPLATMASK},
+ {"RF_SLOPESPLAT",RF_SLOPESPLAT},
+ {"RF_OBJECTSLOPESPLAT",RF_OBJECTSLOPESPLAT},
+ {"RF_NOSPLATBILLBOARD",RF_NOSPLATBILLBOARD},
+ {"RF_NOSPLATROLLANGLE",RF_NOSPLATROLLANGLE},
+ {"RF_BLENDMASK",RF_BLENDMASK},
+ {"RF_FULLBRIGHT",RF_FULLBRIGHT},
+ {"RF_FULLDARK",RF_FULLDARK},
+ {"RF_NOCOLORMAPS",RF_NOCOLORMAPS},
+ {"RF_SPRITETYPEMASK",RF_SPRITETYPEMASK},
+ {"RF_PAPERSPRITE",RF_PAPERSPRITE},
+ {"RF_FLOORSPRITE",RF_FLOORSPRITE},
+ {"RF_SHADOWDRAW",RF_SHADOWDRAW},
+ {"RF_SHADOWEFFECTS",RF_SHADOWEFFECTS},
+ {"RF_DROPSHADOW",RF_DROPSHADOW},
+
+ // Level flags
+ {"LF_SCRIPTISFILE",LF_SCRIPTISFILE},
+ {"LF_SPEEDMUSIC",LF_SPEEDMUSIC},
+ {"LF_NOSSMUSIC",LF_NOSSMUSIC},
+ {"LF_NORELOAD",LF_NORELOAD},
+ {"LF_NOZONE",LF_NOZONE},
+ {"LF_SAVEGAME",LF_SAVEGAME},
+ {"LF_MIXNIGHTSCOUNTDOWN",LF_MIXNIGHTSCOUNTDOWN},
+ {"LF_NOTITLECARDFIRST",LF_NOTITLECARDFIRST},
+ {"LF_NOTITLECARDRESPAWN",LF_NOTITLECARDRESPAWN},
+ {"LF_NOTITLECARDRECORDATTACK",LF_NOTITLECARDRECORDATTACK},
+ {"LF_NOTITLECARD",LF_NOTITLECARD},
+ {"LF_WARNINGTITLE",LF_WARNINGTITLE},
+ // And map flags
+ {"LF2_HIDEINMENU",LF2_HIDEINMENU},
+ {"LF2_HIDEINSTATS",LF2_HIDEINSTATS},
+ {"LF2_RECORDATTACK",LF2_RECORDATTACK},
+ {"LF2_NIGHTSATTACK",LF2_NIGHTSATTACK},
+ {"LF2_NOVISITNEEDED",LF2_NOVISITNEEDED},
+ {"LF2_WIDEICON",LF2_WIDEICON},
+
+ // Emeralds
+ {"EMERALD1",EMERALD1},
+ {"EMERALD2",EMERALD2},
+ {"EMERALD3",EMERALD3},
+ {"EMERALD4",EMERALD4},
+ {"EMERALD5",EMERALD5},
+ {"EMERALD6",EMERALD6},
+ {"EMERALD7",EMERALD7},
+
+ // SKINCOLOR_ doesn't include these..!
+ {"MAXSKINCOLORS",MAXSKINCOLORS},
+ {"FIRSTSUPERCOLOR",FIRSTSUPERCOLOR},
+ {"NUMSUPERCOLORS",NUMSUPERCOLORS},
+
+ // Precipitation
+ {"PRECIP_NONE",PRECIP_NONE},
+ {"PRECIP_STORM",PRECIP_STORM},
+ {"PRECIP_SNOW",PRECIP_SNOW},
+ {"PRECIP_RAIN",PRECIP_RAIN},
+ {"PRECIP_BLANK",PRECIP_BLANK},
+ {"PRECIP_STORM_NORAIN",PRECIP_STORM_NORAIN},
+ {"PRECIP_STORM_NOSTRIKES",PRECIP_STORM_NOSTRIKES},
+
+ // Shields
+ {"SH_NONE",SH_NONE},
+ // Shield flags
+ {"SH_PROTECTFIRE",SH_PROTECTFIRE},
+ {"SH_PROTECTWATER",SH_PROTECTWATER},
+ {"SH_PROTECTELECTRIC",SH_PROTECTELECTRIC},
+ {"SH_PROTECTSPIKE",SH_PROTECTSPIKE},
+ // Indivisible shields
+ {"SH_PITY",SH_PITY},
+ {"SH_WHIRLWIND",SH_WHIRLWIND},
+ {"SH_ARMAGEDDON",SH_ARMAGEDDON},
+ {"SH_PINK",SH_PINK},
+ // normal shields that use flags
+ {"SH_ATTRACT",SH_ATTRACT},
+ {"SH_ELEMENTAL",SH_ELEMENTAL},
+ // Sonic 3 shields
+ {"SH_FLAMEAURA",SH_FLAMEAURA},
+ {"SH_BUBBLEWRAP",SH_BUBBLEWRAP},
+ {"SH_THUNDERCOIN",SH_THUNDERCOIN},
+ // The force shield uses the lower 8 bits to count how many extra hits are left.
+ {"SH_FORCE",SH_FORCE},
+ {"SH_FORCEHP",SH_FORCEHP}, // to be used as a bitmask only
+ // Mostly for use with Mario mode.
+ {"SH_FIREFLOWER",SH_FIREFLOWER},
+ {"SH_STACK",SH_STACK},
+ {"SH_NOSTACK",SH_NOSTACK},
+
+ // Carrying
+ {"CR_NONE",CR_NONE},
+ {"CR_GENERIC",CR_GENERIC},
+ {"CR_PLAYER",CR_PLAYER},
+ {"CR_NIGHTSMODE",CR_NIGHTSMODE},
+ {"CR_NIGHTSFALL",CR_NIGHTSFALL},
+ {"CR_BRAKGOOP",CR_BRAKGOOP},
+ {"CR_ZOOMTUBE",CR_ZOOMTUBE},
+ {"CR_ROPEHANG",CR_ROPEHANG},
+ {"CR_MACESPIN",CR_MACESPIN},
+ {"CR_MINECART",CR_MINECART},
+ {"CR_ROLLOUT",CR_ROLLOUT},
+ {"CR_PTERABYTE",CR_PTERABYTE},
+ {"CR_DUSTDEVIL",CR_DUSTDEVIL},
+
+ // Ring weapons (ringweapons_t)
+ // Useful for A_GiveWeapon
+ {"RW_AUTO",RW_AUTO},
+ {"RW_BOUNCE",RW_BOUNCE},
+ {"RW_SCATTER",RW_SCATTER},
+ {"RW_GRENADE",RW_GRENADE},
+ {"RW_EXPLODE",RW_EXPLODE},
+ {"RW_RAIL",RW_RAIL},
+
+ // Character flags (skinflags_t)
+ {"SF_SUPER",SF_SUPER},
+ {"SF_NOSUPERSPIN",SF_NOSUPERSPIN},
+ {"SF_NOSPINDASHDUST",SF_NOSPINDASHDUST},
+ {"SF_HIRES",SF_HIRES},
+ {"SF_NOSKID",SF_NOSKID},
+ {"SF_NOSPEEDADJUST",SF_NOSPEEDADJUST},
+ {"SF_RUNONWATER",SF_RUNONWATER},
+ {"SF_NOJUMPSPIN",SF_NOJUMPSPIN},
+ {"SF_NOJUMPDAMAGE",SF_NOJUMPDAMAGE},
+ {"SF_STOMPDAMAGE",SF_STOMPDAMAGE},
+ {"SF_MARIODAMAGE",SF_MARIODAMAGE},
+ {"SF_MACHINE",SF_MACHINE},
+ {"SF_DASHMODE",SF_DASHMODE},
+ {"SF_FASTEDGE",SF_FASTEDGE},
+ {"SF_MULTIABILITY",SF_MULTIABILITY},
+ {"SF_NONIGHTSROTATION",SF_NONIGHTSROTATION},
+ {"SF_NONIGHTSSUPER",SF_NONIGHTSSUPER},
+ {"SF_NOSUPERSPRITES",SF_NOSUPERSPRITES},
+ {"SF_NOSUPERJUMPBOOST",SF_NOSUPERJUMPBOOST},
+ {"SF_CANBUSTWALLS",SF_CANBUSTWALLS},
+ {"SF_NOSHIELDABILITY",SF_NOSHIELDABILITY},
+
+ // Dashmode constants
+ {"DASHMODE_THRESHOLD",DASHMODE_THRESHOLD},
+ {"DASHMODE_MAX",DASHMODE_MAX},
+
+ // Character abilities!
+ // Primary
+ {"CA_NONE",CA_NONE}, // now slot 0!
+ {"CA_THOK",CA_THOK},
+ {"CA_FLY",CA_FLY},
+ {"CA_GLIDEANDCLIMB",CA_GLIDEANDCLIMB},
+ {"CA_HOMINGTHOK",CA_HOMINGTHOK},
+ {"CA_DOUBLEJUMP",CA_DOUBLEJUMP},
+ {"CA_FLOAT",CA_FLOAT},
+ {"CA_SLOWFALL",CA_SLOWFALL},
+ {"CA_SWIM",CA_SWIM},
+ {"CA_TELEKINESIS",CA_TELEKINESIS},
+ {"CA_FALLSWITCH",CA_FALLSWITCH},
+ {"CA_JUMPBOOST",CA_JUMPBOOST},
+ {"CA_AIRDRILL",CA_AIRDRILL},
+ {"CA_JUMPTHOK",CA_JUMPTHOK},
+ {"CA_BOUNCE",CA_BOUNCE},
+ {"CA_TWINSPIN",CA_TWINSPIN},
+ // Secondary
+ {"CA2_NONE",CA2_NONE}, // now slot 0!
+ {"CA2_SPINDASH",CA2_SPINDASH},
+ {"CA2_GUNSLINGER",CA2_GUNSLINGER},
+ {"CA2_MELEE",CA2_MELEE},
+
+ // Sound flags
+ {"SF_TOTALLYSINGLE",SF_TOTALLYSINGLE},
+ {"SF_NOMULTIPLESOUND",SF_NOMULTIPLESOUND},
+ {"SF_OUTSIDESOUND",SF_OUTSIDESOUND},
+ {"SF_X4AWAYSOUND",SF_X4AWAYSOUND},
+ {"SF_X8AWAYSOUND",SF_X8AWAYSOUND},
+ {"SF_NOINTERRUPT",SF_NOINTERRUPT},
+ {"SF_X2AWAYSOUND",SF_X2AWAYSOUND},
+
+ // Global emblem var flags
+ {"GE_NIGHTSPULL",GE_NIGHTSPULL},
+ {"GE_NIGHTSITEM",GE_NIGHTSITEM},
+
+ // Map emblem var flags
+ {"ME_ALLEMERALDS",ME_ALLEMERALDS},
+ {"ME_ULTIMATE",ME_ULTIMATE},
+ {"ME_PERFECT",ME_PERFECT},
+
+ // p_local.h constants
+ {"FLOATSPEED",FLOATSPEED},
+ {"MAXSTEPMOVE",MAXSTEPMOVE},
+ {"USERANGE",USERANGE},
+ {"MELEERANGE",MELEERANGE},
+ {"MISSILERANGE",MISSILERANGE},
+ {"ONFLOORZ",ONFLOORZ}, // INT32_MIN
+ {"ONCEILINGZ",ONCEILINGZ}, //INT32_MAX
+ // for P_FlashPal
+ {"PAL_WHITE",PAL_WHITE},
+ {"PAL_MIXUP",PAL_MIXUP},
+ {"PAL_RECYCLE",PAL_RECYCLE},
+ {"PAL_NUKE",PAL_NUKE},
+ // for P_DamageMobj
+ //// Damage types
+ {"DMG_WATER",DMG_WATER},
+ {"DMG_FIRE",DMG_FIRE},
+ {"DMG_ELECTRIC",DMG_ELECTRIC},
+ {"DMG_SPIKE",DMG_SPIKE},
+ {"DMG_NUKE",DMG_NUKE},
+ //// Death types
+ {"DMG_INSTAKILL",DMG_INSTAKILL},
+ {"DMG_DROWNED",DMG_DROWNED},
+ {"DMG_SPACEDROWN",DMG_SPACEDROWN},
+ {"DMG_DEATHPIT",DMG_DEATHPIT},
+ {"DMG_CRUSHED",DMG_CRUSHED},
+ {"DMG_SPECTATOR",DMG_SPECTATOR},
+ //// Masks
+ {"DMG_CANHURTSELF",DMG_CANHURTSELF},
+ {"DMG_DEATHMASK",DMG_DEATHMASK},
+
+ // Intermission types
+ {"int_none",int_none},
+ {"int_coop",int_coop},
+ {"int_match",int_match},
+ {"int_teammatch",int_teammatch},
+ //{"int_tag",int_tag},
+ {"int_ctf",int_ctf},
+ {"int_spec",int_spec},
+ {"int_race",int_race},
+ {"int_comp",int_comp},
+
+ // Jingles (jingletype_t)
+ {"JT_NONE",JT_NONE},
+ {"JT_OTHER",JT_OTHER},
+ {"JT_MASTER",JT_MASTER},
+ {"JT_1UP",JT_1UP},
+ {"JT_SHOES",JT_SHOES},
+ {"JT_INV",JT_INV},
+ {"JT_MINV",JT_MINV},
+ {"JT_DROWN",JT_DROWN},
+ {"JT_SUPER",JT_SUPER},
+ {"JT_GOVER",JT_GOVER},
+ {"JT_NIGHTSTIMEOUT",JT_NIGHTSTIMEOUT},
+ {"JT_SSTIMEOUT",JT_SSTIMEOUT},
+ // {"JT_LCLEAR",JT_LCLEAR},
+ // {"JT_RACENT",JT_RACENT},
+ // {"JT_CONTSC",JT_CONTSC},
+
+ // Player state (playerstate_t)
+ {"PST_LIVE",PST_LIVE}, // Playing or camping.
+ {"PST_DEAD",PST_DEAD}, // Dead on the ground, view follows killer.
+ {"PST_REBORN",PST_REBORN}, // Ready to restart/respawn???
+
+ // Player animation (panim_t)
+ {"PA_ETC",PA_ETC},
+ {"PA_IDLE",PA_IDLE},
+ {"PA_EDGE",PA_EDGE},
+ {"PA_WALK",PA_WALK},
+ {"PA_RUN",PA_RUN},
+ {"PA_DASH",PA_DASH},
+ {"PA_PAIN",PA_PAIN},
+ {"PA_ROLL",PA_ROLL},
+ {"PA_JUMP",PA_JUMP},
+ {"PA_SPRING",PA_SPRING},
+ {"PA_FALL",PA_FALL},
+ {"PA_ABILITY",PA_ABILITY},
+ {"PA_ABILITY2",PA_ABILITY2},
+ {"PA_RIDE",PA_RIDE},
+
+ // Current weapon
+ {"WEP_AUTO",WEP_AUTO},
+ {"WEP_BOUNCE",WEP_BOUNCE},
+ {"WEP_SCATTER",WEP_SCATTER},
+ {"WEP_GRENADE",WEP_GRENADE},
+ {"WEP_EXPLODE",WEP_EXPLODE},
+ {"WEP_RAIL",WEP_RAIL},
+ {"NUM_WEAPONS",NUM_WEAPONS},
+
+ // Value for infinite lives
+ {"INFLIVES",INFLIVES},
+
+ // Got Flags, for player->gotflag!
+ // Used to be MF_ for some stupid reason, now they're GF_ to stop them looking like mobjflags
+ {"GF_REDFLAG",GF_REDFLAG},
+ {"GF_BLUEFLAG",GF_BLUEFLAG},
+
+ // Customisable sounds for Skins, from sounds.h
+ {"SKSSPIN",SKSSPIN},
+ {"SKSPUTPUT",SKSPUTPUT},
+ {"SKSPUDPUD",SKSPUDPUD},
+ {"SKSPLPAN1",SKSPLPAN1}, // Ouchies
+ {"SKSPLPAN2",SKSPLPAN2},
+ {"SKSPLPAN3",SKSPLPAN3},
+ {"SKSPLPAN4",SKSPLPAN4},
+ {"SKSPLDET1",SKSPLDET1}, // Deaths
+ {"SKSPLDET2",SKSPLDET2},
+ {"SKSPLDET3",SKSPLDET3},
+ {"SKSPLDET4",SKSPLDET4},
+ {"SKSPLVCT1",SKSPLVCT1}, // Victories
+ {"SKSPLVCT2",SKSPLVCT2},
+ {"SKSPLVCT3",SKSPLVCT3},
+ {"SKSPLVCT4",SKSPLVCT4},
+ {"SKSTHOK",SKSTHOK},
+ {"SKSSPNDSH",SKSSPNDSH},
+ {"SKSZOOM",SKSZOOM},
+ {"SKSSKID",SKSSKID},
+ {"SKSGASP",SKSGASP},
+ {"SKSJUMP",SKSJUMP},
+
+ // 3D Floor/Fake Floor/FOF/whatever flags
+ {"FF_EXISTS",FF_EXISTS}, ///< Always set, to check for validity.
+ {"FF_BLOCKPLAYER",FF_BLOCKPLAYER}, ///< Solid to player, but nothing else
+ {"FF_BLOCKOTHERS",FF_BLOCKOTHERS}, ///< Solid to everything but player
+ {"FF_SOLID",FF_SOLID}, ///< Clips things.
+ {"FF_RENDERSIDES",FF_RENDERSIDES}, ///< Renders the sides.
+ {"FF_RENDERPLANES",FF_RENDERPLANES}, ///< Renders the floor/ceiling.
+ {"FF_RENDERALL",FF_RENDERALL}, ///< Renders everything.
+ {"FF_SWIMMABLE",FF_SWIMMABLE}, ///< Is a water block.
+ {"FF_NOSHADE",FF_NOSHADE}, ///< Messes with the lighting?
+ {"FF_CUTSOLIDS",FF_CUTSOLIDS}, ///< Cuts out hidden solid pixels.
+ {"FF_CUTEXTRA",FF_CUTEXTRA}, ///< Cuts out hidden translucent pixels.
+ {"FF_CUTLEVEL",FF_CUTLEVEL}, ///< Cuts out all hidden pixels.
+ {"FF_CUTSPRITES",FF_CUTSPRITES}, ///< Final step in making 3D water.
+ {"FF_BOTHPLANES",FF_BOTHPLANES}, ///< Render inside and outside planes.
+ {"FF_EXTRA",FF_EXTRA}, ///< Gets cut by ::FF_CUTEXTRA.
+ {"FF_TRANSLUCENT",FF_TRANSLUCENT}, ///< See through!
+ {"FF_FOG",FF_FOG}, ///< Fog "brush."
+ {"FF_INVERTPLANES",FF_INVERTPLANES}, ///< Only render inside planes.
+ {"FF_ALLSIDES",FF_ALLSIDES}, ///< Render inside and outside sides.
+ {"FF_INVERTSIDES",FF_INVERTSIDES}, ///< Only render inside sides.
+ {"FF_DOUBLESHADOW",FF_DOUBLESHADOW}, ///< Make two lightlist entries to reset light?
+ {"FF_FLOATBOB",FF_FLOATBOB}, ///< Floats on water and bobs if you step on it.
+ {"FF_NORETURN",FF_NORETURN}, ///< Used with ::FF_CRUMBLE. Will not return to its original position after falling.
+ {"FF_CRUMBLE",FF_CRUMBLE}, ///< Falls 2 seconds after being stepped on, and randomly brings all touching crumbling 3dfloors down with it, providing their master sectors share the same tag (allows crumble platforms above or below, to also exist).
+ {"FF_SHATTERBOTTOM",FF_SHATTERBOTTOM}, ///< Used with ::FF_BUSTUP. Like FF_SHATTER, but only breaks from the bottom. Good for springing up through rubble.
+ {"FF_MARIO",FF_MARIO}, ///< Acts like a question block when hit from underneath. Goodie spawned at top is determined by master sector.
+ {"FF_BUSTUP",FF_BUSTUP}, ///< You can spin through/punch this block and it will crumble!
+ {"FF_QUICKSAND",FF_QUICKSAND}, ///< Quicksand!
+ {"FF_PLATFORM",FF_PLATFORM}, ///< You can jump up through this to the top.
+ {"FF_REVERSEPLATFORM",FF_REVERSEPLATFORM}, ///< A fall-through floor in normal gravity, a platform in reverse gravity.
+ {"FF_INTANGIBLEFLATS",FF_INTANGIBLEFLATS}, ///< Both flats are intangible, but the sides are still solid.
+ {"FF_INTANGABLEFLATS",FF_INTANGIBLEFLATS}, ///< Both flats are intangable, but the sides are still solid.
+ {"FF_SHATTER",FF_SHATTER}, ///< Used with ::FF_BUSTUP. Bustable on mere touch.
+ {"FF_SPINBUST",FF_SPINBUST}, ///< Used with ::FF_BUSTUP. Also bustable if you're in your spinning frames.
+ {"FF_STRONGBUST",FF_STRONGBUST}, ///< Used with ::FF_BUSTUP. Only bustable by "strong" characters (Knuckles) and abilities (bouncing, twinspin, melee).
+ {"FF_RIPPLE",FF_RIPPLE}, ///< Ripple the flats
+ {"FF_COLORMAPONLY",FF_COLORMAPONLY}, ///< Only copy the colormap, not the lightlevel
+ {"FF_GOOWATER",FF_GOOWATER}, ///< Used with ::FF_SWIMMABLE. Makes thick bouncey goop.
+
+ // PolyObject flags
+ {"POF_CLIPLINES",POF_CLIPLINES}, ///< Test against lines for collision
+ {"POF_CLIPPLANES",POF_CLIPPLANES}, ///< Test against tops and bottoms for collision
+ {"POF_SOLID",POF_SOLID}, ///< Clips things.
+ {"POF_TESTHEIGHT",POF_TESTHEIGHT}, ///< Test line collision with heights
+ {"POF_RENDERSIDES",POF_RENDERSIDES}, ///< Renders the sides.
+ {"POF_RENDERTOP",POF_RENDERTOP}, ///< Renders the top.
+ {"POF_RENDERBOTTOM",POF_RENDERBOTTOM}, ///< Renders the bottom.
+ {"POF_RENDERPLANES",POF_RENDERPLANES}, ///< Renders top and bottom.
+ {"POF_RENDERALL",POF_RENDERALL}, ///< Renders everything.
+ {"POF_INVERT",POF_INVERT}, ///< Inverts collision (like a cage).
+ {"POF_INVERTPLANES",POF_INVERTPLANES}, ///< Render inside planes.
+ {"POF_INVERTPLANESONLY",POF_INVERTPLANESONLY}, ///< Only render inside planes.
+ {"POF_PUSHABLESTOP",POF_PUSHABLESTOP}, ///< Pushables will stop movement.
+ {"POF_LDEXEC",POF_LDEXEC}, ///< This PO triggers a linedef executor.
+ {"POF_ONESIDE",POF_ONESIDE}, ///< Only use the first side of the linedef.
+ {"POF_NOSPECIALS",POF_NOSPECIALS}, ///< Don't apply sector specials.
+ {"POF_SPLAT",POF_SPLAT}, ///< Use splat flat renderer (treat cyan pixels as invisible).
+
+#ifdef HAVE_LUA_SEGS
+ // Node flags
+ {"NF_SUBSECTOR",NF_SUBSECTOR}, // Indicate a leaf.
+#endif
+
+ // Slope flags
+ {"SL_NOPHYSICS",SL_NOPHYSICS},
+ {"SL_DYNAMIC",SL_DYNAMIC},
+
+ // Angles
+ {"ANG1",ANG1},
+ {"ANG2",ANG2},
+ {"ANG10",ANG10},
+ {"ANG15",ANG15},
+ {"ANG20",ANG20},
+ {"ANG30",ANG30},
+ {"ANG60",ANG60},
+ {"ANG64h",ANG64h},
+ {"ANG105",ANG105},
+ {"ANG210",ANG210},
+ {"ANG255",ANG255},
+ {"ANG340",ANG340},
+ {"ANG350",ANG350},
+ {"ANGLE_11hh",ANGLE_11hh},
+ {"ANGLE_22h",ANGLE_22h},
+ {"ANGLE_45",ANGLE_45},
+ {"ANGLE_67h",ANGLE_67h},
+ {"ANGLE_90",ANGLE_90},
+ {"ANGLE_112h",ANGLE_112h},
+ {"ANGLE_135",ANGLE_135},
+ {"ANGLE_157h",ANGLE_157h},
+ {"ANGLE_180",ANGLE_180},
+ {"ANGLE_202h",ANGLE_202h},
+ {"ANGLE_225",ANGLE_225},
+ {"ANGLE_247h",ANGLE_247h},
+ {"ANGLE_270",ANGLE_270},
+ {"ANGLE_292h",ANGLE_292h},
+ {"ANGLE_315",ANGLE_315},
+ {"ANGLE_337h",ANGLE_337h},
+ {"ANGLE_MAX",ANGLE_MAX},
+
+ // P_Chase directions (dirtype_t)
+ {"DI_NODIR",DI_NODIR},
+ {"DI_EAST",DI_EAST},
+ {"DI_NORTHEAST",DI_NORTHEAST},
+ {"DI_NORTH",DI_NORTH},
+ {"DI_NORTHWEST",DI_NORTHWEST},
+ {"DI_WEST",DI_WEST},
+ {"DI_SOUTHWEST",DI_SOUTHWEST},
+ {"DI_SOUTH",DI_SOUTH},
+ {"DI_SOUTHEAST",DI_SOUTHEAST},
+ {"NUMDIRS",NUMDIRS},
+
+ // Sprite rotation axis (rotaxis_t)
+ {"ROTAXIS_X",ROTAXIS_X},
+ {"ROTAXIS_Y",ROTAXIS_Y},
+ {"ROTAXIS_Z",ROTAXIS_Z},
+
+ // Buttons (ticcmd_t)
+ {"BT_WEAPONMASK",BT_WEAPONMASK}, //our first four bits.
+ {"BT_WEAPONNEXT",BT_WEAPONNEXT},
+ {"BT_WEAPONPREV",BT_WEAPONPREV},
+ {"BT_ATTACK",BT_ATTACK}, // shoot rings
+ {"BT_SPIN",BT_SPIN},
+ {"BT_CAMLEFT",BT_CAMLEFT}, // turn camera left
+ {"BT_CAMRIGHT",BT_CAMRIGHT}, // turn camera right
+ {"BT_TOSSFLAG",BT_TOSSFLAG},
+ {"BT_JUMP",BT_JUMP},
+ {"BT_FIRENORMAL",BT_FIRENORMAL}, // Fire a normal ring no matter what
+ {"BT_CUSTOM1",BT_CUSTOM1}, // Lua customizable
+ {"BT_CUSTOM2",BT_CUSTOM2}, // Lua customizable
+ {"BT_CUSTOM3",BT_CUSTOM3}, // Lua customizable
+
+ // Lua command registration flags
+ {"COM_ADMIN",COM_ADMIN},
+ {"COM_SPLITSCREEN",COM_SPLITSCREEN},
+ {"COM_LOCAL",COM_LOCAL},
+
+ // cvflags_t
+ {"CV_SAVE",CV_SAVE},
+ {"CV_CALL",CV_CALL},
+ {"CV_NETVAR",CV_NETVAR},
+ {"CV_NOINIT",CV_NOINIT},
+ {"CV_FLOAT",CV_FLOAT},
+ {"CV_NOTINNET",CV_NOTINNET},
+ {"CV_MODIFIED",CV_MODIFIED},
+ {"CV_SHOWMODIF",CV_SHOWMODIF},
+ {"CV_SHOWMODIFONETIME",CV_SHOWMODIFONETIME},
+ {"CV_NOSHOWHELP",CV_NOSHOWHELP},
+ {"CV_HIDEN",CV_HIDEN},
+ {"CV_HIDDEN",CV_HIDEN},
+ {"CV_CHEAT",CV_CHEAT},
+ {"CV_NOLUA",CV_NOLUA},
+
+ // v_video flags
+ {"V_NOSCALEPATCH",V_NOSCALEPATCH},
+ {"V_SMALLSCALEPATCH",V_SMALLSCALEPATCH},
+ {"V_MEDSCALEPATCH",V_MEDSCALEPATCH},
+ {"V_6WIDTHSPACE",V_6WIDTHSPACE},
+ {"V_OLDSPACING",V_OLDSPACING},
+ {"V_MONOSPACE",V_MONOSPACE},
+
+ {"V_MAGENTAMAP",V_MAGENTAMAP},
+ {"V_YELLOWMAP",V_YELLOWMAP},
+ {"V_GREENMAP",V_GREENMAP},
+ {"V_BLUEMAP",V_BLUEMAP},
+ {"V_REDMAP",V_REDMAP},
+ {"V_GRAYMAP",V_GRAYMAP},
+ {"V_ORANGEMAP",V_ORANGEMAP},
+ {"V_SKYMAP",V_SKYMAP},
+ {"V_PURPLEMAP",V_PURPLEMAP},
+ {"V_AQUAMAP",V_AQUAMAP},
+ {"V_PERIDOTMAP",V_PERIDOTMAP},
+ {"V_AZUREMAP",V_AZUREMAP},
+ {"V_BROWNMAP",V_BROWNMAP},
+ {"V_ROSYMAP",V_ROSYMAP},
+ {"V_INVERTMAP",V_INVERTMAP},
+
+ {"V_TRANSLUCENT",V_TRANSLUCENT},
+ {"V_10TRANS",V_10TRANS},
+ {"V_20TRANS",V_20TRANS},
+ {"V_30TRANS",V_30TRANS},
+ {"V_40TRANS",V_40TRANS},
+ {"V_50TRANS",V_TRANSLUCENT}, // alias
+ {"V_60TRANS",V_60TRANS},
+ {"V_70TRANS",V_70TRANS},
+ {"V_80TRANS",V_80TRANS},
+ {"V_90TRANS",V_90TRANS},
+ {"V_HUDTRANSHALF",V_HUDTRANSHALF},
+ {"V_HUDTRANS",V_HUDTRANS},
+ {"V_HUDTRANSDOUBLE",V_HUDTRANSDOUBLE},
+ {"V_AUTOFADEOUT",V_AUTOFADEOUT},
+ {"V_RETURN8",V_RETURN8},
+ {"V_OFFSET",V_OFFSET},
+ {"V_ALLOWLOWERCASE",V_ALLOWLOWERCASE},
+ {"V_FLIP",V_FLIP},
+ {"V_CENTERNAMETAG",V_CENTERNAMETAG},
+ {"V_SNAPTOTOP",V_SNAPTOTOP},
+ {"V_SNAPTOBOTTOM",V_SNAPTOBOTTOM},
+ {"V_SNAPTOLEFT",V_SNAPTOLEFT},
+ {"V_SNAPTORIGHT",V_SNAPTORIGHT},
+ {"V_WRAPX",V_WRAPX},
+ {"V_WRAPY",V_WRAPY},
+ {"V_NOSCALESTART",V_NOSCALESTART},
+ {"V_PERPLAYER",V_PERPLAYER},
+
+ {"V_PARAMMASK",V_PARAMMASK},
+ {"V_SCALEPATCHMASK",V_SCALEPATCHMASK},
+ {"V_SPACINGMASK",V_SPACINGMASK},
+ {"V_CHARCOLORMASK",V_CHARCOLORMASK},
+ {"V_ALPHAMASK",V_ALPHAMASK},
+
+ {"V_CHARCOLORSHIFT",V_CHARCOLORSHIFT},
+ {"V_ALPHASHIFT",V_ALPHASHIFT},
+
+ //Kick Reasons
+ {"KR_KICK",KR_KICK},
+ {"KR_PINGLIMIT",KR_PINGLIMIT},
+ {"KR_SYNCH",KR_SYNCH},
+ {"KR_TIMEOUT",KR_TIMEOUT},
+ {"KR_BAN",KR_BAN},
+ {"KR_LEAVE",KR_LEAVE},
+
+ // translation colormaps
+ {"TC_DEFAULT",TC_DEFAULT},
+ {"TC_BOSS",TC_BOSS},
+ {"TC_METALSONIC",TC_METALSONIC},
+ {"TC_ALLWHITE",TC_ALLWHITE},
+ {"TC_RAINBOW",TC_RAINBOW},
+ {"TC_BLINK",TC_BLINK},
+ {"TC_DASHMODE",TC_DASHMODE},
+
+ // marathonmode flags
+ {"MA_INIT",MA_INIT},
+ {"MA_RUNNING",MA_RUNNING},
+ {"MA_NOCUTSCENES",MA_NOCUTSCENES},
+ {"MA_INGAME",MA_INGAME},
+
+ // music types
+ {"MU_NONE", MU_NONE},
+ {"MU_WAV", MU_WAV},
+ {"MU_MOD", MU_MOD},
+ {"MU_MID", MU_MID},
+ {"MU_OGG", MU_OGG},
+ {"MU_MP3", MU_MP3},
+ {"MU_FLAC", MU_FLAC},
+ {"MU_GME", MU_GME},
+ {"MU_MOD_EX", MU_MOD_EX},
+ {"MU_MID_EX", MU_MID_EX},
+
+ // gamestates
+ {"GS_NULL",GS_NULL},
+ {"GS_LEVEL",GS_LEVEL},
+ {"GS_INTERMISSION",GS_INTERMISSION},
+ {"GS_CONTINUING",GS_CONTINUING},
+ {"GS_TITLESCREEN",GS_TITLESCREEN},
+ {"GS_TIMEATTACK",GS_TIMEATTACK},
+ {"GS_CREDITS",GS_CREDITS},
+ {"GS_EVALUATION",GS_EVALUATION},
+ {"GS_GAMEEND",GS_GAMEEND},
+ {"GS_INTRO",GS_INTRO},
+ {"GS_ENDING",GS_ENDING},
+ {"GS_CUTSCENE",GS_CUTSCENE},
+ {"GS_DEDICATEDSERVER",GS_DEDICATEDSERVER},
+ {"GS_WAITINGPLAYERS",GS_WAITINGPLAYERS},
+
+ {NULL,0}
+};
+
+// For this to work compile-time without being in this file,
+// this function would need to check sizes at runtime, without sizeof
+void DEH_TableCheck(void)
+{
+#if defined(_DEBUG) || defined(PARANOIA)
+ const size_t dehstates = sizeof(STATE_LIST)/sizeof(const char*);
+ const size_t dehmobjs = sizeof(MOBJTYPE_LIST)/sizeof(const char*);
+ const size_t dehpowers = sizeof(POWERS_LIST)/sizeof(const char*);
+ const size_t dehcolors = sizeof(COLOR_ENUMS)/sizeof(const char*);
+
+ if (dehstates != S_FIRSTFREESLOT)
+ I_Error("You forgot to update the Dehacked states list, you dolt!\n(%d states defined, versus %s in the Dehacked list)\n", S_FIRSTFREESLOT, sizeu1(dehstates));
+
+ if (dehmobjs != MT_FIRSTFREESLOT)
+ I_Error("You forgot to update the Dehacked mobjtype list, you dolt!\n(%d mobj types defined, versus %s in the Dehacked list)\n", MT_FIRSTFREESLOT, sizeu1(dehmobjs));
+
+ if (dehpowers != NUMPOWERS)
+ I_Error("You forgot to update the Dehacked powers list, you dolt!\n(%d powers defined, versus %s in the Dehacked list)\n", NUMPOWERS, sizeu1(dehpowers));
+
+ if (dehcolors != SKINCOLOR_FIRSTFREESLOT)
+ I_Error("You forgot to update the Dehacked colors list, you dolt!\n(%d colors defined, versus %s in the Dehacked list)\n", SKINCOLOR_FIRSTFREESLOT, sizeu1(dehcolors));
+#endif
+}
diff --git a/src/deh_tables.h b/src/deh_tables.h
new file mode 100644
index 0000000000000000000000000000000000000000..d094bcbad4e74b736aa6aa423cfe94a408dc18f2
--- /dev/null
+++ b/src/deh_tables.h
@@ -0,0 +1,78 @@
+// SONIC ROBO BLAST 2
+//-----------------------------------------------------------------------------
+// Copyright (C) 1998-2000 by DooM Legacy Team.
+// Copyright (C) 1999-2020 by Sonic Team Junior.
+//
+// This program is free software distributed under the
+// terms of the GNU General Public License, version 2.
+// See the 'LICENSE' file for more details.
+//-----------------------------------------------------------------------------
+/// \file deh_tables.h
+/// \brief Define DeHackEd tables.
+
+#ifndef __DEH_TABLES_H__
+#define __DEH_TABLES_H__
+
+#include "doomdef.h" // Constants
+#include "d_think.h" // actionf_t
+#include "info.h" // Mobj, state, sprite, etc constants
+#include "lua_script.h"
+
+// Free slot names
+// The crazy word-reading stuff uses these.
+extern char *FREE_STATES[NUMSTATEFREESLOTS];
+extern char *FREE_MOBJS[NUMMOBJFREESLOTS];
+extern char *FREE_SKINCOLORS[NUMCOLORFREESLOTS];
+extern UINT8 used_spr[(NUMSPRITEFREESLOTS / 8) + 1]; // Bitwise flag for sprite freeslot in use! I would use ceil() here if I could, but it only saves 1 byte of memory anyway.
+
+#define initfreeslots() {\
+ memset(FREE_STATES,0,sizeof(char *) * NUMSTATEFREESLOTS);\
+ memset(FREE_MOBJS,0,sizeof(char *) * NUMMOBJFREESLOTS);\
+ memset(FREE_SKINCOLORS,0,sizeof(char *) * NUMCOLORFREESLOTS);\
+ memset(used_spr,0,sizeof(UINT8) * ((NUMSPRITEFREESLOTS / 8) + 1));\
+}
+
+struct flickytypes_s {
+ const char *name;
+ const mobjtype_t type;
+};
+
+#define MAXFLICKIES 64
+
+/** Action pointer for reading actions from Dehacked lumps.
+ */
+typedef struct
+{
+ actionf_t action; ///< Function pointer corresponding to the actual action.
+ const char *name; ///< Name of the action in ALL CAPS.
+} actionpointer_t;
+
+struct int_const_s {
+ const char *n;
+ // has to be able to hold both fixed_t and angle_t, so drastic measure!!
+ lua_Integer v;
+};
+
+extern const char NIGHTSGRADE_LIST[];
+extern struct flickytypes_s FLICKYTYPES[];
+extern actionpointer_t actionpointers[]; // Array mapping action names to action functions.
+extern const char *const STATE_LIST[];
+extern const char *const MOBJTYPE_LIST[];
+extern const char *const MOBJFLAG_LIST[];
+extern const char *const MOBJFLAG2_LIST[]; // \tMF2_(\S+).*// (.+) --> \t"\1", // \2
+extern const char *const MOBJEFLAG_LIST[];
+extern const char *const MAPTHINGFLAG_LIST[4];
+extern const char *const PLAYERFLAG_LIST[];
+extern const char *const GAMETYPERULE_LIST[];
+extern const char *const ML_LIST[16]; // Linedef flags
+extern const char *COLOR_ENUMS[];
+extern const char *const POWERS_LIST[];
+extern const char *const HUDITEMS_LIST[];
+extern const char *const MENUTYPES_LIST[];
+
+extern struct int_const_s const INT_CONST[];
+
+// Moved to this file because it can't work compile-time otherwise
+void DEH_TableCheck(void);
+
+#endif
diff --git a/src/dehacked.c b/src/dehacked.c
index 88a633976adab7d7cf4fa3a654e097008dbaf13a..c2ea28d27cef95d623c480b0259940e390f7cd2f 100644
--- a/src/dehacked.c
+++ b/src/dehacked.c
@@ -11,77 +11,45 @@
/// \brief Load dehacked file and change tables and text
#include "doomdef.h"
-#include "d_main.h" // for srb2home
-#include "g_game.h"
-#include "sounds.h"
-#include "info.h"
-#include "d_think.h"
-#include "m_argv.h"
-#include "z_zone.h"
-#include "w_wad.h"
-#include "m_menu.h"
-#include "m_misc.h"
-#include "f_finale.h"
-#include "y_inter.h"
-#include "dehacked.h"
-#include "st_stuff.h"
-#include "i_system.h"
-#include "p_local.h" // for var1 and var2, and some constants
-#include "p_setup.h"
-#include "r_data.h"
-#include "r_textures.h"
-#include "r_draw.h"
-#include "r_picformats.h"
-#include "r_things.h" // R_Char2Frame
-#include "r_sky.h"
-#include "fastcmp.h"
-#include "lua_script.h"
-#include "lua_hook.h"
-#include "d_clisrv.h"
-
#include "m_cond.h"
+#include "deh_soc.h"
+#include "deh_tables.h"
-#include "v_video.h" // video flags (for lua)
+boolean deh_loaded = false;
-#ifdef HWRENDER
-#include "hardware/hw_light.h"
-#endif
+boolean gamedataadded = false;
+boolean titlechanged = false;
+boolean introchanged = false;
-// Free slot names
-// The crazy word-reading stuff uses these.
-static char *FREE_STATES[NUMSTATEFREESLOTS];
-static char *FREE_MOBJS[NUMMOBJFREESLOTS];
-static char *FREE_SKINCOLORS[NUMCOLORFREESLOTS];
-static UINT8 used_spr[(NUMSPRITEFREESLOTS / 8) + 1]; // Bitwise flag for sprite freeslot in use! I would use ceil() here if I could, but it only saves 1 byte of memory anyway.
-#define initfreeslots() {\
-memset(FREE_STATES,0,sizeof(char *) * NUMSTATEFREESLOTS);\
-memset(FREE_MOBJS,0,sizeof(char *) * NUMMOBJFREESLOTS);\
-memset(FREE_SKINCOLORS,0,sizeof(char *) * NUMCOLORFREESLOTS);\
-memset(used_spr,0,sizeof(UINT8) * ((NUMSPRITEFREESLOTS / 8) + 1));\
-}
+static int dbg_line;
+static INT32 deh_num_warning = 0;
-// Crazy word-reading stuff
-/// \todo Put these in a seperate file or something.
-static mobjtype_t get_mobjtype(const char *word);
-static statenum_t get_state(const char *word);
-static spritenum_t get_sprite(const char *word);
-static playersprite_t get_sprite2(const char *word);
-static sfxenum_t get_sfx(const char *word);
-#ifdef MUSICSLOT_COMPATIBILITY
-static UINT16 get_mus(const char *word, UINT8 dehacked_mode);
-#endif
-static hudnum_t get_huditem(const char *word);
-static menutype_t get_menutype(const char *word);
-//static INT16 get_gametype(const char *word);
-//static powertype_t get_power(const char *word);
-skincolornum_t get_skincolor(const char *word);
+FUNCPRINTF void deh_warning(const char *first, ...)
+{
+ va_list argptr;
+ char *buf = Z_Malloc(1000, PU_STATIC, NULL);
-boolean deh_loaded = false;
-static int dbg_line;
+ va_start(argptr, first);
+ vsnprintf(buf, 1000, first, argptr); // sizeof only returned 4 here. it didn't like that pointer.
+ va_end(argptr);
-static boolean gamedataadded = false;
-static boolean titlechanged = false;
-static boolean introchanged = false;
+ if(dbg_line == -1) // Not in a SOC, line number unknown.
+ CONS_Alert(CONS_WARNING, "%s\n", buf);
+ else
+ CONS_Alert(CONS_WARNING, "Line %u: %s\n", dbg_line, buf);
+
+ deh_num_warning++;
+
+ Z_Free(buf);
+}
+
+void deh_strlcpy(char *dst, const char *src, size_t size, const char *warntext)
+{
+ size_t len = strlen(src)+1; // Used to determine if truncation has been done
+ if (len > size)
+ deh_warning("%s exceeds max length of %s", warntext, sizeu1(size-1));
+ strlcpy(dst, src, size);
+}
ATTRINLINE static FUNCINLINE char myfget_color(MYFILE *f)
{
@@ -91,6 +59,12 @@ ATTRINLINE static FUNCINLINE char myfget_color(MYFILE *f)
if (c >= '0' && c <= '9')
return 0x80+(c-'0');
+
+ c = tolower(c);
+
+ if (c >= 'a' && c <= 'f')
+ return 0x80+10+(c-'a');
+
return 0x80; // Unhandled -- default to no color
}
@@ -147,7 +121,7 @@ char *myfgets(char *buf, size_t bufsize, MYFILE *f)
return buf;
}
-static char *myhashfgets(char *buf, size_t bufsize, MYFILE *f)
+char *myhashfgets(char *buf, size_t bufsize, MYFILE *f)
{
size_t i = 0;
if (myfeof(f))
@@ -179,11064 +153,495 @@ static char *myhashfgets(char *buf, size_t bufsize, MYFILE *f)
return buf;
}
-static INT32 deh_num_warning = 0;
-
-FUNCPRINTF static void deh_warning(const char *first, ...)
-{
- va_list argptr;
- char *buf = Z_Malloc(1000, PU_STATIC, NULL);
-
- va_start(argptr, first);
- vsnprintf(buf, 1000, first, argptr); // sizeof only returned 4 here. it didn't like that pointer.
- va_end(argptr);
-
- if(dbg_line == -1) // Not in a SOC, line number unknown.
- CONS_Alert(CONS_WARNING, "%s\n", buf);
- else
- CONS_Alert(CONS_WARNING, "Line %u: %s\n", dbg_line, buf);
-
- deh_num_warning++;
-
- Z_Free(buf);
-}
-
-static void deh_strlcpy(char *dst, const char *src, size_t size, const char *warntext)
-{
- size_t len = strlen(src)+1; // Used to determine if truncation has been done
- if (len > size)
- deh_warning("%s exceeds max length of %s", warntext, sizeu1(size-1));
- strlcpy(dst, src, size);
-}
-
-/* ======================================================================== */
-// Load a dehacked file format
-/* ======================================================================== */
-/* a sample to see
- Thing 1 (Player) { // MT_PLAYER
-INT32 doomednum; ID # = 3232 -1, // doomednum
-INT32 spawnstate; Initial frame = 32 "PLAY", // spawnstate
-INT32 spawnhealth; Hit points = 3232 100, // spawnhealth
-INT32 seestate; First moving frame = 32 "PLAY_RUN1", // seestate
-INT32 seesound; Alert sound = 32 sfx_None, // seesound
-INT32 reactiontime; Reaction time = 3232 0, // reactiontime
-INT32 attacksound; Attack sound = 32 sfx_None, // attacksound
-INT32 painstate; Injury frame = 32 "PLAY_PAIN", // painstate
-INT32 painchance; Pain chance = 3232 255, // painchance
-INT32 painsound; Pain sound = 32 sfx_plpain, // painsound
-INT32 meleestate; Close attack frame = 32 "NULL", // meleestate
-INT32 missilestate; Far attack frame = 32 "PLAY_ATK1", // missilestate
-INT32 deathstate; Death frame = 32 "PLAY_DIE1", // deathstate
-INT32 xdeathstate; Exploding frame = 32 "PLAY_XDIE1", // xdeathstate
-INT32 deathsound; Death sound = 32 sfx_pldeth, // deathsound
-INT32 speed; Speed = 3232 0, // speed
-INT32 radius; Width = 211812352 16*FRACUNIT, // radius
-INT32 height; Height = 211812352 56*FRACUNIT, // height
-INT32 dispoffset; DispOffset = 0 0, // dispoffset
-INT32 mass; Mass = 3232 100, // mass
-INT32 damage; Missile damage = 3232 0, // damage
-INT32 activesound; Action sound = 32 sfx_None, // activesound
-INT32 flags; Bits = 3232 MF_SOLID|MF_SHOOTABLE|MF_DROPOFF|MF_PICKUP|MF_NOTDMATCH,
-INT32 raisestate; Respawn frame = 32 S_NULL // raisestate
- }, */
-
-#ifdef HWRENDER
-static INT32 searchvalue(const char *s)
-{
- while (s[0] != '=' && s[0])
- s++;
- if (s[0] == '=')
- return atoi(&s[1]);
- else
- {
- deh_warning("No value found");
- return 0;
- }
-}
-
-static float searchfvalue(const char *s)
-{
- while (s[0] != '=' && s[0])
- s++;
- if (s[0] == '=')
- return (float)atof(&s[1]);
- else
- {
- deh_warning("No value found");
- return 0;
- }
-}
-#endif
-
-// These are for clearing all of various things
-static void clear_conditionsets(void)
-{
- UINT8 i;
- for (i = 0; i < MAXCONDITIONSETS; ++i)
- M_ClearConditionSet(i+1);
-}
-
-static void clear_levels(void)
+// Used when you do something invalid like read a bad item number
+// to prevent extra unnecessary errors
+static void ignorelines(MYFILE *f)
{
- INT16 i;
-
- // This is potentially dangerous but if we're resetting these headers,
- // we may as well try to save some memory, right?
- for (i = 0; i < NUMMAPS; ++i)
+ char *s = Z_Malloc(MAXLINELEN, PU_STATIC, NULL);
+ do
{
- if (!mapheaderinfo[i] || i == (tutorialmap-1))
- continue;
-
- // Custom map header info
- // (no need to set num to 0, we're freeing the entire header shortly)
- Z_Free(mapheaderinfo[i]->customopts);
-
- P_DeleteFlickies(i);
- P_DeleteGrades(i);
-
- Z_Free(mapheaderinfo[i]);
- mapheaderinfo[i] = NULL;
- }
-
- // Realloc the one for the current gamemap as a safeguard
- P_AllocMapHeader(gamemap-1);
-}
-
-static boolean findFreeSlot(INT32 *num)
-{
- // Send the character select entry to a free slot.
- while (*num < MAXSKINS && (description[*num].used))
- *num = *num+1;
-
- // No more free slots. :(
- if (*num >= MAXSKINS)
- return false;
-
- // Redesign your logo. (See M_DrawSetupChoosePlayerMenu in m_menu.c...)
- description[*num].picname[0] = '\0';
- description[*num].nametag[0] = '\0';
- description[*num].displayname[0] = '\0';
- description[*num].oppositecolor = SKINCOLOR_NONE;
- description[*num].tagtextcolor = SKINCOLOR_NONE;
- description[*num].tagoutlinecolor = SKINCOLOR_NONE;
-
- // Found one! ^_^
- return (description[*num].used = true);
+ if (myfgets(s, MAXLINELEN, f))
+ {
+ if (s[0] == '\n')
+ break;
+ }
+ } while (!myfeof(f));
+ Z_Free(s);
}
-// Reads a player.
-// For modifying the character select screen
-static void readPlayer(MYFILE *f, INT32 num)
+static void DEH_LoadDehackedFile(MYFILE *f, boolean mainfile)
{
char *s = Z_Malloc(MAXLINELEN, PU_STATIC, NULL);
+ char textline[MAXLINELEN];
char *word;
char *word2;
- char *displayname = ZZ_Alloc(MAXLINELEN+1);
INT32 i;
- boolean slotfound = false;
- #define SLOTFOUND \
- if (!slotfound && (slotfound = findFreeSlot(&num)) == false) \
- goto done;
+ if (!deh_loaded)
+ initfreeslots();
- displayname[MAXLINELEN] = '\0';
+ deh_num_warning = 0;
- do
+ gamedataadded = titlechanged = introchanged = false;
+
+ // it doesn't test the version of SRB2 and version of dehacked file
+ dbg_line = -1; // start at -1 so the first line is 0.
+ while (!myfeof(f))
{
- if (myfgets(s, MAXLINELEN, f))
+ char origpos[128];
+ INT32 size = 0;
+ char *traverse;
+
+ myfgets(s, MAXLINELEN, f);
+ memcpy(textline, s, MAXLINELEN);
+ if (s[0] == '\n' || s[0] == '#')
+ continue;
+
+ traverse = s;
+
+ while (traverse[0] != '\n')
{
- if (s[0] == '\n')
- break;
+ traverse++;
+ size++;
+ }
+
+ strncpy(origpos, s, size);
+ origpos[size] = '\0';
- for (i = 0; i < MAXLINELEN-3; i++)
+ if (NULL != (word = strtok(s, " "))) {
+ strupr(word);
+ if (word[strlen(word)-1] == '\n')
+ word[strlen(word)-1] = '\0';
+ }
+ if (word)
+ {
+ if (fastcmp(word, "FREESLOT"))
+ {
+ readfreeslots(f);
+ continue;
+ }
+ else if (fastcmp(word, "MAINCFG"))
+ {
+ readmaincfg(f);
+ continue;
+ }
+ else if (fastcmp(word, "WIPES"))
+ {
+ readwipes(f);
+ continue;
+ }
+ word2 = strtok(NULL, " ");
+ if (word2) {
+ strupr(word2);
+ if (word2[strlen(word2) - 1] == '\n')
+ word2[strlen(word2) - 1] = '\0';
+ i = atoi(word2);
+ }
+ else
+ i = 0;
+ if (fastcmp(word, "CHARACTER"))
{
- char *tmp;
- if (s[i] == '=')
+ if (i >= 0 && i < 32)
+ readPlayer(f, i);
+ else
{
- tmp = &s[i+2];
- strncpy(displayname, tmp, SKINNAMESIZE);
- break;
+ deh_warning("Character %d out of range (0 - 31)", i);
+ ignorelines(f);
}
+ continue;
}
-
- word = strtok(s, " ");
- if (word)
- strupr(word);
- else
- break;
-
- if (fastcmp(word, "PLAYERTEXT"))
+ else if (fastcmp(word, "EMBLEM"))
{
- char *playertext = NULL;
-
- SLOTFOUND
-
- for (i = 0; i < MAXLINELEN-3; i++)
+ if (!mainfile && !gamedataadded)
+ {
+ deh_warning("You must define a custom gamedata to use \"%s\"", word);
+ ignorelines(f);
+ }
+ else
{
- if (s[i] == '=')
+ if (!word2)
+ i = numemblems + 1;
+
+ if (i > 0 && i <= MAXEMBLEMS)
{
- playertext = &s[i+2];
- break;
+ if (numemblems < i)
+ numemblems = i;
+ reademblemdata(f, i);
+ }
+ else
+ {
+ deh_warning("Emblem number %d out of range (1 - %d)", i, MAXEMBLEMS);
+ ignorelines(f);
}
}
- if (playertext)
+ continue;
+ }
+ else if (fastcmp(word, "EXTRAEMBLEM"))
+ {
+ if (!mainfile && !gamedataadded)
{
- strcpy(description[num].notes, playertext);
- strcat(description[num].notes, myhashfgets(playertext, sizeof (description[num].notes), f));
+ deh_warning("You must define a custom gamedata to use \"%s\"", word);
+ ignorelines(f);
}
else
- strcpy(description[num].notes, "");
-
- // For some reason, cutting the string did not work above. Most likely due to strcpy or strcat...
- // It works down here, though.
{
- INT32 numline = 0;
- for (i = 0; (size_t)i < sizeof(description[num].notes)-1; i++)
- {
- if (numline < 20 && description[num].notes[i] == '\n')
- numline++;
+ if (!word2)
+ i = numextraemblems + 1;
- if (numline >= 20 || description[num].notes[i] == '\0' || description[num].notes[i] == '#')
- break;
+ if (i > 0 && i <= MAXEXTRAEMBLEMS)
+ {
+ if (numextraemblems < i)
+ numextraemblems = i;
+ readextraemblemdata(f, i);
+ }
+ else
+ {
+ deh_warning("Extra emblem number %d out of range (1 - %d)", i, MAXEXTRAEMBLEMS);
+ ignorelines(f);
}
}
- description[num].notes[strlen(description[num].notes)-1] = '\0';
- description[num].notes[i] = '\0';
continue;
}
-
- word2 = strtok(NULL, " = ");
if (word2)
- strupr(word2);
- else
- break;
-
- if (word2[strlen(word2)-1] == '\n')
- word2[strlen(word2)-1] = '\0';
- i = atoi(word2);
-
- if (fastcmp(word, "PICNAME"))
{
- SLOTFOUND
- strncpy(description[num].picname, word2, 8);
- }
- // new character select
- else if (fastcmp(word, "DISPLAYNAME"))
- {
- SLOTFOUND
- // replace '#' with line breaks
- // (also remove any '\n')
+ if (fastcmp(word, "THING") || fastcmp(word, "MOBJ") || fastcmp(word, "OBJECT"))
{
- char *cur = NULL;
-
- // remove '\n'
- cur = strchr(displayname, '\n');
- if (cur)
- *cur = '\0';
-
- // turn '#' into '\n'
- cur = strchr(displayname, '#');
- while (cur)
+ if (i == 0 && word2[0] != '0') // If word2 isn't a number
+ i = get_mobjtype(word2); // find a thing by name
+ if (i < NUMMOBJTYPES && i > 0)
+ readthing(f, i);
+ else
{
- *cur = '\n';
- cur = strchr(cur, '#');
+ deh_warning("Thing %d out of range (1 - %d)", i, NUMMOBJTYPES-1);
+ ignorelines(f);
}
}
- // copy final string
- strncpy(description[num].displayname, displayname, SKINNAMESIZE);
- }
- else if (fastcmp(word, "OPPOSITECOLOR") || fastcmp(word, "OPPOSITECOLOUR"))
- {
- SLOTFOUND
- description[num].oppositecolor = (UINT16)get_number(word2);
- }
- else if (fastcmp(word, "NAMETAG") || fastcmp(word, "TAGNAME"))
- {
- SLOTFOUND
- strncpy(description[num].nametag, word2, 8);
- }
- else if (fastcmp(word, "TAGTEXTCOLOR") || fastcmp(word, "TAGTEXTCOLOUR"))
- {
- SLOTFOUND
- description[num].tagtextcolor = (UINT16)get_number(word2);
- }
- else if (fastcmp(word, "TAGOUTLINECOLOR") || fastcmp(word, "TAGOUTLINECOLOUR"))
- {
- SLOTFOUND
- description[num].tagoutlinecolor = (UINT16)get_number(word2);
- }
- else if (fastcmp(word, "STATUS"))
- {
- /*
- You MAY disable previous entries if you so desire...
- But try to enable something that's already enabled and you will be sent to a free slot.
-
- Because of this, you are allowed to edit any previous entries you like, but only if you
- signal that you are purposely doing so by disabling and then reenabling the slot.
- */
- if (i && !slotfound && (slotfound = findFreeSlot(&num)) == false)
- goto done;
-
- description[num].used = (!!i);
- }
- else if (fastcmp(word, "SKINNAME"))
- {
- // Send to free slot.
- SLOTFOUND
- strlcpy(description[num].skinname, word2, sizeof description[num].skinname);
- strlwr(description[num].skinname);
- }
- else
- deh_warning("readPlayer %d: unknown word '%s'", num, word);
- }
- } while (!myfeof(f)); // finish when the line is empty
- #undef SLOTFOUND
-done:
- Z_Free(displayname);
- Z_Free(s);
-}
-
-// TODO: Figure out how to do undolines for this....
-// TODO: Warnings for running out of freeslots
-static void readfreeslots(MYFILE *f)
-{
- char *s = Z_Malloc(MAXLINELEN, PU_STATIC, NULL);
- char *word,*type;
- char *tmp;
- int i;
-
- do
- {
- if (myfgets(s, MAXLINELEN, f))
- {
- if (s[0] == '\n')
- break;
-
- tmp = strchr(s, '#');
- if (tmp)
- *tmp = '\0';
- if (s == tmp)
- continue; // Skip comment lines, but don't break.
-
- type = strtok(s, "_");
- if (type)
- strupr(type);
- else
- break;
-
- word = strtok(NULL, "\n");
- if (word)
- strupr(word);
- else
- break;
-
- // TODO: Check for existing freeslot mobjs/states/etc. and make errors.
- // TODO: Out-of-slots warnings/errors.
- // TODO: Name too long (truncated) warnings.
- if (fastcmp(type, "SFX"))
- S_AddSoundFx(word, false, 0, false);
- else if (fastcmp(type, "SPR"))
- {
- for (i = SPR_FIRSTFREESLOT; i <= SPR_LASTFREESLOT; i++)
+ else if (fastcmp(word, "SKINCOLOR") || fastcmp(word, "COLOR"))
{
- if (used_spr[(i-SPR_FIRSTFREESLOT)/8] & (1<<(i%8)))
+ if (i == 0 && word2[0] != '0') // If word2 isn't a number
+ i = get_skincolor(word2); // find a skincolor by name
+ if (i && i < numskincolors)
+ readskincolor(f, i);
+ else
{
- if (!sprnames[i][4] && memcmp(sprnames[i],word,4)==0)
- sprnames[i][4] = (char)f->wad;
- continue; // Already allocated, next.
+ deh_warning("Skincolor %d out of range (1 - %d)", i, numskincolors-1);
+ ignorelines(f);
}
- // Found a free slot!
- strncpy(sprnames[i],word,4);
- //sprnames[i][4] = 0;
- used_spr[(i-SPR_FIRSTFREESLOT)/8] |= 1<<(i%8); // Okay, this sprite slot has been named now.
- break;
}
- }
- else if (fastcmp(type, "S"))
- {
- for (i = 0; i < NUMSTATEFREESLOTS; i++)
- if (!FREE_STATES[i]) {
- FREE_STATES[i] = Z_Malloc(strlen(word)+1, PU_STATIC, NULL);
- strcpy(FREE_STATES[i],word);
- break;
+ else if (fastcmp(word, "SPRITE2"))
+ {
+ if (i == 0 && word2[0] != '0') // If word2 isn't a number
+ i = get_sprite2(word2); // find a sprite by name
+ if (i < (INT32)free_spr2 && i >= (INT32)SPR2_FIRSTFREESLOT)
+ readsprite2(f, i);
+ else
+ {
+ deh_warning("Sprite2 number %d out of range (%d - %d)", i, SPR2_FIRSTFREESLOT, free_spr2-1);
+ ignorelines(f);
}
- }
- else if (fastcmp(type, "MT"))
- {
- for (i = 0; i < NUMMOBJFREESLOTS; i++)
- if (!FREE_MOBJS[i]) {
- FREE_MOBJS[i] = Z_Malloc(strlen(word)+1, PU_STATIC, NULL);
- strcpy(FREE_MOBJS[i],word);
- break;
+ }
+#ifdef HWRENDER
+ else if (fastcmp(word, "LIGHT"))
+ {
+ // TODO: Read lights by name
+ if (i > 0 && i < NUMLIGHTS)
+ readlight(f, i);
+ else
+ {
+ deh_warning("Light number %d out of range (1 - %d)", i, NUMLIGHTS-1);
+ ignorelines(f);
}
- }
- else if (fastcmp(type, "SKINCOLOR"))
- {
- for (i = 0; i < NUMCOLORFREESLOTS; i++)
- if (!FREE_SKINCOLORS[i]) {
- FREE_SKINCOLORS[i] = Z_Malloc(strlen(word)+1, PU_STATIC, NULL);
- strcpy(FREE_SKINCOLORS[i],word);
- M_AddMenuColor(numskincolors++);
- break;
+ }
+#endif
+ else if (fastcmp(word, "SPRITE") || fastcmp(word, "SPRITEINFO"))
+ {
+ if (i == 0 && word2[0] != '0') // If word2 isn't a number
+ i = get_sprite(word2); // find a sprite by name
+ if (i < NUMSPRITES && i > 0)
+ readspriteinfo(f, i, false);
+ else
+ {
+ deh_warning("Sprite number %d out of range (0 - %d)", i, NUMSPRITES-1);
+ ignorelines(f);
}
- }
- else if (fastcmp(type, "SPR2"))
- {
- // Search if we already have an SPR2 by that name...
- for (i = SPR2_FIRSTFREESLOT; i < (int)free_spr2; i++)
- if (memcmp(spr2names[i],word,4) == 0)
- break;
- // We found it? (Two mods using the same SPR2 name?) Then don't allocate another one.
- if (i < (int)free_spr2)
- continue;
- // Copy in the spr2 name and increment free_spr2.
- if (free_spr2 < NUMPLAYERSPRITES) {
- strncpy(spr2names[free_spr2],word,4);
- spr2defaults[free_spr2] = 0;
- spr2names[free_spr2++][4] = 0;
- } else
- deh_warning("Ran out of free SPR2 slots!\n");
- }
- else if (fastcmp(type, "TOL"))
- {
- // Search if we already have a typeoflevel by that name...
- for (i = 0; TYPEOFLEVEL[i].name; i++)
- if (fastcmp(word, TYPEOFLEVEL[i].name))
- break;
-
- // We found it? Then don't allocate another one.
- if (TYPEOFLEVEL[i].name)
- continue;
-
- // We don't, so freeslot it.
- if (lastcustomtol == (UINT32)MAXTOL) // Unless you have way too many, since they're flags.
- deh_warning("Ran out of free typeoflevel slots!\n");
- else
+ }
+ else if (fastcmp(word, "SPRITE2INFO"))
{
- G_AddTOL(lastcustomtol, word);
- lastcustomtol <<= 1;
+ if (i == 0 && word2[0] != '0') // If word2 isn't a number
+ i = get_sprite2(word2); // find a sprite by name
+ if (i < NUMPLAYERSPRITES && i >= 0)
+ readspriteinfo(f, i, true);
+ else
+ {
+ deh_warning("Sprite2 number %d out of range (0 - %d)", i, NUMPLAYERSPRITES-1);
+ ignorelines(f);
+ }
}
- }
- else
- deh_warning("Freeslots: unknown enum class '%s' for '%s_%s'", type, type, word);
- }
- } while (!myfeof(f)); // finish when the line is empty
-
- Z_Free(s);
-}
-
-static void readthing(MYFILE *f, INT32 num)
-{
- char *s = Z_Malloc(MAXLINELEN, PU_STATIC, NULL);
- char *word, *word2;
- char *tmp;
-
- do
- {
- if (myfgets(s, MAXLINELEN, f))
- {
- if (s[0] == '\n')
- break;
-
- tmp = strchr(s, '#');
- if (tmp)
- *tmp = '\0';
- if (s == tmp)
- continue; // Skip comment lines, but don't break.
-
- word = strtok(s, " ");
- if (word)
- strupr(word);
- else
- break;
-
- word2 = strtok(NULL, " = ");
- if (word2)
- strupr(word2);
- else
- break;
- if (word2[strlen(word2)-1] == '\n')
- word2[strlen(word2)-1] = '\0';
-
- if (fastcmp(word, "MAPTHINGNUM") || fastcmp(word, "DOOMEDNUM"))
- {
- mobjinfo[num].doomednum = (INT32)atoi(word2);
- }
- else if (fastcmp(word, "SPAWNSTATE"))
- {
- mobjinfo[num].spawnstate = get_number(word2);
- }
- else if (fastcmp(word, "SPAWNHEALTH"))
- {
- mobjinfo[num].spawnhealth = (INT32)get_number(word2);
- }
- else if (fastcmp(word, "SEESTATE"))
- {
- mobjinfo[num].seestate = get_number(word2);
- }
- else if (fastcmp(word, "SEESOUND"))
- {
- mobjinfo[num].seesound = get_number(word2);
- }
- else if (fastcmp(word, "REACTIONTIME"))
- {
- mobjinfo[num].reactiontime = (INT32)get_number(word2);
- }
- else if (fastcmp(word, "ATTACKSOUND"))
- {
- mobjinfo[num].attacksound = get_number(word2);
- }
- else if (fastcmp(word, "PAINSTATE"))
- {
- mobjinfo[num].painstate = get_number(word2);
- }
- else if (fastcmp(word, "PAINCHANCE"))
- {
- mobjinfo[num].painchance = (INT32)get_number(word2);
- }
- else if (fastcmp(word, "PAINSOUND"))
- {
- mobjinfo[num].painsound = get_number(word2);
- }
- else if (fastcmp(word, "MELEESTATE"))
- {
- mobjinfo[num].meleestate = get_number(word2);
- }
- else if (fastcmp(word, "MISSILESTATE"))
- {
- mobjinfo[num].missilestate = get_number(word2);
- }
- else if (fastcmp(word, "DEATHSTATE"))
- {
- mobjinfo[num].deathstate = get_number(word2);
- }
- else if (fastcmp(word, "DEATHSOUND"))
- {
- mobjinfo[num].deathsound = get_number(word2);
- }
- else if (fastcmp(word, "XDEATHSTATE"))
- {
- mobjinfo[num].xdeathstate = get_number(word2);
- }
- else if (fastcmp(word, "SPEED"))
- {
- mobjinfo[num].speed = get_number(word2);
- }
- else if (fastcmp(word, "RADIUS"))
- {
- mobjinfo[num].radius = get_number(word2);
- }
- else if (fastcmp(word, "HEIGHT"))
- {
- mobjinfo[num].height = get_number(word2);
- }
- else if (fastcmp(word, "DISPOFFSET"))
- {
- mobjinfo[num].dispoffset = get_number(word2);
- }
- else if (fastcmp(word, "MASS"))
- {
- mobjinfo[num].mass = (INT32)get_number(word2);
- }
- else if (fastcmp(word, "DAMAGE"))
- {
- mobjinfo[num].damage = (INT32)get_number(word2);
- }
- else if (fastcmp(word, "ACTIVESOUND"))
- {
- mobjinfo[num].activesound = get_number(word2);
- }
- else if (fastcmp(word, "FLAGS"))
- {
- mobjinfo[num].flags = (INT32)get_number(word2);
- }
- else if (fastcmp(word, "RAISESTATE"))
- {
- mobjinfo[num].raisestate = get_number(word2);
- }
- else
- deh_warning("Thing %d: unknown word '%s'", num, word);
- }
- } while (!myfeof(f)); // finish when the line is empty
-
- Z_Free(s);
-}
-
-static void readskincolor(MYFILE *f, INT32 num)
-{
- char *s = Z_Malloc(MAXLINELEN, PU_STATIC, NULL);
- char *word = s;
- char *word2;
- char *tmp;
-
- Color_cons_t[num].value = num;
-
- do
- {
- if (myfgets(s, MAXLINELEN, f))
- {
- if (s[0] == '\n')
- break;
-
- // First remove trailing newline, if there is one
- tmp = strchr(s, '\n');
- if (tmp)
- *tmp = '\0';
-
- tmp = strchr(s, '#');
- if (tmp)
- *tmp = '\0';
- if (s == tmp)
- continue; // Skip comment lines, but don't break.
-
- // Get the part before the " = "
- tmp = strchr(s, '=');
- if (tmp)
- *(tmp-1) = '\0';
- else
- break;
- strupr(word);
-
- // Now get the part after
- word2 = tmp += 2;
-
- if (fastcmp(word, "NAME"))
- {
- size_t namesize = sizeof(skincolors[num].name);
- char truncword[namesize];
- UINT16 dupecheck;
-
- deh_strlcpy(truncword, word2, namesize, va("Skincolor %d: name", num)); // truncate here to check for dupes
- dupecheck = R_GetColorByName(truncword);
- if (truncword[0] != '\0' && (!stricmp(truncword, skincolors[SKINCOLOR_NONE].name) || (dupecheck && dupecheck != num)))
+ else if (fastcmp(word, "LEVEL"))
{
- size_t lastchar = strlen(truncword);
- char oldword[lastchar+1];
- char dupenum = '1';
+ // Support using the actual map name,
+ // i.e., Level AB, Level FZ, etc.
+
+ // Convert to map number
+ if (word2[0] >= 'A' && word2[0] <= 'Z')
+ i = M_MapNumber(word2[0], word2[1]);
- strlcpy(oldword, truncword, lastchar+1);
- lastchar--;
- if (lastchar == namesize-2) // exactly max length, replace last character with 0
- truncword[lastchar] = '0';
- else // append 0
+ if (i > 0 && i <= NUMMAPS)
+ readlevelheader(f, i);
+ else
{
- strcat(truncword, "0");
- lastchar++;
+ deh_warning("Level number %d out of range (1 - %d)", i, NUMMAPS);
+ ignorelines(f);
}
-
- while (R_GetColorByName(truncword))
+ }
+ else if (fastcmp(word, "GAMETYPE"))
+ {
+ // Get the gametype name from textline
+ // instead of word2, so that gametype names
+ // aren't allcaps
+ INT32 c;
+ for (c = 0; c < MAXLINELEN; c++)
{
- truncword[lastchar] = dupenum;
- if (dupenum == '9')
- dupenum = 'A';
- else if (dupenum == 'Z') // give up :?
+ if (textline[c] == '\0')
+ break;
+ if (textline[c] == ' ')
+ {
+ char *gtname = (textline+c+1);
+ if (gtname)
+ {
+ // remove funny characters
+ INT32 j;
+ for (j = 0; j < (MAXLINELEN - c); j++)
+ {
+ if (gtname[j] == '\0')
+ break;
+ if (gtname[j] < 32)
+ gtname[j] = '\0';
+ }
+ readgametype(f, gtname);
+ }
break;
- else
- dupenum++;
+ }
}
-
- deh_warning("Skincolor %d: name %s is a duplicate of another skincolor's name - renamed to %s", num, oldword, truncword);
}
-
- strlcpy(skincolors[num].name, truncword, namesize); // already truncated
- }
- else if (fastcmp(word, "RAMP"))
- {
- UINT8 i;
- tmp = strtok(word2,",");
- for (i = 0; i < COLORRAMPSIZE; i++) {
- skincolors[num].ramp[i] = (UINT8)get_number(tmp);
- if ((tmp = strtok(NULL,",")) == NULL)
- break;
+ else if (fastcmp(word, "CUTSCENE"))
+ {
+ if (i > 0 && i < 129)
+ readcutscene(f, i - 1);
+ else
+ {
+ deh_warning("Cutscene number %d out of range (1 - 128)", i);
+ ignorelines(f);
+ }
}
- skincolor_modified[num] = true;
- }
- else if (fastcmp(word, "INVCOLOR"))
- {
- UINT16 v = (UINT16)get_number(word2);
- if (v < numskincolors)
- skincolors[num].invcolor = v;
- else
- skincolors[num].invcolor = SKINCOLOR_GREEN;
- }
- else if (fastcmp(word, "INVSHADE"))
- {
- skincolors[num].invshade = get_number(word2)%COLORRAMPSIZE;
- }
- else if (fastcmp(word, "CHATCOLOR"))
- {
- skincolors[num].chatcolor = get_number(word2);
- }
- else if (fastcmp(word, "ACCESSIBLE"))
- {
- if (num > FIRSTSUPERCOLOR)
- skincolors[num].accessible = (boolean)(atoi(word2) || word2[0] == 'T' || word2[0] == 'Y');
- }
- else
- deh_warning("Skincolor %d: unknown word '%s'", num, word);
- }
- } while (!myfeof(f)); // finish when the line is empty
-
- Z_Free(s);
-}
-
-#ifdef HWRENDER
-static void readlight(MYFILE *f, INT32 num)
-{
- char *s = Z_Malloc(MAXLINELEN, PU_STATIC, NULL);
- char *word;
- char *tmp;
- INT32 value;
- float fvalue;
-
- do
- {
- if (myfgets(s, MAXLINELEN, f))
- {
- if (s[0] == '\n')
- break;
-
- tmp = strchr(s, '#');
- if (tmp)
- *tmp = '\0';
- if (s == tmp)
- continue; // Skip comment lines, but don't break.
-
- fvalue = searchfvalue(s);
- value = searchvalue(s);
-
- word = strtok(s, " ");
- if (word)
- strupr(word);
- else
- break;
-
- if (fastcmp(word, "TYPE"))
- {
- lspr[num].type = (UINT16)value;
- }
- else if (fastcmp(word, "OFFSETX"))
- {
- lspr[num].light_xoffset = fvalue;
- }
- else if (fastcmp(word, "OFFSETY"))
- {
- lspr[num].light_yoffset = fvalue;
- }
- else if (fastcmp(word, "CORONACOLOR"))
- {
- lspr[num].corona_color = value;
- }
- else if (fastcmp(word, "CORONARADIUS"))
- {
- lspr[num].corona_radius = fvalue;
- }
- else if (fastcmp(word, "DYNAMICCOLOR"))
- {
- lspr[num].dynamic_color = value;
- }
- else if (fastcmp(word, "DYNAMICRADIUS"))
- {
- lspr[num].dynamic_radius = fvalue;
-
- /// \note Update the sqrradius! unnecessary?
- lspr[num].dynamic_sqrradius = fvalue * fvalue;
- }
- else
- deh_warning("Light %d: unknown word '%s'", num, word);
- }
- } while (!myfeof(f)); // finish when the line is empty
-
- Z_Free(s);
-}
-#endif // HWRENDER
-
-static void readspriteframe(MYFILE *f, spriteinfo_t *sprinfo, UINT8 frame)
-{
- char *s = Z_Malloc(MAXLINELEN, PU_STATIC, NULL);
- char *word, *word2;
- char *tmp;
- INT32 value;
- char *lastline;
-
- do
- {
- lastline = f->curpos;
- if (myfgets(s, MAXLINELEN, f))
- {
- if (s[0] == '\n')
- break;
-
- // First remove trailing newline, if there is one
- tmp = strchr(s, '\n');
- if (tmp)
- *tmp = '\0';
-
- tmp = strchr(s, '#');
- if (tmp)
- *tmp = '\0';
- if (s == tmp)
- continue; // Skip comment lines, but don't break.
-
- // Set / reset word
- word = s;
- while ((*word == '\t') || (*word == ' '))
- word++;
-
- // Get the part before the " = "
- tmp = strchr(s, '=');
- if (tmp)
- {
- *(tmp-1) = '\0';
- // Now get the part after
- word2 = tmp += 2;
- }
- else
- {
- // Get the part before the " "
- tmp = strchr(s, ' ');
- if (tmp)
- {
- *tmp = '\0';
- // Now get the part after
- tmp++;
- word2 = tmp;
- }
- else
- break;
- }
- strupr(word);
- value = atoi(word2); // used for numerical settings
-
- if (fastcmp(word, "XPIVOT"))
- sprinfo->pivot[frame].x = value;
- else if (fastcmp(word, "YPIVOT"))
- sprinfo->pivot[frame].y = value;
- else if (fastcmp(word, "ROTAXIS"))
- sprinfo->pivot[frame].rotaxis = value;
- else
- {
- f->curpos = lastline;
- break;
- }
- }
- } while (!myfeof(f)); // finish when the line is empty
- Z_Free(s);
-}
-
-static void readspriteinfo(MYFILE *f, INT32 num, boolean sprite2)
-{
- char *s = Z_Malloc(MAXLINELEN, PU_STATIC, NULL);
- char *word, *word2;
- char *tmp;
-#ifdef HWRENDER
- INT32 value;
-#endif
- char *lastline;
- INT32 skinnumbers[MAXSKINS];
- INT32 foundskins = 0;
-
- // allocate a spriteinfo
- spriteinfo_t *info = Z_Calloc(sizeof(spriteinfo_t), PU_STATIC, NULL);
- info->available = true;
-
-#ifdef ROTSPRITE
- if ((sprites != NULL) && (!sprite2))
- R_FreeSingleRotSprite(&sprites[num]);
-#endif
-
- do
- {
- lastline = f->curpos;
- if (myfgets(s, MAXLINELEN, f))
- {
- if (s[0] == '\n')
- break;
-
- // First remove trailing newline, if there is one
- tmp = strchr(s, '\n');
- if (tmp)
- *tmp = '\0';
-
- tmp = strchr(s, '#');
- if (tmp)
- *tmp = '\0';
- if (s == tmp)
- continue; // Skip comment lines, but don't break.
-
- // Set / reset word
- word = s;
- while ((*word == '\t') || (*word == ' '))
- word++;
-
- // Get the part before the " = "
- tmp = strchr(s, '=');
- if (tmp)
- {
- *(tmp-1) = '\0';
- // Now get the part after
- word2 = tmp += 2;
- }
- else
- {
- // Get the part before the " "
- tmp = strchr(s, ' ');
- if (tmp)
- {
- *tmp = '\0';
- // Now get the part after
- tmp++;
- word2 = tmp;
- }
- else
- break;
- }
- strupr(word);
-#ifdef HWRENDER
- value = atoi(word2); // used for numerical settings
-
- if (fastcmp(word, "LIGHTTYPE"))
- {
- if (sprite2)
- deh_warning("Sprite2 %s: invalid word '%s'", spr2names[num], word);
- else
- {
- INT32 oldvar;
- for (oldvar = 0; t_lspr[num] != &lspr[oldvar]; oldvar++)
- ;
- t_lspr[num] = &lspr[value];
- }
- }
- else
-#endif
- if (fastcmp(word, "SKIN"))
- {
- INT32 skinnum = -1;
- if (!sprite2)
- {
- deh_warning("Sprite %s: %s keyword found outside of SPRITE2INFO block, ignoring", spr2names[num], word);
- continue;
- }
-
- // make lowercase
- strlwr(word2);
- skinnum = R_SkinAvailable(word2);
- if (skinnum == -1)
- {
- deh_warning("Sprite2 %s: unknown skin %s", spr2names[num], word2);
- break;
- }
-
- skinnumbers[foundskins] = skinnum;
- foundskins++;
- }
- else if (fastcmp(word, "DEFAULT"))
- {
- if (!sprite2)
- {
- deh_warning("Sprite %s: %s keyword found outside of SPRITE2INFO block, ignoring", spr2names[num], word);
- continue;
- }
- if (num < (INT32)free_spr2 && num >= (INT32)SPR2_FIRSTFREESLOT)
- spr2defaults[num] = get_number(word2);
- else
- {
- deh_warning("Sprite2 %s: out of range (%d - %d), ignoring", spr2names[num], SPR2_FIRSTFREESLOT, free_spr2-1);
- continue;
- }
- }
- else if (fastcmp(word, "FRAME"))
- {
- UINT8 frame = R_Char2Frame(word2[0]);
- // frame number too high
- if (frame >= 64)
+ else if (fastcmp(word, "PROMPT"))
{
- if (sprite2)
- deh_warning("Sprite2 %s: invalid frame %s", spr2names[num], word2);
+ if (i > 0 && i < MAX_PROMPTS)
+ readtextprompt(f, i - 1);
else
- deh_warning("Sprite %s: invalid frame %s", sprnames[num], word2);
- break;
- }
-
- // read sprite frame and store it in the spriteinfo_t struct
- readspriteframe(f, info, frame);
- if (sprite2)
- {
- INT32 i;
- if (!foundskins)
{
- deh_warning("Sprite2 %s: no skins specified", spr2names[num]);
- break;
- }
- for (i = 0; i < foundskins; i++)
- {
- size_t skinnum = skinnumbers[i];
- skin_t *skin = &skins[skinnum];
- spriteinfo_t *sprinfo = skin->sprinfo;
-#ifdef ROTSPRITE
- R_FreeSkinRotSprite(skinnum);
-#endif
- M_Memcpy(&sprinfo[num], info, sizeof(spriteinfo_t));
+ deh_warning("Prompt number %d out of range (1 - %d)", i, MAX_PROMPTS);
+ ignorelines(f);
}
}
- else
- M_Memcpy(&spriteinfo[num], info, sizeof(spriteinfo_t));
- }
- else
- {
- //deh_warning("Sprite %s: unknown word '%s'", sprnames[num], word);
- f->curpos = lastline;
- break;
- }
- }
- } while (!myfeof(f)); // finish when the line is empty
-
- Z_Free(s);
- Z_Free(info);
-}
-
-static void readsprite2(MYFILE *f, INT32 num)
-{
- char *s = Z_Malloc(MAXLINELEN, PU_STATIC, NULL);
- char *word, *word2;
- char *tmp;
-
- do
- {
- if (myfgets(s, MAXLINELEN, f))
- {
- if (s[0] == '\n')
- break;
-
- tmp = strchr(s, '#');
- if (tmp)
- *tmp = '\0';
- if (s == tmp)
- continue; // Skip comment lines, but don't break.
-
- word = strtok(s, " ");
- if (word)
- strupr(word);
- else
- break;
-
- word2 = strtok(NULL, " = ");
- if (word2)
- strupr(word2);
- else
- break;
- if (word2[strlen(word2)-1] == '\n')
- word2[strlen(word2)-1] = '\0';
-
- if (fastcmp(word, "DEFAULT"))
- spr2defaults[num] = get_number(word2);
- else
- deh_warning("Sprite2 %s: unknown word '%s'", spr2names[num], word);
- }
- } while (!myfeof(f)); // finish when the line is empty
-
- Z_Free(s);
-}
-
-// copypasted from readPlayer :]
-static const char *const GAMETYPERULE_LIST[];
-static void readgametype(MYFILE *f, char *gtname)
-{
- char *s = Z_Malloc(MAXLINELEN, PU_STATIC, NULL);
- char *word;
- char *word2, *word2lwr = NULL;
- char *tmp;
- INT32 i, j;
-
- INT16 newgtidx = 0;
- UINT32 newgtrules = 0;
- UINT32 newgttol = 0;
- INT32 newgtpointlimit = 0;
- INT32 newgttimelimit = 0;
- UINT8 newgtleftcolor = 0;
- UINT8 newgtrightcolor = 0;
- INT16 newgtrankingstype = -1;
- int newgtinttype = 0;
- char gtdescription[441];
- char gtconst[MAXLINELEN];
-
- // Empty strings.
- gtdescription[0] = '\0';
- gtconst[0] = '\0';
-
- do
- {
- if (myfgets(s, MAXLINELEN, f))
- {
- if (s[0] == '\n')
- break;
-
- word = strtok(s, " ");
- if (word)
- strupr(word);
- else
- break;
-
- if (fastcmp(word, "DESCRIPTION"))
- {
- char *descr = NULL;
-
- for (i = 0; i < MAXLINELEN-3; i++)
+ else if (fastcmp(word, "FRAME") || fastcmp(word, "STATE"))
{
- if (s[i] == '=')
+ if (i == 0 && word2[0] != '0') // If word2 isn't a number
+ i = get_state(word2); // find a state by name
+ if (i < NUMSTATES && i >= 0)
+ readframe(f, i);
+ else
{
- descr = &s[i+2];
- break;
+ deh_warning("Frame %d out of range (0 - %d)", i, NUMSTATES-1);
+ ignorelines(f);
}
}
- if (descr)
- {
- strcpy(gtdescription, descr);
- strcat(gtdescription, myhashfgets(descr, sizeof (gtdescription), f));
- }
- else
- strcpy(gtdescription, "");
-
- // For some reason, cutting the string did not work above. Most likely due to strcpy or strcat...
- // It works down here, though.
+ else if (fastcmp(word, "SOUND"))
{
- INT32 numline = 0;
- for (i = 0; (size_t)i < sizeof(gtdescription)-1; i++)
+ if (i == 0 && word2[0] != '0') // If word2 isn't a number
+ i = get_sfx(word2); // find a sound by name
+ if (i < NUMSFX && i > 0)
+ readsound(f, i);
+ else
{
- if (numline < 20 && gtdescription[i] == '\n')
- numline++;
-
- if (numline >= 20 || gtdescription[i] == '\0' || gtdescription[i] == '#')
- break;
+ deh_warning("Sound %d out of range (1 - %d)", i, NUMSFX-1);
+ ignorelines(f);
}
}
- gtdescription[strlen(gtdescription)-1] = '\0';
- gtdescription[i] = '\0';
- continue;
- }
-
- word2 = strtok(NULL, " = ");
- if (word2)
- {
- if (!word2lwr)
- word2lwr = Z_Malloc(MAXLINELEN, PU_STATIC, NULL);
- strcpy(word2lwr, word2);
- strupr(word2);
- }
- else
- break;
-
- if (word2[strlen(word2)-1] == '\n')
- word2[strlen(word2)-1] = '\0';
- i = atoi(word2);
-
- // Game type rules
- if (fastcmp(word, "RULES"))
- {
- // GTR_
- newgtrules = (UINT32)get_number(word2);
- }
- // Identifier
- else if (fastcmp(word, "IDENTIFIER"))
- {
- // GT_
- strncpy(gtconst, word2, MAXLINELEN);
- }
- // Point and time limits
- else if (fastcmp(word, "DEFAULTPOINTLIMIT"))
- newgtpointlimit = (INT32)i;
- else if (fastcmp(word, "DEFAULTTIMELIMIT"))
- newgttimelimit = (INT32)i;
- // Level platter
- else if (fastcmp(word, "HEADERCOLOR") || fastcmp(word, "HEADERCOLOUR"))
- newgtleftcolor = newgtrightcolor = (UINT8)get_number(word2);
- else if (fastcmp(word, "HEADERLEFTCOLOR") || fastcmp(word, "HEADERLEFTCOLOUR"))
- newgtleftcolor = (UINT8)get_number(word2);
- else if (fastcmp(word, "HEADERRIGHTCOLOR") || fastcmp(word, "HEADERRIGHTCOLOUR"))
- newgtrightcolor = (UINT8)get_number(word2);
- // Rankings type
- else if (fastcmp(word, "RANKINGTYPE"))
- {
- // Case insensitive
- newgtrankingstype = (int)get_number(word2);
- }
- // Intermission type
- else if (fastcmp(word, "INTERMISSIONTYPE"))
- {
- // Case sensitive
- newgtinttype = (int)get_number(word2lwr);
- }
- // Type of level
- else if (fastcmp(word, "TYPEOFLEVEL"))
- {
- if (i) // it's just a number
- newgttol = (UINT32)i;
- else
+ else if (fastcmp(word, "HUDITEM"))
{
- UINT32 tol = 0;
- tmp = strtok(word2,",");
- do {
- for (i = 0; TYPEOFLEVEL[i].name; i++)
- if (fasticmp(tmp, TYPEOFLEVEL[i].name))
- break;
- if (!TYPEOFLEVEL[i].name)
- deh_warning("readgametype %s: unknown typeoflevel flag %s\n", gtname, tmp);
- tol |= TYPEOFLEVEL[i].flag;
- } while((tmp = strtok(NULL,",")) != NULL);
- newgttol = tol;
- }
- }
- // The SOC probably provided gametype rules as words,
- // instead of using the RULES keyword.
- // Like for example "NOSPECTATORSPAWN = TRUE".
- // This is completely valid, and looks better anyway.
- else
- {
- UINT32 wordgt = 0;
- for (j = 0; GAMETYPERULE_LIST[j]; j++)
- if (fastcmp(word, GAMETYPERULE_LIST[j])) {
- wordgt |= (1<<j);
- if (i || word2[0] == 'T' || word2[0] == 'Y')
- newgtrules |= wordgt;
- break;
+ if (i == 0 && word2[0] != '0') // If word2 isn't a number
+ i = get_huditem(word2); // find a huditem by name
+ if (i >= 0 && i < NUMHUDITEMS)
+ readhuditem(f, i);
+ else
+ {
+ deh_warning("HUD item number %d out of range (0 - %d)", i, NUMHUDITEMS-1);
+ ignorelines(f);
}
- if (!wordgt)
- deh_warning("readgametype %s: unknown word '%s'", gtname, word);
- }
- }
- } while (!myfeof(f)); // finish when the line is empty
-
- // Free strings.
- Z_Free(s);
- if (word2lwr)
- Z_Free(word2lwr);
-
- // Ran out of gametype slots
- if (gametypecount == NUMGAMETYPEFREESLOTS)
- {
- CONS_Alert(CONS_WARNING, "Ran out of free gametype slots!\n");
- return;
- }
-
- // Add the new gametype
- newgtidx = G_AddGametype(newgtrules);
- G_AddGametypeTOL(newgtidx, newgttol);
- G_SetGametypeDescription(newgtidx, gtdescription, newgtleftcolor, newgtrightcolor);
-
- // Not covered by G_AddGametype alone.
- if (newgtrankingstype == -1)
- newgtrankingstype = newgtidx;
- gametyperankings[newgtidx] = newgtrankingstype;
- intermissiontypes[newgtidx] = newgtinttype;
- pointlimits[newgtidx] = newgtpointlimit;
- timelimits[newgtidx] = newgttimelimit;
-
- // Write the new gametype name.
- Gametype_Names[newgtidx] = Z_StrDup((const char *)gtname);
-
- // Write the constant name.
- if (gtconst[0] == '\0')
- strncpy(gtconst, gtname, MAXLINELEN);
- G_AddGametypeConstant(newgtidx, (const char *)gtconst);
-
- // Update gametype_cons_t accordingly.
- G_UpdateGametypeSelections();
-
- CONS_Printf("Added gametype %s\n", Gametype_Names[newgtidx]);
-}
-
-static const struct {
- const char *name;
- const mobjtype_t type;
-} FLICKYTYPES[] = {
- {"BLUEBIRD", MT_FLICKY_01}, // Flicky (Flicky)
- {"RABBIT", MT_FLICKY_02}, // Pocky (1)
- {"CHICKEN", MT_FLICKY_03}, // Cucky (1)
- {"SEAL", MT_FLICKY_04}, // Rocky (1)
- {"PIG", MT_FLICKY_05}, // Picky (1)
- {"CHIPMUNK", MT_FLICKY_06}, // Ricky (1)
- {"PENGUIN", MT_FLICKY_07}, // Pecky (1)
- {"FISH", MT_FLICKY_08}, // Nicky (CD)
- {"RAM", MT_FLICKY_09}, // Flocky (CD)
- {"PUFFIN", MT_FLICKY_10}, // Wicky (CD)
- {"COW", MT_FLICKY_11}, // Macky (SRB2)
- {"RAT", MT_FLICKY_12}, // Micky (2)
- {"BEAR", MT_FLICKY_13}, // Becky (2)
- {"DOVE", MT_FLICKY_14}, // Docky (CD)
- {"CAT", MT_FLICKY_15}, // Nyannyan (Flicky)
- {"CANARY", MT_FLICKY_16}, // Lucky (CD)
- {"a", 0}, // End of normal flickies - a lower case character so will never fastcmp valid with uppercase tmp
- //{"FLICKER", MT_FLICKER}, // Flacky (SRB2)
- {"SPIDER", MT_SECRETFLICKY_01}, // Sticky (SRB2)
- {"BAT", MT_SECRETFLICKY_02}, // Backy (SRB2)
- {"SEED", MT_SEED}, // Seed (CD)
- {NULL, 0}
-};
-
-#define MAXFLICKIES 64
-
-static void readlevelheader(MYFILE *f, INT32 num)
-{
- char *s = Z_Malloc(MAXLINELEN, PU_STATIC, NULL);
- char *word;
- char *word2;
- //char *word3; // Non-uppercase version of word2
- char *tmp;
- INT32 i;
-
- // Reset all previous map header information
- P_AllocMapHeader((INT16)(num-1));
-
- do
- {
- if (myfgets(s, MAXLINELEN, f))
- {
- if (s[0] == '\n')
- break;
-
- // First remove trailing newline, if there is one
- tmp = strchr(s, '\n');
- if (tmp)
- *tmp = '\0';
-
- tmp = strchr(s, '#');
- if (tmp)
- *tmp = '\0';
- if (s == tmp)
- continue; // Skip comment lines, but don't break.
-
- // Set / reset word, because some things (Lua.) move it
- word = s;
-
- // Get the part before the " = "
- tmp = strchr(s, '=');
- if (tmp)
- *(tmp-1) = '\0';
- else
- break;
- strupr(word);
-
- // Now get the part after
- word2 = tmp += 2;
- i = atoi(word2); // used for numerical settings
-
-
- if (fastcmp(word, "LEVELNAME"))
- {
- deh_strlcpy(mapheaderinfo[num-1]->lvlttl, word2,
- sizeof(mapheaderinfo[num-1]->lvlttl), va("Level header %d: levelname", num));
- strlcpy(mapheaderinfo[num-1]->selectheading, word2, sizeof(mapheaderinfo[num-1]->selectheading)); // not deh_ so only complains once
- continue;
- }
- // CHEAP HACK: move this over here for lowercase subtitles
- if (fastcmp(word, "SUBTITLE"))
- {
- deh_strlcpy(mapheaderinfo[num-1]->subttl, word2,
- sizeof(mapheaderinfo[num-1]->subttl), va("Level header %d: subtitle", num));
- continue;
- }
-
- // Lua custom options also go above, contents may be case sensitive.
- if (fastncmp(word, "LUA.", 4))
- {
- UINT8 j;
- customoption_t *modoption;
-
- // Note: we actualy strlwr word here, so things are made a little easier for Lua
- strlwr(word);
- word += 4; // move past "lua."
-
- // ... and do a simple name sanity check; the name must start with a letter
- if (*word < 'a' || *word > 'z')
- {
- deh_warning("Level header %d: invalid custom option name \"%s\"", num, word);
- continue;
- }
-
- // Sanity limit of 128 params
- if (mapheaderinfo[num-1]->numCustomOptions == 128)
- {
- deh_warning("Level header %d: too many custom parameters", num);
- continue;
- }
- j = mapheaderinfo[num-1]->numCustomOptions++;
-
- mapheaderinfo[num-1]->customopts =
- Z_Realloc(mapheaderinfo[num-1]->customopts,
- sizeof(customoption_t) * mapheaderinfo[num-1]->numCustomOptions, PU_STATIC, NULL);
-
- // Newly allocated
- modoption = &mapheaderinfo[num-1]->customopts[j];
-
- strncpy(modoption->option, word, 31);
- modoption->option[31] = '\0';
- strncpy(modoption->value, word2, 255);
- modoption->value[255] = '\0';
- continue;
- }
-
- // Now go to uppercase
- strupr(word2);
-
- // List of flickies that are be freed in this map
- if (fastcmp(word, "FLICKYLIST") || fastcmp(word, "ANIMALLIST"))
- {
- if (fastcmp(word2, "NONE"))
- P_DeleteFlickies(num-1);
- else if (fastcmp(word2, "DEMO"))
- P_SetDemoFlickies(num-1);
- else if (fastcmp(word2, "ALL"))
- {
- mobjtype_t tmpflickies[MAXFLICKIES];
-
- for (mapheaderinfo[num-1]->numFlickies = 0;
- ((mapheaderinfo[num-1]->numFlickies < MAXFLICKIES) && FLICKYTYPES[mapheaderinfo[num-1]->numFlickies].type);
- mapheaderinfo[num-1]->numFlickies++)
- tmpflickies[mapheaderinfo[num-1]->numFlickies] = FLICKYTYPES[mapheaderinfo[num-1]->numFlickies].type;
-
- if (mapheaderinfo[num-1]->numFlickies) // just in case...
- {
- size_t newsize = sizeof(mobjtype_t) * mapheaderinfo[num-1]->numFlickies;
- mapheaderinfo[num-1]->flickies = Z_Realloc(mapheaderinfo[num-1]->flickies, newsize, PU_STATIC, NULL);
- M_Memcpy(mapheaderinfo[num-1]->flickies, tmpflickies, newsize);
- }
- }
- else
- {
- mobjtype_t tmpflickies[MAXFLICKIES];
- mapheaderinfo[num-1]->numFlickies = 0;
- tmp = strtok(word2,",");
- // get up to the first MAXFLICKIES flickies
- do {
- if (mapheaderinfo[num-1]->numFlickies == MAXFLICKIES) // never going to get above that number
- {
- deh_warning("Level header %d: too many flickies\n", num);
- break;
- }
-
- if (fastncmp(tmp, "MT_", 3)) // support for specified mobjtypes...
- {
- i = get_mobjtype(tmp);
- if (!i)
- {
- //deh_warning("Level header %d: unknown flicky mobj type %s\n", num, tmp); -- no need for this line as get_mobjtype complains too
- continue;
- }
- tmpflickies[mapheaderinfo[num-1]->numFlickies] = i;
- }
- else // ...or a quick, limited selection of default flickies!
- {
- for (i = 0; FLICKYTYPES[i].name; i++)
- if (fastcmp(tmp, FLICKYTYPES[i].name))
- break;
-
- if (!FLICKYTYPES[i].name)
- {
- deh_warning("Level header %d: unknown flicky selection %s\n", num, tmp);
- continue;
- }
- tmpflickies[mapheaderinfo[num-1]->numFlickies] = FLICKYTYPES[i].type;
- }
- mapheaderinfo[num-1]->numFlickies++;
- } while ((tmp = strtok(NULL,",")) != NULL);
-
- if (mapheaderinfo[num-1]->numFlickies)
- {
- size_t newsize = sizeof(mobjtype_t) * mapheaderinfo[num-1]->numFlickies;
- mapheaderinfo[num-1]->flickies = Z_Realloc(mapheaderinfo[num-1]->flickies, newsize, PU_STATIC, NULL);
- // now we add them to the list!
- M_Memcpy(mapheaderinfo[num-1]->flickies, tmpflickies, newsize);
- }
- else
- deh_warning("Level header %d: no valid flicky types found\n", num);
- }
- }
-
- // NiGHTS grades
- else if (fastncmp(word, "GRADES", 6))
- {
- UINT8 mare = (UINT8)atoi(word + 6);
-
- if (mare <= 0 || mare > 8)
- {
- deh_warning("Level header %d: unknown word '%s'", num, word);
- continue;
- }
-
- P_AddGradesForMare((INT16)(num-1), mare-1, word2);
- }
-
- // Strings that can be truncated
- else if (fastcmp(word, "SELECTHEADING"))
- {
- deh_strlcpy(mapheaderinfo[num-1]->selectheading, word2,
- sizeof(mapheaderinfo[num-1]->selectheading), va("Level header %d: selectheading", num));
- }
- else if (fastcmp(word, "SCRIPTNAME"))
- {
- deh_strlcpy(mapheaderinfo[num-1]->scriptname, word2,
- sizeof(mapheaderinfo[num-1]->scriptname), va("Level header %d: scriptname", num));
- }
- else if (fastcmp(word, "RUNSOC"))
- {
- deh_strlcpy(mapheaderinfo[num-1]->runsoc, word2,
- sizeof(mapheaderinfo[num-1]->runsoc), va("Level header %d: runsoc", num));
- }
- else if (fastcmp(word, "ACT"))
- {
- if (i >= 0 && i <= 99) // 0 for no act number
- mapheaderinfo[num-1]->actnum = (UINT8)i;
- else
- deh_warning("Level header %d: invalid act number %d", num, i);
- }
- else if (fastcmp(word, "NEXTLEVEL"))
- {
- if (fastcmp(word2, "TITLE")) i = 1100;
- else if (fastcmp(word2, "EVALUATION")) i = 1101;
- else if (fastcmp(word2, "CREDITS")) i = 1102;
- else if (fastcmp(word2, "ENDING")) i = 1103;
- else
- // Support using the actual map name,
- // i.e., Nextlevel = AB, Nextlevel = FZ, etc.
-
- // Convert to map number
- if (word2[0] >= 'A' && word2[0] <= 'Z' && word2[2] == '\0')
- i = M_MapNumber(word2[0], word2[1]);
-
- mapheaderinfo[num-1]->nextlevel = (INT16)i;
- }
- else if (fastcmp(word, "MARATHONNEXT"))
- {
- if (fastcmp(word2, "TITLE")) i = 1100;
- else if (fastcmp(word2, "EVALUATION")) i = 1101;
- else if (fastcmp(word2, "CREDITS")) i = 1102;
- else if (fastcmp(word2, "ENDING")) i = 1103;
- else
- // Support using the actual map name,
- // i.e., MarathonNext = AB, MarathonNext = FZ, etc.
-
- // Convert to map number
- if (word2[0] >= 'A' && word2[0] <= 'Z' && word2[2] == '\0')
- i = M_MapNumber(word2[0], word2[1]);
-
- mapheaderinfo[num-1]->marathonnext = (INT16)i;
- }
- else if (fastcmp(word, "TYPEOFLEVEL"))
- {
- if (i) // it's just a number
- mapheaderinfo[num-1]->typeoflevel = (UINT32)i;
- else
- {
- UINT32 tol = 0;
- tmp = strtok(word2,",");
- do {
- for (i = 0; TYPEOFLEVEL[i].name; i++)
- if (fastcmp(tmp, TYPEOFLEVEL[i].name))
- break;
- if (!TYPEOFLEVEL[i].name)
- deh_warning("Level header %d: unknown typeoflevel flag %s\n", num, tmp);
- tol |= TYPEOFLEVEL[i].flag;
- } while((tmp = strtok(NULL,",")) != NULL);
- mapheaderinfo[num-1]->typeoflevel = tol;
- }
- }
- else if (fastcmp(word, "KEYWORDS"))
- {
- deh_strlcpy(mapheaderinfo[num-1]->keywords, word2,
- sizeof(mapheaderinfo[num-1]->keywords), va("Level header %d: keywords", num));
- }
- else if (fastcmp(word, "MUSIC"))
- {
- if (fastcmp(word2, "NONE"))
- mapheaderinfo[num-1]->musname[0] = 0; // becomes empty string
- else
- {
- deh_strlcpy(mapheaderinfo[num-1]->musname, word2,
- sizeof(mapheaderinfo[num-1]->musname), va("Level header %d: music", num));
- }
- }
-#ifdef MUSICSLOT_COMPATIBILITY
- else if (fastcmp(word, "MUSICSLOT"))
- {
- i = get_mus(word2, true);
- if (i && i <= 1035)
- snprintf(mapheaderinfo[num-1]->musname, 7, "%sM", G_BuildMapName(i));
- else if (i && i <= 1050)
- strncpy(mapheaderinfo[num-1]->musname, compat_special_music_slots[i - 1036], 7);
- else
- mapheaderinfo[num-1]->musname[0] = 0; // becomes empty string
- mapheaderinfo[num-1]->musname[6] = 0;
- }
-#endif
- else if (fastcmp(word, "MUSICTRACK"))
- mapheaderinfo[num-1]->mustrack = ((UINT16)i - 1);
- else if (fastcmp(word, "MUSICPOS"))
- mapheaderinfo[num-1]->muspos = (UINT32)get_number(word2);
- else if (fastcmp(word, "MUSICINTERFADEOUT"))
- mapheaderinfo[num-1]->musinterfadeout = (UINT32)get_number(word2);
- else if (fastcmp(word, "MUSICINTER"))
- deh_strlcpy(mapheaderinfo[num-1]->musintername, word2,
- sizeof(mapheaderinfo[num-1]->musintername), va("Level header %d: intermission music", num));
- else if (fastcmp(word, "MUSICPOSTBOSS"))
- deh_strlcpy(mapheaderinfo[num-1]->muspostbossname, word2,
- sizeof(mapheaderinfo[num-1]->muspostbossname), va("Level header %d: post-boss music", num));
- else if (fastcmp(word, "MUSICPOSTBOSSTRACK"))
- mapheaderinfo[num-1]->muspostbosstrack = ((UINT16)i - 1);
- else if (fastcmp(word, "MUSICPOSTBOSSPOS"))
- mapheaderinfo[num-1]->muspostbosspos = (UINT32)get_number(word2);
- else if (fastcmp(word, "MUSICPOSTBOSSFADEIN"))
- mapheaderinfo[num-1]->muspostbossfadein = (UINT32)get_number(word2);
- else if (fastcmp(word, "FORCERESETMUSIC"))
- {
- // This is a weird one because "FALSE"/"NO" could either apply to "leave to default preference" (cv_resetmusic)
- // or "force off". Let's assume it means "force off", and let an unspecified value mean "default preference"
- if (fastcmp(word2, "OFF") || word2[0] == 'F' || word2[0] == 'N') i = 0;
- else if (fastcmp(word2, "ON") || word2[0] == 'T' || word2[0] == 'Y') i = 1;
- else i = -1; // (fastcmp(word2, "DEFAULT"))
-
- if (i >= -1 && i <= 1) // -1 to force off, 1 to force on, 0 to honor default.
- // This behavior can be disabled with cv_resetmusicbyheader
- mapheaderinfo[num-1]->musforcereset = (SINT8)i;
- else
- deh_warning("Level header %d: invalid forceresetmusic option %d", num, i);
- }
- else if (fastcmp(word, "FORCECHARACTER"))
- {
- strlcpy(mapheaderinfo[num-1]->forcecharacter, word2, SKINNAMESIZE+1);
- strlwr(mapheaderinfo[num-1]->forcecharacter); // skin names are lowercase
- }
- else if (fastcmp(word, "WEATHER"))
- mapheaderinfo[num-1]->weather = (UINT8)get_number(word2);
- else if (fastcmp(word, "SKYNUM"))
- mapheaderinfo[num-1]->skynum = (INT16)i;
- else if (fastcmp(word, "INTERSCREEN"))
- strncpy(mapheaderinfo[num-1]->interscreen, word2, 8);
- else if (fastcmp(word, "PRECUTSCENENUM"))
- mapheaderinfo[num-1]->precutscenenum = (UINT8)i;
- else if (fastcmp(word, "CUTSCENENUM"))
- mapheaderinfo[num-1]->cutscenenum = (UINT8)i;
- else if (fastcmp(word, "COUNTDOWN"))
- mapheaderinfo[num-1]->countdown = (INT16)i;
- else if (fastcmp(word, "PALETTE"))
- mapheaderinfo[num-1]->palette = (UINT16)i;
- else if (fastcmp(word, "NUMLAPS"))
- mapheaderinfo[num-1]->numlaps = (UINT8)i;
- else if (fastcmp(word, "UNLOCKABLE"))
- {
- if (i >= 0 && i <= MAXUNLOCKABLES) // 0 for no unlock required, anything else requires something
- mapheaderinfo[num-1]->unlockrequired = (SINT8)i - 1;
- else
- deh_warning("Level header %d: invalid unlockable number %d", num, i);
- }
- else if (fastcmp(word, "LEVELSELECT"))
- mapheaderinfo[num-1]->levelselect = (UINT8)i;
- else if (fastcmp(word, "SKYBOXSCALE"))
- mapheaderinfo[num-1]->skybox_scalex = mapheaderinfo[num-1]->skybox_scaley = mapheaderinfo[num-1]->skybox_scalez = (INT16)i;
- else if (fastcmp(word, "SKYBOXSCALEX"))
- mapheaderinfo[num-1]->skybox_scalex = (INT16)i;
- else if (fastcmp(word, "SKYBOXSCALEY"))
- mapheaderinfo[num-1]->skybox_scaley = (INT16)i;
- else if (fastcmp(word, "SKYBOXSCALEZ"))
- mapheaderinfo[num-1]->skybox_scalez = (INT16)i;
-
- else if (fastcmp(word, "BONUSTYPE"))
- {
- if (fastcmp(word2, "NONE")) i = -1;
- else if (fastcmp(word2, "NORMAL")) i = 0;
- else if (fastcmp(word2, "BOSS")) i = 1;
- else if (fastcmp(word2, "ERZ3")) i = 2;
- else if (fastcmp(word2, "NIGHTS")) i = 3;
- else if (fastcmp(word2, "NIGHTSLINK")) i = 4;
-
- if (i >= -1 && i <= 4) // -1 for no bonus. Max is 4.
- mapheaderinfo[num-1]->bonustype = (SINT8)i;
- else
- deh_warning("Level header %d: invalid bonus type number %d", num, i);
- }
-
- // Title card
- else if (fastcmp(word, "TITLECARDZIGZAG"))
- {
- deh_strlcpy(mapheaderinfo[num-1]->ltzzpatch, word2,
- sizeof(mapheaderinfo[num-1]->ltzzpatch), va("Level header %d: title card zigzag patch name", num));
- }
- else if (fastcmp(word, "TITLECARDZIGZAGTEXT"))
- {
- deh_strlcpy(mapheaderinfo[num-1]->ltzztext, word2,
- sizeof(mapheaderinfo[num-1]->ltzztext), va("Level header %d: title card zigzag text patch name", num));
- }
- else if (fastcmp(word, "TITLECARDACTDIAMOND"))
- {
- deh_strlcpy(mapheaderinfo[num-1]->ltactdiamond, word2,
- sizeof(mapheaderinfo[num-1]->ltactdiamond), va("Level header %d: title card act diamond patch name", num));
- }
-
- else if (fastcmp(word, "MAXBONUSLIVES"))
- mapheaderinfo[num-1]->maxbonuslives = (SINT8)i;
- else if (fastcmp(word, "LEVELFLAGS"))
- mapheaderinfo[num-1]->levelflags = (UINT16)i;
- else if (fastcmp(word, "MENUFLAGS"))
- mapheaderinfo[num-1]->menuflags = (UINT8)i;
-
- // Individual triggers for level flags, for ease of use (and 2.0 compatibility)
- else if (fastcmp(word, "SCRIPTISFILE"))
- {
- if (i || word2[0] == 'T' || word2[0] == 'Y')
- mapheaderinfo[num-1]->levelflags |= LF_SCRIPTISFILE;
- else
- mapheaderinfo[num-1]->levelflags &= ~LF_SCRIPTISFILE;
- }
- else if (fastcmp(word, "SPEEDMUSIC"))
- {
- if (i || word2[0] == 'T' || word2[0] == 'Y')
- mapheaderinfo[num-1]->levelflags |= LF_SPEEDMUSIC;
- else
- mapheaderinfo[num-1]->levelflags &= ~LF_SPEEDMUSIC;
- }
- else if (fastcmp(word, "NOSSMUSIC"))
- {
- if (i || word2[0] == 'T' || word2[0] == 'Y')
- mapheaderinfo[num-1]->levelflags |= LF_NOSSMUSIC;
- else
- mapheaderinfo[num-1]->levelflags &= ~LF_NOSSMUSIC;
- }
- else if (fastcmp(word, "NORELOAD"))
- {
- if (i || word2[0] == 'T' || word2[0] == 'Y')
- mapheaderinfo[num-1]->levelflags |= LF_NORELOAD;
- else
- mapheaderinfo[num-1]->levelflags &= ~LF_NORELOAD;
- }
- else if (fastcmp(word, "NOZONE"))
- {
- if (i || word2[0] == 'T' || word2[0] == 'Y')
- mapheaderinfo[num-1]->levelflags |= LF_NOZONE;
- else
- mapheaderinfo[num-1]->levelflags &= ~LF_NOZONE;
- }
- else if (fastcmp(word, "SAVEGAME"))
- {
- if (i || word2[0] == 'T' || word2[0] == 'Y')
- mapheaderinfo[num-1]->levelflags |= LF_SAVEGAME;
- else
- mapheaderinfo[num-1]->levelflags &= ~LF_SAVEGAME;
- }
- else if (fastcmp(word, "MIXNIGHTSCOUNTDOWN"))
- {
- if (i || word2[0] == 'T' || word2[0] == 'Y')
- mapheaderinfo[num-1]->levelflags |= LF_MIXNIGHTSCOUNTDOWN;
- else
- mapheaderinfo[num-1]->levelflags &= ~LF_MIXNIGHTSCOUNTDOWN;
- }
- else if (fastcmp(word, "WARNINGTITLE"))
- {
- if (i || word2[0] == 'T' || word2[0] == 'Y')
- mapheaderinfo[num-1]->levelflags |= LF_WARNINGTITLE;
- else
- mapheaderinfo[num-1]->levelflags &= ~LF_WARNINGTITLE;
- }
- else if (fastcmp(word, "NOTITLECARD"))
- {
- if (i || word2[0] == 'T' || word2[0] == 'Y')
- mapheaderinfo[num-1]->levelflags |= LF_NOTITLECARD;
- else
- mapheaderinfo[num-1]->levelflags &= ~LF_NOTITLECARD;
- }
- else if (fastcmp(word, "SHOWTITLECARDFOR"))
- {
- mapheaderinfo[num-1]->levelflags |= LF_NOTITLECARD;
- tmp = strtok(word2,",");
- do {
- if (fastcmp(tmp, "FIRST"))
- mapheaderinfo[num-1]->levelflags &= ~LF_NOTITLECARDFIRST;
- else if (fastcmp(tmp, "RESPAWN"))
- mapheaderinfo[num-1]->levelflags &= ~LF_NOTITLECARDRESPAWN;
- else if (fastcmp(tmp, "RECORDATTACK"))
- mapheaderinfo[num-1]->levelflags &= ~LF_NOTITLECARDRECORDATTACK;
- else if (fastcmp(tmp, "ALL"))
- mapheaderinfo[num-1]->levelflags &= ~LF_NOTITLECARD;
- else if (!fastcmp(tmp, "NONE"))
- deh_warning("Level header %d: unknown titlecard show option %s\n", num, tmp);
-
- } while((tmp = strtok(NULL,",")) != NULL);
- }
-
- // Individual triggers for menu flags
- else if (fastcmp(word, "HIDDEN"))
- {
- if (i || word2[0] == 'T' || word2[0] == 'Y')
- mapheaderinfo[num-1]->menuflags |= LF2_HIDEINMENU;
- else
- mapheaderinfo[num-1]->menuflags &= ~LF2_HIDEINMENU;
- }
- else if (fastcmp(word, "HIDEINSTATS"))
- {
- if (i || word2[0] == 'T' || word2[0] == 'Y')
- mapheaderinfo[num-1]->menuflags |= LF2_HIDEINSTATS;
- else
- mapheaderinfo[num-1]->menuflags &= ~LF2_HIDEINSTATS;
- }
- else if (fastcmp(word, "RECORDATTACK") || fastcmp(word, "TIMEATTACK"))
- { // TIMEATTACK is an accepted alias
- if (i || word2[0] == 'T' || word2[0] == 'Y')
- mapheaderinfo[num-1]->menuflags |= LF2_RECORDATTACK;
- else
- mapheaderinfo[num-1]->menuflags &= ~LF2_RECORDATTACK;
- }
- else if (fastcmp(word, "NIGHTSATTACK"))
- {
- if (i || word2[0] == 'T' || word2[0] == 'Y')
- mapheaderinfo[num-1]->menuflags |= LF2_NIGHTSATTACK;
- else
- mapheaderinfo[num-1]->menuflags &= LF2_NIGHTSATTACK;
- }
- else if (fastcmp(word, "NOVISITNEEDED"))
- {
- if (i || word2[0] == 'T' || word2[0] == 'Y')
- mapheaderinfo[num-1]->menuflags |= LF2_NOVISITNEEDED;
- else
- mapheaderinfo[num-1]->menuflags &= ~LF2_NOVISITNEEDED;
- }
- else if (fastcmp(word, "WIDEICON"))
- {
- if (i || word2[0] == 'T' || word2[0] == 'Y')
- mapheaderinfo[num-1]->menuflags |= LF2_WIDEICON;
- else
- mapheaderinfo[num-1]->menuflags &= ~LF2_WIDEICON;
- }
- else if (fastcmp(word, "STARTRINGS"))
- mapheaderinfo[num-1]->startrings = (UINT16)i;
- else if (fastcmp(word, "SPECIALSTAGETIME"))
- mapheaderinfo[num-1]->sstimer = i;
- else if (fastcmp(word, "SPECIALSTAGESPHERES"))
- mapheaderinfo[num-1]->ssspheres = i;
- else if (fastcmp(word, "GRAVITY"))
- mapheaderinfo[num-1]->gravity = FLOAT_TO_FIXED(atof(word2));
- else
- deh_warning("Level header %d: unknown word '%s'", num, word);
- }
- } while (!myfeof(f)); // finish when the line is empty
-
- Z_Free(s);
-}
-
-#undef MAXFLICKIES
-
-static void readcutscenescene(MYFILE *f, INT32 num, INT32 scenenum)
-{
- char *s = Z_Calloc(MAXLINELEN, PU_STATIC, NULL);
- char *word;
- char *word2;
- INT32 i;
- UINT16 usi;
- UINT8 picid;
-
- do
- {
- if (myfgets(s, MAXLINELEN, f))
- {
- if (s[0] == '\n')
- break;
-
- word = strtok(s, " ");
- if (word)
- strupr(word);
- else
- break;
-
- if (fastcmp(word, "SCENETEXT"))
- {
- char *scenetext = NULL;
- char *buffer;
- const int bufferlen = 4096;
-
- for (i = 0; i < MAXLINELEN; i++)
- {
- if (s[i] == '=')
- {
- scenetext = &s[i+2];
- break;
- }
- }
-
- if (!scenetext)
- {
- Z_Free(cutscenes[num]->scene[scenenum].text);
- cutscenes[num]->scene[scenenum].text = NULL;
- continue;
- }
-
- for (i = 0; i < MAXLINELEN; i++)
- {
- if (s[i] == '\0')
- {
- s[i] = '\n';
- s[i+1] = '\0';
- break;
- }
- }
-
- buffer = Z_Malloc(4096, PU_STATIC, NULL);
- strcpy(buffer, scenetext);
-
- strcat(buffer,
- myhashfgets(scenetext, bufferlen
- - strlen(buffer) - 1, f));
-
- // A cutscene overwriting another one...
- Z_Free(cutscenes[num]->scene[scenenum].text);
-
- cutscenes[num]->scene[scenenum].text = Z_StrDup(buffer);
-
- Z_Free(buffer);
-
- continue;
- }
-
- word2 = strtok(NULL, " = ");
- if (word2)
- strupr(word2);
- else
- break;
-
- if (word2[strlen(word2)-1] == '\n')
- word2[strlen(word2)-1] = '\0';
- i = atoi(word2);
- usi = (UINT16)i;
-
-
- if (fastcmp(word, "NUMBEROFPICS"))
- {
- cutscenes[num]->scene[scenenum].numpics = (UINT8)i;
- }
- else if (fastncmp(word, "PIC", 3))
- {
- picid = (UINT8)atoi(word + 3);
- if (picid > 8 || picid == 0)
- {
- deh_warning("CutSceneScene %d: unknown word '%s'", num, word);
- continue;
- }
- --picid;
-
- if (fastcmp(word+4, "NAME"))
- {
- strncpy(cutscenes[num]->scene[scenenum].picname[picid], word2, 8);
- }
- else if (fastcmp(word+4, "HIRES"))
- {
- cutscenes[num]->scene[scenenum].pichires[picid] = (UINT8)(i || word2[0] == 'T' || word2[0] == 'Y');
- }
- else if (fastcmp(word+4, "DURATION"))
- {
- cutscenes[num]->scene[scenenum].picduration[picid] = usi;
- }
- else if (fastcmp(word+4, "XCOORD"))
- {
- cutscenes[num]->scene[scenenum].xcoord[picid] = usi;
- }
- else if (fastcmp(word+4, "YCOORD"))
- {
- cutscenes[num]->scene[scenenum].ycoord[picid] = usi;
- }
- else
- deh_warning("CutSceneScene %d: unknown word '%s'", num, word);
- }
- else if (fastcmp(word, "MUSIC"))
- {
- strncpy(cutscenes[num]->scene[scenenum].musswitch, word2, 7);
- cutscenes[num]->scene[scenenum].musswitch[6] = 0;
- }
-#ifdef MUSICSLOT_COMPATIBILITY
- else if (fastcmp(word, "MUSICSLOT"))
- {
- i = get_mus(word2, true);
- if (i && i <= 1035)
- snprintf(cutscenes[num]->scene[scenenum].musswitch, 7, "%sM", G_BuildMapName(i));
- else if (i && i <= 1050)
- strncpy(cutscenes[num]->scene[scenenum].musswitch, compat_special_music_slots[i - 1036], 7);
- else
- cutscenes[num]->scene[scenenum].musswitch[0] = 0; // becomes empty string
- cutscenes[num]->scene[scenenum].musswitch[6] = 0;
- }
-#endif
- else if (fastcmp(word, "MUSICTRACK"))
- {
- cutscenes[num]->scene[scenenum].musswitchflags = ((UINT16)i) & MUSIC_TRACKMASK;
- }
- else if (fastcmp(word, "MUSICPOS"))
- {
- cutscenes[num]->scene[scenenum].musswitchposition = (UINT32)get_number(word2);
- }
- else if (fastcmp(word, "MUSICLOOP"))
- {
- cutscenes[num]->scene[scenenum].musicloop = (UINT8)(i || word2[0] == 'T' || word2[0] == 'Y');
- }
- else if (fastcmp(word, "TEXTXPOS"))
- {
- cutscenes[num]->scene[scenenum].textxpos = usi;
- }
- else if (fastcmp(word, "TEXTYPOS"))
- {
- cutscenes[num]->scene[scenenum].textypos = usi;
- }
- else if (fastcmp(word, "FADEINID"))
- {
- cutscenes[num]->scene[scenenum].fadeinid = (UINT8)i;
- }
- else if (fastcmp(word, "FADEOUTID"))
- {
- cutscenes[num]->scene[scenenum].fadeoutid = (UINT8)i;
- }
- else if (fastcmp(word, "FADECOLOR"))
- {
- cutscenes[num]->scene[scenenum].fadecolor = (UINT8)i;
- }
- else
- deh_warning("CutSceneScene %d: unknown word '%s'", num, word);
- }
- } while (!myfeof(f)); // finish when the line is empty
-
- Z_Free(s);
-}
-
-static void readcutscene(MYFILE *f, INT32 num)
-{
- char *s = Z_Malloc(MAXLINELEN, PU_STATIC, NULL);
- char *word;
- char *word2;
- char *tmp;
- INT32 value;
-
- // Allocate memory for this cutscene if we don't yet have any
- if (!cutscenes[num])
- cutscenes[num] = Z_Calloc(sizeof (cutscene_t), PU_STATIC, NULL);
-
- do
- {
- if (myfgets(s, MAXLINELEN, f))
- {
- if (s[0] == '\n')
- break;
-
- tmp = strchr(s, '#');
- if (tmp)
- *tmp = '\0';
- if (s == tmp)
- continue; // Skip comment lines, but don't break.
-
- word = strtok(s, " ");
- if (word)
- strupr(word);
- else
- break;
-
- word2 = strtok(NULL, " ");
- if (word2)
- value = atoi(word2);
- else
- {
- deh_warning("No value for token %s", word);
- continue;
- }
-
- if (fastcmp(word, "NUMSCENES"))
- {
- cutscenes[num]->numscenes = value;
- }
- else if (fastcmp(word, "SCENE"))
- {
- if (1 <= value && value <= 128)
- {
- readcutscenescene(f, num, value - 1);
- }
- else
- deh_warning("Scene number %d out of range (1 - 128)", value);
-
- }
- else
- deh_warning("Cutscene %d: unknown word '%s', Scene <num> expected.", num, word);
- }
- } while (!myfeof(f)); // finish when the line is empty
-
- Z_Free(s);
-}
-
-static void readtextpromptpage(MYFILE *f, INT32 num, INT32 pagenum)
-{
- char *s = Z_Calloc(MAXLINELEN, PU_STATIC, NULL);
- char *word;
- char *word2;
- INT32 i;
- UINT16 usi;
- UINT8 picid;
-
- do
- {
- if (myfgets(s, MAXLINELEN, f))
- {
- if (s[0] == '\n')
- break;
-
- word = strtok(s, " ");
- if (word)
- strupr(word);
- else
- break;
-
- if (fastcmp(word, "PAGETEXT"))
- {
- char *pagetext = NULL;
- char *buffer;
- const int bufferlen = 4096;
-
- for (i = 0; i < MAXLINELEN; i++)
- {
- if (s[i] == '=')
- {
- pagetext = &s[i+2];
- break;
- }
- }
-
- if (!pagetext)
- {
- Z_Free(textprompts[num]->page[pagenum].text);
- textprompts[num]->page[pagenum].text = NULL;
- continue;
- }
-
- for (i = 0; i < MAXLINELEN; i++)
- {
- if (s[i] == '\0')
- {
- s[i] = '\n';
- s[i+1] = '\0';
- break;
- }
- }
-
- buffer = Z_Malloc(4096, PU_STATIC, NULL);
- strcpy(buffer, pagetext);
-
- // \todo trim trailing whitespace before the #
- // and also support # at the end of a PAGETEXT with no line break
-
- strcat(buffer,
- myhashfgets(pagetext, bufferlen
- - strlen(buffer) - 1, f));
-
- // A text prompt overwriting another one...
- Z_Free(textprompts[num]->page[pagenum].text);
-
- textprompts[num]->page[pagenum].text = Z_StrDup(buffer);
-
- Z_Free(buffer);
-
- continue;
- }
-
- word2 = strtok(NULL, " = ");
- if (word2)
- strupr(word2);
- else
- break;
-
- if (word2[strlen(word2)-1] == '\n')
- word2[strlen(word2)-1] = '\0';
- i = atoi(word2);
- usi = (UINT16)i;
-
- // copypasta from readcutscenescene
- if (fastcmp(word, "NUMBEROFPICS"))
- {
- textprompts[num]->page[pagenum].numpics = (UINT8)i;
- }
- else if (fastcmp(word, "PICMODE"))
- {
- UINT8 picmode = 0; // PROMPT_PIC_PERSIST
- if (usi == 1 || word2[0] == 'L') picmode = PROMPT_PIC_LOOP;
- else if (usi == 2 || word2[0] == 'D' || word2[0] == 'H') picmode = PROMPT_PIC_DESTROY;
- textprompts[num]->page[pagenum].picmode = picmode;
- }
- else if (fastcmp(word, "PICTOLOOP"))
- textprompts[num]->page[pagenum].pictoloop = (UINT8)i;
- else if (fastcmp(word, "PICTOSTART"))
- textprompts[num]->page[pagenum].pictostart = (UINT8)i;
- else if (fastcmp(word, "PICSMETAPAGE"))
- {
- if (usi && usi <= textprompts[num]->numpages)
- {
- UINT8 metapagenum = usi - 1;
-
- textprompts[num]->page[pagenum].numpics = textprompts[num]->page[metapagenum].numpics;
- textprompts[num]->page[pagenum].picmode = textprompts[num]->page[metapagenum].picmode;
- textprompts[num]->page[pagenum].pictoloop = textprompts[num]->page[metapagenum].pictoloop;
- textprompts[num]->page[pagenum].pictostart = textprompts[num]->page[metapagenum].pictostart;
-
- for (picid = 0; picid < MAX_PROMPT_PICS; picid++)
- {
- strncpy(textprompts[num]->page[pagenum].picname[picid], textprompts[num]->page[metapagenum].picname[picid], 8);
- textprompts[num]->page[pagenum].pichires[picid] = textprompts[num]->page[metapagenum].pichires[picid];
- textprompts[num]->page[pagenum].picduration[picid] = textprompts[num]->page[metapagenum].picduration[picid];
- textprompts[num]->page[pagenum].xcoord[picid] = textprompts[num]->page[metapagenum].xcoord[picid];
- textprompts[num]->page[pagenum].ycoord[picid] = textprompts[num]->page[metapagenum].ycoord[picid];
- }
- }
- }
- else if (fastncmp(word, "PIC", 3))
- {
- picid = (UINT8)atoi(word + 3);
- if (picid > MAX_PROMPT_PICS || picid == 0)
- {
- deh_warning("textpromptscene %d: unknown word '%s'", num, word);
- continue;
- }
- --picid;
-
- if (fastcmp(word+4, "NAME"))
- {
- strncpy(textprompts[num]->page[pagenum].picname[picid], word2, 8);
- }
- else if (fastcmp(word+4, "HIRES"))
- {
- textprompts[num]->page[pagenum].pichires[picid] = (UINT8)(i || word2[0] == 'T' || word2[0] == 'Y');
- }
- else if (fastcmp(word+4, "DURATION"))
- {
- textprompts[num]->page[pagenum].picduration[picid] = usi;
- }
- else if (fastcmp(word+4, "XCOORD"))
- {
- textprompts[num]->page[pagenum].xcoord[picid] = usi;
- }
- else if (fastcmp(word+4, "YCOORD"))
- {
- textprompts[num]->page[pagenum].ycoord[picid] = usi;
- }
- else
- deh_warning("textpromptscene %d: unknown word '%s'", num, word);
- }
- else if (fastcmp(word, "MUSIC"))
- {
- strncpy(textprompts[num]->page[pagenum].musswitch, word2, 7);
- textprompts[num]->page[pagenum].musswitch[6] = 0;
- }
-#ifdef MUSICSLOT_COMPATIBILITY
- else if (fastcmp(word, "MUSICSLOT"))
- {
- i = get_mus(word2, true);
- if (i && i <= 1035)
- snprintf(textprompts[num]->page[pagenum].musswitch, 7, "%sM", G_BuildMapName(i));
- else if (i && i <= 1050)
- strncpy(textprompts[num]->page[pagenum].musswitch, compat_special_music_slots[i - 1036], 7);
- else
- textprompts[num]->page[pagenum].musswitch[0] = 0; // becomes empty string
- textprompts[num]->page[pagenum].musswitch[6] = 0;
- }
-#endif
- else if (fastcmp(word, "MUSICTRACK"))
- {
- textprompts[num]->page[pagenum].musswitchflags = ((UINT16)i) & MUSIC_TRACKMASK;
- }
- else if (fastcmp(word, "MUSICLOOP"))
- {
- textprompts[num]->page[pagenum].musicloop = (UINT8)(i || word2[0] == 'T' || word2[0] == 'Y');
- }
- // end copypasta from readcutscenescene
- else if (fastcmp(word, "NAME"))
- {
- if (*word2 != '\0')
- {
- INT32 j;
-
- // HACK: Add yellow control char now
- // so the drawing function doesn't call it repeatedly
- char name[34];
- name[0] = '\x82'; // color yellow
- name[1] = 0;
- strncat(name, word2, 33);
- name[33] = 0;
-
- // Replace _ with ' '
- for (j = 0; j < 32 && name[j]; j++)
- {
- if (name[j] == '_')
- name[j] = ' ';
- }
-
- strncpy(textprompts[num]->page[pagenum].name, name, 32);
- }
- else
- *textprompts[num]->page[pagenum].name = '\0';
- }
- else if (fastcmp(word, "ICON"))
- strncpy(textprompts[num]->page[pagenum].iconname, word2, 8);
- else if (fastcmp(word, "ICONALIGN"))
- textprompts[num]->page[pagenum].rightside = (i || word2[0] == 'R');
- else if (fastcmp(word, "ICONFLIP"))
- textprompts[num]->page[pagenum].iconflip = (i || word2[0] == 'T' || word2[0] == 'Y');
- else if (fastcmp(word, "LINES"))
- textprompts[num]->page[pagenum].lines = usi;
- else if (fastcmp(word, "BACKCOLOR"))
- {
- INT32 backcolor;
- if (i == 0 || fastcmp(word2, "WHITE")) backcolor = 0;
- else if (i == 1 || fastcmp(word2, "GRAY") || fastcmp(word2, "GREY") ||
- fastcmp(word2, "BLACK")) backcolor = 1;
- else if (i == 2 || fastcmp(word2, "SEPIA")) backcolor = 2;
- else if (i == 3 || fastcmp(word2, "BROWN")) backcolor = 3;
- else if (i == 4 || fastcmp(word2, "PINK")) backcolor = 4;
- else if (i == 5 || fastcmp(word2, "RASPBERRY")) backcolor = 5;
- else if (i == 6 || fastcmp(word2, "RED")) backcolor = 6;
- else if (i == 7 || fastcmp(word2, "CREAMSICLE")) backcolor = 7;
- else if (i == 8 || fastcmp(word2, "ORANGE")) backcolor = 8;
- else if (i == 9 || fastcmp(word2, "GOLD")) backcolor = 9;
- else if (i == 10 || fastcmp(word2, "YELLOW")) backcolor = 10;
- else if (i == 11 || fastcmp(word2, "EMERALD")) backcolor = 11;
- else if (i == 12 || fastcmp(word2, "GREEN")) backcolor = 12;
- else if (i == 13 || fastcmp(word2, "CYAN") || fastcmp(word2, "AQUA")) backcolor = 13;
- else if (i == 14 || fastcmp(word2, "STEEL")) backcolor = 14;
- else if (i == 15 || fastcmp(word2, "PERIWINKLE")) backcolor = 15;
- else if (i == 16 || fastcmp(word2, "BLUE")) backcolor = 16;
- else if (i == 17 || fastcmp(word2, "PURPLE")) backcolor = 17;
- else if (i == 18 || fastcmp(word2, "LAVENDER")) backcolor = 18;
- else if (i >= 256 && i < 512) backcolor = i; // non-transparent palette index
- else if (i < 0) backcolor = INT32_MAX; // CONS_BACKCOLOR user-configured
- else backcolor = 1; // default gray
- textprompts[num]->page[pagenum].backcolor = backcolor;
- }
- else if (fastcmp(word, "ALIGN"))
- {
- UINT8 align = 0; // left
- if (usi == 1 || word2[0] == 'R') align = 1;
- else if (usi == 2 || word2[0] == 'C' || word2[0] == 'M') align = 2;
- textprompts[num]->page[pagenum].align = align;
- }
- else if (fastcmp(word, "VERTICALALIGN"))
- {
- UINT8 align = 0; // top
- if (usi == 1 || word2[0] == 'B') align = 1;
- else if (usi == 2 || word2[0] == 'C' || word2[0] == 'M') align = 2;
- textprompts[num]->page[pagenum].verticalalign = align;
- }
- else if (fastcmp(word, "TEXTSPEED"))
- textprompts[num]->page[pagenum].textspeed = get_number(word2);
- else if (fastcmp(word, "TEXTSFX"))
- textprompts[num]->page[pagenum].textsfx = get_number(word2);
- else if (fastcmp(word, "HIDEHUD"))
- {
- UINT8 hidehud = 0;
- if ((word2[0] == 'F' && (word2[1] == 'A' || !word2[1])) || word2[0] == 'N') hidehud = 0; // false
- else if (usi == 1 || word2[0] == 'T' || word2[0] == 'Y') hidehud = 1; // true (hide appropriate HUD elements)
- else if (usi == 2 || word2[0] == 'A' || (word2[0] == 'F' && word2[1] == 'O')) hidehud = 2; // force (hide all HUD elements)
- textprompts[num]->page[pagenum].hidehud = hidehud;
- }
- else if (fastcmp(word, "METAPAGE"))
- {
- if (usi && usi <= textprompts[num]->numpages)
- {
- UINT8 metapagenum = usi - 1;
-
- strncpy(textprompts[num]->page[pagenum].name, textprompts[num]->page[metapagenum].name, 32);
- strncpy(textprompts[num]->page[pagenum].iconname, textprompts[num]->page[metapagenum].iconname, 8);
- textprompts[num]->page[pagenum].rightside = textprompts[num]->page[metapagenum].rightside;
- textprompts[num]->page[pagenum].iconflip = textprompts[num]->page[metapagenum].iconflip;
- textprompts[num]->page[pagenum].lines = textprompts[num]->page[metapagenum].lines;
- textprompts[num]->page[pagenum].backcolor = textprompts[num]->page[metapagenum].backcolor;
- textprompts[num]->page[pagenum].align = textprompts[num]->page[metapagenum].align;
- textprompts[num]->page[pagenum].verticalalign = textprompts[num]->page[metapagenum].verticalalign;
- textprompts[num]->page[pagenum].textspeed = textprompts[num]->page[metapagenum].textspeed;
- textprompts[num]->page[pagenum].textsfx = textprompts[num]->page[metapagenum].textsfx;
- textprompts[num]->page[pagenum].hidehud = textprompts[num]->page[metapagenum].hidehud;
-
- // music: don't copy, else each page change may reset the music
- }
- }
- else if (fastcmp(word, "TAG"))
- strncpy(textprompts[num]->page[pagenum].tag, word2, 33);
- else if (fastcmp(word, "NEXTPROMPT"))
- textprompts[num]->page[pagenum].nextprompt = usi;
- else if (fastcmp(word, "NEXTPAGE"))
- textprompts[num]->page[pagenum].nextpage = usi;
- else if (fastcmp(word, "NEXTTAG"))
- strncpy(textprompts[num]->page[pagenum].nexttag, word2, 33);
- else if (fastcmp(word, "TIMETONEXT"))
- textprompts[num]->page[pagenum].timetonext = get_number(word2);
- else
- deh_warning("PromptPage %d: unknown word '%s'", num, word);
- }
- } while (!myfeof(f)); // finish when the line is empty
-
- Z_Free(s);
-}
-
-static void readtextprompt(MYFILE *f, INT32 num)
-{
- char *s = Z_Malloc(MAXLINELEN, PU_STATIC, NULL);
- char *word;
- char *word2;
- char *tmp;
- INT32 value;
-
- // Allocate memory for this prompt if we don't yet have any
- if (!textprompts[num])
- textprompts[num] = Z_Calloc(sizeof (textprompt_t), PU_STATIC, NULL);
-
- do
- {
- if (myfgets(s, MAXLINELEN, f))
- {
- if (s[0] == '\n')
- break;
-
- tmp = strchr(s, '#');
- if (tmp)
- *tmp = '\0';
- if (s == tmp)
- continue; // Skip comment lines, but don't break.
-
- word = strtok(s, " ");
- if (word)
- strupr(word);
- else
- break;
-
- word2 = strtok(NULL, " ");
- if (word2)
- value = atoi(word2);
- else
- {
- deh_warning("No value for token %s", word);
- continue;
- }
-
- if (fastcmp(word, "NUMPAGES"))
- {
- textprompts[num]->numpages = min(max(value, 0), MAX_PAGES);
- }
- else if (fastcmp(word, "PAGE"))
- {
- if (1 <= value && value <= MAX_PAGES)
- {
- textprompts[num]->page[value - 1].backcolor = 1; // default to gray
- textprompts[num]->page[value - 1].hidehud = 1; // hide appropriate HUD elements
- readtextpromptpage(f, num, value - 1);
- }
- else
- deh_warning("Page number %d out of range (1 - %d)", value, MAX_PAGES);
-
- }
- else
- deh_warning("Prompt %d: unknown word '%s', Page <num> expected.", num, word);
- }
- } while (!myfeof(f)); // finish when the line is empty
-
- Z_Free(s);
-}
-
-static void readmenu(MYFILE *f, INT32 num)
-{
- char *s = Z_Malloc(MAXLINELEN, PU_STATIC, NULL);
- char *word = s;
- char *word2;
- char *tmp;
- INT32 value;
-
- do
- {
- if (myfgets(s, MAXLINELEN, f))
- {
- if (s[0] == '\n')
- break;
-
- // First remove trailing newline, if there is one
- tmp = strchr(s, '\n');
- if (tmp)
- *tmp = '\0';
-
- tmp = strchr(s, '#');
- if (tmp)
- *tmp = '\0';
- if (s == tmp)
- continue; // Skip comment lines, but don't break.
-
- // Get the part before the " = "
- tmp = strchr(s, '=');
- if (tmp)
- *(tmp-1) = '\0';
- else
- break;
- strupr(word);
-
- // Now get the part after
- word2 = (tmp += 2);
- strupr(word2);
-
- value = atoi(word2); // used for numerical settings
-
- if (fastcmp(word, "BACKGROUNDNAME"))
- {
- strncpy(menupres[num].bgname, word2, 8);
- titlechanged = true;
- }
- else if (fastcmp(word, "HIDEBACKGROUND"))
- {
- menupres[num].bghide = (boolean)(value || word2[0] == 'T' || word2[0] == 'Y');
- titlechanged = true;
- }
- else if (fastcmp(word, "BACKGROUNDCOLOR"))
- {
- menupres[num].bgcolor = get_number(word2);
- titlechanged = true;
- }
- else if (fastcmp(word, "HIDETITLEPICS") || fastcmp(word, "HIDEPICS") || fastcmp(word, "TITLEPICSHIDE"))
- {
- // true by default, except MM_MAIN
- menupres[num].hidetitlepics = (boolean)(value || word2[0] == 'T' || word2[0] == 'Y');
- titlechanged = true;
- }
- else if (fastcmp(word, "TITLEPICSMODE"))
- {
- if (fastcmp(word2, "USER"))
- menupres[num].ttmode = TTMODE_USER;
- else if (fastcmp(word2, "ALACROIX"))
- menupres[num].ttmode = TTMODE_ALACROIX;
- else if (fastcmp(word2, "HIDE") || fastcmp(word2, "HIDDEN") || fastcmp(word2, "NONE"))
- {
- menupres[num].ttmode = TTMODE_USER;
- menupres[num].ttname[0] = 0;
- menupres[num].hidetitlepics = true;
- }
- else // if (fastcmp(word2, "OLD") || fastcmp(word2, "SSNTAILS"))
- menupres[num].ttmode = TTMODE_OLD;
- titlechanged = true;
- }
- else if (fastcmp(word, "TITLEPICSSCALE"))
- {
- // Don't handle Alacroix special case here; see Maincfg section.
- menupres[num].ttscale = max(1, min(8, (UINT8)get_number(word2)));
- titlechanged = true;
- }
- else if (fastcmp(word, "TITLEPICSNAME"))
- {
- strncpy(menupres[num].ttname, word2, 9);
- titlechanged = true;
- }
- else if (fastcmp(word, "TITLEPICSX"))
- {
- menupres[num].ttx = (INT16)get_number(word2);
- titlechanged = true;
- }
- else if (fastcmp(word, "TITLEPICSY"))
- {
- menupres[num].tty = (INT16)get_number(word2);
- titlechanged = true;
- }
- else if (fastcmp(word, "TITLEPICSLOOP"))
- {
- menupres[num].ttloop = (INT16)get_number(word2);
- titlechanged = true;
- }
- else if (fastcmp(word, "TITLEPICSTICS"))
- {
- menupres[num].tttics = (UINT16)get_number(word2);
- titlechanged = true;
- }
- else if (fastcmp(word, "TITLESCROLLSPEED") || fastcmp(word, "TITLESCROLLXSPEED")
- || fastcmp(word, "SCROLLSPEED") || fastcmp(word, "SCROLLXSPEED"))
- {
- menupres[num].titlescrollxspeed = get_number(word2);
- titlechanged = true;
- }
- else if (fastcmp(word, "TITLESCROLLYSPEED") || fastcmp(word, "SCROLLYSPEED"))
- {
- menupres[num].titlescrollyspeed = get_number(word2);
- titlechanged = true;
- }
- else if (fastcmp(word, "MUSIC"))
- {
- strncpy(menupres[num].musname, word2, 7);
- menupres[num].musname[6] = 0;
- titlechanged = true;
- }
-#ifdef MUSICSLOT_COMPATIBILITY
- else if (fastcmp(word, "MUSICSLOT"))
- {
- value = get_mus(word2, true);
- if (value && value <= 1035)
- snprintf(menupres[num].musname, 7, "%sM", G_BuildMapName(value));
- else if (value && value <= 1050)
- strncpy(menupres[num].musname, compat_special_music_slots[value - 1036], 7);
- else
- menupres[num].musname[0] = 0; // becomes empty string
- menupres[num].musname[6] = 0;
- titlechanged = true;
- }
-#endif
- else if (fastcmp(word, "MUSICTRACK"))
- {
- menupres[num].mustrack = ((UINT16)value - 1);
- titlechanged = true;
- }
- else if (fastcmp(word, "MUSICLOOP"))
- {
- // true by default except MM_MAIN
- menupres[num].muslooping = (value || word2[0] == 'T' || word2[0] == 'Y');
- titlechanged = true;
- }
- else if (fastcmp(word, "NOMUSIC"))
- {
- menupres[num].musstop = (value || word2[0] == 'T' || word2[0] == 'Y');
- titlechanged = true;
- }
- else if (fastcmp(word, "IGNOREMUSIC"))
- {
- menupres[num].musignore = (value || word2[0] == 'T' || word2[0] == 'Y');
- titlechanged = true;
- }
- else if (fastcmp(word, "FADESTRENGTH"))
- {
- // one-based, <= 0 means use default value. 1-32
- menupres[num].fadestrength = get_number(word2)-1;
- titlechanged = true;
- }
- else if (fastcmp(word, "NOENTERBUBBLE"))
- {
- menupres[num].enterbubble = !(value || word2[0] == 'T' || word2[0] == 'Y');
- titlechanged = true;
- }
- else if (fastcmp(word, "NOEXITBUBBLE"))
- {
- menupres[num].exitbubble = !(value || word2[0] == 'T' || word2[0] == 'Y');
- titlechanged = true;
- }
- else if (fastcmp(word, "ENTERTAG"))
- {
- menupres[num].entertag = get_number(word2);
- titlechanged = true;
- }
- else if (fastcmp(word, "EXITTAG"))
- {
- menupres[num].exittag = get_number(word2);
- titlechanged = true;
- }
- else if (fastcmp(word, "ENTERWIPE"))
- {
- menupres[num].enterwipe = get_number(word2);
- titlechanged = true;
- }
- else if (fastcmp(word, "EXITWIPE"))
- {
- menupres[num].exitwipe = get_number(word2);
- titlechanged = true;
- }
- }
- } while (!myfeof(f)); // finish when the line is empty
-
- Z_Free(s);
-}
-
-static void readhuditem(MYFILE *f, INT32 num)
-{
- char *s = Z_Malloc(MAXLINELEN, PU_STATIC, NULL);
- char *word = s;
- char *word2;
- char *tmp;
- INT32 i;
-
- do
- {
- if (myfgets(s, MAXLINELEN, f))
- {
- if (s[0] == '\n')
- break;
-
- // First remove trailing newline, if there is one
- tmp = strchr(s, '\n');
- if (tmp)
- *tmp = '\0';
-
- tmp = strchr(s, '#');
- if (tmp)
- *tmp = '\0';
- if (s == tmp)
- continue; // Skip comment lines, but don't break.
-
- // Get the part before the " = "
- tmp = strchr(s, '=');
- if (tmp)
- *(tmp-1) = '\0';
- else
- break;
- strupr(word);
-
- // Now get the part after
- word2 = tmp += 2;
- strupr(word2);
-
- i = atoi(word2); // used for numerical settings
-
- if (fastcmp(word, "X"))
- {
- hudinfo[num].x = i;
- }
- else if (fastcmp(word, "Y"))
- {
- hudinfo[num].y = i;
- }
- else if (fastcmp(word, "F"))
- {
- hudinfo[num].f = i;
- }
- else
- deh_warning("Level header %d: unknown word '%s'", num, word);
- }
- } while (!myfeof(f)); // finish when the line is empty
-
- Z_Free(s);
-}
-
-/*
-Sprite number = 10
-Sprite subnumber = 32968
-Duration = 200
-Next frame = 200
-*/
-
-/** Action pointer for reading actions from Dehacked lumps.
- */
-typedef struct
-{
- actionf_t action; ///< Function pointer corresponding to the actual action.
- const char *name; ///< Name of the action in ALL CAPS.
-} actionpointer_t;
-
-/** Array mapping action names to action functions.
- * Names must be in ALL CAPS for case insensitive comparisons.
- */
-static actionpointer_t actionpointers[] =
-{
- {{A_Explode}, "A_EXPLODE"},
- {{A_Pain}, "A_PAIN"},
- {{A_Fall}, "A_FALL"},
- {{A_MonitorPop}, "A_MONITORPOP"},
- {{A_GoldMonitorPop}, "A_GOLDMONITORPOP"},
- {{A_GoldMonitorRestore}, "A_GOLDMONITORRESTORE"},
- {{A_GoldMonitorSparkle}, "A_GOLDMONITORSPARKLE"},
- {{A_Look}, "A_LOOK"},
- {{A_Chase}, "A_CHASE"},
- {{A_FaceStabChase}, "A_FACESTABCHASE"},
- {{A_FaceStabRev}, "A_FACESTABREV"},
- {{A_FaceStabHurl}, "A_FACESTABHURL"},
- {{A_FaceStabMiss}, "A_FACESTABMISS"},
- {{A_StatueBurst}, "A_STATUEBURST"},
- {{A_FaceTarget}, "A_FACETARGET"},
- {{A_FaceTracer}, "A_FACETRACER"},
- {{A_Scream}, "A_SCREAM"},
- {{A_BossDeath}, "A_BOSSDEATH"},
- {{A_CustomPower}, "A_CUSTOMPOWER"},
- {{A_GiveWeapon}, "A_GIVEWEAPON"},
- {{A_RingBox}, "A_RINGBOX"},
- {{A_Invincibility}, "A_INVINCIBILITY"},
- {{A_SuperSneakers}, "A_SUPERSNEAKERS"},
- {{A_BunnyHop}, "A_BUNNYHOP"},
- {{A_BubbleSpawn}, "A_BUBBLESPAWN"},
- {{A_FanBubbleSpawn}, "A_FANBUBBLESPAWN"},
- {{A_BubbleRise}, "A_BUBBLERISE"},
- {{A_BubbleCheck}, "A_BUBBLECHECK"},
- {{A_AwardScore}, "A_AWARDSCORE"},
- {{A_ExtraLife}, "A_EXTRALIFE"},
- {{A_GiveShield}, "A_GIVESHIELD"},
- {{A_GravityBox}, "A_GRAVITYBOX"},
- {{A_ScoreRise}, "A_SCORERISE"},
- {{A_AttractChase}, "A_ATTRACTCHASE"},
- {{A_DropMine}, "A_DROPMINE"},
- {{A_FishJump}, "A_FISHJUMP"},
- {{A_ThrownRing}, "A_THROWNRING"},
- {{A_SetSolidSteam}, "A_SETSOLIDSTEAM"},
- {{A_UnsetSolidSteam}, "A_UNSETSOLIDSTEAM"},
- {{A_SignSpin}, "A_SIGNSPIN"},
- {{A_SignPlayer}, "A_SIGNPLAYER"},
- {{A_OverlayThink}, "A_OVERLAYTHINK"},
- {{A_JetChase}, "A_JETCHASE"},
- {{A_JetbThink}, "A_JETBTHINK"},
- {{A_JetgThink}, "A_JETGTHINK"},
- {{A_JetgShoot}, "A_JETGSHOOT"},
- {{A_ShootBullet}, "A_SHOOTBULLET"},
- {{A_MinusDigging}, "A_MINUSDIGGING"},
- {{A_MinusPopup}, "A_MINUSPOPUP"},
- {{A_MinusCheck}, "A_MINUSCHECK"},
- {{A_ChickenCheck}, "A_CHICKENCHECK"},
- {{A_MouseThink}, "A_MOUSETHINK"},
- {{A_DetonChase}, "A_DETONCHASE"},
- {{A_CapeChase}, "A_CAPECHASE"},
- {{A_RotateSpikeBall}, "A_ROTATESPIKEBALL"},
- {{A_SlingAppear}, "A_SLINGAPPEAR"},
- {{A_UnidusBall}, "A_UNIDUSBALL"},
- {{A_RockSpawn}, "A_ROCKSPAWN"},
- {{A_SetFuse}, "A_SETFUSE"},
- {{A_CrawlaCommanderThink}, "A_CRAWLACOMMANDERTHINK"},
- {{A_SmokeTrailer}, "A_SMOKETRAILER"},
- {{A_RingExplode}, "A_RINGEXPLODE"},
- {{A_OldRingExplode}, "A_OLDRINGEXPLODE"},
- {{A_MixUp}, "A_MIXUP"},
- {{A_RecyclePowers}, "A_RECYCLEPOWERS"},
- {{A_Boss1Chase}, "A_BOSS1CHASE"},
- {{A_FocusTarget}, "A_FOCUSTARGET"},
- {{A_Boss2Chase}, "A_BOSS2CHASE"},
- {{A_Boss2Pogo}, "A_BOSS2POGO"},
- {{A_BossZoom}, "A_BOSSZOOM"},
- {{A_BossScream}, "A_BOSSSCREAM"},
- {{A_Boss2TakeDamage}, "A_BOSS2TAKEDAMAGE"},
- {{A_Boss7Chase}, "A_BOSS7CHASE"},
- {{A_GoopSplat}, "A_GOOPSPLAT"},
- {{A_Boss2PogoSFX}, "A_BOSS2POGOSFX"},
- {{A_Boss2PogoTarget}, "A_BOSS2POGOTARGET"},
- {{A_BossJetFume}, "A_BOSSJETFUME"},
- {{A_EggmanBox}, "A_EGGMANBOX"},
- {{A_TurretFire}, "A_TURRETFIRE"},
- {{A_SuperTurretFire}, "A_SUPERTURRETFIRE"},
- {{A_TurretStop}, "A_TURRETSTOP"},
- {{A_JetJawRoam}, "A_JETJAWROAM"},
- {{A_JetJawChomp}, "A_JETJAWCHOMP"},
- {{A_PointyThink}, "A_POINTYTHINK"},
- {{A_CheckBuddy}, "A_CHECKBUDDY"},
- {{A_HoodFire}, "A_HOODFIRE"},
- {{A_HoodThink}, "A_HOODTHINK"},
- {{A_HoodFall}, "A_HOODFALL"},
- {{A_ArrowBonks}, "A_ARROWBONKS"},
- {{A_SnailerThink}, "A_SNAILERTHINK"},
- {{A_SharpChase}, "A_SHARPCHASE"},
- {{A_SharpSpin}, "A_SHARPSPIN"},
- {{A_SharpDecel}, "A_SHARPDECEL"},
- {{A_CrushstaceanWalk}, "A_CRUSHSTACEANWALK"},
- {{A_CrushstaceanPunch}, "A_CRUSHSTACEANPUNCH"},
- {{A_CrushclawAim}, "A_CRUSHCLAWAIM"},
- {{A_CrushclawLaunch}, "A_CRUSHCLAWLAUNCH"},
- {{A_VultureVtol}, "A_VULTUREVTOL"},
- {{A_VultureCheck}, "A_VULTURECHECK"},
- {{A_VultureHover}, "A_VULTUREHOVER"},
- {{A_VultureBlast}, "A_VULTUREBLAST"},
- {{A_VultureFly}, "A_VULTUREFLY"},
- {{A_SkimChase}, "A_SKIMCHASE"},
- {{A_1upThinker}, "A_1UPTHINKER"},
- {{A_SkullAttack}, "A_SKULLATTACK"},
- {{A_LobShot}, "A_LOBSHOT"},
- {{A_FireShot}, "A_FIRESHOT"},
- {{A_SuperFireShot}, "A_SUPERFIRESHOT"},
- {{A_BossFireShot}, "A_BOSSFIRESHOT"},
- {{A_Boss7FireMissiles}, "A_BOSS7FIREMISSILES"},
- {{A_Boss1Laser}, "A_BOSS1LASER"},
- {{A_Boss4Reverse}, "A_BOSS4REVERSE"},
- {{A_Boss4SpeedUp}, "A_BOSS4SPEEDUP"},
- {{A_Boss4Raise}, "A_BOSS4RAISE"},
- {{A_SparkFollow}, "A_SPARKFOLLOW"},
- {{A_BuzzFly}, "A_BUZZFLY"},
- {{A_GuardChase}, "A_GUARDCHASE"},
- {{A_EggShield}, "A_EGGSHIELD"},
- {{A_SetReactionTime}, "A_SETREACTIONTIME"},
- {{A_Boss1Spikeballs}, "A_BOSS1SPIKEBALLS"},
- {{A_Boss3TakeDamage}, "A_BOSS3TAKEDAMAGE"},
- {{A_Boss3Path}, "A_BOSS3PATH"},
- {{A_Boss3ShockThink}, "A_BOSS3SHOCKTHINK"},
- {{A_LinedefExecute}, "A_LINEDEFEXECUTE"},
- {{A_PlaySeeSound}, "A_PLAYSEESOUND"},
- {{A_PlayAttackSound}, "A_PLAYATTACKSOUND"},
- {{A_PlayActiveSound}, "A_PLAYACTIVESOUND"},
- {{A_SpawnObjectAbsolute}, "A_SPAWNOBJECTABSOLUTE"},
- {{A_SpawnObjectRelative}, "A_SPAWNOBJECTRELATIVE"},
- {{A_ChangeAngleRelative}, "A_CHANGEANGLERELATIVE"},
- {{A_ChangeAngleAbsolute}, "A_CHANGEANGLEABSOLUTE"},
- {{A_RollAngle}, "A_ROLLANGLE"},
- {{A_ChangeRollAngleRelative},"A_CHANGEROLLANGLERELATIVE"},
- {{A_ChangeRollAngleAbsolute},"A_CHANGEROLLANGLEABSOLUTE"},
- {{A_PlaySound}, "A_PLAYSOUND"},
- {{A_FindTarget}, "A_FINDTARGET"},
- {{A_FindTracer}, "A_FINDTRACER"},
- {{A_SetTics}, "A_SETTICS"},
- {{A_SetRandomTics}, "A_SETRANDOMTICS"},
- {{A_ChangeColorRelative}, "A_CHANGECOLORRELATIVE"},
- {{A_ChangeColorAbsolute}, "A_CHANGECOLORABSOLUTE"},
- {{A_Dye}, "A_DYE"},
- {{A_MoveRelative}, "A_MOVERELATIVE"},
- {{A_MoveAbsolute}, "A_MOVEABSOLUTE"},
- {{A_Thrust}, "A_THRUST"},
- {{A_ZThrust}, "A_ZTHRUST"},
- {{A_SetTargetsTarget}, "A_SETTARGETSTARGET"},
- {{A_SetObjectFlags}, "A_SETOBJECTFLAGS"},
- {{A_SetObjectFlags2}, "A_SETOBJECTFLAGS2"},
- {{A_RandomState}, "A_RANDOMSTATE"},
- {{A_RandomStateRange}, "A_RANDOMSTATERANGE"},
- {{A_DualAction}, "A_DUALACTION"},
- {{A_RemoteAction}, "A_REMOTEACTION"},
- {{A_ToggleFlameJet}, "A_TOGGLEFLAMEJET"},
- {{A_OrbitNights}, "A_ORBITNIGHTS"},
- {{A_GhostMe}, "A_GHOSTME"},
- {{A_SetObjectState}, "A_SETOBJECTSTATE"},
- {{A_SetObjectTypeState}, "A_SETOBJECTTYPESTATE"},
- {{A_KnockBack}, "A_KNOCKBACK"},
- {{A_PushAway}, "A_PUSHAWAY"},
- {{A_RingDrain}, "A_RINGDRAIN"},
- {{A_SplitShot}, "A_SPLITSHOT"},
- {{A_MissileSplit}, "A_MISSILESPLIT"},
- {{A_MultiShot}, "A_MULTISHOT"},
- {{A_InstaLoop}, "A_INSTALOOP"},
- {{A_Custom3DRotate}, "A_CUSTOM3DROTATE"},
- {{A_SearchForPlayers}, "A_SEARCHFORPLAYERS"},
- {{A_CheckRandom}, "A_CHECKRANDOM"},
- {{A_CheckTargetRings}, "A_CHECKTARGETRINGS"},
- {{A_CheckRings}, "A_CHECKRINGS"},
- {{A_CheckTotalRings}, "A_CHECKTOTALRINGS"},
- {{A_CheckHealth}, "A_CHECKHEALTH"},
- {{A_CheckRange}, "A_CHECKRANGE"},
- {{A_CheckHeight}, "A_CHECKHEIGHT"},
- {{A_CheckTrueRange}, "A_CHECKTRUERANGE"},
- {{A_CheckThingCount}, "A_CHECKTHINGCOUNT"},
- {{A_CheckAmbush}, "A_CHECKAMBUSH"},
- {{A_CheckCustomValue}, "A_CHECKCUSTOMVALUE"},
- {{A_CheckCusValMemo}, "A_CHECKCUSVALMEMO"},
- {{A_SetCustomValue}, "A_SETCUSTOMVALUE"},
- {{A_UseCusValMemo}, "A_USECUSVALMEMO"},
- {{A_RelayCustomValue}, "A_RELAYCUSTOMVALUE"},
- {{A_CusValAction}, "A_CUSVALACTION"},
- {{A_ForceStop}, "A_FORCESTOP"},
- {{A_ForceWin}, "A_FORCEWIN"},
- {{A_SpikeRetract}, "A_SPIKERETRACT"},
- {{A_InfoState}, "A_INFOSTATE"},
- {{A_Repeat}, "A_REPEAT"},
- {{A_SetScale}, "A_SETSCALE"},
- {{A_RemoteDamage}, "A_REMOTEDAMAGE"},
- {{A_HomingChase}, "A_HOMINGCHASE"},
- {{A_TrapShot}, "A_TRAPSHOT"},
- {{A_VileTarget}, "A_VILETARGET"},
- {{A_VileAttack}, "A_VILEATTACK"},
- {{A_VileFire}, "A_VILEFIRE"},
- {{A_BrakChase}, "A_BRAKCHASE"},
- {{A_BrakFireShot}, "A_BRAKFIRESHOT"},
- {{A_BrakLobShot}, "A_BRAKLOBSHOT"},
- {{A_NapalmScatter}, "A_NAPALMSCATTER"},
- {{A_SpawnFreshCopy}, "A_SPAWNFRESHCOPY"},
- {{A_FlickySpawn}, "A_FLICKYSPAWN"},
- {{A_FlickyCenter}, "A_FLICKYCENTER"},
- {{A_FlickyAim}, "A_FLICKYAIM"},
- {{A_FlickyFly}, "A_FLICKYFLY"},
- {{A_FlickySoar}, "A_FLICKYSOAR"},
- {{A_FlickyCoast}, "A_FLICKYCOAST"},
- {{A_FlickyHop}, "A_FLICKYHOP"},
- {{A_FlickyFlounder}, "A_FLICKYFLOUNDER"},
- {{A_FlickyCheck}, "A_FLICKYCHECK"},
- {{A_FlickyHeightCheck}, "A_FLICKYHEIGHTCHECK"},
- {{A_FlickyFlutter}, "A_FLICKYFLUTTER"},
- {{A_FlameParticle}, "A_FLAMEPARTICLE"},
- {{A_FadeOverlay}, "A_FADEOVERLAY"},
- {{A_Boss5Jump}, "A_BOSS5JUMP"},
- {{A_LightBeamReset}, "A_LIGHTBEAMRESET"},
- {{A_MineExplode}, "A_MINEEXPLODE"},
- {{A_MineRange}, "A_MINERANGE"},
- {{A_ConnectToGround}, "A_CONNECTTOGROUND"},
- {{A_SpawnParticleRelative}, "A_SPAWNPARTICLERELATIVE"},
- {{A_MultiShotDist}, "A_MULTISHOTDIST"},
- {{A_WhoCaresIfYourSonIsABee},"A_WHOCARESIFYOURSONISABEE"},
- {{A_ParentTriesToSleep}, "A_PARENTTRIESTOSLEEP"},
- {{A_CryingToMomma}, "A_CRYINGTOMOMMA"},
- {{A_CheckFlags2}, "A_CHECKFLAGS2"},
- {{A_Boss5FindWaypoint}, "A_BOSS5FINDWAYPOINT"},
- {{A_DoNPCSkid}, "A_DONPCSKID"},
- {{A_DoNPCPain}, "A_DONPCPAIN"},
- {{A_PrepareRepeat}, "A_PREPAREREPEAT"},
- {{A_Boss5ExtraRepeat}, "A_BOSS5EXTRAREPEAT"},
- {{A_Boss5Calm}, "A_BOSS5CALM"},
- {{A_Boss5CheckOnGround}, "A_BOSS5CHECKONGROUND"},
- {{A_Boss5CheckFalling}, "A_BOSS5CHECKFALLING"},
- {{A_Boss5PinchShot}, "A_BOSS5PINCHSHOT"},
- {{A_Boss5MakeItRain}, "A_BOSS5MAKEITRAIN"},
- {{A_Boss5MakeJunk}, "A_BOSS5MAKEJUNK"},
- {{A_LookForBetter}, "A_LOOKFORBETTER"},
- {{A_Boss5BombExplode}, "A_BOSS5BOMBEXPLODE"},
- {{A_DustDevilThink}, "A_DUSTDEVILTHINK"},
- {{A_TNTExplode}, "A_TNTEXPLODE"},
- {{A_DebrisRandom}, "A_DEBRISRANDOM"},
- {{A_TrainCameo}, "A_TRAINCAMEO"},
- {{A_TrainCameo2}, "A_TRAINCAMEO2"},
- {{A_CanarivoreGas}, "A_CANARIVOREGAS"},
- {{A_KillSegments}, "A_KILLSEGMENTS"},
- {{A_SnapperSpawn}, "A_SNAPPERSPAWN"},
- {{A_SnapperThinker}, "A_SNAPPERTHINKER"},
- {{A_SaloonDoorSpawn}, "A_SALOONDOORSPAWN"},
- {{A_MinecartSparkThink}, "A_MINECARTSPARKTHINK"},
- {{A_ModuloToState}, "A_MODULOTOSTATE"},
- {{A_LavafallRocks}, "A_LAVAFALLROCKS"},
- {{A_LavafallLava}, "A_LAVAFALLLAVA"},
- {{A_FallingLavaCheck}, "A_FALLINGLAVACHECK"},
- {{A_FireShrink}, "A_FIRESHRINK"},
- {{A_SpawnPterabytes}, "A_SPAWNPTERABYTES"},
- {{A_PterabyteHover}, "A_PTERABYTEHOVER"},
- {{A_RolloutSpawn}, "A_ROLLOUTSPAWN"},
- {{A_RolloutRock}, "A_ROLLOUTROCK"},
- {{A_DragonbomberSpawn}, "A_DRAGONBOMERSPAWN"},
- {{A_DragonWing}, "A_DRAGONWING"},
- {{A_DragonSegment}, "A_DRAGONSEGMENT"},
- {{A_ChangeHeight}, "A_CHANGEHEIGHT"},
- {{NULL}, "NONE"},
-
- // This NULL entry must be the last in the list
- {{NULL}, NULL},
-};
-
-static void readframe(MYFILE *f, INT32 num)
-{
- char *s = Z_Malloc(MAXLINELEN, PU_STATIC, NULL);
- char *word1;
- char *word2 = NULL;
- char *tmp;
-
- do
- {
- if (myfgets(s, MAXLINELEN, f))
- {
- if (s[0] == '\n')
- break;
-
- tmp = strchr(s, '#');
- if (tmp)
- *tmp = '\0';
- if (s == tmp)
- continue; // Skip comment lines, but don't break.
-
- word1 = strtok(s, " ");
- if (word1)
- strupr(word1);
- else
- break;
-
- word2 = strtok(NULL, " = ");
- if (word2)
- strupr(word2);
- else
- break;
- if (word2[strlen(word2)-1] == '\n')
- word2[strlen(word2)-1] = '\0';
-
- if (fastcmp(word1, "SPRITENUMBER") || fastcmp(word1, "SPRITENAME"))
- {
- states[num].sprite = get_sprite(word2);
- }
- else if (fastcmp(word1, "SPRITESUBNUMBER") || fastcmp(word1, "SPRITEFRAME"))
- {
- states[num].frame = (INT32)get_number(word2); // So the FF_ flags get calculated
- }
- else if (fastcmp(word1, "DURATION"))
- {
- states[num].tics = (INT32)get_number(word2); // So TICRATE can be used
- }
- else if (fastcmp(word1, "NEXT"))
- {
- states[num].nextstate = get_state(word2);
- }
- else if (fastcmp(word1, "VAR1"))
- {
- states[num].var1 = (INT32)get_number(word2);
- }
- else if (fastcmp(word1, "VAR2"))
- {
- states[num].var2 = (INT32)get_number(word2);
- }
- else if (fastcmp(word1, "ACTION"))
- {
- size_t z;
- boolean found = false;
- char actiontocompare[32];
-
- memset(actiontocompare, 0x00, sizeof(actiontocompare));
- strlcpy(actiontocompare, word2, sizeof (actiontocompare));
- strupr(actiontocompare);
-
- for (z = 0; z < 32; z++)
- {
- if (actiontocompare[z] == '\n' || actiontocompare[z] == '\r')
- {
- actiontocompare[z] = '\0';
- break;
- }
- }
-
- for (z = 0; actionpointers[z].name; z++)
- {
- if (actionpointers[z].action.acv == states[num].action.acv)
- break;
- }
-
- z = 0;
- found = LUA_SetLuaAction(&states[num], actiontocompare);
- if (!found)
- while (actionpointers[z].name)
- {
- if (fastcmp(actiontocompare, actionpointers[z].name))
- {
- states[num].action = actionpointers[z].action;
- states[num].action.acv = actionpointers[z].action.acv; // assign
- states[num].action.acp1 = actionpointers[z].action.acp1;
- found = true;
- break;
- }
- z++;
- }
-
- if (!found)
- deh_warning("Unknown action %s", actiontocompare);
- }
- else
- deh_warning("Frame %d: unknown word '%s'", num, word1);
- }
- } while (!myfeof(f));
-
- Z_Free(s);
-}
-
-static void readsound(MYFILE *f, INT32 num)
-{
- char *s = Z_Malloc(MAXLINELEN, PU_STATIC, NULL);
- char *word;
- char *word2;
- char *tmp;
- INT32 value;
-
- do
- {
- if (myfgets(s, MAXLINELEN, f))
- {
- if (s[0] == '\n')
- break;
-
- tmp = strchr(s, '#');
- if (tmp)
- *tmp = '\0';
- if (s == tmp)
- continue; // Skip comment lines, but don't break.
-
- word = strtok(s, " ");
- if (word)
- strupr(word);
- else
- break;
-
- word2 = strtok(NULL, " ");
- if (word2)
- value = atoi(word2);
- else
- {
- deh_warning("No value for token %s", word);
- continue;
- }
-
- if (fastcmp(word, "SINGULAR"))
- {
- S_sfx[num].singularity = value;
- }
- else if (fastcmp(word, "PRIORITY"))
- {
- S_sfx[num].priority = value;
- }
- else if (fastcmp(word, "FLAGS"))
- {
- S_sfx[num].pitch = value;
- }
- else if (fastcmp(word, "CAPTION") || fastcmp(word, "DESCRIPTION"))
- {
- deh_strlcpy(S_sfx[num].caption, word2,
- sizeof(S_sfx[num].caption), va("Sound effect %d: caption", num));
- }
- else
- deh_warning("Sound %d : unknown word '%s'",num,word);
- }
- } while (!myfeof(f));
-
- Z_Free(s);
-}
-
-/** Checks if a game data file name for a mod is good.
- * "Good" means that it contains only alphanumerics, _, and -;
- * ends in ".dat"; has at least one character before the ".dat";
- * and is not "gamedata.dat" (tested case-insensitively).
- *
- * Assumption: that gamedata.dat is the only .dat file that will
- * ever be treated specially by the game.
- *
- * Note: Check for the tail ".dat" case-insensitively since at
- * present, we get passed the filename in all uppercase.
- *
- * \param s Filename string to check.
- * \return True if the filename is good.
- * \sa readmaincfg()
- * \author Graue <graue@oceanbase.org>
- */
-static boolean GoodDataFileName(const char *s)
-{
- const char *p;
- const char *tail = ".dat";
-
- for (p = s; *p != '\0'; p++)
- if (!isalnum(*p) && *p != '_' && *p != '-' && *p != '.')
- return false;
-
- p = s + strlen(s) - strlen(tail);
- if (p <= s) return false; // too short
- if (!fasticmp(p, tail)) return false; // doesn't end in .dat
- if (fasticmp(s, "gamedata.dat")) return false;
-
- return true;
-}
-
-static void reademblemdata(MYFILE *f, INT32 num)
-{
- char *s = Z_Malloc(MAXLINELEN, PU_STATIC, NULL);
- char *word = s;
- char *word2;
- char *tmp;
- INT32 value;
-
- memset(&emblemlocations[num-1], 0, sizeof(emblem_t));
-
- do
- {
- if (myfgets(s, MAXLINELEN, f))
- {
- if (s[0] == '\n')
- break;
-
- // First remove trailing newline, if there is one
- tmp = strchr(s, '\n');
- if (tmp)
- *tmp = '\0';
-
- tmp = strchr(s, '#');
- if (tmp)
- *tmp = '\0';
- if (s == tmp)
- continue; // Skip comment lines, but don't break.
-
- // Get the part before the " = "
- tmp = strchr(s, '=');
- if (tmp)
- *(tmp-1) = '\0';
- else
- break;
- strupr(word);
-
- // Now get the part after
- word2 = tmp += 2;
- value = atoi(word2); // used for numerical settings
-
- // Up here to allow lowercase in hints
- if (fastcmp(word, "HINT"))
- {
- while ((tmp = strchr(word2, '\\')))
- *tmp = '\n';
- deh_strlcpy(emblemlocations[num-1].hint, word2, sizeof (emblemlocations[num-1].hint), va("Emblem %d: hint", num));
- continue;
- }
- strupr(word2);
-
- if (fastcmp(word, "TYPE"))
- {
- if (fastcmp(word2, "GLOBAL"))
- emblemlocations[num-1].type = ET_GLOBAL;
- else if (fastcmp(word2, "SKIN"))
- emblemlocations[num-1].type = ET_SKIN;
- else if (fastcmp(word2, "SCORE"))
- emblemlocations[num-1].type = ET_SCORE;
- else if (fastcmp(word2, "TIME"))
- emblemlocations[num-1].type = ET_TIME;
- else if (fastcmp(word2, "RINGS"))
- emblemlocations[num-1].type = ET_RINGS;
- else if (fastcmp(word2, "MAP"))
- emblemlocations[num-1].type = ET_MAP;
- else if (fastcmp(word2, "NGRADE"))
- emblemlocations[num-1].type = ET_NGRADE;
- else if (fastcmp(word2, "NTIME"))
- emblemlocations[num-1].type = ET_NTIME;
- else
- emblemlocations[num-1].type = (UINT8)value;
- }
- else if (fastcmp(word, "TAG"))
- emblemlocations[num-1].tag = (INT16)value;
- else if (fastcmp(word, "MAPNUM"))
- {
- // Support using the actual map name,
- // i.e., Level AB, Level FZ, etc.
-
- // Convert to map number
- if (word2[0] >= 'A' && word2[0] <= 'Z')
- value = M_MapNumber(word2[0], word2[1]);
-
- emblemlocations[num-1].level = (INT16)value;
- }
- else if (fastcmp(word, "SPRITE"))
- {
- if (word2[0] >= 'A' && word2[0] <= 'Z')
- value = word2[0];
- else
- value += 'A'-1;
-
- if (value < 'A' || value > 'Z')
- deh_warning("Emblem %d: sprite must be from A - Z (1 - 26)", num);
- else
- emblemlocations[num-1].sprite = (UINT8)value;
- }
- else if (fastcmp(word, "COLOR"))
- emblemlocations[num-1].color = get_number(word2);
- else if (fastcmp(word, "VAR"))
- emblemlocations[num-1].var = get_number(word2);
- else
- deh_warning("Emblem %d: unknown word '%s'", num, word);
- }
- } while (!myfeof(f));
-
- // Default sprite and color definitions for lazy people like me
- if (!emblemlocations[num-1].sprite) switch (emblemlocations[num-1].type)
- {
- case ET_RINGS:
- emblemlocations[num-1].sprite = 'R'; break;
- case ET_SCORE: case ET_NGRADE:
- emblemlocations[num-1].sprite = 'S'; break;
- case ET_TIME: case ET_NTIME:
- emblemlocations[num-1].sprite = 'T'; break;
- default:
- emblemlocations[num-1].sprite = 'A'; break;
- }
- if (!emblemlocations[num-1].color) switch (emblemlocations[num-1].type)
- {
- case ET_RINGS:
- emblemlocations[num-1].color = SKINCOLOR_GOLD; break;
- case ET_SCORE:
- emblemlocations[num-1].color = SKINCOLOR_BROWN; break;
- case ET_NGRADE:
- emblemlocations[num-1].color = SKINCOLOR_TEAL; break;
- case ET_TIME: case ET_NTIME:
- emblemlocations[num-1].color = SKINCOLOR_GREY; break;
- default:
- emblemlocations[num-1].color = SKINCOLOR_BLUE; break;
- }
-
- Z_Free(s);
-}
-
-static void readextraemblemdata(MYFILE *f, INT32 num)
-{
- char *s = Z_Malloc(MAXLINELEN, PU_STATIC, NULL);
- char *word = s;
- char *word2;
- char *tmp;
- INT32 value;
-
- memset(&extraemblems[num-1], 0, sizeof(extraemblem_t));
-
- do
- {
- if (myfgets(s, MAXLINELEN, f))
- {
- if (s[0] == '\n')
- break;
-
- // First remove trailing newline, if there is one
- tmp = strchr(s, '\n');
- if (tmp)
- *tmp = '\0';
-
- tmp = strchr(s, '#');
- if (tmp)
- *tmp = '\0';
- if (s == tmp)
- continue; // Skip comment lines, but don't break.
-
- // Get the part before the " = "
- tmp = strchr(s, '=');
- if (tmp)
- *(tmp-1) = '\0';
- else
- break;
- strupr(word);
-
- // Now get the part after
- word2 = tmp += 2;
-
- value = atoi(word2); // used for numerical settings
-
- if (fastcmp(word, "NAME"))
- deh_strlcpy(extraemblems[num-1].name, word2,
- sizeof (extraemblems[num-1].name), va("Extra emblem %d: name", num));
- else if (fastcmp(word, "OBJECTIVE"))
- deh_strlcpy(extraemblems[num-1].description, word2,
- sizeof (extraemblems[num-1].description), va("Extra emblem %d: objective", num));
- else if (fastcmp(word, "CONDITIONSET"))
- extraemblems[num-1].conditionset = (UINT8)value;
- else if (fastcmp(word, "SHOWCONDITIONSET"))
- extraemblems[num-1].showconditionset = (UINT8)value;
- else
- {
- strupr(word2);
- if (fastcmp(word, "SPRITE"))
- {
- if (word2[0] >= 'A' && word2[0] <= 'Z')
- value = word2[0];
- else
- value += 'A'-1;
-
- if (value < 'A' || value > 'Z')
- deh_warning("Emblem %d: sprite must be from A - Z (1 - 26)", num);
- else
- extraemblems[num-1].sprite = (UINT8)value;
- }
- else if (fastcmp(word, "COLOR"))
- extraemblems[num-1].color = get_number(word2);
- else
- deh_warning("Extra emblem %d: unknown word '%s'", num, word);
- }
- }
- } while (!myfeof(f));
-
- if (!extraemblems[num-1].sprite)
- extraemblems[num-1].sprite = 'X';
- if (!extraemblems[num-1].color)
- extraemblems[num-1].color = SKINCOLOR_BLUE;
-
- Z_Free(s);
-}
-
-static void readunlockable(MYFILE *f, INT32 num)
-{
- char *s = Z_Malloc(MAXLINELEN, PU_STATIC, NULL);
- char *word = s;
- char *word2;
- char *tmp;
- INT32 i;
-
- memset(&unlockables[num], 0, sizeof(unlockable_t));
- unlockables[num].objective[0] = '/';
-
- do
- {
- if (myfgets(s, MAXLINELEN, f))
- {
- if (s[0] == '\n')
- break;
-
- // First remove trailing newline, if there is one
- tmp = strchr(s, '\n');
- if (tmp)
- *tmp = '\0';
-
- tmp = strchr(s, '#');
- if (tmp)
- *tmp = '\0';
- if (s == tmp)
- continue; // Skip comment lines, but don't break.
-
- // Get the part before the " = "
- tmp = strchr(s, '=');
- if (tmp)
- *(tmp-1) = '\0';
- else
- break;
- strupr(word);
-
- // Now get the part after
- word2 = tmp += 2;
-
- i = atoi(word2); // used for numerical settings
-
- if (fastcmp(word, "NAME"))
- deh_strlcpy(unlockables[num].name, word2,
- sizeof (unlockables[num].name), va("Unlockable %d: name", num));
- else if (fastcmp(word, "OBJECTIVE"))
- deh_strlcpy(unlockables[num].objective, word2,
- sizeof (unlockables[num].objective), va("Unlockable %d: objective", num));
- else
- {
- strupr(word2);
- if (fastcmp(word, "HEIGHT"))
- unlockables[num].height = (UINT16)i;
- else if (fastcmp(word, "CONDITIONSET"))
- unlockables[num].conditionset = (UINT8)i;
- else if (fastcmp(word, "SHOWCONDITIONSET"))
- unlockables[num].showconditionset = (UINT8)i;
- else if (fastcmp(word, "NOCECHO"))
- unlockables[num].nocecho = (UINT8)(i || word2[0] == 'T' || word2[0] == 'Y');
- else if (fastcmp(word, "NOCHECKLIST"))
- unlockables[num].nochecklist = (UINT8)(i || word2[0] == 'T' || word2[0] == 'Y');
- else if (fastcmp(word, "TYPE"))
- {
- if (fastcmp(word2, "NONE"))
- unlockables[num].type = SECRET_NONE;
- else if (fastcmp(word2, "ITEMFINDER"))
- unlockables[num].type = SECRET_ITEMFINDER;
- else if (fastcmp(word2, "EMBLEMHINTS"))
- unlockables[num].type = SECRET_EMBLEMHINTS;
- else if (fastcmp(word2, "PANDORA"))
- unlockables[num].type = SECRET_PANDORA;
- else if (fastcmp(word2, "CREDITS"))
- unlockables[num].type = SECRET_CREDITS;
- else if (fastcmp(word2, "RECORDATTACK"))
- unlockables[num].type = SECRET_RECORDATTACK;
- else if (fastcmp(word2, "NIGHTSMODE"))
- unlockables[num].type = SECRET_NIGHTSMODE;
- else if (fastcmp(word2, "HEADER"))
- unlockables[num].type = SECRET_HEADER;
- else if (fastcmp(word2, "LEVELSELECT"))
- unlockables[num].type = SECRET_LEVELSELECT;
- else if (fastcmp(word2, "WARP"))
- unlockables[num].type = SECRET_WARP;
- else if (fastcmp(word2, "SOUNDTEST"))
- unlockables[num].type = SECRET_SOUNDTEST;
- else
- unlockables[num].type = (INT16)i;
- }
- else if (fastcmp(word, "VAR"))
- {
- // Support using the actual map name,
- // i.e., Level AB, Level FZ, etc.
-
- // Convert to map number
- if (word2[0] >= 'A' && word2[0] <= 'Z')
- i = M_MapNumber(word2[0], word2[1]);
-
- unlockables[num].variable = (INT16)i;
- }
- else
- deh_warning("Unlockable %d: unknown word '%s'", num+1, word);
- }
- }
- } while (!myfeof(f)); // finish when the line is empty
-
- Z_Free(s);
-}
-
-static const char NIGHTSGRADE_LIST[] = {
- 'F', // GRADE_F
- 'E', // GRADE_E
- 'D', // GRADE_D
- 'C', // GRADE_C
- 'B', // GRADE_B
- 'A', // GRADE_A
- 'S', // GRADE_S
- '\0'
-};
-
-#define PARAMCHECK(n) do { if (!params[n]) { deh_warning("Too few parameters, need %d", n); return; }} while (0)
-static void readcondition(UINT8 set, UINT32 id, char *word2)
-{
- INT32 i;
- char *params[4]; // condition, requirement, extra info, extra info
- char *spos;
-
- conditiontype_t ty;
- INT32 re;
- INT16 x1 = 0, x2 = 0;
-
- INT32 offset = 0;
-
- spos = strtok(word2, " ");
-
- for (i = 0; i < 4; ++i)
- {
- if (spos != NULL)
- {
- params[i] = spos;
- spos = strtok(NULL, " ");
- }
- else
- params[i] = NULL;
- }
-
- if (!params[0])
- {
- deh_warning("condition line is empty");
- return;
- }
-
- if (fastcmp(params[0], "PLAYTIME"))
- {
- PARAMCHECK(1);
- ty = UC_PLAYTIME;
- re = atoi(params[1]);
- }
- else if (fastcmp(params[0], "GAMECLEAR")
- || (++offset && fastcmp(params[0], "ALLEMERALDS"))
- || (++offset && fastcmp(params[0], "ULTIMATECLEAR")))
- {
- ty = UC_GAMECLEAR + offset;
- re = (params[1]) ? atoi(params[1]) : 1;
- }
- else if ((offset=0) || fastcmp(params[0], "OVERALLSCORE")
- || (++offset && fastcmp(params[0], "OVERALLTIME"))
- || (++offset && fastcmp(params[0], "OVERALLRINGS")))
- {
- PARAMCHECK(1);
- ty = UC_OVERALLSCORE + offset;
- re = atoi(params[1]);
- }
- else if ((offset=0) || fastcmp(params[0], "MAPVISITED")
- || (++offset && fastcmp(params[0], "MAPBEATEN"))
- || (++offset && fastcmp(params[0], "MAPALLEMERALDS"))
- || (++offset && fastcmp(params[0], "MAPULTIMATE"))
- || (++offset && fastcmp(params[0], "MAPPERFECT")))
- {
- PARAMCHECK(1);
- ty = UC_MAPVISITED + offset;
-
- // Convert to map number if it appears to be one
- if (params[1][0] >= 'A' && params[1][0] <= 'Z')
- re = M_MapNumber(params[1][0], params[1][1]);
- else
- re = atoi(params[1]);
-
- if (re < 0 || re >= NUMMAPS)
- {
- deh_warning("Level number %d out of range (1 - %d)", re, NUMMAPS);
- return;
- }
- }
- else if ((offset=0) || fastcmp(params[0], "MAPSCORE")
- || (++offset && fastcmp(params[0], "MAPTIME"))
- || (++offset && fastcmp(params[0], "MAPRINGS")))
- {
- PARAMCHECK(2);
- ty = UC_MAPSCORE + offset;
- re = atoi(params[2]);
-
- // Convert to map number if it appears to be one
- if (params[1][0] >= 'A' && params[1][0] <= 'Z')
- x1 = (INT16)M_MapNumber(params[1][0], params[1][1]);
- else
- x1 = (INT16)atoi(params[1]);
-
- if (x1 < 0 || x1 >= NUMMAPS)
- {
- deh_warning("Level number %d out of range (1 - %d)", re, NUMMAPS);
- return;
- }
- }
- else if ((offset=0) || fastcmp(params[0], "NIGHTSSCORE")
- || (++offset && fastcmp(params[0], "NIGHTSTIME"))
- || (++offset && fastcmp(params[0], "NIGHTSGRADE")))
- {
- PARAMCHECK(2); // one optional one
-
- ty = UC_NIGHTSSCORE + offset;
- i = (params[3] ? 3 : 2);
- if (fastncmp("GRADE_",params[i],6))
- {
- char *p = params[i]+6;
- for (re = 0; NIGHTSGRADE_LIST[re]; re++)
- if (*p == NIGHTSGRADE_LIST[re])
- break;
- if (!NIGHTSGRADE_LIST[re])
- {
- deh_warning("Invalid NiGHTS grade %s\n", params[i]);
- return;
- }
- }
- else
- re = atoi(params[i]);
-
- // Convert to map number if it appears to be one
- if (params[1][0] >= 'A' && params[1][0] <= 'Z')
- x1 = (INT16)M_MapNumber(params[1][0], params[1][1]);
- else
- x1 = (INT16)atoi(params[1]);
-
- if (x1 < 0 || x1 >= NUMMAPS)
- {
- deh_warning("Level number %d out of range (1 - %d)", re, NUMMAPS);
- return;
- }
-
- // Mare number (0 for overall)
- if (params[3]) // Only if we actually got 3 params (so the second one == mare and not requirement)
- x2 = (INT16)atoi(params[2]);
- else
- x2 = 0;
-
- }
- else if (fastcmp(params[0], "TRIGGER"))
- {
- PARAMCHECK(1);
- ty = UC_TRIGGER;
- re = atoi(params[1]);
-
- // constrained by 32 bits
- if (re < 0 || re > 31)
- {
- deh_warning("Trigger ID %d out of range (0 - 31)", re);
- return;
- }
- }
- else if (fastcmp(params[0], "TOTALEMBLEMS"))
- {
- PARAMCHECK(1);
- ty = UC_TOTALEMBLEMS;
- re = atoi(params[1]);
- }
- else if (fastcmp(params[0], "EMBLEM"))
- {
- PARAMCHECK(1);
- ty = UC_EMBLEM;
- re = atoi(params[1]);
-
- if (re <= 0 || re > MAXEMBLEMS)
- {
- deh_warning("Emblem %d out of range (1 - %d)", re, MAXEMBLEMS);
- return;
- }
- }
- else if (fastcmp(params[0], "EXTRAEMBLEM"))
- {
- PARAMCHECK(1);
- ty = UC_EXTRAEMBLEM;
- re = atoi(params[1]);
-
- if (re <= 0 || re > MAXEXTRAEMBLEMS)
- {
- deh_warning("Extra emblem %d out of range (1 - %d)", re, MAXEXTRAEMBLEMS);
- return;
- }
- }
- else if (fastcmp(params[0], "CONDITIONSET"))
- {
- PARAMCHECK(1);
- ty = UC_CONDITIONSET;
- re = atoi(params[1]);
-
- if (re <= 0 || re > MAXCONDITIONSETS)
- {
- deh_warning("Condition set %d out of range (1 - %d)", re, MAXCONDITIONSETS);
- return;
- }
- }
- else
- {
- deh_warning("Invalid condition name %s", params[0]);
- return;
- }
-
- M_AddRawCondition(set, (UINT8)id, ty, re, x1, x2);
-}
-#undef PARAMCHECK
-
-static void readconditionset(MYFILE *f, UINT8 setnum)
-{
- char *s = Z_Malloc(MAXLINELEN, PU_STATIC, NULL);
- char *word = s;
- char *word2;
- char *tmp;
- UINT8 id;
- UINT8 previd = 0;
-
- M_ClearConditionSet(setnum);
-
- do
- {
- if (myfgets(s, MAXLINELEN, f))
- {
- if (s[0] == '\n')
- break;
-
- // First remove trailing newline, if there is one
- tmp = strchr(s, '\n');
- if (tmp)
- *tmp = '\0';
-
- tmp = strchr(s, '#');
- if (tmp)
- *tmp = '\0';
- if (s == tmp)
- continue; // Skip comment lines, but don't break.
-
- // Get the part before the " = "
- tmp = strchr(s, '=');
- if (tmp)
- *(tmp-1) = '\0';
- else
- break;
- strupr(word);
-
- // Now get the part after
- word2 = tmp += 2;
- strupr(word2);
-
- if (fastncmp(word, "CONDITION", 9))
- {
- id = (UINT8)atoi(word + 9);
- if (id == 0)
- {
- deh_warning("Condition set %d: unknown word '%s'", setnum, word);
- continue;
- }
- else if (previd > id)
- {
- // out of order conditions can cause problems, so enforce proper order
- deh_warning("Condition set %d: conditions are out of order, ignoring this line", setnum);
- continue;
- }
- previd = id;
-
- readcondition(setnum, id, word2);
- }
- else
- deh_warning("Condition set %d: unknown word '%s'", setnum, word);
- }
- } while (!myfeof(f)); // finish when the line is empty
-
- Z_Free(s);
-}
-
-static void readmaincfg(MYFILE *f)
-{
- char *s = Z_Malloc(MAXLINELEN, PU_STATIC, NULL);
- char *word = s;
- char *word2;
- char *tmp;
- INT32 value;
-
- do
- {
- if (myfgets(s, MAXLINELEN, f))
- {
- if (s[0] == '\n')
- break;
-
- // First remove trailing newline, if there is one
- tmp = strchr(s, '\n');
- if (tmp)
- *tmp = '\0';
-
- tmp = strchr(s, '#');
- if (tmp)
- *tmp = '\0';
- if (s == tmp)
- continue; // Skip comment lines, but don't break.
-
- // Get the part before the " = "
- tmp = strchr(s, '=');
- if (tmp)
- *(tmp-1) = '\0';
- else
- break;
- strupr(word);
-
- // Now get the part after
- word2 = tmp += 2;
- strupr(word2);
-
- value = atoi(word2); // used for numerical settings
-
- if (fastcmp(word, "EXECCFG"))
- {
- if (strchr(word2, '.'))
- COM_BufAddText(va("exec %s\n", word2));
- else
- {
- lumpnum_t lumpnum;
- char newname[9];
-
- strncpy(newname, word2, 8);
-
- newname[8] = '\0';
-
- lumpnum = W_CheckNumForName(newname);
-
- if (lumpnum == LUMPERROR || W_LumpLength(lumpnum) == 0)
- CONS_Debug(DBG_SETUP, "SOC Error: script lump %s not found/not valid.\n", newname);
- else
- COM_BufInsertText(W_CacheLumpNum(lumpnum, PU_CACHE));
- }
- }
-
- else if (fastcmp(word, "SPSTAGE_START"))
- {
- // Support using the actual map name,
- // i.e., Level AB, Level FZ, etc.
-
- // Convert to map number
- if (word2[0] >= 'A' && word2[0] <= 'Z')
- value = M_MapNumber(word2[0], word2[1]);
- else
- value = get_number(word2);
-
- spstage_start = spmarathon_start = (INT16)value;
- }
- else if (fastcmp(word, "SPMARATHON_START"))
- {
- // Support using the actual map name,
- // i.e., Level AB, Level FZ, etc.
-
- // Convert to map number
- if (word2[0] >= 'A' && word2[0] <= 'Z')
- value = M_MapNumber(word2[0], word2[1]);
- else
- value = get_number(word2);
-
- spmarathon_start = (INT16)value;
- }
- else if (fastcmp(word, "SSTAGE_START"))
- {
- // Support using the actual map name,
- // i.e., Level AB, Level FZ, etc.
-
- // Convert to map number
- if (word2[0] >= 'A' && word2[0] <= 'Z')
- value = M_MapNumber(word2[0], word2[1]);
- else
- value = get_number(word2);
-
- sstage_start = (INT16)value;
- sstage_end = (INT16)(sstage_start+7); // 7 special stages total plus one weirdo
- }
- else if (fastcmp(word, "SMPSTAGE_START"))
- {
- // Support using the actual map name,
- // i.e., Level AB, Level FZ, etc.
-
- // Convert to map number
- if (word2[0] >= 'A' && word2[0] <= 'Z')
- value = M_MapNumber(word2[0], word2[1]);
- else
- value = get_number(word2);
-
- smpstage_start = (INT16)value;
- smpstage_end = (INT16)(smpstage_start+6); // 7 special stages total
- }
- else if (fastcmp(word, "REDTEAM"))
- {
- skincolor_redteam = (UINT16)get_number(word2);
- }
- else if (fastcmp(word, "BLUETEAM"))
- {
- skincolor_blueteam = (UINT16)get_number(word2);
- }
- else if (fastcmp(word, "REDRING"))
- {
- skincolor_redring = (UINT16)get_number(word2);
- }
- else if (fastcmp(word, "BLUERING"))
- {
- skincolor_bluering = (UINT16)get_number(word2);
- }
- else if (fastcmp(word, "INVULNTICS"))
- {
- invulntics = (UINT16)get_number(word2);
- }
- else if (fastcmp(word, "SNEAKERTICS"))
- {
- sneakertics = (UINT16)get_number(word2);
- }
- else if (fastcmp(word, "FLASHINGTICS"))
- {
- flashingtics = (UINT16)get_number(word2);
- }
- else if (fastcmp(word, "TAILSFLYTICS"))
- {
- tailsflytics = (UINT16)get_number(word2);
- }
- else if (fastcmp(word, "UNDERWATERTICS"))
- {
- underwatertics = (UINT16)get_number(word2);
- }
- else if (fastcmp(word, "SPACETIMETICS"))
- {
- spacetimetics = (UINT16)get_number(word2);
- }
- else if (fastcmp(word, "EXTRALIFETICS"))
- {
- extralifetics = (UINT16)get_number(word2);
- }
- else if (fastcmp(word, "NIGHTSLINKTICS"))
- {
- nightslinktics = (UINT16)get_number(word2);
- }
- else if (fastcmp(word, "GAMEOVERTICS"))
- {
- gameovertics = get_number(word2);
- }
- else if (fastcmp(word, "AMMOREMOVALTICS"))
- {
- ammoremovaltics = get_number(word2);
- }
- else if (fastcmp(word, "INTROTOPLAY"))
- {
- introtoplay = (UINT8)get_number(word2);
- // range check, you morons.
- if (introtoplay > 128)
- introtoplay = 128;
- introchanged = true;
- }
- else if (fastcmp(word, "CREDITSCUTSCENE"))
- {
- creditscutscene = (UINT8)get_number(word2);
- // range check, you morons.
- if (creditscutscene > 128)
- creditscutscene = 128;
- }
- else if (fastcmp(word, "USEBLACKROCK"))
- {
- useBlackRock = (UINT8)(value || word2[0] == 'T' || word2[0] == 'Y');
- }
- else if (fastcmp(word, "LOOPTITLE"))
- {
- looptitle = (value || word2[0] == 'T' || word2[0] == 'Y');
- titlechanged = true;
- }
- else if (fastcmp(word, "TITLEMAP"))
- {
- // Support using the actual map name,
- // i.e., Level AB, Level FZ, etc.
-
- // Convert to map number
- if (word2[0] >= 'A' && word2[0] <= 'Z')
- value = M_MapNumber(word2[0], word2[1]);
- else
- value = get_number(word2);
-
- titlemap = (INT16)value;
- titlechanged = true;
- }
- else if (fastcmp(word, "HIDETITLEPICS") || fastcmp(word, "TITLEPICSHIDE"))
- {
- hidetitlepics = (boolean)(value || word2[0] == 'T' || word2[0] == 'Y');
- titlechanged = true;
- }
- else if (fastcmp(word, "TITLEPICSMODE"))
- {
- if (fastcmp(word2, "USER"))
- ttmode = TTMODE_USER;
- else if (fastcmp(word2, "ALACROIX"))
- ttmode = TTMODE_ALACROIX;
- else if (fastcmp(word2, "HIDE") || fastcmp(word2, "HIDDEN") || fastcmp(word2, "NONE"))
- {
- ttmode = TTMODE_USER;
- ttname[0] = 0;
- hidetitlepics = true;
- }
- else // if (fastcmp(word2, "OLD") || fastcmp(word2, "SSNTAILS"))
- ttmode = TTMODE_OLD;
- titlechanged = true;
- }
- else if (fastcmp(word, "TITLEPICSSCALE"))
- {
- ttscale = max(1, min(8, (UINT8)get_number(word2)));
- titlechanged = true;
- }
- else if (fastcmp(word, "TITLEPICSSCALESAVAILABLE"))
- {
- // SPECIAL CASE for Alacroix: Comma-separated list of resolutions that are available
- // for gfx loading.
- ttavailable[0] = ttavailable[1] = ttavailable[2] = ttavailable[3] =\
- ttavailable[4] = ttavailable[5] = false;
-
- if (strstr(word2, "1") != NULL)
- ttavailable[0] = true;
- if (strstr(word2, "2") != NULL)
- ttavailable[1] = true;
- if (strstr(word2, "3") != NULL)
- ttavailable[2] = true;
- if (strstr(word2, "4") != NULL)
- ttavailable[3] = true;
- if (strstr(word2, "5") != NULL)
- ttavailable[4] = true;
- if (strstr(word2, "6") != NULL)
- ttavailable[5] = true;
- titlechanged = true;
- }
- else if (fastcmp(word, "TITLEPICSNAME"))
- {
- strncpy(ttname, word2, 9);
- titlechanged = true;
- }
- else if (fastcmp(word, "TITLEPICSX"))
- {
- ttx = (INT16)get_number(word2);
- titlechanged = true;
- }
- else if (fastcmp(word, "TITLEPICSY"))
- {
- tty = (INT16)get_number(word2);
- titlechanged = true;
- }
- else if (fastcmp(word, "TITLEPICSLOOP"))
- {
- ttloop = (INT16)get_number(word2);
- titlechanged = true;
- }
- else if (fastcmp(word, "TITLEPICSTICS"))
- {
- tttics = (UINT16)get_number(word2);
- titlechanged = true;
- }
- else if (fastcmp(word, "TITLESCROLLSPEED") || fastcmp(word, "TITLESCROLLXSPEED"))
- {
- titlescrollxspeed = get_number(word2);
- titlechanged = true;
- }
- else if (fastcmp(word, "TITLESCROLLYSPEED"))
- {
- titlescrollyspeed = get_number(word2);
- titlechanged = true;
- }
- else if (fastcmp(word, "DISABLESPEEDADJUST"))
- {
- disableSpeedAdjust = (value || word2[0] == 'T' || word2[0] == 'Y');
- }
- else if (fastcmp(word, "NUMDEMOS"))
- {
- numDemos = (UINT8)get_number(word2);
- titlechanged = true;
- }
- else if (fastcmp(word, "DEMODELAYTIME"))
- {
- demoDelayTime = get_number(word2);
- titlechanged = true;
- }
- else if (fastcmp(word, "DEMOIDLETIME"))
- {
- demoIdleTime = get_number(word2);
- titlechanged = true;
- }
- else if (fastcmp(word, "USE1UPSOUND"))
- {
- use1upSound = (UINT8)(value || word2[0] == 'T' || word2[0] == 'Y');
- }
- else if (fastcmp(word, "MAXXTRALIFE"))
- {
- maxXtraLife = (UINT8)get_number(word2);
- }
- else if (fastcmp(word, "USECONTINUES"))
- {
- useContinues = (UINT8)(value || word2[0] == 'T' || word2[0] == 'Y');
- }
-
- else if (fastcmp(word, "GAMEDATA"))
- {
- size_t filenamelen;
-
- // Check the data filename so that mods
- // can't write arbitrary files.
- if (!GoodDataFileName(word2))
- I_Error("Maincfg: bad data file name '%s'\n", word2);
-
- G_SaveGameData();
- strlcpy(gamedatafilename, word2, sizeof (gamedatafilename));
- strlwr(gamedatafilename);
- savemoddata = true;
-
- // Also save a time attack folder
- filenamelen = strlen(gamedatafilename)-4; // Strip off the extension
- strncpy(timeattackfolder, gamedatafilename, min(filenamelen, sizeof (timeattackfolder)));
- timeattackfolder[min(filenamelen, sizeof (timeattackfolder) - 1)] = '\0';
-
- strcpy(savegamename, timeattackfolder);
- strlcat(savegamename, "%u.ssg", sizeof(savegamename));
- // can't use sprintf since there is %u in savegamename
- strcatbf(savegamename, srb2home, PATHSEP);
-
- strcpy(liveeventbackup, va("live%s.bkp", timeattackfolder));
- strcatbf(liveeventbackup, srb2home, PATHSEP);
-
- gamedataadded = true;
- titlechanged = true;
- }
- else if (fastcmp(word, "RESETDATA"))
- {
- P_ResetData(value);
- titlechanged = true;
- }
- else if (fastcmp(word, "CUSTOMVERSION"))
- {
- strlcpy(customversionstring, word2, sizeof (customversionstring));
- //titlechanged = true;
- }
- else if (fastcmp(word, "BOOTMAP"))
- {
- // Support using the actual map name,
- // i.e., Level AB, Level FZ, etc.
-
- // Convert to map number
- if (word2[0] >= 'A' && word2[0] <= 'Z')
- value = M_MapNumber(word2[0], word2[1]);
- else
- value = get_number(word2);
-
- bootmap = (INT16)value;
- //titlechanged = true;
- }
- else if (fastcmp(word, "STARTCHAR"))
- {
- startchar = (INT16)value;
- char_on = -1;
- }
- else if (fastcmp(word, "TUTORIALMAP"))
- {
- // Support using the actual map name,
- // i.e., Level AB, Level FZ, etc.
-
- // Convert to map number
- if (word2[0] >= 'A' && word2[0] <= 'Z')
- value = M_MapNumber(word2[0], word2[1]);
- else
- value = get_number(word2);
-
- tutorialmap = (INT16)value;
- }
- else
- deh_warning("Maincfg: unknown word '%s'", word);
- }
- } while (!myfeof(f));
-
- Z_Free(s);
-}
-
-static void readwipes(MYFILE *f)
-{
- char *s = Z_Malloc(MAXLINELEN, PU_STATIC, NULL);
- char *word = s;
- char *pword = word;
- char *word2;
- char *tmp;
- INT32 value;
- INT32 wipeoffset;
-
- do
- {
- if (myfgets(s, MAXLINELEN, f))
- {
- if (s[0] == '\n')
- break;
-
- // First remove trailing newline, if there is one
- tmp = strchr(s, '\n');
- if (tmp)
- *tmp = '\0';
-
- tmp = strchr(s, '#');
- if (tmp)
- *tmp = '\0';
- if (s == tmp)
- continue; // Skip comment lines, but don't break.
-
- // Get the part before the " = "
- tmp = strchr(s, '=');
- if (tmp)
- *(tmp-1) = '\0';
- else
- break;
- strupr(word);
-
- // Now get the part after
- word2 = tmp += 2;
- value = atoi(word2); // used for numerical settings
-
- if (value < -1 || value > 99)
- {
- deh_warning("Wipes: bad value '%s'", word2);
- continue;
- }
- else if (value == -1)
- value = UINT8_MAX;
-
- // error catching
- wipeoffset = -1;
-
- if (fastncmp(word, "LEVEL_", 6))
- {
- pword = word + 6;
- if (fastcmp(pword, "TOBLACK"))
- wipeoffset = wipe_level_toblack;
- else if (fastcmp(pword, "FINAL"))
- wipeoffset = wipe_level_final;
- }
- else if (fastncmp(word, "INTERMISSION_", 13))
- {
- pword = word + 13;
- if (fastcmp(pword, "TOBLACK"))
- wipeoffset = wipe_intermission_toblack;
- else if (fastcmp(pword, "FINAL"))
- wipeoffset = wipe_intermission_final;
- }
- else if (fastncmp(word, "SPECINTER_", 10))
- {
- pword = word + 10;
- if (fastcmp(pword, "TOBLACK"))
- wipeoffset = wipe_specinter_toblack;
- else if (fastcmp(pword, "FINAL"))
- wipeoffset = wipe_specinter_final;
- }
- else if (fastncmp(word, "MULTINTER_", 10))
- {
- pword = word + 10;
- if (fastcmp(pword, "TOBLACK"))
- wipeoffset = wipe_multinter_toblack;
- else if (fastcmp(pword, "FINAL"))
- wipeoffset = wipe_multinter_final;
- }
- else if (fastncmp(word, "CONTINUING_", 11))
- {
- pword = word + 11;
- if (fastcmp(pword, "TOBLACK"))
- wipeoffset = wipe_continuing_toblack;
- else if (fastcmp(pword, "FINAL"))
- wipeoffset = wipe_continuing_final;
- }
- else if (fastncmp(word, "TITLESCREEN_", 12))
- {
- pword = word + 12;
- if (fastcmp(pword, "TOBLACK"))
- wipeoffset = wipe_titlescreen_toblack;
- else if (fastcmp(pword, "FINAL"))
- wipeoffset = wipe_titlescreen_final;
- }
- else if (fastncmp(word, "TIMEATTACK_", 11))
- {
- pword = word + 11;
- if (fastcmp(pword, "TOBLACK"))
- wipeoffset = wipe_timeattack_toblack;
- else if (fastcmp(pword, "FINAL"))
- wipeoffset = wipe_timeattack_final;
- }
- else if (fastncmp(word, "CREDITS_", 8))
- {
- pword = word + 8;
- if (fastcmp(pword, "TOBLACK"))
- wipeoffset = wipe_credits_toblack;
- else if (fastcmp(pword, "FINAL"))
- wipeoffset = wipe_credits_final;
- else if (fastcmp(pword, "INTERMEDIATE"))
- wipeoffset = wipe_credits_intermediate;
- }
- else if (fastncmp(word, "EVALUATION_", 11))
- {
- pword = word + 11;
- if (fastcmp(pword, "TOBLACK"))
- wipeoffset = wipe_evaluation_toblack;
- else if (fastcmp(pword, "FINAL"))
- wipeoffset = wipe_evaluation_final;
- }
- else if (fastncmp(word, "GAMEEND_", 8))
- {
- pword = word + 8;
- if (fastcmp(pword, "TOBLACK"))
- wipeoffset = wipe_gameend_toblack;
- else if (fastcmp(pword, "FINAL"))
- wipeoffset = wipe_gameend_final;
- }
- else if (fastncmp(word, "SPECLEVEL_", 10))
- {
- pword = word + 10;
- if (fastcmp(pword, "TOWHITE"))
- wipeoffset = wipe_speclevel_towhite;
- }
-
- if (wipeoffset < 0)
- {
- deh_warning("Wipes: unknown word '%s'", word);
- continue;
- }
-
- if (value == UINT8_MAX
- && (wipeoffset <= wipe_level_toblack || wipeoffset >= wipe_speclevel_towhite))
- {
- // Cannot disable non-toblack wipes
- // (or the level toblack wipe, or the special towhite wipe)
- deh_warning("Wipes: can't disable wipe of type '%s'", word);
- continue;
- }
-
- wipedefs[wipeoffset] = (UINT8)value;
- }
- } while (!myfeof(f));
-
- Z_Free(s);
-}
-
-// Used when you do something invalid like read a bad item number
-// to prevent extra unnecessary errors
-static void ignorelines(MYFILE *f)
-{
- char *s = Z_Malloc(MAXLINELEN, PU_STATIC, NULL);
- do
- {
- if (myfgets(s, MAXLINELEN, f))
- {
- if (s[0] == '\n')
- break;
- }
- } while (!myfeof(f));
- Z_Free(s);
-}
-
-static void DEH_LoadDehackedFile(MYFILE *f, boolean mainfile)
-{
- char *s = Z_Malloc(MAXLINELEN, PU_STATIC, NULL);
- char textline[MAXLINELEN];
- char *word;
- char *word2;
- INT32 i;
-
- if (!deh_loaded)
- initfreeslots();
-
- deh_num_warning = 0;
-
- gamedataadded = titlechanged = introchanged = false;
-
- // it doesn't test the version of SRB2 and version of dehacked file
- dbg_line = -1; // start at -1 so the first line is 0.
- while (!myfeof(f))
- {
- char origpos[128];
- INT32 size = 0;
- char *traverse;
-
- myfgets(s, MAXLINELEN, f);
- memcpy(textline, s, MAXLINELEN);
- if (s[0] == '\n' || s[0] == '#')
- continue;
-
- traverse = s;
-
- while (traverse[0] != '\n')
- {
- traverse++;
- size++;
- }
-
- strncpy(origpos, s, size);
- origpos[size] = '\0';
-
- if (NULL != (word = strtok(s, " "))) {
- strupr(word);
- if (word[strlen(word)-1] == '\n')
- word[strlen(word)-1] = '\0';
- }
- if (word)
- {
- if (fastcmp(word, "FREESLOT"))
- {
- readfreeslots(f);
- continue;
- }
- else if (fastcmp(word, "MAINCFG"))
- {
- readmaincfg(f);
- continue;
- }
- else if (fastcmp(word, "WIPES"))
- {
- readwipes(f);
- continue;
- }
- word2 = strtok(NULL, " ");
- if (word2) {
- strupr(word2);
- if (word2[strlen(word2) - 1] == '\n')
- word2[strlen(word2) - 1] = '\0';
- i = atoi(word2);
- }
- else
- i = 0;
- if (fastcmp(word, "CHARACTER"))
- {
- if (i >= 0 && i < 32)
- readPlayer(f, i);
- else
- {
- deh_warning("Character %d out of range (0 - 31)", i);
- ignorelines(f);
- }
- continue;
- }
- else if (fastcmp(word, "EMBLEM"))
- {
- if (!mainfile && !gamedataadded)
- {
- deh_warning("You must define a custom gamedata to use \"%s\"", word);
- ignorelines(f);
- }
- else
- {
- if (!word2)
- i = numemblems + 1;
-
- if (i > 0 && i <= MAXEMBLEMS)
- {
- if (numemblems < i)
- numemblems = i;
- reademblemdata(f, i);
- }
- else
- {
- deh_warning("Emblem number %d out of range (1 - %d)", i, MAXEMBLEMS);
- ignorelines(f);
- }
- }
- continue;
- }
- else if (fastcmp(word, "EXTRAEMBLEM"))
- {
- if (!mainfile && !gamedataadded)
- {
- deh_warning("You must define a custom gamedata to use \"%s\"", word);
- ignorelines(f);
- }
- else
- {
- if (!word2)
- i = numextraemblems + 1;
-
- if (i > 0 && i <= MAXEXTRAEMBLEMS)
- {
- if (numextraemblems < i)
- numextraemblems = i;
- readextraemblemdata(f, i);
- }
- else
- {
- deh_warning("Extra emblem number %d out of range (1 - %d)", i, MAXEXTRAEMBLEMS);
- ignorelines(f);
- }
- }
- continue;
- }
- if (word2)
- {
- if (fastcmp(word, "THING") || fastcmp(word, "MOBJ") || fastcmp(word, "OBJECT"))
- {
- if (i == 0 && word2[0] != '0') // If word2 isn't a number
- i = get_mobjtype(word2); // find a thing by name
- if (i < NUMMOBJTYPES && i > 0)
- readthing(f, i);
- else
- {
- deh_warning("Thing %d out of range (1 - %d)", i, NUMMOBJTYPES-1);
- ignorelines(f);
- }
- }
- else if (fastcmp(word, "SKINCOLOR") || fastcmp(word, "COLOR"))
- {
- if (i == 0 && word2[0] != '0') // If word2 isn't a number
- i = get_skincolor(word2); // find a skincolor by name
- if (i && i < numskincolors)
- readskincolor(f, i);
- else
- {
- deh_warning("Skincolor %d out of range (1 - %d)", i, numskincolors-1);
- ignorelines(f);
- }
- }
- else if (fastcmp(word, "SPRITE2"))
- {
- if (i == 0 && word2[0] != '0') // If word2 isn't a number
- i = get_sprite2(word2); // find a sprite by name
- if (i < (INT32)free_spr2 && i >= (INT32)SPR2_FIRSTFREESLOT)
- readsprite2(f, i);
- else
- {
- deh_warning("Sprite2 number %d out of range (%d - %d)", i, SPR2_FIRSTFREESLOT, free_spr2-1);
- ignorelines(f);
- }
- }
-#ifdef HWRENDER
- else if (fastcmp(word, "LIGHT"))
- {
- // TODO: Read lights by name
- if (i > 0 && i < NUMLIGHTS)
- readlight(f, i);
- else
- {
- deh_warning("Light number %d out of range (1 - %d)", i, NUMLIGHTS-1);
- ignorelines(f);
- }
- }
-#endif
- else if (fastcmp(word, "SPRITE") || fastcmp(word, "SPRITEINFO"))
- {
- if (i == 0 && word2[0] != '0') // If word2 isn't a number
- i = get_sprite(word2); // find a sprite by name
- if (i < NUMSPRITES && i > 0)
- readspriteinfo(f, i, false);
- else
- {
- deh_warning("Sprite number %d out of range (0 - %d)", i, NUMSPRITES-1);
- ignorelines(f);
- }
- }
- else if (fastcmp(word, "SPRITE2INFO"))
- {
- if (i == 0 && word2[0] != '0') // If word2 isn't a number
- i = get_sprite2(word2); // find a sprite by name
- if (i < NUMPLAYERSPRITES && i >= 0)
- readspriteinfo(f, i, true);
- else
- {
- deh_warning("Sprite2 number %d out of range (0 - %d)", i, NUMPLAYERSPRITES-1);
- ignorelines(f);
- }
- }
- else if (fastcmp(word, "LEVEL"))
- {
- // Support using the actual map name,
- // i.e., Level AB, Level FZ, etc.
-
- // Convert to map number
- if (word2[0] >= 'A' && word2[0] <= 'Z')
- i = M_MapNumber(word2[0], word2[1]);
-
- if (i > 0 && i <= NUMMAPS)
- readlevelheader(f, i);
- else
- {
- deh_warning("Level number %d out of range (1 - %d)", i, NUMMAPS);
- ignorelines(f);
- }
- }
- else if (fastcmp(word, "GAMETYPE"))
- {
- // Get the gametype name from textline
- // instead of word2, so that gametype names
- // aren't allcaps
- INT32 c;
- for (c = 0; c < MAXLINELEN; c++)
- {
- if (textline[c] == '\0')
- break;
- if (textline[c] == ' ')
- {
- char *gtname = (textline+c+1);
- if (gtname)
- {
- // remove funny characters
- INT32 j;
- for (j = 0; j < (MAXLINELEN - c); j++)
- {
- if (gtname[j] == '\0')
- break;
- if (gtname[j] < 32)
- gtname[j] = '\0';
- }
- readgametype(f, gtname);
- }
- break;
- }
- }
- }
- else if (fastcmp(word, "CUTSCENE"))
- {
- if (i > 0 && i < 129)
- readcutscene(f, i - 1);
- else
- {
- deh_warning("Cutscene number %d out of range (1 - 128)", i);
- ignorelines(f);
- }
- }
- else if (fastcmp(word, "PROMPT"))
- {
- if (i > 0 && i < MAX_PROMPTS)
- readtextprompt(f, i - 1);
- else
- {
- deh_warning("Prompt number %d out of range (1 - %d)", i, MAX_PROMPTS);
- ignorelines(f);
- }
- }
- else if (fastcmp(word, "FRAME") || fastcmp(word, "STATE"))
- {
- if (i == 0 && word2[0] != '0') // If word2 isn't a number
- i = get_state(word2); // find a state by name
- if (i < NUMSTATES && i >= 0)
- readframe(f, i);
- else
- {
- deh_warning("Frame %d out of range (0 - %d)", i, NUMSTATES-1);
- ignorelines(f);
- }
- }
- else if (fastcmp(word, "SOUND"))
- {
- if (i == 0 && word2[0] != '0') // If word2 isn't a number
- i = get_sfx(word2); // find a sound by name
- if (i < NUMSFX && i > 0)
- readsound(f, i);
- else
- {
- deh_warning("Sound %d out of range (1 - %d)", i, NUMSFX-1);
- ignorelines(f);
- }
- }
- else if (fastcmp(word, "HUDITEM"))
- {
- if (i == 0 && word2[0] != '0') // If word2 isn't a number
- i = get_huditem(word2); // find a huditem by name
- if (i >= 0 && i < NUMHUDITEMS)
- readhuditem(f, i);
- else
- {
- deh_warning("HUD item number %d out of range (0 - %d)", i, NUMHUDITEMS-1);
- ignorelines(f);
- }
- }
- else if (fastcmp(word, "MENU"))
- {
- if (i == 0 && word2[0] != '0') // If word2 isn't a number
- i = get_menutype(word2); // find a huditem by name
- if (i >= 1 && i < NUMMENUTYPES)
- readmenu(f, i);
- else
- {
- // zero-based, but let's start at 1
- deh_warning("Menu number %d out of range (1 - %d)", i, NUMMENUTYPES-1);
- ignorelines(f);
- }
- }
- else if (fastcmp(word, "UNLOCKABLE"))
- {
- if (!mainfile && !gamedataadded)
- {
- deh_warning("You must define a custom gamedata to use \"%s\"", word);
- ignorelines(f);
- }
- else if (i > 0 && i <= MAXUNLOCKABLES)
- readunlockable(f, i - 1);
- else
- {
- deh_warning("Unlockable number %d out of range (1 - %d)", i, MAXUNLOCKABLES);
- ignorelines(f);
- }
- }
- else if (fastcmp(word, "CONDITIONSET"))
- {
- if (!mainfile && !gamedataadded)
- {
- deh_warning("You must define a custom gamedata to use \"%s\"", word);
- ignorelines(f);
- }
- else if (i > 0 && i <= MAXCONDITIONSETS)
- readconditionset(f, (UINT8)i);
- else
- {
- deh_warning("Condition set number %d out of range (1 - %d)", i, MAXCONDITIONSETS);
- ignorelines(f);
- }
- }
- else if (fastcmp(word, "SRB2"))
- {
- if (isdigit(word2[0]))
- {
- i = atoi(word2);
- if (i != PATCHVERSION)
- {
- deh_warning(
- "Patch is for SRB2 version %d, "
- "only version %d is supported",
- i,
- PATCHVERSION
- );
- }
- }
- else
- {
- deh_warning(
- "SRB2 version definition has incorrect format, "
- "use \"SRB2 %d\"",
- PATCHVERSION
- );
- }
- }
- // Clear all data in certain locations (mostly for unlocks)
- // Unless you REALLY want to piss people off,
- // define a custom gamedata /before/ doing this!!
- // (then again, modifiedgame will prevent game data saving anyway)
- else if (fastcmp(word, "CLEAR"))
- {
- boolean clearall = (fastcmp(word2, "ALL"));
-
- if (!mainfile && !gamedataadded)
- {
- deh_warning("You must define a custom gamedata to use \"%s\"", word);
- continue;
- }
-
- if (clearall || fastcmp(word2, "UNLOCKABLES"))
- memset(&unlockables, 0, sizeof(unlockables));
-
- if (clearall || fastcmp(word2, "EMBLEMS"))
- {
- memset(&emblemlocations, 0, sizeof(emblemlocations));
- numemblems = 0;
- }
-
- if (clearall || fastcmp(word2, "EXTRAEMBLEMS"))
- {
- memset(&extraemblems, 0, sizeof(extraemblems));
- numextraemblems = 0;
- }
-
- if (clearall || fastcmp(word2, "CONDITIONSETS"))
- clear_conditionsets();
-
- if (clearall || fastcmp(word2, "LEVELS"))
- clear_levels();
- }
- else
- deh_warning("Unknown word: %s", word);
- }
- else
- deh_warning("missing argument for '%s'", word);
- }
- else
- deh_warning("No word in this line: %s", s);
- } // end while
-
- if (gamedataadded)
- G_LoadGameData();
-
- if (gamestate == GS_TITLESCREEN)
- {
- if (introchanged)
- {
- menuactive = false;
- I_UpdateMouseGrab();
- COM_BufAddText("playintro");
- }
- else if (titlechanged)
- {
- menuactive = false;
- I_UpdateMouseGrab();
- COM_BufAddText("exitgame"); // Command_ExitGame_f() but delayed
- }
- }
-
- dbg_line = -1;
- if (deh_num_warning)
- {
- CONS_Printf(M_GetText("%d warning%s in the SOC lump\n"), deh_num_warning, deh_num_warning == 1 ? "" : "s");
- if (devparm) {
- I_Error("%s%s",va(M_GetText("%d warning%s in the SOC lump\n"), deh_num_warning, deh_num_warning == 1 ? "" : "s"), M_GetText("See log.txt for details.\n"));
- //while (!I_GetKey())
- //I_OsPolling();
- }
- }
-
- deh_loaded = true;
- Z_Free(s);
-}
-
-// read dehacked lump in a wad (there is special trick for for deh
-// file that are converted to wad in w_wad.c)
-void DEH_LoadDehackedLumpPwad(UINT16 wad, UINT16 lump, boolean mainfile)
-{
- MYFILE f;
- f.wad = wad;
- f.size = W_LumpLengthPwad(wad, lump);
- f.data = Z_Malloc(f.size + 1, PU_STATIC, NULL);
- W_ReadLumpPwad(wad, lump, f.data);
- f.curpos = f.data;
- f.data[f.size] = 0;
- DEH_LoadDehackedFile(&f, mainfile);
- Z_Free(f.data);
-}
-
-void DEH_LoadDehackedLump(lumpnum_t lumpnum)
-{
- DEH_LoadDehackedLumpPwad(WADFILENUM(lumpnum),LUMPNUM(lumpnum), false);
-}
-
-////////////////////////////////////////////////////////////////////////////////
-// CRAZY LIST OF STATE NAMES AND ALL FROM HERE DOWN
-// TODO: Make this all a seperate file or something, like part of info.c??
-// TODO: Read the list from a text lump in a WAD as necessary instead
-// or something, don't just keep it all in memory like this.
-// TODO: Make the lists public so we can start using actual mobj
-// and state names in warning and error messages! :D
-
-// RegEx to generate this from info.h: ^\tS_([^,]+), --> \t"S_\1",
-// I am leaving the prefixes solely for clarity to programmers,
-// because sadly no one remembers this place while searching for full state names.
-static const char *const STATE_LIST[] = { // array length left dynamic for sanity testing later.
- "S_NULL",
- "S_UNKNOWN",
- "S_INVISIBLE", // state for invisible sprite
-
- "S_SPAWNSTATE",
- "S_SEESTATE",
- "S_MELEESTATE",
- "S_MISSILESTATE",
- "S_DEATHSTATE",
- "S_XDEATHSTATE",
- "S_RAISESTATE",
-
- // Thok
- "S_THOK",
-
- // Player
- "S_PLAY_STND",
- "S_PLAY_WAIT",
- "S_PLAY_WALK",
- "S_PLAY_SKID",
- "S_PLAY_RUN",
- "S_PLAY_DASH",
- "S_PLAY_PAIN",
- "S_PLAY_STUN",
- "S_PLAY_DEAD",
- "S_PLAY_DRWN",
- "S_PLAY_ROLL",
- "S_PLAY_GASP",
- "S_PLAY_JUMP",
- "S_PLAY_SPRING",
- "S_PLAY_FALL",
- "S_PLAY_EDGE",
- "S_PLAY_RIDE",
-
- // CA2_SPINDASH
- "S_PLAY_SPINDASH",
-
- // CA_FLY/SWIM
- "S_PLAY_FLY",
- "S_PLAY_SWIM",
- "S_PLAY_FLY_TIRED",
-
- // CA_GLIDEANDCLIMB
- "S_PLAY_GLIDE",
- "S_PLAY_GLIDE_LANDING",
- "S_PLAY_CLING",
- "S_PLAY_CLIMB",
-
- // CA_FLOAT/CA_SLOWFALL
- "S_PLAY_FLOAT",
- "S_PLAY_FLOAT_RUN",
-
- // CA_BOUNCE
- "S_PLAY_BOUNCE",
- "S_PLAY_BOUNCE_LANDING",
-
- // CA2_GUNSLINGER
- "S_PLAY_FIRE",
- "S_PLAY_FIRE_FINISH",
-
- // CA_TWINSPIN
- "S_PLAY_TWINSPIN",
-
- // CA2_MELEE
- "S_PLAY_MELEE",
- "S_PLAY_MELEE_FINISH",
- "S_PLAY_MELEE_LANDING",
-
- // SF_SUPER
- "S_PLAY_SUPER_TRANS1",
- "S_PLAY_SUPER_TRANS2",
- "S_PLAY_SUPER_TRANS3",
- "S_PLAY_SUPER_TRANS4",
- "S_PLAY_SUPER_TRANS5",
- "S_PLAY_SUPER_TRANS6",
-
- // technically the player goes here but it's an infinite tic state
- "S_OBJPLACE_DUMMY",
-
- // 1-Up Box Sprites overlay (uses player sprite)
- "S_PLAY_BOX1",
- "S_PLAY_BOX2",
- "S_PLAY_ICON1",
- "S_PLAY_ICON2",
- "S_PLAY_ICON3",
-
- // Level end sign overlay (uses player sprite)
- "S_PLAY_SIGN",
-
- // NiGHTS character (uses player sprite)
- "S_PLAY_NIGHTS_TRANS1",
- "S_PLAY_NIGHTS_TRANS2",
- "S_PLAY_NIGHTS_TRANS3",
- "S_PLAY_NIGHTS_TRANS4",
- "S_PLAY_NIGHTS_TRANS5",
- "S_PLAY_NIGHTS_TRANS6",
- "S_PLAY_NIGHTS_STAND",
- "S_PLAY_NIGHTS_FLOAT",
- "S_PLAY_NIGHTS_FLY",
- "S_PLAY_NIGHTS_DRILL",
- "S_PLAY_NIGHTS_STUN",
- "S_PLAY_NIGHTS_PULL",
- "S_PLAY_NIGHTS_ATTACK",
-
- // c:
- "S_TAILSOVERLAY_STAND",
- "S_TAILSOVERLAY_0DEGREES",
- "S_TAILSOVERLAY_PLUS30DEGREES",
- "S_TAILSOVERLAY_PLUS60DEGREES",
- "S_TAILSOVERLAY_MINUS30DEGREES",
- "S_TAILSOVERLAY_MINUS60DEGREES",
- "S_TAILSOVERLAY_RUN",
- "S_TAILSOVERLAY_FLY",
- "S_TAILSOVERLAY_TIRE",
- "S_TAILSOVERLAY_PAIN",
- "S_TAILSOVERLAY_GASP",
- "S_TAILSOVERLAY_EDGE",
-
- // [:
- "S_JETFUMEFLASH",
-
- // Blue Crawla
- "S_POSS_STND",
- "S_POSS_RUN1",
- "S_POSS_RUN2",
- "S_POSS_RUN3",
- "S_POSS_RUN4",
- "S_POSS_RUN5",
- "S_POSS_RUN6",
-
- // Red Crawla
- "S_SPOS_STND",
- "S_SPOS_RUN1",
- "S_SPOS_RUN2",
- "S_SPOS_RUN3",
- "S_SPOS_RUN4",
- "S_SPOS_RUN5",
- "S_SPOS_RUN6",
-
- // Greenflower Fish
- "S_FISH1",
- "S_FISH2",
- "S_FISH3",
- "S_FISH4",
-
- // Buzz (Gold)
- "S_BUZZLOOK1",
- "S_BUZZLOOK2",
- "S_BUZZFLY1",
- "S_BUZZFLY2",
-
- // Buzz (Red)
- "S_RBUZZLOOK1",
- "S_RBUZZLOOK2",
- "S_RBUZZFLY1",
- "S_RBUZZFLY2",
-
- // Jetty-Syn Bomber
- "S_JETBLOOK1",
- "S_JETBLOOK2",
- "S_JETBZOOM1",
- "S_JETBZOOM2",
-
- // Jetty-Syn Gunner
- "S_JETGLOOK1",
- "S_JETGLOOK2",
- "S_JETGZOOM1",
- "S_JETGZOOM2",
- "S_JETGSHOOT1",
- "S_JETGSHOOT2",
-
- // Crawla Commander
- "S_CCOMMAND1",
- "S_CCOMMAND2",
- "S_CCOMMAND3",
- "S_CCOMMAND4",
-
- // Deton
- "S_DETON1",
- "S_DETON2",
- "S_DETON3",
- "S_DETON4",
- "S_DETON5",
- "S_DETON6",
- "S_DETON7",
- "S_DETON8",
- "S_DETON9",
- "S_DETON10",
- "S_DETON11",
- "S_DETON12",
- "S_DETON13",
- "S_DETON14",
- "S_DETON15",
-
- // Skim Mine Dropper
- "S_SKIM1",
- "S_SKIM2",
- "S_SKIM3",
- "S_SKIM4",
-
- // THZ Turret
- "S_TURRET",
- "S_TURRETFIRE",
- "S_TURRETSHOCK1",
- "S_TURRETSHOCK2",
- "S_TURRETSHOCK3",
- "S_TURRETSHOCK4",
- "S_TURRETSHOCK5",
- "S_TURRETSHOCK6",
- "S_TURRETSHOCK7",
- "S_TURRETSHOCK8",
- "S_TURRETSHOCK9",
-
- // Popup Turret
- "S_TURRETLOOK",
- "S_TURRETSEE",
- "S_TURRETPOPUP1",
- "S_TURRETPOPUP2",
- "S_TURRETPOPUP3",
- "S_TURRETPOPUP4",
- "S_TURRETPOPUP5",
- "S_TURRETPOPUP6",
- "S_TURRETPOPUP7",
- "S_TURRETPOPUP8",
- "S_TURRETSHOOT",
- "S_TURRETPOPDOWN1",
- "S_TURRETPOPDOWN2",
- "S_TURRETPOPDOWN3",
- "S_TURRETPOPDOWN4",
- "S_TURRETPOPDOWN5",
- "S_TURRETPOPDOWN6",
- "S_TURRETPOPDOWN7",
- "S_TURRETPOPDOWN8",
-
- // Spincushion
- "S_SPINCUSHION_LOOK",
- "S_SPINCUSHION_CHASE1",
- "S_SPINCUSHION_CHASE2",
- "S_SPINCUSHION_CHASE3",
- "S_SPINCUSHION_CHASE4",
- "S_SPINCUSHION_AIM1",
- "S_SPINCUSHION_AIM2",
- "S_SPINCUSHION_AIM3",
- "S_SPINCUSHION_AIM4",
- "S_SPINCUSHION_AIM5",
- "S_SPINCUSHION_SPIN1",
- "S_SPINCUSHION_SPIN2",
- "S_SPINCUSHION_SPIN3",
- "S_SPINCUSHION_SPIN4",
- "S_SPINCUSHION_STOP1",
- "S_SPINCUSHION_STOP2",
- "S_SPINCUSHION_STOP3",
- "S_SPINCUSHION_STOP4",
-
- // Crushstacean
- "S_CRUSHSTACEAN_ROAM1",
- "S_CRUSHSTACEAN_ROAM2",
- "S_CRUSHSTACEAN_ROAM3",
- "S_CRUSHSTACEAN_ROAM4",
- "S_CRUSHSTACEAN_ROAMPAUSE",
- "S_CRUSHSTACEAN_PUNCH1",
- "S_CRUSHSTACEAN_PUNCH2",
- "S_CRUSHCLAW_AIM",
- "S_CRUSHCLAW_OUT",
- "S_CRUSHCLAW_STAY",
- "S_CRUSHCLAW_IN",
- "S_CRUSHCLAW_WAIT",
- "S_CRUSHCHAIN",
-
- // Banpyura
- "S_BANPYURA_ROAM1",
- "S_BANPYURA_ROAM2",
- "S_BANPYURA_ROAM3",
- "S_BANPYURA_ROAM4",
- "S_BANPYURA_ROAMPAUSE",
- "S_CDIAG1",
- "S_CDIAG2",
- "S_CDIAG3",
- "S_CDIAG4",
- "S_CDIAG5",
- "S_CDIAG6",
- "S_CDIAG7",
- "S_CDIAG8",
-
- // Jet Jaw
- "S_JETJAW_ROAM1",
- "S_JETJAW_ROAM2",
- "S_JETJAW_ROAM3",
- "S_JETJAW_ROAM4",
- "S_JETJAW_ROAM5",
- "S_JETJAW_ROAM6",
- "S_JETJAW_ROAM7",
- "S_JETJAW_ROAM8",
- "S_JETJAW_CHOMP1",
- "S_JETJAW_CHOMP2",
- "S_JETJAW_CHOMP3",
- "S_JETJAW_CHOMP4",
- "S_JETJAW_CHOMP5",
- "S_JETJAW_CHOMP6",
- "S_JETJAW_CHOMP7",
- "S_JETJAW_CHOMP8",
- "S_JETJAW_CHOMP9",
- "S_JETJAW_CHOMP10",
- "S_JETJAW_CHOMP11",
- "S_JETJAW_CHOMP12",
- "S_JETJAW_CHOMP13",
- "S_JETJAW_CHOMP14",
- "S_JETJAW_CHOMP15",
- "S_JETJAW_CHOMP16",
- "S_JETJAW_SOUND",
-
- // Snailer
- "S_SNAILER1",
- "S_SNAILER_FLICKY",
-
- // Vulture
- "S_VULTURE_STND",
- "S_VULTURE_DRIFT",
- "S_VULTURE_ZOOM1",
- "S_VULTURE_ZOOM2",
- "S_VULTURE_STUNNED",
-
- // Pointy
- "S_POINTY1",
- "S_POINTYBALL1",
-
- // Robo-Hood
- "S_ROBOHOOD_LOOK",
- "S_ROBOHOOD_STAND",
- "S_ROBOHOOD_FIRE1",
- "S_ROBOHOOD_FIRE2",
- "S_ROBOHOOD_JUMP1",
- "S_ROBOHOOD_JUMP2",
- "S_ROBOHOOD_JUMP3",
-
- // Castlebot Facestabber
- "S_FACESTABBER_STND1",
- "S_FACESTABBER_STND2",
- "S_FACESTABBER_STND3",
- "S_FACESTABBER_STND4",
- "S_FACESTABBER_STND5",
- "S_FACESTABBER_STND6",
- "S_FACESTABBER_CHARGE1",
- "S_FACESTABBER_CHARGE2",
- "S_FACESTABBER_CHARGE3",
- "S_FACESTABBER_CHARGE4",
- "S_FACESTABBER_PAIN",
- "S_FACESTABBER_DIE1",
- "S_FACESTABBER_DIE2",
- "S_FACESTABBER_DIE3",
- "S_FACESTABBERSPEAR",
-
- // Egg Guard
- "S_EGGGUARD_STND",
- "S_EGGGUARD_WALK1",
- "S_EGGGUARD_WALK2",
- "S_EGGGUARD_WALK3",
- "S_EGGGUARD_WALK4",
- "S_EGGGUARD_MAD1",
- "S_EGGGUARD_MAD2",
- "S_EGGGUARD_MAD3",
- "S_EGGGUARD_RUN1",
- "S_EGGGUARD_RUN2",
- "S_EGGGUARD_RUN3",
- "S_EGGGUARD_RUN4",
-
- // Egg Shield for Egg Guard
- "S_EGGSHIELD",
- "S_EGGSHIELDBREAK",
-
- // Green Snapper
- "S_SNAPPER_SPAWN",
- "S_SNAPPER_SPAWN2",
- "S_GSNAPPER_STND",
- "S_GSNAPPER1",
- "S_GSNAPPER2",
- "S_GSNAPPER3",
- "S_GSNAPPER4",
- "S_SNAPPER_XPLD",
- "S_SNAPPER_LEG",
- "S_SNAPPER_LEGRAISE",
- "S_SNAPPER_HEAD",
-
- // Minus
- "S_MINUS_INIT",
- "S_MINUS_STND",
- "S_MINUS_DIGGING1",
- "S_MINUS_DIGGING2",
- "S_MINUS_DIGGING3",
- "S_MINUS_DIGGING4",
- "S_MINUS_BURST0",
- "S_MINUS_BURST1",
- "S_MINUS_BURST2",
- "S_MINUS_BURST3",
- "S_MINUS_BURST4",
- "S_MINUS_BURST5",
- "S_MINUS_POPUP",
- "S_MINUS_AERIAL1",
- "S_MINUS_AERIAL2",
- "S_MINUS_AERIAL3",
- "S_MINUS_AERIAL4",
-
- // Minus dirt
- "S_MINUSDIRT1",
- "S_MINUSDIRT2",
- "S_MINUSDIRT3",
- "S_MINUSDIRT4",
- "S_MINUSDIRT5",
- "S_MINUSDIRT6",
- "S_MINUSDIRT7",
-
- // Spring Shell
- "S_SSHELL_STND",
- "S_SSHELL_RUN1",
- "S_SSHELL_RUN2",
- "S_SSHELL_RUN3",
- "S_SSHELL_RUN4",
- "S_SSHELL_SPRING1",
- "S_SSHELL_SPRING2",
- "S_SSHELL_SPRING3",
- "S_SSHELL_SPRING4",
-
- // Spring Shell (yellow)
- "S_YSHELL_STND",
- "S_YSHELL_RUN1",
- "S_YSHELL_RUN2",
- "S_YSHELL_RUN3",
- "S_YSHELL_RUN4",
- "S_YSHELL_SPRING1",
- "S_YSHELL_SPRING2",
- "S_YSHELL_SPRING3",
- "S_YSHELL_SPRING4",
-
- // Unidus
- "S_UNIDUS_STND",
- "S_UNIDUS_RUN",
- "S_UNIDUS_BALL",
-
- // Canarivore
- "S_CANARIVORE_LOOK",
- "S_CANARIVORE_AWAKEN1",
- "S_CANARIVORE_AWAKEN2",
- "S_CANARIVORE_AWAKEN3",
- "S_CANARIVORE_GAS1",
- "S_CANARIVORE_GAS2",
- "S_CANARIVORE_GAS3",
- "S_CANARIVORE_GAS4",
- "S_CANARIVORE_GAS5",
- "S_CANARIVORE_GASREPEAT",
- "S_CANARIVORE_CLOSE1",
- "S_CANARIVORE_CLOSE2",
- "S_CANARIVOREGAS_1",
- "S_CANARIVOREGAS_2",
- "S_CANARIVOREGAS_3",
- "S_CANARIVOREGAS_4",
- "S_CANARIVOREGAS_5",
- "S_CANARIVOREGAS_6",
- "S_CANARIVOREGAS_7",
- "S_CANARIVOREGAS_8",
-
- // Pyre Fly
- "S_PYREFLY_FLY",
- "S_PYREFLY_BURN",
- "S_PYREFIRE1",
- "S_PYREFIRE2",
-
- // Pterabyte
- "S_PTERABYTESPAWNER",
- "S_PTERABYTEWAYPOINT",
- "S_PTERABYTE_FLY1",
- "S_PTERABYTE_FLY2",
- "S_PTERABYTE_FLY3",
- "S_PTERABYTE_FLY4",
- "S_PTERABYTE_SWOOPDOWN",
- "S_PTERABYTE_SWOOPUP",
-
- // Dragonbomber
- "S_DRAGONBOMBER",
- "S_DRAGONWING1",
- "S_DRAGONWING2",
- "S_DRAGONWING3",
- "S_DRAGONWING4",
- "S_DRAGONTAIL_LOADED",
- "S_DRAGONTAIL_EMPTY",
- "S_DRAGONTAIL_EMPTYLOOP",
- "S_DRAGONTAIL_RELOAD",
- "S_DRAGONMINE",
- "S_DRAGONMINE_LAND1",
- "S_DRAGONMINE_LAND2",
- "S_DRAGONMINE_SLOWFLASH1",
- "S_DRAGONMINE_SLOWFLASH2",
- "S_DRAGONMINE_SLOWLOOP",
- "S_DRAGONMINE_FASTFLASH1",
- "S_DRAGONMINE_FASTFLASH2",
- "S_DRAGONMINE_FASTLOOP",
-
- // Boss Explosion
- "S_BOSSEXPLODE",
-
- // S3&K Boss Explosion
- "S_SONIC3KBOSSEXPLOSION1",
- "S_SONIC3KBOSSEXPLOSION2",
- "S_SONIC3KBOSSEXPLOSION3",
- "S_SONIC3KBOSSEXPLOSION4",
- "S_SONIC3KBOSSEXPLOSION5",
- "S_SONIC3KBOSSEXPLOSION6",
-
- "S_JETFUME1",
-
- // Boss 1
- "S_EGGMOBILE_STND",
- "S_EGGMOBILE_ROFL",
- "S_EGGMOBILE_LATK1",
- "S_EGGMOBILE_LATK2",
- "S_EGGMOBILE_LATK3",
- "S_EGGMOBILE_LATK4",
- "S_EGGMOBILE_LATK5",
- "S_EGGMOBILE_LATK6",
- "S_EGGMOBILE_LATK7",
- "S_EGGMOBILE_LATK8",
- "S_EGGMOBILE_LATK9",
- "S_EGGMOBILE_RATK1",
- "S_EGGMOBILE_RATK2",
- "S_EGGMOBILE_RATK3",
- "S_EGGMOBILE_RATK4",
- "S_EGGMOBILE_RATK5",
- "S_EGGMOBILE_RATK6",
- "S_EGGMOBILE_RATK7",
- "S_EGGMOBILE_RATK8",
- "S_EGGMOBILE_RATK9",
- "S_EGGMOBILE_PANIC1",
- "S_EGGMOBILE_PANIC2",
- "S_EGGMOBILE_PANIC3",
- "S_EGGMOBILE_PANIC4",
- "S_EGGMOBILE_PANIC5",
- "S_EGGMOBILE_PANIC6",
- "S_EGGMOBILE_PANIC7",
- "S_EGGMOBILE_PANIC8",
- "S_EGGMOBILE_PANIC9",
- "S_EGGMOBILE_PANIC10",
- "S_EGGMOBILE_PANIC11",
- "S_EGGMOBILE_PANIC12",
- "S_EGGMOBILE_PANIC13",
- "S_EGGMOBILE_PANIC14",
- "S_EGGMOBILE_PANIC15",
- "S_EGGMOBILE_PAIN",
- "S_EGGMOBILE_PAIN2",
- "S_EGGMOBILE_DIE1",
- "S_EGGMOBILE_DIE2",
- "S_EGGMOBILE_DIE3",
- "S_EGGMOBILE_DIE4",
- "S_EGGMOBILE_FLEE1",
- "S_EGGMOBILE_FLEE2",
- "S_EGGMOBILE_BALL",
- "S_EGGMOBILE_TARGET",
-
- "S_BOSSEGLZ1",
- "S_BOSSEGLZ2",
-
- // Boss 2
- "S_EGGMOBILE2_STND",
- "S_EGGMOBILE2_POGO1",
- "S_EGGMOBILE2_POGO2",
- "S_EGGMOBILE2_POGO3",
- "S_EGGMOBILE2_POGO4",
- "S_EGGMOBILE2_POGO5",
- "S_EGGMOBILE2_POGO6",
- "S_EGGMOBILE2_POGO7",
- "S_EGGMOBILE2_PAIN",
- "S_EGGMOBILE2_PAIN2",
- "S_EGGMOBILE2_DIE1",
- "S_EGGMOBILE2_DIE2",
- "S_EGGMOBILE2_DIE3",
- "S_EGGMOBILE2_DIE4",
- "S_EGGMOBILE2_FLEE1",
- "S_EGGMOBILE2_FLEE2",
-
- "S_BOSSTANK1",
- "S_BOSSTANK2",
- "S_BOSSSPIGOT",
-
- // Boss 2 Goop
- "S_GOOP1",
- "S_GOOP2",
- "S_GOOP3",
- "S_GOOPTRAIL",
-
- // Boss 3
- "S_EGGMOBILE3_STND",
- "S_EGGMOBILE3_SHOCK",
- "S_EGGMOBILE3_ATK1",
- "S_EGGMOBILE3_ATK2",
- "S_EGGMOBILE3_ATK3A",
- "S_EGGMOBILE3_ATK3B",
- "S_EGGMOBILE3_ATK3C",
- "S_EGGMOBILE3_ATK3D",
- "S_EGGMOBILE3_ATK4",
- "S_EGGMOBILE3_ATK5",
- "S_EGGMOBILE3_ROFL",
- "S_EGGMOBILE3_PAIN",
- "S_EGGMOBILE3_PAIN2",
- "S_EGGMOBILE3_DIE1",
- "S_EGGMOBILE3_DIE2",
- "S_EGGMOBILE3_DIE3",
- "S_EGGMOBILE3_DIE4",
- "S_EGGMOBILE3_FLEE1",
- "S_EGGMOBILE3_FLEE2",
-
- // Boss 3 Pinch
- "S_FAKEMOBILE_INIT",
- "S_FAKEMOBILE",
- "S_FAKEMOBILE_ATK1",
- "S_FAKEMOBILE_ATK2",
- "S_FAKEMOBILE_ATK3A",
- "S_FAKEMOBILE_ATK3B",
- "S_FAKEMOBILE_ATK3C",
- "S_FAKEMOBILE_ATK3D",
- "S_FAKEMOBILE_DIE1",
- "S_FAKEMOBILE_DIE2",
-
- "S_BOSSSEBH1",
- "S_BOSSSEBH2",
-
- // Boss 3 Shockwave
- "S_SHOCKWAVE1",
- "S_SHOCKWAVE2",
-
- // Boss 4
- "S_EGGMOBILE4_STND",
- "S_EGGMOBILE4_LATK1",
- "S_EGGMOBILE4_LATK2",
- "S_EGGMOBILE4_LATK3",
- "S_EGGMOBILE4_LATK4",
- "S_EGGMOBILE4_LATK5",
- "S_EGGMOBILE4_LATK6",
- "S_EGGMOBILE4_RATK1",
- "S_EGGMOBILE4_RATK2",
- "S_EGGMOBILE4_RATK3",
- "S_EGGMOBILE4_RATK4",
- "S_EGGMOBILE4_RATK5",
- "S_EGGMOBILE4_RATK6",
- "S_EGGMOBILE4_RAISE1",
- "S_EGGMOBILE4_RAISE2",
- "S_EGGMOBILE4_PAIN1",
- "S_EGGMOBILE4_PAIN2",
- "S_EGGMOBILE4_DIE1",
- "S_EGGMOBILE4_DIE2",
- "S_EGGMOBILE4_DIE3",
- "S_EGGMOBILE4_DIE4",
- "S_EGGMOBILE4_FLEE1",
- "S_EGGMOBILE4_FLEE2",
- "S_EGGMOBILE4_MACE",
- "S_EGGMOBILE4_MACE_DIE1",
- "S_EGGMOBILE4_MACE_DIE2",
- "S_EGGMOBILE4_MACE_DIE3",
-
- // Boss 4 jet flame
- "S_JETFLAME",
-
- // Boss 4 Spectator Eggrobo
- "S_EGGROBO1_STND",
- "S_EGGROBO1_BSLAP1",
- "S_EGGROBO1_BSLAP2",
- "S_EGGROBO1_PISSED",
-
- // Boss 4 Spectator Eggrobo jet flame
- "S_EGGROBOJET",
-
- // Boss 5
- "S_FANG_SETUP",
- "S_FANG_INTRO0",
- "S_FANG_INTRO1",
- "S_FANG_INTRO2",
- "S_FANG_INTRO3",
- "S_FANG_INTRO4",
- "S_FANG_INTRO5",
- "S_FANG_INTRO6",
- "S_FANG_INTRO7",
- "S_FANG_INTRO8",
- "S_FANG_INTRO9",
- "S_FANG_INTRO10",
- "S_FANG_INTRO11",
- "S_FANG_INTRO12",
- "S_FANG_CLONE1",
- "S_FANG_CLONE2",
- "S_FANG_CLONE3",
- "S_FANG_CLONE4",
- "S_FANG_IDLE0",
- "S_FANG_IDLE1",
- "S_FANG_IDLE2",
- "S_FANG_IDLE3",
- "S_FANG_IDLE4",
- "S_FANG_IDLE5",
- "S_FANG_IDLE6",
- "S_FANG_IDLE7",
- "S_FANG_IDLE8",
- "S_FANG_PAIN1",
- "S_FANG_PAIN2",
- "S_FANG_PATHINGSTART1",
- "S_FANG_PATHINGSTART2",
- "S_FANG_PATHING",
- "S_FANG_BOUNCE1",
- "S_FANG_BOUNCE2",
- "S_FANG_BOUNCE3",
- "S_FANG_BOUNCE4",
- "S_FANG_FALL1",
- "S_FANG_FALL2",
- "S_FANG_CHECKPATH1",
- "S_FANG_CHECKPATH2",
- "S_FANG_PATHINGCONT1",
- "S_FANG_PATHINGCONT2",
- "S_FANG_PATHINGCONT3",
- "S_FANG_SKID1",
- "S_FANG_SKID2",
- "S_FANG_SKID3",
- "S_FANG_CHOOSEATTACK",
- "S_FANG_FIRESTART1",
- "S_FANG_FIRESTART2",
- "S_FANG_FIRE1",
- "S_FANG_FIRE2",
- "S_FANG_FIRE3",
- "S_FANG_FIRE4",
- "S_FANG_FIREREPEAT",
- "S_FANG_LOBSHOT0",
- "S_FANG_LOBSHOT1",
- "S_FANG_LOBSHOT2",
- "S_FANG_WAIT1",
- "S_FANG_WAIT2",
- "S_FANG_WALLHIT",
- "S_FANG_PINCHPATHINGSTART1",
- "S_FANG_PINCHPATHINGSTART2",
- "S_FANG_PINCHPATHING",
- "S_FANG_PINCHBOUNCE0",
- "S_FANG_PINCHBOUNCE1",
- "S_FANG_PINCHBOUNCE2",
- "S_FANG_PINCHBOUNCE3",
- "S_FANG_PINCHBOUNCE4",
- "S_FANG_PINCHFALL0",
- "S_FANG_PINCHFALL1",
- "S_FANG_PINCHFALL2",
- "S_FANG_PINCHSKID1",
- "S_FANG_PINCHSKID2",
- "S_FANG_PINCHLOBSHOT0",
- "S_FANG_PINCHLOBSHOT1",
- "S_FANG_PINCHLOBSHOT2",
- "S_FANG_PINCHLOBSHOT3",
- "S_FANG_PINCHLOBSHOT4",
- "S_FANG_DIE1",
- "S_FANG_DIE2",
- "S_FANG_DIE3",
- "S_FANG_DIE4",
- "S_FANG_DIE5",
- "S_FANG_DIE6",
- "S_FANG_DIE7",
- "S_FANG_DIE8",
- "S_FANG_FLEEPATHING1",
- "S_FANG_FLEEPATHING2",
- "S_FANG_FLEEBOUNCE1",
- "S_FANG_FLEEBOUNCE2",
- "S_FANG_KO",
-
- "S_BROKENROBOTRANDOM",
- "S_BROKENROBOTA",
- "S_BROKENROBOTB",
- "S_BROKENROBOTC",
- "S_BROKENROBOTD",
- "S_BROKENROBOTE",
- "S_BROKENROBOTF",
-
- "S_ALART1",
- "S_ALART2",
-
- "S_VWREF",
- "S_VWREB",
-
- "S_PROJECTORLIGHT1",
- "S_PROJECTORLIGHT2",
- "S_PROJECTORLIGHT3",
- "S_PROJECTORLIGHT4",
- "S_PROJECTORLIGHT5",
-
- "S_FBOMB1",
- "S_FBOMB2",
- "S_FBOMB_EXPL1",
- "S_FBOMB_EXPL2",
- "S_FBOMB_EXPL3",
- "S_FBOMB_EXPL4",
- "S_FBOMB_EXPL5",
- "S_FBOMB_EXPL6",
- "S_TNTDUST_1",
- "S_TNTDUST_2",
- "S_TNTDUST_3",
- "S_TNTDUST_4",
- "S_TNTDUST_5",
- "S_TNTDUST_6",
- "S_TNTDUST_7",
- "S_TNTDUST_8",
- "S_FSGNA",
- "S_FSGNB",
- "S_FSGNC",
- "S_FSGND",
-
- // Black Eggman (Boss 7)
- "S_BLACKEGG_STND",
- "S_BLACKEGG_STND2",
- "S_BLACKEGG_WALK1",
- "S_BLACKEGG_WALK2",
- "S_BLACKEGG_WALK3",
- "S_BLACKEGG_WALK4",
- "S_BLACKEGG_WALK5",
- "S_BLACKEGG_WALK6",
- "S_BLACKEGG_SHOOT1",
- "S_BLACKEGG_SHOOT2",
- "S_BLACKEGG_PAIN1",
- "S_BLACKEGG_PAIN2",
- "S_BLACKEGG_PAIN3",
- "S_BLACKEGG_PAIN4",
- "S_BLACKEGG_PAIN5",
- "S_BLACKEGG_PAIN6",
- "S_BLACKEGG_PAIN7",
- "S_BLACKEGG_PAIN8",
- "S_BLACKEGG_PAIN9",
- "S_BLACKEGG_PAIN10",
- "S_BLACKEGG_PAIN11",
- "S_BLACKEGG_PAIN12",
- "S_BLACKEGG_PAIN13",
- "S_BLACKEGG_PAIN14",
- "S_BLACKEGG_PAIN15",
- "S_BLACKEGG_PAIN16",
- "S_BLACKEGG_PAIN17",
- "S_BLACKEGG_PAIN18",
- "S_BLACKEGG_PAIN19",
- "S_BLACKEGG_PAIN20",
- "S_BLACKEGG_PAIN21",
- "S_BLACKEGG_PAIN22",
- "S_BLACKEGG_PAIN23",
- "S_BLACKEGG_PAIN24",
- "S_BLACKEGG_PAIN25",
- "S_BLACKEGG_PAIN26",
- "S_BLACKEGG_PAIN27",
- "S_BLACKEGG_PAIN28",
- "S_BLACKEGG_PAIN29",
- "S_BLACKEGG_PAIN30",
- "S_BLACKEGG_PAIN31",
- "S_BLACKEGG_PAIN32",
- "S_BLACKEGG_PAIN33",
- "S_BLACKEGG_PAIN34",
- "S_BLACKEGG_PAIN35",
- "S_BLACKEGG_HITFACE1",
- "S_BLACKEGG_HITFACE2",
- "S_BLACKEGG_HITFACE3",
- "S_BLACKEGG_HITFACE4",
- "S_BLACKEGG_DIE1",
- "S_BLACKEGG_DIE2",
- "S_BLACKEGG_DIE3",
- "S_BLACKEGG_DIE4",
- "S_BLACKEGG_DIE5",
- "S_BLACKEGG_MISSILE1",
- "S_BLACKEGG_MISSILE2",
- "S_BLACKEGG_MISSILE3",
- "S_BLACKEGG_GOOP",
- "S_BLACKEGG_JUMP1",
- "S_BLACKEGG_JUMP2",
- "S_BLACKEGG_DESTROYPLAT1",
- "S_BLACKEGG_DESTROYPLAT2",
- "S_BLACKEGG_DESTROYPLAT3",
-
- "S_BLACKEGG_HELPER", // Collision helper
-
- "S_BLACKEGG_GOOP1",
- "S_BLACKEGG_GOOP2",
- "S_BLACKEGG_GOOP3",
- "S_BLACKEGG_GOOP4",
- "S_BLACKEGG_GOOP5",
- "S_BLACKEGG_GOOP6",
- "S_BLACKEGG_GOOP7",
-
- "S_BLACKEGG_MISSILE",
-
- // New Very-Last-Minute 2.1 Brak Eggman (Cy-Brak-demon)
- "S_CYBRAKDEMON_IDLE",
- "S_CYBRAKDEMON_WALK1",
- "S_CYBRAKDEMON_WALK2",
- "S_CYBRAKDEMON_WALK3",
- "S_CYBRAKDEMON_WALK4",
- "S_CYBRAKDEMON_WALK5",
- "S_CYBRAKDEMON_WALK6",
- "S_CYBRAKDEMON_CHOOSE_ATTACK1",
- "S_CYBRAKDEMON_MISSILE_ATTACK1", // Aim
- "S_CYBRAKDEMON_MISSILE_ATTACK2", // Fire
- "S_CYBRAKDEMON_MISSILE_ATTACK3", // Aim
- "S_CYBRAKDEMON_MISSILE_ATTACK4", // Fire
- "S_CYBRAKDEMON_MISSILE_ATTACK5", // Aim
- "S_CYBRAKDEMON_MISSILE_ATTACK6", // Fire
- "S_CYBRAKDEMON_FLAME_ATTACK1", // Reset
- "S_CYBRAKDEMON_FLAME_ATTACK2", // Aim
- "S_CYBRAKDEMON_FLAME_ATTACK3", // Fire
- "S_CYBRAKDEMON_FLAME_ATTACK4", // Loop
- "S_CYBRAKDEMON_CHOOSE_ATTACK2",
- "S_CYBRAKDEMON_VILE_ATTACK1",
- "S_CYBRAKDEMON_VILE_ATTACK2",
- "S_CYBRAKDEMON_VILE_ATTACK3",
- "S_CYBRAKDEMON_VILE_ATTACK4",
- "S_CYBRAKDEMON_VILE_ATTACK5",
- "S_CYBRAKDEMON_VILE_ATTACK6",
- "S_CYBRAKDEMON_NAPALM_ATTACK1",
- "S_CYBRAKDEMON_NAPALM_ATTACK2",
- "S_CYBRAKDEMON_NAPALM_ATTACK3",
- "S_CYBRAKDEMON_FINISH_ATTACK1", // If just attacked, remove MF2_FRET w/out going back to spawnstate
- "S_CYBRAKDEMON_FINISH_ATTACK2", // Force a delay between attacks so you don't get bombarded with them back-to-back
- "S_CYBRAKDEMON_PAIN1",
- "S_CYBRAKDEMON_PAIN2",
- "S_CYBRAKDEMON_PAIN3",
- "S_CYBRAKDEMON_DIE1",
- "S_CYBRAKDEMON_DIE2",
- "S_CYBRAKDEMON_DIE3",
- "S_CYBRAKDEMON_DIE4",
- "S_CYBRAKDEMON_DIE5",
- "S_CYBRAKDEMON_DIE6",
- "S_CYBRAKDEMON_DIE7",
- "S_CYBRAKDEMON_DIE8",
- "S_CYBRAKDEMON_DEINVINCIBLERIZE",
- "S_CYBRAKDEMON_INVINCIBLERIZE",
-
- "S_CYBRAKDEMONMISSILE",
- "S_CYBRAKDEMONMISSILE_EXPLODE1",
- "S_CYBRAKDEMONMISSILE_EXPLODE2",
- "S_CYBRAKDEMONMISSILE_EXPLODE3",
-
- "S_CYBRAKDEMONFLAMESHOT_FLY1",
- "S_CYBRAKDEMONFLAMESHOT_FLY2",
- "S_CYBRAKDEMONFLAMESHOT_FLY3",
- "S_CYBRAKDEMONFLAMESHOT_DIE",
-
- "S_CYBRAKDEMONFLAMEREST",
-
- "S_CYBRAKDEMONELECTRICBARRIER_INIT1",
- "S_CYBRAKDEMONELECTRICBARRIER_INIT2",
- "S_CYBRAKDEMONELECTRICBARRIER_PLAYSOUND",
- "S_CYBRAKDEMONELECTRICBARRIER1",
- "S_CYBRAKDEMONELECTRICBARRIER2",
- "S_CYBRAKDEMONELECTRICBARRIER3",
- "S_CYBRAKDEMONELECTRICBARRIER4",
- "S_CYBRAKDEMONELECTRICBARRIER5",
- "S_CYBRAKDEMONELECTRICBARRIER6",
- "S_CYBRAKDEMONELECTRICBARRIER7",
- "S_CYBRAKDEMONELECTRICBARRIER8",
- "S_CYBRAKDEMONELECTRICBARRIER9",
- "S_CYBRAKDEMONELECTRICBARRIER10",
- "S_CYBRAKDEMONELECTRICBARRIER11",
- "S_CYBRAKDEMONELECTRICBARRIER12",
- "S_CYBRAKDEMONELECTRICBARRIER13",
- "S_CYBRAKDEMONELECTRICBARRIER14",
- "S_CYBRAKDEMONELECTRICBARRIER15",
- "S_CYBRAKDEMONELECTRICBARRIER16",
- "S_CYBRAKDEMONELECTRICBARRIER17",
- "S_CYBRAKDEMONELECTRICBARRIER18",
- "S_CYBRAKDEMONELECTRICBARRIER19",
- "S_CYBRAKDEMONELECTRICBARRIER20",
- "S_CYBRAKDEMONELECTRICBARRIER21",
- "S_CYBRAKDEMONELECTRICBARRIER22",
- "S_CYBRAKDEMONELECTRICBARRIER23",
- "S_CYBRAKDEMONELECTRICBARRIER24",
- "S_CYBRAKDEMONELECTRICBARRIER_DIE1",
- "S_CYBRAKDEMONELECTRICBARRIER_DIE2",
- "S_CYBRAKDEMONELECTRICBARRIER_DIE3",
- "S_CYBRAKDEMONELECTRICBARRIER_SPARK_RANDOMCHECK",
- "S_CYBRAKDEMONELECTRICBARRIER_SPARK_RANDOMSUCCESS",
- "S_CYBRAKDEMONELECTRICBARRIER_SPARK_RANDOMCHOOSE",
- "S_CYBRAKDEMONELECTRICBARRIER_SPARK_RANDOM1",
- "S_CYBRAKDEMONELECTRICBARRIER_SPARK_RANDOM2",
- "S_CYBRAKDEMONELECTRICBARRIER_SPARK_RANDOM3",
- "S_CYBRAKDEMONELECTRICBARRIER_SPARK_RANDOM4",
- "S_CYBRAKDEMONELECTRICBARRIER_SPARK_RANDOM5",
- "S_CYBRAKDEMONELECTRICBARRIER_SPARK_RANDOM6",
- "S_CYBRAKDEMONELECTRICBARRIER_SPARK_RANDOM7",
- "S_CYBRAKDEMONELECTRICBARRIER_SPARK_RANDOM8",
- "S_CYBRAKDEMONELECTRICBARRIER_SPARK_RANDOM9",
- "S_CYBRAKDEMONELECTRICBARRIER_SPARK_RANDOM10",
- "S_CYBRAKDEMONELECTRICBARRIER_SPARK_RANDOM11",
- "S_CYBRAKDEMONELECTRICBARRIER_SPARK_RANDOM12",
- "S_CYBRAKDEMONELECTRICBARRIER_SPARK_RANDOMFAIL",
- "S_CYBRAKDEMONELECTRICBARRIER_SPARK_RANDOMLOOP",
- "S_CYBRAKDEMONELECTRICBARRIER_REVIVE1",
- "S_CYBRAKDEMONELECTRICBARRIER_REVIVE2",
- "S_CYBRAKDEMONELECTRICBARRIER_REVIVE3",
-
- "S_CYBRAKDEMONTARGETRETICULE1",
- "S_CYBRAKDEMONTARGETRETICULE2",
- "S_CYBRAKDEMONTARGETRETICULE3",
- "S_CYBRAKDEMONTARGETRETICULE4",
- "S_CYBRAKDEMONTARGETRETICULE5",
- "S_CYBRAKDEMONTARGETRETICULE6",
- "S_CYBRAKDEMONTARGETRETICULE7",
- "S_CYBRAKDEMONTARGETRETICULE8",
- "S_CYBRAKDEMONTARGETRETICULE9",
- "S_CYBRAKDEMONTARGETRETICULE10",
- "S_CYBRAKDEMONTARGETRETICULE11",
- "S_CYBRAKDEMONTARGETRETICULE12",
- "S_CYBRAKDEMONTARGETRETICULE13",
- "S_CYBRAKDEMONTARGETRETICULE14",
-
- "S_CYBRAKDEMONTARGETDOT",
-
- "S_CYBRAKDEMONNAPALMBOMBLARGE_FLY1",
- "S_CYBRAKDEMONNAPALMBOMBLARGE_FLY2",
- "S_CYBRAKDEMONNAPALMBOMBLARGE_FLY3",
- "S_CYBRAKDEMONNAPALMBOMBLARGE_FLY4",
- "S_CYBRAKDEMONNAPALMBOMBLARGE_DIE1", // Explode
- "S_CYBRAKDEMONNAPALMBOMBLARGE_DIE2", // Outer ring
- "S_CYBRAKDEMONNAPALMBOMBLARGE_DIE3", // Center
- "S_CYBRAKDEMONNAPALMBOMBLARGE_DIE4", // Sound
-
- "S_CYBRAKDEMONNAPALMBOMBSMALL",
- "S_CYBRAKDEMONNAPALMBOMBSMALL_DIE1", // Explode
- "S_CYBRAKDEMONNAPALMBOMBSMALL_DIE2", // Outer ring
- "S_CYBRAKDEMONNAPALMBOMBSMALL_DIE3", // Inner ring
- "S_CYBRAKDEMONNAPALMBOMBSMALL_DIE4", // Center
- "S_CYBRAKDEMONNAPALMBOMBSMALL_DIE5", // Sound
-
- "S_CYBRAKDEMONNAPALMFLAME_FLY1",
- "S_CYBRAKDEMONNAPALMFLAME_FLY2",
- "S_CYBRAKDEMONNAPALMFLAME_FLY3",
- "S_CYBRAKDEMONNAPALMFLAME_FLY4",
- "S_CYBRAKDEMONNAPALMFLAME_FLY5",
- "S_CYBRAKDEMONNAPALMFLAME_FLY6",
- "S_CYBRAKDEMONNAPALMFLAME_DIE",
-
- "S_CYBRAKDEMONVILEEXPLOSION1",
- "S_CYBRAKDEMONVILEEXPLOSION2",
- "S_CYBRAKDEMONVILEEXPLOSION3",
-
- // Metal Sonic (Race)
- "S_METALSONIC_RACE",
- // Metal Sonic (Battle)
- "S_METALSONIC_FLOAT",
- "S_METALSONIC_VECTOR",
- "S_METALSONIC_STUN",
- "S_METALSONIC_RAISE",
- "S_METALSONIC_GATHER",
- "S_METALSONIC_DASH",
- "S_METALSONIC_BOUNCE",
- "S_METALSONIC_BADBOUNCE",
- "S_METALSONIC_SHOOT",
- "S_METALSONIC_PAIN",
- "S_METALSONIC_DEATH1",
- "S_METALSONIC_DEATH2",
- "S_METALSONIC_DEATH3",
- "S_METALSONIC_DEATH4",
- "S_METALSONIC_FLEE1",
- "S_METALSONIC_FLEE2",
-
- "S_MSSHIELD_F1",
- "S_MSSHIELD_F2",
-
- // Ring
- "S_RING",
-
- // Blue Sphere for special stages
- "S_BLUESPHERE",
- "S_BLUESPHEREBONUS",
- "S_BLUESPHERESPARK",
-
- // Bomb Sphere
- "S_BOMBSPHERE1",
- "S_BOMBSPHERE2",
- "S_BOMBSPHERE3",
- "S_BOMBSPHERE4",
-
- // NiGHTS Chip
- "S_NIGHTSCHIP",
- "S_NIGHTSCHIPBONUS",
-
- // NiGHTS Star
- "S_NIGHTSSTAR",
- "S_NIGHTSSTARXMAS",
-
- // Gravity Wells for special stages
- "S_GRAVWELLGREEN",
- "S_GRAVWELLRED",
-
- // Individual Team Rings
- "S_TEAMRING",
-
- // Special Stage Token
- "S_TOKEN",
-
- // CTF Flags
- "S_REDFLAG",
- "S_BLUEFLAG",
-
- // Emblem
- "S_EMBLEM1",
- "S_EMBLEM2",
- "S_EMBLEM3",
- "S_EMBLEM4",
- "S_EMBLEM5",
- "S_EMBLEM6",
- "S_EMBLEM7",
- "S_EMBLEM8",
- "S_EMBLEM9",
- "S_EMBLEM10",
- "S_EMBLEM11",
- "S_EMBLEM12",
- "S_EMBLEM13",
- "S_EMBLEM14",
- "S_EMBLEM15",
- "S_EMBLEM16",
- "S_EMBLEM17",
- "S_EMBLEM18",
- "S_EMBLEM19",
- "S_EMBLEM20",
- "S_EMBLEM21",
- "S_EMBLEM22",
- "S_EMBLEM23",
- "S_EMBLEM24",
- "S_EMBLEM25",
- "S_EMBLEM26",
-
- // Chaos Emeralds
- "S_CEMG1",
- "S_CEMG2",
- "S_CEMG3",
- "S_CEMG4",
- "S_CEMG5",
- "S_CEMG6",
- "S_CEMG7",
-
- // Emerald hunt shards
- "S_SHRD1",
- "S_SHRD2",
- "S_SHRD3",
-
- // Bubble Source
- "S_BUBBLES1",
- "S_BUBBLES2",
- "S_BUBBLES3",
- "S_BUBBLES4",
-
- // Level End Sign
- "S_SIGN",
- "S_SIGNSPIN1",
- "S_SIGNSPIN2",
- "S_SIGNSPIN3",
- "S_SIGNSPIN4",
- "S_SIGNSPIN5",
- "S_SIGNSPIN6",
- "S_SIGNPLAYER",
- "S_SIGNSLOW",
- "S_SIGNSTOP",
- "S_SIGNBOARD",
- "S_EGGMANSIGN",
- "S_CLEARSIGN",
-
- // Spike Ball
- "S_SPIKEBALL1",
- "S_SPIKEBALL2",
- "S_SPIKEBALL3",
- "S_SPIKEBALL4",
- "S_SPIKEBALL5",
- "S_SPIKEBALL6",
- "S_SPIKEBALL7",
- "S_SPIKEBALL8",
-
- // Elemental Shield's Spawn
- "S_SPINFIRE1",
- "S_SPINFIRE2",
- "S_SPINFIRE3",
- "S_SPINFIRE4",
- "S_SPINFIRE5",
- "S_SPINFIRE6",
-
- // Spikes
- "S_SPIKE1",
- "S_SPIKE2",
- "S_SPIKE3",
- "S_SPIKE4",
- "S_SPIKE5",
- "S_SPIKE6",
- "S_SPIKED1",
- "S_SPIKED2",
-
- // Wall spikes
- "S_WALLSPIKE1",
- "S_WALLSPIKE2",
- "S_WALLSPIKE3",
- "S_WALLSPIKE4",
- "S_WALLSPIKE5",
- "S_WALLSPIKE6",
- "S_WALLSPIKEBASE",
- "S_WALLSPIKED1",
- "S_WALLSPIKED2",
-
- // Starpost
- "S_STARPOST_IDLE",
- "S_STARPOST_FLASH",
- "S_STARPOST_STARTSPIN",
- "S_STARPOST_SPIN",
- "S_STARPOST_ENDSPIN",
-
- // Big floating mine
- "S_BIGMINE_IDLE",
- "S_BIGMINE_ALERT1",
- "S_BIGMINE_ALERT2",
- "S_BIGMINE_ALERT3",
- "S_BIGMINE_SET1",
- "S_BIGMINE_SET2",
- "S_BIGMINE_SET3",
- "S_BIGMINE_BLAST1",
- "S_BIGMINE_BLAST2",
- "S_BIGMINE_BLAST3",
- "S_BIGMINE_BLAST4",
- "S_BIGMINE_BLAST5",
-
- // Cannon Launcher
- "S_CANNONLAUNCHER1",
- "S_CANNONLAUNCHER2",
- "S_CANNONLAUNCHER3",
-
- // Monitor Miscellany
- "S_BOXSPARKLE1",
- "S_BOXSPARKLE2",
- "S_BOXSPARKLE3",
- "S_BOXSPARKLE4",
-
- "S_BOX_FLICKER",
- "S_BOX_POP1",
- "S_BOX_POP2",
-
- "S_GOLDBOX_FLICKER",
- "S_GOLDBOX_OFF1",
- "S_GOLDBOX_OFF2",
- "S_GOLDBOX_OFF3",
- "S_GOLDBOX_OFF4",
- "S_GOLDBOX_OFF5",
- "S_GOLDBOX_OFF6",
- "S_GOLDBOX_OFF7",
-
- // Monitor States (one per box)
- "S_MYSTERY_BOX",
- "S_RING_BOX",
- "S_PITY_BOX",
- "S_ATTRACT_BOX",
- "S_FORCE_BOX",
- "S_ARMAGEDDON_BOX",
- "S_WHIRLWIND_BOX",
- "S_ELEMENTAL_BOX",
- "S_SNEAKERS_BOX",
- "S_INVULN_BOX",
- "S_1UP_BOX",
- "S_EGGMAN_BOX",
- "S_MIXUP_BOX",
- "S_GRAVITY_BOX",
- "S_RECYCLER_BOX",
- "S_SCORE1K_BOX",
- "S_SCORE10K_BOX",
- "S_FLAMEAURA_BOX",
- "S_BUBBLEWRAP_BOX",
- "S_THUNDERCOIN_BOX",
-
- // Gold Repeat Monitor States (one per box)
- "S_PITY_GOLDBOX",
- "S_ATTRACT_GOLDBOX",
- "S_FORCE_GOLDBOX",
- "S_ARMAGEDDON_GOLDBOX",
- "S_WHIRLWIND_GOLDBOX",
- "S_ELEMENTAL_GOLDBOX",
- "S_SNEAKERS_GOLDBOX",
- "S_INVULN_GOLDBOX",
- "S_EGGMAN_GOLDBOX",
- "S_GRAVITY_GOLDBOX",
- "S_FLAMEAURA_GOLDBOX",
- "S_BUBBLEWRAP_GOLDBOX",
- "S_THUNDERCOIN_GOLDBOX",
-
- // Team Ring Boxes (these are special)
- "S_RING_REDBOX1",
- "S_RING_REDBOX2",
- "S_REDBOX_POP1",
- "S_REDBOX_POP2",
-
- "S_RING_BLUEBOX1",
- "S_RING_BLUEBOX2",
- "S_BLUEBOX_POP1",
- "S_BLUEBOX_POP2",
-
- // Box Icons -- 2 states each, animation and action
- "S_RING_ICON1",
- "S_RING_ICON2",
-
- "S_PITY_ICON1",
- "S_PITY_ICON2",
-
- "S_ATTRACT_ICON1",
- "S_ATTRACT_ICON2",
-
- "S_FORCE_ICON1",
- "S_FORCE_ICON2",
-
- "S_ARMAGEDDON_ICON1",
- "S_ARMAGEDDON_ICON2",
-
- "S_WHIRLWIND_ICON1",
- "S_WHIRLWIND_ICON2",
-
- "S_ELEMENTAL_ICON1",
- "S_ELEMENTAL_ICON2",
-
- "S_SNEAKERS_ICON1",
- "S_SNEAKERS_ICON2",
-
- "S_INVULN_ICON1",
- "S_INVULN_ICON2",
-
- "S_1UP_ICON1",
- "S_1UP_ICON2",
-
- "S_EGGMAN_ICON1",
- "S_EGGMAN_ICON2",
-
- "S_MIXUP_ICON1",
- "S_MIXUP_ICON2",
-
- "S_GRAVITY_ICON1",
- "S_GRAVITY_ICON2",
-
- "S_RECYCLER_ICON1",
- "S_RECYCLER_ICON2",
-
- "S_SCORE1K_ICON1",
- "S_SCORE1K_ICON2",
-
- "S_SCORE10K_ICON1",
- "S_SCORE10K_ICON2",
-
- "S_FLAMEAURA_ICON1",
- "S_FLAMEAURA_ICON2",
-
- "S_BUBBLEWRAP_ICON1",
- "S_BUBBLEWRAP_ICON2",
-
- "S_THUNDERCOIN_ICON1",
- "S_THUNDERCOIN_ICON2",
-
- // ---
-
- "S_ROCKET",
-
- "S_LASER",
- "S_LASER2",
- "S_LASERFLASH",
-
- "S_LASERFLAME1",
- "S_LASERFLAME2",
- "S_LASERFLAME3",
- "S_LASERFLAME4",
- "S_LASERFLAME5",
-
- "S_TORPEDO",
-
- "S_ENERGYBALL1",
- "S_ENERGYBALL2",
-
- // Skim Mine, also used by Jetty-Syn bomber
- "S_MINE1",
- "S_MINE_BOOM1",
- "S_MINE_BOOM2",
- "S_MINE_BOOM3",
- "S_MINE_BOOM4",
-
- // Jetty-Syn Bullet
- "S_JETBULLET1",
- "S_JETBULLET2",
-
- "S_TURRETLASER",
- "S_TURRETLASEREXPLODE1",
- "S_TURRETLASEREXPLODE2",
-
- // Cannonball
- "S_CANNONBALL1",
-
- // Arrow
- "S_ARROW",
- "S_ARROWBONK",
-
- // Glaregoyle Demon fire
- "S_DEMONFIRE",
-
- // The letter
- "S_LETTER",
-
- // GFZ flowers
- "S_GFZFLOWERA",
- "S_GFZFLOWERB",
- "S_GFZFLOWERC",
-
- "S_BLUEBERRYBUSH",
- "S_BERRYBUSH",
- "S_BUSH",
-
- // Trees (both GFZ and misc)
- "S_GFZTREE",
- "S_GFZBERRYTREE",
- "S_GFZCHERRYTREE",
- "S_CHECKERTREE",
- "S_CHECKERSUNSETTREE",
- "S_FHZTREE", // Frozen Hillside
- "S_FHZPINKTREE",
- "S_POLYGONTREE",
- "S_BUSHTREE",
- "S_BUSHREDTREE",
- "S_SPRINGTREE",
-
- // THZ flowers
- "S_THZFLOWERA", // THZ1 Steam flower
- "S_THZFLOWERB", // THZ1 Spin flower (red)
- "S_THZFLOWERC", // THZ1 Spin flower (yellow)
-
- // THZ Steam Whistle tree/bush
- "S_THZTREE",
- "S_THZTREEBRANCH1",
- "S_THZTREEBRANCH2",
- "S_THZTREEBRANCH3",
- "S_THZTREEBRANCH4",
- "S_THZTREEBRANCH5",
- "S_THZTREEBRANCH6",
- "S_THZTREEBRANCH7",
- "S_THZTREEBRANCH8",
- "S_THZTREEBRANCH9",
- "S_THZTREEBRANCH10",
- "S_THZTREEBRANCH11",
- "S_THZTREEBRANCH12",
- "S_THZTREEBRANCH13",
-
- // THZ Alarm
- "S_ALARM1",
-
- // Deep Sea Gargoyle
- "S_GARGOYLE",
- "S_BIGGARGOYLE",
-
- // DSZ Seaweed
- "S_SEAWEED1",
- "S_SEAWEED2",
- "S_SEAWEED3",
- "S_SEAWEED4",
- "S_SEAWEED5",
- "S_SEAWEED6",
-
- // Dripping Water
- "S_DRIPA1",
- "S_DRIPA2",
- "S_DRIPA3",
- "S_DRIPA4",
- "S_DRIPB1",
- "S_DRIPC1",
- "S_DRIPC2",
-
- // Coral
- "S_CORAL1",
- "S_CORAL2",
- "S_CORAL3",
- "S_CORAL4",
- "S_CORAL5",
-
- // Blue Crystal
- "S_BLUECRYSTAL1",
-
- // Kelp,
- "S_KELP",
-
- // Animated algae
- "S_ANIMALGAETOP1",
- "S_ANIMALGAETOP2",
- "S_ANIMALGAESEG",
-
- // DSZ Stalagmites
- "S_DSZSTALAGMITE",
- "S_DSZ2STALAGMITE",
-
- // DSZ Light beam
- "S_LIGHTBEAM1",
- "S_LIGHTBEAM2",
- "S_LIGHTBEAM3",
- "S_LIGHTBEAM4",
- "S_LIGHTBEAM5",
- "S_LIGHTBEAM6",
- "S_LIGHTBEAM7",
- "S_LIGHTBEAM8",
- "S_LIGHTBEAM9",
- "S_LIGHTBEAM10",
- "S_LIGHTBEAM11",
- "S_LIGHTBEAM12",
-
- // CEZ Chain
- "S_CEZCHAIN",
-
- // Flame
- "S_FLAME",
- "S_FLAMEPARTICLE",
- "S_FLAMEREST",
-
- // Eggman Statue
- "S_EGGSTATUE1",
-
- // CEZ hidden sling
- "S_SLING1",
- "S_SLING2",
-
- // CEZ maces and chains
- "S_SMALLMACECHAIN",
- "S_BIGMACECHAIN",
- "S_SMALLMACE",
- "S_BIGMACE",
- "S_SMALLGRABCHAIN",
- "S_BIGGRABCHAIN",
-
- // Yellow spring on a ball
- "S_YELLOWSPRINGBALL",
- "S_YELLOWSPRINGBALL2",
- "S_YELLOWSPRINGBALL3",
- "S_YELLOWSPRINGBALL4",
- "S_YELLOWSPRINGBALL5",
-
- // Red spring on a ball
- "S_REDSPRINGBALL",
- "S_REDSPRINGBALL2",
- "S_REDSPRINGBALL3",
- "S_REDSPRINGBALL4",
- "S_REDSPRINGBALL5",
-
- // Small Firebar
- "S_SMALLFIREBAR1",
- "S_SMALLFIREBAR2",
- "S_SMALLFIREBAR3",
- "S_SMALLFIREBAR4",
- "S_SMALLFIREBAR5",
- "S_SMALLFIREBAR6",
- "S_SMALLFIREBAR7",
- "S_SMALLFIREBAR8",
- "S_SMALLFIREBAR9",
- "S_SMALLFIREBAR10",
- "S_SMALLFIREBAR11",
- "S_SMALLFIREBAR12",
- "S_SMALLFIREBAR13",
- "S_SMALLFIREBAR14",
- "S_SMALLFIREBAR15",
- "S_SMALLFIREBAR16",
-
- // Big Firebar
- "S_BIGFIREBAR1",
- "S_BIGFIREBAR2",
- "S_BIGFIREBAR3",
- "S_BIGFIREBAR4",
- "S_BIGFIREBAR5",
- "S_BIGFIREBAR6",
- "S_BIGFIREBAR7",
- "S_BIGFIREBAR8",
- "S_BIGFIREBAR9",
- "S_BIGFIREBAR10",
- "S_BIGFIREBAR11",
- "S_BIGFIREBAR12",
- "S_BIGFIREBAR13",
- "S_BIGFIREBAR14",
- "S_BIGFIREBAR15",
- "S_BIGFIREBAR16",
-
- "S_CEZFLOWER",
- "S_CEZPOLE",
- "S_CEZBANNER1",
- "S_CEZBANNER2",
- "S_PINETREE",
- "S_CEZBUSH1",
- "S_CEZBUSH2",
- "S_CANDLE",
- "S_CANDLEPRICKET",
- "S_FLAMEHOLDER",
- "S_FIRETORCH",
- "S_WAVINGFLAG",
- "S_WAVINGFLAGSEG1",
- "S_WAVINGFLAGSEG2",
- "S_CRAWLASTATUE",
- "S_FACESTABBERSTATUE",
- "S_SUSPICIOUSFACESTABBERSTATUE_WAIT",
- "S_SUSPICIOUSFACESTABBERSTATUE_BURST1",
- "S_SUSPICIOUSFACESTABBERSTATUE_BURST2",
- "S_BRAMBLES",
-
- // Big Tumbleweed
- "S_BIGTUMBLEWEED",
- "S_BIGTUMBLEWEED_ROLL1",
- "S_BIGTUMBLEWEED_ROLL2",
- "S_BIGTUMBLEWEED_ROLL3",
- "S_BIGTUMBLEWEED_ROLL4",
- "S_BIGTUMBLEWEED_ROLL5",
- "S_BIGTUMBLEWEED_ROLL6",
- "S_BIGTUMBLEWEED_ROLL7",
- "S_BIGTUMBLEWEED_ROLL8",
-
- // Little Tumbleweed
- "S_LITTLETUMBLEWEED",
- "S_LITTLETUMBLEWEED_ROLL1",
- "S_LITTLETUMBLEWEED_ROLL2",
- "S_LITTLETUMBLEWEED_ROLL3",
- "S_LITTLETUMBLEWEED_ROLL4",
- "S_LITTLETUMBLEWEED_ROLL5",
- "S_LITTLETUMBLEWEED_ROLL6",
- "S_LITTLETUMBLEWEED_ROLL7",
- "S_LITTLETUMBLEWEED_ROLL8",
-
- // Cacti
- "S_CACTI1",
- "S_CACTI2",
- "S_CACTI3",
- "S_CACTI4",
- "S_CACTI5",
- "S_CACTI6",
- "S_CACTI7",
- "S_CACTI8",
- "S_CACTI9",
- "S_CACTI10",
- "S_CACTI11",
- "S_CACTITINYSEG",
- "S_CACTISMALLSEG",
-
- // Warning signs
- "S_ARIDSIGN_CAUTION",
- "S_ARIDSIGN_CACTI",
- "S_ARIDSIGN_SHARPTURN",
-
- // Oil lamp
- "S_OILLAMP",
- "S_OILLAMPFLARE",
-
- // TNT barrel
- "S_TNTBARREL_STND1",
- "S_TNTBARREL_EXPL1",
- "S_TNTBARREL_EXPL2",
- "S_TNTBARREL_EXPL3",
- "S_TNTBARREL_EXPL4",
- "S_TNTBARREL_EXPL5",
- "S_TNTBARREL_EXPL6",
- "S_TNTBARREL_EXPL7",
- "S_TNTBARREL_FLYING",
-
- // TNT proximity shell
- "S_PROXIMITY_TNT",
- "S_PROXIMITY_TNT_TRIGGER1",
- "S_PROXIMITY_TNT_TRIGGER2",
- "S_PROXIMITY_TNT_TRIGGER3",
- "S_PROXIMITY_TNT_TRIGGER4",
- "S_PROXIMITY_TNT_TRIGGER5",
- "S_PROXIMITY_TNT_TRIGGER6",
- "S_PROXIMITY_TNT_TRIGGER7",
- "S_PROXIMITY_TNT_TRIGGER8",
- "S_PROXIMITY_TNT_TRIGGER9",
- "S_PROXIMITY_TNT_TRIGGER10",
- "S_PROXIMITY_TNT_TRIGGER11",
- "S_PROXIMITY_TNT_TRIGGER12",
- "S_PROXIMITY_TNT_TRIGGER13",
- "S_PROXIMITY_TNT_TRIGGER14",
- "S_PROXIMITY_TNT_TRIGGER15",
- "S_PROXIMITY_TNT_TRIGGER16",
- "S_PROXIMITY_TNT_TRIGGER17",
- "S_PROXIMITY_TNT_TRIGGER18",
- "S_PROXIMITY_TNT_TRIGGER19",
- "S_PROXIMITY_TNT_TRIGGER20",
- "S_PROXIMITY_TNT_TRIGGER21",
- "S_PROXIMITY_TNT_TRIGGER22",
- "S_PROXIMITY_TNT_TRIGGER23",
-
- // Dust devil
- "S_DUSTDEVIL",
- "S_DUSTLAYER1",
- "S_DUSTLAYER2",
- "S_DUSTLAYER3",
- "S_DUSTLAYER4",
- "S_DUSTLAYER5",
- "S_ARIDDUST1",
- "S_ARIDDUST2",
- "S_ARIDDUST3",
-
- // Minecart
- "S_MINECART_IDLE",
- "S_MINECART_DTH1",
- "S_MINECARTEND",
- "S_MINECARTSEG_FRONT",
- "S_MINECARTSEG_BACK",
- "S_MINECARTSEG_LEFT",
- "S_MINECARTSEG_RIGHT",
- "S_MINECARTSIDEMARK1",
- "S_MINECARTSIDEMARK2",
- "S_MINECARTSPARK",
-
- // Saloon door
- "S_SALOONDOOR",
- "S_SALOONDOORCENTER",
-
- // Train cameo
- "S_TRAINCAMEOSPAWNER_1",
- "S_TRAINCAMEOSPAWNER_2",
- "S_TRAINCAMEOSPAWNER_3",
- "S_TRAINCAMEOSPAWNER_4",
- "S_TRAINCAMEOSPAWNER_5",
- "S_TRAINPUFFMAKER",
-
- // Train
- "S_TRAINDUST",
- "S_TRAINSTEAM",
-
- // Flame jet
- "S_FLAMEJETSTND",
- "S_FLAMEJETSTART",
- "S_FLAMEJETSTOP",
- "S_FLAMEJETFLAME1",
- "S_FLAMEJETFLAME2",
- "S_FLAMEJETFLAME3",
- "S_FLAMEJETFLAME4",
- "S_FLAMEJETFLAME5",
- "S_FLAMEJETFLAME6",
- "S_FLAMEJETFLAME7",
- "S_FLAMEJETFLAME8",
- "S_FLAMEJETFLAME9",
-
- // Spinning flame jets
- "S_FJSPINAXISA1", // Counter-clockwise
- "S_FJSPINAXISA2",
- "S_FJSPINAXISB1", // Clockwise
- "S_FJSPINAXISB2",
-
- // Blade's flame
- "S_FLAMEJETFLAMEB1",
- "S_FLAMEJETFLAMEB2",
- "S_FLAMEJETFLAMEB3",
-
- // Lavafall
- "S_LAVAFALL_DORMANT",
- "S_LAVAFALL_TELL",
- "S_LAVAFALL_SHOOT",
- "S_LAVAFALL_LAVA1",
- "S_LAVAFALL_LAVA2",
- "S_LAVAFALL_LAVA3",
- "S_LAVAFALLROCK",
-
- // Rollout Rock
- "S_ROLLOUTSPAWN",
- "S_ROLLOUTROCK",
-
- // RVZ scenery
- "S_BIGFERNLEAF",
- "S_BIGFERN1",
- "S_BIGFERN2",
- "S_JUNGLEPALM",
- "S_TORCHFLOWER",
- "S_WALLVINE_LONG",
- "S_WALLVINE_SHORT",
-
- // Glaregoyles
- "S_GLAREGOYLE",
- "S_GLAREGOYLE_CHARGE",
- "S_GLAREGOYLE_BLINK",
- "S_GLAREGOYLE_HOLD",
- "S_GLAREGOYLE_FIRE",
- "S_GLAREGOYLE_LOOP",
- "S_GLAREGOYLE_COOLDOWN",
- "S_GLAREGOYLEUP",
- "S_GLAREGOYLEUP_CHARGE",
- "S_GLAREGOYLEUP_BLINK",
- "S_GLAREGOYLEUP_HOLD",
- "S_GLAREGOYLEUP_FIRE",
- "S_GLAREGOYLEUP_LOOP",
- "S_GLAREGOYLEUP_COOLDOWN",
- "S_GLAREGOYLEDOWN",
- "S_GLAREGOYLEDOWN_CHARGE",
- "S_GLAREGOYLEDOWN_BLINK",
- "S_GLAREGOYLEDOWN_HOLD",
- "S_GLAREGOYLEDOWN_FIRE",
- "S_GLAREGOYLEDOWN_LOOP",
- "S_GLAREGOYLEDOWN_COOLDOWN",
- "S_GLAREGOYLELONG",
- "S_GLAREGOYLELONG_CHARGE",
- "S_GLAREGOYLELONG_BLINK",
- "S_GLAREGOYLELONG_HOLD",
- "S_GLAREGOYLELONG_FIRE",
- "S_GLAREGOYLELONG_LOOP",
- "S_GLAREGOYLELONG_COOLDOWN",
-
- // ATZ's Red Crystal/Target
- "S_TARGET_IDLE",
- "S_TARGET_HIT1",
- "S_TARGET_HIT2",
- "S_TARGET_RESPAWN",
- "S_TARGET_ALLDONE",
-
- // ATZ's green flame
- "S_GREENFLAME",
-
- // ATZ Blue Gargoyle
- "S_BLUEGARGOYLE",
-
- // Stalagmites
- "S_STG0",
- "S_STG1",
- "S_STG2",
- "S_STG3",
- "S_STG4",
- "S_STG5",
- "S_STG6",
- "S_STG7",
- "S_STG8",
- "S_STG9",
-
- // Xmas-specific stuff
- "S_XMASPOLE",
- "S_CANDYCANE",
- "S_SNOWMAN", // normal
- "S_SNOWMANHAT", // with hat + scarf
- "S_LAMPPOST1", // normal
- "S_LAMPPOST2", // with snow
- "S_HANGSTAR",
- "S_MISTLETOE",
- // Xmas GFZ bushes
- "S_XMASBLUEBERRYBUSH",
- "S_XMASBERRYBUSH",
- "S_XMASBUSH",
- // FHZ
- "S_FHZICE1",
- "S_FHZICE2",
- "S_ROSY_IDLE1",
- "S_ROSY_IDLE2",
- "S_ROSY_IDLE3",
- "S_ROSY_IDLE4",
- "S_ROSY_JUMP",
- "S_ROSY_WALK",
- "S_ROSY_HUG",
- "S_ROSY_PAIN",
- "S_ROSY_STND",
- "S_ROSY_UNHAPPY",
-
- // Halloween Scenery
- // Pumpkins
- "S_JACKO1",
- "S_JACKO1OVERLAY_1",
- "S_JACKO1OVERLAY_2",
- "S_JACKO1OVERLAY_3",
- "S_JACKO1OVERLAY_4",
- "S_JACKO2",
- "S_JACKO2OVERLAY_1",
- "S_JACKO2OVERLAY_2",
- "S_JACKO2OVERLAY_3",
- "S_JACKO2OVERLAY_4",
- "S_JACKO3",
- "S_JACKO3OVERLAY_1",
- "S_JACKO3OVERLAY_2",
- "S_JACKO3OVERLAY_3",
- "S_JACKO3OVERLAY_4",
- // Dr Seuss Trees
- "S_HHZTREE_TOP",
- "S_HHZTREE_TRUNK",
- "S_HHZTREE_LEAF",
- // Mushroom
- "S_HHZSHROOM_1",
- "S_HHZSHROOM_2",
- "S_HHZSHROOM_3",
- "S_HHZSHROOM_4",
- "S_HHZSHROOM_5",
- "S_HHZSHROOM_6",
- "S_HHZSHROOM_7",
- "S_HHZSHROOM_8",
- "S_HHZSHROOM_9",
- "S_HHZSHROOM_10",
- "S_HHZSHROOM_11",
- "S_HHZSHROOM_12",
- "S_HHZSHROOM_13",
- "S_HHZSHROOM_14",
- "S_HHZSHROOM_15",
- "S_HHZSHROOM_16",
- // Misc
- "S_HHZGRASS",
- "S_HHZTENT1",
- "S_HHZTENT2",
- "S_HHZSTALAGMITE_TALL",
- "S_HHZSTALAGMITE_SHORT",
-
- // Botanic Serenity's loads of scenery states
- "S_BSZTALLFLOWER_RED",
- "S_BSZTALLFLOWER_PURPLE",
- "S_BSZTALLFLOWER_BLUE",
- "S_BSZTALLFLOWER_CYAN",
- "S_BSZTALLFLOWER_YELLOW",
- "S_BSZTALLFLOWER_ORANGE",
- "S_BSZFLOWER_RED",
- "S_BSZFLOWER_PURPLE",
- "S_BSZFLOWER_BLUE",
- "S_BSZFLOWER_CYAN",
- "S_BSZFLOWER_YELLOW",
- "S_BSZFLOWER_ORANGE",
- "S_BSZSHORTFLOWER_RED",
- "S_BSZSHORTFLOWER_PURPLE",
- "S_BSZSHORTFLOWER_BLUE",
- "S_BSZSHORTFLOWER_CYAN",
- "S_BSZSHORTFLOWER_YELLOW",
- "S_BSZSHORTFLOWER_ORANGE",
- "S_BSZTULIP_RED",
- "S_BSZTULIP_PURPLE",
- "S_BSZTULIP_BLUE",
- "S_BSZTULIP_CYAN",
- "S_BSZTULIP_YELLOW",
- "S_BSZTULIP_ORANGE",
- "S_BSZCLUSTER_RED",
- "S_BSZCLUSTER_PURPLE",
- "S_BSZCLUSTER_BLUE",
- "S_BSZCLUSTER_CYAN",
- "S_BSZCLUSTER_YELLOW",
- "S_BSZCLUSTER_ORANGE",
- "S_BSZBUSH_RED",
- "S_BSZBUSH_PURPLE",
- "S_BSZBUSH_BLUE",
- "S_BSZBUSH_CYAN",
- "S_BSZBUSH_YELLOW",
- "S_BSZBUSH_ORANGE",
- "S_BSZVINE_RED",
- "S_BSZVINE_PURPLE",
- "S_BSZVINE_BLUE",
- "S_BSZVINE_CYAN",
- "S_BSZVINE_YELLOW",
- "S_BSZVINE_ORANGE",
- "S_BSZSHRUB",
- "S_BSZCLOVER",
- "S_BIG_PALMTREE_TRUNK",
- "S_BIG_PALMTREE_TOP",
- "S_PALMTREE_TRUNK",
- "S_PALMTREE_TOP",
-
- "S_DBALL1",
- "S_DBALL2",
- "S_DBALL3",
- "S_DBALL4",
- "S_DBALL5",
- "S_DBALL6",
- "S_EGGSTATUE2",
-
- // Shield Orb
- "S_ARMA1",
- "S_ARMA2",
- "S_ARMA3",
- "S_ARMA4",
- "S_ARMA5",
- "S_ARMA6",
- "S_ARMA7",
- "S_ARMA8",
- "S_ARMA9",
- "S_ARMA10",
- "S_ARMA11",
- "S_ARMA12",
- "S_ARMA13",
- "S_ARMA14",
- "S_ARMA15",
- "S_ARMA16",
-
- "S_ARMF1",
- "S_ARMF2",
- "S_ARMF3",
- "S_ARMF4",
- "S_ARMF5",
- "S_ARMF6",
- "S_ARMF7",
- "S_ARMF8",
- "S_ARMF9",
- "S_ARMF10",
- "S_ARMF11",
- "S_ARMF12",
- "S_ARMF13",
- "S_ARMF14",
- "S_ARMF15",
- "S_ARMF16",
- "S_ARMF17",
- "S_ARMF18",
- "S_ARMF19",
- "S_ARMF20",
- "S_ARMF21",
- "S_ARMF22",
- "S_ARMF23",
- "S_ARMF24",
- "S_ARMF25",
- "S_ARMF26",
- "S_ARMF27",
- "S_ARMF28",
- "S_ARMF29",
- "S_ARMF30",
- "S_ARMF31",
- "S_ARMF32",
-
- "S_ARMB1",
- "S_ARMB2",
- "S_ARMB3",
- "S_ARMB4",
- "S_ARMB5",
- "S_ARMB6",
- "S_ARMB7",
- "S_ARMB8",
- "S_ARMB9",
- "S_ARMB10",
- "S_ARMB11",
- "S_ARMB12",
- "S_ARMB13",
- "S_ARMB14",
- "S_ARMB15",
- "S_ARMB16",
- "S_ARMB17",
- "S_ARMB18",
- "S_ARMB19",
- "S_ARMB20",
- "S_ARMB21",
- "S_ARMB22",
- "S_ARMB23",
- "S_ARMB24",
- "S_ARMB25",
- "S_ARMB26",
- "S_ARMB27",
- "S_ARMB28",
- "S_ARMB29",
- "S_ARMB30",
- "S_ARMB31",
- "S_ARMB32",
-
- "S_WIND1",
- "S_WIND2",
- "S_WIND3",
- "S_WIND4",
- "S_WIND5",
- "S_WIND6",
- "S_WIND7",
- "S_WIND8",
-
- "S_MAGN1",
- "S_MAGN2",
- "S_MAGN3",
- "S_MAGN4",
- "S_MAGN5",
- "S_MAGN6",
- "S_MAGN7",
- "S_MAGN8",
- "S_MAGN9",
- "S_MAGN10",
- "S_MAGN11",
- "S_MAGN12",
- "S_MAGN13",
-
- "S_FORC1",
- "S_FORC2",
- "S_FORC3",
- "S_FORC4",
- "S_FORC5",
- "S_FORC6",
- "S_FORC7",
- "S_FORC8",
- "S_FORC9",
- "S_FORC10",
-
- "S_FORC11",
- "S_FORC12",
- "S_FORC13",
- "S_FORC14",
- "S_FORC15",
- "S_FORC16",
- "S_FORC17",
- "S_FORC18",
- "S_FORC19",
- "S_FORC20",
-
- "S_FORC21",
-
- "S_ELEM1",
- "S_ELEM2",
- "S_ELEM3",
- "S_ELEM4",
- "S_ELEM5",
- "S_ELEM6",
- "S_ELEM7",
- "S_ELEM8",
- "S_ELEM9",
- "S_ELEM10",
- "S_ELEM11",
- "S_ELEM12",
-
- "S_ELEM13",
- "S_ELEM14",
-
- "S_ELEMF1",
- "S_ELEMF2",
- "S_ELEMF3",
- "S_ELEMF4",
- "S_ELEMF5",
- "S_ELEMF6",
- "S_ELEMF7",
- "S_ELEMF8",
- "S_ELEMF9",
- "S_ELEMF10",
-
- "S_PITY1",
- "S_PITY2",
- "S_PITY3",
- "S_PITY4",
- "S_PITY5",
- "S_PITY6",
- "S_PITY7",
- "S_PITY8",
- "S_PITY9",
- "S_PITY10",
- "S_PITY11",
- "S_PITY12",
-
- "S_FIRS1",
- "S_FIRS2",
- "S_FIRS3",
- "S_FIRS4",
- "S_FIRS5",
- "S_FIRS6",
- "S_FIRS7",
- "S_FIRS8",
- "S_FIRS9",
-
- "S_FIRS10",
- "S_FIRS11",
-
- "S_FIRSB1",
- "S_FIRSB2",
- "S_FIRSB3",
- "S_FIRSB4",
- "S_FIRSB5",
- "S_FIRSB6",
- "S_FIRSB7",
- "S_FIRSB8",
- "S_FIRSB9",
-
- "S_FIRSB10",
-
- "S_BUBS1",
- "S_BUBS2",
- "S_BUBS3",
- "S_BUBS4",
- "S_BUBS5",
- "S_BUBS6",
- "S_BUBS7",
- "S_BUBS8",
- "S_BUBS9",
-
- "S_BUBS10",
- "S_BUBS11",
-
- "S_BUBSB1",
- "S_BUBSB2",
- "S_BUBSB3",
- "S_BUBSB4",
-
- "S_BUBSB5",
- "S_BUBSB6",
-
- "S_ZAPS1",
- "S_ZAPS2",
- "S_ZAPS3",
- "S_ZAPS4",
- "S_ZAPS5",
- "S_ZAPS6",
- "S_ZAPS7",
- "S_ZAPS8",
- "S_ZAPS9",
- "S_ZAPS10",
- "S_ZAPS11",
- "S_ZAPS12",
- "S_ZAPS13", // blank frame
- "S_ZAPS14",
- "S_ZAPS15",
- "S_ZAPS16",
-
- "S_ZAPSB1", // blank frame
- "S_ZAPSB2",
- "S_ZAPSB3",
- "S_ZAPSB4",
- "S_ZAPSB5",
- "S_ZAPSB6",
- "S_ZAPSB7",
- "S_ZAPSB8",
- "S_ZAPSB9",
- "S_ZAPSB10",
- "S_ZAPSB11", // blank frame
-
- //Thunder spark
- "S_THUNDERCOIN_SPARK",
-
- // Invincibility Sparkles
- "S_IVSP",
-
- // Super Sonic Spark
- "S_SSPK1",
- "S_SSPK2",
- "S_SSPK3",
- "S_SSPK4",
- "S_SSPK5",
-
- // Flicky-sized bubble
- "S_FLICKY_BUBBLE",
-
- // Bluebird
- "S_FLICKY_01_OUT",
- "S_FLICKY_01_FLAP1",
- "S_FLICKY_01_FLAP2",
- "S_FLICKY_01_FLAP3",
- "S_FLICKY_01_STAND",
- "S_FLICKY_01_CENTER",
-
- // Rabbit
- "S_FLICKY_02_OUT",
- "S_FLICKY_02_AIM",
- "S_FLICKY_02_HOP",
- "S_FLICKY_02_UP",
- "S_FLICKY_02_DOWN",
- "S_FLICKY_02_STAND",
- "S_FLICKY_02_CENTER",
-
- // Chicken
- "S_FLICKY_03_OUT",
- "S_FLICKY_03_AIM",
- "S_FLICKY_03_HOP",
- "S_FLICKY_03_UP",
- "S_FLICKY_03_FLAP1",
- "S_FLICKY_03_FLAP2",
- "S_FLICKY_03_STAND",
- "S_FLICKY_03_CENTER",
-
- // Seal
- "S_FLICKY_04_OUT",
- "S_FLICKY_04_AIM",
- "S_FLICKY_04_HOP",
- "S_FLICKY_04_UP",
- "S_FLICKY_04_DOWN",
- "S_FLICKY_04_SWIM1",
- "S_FLICKY_04_SWIM2",
- "S_FLICKY_04_SWIM3",
- "S_FLICKY_04_SWIM4",
- "S_FLICKY_04_STAND",
- "S_FLICKY_04_CENTER",
-
- // Pig
- "S_FLICKY_05_OUT",
- "S_FLICKY_05_AIM",
- "S_FLICKY_05_HOP",
- "S_FLICKY_05_UP",
- "S_FLICKY_05_DOWN",
- "S_FLICKY_05_STAND",
- "S_FLICKY_05_CENTER",
-
- // Chipmunk
- "S_FLICKY_06_OUT",
- "S_FLICKY_06_AIM",
- "S_FLICKY_06_HOP",
- "S_FLICKY_06_UP",
- "S_FLICKY_06_DOWN",
- "S_FLICKY_06_STAND",
- "S_FLICKY_06_CENTER",
-
- // Penguin
- "S_FLICKY_07_OUT",
- "S_FLICKY_07_AIML",
- "S_FLICKY_07_HOPL",
- "S_FLICKY_07_UPL",
- "S_FLICKY_07_DOWNL",
- "S_FLICKY_07_AIMR",
- "S_FLICKY_07_HOPR",
- "S_FLICKY_07_UPR",
- "S_FLICKY_07_DOWNR",
- "S_FLICKY_07_SWIM1",
- "S_FLICKY_07_SWIM2",
- "S_FLICKY_07_SWIM3",
- "S_FLICKY_07_STAND",
- "S_FLICKY_07_CENTER",
-
- // Fish
- "S_FLICKY_08_OUT",
- "S_FLICKY_08_AIM",
- "S_FLICKY_08_HOP",
- "S_FLICKY_08_FLAP1",
- "S_FLICKY_08_FLAP2",
- "S_FLICKY_08_FLAP3",
- "S_FLICKY_08_FLAP4",
- "S_FLICKY_08_SWIM1",
- "S_FLICKY_08_SWIM2",
- "S_FLICKY_08_SWIM3",
- "S_FLICKY_08_SWIM4",
- "S_FLICKY_08_STAND",
- "S_FLICKY_08_CENTER",
-
- // Ram
- "S_FLICKY_09_OUT",
- "S_FLICKY_09_AIM",
- "S_FLICKY_09_HOP",
- "S_FLICKY_09_UP",
- "S_FLICKY_09_DOWN",
- "S_FLICKY_09_STAND",
- "S_FLICKY_09_CENTER",
-
- // Puffin
- "S_FLICKY_10_OUT",
- "S_FLICKY_10_FLAP1",
- "S_FLICKY_10_FLAP2",
- "S_FLICKY_10_STAND",
- "S_FLICKY_10_CENTER",
-
- // Cow
- "S_FLICKY_11_OUT",
- "S_FLICKY_11_AIM",
- "S_FLICKY_11_RUN1",
- "S_FLICKY_11_RUN2",
- "S_FLICKY_11_RUN3",
- "S_FLICKY_11_STAND",
- "S_FLICKY_11_CENTER",
-
- // Rat
- "S_FLICKY_12_OUT",
- "S_FLICKY_12_AIM",
- "S_FLICKY_12_RUN1",
- "S_FLICKY_12_RUN2",
- "S_FLICKY_12_RUN3",
- "S_FLICKY_12_STAND",
- "S_FLICKY_12_CENTER",
-
- // Bear
- "S_FLICKY_13_OUT",
- "S_FLICKY_13_AIM",
- "S_FLICKY_13_HOP",
- "S_FLICKY_13_UP",
- "S_FLICKY_13_DOWN",
- "S_FLICKY_13_STAND",
- "S_FLICKY_13_CENTER",
-
- // Dove
- "S_FLICKY_14_OUT",
- "S_FLICKY_14_FLAP1",
- "S_FLICKY_14_FLAP2",
- "S_FLICKY_14_FLAP3",
- "S_FLICKY_14_STAND",
- "S_FLICKY_14_CENTER",
-
- // Cat
- "S_FLICKY_15_OUT",
- "S_FLICKY_15_AIM",
- "S_FLICKY_15_HOP",
- "S_FLICKY_15_UP",
- "S_FLICKY_15_DOWN",
- "S_FLICKY_15_STAND",
- "S_FLICKY_15_CENTER",
-
- // Canary
- "S_FLICKY_16_OUT",
- "S_FLICKY_16_FLAP1",
- "S_FLICKY_16_FLAP2",
- "S_FLICKY_16_FLAP3",
- "S_FLICKY_16_STAND",
- "S_FLICKY_16_CENTER",
-
- // Spider
- "S_SECRETFLICKY_01_OUT",
- "S_SECRETFLICKY_01_AIM",
- "S_SECRETFLICKY_01_HOP",
- "S_SECRETFLICKY_01_UP",
- "S_SECRETFLICKY_01_DOWN",
- "S_SECRETFLICKY_01_STAND",
- "S_SECRETFLICKY_01_CENTER",
-
- // Bat
- "S_SECRETFLICKY_02_OUT",
- "S_SECRETFLICKY_02_FLAP1",
- "S_SECRETFLICKY_02_FLAP2",
- "S_SECRETFLICKY_02_FLAP3",
- "S_SECRETFLICKY_02_STAND",
- "S_SECRETFLICKY_02_CENTER",
-
- // Fan
- "S_FAN",
- "S_FAN2",
- "S_FAN3",
- "S_FAN4",
- "S_FAN5",
-
- // Steam Riser
- "S_STEAM1",
- "S_STEAM2",
- "S_STEAM3",
- "S_STEAM4",
- "S_STEAM5",
- "S_STEAM6",
- "S_STEAM7",
- "S_STEAM8",
-
- // Bumpers
- "S_BUMPER",
- "S_BUMPERHIT",
-
- // Balloons
- "S_BALLOON",
- "S_BALLOONPOP1",
- "S_BALLOONPOP2",
- "S_BALLOONPOP3",
- "S_BALLOONPOP4",
- "S_BALLOONPOP5",
- "S_BALLOONPOP6",
-
- // Yellow Spring
- "S_YELLOWSPRING",
- "S_YELLOWSPRING2",
- "S_YELLOWSPRING3",
- "S_YELLOWSPRING4",
- "S_YELLOWSPRING5",
-
- // Red Spring
- "S_REDSPRING",
- "S_REDSPRING2",
- "S_REDSPRING3",
- "S_REDSPRING4",
- "S_REDSPRING5",
-
- // Blue Spring
- "S_BLUESPRING",
- "S_BLUESPRING2",
- "S_BLUESPRING3",
- "S_BLUESPRING4",
- "S_BLUESPRING5",
-
- // Yellow Diagonal Spring
- "S_YDIAG1",
- "S_YDIAG2",
- "S_YDIAG3",
- "S_YDIAG4",
- "S_YDIAG5",
- "S_YDIAG6",
- "S_YDIAG7",
- "S_YDIAG8",
-
- // Red Diagonal Spring
- "S_RDIAG1",
- "S_RDIAG2",
- "S_RDIAG3",
- "S_RDIAG4",
- "S_RDIAG5",
- "S_RDIAG6",
- "S_RDIAG7",
- "S_RDIAG8",
-
- // Blue Diagonal Spring
- "S_BDIAG1",
- "S_BDIAG2",
- "S_BDIAG3",
- "S_BDIAG4",
- "S_BDIAG5",
- "S_BDIAG6",
- "S_BDIAG7",
- "S_BDIAG8",
-
- // Yellow Side Spring
- "S_YHORIZ1",
- "S_YHORIZ2",
- "S_YHORIZ3",
- "S_YHORIZ4",
- "S_YHORIZ5",
- "S_YHORIZ6",
- "S_YHORIZ7",
- "S_YHORIZ8",
-
- // Red Side Spring
- "S_RHORIZ1",
- "S_RHORIZ2",
- "S_RHORIZ3",
- "S_RHORIZ4",
- "S_RHORIZ5",
- "S_RHORIZ6",
- "S_RHORIZ7",
- "S_RHORIZ8",
-
- // Blue Side Spring
- "S_BHORIZ1",
- "S_BHORIZ2",
- "S_BHORIZ3",
- "S_BHORIZ4",
- "S_BHORIZ5",
- "S_BHORIZ6",
- "S_BHORIZ7",
- "S_BHORIZ8",
-
- // Booster
- "S_BOOSTERSOUND",
- "S_YELLOWBOOSTERROLLER",
- "S_YELLOWBOOSTERSEG_LEFT",
- "S_YELLOWBOOSTERSEG_RIGHT",
- "S_YELLOWBOOSTERSEG_FACE",
- "S_REDBOOSTERROLLER",
- "S_REDBOOSTERSEG_LEFT",
- "S_REDBOOSTERSEG_RIGHT",
- "S_REDBOOSTERSEG_FACE",
-
- // Rain
- "S_RAIN1",
- "S_RAINRETURN",
-
- // Snowflake
- "S_SNOW1",
- "S_SNOW2",
- "S_SNOW3",
-
- // Water Splish
- "S_SPLISH1",
- "S_SPLISH2",
- "S_SPLISH3",
- "S_SPLISH4",
- "S_SPLISH5",
- "S_SPLISH6",
- "S_SPLISH7",
- "S_SPLISH8",
- "S_SPLISH9",
-
- // Lava Splish
- "S_LAVASPLISH",
-
- // added water splash
- "S_SPLASH1",
- "S_SPLASH2",
- "S_SPLASH3",
-
- // lava/slime damage burn smoke
- "S_SMOKE1",
- "S_SMOKE2",
- "S_SMOKE3",
- "S_SMOKE4",
- "S_SMOKE5",
-
- // Bubbles
- "S_SMALLBUBBLE",
- "S_MEDIUMBUBBLE",
- "S_LARGEBUBBLE1",
- "S_LARGEBUBBLE2",
- "S_EXTRALARGEBUBBLE", // breathable
-
- "S_POP1", // Extra Large bubble goes POP!
-
- "S_WATERZAP",
-
- // Spindash dust
- "S_SPINDUST1",
- "S_SPINDUST2",
- "S_SPINDUST3",
- "S_SPINDUST4",
- "S_SPINDUST_BUBBLE1",
- "S_SPINDUST_BUBBLE2",
- "S_SPINDUST_BUBBLE3",
- "S_SPINDUST_BUBBLE4",
- "S_SPINDUST_FIRE1",
- "S_SPINDUST_FIRE2",
- "S_SPINDUST_FIRE3",
- "S_SPINDUST_FIRE4",
-
- "S_FOG1",
- "S_FOG2",
- "S_FOG3",
- "S_FOG4",
- "S_FOG5",
- "S_FOG6",
- "S_FOG7",
- "S_FOG8",
- "S_FOG9",
- "S_FOG10",
- "S_FOG11",
- "S_FOG12",
- "S_FOG13",
- "S_FOG14",
-
- "S_SEED",
-
- "S_PARTICLE",
-
- // Score Logos
- "S_SCRA", // 100
- "S_SCRB", // 200
- "S_SCRC", // 500
- "S_SCRD", // 1000
- "S_SCRE", // 10000
- "S_SCRF", // 400 (mario)
- "S_SCRG", // 800 (mario)
- "S_SCRH", // 2000 (mario)
- "S_SCRI", // 4000 (mario)
- "S_SCRJ", // 8000 (mario)
- "S_SCRK", // 1UP (mario)
- "S_SCRL", // 10
-
- // Drowning Timer Numbers
- "S_ZERO1",
- "S_ONE1",
- "S_TWO1",
- "S_THREE1",
- "S_FOUR1",
- "S_FIVE1",
-
- "S_ZERO2",
- "S_ONE2",
- "S_TWO2",
- "S_THREE2",
- "S_FOUR2",
- "S_FIVE2",
-
- "S_FLIGHTINDICATOR",
-
- "S_LOCKON1",
- "S_LOCKON2",
- "S_LOCKON3",
- "S_LOCKON4",
- "S_LOCKONINF1",
- "S_LOCKONINF2",
- "S_LOCKONINF3",
- "S_LOCKONINF4",
-
- // Tag Sign
- "S_TTAG",
-
- // Got Flag Sign
- "S_GOTFLAG",
-
- // Finish flag
- "S_FINISHFLAG",
-
- "S_CORK",
- "S_LHRT",
-
- // Red Ring
- "S_RRNG1",
- "S_RRNG2",
- "S_RRNG3",
- "S_RRNG4",
- "S_RRNG5",
- "S_RRNG6",
- "S_RRNG7",
-
- // Weapon Ring Ammo
- "S_BOUNCERINGAMMO",
- "S_RAILRINGAMMO",
- "S_INFINITYRINGAMMO",
- "S_AUTOMATICRINGAMMO",
- "S_EXPLOSIONRINGAMMO",
- "S_SCATTERRINGAMMO",
- "S_GRENADERINGAMMO",
-
- // Weapon pickup
- "S_BOUNCEPICKUP",
- "S_BOUNCEPICKUPFADE1",
- "S_BOUNCEPICKUPFADE2",
- "S_BOUNCEPICKUPFADE3",
- "S_BOUNCEPICKUPFADE4",
- "S_BOUNCEPICKUPFADE5",
- "S_BOUNCEPICKUPFADE6",
- "S_BOUNCEPICKUPFADE7",
- "S_BOUNCEPICKUPFADE8",
-
- "S_RAILPICKUP",
- "S_RAILPICKUPFADE1",
- "S_RAILPICKUPFADE2",
- "S_RAILPICKUPFADE3",
- "S_RAILPICKUPFADE4",
- "S_RAILPICKUPFADE5",
- "S_RAILPICKUPFADE6",
- "S_RAILPICKUPFADE7",
- "S_RAILPICKUPFADE8",
-
- "S_AUTOPICKUP",
- "S_AUTOPICKUPFADE1",
- "S_AUTOPICKUPFADE2",
- "S_AUTOPICKUPFADE3",
- "S_AUTOPICKUPFADE4",
- "S_AUTOPICKUPFADE5",
- "S_AUTOPICKUPFADE6",
- "S_AUTOPICKUPFADE7",
- "S_AUTOPICKUPFADE8",
-
- "S_EXPLODEPICKUP",
- "S_EXPLODEPICKUPFADE1",
- "S_EXPLODEPICKUPFADE2",
- "S_EXPLODEPICKUPFADE3",
- "S_EXPLODEPICKUPFADE4",
- "S_EXPLODEPICKUPFADE5",
- "S_EXPLODEPICKUPFADE6",
- "S_EXPLODEPICKUPFADE7",
- "S_EXPLODEPICKUPFADE8",
-
- "S_SCATTERPICKUP",
- "S_SCATTERPICKUPFADE1",
- "S_SCATTERPICKUPFADE2",
- "S_SCATTERPICKUPFADE3",
- "S_SCATTERPICKUPFADE4",
- "S_SCATTERPICKUPFADE5",
- "S_SCATTERPICKUPFADE6",
- "S_SCATTERPICKUPFADE7",
- "S_SCATTERPICKUPFADE8",
-
- "S_GRENADEPICKUP",
- "S_GRENADEPICKUPFADE1",
- "S_GRENADEPICKUPFADE2",
- "S_GRENADEPICKUPFADE3",
- "S_GRENADEPICKUPFADE4",
- "S_GRENADEPICKUPFADE5",
- "S_GRENADEPICKUPFADE6",
- "S_GRENADEPICKUPFADE7",
- "S_GRENADEPICKUPFADE8",
-
- // Thrown Weapon Rings
- "S_THROWNBOUNCE1",
- "S_THROWNBOUNCE2",
- "S_THROWNBOUNCE3",
- "S_THROWNBOUNCE4",
- "S_THROWNBOUNCE5",
- "S_THROWNBOUNCE6",
- "S_THROWNBOUNCE7",
- "S_THROWNINFINITY1",
- "S_THROWNINFINITY2",
- "S_THROWNINFINITY3",
- "S_THROWNINFINITY4",
- "S_THROWNINFINITY5",
- "S_THROWNINFINITY6",
- "S_THROWNINFINITY7",
- "S_THROWNAUTOMATIC1",
- "S_THROWNAUTOMATIC2",
- "S_THROWNAUTOMATIC3",
- "S_THROWNAUTOMATIC4",
- "S_THROWNAUTOMATIC5",
- "S_THROWNAUTOMATIC6",
- "S_THROWNAUTOMATIC7",
- "S_THROWNEXPLOSION1",
- "S_THROWNEXPLOSION2",
- "S_THROWNEXPLOSION3",
- "S_THROWNEXPLOSION4",
- "S_THROWNEXPLOSION5",
- "S_THROWNEXPLOSION6",
- "S_THROWNEXPLOSION7",
- "S_THROWNGRENADE1",
- "S_THROWNGRENADE2",
- "S_THROWNGRENADE3",
- "S_THROWNGRENADE4",
- "S_THROWNGRENADE5",
- "S_THROWNGRENADE6",
- "S_THROWNGRENADE7",
- "S_THROWNGRENADE8",
- "S_THROWNGRENADE9",
- "S_THROWNGRENADE10",
- "S_THROWNGRENADE11",
- "S_THROWNGRENADE12",
- "S_THROWNGRENADE13",
- "S_THROWNGRENADE14",
- "S_THROWNGRENADE15",
- "S_THROWNGRENADE16",
- "S_THROWNGRENADE17",
- "S_THROWNGRENADE18",
- "S_THROWNSCATTER",
-
- "S_RINGEXPLODE",
-
- "S_COIN1",
- "S_COIN2",
- "S_COIN3",
- "S_COINSPARKLE1",
- "S_COINSPARKLE2",
- "S_COINSPARKLE3",
- "S_COINSPARKLE4",
- "S_GOOMBA1",
- "S_GOOMBA1B",
- "S_GOOMBA2",
- "S_GOOMBA3",
- "S_GOOMBA4",
- "S_GOOMBA5",
- "S_GOOMBA6",
- "S_GOOMBA7",
- "S_GOOMBA8",
- "S_GOOMBA9",
- "S_GOOMBA_DEAD",
- "S_BLUEGOOMBA1",
- "S_BLUEGOOMBA1B",
- "S_BLUEGOOMBA2",
- "S_BLUEGOOMBA3",
- "S_BLUEGOOMBA4",
- "S_BLUEGOOMBA5",
- "S_BLUEGOOMBA6",
- "S_BLUEGOOMBA7",
- "S_BLUEGOOMBA8",
- "S_BLUEGOOMBA9",
- "S_BLUEGOOMBA_DEAD",
-
- // Mario-specific stuff
- "S_FIREFLOWER1",
- "S_FIREFLOWER2",
- "S_FIREFLOWER3",
- "S_FIREFLOWER4",
- "S_FIREBALL",
- "S_FIREBALLTRAIL1",
- "S_FIREBALLTRAIL2",
- "S_SHELL",
- "S_PUMA_START1",
- "S_PUMA_START2",
- "S_PUMA_UP1",
- "S_PUMA_UP2",
- "S_PUMA_UP3",
- "S_PUMA_DOWN1",
- "S_PUMA_DOWN2",
- "S_PUMA_DOWN3",
- "S_PUMATRAIL1",
- "S_PUMATRAIL2",
- "S_PUMATRAIL3",
- "S_PUMATRAIL4",
- "S_HAMMER",
- "S_KOOPA1",
- "S_KOOPA2",
- "S_KOOPAFLAME1",
- "S_KOOPAFLAME2",
- "S_KOOPAFLAME3",
- "S_AXE1",
- "S_AXE2",
- "S_AXE3",
- "S_MARIOBUSH1",
- "S_MARIOBUSH2",
- "S_TOAD",
-
- // Nights-specific stuff
- "S_NIGHTSDRONE_MAN1",
- "S_NIGHTSDRONE_MAN2",
- "S_NIGHTSDRONE_SPARKLING1",
- "S_NIGHTSDRONE_SPARKLING2",
- "S_NIGHTSDRONE_SPARKLING3",
- "S_NIGHTSDRONE_SPARKLING4",
- "S_NIGHTSDRONE_SPARKLING5",
- "S_NIGHTSDRONE_SPARKLING6",
- "S_NIGHTSDRONE_SPARKLING7",
- "S_NIGHTSDRONE_SPARKLING8",
- "S_NIGHTSDRONE_SPARKLING9",
- "S_NIGHTSDRONE_SPARKLING10",
- "S_NIGHTSDRONE_SPARKLING11",
- "S_NIGHTSDRONE_SPARKLING12",
- "S_NIGHTSDRONE_SPARKLING13",
- "S_NIGHTSDRONE_SPARKLING14",
- "S_NIGHTSDRONE_SPARKLING15",
- "S_NIGHTSDRONE_SPARKLING16",
- "S_NIGHTSDRONE_GOAL1",
- "S_NIGHTSDRONE_GOAL2",
- "S_NIGHTSDRONE_GOAL3",
- "S_NIGHTSDRONE_GOAL4",
-
- "S_NIGHTSPARKLE1",
- "S_NIGHTSPARKLE2",
- "S_NIGHTSPARKLE3",
- "S_NIGHTSPARKLE4",
- "S_NIGHTSPARKLESUPER1",
- "S_NIGHTSPARKLESUPER2",
- "S_NIGHTSPARKLESUPER3",
- "S_NIGHTSPARKLESUPER4",
- "S_NIGHTSLOOPHELPER",
-
- // NiGHTS bumper
- "S_NIGHTSBUMPER1",
- "S_NIGHTSBUMPER2",
- "S_NIGHTSBUMPER3",
- "S_NIGHTSBUMPER4",
- "S_NIGHTSBUMPER5",
- "S_NIGHTSBUMPER6",
- "S_NIGHTSBUMPER7",
- "S_NIGHTSBUMPER8",
- "S_NIGHTSBUMPER9",
- "S_NIGHTSBUMPER10",
- "S_NIGHTSBUMPER11",
- "S_NIGHTSBUMPER12",
-
- "S_HOOP",
- "S_HOOP_XMASA",
- "S_HOOP_XMASB",
-
- "S_NIGHTSCORE10",
- "S_NIGHTSCORE20",
- "S_NIGHTSCORE30",
- "S_NIGHTSCORE40",
- "S_NIGHTSCORE50",
- "S_NIGHTSCORE60",
- "S_NIGHTSCORE70",
- "S_NIGHTSCORE80",
- "S_NIGHTSCORE90",
- "S_NIGHTSCORE100",
- "S_NIGHTSCORE10_2",
- "S_NIGHTSCORE20_2",
- "S_NIGHTSCORE30_2",
- "S_NIGHTSCORE40_2",
- "S_NIGHTSCORE50_2",
- "S_NIGHTSCORE60_2",
- "S_NIGHTSCORE70_2",
- "S_NIGHTSCORE80_2",
- "S_NIGHTSCORE90_2",
- "S_NIGHTSCORE100_2",
-
- // NiGHTS Paraloop Powerups
- "S_NIGHTSSUPERLOOP",
- "S_NIGHTSDRILLREFILL",
- "S_NIGHTSHELPER",
- "S_NIGHTSEXTRATIME",
- "S_NIGHTSLINKFREEZE",
- "S_EGGCAPSULE",
-
- // Orbiting Chaos Emeralds
- "S_ORBITEM1",
- "S_ORBITEM2",
- "S_ORBITEM3",
- "S_ORBITEM4",
- "S_ORBITEM5",
- "S_ORBITEM6",
- "S_ORBITEM7",
- "S_ORBITEM8",
- "S_ORBIDYA1",
- "S_ORBIDYA2",
- "S_ORBIDYA3",
- "S_ORBIDYA4",
- "S_ORBIDYA5",
-
- // "Flicky" helper
- "S_NIGHTOPIANHELPER1",
- "S_NIGHTOPIANHELPER2",
- "S_NIGHTOPIANHELPER3",
- "S_NIGHTOPIANHELPER4",
- "S_NIGHTOPIANHELPER5",
- "S_NIGHTOPIANHELPER6",
- "S_NIGHTOPIANHELPER7",
- "S_NIGHTOPIANHELPER8",
- "S_NIGHTOPIANHELPER9",
-
- // Nightopian
- "S_PIAN0",
- "S_PIAN1",
- "S_PIAN2",
- "S_PIAN3",
- "S_PIAN4",
- "S_PIAN5",
- "S_PIAN6",
- "S_PIANSING",
-
- // Shleep
- "S_SHLEEP1",
- "S_SHLEEP2",
- "S_SHLEEP3",
- "S_SHLEEP4",
- "S_SHLEEPBOUNCE1",
- "S_SHLEEPBOUNCE2",
- "S_SHLEEPBOUNCE3",
-
- // Secret badniks and hazards, shhhh
- "S_PENGUINATOR_LOOK",
- "S_PENGUINATOR_WADDLE1",
- "S_PENGUINATOR_WADDLE2",
- "S_PENGUINATOR_WADDLE3",
- "S_PENGUINATOR_WADDLE4",
- "S_PENGUINATOR_SLIDE1",
- "S_PENGUINATOR_SLIDE2",
- "S_PENGUINATOR_SLIDE3",
- "S_PENGUINATOR_SLIDE4",
- "S_PENGUINATOR_SLIDE5",
-
- "S_POPHAT_LOOK",
- "S_POPHAT_SHOOT1",
- "S_POPHAT_SHOOT2",
- "S_POPHAT_SHOOT3",
- "S_POPHAT_SHOOT4",
- "S_POPSHOT",
- "S_POPSHOT_TRAIL",
-
- "S_HIVEELEMENTAL_LOOK",
- "S_HIVEELEMENTAL_PREPARE1",
- "S_HIVEELEMENTAL_PREPARE2",
- "S_HIVEELEMENTAL_SHOOT1",
- "S_HIVEELEMENTAL_SHOOT2",
- "S_HIVEELEMENTAL_DORMANT",
- "S_HIVEELEMENTAL_PAIN",
- "S_HIVEELEMENTAL_DIE1",
- "S_HIVEELEMENTAL_DIE2",
- "S_HIVEELEMENTAL_DIE3",
-
- "S_BUMBLEBORE_SPAWN",
- "S_BUMBLEBORE_LOOK1",
- "S_BUMBLEBORE_LOOK2",
- "S_BUMBLEBORE_FLY1",
- "S_BUMBLEBORE_FLY2",
- "S_BUMBLEBORE_RAISE",
- "S_BUMBLEBORE_FALL1",
- "S_BUMBLEBORE_FALL2",
- "S_BUMBLEBORE_STUCK1",
- "S_BUMBLEBORE_STUCK2",
- "S_BUMBLEBORE_DIE",
-
- "S_BUGGLEIDLE",
- "S_BUGGLEFLY",
-
- "S_SMASHSPIKE_FLOAT",
- "S_SMASHSPIKE_EASE1",
- "S_SMASHSPIKE_EASE2",
- "S_SMASHSPIKE_FALL",
- "S_SMASHSPIKE_STOMP1",
- "S_SMASHSPIKE_STOMP2",
- "S_SMASHSPIKE_RISE1",
- "S_SMASHSPIKE_RISE2",
-
- "S_CACO_LOOK",
- "S_CACO_WAKE1",
- "S_CACO_WAKE2",
- "S_CACO_WAKE3",
- "S_CACO_WAKE4",
- "S_CACO_ROAR",
- "S_CACO_CHASE",
- "S_CACO_CHASE_REPEAT",
- "S_CACO_RANDOM",
- "S_CACO_PREPARE_SOUND",
- "S_CACO_PREPARE1",
- "S_CACO_PREPARE2",
- "S_CACO_PREPARE3",
- "S_CACO_SHOOT_SOUND",
- "S_CACO_SHOOT1",
- "S_CACO_SHOOT2",
- "S_CACO_CLOSE",
- "S_CACO_DIE_FLAGS",
- "S_CACO_DIE_GIB1",
- "S_CACO_DIE_GIB2",
- "S_CACO_DIE_SCREAM",
- "S_CACO_DIE_SHATTER",
- "S_CACO_DIE_FALL",
- "S_CACOSHARD_RANDOMIZE",
- "S_CACOSHARD1_1",
- "S_CACOSHARD1_2",
- "S_CACOSHARD2_1",
- "S_CACOSHARD2_2",
- "S_CACOFIRE1",
- "S_CACOFIRE2",
- "S_CACOFIRE3",
- "S_CACOFIRE_EXPLODE1",
- "S_CACOFIRE_EXPLODE2",
- "S_CACOFIRE_EXPLODE3",
- "S_CACOFIRE_EXPLODE4",
-
- "S_SPINBOBERT_MOVE_FLIPUP",
- "S_SPINBOBERT_MOVE_UP",
- "S_SPINBOBERT_MOVE_FLIPDOWN",
- "S_SPINBOBERT_MOVE_DOWN",
- "S_SPINBOBERT_FIRE_MOVE",
- "S_SPINBOBERT_FIRE_GHOST",
- "S_SPINBOBERT_FIRE_TRAIL1",
- "S_SPINBOBERT_FIRE_TRAIL2",
- "S_SPINBOBERT_FIRE_TRAIL3",
-
- "S_HANGSTER_LOOK",
- "S_HANGSTER_SWOOP1",
- "S_HANGSTER_SWOOP2",
- "S_HANGSTER_ARC1",
- "S_HANGSTER_ARC2",
- "S_HANGSTER_ARC3",
- "S_HANGSTER_FLY1",
- "S_HANGSTER_FLY2",
- "S_HANGSTER_FLY3",
- "S_HANGSTER_FLY4",
- "S_HANGSTER_FLYREPEAT",
- "S_HANGSTER_ARCUP1",
- "S_HANGSTER_ARCUP2",
- "S_HANGSTER_ARCUP3",
- "S_HANGSTER_RETURN1",
- "S_HANGSTER_RETURN2",
- "S_HANGSTER_RETURN3",
-
- "S_CRUMBLE1",
- "S_CRUMBLE2",
-
- // Spark
- "S_SPRK1",
- "S_SPRK2",
- "S_SPRK3",
-
- // Robot Explosion
- "S_XPLD_FLICKY",
- "S_XPLD1",
- "S_XPLD2",
- "S_XPLD3",
- "S_XPLD4",
- "S_XPLD5",
- "S_XPLD6",
- "S_XPLD_EGGTRAP",
-
- // Underwater Explosion
- "S_WPLD1",
- "S_WPLD2",
- "S_WPLD3",
- "S_WPLD4",
- "S_WPLD5",
- "S_WPLD6",
-
- "S_DUST1",
- "S_DUST2",
- "S_DUST3",
- "S_DUST4",
-
- "S_ROCKSPAWN",
-
- "S_ROCKCRUMBLEA",
- "S_ROCKCRUMBLEB",
- "S_ROCKCRUMBLEC",
- "S_ROCKCRUMBLED",
- "S_ROCKCRUMBLEE",
- "S_ROCKCRUMBLEF",
- "S_ROCKCRUMBLEG",
- "S_ROCKCRUMBLEH",
- "S_ROCKCRUMBLEI",
- "S_ROCKCRUMBLEJ",
- "S_ROCKCRUMBLEK",
- "S_ROCKCRUMBLEL",
- "S_ROCKCRUMBLEM",
- "S_ROCKCRUMBLEN",
- "S_ROCKCRUMBLEO",
- "S_ROCKCRUMBLEP",
-
- // Level debris
- "S_GFZDEBRIS",
- "S_BRICKDEBRIS",
- "S_WOODDEBRIS",
- "S_REDBRICKDEBRIS",
- "S_BLUEBRICKDEBRIS",
- "S_YELLOWBRICKDEBRIS",
-
-#ifdef SEENAMES
- "S_NAMECHECK",
-#endif
-};
-
-// RegEx to generate this from info.h: ^\tMT_([^,]+), --> \t"MT_\1",
-// I am leaving the prefixes solely for clarity to programmers,
-// because sadly no one remembers this place while searching for full state names.
-static const char *const MOBJTYPE_LIST[] = { // array length left dynamic for sanity testing later.
- "MT_NULL",
- "MT_UNKNOWN",
-
- "MT_THOK", // Thok! mobj
- "MT_PLAYER",
- "MT_TAILSOVERLAY", // c:
- "MT_METALJETFUME",
-
- // Enemies
- "MT_BLUECRAWLA", // Crawla (Blue)
- "MT_REDCRAWLA", // Crawla (Red)
- "MT_GFZFISH", // SDURF
- "MT_GOLDBUZZ", // Buzz (Gold)
- "MT_REDBUZZ", // Buzz (Red)
- "MT_JETTBOMBER", // Jetty-Syn Bomber
- "MT_JETTGUNNER", // Jetty-Syn Gunner
- "MT_CRAWLACOMMANDER", // Crawla Commander
- "MT_DETON", // Deton
- "MT_SKIM", // Skim mine dropper
- "MT_TURRET", // Industrial Turret
- "MT_POPUPTURRET", // Pop-Up Turret
- "MT_SPINCUSHION", // Spincushion
- "MT_CRUSHSTACEAN", // Crushstacean
- "MT_CRUSHCLAW", // Big meaty claw
- "MT_CRUSHCHAIN", // Chain
- "MT_BANPYURA", // Banpyura
- "MT_BANPSPRING", // Banpyura spring
- "MT_JETJAW", // Jet Jaw
- "MT_SNAILER", // Snailer
- "MT_VULTURE", // BASH
- "MT_POINTY", // Pointy
- "MT_POINTYBALL", // Pointy Ball
- "MT_ROBOHOOD", // Robo-Hood
- "MT_FACESTABBER", // Castlebot Facestabber
- "MT_FACESTABBERSPEAR", // Castlebot Facestabber spear aura
- "MT_EGGGUARD", // Egg Guard
- "MT_EGGSHIELD", // Egg Guard's shield
- "MT_GSNAPPER", // Green Snapper
- "MT_SNAPPER_LEG", // Green Snapper leg
- "MT_SNAPPER_HEAD", // Green Snapper head
- "MT_MINUS", // Minus
- "MT_MINUSDIRT", // Minus dirt
- "MT_SPRINGSHELL", // Spring Shell
- "MT_YELLOWSHELL", // Spring Shell (yellow)
- "MT_UNIDUS", // Unidus
- "MT_UNIBALL", // Unidus Ball
- "MT_CANARIVORE", // Canarivore
- "MT_CANARIVORE_GAS", // Canarivore gas
- "MT_PYREFLY", // Pyre Fly
- "MT_PYREFLY_FIRE", // Pyre Fly fire
- "MT_PTERABYTESPAWNER", // Pterabyte spawner
- "MT_PTERABYTEWAYPOINT", // Pterabyte waypoint
- "MT_PTERABYTE", // Pterabyte
- "MT_DRAGONBOMBER", // Dragonbomber
- "MT_DRAGONWING", // Dragonbomber wing
- "MT_DRAGONTAIL", // Dragonbomber tail segment
- "MT_DRAGONMINE", // Dragonbomber mine
-
- // Generic Boss Items
- "MT_BOSSEXPLODE",
- "MT_SONIC3KBOSSEXPLODE",
- "MT_BOSSFLYPOINT",
- "MT_EGGTRAP",
- "MT_BOSS3WAYPOINT",
- "MT_BOSS9GATHERPOINT",
- "MT_BOSSJUNK",
-
- // Boss 1
- "MT_EGGMOBILE",
- "MT_JETFUME1",
- "MT_EGGMOBILE_BALL",
- "MT_EGGMOBILE_TARGET",
- "MT_EGGMOBILE_FIRE",
-
- // Boss 2
- "MT_EGGMOBILE2",
- "MT_EGGMOBILE2_POGO",
- "MT_GOOP",
- "MT_GOOPTRAIL",
-
- // Boss 3
- "MT_EGGMOBILE3",
- "MT_FAKEMOBILE",
- "MT_SHOCKWAVE",
-
- // Boss 4
- "MT_EGGMOBILE4",
- "MT_EGGMOBILE4_MACE",
- "MT_JETFLAME",
- "MT_EGGROBO1",
- "MT_EGGROBO1JET",
-
- // Boss 5
- "MT_FANG",
- "MT_BROKENROBOT",
- "MT_VWREF",
- "MT_VWREB",
- "MT_PROJECTORLIGHT",
- "MT_FBOMB",
- "MT_TNTDUST", // also used by barrel
- "MT_FSGNA",
- "MT_FSGNB",
- "MT_FANGWAYPOINT",
-
- // Black Eggman (Boss 7)
- "MT_BLACKEGGMAN",
- "MT_BLACKEGGMAN_HELPER",
- "MT_BLACKEGGMAN_GOOPFIRE",
- "MT_BLACKEGGMAN_MISSILE",
-
- // New Very-Last-Minute 2.1 Brak Eggman (Cy-Brak-demon)
- "MT_CYBRAKDEMON",
- "MT_CYBRAKDEMON_ELECTRIC_BARRIER",
- "MT_CYBRAKDEMON_MISSILE",
- "MT_CYBRAKDEMON_FLAMESHOT",
- "MT_CYBRAKDEMON_FLAMEREST",
- "MT_CYBRAKDEMON_TARGET_RETICULE",
- "MT_CYBRAKDEMON_TARGET_DOT",
- "MT_CYBRAKDEMON_NAPALM_BOMB_LARGE",
- "MT_CYBRAKDEMON_NAPALM_BOMB_SMALL",
- "MT_CYBRAKDEMON_NAPALM_FLAMES",
- "MT_CYBRAKDEMON_VILE_EXPLOSION",
-
- // Metal Sonic (Boss 9)
- "MT_METALSONIC_RACE",
- "MT_METALSONIC_BATTLE",
- "MT_MSSHIELD_FRONT",
- "MT_MSGATHER",
-
- // Collectible Items
- "MT_RING",
- "MT_FLINGRING", // Lost ring
- "MT_BLUESPHERE", // Blue sphere for special stages
- "MT_FLINGBLUESPHERE", // Lost blue sphere
- "MT_BOMBSPHERE",
- "MT_REDTEAMRING", //Rings collectable by red team.
- "MT_BLUETEAMRING", //Rings collectable by blue team.
- "MT_TOKEN", // Special Stage token for special stage
- "MT_REDFLAG", // Red CTF Flag
- "MT_BLUEFLAG", // Blue CTF Flag
- "MT_EMBLEM",
- "MT_EMERALD1",
- "MT_EMERALD2",
- "MT_EMERALD3",
- "MT_EMERALD4",
- "MT_EMERALD5",
- "MT_EMERALD6",
- "MT_EMERALD7",
- "MT_EMERHUNT", // Emerald Hunt
- "MT_EMERALDSPAWN", // Emerald spawner w/ delay
- "MT_FLINGEMERALD", // Lost emerald
-
- // Springs and others
- "MT_FAN",
- "MT_STEAM",
- "MT_BUMPER",
- "MT_BALLOON",
-
- "MT_YELLOWSPRING",
- "MT_REDSPRING",
- "MT_BLUESPRING",
- "MT_YELLOWDIAG",
- "MT_REDDIAG",
- "MT_BLUEDIAG",
- "MT_YELLOWHORIZ",
- "MT_REDHORIZ",
- "MT_BLUEHORIZ",
-
- "MT_BOOSTERSEG",
- "MT_BOOSTERROLLER",
- "MT_YELLOWBOOSTER",
- "MT_REDBOOSTER",
-
- // Interactive Objects
- "MT_BUBBLES", // Bubble source
- "MT_SIGN", // Level end sign
- "MT_SPIKEBALL", // Spike Ball
- "MT_SPINFIRE",
- "MT_SPIKE",
- "MT_WALLSPIKE",
- "MT_WALLSPIKEBASE",
- "MT_STARPOST",
- "MT_BIGMINE",
- "MT_BLASTEXECUTOR",
- "MT_CANNONLAUNCHER",
-
- // Monitor miscellany
- "MT_BOXSPARKLE",
-
- // Monitor boxes -- regular
- "MT_RING_BOX",
- "MT_PITY_BOX",
- "MT_ATTRACT_BOX",
- "MT_FORCE_BOX",
- "MT_ARMAGEDDON_BOX",
- "MT_WHIRLWIND_BOX",
- "MT_ELEMENTAL_BOX",
- "MT_SNEAKERS_BOX",
- "MT_INVULN_BOX",
- "MT_1UP_BOX",
- "MT_EGGMAN_BOX",
- "MT_MIXUP_BOX",
- "MT_MYSTERY_BOX",
- "MT_GRAVITY_BOX",
- "MT_RECYCLER_BOX",
- "MT_SCORE1K_BOX",
- "MT_SCORE10K_BOX",
- "MT_FLAMEAURA_BOX",
- "MT_BUBBLEWRAP_BOX",
- "MT_THUNDERCOIN_BOX",
-
- // Monitor boxes -- repeating (big) boxes
- "MT_PITY_GOLDBOX",
- "MT_ATTRACT_GOLDBOX",
- "MT_FORCE_GOLDBOX",
- "MT_ARMAGEDDON_GOLDBOX",
- "MT_WHIRLWIND_GOLDBOX",
- "MT_ELEMENTAL_GOLDBOX",
- "MT_SNEAKERS_GOLDBOX",
- "MT_INVULN_GOLDBOX",
- "MT_EGGMAN_GOLDBOX",
- "MT_GRAVITY_GOLDBOX",
- "MT_FLAMEAURA_GOLDBOX",
- "MT_BUBBLEWRAP_GOLDBOX",
- "MT_THUNDERCOIN_GOLDBOX",
-
- // Monitor boxes -- special
- "MT_RING_REDBOX",
- "MT_RING_BLUEBOX",
-
- // Monitor icons
- "MT_RING_ICON",
- "MT_PITY_ICON",
- "MT_ATTRACT_ICON",
- "MT_FORCE_ICON",
- "MT_ARMAGEDDON_ICON",
- "MT_WHIRLWIND_ICON",
- "MT_ELEMENTAL_ICON",
- "MT_SNEAKERS_ICON",
- "MT_INVULN_ICON",
- "MT_1UP_ICON",
- "MT_EGGMAN_ICON",
- "MT_MIXUP_ICON",
- "MT_GRAVITY_ICON",
- "MT_RECYCLER_ICON",
- "MT_SCORE1K_ICON",
- "MT_SCORE10K_ICON",
- "MT_FLAMEAURA_ICON",
- "MT_BUBBLEWRAP_ICON",
- "MT_THUNDERCOIN_ICON",
-
- // Projectiles
- "MT_ROCKET",
- "MT_LASER",
- "MT_TORPEDO",
- "MT_TORPEDO2", // silent
- "MT_ENERGYBALL",
- "MT_MINE", // Skim/Jetty-Syn mine
- "MT_JETTBULLET", // Jetty-Syn Bullet
- "MT_TURRETLASER",
- "MT_CANNONBALL", // Cannonball
- "MT_CANNONBALLDECOR", // Decorative/still cannonball
- "MT_ARROW", // Arrow
- "MT_DEMONFIRE", // Glaregoyle fire
-
- // The letter
- "MT_LETTER",
-
- // Greenflower Scenery
- "MT_GFZFLOWER1",
- "MT_GFZFLOWER2",
- "MT_GFZFLOWER3",
-
- "MT_BLUEBERRYBUSH",
- "MT_BERRYBUSH",
- "MT_BUSH",
-
- // Trees (both GFZ and misc)
- "MT_GFZTREE",
- "MT_GFZBERRYTREE",
- "MT_GFZCHERRYTREE",
- "MT_CHECKERTREE",
- "MT_CHECKERSUNSETTREE",
- "MT_FHZTREE", // Frozen Hillside
- "MT_FHZPINKTREE",
- "MT_POLYGONTREE",
- "MT_BUSHTREE",
- "MT_BUSHREDTREE",
- "MT_SPRINGTREE",
-
- // Techno Hill Scenery
- "MT_THZFLOWER1",
- "MT_THZFLOWER2",
- "MT_THZFLOWER3",
- "MT_THZTREE", // Steam whistle tree/bush
- "MT_THZTREEBRANCH", // branch of said tree
- "MT_ALARM",
-
- // Deep Sea Scenery
- "MT_GARGOYLE", // Deep Sea Gargoyle
- "MT_BIGGARGOYLE", // Deep Sea Gargoyle (Big)
- "MT_SEAWEED", // DSZ Seaweed
- "MT_WATERDRIP", // Dripping Water source
- "MT_WATERDROP", // Water drop from dripping water
- "MT_CORAL1", // Coral
- "MT_CORAL2",
- "MT_CORAL3",
- "MT_CORAL4",
- "MT_CORAL5",
- "MT_BLUECRYSTAL", // Blue Crystal
- "MT_KELP", // Kelp
- "MT_ANIMALGAETOP", // Animated algae top
- "MT_ANIMALGAESEG", // Animated algae segment
- "MT_DSZSTALAGMITE", // Deep Sea 1 Stalagmite
- "MT_DSZ2STALAGMITE", // Deep Sea 2 Stalagmite
- "MT_LIGHTBEAM", // DSZ Light beam
-
- // Castle Eggman Scenery
- "MT_CHAIN", // CEZ Chain
- "MT_FLAME", // Flame (has corona)
- "MT_FLAMEPARTICLE",
- "MT_EGGSTATUE", // Eggman Statue
- "MT_MACEPOINT", // Mace rotation point
- "MT_CHAINMACEPOINT", // Combination of chains and maces point
- "MT_SPRINGBALLPOINT", // Spring ball point
- "MT_CHAINPOINT", // Mace chain
- "MT_HIDDEN_SLING", // Spin mace chain (activatable)
- "MT_FIREBARPOINT", // Firebar
- "MT_CUSTOMMACEPOINT", // Custom mace
- "MT_SMALLMACECHAIN", // Small Mace Chain
- "MT_BIGMACECHAIN", // Big Mace Chain
- "MT_SMALLMACE", // Small Mace
- "MT_BIGMACE", // Big Mace
- "MT_SMALLGRABCHAIN", // Small Grab Chain
- "MT_BIGGRABCHAIN", // Big Grab Chain
- "MT_YELLOWSPRINGBALL", // Yellow spring on a ball
- "MT_REDSPRINGBALL", // Red spring on a ball
- "MT_SMALLFIREBAR", // Small Firebar
- "MT_BIGFIREBAR", // Big Firebar
- "MT_CEZFLOWER", // Flower
- "MT_CEZPOLE1", // Pole (with red banner)
- "MT_CEZPOLE2", // Pole (with blue banner)
- "MT_CEZBANNER1", // Banner (red)
- "MT_CEZBANNER2", // Banner (blue)
- "MT_PINETREE", // Pine Tree
- "MT_CEZBUSH1", // Bush 1
- "MT_CEZBUSH2", // Bush 2
- "MT_CANDLE", // Candle
- "MT_CANDLEPRICKET", // Candle pricket
- "MT_FLAMEHOLDER", // Flame holder
- "MT_FIRETORCH", // Fire torch
- "MT_WAVINGFLAG1", // Waving flag (red)
- "MT_WAVINGFLAG2", // Waving flag (blue)
- "MT_WAVINGFLAGSEG1", // Waving flag segment (red)
- "MT_WAVINGFLAGSEG2", // Waving flag segment (blue)
- "MT_CRAWLASTATUE", // Crawla statue
- "MT_FACESTABBERSTATUE", // Facestabber statue
- "MT_SUSPICIOUSFACESTABBERSTATUE", // :eggthinking:
- "MT_BRAMBLES", // Brambles
-
- // Arid Canyon Scenery
- "MT_BIGTUMBLEWEED",
- "MT_LITTLETUMBLEWEED",
- "MT_CACTI1", // Tiny Red Flower Cactus
- "MT_CACTI2", // Small Red Flower Cactus
- "MT_CACTI3", // Tiny Blue Flower Cactus
- "MT_CACTI4", // Small Blue Flower Cactus
- "MT_CACTI5", // Prickly Pear
- "MT_CACTI6", // Barrel Cactus
- "MT_CACTI7", // Tall Barrel Cactus
- "MT_CACTI8", // Armed Cactus
- "MT_CACTI9", // Ball Cactus
- "MT_CACTI10", // Tiny Cactus
- "MT_CACTI11", // Small Cactus
- "MT_CACTITINYSEG", // Tiny Cactus Segment
- "MT_CACTISMALLSEG", // Small Cactus Segment
- "MT_ARIDSIGN_CAUTION", // Caution Sign
- "MT_ARIDSIGN_CACTI", // Cacti Sign
- "MT_ARIDSIGN_SHARPTURN", // Sharp Turn Sign
- "MT_OILLAMP",
- "MT_TNTBARREL",
- "MT_PROXIMITYTNT",
- "MT_DUSTDEVIL",
- "MT_DUSTLAYER",
- "MT_ARIDDUST",
- "MT_MINECART",
- "MT_MINECARTSEG",
- "MT_MINECARTSPAWNER",
- "MT_MINECARTEND",
- "MT_MINECARTENDSOLID",
- "MT_MINECARTSIDEMARK",
- "MT_MINECARTSPARK",
- "MT_SALOONDOOR",
- "MT_SALOONDOORCENTER",
- "MT_TRAINCAMEOSPAWNER",
- "MT_TRAINSEG",
- "MT_TRAINDUSTSPAWNER",
- "MT_TRAINSTEAMSPAWNER",
- "MT_MINECARTSWITCHPOINT",
-
- // Red Volcano Scenery
- "MT_FLAMEJET",
- "MT_VERTICALFLAMEJET",
- "MT_FLAMEJETFLAME",
-
- "MT_FJSPINAXISA", // Counter-clockwise
- "MT_FJSPINAXISB", // Clockwise
-
- "MT_FLAMEJETFLAMEB", // Blade's flame
-
- "MT_LAVAFALL",
- "MT_LAVAFALL_LAVA",
- "MT_LAVAFALLROCK",
-
- "MT_ROLLOUTSPAWN",
- "MT_ROLLOUTROCK",
-
- "MT_BIGFERNLEAF",
- "MT_BIGFERN",
- "MT_JUNGLEPALM",
- "MT_TORCHFLOWER",
- "MT_WALLVINE_LONG",
- "MT_WALLVINE_SHORT",
-
- // Dark City Scenery
-
- // Egg Rock Scenery
-
- // Azure Temple Scenery
- "MT_GLAREGOYLE",
- "MT_GLAREGOYLEUP",
- "MT_GLAREGOYLEDOWN",
- "MT_GLAREGOYLELONG",
- "MT_TARGET", // AKA Red Crystal
- "MT_GREENFLAME",
- "MT_BLUEGARGOYLE",
-
- // Stalagmites
- "MT_STALAGMITE0",
- "MT_STALAGMITE1",
- "MT_STALAGMITE2",
- "MT_STALAGMITE3",
- "MT_STALAGMITE4",
- "MT_STALAGMITE5",
- "MT_STALAGMITE6",
- "MT_STALAGMITE7",
- "MT_STALAGMITE8",
- "MT_STALAGMITE9",
-
- // Christmas Scenery
- "MT_XMASPOLE",
- "MT_CANDYCANE",
- "MT_SNOWMAN", // normal
- "MT_SNOWMANHAT", // with hat + scarf
- "MT_LAMPPOST1", // normal
- "MT_LAMPPOST2", // with snow
- "MT_HANGSTAR",
- "MT_MISTLETOE",
- // Xmas GFZ bushes
- "MT_XMASBLUEBERRYBUSH",
- "MT_XMASBERRYBUSH",
- "MT_XMASBUSH",
- // FHZ
- "MT_FHZICE1",
- "MT_FHZICE2",
- "MT_ROSY",
- "MT_CDLHRT",
-
- // Halloween Scenery
- // Pumpkins
- "MT_JACKO1",
- "MT_JACKO2",
- "MT_JACKO3",
- // Dr Seuss Trees
- "MT_HHZTREE_TOP",
- "MT_HHZTREE_PART",
- // Misc
- "MT_HHZSHROOM",
- "MT_HHZGRASS",
- "MT_HHZTENTACLE1",
- "MT_HHZTENTACLE2",
- "MT_HHZSTALAGMITE_TALL",
- "MT_HHZSTALAGMITE_SHORT",
-
- // Botanic Serenity scenery
- "MT_BSZTALLFLOWER_RED",
- "MT_BSZTALLFLOWER_PURPLE",
- "MT_BSZTALLFLOWER_BLUE",
- "MT_BSZTALLFLOWER_CYAN",
- "MT_BSZTALLFLOWER_YELLOW",
- "MT_BSZTALLFLOWER_ORANGE",
- "MT_BSZFLOWER_RED",
- "MT_BSZFLOWER_PURPLE",
- "MT_BSZFLOWER_BLUE",
- "MT_BSZFLOWER_CYAN",
- "MT_BSZFLOWER_YELLOW",
- "MT_BSZFLOWER_ORANGE",
- "MT_BSZSHORTFLOWER_RED",
- "MT_BSZSHORTFLOWER_PURPLE",
- "MT_BSZSHORTFLOWER_BLUE",
- "MT_BSZSHORTFLOWER_CYAN",
- "MT_BSZSHORTFLOWER_YELLOW",
- "MT_BSZSHORTFLOWER_ORANGE",
- "MT_BSZTULIP_RED",
- "MT_BSZTULIP_PURPLE",
- "MT_BSZTULIP_BLUE",
- "MT_BSZTULIP_CYAN",
- "MT_BSZTULIP_YELLOW",
- "MT_BSZTULIP_ORANGE",
- "MT_BSZCLUSTER_RED",
- "MT_BSZCLUSTER_PURPLE",
- "MT_BSZCLUSTER_BLUE",
- "MT_BSZCLUSTER_CYAN",
- "MT_BSZCLUSTER_YELLOW",
- "MT_BSZCLUSTER_ORANGE",
- "MT_BSZBUSH_RED",
- "MT_BSZBUSH_PURPLE",
- "MT_BSZBUSH_BLUE",
- "MT_BSZBUSH_CYAN",
- "MT_BSZBUSH_YELLOW",
- "MT_BSZBUSH_ORANGE",
- "MT_BSZVINE_RED",
- "MT_BSZVINE_PURPLE",
- "MT_BSZVINE_BLUE",
- "MT_BSZVINE_CYAN",
- "MT_BSZVINE_YELLOW",
- "MT_BSZVINE_ORANGE",
- "MT_BSZSHRUB",
- "MT_BSZCLOVER",
- "MT_BIG_PALMTREE_TRUNK",
- "MT_BIG_PALMTREE_TOP",
- "MT_PALMTREE_TRUNK",
- "MT_PALMTREE_TOP",
-
- // Misc scenery
- "MT_DBALL",
- "MT_EGGSTATUE2",
-
- // Powerup Indicators
- "MT_ELEMENTAL_ORB", // Elemental shield mobj
- "MT_ATTRACT_ORB", // Attract shield mobj
- "MT_FORCE_ORB", // Force shield mobj
- "MT_ARMAGEDDON_ORB", // Armageddon shield mobj
- "MT_WHIRLWIND_ORB", // Whirlwind shield mobj
- "MT_PITY_ORB", // Pity shield mobj
- "MT_FLAMEAURA_ORB", // Flame shield mobj
- "MT_BUBBLEWRAP_ORB", // Bubble shield mobj
- "MT_THUNDERCOIN_ORB", // Thunder shield mobj
- "MT_THUNDERCOIN_SPARK", // Thunder spark
- "MT_IVSP", // Invincibility sparkles
- "MT_SUPERSPARK", // Super Sonic Spark
-
- // Flickies
- "MT_FLICKY_01", // Bluebird
- "MT_FLICKY_01_CENTER",
- "MT_FLICKY_02", // Rabbit
- "MT_FLICKY_02_CENTER",
- "MT_FLICKY_03", // Chicken
- "MT_FLICKY_03_CENTER",
- "MT_FLICKY_04", // Seal
- "MT_FLICKY_04_CENTER",
- "MT_FLICKY_05", // Pig
- "MT_FLICKY_05_CENTER",
- "MT_FLICKY_06", // Chipmunk
- "MT_FLICKY_06_CENTER",
- "MT_FLICKY_07", // Penguin
- "MT_FLICKY_07_CENTER",
- "MT_FLICKY_08", // Fish
- "MT_FLICKY_08_CENTER",
- "MT_FLICKY_09", // Ram
- "MT_FLICKY_09_CENTER",
- "MT_FLICKY_10", // Puffin
- "MT_FLICKY_10_CENTER",
- "MT_FLICKY_11", // Cow
- "MT_FLICKY_11_CENTER",
- "MT_FLICKY_12", // Rat
- "MT_FLICKY_12_CENTER",
- "MT_FLICKY_13", // Bear
- "MT_FLICKY_13_CENTER",
- "MT_FLICKY_14", // Dove
- "MT_FLICKY_14_CENTER",
- "MT_FLICKY_15", // Cat
- "MT_FLICKY_15_CENTER",
- "MT_FLICKY_16", // Canary
- "MT_FLICKY_16_CENTER",
- "MT_SECRETFLICKY_01", // Spider
- "MT_SECRETFLICKY_01_CENTER",
- "MT_SECRETFLICKY_02", // Bat
- "MT_SECRETFLICKY_02_CENTER",
- "MT_SEED",
-
- // Environmental Effects
- "MT_RAIN", // Rain
- "MT_SNOWFLAKE", // Snowflake
- "MT_SPLISH", // Water splish!
- "MT_LAVASPLISH", // Lava splish!
- "MT_SMOKE",
- "MT_SMALLBUBBLE", // small bubble
- "MT_MEDIUMBUBBLE", // medium bubble
- "MT_EXTRALARGEBUBBLE", // extra large bubble
- "MT_WATERZAP",
- "MT_SPINDUST", // Spindash dust
- "MT_TFOG",
- "MT_PARTICLE",
- "MT_PARTICLEGEN", // For fans, etc.
-
- // Game Indicators
- "MT_SCORE", // score logo
- "MT_DROWNNUMBERS", // Drowning Timer
- "MT_GOTEMERALD", // Chaos Emerald (intangible)
- "MT_LOCKON", // Target
- "MT_LOCKONINF", // In-level Target
- "MT_TAG", // Tag Sign
- "MT_GOTFLAG", // Got Flag sign
- "MT_FINISHFLAG", // Finish flag
-
- // Ambient Sounds
- "MT_AWATERA", // Ambient Water Sound 1
- "MT_AWATERB", // Ambient Water Sound 2
- "MT_AWATERC", // Ambient Water Sound 3
- "MT_AWATERD", // Ambient Water Sound 4
- "MT_AWATERE", // Ambient Water Sound 5
- "MT_AWATERF", // Ambient Water Sound 6
- "MT_AWATERG", // Ambient Water Sound 7
- "MT_AWATERH", // Ambient Water Sound 8
- "MT_RANDOMAMBIENT",
- "MT_RANDOMAMBIENT2",
- "MT_MACHINEAMBIENCE",
-
- "MT_CORK",
- "MT_LHRT",
-
- // Ring Weapons
- "MT_REDRING",
- "MT_BOUNCERING",
- "MT_RAILRING",
- "MT_INFINITYRING",
- "MT_AUTOMATICRING",
- "MT_EXPLOSIONRING",
- "MT_SCATTERRING",
- "MT_GRENADERING",
-
- "MT_BOUNCEPICKUP",
- "MT_RAILPICKUP",
- "MT_AUTOPICKUP",
- "MT_EXPLODEPICKUP",
- "MT_SCATTERPICKUP",
- "MT_GRENADEPICKUP",
-
- "MT_THROWNBOUNCE",
- "MT_THROWNINFINITY",
- "MT_THROWNAUTOMATIC",
- "MT_THROWNSCATTER",
- "MT_THROWNEXPLOSION",
- "MT_THROWNGRENADE",
-
- // Mario-specific stuff
- "MT_COIN",
- "MT_FLINGCOIN",
- "MT_GOOMBA",
- "MT_BLUEGOOMBA",
- "MT_FIREFLOWER",
- "MT_FIREBALL",
- "MT_FIREBALLTRAIL",
- "MT_SHELL",
- "MT_PUMA",
- "MT_PUMATRAIL",
- "MT_HAMMER",
- "MT_KOOPA",
- "MT_KOOPAFLAME",
- "MT_AXE",
- "MT_MARIOBUSH1",
- "MT_MARIOBUSH2",
- "MT_TOAD",
-
- // NiGHTS Stuff
- "MT_AXIS",
- "MT_AXISTRANSFER",
- "MT_AXISTRANSFERLINE",
- "MT_NIGHTSDRONE",
- "MT_NIGHTSDRONE_MAN",
- "MT_NIGHTSDRONE_SPARKLING",
- "MT_NIGHTSDRONE_GOAL",
- "MT_NIGHTSPARKLE",
- "MT_NIGHTSLOOPHELPER",
- "MT_NIGHTSBUMPER", // NiGHTS Bumper
- "MT_HOOP",
- "MT_HOOPCOLLIDE", // Collision detection for NiGHTS hoops
- "MT_HOOPCENTER", // Center of a hoop
- "MT_NIGHTSCORE",
- "MT_NIGHTSCHIP", // NiGHTS Chip
- "MT_FLINGNIGHTSCHIP", // Lost NiGHTS Chip
- "MT_NIGHTSSTAR", // NiGHTS Star
- "MT_FLINGNIGHTSSTAR", // Lost NiGHTS Star
- "MT_NIGHTSSUPERLOOP",
- "MT_NIGHTSDRILLREFILL",
- "MT_NIGHTSHELPER",
- "MT_NIGHTSEXTRATIME",
- "MT_NIGHTSLINKFREEZE",
- "MT_EGGCAPSULE",
- "MT_IDEYAANCHOR",
- "MT_NIGHTOPIANHELPER", // the actual helper object that orbits you
- "MT_PIAN", // decorative singing friend
- "MT_SHLEEP", // almost-decorative sleeping enemy
-
- // Secret badniks and hazards, shhhh
- "MT_PENGUINATOR",
- "MT_POPHAT",
- "MT_POPSHOT",
- "MT_POPSHOT_TRAIL",
-
- "MT_HIVEELEMENTAL",
- "MT_BUMBLEBORE",
-
- "MT_BUGGLE",
-
- "MT_SMASHINGSPIKEBALL",
- "MT_CACOLANTERN",
- "MT_CACOSHARD",
- "MT_CACOFIRE",
- "MT_SPINBOBERT",
- "MT_SPINBOBERT_FIRE1",
- "MT_SPINBOBERT_FIRE2",
- "MT_HANGSTER",
-
- // Utility Objects
- "MT_TELEPORTMAN",
- "MT_ALTVIEWMAN",
- "MT_CRUMBLEOBJ", // Sound generator for crumbling platform
- "MT_TUBEWAYPOINT",
- "MT_PUSH",
- "MT_PULL",
- "MT_GHOST",
- "MT_OVERLAY",
- "MT_ANGLEMAN",
- "MT_POLYANCHOR",
- "MT_POLYSPAWN",
-
- // Skybox objects
- "MT_SKYBOX",
-
- // Debris
- "MT_SPARK", //spark
- "MT_EXPLODE", // Robot Explosion
- "MT_UWEXPLODE", // Underwater Explosion
- "MT_DUST",
- "MT_ROCKSPAWNER",
- "MT_FALLINGROCK",
- "MT_ROCKCRUMBLE1",
- "MT_ROCKCRUMBLE2",
- "MT_ROCKCRUMBLE3",
- "MT_ROCKCRUMBLE4",
- "MT_ROCKCRUMBLE5",
- "MT_ROCKCRUMBLE6",
- "MT_ROCKCRUMBLE7",
- "MT_ROCKCRUMBLE8",
- "MT_ROCKCRUMBLE9",
- "MT_ROCKCRUMBLE10",
- "MT_ROCKCRUMBLE11",
- "MT_ROCKCRUMBLE12",
- "MT_ROCKCRUMBLE13",
- "MT_ROCKCRUMBLE14",
- "MT_ROCKCRUMBLE15",
- "MT_ROCKCRUMBLE16",
-
- // Level debris
- "MT_GFZDEBRIS",
- "MT_BRICKDEBRIS",
- "MT_WOODDEBRIS",
- "MT_REDBRICKDEBRIS",
- "MT_BLUEBRICKDEBRIS",
- "MT_YELLOWBRICKDEBRIS",
-
-#ifdef SEENAMES
- "MT_NAMECHECK",
-#endif
-};
-
-static const char *const MOBJFLAG_LIST[] = {
- "SPECIAL",
- "SOLID",
- "SHOOTABLE",
- "NOSECTOR",
- "NOBLOCKMAP",
- "PAPERCOLLISION",
- "PUSHABLE",
- "BOSS",
- "SPAWNCEILING",
- "NOGRAVITY",
- "AMBIENT",
- "SLIDEME",
- "NOCLIP",
- "FLOAT",
- "BOXICON",
- "MISSILE",
- "SPRING",
- "BOUNCE",
- "MONITOR",
- "NOTHINK",
- "FIRE",
- "NOCLIPHEIGHT",
- "ENEMY",
- "SCENERY",
- "PAIN",
- "STICKY",
- "NIGHTSITEM",
- "NOCLIPTHING",
- "GRENADEBOUNCE",
- "RUNSPAWNFUNC",
- NULL
-};
-
-// \tMF2_(\S+).*// (.+) --> \t"\1", // \2
-static const char *const MOBJFLAG2_LIST[] = {
- "AXIS", // It's a NiGHTS axis! (For faster checking)
- "TWOD", // Moves like it's in a 2D level
- "DONTRESPAWN", // Don't respawn this object!
- "DONTDRAW", // Don't generate a vissprite
- "AUTOMATIC", // Thrown ring has automatic properties
- "RAILRING", // Thrown ring has rail properties
- "BOUNCERING", // Thrown ring has bounce properties
- "EXPLOSION", // Thrown ring has explosive properties
- "SCATTER", // Thrown ring has scatter properties
- "BEYONDTHEGRAVE", // Source of this missile has died and has since respawned.
- "SLIDEPUSH", // MF_PUSHABLE that pushes continuously.
- "CLASSICPUSH", // Drops straight down when object has negative momz.
- "INVERTAIMABLE", // Flips whether it's targetable by A_LookForEnemies (enemies no, decoys yes)
- "INFLOAT", // Floating to a height for a move, don't auto float to target's height.
- "DEBRIS", // Splash ring from explosion ring
- "NIGHTSPULL", // Attracted from a paraloop
- "JUSTATTACKED", // can be pushed by other moving mobjs
- "FIRING", // turret fire
- "SUPERFIRE", // Firing something with Super Sonic-stopping properties. Or, if mobj has MF_MISSILE, this is the actual fire from it.
- "SHADOW", // Fuzzy draw, makes targeting harder.
- "STRONGBOX", // Flag used for "strong" random monitors.
- "OBJECTFLIP", // Flag for objects that always have flipped gravity.
- "SKULLFLY", // Special handling: skull in flight.
- "FRET", // Flashing from a previous hit
- "BOSSNOTRAP", // No Egg Trap after boss
- "BOSSFLEE", // Boss is fleeing!
- "BOSSDEAD", // Boss is dead! (Not necessarily fleeing, if a fleeing point doesn't exist.)
- "AMBUSH", // Alternate behaviour typically set by MTF_AMBUSH
- "LINKDRAW", // Draw vissprite of mobj immediately before/after tracer's vissprite (dependent on dispoffset and position)
- "SHIELD", // Thinker calls P_AddShield/P_ShieldLook (must be partnered with MF_SCENERY to use)
- NULL
-};
-
-static const char *const MOBJEFLAG_LIST[] = {
- "ONGROUND", // The mobj stands on solid floor (not on another mobj or in air)
- "JUSTHITFLOOR", // The mobj just hit the floor while falling, this is cleared on next frame
- "TOUCHWATER", // The mobj stands in a sector with water, and touches the surface
- "UNDERWATER", // The mobj stands in a sector with water, and his waist is BELOW the water surface
- "JUSTSTEPPEDDOWN", // used for ramp sectors
- "VERTICALFLIP", // Vertically flip sprite/allow upside-down physics
- "GOOWATER", // Goo water
- "TOUCHLAVA", // The mobj is touching a lava block
- "PUSHED", // Mobj was already pushed this tic
- "SPRUNG", // Mobj was already sprung this tic
- "APPLYPMOMZ", // Platform movement
- "TRACERANGLE", // Compute and trigger on mobj angle relative to tracer
- NULL
-};
-
-static const char *const MAPTHINGFLAG_LIST[4] = {
- "EXTRA", // Extra flag for objects.
- "OBJECTFLIP", // Reverse gravity flag for objects.
- "OBJECTSPECIAL", // Special flag used with certain objects.
- "AMBUSH" // Deaf monsters/do not react to sound.
-};
-
-static const char *const PLAYERFLAG_LIST[] = {
-
- // Cvars
- "FLIPCAM", // Flip camera angle with gravity flip prefrence.
- "ANALOGMODE", // Analog mode?
- "DIRECTIONCHAR", // Directional character sprites?
- "AUTOBRAKE", // Autobrake?
-
- // Cheats
- "GODMODE",
- "NOCLIP",
- "INVIS",
-
- // True if button down last tic.
- "ATTACKDOWN",
- "SPINDOWN",
- "JUMPDOWN",
- "WPNDOWN",
-
- // Unmoving states
- "STASIS", // Player is not allowed to move
- "JUMPSTASIS", // and that includes jumping.
- // (we don't include FULLSTASIS here I guess because it's just those two together...?)
-
- // Applying autobrake?
- "APPLYAUTOBRAKE",
-
- // Character action status
- "STARTJUMP",
- "JUMPED",
- "NOJUMPDAMAGE",
-
- "SPINNING",
- "STARTDASH",
-
- "THOKKED",
- "SHIELDABILITY",
- "GLIDING",
- "BOUNCING",
-
- // Sliding (usually in water) like Labyrinth/Oil Ocean
- "SLIDING",
-
- // NiGHTS stuff
- "TRANSFERTOCLOSEST",
- "DRILLING",
-
- // Gametype-specific stuff
- "GAMETYPEOVER", // Race time over, or H&S out-of-game
- "TAGIT", // The player is it! For Tag Mode
-
- /*** misc ***/
- "FORCESTRAFE", // Translate turn inputs into strafe inputs
- "CANCARRY", // Can carry?
- "FINISHED",
-
- NULL // stop loop here.
-};
-
-static const char *const GAMETYPERULE_LIST[] = {
- "CAMPAIGN",
- "RINGSLINGER",
- "SPECTATORS",
- "LIVES",
- "TEAMS",
- "FIRSTPERSON",
- "POWERSTONES",
- "TEAMFLAGS",
- "FRIENDLY",
- "SPECIALSTAGES",
- "EMERALDTOKENS",
- "EMERALDHUNT",
- "RACE",
- "TAG",
- "POINTLIMIT",
- "TIMELIMIT",
- "OVERTIME",
- "HURTMESSAGES",
- "FRIENDLYFIRE",
- "STARTCOUNTDOWN",
- "HIDEFROZEN",
- "BLINDFOLDED",
- "RESPAWNDELAY",
- "PITYSHIELD",
- "DEATHPENALTY",
- "NOSPECTATORSPAWN",
- "DEATHMATCHSTARTS",
- "SPAWNINVUL",
- "SPAWNENEMIES",
- "ALLOWEXIT",
- "NOTITLECARD",
- "CUTSCENES",
- NULL
-};
-
-// Linedef flags
-static const char *const ML_LIST[16] = {
- "IMPASSIBLE",
- "BLOCKMONSTERS",
- "TWOSIDED",
- "DONTPEGTOP",
- "DONTPEGBOTTOM",
- "EFFECT1",
- "NOCLIMB",
- "EFFECT2",
- "EFFECT3",
- "EFFECT4",
- "EFFECT5",
- "NOSONIC",
- "NOTAILS",
- "NOKNUX",
- "BOUNCY",
- "TFERLINE"
-};
-
-static const char *COLOR_ENUMS[] = {
- "NONE", // SKINCOLOR_NONE,
-
- // Greyscale ranges
- "WHITE", // SKINCOLOR_WHITE,
- "BONE", // SKINCOLOR_BONE,
- "CLOUDY", // SKINCOLOR_CLOUDY,
- "GREY", // SKINCOLOR_GREY,
- "SILVER", // SKINCOLOR_SILVER,
- "CARBON", // SKINCOLOR_CARBON,
- "JET", // SKINCOLOR_JET,
- "BLACK", // SKINCOLOR_BLACK,
-
- // Desaturated
- "AETHER", // SKINCOLOR_AETHER,
- "SLATE", // SKINCOLOR_SLATE,
- "BLUEBELL", // SKINCOLOR_BLUEBELL,
- "PINK", // SKINCOLOR_PINK,
- "YOGURT", // SKINCOLOR_YOGURT,
- "BROWN", // SKINCOLOR_BROWN,
- "BRONZE", // SKINCOLOR_BRONZE,
- "TAN", // SKINCOLOR_TAN,
- "BEIGE", // SKINCOLOR_BEIGE,
- "MOSS", // SKINCOLOR_MOSS,
- "AZURE", // SKINCOLOR_AZURE,
- "LAVENDER", // SKINCOLOR_LAVENDER,
-
- // Viv's vivid colours (toast 21/07/17)
- "RUBY", // SKINCOLOR_RUBY,
- "SALMON", // SKINCOLOR_SALMON,
- "RED", // SKINCOLOR_RED,
- "CRIMSON", // SKINCOLOR_CRIMSON,
- "FLAME", // SKINCOLOR_FLAME,
- "KETCHUP", // SKINCOLOR_KETCHUP,
- "PEACHY", // SKINCOLOR_PEACHY,
- "QUAIL", // SKINCOLOR_QUAIL,
- "SUNSET", // SKINCOLOR_SUNSET,
- "COPPER", // SKINCOLOR_COPPER,
- "APRICOT", // SKINCOLOR_APRICOT,
- "ORANGE", // SKINCOLOR_ORANGE,
- "RUST", // SKINCOLOR_RUST,
- "GOLD", // SKINCOLOR_GOLD,
- "SANDY", // SKINCOLOR_SANDY,
- "YELLOW", // SKINCOLOR_YELLOW,
- "OLIVE", // SKINCOLOR_OLIVE,
- "LIME", // SKINCOLOR_LIME,
- "PERIDOT", // SKINCOLOR_PERIDOT,
- "APPLE", // SKINCOLOR_APPLE,
- "GREEN", // SKINCOLOR_GREEN,
- "FOREST", // SKINCOLOR_FOREST,
- "EMERALD", // SKINCOLOR_EMERALD,
- "MINT", // SKINCOLOR_MINT,
- "SEAFOAM", // SKINCOLOR_SEAFOAM,
- "AQUA", // SKINCOLOR_AQUA,
- "TEAL", // SKINCOLOR_TEAL,
- "WAVE", // SKINCOLOR_WAVE,
- "CYAN", // SKINCOLOR_CYAN,
- "SKY", // SKINCOLOR_SKY,
- "CERULEAN", // SKINCOLOR_CERULEAN,
- "ICY", // SKINCOLOR_ICY,
- "SAPPHIRE", // SKINCOLOR_SAPPHIRE,
- "CORNFLOWER", // SKINCOLOR_CORNFLOWER,
- "BLUE", // SKINCOLOR_BLUE,
- "COBALT", // SKINCOLOR_COBALT,
- "VAPOR", // SKINCOLOR_VAPOR,
- "DUSK", // SKINCOLOR_DUSK,
- "PASTEL", // SKINCOLOR_PASTEL,
- "PURPLE", // SKINCOLOR_PURPLE,
- "BUBBLEGUM", // SKINCOLOR_BUBBLEGUM,
- "MAGENTA", // SKINCOLOR_MAGENTA,
- "NEON", // SKINCOLOR_NEON,
- "VIOLET", // SKINCOLOR_VIOLET,
- "LILAC", // SKINCOLOR_LILAC,
- "PLUM", // SKINCOLOR_PLUM,
- "RASPBERRY", // SKINCOLOR_RASPBERRY,
- "ROSY", // SKINCOLOR_ROSY,
-
- // Super special awesome Super flashing colors!
- "SUPERSILVER1", // SKINCOLOR_SUPERSILVER1
- "SUPERSILVER2", // SKINCOLOR_SUPERSILVER2,
- "SUPERSILVER3", // SKINCOLOR_SUPERSILVER3,
- "SUPERSILVER4", // SKINCOLOR_SUPERSILVER4,
- "SUPERSILVER5", // SKINCOLOR_SUPERSILVER5,
-
- "SUPERRED1", // SKINCOLOR_SUPERRED1
- "SUPERRED2", // SKINCOLOR_SUPERRED2,
- "SUPERRED3", // SKINCOLOR_SUPERRED3,
- "SUPERRED4", // SKINCOLOR_SUPERRED4,
- "SUPERRED5", // SKINCOLOR_SUPERRED5,
-
- "SUPERORANGE1", // SKINCOLOR_SUPERORANGE1
- "SUPERORANGE2", // SKINCOLOR_SUPERORANGE2,
- "SUPERORANGE3", // SKINCOLOR_SUPERORANGE3,
- "SUPERORANGE4", // SKINCOLOR_SUPERORANGE4,
- "SUPERORANGE5", // SKINCOLOR_SUPERORANGE5,
-
- "SUPERGOLD1", // SKINCOLOR_SUPERGOLD1
- "SUPERGOLD2", // SKINCOLOR_SUPERGOLD2,
- "SUPERGOLD3", // SKINCOLOR_SUPERGOLD3,
- "SUPERGOLD4", // SKINCOLOR_SUPERGOLD4,
- "SUPERGOLD5", // SKINCOLOR_SUPERGOLD5,
-
- "SUPERPERIDOT1", // SKINCOLOR_SUPERPERIDOT1
- "SUPERPERIDOT2", // SKINCOLOR_SUPERPERIDOT2,
- "SUPERPERIDOT3", // SKINCOLOR_SUPERPERIDOT3,
- "SUPERPERIDOT4", // SKINCOLOR_SUPERPERIDOT4,
- "SUPERPERIDOT5", // SKINCOLOR_SUPERPERIDOT5,
-
- "SUPERSKY1", // SKINCOLOR_SUPERSKY1
- "SUPERSKY2", // SKINCOLOR_SUPERSKY2,
- "SUPERSKY3", // SKINCOLOR_SUPERSKY3,
- "SUPERSKY4", // SKINCOLOR_SUPERSKY4,
- "SUPERSKY5", // SKINCOLOR_SUPERSKY5,
-
- "SUPERPURPLE1", // SKINCOLOR_SUPERPURPLE1,
- "SUPERPURPLE2", // SKINCOLOR_SUPERPURPLE2,
- "SUPERPURPLE3", // SKINCOLOR_SUPERPURPLE3,
- "SUPERPURPLE4", // SKINCOLOR_SUPERPURPLE4,
- "SUPERPURPLE5", // SKINCOLOR_SUPERPURPLE5,
-
- "SUPERRUST1", // SKINCOLOR_SUPERRUST1
- "SUPERRUST2", // SKINCOLOR_SUPERRUST2,
- "SUPERRUST3", // SKINCOLOR_SUPERRUST3,
- "SUPERRUST4", // SKINCOLOR_SUPERRUST4,
- "SUPERRUST5", // SKINCOLOR_SUPERRUST5,
-
- "SUPERTAN1", // SKINCOLOR_SUPERTAN1
- "SUPERTAN2", // SKINCOLOR_SUPERTAN2,
- "SUPERTAN3", // SKINCOLOR_SUPERTAN3,
- "SUPERTAN4", // SKINCOLOR_SUPERTAN4,
- "SUPERTAN5" // SKINCOLOR_SUPERTAN5,
-};
-
-static const char *const POWERS_LIST[] = {
- "INVULNERABILITY",
- "SNEAKERS",
- "FLASHING",
- "SHIELD",
- "CARRY",
- "TAILSFLY", // tails flying
- "UNDERWATER", // underwater timer
- "SPACETIME", // In space, no one can hear you spin!
- "EXTRALIFE", // Extra Life timer
- "PUSHING",
- "JUSTSPRUNG",
- "NOAUTOBRAKE",
-
- "SUPER", // Are you super?
- "GRAVITYBOOTS", // gravity boots
-
- // Weapon ammunition
- "INFINITYRING",
- "AUTOMATICRING",
- "BOUNCERING",
- "SCATTERRING",
- "GRENADERING",
- "EXPLOSIONRING",
- "RAILRING",
-
- // Power Stones
- "EMERALDS", // stored like global 'emeralds' variable
-
- // NiGHTS powerups
- "NIGHTS_SUPERLOOP",
- "NIGHTS_HELPER",
- "NIGHTS_LINKFREEZE",
-
- //for linedef exec 427
- "NOCONTROL",
-
- //for dyes
- "DYE",
-
- "JUSTLAUNCHED",
-
- "IGNORELATCH"
-};
-
-static const char *const HUDITEMS_LIST[] = {
- "LIVES",
-
- "RINGS",
- "RINGSNUM",
- "RINGSNUMTICS",
-
- "SCORE",
- "SCORENUM",
-
- "TIME",
- "MINUTES",
- "TIMECOLON",
- "SECONDS",
- "TIMETICCOLON",
- "TICS",
-
- "SS_TOTALRINGS",
-
- "GETRINGS",
- "GETRINGSNUM",
- "TIMELEFT",
- "TIMELEFTNUM",
- "TIMEUP",
- "HUNTPICS",
- "POWERUPS"
-};
-
-static const char *const MENUTYPES_LIST[] = {
- "NONE",
-
- "MAIN",
-
- // Single Player
- "SP_MAIN",
-
- "SP_LOAD",
- "SP_PLAYER",
-
- "SP_LEVELSELECT",
- "SP_LEVELSTATS",
-
- "SP_TIMEATTACK",
- "SP_TIMEATTACK_LEVELSELECT",
- "SP_GUESTREPLAY",
- "SP_REPLAY",
- "SP_GHOST",
-
- "SP_NIGHTSATTACK",
- "SP_NIGHTS_LEVELSELECT",
- "SP_NIGHTS_GUESTREPLAY",
- "SP_NIGHTS_REPLAY",
- "SP_NIGHTS_GHOST",
-
- // Multiplayer
- "MP_MAIN",
- "MP_SPLITSCREEN", // SplitServer
- "MP_SERVER",
- "MP_CONNECT",
- "MP_ROOM",
- "MP_PLAYERSETUP", // MP_PlayerSetupDef shared with SPLITSCREEN if #defined NONET
- "MP_SERVER_OPTIONS",
-
- // Options
- "OP_MAIN",
-
- "OP_P1CONTROLS",
- "OP_CHANGECONTROLS", // OP_ChangeControlsDef shared with P2
- "OP_P1MOUSE",
- "OP_P1JOYSTICK",
- "OP_JOYSTICKSET", // OP_JoystickSetDef shared with P2
- "OP_P1CAMERA",
-
- "OP_P2CONTROLS",
- "OP_P2MOUSE",
- "OP_P2JOYSTICK",
- "OP_P2CAMERA",
-
- "OP_PLAYSTYLE",
-
- "OP_VIDEO",
- "OP_VIDEOMODE",
- "OP_COLOR",
- "OP_OPENGL",
- "OP_OPENGL_LIGHTING",
-
- "OP_SOUND",
-
- "OP_SERVER",
- "OP_MONITORTOGGLE",
-
- "OP_DATA",
- "OP_ADDONS",
- "OP_SCREENSHOTS",
- "OP_ERASEDATA",
-
- // Extras
- "SR_MAIN",
- "SR_PANDORA",
- "SR_LEVELSELECT",
- "SR_UNLOCKCHECKLIST",
- "SR_EMBLEMHINT",
- "SR_PLAYER",
- "SR_SOUNDTEST",
-
- // Addons (Part of MISC, but let's make it our own)
- "AD_MAIN",
-
- // MISC
- // "MESSAGE",
- // "SPAUSE",
-
- // "MPAUSE",
- // "SCRAMBLETEAM",
- // "CHANGETEAM",
- // "CHANGELEVEL",
-
- // "MAPAUSE",
- // "HELP",
-
- "SPECIAL"
-};
-
-struct {
- const char *n;
- // has to be able to hold both fixed_t and angle_t, so drastic measure!!
- lua_Integer v;
-} const INT_CONST[] = {
- // If a mod removes some variables here,
- // please leave the names in-tact and just set
- // the value to 0 or something.
-
- // integer type limits, from doomtype.h
- // INT64 and UINT64 limits not included, they're too big for most purposes anyway
- // signed
- {"INT8_MIN",INT8_MIN},
- {"INT16_MIN",INT16_MIN},
- {"INT32_MIN",INT32_MIN},
- {"INT8_MAX",INT8_MAX},
- {"INT16_MAX",INT16_MAX},
- {"INT32_MAX",INT32_MAX},
- // unsigned
- {"UINT8_MAX",UINT8_MAX},
- {"UINT16_MAX",UINT16_MAX},
- {"UINT32_MAX",UINT32_MAX},
-
- // fixed_t constants, from m_fixed.h
- {"FRACUNIT",FRACUNIT},
- {"FRACBITS",FRACBITS},
-
- // doomdef.h constants
- {"TICRATE",TICRATE},
- {"MUSICRATE",MUSICRATE},
- {"RING_DIST",RING_DIST},
- {"PUSHACCEL",PUSHACCEL},
- {"MODID",MODID}, // I don't know, I just thought it would be cool for a wad to potentially know what mod it was loaded into.
- {"CODEBASE",CODEBASE}, // or what release of SRB2 this is.
- {"NEWTICRATE",NEWTICRATE}, // TICRATE*NEWTICRATERATIO
- {"NEWTICRATERATIO",NEWTICRATERATIO},
-
- // Special linedef executor tag numbers!
- {"LE_PINCHPHASE",LE_PINCHPHASE}, // A boss entered pinch phase (and, in most cases, is preparing their pinch phase attack!)
- {"LE_ALLBOSSESDEAD",LE_ALLBOSSESDEAD}, // All bosses in the map are dead (Egg capsule raise)
- {"LE_BOSSDEAD",LE_BOSSDEAD}, // A boss in the map died (Chaos mode boss tally)
- {"LE_BOSS4DROP",LE_BOSS4DROP}, // CEZ boss dropped its cage
- {"LE_BRAKVILEATACK",LE_BRAKVILEATACK}, // Brak's doing his LOS attack, oh noes
- {"LE_TURRET",LE_TURRET}, // THZ turret
- {"LE_BRAKPLATFORM",LE_BRAKPLATFORM}, // v2.0 Black Eggman destroys platform
- {"LE_CAPSULE2",LE_CAPSULE2}, // Egg Capsule
- {"LE_CAPSULE1",LE_CAPSULE1}, // Egg Capsule
- {"LE_CAPSULE0",LE_CAPSULE0}, // Egg Capsule
- {"LE_KOOPA",LE_KOOPA}, // Distant cousin to Gay Bowser
- {"LE_AXE",LE_AXE}, // MKB Axe object
- {"LE_PARAMWIDTH",LE_PARAMWIDTH}, // If an object that calls LinedefExecute has a nonzero parameter value, this times the parameter will be subtracted. (Mostly for the purpose of coexisting bosses...)
-
- /// \todo Get all this stuff into its own sections, maybe. Maybe.
-
- // Frame settings
- {"FF_FRAMEMASK",FF_FRAMEMASK},
- {"FF_SPR2SUPER",FF_SPR2SUPER},
- {"FF_SPR2ENDSTATE",FF_SPR2ENDSTATE},
- {"FF_SPR2MIDSTART",FF_SPR2MIDSTART},
- {"FF_ANIMATE",FF_ANIMATE},
- {"FF_RANDOMANIM",FF_RANDOMANIM},
- {"FF_GLOBALANIM",FF_GLOBALANIM},
- {"FF_FULLBRIGHT",FF_FULLBRIGHT},
- {"FF_VERTICALFLIP",FF_VERTICALFLIP},
- {"FF_HORIZONTALFLIP",FF_HORIZONTALFLIP},
- {"FF_PAPERSPRITE",FF_PAPERSPRITE},
- {"FF_TRANSMASK",FF_TRANSMASK},
- {"FF_TRANSSHIFT",FF_TRANSSHIFT},
- // new preshifted translucency (used in source)
- {"FF_TRANS10",FF_TRANS10},
- {"FF_TRANS20",FF_TRANS20},
- {"FF_TRANS30",FF_TRANS30},
- {"FF_TRANS40",FF_TRANS40},
- {"FF_TRANS50",FF_TRANS50},
- {"FF_TRANS60",FF_TRANS60},
- {"FF_TRANS70",FF_TRANS70},
- {"FF_TRANS80",FF_TRANS80},
- {"FF_TRANS90",FF_TRANS90},
- // compatibility
- // Transparency for SOCs is pre-shifted
- {"TR_TRANS10",tr_trans10<<FF_TRANSSHIFT},
- {"TR_TRANS20",tr_trans20<<FF_TRANSSHIFT},
- {"TR_TRANS30",tr_trans30<<FF_TRANSSHIFT},
- {"TR_TRANS40",tr_trans40<<FF_TRANSSHIFT},
- {"TR_TRANS50",tr_trans50<<FF_TRANSSHIFT},
- {"TR_TRANS60",tr_trans60<<FF_TRANSSHIFT},
- {"TR_TRANS70",tr_trans70<<FF_TRANSSHIFT},
- {"TR_TRANS80",tr_trans80<<FF_TRANSSHIFT},
- {"TR_TRANS90",tr_trans90<<FF_TRANSSHIFT},
- // Transparency for Lua is not, unless capitalized as above.
- {"tr_trans10",tr_trans10},
- {"tr_trans20",tr_trans20},
- {"tr_trans30",tr_trans30},
- {"tr_trans40",tr_trans40},
- {"tr_trans50",tr_trans50},
- {"tr_trans60",tr_trans60},
- {"tr_trans70",tr_trans70},
- {"tr_trans80",tr_trans80},
- {"tr_trans90",tr_trans90},
- {"NUMTRANSMAPS",NUMTRANSMAPS},
-
- // Level flags
- {"LF_SCRIPTISFILE",LF_SCRIPTISFILE},
- {"LF_SPEEDMUSIC",LF_SPEEDMUSIC},
- {"LF_NOSSMUSIC",LF_NOSSMUSIC},
- {"LF_NORELOAD",LF_NORELOAD},
- {"LF_NOZONE",LF_NOZONE},
- {"LF_SAVEGAME",LF_SAVEGAME},
- {"LF_MIXNIGHTSCOUNTDOWN",LF_MIXNIGHTSCOUNTDOWN},
- {"LF_NOTITLECARDFIRST",LF_NOTITLECARDFIRST},
- {"LF_NOTITLECARDRESPAWN",LF_NOTITLECARDRESPAWN},
- {"LF_NOTITLECARDRECORDATTACK",LF_NOTITLECARDRECORDATTACK},
- {"LF_NOTITLECARD",LF_NOTITLECARD},
- {"LF_WARNINGTITLE",LF_WARNINGTITLE},
- // And map flags
- {"LF2_HIDEINMENU",LF2_HIDEINMENU},
- {"LF2_HIDEINSTATS",LF2_HIDEINSTATS},
- {"LF2_RECORDATTACK",LF2_RECORDATTACK},
- {"LF2_NIGHTSATTACK",LF2_NIGHTSATTACK},
- {"LF2_NOVISITNEEDED",LF2_NOVISITNEEDED},
- {"LF2_WIDEICON",LF2_WIDEICON},
-
- // Emeralds
- {"EMERALD1",EMERALD1},
- {"EMERALD2",EMERALD2},
- {"EMERALD3",EMERALD3},
- {"EMERALD4",EMERALD4},
- {"EMERALD5",EMERALD5},
- {"EMERALD6",EMERALD6},
- {"EMERALD7",EMERALD7},
-
- // SKINCOLOR_ doesn't include these..!
- {"MAXSKINCOLORS",MAXSKINCOLORS},
- {"FIRSTSUPERCOLOR",FIRSTSUPERCOLOR},
- {"NUMSUPERCOLORS",NUMSUPERCOLORS},
-
- // Precipitation
- {"PRECIP_NONE",PRECIP_NONE},
- {"PRECIP_STORM",PRECIP_STORM},
- {"PRECIP_SNOW",PRECIP_SNOW},
- {"PRECIP_RAIN",PRECIP_RAIN},
- {"PRECIP_BLANK",PRECIP_BLANK},
- {"PRECIP_STORM_NORAIN",PRECIP_STORM_NORAIN},
- {"PRECIP_STORM_NOSTRIKES",PRECIP_STORM_NOSTRIKES},
-
- // Shields
- {"SH_NONE",SH_NONE},
- // Shield flags
- {"SH_PROTECTFIRE",SH_PROTECTFIRE},
- {"SH_PROTECTWATER",SH_PROTECTWATER},
- {"SH_PROTECTELECTRIC",SH_PROTECTELECTRIC},
- {"SH_PROTECTSPIKE",SH_PROTECTSPIKE},
- // Indivisible shields
- {"SH_PITY",SH_PITY},
- {"SH_WHIRLWIND",SH_WHIRLWIND},
- {"SH_ARMAGEDDON",SH_ARMAGEDDON},
- {"SH_PINK",SH_PINK},
- // normal shields that use flags
- {"SH_ATTRACT",SH_ATTRACT},
- {"SH_ELEMENTAL",SH_ELEMENTAL},
- // Sonic 3 shields
- {"SH_FLAMEAURA",SH_FLAMEAURA},
- {"SH_BUBBLEWRAP",SH_BUBBLEWRAP},
- {"SH_THUNDERCOIN",SH_THUNDERCOIN},
- // The force shield uses the lower 8 bits to count how many extra hits are left.
- {"SH_FORCE",SH_FORCE},
- {"SH_FORCEHP",SH_FORCEHP}, // to be used as a bitmask only
- // Mostly for use with Mario mode.
- {"SH_FIREFLOWER",SH_FIREFLOWER},
- {"SH_STACK",SH_STACK},
- {"SH_NOSTACK",SH_NOSTACK},
-
- // Carrying
- {"CR_NONE",CR_NONE},
- {"CR_GENERIC",CR_GENERIC},
- {"CR_PLAYER",CR_PLAYER},
- {"CR_NIGHTSMODE",CR_NIGHTSMODE},
- {"CR_NIGHTSFALL",CR_NIGHTSFALL},
- {"CR_BRAKGOOP",CR_BRAKGOOP},
- {"CR_ZOOMTUBE",CR_ZOOMTUBE},
- {"CR_ROPEHANG",CR_ROPEHANG},
- {"CR_MACESPIN",CR_MACESPIN},
- {"CR_MINECART",CR_MINECART},
- {"CR_ROLLOUT",CR_ROLLOUT},
- {"CR_PTERABYTE",CR_PTERABYTE},
- {"CR_DUSTDEVIL",CR_DUSTDEVIL},
-
- // Ring weapons (ringweapons_t)
- // Useful for A_GiveWeapon
- {"RW_AUTO",RW_AUTO},
- {"RW_BOUNCE",RW_BOUNCE},
- {"RW_SCATTER",RW_SCATTER},
- {"RW_GRENADE",RW_GRENADE},
- {"RW_EXPLODE",RW_EXPLODE},
- {"RW_RAIL",RW_RAIL},
-
- // Character flags (skinflags_t)
- {"SF_SUPER",SF_SUPER},
- {"SF_NOSUPERSPIN",SF_NOSUPERSPIN},
- {"SF_NOSPINDASHDUST",SF_NOSPINDASHDUST},
- {"SF_HIRES",SF_HIRES},
- {"SF_NOSKID",SF_NOSKID},
- {"SF_NOSPEEDADJUST",SF_NOSPEEDADJUST},
- {"SF_RUNONWATER",SF_RUNONWATER},
- {"SF_NOJUMPSPIN",SF_NOJUMPSPIN},
- {"SF_NOJUMPDAMAGE",SF_NOJUMPDAMAGE},
- {"SF_STOMPDAMAGE",SF_STOMPDAMAGE},
- {"SF_MARIODAMAGE",SF_MARIODAMAGE},
- {"SF_MACHINE",SF_MACHINE},
- {"SF_DASHMODE",SF_DASHMODE},
- {"SF_FASTEDGE",SF_FASTEDGE},
- {"SF_MULTIABILITY",SF_MULTIABILITY},
- {"SF_NONIGHTSROTATION",SF_NONIGHTSROTATION},
- {"SF_NONIGHTSSUPER",SF_NONIGHTSSUPER},
- {"SF_NOSUPERSPRITES",SF_NOSUPERSPRITES},
- {"SF_NOSUPERJUMPBOOST",SF_NOSUPERJUMPBOOST},
-
- // Dashmode constants
- {"DASHMODE_THRESHOLD",DASHMODE_THRESHOLD},
- {"DASHMODE_MAX",DASHMODE_MAX},
-
- // Character abilities!
- // Primary
- {"CA_NONE",CA_NONE}, // now slot 0!
- {"CA_THOK",CA_THOK},
- {"CA_FLY",CA_FLY},
- {"CA_GLIDEANDCLIMB",CA_GLIDEANDCLIMB},
- {"CA_HOMINGTHOK",CA_HOMINGTHOK},
- {"CA_DOUBLEJUMP",CA_DOUBLEJUMP},
- {"CA_FLOAT",CA_FLOAT},
- {"CA_SLOWFALL",CA_SLOWFALL},
- {"CA_SWIM",CA_SWIM},
- {"CA_TELEKINESIS",CA_TELEKINESIS},
- {"CA_FALLSWITCH",CA_FALLSWITCH},
- {"CA_JUMPBOOST",CA_JUMPBOOST},
- {"CA_AIRDRILL",CA_AIRDRILL},
- {"CA_JUMPTHOK",CA_JUMPTHOK},
- {"CA_BOUNCE",CA_BOUNCE},
- {"CA_TWINSPIN",CA_TWINSPIN},
- // Secondary
- {"CA2_NONE",CA2_NONE}, // now slot 0!
- {"CA2_SPINDASH",CA2_SPINDASH},
- {"CA2_GUNSLINGER",CA2_GUNSLINGER},
- {"CA2_MELEE",CA2_MELEE},
-
- // Sound flags
- {"SF_TOTALLYSINGLE",SF_TOTALLYSINGLE},
- {"SF_NOMULTIPLESOUND",SF_NOMULTIPLESOUND},
- {"SF_OUTSIDESOUND",SF_OUTSIDESOUND},
- {"SF_X4AWAYSOUND",SF_X4AWAYSOUND},
- {"SF_X8AWAYSOUND",SF_X8AWAYSOUND},
- {"SF_NOINTERRUPT",SF_NOINTERRUPT},
- {"SF_X2AWAYSOUND",SF_X2AWAYSOUND},
-
- // Global emblem var flags
- {"GE_NIGHTSPULL",GE_NIGHTSPULL},
- {"GE_NIGHTSITEM",GE_NIGHTSITEM},
-
- // Map emblem var flags
- {"ME_ALLEMERALDS",ME_ALLEMERALDS},
- {"ME_ULTIMATE",ME_ULTIMATE},
- {"ME_PERFECT",ME_PERFECT},
-
- // p_local.h constants
- {"FLOATSPEED",FLOATSPEED},
- {"MAXSTEPMOVE",MAXSTEPMOVE},
- {"USERANGE",USERANGE},
- {"MELEERANGE",MELEERANGE},
- {"MISSILERANGE",MISSILERANGE},
- {"ONFLOORZ",ONFLOORZ}, // INT32_MIN
- {"ONCEILINGZ",ONCEILINGZ}, //INT32_MAX
- // for P_FlashPal
- {"PAL_WHITE",PAL_WHITE},
- {"PAL_MIXUP",PAL_MIXUP},
- {"PAL_RECYCLE",PAL_RECYCLE},
- {"PAL_NUKE",PAL_NUKE},
- // for P_DamageMobj
- //// Damage types
- {"DMG_WATER",DMG_WATER},
- {"DMG_FIRE",DMG_FIRE},
- {"DMG_ELECTRIC",DMG_ELECTRIC},
- {"DMG_SPIKE",DMG_SPIKE},
- {"DMG_NUKE",DMG_NUKE},
- //// Death types
- {"DMG_INSTAKILL",DMG_INSTAKILL},
- {"DMG_DROWNED",DMG_DROWNED},
- {"DMG_SPACEDROWN",DMG_SPACEDROWN},
- {"DMG_DEATHPIT",DMG_DEATHPIT},
- {"DMG_CRUSHED",DMG_CRUSHED},
- {"DMG_SPECTATOR",DMG_SPECTATOR},
- //// Masks
- {"DMG_CANHURTSELF",DMG_CANHURTSELF},
- {"DMG_DEATHMASK",DMG_DEATHMASK},
-
- // Intermission types
- {"int_none",int_none},
- {"int_coop",int_coop},
- {"int_match",int_match},
- {"int_teammatch",int_teammatch},
- //{"int_tag",int_tag},
- {"int_ctf",int_ctf},
- {"int_spec",int_spec},
- {"int_race",int_race},
- {"int_comp",int_comp},
-
- // Jingles (jingletype_t)
- {"JT_NONE",JT_NONE},
- {"JT_OTHER",JT_OTHER},
- {"JT_MASTER",JT_MASTER},
- {"JT_1UP",JT_1UP},
- {"JT_SHOES",JT_SHOES},
- {"JT_INV",JT_INV},
- {"JT_MINV",JT_MINV},
- {"JT_DROWN",JT_DROWN},
- {"JT_SUPER",JT_SUPER},
- {"JT_GOVER",JT_GOVER},
- {"JT_NIGHTSTIMEOUT",JT_NIGHTSTIMEOUT},
- {"JT_SSTIMEOUT",JT_SSTIMEOUT},
- // {"JT_LCLEAR",JT_LCLEAR},
- // {"JT_RACENT",JT_RACENT},
- // {"JT_CONTSC",JT_CONTSC},
-
- // Player state (playerstate_t)
- {"PST_LIVE",PST_LIVE}, // Playing or camping.
- {"PST_DEAD",PST_DEAD}, // Dead on the ground, view follows killer.
- {"PST_REBORN",PST_REBORN}, // Ready to restart/respawn???
-
- // Player animation (panim_t)
- {"PA_ETC",PA_ETC},
- {"PA_IDLE",PA_IDLE},
- {"PA_EDGE",PA_EDGE},
- {"PA_WALK",PA_WALK},
- {"PA_RUN",PA_RUN},
- {"PA_DASH",PA_DASH},
- {"PA_PAIN",PA_PAIN},
- {"PA_ROLL",PA_ROLL},
- {"PA_JUMP",PA_JUMP},
- {"PA_SPRING",PA_SPRING},
- {"PA_FALL",PA_FALL},
- {"PA_ABILITY",PA_ABILITY},
- {"PA_ABILITY2",PA_ABILITY2},
- {"PA_RIDE",PA_RIDE},
-
- // Current weapon
- {"WEP_AUTO",WEP_AUTO},
- {"WEP_BOUNCE",WEP_BOUNCE},
- {"WEP_SCATTER",WEP_SCATTER},
- {"WEP_GRENADE",WEP_GRENADE},
- {"WEP_EXPLODE",WEP_EXPLODE},
- {"WEP_RAIL",WEP_RAIL},
- {"NUM_WEAPONS",NUM_WEAPONS},
-
- // Value for infinite lives
- {"INFLIVES",INFLIVES},
-
- // Got Flags, for player->gotflag!
- // Used to be MF_ for some stupid reason, now they're GF_ to stop them looking like mobjflags
- {"GF_REDFLAG",GF_REDFLAG},
- {"GF_BLUEFLAG",GF_BLUEFLAG},
-
- // Customisable sounds for Skins, from sounds.h
- {"SKSSPIN",SKSSPIN},
- {"SKSPUTPUT",SKSPUTPUT},
- {"SKSPUDPUD",SKSPUDPUD},
- {"SKSPLPAN1",SKSPLPAN1}, // Ouchies
- {"SKSPLPAN2",SKSPLPAN2},
- {"SKSPLPAN3",SKSPLPAN3},
- {"SKSPLPAN4",SKSPLPAN4},
- {"SKSPLDET1",SKSPLDET1}, // Deaths
- {"SKSPLDET2",SKSPLDET2},
- {"SKSPLDET3",SKSPLDET3},
- {"SKSPLDET4",SKSPLDET4},
- {"SKSPLVCT1",SKSPLVCT1}, // Victories
- {"SKSPLVCT2",SKSPLVCT2},
- {"SKSPLVCT3",SKSPLVCT3},
- {"SKSPLVCT4",SKSPLVCT4},
- {"SKSTHOK",SKSTHOK},
- {"SKSSPNDSH",SKSSPNDSH},
- {"SKSZOOM",SKSZOOM},
- {"SKSSKID",SKSSKID},
- {"SKSGASP",SKSGASP},
- {"SKSJUMP",SKSJUMP},
-
- // 3D Floor/Fake Floor/FOF/whatever flags
- {"FF_EXISTS",FF_EXISTS}, ///< Always set, to check for validity.
- {"FF_BLOCKPLAYER",FF_BLOCKPLAYER}, ///< Solid to player, but nothing else
- {"FF_BLOCKOTHERS",FF_BLOCKOTHERS}, ///< Solid to everything but player
- {"FF_SOLID",FF_SOLID}, ///< Clips things.
- {"FF_RENDERSIDES",FF_RENDERSIDES}, ///< Renders the sides.
- {"FF_RENDERPLANES",FF_RENDERPLANES}, ///< Renders the floor/ceiling.
- {"FF_RENDERALL",FF_RENDERALL}, ///< Renders everything.
- {"FF_SWIMMABLE",FF_SWIMMABLE}, ///< Is a water block.
- {"FF_NOSHADE",FF_NOSHADE}, ///< Messes with the lighting?
- {"FF_CUTSOLIDS",FF_CUTSOLIDS}, ///< Cuts out hidden solid pixels.
- {"FF_CUTEXTRA",FF_CUTEXTRA}, ///< Cuts out hidden translucent pixels.
- {"FF_CUTLEVEL",FF_CUTLEVEL}, ///< Cuts out all hidden pixels.
- {"FF_CUTSPRITES",FF_CUTSPRITES}, ///< Final step in making 3D water.
- {"FF_BOTHPLANES",FF_BOTHPLANES}, ///< Render inside and outside planes.
- {"FF_EXTRA",FF_EXTRA}, ///< Gets cut by ::FF_CUTEXTRA.
- {"FF_TRANSLUCENT",FF_TRANSLUCENT}, ///< See through!
- {"FF_FOG",FF_FOG}, ///< Fog "brush."
- {"FF_INVERTPLANES",FF_INVERTPLANES}, ///< Only render inside planes.
- {"FF_ALLSIDES",FF_ALLSIDES}, ///< Render inside and outside sides.
- {"FF_INVERTSIDES",FF_INVERTSIDES}, ///< Only render inside sides.
- {"FF_DOUBLESHADOW",FF_DOUBLESHADOW}, ///< Make two lightlist entries to reset light?
- {"FF_FLOATBOB",FF_FLOATBOB}, ///< Floats on water and bobs if you step on it.
- {"FF_NORETURN",FF_NORETURN}, ///< Used with ::FF_CRUMBLE. Will not return to its original position after falling.
- {"FF_CRUMBLE",FF_CRUMBLE}, ///< Falls 2 seconds after being stepped on, and randomly brings all touching crumbling 3dfloors down with it, providing their master sectors share the same tag (allows crumble platforms above or below, to also exist).
- {"FF_SHATTERBOTTOM",FF_SHATTERBOTTOM}, ///< Used with ::FF_BUSTUP. Like FF_SHATTER, but only breaks from the bottom. Good for springing up through rubble.
- {"FF_MARIO",FF_MARIO}, ///< Acts like a question block when hit from underneath. Goodie spawned at top is determined by master sector.
- {"FF_BUSTUP",FF_BUSTUP}, ///< You can spin through/punch this block and it will crumble!
- {"FF_QUICKSAND",FF_QUICKSAND}, ///< Quicksand!
- {"FF_PLATFORM",FF_PLATFORM}, ///< You can jump up through this to the top.
- {"FF_REVERSEPLATFORM",FF_REVERSEPLATFORM}, ///< A fall-through floor in normal gravity, a platform in reverse gravity.
- {"FF_INTANGIBLEFLATS",FF_INTANGIBLEFLATS}, ///< Both flats are intangible, but the sides are still solid.
- {"FF_INTANGABLEFLATS",FF_INTANGIBLEFLATS}, ///< Both flats are intangable, but the sides are still solid.
- {"FF_SHATTER",FF_SHATTER}, ///< Used with ::FF_BUSTUP. Bustable on mere touch.
- {"FF_SPINBUST",FF_SPINBUST}, ///< Used with ::FF_BUSTUP. Also bustable if you're in your spinning frames.
- {"FF_STRONGBUST",FF_STRONGBUST}, ///< Used with ::FF_BUSTUP. Only bustable by "strong" characters (Knuckles) and abilities (bouncing, twinspin, melee).
- {"FF_RIPPLE",FF_RIPPLE}, ///< Ripple the flats
- {"FF_COLORMAPONLY",FF_COLORMAPONLY}, ///< Only copy the colormap, not the lightlevel
- {"FF_GOOWATER",FF_GOOWATER}, ///< Used with ::FF_SWIMMABLE. Makes thick bouncey goop.
-
-#ifdef HAVE_LUA_SEGS
- // Node flags
- {"NF_SUBSECTOR",NF_SUBSECTOR}, // Indicate a leaf.
-#endif
-
- // Slope flags
- {"SL_NOPHYSICS",SL_NOPHYSICS},
- {"SL_DYNAMIC",SL_DYNAMIC},
-
- // Angles
- {"ANG1",ANG1},
- {"ANG2",ANG2},
- {"ANG10",ANG10},
- {"ANG15",ANG15},
- {"ANG20",ANG20},
- {"ANG30",ANG30},
- {"ANG60",ANG60},
- {"ANG64h",ANG64h},
- {"ANG105",ANG105},
- {"ANG210",ANG210},
- {"ANG255",ANG255},
- {"ANG340",ANG340},
- {"ANG350",ANG350},
- {"ANGLE_11hh",ANGLE_11hh},
- {"ANGLE_22h",ANGLE_22h},
- {"ANGLE_45",ANGLE_45},
- {"ANGLE_67h",ANGLE_67h},
- {"ANGLE_90",ANGLE_90},
- {"ANGLE_112h",ANGLE_112h},
- {"ANGLE_135",ANGLE_135},
- {"ANGLE_157h",ANGLE_157h},
- {"ANGLE_180",ANGLE_180},
- {"ANGLE_202h",ANGLE_202h},
- {"ANGLE_225",ANGLE_225},
- {"ANGLE_247h",ANGLE_247h},
- {"ANGLE_270",ANGLE_270},
- {"ANGLE_292h",ANGLE_292h},
- {"ANGLE_315",ANGLE_315},
- {"ANGLE_337h",ANGLE_337h},
- {"ANGLE_MAX",ANGLE_MAX},
-
- // P_Chase directions (dirtype_t)
- {"DI_NODIR",DI_NODIR},
- {"DI_EAST",DI_EAST},
- {"DI_NORTHEAST",DI_NORTHEAST},
- {"DI_NORTH",DI_NORTH},
- {"DI_NORTHWEST",DI_NORTHWEST},
- {"DI_WEST",DI_WEST},
- {"DI_SOUTHWEST",DI_SOUTHWEST},
- {"DI_SOUTH",DI_SOUTH},
- {"DI_SOUTHEAST",DI_SOUTHEAST},
- {"NUMDIRS",NUMDIRS},
-
- // Sprite rotation axis (rotaxis_t)
- {"ROTAXIS_X",ROTAXIS_X},
- {"ROTAXIS_Y",ROTAXIS_Y},
- {"ROTAXIS_Z",ROTAXIS_Z},
-
- // Buttons (ticcmd_t)
- {"BT_WEAPONMASK",BT_WEAPONMASK}, //our first four bits.
- {"BT_WEAPONNEXT",BT_WEAPONNEXT},
- {"BT_WEAPONPREV",BT_WEAPONPREV},
- {"BT_ATTACK",BT_ATTACK}, // shoot rings
- {"BT_SPIN",BT_SPIN},
- {"BT_CAMLEFT",BT_CAMLEFT}, // turn camera left
- {"BT_CAMRIGHT",BT_CAMRIGHT}, // turn camera right
- {"BT_TOSSFLAG",BT_TOSSFLAG},
- {"BT_JUMP",BT_JUMP},
- {"BT_FIRENORMAL",BT_FIRENORMAL}, // Fire a normal ring no matter what
- {"BT_CUSTOM1",BT_CUSTOM1}, // Lua customizable
- {"BT_CUSTOM2",BT_CUSTOM2}, // Lua customizable
- {"BT_CUSTOM3",BT_CUSTOM3}, // Lua customizable
-
- // Lua command registration flags
- {"COM_ADMIN",COM_ADMIN},
- {"COM_SPLITSCREEN",COM_SPLITSCREEN},
- {"COM_LOCAL",COM_LOCAL},
-
- // cvflags_t
- {"CV_SAVE",CV_SAVE},
- {"CV_CALL",CV_CALL},
- {"CV_NETVAR",CV_NETVAR},
- {"CV_NOINIT",CV_NOINIT},
- {"CV_FLOAT",CV_FLOAT},
- {"CV_NOTINNET",CV_NOTINNET},
- {"CV_MODIFIED",CV_MODIFIED},
- {"CV_SHOWMODIF",CV_SHOWMODIF},
- {"CV_SHOWMODIFONETIME",CV_SHOWMODIFONETIME},
- {"CV_NOSHOWHELP",CV_NOSHOWHELP},
- {"CV_HIDEN",CV_HIDEN},
- {"CV_HIDDEN",CV_HIDEN},
- {"CV_CHEAT",CV_CHEAT},
- {"CV_NOLUA",CV_NOLUA},
-
- // v_video flags
- {"V_NOSCALEPATCH",V_NOSCALEPATCH},
- {"V_SMALLSCALEPATCH",V_SMALLSCALEPATCH},
- {"V_MEDSCALEPATCH",V_MEDSCALEPATCH},
- {"V_6WIDTHSPACE",V_6WIDTHSPACE},
- {"V_OLDSPACING",V_OLDSPACING},
- {"V_MONOSPACE",V_MONOSPACE},
-
- {"V_MAGENTAMAP",V_MAGENTAMAP},
- {"V_YELLOWMAP",V_YELLOWMAP},
- {"V_GREENMAP",V_GREENMAP},
- {"V_BLUEMAP",V_BLUEMAP},
- {"V_REDMAP",V_REDMAP},
- {"V_GRAYMAP",V_GRAYMAP},
- {"V_ORANGEMAP",V_ORANGEMAP},
- {"V_SKYMAP",V_SKYMAP},
- {"V_PURPLEMAP",V_PURPLEMAP},
- {"V_AQUAMAP",V_AQUAMAP},
- {"V_PERIDOTMAP",V_PERIDOTMAP},
- {"V_AZUREMAP",V_AZUREMAP},
- {"V_BROWNMAP",V_BROWNMAP},
- {"V_ROSYMAP",V_ROSYMAP},
- {"V_INVERTMAP",V_INVERTMAP},
-
- {"V_TRANSLUCENT",V_TRANSLUCENT},
- {"V_10TRANS",V_10TRANS},
- {"V_20TRANS",V_20TRANS},
- {"V_30TRANS",V_30TRANS},
- {"V_40TRANS",V_40TRANS},
- {"V_50TRANS",V_TRANSLUCENT}, // alias
- {"V_60TRANS",V_60TRANS},
- {"V_70TRANS",V_70TRANS},
- {"V_80TRANS",V_80TRANS},
- {"V_90TRANS",V_90TRANS},
- {"V_HUDTRANSHALF",V_HUDTRANSHALF},
- {"V_HUDTRANS",V_HUDTRANS},
- {"V_HUDTRANSDOUBLE",V_HUDTRANSDOUBLE},
- {"V_AUTOFADEOUT",V_AUTOFADEOUT},
- {"V_RETURN8",V_RETURN8},
- {"V_OFFSET",V_OFFSET},
- {"V_ALLOWLOWERCASE",V_ALLOWLOWERCASE},
- {"V_FLIP",V_FLIP},
- {"V_CENTERNAMETAG",V_CENTERNAMETAG},
- {"V_SNAPTOTOP",V_SNAPTOTOP},
- {"V_SNAPTOBOTTOM",V_SNAPTOBOTTOM},
- {"V_SNAPTOLEFT",V_SNAPTOLEFT},
- {"V_SNAPTORIGHT",V_SNAPTORIGHT},
- {"V_WRAPX",V_WRAPX},
- {"V_WRAPY",V_WRAPY},
- {"V_NOSCALESTART",V_NOSCALESTART},
- {"V_PERPLAYER",V_PERPLAYER},
-
- {"V_PARAMMASK",V_PARAMMASK},
- {"V_SCALEPATCHMASK",V_SCALEPATCHMASK},
- {"V_SPACINGMASK",V_SPACINGMASK},
- {"V_CHARCOLORMASK",V_CHARCOLORMASK},
- {"V_ALPHAMASK",V_ALPHAMASK},
-
- {"V_CHARCOLORSHIFT",V_CHARCOLORSHIFT},
- {"V_ALPHASHIFT",V_ALPHASHIFT},
-
- //Kick Reasons
- {"KR_KICK",KR_KICK},
- {"KR_PINGLIMIT",KR_PINGLIMIT},
- {"KR_SYNCH",KR_SYNCH},
- {"KR_TIMEOUT",KR_TIMEOUT},
- {"KR_BAN",KR_BAN},
- {"KR_LEAVE",KR_LEAVE},
-
- // translation colormaps
- {"TC_DEFAULT",TC_DEFAULT},
- {"TC_BOSS",TC_BOSS},
- {"TC_METALSONIC",TC_METALSONIC},
- {"TC_ALLWHITE",TC_ALLWHITE},
- {"TC_RAINBOW",TC_RAINBOW},
- {"TC_BLINK",TC_BLINK},
- {"TC_DASHMODE",TC_DASHMODE},
-
- // marathonmode flags
- {"MA_INIT",MA_INIT},
- {"MA_RUNNING",MA_RUNNING},
- {"MA_NOCUTSCENES",MA_NOCUTSCENES},
- {"MA_INGAME",MA_INGAME},
-
- {NULL,0}
-};
-
-static mobjtype_t get_mobjtype(const char *word)
-{ // Returns the value of MT_ enumerations
- mobjtype_t i;
- if (*word >= '0' && *word <= '9')
- return atoi(word);
- if (fastncmp("MT_",word,3))
- word += 3; // take off the MT_
- for (i = 0; i < NUMMOBJFREESLOTS; i++) {
- if (!FREE_MOBJS[i])
- break;
- if (fastcmp(word, FREE_MOBJS[i]))
- return MT_FIRSTFREESLOT+i;
- }
- for (i = 0; i < MT_FIRSTFREESLOT; i++)
- if (fastcmp(word, MOBJTYPE_LIST[i]+3))
- return i;
- deh_warning("Couldn't find mobjtype named 'MT_%s'",word);
- return MT_NULL;
-}
-
-static statenum_t get_state(const char *word)
-{ // Returns the value of S_ enumerations
- statenum_t i;
- if (*word >= '0' && *word <= '9')
- return atoi(word);
- if (fastncmp("S_",word,2))
- word += 2; // take off the S_
- for (i = 0; i < NUMSTATEFREESLOTS; i++) {
- if (!FREE_STATES[i])
- break;
- if (fastcmp(word, FREE_STATES[i]))
- return S_FIRSTFREESLOT+i;
- }
- for (i = 0; i < S_FIRSTFREESLOT; i++)
- if (fastcmp(word, STATE_LIST[i]+2))
- return i;
- deh_warning("Couldn't find state named 'S_%s'",word);
- return S_NULL;
-}
-
-skincolornum_t get_skincolor(const char *word)
-{ // Returns the value of SKINCOLOR_ enumerations
- skincolornum_t i;
- if (*word >= '0' && *word <= '9')
- return atoi(word);
- if (fastncmp("SKINCOLOR_",word,10))
- word += 10; // take off the SKINCOLOR_
- for (i = 0; i < NUMCOLORFREESLOTS; i++) {
- if (!FREE_SKINCOLORS[i])
- break;
- if (fastcmp(word, FREE_SKINCOLORS[i]))
- return SKINCOLOR_FIRSTFREESLOT+i;
- }
- for (i = 0; i < SKINCOLOR_FIRSTFREESLOT; i++)
- if (fastcmp(word, COLOR_ENUMS[i]))
- return i;
- deh_warning("Couldn't find skincolor named 'SKINCOLOR_%s'",word);
- return SKINCOLOR_GREEN;
-}
-
-static spritenum_t get_sprite(const char *word)
-{ // Returns the value of SPR_ enumerations
- spritenum_t i;
- if (*word >= '0' && *word <= '9')
- return atoi(word);
- if (fastncmp("SPR_",word,4))
- word += 4; // take off the SPR_
- for (i = 0; i < NUMSPRITES; i++)
- if (!sprnames[i][4] && memcmp(word,sprnames[i],4)==0)
- return i;
- deh_warning("Couldn't find sprite named 'SPR_%s'",word);
- return SPR_NULL;
-}
-
-static playersprite_t get_sprite2(const char *word)
-{ // Returns the value of SPR2_ enumerations
- playersprite_t i;
- if (*word >= '0' && *word <= '9')
- return atoi(word);
- if (fastncmp("SPR2_",word,5))
- word += 5; // take off the SPR2_
- for (i = 0; i < NUMPLAYERSPRITES; i++)
- if (!spr2names[i][4] && memcmp(word,spr2names[i],4)==0)
- return i;
- deh_warning("Couldn't find sprite named 'SPR2_%s'",word);
- return SPR2_STND;
-}
-
-static sfxenum_t get_sfx(const char *word)
-{ // Returns the value of SFX_ enumerations
- sfxenum_t i;
- if (*word >= '0' && *word <= '9')
- return atoi(word);
- if (fastncmp("SFX_",word,4))
- word += 4; // take off the SFX_
- else if (fastncmp("DS",word,2))
- word += 2; // take off the DS
- for (i = 0; i < NUMSFX; i++)
- if (S_sfx[i].name && fasticmp(word, S_sfx[i].name))
- return i;
- deh_warning("Couldn't find sfx named 'SFX_%s'",word);
- return sfx_None;
-}
-
-#ifdef MUSICSLOT_COMPATIBILITY
-static UINT16 get_mus(const char *word, UINT8 dehacked_mode)
-{ // Returns the value of MUS_ enumerations
- UINT16 i;
- char lumptmp[4];
-
- if (*word >= '0' && *word <= '9')
- return atoi(word);
- if (!word[2] && toupper(word[0]) >= 'A' && toupper(word[0]) <= 'Z')
- return (UINT16)M_MapNumber(word[0], word[1]);
-
- if (fastncmp("MUS_",word,4))
- word += 4; // take off the MUS_
- else if (fastncmp("O_",word,2) || fastncmp("D_",word,2))
- word += 2; // take off the O_ or D_
-
- strncpy(lumptmp, word, 4);
- lumptmp[3] = 0;
- if (fasticmp("MAP",lumptmp))
- {
- word += 3;
- if (toupper(word[0]) >= 'A' && toupper(word[0]) <= 'Z')
- return (UINT16)M_MapNumber(word[0], word[1]);
- else if ((i = atoi(word)))
- return i;
-
- word -= 3;
- if (dehacked_mode)
- deh_warning("Couldn't find music named 'MUS_%s'",word);
- return 0;
- }
- for (i = 0; compat_special_music_slots[i][0]; ++i)
- if (fasticmp(word, compat_special_music_slots[i]))
- return i + 1036;
- if (dehacked_mode)
- deh_warning("Couldn't find music named 'MUS_%s'",word);
- return 0;
-}
-#endif
-
-static hudnum_t get_huditem(const char *word)
-{ // Returns the value of HUD_ enumerations
- hudnum_t i;
- if (*word >= '0' && *word <= '9')
- return atoi(word);
- if (fastncmp("HUD_",word,4))
- word += 4; // take off the HUD_
- for (i = 0; i < NUMHUDITEMS; i++)
- if (fastcmp(word, HUDITEMS_LIST[i]))
- return i;
- deh_warning("Couldn't find huditem named 'HUD_%s'",word);
- return HUD_LIVES;
-}
-
-static menutype_t get_menutype(const char *word)
-{ // Returns the value of MN_ enumerations
- menutype_t i;
- if (*word >= '0' && *word <= '9')
- return atoi(word);
- if (fastncmp("MN_",word,3))
- word += 3; // take off the MN_
- for (i = 0; i < NUMMENUTYPES; i++)
- if (fastcmp(word, MENUTYPES_LIST[i]))
- return i;
- deh_warning("Couldn't find menutype named 'MN_%s'",word);
- return MN_NONE;
-}
-
-/*static INT16 get_gametype(const char *word)
-{ // Returns the value of GT_ enumerations
- INT16 i;
- if (*word >= '0' && *word <= '9')
- return atoi(word);
- if (fastncmp("GT_",word,3))
- word += 3; // take off the GT_
- for (i = 0; i < NUMGAMETYPES; i++)
- if (fastcmp(word, Gametype_ConstantNames[i]+3))
- return i;
- deh_warning("Couldn't find gametype named 'GT_%s'",word);
- return GT_COOP;
-}
-
-static powertype_t get_power(const char *word)
-{ // Returns the value of pw_ enumerations
- powertype_t i;
- if (*word >= '0' && *word <= '9')
- return atoi(word);
- if (fastncmp("PW_",word,3))
- word += 3; // take off the pw_
- for (i = 0; i < NUMPOWERS; i++)
- if (fastcmp(word, POWERS_LIST[i]))
- return i;
- deh_warning("Couldn't find power named 'pw_%s'",word);
- return pw_invulnerability;
-}*/
-
-/// \todo Make ANY of this completely over-the-top math craziness obey the order of operations.
-static fixed_t op_mul(fixed_t a, fixed_t b) { return a*b; }
-static fixed_t op_div(fixed_t a, fixed_t b) { return a/b; }
-static fixed_t op_add(fixed_t a, fixed_t b) { return a+b; }
-static fixed_t op_sub(fixed_t a, fixed_t b) { return a-b; }
-static fixed_t op_or(fixed_t a, fixed_t b) { return a|b; }
-static fixed_t op_and(fixed_t a, fixed_t b) { return a&b; }
-static fixed_t op_lshift(fixed_t a, fixed_t b) { return a<<b; }
-static fixed_t op_rshift(fixed_t a, fixed_t b) { return a>>b; }
-
-struct {
- const char c;
- fixed_t (*v)(fixed_t,fixed_t);
-} OPERATIONS[] = {
- {'*',op_mul},
- {'/',op_div},
- {'+',op_add},
- {'-',op_sub},
- {'|',op_or},
- {'&',op_and},
- {'<',op_lshift},
- {'>',op_rshift},
- {0,NULL}
-};
-
-// Returns the full word, cut at the first symbol or whitespace
-/*static char *read_word(const char *line)
-{
- // Part 1: You got the start of the word, now find the end.
- const char *p;
- INT32 i;
- for (p = line+1; *p; p++) {
- if (*p == ' ' || *p == '\t')
- break;
- for (i = 0; OPERATIONS[i].c; i++)
- if (*p == OPERATIONS[i].c) {
- i = -1;
- break;
- }
- if (i == -1)
- break;
- }
-
- // Part 2: Make a copy of the word and return it.
- {
- size_t len = (p-line);
- char *word = malloc(len+1);
- M_Memcpy(word,line,len);
- word[len] = '\0';
- return word;
- }
-}
-
-static INT32 operation_pad(const char **word)
-{ // Brings word the next operation and returns the operation number.
- INT32 i;
- for (; **word; (*word)++) {
- if (**word == ' ' || **word == '\t')
- continue;
- for (i = 0; OPERATIONS[i].c; i++)
- if (**word == OPERATIONS[i].c)
- {
- if ((**word == '<' && *(*word+1) == '<') || (**word == '>' && *(*word+1) == '>')) (*word)++; // These operations are two characters long.
- else if (**word == '<' || **word == '>') continue; // ... do not accept one character long.
- (*word)++;
- return i;
- }
- deh_warning("Unknown operation '%c'",**word);
- return -1;
- }
- return -1;
-}
-
-static void const_warning(const char *type, const char *word)
-{
- deh_warning("Couldn't find %s named '%s'",type,word);
-}
-
-static fixed_t find_const(const char **rword)
-{ // Finds the value of constants and returns it, bringing word to the next operation.
- INT32 i;
- fixed_t r;
- char *word = read_word(*rword);
- *rword += strlen(word);
- if ((*word >= '0' && *word <= '9') || *word == '-') { // Parse a number
- r = atoi(word);
- free(word);
- return r;
- }
- if (!*(word+1) && // Turn a single A-z symbol into numbers, like sprite frames.
- ((*word >= 'A' && *word <= 'Z') || (*word >= 'a' && *word <= 'z'))) {
- r = R_Char2Frame(*word);
- free(word);
- return r;
- }
- if (fastncmp("MF_", word, 3)) {
- char *p = word+3;
- for (i = 0; MOBJFLAG_LIST[i]; i++)
- if (fastcmp(p, MOBJFLAG_LIST[i])) {
- free(word);
- return (1<<i);
- }
-
- // Not found error
- const_warning("mobj flag",word);
- free(word);
- return 0;
- }
- else if (fastncmp("MF2_", word, 4)) {
- char *p = word+4;
- for (i = 0; MOBJFLAG2_LIST[i]; i++)
- if (fastcmp(p, MOBJFLAG2_LIST[i])) {
- free(word);
- return (1<<i);
- }
-
- // Not found error
- const_warning("mobj flag2",word);
- free(word);
- return 0;
- }
- else if (fastncmp("MFE_", word, 4)) {
- char *p = word+4;
- for (i = 0; MOBJEFLAG_LIST[i]; i++)
- if (fastcmp(p, MOBJEFLAG_LIST[i])) {
- free(word);
- return (1<<i);
- }
-
- // Not found error
- const_warning("mobj eflag",word);
- free(word);
- return 0;
- }
- else if (fastncmp("PF_", word, 3)) {
- char *p = word+3;
- for (i = 0; PLAYERFLAG_LIST[i]; i++)
- if (fastcmp(p, PLAYERFLAG_LIST[i])) {
- free(word);
- return (1<<i);
- }
- if (fastcmp(p, "FULLSTASIS"))
- return PF_FULLSTASIS;
-
- // Not found error
- const_warning("player flag",word);
- free(word);
- return 0;
- }
- else if (fastncmp("S_",word,2)) {
- r = get_state(word);
- free(word);
- return r;
- }
- else if (fastncmp("SKINCOLOR_",word,10)) {
- r = get_skincolor(word);
- free(word);
- return r;
- }
- else if (fastncmp("MT_",word,3)) {
- r = get_mobjtype(word);
- free(word);
- return r;
- }
- else if (fastncmp("SPR_",word,4)) {
- r = get_sprite(word);
- free(word);
- return r;
- }
- else if (fastncmp("SFX_",word,4) || fastncmp("DS",word,2)) {
- r = get_sfx(word);
- free(word);
- return r;
- }
-#ifdef MUSICSLOT_COMPATIBILITY
- else if (fastncmp("MUS_",word,4) || fastncmp("O_",word,2)) {
- r = get_mus(word, true);
- free(word);
- return r;
- }
-#endif
- else if (fastncmp("PW_",word,3)) {
- r = get_power(word);
- free(word);
- return r;
- }
- else if (fastncmp("MN_",word,3)) {
- r = get_menutype(word);
- free(word);
- return r;
- }
- else if (fastncmp("GT_",word,3)) {
- r = get_gametype(word);
- free(word);
- return r;
- }
- else if (fastncmp("GTR_", word, 4)) {
- char *p = word+4;
- for (i = 0; GAMETYPERULE_LIST[i]; i++)
- if (fastcmp(p, GAMETYPERULE_LIST[i])) {
- free(word);
- return (1<<i);
- }
-
- // Not found error
- const_warning("game type rule",word);
- free(word);
- return 0;
- }
- else if (fastncmp("TOL_", word, 4)) {
- char *p = word+4;
- for (i = 0; TYPEOFLEVEL[i].name; i++)
- if (fastcmp(p, TYPEOFLEVEL[i].name)) {
- free(word);
- return TYPEOFLEVEL[i].flag;
- }
-
- // Not found error
- const_warning("typeoflevel",word);
- free(word);
- return 0;
- }
- else if (fastncmp("HUD_",word,4)) {
- r = get_huditem(word);
- free(word);
- return r;
- }
- else if (fastncmp("GRADE_",word,6))
- {
- char *p = word+6;
- for (i = 0; NIGHTSGRADE_LIST[i]; i++)
- if (*p == NIGHTSGRADE_LIST[i])
- {
- free(word);
- return i;
- }
- const_warning("NiGHTS grade",word);
- free(word);
- return 0;
- }
- for (i = 0; INT_CONST[i].n; i++)
- if (fastcmp(word,INT_CONST[i].n)) {
- free(word);
- return INT_CONST[i].v;
- }
-
- // Not found error.
- const_warning("constant",word);
- free(word);
- return 0;
-}*/
-
-// Loops through every constant and operation in word and performs its calculations, returning the final value.
-fixed_t get_number(const char *word)
-{
- return LUA_EvalMath(word);
-
- /*// DESPERATELY NEEDED: Order of operations support! :x
- fixed_t i = find_const(&word);
- INT32 o;
- while(*word) {
- o = operation_pad(&word);
- if (o != -1)
- i = OPERATIONS[o].v(i,find_const(&word));
- else
- break;
- }
- return i;*/
-}
-
-void DEH_Check(void)
-{
-#if defined(_DEBUG) || defined(PARANOIA)
- const size_t dehstates = sizeof(STATE_LIST)/sizeof(const char*);
- const size_t dehmobjs = sizeof(MOBJTYPE_LIST)/sizeof(const char*);
- const size_t dehpowers = sizeof(POWERS_LIST)/sizeof(const char*);
- const size_t dehcolors = sizeof(COLOR_ENUMS)/sizeof(const char*);
-
- if (dehstates != S_FIRSTFREESLOT)
- I_Error("You forgot to update the Dehacked states list, you dolt!\n(%d states defined, versus %s in the Dehacked list)\n", S_FIRSTFREESLOT, sizeu1(dehstates));
-
- if (dehmobjs != MT_FIRSTFREESLOT)
- I_Error("You forgot to update the Dehacked mobjtype list, you dolt!\n(%d mobj types defined, versus %s in the Dehacked list)\n", MT_FIRSTFREESLOT, sizeu1(dehmobjs));
-
- if (dehpowers != NUMPOWERS)
- I_Error("You forgot to update the Dehacked powers list, you dolt!\n(%d powers defined, versus %s in the Dehacked list)\n", NUMPOWERS, sizeu1(dehpowers));
-
- if (dehcolors != SKINCOLOR_FIRSTFREESLOT)
- I_Error("You forgot to update the Dehacked colors list, you dolt!\n(%d colors defined, versus %s in the Dehacked list)\n", SKINCOLOR_FIRSTFREESLOT, sizeu1(dehcolors));
-#endif
-}
-
-#include "lua_script.h"
-#include "lua_libs.h"
-
-// freeslot takes a name (string only!)
-// and allocates it to the appropriate free slot.
-// Returns the slot number allocated for it or nil if failed.
-// ex. freeslot("MT_MYTHING","S_MYSTATE1","S_MYSTATE2")
-// TODO: Error checking! @.@; There's currently no way to know which ones failed and why!
-//
-static inline int lib_freeslot(lua_State *L)
-{
- int n = lua_gettop(L);
- int r = 0; // args returned
- char *s, *type,*word;
-
- if (!lua_lumploading)
- return luaL_error(L, "This function cannot be called from within a hook or coroutine!");
-
- while (n-- > 0)
- {
- s = Z_StrDup(luaL_checkstring(L,1));
- type = strtok(s, "_");
- if (type)
- strupr(type);
- else {
- Z_Free(s);
- return luaL_error(L, "Unknown enum type in '%s'\n", luaL_checkstring(L, 1));
- }
-
- word = strtok(NULL, "\n");
- if (word)
- strupr(word);
- else {
- Z_Free(s);
- return luaL_error(L, "Missing enum name in '%s'\n", luaL_checkstring(L, 1));
- }
- if (fastcmp(type, "SFX")) {
- sfxenum_t sfx;
- strlwr(word);
- CONS_Printf("Sound sfx_%s allocated.\n",word);
- sfx = S_AddSoundFx(word, false, 0, false);
- if (sfx != sfx_None) {
- lua_pushinteger(L, sfx);
- r++;
- } else
- CONS_Alert(CONS_WARNING, "Ran out of free SFX slots!\n");
- }
- else if (fastcmp(type, "SPR"))
- {
- char wad;
- spritenum_t j;
- lua_getfield(L, LUA_REGISTRYINDEX, "WAD");
- wad = (char)lua_tointeger(L, -1);
- lua_pop(L, 1);
- for (j = SPR_FIRSTFREESLOT; j <= SPR_LASTFREESLOT; j++)
- {
- if (used_spr[(j-SPR_FIRSTFREESLOT)/8] & (1<<(j%8)))
- {
- if (!sprnames[j][4] && memcmp(sprnames[j],word,4)==0)
- sprnames[j][4] = wad;
- continue; // Already allocated, next.
}
- // Found a free slot!
- CONS_Printf("Sprite SPR_%s allocated.\n",word);
- strncpy(sprnames[j],word,4);
- //sprnames[j][4] = 0;
- used_spr[(j-SPR_FIRSTFREESLOT)/8] |= 1<<(j%8); // Okay, this sprite slot has been named now.
- lua_pushinteger(L, j);
- r++;
- break;
- }
- if (j > SPR_LASTFREESLOT)
- CONS_Alert(CONS_WARNING, "Ran out of free sprite slots!\n");
- }
- else if (fastcmp(type, "S"))
- {
- statenum_t i;
- for (i = 0; i < NUMSTATEFREESLOTS; i++)
- if (!FREE_STATES[i]) {
- CONS_Printf("State S_%s allocated.\n",word);
- FREE_STATES[i] = Z_Malloc(strlen(word)+1, PU_STATIC, NULL);
- strcpy(FREE_STATES[i],word);
- lua_pushinteger(L, S_FIRSTFREESLOT + i);
- r++;
- break;
+ else if (fastcmp(word, "MENU"))
+ {
+ if (i == 0 && word2[0] != '0') // If word2 isn't a number
+ i = get_menutype(word2); // find a huditem by name
+ if (i >= 1 && i < NUMMENUTYPES)
+ readmenu(f, i);
+ else
+ {
+ // zero-based, but let's start at 1
+ deh_warning("Menu number %d out of range (1 - %d)", i, NUMMENUTYPES-1);
+ ignorelines(f);
+ }
}
- if (i == NUMSTATEFREESLOTS)
- CONS_Alert(CONS_WARNING, "Ran out of free State slots!\n");
- }
- else if (fastcmp(type, "MT"))
- {
- mobjtype_t i;
- for (i = 0; i < NUMMOBJFREESLOTS; i++)
- if (!FREE_MOBJS[i]) {
- CONS_Printf("MobjType MT_%s allocated.\n",word);
- FREE_MOBJS[i] = Z_Malloc(strlen(word)+1, PU_STATIC, NULL);
- strcpy(FREE_MOBJS[i],word);
- lua_pushinteger(L, MT_FIRSTFREESLOT + i);
- r++;
- break;
+ else if (fastcmp(word, "UNLOCKABLE"))
+ {
+ if (!mainfile && !gamedataadded)
+ {
+ deh_warning("You must define a custom gamedata to use \"%s\"", word);
+ ignorelines(f);
+ }
+ else if (i > 0 && i <= MAXUNLOCKABLES)
+ readunlockable(f, i - 1);
+ else
+ {
+ deh_warning("Unlockable number %d out of range (1 - %d)", i, MAXUNLOCKABLES);
+ ignorelines(f);
+ }
}
- if (i == NUMMOBJFREESLOTS)
- CONS_Alert(CONS_WARNING, "Ran out of free MobjType slots!\n");
- }
- else if (fastcmp(type, "SKINCOLOR"))
- {
- skincolornum_t i;
- for (i = 0; i < NUMCOLORFREESLOTS; i++)
- if (!FREE_SKINCOLORS[i]) {
- CONS_Printf("Skincolor SKINCOLOR_%s allocated.\n",word);
- FREE_SKINCOLORS[i] = Z_Malloc(strlen(word)+1, PU_STATIC, NULL);
- strcpy(FREE_SKINCOLORS[i],word);
- M_AddMenuColor(numskincolors++);
- lua_pushinteger(L, SKINCOLOR_FIRSTFREESLOT + i);
- r++;
- break;
+ else if (fastcmp(word, "CONDITIONSET"))
+ {
+ if (!mainfile && !gamedataadded)
+ {
+ deh_warning("You must define a custom gamedata to use \"%s\"", word);
+ ignorelines(f);
+ }
+ else if (i > 0 && i <= MAXCONDITIONSETS)
+ readconditionset(f, (UINT8)i);
+ else
+ {
+ deh_warning("Condition set number %d out of range (1 - %d)", i, MAXCONDITIONSETS);
+ ignorelines(f);
+ }
}
- if (i == NUMCOLORFREESLOTS)
- CONS_Alert(CONS_WARNING, "Ran out of free skincolor slots!\n");
- }
- else if (fastcmp(type, "SPR2"))
- {
- // Search if we already have an SPR2 by that name...
- playersprite_t i;
- for (i = SPR2_FIRSTFREESLOT; i < free_spr2; i++)
- if (memcmp(spr2names[i],word,4) == 0)
- break;
- // We don't, so allocate a new one.
- if (i >= free_spr2) {
- if (free_spr2 < NUMPLAYERSPRITES)
+ else if (fastcmp(word, "SRB2"))
{
- CONS_Printf("Sprite SPR2_%s allocated.\n",word);
- strncpy(spr2names[free_spr2],word,4);
- spr2defaults[free_spr2] = 0;
- lua_pushinteger(L, free_spr2);
- r++;
- spr2names[free_spr2++][4] = 0;
- } else
- CONS_Alert(CONS_WARNING, "Ran out of free SPR2 slots!\n");
- }
- }
- else if (fastcmp(type, "TOL"))
- {
- // Search if we already have a typeoflevel by that name...
- int i;
- for (i = 0; TYPEOFLEVEL[i].name; i++)
- if (fastcmp(word, TYPEOFLEVEL[i].name))
- break;
-
- // We don't, so allocate a new one.
- if (TYPEOFLEVEL[i].name == NULL) {
- if (lastcustomtol == (UINT32)MAXTOL) // Unless you have way too many, since they're flags.
- CONS_Alert(CONS_WARNING, "Ran out of free typeoflevel slots!\n");
- else {
- CONS_Printf("TypeOfLevel TOL_%s allocated.\n",word);
- G_AddTOL(lastcustomtol, word);
- lua_pushinteger(L, lastcustomtol);
- lastcustomtol <<= 1;
- r++;
+ if (isdigit(word2[0]))
+ {
+ i = atoi(word2);
+ if (i != PATCHVERSION)
+ {
+ deh_warning(
+ "Patch is for SRB2 version %d, "
+ "only version %d is supported",
+ i,
+ PATCHVERSION
+ );
+ }
+ }
+ else
+ {
+ deh_warning(
+ "SRB2 version definition has incorrect format, "
+ "use \"SRB2 %d\"",
+ PATCHVERSION
+ );
+ }
}
- }
- }
- Z_Free(s);
- lua_remove(L, 1);
- continue;
- }
- return r;
-}
+ // Clear all data in certain locations (mostly for unlocks)
+ // Unless you REALLY want to piss people off,
+ // define a custom gamedata /before/ doing this!!
+ // (then again, modifiedgame will prevent game data saving anyway)
+ else if (fastcmp(word, "CLEAR"))
+ {
+ boolean clearall = (fastcmp(word2, "ALL"));
-// Wrapper for ALL A_Action functions.
-// Arguments: mobj_t actor, int var1, int var2
-static int action_call(lua_State *L)
-{
- //actionf_t *action = lua_touserdata(L,lua_upvalueindex(1));
- actionf_t *action = *((actionf_t **)luaL_checkudata(L, 1, META_ACTION));
- mobj_t *actor = *((mobj_t **)luaL_checkudata(L, 2, META_MOBJ));
- var1 = (INT32)luaL_optinteger(L, 3, 0);
- var2 = (INT32)luaL_optinteger(L, 4, 0);
- if (!actor)
- return LUA_ErrInvalid(L, "mobj_t");
- action->acp1(actor);
- return 0;
-}
+ if (!mainfile && !gamedataadded)
+ {
+ deh_warning("You must define a custom gamedata to use \"%s\"", word);
+ continue;
+ }
-// Hardcoded A_Action name to call for super() or NULL if super() would be invalid.
-// Set in lua_infolib.
-const char *superactions[MAXRECURSION];
-UINT8 superstack = 0;
+ if (clearall || fastcmp(word2, "UNLOCKABLES"))
+ memset(&unlockables, 0, sizeof(unlockables));
-static int lib_dummysuper(lua_State *L)
-{
- return luaL_error(L, "Can't call super() outside of hardcode-replacing A_Action functions being called by state changes!"); // convoluted, I know. @_@;;
-}
+ if (clearall || fastcmp(word2, "EMBLEMS"))
+ {
+ memset(&emblemlocations, 0, sizeof(emblemlocations));
+ numemblems = 0;
+ }
-static inline int lib_getenum(lua_State *L)
-{
- const char *word, *p;
- fixed_t i;
- boolean mathlib = lua_toboolean(L, lua_upvalueindex(1));
- if (lua_type(L,2) != LUA_TSTRING)
- return 0;
- word = lua_tostring(L,2);
- if (strlen(word) == 1) { // Assume sprite frame if length 1.
- if (*word >= 'A' && *word <= '~')
- {
- lua_pushinteger(L, *word-'A');
- return 1;
- }
- if (mathlib) return luaL_error(L, "constant '%s' could not be parsed.\n", word);
- return 0;
- }
- else if (fastncmp("MF_", word, 3)) {
- p = word+3;
- for (i = 0; MOBJFLAG_LIST[i]; i++)
- if (fastcmp(p, MOBJFLAG_LIST[i])) {
- lua_pushinteger(L, ((lua_Integer)1<<i));
- return 1;
- }
- if (mathlib) return luaL_error(L, "mobjflag '%s' could not be found.\n", word);
- return 0;
- }
- else if (fastncmp("MF2_", word, 4)) {
- p = word+4;
- for (i = 0; MOBJFLAG2_LIST[i]; i++)
- if (fastcmp(p, MOBJFLAG2_LIST[i])) {
- lua_pushinteger(L, ((lua_Integer)1<<i));
- return 1;
- }
- if (mathlib) return luaL_error(L, "mobjflag2 '%s' could not be found.\n", word);
- return 0;
- }
- else if (fastncmp("MFE_", word, 4)) {
- p = word+4;
- for (i = 0; MOBJEFLAG_LIST[i]; i++)
- if (fastcmp(p, MOBJEFLAG_LIST[i])) {
- lua_pushinteger(L, ((lua_Integer)1<<i));
- return 1;
- }
- if (mathlib) return luaL_error(L, "mobjeflag '%s' could not be found.\n", word);
- return 0;
- }
- else if (fastncmp("MTF_", word, 4)) {
- p = word+4;
- for (i = 0; i < 4; i++)
- if (MAPTHINGFLAG_LIST[i] && fastcmp(p, MAPTHINGFLAG_LIST[i])) {
- lua_pushinteger(L, ((lua_Integer)1<<i));
- return 1;
- }
- if (mathlib) return luaL_error(L, "mapthingflag '%s' could not be found.\n", word);
- return 0;
- }
- else if (fastncmp("PF_", word, 3)) {
- p = word+3;
- for (i = 0; PLAYERFLAG_LIST[i]; i++)
- if (fastcmp(p, PLAYERFLAG_LIST[i])) {
- lua_pushinteger(L, ((lua_Integer)1<<i));
- return 1;
- }
- if (fastcmp(p, "FULLSTASIS"))
- {
- lua_pushinteger(L, (lua_Integer)PF_FULLSTASIS);
- return 1;
- }
- else if (fastcmp(p, "USEDOWN")) // Remove case when 2.3 nears release...
- {
- lua_pushinteger(L, (lua_Integer)PF_SPINDOWN);
- return 1;
- }
- if (mathlib) return luaL_error(L, "playerflag '%s' could not be found.\n", word);
- return 0;
- }
- else if (fastncmp("GT_", word, 3)) {
- p = word;
- for (i = 0; Gametype_ConstantNames[i]; i++)
- if (fastcmp(p, Gametype_ConstantNames[i])) {
- lua_pushinteger(L, i);
- return 1;
- }
- if (mathlib) return luaL_error(L, "gametype '%s' could not be found.\n", word);
- return 0;
- }
- else if (fastncmp("GTR_", word, 4)) {
- p = word+4;
- for (i = 0; GAMETYPERULE_LIST[i]; i++)
- if (fastcmp(p, GAMETYPERULE_LIST[i])) {
- lua_pushinteger(L, ((lua_Integer)1<<i));
- return 1;
- }
- if (mathlib) return luaL_error(L, "game type rule '%s' could not be found.\n", word);
- return 0;
- }
- else if (fastncmp("TOL_", word, 4)) {
- p = word+4;
- for (i = 0; TYPEOFLEVEL[i].name; i++)
- if (fastcmp(p, TYPEOFLEVEL[i].name)) {
- lua_pushinteger(L, TYPEOFLEVEL[i].flag);
- return 1;
- }
- if (mathlib) return luaL_error(L, "typeoflevel '%s' could not be found.\n", word);
- return 0;
- }
- else if (fastncmp("ML_", word, 3)) {
- p = word+3;
- for (i = 0; i < 16; i++)
- if (ML_LIST[i] && fastcmp(p, ML_LIST[i])) {
- lua_pushinteger(L, ((lua_Integer)1<<i));
- return 1;
- }
- if (mathlib) return luaL_error(L, "linedef flag '%s' could not be found.\n", word);
- return 0;
- }
- else if (fastncmp("S_",word,2)) {
- p = word+2;
- for (i = 0; i < NUMSTATEFREESLOTS; i++) {
- if (!FREE_STATES[i])
- break;
- if (fastcmp(p, FREE_STATES[i])) {
- lua_pushinteger(L, S_FIRSTFREESLOT+i);
- return 1;
- }
- }
- for (i = 0; i < S_FIRSTFREESLOT; i++)
- if (fastcmp(p, STATE_LIST[i]+2)) {
- lua_pushinteger(L, i);
- return 1;
- }
- return luaL_error(L, "state '%s' does not exist.\n", word);
- }
- else if (fastncmp("MT_",word,3)) {
- p = word+3;
- for (i = 0; i < NUMMOBJFREESLOTS; i++) {
- if (!FREE_MOBJS[i])
- break;
- if (fastcmp(p, FREE_MOBJS[i])) {
- lua_pushinteger(L, MT_FIRSTFREESLOT+i);
- return 1;
- }
- }
- for (i = 0; i < MT_FIRSTFREESLOT; i++)
- if (fastcmp(p, MOBJTYPE_LIST[i]+3)) {
- lua_pushinteger(L, i);
- return 1;
- }
- return luaL_error(L, "mobjtype '%s' does not exist.\n", word);
- }
- else if (fastncmp("SPR_",word,4)) {
- p = word+4;
- for (i = 0; i < NUMSPRITES; i++)
- if (!sprnames[i][4] && fastncmp(p,sprnames[i],4)) {
- lua_pushinteger(L, i);
- return 1;
- }
- if (mathlib) return luaL_error(L, "sprite '%s' could not be found.\n", word);
- return 0;
- }
- else if (fastncmp("SPR2_",word,5)) {
- p = word+5;
- for (i = 0; i < (fixed_t)free_spr2; i++)
- if (!spr2names[i][4])
- {
- // special 3-char cases, e.g. SPR2_RUN
- // the spr2names entry will have "_" on the end, as in "RUN_"
- if (spr2names[i][3] == '_' && !p[3]) {
- if (fastncmp(p,spr2names[i],3)) {
- lua_pushinteger(L, i);
- return 1;
+ if (clearall || fastcmp(word2, "EXTRAEMBLEMS"))
+ {
+ memset(&extraemblems, 0, sizeof(extraemblems));
+ numextraemblems = 0;
}
+
+ if (clearall || fastcmp(word2, "CONDITIONSETS"))
+ clear_conditionsets();
+
+ if (clearall || fastcmp(word2, "LEVELS"))
+ clear_levels();
}
- else if (fastncmp(p,spr2names[i],4)) {
- lua_pushinteger(L, i);
- return 1;
- }
- }
- if (mathlib) return luaL_error(L, "player sprite '%s' could not be found.\n", word);
- return 0;
- }
- else if (!mathlib && fastncmp("sfx_",word,4)) {
- p = word+4;
- for (i = 0; i < NUMSFX; i++)
- if (S_sfx[i].name && fastcmp(p, S_sfx[i].name)) {
- lua_pushinteger(L, i);
- return 1;
- }
- return 0;
- }
- else if (mathlib && fastncmp("SFX_",word,4)) { // SOCs are ALL CAPS!
- p = word+4;
- for (i = 0; i < NUMSFX; i++)
- if (S_sfx[i].name && fasticmp(p, S_sfx[i].name)) {
- lua_pushinteger(L, i);
- return 1;
- }
- return luaL_error(L, "sfx '%s' could not be found.\n", word);
- }
- else if (mathlib && fastncmp("DS",word,2)) {
- p = word+2;
- for (i = 0; i < NUMSFX; i++)
- if (S_sfx[i].name && fasticmp(p, S_sfx[i].name)) {
- lua_pushinteger(L, i);
- return 1;
- }
- if (mathlib) return luaL_error(L, "sfx '%s' could not be found.\n", word);
- return 0;
- }
-#ifdef MUSICSLOT_COMPATIBILITY
- else if (!mathlib && fastncmp("mus_",word,4)) {
- p = word+4;
- if ((i = get_mus(p, false)) == 0)
- return 0;
- lua_pushinteger(L, i);
- return 1;
- }
- else if (mathlib && fastncmp("MUS_",word,4)) { // SOCs are ALL CAPS!
- p = word+4;
- if ((i = get_mus(p, false)) == 0)
- return luaL_error(L, "music '%s' could not be found.\n", word);
- lua_pushinteger(L, i);
- return 1;
- }
- else if (mathlib && (fastncmp("O_",word,2) || fastncmp("D_",word,2))) {
- p = word+2;
- if ((i = get_mus(p, false)) == 0)
- return luaL_error(L, "music '%s' could not be found.\n", word);
- lua_pushinteger(L, i);
- return 1;
- }
-#endif
- else if (!mathlib && fastncmp("pw_",word,3)) {
- p = word+3;
- for (i = 0; i < NUMPOWERS; i++)
- if (fasticmp(p, POWERS_LIST[i])) {
- lua_pushinteger(L, i);
- return 1;
- }
- return 0;
- }
- else if (mathlib && fastncmp("PW_",word,3)) { // SOCs are ALL CAPS!
- p = word+3;
- for (i = 0; i < NUMPOWERS; i++)
- if (fastcmp(p, POWERS_LIST[i])) {
- lua_pushinteger(L, i);
- return 1;
- }
- return luaL_error(L, "power '%s' could not be found.\n", word);
- }
- else if (fastncmp("HUD_",word,4)) {
- p = word+4;
- for (i = 0; i < NUMHUDITEMS; i++)
- if (fastcmp(p, HUDITEMS_LIST[i])) {
- lua_pushinteger(L, i);
- return 1;
- }
- if (mathlib) return luaL_error(L, "huditem '%s' could not be found.\n", word);
- return 0;
- }
- else if (fastncmp("SKINCOLOR_",word,10)) {
- p = word+10;
- for (i = 0; i < NUMCOLORFREESLOTS; i++) {
- if (!FREE_SKINCOLORS[i])
- break;
- if (fastcmp(p, FREE_SKINCOLORS[i])) {
- lua_pushinteger(L, SKINCOLOR_FIRSTFREESLOT+i);
- return 1;
+ else
+ deh_warning("Unknown word: %s", word);
}
+ else
+ deh_warning("missing argument for '%s'", word);
}
- for (i = 0; i < SKINCOLOR_FIRSTFREESLOT; i++)
- if (fastcmp(p, COLOR_ENUMS[i])) {
- lua_pushinteger(L, i);
- return 1;
- }
- return luaL_error(L, "skincolor '%s' could not be found.\n", word);
- }
- else if (fastncmp("GRADE_",word,6))
- {
- p = word+6;
- for (i = 0; NIGHTSGRADE_LIST[i]; i++)
- if (*p == NIGHTSGRADE_LIST[i])
- {
- lua_pushinteger(L, i);
- return 1;
- }
- if (mathlib) return luaL_error(L, "NiGHTS grade '%s' could not be found.\n", word);
- return 0;
- }
- else if (fastncmp("MN_",word,3)) {
- p = word+3;
- for (i = 0; i < NUMMENUTYPES; i++)
- if (fastcmp(p, MENUTYPES_LIST[i])) {
- lua_pushinteger(L, i);
- return 1;
- }
- if (mathlib) return luaL_error(L, "menutype '%s' could not be found.\n", word);
- return 0;
- }
- else if (!mathlib && fastncmp("A_",word,2)) {
- char *caps;
- // Try to get a Lua action first.
- /// \todo Push a closure that sets superactions[] and superstack.
- lua_getfield(L, LUA_REGISTRYINDEX, LREG_ACTIONS);
- // actions are stored in all uppercase.
- caps = Z_StrDup(word);
- strupr(caps);
- lua_getfield(L, -1, caps);
- Z_Free(caps);
- if (!lua_isnil(L, -1))
- return 1; // Success! :D That was easy.
- // Welp, that failed.
- lua_pop(L, 2); // pop nil and LREG_ACTIONS
+ else
+ deh_warning("No word in this line: %s", s);
+ } // end while
- // Hardcoded actions as callable Lua functions!
- // Retrieving them from this metatable allows them to be case-insensitive!
- for (i = 0; actionpointers[i].name; i++)
- if (fasticmp(word, actionpointers[i].name)) {
- // We push the actionf_t* itself as userdata!
- LUA_PushUserdata(L, &actionpointers[i].action, META_ACTION);
- return 1;
- }
- return 0;
- }
- else if (!mathlib && fastcmp("super",word))
+ if (gamedataadded)
+ G_LoadGameData();
+
+ if (gamestate == GS_TITLESCREEN)
{
- if (!superstack)
+ if (introchanged)
+ {
+ menuactive = false;
+ I_UpdateMouseGrab();
+ COM_BufAddText("playintro");
+ }
+ else if (titlechanged)
{
- lua_pushcfunction(L, lib_dummysuper);
- return 1;
+ menuactive = false;
+ I_UpdateMouseGrab();
+ COM_BufAddText("exitgame"); // Command_ExitGame_f() but delayed
}
- for (i = 0; actionpointers[i].name; i++)
- if (fasticmp(superactions[superstack-1], actionpointers[i].name)) {
- LUA_PushUserdata(L, &actionpointers[i].action, META_ACTION);
- return 1;
- }
- return 0;
}
- if (fastcmp(word, "BT_USE")) // Remove case when 2.3 nears release...
- {
- lua_pushinteger(L, (lua_Integer)BT_SPIN);
- return 1;
- }
-
- for (i = 0; INT_CONST[i].n; i++)
- if (fastcmp(word,INT_CONST[i].n)) {
- lua_pushinteger(L, INT_CONST[i].v);
- return 1;
- }
-
- if (mathlib) return luaL_error(L, "constant '%s' could not be parsed.\n", word);
-
- // DYNAMIC variables too!!
- // Try not to add anything that would break netgames or timeattack replays here.
- // You know, like consoleplayer, displayplayer, secondarydisplayplayer, or gametime.
- return LUA_PushGlobals(L, word);
-}
-
-int LUA_EnumLib(lua_State *L)
-{
- if (lua_gettop(L) == 0)
- lua_pushboolean(L, 0);
-
- // Set the global metatable
- lua_createtable(L, 0, 1);
- lua_pushvalue(L, 1); // boolean passed to LUA_EnumLib as first argument.
- lua_pushcclosure(L, lib_getenum, 1);
- lua_setfield(L, -2, "__index");
- lua_setmetatable(L, LUA_GLOBALSINDEX);
- return 0;
-}
-
-// getActionName(action) -> return action's string name
-static int lib_getActionName(lua_State *L)
-{
- if (lua_isuserdata(L, 1)) // arg 1 is built-in action, expect action userdata
- {
- actionf_t *action = *((actionf_t **)luaL_checkudata(L, 1, META_ACTION));
- const char *name = NULL;
- if (!action)
- return luaL_error(L, "not a valid action?");
- name = LUA_GetActionName(action);
- if (!name) // that can't be right?
- return luaL_error(L, "no name string could be found for this action");
- lua_pushstring(L, name);
- return 1;
- }
- else if (lua_isfunction(L, 1)) // arg 1 is a function (either C or Lua)
+ dbg_line = -1;
+ if (deh_num_warning)
{
- lua_settop(L, 1); // set top of stack to 1 (removing any extra args, which there shouldn't be)
- // get the name for this action, if possible.
- lua_getfield(L, LUA_REGISTRYINDEX, LREG_ACTIONS);
- lua_pushnil(L);
- // Lua stack at this point:
- // 1 ... -2 -1
- // arg ... LREG_ACTIONS nil
- while (lua_next(L, -2))
- {
- // Lua stack at this point:
- // 1 ... -3 -2 -1
- // arg ... LREG_ACTIONS "A_ACTION" function
- if (lua_rawequal(L, -1, 1)) // is this the same as the arg?
- {
- // make sure the key (i.e. "A_ACTION") is a string first
- // (note: we don't use lua_isstring because it also returns true for numbers)
- if (lua_type(L, -2) == LUA_TSTRING)
- {
- lua_pushvalue(L, -2); // push "A_ACTION" string to top of stack
- return 1;
- }
- lua_pop(L, 2); // pop the name and function
- break; // probably should have succeeded but we didn't, so end the loop
- }
- lua_pop(L, 1);
+ CONS_Printf(M_GetText("%d warning%s in the SOC lump\n"), deh_num_warning, deh_num_warning == 1 ? "" : "s");
+ if (devparm) {
+ I_Error("%s%s",va(M_GetText("%d warning%s in the SOC lump\n"), deh_num_warning, deh_num_warning == 1 ? "" : "s"), M_GetText("See log.txt for details.\n"));
+ //while (!I_GetKey())
+ //I_OsPolling();
}
- lua_pop(L, 1); // pop LREG_ACTIONS
- return 0; // return nothing (don't error)
}
- return luaL_typerror(L, 1, "action userdata or Lua function");
-}
-
-
-
-int LUA_SOCLib(lua_State *L)
-{
- lua_register(L,"freeslot",lib_freeslot);
- lua_register(L,"getActionName",lib_getActionName);
-
- luaL_newmetatable(L, META_ACTION);
- lua_pushcfunction(L, action_call);
- lua_setfield(L, -2, "__call");
- lua_pop(L, 1);
-
- return 0;
+ deh_loaded = true;
+ Z_Free(s);
}
-const char *LUA_GetActionName(void *action)
+// read dehacked lump in a wad (there is special trick for for deh
+// file that are converted to wad in w_wad.c)
+void DEH_LoadDehackedLumpPwad(UINT16 wad, UINT16 lump, boolean mainfile)
{
- actionf_t *act = (actionf_t *)action;
- size_t z;
- for (z = 0; actionpointers[z].name; z++)
- {
- if (actionpointers[z].action.acv == act->acv)
- return actionpointers[z].name;
- }
- return NULL;
+ MYFILE f;
+ f.wad = wad;
+ f.size = W_LumpLengthPwad(wad, lump);
+ f.data = Z_Malloc(f.size + 1, PU_STATIC, NULL);
+ W_ReadLumpPwad(wad, lump, f.data);
+ f.curpos = f.data;
+ f.data[f.size] = 0;
+ DEH_LoadDehackedFile(&f, mainfile);
+ Z_Free(f.data);
}
-void LUA_SetActionByName(void *state, const char *actiontocompare)
+void DEH_LoadDehackedLump(lumpnum_t lumpnum)
{
- state_t *st = (state_t *)state;
- size_t z;
- for (z = 0; actionpointers[z].name; z++)
- {
- if (fasticmp(actiontocompare, actionpointers[z].name))
- {
- st->action = actionpointers[z].action;
- st->action.acv = actionpointers[z].action.acv; // assign
- st->action.acp1 = actionpointers[z].action.acp1;
- return;
- }
- }
+ DEH_LoadDehackedLumpPwad(WADFILENUM(lumpnum),LUMPNUM(lumpnum), false);
}
diff --git a/src/dehacked.h b/src/dehacked.h
index 54225f36e8c851b67e968b3b25167ac1acf61306..1620314caaba5bbabafded19233b0c162f148f84 100644
--- a/src/dehacked.h
+++ b/src/dehacked.h
@@ -30,16 +30,16 @@ typedef enum
void DEH_LoadDehackedLump(lumpnum_t lumpnum);
void DEH_LoadDehackedLumpPwad(UINT16 wad, UINT16 lump, boolean mainfile);
-void DEH_Check(void);
-
fixed_t get_number(const char *word);
-
-boolean LUA_SetLuaAction(void *state, const char *actiontocompare);
-const char *LUA_GetActionName(void *action);
-void LUA_SetActionByName(void *state, const char *actiontocompare);
+FUNCPRINTF void deh_warning(const char *first, ...);
+void deh_strlcpy(char *dst, const char *src, size_t size, const char *warntext);
extern boolean deh_loaded;
+extern boolean gamedataadded;
+extern boolean titlechanged;
+extern boolean introchanged;
+
#define MAXRECURSION 30
extern const char *superactions[MAXRECURSION];
extern UINT8 superstack;
@@ -60,4 +60,5 @@ typedef struct
} MYFILE;
#define myfeof(a) (a->data + a->size <= a->curpos)
char *myfgets(char *buf, size_t bufsize, MYFILE *f);
+char *myhashfgets(char *buf, size_t bufsize, MYFILE *f);
#endif
diff --git a/src/doomdata.h b/src/doomdata.h
index f3890c846536dc438573104f98398bace13f7415..b3f7f5c4dbcc4ea5ce9ee8ff1cdf34a1845cdafa 100644
--- a/src/doomdata.h
+++ b/src/doomdata.h
@@ -23,6 +23,7 @@
// Some global defines, that configure the game.
#include "doomdef.h"
+#include "taglist.h"
#include "m_fixed.h" // See the mapthing_t scale.
//
@@ -208,11 +209,10 @@ typedef struct
UINT16 options;
INT16 z;
UINT8 extrainfo;
+ taglist_t tags;
fixed_t scale;
- INT16 tag;
INT32 args[NUMMAPTHINGARGS];
char *stringargs[NUMMAPTHINGSTRINGARGS];
-
struct mobj_s *mobj;
} mapthing_t;
diff --git a/src/doomdef.h b/src/doomdef.h
index b9ee1ce5f59cb7bd3c66beab532256533550687b..52abc95972cf4a2ed4b57c1dc939654d84f32906 100644
--- a/src/doomdef.h
+++ b/src/doomdef.h
@@ -582,9 +582,6 @@ extern const char *compdate, *comptime, *comprevision, *compbranch;
/// Dumps the contents of a network save game upon consistency failure for debugging.
//#define DUMPCONSISTENCY
-/// See name of player in your crosshair
-#define SEENAMES
-
/// Who put weights on my recycler? ... Inuyasha did.
/// \note XMOD port.
//#define WEIGHTEDRECYCLER
@@ -628,9 +625,6 @@ extern const char *compdate, *comptime, *comprevision, *compbranch;
/// \note Required for proper collision with moving sloped surfaces that have sector specials on them.
#define SECTORSPECIALSAFTERTHINK
-/// Cache patches in Lua in a way that renderer switching will work flawlessly.
-//#define LUA_PATCH_SAFETY
-
/// Sprite rotation
#define ROTSPRITE
#define ROTANGLES 72 // Needs to be a divisor of 360 (45, 60, 90, 120...)
diff --git a/src/doomstat.h b/src/doomstat.h
index 3abaf298882beec742fe5bc3fb64beb64dd3ce41..2d28b81af7f007b380e466242c2ff0e49c317f01 100644
--- a/src/doomstat.h
+++ b/src/doomstat.h
@@ -410,7 +410,7 @@ enum GameType
GT_LASTFREESLOT = GT_FIRSTFREESLOT + NUMGAMETYPEFREESLOTS - 1,
NUMGAMETYPES
};
-// If you alter this list, update dehacked.c, MISC_ChangeGameTypeMenu in m_menu.c, and Gametype_Names in g_game.c
+// If you alter this list, update deh_tables.c, MISC_ChangeGameTypeMenu in m_menu.c, and Gametype_Names in g_game.c
// Gametype rules
enum GameTypeRules
diff --git a/src/doomtype.h b/src/doomtype.h
index 0aa3e23e05b74613b690993450e87b5dad6e800d..950f50856b7679e035c268e036660fe505d8dbab 100644
--- a/src/doomtype.h
+++ b/src/doomtype.h
@@ -371,4 +371,38 @@ typedef UINT32 tic_t;
#define WSTRING2(s) L ## s
#define WSTRING(s) WSTRING2 (s)
+/*
+A hack by Monster Iestyn: Return a pointer to a field of
+a struct from a pointer to another field in the struct.
+Needed for some lua shenanigans.
+*/
+#define FIELDFROM( type, field, have, want ) \
+ (void *)((intptr_t)(field) - offsetof (type, have) + offsetof (type, want))
+
+typedef UINT8 bitarray_t;
+
+#define BIT_ARRAY_SIZE(n) (((n) + 7) >> 3)
+
+static inline int
+in_bit_array (const bitarray_t * const array, const int value)
+{
+ return (array[value >> 3] & (1<<(value & 7)));
+}
+
+static inline void
+set_bit_array (bitarray_t * const array, const int value)
+{
+ array[value >> 3] |= (1<<(value & 7));
+}
+
+static inline void
+unset_bit_array (bitarray_t * const array, const int value)
+{
+ array[value >> 3] &= ~(1<<(value & 7));
+}
+
+#ifdef HAVE_SDL
+typedef UINT64 precise_t;
+#endif
+
#endif //__DOOMTYPE__
diff --git a/src/dummy/i_cdmus.c b/src/dummy/i_cdmus.c
index fc35eb9cf0bec5ac8532c6ae6ec4f685592b51ab..94b8fa30ed150ca99e2e8d320d77c7322af39697 100644
--- a/src/dummy/i_cdmus.c
+++ b/src/dummy/i_cdmus.c
@@ -8,8 +8,8 @@
UINT8 cdaudio_started = 0;
-consvar_t cd_volume = {"cd_volume","31",CV_SAVE,soundvolume_cons_t, NULL, 0, NULL, NULL, 0, 0, NULL};
-consvar_t cdUpdate = {"cd_update","1",CV_SAVE, NULL, NULL, 0, NULL, NULL, 0, 0, NULL};
+consvar_t cd_volume = CVAR_INIT ("cd_volume","31",CV_SAVE,soundvolume_cons_t, NULL);
+consvar_t cdUpdate = CVAR_INIT ("cd_update","1",CV_SAVE, NULL, NULL);
void I_InitCD(void){}
diff --git a/src/dummy/i_video.c b/src/dummy/i_video.c
index 56ead3672ae8ded9510814b20c766061a5d1d668..3b0a12a328df587e1cd20d0312cf96ce6c8df847 100644
--- a/src/dummy/i_video.c
+++ b/src/dummy/i_video.c
@@ -3,12 +3,13 @@
#include "../i_video.h"
rendermode_t rendermode = render_none;
+rendermode_t chosenrendermode = render_none;
boolean highcolor = false;
boolean allow_fullscreen = false;
-consvar_t cv_vidwait = {"vid_wait", "On", CV_SAVE, CV_OnOff, NULL, 0, NULL, NULL, 0, 0, NULL};
+consvar_t cv_vidwait = CVAR_INIT ("vid_wait", "On", CV_SAVE, CV_OnOff, NULL);
void I_StartupGraphics(void){}
void I_ShutdownGraphics(void){}
@@ -40,8 +41,15 @@ INT32 VID_SetMode(INT32 modenum)
return 0;
}
-void VID_CheckRenderer(void) {}
-void VID_CheckGLLoaded(rendermode_t oldrender) {}
+boolean VID_CheckRenderer(void)
+{
+ return false;
+}
+
+void VID_CheckGLLoaded(rendermode_t oldrender)
+{
+ (void)oldrender;
+}
const char *VID_GetModeName(INT32 modenum)
{
diff --git a/src/f_finale.c b/src/f_finale.c
index 57f8a87121dd096b49285f4c98025ad364720f7e..fdcfad2795f94f5c656345caa0921191084c135f 100644
--- a/src/f_finale.c
+++ b/src/f_finale.c
@@ -533,78 +533,78 @@ static void F_IntroDrawScene(void)
bgxoffs = 28;
break;
case 1:
- background = W_CachePatchName("INTRO1", PU_PATCH);
+ background = W_CachePatchName("INTRO1", PU_PATCH_LOWPRIORITY);
break;
case 2:
- background = W_CachePatchName("INTRO2", PU_PATCH);
+ background = W_CachePatchName("INTRO2", PU_PATCH_LOWPRIORITY);
break;
case 3:
- background = W_CachePatchName("INTRO3", PU_PATCH);
+ background = W_CachePatchName("INTRO3", PU_PATCH_LOWPRIORITY);
break;
case 4:
- background = W_CachePatchName("INTRO4", PU_PATCH);
+ background = W_CachePatchName("INTRO4", PU_PATCH_LOWPRIORITY);
break;
case 5:
if (intro_curtime >= 5*TICRATE)
- background = W_CachePatchName("RADAR", PU_PATCH);
+ background = W_CachePatchName("RADAR", PU_PATCH_LOWPRIORITY);
else
- background = W_CachePatchName("DRAT", PU_PATCH);
+ background = W_CachePatchName("DRAT", PU_PATCH_LOWPRIORITY);
break;
case 6:
- background = W_CachePatchName("INTRO6", PU_PATCH);
+ background = W_CachePatchName("INTRO6", PU_PATCH_LOWPRIORITY);
cx = 180;
cy = 8;
break;
case 7:
{
if (intro_curtime >= 7*TICRATE + ((TICRATE/7)*2))
- background = W_CachePatchName("SGRASS5", PU_PATCH);
+ background = W_CachePatchName("SGRASS5", PU_PATCH_LOWPRIORITY);
else if (intro_curtime >= 7*TICRATE + (TICRATE/7))
- background = W_CachePatchName("SGRASS4", PU_PATCH);
+ background = W_CachePatchName("SGRASS4", PU_PATCH_LOWPRIORITY);
else if (intro_curtime >= 7*TICRATE)
- background = W_CachePatchName("SGRASS3", PU_PATCH);
+ background = W_CachePatchName("SGRASS3", PU_PATCH_LOWPRIORITY);
else if (intro_curtime >= 6*TICRATE)
- background = W_CachePatchName("SGRASS2", PU_PATCH);
+ background = W_CachePatchName("SGRASS2", PU_PATCH_LOWPRIORITY);
else
- background = W_CachePatchName("SGRASS1", PU_PATCH);
+ background = W_CachePatchName("SGRASS1", PU_PATCH_LOWPRIORITY);
break;
}
case 8:
- background = W_CachePatchName("WATCHING", PU_PATCH);
+ background = W_CachePatchName("WATCHING", PU_PATCH_LOWPRIORITY);
break;
case 9:
- background = W_CachePatchName("ZOOMING", PU_PATCH);
+ background = W_CachePatchName("ZOOMING", PU_PATCH_LOWPRIORITY);
break;
case 10:
break;
case 11:
- background = W_CachePatchName("INTRO5", PU_PATCH);
+ background = W_CachePatchName("INTRO5", PU_PATCH_LOWPRIORITY);
break;
case 12:
- background = W_CachePatchName("REVENGE", PU_PATCH);
+ background = W_CachePatchName("REVENGE", PU_PATCH_LOWPRIORITY);
cx = 208;
cy = 8;
break;
case 13:
- background = W_CachePatchName("CONFRONT", PU_PATCH);
+ background = W_CachePatchName("CONFRONT", PU_PATCH_LOWPRIORITY);
cy += 48;
break;
case 14:
- background = W_CachePatchName("TAILSSAD", PU_PATCH);
+ background = W_CachePatchName("TAILSSAD", PU_PATCH_LOWPRIORITY);
bgxoffs = 144;
cx = 8;
cy = 8;
break;
case 15:
if (intro_curtime >= 7*TICRATE)
- background = W_CachePatchName("SONICDO2", PU_PATCH);
+ background = W_CachePatchName("SONICDO2", PU_PATCH_LOWPRIORITY);
else
- background = W_CachePatchName("SONICDO1", PU_PATCH);
+ background = W_CachePatchName("SONICDO1", PU_PATCH_LOWPRIORITY);
cx = 224;
cy = 8;
break;
case 16:
- background = W_CachePatchName("INTRO7", PU_PATCH);
+ background = W_CachePatchName("INTRO7", PU_PATCH_LOWPRIORITY);
break;
default:
break;
@@ -635,7 +635,7 @@ static void F_IntroDrawScene(void)
strncpy(stjrintro, "STJRI029", 9);
S_ChangeMusicInternal("_stjr", false);
- background = W_CachePatchName(stjrintro, PU_PATCH);
+ background = W_CachePatchName(stjrintro, PU_PATCH_LOWPRIORITY);
wipestyleflags = WSF_FADEIN;
F_WipeStartScreen();
F_TryColormapFade(31);
@@ -646,7 +646,7 @@ static void F_IntroDrawScene(void)
if (!WipeInAction) // Draw the patch if not in a wipe
{
- background = W_CachePatchName(stjrintro, PU_PATCH);
+ background = W_CachePatchName(stjrintro, PU_PATCH_LOWPRIORITY);
V_DrawSmallScaledPatch(bgxoffs, 84, 0, background);
}
}
@@ -656,27 +656,27 @@ static void F_IntroDrawScene(void)
if (timetonext > 5*TICRATE && timetonext < 6*TICRATE)
{
if (!(finalecount & 3))
- background = W_CachePatchName("BRITEGG1", PU_PATCH);
+ background = W_CachePatchName("BRITEGG1", PU_PATCH_LOWPRIORITY);
else
- background = W_CachePatchName("DARKEGG1", PU_PATCH);
+ background = W_CachePatchName("DARKEGG1", PU_PATCH_LOWPRIORITY);
V_DrawSmallScaledPatch(0, 0, 0, background);
}
else if (timetonext > 3*TICRATE && timetonext < 4*TICRATE)
{
if (!(finalecount & 3))
- background = W_CachePatchName("BRITEGG2", PU_PATCH);
+ background = W_CachePatchName("BRITEGG2", PU_PATCH_LOWPRIORITY);
else
- background = W_CachePatchName("DARKEGG2", PU_PATCH);
+ background = W_CachePatchName("DARKEGG2", PU_PATCH_LOWPRIORITY);
V_DrawSmallScaledPatch(0, 0, 0, background);
}
else if (timetonext > 1*TICRATE && timetonext < 2*TICRATE)
{
if (!(finalecount & 3))
- background = W_CachePatchName("BRITEGG3", PU_PATCH);
+ background = W_CachePatchName("BRITEGG3", PU_PATCH_LOWPRIORITY);
else
- background = W_CachePatchName("DARKEGG3", PU_PATCH);
+ background = W_CachePatchName("DARKEGG3", PU_PATCH_LOWPRIORITY);
V_DrawSmallScaledPatch(0, 0, 0, background);
}
@@ -708,79 +708,79 @@ static void F_IntroDrawScene(void)
knucklesx += sonicx;
sonicx += P_ReturnThrustX(NULL, finalecount * ANG10, 3);
- V_DrawSmallScaledPatch(skyx, 0, 0, (patch = W_CachePatchName("INTROSKY", PU_PATCH)));
+ V_DrawSmallScaledPatch(skyx, 0, 0, (patch = W_CachePatchName("INTROSKY", PU_PATCH_LOWPRIORITY)));
V_DrawSmallScaledPatch(skyx - 320, 0, 0, patch);
W_UnlockCachedPatch(patch);
- V_DrawSmallScaledPatch(grassx, 0, 0, (patch = W_CachePatchName("INTROGRS", PU_PATCH)));
+ V_DrawSmallScaledPatch(grassx, 0, 0, (patch = W_CachePatchName("INTROGRS", PU_PATCH_LOWPRIORITY)));
V_DrawSmallScaledPatch(grassx - 320, 0, 0, patch);
W_UnlockCachedPatch(patch);
if (finalecount & 1)
{
// Sonic
- V_DrawSmallScaledPatch(sonicx, 54, 0, (patch = W_CachePatchName("RUN2", PU_PATCH)));
+ V_DrawSmallScaledPatch(sonicx, 54, 0, (patch = W_CachePatchName("RUN2", PU_PATCH_LOWPRIORITY)));
W_UnlockCachedPatch(patch);
// Appendages
if (finalecount & 2)
{
// Sonic's feet
- V_DrawSmallScaledPatch(sonicx - 8, 92, 0, (patch = W_CachePatchName("PEELOUT4", PU_PATCH)));
+ V_DrawSmallScaledPatch(sonicx - 8, 92, 0, (patch = W_CachePatchName("PEELOUT4", PU_PATCH_LOWPRIORITY)));
W_UnlockCachedPatch(patch);
// Tails' tails
- V_DrawSmallScaledPatch(tailsx, tailsy, 0, (patch = W_CachePatchName("HELICOP2", PU_PATCH)));
+ V_DrawSmallScaledPatch(tailsx, tailsy, 0, (patch = W_CachePatchName("HELICOP2", PU_PATCH_LOWPRIORITY)));
W_UnlockCachedPatch(patch);
}
else
{
// Sonic's feet
- V_DrawSmallScaledPatch(sonicx - 8, 92, 0, (patch = W_CachePatchName("PEELOUT2", PU_PATCH)));
+ V_DrawSmallScaledPatch(sonicx - 8, 92, 0, (patch = W_CachePatchName("PEELOUT2", PU_PATCH_LOWPRIORITY)));
W_UnlockCachedPatch(patch);
// Tails' tails
- V_DrawSmallScaledPatch(tailsx, tailsy, 0, (patch = W_CachePatchName("HELICOP1", PU_PATCH)));
+ V_DrawSmallScaledPatch(tailsx, tailsy, 0, (patch = W_CachePatchName("HELICOP1", PU_PATCH_LOWPRIORITY)));
W_UnlockCachedPatch(patch);
}
// Tails
- V_DrawSmallScaledPatch(tailsx, tailsy, 0, (patch = W_CachePatchName("FLY2", PU_PATCH)));
+ V_DrawSmallScaledPatch(tailsx, tailsy, 0, (patch = W_CachePatchName("FLY2", PU_PATCH_LOWPRIORITY)));
W_UnlockCachedPatch(patch);
// Knuckles
- V_DrawSmallScaledPatch(knucklesx, knucklesy, 0, (patch = W_CachePatchName("GLIDE2", PU_PATCH)));
+ V_DrawSmallScaledPatch(knucklesx, knucklesy, 0, (patch = W_CachePatchName("GLIDE2", PU_PATCH_LOWPRIORITY)));
W_UnlockCachedPatch(patch);
}
else
{
// Sonic
- V_DrawSmallScaledPatch(sonicx, 54, 0, (patch = W_CachePatchName("RUN1", PU_PATCH)));
+ V_DrawSmallScaledPatch(sonicx, 54, 0, (patch = W_CachePatchName("RUN1", PU_PATCH_LOWPRIORITY)));
W_UnlockCachedPatch(patch);
// Appendages
if (finalecount & 2)
{
// Sonic's feet
- V_DrawSmallScaledPatch(sonicx - 8, 92, 0, (patch = W_CachePatchName("PEELOUT3", PU_PATCH)));
+ V_DrawSmallScaledPatch(sonicx - 8, 92, 0, (patch = W_CachePatchName("PEELOUT3", PU_PATCH_LOWPRIORITY)));
W_UnlockCachedPatch(patch);
// Tails' tails
- V_DrawSmallScaledPatch(tailsx, tailsy, 0, (patch = W_CachePatchName("HELICOP2", PU_PATCH)));
+ V_DrawSmallScaledPatch(tailsx, tailsy, 0, (patch = W_CachePatchName("HELICOP2", PU_PATCH_LOWPRIORITY)));
W_UnlockCachedPatch(patch);
}
else
{
// Sonic's feet
- V_DrawSmallScaledPatch(sonicx - 8, 92, 0, (patch = W_CachePatchName("PEELOUT1", PU_PATCH)));
+ V_DrawSmallScaledPatch(sonicx - 8, 92, 0, (patch = W_CachePatchName("PEELOUT1", PU_PATCH_LOWPRIORITY)));
W_UnlockCachedPatch(patch);
// Tails' tails
- V_DrawSmallScaledPatch(tailsx, tailsy, 0, (patch = W_CachePatchName("HELICOP1", PU_PATCH)));
+ V_DrawSmallScaledPatch(tailsx, tailsy, 0, (patch = W_CachePatchName("HELICOP1", PU_PATCH_LOWPRIORITY)));
W_UnlockCachedPatch(patch);
}
// Tails
- V_DrawSmallScaledPatch(tailsx, tailsy, 0, (patch = W_CachePatchName("FLY1", PU_PATCH)));
+ V_DrawSmallScaledPatch(tailsx, tailsy, 0, (patch = W_CachePatchName("FLY1", PU_PATCH_LOWPRIORITY)));
W_UnlockCachedPatch(patch);
// Knuckles
- V_DrawSmallScaledPatch(knucklesx, knucklesy, 0, (patch = W_CachePatchName("GLIDE1", PU_PATCH)));
+ V_DrawSmallScaledPatch(knucklesx, knucklesy, 0, (patch = W_CachePatchName("GLIDE1", PU_PATCH_LOWPRIORITY)));
W_UnlockCachedPatch(patch);
}
@@ -813,8 +813,8 @@ static void F_IntroDrawScene(void)
y += (30*(FRACUNIT-scale));
}
- rockpat = W_CachePatchName(va("ROID00%.2d", 34 - (worktics % 35)), PU_PATCH);
- glow = W_CachePatchName(va("ENDGLOW%.1d", 2+(worktics & 1)), PU_PATCH);
+ rockpat = W_CachePatchName(va("ROID00%.2d", 34 - (worktics % 35)), PU_PATCH_LOWPRIORITY);
+ glow = W_CachePatchName(va("ENDGLOW%.1d", 2+(worktics & 1)), PU_PATCH_LOWPRIORITY);
if (worktics >= 5)
trans = (worktics-5)>>1;
@@ -934,7 +934,7 @@ void F_IntroDrawer(void)
{
if (intro_scenenum == 5 && intro_curtime == 5*TICRATE)
{
- patch_t *radar = W_CachePatchName("RADAR", PU_PATCH);
+ patch_t *radar = W_CachePatchName("RADAR", PU_PATCH_LOWPRIORITY);
F_WipeStartScreen();
F_WipeColorFill(31);
@@ -947,7 +947,7 @@ void F_IntroDrawer(void)
}
else if (intro_scenenum == 7 && intro_curtime == 6*TICRATE) // Force a wipe here
{
- patch_t *grass = W_CachePatchName("SGRASS2", PU_PATCH);
+ patch_t *grass = W_CachePatchName("SGRASS2", PU_PATCH_LOWPRIORITY);
F_WipeStartScreen();
F_WipeColorFill(31);
@@ -960,7 +960,7 @@ void F_IntroDrawer(void)
}
/*else if (intro_scenenum == 11 && intro_curtime == 7*TICRATE)
{
- patch_t *confront = W_CachePatchName("CONFRONT", PU_PATCH);
+ patch_t *confront = W_CachePatchName("CONFRONT", PU_PATCH_LOWPRIORITY);
F_WipeStartScreen();
F_WipeColorFill(31);
@@ -973,7 +973,7 @@ void F_IntroDrawer(void)
}*/
if (intro_scenenum == 15 && intro_curtime == 7*TICRATE)
{
- patch_t *sdo = W_CachePatchName("SONICDO2", PU_PATCH);
+ patch_t *sdo = W_CachePatchName("SONICDO2", PU_PATCH_LOWPRIORITY);
F_WipeStartScreen();
F_WipeColorFill(31);
@@ -1074,6 +1074,7 @@ static const char *credits[] = {
"\1Programming",
"Alam \"GBC\" Arias",
"Logan \"GBA\" Arias",
+ "Zolton \"Zippy_Zolton\" Auburn",
"Colette \"fickleheart\" Bordelon",
"Andrew \"orospakr\" Clunis",
"Sally \"TehRealSalt\" Cochenour",
@@ -1104,6 +1105,7 @@ static const char *credits[] = {
"Sean \"Sryder13\" Ryder",
"Ehab \"Wolfy\" Saeed",
"Tasos \"tatokis\" Sahanidis", // Corrected C FixedMul, making 64-bit builds netplay compatible
+ "Riku \"Ors\" Salminen", // Demo consistency improvements
"Jonas \"MascaraSnake\" Sauer",
"Wessel \"sphere\" Smit",
"\"SSNTails\"",
@@ -1127,6 +1129,7 @@ static const char *credits[] = {
"Sherman \"CoatRack\" DesJardins",
"\"DirkTheHusky\"",
"Jesse \"Jeck Jims\" Emerick",
+ "\"Fighter_Builder\"", // for the CEZ3 button debris
"Buddy \"KinkaJoy\" Fischer",
"Vivian \"toaster\" Grannell",
"James \"SwitchKaze\" Hale",
@@ -1135,6 +1138,7 @@ static const char *credits[] = {
"Iestyn \"Monster Iestyn\" Jealous",
"William \"GuyWithThePie\" Kloppenberg",
"Alice \"Alacroix\" de Lemos",
+ "Logan \"Hyperchaotix\" McCloud",
"Alexander \"DrTapeworm\" Moench-Ford",
"Andrew \"Senku Niola\" Moran",
"\"MotorRoach\"",
@@ -1207,7 +1211,7 @@ static const char *credits[] = {
"\1Testing",
"Discord Community Testers",
"Hank \"FuriousFox\" Brannock",
- "Cody \"SRB2 Playah\" Koester",
+ "Cody \"Playah\" Koester",
"Skye \"OmegaVelocity\" Meredith",
"Stephen \"HEDGESMFG\" Moellering",
"Rosalie \"ST218\" Molina",
@@ -1302,14 +1306,14 @@ void F_CreditDrawer(void)
V_DrawFill(0, 0, BASEVIDWIDTH, BASEVIDHEIGHT, 31);
// Zig Zagz
- V_DrawScaledPatch(-16, zagpos, V_SNAPTOLEFT, W_CachePatchName("LTZIGZAG", PU_PATCH));
- V_DrawScaledPatch(-16, zagpos - 320, V_SNAPTOLEFT, W_CachePatchName("LTZIGZAG", PU_PATCH));
- V_DrawScaledPatch(BASEVIDWIDTH + 16, zagpos, V_SNAPTORIGHT|V_FLIP, W_CachePatchName("LTZIGZAG", PU_PATCH));
- V_DrawScaledPatch(BASEVIDWIDTH + 16, zagpos - 320, V_SNAPTORIGHT|V_FLIP, W_CachePatchName("LTZIGZAG", PU_PATCH));
+ V_DrawScaledPatch(-16, zagpos, V_SNAPTOLEFT, W_CachePatchName("LTZIGZAG", PU_PATCH_LOWPRIORITY));
+ V_DrawScaledPatch(-16, zagpos - 320, V_SNAPTOLEFT, W_CachePatchName("LTZIGZAG", PU_PATCH_LOWPRIORITY));
+ V_DrawScaledPatch(BASEVIDWIDTH + 16, zagpos, V_SNAPTORIGHT|V_FLIP, W_CachePatchName("LTZIGZAG", PU_PATCH_LOWPRIORITY));
+ V_DrawScaledPatch(BASEVIDWIDTH + 16, zagpos - 320, V_SNAPTORIGHT|V_FLIP, W_CachePatchName("LTZIGZAG", PU_PATCH_LOWPRIORITY));
// Draw background pictures first
for (i = 0; credits_pics[i].patch; i++)
- V_DrawSciencePatch(credits_pics[i].x<<FRACBITS, (280<<FRACBITS) + (((i*credits_height)<<FRACBITS)/(credits_numpics)) - 4*(animtimer<<FRACBITS)/5, 0, W_CachePatchName(credits_pics[i].patch, PU_PATCH), FRACUNIT>>1);
+ V_DrawSciencePatch(credits_pics[i].x<<FRACBITS, (280<<FRACBITS) + (((i*credits_height)<<FRACBITS)/(credits_numpics)) - 4*(animtimer<<FRACBITS)/5, 0, W_CachePatchName(credits_pics[i].patch, PU_PATCH_LOWPRIORITY), FRACUNIT>>1);
// Dim the background
V_DrawFadeScreen(0xFF00, 16);
@@ -1518,14 +1522,14 @@ void F_GameEvaluationDrawer(void)
if (goodending)
{
- rockpat = W_CachePatchName(va("ROID00%.2d", 34 - (finalecount % 35)), PU_PATCH);
- glow = W_CachePatchName(va("ENDGLOW%.1d", 2+(finalecount & 1)), PU_PATCH);
+ rockpat = W_CachePatchName(va("ROID00%.2d", 34 - (finalecount % 35)), PU_PATCH_LOWPRIORITY);
+ glow = W_CachePatchName(va("ENDGLOW%.1d", 2+(finalecount & 1)), PU_PATCH_LOWPRIORITY);
x -= FRACUNIT;
}
else
{
- rockpat = W_CachePatchName("ROID0000", PU_LEVEL);
- glow = W_CachePatchName(va("ENDGLOW%.1d", (finalecount & 1)), PU_PATCH);
+ rockpat = W_CachePatchName("ROID0000", PU_PATCH_LOWPRIORITY);
+ glow = W_CachePatchName(va("ENDGLOW%.1d", (finalecount & 1)), PU_PATCH_LOWPRIORITY);
}
if (finalecount >= 5)
@@ -1557,20 +1561,20 @@ void F_GameEvaluationDrawer(void)
// if j == 0 - alternate between 0 and 1
// 1 - 1 and 2
// 2 - 2 and not rendered
- V_DrawFixedPatch(x+sparkloffs[j-1][0], y+sparkloffs[j-1][1], FRACUNIT, 0, W_CachePatchName(va("ENDSPKL%.1d", (j - ((sparklloop & 1) ? 0 : 1))), PU_PATCH), R_GetTranslationColormap(TC_DEFAULT, SKINCOLOR_AQUA, GTC_CACHE));
+ V_DrawFixedPatch(x+sparkloffs[j-1][0], y+sparkloffs[j-1][1], FRACUNIT, 0, W_CachePatchName(va("ENDSPKL%.1d", (j - ((sparklloop & 1) ? 0 : 1))), PU_PATCH_LOWPRIORITY), R_GetTranslationColormap(TC_DEFAULT, SKINCOLOR_AQUA, GTC_CACHE));
}
j--;
}
}
else
{
- patch_t *eggrock = W_CachePatchName("ENDEGRK5", PU_PATCH);
+ patch_t *eggrock = W_CachePatchName("ENDEGRK5", PU_PATCH_LOWPRIORITY);
V_DrawFixedPatch(x, y, scale, 0, eggrock, colormap[0]);
if (trans < 10)
V_DrawFixedPatch(x, y, scale, trans<<V_ALPHASHIFT, eggrock, colormap[1]);
else if (sparklloop)
V_DrawFixedPatch(x, y, scale, (10-sparklloop)<<V_ALPHASHIFT,
- W_CachePatchName("ENDEGRK0", PU_PATCH), colormap[1]);
+ W_CachePatchName("ENDEGRK0", PU_PATCH_LOWPRIORITY), colormap[1]);
}
}
@@ -1584,7 +1588,7 @@ void F_GameEvaluationDrawer(void)
eemeralds_cur += (360<<FRACBITS)/7;
patchname[4] = 'A'+(char)i;
- V_DrawFixedPatch(x, y, FRACUNIT, ((emeralds & (1<<i)) ? 0 : V_80TRANS), W_CachePatchName(patchname, PU_PATCH), NULL);
+ V_DrawFixedPatch(x, y, FRACUNIT, ((emeralds & (1<<i)) ? 0 : V_80TRANS), W_CachePatchName(patchname, PU_PATCH_LOWPRIORITY), NULL);
}
V_DrawCreditString((BASEVIDWIDTH - V_CreditStringWidth(endingtext))<<(FRACBITS-1), (BASEVIDHEIGHT-100)<<(FRACBITS-1), 0, endingtext);
@@ -1713,32 +1717,32 @@ void F_GameEvaluationTicker(void)
static void F_CacheEnding(void)
{
- endbrdr[1] = W_CachePatchName("ENDBRDR1", PU_PATCH);
+ endbrdr[1] = W_CachePatchName("ENDBRDR1", PU_PATCH_LOWPRIORITY);
- endegrk[0] = W_CachePatchName("ENDEGRK0", PU_PATCH);
- endegrk[1] = W_CachePatchName("ENDEGRK1", PU_PATCH);
+ endegrk[0] = W_CachePatchName("ENDEGRK0", PU_PATCH_LOWPRIORITY);
+ endegrk[1] = W_CachePatchName("ENDEGRK1", PU_PATCH_LOWPRIORITY);
- endglow[0] = W_CachePatchName("ENDGLOW0", PU_PATCH);
- endglow[1] = W_CachePatchName("ENDGLOW1", PU_PATCH);
+ endglow[0] = W_CachePatchName("ENDGLOW0", PU_PATCH_LOWPRIORITY);
+ endglow[1] = W_CachePatchName("ENDGLOW1", PU_PATCH_LOWPRIORITY);
- endbgsp[0] = W_CachePatchName("ENDBGSP0", PU_PATCH);
- endbgsp[1] = W_CachePatchName("ENDBGSP1", PU_PATCH);
- endbgsp[2] = W_CachePatchName("ENDBGSP2", PU_PATCH);
+ endbgsp[0] = W_CachePatchName("ENDBGSP0", PU_PATCH_LOWPRIORITY);
+ endbgsp[1] = W_CachePatchName("ENDBGSP1", PU_PATCH_LOWPRIORITY);
+ endbgsp[2] = W_CachePatchName("ENDBGSP2", PU_PATCH_LOWPRIORITY);
- endspkl[0] = W_CachePatchName("ENDSPKL0", PU_PATCH);
- endspkl[1] = W_CachePatchName("ENDSPKL1", PU_PATCH);
- endspkl[2] = W_CachePatchName("ENDSPKL2", PU_PATCH);
+ endspkl[0] = W_CachePatchName("ENDSPKL0", PU_PATCH_LOWPRIORITY);
+ endspkl[1] = W_CachePatchName("ENDSPKL1", PU_PATCH_LOWPRIORITY);
+ endspkl[2] = W_CachePatchName("ENDSPKL2", PU_PATCH_LOWPRIORITY);
- endxpld[0] = W_CachePatchName("ENDXPLD0", PU_PATCH);
- endxpld[1] = W_CachePatchName("ENDXPLD1", PU_PATCH);
- endxpld[2] = W_CachePatchName("ENDXPLD2", PU_PATCH);
- endxpld[3] = W_CachePatchName("ENDXPLD3", PU_PATCH);
+ endxpld[0] = W_CachePatchName("ENDXPLD0", PU_PATCH_LOWPRIORITY);
+ endxpld[1] = W_CachePatchName("ENDXPLD1", PU_PATCH_LOWPRIORITY);
+ endxpld[2] = W_CachePatchName("ENDXPLD2", PU_PATCH_LOWPRIORITY);
+ endxpld[3] = W_CachePatchName("ENDXPLD3", PU_PATCH_LOWPRIORITY);
- endescp[0] = W_CachePatchName("ENDESCP0", PU_PATCH);
- endescp[1] = W_CachePatchName("ENDESCP1", PU_PATCH);
- endescp[2] = W_CachePatchName("ENDESCP2", PU_PATCH);
- endescp[3] = W_CachePatchName("ENDESCP3", PU_PATCH);
- endescp[4] = W_CachePatchName("ENDESCP4", PU_PATCH);
+ endescp[0] = W_CachePatchName("ENDESCP0", PU_PATCH_LOWPRIORITY);
+ endescp[1] = W_CachePatchName("ENDESCP1", PU_PATCH_LOWPRIORITY);
+ endescp[2] = W_CachePatchName("ENDESCP2", PU_PATCH_LOWPRIORITY);
+ endescp[3] = W_CachePatchName("ENDESCP3", PU_PATCH_LOWPRIORITY);
+ endescp[4] = W_CachePatchName("ENDESCP4", PU_PATCH_LOWPRIORITY);
// so we only need to check once
if ((goodending = ALL7EMERALDS(emeralds)))
@@ -1751,41 +1755,41 @@ static void F_CacheEnding(void)
sprdef = &skins[skinnum].sprites[SPR2_XTRA];
// character head, skin specific
sprframe = &sprdef->spriteframes[XTRA_ENDING];
- endfwrk[0] = W_CachePatchNum(sprframe->lumppat[0], PU_PATCH);
+ endfwrk[0] = W_CachePatchNum(sprframe->lumppat[0], PU_PATCH_LOWPRIORITY);
sprframe = &sprdef->spriteframes[XTRA_ENDING+1];
- endfwrk[1] = W_CachePatchNum(sprframe->lumppat[0], PU_PATCH);
+ endfwrk[1] = W_CachePatchNum(sprframe->lumppat[0], PU_PATCH_LOWPRIORITY);
sprframe = &sprdef->spriteframes[XTRA_ENDING+2];
- endfwrk[2] = W_CachePatchNum(sprframe->lumppat[0], PU_PATCH);
+ endfwrk[2] = W_CachePatchNum(sprframe->lumppat[0], PU_PATCH_LOWPRIORITY);
}
else // Show a star if your character doesn't have an ending firework display. (Basically the MISSINGs for this)
{
- endfwrk[0] = W_CachePatchName("ENDFWRK3", PU_PATCH);
- endfwrk[1] = W_CachePatchName("ENDFWRK4", PU_PATCH);
- endfwrk[2] = W_CachePatchName("ENDFWRK5", PU_PATCH);
+ endfwrk[0] = W_CachePatchName("ENDFWRK3", PU_PATCH_LOWPRIORITY);
+ endfwrk[1] = W_CachePatchName("ENDFWRK4", PU_PATCH_LOWPRIORITY);
+ endfwrk[2] = W_CachePatchName("ENDFWRK5", PU_PATCH_LOWPRIORITY);
}
- endbrdr[0] = W_CachePatchName("ENDBRDR2", PU_PATCH);
+ endbrdr[0] = W_CachePatchName("ENDBRDR2", PU_PATCH_LOWPRIORITY);
}
else
{
// eggman, skin nonspecific
- endfwrk[0] = W_CachePatchName("ENDFWRK0", PU_PATCH);
- endfwrk[1] = W_CachePatchName("ENDFWRK1", PU_PATCH);
- endfwrk[2] = W_CachePatchName("ENDFWRK2", PU_PATCH);
+ endfwrk[0] = W_CachePatchName("ENDFWRK0", PU_PATCH_LOWPRIORITY);
+ endfwrk[1] = W_CachePatchName("ENDFWRK1", PU_PATCH_LOWPRIORITY);
+ endfwrk[2] = W_CachePatchName("ENDFWRK2", PU_PATCH_LOWPRIORITY);
- endbrdr[0] = W_CachePatchName("ENDBRDR0", PU_LEVEL);
+ endbrdr[0] = W_CachePatchName("ENDBRDR0", PU_PATCH_LOWPRIORITY);
}
}
static void F_CacheGoodEnding(void)
{
- endegrk[0] = W_CachePatchName("ENDEGRK2", PU_PATCH);
- endegrk[1] = W_CachePatchName("ENDEGRK3", PU_PATCH);
+ endegrk[0] = W_CachePatchName("ENDEGRK2", PU_PATCH_LOWPRIORITY);
+ endegrk[1] = W_CachePatchName("ENDEGRK3", PU_PATCH_LOWPRIORITY);
- endglow[0] = W_CachePatchName("ENDGLOW2", PU_PATCH);
- endglow[1] = W_CachePatchName("ENDGLOW3", PU_PATCH);
+ endglow[0] = W_CachePatchName("ENDGLOW2", PU_PATCH_LOWPRIORITY);
+ endglow[1] = W_CachePatchName("ENDGLOW3", PU_PATCH_LOWPRIORITY);
- endxpld[0] = W_CachePatchName("ENDEGRK4", PU_PATCH);
+ endxpld[0] = W_CachePatchName("ENDEGRK4", PU_PATCH_LOWPRIORITY);
}
void F_StartEnding(void)
@@ -1842,17 +1846,10 @@ void F_EndingDrawer(void)
INT32 x, y, i, j, parallaxticker;
patch_t *rockpat;
- if (needpatchrecache)
- {
- F_CacheEnding();
- if (goodending && finalecount >= INFLECTIONPOINT) // time to swap some assets
- F_CacheGoodEnding();
- }
-
if (!goodending || finalecount < INFLECTIONPOINT)
- rockpat = W_CachePatchName("ROID0000", PU_PATCH);
+ rockpat = W_CachePatchName("ROID0000", PU_PATCH_LOWPRIORITY);
else
- rockpat = W_CachePatchName(va("ROID00%.2d", 34 - ((finalecount - INFLECTIONPOINT) % 35)), PU_PATCH);
+ rockpat = W_CachePatchName(va("ROID00%.2d", 34 - ((finalecount - INFLECTIONPOINT) % 35)), PU_PATCH_LOWPRIORITY);
V_DrawFill(0, 0, BASEVIDWIDTH, BASEVIDHEIGHT, 31);
@@ -2189,7 +2186,7 @@ void F_EndingDrawer(void)
eemeralds_cur[0] += (360<<FRACBITS)/7;
patchname[4] = 'A'+(char)i;
- V_DrawFixedPatch(x, y, FRACUNIT, 0, W_CachePatchName(patchname, PU_LEVEL), NULL);
+ V_DrawFixedPatch(x, y, FRACUNIT, 0, W_CachePatchName(patchname, PU_PATCH_LOWPRIORITY), NULL);
}
} // if (goodending...
} // (finalecount > 20)
@@ -2336,14 +2333,14 @@ void F_SkyScroll(INT32 scrollxspeed, INT32 scrollyspeed, const char *patchname)
if (!scrollxspeed && !scrollyspeed)
{
- V_DrawPatchFill(W_CachePatchName(patchname, PU_PATCH));
+ V_DrawPatchFill(W_CachePatchName(patchname, PU_PATCH_LOWPRIORITY));
return;
}
- pat = W_CachePatchName(patchname, PU_PATCH);
+ pat = W_CachePatchName(patchname, PU_PATCH_LOWPRIORITY);
- patwidth = SHORT(pat->width);
- patheight = SHORT(pat->height);
+ patwidth = pat->width;
+ patheight = pat->height;
pw = patwidth * dupz;
ph = patheight * dupz;
@@ -2379,7 +2376,7 @@ void F_SkyScroll(INT32 scrollxspeed, INT32 scrollyspeed, const char *patchname)
lumpnum = W_CheckNumForName(name); \
if (lumpnum != LUMPERROR) \
{ \
- arr[0] = W_CachePatchName(name, PU_LEVEL); \
+ arr[0] = W_CachePatchName(name, PU_PATCH_LOWPRIORITY); \
arr[min(1, maxf-1)] = 0; \
} \
else if (strlen(name) <= 6) \
@@ -2392,7 +2389,7 @@ else if (strlen(name) <= 6) \
lumpname[8] = 0; \
lumpnum = W_CheckNumForName(lumpname); \
if (lumpnum != LUMPERROR) \
- arr[i] = W_CachePatchName(lumpname, PU_LEVEL); \
+ arr[i] = W_CachePatchName(lumpname, PU_PATCH_LOWPRIORITY); \
else \
break; \
} \
@@ -2407,21 +2404,21 @@ static void F_CacheTitleScreen(void)
{
case TTMODE_OLD:
case TTMODE_NONE:
- ttbanner = W_CachePatchName("TTBANNER", PU_LEVEL);
- ttwing = W_CachePatchName("TTWING", PU_LEVEL);
- ttsonic = W_CachePatchName("TTSONIC", PU_LEVEL);
- ttswave1 = W_CachePatchName("TTSWAVE1", PU_LEVEL);
- ttswave2 = W_CachePatchName("TTSWAVE2", PU_LEVEL);
- ttswip1 = W_CachePatchName("TTSWIP1", PU_LEVEL);
- ttsprep1 = W_CachePatchName("TTSPREP1", PU_LEVEL);
- ttsprep2 = W_CachePatchName("TTSPREP2", PU_LEVEL);
- ttspop1 = W_CachePatchName("TTSPOP1", PU_LEVEL);
- ttspop2 = W_CachePatchName("TTSPOP2", PU_LEVEL);
- ttspop3 = W_CachePatchName("TTSPOP3", PU_LEVEL);
- ttspop4 = W_CachePatchName("TTSPOP4", PU_LEVEL);
- ttspop5 = W_CachePatchName("TTSPOP5", PU_LEVEL);
- ttspop6 = W_CachePatchName("TTSPOP6", PU_LEVEL);
- ttspop7 = W_CachePatchName("TTSPOP7", PU_LEVEL);
+ ttbanner = W_CachePatchName("TTBANNER", PU_PATCH_LOWPRIORITY);
+ ttwing = W_CachePatchName("TTWING", PU_PATCH_LOWPRIORITY);
+ ttsonic = W_CachePatchName("TTSONIC", PU_PATCH_LOWPRIORITY);
+ ttswave1 = W_CachePatchName("TTSWAVE1", PU_PATCH_LOWPRIORITY);
+ ttswave2 = W_CachePatchName("TTSWAVE2", PU_PATCH_LOWPRIORITY);
+ ttswip1 = W_CachePatchName("TTSWIP1", PU_PATCH_LOWPRIORITY);
+ ttsprep1 = W_CachePatchName("TTSPREP1", PU_PATCH_LOWPRIORITY);
+ ttsprep2 = W_CachePatchName("TTSPREP2", PU_PATCH_LOWPRIORITY);
+ ttspop1 = W_CachePatchName("TTSPOP1", PU_PATCH_LOWPRIORITY);
+ ttspop2 = W_CachePatchName("TTSPOP2", PU_PATCH_LOWPRIORITY);
+ ttspop3 = W_CachePatchName("TTSPOP3", PU_PATCH_LOWPRIORITY);
+ ttspop4 = W_CachePatchName("TTSPOP4", PU_PATCH_LOWPRIORITY);
+ ttspop5 = W_CachePatchName("TTSPOP5", PU_PATCH_LOWPRIORITY);
+ ttspop6 = W_CachePatchName("TTSPOP6", PU_PATCH_LOWPRIORITY);
+ ttspop7 = W_CachePatchName("TTSPOP7", PU_PATCH_LOWPRIORITY);
break;
// don't load alacroix gfx yet; we do that upon first draw.
@@ -2541,7 +2538,7 @@ void F_StartTitleScreen(void)
static void F_UnloadAlacroixGraphics(SINT8 oldttscale)
{
- // This all gets freed by PU_LEVEL when exiting the menus.
+ // This all gets freed by PU_PATCH_LOWPRIORITY when exiting the menus.
// When re-visiting the menus (e.g., from exiting in-game), the gfx are force-reloaded.
// So leftover addresses here should not be a problem.
@@ -2549,28 +2546,28 @@ static void F_UnloadAlacroixGraphics(SINT8 oldttscale)
oldttscale--; // zero-based index
for (i = 0; i < TTMAX_ALACROIX; i++)
{
- if(ttembl[oldttscale][i]) { Z_Free(ttembl[oldttscale][i]); ttembl[oldttscale][i] = 0; }
- if(ttribb[oldttscale][i]) { Z_Free(ttribb[oldttscale][i]); ttribb[oldttscale][i] = 0; }
- if(ttsont[oldttscale][i]) { Z_Free(ttsont[oldttscale][i]); ttsont[oldttscale][i] = 0; }
- if(ttrobo[oldttscale][i]) { Z_Free(ttrobo[oldttscale][i]); ttrobo[oldttscale][i] = 0; }
- if(tttwot[oldttscale][i]) { Z_Free(tttwot[oldttscale][i]); tttwot[oldttscale][i] = 0; }
- if(ttrbtx[oldttscale][i]) { Z_Free(ttrbtx[oldttscale][i]); ttrbtx[oldttscale][i] = 0; }
- if(ttsoib[oldttscale][i]) { Z_Free(ttsoib[oldttscale][i]); ttsoib[oldttscale][i] = 0; }
- if(ttsoif[oldttscale][i]) { Z_Free(ttsoif[oldttscale][i]); ttsoif[oldttscale][i] = 0; }
- if(ttsoba[oldttscale][i]) { Z_Free(ttsoba[oldttscale][i]); ttsoba[oldttscale][i] = 0; }
- if(ttsobk[oldttscale][i]) { Z_Free(ttsobk[oldttscale][i]); ttsobk[oldttscale][i] = 0; }
- if(ttsodh[oldttscale][i]) { Z_Free(ttsodh[oldttscale][i]); ttsodh[oldttscale][i] = 0; }
- if(tttaib[oldttscale][i]) { Z_Free(tttaib[oldttscale][i]); tttaib[oldttscale][i] = 0; }
- if(tttaif[oldttscale][i]) { Z_Free(tttaif[oldttscale][i]); tttaif[oldttscale][i] = 0; }
- if(tttaba[oldttscale][i]) { Z_Free(tttaba[oldttscale][i]); tttaba[oldttscale][i] = 0; }
- if(tttabk[oldttscale][i]) { Z_Free(tttabk[oldttscale][i]); tttabk[oldttscale][i] = 0; }
- if(tttabt[oldttscale][i]) { Z_Free(tttabt[oldttscale][i]); tttabt[oldttscale][i] = 0; }
- if(tttaft[oldttscale][i]) { Z_Free(tttaft[oldttscale][i]); tttaft[oldttscale][i] = 0; }
- if(ttknib[oldttscale][i]) { Z_Free(ttknib[oldttscale][i]); ttknib[oldttscale][i] = 0; }
- if(ttknif[oldttscale][i]) { Z_Free(ttknif[oldttscale][i]); ttknif[oldttscale][i] = 0; }
- if(ttknba[oldttscale][i]) { Z_Free(ttknba[oldttscale][i]); ttknba[oldttscale][i] = 0; }
- if(ttknbk[oldttscale][i]) { Z_Free(ttknbk[oldttscale][i]); ttknbk[oldttscale][i] = 0; }
- if(ttkndh[oldttscale][i]) { Z_Free(ttkndh[oldttscale][i]); ttkndh[oldttscale][i] = 0; }
+ if(ttembl[oldttscale][i]) { Patch_Free(ttembl[oldttscale][i]); ttembl[oldttscale][i] = 0; }
+ if(ttribb[oldttscale][i]) { Patch_Free(ttribb[oldttscale][i]); ttribb[oldttscale][i] = 0; }
+ if(ttsont[oldttscale][i]) { Patch_Free(ttsont[oldttscale][i]); ttsont[oldttscale][i] = 0; }
+ if(ttrobo[oldttscale][i]) { Patch_Free(ttrobo[oldttscale][i]); ttrobo[oldttscale][i] = 0; }
+ if(tttwot[oldttscale][i]) { Patch_Free(tttwot[oldttscale][i]); tttwot[oldttscale][i] = 0; }
+ if(ttrbtx[oldttscale][i]) { Patch_Free(ttrbtx[oldttscale][i]); ttrbtx[oldttscale][i] = 0; }
+ if(ttsoib[oldttscale][i]) { Patch_Free(ttsoib[oldttscale][i]); ttsoib[oldttscale][i] = 0; }
+ if(ttsoif[oldttscale][i]) { Patch_Free(ttsoif[oldttscale][i]); ttsoif[oldttscale][i] = 0; }
+ if(ttsoba[oldttscale][i]) { Patch_Free(ttsoba[oldttscale][i]); ttsoba[oldttscale][i] = 0; }
+ if(ttsobk[oldttscale][i]) { Patch_Free(ttsobk[oldttscale][i]); ttsobk[oldttscale][i] = 0; }
+ if(ttsodh[oldttscale][i]) { Patch_Free(ttsodh[oldttscale][i]); ttsodh[oldttscale][i] = 0; }
+ if(tttaib[oldttscale][i]) { Patch_Free(tttaib[oldttscale][i]); tttaib[oldttscale][i] = 0; }
+ if(tttaif[oldttscale][i]) { Patch_Free(tttaif[oldttscale][i]); tttaif[oldttscale][i] = 0; }
+ if(tttaba[oldttscale][i]) { Patch_Free(tttaba[oldttscale][i]); tttaba[oldttscale][i] = 0; }
+ if(tttabk[oldttscale][i]) { Patch_Free(tttabk[oldttscale][i]); tttabk[oldttscale][i] = 0; }
+ if(tttabt[oldttscale][i]) { Patch_Free(tttabt[oldttscale][i]); tttabt[oldttscale][i] = 0; }
+ if(tttaft[oldttscale][i]) { Patch_Free(tttaft[oldttscale][i]); tttaft[oldttscale][i] = 0; }
+ if(ttknib[oldttscale][i]) { Patch_Free(ttknib[oldttscale][i]); ttknib[oldttscale][i] = 0; }
+ if(ttknif[oldttscale][i]) { Patch_Free(ttknif[oldttscale][i]); ttknif[oldttscale][i] = 0; }
+ if(ttknba[oldttscale][i]) { Patch_Free(ttknba[oldttscale][i]); ttknba[oldttscale][i] = 0; }
+ if(ttknbk[oldttscale][i]) { Patch_Free(ttknbk[oldttscale][i]); ttknbk[oldttscale][i] = 0; }
+ if(ttkndh[oldttscale][i]) { Patch_Free(ttkndh[oldttscale][i]); ttkndh[oldttscale][i] = 0; }
}
ttloaded[oldttscale] = false;
}
@@ -2647,17 +2644,12 @@ static void F_FigureActiveTtScale(void)
SINT8 newttscale = max(1, min(6, vid.dupx));
SINT8 oldttscale = activettscale;
- if (needpatchrecache)
- ttloaded[0] = ttloaded[1] = ttloaded[2] = ttloaded[3] = ttloaded[4] = ttloaded[5] = 0;
- else
- {
- if (newttscale == testttscale)
- return;
+ if (newttscale == testttscale)
+ return;
- // We have a new ttscale, so load gfx
- if(oldttscale > 0)
- F_UnloadAlacroixGraphics(oldttscale);
- }
+ // We have a new ttscale, so load gfx
+ if(oldttscale > 0)
+ F_UnloadAlacroixGraphics(oldttscale);
testttscale = newttscale;
@@ -2691,9 +2683,6 @@ void F_TitleScreenDrawer(void)
if (modeattacking)
return; // We likely came here from retrying. Don't do a damn thing.
- if (needpatchrecache && (curttmode != TTMODE_ALACROIX))
- F_CacheTitleScreen();
-
// Draw that sky!
if (curbgcolor >= 0)
V_DrawFill(0, 0, BASEVIDWIDTH, BASEVIDHEIGHT, curbgcolor);
@@ -3657,7 +3646,7 @@ void F_ContinueDrawer(void)
V_DrawLevelTitle(x - (V_LevelNameWidth("Continue?")>>1), 16, 0, "Continue?");
// Two stars...
- patch = W_CachePatchName("CONTSTAR", PU_PATCH);
+ patch = W_CachePatchName("CONTSTAR", PU_PATCH_LOWPRIORITY);
V_DrawScaledPatch(x-32, 160, 0, patch);
V_DrawScaledPatch(x+32, 160, 0, patch);
@@ -3665,14 +3654,14 @@ void F_ContinueDrawer(void)
if (timeleft > 9)
{
numbuf[7] = '1';
- V_DrawScaledPatch(x - 10, 160, 0, W_CachePatchName(numbuf, PU_PATCH));
+ V_DrawScaledPatch(x - 10, 160, 0, W_CachePatchName(numbuf, PU_PATCH_LOWPRIORITY));
numbuf[7] = '0';
- V_DrawScaledPatch(x + 10, 160, 0, W_CachePatchName(numbuf, PU_PATCH));
+ V_DrawScaledPatch(x + 10, 160, 0, W_CachePatchName(numbuf, PU_PATCH_LOWPRIORITY));
}
else
{
numbuf[7] = '0'+timeleft;
- V_DrawScaledPatch(x, 160, 0, W_CachePatchName(numbuf, PU_PATCH));
+ V_DrawScaledPatch(x, 160, 0, W_CachePatchName(numbuf, PU_PATCH_LOWPRIORITY));
}
// Draw the continue markers! Show continues.
@@ -3701,7 +3690,7 @@ void F_ContinueDrawer(void)
}
// Spotlight
- V_DrawScaledPatch(x, 140, 0, W_CachePatchName("CONTSPOT", PU_PATCH));
+ V_DrawScaledPatch(x, 140, 0, W_CachePatchName("CONTSPOT", PU_PATCH_LOWPRIORITY));
// warping laser
if (continuetime)
@@ -3738,7 +3727,7 @@ void F_ContinueDrawer(void)
#define drawchar(dx, dy, n) {\
sprdef = &contskins[n]->sprites[cont_spr2[n][0]];\
sprframe = &sprdef->spriteframes[cont_spr2[n][1]];\
- patch = W_CachePatchNum(sprframe->lumppat[cont_spr2[n][2]], PU_PATCH);\
+ patch = W_CachePatchNum(sprframe->lumppat[cont_spr2[n][2]], PU_PATCH_LOWPRIORITY);\
V_DrawFixedPatch((dx), (dy), contskins[n]->highresscale, (sprframe->flip & (1<<cont_spr2[n][2])) ? V_FLIP : 0, patch, contcolormaps[n]);\
}
@@ -4003,10 +3992,10 @@ void F_CutsceneDrawer(void)
{
if (cutscenes[cutnum]->scene[scenenum].pichires[picnum])
V_DrawSmallScaledPatch(picxpos, picypos, 0,
- W_CachePatchName(cutscenes[cutnum]->scene[scenenum].picname[picnum], PU_PATCH));
+ W_CachePatchName(cutscenes[cutnum]->scene[scenenum].picname[picnum], PU_PATCH_LOWPRIORITY));
else
V_DrawScaledPatch(picxpos,picypos, 0,
- W_CachePatchName(cutscenes[cutnum]->scene[scenenum].picname[picnum], PU_PATCH));
+ W_CachePatchName(cutscenes[cutnum]->scene[scenenum].picname[picnum], PU_PATCH_LOWPRIORITY));
}
if (dofadenow && rendermode != render_none)
@@ -4492,10 +4481,10 @@ void F_TextPromptDrawer(void)
{
if (textprompts[cutnum]->page[scenenum].pichires[picnum])
V_DrawSmallScaledPatch(picxpos, picypos, 0,
- W_CachePatchName(textprompts[cutnum]->page[scenenum].picname[picnum], PU_PATCH));
+ W_CachePatchName(textprompts[cutnum]->page[scenenum].picname[picnum], PU_PATCH_LOWPRIORITY));
else
V_DrawScaledPatch(picxpos,picypos, 0,
- W_CachePatchName(textprompts[cutnum]->page[scenenum].picname[picnum], PU_PATCH));
+ W_CachePatchName(textprompts[cutnum]->page[scenenum].picname[picnum], PU_PATCH_LOWPRIORITY));
}
// Draw background
@@ -4505,7 +4494,7 @@ void F_TextPromptDrawer(void)
if (iconlump != LUMPERROR)
{
INT32 iconx, icony, scale, scaledsize;
- patch = W_CachePatchName(textprompts[cutnum]->page[scenenum].iconname, PU_PATCH);
+ patch = W_CachePatchName(textprompts[cutnum]->page[scenenum].iconname, PU_PATCH_LOWPRIORITY);
// scale and center
if (patch->width > patch->height)
diff --git a/src/f_wipe.c b/src/f_wipe.c
index f5b9bd72230ae7f5763b7fdc97cbbca9398d0ff5..6afb8a6a7934709c90b1428fcd5f5a6f55d54c20 100644
--- a/src/f_wipe.c
+++ b/src/f_wipe.c
@@ -293,7 +293,7 @@ static void F_DoWipe(fademask_t *fademask)
else
{
// pointer to transtable that this mask would use
- transtbl = transtables + ((9 - *mask)<<FF_TRANSSHIFT);
+ transtbl = R_GetTranslucencyTable((9 - *mask) + 1);
// DRAWING LOOP
while (draw_linestogo--)
diff --git a/src/filesrch.c b/src/filesrch.c
index 13d73b6f49845b5b693ff69080b2a779e1364b9d..cb53d07be958fe1ab7ad42ffac3efc0ee768e44f 100644
--- a/src/filesrch.c
+++ b/src/filesrch.c
@@ -312,18 +312,18 @@ static CV_PossibleValue_t addons_cons_t[] = {{0, "Default"},
#endif
{3, "CUSTOM"}, {0, NULL}};
-consvar_t cv_addons_option = {"addons_option", "Default", CV_SAVE|CV_CALL, addons_cons_t, Addons_option_Onchange, 0, NULL, NULL, 0, 0, NULL};
-consvar_t cv_addons_folder = {"addons_folder", "", CV_SAVE, NULL, NULL, 0, NULL, NULL, 0, 0, NULL};
+consvar_t cv_addons_option = CVAR_INIT ("addons_option", "Default", CV_SAVE|CV_CALL, addons_cons_t, Addons_option_Onchange);
+consvar_t cv_addons_folder = CVAR_INIT ("addons_folder", "", CV_SAVE, NULL, NULL);
static CV_PossibleValue_t addons_md5_cons_t[] = {{0, "Name"}, {1, "Contents"}, {0, NULL}};
-consvar_t cv_addons_md5 = {"addons_md5", "Name", CV_SAVE, addons_md5_cons_t, NULL, 0, NULL, NULL, 0, 0, NULL};
+consvar_t cv_addons_md5 = CVAR_INIT ("addons_md5", "Name", CV_SAVE, addons_md5_cons_t, NULL);
-consvar_t cv_addons_showall = {"addons_showall", "No", CV_SAVE, CV_YesNo, NULL, 0, NULL, NULL, 0, 0, NULL};
+consvar_t cv_addons_showall = CVAR_INIT ("addons_showall", "No", CV_SAVE, CV_YesNo, NULL);
-consvar_t cv_addons_search_case = {"addons_search_case", "No", CV_SAVE, CV_YesNo, NULL, 0, NULL, NULL, 0, 0, NULL};
+consvar_t cv_addons_search_case = CVAR_INIT ("addons_search_case", "No", CV_SAVE, CV_YesNo, NULL);
static CV_PossibleValue_t addons_search_type_cons_t[] = {{0, "Start"}, {1, "Anywhere"}, {0, NULL}};
-consvar_t cv_addons_search_type = {"addons_search_type", "Anywhere", CV_SAVE, addons_search_type_cons_t, NULL, 0, NULL, NULL, 0, 0, NULL};
+consvar_t cv_addons_search_type = CVAR_INIT ("addons_search_type", "Anywhere", CV_SAVE, addons_search_type_cons_t, NULL);
char menupath[1024];
size_t menupathindex[menudepth];
diff --git a/src/g_demo.c b/src/g_demo.c
index a2a9cb907b2dafd99a5a64c21143cd7213874d07..593fd77234a329ba89140e9ad82b98a5e993c22d 100644
--- a/src/g_demo.c
+++ b/src/g_demo.c
@@ -94,7 +94,7 @@ demoghost *ghosts = NULL;
// DEMO RECORDING
//
-#define DEMOVERSION 0x000d
+#define DEMOVERSION 0x000e
#define DEMOHEADER "\xF0" "SRB2Replay" "\x0F"
#define DF_GHOST 0x01 // This demo contains ghost data too!
@@ -345,32 +345,29 @@ void G_WriteGhostTic(mobj_t *ghost)
else
{
// For moving normally:
- // Store one full byte of movement, plus one byte of fractional movement.
- INT16 momx = (INT16)((ghost->x-oldghost.x)>>8);
- INT16 momy = (INT16)((ghost->y-oldghost.y)>>8);
+ fixed_t momx = ghost->x-oldghost.x;
+ fixed_t momy = ghost->y-oldghost.y;
if (momx != oldghost.momx
|| momy != oldghost.momy)
{
oldghost.momx = momx;
oldghost.momy = momy;
ziptic |= GZT_MOMXY;
- WRITEINT16(demo_p,momx);
- WRITEINT16(demo_p,momy);
+ WRITEFIXED(demo_p,momx);
+ WRITEFIXED(demo_p,momy);
}
- momx = (INT16)((ghost->z-oldghost.z)>>8);
+ momx = ghost->z-oldghost.z;
if (momx != oldghost.momz)
{
oldghost.momz = momx;
ziptic |= GZT_MOMZ;
- WRITEINT16(demo_p,momx);
+ WRITEFIXED(demo_p,momx);
}
// This SHOULD set oldghost.x/y/z to match ghost->x/y/z
- // but it keeps the fractional loss of one byte,
- // so it will hopefully be made up for in future tics.
- oldghost.x += oldghost.momx<<8;
- oldghost.y += oldghost.momy<<8;
- oldghost.z += oldghost.momz<<8;
+ oldghost.x += oldghost.momx;
+ oldghost.y += oldghost.momy;
+ oldghost.z += oldghost.momz;
}
#undef MAXMOM
@@ -456,15 +453,14 @@ void G_WriteGhostTic(mobj_t *ghost)
WRITEUINT16(demo_p,oldghost.sprite);
if (ghostext.flags & EZT_HEIGHT)
{
- height >>= FRACBITS;
- WRITEINT16(demo_p, height);
+ WRITEFIXED(demo_p, height);
}
ghostext.flags = 0;
}
if (ghost->player && ghost->player->followmobj && !(ghost->player->followmobj->sprite == SPR_NULL || (ghost->player->followmobj->flags2 & MF2_DONTDRAW))) // bloats tails runs but what can ya do
{
- INT16 temp;
+ fixed_t temp;
UINT8 *followtic_p = demo_p++;
UINT8 followtic = 0;
@@ -492,12 +488,12 @@ void G_WriteGhostTic(mobj_t *ghost)
WRITEFIXED(demo_p,ghost->player->followmobj->scale);
}
- temp = (INT16)((ghost->player->followmobj->x-ghost->x)>>8);
- WRITEINT16(demo_p,temp);
- temp = (INT16)((ghost->player->followmobj->y-ghost->y)>>8);
- WRITEINT16(demo_p,temp);
- temp = (INT16)((ghost->player->followmobj->z-ghost->z)>>8);
- WRITEINT16(demo_p,temp);
+ temp = ghost->player->followmobj->x-ghost->x;
+ WRITEFIXED(demo_p,temp);
+ temp = ghost->player->followmobj->y-ghost->y;
+ WRITEFIXED(demo_p,temp);
+ temp = ghost->player->followmobj->z-ghost->z;
+ WRITEFIXED(demo_p,temp);
if (followtic & FZT_SKIN)
WRITEUINT8(demo_p,ghost->player->followmobj->sprite2);
WRITEUINT16(demo_p,ghost->player->followmobj->sprite);
@@ -547,11 +543,11 @@ void G_ConsGhostTic(void)
{
if (ziptic & GZT_MOMXY)
{
- oldghost.momx = READINT16(demo_p)<<8;
- oldghost.momy = READINT16(demo_p)<<8;
+ oldghost.momx = (demoversion < 0x000e) ? READINT16(demo_p)<<8 : READFIXED(demo_p);
+ oldghost.momy = (demoversion < 0x000e) ? READINT16(demo_p)<<8 : READFIXED(demo_p);
}
if (ziptic & GZT_MOMZ)
- oldghost.momz = READINT16(demo_p)<<8;
+ oldghost.momz = (demoversion < 0x000e) ? READINT16(demo_p)<<8 : READFIXED(demo_p);
oldghost.x += oldghost.momx;
oldghost.y += oldghost.momy;
oldghost.z += oldghost.momz;
@@ -613,7 +609,7 @@ void G_ConsGhostTic(void)
if (xziptic & EZT_SPRITE)
demo_p += sizeof(UINT16);
if (xziptic & EZT_HEIGHT)
- demo_p += sizeof(INT16);
+ demo_p += (demoversion < 0x000e) ? sizeof(INT16) : sizeof(fixed_t);
}
if (ziptic & GZT_FOLLOW)
@@ -627,9 +623,8 @@ void G_ConsGhostTic(void)
}
if (followtic & FZT_SCALE)
demo_p += sizeof(fixed_t);
- demo_p += sizeof(INT16);
- demo_p += sizeof(INT16);
- demo_p += sizeof(INT16);
+ // momx, momy and momz
+ demo_p += (demoversion < 0x000e) ? sizeof(INT16) * 3 : sizeof(fixed_t) * 3;
if (followtic & FZT_SKIN)
demo_p++;
demo_p += sizeof(UINT16);
@@ -697,11 +692,11 @@ void G_GhostTicker(void)
{
if (ziptic & GZT_MOMXY)
{
- g->oldmo.momx = READINT16(g->p)<<8;
- g->oldmo.momy = READINT16(g->p)<<8;
+ g->oldmo.momx = (g->version < 0x000e) ? READINT16(g->p)<<8 : READFIXED(g->p);
+ g->oldmo.momy = (g->version < 0x000e) ? READINT16(g->p)<<8 : READFIXED(g->p);
}
if (ziptic & GZT_MOMZ)
- g->oldmo.momz = READINT16(g->p)<<8;
+ g->oldmo.momz = (g->version < 0x000e) ? READINT16(g->p)<<8 : READFIXED(g->p);
g->oldmo.x += g->oldmo.momx;
g->oldmo.y += g->oldmo.momy;
g->oldmo.z += g->oldmo.momz;
@@ -846,7 +841,7 @@ void G_GhostTicker(void)
g->mo->sprite = READUINT16(g->p);
if (xziptic & EZT_HEIGHT)
{
- fixed_t temp = READINT16(g->p)<<FRACBITS;
+ fixed_t temp = (g->version < 0x000e) ? READINT16(g->p)<<FRACBITS : READFIXED(g->p);
g->mo->height = FixedMul(temp, g->mo->scale);
}
}
@@ -905,11 +900,11 @@ void G_GhostTicker(void)
P_SetScale(follow, follow->destscale);
P_UnsetThingPosition(follow);
- temp = READINT16(g->p)<<8;
+ temp = (g->version < 0x000e) ? READINT16(g->p)<<8 : READFIXED(g->p);
follow->x = g->mo->x + temp;
- temp = READINT16(g->p)<<8;
+ temp = (g->version < 0x000e) ? READINT16(g->p)<<8 : READFIXED(g->p);
follow->y = g->mo->y + temp;
- temp = READINT16(g->p)<<8;
+ temp = (g->version < 0x000e) ? READINT16(g->p)<<8 : READFIXED(g->p);
follow->z = g->mo->z + temp;
P_SetThingPosition(follow);
if (followtic & FZT_SKIN)
@@ -1010,11 +1005,11 @@ void G_ReadMetalTic(mobj_t *metal)
{
if (ziptic & GZT_MOMXY)
{
- oldmetal.momx = READINT16(metal_p)<<8;
- oldmetal.momy = READINT16(metal_p)<<8;
+ oldmetal.momx = (metalversion < 0x000e) ? READINT16(metal_p)<<8 : READFIXED(metal_p);
+ oldmetal.momy = (metalversion < 0x000e) ? READINT16(metal_p)<<8 : READFIXED(metal_p);
}
if (ziptic & GZT_MOMZ)
- oldmetal.momz = READINT16(metal_p)<<8;
+ oldmetal.momz = (metalversion < 0x000e) ? READINT16(metal_p)<<8 : READFIXED(metal_p);
oldmetal.x += oldmetal.momx;
oldmetal.y += oldmetal.momy;
oldmetal.z += oldmetal.momz;
@@ -1110,7 +1105,7 @@ void G_ReadMetalTic(mobj_t *metal)
metal->sprite = READUINT16(metal_p);
if (xziptic & EZT_HEIGHT)
{
- fixed_t temp = READINT16(metal_p)<<FRACBITS;
+ fixed_t temp = (metalversion < 0x000e) ? READINT16(metal_p)<<FRACBITS : READFIXED(metal_p);
metal->height = FixedMul(temp, metal->scale);
}
}
@@ -1149,11 +1144,11 @@ void G_ReadMetalTic(mobj_t *metal)
P_SetScale(follow, follow->destscale);
P_UnsetThingPosition(follow);
- temp = READINT16(metal_p)<<8;
+ temp = (metalversion < 0x000e) ? READINT16(metal_p)<<8 : READFIXED(metal_p);
follow->x = metal->x + temp;
- temp = READINT16(metal_p)<<8;
+ temp = (metalversion < 0x000e) ? READINT16(metal_p)<<8 : READFIXED(metal_p);
follow->y = metal->y + temp;
- temp = READINT16(metal_p)<<8;
+ temp = (metalversion < 0x000e) ? READINT16(metal_p)<<8 : READFIXED(metal_p);
follow->z = metal->z + temp;
P_SetThingPosition(follow);
if (followtic & FZT_SKIN)
@@ -1213,32 +1208,30 @@ void G_WriteMetalTic(mobj_t *metal)
else
{
// For moving normally:
- // Store one full byte of movement, plus one byte of fractional movement.
- INT16 momx = (INT16)((metal->x-oldmetal.x)>>8);
- INT16 momy = (INT16)((metal->y-oldmetal.y)>>8);
+ // Store movement as a fixed value
+ fixed_t momx = metal->x-oldmetal.x;
+ fixed_t momy = metal->y-oldmetal.y;
if (momx != oldmetal.momx
|| momy != oldmetal.momy)
{
oldmetal.momx = momx;
oldmetal.momy = momy;
ziptic |= GZT_MOMXY;
- WRITEINT16(demo_p,momx);
- WRITEINT16(demo_p,momy);
+ WRITEFIXED(demo_p,momx);
+ WRITEFIXED(demo_p,momy);
}
- momx = (INT16)((metal->z-oldmetal.z)>>8);
+ momx = metal->z-oldmetal.z;
if (momx != oldmetal.momz)
{
oldmetal.momz = momx;
ziptic |= GZT_MOMZ;
- WRITEINT16(demo_p,momx);
+ WRITEFIXED(demo_p,momx);
}
// This SHOULD set oldmetal.x/y/z to match metal->x/y/z
- // but it keeps the fractional loss of one byte,
- // so it will hopefully be made up for in future tics.
- oldmetal.x += oldmetal.momx<<8;
- oldmetal.y += oldmetal.momy<<8;
- oldmetal.z += oldmetal.momz<<8;
+ oldmetal.x += oldmetal.momx;
+ oldmetal.y += oldmetal.momy;
+ oldmetal.z += oldmetal.momz;
}
#undef MAXMOM
@@ -1299,15 +1292,14 @@ void G_WriteMetalTic(mobj_t *metal)
WRITEUINT16(demo_p,oldmetal.sprite);
if (ghostext.flags & EZT_HEIGHT)
{
- height >>= FRACBITS;
- WRITEINT16(demo_p, height);
+ WRITEFIXED(demo_p, height);
}
ghostext.flags = 0;
}
if (metal->player && metal->player->followmobj && !(metal->player->followmobj->sprite == SPR_NULL || (metal->player->followmobj->flags2 & MF2_DONTDRAW)))
{
- INT16 temp;
+ fixed_t temp;
UINT8 *followtic_p = demo_p++;
UINT8 followtic = 0;
@@ -1335,12 +1327,12 @@ void G_WriteMetalTic(mobj_t *metal)
WRITEFIXED(demo_p,metal->player->followmobj->scale);
}
- temp = (INT16)((metal->player->followmobj->x-metal->x)>>8);
- WRITEINT16(demo_p,temp);
- temp = (INT16)((metal->player->followmobj->y-metal->y)>>8);
- WRITEINT16(demo_p,temp);
- temp = (INT16)((metal->player->followmobj->z-metal->z)>>8);
- WRITEINT16(demo_p,temp);
+ temp = metal->player->followmobj->x-metal->x;
+ WRITEFIXED(demo_p,temp);
+ temp = metal->player->followmobj->y-metal->y;
+ WRITEFIXED(demo_p,temp);
+ temp = metal->player->followmobj->z-metal->z;
+ WRITEFIXED(demo_p,temp);
if (followtic & FZT_SKIN)
WRITEUINT8(demo_p,metal->player->followmobj->sprite2);
WRITEUINT16(demo_p,metal->player->followmobj->sprite);
@@ -1480,8 +1472,8 @@ void G_BeginRecording(void)
WRITEUINT8(demo_p,player->thrustfactor);
WRITEUINT8(demo_p,player->accelstart);
WRITEUINT8(demo_p,player->acceleration);
- WRITEUINT8(demo_p,player->height>>FRACBITS);
- WRITEUINT8(demo_p,player->spinheight>>FRACBITS);
+ WRITEFIXED(demo_p,player->height);
+ WRITEFIXED(demo_p,player->spinheight);
WRITEUINT8(demo_p,player->camerascale>>FRACBITS);
WRITEUINT8(demo_p,player->shieldscale>>FRACBITS);
@@ -1818,6 +1810,7 @@ void G_DoPlayDemo(char *defdemoname)
demoversion = READUINT16(demo_p);
switch(demoversion)
{
+ case 0x000d:
case DEMOVERSION: // latest always supported
cnamelen = MAXCOLORNAME;
break;
@@ -1906,8 +1899,8 @@ void G_DoPlayDemo(char *defdemoname)
thrustfactor = READUINT8(demo_p);
accelstart = READUINT8(demo_p);
acceleration = READUINT8(demo_p);
- height = (fixed_t)READUINT8(demo_p)<<FRACBITS;
- spinheight = (fixed_t)READUINT8(demo_p)<<FRACBITS;
+ height = (demoversion < 0x000e) ? (fixed_t)READUINT8(demo_p)<<FRACBITS : READFIXED(demo_p);
+ spinheight = (demoversion < 0x000e) ? (fixed_t)READUINT8(demo_p)<<FRACBITS : READFIXED(demo_p);
camerascale = (fixed_t)READUINT8(demo_p)<<FRACBITS;
shieldscale = (fixed_t)READUINT8(demo_p)<<FRACBITS;
jumpfactor = READFIXED(demo_p);
@@ -1963,9 +1956,7 @@ void G_DoPlayDemo(char *defdemoname)
// Set skin
SetPlayerSkin(0, skin);
-#ifdef HAVE_BLUA
LUAh_MapChange(gamemap);
-#endif
displayplayer = consoleplayer = 0;
memset(playeringame,0,sizeof(playeringame));
playeringame[0] = true;
@@ -2072,6 +2063,7 @@ void G_AddGhost(char *defdemoname)
ghostversion = READUINT16(p);
switch(ghostversion)
{
+ case 0x000d:
case DEMOVERSION: // latest always supported
cnamelen = MAXCOLORNAME;
break;
@@ -2154,8 +2146,7 @@ void G_AddGhost(char *defdemoname)
p++; // thrustfactor
p++; // accelstart
p++; // acceleration
- p++; // height
- p++; // spinheight
+ p += (ghostversion < 0x000e) ? 2 : 2 * sizeof(fixed_t); // height and spinheight
p++; // camerascale
p++; // shieldscale
p += 4; // jumpfactor
@@ -2167,7 +2158,7 @@ void G_AddGhost(char *defdemoname)
count = READUINT16(p);
while (count--)
{
- p += 2;
+ SKIPSTRING(p);
SKIPSTRING(p);
p++;
}
@@ -2323,6 +2314,7 @@ void G_DoPlayMetal(void)
switch(metalversion)
{
case DEMOVERSION: // latest always supported
+ case 0x000d: // There are checks wheter the momentum is from older demo versions or not
case 0x000c: // all that changed between then and now was longer color name
break;
// too old, cannot support.
diff --git a/src/g_game.c b/src/g_game.c
index ed39124e6ecd240fe8e48d227fb85bd43118e40b..399c4f2bdc07cad33809be359fe694922466d97a 100644
--- a/src/g_game.c
+++ b/src/g_game.c
@@ -297,100 +297,100 @@ static CV_PossibleValue_t joyaxis_cons_t[] = {{0, "None"},
// don't mind me putting these here, I was lazy to figure out where else I could put those without blowing up the compiler.
// it automatically becomes compact with 20+ players, but if you like it, I guess you can turn that on!
-consvar_t cv_compactscoreboard= {"compactscoreboard", "Off", CV_SAVE, CV_OnOff, NULL, 0, NULL, NULL, 0, 0, NULL};
+consvar_t cv_compactscoreboard= CVAR_INIT ("compactscoreboard", "Off", CV_SAVE, CV_OnOff, NULL);
// chat timer thingy
static CV_PossibleValue_t chattime_cons_t[] = {{5, "MIN"}, {999, "MAX"}, {0, NULL}};
-consvar_t cv_chattime = {"chattime", "8", CV_SAVE, chattime_cons_t, NULL, 0, NULL, NULL, 0, 0, NULL};
+consvar_t cv_chattime = CVAR_INIT ("chattime", "8", CV_SAVE, chattime_cons_t, NULL);
// chatwidth
static CV_PossibleValue_t chatwidth_cons_t[] = {{64, "MIN"}, {300, "MAX"}, {0, NULL}};
-consvar_t cv_chatwidth = {"chatwidth", "150", CV_SAVE, chatwidth_cons_t, NULL, 0, NULL, NULL, 0, 0, NULL};
+consvar_t cv_chatwidth = CVAR_INIT ("chatwidth", "150", CV_SAVE, chatwidth_cons_t, NULL);
// chatheight
static CV_PossibleValue_t chatheight_cons_t[] = {{6, "MIN"}, {22, "MAX"}, {0, NULL}};
-consvar_t cv_chatheight= {"chatheight", "8", CV_SAVE, chatheight_cons_t, NULL, 0, NULL, NULL, 0, 0, NULL};
+consvar_t cv_chatheight= CVAR_INIT ("chatheight", "8", CV_SAVE, chatheight_cons_t, NULL);
// chat notifications (do you want to hear beeps? I'd understand if you didn't.)
-consvar_t cv_chatnotifications= {"chatnotifications", "On", CV_SAVE, CV_OnOff, NULL, 0, NULL, NULL, 0, 0, NULL};
+consvar_t cv_chatnotifications= CVAR_INIT ("chatnotifications", "On", CV_SAVE, CV_OnOff, NULL);
// chat spam protection (why would you want to disable that???)
-consvar_t cv_chatspamprotection= {"chatspamprotection", "On", CV_SAVE, CV_OnOff, NULL, 0, NULL, NULL, 0, 0, NULL};
+consvar_t cv_chatspamprotection= CVAR_INIT ("chatspamprotection", "On", CV_SAVE, CV_OnOff, NULL);
// minichat text background
-consvar_t cv_chatbacktint = {"chatbacktint", "On", CV_SAVE, CV_OnOff, NULL, 0, NULL, NULL, 0, 0, NULL};
+consvar_t cv_chatbacktint = CVAR_INIT ("chatbacktint", "On", CV_SAVE, CV_OnOff, NULL);
// old shit console chat. (mostly exists for stuff like terminal, not because I cared if anyone liked the old chat.)
static CV_PossibleValue_t consolechat_cons_t[] = {{0, "Window"}, {1, "Console"}, {2, "Window (Hidden)"}, {0, NULL}};
-consvar_t cv_consolechat = {"chatmode", "Window", CV_SAVE, consolechat_cons_t, NULL, 0, NULL, NULL, 0, 0, NULL};
+consvar_t cv_consolechat = CVAR_INIT ("chatmode", "Window", CV_SAVE, consolechat_cons_t, NULL);
// Pause game upon window losing focus
-consvar_t cv_pauseifunfocused = {"pauseifunfocused", "Yes", CV_SAVE, CV_YesNo, NULL, 0, NULL, NULL, 0, 0, NULL};
-
-consvar_t cv_crosshair = {"crosshair", "Cross", CV_SAVE, crosshair_cons_t, NULL, 0, NULL, NULL, 0, 0, NULL};
-consvar_t cv_crosshair2 = {"crosshair2", "Cross", CV_SAVE, crosshair_cons_t, NULL, 0, NULL, NULL, 0, 0, NULL};
-consvar_t cv_invertmouse = {"invertmouse", "Off", CV_SAVE, CV_OnOff, NULL, 0, NULL, NULL, 0, 0, NULL};
-consvar_t cv_alwaysfreelook = {"alwaysmlook", "On", CV_SAVE, CV_OnOff, NULL, 0, NULL, NULL, 0, 0, NULL};
-consvar_t cv_invertmouse2 = {"invertmouse2", "Off", CV_SAVE, CV_OnOff, NULL, 0, NULL, NULL, 0, 0, NULL};
-consvar_t cv_alwaysfreelook2 = {"alwaysmlook2", "On", CV_SAVE, CV_OnOff, NULL, 0, NULL, NULL, 0, 0, NULL};
-consvar_t cv_chasefreelook = {"chasemlook", "Off", CV_SAVE, CV_OnOff, NULL, 0, NULL, NULL, 0, 0, NULL};
-consvar_t cv_chasefreelook2 = {"chasemlook2", "Off", CV_SAVE, CV_OnOff, NULL, 0, NULL, NULL, 0, 0, NULL};
-consvar_t cv_mousemove = {"mousemove", "Off", CV_SAVE, CV_OnOff, NULL, 0, NULL, NULL, 0, 0, NULL};
-consvar_t cv_mousemove2 = {"mousemove2", "Off", CV_SAVE, CV_OnOff, NULL, 0, NULL, NULL, 0, 0, NULL};
+consvar_t cv_pauseifunfocused = CVAR_INIT ("pauseifunfocused", "Yes", CV_SAVE, CV_YesNo, NULL);
+
+consvar_t cv_crosshair = CVAR_INIT ("crosshair", "Cross", CV_SAVE, crosshair_cons_t, NULL);
+consvar_t cv_crosshair2 = CVAR_INIT ("crosshair2", "Cross", CV_SAVE, crosshair_cons_t, NULL);
+consvar_t cv_invertmouse = CVAR_INIT ("invertmouse", "Off", CV_SAVE, CV_OnOff, NULL);
+consvar_t cv_alwaysfreelook = CVAR_INIT ("alwaysmlook", "On", CV_SAVE, CV_OnOff, NULL);
+consvar_t cv_invertmouse2 = CVAR_INIT ("invertmouse2", "Off", CV_SAVE, CV_OnOff, NULL);
+consvar_t cv_alwaysfreelook2 = CVAR_INIT ("alwaysmlook2", "On", CV_SAVE, CV_OnOff, NULL);
+consvar_t cv_chasefreelook = CVAR_INIT ("chasemlook", "Off", CV_SAVE, CV_OnOff, NULL);
+consvar_t cv_chasefreelook2 = CVAR_INIT ("chasemlook2", "Off", CV_SAVE, CV_OnOff, NULL);
+consvar_t cv_mousemove = CVAR_INIT ("mousemove", "Off", CV_SAVE, CV_OnOff, NULL);
+consvar_t cv_mousemove2 = CVAR_INIT ("mousemove2", "Off", CV_SAVE, CV_OnOff, NULL);
// previously "analog", "analog2", "useranalog", and "useranalog2", invalidating 2.1-era copies of config.cfg
// changed because it'd be nice to see people try out our actually good controls with gamepads now autobrake exists
consvar_t cv_analog[2] = {
- {"sessionanalog", "Off", CV_CALL|CV_NOSHOWHELP, CV_OnOff, Analog_OnChange, 0, NULL, NULL, 0, 0, NULL},
- {"sessionanalog2", "Off", CV_CALL|CV_NOSHOWHELP, CV_OnOff, Analog2_OnChange, 0, NULL, NULL, 0, 0, NULL}
+ CVAR_INIT ("sessionanalog", "Off", CV_CALL|CV_NOSHOWHELP, CV_OnOff, Analog_OnChange),
+ CVAR_INIT ("sessionanalog2", "Off", CV_CALL|CV_NOSHOWHELP, CV_OnOff, Analog2_OnChange),
};
consvar_t cv_useranalog[2] = {
- {"configanalog", "Off", CV_SAVE|CV_CALL|CV_NOSHOWHELP, CV_OnOff, UserAnalog_OnChange, 0, NULL, NULL, 0, 0, NULL},
- {"configanalog2", "Off", CV_SAVE|CV_CALL|CV_NOSHOWHELP, CV_OnOff, UserAnalog2_OnChange, 0, NULL, NULL, 0, 0, NULL}
+ CVAR_INIT ("configanalog", "Off", CV_SAVE|CV_CALL|CV_NOSHOWHELP, CV_OnOff, UserAnalog_OnChange),
+ CVAR_INIT ("configanalog2", "Off", CV_SAVE|CV_CALL|CV_NOSHOWHELP, CV_OnOff, UserAnalog2_OnChange),
};
// deez New User eXperiences
static CV_PossibleValue_t directionchar_cons_t[] = {{0, "Camera"}, {1, "Movement"}, {2, "Simple Locked"}, {0, NULL}};
consvar_t cv_directionchar[2] = {
- {"directionchar", "Movement", CV_SAVE|CV_CALL, directionchar_cons_t, DirectionChar_OnChange, 0, NULL, NULL, 0, 0, NULL},
- {"directionchar2", "Movement", CV_SAVE|CV_CALL, directionchar_cons_t, DirectionChar2_OnChange, 0, NULL, NULL, 0, 0, NULL}
+ CVAR_INIT ("directionchar", "Movement", CV_SAVE|CV_CALL, directionchar_cons_t, DirectionChar_OnChange),
+ CVAR_INIT ("directionchar2", "Movement", CV_SAVE|CV_CALL, directionchar_cons_t, DirectionChar2_OnChange),
};
-consvar_t cv_autobrake = {"autobrake", "On", CV_SAVE|CV_CALL, CV_OnOff, AutoBrake_OnChange, 0, NULL, NULL, 0, 0, NULL};
-consvar_t cv_autobrake2 = {"autobrake2", "On", CV_SAVE|CV_CALL, CV_OnOff, AutoBrake2_OnChange, 0, NULL, NULL, 0, 0, NULL};
+consvar_t cv_autobrake = CVAR_INIT ("autobrake", "On", CV_SAVE|CV_CALL, CV_OnOff, AutoBrake_OnChange);
+consvar_t cv_autobrake2 = CVAR_INIT ("autobrake2", "On", CV_SAVE|CV_CALL, CV_OnOff, AutoBrake2_OnChange);
// hi here's some new controls
static CV_PossibleValue_t zerotoone_cons_t[] = {{0, "MIN"}, {FRACUNIT, "MAX"}, {0, NULL}};
consvar_t cv_cam_shiftfacing[2] = {
- {"cam_shiftfacingchar", "0.33", CV_FLOAT|CV_SAVE, zerotoone_cons_t, NULL, 0, NULL, NULL, 0, 0, NULL},
- {"cam2_shiftfacingchar", "0.33", CV_FLOAT|CV_SAVE, zerotoone_cons_t, NULL, 0, NULL, NULL, 0, 0, NULL},
+ CVAR_INIT ("cam_shiftfacingchar", "0.33", CV_FLOAT|CV_SAVE, zerotoone_cons_t, NULL),
+ CVAR_INIT ("cam2_shiftfacingchar", "0.33", CV_FLOAT|CV_SAVE, zerotoone_cons_t, NULL),
};
consvar_t cv_cam_turnfacing[2] = {
- {"cam_turnfacingchar", "0.25", CV_FLOAT|CV_SAVE, zerotoone_cons_t, NULL, 0, NULL, NULL, 0, 0, NULL},
- {"cam2_turnfacingchar", "0.25", CV_FLOAT|CV_SAVE, zerotoone_cons_t, NULL, 0, NULL, NULL, 0, 0, NULL},
+ CVAR_INIT ("cam_turnfacingchar", "0.25", CV_FLOAT|CV_SAVE, zerotoone_cons_t, NULL),
+ CVAR_INIT ("cam2_turnfacingchar", "0.25", CV_FLOAT|CV_SAVE, zerotoone_cons_t, NULL),
};
consvar_t cv_cam_turnfacingability[2] = {
- {"cam_turnfacingability", "0.125", CV_FLOAT|CV_SAVE, zerotoone_cons_t, NULL, 0, NULL, NULL, 0, 0, NULL},
- {"cam2_turnfacingability", "0.125", CV_FLOAT|CV_SAVE, zerotoone_cons_t, NULL, 0, NULL, NULL, 0, 0, NULL},
+ CVAR_INIT ("cam_turnfacingability", "0.125", CV_FLOAT|CV_SAVE, zerotoone_cons_t, NULL),
+ CVAR_INIT ("cam2_turnfacingability", "0.125", CV_FLOAT|CV_SAVE, zerotoone_cons_t, NULL),
};
consvar_t cv_cam_turnfacingspindash[2] = {
- {"cam_turnfacingspindash", "0.5", CV_FLOAT|CV_SAVE, zerotoone_cons_t, NULL, 0, NULL, NULL, 0, 0, NULL},
- {"cam2_turnfacingspindash", "0.5", CV_FLOAT|CV_SAVE, zerotoone_cons_t, NULL, 0, NULL, NULL, 0, 0, NULL},
+ CVAR_INIT ("cam_turnfacingspindash", "0.5", CV_FLOAT|CV_SAVE, zerotoone_cons_t, NULL),
+ CVAR_INIT ("cam2_turnfacingspindash", "0.5", CV_FLOAT|CV_SAVE, zerotoone_cons_t, NULL),
};
consvar_t cv_cam_turnfacinginput[2] = {
- {"cam_turnfacinginput", "0.25", CV_FLOAT|CV_SAVE, zerotoone_cons_t, NULL, 0, NULL, NULL, 0, 0, NULL},
- {"cam2_turnfacinginput", "0.25", CV_FLOAT|CV_SAVE, zerotoone_cons_t, NULL, 0, NULL, NULL, 0, 0, NULL},
+ CVAR_INIT ("cam_turnfacinginput", "0.25", CV_FLOAT|CV_SAVE, zerotoone_cons_t, NULL),
+ CVAR_INIT ("cam2_turnfacinginput", "0.25", CV_FLOAT|CV_SAVE, zerotoone_cons_t, NULL),
};
static CV_PossibleValue_t centertoggle_cons_t[] = {{0, "Hold"}, {1, "Toggle"}, {2, "Sticky Hold"}, {0, NULL}};
consvar_t cv_cam_centertoggle[2] = {
- {"cam_centertoggle", "Hold", CV_SAVE, centertoggle_cons_t, NULL, 0, NULL, NULL, 0, 0, NULL},
- {"cam2_centertoggle", "Hold", CV_SAVE, centertoggle_cons_t, NULL, 0, NULL, NULL, 0, 0, NULL},
+ CVAR_INIT ("cam_centertoggle", "Hold", CV_SAVE, centertoggle_cons_t, NULL),
+ CVAR_INIT ("cam2_centertoggle", "Hold", CV_SAVE, centertoggle_cons_t, NULL),
};
static CV_PossibleValue_t lockedinput_cons_t[] = {{0, "Strafe"}, {1, "Turn"}, {0, NULL}};
consvar_t cv_cam_lockedinput[2] = {
- {"cam_lockedinput", "Strafe", CV_SAVE, lockedinput_cons_t, NULL, 0, NULL, NULL, 0, 0, NULL},
- {"cam2_lockedinput", "Strafe", CV_SAVE, lockedinput_cons_t, NULL, 0, NULL, NULL, 0, 0, NULL},
+ CVAR_INIT ("cam_lockedinput", "Strafe", CV_SAVE, lockedinput_cons_t, NULL),
+ CVAR_INIT ("cam2_lockedinput", "Strafe", CV_SAVE, lockedinput_cons_t, NULL),
};
static CV_PossibleValue_t lockedassist_cons_t[] = {
@@ -402,8 +402,8 @@ static CV_PossibleValue_t lockedassist_cons_t[] = {
{0, NULL}
};
consvar_t cv_cam_lockonboss[2] = {
- {"cam_lockaimassist", "Bosses", CV_SAVE, lockedassist_cons_t, NULL, 0, NULL, NULL, 0, 0, NULL},
- {"cam2_lockaimassist", "Bosses", CV_SAVE, lockedassist_cons_t, NULL, 0, NULL, NULL, 0, 0, NULL},
+ CVAR_INIT ("cam_lockaimassist", "Bosses", CV_SAVE, lockedassist_cons_t, NULL),
+ CVAR_INIT ("cam2_lockaimassist", "Bosses", CV_SAVE, lockedassist_cons_t, NULL),
};
typedef enum
@@ -422,31 +422,29 @@ typedef enum
AXISFIRENORMAL,
} axis_input_e;
-consvar_t cv_turnaxis = {"joyaxis_turn", "X-Rudder", CV_SAVE, joyaxis_cons_t, NULL, 0, NULL, NULL, 0, 0, NULL};
-consvar_t cv_moveaxis = {"joyaxis_move", "Y-Axis", CV_SAVE, joyaxis_cons_t, NULL, 0, NULL, NULL, 0, 0, NULL};
-consvar_t cv_sideaxis = {"joyaxis_side", "X-Axis", CV_SAVE, joyaxis_cons_t, NULL, 0, NULL, NULL, 0, 0, NULL};
-consvar_t cv_lookaxis = {"joyaxis_look", "Y-Rudder-", CV_SAVE, joyaxis_cons_t, NULL, 0, NULL, NULL, 0, 0, NULL};
-consvar_t cv_jumpaxis = {"joyaxis_jump", "None", CV_SAVE, joyaxis_cons_t, NULL, 0, NULL, NULL, 0, 0, NULL};
-consvar_t cv_spinaxis = {"joyaxis_spin", "None", CV_SAVE, joyaxis_cons_t, NULL, 0, NULL, NULL, 0, 0, NULL};
-consvar_t cv_fireaxis = {"joyaxis_fire", "Z-Axis-", CV_SAVE, joyaxis_cons_t, NULL, 0, NULL, NULL, 0, 0, NULL};
-consvar_t cv_firenaxis = {"joyaxis_firenormal", "Z-Axis", CV_SAVE, joyaxis_cons_t, NULL, 0, NULL, NULL, 0, 0, NULL};
-consvar_t cv_deadzone = {"joy_deadzone", "0.125", CV_FLOAT|CV_SAVE, zerotoone_cons_t, NULL, 0, NULL, NULL, 0, 0, NULL};
-consvar_t cv_digitaldeadzone = {"joy_digdeadzone", "0.25", CV_FLOAT|CV_SAVE, zerotoone_cons_t, NULL, 0, NULL, NULL, 0, 0, NULL};
-
-consvar_t cv_turnaxis2 = {"joyaxis2_turn", "X-Rudder", CV_SAVE, joyaxis_cons_t, NULL, 0, NULL, NULL, 0, 0, NULL};
-consvar_t cv_moveaxis2 = {"joyaxis2_move", "Y-Axis", CV_SAVE, joyaxis_cons_t, NULL, 0, NULL, NULL, 0, 0, NULL};
-consvar_t cv_sideaxis2 = {"joyaxis2_side", "X-Axis", CV_SAVE, joyaxis_cons_t, NULL, 0, NULL, NULL, 0, 0, NULL};
-consvar_t cv_lookaxis2 = {"joyaxis2_look", "Y-Rudder-", CV_SAVE, joyaxis_cons_t, NULL, 0, NULL, NULL, 0, 0, NULL};
-consvar_t cv_jumpaxis2 = {"joyaxis2_jump", "None", CV_SAVE, joyaxis_cons_t, NULL, 0, NULL, NULL, 0, 0, NULL};
-consvar_t cv_spinaxis2 = {"joyaxis2_spin", "None", CV_SAVE, joyaxis_cons_t, NULL, 0, NULL, NULL, 0, 0, NULL};
-consvar_t cv_fireaxis2 = {"joyaxis2_fire", "Z-Axis-", CV_SAVE, joyaxis_cons_t, NULL, 0, NULL, NULL, 0, 0, NULL};
-consvar_t cv_firenaxis2 = {"joyaxis2_firenormal", "Z-Axis", CV_SAVE, joyaxis_cons_t, NULL, 0, NULL, NULL, 0, 0, NULL};
-consvar_t cv_deadzone2 = {"joy_deadzone2", "0.125", CV_FLOAT|CV_SAVE, zerotoone_cons_t, NULL, 0, NULL, NULL, 0, 0, NULL};
-consvar_t cv_digitaldeadzone2 = {"joy_digdeadzone2", "0.25", CV_FLOAT|CV_SAVE, zerotoone_cons_t, NULL, 0, NULL, NULL, 0, 0, NULL};
-
-#ifdef SEENAMES
+consvar_t cv_turnaxis = CVAR_INIT ("joyaxis_turn", "X-Rudder", CV_SAVE, joyaxis_cons_t, NULL);
+consvar_t cv_moveaxis = CVAR_INIT ("joyaxis_move", "Y-Axis", CV_SAVE, joyaxis_cons_t, NULL);
+consvar_t cv_sideaxis = CVAR_INIT ("joyaxis_side", "X-Axis", CV_SAVE, joyaxis_cons_t, NULL);
+consvar_t cv_lookaxis = CVAR_INIT ("joyaxis_look", "Y-Rudder-", CV_SAVE, joyaxis_cons_t, NULL);
+consvar_t cv_jumpaxis = CVAR_INIT ("joyaxis_jump", "None", CV_SAVE, joyaxis_cons_t, NULL);
+consvar_t cv_spinaxis = CVAR_INIT ("joyaxis_spin", "None", CV_SAVE, joyaxis_cons_t, NULL);
+consvar_t cv_fireaxis = CVAR_INIT ("joyaxis_fire", "Z-Axis-", CV_SAVE, joyaxis_cons_t, NULL);
+consvar_t cv_firenaxis = CVAR_INIT ("joyaxis_firenormal", "Z-Axis", CV_SAVE, joyaxis_cons_t, NULL);
+consvar_t cv_deadzone = CVAR_INIT ("joy_deadzone", "0.125", CV_FLOAT|CV_SAVE, zerotoone_cons_t, NULL);
+consvar_t cv_digitaldeadzone = CVAR_INIT ("joy_digdeadzone", "0.25", CV_FLOAT|CV_SAVE, zerotoone_cons_t, NULL);
+
+consvar_t cv_turnaxis2 = CVAR_INIT ("joyaxis2_turn", "X-Rudder", CV_SAVE, joyaxis_cons_t, NULL);
+consvar_t cv_moveaxis2 = CVAR_INIT ("joyaxis2_move", "Y-Axis", CV_SAVE, joyaxis_cons_t, NULL);
+consvar_t cv_sideaxis2 = CVAR_INIT ("joyaxis2_side", "X-Axis", CV_SAVE, joyaxis_cons_t, NULL);
+consvar_t cv_lookaxis2 = CVAR_INIT ("joyaxis2_look", "Y-Rudder-", CV_SAVE, joyaxis_cons_t, NULL);
+consvar_t cv_jumpaxis2 = CVAR_INIT ("joyaxis2_jump", "None", CV_SAVE, joyaxis_cons_t, NULL);
+consvar_t cv_spinaxis2 = CVAR_INIT ("joyaxis2_spin", "None", CV_SAVE, joyaxis_cons_t, NULL);
+consvar_t cv_fireaxis2 = CVAR_INIT ("joyaxis2_fire", "Z-Axis-", CV_SAVE, joyaxis_cons_t, NULL);
+consvar_t cv_firenaxis2 = CVAR_INIT ("joyaxis2_firenormal", "Z-Axis", CV_SAVE, joyaxis_cons_t, NULL);
+consvar_t cv_deadzone2 = CVAR_INIT ("joy_deadzone2", "0.125", CV_FLOAT|CV_SAVE, zerotoone_cons_t, NULL);
+consvar_t cv_digitaldeadzone2 = CVAR_INIT ("joy_digdeadzone2", "0.25", CV_FLOAT|CV_SAVE, zerotoone_cons_t, NULL);
+
player_t *seenplayer; // player we're aiming at right now
-#endif
// now automatically allocated in D_RegisterClientCommands
// so that it doesn't have to be updated depending on the value of MAXPLAYERS
@@ -1677,6 +1675,26 @@ void G_BuildTiccmd(ticcmd_t *cmd, INT32 realtics, UINT8 ssplayer)
}
}
+ // At this point, cmd doesn't contain the final angle yet,
+ // So we need to temporarily transform it so Lua scripters
+ // don't need to handle it differently than in other hooks.
+ if (addedtogame && gamestate == GS_LEVEL)
+ {
+ INT16 extra = ticcmd_oldangleturn[forplayer] - player->oldrelangleturn;
+ INT16 origangle = cmd->angleturn;
+ INT16 orighookangle = (INT16)(origangle + player->angleturn + extra);
+ INT16 origaiming = cmd->aiming;
+
+ cmd->angleturn = orighookangle;
+
+ LUAh_PlayerCmd(player, cmd);
+
+ extra = cmd->angleturn - orighookangle;
+ cmd->angleturn = origangle + extra;
+ *myangle += extra << 16;
+ *myaiming += (cmd->aiming - origaiming) << 16;
+ }
+
//Reset away view if a command is given.
if (ssplayer == 1 && (cmd->forwardmove || cmd->sidemove || cmd->buttons)
&& displayplayer != consoleplayer)
@@ -1825,7 +1843,7 @@ void G_DoLoadLevel(boolean resetplayer)
}
// Setup the level.
- if (!P_LoadLevel(false)) // this never returns false?
+ if (!P_LoadLevel(false, false)) // this never returns false?
{
// fail so reset game stuff
Command_ExitGame_f();
@@ -2015,7 +2033,7 @@ boolean G_Responder(event_t *ev)
if (F_CreditResponder(ev))
{
// Skip credits for everyone
- if (! serverrunning)/* hahahahahaha */
+ if (! netgame)
F_StartGameEvaluation();
else if (server || IsPlayerAdmin(consoleplayer))
SendNetXCmd(XD_EXITLEVEL, NULL, 0);
@@ -2212,8 +2230,35 @@ void G_Ticker(boolean run)
// Costs a life to retry ... unless the player in question is dead already, or you haven't even touched the first starpost in marathon run.
if (marathonmode && gamemap == spmarathon_start && !players[consoleplayer].starposttime)
{
+ player_t *p = &players[consoleplayer];
marathonmode |= MA_INIT;
marathontime = 0;
+
+ numgameovers = tokenlist = token = 0;
+ countdown = countdown2 = exitfadestarted = 0;
+
+ p->playerstate = PST_REBORN;
+ p->starpostx = p->starposty = p->starpostz = 0;
+
+ p->lives = startinglivesbalance[0];
+ p->continues = 1;
+
+ p->score = 0;
+
+ // The latter two should clear by themselves, but just in case
+ p->pflags &= ~(PF_TAGIT|PF_GAMETYPEOVER|PF_FULLSTASIS);
+
+ // Clear cheatcodes too, just in case.
+ p->pflags &= ~(PF_GODMODE|PF_NOCLIP|PF_INVIS);
+
+ p->xtralife = 0;
+
+ // Reset unlockable triggers
+ unlocktriggers = 0;
+
+ emeralds = 0;
+
+ memset(&luabanks, 0, sizeof(luabanks));
}
else if (G_GametypeUsesLives() && players[consoleplayer].playerstate == PST_LIVE && players[consoleplayer].lives != INFLIVES)
players[consoleplayer].lives -= 1;
@@ -2246,14 +2291,21 @@ void G_Ticker(boolean run)
{
if (playeringame[i])
{
+ INT16 received;
+
G_CopyTiccmd(&players[i].cmd, &netcmds[buf][i], 1);
+ received = (players[i].cmd.angleturn & TICCMD_RECEIVED);
+
players[i].angleturn += players[i].cmd.angleturn - players[i].oldrelangleturn;
players[i].oldrelangleturn = players[i].cmd.angleturn;
if (P_ControlStyle(&players[i]) == CS_LMAOGALOG)
P_ForceLocalAngle(&players[i], players[i].angleturn << 16);
else
players[i].cmd.angleturn = players[i].angleturn;
+
+ players[i].cmd.angleturn &= ~TICCMD_RECEIVED;
+ players[i].cmd.angleturn |= received;
}
}
@@ -3455,6 +3507,7 @@ tolinfo_t TYPEOFLEVEL[NUMTOLNAMES] = {
{"MARIO",TOL_MARIO},
{"NIGHTS",TOL_NIGHTS},
{"OLDBRAK",TOL_ERZ3},
+ {"ERZ3",TOL_ERZ3},
{"XMAS",TOL_XMAS},
{"CHRISTMAS",TOL_XMAS},
@@ -3514,7 +3567,7 @@ INT32 G_GetGametypeByName(const char *gametypestr)
//
boolean G_IsSpecialStage(INT32 mapnum)
{
- if (gametype != GT_COOP || modeattacking == ATTACKING_RECORD)
+ if (modeattacking == ATTACKING_RECORD)
return false;
if (mapnum >= sstage_start && mapnum <= sstage_end)
return true;
@@ -3921,6 +3974,7 @@ static void G_DoCompleted(void)
{
G_SetGamestate(GS_INTERMISSION);
Y_StartIntermission();
+ Y_LoadIntermissionData();
G_UpdateVisited();
G_HandleSaveLevel();
}
diff --git a/src/g_game.h b/src/g_game.h
index 2bcf444c234c244c2f8f76aab62cebee226d18ee..744d6755abd35dc0765ec2174e1cfed94c2b15b8 100644
--- a/src/g_game.h
+++ b/src/g_game.h
@@ -25,9 +25,7 @@ extern char timeattackfolder[64];
extern char customversionstring[32];
#define GAMEDATASIZE (4*8192)
-#ifdef SEENAMES
extern player_t *seenplayer;
-#endif
extern char player_names[MAXPLAYERS][MAXPLAYERNAME+1];
extern INT32 player_name_changes[MAXPLAYERS];
diff --git a/src/g_input.c b/src/g_input.c
index 1cf6990c92dd1b3b3c938aa64e84e66bc15cb619..d3c21e774c4359d4f2433379dcbbe6e7fdc79436 100644
--- a/src/g_input.c
+++ b/src/g_input.c
@@ -25,11 +25,11 @@ static CV_PossibleValue_t mousesens_cons_t[] = {{1, "MIN"}, {MAXMOUSESENSITIVITY
static CV_PossibleValue_t onecontrolperkey_cons_t[] = {{1, "One"}, {2, "Several"}, {0, NULL}};
// mouse values are used once
-consvar_t cv_mousesens = {"mousesens", "20", CV_SAVE, mousesens_cons_t, NULL, 0, NULL, NULL, 0, 0, NULL};
-consvar_t cv_mousesens2 = {"mousesens2", "20", CV_SAVE, mousesens_cons_t, NULL, 0, NULL, NULL, 0, 0, NULL};
-consvar_t cv_mouseysens = {"mouseysens", "20", CV_SAVE, mousesens_cons_t, NULL, 0, NULL, NULL, 0, 0, NULL};
-consvar_t cv_mouseysens2 = {"mouseysens2", "20", CV_SAVE, mousesens_cons_t, NULL, 0, NULL, NULL, 0, 0, NULL};
-consvar_t cv_controlperkey = {"controlperkey", "One", CV_SAVE, onecontrolperkey_cons_t, NULL, 0, NULL, NULL, 0, 0, NULL};
+consvar_t cv_mousesens = CVAR_INIT ("mousesens", "20", CV_SAVE, mousesens_cons_t, NULL);
+consvar_t cv_mousesens2 = CVAR_INIT ("mousesens2", "20", CV_SAVE, mousesens_cons_t, NULL);
+consvar_t cv_mouseysens = CVAR_INIT ("mouseysens", "20", CV_SAVE, mousesens_cons_t, NULL);
+consvar_t cv_mouseysens2 = CVAR_INIT ("mouseysens2", "20", CV_SAVE, mousesens_cons_t, NULL);
+consvar_t cv_controlperkey = CVAR_INIT ("controlperkey", "One", CV_SAVE, onecontrolperkey_cons_t, NULL);
INT32 mousex, mousey;
INT32 mlooky; // like mousey but with a custom sensitivity for mlook
diff --git a/src/hardware/hw_batching.c b/src/hardware/hw_batching.c
index 492cea5fa13653163bfef64c6581ceb1b55280df..b13ad03eace3b21342b8f1048b780aea2f36c08a 100644
--- a/src/hardware/hw_batching.c
+++ b/src/hardware/hw_batching.c
@@ -1,7 +1,6 @@
// SONIC ROBO BLAST 2
//-----------------------------------------------------------------------------
-// Copyright (C) 1998-2000 by DooM Legacy Team.
-// Copyright (C) 1999-2020 by Sonic Team Junior.
+// Copyright (C) 2020 by Sonic Team Junior.
//
// This program is free software distributed under the
// terms of the GNU General Public License, version 2.
@@ -138,6 +137,8 @@ static int comparePolygons(const void *p1, const void *p2)
PolygonArrayEntry* poly2 = &polygonArray[index2];
int diff;
INT64 diff64;
+ UINT32 downloaded1 = 0;
+ UINT32 downloaded2 = 0;
int shader1 = poly1->shader;
int shader2 = poly2->shader;
@@ -153,7 +154,11 @@ static int comparePolygons(const void *p1, const void *p2)
if (shader1 == -1 && shader2 == -1)
return index1 - index2;
- diff64 = poly1->texture - poly2->texture;
+ if (poly1->texture)
+ downloaded1 = poly1->texture->downloaded; // there should be a opengl texture name here, usable for comparisons
+ if (poly2->texture)
+ downloaded2 = poly2->texture->downloaded;
+ diff64 = downloaded1 - downloaded2;
if (diff64 != 0) return diff64;
diff = poly1->polyFlags - poly2->polyFlags;
@@ -185,16 +190,21 @@ static int comparePolygonsNoShaders(const void *p1, const void *p2)
GLMipmap_t *texture1 = poly1->texture;
GLMipmap_t *texture2 = poly2->texture;
+ UINT32 downloaded1 = 0;
+ UINT32 downloaded2 = 0;
if (poly1->polyFlags & PF_NoTexture || poly1->horizonSpecial)
texture1 = NULL;
if (poly2->polyFlags & PF_NoTexture || poly2->horizonSpecial)
texture2 = NULL;
- diff64 = texture1 - texture2;
- if (diff64 != 0) return diff64;
-
+ if (texture1)
+ downloaded1 = texture1->downloaded; // there should be a opengl texture name here, usable for comparisons
+ if (texture2)
+ downloaded2 = texture2->downloaded;
// skywalls and horizon lines must retain their order for horizon lines to work
- if (texture1 == NULL && texture2 == NULL)
+ if (!texture1 && !texture2)
return index1 - index2;
+ diff64 = downloaded1 - downloaded2;
+ if (diff64 != 0) return diff64;
diff = poly1->polyFlags - poly2->polyFlags;
if (diff != 0) return diff;
@@ -235,13 +245,13 @@ void HWR_RenderBatches(void)
currently_batching = false;// no longer collecting batches
if (!polygonArraySize)
{
- rs_hw_numpolys = rs_hw_numcalls = rs_hw_numshaders = rs_hw_numtextures = rs_hw_numpolyflags = rs_hw_numcolors = 0;
+ ps_hw_numpolys = ps_hw_numcalls = ps_hw_numshaders = ps_hw_numtextures = ps_hw_numpolyflags = ps_hw_numcolors = 0;
return;// nothing to draw
}
// init stats vars
- rs_hw_numpolys = polygonArraySize;
- rs_hw_numcalls = rs_hw_numverts = 0;
- rs_hw_numshaders = rs_hw_numtextures = rs_hw_numpolyflags = rs_hw_numcolors = 1;
+ ps_hw_numpolys = polygonArraySize;
+ ps_hw_numcalls = ps_hw_numverts = 0;
+ ps_hw_numshaders = ps_hw_numtextures = ps_hw_numpolyflags = ps_hw_numcolors = 1;
// init polygonIndexArray
for (i = 0; i < polygonArraySize; i++)
{
@@ -249,12 +259,12 @@ void HWR_RenderBatches(void)
}
// sort polygons
- rs_hw_batchsorttime = I_GetTimeMicros();
+ ps_hw_batchsorttime = I_GetPreciseTime();
if (cv_glshaders.value && gl_shadersavailable)
qsort(polygonIndexArray, polygonArraySize, sizeof(unsigned int), comparePolygons);
else
qsort(polygonIndexArray, polygonArraySize, sizeof(unsigned int), comparePolygonsNoShaders);
- rs_hw_batchsorttime = I_GetTimeMicros() - rs_hw_batchsorttime;
+ ps_hw_batchsorttime = I_GetPreciseTime() - ps_hw_batchsorttime;
// sort order
// 1. shader
// 2. texture
@@ -262,7 +272,7 @@ void HWR_RenderBatches(void)
// 4. colors + light level
// not sure about what order of the last 2 should be, or if it even matters
- rs_hw_batchdrawtime = I_GetTimeMicros();
+ ps_hw_batchdrawtime = I_GetPreciseTime();
currentShader = polygonArray[polygonIndexArray[0]].shader;
currentTexture = polygonArray[polygonIndexArray[0]].texture;
@@ -398,8 +408,8 @@ void HWR_RenderBatches(void)
// execute draw call
HWD.pfnDrawIndexedTriangles(¤tSurfaceInfo, finalVertexArray, finalIndexWritePos, currentPolyFlags, finalVertexIndexArray);
// update stats
- rs_hw_numcalls++;
- rs_hw_numverts += finalIndexWritePos;
+ ps_hw_numcalls++;
+ ps_hw_numverts += finalIndexWritePos;
// reset write positions
finalVertexWritePos = 0;
finalIndexWritePos = 0;
@@ -416,7 +426,7 @@ void HWR_RenderBatches(void)
currentShader = nextShader;
changeShader = false;
- rs_hw_numshaders++;
+ ps_hw_numshaders++;
}
if (changeTexture)
{
@@ -425,21 +435,21 @@ void HWR_RenderBatches(void)
currentTexture = nextTexture;
changeTexture = false;
- rs_hw_numtextures++;
+ ps_hw_numtextures++;
}
if (changePolyFlags)
{
currentPolyFlags = nextPolyFlags;
changePolyFlags = false;
- rs_hw_numpolyflags++;
+ ps_hw_numpolyflags++;
}
if (changeSurfaceInfo)
{
currentSurfaceInfo = nextSurfaceInfo;
changeSurfaceInfo = false;
- rs_hw_numcolors++;
+ ps_hw_numcolors++;
}
// and that should be it?
}
@@ -447,7 +457,7 @@ void HWR_RenderBatches(void)
polygonArraySize = 0;
unsortedVertexArraySize = 0;
- rs_hw_batchdrawtime = I_GetTimeMicros() - rs_hw_batchdrawtime;
+ ps_hw_batchdrawtime = I_GetPreciseTime() - ps_hw_batchdrawtime;
}
diff --git a/src/hardware/hw_batching.h b/src/hardware/hw_batching.h
index 7c108a4bd2a18e2cee24487afe8c79b4b856c28b..42291a0dfd261731ce6d40c24e06de63260dc132 100644
--- a/src/hardware/hw_batching.h
+++ b/src/hardware/hw_batching.h
@@ -1,7 +1,6 @@
// SONIC ROBO BLAST 2
//-----------------------------------------------------------------------------
-// Copyright (C) 1998-2000 by DooM Legacy Team.
-// Copyright (C) 1999-2020 by Sonic Team Junior.
+// Copyright (C) 2020 by Sonic Team Junior.
//
// This program is free software distributed under the
// terms of the GNU General Public License, version 2.
@@ -17,7 +16,7 @@
#include "hw_data.h"
#include "hw_drv.h"
-typedef struct
+typedef struct
{
FSurfaceInfo surf;// surf also has its own polyflags for some reason, but it seems unused
unsigned int vertsIndex;// location of verts in unsortedVertexArray
diff --git a/src/hardware/hw_cache.c b/src/hardware/hw_cache.c
index 8c85c5112b09aa38ebd619b13c7c7b07a147e92f..83a4e2e03d9b56cd503092762b7ac48fe52a5611 100644
--- a/src/hardware/hw_cache.c
+++ b/src/hardware/hw_cache.c
@@ -25,6 +25,7 @@
#include "../z_zone.h"
#include "../v_video.h"
#include "../r_draw.h"
+#include "../r_patch.h"
#include "../r_picformats.h"
#include "../p_setup.h"
@@ -107,7 +108,7 @@ static void HWR_DrawColumnInCache(const column_t *patchcol, UINT8 *block, GLMipm
//Hurdler: 25/04/2000: now support colormap in hardware mode
if (mipmap->colormap)
- texel = mipmap->colormap[texel];
+ texel = mipmap->colormap->data[texel];
// hope compiler will get this switch out of the loops (dreams...)
// gcc do it ! but vcc not ! (why don't use cygwin gcc for win32 ?)
@@ -217,7 +218,7 @@ static void HWR_DrawFlippedColumnInCache(const column_t *patchcol, UINT8 *block,
//Hurdler: 25/04/2000: now support colormap in hardware mode
if (mipmap->colormap)
- texel = mipmap->colormap[texel];
+ texel = mipmap->colormap->data[texel];
// hope compiler will get this switch out of the loops (dreams...)
// gcc do it ! but vcc not ! (why don't use cygwin gcc for win32 ?)
@@ -306,7 +307,7 @@ static void HWR_DrawPatchInCache(GLMipmap_t *mipmap,
// Draw each column to the block cache
for (; ncols--; block += bpp, xfrac += xfracstep)
{
- patchcol = (const column_t *)((const UINT8 *)realpatch + LONG(realpatch->columnofs[xfrac>>FRACBITS]));
+ patchcol = (const column_t *)((const UINT8 *)realpatch->columns + (realpatch->columnofs[xfrac>>FRACBITS]));
HWR_DrawColumnInCache(patchcol, block, mipmap,
pblockheight, blockmodulo,
@@ -320,7 +321,7 @@ static void HWR_DrawPatchInCache(GLMipmap_t *mipmap,
static void HWR_DrawTexturePatchInCache(GLMipmap_t *mipmap,
INT32 pblockwidth, INT32 pblockheight,
texture_t *texture, texpatch_t *patch,
- const patch_t *realpatch)
+ const softwarepatch_t *realpatch)
{
INT32 x, x1, x2;
INT32 col, ncols;
@@ -391,7 +392,7 @@ static void HWR_DrawTexturePatchInCache(GLMipmap_t *mipmap,
bpp = format2bpp(mipmap->format);
if (bpp < 1 || bpp > 4)
- I_Error("HWR_DrawPatchInCache: no drawer defined for this bpp (%d)\n",bpp);
+ I_Error("HWR_DrawTexturePatchInCache: no drawer defined for this bpp (%d)\n",bpp);
// NOTE: should this actually be pblockwidth*bpp?
blockmodulo = pblockwidth*bpp;
@@ -446,7 +447,7 @@ static void HWR_GenerateTexture(INT32 texnum, GLMapTexture_t *grtex)
UINT8 *block;
texture_t *texture;
texpatch_t *patch;
- patch_t *realpatch;
+ softwarepatch_t *realpatch;
UINT8 *pdata;
INT32 blockwidth, blockheight, blocksize;
@@ -502,16 +503,16 @@ static void HWR_GenerateTexture(INT32 texnum, GLMapTexture_t *grtex)
boolean dealloc = true;
size_t lumplength = W_LumpLengthPwad(patch->wad, patch->lump);
pdata = W_CacheLumpNumPwad(patch->wad, patch->lump, PU_CACHE);
- realpatch = (patch_t *)pdata;
+ realpatch = (softwarepatch_t *)pdata;
#ifndef NO_PNG_LUMPS
if (Picture_IsLumpPNG((UINT8 *)realpatch, lumplength))
- realpatch = (patch_t *)Picture_PNGConvert(pdata, PICFMT_PATCH, NULL, NULL, NULL, NULL, lumplength, NULL, 0);
+ realpatch = (softwarepatch_t *)Picture_PNGConvert(pdata, PICFMT_DOOMPATCH, NULL, NULL, NULL, NULL, lumplength, NULL, 0);
else
#endif
#ifdef WALLFLATS
if (texture->type == TEXTURETYPE_FLAT)
- realpatch = (patch_t *)Picture_Convert(PICFMT_FLAT, pdata, PICFMT_PATCH, 0, NULL, texture->width, texture->height, 0, 0, 0);
+ realpatch = (softwarepatch_t *)Picture_Convert(PICFMT_FLAT, pdata, PICFMT_DOOMPATCH, 0, NULL, texture->width, texture->height, 0, 0, 0);
else
#endif
{
@@ -544,36 +545,20 @@ static void HWR_GenerateTexture(INT32 texnum, GLMapTexture_t *grtex)
// patch may be NULL if grMipmap has been initialised already and makebitmap is false
void HWR_MakePatch (const patch_t *patch, GLPatch_t *grPatch, GLMipmap_t *grMipmap, boolean makebitmap)
{
-#ifndef NO_PNG_LUMPS
- // lump is a png so convert it
- size_t len = W_LumpLengthPwad(grPatch->wadnum, grPatch->lumpnum);
- if ((patch != NULL) && Picture_IsLumpPNG((const UINT8 *)patch, len))
- patch = (patch_t *)Picture_PNGConvert((const UINT8 *)patch, PICFMT_PATCH, NULL, NULL, NULL, NULL, len, NULL, 0);
-#endif
-
- // don't do it twice (like a cache)
if (grMipmap->width == 0)
{
- // save the original patch header so that the GLPatch can be casted
- // into a standard patch_t struct and the existing code can get the
- // orginal patch dimensions and offsets.
- grPatch->width = SHORT(patch->width);
- grPatch->height = SHORT(patch->height);
- grPatch->leftoffset = SHORT(patch->leftoffset);
- grPatch->topoffset = SHORT(patch->topoffset);
-
grMipmap->width = grMipmap->height = 1;
- while (grMipmap->width < grPatch->width) grMipmap->width <<= 1;
- while (grMipmap->height < grPatch->height) grMipmap->height <<= 1;
+ while (grMipmap->width < patch->width) grMipmap->width <<= 1;
+ while (grMipmap->height < patch->height) grMipmap->height <<= 1;
// no wrap around, no chroma key
grMipmap->flags = 0;
+
// setup the texture info
grMipmap->format = patchformat;
- //grPatch->max_s = grPatch->max_t = 1.0f;
- grPatch->max_s = (float)grPatch->width / (float)grMipmap->width;
- grPatch->max_t = (float)grPatch->height / (float)grMipmap->height;
+ grPatch->max_s = (float)patch->width / (float)grMipmap->width;
+ grPatch->max_t = (float)patch->height / (float)grMipmap->height;
}
Z_Free(grMipmap->data);
@@ -585,7 +570,7 @@ void HWR_MakePatch (const patch_t *patch, GLPatch_t *grPatch, GLMipmap_t *grMipm
HWR_DrawPatchInCache(grMipmap,
grMipmap->width, grMipmap->height,
- grPatch->width, grPatch->height,
+ patch->width, patch->height,
patch);
}
}
@@ -598,20 +583,56 @@ void HWR_MakePatch (const patch_t *patch, GLPatch_t *grPatch, GLMipmap_t *grMipm
static size_t gl_numtextures = 0; // Texture count
static GLMapTexture_t *gl_textures; // For all textures
static GLMapTexture_t *gl_flats; // For all (texture) flats, as normal flats don't need to be cached
+boolean gl_maptexturesloaded = false;
-void HWR_InitTextureCache(void)
+void HWR_FreeTextureData(patch_t *patch)
{
- gl_textures = NULL;
- gl_flats = NULL;
+ GLPatch_t *grPatch;
+
+ if (!patch || !patch->hardware)
+ return;
+
+ grPatch = patch->hardware;
+
+ if (vid.glstate == VID_GL_LIBRARY_LOADED)
+ HWD.pfnDeleteTexture(grPatch->mipmap);
+ if (grPatch->mipmap->data)
+ Z_Free(grPatch->mipmap->data);
+}
+
+void HWR_FreeTexture(patch_t *patch)
+{
+ if (!patch)
+ return;
+
+ if (patch->hardware)
+ {
+ GLPatch_t *grPatch = patch->hardware;
+
+ HWR_FreeTextureColormaps(patch);
+
+ if (grPatch->mipmap)
+ {
+ HWR_FreeTextureData(patch);
+ Z_Free(grPatch->mipmap);
+ }
+
+ Z_Free(patch->hardware);
+ }
+
+ patch->hardware = NULL;
}
-// Callback function for HWR_FreeTextureCache.
-static void FreeMipmapColormap(INT32 patchnum, void *patch)
+// Called by HWR_FreePatchCache.
+void HWR_FreeTextureColormaps(patch_t *patch)
{
- GLPatch_t* const pat = patch;
- (void)patchnum; //unused
+ GLPatch_t *pat;
// The patch must be valid, obviously
+ if (!patch)
+ return;
+
+ pat = patch->hardware;
if (!pat)
return;
@@ -627,7 +648,7 @@ static void FreeMipmapColormap(INT32 patchnum, void *patch)
if (!pat->mipmap)
break;
- // No colormap mipmap either.
+ // No colormap mipmaps either.
if (!pat->mipmap->nextcolormap)
break;
@@ -638,35 +659,78 @@ static void FreeMipmapColormap(INT32 patchnum, void *patch)
// Free image data from memory.
if (next->data)
Z_Free(next->data);
+ if (next->colormap)
+ Z_Free(next->colormap);
next->data = NULL;
+ next->colormap = NULL;
+ HWD.pfnDeleteTexture(next);
// Free the old colormap mipmap from memory.
free(next);
}
}
-void HWR_FreeMipmapCache(void)
+static boolean FreeTextureCallback(void *mem)
{
- INT32 i;
+ patch_t *patch = (patch_t *)mem;
+ HWR_FreeTexture(patch);
+ return false;
+}
+
+static boolean FreeColormapsCallback(void *mem)
+{
+ patch_t *patch = (patch_t *)mem;
+ HWR_FreeTextureColormaps(patch);
+ return false;
+}
+
+static void HWR_FreePatchCache(boolean freeall)
+{
+ boolean (*callback)(void *mem) = FreeTextureCallback;
- // free references to the textures
- HWD.pfnClearMipMapCache();
+ if (!freeall)
+ callback = FreeColormapsCallback;
- // free all hardware-converted graphics cached in the heap
- // our gool is only the textures since user of the texture is the texture cache
- Z_FreeTag(PU_HWRCACHE);
- Z_FreeTag(PU_HWRCACHE_UNLOCKED);
+ Z_IterateTags(PU_PATCH, PU_PATCH_ROTATED, callback);
+ Z_IterateTags(PU_SPRITE, PU_HUDGFX, callback);
+}
+
+// free all textures after each level
+void HWR_ClearAllTextures(void)
+{
+ HWD.pfnClearMipMapCache(); // free references to the textures
+ HWR_FreePatchCache(true);
+}
+
+void HWR_FreeColormapCache(void)
+{
+ HWR_FreePatchCache(false);
+}
+
+void HWR_InitMapTextures(void)
+{
+ gl_textures = NULL;
+ gl_flats = NULL;
+ gl_maptexturesloaded = false;
+}
- // Alam: free the Z_Blocks before freeing it's users
- // free all patch colormaps after each level: must be done after ClearMipMapCache!
- for (i = 0; i < numwadfiles; i++)
- M_AATreeIterate(wadfiles[i]->hwrcache, FreeMipmapColormap);
+static void FreeMapTexture(GLMapTexture_t *tex)
+{
+ HWD.pfnDeleteTexture(&tex->mipmap);
+ if (tex->mipmap.data)
+ Z_Free(tex->mipmap.data);
+ tex->mipmap.data = NULL;
}
-void HWR_FreeTextureCache(void)
+void HWR_FreeMapTextures(void)
{
- // free references to the textures
- HWR_FreeMipmapCache();
+ size_t i;
+
+ for (i = 0; i < gl_numtextures; i++)
+ {
+ FreeMapTexture(&gl_textures[i]);
+ FreeMapTexture(&gl_flats[i]);
+ }
// now the heap don't have any 'user' pointing to our
// texturecache info, we can free it
@@ -677,22 +741,22 @@ void HWR_FreeTextureCache(void)
gl_textures = NULL;
gl_flats = NULL;
gl_numtextures = 0;
+ gl_maptexturesloaded = false;
}
-void HWR_LoadTextures(size_t pnumtextures)
+void HWR_LoadMapTextures(size_t pnumtextures)
{
- // we must free it since numtextures changed
- HWR_FreeTextureCache();
+ // we must free it since numtextures may have changed
+ HWR_FreeMapTextures();
- // Why not Z_Malloc?
gl_numtextures = pnumtextures;
gl_textures = calloc(gl_numtextures, sizeof(*gl_textures));
gl_flats = calloc(gl_numtextures, sizeof(*gl_flats));
- // Doesn't tell you which it _is_, but hopefully
- // should never ever happen (right?!)
if ((gl_textures == NULL) || (gl_flats == NULL))
- I_Error("HWR_LoadTextures: ran out of memory for OpenGL textures. Sad!");
+ I_Error("HWR_LoadMapTextures: ran out of memory for OpenGL textures");
+
+ gl_maptexturesloaded = true;
}
void HWR_SetPalette(RGBA_t *palette)
@@ -730,7 +794,6 @@ GLMapTexture_t *HWR_GetTexture(INT32 tex)
// If hardware does not have the texture, then call pfnSetTexture to upload it
if (!grtex->mipmap.downloaded)
HWD.pfnSetTexture(&grtex->mipmap);
-
HWR_SetCurrentTexture(&grtex->mipmap);
// The system-memory data can be purged now.
@@ -803,20 +866,22 @@ static void HWR_CacheTextureAsFlat(GLMipmap_t *grMipmap, INT32 texturenum)
}
// Download a Doom 'flat' to the hardware cache and make it ready for use
-void HWR_LiterallyGetFlat(lumpnum_t flatlumpnum)
+void HWR_GetRawFlat(lumpnum_t flatlumpnum)
{
GLMipmap_t *grmip;
+ patch_t *patch;
+
if (flatlumpnum == LUMPERROR)
return;
- grmip = HWR_GetCachedGLPatch(flatlumpnum)->mipmap;
+ patch = HWR_GetCachedGLPatch(flatlumpnum);
+ grmip = ((GLPatch_t *)Patch_AllocateHardwarePatch(patch))->mipmap;
if (!grmip->downloaded && !grmip->data)
HWR_CacheFlat(grmip, flatlumpnum);
// If hardware does not have the texture, then call pfnSetTexture to upload it
if (!grmip->downloaded)
HWD.pfnSetTexture(grmip);
-
HWR_SetCurrentTexture(grmip);
// The system-memory data can be purged now.
@@ -830,7 +895,7 @@ void HWR_GetLevelFlat(levelflat_t *levelflat)
return;
if (levelflat->type == LEVELFLAT_FLAT)
- HWR_LiterallyGetFlat(levelflat->u.flat.lumpnum);
+ HWR_GetRawFlat(levelflat->u.flat.lumpnum);
else if (levelflat->type == LEVELFLAT_TEXTURE)
{
GLMapTexture_t *grtex;
@@ -854,7 +919,6 @@ void HWR_GetLevelFlat(levelflat_t *levelflat)
// If hardware does not have the texture, then call pfnSetTexture to upload it
if (!grtex->mipmap.downloaded)
HWD.pfnSetTexture(&grtex->mipmap);
-
HWR_SetCurrentTexture(&grtex->mipmap);
// The system-memory data can be purged now.
@@ -862,23 +926,25 @@ void HWR_GetLevelFlat(levelflat_t *levelflat)
}
else if (levelflat->type == LEVELFLAT_PATCH)
{
- GLPatch_t *patch = W_CachePatchNum(levelflat->u.flat.lumpnum, PU_CACHE);
- levelflat->width = (UINT16)SHORT(patch->width);
- levelflat->height = (UINT16)SHORT(patch->height);
+ patch_t *patch = W_CachePatchNum(levelflat->u.flat.lumpnum, PU_CACHE);
+ levelflat->width = (UINT16)(patch->width);
+ levelflat->height = (UINT16)(patch->height);
HWR_GetPatch(patch);
}
#ifndef NO_PNG_LUMPS
else if (levelflat->type == LEVELFLAT_PNG)
{
- INT32 pngwidth = 0, pngheight = 0;
GLMipmap_t *mipmap = levelflat->mipmap;
- UINT8 *flat;
- size_t size;
// Cache the picture.
- if (!levelflat->picture)
+ if (!levelflat->mippic)
{
- levelflat->picture = Picture_PNGConvert(W_CacheLumpNum(levelflat->u.flat.lumpnum, PU_CACHE), PICFMT_FLAT, &pngwidth, &pngheight, NULL, NULL, W_LumpLength(levelflat->u.flat.lumpnum), NULL, 0);
+ INT32 pngwidth = 0, pngheight = 0;
+ void *pic = Picture_PNGConvert(W_CacheLumpNum(levelflat->u.flat.lumpnum, PU_CACHE), PICFMT_FLAT, &pngwidth, &pngheight, NULL, NULL, W_LumpLength(levelflat->u.flat.lumpnum), NULL, 0);
+
+ Z_ChangeTag(pic, PU_LEVEL);
+ Z_SetUser(pic, &levelflat->mippic);
+
levelflat->width = (UINT16)pngwidth;
levelflat->height = (UINT16)pngheight;
}
@@ -886,7 +952,7 @@ void HWR_GetLevelFlat(levelflat_t *levelflat)
// Make the mipmap.
if (mipmap == NULL)
{
- mipmap = Z_Calloc(sizeof(GLMipmap_t), PU_LEVEL, NULL);
+ mipmap = Z_Calloc(sizeof(GLMipmap_t), PU_STATIC, NULL);
mipmap->format = GL_TEXFMT_P_8;
mipmap->flags = TF_WRAPXY|TF_CHROMAKEYED;
levelflat->mipmap = mipmap;
@@ -894,106 +960,109 @@ void HWR_GetLevelFlat(levelflat_t *levelflat)
if (!mipmap->data && !mipmap->downloaded)
{
+ UINT8 *flat;
+ size_t size;
+
+ if (levelflat->mippic == NULL)
+ I_Error("HWR_GetLevelFlat: levelflat->mippic == NULL");
+
mipmap->width = levelflat->width;
mipmap->height = levelflat->height;
+
size = (mipmap->width * mipmap->height);
flat = Z_Malloc(size, PU_LEVEL, &mipmap->data);
- if (levelflat->picture == NULL)
- I_Error("HWR_GetLevelFlat: levelflat->picture == NULL");
- M_Memcpy(flat, levelflat->picture, size);
+ M_Memcpy(flat, levelflat->mippic, size);
}
// Tell the hardware driver to bind the current texture to the flat's mipmap
- HWD.pfnSetTexture(mipmap);
+ HWR_SetCurrentTexture(mipmap);
}
#endif
else // set no texture
HWR_SetCurrentTexture(NULL);
}
-//
-// HWR_LoadMappedPatch(): replace the skin color of the sprite in cache
-// : load it first in doom cache if not already
-//
-static void HWR_LoadMappedPatch(GLMipmap_t *grmip, GLPatch_t *gpatch)
+// --------------------+
+// HWR_LoadPatchMipmap : Generates a patch into a mipmap, usually the mipmap inside the patch itself
+// --------------------+
+static void HWR_LoadPatchMipmap(patch_t *patch, GLMipmap_t *grMipmap)
{
- if (!grmip->downloaded && !grmip->data)
- {
- patch_t *patch = gpatch->rawpatch;
- if (!patch)
- patch = W_CacheLumpNumPwad(gpatch->wadnum, gpatch->lumpnum, PU_STATIC);
- HWR_MakePatch(patch, gpatch, grmip, true);
-
- // You can't free rawpatch for some reason?
- // (Obviously I can't, sprite rotation needs that...)
- if (!gpatch->rawpatch)
- Z_Free(patch);
- }
+ GLPatch_t *grPatch = patch->hardware;
+ if (!grMipmap->downloaded && !grMipmap->data)
+ HWR_MakePatch(patch, grPatch, grMipmap, true);
// If hardware does not have the texture, then call pfnSetTexture to upload it
- if (!grmip->downloaded)
- HWD.pfnSetTexture(grmip);
-
- HWR_SetCurrentTexture(grmip);
+ if (!grMipmap->downloaded)
+ HWD.pfnSetTexture(grMipmap);
+ HWR_SetCurrentTexture(grMipmap);
// The system-memory data can be purged now.
- Z_ChangeTag(grmip->data, PU_HWRCACHE_UNLOCKED);
+ Z_ChangeTag(grMipmap->data, PU_HWRCACHE_UNLOCKED);
}
-// -----------------+
-// HWR_GetPatch : Download a patch to the hardware cache and make it ready for use
-// -----------------+
-void HWR_GetPatch(GLPatch_t *gpatch)
+// ----------------------+
+// HWR_UpdatePatchMipmap : Updates a mipmap.
+// ----------------------+
+static void HWR_UpdatePatchMipmap(patch_t *patch, GLMipmap_t *grMipmap)
{
- // is it in hardware cache
- if (!gpatch->mipmap->downloaded && !gpatch->mipmap->data)
- {
- // load the software patch, PU_STATIC or the Z_Malloc for hardware patch will
- // flush the software patch before the conversion! oh yeah I suffered
- patch_t *ptr = gpatch->rawpatch;
- if (!ptr)
- ptr = W_CacheLumpNumPwad(gpatch->wadnum, gpatch->lumpnum, PU_STATIC);
- HWR_MakePatch(ptr, gpatch, gpatch->mipmap, true);
-
- // this is inefficient.. but the hardware patch in heap is purgeable so it should
- // not fragment memory, and besides the REAL cache here is the hardware memory
- if (!gpatch->rawpatch)
- Z_Free(ptr);
- }
+ GLPatch_t *grPatch = patch->hardware;
+ HWR_MakePatch(patch, grPatch, grMipmap, true);
// If hardware does not have the texture, then call pfnSetTexture to upload it
- if (!gpatch->mipmap->downloaded)
- HWD.pfnSetTexture(gpatch->mipmap);
-
- HWR_SetCurrentTexture(gpatch->mipmap);
+ // If it does have the texture, then call pfnUpdateTexture to update it
+ if (!grMipmap->downloaded)
+ HWD.pfnSetTexture(grMipmap);
+ else
+ HWD.pfnUpdateTexture(grMipmap);
+ HWR_SetCurrentTexture(grMipmap);
- // The system-memory patch data can be purged now.
- Z_ChangeTag(gpatch->mipmap->data, PU_HWRCACHE_UNLOCKED);
+ // The system-memory data can be purged now.
+ Z_ChangeTag(grMipmap->data, PU_HWRCACHE_UNLOCKED);
}
+// -----------------+
+// HWR_GetPatch : Downloads a patch to the hardware cache and make it ready for use
+// -----------------+
+void HWR_GetPatch(patch_t *patch)
+{
+ if (!patch->hardware)
+ Patch_CreateGL(patch);
+ HWR_LoadPatchMipmap(patch, ((GLPatch_t *)patch->hardware)->mipmap);
+}
// -------------------+
// HWR_GetMappedPatch : Same as HWR_GetPatch for sprite color
// -------------------+
-void HWR_GetMappedPatch(GLPatch_t *gpatch, const UINT8 *colormap)
+void HWR_GetMappedPatch(patch_t *patch, const UINT8 *colormap)
{
- GLMipmap_t *grmip, *newmip;
+ GLPatch_t *grPatch;
+ GLMipmap_t *grMipmap, *newMipmap;
+
+ if (!patch->hardware)
+ Patch_CreateGL(patch);
+ grPatch = patch->hardware;
if (colormap == colormaps || colormap == NULL)
{
- // Load the default (green) color in doom cache (temporary?) AND hardware cache
- HWR_GetPatch(gpatch);
+ // Load the default (green) color in hardware cache
+ HWR_GetPatch(patch);
return;
}
- // search for the mimmap
+ // search for the mipmap
// skip the first (no colormap translated)
- for (grmip = gpatch->mipmap; grmip->nextcolormap; )
+ for (grMipmap = grPatch->mipmap; grMipmap->nextcolormap; )
{
- grmip = grmip->nextcolormap;
- if (grmip->colormap == colormap)
+ grMipmap = grMipmap->nextcolormap;
+ if (grMipmap->colormap && grMipmap->colormap->source == colormap)
{
- HWR_LoadMappedPatch(grmip, gpatch);
+ if (memcmp(grMipmap->colormap->data, colormap, 256 * sizeof(UINT8)))
+ {
+ M_Memcpy(grMipmap->colormap->data, colormap, 256 * sizeof(UINT8));
+ HWR_UpdatePatchMipmap(patch, grMipmap);
+ }
+ else
+ HWR_LoadPatchMipmap(patch, grMipmap);
return;
}
}
@@ -1002,15 +1071,18 @@ void HWR_GetMappedPatch(GLPatch_t *gpatch, const UINT8 *colormap)
//BP: WARNING: don't free it manually without clearing the cache of harware renderer
// (it have a liste of mipmap)
- // this malloc is cleared in HWR_FreeTextureCache
+ // this malloc is cleared in HWR_FreeColormapCache
// (...) unfortunately z_malloc fragment alot the memory :(so malloc is better
- newmip = calloc(1, sizeof (*newmip));
- if (newmip == NULL)
+ newMipmap = calloc(1, sizeof (*newMipmap));
+ if (newMipmap == NULL)
I_Error("%s: Out of memory", "HWR_GetMappedPatch");
- grmip->nextcolormap = newmip;
+ grMipmap->nextcolormap = newMipmap;
- newmip->colormap = colormap;
- HWR_LoadMappedPatch(newmip, gpatch);
+ newMipmap->colormap = Z_Calloc(sizeof(*newMipmap->colormap), PU_HWRPATCHCOLMIPMAP, NULL);
+ newMipmap->colormap->source = colormap;
+ M_Memcpy(newMipmap->colormap->data, colormap, 256 * sizeof(UINT8));
+
+ HWR_LoadPatchMipmap(patch, newMipmap);
}
void HWR_UnlockCachedPatch(GLPatch_t *gpatch)
@@ -1019,7 +1091,6 @@ void HWR_UnlockCachedPatch(GLPatch_t *gpatch)
return;
Z_ChangeTag(gpatch->mipmap->data, PU_HWRCACHE_UNLOCKED);
- Z_ChangeTag(gpatch, PU_HWRPATCHINFO_UNLOCKED);
}
static const INT32 picmode2GR[] =
@@ -1100,79 +1171,73 @@ static void HWR_DrawPicInCache(UINT8 *block, INT32 pblockwidth, INT32 pblockheig
// HWR_GetPic : Download a Doom pic (raw row encoded with no 'holes')
// Returns :
// -----------------+
-GLPatch_t *HWR_GetPic(lumpnum_t lumpnum)
+patch_t *HWR_GetPic(lumpnum_t lumpnum)
{
- GLPatch_t *grpatch = HWR_GetCachedGLPatch(lumpnum);
- if (!grpatch->mipmap->downloaded && !grpatch->mipmap->data)
+ patch_t *patch = HWR_GetCachedGLPatch(lumpnum);
+ GLPatch_t *grPatch = (GLPatch_t *)(patch->hardware);
+
+ if (!grPatch->mipmap->downloaded && !grPatch->mipmap->data)
{
pic_t *pic;
UINT8 *block;
size_t len;
pic = W_CacheLumpNum(lumpnum, PU_CACHE);
- grpatch->width = SHORT(pic->width);
- grpatch->height = SHORT(pic->height);
+ patch->width = SHORT(pic->width);
+ patch->height = SHORT(pic->height);
len = W_LumpLength(lumpnum) - sizeof (pic_t);
- grpatch->leftoffset = 0;
- grpatch->topoffset = 0;
-
- grpatch->mipmap->width = (UINT16)grpatch->width;
- grpatch->mipmap->height = (UINT16)grpatch->height;
+ grPatch->mipmap->width = (UINT16)patch->width;
+ grPatch->mipmap->height = (UINT16)patch->height;
if (pic->mode == PALETTE)
- grpatch->mipmap->format = textureformat; // can be set by driver
+ grPatch->mipmap->format = textureformat; // can be set by driver
else
- grpatch->mipmap->format = picmode2GR[pic->mode];
+ grPatch->mipmap->format = picmode2GR[pic->mode];
- Z_Free(grpatch->mipmap->data);
+ Z_Free(grPatch->mipmap->data);
// allocate block
- block = MakeBlock(grpatch->mipmap);
+ block = MakeBlock(grPatch->mipmap);
- if (grpatch->width == SHORT(pic->width) &&
- grpatch->height == SHORT(pic->height) &&
- format2bpp(grpatch->mipmap->format) == format2bpp(picmode2GR[pic->mode]))
+ if (patch->width == SHORT(pic->width) &&
+ patch->height == SHORT(pic->height) &&
+ format2bpp(grPatch->mipmap->format) == format2bpp(picmode2GR[pic->mode]))
{
// no conversion needed
- M_Memcpy(grpatch->mipmap->data, pic->data,len);
+ M_Memcpy(grPatch->mipmap->data, pic->data,len);
}
else
HWR_DrawPicInCache(block, SHORT(pic->width), SHORT(pic->height),
- SHORT(pic->width)*format2bpp(grpatch->mipmap->format),
+ SHORT(pic->width)*format2bpp(grPatch->mipmap->format),
pic,
- format2bpp(grpatch->mipmap->format));
+ format2bpp(grPatch->mipmap->format));
Z_Unlock(pic);
Z_ChangeTag(block, PU_HWRCACHE_UNLOCKED);
- grpatch->mipmap->flags = 0;
- grpatch->max_s = grpatch->max_t = 1.0f;
+ grPatch->mipmap->flags = 0;
+ grPatch->max_s = grPatch->max_t = 1.0f;
}
- HWD.pfnSetTexture(grpatch->mipmap);
- //CONS_Debug(DBG_RENDER, "picloaded at %x as texture %d\n",grpatch->mipmap.data, grpatch->mipmap.downloaded);
+ HWD.pfnSetTexture(grPatch->mipmap);
+ //CONS_Debug(DBG_RENDER, "picloaded at %x as texture %d\n",grPatch->mipmap->data, grPatch->mipmap->downloaded);
- return grpatch;
+ return patch;
}
-GLPatch_t *HWR_GetCachedGLPatchPwad(UINT16 wadnum, UINT16 lumpnum)
+patch_t *HWR_GetCachedGLPatchPwad(UINT16 wadnum, UINT16 lumpnum)
{
- aatree_t *hwrcache = wadfiles[wadnum]->hwrcache;
- GLPatch_t *grpatch;
-
- if (!(grpatch = M_AATreeGet(hwrcache, lumpnum)))
+ lumpcache_t *lumpcache = wadfiles[wadnum]->patchcache;
+ if (!lumpcache[lumpnum])
{
- grpatch = Z_Calloc(sizeof(GLPatch_t), PU_HWRPATCHINFO, NULL);
- grpatch->wadnum = wadnum;
- grpatch->lumpnum = lumpnum;
- grpatch->mipmap = Z_Calloc(sizeof(GLMipmap_t), PU_HWRPATCHINFO, NULL);
- M_AATreeSet(hwrcache, lumpnum, grpatch);
+ void *ptr = Z_Calloc(sizeof(patch_t), PU_PATCH, &lumpcache[lumpnum]);
+ Patch_Create(NULL, 0, ptr);
+ Patch_AllocateHardwarePatch(ptr);
}
-
- return grpatch;
+ return (patch_t *)(lumpcache[lumpnum]);
}
-GLPatch_t *HWR_GetCachedGLPatch(lumpnum_t lumpnum)
+patch_t *HWR_GetCachedGLPatch(lumpnum_t lumpnum)
{
return HWR_GetCachedGLPatchPwad(WADFILENUM(lumpnum),LUMPNUM(lumpnum));
}
@@ -1192,8 +1257,8 @@ static void HWR_DrawFadeMaskInCache(GLMipmap_t *mipmap, INT32 pblockwidth, INT32
W_ReadLump(fademasklumpnum, Z_Malloc(W_LumpLength(fademasklumpnum),
PU_HWRCACHE, &flat));
- stepy = ((INT32)SHORT(fmheight)<<FRACBITS)/pblockheight;
- stepx = ((INT32)SHORT(fmwidth)<<FRACBITS)/pblockwidth;
+ stepy = ((INT32)fmheight<<FRACBITS)/pblockheight;
+ stepx = ((INT32)fmwidth<<FRACBITS)/pblockwidth;
posy = 0;
for (j = 0; j < pblockheight; j++)
{
@@ -1265,7 +1330,8 @@ static void HWR_CacheFadeMask(GLMipmap_t *grMipmap, lumpnum_t fademasklumpnum)
void HWR_GetFadeMask(lumpnum_t fademasklumpnum)
{
- GLMipmap_t *grmip = HWR_GetCachedGLPatch(fademasklumpnum)->mipmap;
+ patch_t *patch = HWR_GetCachedGLPatch(fademasklumpnum);
+ GLMipmap_t *grmip = ((GLPatch_t *)Patch_AllocateHardwarePatch(patch))->mipmap;
if (!grmip->downloaded && !grmip->data)
HWR_CacheFadeMask(grmip, fademasklumpnum);
diff --git a/src/hardware/hw_data.h b/src/hardware/hw_data.h
index e5477d7292b3701a4bb8966c19715c0cd508d881..7e56a14d0f71b9d575046ccb9877487169c3877d 100644
--- a/src/hardware/hw_data.h
+++ b/src/hardware/hw_data.h
@@ -39,59 +39,53 @@ typedef enum GLTextureFormat_e
GL_TEXFMT_ALPHA_INTENSITY_88 = 0x22,
} GLTextureFormat_t;
-// data holds the address of the graphics data cached in heap memory
-// NULL if the texture is not in Doom heap cache.
+// Colormap structure for mipmaps.
+struct GLColormap_s
+{
+ const UINT8 *source;
+ UINT8 data[256];
+};
+typedef struct GLColormap_s GLColormap_t;
+
+
+// Texture information (misleadingly named "mipmap" all over the code.)
+// The *data pointer holds the address of the graphics data cached in heap memory.
+// NULL if the texture is not in SRB2's heap cache.
struct GLMipmap_s
{
- //for TexDownloadMipMap
- GLTextureFormat_t format;
- void *data;
+ // for UpdateTexture
+ GLTextureFormat_t format;
+ void *data;
- UINT32 flags;
- UINT16 height;
- UINT16 width;
- UINT32 downloaded; // the dll driver have it in there cache ?
+ UINT32 flags;
+ UINT16 height;
+ UINT16 width;
+ UINT32 downloaded; // The GPU has this texture.
struct GLMipmap_s *nextcolormap;
- const UINT8 *colormap;
-
- // opengl
- struct GLMipmap_s *nextmipmap; // opengl : liste of all texture in opengl driver
+ struct GLColormap_s *colormap;
};
typedef struct GLMipmap_s GLMipmap_t;
//
-// Doom texture info, as cached for hardware rendering
+// Level textures, as cached for hardware rendering.
//
struct GLMapTexture_s
{
GLMipmap_t mipmap;
- float scaleX; //used for scaling textures on walls
+ float scaleX; // Used for scaling textures on walls
float scaleY;
};
typedef struct GLMapTexture_s GLMapTexture_t;
-// a cached patch as converted to hardware format, holding the original patch_t
-// header so that the existing code can retrieve ->width, ->height as usual
-// This is returned by W_CachePatchNum()/W_CachePatchName(), when rendermode
-// is 'render_opengl'. Else it returns the normal patch_t data.
-
+// Patch information for the hardware renderer.
struct GLPatch_s
{
- // the 4 first fields come right away from the original patch_t
- INT16 width;
- INT16 height;
- INT16 leftoffset; // pixels to the left of origin
- INT16 topoffset; // pixels below the origin
- //
- float max_s,max_t;
- UINT16 wadnum; // the software patch lump num for when the hardware patch
- UINT16 lumpnum; // was flushed, and we need to re-create it
- void *rawpatch; // :^)
- GLMipmap_t *mipmap;
-} ATTRPACK;
+ GLMipmap_t *mipmap; // Texture data. Allocated whenever the patch is.
+ float max_s, max_t;
+};
typedef struct GLPatch_s GLPatch_t;
#endif //_HWR_DATA_
diff --git a/src/hardware/hw_defs.h b/src/hardware/hw_defs.h
index a7f7acd22d21df314df0a3e7c41c63454bd3005f..8df9b8916b2e563d7c1eebb16511b222a636a312 100644
--- a/src/hardware/hw_defs.h
+++ b/src/hardware/hw_defs.h
@@ -1,7 +1,7 @@
// SONIC ROBO BLAST 2
//-----------------------------------------------------------------------------
// Copyright (C) 1998-2000 by DooM Legacy Team.
-// Copyright (C) 1999-2020 by Sonic Team Junior.
+// Copyright (C) 1999-2021 by Sonic Team Junior.
//
// This program is free software distributed under the
// terms of the GNU General Public License, version 2.
@@ -132,6 +132,43 @@ typedef struct
FLOAT t; // t texture ordinate (t over w)
} FOutVector;
+#ifdef GL_SHADERS
+// Predefined shader types
+enum
+{
+ SHADER_DEFAULT = 0,
+
+ SHADER_FLOOR,
+ SHADER_WALL,
+ SHADER_SPRITE,
+ SHADER_MODEL, SHADER_MODEL_LIGHTING,
+ SHADER_WATER,
+ SHADER_FOG,
+ SHADER_SKY,
+
+ NUMBASESHADERS,
+};
+
+// Maximum amount of shader programs
+// Must be higher than NUMBASESHADERS
+#define HWR_MAXSHADERS 16
+
+// Shader sources (vertex and fragment)
+typedef struct
+{
+ char *vertex;
+ char *fragment;
+} shadersource_t;
+
+// Custom shader reference table
+typedef struct
+{
+ const char *type;
+ INT32 id;
+} customshaderxlat_t;
+
+#endif
+
typedef struct vbo_vertex_s
{
float x, y, z;
@@ -175,35 +212,32 @@ typedef struct
// You pass a combination of these flags to DrawPolygon()
enum EPolyFlags
{
- // the first 5 are mutually exclusive
-
- PF_Masked = 0x00000001, // Poly is alpha scaled and 0 alpha pels are discarded (holes in texture)
+ // Mutually exclusive blend flags
+ PF_Masked = 0x00000001, // Poly is alpha scaled and 0 alpha pixels are discarded (holes in texture)
PF_Translucent = 0x00000002, // Poly is transparent, alpha = level of transparency
- PF_Additive = 0x00000004, // Poly is added to the frame buffer
- PF_Environment = 0x00000008, // Poly should be drawn environment mapped.
- // Hurdler: used for text drawing
- PF_Substractive = 0x00000010, // for splat
- PF_NoAlphaTest = 0x00000020, // hiden param
- PF_Fog = 0x00000040, // Fog blocks
- PF_Blending = (PF_Environment|PF_Additive|PF_Translucent|PF_Masked|PF_Substractive|PF_Fog)&~PF_NoAlphaTest,
-
- // other flag bits
-
- PF_Occlude = 0x00000100, // Update the depth buffer
- PF_NoDepthTest = 0x00000200, // Disable the depth test mode
- PF_Invisible = 0x00000400, // Disable write to color buffer
- PF_Decal = 0x00000800, // Enable polygon offset
- PF_Modulated = 0x00001000, // Modulation (multiply output with constant ARGB)
+ PF_Environment = 0x00000004, // Poly should be drawn environment mapped. (Hurdler: used for text drawing)
+ PF_Additive = 0x00000008, // Source blending factor is additive.
+ PF_Subtractive = 0x00000010, // Subtractive color blending
+ PF_ReverseSubtract = 0x00000020, // Reverse subtract, used in wall splats (decals)
+ PF_Multiplicative = 0x00000040, // Multiplicative color blending
+ PF_Fog = 0x20000000, // Fog blocks
+ PF_NoAlphaTest = 0x40000000, // Disables alpha testing
+ PF_Blending = (PF_Masked|PF_Translucent|PF_Environment|PF_Additive|PF_Subtractive|PF_ReverseSubtract|PF_Multiplicative|PF_Fog) & ~PF_NoAlphaTest,
+
+ // other flag bits
+ PF_Occlude = 0x00000100, // Updates the depth buffer
+ PF_NoDepthTest = 0x00000200, // Disables the depth test mode
+ PF_Invisible = 0x00000400, // Disables write to color buffer
+ PF_Decal = 0x00000800, // Enables polygon offset
+ PF_Modulated = 0x00001000, // Modulation (multiply output with constant RGBA)
// When set, pass the color constant into the FSurfaceInfo -> PolyColor
- PF_NoTexture = 0x00002000, // Use the small white texture
- PF_Corona = 0x00004000, // Tell the rendrer we are drawing a corona
- PF_Ripple = 0x00008000, // Water shader effect
- PF_RemoveYWrap = 0x00010000, // Force clamp texture on Y
- PF_ForceWrapX = 0x00020000, // Force repeat texture on X
- PF_ForceWrapY = 0x00040000, // Force repeat texture on Y
- PF_Clip = 0x40000000, // clip to frustum and nearz plane (glide only, automatic in opengl)
- PF_NoZClip = 0x20000000, // in conjonction with PF_Clip
- PF_Debug = 0x80000000 // print debug message in driver :)
+ PF_NoTexture = 0x00002000, // Disables texturing
+ PF_Corona = 0x00004000, // Tells the renderer we are drawing a corona
+ PF_ColorMapped = 0x00008000, // Surface has "tint" and "fade" colors, which are sent as uniforms to a shader.
+ PF_RemoveYWrap = 0x00010000, // Forces clamp texture on Y
+ PF_ForceWrapX = 0x00020000, // Forces repeat texture on X
+ PF_ForceWrapY = 0x00040000, // Forces repeat texture on Y
+ PF_Ripple = 0x00100000 // Water ripple effect. The current backend doesn't use it for anything.
};
@@ -221,9 +255,17 @@ enum ETextureFlags
TF_TRANSPARENT = 0x00000040, // texture with some alpha == 0
};
-typedef struct GLMipmap_s FTextureInfo;
+struct FTextureInfo
+{
+ UINT32 width, height;
+ UINT32 downloaded;
+ UINT32 format;
+
+ struct GLMipmap_s *texture;
+ struct FTextureInfo *prev, *next;
+};
+typedef struct FTextureInfo FTextureInfo;
-// jimita 14032019
struct FLightInfo
{
FUINT light_level;
@@ -239,7 +281,7 @@ struct FSurfaceInfo
RGBA_t PolyColor;
RGBA_t TintColor;
RGBA_t FadeColor;
- FLightInfo LightInfo; // jimita 14032019
+ FLightInfo LightInfo;
};
typedef struct FSurfaceInfo FSurfaceInfo;
@@ -258,6 +300,16 @@ enum hwdsetspecialstate
typedef enum hwdsetspecialstate hwdspecialstate_t;
+// Lactozilla: Shader options
+enum hwdshaderoption
+{
+ HWD_SHADEROPTION_OFF,
+ HWD_SHADEROPTION_ON,
+ HWD_SHADEROPTION_NOCUSTOM,
+};
+
+typedef enum hwdshaderoption hwdshaderoption_t;
+
// Lactozilla: Shader info
// Generally set at the start of the frame.
enum hwdshaderinfo
diff --git a/src/hardware/hw_draw.c b/src/hardware/hw_draw.c
index f5a984d5d3a23ed3bd80d4d7e690bcba8d42422c..ba4923d10e76149cf0dd088aa7633db43e4a8ff0 100644
--- a/src/hardware/hw_draw.c
+++ b/src/hardware/hw_draw.c
@@ -68,10 +68,11 @@ static UINT8 softwaretranstogl_lo[11] = { 0, 12, 24, 36, 48, 60, 71, 83, 95,111
// Notes : x,y : positions relative to the original Doom resolution
// : textes(console+score) + menus + status bar
// -----------------+
-void HWR_DrawPatch(GLPatch_t *gpatch, INT32 x, INT32 y, INT32 option)
+void HWR_DrawPatch(patch_t *gpatch, INT32 x, INT32 y, INT32 option)
{
FOutVector v[4];
FBITFIELD flags;
+ GLPatch_t *hwrPatch;
// 3--2
// | /|
@@ -84,6 +85,7 @@ void HWR_DrawPatch(GLPatch_t *gpatch, INT32 x, INT32 y, INT32 option)
// make patch ready in hardware cache
HWR_GetPatch(gpatch);
+ hwrPatch = ((GLPatch_t *)gpatch->hardware);
switch (option & V_SCALEPATCHMASK)
{
@@ -103,17 +105,17 @@ void HWR_DrawPatch(GLPatch_t *gpatch, INT32 x, INT32 y, INT32 option)
if (option & V_NOSCALESTART)
sdupx = sdupy = 2.0f;
- v[0].x = v[3].x = (x*sdupx-SHORT(gpatch->leftoffset)*pdupx)/vid.width - 1;
- v[2].x = v[1].x = (x*sdupx+(SHORT(gpatch->width)-SHORT(gpatch->leftoffset))*pdupx)/vid.width - 1;
- v[0].y = v[1].y = 1-(y*sdupy-SHORT(gpatch->topoffset)*pdupy)/vid.height;
- v[2].y = v[3].y = 1-(y*sdupy+(SHORT(gpatch->height)-SHORT(gpatch->topoffset))*pdupy)/vid.height;
+ v[0].x = v[3].x = (x*sdupx-(gpatch->leftoffset)*pdupx)/vid.width - 1;
+ v[2].x = v[1].x = (x*sdupx+(gpatch->width-gpatch->leftoffset)*pdupx)/vid.width - 1;
+ v[0].y = v[1].y = 1-(y*sdupy-(gpatch->topoffset)*pdupy)/vid.height;
+ v[2].y = v[3].y = 1-(y*sdupy+(gpatch->height-gpatch->topoffset)*pdupy)/vid.height;
v[0].z = v[1].z = v[2].z = v[3].z = 1.0f;
v[0].s = v[3].s = 0.0f;
- v[2].s = v[1].s = gpatch->max_s;
+ v[2].s = v[1].s = hwrPatch->max_s;
v[0].t = v[1].t = 0.0f;
- v[2].t = v[3].t = gpatch->max_t;
+ v[2].t = v[3].t = hwrPatch->max_t;
flags = PF_Translucent|PF_NoDepthTest;
@@ -126,13 +128,14 @@ void HWR_DrawPatch(GLPatch_t *gpatch, INT32 x, INT32 y, INT32 option)
HWD.pfnDrawPolygon(NULL, v, 4, flags);
}
-void HWR_DrawStretchyFixedPatch(GLPatch_t *gpatch, fixed_t x, fixed_t y, fixed_t pscale, fixed_t vscale, INT32 option, const UINT8 *colormap)
+void HWR_DrawStretchyFixedPatch(patch_t *gpatch, fixed_t x, fixed_t y, fixed_t pscale, fixed_t vscale, INT32 option, const UINT8 *colormap)
{
FOutVector v[4];
FBITFIELD flags;
float cx = FIXED_TO_FLOAT(x);
float cy = FIXED_TO_FLOAT(y);
UINT8 alphalevel = ((option & V_ALPHAMASK) >> V_ALPHASHIFT);
+ GLPatch_t *hwrPatch;
// 3--2
// | /|
@@ -151,6 +154,8 @@ void HWR_DrawStretchyFixedPatch(GLPatch_t *gpatch, fixed_t x, fixed_t y, fixed_t
else
HWR_GetMappedPatch(gpatch, colormap);
+ hwrPatch = ((GLPatch_t *)gpatch->hardware);
+
dupx = (float)vid.dupx;
dupy = (float)vid.dupy;
@@ -181,13 +186,13 @@ void HWR_DrawStretchyFixedPatch(GLPatch_t *gpatch, fixed_t x, fixed_t y, fixed_t
// left offset
if (option & V_FLIP)
- offsetx = (float)(SHORT(gpatch->width) - SHORT(gpatch->leftoffset)) * fscalew;
+ offsetx = (float)(gpatch->width - gpatch->leftoffset) * fscalew;
else
- offsetx = (float)SHORT(gpatch->leftoffset) * fscalew;
+ offsetx = (float)(gpatch->leftoffset) * fscalew;
// top offset
// TODO: make some kind of vertical version of V_FLIP, maybe by deprecating V_OFFSET in future?!?
- offsety = (float)SHORT(gpatch->topoffset) * fscaleh;
+ offsety = (float)(gpatch->topoffset) * fscaleh;
if ((option & (V_NOSCALESTART|V_OFFSET)) == (V_NOSCALESTART|V_OFFSET)) // Multiply by dupx/dupy for crosshairs
{
@@ -277,17 +282,14 @@ void HWR_DrawStretchyFixedPatch(GLPatch_t *gpatch, fixed_t x, fixed_t y, fixed_t
// if it's meant to cover the whole screen, black out the rest (ONLY IF TOP LEFT ISN'T TRANSPARENT)
// cx and cy are possibly *slightly* off from float maths
// This is done before here compared to software because we directly alter cx and cy to centre
- if (cx >= -0.1f && cx <= 0.1f && SHORT(gpatch->width) == BASEVIDWIDTH && cy >= -0.1f && cy <= 0.1f && SHORT(gpatch->height) == BASEVIDHEIGHT)
+ if (cx >= -0.1f && cx <= 0.1f && gpatch->width == BASEVIDWIDTH && cy >= -0.1f && cy <= 0.1f && gpatch->height == BASEVIDHEIGHT)
{
- // Need to temporarily cache the real patch to get the colour of the top left pixel
- patch_t *realpatch = W_CacheSoftwarePatchNumPwad(gpatch->wadnum, gpatch->lumpnum, PU_STATIC);
- const column_t *column = (const column_t *)((const UINT8 *)(realpatch) + LONG((realpatch)->columnofs[0]));
+ const column_t *column = (const column_t *)((const UINT8 *)(gpatch->columns) + (gpatch->columnofs[0]));
if (!column->topdelta)
{
const UINT8 *source = (const UINT8 *)(column) + 3;
HWR_DrawFill(0, 0, BASEVIDWIDTH, BASEVIDHEIGHT, (column->topdelta == 0xff ? 31 : source[0]));
}
- Z_Free(realpatch);
}
// centre screen
if (fabsf((float)vid.width - (float)BASEVIDWIDTH * dupx) > 1.0E-36f)
@@ -317,13 +319,13 @@ void HWR_DrawStretchyFixedPatch(GLPatch_t *gpatch, fixed_t x, fixed_t y, fixed_t
if (pscale != FRACUNIT || (splitscreen && option & V_PERPLAYER))
{
- fwidth = (float)SHORT(gpatch->width) * fscalew * dupx;
- fheight = (float)SHORT(gpatch->height) * fscaleh * dupy;
+ fwidth = (float)(gpatch->width) * fscalew * dupx;
+ fheight = (float)(gpatch->height) * fscaleh * dupy;
}
else
{
- fwidth = (float)SHORT(gpatch->width) * dupx;
- fheight = (float)SHORT(gpatch->height) * dupy;
+ fwidth = (float)(gpatch->width) * dupx;
+ fheight = (float)(gpatch->height) * dupy;
}
// positions of the cx, cy, are between 0 and vid.width/vid.height now, we need them to be between -1 and 1
@@ -345,17 +347,17 @@ void HWR_DrawStretchyFixedPatch(GLPatch_t *gpatch, fixed_t x, fixed_t y, fixed_t
if (option & V_FLIP)
{
- v[0].s = v[3].s = gpatch->max_s;
+ v[0].s = v[3].s = hwrPatch->max_s;
v[2].s = v[1].s = 0.0f;
}
else
{
v[0].s = v[3].s = 0.0f;
- v[2].s = v[1].s = gpatch->max_s;
+ v[2].s = v[1].s = hwrPatch->max_s;
}
v[0].t = v[1].t = 0.0f;
- v[2].t = v[3].t = gpatch->max_t;
+ v[2].t = v[3].t = hwrPatch->max_t;
flags = PF_Translucent|PF_NoDepthTest;
@@ -380,13 +382,14 @@ void HWR_DrawStretchyFixedPatch(GLPatch_t *gpatch, fixed_t x, fixed_t y, fixed_t
HWD.pfnDrawPolygon(NULL, v, 4, flags);
}
-void HWR_DrawCroppedPatch(GLPatch_t *gpatch, fixed_t x, fixed_t y, fixed_t pscale, INT32 option, fixed_t sx, fixed_t sy, fixed_t w, fixed_t h)
+void HWR_DrawCroppedPatch(patch_t *gpatch, fixed_t x, fixed_t y, fixed_t pscale, INT32 option, fixed_t sx, fixed_t sy, fixed_t w, fixed_t h)
{
FOutVector v[4];
FBITFIELD flags;
float cx = FIXED_TO_FLOAT(x);
float cy = FIXED_TO_FLOAT(y);
UINT8 alphalevel = ((option & V_ALPHAMASK) >> V_ALPHASHIFT);
+ GLPatch_t *hwrPatch;
// 3--2
// | /|
@@ -399,6 +402,7 @@ void HWR_DrawCroppedPatch(GLPatch_t *gpatch, fixed_t x, fixed_t y, fixed_t pscal
// make patch ready in hardware cache
HWR_GetPatch(gpatch);
+ hwrPatch = ((GLPatch_t *)gpatch->hardware);
dupx = (float)vid.dupx;
dupy = (float)vid.dupy;
@@ -423,8 +427,8 @@ void HWR_DrawCroppedPatch(GLPatch_t *gpatch, fixed_t x, fixed_t y, fixed_t pscal
// fuck it, no GL support for croppedpatch v_perplayer right now. it's not like it's accessible to Lua or anything, and we only use it for menus...
- cy -= (float)SHORT(gpatch->topoffset) * fscale;
- cx -= (float)SHORT(gpatch->leftoffset) * fscale;
+ cy -= (float)(gpatch->topoffset) * fscale;
+ cx -= (float)(gpatch->leftoffset) * fscale;
if (!(option & V_NOSCALESTART))
{
@@ -433,21 +437,9 @@ void HWR_DrawCroppedPatch(GLPatch_t *gpatch, fixed_t x, fixed_t y, fixed_t pscal
if (!(option & V_SCALEPATCHMASK))
{
- // if it's meant to cover the whole screen, black out the rest (ONLY IF TOP LEFT ISN'T TRANSPARENT)
- // cx and cy are possibly *slightly* off from float maths
- // This is done before here compared to software because we directly alter cx and cy to centre
- if (cx >= -0.1f && cx <= 0.1f && SHORT(gpatch->width) == BASEVIDWIDTH && cy >= -0.1f && cy <= 0.1f && SHORT(gpatch->height) == BASEVIDHEIGHT)
- {
- // Need to temporarily cache the real patch to get the colour of the top left pixel
- patch_t *realpatch = W_CacheSoftwarePatchNumPwad(gpatch->wadnum, gpatch->lumpnum, PU_STATIC);
- const column_t *column = (const column_t *)((const UINT8 *)(realpatch) + LONG((realpatch)->columnofs[0]));
- if (!column->topdelta)
- {
- const UINT8 *source = (const UINT8 *)(column) + 3;
- HWR_DrawFill(0, 0, BASEVIDWIDTH, BASEVIDHEIGHT, (column->topdelta == 0xff ? 31 : source[0]));
- }
- Z_Free(realpatch);
- }
+ // if it's meant to cover the whole screen, black out the rest
+ // no the patch is cropped do not do this ever
+
// centre screen
if (fabsf((float)vid.width - (float)BASEVIDWIDTH * dupx) > 1.0E-36f)
{
@@ -469,11 +461,11 @@ void HWR_DrawCroppedPatch(GLPatch_t *gpatch, fixed_t x, fixed_t y, fixed_t pscal
fwidth = w;
fheight = h;
- if (fwidth > SHORT(gpatch->width))
- fwidth = SHORT(gpatch->width);
+ if (sx + w > gpatch->width)
+ fwidth = gpatch->width - sx;
- if (fheight > SHORT(gpatch->height))
- fheight = SHORT(gpatch->height);
+ if (sy + h > gpatch->height)
+ fheight = gpatch->height - sy;
if (pscale != FRACUNIT)
{
@@ -503,17 +495,17 @@ void HWR_DrawCroppedPatch(GLPatch_t *gpatch, fixed_t x, fixed_t y, fixed_t pscal
v[0].z = v[1].z = v[2].z = v[3].z = 1.0f;
- v[0].s = v[3].s = ((sx )/(float)SHORT(gpatch->width) )*gpatch->max_s;
- if (sx + w > SHORT(gpatch->width))
- v[2].s = v[1].s = gpatch->max_s;
+ v[0].s = v[3].s = ((sx)/(float)(gpatch->width))*hwrPatch->max_s;
+ if (sx + w > gpatch->width)
+ v[2].s = v[1].s = hwrPatch->max_s;
else
- v[2].s = v[1].s = ((sx+w)/(float)SHORT(gpatch->width) )*gpatch->max_s;
+ v[2].s = v[1].s = ((sx+w)/(float)(gpatch->width))*hwrPatch->max_s;
- v[0].t = v[1].t = ((sy )/(float)SHORT(gpatch->height))*gpatch->max_t;
- if (sy + h > SHORT(gpatch->height))
- v[2].t = v[3].t = gpatch->max_t;
+ v[0].t = v[1].t = ((sy)/(float)(gpatch->height))*hwrPatch->max_t;
+ if (sy + h > gpatch->height)
+ v[2].t = v[3].t = hwrPatch->max_t;
else
- v[2].t = v[3].t = ((sy+h)/(float)SHORT(gpatch->height))*gpatch->max_t;
+ v[2].t = v[3].t = ((sy+h)/(float)(gpatch->height))*hwrPatch->max_t;
flags = PF_Translucent|PF_NoDepthTest;
@@ -541,7 +533,7 @@ void HWR_DrawCroppedPatch(GLPatch_t *gpatch, fixed_t x, fixed_t y, fixed_t pscal
void HWR_DrawPic(INT32 x, INT32 y, lumpnum_t lumpnum)
{
FOutVector v[4];
- const GLPatch_t *patch;
+ const patch_t *patch;
// make pic ready in hardware cache
patch = HWR_GetPic(lumpnum);
@@ -558,10 +550,10 @@ void HWR_DrawPic(INT32 x, INT32 y, lumpnum_t lumpnum)
v[0].z = v[1].z = v[2].z = v[3].z = 1.0f;
- v[0].s = v[3].s = 0;
- v[2].s = v[1].s = patch->max_s;
- v[0].t = v[1].t = 0;
- v[2].t = v[3].t = patch->max_t;
+ v[0].s = v[3].s = 0;
+ v[2].s = v[1].s = ((GLPatch_t *)patch->hardware)->max_s;
+ v[0].t = v[1].t = 0;
+ v[2].t = v[3].t = ((GLPatch_t *)patch->hardware)->max_t;
//Hurdler: Boris, the same comment as above... but maybe for pics
@@ -570,7 +562,7 @@ void HWR_DrawPic(INT32 x, INT32 y, lumpnum_t lumpnum)
// But then, the question is: why not 0 instead of PF_Masked ?
// or maybe PF_Environment ??? (like what I said above)
// BP: PF_Environment don't change anything ! and 0 is undifined
- HWD.pfnDrawPolygon(NULL, v, 4, PF_Translucent | PF_NoDepthTest | PF_Clip | PF_NoZClip);
+ HWD.pfnDrawPolygon(NULL, v, 4, PF_Translucent | PF_NoDepthTest);
}
// ==========================================================================
@@ -638,7 +630,7 @@ void HWR_DrawFlatFill (INT32 x, INT32 y, INT32 w, INT32 h, lumpnum_t flatlumpnum
v[0].t = v[1].t = (float)((y & flatflag)/dflatsize);
v[2].t = v[3].t = (float)(v[0].t + h/dflatsize);
- HWR_LiterallyGetFlat(flatlumpnum);
+ HWR_GetRawFlat(flatlumpnum);
//Hurdler: Boris, the same comment as above... but maybe for pics
// it not a problem since they don't have any transparent pixel
@@ -934,7 +926,7 @@ void HWR_DrawViewBorder(INT32 clearlines)
INT32 top, side;
INT32 baseviewwidth, baseviewheight;
INT32 basewindowx, basewindowy;
- GLPatch_t *patch;
+ patch_t *patch;
// if (gl_viewwidth == vid.width)
// return;
diff --git a/src/hardware/hw_drv.h b/src/hardware/hw_drv.h
index 4023e3062c6a4cc569f2e1de397f7fa5fc16386f..8cae144ff81fdb2ca5ee53deea1e9c1fc8cc8531 100644
--- a/src/hardware/hw_drv.h
+++ b/src/hardware/hw_drv.h
@@ -40,8 +40,9 @@ EXPORT void HWRAPI(DrawIndexedTriangles) (FSurfaceInfo *pSurf, FOutVector *pOutV
EXPORT void HWRAPI(RenderSkyDome) (gl_sky_t *sky);
EXPORT void HWRAPI(SetBlend) (FBITFIELD PolyFlags);
EXPORT void HWRAPI(ClearBuffer) (FBOOLEAN ColorMask, FBOOLEAN DepthMask, FRGBAFloat *ClearColor);
-EXPORT void HWRAPI(SetTexture) (FTextureInfo *TexInfo);
-EXPORT void HWRAPI(UpdateTexture) (FTextureInfo *TexInfo);
+EXPORT void HWRAPI(SetTexture) (GLMipmap_t *TexInfo);
+EXPORT void HWRAPI(UpdateTexture) (GLMipmap_t *TexInfo);
+EXPORT void HWRAPI(DeleteTexture) (GLMipmap_t *TexInfo);
EXPORT void HWRAPI(ReadRect) (INT32 x, INT32 y, INT32 width, INT32 height, INT32 dst_stride, UINT16 *dst_data);
EXPORT void HWRAPI(GClipRect) (INT32 minx, INT32 miny, INT32 maxx, INT32 maxy, float nearclip);
EXPORT void HWRAPI(ClearMipMapCache) (void);
@@ -67,15 +68,13 @@ EXPORT void HWRAPI(DrawScreenFinalTexture) (int width, int height);
#define SCREENVERTS 10
EXPORT void HWRAPI(PostImgRedraw) (float points[SCREENVERTS][SCREENVERTS][2]);
-// jimita
-EXPORT boolean HWRAPI(LoadShaders) (void);
-EXPORT void HWRAPI(KillShaders) (void);
-EXPORT void HWRAPI(SetShader) (int shader);
+EXPORT boolean HWRAPI(CompileShaders) (void);
+EXPORT void HWRAPI(CleanShaders) (void);
+EXPORT void HWRAPI(SetShader) (int type);
EXPORT void HWRAPI(UnSetShader) (void);
EXPORT void HWRAPI(SetShaderInfo) (hwdshaderinfo_t info, INT32 value);
-EXPORT void HWRAPI(LoadCustomShader) (int number, char *shader, size_t size, boolean fragment);
-EXPORT boolean HWRAPI(InitCustomShaders) (void);
+EXPORT void HWRAPI(LoadCustomShader) (int number, char *code, size_t size, boolean isfragment);
// ==========================================================================
// HWR DRIVER OBJECT, FOR CLIENT PROGRAM
@@ -96,6 +95,7 @@ struct hwdriver_s
ClearBuffer pfnClearBuffer;
SetTexture pfnSetTexture;
UpdateTexture pfnUpdateTexture;
+ DeleteTexture pfnDeleteTexture;
ReadRect pfnReadRect;
GClipRect pfnGClipRect;
ClearMipMapCache pfnClearMipMapCache;
@@ -120,14 +120,13 @@ struct hwdriver_s
MakeScreenFinalTexture pfnMakeScreenFinalTexture;
DrawScreenFinalTexture pfnDrawScreenFinalTexture;
- LoadShaders pfnLoadShaders;
- KillShaders pfnKillShaders;
+ CompileShaders pfnCompileShaders;
+ CleanShaders pfnCleanShaders;
SetShader pfnSetShader;
UnSetShader pfnUnSetShader;
SetShaderInfo pfnSetShaderInfo;
LoadCustomShader pfnLoadCustomShader;
- InitCustomShaders pfnInitCustomShaders;
};
extern struct hwdriver_s hwdriver;
diff --git a/src/hardware/hw_glob.h b/src/hardware/hw_glob.h
index 6ede8448bf88cc6ee2b9a7083546e2b2e059e904..2aba622481d618a4e8f5d2d499e420e74123b9ce 100644
--- a/src/hardware/hw_glob.h
+++ b/src/hardware/hw_glob.h
@@ -62,19 +62,32 @@ typedef struct
typedef struct gl_vissprite_s
{
float x1, x2;
- float tz, ty;
+ float z1, z2;
+ float gz, gzt;
+
+ float tz;
float tracertz; // for MF2_LINKDRAW sprites, this contains tracer's tz for use in sorting
- //lumpnum_t patchlumpnum;
- GLPatch_t *gpatch;
- boolean flip;
- UINT8 translucency; //alpha level 0-255
- mobj_t *mobj; // NOTE: This is a precipmobj_t if precip is true !!! Watch out.
+
+ float scale;
+ float shadowheight, shadowscale;
+
+ float spritexscale, spriteyscale;
+ float spritexoffset, spriteyoffset;
+
+ UINT32 renderflags;
+ UINT8 rotateflags;
+
+ boolean flip, vflip;
boolean precip; // Tails 08-25-2002
- boolean vflip;
- //Hurdler: 25/04/2000: now support colormap in hardware mode
+ boolean rotated;
+ UINT8 translucency; //alpha level 0-255
+
+ //Hurdler: 25/04/2000: now support colormap in hardware mode
UINT8 *colormap;
INT32 dispoffset; // copy of info->dispoffset, affects ordering but not drawing
- float z1, z2;
+
+ patch_t *gpatch;
+ mobj_t *mobj; // NOTE: This is a precipmobj_t if precip is true !!! Watch out.
} gl_vissprite_t;
// --------
@@ -86,25 +99,36 @@ extern size_t addsubsector;
void HWR_InitPolyPool(void);
void HWR_FreePolyPool(void);
+void HWR_FreeExtraSubsectors(void);
+
// --------
// hw_cache.c
// --------
-void HWR_InitTextureCache(void);
-void HWR_FreeTextureCache(void);
-void HWR_FreeMipmapCache(void);
-void HWR_FreeExtraSubsectors(void);
+void HWR_InitMapTextures(void);
+void HWR_LoadMapTextures(size_t pnumtextures);
+void HWR_FreeMapTextures(void);
+
+patch_t *HWR_GetCachedGLPatchPwad(UINT16 wad, UINT16 lump);
+patch_t *HWR_GetCachedGLPatch(lumpnum_t lumpnum);
+
+void HWR_GetPatch(patch_t *patch);
+void HWR_GetMappedPatch(patch_t *patch, const UINT8 *colormap);
+void HWR_GetFadeMask(lumpnum_t fademasklumpnum);
+patch_t *HWR_GetPic(lumpnum_t lumpnum);
-void HWR_GetLevelFlat(levelflat_t *levelflat);
-void HWR_LiterallyGetFlat(lumpnum_t flatlumpnum);
GLMapTexture_t *HWR_GetTexture(INT32 tex);
-void HWR_GetPatch(GLPatch_t *gpatch);
-void HWR_GetMappedPatch(GLPatch_t *gpatch, const UINT8 *colormap);
+void HWR_GetLevelFlat(levelflat_t *levelflat);
+void HWR_GetRawFlat(lumpnum_t flatlumpnum);
+
+void HWR_FreeTexture(patch_t *patch);
+void HWR_FreeTextureData(patch_t *patch);
+void HWR_FreeTextureColormaps(patch_t *patch);
+void HWR_ClearAllTextures(void);
+void HWR_FreeColormapCache(void);
void HWR_UnlockCachedPatch(GLPatch_t *gpatch);
-GLPatch_t *HWR_GetPic(lumpnum_t lumpnum);
+
void HWR_SetPalette(RGBA_t *palette);
-GLPatch_t *HWR_GetCachedGLPatchPwad(UINT16 wad, UINT16 lump);
-GLPatch_t *HWR_GetCachedGLPatch(lumpnum_t lumpnum);
-void HWR_GetFadeMask(lumpnum_t fademasklumpnum);
+
// --------
// hw_draw.c
diff --git a/src/hardware/hw_light.c b/src/hardware/hw_light.c
index 32c2d550d4355b02b039bb2a8ee708b9afd17c51..e83d9a6ec025143150754ab6910afed140b4fdcd 100644
--- a/src/hardware/hw_light.c
+++ b/src/hardware/hw_light.c
@@ -1,7 +1,7 @@
// SONIC ROBO BLAST 2
//-----------------------------------------------------------------------------
// Copyright (C) 1998-2000 by DooM Legacy Team.
-// Copyright (C) 1999-2020 by Sonic Team Junior.
+// Copyright (C) 1999-2021 by Sonic Team Junior.
//
// This program is free software distributed under the
// terms of the GNU General Public License, version 2.
@@ -35,8 +35,7 @@
#define DL_HIGH_QUALITY
//#define STATICLIGHT //Hurdler: TODO!
-//#define LIGHTMAPFLAGS (PF_Masked|PF_Clip|PF_NoAlphaTest) // debug see overdraw
-#define LIGHTMAPFLAGS (PF_Modulated|PF_Additive|PF_Clip)
+#define LIGHTMAPFLAGS (PF_Modulated|PF_Additive)
#ifdef ALAM_LIGHTING
static dynlights_t view_dynlights[2]; // 2 players in splitscreen mode
@@ -254,6 +253,7 @@ light_t *t_lspr[NUMSPRITES] =
&lspr[NOLIGHT], // SPR_SIGN
&lspr[NOLIGHT], // SPR_SPIK
&lspr[NOLIGHT], // SPR_SFLM
+ &lspr[NOLIGHT], // SPR_TFLM
&lspr[NOLIGHT], // SPR_USPK
&lspr[NOLIGHT], // SPR_WSPK
&lspr[NOLIGHT], // SPR_WSPB
@@ -1056,7 +1056,7 @@ void HWR_DoCoronasLighting(FOutVector *outVerts, gl_vissprite_t *spr)
HWR_GetPic(coronalumpnum); /// \todo use different coronas
- HWD.pfnDrawPolygon (&Surf, light, 4, PF_Modulated | PF_Additive | PF_Clip | PF_Corona | PF_NoDepthTest);
+ HWD.pfnDrawPolygon (&Surf, light, 4, PF_Modulated | PF_Additive | PF_Corona | PF_NoDepthTest);
}
}
#endif
@@ -1144,7 +1144,7 @@ void HWR_DrawCoronas(void)
light[3].y = cy+size*1.33f;
light[3].s = 0.0f; light[3].t = 1.0f;
- HWD.pfnDrawPolygon (&Surf, light, 4, PF_Modulated | PF_Additive | PF_Clip | PF_NoDepthTest | PF_Corona);
+ HWD.pfnDrawPolygon (&Surf, light, 4, PF_Modulated | PF_Additive | PF_NoDepthTest | PF_Corona);
}
}
#endif
diff --git a/src/hardware/hw_main.c b/src/hardware/hw_main.c
index cbfcfff870e3ed4b181f989218d55e852bb8c0e2..e94c637e46ca7fb1f6e99463042e00d760944745 100644
--- a/src/hardware/hw_main.c
+++ b/src/hardware/hw_main.c
@@ -1,7 +1,7 @@
// SONIC ROBO BLAST 2
//-----------------------------------------------------------------------------
// Copyright (C) 1998-2000 by DooM Legacy Team.
-// Copyright (C) 1999-2020 by Sonic Team Junior.
+// Copyright (C) 1999-2021 by Sonic Team Junior.
//
// This program is free software distributed under the
// terms of the GNU General Public License, version 2.
@@ -25,6 +25,7 @@
#include "../p_local.h"
#include "../p_setup.h"
#include "../r_local.h"
+#include "../r_patch.h"
#include "../r_picformats.h"
#include "../r_bsp.h"
#include "../d_clisrv.h"
@@ -146,29 +147,37 @@ static angle_t gl_aimingangle;
static void HWR_SetTransformAiming(FTransform *trans, player_t *player, boolean skybox);
// Render stats
-int rs_hw_nodesorttime = 0;
-int rs_hw_nodedrawtime = 0;
-int rs_hw_spritesorttime = 0;
-int rs_hw_spritedrawtime = 0;
+precise_t ps_hw_skyboxtime = 0;
+precise_t ps_hw_nodesorttime = 0;
+precise_t ps_hw_nodedrawtime = 0;
+precise_t ps_hw_spritesorttime = 0;
+precise_t ps_hw_spritedrawtime = 0;
// Render stats for batching
-int rs_hw_numpolys = 0;
-int rs_hw_numverts = 0;
-int rs_hw_numcalls = 0;
-int rs_hw_numshaders = 0;
-int rs_hw_numtextures = 0;
-int rs_hw_numpolyflags = 0;
-int rs_hw_numcolors = 0;
-int rs_hw_batchsorttime = 0;
-int rs_hw_batchdrawtime = 0;
-
+int ps_hw_numpolys = 0;
+int ps_hw_numverts = 0;
+int ps_hw_numcalls = 0;
+int ps_hw_numshaders = 0;
+int ps_hw_numtextures = 0;
+int ps_hw_numpolyflags = 0;
+int ps_hw_numcolors = 0;
+precise_t ps_hw_batchsorttime = 0;
+precise_t ps_hw_batchdrawtime = 0;
+
+boolean gl_init = false;
+boolean gl_maploaded = false;
+boolean gl_sessioncommandsadded = false;
boolean gl_shadersavailable = true;
-
// ==========================================================================
// Lighting
// ==========================================================================
+static boolean HWR_UseShader(void)
+{
+ return (cv_glshaders.value && gl_shadersavailable);
+}
+
void HWR_Lighting(FSurfaceInfo *Surface, INT32 light_level, extracolormap_t *colormap)
{
RGBA_t poly_color, tint_color, fade_color;
@@ -178,7 +187,7 @@ void HWR_Lighting(FSurfaceInfo *Surface, INT32 light_level, extracolormap_t *col
fade_color.rgba = (colormap != NULL) ? (UINT32)colormap->fadergba : GL_DEFAULTFOG;
// Crappy backup coloring if you can't do shaders
- if (!cv_glshaders.value || !gl_shadersavailable)
+ if (!HWR_UseShader())
{
// be careful, this may get negative for high lightlevel values.
float tint_alpha, fade_alpha;
@@ -367,7 +376,7 @@ static void HWR_RenderPlane(subsector_t *subsector, extrasubsector_t *xsub, bool
static FOutVector *planeVerts = NULL;
static UINT16 numAllocedPlaneVerts = 0;
- int shader;
+ INT32 shader = SHADER_DEFAULT;
// no convex poly were generated for this subsector
if (!xsub->planepoly)
@@ -564,12 +573,17 @@ static void HWR_RenderPlane(subsector_t *subsector, extrasubsector_t *xsub, bool
else
PolyFlags |= PF_Masked|PF_Modulated;
- if (PolyFlags & PF_Fog)
- shader = 6; // fog shader
- else if (PolyFlags & PF_Ripple)
- shader = 5; // water shader
- else
- shader = 1; // floor shader
+ if (HWR_UseShader())
+ {
+ if (PolyFlags & PF_Fog)
+ shader = SHADER_FOG;
+ else if (PolyFlags & PF_Ripple)
+ shader = SHADER_WATER;
+ else
+ shader = SHADER_FLOOR;
+
+ PolyFlags |= PF_ColorMapped;
+ }
HWR_ProcessPolygon(&Surf, planeVerts, nrPlaneVerts, PolyFlags, shader, false);
@@ -692,101 +706,76 @@ static void HWR_RenderSkyPlane(extrasubsector_t *xsub, fixed_t fixedheight)
v3d->z = pv->y;
}
- HWD.pfnDrawPolygon(NULL, planeVerts, nrPlaneVerts,
- PF_Clip|PF_Invisible|PF_NoTexture|PF_Occlude);
+ HWD.pfnDrawPolygon(NULL, planeVerts, nrPlaneVerts, PF_Invisible|PF_NoTexture|PF_Occlude);
}
#endif //polysky
#endif //doplanes
-/*
- wallVerts order is :
- 3--2
- | /|
- |/ |
- 0--1
-*/
-#ifdef WALLSPLATS
-static void HWR_DrawSegsSplats(FSurfaceInfo * pSurf)
+FBITFIELD HWR_GetBlendModeFlag(INT32 ast)
{
- FOutVector wallVerts[4];
- wallsplat_t *splat;
- GLPatch_t *gpatch;
- fixed_t i;
- // seg bbox
- fixed_t segbbox[4];
-
- M_ClearBox(segbbox);
- M_AddToBox(segbbox,
- FLOAT_TO_FIXED(((polyvertex_t *)gl_curline->pv1)->x),
- FLOAT_TO_FIXED(((polyvertex_t *)gl_curline->pv1)->y));
- M_AddToBox(segbbox,
- FLOAT_TO_FIXED(((polyvertex_t *)gl_curline->pv2)->x),
- FLOAT_TO_FIXED(((polyvertex_t *)gl_curline->pv2)->y));
-
- splat = (wallsplat_t *)gl_curline->linedef->splats;
- for (; splat; splat = splat->next)
- {
- //BP: don't draw splat extern to this seg
- // this is quick fix best is explain in logboris.txt at 12-4-2000
- if (!M_PointInBox(segbbox,splat->v1.x,splat->v1.y) && !M_PointInBox(segbbox,splat->v2.x,splat->v2.y))
- continue;
-
- gpatch = W_CachePatchNum(splat->patch, PU_PATCH);
- HWR_GetPatch(gpatch);
-
- wallVerts[0].x = wallVerts[3].x = FIXED_TO_FLOAT(splat->v1.x);
- wallVerts[0].z = wallVerts[3].z = FIXED_TO_FLOAT(splat->v1.y);
- wallVerts[2].x = wallVerts[1].x = FIXED_TO_FLOAT(splat->v2.x);
- wallVerts[2].z = wallVerts[1].z = FIXED_TO_FLOAT(splat->v2.y);
-
- i = splat->top;
- if (splat->yoffset)
- i += *splat->yoffset;
+ switch (ast)
+ {
+ case AST_COPY:
+ case AST_OVERLAY:
+ return PF_Masked;
+ case AST_ADD:
+ return PF_Additive;
+ case AST_SUBTRACT:
+ return PF_Subtractive;
+ case AST_REVERSESUBTRACT:
+ return PF_ReverseSubtract;
+ case AST_MODULATE:
+ return PF_Multiplicative;
+ default:
+ return PF_Translucent;
+ }
+
+ return 0;
+}
- wallVerts[2].y = wallVerts[3].y = FIXED_TO_FLOAT(i)+(gpatch->height>>1);
- wallVerts[0].y = wallVerts[1].y = FIXED_TO_FLOAT(i)-(gpatch->height>>1);
+UINT8 HWR_GetTranstableAlpha(INT32 transtablenum)
+{
+ transtablenum = max(min(transtablenum, tr_trans90), 0);
- wallVerts[3].s = wallVerts[3].t = wallVerts[2].s = wallVerts[0].t = 0.0f;
- wallVerts[1].s = wallVerts[1].t = wallVerts[2].t = wallVerts[0].s = 1.0f;
+ switch (transtablenum)
+ {
+ case 0 : return 0xff;
+ case tr_trans10 : return 0xe6;
+ case tr_trans20 : return 0xcc;
+ case tr_trans30 : return 0xb3;
+ case tr_trans40 : return 0x99;
+ case tr_trans50 : return 0x80;
+ case tr_trans60 : return 0x66;
+ case tr_trans70 : return 0x4c;
+ case tr_trans80 : return 0x33;
+ case tr_trans90 : return 0x19;
+ }
- switch (splat->flags & SPLATDRAWMODE_MASK)
- {
- case SPLATDRAWMODE_OPAQUE :
- pSurf.PolyColor.s.alpha = 0xff;
- i = PF_Translucent;
- break;
- case SPLATDRAWMODE_TRANS :
- pSurf.PolyColor.s.alpha = 128;
- i = PF_Translucent;
- break;
- case SPLATDRAWMODE_SHADE :
- pSurf.PolyColor.s.alpha = 0xff;
- i = PF_Substractive;
- break;
- }
+ return 0xff;
+}
- HWD.pfnSetShader(2); // wall shader
- HWD.pfnDrawPolygon(&pSurf, wallVerts, 4, i|PF_Modulated|PF_Decal);
+FBITFIELD HWR_SurfaceBlend(INT32 style, INT32 transtablenum, FSurfaceInfo *pSurf)
+{
+ if (!transtablenum || style == AST_COPY || style == AST_OVERLAY)
+ {
+ pSurf->PolyColor.s.alpha = 0xff;
+ return PF_Masked;
}
+
+ pSurf->PolyColor.s.alpha = HWR_GetTranstableAlpha(transtablenum);
+ return HWR_GetBlendModeFlag(style);
}
-#endif
FBITFIELD HWR_TranstableToAlpha(INT32 transtablenum, FSurfaceInfo *pSurf)
{
- switch (transtablenum)
+ if (!transtablenum)
{
- case 0 : pSurf->PolyColor.s.alpha = 0x00;return PF_Masked;
- case tr_trans10 : pSurf->PolyColor.s.alpha = 0xe6;return PF_Translucent;
- case tr_trans20 : pSurf->PolyColor.s.alpha = 0xcc;return PF_Translucent;
- case tr_trans30 : pSurf->PolyColor.s.alpha = 0xb3;return PF_Translucent;
- case tr_trans40 : pSurf->PolyColor.s.alpha = 0x99;return PF_Translucent;
- case tr_trans50 : pSurf->PolyColor.s.alpha = 0x80;return PF_Translucent;
- case tr_trans60 : pSurf->PolyColor.s.alpha = 0x66;return PF_Translucent;
- case tr_trans70 : pSurf->PolyColor.s.alpha = 0x4c;return PF_Translucent;
- case tr_trans80 : pSurf->PolyColor.s.alpha = 0x33;return PF_Translucent;
- case tr_trans90 : pSurf->PolyColor.s.alpha = 0x19;return PF_Translucent;
+ pSurf->PolyColor.s.alpha = 0x00;
+ return PF_Masked;
}
+
+ pSurf->PolyColor.s.alpha = HWR_GetTranstableAlpha(transtablenum);
return PF_Translucent;
}
@@ -796,19 +785,30 @@ static void HWR_AddTransparentWall(FOutVector *wallVerts, FSurfaceInfo *pSurf, I
// Wall generation from subsector segs
// ==========================================================================
+/*
+ wallVerts order is :
+ 3--2
+ | /|
+ |/ |
+ 0--1
+*/
+
//
// HWR_ProjectWall
//
static void HWR_ProjectWall(FOutVector *wallVerts, FSurfaceInfo *pSurf, FBITFIELD blendmode, INT32 lightlevel, extracolormap_t *wallcolormap)
{
+ INT32 shader = SHADER_DEFAULT;
+
HWR_Lighting(pSurf, lightlevel, wallcolormap);
- HWR_ProcessPolygon(pSurf, wallVerts, 4, blendmode|PF_Modulated|PF_Occlude, 2, false); // wall shader
+ if (HWR_UseShader())
+ {
+ shader = SHADER_WALL;
+ blendmode |= PF_ColorMapped;
+ }
-#ifdef WALLSPLATS
- if (gl_curline->linedef->splats && cv_splats.value)
- HWR_DrawSegsSplats(pSurf);
-#endif
+ HWR_ProcessPolygon(pSurf, wallVerts, 4, blendmode|PF_Modulated|PF_Occlude, shader, false);
}
// ==========================================================================
@@ -853,7 +853,7 @@ static float HWR_ClipViewSegment(INT32 x, polyvertex_t *v1, polyvertex_t *v2)
//
// HWR_SplitWall
//
-static void HWR_SplitWall(sector_t *sector, FOutVector *wallVerts, INT32 texnum, FSurfaceInfo* Surf, INT32 cutflag, ffloor_t *pfloor)
+static void HWR_SplitWall(sector_t *sector, FOutVector *wallVerts, INT32 texnum, FSurfaceInfo* Surf, INT32 cutflag, ffloor_t *pfloor, FBITFIELD polyflags)
{
/* SoM: split up and light walls according to the
lightlist. This may also include leaving out parts
@@ -991,11 +991,11 @@ static void HWR_SplitWall(sector_t *sector, FOutVector *wallVerts, INT32 texnum,
wallVerts[1].y = endbot;
if (cutflag & FF_FOG)
- HWR_AddTransparentWall(wallVerts, Surf, texnum, PF_Fog|PF_NoTexture, true, lightnum, colormap);
+ HWR_AddTransparentWall(wallVerts, Surf, texnum, PF_Fog|PF_NoTexture|polyflags, true, lightnum, colormap);
else if (cutflag & FF_TRANSLUCENT)
- HWR_AddTransparentWall(wallVerts, Surf, texnum, PF_Translucent, false, lightnum, colormap);
+ HWR_AddTransparentWall(wallVerts, Surf, texnum, PF_Translucent|polyflags, false, lightnum, colormap);
else
- HWR_ProjectWall(wallVerts, Surf, PF_Masked, lightnum, colormap);
+ HWR_ProjectWall(wallVerts, Surf, PF_Masked|polyflags, lightnum, colormap);
top = bot;
endtop = endbot;
@@ -1020,11 +1020,11 @@ static void HWR_SplitWall(sector_t *sector, FOutVector *wallVerts, INT32 texnum,
wallVerts[1].y = endbot;
if (cutflag & FF_FOG)
- HWR_AddTransparentWall(wallVerts, Surf, texnum, PF_Fog|PF_NoTexture, true, lightnum, colormap);
+ HWR_AddTransparentWall(wallVerts, Surf, texnum, PF_Fog|PF_NoTexture|polyflags, true, lightnum, colormap);
else if (cutflag & FF_TRANSLUCENT)
- HWR_AddTransparentWall(wallVerts, Surf, texnum, PF_Translucent, false, lightnum, colormap);
+ HWR_AddTransparentWall(wallVerts, Surf, texnum, PF_Translucent|polyflags, false, lightnum, colormap);
else
- HWR_ProjectWall(wallVerts, Surf, PF_Masked, lightnum, colormap);
+ HWR_ProjectWall(wallVerts, Surf, PF_Masked|polyflags, lightnum, colormap);
}
// HWR_DrawSkyWall
@@ -1167,7 +1167,7 @@ static void HWR_ProcessSeg(void) // Sort of like GLWall::Process in GZDoom
texturevpegtop += gl_sidedef->rowoffset;
// This is so that it doesn't overflow and screw up the wall, it doesn't need to go higher than the texture's height anyway
- texturevpegtop %= SHORT(textures[gl_toptexture]->height)<<FRACBITS;
+ texturevpegtop %= (textures[gl_toptexture]->height)<<FRACBITS;
wallVerts[3].t = wallVerts[2].t = texturevpegtop * grTex->scaleY;
wallVerts[0].t = wallVerts[1].t = (texturevpegtop + gl_frontsector->ceilingheight - gl_backsector->ceilingheight) * grTex->scaleY;
@@ -1205,7 +1205,7 @@ static void HWR_ProcessSeg(void) // Sort of like GLWall::Process in GZDoom
wallVerts[1].y = FIXED_TO_FLOAT(worldhighslope);
if (gl_frontsector->numlights)
- HWR_SplitWall(gl_frontsector, wallVerts, gl_toptexture, &Surf, FF_CUTLEVEL, NULL);
+ HWR_SplitWall(gl_frontsector, wallVerts, gl_toptexture, &Surf, FF_CUTLEVEL, NULL, 0);
else if (grTex->mipmap.flags & TF_TRANSPARENT)
HWR_AddTransparentWall(wallVerts, &Surf, gl_toptexture, PF_Environment, false, lightnum, colormap);
else
@@ -1233,7 +1233,7 @@ static void HWR_ProcessSeg(void) // Sort of like GLWall::Process in GZDoom
texturevpegbottom += gl_sidedef->rowoffset;
// This is so that it doesn't overflow and screw up the wall, it doesn't need to go higher than the texture's height anyway
- texturevpegbottom %= SHORT(textures[gl_bottomtexture]->height)<<FRACBITS;
+ texturevpegbottom %= (textures[gl_bottomtexture]->height)<<FRACBITS;
wallVerts[3].t = wallVerts[2].t = texturevpegbottom * grTex->scaleY;
wallVerts[0].t = wallVerts[1].t = (texturevpegbottom + gl_backsector->floorheight - gl_frontsector->floorheight) * grTex->scaleY;
@@ -1271,7 +1271,7 @@ static void HWR_ProcessSeg(void) // Sort of like GLWall::Process in GZDoom
wallVerts[1].y = FIXED_TO_FLOAT(worldbottomslope);
if (gl_frontsector->numlights)
- HWR_SplitWall(gl_frontsector, wallVerts, gl_bottomtexture, &Surf, FF_CUTLEVEL, NULL);
+ HWR_SplitWall(gl_frontsector, wallVerts, gl_bottomtexture, &Surf, FF_CUTLEVEL, NULL, 0);
else if (grTex->mipmap.flags & TF_TRANSPARENT)
HWR_AddTransparentWall(wallVerts, &Surf, gl_bottomtexture, PF_Environment, false, lightnum, colormap);
else
@@ -1487,13 +1487,17 @@ static void HWR_ProcessSeg(void) // Sort of like GLWall::Process in GZDoom
blendmode = HWR_TranstableToAlpha(gl_curline->polyseg->translucency, &Surf);
}
+ // Render midtextures on two-sided lines with a z-buffer offset.
+ // This will cause the midtexture appear on top, if a FOF overlaps with it.
+ blendmode |= PF_Decal;
+
if (gl_frontsector->numlights)
{
if (!(blendmode & PF_Masked))
- HWR_SplitWall(gl_frontsector, wallVerts, gl_midtexture, &Surf, FF_TRANSLUCENT, NULL);
+ HWR_SplitWall(gl_frontsector, wallVerts, gl_midtexture, &Surf, FF_TRANSLUCENT, NULL, PF_Decal);
else
{
- HWR_SplitWall(gl_frontsector, wallVerts, gl_midtexture, &Surf, FF_CUTLEVEL, NULL);
+ HWR_SplitWall(gl_frontsector, wallVerts, gl_midtexture, &Surf, FF_CUTLEVEL, NULL, PF_Decal);
}
}
else if (!(blendmode & PF_Masked))
@@ -1576,7 +1580,7 @@ static void HWR_ProcessSeg(void) // Sort of like GLWall::Process in GZDoom
// I don't think that solid walls can use translucent linedef types...
if (gl_frontsector->numlights)
- HWR_SplitWall(gl_frontsector, wallVerts, gl_midtexture, &Surf, FF_CUTLEVEL, NULL);
+ HWR_SplitWall(gl_frontsector, wallVerts, gl_midtexture, &Surf, FF_CUTLEVEL, NULL, 0);
else
{
if (grTex->mipmap.flags & TF_TRANSPARENT)
@@ -1607,7 +1611,7 @@ static void HWR_ProcessSeg(void) // Sort of like GLWall::Process in GZDoom
//Hurdler: 3d-floors test
- if (gl_frontsector && gl_backsector && gl_frontsector->tag != gl_backsector->tag && (gl_backsector->ffloors || gl_frontsector->ffloors))
+ if (gl_frontsector && gl_backsector && !Tag_Compare(&gl_frontsector->tags, &gl_backsector->tags) && (gl_backsector->ffloors || gl_frontsector->ffloors))
{
ffloor_t * rover;
fixed_t highcut = 0, lowcut = 0;
@@ -1624,6 +1628,18 @@ static void HWR_ProcessSeg(void) // Sort of like GLWall::Process in GZDoom
{
for (rover = gl_backsector->ffloors; rover; rover = rover->next)
{
+ boolean bothsides = false;
+ // Skip if it exists on both sectors.
+ ffloor_t * r2;
+ for (r2 = gl_frontsector->ffloors; r2; r2 = r2->next)
+ if (rover->master == r2->master)
+ {
+ bothsides = true;
+ break;
+ }
+
+ if (bothsides) continue;
+
if (!(rover->flags & FF_EXISTS) || !(rover->flags & FF_RENDERSIDES))
continue;
if (!(rover->flags & FF_ALLSIDES) && rover->flags & FF_INVERTSIDES)
@@ -1727,7 +1743,7 @@ static void HWR_ProcessSeg(void) // Sort of like GLWall::Process in GZDoom
Surf.PolyColor.s.alpha = HWR_FogBlockAlpha(rover->master->frontsector->lightlevel, rover->master->frontsector->extra_colormap);
if (gl_frontsector->numlights)
- HWR_SplitWall(gl_frontsector, wallVerts, 0, &Surf, rover->flags, rover);
+ HWR_SplitWall(gl_frontsector, wallVerts, 0, &Surf, rover->flags, rover, 0);
else
HWR_AddTransparentWall(wallVerts, &Surf, 0, blendmode, true, lightnum, colormap);
}
@@ -1742,7 +1758,7 @@ static void HWR_ProcessSeg(void) // Sort of like GLWall::Process in GZDoom
}
if (gl_frontsector->numlights)
- HWR_SplitWall(gl_frontsector, wallVerts, texnum, &Surf, rover->flags, rover);
+ HWR_SplitWall(gl_frontsector, wallVerts, texnum, &Surf, rover->flags, rover, 0);
else
{
if (blendmode != PF_Masked)
@@ -1758,6 +1774,18 @@ static void HWR_ProcessSeg(void) // Sort of like GLWall::Process in GZDoom
{
for (rover = gl_frontsector->ffloors; rover; rover = rover->next)
{
+ boolean bothsides = false;
+ // Skip if it exists on both sectors.
+ ffloor_t * r2;
+ for (r2 = gl_backsector->ffloors; r2; r2 = r2->next)
+ if (rover->master == r2->master)
+ {
+ bothsides = true;
+ break;
+ }
+
+ if (bothsides) continue;
+
if (!(rover->flags & FF_EXISTS) || !(rover->flags & FF_RENDERSIDES))
continue;
if (!(rover->flags & FF_ALLSIDES || rover->flags & FF_INVERTSIDES))
@@ -1827,7 +1855,7 @@ static void HWR_ProcessSeg(void) // Sort of like GLWall::Process in GZDoom
Surf.PolyColor.s.alpha = HWR_FogBlockAlpha(rover->master->frontsector->lightlevel, rover->master->frontsector->extra_colormap);
if (gl_backsector->numlights)
- HWR_SplitWall(gl_backsector, wallVerts, 0, &Surf, rover->flags, rover);
+ HWR_SplitWall(gl_backsector, wallVerts, 0, &Surf, rover->flags, rover, 0);
else
HWR_AddTransparentWall(wallVerts, &Surf, 0, blendmode, true, lightnum, colormap);
}
@@ -1842,7 +1870,7 @@ static void HWR_ProcessSeg(void) // Sort of like GLWall::Process in GZDoom
}
if (gl_backsector->numlights)
- HWR_SplitWall(gl_backsector, wallVerts, texnum, &Surf, rover->flags, rover);
+ HWR_SplitWall(gl_backsector, wallVerts, texnum, &Surf, rover->flags, rover, 0);
else
{
if (blendmode != PF_Masked)
@@ -1958,7 +1986,7 @@ static cliprange_t * hw_newend;
static cliprange_t gl_solidsegs[MAXSEGS];
// needs fix: walls are incorrectly clipped one column less
-static consvar_t cv_glclipwalls = {"gr_clipwalls", "Off", 0, CV_OnOff, NULL, 0, NULL, NULL, 0, 0, NULL};
+static consvar_t cv_glclipwalls = CVAR_INIT ("gr_clipwalls", "Off", 0, CV_OnOff, NULL);
static void printsolidsegs(void)
{
@@ -2383,7 +2411,7 @@ static void HWR_AddLine(seg_t * line)
if (!line->polyseg &&
!line->sidedef->midtexture
&& ((!gl_frontsector->ffloors && !gl_backsector->ffloors)
- || (gl_frontsector->tag == gl_backsector->tag)))
+ || Tag_Compare(&gl_frontsector->tags, &gl_backsector->tags)))
return; // line is empty, don't even bother
// treat like wide open window instead
HWR_ProcessSeg(); // Doesn't need arguments because they're defined globally :D
@@ -2422,7 +2450,7 @@ static void HWR_AddLine(seg_t * line)
if (!line->polyseg &&
!line->sidedef->midtexture
&& ((!gl_frontsector->ffloors && !gl_backsector->ffloors)
- || (gl_frontsector->tag == gl_backsector->tag)))
+ || Tag_Compare(&gl_frontsector->tags, &gl_backsector->tags)))
return; // line is empty, don't even bother
goto clippass; // treat like wide open window instead
@@ -2657,30 +2685,30 @@ static void HWR_RenderPolyObjectPlane(polyobj_t *polysector, boolean isceiling,
FBITFIELD blendmode, UINT8 lightlevel, levelflat_t *levelflat, sector_t *FOFsector,
UINT8 alpha, extracolormap_t *planecolormap)
{
- float height; //constant y for all points on the convex flat polygon
- FOutVector *v3d;
- INT32 i;
- float flatxref,flatyref;
+ FSurfaceInfo Surf;
+ FOutVector *v3d;
+ INT32 shader = SHADER_DEFAULT;
+
+ size_t nrPlaneVerts = polysector->numVertices;
+ INT32 i;
+
+ float height = FIXED_TO_FLOAT(fixedheight); // constant y for all points on the convex flat polygon
+ float flatxref, flatyref;
float fflatwidth = 64.0f, fflatheight = 64.0f;
INT32 flatflag = 63;
+
boolean texflat = false;
+
float scrollx = 0.0f, scrolly = 0.0f;
angle_t angle = 0;
- FSurfaceInfo Surf;
fixed_t tempxs, tempyt;
- size_t nrPlaneVerts;
static FOutVector *planeVerts = NULL;
static UINT16 numAllocedPlaneVerts = 0;
- nrPlaneVerts = polysector->numVertices;
-
- height = FIXED_TO_FLOAT(fixedheight);
-
- if (nrPlaneVerts < 3) //not even a triangle ?
+ if (nrPlaneVerts < 3) // Not even a triangle?
return;
-
- if (nrPlaneVerts > (size_t)UINT16_MAX) // FIXME: exceeds plVerts size
+ else if (nrPlaneVerts > (size_t)UINT16_MAX) // FIXME: exceeds plVerts size
{
CONS_Debug(DBG_RENDER, "polygon size of %s exceeds max value of %d vertices\n", sizeu1(nrPlaneVerts), UINT16_MAX);
return;
@@ -2832,18 +2860,23 @@ static void HWR_RenderPolyObjectPlane(polyobj_t *polysector, boolean isceiling,
v3d->z = FIXED_TO_FLOAT(polysector->vertices[i]->y);
}
-
HWR_Lighting(&Surf, lightlevel, planecolormap);
if (blendmode & PF_Translucent)
{
Surf.PolyColor.s.alpha = (UINT8)alpha;
- blendmode |= PF_Modulated|PF_Occlude|PF_Clip;
+ blendmode |= PF_Modulated|PF_Occlude;
}
else
- blendmode |= PF_Masked|PF_Modulated|PF_Clip;
+ blendmode |= PF_Masked|PF_Modulated;
- HWR_ProcessPolygon(&Surf, planeVerts, nrPlaneVerts, blendmode, 1, false); // floor shader
+ if (HWR_UseShader())
+ {
+ shader = SHADER_FLOOR;
+ blendmode |= PF_ColorMapped;
+ }
+
+ HWR_ProcessPolygon(&Surf, planeVerts, nrPlaneVerts, blendmode, shader, false);
}
static void HWR_AddPolyObjectPlanes(void)
@@ -3188,7 +3221,7 @@ static void HWR_Subsector(size_t num)
}
// for render stats
- rs_numpolyobjects += numpolys;
+ ps_numpolyobjects += numpolys;
// Sort polyobjects
R_SortPolyObjects(sub);
@@ -3296,7 +3329,7 @@ static void HWR_RenderBSPNode(INT32 bspnum)
// Decide which side the view point is on
INT32 side;
- rs_numbspcalls++;
+ ps_numbspcalls++;
// Found a subsector?
if (bspnum & NF_SUBSECTOR)
@@ -3511,7 +3544,7 @@ static void HWR_LinkDrawHackFinish(void)
{
// draw sprite shape, only to z-buffer
HWR_GetPatch(linkdrawlist[i].spr->gpatch);
- HWR_ProcessPolygon(&surf, linkdrawlist[i].verts, 4, PF_Translucent|PF_Occlude|PF_Invisible|PF_Clip, 0, false);
+ HWR_ProcessPolygon(&surf, linkdrawlist[i].verts, 4, PF_Translucent|PF_Occlude|PF_Invisible, 0, false);
}
// reset list
linkdrawcount = 0;
@@ -3559,11 +3592,13 @@ static boolean HWR_DoCulling(line_t *cullheight, line_t *viewcullheight, float v
static void HWR_DrawDropShadow(mobj_t *thing, fixed_t scale)
{
- GLPatch_t *gpatch;
+ patch_t *gpatch;
FOutVector shadowVerts[4];
FSurfaceInfo sSurf;
float fscale; float fx; float fy; float offset;
extracolormap_t *colormap = NULL;
+ FBITFIELD blendmode = PF_Translucent|PF_Modulated;
+ INT32 shader = SHADER_DEFAULT;
UINT8 i;
SINT8 flip = P_MobjFlip(thing);
@@ -3585,12 +3620,12 @@ static void HWR_DrawDropShadow(mobj_t *thing, fixed_t scale)
if (alpha >= 255) return;
alpha = 255 - alpha;
- gpatch = (GLPatch_t *)W_CachePatchName("DSHADOW", PU_CACHE);
- if (!(gpatch && gpatch->mipmap->format)) return;
+ gpatch = (patch_t *)W_CachePatchName("DSHADOW", PU_SPRITE);
+ if (!(gpatch && ((GLPatch_t *)gpatch->hardware)->mipmap->format)) return;
HWR_GetPatch(gpatch);
scalemul = FixedMul(FRACUNIT - floordiff/640, scale);
- scalemul = FixedMul(scalemul, (thing->radius*2) / SHORT(gpatch->height));
+ scalemul = FixedMul(scalemul, (thing->radius*2) / gpatch->height);
fscale = FIXED_TO_FLOAT(scalemul);
fx = FIXED_TO_FLOAT(thing->x);
@@ -3602,9 +3637,9 @@ static void HWR_DrawDropShadow(mobj_t *thing, fixed_t scale)
// 0--1
if (thing && fabsf(fscale - 1.0f) > 1.0E-36f)
- offset = (SHORT(gpatch->height)/2) * fscale;
+ offset = ((gpatch->height)/2) * fscale;
else
- offset = (float)(SHORT(gpatch->height)/2);
+ offset = (float)((gpatch->height)/2);
shadowVerts[2].x = shadowVerts[3].x = fx + offset;
shadowVerts[1].x = shadowVerts[0].x = fx - offset;
@@ -3634,35 +3669,42 @@ static void HWR_DrawDropShadow(mobj_t *thing, fixed_t scale)
}
shadowVerts[0].s = shadowVerts[3].s = 0;
- shadowVerts[2].s = shadowVerts[1].s = gpatch->max_s;
+ shadowVerts[2].s = shadowVerts[1].s = ((GLPatch_t *)gpatch->hardware)->max_s;
shadowVerts[3].t = shadowVerts[2].t = 0;
- shadowVerts[0].t = shadowVerts[1].t = gpatch->max_t;
+ shadowVerts[0].t = shadowVerts[1].t = ((GLPatch_t *)gpatch->hardware)->max_t;
- if (thing->subsector->sector->numlights)
+ if (!(thing->renderflags & RF_NOCOLORMAPS))
{
- light = R_GetPlaneLight(thing->subsector->sector, groundz, false); // Always use the light at the top instead of whatever I was doing before
+ if (thing->subsector->sector->numlights)
+ {
+ // Always use the light at the top instead of whatever I was doing before
+ light = R_GetPlaneLight(thing->subsector->sector, groundz, false);
- if (*thing->subsector->sector->lightlist[light].extra_colormap)
- colormap = *thing->subsector->sector->lightlist[light].extra_colormap;
- }
- else
- {
- if (thing->subsector->sector->extra_colormap)
+ if (*thing->subsector->sector->lightlist[light].extra_colormap)
+ colormap = *thing->subsector->sector->lightlist[light].extra_colormap;
+ }
+ else if (thing->subsector->sector->extra_colormap)
colormap = thing->subsector->sector->extra_colormap;
}
HWR_Lighting(&sSurf, 0, colormap);
sSurf.PolyColor.s.alpha = alpha;
- HWR_ProcessPolygon(&sSurf, shadowVerts, 4, PF_Translucent|PF_Modulated|PF_Clip, 3, false); // sprite shader
+ if (HWR_UseShader())
+ {
+ shader = SHADER_SPRITE;
+ blendmode |= PF_ColorMapped;
+ }
+
+ HWR_ProcessPolygon(&sSurf, shadowVerts, 4, blendmode, shader, false);
}
// This is expecting a pointer to an array containing 4 wallVerts for a sprite
static void HWR_RotateSpritePolyToAim(gl_vissprite_t *spr, FOutVector *wallVerts, const boolean precip)
{
if (cv_glspritebillboarding.value
- && spr && spr->mobj && !(spr->mobj->frame & FF_PAPERSPRITE)
+ && spr && spr->mobj && !R_ThingIsPaperSprite(spr->mobj)
&& wallVerts)
{
float basey = FIXED_TO_FLOAT(spr->mobj->z);
@@ -3675,17 +3717,17 @@ static void HWR_RotateSpritePolyToAim(gl_vissprite_t *spr, FOutVector *wallVerts
// X, Y, AND Z need to be manipulated for the polys to rotate around the
// origin, because of how the origin setting works I believe that should
// be mobj->z or mobj->z + mobj->height
- wallVerts[2].y = wallVerts[3].y = (spr->ty - basey) * gl_viewludsin + basey;
+ wallVerts[2].y = wallVerts[3].y = (spr->gzt - basey) * gl_viewludsin + basey;
wallVerts[0].y = wallVerts[1].y = (lowy - basey) * gl_viewludsin + basey;
// translate back to be around 0 before translating back
- wallVerts[3].x += ((spr->ty - basey) * gl_viewludcos) * gl_viewcos;
- wallVerts[2].x += ((spr->ty - basey) * gl_viewludcos) * gl_viewcos;
+ wallVerts[3].x += ((spr->gzt - basey) * gl_viewludcos) * gl_viewcos;
+ wallVerts[2].x += ((spr->gzt - basey) * gl_viewludcos) * gl_viewcos;
wallVerts[0].x += ((lowy - basey) * gl_viewludcos) * gl_viewcos;
wallVerts[1].x += ((lowy - basey) * gl_viewludcos) * gl_viewcos;
- wallVerts[3].z += ((spr->ty - basey) * gl_viewludcos) * gl_viewsin;
- wallVerts[2].z += ((spr->ty - basey) * gl_viewludcos) * gl_viewsin;
+ wallVerts[3].z += ((spr->gzt - basey) * gl_viewludcos) * gl_viewsin;
+ wallVerts[2].z += ((spr->gzt - basey) * gl_viewludcos) * gl_viewsin;
wallVerts[0].z += ((lowy - basey) * gl_viewludcos) * gl_viewsin;
wallVerts[1].z += ((lowy - basey) * gl_viewludcos) * gl_viewsin;
@@ -3694,16 +3736,16 @@ static void HWR_RotateSpritePolyToAim(gl_vissprite_t *spr, FOutVector *wallVerts
static void HWR_SplitSprite(gl_vissprite_t *spr)
{
- float this_scale = 1.0f;
FOutVector wallVerts[4];
FOutVector baseWallVerts[4]; // This is what the verts should end up as
- GLPatch_t *gpatch;
+ patch_t *gpatch;
FSurfaceInfo Surf;
- const boolean hires = (spr->mobj && spr->mobj->skin && ((skin_t *)spr->mobj->skin)->flags & SF_HIRES);
- extracolormap_t *colormap;
+ extracolormap_t *colormap = NULL;
FUINT lightlevel;
+ boolean lightset = true;
FBITFIELD blend = 0;
FBITFIELD occlusion;
+ INT32 shader = SHADER_DEFAULT;
boolean use_linkdraw_hack = false;
UINT8 alpha;
@@ -3720,12 +3762,7 @@ static void HWR_SplitSprite(gl_vissprite_t *spr)
fixed_t temp;
fixed_t v1x, v1y, v2x, v2y;
- this_scale = FIXED_TO_FLOAT(spr->mobj->scale);
-
- if (hires)
- this_scale = this_scale * FIXED_TO_FLOAT(((skin_t *)spr->mobj->skin)->highresscale);
-
- gpatch = spr->gpatch; //W_CachePatchNum(spr->patchlumpnum, PU_CACHE);
+ gpatch = spr->gpatch;
// cache the patch in the graphics card memory
//12/12/99: Hurdler: same comment as above (for md2)
@@ -3737,11 +3774,8 @@ static void HWR_SplitSprite(gl_vissprite_t *spr)
baseWallVerts[0].z = baseWallVerts[3].z = spr->z1;
baseWallVerts[1].z = baseWallVerts[2].z = spr->z2;
- baseWallVerts[2].y = baseWallVerts[3].y = spr->ty;
- if (spr->mobj && fabsf(this_scale - 1.0f) > 1.0E-36f)
- baseWallVerts[0].y = baseWallVerts[1].y = spr->ty - gpatch->height * this_scale;
- else
- baseWallVerts[0].y = baseWallVerts[1].y = spr->ty - gpatch->height;
+ baseWallVerts[2].y = baseWallVerts[3].y = spr->gzt;
+ baseWallVerts[0].y = baseWallVerts[1].y = spr->gz;
v1x = FLOAT_TO_FIXED(spr->x1);
v1y = FLOAT_TO_FIXED(spr->z1);
@@ -3750,25 +3784,25 @@ static void HWR_SplitSprite(gl_vissprite_t *spr)
if (spr->flip)
{
- baseWallVerts[0].s = baseWallVerts[3].s = gpatch->max_s;
+ baseWallVerts[0].s = baseWallVerts[3].s = ((GLPatch_t *)gpatch->hardware)->max_s;
baseWallVerts[2].s = baseWallVerts[1].s = 0;
}
else
{
baseWallVerts[0].s = baseWallVerts[3].s = 0;
- baseWallVerts[2].s = baseWallVerts[1].s = gpatch->max_s;
+ baseWallVerts[2].s = baseWallVerts[1].s = ((GLPatch_t *)gpatch->hardware)->max_s;
}
// flip the texture coords (look familiar?)
if (spr->vflip)
{
- baseWallVerts[3].t = baseWallVerts[2].t = gpatch->max_t;
+ baseWallVerts[3].t = baseWallVerts[2].t = ((GLPatch_t *)gpatch->hardware)->max_t;
baseWallVerts[0].t = baseWallVerts[1].t = 0;
}
else
{
baseWallVerts[3].t = baseWallVerts[2].t = 0;
- baseWallVerts[0].t = baseWallVerts[1].t = gpatch->max_t;
+ baseWallVerts[0].t = baseWallVerts[1].t = ((GLPatch_t *)gpatch->hardware)->max_t;
}
// if it has a dispoffset, push it a little towards the camera
@@ -3814,10 +3848,13 @@ static void HWR_SplitSprite(gl_vissprite_t *spr)
else if (spr->mobj->flags2 & MF2_SHADOW)
{
Surf.PolyColor.s.alpha = 0x40;
- blend = PF_Translucent;
+ blend = HWR_GetBlendModeFlag(spr->mobj->blendmode);
}
else if (spr->mobj->frame & FF_TRANSMASK)
- blend = HWR_TranstableToAlpha((spr->mobj->frame & FF_TRANSMASK)>>FF_TRANSSHIFT, &Surf);
+ {
+ INT32 trans = (spr->mobj->frame & FF_TRANSMASK)>>FF_TRANSSHIFT;
+ blend = HWR_SurfaceBlend(spr->mobj->blendmode, trans, &Surf);
+ }
else
{
// BP: i agree that is little better in environement but it don't
@@ -3825,29 +3862,42 @@ static void HWR_SplitSprite(gl_vissprite_t *spr)
// Hurdler: PF_Environement would be cool, but we need to fix
// the issue with the fog before
Surf.PolyColor.s.alpha = 0xFF;
- blend = PF_Translucent|occlusion;
+ blend = HWR_GetBlendModeFlag(spr->mobj->blendmode)|occlusion;
if (!occlusion) use_linkdraw_hack = true;
}
+ if (HWR_UseShader())
+ {
+ shader = SHADER_SPRITE;
+ blend |= PF_ColorMapped;
+ }
+
alpha = Surf.PolyColor.s.alpha;
// Start with the lightlevel and colormap from the top of the sprite
lightlevel = *list[sector->numlights - 1].lightlevel;
- colormap = *list[sector->numlights - 1].extra_colormap;
+ if (!(spr->mobj->renderflags & RF_NOCOLORMAPS))
+ colormap = *list[sector->numlights - 1].extra_colormap;
+
i = 0;
temp = FLOAT_TO_FIXED(realtop);
- if (spr->mobj->frame & FF_FULLBRIGHT)
+ if (R_ThingIsFullBright(spr->mobj))
lightlevel = 255;
+ else if (R_ThingIsFullDark(spr->mobj))
+ lightlevel = 0;
+ else
+ lightset = false;
for (i = 1; i < sector->numlights; i++)
{
fixed_t h = P_GetLightZAt(§or->lightlist[i], spr->mobj->x, spr->mobj->y);
if (h <= temp)
{
- if (!(spr->mobj->frame & FF_FULLBRIGHT))
+ if (!lightset)
lightlevel = *list[i-1].lightlevel > 255 ? 255 : *list[i-1].lightlevel;
- colormap = *list[i-1].extra_colormap;
+ if (!(spr->mobj->renderflags & RF_NOCOLORMAPS))
+ colormap = *list[i-1].extra_colormap;
break;
}
}
@@ -3860,9 +3910,10 @@ static void HWR_SplitSprite(gl_vissprite_t *spr)
// even if we aren't changing colormap or lightlevel, we still need to continue drawing down the sprite
if (!(list[i].flags & FF_NOSHADE) && (list[i].flags & FF_CUTSPRITES))
{
- if (!(spr->mobj->frame & FF_FULLBRIGHT))
+ if (!lightset)
lightlevel = *list[i].lightlevel > 255 ? 255 : *list[i].lightlevel;
- colormap = *list[i].extra_colormap;
+ if (!(spr->mobj->renderflags & RF_NOCOLORMAPS))
+ colormap = *list[i].extra_colormap;
}
if (i + 1 < sector->numlights)
@@ -3903,7 +3954,7 @@ static void HWR_SplitSprite(gl_vissprite_t *spr)
// The x and y only need to be adjusted in the case that it's not a papersprite
if (cv_glspritebillboarding.value
- && spr->mobj && !(spr->mobj->frame & FF_PAPERSPRITE))
+ && spr->mobj && !R_ThingIsPaperSprite(spr->mobj))
{
// Get the x and z of the vertices so billboarding draws correctly
realheight = realbot - realtop;
@@ -3929,7 +3980,7 @@ static void HWR_SplitSprite(gl_vissprite_t *spr)
Surf.PolyColor.s.alpha = alpha;
- HWR_ProcessPolygon(&Surf, wallVerts, 4, blend|PF_Modulated|PF_Clip, 3, false); // sprite shader
+ HWR_ProcessPolygon(&Surf, wallVerts, 4, blend|PF_Modulated, shader, false);
if (use_linkdraw_hack)
HWR_LinkDrawHackAdd(wallVerts, spr);
@@ -3958,7 +4009,7 @@ static void HWR_SplitSprite(gl_vissprite_t *spr)
Surf.PolyColor.s.alpha = alpha;
- HWR_ProcessPolygon(&Surf, wallVerts, 4, blend|PF_Modulated|PF_Clip, 3, false); // sprite shader
+ HWR_ProcessPolygon(&Surf, wallVerts, 4, blend|PF_Modulated, shader, false);
if (use_linkdraw_hack)
HWR_LinkDrawHackAdd(wallVerts, spr);
@@ -3971,16 +4022,10 @@ static void HWR_SplitSprite(gl_vissprite_t *spr)
// -----------------+
static void HWR_DrawSprite(gl_vissprite_t *spr)
{
- float this_scale = 1.0f;
FOutVector wallVerts[4];
- GLPatch_t *gpatch; // sprite patch converted to hardware
+ patch_t *gpatch;
FSurfaceInfo Surf;
- const boolean hires = (spr->mobj && spr->mobj->skin && ((skin_t *)spr->mobj->skin)->flags & SF_HIRES);
- //const boolean papersprite = (spr->mobj && (spr->mobj->frame & FF_PAPERSPRITE));
- if (spr->mobj)
- this_scale = FIXED_TO_FLOAT(spr->mobj->scale);
- if (hires)
- this_scale = this_scale * FIXED_TO_FLOAT(((skin_t *)spr->mobj->skin)->highresscale);
+ const boolean splat = R_ThingIsFloorSprite(spr->mobj);
if (!spr->mobj)
return;
@@ -3988,7 +4033,7 @@ static void HWR_DrawSprite(gl_vissprite_t *spr)
if (!spr->mobj->subsector)
return;
- if (spr->mobj->subsector->sector->numlights)
+ if (spr->mobj->subsector->sector->numlights && !splat)
{
HWR_SplitSprite(spr);
return;
@@ -4000,7 +4045,7 @@ static void HWR_DrawSprite(gl_vissprite_t *spr)
// sure to do it the right way. So actually, we keep normal sprite
// in memory and we add the md2 model if it exists for that sprite
- gpatch = spr->gpatch; //W_CachePatchNum(spr->patchlumpnum, PU_CACHE);
+ gpatch = spr->gpatch;
#ifdef ALAM_LIGHTING
if (!(spr->mobj->flags2 & MF2_DEBRIS) && (spr->mobj->sprite != SPR_PLAY ||
@@ -4015,57 +4060,167 @@ static void HWR_DrawSprite(gl_vissprite_t *spr)
// |/ |
// 0--1
- // these were already scaled in HWR_ProjectSprite
- wallVerts[0].x = wallVerts[3].x = spr->x1;
- wallVerts[2].x = wallVerts[1].x = spr->x2;
- wallVerts[2].y = wallVerts[3].y = spr->ty;
- if (spr->mobj && fabsf(this_scale - 1.0f) > 1.0E-36f)
- wallVerts[0].y = wallVerts[1].y = spr->ty - gpatch->height * this_scale;
+ if (splat)
+ {
+ F2DCoord verts[4];
+ F2DCoord rotated[4];
+
+ angle_t angle;
+ float ca, sa;
+ float w, h;
+ float xscale, yscale;
+ float xoffset, yoffset;
+ float leftoffset, topoffset;
+ float scale = spr->scale;
+ float zoffset = (P_MobjFlip(spr->mobj) * 0.05f);
+ pslope_t *splatslope = NULL;
+ INT32 i;
+
+ renderflags_t renderflags = spr->renderflags;
+ if (renderflags & RF_SHADOWEFFECTS)
+ scale *= spr->shadowscale;
+
+ if (spr->rotateflags & SRF_3D || renderflags & RF_NOSPLATBILLBOARD)
+ angle = spr->mobj->angle;
+ else
+ angle = viewangle;
+
+ if (!spr->rotated)
+ angle += spr->mobj->rollangle;
+
+ angle = -angle;
+ angle += ANGLE_90;
+
+ topoffset = spr->spriteyoffset;
+ leftoffset = spr->spritexoffset;
+ if (spr->flip)
+ leftoffset = ((float)gpatch->width - leftoffset);
+
+ xscale = spr->scale * spr->spritexscale;
+ yscale = spr->scale * spr->spriteyscale;
+
+ xoffset = leftoffset * xscale;
+ yoffset = topoffset * yscale;
+
+ w = (float)gpatch->width * xscale;
+ h = (float)gpatch->height * yscale;
+
+ // Set positions
+
+ // 3--2
+ // | |
+ // 0--1
+
+ verts[3].x = -xoffset;
+ verts[3].y = yoffset;
+
+ verts[2].x = w - xoffset;
+ verts[2].y = yoffset;
+
+ verts[1].x = w - xoffset;
+ verts[1].y = -h + yoffset;
+
+ verts[0].x = -xoffset;
+ verts[0].y = -h + yoffset;
+
+ ca = FIXED_TO_FLOAT(FINECOSINE((-angle)>>ANGLETOFINESHIFT));
+ sa = FIXED_TO_FLOAT(FINESINE((-angle)>>ANGLETOFINESHIFT));
+
+ // Rotate
+ for (i = 0; i < 4; i++)
+ {
+ rotated[i].x = (verts[i].x * ca) - (verts[i].y * sa);
+ rotated[i].y = (verts[i].x * sa) + (verts[i].y * ca);
+ }
+
+ // Translate
+ for (i = 0; i < 4; i++)
+ {
+ wallVerts[i].x = rotated[i].x + FIXED_TO_FLOAT(spr->mobj->x);
+ wallVerts[i].z = rotated[i].y + FIXED_TO_FLOAT(spr->mobj->y);
+ }
+
+ if (renderflags & (RF_SLOPESPLAT | RF_OBJECTSLOPESPLAT))
+ {
+ pslope_t *standingslope = spr->mobj->standingslope; // The slope that the object is standing on.
+
+ // The slope that was defined for the sprite.
+ if (renderflags & RF_SLOPESPLAT)
+ splatslope = spr->mobj->floorspriteslope;
+
+ if (standingslope && (renderflags & RF_OBJECTSLOPESPLAT))
+ splatslope = standingslope;
+ }
+
+ // Set vertical position
+ if (splatslope)
+ {
+ for (i = 0; i < 4; i++)
+ {
+ fixed_t slopez = P_GetSlopeZAt(splatslope, FLOAT_TO_FIXED(wallVerts[i].x), FLOAT_TO_FIXED(wallVerts[i].z));
+ wallVerts[i].y = FIXED_TO_FLOAT(slopez) + zoffset;
+ }
+ }
+ else
+ {
+ for (i = 0; i < 4; i++)
+ wallVerts[i].y = FIXED_TO_FLOAT(spr->mobj->z) + zoffset;
+ }
+ }
else
- wallVerts[0].y = wallVerts[1].y = spr->ty - gpatch->height;
+ {
+ // these were already scaled in HWR_ProjectSprite
+ wallVerts[0].x = wallVerts[3].x = spr->x1;
+ wallVerts[2].x = wallVerts[1].x = spr->x2;
+ wallVerts[2].y = wallVerts[3].y = spr->gzt;
+ wallVerts[0].y = wallVerts[1].y = spr->gz;
- // make a wall polygon (with 2 triangles), using the floor/ceiling heights,
- // and the 2d map coords of start/end vertices
- wallVerts[0].z = wallVerts[3].z = spr->z1;
- wallVerts[1].z = wallVerts[2].z = spr->z2;
+ // make a wall polygon (with 2 triangles), using the floor/ceiling heights,
+ // and the 2d map coords of start/end vertices
+ wallVerts[0].z = wallVerts[3].z = spr->z1;
+ wallVerts[1].z = wallVerts[2].z = spr->z2;
+ }
+
+ // cache the patch in the graphics card memory
+ //12/12/99: Hurdler: same comment as above (for md2)
+ //Hurdler: 25/04/2000: now support colormap in hardware mode
+ HWR_GetMappedPatch(gpatch, spr->colormap);
if (spr->flip)
{
- wallVerts[0].s = wallVerts[3].s = gpatch->max_s;
+ wallVerts[0].s = wallVerts[3].s = ((GLPatch_t *)gpatch->hardware)->max_s;
wallVerts[2].s = wallVerts[1].s = 0;
}else{
wallVerts[0].s = wallVerts[3].s = 0;
- wallVerts[2].s = wallVerts[1].s = gpatch->max_s;
+ wallVerts[2].s = wallVerts[1].s = ((GLPatch_t *)gpatch->hardware)->max_s;
}
// flip the texture coords (look familiar?)
if (spr->vflip)
{
- wallVerts[3].t = wallVerts[2].t = gpatch->max_t;
+ wallVerts[3].t = wallVerts[2].t = ((GLPatch_t *)gpatch->hardware)->max_t;
wallVerts[0].t = wallVerts[1].t = 0;
}else{
wallVerts[3].t = wallVerts[2].t = 0;
- wallVerts[0].t = wallVerts[1].t = gpatch->max_t;
+ wallVerts[0].t = wallVerts[1].t = ((GLPatch_t *)gpatch->hardware)->max_t;
}
- // cache the patch in the graphics card memory
- //12/12/99: Hurdler: same comment as above (for md2)
- //Hurdler: 25/04/2000: now support colormap in hardware mode
- HWR_GetMappedPatch(gpatch, spr->colormap);
+ if (!splat)
+ {
+ // if it has a dispoffset, push it a little towards the camera
+ if (spr->dispoffset) {
+ float co = -gl_viewcos*(0.05f*spr->dispoffset);
+ float si = -gl_viewsin*(0.05f*spr->dispoffset);
+ wallVerts[0].z = wallVerts[3].z = wallVerts[0].z+si;
+ wallVerts[1].z = wallVerts[2].z = wallVerts[1].z+si;
+ wallVerts[0].x = wallVerts[3].x = wallVerts[0].x+co;
+ wallVerts[1].x = wallVerts[2].x = wallVerts[1].x+co;
+ }
- // if it has a dispoffset, push it a little towards the camera
- if (spr->dispoffset) {
- float co = -gl_viewcos*(0.05f*spr->dispoffset);
- float si = -gl_viewsin*(0.05f*spr->dispoffset);
- wallVerts[0].z = wallVerts[3].z = wallVerts[0].z+si;
- wallVerts[1].z = wallVerts[2].z = wallVerts[1].z+si;
- wallVerts[0].x = wallVerts[3].x = wallVerts[0].x+co;
- wallVerts[1].x = wallVerts[2].x = wallVerts[1].x+co;
+ // Let dispoffset work first since this adjust each vertex
+ HWR_RotateSpritePolyToAim(spr, wallVerts, false);
}
- // Let dispoffset work first since this adjust each vertex
- HWR_RotateSpritePolyToAim(spr, wallVerts, false);
-
// This needs to be AFTER the shadows so that the regular sprites aren't drawn completely black.
// sprite lighting by modulating the RGB components
/// \todo coloured
@@ -4073,16 +4228,38 @@ static void HWR_DrawSprite(gl_vissprite_t *spr)
// colormap test
{
sector_t *sector = spr->mobj->subsector->sector;
- UINT8 lightlevel = 255;
- extracolormap_t *colormap = sector->extra_colormap;
+ UINT8 lightlevel = 0;
+ boolean lightset = true;
+ extracolormap_t *colormap = NULL;
+
+ if (R_ThingIsFullBright(spr->mobj))
+ lightlevel = 255;
+ else if (R_ThingIsFullDark(spr->mobj))
+ lightlevel = 0;
+ else
+ lightset = false;
+
+ if (!(spr->mobj->renderflags & RF_NOCOLORMAPS))
+ colormap = sector->extra_colormap;
+
+ if (splat && sector->numlights)
+ {
+ INT32 light = R_GetPlaneLight(sector, spr->mobj->z, false);
+
+ if (!lightset)
+ lightlevel = *sector->lightlist[light].lightlevel > 255 ? 255 : *sector->lightlist[light].lightlevel;
- if (!(spr->mobj->frame & FF_FULLBRIGHT))
+ if (*sector->lightlist[light].extra_colormap && !(spr->mobj->renderflags & RF_NOCOLORMAPS))
+ colormap = *sector->lightlist[light].extra_colormap;
+ }
+ else if (!lightset)
lightlevel = sector->lightlevel > 255 ? 255 : sector->lightlevel;
HWR_Lighting(&Surf, lightlevel, colormap);
}
{
+ INT32 shader = SHADER_DEFAULT;
FBITFIELD blend = 0;
FBITFIELD occlusion;
boolean use_linkdraw_hack = false;
@@ -4103,10 +4280,13 @@ static void HWR_DrawSprite(gl_vissprite_t *spr)
else if (spr->mobj->flags2 & MF2_SHADOW)
{
Surf.PolyColor.s.alpha = 0x40;
- blend = PF_Translucent;
+ blend = HWR_GetBlendModeFlag(spr->mobj->blendmode);
}
else if (spr->mobj->frame & FF_TRANSMASK)
- blend = HWR_TranstableToAlpha((spr->mobj->frame & FF_TRANSMASK)>>FF_TRANSSHIFT, &Surf);
+ {
+ INT32 trans = (spr->mobj->frame & FF_TRANSMASK)>>FF_TRANSSHIFT;
+ blend = HWR_SurfaceBlend(spr->mobj->blendmode, trans, &Surf);
+ }
else
{
// BP: i agree that is little better in environement but it don't
@@ -4114,11 +4294,29 @@ static void HWR_DrawSprite(gl_vissprite_t *spr)
// Hurdler: PF_Environement would be cool, but we need to fix
// the issue with the fog before
Surf.PolyColor.s.alpha = 0xFF;
+ blend = HWR_GetBlendModeFlag(spr->mobj->blendmode)|occlusion;
+ if (!occlusion) use_linkdraw_hack = true;
+ }
+
+ if (spr->renderflags & RF_SHADOWEFFECTS)
+ {
+ INT32 alpha = Surf.PolyColor.s.alpha;
+ alpha -= ((INT32)(spr->shadowheight / 4.0f)) + 75;
+ if (alpha < 1)
+ return;
+
+ Surf.PolyColor.s.alpha = (UINT8)(alpha);
blend = PF_Translucent|occlusion;
if (!occlusion) use_linkdraw_hack = true;
}
- HWR_ProcessPolygon(&Surf, wallVerts, 4, blend|PF_Modulated|PF_Clip, 3, false); // sprite shader
+ if (HWR_UseShader())
+ {
+ shader = SHADER_SPRITE;
+ blend |= PF_ColorMapped;
+ }
+
+ HWR_ProcessPolygon(&Surf, wallVerts, 4, blend|PF_Modulated, shader, false);
if (use_linkdraw_hack)
HWR_LinkDrawHackAdd(wallVerts, spr);
@@ -4129,9 +4327,10 @@ static void HWR_DrawSprite(gl_vissprite_t *spr)
// Sprite drawer for precipitation
static inline void HWR_DrawPrecipitationSprite(gl_vissprite_t *spr)
{
+ INT32 shader = SHADER_DEFAULT;
FBITFIELD blend = 0;
FOutVector wallVerts[4];
- GLPatch_t *gpatch; // sprite patch converted to hardware
+ patch_t *gpatch;
FSurfaceInfo Surf;
if (!spr->mobj)
@@ -4141,7 +4340,7 @@ static inline void HWR_DrawPrecipitationSprite(gl_vissprite_t *spr)
return;
// cache sprite graphics
- gpatch = spr->gpatch; //W_CachePatchNum(spr->patchlumpnum, PU_CACHE);
+ gpatch = spr->gpatch;
// create the sprite billboard
//
@@ -4151,8 +4350,8 @@ static inline void HWR_DrawPrecipitationSprite(gl_vissprite_t *spr)
// 0--1
wallVerts[0].x = wallVerts[3].x = spr->x1;
wallVerts[2].x = wallVerts[1].x = spr->x2;
- wallVerts[2].y = wallVerts[3].y = spr->ty;
- wallVerts[0].y = wallVerts[1].y = spr->ty - gpatch->height;
+ wallVerts[2].y = wallVerts[3].y = spr->gzt;
+ wallVerts[0].y = wallVerts[1].y = spr->gz;
// make a wall polygon (with 2 triangles), using the floor/ceiling heights,
// and the 2d map coords of start/end vertices
@@ -4163,10 +4362,10 @@ static inline void HWR_DrawPrecipitationSprite(gl_vissprite_t *spr)
HWR_RotateSpritePolyToAim(spr, wallVerts, true);
wallVerts[0].s = wallVerts[3].s = 0;
- wallVerts[2].s = wallVerts[1].s = gpatch->max_s;
+ wallVerts[2].s = wallVerts[1].s = ((GLPatch_t *)gpatch->hardware)->max_s;
wallVerts[3].t = wallVerts[2].t = 0;
- wallVerts[0].t = wallVerts[1].t = gpatch->max_t;
+ wallVerts[0].t = wallVerts[1].t = ((GLPatch_t *)gpatch->hardware)->max_t;
// cache the patch in the graphics card memory
//12/12/99: Hurdler: same comment as above (for md2)
@@ -4181,11 +4380,10 @@ static inline void HWR_DrawPrecipitationSprite(gl_vissprite_t *spr)
if (sector->numlights)
{
- INT32 light;
-
- light = R_GetPlaneLight(sector, spr->mobj->z + spr->mobj->height, false); // Always use the light at the top instead of whatever I was doing before
+ // Always use the light at the top instead of whatever I was doing before
+ INT32 light = R_GetPlaneLight(sector, spr->mobj->z + spr->mobj->height, false);
- if (!(spr->mobj->frame & FF_FULLBRIGHT))
+ if (!R_ThingIsFullBright(spr->mobj))
lightlevel = *sector->lightlist[light].lightlevel > 255 ? 255 : *sector->lightlist[light].lightlevel;
if (*sector->lightlist[light].extra_colormap)
@@ -4193,7 +4391,7 @@ static inline void HWR_DrawPrecipitationSprite(gl_vissprite_t *spr)
}
else
{
- if (!(spr->mobj->frame & FF_FULLBRIGHT))
+ if (!R_ThingIsFullBright(spr->mobj))
lightlevel = sector->lightlevel > 255 ? 255 : sector->lightlevel;
if (sector->extra_colormap)
@@ -4203,13 +4401,11 @@ static inline void HWR_DrawPrecipitationSprite(gl_vissprite_t *spr)
HWR_Lighting(&Surf, lightlevel, colormap);
}
- if (spr->mobj->flags2 & MF2_SHADOW)
+ if (spr->mobj->frame & FF_TRANSMASK)
{
- Surf.PolyColor.s.alpha = 0x40;
- blend = PF_Translucent;
+ INT32 trans = (spr->mobj->frame & FF_TRANSMASK)>>FF_TRANSSHIFT;
+ blend = HWR_SurfaceBlend(AST_TRANSLUCENT, trans, &Surf);
}
- else if (spr->mobj->frame & FF_TRANSMASK)
- blend = HWR_TranstableToAlpha((spr->mobj->frame & FF_TRANSMASK)>>FF_TRANSSHIFT, &Surf);
else
{
// BP: i agree that is little better in environement but it don't
@@ -4217,10 +4413,16 @@ static inline void HWR_DrawPrecipitationSprite(gl_vissprite_t *spr)
// Hurdler: PF_Environement would be cool, but we need to fix
// the issue with the fog before
Surf.PolyColor.s.alpha = 0xFF;
- blend = PF_Translucent|PF_Occlude;
+ blend = HWR_GetBlendModeFlag(spr->mobj->blendmode)|PF_Occlude;
}
- HWR_ProcessPolygon(&Surf, wallVerts, 4, blend|PF_Modulated|PF_Clip, 3, false); // sprite shader
+ if (HWR_UseShader())
+ {
+ shader = SHADER_SPRITE;
+ blend |= PF_ColorMapped;
+ }
+
+ HWR_ProcessPolygon(&Surf, wallVerts, 4, blend|PF_Modulated, shader, false);
}
#endif
@@ -4502,7 +4704,7 @@ static void HWR_CreateDrawNodes(void)
// that is already lying around. This should all be in some sort of linked list or lists.
sortindex = Z_Calloc(sizeof(size_t) * (numplanes + numpolyplanes + numwalls), PU_STATIC, NULL);
- rs_hw_nodesorttime = I_GetTimeMicros();
+ ps_hw_nodesorttime = I_GetPreciseTime();
for (i = 0; i < numplanes; i++, p++)
{
@@ -4522,7 +4724,7 @@ static void HWR_CreateDrawNodes(void)
sortindex[p] = p;
}
- rs_numdrawnodes = p;
+ ps_numdrawnodes = p;
// p is the number of stuff to sort
@@ -4557,13 +4759,13 @@ static void HWR_CreateDrawNodes(void)
}
}
- rs_hw_nodesorttime = I_GetTimeMicros() - rs_hw_nodesorttime;
+ ps_hw_nodesorttime = I_GetPreciseTime() - ps_hw_nodesorttime;
- rs_hw_nodedrawtime = I_GetTimeMicros();
+ ps_hw_nodedrawtime = I_GetPreciseTime();
// Okay! Let's draw it all! Woo!
HWD.pfnSetTransform(&atransform);
- HWD.pfnSetShader(0);
+ HWD.pfnSetShader(SHADER_DEFAULT);
for (i = 0; i < p; i++)
{
@@ -4596,7 +4798,7 @@ static void HWR_CreateDrawNodes(void)
}
}
- rs_hw_nodedrawtime = I_GetTimeMicros() - rs_hw_nodedrawtime;
+ ps_hw_nodedrawtime = I_GetPreciseTime() - ps_hw_nodedrawtime;
numwalls = 0;
numplanes = 0;
@@ -4684,7 +4886,7 @@ static void HWR_DrawSprites(void)
// (Other states probably don't matter. Here I left them same as in LinkDrawHackFinish)
// Without this workaround the rest of the draw calls in this frame (including UI, screen texture)
// can get drawn using an incorrect glBlendFunc, resulting in a occasional black screen.
- HWD.pfnSetBlend(PF_Translucent|PF_Occlude|PF_Clip|PF_Masked);
+ HWD.pfnSetBlend(PF_Translucent|PF_Occlude|PF_Masked);
}
// --------------------------------------------------------------------------
@@ -4749,23 +4951,28 @@ static void HWR_ProjectSprite(mobj_t *thing)
float tracertz = 0.0f;
float x1, x2;
float rightsin, rightcos;
- float this_scale;
+ float this_scale, this_xscale, this_yscale;
+ float spritexscale, spriteyscale;
+ float shadowheight = 1.0f, shadowscale = 1.0f;
float gz, gzt;
spritedef_t *sprdef;
spriteframe_t *sprframe;
+#ifdef ROTSPRITE
spriteinfo_t *sprinfo;
+#endif
md2_t *md2;
size_t lumpoff;
unsigned rot;
UINT16 flip;
- boolean vflip = (!(thing->eflags & MFE_VERTICALFLIP) != !(thing->frame & FF_VERTICALFLIP));
+ boolean vflip = (!(thing->eflags & MFE_VERTICALFLIP) != !R_ThingVerticallyFlipped(thing));
boolean mirrored = thing->mirrored;
- boolean hflip = (!(thing->frame & FF_HORIZONTALFLIP) != !mirrored);
+ boolean hflip = (!R_ThingHorizontallyFlipped(thing) != !mirrored);
INT32 dispoffset;
angle_t ang;
INT32 heightsec, phs;
- const boolean papersprite = (thing->frame & FF_PAPERSPRITE);
+ const boolean splat = R_ThingIsFloorSprite(thing);
+ const boolean papersprite = (R_ThingIsPaperSprite(thing) && !splat);
angle_t mobjangle = (thing->player ? thing->player->drawangle : thing->angle);
float z1, z2;
@@ -4779,9 +4986,21 @@ static void HWR_ProjectSprite(mobj_t *thing)
if (!thing)
return;
+ if (thing->spritexscale < 1 || thing->spriteyscale < 1)
+ return;
+
+ // Visibility check by the blend mode.
+ if (thing->frame & FF_TRANSMASK)
+ {
+ if (!R_BlendLevelVisible(thing->blendmode, (thing->frame & FF_TRANSMASK)>>FF_TRANSSHIFT))
+ return;
+ }
+
dispoffset = thing->info->dispoffset;
this_scale = FIXED_TO_FLOAT(thing->scale);
+ spritexscale = FIXED_TO_FLOAT(thing->spritexscale);
+ spriteyscale = FIXED_TO_FLOAT(thing->spriteyscale);
// transform the origin point
tr_x = FIXED_TO_FLOAT(thing->x) - gl_viewx;
@@ -4791,7 +5010,7 @@ static void HWR_ProjectSprite(mobj_t *thing)
tz = (tr_x * gl_viewcos) + (tr_y * gl_viewsin);
// thing is behind view plane?
- if (tz < ZCLIP_PLANE && !papersprite)
+ if (tz < ZCLIP_PLANE && !(papersprite || splat))
{
if (cv_glmodels.value) //Yellow: Only MD2's dont disappear
{
@@ -4823,12 +5042,16 @@ static void HWR_ProjectSprite(mobj_t *thing)
if (thing->skin && thing->sprite == SPR_PLAY)
{
sprdef = &((skin_t *)thing->skin)->sprites[thing->sprite2];
+#ifdef ROTSPRITE
sprinfo = &((skin_t *)thing->skin)->sprinfo[thing->sprite2];
+#endif
}
else
{
sprdef = &sprites[thing->sprite];
- sprinfo = NULL;
+#ifdef ROTSPRITE
+ sprinfo = &spriteinfo[thing->sprite];
+#endif
}
if (rot >= sprdef->numframes)
@@ -4838,7 +5061,9 @@ static void HWR_ProjectSprite(mobj_t *thing)
thing->sprite = states[S_UNKNOWN].sprite;
thing->frame = states[S_UNKNOWN].frame;
sprdef = &sprites[thing->sprite];
- sprinfo = NULL;
+#ifdef ROTSPRITE
+ sprinfo = &spriteinfo[thing->sprite];
+#endif
rot = thing->frame&FF_FRAMEMASK;
thing->state->sprite = thing->sprite;
thing->state->frame = thing->frame;
@@ -4889,7 +5114,7 @@ static void HWR_ProjectSprite(mobj_t *thing)
}
if (thing->skin && ((skin_t *)thing->skin)->flags & SF_HIRES)
- this_scale = this_scale * FIXED_TO_FLOAT(((skin_t *)thing->skin)->highresscale);
+ this_scale *= FIXED_TO_FLOAT(((skin_t *)thing->skin)->highresscale);
spr_width = spritecachedinfo[lumpoff].width;
spr_height = spritecachedinfo[lumpoff].height;
@@ -4897,24 +5122,42 @@ static void HWR_ProjectSprite(mobj_t *thing)
spr_topoffset = spritecachedinfo[lumpoff].topoffset;
#ifdef ROTSPRITE
- if (thing->rollangle)
+ if (thing->rollangle
+ && !(splat && !(thing->renderflags & RF_NOSPLATROLLANGLE)))
{
rollangle = R_GetRollAngle(thing->rollangle);
- if (!(sprframe->rotsprite.cached & (1<<rot)))
- R_CacheRotSprite(thing->sprite, (thing->frame & FF_FRAMEMASK), sprinfo, sprframe, rot, flip);
- rotsprite = sprframe->rotsprite.patch[rot][rollangle];
+ rotsprite = Patch_GetRotatedSprite(sprframe, (thing->frame & FF_FRAMEMASK), rot, flip, false, sprinfo, rollangle);
+
if (rotsprite != NULL)
{
- spr_width = SHORT(rotsprite->width) << FRACBITS;
- spr_height = SHORT(rotsprite->height) << FRACBITS;
- spr_offset = SHORT(rotsprite->leftoffset) << FRACBITS;
- spr_topoffset = SHORT(rotsprite->topoffset) << FRACBITS;
+ spr_width = rotsprite->width << FRACBITS;
+ spr_height = rotsprite->height << FRACBITS;
+ spr_offset = rotsprite->leftoffset << FRACBITS;
+ spr_topoffset = rotsprite->topoffset << FRACBITS;
+ spr_topoffset += FEETADJUST;
+
// flip -> rotate, not rotate -> flip
flip = 0;
}
}
#endif
+ if (thing->renderflags & RF_ABSOLUTEOFFSETS)
+ {
+ spr_offset = thing->spritexoffset;
+ spr_topoffset = thing->spriteyoffset;
+ }
+ else
+ {
+ SINT8 flipoffset = 1;
+
+ if ((thing->renderflags & RF_FLIPOFFSETS) && flip)
+ flipoffset = -1;
+
+ spr_offset += thing->spritexoffset * flipoffset;
+ spr_topoffset += thing->spriteyoffset * flipoffset;
+ }
+
if (papersprite)
{
rightsin = FIXED_TO_FLOAT(FINESINE((mobjangle)>>ANGLETOFINESHIFT));
@@ -4928,15 +5171,36 @@ static void HWR_ProjectSprite(mobj_t *thing)
flip = !flip != !hflip;
+ if (thing->renderflags & RF_SHADOWEFFECTS)
+ {
+ mobj_t *caster = thing->target;
+
+ if (caster && !P_MobjWasRemoved(caster))
+ {
+ fixed_t groundz = R_GetShadowZ(thing, NULL);
+ fixed_t floordiff = abs(((thing->eflags & MFE_VERTICALFLIP) ? caster->height : 0) + caster->z - groundz);
+
+ shadowheight = FIXED_TO_FLOAT(floordiff);
+ shadowscale = FIXED_TO_FLOAT(FixedMul(FRACUNIT - floordiff/640, caster->scale));
+
+ if (splat)
+ spritexscale *= shadowscale;
+ spriteyscale *= shadowscale;
+ }
+ }
+
+ this_xscale = spritexscale * this_scale;
+ this_yscale = spriteyscale * this_scale;
+
if (flip)
{
- x1 = (FIXED_TO_FLOAT(spr_width - spr_offset) * this_scale);
- x2 = (FIXED_TO_FLOAT(spr_offset) * this_scale);
+ x1 = (FIXED_TO_FLOAT(spr_width - spr_offset) * this_xscale);
+ x2 = (FIXED_TO_FLOAT(spr_offset) * this_xscale);
}
else
{
- x1 = (FIXED_TO_FLOAT(spr_offset) * this_scale);
- x2 = (FIXED_TO_FLOAT(spr_width - spr_offset) * this_scale);
+ x1 = (FIXED_TO_FLOAT(spr_offset) * this_xscale);
+ x2 = (FIXED_TO_FLOAT(spr_width - spr_offset) * this_xscale);
}
// test if too close
@@ -4958,13 +5222,13 @@ static void HWR_ProjectSprite(mobj_t *thing)
if (vflip)
{
- gz = FIXED_TO_FLOAT(thing->z+thing->height) - FIXED_TO_FLOAT(spr_topoffset) * this_scale;
- gzt = gz + FIXED_TO_FLOAT(spr_height) * this_scale;
+ gz = FIXED_TO_FLOAT(thing->z + thing->height) - (FIXED_TO_FLOAT(spr_topoffset) * this_yscale);
+ gzt = gz + (FIXED_TO_FLOAT(spr_height) * this_yscale);
}
else
{
- gzt = FIXED_TO_FLOAT(thing->z) + FIXED_TO_FLOAT(spr_topoffset) * this_scale;
- gz = gzt - FIXED_TO_FLOAT(spr_height) * this_scale;
+ gzt = FIXED_TO_FLOAT(thing->z) + (FIXED_TO_FLOAT(spr_topoffset) * this_yscale);
+ gz = gzt - (FIXED_TO_FLOAT(spr_height) * this_yscale);
}
if (thing->subsector->sector->cullheight)
@@ -5021,20 +5285,39 @@ static void HWR_ProjectSprite(mobj_t *thing)
vis = HWR_NewVisSprite();
vis->x1 = x1;
vis->x2 = x2;
+ vis->z1 = z1;
+ vis->z2 = z2;
+
vis->tz = tz; // Keep tz for the simple sprite sorting that happens
vis->tracertz = tracertz;
+
+ vis->renderflags = thing->renderflags;
+ vis->rotateflags = sprframe->rotate;
+
+ vis->shadowheight = shadowheight;
+ vis->shadowscale = shadowscale;
vis->dispoffset = dispoffset; // Monster Iestyn: 23/11/15: HARDWARE SUPPORT AT LAST
- //vis->patchlumpnum = sprframe->lumppat[rot];
+ vis->flip = flip;
+
+ vis->scale = this_scale;
+ vis->spritexscale = spritexscale;
+ vis->spriteyscale = spriteyscale;
+ vis->spritexoffset = FIXED_TO_FLOAT(spr_offset);
+ vis->spriteyoffset = FIXED_TO_FLOAT(spr_topoffset);
+
+ vis->rotated = false;
+
#ifdef ROTSPRITE
if (rotsprite)
- vis->gpatch = (GLPatch_t *)rotsprite;
+ {
+ vis->gpatch = (patch_t *)rotsprite;
+ vis->rotated = true;
+ }
else
#endif
- vis->gpatch = (GLPatch_t *)W_CachePatchNum(sprframe->lumppat[rot], PU_CACHE);
- vis->flip = flip;
+ vis->gpatch = (patch_t *)W_CachePatchNum(sprframe->lumppat[rot], PU_SPRITE);
+
vis->mobj = thing;
- vis->z1 = z1;
- vis->z2 = z2;
//Hurdler: 25/04/2000: now support colormap in hardware mode
if ((vis->mobj->flags & (MF_ENEMY|MF_BOSS)) && (vis->mobj->flags2 & MF2_FRET) && !(vis->mobj->flags & MF_GRENADEBOUNCE) && (leveltime & 1)) // Bosses "flash"
@@ -5069,10 +5352,11 @@ static void HWR_ProjectSprite(mobj_t *thing)
vis->colormap = R_GetTranslationColormap(TC_DEFAULT, vis->mobj->color ? vis->mobj->color : SKINCOLOR_CYAN, GTC_CACHE);
}
else
- vis->colormap = colormaps;
+ vis->colormap = NULL;
// set top/bottom coords
- vis->ty = gzt;
+ vis->gzt = gzt;
+ vis->gz = gz;
//CONS_Debug(DBG_RENDER, "------------------\nH: sprite : %d\nH: frame : %x\nH: type : %d\nH: sname : %s\n\n",
// thing->sprite, thing->frame, thing->type, sprnames[thing->sprite]);
@@ -5098,6 +5382,13 @@ static void HWR_ProjectPrecipitationSprite(precipmobj_t *thing)
unsigned rot = 0;
UINT8 flip;
+ // Visibility check by the blend mode.
+ if (thing->frame & FF_TRANSMASK)
+ {
+ if (!R_BlendLevelVisible(thing->blendmode, (thing->frame & FF_TRANSMASK)>>FF_TRANSSHIFT))
+ return;
+ }
+
// transform the origin point
tr_x = FIXED_TO_FLOAT(thing->x) - gl_viewx;
tr_y = FIXED_TO_FLOAT(thing->y) - gl_viewy;
@@ -5131,7 +5422,7 @@ static void HWR_ProjectPrecipitationSprite(precipmobj_t *thing)
return;
#endif
- sprframe = &sprdef->spriteframes[ thing->frame & FF_FRAMEMASK];
+ sprframe = &sprdef->spriteframes[thing->frame & FF_FRAMEMASK];
// use single rotation for all views
lumpoff = sprframe->lumpid[0];
@@ -5165,15 +5456,15 @@ static void HWR_ProjectPrecipitationSprite(precipmobj_t *thing)
vis->z2 = z2;
vis->tz = tz;
vis->dispoffset = 0; // Monster Iestyn: 23/11/15: HARDWARE SUPPORT AT LAST
- //vis->patchlumpnum = sprframe->lumppat[rot];
- vis->gpatch = (GLPatch_t *)W_CachePatchNum(sprframe->lumppat[rot], PU_CACHE);
+ vis->gpatch = (patch_t *)W_CachePatchNum(sprframe->lumppat[rot], PU_SPRITE);
vis->flip = flip;
vis->mobj = (mobj_t *)thing;
- vis->colormap = colormaps;
+ vis->colormap = NULL;
// set top/bottom coords
- vis->ty = FIXED_TO_FLOAT(thing->z + spritecachedinfo[lumpoff].topoffset);
+ vis->gzt = FIXED_TO_FLOAT(thing->z + spritecachedinfo[lumpoff].topoffset);
+ vis->gz = vis->gzt - FIXED_TO_FLOAT(spritecachedinfo[lumpoff].height);
vis->precip = true;
@@ -5383,7 +5674,7 @@ static void HWR_DrawSkyBackground(player_t *player)
HWR_BuildSkyDome();
}
- HWD.pfnSetShader(7); // sky shader
+ HWD.pfnSetShader(SHADER_SKY); // sky shader
HWD.pfnSetTransform(&dometransform);
HWD.pfnRenderSkyDome(&gl_sky);
}
@@ -5470,7 +5761,7 @@ static void HWR_DrawSkyBackground(player_t *player)
HWD.pfnDrawPolygon(NULL, v, 4, 0);
}
- HWD.pfnSetShader(0);
+ HWD.pfnSetShader(SHADER_DEFAULT);
}
@@ -5555,6 +5846,20 @@ static void HWR_SetTransformAiming(FTransform *trans, player_t *player, boolean
trans->anglex = (float)(gl_aimingangle>>ANGLETOFINESHIFT)*(360.0f/(float)FINEANGLES);
}
+//
+// Sets the shader state.
+//
+static void HWR_SetShaderState(void)
+{
+ hwdshaderoption_t state = cv_glshaders.value;
+
+ if (!cv_glallowshaders.value)
+ state = (cv_glshaders.value == HWD_SHADEROPTION_ON ? HWD_SHADEROPTION_NOCUSTOM : cv_glshaders.value);
+
+ HWD.pfnSetSpecialState(HWD_SET_SHADERS, (INT32)state);
+ HWD.pfnSetShader(SHADER_DEFAULT);
+}
+
// ==========================================================================
// Same as rendering the player view, but from the skybox object
// ==========================================================================
@@ -5673,8 +5978,7 @@ void HWR_RenderSkyboxView(INT32 viewnumber, player_t *player)
HWD.pfnSetTransform(&atransform);
// Reset the shader state.
- HWD.pfnSetSpecialState(HWD_SET_SHADERS, cv_glshaders.value);
- HWD.pfnSetShader(0);
+ HWR_SetShaderState();
validcount++;
@@ -5777,8 +6081,10 @@ void HWR_RenderPlayerView(INT32 viewnumber, player_t *player)
if (viewnumber == 0) // Only do it if it's the first screen being rendered
HWD.pfnClearBuffer(true, false, &ClearColor); // Clear the Color Buffer, stops HOMs. Also seems to fix the skybox issue on Intel GPUs.
+ ps_hw_skyboxtime = I_GetPreciseTime();
if (skybox && drawsky) // If there's a skybox and we should be drawing the sky, draw the skybox
HWR_RenderSkyboxView(viewnumber, player); // This is drawn before everything else so it is placed behind
+ ps_hw_skyboxtime = I_GetPreciseTime() - ps_hw_skyboxtime;
{
// do we really need to save player (is it not the same)?
@@ -5886,12 +6192,11 @@ void HWR_RenderPlayerView(INT32 viewnumber, player_t *player)
HWD.pfnSetTransform(&atransform);
// Reset the shader state.
- HWD.pfnSetSpecialState(HWD_SET_SHADERS, cv_glshaders.value);
- HWD.pfnSetShader(0);
+ HWR_SetShaderState();
- rs_numbspcalls = 0;
- rs_numpolyobjects = 0;
- rs_bsptime = I_GetTimeMicros();
+ ps_numbspcalls = 0;
+ ps_numpolyobjects = 0;
+ ps_bsptime = I_GetPreciseTime();
validcount++;
@@ -5929,7 +6234,7 @@ void HWR_RenderPlayerView(INT32 viewnumber, player_t *player)
}
#endif
- rs_bsptime = I_GetTimeMicros() - rs_bsptime;
+ ps_bsptime = I_GetPreciseTime() - ps_bsptime;
if (cv_glbatching.value)
HWR_RenderBatches();
@@ -5944,22 +6249,22 @@ void HWR_RenderPlayerView(INT32 viewnumber, player_t *player)
#endif
// Draw MD2 and sprites
- rs_numsprites = gl_visspritecount;
- rs_hw_spritesorttime = I_GetTimeMicros();
+ ps_numsprites = gl_visspritecount;
+ ps_hw_spritesorttime = I_GetPreciseTime();
HWR_SortVisSprites();
- rs_hw_spritesorttime = I_GetTimeMicros() - rs_hw_spritesorttime;
- rs_hw_spritedrawtime = I_GetTimeMicros();
+ ps_hw_spritesorttime = I_GetPreciseTime() - ps_hw_spritesorttime;
+ ps_hw_spritedrawtime = I_GetPreciseTime();
HWR_DrawSprites();
- rs_hw_spritedrawtime = I_GetTimeMicros() - rs_hw_spritedrawtime;
+ ps_hw_spritedrawtime = I_GetPreciseTime() - ps_hw_spritedrawtime;
#ifdef NEWCORONAS
//Hurdler: they must be drawn before translucent planes, what about gl fog?
HWR_DrawCoronas();
#endif
- rs_numdrawnodes = 0;
- rs_hw_nodesorttime = 0;
- rs_hw_nodedrawtime = 0;
+ ps_numdrawnodes = 0;
+ ps_hw_nodesorttime = 0;
+ ps_hw_nodedrawtime = 0;
if (numplanes || numpolyplanes || numwalls) //Hurdler: render 3D water and transparent walls after everything
{
HWR_CreateDrawNodes();
@@ -5978,13 +6283,30 @@ void HWR_RenderPlayerView(INT32 viewnumber, player_t *player)
HWD.pfnGClipRect(0, 0, vid.width, vid.height, NZCLIP_PLANE);
}
+void HWR_LoadLevel(void)
+{
+#ifdef ALAM_LIGHTING
+ // BP: reset light between levels (we draw preview frame lights on current frame)
+ HWR_ResetLights();
+#endif
+
+ HWR_CreatePlanePolygons((INT32)numnodes - 1);
+
+ // Build the sky dome
+ HWR_ClearSkyDome();
+ HWR_BuildSkyDome();
+
+ gl_maploaded = true;
+}
+
// ==========================================================================
// 3D ENGINE COMMANDS
// ==========================================================================
-static CV_PossibleValue_t grmodelinterpolation_cons_t[] = {{0, "Off"}, {1, "Sometimes"}, {2, "Always"}, {0, NULL}};
-static CV_PossibleValue_t grfakecontrast_cons_t[] = {{0, "Off"}, {1, "On"}, {2, "Smooth"}, {0, NULL}};
-static CV_PossibleValue_t grshearing_cons_t[] = {{0, "Off"}, {1, "On"}, {2, "Third-person"}, {0, NULL}};
+static CV_PossibleValue_t glshaders_cons_t[] = {{HWD_SHADEROPTION_OFF, "Off"}, {HWD_SHADEROPTION_ON, "On"}, {HWD_SHADEROPTION_NOCUSTOM, "Ignore custom shaders"}, {0, NULL}};
+static CV_PossibleValue_t glmodelinterpolation_cons_t[] = {{0, "Off"}, {1, "Sometimes"}, {2, "Always"}, {0, NULL}};
+static CV_PossibleValue_t glfakecontrast_cons_t[] = {{0, "Off"}, {1, "On"}, {2, "Smooth"}, {0, NULL}};
+static CV_PossibleValue_t glshearing_cons_t[] = {{0, "Off"}, {1, "On"}, {2, "Third-person"}, {0, NULL}};
static void CV_glfiltermode_OnChange(void);
static void CV_glanisotropic_OnChange(void);
@@ -5995,36 +6317,35 @@ static CV_PossibleValue_t glfiltermode_cons_t[]= {{HWD_SET_TEXTUREFILTER_POINTSA
{HWD_SET_TEXTUREFILTER_MIXED2, "Nearest_Linear"},
{HWD_SET_TEXTUREFILTER_MIXED3, "Nearest_Mipmap"},
{0, NULL}};
-CV_PossibleValue_t granisotropicmode_cons_t[] = {{1, "MIN"}, {16, "MAX"}, {0, NULL}};
+CV_PossibleValue_t glanisotropicmode_cons_t[] = {{1, "MIN"}, {16, "MAX"}, {0, NULL}};
-consvar_t cv_glshaders = {"gr_shaders", "On", CV_SAVE, CV_OnOff, NULL, 0, NULL, NULL, 0, 0, NULL};
-consvar_t cv_fovchange = {"gr_fovchange", "Off", CV_SAVE, CV_OnOff, NULL, 0, NULL, NULL, 0, 0, NULL};
+consvar_t cv_glshaders = CVAR_INIT ("gr_shaders", "On", CV_SAVE, glshaders_cons_t, NULL);
+consvar_t cv_glallowshaders = CVAR_INIT ("gr_allowclientshaders", "On", CV_NETVAR, CV_OnOff, NULL);
+consvar_t cv_fovchange = CVAR_INIT ("gr_fovchange", "Off", CV_SAVE, CV_OnOff, NULL);
#ifdef ALAM_LIGHTING
-consvar_t cv_gldynamiclighting = {"gr_dynamiclighting", "On", CV_SAVE, CV_OnOff, NULL, 0, NULL, NULL, 0, 0, NULL};
-consvar_t cv_glstaticlighting = {"gr_staticlighting", "On", CV_SAVE, CV_OnOff, NULL, 0, NULL, NULL, 0, 0, NULL};
-consvar_t cv_glcoronas = {"gr_coronas", "On", CV_SAVE, CV_OnOff, NULL, 0, NULL, NULL, 0, 0, NULL};
-consvar_t cv_glcoronasize = {"gr_coronasize", "1", CV_SAVE|CV_FLOAT, 0, NULL, 0, NULL, NULL, 0, 0, NULL};
+consvar_t cv_gldynamiclighting = CVAR_INIT ("gr_dynamiclighting", "On", CV_SAVE, CV_OnOff, NULL);
+consvar_t cv_glstaticlighting = CVAR_INIT ("gr_staticlighting", "On", CV_SAVE, CV_OnOff, NULL);
+consvar_t cv_glcoronas = CVAR_INIT ("gr_coronas", "On", CV_SAVE, CV_OnOff, NULL);
+consvar_t cv_glcoronasize = CVAR_INIT ("gr_coronasize", "1", CV_SAVE|CV_FLOAT, 0, NULL);
#endif
-consvar_t cv_glmodels = {"gr_models", "Off", CV_SAVE, CV_OnOff, NULL, 0, NULL, NULL, 0, 0, NULL};
-consvar_t cv_glmodelinterpolation = {"gr_modelinterpolation", "Sometimes", CV_SAVE, grmodelinterpolation_cons_t, NULL, 0, NULL, NULL, 0, 0, NULL};
-consvar_t cv_glmodellighting = {"gr_modellighting", "Off", CV_SAVE, CV_OnOff, NULL, 0, NULL, NULL, 0, 0, NULL};
+consvar_t cv_glmodels = CVAR_INIT ("gr_models", "Off", CV_SAVE, CV_OnOff, NULL);
+consvar_t cv_glmodelinterpolation = CVAR_INIT ("gr_modelinterpolation", "Sometimes", CV_SAVE, glmodelinterpolation_cons_t, NULL);
+consvar_t cv_glmodellighting = CVAR_INIT ("gr_modellighting", "Off", CV_SAVE, CV_OnOff, NULL);
-consvar_t cv_glshearing = {"gr_shearing", "Off", CV_SAVE, grshearing_cons_t, NULL, 0, NULL, NULL, 0, 0, NULL};
-consvar_t cv_glspritebillboarding = {"gr_spritebillboarding", "Off", CV_SAVE, CV_OnOff, NULL, 0, NULL, NULL, 0, 0, NULL};
-consvar_t cv_glskydome = {"gr_skydome", "On", CV_SAVE, CV_OnOff, NULL, 0, NULL, NULL, 0, 0, NULL};
-consvar_t cv_glfakecontrast = {"gr_fakecontrast", "Smooth", CV_SAVE, grfakecontrast_cons_t, NULL, 0, NULL, NULL, 0, 0, NULL};
-consvar_t cv_glslopecontrast = {"gr_slopecontrast", "Off", CV_SAVE, CV_OnOff, NULL, 0, NULL, NULL, 0, 0, NULL};
+consvar_t cv_glshearing = CVAR_INIT ("gr_shearing", "Off", CV_SAVE, glshearing_cons_t, NULL);
+consvar_t cv_glspritebillboarding = CVAR_INIT ("gr_spritebillboarding", "Off", CV_SAVE, CV_OnOff, NULL);
+consvar_t cv_glskydome = CVAR_INIT ("gr_skydome", "On", CV_SAVE, CV_OnOff, NULL);
+consvar_t cv_glfakecontrast = CVAR_INIT ("gr_fakecontrast", "Smooth", CV_SAVE, glfakecontrast_cons_t, NULL);
+consvar_t cv_glslopecontrast = CVAR_INIT ("gr_slopecontrast", "Off", CV_SAVE, CV_OnOff, NULL);
-consvar_t cv_glfiltermode = {"gr_filtermode", "Nearest", CV_SAVE|CV_CALL, glfiltermode_cons_t,
- CV_glfiltermode_OnChange, 0, NULL, NULL, 0, 0, NULL};
-consvar_t cv_glanisotropicmode = {"gr_anisotropicmode", "1", CV_CALL, granisotropicmode_cons_t,
- CV_glanisotropic_OnChange, 0, NULL, NULL, 0, 0, NULL};
+consvar_t cv_glfiltermode = CVAR_INIT ("gr_filtermode", "Nearest", CV_SAVE|CV_CALL, glfiltermode_cons_t, CV_glfiltermode_OnChange);
+consvar_t cv_glanisotropicmode = CVAR_INIT ("gr_anisotropicmode", "1", CV_CALL, glanisotropicmode_cons_t, CV_glanisotropic_OnChange);
-consvar_t cv_glsolvetjoin = {"gr_solvetjoin", "On", 0, CV_OnOff, NULL, 0, NULL, NULL, 0, 0, NULL};
+consvar_t cv_glsolvetjoin = CVAR_INIT ("gr_solvetjoin", "On", 0, CV_OnOff, NULL);
-consvar_t cv_glbatching = {"gr_batching", "On", 0, CV_OnOff, NULL, 0, NULL, NULL, 0, 0, NULL};
+consvar_t cv_glbatching = CVAR_INIT ("gr_batching", "On", 0, CV_OnOff, NULL);
static void CV_glfiltermode_OnChange(void)
{
@@ -6059,11 +6380,11 @@ void HWR_AddCommands(void)
CV_RegisterVar(&cv_glfakecontrast);
CV_RegisterVar(&cv_glshearing);
CV_RegisterVar(&cv_glshaders);
+ CV_RegisterVar(&cv_glallowshaders);
CV_RegisterVar(&cv_glfiltermode);
CV_RegisterVar(&cv_glsolvetjoin);
- CV_RegisterVar(&cv_renderstats);
CV_RegisterVar(&cv_glbatching);
#ifndef NEWCLIP
@@ -6073,13 +6394,10 @@ void HWR_AddCommands(void)
void HWR_AddSessionCommands(void)
{
- static boolean alreadycalled = false;
- if (alreadycalled)
+ if (gl_sessioncommandsadded)
return;
-
CV_RegisterVar(&cv_glanisotropicmode);
-
- alreadycalled = true;
+ gl_sessioncommandsadded = true;
}
// --------------------------------------------------------------------------
@@ -6087,33 +6405,27 @@ void HWR_AddSessionCommands(void)
// --------------------------------------------------------------------------
void HWR_Startup(void)
{
- static boolean startupdone = false;
-
- // do this once
- if (!startupdone)
+ if (!gl_init)
{
- INT32 i;
CONS_Printf("HWR_Startup()...\n");
HWR_InitPolyPool();
HWR_AddSessionCommands();
- HWR_InitTextureCache();
+ HWR_InitMapTextures();
HWR_InitModels();
#ifdef ALAM_LIGHTING
HWR_InitLight();
#endif
- // read every custom shader
- for (i = 0; i < numwadfiles; i++)
- HWR_ReadShaders(i, (wadfiles[i]->type == RET_PK3));
- if (!HWR_LoadShaders())
+ HWR_LoadAllCustomShaders();
+ if (!HWR_CompileShaders())
gl_shadersavailable = false;
}
if (rendermode == render_opengl)
textureformat = patchformat = GL_TEXFMT_RGBA;
- startupdone = true;
+ gl_init = true;
}
// --------------------------------------------------------------------------
@@ -6121,9 +6433,24 @@ void HWR_Startup(void)
// --------------------------------------------------------------------------
void HWR_Switch(void)
{
+ // Add session commands
+ if (!gl_sessioncommandsadded)
+ HWR_AddSessionCommands();
+
// Set special states from CVARs
HWD.pfnSetSpecialState(HWD_SET_TEXTUREFILTERMODE, cv_glfiltermode.value);
HWD.pfnSetSpecialState(HWD_SET_TEXTUREANISOTROPICMODE, cv_glanisotropicmode.value);
+
+ // Load textures
+ if (!gl_maptexturesloaded)
+ HWR_LoadMapTextures(numtextures);
+
+ // Create plane polygons
+ if (!gl_maploaded && (gamestate == GS_LEVEL || (gamestate == GS_TITLESCREEN && titlemapinaction)))
+ {
+ HWR_ClearAllTextures();
+ HWR_LoadLevel();
+ }
}
// --------------------------------------------------------------------------
@@ -6134,7 +6461,7 @@ void HWR_Shutdown(void)
CONS_Printf("HWR_Shutdown()\n");
HWR_FreeExtraSubsectors();
HWR_FreePolyPool();
- HWR_FreeTextureCache();
+ HWR_FreeMapTextures();
HWD.pfnFlushScreenTextures();
}
@@ -6191,32 +6518,31 @@ void HWR_RenderWall(FOutVector *wallVerts, FSurfaceInfo *pSurf, FBITFIELD blend,
FBITFIELD blendmode = blend;
UINT8 alpha = pSurf->PolyColor.s.alpha; // retain the alpha
- int shader;
+ INT32 shader = SHADER_DEFAULT;
// Lighting is done here instead so that fog isn't drawn incorrectly on transparent walls after sorting
HWR_Lighting(pSurf, lightlevel, wallcolormap);
pSurf->PolyColor.s.alpha = alpha; // put the alpha back after lighting
- shader = 2; // wall shader
-
if (blend & PF_Environment)
blendmode |= PF_Occlude; // PF_Occlude must be used for solid objects
- if (fogwall)
+ if (HWR_UseShader())
{
- blendmode |= PF_Fog;
- shader = 6; // fog shader
+ if (fogwall)
+ shader = SHADER_FOG;
+ else
+ shader = SHADER_WALL;
+
+ blendmode |= PF_ColorMapped;
}
- blendmode |= PF_Modulated; // No PF_Occlude means overlapping (incorrect) transparency
+ if (fogwall)
+ blendmode |= PF_Fog;
+ blendmode |= PF_Modulated; // No PF_Occlude means overlapping (incorrect) transparency
HWR_ProcessPolygon(pSurf, wallVerts, 4, blendmode, shader, false);
-
-#ifdef WALLSPLATS
- if (gl_curline->linedef->splats && cv_splats.value)
- HWR_DrawSegsSplats(pSurf);
-#endif
}
INT32 HWR_GetTextureUsed(void)
@@ -6257,7 +6583,7 @@ void HWR_DoPostProcessor(player_t *player)
Surf.PolyColor.s.alpha = 0xc0; // match software mode
- HWD.pfnDrawPolygon(&Surf, v, 4, PF_Modulated|PF_Additive|PF_NoTexture|PF_NoDepthTest|PF_Clip|PF_NoZClip);
+ HWD.pfnDrawPolygon(&Surf, v, 4, PF_Modulated|PF_Additive|PF_NoTexture|PF_NoDepthTest);
}
// Capture the screen for intermission and screen waving
@@ -6390,14 +6716,7 @@ void HWR_DrawScreenFinalTexture(int width, int height)
HWD.pfnDrawScreenFinalTexture(width, height);
}
-// jimita 18032019
-typedef struct
-{
- char type[16];
- INT32 id;
-} shaderxlat_t;
-
-static inline UINT16 HWR_CheckShader(UINT16 wadnum)
+static inline UINT16 HWR_FindShaderDefs(UINT16 wadnum)
{
UINT16 i;
lumpinfo_t *lump_p;
@@ -6410,12 +6729,34 @@ static inline UINT16 HWR_CheckShader(UINT16 wadnum)
return INT16_MAX;
}
-boolean HWR_LoadShaders(void)
+boolean HWR_CompileShaders(void)
{
- return HWD.pfnInitCustomShaders();
+ return HWD.pfnCompileShaders();
}
-void HWR_ReadShaders(UINT16 wadnum, boolean PK3)
+customshaderxlat_t shaderxlat[] =
+{
+ {"Flat", SHADER_FLOOR},
+ {"WallTexture", SHADER_WALL},
+ {"Sprite", SHADER_SPRITE},
+ {"Model", SHADER_MODEL},
+ {"ModelLighting", SHADER_MODEL_LIGHTING},
+ {"WaterRipple", SHADER_WATER},
+ {"Fog", SHADER_FOG},
+ {"Sky", SHADER_SKY},
+ {NULL, 0},
+};
+
+void HWR_LoadAllCustomShaders(void)
+{
+ INT32 i;
+
+ // read every custom shader
+ for (i = 0; i < numwadfiles; i++)
+ HWR_LoadCustomShadersFromFile(i, (wadfiles[i]->type == RET_PK3));
+}
+
+void HWR_LoadCustomShadersFromFile(UINT16 wadnum, boolean PK3)
{
UINT16 lump;
char *shaderdef, *line;
@@ -6426,19 +6767,7 @@ void HWR_ReadShaders(UINT16 wadnum, boolean PK3)
int shadertype = 0;
int i;
- #define SHADER_TYPES 7
- shaderxlat_t shaderxlat[SHADER_TYPES] =
- {
- {"Flat", 1},
- {"WallTexture", 2},
- {"Sprite", 3},
- {"Model", 4},
- {"WaterRipple", 5},
- {"Fog", 6},
- {"Sky", 7},
- };
-
- lump = HWR_CheckShader(wadnum);
+ lump = HWR_FindShaderDefs(wadnum);
if (lump == INT16_MAX)
return;
@@ -6464,7 +6793,7 @@ void HWR_ReadShaders(UINT16 wadnum, boolean PK3)
value = strtok(NULL, "\r\n ");
if (!value)
{
- CONS_Alert(CONS_WARNING, "HWR_ReadShaders: Missing shader type (file %s, line %d)\n", wadfiles[wadnum]->filename, linenum);
+ CONS_Alert(CONS_WARNING, "HWR_LoadCustomShadersFromFile: Missing shader type (file %s, line %d)\n", wadfiles[wadnum]->filename, linenum);
stoken = strtok(NULL, "\r\n"); // skip end of line
goto skip_lump;
}
@@ -6483,19 +6812,19 @@ skip_lump:
value = strtok(NULL, "\r\n= ");
if (!value)
{
- CONS_Alert(CONS_WARNING, "HWR_ReadShaders: Missing shader target (file %s, line %d)\n", wadfiles[wadnum]->filename, linenum);
+ CONS_Alert(CONS_WARNING, "HWR_LoadCustomShadersFromFile: Missing shader target (file %s, line %d)\n", wadfiles[wadnum]->filename, linenum);
stoken = strtok(NULL, "\r\n"); // skip end of line
goto skip_field;
}
if (!shadertype)
{
- CONS_Alert(CONS_ERROR, "HWR_ReadShaders: Missing shader type (file %s, line %d)\n", wadfiles[wadnum]->filename, linenum);
+ CONS_Alert(CONS_ERROR, "HWR_LoadCustomShadersFromFile: Missing shader type (file %s, line %d)\n", wadfiles[wadnum]->filename, linenum);
Z_Free(line);
return;
}
- for (i = 0; i < SHADER_TYPES; i++)
+ for (i = 0; shaderxlat[i].type; i++)
{
if (!stricmp(shaderxlat[i].type, stoken))
{
@@ -6521,7 +6850,7 @@ skip_lump:
if (shader_lumpnum == INT16_MAX)
{
- CONS_Alert(CONS_ERROR, "HWR_ReadShaders: Missing shader source %s (file %s, line %d)\n", shader_lumpname, wadfiles[wadnum]->filename, linenum);
+ CONS_Alert(CONS_ERROR, "HWR_LoadCustomShadersFromFile: Missing shader source %s (file %s, line %d)\n", shader_lumpname, wadfiles[wadnum]->filename, linenum);
Z_Free(shader_lumpname);
continue;
}
@@ -6547,4 +6876,22 @@ skip_field:
return;
}
+const char *HWR_GetShaderName(INT32 shader)
+{
+ INT32 i;
+
+ if (shader)
+ {
+ for (i = 0; shaderxlat[i].type; i++)
+ {
+ if (shaderxlat[i].id == shader)
+ return shaderxlat[i].type;
+ }
+
+ return "Unknown";
+ }
+
+ return "Default";
+}
+
#endif // HWRENDER
diff --git a/src/hardware/hw_main.h b/src/hardware/hw_main.h
index d70bb6d727790f209fd83af647c9495e81ba2de4..4ad09aa3d63b1612239243ca15a0a2d878ea7c8d 100644
--- a/src/hardware/hw_main.h
+++ b/src/hardware/hw_main.h
@@ -37,13 +37,12 @@ void HWR_DrawViewBorder(INT32 clearlines);
void HWR_DrawFlatFill(INT32 x, INT32 y, INT32 w, INT32 h, lumpnum_t flatlumpnum);
void HWR_InitTextureMapping(void);
void HWR_SetViewSize(void);
-void HWR_DrawPatch(GLPatch_t *gpatch, INT32 x, INT32 y, INT32 option);
-void HWR_DrawStretchyFixedPatch(GLPatch_t *gpatch, fixed_t x, fixed_t y, fixed_t pscale, fixed_t vscale, INT32 option, const UINT8 *colormap);
-void HWR_DrawCroppedPatch(GLPatch_t *gpatch, fixed_t x, fixed_t y, fixed_t scale, INT32 option, fixed_t sx, fixed_t sy, fixed_t w, fixed_t h);
+void HWR_DrawPatch(patch_t *gpatch, INT32 x, INT32 y, INT32 option);
+void HWR_DrawStretchyFixedPatch(patch_t *gpatch, fixed_t x, fixed_t y, fixed_t pscale, fixed_t vscale, INT32 option, const UINT8 *colormap);
+void HWR_DrawCroppedPatch(patch_t *gpatch, fixed_t x, fixed_t y, fixed_t scale, INT32 option, fixed_t sx, fixed_t sy, fixed_t w, fixed_t h);
void HWR_MakePatch(const patch_t *patch, GLPatch_t *grPatch, GLMipmap_t *grMipmap, boolean makebitmap);
void HWR_CreatePlanePolygons(INT32 bspnum);
void HWR_CreateStaticLightmaps(INT32 bspnum);
-void HWR_LoadTextures(size_t pnumtextures);
void HWR_DrawFill(INT32 x, INT32 y, INT32 w, INT32 h, INT32 color);
void HWR_DrawFadeFill(INT32 x, INT32 y, INT32 w, INT32 h, INT32 color, UINT16 actualcolor, UINT8 strength);
void HWR_DrawConsoleFill(INT32 x, INT32 y, INT32 w, INT32 h, INT32 color, UINT32 actualcolor); // Lat: separate flags from color since color needs to be an uint to work right.
@@ -55,7 +54,6 @@ boolean HWR_Screenshot(const char *pathname);
void HWR_AddCommands(void);
void HWR_AddSessionCommands(void);
void transform(float *cx, float *cy, float *cz);
-FBITFIELD HWR_TranstableToAlpha(INT32 transtablenum, FSurfaceInfo *pSurf);
INT32 HWR_GetTextureUsed(void);
void HWR_DoPostProcessor(player_t *player);
void HWR_StartScreenWipe(void);
@@ -66,14 +64,24 @@ void HWR_DoTintedWipe(UINT8 wipenum, UINT8 scrnnum);
void HWR_MakeScreenFinalTexture(void);
void HWR_DrawScreenFinalTexture(int width, int height);
-// This stuff is put here so MD2's can use them
+// This stuff is put here so models can use them
void HWR_Lighting(FSurfaceInfo *Surface, INT32 light_level, extracolormap_t *colormap);
UINT8 HWR_FogBlockAlpha(INT32 light, extracolormap_t *colormap); // Let's see if this can work
-void HWR_ReadShaders(UINT16 wadnum, boolean PK3);
-boolean HWR_LoadShaders(void);
+UINT8 HWR_GetTranstableAlpha(INT32 transtablenum);
+FBITFIELD HWR_GetBlendModeFlag(INT32 ast);
+FBITFIELD HWR_SurfaceBlend(INT32 style, INT32 transtablenum, FSurfaceInfo *pSurf);
+FBITFIELD HWR_TranstableToAlpha(INT32 transtablenum, FSurfaceInfo *pSurf);
+
+boolean HWR_CompileShaders(void);
-extern CV_PossibleValue_t granisotropicmode_cons_t[];
+void HWR_LoadAllCustomShaders(void);
+void HWR_LoadCustomShadersFromFile(UINT16 wadnum, boolean PK3);
+const char *HWR_GetShaderName(INT32 shader);
+
+extern customshaderxlat_t shaderxlat[];
+
+extern CV_PossibleValue_t glanisotropicmode_cons_t[];
#ifdef ALAM_LIGHTING
extern consvar_t cv_gldynamiclighting;
@@ -82,7 +90,7 @@ extern consvar_t cv_glcoronas;
extern consvar_t cv_glcoronasize;
#endif
-extern consvar_t cv_glshaders;
+extern consvar_t cv_glshaders, cv_glallowshaders;
extern consvar_t cv_glmodels;
extern consvar_t cv_glmodelinterpolation;
extern consvar_t cv_glmodellighting;
@@ -108,22 +116,27 @@ extern FTransform atransform;
// Render stats
-extern int rs_hw_nodesorttime;
-extern int rs_hw_nodedrawtime;
-extern int rs_hw_spritesorttime;
-extern int rs_hw_spritedrawtime;
+extern precise_t ps_hw_skyboxtime;
+extern precise_t ps_hw_nodesorttime;
+extern precise_t ps_hw_nodedrawtime;
+extern precise_t ps_hw_spritesorttime;
+extern precise_t ps_hw_spritedrawtime;
// Render stats for batching
-extern int rs_hw_numpolys;
-extern int rs_hw_numverts;
-extern int rs_hw_numcalls;
-extern int rs_hw_numshaders;
-extern int rs_hw_numtextures;
-extern int rs_hw_numpolyflags;
-extern int rs_hw_numcolors;
-extern int rs_hw_batchsorttime;
-extern int rs_hw_batchdrawtime;
-
+extern int ps_hw_numpolys;
+extern int ps_hw_numverts;
+extern int ps_hw_numcalls;
+extern int ps_hw_numshaders;
+extern int ps_hw_numtextures;
+extern int ps_hw_numpolyflags;
+extern int ps_hw_numcolors;
+extern precise_t ps_hw_batchsorttime;
+extern precise_t ps_hw_batchdrawtime;
+
+extern boolean gl_init;
+extern boolean gl_maploaded;
+extern boolean gl_maptexturesloaded;
+extern boolean gl_sessioncommandsadded;
extern boolean gl_shadersavailable;
#endif
diff --git a/src/hardware/hw_md2.c b/src/hardware/hw_md2.c
index 5f513089618c63fb4198afaf1d7ba3d1b214c7e5..5caf344f75a3859751919338d8cea8b6badf1f92 100644
--- a/src/hardware/hw_md2.c
+++ b/src/hardware/hw_md2.c
@@ -92,7 +92,13 @@ static void md2_freeModel (model_t *model)
static model_t *md2_readModel(const char *filename)
{
//Filename checking fixed ~Monster Iestyn and Golden
- return LoadModel(va("%s"PATHSEP"%s", srb2home, filename), PU_STATIC);
+ if (FIL_FileExists(va("%s"PATHSEP"%s", srb2home, filename)))
+ return LoadModel(va("%s"PATHSEP"%s", srb2home, filename), PU_STATIC);
+
+ if (FIL_FileExists(va("%s"PATHSEP"%s", srb2path, filename)))
+ return LoadModel(va("%s"PATHSEP"%s", srb2path, filename), PU_STATIC);
+
+ return NULL;
}
static inline void md2_printModelInfo (model_t *model)
@@ -152,7 +158,7 @@ static GLTextureFormat_t PNG_Load(const char *filename, int *w, int *h, GLPatch_
jmp_buf jmpbuf;
#endif
#endif
- png_FILE_p png_FILE;
+ volatile png_FILE_p png_FILE;
//Filename checking fixed ~Monster Iestyn and Golden
char *pngfilename = va("%s"PATHSEP"models"PATHSEP"%s", srb2home, filename);
@@ -160,8 +166,12 @@ static GLTextureFormat_t PNG_Load(const char *filename, int *w, int *h, GLPatch_
png_FILE = fopen(pngfilename, "rb");
if (!png_FILE)
{
+ pngfilename = va("%s"PATHSEP"models"PATHSEP"%s", srb2path, filename);
+ FIL_ForceExtension(pngfilename, ".png");
+ png_FILE = fopen(pngfilename, "rb");
//CONS_Debug(DBG_RENDER, "M_SavePNG: Error on opening %s for loading\n", filename);
- return 0;
+ if (!png_FILE)
+ return 0;
}
png_ptr = png_create_read_struct(PNG_LIBPNG_VER_STRING, NULL,
@@ -288,7 +298,13 @@ static GLTextureFormat_t PCX_Load(const char *filename, int *w, int *h,
FIL_ForceExtension(pcxfilename, ".pcx");
file = fopen(pcxfilename, "rb");
if (!file)
- return 0;
+ {
+ pcxfilename = va("%s"PATHSEP"models"PATHSEP"%s", srb2path, filename);
+ FIL_ForceExtension(pcxfilename, ".pcx");
+ file = fopen(pcxfilename, "rb");
+ if (!file)
+ return 0;
+ }
if (fread(&header, sizeof (PcxHeader), 1, file) != 1)
{
@@ -348,48 +364,53 @@ static GLTextureFormat_t PCX_Load(const char *filename, int *w, int *h,
// -----------------+
static void md2_loadTexture(md2_t *model)
{
- GLPatch_t *grpatch;
+ patch_t *patch;
+ GLPatch_t *grPatch = NULL;
const char *filename = model->filename;
if (model->grpatch)
{
- grpatch = model->grpatch;
- Z_Free(grpatch->mipmap->data);
+ patch = model->grpatch;
+ grPatch = (GLPatch_t *)(patch->hardware);
+ if (grPatch)
+ Z_Free(grPatch->mipmap->data);
}
else
- {
- grpatch = Z_Calloc(sizeof *grpatch, PU_HWRPATCHINFO,
- &(model->grpatch));
- grpatch->mipmap = Z_Calloc(sizeof (GLMipmap_t), PU_HWRPATCHINFO, NULL);
- }
+ model->grpatch = patch = Patch_Create(NULL, 0, NULL);
- if (!grpatch->mipmap->downloaded && !grpatch->mipmap->data)
+ if (!patch->hardware)
+ Patch_AllocateHardwarePatch(patch);
+
+ if (grPatch == NULL)
+ grPatch = (GLPatch_t *)(patch->hardware);
+
+ if (!grPatch->mipmap->downloaded && !grPatch->mipmap->data)
{
int w = 0, h = 0;
UINT32 size;
RGBA_t *image;
#ifdef HAVE_PNG
- grpatch->mipmap->format = PNG_Load(filename, &w, &h, grpatch);
- if (grpatch->mipmap->format == 0)
+ grPatch->mipmap->format = PNG_Load(filename, &w, &h, grPatch);
+ if (grPatch->mipmap->format == 0)
#endif
- grpatch->mipmap->format = PCX_Load(filename, &w, &h, grpatch);
- if (grpatch->mipmap->format == 0)
+ grPatch->mipmap->format = PCX_Load(filename, &w, &h, grPatch);
+ if (grPatch->mipmap->format == 0)
{
model->notexturefile = true; // mark it so its not searched for again repeatedly
return;
}
- grpatch->mipmap->downloaded = 0;
- grpatch->mipmap->flags = 0;
+ grPatch->mipmap->downloaded = 0;
+ grPatch->mipmap->flags = 0;
- grpatch->width = (INT16)w;
- grpatch->height = (INT16)h;
- grpatch->mipmap->width = (UINT16)w;
- grpatch->mipmap->height = (UINT16)h;
+ patch->width = (INT16)w;
+ patch->height = (INT16)h;
+ grPatch->mipmap->width = (UINT16)w;
+ grPatch->mipmap->height = (UINT16)h;
// Lactozilla: Apply colour cube
- image = grpatch->mipmap->data;
+ image = grPatch->mipmap->data;
size = w*h;
while (size--)
{
@@ -397,7 +418,7 @@ static void md2_loadTexture(md2_t *model)
image++;
}
}
- HWD.pfnSetTexture(grpatch->mipmap);
+ HWD.pfnSetTexture(grPatch->mipmap);
}
// -----------------+
@@ -405,48 +426,53 @@ static void md2_loadTexture(md2_t *model)
// -----------------+
static void md2_loadBlendTexture(md2_t *model)
{
- GLPatch_t *grpatch;
+ patch_t *patch;
+ GLPatch_t *grPatch = NULL;
char *filename = Z_Malloc(strlen(model->filename)+7, PU_STATIC, NULL);
- strcpy(filename, model->filename);
+ strcpy(filename, model->filename);
FIL_ForceExtension(filename, "_blend.png");
if (model->blendgrpatch)
{
- grpatch = model->blendgrpatch;
- Z_Free(grpatch->mipmap->data);
+ patch = model->blendgrpatch;
+ grPatch = (GLPatch_t *)(patch->hardware);
+ if (grPatch)
+ Z_Free(grPatch->mipmap->data);
}
else
- {
- grpatch = Z_Calloc(sizeof *grpatch, PU_HWRPATCHINFO,
- &(model->blendgrpatch));
- grpatch->mipmap = Z_Calloc(sizeof (GLMipmap_t), PU_HWRPATCHINFO, NULL);
- }
+ model->blendgrpatch = patch = Patch_Create(NULL, 0, NULL);
+
+ if (!patch->hardware)
+ Patch_AllocateHardwarePatch(patch);
+
+ if (grPatch == NULL)
+ grPatch = (GLPatch_t *)(patch->hardware);
- if (!grpatch->mipmap->downloaded && !grpatch->mipmap->data)
+ if (!grPatch->mipmap->downloaded && !grPatch->mipmap->data)
{
int w = 0, h = 0;
#ifdef HAVE_PNG
- grpatch->mipmap->format = PNG_Load(filename, &w, &h, grpatch);
- if (grpatch->mipmap->format == 0)
+ grPatch->mipmap->format = PNG_Load(filename, &w, &h, grPatch);
+ if (grPatch->mipmap->format == 0)
#endif
- grpatch->mipmap->format = PCX_Load(filename, &w, &h, grpatch);
- if (grpatch->mipmap->format == 0)
+ grPatch->mipmap->format = PCX_Load(filename, &w, &h, grPatch);
+ if (grPatch->mipmap->format == 0)
{
model->noblendfile = true; // mark it so its not searched for again repeatedly
Z_Free(filename);
return;
}
- grpatch->mipmap->downloaded = 0;
- grpatch->mipmap->flags = 0;
+ grPatch->mipmap->downloaded = 0;
+ grPatch->mipmap->flags = 0;
- grpatch->width = (INT16)w;
- grpatch->height = (INT16)h;
- grpatch->mipmap->width = (UINT16)w;
- grpatch->mipmap->height = (UINT16)h;
+ patch->width = (INT16)w;
+ patch->height = (INT16)h;
+ grPatch->mipmap->width = (UINT16)w;
+ grPatch->mipmap->height = (UINT16)h;
}
- HWD.pfnSetTexture(grpatch->mipmap); // We do need to do this so that it can be cleared and knows to recreate it when necessary
+ HWD.pfnSetTexture(grPatch->mipmap); // We do need to do this so that it can be cleared and knows to recreate it when necessary
Z_Free(filename);
}
@@ -493,9 +519,13 @@ void HWR_InitModels(void)
if (!f)
{
- CONS_Printf("%s %s\n", M_GetText("Error while loading models.dat:"), strerror(errno));
- nomd2s = true;
- return;
+ f = fopen(va("%s"PATHSEP"%s", srb2path, "models.dat"), "rt");
+ if (!f)
+ {
+ CONS_Printf("%s %s\n", M_GetText("Error while loading models.dat:"), strerror(errno));
+ nomd2s = true;
+ return;
+ }
}
// length of the player model prefix
@@ -569,9 +599,13 @@ void HWR_AddPlayerModel(int skin) // For skins that were added after startup
if (!f)
{
- CONS_Printf("Error while loading models.dat\n");
- nomd2s = true;
- return;
+ f = fopen(va("%s"PATHSEP"%s", srb2path, "models.dat"), "rt");
+ if (!f)
+ {
+ CONS_Printf("%s %s\n", M_GetText("Error while loading models.dat:"), strerror(errno));
+ nomd2s = true;
+ return;
+ }
}
// length of the player model prefix
@@ -624,9 +658,13 @@ void HWR_AddSpriteModel(size_t spritenum) // For sprites that were added after s
if (!f)
{
- CONS_Printf("Error while loading models.dat\n");
- nomd2s = true;
- return;
+ f = fopen(va("%s"PATHSEP"%s", srb2path, "models.dat"), "rt");
+ if (!f)
+ {
+ CONS_Printf("%s %s\n", M_GetText("Error while loading models.dat:"), strerror(errno));
+ nomd2s = true;
+ return;
+ }
}
// Check for any models that match the names of sprite names!
@@ -664,8 +702,10 @@ spritemodelfound:
#define SETBRIGHTNESS(brightness,r,g,b) \
brightness = (UINT8)(((1063*(UINT16)(r))/5000) + ((3576*(UINT16)(g))/5000) + ((361*(UINT16)(b))/5000))
-static void HWR_CreateBlendedTexture(GLPatch_t *gpatch, GLPatch_t *blendgpatch, GLMipmap_t *grmip, INT32 skinnum, skincolornum_t color)
+static void HWR_CreateBlendedTexture(patch_t *gpatch, patch_t *blendgpatch, GLMipmap_t *grMipmap, INT32 skinnum, skincolornum_t color)
{
+ GLPatch_t *hwrPatch = gpatch->hardware;
+ GLPatch_t *hwrBlendPatch = blendgpatch->hardware;
UINT16 w = gpatch->width, h = gpatch->height;
UINT32 size = w*h;
RGBA_t *image, *blendimage, *cur, blendcolor;
@@ -678,28 +718,29 @@ static void HWR_CreateBlendedTexture(GLPatch_t *gpatch, GLPatch_t *blendgpatch,
memset(translation, 0, sizeof(translation));
memset(cutoff, 0, sizeof(cutoff));
- if (grmip->width == 0)
+ if (grMipmap->width == 0)
{
- grmip->width = gpatch->width;
- grmip->height = gpatch->height;
+ grMipmap->width = gpatch->width;
+ grMipmap->height = gpatch->height;
// no wrap around, no chroma key
- grmip->flags = 0;
+ grMipmap->flags = 0;
+
// setup the texture info
- grmip->format = GL_TEXFMT_RGBA;
+ grMipmap->format = GL_TEXFMT_RGBA;
}
- if (grmip->data)
+ if (grMipmap->data)
{
- Z_Free(grmip->data);
- grmip->data = NULL;
+ Z_Free(grMipmap->data);
+ grMipmap->data = NULL;
}
- cur = Z_Malloc(size*4, PU_HWRMODELTEXTURE, &grmip->data);
+ cur = Z_Malloc(size*4, PU_HWRMODELTEXTURE, &grMipmap->data);
memset(cur, 0x00, size*4);
- image = gpatch->mipmap->data;
- blendimage = blendgpatch->mipmap->data;
+ image = hwrPatch->mipmap->data;
+ blendimage = hwrBlendPatch->mipmap->data;
// TC_METALSONIC includes an actual skincolor translation, on top of its flashing.
if (skinnum == TC_METALSONIC)
@@ -1038,37 +1079,47 @@ skippixel:
#undef SETBRIGHTNESS
-static void HWR_GetBlendedTexture(GLPatch_t *gpatch, GLPatch_t *blendgpatch, INT32 skinnum, const UINT8 *colormap, skincolornum_t color)
+static void HWR_GetBlendedTexture(patch_t *patch, patch_t *blendpatch, INT32 skinnum, const UINT8 *colormap, skincolornum_t color)
{
// mostly copied from HWR_GetMappedPatch, hence the similarities and comment
- GLMipmap_t *grmip, *newmip;
+ GLPatch_t *grPatch = patch->hardware;
+ GLPatch_t *grBlendPatch = NULL;
+ GLMipmap_t *grMipmap, *newMipmap;
- if (colormap == colormaps || colormap == NULL)
+ if (blendpatch == NULL || colormap == colormaps || colormap == NULL)
{
// Don't do any blending
- HWD.pfnSetTexture(gpatch->mipmap);
+ HWD.pfnSetTexture(grPatch->mipmap);
return;
}
- if ((blendgpatch && blendgpatch->mipmap->format)
- && (gpatch->width != blendgpatch->width || gpatch->height != blendgpatch->height))
+ if ((blendpatch && (grBlendPatch = blendpatch->hardware) && grBlendPatch->mipmap->format)
+ && (patch->width != blendpatch->width || patch->height != blendpatch->height))
{
// Blend image exists, but it's bad.
- HWD.pfnSetTexture(gpatch->mipmap);
+ HWD.pfnSetTexture(grPatch->mipmap);
return;
}
// search for the mipmap
// skip the first (no colormap translated)
- for (grmip = gpatch->mipmap; grmip->nextcolormap; )
+ for (grMipmap = grPatch->mipmap; grMipmap->nextcolormap; )
{
- grmip = grmip->nextcolormap;
- if (grmip->colormap == colormap)
+ grMipmap = grMipmap->nextcolormap;
+ if (grMipmap->colormap && grMipmap->colormap->source == colormap)
{
- if (grmip->downloaded && grmip->data)
+ if (grMipmap->downloaded && grMipmap->data)
{
- HWD.pfnSetTexture(grmip); // found the colormap, set it to the correct texture
- Z_ChangeTag(grmip->data, PU_HWRMODELTEXTURE_UNLOCKED);
+ if (memcmp(grMipmap->colormap->data, colormap, 256 * sizeof(UINT8)))
+ {
+ M_Memcpy(grMipmap->colormap->data, colormap, 256 * sizeof(UINT8));
+ HWR_CreateBlendedTexture(patch, blendpatch, grMipmap, skinnum, color);
+ HWD.pfnUpdateTexture(grMipmap);
+ }
+ else
+ HWD.pfnSetTexture(grMipmap); // found the colormap, set it to the correct texture
+
+ Z_ChangeTag(grMipmap->data, PU_HWRMODELTEXTURE_UNLOCKED);
return;
}
}
@@ -1079,18 +1130,21 @@ static void HWR_GetBlendedTexture(GLPatch_t *gpatch, GLPatch_t *blendgpatch, INT
//BP: WARNING: don't free it manually without clearing the cache of harware renderer
// (it have a liste of mipmap)
- // this malloc is cleared in HWR_FreeTextureCache
+ // this malloc is cleared in HWR_FreeColormapCache
// (...) unfortunately z_malloc fragment alot the memory :(so malloc is better
- newmip = calloc(1, sizeof (*newmip));
- if (newmip == NULL)
+ newMipmap = calloc(1, sizeof (*newMipmap));
+ if (newMipmap == NULL)
I_Error("%s: Out of memory", "HWR_GetBlendedTexture");
- grmip->nextcolormap = newmip;
- newmip->colormap = colormap;
+ grMipmap->nextcolormap = newMipmap;
+
+ newMipmap->colormap = Z_Calloc(sizeof(*newMipmap->colormap), PU_HWRPATCHCOLMIPMAP, NULL);
+ newMipmap->colormap->source = colormap;
+ M_Memcpy(newMipmap->colormap->data, colormap, 256 * sizeof(UINT8));
- HWR_CreateBlendedTexture(gpatch, blendgpatch, newmip, skinnum, color);
+ HWR_CreateBlendedTexture(patch, blendpatch, newMipmap, skinnum, color);
- HWD.pfnSetTexture(newmip);
- Z_ChangeTag(newmip->data, PU_HWRMODELTEXTURE_UNLOCKED);
+ HWD.pfnSetTexture(newMipmap);
+ Z_ChangeTag(newMipmap->data, PU_HWRMODELTEXTURE_UNLOCKED);
}
#define NORMALFOG 0x00000000
@@ -1178,9 +1232,11 @@ static UINT8 HWR_GetModelSprite2(md2_t *md2, skin_t *skin, UINT8 spr2, player_t
}
// Adjust texture coords of model to fit into a patch's max_s and max_t
-static void adjustTextureCoords(model_t *model, GLPatch_t *gpatch)
+static void adjustTextureCoords(model_t *model, patch_t *patch)
{
int i;
+ GLPatch_t *gpatch = ((GLPatch_t *)patch->hardware);
+
for (i = 0; i < model->numMeshes; i++)
{
int j;
@@ -1258,7 +1314,7 @@ boolean HWR_DrawModel(gl_vissprite_t *spr)
light = R_GetPlaneLight(sector, spr->mobj->z + spr->mobj->height, false); // Always use the light at the top instead of whatever I was doing before
- if (!(spr->mobj->frame & FF_FULLBRIGHT))
+ if (!R_ThingIsFullBright(spr->mobj))
lightlevel = *sector->lightlist[light].lightlevel > 255 ? 255 : *sector->lightlist[light].lightlevel;
if (*sector->lightlist[light].extra_colormap)
@@ -1266,7 +1322,7 @@ boolean HWR_DrawModel(gl_vissprite_t *spr)
}
else
{
- if (!(spr->mobj->frame & FF_FULLBRIGHT))
+ if (!R_ThingIsFullBright(spr->mobj))
lightlevel = sector->lightlevel > 255 ? 255 : sector->lightlevel;
if (sector->extra_colormap)
@@ -1280,13 +1336,13 @@ boolean HWR_DrawModel(gl_vissprite_t *spr)
// Look at HWR_ProjectSprite for more
{
- GLPatch_t *gpatch;
+ patch_t *gpatch, *blendgpatch;
+ GLPatch_t *hwrPatch = NULL, *hwrBlendPatch = NULL;
INT32 durs = spr->mobj->state->tics;
INT32 tics = spr->mobj->tics;
- //mdlframe_t *next = NULL;
- const boolean papersprite = (spr->mobj->frame & FF_PAPERSPRITE);
- const UINT8 flip = (UINT8)(!(spr->mobj->eflags & MFE_VERTICALFLIP) != !(spr->mobj->frame & FF_VERTICALFLIP));
- const UINT8 hflip = (UINT8)(!(spr->mobj->mirrored) != !(spr->mobj->frame & FF_HORIZONTALFLIP));
+ const boolean papersprite = (R_ThingIsPaperSprite(spr->mobj) && !R_ThingIsFloorSprite(spr->mobj));
+ const UINT8 flip = (UINT8)(!(spr->mobj->eflags & MFE_VERTICALFLIP) != !R_ThingVerticallyFlipped(spr->mobj));
+ const UINT8 hflip = (UINT8)(!(spr->mobj->mirrored) != !R_ThingHorizontallyFlipped(spr->mobj));
spritedef_t *sprdef;
spriteframe_t *sprframe;
spriteinfo_t *sprinfo;
@@ -1298,15 +1354,16 @@ boolean HWR_DrawModel(gl_vissprite_t *spr)
//if (tics > durs)
//durs = tics;
- if (spr->mobj->flags2 & MF2_SHADOW)
- Surf.PolyColor.s.alpha = 0x40;
- else if (spr->mobj->frame & FF_TRANSMASK)
- HWR_TranstableToAlpha((spr->mobj->frame & FF_TRANSMASK)>>FF_TRANSSHIFT, &Surf);
+ if (spr->mobj->frame & FF_TRANSMASK)
+ Surf.PolyFlags = HWR_SurfaceBlend(spr->mobj->blendmode, (spr->mobj->frame & FF_TRANSMASK)>>FF_TRANSSHIFT, &Surf);
else
- Surf.PolyColor.s.alpha = 0xFF;
+ {
+ Surf.PolyColor.s.alpha = (spr->mobj->flags2 & MF2_SHADOW) ? 0x40 : 0xff;
+ Surf.PolyFlags = HWR_GetBlendModeFlag(spr->mobj->blendmode);
+ }
- // dont forget to enabled the depth test because we can't do this like
- // before: polygons models are not sorted
+ // don't forget to enable the depth test because we can't do this
+ // like before: model polygons are not sorted
// 1. load model+texture if not already loaded
// 2. draw model with correct position, rotation,...
@@ -1325,16 +1382,33 @@ boolean HWR_DrawModel(gl_vissprite_t *spr)
// texture loading before model init, so it knows if sprite graphics are used, which
// means that texture coordinates have to be adjusted
gpatch = md2->grpatch;
- if (!gpatch || ((!gpatch->mipmap->format || !gpatch->mipmap->downloaded) && !md2->notexturefile))
+ if (gpatch)
+ hwrPatch = ((GLPatch_t *)gpatch->hardware);
+
+ if (!gpatch || !hwrPatch
+ || ((!hwrPatch->mipmap->format || !hwrPatch->mipmap->downloaded) && !md2->notexturefile))
md2_loadTexture(md2);
- gpatch = md2->grpatch; // Load it again, because it isn't being loaded into gpatch after md2_loadtexture...
- if ((gpatch && gpatch->mipmap->format) // don't load the blend texture if the base texture isn't available
- && (!md2->blendgrpatch
- || ((!((GLPatch_t *)md2->blendgrpatch)->mipmap->format || !((GLPatch_t *)md2->blendgrpatch)->mipmap->downloaded)
- && !md2->noblendfile)))
+ // Load it again, because it isn't being loaded into gpatch after md2_loadtexture...
+ gpatch = md2->grpatch;
+ if (gpatch)
+ hwrPatch = ((GLPatch_t *)gpatch->hardware);
+
+ // Load blend texture
+ blendgpatch = md2->blendgrpatch;
+ if (blendgpatch)
+ hwrBlendPatch = ((GLPatch_t *)blendgpatch->hardware);
+
+ if ((gpatch && hwrPatch && hwrPatch->mipmap->format) // don't load the blend texture if the base texture isn't available
+ && (!blendgpatch || !hwrBlendPatch
+ || ((!hwrBlendPatch->mipmap->format || !hwrBlendPatch->mipmap->downloaded) && !md2->noblendfile)))
md2_loadBlendTexture(md2);
+ // Load it again, because it isn't being loaded into blendgpatch after md2_loadblendtexture...
+ blendgpatch = md2->blendgrpatch;
+ if (blendgpatch)
+ hwrBlendPatch = ((GLPatch_t *)blendgpatch->hardware);
+
if (md2->error)
return false; // we already failed loading this before :(
if (!md2->model)
@@ -1348,7 +1422,7 @@ boolean HWR_DrawModel(gl_vissprite_t *spr)
md2_printModelInfo(md2->model);
// If model uses sprite patch as texture, then
// adjust texture coordinates to take power of two textures into account
- if (!gpatch || !gpatch->mipmap->format)
+ if (!gpatch || !hwrPatch->mipmap->format)
adjustTextureCoords(md2->model, spr->gpatch);
// note down the max_s and max_t that end up in the VBO
md2->model->vbo_max_s = md2->model->max_s;
@@ -1367,7 +1441,7 @@ boolean HWR_DrawModel(gl_vissprite_t *spr)
finalscale = md2->scale;
//Hurdler: arf, I don't like that implementation at all... too much crappy
- if (gpatch && gpatch->mipmap->format) // else if meant that if a texture couldn't be loaded, it would just end up using something else's texture
+ if (gpatch && hwrPatch && hwrPatch->mipmap->format) // else if meant that if a texture couldn't be loaded, it would just end up using something else's texture
{
INT32 skinnum = TC_DEFAULT;
@@ -1400,21 +1474,19 @@ boolean HWR_DrawModel(gl_vissprite_t *spr)
}
// Translation or skin number found
- HWR_GetBlendedTexture(gpatch, (GLPatch_t *)md2->blendgrpatch, skinnum, spr->colormap, (skincolornum_t)spr->mobj->color);
+ HWR_GetBlendedTexture(gpatch, blendgpatch, skinnum, spr->colormap, (skincolornum_t)spr->mobj->color);
}
- else
+ else // Sprite
{
- // Sprite
- gpatch = spr->gpatch; //W_CachePatchNum(spr->patchlumpnum, PU_CACHE);
// Check if sprite dimensions are different from previously used sprite.
// If so, uvs need to be readjusted.
// Comparing floats with the != operator here should be okay because they
// are just copies of glpatches' max_s and max_t values.
// Instead of the != operator, memcmp is used to avoid a compiler warning.
- if (memcmp(&(gpatch->max_s), &(md2->model->max_s), sizeof(md2->model->max_s)) != 0 ||
- memcmp(&(gpatch->max_t), &(md2->model->max_t), sizeof(md2->model->max_t)) != 0)
- adjustTextureCoords(md2->model, gpatch);
- HWR_GetMappedPatch(gpatch, spr->colormap);
+ if (memcmp(&(hwrPatch->max_s), &(md2->model->max_s), sizeof(md2->model->max_s)) != 0 ||
+ memcmp(&(hwrPatch->max_t), &(md2->model->max_t), sizeof(md2->model->max_t)) != 0)
+ adjustTextureCoords(md2->model, spr->gpatch);
+ HWR_GetMappedPatch(spr->gpatch, spr->colormap);
}
if (spr->mobj->frame & FF_ANIMATE)
@@ -1572,7 +1644,7 @@ boolean HWR_DrawModel(gl_vissprite_t *spr)
p.mirror = atransform.mirror; // from Kart
#endif
- HWD.pfnSetShader(4); // model shader
+ HWD.pfnSetShader(SHADER_MODEL); // model shader
HWD.pfnDrawModel(md2->model, frame, durs, tics, nextFrame, &p, finalscale, flip, hflip, &Surf);
}
diff --git a/src/hardware/r_opengl/r_opengl.c b/src/hardware/r_opengl/r_opengl.c
index 6286da3a3c50944b569d85417e386bcc45ab5b93..af06a198fc3f110278c3894ee99a2e0596860e0c 100644
--- a/src/hardware/r_opengl/r_opengl.c
+++ b/src/hardware/r_opengl/r_opengl.c
@@ -58,8 +58,9 @@ static GLuint tex_downloaded = 0;
static GLfloat fov = 90.0f;
static FBITFIELD CurrentPolyFlags;
-static FTextureInfo *gl_cachetail = NULL;
-static FTextureInfo *gl_cachehead = NULL;
+// Linked list of all textures.
+static FTextureInfo *TexCacheTail = NULL;
+static FTextureInfo *TexCacheHead = NULL;
RGBA_t myPaletteData[256];
GLint screen_width = 0; // used by Draw2DLine()
@@ -91,12 +92,6 @@ static GLuint startScreenWipe = 0;
static GLuint endScreenWipe = 0;
static GLuint finalScreenTexture = 0;
-// Lactozilla: Set shader programs and uniforms
-static void *Shader_Load(FSurfaceInfo *Surface, GLRGBAFloat *poly, GLRGBAFloat *tint, GLRGBAFloat *fade);
-static void Shader_SetUniforms(FSurfaceInfo *Surface, GLRGBAFloat *poly, GLRGBAFloat *tint, GLRGBAFloat *fade);
-
-static GLRGBAFloat shader_defaultcolor = {1.0f, 1.0f, 1.0f, 1.0f};
-
// shortcut for ((float)1/i)
static const GLfloat byte2float[256] = {
0.000000f, 0.003922f, 0.007843f, 0.011765f, 0.015686f, 0.019608f, 0.023529f, 0.027451f,
@@ -425,6 +420,10 @@ static PFNglBufferData pglBufferData;
typedef void (APIENTRY * PFNglDeleteBuffers) (GLsizei n, const GLuint *buffers);
static PFNglDeleteBuffers pglDeleteBuffers;
+/* 2.0 functions */
+typedef void (APIENTRY * PFNglBlendEquation) (GLenum mode);
+static PFNglBlendEquation pglBlendEquation;
+
/* 1.2 Parms */
/* GL_CLAMP_TO_EDGE_EXT */
@@ -532,8 +531,8 @@ boolean SetupGLfunc(void)
return true;
}
-static boolean gl_allowshaders = false;
static boolean gl_shadersenabled = false;
+static hwdshaderoption_t gl_allowshaders = HWD_SHADEROPTION_OFF;
#ifdef GL_SHADERS
typedef GLuint (APIENTRY *PFNglCreateShader) (GLenum);
@@ -543,6 +542,7 @@ typedef void (APIENTRY *PFNglGetShaderiv) (GLuint, GLenum, GLint*);
typedef void (APIENTRY *PFNglGetShaderInfoLog) (GLuint, GLsizei, GLsizei*, GLchar*);
typedef void (APIENTRY *PFNglDeleteShader) (GLuint);
typedef GLuint (APIENTRY *PFNglCreateProgram) (void);
+typedef void (APIENTRY *PFNglDeleteProgram) (GLuint);
typedef void (APIENTRY *PFNglAttachShader) (GLuint, GLuint);
typedef void (APIENTRY *PFNglLinkProgram) (GLuint);
typedef void (APIENTRY *PFNglGetProgramiv) (GLuint, GLenum, GLint*);
@@ -564,6 +564,7 @@ static PFNglGetShaderiv pglGetShaderiv;
static PFNglGetShaderInfoLog pglGetShaderInfoLog;
static PFNglDeleteShader pglDeleteShader;
static PFNglCreateProgram pglCreateProgram;
+static PFNglDeleteProgram pglDeleteProgram;
static PFNglAttachShader pglAttachShader;
static PFNglLinkProgram pglLinkProgram;
static PFNglGetProgramiv pglGetProgramiv;
@@ -578,15 +579,6 @@ static PFNglUniform2fv pglUniform2fv;
static PFNglUniform3fv pglUniform3fv;
static PFNglGetUniformLocation pglGetUniformLocation;
-#define MAXSHADERS 16
-#define MAXSHADERPROGRAMS 16
-
-// 18032019
-static char *gl_customvertexshaders[MAXSHADERS];
-static char *gl_customfragmentshaders[MAXSHADERS];
-static GLuint gl_currentshaderprogram = 0;
-static boolean gl_shaderprogramchanged = true;
-
// 13062019
typedef enum
{
@@ -604,23 +596,85 @@ typedef enum
gluniform_max,
} gluniform_t;
-typedef struct gl_shaderprogram_s
+typedef struct gl_shader_s
{
GLuint program;
- boolean custom;
GLint uniforms[gluniform_max+1];
-} gl_shaderprogram_t;
-static gl_shaderprogram_t gl_shaderprograms[MAXSHADERPROGRAMS];
+ boolean custom;
+} gl_shader_t;
+
+static gl_shader_t gl_shaders[HWR_MAXSHADERS];
+static gl_shader_t gl_usershaders[HWR_MAXSHADERS];
+static shadersource_t gl_customshaders[HWR_MAXSHADERS];
+
+// 09102020
+typedef struct gl_shaderstate_s
+{
+ gl_shader_t *current;
+ GLuint type;
+ GLuint program;
+ boolean changed;
+} gl_shaderstate_t;
+static gl_shaderstate_t gl_shaderstate;
// Shader info
static INT32 shader_leveltime = 0;
-// ========================
-// Fragment shader macros
-// ========================
+// Lactozilla: Shader functions
+static boolean Shader_CompileProgram(gl_shader_t *shader, GLint i, const GLchar *vert_shader, const GLchar *frag_shader);
+static void Shader_CompileError(const char *message, GLuint program, INT32 shadernum);
+static void Shader_SetUniforms(FSurfaceInfo *Surface, GLRGBAFloat *poly, GLRGBAFloat *tint, GLRGBAFloat *fade);
+
+static GLRGBAFloat shader_defaultcolor = {1.0f, 1.0f, 1.0f, 1.0f};
+
+// ================
+// Vertex shaders
+// ================
+
+//
+// Generic vertex shader
+//
+
+#define GLSL_DEFAULT_VERTEX_SHADER \
+ "void main()\n" \
+ "{\n" \
+ "gl_Position = gl_ProjectionMatrix * gl_ModelViewMatrix * gl_Vertex;\n" \
+ "gl_FrontColor = gl_Color;\n" \
+ "gl_TexCoord[0].xy = gl_MultiTexCoord0.xy;\n" \
+ "gl_ClipVertex = gl_ModelViewMatrix * gl_Vertex;\n" \
+ "}\0"
+
+// replicates the way fixed function lighting is used by the model lighting option,
+// stores the lighting result to gl_Color
+// (ambient lighting of 0.75 and diffuse lighting from above)
+#define GLSL_MODEL_LIGHTING_VERTEX_SHADER \
+ "void main()\n" \
+ "{\n" \
+ "float nDotVP = dot(gl_Normal, vec3(0, 1, 0));\n" \
+ "float light = 0.75 + max(nDotVP, 0.0);\n" \
+ "gl_Position = gl_ProjectionMatrix * gl_ModelViewMatrix * gl_Vertex;\n" \
+ "gl_FrontColor = vec4(light, light, light, 1.0);\n" \
+ "gl_TexCoord[0].xy = gl_MultiTexCoord0.xy;\n" \
+ "gl_ClipVertex = gl_ModelViewMatrix * gl_Vertex;\n" \
+ "}\0"
+
+// ==================
+// Fragment shaders
+// ==================
//
-// GLSL Software fragment shader
+// Generic fragment shader
+//
+
+#define GLSL_DEFAULT_FRAGMENT_SHADER \
+ "uniform sampler2D tex;\n" \
+ "uniform vec4 poly_color;\n" \
+ "void main(void) {\n" \
+ "gl_FragColor = texture2D(tex, gl_TexCoord[0].st) * poly_color;\n" \
+ "}\0"
+
+//
+// Software fragment shader
//
#define GLSL_DOOM_COLORMAP \
@@ -761,22 +815,10 @@ static INT32 shader_leveltime = 0;
"gl_FragColor = final_color;\n" \
"}\0"
-//
-// GLSL generic fragment shader
-//
-
-#define GLSL_DEFAULT_FRAGMENT_SHADER \
- "uniform sampler2D tex;\n" \
- "uniform vec4 poly_color;\n" \
- "void main(void) {\n" \
- "gl_FragColor = texture2D(tex, gl_TexCoord[0].st) * poly_color;\n" \
- "}\0"
-
//
// Sky fragment shader
// Modulates poly_color with gl_Color
//
-
#define GLSL_SKY_FRAGMENT_SHADER \
"uniform sampler2D tex;\n" \
"uniform vec4 poly_color;\n" \
@@ -784,97 +826,42 @@ static INT32 shader_leveltime = 0;
"gl_FragColor = texture2D(tex, gl_TexCoord[0].st) * gl_Color * poly_color;\n" \
"}\0"
-static const char *fragment_shaders[] = {
- // Default fragment shader
- GLSL_DEFAULT_FRAGMENT_SHADER,
-
- // Floor fragment shader
- GLSL_SOFTWARE_FRAGMENT_SHADER,
-
- // Wall fragment shader
- GLSL_SOFTWARE_FRAGMENT_SHADER,
-
- // Sprite fragment shader
- GLSL_SOFTWARE_FRAGMENT_SHADER,
-
- // Model fragment shader
- GLSL_SOFTWARE_FRAGMENT_SHADER,
-
- // Water fragment shader
- GLSL_WATER_FRAGMENT_SHADER,
-
- // Fog fragment shader
- GLSL_FOG_FRAGMENT_SHADER,
-
- // Sky fragment shader
- GLSL_SKY_FRAGMENT_SHADER,
-
- // Model fragment shader + diffuse lighting from above
- GLSL_SOFTWARE_MODEL_LIGHTING_FRAGMENT_SHADER,
-
- NULL,
-};
-
-// ======================
-// Vertex shader macros
-// ======================
-
-//
-// GLSL generic vertex shader
-//
-
-#define GLSL_DEFAULT_VERTEX_SHADER \
- "void main()\n" \
- "{\n" \
- "gl_Position = gl_ProjectionMatrix * gl_ModelViewMatrix * gl_Vertex;\n" \
- "gl_FrontColor = gl_Color;\n" \
- "gl_TexCoord[0].xy = gl_MultiTexCoord0.xy;\n" \
- "gl_ClipVertex = gl_ModelViewMatrix * gl_Vertex;\n" \
- "}\0"
-
-// replicates the way fixed function lighting is used by the model lighting option,
-// stores the lighting result to gl_Color
-// (ambient lighting of 0.75 and diffuse lighting from above)
-#define GLSL_MODEL_LIGHTING_VERTEX_SHADER \
- "void main()\n" \
- "{\n" \
- "float nDotVP = dot(gl_Normal, vec3(0, 1, 0));\n" \
- "float light = 0.75 + max(nDotVP, 0.0);\n" \
- "gl_Position = gl_ProjectionMatrix * gl_ModelViewMatrix * gl_Vertex;\n" \
- "gl_FrontColor = vec4(light, light, light, 1.0);\n" \
- "gl_TexCoord[0].xy = gl_MultiTexCoord0.xy;\n" \
- "gl_ClipVertex = gl_ModelViewMatrix * gl_Vertex;\n" \
- "}\0"
+// ================
+// Shader sources
+// ================
-static const char *vertex_shaders[] = {
- // Default vertex shader
- GLSL_DEFAULT_VERTEX_SHADER,
+static struct {
+ const char *vertex;
+ const char *fragment;
+} const gl_shadersources[] = {
+ // Default shader
+ {GLSL_DEFAULT_VERTEX_SHADER, GLSL_DEFAULT_FRAGMENT_SHADER},
- // Floor vertex shader
- GLSL_DEFAULT_VERTEX_SHADER,
+ // Floor shader
+ {GLSL_DEFAULT_VERTEX_SHADER, GLSL_SOFTWARE_FRAGMENT_SHADER},
- // Wall vertex shader
- GLSL_DEFAULT_VERTEX_SHADER,
+ // Wall shader
+ {GLSL_DEFAULT_VERTEX_SHADER, GLSL_SOFTWARE_FRAGMENT_SHADER},
- // Sprite vertex shader
- GLSL_DEFAULT_VERTEX_SHADER,
+ // Sprite shader
+ {GLSL_DEFAULT_VERTEX_SHADER, GLSL_SOFTWARE_FRAGMENT_SHADER},
- // Model vertex shader
- GLSL_DEFAULT_VERTEX_SHADER,
+ // Model shader
+ {GLSL_DEFAULT_VERTEX_SHADER, GLSL_SOFTWARE_FRAGMENT_SHADER},
- // Water vertex shader
- GLSL_DEFAULT_VERTEX_SHADER,
+ // Model shader + diffuse lighting from above
+ {GLSL_MODEL_LIGHTING_VERTEX_SHADER, GLSL_SOFTWARE_MODEL_LIGHTING_FRAGMENT_SHADER},
- // Fog vertex shader
- GLSL_DEFAULT_VERTEX_SHADER,
+ // Water shader
+ {GLSL_DEFAULT_VERTEX_SHADER, GLSL_WATER_FRAGMENT_SHADER},
- // Sky vertex shader
- GLSL_DEFAULT_VERTEX_SHADER,
+ // Fog shader
+ {GLSL_DEFAULT_VERTEX_SHADER, GLSL_FOG_FRAGMENT_SHADER},
- // Model vertex shader + diffuse lighting from above
- GLSL_MODEL_LIGHTING_VERTEX_SHADER,
+ // Sky shader
+ {GLSL_DEFAULT_VERTEX_SHADER, GLSL_SKY_FRAGMENT_SHADER},
- NULL,
+ {NULL, NULL},
};
#endif // GL_SHADERS
@@ -892,6 +879,9 @@ void SetupGLFunc4(void)
pglBufferData = GetGLFunc("glBufferData");
pglDeleteBuffers = GetGLFunc("glDeleteBuffers");
+ /* 2.0 funcs */
+ pglBlendEquation = GetGLFunc("glBlendEquation");
+
#ifdef GL_SHADERS
pglCreateShader = GetGLFunc("glCreateShader");
pglShaderSource = GetGLFunc("glShaderSource");
@@ -900,6 +890,7 @@ void SetupGLFunc4(void)
pglGetShaderInfoLog = GetGLFunc("glGetShaderInfoLog");
pglDeleteShader = GetGLFunc("glDeleteShader");
pglCreateProgram = GetGLFunc("glCreateProgram");
+ pglDeleteProgram = GetGLFunc("glDeleteProgram");
pglAttachShader = GetGLFunc("glAttachShader");
pglLinkProgram = GetGLFunc("glLinkProgram");
pglGetProgramiv = GetGLFunc("glGetProgramiv");
@@ -919,137 +910,61 @@ void SetupGLFunc4(void)
pgluBuild2DMipmaps = GetGLFunc("gluBuild2DMipmaps");
}
-// jimita
-EXPORT boolean HWRAPI(LoadShaders) (void)
+EXPORT boolean HWRAPI(CompileShaders) (void)
{
#ifdef GL_SHADERS
- GLuint gl_vertShader, gl_fragShader;
- GLint i, result;
+ GLint i;
- if (!pglUseProgram) return false;
+ if (!pglUseProgram)
+ return false;
- gl_customvertexshaders[0] = NULL;
- gl_customfragmentshaders[0] = NULL;
+ gl_customshaders[SHADER_DEFAULT].vertex = NULL;
+ gl_customshaders[SHADER_DEFAULT].fragment = NULL;
- for (i = 0; vertex_shaders[i] && fragment_shaders[i]; i++)
+ for (i = 0; gl_shadersources[i].vertex && gl_shadersources[i].fragment; i++)
{
- gl_shaderprogram_t *shader;
- const GLchar* vert_shader = vertex_shaders[i];
- const GLchar* frag_shader = fragment_shaders[i];
- boolean custom = ((gl_customvertexshaders[i] || gl_customfragmentshaders[i]) && (i > 0));
+ gl_shader_t *shader, *usershader;
+ const GLchar *vert_shader = gl_shadersources[i].vertex;
+ const GLchar *frag_shader = gl_shadersources[i].fragment;
- // 18032019
- if (gl_customvertexshaders[i])
- vert_shader = gl_customvertexshaders[i];
- if (gl_customfragmentshaders[i])
- frag_shader = gl_customfragmentshaders[i];
-
- if (i >= MAXSHADERS)
- break;
- if (i >= MAXSHADERPROGRAMS)
+ if (i >= HWR_MAXSHADERS)
break;
- shader = &gl_shaderprograms[i];
- shader->program = 0;
- shader->custom = custom;
-
- //
- // Load and compile vertex shader
- //
- gl_vertShader = pglCreateShader(GL_VERTEX_SHADER);
- if (!gl_vertShader)
- {
- GL_MSG_Error("LoadShaders: Error creating vertex shader %d\n", i);
- continue;
- }
-
- pglShaderSource(gl_vertShader, 1, &vert_shader, NULL);
- pglCompileShader(gl_vertShader);
-
- // check for compile errors
- pglGetShaderiv(gl_vertShader, GL_COMPILE_STATUS, &result);
- if (result == GL_FALSE)
- {
- GLchar* infoLog;
- GLint logLength;
-
- pglGetShaderiv(gl_vertShader, GL_INFO_LOG_LENGTH, &logLength);
-
- infoLog = malloc(logLength);
- pglGetShaderInfoLog(gl_vertShader, logLength, NULL, infoLog);
-
- GL_MSG_Error("LoadShaders: Error compiling vertex shader %d\n%s", i, infoLog);
- continue;
- }
+ shader = &gl_shaders[i];
+ usershader = &gl_usershaders[i];
- //
- // Load and compile fragment shader
- //
- gl_fragShader = pglCreateShader(GL_FRAGMENT_SHADER);
- if (!gl_fragShader)
- {
- GL_MSG_Error("LoadShaders: Error creating fragment shader %d\n", i);
- continue;
- }
-
- pglShaderSource(gl_fragShader, 1, &frag_shader, NULL);
- pglCompileShader(gl_fragShader);
-
- // check for compile errors
- pglGetShaderiv(gl_fragShader, GL_COMPILE_STATUS, &result);
- if (result == GL_FALSE)
- {
- GLchar* infoLog;
- GLint logLength;
+ if (shader->program)
+ pglDeleteProgram(shader->program);
+ if (usershader->program)
+ pglDeleteProgram(usershader->program);
- pglGetShaderiv(gl_fragShader, GL_INFO_LOG_LENGTH, &logLength);
+ shader->program = 0;
+ usershader->program = 0;
- infoLog = malloc(logLength);
- pglGetShaderInfoLog(gl_fragShader, logLength, NULL, infoLog);
+ if (!Shader_CompileProgram(shader, i, vert_shader, frag_shader))
+ shader->program = 0;
- GL_MSG_Error("LoadShaders: Error compiling fragment shader %d\n%s", i, infoLog);
+ // Compile custom shader
+ if ((i == SHADER_DEFAULT) || !(gl_customshaders[i].vertex || gl_customshaders[i].fragment))
continue;
- }
-
- shader->program = pglCreateProgram();
- pglAttachShader(shader->program, gl_vertShader);
- pglAttachShader(shader->program, gl_fragShader);
- pglLinkProgram(shader->program);
- // check link status
- pglGetProgramiv(shader->program, GL_LINK_STATUS, &result);
-
- // delete the shader objects
- pglDeleteShader(gl_vertShader);
- pglDeleteShader(gl_fragShader);
+ // 18032019
+ if (gl_customshaders[i].vertex)
+ vert_shader = gl_customshaders[i].vertex;
+ if (gl_customshaders[i].fragment)
+ frag_shader = gl_customshaders[i].fragment;
- // couldn't link?
- if (result != GL_TRUE)
+ if (!Shader_CompileProgram(usershader, i, vert_shader, frag_shader))
{
- shader->program = 0;
- shader->custom = false;
- GL_MSG_Error("LoadShaders: Error linking shader program %d\n", i);
- continue;
+ GL_MSG_Warning("CompileShaders: Could not compile custom shader program for %s\n", HWR_GetShaderName(i));
+ usershader->program = 0;
}
-
- // 13062019
-#define GETUNI(uniform) pglGetUniformLocation(shader->program, uniform);
-
- // lighting
- shader->uniforms[gluniform_poly_color] = GETUNI("poly_color");
- shader->uniforms[gluniform_tint_color] = GETUNI("tint_color");
- shader->uniforms[gluniform_fade_color] = GETUNI("fade_color");
- shader->uniforms[gluniform_lighting] = GETUNI("lighting");
- shader->uniforms[gluniform_fade_start] = GETUNI("fade_start");
- shader->uniforms[gluniform_fade_end] = GETUNI("fade_end");
-
- // misc. (custom shaders)
- shader->uniforms[gluniform_leveltime] = GETUNI("leveltime");
-
-#undef GETUNI
}
-#endif
+
return true;
+#else
+ return false;
+#endif
}
//
@@ -1077,25 +992,34 @@ EXPORT void HWRAPI(SetShaderInfo) (hwdshaderinfo_t info, INT32 value)
//
// Custom shader loading
//
-EXPORT void HWRAPI(LoadCustomShader) (int number, char *shader, size_t size, boolean fragment)
+EXPORT void HWRAPI(LoadCustomShader) (int number, char *code, size_t size, boolean isfragment)
{
#ifdef GL_SHADERS
- if (!pglUseProgram) return;
- if (number < 1 || number > MAXSHADERS)
- I_Error("LoadCustomShader(): cannot load shader %d (max %d)", number, MAXSHADERS);
+ shadersource_t *shader;
- if (fragment)
- {
- gl_customfragmentshaders[number] = malloc(size+1);
- strncpy(gl_customfragmentshaders[number], shader, size);
- gl_customfragmentshaders[number][size] = 0;
+ if (!pglUseProgram)
+ return;
+
+ if (number < 1 || number > HWR_MAXSHADERS)
+ I_Error("LoadCustomShader: cannot load shader %d (min 1, max %d)", number, HWR_MAXSHADERS);
+ else if (code == NULL)
+ I_Error("LoadCustomShader: empty shader");
+
+ shader = &gl_customshaders[number];
+
+#define COPYSHADER(source) { \
+ if (shader->source) \
+ free(shader->source); \
+ shader->source = malloc(size+1); \
+ strncpy(shader->source, code, size); \
+ shader->source[size] = 0; \
}
+
+ if (isfragment)
+ COPYSHADER(fragment)
else
- {
- gl_customvertexshaders[number] = malloc(size+1);
- strncpy(gl_customvertexshaders[number], shader, size);
- gl_customvertexshaders[number][size] = 0;
- }
+ COPYSHADER(vertex)
+
#else
(void)number;
(void)shader;
@@ -1104,34 +1028,45 @@ EXPORT void HWRAPI(LoadCustomShader) (int number, char *shader, size_t size, boo
#endif
}
-EXPORT boolean HWRAPI(InitCustomShaders) (void)
+EXPORT void HWRAPI(SetShader) (int type)
{
#ifdef GL_SHADERS
- KillShaders();
- return LoadShaders();
-#endif
-}
-
-EXPORT void HWRAPI(SetShader) (int shader)
-{
-#ifdef GL_SHADERS
- if (gl_allowshaders)
+ if (gl_allowshaders != HWD_SHADEROPTION_OFF)
{
+ gl_shader_t *shader = gl_shaderstate.current;
+
// If using model lighting, set the appropriate shader.
// However don't override a custom shader.
- // Should use an enum or something...
- if (shader == 4 && model_lighting && !gl_shaderprograms[4].custom)
- shader = 8;
- if ((GLuint)shader != gl_currentshaderprogram)
+ if (type == SHADER_MODEL && model_lighting
+ && !(gl_shaders[SHADER_MODEL].custom && !gl_shaders[SHADER_MODEL_LIGHTING].custom))
+ type = SHADER_MODEL_LIGHTING;
+
+ if ((shader == NULL) || (GLuint)type != gl_shaderstate.type)
{
- gl_currentshaderprogram = shader;
- gl_shaderprogramchanged = true;
+ gl_shader_t *baseshader = &gl_shaders[type];
+ gl_shader_t *usershader = &gl_usershaders[type];
+
+ if (usershader->program)
+ shader = (gl_allowshaders == HWD_SHADEROPTION_NOCUSTOM) ? baseshader : usershader;
+ else
+ shader = baseshader;
+
+ gl_shaderstate.current = shader;
+ gl_shaderstate.type = type;
+ gl_shaderstate.changed = true;
+ }
+
+ if (gl_shaderstate.program != shader->program)
+ {
+ gl_shaderstate.program = shader->program;
+ gl_shaderstate.changed = true;
}
- gl_shadersenabled = true;
+
+ gl_shadersenabled = (shader->program != 0);
return;
}
#else
- (void)shader;
+ (void)type;
#endif
gl_shadersenabled = false;
}
@@ -1139,16 +1074,34 @@ EXPORT void HWRAPI(SetShader) (int shader)
EXPORT void HWRAPI(UnSetShader) (void)
{
#ifdef GL_SHADERS
- gl_shadersenabled = false;
- gl_currentshaderprogram = 0;
- if (!pglUseProgram) return;
- pglUseProgram(0);
+ gl_shaderstate.current = NULL;
+ gl_shaderstate.type = 0;
+ gl_shaderstate.program = 0;
+
+ if (pglUseProgram)
+ pglUseProgram(0);
#endif
+
+ gl_shadersenabled = false;
}
-EXPORT void HWRAPI(KillShaders) (void)
+EXPORT void HWRAPI(CleanShaders) (void)
{
- // unused.........................
+ INT32 i;
+
+ for (i = 1; i < HWR_MAXSHADERS; i++)
+ {
+ shadersource_t *shader = &gl_customshaders[i];
+
+ if (shader->vertex)
+ free(shader->vertex);
+
+ if (shader->fragment)
+ free(shader->fragment);
+
+ shader->vertex = NULL;
+ shader->fragment = NULL;
+ }
}
// -----------------+
@@ -1286,6 +1239,7 @@ void SetStates(void)
pglTexEnvi(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
+ pglEnable(GL_ALPHA_TEST);
pglAlphaFunc(GL_NOTEQUAL, 0.0f);
//pglBlendFunc(GL_ONE, GL_ZERO); // copy pixel to frame buffer (opaque)
@@ -1328,6 +1282,41 @@ void SetStates(void)
}
+// -----------------+
+// DeleteTexture : Deletes a texture from the GPU and frees its data
+// -----------------+
+EXPORT void HWRAPI(DeleteTexture) (GLMipmap_t *pTexInfo)
+{
+ FTextureInfo *head = TexCacheHead;
+
+ if (!pTexInfo)
+ return;
+ else if (pTexInfo->downloaded)
+ pglDeleteTextures(1, (GLuint *)&pTexInfo->downloaded);
+
+ while (head)
+ {
+ if (head->downloaded == pTexInfo->downloaded)
+ {
+ if (head->next)
+ head->next->prev = head->prev;
+ else // no next -> tail is being deleted -> update TexCacheTail
+ TexCacheTail = head->prev;
+ if (head->prev)
+ head->prev->next = head->next;
+ else // no prev -> head is being deleted -> update TexCacheHead
+ TexCacheHead = head->next;
+ free(head);
+ break;
+ }
+
+ head = head->next;
+ }
+
+ pTexInfo->downloaded = 0;
+}
+
+
// -----------------+
// Flush : flush OpenGL textures
// : Clear list of downloaded mipmaps
@@ -1336,15 +1325,25 @@ void Flush(void)
{
//GL_DBG_Printf ("HWR_Flush()\n");
- while (gl_cachehead)
+ while (TexCacheHead)
{
- if (gl_cachehead->downloaded)
- pglDeleteTextures(1, (GLuint *)&gl_cachehead->downloaded);
- gl_cachehead->downloaded = 0;
- gl_cachehead = gl_cachehead->nextmipmap;
+ FTextureInfo *pTexInfo = TexCacheHead;
+ GLMipmap_t *texture = pTexInfo->texture;
+
+ if (pTexInfo->downloaded)
+ {
+ pglDeleteTextures(1, (GLuint *)&pTexInfo->downloaded);
+ pTexInfo->downloaded = 0;
+ }
+
+ if (texture)
+ texture->downloaded = 0;
+
+ TexCacheHead = pTexInfo->next;
+ free(pTexInfo);
}
- gl_cachetail = gl_cachehead = NULL; //Hurdler: well, gl_cachehead is already NULL
+ TexCacheTail = TexCacheHead = NULL; //Hurdler: well, TexCacheHead is already NULL
tex_downloaded = 0;
}
@@ -1545,64 +1544,108 @@ EXPORT void HWRAPI(Draw2DLine) (F2DCoord * v1,
pglEnable(GL_TEXTURE_2D);
}
+
+// -----------------+
+// SetBlend : Set render mode
+// -----------------+
+// PF_Masked - we could use an ALPHA_TEST of GL_EQUAL, and alpha ref of 0,
+// is it faster when pixels are discarded ?
+
static void Clamp2D(GLenum pname)
{
pglTexParameteri(GL_TEXTURE_2D, pname, GL_CLAMP); // fallback clamp
pglTexParameteri(GL_TEXTURE_2D, pname, GL_CLAMP_TO_EDGE);
}
+static void SetBlendEquation(GLenum mode)
+{
+ if (pglBlendEquation)
+ pglBlendEquation(mode);
+}
+
+static void SetBlendMode(FBITFIELD flags)
+{
+ // Set blending function
+ switch (flags)
+ {
+ case PF_Translucent & PF_Blending:
+ pglBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); // alpha = level of transparency
+ break;
+ case PF_Masked & PF_Blending:
+ // Hurdler: does that mean lighting is only made by alpha src?
+ // it sounds ok, but not for polygonsmooth
+ pglBlendFunc(GL_SRC_ALPHA, GL_ZERO); // 0 alpha = holes in texture
+ break;
+ case PF_Additive & PF_Blending:
+ case PF_Subtractive & PF_Blending:
+ case PF_ReverseSubtract & PF_Blending:
+ pglBlendFunc(GL_SRC_ALPHA, GL_ONE); // src * alpha + dest
+ break;
+ case PF_Environment & PF_Blending:
+ pglBlendFunc(GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
+ break;
+ case PF_Multiplicative & PF_Blending:
+ pglBlendFunc(GL_DST_COLOR, GL_ZERO);
+ break;
+ case PF_Fog & PF_Fog:
+ // Sryder: Fog
+ // multiplies input colour by input alpha, and destination colour by input colour, then adds them
+ pglBlendFunc(GL_SRC_ALPHA, GL_SRC_COLOR);
+ break;
+ default: // must be 0, otherwise it's an error
+ // No blending
+ pglBlendFunc(GL_ONE, GL_ZERO); // the same as no blending
+ break;
+ }
+
+ // Set blending equation
+ switch (flags)
+ {
+ case PF_Subtractive & PF_Blending:
+ SetBlendEquation(GL_FUNC_SUBTRACT);
+ break;
+ case PF_ReverseSubtract & PF_Blending:
+ // good for shadow
+ // not really but what else ?
+ SetBlendEquation(GL_FUNC_REVERSE_SUBTRACT);
+ break;
+ default:
+ SetBlendEquation(GL_FUNC_ADD);
+ break;
+ }
+
+ // Alpha test
+ switch (flags)
+ {
+ case PF_Masked & PF_Blending:
+ pglAlphaFunc(GL_GREATER, 0.5f);
+ break;
+ case PF_Translucent & PF_Blending:
+ case PF_Additive & PF_Blending:
+ case PF_Subtractive & PF_Blending:
+ case PF_ReverseSubtract & PF_Blending:
+ case PF_Environment & PF_Blending:
+ case PF_Multiplicative & PF_Blending:
+ pglAlphaFunc(GL_NOTEQUAL, 0.0f);
+ break;
+ case PF_Fog & PF_Fog:
+ pglAlphaFunc(GL_ALWAYS, 0.0f); // Don't discard zero alpha fragments
+ break;
+ default:
+ pglAlphaFunc(GL_GREATER, 0.5f);
+ break;
+ }
+}
-// -----------------+
-// SetBlend : Set render mode
-// -----------------+
-// PF_Masked - we could use an ALPHA_TEST of GL_EQUAL, and alpha ref of 0,
-// is it faster when pixels are discarded ?
EXPORT void HWRAPI(SetBlend) (FBITFIELD PolyFlags)
{
FBITFIELD Xor;
Xor = CurrentPolyFlags^PolyFlags;
- if (Xor & (PF_Blending|PF_RemoveYWrap|PF_ForceWrapX|PF_ForceWrapY|PF_Occlude|PF_NoTexture|PF_Modulated|PF_NoDepthTest|PF_Decal|PF_Invisible|PF_NoAlphaTest))
+ if (Xor & (PF_Blending|PF_RemoveYWrap|PF_ForceWrapX|PF_ForceWrapY|PF_Occlude|PF_NoTexture|PF_Modulated|PF_NoDepthTest|PF_Decal|PF_Invisible))
{
- if (Xor&(PF_Blending)) // if blending mode must be changed
- {
- switch (PolyFlags & PF_Blending) {
- case PF_Translucent & PF_Blending:
- pglBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); // alpha = level of transparency
- pglAlphaFunc(GL_NOTEQUAL, 0.0f);
- break;
- case PF_Masked & PF_Blending:
- // Hurdler: does that mean lighting is only made by alpha src?
- // it sounds ok, but not for polygonsmooth
- pglBlendFunc(GL_SRC_ALPHA, GL_ZERO); // 0 alpha = holes in texture
- pglAlphaFunc(GL_GREATER, 0.5f);
- break;
- case PF_Additive & PF_Blending:
- pglBlendFunc(GL_SRC_ALPHA, GL_ONE); // src * alpha + dest
- pglAlphaFunc(GL_NOTEQUAL, 0.0f);
- break;
- case PF_Environment & PF_Blending:
- pglBlendFunc(GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
- pglAlphaFunc(GL_NOTEQUAL, 0.0f);
- break;
- case PF_Substractive & PF_Blending:
- // good for shadow
- // not really but what else ?
- pglBlendFunc(GL_ZERO, GL_ONE_MINUS_SRC_COLOR);
- pglAlphaFunc(GL_NOTEQUAL, 0.0f);
- break;
- case PF_Fog & PF_Fog:
- // Sryder: Fog
- // multiplies input colour by input alpha, and destination colour by input colour, then adds them
- pglBlendFunc(GL_SRC_ALPHA, GL_SRC_COLOR);
- pglAlphaFunc(GL_ALWAYS, 0.0f); // Don't discard zero alpha fragments
- break;
- default : // must be 0, otherwise it's an error
- // No blending
- pglBlendFunc(GL_ONE, GL_ZERO); // the same as no blending
- pglAlphaFunc(GL_GREATER, 0.5f);
- break;
- }
- }
+ if (Xor & PF_Blending) // if blending mode must be changed
+ SetBlendMode(PolyFlags & PF_Blending);
+
if (Xor & PF_NoAlphaTest)
{
if (PolyFlags & PF_NoAlphaTest)
@@ -1619,7 +1662,7 @@ EXPORT void HWRAPI(SetBlend) (FBITFIELD PolyFlags)
pglDisable(GL_POLYGON_OFFSET_FILL);
}
- if (Xor&PF_NoDepthTest)
+ if (Xor & PF_NoDepthTest)
{
if (PolyFlags & PF_NoDepthTest)
pglDepthFunc(GL_ALWAYS); //pglDisable(GL_DEPTH_TEST);
@@ -1627,25 +1670,25 @@ EXPORT void HWRAPI(SetBlend) (FBITFIELD PolyFlags)
pglDepthFunc(GL_LEQUAL); //pglEnable(GL_DEPTH_TEST);
}
- if (Xor&PF_RemoveYWrap)
+ if (Xor & PF_RemoveYWrap)
{
if (PolyFlags & PF_RemoveYWrap)
Clamp2D(GL_TEXTURE_WRAP_T);
}
- if (Xor&PF_ForceWrapX)
+ if (Xor & PF_ForceWrapX)
{
if (PolyFlags & PF_ForceWrapX)
pglTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_REPEAT);
}
- if (Xor&PF_ForceWrapY)
+ if (Xor & PF_ForceWrapY)
{
if (PolyFlags & PF_ForceWrapY)
pglTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_REPEAT);
}
- if (Xor&PF_Modulated)
+ if (Xor & PF_Modulated)
{
#if defined (__unix__) || defined (UNIXCOMMON)
if (oglflags & GLF_NOTEXENV)
@@ -1698,7 +1741,7 @@ EXPORT void HWRAPI(SetBlend) (FBITFIELD PolyFlags)
// -----------------+
// UpdateTexture : Updates the texture data.
// -----------------+
-EXPORT void HWRAPI(UpdateTexture) (FTextureInfo *pTexInfo)
+EXPORT void HWRAPI(UpdateTexture) (GLMipmap_t *pTexInfo)
{
// Download a mipmap
boolean updatemipmap = true;
@@ -1900,7 +1943,7 @@ EXPORT void HWRAPI(UpdateTexture) (FTextureInfo *pTexInfo)
// -----------------+
// SetTexture : The mipmap becomes the current texture source
// -----------------+
-EXPORT void HWRAPI(SetTexture) (FTextureInfo *pTexInfo)
+EXPORT void HWRAPI(SetTexture) (GLMipmap_t *pTexInfo)
{
if (!pTexInfo)
{
@@ -1917,54 +1960,46 @@ EXPORT void HWRAPI(SetTexture) (FTextureInfo *pTexInfo)
}
else
{
+ FTextureInfo *newTex = calloc(1, sizeof (*newTex));
+
UpdateTexture(pTexInfo);
- pTexInfo->nextmipmap = NULL;
- if (gl_cachetail)
- { // insertion at the tail
- gl_cachetail->nextmipmap = pTexInfo;
- gl_cachetail = pTexInfo;
- }
- else // initialization of the linked list
- gl_cachetail = gl_cachehead = pTexInfo;
- }
-}
-static void *Shader_Load(FSurfaceInfo *Surface, GLRGBAFloat *poly, GLRGBAFloat *tint, GLRGBAFloat *fade)
-{
-#ifdef GL_SHADERS
- if (gl_shadersenabled && pglUseProgram)
- {
- gl_shaderprogram_t *shader = &gl_shaderprograms[gl_currentshaderprogram];
- if (shader->program)
+ newTex->texture = pTexInfo;
+ newTex->downloaded = (UINT32)pTexInfo->downloaded;
+ newTex->width = (UINT32)pTexInfo->width;
+ newTex->height = (UINT32)pTexInfo->height;
+ newTex->format = (UINT32)pTexInfo->format;
+
+ // insertion at the tail
+ if (TexCacheTail)
{
- if (gl_shaderprogramchanged)
- {
- pglUseProgram(gl_shaderprograms[gl_currentshaderprogram].program);
- gl_shaderprogramchanged = false;
- }
- Shader_SetUniforms(Surface, poly, tint, fade);
- return shader;
+ newTex->prev = TexCacheTail;
+ TexCacheTail->next = newTex;
+ TexCacheTail = newTex;
}
- else
- pglUseProgram(0);
+ else // initialization of the linked list
+ TexCacheTail = TexCacheHead = newTex;
}
-#else
- (void)Surface;
- (void)poly;
- (void)tint;
- (void)fade;
-#endif
- return NULL;
}
static void Shader_SetUniforms(FSurfaceInfo *Surface, GLRGBAFloat *poly, GLRGBAFloat *tint, GLRGBAFloat *fade)
{
#ifdef GL_SHADERS
- if (gl_shadersenabled)
+ gl_shader_t *shader = gl_shaderstate.current;
+
+ if (gl_shadersenabled && (shader != NULL) && pglUseProgram)
{
- gl_shaderprogram_t *shader = &gl_shaderprograms[gl_currentshaderprogram];
if (!shader->program)
+ {
+ pglUseProgram(0);
return;
+ }
+
+ if (gl_shaderstate.changed)
+ {
+ pglUseProgram(shader->program);
+ gl_shaderstate.changed = false;
+ }
// Color uniforms can be left NULL and will be set to white (1.0f, 1.0f, 1.0f, 1.0f)
if (poly == NULL)
@@ -2017,6 +2052,116 @@ static void Shader_SetUniforms(FSurfaceInfo *Surface, GLRGBAFloat *poly, GLRGBAF
#endif
}
+static boolean Shader_CompileProgram(gl_shader_t *shader, GLint i, const GLchar *vert_shader, const GLchar *frag_shader)
+{
+ GLuint gl_vertShader, gl_fragShader;
+ GLint result;
+
+ //
+ // Load and compile vertex shader
+ //
+ gl_vertShader = pglCreateShader(GL_VERTEX_SHADER);
+ if (!gl_vertShader)
+ {
+ GL_MSG_Error("Shader_CompileProgram: Error creating vertex shader %s\n", HWR_GetShaderName(i));
+ return false;
+ }
+
+ pglShaderSource(gl_vertShader, 1, &vert_shader, NULL);
+ pglCompileShader(gl_vertShader);
+
+ // check for compile errors
+ pglGetShaderiv(gl_vertShader, GL_COMPILE_STATUS, &result);
+ if (result == GL_FALSE)
+ {
+ Shader_CompileError("Error compiling vertex shader", gl_vertShader, i);
+ pglDeleteShader(gl_vertShader);
+ return false;
+ }
+
+ //
+ // Load and compile fragment shader
+ //
+ gl_fragShader = pglCreateShader(GL_FRAGMENT_SHADER);
+ if (!gl_fragShader)
+ {
+ GL_MSG_Error("Shader_CompileProgram: Error creating fragment shader %s\n", HWR_GetShaderName(i));
+ pglDeleteShader(gl_vertShader);
+ pglDeleteShader(gl_fragShader);
+ return false;
+ }
+
+ pglShaderSource(gl_fragShader, 1, &frag_shader, NULL);
+ pglCompileShader(gl_fragShader);
+
+ // check for compile errors
+ pglGetShaderiv(gl_fragShader, GL_COMPILE_STATUS, &result);
+ if (result == GL_FALSE)
+ {
+ Shader_CompileError("Error compiling fragment shader", gl_fragShader, i);
+ pglDeleteShader(gl_vertShader);
+ pglDeleteShader(gl_fragShader);
+ return false;
+ }
+
+ shader->program = pglCreateProgram();
+ pglAttachShader(shader->program, gl_vertShader);
+ pglAttachShader(shader->program, gl_fragShader);
+ pglLinkProgram(shader->program);
+
+ // check link status
+ pglGetProgramiv(shader->program, GL_LINK_STATUS, &result);
+
+ // delete the shader objects
+ pglDeleteShader(gl_vertShader);
+ pglDeleteShader(gl_fragShader);
+
+ // couldn't link?
+ if (result != GL_TRUE)
+ {
+ GL_MSG_Error("Shader_CompileProgram: Error linking shader program %s\n", HWR_GetShaderName(i));
+ pglDeleteProgram(shader->program);
+ return false;
+ }
+
+ // 13062019
+#define GETUNI(uniform) pglGetUniformLocation(shader->program, uniform);
+
+ // lighting
+ shader->uniforms[gluniform_poly_color] = GETUNI("poly_color");
+ shader->uniforms[gluniform_tint_color] = GETUNI("tint_color");
+ shader->uniforms[gluniform_fade_color] = GETUNI("fade_color");
+ shader->uniforms[gluniform_lighting] = GETUNI("lighting");
+ shader->uniforms[gluniform_fade_start] = GETUNI("fade_start");
+ shader->uniforms[gluniform_fade_end] = GETUNI("fade_end");
+
+ // misc. (custom shaders)
+ shader->uniforms[gluniform_leveltime] = GETUNI("leveltime");
+
+#undef GETUNI
+
+ return true;
+}
+
+static void Shader_CompileError(const char *message, GLuint program, INT32 shadernum)
+{
+ GLchar *infoLog = NULL;
+ GLint logLength;
+
+ pglGetShaderiv(program, GL_INFO_LOG_LENGTH, &logLength);
+
+ if (logLength)
+ {
+ infoLog = malloc(logLength);
+ pglGetShaderInfoLog(program, logLength, NULL, infoLog);
+ }
+
+ GL_MSG_Error("Shader_CompileProgram: %s (%s)\n%s", message, HWR_GetShaderName(shadernum), (infoLog ? infoLog : ""));
+
+ if (infoLog)
+ free(infoLog);
+}
+
// code that is common between DrawPolygon and DrawIndexedTriangles
// the corona thing is there too, i have no idea if that stuff works with DrawIndexedTriangles and batching
static void PreparePolygon(FSurfaceInfo *pSurf, FOutVector *pOutVerts, FBITFIELD PolyFlags)
@@ -2030,32 +2175,34 @@ static void PreparePolygon(FSurfaceInfo *pSurf, FOutVector *pOutVerts, FBITFIELD
SetBlend(PolyFlags); //TODO: inline (#pragma..)
- // PolyColor
if (pSurf)
{
- // If Modulated, mix the surface colour to the texture
+ // If modulated, mix the surface colour to the texture
if (CurrentPolyFlags & PF_Modulated)
- {
- // Poly color
- poly.red = byte2float[pSurf->PolyColor.s.red];
- poly.green = byte2float[pSurf->PolyColor.s.green];
- poly.blue = byte2float[pSurf->PolyColor.s.blue];
- poly.alpha = byte2float[pSurf->PolyColor.s.alpha];
-
pglColor4ubv((GLubyte*)&pSurf->PolyColor.s);
- }
- // Tint color
- tint.red = byte2float[pSurf->TintColor.s.red];
- tint.green = byte2float[pSurf->TintColor.s.green];
- tint.blue = byte2float[pSurf->TintColor.s.blue];
- tint.alpha = byte2float[pSurf->TintColor.s.alpha];
+ // If the surface is either modulated or colormapped, or both
+ if (CurrentPolyFlags & (PF_Modulated | PF_ColorMapped))
+ {
+ poly.red = byte2float[pSurf->PolyColor.s.red];
+ poly.green = byte2float[pSurf->PolyColor.s.green];
+ poly.blue = byte2float[pSurf->PolyColor.s.blue];
+ poly.alpha = byte2float[pSurf->PolyColor.s.alpha];
+ }
- // Fade color
- fade.red = byte2float[pSurf->FadeColor.s.red];
- fade.green = byte2float[pSurf->FadeColor.s.green];
- fade.blue = byte2float[pSurf->FadeColor.s.blue];
- fade.alpha = byte2float[pSurf->FadeColor.s.alpha];
+ // Only if the surface is colormapped
+ if (CurrentPolyFlags & PF_ColorMapped)
+ {
+ tint.red = byte2float[pSurf->TintColor.s.red];
+ tint.green = byte2float[pSurf->TintColor.s.green];
+ tint.blue = byte2float[pSurf->TintColor.s.blue];
+ tint.alpha = byte2float[pSurf->TintColor.s.alpha];
+
+ fade.red = byte2float[pSurf->FadeColor.s.red];
+ fade.green = byte2float[pSurf->FadeColor.s.green];
+ fade.blue = byte2float[pSurf->FadeColor.s.blue];
+ fade.alpha = byte2float[pSurf->FadeColor.s.alpha];
+ }
}
// this test is added for new coronas' code (without depth buffer)
@@ -2121,7 +2268,7 @@ static void PreparePolygon(FSurfaceInfo *pSurf, FOutVector *pOutVerts, FBITFIELD
pglColor4ubv(c);
}
- Shader_Load(pSurf, &poly, &tint, &fade);
+ Shader_SetUniforms(pSurf, &poly, &tint, &fade);
}
// -----------------+
@@ -2167,7 +2314,7 @@ EXPORT void HWRAPI(RenderSkyDome) (gl_sky_t *sky)
{
int i, j;
- Shader_Load(NULL, NULL, NULL, NULL);
+ Shader_SetUniforms(NULL, NULL, NULL, NULL);
// Build the sky dome! Yes!
if (sky->rebuild)
@@ -2259,15 +2406,7 @@ EXPORT void HWRAPI(SetSpecialState) (hwdspecialstate_t IdState, INT32 Value)
break;
case HWD_SET_SHADERS:
- switch (Value)
- {
- case 1:
- gl_allowshaders = true;
- break;
- default:
- gl_allowshaders = false;
- break;
- }
+ gl_allowshaders = (hwdshaderoption_t)Value;
break;
case HWD_SET_TEXTUREFILTERMODE:
@@ -2537,6 +2676,7 @@ static void DrawModelEx(model_t *model, INT32 frameIndex, INT32 duration, INT32
boolean useVBO = true;
+ FBITFIELD flags;
int i;
// Because otherwise, scaling the screen negatively vertically breaks the lighting
@@ -2604,8 +2744,6 @@ static void DrawModelEx(model_t *model, INT32 frameIndex, INT32 duration, INT32
else
pglColor4ubv((GLubyte*)&Surface->PolyColor.s);
- SetBlend((poly.alpha < 1 ? PF_Translucent : (PF_Masked|PF_Occlude))|PF_Modulated);
-
tint.red = byte2float[Surface->TintColor.s.red];
tint.green = byte2float[Surface->TintColor.s.green];
tint.blue = byte2float[Surface->TintColor.s.blue];
@@ -2616,7 +2754,14 @@ static void DrawModelEx(model_t *model, INT32 frameIndex, INT32 duration, INT32
fade.blue = byte2float[Surface->FadeColor.s.blue];
fade.alpha = byte2float[Surface->FadeColor.s.alpha];
- Shader_Load(Surface, &poly, &tint, &fade);
+ flags = (Surface->PolyFlags | PF_Modulated);
+ if (Surface->PolyFlags & (PF_Additive|PF_Subtractive|PF_ReverseSubtract|PF_Multiplicative))
+ flags |= PF_Occlude;
+ else if (Surface->PolyColor.s.alpha == 0xFF)
+ flags |= (PF_Occlude | PF_Masked);
+
+ SetBlend(flags);
+ Shader_SetUniforms(Surface, &poly, &tint, &fade);
pglEnable(GL_CULL_FACE);
pglEnable(GL_NORMALIZE);
@@ -2871,7 +3016,6 @@ EXPORT void HWRAPI(SetTransform) (FTransform *stransform)
pglMatrixMode(GL_PROJECTION);
pglLoadIdentity();
- // jimita 14042019
// Simulate Software's y-shearing
// https://zdoom.org/wiki/Y-shearing
if (shearing)
@@ -2899,7 +3043,7 @@ EXPORT void HWRAPI(SetTransform) (FTransform *stransform)
EXPORT INT32 HWRAPI(GetTextureUsed) (void)
{
- FTextureInfo *tmp = gl_cachehead;
+ FTextureInfo *tmp = TexCacheHead;
INT32 res = 0;
while (tmp)
@@ -2916,7 +3060,7 @@ EXPORT INT32 HWRAPI(GetTextureUsed) (void)
// Add it up!
res += tmp->height*tmp->width*bpp;
- tmp = tmp->nextmipmap;
+ tmp = tmp->next;
}
return res;
@@ -3185,7 +3329,7 @@ EXPORT void HWRAPI(DoScreenWipe)(void)
pglClear(GL_COLOR_BUFFER_BIT|GL_DEPTH_BUFFER_BIT);
- SetBlend(PF_Modulated|PF_NoDepthTest|PF_Clip|PF_NoZClip);
+ SetBlend(PF_Modulated|PF_NoDepthTest);
pglEnable(GL_TEXTURE_2D);
// Draw the original screen
@@ -3195,7 +3339,7 @@ EXPORT void HWRAPI(DoScreenWipe)(void)
pglVertexPointer(3, GL_FLOAT, 0, screenVerts);
pglDrawArrays(GL_TRIANGLE_FAN, 0, 4);
- SetBlend(PF_Modulated|PF_Translucent|PF_NoDepthTest|PF_Clip|PF_NoZClip);
+ SetBlend(PF_Modulated|PF_Translucent|PF_NoDepthTest);
// Draw the end screen that fades in
pglActiveTexture(GL_TEXTURE0);
diff --git a/src/http-mserv.c b/src/http-mserv.c
index a7682718418014f6f52b46813cb0a91d2f500c3d..7c7d04495cd8f5641bd7c6f236c47bd0eb344c64 100644
--- a/src/http-mserv.c
+++ b/src/http-mserv.c
@@ -36,20 +36,23 @@ Documentation available here.
static void MasterServer_Debug_OnChange (void);
-consvar_t cv_masterserver_timeout = {
- "masterserver_timeout", "5", CV_SAVE, CV_Unsigned,
- NULL, 0, NULL, NULL, 0, 0, NULL/* C90 moment */
-};
-
-consvar_t cv_masterserver_debug = {
+consvar_t cv_masterserver_timeout = CVAR_INIT
+(
+ "masterserver_timeout", "5", CV_SAVE, CV_Unsigned,
+ NULL
+);
+
+consvar_t cv_masterserver_debug = CVAR_INIT
+(
"masterserver_debug", "Off", CV_SAVE|CV_CALL, CV_OnOff,
- MasterServer_Debug_OnChange, 0, NULL, NULL, 0, 0, NULL/* C90 moment */
-};
-
-consvar_t cv_masterserver_token = {
- "masterserver_token", "", CV_SAVE, NULL,
- NULL, 0, NULL, NULL, 0, 0, NULL/* C90 moment */
-};
+ MasterServer_Debug_OnChange
+);
+
+consvar_t cv_masterserver_token = CVAR_INIT
+(
+ "masterserver_token", "", CV_SAVE, NULL,
+ NULL
+);
#ifdef MASTERSERVER
diff --git a/src/hu_stuff.c b/src/hu_stuff.c
index 72fb9272d441135456286f908da9ba7e2ff9dc98..7c4f1acf1124b1087dcd7a90cf61b2f883434f18 100644
--- a/src/hu_stuff.c
+++ b/src/hu_stuff.c
@@ -98,6 +98,7 @@ patch_t *emeraldpics[3][8]; // 0 = normal, 1 = tiny, 2 = coinbox
static patch_t *emblemicon;
patch_t *tokenicon;
static patch_t *exiticon;
+static patch_t *nopingicon;
//-------------------------------------------
// misc vars
@@ -286,6 +287,7 @@ void HU_LoadGraphics(void)
emblemicon = W_CachePatchName("EMBLICON", PU_HUDGFX);
tokenicon = W_CachePatchName("TOKNICON", PU_HUDGFX);
exiticon = W_CachePatchName("EXITICON", PU_HUDGFX);
+ nopingicon = W_CachePatchName("NOPINGICON", PU_HUDGFX);
emeraldpics[0][0] = W_CachePatchName("CHAOS1", PU_HUDGFX);
emeraldpics[0][1] = W_CachePatchName("CHAOS2", PU_HUDGFX);
@@ -1794,8 +1796,8 @@ static void HU_DrawChat_Old(void)
size_t i = 0;
const char *ntalk = "Say: ", *ttalk = "Say-Team: ";
const char *talk = ntalk;
- INT32 charwidth = 8 * con_scalefactor; //SHORT(hu_font['A'-HU_FONTSTART]->width) * con_scalefactor;
- INT32 charheight = 8 * con_scalefactor; //SHORT(hu_font['A'-HU_FONTSTART]->height) * con_scalefactor;
+ INT32 charwidth = 8 * con_scalefactor; //(hu_font['A'-HU_FONTSTART]->width) * con_scalefactor;
+ INT32 charheight = 8 * con_scalefactor; //(hu_font['A'-HU_FONTSTART]->height) * con_scalefactor;
if (teamtalk)
{
talk = ttalk;
@@ -1816,7 +1818,7 @@ static void HU_DrawChat_Old(void)
}
else
{
- //charwidth = SHORT(hu_font[talk[i]-HU_FONTSTART]->width) * con_scalefactor;
+ //charwidth = (hu_font[talk[i]-HU_FONTSTART]->width) * con_scalefactor;
V_DrawCharacter(HU_INPUTX + c, y, talk[i++] | cv_constextsize.value | V_NOSCALESTART, true);
}
c += charwidth;
@@ -1844,7 +1846,7 @@ static void HU_DrawChat_Old(void)
}
else
{
- //charwidth = SHORT(hu_font[w_chat[i]-HU_FONTSTART]->width) * con_scalefactor;
+ //charwidth = (hu_font[w_chat[i]-HU_FONTSTART]->width) * con_scalefactor;
V_DrawCharacter(HU_INPUTX + c, y, w_chat[i++] | cv_constextsize.value | V_NOSCALESTART | t, true);
}
@@ -2109,18 +2111,21 @@ void HU_Drawer(void)
return;
// draw the crosshair, not when viewing demos nor with chasecam
- if (!automapactive && cv_crosshair.value && !demoplayback &&
- (!camera.chase || ticcmd_ztargetfocus[0])
- && !players[displayplayer].spectator)
- HU_DrawCrosshair();
+ if (LUA_HudEnabled(hud_crosshair))
+ {
+ if (!automapactive && cv_crosshair.value && !demoplayback &&
+ (!camera.chase || ticcmd_ztargetfocus[0])
+ && !players[displayplayer].spectator)
+ HU_DrawCrosshair();
- if (!automapactive && cv_crosshair2.value && !demoplayback &&
- (!camera2.chase || ticcmd_ztargetfocus[1])
- && !players[secondarydisplayplayer].spectator)
- HU_DrawCrosshair2();
+ if (!automapactive && cv_crosshair2.value && !demoplayback &&
+ (!camera2.chase || ticcmd_ztargetfocus[1])
+ && !players[secondarydisplayplayer].spectator)
+ HU_DrawCrosshair2();
+ }
// draw desynch text
- if (hu_resynching)
+ if (hu_redownloadinggamestate)
{
static UINT32 resynch_ticker = 0;
char resynch_text[14];
@@ -2243,8 +2248,8 @@ void HU_Erase(void)
//
void HU_drawPing(INT32 x, INT32 y, UINT32 ping, boolean notext, INT32 flags)
{
- UINT8 numbars = 1; // how many ping bars do we draw?
- UINT8 barcolor = 35; // color we use for the bars (green, yellow or red)
+ UINT8 numbars = 0; // how many ping bars do we draw?
+ UINT8 barcolor = 31; // color we use for the bars (green, yellow, red or black)
SINT8 i = 0;
SINT8 yoffset = 6;
INT32 dx = x+1 - (V_SmallStringWidth(va("%dms", ping),
@@ -2257,11 +2262,16 @@ void HU_drawPing(INT32 x, INT32 y, UINT32 ping, boolean notext, INT32 flags)
}
else if (ping < 256)
{
- numbars = 2; // Apparently ternaries w/ multiple statements don't look good in C so I decided against it.
+ numbars = 2;
barcolor = 73;
}
+ else if (ping < UINT32_MAX)
+ {
+ numbars = 1;
+ barcolor = 35;
+ }
- if (!notext || vid.width >= 640) // how sad, we're using a shit resolution.
+ if (ping < UINT32_MAX && (!notext || vid.width >= 640)) // how sad, we're using a shit resolution.
V_DrawSmallString(dx, y+4, V_ALLOWLOWERCASE|flags, va("%dms", ping));
for (i=0; (i<3); i++) // Draw the ping bar
@@ -2272,6 +2282,9 @@ void HU_drawPing(INT32 x, INT32 y, UINT32 ping, boolean notext, INT32 flags)
yoffset -= 2;
}
+
+ if (ping == UINT32_MAX)
+ V_DrawSmallScaledPatch(x + 4 - nopingicon->width/2, y + 9 - nopingicon->height/2, 0, nopingicon);
}
//
@@ -2298,16 +2311,17 @@ void HU_DrawTabRankings(INT32 x, INT32 y, playersort_t *tab, INT32 scorelines, I
if (!splitscreen) // don't draw it on splitscreen,
{
- if (!(tab[i].num == serverplayer || players[tab[i].num].quittime))
- HU_drawPing(x+ 253, y, playerpingtable[tab[i].num], false, 0);
+ if (tab[i].num != serverplayer)
+ HU_drawPing(x + 253, y, players[tab[i].num].quittime ? UINT32_MAX : playerpingtable[tab[i].num], false, 0);
//else
// V_DrawSmallString(x+ 246, y+4, V_YELLOWMAP, "SERVER");
}
- V_DrawString(x + 20, y,
- ((tab[i].num == whiteplayer) ? V_YELLOWMAP : 0)
- | (greycheck ? V_60TRANS : 0)
- | V_ALLOWLOWERCASE, tab[i].name);
+ if (!players[tab[i].num].quittime || (leveltime / (TICRATE/2) & 1))
+ V_DrawString(x + 20, y,
+ ((tab[i].num == whiteplayer) ? V_YELLOWMAP : 0)
+ | (greycheck ? V_60TRANS : 0)
+ | V_ALLOWLOWERCASE, tab[i].name);
// Draw emeralds
if (players[tab[i].num].powers[pw_invulnerability] && (players[tab[i].num].powers[pw_invulnerability] == players[tab[i].num].powers[pw_sneakers]) && ((leveltime/7) & 1))
@@ -2364,7 +2378,7 @@ void HU_DrawTabRankings(INT32 x, INT32 y, playersort_t *tab, INT32 scorelines, I
}
if (players[tab[i].num].exiting || (players[tab[i].num].pflags & PF_FINISHED))
- V_DrawSmallScaledPatch(x - SHORT(exiticon->width)/2 - 1, y-3, 0, exiticon);
+ V_DrawSmallScaledPatch(x - exiticon->width/2 - 1, y-3, 0, exiticon);
if (gametyperankings[gametype] == GT_RACE)
{
@@ -2455,10 +2469,11 @@ static void HU_Draw32TeamTabRankings(playersort_t *tab, INT32 whiteplayer)
supercheck = supercheckdef;
strlcpy(name, tab[i].name, 8);
- V_DrawString(x + 10, y,
- ((tab[i].num == whiteplayer) ? V_YELLOWMAP : 0)
- | (greycheck ? 0 : V_TRANSLUCENT)
- | V_ALLOWLOWERCASE, name);
+ if (!players[tab[i].num].quittime || (leveltime / (TICRATE/2) & 1))
+ V_DrawString(x + 10, y,
+ ((tab[i].num == whiteplayer) ? V_YELLOWMAP : 0)
+ | (greycheck ? 0 : V_TRANSLUCENT)
+ | V_ALLOWLOWERCASE, name);
if (gametyperules & GTR_TEAMFLAGS)
{
@@ -2497,10 +2512,10 @@ static void HU_Draw32TeamTabRankings(playersort_t *tab, INT32 whiteplayer)
V_DrawRightAlignedThinString(x+128, y, ((players[tab[i].num].spectator || players[tab[i].num].playerstate == PST_DEAD) ? 0 : V_TRANSLUCENT), va("%u", tab[i].count));
if (!splitscreen)
{
- if (!(tab[i].num == serverplayer || players[tab[i].num].quittime))
- HU_drawPing(x+ 135, y+1, playerpingtable[tab[i].num], true, 0);
- //else
- //V_DrawSmallString(x+ 129, y+4, V_YELLOWMAP, "HOST");
+ if (tab[i].num != serverplayer)
+ HU_drawPing(x + 135, y+1, players[tab[i].num].quittime ? UINT32_MAX : playerpingtable[tab[i].num], true, 0);
+ //else
+ //V_DrawSmallString(x+ 129, y+4, V_YELLOWMAP, "HOST");
}
}
}
@@ -2583,10 +2598,11 @@ void HU_DrawTeamTabRankings(playersort_t *tab, INT32 whiteplayer)
supercheck = supercheckdef;
strlcpy(name, tab[i].name, 7);
- V_DrawString(x + 20, y,
- ((tab[i].num == whiteplayer) ? V_YELLOWMAP : 0)
- | (greycheck ? V_TRANSLUCENT : 0)
- | V_ALLOWLOWERCASE, name);
+ if (!players[tab[i].num].quittime || (leveltime / (TICRATE/2) & 1))
+ V_DrawString(x + 20, y,
+ ((tab[i].num == whiteplayer) ? V_YELLOWMAP : 0)
+ | (greycheck ? V_TRANSLUCENT : 0)
+ | V_ALLOWLOWERCASE, name);
if (gametyperules & GTR_TEAMFLAGS)
{
@@ -2621,10 +2637,10 @@ void HU_DrawTeamTabRankings(playersort_t *tab, INT32 whiteplayer)
V_DrawRightAlignedThinString(x+100, y, (greycheck ? V_TRANSLUCENT : 0), va("%u", tab[i].count));
if (!splitscreen)
{
- if (!(tab[i].num == serverplayer || players[tab[i].num].quittime))
- HU_drawPing(x+ 113, y, playerpingtable[tab[i].num], false, 0);
- //else
- // V_DrawSmallString(x+ 94, y+4, V_YELLOWMAP, "SERVER");
+ if (tab[i].num != serverplayer)
+ HU_drawPing(x+ 113, y, players[tab[i].num].quittime ? UINT32_MAX : playerpingtable[tab[i].num], false, 0);
+ //else
+ // V_DrawSmallString(x+ 94, y+4, V_YELLOWMAP, "SERVER");
}
}
}
@@ -2652,15 +2668,16 @@ void HU_DrawDualTabRankings(INT32 x, INT32 y, playersort_t *tab, INT32 scoreline
supercheck = supercheckdef;
strlcpy(name, tab[i].name, 7);
- if (!(tab[i].num == serverplayer || players[tab[i].num].quittime))
- HU_drawPing(x+ 113, y, playerpingtable[tab[i].num], false, 0);
+ if (tab[i].num != serverplayer)
+ HU_drawPing(x+ 113, y, players[tab[i].num].quittime ? UINT32_MAX : playerpingtable[tab[i].num], false, 0);
//else
// V_DrawSmallString(x+ 94, y+4, V_YELLOWMAP, "SERVER");
- V_DrawString(x + 20, y,
- ((tab[i].num == whiteplayer) ? V_YELLOWMAP : 0)
- | (greycheck ? V_TRANSLUCENT : 0)
- | V_ALLOWLOWERCASE, name);
+ if (!players[tab[i].num].quittime || (leveltime / (TICRATE/2) & 1))
+ V_DrawString(x + 20, y,
+ ((tab[i].num == whiteplayer) ? V_YELLOWMAP : 0)
+ | (greycheck ? V_TRANSLUCENT : 0)
+ | V_ALLOWLOWERCASE, name);
if (G_GametypeUsesLives() && !(G_GametypeUsesCoopLives() && (cv_cooplives.value == 0 || cv_cooplives.value == 3)) && (players[tab[i].num].lives != INFLIVES)) //show lives
V_DrawRightAlignedString(x, y+4, V_ALLOWLOWERCASE, va("%dx", players[tab[i].num].lives));
@@ -2668,7 +2685,7 @@ void HU_DrawDualTabRankings(INT32 x, INT32 y, playersort_t *tab, INT32 scoreline
V_DrawSmallScaledPatch(x-28, y-4, 0, tagico);
if (players[tab[i].num].exiting || (players[tab[i].num].pflags & PF_FINISHED))
- V_DrawSmallScaledPatch(x - SHORT(exiticon->width)/2 - 1, y-3, 0, exiticon);
+ V_DrawSmallScaledPatch(x - exiticon->width/2 - 1, y-3, 0, exiticon);
// Draw emeralds
if (players[tab[i].num].powers[pw_invulnerability] && (players[tab[i].num].powers[pw_invulnerability] == players[tab[i].num].powers[pw_sneakers]) && ((leveltime/7) & 1))
@@ -2760,16 +2777,17 @@ static void HU_Draw32TabRankings(INT32 x, INT32 y, playersort_t *tab, INT32 scor
strlcpy(name, tab[i].name, 7);
if (!splitscreen) // don't draw it on splitscreen,
{
- if (!(tab[i].num == serverplayer || players[tab[i].num].quittime))
- HU_drawPing(x+ 135, y+1, playerpingtable[tab[i].num], true, 0);
- //else
- // V_DrawSmallString(x+ 129, y+4, V_YELLOWMAP, "HOST");
+ if (tab[i].num != serverplayer)
+ HU_drawPing(x+ 135, y+1, players[tab[i].num].quittime ? UINT32_MAX : playerpingtable[tab[i].num], true, 0);
+ //else
+ // V_DrawSmallString(x+ 129, y+4, V_YELLOWMAP, "HOST");
}
- V_DrawString(x + 10, y,
- ((tab[i].num == whiteplayer) ? V_YELLOWMAP : 0)
- | (greycheck ? 0 : V_TRANSLUCENT)
- | V_ALLOWLOWERCASE, name);
+ if (!players[tab[i].num].quittime || (leveltime / (TICRATE/2) & 1))
+ V_DrawString(x + 10, y,
+ ((tab[i].num == whiteplayer) ? V_YELLOWMAP : 0)
+ | (greycheck ? 0 : V_TRANSLUCENT)
+ | V_ALLOWLOWERCASE, name);
if (G_GametypeUsesLives()) //show lives
V_DrawRightAlignedThinString(x-1, y, V_ALLOWLOWERCASE, va("%d", players[tab[i].num].lives));
@@ -3094,7 +3112,7 @@ static void HU_DrawCoopOverlay(void)
if (LUA_HudEnabled(hud_tabemblems) && (!modifiedgame || savemoddata))
{
V_DrawString(160, 144, 0, va("- %d/%d", M_CountEmblems(), numemblems+numextraemblems));
- V_DrawScaledPatch(128, 144 - SHORT(emblemicon->height)/4, 0, emblemicon);
+ V_DrawScaledPatch(128, 144 - emblemicon->height/4, 0, emblemicon);
}
if (!LUA_HudEnabled(hud_coopemeralds))
diff --git a/src/i_sound.h b/src/i_sound.h
index a2249a10273fa48c95650a75fa692b84d4de37d8..d45c0b323ef4ca34ea936e49b8e598471eb9d290 100644
--- a/src/i_sound.h
+++ b/src/i_sound.h
@@ -21,15 +21,12 @@
// copied from SDL mixer, plus GME
typedef enum {
MU_NONE,
- MU_CMD,
MU_WAV,
MU_MOD,
MU_MID,
MU_OGG,
MU_MP3,
- MU_MP3_MAD_UNUSED, // use MU_MP3 instead
MU_FLAC,
- MU_MODPLUG_UNUSED, // use MU_MOD instead
MU_GME,
MU_MOD_EX, // libopenmpt
MU_MID_EX // Non-native MIDI
diff --git a/src/i_system.h b/src/i_system.h
index dd0b65f6df542d228019f5c3c91d59c5bcd6728c..12f0d751d14eec081175d3a01fdb8a1d03647bb4 100644
--- a/src/i_system.h
+++ b/src/i_system.h
@@ -46,7 +46,13 @@ UINT32 I_GetFreeMem(UINT32 *total);
*/
tic_t I_GetTime(void);
-int I_GetTimeMicros(void);// provides microsecond counter for render stats
+/** \brief Returns precise time value for performance measurement.
+ */
+precise_t I_GetPreciseTime(void);
+
+/** \brief Returns the difference between precise times as microseconds.
+ */
+int I_PreciseToMicros(precise_t);
/** \brief The I_Sleep function
diff --git a/src/i_video.h b/src/i_video.h
index 98ed7f38a18822d8038ec0973ef3c680572c2d89..ab48881d4405036b515ff65988a81bab89e7236a 100644
--- a/src/i_video.h
+++ b/src/i_video.h
@@ -36,10 +36,9 @@ typedef enum
*/
extern rendermode_t rendermode;
-/** \brief OpenGL state
- 0 = never loaded, 1 = loaded successfully, -1 = failed loading
+/** \brief render mode set by command line arguments
*/
-extern INT32 vid_opengl_state;
+extern rendermode_t chosenrendermode;
/** \brief use highcolor modes if true
*/
@@ -90,8 +89,9 @@ INT32 VID_GetModeForSize(INT32 w, INT32 h);
INT32 VID_SetMode(INT32 modenum);
/** \brief Checks the render state
+ \return true if the renderer changed
*/
-void VID_CheckRenderer(void);
+boolean VID_CheckRenderer(void);
/** \brief Load OpenGL mode
*/
diff --git a/src/info.c b/src/info.c
index cb5fb0889e2830313f1e54bb0350b95da3c52f8a..ee836a3728e4bb0ccea8352b790b7dfdb053136e 100644
--- a/src/info.c
+++ b/src/info.c
@@ -150,6 +150,7 @@ char sprnames[NUMSPRITES + 1][5] =
"SIGN", // Level end sign
"SPIK", // Spike Ball
"SFLM", // Spin fire
+ "TFLM", // Spin fire (team)
"USPK", // Floor spike
"WSPK", // Wall spike
"WSPB", // Wall spike base
@@ -584,6 +585,7 @@ char spr2names[NUMPLAYERSPRITES][5] =
"TAL9",
"TALA",
"TALB",
+ "TALC",
"CNT1",
"CNT2",
@@ -661,6 +663,7 @@ playersprite_t spr2defaults[NUMPLAYERSPRITES] = {
SPR2_TAL0, // SPR2_TAL9,
SPR2_TAL9, // SPR2_TALA,
SPR2_TAL0, // SPR2_TALB,
+ SPR2_TAL6, // SPR2_TALC,
SPR2_WAIT, // SPR2_CNT1,
SPR2_FALL, // SPR2_CNT2,
@@ -801,6 +804,7 @@ state_t states[NUMSTATES] =
{SPR_PLAY, SPR2_TAL9|FF_SPR2MIDSTART, 35, {NULL}, 0, 0, S_TAILSOVERLAY_PAIN}, // S_TAILSOVERLAY_PAIN
{SPR_PLAY, SPR2_TALA|FF_SPR2MIDSTART, 35, {NULL}, 0, 0, S_TAILSOVERLAY_GASP}, // S_TAILSOVERLAY_GASP
{SPR_PLAY, SPR2_TALB , 35, {NULL}, 0, 0, S_TAILSOVERLAY_EDGE}, // S_TAILSOVERLAY_EDGE
+ {SPR_PLAY, SPR2_TALC|FF_SPR2MIDSTART, 35, {NULL}, 0, 0, S_TAILSOVERLAY_DASH}, // S_TAILSOVERLAY_DASH
// [:
{SPR_JETF, 3|FF_ANIMATE|FF_FULLBRIGHT, 2, {NULL}, 1, 1, S_JETFUME1}, // S_JETFUMEFLASH
@@ -1891,6 +1895,13 @@ state_t states[NUMSTATES] =
{SPR_SFLM, FF_FULLBRIGHT|4, 2, {NULL}, 0, 0, S_SPINFIRE6}, // S_SPINFIRE5
{SPR_SFLM, FF_FULLBRIGHT|5, 2, {NULL}, 0, 0, S_SPINFIRE1}, // S_SPINFIRE6
+ {SPR_TFLM, FF_FULLBRIGHT, 2, {NULL}, 0, 0, S_TEAM_SPINFIRE2}, // S_TEAM_SPINFIRE1
+ {SPR_TFLM, FF_FULLBRIGHT|1, 2, {NULL}, 0, 0, S_TEAM_SPINFIRE3}, // S_TEAM_SPINFIRE2
+ {SPR_TFLM, FF_FULLBRIGHT|2, 2, {NULL}, 0, 0, S_TEAM_SPINFIRE4}, // S_TEAM_SPINFIRE3
+ {SPR_TFLM, FF_FULLBRIGHT|3, 2, {NULL}, 0, 0, S_TEAM_SPINFIRE5}, // S_TEAM_SPINFIRE4
+ {SPR_TFLM, FF_FULLBRIGHT|4, 2, {NULL}, 0, 0, S_TEAM_SPINFIRE6}, // S_TEAM_SPINFIRE5
+ {SPR_TFLM, FF_FULLBRIGHT|5, 2, {NULL}, 0, 0, S_TEAM_SPINFIRE1}, // S_TEAM_SPINFIRE6
+
// Floor Spike
{SPR_USPK, 0,-1, {A_SpikeRetract}, 1, 0, S_SPIKE2}, // S_SPIKE1 -- Fully extended
{SPR_USPK, 1, 2, {A_Pain}, 0, 0, S_SPIKE3}, // S_SPIKE2
@@ -3288,18 +3299,18 @@ state_t states[NUMSTATES] =
{SPR_WZAP, FF_TRANS10|FF_ANIMATE|FF_RANDOMANIM, 4, {NULL}, 3, 2, S_NULL}, // S_WATERZAP
// Spindash dust
- {SPR_DUST, 0, 7, {NULL}, 0, 0, S_SPINDUST2}, // S_SPINDUST1
- {SPR_DUST, 1, 6, {NULL}, 0, 0, S_SPINDUST3}, // S_SPINDUST2
- {SPR_DUST, FF_TRANS30|2, 4, {NULL}, 0, 0, S_SPINDUST4}, // S_SPINDUST3
- {SPR_DUST, FF_TRANS60|3, 3, {NULL}, 0, 0, S_NULL}, // S_SPINDUST4
- {SPR_BUBL, 0, 7, {NULL}, 0, 0, S_SPINDUST_BUBBLE2}, // S_SPINDUST_BUBBLE1
- {SPR_BUBL, 0, 6, {NULL}, 0, 0, S_SPINDUST_BUBBLE3}, // S_SPINDUST_BUBBLE2
- {SPR_BUBL, FF_TRANS30|0, 4, {NULL}, 0, 0, S_SPINDUST_BUBBLE4}, // S_SPINDUST_BUBBLE3
- {SPR_BUBL, FF_TRANS60|0, 3, {NULL}, 0, 0, S_NULL}, // S_SPINDUST_BUBBLE4
- {SPR_FPRT, 0, 7, {NULL}, 0, 0, S_SPINDUST_FIRE2}, // S_SPINDUST_FIRE1
- {SPR_FPRT, 0, 6, {NULL}, 0, 0, S_SPINDUST_FIRE3}, // S_SPINDUST_FIRE2
- {SPR_FPRT, FF_TRANS30|0, 4, {NULL}, 0, 0, S_SPINDUST_FIRE4}, // S_SPINDUST_FIRE3
- {SPR_FPRT, FF_TRANS60|0, 3, {NULL}, 0, 0, S_NULL}, // S_SPINDUST_FIRE4
+ {SPR_DUST, 0, 7, {NULL}, 0, 0, S_SPINDUST2}, // S_SPINDUST1
+ {SPR_DUST, 1, 6, {NULL}, 0, 0, S_SPINDUST3}, // S_SPINDUST2
+ {SPR_DUST, FF_TRANS30|2, 4, {NULL}, 0, 0, S_SPINDUST4}, // S_SPINDUST3
+ {SPR_DUST, FF_TRANS60|3, 3, {NULL}, 0, 0, S_NULL}, // S_SPINDUST4
+ {SPR_BUBL, 0, 7, {NULL}, 0, 0, S_SPINDUST_BUBBLE2}, // S_SPINDUST_BUBBLE1
+ {SPR_BUBL, 0, 6, {NULL}, 0, 0, S_SPINDUST_BUBBLE3}, // S_SPINDUST_BUBBLE2
+ {SPR_BUBL, FF_TRANS30|0, 4, {NULL}, 0, 0, S_SPINDUST_BUBBLE4}, // S_SPINDUST_BUBBLE3
+ {SPR_BUBL, FF_TRANS60|0, 3, {NULL}, 0, 0, S_NULL}, // S_SPINDUST_BUBBLE4
+ {SPR_FPRT, FF_FULLBRIGHT|0, 7, {NULL}, 0, 0, S_SPINDUST_FIRE2}, // S_SPINDUST_FIRE1
+ {SPR_FPRT, FF_FULLBRIGHT|0, 6, {NULL}, 0, 0, S_SPINDUST_FIRE3}, // S_SPINDUST_FIRE2
+ {SPR_FPRT, FF_FULLBRIGHT|FF_TRANS30|0, 4, {NULL}, 0, 0, S_SPINDUST_FIRE4}, // S_SPINDUST_FIRE3
+ {SPR_FPRT, FF_FULLBRIGHT|FF_TRANS60|0, 3, {NULL}, 0, 0, S_NULL}, // S_SPINDUST_FIRE4
{SPR_TFOG, FF_FULLBRIGHT|FF_TRANS50, 2, {NULL}, 0, 0, S_FOG2}, // S_FOG1
@@ -3921,9 +3932,7 @@ state_t states[NUMSTATES] =
{SPR_BRIB, FF_ANIMATE|FF_RANDOMANIM, -1, {NULL}, 31, 1, S_NULL}, // S_BLUEBRICKDEBRIS
{SPR_BRIY, FF_ANIMATE|FF_RANDOMANIM, -1, {NULL}, 31, 1, S_NULL}, // S_YELLOWBRICKDEBRIS
-#ifdef SEENAMES
{SPR_NULL, 0, 1, {NULL}, 0, 0, S_NULL}, // S_NAMECHECK
-#endif
};
mobjinfo_t mobjinfo[NUMMOBJTYPES] =
@@ -6455,8 +6464,8 @@ mobjinfo_t mobjinfo[NUMMOBJTYPES] =
S_NULL, // xdeathstate
sfx_fizzle, // deathsound
10*FRACUNIT, // speed
- 48*FRACUNIT, // radius
- 160*FRACUNIT, // height
+ 24*FRACUNIT, // radius
+ 80*FRACUNIT, // height
0, // display offset
DMG_ELECTRIC, // mass
1, // damage
@@ -21650,7 +21659,6 @@ mobjinfo_t mobjinfo[NUMMOBJTYPES] =
S_NULL // raisestate
},
-#ifdef SEENAMES
{ // MT_NAMECHECK
-1, // doomednum
S_NAMECHECK, // spawnstate
@@ -21677,7 +21685,6 @@ mobjinfo_t mobjinfo[NUMMOBJTYPES] =
MF_NOBLOCKMAP|MF_MISSILE|MF_NOGRAVITY|MF_NOSECTOR, // flags
S_NULL // raisestate
},
-#endif
};
skincolor_t skincolors[MAXSKINCOLORS] = {
diff --git a/src/info.h b/src/info.h
index 721ebf7f269c8d575a5b717a3bc7d76def2b5730..60e9702463fb50db9934d6aea9e6eab28a562983 100644
--- a/src/info.h
+++ b/src/info.h
@@ -19,11 +19,279 @@
#include "sounds.h"
#include "m_fixed.h"
-// dehacked.c now has lists for the more named enums! PLEASE keep them up to date!
+// deh_tables.c now has lists for the more named enums! PLEASE keep them up to date!
// For great modding!!
+// IMPORTANT!
+// DO NOT FORGET TO SYNC THIS LIST WITH THE ACTIONPOINTERS ARRAY IN DEH_TABLES.C
+enum actionnum
+{
+ A_EXPLODE = 0,
+ A_PAIN,
+ A_FALL,
+ A_MONITORPOP,
+ A_GOLDMONITORPOP,
+ A_GOLDMONITORRESTORE,
+ A_GOLDMONITORSPARKLE,
+ A_LOOK,
+ A_CHASE,
+ A_FACESTABCHASE,
+ A_FACESTABREV,
+ A_FACESTABHURL,
+ A_FACESTABMISS,
+ A_STATUEBURST,
+ A_FACETARGET,
+ A_FACETRACER,
+ A_SCREAM,
+ A_BOSSDEATH,
+ A_CUSTOMPOWER,
+ A_GIVEWEAPON,
+ A_RINGBOX,
+ A_INVINCIBILITY,
+ A_SUPERSNEAKERS,
+ A_BUNNYHOP,
+ A_BUBBLESPAWN,
+ A_FANBUBBLESPAWN,
+ A_BUBBLERISE,
+ A_BUBBLECHECK,
+ A_AWARDSCORE,
+ A_EXTRALIFE,
+ A_GIVESHIELD,
+ A_GRAVITYBOX,
+ A_SCORERISE,
+ A_ATTRACTCHASE,
+ A_DROPMINE,
+ A_FISHJUMP,
+ A_THROWNRING,
+ A_SETSOLIDSTEAM,
+ A_UNSETSOLIDSTEAM,
+ A_SIGNSPIN,
+ A_SIGNPLAYER,
+ A_OVERLAYTHINK,
+ A_JETCHASE,
+ A_JETBTHINK,
+ A_JETGTHINK,
+ A_JETGSHOOT,
+ A_SHOOTBULLET,
+ A_MINUSDIGGING,
+ A_MINUSPOPUP,
+ A_MINUSCHECK,
+ A_CHICKENCHECK,
+ A_MOUSETHINK,
+ A_DETONCHASE,
+ A_CAPECHASE,
+ A_ROTATESPIKEBALL,
+ A_SLINGAPPEAR,
+ A_UNIDUSBALL,
+ A_ROCKSPAWN,
+ A_SETFUSE,
+ A_CRAWLACOMMANDERTHINK,
+ A_SMOKETRAILER,
+ A_RINGEXPLODE,
+ A_OLDRINGEXPLODE,
+ A_MIXUP,
+ A_RECYCLEPOWERS,
+ A_BOSS1CHASE,
+ A_FOCUSTARGET,
+ A_BOSS2CHASE,
+ A_BOSS2POGO,
+ A_BOSSZOOM,
+ A_BOSSSCREAM,
+ A_BOSS2TAKEDAMAGE,
+ A_BOSS7CHASE,
+ A_GOOPSPLAT,
+ A_BOSS2POGOSFX,
+ A_BOSS2POGOTARGET,
+ A_BOSSJETFUME,
+ A_EGGMANBOX,
+ A_TURRETFIRE,
+ A_SUPERTURRETFIRE,
+ A_TURRETSTOP,
+ A_JETJAWROAM,
+ A_JETJAWCHOMP,
+ A_POINTYTHINK,
+ A_CHECKBUDDY,
+ A_HOODFIRE,
+ A_HOODTHINK,
+ A_HOODFALL,
+ A_ARROWBONKS,
+ A_SNAILERTHINK,
+ A_SHARPCHASE,
+ A_SHARPSPIN,
+ A_SHARPDECEL,
+ A_CRUSHSTACEANWALK,
+ A_CRUSHSTACEANPUNCH,
+ A_CRUSHCLAWAIM,
+ A_CRUSHCLAWLAUNCH,
+ A_VULTUREVTOL,
+ A_VULTURECHECK,
+ A_VULTUREHOVER,
+ A_VULTUREBLAST,
+ A_VULTUREFLY,
+ A_SKIMCHASE,
+ A_1UPTHINKER,
+ A_SKULLATTACK,
+ A_LOBSHOT,
+ A_FIRESHOT,
+ A_SUPERFIRESHOT,
+ A_BOSSFIRESHOT,
+ A_BOSS7FIREMISSILES,
+ A_BOSS1LASER,
+ A_BOSS4REVERSE,
+ A_BOSS4SPEEDUP,
+ A_BOSS4RAISE,
+ A_SPARKFOLLOW,
+ A_BUZZFLY,
+ A_GUARDCHASE,
+ A_EGGSHIELD,
+ A_SETREACTIONTIME,
+ A_BOSS1SPIKEBALLS,
+ A_BOSS3TAKEDAMAGE,
+ A_BOSS3PATH,
+ A_BOSS3SHOCKTHINK,
+ A_LINEDEFEXECUTE,
+ A_PLAYSEESOUND,
+ A_PLAYATTACKSOUND,
+ A_PLAYACTIVESOUND,
+ A_SPAWNOBJECTABSOLUTE,
+ A_SPAWNOBJECTRELATIVE,
+ A_CHANGEANGLERELATIVE,
+ A_CHANGEANGLEABSOLUTE,
+ A_ROLLANGLE,
+ A_CHANGEROLLANGLERELATIVE,
+ A_CHANGEROLLANGLEABSOLUTE,
+ A_PLAYSOUND,
+ A_FINDTARGET,
+ A_FINDTRACER,
+ A_SETTICS,
+ A_SETRANDOMTICS,
+ A_CHANGECOLORRELATIVE,
+ A_CHANGECOLORABSOLUTE,
+ A_DYE,
+ A_MOVERELATIVE,
+ A_MOVEABSOLUTE,
+ A_THRUST,
+ A_ZTHRUST,
+ A_SETTARGETSTARGET,
+ A_SETOBJECTFLAGS,
+ A_SETOBJECTFLAGS2,
+ A_RANDOMSTATE,
+ A_RANDOMSTATERANGE,
+ A_DUALACTION,
+ A_REMOTEACTION,
+ A_TOGGLEFLAMEJET,
+ A_ORBITNIGHTS,
+ A_GHOSTME,
+ A_SETOBJECTSTATE,
+ A_SETOBJECTTYPESTATE,
+ A_KNOCKBACK,
+ A_PUSHAWAY,
+ A_RINGDRAIN,
+ A_SPLITSHOT,
+ A_MISSILESPLIT,
+ A_MULTISHOT,
+ A_INSTALOOP,
+ A_CUSTOM3DROTATE,
+ A_SEARCHFORPLAYERS,
+ A_CHECKRANDOM,
+ A_CHECKTARGETRINGS,
+ A_CHECKRINGS,
+ A_CHECKTOTALRINGS,
+ A_CHECKHEALTH,
+ A_CHECKRANGE,
+ A_CHECKHEIGHT,
+ A_CHECKTRUERANGE,
+ A_CHECKTHINGCOUNT,
+ A_CHECKAMBUSH,
+ A_CHECKCUSTOMVALUE,
+ A_CHECKCUSVALMEMO,
+ A_SETCUSTOMVALUE,
+ A_USECUSVALMEMO,
+ A_RELAYCUSTOMVALUE,
+ A_CUSVALACTION,
+ A_FORCESTOP,
+ A_FORCEWIN,
+ A_SPIKERETRACT,
+ A_INFOSTATE,
+ A_REPEAT,
+ A_SETSCALE,
+ A_REMOTEDAMAGE,
+ A_HOMINGCHASE,
+ A_TRAPSHOT,
+ A_VILETARGET,
+ A_VILEATTACK,
+ A_VILEFIRE,
+ A_BRAKCHASE,
+ A_BRAKFIRESHOT,
+ A_BRAKLOBSHOT,
+ A_NAPALMSCATTER,
+ A_SPAWNFRESHCOPY,
+ A_FLICKYSPAWN,
+ A_FLICKYCENTER,
+ A_FLICKYAIM,
+ A_FLICKYFLY,
+ A_FLICKYSOAR,
+ A_FLICKYCOAST,
+ A_FLICKYHOP,
+ A_FLICKYFLOUNDER,
+ A_FLICKYCHECK,
+ A_FLICKYHEIGHTCHECK,
+ A_FLICKYFLUTTER,
+ A_FLAMEPARTICLE,
+ A_FADEOVERLAY,
+ A_BOSS5JUMP,
+ A_LIGHTBEAMRESET,
+ A_MINEEXPLODE,
+ A_MINERANGE,
+ A_CONNECTTOGROUND,
+ A_SPAWNPARTICLERELATIVE,
+ A_MULTISHOTDIST,
+ A_WHOCARESIFYOURSONISABEE,
+ A_PARENTTRIESTOSLEEP,
+ A_CRYINGTOMOMMA,
+ A_CHECKFLAGS2,
+ A_BOSS5FINDWAYPOINT,
+ A_DONPCSKID,
+ A_DONPCPAIN,
+ A_PREPAREREPEAT,
+ A_BOSS5EXTRAREPEAT,
+ A_BOSS5CALM,
+ A_BOSS5CHECKONGROUND,
+ A_BOSS5CHECKFALLING,
+ A_BOSS5PINCHSHOT,
+ A_BOSS5MAKEITRAIN,
+ A_BOSS5MAKEJUNK,
+ A_LOOKFORBETTER,
+ A_BOSS5BOMBEXPLODE,
+ A_DUSTDEVILTHINK,
+ A_TNTEXPLODE,
+ A_DEBRISRANDOM,
+ A_TRAINCAMEO,
+ A_TRAINCAMEO2,
+ A_CANARIVOREGAS,
+ A_KILLSEGMENTS,
+ A_SNAPPERSPAWN,
+ A_SNAPPERTHINKER,
+ A_SALOONDOORSPAWN,
+ A_MINECARTSPARKTHINK,
+ A_MODULOTOSTATE,
+ A_LAVAFALLROCKS,
+ A_LAVAFALLLAVA,
+ A_FALLINGLAVACHECK,
+ A_FIRESHRINK,
+ A_SPAWNPTERABYTES,
+ A_PTERABYTEHOVER,
+ A_ROLLOUTSPAWN,
+ A_ROLLOUTROCK,
+ A_DRAGONBOMBERSPAWN,
+ A_DRAGONWING,
+ A_DRAGONSEGMENT,
+ A_CHANGEHEIGHT,
+ NUMACTIONS
+};
+
// IMPORTANT NOTE: If you add/remove from this list of action
-// functions, don't forget to update them in dehacked.c!
+// functions, don't forget to update them in deh_tables.c!
void A_Explode();
void A_Pain();
void A_Fall();
@@ -286,6 +554,8 @@ void A_DragonWing();
void A_DragonSegment();
void A_ChangeHeight();
+extern boolean actionsoverridden[NUMACTIONS];
+
// ratio of states to sprites to mobj types is roughly 6 : 1 : 1
#define NUMMOBJFREESLOTS 512
#define NUMSPRITEFREESLOTS NUMMOBJFREESLOTS
@@ -414,6 +684,7 @@ typedef enum sprite
SPR_SIGN, // Level end sign
SPR_SPIK, // Spike Ball
SPR_SFLM, // Spin fire
+ SPR_TFLM, // Spin fire (team)
SPR_USPK, // Floor spike
SPR_WSPK, // Wall spike
SPR_WSPB, // Wall spike base
@@ -856,6 +1127,7 @@ typedef enum playersprite
SPR2_TAL9,
SPR2_TALA,
SPR2_TALB,
+ SPR2_TALC,
SPR2_CNT1, // continue disappointment
SPR2_CNT2, // continue lift
@@ -997,6 +1269,7 @@ typedef enum state
S_TAILSOVERLAY_PAIN,
S_TAILSOVERLAY_GASP,
S_TAILSOVERLAY_EDGE,
+ S_TAILSOVERLAY_DASH,
// [:
S_JETFUMEFLASH,
@@ -2052,6 +2325,13 @@ typedef enum state
S_SPINFIRE5,
S_SPINFIRE6,
+ S_TEAM_SPINFIRE1,
+ S_TEAM_SPINFIRE2,
+ S_TEAM_SPINFIRE3,
+ S_TEAM_SPINFIRE4,
+ S_TEAM_SPINFIRE5,
+ S_TEAM_SPINFIRE6,
+
// Spikes
S_SPIKE1,
S_SPIKE2,
@@ -4008,9 +4288,7 @@ typedef enum state
S_BLUEBRICKDEBRIS, // for CEZ3
S_YELLOWBRICKDEBRIS, // for CEZ3
-#ifdef SEENAMES
S_NAMECHECK,
-#endif
S_FIRSTFREESLOT,
S_LASTFREESLOT = S_FIRSTFREESLOT + NUMSTATEFREESLOTS - 1,
@@ -4810,9 +5088,7 @@ typedef enum mobj_type
MT_BLUEBRICKDEBRIS, // for CEZ3
MT_YELLOWBRICKDEBRIS, // for CEZ3
-#ifdef SEENAMES
MT_NAMECHECK,
-#endif
MT_FIRSTFREESLOT,
MT_LASTFREESLOT = MT_FIRSTFREESLOT + NUMMOBJFREESLOTS - 1,
diff --git a/src/lua_baselib.c b/src/lua_baselib.c
index 6b25e32ea5e1746536b31111cf9eea749d42c453..a265465dad6b1c542024f438fb2e961234d0d051 100644
--- a/src/lua_baselib.c
+++ b/src/lua_baselib.c
@@ -32,9 +32,13 @@
#include "lua_script.h"
#include "lua_libs.h"
#include "lua_hud.h" // hud_running errors
+#include "taglist.h" // P_FindSpecialLineFromTag
+#include "lua_hook.h" // hook_cmd_running errors
#define NOHUD if (hud_running)\
-return luaL_error(L, "HUD rendering code should not call this function!");
+return luaL_error(L, "HUD rendering code should not call this function!");\
+else if (hook_cmd_running)\
+return luaL_error(L, "CMD building code should not call this function!");
boolean luaL_checkboolean(lua_State *L, int narg) {
luaL_checktype(L, narg, LUA_TBOOLEAN);
@@ -151,6 +155,8 @@ static const struct {
{META_PIVOTLIST, "spriteframepivot_t[]"},
{META_FRAMEPIVOT, "spriteframepivot_t"},
+ {META_TAGLIST, "taglist"},
+
{META_MOBJ, "mobj_t"},
{META_MAPTHING, "mapthing_t"},
@@ -159,6 +165,8 @@ static const struct {
{META_SKIN, "skin_t"},
{META_POWERS, "player_t.powers"},
{META_SOUNDSID, "skin_t.soundsid"},
+ {META_SKINSPRITES, "skin_t.sprites"},
+ {META_SKINSPRITESLIST, "skin_t.sprites[]"},
{META_VERTEX, "vertex_t"},
{META_LINE, "line_t"},
@@ -170,11 +178,19 @@ static const struct {
{META_SEG, "seg_t"},
{META_NODE, "node_t"},
#endif
+ {META_SLOPE, "slope_t"},
+ {META_VECTOR2, "vector2_t"},
+ {META_VECTOR3, "vector3_t"},
{META_MAPHEADER, "mapheader_t"},
+ {META_POLYOBJ, "polyobj_t"},
+
{META_CVAR, "consvar_t"},
{META_SECTORLINES, "sector_t.lines"},
+#ifdef MUTABLE_TAGS
+ {META_SECTORTAGLIST, "sector_t.taglist"},
+#endif
{META_SIDENUM, "line_t.sidenum"},
{META_LINEARGS, "line_t.args"},
{META_LINESTRINGARGS, "line_t.stringargs"},
@@ -226,16 +242,60 @@ static const char *GetUserdataUType(lua_State *L)
// or players[0].powers -> "player_t.powers"
static int lib_userdataType(lua_State *L)
{
- int type;
lua_settop(L, 1); // pop everything except arg 1 (in case somebody decided to add more)
- type = lua_type(L, 1);
- if (type == LUA_TLIGHTUSERDATA || type == LUA_TUSERDATA)
- {
- lua_pushstring(L, GetUserdataUType(L));
- return 1;
- }
- else
- return luaL_typerror(L, 1, "userdata");
+ luaL_checktype(L, 1, LUA_TUSERDATA);
+ lua_pushstring(L, GetUserdataUType(L));
+ return 1;
+}
+
+// Takes a metatable as first and only argument
+// Only callable during script loading
+static int lib_registerMetatable(lua_State *L)
+{
+ static UINT16 nextid = 1;
+
+ if (!lua_lumploading)
+ return luaL_error(L, "This function cannot be called from within a hook or coroutine!");
+ luaL_checktype(L, 1, LUA_TTABLE);
+
+ if (nextid == 0)
+ return luaL_error(L, "Too many metatables registered?! Please consider rewriting your script once you are sober again.\n");
+
+ lua_getfield(L, LUA_REGISTRYINDEX, LREG_METATABLES); // 2
+ // registry.metatables[metatable] = nextid
+ lua_pushvalue(L, 1); // 3
+ lua_pushnumber(L, nextid); // 4
+ lua_settable(L, 2);
+
+ // registry.metatables[nextid] = metatable
+ lua_pushnumber(L, nextid); // 3
+ lua_pushvalue(L, 1); // 4
+ lua_settable(L, 2);
+ lua_pop(L, 1);
+
+ nextid++;
+
+ return 0;
+}
+
+// Takes a string as only argument and returns the metatable
+// associated to the userdata type this string refers to
+// Returns nil if the string does not refer to a valid userdata type
+static int lib_userdataMetatable(lua_State *L)
+{
+ UINT32 i;
+ const char *udname = luaL_checkstring(L, 1);
+
+ // Find internal metatable name
+ for (i = 0; meta2utype[i].meta; i++)
+ if (!strcmp(udname, meta2utype[i].utype))
+ {
+ luaL_getmetatable(L, meta2utype[i].meta);
+ return 1;
+ }
+
+ lua_pushnil(L);
+ return 1;
}
static int lib_isPlayerAdmin(lua_State *L)
@@ -366,7 +426,7 @@ static int lib_pAproxDistance(lua_State *L)
fixed_t dx = luaL_checkfixed(L, 1);
fixed_t dy = luaL_checkfixed(L, 2);
//HUDSAFE
- lua_pushfixed(L, P_AproxDistance(dx, dy));
+ lua_pushfixed(L, R_PointToDist2(0, 0, dx, dy));
return 1;
}
@@ -907,47 +967,77 @@ static int lib_pMaceRotate(lua_State *L)
return 0;
}
+static int lib_pCreateFloorSpriteSlope(lua_State *L)
+{
+ mobj_t *mobj = *((mobj_t **)luaL_checkudata(L, 1, META_MOBJ));
+ NOHUD
+ INLEVEL
+ if (!mobj)
+ return LUA_ErrInvalid(L, "mobj_t");
+ LUA_PushUserdata(L, (pslope_t *)P_CreateFloorSpriteSlope(mobj), META_SLOPE);
+ return 1;
+}
+
+static int lib_pRemoveFloorSpriteSlope(lua_State *L)
+{
+ mobj_t *mobj = *((mobj_t **)luaL_checkudata(L, 1, META_MOBJ));
+ NOHUD
+ INLEVEL
+ if (!mobj)
+ return LUA_ErrInvalid(L, "mobj_t");
+ P_RemoveFloorSpriteSlope(mobj);
+ return 1;
+}
+
static int lib_pRailThinker(lua_State *L)
{
mobj_t *mobj = *((mobj_t **)luaL_checkudata(L, 1, META_MOBJ));
+ mobj_t *ptmthing = tmthing;
NOHUD
INLEVEL
if (!mobj)
return LUA_ErrInvalid(L, "mobj_t");
lua_pushboolean(L, P_RailThinker(mobj));
+ P_SetTarget(&tmthing, ptmthing);
return 1;
}
static int lib_pXYMovement(lua_State *L)
{
mobj_t *actor = *((mobj_t **)luaL_checkudata(L, 1, META_MOBJ));
+ mobj_t *ptmthing = tmthing;
NOHUD
INLEVEL
if (!actor)
return LUA_ErrInvalid(L, "mobj_t");
P_XYMovement(actor);
+ P_SetTarget(&tmthing, ptmthing);
return 0;
}
static int lib_pRingXYMovement(lua_State *L)
{
mobj_t *actor = *((mobj_t **)luaL_checkudata(L, 1, META_MOBJ));
+ mobj_t *ptmthing = tmthing;
NOHUD
INLEVEL
if (!actor)
return LUA_ErrInvalid(L, "mobj_t");
P_RingXYMovement(actor);
+ P_SetTarget(&tmthing, ptmthing);
return 0;
}
static int lib_pSceneryXYMovement(lua_State *L)
{
mobj_t *actor = *((mobj_t **)luaL_checkudata(L, 1, META_MOBJ));
+ mobj_t *ptmthing = tmthing;
NOHUD
INLEVEL
if (!actor)
return LUA_ErrInvalid(L, "mobj_t");
P_SceneryXYMovement(actor);
+ P_SetTarget(&tmthing, ptmthing);
return 0;
}
@@ -959,6 +1049,7 @@ static int lib_pZMovement(lua_State *L)
if (!actor)
return LUA_ErrInvalid(L, "mobj_t");
lua_pushboolean(L, P_ZMovement(actor));
+ P_CheckPosition(actor, actor->x, actor->y);
return 1;
}
@@ -970,6 +1061,7 @@ static int lib_pRingZMovement(lua_State *L)
if (!actor)
return LUA_ErrInvalid(L, "mobj_t");
P_RingZMovement(actor);
+ P_CheckPosition(actor, actor->x, actor->y);
return 0;
}
@@ -981,6 +1073,7 @@ static int lib_pSceneryZMovement(lua_State *L)
if (!actor)
return LUA_ErrInvalid(L, "mobj_t");
lua_pushboolean(L, P_SceneryZMovement(actor));
+ P_CheckPosition(actor, actor->x, actor->y);
return 1;
}
@@ -992,6 +1085,7 @@ static int lib_pPlayerZMovement(lua_State *L)
if (!actor)
return LUA_ErrInvalid(L, "mobj_t");
P_PlayerZMovement(actor);
+ P_CheckPosition(actor, actor->x, actor->y);
return 0;
}
@@ -1571,6 +1665,26 @@ static int lib_pSwitchShield(lua_State *L)
return 0;
}
+static int lib_pPlayerCanEnterSpinGaps(lua_State *L)
+{
+ player_t *player = *((player_t **)luaL_checkudata(L, 1, META_PLAYER));
+ INLEVEL
+ if (!player)
+ return LUA_ErrInvalid(L, "player_t");
+ lua_pushboolean(L, P_PlayerCanEnterSpinGaps(player));
+ return 1;
+}
+
+static int lib_pPlayerShouldUseSpinHeight(lua_State *L)
+{
+ player_t *player = *((player_t **)luaL_checkudata(L, 1, META_PLAYER));
+ INLEVEL
+ if (!player)
+ return LUA_ErrInvalid(L, "player_t");
+ lua_pushboolean(L, P_PlayerShouldUseSpinHeight(player));
+ return 1;
+}
+
// P_MAP
///////////
@@ -1715,6 +1829,18 @@ static int lib_pFloorzAtPos(lua_State *L)
return 1;
}
+static int lib_pCeilingzAtPos(lua_State *L)
+{
+ fixed_t x = luaL_checkfixed(L, 1);
+ fixed_t y = luaL_checkfixed(L, 2);
+ fixed_t z = luaL_checkfixed(L, 3);
+ fixed_t height = luaL_checkfixed(L, 4);
+ //HUDSAFE
+ INLEVEL
+ lua_pushfixed(L, P_CeilingzAtPos(x, y, z, height));
+ return 1;
+}
+
static int lib_pDoSpring(lua_State *L)
{
mobj_t *spring = *((mobj_t **)luaL_checkudata(L, 1, META_MOBJ));
@@ -2586,30 +2712,56 @@ static int lib_rGetNameByColor(lua_State *L)
// S_SOUND
////////////
+static int GetValidSoundOrigin(lua_State *L, void **origin)
+{
+ const char *type;
+
+ lua_settop(L, 1);
+ type = GetUserdataUType(L);
+
+ if (fasticmp(type, "mobj_t"))
+ {
+ *origin = *((mobj_t **)luaL_checkudata(L, 1, META_MOBJ));
+ if (!(*origin))
+ return LUA_ErrInvalid(L, "mobj_t");
+ return 1;
+ }
+ else if (fasticmp(type, "sector_t"))
+ {
+ *origin = *((sector_t **)luaL_checkudata(L, 1, META_SECTOR));
+ if (!(*origin))
+ return LUA_ErrInvalid(L, "sector_t");
+
+ *origin = &((sector_t *)(*origin))->soundorg;
+ return 1;
+ }
+
+ return LUA_ErrInvalid(L, "mobj_t/sector_t");
+}
+
static int lib_sStartSound(lua_State *L)
{
- const void *origin = NULL;
+ void *origin = NULL;
sfxenum_t sound_id = luaL_checkinteger(L, 2);
player_t *player = NULL;
//NOHUD
+
if (sound_id >= NUMSFX)
return luaL_error(L, "sfx %d out of range (0 - %d)", sound_id, NUMSFX-1);
- if (!lua_isnil(L, 1))
- {
- origin = *((mobj_t **)luaL_checkudata(L, 1, META_MOBJ));
- if (!origin)
- return LUA_ErrInvalid(L, "mobj_t");
- }
+
if (!lua_isnone(L, 3) && lua_isuserdata(L, 3))
{
player = *((player_t **)luaL_checkudata(L, 3, META_PLAYER));
if (!player)
return LUA_ErrInvalid(L, "player_t");
}
+ if (!lua_isnil(L, 1))
+ if (!GetValidSoundOrigin(L, &origin))
+ return 0;
if (!player || P_IsLocalPlayer(player))
{
- if (hud_running)
- origin = NULL; // HUD rendering startsound shouldn't have an origin, just remove it instead of having a retarded error.
+ if (hud_running || hook_cmd_running)
+ origin = NULL; // HUD rendering and CMD building startsound shouldn't have an origin, just remove it instead of having a retarded error.
S_StartSound(origin, sound_id);
}
@@ -2618,18 +2770,12 @@ static int lib_sStartSound(lua_State *L)
static int lib_sStartSoundAtVolume(lua_State *L)
{
- const void *origin = NULL;
+ void *origin = NULL;
sfxenum_t sound_id = luaL_checkinteger(L, 2);
INT32 volume = (INT32)luaL_checkinteger(L, 3);
player_t *player = NULL;
//NOHUD
- if (!lua_isnil(L, 1))
- {
- origin = *((mobj_t **)luaL_checkudata(L, 1, META_MOBJ));
- if (!origin)
- return LUA_ErrInvalid(L, "mobj_t");
- }
if (sound_id >= NUMSFX)
return luaL_error(L, "sfx %d out of range (0 - %d)", sound_id, NUMSFX-1);
if (!lua_isnone(L, 4) && lua_isuserdata(L, 4))
@@ -2638,30 +2784,37 @@ static int lib_sStartSoundAtVolume(lua_State *L)
if (!player)
return LUA_ErrInvalid(L, "player_t");
}
+ if (!lua_isnil(L, 1))
+ if (!GetValidSoundOrigin(L, &origin))
+ return LUA_ErrInvalid(L, "mobj_t/sector_t");
+
if (!player || P_IsLocalPlayer(player))
- S_StartSoundAtVolume(origin, sound_id, volume);
+ S_StartSoundAtVolume(origin, sound_id, volume);
return 0;
}
static int lib_sStopSound(lua_State *L)
{
- void *origin = *((mobj_t **)luaL_checkudata(L, 1, META_MOBJ));
+ void *origin = NULL;
//NOHUD
- if (!origin)
- return LUA_ErrInvalid(L, "mobj_t");
+ if (!GetValidSoundOrigin(L, &origin))
+ return LUA_ErrInvalid(L, "mobj_t/sector_t");
+
S_StopSound(origin);
return 0;
}
static int lib_sStopSoundByID(lua_State *L)
{
- void *origin = *((mobj_t **)luaL_checkudata(L, 1, META_MOBJ));
+ void *origin = NULL;
sfxenum_t sound_id = luaL_checkinteger(L, 2);
//NOHUD
- if (!origin)
- return LUA_ErrInvalid(L, "mobj_t");
+
if (sound_id >= NUMSFX)
return luaL_error(L, "sfx %d out of range (0 - %d)", sound_id, NUMSFX-1);
+ if (!lua_isnil(L, 1))
+ if (!GetValidSoundOrigin(L, &origin))
+ return LUA_ErrInvalid(L, "mobj_t/sector_t");
S_StopSoundByID(origin, sound_id);
return 0;
@@ -2887,11 +3040,12 @@ static int lib_sSetMusicPosition(lua_State *L)
static int lib_sOriginPlaying(lua_State *L)
{
- void *origin = *((mobj_t **)luaL_checkudata(L, 1, META_MOBJ));
+ void *origin = NULL;
//NOHUD
INLEVEL
- if (!origin)
- return LUA_ErrInvalid(L, "mobj_t");
+ if (!GetValidSoundOrigin(L, &origin))
+ return LUA_ErrInvalid(L, "mobj_t/sector_t");
+
lua_pushboolean(L, S_OriginPlaying(origin));
return 1;
}
@@ -2908,14 +3062,15 @@ static int lib_sIdPlaying(lua_State *L)
static int lib_sSoundPlaying(lua_State *L)
{
- void *origin = *((mobj_t **)luaL_checkudata(L, 1, META_MOBJ));
+ void *origin = NULL;
sfxenum_t id = luaL_checkinteger(L, 2);
//NOHUD
INLEVEL
- if (!origin)
- return LUA_ErrInvalid(L, "mobj_t");
if (id >= NUMSFX)
return luaL_error(L, "sfx %d out of range (0 - %d)", id, NUMSFX-1);
+ if (!GetValidSoundOrigin(L, &origin))
+ return LUA_ErrInvalid(L, "mobj_t/sector_t");
+
lua_pushboolean(L, S_SoundPlaying(origin, id));
return 1;
}
@@ -2945,6 +3100,185 @@ static int lib_sStartMusicCaption(lua_State *L)
return 0;
}
+static int lib_sMusicType(lua_State *L)
+{
+ player_t *player = NULL;
+ NOHUD
+ if (!lua_isnone(L, 1) && lua_isuserdata(L, 1))
+ {
+ player = *((player_t **)luaL_checkudata(L, 1, META_PLAYER));
+ if (!player)
+ return LUA_ErrInvalid(L, "player_t");
+ }
+ if (!player || P_IsLocalPlayer(player))
+ lua_pushinteger(L, S_MusicType());
+ else
+ lua_pushnil(L);
+ return 1;
+}
+
+static int lib_sMusicPlaying(lua_State *L)
+{
+ player_t *player = NULL;
+ NOHUD
+ if (!lua_isnone(L, 1) && lua_isuserdata(L, 1))
+ {
+ player = *((player_t **)luaL_checkudata(L, 1, META_PLAYER));
+ if (!player)
+ return LUA_ErrInvalid(L, "player_t");
+ }
+ if (!player || P_IsLocalPlayer(player))
+ lua_pushboolean(L, S_MusicPlaying());
+ else
+ lua_pushnil(L);
+ return 1;
+}
+
+static int lib_sMusicPaused(lua_State *L)
+{
+ player_t *player = NULL;
+ NOHUD
+ if (!lua_isnone(L, 1) && lua_isuserdata(L, 1))
+ {
+ player = *((player_t **)luaL_checkudata(L, 1, META_PLAYER));
+ if (!player)
+ return LUA_ErrInvalid(L, "player_t");
+ }
+ if (!player || P_IsLocalPlayer(player))
+ lua_pushboolean(L, S_MusicPaused());
+ else
+ lua_pushnil(L);
+ return 1;
+}
+
+static int lib_sMusicName(lua_State *L)
+{
+ player_t *player = NULL;
+ NOHUD
+ if (!lua_isnone(L, 1) && lua_isuserdata(L, 1))
+ {
+ player = *((player_t **)luaL_checkudata(L, 1, META_PLAYER));
+ if (!player)
+ return LUA_ErrInvalid(L, "player_t");
+ }
+ if (!player || P_IsLocalPlayer(player))
+ lua_pushstring(L, S_MusicName());
+ else
+ lua_pushnil(L);
+ return 1;
+}
+
+static int lib_sMusicExists(lua_State *L)
+{
+ boolean checkMIDI = lua_opttrueboolean(L, 2);
+ boolean checkDigi = lua_opttrueboolean(L, 3);
+#ifdef MUSICSLOT_COMPATIBILITY
+ const char *music_name;
+ UINT32 music_num;
+ char music_compat_name[7];
+ UINT16 music_flags = 0;
+ NOHUD
+ if (lua_isnumber(L, 1))
+ {
+ music_num = (UINT32)luaL_checkinteger(L, 1);
+ music_flags = (UINT16)(music_num & 0x0000FFFF);
+ if (music_flags && music_flags <= 1035)
+ snprintf(music_compat_name, 7, "%sM", G_BuildMapName((INT32)music_flags));
+ else if (music_flags && music_flags <= 1050)
+ strncpy(music_compat_name, compat_special_music_slots[music_flags - 1036], 7);
+ else
+ music_compat_name[0] = 0; // becomes empty string
+ music_compat_name[6] = 0;
+ music_name = (const char *)&music_compat_name;
+ }
+ else
+ {
+ music_num = 0;
+ music_name = luaL_checkstring(L, 1);
+ }
+#else
+ const char *music_name = luaL_checkstring(L, 1);
+#endif
+ NOHUD
+ lua_pushboolean(L, S_MusicExists(music_name, checkMIDI, checkDigi));
+ return 1;
+}
+
+static int lib_sSetMusicLoopPoint(lua_State *L)
+{
+ UINT32 looppoint = (UINT32)luaL_checkinteger(L, 1);
+ player_t *player = NULL;
+ NOHUD
+ if (!lua_isnone(L, 2) && lua_isuserdata(L, 2))
+ {
+ player = *((player_t **)luaL_checkudata(L, 2, META_PLAYER));
+ if (!player)
+ return LUA_ErrInvalid(L, "player_t");
+ }
+ if (!player || P_IsLocalPlayer(player))
+ lua_pushboolean(L, S_SetMusicLoopPoint(looppoint));
+ else
+ lua_pushnil(L);
+ return 1;
+}
+
+static int lib_sGetMusicLoopPoint(lua_State *L)
+{
+ player_t *player = NULL;
+ NOHUD
+ if (!lua_isnone(L, 1) && lua_isuserdata(L, 1))
+ {
+ player = *((player_t **)luaL_checkudata(L, 1, META_PLAYER));
+ if (!player)
+ return LUA_ErrInvalid(L, "player_t");
+ }
+ if (!player || P_IsLocalPlayer(player))
+ lua_pushinteger(L, (int)S_GetMusicLoopPoint());
+ else
+ lua_pushnil(L);
+ return 1;
+}
+
+static int lib_sPauseMusic(lua_State *L)
+{
+ player_t *player = NULL;
+ NOHUD
+ if (!lua_isnone(L, 1) && lua_isuserdata(L, 1))
+ {
+ player = *((player_t **)luaL_checkudata(L, 1, META_PLAYER));
+ if (!player)
+ return LUA_ErrInvalid(L, "player_t");
+ }
+ if (!player || P_IsLocalPlayer(player))
+ {
+ S_PauseAudio();
+ lua_pushboolean(L, true);
+ }
+ else
+ lua_pushnil(L);
+ return 1;
+}
+
+static int lib_sResumeMusic(lua_State *L)
+{
+ player_t *player = NULL;
+ NOHUD
+ if (!lua_isnone(L, 1) && lua_isuserdata(L, 1))
+ {
+ player = *((player_t **)luaL_checkudata(L, 1, META_PLAYER));
+ if (!player)
+ return LUA_ErrInvalid(L, "player_t");
+ }
+ if (!player || P_IsLocalPlayer(player))
+ {
+ S_ResumeAudio();
+ lua_pushboolean(L, true);
+ }
+ else
+ lua_pushnil(L);
+ return 1;
+}
+
// G_GAME
////////////
@@ -3433,6 +3767,8 @@ static luaL_Reg lib[] = {
{"chatprint", lib_chatprint},
{"chatprintf", lib_chatprintf},
{"userdataType", lib_userdataType},
+ {"registerMetatable", lib_registerMetatable},
+ {"userdataMetatable", lib_userdataMetatable},
{"IsPlayerAdmin", lib_isPlayerAdmin},
{"reserveLuabanks", lib_reserveLuabanks},
@@ -3492,6 +3828,8 @@ static luaL_Reg lib[] = {
{"P_CheckSolidLava",lib_pCheckSolidLava},
{"P_CanRunOnWater",lib_pCanRunOnWater},
{"P_MaceRotate",lib_pMaceRotate},
+ {"P_CreateFloorSpriteSlope",lib_pCreateFloorSpriteSlope},
+ {"P_RemoveFloorSpriteSlope",lib_pRemoveFloorSpriteSlope},
{"P_RailThinker",lib_pRailThinker},
{"P_XYMovement",lib_pXYMovement},
{"P_RingXYMovement",lib_pRingXYMovement},
@@ -3548,6 +3886,8 @@ static luaL_Reg lib[] = {
{"P_SpawnSpinMobj",lib_pSpawnSpinMobj},
{"P_Telekinesis",lib_pTelekinesis},
{"P_SwitchShield",lib_pSwitchShield},
+ {"P_PlayerCanEnterSpinGaps",lib_pPlayerCanEnterSpinGaps},
+ {"P_PlayerShouldUseSpinHeight",lib_pPlayerShouldUseSpinHeight},
// p_map
{"P_CheckPosition",lib_pCheckPosition},
@@ -3560,6 +3900,7 @@ static luaL_Reg lib[] = {
{"P_CheckHoopPosition",lib_pCheckHoopPosition},
{"P_RadiusAttack",lib_pRadiusAttack},
{"P_FloorzAtPos",lib_pFloorzAtPos},
+ {"P_CeilingzAtPos",lib_pCeilingzAtPos},
{"P_DoSpring",lib_pDoSpring},
// p_inter
@@ -3650,6 +3991,15 @@ static luaL_Reg lib[] = {
{"S_IdPlaying",lib_sIdPlaying},
{"S_SoundPlaying",lib_sSoundPlaying},
{"S_StartMusicCaption", lib_sStartMusicCaption},
+ {"S_MusicType",lib_sMusicType},
+ {"S_MusicPlaying",lib_sMusicPlaying},
+ {"S_MusicPaused",lib_sMusicPaused},
+ {"S_MusicName",lib_sMusicName},
+ {"S_MusicExists",lib_sMusicExists},
+ {"S_SetMusicLoopPoint",lib_sSetMusicLoopPoint},
+ {"S_GetMusicLoopPoint",lib_sGetMusicLoopPoint},
+ {"S_PauseMusic",lib_sPauseMusic},
+ {"S_ResumeMusic", lib_sResumeMusic},
// g_game
{"G_AddGametype", lib_gAddGametype},
diff --git a/src/lua_blockmaplib.c b/src/lua_blockmaplib.c
index 5aae73284d985f34c16d11498aa35105fdba92ba..1949d56bb56fdca88c46005ae3118affc4e9c1df 100644
--- a/src/lua_blockmaplib.c
+++ b/src/lua_blockmaplib.c
@@ -1,6 +1,6 @@
// SONIC ROBO BLAST 2
//-----------------------------------------------------------------------------
-// Copyright (C) 2016 by Iestyn "Monster Iestyn" Jealous.
+// Copyright (C) 2016-2020 by Iestyn "Monster Iestyn" Jealous.
// Copyright (C) 2016-2020 by Sonic Team Junior.
//
// This program is free software distributed under the
@@ -13,6 +13,7 @@
#include "doomdef.h"
#include "p_local.h"
#include "r_main.h" // validcount
+#include "p_polyobj.h"
#include "lua_script.h"
#include "lua_libs.h"
//#include "lua_hud.h" // hud_running errors
@@ -20,6 +21,7 @@
static const char *const search_opt[] = {
"objects",
"lines",
+ "polyobjs",
NULL};
// a quickly-made function pointer typedef used by lib_searchBlockmap...
@@ -167,6 +169,55 @@ static UINT8 lib_searchBlockmap_Lines(lua_State *L, INT32 x, INT32 y, mobj_t *th
return 0; // Everything was checked.
}
+// Helper function for "polyobjs" search
+static UINT8 lib_searchBlockmap_PolyObjs(lua_State *L, INT32 x, INT32 y, mobj_t *thing)
+{
+ INT32 offset;
+ polymaplink_t *plink; // haleyjd 02/22/06
+
+ if (x < 0 || y < 0 || x >= bmapwidth || y >= bmapheight)
+ return 0;
+
+ offset = y*bmapwidth + x;
+
+ // haleyjd 02/22/06: consider polyobject lines
+ plink = polyblocklinks[offset];
+
+ while (plink)
+ {
+ polyobj_t *po = plink->po;
+
+ if (po->validcount != validcount) // if polyobj hasn't been checked
+ {
+ po->validcount = validcount;
+
+ lua_pushvalue(L, 1);
+ LUA_PushUserdata(L, thing, META_MOBJ);
+ LUA_PushUserdata(L, po, META_POLYOBJ);
+ if (lua_pcall(gL, 2, 1, 0)) {
+ if (!blockfuncerror || cv_debug & DBG_LUA)
+ CONS_Alert(CONS_WARNING,"%s\n",lua_tostring(gL, -1));
+ lua_pop(gL, 1);
+ blockfuncerror = true;
+ return 0; // *shrugs*
+ }
+ if (!lua_isnil(gL, -1))
+ { // if nil, continue
+ if (lua_toboolean(gL, -1))
+ return 2; // stop whole search
+ else
+ return 1; // stop block search
+ }
+ lua_pop(gL, 1);
+ if (P_MobjWasRemoved(thing))
+ return 2;
+ }
+ plink = (polymaplink_t *)(plink->link.next);
+ }
+
+ return 0; // Everything was checked.
+}
+
// The searchBlockmap function
// arguments: searchBlockmap(searchtype, function, mobj, [x1, x2, y1, y2])
// return value:
@@ -195,6 +246,9 @@ static int lib_searchBlockmap(lua_State *L)
case 1: // "lines"
searchFunc = lib_searchBlockmap_Lines;
break;
+ case 2: // "polyobjs"
+ searchFunc = lib_searchBlockmap_PolyObjs;
+ break;
}
// the mobj we are searching around, the "calling" mobj we could say
diff --git a/src/lua_consolelib.c b/src/lua_consolelib.c
index fae4f2d14b3ab91eff6eb83fb2a7c6591c96aa63..a8ef6b7c0b5a8099ae7e018753f77db011292435 100644
--- a/src/lua_consolelib.c
+++ b/src/lua_consolelib.c
@@ -28,7 +28,7 @@ return luaL_error(L, "HUD rendering code should not call this function!");
#define NOHOOK if (!lua_lumploading)\
return luaL_error(L, "This function cannot be called from within a hook or coroutine!");
-static const char *cvname = NULL;
+static consvar_t *this_cvar;
void Got_Luacmd(UINT8 **cp, INT32 playernum)
{
@@ -40,6 +40,10 @@ void Got_Luacmd(UINT8 **cp, INT32 playernum)
// like sending random junk lua commands to crash the server
if (!gL) goto deny;
+
+ lua_settop(gL, 0); // Just in case...
+ lua_pushcfunction(gL, LUA_GetErrorMessage);
+
lua_getfield(gL, LUA_REGISTRYINDEX, "COM_Command"); // push COM_Command
if (!lua_istable(gL, -1)) goto deny;
@@ -76,7 +80,7 @@ void Got_Luacmd(UINT8 **cp, INT32 playernum)
READSTRINGN(*cp, buf, 255);
lua_pushstring(gL, buf);
}
- LUA_Call(gL, (int)argc); // argc is 1-based, so this will cover the player we passed too.
+ LUA_Call(gL, (int)argc, 0, 1); // argc is 1-based, so this will cover the player we passed too.
return;
deny:
@@ -98,6 +102,10 @@ void COM_Lua_f(void)
INT32 playernum = consoleplayer;
I_Assert(gL != NULL);
+
+ lua_settop(gL, 0); // Just in case...
+ lua_pushcfunction(gL, LUA_GetErrorMessage);
+
lua_getfield(gL, LUA_REGISTRYINDEX, "COM_Command"); // push COM_Command
I_Assert(lua_istable(gL, -1));
@@ -167,7 +175,7 @@ void COM_Lua_f(void)
LUA_PushUserdata(gL, &players[playernum], META_PLAYER);
for (i = 1; i < COM_Argc(); i++)
lua_pushstring(gL, COM_Argv(i));
- LUA_Call(gL, (int)COM_Argc()); // COM_Argc is 1-based, so this will cover the player we passed too.
+ LUA_Call(gL, (int)COM_Argc(), 0, 1); // COM_Argc is 1-based, so this will cover the player we passed too.
}
// Wrapper for COM_AddCommand
@@ -265,31 +273,29 @@ static int lib_comBufInsertText(lua_State *L)
return 0;
}
-void LUA_CVarChanged(const char *name)
+void LUA_CVarChanged(void *cvar)
{
- cvname = name;
+ this_cvar = cvar;
}
static void Lua_OnChange(void)
{
- I_Assert(gL != NULL);
- I_Assert(cvname != NULL);
-
/// \todo Network this! XD_LUAVAR
+ lua_pushcfunction(gL, LUA_GetErrorMessage);
+ lua_insert(gL, 1); // Because LUA_Call wants it at index 1.
+
// From CV_OnChange registry field, get the function for this cvar by name.
lua_getfield(gL, LUA_REGISTRYINDEX, "CV_OnChange");
I_Assert(lua_istable(gL, -1));
- lua_getfield(gL, -1, cvname); // get function
+ lua_pushlightuserdata(gL, this_cvar);
+ lua_rawget(gL, -2); // get function
- // From the CV_Vars registry field, get the cvar's userdata by name.
- lua_getfield(gL, LUA_REGISTRYINDEX, "CV_Vars");
- I_Assert(lua_istable(gL, -1));
- lua_getfield(gL, -1, cvname); // get consvar_t* userdata.
- lua_remove(gL, -2); // pop the CV_Vars table.
+ LUA_RawPushUserdata(gL, this_cvar);
- LUA_Call(gL, 1); // call function(cvar)
+ LUA_Call(gL, 1, 0, 1); // call function(cvar)
lua_pop(gL, 1); // pop CV_OnChange table
+ lua_remove(gL, 1); // remove LUA_GetErrorMessage
}
static int lib_cvRegisterVar(lua_State *L)
@@ -300,15 +306,12 @@ static int lib_cvRegisterVar(lua_State *L)
luaL_checktype(L, 1, LUA_TTABLE);
lua_settop(L, 1); // Clear out all other possible arguments, leaving only the first one.
NOHOOK
- cvar = lua_newuserdata(L, sizeof(consvar_t));
- luaL_getmetatable(L, META_CVAR);
- lua_setmetatable(L, -2);
+ cvar = ZZ_Calloc(sizeof(consvar_t));
+ LUA_PushUserdata(L, cvar, META_CVAR);
#define FIELDERROR(f, e) luaL_error(L, "bad value for " LUA_QL(f) " in table passed to " LUA_QL("CV_RegisterVar") " (%s)", e);
#define TYPEERROR(f, t) FIELDERROR(f, va("%s expected, got %s", lua_typename(L, t), luaL_typename(L, -1)))
- memset(cvar, 0x00, sizeof(consvar_t)); // zero everything by default
-
lua_pushnil(L);
while (lua_next(L, 1)) {
// stack: cvar table, cvar userdata, key/index, value
@@ -357,7 +360,7 @@ static int lib_cvRegisterVar(lua_State *L)
lua_getfield(L, LUA_REGISTRYINDEX, "CV_PossibleValue");
I_Assert(lua_istable(L, 5));
- lua_pushvalue(L, 2); // cvar userdata
+ lua_pushlightuserdata(L, cvar);
cvpv = lua_newuserdata(L, sizeof(CV_PossibleValue_t) * (count+1));
lua_rawset(L, 5);
lua_pop(L, 1); // pop CV_PossibleValue registry table
@@ -385,8 +388,9 @@ static int lib_cvRegisterVar(lua_State *L)
TYPEERROR("func", LUA_TFUNCTION)
lua_getfield(L, LUA_REGISTRYINDEX, "CV_OnChange");
I_Assert(lua_istable(L, 5));
+ lua_pushlightuserdata(L, cvar);
lua_pushvalue(L, 4);
- lua_setfield(L, 5, cvar->name);
+ lua_rawset(L, 5);
lua_pop(L, 1);
cvar->func = Lua_OnChange;
}
@@ -403,19 +407,6 @@ static int lib_cvRegisterVar(lua_State *L)
if ((cvar->flags & CV_CALL) && !cvar->func)
return luaL_error(L, M_GetText("Variable %s has CV_CALL without a function\n"), cvar->name);
- // stack: cvar table, cvar userdata
- lua_getfield(L, LUA_REGISTRYINDEX, "CV_Vars");
- I_Assert(lua_istable(L, 3));
-
- lua_getfield(L, 3, cvar->name);
- if (lua_type(L, -1) != LUA_TNIL)
- return luaL_error(L, M_GetText("Variable %s is already defined\n"), cvar->name);
- lua_pop(L, 1);
-
- lua_pushvalue(L, 2);
- lua_setfield(L, 3, cvar->name);
- lua_pop(L, 1);
-
// actually time to register it to the console now! Finally!
cvar->flags |= CV_MODIFIED;
CV_RegisterVar(cvar);
@@ -428,10 +419,59 @@ static int lib_cvRegisterVar(lua_State *L)
static int lib_cvFindVar(lua_State *L)
{
- LUA_PushLightUserdata(L, CV_FindVar(luaL_checkstring(L,1)), META_CVAR);
+ const char *name = luaL_checkstring(L, 1);
+ LUA_PushUserdata(L, CV_FindVar(name), META_CVAR);
return 1;
}
+static int CVarSetFunction
+(
+ lua_State *L,
+ void (*Set)(consvar_t *, const char *),
+ void (*SetValue)(consvar_t *, INT32)
+){
+ consvar_t *cvar = *(consvar_t **)luaL_checkudata(L, 1, META_CVAR);
+
+ if (cvar->flags & CV_NOLUA)
+ return luaL_error(L, "Variable %s cannot be set from Lua.", cvar->name);
+
+ switch (lua_type(L, 2))
+ {
+ case LUA_TSTRING:
+ (*Set)(cvar, lua_tostring(L, 2));
+ break;
+ case LUA_TNUMBER:
+ (*SetValue)(cvar, (INT32)lua_tonumber(L, 2));
+ break;
+ default:
+ return luaL_typerror(L, 1, "string or number");
+ }
+
+ return 0;
+}
+
+static int lib_cvSet(lua_State *L)
+{
+ return CVarSetFunction(L, CV_Set, CV_SetValue);
+}
+
+static int lib_cvStealthSet(lua_State *L)
+{
+ return CVarSetFunction(L, CV_StealthSet, CV_StealthSetValue);
+}
+
+static int lib_cvAddValue(lua_State *L)
+{
+ consvar_t *cvar = *(consvar_t **)luaL_checkudata(L, 1, META_CVAR);
+
+ if (cvar->flags & CV_NOLUA)
+ return luaL_error(L, "Variable %s cannot be set from Lua.", cvar->name);
+
+ CV_AddValue(cvar, (INT32)luaL_checknumber(L, 2));
+
+ return 0;
+}
+
// CONS_Printf for a single player
// Use 'print' in baselib for a global message.
static int lib_consPrintf(lua_State *L)
@@ -472,13 +512,16 @@ static luaL_Reg lib[] = {
{"COM_BufInsertText", lib_comBufInsertText},
{"CV_RegisterVar", lib_cvRegisterVar},
{"CV_FindVar", lib_cvFindVar},
+ {"CV_Set", lib_cvSet},
+ {"CV_StealthSet", lib_cvStealthSet},
+ {"CV_AddValue", lib_cvAddValue},
{"CONS_Printf", lib_consPrintf},
{NULL, NULL}
};
static int cvar_get(lua_State *L)
{
- consvar_t *cvar = (consvar_t *)luaL_checkudata(L, 1, META_CVAR);
+ consvar_t *cvar = *(consvar_t **)luaL_checkudata(L, 1, META_CVAR);
const char *field = luaL_checkstring(L, 2);
if(fastcmp(field,"name"))
diff --git a/src/lua_hook.h b/src/lua_hook.h
index 48f6cab32c51ceb695d325b47196341033d0a6a7..0d631aa4e275259c5bda256e2dcc0e5824283ea4 100644
--- a/src/lua_hook.h
+++ b/src/lua_hook.h
@@ -59,11 +59,17 @@ enum hook {
hook_PlayerThink,
hook_ShouldJingleContinue,
hook_GameQuit,
+ hook_PlayerCmd,
+ hook_MusicChange,
+ hook_PlayerHeight,
+ hook_PlayerCanEnterSpinGaps,
hook_MAX // last hook
};
extern const char *const hookNames[];
+extern boolean hook_cmd_running;
+
void LUAh_MapChange(INT16 mapnumber); // Hook for map change (before load)
void LUAh_MapLoad(void); // Hook for map load
void LUAh_PlayerJoin(int playernum); // Hook for Got_AddPlayer
@@ -108,9 +114,11 @@ void LUAh_PlayerQuit(player_t *plr, kickreason_t reason); // Hook for player qui
void LUAh_IntermissionThinker(void); // Hook for Y_Ticker
boolean LUAh_TeamSwitch(player_t *player, int newteam, boolean fromspectators, boolean tryingautobalance, boolean tryingscramble); // Hook for team switching in... uh....
UINT8 LUAh_ViewpointSwitch(player_t *player, player_t *newdisplayplayer, boolean forced); // Hook for spy mode
-#ifdef SEENAMES
boolean LUAh_SeenPlayer(player_t *player, player_t *seenfriend); // Hook for MT_NAMECHECK
-#endif
#define LUAh_PlayerThink(player) LUAh_PlayerHook(player, hook_PlayerThink) // Hook for P_PlayerThink
boolean LUAh_ShouldJingleContinue(player_t *player, const char *musname); // Hook for whether a jingle of the given music should continue playing
-void LUAh_GameQuit(void); // Hook for game quitting
\ No newline at end of file
+void LUAh_GameQuit(boolean quitting); // Hook for game quitting
+boolean LUAh_PlayerCmd(player_t *player, ticcmd_t *cmd); // Hook for building player's ticcmd struct (Ported from SRB2Kart)
+boolean LUAh_MusicChange(const char *oldname, char *newname, UINT16 *mflags, boolean *looping, UINT32 *position, UINT32 *prefadems, UINT32 *fadeinms); // Hook for music changes
+fixed_t LUAh_PlayerHeight(player_t *player);
+UINT8 LUAh_PlayerCanEnterSpinGaps(player_t *player);
diff --git a/src/lua_hooklib.c b/src/lua_hooklib.c
index d02601ce4452a7d4ace510682370c2c03a3cbbfa..a3f4a95d232e50f6a94f78289c353f1d6fa8c7c8 100644
--- a/src/lua_hooklib.c
+++ b/src/lua_hooklib.c
@@ -23,6 +23,10 @@
#include "lua_hook.h"
#include "lua_hud.h" // hud_running errors
+#include "m_perfstats.h"
+#include "d_netcmd.h" // for cv_perfstats
+#include "i_system.h" // I_GetPreciseTime
+
static UINT8 hooksAvailable[(hook_MAX/8)+1];
const char *const hookNames[hook_MAX+1] = {
@@ -71,6 +75,10 @@ const char *const hookNames[hook_MAX+1] = {
"PlayerThink",
"ShouldJingleContinue",
"GameQuit",
+ "PlayerCmd",
+ "MusicChange",
+ "PlayerHeight",
+ "PlayerCanEnterSpinGaps",
NULL
};
@@ -215,6 +223,8 @@ static int lib_addHook(lua_State *L)
case hook_ShieldSpawn:
case hook_ShieldSpecial:
case hook_PlayerThink:
+ case hook_PlayerHeight:
+ case hook_PlayerCanEnterSpinGaps:
lastp = &playerhooks;
break;
case hook_LinedefExecute:
@@ -259,6 +269,9 @@ boolean LUAh_MobjHook(mobj_t *mo, enum hook which)
I_Assert(mo->type < NUMMOBJTYPES);
+ if (!(mobjhooks[MT_NULL] || mobjhooks[mo->type]))
+ return false;
+
lua_settop(gL, 0);
lua_pushcfunction(gL, LUA_GetErrorMessage);
@@ -268,6 +281,7 @@ boolean LUAh_MobjHook(mobj_t *mo, enum hook which)
if (hookp->type != which)
continue;
+ ps_lua_mobjhooks++;
if (lua_gettop(gL) == 1)
LUA_PushUserdata(gL, mo, META_MOBJ);
PushHook(gL, hookp);
@@ -289,6 +303,7 @@ boolean LUAh_MobjHook(mobj_t *mo, enum hook which)
if (hookp->type != which)
continue;
+ ps_lua_mobjhooks++;
if (lua_gettop(gL) == 1)
LUA_PushUserdata(gL, mo, META_MOBJ);
PushHook(gL, hookp);
@@ -324,6 +339,7 @@ boolean LUAh_PlayerHook(player_t *plr, enum hook which)
if (hookp->type != which)
continue;
+ ps_lua_mobjhooks++;
if (lua_gettop(gL) == 1)
LUA_PushUserdata(gL, plr, META_PLAYER);
PushHook(gL, hookp);
@@ -455,6 +471,9 @@ void LUAh_PreThinkFrame(void)
void LUAh_ThinkFrame(void)
{
hook_p hookp;
+ // variables used by perf stats
+ int hook_index = 0;
+ precise_t time_taken = 0;
if (!gL || !(hooksAvailable[hook_ThinkFrame/8] & (1<<(hook_ThinkFrame%8))))
return;
@@ -465,6 +484,8 @@ void LUAh_ThinkFrame(void)
if (hookp->type != hook_ThinkFrame)
continue;
+ if (cv_perfstats.value == 3)
+ time_taken = I_GetPreciseTime();
PushHook(gL, hookp);
if (lua_pcall(gL, 0, 0, 1)) {
if (!hookp->error || cv_debug & DBG_LUA)
@@ -472,6 +493,16 @@ void LUAh_ThinkFrame(void)
lua_pop(gL, 1);
hookp->error = true;
}
+ if (cv_perfstats.value == 3)
+ {
+ lua_Debug ar;
+ time_taken = I_GetPreciseTime() - time_taken;
+ // we need the function, let's just retrieve it again
+ PushHook(gL, hookp);
+ lua_getinfo(gL, ">S", &ar);
+ PS_SetThinkFrameHookInfo(hook_index, time_taken, ar.short_src);
+ hook_index++;
+ }
}
lua_pop(gL, 1); // Pop error handler
@@ -513,6 +544,9 @@ UINT8 LUAh_MobjCollideHook(mobj_t *thing1, mobj_t *thing2, enum hook which)
I_Assert(thing1->type < NUMMOBJTYPES);
+ if (!(mobjcollidehooks[MT_NULL] || mobjcollidehooks[thing1->type]))
+ return 0;
+
lua_settop(gL, 0);
lua_pushcfunction(gL, LUA_GetErrorMessage);
@@ -522,6 +556,7 @@ UINT8 LUAh_MobjCollideHook(mobj_t *thing1, mobj_t *thing2, enum hook which)
if (hookp->type != which)
continue;
+ ps_lua_mobjhooks++;
if (lua_gettop(gL) == 1)
{
LUA_PushUserdata(gL, thing1, META_MOBJ);
@@ -552,6 +587,7 @@ UINT8 LUAh_MobjCollideHook(mobj_t *thing1, mobj_t *thing2, enum hook which)
if (hookp->type != which)
continue;
+ ps_lua_mobjhooks++;
if (lua_gettop(gL) == 1)
{
LUA_PushUserdata(gL, thing1, META_MOBJ);
@@ -590,6 +626,9 @@ UINT8 LUAh_MobjLineCollideHook(mobj_t *thing, line_t *line, enum hook which)
I_Assert(thing->type < NUMMOBJTYPES);
+ if (!(mobjcollidehooks[MT_NULL] || mobjcollidehooks[thing->type]))
+ return 0;
+
lua_settop(gL, 0);
lua_pushcfunction(gL, LUA_GetErrorMessage);
@@ -599,6 +638,7 @@ UINT8 LUAh_MobjLineCollideHook(mobj_t *thing, line_t *line, enum hook which)
if (hookp->type != which)
continue;
+ ps_lua_mobjhooks++;
if (lua_gettop(gL) == 1)
{
LUA_PushUserdata(gL, thing, META_MOBJ);
@@ -629,6 +669,7 @@ UINT8 LUAh_MobjLineCollideHook(mobj_t *thing, line_t *line, enum hook which)
if (hookp->type != which)
continue;
+ ps_lua_mobjhooks++;
if (lua_gettop(gL) == 1)
{
LUA_PushUserdata(gL, thing, META_MOBJ);
@@ -668,12 +709,16 @@ boolean LUAh_MobjThinker(mobj_t *mo)
I_Assert(mo->type < NUMMOBJTYPES);
+ if (!(mobjthinkerhooks[MT_NULL] || mobjthinkerhooks[mo->type]))
+ return false;
+
lua_settop(gL, 0);
lua_pushcfunction(gL, LUA_GetErrorMessage);
// Look for all generic mobj thinker hooks
for (hookp = mobjthinkerhooks[MT_NULL]; hookp; hookp = hookp->next)
{
+ ps_lua_mobjhooks++;
if (lua_gettop(gL) == 1)
LUA_PushUserdata(gL, mo, META_MOBJ);
PushHook(gL, hookp);
@@ -692,6 +737,7 @@ boolean LUAh_MobjThinker(mobj_t *mo)
for (hookp = mobjthinkerhooks[mo->type]; hookp; hookp = hookp->next)
{
+ ps_lua_mobjhooks++;
if (lua_gettop(gL) == 1)
LUA_PushUserdata(gL, mo, META_MOBJ);
PushHook(gL, hookp);
@@ -718,10 +764,13 @@ boolean LUAh_TouchSpecial(mobj_t *special, mobj_t *toucher)
hook_p hookp;
boolean hooked = false;
if (!gL || !(hooksAvailable[hook_TouchSpecial/8] & (1<<(hook_TouchSpecial%8))))
- return 0;
+ return false;
I_Assert(special->type < NUMMOBJTYPES);
+ if (!(mobjhooks[MT_NULL] || mobjhooks[special->type]))
+ return false;
+
lua_settop(gL, 0);
lua_pushcfunction(gL, LUA_GetErrorMessage);
@@ -731,6 +780,7 @@ boolean LUAh_TouchSpecial(mobj_t *special, mobj_t *toucher)
if (hookp->type != hook_TouchSpecial)
continue;
+ ps_lua_mobjhooks++;
if (lua_gettop(gL) == 1)
{
LUA_PushUserdata(gL, special, META_MOBJ);
@@ -756,6 +806,7 @@ boolean LUAh_TouchSpecial(mobj_t *special, mobj_t *toucher)
if (hookp->type != hook_TouchSpecial)
continue;
+ ps_lua_mobjhooks++;
if (lua_gettop(gL) == 1)
{
LUA_PushUserdata(gL, special, META_MOBJ);
@@ -790,6 +841,9 @@ UINT8 LUAh_ShouldDamage(mobj_t *target, mobj_t *inflictor, mobj_t *source, INT32
I_Assert(target->type < NUMMOBJTYPES);
+ if (!(mobjhooks[MT_NULL] || mobjhooks[target->type]))
+ return 0;
+
lua_settop(gL, 0);
lua_pushcfunction(gL, LUA_GetErrorMessage);
@@ -799,6 +853,7 @@ UINT8 LUAh_ShouldDamage(mobj_t *target, mobj_t *inflictor, mobj_t *source, INT32
if (hookp->type != hook_ShouldDamage)
continue;
+ ps_lua_mobjhooks++;
if (lua_gettop(gL) == 1)
{
LUA_PushUserdata(gL, target, META_MOBJ);
@@ -834,6 +889,7 @@ UINT8 LUAh_ShouldDamage(mobj_t *target, mobj_t *inflictor, mobj_t *source, INT32
{
if (hookp->type != hook_ShouldDamage)
continue;
+ ps_lua_mobjhooks++;
if (lua_gettop(gL) == 1)
{
LUA_PushUserdata(gL, target, META_MOBJ);
@@ -875,10 +931,13 @@ boolean LUAh_MobjDamage(mobj_t *target, mobj_t *inflictor, mobj_t *source, INT32
hook_p hookp;
boolean hooked = false;
if (!gL || !(hooksAvailable[hook_MobjDamage/8] & (1<<(hook_MobjDamage%8))))
- return 0;
+ return false;
I_Assert(target->type < NUMMOBJTYPES);
+ if (!(mobjhooks[MT_NULL] || mobjhooks[target->type]))
+ return false;
+
lua_settop(gL, 0);
lua_pushcfunction(gL, LUA_GetErrorMessage);
@@ -888,6 +947,7 @@ boolean LUAh_MobjDamage(mobj_t *target, mobj_t *inflictor, mobj_t *source, INT32
if (hookp->type != hook_MobjDamage)
continue;
+ ps_lua_mobjhooks++;
if (lua_gettop(gL) == 1)
{
LUA_PushUserdata(gL, target, META_MOBJ);
@@ -919,6 +979,7 @@ boolean LUAh_MobjDamage(mobj_t *target, mobj_t *inflictor, mobj_t *source, INT32
if (hookp->type != hook_MobjDamage)
continue;
+ ps_lua_mobjhooks++;
if (lua_gettop(gL) == 1)
{
LUA_PushUserdata(gL, target, META_MOBJ);
@@ -955,10 +1016,13 @@ boolean LUAh_MobjDeath(mobj_t *target, mobj_t *inflictor, mobj_t *source, UINT8
hook_p hookp;
boolean hooked = false;
if (!gL || !(hooksAvailable[hook_MobjDeath/8] & (1<<(hook_MobjDeath%8))))
- return 0;
+ return false;
I_Assert(target->type < NUMMOBJTYPES);
+ if (!(mobjhooks[MT_NULL] || mobjhooks[target->type]))
+ return false;
+
lua_settop(gL, 0);
lua_pushcfunction(gL, LUA_GetErrorMessage);
@@ -968,6 +1032,7 @@ boolean LUAh_MobjDeath(mobj_t *target, mobj_t *inflictor, mobj_t *source, UINT8
if (hookp->type != hook_MobjDeath)
continue;
+ ps_lua_mobjhooks++;
if (lua_gettop(gL) == 1)
{
LUA_PushUserdata(gL, target, META_MOBJ);
@@ -997,6 +1062,7 @@ boolean LUAh_MobjDeath(mobj_t *target, mobj_t *inflictor, mobj_t *source, UINT8
if (hookp->type != hook_MobjDeath)
continue;
+ ps_lua_mobjhooks++;
if (lua_gettop(gL) == 1)
{
LUA_PushUserdata(gL, target, META_MOBJ);
@@ -1189,6 +1255,7 @@ boolean LUAh_LinedefExecute(line_t *line, mobj_t *mo, sector_t *sector)
if (strcmp(hookp->s.str, line->stringargs[0]))
continue;
+ ps_lua_mobjhooks++;
if (lua_gettop(gL) == 1)
{
LUA_PushUserdata(gL, line, META_LINE);
@@ -1354,6 +1421,9 @@ boolean LUAh_MapThingSpawn(mobj_t *mo, mapthing_t *mthing)
if (!gL || !(hooksAvailable[hook_MapThingSpawn/8] & (1<<(hook_MapThingSpawn%8))))
return false;
+ if (!(mobjhooks[MT_NULL] || mobjhooks[mo->type]))
+ return false;
+
lua_settop(gL, 0);
lua_pushcfunction(gL, LUA_GetErrorMessage);
@@ -1363,6 +1433,7 @@ boolean LUAh_MapThingSpawn(mobj_t *mo, mapthing_t *mthing)
if (hookp->type != hook_MapThingSpawn)
continue;
+ ps_lua_mobjhooks++;
if (lua_gettop(gL) == 1)
{
LUA_PushUserdata(gL, mo, META_MOBJ);
@@ -1388,6 +1459,7 @@ boolean LUAh_MapThingSpawn(mobj_t *mo, mapthing_t *mthing)
if (hookp->type != hook_MapThingSpawn)
continue;
+ ps_lua_mobjhooks++;
if (lua_gettop(gL) == 1)
{
LUA_PushUserdata(gL, mo, META_MOBJ);
@@ -1420,6 +1492,9 @@ boolean LUAh_FollowMobj(player_t *player, mobj_t *mobj)
if (!gL || !(hooksAvailable[hook_FollowMobj/8] & (1<<(hook_FollowMobj%8))))
return 0;
+ if (!(mobjhooks[MT_NULL] || mobjhooks[mobj->type]))
+ return 0;
+
lua_settop(gL, 0);
lua_pushcfunction(gL, LUA_GetErrorMessage);
@@ -1429,6 +1504,7 @@ boolean LUAh_FollowMobj(player_t *player, mobj_t *mobj)
if (hookp->type != hook_FollowMobj)
continue;
+ ps_lua_mobjhooks++;
if (lua_gettop(gL) == 1)
{
LUA_PushUserdata(gL, player, META_PLAYER);
@@ -1454,6 +1530,7 @@ boolean LUAh_FollowMobj(player_t *player, mobj_t *mobj)
if (hookp->type != hook_FollowMobj)
continue;
+ ps_lua_mobjhooks++;
if (lua_gettop(gL) == 1)
{
LUA_PushUserdata(gL, player, META_PLAYER);
@@ -1494,6 +1571,7 @@ UINT8 LUAh_PlayerCanDamage(player_t *player, mobj_t *mobj)
if (hookp->type != hook_PlayerCanDamage)
continue;
+ ps_lua_mobjhooks++;
if (lua_gettop(gL) == 1)
{
LUA_PushUserdata(gL, player, META_PLAYER);
@@ -1680,7 +1758,6 @@ UINT8 LUAh_ViewpointSwitch(player_t *player, player_t *newdisplayplayer, boolean
}
// Hook for MT_NAMECHECK
-#ifdef SEENAMES
boolean LUAh_SeenPlayer(player_t *player, player_t *seenfriend)
{
hook_p hookp;
@@ -1724,7 +1801,6 @@ boolean LUAh_SeenPlayer(player_t *player, player_t *seenfriend)
return hasSeenPlayer;
}
-#endif // SEENAMES
boolean LUAh_ShouldJingleContinue(player_t *player, const char *musname)
{
@@ -1772,7 +1848,7 @@ boolean LUAh_ShouldJingleContinue(player_t *player, const char *musname)
}
// Hook for game quitting
-void LUAh_GameQuit(void)
+void LUAh_GameQuit(boolean quitting)
{
hook_p hookp;
if (!gL || !(hooksAvailable[hook_GameQuit/8] & (1<<(hook_GameQuit%8))))
@@ -1786,7 +1862,8 @@ void LUAh_GameQuit(void)
continue;
PushHook(gL, hookp);
- if (lua_pcall(gL, 0, 0, 1)) {
+ lua_pushboolean(gL, quitting);
+ if (lua_pcall(gL, 1, 0, 1)) {
if (!hookp->error || cv_debug & DBG_LUA)
CONS_Alert(CONS_WARNING,"%s\n",lua_tostring(gL, -1));
lua_pop(gL, 1);
@@ -1796,3 +1873,191 @@ void LUAh_GameQuit(void)
lua_pop(gL, 1); // Pop error handler
}
+
+// Hook for building player's ticcmd struct (Ported from SRB2Kart)
+boolean hook_cmd_running = false;
+boolean LUAh_PlayerCmd(player_t *player, ticcmd_t *cmd)
+{
+ hook_p hookp;
+ boolean hooked = false;
+ if (!gL || !(hooksAvailable[hook_PlayerCmd/8] & (1<<(hook_PlayerCmd%8))))
+ return false;
+
+ lua_settop(gL, 0);
+ lua_pushcfunction(gL, LUA_GetErrorMessage);
+
+ hook_cmd_running = true;
+ for (hookp = roothook; hookp; hookp = hookp->next)
+ {
+ if (hookp->type != hook_PlayerCmd)
+ continue;
+
+ if (lua_gettop(gL) == 1)
+ {
+ LUA_PushUserdata(gL, player, META_PLAYER);
+ LUA_PushUserdata(gL, cmd, META_TICCMD);
+ }
+ PushHook(gL, hookp);
+ lua_pushvalue(gL, -3);
+ lua_pushvalue(gL, -3);
+ if (lua_pcall(gL, 2, 1, 1)) {
+ if (!hookp->error || cv_debug & DBG_LUA)
+ CONS_Alert(CONS_WARNING,"%s\n",lua_tostring(gL, -1));
+ lua_pop(gL, 1);
+ hookp->error = true;
+ continue;
+ }
+ if (lua_toboolean(gL, -1))
+ hooked = true;
+ lua_pop(gL, 1);
+ }
+
+ lua_settop(gL, 0);
+ hook_cmd_running = false;
+ return hooked;
+}
+
+// Hook for music changes
+boolean LUAh_MusicChange(const char *oldname, char *newname, UINT16 *mflags, boolean *looping,
+ UINT32 *position, UINT32 *prefadems, UINT32 *fadeinms)
+{
+ hook_p hookp;
+ boolean hooked = false;
+
+ if (!gL || !(hooksAvailable[hook_MusicChange/8] & (1<<(hook_MusicChange%8))))
+ return false;
+
+ lua_settop(gL, 0);
+ lua_pushcfunction(gL, LUA_GetErrorMessage);
+
+ for (hookp = roothook; hookp; hookp = hookp->next)
+ if (hookp->type == hook_MusicChange)
+ {
+ PushHook(gL, hookp);
+ lua_pushstring(gL, oldname);
+ lua_pushstring(gL, newname);
+ lua_pushinteger(gL, *mflags);
+ lua_pushboolean(gL, *looping);
+ lua_pushinteger(gL, *position);
+ lua_pushinteger(gL, *prefadems);
+ lua_pushinteger(gL, *fadeinms);
+ if (lua_pcall(gL, 7, 6, 1)) {
+ CONS_Alert(CONS_WARNING,"%s\n",lua_tostring(gL,-1));
+ lua_pop(gL, 1);
+ continue;
+ }
+
+ // output 1: true, false, or string musicname override
+ if (lua_isboolean(gL, -6) && lua_toboolean(gL, -6))
+ hooked = true;
+ else if (lua_isstring(gL, -6))
+ strncpy(newname, lua_tostring(gL, -6), 7);
+ // output 2: mflags override
+ if (lua_isnumber(gL, -5))
+ *mflags = lua_tonumber(gL, -5);
+ // output 3: looping override
+ if (lua_isboolean(gL, -4))
+ *looping = lua_toboolean(gL, -4);
+ // output 4: position override
+ if (lua_isnumber(gL, -3))
+ *position = lua_tonumber(gL, -3);
+ // output 5: prefadems override
+ if (lua_isnumber(gL, -2))
+ *prefadems = lua_tonumber(gL, -2);
+ // output 6: fadeinms override
+ if (lua_isnumber(gL, -1))
+ *fadeinms = lua_tonumber(gL, -1);
+
+ lua_pop(gL, 7); // Pop returned values and error handler
+ }
+
+ lua_settop(gL, 0);
+ newname[6] = 0;
+ return hooked;
+}
+
+// Hook for determining player height
+fixed_t LUAh_PlayerHeight(player_t *player)
+{
+ hook_p hookp;
+ fixed_t newheight = -1;
+ if (!gL || !(hooksAvailable[hook_PlayerHeight/8] & (1<<(hook_PlayerHeight%8))))
+ return newheight;
+
+ lua_settop(gL, 0);
+ lua_pushcfunction(gL, LUA_GetErrorMessage);
+
+ for (hookp = playerhooks; hookp; hookp = hookp->next)
+ {
+ if (hookp->type != hook_PlayerHeight)
+ continue;
+
+ ps_lua_mobjhooks++;
+ if (lua_gettop(gL) == 1)
+ LUA_PushUserdata(gL, player, META_PLAYER);
+ PushHook(gL, hookp);
+ lua_pushvalue(gL, -2);
+ if (lua_pcall(gL, 1, 1, 1)) {
+ if (!hookp->error || cv_debug & DBG_LUA)
+ CONS_Alert(CONS_WARNING,"%s\n",lua_tostring(gL, -1));
+ lua_pop(gL, 1);
+ hookp->error = true;
+ continue;
+ }
+ if (!lua_isnil(gL, -1))
+ {
+ fixed_t returnedheight = lua_tonumber(gL, -1);
+ // 0 height has... strange results, but it's not problematic like negative heights are.
+ // when an object's height is set to a negative number directly with lua, it's forced to 0 instead.
+ // here, I think it's better to ignore negatives so that they don't replace any results of previous hooks!
+ if (returnedheight >= 0)
+ newheight = returnedheight;
+ }
+ lua_pop(gL, 1);
+ }
+
+ lua_settop(gL, 0);
+ return newheight;
+}
+
+// Hook for determining whether players are allowed passage through spin gaps
+UINT8 LUAh_PlayerCanEnterSpinGaps(player_t *player)
+{
+ hook_p hookp;
+ UINT8 canEnter = 0; // 0 = default, 1 = force yes, 2 = force no.
+ if (!gL || !(hooksAvailable[hook_PlayerCanEnterSpinGaps/8] & (1<<(hook_PlayerCanEnterSpinGaps%8))))
+ return 0;
+
+ lua_settop(gL, 0);
+ lua_pushcfunction(gL, LUA_GetErrorMessage);
+
+ for (hookp = playerhooks; hookp; hookp = hookp->next)
+ {
+ if (hookp->type != hook_PlayerCanEnterSpinGaps)
+ continue;
+
+ ps_lua_mobjhooks++;
+ if (lua_gettop(gL) == 1)
+ LUA_PushUserdata(gL, player, META_PLAYER);
+ PushHook(gL, hookp);
+ lua_pushvalue(gL, -2);
+ if (lua_pcall(gL, 1, 1, 1)) {
+ if (!hookp->error || cv_debug & DBG_LUA)
+ CONS_Alert(CONS_WARNING,"%s\n",lua_tostring(gL, -1));
+ lua_pop(gL, 1);
+ hookp->error = true;
+ continue;
+ }
+ if (!lua_isnil(gL, -1))
+ { // if nil, leave canEnter = 0.
+ if (lua_toboolean(gL, -1))
+ canEnter = 1; // Force yes
+ else
+ canEnter = 2; // Force no
+ }
+ lua_pop(gL, 1);
+ }
+
+ lua_settop(gL, 0);
+ return canEnter;
+}
diff --git a/src/lua_hud.h b/src/lua_hud.h
index 4a7c596c8a95e7d343fd9da73b8aa50bcaa344b0..1e9dca00b921abe7e3c0baa2413fc015668e5fa8 100644
--- a/src/lua_hud.h
+++ b/src/lua_hud.h
@@ -13,6 +13,7 @@
enum hud {
hud_stagetitle = 0,
hud_textspectator,
+ hud_crosshair,
// Singleplayer / Co-op
hud_score,
hud_time,
diff --git a/src/lua_hudlib.c b/src/lua_hudlib.c
index 4aa70574b3802b62b22cbc4772fb11aa216cdd61..8d451e99c5100bc2370974ea977ea055fed04595 100644
--- a/src/lua_hudlib.c
+++ b/src/lua_hudlib.c
@@ -35,15 +35,11 @@ static UINT8 hud_enabled[(hud_MAX/8)+1];
static UINT8 hudAvailable; // hud hooks field
-#ifdef LUA_PATCH_SAFETY
-static patchinfo_t *patchinfo, *patchinfohead;
-static int numluapatches;
-#endif
-
// must match enum hud in lua_hud.h
static const char *const hud_disable_options[] = {
"stagetitle",
"textspectator",
+ "crosshair",
"score",
"time",
@@ -292,11 +288,7 @@ static int colormap_get(lua_State *L)
static int patch_get(lua_State *L)
{
-#ifdef LUA_PATCH_SAFETY
patch_t *patch = *((patch_t **)luaL_checkudata(L, 1, META_PATCH));
-#else
- patchinfo_t *patch = *((patchinfo_t **)luaL_checkudata(L, 1, META_PATCH));
-#endif
enum patch field = luaL_checkoption(L, 2, NULL, patch_opt);
// patches are invalidated when switching renderers
@@ -314,16 +306,16 @@ static int patch_get(lua_State *L)
lua_pushboolean(L, patch != NULL);
break;
case patch_width:
- lua_pushinteger(L, SHORT(patch->width));
+ lua_pushinteger(L, patch->width);
break;
case patch_height:
- lua_pushinteger(L, SHORT(patch->height));
+ lua_pushinteger(L, patch->height);
break;
case patch_leftoffset:
- lua_pushinteger(L, SHORT(patch->leftoffset));
+ lua_pushinteger(L, patch->leftoffset);
break;
case patch_topoffset:
- lua_pushinteger(L, SHORT(patch->topoffset));
+ lua_pushinteger(L, patch->topoffset);
break;
}
return 1;
@@ -403,59 +395,8 @@ static int libd_patchExists(lua_State *L)
static int libd_cachePatch(lua_State *L)
{
-#ifdef LUA_PATCH_SAFETY
- int i;
- lumpnum_t lumpnum;
- patchinfo_t *luapat;
- patch_t *realpatch;
-
- HUDONLY
-
- luapat = patchinfohead;
- lumpnum = W_CheckNumForLongName(luaL_checkstring(L, 1));
- if (lumpnum == LUMPERROR)
- lumpnum = W_GetNumForLongName("MISSING");
-
- for (i = 0; i < numluapatches; i++)
- {
- // check if already cached
- if (luapat->wadnum == WADFILENUM(lumpnum) && luapat->lumpnum == LUMPNUM(lumpnum))
- {
- LUA_PushUserdata(L, luapat, META_PATCH);
- return 1;
- }
- luapat = luapat->next;
- if (!luapat)
- break;
- }
-
- if (numluapatches > 0)
- {
- patchinfo->next = Z_Malloc(sizeof(patchinfo_t), PU_STATIC, NULL);
- patchinfo = patchinfo->next;
- }
- else
- {
- patchinfo = Z_Malloc(sizeof(patchinfo_t), PU_STATIC, NULL);
- patchinfohead = patchinfo;
- }
-
- realpatch = W_CachePatchNum(lumpnum, PU_PATCH);
-
- patchinfo->width = realpatch->width;
- patchinfo->height = realpatch->height;
- patchinfo->leftoffset = realpatch->leftoffset;
- patchinfo->topoffset = realpatch->topoffset;
-
- patchinfo->wadnum = WADFILENUM(lumpnum);
- patchinfo->lumpnum = LUMPNUM(lumpnum);
-
- LUA_PushUserdata(L, patchinfo, META_PATCH);
- numluapatches++;
-#else
HUDONLY
LUA_PushUserdata(L, W_CachePatchLongName(luaL_checkstring(L, 1), PU_PATCH), META_PATCH);
-#endif
return 1;
}
@@ -518,9 +459,8 @@ static int libd_getSpritePatch(lua_State *L)
INT32 rot = R_GetRollAngle(rollangle);
if (rot) {
- if (!(sprframe->rotsprite.cached & (1<<angle)))
- R_CacheRotSprite(i, frame, NULL, sprframe, angle, sprframe->flip & (1<<angle));
- LUA_PushUserdata(L, sprframe->rotsprite.patch[angle][rot], META_PATCH);
+ patch_t *rotsprite = Patch_GetRotatedSprite(sprframe, frame, angle, sprframe->flip & (1<<angle), true, &spriteinfo[i], rot);
+ LUA_PushUserdata(L, rotsprite, META_PATCH);
lua_pushboolean(L, false);
lua_pushboolean(L, true);
return 3;
@@ -529,7 +469,7 @@ static int libd_getSpritePatch(lua_State *L)
#endif
// push both the patch and it's "flip" value
- LUA_PushUserdata(L, W_CachePatchNum(sprframe->lumppat[angle], PU_PATCH), META_PATCH);
+ LUA_PushUserdata(L, W_CachePatchNum(sprframe->lumppat[angle], PU_SPRITE), META_PATCH);
lua_pushboolean(L, (sprframe->flip & (1<<angle)) != 0);
return 2;
}
@@ -631,9 +571,8 @@ static int libd_getSprite2Patch(lua_State *L)
INT32 rot = R_GetRollAngle(rollangle);
if (rot) {
- if (!(sprframe->rotsprite.cached & (1<<angle)))
- R_CacheRotSprite(SPR_PLAY, frame, &skins[i].sprinfo[j], sprframe, angle, sprframe->flip & (1<<angle));
- LUA_PushUserdata(L, sprframe->rotsprite.patch[angle][rot], META_PATCH);
+ patch_t *rotsprite = Patch_GetRotatedSprite(sprframe, frame, angle, sprframe->flip & (1<<angle), true, &skins[i].sprinfo[j], rot);
+ LUA_PushUserdata(L, rotsprite, META_PATCH);
lua_pushboolean(L, false);
lua_pushboolean(L, true);
return 3;
@@ -642,7 +581,7 @@ static int libd_getSprite2Patch(lua_State *L)
#endif
// push both the patch and it's "flip" value
- LUA_PushUserdata(L, W_CachePatchNum(sprframe->lumppat[angle], PU_PATCH), META_PATCH);
+ LUA_PushUserdata(L, W_CachePatchNum(sprframe->lumppat[angle], PU_SPRITE), META_PATCH);
lua_pushboolean(L, (sprframe->flip & (1<<angle)) != 0);
return 2;
}
@@ -651,22 +590,14 @@ static int libd_draw(lua_State *L)
{
INT32 x, y, flags;
patch_t *patch;
-#ifdef LUA_PATCH_SAFETY
- patchinfo_t *luapat;
-#endif
const UINT8 *colormap = NULL;
HUDONLY
x = luaL_checkinteger(L, 1);
y = luaL_checkinteger(L, 2);
-#ifdef LUA_PATCH_SAFETY
- luapat = *((patchinfo_t **)luaL_checkudata(L, 3, META_PATCH));
- patch = W_CachePatchNum((luapat->wadnum<<16)+luapat->lumpnum, PU_PATCH);
-#else
patch = *((patch_t **)luaL_checkudata(L, 3, META_PATCH));
if (!patch)
return LUA_ErrInvalid(L, "patch_t");
-#endif
flags = luaL_optinteger(L, 4, 0);
if (!lua_isnoneornil(L, 5))
colormap = *((UINT8 **)luaL_checkudata(L, 5, META_COLORMAP));
@@ -682,9 +613,6 @@ static int libd_drawScaled(lua_State *L)
fixed_t x, y, scale;
INT32 flags;
patch_t *patch;
-#ifdef LUA_PATCH_SAFETY
- patchinfo_t *luapat;
-#endif
const UINT8 *colormap = NULL;
HUDONLY
@@ -693,14 +621,9 @@ static int libd_drawScaled(lua_State *L)
scale = luaL_checkinteger(L, 3);
if (scale < 0)
return luaL_error(L, "negative scale");
-#ifdef LUA_PATCH_SAFETY
- luapat = *((patchinfo_t **)luaL_checkudata(L, 4, META_PATCH));
- patch = W_CachePatchNum((luapat->wadnum<<16)+luapat->lumpnum, PU_PATCH);
-#else
patch = *((patch_t **)luaL_checkudata(L, 4, META_PATCH));
if (!patch)
return LUA_ErrInvalid(L, "patch_t");
-#endif
flags = luaL_optinteger(L, 5, 0);
if (!lua_isnoneornil(L, 6))
colormap = *((UINT8 **)luaL_checkudata(L, 6, META_COLORMAP));
@@ -974,8 +897,10 @@ static int libd_getColormap(lua_State *L)
else if (lua_type(L, 1) == LUA_TNUMBER) // skin number
{
skinnum = (INT32)luaL_checkinteger(L, 1);
- if (skinnum < TC_BLINK || skinnum >= MAXSKINS)
- return luaL_error(L, "skin number %d is out of range (%d - %d)", skinnum, TC_BLINK, MAXSKINS-1);
+ if (skinnum >= MAXSKINS)
+ return luaL_error(L, "skin number %d is out of range (>%d)", skinnum, MAXSKINS-1);
+ else if (skinnum < 0 && skinnum > TC_DEFAULT)
+ return luaL_error(L, "translation colormap index is out of range");
}
else // skin name
{
@@ -992,6 +917,19 @@ static int libd_getColormap(lua_State *L)
return 1;
}
+static int libd_getStringColormap(lua_State *L)
+{
+ INT32 flags = luaL_checkinteger(L, 1);
+ UINT8* colormap = NULL;
+ HUDONLY
+ colormap = V_GetStringColormap(flags & V_CHARCOLORMASK);
+ if (colormap) {
+ LUA_PushUserdata(L, colormap, META_COLORMAP); // push as META_COLORMAP userdata, specifically for patches to use!
+ return 1;
+ }
+ return 0;
+}
+
static int libd_fadeScreen(lua_State *L)
{
UINT16 color = luaL_checkinteger(L, 1);
@@ -1142,6 +1080,7 @@ static luaL_Reg lib_draw[] = {
{"getSpritePatch", libd_getSpritePatch},
{"getSprite2Patch", libd_getSprite2Patch},
{"getColormap", libd_getColormap},
+ {"getStringColormap", libd_getStringColormap},
// drawing
{"draw", libd_draw},
{"drawScaled", libd_drawScaled},
@@ -1247,10 +1186,6 @@ int LUA_HudLib(lua_State *L)
{
memset(hud_enabled, 0xff, (hud_MAX/8)+1);
-#ifdef LUA_PATCH_SAFETY
- numluapatches = 0;
-#endif
-
lua_newtable(L); // HUD registry table
lua_newtable(L);
luaL_register(L, NULL, lib_draw);
@@ -1329,7 +1264,9 @@ void LUAh_GameHUD(player_t *stplayr)
return;
hud_running = true;
- lua_pop(gL, -1);
+ lua_settop(gL, 0);
+
+ lua_pushcfunction(gL, LUA_GetErrorMessage);
lua_getfield(gL, LUA_REGISTRYINDEX, "HUD");
I_Assert(lua_istable(gL, -1));
@@ -1351,9 +1288,9 @@ void LUAh_GameHUD(player_t *stplayr)
lua_pushvalue(gL, -5); // graphics library (HUD[1])
lua_pushvalue(gL, -5); // stplayr
lua_pushvalue(gL, -5); // camera
- LUA_Call(gL, 3);
+ LUA_Call(gL, 3, 0, 1);
}
- lua_pop(gL, -1);
+ lua_settop(gL, 0);
hud_running = false;
}
@@ -1363,7 +1300,9 @@ void LUAh_ScoresHUD(void)
return;
hud_running = true;
- lua_pop(gL, -1);
+ lua_settop(gL, 0);
+
+ lua_pushcfunction(gL, LUA_GetErrorMessage);
lua_getfield(gL, LUA_REGISTRYINDEX, "HUD");
I_Assert(lua_istable(gL, -1));
@@ -1376,9 +1315,9 @@ void LUAh_ScoresHUD(void)
lua_pushnil(gL);
while (lua_next(gL, -3) != 0) {
lua_pushvalue(gL, -3); // graphics library (HUD[1])
- LUA_Call(gL, 1);
+ LUA_Call(gL, 1, 0, 1);
}
- lua_pop(gL, -1);
+ lua_settop(gL, 0);
hud_running = false;
}
@@ -1388,7 +1327,9 @@ void LUAh_TitleHUD(void)
return;
hud_running = true;
- lua_pop(gL, -1);
+ lua_settop(gL, 0);
+
+ lua_pushcfunction(gL, LUA_GetErrorMessage);
lua_getfield(gL, LUA_REGISTRYINDEX, "HUD");
I_Assert(lua_istable(gL, -1));
@@ -1401,9 +1342,9 @@ void LUAh_TitleHUD(void)
lua_pushnil(gL);
while (lua_next(gL, -3) != 0) {
lua_pushvalue(gL, -3); // graphics library (HUD[1])
- LUA_Call(gL, 1);
+ LUA_Call(gL, 1, 0, 1);
}
- lua_pop(gL, -1);
+ lua_settop(gL, 0);
hud_running = false;
}
@@ -1413,7 +1354,9 @@ void LUAh_TitleCardHUD(player_t *stplayr)
return;
hud_running = true;
- lua_pop(gL, -1);
+ lua_settop(gL, 0);
+
+ lua_pushcfunction(gL, LUA_GetErrorMessage);
lua_getfield(gL, LUA_REGISTRYINDEX, "HUD");
I_Assert(lua_istable(gL, -1));
@@ -1434,10 +1377,10 @@ void LUAh_TitleCardHUD(player_t *stplayr)
lua_pushvalue(gL, -6); // stplayr
lua_pushvalue(gL, -6); // lt_ticker
lua_pushvalue(gL, -6); // lt_endtime
- LUA_Call(gL, 4);
+ LUA_Call(gL, 4, 0, 1);
}
- lua_pop(gL, -1);
+ lua_settop(gL, 0);
hud_running = false;
}
@@ -1447,7 +1390,9 @@ void LUAh_IntermissionHUD(void)
return;
hud_running = true;
- lua_pop(gL, -1);
+ lua_settop(gL, 0);
+
+ lua_pushcfunction(gL, LUA_GetErrorMessage);
lua_getfield(gL, LUA_REGISTRYINDEX, "HUD");
I_Assert(lua_istable(gL, -1));
@@ -1460,8 +1405,8 @@ void LUAh_IntermissionHUD(void)
lua_pushnil(gL);
while (lua_next(gL, -3) != 0) {
lua_pushvalue(gL, -3); // graphics library (HUD[1])
- LUA_Call(gL, 1);
+ LUA_Call(gL, 1, 0, 1);
}
- lua_pop(gL, -1);
+ lua_settop(gL, 0);
hud_running = false;
}
diff --git a/src/lua_infolib.c b/src/lua_infolib.c
index 9a6153bb32d8ce93d5d6712b64056c3fa7287067..6e86f47b7272701efb42497a8fde70692681911a 100644
--- a/src/lua_infolib.c
+++ b/src/lua_infolib.c
@@ -14,9 +14,12 @@
#include "fastcmp.h"
#include "info.h"
#include "dehacked.h"
+#include "deh_tables.h"
+#include "deh_lua.h"
#include "p_mobj.h"
#include "p_local.h"
#include "z_zone.h"
+#include "r_patch.h"
#include "r_picformats.h"
#include "r_things.h"
#include "r_draw.h" // R_GetColorByName
@@ -25,11 +28,12 @@
#include "lua_script.h"
#include "lua_libs.h"
#include "lua_hud.h" // hud_running errors
+#include "lua_hook.h" // hook_cmd_running errors
extern CV_PossibleValue_t Color_cons_t[];
extern UINT8 skincolor_modified[];
-boolean LUA_CallAction(const char *action, mobj_t *actor);
+boolean LUA_CallAction(enum actionnum actionnum, mobj_t *actor);
state_t *astate;
enum sfxinfo_read {
@@ -62,6 +66,8 @@ const char *const sfxinfo_wopt[] = {
"caption",
NULL};
+boolean actionsoverridden[NUMACTIONS] = {false};
+
//
// Sprite Names
//
@@ -165,6 +171,8 @@ static int lib_setSpr2default(lua_State *L)
if (hud_running)
return luaL_error(L, "Do not alter spr2defaults[] in HUD rendering code!");
+ if (hook_cmd_running)
+ return luaL_error(L, "Do not alter spr2defaults[] in CMD building code!");
// todo: maybe allow setting below first freeslot..? step 1 is toggling this, step 2 is testing to see whether it's net-safe
#ifdef SETALLSPR2DEFAULTS
@@ -371,16 +379,14 @@ static int lib_setSpriteInfo(lua_State *L)
return luaL_error(L, "Do not alter spriteinfo_t from within a hook or coroutine!");
if (hud_running)
return luaL_error(L, "Do not alter spriteinfo_t in HUD rendering code!");
+ if (hook_cmd_running)
+ return luaL_error(L, "Do not alter spriteinfo_t in CMD building code!");
lua_remove(L, 1);
{
UINT32 i = luaL_checkinteger(L, 1);
if (i == 0 || i >= NUMSPRITES)
return luaL_error(L, "spriteinfo[] index %d out of range (1 - %d)", i, NUMSPRITES-1);
-#ifdef ROTSPRITE
- if (sprites != NULL)
- R_FreeSingleRotSprite(&sprites[i]);
-#endif
info = &spriteinfo[i]; // get the spriteinfo to assign to.
}
luaL_checktype(L, 2, LUA_TTABLE); // check that we've been passed a table.
@@ -455,6 +461,8 @@ static int spriteinfo_set(lua_State *L)
return luaL_error(L, "Do not alter spriteinfo_t from within a hook or coroutine!");
if (hud_running)
return luaL_error(L, "Do not alter spriteinfo_t in HUD rendering code!");
+ if (hook_cmd_running)
+ return luaL_error(L, "Do not alter spriteinfo_t in CMD building code!");
I_Assert(sprinfo != NULL);
@@ -462,11 +470,6 @@ static int spriteinfo_set(lua_State *L)
lua_remove(L, 1); // remove field
lua_settop(L, 1); // leave only one value
-#ifdef ROTSPRITE
- if (sprites != NULL)
- R_FreeSingleRotSprite(&sprites[sprinfo-spriteinfo]);
-#endif
-
if (fastcmp(field, "pivot"))
{
// pivot[] is a table
@@ -533,6 +536,8 @@ static int pivotlist_set(lua_State *L)
return luaL_error(L, "Do not alter spriteframepivot_t from within a hook or coroutine!");
if (hud_running)
return luaL_error(L, "Do not alter spriteframepivot_t in HUD rendering code!");
+ if (hook_cmd_running)
+ return luaL_error(L, "Do not alter spriteframepivot_t in CMD building code!");
I_Assert(pivotlist != NULL);
@@ -587,6 +592,8 @@ static int framepivot_set(lua_State *L)
return luaL_error(L, "Do not alter spriteframepivot_t from within a hook or coroutine!");
if (hud_running)
return luaL_error(L, "Do not alter spriteframepivot_t in HUD rendering code!");
+ if (hook_cmd_running)
+ return luaL_error(L, "Do not alter spriteframepivot_t in CMD building code!");
I_Assert(framepivot != NULL);
@@ -619,6 +626,9 @@ static void A_Lua(mobj_t *actor)
boolean found = false;
I_Assert(actor != NULL);
+ lua_settop(gL, 0); // Just in case...
+ lua_pushcfunction(gL, LUA_GetErrorMessage);
+
// get the action for this state
lua_getfield(gL, LUA_REGISTRYINDEX, LREG_STATEACTION);
I_Assert(lua_istable(gL, -1));
@@ -647,7 +657,7 @@ static void A_Lua(mobj_t *actor)
LUA_PushUserdata(gL, actor, META_MOBJ);
lua_pushinteger(gL, var1);
lua_pushinteger(gL, var2);
- LUA_Call(gL, 3);
+ LUA_Call(gL, 3, 0, 1);
if (found)
{
@@ -686,6 +696,8 @@ static int lib_setState(lua_State *L)
if (hud_running)
return luaL_error(L, "Do not alter states in HUD rendering code!");
+ if (hook_cmd_running)
+ return luaL_error(L, "Do not alter states in CMD building code!");
// clear the state to start with, in case of missing table elements
memset(state,0,sizeof(state_t));
@@ -800,36 +812,33 @@ boolean LUA_SetLuaAction(void *stv, const char *action)
return true; // action successfully set.
}
-boolean LUA_CallAction(const char *csaction, mobj_t *actor)
+boolean LUA_CallAction(enum actionnum actionnum, mobj_t *actor)
{
- I_Assert(csaction != NULL);
I_Assert(actor != NULL);
- if (!gL) // Lua isn't loaded,
+ if (!actionsoverridden[actionnum]) // The action is not overriden,
return false; // action not called.
- if (superstack && fasticmp(csaction, superactions[superstack-1])) // the action is calling itself,
+ if (superstack && fasticmp(actionpointers[actionnum].name, superactions[superstack-1])) // the action is calling itself,
return false; // let it call the hardcoded function instead.
+ lua_pushcfunction(gL, LUA_GetErrorMessage);
+
// grab function by uppercase name.
lua_getfield(gL, LUA_REGISTRYINDEX, LREG_ACTIONS);
- {
- char *action = Z_StrDup(csaction);
- strupr(action);
- lua_getfield(gL, -1, action);
- Z_Free(action);
- }
+ lua_getfield(gL, -1, actionpointers[actionnum].name);
lua_remove(gL, -2); // pop LREG_ACTIONS
if (lua_isnil(gL, -1)) // no match
{
- lua_pop(gL, 1); // pop nil
+ lua_pop(gL, 2); // pop nil and error handler
return false; // action not called.
}
if (superstack == MAXRECURSION)
{
CONS_Alert(CONS_WARNING, "Max Lua Action recursion reached! Cool it on the calling A_Action functions from inside A_Action functions!\n");
+ lua_pop(gL, 2); // pop function and error handler
return true;
}
@@ -840,10 +849,11 @@ boolean LUA_CallAction(const char *csaction, mobj_t *actor)
lua_pushinteger(gL, var1);
lua_pushinteger(gL, var2);
- superactions[superstack] = csaction;
+ superactions[superstack] = actionpointers[actionnum].name;
++superstack;
- LUA_Call(gL, 3);
+ LUA_Call(gL, 3, 0, -(2 + 3));
+ lua_pop(gL, -1); // Error handler
--superstack;
superactions[superstack] = NULL;
@@ -906,6 +916,8 @@ static int state_set(lua_State *L)
if (hud_running)
return luaL_error(L, "Do not alter states in HUD rendering code!");
+ if (hook_cmd_running)
+ return luaL_error(L, "Do not alter states in CMD building code!");
if (fastcmp(field,"sprite")) {
value = luaL_checknumber(L, 3);
@@ -1006,6 +1018,8 @@ static int lib_setMobjInfo(lua_State *L)
if (hud_running)
return luaL_error(L, "Do not alter mobjinfo in HUD rendering code!");
+ if (hook_cmd_running)
+ return luaL_error(L, "Do not alter mobjinfo in CMD building code!");
// clear the mobjinfo to start with, in case of missing table elements
memset(info,0,sizeof(mobjinfo_t));
@@ -1173,6 +1187,8 @@ static int mobjinfo_set(lua_State *L)
if (hud_running)
return luaL_error(L, "Do not alter mobjinfo in HUD rendering code!");
+ if (hook_cmd_running)
+ return luaL_error(L, "Do not alter mobjinfo in CMD building code!");
I_Assert(info != NULL);
I_Assert(info >= mobjinfo);
@@ -1295,6 +1311,8 @@ static int lib_setSfxInfo(lua_State *L)
if (hud_running)
return luaL_error(L, "Do not alter sfxinfo in HUD rendering code!");
+ if (hook_cmd_running)
+ return luaL_error(L, "Do not alter sfxinfo in CMD building code!");
lua_pushnil(L);
while (lua_next(L, 1)) {
@@ -1376,6 +1394,8 @@ static int sfxinfo_set(lua_State *L)
if (hud_running)
return luaL_error(L, "Do not alter S_sfx in HUD rendering code!");
+ if (hook_cmd_running)
+ return luaL_error(L, "Do not alter S_sfx in CMD building code!");
I_Assert(sfx != NULL);
@@ -1443,6 +1463,8 @@ static int lib_setluabanks(lua_State *L)
if (hud_running)
return luaL_error(L, "Do not alter luabanks[] in HUD rendering code!");
+ if (hook_cmd_running)
+ return luaL_error(L, "Do not alter luabanks[] in CMD building code!");
lua_remove(L, 1); // don't care about luabanks[] dummy userdata.
@@ -1523,6 +1545,8 @@ static int lib_setSkinColor(lua_State *L)
if (hud_running)
return luaL_error(L, "Do not alter skincolors in HUD rendering code!");
+ if (hook_cmd_running)
+ return luaL_error(L, "Do not alter skincolors in CMD building code!");
// clear the skincolor to start with, in case of missing table elements
memset(info,0,sizeof(skincolor_t));
@@ -1611,8 +1635,10 @@ static int skincolor_get(lua_State *L)
lua_pushinteger(L, info->chatcolor);
else if (fastcmp(field,"accessible"))
lua_pushboolean(L, info->accessible);
- else
+ else {
CONS_Debug(DBG_LUA, M_GetText("'%s' has no field named '%s'; returning nil.\n"), "skincolor_t", field);
+ return 0;
+ }
return 1;
}
@@ -1711,6 +1737,8 @@ static int colorramp_set(lua_State *L)
return luaL_error(L, LUA_QL("skincolor_t") " field 'ramp' index %d out of range (0 - %d)", n, COLORRAMPSIZE-1);
if (hud_running)
return luaL_error(L, "Do not alter skincolor_t in HUD rendering code!");
+ if (hook_cmd_running)
+ return luaL_error(L, "Do not alter skincolor_t in CMD building code!");
colorramp[n] = i;
skincolor_modified[cnum] = true;
return 0;
diff --git a/src/lua_libs.h b/src/lua_libs.h
index f987c79fdfd25bd52b945b0c7ac052f447d7f36a..fbe8d48780f35009dfb0ca9b8f7209664297017c 100644
--- a/src/lua_libs.h
+++ b/src/lua_libs.h
@@ -12,10 +12,13 @@
extern lua_State *gL;
+#define MUTABLE_TAGS
+
#define LREG_VALID "VALID_USERDATA"
#define LREG_EXTVARS "LUA_VARS"
#define LREG_STATEACTION "STATE_ACTION"
#define LREG_ACTIONS "MOBJ_ACTION"
+#define LREG_METATABLES "METATABLES"
#define META_STATE "STATE_T*"
#define META_MOBJINFO "MOBJINFO_T*"
@@ -26,6 +29,8 @@ extern lua_State *gL;
#define META_PIVOTLIST "SPRITEFRAMEPIVOT_T[]"
#define META_FRAMEPIVOT "SPRITEFRAMEPIVOT_T*"
+#define META_TAGLIST "TAGLIST"
+
#define META_MOBJ "MOBJ_T*"
#define META_MAPTHING "MAPTHING_T*"
@@ -34,6 +39,8 @@ extern lua_State *gL;
#define META_SKIN "SKIN_T*"
#define META_POWERS "PLAYER_T*POWERS"
#define META_SOUNDSID "SKIN_T*SOUNDSID"
+#define META_SKINSPRITES "SKIN_T*SPRITES"
+#define META_SKINSPRITESLIST "SKIN_T*SPRITES[]"
#define META_VERTEX "VERTEX_T*"
#define META_LINE "LINE_T*"
@@ -50,14 +57,21 @@ extern lua_State *gL;
#define META_VECTOR3 "VECTOR3_T"
#define META_MAPHEADER "MAPHEADER_T*"
+#define META_POLYOBJ "POLYOBJ_T*"
+
#define META_CVAR "CONSVAR_T*"
#define META_SECTORLINES "SECTOR_T*LINES"
+#ifdef MUTABLE_TAGS
+#define META_SECTORTAGLIST "sector_t.taglist"
+#endif
#define META_SIDENUM "LINE_T*SIDENUM"
#define META_LINEARGS "LINE_T*ARGS"
#define META_LINESTRINGARGS "LINE_T*STRINGARGS"
#define META_THINGARGS "MAPTHING_T*ARGS"
#define META_THINGSTRINGARGS "MAPTHING_T*STRINGARGS"
+#define META_POLYOBJVERTICES "POLYOBJ_T*VERTICES"
+#define META_POLYOBJLINES "POLYOBJ_T*LINES"
#ifdef HAVE_LUA_SEGS
#define META_NODEBBOX "NODE_T*BBOX"
#define META_NODECHILDREN "NODE_T*CHILDREN"
@@ -88,5 +102,7 @@ int LUA_PlayerLib(lua_State *L);
int LUA_SkinLib(lua_State *L);
int LUA_ThinkerLib(lua_State *L);
int LUA_MapLib(lua_State *L);
+int LUA_TagLib(lua_State *L);
+int LUA_PolyObjLib(lua_State *L);
int LUA_BlockmapLib(lua_State *L);
int LUA_HudLib(lua_State *L);
diff --git a/src/lua_maplib.c b/src/lua_maplib.c
index 216818d29b63e85356c698884ea94d93bff79844..0161417960fc30556b1fdf11e112c4a7c6f5215f 100644
--- a/src/lua_maplib.c
+++ b/src/lua_maplib.c
@@ -16,11 +16,13 @@
#include "p_setup.h"
#include "z_zone.h"
#include "p_slopes.h"
+#include "p_polyobj.h"
#include "r_main.h"
#include "lua_script.h"
#include "lua_libs.h"
#include "lua_hud.h" // hud_running errors
+#include "lua_hook.h" // hook_cmd_running errors
#include "dehacked.h"
#include "fastcmp.h"
@@ -35,6 +37,7 @@ enum sector_e {
sector_lightlevel,
sector_special,
sector_tag,
+ sector_taglist,
sector_thinglist,
sector_heightsec,
sector_camsec,
@@ -53,6 +56,7 @@ static const char *const sector_opt[] = {
"lightlevel",
"special",
"tag",
+ "taglist",
"thinglist",
"heightsec",
"camsec",
@@ -67,6 +71,7 @@ enum subsector_e {
subsector_sector,
subsector_numlines,
subsector_firstline,
+ subsector_polyList
};
static const char *const subsector_opt[] = {
@@ -74,6 +79,7 @@ static const char *const subsector_opt[] = {
"sector",
"numlines",
"firstline",
+ "polyList",
NULL};
enum line_e {
@@ -85,6 +91,7 @@ enum line_e {
line_flags,
line_special,
line_tag,
+ line_taglist,
line_args,
line_stringargs,
line_sidenum,
@@ -95,8 +102,7 @@ enum line_e {
line_slopetype,
line_frontsector,
line_backsector,
- line_firsttag,
- line_nexttag,
+ line_polyobj,
line_text,
line_callcount
};
@@ -110,6 +116,7 @@ static const char *const line_opt[] = {
"flags",
"special",
"tag",
+ "taglist",
"args",
"stringargs",
"sidenum",
@@ -120,8 +127,7 @@ static const char *const line_opt[] = {
"slopetype",
"frontsector",
"backsector",
- "firsttag",
- "nexttag",
+ "polyobj",
"text",
"callcount",
NULL};
@@ -222,6 +228,7 @@ enum seg_e {
seg_linedef,
seg_frontsector,
seg_backsector,
+ seg_polyseg
};
static const char *const seg_opt[] = {
@@ -235,6 +242,7 @@ static const char *const seg_opt[] = {
"linedef",
"frontsector",
"backsector",
+ "polyseg",
NULL};
enum node_e {
@@ -324,9 +332,9 @@ static const char *const vector_opt[] = {
static const char *const array_opt[] ={"iterate",NULL};
static const char *const valid_opt[] ={"valid",NULL};
-///////////////////////////////////
-// sector list iterate functions //
-///////////////////////////////////
+/////////////////////////////////////////////
+// sector/subsector list iterate functions //
+/////////////////////////////////////////////
// iterates through a sector's thinglist!
static int lib_iterateSectorThinglist(lua_State *L)
@@ -398,6 +406,41 @@ static int lib_iterateSectorFFloors(lua_State *L)
return 0;
}
+// iterates through a subsector's polyList! (for polyobj_t)
+static int lib_iterateSubSectorPolylist(lua_State *L)
+{
+ polyobj_t *state = NULL;
+ polyobj_t *po = NULL;
+
+ INLEVEL
+
+ if (lua_gettop(L) < 2)
+ return luaL_error(L, "Don't call subsector.polyList() directly, use it as 'for polyobj in subsector.polyList do <block> end'.");
+
+ if (!lua_isnil(L, 1))
+ state = *((polyobj_t **)luaL_checkudata(L, 1, META_POLYOBJ));
+ else
+ return 0; // no polylist to iterate through sorry!
+
+ lua_settop(L, 2);
+ lua_remove(L, 1); // remove state now.
+
+ if (!lua_isnil(L, 1))
+ {
+ po = *((polyobj_t **)luaL_checkudata(L, 1, META_POLYOBJ));
+ po = (polyobj_t *)(po->link.next);
+ }
+ else
+ po = state; // state is used as the "start" of the polylist
+
+ if (po)
+ {
+ LUA_PushUserdata(L, po, META_POLYOBJ);
+ return 1;
+ }
+ return 0;
+}
+
static int sector_iterate(lua_State *L)
{
lua_pushvalue(L, lua_upvalueindex(1)); // iterator function, or the "generator"
@@ -446,7 +489,7 @@ static int sectorlines_get(lua_State *L)
// get the "linecount" by shifting our retrieved memory address of "lines" to where "linecount" is in the sector_t, then dereferencing the result
// we need this to determine the array's actual size, and therefore also the maximum value allowed as an index
// this only works if seclines is actually a pointer to a sector's lines member in memory, oh boy
- numoflines = (size_t)(*(size_t *)(((size_t)seclines) - (offsetof(sector_t, lines) - offsetof(sector_t, linecount))));
+ numoflines = *(size_t *)FIELDFROM (sector_t, seclines, lines,/* -> */linecount);
/* OLD HACK
// check first linedef to figure which of its sectors owns this sector->lines pointer
@@ -480,7 +523,7 @@ static int sectorlines_num(lua_State *L)
return luaL_error(L, "accessed sector_t.lines doesn't exist anymore.");
// see comments in the _get function above
- numoflines = (size_t)(*(size_t *)(((size_t)seclines) - (offsetof(sector_t, lines) - offsetof(sector_t, linecount))));
+ numoflines = *(size_t *)FIELDFROM (sector_t, seclines, lines,/* -> */linecount);
lua_pushinteger(L, numoflines);
return 1;
}
@@ -540,7 +583,10 @@ static int sector_get(lua_State *L)
lua_pushinteger(L, sector->special);
return 1;
case sector_tag:
- lua_pushinteger(L, sector->tag);
+ lua_pushinteger(L, (UINT16)Tag_FGet(§or->tags));
+ return 1;
+ case sector_taglist:
+ LUA_PushUserdata(L, §or->tags, META_SECTORTAGLIST);
return 1;
case sector_thinglist: // thinglist
lua_pushcfunction(L, lib_iterateSectorThinglist);
@@ -585,6 +631,8 @@ static int sector_set(lua_State *L)
if (hud_running)
return luaL_error(L, "Do not alter sector_t in HUD rendering code!");
+ if (hook_cmd_running)
+ return luaL_error(L, "Do not alter sector_t in CMD building code!");
switch(field)
{
@@ -639,8 +687,10 @@ static int sector_set(lua_State *L)
sector->special = (INT16)luaL_checkinteger(L, 3);
break;
case sector_tag:
- P_ChangeSectorTag((UINT32)(sector - sectors), (INT16)luaL_checkinteger(L, 3));
+ Tag_SectorFSet((UINT32)(sector - sectors), (INT16)luaL_checkinteger(L, 3));
break;
+ case sector_taglist:
+ return LUA_ErrSetDirectly(L, "sector_t", "taglist");
}
return 0;
}
@@ -684,6 +734,11 @@ static int subsector_get(lua_State *L)
case subsector_firstline:
lua_pushinteger(L, subsector->firstline);
return 1;
+ case subsector_polyList: // polyList
+ lua_pushcfunction(L, lib_iterateSubSectorPolylist);
+ LUA_PushUserdata(L, subsector->polyList, META_POLYOBJ);
+ lua_pushcclosure(L, sector_iterate, 2); // push lib_iterateSubSectorPolylist and subsector->polyList as upvalues for the function
+ return 1;
}
return 0;
}
@@ -773,7 +828,21 @@ static int line_get(lua_State *L)
lua_pushinteger(L, line->special);
return 1;
case line_tag:
- lua_pushinteger(L, line->tag);
+ // HELLO
+ // THIS IS LJ SONIC
+ // HOW IS YOUR DAY?
+ // BY THE WAY WHEN 2.3 OR 3.0 OR 4.0 OR SRB3 OR SRB4 OR WHATEVER IS OUT
+ // YOU SHOULD REMEMBER TO CHANGE THIS SO IT ALWAYS RETURNS A UNSIGNED VALUE
+ // HAVE A NICE DAY
+ //
+ //
+ //
+ //
+ // you are ugly
+ lua_pushinteger(L, Tag_FGet(&line->tags));
+ return 1;
+ case line_taglist:
+ LUA_PushUserdata(L, &line->tags, META_TAGLIST);
return 1;
case line_args:
LUA_PushUserdata(L, line->args, META_LINEARGS);
@@ -821,11 +890,8 @@ static int line_get(lua_State *L)
case line_backsector:
LUA_PushUserdata(L, line->backsector, META_SECTOR);
return 1;
- case line_firsttag:
- lua_pushinteger(L, line->firsttag);
- return 1;
- case line_nexttag:
- lua_pushinteger(L, line->nexttag);
+ case line_polyobj:
+ LUA_PushUserdata(L, line->polyobj, META_POLYOBJ);
return 1;
case line_text:
lua_pushstring(L, line->text);
@@ -1089,6 +1155,9 @@ static int seg_get(lua_State *L)
case seg_backsector:
LUA_PushUserdata(L, seg->backsector, META_SECTOR);
return 1;
+ case seg_polyseg:
+ LUA_PushUserdata(L, seg->polyseg, META_POLYOBJ);
+ return 1;
}
return 0;
}
@@ -1339,25 +1408,15 @@ static int lib_iterateSectors(lua_State *L)
static int lib_getSector(lua_State *L)
{
- int field;
INLEVEL
- lua_settop(L, 2);
- lua_remove(L, 1); // dummy userdata table is unused.
- if (lua_isnumber(L, 1))
+ if (lua_isnumber(L, 2))
{
- size_t i = lua_tointeger(L, 1);
+ size_t i = lua_tointeger(L, 2);
if (i >= numsectors)
return 0;
LUA_PushUserdata(L, §ors[i], META_SECTOR);
return 1;
}
- field = luaL_checkoption(L, 1, NULL, array_opt);
- switch(field)
- {
- case 0: // iterate
- lua_pushcfunction(L, lib_iterateSectors);
- return 1;
- }
return 0;
}
@@ -1443,25 +1502,15 @@ static int lib_iterateLines(lua_State *L)
static int lib_getLine(lua_State *L)
{
- int field;
INLEVEL
- lua_settop(L, 2);
- lua_remove(L, 1); // dummy userdata table is unused.
- if (lua_isnumber(L, 1))
+ if (lua_isnumber(L, 2))
{
- size_t i = lua_tointeger(L, 1);
+ size_t i = lua_tointeger(L, 2);
if (i >= numlines)
return 0;
LUA_PushUserdata(L, &lines[i], META_LINE);
return 1;
}
- field = luaL_checkoption(L, 1, NULL, array_opt);
- switch(field)
- {
- case 0: // iterate
- lua_pushcfunction(L, lib_iterateLines);
- return 1;
- }
return 0;
}
@@ -1772,6 +1821,8 @@ static int ffloor_set(lua_State *L)
if (hud_running)
return luaL_error(L, "Do not alter ffloor_t in HUD rendering code!");
+ if (hook_cmd_running)
+ return luaL_error(L, "Do not alter ffloor_t in CMD building code!");
switch(field)
{
@@ -1896,6 +1947,8 @@ static int slope_set(lua_State *L)
if (hud_running)
return luaL_error(L, "Do not alter pslope_t in HUD rendering code!");
+ if (hook_cmd_running)
+ return luaL_error(L, "Do not alter pslope_t in CMD building code!");
switch(field) // todo: reorganize this shit
{
@@ -2139,6 +2192,8 @@ static int mapheaderinfo_get(lua_State *L)
lua_pushinteger(L, header->levelflags);
else if (fastcmp(field,"menuflags"))
lua_pushinteger(L, header->menuflags);
+ else if (fastcmp(field,"selectheading"))
+ lua_pushstring(L, header->selectheading);
else if (fastcmp(field,"startrings"))
lua_pushinteger(L, header->startrings);
else if (fastcmp(field, "sstimer"))
@@ -2308,15 +2363,13 @@ int LUA_MapLib(lua_State *L)
//lua_setfield(L, -2, "__len");
lua_pop(L, 1);
- lua_newuserdata(L, 0);
- lua_createtable(L, 0, 2);
- lua_pushcfunction(L, lib_getSector);
- lua_setfield(L, -2, "__index");
-
- lua_pushcfunction(L, lib_numsectors);
- lua_setfield(L, -2, "__len");
- lua_setmetatable(L, -2);
- lua_setglobal(L, "sectors");
+ LUA_PushTaggableObjectArray(L, "sectors",
+ lib_iterateSectors,
+ lib_getSector,
+ lib_numsectors,
+ tags_sectors,
+ &numsectors, §ors,
+ sizeof (sector_t), META_SECTOR);
lua_newuserdata(L, 0);
lua_createtable(L, 0, 2);
@@ -2328,15 +2381,13 @@ int LUA_MapLib(lua_State *L)
lua_setmetatable(L, -2);
lua_setglobal(L, "subsectors");
- lua_newuserdata(L, 0);
- lua_createtable(L, 0, 2);
- lua_pushcfunction(L, lib_getLine);
- lua_setfield(L, -2, "__index");
-
- lua_pushcfunction(L, lib_numlines);
- lua_setfield(L, -2, "__len");
- lua_setmetatable(L, -2);
- lua_setglobal(L, "lines");
+ LUA_PushTaggableObjectArray(L, "lines",
+ lib_iterateLines,
+ lib_getLine,
+ lib_numlines,
+ tags_lines,
+ &numlines, &lines,
+ sizeof (line_t), META_LINE);
lua_newuserdata(L, 0);
lua_createtable(L, 0, 2);
diff --git a/src/lua_mathlib.c b/src/lua_mathlib.c
index 7cbe7a6cc9bbc579d47ff6f6a03ab3f2ad6b5ef4..b6046ab53b2d37948bc6fdb40c540a49d148be57 100644
--- a/src/lua_mathlib.c
+++ b/src/lua_mathlib.c
@@ -15,6 +15,7 @@
#include "tables.h"
#include "p_local.h"
#include "doomstat.h" // for ALL7EMERALDS
+#include "r_main.h" // for R_PointToDist2
#include "lua_script.h"
#include "lua_libs.h"
@@ -129,7 +130,7 @@ static int lib_fixedsqrt(lua_State *L)
static int lib_fixedhypot(lua_State *L)
{
- lua_pushfixed(L, FixedHypot(luaL_checkfixed(L, 1), luaL_checkfixed(L, 2)));
+ lua_pushfixed(L, R_PointToDist2(0, 0, luaL_checkfixed(L, 1), luaL_checkfixed(L, 2)));
return 1;
}
@@ -192,18 +193,30 @@ static luaL_Reg lib[] = {
{"cos", lib_finecosine},
{"tan", lib_finetangent},
{"FixedAngle", lib_fixedangle},
+ {"fixangle" , lib_fixedangle},
{"AngleFixed", lib_anglefixed},
+ {"anglefix" , lib_anglefixed},
{"InvAngle", lib_invangle},
{"FixedMul", lib_fixedmul},
+ {"fixmul" , lib_fixedmul},
{"FixedInt", lib_fixedint},
+ {"fixint" , lib_fixedint},
{"FixedDiv", lib_fixeddiv},
+ {"fixdiv" , lib_fixeddiv},
{"FixedRem", lib_fixedrem},
+ {"fixrem" , lib_fixedrem},
{"FixedSqrt", lib_fixedsqrt},
+ {"fixsqrt" , lib_fixedsqrt},
{"FixedHypot", lib_fixedhypot},
+ {"fixhypot" , lib_fixedhypot},
{"FixedFloor", lib_fixedfloor},
+ {"fixfloor" , lib_fixedfloor},
{"FixedTrunc", lib_fixedtrunc},
+ {"fixtrunc" , lib_fixedtrunc},
{"FixedCeil", lib_fixedceil},
+ {"fixceil" , lib_fixedceil},
{"FixedRound", lib_fixedround},
+ {"fixround" , lib_fixedround},
{"GetSecSpecial", lib_getsecspecial},
{"All7Emeralds", lib_all7emeralds},
{"ColorOpposite", lib_coloropposite},
diff --git a/src/lua_mobjlib.c b/src/lua_mobjlib.c
index 4fa938ea54ba0025f87994a0f0bc68a49d467e64..65adceb154cb66424c73b3415253891307a9f706 100644
--- a/src/lua_mobjlib.c
+++ b/src/lua_mobjlib.c
@@ -20,8 +20,7 @@
#include "lua_script.h"
#include "lua_libs.h"
#include "lua_hud.h" // hud_running errors
-
-static const char *const array_opt[] ={"iterate",NULL};
+#include "lua_hook.h" // hook_cmd_running errors
enum mobj_e {
mobj_valid = 0,
@@ -38,6 +37,11 @@ enum mobj_e {
mobj_frame,
mobj_sprite2,
mobj_anim_duration,
+ mobj_spritexscale,
+ mobj_spriteyscale,
+ mobj_spritexoffset,
+ mobj_spriteyoffset,
+ mobj_floorspriteslope,
mobj_touching_sectorlist,
mobj_subsector,
mobj_floorz,
@@ -55,8 +59,10 @@ enum mobj_e {
mobj_flags,
mobj_flags2,
mobj_eflags,
+ mobj_renderflags,
mobj_skin,
mobj_color,
+ mobj_blendmode,
mobj_bnext,
mobj_bprev,
mobj_hnext,
@@ -107,6 +113,11 @@ static const char *const mobj_opt[] = {
"frame",
"sprite2",
"anim_duration",
+ "spritexscale",
+ "spriteyscale",
+ "spritexoffset",
+ "spriteyoffset",
+ "floorspriteslope",
"touching_sectorlist",
"subsector",
"floorz",
@@ -124,8 +135,10 @@ static const char *const mobj_opt[] = {
"flags",
"flags2",
"eflags",
+ "renderflags",
"skin",
"color",
+ "blendmode",
"bnext",
"bprev",
"hnext",
@@ -226,6 +239,21 @@ static int mobj_get(lua_State *L)
case mobj_anim_duration:
lua_pushinteger(L, mo->anim_duration);
break;
+ case mobj_spritexscale:
+ lua_pushfixed(L, mo->spritexscale);
+ break;
+ case mobj_spriteyscale:
+ lua_pushfixed(L, mo->spriteyscale);
+ break;
+ case mobj_spritexoffset:
+ lua_pushfixed(L, mo->spritexoffset);
+ break;
+ case mobj_spriteyoffset:
+ lua_pushfixed(L, mo->spriteyoffset);
+ break;
+ case mobj_floorspriteslope:
+ LUA_PushUserdata(L, mo->floorspriteslope, META_SLOPE);
+ break;
case mobj_touching_sectorlist:
return UNIMPLEMENTED;
case mobj_subsector:
@@ -276,6 +304,9 @@ static int mobj_get(lua_State *L)
case mobj_eflags:
lua_pushinteger(L, mo->eflags);
break;
+ case mobj_renderflags:
+ lua_pushinteger(L, mo->renderflags);
+ break;
case mobj_skin: // skin name or nil, not struct
if (!mo->skin)
return 0;
@@ -284,6 +315,9 @@ static int mobj_get(lua_State *L)
case mobj_color:
lua_pushinteger(L, mo->color);
break;
+ case mobj_blendmode:
+ lua_pushinteger(L, mo->blendmode);
+ break;
case mobj_bnext:
LUA_PushUserdata(L, mo->bnext, META_MOBJ);
break;
@@ -437,6 +471,8 @@ static int mobj_set(lua_State *L)
if (hud_running)
return luaL_error(L, "Do not alter mobj_t in HUD rendering code!");
+ if (hook_cmd_running)
+ return luaL_error(L, "Do not alter mobj_t in CMD building code!");
switch(field)
{
@@ -489,6 +525,20 @@ static int mobj_set(lua_State *L)
case mobj_anim_duration:
mo->anim_duration = (UINT16)luaL_checkinteger(L, 3);
break;
+ case mobj_spritexscale:
+ mo->spritexscale = luaL_checkfixed(L, 3);
+ break;
+ case mobj_spriteyscale:
+ mo->spriteyscale = luaL_checkfixed(L, 3);
+ break;
+ case mobj_spritexoffset:
+ mo->spritexoffset = luaL_checkfixed(L, 3);
+ break;
+ case mobj_spriteyoffset:
+ mo->spriteyoffset = luaL_checkfixed(L, 3);
+ break;
+ case mobj_floorspriteslope:
+ return NOSET;
case mobj_touching_sectorlist:
return UNIMPLEMENTED;
case mobj_subsector:
@@ -577,6 +627,9 @@ static int mobj_set(lua_State *L)
case mobj_eflags:
mo->eflags = (UINT32)luaL_checkinteger(L, 3);
break;
+ case mobj_renderflags:
+ mo->renderflags = (UINT32)luaL_checkinteger(L, 3);
+ break;
case mobj_skin: // set skin by name
{
INT32 i;
@@ -600,6 +653,9 @@ static int mobj_set(lua_State *L)
mo->color = newcolor;
break;
}
+ case mobj_blendmode:
+ mo->blendmode = (INT32)luaL_checkinteger(L, 3);
+ break;
case mobj_bnext:
return NOSETPOS;
case mobj_bprev:
@@ -845,7 +901,12 @@ static int mapthing_get(lua_State *L)
else if(fastcmp(field,"extrainfo"))
number = mt->extrainfo;
else if(fastcmp(field,"tag"))
- number = mt->tag;
+ number = Tag_FGet(&mt->tags);
+ else if(fastcmp(field,"taglist"))
+ {
+ LUA_PushUserdata(L, &mt->tags, META_TAGLIST);
+ return 1;
+ }
else if(fastcmp(field,"args"))
{
LUA_PushUserdata(L, mt->args, META_THINGARGS);
@@ -878,6 +939,8 @@ static int mapthing_set(lua_State *L)
if (hud_running)
return luaL_error(L, "Do not alter mapthing_t in HUD rendering code!");
+ if (hook_cmd_running)
+ return luaL_error(L, "Do not alter mapthing_t in CMD building code!");
if(fastcmp(field,"x"))
mt->x = (INT16)luaL_checkinteger(L, 3);
@@ -905,7 +968,9 @@ static int mapthing_set(lua_State *L)
mt->extrainfo = (UINT8)extrainfo;
}
else if (fastcmp(field,"tag"))
- mt->tag = (INT16)luaL_checkinteger(L, 3);
+ Tag_FSet(&mt->tags, (INT16)luaL_checkinteger(L, 3));
+ else if (fastcmp(field,"taglist"))
+ return LUA_ErrSetDirectly(L, "mapthing_t", "taglist");
else if(fastcmp(field,"mobj"))
mt->mobj = *((mobj_t **)luaL_checkudata(L, 3, META_MOBJ));
else
@@ -943,25 +1008,15 @@ static int lib_iterateMapthings(lua_State *L)
static int lib_getMapthing(lua_State *L)
{
- int field;
INLEVEL
- lua_settop(L, 2);
- lua_remove(L, 1); // dummy userdata table is unused.
- if (lua_isnumber(L, 1))
+ if (lua_isnumber(L, 2))
{
- size_t i = lua_tointeger(L, 1);
+ size_t i = lua_tointeger(L, 2);
if (i >= nummapthings)
return 0;
LUA_PushUserdata(L, &mapthings[i], META_MAPTHING);
return 1;
}
- field = luaL_checkoption(L, 1, NULL, array_opt);
- switch(field)
- {
- case 0: // iterate
- lua_pushcfunction(L, lib_iterateMapthings);
- return 1;
- }
return 0;
}
@@ -1008,14 +1063,13 @@ int LUA_MobjLib(lua_State *L)
lua_setfield(L, -2, "__len");
lua_pop(L,1);
- lua_newuserdata(L, 0);
- lua_createtable(L, 0, 2);
- lua_pushcfunction(L, lib_getMapthing);
- lua_setfield(L, -2, "__index");
+ LUA_PushTaggableObjectArray(L, "mapthings",
+ lib_iterateMapthings,
+ lib_getMapthing,
+ lib_nummapthings,
+ tags_mapthings,
+ &nummapthings, &mapthings,
+ sizeof (mapthing_t), META_MAPTHING);
- lua_pushcfunction(L, lib_nummapthings);
- lua_setfield(L, -2, "__len");
- lua_setmetatable(L, -2);
- lua_setglobal(L, "mapthings");
return 0;
}
diff --git a/src/lua_playerlib.c b/src/lua_playerlib.c
index 1ce9be525f50146735f3973bb5b36de246c5b383..0eb54808fb21a90de8ee5b6aaa3d046eff8cfdd1 100644
--- a/src/lua_playerlib.c
+++ b/src/lua_playerlib.c
@@ -20,6 +20,7 @@
#include "lua_script.h"
#include "lua_libs.h"
#include "lua_hud.h" // hud_running errors
+#include "lua_hook.h" // hook_cmd_running errors
static int lib_iteratePlayers(lua_State *L)
{
@@ -157,6 +158,10 @@ static int player_get(lua_State *L)
lua_pushinteger(L, plr->flashpal);
else if (fastcmp(field,"skincolor"))
lua_pushinteger(L, plr->skincolor);
+ else if (fastcmp(field,"skin"))
+ lua_pushinteger(L, plr->skin);
+ else if (fastcmp(field,"availabilities"))
+ lua_pushinteger(L, plr->availabilities);
else if (fastcmp(field,"score"))
lua_pushinteger(L, plr->score);
else if (fastcmp(field,"dashspeed"))
@@ -400,6 +405,8 @@ static int player_set(lua_State *L)
if (hud_running)
return luaL_error(L, "Do not alter player_t in HUD rendering code!");
+ if (hook_cmd_running)
+ return luaL_error(L, "Do not alter player_t in CMD building code!");
if (fastcmp(field,"mo") || fastcmp(field,"realmo")) {
mobj_t *newmo = *((mobj_t **)luaL_checkudata(L, 3, META_MOBJ));
@@ -466,6 +473,10 @@ static int player_set(lua_State *L)
return luaL_error(L, "player.skincolor %d out of range (0 - %d).", newcolor, numskincolors-1);
plr->skincolor = newcolor;
}
+ else if (fastcmp(field,"skin"))
+ return NOSET;
+ else if (fastcmp(field,"availabilities"))
+ return NOSET;
else if (fastcmp(field,"score"))
plr->score = (UINT32)luaL_checkinteger(L, 3);
else if (fastcmp(field,"dashspeed"))
@@ -770,6 +781,8 @@ static int power_set(lua_State *L)
return luaL_error(L, LUA_QL("powertype_t") " cannot be %d", (INT16)p);
if (hud_running)
return luaL_error(L, "Do not alter player_t in HUD rendering code!");
+ if (hook_cmd_running)
+ return luaL_error(L, "Do not alter player_t in CMD building code!");
powers[p] = i;
return 0;
}
diff --git a/src/lua_polyobjlib.c b/src/lua_polyobjlib.c
new file mode 100644
index 0000000000000000000000000000000000000000..2a5bcfbf19a54458e63960d5b06c1466f96487de
--- /dev/null
+++ b/src/lua_polyobjlib.c
@@ -0,0 +1,486 @@
+// SONIC ROBO BLAST 2
+//-----------------------------------------------------------------------------
+// Copyright (C) 2020 by Iestyn "Monster Iestyn" Jealous.
+// Copyright (C) 2020 by Sonic Team Junior.
+//
+// This program is free software distributed under the
+// terms of the GNU General Public License, version 2.
+// See the 'LICENSE' file for more details.
+//-----------------------------------------------------------------------------
+/// \file lua_polyobjlib.c
+/// \brief polyobject library for Lua scripting
+
+#include "doomdef.h"
+#include "fastcmp.h"
+#include "p_local.h"
+#include "p_polyobj.h"
+#include "lua_script.h"
+#include "lua_libs.h"
+#include "lua_hud.h" // hud_running errors
+
+#define NOHUD if (hud_running)\
+return luaL_error(L, "HUD rendering code should not call this function!");
+
+enum polyobj_e {
+ // properties
+ polyobj_valid = 0,
+ polyobj_id,
+ polyobj_parent,
+ polyobj_vertices,
+ polyobj_lines,
+ polyobj_sector,
+ polyobj_angle,
+ polyobj_damage,
+ polyobj_thrust,
+ polyobj_flags,
+ polyobj_translucency,
+ polyobj_triggertag,
+ // special functions - utility
+ polyobj_pointInside,
+ polyobj_mobjTouching,
+ polyobj_mobjInside,
+ // special functions - manipulation
+ polyobj_moveXY,
+ polyobj_rotate
+};
+static const char *const polyobj_opt[] = {
+ // properties
+ "valid",
+ "id",
+ "parent",
+ "vertices",
+ "lines",
+ "sector",
+ "angle",
+ "damage",
+ "thrust",
+ "flags",
+ "translucency",
+ "triggertag",
+ // special functions - utility
+ "pointInside",
+ "mobjTouching",
+ "mobjInside",
+ // special functions - manipulation
+ "moveXY",
+ "rotate",
+ NULL};
+
+static const char *const valid_opt[] ={"valid",NULL};
+
+////////////////////////
+// polyobj.vertices[] //
+////////////////////////
+
+// polyobj.vertices, i -> polyobj.vertices[i]
+// polyobj.vertices.valid, for validity checking
+//
+// see sectorlines_get in lua_maplib.c
+//
+static int polyobjvertices_get(lua_State *L)
+{
+ vertex_t ***polyverts = *((vertex_t ****)luaL_checkudata(L, 1, META_POLYOBJVERTICES));
+ size_t i;
+ size_t numofverts = 0;
+ lua_settop(L, 2);
+ if (!lua_isnumber(L, 2))
+ {
+ int field = luaL_checkoption(L, 2, NULL, valid_opt);
+ if (!polyverts || !(*polyverts))
+ {
+ if (field == 0) {
+ lua_pushboolean(L, 0);
+ return 1;
+ }
+ return luaL_error(L, "accessed polyobj_t.vertices doesn't exist anymore.");
+ } else if (field == 0) {
+ lua_pushboolean(L, 1);
+ return 1;
+ }
+ }
+
+ numofverts = *(size_t *)FIELDFROM (polyobj_t, polyverts, vertices,/* -> */numVertices);
+
+ if (!numofverts)
+ return luaL_error(L, "no vertices found!");
+
+ i = (size_t)lua_tointeger(L, 2);
+ if (i >= numofverts)
+ return 0;
+ LUA_PushUserdata(L, (*polyverts)[i], META_VERTEX);
+ return 1;
+}
+
+// #(polyobj.vertices) -> polyobj.numVertices
+static int polyobjvertices_num(lua_State *L)
+{
+ vertex_t ***polyverts = *((vertex_t ****)luaL_checkudata(L, 1, META_POLYOBJVERTICES));
+ size_t numofverts = 0;
+
+ if (!polyverts || !(*polyverts))
+ return luaL_error(L, "accessed polyobj_t.vertices doesn't exist anymore.");
+
+ numofverts = *(size_t *)FIELDFROM (polyobj_t, polyverts, vertices,/* -> */numVertices);
+ lua_pushinteger(L, numofverts);
+ return 1;
+}
+
+/////////////////////
+// polyobj.lines[] //
+/////////////////////
+
+// polyobj.lines, i -> polyobj.lines[i]
+// polyobj.lines.valid, for validity checking
+//
+// see sectorlines_get in lua_maplib.c
+//
+static int polyobjlines_get(lua_State *L)
+{
+ line_t ***polylines = *((line_t ****)luaL_checkudata(L, 1, META_POLYOBJLINES));
+ size_t i;
+ size_t numoflines = 0;
+ lua_settop(L, 2);
+ if (!lua_isnumber(L, 2))
+ {
+ int field = luaL_checkoption(L, 2, NULL, valid_opt);
+ if (!polylines || !(*polylines))
+ {
+ if (field == 0) {
+ lua_pushboolean(L, 0);
+ return 1;
+ }
+ return luaL_error(L, "accessed polyobj_t.lines doesn't exist anymore.");
+ } else if (field == 0) {
+ lua_pushboolean(L, 1);
+ return 1;
+ }
+ }
+
+ numoflines = *(size_t *)FIELDFROM (polyobj_t, polylines, lines,/* -> */numLines);
+
+ if (!numoflines)
+ return luaL_error(L, "no lines found!");
+
+ i = (size_t)lua_tointeger(L, 2);
+ if (i >= numoflines)
+ return 0;
+ LUA_PushUserdata(L, (*polylines)[i], META_LINE);
+ return 1;
+}
+
+// #(polyobj.lines) -> polyobj.numLines
+static int polyobjlines_num(lua_State *L)
+{
+ line_t ***polylines = *((line_t ****)luaL_checkudata(L, 1, META_POLYOBJLINES));
+ size_t numoflines = 0;
+
+ if (!polylines || !(*polylines))
+ return luaL_error(L, "accessed polyobj_t.lines doesn't exist anymore.");
+
+ numoflines = *(size_t *)FIELDFROM (polyobj_t, polylines, lines,/* -> */numLines);
+ lua_pushinteger(L, numoflines);
+ return 1;
+}
+
+/////////////////////////////////
+// polyobj_t function wrappers //
+/////////////////////////////////
+
+// special functions - utility
+static int lib_polyobj_PointInside(lua_State *L)
+{
+ polyobj_t *po = *((polyobj_t **)luaL_checkudata(L, 1, META_POLYOBJ));
+ fixed_t x = luaL_checkfixed(L, 2);
+ fixed_t y = luaL_checkfixed(L, 3);
+ INLEVEL
+ if (!po)
+ return LUA_ErrInvalid(L, "polyobj_t");
+ lua_pushboolean(L, P_PointInsidePolyobj(po, x, y));
+ return 1;
+}
+
+static int lib_polyobj_MobjTouching(lua_State *L)
+{
+ polyobj_t *po = *((polyobj_t **)luaL_checkudata(L, 1, META_POLYOBJ));
+ mobj_t *mo = *((mobj_t **)luaL_checkudata(L, 2, META_MOBJ));
+ INLEVEL
+ if (!po)
+ return LUA_ErrInvalid(L, "polyobj_t");
+ if (!mo)
+ return LUA_ErrInvalid(L, "mobj_t");
+ lua_pushboolean(L, P_MobjTouchingPolyobj(po, mo));
+ return 1;
+}
+
+static int lib_polyobj_MobjInside(lua_State *L)
+{
+ polyobj_t *po = *((polyobj_t **)luaL_checkudata(L, 1, META_POLYOBJ));
+ mobj_t *mo = *((mobj_t **)luaL_checkudata(L, 2, META_MOBJ));
+ INLEVEL
+ if (!po)
+ return LUA_ErrInvalid(L, "polyobj_t");
+ if (!mo)
+ return LUA_ErrInvalid(L, "mobj_t");
+ lua_pushboolean(L, P_MobjInsidePolyobj(po, mo));
+ return 1;
+}
+
+// special functions - manipulation
+static int lib_polyobj_moveXY(lua_State *L)
+{
+ polyobj_t *po = *((polyobj_t **)luaL_checkudata(L, 1, META_POLYOBJ));
+ fixed_t x = luaL_checkfixed(L, 2);
+ fixed_t y = luaL_checkfixed(L, 3);
+ boolean checkmobjs = lua_opttrueboolean(L, 4);
+ NOHUD
+ INLEVEL
+ if (!po)
+ return LUA_ErrInvalid(L, "polyobj_t");
+ lua_pushboolean(L, Polyobj_moveXY(po, x, y, checkmobjs));
+ return 1;
+}
+
+static int lib_polyobj_rotate(lua_State *L)
+{
+ polyobj_t *po = *((polyobj_t **)luaL_checkudata(L, 1, META_POLYOBJ));
+ angle_t delta = luaL_checkangle(L, 2);
+ UINT8 turnthings = (UINT8)luaL_optinteger(L, 3, 0); // don't turn anything by default? (could change this if not desired)
+ boolean checkmobjs = lua_opttrueboolean(L, 4);
+ NOHUD
+ INLEVEL
+ if (!po)
+ return LUA_ErrInvalid(L, "polyobj_t");
+ lua_pushboolean(L, Polyobj_rotate(po, delta, turnthings, checkmobjs));
+ return 1;
+}
+
+///////////////
+// polyobj_t //
+///////////////
+
+static int polyobj_get(lua_State *L)
+{
+ polyobj_t *polyobj = *((polyobj_t **)luaL_checkudata(L, 1, META_POLYOBJ));
+ enum polyobj_e field = luaL_checkoption(L, 2, NULL, polyobj_opt);
+
+ if (!polyobj) {
+ if (field == polyobj_valid) {
+ lua_pushboolean(L, false);
+ return 1;
+ }
+ return LUA_ErrInvalid(L, "polyobj_t");
+ }
+
+ switch (field)
+ {
+ // properties
+ case polyobj_valid:
+ lua_pushboolean(L, true);
+ break;
+ case polyobj_id:
+ lua_pushinteger(L, polyobj->id);
+ break;
+ case polyobj_parent:
+ lua_pushinteger(L, polyobj->parent);
+ break;
+ case polyobj_vertices: // vertices
+ LUA_PushUserdata(L, &polyobj->vertices, META_POLYOBJVERTICES); // push the address of the "vertices" member in the struct, to allow our hacks to work
+ break;
+ case polyobj_lines: // lines
+ LUA_PushUserdata(L, &polyobj->lines, META_POLYOBJLINES); // push the address of the "lines" member in the struct, to allow our hacks to work
+ break;
+ case polyobj_sector: // shortcut that exists only in Lua!
+ LUA_PushUserdata(L, polyobj->lines[0]->backsector, META_SECTOR);
+ break;
+ case polyobj_angle:
+ lua_pushangle(L, polyobj->angle);
+ break;
+ case polyobj_damage:
+ lua_pushinteger(L, polyobj->damage);
+ break;
+ case polyobj_thrust:
+ lua_pushfixed(L, polyobj->thrust);
+ break;
+ case polyobj_flags:
+ lua_pushinteger(L, polyobj->flags);
+ break;
+ case polyobj_translucency:
+ lua_pushinteger(L, polyobj->translucency);
+ break;
+ case polyobj_triggertag:
+ lua_pushinteger(L, polyobj->triggertag);
+ break;
+ // special functions - utility
+ case polyobj_pointInside:
+ lua_pushcfunction(L, lib_polyobj_PointInside);
+ break;
+ case polyobj_mobjTouching:
+ lua_pushcfunction(L, lib_polyobj_MobjTouching);
+ break;
+ case polyobj_mobjInside:
+ lua_pushcfunction(L, lib_polyobj_MobjInside);
+ break;
+ // special functions - manipulation
+ case polyobj_moveXY:
+ lua_pushcfunction(L, lib_polyobj_moveXY);
+ break;
+ case polyobj_rotate:
+ lua_pushcfunction(L, lib_polyobj_rotate);
+ break;
+ }
+ return 1;
+}
+
+static int polyobj_set(lua_State *L)
+{
+ polyobj_t *polyobj = *((polyobj_t **)luaL_checkudata(L, 1, META_POLYOBJ));
+ enum polyobj_e field = luaL_checkoption(L, 2, NULL, polyobj_opt);
+
+ if (!polyobj)
+ return LUA_ErrInvalid(L, "polyobj_t");
+
+ if (hud_running)
+ return luaL_error(L, "Do not alter polyobj_t in HUD rendering code!");
+
+ switch (field)
+ {
+ default:
+ return luaL_error(L, LUA_QL("polyobj_t") " field " LUA_QS " cannot be modified.", polyobj_opt[field]);
+ case polyobj_angle:
+ return luaL_error(L, LUA_QL("polyobj_t") " field " LUA_QS " should not be set directly. Use the function " LUA_QL("polyobj:rotate(angle)") " instead.", polyobj_opt[field]);
+ case polyobj_parent:
+ polyobj->parent = luaL_checkinteger(L, 3);
+ break;
+ case polyobj_flags:
+ polyobj->flags = luaL_checkinteger(L, 3);
+ break;
+ case polyobj_translucency:
+ polyobj->translucency = luaL_checkinteger(L, 3);
+ break;
+ }
+
+ return 0;
+}
+
+static int polyobj_num(lua_State *L)
+{
+ polyobj_t *polyobj = *((polyobj_t **)luaL_checkudata(L, 1, META_POLYOBJ));
+ if (!polyobj)
+ return luaL_error(L, "accessed polyobj_t doesn't exist anymore.");
+ lua_pushinteger(L, polyobj-PolyObjects);
+ return 1;
+}
+
+///////////////////
+// PolyObjects[] //
+///////////////////
+
+static int lib_iteratePolyObjects(lua_State *L)
+{
+ INT32 i = -1;
+ if (lua_gettop(L) < 2)
+ {
+ //return luaL_error(L, "Don't call PolyObjects.iterate() directly, use it as 'for polyobj in PolyObjects.iterate do <block> end'.");
+ lua_pushcfunction(L, lib_iteratePolyObjects);
+ return 1;
+ }
+ lua_settop(L, 2);
+ lua_remove(L, 1); // state is unused.
+ if (!lua_isnil(L, 1))
+ i = (INT32)(*((polyobj_t **)luaL_checkudata(L, 1, META_POLYOBJ)) - PolyObjects);
+ for (i++; i < numPolyObjects; i++)
+ {
+ LUA_PushUserdata(L, &PolyObjects[i], META_POLYOBJ);
+ return 1;
+ }
+ return 0;
+}
+
+static int lib_PolyObject_getfornum(lua_State *L)
+{
+ INT32 id = (INT32)luaL_checkinteger(L, 1);
+
+ if (!numPolyObjects)
+ return 0; // if there's no PolyObjects then bail out here
+
+ LUA_PushUserdata(L, Polyobj_GetForNum(id), META_POLYOBJ);
+ return 1;
+}
+
+static int lib_getPolyObject(lua_State *L)
+{
+ const char *field;
+ INT32 i;
+
+ // find PolyObject by number
+ if (lua_type(L, 2) == LUA_TNUMBER)
+ {
+ i = luaL_checkinteger(L, 2);
+ if (i < 0 || i >= numPolyObjects)
+ return luaL_error(L, "polyobjects[] index %d out of range (0 - %d)", i, numPolyObjects-1);
+ LUA_PushUserdata(L, &PolyObjects[i], META_POLYOBJ);
+ return 1;
+ }
+
+ field = luaL_checkstring(L, 2);
+ // special function iterate
+ if (fastcmp(field,"iterate"))
+ {
+ lua_pushcfunction(L, lib_iteratePolyObjects);
+ return 1;
+ }
+ // find PolyObject by ID
+ else if (fastcmp(field,"GetForNum")) // name could probably be better
+ {
+ lua_pushcfunction(L, lib_PolyObject_getfornum);
+ return 1;
+ }
+ return 0;
+}
+
+static int lib_numPolyObjects(lua_State *L)
+{
+ lua_pushinteger(L, numPolyObjects);
+ return 1;
+}
+
+int LUA_PolyObjLib(lua_State *L)
+{
+ luaL_newmetatable(L, META_POLYOBJVERTICES);
+ lua_pushcfunction(L, polyobjvertices_get);
+ lua_setfield(L, -2, "__index");
+
+ lua_pushcfunction(L, polyobjvertices_num);
+ lua_setfield(L, -2, "__len");
+ lua_pop(L, 1);
+
+ luaL_newmetatable(L, META_POLYOBJLINES);
+ lua_pushcfunction(L, polyobjlines_get);
+ lua_setfield(L, -2, "__index");
+
+ lua_pushcfunction(L, polyobjlines_num);
+ lua_setfield(L, -2, "__len");
+ lua_pop(L, 1);
+
+ luaL_newmetatable(L, META_POLYOBJ);
+ lua_pushcfunction(L, polyobj_get);
+ lua_setfield(L, -2, "__index");
+
+ lua_pushcfunction(L, polyobj_set);
+ lua_setfield(L, -2, "__newindex");
+
+ lua_pushcfunction(L, polyobj_num);
+ lua_setfield(L, -2, "__len");
+ lua_pop(L,1);
+
+ lua_newuserdata(L, 0);
+ lua_createtable(L, 0, 2);
+ lua_pushcfunction(L, lib_getPolyObject);
+ lua_setfield(L, -2, "__index");
+
+ lua_pushcfunction(L, lib_numPolyObjects);
+ lua_setfield(L, -2, "__len");
+ lua_setmetatable(L, -2);
+ lua_setglobal(L, "polyobjects");
+ return 0;
+}
diff --git a/src/lua_script.c b/src/lua_script.c
index 0260f018ab73c15c86487bbfb60082e65089d375..9f84328329485dac3df433b96403226b51b4535c 100644
--- a/src/lua_script.c
+++ b/src/lua_script.c
@@ -13,6 +13,7 @@
#include "doomdef.h"
#include "fastcmp.h"
#include "dehacked.h"
+#include "deh_lua.h"
#include "z_zone.h"
#include "w_wad.h"
#include "p_setup.h"
@@ -24,6 +25,7 @@
#include "p_saveg.h"
#include "p_local.h"
#include "p_slopes.h" // for P_SlopeById
+#include "p_polyobj.h" // polyobj_t, PolyObjects
#ifdef LUA_ALLOW_BYTECODE
#include "d_netfil.h" // for LUA_DumpFile
#endif
@@ -33,6 +35,7 @@
#include "lua_hook.h"
#include "doomstat.h"
+#include "g_state.h"
lua_State *gL = NULL;
@@ -50,6 +53,8 @@ static lua_CFunction liblist[] = {
LUA_SkinLib, // skin_t, skins[]
LUA_ThinkerLib, // thinker_t
LUA_MapLib, // line_t, side_t, sector_t, subsector_t
+ LUA_TagLib, // tags
+ LUA_PolyObjLib, // polyobj_t
LUA_BlockmapLib, // blockmap stuff
LUA_HudLib, // HUD stuff
NULL
@@ -130,6 +135,19 @@ int LUA_GetErrorMessage(lua_State *L)
return 1;
}
+int LUA_Call(lua_State *L, int nargs, int nresults, int errorhandlerindex)
+{
+ int err = lua_pcall(L, nargs, nresults, errorhandlerindex);
+
+ if (err)
+ {
+ CONS_Alert(CONS_WARNING, "%s\n", lua_tostring(L, -1));
+ lua_pop(L, 1);
+ }
+
+ return err;
+}
+
// Moved here from lib_getenum.
int LUA_PushGlobals(lua_State *L, const char *word)
{
@@ -315,7 +333,7 @@ int LUA_PushGlobals(lua_State *L, const char *word)
return 1;
// local player variables, by popular request
} else if (fastcmp(word,"consoleplayer")) { // player controlling console (aka local player 1)
- if (consoleplayer < 0 || !playeringame[consoleplayer])
+ if (!addedtogame || consoleplayer < 0 || !playeringame[consoleplayer])
return 0;
LUA_PushUserdata(L, &players[consoleplayer], META_PLAYER);
return 1;
@@ -359,6 +377,9 @@ int LUA_PushGlobals(lua_State *L, const char *word)
} else if (fastcmp(word, "token")) {
lua_pushinteger(L, token);
return 1;
+ } else if (fastcmp(word, "gamestate")) {
+ lua_pushinteger(L, gamestate);
+ return 1;
}
return 0;
}
@@ -370,6 +391,44 @@ int LUA_CheckGlobals(lua_State *L, const char *word)
redscore = (UINT32)luaL_checkinteger(L, 2);
else if (fastcmp(word, "bluescore"))
bluescore = (UINT32)luaL_checkinteger(L, 2);
+ else if (fastcmp(word, "skincolor_redteam"))
+ skincolor_redteam = (UINT16)luaL_checkinteger(L, 2);
+ else if (fastcmp(word, "skincolor_blueteam"))
+ skincolor_blueteam = (UINT16)luaL_checkinteger(L, 2);
+ else if (fastcmp(word, "skincolor_redring"))
+ skincolor_redring = (UINT16)luaL_checkinteger(L, 2);
+ else if (fastcmp(word, "skincolor_bluering"))
+ skincolor_bluering = (UINT16)luaL_checkinteger(L, 2);
+ else if (fastcmp(word, "emeralds"))
+ emeralds = (UINT16)luaL_checkinteger(L, 2);
+ else if (fastcmp(word, "token"))
+ token = (UINT32)luaL_checkinteger(L, 2);
+ else if (fastcmp(word, "gravity"))
+ gravity = (fixed_t)luaL_checkinteger(L, 2);
+ else if (fastcmp(word, "stoppedclock"))
+ stoppedclock = luaL_checkboolean(L, 2);
+ else if (fastcmp(word, "displayplayer"))
+ {
+ player_t *player = *((player_t **)luaL_checkudata(L, 2, META_PLAYER));
+
+ if (player)
+ displayplayer = player - players;
+ }
+ else if (fastcmp(word, "mapmusname"))
+ {
+ size_t strlength;
+ const char *str = luaL_checklstring(L, 2, &strlength);
+
+ if (strlength > 6)
+ return luaL_error(L, "string length out of range (maximum 6 characters)");
+
+ if (strlen(str) < strlength)
+ return luaL_error(L, "string must not contain embedded zeros!");
+
+ strncpy(mapmusname, str, strlength);
+ }
+ else if (fastcmp(word, "mapmusflags"))
+ mapmusflags = (UINT16)luaL_checkinteger(L, 2);
else
return 0;
@@ -382,6 +441,7 @@ static int setglobals(lua_State *L)
{
const char *csname;
char *name;
+ enum actionnum actionnum;
lua_remove(L, 1); // we're not gonna be using _G
csname = lua_tostring(L, 1);
@@ -400,6 +460,10 @@ static int setglobals(lua_State *L)
lua_rawset(L, -3); // rawset doesn't trigger this metatable again.
// otherwise we would've used setfield, obviously.
+ actionnum = LUA_GetActionNumByName(name);
+ if (actionnum < NUMACTIONS)
+ actionsoverridden[actionnum] = true;
+
Z_Free(name);
return 0;
}
@@ -431,12 +495,16 @@ static void LUA_ClearState(void)
// open base libraries
luaL_openlibs(L);
- lua_pop(L, -1);
+ lua_settop(L, 0);
// make LREG_VALID table for all pushed userdata cache.
lua_newtable(L);
lua_setfield(L, LUA_REGISTRYINDEX, LREG_VALID);
+ // make LREG_METATABLES table for all registered metatables
+ lua_newtable(L);
+ lua_setfield(L, LUA_REGISTRYINDEX, LREG_METATABLES);
+
// open srb2 libraries
for(i = 0; liblist[i]; i++) {
lua_pushcfunction(L, liblist[i]);
@@ -630,7 +698,7 @@ fixed_t LUA_EvalMath(const char *word)
*b = '\0';
// eval string.
- lua_pop(L, -1);
+ lua_settop(L, 0);
if (luaL_dostring(L, buf))
{
p = lua_tostring(L, -1);
@@ -646,51 +714,42 @@ fixed_t LUA_EvalMath(const char *word)
return res;
}
-/*
-LUA_PushUserdata but no userdata is created.
-You can't invalidate it therefore.
-*/
-
-void LUA_PushLightUserdata (lua_State *L, void *data, const char *meta)
+// Takes a pointer, any pointer, and a metatable name
+// Creates a userdata for that pointer with the given metatable
+// Pushes it to the stack and stores it in the registry.
+void LUA_PushUserdata(lua_State *L, void *data, const char *meta)
{
- if (data)
+ if (LUA_RawPushUserdata(L, data) == LPUSHED_NEW)
{
- lua_pushlightuserdata(L, data);
luaL_getmetatable(L, meta);
- /*
- The metatable is the last value on the stack, so this
- applies it to the second value, which is the userdata.
- */
lua_setmetatable(L, -2);
}
- else
- lua_pushnil(L);
}
-// Takes a pointer, any pointer, and a metatable name
-// Creates a userdata for that pointer with the given metatable
-// Pushes it to the stack and stores it in the registry.
-void LUA_PushUserdata(lua_State *L, void *data, const char *meta)
+// Same as LUA_PushUserdata but don't set a metatable yet.
+lpushed_t LUA_RawPushUserdata(lua_State *L, void *data)
{
+ lpushed_t status = LPUSHED_NIL;
+
void **userdata;
if (!data) { // push a NULL
lua_pushnil(L);
- return;
+ return status;
}
lua_getfield(L, LUA_REGISTRYINDEX, LREG_VALID);
I_Assert(lua_istable(L, -1));
+
lua_pushlightuserdata(L, data);
lua_rawget(L, -2);
+
if (lua_isnil(L, -1)) { // no userdata? deary me, we'll have to make one.
lua_pop(L, 1); // pop the nil
// create the userdata
userdata = lua_newuserdata(L, sizeof(void *));
*userdata = data;
- luaL_getmetatable(L, meta);
- lua_setmetatable(L, -2);
// Set it in the registry so we can find it again
lua_pushlightuserdata(L, data); // k (store the userdata via the data's pointer)
@@ -698,8 +757,15 @@ void LUA_PushUserdata(lua_State *L, void *data, const char *meta)
lua_rawset(L, -4);
// stack is left with the userdata on top, as if getting it had originally succeeded.
+
+ status = LPUSHED_NEW;
}
+ else
+ status = LPUSHED_EXISTING;
+
lua_remove(L, -2); // remove LREG_VALID
+
+ return status;
}
// When userdata is freed, use this function to remove it from Lua.
@@ -759,6 +825,7 @@ void LUA_InvalidateLevel(void)
{
LUA_InvalidateUserdata(§ors[i]);
LUA_InvalidateUserdata(§ors[i].lines);
+ LUA_InvalidateUserdata(§ors[i].tags);
if (sectors[i].ffloors)
{
for (rover = sectors[i].ffloors; rover; rover = rover->next)
@@ -768,12 +835,19 @@ void LUA_InvalidateLevel(void)
for (i = 0; i < numlines; i++)
{
LUA_InvalidateUserdata(&lines[i]);
+ LUA_InvalidateUserdata(&lines[i].tags);
LUA_InvalidateUserdata(lines[i].sidenum);
}
for (i = 0; i < numsides; i++)
LUA_InvalidateUserdata(&sides[i]);
for (i = 0; i < numvertexes; i++)
LUA_InvalidateUserdata(&vertexes[i]);
+ for (i = 0; i < (size_t)numPolyObjects; i++)
+ {
+ LUA_InvalidateUserdata(&PolyObjects[i]);
+ LUA_InvalidateUserdata(&PolyObjects[i].vertices);
+ LUA_InvalidateUserdata(&PolyObjects[i].lines);
+ }
#ifdef HAVE_LUA_SEGS
for (i = 0; i < numsegs; i++)
LUA_InvalidateUserdata(&segs[i]);
@@ -793,7 +867,10 @@ void LUA_InvalidateMapthings(void)
return;
for (i = 0; i < nummapthings; i++)
+ {
LUA_InvalidateUserdata(&mapthings[i]);
+ LUA_InvalidateUserdata(&mapthings[i].tags);
+ }
}
void LUA_InvalidatePlayer(player_t *player)
@@ -832,6 +909,7 @@ enum
ARCH_NODE,
#endif
ARCH_FFLOOR,
+ ARCH_POLYOBJ,
ARCH_SLOPE,
ARCH_MAPHEADER,
ARCH_SKINCOLOR,
@@ -858,6 +936,7 @@ static const struct {
{META_NODE, ARCH_NODE},
#endif
{META_FFLOOR, ARCH_FFLOOR},
+ {META_POLYOBJ, ARCH_POLYOBJ},
{META_SLOPE, ARCH_SLOPE},
{META_MAPHEADER, ARCH_MAPHEADER},
{META_SKINCOLOR, ARCH_SKINCOLOR},
@@ -966,8 +1045,17 @@ static UINT8 ArchiveValue(int TABLESINDEX, int myindex)
lua_pop(gL, 1);
}
if (!found)
+ {
t++;
+ if (t == 0)
+ {
+ CONS_Alert(CONS_ERROR, "Too many tables to archive!\n");
+ WRITEUINT8(save_p, ARCH_NULL);
+ return 0;
+ }
+ }
+
WRITEUINT8(save_p, ARCH_TABLE);
WRITEUINT16(save_p, t);
@@ -1126,6 +1214,17 @@ static UINT8 ArchiveValue(int TABLESINDEX, int myindex)
}
break;
}
+ case ARCH_POLYOBJ:
+ {
+ polyobj_t *polyobj = *((polyobj_t **)lua_touserdata(gL, myindex));
+ if (!polyobj)
+ WRITEUINT8(save_p, ARCH_NULL);
+ else {
+ WRITEUINT8(save_p, ARCH_POLYOBJ);
+ WRITEUINT16(save_p, polyobj-PolyObjects);
+ }
+ break;
+ }
case ARCH_SLOPE:
{
pslope_t *slope = *((pslope_t **)lua_touserdata(gL, myindex));
@@ -1269,8 +1368,22 @@ static void ArchiveTables(void)
lua_pop(gL, 1);
}
- lua_pop(gL, 1);
WRITEUINT8(save_p, ARCH_TEND);
+
+ // Write metatable ID
+ if (lua_getmetatable(gL, -1))
+ {
+ // registry.metatables[metatable]
+ lua_getfield(gL, LUA_REGISTRYINDEX, LREG_METATABLES);
+ lua_pushvalue(gL, -2);
+ lua_gettable(gL, -2);
+ WRITEUINT16(save_p, lua_isnil(gL, -1) ? 0 : lua_tointeger(gL, -1));
+ lua_pop(gL, 3);
+ }
+ else
+ WRITEUINT16(save_p, 0);
+
+ lua_pop(gL, 1);
}
}
@@ -1381,6 +1494,9 @@ static UINT8 UnArchiveValue(int TABLESINDEX)
LUA_PushUserdata(gL, rover, META_FFLOOR);
break;
}
+ case ARCH_POLYOBJ:
+ LUA_PushUserdata(gL, &PolyObjects[READUINT16(save_p)], META_POLYOBJ);
+ break;
case ARCH_SLOPE:
LUA_PushUserdata(gL, P_SlopeById(READUINT16(save_p)), META_SLOPE);
break;
@@ -1438,6 +1554,7 @@ static void UnArchiveTables(void)
{
int TABLESINDEX;
UINT16 i, n;
+ UINT16 metatableid;
if (!gL)
return;
@@ -1462,6 +1579,19 @@ static void UnArchiveTables(void)
else
lua_rawset(gL, -3);
}
+
+ metatableid = READUINT16(save_p);
+ if (metatableid)
+ {
+ // setmetatable(table, registry.metatables[metatableid])
+ lua_getfield(gL, LUA_REGISTRYINDEX, LREG_METATABLES);
+ lua_rawgeti(gL, -1, metatableid);
+ if (lua_isnil(gL, -1))
+ I_Error("Unknown metatable ID %d\n", metatableid);
+ lua_setmetatable(gL, -3);
+ lua_pop(gL, 1);
+ }
+
lua_pop(gL, 1);
}
}
@@ -1555,3 +1685,36 @@ int Lua_optoption(lua_State *L, int narg,
return i;
return -1;
}
+
+void LUA_PushTaggableObjectArray
+( lua_State *L,
+ const char *field,
+ lua_CFunction iterator,
+ lua_CFunction indexer,
+ lua_CFunction counter,
+ taggroup_t *garray[],
+ size_t * max_elements,
+ void * element_array,
+ size_t sizeof_element,
+ const char *meta)
+{
+ lua_newuserdata(L, 0);
+ lua_createtable(L, 0, 2);
+ lua_createtable(L, 0, 2);
+ lua_pushcfunction(L, iterator);
+ lua_setfield(L, -2, "iterate");
+
+ LUA_InsertTaggroupIterator(L, garray,
+ max_elements, element_array, sizeof_element, meta);
+
+ lua_createtable(L, 0, 1);
+ lua_pushcfunction(L, indexer);
+ lua_setfield(L, -2, "__index");
+ lua_setmetatable(L, -2);
+ lua_setfield(L, -2, "__index");
+
+ lua_pushcfunction(L, counter);
+ lua_setfield(L, -2, "__len");
+ lua_setmetatable(L, -2);
+ lua_setglobal(L, field);
+}
diff --git a/src/lua_script.h b/src/lua_script.h
index 5a3520d11996db85806704f6e88be1d9f8a16f6c..89ba7b6eec329cfe7372a6081a2fa8e615fc1a44 100644
--- a/src/lua_script.h
+++ b/src/lua_script.h
@@ -10,10 +10,14 @@
/// \file lua_script.h
/// \brief Lua scripting basics
+#ifndef LUA_SCRIPT_H
+#define LUA_SCRIPT_H
+
#include "m_fixed.h"
#include "doomtype.h"
#include "d_player.h"
#include "g_state.h"
+#include "taglist.h"
#include "blua/lua.h"
#include "blua/lualib.h"
@@ -40,41 +44,65 @@ void LUA_ClearExtVars(void);
extern INT32 lua_lumploading; // is LUA_LoadLump being called?
int LUA_GetErrorMessage(lua_State *L);
+int LUA_Call(lua_State *L, int nargs, int nresults, int errorhandlerindex);
void LUA_LoadLump(UINT16 wad, UINT16 lump, boolean noresults);
#ifdef LUA_ALLOW_BYTECODE
void LUA_DumpFile(const char *filename);
#endif
fixed_t LUA_EvalMath(const char *word);
-void LUA_PushLightUserdata(lua_State *L, void *data, const char *meta);
-void LUA_PushUserdata(lua_State *L, void *data, const char *meta);
-void LUA_InvalidateUserdata(void *data);
-void LUA_InvalidateLevel(void);
-void LUA_InvalidateMapthings(void);
-void LUA_InvalidatePlayer(player_t *player);
void LUA_Step(void);
void LUA_Archive(void);
void LUA_UnArchive(void);
int LUA_PushGlobals(lua_State *L, const char *word);
int LUA_CheckGlobals(lua_State *L, const char *word);
void Got_Luacmd(UINT8 **cp, INT32 playernum); // lua_consolelib.c
-void LUA_CVarChanged(const char *name); // lua_consolelib.c
+void LUA_CVarChanged(void *cvar); // lua_consolelib.c
int Lua_optoption(lua_State *L, int narg,
const char *def, const char *const lst[]);
void LUAh_NetArchiveHook(lua_CFunction archFunc);
+void LUA_PushTaggableObjectArray
+( lua_State *L,
+ const char *field,
+ lua_CFunction iterator,
+ lua_CFunction indexer,
+ lua_CFunction counter,
+ taggroup_t *garray[],
+ size_t * max_elements,
+ void * element_array,
+ size_t sizeof_element,
+ const char *meta);
+
+void LUA_InsertTaggroupIterator
+( lua_State *L,
+ taggroup_t *garray[],
+ size_t * max_elements,
+ void * element_array,
+ size_t sizeof_element,
+ const char * meta);
+
+typedef enum {
+ LPUSHED_NIL,
+ LPUSHED_NEW,
+ LPUSHED_EXISTING,
+} lpushed_t;
+
+void LUA_PushUserdata(lua_State *L, void *data, const char *meta);
+lpushed_t LUA_RawPushUserdata(lua_State *L, void *data);
+
+void LUA_InvalidateUserdata(void *data);
+
+void LUA_InvalidateLevel(void);
+void LUA_InvalidateMapthings(void);
+void LUA_InvalidatePlayer(player_t *player);
+
// Console wrapper
void COM_Lua_f(void);
-#define LUA_Call(L,a)\
-{\
- if (lua_pcall(L, a, 0, 0)) {\
- CONS_Alert(CONS_WARNING,"%s\n",lua_tostring(L,-1));\
- lua_pop(L, 1);\
- }\
-}
-
#define LUA_ErrInvalid(L, type) luaL_error(L, "accessed " type " doesn't exist anymore, please check 'valid' before using " type ".");
+#define LUA_ErrSetDirectly(L, type, field) luaL_error(L, type " field " LUA_QL(field) " cannot be set directly.")
+
// Deprecation warnings
// Shows once upon use. Then doesn't show again.
#define LUA_Deprecated(L,this_func,use_instead)\
@@ -105,3 +133,5 @@ void COM_Lua_f(void);
#define INLEVEL if (! ISINLEVEL)\
return luaL_error(L, "This can only be used in a level!");
+
+#endif/*LUA_SCRIPT_H*/
diff --git a/src/lua_skinlib.c b/src/lua_skinlib.c
index 3e4ddb9f0806d4debc27867ddbec50eaae66ec1d..7e7480be389741aa9a135e7681ebcf2249c2806b 100644
--- a/src/lua_skinlib.c
+++ b/src/lua_skinlib.c
@@ -21,7 +21,6 @@
enum skin {
skin_valid = 0,
skin_name,
- skin_spritedef,
skin_wadnum,
skin_flags,
skin_realname,
@@ -54,12 +53,12 @@ enum skin {
skin_contspeed,
skin_contangle,
skin_soundsid,
- skin_availability
+ skin_availability,
+ skin_sprites
};
static const char *const skin_opt[] = {
"valid",
"name",
- "spritedef",
"wadnum",
"flags",
"realname",
@@ -93,6 +92,7 @@ static const char *const skin_opt[] = {
"contangle",
"soundsid",
"availability",
+ "sprites",
NULL};
#define UNIMPLEMENTED luaL_error(L, LUA_QL("skin_t") " field " LUA_QS " is not implemented for Lua and cannot be accessed.", skin_opt[field])
@@ -113,8 +113,6 @@ static int skin_get(lua_State *L)
case skin_name:
lua_pushstring(L, skin->name);
break;
- case skin_spritedef:
- return UNIMPLEMENTED;
case skin_wadnum:
// !!WARNING!! May differ between clients due to music wads, therefore NOT NETWORK SAFE
return UNIMPLEMENTED;
@@ -214,6 +212,9 @@ static int skin_get(lua_State *L)
case skin_availability:
lua_pushinteger(L, skin->availability);
break;
+ case skin_sprites:
+ LUA_PushUserdata(L, skin->sprites, META_SKINSPRITES);
+ break;
}
return 1;
}
@@ -324,6 +325,49 @@ static int soundsid_num(lua_State *L)
return 1;
}
+enum spritesopt {
+ numframes = 0
+};
+
+static const char *const sprites_opt[] = {
+ "numframes",
+ NULL};
+
+// skin.sprites[i] -> sprites[i]
+static int lib_getSkinSprite(lua_State *L)
+{
+ spritedef_t *sprites = *(spritedef_t **)luaL_checkudata(L, 1, META_SKINSPRITES);
+ playersprite_t i = luaL_checkinteger(L, 2);
+
+ if (i < 0 || i >= NUMPLAYERSPRITES*2)
+ return luaL_error(L, LUA_QL("skin_t") " field 'sprites' index %d out of range (0 - %d)", i, (NUMPLAYERSPRITES*2)-1);
+
+ LUA_PushUserdata(L, &sprites[i], META_SKINSPRITESLIST);
+ return 1;
+}
+
+// #skin.sprites -> NUMPLAYERSPRITES*2
+static int lib_numSkinsSprites(lua_State *L)
+{
+ lua_pushinteger(L, NUMPLAYERSPRITES*2);
+ return 1;
+}
+
+static int sprite_get(lua_State *L)
+{
+ spritedef_t *sprite = *(spritedef_t **)luaL_checkudata(L, 1, META_SKINSPRITESLIST);
+ enum spritesopt field = luaL_checkoption(L, 2, NULL, sprites_opt);
+
+ switch (field)
+ {
+ case numframes:
+ lua_pushinteger(L, sprite->numframes);
+ break;
+ }
+ return 1;
+}
+
+
int LUA_SkinLib(lua_State *L)
{
luaL_newmetatable(L, META_SKIN);
@@ -345,6 +389,19 @@ int LUA_SkinLib(lua_State *L)
lua_setfield(L, -2, "__len");
lua_pop(L,1);
+ luaL_newmetatable(L, META_SKINSPRITES);
+ lua_pushcfunction(L, lib_getSkinSprite);
+ lua_setfield(L, -2, "__index");
+
+ lua_pushcfunction(L, lib_numSkinsSprites);
+ lua_setfield(L, -2, "__len");
+ lua_pop(L,1);
+
+ luaL_newmetatable(L, META_SKINSPRITESLIST);
+ lua_pushcfunction(L, sprite_get);
+ lua_setfield(L, -2, "__index");
+ lua_pop(L,1);
+
lua_newuserdata(L, 0);
lua_createtable(L, 0, 2);
lua_pushcfunction(L, lib_getSkin);
diff --git a/src/lua_taglib.c b/src/lua_taglib.c
new file mode 100644
index 0000000000000000000000000000000000000000..c9f320fe8f230524b0b42b10b04022b8d79a5d10
--- /dev/null
+++ b/src/lua_taglib.c
@@ -0,0 +1,451 @@
+// SONIC ROBO BLAST 2
+//-----------------------------------------------------------------------------
+// Copyright (C) 2020 by James R.
+// Copyright (C) 2020 by Sonic Team Junior.
+//
+// This program is free software distributed under the
+// terms of the GNU General Public License, version 2.
+// See the 'LICENSE' file for more details.
+//-----------------------------------------------------------------------------
+/// \file lua_taglib.c
+/// \brief tag list iterator for Lua scripting
+
+#include "doomdef.h"
+#include "taglist.h"
+#include "r_state.h"
+
+#include "lua_script.h"
+#include "lua_libs.h"
+
+#ifdef MUTABLE_TAGS
+#include "z_zone.h"
+#endif
+
+static int tag_iterator(lua_State *L)
+{
+ INT32 tag = lua_isnil(L, 2) ? -1 : lua_tonumber(L, 2);
+ do
+ {
+ if (++tag >= MAXTAGS)
+ return 0;
+ }
+ while (! in_bit_array(tags_available, tag)) ;
+ lua_pushnumber(L, tag);
+ return 1;
+}
+
+enum {
+#define UPVALUE lua_upvalueindex
+ up_garray = UPVALUE(1),
+ up_max_elements = UPVALUE(2),
+ up_element_array = UPVALUE(3),
+ up_sizeof_element = UPVALUE(4),
+ up_meta = UPVALUE(5),
+#undef UPVALUE
+};
+
+static INT32 next_element(lua_State *L, const mtag_t tag, const size_t p)
+{
+ taggroup_t ** garray = lua_touserdata(L, up_garray);
+ const size_t * max_elements = lua_touserdata(L, up_max_elements);
+ return Taggroup_Iterate(garray, *max_elements, tag, p);
+}
+
+static void push_element(lua_State *L, void *element)
+{
+ if (LUA_RawPushUserdata(L, element) == LPUSHED_NEW)
+ {
+ lua_pushvalue(L, up_meta);
+ lua_setmetatable(L, -2);
+ }
+}
+
+static void push_next_element(lua_State *L, const INT32 element)
+{
+ char * element_array = *(char **)lua_touserdata(L, up_element_array);
+ const size_t sizeof_element = lua_tonumber(L, up_sizeof_element);
+ push_element(L, &element_array[element * sizeof_element]);
+}
+
+struct element_iterator_state {
+ mtag_t tag;
+ size_t p;
+};
+
+static int element_iterator(lua_State *L)
+{
+ struct element_iterator_state * state = lua_touserdata(L, 1);
+ if (lua_isnoneornil(L, 3))
+ state->p = 0;
+ lua_pushnumber(L, ++state->p);
+ lua_gettable(L, 1);
+ return 1;
+}
+
+static int lib_iterateTags(lua_State *L)
+{
+ if (lua_gettop(L) < 2)
+ {
+ lua_pushcfunction(L, tag_iterator);
+ return 1;
+ }
+ else
+ return tag_iterator(L);
+}
+
+static int lib_numTags(lua_State *L)
+{
+ lua_pushnumber(L, num_tags);
+ return 1;
+}
+
+static int lib_getTaggroup(lua_State *L)
+{
+ struct element_iterator_state *state;
+
+ mtag_t tag;
+
+ if (lua_gettop(L) > 1)
+ return luaL_error(L, "too many arguments");
+
+ if (lua_isnoneornil(L, 1))
+ {
+ tag = MTAG_GLOBAL;
+ }
+ else
+ {
+ tag = lua_tonumber(L, 1);
+ luaL_argcheck(L, tag >= -1, 1, "tag out of range");
+ }
+
+ state = lua_newuserdata(L, sizeof *state);
+ state->tag = tag;
+ state->p = 0;
+
+ lua_pushvalue(L, lua_upvalueindex(1));
+ lua_setmetatable(L, -2);
+
+ return 1;
+}
+
+static int lib_getTaggroupElement(lua_State *L)
+{
+ const size_t p = luaL_checknumber(L, 2) - 1;
+ const mtag_t tag = *(mtag_t *)lua_touserdata(L, 1);
+ const INT32 element = next_element(L, tag, p);
+
+ if (element == -1)
+ return 0;
+ else
+ {
+ push_next_element(L, element);
+ return 1;
+ }
+}
+
+static int lib_numTaggroupElements(lua_State *L)
+{
+ const mtag_t tag = *(mtag_t *)lua_touserdata(L, 1);
+ if (tag == MTAG_GLOBAL)
+ lua_pushnumber(L, *(size_t *)lua_touserdata(L, up_max_elements));
+ else
+ {
+ const taggroup_t ** garray = lua_touserdata(L, up_garray);
+ lua_pushnumber(L, Taggroup_Count(garray[tag]));
+ }
+ return 1;
+}
+
+#ifdef MUTABLE_TAGS
+static int meta_ref[2];
+#endif
+
+static int has_valid_field(lua_State *L)
+{
+ int equal;
+ lua_rawgeti(L, LUA_ENVIRONINDEX, 1);
+ equal = lua_rawequal(L, 2, -1);
+ lua_pop(L, 1);
+ return equal;
+}
+
+static taglist_t * valid_taglist(lua_State *L, int idx, boolean getting)
+{
+ taglist_t *list = *(taglist_t **)lua_touserdata(L, idx);
+
+ if (list == NULL)
+ {
+ if (getting && has_valid_field(L))
+ lua_pushboolean(L, 0);
+ else
+ LUA_ErrInvalid(L, "taglist");/* doesn't actually return */
+ return NULL;
+ }
+ else
+ return list;
+}
+
+static taglist_t * check_taglist(lua_State *L, int idx)
+{
+ if (lua_isuserdata(L, idx) && lua_getmetatable(L, idx))
+ {
+ lua_getref(L, meta_ref[0]);
+ lua_getref(L, meta_ref[1]);
+
+ if (lua_rawequal(L, -3, -2) || lua_rawequal(L, -3, -1))
+ {
+ lua_pop(L, 3);
+ return valid_taglist(L, idx, false);
+ }
+ }
+
+ return luaL_argerror(L, idx, "must be a tag list"), NULL;
+}
+
+static int taglist_get(lua_State *L)
+{
+ const taglist_t *list = valid_taglist(L, 1, true);
+
+ if (list == NULL)/* valid check */
+ return 1;
+
+ if (lua_isnumber(L, 2))
+ {
+ const size_t i = lua_tonumber(L, 2);
+
+ if (list && i <= list->count)
+ {
+ lua_pushnumber(L, list->tags[i - 1]);
+ return 1;
+ }
+ else
+ return 0;
+ }
+ else if (has_valid_field(L))
+ {
+ lua_pushboolean(L, 1);
+ return 1;
+ }
+ else
+ {
+ lua_getmetatable(L, 1);
+ lua_replace(L, 1);
+ lua_rawget(L, 1);
+ return 1;
+ }
+}
+
+static int taglist_len(lua_State *L)
+{
+ const taglist_t *list = valid_taglist(L, 1, false);
+ lua_pushnumber(L, list->count);
+ return 1;
+}
+
+static int taglist_equal(lua_State *L)
+{
+ const taglist_t *lhs = check_taglist(L, 1);
+ const taglist_t *rhs = check_taglist(L, 2);
+ lua_pushboolean(L, Tag_Compare(lhs, rhs));
+ return 1;
+}
+
+static int taglist_iterator(lua_State *L)
+{
+ const taglist_t *list = valid_taglist(L, 1, false);
+ const size_t i = 1 + lua_tonumber(L, lua_upvalueindex(1));
+ if (i <= list->count)
+ {
+ lua_pushnumber(L, list->tags[i - 1]);
+ /* watch me exploit an upvalue as a control because
+ I want to use the control as the value */
+ lua_pushnumber(L, i);
+ lua_replace(L, lua_upvalueindex(1));
+ return 1;
+ }
+ else
+ return 0;
+}
+
+static int taglist_iterate(lua_State *L)
+{
+ check_taglist(L, 1);
+ lua_pushnumber(L, 0);
+ lua_pushcclosure(L, taglist_iterator, 1);
+ lua_pushvalue(L, 1);
+ return 2;
+}
+
+static int taglist_find(lua_State *L)
+{
+ const taglist_t *list = check_taglist(L, 1);
+ const mtag_t tag = luaL_checknumber(L, 2);
+ lua_pushboolean(L, Tag_Find(list, tag));
+ return 1;
+}
+
+static int taglist_shares(lua_State *L)
+{
+ const taglist_t *lhs = check_taglist(L, 1);
+ const taglist_t *rhs = check_taglist(L, 2);
+ lua_pushboolean(L, Tag_Share(lhs, rhs));
+ return 1;
+}
+
+/* only sector tags are mutable... */
+
+#ifdef MUTABLE_TAGS
+static size_t sector_of_taglist(taglist_t *list)
+{
+ return (sector_t *)((char *)list - offsetof (sector_t, tags)) - sectors;
+}
+
+static int this_taglist(lua_State *L)
+{
+ lua_settop(L, 1);
+ return 1;
+}
+
+static int taglist_add(lua_State *L)
+{
+ taglist_t *list = *(taglist_t **)luaL_checkudata(L, 1, META_SECTORTAGLIST);
+ const mtag_t tag = luaL_checknumber(L, 2);
+
+ if (! Tag_Find(list, tag))
+ {
+ Taggroup_Add(tags_sectors, tag, sector_of_taglist(list));
+ Tag_Add(list, tag);
+ }
+
+ return this_taglist(L);
+}
+
+static int taglist_remove(lua_State *L)
+{
+ taglist_t *list = *(taglist_t **)luaL_checkudata(L, 1, META_SECTORTAGLIST);
+ const mtag_t tag = luaL_checknumber(L, 2);
+
+ size_t i;
+
+ for (i = 0; i < list->count; ++i)
+ {
+ if (list->tags[i] == tag)
+ {
+ if (list->count > 1)
+ {
+ memmove(&list->tags[i], &list->tags[i + 1],
+ (list->count - 1 - i) * sizeof (mtag_t));
+ list->tags = Z_Realloc(list->tags,
+ (--list->count) * sizeof (mtag_t), PU_LEVEL, NULL);
+ Taggroup_Remove(tags_sectors, tag, sector_of_taglist(list));
+ }
+ else/* reset to default tag */
+ Tag_SectorFSet(sector_of_taglist(list), 0);
+ break;
+ }
+ }
+
+ return this_taglist(L);
+}
+#endif/*MUTABLE_TAGS*/
+
+void LUA_InsertTaggroupIterator
+( lua_State *L,
+ taggroup_t *garray[],
+ size_t * max_elements,
+ void * element_array,
+ size_t sizeof_element,
+ const char * meta)
+{
+ lua_createtable(L, 0, 3);
+ lua_pushlightuserdata(L, garray);
+ lua_pushlightuserdata(L, max_elements);
+
+ lua_pushvalue(L, -2);
+ lua_pushvalue(L, -2);
+ lua_pushlightuserdata(L, element_array);
+ lua_pushnumber(L, sizeof_element);
+ luaL_getmetatable(L, meta);
+ lua_pushcclosure(L, lib_getTaggroupElement, 5);
+ lua_setfield(L, -4, "__index");
+
+ lua_pushcclosure(L, lib_numTaggroupElements, 2);
+ lua_setfield(L, -2, "__len");
+
+ lua_pushcfunction(L, element_iterator);
+ lua_setfield(L, -2, "__call");
+ lua_pushcclosure(L, lib_getTaggroup, 1);
+ lua_setfield(L, -2, "tagged");
+}
+
+static luaL_Reg taglist_lib[] = {
+ {"iterate", taglist_iterate},
+ {"find", taglist_find},
+ {"shares", taglist_shares},
+#ifdef MUTABLE_TAGS
+ {"add", taglist_add},
+ {"remove", taglist_remove},
+#endif
+ {0}
+};
+
+static void open_taglist(lua_State *L)
+{
+ luaL_register(L, "taglist", taglist_lib);
+
+ lua_getfield(L, -1, "find");
+ lua_setfield(L, -2, "has");
+}
+
+#define new_literal(L, s) \
+ (lua_pushliteral(L, s), luaL_ref(L, -2))
+
+#ifdef MUTABLE_TAGS
+static int
+#else
+static void
+#endif
+set_taglist_metatable(lua_State *L, const char *meta)
+{
+ luaL_newmetatable(L, meta);
+ lua_pushcfunction(L, taglist_get);
+ lua_createtable(L, 0, 1);
+ new_literal(L, "valid");
+ lua_setfenv(L, -2);
+ lua_setfield(L, -2, "__index");
+
+ lua_pushcfunction(L, taglist_len);
+ lua_setfield(L, -2, "__len");
+
+ lua_pushcfunction(L, taglist_equal);
+ lua_setfield(L, -2, "__eq");
+#ifdef MUTABLE_TAGS
+ return luaL_ref(L, LUA_REGISTRYINDEX);
+#endif
+}
+
+int LUA_TagLib(lua_State *L)
+{
+ lua_newuserdata(L, 0);
+ lua_createtable(L, 0, 2);
+ lua_createtable(L, 0, 1);
+ lua_pushcfunction(L, lib_iterateTags);
+ lua_setfield(L, -2, "iterate");
+ lua_setfield(L, -2, "__index");
+
+ lua_pushcfunction(L, lib_numTags);
+ lua_setfield(L, -2, "__len");
+ lua_setmetatable(L, -2);
+ lua_setglobal(L, "tags");
+
+ open_taglist(L);
+
+#ifdef MUTABLE_TAGS
+ meta_ref[0] = set_taglist_metatable(L, META_TAGLIST);
+ meta_ref[1] = set_taglist_metatable(L, META_SECTORTAGLIST);
+#else
+ set_taglist_metatable(L, META_TAGLIST);
+#endif
+
+ return 0;
+}
diff --git a/src/m_anigif.c b/src/m_anigif.c
index 7c2bb359e081645e6ded76ec1a0f2b4b140f60e2..41f99254eff59fea3d80f7592168723d9de7a975 100644
--- a/src/m_anigif.c
+++ b/src/m_anigif.c
@@ -18,7 +18,7 @@
#include "z_zone.h"
#include "v_video.h"
#include "i_video.h"
-#include "i_system.h" // I_GetTimeMicros
+#include "i_system.h" // I_GetPreciseTime
#include "m_misc.h"
#include "st_stuff.h" // st_palette
@@ -29,15 +29,21 @@
// GIFs are always little-endian
#include "byteptr.h"
-consvar_t cv_gif_optimize = {"gif_optimize", "On", CV_SAVE, CV_OnOff, NULL, 0, NULL, NULL, 0, 0, NULL};
-consvar_t cv_gif_downscale = {"gif_downscale", "On", CV_SAVE, CV_OnOff, NULL, 0, NULL, NULL, 0, 0, NULL};
-consvar_t cv_gif_dynamicdelay = {"gif_dynamicdelay", "On", CV_SAVE, CV_OnOff, NULL, 0, NULL, NULL, 0, 0, NULL};
-consvar_t cv_gif_localcolortable = {"gif_localcolortable", "On", CV_SAVE, CV_OnOff, NULL, 0, NULL, NULL, 0, 0, NULL};
+CV_PossibleValue_t gif_dynamicdelay_cons_t[] = {
+ {0, "Off"},
+ {1, "On"},
+ {2, "Accurate, experimental"},
+{0, NULL}};
+
+consvar_t cv_gif_optimize = CVAR_INIT ("gif_optimize", "On", CV_SAVE, CV_OnOff, NULL);
+consvar_t cv_gif_downscale = CVAR_INIT ("gif_downscale", "On", CV_SAVE, CV_OnOff, NULL);
+consvar_t cv_gif_dynamicdelay = CVAR_INIT ("gif_dynamicdelay", "On", CV_SAVE, gif_dynamicdelay_cons_t, NULL);
+consvar_t cv_gif_localcolortable = CVAR_INIT ("gif_localcolortable", "On", CV_SAVE, CV_OnOff, NULL);
#ifdef HAVE_ANIGIF
static boolean gif_optimize = false; // So nobody can do something dumb
static boolean gif_downscale = false; // like changing cvars mid output
-static boolean gif_dynamicdelay = false; // and messing something up
+static UINT8 gif_dynamicdelay = (UINT8)0; // and messing something up
// Palette handling
static boolean gif_localcolortable = false;
@@ -47,7 +53,8 @@ static RGBA_t *gif_framepalette = NULL;
static FILE *gif_out = NULL;
static INT32 gif_frames = 0;
-static UINT32 gif_prevframems = 0;
+static precise_t gif_prevframetime = 0;
+static UINT32 gif_delayus = 0; // "us" is microseconds
static UINT8 gif_writeover = 0;
@@ -507,7 +514,7 @@ static void GIF_rgbconvert(UINT8 *linear, UINT8 *scr)
size_t src = 0, dest = 0;
size_t size = (vid.width * vid.height * 3);
- InitColorLUT(&gif_colorlookup, gif_framepalette, true);
+ InitColorLUT(&gif_colorlookup, (gif_localcolortable) ? gif_framepalette : gif_headerpalette, true);
while (src < size)
{
@@ -594,16 +601,30 @@ static void GIF_framewrite(void)
// screen regions are handled in GIF_lzw
{
- UINT16 delay;
+ UINT16 delay = 0;
INT32 startline;
- if (gif_dynamicdelay) {
+ if (gif_dynamicdelay ==(UINT8) 2)
+ {
// golden's attempt at creating a "dynamic delay"
+ UINT16 mingifdelay = 10; // minimum gif delay in milliseconds (keep at 10 because gifs can't get more precise).
+ gif_delayus += I_PreciseToMicros(I_GetPreciseTime() - gif_prevframetime); // increase delay by how much time was spent between last measurement
+
+ if (gif_delayus/1000 >= mingifdelay) // delay is big enough to be able to effect gif frame delay?
+ {
+ int frames = (gif_delayus/1000) / mingifdelay; // get amount of frames to delay.
+ delay = frames; // set the delay to delay that amount of frames.
+ gif_delayus -= frames*(mingifdelay*1000); // remove frames by the amount of milliseconds they take. don't reset to 0, the microseconds help consistency.
+ }
+ }
+ else if (gif_dynamicdelay ==(UINT8) 1)
+ {
float delayf = ceil(100.0f/NEWTICRATE);
- delay = (UINT16)((I_GetTimeMicros() - gif_prevframems)/10/1000);
- if (delay < (int)(delayf))
- delay = (int)(delayf);
+ delay = (UINT16)I_PreciseToMicros((I_GetPreciseTime() - gif_prevframetime))/10/1000;
+
+ if (delay < (UINT16)(delayf))
+ delay = (UINT16)(delayf);
}
else
{
@@ -690,7 +711,7 @@ static void GIF_framewrite(void)
}
fwrite(gifframe_data, 1, (p - gifframe_data), gif_out);
++gif_frames;
- gif_prevframems = I_GetTimeMicros();
+ gif_prevframetime = I_GetPreciseTime();
}
@@ -711,14 +732,15 @@ INT32 GIF_open(const char *filename)
gif_optimize = (!!cv_gif_optimize.value);
gif_downscale = (!!cv_gif_downscale.value);
- gif_dynamicdelay = (!!cv_gif_dynamicdelay.value);
+ gif_dynamicdelay = (UINT8)cv_gif_dynamicdelay.value;
gif_localcolortable = (!!cv_gif_localcolortable.value);
gif_colorprofile = (!!cv_screenshot_colorprofile.value);
gif_headerpalette = GIF_getpalette(0);
GIF_headwrite();
gif_frames = 0;
- gif_prevframems = I_GetTimeMicros();
+ gif_prevframetime = I_GetPreciseTime();
+ gif_delayus = 0;
return 1;
}
diff --git a/src/m_cheat.c b/src/m_cheat.c
index a3f6d3daf3eadb239bc32b3fce02662778352095..6e0fb8c5c0784f66be508981aa33d75f9a661d89 100644
--- a/src/m_cheat.c
+++ b/src/m_cheat.c
@@ -967,10 +967,10 @@ static CV_PossibleValue_t op_speed_t[] = {{1, "MIN"}, {128, "MAX"}, {0, NULL}};
static CV_PossibleValue_t op_flags_t[] = {{0, "MIN"}, {15, "MAX"}, {0, NULL}};
static CV_PossibleValue_t op_hoopflags_t[] = {{0, "MIN"}, {15, "MAX"}, {0, NULL}};
-consvar_t cv_mapthingnum = {"op_mapthingnum", "0", CV_NOTINNET, op_mapthing_t, NULL, 0, NULL, NULL, 0, 0, NULL};
-consvar_t cv_speed = {"op_speed", "16", CV_NOTINNET, op_speed_t, NULL, 0, NULL, NULL, 0, 0, NULL};
-consvar_t cv_opflags = {"op_flags", "0", CV_NOTINNET, op_flags_t, NULL, 0, NULL, NULL, 0, 0, NULL};
-consvar_t cv_ophoopflags = {"op_hoopflags", "4", CV_NOTINNET, op_hoopflags_t, NULL, 0, NULL, NULL, 0, 0, NULL};
+consvar_t cv_mapthingnum = CVAR_INIT ("op_mapthingnum", "0", CV_NOTINNET, op_mapthing_t, NULL);
+consvar_t cv_speed = CVAR_INIT ("op_speed", "16", CV_NOTINNET, op_speed_t, NULL);
+consvar_t cv_opflags = CVAR_INIT ("op_flags", "0", CV_NOTINNET, op_flags_t, NULL);
+consvar_t cv_ophoopflags = CVAR_INIT ("op_hoopflags", "4", CV_NOTINNET, op_hoopflags_t, NULL);
boolean objectplacing = false;
mobjtype_t op_currentthing = 0; // For the object placement mode
@@ -1108,7 +1108,6 @@ static mapthing_t *OP_CreateNewMapThing(player_t *player, UINT16 type, boolean c
mt->options = (mt->z << ZSHIFT) | (UINT16)cv_opflags.value;
mt->scale = player->mo->scale;
- mt->tag = 0;
memset(mt->args, 0, NUMMAPTHINGARGS*sizeof(*mt->args));
memset(mt->stringargs, 0x00, NUMMAPTHINGSTRINGARGS*sizeof(*mt->stringargs));
mt->pitch = mt->roll = 0;
@@ -1435,19 +1434,26 @@ void Command_Writethings_f(void)
REQUIRE_SINGLEPLAYER;
REQUIRE_OBJECTPLACE;
- P_WriteThings(W_GetNumForName(G_BuildMapName(gamemap)) + ML_THINGS);
+ P_WriteThings();
}
void Command_ObjectPlace_f(void)
{
+ size_t thingarg;
+ size_t silent;
+
REQUIRE_INLEVEL;
REQUIRE_SINGLEPLAYER;
REQUIRE_NOULTIMATE;
G_SetGameModified(multiplayer);
+ silent = COM_CheckParm("-silent");
+
+ thingarg = 2 - ( silent != 1 );
+
// Entering objectplace?
- if (!objectplacing || COM_Argc() > 1)
+ if (!objectplacing || thingarg < COM_Argc())
{
if (!objectplacing)
{
@@ -1456,7 +1462,7 @@ void Command_ObjectPlace_f(void)
if (players[0].powers[pw_carry] == CR_NIGHTSMODE)
return;
- if (!COM_CheckParm("-silent"))
+ if (! silent)
{
HU_SetCEchoFlags(V_RETURN8|V_MONOSPACE|V_AUTOFADEOUT);
HU_SetCEchoDuration(10);
@@ -1507,9 +1513,9 @@ void Command_ObjectPlace_f(void)
op_oldstate = (statenum_t)(players[0].mo->state-states);
}
- if (COM_Argc() > 1)
+ if (thingarg < COM_Argc())
{
- UINT16 mapthingnum = atoi(COM_Argv(1));
+ UINT16 mapthingnum = atoi(COM_Argv(thingarg));
mobjtype_t type = P_GetMobjtype(mapthingnum);
if (type == MT_UNKNOWN)
CONS_Printf(M_GetText("No mobj type delegated to thing type %d.\n"), mapthingnum);
diff --git a/src/m_menu.c b/src/m_menu.c
index 9c21fbc0000d93d5ed0090a6fd1e3d7c279e08bf..13531f1b8d5c2412369b013e08a3b7eb77936341 100644
--- a/src/m_menu.c
+++ b/src/m_menu.c
@@ -412,23 +412,23 @@ static void Dummymares_OnChange(void);
// CONSOLE VARIABLES AND THEIR POSSIBLE VALUES GO HERE.
// ==========================================================================
-consvar_t cv_showfocuslost = {"showfocuslost", "Yes", CV_SAVE, CV_YesNo, NULL, 0, NULL, NULL, 0, 0, NULL };
+consvar_t cv_showfocuslost = CVAR_INIT ("showfocuslost", "Yes", CV_SAVE, CV_YesNo, NULL);
static CV_PossibleValue_t map_cons_t[] = {
{1,"MIN"},
{NUMMAPS, "MAX"},
{0,NULL}
};
-consvar_t cv_nextmap = {"nextmap", "1", CV_HIDEN|CV_CALL, map_cons_t, Nextmap_OnChange, 0, NULL, NULL, 0, 0, NULL};
+consvar_t cv_nextmap = CVAR_INIT ("nextmap", "1", CV_HIDEN|CV_CALL, map_cons_t, Nextmap_OnChange);
static CV_PossibleValue_t skins_cons_t[MAXSKINS+1] = {{1, DEFAULTSKIN}};
-consvar_t cv_chooseskin = {"chooseskin", DEFAULTSKIN, CV_HIDEN|CV_CALL, skins_cons_t, Nextmap_OnChange, 0, NULL, NULL, 0, 0, NULL};
+consvar_t cv_chooseskin = CVAR_INIT ("chooseskin", DEFAULTSKIN, CV_HIDEN|CV_CALL, skins_cons_t, Nextmap_OnChange);
// This gametype list is integral for many different reasons.
-// When you add gametypes here, don't forget to update them in dehacked.c and doomstat.h!
+// When you add gametypes here, don't forget to update them in deh_tables.c and doomstat.h!
CV_PossibleValue_t gametype_cons_t[NUMGAMETYPES+1];
-consvar_t cv_newgametype = {"newgametype", "Co-op", CV_HIDEN|CV_CALL, gametype_cons_t, Newgametype_OnChange, 0, NULL, NULL, 0, 0, NULL};
+consvar_t cv_newgametype = CVAR_INIT ("newgametype", "Co-op", CV_HIDEN|CV_CALL, gametype_cons_t, Newgametype_OnChange);
static CV_PossibleValue_t serversort_cons_t[] = {
{0,"Ping"},
@@ -439,22 +439,22 @@ static CV_PossibleValue_t serversort_cons_t[] = {
{5,"Gametype"},
{0,NULL}
};
-consvar_t cv_serversort = {"serversort", "Ping", CV_HIDEN | CV_CALL, serversort_cons_t, M_SortServerList, 0, NULL, NULL, 0, 0, NULL};
+consvar_t cv_serversort = CVAR_INIT ("serversort", "Ping", CV_HIDEN | CV_CALL, serversort_cons_t, M_SortServerList);
// first time memory
-consvar_t cv_tutorialprompt = {"tutorialprompt", "On", CV_SAVE, CV_OnOff, NULL, 0, NULL, NULL, 0, 0, NULL};
+consvar_t cv_tutorialprompt = CVAR_INIT ("tutorialprompt", "On", CV_SAVE, CV_OnOff, NULL);
// autorecord demos for time attack
-static consvar_t cv_autorecord = {"autorecord", "Yes", 0, CV_YesNo, NULL, 0, NULL, NULL, 0, 0, NULL};
+static consvar_t cv_autorecord = CVAR_INIT ("autorecord", "Yes", 0, CV_YesNo, NULL);
CV_PossibleValue_t ghost_cons_t[] = {{0, "Hide"}, {1, "Show"}, {2, "Show All"}, {0, NULL}};
CV_PossibleValue_t ghost2_cons_t[] = {{0, "Hide"}, {1, "Show"}, {0, NULL}};
-consvar_t cv_ghost_bestscore = {"ghost_bestscore", "Show", CV_SAVE, ghost_cons_t, NULL, 0, NULL, NULL, 0, 0, NULL};
-consvar_t cv_ghost_besttime = {"ghost_besttime", "Show", CV_SAVE, ghost_cons_t, NULL, 0, NULL, NULL, 0, 0, NULL};
-consvar_t cv_ghost_bestrings = {"ghost_bestrings", "Show", CV_SAVE, ghost_cons_t, NULL, 0, NULL, NULL, 0, 0, NULL};
-consvar_t cv_ghost_last = {"ghost_last", "Show", CV_SAVE, ghost_cons_t, NULL, 0, NULL, NULL, 0, 0, NULL};
-consvar_t cv_ghost_guest = {"ghost_guest", "Show", CV_SAVE, ghost2_cons_t, NULL, 0, NULL, NULL, 0, 0, NULL};
+consvar_t cv_ghost_bestscore = CVAR_INIT ("ghost_bestscore", "Show", CV_SAVE, ghost_cons_t, NULL);
+consvar_t cv_ghost_besttime = CVAR_INIT ("ghost_besttime", "Show", CV_SAVE, ghost_cons_t, NULL);
+consvar_t cv_ghost_bestrings = CVAR_INIT ("ghost_bestrings", "Show", CV_SAVE, ghost_cons_t, NULL);
+consvar_t cv_ghost_last = CVAR_INIT ("ghost_last", "Show", CV_SAVE, ghost_cons_t, NULL);
+consvar_t cv_ghost_guest = CVAR_INIT ("ghost_guest", "Show", CV_SAVE, ghost2_cons_t, NULL);
//Console variables used solely in the menu system.
//todo: add a way to use non-console variables in the menu
@@ -468,19 +468,19 @@ static CV_PossibleValue_t dummymares_cons_t[] = {
{-1, "END"}, {0,"Overall"}, {1,"Mare 1"}, {2,"Mare 2"}, {3,"Mare 3"}, {4,"Mare 4"}, {5,"Mare 5"}, {6,"Mare 6"}, {7,"Mare 7"}, {8,"Mare 8"}, {0,NULL}
};
-static consvar_t cv_dummyteam = {"dummyteam", "Spectator", CV_HIDEN, dummyteam_cons_t, NULL, 0, NULL, NULL, 0, 0, NULL};
-static consvar_t cv_dummyscramble = {"dummyscramble", "Random", CV_HIDEN, dummyscramble_cons_t, NULL, 0, NULL, NULL, 0, 0, NULL};
-static consvar_t cv_dummyrings = {"dummyrings", "0", CV_HIDEN, ringlimit_cons_t, NULL, 0, NULL, NULL, 0, 0, NULL};
-static consvar_t cv_dummylives = {"dummylives", "0", CV_HIDEN, liveslimit_cons_t, NULL, 0, NULL, NULL, 0, 0, NULL};
-static consvar_t cv_dummycontinues = {"dummycontinues", "0", CV_HIDEN, contlimit_cons_t, NULL, 0, NULL, NULL, 0, 0, NULL};
-static consvar_t cv_dummymares = {"dummymares", "Overall", CV_HIDEN|CV_CALL, dummymares_cons_t, Dummymares_OnChange, 0, NULL, NULL, 0, 0, NULL};
+static consvar_t cv_dummyteam = CVAR_INIT ("dummyteam", "Spectator", CV_HIDEN, dummyteam_cons_t, NULL);
+static consvar_t cv_dummyscramble = CVAR_INIT ("dummyscramble", "Random", CV_HIDEN, dummyscramble_cons_t, NULL);
+static consvar_t cv_dummyrings = CVAR_INIT ("dummyrings", "0", CV_HIDEN, ringlimit_cons_t, NULL);
+static consvar_t cv_dummylives = CVAR_INIT ("dummylives", "0", CV_HIDEN, liveslimit_cons_t, NULL);
+static consvar_t cv_dummycontinues = CVAR_INIT ("dummycontinues", "0", CV_HIDEN, contlimit_cons_t, NULL);
+static consvar_t cv_dummymares = CVAR_INIT ("dummymares", "Overall", CV_HIDEN|CV_CALL, dummymares_cons_t, Dummymares_OnChange);
CV_PossibleValue_t marathon_cons_t[] = {{0, "Standard"}, {1, "Live Event Backup"}, {2, "Ultimate"}, {0, NULL}};
CV_PossibleValue_t loadless_cons_t[] = {{0, "Realtime"}, {1, "In-game"}, {0, NULL}};
-consvar_t cv_dummymarathon = {"dummymarathon", "Standard", CV_HIDEN, marathon_cons_t, NULL, 0, NULL, NULL, 0, 0, NULL};
-consvar_t cv_dummycutscenes = {"dummycutscenes", "Off", CV_HIDEN, CV_OnOff, NULL, 0, NULL, NULL, 0, 0, NULL};
-consvar_t cv_dummyloadless = {"dummyloadless", "In-game", CV_HIDEN, loadless_cons_t, NULL, 0, NULL, NULL, 0, 0, NULL};
+consvar_t cv_dummymarathon = CVAR_INIT ("dummymarathon", "Standard", CV_HIDEN, marathon_cons_t, NULL);
+consvar_t cv_dummycutscenes = CVAR_INIT ("dummycutscenes", "Off", CV_HIDEN, CV_OnOff, NULL);
+consvar_t cv_dummyloadless = CVAR_INIT ("dummyloadless", "In-game", CV_HIDEN, loadless_cons_t, NULL);
// ==========================================================================
// ORGANIZATION START.
@@ -1356,9 +1356,7 @@ static menuitem_t OP_VideoOptionsMenu[] =
{IT_STRING | IT_CVAR, NULL, "Score/Time/Rings", &cv_timetic, 71},
{IT_STRING | IT_CVAR, NULL, "Show Powerups", &cv_powerupdisplay, 76},
{IT_STRING | IT_CVAR, NULL, "Local ping display", &cv_showping, 81}, // shows ping next to framerate if we want to.
-#ifdef SEENAMES
{IT_STRING | IT_CVAR, NULL, "Show player names", &cv_seenames, 86},
-#endif
{IT_HEADER, NULL, "Console", NULL, 95},
{IT_STRING | IT_CVAR, NULL, "Background color", &cons_backcolor, 101},
@@ -1551,18 +1549,19 @@ static menuitem_t OP_ScreenshotOptionsMenu[] =
{IT_STRING|IT_CVAR, NULL, "Window Size", &cv_zlib_window_bits, 57},
{IT_HEADER, NULL, "Movie Mode (F9)", NULL, 64},
- {IT_STRING|IT_CVAR, NULL, "Storage Location", &cv_movie_option, 70},
- {IT_STRING|IT_CVAR|IT_CV_STRING, NULL, "Custom Folder", &cv_movie_folder, 75},
- {IT_STRING|IT_CVAR, NULL, "Capture Mode", &cv_moviemode, 90},
+ {IT_STRING|IT_CVAR, NULL, "Storage Location", &cv_movie_option, 70},
+ {IT_STRING|IT_CVAR|IT_CV_STRING, NULL, "Custom Folder", &cv_movie_folder, 75},
+ {IT_STRING|IT_CVAR, NULL, "Capture Mode", &cv_moviemode, 90},
- {IT_STRING|IT_CVAR, NULL, "Region Optimizing", &cv_gif_optimize, 95},
- {IT_STRING|IT_CVAR, NULL, "Downscaling", &cv_gif_downscale, 100},
+ {IT_STRING|IT_CVAR, NULL, "Downscaling", &cv_gif_downscale, 95},
+ {IT_STRING|IT_CVAR, NULL, "Region Optimizing", &cv_gif_optimize, 100},
{IT_STRING|IT_CVAR, NULL, "Local Color Table", &cv_gif_localcolortable, 105},
- {IT_STRING|IT_CVAR, NULL, "Memory Level", &cv_zlib_memorya, 95},
- {IT_STRING|IT_CVAR, NULL, "Compression Level", &cv_zlib_levela, 100},
- {IT_STRING|IT_CVAR, NULL, "Strategy", &cv_zlib_strategya, 105},
- {IT_STRING|IT_CVAR, NULL, "Window Size", &cv_zlib_window_bitsa, 110},
+ {IT_STRING|IT_CVAR, NULL, "Downscaling", &cv_apng_downscale, 95},
+ {IT_STRING|IT_CVAR, NULL, "Memory Level", &cv_zlib_memorya, 100},
+ {IT_STRING|IT_CVAR, NULL, "Compression Level", &cv_zlib_levela, 105},
+ {IT_STRING|IT_CVAR, NULL, "Strategy", &cv_zlib_strategya, 110},
+ {IT_STRING|IT_CVAR, NULL, "Window Size", &cv_zlib_window_bitsa, 115},
};
enum
@@ -1575,7 +1574,7 @@ enum
op_screenshot_gif_start = 13,
op_screenshot_gif_end = 15,
op_screenshot_apng_start = 16,
- op_screenshot_apng_end = 19,
+ op_screenshot_apng_end = 20,
};
static menuitem_t OP_EraseDataMenu[] =
@@ -1613,53 +1612,54 @@ static menuitem_t OP_ServerOptionsMenu[] =
{IT_STRING | IT_CVAR, NULL, "Max Players", &cv_maxplayers, 21},
{IT_STRING | IT_CVAR, NULL, "Allow Add-on Downloading", &cv_downloading, 26},
{IT_STRING | IT_CVAR, NULL, "Allow players to join", &cv_allownewplayer, 31},
+ {IT_STRING | IT_CVAR, NULL, "Minutes for reconnecting", &cv_rejointimeout, 36},
#endif
- {IT_STRING | IT_CVAR, NULL, "Map progression", &cv_advancemap, 36},
- {IT_STRING | IT_CVAR, NULL, "Intermission Timer", &cv_inttime, 41},
+ {IT_STRING | IT_CVAR, NULL, "Map progression", &cv_advancemap, 41},
+ {IT_STRING | IT_CVAR, NULL, "Intermission Timer", &cv_inttime, 46},
- {IT_HEADER, NULL, "Characters", NULL, 50},
- {IT_STRING | IT_CVAR, NULL, "Force a character", &cv_forceskin, 56},
- {IT_STRING | IT_CVAR, NULL, "Restrict character changes", &cv_restrictskinchange, 61},
+ {IT_HEADER, NULL, "Characters", NULL, 55},
+ {IT_STRING | IT_CVAR, NULL, "Force a character", &cv_forceskin, 61},
+ {IT_STRING | IT_CVAR, NULL, "Restrict character changes", &cv_restrictskinchange, 66},
- {IT_HEADER, NULL, "Items", NULL, 70},
- {IT_STRING | IT_CVAR, NULL, "Item respawn delay", &cv_itemrespawntime, 76},
- {IT_STRING | IT_SUBMENU, NULL, "Mystery Item Monitor Toggles...", &OP_MonitorToggleDef, 81},
+ {IT_HEADER, NULL, "Items", NULL, 75},
+ {IT_STRING | IT_CVAR, NULL, "Item respawn delay", &cv_itemrespawntime, 81},
+ {IT_STRING | IT_SUBMENU, NULL, "Mystery Item Monitor Toggles...", &OP_MonitorToggleDef, 86},
- {IT_HEADER, NULL, "Cooperative", NULL, 90},
- {IT_STRING | IT_CVAR, NULL, "Players required for exit", &cv_playersforexit, 96},
- {IT_STRING | IT_CVAR, NULL, "Starposts", &cv_coopstarposts, 101},
- {IT_STRING | IT_CVAR, NULL, "Life sharing", &cv_cooplives, 106},
- {IT_STRING | IT_CVAR, NULL, "Post-goal free roaming", &cv_exitmove, 111},
+ {IT_HEADER, NULL, "Cooperative", NULL, 95},
+ {IT_STRING | IT_CVAR, NULL, "Players required for exit", &cv_playersforexit, 101},
+ {IT_STRING | IT_CVAR, NULL, "Starposts", &cv_coopstarposts, 106},
+ {IT_STRING | IT_CVAR, NULL, "Life sharing", &cv_cooplives, 111},
+ {IT_STRING | IT_CVAR, NULL, "Post-goal free roaming", &cv_exitmove, 116},
- {IT_HEADER, NULL, "Race, Competition", NULL, 120},
- {IT_STRING | IT_CVAR, NULL, "Level completion countdown", &cv_countdowntime, 126},
- {IT_STRING | IT_CVAR, NULL, "Item Monitors", &cv_competitionboxes, 131},
+ {IT_HEADER, NULL, "Race, Competition", NULL, 125},
+ {IT_STRING | IT_CVAR, NULL, "Level completion countdown", &cv_countdowntime, 131},
+ {IT_STRING | IT_CVAR, NULL, "Item Monitors", &cv_competitionboxes, 136},
- {IT_HEADER, NULL, "Ringslinger (Match, CTF, Tag, H&S)", NULL, 140},
- {IT_STRING | IT_CVAR, NULL, "Time Limit", &cv_timelimit, 146},
- {IT_STRING | IT_CVAR, NULL, "Score Limit", &cv_pointlimit, 151},
- {IT_STRING | IT_CVAR, NULL, "Overtime on Tie", &cv_overtime, 156},
- {IT_STRING | IT_CVAR, NULL, "Player respawn delay", &cv_respawntime, 161},
+ {IT_HEADER, NULL, "Ringslinger (Match, CTF, Tag, H&S)", NULL, 145},
+ {IT_STRING | IT_CVAR, NULL, "Time Limit", &cv_timelimit, 151},
+ {IT_STRING | IT_CVAR, NULL, "Score Limit", &cv_pointlimit, 156},
+ {IT_STRING | IT_CVAR, NULL, "Overtime on Tie", &cv_overtime, 161},
+ {IT_STRING | IT_CVAR, NULL, "Player respawn delay", &cv_respawntime, 166},
- {IT_STRING | IT_CVAR, NULL, "Item Monitors", &cv_matchboxes, 171},
- {IT_STRING | IT_CVAR, NULL, "Weapon Rings", &cv_specialrings, 176},
- {IT_STRING | IT_CVAR, NULL, "Power Stones", &cv_powerstones, 181},
+ {IT_STRING | IT_CVAR, NULL, "Item Monitors", &cv_matchboxes, 176},
+ {IT_STRING | IT_CVAR, NULL, "Weapon Rings", &cv_specialrings, 181},
+ {IT_STRING | IT_CVAR, NULL, "Power Stones", &cv_powerstones, 186},
- {IT_STRING | IT_CVAR, NULL, "Flag respawn delay", &cv_flagtime, 191},
- {IT_STRING | IT_CVAR, NULL, "Hiding time", &cv_hidetime, 196},
+ {IT_STRING | IT_CVAR, NULL, "Flag respawn delay", &cv_flagtime, 196},
+ {IT_STRING | IT_CVAR, NULL, "Hiding time", &cv_hidetime, 201},
- {IT_HEADER, NULL, "Teams", NULL, 205},
- {IT_STRING | IT_CVAR, NULL, "Autobalance sizes", &cv_autobalance, 211},
- {IT_STRING | IT_CVAR, NULL, "Scramble on Map Change", &cv_scrambleonchange, 216},
+ {IT_HEADER, NULL, "Teams", NULL, 210},
+ {IT_STRING | IT_CVAR, NULL, "Autobalance sizes", &cv_autobalance, 216},
+ {IT_STRING | IT_CVAR, NULL, "Scramble on Map Change", &cv_scrambleonchange, 221},
#ifndef NONET
- {IT_HEADER, NULL, "Advanced", NULL, 225},
- {IT_STRING | IT_CVAR | IT_CV_STRING, NULL, "Master server", &cv_masterserver, 231},
+ {IT_HEADER, NULL, "Advanced", NULL, 230},
+ {IT_STRING | IT_CVAR | IT_CV_STRING, NULL, "Master server", &cv_masterserver, 236},
- {IT_STRING | IT_CVAR, NULL, "Join delay", &cv_joindelay, 246},
- {IT_STRING | IT_CVAR, NULL, "Attempts to resynchronise", &cv_resynchattempts, 251},
+ {IT_STRING | IT_CVAR, NULL, "Join delay", &cv_joindelay, 251},
+ {IT_STRING | IT_CVAR, NULL, "Attempts to resynchronise", &cv_resynchattempts, 256},
- {IT_STRING | IT_CVAR, NULL, "Show IP Address of Joiners", &cv_showjoinaddress, 256},
+ {IT_STRING | IT_CVAR, NULL, "Show IP Address of Joiners", &cv_showjoinaddress, 261},
#endif
};
@@ -2145,15 +2145,20 @@ menu_t OP_PlaystyleDef = {
static void M_VideoOptions(INT32 choice)
{
(void)choice;
+
+ OP_VideoOptionsMenu[op_video_renderer].status = (IT_TRANSTEXT | IT_PAIR);
+ OP_VideoOptionsMenu[op_video_renderer].patch = "Renderer";
+ OP_VideoOptionsMenu[op_video_renderer].text = "Software";
+
#ifdef HWRENDER
- if (vid_opengl_state == -1)
+ if (vid.glstate != VID_GL_LIBRARY_ERROR)
{
- OP_VideoOptionsMenu[op_video_renderer].status = (IT_TRANSTEXT | IT_PAIR);
- OP_VideoOptionsMenu[op_video_renderer].patch = "Renderer";
- OP_VideoOptionsMenu[op_video_renderer].text = "Software";
+ OP_VideoOptionsMenu[op_video_renderer].status = (IT_STRING | IT_CVAR);
+ OP_VideoOptionsMenu[op_video_renderer].patch = NULL;
+ OP_VideoOptionsMenu[op_video_renderer].text = "Renderer";
}
-
#endif
+
M_SetupNextMenu(&OP_VideoOptionsDef);
}
@@ -4026,7 +4031,7 @@ static void M_DrawThermo(INT32 x, INT32 y, consvar_t *cv)
cursorlump = W_GetNumForName("M_THERMO");
V_DrawScaledPatch(xx, y, 0, p = W_CachePatchNum(leftlump,PU_PATCH));
- xx += SHORT(p->width) - SHORT(p->leftoffset);
+ xx += p->width - p->leftoffset;
for (i = 0; i < 16; i++)
{
V_DrawScaledPatch(xx, y, V_WRAPX, W_CachePatchNum(centerlump[i & 1], PU_PATCH));
@@ -4165,7 +4170,7 @@ static void M_DrawStaticBox(fixed_t x, fixed_t y, INT32 flags, fixed_t w, fixed_
fixed_t sw, pw;
patch = W_CachePatchName("LSSTATIC", PU_PATCH);
- pw = SHORT(patch->width) - (sw = w*2); //FixedDiv(w, scale); -- for scale FRACUNIT/2
+ pw = patch->width - (sw = w*2); //FixedDiv(w, scale); -- for scale FRACUNIT/2
/*if (pw > 0) -- model code for modders providing weird LSSTATIC
{
@@ -4262,8 +4267,8 @@ static void M_DrawMenuTitle(void)
if (p->height > 24) // title is larger than normal
{
- INT32 xtitle = (BASEVIDWIDTH - (SHORT(p->width)/2))/2;
- INT32 ytitle = (30 - (SHORT(p->height)/2))/2;
+ INT32 xtitle = (BASEVIDWIDTH - (p->width/2))/2;
+ INT32 ytitle = (30 - (p->height/2))/2;
if (xtitle < 0)
xtitle = 0;
@@ -4274,8 +4279,8 @@ static void M_DrawMenuTitle(void)
}
else
{
- INT32 xtitle = (BASEVIDWIDTH - SHORT(p->width))/2;
- INT32 ytitle = (30 - SHORT(p->height))/2;
+ INT32 xtitle = (BASEVIDWIDTH - p->width)/2;
+ INT32 ytitle = (30 - p->height)/2;
if (xtitle < 0)
xtitle = 0;
@@ -4311,7 +4316,7 @@ static void M_DrawGenericMenu(void)
{
patch_t *p;
p = W_CachePatchName(currentMenu->menuitems[i].patch, PU_PATCH);
- V_DrawScaledPatch((BASEVIDWIDTH - SHORT(p->width))/2, y, 0, p);
+ V_DrawScaledPatch((BASEVIDWIDTH - p->width)/2, y, 0, p);
}
else
{
@@ -4842,7 +4847,7 @@ static void M_DrawCenteredMenu(void)
{
patch_t *p;
p = W_CachePatchName(currentMenu->menuitems[i].patch, PU_PATCH);
- V_DrawScaledPatch((BASEVIDWIDTH - SHORT(p->width))/2, y, 0, p);
+ V_DrawScaledPatch((BASEVIDWIDTH - p->width)/2, y, 0, p);
}
else
{
@@ -5585,9 +5590,6 @@ static void M_DrawLevelPlatterWideMap(UINT8 row, UINT8 col, INT32 x, INT32 y, bo
if (map <= 0)
return;
- if (needpatchrecache)
- M_CacheLevelPlatter();
-
// A 564x100 image of the level as entry MAPxxW
if (!(levelselect.rows[row].mapavailable[col]))
{
@@ -5619,9 +5621,6 @@ static void M_DrawLevelPlatterMap(UINT8 row, UINT8 col, INT32 x, INT32 y, boolea
if (map <= 0)
return;
- if (needpatchrecache)
- M_CacheLevelPlatter();
-
// A 160x100 image of the level as entry MAPxxP
if (!(levelselect.rows[row].mapavailable[col]))
{
@@ -5696,7 +5695,7 @@ static void M_DrawRecordAttackForeground(void)
angle_t fa;
INT32 i;
- INT32 height = (SHORT(fg->height)/2);
+ INT32 height = (fg->height / 2);
INT32 dupz = (vid.dupx < vid.dupy ? vid.dupx : vid.dupy);
for (i = -12; i < (BASEVIDHEIGHT/height) + 12; i++)
@@ -5731,9 +5730,9 @@ static void M_DrawNightsAttackMountains(void)
static INT32 bgscrollx;
INT32 dupz = (vid.dupx < vid.dupy ? vid.dupx : vid.dupy);
patch_t *background = W_CachePatchName(curbgname, PU_PATCH);
- INT16 w = SHORT(background->width);
+ INT16 w = background->width;
INT32 x = FixedInt(-bgscrollx) % w;
- INT32 y = BASEVIDHEIGHT - SHORT(background->height)*2;
+ INT32 y = BASEVIDHEIGHT - (background->height * 2);
if (vid.height != BASEVIDHEIGHT * dupz)
V_DrawFill(0, 0, BASEVIDWIDTH, BASEVIDHEIGHT, 158);
@@ -5758,18 +5757,18 @@ static void M_DrawNightsAttackBackground(void)
// top
patch_t *backtopfg = W_CachePatchName("NTSATKT1", PU_PATCH);
patch_t *fronttopfg = W_CachePatchName("NTSATKT2", PU_PATCH);
- INT32 backtopwidth = SHORT(backtopfg->width);
- //INT32 backtopheight = SHORT(backtopfg->height);
- INT32 fronttopwidth = SHORT(fronttopfg->width);
- //INT32 fronttopheight = SHORT(fronttopfg->height);
+ INT32 backtopwidth = backtopfg->width;
+ //INT32 backtopheight = backtopfg->height;
+ INT32 fronttopwidth = fronttopfg->width;
+ //INT32 fronttopheight = fronttopfg->height;
// bottom
patch_t *backbottomfg = W_CachePatchName("NTSATKB1", PU_PATCH);
patch_t *frontbottomfg = W_CachePatchName("NTSATKB2", PU_PATCH);
- INT32 backbottomwidth = SHORT(backbottomfg->width);
- INT32 backbottomheight = SHORT(backbottomfg->height);
- INT32 frontbottomwidth = SHORT(frontbottomfg->width);
- INT32 frontbottomheight = SHORT(frontbottomfg->height);
+ INT32 backbottomwidth = backbottomfg->width;
+ INT32 backbottomheight = backbottomfg->height;
+ INT32 frontbottomwidth = frontbottomfg->width;
+ INT32 frontbottomheight = frontbottomfg->height;
// background
M_DrawNightsAttackMountains();
@@ -5831,8 +5830,6 @@ static void M_DrawNightsAttackSuperSonic(void)
const UINT8 *colormap = R_GetTranslationColormap(TC_DEFAULT, SKINCOLOR_YELLOW, GTC_CACHE);
INT32 timer = (ntsatkdrawtimer/4) % 2;
angle_t fa = (FixedAngle(((ntsatkdrawtimer * 4) % 360)<<FRACBITS)>>ANGLETOFINESHIFT) & FINEMASK;
- ntssupersonic[0] = W_CachePatchName("NTSSONC1", PU_PATCH);
- ntssupersonic[1] = W_CachePatchName("NTSSONC2", PU_PATCH);
V_DrawFixedPatch(235<<FRACBITS, (120<<FRACBITS) - (8*FINESINE(fa)), FRACUNIT, 0, ntssupersonic[timer], colormap);
}
@@ -6154,7 +6151,7 @@ static void M_DrawMessageMenu(void)
}
V_DrawString((BASEVIDWIDTH - V_StringWidth(string, 0))/2,y,V_ALLOWLOWERCASE,string);
- y += 8; //SHORT(hu_font[0]->height);
+ y += 8; //hu_font[0]->height;
}
}
@@ -6176,7 +6173,7 @@ static void M_StopMessage(INT32 choice)
static void M_DrawImageDef(void)
{
// Grr. Need to autodetect for pic_ts.
- pic_t *pictest = (pic_t *)W_CachePatchName(currentMenu->menuitems[itemOn].text,PU_CACHE);
+ pic_t *pictest = (pic_t *)W_CacheLumpName(currentMenu->menuitems[itemOn].text,PU_CACHE);
if (!pictest->zero)
V_DrawScaledPic(0,0,0,W_GetNumForName(currentMenu->menuitems[itemOn].text));
else
@@ -6237,8 +6234,8 @@ static void M_AddonsOptions(INT32 choice)
M_SetupNextMenu(&OP_AddonsOptionsDef);
}
-#define LOCATIONSTRING1 "Visit \x83SRB2.ORG/MODS\x80 to get & make add-ons!"
-//#define LOCATIONSTRING2 "Visit \x88SRB2.ORG/MODS\x80 to get & make add-ons!"
+#define LOCATIONSTRING1 "Visit \x83SRB2.ORG/ADDONS\x80 to get & make addons!"
+//#define LOCATIONSTRING2 "Visit \x88SRB2.ORG/ADDONS\x80 to get & make addons!"
static void M_LoadAddonsPatches(void)
{
@@ -6444,10 +6441,6 @@ static void M_DrawAddons(void)
return;
}
- // Lactozilla: Load addons menu patches.
- if (needpatchrecache)
- M_LoadAddonsPatches();
-
if (Playing())
V_DrawCenteredString(BASEVIDWIDTH/2, 5, warningflags, "Adding files mid-game may cause problems.");
else
@@ -6944,8 +6937,7 @@ static void M_SelectableClearMenus(INT32 choice)
static void M_UltimateCheat(INT32 choice)
{
(void)choice;
- if (Playing())
- LUAh_GameQuit();
+ LUAh_GameQuit(true);
I_Quit();
}
@@ -7602,9 +7594,6 @@ static void M_DrawSoundTest(void)
fixed_t hscale = FRACUNIT/2, vscale = FRACUNIT/2, bounce = 0;
UINT8 frame[4] = {0, 0, -1, SKINCOLOR_RUBY};
- if (needpatchrecache)
- M_CacheSoundTest();
-
// let's handle the ticker first. ideally we'd tick this somewhere else, BUT...
if (curplaying)
{
@@ -8246,17 +8235,15 @@ static void M_CacheLoadGameData(void)
static void M_DrawLoadGameData(void)
{
- INT32 i, savetodraw, x, y, hsep = 90;
+ INT32 i, prev_i = 1, savetodraw, x, y, hsep = 90;
skin_t *charskin = NULL;
if (vid.width != BASEVIDWIDTH*vid.dupx)
hsep = (hsep*vid.width)/(BASEVIDWIDTH*vid.dupx);
- if (needpatchrecache)
- M_CacheLoadGameData();
-
- for (i = -2; i <= 2; i++)
+ for (i = 2; prev_i; i = -(i + ((UINT32)i >> 31))) // draws from outwards in; 2, -2, 1, -1, 0
{
+ prev_i = i;
savetodraw = (saveSlotSelected + i + numsaves)%numsaves;
x = (BASEVIDWIDTH/2 - 42 + loadgamescroll) + (i*hsep);
y = 33 + 9;
@@ -8435,7 +8422,7 @@ static void M_DrawLoadGameData(void)
sprdef = &charbotskin->sprites[SPR2_SIGN];
if (!sprdef->numframes)
goto skipbot;
- colormap = R_GetTranslationColormap(savegameinfo[savetodraw].botskin-1, charbotskin->prefcolor, 0);
+ colormap = R_GetTranslationColormap(savegameinfo[savetodraw].botskin-1, charbotskin->prefcolor, GTC_CACHE);
sprframe = &sprdef->spriteframes[0];
patch = W_CachePatchNum(sprframe->lumppat[0], PU_PATCH);
@@ -8445,8 +8432,6 @@ static void M_DrawLoadGameData(void)
charbotskin->highresscale,
0, patch, colormap);
- Z_Free(colormap);
-
tempx -= (20<<FRACBITS);
//flip = V_FLIP;
}
@@ -8455,7 +8440,7 @@ skipbot:
if (!charskin) // shut up compiler
goto skipsign;
sprdef = &charskin->sprites[SPR2_SIGN];
- colormap = R_GetTranslationColormap(savegameinfo[savetodraw].skinnum, charskin->prefcolor, 0);
+ colormap = R_GetTranslationColormap(savegameinfo[savetodraw].skinnum, charskin->prefcolor, GTC_CACHE);
if (!sprdef->numframes)
goto skipsign;
sprframe = &sprdef->spriteframes[0];
@@ -8495,8 +8480,6 @@ skipsign:
charskin->highresscale/2,
0, patch, colormap);
skiplife:
- if (colormap)
- Z_Free(colormap);
patch = W_CachePatchName("STLIVEX", PU_PATCH);
@@ -8957,6 +8940,7 @@ void M_ForceSaveSlotSelected(INT32 sslot)
// ================
// CHARACTER SELECT
// ================
+
static void M_CacheCharacterSelectEntry(INT32 i, INT32 skinnum)
{
if (!(description[i].picname[0]))
@@ -8977,22 +8961,6 @@ static void M_CacheCharacterSelectEntry(INT32 i, INT32 skinnum)
description[i].namepic = W_CachePatchName(description[i].nametag, PU_PATCH);
}
-static void M_CacheCharacterSelect(void)
-{
- INT32 i, skinnum;
-
- for (i = 0; i < MAXSKINS; i++)
- {
- if (!description[i].used)
- continue;
-
- // Already set in M_SetupChoosePlayer
- skinnum = description[i].skinnum[0];
- if ((skinnum != -1) && (R_SkinUsable(-1, skinnum)))
- M_CacheCharacterSelectEntry(i, skinnum);
- }
-}
-
static UINT8 M_SetupChoosePlayerDirect(INT32 choice)
{
INT32 skinnum;
@@ -9192,16 +9160,13 @@ static void M_DrawSetupChoosePlayerMenu(void)
patch_t *charbg = W_CachePatchName("CHARBG", PU_PATCH);
patch_t *charfg = W_CachePatchName("CHARFG", PU_PATCH);
- INT16 bgheight = SHORT(charbg->height);
- INT16 fgheight = SHORT(charfg->height);
- INT16 bgwidth = SHORT(charbg->width);
- INT16 fgwidth = SHORT(charfg->width);
+ INT16 bgheight = charbg->height;
+ INT16 fgheight = charfg->height;
+ INT16 bgwidth = charbg->width;
+ INT16 fgwidth = charfg->width;
INT32 x, y;
INT32 w = (vid.width/vid.dupx);
- if (needpatchrecache)
- M_CacheCharacterSelect();
-
if (abs(char_scroll) > FRACUNIT)
char_scroll -= (char_scroll>>2);
else // close enough.
@@ -9290,14 +9255,14 @@ static void M_DrawSetupChoosePlayerMenu(void)
curoutlinecolor = col = skincolors[charskin->prefcolor].invcolor;
txsh = oxsh;
- ox = 8 + SHORT((description[char_on].charpic)->width)/2;
+ ox = 8 + ((description[char_on].charpic)->width)/2;
y = my + 144;
// cur
{
x = ox - txsh;
if (curpatch)
- x -= (SHORT(curpatch->width)/2);
+ x -= curpatch->width / 2;
if (curtext[0] != '\0')
{
@@ -9330,7 +9295,7 @@ static void M_DrawSetupChoosePlayerMenu(void)
x = (ox - txsh) - w;
if (prevpatch)
- x -= (SHORT(prevpatch->width)/2);
+ x -= prevpatch->width / 2;
if (prevtext[0] != '\0')
{
@@ -9360,7 +9325,7 @@ static void M_DrawSetupChoosePlayerMenu(void)
x = (ox - txsh) + w;
if (nextpatch)
- x -= (SHORT(nextpatch->width)/2);
+ x -= nextpatch->width / 2;
if (nexttext[0] != '\0')
{
@@ -9382,7 +9347,7 @@ static void M_DrawSetupChoosePlayerMenu(void)
{
patch_t *header = W_CachePatchName("M_PICKP", PU_PATCH);
INT32 xtitle = 146;
- INT32 ytitle = (35 - SHORT(header->height))/2;
+ INT32 ytitle = (35 - header->height) / 2;
V_DrawFixedPatch(xtitle<<FRACBITS, ytitle<<FRACBITS, FRACUNIT/2, 0, header, NULL);
}
#endif // CHOOSEPLAYER_DRAWHEADER
@@ -9848,8 +9813,8 @@ void M_DrawTimeAttackMenu(void)
empatch = W_CachePatchName(M_GetEmblemPatch(em, true), PU_PATCH);
- empatx = SHORT(empatch->leftoffset)/2;
- empaty = SHORT(empatch->topoffset)/2;
+ empatx = empatch->leftoffset / 2;
+ empaty = empatch->topoffset / 2;
if (em->collected)
V_DrawSmallMappedPatch(104+76+empatx, yHeight+lsheadingheight/2+empaty, 0, empatch,
@@ -10085,7 +10050,7 @@ void M_DrawNightsAttackMenu(void)
// Super Sonic
M_DrawNightsAttackSuperSonic();
//if (P_HasGrades(cv_nextmap.value, 0))
- // V_DrawScaledPatch(235 - (SHORT((ngradeletters[bestoverall])->width)*3)/2, 135, 0, ngradeletters[bestoverall]);
+ // V_DrawScaledPatch(235 - (((ngradeletters[bestoverall])->width)*3)/2, 135, 0, ngradeletters[bestoverall]);
if (P_HasGrades(cv_nextmap.value, cv_dummymares.value))
{//make bigger again
@@ -10172,6 +10137,9 @@ static void M_NightsAttack(INT32 choice)
// This is really just to make sure Sonic is the played character, just in case
M_PatchSkinNameTable();
+ ntssupersonic[0] = W_CachePatchName("NTSSONC1", PU_PATCH);
+ ntssupersonic[1] = W_CachePatchName("NTSSONC2", PU_PATCH);
+
G_SetGamestate(GS_TIMEATTACK); // do this before M_SetupNextMenu so that menu meta state knows that we're switching
titlemapinaction = TITLEMAP_OFF; // Nope don't give us HOMs please
M_SetupNextMenu(&SP_NightsAttackDef);
@@ -10573,10 +10541,6 @@ void M_DrawMarathon(void)
angle_t fa;
INT32 dupz = (vid.dupx < vid.dupy ? vid.dupx : vid.dupy), xspan = (vid.width/dupz), yspan = (vid.height/dupz), diffx = (xspan - BASEVIDWIDTH)/2, diffy = (yspan - BASEVIDHEIGHT)/2, maxy = BASEVIDHEIGHT + diffy;
- // lactozilla: the renderer changed so recache patches
- if (needpatchrecache)
- M_CacheCharacterSelect();
-
curbgxspeed = 0;
curbgyspeed = 18;
@@ -10643,7 +10607,7 @@ void M_DrawMarathon(void)
{
patch_t *fg = W_CachePatchName("RECATKFG", PU_PATCH);
INT32 trans = V_60TRANS+((cnt&~3)<<(V_ALPHASHIFT-2));
- INT32 height = (SHORT(fg->height)/2);
+ INT32 height = fg->height / 2;
char patchname[7] = "CEMGx0";
dupz = (w*7)/6; //(w*42*120)/(360*6); -- I don't know why this works but I'm not going to complain.
@@ -11413,7 +11377,7 @@ static void M_DrawServerMenu(void)
else
PictureOfLevel = W_CachePatchName("BLANKLVL", PU_PATCH);
- V_DrawSmallScaledPatch(319 - (currentMenu->x + (SHORT(PictureOfLevel->width)/2)), currentMenu->y + imgheight, 0, PictureOfLevel);
+ V_DrawSmallScaledPatch(319 - (currentMenu->x + (PictureOfLevel->width / 2)), currentMenu->y + imgheight, 0, PictureOfLevel);
}
}
@@ -11455,9 +11419,9 @@ static void M_ServerOptions(INT32 choice)
OP_ServerOptionsMenu[ 2].status = IT_GRAYEDOUT; // Max players
OP_ServerOptionsMenu[ 3].status = IT_GRAYEDOUT; // Allow add-on downloading
OP_ServerOptionsMenu[ 4].status = IT_GRAYEDOUT; // Allow players to join
- OP_ServerOptionsMenu[35].status = IT_GRAYEDOUT; // Master server
- OP_ServerOptionsMenu[36].status = IT_GRAYEDOUT; // Minimum delay between joins
- OP_ServerOptionsMenu[37].status = IT_GRAYEDOUT; // Attempts to resynchronise
+ OP_ServerOptionsMenu[36].status = IT_GRAYEDOUT; // Master server
+ OP_ServerOptionsMenu[37].status = IT_GRAYEDOUT; // Minimum delay between joins
+ OP_ServerOptionsMenu[38].status = IT_GRAYEDOUT; // Attempts to resynchronise
}
else
{
@@ -11465,11 +11429,11 @@ static void M_ServerOptions(INT32 choice)
OP_ServerOptionsMenu[ 2].status = IT_STRING | IT_CVAR;
OP_ServerOptionsMenu[ 3].status = IT_STRING | IT_CVAR;
OP_ServerOptionsMenu[ 4].status = IT_STRING | IT_CVAR;
- OP_ServerOptionsMenu[35].status = (netgame
+ OP_ServerOptionsMenu[36].status = (netgame
? IT_GRAYEDOUT
: (IT_STRING | IT_CVAR | IT_CV_STRING));
- OP_ServerOptionsMenu[36].status = IT_STRING | IT_CVAR;
OP_ServerOptionsMenu[37].status = IT_STRING | IT_CVAR;
+ OP_ServerOptionsMenu[38].status = IT_STRING | IT_CVAR;
}
#endif
@@ -11786,7 +11750,7 @@ static void M_DrawSetupMultiPlayerMenu(void)
goto faildraw;
// ok, draw player sprite for sure now
- colormap = R_GetTranslationColormap(setupm_fakeskin, setupm_fakecolor->color, 0);
+ colormap = R_GetTranslationColormap(setupm_fakeskin, setupm_fakecolor->color, GTC_CACHE);
if (multi_frame >= sprdef->numframes)
multi_frame = 0;
@@ -11804,7 +11768,6 @@ static void M_DrawSetupMultiPlayerMenu(void)
FixedDiv(skins[setupm_fakeskin].highresscale, skins[setupm_fakeskin].shieldscale),
flags, patch, colormap);
- Z_Free(colormap);
goto colordraw;
faildraw:
@@ -13403,8 +13366,7 @@ void M_QuitResponse(INT32 ch)
if (ch != 'y' && ch != KEY_ENTER)
return;
- if (Playing())
- LUAh_GameQuit();
+ LUAh_GameQuit(true);
if (!(netgame || cv_debug))
{
S_ResetCaptions();
diff --git a/src/m_misc.c b/src/m_misc.c
index 42890cb08a26e34e54eb2f904615ff214c5c018c..17a398b83f9b26a19d756a5fdfafe8b8a63652c5 100644
--- a/src/m_misc.c
+++ b/src/m_misc.c
@@ -102,16 +102,16 @@ typedef off_t off64_t;
#endif
static CV_PossibleValue_t screenshot_cons_t[] = {{0, "Default"}, {1, "HOME"}, {2, "SRB2"}, {3, "CUSTOM"}, {0, NULL}};
-consvar_t cv_screenshot_option = {"screenshot_option", "Default", CV_SAVE|CV_CALL, screenshot_cons_t, Screenshot_option_Onchange, 0, NULL, NULL, 0, 0, NULL};
-consvar_t cv_screenshot_folder = {"screenshot_folder", "", CV_SAVE, NULL, NULL, 0, NULL, NULL, 0, 0, NULL};
+consvar_t cv_screenshot_option = CVAR_INIT ("screenshot_option", "Default", CV_SAVE|CV_CALL, screenshot_cons_t, Screenshot_option_Onchange);
+consvar_t cv_screenshot_folder = CVAR_INIT ("screenshot_folder", "", CV_SAVE, NULL, NULL);
-consvar_t cv_screenshot_colorprofile = {"screenshot_colorprofile", "Yes", CV_SAVE, CV_YesNo, NULL, 0, NULL, NULL, 0, 0, NULL};
+consvar_t cv_screenshot_colorprofile = CVAR_INIT ("screenshot_colorprofile", "Yes", CV_SAVE, CV_YesNo, NULL);
static CV_PossibleValue_t moviemode_cons_t[] = {{MM_GIF, "GIF"}, {MM_APNG, "aPNG"}, {MM_SCREENSHOT, "Screenshots"}, {0, NULL}};
-consvar_t cv_moviemode = {"moviemode_mode", "GIF", CV_SAVE|CV_CALL, moviemode_cons_t, Moviemode_mode_Onchange, 0, NULL, NULL, 0, 0, NULL};
+consvar_t cv_moviemode = CVAR_INIT ("moviemode_mode", "GIF", CV_SAVE|CV_CALL, moviemode_cons_t, Moviemode_mode_Onchange);
-consvar_t cv_movie_option = {"movie_option", "Default", CV_SAVE|CV_CALL, screenshot_cons_t, Moviemode_option_Onchange, 0, NULL, NULL, 0, 0, NULL};
-consvar_t cv_movie_folder = {"movie_folder", "", CV_SAVE, NULL, NULL, 0, NULL, NULL, 0, 0, NULL};
+consvar_t cv_movie_option = CVAR_INIT ("movie_option", "Default", CV_SAVE|CV_CALL, screenshot_cons_t, Moviemode_option_Onchange);
+consvar_t cv_movie_folder = CVAR_INIT ("movie_folder", "", CV_SAVE, NULL, NULL);
static CV_PossibleValue_t zlib_mem_level_t[] = {
{1, "(Min Memory) 1"},
@@ -153,16 +153,21 @@ static CV_PossibleValue_t apng_delay_t[] = {
// zlib memory usage is as follows:
// (1 << (zlib_window_bits+2)) + (1 << (zlib_level+9))
-consvar_t cv_zlib_memory = {"png_memory_level", "7", CV_SAVE, zlib_mem_level_t, NULL, 0, NULL, NULL, 0, 0, NULL};
-consvar_t cv_zlib_level = {"png_compress_level", "(Optimal) 6", CV_SAVE, zlib_level_t, NULL, 0, NULL, NULL, 0, 0, NULL};
-consvar_t cv_zlib_strategy = {"png_strategy", "Normal", CV_SAVE, zlib_strategy_t, NULL, 0, NULL, NULL, 0, 0, NULL};
-consvar_t cv_zlib_window_bits = {"png_window_size", "32k", CV_SAVE, zlib_window_bits_t, NULL, 0, NULL, NULL, 0, 0, NULL};
+consvar_t cv_zlib_memory = CVAR_INIT ("png_memory_level", "7", CV_SAVE, zlib_mem_level_t, NULL);
+consvar_t cv_zlib_level = CVAR_INIT ("png_compress_level", "(Optimal) 6", CV_SAVE, zlib_level_t, NULL);
+consvar_t cv_zlib_strategy = CVAR_INIT ("png_strategy", "Normal", CV_SAVE, zlib_strategy_t, NULL);
+consvar_t cv_zlib_window_bits = CVAR_INIT ("png_window_size", "32k", CV_SAVE, zlib_window_bits_t, NULL);
+
+consvar_t cv_zlib_memorya = CVAR_INIT ("apng_memory_level", "(Max Memory) 9", CV_SAVE, zlib_mem_level_t, NULL);
+consvar_t cv_zlib_levela = CVAR_INIT ("apng_compress_level", "4", CV_SAVE, zlib_level_t, NULL);
+consvar_t cv_zlib_strategya = CVAR_INIT ("apng_strategy", "RLE", CV_SAVE, zlib_strategy_t, NULL);
+consvar_t cv_zlib_window_bitsa = CVAR_INIT ("apng_window_size", "32k", CV_SAVE, zlib_window_bits_t, NULL);
+consvar_t cv_apng_delay = CVAR_INIT ("apng_speed", "1x", CV_SAVE, apng_delay_t, NULL);
+consvar_t cv_apng_downscale = CVAR_INIT ("apng_downscale", "On", CV_SAVE, CV_OnOff, NULL);
-consvar_t cv_zlib_memorya = {"apng_memory_level", "(Max Memory) 9", CV_SAVE, zlib_mem_level_t, NULL, 0, NULL, NULL, 0, 0, NULL};
-consvar_t cv_zlib_levela = {"apng_compress_level", "4", CV_SAVE, zlib_level_t, NULL, 0, NULL, NULL, 0, 0, NULL};
-consvar_t cv_zlib_strategya = {"apng_strategy", "RLE", CV_SAVE, zlib_strategy_t, NULL, 0, NULL, NULL, 0, 0, NULL};
-consvar_t cv_zlib_window_bitsa = {"apng_window_size", "32k", CV_SAVE, zlib_window_bits_t, NULL, 0, NULL, NULL, 0, 0, NULL};
-consvar_t cv_apng_delay = {"apng_speed", "1x", CV_SAVE, apng_delay_t, NULL, 0, NULL, NULL, 0, 0, NULL};
+#ifdef USE_APNG
+static boolean apng_downscale = false; // So nobody can do something dumb like changing cvars mid output
+#endif
boolean takescreenshot = false; // Take a screenshot this tic
@@ -981,25 +986,38 @@ static inline boolean M_PNGLib(void)
static void M_PNGFrame(png_structp png_ptr, png_infop png_info_ptr, png_bytep png_buf)
{
+ png_uint_16 downscale = apng_downscale ? vid.dupx : 1;
+
png_uint_32 pitch = png_get_rowbytes(png_ptr, png_info_ptr);
- PNG_CONST png_uint_32 height = vid.height;
- png_bytepp row_pointers = png_malloc(png_ptr, height* sizeof (png_bytep));
- png_uint_32 y;
+ PNG_CONST png_uint_32 width = vid.width / downscale;
+ PNG_CONST png_uint_32 height = vid.height / downscale;
+ png_bytepp row_pointers = png_malloc(png_ptr, height * sizeof (png_bytep));
+ png_uint_32 x, y;
png_uint_16 framedelay = (png_uint_16)cv_apng_delay.value;
apng_frames++;
for (y = 0; y < height; y++)
{
- row_pointers[y] = png_buf;
- png_buf += pitch;
+ row_pointers[y] = malloc(pitch * sizeof(png_byte));
+ for (x = 0; x < width; x++)
+ row_pointers[y][x] = png_buf[x * downscale];
+ png_buf += pitch * (downscale * downscale);
}
+ //for (x = 0; x < width; x++)
+ //{
+ // printf("%d", x);
+ // row_pointers[y][x] = 0;
+ //}
+ /* row_pointers[y] = calloc(1, sizeof(png_bytep));
+ png_buf += pitch * 2;
+ }*/
#ifndef PNG_STATIC
if (aPNG_write_frame_head)
#endif
aPNG_write_frame_head(apng_ptr, apng_info_ptr, row_pointers,
- vid.width, /* width */
+ width, /* width */
height, /* height */
0, /* x offset */
0, /* y offset */
@@ -1030,6 +1048,12 @@ static void M_PNGfix_acTL(png_structp png_ptr, png_infop png_info_ptr,
static boolean M_SetupaPNG(png_const_charp filename, png_bytep pal)
{
+ png_uint_16 downscale;
+
+ apng_downscale = (!!cv_apng_downscale.value);
+
+ downscale = apng_downscale ? vid.dupx : 1;
+
apng_FILE = fopen(filename,"wb+"); // + mode for reading
if (!apng_FILE)
{
@@ -1080,7 +1104,7 @@ static boolean M_SetupaPNG(png_const_charp filename, png_bytep pal)
png_set_compression_strategy(apng_ptr, cv_zlib_strategya.value);
png_set_compression_window_bits(apng_ptr, cv_zlib_window_bitsa.value);
- M_PNGhdr(apng_ptr, apng_info_ptr, vid.width, vid.height, pal);
+ M_PNGhdr(apng_ptr, apng_info_ptr, vid.width / downscale, vid.height / downscale, pal);
M_PNGText(apng_ptr, apng_info_ptr, true);
diff --git a/src/m_misc.h b/src/m_misc.h
index dbded37d0a47fdc81c0488098e5bf7ac8e677143..c5ef9f9f2548e339ef76e96ae02f835b82dec23c 100644
--- a/src/m_misc.h
+++ b/src/m_misc.h
@@ -33,7 +33,7 @@ extern consvar_t cv_screenshot_option, cv_screenshot_folder, cv_screenshot_color
extern consvar_t cv_moviemode, cv_movie_folder, cv_movie_option;
extern consvar_t cv_zlib_memory, cv_zlib_level, cv_zlib_strategy, cv_zlib_window_bits;
extern consvar_t cv_zlib_memorya, cv_zlib_levela, cv_zlib_strategya, cv_zlib_window_bitsa;
-extern consvar_t cv_apng_delay;
+extern consvar_t cv_apng_delay, cv_apng_downscale;
void M_StartMovie(void);
void M_SaveFrame(void);
diff --git a/src/m_perfstats.c b/src/m_perfstats.c
new file mode 100644
index 0000000000000000000000000000000000000000..b58599b6d934651ab4d8a0e45f71713477921a52
--- /dev/null
+++ b/src/m_perfstats.c
@@ -0,0 +1,581 @@
+// SONIC ROBO BLAST 2
+//-----------------------------------------------------------------------------
+// Copyright (C) 2020 by Sonic Team Junior.
+//
+// This program is free software distributed under the
+// terms of the GNU General Public License, version 2.
+// See the 'LICENSE' file for more details.
+//-----------------------------------------------------------------------------
+/// \file m_perfstats.c
+/// \brief Performance measurement tools.
+
+#include "m_perfstats.h"
+#include "v_video.h"
+#include "i_video.h"
+#include "d_netcmd.h"
+#include "r_main.h"
+#include "i_system.h"
+#include "z_zone.h"
+#include "p_local.h"
+
+#ifdef HWRENDER
+#include "hardware/hw_main.h"
+#endif
+
+struct perfstatcol;
+struct perfstatrow;
+
+typedef struct perfstatcol perfstatcol_t;
+typedef struct perfstatrow perfstatrow_t;
+
+struct perfstatcol {
+ INT32 lores_x;
+ INT32 hires_x;
+ INT32 color;
+ perfstatrow_t * rows;
+};
+
+struct perfstatrow {
+ const char * lores_label;
+ const char * hires_label;
+ void * value;
+};
+
+static precise_t ps_frametime = 0;
+
+precise_t ps_tictime = 0;
+
+precise_t ps_playerthink_time = 0;
+precise_t ps_thinkertime = 0;
+
+precise_t ps_thlist_times[NUM_THINKERLISTS];
+
+int ps_checkposition_calls = 0;
+
+precise_t ps_lua_thinkframe_time = 0;
+int ps_lua_mobjhooks = 0;
+
+// dynamically allocated resizeable array for thinkframe hook stats
+ps_hookinfo_t *thinkframe_hooks = NULL;
+int thinkframe_hooks_length = 0;
+int thinkframe_hooks_capacity = 16;
+
+static INT32 draw_row;
+
+void PS_SetThinkFrameHookInfo(int index, precise_t time_taken, char* short_src)
+{
+ if (!thinkframe_hooks)
+ {
+ // array needs to be initialized
+ thinkframe_hooks = Z_Malloc(sizeof(ps_hookinfo_t) * thinkframe_hooks_capacity, PU_STATIC, NULL);
+ }
+ if (index >= thinkframe_hooks_capacity)
+ {
+ // array needs more space, realloc with double size
+ thinkframe_hooks_capacity *= 2;
+ thinkframe_hooks = Z_Realloc(thinkframe_hooks,
+ sizeof(ps_hookinfo_t) * thinkframe_hooks_capacity, PU_STATIC, NULL);
+ }
+ thinkframe_hooks[index].time_taken = time_taken;
+ memcpy(thinkframe_hooks[index].short_src, short_src, LUA_IDSIZE * sizeof(char));
+ // since the values are set sequentially from begin to end, the last call should leave
+ // the correct value to this variable
+ thinkframe_hooks_length = index + 1;
+}
+
+static void PS_SetFrameTime(void)
+{
+ precise_t currenttime = I_GetPreciseTime();
+ ps_frametime = currenttime - ps_prevframetime;
+ ps_prevframetime = currenttime;
+}
+
+static boolean M_HighResolution(void)
+{
+ return (vid.width >= 640 && vid.height >= 400);
+}
+
+enum {
+ PERF_TIME,
+ PERF_COUNT,
+};
+
+static void M_DrawPerfString(perfstatcol_t *col, int type)
+{
+ const boolean hires = M_HighResolution();
+
+ INT32 draw_flags = V_MONOSPACE | col->color;
+
+ perfstatrow_t * row;
+
+ int value;
+
+ if (hires)
+ draw_flags |= V_ALLOWLOWERCASE;
+
+ for (row = col->rows; row->lores_label; ++row)
+ {
+ if (type == PERF_TIME)
+ value = I_PreciseToMicros(*(precise_t *)row->value);
+ else
+ value = *(int *)row->value;
+
+ if (hires)
+ {
+ V_DrawSmallString(col->hires_x, draw_row, draw_flags,
+ va("%s %d", row->hires_label, value));
+
+ draw_row += 5;
+ }
+ else
+ {
+ V_DrawThinString(col->lores_x, draw_row, draw_flags,
+ va("%s %d", row->lores_label, value));
+
+ draw_row += 8;
+ }
+ }
+}
+
+static void M_DrawPerfTiming(perfstatcol_t *col)
+{
+ M_DrawPerfString(col, PERF_TIME);
+}
+
+static void M_DrawPerfCount(perfstatcol_t *col)
+{
+ M_DrawPerfString(col, PERF_COUNT);
+}
+
+static void M_DrawRenderStats(void)
+{
+ const boolean hires = M_HighResolution();
+
+ const int half_row = hires ? 5 : 4;
+
+ precise_t extrarendertime;
+
+ perfstatrow_t frametime_row[] = {
+ {"frmtime", "Frame time: ", &ps_frametime},
+ {0}
+ };
+
+ perfstatrow_t rendercalltime_row[] = {
+ {"drwtime", "3d rendering: ", &ps_rendercalltime},
+ {0}
+ };
+
+ perfstatrow_t opengltime_row[] = {
+ {"skybox ", "Skybox render: ", &ps_hw_skyboxtime},
+ {"bsptime", "RenderBSPNode: ", &ps_bsptime},
+ {"nodesrt", "Drwnode sort: ", &ps_hw_nodesorttime},
+ {"nodedrw", "Drwnode render:", &ps_hw_nodedrawtime},
+ {"sprsort", "Sprite sort: ", &ps_hw_spritesorttime},
+ {"sprdraw", "Sprite render: ", &ps_hw_spritedrawtime},
+ {"other ", "Other: ", &extrarendertime},
+ {0}
+ };
+
+ perfstatrow_t softwaretime_row[] = {
+ {"bsptime", "RenderBSPNode: ", &ps_bsptime},
+ {"sprclip", "R_ClipSprites: ", &ps_sw_spritecliptime},
+ {"portals", "Portals+Skybox:", &ps_sw_portaltime},
+ {"planes ", "R_DrawPlanes: ", &ps_sw_planetime},
+ {"masked ", "R_DrawMasked: ", &ps_sw_maskedtime},
+ {"other ", "Other: ", &extrarendertime},
+ {0}
+ };
+
+ perfstatrow_t uiswaptime_row[] = {
+ {"ui ", "UI render: ", &ps_uitime},
+ {"finupdt", "I_FinishUpdate:", &ps_swaptime},
+ {0}
+ };
+
+ perfstatrow_t tictime_row[] = {
+ {"logic ", "Game logic: ", &ps_tictime},
+ {0}
+ };
+
+ perfstatrow_t rendercalls_row[] = {
+ {"bspcall", "BSP calls: ", &ps_numbspcalls},
+ {"sprites", "Sprites: ", &ps_numsprites},
+ {"drwnode", "Drawnodes: ", &ps_numdrawnodes},
+ {"plyobjs", "Polyobjects: ", &ps_numpolyobjects},
+ {0}
+ };
+
+ perfstatrow_t batchtime_row[] = {
+ {"batsort", "Batch sort: ", &ps_hw_batchsorttime},
+ {"batdraw", "Batch render:", &ps_hw_batchdrawtime},
+ {0}
+ };
+
+ perfstatrow_t batchcount_row[] = {
+ {"polygon", "Polygons: ", &ps_hw_numpolys},
+ {"vertex ", "Vertices: ", &ps_hw_numverts},
+ {0}
+ };
+
+ perfstatrow_t batchcalls_row[] = {
+ {"drwcall", "Draw calls:", &ps_hw_numcalls},
+ {"shaders", "Shaders: ", &ps_hw_numshaders},
+ {"texture", "Textures: ", &ps_hw_numtextures},
+ {"polyflg", "Polyflags: ", &ps_hw_numpolyflags},
+ {"colors ", "Colors: ", &ps_hw_numcolors},
+ {0}
+ };
+
+ perfstatcol_t frametime_col = {20, 20, V_YELLOWMAP, frametime_row};
+ perfstatcol_t rendercalltime_col = {20, 20, V_YELLOWMAP, rendercalltime_row};
+
+ perfstatcol_t opengltime_col = {24, 24, V_YELLOWMAP, opengltime_row};
+ perfstatcol_t softwaretime_col = {24, 24, V_YELLOWMAP, softwaretime_row};
+
+ perfstatcol_t uiswaptime_col = {20, 20, V_YELLOWMAP, uiswaptime_row};
+ perfstatcol_t tictime_col = {20, 20, V_GRAYMAP, tictime_row};
+
+ perfstatcol_t rendercalls_col = {90, 115, V_BLUEMAP, rendercalls_row};
+
+ perfstatcol_t batchtime_col = {90, 115, V_REDMAP, batchtime_row};
+
+ perfstatcol_t batchcount_col = {155, 200, V_PURPLEMAP, batchcount_row};
+ perfstatcol_t batchcalls_col = {220, 200, V_PURPLEMAP, batchcalls_row};
+
+
+ boolean rendering = (
+ gamestate == GS_LEVEL ||
+ (gamestate == GS_TITLESCREEN && titlemapinaction)
+ );
+
+ draw_row = 10;
+ M_DrawPerfTiming(&frametime_col);
+
+ if (rendering)
+ {
+ M_DrawPerfTiming(&rendercalltime_col);
+
+ // Remember to update this calculation when adding more 3d rendering stats!
+ extrarendertime = ps_rendercalltime - ps_bsptime;
+
+#ifdef HWRENDER
+ if (rendermode == render_opengl)
+ {
+ extrarendertime -=
+ ps_hw_skyboxtime +
+ ps_hw_nodesorttime +
+ ps_hw_nodedrawtime +
+ ps_hw_spritesorttime +
+ ps_hw_spritedrawtime;
+
+ if (cv_glbatching.value)
+ {
+ extrarendertime -=
+ ps_hw_batchsorttime +
+ ps_hw_batchdrawtime;
+ }
+
+ M_DrawPerfTiming(&opengltime_col);
+ }
+ else
+#endif
+ {
+ extrarendertime -=
+ ps_sw_spritecliptime +
+ ps_sw_portaltime +
+ ps_sw_planetime +
+ ps_sw_maskedtime;
+
+ M_DrawPerfTiming(&softwaretime_col);
+ }
+ }
+
+ M_DrawPerfTiming(&uiswaptime_col);
+
+ draw_row += half_row;
+ M_DrawPerfTiming(&tictime_col);
+
+ if (rendering)
+ {
+ draw_row = 10;
+ M_DrawPerfCount(&rendercalls_col);
+
+#ifdef HWRENDER
+ if (rendermode == render_opengl && cv_glbatching.value)
+ {
+ draw_row += half_row;
+ M_DrawPerfTiming(&batchtime_col);
+
+ draw_row = 10;
+ M_DrawPerfCount(&batchcount_col);
+
+ if (hires)
+ draw_row += half_row;
+ else
+ draw_row = 10;
+
+ M_DrawPerfCount(&batchcalls_col);
+ }
+#endif
+ }
+}
+
+static void M_DrawTickStats(void)
+{
+ int i = 0;
+ thinker_t *thinker;
+ int thinkercount = 0;
+ int polythcount = 0;
+ int mainthcount = 0;
+ int mobjcount = 0;
+ int nothinkcount = 0;
+ int scenerycount = 0;
+ int regularcount = 0;
+ int dynslopethcount = 0;
+ int precipcount = 0;
+ int removecount = 0;
+
+ precise_t extratime =
+ ps_tictime -
+ ps_playerthink_time -
+ ps_thinkertime -
+ ps_lua_thinkframe_time;
+
+ perfstatrow_t tictime_row[] = {
+ {"logic ", "Game logic: ", &ps_tictime},
+ {0}
+ };
+
+ perfstatrow_t thinker_time_row[] = {
+ {"plrthnk", "P_PlayerThink: ", &ps_playerthink_time},
+ {"thnkers", "P_RunThinkers: ", &ps_thinkertime},
+ {0}
+ };
+
+ perfstatrow_t detailed_thinker_time_row[] = {
+ {"plyobjs", "Polyobjects: ", &ps_thlist_times[THINK_POLYOBJ]},
+ {"main ", "Main: ", &ps_thlist_times[THINK_MAIN]},
+ {"mobjs ", "Mobjs: ", &ps_thlist_times[THINK_MOBJ]},
+ {"dynslop", "Dynamic slopes: ", &ps_thlist_times[THINK_DYNSLOPE]},
+ {"precip ", "Precipitation: ", &ps_thlist_times[THINK_PRECIP]},
+ {0}
+ };
+
+ perfstatrow_t extra_thinker_time_row[] = {
+ {"lthinkf", "LUAh_ThinkFrame:", &ps_lua_thinkframe_time},
+ {"other ", "Other: ", &extratime},
+ {0}
+ };
+
+ perfstatrow_t thinkercount_row[] = {
+ {"thnkers", "Thinkers: ", &thinkercount},
+ {0}
+ };
+
+ perfstatrow_t detailed_thinkercount_row[] = {
+ {"plyobjs", "Polyobjects: ", &polythcount},
+ {"main ", "Main: ", &mainthcount},
+ {"mobjs ", "Mobjs: ", &mobjcount},
+ {0}
+ };
+
+ perfstatrow_t mobjthinkercount_row[] = {
+ {"regular", "Regular: ", ®ularcount},
+ {"scenery", "Scenery: ", &scenerycount},
+ {0}
+ };
+
+ perfstatrow_t nothinkcount_row[] = {
+ {"nothink", "Nothink: ", ¬hinkcount},
+ {0}
+ };
+
+ perfstatrow_t detailed_thinkercount_row2[] = {
+ {"dynslop", "Dynamic slopes: ", &dynslopethcount},
+ {"precip ", "Precipitation: ", &precipcount},
+ {"remove ", "Pending removal:", &removecount},
+ {0}
+ };
+
+ perfstatrow_t misc_calls_row[] = {
+ {"lmhook", "Lua mobj hooks: ", &ps_lua_mobjhooks},
+ {"chkpos", "P_CheckPosition:", &ps_checkposition_calls},
+ {0}
+ };
+
+ perfstatcol_t tictime_col = {20, 20, V_YELLOWMAP, tictime_row};
+ perfstatcol_t thinker_time_col = {24, 24, V_YELLOWMAP, thinker_time_row};
+ perfstatcol_t detailed_thinker_time_col = {28, 28, V_YELLOWMAP, detailed_thinker_time_row};
+ perfstatcol_t extra_thinker_time_col = {24, 24, V_YELLOWMAP, extra_thinker_time_row};
+
+ perfstatcol_t thinkercount_col = {90, 115, V_BLUEMAP, thinkercount_row};
+ perfstatcol_t detailed_thinkercount_col = {94, 119, V_BLUEMAP, detailed_thinkercount_row};
+ perfstatcol_t mobjthinkercount_col = {98, 123, V_BLUEMAP, mobjthinkercount_row};
+ perfstatcol_t nothinkcount_col = {98, 123, V_BLUEMAP, nothinkcount_row};
+ perfstatcol_t detailed_thinkercount_col2 = {94, 119, V_BLUEMAP, detailed_thinkercount_row2};
+ perfstatcol_t misc_calls_col = {170, 216, V_PURPLEMAP, misc_calls_row};
+
+ for (i = 0; i < NUM_THINKERLISTS; i++)
+ {
+ for (thinker = thlist[i].next; thinker != &thlist[i]; thinker = thinker->next)
+ {
+ thinkercount++;
+ if (thinker->function.acp1 == (actionf_p1)P_RemoveThinkerDelayed)
+ removecount++;
+ else if (i == THINK_POLYOBJ)
+ polythcount++;
+ else if (i == THINK_MAIN)
+ mainthcount++;
+ else if (i == THINK_MOBJ)
+ {
+ if (thinker->function.acp1 == (actionf_p1)P_MobjThinker)
+ {
+ mobj_t *mobj = (mobj_t*)thinker;
+ mobjcount++;
+ if (mobj->flags & MF_NOTHINK)
+ nothinkcount++;
+ else if (mobj->flags & MF_SCENERY)
+ scenerycount++;
+ else
+ regularcount++;
+ }
+ }
+ else if (i == THINK_DYNSLOPE)
+ dynslopethcount++;
+ else if (i == THINK_PRECIP)
+ precipcount++;
+ }
+ }
+
+ draw_row = 10;
+ M_DrawPerfTiming(&tictime_col);
+ M_DrawPerfTiming(&thinker_time_col);
+ M_DrawPerfTiming(&detailed_thinker_time_col);
+ M_DrawPerfTiming(&extra_thinker_time_col);
+
+ draw_row = 10;
+ M_DrawPerfCount(&thinkercount_col);
+ M_DrawPerfCount(&detailed_thinkercount_col);
+ M_DrawPerfCount(&mobjthinkercount_col);
+
+ if (nothinkcount)
+ M_DrawPerfCount(¬hinkcount_col);
+
+ M_DrawPerfCount(&detailed_thinkercount_col2);
+
+ if (M_HighResolution())
+ {
+ V_DrawSmallString(212, 10, V_MONOSPACE | V_ALLOWLOWERCASE | V_PURPLEMAP, "Calls:");
+
+ draw_row = 15;
+ }
+ else
+ {
+ draw_row = 10;
+ }
+
+ M_DrawPerfCount(&misc_calls_col);
+}
+
+void M_DrawPerfStats(void)
+{
+ char s[100];
+
+ PS_SetFrameTime();
+
+ if (cv_perfstats.value == 1) // rendering
+ {
+ M_DrawRenderStats();
+ }
+ else if (cv_perfstats.value == 2) // logic
+ {
+ M_DrawTickStats();
+ }
+ else if (cv_perfstats.value == 3) // lua thinkframe
+ {
+ if (!(gamestate == GS_LEVEL || (gamestate == GS_TITLESCREEN && titlemapinaction)))
+ return;
+ if (vid.width < 640 || vid.height < 400) // low resolution
+ {
+ // it's not gonna fit very well..
+ V_DrawThinString(30, 30, V_MONOSPACE | V_ALLOWLOWERCASE | V_YELLOWMAP, "Not available for resolutions below 640x400");
+ }
+ else // high resolution
+ {
+ int i;
+ // text writing position
+ int x = 2;
+ int y = 4;
+ UINT32 text_color;
+ char tempbuffer[LUA_IDSIZE];
+ char last_mod_name[LUA_IDSIZE];
+ last_mod_name[0] = '\0';
+ for (i = 0; i < thinkframe_hooks_length; i++)
+ {
+ char* str = thinkframe_hooks[i].short_src;
+ char* tempstr = tempbuffer;
+ int len = (int)strlen(str);
+ char* str_ptr;
+ if (strcmp(".lua", str + len - 4) == 0)
+ {
+ str[len-4] = '\0'; // remove .lua at end
+ len -= 4;
+ }
+ // we locate the wad/pk3 name in the string and compare it to
+ // what we found on the previous iteration.
+ // if the name has changed, print it out on the screen
+ strcpy(tempstr, str);
+ str_ptr = strrchr(tempstr, '|');
+ if (str_ptr)
+ {
+ *str_ptr = '\0';
+ str = str_ptr + 1; // this is the name of the hook without the mod file name
+ str_ptr = strrchr(tempstr, PATHSEP[0]);
+ if (str_ptr)
+ tempstr = str_ptr + 1;
+ // tempstr should now point to the mod name, (wad/pk3) possibly truncated
+ if (strcmp(tempstr, last_mod_name) != 0)
+ {
+ strcpy(last_mod_name, tempstr);
+ len = (int)strlen(tempstr);
+ if (len > 25)
+ tempstr += len - 25;
+ snprintf(s, sizeof s - 1, "%s", tempstr);
+ V_DrawSmallString(x, y, V_MONOSPACE | V_ALLOWLOWERCASE | V_GRAYMAP, s);
+ y += 4; // repeated code!
+ if (y > 192)
+ {
+ y = 4;
+ x += 106;
+ if (x > 214)
+ break;
+ }
+ }
+ text_color = V_YELLOWMAP;
+ }
+ else
+ {
+ // probably a standalone lua file
+ // cut off the folder if it's there
+ str_ptr = strrchr(tempstr, PATHSEP[0]);
+ if (str_ptr)
+ str = str_ptr + 1;
+ text_color = 0; // white
+ }
+ len = (int)strlen(str);
+ if (len > 20)
+ str += len - 20;
+ snprintf(s, sizeof s - 1, "%20s: %d", str, I_PreciseToMicros(thinkframe_hooks[i].time_taken));
+ V_DrawSmallString(x, y, V_MONOSPACE | V_ALLOWLOWERCASE | text_color, s);
+ y += 4; // repeated code!
+ if (y > 192)
+ {
+ y = 4;
+ x += 106;
+ if (x > 214)
+ break;
+ }
+ }
+ }
+ }
+}
diff --git a/src/m_perfstats.h b/src/m_perfstats.h
new file mode 100644
index 0000000000000000000000000000000000000000..1ca71957fcb7581eaa9248a6905e83358b1abcb0
--- /dev/null
+++ b/src/m_perfstats.h
@@ -0,0 +1,41 @@
+// SONIC ROBO BLAST 2
+//-----------------------------------------------------------------------------
+// Copyright (C) 2020 by Sonic Team Junior.
+//
+// This program is free software distributed under the
+// terms of the GNU General Public License, version 2.
+// See the 'LICENSE' file for more details.
+//-----------------------------------------------------------------------------
+/// \file m_perfstats.h
+/// \brief Performance measurement tools.
+
+#ifndef __M_PERFSTATS_H__
+#define __M_PERFSTATS_H__
+
+#include "doomdef.h"
+#include "lua_script.h"
+#include "p_local.h"
+
+extern precise_t ps_tictime;
+
+extern precise_t ps_playerthink_time;
+extern precise_t ps_thinkertime;
+
+extern precise_t ps_thlist_times[];
+
+extern int ps_checkposition_calls;
+
+extern precise_t ps_lua_thinkframe_time;
+extern int ps_lua_mobjhooks;
+
+typedef struct
+{
+ precise_t time_taken;
+ char short_src[LUA_IDSIZE];
+} ps_hookinfo_t;
+
+void PS_SetThinkFrameHookInfo(int index, precise_t time_taken, char* short_src);
+
+void M_DrawPerfStats(void);
+
+#endif
diff --git a/src/mserv.c b/src/mserv.c
index 27d479797de6d5222360ed6db79ef5a7ab4b7069..dfb4174156978b35f6d29bebee1738eac0f2d446 100644
--- a/src/mserv.c
+++ b/src/mserv.c
@@ -61,10 +61,10 @@ static CV_PossibleValue_t masterserver_update_rate_cons_t[] = {
{0,NULL}
};
-consvar_t cv_masterserver = {"masterserver", "https://mb.srb2.org/MS/0", CV_SAVE|CV_CALL, NULL, MasterServer_OnChange, 0, NULL, NULL, 0, 0, NULL};
-consvar_t cv_servername = {"servername", "SRB2 server", CV_SAVE|CV_CALL|CV_NOINIT, NULL, Update_parameters, 0, NULL, NULL, 0, 0, NULL};
+consvar_t cv_masterserver = CVAR_INIT ("masterserver", "https://mb.srb2.org/MS/0", CV_SAVE|CV_CALL, NULL, MasterServer_OnChange);
+consvar_t cv_servername = CVAR_INIT ("servername", "SRB2 server", CV_SAVE|CV_NETVAR|CV_CALL|CV_NOINIT, NULL, Update_parameters);
-consvar_t cv_masterserver_update_rate = {"masterserver_update_rate", "15", CV_SAVE|CV_CALL|CV_NOINIT, masterserver_update_rate_cons_t, Update_parameters, 0, NULL, NULL, 0, 0, NULL};
+consvar_t cv_masterserver_update_rate = CVAR_INIT ("masterserver_update_rate", "15", CV_SAVE|CV_CALL|CV_NOINIT, masterserver_update_rate_cons_t, Update_parameters);
INT16 ms_RoomId = -1;
diff --git a/src/p_ceilng.c b/src/p_ceilng.c
index 3c3c507cd168e46a50ccdce3a503c8570c028797..f12499d5ce6315e1a8baf70b43f454443ae0bef8 100644
--- a/src/p_ceilng.c
+++ b/src/p_ceilng.c
@@ -394,8 +394,10 @@ INT32 EV_DoCeiling(line_t *line, ceiling_e type)
INT32 secnum = -1;
sector_t *sec;
ceiling_t *ceiling;
+ mtag_t tag = Tag_FGet(&line->tags);
+ TAG_ITER_DECLARECOUNTER(0);
- while ((secnum = P_FindSectorFromTag(line->tag,secnum)) >= 0)
+ TAG_ITER_SECTORS(0, tag, secnum)
{
sec = §ors[secnum];
@@ -593,7 +595,7 @@ INT32 EV_DoCeiling(line_t *line, ceiling_e type)
}
- ceiling->tag = sec->tag;
+ ceiling->tag = tag;
ceiling->type = type;
firstone = 0;
}
@@ -614,8 +616,10 @@ INT32 EV_DoCrush(line_t *line, ceiling_e type)
INT32 secnum = -1;
sector_t *sec;
ceiling_t *ceiling;
+ mtag_t tag = Tag_FGet(&line->tags);
+ TAG_ITER_DECLARECOUNTER(0);
- while ((secnum = P_FindSectorFromTag(line->tag,secnum)) >= 0)
+ TAG_ITER_SECTORS(0, tag, secnum)
{
sec = §ors[secnum];
@@ -670,7 +674,7 @@ INT32 EV_DoCrush(line_t *line, ceiling_e type)
break;
}
- ceiling->tag = sec->tag;
+ ceiling->tag = tag;
ceiling->type = type;
}
return rtn;
diff --git a/src/p_enemy.c b/src/p_enemy.c
index ddb01b63ba4fdb2a0fa7ea1cc524a4f531f1b5d8..51f18f596e58fb39add493617360539329c8009f 100644
--- a/src/p_enemy.c
+++ b/src/p_enemy.c
@@ -30,7 +30,7 @@
#include "hardware/hw3sound.h"
#endif
-boolean LUA_CallAction(const char *action, mobj_t *actor);
+boolean LUA_CallAction(enum actionnum actionnum, mobj_t *actor);
player_t *stplyr;
INT32 var1;
@@ -981,7 +981,7 @@ void A_Look(mobj_t *actor)
INT32 locvar1 = var1;
INT32 locvar2 = var2;
- if (LUA_CallAction("A_Look", actor))
+ if (LUA_CallAction(A_LOOK, actor))
return;
if (!P_LookForPlayers(actor, locvar1 & 65535, false , FixedMul((locvar1 >> 16)*FRACUNIT, actor->scale)))
@@ -1014,7 +1014,7 @@ void A_Chase(mobj_t *actor)
INT32 delta;
INT32 locvar1 = var1;
- if (LUA_CallAction("A_Chase", actor))
+ if (LUA_CallAction(A_CHASE, actor))
return;
I_Assert(actor != NULL);
@@ -1105,7 +1105,7 @@ void A_FaceStabChase(mobj_t *actor)
{
INT32 delta;
- if (LUA_CallAction("A_FaceStabChase", actor))
+ if (LUA_CallAction(A_FACESTABCHASE, actor))
return;
if (actor->reactiontime)
@@ -1227,7 +1227,7 @@ void A_FaceStabRev(mobj_t *actor)
INT32 locvar1 = var1;
INT32 locvar2 = var2;
- if (LUA_CallAction("A_FaceStabRev", actor))
+ if (LUA_CallAction(A_FACESTABREV, actor))
return;
if (!actor->target)
@@ -1270,7 +1270,7 @@ void A_FaceStabHurl(mobj_t *actor)
INT32 locvar1 = var1;
INT32 locvar2 = var2;
- if (LUA_CallAction("A_FaceStabHurl", actor))
+ if (LUA_CallAction(A_FACESTABHURL, actor))
return;
if (actor->target)
@@ -1360,7 +1360,7 @@ void A_FaceStabMiss(mobj_t *actor)
{
INT32 locvar2 = var2;
- if (LUA_CallAction("A_FaceStabMiss", actor))
+ if (LUA_CallAction(A_FACESTABMISS, actor))
return;
if (++actor->extravalue1 >= 3)
@@ -1395,7 +1395,7 @@ void A_StatueBurst(mobj_t *actor)
mobjtype_t chunktype = (mobjtype_t)actor->info->raisestate;
mobj_t *new;
- if (LUA_CallAction("A_StatueBurst", actor))
+ if (LUA_CallAction(A_STATUEBURST, actor))
return;
if (!locvar1 || !(new = P_SpawnMobjFromMobj(actor, 0, 0, 0, locvar1)))
@@ -1445,7 +1445,7 @@ void A_StatueBurst(mobj_t *actor)
//
void A_JetJawRoam(mobj_t *actor)
{
- if (LUA_CallAction("A_JetJawRoam", actor))
+ if (LUA_CallAction(A_JETJAWROAM, actor))
return;
if (actor->reactiontime)
@@ -1474,7 +1474,7 @@ void A_JetJawChomp(mobj_t *actor)
{
INT32 delta;
- if (LUA_CallAction("A_JetJawChomp", actor))
+ if (LUA_CallAction(A_JETJAWCHOMP, actor))
return;
// turn towards movement direction if not there yet
@@ -1521,7 +1521,7 @@ void A_PointyThink(mobj_t *actor)
boolean firsttime = true;
INT32 sign;
- if (LUA_CallAction("A_PointyThink", actor))
+ if (LUA_CallAction(A_POINTYTHINK, actor))
return;
actor->momx = actor->momy = actor->momz = 0;
@@ -1619,7 +1619,7 @@ void A_CheckBuddy(mobj_t *actor)
{
INT32 locvar1 = var1;
- if (LUA_CallAction("A_CheckBuddy", actor))
+ if (LUA_CallAction(A_CHECKBUDDY, actor))
return;
if (locvar1 && (!actor->tracer || actor->tracer->health <= 0))
@@ -1662,7 +1662,7 @@ void A_HoodFire(mobj_t *actor)
mobj_t *arrow;
INT32 locvar1 = var1;
- if (LUA_CallAction("A_HoodFire", actor))
+ if (LUA_CallAction(A_HOODFIRE, actor))
return;
// Check target first.
@@ -1694,7 +1694,7 @@ void A_HoodThink(mobj_t *actor)
fixed_t dx, dy, dz, dm;
boolean checksight;
- if (LUA_CallAction("A_HoodThink", actor))
+ if (LUA_CallAction(A_HOODTHINK, actor))
return;
// Check target first.
@@ -1761,7 +1761,7 @@ void A_HoodThink(mobj_t *actor)
//
void A_HoodFall(mobj_t *actor)
{
- if (LUA_CallAction("A_HoodFall", actor))
+ if (LUA_CallAction(A_HOODFALL, actor))
return;
if (!P_IsObjectOnGround(actor))
@@ -1781,7 +1781,7 @@ void A_HoodFall(mobj_t *actor)
//
void A_ArrowBonks(mobj_t *actor)
{
- if (LUA_CallAction("A_ArrowBonks", actor))
+ if (LUA_CallAction(A_ARROWBONKS, actor))
return;
if (((actor->eflags & MFE_VERTICALFLIP) && actor->z + actor->height >= actor->ceilingz)
@@ -1804,7 +1804,7 @@ void A_ArrowBonks(mobj_t *actor)
//
void A_SnailerThink(mobj_t *actor)
{
- if (LUA_CallAction("A_SnailerThink", actor))
+ if (LUA_CallAction(A_SNAILERTHINK, actor))
return;
if (!actor->target || !(actor->target->flags & MF_SHOOTABLE))
@@ -1877,7 +1877,7 @@ void A_SnailerThink(mobj_t *actor)
//
void A_SharpChase(mobj_t *actor)
{
- if (LUA_CallAction("A_SharpChase", actor))
+ if (LUA_CallAction(A_SHARPCHASE, actor))
return;
if (actor->reactiontime)
@@ -1933,7 +1933,7 @@ void A_SharpSpin(mobj_t *actor)
INT32 locvar2 = var2;
angle_t oldang = actor->angle;
- if (LUA_CallAction("A_SharpSpin", actor))
+ if (LUA_CallAction(A_SHARPSPIN, actor))
return;
if (actor->threshold && actor->target)
@@ -1966,7 +1966,7 @@ void A_SharpSpin(mobj_t *actor)
//
void A_SharpDecel(mobj_t *actor)
{
- if (LUA_CallAction("A_SharpDecel", actor))
+ if (LUA_CallAction(A_SHARPDECEL, actor))
return;
if (actor->momx > 2 || actor->momy > 2)
@@ -1991,7 +1991,7 @@ void A_CrushstaceanWalk(mobj_t *actor)
INT32 locvar2 = (var2 ? var2 : (INT32)actor->info->spawnstate);
angle_t ang = actor->angle + ((actor->flags2 & MF2_AMBUSH) ? ANGLE_90 : ANGLE_270);
- if (LUA_CallAction("A_CrushstaceanWalk", actor))
+ if (LUA_CallAction(A_CRUSHSTACEANWALK, actor))
return;
actor->reactiontime--;
@@ -2020,7 +2020,7 @@ void A_CrushstaceanPunch(mobj_t *actor)
{
INT32 locvar2 = (var2 ? var2 : (INT32)actor->info->spawnstate);
- if (LUA_CallAction("A_CrushstaceanPunch", actor))
+ if (LUA_CallAction(A_CRUSHSTACEANPUNCH, actor))
return;
if (!actor->tracer)
@@ -2052,7 +2052,7 @@ void A_CrushclawAim(mobj_t *actor)
mobj_t *crab = actor->tracer;
angle_t ang;
- if (LUA_CallAction("A_CrushclawAim", actor))
+ if (LUA_CallAction(A_CRUSHCLAWAIM, actor))
return;
if (!crab)
@@ -2113,7 +2113,7 @@ void A_CrushclawLaunch(mobj_t *actor)
INT32 locvar2 = var2;
mobj_t *crab = actor->tracer;
- if (LUA_CallAction("A_CrushclawLaunch", actor))
+ if (LUA_CallAction(A_CRUSHCLAWLAUNCH, actor))
return;
if (!crab)
@@ -2244,7 +2244,7 @@ void A_CrushclawLaunch(mobj_t *actor)
//
void A_VultureVtol(mobj_t *actor)
{
- if (LUA_CallAction("A_VultureVtol", actor))
+ if (LUA_CallAction(A_VULTUREVTOL, actor))
return;
if (!actor->target)
@@ -2279,7 +2279,7 @@ void A_VultureVtol(mobj_t *actor)
//
void A_VultureCheck(mobj_t *actor)
{
- if (LUA_CallAction("A_VultureCheck", actor))
+ if (LUA_CallAction(A_VULTURECHECK, actor))
return;
if (actor->momx || actor->momy)
@@ -2335,7 +2335,7 @@ void A_VultureHover(mobj_t *actor)
fixed_t memz = actor->z;
SINT8 i;
- if (LUA_CallAction("A_VultureHover", actor))
+ if (LUA_CallAction(A_VULTUREHOVER, actor))
return;
if (!actor->target || P_MobjWasRemoved(actor->target))
@@ -2397,7 +2397,7 @@ void A_VultureBlast(mobj_t *actor)
angle_t faa;
fixed_t faacos, faasin;
- if (LUA_CallAction("A_VultureBlast", actor))
+ if (LUA_CallAction(A_VULTUREBLAST, actor))
return;
S_StartSound(actor, actor->info->attacksound);
@@ -2436,7 +2436,7 @@ void A_VultureFly(mobj_t *actor)
mobj_t *dust;
fixed_t momm;
- if (LUA_CallAction("A_VultureFly", actor))
+ if (LUA_CallAction(A_VULTUREFLY, actor))
return;
if (!actor->target || P_MobjWasRemoved(actor->target))
@@ -2528,7 +2528,7 @@ void A_SkimChase(mobj_t *actor)
{
INT32 delta;
- if (LUA_CallAction("A_SkimChase", actor))
+ if (LUA_CallAction(A_SKIMCHASE, actor))
return;
if (actor->reactiontime)
@@ -2614,7 +2614,7 @@ nomissile:
//
void A_FaceTarget(mobj_t *actor)
{
- if (LUA_CallAction("A_FaceTarget", actor))
+ if (LUA_CallAction(A_FACETARGET, actor))
return;
if (!actor->target)
@@ -2632,7 +2632,7 @@ void A_FaceTarget(mobj_t *actor)
//
void A_FaceTracer(mobj_t *actor)
{
- if (LUA_CallAction("A_FaceTracer", actor))
+ if (LUA_CallAction(A_FACETRACER, actor))
return;
if (!actor->tracer)
@@ -2661,7 +2661,7 @@ void A_LobShot(mobj_t *actor)
fixed_t vertical, horizontal;
fixed_t airtime = var2 & 65535;
- if (LUA_CallAction("A_LobShot", actor))
+ if (LUA_CallAction(A_LOBSHOT, actor))
return;
if (!actor->target)
@@ -2761,7 +2761,7 @@ void A_FireShot(mobj_t *actor)
INT32 locvar1 = var1;
INT32 locvar2 = var2;
- if (LUA_CallAction("A_FireShot", actor))
+ if (LUA_CallAction(A_FIRESHOT, actor))
return;
if (!actor->target)
@@ -2799,7 +2799,7 @@ void A_SuperFireShot(mobj_t *actor)
INT32 locvar1 = var1;
INT32 locvar2 = var2;
- if (LUA_CallAction("A_SuperFireShot", actor))
+ if (LUA_CallAction(A_SUPERFIRESHOT, actor))
return;
if (!actor->target)
@@ -2846,7 +2846,7 @@ void A_BossFireShot(mobj_t *actor)
INT32 locvar2 = var2;
mobj_t *missile;
- if (LUA_CallAction("A_BossFireShot", actor))
+ if (LUA_CallAction(A_BOSSFIRESHOT, actor))
return;
if (!actor->target)
@@ -2930,7 +2930,7 @@ void A_Boss7FireMissiles(mobj_t *actor)
INT32 locvar1 = var1;
INT32 locvar2 = var2;
- if (LUA_CallAction("A_Boss7FireMissiles", actor))
+ if (LUA_CallAction(A_BOSS7FIREMISSILES, actor))
return;
if (!actor->target)
@@ -3005,7 +3005,7 @@ void A_Boss1Laser(mobj_t *actor)
SKINCOLOR_SUPERRED3,
};
- if (LUA_CallAction("A_Boss1Laser", actor))
+ if (LUA_CallAction(A_BOSS1LASER, actor))
return;
if (!actor->target)
@@ -3176,7 +3176,7 @@ void A_FocusTarget(mobj_t *actor)
INT32 locvar1 = var1;
INT32 locvar2 = var2;
- if (LUA_CallAction("A_FocusTarget", actor))
+ if (LUA_CallAction(A_FOCUSTARGET, actor))
return;
if (actor->target)
@@ -3227,7 +3227,7 @@ void A_Boss4Reverse(mobj_t *actor)
sfxenum_t locvar1 = (sfxenum_t)var1;
sfxenum_t locvar2 = (sfxenum_t)var2;
- if (LUA_CallAction("A_Boss4Reverse", actor))
+ if (LUA_CallAction(A_BOSS4REVERSE, actor))
return;
actor->reactiontime = 0;
@@ -3262,7 +3262,7 @@ void A_Boss4SpeedUp(mobj_t *actor)
{
sfxenum_t locvar1 = (sfxenum_t)var1;
- if (LUA_CallAction("A_Boss4SpeedUp", actor))
+ if (LUA_CallAction(A_BOSS4SPEEDUP, actor))
return;
S_StartSound(NULL, locvar1);
@@ -3280,7 +3280,7 @@ void A_Boss4Raise(mobj_t *actor)
{
sfxenum_t locvar1 = (sfxenum_t)var1;
- if (LUA_CallAction("A_Boss4Raise", actor))
+ if (LUA_CallAction(A_BOSS4RAISE, actor))
return;
S_StartSound(NULL, locvar1);
@@ -3311,7 +3311,7 @@ void A_SkullAttack(mobj_t *actor)
INT32 locvar1 = var1;
INT32 locvar2 = var2;
- if (LUA_CallAction("A_SkullAttack", actor))
+ if (LUA_CallAction(A_SKULLATTACK, actor))
return;
if (!actor->target)
@@ -3429,7 +3429,7 @@ void A_BossZoom(mobj_t *actor)
angle_t an;
INT32 dist;
- if (LUA_CallAction("A_BossZoom", actor))
+ if (LUA_CallAction(A_BOSSZOOM, actor))
return;
if (!actor->target)
@@ -3469,7 +3469,7 @@ void A_BossScream(mobj_t *actor)
INT32 locvar2 = var2;
mobjtype_t explodetype;
- if (LUA_CallAction("A_BossScream", actor))
+ if (LUA_CallAction(A_BOSSSCREAM, actor))
return;
if (locvar1 & 1)
@@ -3514,7 +3514,7 @@ void A_BossScream(mobj_t *actor)
//
void A_Scream(mobj_t *actor)
{
- if (LUA_CallAction("A_Scream", actor))
+ if (LUA_CallAction(A_SCREAM, actor))
return;
if (actor->tracer && (actor->tracer->type == MT_SHELL || actor->tracer->type == MT_FIREBALL))
@@ -3532,7 +3532,7 @@ void A_Scream(mobj_t *actor)
//
void A_Pain(mobj_t *actor)
{
- if (LUA_CallAction("A_Pain", actor))
+ if (LUA_CallAction(A_PAIN, actor))
return;
if (actor->info->painsound)
@@ -3553,7 +3553,7 @@ void A_Fall(mobj_t *actor)
{
INT32 locvar1 = var1;
- if (LUA_CallAction("A_Fall", actor))
+ if (LUA_CallAction(A_FALL, actor))
return;
// actor is on ground, it can be walked over
@@ -3585,7 +3585,7 @@ void A_1upThinker(mobj_t *actor)
fixed_t temp;
INT32 closestplayer = -1;
- if (LUA_CallAction("A_1upThinker", actor))
+ if (LUA_CallAction(A_1UPTHINKER, actor))
return;
for (i = 0; i < MAXPLAYERS; i++)
@@ -3651,7 +3651,7 @@ void A_MonitorPop(mobj_t *actor)
mobjtype_t item = 0;
mobj_t *newmobj;
- if (LUA_CallAction("A_MonitorPop", actor))
+ if (LUA_CallAction(A_MONITORPOP, actor))
return;
// Spawn the "pop" explosion.
@@ -3732,7 +3732,7 @@ void A_GoldMonitorPop(mobj_t *actor)
mobjtype_t item = 0;
mobj_t *newmobj;
- if (LUA_CallAction("A_GoldMonitorPop", actor))
+ if (LUA_CallAction(A_GOLDMONITORPOP, actor))
return;
// Don't spawn the "pop" explosion, because the monitor isn't broken.
@@ -3815,7 +3815,7 @@ void A_GoldMonitorPop(mobj_t *actor)
//
void A_GoldMonitorRestore(mobj_t *actor)
{
- if (LUA_CallAction("A_GoldMonitorRestore", actor))
+ if (LUA_CallAction(A_GOLDMONITORRESTORE, actor))
return;
actor->flags |= MF_MONITOR|MF_SHOOTABLE;
@@ -3833,7 +3833,7 @@ void A_GoldMonitorSparkle(mobj_t *actor)
{
fixed_t i, ngangle, xofs, yofs;
- if (LUA_CallAction("A_GoldMonitorSparkle", actor))
+ if (LUA_CallAction(A_GOLDMONITORSPARKLE, actor))
return;
ngangle = FixedAngle(((leveltime * 21) % 360) << FRACBITS);
@@ -3855,7 +3855,7 @@ void A_Explode(mobj_t *actor)
{
INT32 locvar1 = var1;
- if (LUA_CallAction("A_Explode", actor))
+ if (LUA_CallAction(A_EXPLODE, actor))
return;
P_RadiusAttack(actor, actor->target, actor->info->damage, locvar1, true);
@@ -3875,7 +3875,7 @@ void A_BossDeath(mobj_t *mo)
line_t junk;
INT32 i;
- if (LUA_CallAction("A_BossDeath", mo))
+ if (LUA_CallAction(A_BOSSDEATH, mo))
return;
if (mo->spawnpoint && mo->spawnpoint->extrainfo)
@@ -3924,12 +3924,17 @@ void A_BossDeath(mobj_t *mo)
}
else
{
+ // Initialize my junk
+ junk.tags.tags = NULL;
+ junk.tags.count = 0;
+
// Bring the egg trap up to the surface
- junk.tag = LE_CAPSULE0;
+ // Incredibly shitty code ahead
+ Tag_FSet(&junk.tags, LE_CAPSULE0);
EV_DoElevator(&junk, elevateHighest, false);
- junk.tag = LE_CAPSULE1;
+ Tag_FSet(&junk.tags, LE_CAPSULE1);
EV_DoElevator(&junk, elevateUp, false);
- junk.tag = LE_CAPSULE2;
+ Tag_FSet(&junk.tags, LE_CAPSULE2);
EV_DoElevator(&junk, elevateHighest, false);
if (mapheaderinfo[gamemap-1]->muspostbossname[0] &&
@@ -4052,7 +4057,11 @@ bossjustdie:
}
case MT_KOOPA:
{
- junk.tag = LE_KOOPA;
+ // Initialize my junk
+ junk.tags.tags = NULL;
+ junk.tags.count = 0;
+
+ Tag_FSet(&junk.tags, LE_KOOPA);
EV_DoCeiling(&junk, raiseToHighest);
return;
}
@@ -4183,7 +4192,7 @@ void A_CustomPower(mobj_t *actor)
INT32 locvar2 = var2;
boolean spawnshield = false;
- if (LUA_CallAction("A_CustomPower", actor))
+ if (LUA_CallAction(A_CUSTOMPOWER, actor))
return;
if (!actor->target || !actor->target->player)
@@ -4192,7 +4201,7 @@ void A_CustomPower(mobj_t *actor)
return;
}
- if (locvar1 >= NUMPOWERS)
+ if (locvar1 >= NUMPOWERS || locvar1 < 0)
{
CONS_Debug(DBG_GAMELOGIC, "Power #%d out of range!\n", locvar1);
return;
@@ -4223,7 +4232,7 @@ void A_GiveWeapon(mobj_t *actor)
player_t *player;
INT32 locvar1 = var1;
- if (LUA_CallAction("A_GiveWeapon", actor))
+ if (LUA_CallAction(A_GIVEWEAPON, actor))
return;
if (!actor->target || !actor->target->player)
@@ -4256,7 +4265,7 @@ void A_RingBox(mobj_t *actor)
{
player_t *player;
- if (LUA_CallAction("A_RingBox", actor))
+ if (LUA_CallAction(A_RINGBOX, actor))
return;
if (!actor->target || !actor->target->player)
@@ -4283,7 +4292,7 @@ void A_Invincibility(mobj_t *actor)
{
player_t *player;
- if (LUA_CallAction("A_Invincibility", actor))
+ if (LUA_CallAction(A_INVINCIBILITY, actor))
return;
if (!actor->target || !actor->target->player)
@@ -4316,7 +4325,7 @@ void A_SuperSneakers(mobj_t *actor)
{
player_t *player;
- if (LUA_CallAction("A_SuperSneakers", actor))
+ if (LUA_CallAction(A_SUPERSNEAKERS, actor))
return;
if (!actor->target || !actor->target->player)
@@ -4351,7 +4360,7 @@ void A_AwardScore(mobj_t *actor)
{
player_t *player;
- if (LUA_CallAction("A_AwardScore", actor))
+ if (LUA_CallAction(A_AWARDSCORE, actor))
return;
if (!actor->target || !actor->target->player)
@@ -4378,7 +4387,7 @@ void A_ExtraLife(mobj_t *actor)
{
player_t *player;
- if (LUA_CallAction("A_ExtraLife", actor))
+ if (LUA_CallAction(A_EXTRALIFE, actor))
return;
if (!actor->target || !actor->target->player)
@@ -4416,7 +4425,7 @@ void A_GiveShield(mobj_t *actor)
player_t *player;
UINT16 locvar1 = var1;
- if (LUA_CallAction("A_GiveShield", actor))
+ if (LUA_CallAction(A_GIVESHIELD, actor))
return;
if (!actor->target || !actor->target->player)
@@ -4442,7 +4451,7 @@ void A_GravityBox(mobj_t *actor)
{
player_t *player;
- if (LUA_CallAction("A_GravityBox", actor))
+ if (LUA_CallAction(A_GRAVITYBOX, actor))
return;
if (!actor->target || !actor->target->player)
@@ -4467,7 +4476,7 @@ void A_GravityBox(mobj_t *actor)
//
void A_ScoreRise(mobj_t *actor)
{
- if (LUA_CallAction("A_ScoreRise", actor))
+ if (LUA_CallAction(A_SCORERISE, actor))
return;
// make logo rise!
@@ -4486,7 +4495,7 @@ void A_BunnyHop(mobj_t *actor)
INT32 locvar1 = var1;
INT32 locvar2 = var2;
- if (LUA_CallAction("A_BunnyHop", actor))
+ if (LUA_CallAction(A_BUNNYHOP, actor))
return;
if (((actor->eflags & MFE_VERTICALFLIP) && actor->z + actor->height >= actor->ceilingz)
@@ -4510,7 +4519,7 @@ void A_BubbleSpawn(mobj_t *actor)
UINT8 prandom;
mobj_t *bubble = NULL;
- if (LUA_CallAction("A_BubbleSpawn", actor))
+ if (LUA_CallAction(A_BUBBLESPAWN, actor))
return;
if (!(actor->eflags & MFE_UNDERWATER))
@@ -4563,7 +4572,7 @@ void A_FanBubbleSpawn(mobj_t *actor)
mobj_t *bubble = NULL;
fixed_t hz = actor->z + (4*actor->height)/5;
- if (LUA_CallAction("A_FanBubbleSpawn", actor))
+ if (LUA_CallAction(A_FANBUBBLESPAWN, actor))
return;
if (!(actor->eflags & MFE_UNDERWATER))
@@ -4609,7 +4618,7 @@ void A_BubbleRise(mobj_t *actor)
INT32 locvar1 = var1;
INT32 locvar2 = var2;
- if (LUA_CallAction("A_BubbleRise", actor))
+ if (LUA_CallAction(A_BUBBLERISE, actor))
return;
if (actor->type == MT_EXTRALARGEBUBBLE)
@@ -4645,7 +4654,7 @@ void A_BubbleRise(mobj_t *actor)
//
void A_BubbleCheck(mobj_t *actor)
{
- if (LUA_CallAction("A_BubbleCheck", actor))
+ if (LUA_CallAction(A_BUBBLECHECK, actor))
return;
if (actor->eflags & MFE_UNDERWATER)
@@ -4663,7 +4672,7 @@ void A_BubbleCheck(mobj_t *actor)
//
void A_AttractChase(mobj_t *actor)
{
- if (LUA_CallAction("A_AttractChase", actor))
+ if (LUA_CallAction(A_ATTRACTCHASE, actor))
return;
if (actor->flags2 & MF2_NIGHTSPULL || !actor->health)
@@ -4734,7 +4743,7 @@ void A_DropMine(mobj_t *actor)
fixed_t z;
mobj_t *mine;
- if (LUA_CallAction("A_DropMine", actor))
+ if (LUA_CallAction(A_DROPMINE, actor))
return;
if (locvar2 & 65535)
@@ -4782,7 +4791,7 @@ void A_FishJump(mobj_t *actor)
INT32 locvar1 = var1;
INT32 locvar2 = var2;
- if (LUA_CallAction("A_FishJump", actor))
+ if (LUA_CallAction(A_FISHJUMP, actor))
return;
if (locvar2)
@@ -4833,7 +4842,7 @@ void A_ThrownRing(mobj_t *actor)
player_t *player;
fixed_t dist;
- if (LUA_CallAction("A_ThrownRing", actor))
+ if (LUA_CallAction(A_THROWNRING, actor))
return;
if (leveltime % (TICRATE/7) == 0)
@@ -4903,7 +4912,7 @@ void A_ThrownRing(mobj_t *actor)
}
if (actor->tracer && (actor->tracer->health)
- && (actor->tracer->player->powers[pw_shield] & SH_PROTECTELECTRIC))// Already found someone to follow.
+ && (actor->tracer->player && actor->tracer->player->powers[pw_shield] & SH_PROTECTELECTRIC))// Already found someone to follow.
{
const INT32 temp = actor->threshold;
actor->threshold = 32000;
@@ -4989,7 +4998,7 @@ void A_ThrownRing(mobj_t *actor)
//
void A_SetSolidSteam(mobj_t *actor)
{
- if (LUA_CallAction("A_SetSolidSteam", actor))
+ if (LUA_CallAction(A_SETSOLIDSTEAM, actor))
return;
actor->flags &= ~MF_NOCLIP;
@@ -5020,7 +5029,7 @@ void A_SetSolidSteam(mobj_t *actor)
//
void A_UnsetSolidSteam(mobj_t *actor)
{
- if (LUA_CallAction("A_UnsetSolidSteam", actor))
+ if (LUA_CallAction(A_UNSETSOLIDSTEAM, actor))
return;
actor->flags &= ~MF_SOLID;
@@ -5040,7 +5049,7 @@ void A_SignSpin(mobj_t *actor)
INT16 i;
angle_t rotateangle = FixedAngle(locvar1 << FRACBITS);
- if (LUA_CallAction("A_SignSpin", actor))
+ if (LUA_CallAction(A_SIGNSPIN, actor))
return;
if (P_IsObjectOnGround(actor) && P_MobjFlip(actor) * actor->momz <= 0)
@@ -5111,7 +5120,7 @@ void A_SignPlayer(mobj_t *actor)
facecolor = signcolor = (UINT16)locvar2;
- if (LUA_CallAction("A_SignPlayer", actor))
+ if (LUA_CallAction(A_SIGNPLAYER, actor))
return;
if (actor->tracer == NULL || locvar1 < -3 || locvar1 >= numskins || signcolor >= numskincolors)
@@ -5229,7 +5238,7 @@ void A_OverlayThink(mobj_t *actor)
{
fixed_t destx, desty;
- if (LUA_CallAction("A_OverlayThink", actor))
+ if (LUA_CallAction(A_OVERLAYTHINK, actor))
return;
if (!actor->target)
@@ -5281,7 +5290,7 @@ void A_JetChase(mobj_t *actor)
{
fixed_t thefloor;
- if (LUA_CallAction("A_JetChase", actor))
+ if (LUA_CallAction(A_JETCHASE, actor))
return;
if (actor->flags2 & MF2_AMBUSH)
@@ -5377,7 +5386,7 @@ void A_JetbThink(mobj_t *actor)
sector_t *nextsector;
fixed_t thefloor;
- if (LUA_CallAction("A_JetbThink", actor))
+ if (LUA_CallAction(A_JETBTHINK, actor))
return;
if (actor->z >= actor->waterbottom && actor->watertop > actor->floorz
@@ -5442,7 +5451,7 @@ void A_JetgShoot(mobj_t *actor)
{
fixed_t dist;
- if (LUA_CallAction("A_JetgShoot", actor))
+ if (LUA_CallAction(A_JETGSHOOT, actor))
return;
if (!actor->target)
@@ -5482,7 +5491,7 @@ void A_ShootBullet(mobj_t *actor)
{
fixed_t dist;
- if (LUA_CallAction("A_ShootBullet", actor))
+ if (LUA_CallAction(A_SHOOTBULLET, actor))
return;
if (!actor->target)
@@ -5542,7 +5551,7 @@ void A_MinusDigging(mobj_t *actor)
fixed_t mz = (actor->eflags & MFE_VERTICALFLIP) ? actor->ceilingz : actor->floorz;
mobj_t *par;
- if (LUA_CallAction("A_MinusDigging", actor))
+ if (LUA_CallAction(A_MINUSDIGGING, actor))
return;
if (!actor->target)
@@ -5623,7 +5632,7 @@ void A_MinusPopup(mobj_t *actor)
angle_t ani = FixedAngle(FRACUNIT*360/num);
INT32 i;
- if (LUA_CallAction("A_MinusPopup", actor))
+ if (LUA_CallAction(A_MINUSPOPUP, actor))
return;
if (actor->eflags & MFE_VERTICALFLIP)
@@ -5658,7 +5667,7 @@ void A_MinusCheck(mobj_t *actor)
INT32 locvar1 = var1;
INT32 locvar2 = var2;
- if (LUA_CallAction("A_MinusCheck", actor))
+ if (LUA_CallAction(A_MINUSCHECK, actor))
return;
if (((actor->eflags & MFE_VERTICALFLIP) && actor->z + actor->height >= actor->ceilingz) || (!(actor->eflags & MFE_VERTICALFLIP) && actor->z <= actor->floorz))
@@ -5689,7 +5698,7 @@ void A_MinusCheck(mobj_t *actor)
//
void A_ChickenCheck(mobj_t *actor)
{
- if (LUA_CallAction("A_ChickenCheck", actor))
+ if (LUA_CallAction(A_CHICKENCHECK, actor))
return;
if ((!(actor->eflags & MFE_VERTICALFLIP) && actor->z <= actor->floorz)
@@ -5720,7 +5729,7 @@ void A_JetgThink(mobj_t *actor)
fixed_t thefloor;
- if (LUA_CallAction("A_JetgThink", actor))
+ if (LUA_CallAction(A_JETGTHINK, actor))
return;
if (actor->z >= actor->waterbottom && actor->watertop > actor->floorz
@@ -5770,7 +5779,7 @@ void A_JetgThink(mobj_t *actor)
//
void A_MouseThink(mobj_t *actor)
{
- if (LUA_CallAction("A_MouseThink", actor))
+ if (LUA_CallAction(A_MOUSETHINK, actor))
return;
if (actor->reactiontime)
@@ -5807,7 +5816,7 @@ void A_DetonChase(mobj_t *actor)
angle_t exact;
fixed_t xydist, dist;
- if (LUA_CallAction("A_DetonChase", actor))
+ if (LUA_CallAction(A_DETONCHASE, actor))
return;
// modify tracer threshold
@@ -5911,13 +5920,18 @@ void A_DetonChase(mobj_t *actor)
if (actor->reactiontime == -42)
{
- fixed_t xyspeed;
+ fixed_t xyspeed, speed;
+
+ if (actor->target->player)
+ speed = actor->target->player->normalspeed;
+ else
+ speed = actor->target->info->speed;
actor->reactiontime = -42;
exact = actor->movedir>>ANGLETOFINESHIFT;
- xyspeed = FixedMul(FixedMul(actor->tracer->player->normalspeed,3*FRACUNIT/4), FINECOSINE(exact));
- actor->momz = FixedMul(FixedMul(actor->tracer->player->normalspeed,3*FRACUNIT/4), FINESINE(exact));
+ xyspeed = FixedMul(FixedMul(speed,3*FRACUNIT/4), FINECOSINE(exact));
+ actor->momz = FixedMul(FixedMul(speed,3*FRACUNIT/4), FINESINE(exact));
exact = actor->angle>>ANGLETOFINESHIFT;
actor->momx = FixedMul(xyspeed, FINECOSINE(exact));
@@ -5954,7 +5968,7 @@ void A_CapeChase(mobj_t *actor)
INT32 locvar2 = var2;
angle_t angle;
- if (LUA_CallAction("A_CapeChase", actor))
+ if (LUA_CallAction(A_CAPECHASE, actor))
return;
CONS_Debug(DBG_GAMELOGIC, "A_CapeChase called from object type %d, var1: %d, var2: %d\n", actor->type, locvar1, locvar2);
@@ -6014,7 +6028,7 @@ void A_RotateSpikeBall(mobj_t *actor)
INT32 locvar1 = var1;
const fixed_t radius = FixedMul(12*actor->info->speed, actor->scale);
- if (LUA_CallAction("A_RotateSpikeBall", actor))
+ if (LUA_CallAction(A_ROTATESPIKEBALL, actor))
return;
if (!((!locvar1 && (actor->target)) || (locvar1 && (actor->tracer))))// This should NEVER happen.
@@ -6065,7 +6079,7 @@ void A_UnidusBall(mobj_t *actor)
INT32 locvar1 = var1;
boolean canthrow = false;
- if (LUA_CallAction("A_UnidusBall", actor))
+ if (LUA_CallAction(A_UNIDUSBALL, actor))
return;
actor->angle += ANGLE_11hh;
@@ -6157,12 +6171,12 @@ void A_RockSpawn(mobj_t *actor)
{
mobj_t *mo;
mobjtype_t type;
- INT32 i = P_FindSpecialLineFromTag(12, (INT16)actor->threshold, -1);
+ INT32 i = Tag_FindLineSpecial(12, (INT16)actor->threshold);
line_t *line;
fixed_t dist;
fixed_t randomoomph;
- if (LUA_CallAction("A_RockSpawn", actor))
+ if (LUA_CallAction(A_ROCKSPAWN, actor))
return;
if (i == -1)
@@ -6215,7 +6229,7 @@ void A_SlingAppear(mobj_t *actor)
UINT8 mlength = 4;
mobj_t *spawnee, *hprev;
- if (LUA_CallAction("A_SlingAppear", actor))
+ if (LUA_CallAction(A_SLINGAPPEAR, actor))
return;
P_UnsetThingPosition(actor);
@@ -6265,7 +6279,7 @@ void A_SetFuse(mobj_t *actor)
INT32 locvar1 = var1;
INT32 locvar2 = var2;
- if (LUA_CallAction("A_SetFuse", actor))
+ if (LUA_CallAction(A_SETFUSE, actor))
return;
if ((!actor->fuse || (locvar2 >> 16)) && (locvar2 >> 16) != 2) // set the actor's fuse value
@@ -6294,7 +6308,7 @@ void A_CrawlaCommanderThink(mobj_t *actor)
INT32 locvar2 = var2;
boolean hovermode = (actor->health > 1 || actor->fuse);
- if (LUA_CallAction("A_CrawlaCommanderThink", actor))
+ if (LUA_CallAction(A_CRAWLACOMMANDERTHINK, actor))
return;
if (actor->z >= actor->waterbottom && actor->watertop > actor->floorz
@@ -6452,7 +6466,7 @@ void A_RingExplode(mobj_t *actor)
thinker_t *th;
angle_t d;
- if (LUA_CallAction("A_RingExplode", actor))
+ if (LUA_CallAction(A_RINGEXPLODE, actor))
return;
for (d = 0; d < 16; d++)
@@ -6497,7 +6511,7 @@ void A_OldRingExplode(mobj_t *actor) {
INT32 locvar1 = var1;
boolean changecolor = (actor->target && actor->target->player);
- if (LUA_CallAction("A_OldRingExplode", actor))
+ if (LUA_CallAction(A_OLDRINGEXPLODE, actor))
return;
for (i = 0; i < 32; i++)
@@ -6573,7 +6587,7 @@ void A_MixUp(mobj_t *actor)
boolean teleported[MAXPLAYERS];
INT32 i, numplayers = 0, prandom = 0;
- if (LUA_CallAction("A_MixUp", actor))
+ if (LUA_CallAction(A_MIXUP, actor))
return;
if (!multiplayer)
@@ -6848,7 +6862,7 @@ void A_RecyclePowers(mobj_t *actor)
INT32 weapons[MAXPLAYERS];
INT32 weaponheld[MAXPLAYERS];
- if (LUA_CallAction("A_RecyclePowers", actor))
+ if (LUA_CallAction(A_RECYCLEPOWERS, actor))
return;
if (!multiplayer)
@@ -6979,7 +6993,7 @@ void A_Boss1Chase(mobj_t *actor)
{
INT32 delta;
- if (LUA_CallAction("A_Boss1Chase", actor))
+ if (LUA_CallAction(A_BOSS1CHASE, actor))
return;
if (!actor->target || !(actor->target->flags & MF_SHOOTABLE))
@@ -7102,7 +7116,7 @@ void A_Boss2Chase(mobj_t *actor)
boolean reverse = false;
INT32 speedvar;
- if (LUA_CallAction("A_Boss2Chase", actor))
+ if (LUA_CallAction(A_BOSS2CHASE, actor))
return;
if (actor->health <= 0)
@@ -7228,7 +7242,7 @@ void A_Boss2Chase(mobj_t *actor)
//
void A_Boss2Pogo(mobj_t *actor)
{
- if (LUA_CallAction("A_Boss2Pogo", actor))
+ if (LUA_CallAction(A_BOSS2POGO, actor))
return;
if (actor->z <= actor->floorz + FixedMul(8*FRACUNIT, actor->scale) && actor->momz <= 0)
@@ -7276,7 +7290,7 @@ void A_Boss2TakeDamage(mobj_t *actor)
{
INT32 locvar1 = var1;
- if (LUA_CallAction("A_Boss2TakeDamage", actor))
+ if (LUA_CallAction(A_BOSS2TAKEDAMAGE, actor))
return;
A_Pain(actor);
@@ -7299,7 +7313,7 @@ void A_Boss7Chase(mobj_t *actor)
INT32 delta;
INT32 i;
- if (LUA_CallAction("A_Boss7Chase", actor))
+ if (LUA_CallAction(A_BOSS7CHASE, actor))
return;
if (actor->z != actor->floorz)
@@ -7429,7 +7443,7 @@ void A_Boss7Chase(mobj_t *actor)
//
void A_GoopSplat(mobj_t *actor)
{
- if (LUA_CallAction("A_GoopSplat", actor))
+ if (LUA_CallAction(A_GOOPSPLAT, actor))
return;
P_UnsetThingPosition(actor);
@@ -7454,7 +7468,7 @@ void A_Boss2PogoSFX(mobj_t *actor)
INT32 locvar1 = var1;
INT32 locvar2 = var2;
- if (LUA_CallAction("A_Boss2PogoSFX", actor))
+ if (LUA_CallAction(A_BOSS2POGOSFX, actor))
return;
if (!actor->target || !(actor->target->flags & MF_SHOOTABLE))
@@ -7496,7 +7510,7 @@ void A_Boss2PogoTarget(mobj_t *actor)
INT32 locvar1 = var1;
INT32 locvar2 = var2;
- if (LUA_CallAction("A_Boss2PogoTarget", actor))
+ if (LUA_CallAction(A_BOSS2POGOTARGET, actor))
return;
if (!actor->target || !(actor->target->flags & MF_SHOOTABLE) || (actor->target->player && actor->target->player->powers[pw_flashing])
@@ -7512,7 +7526,7 @@ void A_Boss2PogoTarget(mobj_t *actor)
}
// Target hit, retreat!
- if (actor->target->player->powers[pw_flashing] > TICRATE || actor->flags2 & MF2_FRET)
+ if ((actor->target->player && actor->target->player->powers[pw_flashing] > TICRATE) || actor->flags2 & MF2_FRET)
{
UINT8 prandom = P_RandomByte();
actor->z++; // unstick from the floor
@@ -7523,7 +7537,7 @@ void A_Boss2PogoTarget(mobj_t *actor)
// Try to land on top of the player.
else if (P_AproxDistance(actor->x-actor->target->x, actor->y-actor->target->y) < FixedMul(512*FRACUNIT, actor->scale))
{
- fixed_t airtime, gravityadd, zoffs;
+ fixed_t airtime, gravityadd, zoffs, height;
// check gravity in the sector (for later math)
P_CheckGravity(actor, true);
@@ -7545,7 +7559,13 @@ void A_Boss2PogoTarget(mobj_t *actor)
// Remember, kids!
// Reduced down Calculus lets you avoid bad 'logic math' loops!
//airtime = FixedDiv(-actor->momz<<1, gravityadd)<<1; // going from 0 to 0 is much simpler
- zoffs = (P_GetPlayerHeight(actor->target->player)>>1) + (actor->target->floorz - actor->floorz); // offset by the difference in floor height plus half the player height,
+
+ if (actor->target->player)
+ height = P_GetPlayerHeight(actor->target->player) >> 1;
+ else
+ height = actor->target->height >> 1;
+
+ zoffs = height + (actor->target->floorz - actor->floorz); // offset by the difference in floor height plus half the player height,
airtime = FixedDiv((-actor->momz - FixedSqrt(FixedMul(actor->momz,actor->momz)+zoffs)), gravityadd)<<1; // to try and land on their head rather than on their feet
actor->angle = R_PointToAngle2(actor->x, actor->y, actor->target->x, actor->target->y);
@@ -7581,7 +7601,7 @@ void A_Boss2PogoTarget(mobj_t *actor)
//
void A_EggmanBox(mobj_t *actor)
{
- if (LUA_CallAction("A_EggmanBox", actor))
+ if (LUA_CallAction(A_EGGMANBOX, actor))
return;
if (!actor->target || !actor->target->player)
@@ -7607,7 +7627,7 @@ void A_TurretFire(mobj_t *actor)
INT32 locvar1 = var1;
INT32 locvar2 = var2;
- if (LUA_CallAction("A_TurretFire", actor))
+ if (LUA_CallAction(A_TURRETFIRE, actor))
return;
if (locvar2)
@@ -7645,7 +7665,7 @@ void A_SuperTurretFire(mobj_t *actor)
INT32 locvar1 = var1;
INT32 locvar2 = var2;
- if (LUA_CallAction("A_SuperTurretFire", actor))
+ if (LUA_CallAction(A_SUPERTURRETFIRE, actor))
return;
if (locvar2)
@@ -7681,7 +7701,7 @@ void A_TurretStop(mobj_t *actor)
{
INT32 locvar1 = var1;
- if (LUA_CallAction("A_TurretStop", actor))
+ if (LUA_CallAction(A_TURRETSTOP, actor))
return;
actor->flags2 &= ~MF2_FIRING;
@@ -7700,7 +7720,7 @@ void A_TurretStop(mobj_t *actor)
//
void A_SparkFollow(mobj_t *actor)
{
- if (LUA_CallAction("A_SparkFollow", actor))
+ if (LUA_CallAction(A_SPARKFOLLOW, actor))
return;
if ((!actor->target || (actor->target->health <= 0))
@@ -7736,7 +7756,7 @@ void A_BuzzFly(mobj_t *actor)
INT32 locvar1 = var1;
INT32 locvar2 = var2;
- if (LUA_CallAction("A_BuzzFly", actor))
+ if (LUA_CallAction(A_BUZZFLY, actor))
return;
if (actor->flags2 & MF2_AMBUSH)
@@ -7835,7 +7855,7 @@ void A_GuardChase(mobj_t *actor)
{
INT32 delta;
- if (LUA_CallAction("A_GuardChase", actor))
+ if (LUA_CallAction(A_GUARDCHASE, actor))
return;
if (actor->reactiontime)
@@ -7940,7 +7960,7 @@ void A_EggShield(mobj_t *actor)
fixed_t movex, movey;
angle_t angle;
- if (LUA_CallAction("A_EggShield", actor))
+ if (LUA_CallAction(A_EGGSHIELD, actor))
return;
if (!actor->target || !actor->target->health)
@@ -8022,7 +8042,7 @@ void A_EggShield(mobj_t *actor)
//
void A_SetReactionTime(mobj_t *actor)
{
- if (LUA_CallAction("A_SetReactionTime", actor))
+ if (LUA_CallAction(A_SETREACTIONTIME, actor))
return;
if (var1)
@@ -8044,7 +8064,7 @@ void A_Boss1Spikeballs(mobj_t *actor)
INT32 locvar2 = var2;
mobj_t *ball;
- if (LUA_CallAction("A_Boss1Spikeballs", actor))
+ if (LUA_CallAction(A_BOSS1SPIKEBALLS, actor))
return;
ball = P_SpawnMobj(actor->x, actor->y, actor->z, MT_EGGMOBILE_BALL);
@@ -8066,7 +8086,7 @@ void A_Boss1Spikeballs(mobj_t *actor)
//
void A_Boss3TakeDamage(mobj_t *actor)
{
- if (LUA_CallAction("A_Boss3TakeDamage", actor))
+ if (LUA_CallAction(A_BOSS3TAKEDAMAGE, actor))
return;
actor->movecount = var1;
@@ -8086,7 +8106,7 @@ void A_Boss3TakeDamage(mobj_t *actor)
//
void A_Boss3Path(mobj_t *actor)
{
- if (LUA_CallAction("A_Boss3Path", actor))
+ if (LUA_CallAction(A_BOSS3PATH, actor))
return;
if (actor->tracer && actor->tracer->health && actor->tracer->movecount)
@@ -8213,7 +8233,7 @@ void A_Boss3Path(mobj_t *actor)
//
void A_Boss3ShockThink(mobj_t *actor)
{
- if (LUA_CallAction("A_Boss3ShockThink", actor))
+ if (LUA_CallAction(A_BOSS3SHOCKTHINK, actor))
return;
if (actor->momx || actor->momy)
@@ -8266,7 +8286,7 @@ void A_LinedefExecute(mobj_t *actor)
INT32 locvar1 = var1;
INT32 locvar2 = var2;
- if (LUA_CallAction("A_LinedefExecute", actor))
+ if (LUA_CallAction(A_LINEDEFEXECUTE, actor))
return;
tagnum = locvar1;
@@ -8292,7 +8312,7 @@ void A_LinedefExecute(mobj_t *actor)
//
void A_PlaySeeSound(mobj_t *actor)
{
- if (LUA_CallAction("A_PlaySeeSound", actor))
+ if (LUA_CallAction(A_PLAYSEESOUND, actor))
return;
if (actor->info->seesound)
@@ -8308,7 +8328,7 @@ void A_PlaySeeSound(mobj_t *actor)
//
void A_PlayAttackSound(mobj_t *actor)
{
- if (LUA_CallAction("A_PlayAttackSound", actor))
+ if (LUA_CallAction(A_PLAYATTACKSOUND, actor))
return;
if (actor->info->attacksound)
@@ -8324,7 +8344,7 @@ void A_PlayAttackSound(mobj_t *actor)
//
void A_PlayActiveSound(mobj_t *actor)
{
- if (LUA_CallAction("A_PlayActiveSound", actor))
+ if (LUA_CallAction(A_PLAYACTIVESOUND, actor))
return;
if (actor->info->activesound)
@@ -8343,7 +8363,7 @@ void A_SmokeTrailer(mobj_t *actor)
mobj_t *th;
INT32 locvar1 = var1;
- if (LUA_CallAction("A_SmokeTrailer", actor))
+ if (LUA_CallAction(A_SMOKETRAILER, actor))
return;
if (leveltime % 4)
@@ -8384,7 +8404,7 @@ void A_SpawnObjectAbsolute(mobj_t *actor)
INT32 locvar1 = var1;
INT32 locvar2 = var2;
- if (LUA_CallAction("A_SpawnObjectAbsolute", actor))
+ if (LUA_CallAction(A_SPAWNOBJECTABSOLUTE, actor))
return;
x = (INT16)(locvar1>>16);
@@ -8420,7 +8440,7 @@ void A_SpawnObjectRelative(mobj_t *actor)
INT32 locvar1 = var1;
INT32 locvar2 = var2;
- if (LUA_CallAction("A_SpawnObjectRelative", actor))
+ if (LUA_CallAction(A_SPAWNOBJECTRELATIVE, actor))
return;
CONS_Debug(DBG_GAMELOGIC, "A_SpawnObjectRelative called from object type %d, var1: %d, var2: %d\n", actor->type, locvar1, locvar2);
@@ -8464,7 +8484,7 @@ void A_ChangeAngleRelative(mobj_t *actor)
//const angle_t amin = FixedAngle(locvar1*FRACUNIT);
//const angle_t amax = FixedAngle(locvar2*FRACUNIT);
- if (LUA_CallAction("A_ChangeAngleRelative", actor))
+ if (LUA_CallAction(A_CHANGEANGLERELATIVE, actor))
return;
#ifdef PARANOIA
@@ -8497,7 +8517,7 @@ void A_ChangeAngleAbsolute(mobj_t *actor)
//const angle_t amin = FixedAngle(locvar1*FRACUNIT);
//const angle_t amax = FixedAngle(locvar2*FRACUNIT);
- if (LUA_CallAction("A_ChangeAngleAbsolute", actor))
+ if (LUA_CallAction(A_CHANGEANGLEABSOLUTE, actor))
return;
#ifdef PARANOIA
@@ -8526,7 +8546,7 @@ void A_RollAngle(mobj_t *actor)
INT32 locvar2 = var2;
const angle_t angle = FixedAngle(locvar1*FRACUNIT);
- if (LUA_CallAction("A_RollAngle", actor))
+ if (LUA_CallAction(A_ROLLANGLE, actor))
return;
// relative (default)
@@ -8551,7 +8571,7 @@ void A_ChangeRollAngleRelative(mobj_t *actor)
const fixed_t amin = locvar1*FRACUNIT;
const fixed_t amax = locvar2*FRACUNIT;
- if (LUA_CallAction("A_ChangeRollAngleRelative", actor))
+ if (LUA_CallAction(A_CHANGEROLLANGLERELATIVE, actor))
return;
#ifdef PARANOIA
@@ -8576,7 +8596,7 @@ void A_ChangeRollAngleAbsolute(mobj_t *actor)
const fixed_t amin = locvar1*FRACUNIT;
const fixed_t amax = locvar2*FRACUNIT;
- if (LUA_CallAction("A_ChangeRollAngleAbsolute", actor))
+ if (LUA_CallAction(A_CHANGEROLLANGLEABSOLUTE, actor))
return;
#ifdef PARANOIA
@@ -8601,7 +8621,7 @@ void A_PlaySound(mobj_t *actor)
INT32 locvar1 = var1;
INT32 locvar2 = var2;
- if (LUA_CallAction("A_PlaySound", actor))
+ if (LUA_CallAction(A_PLAYSOUND, actor))
return;
if (leveltime < 2 && (locvar2 >> 16))
@@ -8626,7 +8646,7 @@ void A_FindTarget(mobj_t *actor)
mobj_t *mo2;
fixed_t dist1 = 0, dist2 = 0;
- if (LUA_CallAction("A_FindTarget", actor))
+ if (LUA_CallAction(A_FINDTARGET, actor))
return;
CONS_Debug(DBG_GAMELOGIC, "A_FindTarget called from object type %d, var1: %d, var2: %d\n", actor->type, locvar1, locvar2);
@@ -8690,7 +8710,7 @@ void A_FindTracer(mobj_t *actor)
mobj_t *mo2;
fixed_t dist1 = 0, dist2 = 0;
- if (LUA_CallAction("A_FindTracer", actor))
+ if (LUA_CallAction(A_FINDTRACER, actor))
return;
CONS_Debug(DBG_GAMELOGIC, "A_FindTracer called from object type %d, var1: %d, var2: %d\n", actor->type, locvar1, locvar2);
@@ -8750,7 +8770,7 @@ void A_SetTics(mobj_t *actor)
INT32 locvar1 = var1;
INT32 locvar2 = var2;
- if (LUA_CallAction("A_SetTics", actor))
+ if (LUA_CallAction(A_SETTICS, actor))
return;
if (locvar1)
@@ -8771,7 +8791,7 @@ void A_SetRandomTics(mobj_t *actor)
INT32 locvar1 = var1;
INT32 locvar2 = var2;
- if (LUA_CallAction("A_SetRandomTics", actor))
+ if (LUA_CallAction(A_SETRANDOMTICS, actor))
return;
actor->tics = P_RandomRange(locvar1, locvar2);
@@ -8789,7 +8809,7 @@ void A_ChangeColorRelative(mobj_t *actor)
INT32 locvar1 = var1;
INT32 locvar2 = var2;
- if (LUA_CallAction("A_ChangeColorRelative", actor))
+ if (LUA_CallAction(A_CHANGECOLORRELATIVE, actor))
return;
if (locvar1)
@@ -8814,7 +8834,7 @@ void A_ChangeColorAbsolute(mobj_t *actor)
INT32 locvar1 = var1;
INT32 locvar2 = var2;
- if (LUA_CallAction("A_ChangeColorAbsolute", actor))
+ if (LUA_CallAction(A_CHANGECOLORABSOLUTE, actor))
return;
if (locvar1)
@@ -8840,7 +8860,7 @@ void A_Dye(mobj_t *actor)
mobj_t *target = ((locvar1 && actor->target) ? actor->target : actor);
UINT16 color = (UINT16)locvar2;
- if (LUA_CallAction("A_Dye", actor))
+ if (LUA_CallAction(A_DYE, actor))
return;
if (color >= numskincolors)
return;
@@ -8873,7 +8893,7 @@ void A_MoveRelative(mobj_t *actor)
INT32 locvar1 = var1;
INT32 locvar2 = var2;
- if (LUA_CallAction("A_MoveRelative", actor))
+ if (LUA_CallAction(A_MOVERELATIVE, actor))
return;
P_Thrust(actor, actor->angle+FixedAngle(locvar1*FRACUNIT), FixedMul(locvar2*FRACUNIT, actor->scale));
@@ -8891,7 +8911,7 @@ void A_MoveAbsolute(mobj_t *actor)
INT32 locvar1 = var1;
INT32 locvar2 = var2;
- if (LUA_CallAction("A_MoveAbsolute", actor))
+ if (LUA_CallAction(A_MOVEABSOLUTE, actor))
return;
P_InstaThrust(actor, FixedAngle(locvar1*FRACUNIT), FixedMul(locvar2*FRACUNIT, actor->scale));
@@ -8909,7 +8929,7 @@ void A_Thrust(mobj_t *actor)
INT32 locvar1 = var1;
INT32 locvar2 = var2;
- if (LUA_CallAction("A_Thrust", actor))
+ if (LUA_CallAction(A_THRUST, actor))
return;
if (!locvar1)
@@ -8935,7 +8955,7 @@ void A_ZThrust(mobj_t *actor)
INT32 locvar1 = var1;
INT32 locvar2 = var2;
- if (LUA_CallAction("A_ZThrust", actor))
+ if (LUA_CallAction(A_ZTHRUST, actor))
return;
if (!locvar1)
@@ -8969,7 +8989,7 @@ void A_SetTargetsTarget(mobj_t *actor)
INT32 locvar2 = var2;
mobj_t *oldtarg = NULL, *newtarg = NULL;
- if (LUA_CallAction("A_SetTargetsTarget", actor))
+ if (LUA_CallAction(A_SETTARGETSTARGET, actor))
return;
// actor's target
@@ -9013,7 +9033,7 @@ void A_SetObjectFlags(mobj_t *actor)
INT32 locvar2 = var2;
boolean unlinkthings = false;
- if (LUA_CallAction("A_SetObjectFlags", actor))
+ if (LUA_CallAction(A_SETOBJECTFLAGS, actor))
return;
if (locvar2 == 2)
@@ -9054,7 +9074,7 @@ void A_SetObjectFlags2(mobj_t *actor)
INT32 locvar1 = var1;
INT32 locvar2 = var2;
- if (LUA_CallAction("A_SetObjectFlags2", actor))
+ if (LUA_CallAction(A_SETOBJECTFLAGS2, actor))
return;
if (locvar2 == 2)
@@ -9081,7 +9101,7 @@ void A_BossJetFume(mobj_t *actor)
mobj_t *filler;
INT32 locvar1 = var1;
- if (LUA_CallAction("A_BossJetFume", actor))
+ if (LUA_CallAction(A_BOSSJETFUME, actor))
return;
if (locvar1 == 0) // Boss1 jet fumes
@@ -9216,7 +9236,7 @@ void A_RandomState(mobj_t *actor)
INT32 locvar1 = var1;
INT32 locvar2 = var2;
- if (LUA_CallAction("A_RandomState", actor))
+ if (LUA_CallAction(A_RANDOMSTATE, actor))
return;
P_SetMobjState(actor, P_RandomChance(FRACUNIT/2) ? locvar1 : locvar2);
@@ -9234,7 +9254,7 @@ void A_RandomStateRange(mobj_t *actor)
INT32 locvar1 = var1;
INT32 locvar2 = var2;
- if (LUA_CallAction("A_RandomStateRange", actor))
+ if (LUA_CallAction(A_RANDOMSTATERANGE, actor))
return;
P_SetMobjState(actor, P_RandomRange(locvar1, locvar2));
@@ -9252,7 +9272,7 @@ void A_DualAction(mobj_t *actor)
INT32 locvar1 = var1;
INT32 locvar2 = var2;
- if (LUA_CallAction("A_DualAction", actor))
+ if (LUA_CallAction(A_DUALACTION, actor))
return;
CONS_Debug(DBG_GAMELOGIC, "A_DualAction called from object type %d, var1: %d, var2: %d\n", actor->type, locvar1, locvar2);
@@ -9285,7 +9305,7 @@ void A_RemoteAction(mobj_t *actor)
INT32 locvar2 = var2;
mobj_t *originaltarget = actor->target; // Hold on to the target for later.
- if (LUA_CallAction("A_RemoteAction", actor))
+ if (LUA_CallAction(A_REMOTEACTION, actor))
return;
// If >=0, find the closest target.
@@ -9367,7 +9387,7 @@ void A_RemoteAction(mobj_t *actor)
//
void A_ToggleFlameJet(mobj_t* actor)
{
- if (LUA_CallAction("A_ToggleFlameJet", actor))
+ if (LUA_CallAction(A_TOGGLEFLAMEJET, actor))
return;
// threshold - off delay
@@ -9414,7 +9434,7 @@ void A_OrbitNights(mobj_t* actor)
boolean donotrescale = (var2 & 0x40000);
INT32 xfactor = 32, yfactor = 32, zfactor = 20;
- if (LUA_CallAction("A_OrbitNights", actor))
+ if (LUA_CallAction(A_ORBITNIGHTS, actor))
return;
if (actor->flags & MF_GRENADEBOUNCE)
@@ -9487,7 +9507,7 @@ void A_GhostMe(mobj_t *actor)
INT32 locvar1 = var1;
mobj_t *ghost;
- if (LUA_CallAction("A_GhostMe", actor))
+ if (LUA_CallAction(A_GHOSTME, actor))
return;
ghost = P_SpawnGhostMobj(actor);
@@ -9510,7 +9530,7 @@ void A_SetObjectState(mobj_t *actor)
INT32 locvar2 = var2;
mobj_t *target;
- if (LUA_CallAction("A_SetObjectState", actor))
+ if (LUA_CallAction(A_SETOBJECTSTATE, actor))
return;
if ((!locvar2 && !actor->target) || (locvar2 && !actor->tracer))
@@ -9554,7 +9574,7 @@ void A_SetObjectTypeState(mobj_t *actor)
mobj_t *mo2;
fixed_t dist = 0;
- if (LUA_CallAction("A_SetObjectTypeState", actor))
+ if (LUA_CallAction(A_SETOBJECTTYPESTATE, actor))
return;
for (th = thlist[THINK_MOBJ].next; th != &thlist[THINK_MOBJ]; th = th->next)
@@ -9596,7 +9616,7 @@ void A_KnockBack(mobj_t *actor)
INT32 locvar1 = var1;
mobj_t *target;
- if (LUA_CallAction("A_KnockBack", actor))
+ if (LUA_CallAction(A_KNOCKBACK, actor))
return;
if (!locvar1)
@@ -9631,7 +9651,7 @@ void A_PushAway(mobj_t *actor)
mobj_t *target; // target
angle_t an; // actor to target angle
- if (LUA_CallAction("A_PushAway", actor))
+ if (LUA_CallAction(A_PUSHAWAY, actor))
return;
if ((!(locvar2 >> 16) && !actor->target) || ((locvar2 >> 16) && !actor->tracer))
@@ -9665,7 +9685,7 @@ void A_RingDrain(mobj_t *actor)
INT32 locvar1 = var1;
player_t *player;
- if (LUA_CallAction("A_RingDrain", actor))
+ if (LUA_CallAction(A_RINGDRAIN, actor))
return;
if (!actor->target || !actor->target->player)
@@ -9697,7 +9717,7 @@ void A_SplitShot(mobj_t *actor)
const fixed_t offs = (fixed_t)(locvar1*FRACUNIT);
const fixed_t hoffs = (fixed_t)(loc2up*FRACUNIT);
- if (LUA_CallAction("A_SplitShot", actor))
+ if (LUA_CallAction(A_SPLITSHOT, actor))
return;
if (!actor->target)
@@ -9734,7 +9754,7 @@ void A_MissileSplit(mobj_t *actor)
INT32 locvar1 = var1;
INT32 locvar2 = var2;
- if (LUA_CallAction("A_MissileSplit", actor))
+ if (LUA_CallAction(A_MISSILESPLIT, actor))
return;
if (actor->eflags & MFE_VERTICALFLIP)
@@ -9762,7 +9782,7 @@ void A_MultiShot(mobj_t *actor)
INT32 count = 0;
fixed_t ad;
- if (LUA_CallAction("A_MultiShot", actor))
+ if (LUA_CallAction(A_MULTISHOT, actor))
return;
if (actor->target)
@@ -9823,7 +9843,7 @@ void A_InstaLoop(mobj_t *actor)
const fixed_t ac = FINECOSINE(fa);
const fixed_t as = FINESINE(fa);
- if (LUA_CallAction("A_InstaLoop", actor))
+ if (LUA_CallAction(A_INSTALOOP, actor))
return;
P_InstaThrust(actor, actor->angle, FixedMul(ac, FixedMul(force, actor->scale)));
@@ -9856,25 +9876,26 @@ void A_Custom3DRotate(mobj_t *actor)
const fixed_t hspeed = FixedMul(loc2up*FRACUNIT/10, actor->scale);
const fixed_t vspeed = FixedMul(loc2lw*FRACUNIT/10, actor->scale);
- if (LUA_CallAction("A_Custom3DRotate", actor))
+ if (LUA_CallAction(A_CUSTOM3DROTATE, actor))
return;
- if (actor->target->health == 0)
+ if (!actor->target) // Ensure we actually have a target first.
{
+ CONS_Printf("Error: A_Custom3DRotate: Object has no target.\n");
P_RemoveMobj(actor);
return;
}
- if (!actor->target) // This should NEVER happen.
+ if (actor->target->health == 0)
{
- if (cv_debug)
- CONS_Printf("Error: Object has no target\n");
P_RemoveMobj(actor);
return;
}
+
if (hspeed==0 && vspeed==0)
{
- CONS_Printf("Error: A_Custom3DRotate: Object has no speed.\n");
+ if (cv_debug)
+ CONS_Printf("Error: A_Custom3DRotate: Object has no speed.\n");
return;
}
@@ -9915,7 +9936,7 @@ void A_SearchForPlayers(mobj_t *actor)
INT32 locvar1 = var1;
INT32 locvar2 = var2;
- if (LUA_CallAction("A_SearchForPlayers", actor))
+ if (LUA_CallAction(A_SEARCHFORPLAYERS, actor))
return;
if (!actor->target || !(actor->target->flags & MF_SHOOTABLE))
@@ -9947,7 +9968,7 @@ void A_CheckRandom(mobj_t *actor)
INT32 locvar2 = var2;
fixed_t chance = FRACUNIT;
- if (LUA_CallAction("A_CheckRandom", actor))
+ if (LUA_CallAction(A_CHECKRANDOM, actor))
return;
if ((locvar1 & 0xFFFF) == 0)
@@ -9974,7 +9995,7 @@ void A_CheckTargetRings(mobj_t *actor)
INT32 locvar1 = var1;
INT32 locvar2 = var2;
- if (LUA_CallAction("A_CheckTargetRings", actor))
+ if (LUA_CallAction(A_CHECKTARGETRINGS, actor))
return;
if (!(actor->target) || !(actor->target->player))
@@ -9997,7 +10018,7 @@ void A_CheckRings(mobj_t *actor)
INT32 locvar2 = var2;
INT32 i, cntr = 0;
- if (LUA_CallAction("A_CheckRings", actor))
+ if (LUA_CallAction(A_CHECKRINGS, actor))
return;
for (i = 0; i < MAXPLAYERS; i++)
@@ -10021,7 +10042,7 @@ void A_CheckTotalRings(mobj_t *actor)
INT32 i, cntr = 0;
- if (LUA_CallAction("A_CheckTotalRings", actor))
+ if (LUA_CallAction(A_CHECKTOTALRINGS, actor))
return;
for (i = 0; i < MAXPLAYERS; i++)
@@ -10043,7 +10064,7 @@ void A_CheckHealth(mobj_t *actor)
INT32 locvar1 = var1;
INT32 locvar2 = var2;
- if (LUA_CallAction("A_CheckHealth", actor))
+ if (LUA_CallAction(A_CHECKHEALTH, actor))
return;
if (actor->health <= locvar1)
@@ -10065,7 +10086,7 @@ void A_CheckRange(mobj_t *actor)
INT32 locvar2 = var2;
fixed_t dist;
- if (LUA_CallAction("A_CheckRange", actor))
+ if (LUA_CallAction(A_CHECKRANGE, actor))
return;
if ((!(locvar1 >> 16) && !actor->target) || ((locvar1 >> 16) && !actor->tracer))
@@ -10095,7 +10116,7 @@ void A_CheckHeight(mobj_t *actor)
INT32 locvar2 = var2;
fixed_t height;
- if (LUA_CallAction("A_CheckHeight", actor))
+ if (LUA_CallAction(A_CHECKHEIGHT, actor))
return;
if ((!(locvar1 >> 16) && !actor->target) || ((locvar1 >> 16) && !actor->tracer))
@@ -10127,7 +10148,7 @@ void A_CheckTrueRange(mobj_t *actor)
fixed_t dist; // horizontal range
fixed_t l; // true range
- if (LUA_CallAction("A_CheckTrueRange", actor))
+ if (LUA_CallAction(A_CHECKTRUERANGE, actor))
return;
if ((!(locvar1 >> 16) && !actor->target) || ((locvar1 >> 16) && !actor->tracer))
@@ -10178,7 +10199,7 @@ void A_CheckThingCount(mobj_t *actor)
mobj_t *mo2;
fixed_t dist = 0;
- if (LUA_CallAction("A_CheckThingCount", actor))
+ if (LUA_CallAction(A_CHECKTHINGCOUNT, actor))
return;
for (th = thlist[THINK_MOBJ].next; th != &thlist[THINK_MOBJ]; th = th->next)
@@ -10223,7 +10244,7 @@ void A_CheckAmbush(mobj_t *actor)
angle_t atp; // actor to target angle
angle_t an; // angle between at and atp
- if (LUA_CallAction("A_CheckAmbush", actor))
+ if (LUA_CallAction(A_CHECKAMBUSH, actor))
return;
if ((!locvar1 && !actor->target) || (locvar1 && !actor->tracer))
@@ -10261,7 +10282,7 @@ void A_CheckCustomValue(mobj_t *actor)
INT32 locvar1 = var1;
INT32 locvar2 = var2;
- if (LUA_CallAction("A_CheckCustomValue", actor))
+ if (LUA_CallAction(A_CHECKCUSTOMVALUE, actor))
return;
if (actor->cusval >= locvar1)
@@ -10280,7 +10301,7 @@ void A_CheckCusValMemo(mobj_t *actor)
INT32 locvar1 = var1;
INT32 locvar2 = var2;
- if (LUA_CallAction("A_CheckCusValMemo", actor))
+ if (LUA_CallAction(A_CHECKCUSVALMEMO, actor))
return;
if (actor->cvmem >= locvar1)
@@ -10305,7 +10326,7 @@ void A_SetCustomValue(mobj_t *actor)
INT32 locvar1 = var1;
INT32 locvar2 = var2;
- if (LUA_CallAction("A_SetCustomValue", actor))
+ if (LUA_CallAction(A_SETCUSTOMVALUE, actor))
return;
if (cv_debug)
@@ -10355,7 +10376,7 @@ void A_UseCusValMemo(mobj_t *actor)
INT32 temp = actor->cusval; // value being manipulated
INT32 tempM = actor->cvmem; // value used to manipulate temp with
- if (LUA_CallAction("A_UseCusValMemo", actor))
+ if (LUA_CallAction(A_USECUSVALMEMO, actor))
return;
if (locvar1 == 1) // cvmem being changed using cusval
@@ -10418,7 +10439,7 @@ void A_RelayCustomValue(mobj_t *actor)
INT32 temp; // reference value - var1 lower 16 bits changes this
INT32 tempT; // target's value - changed to tracer if var1 upper 16 bits set, then modified to become final value
- if (LUA_CallAction("A_RelayCustomValue", actor))
+ if (LUA_CallAction(A_RELAYCUSTOMVALUE, actor))
return;
if ((!(locvar1 >> 16) && !actor->target) || ((locvar1 >> 16) && !actor->tracer))
@@ -10477,7 +10498,7 @@ void A_CusValAction(mobj_t *actor)
INT32 locvar1 = var1;
INT32 locvar2 = var2;
- if (LUA_CallAction("A_CusValAction", actor))
+ if (LUA_CallAction(A_CUSVALACTION, actor))
return;
if (locvar2 == 5)
@@ -10528,7 +10549,7 @@ void A_ForceStop(mobj_t *actor)
{
INT32 locvar1 = var1;
- if (LUA_CallAction("A_ForceStop", actor))
+ if (LUA_CallAction(A_FORCESTOP, actor))
return;
actor->momx = actor->momy = 0;
@@ -10547,7 +10568,7 @@ void A_ForceWin(mobj_t *actor)
{
INT32 i;
- if (LUA_CallAction("A_ForceWin", actor))
+ if (LUA_CallAction(A_FORCEWIN, actor))
return;
for (i = 0; i < MAXPLAYERS; i++)
@@ -10581,7 +10602,7 @@ void A_SpikeRetract(mobj_t *actor)
{
INT32 locvar1 = var1;
- if (LUA_CallAction("A_SpikeRetract", actor))
+ if (LUA_CallAction(A_SPIKERETRACT, actor))
return;
if (actor->flags & MF_NOBLOCKMAP)
@@ -10665,7 +10686,7 @@ void A_Repeat(mobj_t *actor)
INT32 locvar1 = var1;
INT32 locvar2 = var2;
- if (LUA_CallAction("A_Repeat", actor))
+ if (LUA_CallAction(A_REPEAT, actor))
return;
if (locvar1 && (!actor->extravalue2 || actor->extravalue2 > locvar1))
@@ -10690,7 +10711,7 @@ void A_SetScale(mobj_t *actor)
INT32 locvar2 = var2;
mobj_t *target;
- if (LUA_CallAction("A_SetScale", actor))
+ if (LUA_CallAction(A_SETSCALE, actor))
return;
if (locvar1 <= 0)
@@ -10733,7 +10754,7 @@ void A_RemoteDamage(mobj_t *actor)
mobj_t *target; // we MUST have a target
mobj_t *source = NULL; // on the other hand we don't necessarily need a source
- if (LUA_CallAction("A_RemoteDamage", actor))
+ if (LUA_CallAction(A_REMOTEDAMAGE, actor))
return;
if (locvar1 == 1)
@@ -10786,7 +10807,7 @@ void A_HomingChase(mobj_t *actor)
fixed_t dist;
fixed_t speedmul;
- if (LUA_CallAction("A_HomingChase", actor))
+ if (LUA_CallAction(A_HOMINGCHASE, actor))
return;
if (locvar2 == 1)
@@ -10839,7 +10860,7 @@ void A_TrapShot(mobj_t *actor)
fixed_t x, y, z;
fixed_t speed;
- if (LUA_CallAction("A_TrapShot", actor))
+ if (LUA_CallAction(A_TRAPSHOT, actor))
return;
x = actor->x + P_ReturnThrustX(actor, actor->angle, FixedMul(frontoff*FRACUNIT, actor->scale));
@@ -10904,7 +10925,7 @@ void A_VileTarget(mobj_t *actor)
mobjtype_t fogtype;
INT32 i;
- if (LUA_CallAction("A_VileTarget", actor))
+ if (LUA_CallAction(A_VILETARGET, actor))
return;
if (!actor->target)
@@ -10991,7 +11012,7 @@ void A_VileAttack(mobj_t *actor)
mobj_t *fire;
INT32 i;
- if (LUA_CallAction("A_VileAttack", actor))
+ if (LUA_CallAction(A_VILEATTACK, actor))
return;
if (!actor->target)
@@ -11103,7 +11124,7 @@ void A_VileFire(mobj_t *actor)
INT32 locvar2 = var2;
mobj_t *dest;
- if (LUA_CallAction("A_VileFire", actor))
+ if (LUA_CallAction(A_VILEFIRE, actor))
return;
dest = actor->tracer;
@@ -11189,7 +11210,7 @@ void A_BrakChase(mobj_t *actor)
INT32 locvar1 = var1;
INT32 locvar2 = var2;
- if (LUA_CallAction("A_BrakChase", actor))
+ if (LUA_CallAction(A_BRAKCHASE, actor))
return;
// Set new tics NOW, in case the state changes while we're doing this and we try applying this to the painstate or something silly
@@ -11309,7 +11330,7 @@ void A_BrakFireShot(mobj_t *actor)
fixed_t x, y, z;
INT32 locvar1 = var1;
- if (LUA_CallAction("A_BrakFireShot", actor))
+ if (LUA_CallAction(A_BRAKFIRESHOT, actor))
return;
if (!actor->target)
@@ -11372,7 +11393,7 @@ void A_BrakLobShot(mobj_t *actor)
INT32 locvar2 = var2 & 0x0000FFFF;
INT32 aimDirect = var2 & 0xFFFF0000;
- if (LUA_CallAction("A_BrakLobShot", actor))
+ if (LUA_CallAction(A_BRAKLOBSHOT, actor))
return;
if (!actor->target)
@@ -11478,7 +11499,7 @@ void A_NapalmScatter(mobj_t *actor)
INT32 i; // for-loop cursor
mobj_t *mo; // each and every spawned napalm burst
- if (LUA_CallAction("A_NapalmScatter", actor))
+ if (LUA_CallAction(A_NAPALMSCATTER, actor))
return;
// Some quick sanity-checking
@@ -11530,7 +11551,7 @@ void A_SpawnFreshCopy(mobj_t *actor)
{
mobj_t *newObject;
- if (LUA_CallAction("A_SpawnFreshCopy", actor))
+ if (LUA_CallAction(A_SPAWNFRESHCOPY, actor))
return;
newObject = P_SpawnMobjFromMobj(actor, 0, 0, 0, actor->type);
@@ -11606,7 +11627,7 @@ void A_FlickySpawn(mobj_t *actor)
INT32 test = (var1 >> 16);
SINT8 moveforward = 0;
- if (LUA_CallAction("A_FlickySpawn", actor))
+ if (LUA_CallAction(A_FLICKYSPAWN, actor))
return;
if (test & 1)
@@ -11674,7 +11695,7 @@ void A_FlickyCenter(mobj_t *actor)
UINT8 flickycolor = ((locvar1 >> 16) & 0xFF);
UINT8 flickyflags = ((locvar1 >> 20) & 0xF);
- if (LUA_CallAction("A_FlickyCenter", actor))
+ if (LUA_CallAction(A_FLICKYCENTER, actor))
return;
if (!actor->tracer)
@@ -11794,7 +11815,7 @@ void A_FlickyAim(mobj_t *actor)
INT32 locvar2 = var2;
boolean flickyhitwall = false;
- if (LUA_CallAction("A_FlickyAim", actor))
+ if (LUA_CallAction(A_FLICKYAIM, actor))
return;
if ((actor->momx == actor->momy && actor->momy == 0)
@@ -11894,7 +11915,7 @@ void A_FlickyFly(mobj_t *actor)
INT32 locvar1 = var1;
INT32 locvar2 = var2;
- if (LUA_CallAction("A_FlickyFly", actor))
+ if (LUA_CallAction(A_FLICKYFLY, actor))
return;
P_InternalFlickyFly(actor, locvar1, locvar2,
@@ -11914,7 +11935,7 @@ void A_FlickySoar(mobj_t *actor)
INT32 locvar1 = var1;
INT32 locvar2 = var2;
- if (LUA_CallAction("A_FlickySoar", actor))
+ if (LUA_CallAction(A_FLICKYSOAR, actor))
return;
P_InternalFlickyFly(actor, locvar1, locvar2,
@@ -11938,7 +11959,7 @@ void A_FlickyCoast(mobj_t *actor)
INT32 locvar1 = var1;
INT32 locvar2 = var2;
- if (LUA_CallAction("A_FlickyCoast", actor))
+ if (LUA_CallAction(A_FLICKYCOAST, actor))
return;
if (actor->eflags & MFE_UNDERWATER)
@@ -11985,7 +12006,7 @@ void A_FlickyHop(mobj_t *actor)
INT32 locvar1 = var1;
INT32 locvar2 = var2;
- if (LUA_CallAction("A_FlickyHop", actor))
+ if (LUA_CallAction(A_FLICKYHOP, actor))
return;
P_InternalFlickyHop(actor, locvar1, locvar2, actor->angle);
@@ -12004,7 +12025,7 @@ void A_FlickyFlounder(mobj_t *actor)
INT32 locvar2 = var2;
angle_t hopangle;
- if (LUA_CallAction("A_FlickyFlounder", actor))
+ if (LUA_CallAction(A_FLICKYFLOUNDER, actor))
return;
locvar1 *= (P_RandomKey(2) + 1);
@@ -12026,7 +12047,7 @@ void A_FlickyCheck(mobj_t *actor)
INT32 locvar1 = var1;
INT32 locvar2 = var2;
- if (LUA_CallAction("A_FlickyCheck", actor))
+ if (LUA_CallAction(A_FLICKYCHECK, actor))
return;
if (actor->target
@@ -12063,7 +12084,7 @@ void A_FlickyHeightCheck(mobj_t *actor)
INT32 locvar1 = var1;
INT32 locvar2 = var2;
- if (LUA_CallAction("A_FlickyHeightCheck", actor))
+ if (LUA_CallAction(A_FLICKYHEIGHTCHECK, actor))
return;
if (actor->target
@@ -12098,7 +12119,7 @@ void A_FlickyFlutter(mobj_t *actor)
INT32 locvar1 = var1;
INT32 locvar2 = var2;
- if (LUA_CallAction("A_FlickyFlutter", actor))
+ if (LUA_CallAction(A_FLICKYFLUTTER, actor))
return;
var1 = locvar1;
@@ -12129,7 +12150,7 @@ void A_FlameParticle(mobj_t *actor)
fixed_t rad, hei;
mobj_t *particle;
- if (LUA_CallAction("A_FlameParticle", actor))
+ if (LUA_CallAction(A_FLAMEPARTICLE, actor))
return;
if (!type)
@@ -12157,7 +12178,7 @@ void A_FadeOverlay(mobj_t *actor)
mobj_t *fade;
INT32 locvar1 = var1;
- if (LUA_CallAction("A_FadeOverlay", actor))
+ if (LUA_CallAction(A_FADEOVERLAY, actor))
return;
fade = P_SpawnGhostMobj(actor);
@@ -12198,7 +12219,7 @@ void A_Boss5Jump(mobj_t *actor)
// INT32 locvar1 = var1;
// INT32 locvar2 = var2;
- if (LUA_CallAction("A_Boss5Jump", actor))
+ if (LUA_CallAction(A_BOSS5JUMP, actor))
return;
if (!actor->tracer)
@@ -12275,7 +12296,7 @@ void A_LightBeamReset(mobj_t *actor)
// INT32 locvar1 = var1;
// INT32 locvar2 = var2;
- if (LUA_CallAction("A_LightBeamReset", actor))
+ if (LUA_CallAction(A_LIGHTBEAMRESET, actor))
return;
actor->destscale = FRACUNIT + P_SignedRandom()*FRACUNIT/256;
@@ -12305,7 +12326,7 @@ void A_MineExplode(mobj_t *actor)
// INT32 locvar1 = var1;
// INT32 locvar2 = var2;
- if (LUA_CallAction("A_MineExplode", actor))
+ if (LUA_CallAction(A_MINEEXPLODE, actor))
return;
A_Scream(actor);
@@ -12358,7 +12379,7 @@ void A_MineRange(mobj_t *actor)
INT32 locvar1 = var1;
// INT32 locvar2 = var2;
- if (LUA_CallAction("A_MineRange", actor))
+ if (LUA_CallAction(A_MINERANGE, actor))
return;
if (!actor->target)
@@ -12384,7 +12405,7 @@ void A_ConnectToGround(mobj_t *actor)
INT32 locvar1 = var1;
INT32 locvar2 = var2;
- if (LUA_CallAction("A_ConnectToGround", actor))
+ if (LUA_CallAction(A_CONNECTTOGROUND, actor))
return;
if (actor->subsector->sector->ffloors)
@@ -12443,7 +12464,7 @@ void A_SpawnParticleRelative(mobj_t *actor)
INT32 locvar1 = var1;
INT32 locvar2 = var2;
- if (LUA_CallAction("A_SpawnParticleRelative", actor))
+ if (LUA_CallAction(A_SPAWNPARTICLERELATIVE, actor))
return;
@@ -12481,7 +12502,7 @@ void A_MultiShotDist(mobj_t *actor)
INT32 locvar1 = var1;
INT32 locvar2 = var2;
- if (LUA_CallAction("A_MultiShotDist", actor))
+ if (LUA_CallAction(A_MULTISHOTDIST, actor))
return;
{
@@ -12520,7 +12541,7 @@ void A_WhoCaresIfYourSonIsABee(mobj_t *actor)
fixed_t foffsety;
mobj_t *son;
- if (LUA_CallAction("A_WhoCaresIfYourSonIsABee", actor))
+ if (LUA_CallAction(A_WHOCARESIFYOURSONISABEE, actor))
return;
A_FaceTarget(actor);
@@ -12554,7 +12575,7 @@ void A_ParentTriesToSleep(mobj_t *actor)
{
INT32 locvar1 = var1;
- if (LUA_CallAction("A_ParentTriesToSleep", actor))
+ if (LUA_CallAction(A_PARENTTRIESTOSLEEP, actor))
return;
if (actor->extravalue1)
@@ -12582,7 +12603,7 @@ void A_ParentTriesToSleep(mobj_t *actor)
//
void A_CryingToMomma(mobj_t *actor)
{
- if (LUA_CallAction("A_CryingToMomma", actor))
+ if (LUA_CallAction(A_CRYINGTOMOMMA, actor))
return;
if (actor->tracer)
@@ -12612,7 +12633,7 @@ void A_CheckFlags2(mobj_t *actor)
INT32 locvar1 = var1;
INT32 locvar2 = var2;
- if (LUA_CallAction("A_CheckFlags2", actor))
+ if (LUA_CallAction(A_CHECKFLAGS2, actor))
return;
if (actor->flags2 & locvar1)
@@ -12633,7 +12654,7 @@ void A_Boss5FindWaypoint(mobj_t *actor)
UINT32 i;
UINT8 extrainfo = (actor->spawnpoint ? actor->spawnpoint->extrainfo : 0);
- if (LUA_CallAction("A_Boss5FindWaypoint", actor))
+ if (LUA_CallAction(A_BOSS5FINDWAYPOINT, actor))
return;
avoidcenter = !actor->tracer || (actor->health == actor->info->damage+1);
@@ -12850,7 +12871,7 @@ void A_DoNPCSkid(mobj_t *actor)
INT32 locvar2 = var2;
fixed_t x, y, z;
- if (LUA_CallAction("A_DoNPCSkid", actor))
+ if (LUA_CallAction(A_DONPCSKID, actor))
return;
x = actor->x;
@@ -12906,7 +12927,7 @@ void A_DoNPCPain(mobj_t *actor)
fixed_t vspeed = 0;
fixed_t hspeed = FixedMul(4*FRACUNIT, actor->scale);
- if (LUA_CallAction("A_DoNPCPain", actor))
+ if (LUA_CallAction(A_DONPCPAIN, actor))
return;
actor->flags &= ~(MF_NOGRAVITY|MF_NOCLIP|MF_NOCLIPHEIGHT);
@@ -12954,7 +12975,7 @@ void A_PrepareRepeat(mobj_t *actor)
{
INT32 locvar1 = var1;
- if (LUA_CallAction("A_PrepareRepeat", actor))
+ if (LUA_CallAction(A_PREPAREREPEAT, actor))
return;
actor->extravalue2 = locvar1;
@@ -12975,7 +12996,7 @@ void A_Boss5ExtraRepeat(mobj_t *actor)
INT32 locspawn;
INT32 lochealth;
- if (LUA_CallAction("A_Boss5ExtraRepeat", actor))
+ if (LUA_CallAction(A_BOSS5EXTRAREPEAT, actor))
return;
if (actor->extravalue2 > 0 && !(actor->flags2 & MF2_FRET))
@@ -13007,7 +13028,7 @@ void A_Boss5ExtraRepeat(mobj_t *actor)
//
void A_Boss5Calm(mobj_t *actor)
{
- if (LUA_CallAction("A_Boss5Calm", actor))
+ if (LUA_CallAction(A_BOSS5CALM, actor))
return;
actor->flags |= MF_SHOOTABLE;
@@ -13026,7 +13047,7 @@ void A_Boss5CheckOnGround(mobj_t *actor)
INT32 locvar1 = var1;
INT32 locvar2 = var2;
- if (LUA_CallAction("A_Boss5CheckOnGround", actor))
+ if (LUA_CallAction(A_BOSS5CHECKONGROUND, actor))
return;
if ((!(actor->eflags & MFE_VERTICALFLIP) && actor->z <= actor->floorz)
@@ -13057,7 +13078,7 @@ void A_Boss5CheckFalling(mobj_t *actor)
INT32 locvar1 = var1;
INT32 locvar2 = var2;
- if (LUA_CallAction("A_Boss5CheckFalling", actor))
+ if (LUA_CallAction(A_BOSS5CHECKFALLING, actor))
return;
if (actor->health && actor->extravalue2 > 1)
@@ -13086,7 +13107,7 @@ void A_Boss5PinchShot(mobj_t *actor)
fixed_t zoffset;
mobj_t *missile;
- if (LUA_CallAction("A_Boss5PinchShot", actor))
+ if (LUA_CallAction(A_BOSS5PINCHSHOT, actor))
return;
if (actor->health > actor->info->damage)
@@ -13121,7 +13142,7 @@ void A_Boss5MakeItRain(mobj_t *actor)
INT32 offset = (48 + locvar2)<<16; // upper 16 bits, not fixed_t!
INT32 i;
- if (LUA_CallAction("A_Boss5MakeItRain", actor))
+ if (LUA_CallAction(A_BOSS5MAKEITRAIN, actor))
return;
actor->flags2 |= MF2_STRONGBOX;
@@ -13157,7 +13178,7 @@ void A_Boss5MakeJunk(mobj_t *actor)
angle_t ang;
INT32 i = ((locvar2 & 1) ? 8 : 1);
- if (LUA_CallAction("A_Boss5MakeJunk", actor))
+ if (LUA_CallAction(A_BOSS5MAKEJUNK, actor))
return;
if (locvar1 < 0 && (actor->flags2 & MF2_SLIDEPUSH)) // this entire action is a hack, don't judge me
@@ -13247,7 +13268,7 @@ void A_LookForBetter(mobj_t *actor)
{
INT32 locvar1 = var1;
- if (LUA_CallAction("A_LookForBetter", actor))
+ if (LUA_CallAction(A_LOOKFORBETTER, actor))
return;
P_LookForPlayers(actor, (locvar1 & 65535), false, FixedMul((locvar1 >> 16)*FRACUNIT, actor->scale));
@@ -13307,7 +13328,7 @@ void A_Boss5BombExplode(mobj_t *actor)
{
INT32 locvar1 = var1;
- if (LUA_CallAction("A_Boss5BombExplode", actor))
+ if (LUA_CallAction(A_BOSS5BOMBEXPLODE, actor))
return;
// The original Lua script did not use |= to add flags but just set these flags exactly apparently?
@@ -13417,7 +13438,7 @@ void A_DustDevilThink(mobj_t *actor)
INT32 bx, by, xl, xh, yl, yh;
fixed_t radius = actor->radius;
- if (LUA_CallAction("A_DustDevilThink", actor))
+ if (LUA_CallAction(A_DUSTDEVILTHINK, actor))
return;
//Chained thinker for the spiralling dust column.
@@ -13559,7 +13580,7 @@ void A_TNTExplode(mobj_t *actor)
INT32 xl, xh, yl, yh;
static mappoint_t epicenter = {0,0,0};
- if (LUA_CallAction("A_TNTExplode", actor))
+ if (LUA_CallAction(A_TNTEXPLODE, actor))
return;
if (actor->tracer)
@@ -13625,7 +13646,7 @@ void A_DebrisRandom(mobj_t *actor)
{
INT32 locvar1 = var1;
- if (LUA_CallAction("A_DebrisRandom", actor))
+ if (LUA_CallAction(A_DEBRISRANDOM, actor))
return;
actor->frame |= P_RandomRange(0, locvar1);
@@ -13666,7 +13687,7 @@ void A_TrainCameo(mobj_t *actor)
fixed_t span = locvar1*FRACUNIT;
fixed_t len = locvar2*FRACUNIT;
- if (LUA_CallAction("A_TrainCameo", actor))
+ if (LUA_CallAction(A_TRAINCAMEO, actor))
return;
//Spawn sides.
@@ -13704,7 +13725,7 @@ void A_TrainCameo2(mobj_t *actor)
fixed_t span = locvar1*FRACUNIT;
fixed_t len = locvar2*FRACUNIT;
- if (LUA_CallAction("A_TrainCameo2", actor))
+ if (LUA_CallAction(A_TRAINCAMEO2, actor))
return;
//Spawn sides.
@@ -13730,7 +13751,7 @@ void A_CanarivoreGas(mobj_t *actor)
{
INT32 locvar1 = var1;
- if (LUA_CallAction("A_CanarivoreGas", actor))
+ if (LUA_CallAction(A_CANARIVOREGAS, actor))
return;
P_DustRing(locvar1, 4, actor->x, actor->y, actor->z + actor->height / 5, 18, 0, FRACUNIT/10, actor->scale);
@@ -13751,7 +13772,7 @@ void A_KillSegments(mobj_t *actor)
mobj_t *seg = actor->tracer;
INT32 fuse = locvar1 ? locvar1 : TICRATE/2;
- if (LUA_CallAction("A_KillSegments", actor))
+ if (LUA_CallAction(A_KILLSEGMENTS, actor))
return;
while (seg)
@@ -13834,7 +13855,7 @@ void A_SnapperSpawn(mobj_t *actor)
INT32 i;
mobj_t *seg;
- if (LUA_CallAction("A_SnapperSpawn", actor))
+ if (LUA_CallAction(A_SNAPPERSPAWN, actor))
return;
// It spawns 1 head.
@@ -13884,7 +13905,7 @@ void A_SnapperThinker(mobj_t *actor)
fixed_t dist;
boolean chasing;
- if (LUA_CallAction("A_SnapperThinker", actor))
+ if (LUA_CallAction(A_SNAPPERTHINKER, actor))
return;
// We make a check just in case there's no spawnpoint.
@@ -14005,7 +14026,7 @@ void A_SaloonDoorSpawn(mobj_t *actor)
mobj_t *door;
mobjflag2_t ambush = (actor->flags2 & MF2_AMBUSH);
- if (LUA_CallAction("A_SaloonDoorSpawn", actor))
+ if (LUA_CallAction(A_SALOONDOORSPAWN, actor))
return;
if (!locvar1)
@@ -14042,7 +14063,7 @@ void A_MinecartSparkThink(mobj_t *actor)
fixed_t dz, dm;
UINT8 i;
- if (LUA_CallAction("A_MinecartSparkThink", actor))
+ if (LUA_CallAction(A_MINECARTSPARKTHINK, actor))
return;
if (actor->momz == 0 && P_IsObjectOnGround(actor))
@@ -14076,7 +14097,7 @@ void A_ModuloToState(mobj_t *actor)
INT32 locvar1 = var1;
INT32 locvar2 = var2;
- if (LUA_CallAction("A_ModuloToState", actor))
+ if (LUA_CallAction(A_MODULOTOSTATE, actor))
return;
if ((modulothing % locvar1 == 0))
@@ -14095,7 +14116,7 @@ void A_LavafallRocks(mobj_t *actor)
{
UINT8 i;
- if (LUA_CallAction("A_LavafallRocks", actor))
+ if (LUA_CallAction(A_LAVAFALLROCKS, actor))
return;
// Don't spawn rocks unless a player is relatively close by.
@@ -14126,7 +14147,7 @@ void A_LavafallLava(mobj_t *actor)
mobj_t *lavafall;
UINT8 i;
- if (LUA_CallAction("A_LavafallLava", actor))
+ if (LUA_CallAction(A_LAVAFALLLAVA, actor))
return;
if ((40 - actor->fuse) % (2*(actor->scale >> FRACBITS)))
@@ -14154,7 +14175,7 @@ void A_LavafallLava(mobj_t *actor)
//
void A_FallingLavaCheck(mobj_t *actor)
{
- if (LUA_CallAction("A_FallingLavaCheck", actor))
+ if (LUA_CallAction(A_FALLINGLAVACHECK, actor))
return;
if (actor->eflags & MFE_TOUCHWATER || P_IsObjectOnGround(actor))
@@ -14179,7 +14200,7 @@ void A_FireShrink(mobj_t *actor)
INT32 locvar1 = var1;
INT32 locvar2 = var2;
- if (LUA_CallAction("A_FireShrink", actor))
+ if (LUA_CallAction(A_FIRESHRINK, actor))
return;
actor->destscale = locvar1;
@@ -14203,7 +14224,7 @@ void A_SpawnPterabytes(mobj_t *actor)
UINT8 amount = 1;
UINT8 i;
- if (LUA_CallAction("A_SpawnPterabytes", actor))
+ if (LUA_CallAction(A_SPAWNPTERABYTES, actor))
return;
if (actor->spawnpoint)
@@ -14238,7 +14259,7 @@ void A_PterabyteHover(mobj_t *actor)
{
angle_t ang, fa;
- if (LUA_CallAction("A_PterabyteHover", actor))
+ if (LUA_CallAction(A_PTERABYTEHOVER, actor))
return;
P_InstaThrust(actor, actor->angle, actor->info->speed);
@@ -14260,7 +14281,7 @@ void A_RolloutSpawn(mobj_t *actor)
INT32 locvar1 = var1;
INT32 locvar2 = var2;
- if (LUA_CallAction("A_RolloutSpawn", actor))
+ if (LUA_CallAction(A_ROLLOUTSPAWN, actor))
return;
if (!(actor->target)
@@ -14296,7 +14317,7 @@ void A_RolloutRock(mobj_t *actor)
fixed_t speed = P_AproxDistance(actor->momx, actor->momy), topspeed = FixedMul(actor->info->speed, actor->scale);
boolean inwater = actor->eflags & (MFE_TOUCHWATER|MFE_UNDERWATER);
- if (LUA_CallAction("A_RolloutRock", actor))
+ if (LUA_CallAction(A_ROLLOUTROCK, actor))
return;
actor->friction = FRACUNIT; // turns out riding on solids sucks, so let's just make it easier on ourselves
@@ -14379,7 +14400,7 @@ void A_DragonbomberSpawn(mobj_t *actor)
UINT8 i;
mobj_t *mo = actor;
- if (LUA_CallAction("A_DragonbomberSpawn", actor))
+ if (LUA_CallAction(A_DRAGONBOMBERSPAWN, actor))
return;
for (i = 0; i < var1; i++) // spawn tail segments
@@ -14415,7 +14436,7 @@ void A_DragonWing(mobj_t *actor)
mobj_t *target = actor->target;
fixed_t x, y;
- if (LUA_CallAction("A_DragonWing", actor))
+ if (LUA_CallAction(A_DRAGONWING, actor))
return;
if (target == NULL || !target->health)
@@ -14448,7 +14469,7 @@ void A_DragonSegment(mobj_t *actor)
fixed_t ydist;
fixed_t zdist;
- if (LUA_CallAction("A_DragonSegment", actor))
+ if (LUA_CallAction(A_DRAGONSEGMENT, actor))
return;
if (target == NULL || !target->health)
@@ -14486,7 +14507,7 @@ void A_ChangeHeight(mobj_t *actor)
fixed_t height = locvar1;
boolean reverse;
- if (LUA_CallAction("A_ChangeHeight", actor))
+ if (LUA_CallAction(A_CHANGEHEIGHT, actor))
return;
reverse = (actor->eflags & MFE_VERTICALFLIP) || (actor->flags2 & MF2_OBJECTFLIP);
diff --git a/src/p_floor.c b/src/p_floor.c
index a0f7edd9ca0e68617b1eede0441c5a14a2dbe549..7c26065b59b6e9ef0f002bf20907e3eae75856cc 100644
--- a/src/p_floor.c
+++ b/src/p_floor.c
@@ -632,8 +632,10 @@ void T_BounceCheese(bouncecheese_t *bouncer)
fixed_t waterheight;
fixed_t floorheight;
sector_t *actionsector;
- INT32 i;
boolean remove;
+ INT32 i;
+ mtag_t tag = Tag_FGet(&bouncer->sourceline->tags);
+ TAG_ITER_DECLARECOUNTER(0);
if (bouncer->sector->crumblestate == CRUMBLE_RESTORE || bouncer->sector->crumblestate == CRUMBLE_WAIT
|| bouncer->sector->crumblestate == CRUMBLE_ACTIVATED) // Oops! Crumbler says to remove yourself!
@@ -648,7 +650,7 @@ void T_BounceCheese(bouncecheese_t *bouncer)
}
// You can use multiple target sectors, but at your own risk!!!
- for (i = -1; (i = P_FindSectorFromTag(bouncer->sourceline->tag, i)) >= 0 ;)
+ TAG_ITER_SECTORS(0, tag, i)
{
actionsector = §ors[i];
actionsector->moved = true;
@@ -772,6 +774,8 @@ void T_StartCrumble(crumble_t *crumble)
ffloor_t *rover;
sector_t *sector;
INT32 i;
+ mtag_t tag = Tag_FGet(&crumble->sourceline->tags);
+ TAG_ITER_DECLARECOUNTER(0);
// Once done, the no-return thinker just sits there,
// constantly 'returning'... kind of an oxymoron, isn't it?
@@ -800,7 +804,7 @@ void T_StartCrumble(crumble_t *crumble)
}
else if (++crumble->timer == 0) // Reposition back to original spot
{
- for (i = -1; (i = P_FindSectorFromTag(crumble->sourceline->tag, i)) >= 0 ;)
+ TAG_ITER_SECTORS(0, tag, i)
{
sector = §ors[i];
@@ -836,7 +840,7 @@ void T_StartCrumble(crumble_t *crumble)
// Flash to indicate that the platform is about to return.
if (crumble->timer > -224 && (leveltime % ((abs(crumble->timer)/8) + 1) == 0))
{
- for (i = -1; (i = P_FindSectorFromTag(crumble->sourceline->tag, i)) >= 0 ;)
+ TAG_ITER_SECTORS(0, tag, i)
{
sector = §ors[i];
@@ -928,7 +932,7 @@ void T_StartCrumble(crumble_t *crumble)
P_RemoveThinker(&crumble->thinker);
}
- for (i = -1; (i = P_FindSectorFromTag(crumble->sourceline->tag, i)) >= 0 ;)
+ TAG_ITER_SECTORS(0, tag, i)
{
sector = §ors[i];
sector->moved = true;
@@ -944,6 +948,7 @@ void T_StartCrumble(crumble_t *crumble)
void T_MarioBlock(mariothink_t *block)
{
INT32 i;
+ TAG_ITER_DECLARECOUNTER(0);
T_MovePlane
(
@@ -978,8 +983,7 @@ void T_MarioBlock(mariothink_t *block)
block->sector->ceilspeed = 0;
block->direction = 0;
}
-
- for (i = -1; (i = P_FindSectorFromTag(block->tag, i)) >= 0 ;)
+ TAG_ITER_SECTORS(0, (INT16)block->tag, i)
P_RecalcPrecipInSector(§ors[i]);
}
@@ -992,8 +996,7 @@ void T_FloatSector(floatthink_t *floater)
// Just find the first sector with the tag.
// Doesn't work with multiple sectors that have different floor/ceiling heights.
- secnum = P_FindSectorFromTag(floater->tag, -1);
- if (secnum <= 0)
+ if ((secnum = Tag_Iterate_Sectors((INT16)floater->tag, 0)) < 0)
return;
actionsector = §ors[secnum];
@@ -1061,9 +1064,7 @@ static mobj_t *SearchMarioNode(msecnode_t *node)
case MT_HOOP:
case MT_HOOPCOLLIDE:
case MT_NIGHTSCORE:
-#ifdef SEENAMES
case MT_NAMECHECK: // DEFINITELY not this, because it is client-side.
-#endif
continue;
default:
break;
@@ -1131,10 +1132,8 @@ void T_ThwompSector(thwomp_t *thwomp)
// Just find the first sector with the tag.
// Doesn't work with multiple sectors that have different floor/ceiling heights.
- secnum = P_FindSectorFromTag(thwomp->tag, -1);
-
- if (secnum <= 0)
- return; // Bad bad bad!
+ if ((secnum = Tag_Iterate_Sectors((INT16)thwomp->tag, 0)) < 0)
+ return;
actionsector = §ors[secnum];
@@ -1293,8 +1292,10 @@ void T_NoEnemiesSector(noenemies_t *nobaddies)
sector_t *sec = NULL;
INT32 secnum = -1;
boolean FOFsector = false;
+ mtag_t tag = Tag_FGet(&nobaddies->sourceline->tags);
+ TAG_ITER_DECLARECOUNTER(0);
- while ((secnum = P_FindSectorFromTag(nobaddies->sourceline->tag, secnum)) >= 0)
+ TAG_ITER_SECTORS(0, tag, secnum)
{
sec = §ors[secnum];
@@ -1304,13 +1305,15 @@ void T_NoEnemiesSector(noenemies_t *nobaddies)
for (i = 0; i < sec->linecount; i++)
{
INT32 targetsecnum = -1;
+ mtag_t tag2 = Tag_FGet(&sec->lines[i]->tags);
+ TAG_ITER_DECLARECOUNTER(1);
if (sec->lines[i]->special < 100 || sec->lines[i]->special >= 300)
continue;
FOFsector = true;
- while ((targetsecnum = P_FindSectorFromTag(sec->lines[i]->tag, targetsecnum)) >= 0)
+ TAG_ITER_SECTORS(1, tag2, targetsecnum)
{
if (T_SectorHasEnemies(§ors[targetsecnum]))
return;
@@ -1321,7 +1324,7 @@ void T_NoEnemiesSector(noenemies_t *nobaddies)
return;
}
- CONS_Debug(DBG_GAMELOGIC, "Running no-more-enemies exec with tag of %d\n", nobaddies->sourceline->tag);
+ CONS_Debug(DBG_GAMELOGIC, "Running no-more-enemies exec with tag of %d\n", tag);
// No enemies found, run the linedef exec and terminate this thinker
P_RunTriggerLinedef(nobaddies->sourceline, NULL, NULL);
@@ -1396,6 +1399,8 @@ void T_EachTimeThinker(eachtime_t *eachtime)
boolean floortouch = false;
fixed_t bottomheight, topheight;
ffloor_t *rover;
+ mtag_t tag = Tag_FGet(&eachtime->sourceline->tags);
+ TAG_ITER_DECLARECOUNTER(0);
for (i = 0; i < MAXPLAYERS; i++)
{
@@ -1405,7 +1410,7 @@ void T_EachTimeThinker(eachtime_t *eachtime)
eachtime->playersOnArea[i] = false;
}
- while ((secnum = P_FindSectorFromTag(eachtime->sourceline->tag, secnum)) >= 0)
+ TAG_ITER_SECTORS(0, tag, secnum)
{
sec = §ors[secnum];
@@ -1422,13 +1427,15 @@ void T_EachTimeThinker(eachtime_t *eachtime)
for (i = 0; i < sec->linecount; i++)
{
INT32 targetsecnum = -1;
+ mtag_t tag2 = Tag_FGet(&sec->lines[i]->tags);
+ TAG_ITER_DECLARECOUNTER(1);
if (sec->lines[i]->special < 100 || sec->lines[i]->special >= 300)
continue;
FOFsector = true;
- while ((targetsecnum = P_FindSectorFromTag(sec->lines[i]->tag, targetsecnum)) >= 0)
+ TAG_ITER_SECTORS(1, tag2, targetsecnum)
{
targetsec = §ors[targetsecnum];
@@ -1530,7 +1537,7 @@ void T_EachTimeThinker(eachtime_t *eachtime)
if (!playersArea[i] && (!eachtime->triggerOnExit || !P_IsPlayerValid(i)))
continue;
- CONS_Debug(DBG_GAMELOGIC, "Trying to activate each time executor with tag %d\n", eachtime->sourceline->tag);
+ CONS_Debug(DBG_GAMELOGIC, "Trying to activate each time executor with tag %d\n", tag);
// 03/08/14 -Monster Iestyn
// No more stupid hacks involving changing eachtime->sourceline's tag or special or whatever!
@@ -1562,11 +1569,13 @@ void T_RaiseSector(raise_t *raise)
fixed_t distToNearestEndpoint;
INT32 direction;
result_e res = 0;
+ mtag_t tag = raise->tag;
+ TAG_ITER_DECLARECOUNTER(0);
if (raise->sector->crumblestate >= CRUMBLE_FALL || raise->sector->ceilingdata)
return;
- for (i = -1; (i = P_FindSectorFromTag(raise->tag, i)) >= 0 ;)
+ TAG_ITER_SECTORS(0, tag, i)
{
sector = §ors[i];
@@ -1693,7 +1702,7 @@ void T_RaiseSector(raise_t *raise)
raise->sector->ceilspeed = 42;
raise->sector->floorspeed = speed*direction;
- for (i = -1; (i = P_FindSectorFromTag(raise->tag, i)) >= 0 ;)
+ TAG_ITER_SECTORS(0, tag, i)
P_RecalcPrecipInSector(§ors[i]);
}
@@ -1810,8 +1819,10 @@ void EV_DoFloor(line_t *line, floor_e floortype)
INT32 secnum = -1;
sector_t *sec;
floormove_t *dofloor;
+ mtag_t tag = Tag_FGet(&line->tags);
+ TAG_ITER_DECLARECOUNTER(0);
- while ((secnum = P_FindSectorFromTag(line->tag, secnum)) >= 0)
+ TAG_ITER_SECTORS(0, tag, secnum)
{
sec = §ors[secnum];
@@ -2025,9 +2036,11 @@ void EV_DoElevator(line_t *line, elevator_e elevtype, boolean customspeed)
INT32 secnum = -1;
sector_t *sec;
elevator_t *elevator;
+ mtag_t tag = Tag_FGet(&line->tags);
+ TAG_ITER_DECLARECOUNTER(0);
// act on all sectors with the same tag as the triggering linedef
- while ((secnum = P_FindSectorFromTag(line->tag,secnum)) >= 0)
+ TAG_ITER_SECTORS(0, tag, secnum)
{
sec = §ors[secnum];
@@ -2148,6 +2161,7 @@ void EV_CrumbleChain(sector_t *sec, ffloor_t *rover)
INT16 flags;
sector_t *controlsec = rover->master->frontsector;
+ mtag_t tag = Tag_FGet(&controlsec->tags);
if (sec == NULL)
{
@@ -2176,9 +2190,9 @@ void EV_CrumbleChain(sector_t *sec, ffloor_t *rover)
lifetime = 3*TICRATE;
flags = 0;
- if (controlsec->tag != 0)
+ if (tag != 0)
{
- INT32 tagline = P_FindSpecialLineFromTag(14, controlsec->tag, -1);
+ INT32 tagline = Tag_FindLineSpecial(14, tag);
if (tagline != -1)
{
if (sides[lines[tagline].sidenum[0]].toptexture)
@@ -2322,6 +2336,8 @@ INT32 EV_StartCrumble(sector_t *sec, ffloor_t *rover, boolean floating,
crumble_t *crumble;
sector_t *foundsec;
INT32 i;
+ mtag_t tag = Tag_FGet(&rover->master->tags);
+ TAG_ITER_DECLARECOUNTER(0);
// If floor is already activated, skip it
if (sec->floordata)
@@ -2364,7 +2380,7 @@ INT32 EV_StartCrumble(sector_t *sec, ffloor_t *rover, boolean floating,
crumble->sector->crumblestate = CRUMBLE_ACTIVATED;
- for (i = -1; (i = P_FindSectorFromTag(crumble->sourceline->tag, i)) >= 0 ;)
+ TAG_ITER_SECTORS(0, tag, i)
{
foundsec = §ors[i];
@@ -2413,7 +2429,7 @@ void EV_MarioBlock(ffloor_t *rover, sector_t *sector, mobj_t *puncher)
block->direction = 1;
block->floorstartheight = block->sector->floorheight;
block->ceilingstartheight = block->sector->ceilingheight;
- block->tag = (INT16)sector->tag;
+ block->tag = (INT16)Tag_FGet(§or->tags);
if (itsamonitor)
{
diff --git a/src/p_inter.c b/src/p_inter.c
index 5f2050b7f3270407bd22fce622e3de2f89734e8c..e9a16a3dd143128a06fa5658cb8ad2d7fb35f4c2 100644
--- a/src/p_inter.c
+++ b/src/p_inter.c
@@ -1388,7 +1388,11 @@ void P_TouchSpecialThing(mobj_t *special, mobj_t *toucher, boolean heightcheck)
if (player->bot)
return;
- junk.tag = LE_AXE;
+ // Initialize my junk
+ junk.tags.tags = NULL;
+ junk.tags.count = 0;
+
+ Tag_FSet(&junk.tags, LE_AXE);
EV_DoElevator(&junk, bridgeFall, false);
// scan the remaining thinkers to find koopa
diff --git a/src/p_lights.c b/src/p_lights.c
index 371077a302d39b903b88658baf492d38680dcbb7..d396e92d3dedff6ac56f40901335ec701d6625e9 100644
--- a/src/p_lights.c
+++ b/src/p_lights.c
@@ -374,8 +374,10 @@ void P_FadeLightBySector(sector_t *sector, INT32 destvalue, INT32 speed, boolean
void P_FadeLight(INT16 tag, INT32 destvalue, INT32 speed, boolean ticbased, boolean force)
{
INT32 i;
+ TAG_ITER_DECLARECOUNTER(0);
+
// search all sectors for ones with tag
- for (i = -1; (i = P_FindSectorFromTag(tag, i)) >= 0 ;)
+ TAG_ITER_SECTORS(0, tag, i)
{
if (!force && ticbased // always let speed fader execute
&& sectors[i].lightingdata
diff --git a/src/p_local.h b/src/p_local.h
index cf3a66e9dc30d68ca3745845be5d57f1e7e19c9b..8568dd4f8c2d58481c1b15e7b5a9e65a864f77bc 100644
--- a/src/p_local.h
+++ b/src/p_local.h
@@ -143,6 +143,8 @@ angle_t P_GetLocalAngle(player_t *player);
void P_SetLocalAngle(player_t *player, angle_t angle);
void P_ForceLocalAngle(player_t *player, angle_t angle);
boolean P_PlayerFullbright(player_t *player);
+boolean P_PlayerCanEnterSpinGaps(player_t *player);
+boolean P_PlayerShouldUseSpinHeight(player_t *player);
boolean P_IsObjectInGoop(mobj_t *mo);
boolean P_IsObjectOnGround(mobj_t *mo);
@@ -326,9 +328,7 @@ mobj_t *P_SpawnPointMissile(mobj_t *source, fixed_t xa, fixed_t ya, fixed_t za,
mobj_t *P_SpawnAlteredDirectionMissile(mobj_t *source, mobjtype_t type, fixed_t x, fixed_t y, fixed_t z, INT32 shiftingAngle);
mobj_t *P_SPMAngle(mobj_t *source, mobjtype_t type, angle_t angle, UINT8 aimtype, UINT32 flags2);
#define P_SpawnPlayerMissile(s,t,f) P_SPMAngle(s,t,s->angle,true,f)
-#ifdef SEENAMES
#define P_SpawnNameFinder(s,t) P_SPMAngle(s,t,s->angle,true,0)
-#endif
void P_ColorTeamMissile(mobj_t *missile, player_t *source);
SINT8 P_MobjFlip(mobj_t *mobj);
fixed_t P_GetMobjGravity(mobj_t *mo);
@@ -428,6 +428,7 @@ void P_Initsecnode(void);
void P_RadiusAttack(mobj_t *spot, mobj_t *source, fixed_t damagedist, UINT8 damagetype, boolean sightcheck);
fixed_t P_FloorzAtPos(fixed_t x, fixed_t y, fixed_t z, fixed_t height);
+fixed_t P_CeilingzAtPos(fixed_t x, fixed_t y, fixed_t z, fixed_t height);
boolean PIT_PushableMoved(mobj_t *thing);
boolean P_DoSpring(mobj_t *spring, mobj_t *object);
diff --git a/src/p_map.c b/src/p_map.c
index 1c10a78f3bdf06ea6b100ca8756e6dffef23bb0e..bf668ba3e8562db44f524066553350306f206ae1 100644
--- a/src/p_map.c
+++ b/src/p_map.c
@@ -33,6 +33,8 @@
#include "lua_hook.h"
+#include "m_perfstats.h" // ps_checkposition_calls
+
fixed_t tmbbox[4];
mobj_t *tmthing;
static INT32 tmflags;
@@ -725,9 +727,8 @@ static boolean PIT_CheckThing(mobj_t *thing)
|| (thing->player && thing->player->spectator))
return true;
-#ifdef SEENAMES
- // Do name checks all the way up here
- // So that NOTHING ELSE can see MT_NAMECHECK because it is client-side.
+ // Do name checks all the way up here
+ // So that NOTHING ELSE can see MT_NAMECHECK because it is client-side.
if (tmthing->type == MT_NAMECHECK)
{
// Ignore things that aren't players, ignore spectators, ignore yourself.
@@ -751,7 +752,6 @@ static boolean PIT_CheckThing(mobj_t *thing)
seenplayer = thing->player;
return false;
}
-#endif
// Metal Sonic destroys tiny baby objects.
if (tmthing->type == MT_METALSONIC_RACE
@@ -980,7 +980,8 @@ static boolean PIT_CheckThing(mobj_t *thing)
if (thing->type == MT_SALOONDOOR && tmthing->player)
{
mobj_t *ref = (tmthing->player->powers[pw_carry] == CR_MINECART && tmthing->tracer && !P_MobjWasRemoved(tmthing->tracer)) ? tmthing->tracer : tmthing;
- if ((thing->flags2 & MF2_AMBUSH) || ref != tmthing)
+ if (((thing->flags2 & MF2_AMBUSH) && (tmthing->z <= thing->z + thing->height) && (tmthing->z + tmthing->height >= thing->z))
+ || ref != tmthing)
{
fixed_t dm = min(FixedHypot(ref->momx, ref->momy), 16*FRACUNIT);
angle_t ang = R_PointToAngle2(0, 0, ref->momx, ref->momy) - thing->angle;
@@ -993,7 +994,8 @@ static boolean PIT_CheckThing(mobj_t *thing)
if (thing->type == MT_SALOONDOORCENTER && tmthing->player)
{
- if ((thing->flags2 & MF2_AMBUSH) || (tmthing->player->powers[pw_carry] == CR_MINECART && tmthing->tracer && !P_MobjWasRemoved(tmthing->tracer)))
+ if (((thing->flags2 & MF2_AMBUSH) && (tmthing->z <= thing->z + thing->height) && (tmthing->z + tmthing->height >= thing->z))
+ || (tmthing->player->powers[pw_carry] == CR_MINECART && tmthing->tracer && !P_MobjWasRemoved(tmthing->tracer)))
return true;
}
@@ -2019,6 +2021,8 @@ boolean P_CheckPosition(mobj_t *thing, fixed_t x, fixed_t y)
subsector_t *newsubsec;
boolean blockval = true;
+ ps_checkposition_calls++;
+
I_Assert(thing != NULL);
#ifdef PARANOIA
if (P_MobjWasRemoved(thing))
@@ -2253,6 +2257,8 @@ boolean P_CheckPosition(mobj_t *thing, fixed_t x, fixed_t y)
{
if (!P_BlockThingsIterator(bx, by, PIT_CheckThing))
blockval = false;
+ else
+ tmhitthing = tmfloorthing;
if (P_MobjWasRemoved(tmthing))
return false;
}
@@ -2661,7 +2667,7 @@ boolean P_TryMove(mobj_t *thing, fixed_t x, fixed_t y, boolean allowdropoff)
fixed_t tryx = thing->x;
fixed_t tryy = thing->y;
fixed_t radius = thing->radius;
- fixed_t thingtop = thing->z + thing->height;
+ fixed_t thingtop;
fixed_t startingonground = P_IsObjectOnGround(thing);
floatok = false;
@@ -2702,6 +2708,11 @@ boolean P_TryMove(mobj_t *thing, fixed_t x, fixed_t y, boolean allowdropoff)
|| GETSECSPECIAL(R_PointInSubsector(x, y)->sector->special, 1) == 13)
maxstep <<= 1;
+ // If using type Section1:14, no maxstep.
+ if (P_PlayerTouchingSectorSpecial(thing->player, 1, 14)
+ || GETSECSPECIAL(R_PointInSubsector(x, y)->sector->special, 1) == 14)
+ maxstep = 0;
+
// Don't 'step up' while springing,
// Only step up "if needed".
if (thing->player->panim == PA_SPRING
@@ -2712,7 +2723,10 @@ boolean P_TryMove(mobj_t *thing, fixed_t x, fixed_t y, boolean allowdropoff)
if (thing->type == MT_SKIM)
maxstep = 0;
- if (tmceilingz - tmfloorz < thing->height)
+ if (tmceilingz - tmfloorz < thing->height
+ || (thing->player
+ && tmceilingz - tmfloorz < P_GetPlayerHeight(thing->player)
+ && !P_PlayerCanEnterSpinGaps(thing->player)))
{
if (tmfloorthing)
tmhitthing = tmfloorthing;
@@ -2721,47 +2735,47 @@ boolean P_TryMove(mobj_t *thing, fixed_t x, fixed_t y, boolean allowdropoff)
floatok = true;
- if (thing->eflags & MFE_VERTICALFLIP)
+ thingtop = thing->z + thing->height;
+
+ // Step up
+ if (thing->z < tmfloorz)
{
- if (thing->z < tmfloorz)
+ if (maxstep > 0 && tmfloorz - thing->z <= maxstep)
+ {
+ thing->z = thing->floorz = tmfloorz;
+ thing->floorrover = tmfloorrover;
+ thing->eflags |= MFE_JUSTSTEPPEDDOWN;
+ }
+ else
+ {
return false; // mobj must raise itself to fit
+ }
}
else if (tmceilingz < thingtop)
- return false; // mobj must lower itself to fit
-
- // Ramp test
- if (maxstep > 0 && !(
- thing->player && (
- P_PlayerTouchingSectorSpecial(thing->player, 1, 14)
- || GETSECSPECIAL(R_PointInSubsector(x, y)->sector->special, 1) == 14)
- )
- )
+ {
+ if (maxstep > 0 && thingtop - tmceilingz <= maxstep)
+ {
+ thing->z = ( thing->ceilingz = tmceilingz ) - thing->height;
+ thing->ceilingrover = tmceilingrover;
+ thing->eflags |= MFE_JUSTSTEPPEDDOWN;
+ }
+ else
+ {
+ return false; // mobj must lower itself to fit
+ }
+ }
+ else if (maxstep > 0) // Step down
{
// If the floor difference is MAXSTEPMOVE or less, and the sector isn't Section1:14, ALWAYS
// step down! Formerly required a Section1:13 sector for the full MAXSTEPMOVE, but no more.
- if (thing->eflags & MFE_VERTICALFLIP)
+ if (thingtop == thing->ceilingz && tmceilingz > thingtop && tmceilingz - thingtop <= maxstep)
{
- if (thingtop == thing->ceilingz && tmceilingz > thingtop && tmceilingz - thingtop <= maxstep)
- {
- thing->z = (thing->ceilingz = thingtop = tmceilingz) - thing->height;
- thing->ceilingrover = tmceilingrover;
- thing->eflags |= MFE_JUSTSTEPPEDDOWN;
- }
- else if (tmceilingz < thingtop && thingtop - tmceilingz <= maxstep)
- {
- thing->z = (thing->ceilingz = thingtop = tmceilingz) - thing->height;
- thing->ceilingrover = tmceilingrover;
- thing->eflags |= MFE_JUSTSTEPPEDDOWN;
- }
- }
- else if (thing->z == thing->floorz && tmfloorz < thing->z && thing->z - tmfloorz <= maxstep)
- {
- thing->z = thing->floorz = tmfloorz;
- thing->floorrover = tmfloorrover;
+ thing->z = (thing->ceilingz = tmceilingz) - thing->height;
+ thing->ceilingrover = tmceilingrover;
thing->eflags |= MFE_JUSTSTEPPEDDOWN;
}
- else if (tmfloorz > thing->z && tmfloorz - thing->z <= maxstep)
+ else if (thing->z == thing->floorz && tmfloorz < thing->z && thing->z - tmfloorz <= maxstep)
{
thing->z = thing->floorz = tmfloorz;
thing->floorrover = tmfloorrover;
@@ -2769,22 +2783,6 @@ boolean P_TryMove(mobj_t *thing, fixed_t x, fixed_t y, boolean allowdropoff)
}
}
- if (thing->eflags & MFE_VERTICALFLIP)
- {
- if (thingtop - tmceilingz > maxstep)
- {
- if (tmfloorthing)
- tmhitthing = tmfloorthing;
- return false; // too big a step up
- }
- }
- else if (tmfloorz - thing->z > maxstep)
- {
- if (tmfloorthing)
- tmhitthing = tmfloorthing;
- return false; // too big a step up
- }
-
if (!allowdropoff && !(thing->flags & MF_FLOAT) && thing->type != MT_SKIM && !tmfloorthing)
{
if (thing->eflags & MFE_VERTICALFLIP)
@@ -3114,7 +3112,7 @@ static void P_HitSlideLine(line_t *ld)
lineangle >>= ANGLETOFINESHIFT;
deltaangle >>= ANGLETOFINESHIFT;
- movelen = P_AproxDistance(tmxmove, tmymove);
+ movelen = R_PointToDist2(0, 0, tmxmove, tmymove);
newlen = FixedMul(movelen, FINECOSINE(deltaangle));
tmxmove = FixedMul(newlen, FINECOSINE(lineangle));
@@ -3336,6 +3334,11 @@ static boolean PTR_LineIsBlocking(line_t *li)
if (openbottom - slidemo->z > FixedMul(MAXSTEPMOVE, slidemo->scale))
return true; // too big a step up
+ if (slidemo->player
+ && openrange < P_GetPlayerHeight(slidemo->player)
+ && !P_PlayerCanEnterSpinGaps(slidemo->player))
+ return true; // nonspin character should not take this path
+
return false;
}
@@ -3351,7 +3354,7 @@ static void PTR_GlideClimbTraverse(line_t *li)
{
for (rover = checksector->ffloors; rover; rover = rover->next)
{
- if (!(rover->flags & FF_EXISTS) || !(rover->flags & FF_BLOCKPLAYER) || (rover->flags & FF_BUSTUP))
+ if (!(rover->flags & FF_EXISTS) || !(rover->flags & FF_BLOCKPLAYER) || ((rover->flags & FF_BUSTUP) && (slidemo->player->charflags & SF_CANBUSTWALLS)))
continue;
topheight = P_GetFFloorTopZAt (rover, slidemo->x, slidemo->y);
@@ -3450,9 +3453,17 @@ static boolean PTR_SlideTraverse(intercept_t *in)
P_ProcessSpecialSector(slidemo->player, slidemo->subsector->sector, li->polyobj->lines[0]->backsector);
}
- if (slidemo->player && slidemo->player->charability == CA_GLIDEANDCLIMB
- && (slidemo->player->pflags & PF_GLIDING || slidemo->player->climbing))
- PTR_GlideClimbTraverse(li);
+ if (slidemo->player)
+ {
+ if (slidemo->player->charability == CA_GLIDEANDCLIMB
+ && (slidemo->player->pflags & PF_GLIDING || slidemo->player->climbing))
+ PTR_GlideClimbTraverse(li);
+ else
+ {
+ slidemo->player->lastsidehit = li->sidenum[P_PointOnLineSide(slidemo->x, slidemo->y, li)];
+ slidemo->player->lastlinehit = (INT16)(li - lines);
+ }
+ }
if (in->frac < bestslidefrac && (!slidemo->player || !slidemo->player->climbing))
{
@@ -4963,7 +4974,7 @@ void P_MapEnd(void)
}
// P_FloorzAtPos
-// Returns the floorz of the XYZ position // TODO: Need ceilingpos function too
+// Returns the floorz of the XYZ position
// Tails 05-26-2003
fixed_t P_FloorzAtPos(fixed_t x, fixed_t y, fixed_t z, fixed_t height)
{
@@ -5007,3 +5018,47 @@ fixed_t P_FloorzAtPos(fixed_t x, fixed_t y, fixed_t z, fixed_t height)
return floorz;
}
+
+// P_CeilingZAtPos
+// Returns the ceilingz of the XYZ position
+fixed_t P_CeilingzAtPos(fixed_t x, fixed_t y, fixed_t z, fixed_t height)
+{
+ sector_t *sec = R_PointInSubsector(x, y)->sector;
+ fixed_t ceilingz = P_GetSectorCeilingZAt(sec, x, y);
+
+ if (sec->ffloors)
+ {
+ ffloor_t *rover;
+ fixed_t delta1, delta2, thingtop = z + height;
+
+ for (rover = sec->ffloors; rover; rover = rover->next)
+ {
+ fixed_t topheight, bottomheight;
+ if (!(rover->flags & FF_EXISTS))
+ continue;
+
+ if ((!(rover->flags & FF_SOLID || rover->flags & FF_QUICKSAND) || (rover->flags & FF_SWIMMABLE)))
+ continue;
+
+ topheight = P_GetFFloorTopZAt (rover, x, y);
+ bottomheight = P_GetFFloorBottomZAt(rover, x, y);
+
+ if (rover->flags & FF_QUICKSAND)
+ {
+ if (thingtop > bottomheight && topheight > z)
+ {
+ if (ceilingz > z)
+ ceilingz = z;
+ }
+ continue;
+ }
+
+ delta1 = z - (bottomheight + ((topheight - bottomheight)/2));
+ delta2 = thingtop - (bottomheight + ((topheight - bottomheight)/2));
+ if (bottomheight < ceilingz && abs(delta1) > abs(delta2))
+ ceilingz = bottomheight;
+ }
+ }
+
+ return ceilingz;
+}
diff --git a/src/p_mobj.c b/src/p_mobj.c
index badf1937272758573edd22989213ffbb54e305be..49db6daee9916632abb3a9fedb3c18a6f6871e82 100644
--- a/src/p_mobj.c
+++ b/src/p_mobj.c
@@ -36,11 +36,7 @@
#include "m_cond.h"
static CV_PossibleValue_t CV_BobSpeed[] = {{0, "MIN"}, {4*FRACUNIT, "MAX"}, {0, NULL}};
-consvar_t cv_movebob = {"movebob", "1.0", CV_FLOAT|CV_SAVE, CV_BobSpeed, NULL, 0, NULL, NULL, 0, 0, NULL};
-
-#ifdef WALLSPLATS
-consvar_t cv_splats = {"splats", "On", CV_SAVE, CV_OnOff, NULL, 0, NULL, NULL, 0, 0, NULL};
-#endif
+consvar_t cv_movebob = CVAR_INIT ("movebob", "1.0", CV_FLOAT|CV_SAVE, CV_BobSpeed, NULL);
actioncache_t actioncachehead;
@@ -1961,29 +1957,6 @@ void P_XYMovement(mobj_t *mo)
return;
}
- // draw damage on wall
- //SPLAT TEST ----------------------------------------------------------
-#ifdef WALLSPLATS
- if (blockingline && mo->type != MT_REDRING && mo->type != MT_FIREBALL
- && !(mo->flags2 & (MF2_AUTOMATIC|MF2_RAILRING|MF2_BOUNCERING|MF2_EXPLOSION|MF2_SCATTER)))
- // set by last P_TryMove() that failed
- {
- divline_t divl;
- divline_t misl;
- fixed_t frac;
-
- P_MakeDivline(blockingline, &divl);
- misl.x = mo->x;
- misl.y = mo->y;
- misl.dx = mo->momx;
- misl.dy = mo->momy;
- frac = P_InterceptVector(&divl, &misl);
- R_AddWallSplat(blockingline, P_PointOnLineSide(mo->x,mo->y,blockingline),
- "A_DMG3", mo->z, frac, SPLATDRAWMODE_SHADE);
- }
-#endif
- // --------------------------------------------------------- SPLAT TEST
-
P_ExplodeMissile(mo);
return;
}
@@ -3215,13 +3188,16 @@ boolean P_SceneryZMovement(mobj_t *mo)
//
boolean P_CanRunOnWater(player_t *player, ffloor_t *rover)
{
- fixed_t topheight = P_GetFFloorTopZAt(rover, player->mo->x, player->mo->y);
+ boolean flip = player->mo->eflags & MFE_VERTICALFLIP;
+ fixed_t surfaceheight = flip ? P_GetFFloorBottomZAt(rover, player->mo->x, player->mo->y) : P_GetFFloorTopZAt(rover, player->mo->x, player->mo->y);
+ fixed_t playerbottom = flip ? (player->mo->z + player->mo->height) : player->mo->z;
+ boolean doifit = flip ? (surfaceheight - player->mo->floorz >= player->mo->height) : (player->mo->ceilingz - surfaceheight >= player->mo->height);
if (!player->powers[pw_carry] && !player->homing
- && ((player->powers[pw_super] || player->charflags & SF_RUNONWATER || player->dashmode >= DASHMODE_THRESHOLD) && player->mo->ceilingz-topheight >= player->mo->height)
+ && ((player->powers[pw_super] || player->charflags & SF_RUNONWATER || player->dashmode >= DASHMODE_THRESHOLD) && doifit)
&& (rover->flags & FF_SWIMMABLE) && !(player->pflags & PF_SPINNING) && player->speed > FixedMul(player->runspeed, player->mo->scale)
&& !(player->pflags & PF_SLIDING)
- && abs(player->mo->z - topheight) < FixedMul(30*FRACUNIT, player->mo->scale))
+ && abs(playerbottom - surfaceheight) < FixedMul(30*FRACUNIT, player->mo->scale))
return true;
return false;
@@ -3393,7 +3369,7 @@ void P_MobjCheckWater(mobj_t *mobj)
}
// skipping stone!
- if (p && (p->charability2 == CA2_SPINDASH) && p->speed/2 > abs(mobj->momz)
+ if (p && p->speed/2 > abs(mobj->momz)
&& ((p->pflags & (PF_SPINNING|PF_JUMPED)) == PF_SPINNING)
&& ((!(mobj->eflags & MFE_VERTICALFLIP) && thingtop - mobj->momz > mobj->watertop)
|| ((mobj->eflags & MFE_VERTICALFLIP) && mobj->z - mobj->momz < mobj->waterbottom)))
@@ -3536,16 +3512,19 @@ static boolean P_CameraCheckHeat(camera_t *thiscam)
{
sector_t *sector;
fixed_t halfheight = thiscam->z + (thiscam->height >> 1);
+ size_t i;
// see if we are in water
sector = thiscam->subsector->sector;
- if (P_FindSpecialLineFromTag(13, sector->tag, -1) != -1)
- return true;
+ for (i = 0; i < sector->tags.count; i++)
+ if (Tag_FindLineSpecial(13, sector->tags.tags[i]) != -1)
+ return true;
if (sector->ffloors)
{
ffloor_t *rover;
+ size_t j;
for (rover = sector->ffloors; rover; rover = rover->next)
{
@@ -3557,7 +3536,8 @@ static boolean P_CameraCheckHeat(camera_t *thiscam)
if (halfheight <= P_GetFFloorBottomZAt(rover, thiscam->x, thiscam->y))
continue;
- if (P_FindSpecialLineFromTag(13, rover->master->frontsector->tag, -1) != -1)
+ for (j = 0; j < rover->master->frontsector->tags.count; j++)
+ if (Tag_FindLineSpecial(13, rover->master->frontsector->tags.tags[j]) != -1)
return true;
}
}
@@ -4626,16 +4606,18 @@ static boolean P_Boss4MoveCage(mobj_t *mobj, fixed_t delta)
const UINT16 tag = 65534 + (mobj->spawnpoint ? mobj->spawnpoint->extrainfo*LE_PARAMWIDTH : 0);
INT32 snum;
sector_t *sector;
- for (snum = sectors[tag%numsectors].firsttag; snum != -1; snum = sector->nexttag)
+ boolean gotcage = false;
+ TAG_ITER_DECLARECOUNTER(0);
+
+ TAG_ITER_SECTORS(0, tag, snum)
{
sector = §ors[snum];
- if (sector->tag != tag)
- continue;
sector->floorheight += delta;
sector->ceilingheight += delta;
P_CheckSector(sector, true);
+ gotcage = true;
}
- return sectors[tag%numsectors].firsttag != -1;
+ return gotcage;
}
// Move Boss4's arms to angle
@@ -4707,26 +4689,16 @@ static void P_Boss4PinchSpikeballs(mobj_t *mobj, angle_t angle, fixed_t dz)
static void P_Boss4DestroyCage(mobj_t *mobj)
{
const UINT16 tag = 65534 + (mobj->spawnpoint ? mobj->spawnpoint->extrainfo*LE_PARAMWIDTH : 0);
- INT32 snum, next;
+ INT32 snum;
size_t a;
sector_t *sector, *rsec;
ffloor_t *rover;
+ TAG_ITER_DECLARECOUNTER(0);
- // This will be the final iteration of sector tag.
- // We'll destroy the tag list as we go.
- next = sectors[tag%numsectors].firsttag;
- sectors[tag%numsectors].firsttag = -1;
-
- for (snum = next; snum != -1; snum = next)
+ TAG_ITER_SECTORS(0, tag, snum)
{
sector = §ors[snum];
- next = sector->nexttag;
- sector->nexttag = -1;
- if (sector->tag != tag)
- continue;
- sector->tag = 0;
-
// Destroy the FOFs.
for (a = 0; a < sector->numattached; a++)
{
@@ -5685,14 +5657,10 @@ static void P_Boss9Thinker(mobj_t *mobj)
if (P_RandomRange(1,(dist>>FRACBITS)/16) == 1)
break;
}
- if (spawner)
+ if (spawner && dist)
{
mobj_t *missile = P_SpawnMissile(spawner, mobj, MT_MSGATHER);
-
- if (dist == 0)
- missile->fuse = 0;
- else
- missile->fuse = (dist/P_AproxDistance(missile->momx, missile->momy));
+ missile->fuse = (dist/P_AproxDistance(missile->momx, missile->momy));
if (missile->fuse > mobj->fuse)
P_RemoveMobj(missile);
@@ -7968,7 +7936,7 @@ static boolean P_MobjPushableThink(mobj_t *mobj)
P_PushableThinker(mobj);
// Extinguish fire objects in water. (Yes, it's extraordinarily rare to have a pushable flame object, but Brak uses such a case.)
- if (mobj->flags & MF_FIRE && mobj->type != MT_PUMA && mobj->type != MT_FIREBALL
+ if ((mobj->flags & MF_FIRE) && !(mobj->eflags & MFE_TOUCHLAVA)
&& (mobj->eflags & (MFE_UNDERWATER | MFE_TOUCHWATER)))
{
P_KillMobj(mobj, NULL, NULL, 0);
@@ -9614,12 +9582,6 @@ static boolean P_MobjRegularThink(mobj_t *mobj)
mobj->fuse = 1; // Return to base.
break;
}
- case MT_CANNONBALL:
-#ifdef FLOORSPLATS
- R_AddFloorSplat(mobj->tracer->subsector, mobj->tracer, "TARGET", mobj->tracer->x,
- mobj->tracer->y, mobj->tracer->floorz, SPLATDRAWMODE_SHADE);
-#endif
- break;
case MT_SPINDUST: // Spindash dust
mobj->momx = FixedMul(mobj->momx, (3*FRACUNIT)/4); // originally 50000
mobj->momy = FixedMul(mobj->momy, (3*FRACUNIT)/4); // same
@@ -9688,6 +9650,12 @@ static boolean P_MobjRegularThink(mobj_t *mobj)
break;
}
case MT_SALOONDOOR:
+ if (!mobj->tracer) // Door center is gone or not spawned?
+ {
+ P_RemoveMobj(mobj); // Die
+ return false;
+ }
+
P_SaloonDoorThink(mobj);
break;
case MT_MINECARTSPAWNER:
@@ -9742,7 +9710,7 @@ static boolean P_MobjRegularThink(mobj_t *mobj)
P_MobjCheckWater(mobj);
// Extinguish fire objects in water
- if (mobj->flags & MF_FIRE && mobj->type != MT_PUMA && mobj->type != MT_FIREBALL
+ if ((mobj->flags & MF_FIRE) && !(mobj->eflags & MFE_TOUCHLAVA)
&& (mobj->eflags & (MFE_UNDERWATER|MFE_TOUCHWATER)))
{
P_KillMobj(mobj, NULL, NULL, 0);
@@ -9872,7 +9840,7 @@ static void P_FlagFuseThink(mobj_t *mobj)
if (mobj->type == MT_REDFLAG)
{
if (!(mobj->flags2 & MF2_JUSTATTACKED))
- CONS_Printf(M_GetText("The %c%s%c has returned to base.\n"), 0x85, M_GetText("Red flag"), 0x80);
+ CONS_Printf(M_GetText("The \205Red flag\200 has returned to base.\n"));
// Assumedly in splitscreen players will be on opposing teams
if (players[consoleplayer].ctfteam == 1 || splitscreen)
@@ -9885,7 +9853,7 @@ static void P_FlagFuseThink(mobj_t *mobj)
else // MT_BLUEFLAG
{
if (!(mobj->flags2 & MF2_JUSTATTACKED))
- CONS_Printf(M_GetText("The %c%s%c has returned to base.\n"), 0x84, M_GetText("Blue flag"), 0x80);
+ CONS_Printf(M_GetText("The \204Blue flag\200 has returned to base.\n"));
// Assumedly in splitscreen players will be on opposing teams
if (players[consoleplayer].ctfteam == 2 || splitscreen)
@@ -10046,11 +10014,12 @@ void P_MobjThinker(mobj_t *mobj)
// Sector special (2,8) allows ANY mobj to trigger a linedef exec
if (mobj->subsector && GETSECSPECIAL(mobj->subsector->sector->special, 2) == 8)
{
- sector_t *sec2;
-
- sec2 = P_ThingOnSpecial3DFloor(mobj);
+ sector_t *sec2 = P_ThingOnSpecial3DFloor(mobj);
if (sec2 && GETSECSPECIAL(sec2->special, 2) == 1)
- P_LinedefExecute(sec2->tag, mobj, sec2);
+ {
+ mtag_t tag = Tag_FGet(&sec2->tags);
+ P_LinedefExecute(tag, mobj, sec2);
+ }
}
if (mobj->scale != mobj->destscale)
@@ -10274,14 +10243,19 @@ void P_PushableThinker(mobj_t *mobj)
sec = mobj->subsector->sector;
if (GETSECSPECIAL(sec->special, 2) == 1 && mobj->z == sec->floorheight)
- P_LinedefExecute(sec->tag, mobj, sec);
-// else if (GETSECSPECIAL(sec->special, 2) == 8)
{
- sector_t *sec2;
+ mtag_t tag = Tag_FGet(&sec->tags);
+ P_LinedefExecute(tag, mobj, sec);
+ }
- sec2 = P_ThingOnSpecial3DFloor(mobj);
+// else if (GETSECSPECIAL(sec->special, 2) == 8)
+ {
+ sector_t *sec2 = P_ThingOnSpecial3DFloor(mobj);
if (sec2 && GETSECSPECIAL(sec2->special, 2) == 1)
- P_LinedefExecute(sec2->tag, mobj, sec2);
+ {
+ mtag_t tag = Tag_FGet(&sec2->tags);
+ P_LinedefExecute(tag, mobj, sec2);
+ }
}
// it has to be pushable RIGHT NOW for this part to happen
@@ -10502,13 +10476,16 @@ mobj_t *P_SpawnMobj(fixed_t x, fixed_t y, fixed_t z, mobjtype_t type)
if ((maptol & TOL_ERZ3) && !(mobj->type == MT_BLACKEGGMAN))
mobj->destscale = FRACUNIT/2;
+ // Sprite rendering
+ mobj->blendmode = AST_TRANSLUCENT;
+ mobj->spritexscale = mobj->spriteyscale = mobj->scale;
+ mobj->spritexoffset = mobj->spriteyoffset = 0;
+ mobj->floorspriteslope = NULL;
+
// set subsector and/or block links
P_SetThingPosition(mobj);
I_Assert(mobj->subsector != NULL);
- // Make sure scale matches destscale immediately when spawned
- P_SetScale(mobj, mobj->destscale);
-
mobj->floorz = P_GetSectorFloorZAt (mobj->subsector->sector, x, y);
mobj->ceilingz = P_GetSectorCeilingZAt(mobj->subsector->sector, x, y);
@@ -10902,6 +10879,22 @@ static inline precipmobj_t *P_SpawnSnowMobj(fixed_t x, fixed_t y, fixed_t z, mob
return mo;
}
+void *P_CreateFloorSpriteSlope(mobj_t *mobj)
+{
+ if (mobj->floorspriteslope)
+ Z_Free(mobj->floorspriteslope);
+ mobj->floorspriteslope = Z_Calloc(sizeof(pslope_t), PU_LEVEL, NULL);
+ mobj->floorspriteslope->normal.z = FRACUNIT;
+ return (void *)mobj->floorspriteslope;
+}
+
+void P_RemoveFloorSpriteSlope(mobj_t *mobj)
+{
+ if (mobj->floorspriteslope)
+ Z_Free(mobj->floorspriteslope);
+ mobj->floorspriteslope = NULL;
+}
+
//
// P_RemoveMobj
//
@@ -10958,11 +10951,14 @@ void P_RemoveMobj(mobj_t *mobj)
P_DelSeclist(sector_list);
sector_list = NULL;
}
+
mobj->flags |= MF_NOSECTOR|MF_NOBLOCKMAP;
mobj->subsector = NULL;
mobj->state = NULL;
mobj->player = NULL;
+ P_RemoveFloorSpriteSlope(mobj);
+
// stop any playing sound
S_StopSound(mobj);
@@ -11047,10 +11043,10 @@ void P_RemoveSavegameMobj(mobj_t *mobj)
}
static CV_PossibleValue_t respawnitemtime_cons_t[] = {{1, "MIN"}, {300, "MAX"}, {0, NULL}};
-consvar_t cv_itemrespawntime = {"respawnitemtime", "30", CV_NETVAR|CV_CHEAT, respawnitemtime_cons_t, NULL, 0, NULL, NULL, 0, 0, NULL};
-consvar_t cv_itemrespawn = {"respawnitem", "On", CV_NETVAR, CV_OnOff, NULL, 0, NULL, NULL, 0, 0, NULL};
+consvar_t cv_itemrespawntime = CVAR_INIT ("respawnitemtime", "30", CV_SAVE|CV_NETVAR|CV_CHEAT, respawnitemtime_cons_t, NULL);
+consvar_t cv_itemrespawn = CVAR_INIT ("respawnitem", "On", CV_SAVE|CV_NETVAR, CV_OnOff, NULL);
static CV_PossibleValue_t flagtime_cons_t[] = {{0, "MIN"}, {300, "MAX"}, {0, NULL}};
-consvar_t cv_flagtime = {"flagtime", "30", CV_NETVAR|CV_CHEAT, flagtime_cons_t, NULL, 0, NULL, NULL, 0, 0, NULL};
+consvar_t cv_flagtime = CVAR_INIT ("flagtime", "30", CV_SAVE|CV_NETVAR|CV_CHEAT, flagtime_cons_t, NULL);
void P_SpawnPrecipitation(void)
{
@@ -11403,6 +11399,10 @@ void P_SpawnPlayer(INT32 playernum)
p->jumpfactor = skins[p->skin].jumpfactor;
}
+ // Clear lastlinehit and lastsidehit
+ p->lastsidehit = -1;
+ p->lastlinehit = -1;
+
//awayview stuff
p->awayviewmobj = NULL;
p->awayviewtics = 0;
@@ -11798,7 +11798,7 @@ static boolean P_AllowMobjSpawn(mapthing_t* mthing, mobjtype_t i)
if (!(G_CoopGametype() || (mthing->options & MTF_EXTRA)))
return false; // she doesn't hang out here
- if (!mariomode && !(netgame || multiplayer) && players[consoleplayer].skin == 3)
+ if (!(netgame || multiplayer) && players[consoleplayer].skin == 3)
return false; // no doubles
break;
@@ -11956,9 +11956,6 @@ static mobjtype_t P_GetMobjtypeSubstitute(mapthing_t *mthing, mobjtype_t i)
return MT_SCORE1K_BOX; // 1,000
}
- if (mariomode && i == MT_ROSY)
- return MT_TOAD; // don't remove on penalty of death
-
return i;
}
@@ -12033,8 +12030,7 @@ static boolean P_SetupMace(mapthing_t *mthing, mobj_t *mobj, boolean *doangle)
const size_t mthingi = (size_t)(mthing - mapthings);
// Find the corresponding linedef special, using angle as tag
- // P_FindSpecialLineFromTag works here now =D
- line = P_FindSpecialLineFromTag(9, mthing->angle, -1);
+ line = Tag_FindLineSpecial(9, mthing->angle);
if (line == -1)
{
@@ -12344,7 +12340,7 @@ static boolean P_SetupParticleGen(mapthing_t *mthing, mobj_t *mobj)
const size_t mthingi = (size_t)(mthing - mapthings);
// Find the corresponding linedef special, using angle as tag
- line = P_FindSpecialLineFromTag(15, mthing->angle, -1);
+ line = Tag_FindLineSpecial(15, mthing->angle);
if (line == -1)
{
@@ -12583,17 +12579,20 @@ static boolean P_SetupSpawnedMapThing(mapthing_t *mthing, mobj_t *mobj, boolean
break;
}
case MT_SKYBOX:
- if (mthing->tag < 0 || mthing->tag > 15)
+ {
+ mtag_t tag = Tag_FGet(&mthing->tags);
+ if (tag < 0 || tag > 15)
{
- CONS_Debug(DBG_GAMELOGIC, "P_SetupSpawnedMapThing: Skybox ID %d of mapthing %s is not between 0 and 15!\n", mthing->tag, sizeu1((size_t)(mthing - mapthings)));
+ CONS_Debug(DBG_GAMELOGIC, "P_SetupSpawnedMapThing: Skybox ID %d of mapthing %s is not between 0 and 15!\n", tag, sizeu1((size_t)(mthing - mapthings)));
break;
}
if (mthing->options & MTF_OBJECTSPECIAL)
- skyboxcenterpnts[mthing->tag] = mobj;
+ skyboxcenterpnts[tag] = mobj;
else
- skyboxviewpnts[mthing->tag] = mobj;
+ skyboxviewpnts[tag] = mobj;
break;
+ }
case MT_EGGSTATUE:
if (mthing->options & MTF_EXTRA)
{
@@ -13080,8 +13079,8 @@ static mobj_t *P_SpawnMobjFromMapThing(mapthing_t *mthing, fixed_t x, fixed_t y,
mobj = P_SpawnMobj(x, y, z, i);
mobj->spawnpoint = mthing;
- P_SetScale(mobj, mthing->scale);
- mobj->destscale = mthing->scale;
+ P_SetScale(mobj, FixedMul(mobj->scale, mthing->scale));
+ mobj->destscale = FixedMul(mobj->destscale, mthing->scale);
if (!P_SetupSpawnedMapThing(mthing, mobj, &doangle))
return mobj;
diff --git a/src/p_mobj.h b/src/p_mobj.h
index 27a6ef4f05d3a2f8a5a9cf57b8fe495fe4325ff0..5bb7c908e85463020507f1e02dbb7059d904ddf6 100644
--- a/src/p_mobj.h
+++ b/src/p_mobj.h
@@ -194,6 +194,7 @@ typedef enum
MF2_AMBUSH = 1<<27, // Alternate behaviour typically set by MTF_AMBUSH
MF2_LINKDRAW = 1<<28, // Draw vissprite of mobj immediately before/after tracer's vissprite (dependent on dispoffset and position)
MF2_SHIELD = 1<<29, // Thinker calls P_AddShield/P_ShieldLook (must be partnered with MF_SCENERY to use)
+ MF2_SPLAT = 1<<30, // Renders as a splat
// free: to and including 1<<31
} mobjflag2_t;
@@ -264,6 +265,7 @@ typedef enum {
// Ran the thinker this tic.
PCF_THUNK = 32,
} precipflag_t;
+
// Map Object definition.
typedef struct mobj_s
{
@@ -285,6 +287,12 @@ typedef struct mobj_s
UINT8 sprite2; // player sprites
UINT16 anim_duration; // for FF_ANIMATE states
+ UINT32 renderflags; // render flags
+ INT32 blendmode; // blend mode
+ fixed_t spritexscale, spriteyscale;
+ fixed_t spritexoffset, spriteyoffset;
+ struct pslope_s *floorspriteslope; // The slope that the floorsprite is rotated by
+
struct msecnode_s *touching_sectorlist; // a linked list of sectors where this object appears
struct subsector_s *subsector; // Subsector the mobj resides in.
@@ -399,13 +407,19 @@ typedef struct precipmobj_s
struct precipmobj_s **sprev; // killough 8/11/98: change to ptr-to-ptr
// More drawing info: to determine current sprite.
- angle_t angle, pitch, roll; // orientation
+ angle_t angle, pitch, roll; // orientation
angle_t rollangle;
spritenum_t sprite; // used to find patch_t and flip value
UINT32 frame; // frame number, plus bits see p_pspr.h
UINT8 sprite2; // player sprites
UINT16 anim_duration; // for FF_ANIMATE states
+ UINT32 renderflags; // render flags
+ INT32 blendmode; // blend mode
+ fixed_t spritexscale, spriteyscale;
+ fixed_t spritexoffset, spriteyoffset;
+ struct pslope_s *floorspriteslope; // The slope that the floorsprite is rotated by
+
struct mprecipsecnode_s *touching_sectorlist; // a linked list of sectors where this object appears
struct subsector_s *subsector; // Subsector the mobj resides in.
@@ -462,6 +476,8 @@ void P_SpawnItemPattern(mapthing_t *mthing, boolean bonustime);
void P_SpawnHoopOfSomething(fixed_t x, fixed_t y, fixed_t z, fixed_t radius, INT32 number, mobjtype_t type, angle_t rotangle);
void P_SpawnPrecipitation(void);
void P_SpawnParaloop(fixed_t x, fixed_t y, fixed_t z, fixed_t radius, INT32 number, mobjtype_t type, statenum_t nstate, angle_t rotangle, boolean spawncenter);
+void *P_CreateFloorSpriteSlope(mobj_t *mobj);
+void P_RemoveFloorSpriteSlope(mobj_t *mobj);
boolean P_BossTargetPlayer(mobj_t *actor, boolean closest);
boolean P_SupermanLook4Players(mobj_t *actor);
void P_DestroyRobots(void);
diff --git a/src/p_polyobj.c b/src/p_polyobj.c
index b0a794ddf1601d0a6818907081f6395e486c7e0d..874edbd50cfb60d6ff0308748dd149c96f8480c3 100644
--- a/src/p_polyobj.c
+++ b/src/p_polyobj.c
@@ -556,10 +556,11 @@ static void Polyobj_moveToSpawnSpot(mapthing_t *anchor)
polyobj_t *po;
vertex_t dist, sspot;
size_t i;
+ mtag_t tag = Tag_FGet(&anchor->tags);
- if (!(po = Polyobj_GetForNum(anchor->tag)))
+ if (!(po = Polyobj_GetForNum(tag)))
{
- CONS_Debug(DBG_POLYOBJ, "Bad polyobject %d for anchor point\n", anchor->tag);
+ CONS_Debug(DBG_POLYOBJ, "Bad polyobject %d for anchor point\n", tag);
return;
}
@@ -976,7 +977,7 @@ static INT32 Polyobj_clipThings(polyobj_t *po, line_t *line)
// Moves a polyobject on the x-y plane.
-static boolean Polyobj_moveXY(polyobj_t *po, fixed_t x, fixed_t y, boolean checkmobjs)
+boolean Polyobj_moveXY(polyobj_t *po, fixed_t x, fixed_t y, boolean checkmobjs)
{
size_t i;
vertex_t vec;
@@ -1162,7 +1163,7 @@ static void Polyobj_rotateThings(polyobj_t *po, vector2_t origin, angle_t delta,
}
// Rotates a polyobject around its start point.
-static boolean Polyobj_rotate(polyobj_t *po, angle_t delta, UINT8 turnthings, boolean checkmobjs)
+boolean Polyobj_rotate(polyobj_t *po, angle_t delta, UINT8 turnthings, boolean checkmobjs)
{
size_t i;
angle_t angle;
@@ -1342,7 +1343,7 @@ void Polyobj_InitLevel(void)
{
qitem = (mobjqitem_t *)M_QueueIterator(&spawnqueue);
- Polyobj_spawnPolyObj(i, qitem->mo, qitem->mo->spawnpoint->tag);
+ Polyobj_spawnPolyObj(i, qitem->mo, Tag_FGet(&qitem->mo->spawnpoint->tags));
}
// move polyobjects to spawn points
@@ -2444,10 +2445,11 @@ boolean EV_DoPolyObjFlag(polyflagdata_t *pfdata)
polymove_t *th;
size_t i;
INT32 start;
+ mtag_t tag = pfdata->polyObjNum;
- if (!(po = Polyobj_GetForNum(pfdata->polyObjNum)))
+ if (!(po = Polyobj_GetForNum(tag)))
{
- CONS_Debug(DBG_POLYOBJ, "EV_DoPolyFlag: bad polyobj %d\n", pfdata->polyObjNum);
+ CONS_Debug(DBG_POLYOBJ, "EV_DoPolyFlag: bad polyobj %d\n", tag);
return false;
}
@@ -2470,7 +2472,7 @@ boolean EV_DoPolyObjFlag(polyflagdata_t *pfdata)
po->thinker = &th->thinker;
// set fields
- th->polyObjNum = pfdata->polyObjNum;
+ th->polyObjNum = tag;
th->distance = 0;
th->speed = pfdata->speed;
th->angle = pfdata->angle;
diff --git a/src/p_polyobj.h b/src/p_polyobj.h
index f24caca4e7263102e4b2de2b9d4311435858dc28..8c29469653aa6207731fe7dcccbebba313d345b7 100644
--- a/src/p_polyobj.h
+++ b/src/p_polyobj.h
@@ -336,6 +336,8 @@ typedef struct polyfadedata_s
// Functions
//
+boolean Polyobj_moveXY(polyobj_t *po, fixed_t x, fixed_t y, boolean checkmobjs);
+boolean Polyobj_rotate(polyobj_t *po, angle_t delta, UINT8 turnthings, boolean checkmobjs);
polyobj_t *Polyobj_GetForNum(INT32 id);
void Polyobj_InitLevel(void);
void Polyobj_MoveOnLoad(polyobj_t *po, angle_t angle, fixed_t x, fixed_t y);
diff --git a/src/p_saveg.c b/src/p_saveg.c
index 4f6f31803998d8cf8c19472a21d4090d779b2119..03229e740bc0b5cddc3940ee8df0b96d1843347d 100644
--- a/src/p_saveg.c
+++ b/src/p_saveg.c
@@ -98,13 +98,16 @@ static void P_NetArchivePlayers(void)
for (i = 0; i < MAXPLAYERS; i++)
{
+ WRITESINT8(save_p, (SINT8)adminplayers[i]);
+
if (!playeringame[i])
continue;
flags = 0;
- // no longer send ticcmds, player name, skin, or color
+ // no longer send ticcmds
+ WRITESTRINGN(save_p, player_names[i], MAXPLAYERNAME);
WRITEINT16(save_p, players[i].angleturn);
WRITEINT16(save_p, players[i].oldrelangleturn);
WRITEANGLE(save_p, players[i].aiming);
@@ -134,6 +137,9 @@ static void P_NetArchivePlayers(void)
WRITEUINT16(save_p, players[i].flashpal);
WRITEUINT16(save_p, players[i].flashcount);
+ WRITEUINT8(save_p, players[i].skincolor);
+ WRITEINT32(save_p, players[i].skin);
+ WRITEUINT32(save_p, players[i].availabilities);
WRITEUINT32(save_p, players[i].score);
WRITEFIXED(save_p, players[i].dashspeed);
WRITESINT8(save_p, players[i].lives);
@@ -305,6 +311,8 @@ static void P_NetUnArchivePlayers(void)
for (i = 0; i < MAXPLAYERS; i++)
{
+ adminplayers[i] = (INT32)READSINT8(save_p);
+
// Do NOT memset player struct to 0
// other areas may initialize data elsewhere
//memset(&players[i], 0, sizeof (player_t));
@@ -312,9 +320,8 @@ static void P_NetUnArchivePlayers(void)
continue;
// NOTE: sending tics should (hopefully) no longer be necessary
- // sending player names, skin and color should not be necessary at all!
- // (that data is handled in the server config now)
+ READSTRINGN(save_p, player_names[i], MAXPLAYERNAME);
players[i].angleturn = READINT16(save_p);
players[i].oldrelangleturn = READINT16(save_p);
players[i].aiming = READANGLE(save_p);
@@ -344,6 +351,9 @@ static void P_NetUnArchivePlayers(void)
players[i].flashpal = READUINT16(save_p);
players[i].flashcount = READUINT16(save_p);
+ players[i].skincolor = READUINT8(save_p);
+ players[i].skin = READINT32(save_p);
+ players[i].availabilities = READUINT32(save_p);
players[i].score = READUINT32(save_p);
players[i].dashspeed = READFIXED(save_p); // dashing speed
players[i].lives = READSINT8(save_p);
@@ -913,7 +923,7 @@ static void UnArchiveFFloors(const sector_t *ss)
static void ArchiveSectors(void)
{
- size_t i;
+ size_t i, j;
const sector_t *ss = sectors;
const sector_t *spawnss = spawnsectors;
UINT8 diff, diff2, diff3;
@@ -951,10 +961,8 @@ static void ArchiveSectors(void)
if (ss->ceilingpic_angle != spawnss->ceilingpic_angle)
diff2 |= SD_CEILANG;
- if (ss->tag != spawnss->tag)
+ if (!Tag_Compare(&ss->tags, &spawnss->tags))
diff2 |= SD_TAG;
- if (ss->nexttag != spawnss->nexttag || ss->firsttag != spawnss->firsttag)
- diff3 |= SD_TAGLIST;
if (ss->extra_colormap != spawnss->extra_colormap)
diff3 |= SD_COLORMAP;
@@ -1002,12 +1010,11 @@ static void ArchiveSectors(void)
WRITEANGLE(save_p, ss->floorpic_angle);
if (diff2 & SD_CEILANG)
WRITEANGLE(save_p, ss->ceilingpic_angle);
- if (diff2 & SD_TAG) // save only the tag
- WRITEINT16(save_p, ss->tag);
- if (diff3 & SD_TAGLIST) // save both firsttag and nexttag
- { // either of these could be changed even if tag isn't
- WRITEINT32(save_p, ss->firsttag);
- WRITEINT32(save_p, ss->nexttag);
+ if (diff2 & SD_TAG)
+ {
+ WRITEUINT32(save_p, ss->tags.count);
+ for (j = 0; j < ss->tags.count; j++)
+ WRITEINT16(save_p, ss->tags.tags[j]);
}
if (diff3 & SD_COLORMAP)
@@ -1025,7 +1032,7 @@ static void ArchiveSectors(void)
static void UnArchiveSectors(void)
{
- UINT16 i;
+ UINT16 i, j;
UINT8 diff, diff2, diff3;
for (;;)
{
@@ -1079,13 +1086,29 @@ static void UnArchiveSectors(void)
if (diff2 & SD_CEILANG)
sectors[i].ceilingpic_angle = READANGLE(save_p);
if (diff2 & SD_TAG)
- sectors[i].tag = READINT16(save_p); // DON'T use P_ChangeSectorTag
- if (diff3 & SD_TAGLIST)
{
- sectors[i].firsttag = READINT32(save_p);
- sectors[i].nexttag = READINT32(save_p);
+ size_t ncount = READUINT32(save_p);
+
+ // Remove entries from global lists.
+ for (j = 0; j < sectors[i].tags.count; j++)
+ Taggroup_Remove(tags_sectors, sectors[i].tags.tags[j], i);
+
+ // Reallocate if size differs.
+ if (ncount != sectors[i].tags.count)
+ {
+ sectors[i].tags.count = ncount;
+ sectors[i].tags.tags = Z_Realloc(sectors[i].tags.tags, ncount*sizeof(mtag_t), PU_LEVEL, NULL);
+ }
+
+ for (j = 0; j < ncount; j++)
+ sectors[i].tags.tags[j] = READINT16(save_p);
+
+ // Add new entries.
+ for (j = 0; j < sectors[i].tags.count; j++)
+ Taggroup_Remove(tags_sectors, sectors[i].tags.tags[j], i);
}
+
if (diff3 & SD_COLORMAP)
sectors[i].extra_colormap = GetNetColormapFromList(READUINT32(save_p));
if (diff3 & SD_CRUMBLESTATE)
@@ -1394,6 +1417,13 @@ typedef enum
MD2_MIRRORED = 1<<13,
MD2_ROLLANGLE = 1<<14,
MD2_SHADOWSCALE = 1<<15,
+ MD2_RENDERFLAGS = 1<<16,
+ MD2_BLENDMODE = 1<<17,
+ MD2_SPRITEXSCALE = 1<<18,
+ MD2_SPRITEYSCALE = 1<<19,
+ MD2_SPRITEXOFFSET = 1<<20,
+ MD2_SPRITEYOFFSET = 1<<21,
+ MD2_FLOORSPRITESLOPE = 1<<22,
} mobj_diff2_t;
typedef enum
@@ -1476,7 +1506,7 @@ static void SaveMobjThinker(const thinker_t *th, const UINT8 type)
{
const mobj_t *mobj = (const mobj_t *)th;
UINT32 diff;
- UINT16 diff2;
+ UINT32 diff2;
// Ignore stationary hoops - these will be respawned from mapthings.
if (mobj->type == MT_HOOP)
@@ -1606,6 +1636,29 @@ static void SaveMobjThinker(const thinker_t *th, const UINT8 type)
diff2 |= MD2_ROLLANGLE;
if (mobj->shadowscale)
diff2 |= MD2_SHADOWSCALE;
+ if (mobj->renderflags)
+ diff2 |= MD2_RENDERFLAGS;
+ if (mobj->blendmode != AST_TRANSLUCENT)
+ diff2 |= MD2_BLENDMODE;
+ if (mobj->spritexscale != FRACUNIT)
+ diff2 |= MD2_SPRITEXSCALE;
+ if (mobj->spriteyscale != FRACUNIT)
+ diff2 |= MD2_SPRITEYSCALE;
+ if (mobj->spritexoffset)
+ diff2 |= MD2_SPRITEXOFFSET;
+ if (mobj->spriteyoffset)
+ diff2 |= MD2_SPRITEYOFFSET;
+ if (mobj->floorspriteslope)
+ {
+ pslope_t *slope = mobj->floorspriteslope;
+ if (slope->zangle || slope->zdelta || slope->xydirection
+ || slope->o.x || slope->o.y || slope->o.z
+ || slope->d.x || slope->d.y
+ || slope->normal.x || slope->normal.y
+ || (slope->normal.z != FRACUNIT))
+ diff2 |= MD2_FLOORSPRITESLOPE;
+ }
+
if (diff2 != 0)
diff |= MD_MORE;
@@ -1616,7 +1669,7 @@ static void SaveMobjThinker(const thinker_t *th, const UINT8 type)
WRITEUINT8(save_p, type);
WRITEUINT32(save_p, diff);
if (diff & MD_MORE)
- WRITEUINT16(save_p, diff2);
+ WRITEUINT32(save_p, diff2);
// save pointer, at load time we will search this pointer to reinitilize pointers
WRITEUINT32(save_p, (size_t)mobj);
@@ -1748,6 +1801,37 @@ static void SaveMobjThinker(const thinker_t *th, const UINT8 type)
WRITEANGLE(save_p, mobj->rollangle);
if (diff2 & MD2_SHADOWSCALE)
WRITEFIXED(save_p, mobj->shadowscale);
+ if (diff2 & MD2_RENDERFLAGS)
+ WRITEUINT32(save_p, mobj->renderflags);
+ if (diff2 & MD2_BLENDMODE)
+ WRITEINT32(save_p, mobj->blendmode);
+ if (diff2 & MD2_SPRITEXSCALE)
+ WRITEFIXED(save_p, mobj->spritexscale);
+ if (diff2 & MD2_SPRITEYSCALE)
+ WRITEFIXED(save_p, mobj->spriteyscale);
+ if (diff2 & MD2_SPRITEXOFFSET)
+ WRITEFIXED(save_p, mobj->spritexoffset);
+ if (diff2 & MD2_SPRITEYOFFSET)
+ WRITEFIXED(save_p, mobj->spriteyoffset);
+ if (diff2 & MD2_FLOORSPRITESLOPE)
+ {
+ pslope_t *slope = mobj->floorspriteslope;
+
+ WRITEFIXED(save_p, slope->zdelta);
+ WRITEANGLE(save_p, slope->zangle);
+ WRITEANGLE(save_p, slope->xydirection);
+
+ WRITEFIXED(save_p, slope->o.x);
+ WRITEFIXED(save_p, slope->o.y);
+ WRITEFIXED(save_p, slope->o.z);
+
+ WRITEFIXED(save_p, slope->d.x);
+ WRITEFIXED(save_p, slope->d.y);
+
+ WRITEFIXED(save_p, slope->normal.x);
+ WRITEFIXED(save_p, slope->normal.y);
+ WRITEFIXED(save_p, slope->normal.z);
+ }
WRITEUINT32(save_p, mobj->mobjnum);
}
@@ -2533,14 +2617,14 @@ static thinker_t* LoadMobjThinker(actionf_p1 thinker)
thinker_t *next;
mobj_t *mobj;
UINT32 diff;
- UINT16 diff2;
+ UINT32 diff2;
INT32 i;
fixed_t z, floorz, ceilingz;
ffloor_t *floorrover = NULL, *ceilingrover = NULL;
diff = READUINT32(save_p);
if (diff & MD_MORE)
- diff2 = READUINT16(save_p);
+ diff2 = READUINT32(save_p);
else
diff2 = 0;
@@ -2757,6 +2841,43 @@ static thinker_t* LoadMobjThinker(actionf_p1 thinker)
mobj->rollangle = READANGLE(save_p);
if (diff2 & MD2_SHADOWSCALE)
mobj->shadowscale = READFIXED(save_p);
+ if (diff2 & MD2_RENDERFLAGS)
+ mobj->renderflags = READUINT32(save_p);
+ if (diff2 & MD2_BLENDMODE)
+ mobj->blendmode = READINT32(save_p);
+ else
+ mobj->blendmode = AST_TRANSLUCENT;
+ if (diff2 & MD2_SPRITEXSCALE)
+ mobj->spritexscale = READFIXED(save_p);
+ else
+ mobj->spritexscale = FRACUNIT;
+ if (diff2 & MD2_SPRITEYSCALE)
+ mobj->spriteyscale = READFIXED(save_p);
+ else
+ mobj->spriteyscale = FRACUNIT;
+ if (diff2 & MD2_SPRITEXOFFSET)
+ mobj->spritexoffset = READFIXED(save_p);
+ if (diff2 & MD2_SPRITEYOFFSET)
+ mobj->spriteyoffset = READFIXED(save_p);
+ if (diff2 & MD2_FLOORSPRITESLOPE)
+ {
+ pslope_t *slope = (pslope_t *)P_CreateFloorSpriteSlope(mobj);
+
+ slope->zdelta = READFIXED(save_p);
+ slope->zangle = READANGLE(save_p);
+ slope->xydirection = READANGLE(save_p);
+
+ slope->o.x = READFIXED(save_p);
+ slope->o.y = READFIXED(save_p);
+ slope->o.z = READFIXED(save_p);
+
+ slope->d.x = READFIXED(save_p);
+ slope->d.y = READFIXED(save_p);
+
+ slope->normal.x = READFIXED(save_p);
+ slope->normal.y = READFIXED(save_p);
+ slope->normal.z = READFIXED(save_p);
+ }
if (diff & MD_REDFLAG)
{
@@ -3951,14 +4072,17 @@ static inline void P_UnArchiveSPGame(INT16 mapoverride)
playeringame[consoleplayer] = true;
}
-static void P_NetArchiveMisc(void)
+static void P_NetArchiveMisc(boolean resending)
{
INT32 i;
WRITEUINT32(save_p, ARCHIVEBLOCK_MISC);
+ if (resending)
+ WRITEUINT32(save_p, gametic);
WRITEINT16(save_p, gamemap);
WRITEINT16(save_p, gamestate);
+ WRITEINT16(save_p, gametype);
{
UINT32 pig = 0;
@@ -3990,6 +4114,12 @@ static void P_NetArchiveMisc(void)
WRITEINT32(save_p, sstimer);
WRITEUINT32(save_p, bluescore);
WRITEUINT32(save_p, redscore);
+
+ WRITEUINT16(save_p, skincolor_redteam);
+ WRITEUINT16(save_p, skincolor_blueteam);
+ WRITEUINT16(save_p, skincolor_redring);
+ WRITEUINT16(save_p, skincolor_bluering);
+
WRITEINT32(save_p, modulothing);
WRITEINT16(save_p, autobalance);
@@ -4021,13 +4151,16 @@ static void P_NetArchiveMisc(void)
WRITEUINT8(save_p, 0x2e);
}
-static inline boolean P_NetUnArchiveMisc(void)
+static inline boolean P_NetUnArchiveMisc(boolean reloading)
{
INT32 i;
if (READUINT32(save_p) != ARCHIVEBLOCK_MISC)
I_Error("Bad $$$.sav at archive block Misc");
+ if (reloading)
+ gametic = READUINT32(save_p);
+
gamemap = READINT16(save_p);
// gamemap changed; we assume that its map header is always valid,
@@ -4041,6 +4174,8 @@ static inline boolean P_NetUnArchiveMisc(void)
G_SetGamestate(READINT16(save_p));
+ gametype = READINT16(save_p);
+
{
UINT32 pig = READUINT32(save_p);
for (i = 0; i < MAXPLAYERS; i++)
@@ -4054,7 +4189,7 @@ static inline boolean P_NetUnArchiveMisc(void)
tokenlist = READUINT32(save_p);
- if (!P_LoadLevel(true))
+ if (!P_LoadLevel(true, reloading))
return false;
// get the time
@@ -4074,6 +4209,12 @@ static inline boolean P_NetUnArchiveMisc(void)
sstimer = READINT32(save_p);
bluescore = READUINT32(save_p);
redscore = READUINT32(save_p);
+
+ skincolor_redteam = READUINT16(save_p);
+ skincolor_blueteam = READUINT16(save_p);
+ skincolor_redring = READUINT16(save_p);
+ skincolor_bluering = READUINT16(save_p);
+
modulothing = READINT32(save_p);
autobalance = READINT16(save_p);
@@ -4153,14 +4294,14 @@ void P_SaveGame(INT16 mapnum)
P_ArchiveLuabanksAndConsistency();
}
-void P_SaveNetGame(void)
+void P_SaveNetGame(boolean resending)
{
thinker_t *th;
mobj_t *mobj;
INT32 i = 1; // don't start from 0, it'd be confused with a blank pointer otherwise
CV_SaveNetVars(&save_p);
- P_NetArchiveMisc();
+ P_NetArchiveMisc(resending);
// Assign the mobjnumber for pointer tracking
for (th = thlist[THINK_MOBJ].next; th != &thlist[THINK_MOBJ]; th = th->next)
@@ -4208,10 +4349,10 @@ boolean P_LoadGame(INT16 mapoverride)
return true;
}
-boolean P_LoadNetGame(void)
+boolean P_LoadNetGame(boolean reloading)
{
CV_LoadNetVars(&save_p);
- if (!P_NetUnArchiveMisc())
+ if (!P_NetUnArchiveMisc(reloading))
return false;
P_NetUnArchivePlayers();
if (gamestate == GS_LEVEL)
diff --git a/src/p_saveg.h b/src/p_saveg.h
index d8756a7a9b955e4520e46849c3d76313329b1623..be98953eb232198e88fb757840f9e0021fa48f2d 100644
--- a/src/p_saveg.h
+++ b/src/p_saveg.h
@@ -22,9 +22,9 @@
// These are the load / save game routines.
void P_SaveGame(INT16 mapnum);
-void P_SaveNetGame(void);
+void P_SaveNetGame(boolean resending);
boolean P_LoadGame(INT16 mapoverride);
-boolean P_LoadNetGame(void);
+boolean P_LoadNetGame(boolean reloading);
mobj_t *P_FindNewPosition(UINT32 oldposition);
diff --git a/src/p_setup.c b/src/p_setup.c
index 996e9ec30d7e42eb04d9b0261f14d78f11fcdd46..40dd1a28477a50c3216372314facfd5efdab8984 100644
--- a/src/p_setup.c
+++ b/src/p_setup.c
@@ -29,6 +29,7 @@
#include "r_data.h"
#include "r_things.h" // for R_AddSpriteDefs
#include "r_textures.h"
+#include "r_patch.h"
#include "r_picformats.h"
#include "r_sky.h"
#include "r_draw.h"
@@ -82,6 +83,8 @@
#include "fastcmp.h" // textmap parsing
+#include "taglist.h"
+
//
// Map MD5, calculated on level load.
// Sent to clients in PT_SERVERINFO.
@@ -548,7 +551,7 @@ Ploadflat (levelflat_t *levelflat, const char *flatname, boolean resize)
lumpnum_t flatnum;
int texturenum;
- patch_t *flatpatch;
+ UINT8 *flatpatch;
size_t lumplength;
size_t i;
@@ -608,7 +611,7 @@ flatfound:
/* This could be a flat, patch, or PNG. */
flatpatch = W_CacheLumpNum(flatnum, PU_CACHE);
lumplength = W_LumpLength(flatnum);
- if (Picture_CheckIfPatch(flatpatch, lumplength))
+ if (Picture_CheckIfDoomPatch((softwarepatch_t *)flatpatch, lumplength))
levelflat->type = LEVELFLAT_PATCH;
else
{
@@ -904,16 +907,13 @@ static void P_SpawnMapThings(boolean spawnemblems)
}
// Experimental groovy write function!
-void P_WriteThings(lumpnum_t lumpnum)
+void P_WriteThings(void)
{
size_t i, length;
mapthing_t *mt;
- UINT8 *data;
UINT8 *savebuffer, *savebuf_p;
INT16 temp;
- data = W_CacheLumpNum(lumpnum, PU_LEVEL);
-
savebuf_p = savebuffer = (UINT8 *)malloc(nummapthings * sizeof (mapthing_t));
if (!savebuf_p)
@@ -935,8 +935,6 @@ void P_WriteThings(lumpnum_t lumpnum)
WRITEUINT16(savebuf_p, mt->options);
}
- Z_Free(data);
-
length = savebuf_p - savebuffer;
FIL_WriteFile(va("newthings%d.lmp", gamemap), savebuffer, length);
@@ -968,8 +966,6 @@ static void P_LoadVertices(UINT8 *data)
static void P_InitializeSector(sector_t *ss)
{
- ss->nexttag = ss->firsttag = -1;
-
memset(&ss->soundorg, 0, sizeof(ss->soundorg));
ss->validcount = 0;
@@ -1040,7 +1036,7 @@ static void P_LoadSectors(UINT8 *data)
ss->lightlevel = SHORT(ms->lightlevel);
ss->special = SHORT(ms->special);
- ss->tag = SHORT(ms->tag);
+ Tag_FSet(&ss->tags, SHORT(ms->tag));
ss->floor_xoffs = ss->floor_yoffs = 0;
ss->ceiling_xoffs = ss->ceiling_yoffs = 0;
@@ -1079,10 +1075,6 @@ static void P_InitializeLinedef(line_t *ld)
ld->frontsector = ld->backsector = NULL;
ld->validcount = 0;
-#ifdef WALLSPLATS
- ld->splats = NULL;
-#endif
- ld->firsttag = ld->nexttag = -1;
ld->polyobj = NULL;
ld->text = NULL;
@@ -1154,7 +1146,7 @@ static void P_LoadLinedefs(UINT8 *data)
{
ld->flags = SHORT(mld->flags);
ld->special = SHORT(mld->special);
- ld->tag = SHORT(mld->tag);
+ Tag_FSet(&ld->tags, SHORT(mld->tag));
memset(ld->args, 0, NUMLINEARGS*sizeof(*ld->args));
memset(ld->stringargs, 0x00, NUMLINESTRINGARGS*sizeof(*ld->stringargs));
ld->alpha = FRACUNIT;
@@ -1347,7 +1339,7 @@ static void P_LoadSidedefs(UINT8 *data)
|| (msd->toptexture[0] >= 'A' && msd->toptexture[0] <= 'F'))
sd->toptexture = axtoi(msd->toptexture);
else
- I_Error("Custom FOF (tag %d) needs a value in the linedef's back side upper texture field.", sd->line->tag);
+ I_Error("Custom FOF (line id %s) needs a value in the linedef's back side upper texture field.", sizeu1(sd->line - lines));
sd->midtexture = R_TextureNumForName(msd->midtexture);
sd->bottomtexture = R_TextureNumForName(msd->bottomtexture);
@@ -1387,8 +1379,8 @@ static void P_LoadThings(UINT8 *data)
mt->type = READUINT16(data);
mt->options = READUINT16(data);
mt->extrainfo = (UINT8)(mt->type >> 12);
+ Tag_FSet(&mt->tags, 0);
mt->scale = FRACUNIT;
- mt->tag = 0;
memset(mt->args, 0, NUMMAPTHINGARGS*sizeof(*mt->args));
memset(mt->stringargs, 0x00, NUMMAPTHINGSTRINGARGS*sizeof(*mt->stringargs));
mt->pitch = mt->roll = 0;
@@ -1524,7 +1516,17 @@ static void ParseTextmapSectorParameter(UINT32 i, char *param, char *val)
else if (fastcmp(param, "special"))
sectors[i].special = atol(val);
else if (fastcmp(param, "id"))
- sectors[i].tag = atol(val);
+ Tag_FSet(§ors[i].tags, atol(val));
+ else if (fastcmp(param, "moreids"))
+ {
+ char* id = val;
+ while (id)
+ {
+ Tag_Add(§ors[i].tags, atol(id));
+ if ((id = strchr(id, ' ')))
+ id++;
+ }
+ }
else if (fastcmp(param, "xpanningfloor"))
sectors[i].floor_xoffs = FLOAT_TO_FIXED(atof(val));
else if (fastcmp(param, "ypanningfloor"))
@@ -1602,13 +1604,31 @@ static void ParseTextmapSidedefParameter(UINT32 i, char *param, char *val)
static void ParseTextmapLinedefParameter(UINT32 i, char *param, char *val)
{
if (fastcmp(param, "id"))
- lines[i].tag = atol(val);
+ Tag_FSet(&lines[i].tags, atol(val));
+ else if (fastcmp(param, "moreids"))
+ {
+ char* id = val;
+ while (id)
+ {
+ Tag_Add(&lines[i].tags, atol(id));
+ if ((id = strchr(id, ' ')))
+ id++;
+ }
+ }
else if (fastcmp(param, "special"))
lines[i].special = atol(val);
else if (fastcmp(param, "v1"))
P_SetLinedefV1(i, atol(val));
else if (fastcmp(param, "v2"))
P_SetLinedefV2(i, atol(val));
+ else if (strlen(param) == 7 && fastncmp(param, "arg", 3) && fastncmp(param + 4, "str", 3))
+ {
+ size_t argnum = param[3] - '0';
+ if (argnum >= NUMLINESTRINGARGS)
+ return;
+ lines[i].stringargs[argnum] = Z_Malloc(strlen(val) + 1, PU_LEVEL, NULL);
+ M_Memcpy(lines[i].stringargs[argnum], val, strlen(val) + 1);
+ }
else if (fastncmp(param, "arg", 3) && strlen(param) > 3)
{
size_t argnum = atol(param + 3);
@@ -1616,14 +1636,6 @@ static void ParseTextmapLinedefParameter(UINT32 i, char *param, char *val)
return;
lines[i].args[argnum] = atol(val);
}
- else if (fastncmp(param, "stringarg", 9) && strlen(param) > 9)
- {
- size_t argnum = param[9] - '0';
- if (argnum >= NUMLINESTRINGARGS)
- return;
- lines[i].stringargs[argnum] = Z_Malloc(strlen(val) + 1, PU_LEVEL, NULL);
- M_Memcpy(lines[i].stringargs[argnum], val, strlen(val) + 1);
- }
else if (fastcmp(param, "sidefront"))
lines[i].sidenum[0] = atol(val);
else if (fastcmp(param, "sideback"))
@@ -1671,8 +1683,18 @@ static void ParseTextmapLinedefParameter(UINT32 i, char *param, char *val)
static void ParseTextmapThingParameter(UINT32 i, char *param, char *val)
{
if (fastcmp(param, "id"))
- mapthings[i].tag = atol(val);
- if (fastcmp(param, "x"))
+ Tag_FSet(&mapthings[i].tags, atol(val));
+ else if (fastcmp(param, "moreids"))
+ {
+ char* id = val;
+ while (id)
+ {
+ Tag_Add(&mapthings[i].tags, atol(id));
+ if ((id = strchr(id, ' ')))
+ id++;
+ }
+ }
+ else if (fastcmp(param, "x"))
mapthings[i].x = atol(val);
else if (fastcmp(param, "y"))
mapthings[i].y = atol(val);
@@ -1698,6 +1720,14 @@ static void ParseTextmapThingParameter(UINT32 i, char *param, char *val)
else if (fastcmp(param, "ambush") && fastcmp("true", val))
mapthings[i].options |= MTF_AMBUSH;
+ else if (strlen(param) == 7 && fastncmp(param, "arg", 3) && fastncmp(param + 4, "str", 3))
+ {
+ size_t argnum = param[3] - '0';
+ if (argnum >= NUMMAPTHINGSTRINGARGS)
+ return;
+ mapthings[i].stringargs[argnum] = Z_Malloc(strlen(val) + 1, PU_LEVEL, NULL);
+ M_Memcpy(mapthings[i].stringargs[argnum], val, strlen(val) + 1);
+ }
else if (fastncmp(param, "arg", 3) && strlen(param) > 3)
{
size_t argnum = atol(param + 3);
@@ -1705,14 +1735,6 @@ static void ParseTextmapThingParameter(UINT32 i, char *param, char *val)
return;
mapthings[i].args[argnum] = atol(val);
}
- else if (fastncmp(param, "stringarg", 9) && strlen(param) > 9)
- {
- size_t argnum = param[9] - '0';
- if (argnum >= NUMMAPTHINGSTRINGARGS)
- return;
- mapthings[i].stringargs[argnum] = Z_Malloc(strlen(val) + 1, PU_LEVEL, NULL);
- M_Memcpy(mapthings[i].stringargs[argnum], val, strlen(val) + 1);
- }
}
/** From a given position table, run a specified parser function through a {}-encapsuled text.
@@ -1829,7 +1851,7 @@ static void P_LoadTextmap(void)
sc->lightlevel = 255;
sc->special = 0;
- sc->tag = 0;
+ Tag_FSet(&sc->tags, 0);
sc->floor_xoffs = sc->floor_yoffs = 0;
sc->ceiling_xoffs = sc->ceiling_yoffs = 0;
@@ -1847,6 +1869,7 @@ static void P_LoadTextmap(void)
textmap_colormap.fadeend = 31;
textmap_colormap.flags = 0;
TextmapParse(sectorsPos[i], i, ParseTextmapSectorParameter);
+
P_InitializeSector(sc);
if (textmap_colormap.used)
{
@@ -1863,7 +1886,8 @@ static void P_LoadTextmap(void)
ld->v1 = ld->v2 = NULL;
ld->flags = 0;
ld->special = 0;
- ld->tag = 0;
+ Tag_FSet(&ld->tags, 0);
+
memset(ld->args, 0, NUMLINEARGS*sizeof(*ld->args));
memset(ld->stringargs, 0x00, NUMLINESTRINGARGS*sizeof(*ld->stringargs));
ld->alpha = FRACUNIT;
@@ -1911,8 +1935,8 @@ static void P_LoadTextmap(void)
mt->options = 0;
mt->z = 0;
mt->extrainfo = 0;
+ Tag_FSet(&mt->tags, 0);
mt->scale = FRACUNIT;
- mt->tag = 0;
memset(mt->args, 0, NUMMAPTHINGARGS*sizeof(*mt->args));
memset(mt->stringargs, 0x00, NUMMAPTHINGSTRINGARGS*sizeof(*mt->stringargs));
mt->mobj = NULL;
@@ -2080,9 +2104,6 @@ static boolean P_LoadMapData(const virtres_t *virt)
static void P_InitializeSubsector(subsector_t *ss)
{
ss->sector = NULL;
-#ifdef FLOORSPLATS
- ss->splats = NULL;
-#endif
ss->validcount = 0;
}
@@ -2127,7 +2148,7 @@ static void P_LoadNodes(UINT8 *data)
* \param seg Seg to compute length for.
* \return Length in fracunits.
*/
-fixed_t P_SegLength(seg_t *seg)
+static fixed_t P_SegLength(seg_t *seg)
{
INT64 dx = (seg->v2->x - seg->v1->x)>>1;
INT64 dy = (seg->v2->y - seg->v1->y)>>1;
@@ -2401,6 +2422,10 @@ static boolean P_LoadExtendedSubsectorsAndSegs(UINT8 **data, nodetype_t nodetype
seg->angle = R_PointToAngle2(v1->x, v1->y, v2->x, v2->y);
if (seg->linedef)
segs[i].offset = FixedHypot(v1->x - seg->linedef->v1->x, v1->y - seg->linedef->v1->y);
+ seg->length = P_SegLength(seg);
+#ifdef HWRENDER
+ seg->flength = (rendermode == render_opengl) ? P_SegLengthFloat(seg) : 0;
+#endif
}
return true;
@@ -2925,30 +2950,6 @@ static void P_LinkMapData(void)
}
}
-/** Hashes the sector tags across the sectors and linedefs.
- *
- * \sa P_FindSectorFromTag, P_ChangeSectorTag
- * \author Lee Killough
- */
-static inline void P_InitTagLists(void)
-{
- register size_t i;
-
- for (i = numsectors - 1; i != (size_t)-1; i--)
- {
- size_t j = (unsigned)sectors[i].tag % numsectors;
- sectors[i].nexttag = sectors[j].firsttag;
- sectors[j].firsttag = (INT32)i;
- }
-
- for (i = numlines - 1; i != (size_t)-1; i--)
- {
- size_t j = (unsigned)lines[i].tag % numlines;
- lines[i].nexttag = lines[j].firsttag;
- lines[j].firsttag = (INT32)i;
- }
-}
-
//For maps in binary format, converts setup of specials to UDMF format.
static void P_ConvertBinaryMap(void)
{
@@ -2956,14 +2957,28 @@ static void P_ConvertBinaryMap(void)
for (i = 0; i < numlines; i++)
{
+ mtag_t tag = Tag_FGet(&lines[i].tags);
+
switch (lines[i].special)
{
case 20: //PolyObject first line
{
- INT32 paramline = P_FindSpecialLineFromTag(22, lines[i].tag, -1);
+ INT32 check = -1;
+ INT32 paramline = -1;
+
+ TAG_ITER_DECLARECOUNTER(0);
+
+ TAG_ITER_LINES(0, tag, check)
+ {
+ if (lines[check].special == 22)
+ {
+ paramline = check;
+ break;
+ }
+ }
//PolyObject ID
- lines[i].args[0] = lines[i].tag;
+ lines[i].args[0] = tag;
//Default: Invisible planes
lines[i].args[3] |= TMPF_INVISIBLEPLANES;
@@ -3009,7 +3024,7 @@ static void P_ConvertBinaryMap(void)
CONS_Alert(CONS_WARNING, "Linedef %s is missing the hook name of the Lua function to call! (This should be given in the front texture fields)\n", sizeu1(i));
break;
case 447: //Change colormap
- lines[i].args[0] = lines[i].tag;
+ lines[i].args[0] = Tag_FGet(&lines[i].tags);
if (lines[i].flags & ML_EFFECT3)
lines[i].args[2] |= TMCF_RELATIVE;
if (lines[i].flags & ML_EFFECT1)
@@ -3025,7 +3040,7 @@ static void P_ConvertBinaryMap(void)
abs(sides[lines[i].sidenum[1]].rowoffset >> FRACBITS)
: abs(sides[lines[i].sidenum[0]].rowoffset >> FRACBITS));
- lines[i].args[0] = lines[i].tag;
+ lines[i].args[0] = Tag_FGet(&lines[i].tags);
if (lines[i].flags & ML_EFFECT4)
lines[i].args[2] = speed;
else
@@ -3045,10 +3060,10 @@ static void P_ConvertBinaryMap(void)
break;
}
case 456: //Stop fading colormap
- lines[i].args[0] = lines[i].tag;
+ lines[i].args[0] = Tag_FGet(&lines[i].tags);
break;
case 606: //Colormap
- lines[i].args[0] = lines[i].tag;
+ lines[i].args[0] = Tag_FGet(&lines[i].tags);
break;
case 700: //Slope front sector floor
case 701: //Slope front sector ceiling
@@ -3089,7 +3104,7 @@ static void P_ConvertBinaryMap(void)
else if (lines[i].special == 715)
lines[i].args[0] = TMSP_BACKCEILING;
- lines[i].args[1] = lines[i].tag;
+ lines[i].args[1] = tag;
if (lines[i].flags & ML_EFFECT6)
{
@@ -3121,9 +3136,9 @@ static void P_ConvertBinaryMap(void)
case 721: //Copy front side ceiling slope
case 722: //Copy front side floor and ceiling slope
if (lines[i].special != 721)
- lines[i].args[0] = lines[i].tag;
+ lines[i].args[0] = tag;
if (lines[i].special != 720)
- lines[i].args[1] = lines[i].tag;
+ lines[i].args[1] = tag;
lines[i].special = 720;
break;
case 900: //Translucent wall (10%)
@@ -3156,21 +3171,39 @@ static void P_ConvertBinaryMap(void)
switch (mapthings[i].type)
{
case 750:
+ Tag_FSet(&mapthings[i].tags, mapthings[i].angle);
+ break;
case 760:
case 761:
- mapthings[i].tag = mapthings[i].angle;
+ Tag_FSet(&mapthings[i].tags, mapthings[i].angle);
break;
case 762:
{
- INT32 firstline = P_FindSpecialLineFromTag(20, mapthings[i].angle, -1);
+ INT32 check = -1;
+ INT32 firstline = -1;
+ mtag_t tag = mapthings[i].angle;
+
+ TAG_ITER_DECLARECOUNTER(0);
+
+ Tag_FSet(&mapthings[i].tags, tag);
+
+ TAG_ITER_LINES(0, tag, check)
+ {
+ if (lines[check].special == 20)
+ {
+ firstline = check;
+ break;
+ }
+ }
+
if (firstline != -1)
lines[firstline].args[3] |= TMPF_CRUSH;
- mapthings[i].tag = mapthings[i].angle;
+
mapthings[i].type = 761;
break;
}
case 780:
- mapthings[i].tag = mapthings[i].extrainfo;
+ Tag_FSet(&mapthings[i].tags, mapthings[i].extrainfo);
break;
default:
break;
@@ -3244,6 +3277,7 @@ static boolean P_LoadMapFromFile(void)
{
virtres_t *virt = vres_GetMap(lastloadedmaplumpnum);
virtlump_t *textmap = vres_Find(virt, "TEXTMAP");
+ size_t i;
udmf = textmap != NULL;
if (!P_LoadMapData(virt))
@@ -3253,7 +3287,7 @@ static boolean P_LoadMapFromFile(void)
P_LinkMapData();
- P_InitTagLists(); // Create xref tables for tags
+ Taglist_InitGlobalTables();
if (!udmf)
P_ConvertBinaryMap();
@@ -3267,6 +3301,10 @@ static boolean P_LoadMapFromFile(void)
memcpy(spawnlines, lines, numlines * sizeof(*lines));
memcpy(spawnsides, sides, numsides * sizeof(*sides));
+ for (i = 0; i < numsectors; i++)
+ if (sectors[i].tags.count)
+ spawnsectors[i].tags.tags = memcpy(Z_Malloc(sectors[i].tags.count*sizeof(mtag_t), PU_LEVEL, NULL), sectors[i].tags.tags, sectors[i].tags.count*sizeof(mtag_t));
+
P_MakeMapMD5(virt, &mapmd5);
vres_Free(virt);
@@ -3315,8 +3353,6 @@ static void P_InitLevelSettings(void)
leveltime = 0;
- localaiming = 0;
- localaiming2 = 0;
modulothing = 0;
// special stage tokens, emeralds, and ring total
@@ -3431,6 +3467,9 @@ void P_RespawnThings(void)
P_InitLevelSettings();
+ localaiming = 0;
+ localaiming2 = 0;
+
P_SpawnMapThings(true);
// restore skybox viewpoint/centerpoint if necessary, set them to defaults if we can't do that
@@ -3938,7 +3977,7 @@ static void P_InitGametype(void)
* \param fromnetsave If true, skip some stuff because we're loading a netgame snapshot.
* \todo Clean up, refactor, split up; get rid of the bloat.
*/
-boolean P_LoadLevel(boolean fromnetsave)
+boolean P_LoadLevel(boolean fromnetsave, boolean reloadinggamestate)
{
// use gamemap to get map number.
// 99% of the things already did, so.
@@ -4008,25 +4047,28 @@ boolean P_LoadLevel(boolean fromnetsave)
players[consoleplayer].viewz = 1;
// Cancel all d_main.c fadeouts (keep fade in though).
- wipegamestate = FORCEWIPEOFF;
+ if (reloadinggamestate)
+ wipegamestate = gamestate; // Don't fade if reloading the gamestate
+ else
+ wipegamestate = FORCEWIPEOFF;
wipestyleflags = 0;
- // Special stage fade to white
+ // Special stage & record attack retry fade to white
// This is handled BEFORE sounds are stopped.
- if (modeattacking && !demoplayback && (pausedelay == INT32_MIN))
- ranspecialwipe = 2;
- else if (rendermode != render_none && G_IsSpecialStage(gamemap))
- {
- P_RunSpecialStageWipe();
- ranspecialwipe = 1;
- }
-
if (G_GetModeAttackRetryFlag())
{
- if (modeattacking)
+ if (modeattacking && !demoplayback)
+ {
+ ranspecialwipe = 2;
wipestyleflags |= (WSF_FADEOUT|WSF_TOWHITE);
+ }
G_ClearModeAttackRetryFlag();
}
+ else if (rendermode != render_none && G_IsSpecialStage(gamemap))
+ {
+ P_RunSpecialStageWipe();
+ ranspecialwipe = 1;
+ }
// Make sure all sounds are stopped before Z_FreeTags.
S_StopSounds();
@@ -4034,18 +4076,20 @@ boolean P_LoadLevel(boolean fromnetsave)
// Fade out music here. Deduct 2 tics so the fade volume actually reaches 0.
// But don't halt the music! S_Start will take care of that. This dodges a MIDI crash bug.
- if (!titlemapinaction && (RESETMUSIC ||
+ if (!(reloadinggamestate || titlemapinaction) && (RESETMUSIC ||
strnicmp(S_MusicName(),
(mapmusflags & MUSIC_RELOADRESET) ? mapheaderinfo[gamemap-1]->musname : mapmusname, 7)))
+ {
S_FadeMusic(0, FixedMul(
FixedDiv((F_GetWipeLength(wipedefs[wipe_level_toblack])-2)*NEWTICRATERATIO, NEWTICRATE), MUSICRATE));
+ }
// Let's fade to black here
// But only if we didn't do the special stage wipe
- if (rendermode != render_none && !ranspecialwipe)
+ if (rendermode != render_none && !(ranspecialwipe || reloadinggamestate))
P_RunLevelWipe();
- if (!titlemapinaction)
+ if (!(reloadinggamestate || titlemapinaction))
{
if (ranspecialwipe == 2)
{
@@ -4089,13 +4133,16 @@ boolean P_LoadLevel(boolean fromnetsave)
// Clear pointers that would be left dangling by the purge
R_FlushTranslationColormapCache();
- Z_FreeTags(PU_LEVEL, PU_PURGELEVEL - 1);
-
-#if defined (WALLSPLATS) || defined (FLOORSPLATS)
- // clear the splats from previous level
- R_ClearLevelSplats();
+#ifdef HWRENDER
+ // Free GPU textures before freeing patches.
+ if (rendermode == render_opengl && (vid.glstate == VID_GL_LIBRARY_LOADED))
+ HWR_ClearAllTextures();
#endif
+ Patch_FreeTag(PU_PATCH_LOWPRIORITY);
+ Patch_FreeTag(PU_PATCH_ROTATED);
+ Z_FreeTags(PU_LEVEL, PU_PURGELEVEL - 1);
+
P_InitThinkers();
P_InitCachedActions();
@@ -4152,14 +4199,14 @@ boolean P_LoadLevel(boolean fromnetsave)
P_SpawnPrecipitation();
#ifdef HWRENDER // not win32 only 19990829 by Kin
+ gl_maploaded = false;
+
// Lactozilla: Free extrasubsectors regardless of renderer.
- // Maybe we're not in OpenGL anymore.
- if (extrasubsectors)
- free(extrasubsectors);
- extrasubsectors = NULL;
- // stuff like HWR_CreatePlanePolygons is called there
+ HWR_FreeExtraSubsectors();
+
+ // Create plane polygons.
if (rendermode == render_opengl)
- HWR_SetupLevel();
+ HWR_LoadLevel();
#endif
// oh god I hope this helps
@@ -4170,7 +4217,12 @@ boolean P_LoadLevel(boolean fromnetsave)
if (!fromnetsave)
P_InitGametype();
- P_InitCamera();
+ if (!reloadinggamestate)
+ {
+ P_InitCamera();
+ localaiming = 0;
+ localaiming2 = 0;
+ }
// clear special respawning que
iquehead = iquetail = 0;
@@ -4178,7 +4230,7 @@ boolean P_LoadLevel(boolean fromnetsave)
P_MapEnd();
// Remove the loading shit from the screen
- if (rendermode != render_none && !titlemapinaction)
+ if (rendermode != render_none && !(titlemapinaction || reloadinggamestate))
F_WipeColorFill(levelfadecol);
if (precache || dedicated)
@@ -4187,9 +4239,9 @@ boolean P_LoadLevel(boolean fromnetsave)
nextmapoverride = 0;
skipstats = 0;
- if (!(netgame || multiplayer) && (!modifiedgame || savemoddata))
+ if (!(netgame || multiplayer || demoplayback) && (!modifiedgame || savemoddata))
mapvisited[gamemap-1] |= MV_VISITED;
- else
+ else if (netgame || multiplayer)
mapvisited[gamemap-1] |= MV_MP; // you want to record that you've been there this session, but not permanently
levelloading = false;
@@ -4222,8 +4274,8 @@ boolean P_LoadLevel(boolean fromnetsave)
LUAh_MapLoad();
}
- // No render mode, stop here.
- if (rendermode == render_none)
+ // No render mode or reloading gamestate, stop here.
+ if (rendermode == render_none || reloadinggamestate)
return true;
// Title card!
@@ -4241,33 +4293,6 @@ boolean P_LoadLevel(boolean fromnetsave)
return true;
}
-#ifdef HWRENDER
-void HWR_SetupLevel(void)
-{
- // Lactozilla (December 8, 2019)
- // Level setup used to free EVERY mipmap from memory.
- // Even mipmaps that aren't related to level textures.
- // Presumably, the hardware render code used to store textures as level data.
- // Meaning, they had memory allocated and marked with the PU_LEVEL tag.
- // Level textures are only reloaded after R_LoadTextures, which is
- // when the texture list is loaded.
-
- // Sal: Unfortunately, NOT freeing them causes the dreaded Color Bug.
- HWR_FreeMipmapCache();
-
-#ifdef ALAM_LIGHTING
- // BP: reset light between levels (we draw preview frame lights on current frame)
- HWR_ResetLights();
-#endif
-
- HWR_CreatePlanePolygons((INT32)numnodes - 1);
-
- // Build the sky dome
- HWR_ClearSkyDome();
- HWR_BuildSkyDome();
-}
-#endif
-
//
// P_RunSOC
//
@@ -4473,10 +4498,17 @@ boolean P_AddWadFile(const char *wadfilename)
if (!devparm && digmreplaces)
CONS_Printf(M_GetText("%s digital musics replaced\n"), sizeu1(digmreplaces));
+#ifdef HWRENDER
+ // Free GPU textures before freeing patches.
+ if (rendermode == render_opengl && (vid.glstate == VID_GL_LIBRARY_LOADED))
+ HWR_ClearAllTextures();
+#endif
//
// search for sprite replacements
//
+ Patch_FreeTag(PU_SPRITE);
+ Patch_FreeTag(PU_PATCH_ROTATED);
R_AddSpriteDefs(wadnum);
// Reload it all anyway, just in case they
diff --git a/src/p_setup.h b/src/p_setup.h
index ef903e103725194d058e0a8bfac1e6a929c7373b..5d13ae7d429d94d5c1fed55b08ff275fe3d3b353 100644
--- a/src/p_setup.h
+++ b/src/p_setup.h
@@ -80,6 +80,7 @@ typedef struct
UINT8 *picture;
#ifdef HWRENDER
void *mipmap;
+ void *mippic;
#endif
} levelflat_t;
@@ -97,15 +98,15 @@ void P_SetupLevelSky(INT32 skynum, boolean global);
void P_ScanThings(INT16 mapnum, INT16 wadnum, INT16 lumpnum);
#endif
void P_RespawnThings(void);
-boolean P_LoadLevel(boolean fromnetsave);
+boolean P_LoadLevel(boolean fromnetsave, boolean reloadinggamestate);
#ifdef HWRENDER
-void HWR_SetupLevel(void);
+void HWR_LoadLevel(void);
#endif
boolean P_AddWadFile(const char *wadfilename);
boolean P_RunSOC(const char *socfilename);
void P_LoadSoundsRange(UINT16 wadnum, UINT16 first, UINT16 num);
void P_LoadMusicsRange(UINT16 wadnum, UINT16 first, UINT16 num);
-void P_WriteThings(lumpnum_t lump);
+void P_WriteThings(void);
size_t P_PrecacheLevelFlats(void);
void P_AllocMapHeader(INT16 i);
diff --git a/src/p_slopes.c b/src/p_slopes.c
index e93b0f6c993650043a1afe588c21aa1b64bbac37..aa46a84024d459e2c3dab0164d4122b59f30b126 100644
--- a/src/p_slopes.c
+++ b/src/p_slopes.c
@@ -139,7 +139,7 @@ void T_DynamicSlopeVert (dynplanethink_t* th)
INT32 l;
for (i = 0; i < 3; i++) {
- l = P_FindSpecialLineFromTag(799, th->tags[i], -1);
+ l = Tag_FindLineSpecial(799, th->tags[i]);
if (l != -1) {
th->vex[i].z = lines[l].frontsector->floorheight;
}
@@ -405,9 +405,6 @@ static void line_SpawnViaLine(const int linenum, const boolean spawnthinker)
P_AddDynSlopeThinker(cslope, DP_BACKCEIL, line, extent, NULL, NULL);
}
}
-
- if(!line->tag)
- return;
}
/// Creates a new slope from three mapthings with the specified IDs
@@ -426,11 +423,11 @@ static pslope_t *MakeViaMapthings(INT16 tag1, INT16 tag2, INT16 tag3, UINT8 flag
if (mt->type != 750) // Haha, I'm hijacking the old Chaos Spawn thingtype for something!
continue;
- if (!vertices[0] && mt->tag == tag1)
+ if (!vertices[0] && Tag_Find(&mt->tags, tag1))
vertices[0] = mt;
- else if (!vertices[1] && mt->tag == tag2)
+ else if (!vertices[1] && Tag_Find(&mt->tags, tag2))
vertices[1] = mt;
- else if (!vertices[2] && mt->tag == tag3)
+ else if (!vertices[2] && Tag_Find(&mt->tags, tag3))
vertices[2] = mt;
}
@@ -549,11 +546,11 @@ static boolean P_SetSlopeFromTag(sector_t *sec, INT32 tag, boolean ceiling)
{
INT32 i;
pslope_t **secslope = ceiling ? &sec->c_slope : &sec->f_slope;
+ TAG_ITER_DECLARECOUNTER(0);
if (!tag || *secslope)
return false;
-
- for (i = -1; (i = P_FindSectorFromTag(tag, i)) >= 0;)
+ TAG_ITER_SECTORS(0, tag, i)
{
pslope_t *srcslope = ceiling ? sectors[i].c_slope : sectors[i].f_slope;
if (srcslope)
diff --git a/src/p_spec.c b/src/p_spec.c
index 7a79bd494f951e8a0befbf2812a23b2326200624..226e58d154423037c980835f61447a2ca8bb500d 100644
--- a/src/p_spec.c
+++ b/src/p_spec.c
@@ -988,99 +988,12 @@ static sector_t *P_FindModelCeilingSector(fixed_t ceildestheight, INT32 secnum)
}
#endif
-/** Searches the tag lists for the next sector with a given tag.
- *
- * \param tag Tag number to look for.
- * \param start -1 to start anew, or the result of a previous call to keep
- * searching.
- * \return Number of the next tagged sector found.
- */
-INT32 P_FindSectorFromTag(INT16 tag, INT32 start)
-{
- if (tag == -1)
- {
- start++;
-
- if (start >= (INT32)numsectors)
- return -1;
-
- return start;
- }
- else
- {
- start = start >= 0 ? sectors[start].nexttag :
- sectors[(unsigned)tag % numsectors].firsttag;
- while (start >= 0 && sectors[start].tag != tag)
- start = sectors[start].nexttag;
- return start;
- }
-}
-
-/** Searches the tag lists for the next line with a given tag and special.
- *
- * \param tag Tag number.
- * \param start -1 to start anew, or the result of a previous call to keep
- * searching.
- * \return Number of next suitable line found.
- * \author Graue <graue@oceanbase.org>
- */
-static INT32 P_FindLineFromTag(INT32 tag, INT32 start)
-{
- if (tag == -1)
- {
- start++;
-
- if (start >= (INT32)numlines)
- return -1;
-
- return start;
- }
- else
- {
- start = start >= 0 ? lines[start].nexttag :
- lines[(unsigned)tag % numlines].firsttag;
- while (start >= 0 && lines[start].tag != tag)
- start = lines[start].nexttag;
- return start;
- }
-}
-
-INT32 P_FindSpecialLineFromTag(INT16 special, INT16 tag, INT32 start)
-{
- if (tag == -1)
- {
- start++;
-
- // This redundant check stops the compiler from complaining about function expansion
- // elsewhere for some reason and everything is awful
- if (start >= (INT32)numlines)
- return -1;
-
- while (start < (INT32)numlines && lines[start].special != special)
- start++;
-
- if (start >= (INT32)numlines)
- return -1;
-
- return start;
- }
- else
- {
- start = start >= 0 ? lines[start].nexttag :
- lines[(unsigned)tag % numlines].firsttag;
- while (start >= 0 && (lines[start].tag != tag || lines[start].special != special))
- start = lines[start].nexttag;
- return start;
- }
-}
-
-
// Parses arguments for parameterized polyobject door types
static boolean PolyDoor(line_t *line)
{
polydoordata_t pdd;
- pdd.polyObjNum = line->tag; // polyobject id
+ pdd.polyObjNum = Tag_FGet(&line->tags); // polyobject id
switch(line->special)
{
@@ -1117,7 +1030,7 @@ static boolean PolyMove(line_t *line)
{
polymovedata_t pmd;
- pmd.polyObjNum = line->tag;
+ pmd.polyObjNum = Tag_FGet(&line->tags);
pmd.speed = sides[line->sidenum[0]].textureoffset / 8;
pmd.angle = R_PointToAngle2(line->v1->x, line->v1->y, line->v2->x, line->v2->y);
pmd.distance = sides[line->sidenum[0]].rowoffset;
@@ -1131,7 +1044,7 @@ static boolean PolyMove(line_t *line)
// If NOCLIMB is ticked, the polyobject will still be tangible, just not visible.
static void PolyInvisible(line_t *line)
{
- INT32 polyObjNum = line->tag;
+ INT32 polyObjNum = Tag_FGet(&line->tags);
polyobj_t *po;
if (!(po = Polyobj_GetForNum(polyObjNum)))
@@ -1155,7 +1068,7 @@ static void PolyInvisible(line_t *line)
// If NOCLIMB is ticked, the polyobject will not be tangible, just visible.
static void PolyVisible(line_t *line)
{
- INT32 polyObjNum = line->tag;
+ INT32 polyObjNum = Tag_FGet(&line->tags);
polyobj_t *po;
if (!(po = Polyobj_GetForNum(polyObjNum)))
@@ -1180,7 +1093,7 @@ static void PolyVisible(line_t *line)
// Frontsector floor / 100 = translevel
static void PolyTranslucency(line_t *line)
{
- INT32 polyObjNum = line->tag;
+ INT32 polyObjNum = Tag_FGet(&line->tags);
polyobj_t *po;
INT32 value;
@@ -1212,7 +1125,7 @@ static void PolyTranslucency(line_t *line)
// Makes a polyobject translucency fade and applies tangibility
static boolean PolyFade(line_t *line)
{
- INT32 polyObjNum = line->tag;
+ INT32 polyObjNum = Tag_FGet(&line->tags);
polyobj_t *po;
polyfadedata_t pfd;
INT32 value;
@@ -1274,7 +1187,7 @@ static boolean PolyWaypoint(line_t *line)
{
polywaypointdata_t pwd;
- pwd.polyObjNum = line->tag;
+ pwd.polyObjNum = Tag_FGet(&line->tags);
pwd.speed = sides[line->sidenum[0]].textureoffset / 8;
pwd.sequence = sides[line->sidenum[0]].rowoffset >> FRACBITS; // Sequence #
@@ -1301,7 +1214,7 @@ static boolean PolyRotate(line_t *line)
{
polyrotdata_t prd;
- prd.polyObjNum = line->tag;
+ prd.polyObjNum = Tag_FGet(&line->tags);
prd.speed = sides[line->sidenum[0]].textureoffset >> FRACBITS; // angular speed
prd.distance = sides[line->sidenum[0]].rowoffset >> FRACBITS; // angular distance
@@ -1326,7 +1239,7 @@ static boolean PolyFlag(line_t *line)
{
polyflagdata_t pfd;
- pfd.polyObjNum = line->tag;
+ pfd.polyObjNum = Tag_FGet(&line->tags);
pfd.speed = P_AproxDistance(line->dx, line->dy) >> FRACBITS;
pfd.angle = R_PointToAngle2(line->v1->x, line->v1->y, line->v2->x, line->v2->y) >> ANGLETOFINESHIFT;
pfd.momx = sides[line->sidenum[0]].textureoffset >> FRACBITS;
@@ -1339,7 +1252,7 @@ static boolean PolyDisplace(line_t *line)
{
polydisplacedata_t pdd;
- pdd.polyObjNum = line->tag;
+ pdd.polyObjNum = Tag_FGet(&line->tags);
pdd.controlSector = line->frontsector;
pdd.dx = line->dx>>8;
@@ -1355,7 +1268,7 @@ static boolean PolyRotDisplace(line_t *line)
polyrotdisplacedata_t pdd;
fixed_t anginter, distinter;
- pdd.polyObjNum = line->tag;
+ pdd.polyObjNum = Tag_FGet(&line->tags);
pdd.controlSector = line->frontsector;
// Rotate 'anginter' interval for each 'distinter' interval from the control sector.
@@ -1375,66 +1288,6 @@ static boolean PolyRotDisplace(line_t *line)
return EV_DoPolyObjRotDisplace(&pdd);
}
-/** Changes a sector's tag.
- * Used by the linedef executor tag changer and by crumblers.
- *
- * \param sector Sector whose tag will be changed.
- * \param newtag New tag number for this sector.
- * \sa P_InitTagLists, P_FindSectorFromTag
- * \author Graue <graue@oceanbase.org>
- */
-void P_ChangeSectorTag(UINT32 sector, INT16 newtag)
-{
- INT16 oldtag;
- INT32 i;
-
- I_Assert(sector < numsectors);
-
- if ((oldtag = sectors[sector].tag) == newtag)
- return;
-
- // first you have to remove it from the old tag's taglist
- i = sectors[(unsigned)oldtag % numsectors].firsttag;
-
- if (i == -1) // shouldn't happen
- I_Error("Corrupt tag list for sector %u\n", sector);
- else if ((UINT32)i == sector)
- sectors[(unsigned)oldtag % numsectors].firsttag = sectors[sector].nexttag;
- else
- {
- while (sectors[i].nexttag != -1 && (UINT32)sectors[i].nexttag < sector )
- i = sectors[i].nexttag;
-
- sectors[i].nexttag = sectors[sector].nexttag;
- }
-
- sectors[sector].tag = newtag;
-
- // now add it to the new tag's taglist
- if ((UINT32)sectors[(unsigned)newtag % numsectors].firsttag > sector)
- {
- sectors[sector].nexttag = sectors[(unsigned)newtag % numsectors].firsttag;
- sectors[(unsigned)newtag % numsectors].firsttag = sector;
- }
- else
- {
- i = sectors[(unsigned)newtag % numsectors].firsttag;
-
- if (i == -1)
- {
- sectors[(unsigned)newtag % numsectors].firsttag = sector;
- sectors[sector].nexttag = -1;
- }
- else
- {
- while (sectors[i].nexttag != -1 && (UINT32)sectors[i].nexttag < sector )
- i = sectors[i].nexttag;
-
- sectors[sector].nexttag = sectors[i].nexttag;
- sectors[i].nexttag = sector;
- }
- }
-}
//
// P_RunNightserizeExecutors
@@ -2103,7 +1956,7 @@ void P_LinedefExecute(INT16 tag, mobj_t *actor, sector_t *caller)
for (masterline = 0; masterline < numlines; masterline++)
{
- if (lines[masterline].tag != tag)
+ if (Tag_FGet(&lines[masterline].tags) != tag)
continue;
// "No More Enemies" and "Level Load" take care of themselves.
@@ -2369,6 +2222,8 @@ static void P_ProcessLineSpecial(line_t *line, mobj_t *mo, sector_t *callsec)
{
INT32 secnum = -1;
mobj_t *bot = NULL;
+ mtag_t tag = Tag_FGet(&line->tags);
+ TAG_ITER_DECLARECOUNTER(0);
I_Assert(!mo || !P_MobjWasRemoved(mo)); // If mo is there, mo must be valid!
@@ -2396,7 +2251,7 @@ static void P_ProcessLineSpecial(line_t *line, mobj_t *mo, sector_t *callsec)
newceilinglightsec = line->frontsector->ceilinglightsec;
// act on all sectors with the same tag as the triggering linedef
- while ((secnum = P_FindSectorFromTag(line->tag, secnum)) >= 0)
+ TAG_ITER_SECTORS(0, tag, secnum)
{
if (sectors[secnum].lightingdata)
{
@@ -2451,17 +2306,17 @@ static void P_ProcessLineSpecial(line_t *line, mobj_t *mo, sector_t *callsec)
case 409: // Change tagged sectors' tag
// (formerly "Change calling sectors' tag", but behavior was changed)
{
- while ((secnum = P_FindSectorFromTag(line->tag, secnum)) >= 0)
- P_ChangeSectorTag(secnum,(INT16)(sides[line->sidenum[0]].textureoffset>>FRACBITS));
+ TAG_ITER_SECTORS(0, tag, secnum)
+ Tag_SectorFSet(secnum,(INT16)(sides[line->sidenum[0]].textureoffset>>FRACBITS));
break;
}
case 410: // Change front sector's tag
- P_ChangeSectorTag((UINT32)(line->frontsector - sectors), (INT16)(sides[line->sidenum[0]].textureoffset>>FRACBITS));
+ Tag_SectorFSet((UINT32)(line->frontsector - sectors), (INT16)(sides[line->sidenum[0]].textureoffset>>FRACBITS));
break;
case 411: // Stop floor/ceiling movement in tagged sector(s)
- while ((secnum = P_FindSectorFromTag(line->tag, secnum)) >= 0)
+ TAG_ITER_SECTORS(0, tag, secnum)
{
if (sectors[secnum].floordata)
{
@@ -2531,7 +2386,7 @@ static void P_ProcessLineSpecial(line_t *line, mobj_t *mo, sector_t *callsec)
}
else
{
- if ((secnum = P_FindSectorFromTag(line->tag, -1)) < 0)
+ if ((secnum = Tag_Iterate_Sectors(tag, 0)) < 0)
return;
dest = P_GetObjectTypeInSectorNum(MT_TELEPORTMAN, secnum);
@@ -2638,7 +2493,7 @@ static void P_ProcessLineSpecial(line_t *line, mobj_t *mo, sector_t *callsec)
return;
}
- if (line->tag != 0) // Do special stuff only if a non-zero linedef tag is set
+ if (tag != 0) // Do special stuff only if a non-zero linedef tag is set
{
// Play sounds from tagged sectors' origins.
if (line->flags & ML_EFFECT5) // Repeat Midtexture
@@ -2646,7 +2501,7 @@ static void P_ProcessLineSpecial(line_t *line, mobj_t *mo, sector_t *callsec)
// Additionally play the sound from tagged sectors' soundorgs
sector_t *sec;
- while ((secnum = P_FindSectorFromTag(line->tag, secnum)) >= 0)
+ TAG_ITER_SECTORS(0, tag, secnum)
{
sec = §ors[secnum];
S_StartSound(&sec->soundorg, sfxnum);
@@ -2666,7 +2521,7 @@ static void P_ProcessLineSpecial(line_t *line, mobj_t *mo, sector_t *callsec)
if (!camobj)
continue;
- if (foundit || (camobj->subsector->sector->tag == line->tag))
+ if (foundit || Tag_Find(&camobj->subsector->sector->tags, tag))
{
foundit = true;
break;
@@ -2675,7 +2530,7 @@ static void P_ProcessLineSpecial(line_t *line, mobj_t *mo, sector_t *callsec)
// Only trigger if mobj is touching the tag
for(rover = camobj->subsector->sector->ffloors; rover; rover = rover->next)
{
- if (rover->master->frontsector->tag != line->tag)
+ if (!Tag_Find(&rover->master->frontsector->tags, tag))
continue;
if (camobj->z > P_GetSpecialTopZ(camobj, sectors + rover->secnum, camobj->subsector->sector))
@@ -2761,7 +2616,7 @@ static void P_ProcessLineSpecial(line_t *line, mobj_t *mo, sector_t *callsec)
break;
case 416: // Spawn adjustable fire flicker
- while ((secnum = P_FindSectorFromTag(line->tag, secnum)) >= 0)
+ TAG_ITER_SECTORS(0, tag, secnum)
{
if (line->flags & ML_NOCLIMB && line->backsector)
{
@@ -2795,7 +2650,7 @@ static void P_ProcessLineSpecial(line_t *line, mobj_t *mo, sector_t *callsec)
break;
case 417: // Spawn adjustable glowing light
- while ((secnum = P_FindSectorFromTag(line->tag, secnum)) >= 0)
+ TAG_ITER_SECTORS(0, tag, secnum)
{
if (line->flags & ML_NOCLIMB && line->backsector)
{
@@ -2829,7 +2684,7 @@ static void P_ProcessLineSpecial(line_t *line, mobj_t *mo, sector_t *callsec)
break;
case 418: // Spawn adjustable strobe flash (unsynchronized)
- while ((secnum = P_FindSectorFromTag(line->tag, secnum)) >= 0)
+ TAG_ITER_SECTORS(0, tag, secnum)
{
if (line->flags & ML_NOCLIMB && line->backsector)
{
@@ -2863,7 +2718,7 @@ static void P_ProcessLineSpecial(line_t *line, mobj_t *mo, sector_t *callsec)
break;
case 419: // Spawn adjustable strobe flash (synchronized)
- while ((secnum = P_FindSectorFromTag(line->tag, secnum)) >= 0)
+ TAG_ITER_SECTORS(0, tag, secnum)
{
if (line->flags & ML_NOCLIMB && line->backsector)
{
@@ -2897,7 +2752,7 @@ static void P_ProcessLineSpecial(line_t *line, mobj_t *mo, sector_t *callsec)
break;
case 420: // Fade light levels in tagged sectors to new value
- P_FadeLight(line->tag,
+ P_FadeLight(tag,
(line->flags & ML_DONTPEGBOTTOM) ? max(sides[line->sidenum[0]].textureoffset>>FRACBITS, 0) : line->frontsector->lightlevel,
// failsafe: if user specifies Back Y Offset and NOT Front Y Offset, use the Back Offset
// to be consistent with other light and fade specials
@@ -2911,7 +2766,7 @@ static void P_ProcessLineSpecial(line_t *line, mobj_t *mo, sector_t *callsec)
break;
case 421: // Stop lighting effect in tagged sectors
- while ((secnum = P_FindSectorFromTag(line->tag, secnum)) >= 0)
+ TAG_ITER_SECTORS(0, tag, secnum)
if (sectors[secnum].lightingdata)
{
P_RemoveThinker(&((elevator_t *)sectors[secnum].lightingdata)->thinker);
@@ -2926,7 +2781,7 @@ static void P_ProcessLineSpecial(line_t *line, mobj_t *mo, sector_t *callsec)
if ((!mo || !mo->player) && !titlemapinaction) // only players have views, and title screens
return;
- if ((secnum = P_FindSectorFromTag(line->tag, -1)) < 0)
+ if ((secnum = Tag_Iterate_Sectors(tag, 0)) < 0)
return;
altview = P_GetObjectTypeInSectorNum(MT_ALTVIEWMAN, secnum);
@@ -3108,8 +2963,7 @@ static void P_ProcessLineSpecial(line_t *line, mobj_t *mo, sector_t *callsec)
continue;
scroller = (scroll_t *)th;
-
- if (sectors[scroller->affectee].tag != line->tag)
+ if (!Tag_Find(§ors[scroller->affectee].tags, tag))
continue;
scroller->dx = FixedMul(line->dx>>SCROLL_SHIFT, CARRYFACTOR);
@@ -3126,7 +2980,7 @@ static void P_ProcessLineSpecial(line_t *line, mobj_t *mo, sector_t *callsec)
ffloor_t *rover; // FOF that we are going to crumble
boolean foundrover = false; // for debug, "Can't find a FOF" message
- for (secnum = -1; (secnum = P_FindSectorFromTag(sectag, secnum)) >= 0 ;)
+ TAG_ITER_SECTORS(0, sectag, secnum)
{
sec = sectors + secnum;
@@ -3138,7 +2992,7 @@ static void P_ProcessLineSpecial(line_t *line, mobj_t *mo, sector_t *callsec)
for (rover = sec->ffloors; rover; rover = rover->next)
{
- if (rover->master->frontsector->tag == foftag)
+ if (Tag_Find(&rover->master->frontsector->tags, foftag))
{
foundrover = true;
@@ -3185,12 +3039,13 @@ static void P_ProcessLineSpecial(line_t *line, mobj_t *mo, sector_t *callsec)
size_t linenum;
side_t *set = &sides[line->sidenum[0]], *this;
boolean always = !(line->flags & ML_NOCLIMB); // If noclimb: Only change mid texture if mid texture already exists on tagged lines, etc.
+
for (linenum = 0; linenum < numlines; linenum++)
{
if (lines[linenum].special == 439)
continue; // Don't override other set texture lines!
- if (lines[linenum].tag != line->tag)
+ if (!Tag_Find(&lines[linenum].tags, tag))
continue; // Find tagged lines
// Front side
@@ -3250,7 +3105,7 @@ static void P_ProcessLineSpecial(line_t *line, mobj_t *mo, sector_t *callsec)
if (line->sidenum[1] != 0xffff)
state = (statenum_t)sides[line->sidenum[1]].toptexture;
- while ((secnum = P_FindSectorFromTag(line->tag, secnum)) >= 0)
+ TAG_ITER_SECTORS(0, tag, secnum)
{
boolean tryagain;
sec = sectors + secnum;
@@ -3310,7 +3165,7 @@ static void P_ProcessLineSpecial(line_t *line, mobj_t *mo, sector_t *callsec)
boolean foundrover = false; // for debug, "Can't find a FOF" message
ffloortype_e oldflags; // store FOF's old flags
- for (secnum = -1; (secnum = P_FindSectorFromTag(sectag, secnum)) >= 0 ;)
+ TAG_ITER_SECTORS(0, sectag, secnum)
{
sec = sectors + secnum;
@@ -3322,7 +3177,7 @@ static void P_ProcessLineSpecial(line_t *line, mobj_t *mo, sector_t *callsec)
for (rover = sec->ffloors; rover; rover = rover->next)
{
- if (rover->master->frontsector->tag == foftag)
+ if (Tag_Find(&rover->master->frontsector->tags, foftag))
{
foundrover = true;
@@ -3368,7 +3223,7 @@ static void P_ProcessLineSpecial(line_t *line, mobj_t *mo, sector_t *callsec)
if (line->flags & ML_NOCLIMB) // don't respawn!
respawn = false;
- for (secnum = -1; (secnum = P_FindSectorFromTag(sectag, secnum)) >= 0 ;)
+ TAG_ITER_SECTORS(0, sectag, secnum)
{
sec = sectors + secnum;
@@ -3380,7 +3235,7 @@ static void P_ProcessLineSpecial(line_t *line, mobj_t *mo, sector_t *callsec)
for (rover = sec->ffloors; rover; rover = rover->next)
{
- if (rover->master->frontsector->tag == foftag)
+ if (Tag_Find(&rover->master->frontsector->tags, foftag))
{
foundrover = true;
@@ -3415,7 +3270,7 @@ static void P_ProcessLineSpecial(line_t *line, mobj_t *mo, sector_t *callsec)
source = line->frontsector->extra_colormap;
else
{
- INT32 sourcesec = P_FindSectorFromTag(line->args[1], -1);
+ INT32 sourcesec = Tag_Iterate_Sectors(line->args[1], 0);
if (sourcesec == -1)
{
CONS_Debug(DBG_GAMELOGIC, "Line type 447 Executor: Can't find sector with source colormap (tag %d)!\n", line->args[1]);
@@ -3424,8 +3279,7 @@ static void P_ProcessLineSpecial(line_t *line, mobj_t *mo, sector_t *callsec)
source = sectors[sourcesec].extra_colormap;
}
}
-
- for (secnum = -1; (secnum = P_FindSectorFromTag(line->args[0], secnum)) >= 0;)
+ TAG_ITER_SECTORS(0, line->args[0], secnum)
{
if (sectors[secnum].colormap_protected)
continue;
@@ -3477,7 +3331,7 @@ static void P_ProcessLineSpecial(line_t *line, mobj_t *mo, sector_t *callsec)
{
CONS_Alert(CONS_WARNING,
M_GetText("Skybox switch linedef (tag %d) doesn't have anything to do.\nConsider changing the linedef's flag configuration or removing it entirely.\n"),
- line->tag);
+ tag);
}
else
{
@@ -3515,7 +3369,7 @@ static void P_ProcessLineSpecial(line_t *line, mobj_t *mo, sector_t *callsec)
{
CONS_Alert(CONS_WARNING,
M_GetText("Boss enable linedef (tag %d) has an invalid texture x offset.\nConsider changing it or removing it entirely.\n"),
- line->tag);
+ tag);
break;
}
if (line->flags & ML_NOCLIMB)
@@ -3532,7 +3386,7 @@ static void P_ProcessLineSpecial(line_t *line, mobj_t *mo, sector_t *callsec)
}
case 450: // Execute Linedef Executor - for recursion
- P_LinedefExecute(line->tag, mo, NULL);
+ P_LinedefExecute(tag, mo, NULL);
break;
case 451: // Execute Random Linedef Executor
@@ -3560,7 +3414,7 @@ static void P_ProcessLineSpecial(line_t *line, mobj_t *mo, sector_t *callsec)
ffloor_t *rover; // FOF that we are going to operate
boolean foundrover = false; // for debug, "Can't find a FOF" message
- for (secnum = -1; (secnum = P_FindSectorFromTag(sectag, secnum)) >= 0 ;)
+ TAG_ITER_SECTORS(0, sectag, secnum)
{
sec = sectors + secnum;
@@ -3572,7 +3426,7 @@ static void P_ProcessLineSpecial(line_t *line, mobj_t *mo, sector_t *callsec)
for (rover = sec->ffloors; rover; rover = rover->next)
{
- if (rover->master->frontsector->tag == foftag)
+ if (Tag_Find(&rover->master->frontsector->tags, foftag))
{
foundrover = true;
@@ -3624,7 +3478,7 @@ static void P_ProcessLineSpecial(line_t *line, mobj_t *mo, sector_t *callsec)
boolean foundrover = false; // for debug, "Can't find a FOF" message
size_t j = 0; // sec->ffloors is saved as ffloor #0, ss->ffloors->next is #1, etc
- for (secnum = -1; (secnum = P_FindSectorFromTag(sectag, secnum)) >= 0 ;)
+ TAG_ITER_SECTORS(0, sectag, secnum)
{
sec = sectors + secnum;
@@ -3636,7 +3490,7 @@ static void P_ProcessLineSpecial(line_t *line, mobj_t *mo, sector_t *callsec)
for (rover = sec->ffloors; rover; rover = rover->next)
{
- if (rover->master->frontsector->tag == foftag)
+ if (Tag_Find(&rover->master->frontsector->tags, foftag))
{
foundrover = true;
@@ -3709,7 +3563,7 @@ static void P_ProcessLineSpecial(line_t *line, mobj_t *mo, sector_t *callsec)
ffloor_t *rover; // FOF that we are going to operate
boolean foundrover = false; // for debug, "Can't find a FOF" message
- for (secnum = -1; (secnum = P_FindSectorFromTag(sectag, secnum)) >= 0 ;)
+ TAG_ITER_SECTORS(0, sectag, secnum)
{
sec = sectors + secnum;
@@ -3721,7 +3575,7 @@ static void P_ProcessLineSpecial(line_t *line, mobj_t *mo, sector_t *callsec)
for (rover = sec->ffloors; rover; rover = rover->next)
{
- if (rover->master->frontsector->tag == foftag)
+ if (Tag_Find(&rover->master->frontsector->tags, foftag))
{
foundrover = true;
@@ -3750,7 +3604,7 @@ static void P_ProcessLineSpecial(line_t *line, mobj_t *mo, sector_t *callsec)
dest = line->frontsector->extra_colormap;
else
{
- INT32 destsec = P_FindSectorFromTag(line->args[1], -1);
+ INT32 destsec = Tag_Iterate_Sectors(line->args[1], 0);
if (destsec == -1)
{
CONS_Debug(DBG_GAMELOGIC, "Line type 455 Executor: Can't find sector with destination colormap (tag %d)!\n", line->args[1]);
@@ -3760,7 +3614,7 @@ static void P_ProcessLineSpecial(line_t *line, mobj_t *mo, sector_t *callsec)
}
}
- for (secnum = -1; (secnum = P_FindSectorFromTag(line->args[0], secnum)) >= 0;)
+ TAG_ITER_SECTORS(0, line->args[0], secnum)
{
extracolormap_t *source_exc, *dest_exc, *exc;
@@ -3840,7 +3694,7 @@ static void P_ProcessLineSpecial(line_t *line, mobj_t *mo, sector_t *callsec)
break;
}
case 456: // Stop fade colormap
- for (secnum = -1; (secnum = P_FindSectorFromTag(line->args[0], secnum)) >= 0 ;)
+ TAG_ITER_SECTORS(0, line->args[0], secnum)
P_ResetColormapFader(§ors[secnum]);
break;
@@ -3854,7 +3708,7 @@ static void P_ProcessLineSpecial(line_t *line, mobj_t *mo, sector_t *callsec)
boolean persist = (line->flags & ML_EFFECT2);
mobj_t *anchormo;
- if ((secnum = P_FindSectorFromTag(line->tag, -1)) < 0)
+ if ((secnum = Tag_Iterate_Sectors(tag, 0)) < 0)
return;
anchormo = P_GetObjectTypeInSectorNum(MT_ANGLEMAN, secnum);
@@ -3885,7 +3739,7 @@ static void P_ProcessLineSpecial(line_t *line, mobj_t *mo, sector_t *callsec)
{
INT32 promptnum = max(0, (sides[line->sidenum[0]].textureoffset>>FRACBITS)-1);
INT32 pagenum = max(0, (sides[line->sidenum[0]].rowoffset>>FRACBITS)-1);
- INT32 postexectag = abs((line->sidenum[1] != 0xFFFF) ? sides[line->sidenum[1]].textureoffset>>FRACBITS : line->tag);
+ INT32 postexectag = abs((line->sidenum[1] != 0xFFFF) ? sides[line->sidenum[1]].textureoffset>>FRACBITS : tag);
boolean closetextprompt = (line->flags & ML_BLOCKMONSTERS);
//boolean allplayers = (line->flags & ML_NOCLIMB);
@@ -4009,7 +3863,7 @@ static void P_ProcessLineSpecial(line_t *line, mobj_t *mo, sector_t *callsec)
if (!mo2->spawnpoint)
continue;
- if (mo2->spawnpoint->angle != line->tag)
+ if (mo2->spawnpoint->angle != tag)
continue;
P_KillMobj(mo2, NULL, mo, 0);
@@ -4033,11 +3887,12 @@ static void P_ProcessLineSpecial(line_t *line, mobj_t *mo, sector_t *callsec)
case 465: // Set linedef executor delay
{
INT32 linenum;
+ TAG_ITER_DECLARECOUNTER(1);
if (!udmf)
break;
- for (linenum = -1; (linenum = P_FindLineFromTag(line->args[0], linenum)) >= 0 ;)
+ TAG_ITER_LINES(1, line->args[0], linenum)
{
if (line->args[2])
lines[linenum].executordelay += line->args[1];
@@ -4382,6 +4237,7 @@ void P_ProcessSpecialSector(player_t *player, sector_t *sector, sector_t *rovers
INT32 i = 0;
INT32 section1, section2, section3, section4;
INT32 special;
+ mtag_t sectag = Tag_FGet(§or->tags);
section1 = GETSECSPECIAL(sector->special, 1);
section2 = GETSECSPECIAL(sector->special, 2);
@@ -4448,7 +4304,7 @@ void P_ProcessSpecialSector(player_t *player, sector_t *sector, sector_t *rovers
if (leveltime % (TICRATE/2) == 0 && player->rings > 0)
{
player->rings--;
- S_StartSound(player->mo, sfx_itemup);
+ S_StartSound(player->mo, sfx_antiri);
}
break;
case 11: // Special Stage Damage
@@ -4536,7 +4392,7 @@ void P_ProcessSpecialSector(player_t *player, sector_t *sector, sector_t *rovers
case 6: // Linedef executor (7 Emeralds)
case 7: // Linedef executor (NiGHTS Mare)
if (!player->bot)
- P_LinedefExecute(sector->tag, player->mo, sector);
+ P_LinedefExecute(sectag, player->mo, sector);
break;
case 8: // Tells pushable things to check FOFs
break;
@@ -4564,15 +4420,19 @@ void P_ProcessSpecialSector(player_t *player, sector_t *sector, sector_t *rovers
// clear the special so you can't push the button twice.
sector->special = 0;
+ // Initialize my junk
+ junk.tags.tags = NULL;
+ junk.tags.count = 0;
+
// Move the button down
- junk.tag = 680;
+ Tag_FSet(&junk.tags, LE_CAPSULE0);
EV_DoElevator(&junk, elevateDown, false);
// Open the top FOF
- junk.tag = 681;
+ Tag_FSet(&junk.tags, LE_CAPSULE1);
EV_DoFloor(&junk, raiseFloorToNearestFast);
// Open the bottom FOF
- junk.tag = 682;
+ Tag_FSet(&junk.tags, LE_CAPSULE2);
EV_DoCeiling(&junk, lowerToLowestFast);
// Mark all players with the time to exit thingy!
@@ -4607,7 +4467,7 @@ DoneSection2:
if (player->powers[pw_flashing] != 0 && player->powers[pw_flashing] < TICRATE/2)
break;
- i = P_FindSpecialLineFromTag(4, sector->tag, -1);
+ i = Tag_FindLineSpecial(4, sectag);
if (i != -1)
{
@@ -4620,7 +4480,7 @@ DoneSection2:
if (linespeed == 0)
{
- CONS_Debug(DBG_GAMELOGIC, "ERROR: Speed pad (tag %d) at zero speed.\n", sector->tag);
+ CONS_Debug(DBG_GAMELOGIC, "ERROR: Speed pad (tag %d) at zero speed.\n", sectag);
break;
}
@@ -4647,7 +4507,7 @@ DoneSection2:
P_InstaThrust(player->mo, player->mo->angle, linespeed);
- if ((lines[i].flags & ML_EFFECT5) && (player->charability2 == CA2_SPINDASH)) // Roll!
+ if (lines[i].flags & ML_EFFECT5) // Roll!
{
if (!(player->pflags & PF_SPINNING))
player->pflags |= PF_SPINNING;
@@ -4714,7 +4574,7 @@ DoneSection2:
// important: use sector->tag on next line instead of player->mo->subsector->tag
// this part is different from in P_PlayerThink, this is what was causing
// FOF custom exits not to work.
- lineindex = P_FindSpecialLineFromTag(2, sector->tag, -1);
+ lineindex = Tag_FindLineSpecial(2, sectag);
if (G_CoopGametype() && lineindex != -1) // Custom exit!
{
@@ -4744,7 +4604,7 @@ DoneSection2:
HU_SetCEchoFlags(V_AUTOFADEOUT|V_ALLOWLOWERCASE);
HU_SetCEchoDuration(5);
- HU_DoCEcho(va(M_GetText("%s%s%s\\CAPTURED THE %sBLUE FLAG%s.\\\\\\\\"), "\x85", player_names[player-players], "\x80", "\x84", "\x80"));
+ HU_DoCEcho(va(M_GetText("\205%s\200\\CAPTURED THE \204BLUE FLAG\200.\\\\\\\\"), player_names[player-players]));
if (splitscreen || players[consoleplayer].ctfteam == 1)
S_StartSound(NULL, sfx_flgcap);
@@ -4777,7 +4637,7 @@ DoneSection2:
HU_SetCEchoFlags(V_AUTOFADEOUT|V_ALLOWLOWERCASE);
HU_SetCEchoDuration(5);
- HU_DoCEcho(va(M_GetText("%s%s%s\\CAPTURED THE %sRED FLAG%s.\\\\\\\\"), "\x84", player_names[player-players], "\x80", "\x85", "\x80"));
+ HU_DoCEcho(va(M_GetText("\204%s\200\\CAPTURED THE \205RED FLAG\200.\\\\\\\\"), player_names[player-players]));
if (splitscreen || players[consoleplayer].ctfteam == 2)
S_StartSound(NULL, sfx_flgcap);
@@ -4813,7 +4673,7 @@ DoneSection2:
break;
case 7: // Make player spin
- if (!(player->pflags & PF_SPINNING) && P_IsObjectOnGround(player->mo) && (player->charability2 == CA2_SPINDASH))
+ if (!(player->pflags & PF_SPINNING))
{
player->pflags |= PF_SPINNING;
P_SetPlayerMobjState(player->mo, S_PLAY_ROLL);
@@ -4840,7 +4700,7 @@ DoneSection2:
break;
// Find line #3 tagged to this sector
- lineindex = P_FindSpecialLineFromTag(3, sector->tag, -1);
+ lineindex = Tag_FindLineSpecial(3, sectag);
if (lineindex == -1)
{
@@ -4905,7 +4765,7 @@ DoneSection2:
break;
// Find line #3 tagged to this sector
- lineindex = P_FindSpecialLineFromTag(3, sector->tag, -1);
+ lineindex = Tag_FindLineSpecial(3, sectag);
if (lineindex == -1)
{
@@ -4967,6 +4827,8 @@ DoneSection2:
if (player->laps >= (UINT8)cv_numlaps.value)
CONS_Printf(M_GetText("%s has finished the race.\n"), player_names[player-players]);
+ else if (player->laps == (UINT8)cv_numlaps.value-1)
+ CONS_Printf(M_GetText("%s started the \205final lap\200!\n"), player_names[player-players]);
else
CONS_Printf(M_GetText("%s started lap %u\n"), player_names[player-players], (UINT32)player->laps+1);
@@ -5034,7 +4896,7 @@ DoneSection2:
memset(&resulthigh, 0x00, sizeof(resulthigh));
// Find line #11 tagged to this sector
- lineindex = P_FindSpecialLineFromTag(11, sector->tag, -1);
+ lineindex = Tag_FindLineSpecial(11, sectag);
if (lineindex == -1)
{
@@ -5654,7 +5516,7 @@ static ffloor_t *P_AddFakeFloor(sector_t *sec, sector_t *sec2, line_t *master, f
{
fixed_t tempceiling = sec2->ceilingheight;
//flip the sector around and print an error instead of crashing 12.1.08 -Inuyasha
- CONS_Alert(CONS_ERROR, M_GetText("A FOF tagged %d has a top height below its bottom.\n"), master->tag);
+ CONS_Alert(CONS_ERROR, M_GetText("FOF (line %s) has a top height below its bottom.\n"), sizeu1(master - lines));
sec2->ceilingheight = sec2->floorheight;
sec2->floorheight = tempceiling;
}
@@ -5794,7 +5656,7 @@ static ffloor_t *P_AddFakeFloor(sector_t *sec, sector_t *sec2, line_t *master, f
if ((flags & FF_FLOATBOB))
{
- P_AddFloatThinker(sec2, sec->tag, master);
+ P_AddFloatThinker(sec2, Tag_FGet(&master->tags), master);
CheckForFloatBob = true;
}
@@ -5950,7 +5812,7 @@ static void P_AddAirbob(sector_t *sec, INT16 tag, fixed_t dist, boolean raise, b
* \sa P_SpawnSpecials, T_ThwompSector
* \author SSNTails <http://www.ssntails.org>
*/
-static inline void P_AddThwompThinker(sector_t *sec, INT16 tag, line_t *sourceline, fixed_t crushspeed, fixed_t retractspeed, UINT16 sound)
+static inline void P_AddThwompThinker(sector_t *sec, line_t *sourceline, fixed_t crushspeed, fixed_t retractspeed, UINT16 sound)
{
thwomp_t *thwomp;
@@ -5974,7 +5836,7 @@ static inline void P_AddThwompThinker(sector_t *sec, INT16 tag, line_t *sourceli
thwomp->floorstartheight = sec->floorheight;
thwomp->ceilingstartheight = sec->ceilingheight;
thwomp->delay = 1;
- thwomp->tag = tag;
+ thwomp->tag = Tag_FGet(&sourceline->tags);
thwomp->sound = sound;
sec->floordata = thwomp;
@@ -6066,8 +5928,9 @@ void T_LaserFlash(laserthink_t *flash)
sector_t *sector;
sector_t *sourcesec = flash->sourceline->frontsector;
fixed_t top, bottom;
+ TAG_ITER_DECLARECOUNTER(0);
- for (s = -1; (s = P_FindSectorFromTag(flash->tag, s)) >= 0 ;)
+ TAG_ITER_SECTORS(0, flash->tag, s)
{
sector = §ors[s];
for (fflr = sector->ffloors; fflr; fflr = fflr->next)
@@ -6322,6 +6185,8 @@ void P_SpawnSpecials(boolean fromnetsave)
// Init line EFFECTs
for (i = 0; i < numlines; i++)
{
+ mtag_t tag = Tag_FGet(&lines[i].tags);
+
if (lines[i].special != 7) // This is a hack. I can at least hope nobody wants to prevent flat alignment in netgames...
{
// set line specials to 0 here too, same reason as above
@@ -6345,10 +6210,11 @@ void P_SpawnSpecials(boolean fromnetsave)
INT32 s;
size_t sec;
ffloortype_e ffloorflags;
+ TAG_ITER_DECLARECOUNTER(0);
case 1: // Definable gravity per sector
sec = sides[*lines[i].sidenum].sector - sectors;
- for (s = -1; (s = P_FindSectorFromTag(lines[i].tag, s)) >= 0 ;)
+ TAG_ITER_SECTORS(0, tag, s)
{
sectors[s].gravity = §ors[sec].floorheight; // This allows it to change in realtime!
@@ -6372,7 +6238,7 @@ void P_SpawnSpecials(boolean fromnetsave)
case 5: // Change camera info
sec = sides[*lines[i].sidenum].sector - sectors;
- for (s = -1; (s = P_FindSectorFromTag(lines[i].tag, s)) >= 0 ;)
+ TAG_ITER_SECTORS(0, tag, s)
P_AddCameraScanner(§ors[sec], §ors[s], R_PointToAngle2(lines[i].v2->x, lines[i].v2->y, lines[i].v1->x, lines[i].v1->y));
break;
@@ -6395,22 +6261,22 @@ void P_SpawnSpecials(boolean fromnetsave)
}
//If no tag is given, apply to front sector
- if (lines[i].tag == 0)
+ if (tag == 0)
P_ApplyFlatAlignment(lines + i, lines[i].frontsector, flatangle, xoffs, yoffs);
else
{
- for (s = -1; (s = P_FindSectorFromTag(lines[i].tag, s)) >= 0;)
+ TAG_ITER_SECTORS(0, tag, s)
P_ApplyFlatAlignment(lines + i, sectors + s, flatangle, xoffs, yoffs);
}
}
else // Otherwise, print a helpful warning. Can I do no less?
CONS_Alert(CONS_WARNING,
M_GetText("Flat alignment linedef (tag %d) doesn't have anything to do.\nConsider changing the linedef's flag configuration or removing it entirely.\n"),
- lines[i].tag);
+ tag);
break;
case 8: // Sector Parameters
- for (s = -1; (s = P_FindSectorFromTag(lines[i].tag, s)) >= 0 ;)
+ TAG_ITER_SECTORS(0, tag, s)
{
if (lines[i].flags & ML_NOCLIMB)
{
@@ -6437,8 +6303,7 @@ void P_SpawnSpecials(boolean fromnetsave)
break;
case 10: // Vertical culling plane for sprites and FOFs
- sec = sides[*lines[i].sidenum].sector - sectors;
- for (s = -1; (s = P_FindSectorFromTag(lines[i].tag, s)) >= 0 ;)
+ TAG_ITER_SECTORS(0, tag, s)
sectors[s].cullheight = &lines[i]; // This allows it to change in realtime!
break;
@@ -6499,36 +6364,38 @@ void P_SpawnSpecials(boolean fromnetsave)
case 63: // support for drawn heights coming from different sector
sec = sides[*lines[i].sidenum].sector-sectors;
- for (s = -1; (s = P_FindSectorFromTag(lines[i].tag, s)) >= 0 ;)
+ TAG_ITER_SECTORS(0, tag, s)
sectors[s].heightsec = (INT32)sec;
break;
case 64: // Appearing/Disappearing FOF option
if (lines[i].flags & ML_BLOCKMONSTERS) { // Find FOFs by control sector tag
- for (s = -1; (s = P_FindSectorFromTag(lines[i].tag, s)) >= 0 ;)
+ TAG_ITER_SECTORS(0, tag, s)
for (j = 0; (unsigned)j < sectors[s].linecount; j++)
if (sectors[s].lines[j]->special >= 100 && sectors[s].lines[j]->special < 300)
Add_MasterDisappearer(abs(lines[i].dx>>FRACBITS), abs(lines[i].dy>>FRACBITS), abs(sides[lines[i].sidenum[0]].sector->floorheight>>FRACBITS), (INT32)(sectors[s].lines[j]-lines), (INT32)i);
} else // Find FOFs by effect sector tag
- for (s = -1; (s = P_FindLineFromTag(lines[i].tag, s)) >= 0 ;)
+ {
+ TAG_ITER_LINES(0, tag, s)
{
if ((size_t)s == i)
continue;
- if (sides[lines[s].sidenum[0]].sector->tag == sides[lines[i].sidenum[0]].sector->tag)
+ if (Tag_Find(&sides[lines[s].sidenum[0]].sector->tags, Tag_FGet(&sides[lines[i].sidenum[0]].sector->tags)))
Add_MasterDisappearer(abs(lines[i].dx>>FRACBITS), abs(lines[i].dy>>FRACBITS), abs(sides[lines[i].sidenum[0]].sector->floorheight>>FRACBITS), s, (INT32)i);
}
+ }
break;
case 66: // Displace floor by front sector
- for (s = -1; (s = P_FindSectorFromTag(lines[i].tag, s)) >= 0 ;)
+ TAG_ITER_SECTORS(0, tag, s)
P_AddPlaneDisplaceThinker(pd_floor, P_AproxDistance(lines[i].dx, lines[i].dy)>>8, sides[lines[i].sidenum[0]].sector-sectors, s, !!(lines[i].flags & ML_NOCLIMB));
break;
case 67: // Displace ceiling by front sector
- for (s = -1; (s = P_FindSectorFromTag(lines[i].tag, s)) >= 0 ;)
+ TAG_ITER_SECTORS(0, tag, s)
P_AddPlaneDisplaceThinker(pd_ceiling, P_AproxDistance(lines[i].dx, lines[i].dy)>>8, sides[lines[i].sidenum[0]].sector-sectors, s, !!(lines[i].flags & ML_NOCLIMB));
break;
case 68: // Displace both floor AND ceiling by front sector
- for (s = -1; (s = P_FindSectorFromTag(lines[i].tag, s)) >= 0 ;)
+ TAG_ITER_SECTORS(0, tag, s)
P_AddPlaneDisplaceThinker(pd_both, P_AproxDistance(lines[i].dx, lines[i].dy)>>8, sides[lines[i].sidenum[0]].sector-sectors, s, !!(lines[i].flags & ML_NOCLIMB));
break;
@@ -6725,16 +6592,16 @@ void P_SpawnSpecials(boolean fromnetsave)
{
fixed_t dist = (lines[i].special == 150) ? 16*FRACUNIT : P_AproxDistance(lines[i].dx, lines[i].dy);
P_AddFakeFloorsByLine(i, FF_EXISTS|FF_SOLID|FF_RENDERALL|FF_CUTLEVEL, secthinkers);
- P_AddAirbob(lines[i].frontsector, lines[i].tag, dist, false, !!(lines[i].flags & ML_NOCLIMB), false);
+ P_AddAirbob(lines[i].frontsector, tag, dist, false, !!(lines[i].flags & ML_NOCLIMB), false);
break;
}
case 152: // Adjustable air bobbing platform in reverse
P_AddFakeFloorsByLine(i, FF_EXISTS|FF_SOLID|FF_RENDERALL|FF_CUTLEVEL, secthinkers);
- P_AddAirbob(lines[i].frontsector, lines[i].tag, P_AproxDistance(lines[i].dx, lines[i].dy), true, !!(lines[i].flags & ML_NOCLIMB), false);
+ P_AddAirbob(lines[i].frontsector, tag, P_AproxDistance(lines[i].dx, lines[i].dy), true, !!(lines[i].flags & ML_NOCLIMB), false);
break;
case 153: // Dynamic Sinking Platform
P_AddFakeFloorsByLine(i, FF_EXISTS|FF_SOLID|FF_RENDERALL|FF_CUTLEVEL, secthinkers);
- P_AddAirbob(lines[i].frontsector, lines[i].tag, P_AproxDistance(lines[i].dx, lines[i].dy), false, !!(lines[i].flags & ML_NOCLIMB), true);
+ P_AddAirbob(lines[i].frontsector, tag, P_AproxDistance(lines[i].dx, lines[i].dy), false, !!(lines[i].flags & ML_NOCLIMB), true);
break;
case 160: // Float/bob platform
@@ -6784,13 +6651,13 @@ void P_SpawnSpecials(boolean fromnetsave)
case 176: // Air bobbing platform that will crumble and bob on the water when it falls and hits
P_AddFakeFloorsByLine(i, FF_EXISTS|FF_SOLID|FF_RENDERALL|FF_FLOATBOB|FF_CRUMBLE, secthinkers);
- P_AddAirbob(lines[i].frontsector, lines[i].tag, 16*FRACUNIT, false, !!(lines[i].flags & ML_NOCLIMB), false);
+ P_AddAirbob(lines[i].frontsector, tag, 16*FRACUNIT, false, !!(lines[i].flags & ML_NOCLIMB), false);
break;
case 177: // Air bobbing platform that will crumble and bob on
// the water when it falls and hits, then never return
P_AddFakeFloorsByLine(i, FF_EXISTS|FF_SOLID|FF_RENDERALL|FF_CUTLEVEL|FF_FLOATBOB|FF_CRUMBLE|FF_NORETURN, secthinkers);
- P_AddAirbob(lines[i].frontsector, lines[i].tag, 16*FRACUNIT, false, !!(lines[i].flags & ML_NOCLIMB), false);
+ P_AddAirbob(lines[i].frontsector, tag, 16*FRACUNIT, false, !!(lines[i].flags & ML_NOCLIMB), false);
break;
case 178: // Crumbling platform that will float when it hits water
@@ -6803,7 +6670,7 @@ void P_SpawnSpecials(boolean fromnetsave)
case 180: // Air bobbing platform that will crumble
P_AddFakeFloorsByLine(i, FF_EXISTS|FF_SOLID|FF_RENDERALL|FF_CUTLEVEL|FF_CRUMBLE, secthinkers);
- P_AddAirbob(lines[i].frontsector, lines[i].tag, 16*FRACUNIT, false, !!(lines[i].flags & ML_NOCLIMB), false);
+ P_AddAirbob(lines[i].frontsector, tag, 16*FRACUNIT, false, !!(lines[i].flags & ML_NOCLIMB), false);
break;
case 190: // Rising Platform FOF (solid, opaque, shadows)
@@ -6830,7 +6697,7 @@ void P_SpawnSpecials(boolean fromnetsave)
ffloorflags |= FF_NOSHADE;
P_AddFakeFloorsByLine(i, ffloorflags, secthinkers);
- P_AddRaiseThinker(lines[i].frontsector, lines[i].tag, speed, ceilingtop, ceilingbottom, !!(lines[i].flags & ML_BLOCKMONSTERS), !!(lines[i].flags & ML_NOCLIMB));
+ P_AddRaiseThinker(lines[i].frontsector, tag, speed, ceilingtop, ceilingbottom, !!(lines[i].flags & ML_BLOCKMONSTERS), !!(lines[i].flags & ML_NOCLIMB));
break;
}
@@ -6892,7 +6759,7 @@ void P_SpawnSpecials(boolean fromnetsave)
fixed_t crushspeed = (lines[i].flags & ML_EFFECT5) ? lines[i].dy >> 3 : 10*FRACUNIT;
fixed_t retractspeed = (lines[i].flags & ML_EFFECT5) ? lines[i].dx >> 3 : 2*FRACUNIT;
UINT16 sound = (lines[i].flags & ML_EFFECT4) ? sides[lines[i].sidenum[0]].textureoffset >> FRACBITS : sfx_thwomp;
- P_AddThwompThinker(lines[i].frontsector, lines[i].tag, &lines[i], crushspeed, retractspeed, sound);
+ P_AddThwompThinker(lines[i].frontsector, &lines[i], crushspeed, retractspeed, sound);
P_AddFakeFloorsByLine(i, FF_EXISTS|FF_SOLID|FF_RENDERALL|FF_CUTLEVEL, secthinkers);
break;
}
@@ -6934,7 +6801,7 @@ void P_SpawnSpecials(boolean fromnetsave)
break;
case 258: // Laser block
- P_AddLaserThinker(lines[i].tag, lines + i, !!(lines[i].flags & ML_EFFECT1));
+ P_AddLaserThinker(tag, lines + i, !!(lines[i].flags & ML_EFFECT1));
P_AddFakeFloorsByLine(i, FF_EXISTS|FF_RENDERALL|FF_NOSHADE|FF_EXTRA|FF_CUTEXTRA|FF_TRANSLUCENT, secthinkers);
break;
@@ -6945,7 +6812,7 @@ void P_SpawnSpecials(boolean fromnetsave)
P_AddFakeFloorsByLine(i, fofflags, secthinkers);
}
else
- I_Error("Custom FOF (tag %d) found without a linedef back side!", lines[i].tag);
+ I_Error("Custom FOF (tag %d) found without a linedef back side!", tag);
break;
case 300: // Linedef executor (combines with sector special 974/975) and commands
@@ -7075,7 +6942,7 @@ void P_SpawnSpecials(boolean fromnetsave)
{
CONS_Alert(CONS_WARNING,
M_GetText("Boss enable linedef (tag %d) has an invalid texture x offset.\nConsider changing it or removing it entirely.\n"),
- lines[i].tag);
+ tag);
break;
}
if (!(lines[i].flags & ML_NOCLIMB))
@@ -7124,46 +6991,46 @@ void P_SpawnSpecials(boolean fromnetsave)
case 600: // floor lighting independently (e.g. lava)
sec = sides[*lines[i].sidenum].sector-sectors;
- for (s = -1; (s = P_FindSectorFromTag(lines[i].tag, s)) >= 0 ;)
+ TAG_ITER_SECTORS(0, tag, s)
sectors[s].floorlightsec = (INT32)sec;
break;
case 601: // ceiling lighting independently
sec = sides[*lines[i].sidenum].sector-sectors;
- for (s = -1; (s = P_FindSectorFromTag(lines[i].tag, s)) >= 0 ;)
+ TAG_ITER_SECTORS(0, tag, s)
sectors[s].ceilinglightsec = (INT32)sec;
break;
case 602: // Adjustable pulsating light
sec = sides[*lines[i].sidenum].sector - sectors;
- for (s = -1; (s = P_FindSectorFromTag(lines[i].tag, s)) >= 0 ;)
+ TAG_ITER_SECTORS(0, tag, s)
P_SpawnAdjustableGlowingLight(§ors[sec], §ors[s],
P_AproxDistance(lines[i].dx, lines[i].dy)>>FRACBITS);
break;
case 603: // Adjustable flickering light
sec = sides[*lines[i].sidenum].sector - sectors;
- for (s = -1; (s = P_FindSectorFromTag(lines[i].tag, s)) >= 0 ;)
+ TAG_ITER_SECTORS(0, tag, s)
P_SpawnAdjustableFireFlicker(§ors[sec], §ors[s],
P_AproxDistance(lines[i].dx, lines[i].dy)>>FRACBITS);
break;
case 604: // Adjustable Blinking Light (unsynchronized)
sec = sides[*lines[i].sidenum].sector - sectors;
- for (s = -1; (s = P_FindSectorFromTag(lines[i].tag, s)) >= 0 ;)
+ TAG_ITER_SECTORS(0, tag, s)
P_SpawnAdjustableStrobeFlash(§ors[sec], §ors[s],
abs(lines[i].dx)>>FRACBITS, abs(lines[i].dy)>>FRACBITS, false);
break;
case 605: // Adjustable Blinking Light (synchronized)
sec = sides[*lines[i].sidenum].sector - sectors;
- for (s = -1; (s = P_FindSectorFromTag(lines[i].tag, s)) >= 0 ;)
+ TAG_ITER_SECTORS(0, tag, s)
P_SpawnAdjustableStrobeFlash(§ors[sec], §ors[s],
abs(lines[i].dx)>>FRACBITS, abs(lines[i].dy)>>FRACBITS, true);
break;
case 606: // HACK! Copy colormaps. Just plain colormaps.
- for (s = -1; (s = P_FindSectorFromTag(lines[i].args[0], s)) >= 0;)
+ TAG_ITER_SECTORS(0, lines[i].args[0], s)
{
extracolormap_t *exc;
@@ -7178,7 +7045,7 @@ void P_SpawnSpecials(boolean fromnetsave)
exc = lines[i].frontsector->extra_colormap;
else
{
- INT32 sourcesec = P_FindSectorFromTag(lines[i].args[1], -1);
+ INT32 sourcesec = Tag_Iterate_Sectors(lines[i].args[1], 0);
if (sourcesec == -1)
{
CONS_Debug(DBG_GAMELOGIC, "Line type 606: Can't find sector with source colormap (tag %d)!\n", lines[i].args[1]);
@@ -7237,11 +7104,14 @@ void P_SpawnSpecials(boolean fromnetsave)
*/
static void P_AddFakeFloorsByLine(size_t line, ffloortype_e ffloorflags, thinkerlist_t *secthinkers)
{
+ TAG_ITER_DECLARECOUNTER(0);
INT32 s;
+ mtag_t tag = Tag_FGet(&lines[line].tags);
size_t sec = sides[*lines[line].sidenum].sector-sectors;
- for (s = -1; (s = P_FindSectorFromTag(lines[line].tag, s)) >= 0 ;)
- P_AddFakeFloor(§ors[s], §ors[sec], lines+line, ffloorflags, secthinkers);
+ line_t* li = lines + line;
+ TAG_ITER_SECTORS(0, tag, s)
+ P_AddFakeFloor(§ors[s], §ors[sec], li, ffloorflags, secthinkers);
}
/*
@@ -7350,6 +7220,7 @@ void T_Scroll(scroll_t *s)
size_t i;
INT32 sect;
ffloor_t *rover;
+ TAG_ITER_DECLARECOUNTER(0);
case sc_side: // scroll wall texture
side = sides + s->affectee;
@@ -7386,7 +7257,7 @@ void T_Scroll(scroll_t *s)
if (!is3dblock)
continue;
- for (sect = -1; (sect = P_FindSectorFromTag(line->tag, sect)) >= 0 ;)
+ TAG_ITER_SECTORS(0, Tag_FGet(&line->tags), sect)
{
sector_t *psec;
psec = sectors + sect;
@@ -7461,8 +7332,7 @@ void T_Scroll(scroll_t *s)
if (!is3dblock)
continue;
-
- for (sect = -1; (sect = P_FindSectorFromTag(line->tag, sect)) >= 0 ;)
+ TAG_ITER_SECTORS(0, Tag_FGet(&line->tags), sect)
{
sector_t *psec;
psec = sectors + sect;
@@ -7560,6 +7430,7 @@ static void P_SpawnScrollers(void)
{
size_t i;
line_t *l = lines;
+ mtag_t tag;
for (i = 0; i < numlines; i++, l++)
{
@@ -7568,6 +7439,8 @@ static void P_SpawnScrollers(void)
INT32 control = -1, accel = 0; // no control sector or acceleration
INT32 special = l->special;
+ tag = Tag_FGet(&l->tags);
+
// These types are same as the ones they get set to except that the
// first side's sector's heights cause scrolling when they change, and
// this linedef controls the direction and speed of the scrolling. The
@@ -7599,10 +7472,11 @@ static void P_SpawnScrollers(void)
switch (special)
{
register INT32 s;
+ TAG_ITER_DECLARECOUNTER(0);
case 513: // scroll effect ceiling
case 533: // scroll and carry objects on ceiling
- for (s = -1; (s = P_FindSectorFromTag(l->tag, s)) >= 0 ;)
+ TAG_ITER_SECTORS(0, tag, s)
Add_Scroller(sc_ceiling, -dx, dy, control, s, accel, l->flags & ML_NOCLIMB);
if (special != 533)
break;
@@ -7611,13 +7485,13 @@ static void P_SpawnScrollers(void)
case 523: // carry objects on ceiling
dx = FixedMul(dx, CARRYFACTOR);
dy = FixedMul(dy, CARRYFACTOR);
- for (s = -1; (s = P_FindSectorFromTag(l->tag, s)) >= 0 ;)
+ TAG_ITER_SECTORS(0, tag, s)
Add_Scroller(sc_carry_ceiling, dx, dy, control, s, accel, l->flags & ML_NOCLIMB);
break;
case 510: // scroll effect floor
case 530: // scroll and carry objects on floor
- for (s = -1; (s = P_FindSectorFromTag(l->tag, s)) >= 0 ;)
+ TAG_ITER_SECTORS(0, tag, s)
Add_Scroller(sc_floor, -dx, dy, control, s, accel, l->flags & ML_NOCLIMB);
if (special != 530)
break;
@@ -7626,14 +7500,15 @@ static void P_SpawnScrollers(void)
case 520: // carry objects on floor
dx = FixedMul(dx, CARRYFACTOR);
dy = FixedMul(dy, CARRYFACTOR);
- for (s = -1; (s = P_FindSectorFromTag(l->tag, s)) >= 0 ;)
+ TAG_ITER_SECTORS(0, tag, s)
Add_Scroller(sc_carry, dx, dy, control, s, accel, l->flags & ML_NOCLIMB);
break;
// scroll wall according to linedef
// (same direction and speed as scrolling floors)
case 502:
- for (s = -1; (s = P_FindLineFromTag(l->tag, s)) >= 0 ;)
+ {
+ TAG_ITER_LINES(0, tag, s)
if (s != (INT32)i)
{
if (l->flags & ML_EFFECT2) // use texture offsets instead
@@ -7650,6 +7525,7 @@ static void P_SpawnScrollers(void)
Add_Scroller(sc_side, dx, dy, control, lines[s].sidenum[0], accel, 0);
}
break;
+ }
case 505:
s = lines[i].sidenum[0];
@@ -7733,8 +7609,10 @@ void T_Disappear(disappear_t *d)
{
ffloor_t *rover;
register INT32 s;
+ mtag_t afftag = Tag_FGet(&lines[d->affectee].tags);
+ TAG_ITER_DECLARECOUNTER(0);
- for (s = -1; (s = P_FindSectorFromTag(lines[d->affectee].tag, s)) >= 0 ;)
+ TAG_ITER_SECTORS(0, afftag, s)
{
for (rover = sectors[s].ffloors; rover; rover = rover->next)
{
@@ -8460,14 +8338,17 @@ static void P_SpawnFriction(void)
{
size_t i;
line_t *l = lines;
+ mtag_t tag;
register INT32 s;
fixed_t strength; // frontside texture offset controls magnitude
fixed_t friction; // friction value to be applied during movement
INT32 movefactor; // applied to each player move to simulate inertia
+ TAG_ITER_DECLARECOUNTER(0);
for (i = 0; i < numlines; i++, l++)
if (l->special == 540)
{
+ tag = Tag_FGet(&l->tags);
strength = sides[l->sidenum[0]].textureoffset>>FRACBITS;
if (strength > 0) // sludge
strength = strength*2; // otherwise, the maximum sludginess value is +967...
@@ -8488,7 +8369,7 @@ static void P_SpawnFriction(void)
else
movefactor = FRACUNIT;
- for (s = -1; (s = P_FindSectorFromTag(l->tag, s)) >= 0 ;)
+ TAG_ITER_SECTORS(0, tag, s)
Add_Friction(friction, movefactor, s, -1);
}
}
@@ -9004,22 +8885,26 @@ static void P_SpawnPushers(void)
{
size_t i;
line_t *l = lines;
+ mtag_t tag;
register INT32 s;
mobj_t *thing;
+ TAG_ITER_DECLARECOUNTER(0);
for (i = 0; i < numlines; i++, l++)
+ {
+ tag = Tag_FGet(&l->tags);
switch (l->special)
{
case 541: // wind
- for (s = -1; (s = P_FindSectorFromTag(l->tag, s)) >= 0 ;)
+ TAG_ITER_SECTORS(0, tag, s)
Add_Pusher(p_wind, l->dx, l->dy, NULL, s, -1, l->flags & ML_NOCLIMB, l->flags & ML_EFFECT4);
break;
case 544: // current
- for (s = -1; (s = P_FindSectorFromTag(l->tag, s)) >= 0 ;)
+ TAG_ITER_SECTORS(0, tag, s)
Add_Pusher(p_current, l->dx, l->dy, NULL, s, -1, l->flags & ML_NOCLIMB, l->flags & ML_EFFECT4);
break;
case 547: // push/pull
- for (s = -1; (s = P_FindSectorFromTag(l->tag, s)) >= 0 ;)
+ TAG_ITER_SECTORS(0, tag, s)
{
thing = P_GetPushThing(s);
if (thing) // No MT_P* means no effect
@@ -9027,20 +8912,21 @@ static void P_SpawnPushers(void)
}
break;
case 545: // current up
- for (s = -1; (s = P_FindSectorFromTag(l->tag, s)) >= 0 ;)
+ TAG_ITER_SECTORS(0, tag, s)
Add_Pusher(p_upcurrent, l->dx, l->dy, NULL, s, -1, l->flags & ML_NOCLIMB, l->flags & ML_EFFECT4);
break;
case 546: // current down
- for (s = -1; (s = P_FindSectorFromTag(l->tag, s)) >= 0 ;)
+ TAG_ITER_SECTORS(0, tag, s)
Add_Pusher(p_downcurrent, l->dx, l->dy, NULL, s, -1, l->flags & ML_NOCLIMB, l->flags & ML_EFFECT4);
break;
case 542: // wind up
- for (s = -1; (s = P_FindSectorFromTag(l->tag, s)) >= 0 ;)
+ TAG_ITER_SECTORS(0, tag, s)
Add_Pusher(p_upwind, l->dx, l->dy, NULL, s, -1, l->flags & ML_NOCLIMB, l->flags & ML_EFFECT4);
break;
case 543: // wind down
- for (s = -1; (s = P_FindSectorFromTag(l->tag, s)) >= 0 ;)
+ TAG_ITER_SECTORS(0, tag, s)
Add_Pusher(p_downwind, l->dx, l->dy, NULL, s, -1, l->flags & ML_NOCLIMB, l->flags & ML_EFFECT4);
break;
}
+ }
}
diff --git a/src/p_spec.h b/src/p_spec.h
index 596d8171d2acfb8b8b337f8a4fc4c686f2d3ce9b..bba7c4a40a090084cce1f9738dc414c5a0c1c013 100644
--- a/src/p_spec.h
+++ b/src/p_spec.h
@@ -55,9 +55,6 @@ fixed_t P_FindNextLowestFloor(sector_t *sec, fixed_t currentheight);
fixed_t P_FindLowestCeilingSurrounding(sector_t *sec);
fixed_t P_FindHighestCeilingSurrounding(sector_t *sec);
-INT32 P_FindSectorFromTag(INT16 tag, INT32 start);
-INT32 P_FindSpecialLineFromTag(INT16 special, INT16 tag, INT32 start);
-
INT32 P_FindMinSurroundingLight(sector_t *sector, INT32 max);
void P_SetupSignExit(player_t *player);
@@ -67,7 +64,6 @@ void P_SwitchWeather(INT32 weathernum);
boolean P_RunTriggerLinedef(line_t *triggerline, mobj_t *actor, sector_t *caller);
void P_LinedefExecute(INT16 tag, mobj_t *actor, sector_t *caller);
-void P_ChangeSectorTag(UINT32 sector, INT16 newtag);
void P_RunNightserizeExecutors(mobj_t *actor);
void P_RunDeNightserizeExecutors(mobj_t *actor);
void P_RunNightsLapExecutors(mobj_t *actor);
diff --git a/src/p_tick.c b/src/p_tick.c
index f84ae96c0b5d860dfe26447c0403676536453fec..c0a1c5700727eecd19ce386d7ea0e708cb28a8bb 100644
--- a/src/p_tick.c
+++ b/src/p_tick.c
@@ -21,6 +21,8 @@
#include "m_random.h"
#include "lua_script.h"
#include "lua_hook.h"
+#include "m_perfstats.h"
+#include "i_system.h" // I_GetPreciseTime
// Object place
#include "m_cheat.h"
@@ -321,6 +323,7 @@ static inline void P_RunThinkers(void)
size_t i;
for (i = 0; i < NUM_THINKERLISTS; i++)
{
+ ps_thlist_times[i] = I_GetPreciseTime();
for (currentthinker = thlist[i].next; currentthinker != &thlist[i]; currentthinker = currentthinker->next)
{
#ifdef PARANOIA
@@ -328,6 +331,7 @@ static inline void P_RunThinkers(void)
#endif
currentthinker->function.acp1(currentthinker);
}
+ ps_thlist_times[i] = I_GetPreciseTime() - ps_thlist_times[i];
}
}
@@ -639,13 +643,26 @@ void P_Ticker(boolean run)
if (demorecording)
G_WriteDemoTiccmd(&players[consoleplayer].cmd, 0);
if (demoplayback)
- G_ReadDemoTiccmd(&players[consoleplayer].cmd, 0);
+ {
+ player_t* p = &players[consoleplayer];
+ G_ReadDemoTiccmd(&p->cmd, 0);
+ if (!cv_freedemocamera.value)
+ {
+ P_ForceLocalAngle(p, p->cmd.angleturn << 16);
+ localaiming = p->aiming;
+ }
+ }
+
+ ps_lua_mobjhooks = 0;
+ ps_checkposition_calls = 0;
LUAh_PreThinkFrame();
+ ps_playerthink_time = I_GetPreciseTime();
for (i = 0; i < MAXPLAYERS; i++)
if (playeringame[i] && players[i].mo && !P_MobjWasRemoved(players[i].mo))
P_PlayerThink(&players[i]);
+ ps_playerthink_time = I_GetPreciseTime() - ps_playerthink_time;
}
// Keep track of how long they've been playing!
@@ -660,14 +677,18 @@ void P_Ticker(boolean run)
if (run)
{
+ ps_thinkertime = I_GetPreciseTime();
P_RunThinkers();
+ ps_thinkertime = I_GetPreciseTime() - ps_thinkertime;
// Run any "after all the other thinkers" stuff
for (i = 0; i < MAXPLAYERS; i++)
if (playeringame[i] && players[i].mo && !P_MobjWasRemoved(players[i].mo))
P_PlayerAfterThink(&players[i]);
+ ps_lua_thinkframe_time = I_GetPreciseTime();
LUAh_ThinkFrame();
+ ps_lua_thinkframe_time = I_GetPreciseTime() - ps_lua_thinkframe_time;
}
// Run shield positioning
diff --git a/src/p_user.c b/src/p_user.c
index b8e7d174653e8e6f9f3bc5a95088dbed167130db..4413cc6cdfe583ddf18c3ada79ed8c4a6a39bc66 100644
--- a/src/p_user.c
+++ b/src/p_user.c
@@ -190,7 +190,7 @@ fixed_t P_ReturnThrustY(mobj_t *mo, angle_t angle, fixed_t move)
boolean P_AutoPause(void)
{
// Don't pause even on menu-up or focus-lost in netgames or record attack
- if (netgame || modeattacking || gamestate == GS_TITLESCREEN)
+ if (netgame || modeattacking || gamestate == GS_TITLESCREEN || (marathonmode && gamestate == GS_INTERMISSION))
return false;
return (menuactive || ( window_notinfocus && cv_pauseifunfocused.value ));
@@ -1341,7 +1341,7 @@ void P_DoSuperTransformation(player_t *player, boolean giverings)
// Transformation animation
P_SetPlayerMobjState(player->mo, S_PLAY_SUPER_TRANS1);
- if (giverings)
+ if (giverings && player->rings < 50)
player->rings = 50;
// Just in case.
@@ -1491,10 +1491,10 @@ void P_PlayLivesJingle(player_t *player)
if (player && !P_IsLocalPlayer(player))
return;
- if (use1upSound || cv_1upsound.value)
- S_StartSound(NULL, sfx_oneup);
- else if (mariomode)
+ if (mariomode)
S_StartSound(NULL, sfx_marioa);
+ else if (use1upSound || cv_1upsound.value)
+ S_StartSound(NULL, sfx_oneup);
else
{
P_PlayJingle(player, JT_1UP);
@@ -2029,6 +2029,7 @@ mobj_t *P_SpawnGhostMobj(mobj_t *mobj)
ghost->colorized = mobj->colorized; // alternatively, "true" for sonic advance style colourisation
ghost->angle = (mobj->player ? mobj->player->drawangle : mobj->angle);
+ ghost->rollangle = mobj->rollangle;
ghost->sprite = mobj->sprite;
ghost->sprite2 = mobj->sprite2;
ghost->frame = mobj->frame;
@@ -2328,7 +2329,8 @@ boolean P_PlayerHitFloor(player_t *player, boolean dorollstuff)
P_MobjCheckWater(player->mo);
if (player->pflags & PF_SPINNING)
{
- if (player->mo->state-states != S_PLAY_ROLL && !(player->pflags & PF_STARTDASH))
+ if (!(player->pflags & PF_STARTDASH) && player->panim != PA_ROLL && player->panim != PA_ETC
+ && player->panim != PA_ABILITY && player->panim != PA_ABILITY2)
{
P_SetPlayerMobjState(player->mo, S_PLAY_ROLL);
S_StartSound(player->mo, sfx_spin);
@@ -2564,7 +2566,7 @@ static boolean P_PlayerCanBust(player_t *player, ffloor_t *rover)
}
// Strong abilities can break even FF_STRONGBUST.
- if (player->charability == CA_GLIDEANDCLIMB)
+ if (player->charflags & SF_CANBUSTWALLS)
return true;
if (player->pflags & PF_BOUNCING)
@@ -3214,7 +3216,7 @@ static void P_DoClimbing(player_t *player)
for (rover = glidesector->sector->ffloors; rover; rover = rover->next)
{
- if (!(rover->flags & FF_EXISTS) || !(rover->flags & FF_BLOCKPLAYER) || (rover->flags & FF_BUSTUP))
+ if (!(rover->flags & FF_EXISTS) || !(rover->flags & FF_BLOCKPLAYER) || ((rover->flags & FF_BUSTUP) && (player->charflags & SF_CANBUSTWALLS)))
continue;
floorclimb = true;
@@ -3255,7 +3257,7 @@ static void P_DoClimbing(player_t *player)
// Is there a FOF directly below this one that we can move onto?
for (roverbelow = glidesector->sector->ffloors; roverbelow; roverbelow = roverbelow->next)
{
- if (!(roverbelow->flags & FF_EXISTS) || !(roverbelow->flags & FF_BLOCKPLAYER) || (roverbelow->flags & FF_BUSTUP))
+ if (!(roverbelow->flags & FF_EXISTS) || !(roverbelow->flags & FF_BLOCKPLAYER) || ((rover->flags & FF_BUSTUP) && (player->charflags & SF_CANBUSTWALLS)))
continue;
if (roverbelow == rover)
@@ -3300,7 +3302,7 @@ static void P_DoClimbing(player_t *player)
// Is there a FOF directly below this one that we can move onto?
for (roverbelow = glidesector->sector->ffloors; roverbelow; roverbelow = roverbelow->next)
{
- if (!(roverbelow->flags & FF_EXISTS) || !(roverbelow->flags & FF_BLOCKPLAYER) || (roverbelow->flags & FF_BUSTUP))
+ if (!(roverbelow->flags & FF_EXISTS) || !(roverbelow->flags & FF_BLOCKPLAYER) || ((rover->flags & FF_BUSTUP) && (player->charflags & SF_CANBUSTWALLS)))
continue;
if (roverbelow == rover)
@@ -3357,7 +3359,7 @@ static void P_DoClimbing(player_t *player)
ffloor_t *rover;
for (rover = glidesector->sector->ffloors; rover; rover = rover->next)
{
- if (!(rover->flags & FF_EXISTS) || !(rover->flags & FF_BLOCKPLAYER) || (rover->flags & FF_BUSTUP))
+ if (!(rover->flags & FF_EXISTS) || !(rover->flags & FF_BLOCKPLAYER) || ((rover->flags & FF_BUSTUP) && (player->charflags & SF_CANBUSTWALLS)))
continue;
bottomheight = P_GetFFloorBottomZAt(rover, player->mo->x, player->mo->y);
@@ -3397,7 +3399,7 @@ static void P_DoClimbing(player_t *player)
ffloor_t *rover;
for (rover = glidesector->sector->ffloors; rover; rover = rover->next)
{
- if (!(rover->flags & FF_EXISTS) || !(rover->flags & FF_BLOCKPLAYER) || (rover->flags & FF_BUSTUP))
+ if (!(rover->flags & FF_EXISTS) || !(rover->flags & FF_BLOCKPLAYER) || ((rover->flags & FF_BUSTUP) && (player->charflags & SF_CANBUSTWALLS)))
continue;
topheight = P_GetFFloorTopZAt(rover, player->mo->x, player->mo->y);
@@ -4497,7 +4499,7 @@ void P_DoJump(player_t *player, boolean soundandstate)
if (twodlevel || (player->mo->flags2 & MF2_TWOD))
factor += player->jumpfactor / 10;
- if (player->charflags & SF_MULTIABILITY && player->charability == CA_DOUBLEJUMP)
+ if (player->charflags & SF_MULTIABILITY && player->charability == CA_DOUBLEJUMP && (player->actionspd >> FRACBITS) != -1)
factor -= max(0, player->secondjump * player->jumpfactor / ((player->actionspd >> FRACBITS) + 1)); // Reduce the jump height each time
//if (maptol & TOL_NIGHTS)
@@ -4524,6 +4526,9 @@ void P_DoJump(player_t *player, boolean soundandstate)
player->pflags |= P_GetJumpFlags(player);;
+ if (player->charflags & SF_NOJUMPDAMAGE)
+ player->pflags &= ~PF_SPINNING;
+
if (soundandstate)
{
if (!player->spectator)
@@ -4835,6 +4840,8 @@ void P_DoJumpShield(player_t *player)
}
#undef limitangle
#undef numangles
+ player->pflags &= ~PF_NOJUMPDAMAGE;
+ P_SetPlayerMobjState(player->mo, S_PLAY_ROLL);
S_StartSound(player->mo, sfx_s3k45);
}
else
@@ -4873,22 +4880,28 @@ void P_DoBubbleBounce(player_t *player)
//
void P_DoAbilityBounce(player_t *player, boolean changemomz)
{
- fixed_t prevmomz;
if (player->mo->state-states == S_PLAY_BOUNCE_LANDING)
return;
+
if (changemomz)
{
- fixed_t minmomz;
- prevmomz = player->mo->momz;
+ fixed_t prevmomz = player->mo->momz, minmomz;
+
if (P_MobjFlip(player->mo)*prevmomz < 0)
prevmomz = 0;
else if (player->mo->eflags & MFE_UNDERWATER)
prevmomz /= 2;
+
P_DoJump(player, false);
player->pflags &= ~(PF_STARTJUMP|PF_JUMPED);
minmomz = FixedMul(player->mo->momz, 3*FRACUNIT/2);
- player->mo->momz = max(minmomz, (minmomz + prevmomz)/2);
+
+ if (player->mo->eflags & MFE_VERTICALFLIP) // Use "min" or "max" depending on if the player is flipped
+ player->mo->momz = min(minmomz, (minmomz + prevmomz)/2);
+ else
+ player->mo->momz = max(minmomz, (minmomz + prevmomz)/2);
}
+
S_StartSound(player->mo, sfx_boingf);
P_SetPlayerMobjState(player->mo, S_PLAY_BOUNCE_LANDING);
player->pflags |= PF_BOUNCING|PF_THOKKED;
@@ -5006,6 +5019,120 @@ static void P_DoTwinSpin(player_t *player)
P_SetPlayerMobjState(player->mo, S_PLAY_TWINSPIN);
}
+//
+// returns true if the player used a shield ability, false otherwise
+// passing in the mobjs from P_DoJumpStuff is a bit hackily specific, but I don't care enough to make a more elaborate solution (I think that is more appropriately approached with a more general MT_LOCKON spawning system)
+//
+static boolean P_PlayerShieldThink(player_t *player, ticcmd_t *cmd, mobj_t *lockonthok, mobj_t *visual)
+{
+ mobj_t *lockonshield = NULL;
+
+ if ((player->powers[pw_shield] & SH_NOSTACK) && !player->powers[pw_super] && !(player->pflags & PF_SPINDOWN)
+ && ((!(player->pflags & PF_THOKKED) || (((player->powers[pw_shield] & SH_NOSTACK) == SH_BUBBLEWRAP || (player->powers[pw_shield] & SH_NOSTACK) == SH_ATTRACT) && player->secondjump == UINT8_MAX) ))) // thokked is optional if you're bubblewrapped / 3dblasted
+ {
+ if ((player->powers[pw_shield] & SH_NOSTACK) == SH_ATTRACT && !(player->charflags & SF_NOSHIELDABILITY))
+ {
+ if ((lockonshield = P_LookForEnemies(player, false, false)))
+ {
+ if (P_IsLocalPlayer(player)) // Only display it on your own view.
+ {
+ boolean dovis = true;
+ if (lockonshield == lockonthok)
+ {
+ if (leveltime & 2)
+ dovis = false;
+ else if (visual)
+ P_RemoveMobj(visual);
+ }
+ if (dovis)
+ {
+ visual = P_SpawnMobj(lockonshield->x, lockonshield->y, lockonshield->z, MT_LOCKON); // positioning, flip handled in P_SceneryThinker
+ P_SetTarget(&visual->target, lockonshield);
+ P_SetMobjStateNF(visual, visual->info->spawnstate+1);
+ }
+ }
+ }
+ }
+ if ((!(player->charflags & SF_NOSHIELDABILITY)) && (cmd->buttons & BT_SPIN && !LUAh_ShieldSpecial(player))) // Spin button effects
+ {
+ // Force stop
+ if ((player->powers[pw_shield] & ~(SH_FORCEHP|SH_STACK)) == SH_FORCE)
+ {
+ player->pflags |= PF_THOKKED|PF_SHIELDABILITY;
+ player->mo->momx = player->mo->momy = player->mo->momz = 0;
+ S_StartSound(player->mo, sfx_ngskid);
+ }
+ else
+ {
+ switch (player->powers[pw_shield] & SH_NOSTACK)
+ {
+ // Whirlwind jump/Thunder jump
+ case SH_WHIRLWIND:
+ case SH_THUNDERCOIN:
+ P_DoJumpShield(player);
+ break;
+ // Armageddon pow
+ case SH_ARMAGEDDON:
+ player->pflags |= PF_THOKKED|PF_SHIELDABILITY;
+ P_BlackOw(player);
+ break;
+ // Attraction blast
+ case SH_ATTRACT:
+ player->pflags |= PF_THOKKED|PF_SHIELDABILITY;
+ player->homing = 2;
+ P_SetTarget(&player->mo->target, P_SetTarget(&player->mo->tracer, lockonshield));
+ if (lockonshield)
+ {
+ player->mo->angle = R_PointToAngle2(player->mo->x, player->mo->y, lockonshield->x, lockonshield->y);
+ player->pflags &= ~PF_NOJUMPDAMAGE;
+ P_SetPlayerMobjState(player->mo, S_PLAY_ROLL);
+ S_StartSound(player->mo, sfx_s3k40);
+ player->homing = 3*TICRATE;
+ }
+ else
+ S_StartSound(player->mo, sfx_s3ka6);
+ break;
+ // Elemental stomp/Bubble bounce
+ case SH_ELEMENTAL:
+ case SH_BUBBLEWRAP:
+ {
+ boolean elem = ((player->powers[pw_shield] & SH_NOSTACK) == SH_ELEMENTAL);
+ player->pflags |= PF_THOKKED|PF_SHIELDABILITY;
+ if (elem)
+ {
+ player->mo->momx = player->mo->momy = 0;
+ S_StartSound(player->mo, sfx_s3k43);
+ }
+ else
+ {
+ player->mo->momx -= (player->mo->momx/3);
+ player->mo->momy -= (player->mo->momy/3);
+ player->pflags &= ~PF_NOJUMPDAMAGE;
+ P_SetPlayerMobjState(player->mo, S_PLAY_ROLL);
+ S_StartSound(player->mo, sfx_s3k44);
+ }
+ player->secondjump = 0;
+ P_SetObjectMomZ(player->mo, -24*FRACUNIT, false);
+ break;
+ }
+ // Flame burst
+ case SH_FLAMEAURA:
+ player->pflags |= PF_THOKKED|PF_SHIELDABILITY;
+ P_Thrust(player->mo, player->mo->angle, FixedMul(30*FRACUNIT - FixedSqrt(FixedDiv(player->speed, player->mo->scale)), player->mo->scale));
+ player->drawangle = player->mo->angle;
+ player->pflags &= ~PF_NOJUMPDAMAGE;
+ P_SetPlayerMobjState(player->mo, S_PLAY_ROLL);
+ S_StartSound(player->mo, sfx_s3k43);
+ default:
+ break;
+ }
+ }
+ }
+ return player->pflags & PF_SHIELDABILITY;
+ }
+ return false;
+}
+
//
// P_DoJumpStuff
//
@@ -5013,7 +5140,7 @@ static void P_DoTwinSpin(player_t *player)
//
static void P_DoJumpStuff(player_t *player, ticcmd_t *cmd)
{
- mobj_t *lockonthok = NULL, *lockonshield = NULL, *visual = NULL;
+ mobj_t *lockonthok = NULL, *visual = NULL;
if (player->pflags & PF_JUMPSTASIS)
return;
@@ -5040,106 +5167,8 @@ static void P_DoJumpStuff(player_t *player, ticcmd_t *cmd)
;
else if (player->pflags & (PF_GLIDING|PF_SLIDING|PF_SHIELDABILITY)) // If the player has used an ability previously
;
- else if ((player->powers[pw_shield] & SH_NOSTACK) && !player->powers[pw_super] && !(player->pflags & PF_SPINDOWN)
- && ((!(player->pflags & PF_THOKKED) || ((player->powers[pw_shield] & SH_NOSTACK) == SH_BUBBLEWRAP && player->secondjump == UINT8_MAX)))) // thokked is optional if you're bubblewrapped
- {
- if ((player->powers[pw_shield] & SH_NOSTACK) == SH_ATTRACT)
- {
- if ((lockonshield = P_LookForEnemies(player, false, false)))
- {
- if (P_IsLocalPlayer(player)) // Only display it on your own view.
- {
- boolean dovis = true;
- if (lockonshield == lockonthok)
- {
- if (leveltime & 2)
- dovis = false;
- else if (visual)
- P_RemoveMobj(visual);
- }
- if (dovis)
- {
- visual = P_SpawnMobj(lockonshield->x, lockonshield->y, lockonshield->z, MT_LOCKON); // positioning, flip handled in P_SceneryThinker
- P_SetTarget(&visual->target, lockonshield);
- P_SetMobjStateNF(visual, visual->info->spawnstate+1);
- }
- }
- }
- }
- if (cmd->buttons & BT_SPIN && !LUAh_ShieldSpecial(player)) // Spin button effects
- {
- // Force stop
- if ((player->powers[pw_shield] & ~(SH_FORCEHP|SH_STACK)) == SH_FORCE)
- {
- player->pflags |= PF_THOKKED|PF_SHIELDABILITY;
- player->mo->momx = player->mo->momy = player->mo->momz = 0;
- S_StartSound(player->mo, sfx_ngskid);
- }
- else
- {
- switch (player->powers[pw_shield] & SH_NOSTACK)
- {
- // Whirlwind jump/Thunder jump
- case SH_WHIRLWIND:
- case SH_THUNDERCOIN:
- P_DoJumpShield(player);
- break;
- // Armageddon pow
- case SH_ARMAGEDDON:
- player->pflags |= PF_THOKKED|PF_SHIELDABILITY;
- P_BlackOw(player);
- break;
- // Attraction blast
- case SH_ATTRACT:
- player->pflags |= PF_THOKKED|PF_SHIELDABILITY;
- player->homing = 2;
- P_SetTarget(&player->mo->target, P_SetTarget(&player->mo->tracer, lockonshield));
- if (lockonshield)
- {
- player->mo->angle = R_PointToAngle2(player->mo->x, player->mo->y, lockonshield->x, lockonshield->y);
- player->pflags &= ~PF_NOJUMPDAMAGE;
- P_SetPlayerMobjState(player->mo, S_PLAY_ROLL);
- S_StartSound(player->mo, sfx_s3k40);
- player->homing = 3*TICRATE;
- }
- else
- S_StartSound(player->mo, sfx_s3ka6);
- break;
- // Elemental stomp/Bubble bounce
- case SH_ELEMENTAL:
- case SH_BUBBLEWRAP:
- {
- boolean elem = ((player->powers[pw_shield] & SH_NOSTACK) == SH_ELEMENTAL);
- player->pflags |= PF_THOKKED|PF_SHIELDABILITY;
- if (elem)
- {
- player->mo->momx = player->mo->momy = 0;
- S_StartSound(player->mo, sfx_s3k43);
- }
- else
- {
- player->mo->momx -= (player->mo->momx/3);
- player->mo->momy -= (player->mo->momy/3);
- player->pflags &= ~PF_NOJUMPDAMAGE;
- P_SetPlayerMobjState(player->mo, S_PLAY_ROLL);
- S_StartSound(player->mo, sfx_s3k44);
- }
- player->secondjump = 0;
- P_SetObjectMomZ(player->mo, -24*FRACUNIT, false);
- break;
- }
- // Flame burst
- case SH_FLAMEAURA:
- player->pflags |= PF_THOKKED|PF_SHIELDABILITY;
- P_Thrust(player->mo, player->mo->angle, FixedMul(30*FRACUNIT - FixedSqrt(FixedDiv(player->speed, player->mo->scale)), player->mo->scale));
- player->drawangle = player->mo->angle;
- S_StartSound(player->mo, sfx_s3k43);
- default:
- break;
- }
- }
- }
- }
+ else if (P_PlayerShieldThink(player, cmd, lockonthok, visual))
+ ;
else if ((cmd->buttons & BT_SPIN))
{
if (!(player->pflags & PF_SPINDOWN) && P_SuperReady(player))
@@ -5472,7 +5501,7 @@ static void P_DoJumpStuff(player_t *player, ticcmd_t *cmd)
break;
}
}
- else if ((player->powers[pw_shield] & SH_NOSTACK) == SH_WHIRLWIND && !player->powers[pw_super])
+ else if ((!(player->charflags & SF_NOSHIELDABILITY)) && ((player->powers[pw_shield] & SH_NOSTACK) == SH_WHIRLWIND && !player->powers[pw_super] && !LUAh_ShieldSpecial(player)))
P_DoJumpShield(player);
}
@@ -5484,6 +5513,8 @@ static void P_DoJumpStuff(player_t *player, ticcmd_t *cmd)
{
if (!P_HomingAttack(player->mo, player->mo->tracer))
{
+ player->pflags &= ~PF_SHIELDABILITY;
+ player->secondjump = UINT8_MAX;
P_SetObjectMomZ(player->mo, 6*FRACUNIT, false);
if (player->mo->eflags & MFE_UNDERWATER)
player->mo->momz = FixedMul(player->mo->momz, FRACUNIT/3);
@@ -7731,6 +7762,11 @@ void P_ElementalFire(player_t *player, boolean cropcircle)
flame->eflags = (flame->eflags & ~MFE_VERTICALFLIP)|(player->mo->eflags & MFE_VERTICALFLIP);
P_InstaThrust(flame, flame->angle, FixedMul(3*FRACUNIT, flame->scale));
P_SetObjectMomZ(flame, 3*FRACUNIT, false);
+ if (!(gametyperules & GTR_FRIENDLY))
+ {
+ P_SetMobjState(flame, S_TEAM_SPINFIRE1);
+ flame->color = player->mo->color;
+ }
}
#undef limitangle
#undef numangles
@@ -7758,6 +7794,11 @@ void P_ElementalFire(player_t *player, boolean cropcircle)
flame->destscale = player->mo->scale;
P_SetScale(flame, player->mo->scale);
flame->eflags = (flame->eflags & ~MFE_VERTICALFLIP)|(player->mo->eflags & MFE_VERTICALFLIP);
+ if (!(gametyperules & GTR_FRIENDLY))
+ {
+ P_SetMobjState(flame, S_TEAM_SPINFIRE1);
+ flame->color = player->mo->color;
+ }
flame->momx = 8; // this is a hack which is used to ensure it still behaves as a missile and can damage others
P_XYMovement(flame);
@@ -8584,12 +8625,6 @@ void P_MovePlayer(player_t *player)
player->climbing--;
}
- if (!player->climbing)
- {
- player->lastsidehit = -1;
- player->lastlinehit = -1;
- }
-
// Make sure you're not teetering when you shouldn't be.
if (player->panim == PA_EDGE
&& (player->mo->momx || player->mo->momy || player->mo->momz))
@@ -8614,41 +8649,47 @@ void P_MovePlayer(player_t *player)
P_DoFiring(player, cmd);
{
+ boolean atspinheight = false;
fixed_t oldheight = player->mo->height;
+ fixed_t luaheight = LUAh_PlayerHeight(player);
+ if (luaheight != -1)
+ {
+ player->mo->height = luaheight;
+ if (luaheight <= P_GetPlayerSpinHeight(player))
+ atspinheight = true; // spinning will not save you from being crushed
+ }
// Less height while spinning. Good for spinning under things...?
- if ((player->mo->state == &states[player->mo->info->painstate])
- || ((player->pflags & PF_JUMPED) && !(player->pflags & PF_NOJUMPDAMAGE))
- || (player->pflags & PF_SPINNING)
- || player->powers[pw_tailsfly] || player->pflags & PF_GLIDING
- || (player->charability == CA_GLIDEANDCLIMB && player->mo->state-states == S_PLAY_GLIDE_LANDING)
- || (player->charability == CA_FLY && player->mo->state-states == S_PLAY_FLY_TIRED))
+ else if (P_PlayerShouldUseSpinHeight(player))
+ {
player->mo->height = P_GetPlayerSpinHeight(player);
+ atspinheight = true;
+ }
else
player->mo->height = P_GetPlayerHeight(player);
if (player->mo->eflags & MFE_VERTICALFLIP && player->mo->height != oldheight) // adjust z height for reverse gravity, similar to how it's done for scaling
player->mo->z -= player->mo->height - oldheight;
- }
- // Crush test...
- if ((player->mo->ceilingz - player->mo->floorz < player->mo->height)
- && !(player->mo->flags & MF_NOCLIP))
- {
- if ((player->charability2 == CA2_SPINDASH) && !(player->pflags & PF_SPINNING))
+ // Crush test...
+ if ((player->mo->ceilingz - player->mo->floorz < player->mo->height)
+ && !(player->mo->flags & MF_NOCLIP))
{
- player->pflags |= PF_SPINNING;
- P_SetPlayerMobjState(player->mo, S_PLAY_ROLL);
- }
- else if (player->mo->ceilingz - player->mo->floorz < player->mo->height)
- {
- if ((netgame || multiplayer) && player->spectator)
- P_DamageMobj(player->mo, NULL, NULL, 1, DMG_SPECTATOR); // Respawn crushed spectators
- else
- P_DamageMobj(player->mo, NULL, NULL, 1, DMG_CRUSHED);
+ if (!atspinheight)
+ {
+ player->pflags |= PF_SPINNING;
+ P_SetPlayerMobjState(player->mo, S_PLAY_ROLL);
+ }
+ else if (player->mo->ceilingz - player->mo->floorz < player->mo->height)
+ {
+ if ((netgame || multiplayer) && player->spectator)
+ P_DamageMobj(player->mo, NULL, NULL, 1, DMG_SPECTATOR); // Respawn crushed spectators
+ else
+ P_DamageMobj(player->mo, NULL, NULL, 1, DMG_CRUSHED);
- if (player->playerstate == PST_DEAD)
- return;
+ if (player->playerstate == PST_DEAD)
+ return;
+ }
}
}
@@ -8675,12 +8716,6 @@ void P_MovePlayer(player_t *player)
player->fovadd = 0;
#endif
-#ifdef FLOORSPLATS
- if (cv_shadow.value && rendermode == render_soft)
- R_AddFloorSplat(player->mo->subsector, player->mo, "SHADOW", player->mo->x,
- player->mo->y, player->mo->floorz, SPLATDRAWMODE_OPAQUE);
-#endif
-
// Look for blocks to bust up
// Because of FF_SHATTER, we should look for blocks constantly,
// not just when spinning or playing as Knuckles
@@ -9631,45 +9666,45 @@ static CV_PossibleValue_t rotation_cons_t[] = {{1, "MIN"}, {25, "MAX"}, {0, NULL
static CV_PossibleValue_t CV_CamRotate[] = {{-720, "MIN"}, {720, "MAX"}, {0, NULL}};
static CV_PossibleValue_t multiplier_cons_t[] = {{0, "MIN"}, {3*FRACUNIT, "MAX"}, {0, NULL}};
-consvar_t cv_cam_dist = {"cam_curdist", "160", CV_FLOAT, NULL, NULL, 0, NULL, NULL, 0, 0, NULL};
-consvar_t cv_cam_height = {"cam_curheight", "25", CV_FLOAT, NULL, NULL, 0, NULL, NULL, 0, 0, NULL};
-consvar_t cv_cam_still = {"cam_still", "Off", 0, CV_OnOff, NULL, 0, NULL, NULL, 0, 0, NULL};
-consvar_t cv_cam_speed = {"cam_speed", "0.3", CV_FLOAT|CV_SAVE, CV_CamSpeed, NULL, 0, NULL, NULL, 0, 0, NULL};
-consvar_t cv_cam_rotate = {"cam_rotate", "0", CV_CALL|CV_NOINIT, CV_CamRotate, CV_CamRotate_OnChange, 0, NULL, NULL, 0, 0, NULL};
-consvar_t cv_cam_rotspeed = {"cam_rotspeed", "10", CV_SAVE, rotation_cons_t, NULL, 0, NULL, NULL, 0, 0, NULL};
-consvar_t cv_cam_turnmultiplier = {"cam_turnmultiplier", "1.0", CV_FLOAT|CV_SAVE, multiplier_cons_t, NULL, 0, NULL, NULL, 0, 0, NULL};
-consvar_t cv_cam_orbit = {"cam_orbit", "Off", CV_SAVE, CV_OnOff, NULL, 0, NULL, NULL, 0, 0, NULL};
-consvar_t cv_cam_adjust = {"cam_adjust", "On", CV_SAVE, CV_OnOff, NULL, 0, NULL, NULL, 0, 0, NULL};
-consvar_t cv_cam2_dist = {"cam2_curdist", "160", CV_FLOAT, NULL, NULL, 0, NULL, NULL, 0, 0, NULL};
-consvar_t cv_cam2_height = {"cam2_curheight", "25", CV_FLOAT, NULL, NULL, 0, NULL, NULL, 0, 0, NULL};
-consvar_t cv_cam2_still = {"cam2_still", "Off", 0, CV_OnOff, NULL, 0, NULL, NULL, 0, 0, NULL};
-consvar_t cv_cam2_speed = {"cam2_speed", "0.3", CV_FLOAT|CV_SAVE, CV_CamSpeed, NULL, 0, NULL, NULL, 0, 0, NULL};
-consvar_t cv_cam2_rotate = {"cam2_rotate", "0", CV_CALL|CV_NOINIT, CV_CamRotate, CV_CamRotate2_OnChange, 0, NULL, NULL, 0, 0, NULL};
-consvar_t cv_cam2_rotspeed = {"cam2_rotspeed", "10", CV_SAVE, rotation_cons_t, NULL, 0, NULL, NULL, 0, 0, NULL};
-consvar_t cv_cam2_turnmultiplier = {"cam2_turnmultiplier", "1.0", CV_FLOAT|CV_SAVE, multiplier_cons_t, NULL, 0, NULL, NULL, 0, 0, NULL};
-consvar_t cv_cam2_orbit = {"cam2_orbit", "Off", CV_SAVE, CV_OnOff, NULL, 0, NULL, NULL, 0, 0, NULL};
-consvar_t cv_cam2_adjust = {"cam2_adjust", "On", CV_SAVE, CV_OnOff, NULL, 0, NULL, NULL, 0, 0, NULL};
+consvar_t cv_cam_dist = CVAR_INIT ("cam_curdist", "160", CV_FLOAT, NULL, NULL);
+consvar_t cv_cam_height = CVAR_INIT ("cam_curheight", "25", CV_FLOAT, NULL, NULL);
+consvar_t cv_cam_still = CVAR_INIT ("cam_still", "Off", 0, CV_OnOff, NULL);
+consvar_t cv_cam_speed = CVAR_INIT ("cam_speed", "0.3", CV_FLOAT|CV_SAVE, CV_CamSpeed, NULL);
+consvar_t cv_cam_rotate = CVAR_INIT ("cam_rotate", "0", CV_CALL|CV_NOINIT, CV_CamRotate, CV_CamRotate_OnChange);
+consvar_t cv_cam_rotspeed = CVAR_INIT ("cam_rotspeed", "10", CV_SAVE, rotation_cons_t, NULL);
+consvar_t cv_cam_turnmultiplier = CVAR_INIT ("cam_turnmultiplier", "1.0", CV_FLOAT|CV_SAVE, multiplier_cons_t, NULL);
+consvar_t cv_cam_orbit = CVAR_INIT ("cam_orbit", "Off", CV_SAVE, CV_OnOff, NULL);
+consvar_t cv_cam_adjust = CVAR_INIT ("cam_adjust", "On", CV_SAVE, CV_OnOff, NULL);
+consvar_t cv_cam2_dist = CVAR_INIT ("cam2_curdist", "160", CV_FLOAT, NULL, NULL);
+consvar_t cv_cam2_height = CVAR_INIT ("cam2_curheight", "25", CV_FLOAT, NULL, NULL);
+consvar_t cv_cam2_still = CVAR_INIT ("cam2_still", "Off", 0, CV_OnOff, NULL);
+consvar_t cv_cam2_speed = CVAR_INIT ("cam2_speed", "0.3", CV_FLOAT|CV_SAVE, CV_CamSpeed, NULL);
+consvar_t cv_cam2_rotate = CVAR_INIT ("cam2_rotate", "0", CV_CALL|CV_NOINIT, CV_CamRotate, CV_CamRotate2_OnChange);
+consvar_t cv_cam2_rotspeed = CVAR_INIT ("cam2_rotspeed", "10", CV_SAVE, rotation_cons_t, NULL);
+consvar_t cv_cam2_turnmultiplier = CVAR_INIT ("cam2_turnmultiplier", "1.0", CV_FLOAT|CV_SAVE, multiplier_cons_t, NULL);
+consvar_t cv_cam2_orbit = CVAR_INIT ("cam2_orbit", "Off", CV_SAVE, CV_OnOff, NULL);
+consvar_t cv_cam2_adjust = CVAR_INIT ("cam2_adjust", "On", CV_SAVE, CV_OnOff, NULL);
// [standard vs simple][p1 or p2]
consvar_t cv_cam_savedist[2][2] = {
{ // standard
- {"cam_dist", "160", CV_FLOAT|CV_SAVE|CV_CALL, NULL, CV_UpdateCamDist, 0, NULL, NULL, 0, 0, NULL},
- {"cam2_dist", "160", CV_FLOAT|CV_SAVE|CV_CALL, NULL, CV_UpdateCam2Dist, 0, NULL, NULL, 0, 0, NULL}
+ CVAR_INIT ("cam_dist", "160", CV_FLOAT|CV_SAVE|CV_CALL, NULL, CV_UpdateCamDist),
+ CVAR_INIT ("cam2_dist", "160", CV_FLOAT|CV_SAVE|CV_CALL, NULL, CV_UpdateCam2Dist),
},
{ // simple
- {"cam_simpledist", "224", CV_FLOAT|CV_SAVE|CV_CALL, NULL, CV_UpdateCamDist, 0, NULL, NULL, 0, 0, NULL},
- {"cam2_simpledist", "224", CV_FLOAT|CV_SAVE|CV_CALL, NULL, CV_UpdateCam2Dist, 0, NULL, NULL, 0, 0, NULL}
+ CVAR_INIT ("cam_simpledist", "224", CV_FLOAT|CV_SAVE|CV_CALL, NULL, CV_UpdateCamDist),
+ CVAR_INIT ("cam2_simpledist", "224", CV_FLOAT|CV_SAVE|CV_CALL, NULL, CV_UpdateCam2Dist),
}
};
consvar_t cv_cam_saveheight[2][2] = {
{ // standard
- {"cam_height", "25", CV_FLOAT|CV_SAVE|CV_CALL, NULL, CV_UpdateCamDist, 0, NULL, NULL, 0, 0, NULL},
- {"cam2_height", "25", CV_FLOAT|CV_SAVE|CV_CALL, NULL, CV_UpdateCam2Dist, 0, NULL, NULL, 0, 0, NULL}
+ CVAR_INIT ("cam_height", "25", CV_FLOAT|CV_SAVE|CV_CALL, NULL, CV_UpdateCamDist),
+ CVAR_INIT ("cam2_height", "25", CV_FLOAT|CV_SAVE|CV_CALL, NULL, CV_UpdateCam2Dist),
},
{ // simple
- {"cam_simpleheight", "48", CV_FLOAT|CV_SAVE|CV_CALL, NULL, CV_UpdateCamDist, 0, NULL, NULL, 0, 0, NULL},
- {"cam2_simpleheight", "48", CV_FLOAT|CV_SAVE|CV_CALL, NULL, CV_UpdateCam2Dist, 0, NULL, NULL, 0, 0, NULL}
+ CVAR_INIT ("cam_simpleheight", "48", CV_FLOAT|CV_SAVE|CV_CALL, NULL, CV_UpdateCamDist),
+ CVAR_INIT ("cam2_simpleheight", "48", CV_FLOAT|CV_SAVE|CV_CALL, NULL, CV_UpdateCam2Dist),
}
};
@@ -10562,6 +10597,7 @@ static void P_CalcPostImg(player_t *player)
postimg_t *type;
INT32 *param;
fixed_t pviewheight;
+ size_t i;
if (player->mo->eflags & MFE_VERTICALFLIP)
pviewheight = player->mo->z + player->mo->height - player->viewheight;
@@ -10586,28 +10622,45 @@ static void P_CalcPostImg(player_t *player)
}
// see if we are in heat (no, not THAT kind of heat...)
-
- if (P_FindSpecialLineFromTag(13, sector->tag, -1) != -1)
- *type = postimg_heat;
- else if (sector->ffloors)
+ for (i = 0; i < sector->tags.count; i++)
{
- ffloor_t *rover;
- fixed_t topheight;
- fixed_t bottomheight;
-
- for (rover = sector->ffloors; rover; rover = rover->next)
+ if (Tag_FindLineSpecial(13, sector->tags.tags[i]) != -1)
{
- if (!(rover->flags & FF_EXISTS))
- continue;
+ *type = postimg_heat;
+ break;
+ }
+ else if (sector->ffloors)
+ {
+ ffloor_t *rover;
+ fixed_t topheight;
+ fixed_t bottomheight;
+ boolean gotres = false;
- topheight = P_GetFFloorTopZAt (rover, player->mo->x, player->mo->y);
- bottomheight = P_GetFFloorBottomZAt(rover, player->mo->x, player->mo->y);
+ for (rover = sector->ffloors; rover; rover = rover->next)
+ {
+ size_t j;
- if (pviewheight >= topheight || pviewheight <= bottomheight)
- continue;
+ if (!(rover->flags & FF_EXISTS))
+ continue;
- if (P_FindSpecialLineFromTag(13, rover->master->frontsector->tag, -1) != -1)
- *type = postimg_heat;
+ topheight = P_GetFFloorTopZAt (rover, player->mo->x, player->mo->y);
+ bottomheight = P_GetFFloorBottomZAt(rover, player->mo->x, player->mo->y);
+
+ if (pviewheight >= topheight || pviewheight <= bottomheight)
+ continue;
+
+ for (j = 0; j < rover->master->frontsector->tags.count; j++)
+ {
+ if (Tag_FindLineSpecial(13, rover->master->frontsector->tags.tags[j]) != -1)
+ {
+ *type = postimg_heat;
+ gotres = true;
+ break;
+ }
+ }
+ }
+ if (gotres)
+ break;
}
}
@@ -10706,22 +10759,21 @@ static sector_t *P_GetMinecartSector(fixed_t x, fixed_t y, fixed_t z, fixed_t *n
static INT32 P_GetMinecartSpecialLine(sector_t *sec)
{
INT32 line = -1;
+ size_t i;
if (!sec)
return line;
- if (sec->tag != 0)
- line = P_FindSpecialLineFromTag(16, sec->tag, -1);
+ for (i = 0; i < sec->tags.count; i++)
+ if (sec->tags.tags[i] != 0)
+ line = Tag_FindLineSpecial(16, sec->tags.tags[i]);
// Also try for lines facing the sector itself, with tag 0.
+ for (i = 0; i < sec->linecount; i++)
{
- UINT32 i;
- for (i = 0; i < sec->linecount; i++)
- {
- line_t *li = sec->lines[i];
- if (li->tag == 0 && li->special == 16 && li->frontsector == sec)
- line = li - lines;
- }
+ line_t *li = sec->lines[i];
+ if (Tag_Find(&li->tags, 0) && li->special == 16 && li->frontsector == sec)
+ line = li - lines;
}
return line;
@@ -11190,6 +11242,8 @@ static void P_DoTailsOverlay(player_t *player, mobj_t *tails)
chosenstate = S_TAILSOVERLAY_GASP;
else if (player->mo->state-states == S_PLAY_EDGE)
chosenstate = S_TAILSOVERLAY_EDGE;
+ else if (player->panim == PA_DASH)
+ chosenstate = S_TAILSOVERLAY_DASH;
else if (player->panim == PA_RUN)
chosenstate = S_TAILSOVERLAY_RUN;
else if (player->panim == PA_WALK)
@@ -11310,7 +11364,7 @@ static void P_DoMetalJetFume(player_t *player, mobj_t *fume)
angle_t angle = player->drawangle;
fixed_t dist;
panim_t panim = player->panim;
- tic_t dashmode = player->dashmode;
+ tic_t dashmode = min(player->dashmode, DASHMODE_MAX);
boolean underwater = mo->eflags & MFE_UNDERWATER;
statenum_t stat = fume->state-states;
@@ -11448,7 +11502,6 @@ void P_PlayerThink(player_t *player)
}
}
-#ifdef SEENAMES
if (netgame && player == &players[displayplayer] && !(leveltime % (TICRATE/5)))
{
seenplayer = NULL;
@@ -11473,7 +11526,6 @@ void P_PlayerThink(player_t *player)
}
}
}
-#endif
if (player->awayviewmobj && P_MobjWasRemoved(player->awayviewmobj))
{
@@ -12278,12 +12330,14 @@ void P_PlayerThink(player_t *player)
sector_t *controlsec;
for (j=0; j<numsectors; j++)
{
+ mtag_t sectag = Tag_FGet(§ors[j].tags);
controlsec = NULL;
// Does this sector have a water linedef?
for (i=0; i<numlines;i++)
{
+ mtag_t linetag = Tag_FGet(&lines[i].tags);
if ((lines[i].special == 121 || lines[i].special == 123)
- && lines[i].tag == sectors[j].tag)
+ && linetag == sectag)
{
controlsec = lines[i].frontsector;
break;
@@ -12292,15 +12346,16 @@ void P_PlayerThink(player_t *player)
if (i < numlines && controlsec)
{
+ controlsectag = Tag_FGet(&controlsec->tags);
// Does this sector have a colormap?
for (i=0; i<numlines;i++)
{
- if (lines[i].special == 606 && lines[i].tag == controlsec->tag)
+ if (lines[i].special == 606 && linetag == controlsectag)
break;
}
if (i == numlines)
- CONS_Debug(DBG_GAMELOGIC, "%d, %d\n", j, sectors[j].tag);
+ CONS_Debug(DBG_GAMELOGIC, "%d, %d\n", j, sectag);
}
}
@@ -12541,13 +12596,16 @@ void P_PlayerAfterThink(player_t *player)
player->powers[pw_carry] = CR_NONE;
else
{
- P_TryMove(player->mo, tails->x + P_ReturnThrustX(tails, tails->player->drawangle, 4*FRACUNIT), tails->y + P_ReturnThrustY(tails, tails->player->drawangle, 4*FRACUNIT), true);
+ if (tails->player)
+ P_TryMove(player->mo, tails->x + P_ReturnThrustX(tails, tails->player->drawangle, 4*FRACUNIT), tails->y + P_ReturnThrustY(tails, tails->player->drawangle, 4*FRACUNIT), true);
+ else
+ P_TryMove(player->mo, tails->x + P_ReturnThrustX(tails, tails->angle, 4*FRACUNIT), tails->y + P_ReturnThrustY(tails, tails->angle, 4*FRACUNIT), true);
player->mo->momx = tails->momx;
player->mo->momy = tails->momy;
player->mo->momz = tails->momz;
}
- if (G_CoopGametype() && (!tails->player || tails->player->bot != 1))
+ if (G_CoopGametype() && tails->player && tails->player->bot != 1)
{
player->mo->angle = tails->angle;
@@ -12562,7 +12620,7 @@ void P_PlayerAfterThink(player_t *player)
{
if (player->mo->state-states != S_PLAY_RIDE)
P_SetPlayerMobjState(player->mo, S_PLAY_RIDE);
- if ((tails->skin && ((skin_t *)(tails->skin))->sprites[SPR2_SWIM].numframes) && (tails->eflags & MFE_UNDERWATER))
+ if (tails->player && (tails->skin && ((skin_t *)(tails->skin))->sprites[SPR2_SWIM].numframes) && (tails->eflags & MFE_UNDERWATER))
tails->player->powers[pw_tailsfly] = 0;
}
else
@@ -12897,3 +12955,33 @@ boolean P_PlayerFullbright(player_t *player)
|| !(player->mo->state >= &states[S_PLAY_NIGHTS_TRANS1]
&& player->mo->state < &states[S_PLAY_NIGHTS_TRANS6])))); // Note the < instead of <=
}
+
+#define JUMPCURLED(player) ((player->pflags & PF_JUMPED)\
+ && (!(player->charflags & SF_NOJUMPSPIN))\
+ && (player->panim == PA_JUMP || player->panim == PA_ROLL))\
+
+// returns true if the player can enter a sector that they could not if standing at their skin's full height
+boolean P_PlayerCanEnterSpinGaps(player_t *player)
+{
+ UINT8 canEnter = LUAh_PlayerCanEnterSpinGaps(player);
+ if (canEnter == 1)
+ return true;
+ else if (canEnter == 2)
+ return false;
+
+ return ((player->pflags & (PF_SPINNING|PF_GLIDING)) // players who are spinning or gliding
+ || (player->charability == CA_GLIDEANDCLIMB && player->mo->state-states == S_PLAY_GLIDE_LANDING) // players who are landing from a glide
+ || JUMPCURLED(player)); // players who are jumpcurled, but only if they would normally jump that way
+}
+
+// returns true if the player should use their skin's spinheight instead of their skin's height
+boolean P_PlayerShouldUseSpinHeight(player_t *player)
+{
+ return ((player->pflags & (PF_SPINNING|PF_GLIDING))
+ || (player->mo->state == &states[player->mo->info->painstate])
+ || (player->panim == PA_ROLL)
+ || ((player->powers[pw_tailsfly] || (player->charability == CA_FLY && player->mo->state-states == S_PLAY_FLY_TIRED))
+ && !(player->charflags & SF_NOJUMPSPIN))
+ || (player->charability == CA_GLIDEANDCLIMB && player->mo->state-states == S_PLAY_GLIDE_LANDING)
+ || JUMPCURLED(player));
+}
diff --git a/src/r_bsp.c b/src/r_bsp.c
index a430ef04069446eb0aee9452e6acb737ae4332f5..6f2a90d2d5e6c8642b4dc0eded0d47afb189012b 100644
--- a/src/r_bsp.c
+++ b/src/r_bsp.c
@@ -21,6 +21,7 @@
#include "p_local.h" // camera
#include "p_slopes.h"
#include "z_zone.h" // Check R_Prep3DFloors
+#include "taglist.h"
seg_t *curline;
side_t *sidedef;
@@ -374,7 +375,7 @@ boolean R_IsEmptyLine(seg_t *line, sector_t *front, sector_t *back)
// Consider colormaps
&& back->extra_colormap == front->extra_colormap
&& ((!front->ffloors && !back->ffloors)
- || front->tag == back->tag));
+ || Tag_Compare(&front->tags, &back->tags)));
}
//
@@ -448,21 +449,25 @@ static void R_AddLine(seg_t *line)
// Portal line
if (line->linedef->special == 40 && line->side == 0)
{
+ // Render portal if recursiveness limit hasn't been reached.
+ // Otherwise, render the wall normally.
if (portalrender < cv_maxportals.value)
{
- // Find the other side!
- INT32 line2 = P_FindSpecialLineFromTag(40, line->linedef->tag, -1);
- if (line->linedef == &lines[line2])
- line2 = P_FindSpecialLineFromTag(40, line->linedef->tag, line2);
- if (line2 >= 0) // found it!
+ size_t p;
+ mtag_t tag = Tag_FGet(&line->linedef->tags);
+ INT32 li1 = line->linedef-lines;
+ INT32 li2;
+
+ for (p = 0; (li2 = Tag_Iterate_Lines(tag, p)) >= 0; p++)
{
- Portal_Add2Lines(line->linedef-lines, line2, x1, x2); // Remember the lines for later rendering
- //return; // Don't fill in that space now!
+ // Skip invalid lines.
+ if ((tag != Tag_FGet(&lines[li2].tags)) || (lines[li1].special != lines[li2].special) || (li1 == li2))
+ continue;
+
+ Portal_Add2Lines(li1, li2, x1, x2);
goto clipsolid;
}
}
- // Recursed TOO FAR (viewing a portal within a portal)
- // So uhhh, render it as a normal wall instead or something ???
}
// Single sided line?
@@ -483,7 +488,7 @@ static void R_AddLine(seg_t *line)
if (!line->polyseg &&
!line->sidedef->midtexture
&& ((!frontsector->ffloors && !backsector->ffloors)
- || (frontsector->tag == backsector->tag)))
+ || Tag_Compare(&frontsector->tags, &backsector->tags)))
return; // line is empty, don't even bother
goto clippass; // treat like wide open window instead
@@ -799,7 +804,7 @@ static void R_AddPolyObjects(subsector_t *sub)
}
// for render stats
- rs_numpolyobjects += numpolys;
+ ps_numpolyobjects += numpolys;
// sort polyobjects
R_SortPolyObjects(sub);
@@ -1048,11 +1053,6 @@ static void R_Subsector(size_t num)
}
}
-#ifdef FLOORSPLATS
- if (sub->splats)
- R_AddVisibleFloorSplats(sub);
-#endif
-
// killough 9/18/98: Fix underwater slowdown, by passing real sector
// instead of fake one. Improve sprite lighting by basing sprite
// lightlevels on floor & ceiling lightlevels in the surrounding area.
@@ -1239,7 +1239,7 @@ void R_RenderBSPNode(INT32 bspnum)
node_t *bsp;
INT32 side;
- rs_numbspcalls++;
+ ps_numbspcalls++;
while (!(bspnum & NF_SUBSECTOR)) // Found a subsector?
{
diff --git a/src/r_data.c b/src/r_data.c
index dd36c2ee28623ce1ce16aa49709196009702e08b..2cfe9cb7ace3139d40a32a9d8dd0ba21afa9b794 100644
--- a/src/r_data.c
+++ b/src/r_data.c
@@ -2,7 +2,7 @@
//-----------------------------------------------------------------------------
// Copyright (C) 1993-1996 by id Software, Inc.
// Copyright (C) 1998-2000 by DooM Legacy Team.
-// Copyright (C) 1999-2020 by Sonic Team Junior.
+// Copyright (C) 1999-2021 by Sonic Team Junior.
//
// This program is free software distributed under the
// terms of the GNU General Public License, version 2.
@@ -20,6 +20,7 @@
#include "m_misc.h"
#include "r_data.h"
#include "r_textures.h"
+#include "r_patch.h"
#include "r_picformats.h"
#include "w_wad.h"
#include "z_zone.h"
@@ -29,10 +30,6 @@
#include "byteptr.h"
#include "dehacked.h"
-#ifdef _WIN32
-#include <malloc.h> // alloca(sizeof)
-#endif
-
//
// Graphics.
// SRB2 graphics for walls and sprites
@@ -174,13 +171,15 @@ UINT8 ASTBlendPaletteIndexes(UINT8 background, UINT8 foreground, int style, UINT
if (alpha <= ASTTextureBlendingThreshold[1])
{
UINT8 *mytransmap;
+ INT32 trans;
// Is the patch way too translucent? Don't blend then.
if (alpha < ASTTextureBlendingThreshold[0])
return background;
// The equation's not exact but it works as intended. I'll call it a day for now.
- mytransmap = transtables + ((8*(alpha) + 255/8)/(255 - 255/11) << FF_TRANSSHIFT);
+ trans = (8*(alpha) + 255/8)/(255 - 255/11);
+ mytransmap = R_GetTranslucencyTable(trans + 1);
if (background != 0xFF)
return *(mytransmap + (background<<8) + foreground);
}
@@ -1307,7 +1306,7 @@ void R_PrecacheLevel(void)
lump = sf->lumppat[a];\
if (devparm)\
spritememory += W_LumpLength(lump);\
- W_CachePatchNum(lump, PU_PATCH);\
+ W_CachePatchNum(lump, PU_SPRITE);\
}
// see R_InitSprites for more about lumppat,lumpid
switch (sf->rotate)
diff --git a/src/r_defs.h b/src/r_defs.h
index 132106bc88c0dd0b28d93fb0cf24e51947bf804d..9c649fbc4508bf148787566eb6692f6111d24706 100644
--- a/src/r_defs.h
+++ b/src/r_defs.h
@@ -28,6 +28,8 @@
#include "m_aatree.h"
#endif
+#include "taglist.h"
+
//
// ClipWallSegment
// Clips the given range of columns
@@ -281,8 +283,7 @@ typedef struct sector_s
INT32 ceilingpic;
INT16 lightlevel;
INT16 special;
- UINT16 tag;
- INT32 nexttag, firsttag; // for fast tag searches
+ taglist_t tags;
// origin for any sounds played by the sector
// also considered the center for e.g. Mario blocks
@@ -389,7 +390,7 @@ typedef struct line_s
// Animation related.
INT16 flags;
INT16 special;
- INT16 tag;
+ taglist_t tags;
INT32 args[NUMLINEARGS];
char *stringargs[NUMLINESTRINGARGS];
@@ -409,10 +410,6 @@ typedef struct line_s
sector_t *backsector;
size_t validcount; // if == validcount, already checked
-#if 1//#ifdef WALLSPLATS
- void *splats; // wallsplat_t list
-#endif
- INT32 firsttag, nexttag; // improves searches for tags.
polyobj_t *polyobj; // Belongs to a polyobject?
char *text; // a concatenation of all front and back texture names, for linedef specials that require a string.
@@ -457,9 +454,6 @@ typedef struct subsector_s
INT16 numlines;
UINT16 firstline;
struct polyobj_s *polyList; // haleyjd 02/19/06: list of polyobjects
-#if 1//#ifdef FLOORSPLATS
- void *splats; // floorsplat_t list
-#endif
size_t validcount;
} subsector_t;
@@ -652,8 +646,12 @@ typedef enum
RGBA32 = 4, // 32 bit rgba
} pic_mode_t;
-#if defined(_MSC_VER)
-#pragma pack(1)
+#ifdef ROTSPRITE
+typedef struct
+{
+ INT32 angles;
+ void **patches;
+} rotsprite_t;
#endif
// Patches.
@@ -661,7 +659,26 @@ typedef enum
// Patches are used for sprites and all masked pictures, and we compose
// textures from the TEXTURES list of patches.
//
-// WARNING: this structure is cloned in GLPatch_t
+typedef struct
+{
+ INT16 width, height;
+ INT16 leftoffset, topoffset;
+
+ INT32 *columnofs; // Column offsets. This is relative to patch->columns
+ UINT8 *columns; // Software column data
+
+ void *hardware; // OpenGL patch, allocated whenever necessary
+ void *flats[4]; // The patch as flats
+
+#ifdef ROTSPRITE
+ rotsprite_t *rotated; // Rotated patches
+#endif
+} patch_t;
+
+#if defined(_MSC_VER)
+#pragma pack(1)
+#endif
+
typedef struct
{
INT16 width; // bounding box size
@@ -670,7 +687,7 @@ typedef struct
INT16 topoffset; // pixels below the origin
INT32 columnofs[8]; // only [width] used
// the [0] is &columnofs[width]
-} ATTRPACK patch_t;
+} ATTRPACK softwarepatch_t;
#ifdef _MSC_VER
#pragma warning(disable : 4200)
@@ -696,14 +713,32 @@ typedef struct
#pragma pack()
#endif
-// rotsprite
-#ifdef ROTSPRITE
-typedef struct
+typedef enum
{
- patch_t *patch[16][ROTANGLES];
- UINT16 cached;
-} rotsprite_t;
-#endif/*ROTSPRITE*/
+ RF_HORIZONTALFLIP = 0x0001, // Flip sprite horizontally
+ RF_VERTICALFLIP = 0x0002, // Flip sprite vertically
+ RF_ABSOLUTEOFFSETS = 0x0004, // Sprite uses the object's offsets absolutely, instead of relatively
+ RF_FLIPOFFSETS = 0x0008, // Relative object offsets are flipped with the sprite
+
+ RF_SPLATMASK = 0x00F0, // --Floor sprite flags
+ RF_SLOPESPLAT = 0x0010, // Rotate floor sprites by a slope
+ RF_OBJECTSLOPESPLAT = 0x0020, // Rotate floor sprites by the object's standing slope
+ RF_NOSPLATBILLBOARD = 0x0040, // Don't billboard floor sprites (faces forward from the view angle)
+ RF_NOSPLATROLLANGLE = 0x0080, // Don't rotate floor sprites by the object's rollangle (uses rotated patches instead)
+
+ RF_BLENDMASK = 0x0F00, // --Blending modes
+ RF_FULLBRIGHT = 0x0100, // Sprite is drawn at full brightness
+ RF_FULLDARK = 0x0200, // Sprite is drawn completely dark
+ RF_NOCOLORMAPS = 0x0400, // Sprite is not drawn with colormaps
+
+ RF_SPRITETYPEMASK = 0x7000, // ---Different sprite types
+ RF_PAPERSPRITE = 0x1000, // Paper sprite
+ RF_FLOORSPRITE = 0x2000, // Floor sprite
+
+ RF_SHADOWDRAW = 0x10000, // Stretches and skews the sprite like a shadow.
+ RF_SHADOWEFFECTS = 0x20000, // Scales and becomes transparent like a shadow.
+ RF_DROPSHADOW = (RF_SHADOWDRAW | RF_SHADOWEFFECTS | RF_FULLDARK),
+} renderflags_t;
typedef enum
{
@@ -717,24 +752,6 @@ typedef enum
SRF_NONE = 0xff // Initial value
} spriterotateflags_t; // SRF's up!
-// Same as a patch_t, except just the header
-// and the wadnum/lumpnum combination that points
-// to wherever the patch is in memory.
-struct patchinfo_s
-{
- INT16 width; // bounding box size
- INT16 height;
- INT16 leftoffset; // pixels to the left of origin
- INT16 topoffset; // pixels below the origin
-
- UINT16 wadnum; // the software patch lump num for when the patch
- UINT16 lumpnum; // was flushed, and we need to re-create it
-
- // next patchinfo_t in memory
- struct patchinfo_s *next;
-};
-typedef struct patchinfo_s patchinfo_t;
-
//
// Sprites are patches with a special naming convention so they can be
// recognized by R_InitSprites.
@@ -764,7 +781,7 @@ typedef struct
UINT16 flip;
#ifdef ROTSPRITE
- rotsprite_t rotsprite;
+ rotsprite_t *rotated[2][16]; // Rotated patches
#endif
} spriteframe_t;
diff --git a/src/r_draw.c b/src/r_draw.c
index 2b798c3bf383c42d22e99674e1ceb4521a85c352..9a835ee5840c7e087256109f87ffef9f01bcf22c 100644
--- a/src/r_draw.c
+++ b/src/r_draw.c
@@ -2,7 +2,7 @@
//-----------------------------------------------------------------------------
// Copyright (C) 1993-1996 by id Software, Inc.
// Copyright (C) 1998-2000 by DooM Legacy Team.
-// Copyright (C) 1999-2020 by Sonic Team Junior.
+// Copyright (C) 1999-2021 by Sonic Team Junior.
//
// This program is free software distributed under the
// terms of the GNU General Public License, version 2.
@@ -75,6 +75,7 @@ UINT8 *dc_source;
#define NUMTRANSTABLES 9 // how many translucency tables are used
UINT8 *transtables; // translucency tables
+UINT8 *blendtables[NUMBLENDMAPS];
/** \brief R_DrawTransColumn uses this
*/
@@ -98,15 +99,19 @@ INT32 dc_numlights = 0, dc_maxlights, dc_texheight;
INT32 ds_y, ds_x1, ds_x2;
lighttable_t *ds_colormap;
+lighttable_t *ds_translation; // Lactozilla: Sprite splat drawer
+
fixed_t ds_xfrac, ds_yfrac, ds_xstep, ds_ystep;
+INT32 ds_waterofs, ds_bgofs;
+
UINT16 ds_flatwidth, ds_flatheight;
boolean ds_powersoftwo;
-UINT8 *ds_source; // start of a 64*64 tile image
+UINT8 *ds_source; // points to the start of a flat
UINT8 *ds_transmap; // one of the translucency tables
-pslope_t *ds_slope; // Current slope being used
-floatv3_t ds_su[MAXVIDHEIGHT], ds_sv[MAXVIDHEIGHT], ds_sz[MAXVIDHEIGHT]; // Vectors for... stuff?
+// Vectors for Software's tilted slope drawers
+floatv3_t *ds_su, *ds_sv, *ds_sz;
floatv3_t *ds_sup, *ds_svp, *ds_szp;
float focallengthf, zeroheight;
@@ -115,10 +120,6 @@ float focallengthf, zeroheight;
UINT32 nflatxshift, nflatyshift, nflatshiftup, nflatmask;
-// ==========================================================================
-// OLD DOOM FUZZY EFFECT
-// ==========================================================================
-
// =========================================================================
// TRANSLATION COLORMAP CODE
// =========================================================================
@@ -133,19 +134,51 @@ UINT32 nflatxshift, nflatyshift, nflatshiftup, nflatmask;
#define DEFAULT_STARTTRANSCOLOR 96
#define NUM_PALETTE_ENTRIES 256
-static UINT8** translationtablecache[MAXSKINS + 7] = {NULL};
+static UINT8 **translationtablecache[MAXSKINS + 7] = {NULL};
UINT8 skincolor_modified[MAXSKINCOLORS];
-CV_PossibleValue_t Color_cons_t[MAXSKINCOLORS+1];
+static INT32 SkinToCacheIndex(INT32 skinnum)
+{
+ switch (skinnum)
+ {
+ case TC_DEFAULT: return DEFAULT_TT_CACHE_INDEX;
+ case TC_BOSS: return BOSS_TT_CACHE_INDEX;
+ case TC_METALSONIC: return METALSONIC_TT_CACHE_INDEX;
+ case TC_ALLWHITE: return ALLWHITE_TT_CACHE_INDEX;
+ case TC_RAINBOW: return RAINBOW_TT_CACHE_INDEX;
+ case TC_BLINK: return BLINK_TT_CACHE_INDEX;
+ case TC_DASHMODE: return DASHMODE_TT_CACHE_INDEX;
+ default: break;
+ }
+
+ return skinnum;
+}
+
+static INT32 CacheIndexToSkin(INT32 ttc)
+{
+ switch (ttc)
+ {
+ case DEFAULT_TT_CACHE_INDEX: return TC_DEFAULT;
+ case BOSS_TT_CACHE_INDEX: return TC_BOSS;
+ case METALSONIC_TT_CACHE_INDEX: return TC_METALSONIC;
+ case ALLWHITE_TT_CACHE_INDEX: return TC_ALLWHITE;
+ case RAINBOW_TT_CACHE_INDEX: return TC_RAINBOW;
+ case BLINK_TT_CACHE_INDEX: return TC_BLINK;
+ case DASHMODE_TT_CACHE_INDEX: return TC_DASHMODE;
+ default: break;
+ }
-/** \brief The R_InitTranslationTables
+ return ttc;
+}
- load in color translation tables
+CV_PossibleValue_t Color_cons_t[MAXSKINCOLORS+1];
+
+/** \brief Initializes the translucency tables used by the Software renderer.
*/
-void R_InitTranslationTables(void)
+void R_InitTranslucencyTables(void)
{
- // Load here the transparency lookup tables 'TINTTAB'
- // NOTE: the TINTTAB resource MUST BE aligned on 64k for the asm
+ // Load here the transparency lookup tables 'TRANSx0'
+ // NOTE: the TRANSx0 resources MUST BE aligned on 64k for the asm
// optimised code (in other words, transtables pointer low word is 0)
transtables = Z_MallocAlign(NUMTRANSTABLES*0x10000, PU_STATIC,
NULL, 16);
@@ -159,17 +192,190 @@ void R_InitTranslationTables(void)
W_ReadLump(W_GetNumForName("TRANS70"), transtables+0x60000);
W_ReadLump(W_GetNumForName("TRANS80"), transtables+0x70000);
W_ReadLump(W_GetNumForName("TRANS90"), transtables+0x80000);
+
+ R_GenerateBlendTables();
}
+static colorlookup_t transtab_lut;
-/** \brief Generates a translation colormap.
+static void BlendTab_Translucent(UINT8 *table, int style, UINT8 blendamt)
+{
+ INT16 bg, fg;
- \param dest_colormap colormap to populate
- \param skinnum number of skin, TC_DEFAULT or TC_BOSS
- \param color translation color
+ if (table == NULL)
+ I_Error("BlendTab_Translucent: input table was NULL!");
- \return void
-*/
+ for (bg = 0; bg < 0xFF; bg++)
+ {
+ for (fg = 0; fg < 0xFF; fg++)
+ {
+ RGBA_t backrgba = V_GetMasterColor(bg);
+ RGBA_t frontrgba = V_GetMasterColor(fg);
+ RGBA_t result;
+
+ result.rgba = ASTBlendPixel(backrgba, frontrgba, style, 0xFF);
+ result.rgba = ASTBlendPixel(result, frontrgba, AST_TRANSLUCENT, blendamt);
+
+ table[((bg * 0x100) + fg)] = GetColorLUT(&transtab_lut, result.s.red, result.s.green, result.s.blue);
+ }
+ }
+}
+
+static void BlendTab_Subtractive(UINT8 *table, int style, UINT8 blendamt)
+{
+ INT16 bg, fg;
+
+ if (table == NULL)
+ I_Error("BlendTab_Subtractive: input table was NULL!");
+
+ if (blendamt == 0xFF)
+ {
+ memset(table, GetColorLUT(&transtab_lut, 0, 0, 0), 0x10000);
+ return;
+ }
+
+ for (bg = 0; bg < 0xFF; bg++)
+ {
+ for (fg = 0; fg < 0xFF; fg++)
+ {
+ RGBA_t backrgba = V_GetMasterColor(bg);
+ RGBA_t frontrgba = V_GetMasterColor(fg);
+ RGBA_t result;
+
+ result.rgba = ASTBlendPixel(backrgba, frontrgba, style, 0xFF);
+ result.s.red = max(0, result.s.red - blendamt);
+ result.s.green = max(0, result.s.green - blendamt);
+ result.s.blue = max(0, result.s.blue - blendamt);
+
+ table[((bg * 0x100) + fg)] = GetColorLUT(&transtab_lut, result.s.red, result.s.green, result.s.blue);
+ }
+ }
+}
+
+static void BlendTab_Modulative(UINT8 *table)
+{
+ INT16 bg, fg;
+
+ if (table == NULL)
+ I_Error("BlendTab_Modulative: input table was NULL!");
+
+ for (bg = 0; bg < 0xFF; bg++)
+ {
+ for (fg = 0; fg < 0xFF; fg++)
+ {
+ RGBA_t backrgba = V_GetMasterColor(bg);
+ RGBA_t frontrgba = V_GetMasterColor(fg);
+ RGBA_t result;
+ result.rgba = ASTBlendPixel(backrgba, frontrgba, AST_MODULATE, 0);
+ table[((bg * 0x100) + fg)] = GetColorLUT(&transtab_lut, result.s.red, result.s.green, result.s.blue);
+ }
+ }
+}
+
+static INT32 BlendTab_Count[NUMBLENDMAPS] =
+{
+ NUMTRANSTABLES+1, // blendtab_add
+ NUMTRANSTABLES+1, // blendtab_subtract
+ NUMTRANSTABLES+1, // blendtab_reversesubtract
+ 1 // blendtab_modulate
+};
+
+static INT32 BlendTab_FromStyle[] =
+{
+ 0, // AST_COPY
+ 0, // AST_TRANSLUCENT
+ blendtab_add, // AST_ADD
+ blendtab_subtract, // AST_SUBTRACT
+ blendtab_reversesubtract, // AST_REVERSESUBTRACT
+ blendtab_modulate, // AST_MODULATE
+ 0 // AST_OVERLAY
+};
+
+static void BlendTab_GenerateMaps(INT32 tab, INT32 style, void (*genfunc)(UINT8 *, int, UINT8))
+{
+ INT32 i = 0, num = BlendTab_Count[tab];
+ const float amtmul = (256.0f / (float)(NUMTRANSTABLES + 1));
+ for (; i < num; i++)
+ {
+ const size_t offs = (0x10000 * i);
+ const UINT16 alpha = min(amtmul * i, 0xFF);
+ genfunc(blendtables[tab] + offs, style, alpha);
+ }
+}
+
+void R_GenerateBlendTables(void)
+{
+ INT32 i;
+
+ for (i = 0; i < NUMBLENDMAPS; i++)
+ blendtables[i] = Z_MallocAlign(BlendTab_Count[i] * 0x10000, PU_STATIC, NULL, 16);
+
+ InitColorLUT(&transtab_lut, pMasterPalette, false);
+
+ // Additive
+ BlendTab_GenerateMaps(blendtab_add, AST_ADD, BlendTab_Translucent);
+
+ // Subtractive
+#if 1
+ BlendTab_GenerateMaps(blendtab_subtract, AST_SUBTRACT, BlendTab_Subtractive);
+#else
+ BlendTab_GenerateMaps(blendtab_subtract, AST_SUBTRACT, BlendTab_Translucent);
+#endif
+
+ // Reverse subtractive
+ BlendTab_GenerateMaps(blendtab_reversesubtract, AST_REVERSESUBTRACT, BlendTab_Translucent);
+
+ // Modulative blending only requires a single table
+ BlendTab_Modulative(blendtables[blendtab_modulate]);
+}
+
+#define ClipBlendLevel(style, trans) max(min((trans), BlendTab_Count[BlendTab_FromStyle[style]]-1), 0)
+#define ClipTransLevel(trans) max(min((trans), NUMTRANSMAPS-2), 0)
+
+UINT8 *R_GetTranslucencyTable(INT32 alphalevel)
+{
+ return transtables + (ClipTransLevel(alphalevel-1) << FF_TRANSSHIFT);
+}
+
+UINT8 *R_GetBlendTable(int style, INT32 alphalevel)
+{
+ size_t offs;
+
+ if (style == AST_COPY || style == AST_OVERLAY)
+ return NULL;
+
+ offs = (ClipBlendLevel(style, alphalevel) << FF_TRANSSHIFT);
+
+ // Lactozilla: Returns the equivalent to AST_TRANSLUCENT
+ // if no alpha style matches any of the blend tables.
+ switch (style)
+ {
+ case AST_ADD:
+ return blendtables[blendtab_add] + offs;
+ case AST_SUBTRACT:
+ return blendtables[blendtab_subtract] + offs;
+ case AST_REVERSESUBTRACT:
+ return blendtables[blendtab_reversesubtract] + offs;
+ case AST_MODULATE:
+ return blendtables[blendtab_modulate];
+ default:
+ break;
+ }
+
+ // Return a normal translucency table
+ if (--alphalevel >= 0)
+ return transtables + (ClipTransLevel(alphalevel) << FF_TRANSSHIFT);
+ else
+ return NULL;
+}
+
+boolean R_BlendLevelVisible(INT32 blendmode, INT32 alphalevel)
+{
+ if (blendmode == AST_COPY || blendmode == AST_SUBTRACT || blendmode == AST_MODULATE || blendmode == AST_OVERLAY)
+ return true;
+
+ return (alphalevel < BlendTab_Count[BlendTab_FromStyle[blendmode]]);
+}
// Define for getting accurate color brightness readings according to how the human eye sees them.
// https://en.wikipedia.org/wiki/Relative_luminance
@@ -227,6 +433,14 @@ static void R_RainbowColormap(UINT8 *dest_colormap, UINT16 skincolor)
#undef SETBRIGHTNESS
+/** \brief Generates a translation colormap.
+
+ \param dest_colormap colormap to populate
+ \param skinnum skin number, or a translation mode
+ \param color translation color
+
+ \return void
+*/
static void R_GenerateTranslationColormap(UINT8 *dest_colormap, INT32 skinnum, UINT16 color)
{
INT32 i, starttranscolor, skinramplength;
@@ -326,6 +540,9 @@ static void R_GenerateTranslationColormap(UINT8 *dest_colormap, INT32 skinnum, U
if (color >= numskincolors)
I_Error("Invalid skin color #%hu.", (UINT16)color);
+ if (skinnum < 0 && skinnum > TC_DEFAULT)
+ I_Error("Invalid translation colormap index %d.", skinnum);
+
starttranscolor = (skinnum != TC_DEFAULT) ? skins[skinnum].starttranscolor : DEFAULT_STARTTRANSCOLOR;
if (starttranscolor >= NUM_PALETTE_ENTRIES)
@@ -362,25 +579,11 @@ static void R_GenerateTranslationColormap(UINT8 *dest_colormap, INT32 skinnum, U
UINT8* R_GetTranslationColormap(INT32 skinnum, skincolornum_t color, UINT8 flags)
{
UINT8* ret;
- INT32 skintableindex;
+ INT32 skintableindex = SkinToCacheIndex(skinnum); // Adjust if we want the default colormap
INT32 i;
- // Adjust if we want the default colormap
- switch (skinnum)
- {
- case TC_DEFAULT: skintableindex = DEFAULT_TT_CACHE_INDEX; break;
- case TC_BOSS: skintableindex = BOSS_TT_CACHE_INDEX; break;
- case TC_METALSONIC: skintableindex = METALSONIC_TT_CACHE_INDEX; break;
- case TC_ALLWHITE: skintableindex = ALLWHITE_TT_CACHE_INDEX; break;
- case TC_RAINBOW: skintableindex = RAINBOW_TT_CACHE_INDEX; break;
- case TC_BLINK: skintableindex = BLINK_TT_CACHE_INDEX; break;
- case TC_DASHMODE: skintableindex = DASHMODE_TT_CACHE_INDEX; break;
- default: skintableindex = skinnum; break;
- }
-
if (flags & GTC_CACHE)
{
-
// Allocate table for skin if necessary
if (!translationtablecache[skintableindex])
translationtablecache[skintableindex] = Z_Calloc(MAXSKINCOLORS * sizeof(UINT8**), PU_STATIC, NULL);
@@ -393,7 +596,8 @@ UINT8* R_GetTranslationColormap(INT32 skinnum, skincolornum_t color, UINT8 flags
{
for (i = 0; i < (INT32)(sizeof(translationtablecache) / sizeof(translationtablecache[0])); i++)
if (translationtablecache[i] && translationtablecache[i][color])
- R_GenerateTranslationColormap(translationtablecache[i][color], i>=MAXSKINS ? MAXSKINS-i-1 : i, color);
+ R_GenerateTranslationColormap(translationtablecache[i][color], CacheIndexToSkin(i), color);
+
skincolor_modified[color] = false;
}
}
diff --git a/src/r_draw.h b/src/r_draw.h
index 1ca22f18aa7f80840c9c367dcb2c0199bb62a5c0..caf43fd89d7ba5451eed376ef08591c71a25efa8 100644
--- a/src/r_draw.h
+++ b/src/r_draw.h
@@ -2,7 +2,7 @@
//-----------------------------------------------------------------------------
// Copyright (C) 1993-1996 by id Software, Inc.
// Copyright (C) 1998-2000 by DooM Legacy Team.
-// Copyright (C) 1999-2020 by Sonic Team Junior.
+// Copyright (C) 1999-2021 by Sonic Team Junior.
//
// This program is free software distributed under the
// terms of the GNU General Public License, version 2.
@@ -37,7 +37,6 @@ extern UINT8 dc_hires;
extern UINT8 *dc_source; // first pixel in a column
// translucency stuff here
-extern UINT8 *transtables; // translucency tables, should be (*transtables)[5][256][256]
extern UINT8 *dc_transmap;
// translation stuff here
@@ -56,9 +55,14 @@ extern INT32 dc_texheight;
extern INT32 ds_y, ds_x1, ds_x2;
extern lighttable_t *ds_colormap;
+extern lighttable_t *ds_translation;
+
extern fixed_t ds_xfrac, ds_yfrac, ds_xstep, ds_ystep;
+extern INT32 ds_waterofs, ds_bgofs;
+
extern UINT16 ds_flatwidth, ds_flatheight;
extern boolean ds_powersoftwo;
+
extern UINT8 *ds_source;
extern UINT8 *ds_transmap;
@@ -66,8 +70,8 @@ typedef struct {
float x, y, z;
} floatv3_t;
-extern pslope_t *ds_slope; // Current slope being used
-extern floatv3_t ds_su[MAXVIDHEIGHT], ds_sv[MAXVIDHEIGHT], ds_sz[MAXVIDHEIGHT]; // Vectors for... stuff?
+// Vectors for Software's tilted slope drawers
+extern floatv3_t *ds_su, *ds_sv, *ds_sz;
extern floatv3_t *ds_sup, *ds_svp, *ds_szp;
extern float focallengthf, zeroheight;
@@ -102,25 +106,49 @@ extern lumpnum_t viewborderlump[8];
#define GTC_CACHE 1
-#define TC_DEFAULT -1
-#define TC_BOSS -2
-#define TC_METALSONIC -3 // For Metal Sonic battle
-#define TC_ALLWHITE -4 // For Cy-Brak-demon
-#define TC_RAINBOW -5 // For single colour
-#define TC_BLINK -6 // For item blinking, according to kart
-#define TC_DASHMODE -7 // For Metal Sonic's dashmode
+enum
+{
+ TC_BOSS = INT8_MIN,
+ TC_METALSONIC, // For Metal Sonic battle
+ TC_ALLWHITE, // For Cy-Brak-demon
+ TC_RAINBOW, // For single colour
+ TC_BLINK, // For item blinking, according to kart
+ TC_DASHMODE, // For Metal Sonic's dashmode
+
+ TC_DEFAULT
+};
+// Custom player skin translation
// Initialize color translation tables, for player rendering etc.
-void R_InitTranslationTables(void);
UINT8* R_GetTranslationColormap(INT32 skinnum, skincolornum_t color, UINT8 flags);
void R_FlushTranslationColormapCache(void);
UINT16 R_GetColorByName(const char *name);
UINT16 R_GetSuperColorByName(const char *name);
+extern UINT8 *transtables; // translucency tables, should be (*transtables)[5][256][256]
+
+enum
+{
+ blendtab_add,
+ blendtab_subtract,
+ blendtab_reversesubtract,
+ blendtab_modulate,
+ NUMBLENDMAPS
+};
+
+extern UINT8 *blendtables[NUMBLENDMAPS];
+
+void R_InitTranslucencyTables(void);
+void R_GenerateBlendTables(void);
+
+UINT8 *R_GetTranslucencyTable(INT32 alphalevel);
+UINT8 *R_GetBlendTable(int style, INT32 alphalevel);
+
+boolean R_BlendLevelVisible(INT32 blendmode, INT32 alphalevel);
+
// Color ramp modification should force a recache
extern UINT8 skincolor_modified[];
-// Custom player skin translation
void R_InitViewBuffer(INT32 width, INT32 height);
void R_InitViewBorder(void);
void R_VideoErase(size_t ofs, INT32 count);
@@ -149,39 +177,47 @@ void R_Draw2sMultiPatchTranslucentColumn_8(void);
void R_DrawFogColumn_8(void);
void R_DrawColumnShadowed_8(void);
+#define PLANELIGHTFLOAT (BASEVIDWIDTH * BASEVIDWIDTH / vid.width / (zeroheight - FIXED_TO_FLOAT(viewz)) / 21.0f * FIXED_TO_FLOAT(fovtan))
+
void R_DrawSpan_8(void);
-void R_DrawSplat_8(void);
void R_DrawTranslucentSpan_8(void);
-void R_DrawTranslucentSplat_8(void);
void R_DrawTiltedSpan_8(void);
void R_DrawTiltedTranslucentSpan_8(void);
-#ifndef NOWATER
-void R_DrawTiltedTranslucentWaterSpan_8(void);
-#endif
+
+void R_DrawSplat_8(void);
+void R_DrawTranslucentSplat_8(void);
void R_DrawTiltedSplat_8(void);
+
+void R_DrawFloorSprite_8(void);
+void R_DrawTranslucentFloorSprite_8(void);
+void R_DrawTiltedFloorSprite_8(void);
+void R_DrawTiltedTranslucentFloorSprite_8(void);
+
void R_CalcTiltedLighting(fixed_t start, fixed_t end);
extern INT32 tiltlighting[MAXVIDWIDTH];
-#ifndef NOWATER
+
void R_DrawTranslucentWaterSpan_8(void);
-extern INT32 ds_bgofs;
-extern INT32 ds_waterofs;
-#endif
+void R_DrawTiltedTranslucentWaterSpan_8(void);
+
void R_DrawFogSpan_8(void);
// Lactozilla: Non-powers-of-two
void R_DrawSpan_NPO2_8(void);
void R_DrawTranslucentSpan_NPO2_8(void);
-void R_DrawSplat_NPO2_8(void);
-void R_DrawTranslucentSplat_NPO2_8(void);
void R_DrawTiltedSpan_NPO2_8(void);
void R_DrawTiltedTranslucentSpan_NPO2_8(void);
-#ifndef NOWATER
-void R_DrawTiltedTranslucentWaterSpan_NPO2_8(void);
-#endif
+
+void R_DrawSplat_NPO2_8(void);
+void R_DrawTranslucentSplat_NPO2_8(void);
void R_DrawTiltedSplat_NPO2_8(void);
-#ifndef NOWATER
+
+void R_DrawFloorSprite_NPO2_8(void);
+void R_DrawTranslucentFloorSprite_NPO2_8(void);
+void R_DrawTiltedFloorSprite_NPO2_8(void);
+void R_DrawTiltedTranslucentFloorSprite_NPO2_8(void);
+
void R_DrawTranslucentWaterSpan_NPO2_8(void);
-#endif
+void R_DrawTiltedTranslucentWaterSpan_NPO2_8(void);
#ifdef USEASM
void ASMCALL R_DrawColumn_8_ASM(void);
diff --git a/src/r_draw8.c b/src/r_draw8.c
index 940ea724b31ef2411514799d4a9f7df7e284c907..1f451115eba2108c59b6188232d5b88bd3aacb74 100644
--- a/src/r_draw8.c
+++ b/src/r_draw8.c
@@ -1,7 +1,7 @@
// SONIC ROBO BLAST 2
//-----------------------------------------------------------------------------
// Copyright (C) 1998-2000 by DooM Legacy Team.
-// Copyright (C) 1999-2020 by Sonic Team Junior.
+// Copyright (C) 1999-2021 by Sonic Team Junior.
//
// This program is free software distributed under the
// terms of the GNU General Public License, version 2.
@@ -536,6 +536,9 @@ void R_DrawTranslatedColumn_8(void)
// SPANS
// ==========================================================================
+#define SPANSIZE 16
+#define INVSPAN 0.0625f
+
/** \brief The R_DrawSpan_8 function
Draws the actual span.
*/
@@ -643,8 +646,6 @@ void R_CalcTiltedLighting(fixed_t start, fixed_t end)
}
}
-#define PLANELIGHTFLOAT (BASEVIDWIDTH * BASEVIDWIDTH / vid.width / (zeroheight - FIXED_TO_FLOAT(viewz)) / 21.0f * FIXED_TO_FLOAT(fovtan))
-
/** \brief The R_DrawTiltedSpan_8 function
Draw slopes! Holy sheit!
*/
@@ -704,9 +705,6 @@ void R_DrawTiltedSpan_8(void)
vz += ds_svp->x;
} while (--width >= 0);
#else
-#define SPANSIZE 16
-#define INVSPAN 0.0625f
-
startz = 1.f/iz;
startu = uz*startz;
startv = vz*startz;
@@ -839,9 +837,6 @@ void R_DrawTiltedTranslucentSpan_8(void)
vz += ds_svp->x;
} while (--width >= 0);
#else
-#define SPANSIZE 16
-#define INVSPAN 0.0625f
-
startz = 1.f/iz;
startu = uz*startz;
startv = vz*startz;
@@ -916,7 +911,6 @@ void R_DrawTiltedTranslucentSpan_8(void)
#endif
}
-#ifndef NOWATER
/** \brief The R_DrawTiltedTranslucentWaterSpan_8 function
Like DrawTiltedTranslucentSpan, but for water
*/
@@ -977,9 +971,6 @@ void R_DrawTiltedTranslucentWaterSpan_8(void)
vz += ds_svp->x;
} while (--width >= 0);
#else
-#define SPANSIZE 16
-#define INVSPAN 0.0625f
-
startz = 1.f/iz;
startu = uz*startz;
startv = vz*startz;
@@ -1053,7 +1044,6 @@ void R_DrawTiltedTranslucentWaterSpan_8(void)
}
#endif
}
-#endif // NOWATER
void R_DrawTiltedSplat_8(void)
{
@@ -1116,9 +1106,6 @@ void R_DrawTiltedSplat_8(void)
vz += ds_svp->x;
} while (--width >= 0);
#else
-#define SPANSIZE 16
-#define INVSPAN 0.0625f
-
startz = 1.f/iz;
startu = uz*startz;
startv = vz*startz;
@@ -1419,6 +1406,438 @@ void R_DrawTranslucentSplat_8 (void)
}
}
+/** \brief The R_DrawFloorSprite_8 function
+ Just like R_DrawSplat_8, but for floor sprites.
+*/
+void R_DrawFloorSprite_8 (void)
+{
+ fixed_t xposition;
+ fixed_t yposition;
+ fixed_t xstep, ystep;
+
+ UINT16 *source;
+ UINT8 *colormap;
+ UINT8 *translation;
+ UINT8 *dest;
+ const UINT8 *deststop = screens[0] + vid.rowbytes * vid.height;
+
+ size_t count = (ds_x2 - ds_x1 + 1);
+ UINT32 val;
+
+ xposition = ds_xfrac; yposition = ds_yfrac;
+ xstep = ds_xstep; ystep = ds_ystep;
+
+ // SoM: we only need 6 bits for the integer part (0 thru 63) so the rest
+ // can be used for the fraction part. This allows calculation of the memory address in the
+ // texture with two shifts, an OR and one AND. (see below)
+ // for texture sizes > 64 the amount of precision we can allow will decrease, but only by one
+ // bit per power of two (obviously)
+ // Ok, because I was able to eliminate the variable spot below, this function is now FASTER
+ // than the original span renderer. Whodathunkit?
+ xposition <<= nflatshiftup; yposition <<= nflatshiftup;
+ xstep <<= nflatshiftup; ystep <<= nflatshiftup;
+
+ source = (UINT16 *)ds_source;
+ colormap = ds_colormap;
+ translation = ds_translation;
+ dest = ylookup[ds_y] + columnofs[ds_x1];
+
+ while (count >= 8)
+ {
+ // SoM: Why didn't I see this earlier? the spot variable is a waste now because we don't
+ // have the uber complicated math to calculate it now, so that was a memory write we didn't
+ // need!
+ val = (((UINT32)yposition >> nflatyshift) & nflatmask) | ((UINT32)xposition >> nflatxshift);
+ val = source[val];
+ if (val & 0xFF00)
+ dest[0] = colormap[translation[val & 0xFF]];
+ xposition += xstep;
+ yposition += ystep;
+
+ val = (((UINT32)yposition >> nflatyshift) & nflatmask) | ((UINT32)xposition >> nflatxshift);
+ val = source[val];
+ if (val & 0xFF00)
+ dest[1] = colormap[translation[val & 0xFF]];
+ xposition += xstep;
+ yposition += ystep;
+
+ val = (((UINT32)yposition >> nflatyshift) & nflatmask) | ((UINT32)xposition >> nflatxshift);
+ val = source[val];
+ if (val & 0xFF00)
+ dest[2] = colormap[translation[val & 0xFF]];
+ xposition += xstep;
+ yposition += ystep;
+
+ val = (((UINT32)yposition >> nflatyshift) & nflatmask) | ((UINT32)xposition >> nflatxshift);
+ val = source[val];
+ if (val & 0xFF00)
+ dest[3] = colormap[translation[val & 0xFF]];
+ xposition += xstep;
+ yposition += ystep;
+
+ val = (((UINT32)yposition >> nflatyshift) & nflatmask) | ((UINT32)xposition >> nflatxshift);
+ val = source[val];
+ if (val & 0xFF00)
+ dest[4] = colormap[translation[val & 0xFF]];
+ xposition += xstep;
+ yposition += ystep;
+
+ val = (((UINT32)yposition >> nflatyshift) & nflatmask) | ((UINT32)xposition >> nflatxshift);
+ val = source[val];
+ if (val & 0xFF00)
+ dest[5] = colormap[translation[val & 0xFF]];
+ xposition += xstep;
+ yposition += ystep;
+
+ val = (((UINT32)yposition >> nflatyshift) & nflatmask) | ((UINT32)xposition >> nflatxshift);
+ val = source[val];
+ if (val & 0xFF00)
+ dest[6] = colormap[translation[val & 0xFF]];
+ xposition += xstep;
+ yposition += ystep;
+
+ val = (((UINT32)yposition >> nflatyshift) & nflatmask) | ((UINT32)xposition >> nflatxshift);
+ val = source[val];
+ if (val & 0xFF00)
+ dest[7] = colormap[translation[val & 0xFF]];
+ xposition += xstep;
+ yposition += ystep;
+
+ dest += 8;
+ count -= 8;
+ }
+ while (count-- && dest <= deststop)
+ {
+ val = source[(((UINT32)yposition >> nflatyshift) & nflatmask) | ((UINT32)xposition >> nflatxshift)];
+ if (val & 0xFF00)
+ *dest = colormap[translation[val & 0xFF]];
+ dest++;
+ xposition += xstep;
+ yposition += ystep;
+ }
+}
+
+/** \brief The R_DrawTranslucentFloorSplat_8 function
+ Just like R_DrawFloorSprite_8, but is translucent!
+*/
+void R_DrawTranslucentFloorSprite_8 (void)
+{
+ fixed_t xposition;
+ fixed_t yposition;
+ fixed_t xstep, ystep;
+
+ UINT16 *source;
+ UINT8 *colormap;
+ UINT8 *translation;
+ UINT8 *dest;
+ const UINT8 *deststop = screens[0] + vid.rowbytes * vid.height;
+
+ size_t count = (ds_x2 - ds_x1 + 1);
+ UINT32 val;
+
+ xposition = ds_xfrac; yposition = ds_yfrac;
+ xstep = ds_xstep; ystep = ds_ystep;
+
+ // SoM: we only need 6 bits for the integer part (0 thru 63) so the rest
+ // can be used for the fraction part. This allows calculation of the memory address in the
+ // texture with two shifts, an OR and one AND. (see below)
+ // for texture sizes > 64 the amount of precision we can allow will decrease, but only by one
+ // bit per power of two (obviously)
+ // Ok, because I was able to eliminate the variable spot below, this function is now FASTER
+ // than the original span renderer. Whodathunkit?
+ xposition <<= nflatshiftup; yposition <<= nflatshiftup;
+ xstep <<= nflatshiftup; ystep <<= nflatshiftup;
+
+ source = (UINT16 *)ds_source;
+ colormap = ds_colormap;
+ translation = ds_translation;
+ dest = ylookup[ds_y] + columnofs[ds_x1];
+
+ while (count >= 8)
+ {
+ // SoM: Why didn't I see this earlier? the spot variable is a waste now because we don't
+ // have the uber complicated math to calculate it now, so that was a memory write we didn't
+ // need!
+ val = source[(((UINT32)yposition >> nflatyshift) & nflatmask) | ((UINT32)xposition >> nflatxshift)];
+ if (val & 0xFF00)
+ dest[0] = *(ds_transmap + (colormap[translation[val & 0xFF]] << 8) + dest[0]);
+ xposition += xstep;
+ yposition += ystep;
+
+ val = source[(((UINT32)yposition >> nflatyshift) & nflatmask) | ((UINT32)xposition >> nflatxshift)];
+ if (val & 0xFF00)
+ dest[1] = *(ds_transmap + (colormap[translation[val & 0xFF]] << 8) + dest[1]);
+ xposition += xstep;
+ yposition += ystep;
+
+ val = source[(((UINT32)yposition >> nflatyshift) & nflatmask) | ((UINT32)xposition >> nflatxshift)];
+ if (val & 0xFF00)
+ dest[2] = *(ds_transmap + (colormap[translation[val & 0xFF]] << 8) + dest[2]);
+ xposition += xstep;
+ yposition += ystep;
+
+ val = source[(((UINT32)yposition >> nflatyshift) & nflatmask) | ((UINT32)xposition >> nflatxshift)];
+ if (val & 0xFF00)
+ dest[3] = *(ds_transmap + (colormap[translation[val & 0xFF]] << 8) + dest[3]);
+ xposition += xstep;
+ yposition += ystep;
+
+ val = source[(((UINT32)yposition >> nflatyshift) & nflatmask) | ((UINT32)xposition >> nflatxshift)];
+ if (val & 0xFF00)
+ dest[4] = *(ds_transmap + (colormap[translation[val & 0xFF]] << 8) + dest[4]);
+ xposition += xstep;
+ yposition += ystep;
+
+ val = source[(((UINT32)yposition >> nflatyshift) & nflatmask) | ((UINT32)xposition >> nflatxshift)];
+ if (val & 0xFF00)
+ dest[5] = *(ds_transmap + (colormap[translation[val & 0xFF]] << 8) + dest[5]);
+ xposition += xstep;
+ yposition += ystep;
+
+ val = source[(((UINT32)yposition >> nflatyshift) & nflatmask) | ((UINT32)xposition >> nflatxshift)];
+ if (val & 0xFF00)
+ dest[6] = *(ds_transmap + (colormap[translation[val & 0xFF]] << 8) + dest[6]);
+ xposition += xstep;
+ yposition += ystep;
+
+ val = source[(((UINT32)yposition >> nflatyshift) & nflatmask) | ((UINT32)xposition >> nflatxshift)];
+ if (val & 0xFF00)
+ dest[7] = *(ds_transmap + (colormap[translation[val & 0xFF]] << 8) + dest[7]);
+ xposition += xstep;
+ yposition += ystep;
+
+ dest += 8;
+ count -= 8;
+ }
+ while (count-- && dest <= deststop)
+ {
+ val = source[(((UINT32)yposition >> nflatyshift) & nflatmask) | ((UINT32)xposition >> nflatxshift)];
+ if (val & 0xFF00)
+ *dest = *(ds_transmap + (colormap[translation[val & 0xFF]] << 8) + *dest);
+ dest++;
+ xposition += xstep;
+ yposition += ystep;
+ }
+}
+
+/** \brief The R_DrawTiltedFloorSprite_8 function
+ Draws a tilted floor sprite.
+*/
+void R_DrawTiltedFloorSprite_8(void)
+{
+ // x1, x2 = ds_x1, ds_x2
+ int width = ds_x2 - ds_x1;
+ double iz, uz, vz;
+ UINT32 u, v;
+ int i;
+
+ UINT16 *source;
+ UINT8 *colormap;
+ UINT8 *translation;
+ UINT8 *dest;
+ UINT16 val;
+
+ double startz, startu, startv;
+ double izstep, uzstep, vzstep;
+ double endz, endu, endv;
+ UINT32 stepu, stepv;
+
+ iz = ds_szp->z + ds_szp->y*(centery-ds_y) + ds_szp->x*(ds_x1-centerx);
+ uz = ds_sup->z + ds_sup->y*(centery-ds_y) + ds_sup->x*(ds_x1-centerx);
+ vz = ds_svp->z + ds_svp->y*(centery-ds_y) + ds_svp->x*(ds_x1-centerx);
+
+ dest = ylookup[ds_y] + columnofs[ds_x1];
+ source = (UINT16 *)ds_source;
+ colormap = ds_colormap;
+ translation = ds_translation;
+
+ startz = 1.f/iz;
+ startu = uz*startz;
+ startv = vz*startz;
+
+ izstep = ds_szp->x * SPANSIZE;
+ uzstep = ds_sup->x * SPANSIZE;
+ vzstep = ds_svp->x * SPANSIZE;
+ //x1 = 0;
+ width++;
+
+ while (width >= SPANSIZE)
+ {
+ iz += izstep;
+ uz += uzstep;
+ vz += vzstep;
+
+ endz = 1.f/iz;
+ endu = uz*endz;
+ endv = vz*endz;
+ stepu = (INT64)((endu - startu) * INVSPAN);
+ stepv = (INT64)((endv - startv) * INVSPAN);
+ u = (INT64)(startu) + viewx;
+ v = (INT64)(startv) + viewy;
+
+ for (i = SPANSIZE-1; i >= 0; i--)
+ {
+ val = source[((v >> nflatyshift) & nflatmask) | (u >> nflatxshift)];
+ if (val & 0xFF00)
+ *dest = colormap[translation[val & 0xFF]];
+ dest++;
+
+ u += stepu;
+ v += stepv;
+ }
+ startu = endu;
+ startv = endv;
+ width -= SPANSIZE;
+ }
+ if (width > 0)
+ {
+ if (width == 1)
+ {
+ u = (INT64)(startu);
+ v = (INT64)(startv);
+ val = source[((v >> nflatyshift) & nflatmask) | (u >> nflatxshift)];
+ if (val & 0xFF00)
+ *dest = colormap[translation[val & 0xFF]];
+ }
+ else
+ {
+ double left = width;
+ iz += ds_szp->x * left;
+ uz += ds_sup->x * left;
+ vz += ds_svp->x * left;
+
+ endz = 1.f/iz;
+ endu = uz*endz;
+ endv = vz*endz;
+ left = 1.f/left;
+ stepu = (INT64)((endu - startu) * left);
+ stepv = (INT64)((endv - startv) * left);
+ u = (INT64)(startu) + viewx;
+ v = (INT64)(startv) + viewy;
+
+ for (; width != 0; width--)
+ {
+ val = source[((v >> nflatyshift) & nflatmask) | (u >> nflatxshift)];
+ if (val & 0xFF00)
+ *dest = colormap[translation[val & 0xFF]];
+ dest++;
+
+ u += stepu;
+ v += stepv;
+ }
+ }
+ }
+}
+
+/** \brief The R_DrawTiltedTranslucentFloorSprite_8 function
+ Draws a tilted, translucent, floor sprite.
+*/
+void R_DrawTiltedTranslucentFloorSprite_8(void)
+{
+ // x1, x2 = ds_x1, ds_x2
+ int width = ds_x2 - ds_x1;
+ double iz, uz, vz;
+ UINT32 u, v;
+ int i;
+
+ UINT16 *source;
+ UINT8 *colormap;
+ UINT8 *translation;
+ UINT8 *dest;
+ UINT16 val;
+
+ double startz, startu, startv;
+ double izstep, uzstep, vzstep;
+ double endz, endu, endv;
+ UINT32 stepu, stepv;
+
+ iz = ds_szp->z + ds_szp->y*(centery-ds_y) + ds_szp->x*(ds_x1-centerx);
+ uz = ds_sup->z + ds_sup->y*(centery-ds_y) + ds_sup->x*(ds_x1-centerx);
+ vz = ds_svp->z + ds_svp->y*(centery-ds_y) + ds_svp->x*(ds_x1-centerx);
+
+ dest = ylookup[ds_y] + columnofs[ds_x1];
+ source = (UINT16 *)ds_source;
+ colormap = ds_colormap;
+ translation = ds_translation;
+
+ startz = 1.f/iz;
+ startu = uz*startz;
+ startv = vz*startz;
+
+ izstep = ds_szp->x * SPANSIZE;
+ uzstep = ds_sup->x * SPANSIZE;
+ vzstep = ds_svp->x * SPANSIZE;
+ //x1 = 0;
+ width++;
+
+ while (width >= SPANSIZE)
+ {
+ iz += izstep;
+ uz += uzstep;
+ vz += vzstep;
+
+ endz = 1.f/iz;
+ endu = uz*endz;
+ endv = vz*endz;
+ stepu = (INT64)((endu - startu) * INVSPAN);
+ stepv = (INT64)((endv - startv) * INVSPAN);
+ u = (INT64)(startu) + viewx;
+ v = (INT64)(startv) + viewy;
+
+ for (i = SPANSIZE-1; i >= 0; i--)
+ {
+ val = source[((v >> nflatyshift) & nflatmask) | (u >> nflatxshift)];
+ if (val & 0xFF00)
+ *dest = *(ds_transmap + (colormap[translation[val & 0xFF]] << 8) + *dest);
+ dest++;
+
+ u += stepu;
+ v += stepv;
+ }
+ startu = endu;
+ startv = endv;
+ width -= SPANSIZE;
+ }
+ if (width > 0)
+ {
+ if (width == 1)
+ {
+ u = (INT64)(startu);
+ v = (INT64)(startv);
+ val = source[((v >> nflatyshift) & nflatmask) | (u >> nflatxshift)];
+ if (val & 0xFF00)
+ *dest = *(ds_transmap + (colormap[translation[val & 0xFF]] << 8) + *dest);
+ }
+ else
+ {
+ double left = width;
+ iz += ds_szp->x * left;
+ uz += ds_sup->x * left;
+ vz += ds_svp->x * left;
+
+ endz = 1.f/iz;
+ endu = uz*endz;
+ endv = vz*endz;
+ left = 1.f/left;
+ stepu = (INT64)((endu - startu) * left);
+ stepv = (INT64)((endv - startv) * left);
+ u = (INT64)(startu) + viewx;
+ v = (INT64)(startv) + viewy;
+
+ for (; width != 0; width--)
+ {
+ val = source[((v >> nflatyshift) & nflatmask) | (u >> nflatxshift)];
+ if (val & 0xFF00)
+ *dest = *(ds_transmap + (colormap[translation[val & 0xFF]] << 8) + *dest);
+ dest++;
+
+ u += stepu;
+ v += stepv;
+ }
+ }
+ }
+}
+
/** \brief The R_DrawTranslucentSpan_8 function
Draws the actual span with translucency.
*/
@@ -1503,7 +1922,6 @@ void R_DrawTranslucentSpan_8 (void)
}
}
-#ifndef NOWATER
void R_DrawTranslucentWaterSpan_8(void)
{
UINT32 xposition;
@@ -1580,7 +1998,6 @@ void R_DrawTranslucentWaterSpan_8(void)
yposition += ystep;
}
}
-#endif
/** \brief The R_DrawFogSpan_8 function
Draws the actual span with fogging.
diff --git a/src/r_draw8_npo2.c b/src/r_draw8_npo2.c
index 02015569455e94df9e4ec9a8c8be835cbd0da856..a34a20e9a9737241bbc183d71f8bae01a982cb7a 100644
--- a/src/r_draw8_npo2.c
+++ b/src/r_draw8_npo2.c
@@ -15,6 +15,9 @@
// SPANS
// ==========================================================================
+#define SPANSIZE 16
+#define INVSPAN 0.0625f
+
/** \brief The R_DrawSpan_NPO2_8 function
Draws the actual span.
*/
@@ -23,6 +26,8 @@ void R_DrawSpan_NPO2_8 (void)
fixed_t xposition;
fixed_t yposition;
fixed_t xstep, ystep;
+ fixed_t x, y;
+ fixed_t fixedwidth, fixedheight;
UINT8 *source;
UINT8 *colormap;
@@ -41,19 +46,39 @@ void R_DrawSpan_NPO2_8 (void)
if (dest+8 > deststop)
return;
+ fixedwidth = ds_flatwidth << FRACBITS;
+ fixedheight = ds_flatheight << FRACBITS;
+
+ // Fix xposition and yposition if they are out of bounds.
+ if (xposition < 0)
+ xposition = fixedwidth - ((UINT32)(fixedwidth - xposition) % fixedwidth);
+ else if (xposition >= fixedwidth)
+ xposition %= fixedwidth;
+ if (yposition < 0)
+ yposition = fixedheight - ((UINT32)(fixedheight - yposition) % fixedheight);
+ else if (yposition >= fixedheight)
+ yposition %= fixedheight;
+
while (count-- && dest <= deststop)
{
- fixed_t x = (xposition >> FRACBITS);
- fixed_t y = (yposition >> FRACBITS);
-
- // Carefully align all of my Friends.
- if (x < 0)
- x = ds_flatwidth - ((UINT32)(ds_flatwidth - x) % ds_flatwidth);
- if (y < 0)
- y = ds_flatheight - ((UINT32)(ds_flatheight - y) % ds_flatheight);
+ // The loops here keep the texture coordinates within the texture.
+ // They will rarely iterate multiple times, and are cheaper than a modulo operation,
+ // even if using libdivide.
+ if (xstep < 0) // These if statements are hopefully hoisted by the compiler to above this loop
+ while (xposition < 0)
+ xposition += fixedwidth;
+ else
+ while (xposition >= fixedwidth)
+ xposition -= fixedwidth;
+ if (ystep < 0)
+ while (yposition < 0)
+ yposition += fixedheight;
+ else
+ while (yposition >= fixedheight)
+ yposition -= fixedheight;
- x %= ds_flatwidth;
- y %= ds_flatheight;
+ x = (xposition >> FRACBITS);
+ y = (yposition >> FRACBITS);
*dest++ = colormap[source[((y * ds_flatwidth) + x)]];
xposition += xstep;
@@ -61,8 +86,6 @@ void R_DrawSpan_NPO2_8 (void)
}
}
-#define PLANELIGHTFLOAT (BASEVIDWIDTH * BASEVIDWIDTH / vid.width / (zeroheight - FIXED_TO_FLOAT(viewz)) / 21.0f * FIXED_TO_FLOAT(fovtan))
-
/** \brief The R_DrawTiltedSpan_NPO2_8 function
Draw slopes! Holy sheit!
*/
@@ -137,9 +160,6 @@ void R_DrawTiltedSpan_NPO2_8(void)
vz += ds_svp->x;
} while (--width >= 0);
#else
-#define SPANSIZE 16
-#define INVSPAN 0.0625f
-
startz = 1.f/iz;
startu = uz*startz;
startv = vz*startz;
@@ -332,9 +352,6 @@ void R_DrawTiltedTranslucentSpan_NPO2_8(void)
vz += ds_svp->x;
} while (--width >= 0);
#else
-#define SPANSIZE 16
-#define INVSPAN 0.0625f
-
startz = 1.f/iz;
startu = uz*startz;
startv = vz*startz;
@@ -531,9 +548,6 @@ void R_DrawTiltedSplat_NPO2_8(void)
vz += ds_svp->x;
} while (--width >= 0);
#else
-#define SPANSIZE 16
-#define INVSPAN 0.0625f
-
startz = 1.f/iz;
startu = uz*startz;
startv = vz*startz;
@@ -668,6 +682,8 @@ void R_DrawSplat_NPO2_8 (void)
fixed_t xposition;
fixed_t yposition;
fixed_t xstep, ystep;
+ fixed_t x, y;
+ fixed_t fixedwidth, fixedheight;
UINT8 *source;
UINT8 *colormap;
@@ -684,20 +700,39 @@ void R_DrawSplat_NPO2_8 (void)
colormap = ds_colormap;
dest = ylookup[ds_y] + columnofs[ds_x1];
- while (count-- && dest <= deststop)
- {
- fixed_t x = (xposition >> FRACBITS);
- fixed_t y = (yposition >> FRACBITS);
+ fixedwidth = ds_flatwidth << FRACBITS;
+ fixedheight = ds_flatheight << FRACBITS;
- // Carefully align all of my Friends.
- if (x < 0)
- x = ds_flatwidth - ((UINT32)(ds_flatwidth - x) % ds_flatwidth);
- if (y < 0)
- y = ds_flatheight - ((UINT32)(ds_flatheight - y) % ds_flatheight);
+ // Fix xposition and yposition if they are out of bounds.
+ if (xposition < 0)
+ xposition = fixedwidth - ((UINT32)(fixedwidth - xposition) % fixedwidth);
+ else if (xposition >= fixedwidth)
+ xposition %= fixedwidth;
+ if (yposition < 0)
+ yposition = fixedheight - ((UINT32)(fixedheight - yposition) % fixedheight);
+ else if (yposition >= fixedheight)
+ yposition %= fixedheight;
- x %= ds_flatwidth;
- y %= ds_flatheight;
+ while (count-- && dest <= deststop)
+ {
+ // The loops here keep the texture coordinates within the texture.
+ // They will rarely iterate multiple times, and are cheaper than a modulo operation,
+ // even if using libdivide.
+ if (xstep < 0) // These if statements are hopefully hoisted by the compiler to above this loop
+ while (xposition < 0)
+ xposition += fixedwidth;
+ else
+ while (xposition >= fixedwidth)
+ xposition -= fixedwidth;
+ if (ystep < 0)
+ while (yposition < 0)
+ yposition += fixedheight;
+ else
+ while (yposition >= fixedheight)
+ yposition -= fixedheight;
+ x = (xposition >> FRACBITS);
+ y = (yposition >> FRACBITS);
val = source[((y * ds_flatwidth) + x)];
if (val != TRANSPARENTPIXEL)
*dest = colormap[val];
@@ -715,6 +750,8 @@ void R_DrawTranslucentSplat_NPO2_8 (void)
fixed_t xposition;
fixed_t yposition;
fixed_t xstep, ystep;
+ fixed_t x, y;
+ fixed_t fixedwidth, fixedheight;
UINT8 *source;
UINT8 *colormap;
@@ -731,20 +768,39 @@ void R_DrawTranslucentSplat_NPO2_8 (void)
colormap = ds_colormap;
dest = ylookup[ds_y] + columnofs[ds_x1];
- while (count-- && dest <= deststop)
- {
- fixed_t x = (xposition >> FRACBITS);
- fixed_t y = (yposition >> FRACBITS);
+ fixedwidth = ds_flatwidth << FRACBITS;
+ fixedheight = ds_flatheight << FRACBITS;
- // Carefully align all of my Friends.
- if (x < 0)
- x = ds_flatwidth - ((UINT32)(ds_flatwidth - x) % ds_flatwidth);
- if (y < 0)
- y = ds_flatheight - ((UINT32)(ds_flatheight - y) % ds_flatheight);
+ // Fix xposition and yposition if they are out of bounds.
+ if (xposition < 0)
+ xposition = fixedwidth - ((UINT32)(fixedwidth - xposition) % fixedwidth);
+ else if (xposition >= fixedwidth)
+ xposition %= fixedwidth;
+ if (yposition < 0)
+ yposition = fixedheight - ((UINT32)(fixedheight - yposition) % fixedheight);
+ else if (yposition >= fixedheight)
+ yposition %= fixedheight;
- x %= ds_flatwidth;
- y %= ds_flatheight;
+ while (count-- && dest <= deststop)
+ {
+ // The loops here keep the texture coordinates within the texture.
+ // They will rarely iterate multiple times, and are cheaper than a modulo operation,
+ // even if using libdivide.
+ if (xstep < 0) // These if statements are hopefully hoisted by the compiler to above this loop
+ while (xposition < 0)
+ xposition += fixedwidth;
+ else
+ while (xposition >= fixedwidth)
+ xposition -= fixedwidth;
+ if (ystep < 0)
+ while (yposition < 0)
+ yposition += fixedheight;
+ else
+ while (yposition >= fixedheight)
+ yposition -= fixedheight;
+ x = (xposition >> FRACBITS);
+ y = (yposition >> FRACBITS);
val = source[((y * ds_flatwidth) + x)];
if (val != TRANSPARENTPIXEL)
*dest = *(ds_transmap + (colormap[val] << 8) + *dest);
@@ -754,6 +810,446 @@ void R_DrawTranslucentSplat_NPO2_8 (void)
}
}
+/** \brief The R_DrawFloorSprite_NPO2_8 function
+ Just like R_DrawSplat_NPO2_8, but for floor sprites.
+*/
+void R_DrawFloorSprite_NPO2_8 (void)
+{
+ fixed_t xposition;
+ fixed_t yposition;
+ fixed_t xstep, ystep;
+ fixed_t x, y;
+ fixed_t fixedwidth, fixedheight;
+
+ UINT16 *source;
+ UINT8 *translation;
+ UINT8 *colormap;
+ UINT8 *dest;
+ const UINT8 *deststop = screens[0] + vid.rowbytes * vid.height;
+
+ size_t count = (ds_x2 - ds_x1 + 1);
+ UINT32 val;
+
+ xposition = ds_xfrac; yposition = ds_yfrac;
+ xstep = ds_xstep; ystep = ds_ystep;
+
+ source = (UINT16 *)ds_source;
+ colormap = ds_colormap;
+ translation = ds_translation;
+ dest = ylookup[ds_y] + columnofs[ds_x1];
+
+ fixedwidth = ds_flatwidth << FRACBITS;
+ fixedheight = ds_flatheight << FRACBITS;
+
+ // Fix xposition and yposition if they are out of bounds.
+ if (xposition < 0)
+ xposition = fixedwidth - ((UINT32)(fixedwidth - xposition) % fixedwidth);
+ else if (xposition >= fixedwidth)
+ xposition %= fixedwidth;
+ if (yposition < 0)
+ yposition = fixedheight - ((UINT32)(fixedheight - yposition) % fixedheight);
+ else if (yposition >= fixedheight)
+ yposition %= fixedheight;
+
+ while (count-- && dest <= deststop)
+ {
+ // The loops here keep the texture coordinates within the texture.
+ // They will rarely iterate multiple times, and are cheaper than a modulo operation,
+ // even if using libdivide.
+ if (xstep < 0) // These if statements are hopefully hoisted by the compiler to above this loop
+ while (xposition < 0)
+ xposition += fixedwidth;
+ else
+ while (xposition >= fixedwidth)
+ xposition -= fixedwidth;
+ if (ystep < 0)
+ while (yposition < 0)
+ yposition += fixedheight;
+ else
+ while (yposition >= fixedheight)
+ yposition -= fixedheight;
+
+ x = (xposition >> FRACBITS);
+ y = (yposition >> FRACBITS);
+ val = source[((y * ds_flatwidth) + x)];
+ if (val & 0xFF00)
+ *dest = colormap[translation[val & 0xFF]];
+ dest++;
+ xposition += xstep;
+ yposition += ystep;
+ }
+}
+
+/** \brief The R_DrawTranslucentFloorSprite_NPO2_8 function
+ Just like R_DrawFloorSprite_NPO2_8, but is translucent!
+*/
+void R_DrawTranslucentFloorSprite_NPO2_8 (void)
+{
+ fixed_t xposition;
+ fixed_t yposition;
+ fixed_t xstep, ystep;
+ fixed_t x, y;
+ fixed_t fixedwidth, fixedheight;
+
+ UINT16 *source;
+ UINT8 *translation;
+ UINT8 *colormap;
+ UINT8 *dest;
+ const UINT8 *deststop = screens[0] + vid.rowbytes * vid.height;
+
+ size_t count = (ds_x2 - ds_x1 + 1);
+ UINT32 val;
+
+ xposition = ds_xfrac; yposition = ds_yfrac;
+ xstep = ds_xstep; ystep = ds_ystep;
+
+ source = (UINT16 *)ds_source;
+ colormap = ds_colormap;
+ translation = ds_translation;
+ dest = ylookup[ds_y] + columnofs[ds_x1];
+
+ fixedwidth = ds_flatwidth << FRACBITS;
+ fixedheight = ds_flatheight << FRACBITS;
+
+ // Fix xposition and yposition if they are out of bounds.
+ if (xposition < 0)
+ xposition = fixedwidth - ((UINT32)(fixedwidth - xposition) % fixedwidth);
+ else if (xposition >= fixedwidth)
+ xposition %= fixedwidth;
+ if (yposition < 0)
+ yposition = fixedheight - ((UINT32)(fixedheight - yposition) % fixedheight);
+ else if (yposition >= fixedheight)
+ yposition %= fixedheight;
+
+ while (count-- && dest <= deststop)
+ {
+ // The loops here keep the texture coordinates within the texture.
+ // They will rarely iterate multiple times, and are cheaper than a modulo operation,
+ // even if using libdivide.
+ if (xstep < 0) // These if statements are hopefully hoisted by the compiler to above this loop
+ while (xposition < 0)
+ xposition += fixedwidth;
+ else
+ while (xposition >= fixedwidth)
+ xposition -= fixedwidth;
+ if (ystep < 0)
+ while (yposition < 0)
+ yposition += fixedheight;
+ else
+ while (yposition >= fixedheight)
+ yposition -= fixedheight;
+
+ x = (xposition >> FRACBITS);
+ y = (yposition >> FRACBITS);
+ val = source[((y * ds_flatwidth) + x)];
+ if (val & 0xFF00)
+ *dest = *(ds_transmap + (colormap[translation[val & 0xFF]] << 8) + *dest);
+ dest++;
+ xposition += xstep;
+ yposition += ystep;
+ }
+}
+
+/** \brief The R_DrawTiltedFloorSprite_NPO2_8 function
+ Draws a tilted floor sprite.
+*/
+void R_DrawTiltedFloorSprite_NPO2_8(void)
+{
+ // x1, x2 = ds_x1, ds_x2
+ int width = ds_x2 - ds_x1;
+ double iz, uz, vz;
+ UINT32 u, v;
+ int i;
+
+ UINT16 *source;
+ UINT8 *colormap;
+ UINT8 *translation;
+ UINT8 *dest;
+ UINT16 val;
+
+ double startz, startu, startv;
+ double izstep, uzstep, vzstep;
+ double endz, endu, endv;
+ UINT32 stepu, stepv;
+
+ iz = ds_szp->z + ds_szp->y*(centery-ds_y) + ds_szp->x*(ds_x1-centerx);
+ uz = ds_sup->z + ds_sup->y*(centery-ds_y) + ds_sup->x*(ds_x1-centerx);
+ vz = ds_svp->z + ds_svp->y*(centery-ds_y) + ds_svp->x*(ds_x1-centerx);
+
+ dest = ylookup[ds_y] + columnofs[ds_x1];
+ source = (UINT16 *)ds_source;
+ colormap = ds_colormap;
+ translation = ds_translation;
+
+ startz = 1.f/iz;
+ startu = uz*startz;
+ startv = vz*startz;
+
+ izstep = ds_szp->x * SPANSIZE;
+ uzstep = ds_sup->x * SPANSIZE;
+ vzstep = ds_svp->x * SPANSIZE;
+ //x1 = 0;
+ width++;
+
+ while (width >= SPANSIZE)
+ {
+ iz += izstep;
+ uz += uzstep;
+ vz += vzstep;
+
+ endz = 1.f/iz;
+ endu = uz*endz;
+ endv = vz*endz;
+ stepu = (INT64)((endu - startu) * INVSPAN);
+ stepv = (INT64)((endv - startv) * INVSPAN);
+ u = (INT64)(startu) + viewx;
+ v = (INT64)(startv) + viewy;
+
+ for (i = SPANSIZE-1; i >= 0; i--)
+ {
+ // Lactozilla: Non-powers-of-two
+ fixed_t x = (((fixed_t)u-viewx) >> FRACBITS);
+ fixed_t y = (((fixed_t)v-viewy) >> FRACBITS);
+
+ // Carefully align all of my Friends.
+ if (x < 0)
+ x = ds_flatwidth - ((UINT32)(ds_flatwidth - x) % ds_flatwidth);
+ if (y < 0)
+ y = ds_flatheight - ((UINT32)(ds_flatheight - y) % ds_flatheight);
+
+ x %= ds_flatwidth;
+ y %= ds_flatheight;
+
+ val = source[((y * ds_flatwidth) + x)];
+ if (val & 0xFF00)
+ *dest = colormap[translation[val & 0xFF]];
+ dest++;
+
+ u += stepu;
+ v += stepv;
+ }
+ startu = endu;
+ startv = endv;
+ width -= SPANSIZE;
+ }
+ if (width > 0)
+ {
+ if (width == 1)
+ {
+ u = (INT64)(startu);
+ v = (INT64)(startv);
+ // Lactozilla: Non-powers-of-two
+ {
+ fixed_t x = (((fixed_t)u-viewx) >> FRACBITS);
+ fixed_t y = (((fixed_t)v-viewy) >> FRACBITS);
+
+ // Carefully align all of my Friends.
+ if (x < 0)
+ x = ds_flatwidth - ((UINT32)(ds_flatwidth - x) % ds_flatwidth);
+ if (y < 0)
+ y = ds_flatheight - ((UINT32)(ds_flatheight - y) % ds_flatheight);
+
+ x %= ds_flatwidth;
+ y %= ds_flatheight;
+
+ val = source[((y * ds_flatwidth) + x)];
+ if (val & 0xFF00)
+ *dest = colormap[translation[val & 0xFF]];
+ }
+ }
+ else
+ {
+ double left = width;
+ iz += ds_szp->x * left;
+ uz += ds_sup->x * left;
+ vz += ds_svp->x * left;
+
+ endz = 1.f/iz;
+ endu = uz*endz;
+ endv = vz*endz;
+ left = 1.f/left;
+ stepu = (INT64)((endu - startu) * left);
+ stepv = (INT64)((endv - startv) * left);
+ u = (INT64)(startu) + viewx;
+ v = (INT64)(startv) + viewy;
+
+ for (; width != 0; width--)
+ {
+ // Lactozilla: Non-powers-of-two
+ fixed_t x = (((fixed_t)u-viewx) >> FRACBITS);
+ fixed_t y = (((fixed_t)v-viewy) >> FRACBITS);
+
+ // Carefully align all of my Friends.
+ if (x < 0)
+ x = ds_flatwidth - ((UINT32)(ds_flatwidth - x) % ds_flatwidth);
+ if (y < 0)
+ y = ds_flatheight - ((UINT32)(ds_flatheight - y) % ds_flatheight);
+
+ x %= ds_flatwidth;
+ y %= ds_flatheight;
+
+ val = source[((y * ds_flatwidth) + x)];
+ if (val & 0xFF00)
+ *dest = colormap[translation[val & 0xFF]];
+ dest++;
+
+ u += stepu;
+ v += stepv;
+ }
+ }
+ }
+}
+
+/** \brief The R_DrawTiltedTranslucentFloorSprite_NPO2_8 function
+ Draws a tilted, translucent, floor sprite.
+*/
+void R_DrawTiltedTranslucentFloorSprite_NPO2_8(void)
+{
+ // x1, x2 = ds_x1, ds_x2
+ int width = ds_x2 - ds_x1;
+ double iz, uz, vz;
+ UINT32 u, v;
+ int i;
+
+ UINT16 *source;
+ UINT8 *colormap;
+ UINT8 *translation;
+ UINT8 *dest;
+ UINT16 val;
+
+ double startz, startu, startv;
+ double izstep, uzstep, vzstep;
+ double endz, endu, endv;
+ UINT32 stepu, stepv;
+
+ iz = ds_szp->z + ds_szp->y*(centery-ds_y) + ds_szp->x*(ds_x1-centerx);
+ uz = ds_sup->z + ds_sup->y*(centery-ds_y) + ds_sup->x*(ds_x1-centerx);
+ vz = ds_svp->z + ds_svp->y*(centery-ds_y) + ds_svp->x*(ds_x1-centerx);
+
+ dest = ylookup[ds_y] + columnofs[ds_x1];
+ source = (UINT16 *)ds_source;
+ colormap = ds_colormap;
+ translation = ds_translation;
+
+ startz = 1.f/iz;
+ startu = uz*startz;
+ startv = vz*startz;
+
+ izstep = ds_szp->x * SPANSIZE;
+ uzstep = ds_sup->x * SPANSIZE;
+ vzstep = ds_svp->x * SPANSIZE;
+ //x1 = 0;
+ width++;
+
+ while (width >= SPANSIZE)
+ {
+ iz += izstep;
+ uz += uzstep;
+ vz += vzstep;
+
+ endz = 1.f/iz;
+ endu = uz*endz;
+ endv = vz*endz;
+ stepu = (INT64)((endu - startu) * INVSPAN);
+ stepv = (INT64)((endv - startv) * INVSPAN);
+ u = (INT64)(startu) + viewx;
+ v = (INT64)(startv) + viewy;
+
+ for (i = SPANSIZE-1; i >= 0; i--)
+ {
+ // Lactozilla: Non-powers-of-two
+ fixed_t x = (((fixed_t)u-viewx) >> FRACBITS);
+ fixed_t y = (((fixed_t)v-viewy) >> FRACBITS);
+
+ // Carefully align all of my Friends.
+ if (x < 0)
+ x = ds_flatwidth - ((UINT32)(ds_flatwidth - x) % ds_flatwidth);
+ if (y < 0)
+ y = ds_flatheight - ((UINT32)(ds_flatheight - y) % ds_flatheight);
+
+ x %= ds_flatwidth;
+ y %= ds_flatheight;
+
+ val = source[((y * ds_flatwidth) + x)];
+ if (val & 0xFF00)
+ *dest = *(ds_transmap + (colormap[translation[val & 0xFF]] << 8) + *dest);
+ dest++;
+
+ u += stepu;
+ v += stepv;
+ }
+ startu = endu;
+ startv = endv;
+ width -= SPANSIZE;
+ }
+ if (width > 0)
+ {
+ if (width == 1)
+ {
+ u = (INT64)(startu);
+ v = (INT64)(startv);
+ // Lactozilla: Non-powers-of-two
+ {
+ fixed_t x = (((fixed_t)u-viewx) >> FRACBITS);
+ fixed_t y = (((fixed_t)v-viewy) >> FRACBITS);
+
+ // Carefully align all of my Friends.
+ if (x < 0)
+ x = ds_flatwidth - ((UINT32)(ds_flatwidth - x) % ds_flatwidth);
+ if (y < 0)
+ y = ds_flatheight - ((UINT32)(ds_flatheight - y) % ds_flatheight);
+
+ x %= ds_flatwidth;
+ y %= ds_flatheight;
+
+ val = source[((y * ds_flatwidth) + x)];
+ if (val & 0xFF00)
+ *dest = *(ds_transmap + (colormap[translation[val & 0xFF]] << 8) + *dest);
+ }
+ }
+ else
+ {
+ double left = width;
+ iz += ds_szp->x * left;
+ uz += ds_sup->x * left;
+ vz += ds_svp->x * left;
+
+ endz = 1.f/iz;
+ endu = uz*endz;
+ endv = vz*endz;
+ left = 1.f/left;
+ stepu = (INT64)((endu - startu) * left);
+ stepv = (INT64)((endv - startv) * left);
+ u = (INT64)(startu) + viewx;
+ v = (INT64)(startv) + viewy;
+
+ for (; width != 0; width--)
+ {
+ // Lactozilla: Non-powers-of-two
+ fixed_t x = (((fixed_t)u-viewx) >> FRACBITS);
+ fixed_t y = (((fixed_t)v-viewy) >> FRACBITS);
+
+ // Carefully align all of my Friends.
+ if (x < 0)
+ x = ds_flatwidth - ((UINT32)(ds_flatwidth - x) % ds_flatwidth);
+ if (y < 0)
+ y = ds_flatheight - ((UINT32)(ds_flatheight - y) % ds_flatheight);
+
+ x %= ds_flatwidth;
+ y %= ds_flatheight;
+
+ val = source[((y * ds_flatwidth) + x)];
+ if (val & 0xFF00)
+ *dest = *(ds_transmap + (colormap[translation[val & 0xFF]] << 8) + *dest);
+ dest++;
+
+ u += stepu;
+ v += stepv;
+ }
+ }
+ }
+}
+
/** \brief The R_DrawTranslucentSpan_NPO2_8 function
Draws the actual span with translucency.
*/
@@ -762,6 +1258,8 @@ void R_DrawTranslucentSpan_NPO2_8 (void)
fixed_t xposition;
fixed_t yposition;
fixed_t xstep, ystep;
+ fixed_t x, y;
+ fixed_t fixedwidth, fixedheight;
UINT8 *source;
UINT8 *colormap;
@@ -778,20 +1276,39 @@ void R_DrawTranslucentSpan_NPO2_8 (void)
colormap = ds_colormap;
dest = ylookup[ds_y] + columnofs[ds_x1];
- while (count-- && dest <= deststop)
- {
- fixed_t x = (xposition >> FRACBITS);
- fixed_t y = (yposition >> FRACBITS);
+ fixedwidth = ds_flatwidth << FRACBITS;
+ fixedheight = ds_flatheight << FRACBITS;
- // Carefully align all of my Friends.
- if (x < 0)
- x = ds_flatwidth - ((UINT32)(ds_flatwidth - x) % ds_flatwidth);
- if (y < 0)
- y = ds_flatheight - ((UINT32)(ds_flatheight - y) % ds_flatheight);
+ // Fix xposition and yposition if they are out of bounds.
+ if (xposition < 0)
+ xposition = fixedwidth - ((UINT32)(fixedwidth - xposition) % fixedwidth);
+ else if (xposition >= fixedwidth)
+ xposition %= fixedwidth;
+ if (yposition < 0)
+ yposition = fixedheight - ((UINT32)(fixedheight - yposition) % fixedheight);
+ else if (yposition >= fixedheight)
+ yposition %= fixedheight;
- x %= ds_flatwidth;
- y %= ds_flatheight;
+ while (count-- && dest <= deststop)
+ {
+ // The loops here keep the texture coordinates within the texture.
+ // They will rarely iterate multiple times, and are cheaper than a modulo operation,
+ // even if using libdivide.
+ if (xstep < 0) // These if statements are hopefully hoisted by the compiler to above this loop
+ while (xposition < 0)
+ xposition += fixedwidth;
+ else
+ while (xposition >= fixedwidth)
+ xposition -= fixedwidth;
+ if (ystep < 0)
+ while (yposition < 0)
+ yposition += fixedheight;
+ else
+ while (yposition >= fixedheight)
+ yposition -= fixedheight;
+ x = (xposition >> FRACBITS);
+ y = (yposition >> FRACBITS);
val = ((y * ds_flatwidth) + x);
*dest = *(ds_transmap + (colormap[source[val]] << 8) + *dest);
dest++;
@@ -800,12 +1317,13 @@ void R_DrawTranslucentSpan_NPO2_8 (void)
}
}
-#ifndef NOWATER
void R_DrawTranslucentWaterSpan_NPO2_8(void)
{
fixed_t xposition;
fixed_t yposition;
fixed_t xstep, ystep;
+ fixed_t x, y;
+ fixed_t fixedwidth, fixedheight;
UINT8 *source;
UINT8 *colormap;
@@ -823,20 +1341,39 @@ void R_DrawTranslucentWaterSpan_NPO2_8(void)
dest = ylookup[ds_y] + columnofs[ds_x1];
dsrc = screens[1] + (ds_y+ds_bgofs)*vid.width + ds_x1;
- while (count-- && dest <= deststop)
- {
- fixed_t x = (xposition >> FRACBITS);
- fixed_t y = (yposition >> FRACBITS);
+ fixedwidth = ds_flatwidth << FRACBITS;
+ fixedheight = ds_flatheight << FRACBITS;
- // Carefully align all of my Friends.
- if (x < 0)
- x = ds_flatwidth - ((UINT32)(ds_flatwidth - x) % ds_flatwidth);
- if (y < 0)
- y = ds_flatheight - ((UINT32)(ds_flatheight - y) % ds_flatheight);
+ // Fix xposition and yposition if they are out of bounds.
+ if (xposition < 0)
+ xposition = fixedwidth - ((UINT32)(fixedwidth - xposition) % fixedwidth);
+ else if (xposition >= fixedwidth)
+ xposition %= fixedwidth;
+ if (yposition < 0)
+ yposition = fixedheight - ((UINT32)(fixedheight - yposition) % fixedheight);
+ else if (yposition >= fixedheight)
+ yposition %= fixedheight;
- x %= ds_flatwidth;
- y %= ds_flatheight;
+ while (count-- && dest <= deststop)
+ {
+ // The loops here keep the texture coordinates within the texture.
+ // They will rarely iterate multiple times, and are cheaper than a modulo operation,
+ // even if using libdivide.
+ if (xstep < 0) // These if statements are hopefully hoisted by the compiler to above this loop
+ while (xposition < 0)
+ xposition += fixedwidth;
+ else
+ while (xposition >= fixedwidth)
+ xposition -= fixedwidth;
+ if (ystep < 0)
+ while (yposition < 0)
+ yposition += fixedheight;
+ else
+ while (yposition >= fixedheight)
+ yposition -= fixedheight;
+ x = (xposition >> FRACBITS);
+ y = (yposition >> FRACBITS);
*dest++ = colormap[*(ds_transmap + (source[((y * ds_flatwidth) + x)] << 8) + *dsrc++)];
xposition += xstep;
yposition += ystep;
@@ -918,9 +1455,6 @@ void R_DrawTiltedTranslucentWaterSpan_NPO2_8(void)
vz += ds_svp->x;
} while (--width >= 0);
#else
-#define SPANSIZE 16
-#define INVSPAN 0.0625f
-
startz = 1.f/iz;
startu = uz*startz;
startv = vz*startz;
@@ -1039,4 +1573,3 @@ void R_DrawTiltedTranslucentWaterSpan_NPO2_8(void)
}
#endif
}
-#endif // NOWATER
diff --git a/src/r_main.c b/src/r_main.c
index ef898de94a381dc53576eaa75efe475b18e9139f..04bdebc58282642cdca3329e9b3f801c10f4c6c3 100644
--- a/src/r_main.c
+++ b/src/r_main.c
@@ -34,7 +34,7 @@
#include "m_random.h" // quake camera shake
#include "r_portal.h"
#include "r_main.h"
-#include "i_system.h" // I_GetTimeMicros
+#include "i_system.h" // I_GetPreciseTime
#ifdef HWRENDER
#include "hardware/hw_main.h"
@@ -100,22 +100,22 @@ lighttable_t *zlight[LIGHTLEVELS][MAXLIGHTZ];
extracolormap_t *extra_colormaps = NULL;
// Render stats
-int rs_prevframetime = 0;
-int rs_rendercalltime = 0;
-int rs_uitime = 0;
-int rs_swaptime = 0;
-int rs_tictime = 0;
+precise_t ps_prevframetime = 0;
+precise_t ps_rendercalltime = 0;
+precise_t ps_uitime = 0;
+precise_t ps_swaptime = 0;
-int rs_bsptime = 0;
+precise_t ps_bsptime = 0;
-int rs_sw_portaltime = 0;
-int rs_sw_planetime = 0;
-int rs_sw_maskedtime = 0;
+precise_t ps_sw_spritecliptime = 0;
+precise_t ps_sw_portaltime = 0;
+precise_t ps_sw_planetime = 0;
+precise_t ps_sw_maskedtime = 0;
-int rs_numbspcalls = 0;
-int rs_numsprites = 0;
-int rs_numdrawnodes = 0;
-int rs_numpolyobjects = 0;
+int ps_numbspcalls = 0;
+int ps_numsprites = 0;
+int ps_numdrawnodes = 0;
+int ps_numpolyobjects = 0;
static CV_PossibleValue_t drawdist_cons_t[] = {
{256, "256"}, {512, "512"}, {768, "768"},
@@ -143,31 +143,32 @@ static void FlipCam2_OnChange(void);
void SendWeaponPref(void);
void SendWeaponPref2(void);
-consvar_t cv_tailspickup = {"tailspickup", "On", CV_NETVAR, CV_OnOff, NULL, 0, NULL, NULL, 0, 0, NULL};
-consvar_t cv_chasecam = {"chasecam", "On", CV_CALL, CV_OnOff, ChaseCam_OnChange, 0, NULL, NULL, 0, 0, NULL};
-consvar_t cv_chasecam2 = {"chasecam2", "On", CV_CALL, CV_OnOff, ChaseCam2_OnChange, 0, NULL, NULL, 0, 0, NULL};
-consvar_t cv_flipcam = {"flipcam", "No", CV_SAVE|CV_CALL|CV_NOINIT, CV_YesNo, FlipCam_OnChange, 0, NULL, NULL, 0, 0, NULL};
-consvar_t cv_flipcam2 = {"flipcam2", "No", CV_SAVE|CV_CALL|CV_NOINIT, CV_YesNo, FlipCam2_OnChange, 0, NULL, NULL, 0, 0, NULL};
-
-consvar_t cv_shadow = {"shadow", "On", CV_SAVE, CV_OnOff, NULL, 0, NULL, NULL, 0, 0, NULL};
-consvar_t cv_skybox = {"skybox", "On", CV_SAVE, CV_OnOff, NULL, 0, NULL, NULL, 0, 0, NULL};
-consvar_t cv_allowmlook = {"allowmlook", "Yes", CV_NETVAR, CV_YesNo, NULL, 0, NULL, NULL, 0, 0, NULL};
-consvar_t cv_showhud = {"showhud", "Yes", CV_CALL, CV_YesNo, R_SetViewSize, 0, NULL, NULL, 0, 0, NULL};
-consvar_t cv_translucenthud = {"translucenthud", "10", CV_SAVE, translucenthud_cons_t, NULL, 0, NULL, NULL, 0, 0, NULL};
-
-consvar_t cv_translucency = {"translucency", "On", CV_SAVE, CV_OnOff, NULL, 0, NULL, NULL, 0, 0, NULL};
-consvar_t cv_drawdist = {"drawdist", "Infinite", CV_SAVE, drawdist_cons_t, NULL, 0, NULL, NULL, 0, 0, NULL};
-consvar_t cv_drawdist_nights = {"drawdist_nights", "2048", CV_SAVE, drawdist_cons_t, NULL, 0, NULL, NULL, 0, 0, NULL};
-consvar_t cv_drawdist_precip = {"drawdist_precip", "1024", CV_SAVE, drawdist_precip_cons_t, NULL, 0, NULL, NULL, 0, 0, NULL};
-//consvar_t cv_precipdensity = {"precipdensity", "Moderate", CV_SAVE, precipdensity_cons_t, NULL, 0, NULL, NULL, 0, 0, NULL};
-consvar_t cv_fov = {"fov", "90", CV_FLOAT|CV_CALL, fov_cons_t, Fov_OnChange, 0, NULL, NULL, 0, 0, NULL};
+consvar_t cv_tailspickup = CVAR_INIT ("tailspickup", "On", CV_NETVAR, CV_OnOff, NULL);
+consvar_t cv_chasecam = CVAR_INIT ("chasecam", "On", CV_CALL, CV_OnOff, ChaseCam_OnChange);
+consvar_t cv_chasecam2 = CVAR_INIT ("chasecam2", "On", CV_CALL, CV_OnOff, ChaseCam2_OnChange);
+consvar_t cv_flipcam = CVAR_INIT ("flipcam", "No", CV_SAVE|CV_CALL|CV_NOINIT, CV_YesNo, FlipCam_OnChange);
+consvar_t cv_flipcam2 = CVAR_INIT ("flipcam2", "No", CV_SAVE|CV_CALL|CV_NOINIT, CV_YesNo, FlipCam2_OnChange);
+
+consvar_t cv_shadow = CVAR_INIT ("shadow", "On", CV_SAVE, CV_OnOff, NULL);
+consvar_t cv_skybox = CVAR_INIT ("skybox", "On", CV_SAVE, CV_OnOff, NULL);
+consvar_t cv_ffloorclip = CVAR_INIT ("ffloorclip", "On", CV_SAVE, CV_OnOff, NULL);
+consvar_t cv_allowmlook = CVAR_INIT ("allowmlook", "Yes", CV_NETVAR, CV_YesNo, NULL);
+consvar_t cv_showhud = CVAR_INIT ("showhud", "Yes", CV_CALL, CV_YesNo, R_SetViewSize);
+consvar_t cv_translucenthud = CVAR_INIT ("translucenthud", "10", CV_SAVE, translucenthud_cons_t, NULL);
+
+consvar_t cv_translucency = CVAR_INIT ("translucency", "On", CV_SAVE, CV_OnOff, NULL);
+consvar_t cv_drawdist = CVAR_INIT ("drawdist", "Infinite", CV_SAVE, drawdist_cons_t, NULL);
+consvar_t cv_drawdist_nights = CVAR_INIT ("drawdist_nights", "2048", CV_SAVE, drawdist_cons_t, NULL);
+consvar_t cv_drawdist_precip = CVAR_INIT ("drawdist_precip", "1024", CV_SAVE, drawdist_precip_cons_t, NULL);
+//consvar_t cv_precipdensity = CVAR_INIT ("precipdensity", "Moderate", CV_SAVE, precipdensity_cons_t, NULL);
+consvar_t cv_fov = CVAR_INIT ("fov", "90", CV_FLOAT|CV_CALL, fov_cons_t, Fov_OnChange);
// Okay, whoever said homremoval causes a performance hit should be shot.
-consvar_t cv_homremoval = {"homremoval", "No", CV_SAVE, homremoval_cons_t, NULL, 0, NULL, NULL, 0, 0, NULL};
+consvar_t cv_homremoval = CVAR_INIT ("homremoval", "No", CV_SAVE, homremoval_cons_t, NULL);
-consvar_t cv_maxportals = {"maxportals", "2", CV_SAVE, maxportals_cons_t, NULL, 0, NULL, NULL, 0, 0, NULL};
+consvar_t cv_maxportals = CVAR_INIT ("maxportals", "2", CV_SAVE, maxportals_cons_t, NULL);
-consvar_t cv_renderstats = {"renderstats", "Off", 0, CV_OnOff, NULL, 0, NULL, NULL, 0, 0, NULL};
+consvar_t cv_renderstats = CVAR_INIT ("renderstats", "Off", 0, CV_OnOff, NULL);
void SplitScreen_OnChange(void)
{
@@ -958,6 +959,16 @@ void R_ExecuteSetViewSize(void)
dy = FixedMul(abs(dy), fovtan);
yslopetab[i] = FixedDiv(centerx*FRACUNIT, dy);
}
+
+ if (ds_su)
+ Z_Free(ds_su);
+ if (ds_sv)
+ Z_Free(ds_sv);
+ if (ds_sz)
+ Z_Free(ds_sz);
+
+ ds_su = ds_sv = ds_sz = NULL;
+ ds_sup = ds_svp = ds_szp = NULL;
}
memset(scalelight, 0xFF, sizeof(scalelight));
@@ -1010,8 +1021,8 @@ void R_Init(void)
//I_OutputMsg("\nR_InitLightTables");
R_InitLightTables();
- //I_OutputMsg("\nR_InitTranslationTables\n");
- R_InitTranslationTables();
+ //I_OutputMsg("\nR_InitTranslucencyTables\n");
+ R_InitTranslucencyTables();
R_InitDrawNodes();
@@ -1078,8 +1089,6 @@ subsector_t *R_PointInSubsectorOrNull(fixed_t x, fixed_t y)
// 18/08/18: (No it's actually 16*viewheight, thanks Jimita for finding this out)
static void R_SetupFreelook(player_t *player, boolean skybox)
{
- INT32 dy = 0;
-
#ifndef HWRENDER
(void)player;
(void)skybox;
@@ -1098,14 +1107,15 @@ static void R_SetupFreelook(player_t *player, boolean skybox)
G_SoftwareClipAimingPitch((INT32 *)&aimingangle);
}
+ centeryfrac = (viewheight/2)<<FRACBITS;
+
if (rendermode == render_soft)
- {
- dy = (AIMINGTODY(aimingangle)>>FRACBITS) * viewwidth/BASEVIDWIDTH;
- yslope = &yslopetab[viewheight*8 - (viewheight/2 + dy)];
- }
+ centeryfrac += FixedMul(AIMINGTODY(aimingangle), FixedDiv(viewwidth<<FRACBITS, BASEVIDWIDTH<<FRACBITS));
- centery = (viewheight/2) + dy;
- centeryfrac = centery<<FRACBITS;
+ centery = FixedInt(FixedRound(centeryfrac));
+
+ if (rendermode == render_soft)
+ yslope = &yslopetab[viewheight*8 - centery];
}
void R_SetupFrame(player_t *player)
@@ -1472,9 +1482,6 @@ void R_RenderPlayerView(player_t *player)
}
R_ClearDrawSegs();
R_ClearSprites();
-#ifdef FLOORSPLATS
- R_ClearVisibleFloorSplats();
-#endif
Portal_InitList();
// check for new console commands.
@@ -1489,11 +1496,11 @@ void R_RenderPlayerView(player_t *player)
mytotal = 0;
ProfZeroTimer();
#endif
- rs_numbspcalls = rs_numpolyobjects = rs_numdrawnodes = 0;
- rs_bsptime = I_GetTimeMicros();
+ ps_numbspcalls = ps_numpolyobjects = ps_numdrawnodes = 0;
+ ps_bsptime = I_GetPreciseTime();
R_RenderBSPNode((INT32)numnodes - 1);
- rs_bsptime = I_GetTimeMicros() - rs_bsptime;
- rs_numsprites = visspritecount;
+ ps_bsptime = I_GetPreciseTime() - ps_bsptime;
+ ps_numsprites = visspritecount;
#ifdef TIMING
RDMSR(0x10, &mycount);
mytotal += mycount; // 64bit add
@@ -1503,7 +1510,9 @@ void R_RenderPlayerView(player_t *player)
//profile stuff ---------------------------------------------------------
Mask_Post(&masks[nummasks - 1]);
+ ps_sw_spritecliptime = I_GetPreciseTime();
R_ClipSprites(drawsegs, NULL);
+ ps_sw_spritecliptime = I_GetPreciseTime() - ps_sw_spritecliptime;
// Add skybox portals caused by sky visplanes.
@@ -1511,7 +1520,7 @@ void R_RenderPlayerView(player_t *player)
Portal_AddSkyboxPortals();
// Portal rendering. Hijacks the BSP traversal.
- rs_sw_portaltime = I_GetTimeMicros();
+ ps_sw_portaltime = I_GetPreciseTime();
if (portal_base)
{
portal_t *portal;
@@ -1551,42 +1560,21 @@ void R_RenderPlayerView(player_t *player)
Portal_Remove(portal);
}
}
- rs_sw_portaltime = I_GetTimeMicros() - rs_sw_portaltime;
+ ps_sw_portaltime = I_GetPreciseTime() - ps_sw_portaltime;
- rs_sw_planetime = I_GetTimeMicros();
+ ps_sw_planetime = I_GetPreciseTime();
R_DrawPlanes();
-#ifdef FLOORSPLATS
- R_DrawVisibleFloorSplats();
-#endif
- rs_sw_planetime = I_GetTimeMicros() - rs_sw_planetime;
+ ps_sw_planetime = I_GetPreciseTime() - ps_sw_planetime;
// draw mid texture and sprite
// And now 3D floors/sides!
- rs_sw_maskedtime = I_GetTimeMicros();
+ ps_sw_maskedtime = I_GetPreciseTime();
R_DrawMasked(masks, nummasks);
- rs_sw_maskedtime = I_GetTimeMicros() - rs_sw_maskedtime;
+ ps_sw_maskedtime = I_GetPreciseTime() - ps_sw_maskedtime;
free(masks);
}
-#ifdef HWRENDER
-void R_InitHardwareMode(void)
-{
- HWR_AddSessionCommands();
- HWR_Switch();
- HWR_LoadTextures(numtextures);
- if (gamestate == GS_LEVEL || (gamestate == GS_TITLESCREEN && titlemapinaction))
- HWR_SetupLevel();
-}
-#endif
-
-void R_ReloadHUDGraphics(void)
-{
- ST_LoadGraphics();
- HU_LoadGraphics();
- ST_ReloadSkinFaceGraphics();
-}
-
// =========================================================================
// ENGINE COMMANDS & VARS
// =========================================================================
@@ -1615,6 +1603,7 @@ void R_RegisterEngineStuff(void)
CV_RegisterVar(&cv_shadow);
CV_RegisterVar(&cv_skybox);
+ CV_RegisterVar(&cv_ffloorclip);
CV_RegisterVar(&cv_cam_dist);
CV_RegisterVar(&cv_cam_still);
diff --git a/src/r_main.h b/src/r_main.h
index 89b359c5514805c012104524ab7390a98b2cc7ce..2ac6abf5a1e45ca7b0062a1e663e221ef9825931 100644
--- a/src/r_main.h
+++ b/src/r_main.h
@@ -78,24 +78,22 @@ boolean R_DoCulling(line_t *cullheight, line_t *viewcullheight, fixed_t vz, fixe
// Render stats
-extern consvar_t cv_renderstats;
+extern precise_t ps_prevframetime;// time when previous frame was rendered
+extern precise_t ps_rendercalltime;
+extern precise_t ps_uitime;
+extern precise_t ps_swaptime;
-extern int rs_prevframetime;// time when previous frame was rendered
-extern int rs_rendercalltime;
-extern int rs_uitime;
-extern int rs_swaptime;
-extern int rs_tictime;
+extern precise_t ps_bsptime;
-extern int rs_bsptime;
+extern precise_t ps_sw_spritecliptime;
+extern precise_t ps_sw_portaltime;
+extern precise_t ps_sw_planetime;
+extern precise_t ps_sw_maskedtime;
-extern int rs_sw_portaltime;
-extern int rs_sw_planetime;
-extern int rs_sw_maskedtime;
-
-extern int rs_numbspcalls;
-extern int rs_numsprites;
-extern int rs_numdrawnodes;
-extern int rs_numpolyobjects;
+extern int ps_numbspcalls;
+extern int ps_numsprites;
+extern int ps_numdrawnodes;
+extern int ps_numpolyobjects;
//
// REFRESH - the actual rendering functions.
@@ -107,6 +105,7 @@ extern consvar_t cv_chasecam, cv_chasecam2;
extern consvar_t cv_flipcam, cv_flipcam2;
extern consvar_t cv_shadow;
+extern consvar_t cv_ffloorclip;
extern consvar_t cv_translucency;
extern consvar_t cv_drawdist, cv_drawdist_nights, cv_drawdist_precip;
extern consvar_t cv_fov;
@@ -115,10 +114,6 @@ extern consvar_t cv_tailspickup;
// Called by startup code.
void R_Init(void);
-#ifdef HWRENDER
-void R_InitHardwareMode(void);
-#endif
-void R_ReloadHUDGraphics(void);
void R_CheckViewMorph(void);
void R_ApplyViewMorph(void);
diff --git a/src/r_patch.c b/src/r_patch.c
new file mode 100644
index 0000000000000000000000000000000000000000..1a08d1892d5e13d6b36ebfe59945bce9a58b75f6
--- /dev/null
+++ b/src/r_patch.c
@@ -0,0 +1,160 @@
+// SONIC ROBO BLAST 2
+//-----------------------------------------------------------------------------
+// Copyright (C) 2020 by Jaime "Lactozilla" Passos.
+//
+// This program is free software distributed under the
+// terms of the GNU General Public License, version 2.
+// See the 'LICENSE' file for more details.
+//-----------------------------------------------------------------------------
+/// \file r_patch.c
+/// \brief Patch generation.
+
+#include "doomdef.h"
+#include "r_patch.h"
+#include "r_picformats.h"
+#include "r_defs.h"
+#include "z_zone.h"
+
+#ifdef HWRENDER
+#include "hardware/hw_glob.h"
+#endif
+
+//
+// Creates a patch.
+// Assumes a PU_PATCH zone memory tag and no user, but can always be set later
+//
+
+patch_t *Patch_Create(softwarepatch_t *source, size_t srcsize, void *dest)
+{
+ patch_t *patch = (dest == NULL) ? Z_Calloc(sizeof(patch_t), PU_PATCH, NULL) : (patch_t *)(dest);
+
+ if (source)
+ {
+ INT32 col, colsize;
+ size_t size = sizeof(INT32) * SHORT(source->width);
+ size_t offs = (sizeof(INT16) * 4) + size;
+
+ patch->width = SHORT(source->width);
+ patch->height = SHORT(source->height);
+ patch->leftoffset = SHORT(source->leftoffset);
+ patch->topoffset = SHORT(source->topoffset);
+ patch->columnofs = Z_Calloc(size, PU_PATCH_DATA, NULL);
+
+ for (col = 0; col < source->width; col++)
+ {
+ // This makes the column offsets relative to the column data itself,
+ // instead of the entire patch data
+ patch->columnofs[col] = LONG(source->columnofs[col]) - offs;
+ }
+
+ if (!srcsize)
+ I_Error("Patch_Create: no source size!");
+
+ colsize = (INT32)(srcsize) - (INT32)offs;
+ if (colsize <= 0)
+ I_Error("Patch_Create: no column data!");
+
+ patch->columns = Z_Calloc(colsize, PU_PATCH_DATA, NULL);
+ M_Memcpy(patch->columns, ((UINT8 *)source + LONG(source->columnofs[0])), colsize);
+ }
+
+ return patch;
+}
+
+//
+// Frees a patch from memory.
+//
+
+static void Patch_FreeData(patch_t *patch)
+{
+ INT32 i;
+
+#ifdef HWRENDER
+ if (patch->hardware)
+ HWR_FreeTexture(patch);
+#endif
+
+ for (i = 0; i < 4; i++)
+ {
+ if (patch->flats[i])
+ Z_Free(patch->flats[i]);
+ }
+
+#ifdef ROTSPRITE
+ if (patch->rotated)
+ {
+ rotsprite_t *rotsprite = patch->rotated;
+
+ for (i = 0; i < rotsprite->angles; i++)
+ {
+ if (rotsprite->patches[i])
+ Patch_Free(rotsprite->patches[i]);
+ }
+
+ Z_Free(rotsprite->patches);
+ Z_Free(rotsprite);
+ }
+#endif
+
+ if (patch->columnofs)
+ Z_Free(patch->columnofs);
+ if (patch->columns)
+ Z_Free(patch->columns);
+}
+
+void Patch_Free(patch_t *patch)
+{
+ Patch_FreeData(patch);
+ Z_Free(patch);
+}
+
+//
+// Frees patches with a tag range.
+//
+
+static boolean Patch_FreeTagsCallback(void *mem)
+{
+ patch_t *patch = (patch_t *)mem;
+ Patch_FreeData(patch);
+ return true;
+}
+
+void Patch_FreeTags(INT32 lowtag, INT32 hightag)
+{
+ Z_IterateTags(lowtag, hightag, Patch_FreeTagsCallback);
+}
+
+void Patch_GenerateFlat(patch_t *patch, pictureflags_t flags)
+{
+ UINT8 flip = (flags & (PICFLAGS_XFLIP | PICFLAGS_YFLIP));
+ if (patch->flats[flip] == NULL)
+ patch->flats[flip] = Picture_Convert(PICFMT_PATCH, patch, PICFMT_FLAT16, 0, NULL, 0, 0, 0, 0, flags);
+}
+
+#ifdef HWRENDER
+//
+// Allocates a hardware patch.
+//
+
+void *Patch_AllocateHardwarePatch(patch_t *patch)
+{
+ if (!patch->hardware)
+ {
+ GLPatch_t *grPatch = Z_Calloc(sizeof(GLPatch_t), PU_HWRPATCHINFO, &patch->hardware);
+ grPatch->mipmap = Z_Calloc(sizeof(GLMipmap_t), PU_HWRPATCHINFO, &grPatch->mipmap);
+ }
+ return (void *)(patch->hardware);
+}
+
+//
+// Creates a hardware patch.
+//
+
+void *Patch_CreateGL(patch_t *patch)
+{
+ GLPatch_t *grPatch = (GLPatch_t *)Patch_AllocateHardwarePatch(patch);
+ if (!grPatch->mipmap->data) // Run HWR_MakePatch in all cases, to recalculate some things
+ HWR_MakePatch(patch, grPatch, grPatch->mipmap, false);
+ return grPatch;
+}
+#endif // HWRENDER
diff --git a/src/r_patch.h b/src/r_patch.h
new file mode 100644
index 0000000000000000000000000000000000000000..32bcb3909efe057af98d54cd151f56414c71deb1
--- /dev/null
+++ b/src/r_patch.h
@@ -0,0 +1,44 @@
+// SONIC ROBO BLAST 2
+//-----------------------------------------------------------------------------
+// Copyright (C) 2020 by Jaime "Lactozilla" Passos.
+//
+// This program is free software distributed under the
+// terms of the GNU General Public License, version 2.
+// See the 'LICENSE' file for more details.
+//-----------------------------------------------------------------------------
+/// \file r_patch.h
+/// \brief Patch generation.
+
+#ifndef __R_PATCH__
+#define __R_PATCH__
+
+#include "r_defs.h"
+#include "r_picformats.h"
+#include "doomdef.h"
+
+// Patch functions
+patch_t *Patch_Create(softwarepatch_t *source, size_t srcsize, void *dest);
+void Patch_Free(patch_t *patch);
+
+#define Patch_FreeTag(tagnum) Patch_FreeTags(tagnum, tagnum)
+void Patch_FreeTags(INT32 lowtag, INT32 hightag);
+
+void Patch_GenerateFlat(patch_t *patch, pictureflags_t flags);
+
+#ifdef HWRENDER
+void *Patch_AllocateHardwarePatch(patch_t *patch);
+void *Patch_CreateGL(patch_t *patch);
+#endif
+
+#ifdef ROTSPRITE
+void Patch_Rotate(patch_t *patch, INT32 angle, INT32 xpivot, INT32 ypivot, boolean flip);
+patch_t *Patch_GetRotated(patch_t *patch, INT32 angle, boolean flip);
+patch_t *Patch_GetRotatedSprite(
+ spriteframe_t *sprite,
+ size_t frame, size_t spriteangle,
+ boolean flip, boolean adjustfeet,
+ void *info, INT32 rotationangle);
+INT32 R_GetRollAngle(angle_t rollangle);
+#endif
+
+#endif // __R_PATCH__
diff --git a/src/r_patchrotation.c b/src/r_patchrotation.c
new file mode 100644
index 0000000000000000000000000000000000000000..123c4eef229a20fa554094bf44a2cc3853e72dc8
--- /dev/null
+++ b/src/r_patchrotation.c
@@ -0,0 +1,273 @@
+// SONIC ROBO BLAST 2
+//-----------------------------------------------------------------------------
+// Copyright (C) 2020 by Jaime "Lactozilla" Passos.
+//
+// This program is free software distributed under the
+// terms of the GNU General Public License, version 2.
+// See the 'LICENSE' file for more details.
+//-----------------------------------------------------------------------------
+/// \file r_patchrotation.c
+/// \brief Patch rotation.
+
+#include "r_patchrotation.h"
+#include "r_things.h" // FEETADJUST
+#include "z_zone.h"
+#include "w_wad.h"
+
+#ifdef ROTSPRITE
+fixed_t rollcosang[ROTANGLES];
+fixed_t rollsinang[ROTANGLES];
+
+INT32 R_GetRollAngle(angle_t rollangle)
+{
+ INT32 ra = AngleFixed(rollangle)>>FRACBITS;
+#if (ROTANGDIFF > 1)
+ ra += (ROTANGDIFF/2);
+#endif
+ ra /= ROTANGDIFF;
+ ra %= ROTANGLES;
+ return ra;
+}
+
+patch_t *Patch_GetRotated(patch_t *patch, INT32 angle, boolean flip)
+{
+ rotsprite_t *rotsprite = patch->rotated;
+ if (rotsprite == NULL || angle < 1 || angle >= ROTANGLES)
+ return NULL;
+
+ if (flip)
+ angle += rotsprite->angles;
+
+ return rotsprite->patches[angle];
+}
+
+patch_t *Patch_GetRotatedSprite(
+ spriteframe_t *sprite,
+ size_t frame, size_t spriteangle,
+ boolean flip, boolean adjustfeet,
+ void *info, INT32 rotationangle)
+{
+ rotsprite_t *rotsprite;
+ spriteinfo_t *sprinfo = (spriteinfo_t *)info;
+ INT32 idx = rotationangle;
+ UINT8 type = (adjustfeet ? 1 : 0);
+
+ if (rotationangle < 1 || rotationangle >= ROTANGLES)
+ return NULL;
+
+ rotsprite = sprite->rotated[type][spriteangle];
+
+ if (rotsprite == NULL)
+ {
+ rotsprite = RotatedPatch_Create(ROTANGLES);
+ sprite->rotated[type][spriteangle] = rotsprite;
+ }
+
+ if (flip)
+ idx += rotsprite->angles;
+
+ if (rotsprite->patches[idx] == NULL)
+ {
+ patch_t *patch;
+ INT32 xpivot = 0, ypivot = 0;
+ lumpnum_t lump = sprite->lumppat[spriteangle];
+
+ if (lump == LUMPERROR)
+ return NULL;
+
+ patch = W_CachePatchNum(lump, PU_SPRITE);
+
+ if (sprinfo->available)
+ {
+ xpivot = sprinfo->pivot[frame].x;
+ ypivot = sprinfo->pivot[frame].y;
+ }
+ else
+ {
+ xpivot = patch->leftoffset;
+ ypivot = patch->height / 2;
+ }
+
+ RotatedPatch_DoRotation(rotsprite, patch, rotationangle, xpivot, ypivot, flip);
+
+ //BP: we cannot use special tric in hardware mode because feet in ground caused by z-buffer
+ if (adjustfeet)
+ ((patch_t *)rotsprite->patches[idx])->topoffset += FEETADJUST>>FRACBITS;
+ }
+
+ return rotsprite->patches[idx];
+}
+
+void Patch_Rotate(patch_t *patch, INT32 angle, INT32 xpivot, INT32 ypivot, boolean flip)
+{
+ if (patch->rotated == NULL)
+ patch->rotated = RotatedPatch_Create(ROTANGLES);
+ RotatedPatch_DoRotation(patch->rotated, patch, angle, xpivot, ypivot, flip);
+}
+
+rotsprite_t *RotatedPatch_Create(INT32 numangles)
+{
+ rotsprite_t *rotsprite = Z_Calloc(sizeof(rotsprite_t), PU_STATIC, NULL);
+ rotsprite->angles = numangles;
+ rotsprite->patches = Z_Calloc(rotsprite->angles * 2 * sizeof(void *), PU_STATIC, NULL);
+ return rotsprite;
+}
+
+static void RotatedPatch_CalculateDimensions(
+ INT32 width, INT32 height,
+ fixed_t ca, fixed_t sa,
+ INT32 *newwidth, INT32 *newheight)
+{
+ fixed_t fixedwidth = (width * FRACUNIT);
+ fixed_t fixedheight = (height * FRACUNIT);
+
+ fixed_t w1 = abs(FixedMul(fixedwidth, ca) - FixedMul(fixedheight, sa));
+ fixed_t w2 = abs(FixedMul(-fixedwidth, ca) - FixedMul(fixedheight, sa));
+ fixed_t h1 = abs(FixedMul(fixedwidth, sa) + FixedMul(fixedheight, ca));
+ fixed_t h2 = abs(FixedMul(-fixedwidth, sa) + FixedMul(fixedheight, ca));
+
+ w1 = FixedInt(FixedCeil(w1 + (FRACUNIT/2)));
+ w2 = FixedInt(FixedCeil(w2 + (FRACUNIT/2)));
+ h1 = FixedInt(FixedCeil(h1 + (FRACUNIT/2)));
+ h2 = FixedInt(FixedCeil(h2 + (FRACUNIT/2)));
+
+ *newwidth = max(width, max(w1, w2));
+ *newheight = max(height, max(h1, h2));
+}
+
+void RotatedPatch_DoRotation(rotsprite_t *rotsprite, patch_t *patch, INT32 angle, INT32 xpivot, INT32 ypivot, boolean flip)
+{
+ patch_t *rotated;
+ UINT16 *rawdst, *rawconv;
+ size_t size;
+ pictureflags_t bflip = (flip) ? PICFLAGS_XFLIP : 0;
+
+ INT32 width = patch->width;
+ INT32 height = patch->height;
+ INT32 leftoffset = patch->leftoffset;
+ INT32 newwidth, newheight;
+
+ fixed_t ca = rollcosang[angle];
+ fixed_t sa = rollsinang[angle];
+ fixed_t xcenter, ycenter;
+ INT32 idx = angle;
+ INT32 x, y;
+ INT32 sx, sy;
+ INT32 dx, dy;
+ INT32 ox, oy;
+ INT32 minx, miny, maxx, maxy;
+
+ // Don't cache angle = 0
+ if (angle < 1 || angle >= ROTANGLES)
+ return;
+
+ if (flip)
+ {
+ idx += rotsprite->angles;
+ xpivot = width - xpivot;
+ leftoffset = width - leftoffset;
+ }
+
+ if (rotsprite->patches[idx])
+ return;
+
+ // Find the dimensions of the rotated patch.
+ RotatedPatch_CalculateDimensions(width, height, ca, sa, &newwidth, &newheight);
+
+ xcenter = (xpivot * FRACUNIT);
+ ycenter = (ypivot * FRACUNIT);
+
+ if (xpivot != width / 2 || ypivot != height / 2)
+ {
+ newwidth *= 2;
+ newheight *= 2;
+ }
+
+ minx = newwidth;
+ miny = newheight;
+ maxx = 0;
+ maxy = 0;
+
+ // Draw the rotated sprite to a temporary buffer.
+ size = (newwidth * newheight);
+ if (!size)
+ size = (width * height);
+ rawdst = Z_Calloc(size * sizeof(UINT16), PU_STATIC, NULL);
+
+ for (dy = 0; dy < newheight; dy++)
+ {
+ for (dx = 0; dx < newwidth; dx++)
+ {
+ x = (dx - (newwidth / 2)) * FRACUNIT;
+ y = (dy - (newheight / 2)) * FRACUNIT;
+ sx = FixedMul(x, ca) + FixedMul(y, sa) + xcenter;
+ sy = -FixedMul(x, sa) + FixedMul(y, ca) + ycenter;
+
+ sx >>= FRACBITS;
+ sy >>= FRACBITS;
+
+ if (sx >= 0 && sy >= 0 && sx < width && sy < height)
+ {
+ void *input = Picture_GetPatchPixel(patch, PICFMT_PATCH, sx, sy, bflip);
+ if (input != NULL)
+ {
+ rawdst[(dy * newwidth) + dx] = (0xFF00 | (*(UINT8 *)input));
+ if (dx < minx)
+ minx = dx;
+ if (dy < miny)
+ miny = dy;
+ if (dx > maxx)
+ maxx = dx;
+ if (dy > maxy)
+ maxy = dy;
+ }
+ }
+ }
+ }
+
+ ox = (newwidth / 2) + (leftoffset - xpivot);
+ oy = (newheight / 2) + (patch->topoffset - ypivot);
+ width = (maxx - minx);
+ height = (maxy - miny);
+
+ if ((unsigned)(width * height) != size)
+ {
+ UINT16 *src, *dest;
+
+ size = (width * height);
+ rawconv = Z_Calloc(size * sizeof(UINT16), PU_STATIC, NULL);
+
+ src = &rawdst[(miny * newwidth) + minx];
+ dest = rawconv;
+ dy = height;
+
+ while (dy--)
+ {
+ M_Memcpy(dest, src, width * sizeof(UINT16));
+ dest += width;
+ src += newwidth;
+ }
+
+ ox -= minx;
+ oy -= miny;
+
+ Z_Free(rawdst);
+ }
+ else
+ {
+ rawconv = rawdst;
+ width = newwidth;
+ height = newheight;
+ }
+
+ // make patch
+ rotated = (patch_t *)Picture_Convert(PICFMT_FLAT16, rawconv, PICFMT_PATCH, 0, NULL, width, height, 0, 0, 0);
+
+ Z_ChangeTag(rotated, PU_PATCH_ROTATED);
+ Z_SetUser(rotated, (void **)(&rotsprite->patches[idx]));
+ Z_Free(rawconv);
+
+ rotated->leftoffset = ox;
+ rotated->topoffset = oy;
+}
+#endif
diff --git a/src/r_patchrotation.h b/src/r_patchrotation.h
new file mode 100644
index 0000000000000000000000000000000000000000..2744f71d25380469b30b1fdcf8b5112578a2abd8
--- /dev/null
+++ b/src/r_patchrotation.h
@@ -0,0 +1,21 @@
+// SONIC ROBO BLAST 2
+//-----------------------------------------------------------------------------
+// Copyright (C) 2020 by Jaime "Lactozilla" Passos.
+//
+// This program is free software distributed under the
+// terms of the GNU General Public License, version 2.
+// See the 'LICENSE' file for more details.
+//-----------------------------------------------------------------------------
+/// \file r_patchrotation.h
+/// \brief Patch rotation.
+
+#include "r_patch.h"
+#include "r_picformats.h"
+
+#ifdef ROTSPRITE
+rotsprite_t *RotatedPatch_Create(INT32 numangles);
+void RotatedPatch_DoRotation(rotsprite_t *rotsprite, patch_t *patch, INT32 angle, INT32 xpivot, INT32 ypivot, boolean flip);
+
+extern fixed_t rollcosang[ROTANGLES];
+extern fixed_t rollsinang[ROTANGLES];
+#endif
diff --git a/src/r_picformats.c b/src/r_picformats.c
index 95fe23aeb11e6e355ed84644e3b9aa1b421b2f7c..f87362c76ef895097b7e21329367c6b082fa705e 100644
--- a/src/r_picformats.c
+++ b/src/r_picformats.c
@@ -16,10 +16,11 @@
#include "dehacked.h"
#include "i_video.h"
#include "r_data.h"
-#include "r_textures.h"
-#include "r_draw.h"
+#include "r_patch.h"
#include "r_picformats.h"
+#include "r_textures.h"
#include "r_things.h"
+#include "r_draw.h"
#include "v_video.h"
#include "z_zone.h"
#include "w_wad.h"
@@ -142,10 +143,21 @@ void *Picture_PatchConvert(
if (Picture_IsPatchFormat(informat))
{
inpatch = (patch_t *)picture;
- inwidth = SHORT(inpatch->width);
- inheight = SHORT(inpatch->height);
- inleftoffset = SHORT(inpatch->leftoffset);
- intopoffset = SHORT(inpatch->topoffset);
+ if (Picture_IsDoomPatchFormat(informat))
+ {
+ softwarepatch_t *doompatch = (softwarepatch_t *)picture;
+ inwidth = SHORT(doompatch->width);
+ inheight = SHORT(doompatch->height);
+ inleftoffset = SHORT(doompatch->leftoffset);
+ intopoffset = SHORT(doompatch->topoffset);
+ }
+ else
+ {
+ inwidth = inpatch->width;
+ inheight = inpatch->height;
+ inleftoffset = inpatch->leftoffset;
+ intopoffset = inpatch->topoffset;
+ }
}
// Write image size and offset
@@ -275,6 +287,7 @@ void *Picture_PatchConvert(
switch (outformat)
{
case PICFMT_PATCH32:
+ case PICFMT_DOOMPATCH32:
{
if (inbpp == PICDEPTH_32BPP)
{
@@ -294,6 +307,7 @@ void *Picture_PatchConvert(
break;
}
case PICFMT_PATCH16:
+ case PICFMT_DOOMPATCH16:
if (inbpp == PICDEPTH_32BPP)
{
RGBA_t in = *(RGBA_t *)input;
@@ -338,9 +352,26 @@ void *Picture_PatchConvert(
img = Z_Malloc(size, PU_STATIC, NULL);
memcpy(img, imgbuf, size);
- if (outsize != NULL)
- *outsize = size;
- return img;
+ if (Picture_IsInternalPatchFormat(outformat))
+ {
+ patch_t *converted = Patch_Create((softwarepatch_t *)img, size, NULL);
+
+#ifdef HWRENDER
+ Patch_CreateGL(converted);
+#endif
+
+ Z_Free(img);
+
+ if (outsize != NULL)
+ *outsize = sizeof(patch_t);
+ return converted;
+ }
+ else
+ {
+ if (outsize != NULL)
+ *outsize = size;
+ return img;
+ }
}
/** Converts a picture to a flat.
@@ -391,8 +422,17 @@ void *Picture_FlatConvert(
if (Picture_IsPatchFormat(informat))
{
inpatch = (patch_t *)picture;
- inwidth = SHORT(inpatch->width);
- inheight = SHORT(inpatch->height);
+ if (Picture_IsDoomPatchFormat(informat))
+ {
+ softwarepatch_t *doompatch = ((softwarepatch_t *)picture);
+ inwidth = SHORT(doompatch->width);
+ inheight = SHORT(doompatch->height);
+ }
+ else
+ {
+ inwidth = inpatch->width;
+ inheight = inpatch->height;
+ }
}
size = (inwidth * inheight) * (outbpp / 8);
@@ -503,22 +543,26 @@ void *Picture_GetPatchPixel(
UINT8 *s8 = NULL;
UINT16 *s16 = NULL;
UINT32 *s32 = NULL;
+ softwarepatch_t *doompatch = (softwarepatch_t *)patch;
+ boolean isdoompatch = Picture_IsDoomPatchFormat(informat);
+ INT16 width;
if (patch == NULL)
I_Error("Picture_GetPatchPixel: patch == NULL");
- if (x >= 0 && x < SHORT(patch->width))
+ width = (isdoompatch ? SHORT(doompatch->width) : patch->width);
+
+ if (x >= 0 && x < width)
{
+ INT32 colx = (flags & PICFLAGS_XFLIP) ? (width-1)-x : x;
INT32 topdelta, prevdelta = -1;
- INT32 colofs = 0;
+ INT32 colofs = (isdoompatch ? LONG(doompatch->columnofs[colx]) : patch->columnofs[colx]);
- if (flags & PICFLAGS_XFLIP)
- colofs = LONG(patch->columnofs[(SHORT(patch->width)-1)-x]);
+ // Column offsets are pointers, so no casting is required.
+ if (isdoompatch)
+ column = (column_t *)((UINT8 *)doompatch + colofs);
else
- colofs = LONG(patch->columnofs[x]);
-
- // Column offsets are pointers so no casting required
- column = (column_t *)((UINT8 *)patch + colofs);
+ column = (column_t *)((UINT8 *)patch->columns + colofs);
while (column->topdelta != 0xff)
{
@@ -527,25 +571,25 @@ void *Picture_GetPatchPixel(
topdelta += prevdelta;
prevdelta = topdelta;
s8 = (UINT8 *)(column) + 3;
- if (informat == PICFMT_PATCH32)
+ if (Picture_FormatBPP(informat) == PICDEPTH_32BPP)
s32 = (UINT32 *)s8;
- else if (informat == PICFMT_PATCH16)
+ else if (Picture_FormatBPP(informat) == PICDEPTH_16BPP)
s16 = (UINT16 *)s8;
for (ofs = 0; ofs < column->length; ofs++)
{
if ((topdelta + ofs) == y)
{
- if (informat == PICFMT_PATCH32)
+ if (Picture_FormatBPP(informat) == PICDEPTH_32BPP)
return &s32[ofs];
- else if (informat == PICFMT_PATCH16)
+ else if (Picture_FormatBPP(informat) == PICDEPTH_16BPP)
return &s16[ofs];
- else // PICFMT_PATCH
+ else // PICDEPTH_8BPP
return &s8[ofs];
}
}
- if (informat == PICFMT_PATCH32)
+ if (Picture_FormatBPP(informat) == PICDEPTH_32BPP)
column = (column_t *)((UINT32 *)column + column->length);
- else if (informat == PICFMT_PATCH16)
+ else if (Picture_FormatBPP(informat) == PICDEPTH_16BPP)
column = (column_t *)((UINT16 *)column + column->length);
else
column = (column_t *)((UINT8 *)column + column->length);
@@ -568,15 +612,18 @@ INT32 Picture_FormatBPP(pictureformat_t format)
{
case PICFMT_PATCH32:
case PICFMT_FLAT32:
+ case PICFMT_DOOMPATCH32:
case PICFMT_PNG:
bpp = PICDEPTH_32BPP;
break;
case PICFMT_PATCH16:
case PICFMT_FLAT16:
+ case PICFMT_DOOMPATCH16:
bpp = PICDEPTH_16BPP;
break;
case PICFMT_PATCH:
case PICFMT_FLAT:
+ case PICFMT_DOOMPATCH:
bpp = PICDEPTH_8BPP;
break;
default:
@@ -592,7 +639,43 @@ INT32 Picture_FormatBPP(pictureformat_t format)
*/
boolean Picture_IsPatchFormat(pictureformat_t format)
{
- return (format == PICFMT_PATCH || format == PICFMT_PATCH16 || format == PICFMT_PATCH32);
+ return (Picture_IsInternalPatchFormat(format) || Picture_IsDoomPatchFormat(format));
+}
+
+/** Checks if the specified picture format is an internal patch.
+ *
+ * \param format Input picture format.
+ * \return True if the picture format is an internal patch, false if not.
+ */
+boolean Picture_IsInternalPatchFormat(pictureformat_t format)
+{
+ switch (format)
+ {
+ case PICFMT_PATCH:
+ case PICFMT_PATCH16:
+ case PICFMT_PATCH32:
+ return true;
+ default:
+ return false;
+ }
+}
+
+/** Checks if the specified picture format is a Doom patch.
+ *
+ * \param format Input picture format.
+ * \return True if the picture format is a Doom patch, false if not.
+ */
+boolean Picture_IsDoomPatchFormat(pictureformat_t format)
+{
+ switch (format)
+ {
+ case PICFMT_DOOMPATCH:
+ case PICFMT_DOOMPATCH16:
+ case PICFMT_DOOMPATCH32:
+ return true;
+ default:
+ return false;
+ }
}
/** Checks if the specified picture format is a flat.
@@ -605,14 +688,14 @@ boolean Picture_IsFlatFormat(pictureformat_t format)
return (format == PICFMT_FLAT || format == PICFMT_FLAT16 || format == PICFMT_FLAT32);
}
-/** Returns true if the lump is a valid patch.
- * PICFMT_PATCH only, I think??
+/** Returns true if the lump is a valid Doom patch.
+ * PICFMT_DOOMPATCH only.
*
* \param patch Input patch.
* \param picture Input patch size.
* \return True if the input patch is valid.
*/
-boolean Picture_CheckIfPatch(patch_t *patch, size_t size)
+boolean Picture_CheckIfDoomPatch(softwarepatch_t *patch, size_t size)
{
INT16 width, height;
boolean result;
@@ -887,26 +970,45 @@ static png_bytep *PNG_Read(
// matches the color count of SRB2's palette: 256 colors.
if (png_get_PLTE(png_ptr, png_info_ptr, &palette, &palette_size))
{
- if (palette_size == 256)
+ if (palette_size == 256 && pMasterPalette)
+ {
+ png_colorp pal = palette;
+ INT32 i;
+
usepal = true;
+
+ for (i = 0; i < 256; i++)
+ {
+ UINT32 rgb = R_PutRgbaRGBA(pal->red, pal->green, pal->blue, 0xFF);
+ if (rgb != pMasterPalette[i].rgba)
+ {
+ usepal = false;
+ break;
+ }
+ pal++;
+ }
+ }
}
// If any of the tRNS colors have an alpha lower than 0xFF, and that
// color is present on the image, the palette flag is disabled.
- png_get_tRNS(png_ptr, png_info_ptr, &trans, &trans_num, &trans_values);
-
- if (trans && trans_num == 256)
+ if (usepal)
{
- int i;
- for (i = 0; i < trans_num; i++)
+ png_get_tRNS(png_ptr, png_info_ptr, &trans, &trans_num, &trans_values);
+
+ if (trans && trans_num == 256)
{
- // libpng will transform this image into RGB even if
- // the transparent index does not exist in the image,
- // and there is no way around that.
- if (trans[i] < 0xFF)
+ INT32 i;
+ for (i = 0; i < trans_num; i++)
{
- usepal = false;
- break;
+ // libpng will transform this image into RGB even if
+ // the transparent index does not exist in the image,
+ // and there is no way around that.
+ if (trans[i] < 0xFF)
+ {
+ usepal = false;
+ break;
+ }
}
}
}
@@ -1446,11 +1548,6 @@ static void R_ParseSpriteInfo(boolean spr2)
info = Z_Calloc(sizeof(spriteinfo_t), PU_STATIC, NULL);
info->available = true;
-#ifdef ROTSPRITE
- if ((sprites != NULL) && (!spr2))
- R_FreeSingleRotSprite(&sprites[sprnum]);
-#endif
-
// Left Curly Brace
sprinfoToken = M_GetToken(NULL);
if (sprinfoToken == NULL)
@@ -1511,9 +1608,6 @@ static void R_ParseSpriteInfo(boolean spr2)
size_t skinnum = skinnumbers[i];
skin_t *skin = &skins[skinnum];
spriteinfo_t *sprinfo = skin->sprinfo;
-#ifdef ROTSPRITE
- R_FreeSkinRotSprite(skinnum);
-#endif
M_Memcpy(&sprinfo[spr2num], info, sizeof(spriteinfo_t));
}
}
@@ -1603,316 +1697,3 @@ void R_LoadSpriteInfoLumps(UINT16 wadnum, UINT16 numlumps)
R_ParseSPRTINFOLump(wadnum, i);
}
}
-
-#ifdef ROTSPRITE
-//
-// R_GetRollAngle
-//
-// Angles precalculated in R_InitSprites.
-//
-fixed_t rollcosang[ROTANGLES];
-fixed_t rollsinang[ROTANGLES];
-INT32 R_GetRollAngle(angle_t rollangle)
-{
- INT32 ra = AngleFixed(rollangle)>>FRACBITS;
-#if (ROTANGDIFF > 1)
- ra += (ROTANGDIFF/2);
-#endif
- ra /= ROTANGDIFF;
- ra %= ROTANGLES;
- return ra;
-}
-
-//
-// R_CacheRotSprite
-//
-// Create a rotated sprite.
-//
-void R_CacheRotSprite(spritenum_t sprnum, UINT8 frame, spriteinfo_t *sprinfo, spriteframe_t *sprframe, INT32 rot, UINT8 flip)
-{
- INT32 angle;
- patch_t *patch;
- patch_t *newpatch;
- UINT16 *rawdst;
- size_t size;
- pictureflags_t bflip = (flip) ? PICFLAGS_XFLIP : 0;
-
-#define SPRITE_XCENTER (leftoffset)
-#define SPRITE_YCENTER (height / 2)
-#define ROTSPRITE_XCENTER (newwidth / 2)
-#define ROTSPRITE_YCENTER (newheight / 2)
-
- if (!(sprframe->rotsprite.cached & (1<<rot)))
- {
- INT32 dx, dy;
- INT32 px, py;
- INT32 width, height, leftoffset;
- fixed_t ca, sa;
- lumpnum_t lump = sprframe->lumppat[rot];
-#ifndef NO_PNG_LUMPS
- size_t lumplength;
-#endif
-
- if (lump == LUMPERROR)
- return;
-
- patch = (patch_t *)W_CacheLumpNum(lump, PU_STATIC);
-#ifndef NO_PNG_LUMPS
- lumplength = W_LumpLength(lump);
-
- if (Picture_IsLumpPNG((const UINT8 *)patch, lumplength))
- patch = (patch_t *)Picture_PNGConvert((const UINT8 *)patch, PICFMT_PATCH, NULL, NULL, NULL, NULL, lumplength, NULL, 0);
- else
-#endif
- // Because there's something wrong with SPR_DFLM, I guess
- if (!Picture_CheckIfPatch(patch, lumplength))
- return;
-
- width = SHORT(patch->width);
- height = SHORT(patch->height);
- leftoffset = SHORT(patch->leftoffset);
-
- // rotation pivot
- px = SPRITE_XCENTER;
- py = SPRITE_YCENTER;
-
- // get correct sprite info for sprite
- if (sprinfo == NULL)
- sprinfo = &spriteinfo[sprnum];
- if (sprinfo->available)
- {
- px = sprinfo->pivot[frame].x;
- py = sprinfo->pivot[frame].y;
- }
- if (bflip)
- {
- px = width - px;
- leftoffset = width - leftoffset;
- }
-
- // Don't cache angle = 0
- for (angle = 1; angle < ROTANGLES; angle++)
- {
- INT32 newwidth, newheight;
-
- ca = rollcosang[angle];
- sa = rollsinang[angle];
-
- // Find the dimensions of the rotated patch.
- {
- INT32 w1 = abs(FixedMul(width << FRACBITS, ca) - FixedMul(height << FRACBITS, sa));
- INT32 w2 = abs(FixedMul(-(width << FRACBITS), ca) - FixedMul(height << FRACBITS, sa));
- INT32 h1 = abs(FixedMul(width << FRACBITS, sa) + FixedMul(height << FRACBITS, ca));
- INT32 h2 = abs(FixedMul(-(width << FRACBITS), sa) + FixedMul(height << FRACBITS, ca));
- w1 = FixedInt(FixedCeil(w1 + (FRACUNIT/2)));
- w2 = FixedInt(FixedCeil(w2 + (FRACUNIT/2)));
- h1 = FixedInt(FixedCeil(h1 + (FRACUNIT/2)));
- h2 = FixedInt(FixedCeil(h2 + (FRACUNIT/2)));
- newwidth = max(width, max(w1, w2));
- newheight = max(height, max(h1, h2));
- }
-
- // check boundaries
- {
- fixed_t top[2][2];
- fixed_t bottom[2][2];
-
- top[0][0] = FixedMul((-ROTSPRITE_XCENTER) << FRACBITS, ca) + FixedMul((-ROTSPRITE_YCENTER) << FRACBITS, sa) + (px << FRACBITS);
- top[0][1] = FixedMul((-ROTSPRITE_XCENTER) << FRACBITS, sa) + FixedMul((-ROTSPRITE_YCENTER) << FRACBITS, ca) + (py << FRACBITS);
- top[1][0] = FixedMul((newwidth-ROTSPRITE_XCENTER) << FRACBITS, ca) + FixedMul((-ROTSPRITE_YCENTER) << FRACBITS, sa) + (px << FRACBITS);
- top[1][1] = FixedMul((newwidth-ROTSPRITE_XCENTER) << FRACBITS, sa) + FixedMul((-ROTSPRITE_YCENTER) << FRACBITS, ca) + (py << FRACBITS);
-
- bottom[0][0] = FixedMul((-ROTSPRITE_XCENTER) << FRACBITS, ca) + FixedMul((newheight-ROTSPRITE_YCENTER) << FRACBITS, sa) + (px << FRACBITS);
- bottom[0][1] = -FixedMul((-ROTSPRITE_XCENTER) << FRACBITS, sa) + FixedMul((newheight-ROTSPRITE_YCENTER) << FRACBITS, ca) + (py << FRACBITS);
- bottom[1][0] = FixedMul((newwidth-ROTSPRITE_XCENTER) << FRACBITS, ca) + FixedMul((newheight-ROTSPRITE_YCENTER) << FRACBITS, sa) + (px << FRACBITS);
- bottom[1][1] = -FixedMul((newwidth-ROTSPRITE_XCENTER) << FRACBITS, sa) + FixedMul((newheight-ROTSPRITE_YCENTER) << FRACBITS, ca) + (py << FRACBITS);
-
- top[0][0] >>= FRACBITS;
- top[0][1] >>= FRACBITS;
- top[1][0] >>= FRACBITS;
- top[1][1] >>= FRACBITS;
-
- bottom[0][0] >>= FRACBITS;
- bottom[0][1] >>= FRACBITS;
- bottom[1][0] >>= FRACBITS;
- bottom[1][1] >>= FRACBITS;
-
-#define BOUNDARYWCHECK(b) (b[0] < 0 || b[0] >= width)
-#define BOUNDARYHCHECK(b) (b[1] < 0 || b[1] >= height)
-#define BOUNDARYADJUST(x) x *= 2
- // top left/right
- if (BOUNDARYWCHECK(top[0]) || BOUNDARYWCHECK(top[1]))
- BOUNDARYADJUST(newwidth);
- // bottom left/right
- else if (BOUNDARYWCHECK(bottom[0]) || BOUNDARYWCHECK(bottom[1]))
- BOUNDARYADJUST(newwidth);
- // top left/right
- if (BOUNDARYHCHECK(top[0]) || BOUNDARYHCHECK(top[1]))
- BOUNDARYADJUST(newheight);
- // bottom left/right
- else if (BOUNDARYHCHECK(bottom[0]) || BOUNDARYHCHECK(bottom[1]))
- BOUNDARYADJUST(newheight);
-#undef BOUNDARYWCHECK
-#undef BOUNDARYHCHECK
-#undef BOUNDARYADJUST
- }
-
- // Draw the rotated sprite to a temporary buffer.
- size = (newwidth * newheight);
- if (!size)
- size = (width * height);
- rawdst = Z_Calloc(size * sizeof(UINT16), PU_STATIC, NULL);
-
- for (dy = 0; dy < newheight; dy++)
- {
- for (dx = 0; dx < newwidth; dx++)
- {
- INT32 x = (dx-ROTSPRITE_XCENTER) << FRACBITS;
- INT32 y = (dy-ROTSPRITE_YCENTER) << FRACBITS;
- INT32 sx = FixedMul(x, ca) + FixedMul(y, sa) + (px << FRACBITS);
- INT32 sy = -FixedMul(x, sa) + FixedMul(y, ca) + (py << FRACBITS);
- sx >>= FRACBITS;
- sy >>= FRACBITS;
- if (sx >= 0 && sy >= 0 && sx < width && sy < height)
- {
- void *input = Picture_GetPatchPixel(patch, PICFMT_PATCH, sx, sy, bflip);
- if (input != NULL)
- rawdst[(dy*newwidth)+dx] = (0xFF00 | (*(UINT8 *)input));
- }
- }
- }
-
- // make patch
- newpatch = (patch_t *)Picture_Convert(PICFMT_FLAT16, rawdst, PICFMT_PATCH, 0, &size, newwidth, newheight, 0, 0, 0);
- {
- newpatch->leftoffset = (newpatch->width / 2) + (leftoffset - px);
- newpatch->topoffset = (newpatch->height / 2) + (SHORT(patch->topoffset) - py);
- }
-
- //BP: we cannot use special tric in hardware mode because feet in ground caused by z-buffer
- if (rendermode != render_none) // not for psprite
- newpatch->topoffset += FEETADJUST>>FRACBITS;
-
- // P_PrecacheLevel
- if (devparm) spritememory += size;
-
- // convert everything to little-endian, for big-endian support
- newpatch->width = SHORT(newpatch->width);
- newpatch->height = SHORT(newpatch->height);
- newpatch->leftoffset = SHORT(newpatch->leftoffset);
- newpatch->topoffset = SHORT(newpatch->topoffset);
-
-#ifdef HWRENDER
- if (rendermode == render_opengl)
- {
- GLPatch_t *grPatch = Z_Calloc(sizeof(GLPatch_t), PU_HWRPATCHINFO, NULL);
- grPatch->mipmap = Z_Calloc(sizeof(GLMipmap_t), PU_HWRPATCHINFO, NULL);
- grPatch->rawpatch = newpatch;
- sprframe->rotsprite.patch[rot][angle] = (patch_t *)grPatch;
- HWR_MakePatch(newpatch, grPatch, grPatch->mipmap, false);
- }
- else
-#endif // HWRENDER
- sprframe->rotsprite.patch[rot][angle] = newpatch;
-
- // free rotated image data
- Z_Free(rawdst);
- }
-
- // This rotation is cached now
- sprframe->rotsprite.cached |= (1<<rot);
-
- // free image data
- Z_Free(patch);
- }
-#undef SPRITE_XCENTER
-#undef SPRITE_YCENTER
-#undef ROTSPRITE_XCENTER
-#undef ROTSPRITE_YCENTER
-}
-
-//
-// R_FreeSingleRotSprite
-//
-// Free sprite rotation data from memory, for a single spritedef.
-//
-void R_FreeSingleRotSprite(spritedef_t *spritedef)
-{
- UINT8 frame;
- INT32 rot, ang;
-
- for (frame = 0; frame < spritedef->numframes; frame++)
- {
- spriteframe_t *sprframe = &spritedef->spriteframes[frame];
- for (rot = 0; rot < 16; rot++)
- {
- if (sprframe->rotsprite.cached & (1<<rot))
- {
- for (ang = 0; ang < ROTANGLES; ang++)
- {
- patch_t *rotsprite = sprframe->rotsprite.patch[rot][ang];
- if (rotsprite)
- {
-#ifdef HWRENDER
- if (rendermode == render_opengl)
- {
- GLPatch_t *grPatch = (GLPatch_t *)rotsprite;
- if (grPatch->rawpatch)
- {
- Z_Free(grPatch->rawpatch);
- grPatch->rawpatch = NULL;
- }
- if (grPatch->mipmap)
- {
- if (grPatch->mipmap->data)
- {
- Z_Free(grPatch->mipmap->data);
- grPatch->mipmap->data = NULL;
- }
- Z_Free(grPatch->mipmap);
- grPatch->mipmap = NULL;
- }
- }
-#endif
- Z_Free(rotsprite);
- }
- }
- sprframe->rotsprite.cached &= ~(1<<rot);
- }
- }
- }
-}
-
-//
-// R_FreeSkinRotSprite
-//
-// Free sprite rotation data from memory, for a skin.
-// Calls R_FreeSingleRotSprite.
-//
-void R_FreeSkinRotSprite(size_t skinnum)
-{
- size_t i;
- skin_t *skin = &skins[skinnum];
- spritedef_t *skinsprites = skin->sprites;
- for (i = 0; i < NUMPLAYERSPRITES*2; i++)
- {
- R_FreeSingleRotSprite(skinsprites);
- skinsprites++;
- }
-}
-
-//
-// R_FreeAllRotSprite
-//
-// Free ALL sprite rotation data from memory.
-//
-void R_FreeAllRotSprite(void)
-{
- INT32 i;
- size_t s;
- for (s = 0; s < numsprites; s++)
- R_FreeSingleRotSprite(&sprites[s]);
- for (i = 0; i < numskins; ++i)
- R_FreeSkinRotSprite(i);
-}
-#endif
diff --git a/src/r_picformats.h b/src/r_picformats.h
index 3ee76a92f1bf2c521ef92372429543e7de10cba8..8d3999013475f23b9428e0e252148d91c88c8ea2 100644
--- a/src/r_picformats.h
+++ b/src/r_picformats.h
@@ -24,6 +24,7 @@ typedef enum
// Doom formats
PICFMT_PATCH,
PICFMT_FLAT,
+ PICFMT_DOOMPATCH,
// PNG
PICFMT_PNG,
@@ -31,10 +32,12 @@ typedef enum
// 16bpp
PICFMT_PATCH16,
PICFMT_FLAT16,
+ PICFMT_DOOMPATCH16,
// 32bpp
PICFMT_PATCH32,
- PICFMT_FLAT32
+ PICFMT_FLAT32,
+ PICFMT_DOOMPATCH32
} pictureformat_t;
typedef enum
@@ -76,8 +79,10 @@ void *Picture_TextureToFlat(size_t trickytex);
INT32 Picture_FormatBPP(pictureformat_t format);
boolean Picture_IsPatchFormat(pictureformat_t format);
+boolean Picture_IsInternalPatchFormat(pictureformat_t format);
+boolean Picture_IsDoomPatchFormat(pictureformat_t format);
boolean Picture_IsFlatFormat(pictureformat_t format);
-boolean Picture_CheckIfPatch(patch_t *patch, size_t size);
+boolean Picture_CheckIfDoomPatch(softwarepatch_t *patch, size_t size);
// Structs
typedef enum
@@ -120,15 +125,4 @@ extern spriteinfo_t spriteinfo[NUMSPRITES];
void R_LoadSpriteInfoLumps(UINT16 wadnum, UINT16 numlumps);
void R_ParseSPRTINFOLump(UINT16 wadNum, UINT16 lumpNum);
-// Sprite rotation
-#ifdef ROTSPRITE
-INT32 R_GetRollAngle(angle_t rollangle);
-void R_CacheRotSprite(spritenum_t sprnum, UINT8 frame, spriteinfo_t *sprinfo, spriteframe_t *sprframe, INT32 rot, UINT8 flip);
-void R_FreeSingleRotSprite(spritedef_t *spritedef);
-void R_FreeSkinRotSprite(size_t skinnum);
-extern fixed_t rollcosang[ROTANGLES];
-extern fixed_t rollsinang[ROTANGLES];
-void R_FreeAllRotSprite(void);
-#endif
-
-#endif // __R_PATCH__
+#endif // __R_PICFORMATS__
diff --git a/src/r_plane.c b/src/r_plane.c
index 6c238896ca4f867d1c49b9cfee4260de2f8315d9..ea4dfa4e8a8c13d4aad4ed8260d6da37e8fea00a 100644
--- a/src/r_plane.c
+++ b/src/r_plane.c
@@ -2,7 +2,7 @@
//-----------------------------------------------------------------------------
// Copyright (C) 1993-1996 by id Software, Inc.
// Copyright (C) 1998-2000 by DooM Legacy Team.
-// Copyright (C) 1999-2020 by Sonic Team Junior.
+// Copyright (C) 1999-2021 by Sonic Team Junior.
//
// This program is free software distributed under the
// terms of the GNU General Public License, version 2.
@@ -60,7 +60,7 @@ INT32 numffloors;
//SoM: 3/23/2000: Boom visplane hashing routine.
#define visplane_hash(picnum,lightlevel,height) \
- ((unsigned)((picnum)*3+(lightlevel)+(height)*7) & (MAXVISPLANES-1))
+ ((unsigned)((picnum)*3+(lightlevel)+(height)*7) & VISPLANEHASHMASK)
//SoM: 3/23/2000: Use boom opening limit removal
size_t maxopenings;
@@ -115,51 +115,54 @@ void R_InitPlanes(void)
}
//
-// Water ripple effect!!
+// Water ripple effect
// Needs the height of the plane, and the vertical position of the span.
-// Sets ripple_xfrac and ripple_yfrac, added to ds_xfrac and ds_yfrac, if the span is not tilted.
+// Sets planeripple.xfrac and planeripple.yfrac, added to ds_xfrac and ds_yfrac, if the span is not tilted.
//
-#ifndef NOWATER
-INT32 ds_bgofs;
-INT32 ds_waterofs;
-
-static INT32 wtofs=0;
-static boolean itswater;
-static fixed_t ripple_xfrac;
-static fixed_t ripple_yfrac;
+struct
+{
+ INT32 offset;
+ fixed_t xfrac, yfrac;
+ boolean active;
+} planeripple;
-static void R_PlaneRipple(visplane_t *plane, INT32 y, fixed_t plheight)
+static void R_CalculatePlaneRipple(visplane_t *plane, INT32 y, fixed_t plheight, boolean calcfrac)
{
fixed_t distance = FixedMul(plheight, yslope[y]);
- const INT32 yay = (wtofs + (distance>>9) ) & 8191;
+ const INT32 yay = (planeripple.offset + (distance>>9)) & 8191;
+
// ripples da water texture
- angle_t angle = (plane->viewangle + plane->plangle)>>ANGLETOFINESHIFT;
ds_bgofs = FixedDiv(FINESINE(yay), (1<<12) + (distance>>11))>>FRACBITS;
- angle = (angle + 2048) & 8191; // 90 degrees
- ripple_xfrac = FixedMul(FINECOSINE(angle), (ds_bgofs<<FRACBITS));
- ripple_yfrac = FixedMul(FINESINE(angle), (ds_bgofs<<FRACBITS));
+ if (calcfrac)
+ {
+ angle_t angle = (plane->viewangle + plane->plangle)>>ANGLETOFINESHIFT;
+ angle = (angle + 2048) & 8191; // 90 degrees
+ planeripple.xfrac = FixedMul(FINECOSINE(angle), (ds_bgofs<<FRACBITS));
+ planeripple.yfrac = FixedMul(FINESINE(angle), (ds_bgofs<<FRACBITS));
+ }
+}
+
+static void R_UpdatePlaneRipple(void)
+{
+ ds_waterofs = (leveltime & 1)*16384;
+ planeripple.offset = (leveltime * 140);
}
-#endif
//
// R_MapPlane
//
// Uses global vars:
+// planeheight
// basexscale
// baseyscale
// centerx
-// viewx
-// viewy
-// viewsin
-// viewcos
-// viewheight
void R_MapPlane(INT32 y, INT32 x1, INT32 x2)
{
angle_t angle, planecos, planesin;
- fixed_t distance, span;
+ fixed_t distance = 0, span;
size_t pindex;
#ifdef RANGECHECK
@@ -167,41 +170,51 @@ void R_MapPlane(INT32 y, INT32 x1, INT32 x2)
I_Error("R_MapPlane: %d, %d at %d", x1, x2, y);
#endif
- // from r_splats's R_RenderFloorSplat
- if (x1 >= vid.width) x1 = vid.width - 1;
-
- angle = (currentplane->viewangle + currentplane->plangle)>>ANGLETOFINESHIFT;
- planecos = FINECOSINE(angle);
- planesin = FINESINE(angle);
+ if (x1 >= vid.width)
+ x1 = vid.width - 1;
- if (planeheight != cachedheight[y])
+ if (!currentplane->slope)
{
- cachedheight[y] = planeheight;
- distance = cacheddistance[y] = FixedMul(planeheight, yslope[y]);
- ds_xstep = cachedxstep[y] = FixedMul(distance, basexscale);
- ds_ystep = cachedystep[y] = FixedMul(distance, baseyscale);
+ angle = (currentplane->viewangle + currentplane->plangle)>>ANGLETOFINESHIFT;
+ planecos = FINECOSINE(angle);
+ planesin = FINESINE(angle);
- if ((span = abs(centery-y)))
+ if (planeheight != cachedheight[y])
{
- ds_xstep = cachedxstep[y] = FixedMul(planesin, planeheight) / span;
- ds_ystep = cachedystep[y] = FixedMul(planecos, planeheight) / span;
+ cachedheight[y] = planeheight;
+ cacheddistance[y] = distance = FixedMul(planeheight, yslope[y]);
+ span = abs(centery - y);
+
+ if (span) // don't divide by zero
+ {
+ ds_xstep = FixedMul(planesin, planeheight) / span;
+ ds_ystep = FixedMul(planecos, planeheight) / span;
+ }
+ else
+ {
+ ds_xstep = FixedMul(distance, basexscale);
+ ds_ystep = FixedMul(distance, baseyscale);
+ }
+
+ cachedxstep[y] = ds_xstep;
+ cachedystep[y] = ds_ystep;
+ }
+ else
+ {
+ distance = cacheddistance[y];
+ ds_xstep = cachedxstep[y];
+ ds_ystep = cachedystep[y];
}
- }
- else
- {
- distance = cacheddistance[y];
- ds_xstep = cachedxstep[y];
- ds_ystep = cachedystep[y];
- }
- ds_xfrac = xoffs + FixedMul(planecos, distance) + (x1 - centerx) * ds_xstep;
- ds_yfrac = yoffs - FixedMul(planesin, distance) + (x1 - centerx) * ds_ystep;
+ ds_xfrac = xoffs + FixedMul(planecos, distance) + (x1 - centerx) * ds_xstep;
+ ds_yfrac = yoffs - FixedMul(planesin, distance) + (x1 - centerx) * ds_ystep;
+ }
-#ifndef NOWATER
- if (itswater)
+ // Water ripple effect
+ if (planeripple.active)
{
// Needed for ds_bgofs
- R_PlaneRipple(currentplane, y, planeheight);
+ R_CalculatePlaneRipple(currentplane, y, planeheight, (!currentplane->slope));
if (currentplane->slope)
{
@@ -211,25 +224,25 @@ void R_MapPlane(INT32 y, INT32 x1, INT32 x2)
}
else
{
- ds_xfrac += ripple_xfrac;
- ds_yfrac += ripple_yfrac;
+ ds_xfrac += planeripple.xfrac;
+ ds_yfrac += planeripple.yfrac;
}
- if (y+ds_bgofs>=viewheight)
+ if ((y + ds_bgofs) >= viewheight)
ds_bgofs = viewheight-y-1;
- if (y+ds_bgofs<0)
+ if ((y + ds_bgofs) < 0)
ds_bgofs = -y;
}
-#endif
-
- pindex = distance >> LIGHTZSHIFT;
- if (pindex >= MAXLIGHTZ)
- pindex = MAXLIGHTZ - 1;
if (currentplane->slope)
ds_colormap = colormaps;
else
+ {
+ pindex = distance >> LIGHTZSHIFT;
+ if (pindex >= MAXLIGHTZ)
+ pindex = MAXLIGHTZ - 1;
ds_colormap = planezlight[pindex];
+ }
if (currentplane->extra_colormap)
ds_colormap = currentplane->extra_colormap->colormap + (ds_colormap - colormaps);
@@ -380,28 +393,30 @@ visplane_t *R_FindPlane(fixed_t height, INT32 picnum, INT32 lightlevel,
lightlevel = 0;
}
- // New visplane algorithm uses hash table
- hash = visplane_hash(picnum, lightlevel, height);
-
- for (check = visplanes[hash]; check; check = check->next)
+ if (!pfloor)
{
- if (check->polyobj && pfloor)
- continue;
- if (polyobj != check->polyobj)
- continue;
- if (height == check->height && picnum == check->picnum
- && lightlevel == check->lightlevel
- && xoff == check->xoffs && yoff == check->yoffs
- && planecolormap == check->extra_colormap
- && !pfloor && !check->ffloor
- && check->viewx == viewx && check->viewy == viewy && check->viewz == viewz
- && check->viewangle == viewangle
- && check->plangle == plangle
- && check->slope == slope)
+ hash = visplane_hash(picnum, lightlevel, height);
+ for (check = visplanes[hash]; check; check = check->next)
{
- return check;
+ if (polyobj != check->polyobj)
+ continue;
+ if (height == check->height && picnum == check->picnum
+ && lightlevel == check->lightlevel
+ && xoff == check->xoffs && yoff == check->yoffs
+ && planecolormap == check->extra_colormap
+ && check->viewx == viewx && check->viewy == viewy && check->viewz == viewz
+ && check->viewangle == viewangle
+ && check->plangle == plangle
+ && check->slope == slope)
+ {
+ return check;
+ }
}
}
+ else
+ {
+ hash = MAXVISPLANES - 1;
+ }
check = new_visplane(hash);
@@ -471,9 +486,17 @@ visplane_t *R_CheckPlane(visplane_t *pl, INT32 start, INT32 stop)
}
else /* Cannot use existing plane; create a new one */
{
- unsigned hash =
- visplane_hash(pl->picnum, pl->lightlevel, pl->height);
- visplane_t *new_pl = new_visplane(hash);
+ visplane_t *new_pl;
+ if (pl->ffloor)
+ {
+ new_pl = new_visplane(MAXVISPLANES - 1);
+ }
+ else
+ {
+ unsigned hash =
+ visplane_hash(pl->picnum, pl->lightlevel, pl->height);
+ new_pl = new_visplane(hash);
+ }
new_pl->height = pl->height;
new_pl->picnum = pl->picnum;
@@ -553,7 +576,7 @@ void R_ExpandPlane(visplane_t *pl, INT32 start, INT32 stop)
//
void R_MakeSpans(INT32 x, INT32 t1, INT32 b1, INT32 t2, INT32 b2)
{
- // Alam: from r_splats's R_RenderFloorSplat
+ // Alam: from r_splats's R_RasterizeFloorSplat
if (t1 >= vid.height) t1 = vid.height-1;
if (b1 >= vid.height) b1 = vid.height-1;
if (t2 >= vid.height) t2 = vid.height-1;
@@ -582,9 +605,7 @@ void R_DrawPlanes(void)
visplane_t *pl;
INT32 i;
- // Note: are these two lines really needed?
- // R_DrawSinglePlane and R_DrawSkyPlane do span/column drawer resets themselves anyway
- spanfunc = spanfuncs[BASEDRAWFUNC];
+ R_UpdatePlaneRipple();
for (i = 0; i < MAXVISPLANES; i++, pl++)
{
@@ -596,10 +617,6 @@ void R_DrawPlanes(void)
R_DrawSinglePlane(pl);
}
}
-#ifndef NOWATER
- ds_waterofs = (leveltime & 1)*16384;
- wtofs = leveltime * 140;
-#endif
}
// R_DrawSkyPlane
@@ -645,46 +662,48 @@ static void R_DrawSkyPlane(visplane_t *pl)
}
}
-static void R_SlopeVectors(visplane_t *pl, INT32 i, float fudge)
+// Potentially override other stuff for now cus we're mean. :< But draw a slope plane!
+// I copied ZDoom's code and adapted it to SRB2... -Red
+void R_CalculateSlopeVectors(pslope_t *slope, fixed_t planeviewx, fixed_t planeviewy, fixed_t planeviewz, fixed_t planexscale, fixed_t planeyscale, fixed_t planexoffset, fixed_t planeyoffset, angle_t planeviewangle, angle_t planeangle, float fudge)
{
- // Potentially override other stuff for now cus we're mean. :< But draw a slope plane!
- // I copied ZDoom's code and adapted it to SRB2... -Red
floatv3_t p, m, n;
float ang;
float vx, vy, vz;
+ float xscale = FIXED_TO_FLOAT(planexscale);
+ float yscale = FIXED_TO_FLOAT(planeyscale);
// compiler complains when P_GetSlopeZAt is used in FLOAT_TO_FIXED directly
// use this as a temp var to store P_GetSlopeZAt's return value each time
fixed_t temp;
- vx = FIXED_TO_FLOAT(pl->viewx+xoffs);
- vy = FIXED_TO_FLOAT(pl->viewy-yoffs);
- vz = FIXED_TO_FLOAT(pl->viewz);
+ vx = FIXED_TO_FLOAT(planeviewx+planexoffset);
+ vy = FIXED_TO_FLOAT(planeviewy-planeyoffset);
+ vz = FIXED_TO_FLOAT(planeviewz);
- temp = P_GetSlopeZAt(pl->slope, pl->viewx, pl->viewy);
+ temp = P_GetSlopeZAt(slope, planeviewx, planeviewy);
zeroheight = FIXED_TO_FLOAT(temp);
// p is the texture origin in view space
// Don't add in the offsets at this stage, because doing so can result in
// errors if the flat is rotated.
- ang = ANG2RAD(ANGLE_270 - pl->viewangle);
+ ang = ANG2RAD(ANGLE_270 - planeviewangle);
p.x = vx * cos(ang) - vy * sin(ang);
p.z = vx * sin(ang) + vy * cos(ang);
- temp = P_GetSlopeZAt(pl->slope, -xoffs, yoffs);
+ temp = P_GetSlopeZAt(slope, -planexoffset, planeyoffset);
p.y = FIXED_TO_FLOAT(temp) - vz;
// m is the v direction vector in view space
- ang = ANG2RAD(ANGLE_180 - (pl->viewangle + pl->plangle));
- m.x = cos(ang);
- m.z = sin(ang);
+ ang = ANG2RAD(ANGLE_180 - (planeviewangle + planeangle));
+ m.x = yscale * cos(ang);
+ m.z = yscale * sin(ang);
// n is the u direction vector in view space
- n.x = sin(ang);
- n.z = -cos(ang);
+ n.x = xscale * sin(ang);
+ n.z = -xscale * cos(ang);
- ang = ANG2RAD(pl->plangle);
- temp = P_GetSlopeZAt(pl->slope, pl->viewx + FLOAT_TO_FIXED(sin(ang)), pl->viewy + FLOAT_TO_FIXED(cos(ang)));
+ ang = ANG2RAD(planeangle);
+ temp = P_GetSlopeZAt(slope, planeviewx + FLOAT_TO_FIXED(yscale * sin(ang)), planeviewy + FLOAT_TO_FIXED(yscale * cos(ang)));
m.y = FIXED_TO_FLOAT(temp) - zeroheight;
- temp = P_GetSlopeZAt(pl->slope, pl->viewx + FLOAT_TO_FIXED(cos(ang)), pl->viewy - FLOAT_TO_FIXED(sin(ang)));
+ temp = P_GetSlopeZAt(slope, planeviewx + FLOAT_TO_FIXED(xscale * cos(ang)), planeviewy - FLOAT_TO_FIXED(xscale * sin(ang)));
n.y = FIXED_TO_FLOAT(temp) - zeroheight;
if (ds_powersoftwo)
@@ -700,42 +719,62 @@ static void R_SlopeVectors(visplane_t *pl, INT32 i, float fudge)
// Eh. I tried making this stuff fixed-point and it exploded on me. Here's a macro for the only floating-point vector function I recall using.
#define CROSS(d, v1, v2) \
-d.x = (v1.y * v2.z) - (v1.z * v2.y);\
-d.y = (v1.z * v2.x) - (v1.x * v2.z);\
-d.z = (v1.x * v2.y) - (v1.y * v2.x)
- CROSS(ds_su[i], p, m);
- CROSS(ds_sv[i], p, n);
- CROSS(ds_sz[i], m, n);
+d->x = (v1.y * v2.z) - (v1.z * v2.y);\
+d->y = (v1.z * v2.x) - (v1.x * v2.z);\
+d->z = (v1.x * v2.y) - (v1.y * v2.x)
+ CROSS(ds_sup, p, m);
+ CROSS(ds_svp, p, n);
+ CROSS(ds_szp, m, n);
#undef CROSS
- ds_su[i].z *= focallengthf;
- ds_sv[i].z *= focallengthf;
- ds_sz[i].z *= focallengthf;
+ ds_sup->z *= focallengthf;
+ ds_svp->z *= focallengthf;
+ ds_szp->z *= focallengthf;
// Premultiply the texture vectors with the scale factors
#define SFMULT 65536.f
if (ds_powersoftwo)
{
- ds_su[i].x *= (SFMULT * (1<<nflatshiftup));
- ds_su[i].y *= (SFMULT * (1<<nflatshiftup));
- ds_su[i].z *= (SFMULT * (1<<nflatshiftup));
- ds_sv[i].x *= (SFMULT * (1<<nflatshiftup));
- ds_sv[i].y *= (SFMULT * (1<<nflatshiftup));
- ds_sv[i].z *= (SFMULT * (1<<nflatshiftup));
+ ds_sup->x *= (SFMULT * (1<<nflatshiftup));
+ ds_sup->y *= (SFMULT * (1<<nflatshiftup));
+ ds_sup->z *= (SFMULT * (1<<nflatshiftup));
+ ds_svp->x *= (SFMULT * (1<<nflatshiftup));
+ ds_svp->y *= (SFMULT * (1<<nflatshiftup));
+ ds_svp->z *= (SFMULT * (1<<nflatshiftup));
}
else
{
// Lactozilla: I'm essentially multiplying the vectors by FRACUNIT...
- ds_su[i].x *= SFMULT;
- ds_su[i].y *= SFMULT;
- ds_su[i].z *= SFMULT;
- ds_sv[i].x *= SFMULT;
- ds_sv[i].y *= SFMULT;
- ds_sv[i].z *= SFMULT;
+ ds_sup->x *= SFMULT;
+ ds_sup->y *= SFMULT;
+ ds_sup->z *= SFMULT;
+ ds_svp->x *= SFMULT;
+ ds_svp->y *= SFMULT;
+ ds_svp->z *= SFMULT;
}
#undef SFMULT
}
+void R_SetTiltedSpan(INT32 span)
+{
+ if (ds_su == NULL)
+ ds_su = Z_Malloc(sizeof(*ds_su) * vid.height, PU_STATIC, NULL);
+ if (ds_sv == NULL)
+ ds_sv = Z_Malloc(sizeof(*ds_sv) * vid.height, PU_STATIC, NULL);
+ if (ds_sz == NULL)
+ ds_sz = Z_Malloc(sizeof(*ds_sz) * vid.height, PU_STATIC, NULL);
+
+ ds_sup = &ds_su[span];
+ ds_svp = &ds_sv[span];
+ ds_szp = &ds_sz[span];
+}
+
+static void R_SetSlopePlaneVectors(visplane_t *pl, INT32 y, fixed_t xoff, fixed_t yoff, float fudge)
+{
+ R_SetTiltedSpan(y);
+ R_CalculateSlopeVectors(pl->slope, pl->viewx, pl->viewy, pl->viewz, FRACUNIT, FRACUNIT, xoff, yoff, pl->viewangle, pl->plangle, fudge);
+}
+
void R_DrawSinglePlane(visplane_t *pl)
{
levelflat_t *levelflat;
@@ -756,9 +795,7 @@ void R_DrawSinglePlane(visplane_t *pl)
return;
}
-#ifndef NOWATER
- itswater = false;
-#endif
+ planeripple.active = false;
spanfunc = spanfuncs[BASEDRAWFUNC];
if (pl->polyobj)
@@ -769,7 +806,7 @@ void R_DrawSinglePlane(visplane_t *pl)
else if (pl->polyobj->translucency > 0)
{
spanfunctype = (pl->polyobj->flags & POF_SPLAT) ? SPANDRAWFUNC_TRANSSPLAT : SPANDRAWFUNC_TRANS;
- ds_transmap = transtables + ((pl->polyobj->translucency-1)<<FF_TRANSSHIFT);
+ ds_transmap = R_GetTranslucencyTable(pl->polyobj->translucency);
}
else if (pl->polyobj->flags & POF_SPLAT) // Opaque, but allow transparent flat pixels
spanfunctype = SPANDRAWFUNC_SPLAT;
@@ -808,23 +845,23 @@ void R_DrawSinglePlane(visplane_t *pl)
if (pl->ffloor->alpha < 12)
return; // Don't even draw it
else if (pl->ffloor->alpha < 38)
- ds_transmap = transtables + ((tr_trans90-1)<<FF_TRANSSHIFT);
+ ds_transmap = R_GetTranslucencyTable(tr_trans90);
else if (pl->ffloor->alpha < 64)
- ds_transmap = transtables + ((tr_trans80-1)<<FF_TRANSSHIFT);
+ ds_transmap = R_GetTranslucencyTable(tr_trans80);
else if (pl->ffloor->alpha < 89)
- ds_transmap = transtables + ((tr_trans70-1)<<FF_TRANSSHIFT);
+ ds_transmap = R_GetTranslucencyTable(tr_trans70);
else if (pl->ffloor->alpha < 115)
- ds_transmap = transtables + ((tr_trans60-1)<<FF_TRANSSHIFT);
+ ds_transmap = R_GetTranslucencyTable(tr_trans60);
else if (pl->ffloor->alpha < 140)
- ds_transmap = transtables + ((tr_trans50-1)<<FF_TRANSSHIFT);
+ ds_transmap = R_GetTranslucencyTable(tr_trans50);
else if (pl->ffloor->alpha < 166)
- ds_transmap = transtables + ((tr_trans40-1)<<FF_TRANSSHIFT);
+ ds_transmap = R_GetTranslucencyTable(tr_trans40);
else if (pl->ffloor->alpha < 192)
- ds_transmap = transtables + ((tr_trans30-1)<<FF_TRANSSHIFT);
+ ds_transmap = R_GetTranslucencyTable(tr_trans30);
else if (pl->ffloor->alpha < 217)
- ds_transmap = transtables + ((tr_trans20-1)<<FF_TRANSSHIFT);
+ ds_transmap = R_GetTranslucencyTable(tr_trans20);
else if (pl->ffloor->alpha < 243)
- ds_transmap = transtables + ((tr_trans10-1)<<FF_TRANSSHIFT);
+ ds_transmap = R_GetTranslucencyTable(tr_trans10);
else // Opaque, but allow transparent flat pixels
spanfunctype = SPANDRAWFUNC_SPLAT;
@@ -840,12 +877,12 @@ void R_DrawSinglePlane(visplane_t *pl)
}
else light = (pl->lightlevel >> LIGHTSEGSHIFT);
- #ifndef NOWATER
if (pl->ffloor->flags & FF_RIPPLE)
{
INT32 top, bottom;
- itswater = true;
+ planeripple.active = true;
+
if (spanfunctype == SPANDRAWFUNC_TRANS)
{
spanfunctype = SPANDRAWFUNC_WATER;
@@ -865,26 +902,11 @@ void R_DrawSinglePlane(visplane_t *pl)
vid.width, vid.width);
}
}
- #endif
}
else
light = (pl->lightlevel >> LIGHTSEGSHIFT);
}
- if (!pl->slope // Don't mess with angle on slopes! We'll handle this ourselves later
- && viewangle != pl->viewangle+pl->plangle)
- {
- memset(cachedheight, 0, sizeof (cachedheight));
- angle = (pl->viewangle+pl->plangle-ANGLE_90)>>ANGLETOFINESHIFT;
- basexscale = FixedDiv(FINECOSINE(angle),centerxfrac);
- baseyscale = -FixedDiv(FINESINE(angle),centerxfrac);
- viewangle = pl->viewangle+pl->plangle;
- }
-
- xoffs = pl->xoffs;
- yoffs = pl->yoffs;
- planeheight = abs(pl->height - pl->viewz);
-
currentplane = pl;
levelflat = &levelflats[pl->picnum];
@@ -909,6 +931,20 @@ void R_DrawSinglePlane(visplane_t *pl)
R_CheckFlatLength(ds_flatwidth * ds_flatheight);
}
+ if (!pl->slope // Don't mess with angle on slopes! We'll handle this ourselves later
+ && viewangle != pl->viewangle+pl->plangle)
+ {
+ memset(cachedheight, 0, sizeof (cachedheight));
+ angle = (pl->viewangle+pl->plangle-ANGLE_90)>>ANGLETOFINESHIFT;
+ basexscale = FixedDiv(FINECOSINE(angle),centerxfrac);
+ baseyscale = -FixedDiv(FINESINE(angle),centerxfrac);
+ viewangle = pl->viewangle+pl->plangle;
+ }
+
+ xoffs = pl->xoffs;
+ yoffs = pl->yoffs;
+ planeheight = abs(pl->height - pl->viewz);
+
if (light >= LIGHTLEVELS)
light = LIGHTLEVELS-1;
@@ -968,50 +1004,41 @@ void R_DrawSinglePlane(visplane_t *pl)
xoffs -= (pl->slope->o.x + (1 << (31-nflatshiftup))) & ~((1 << (32-nflatshiftup))-1);
yoffs += (pl->slope->o.y + (1 << (31-nflatshiftup))) & ~((1 << (32-nflatshiftup))-1);
}
+
xoffs = (fixed_t)(xoffs*fudgecanyon);
yoffs = (fixed_t)(yoffs/fudgecanyon);
}
- ds_sup = &ds_su[0];
- ds_svp = &ds_sv[0];
- ds_szp = &ds_sz[0];
-
-#ifndef NOWATER
- if (itswater)
+ if (planeripple.active)
{
- INT32 i;
fixed_t plheight = abs(P_GetSlopeZAt(pl->slope, pl->viewx, pl->viewy) - pl->viewz);
- fixed_t rxoffs = xoffs;
- fixed_t ryoffs = yoffs;
R_PlaneBounds(pl);
- for (i = pl->high; i < pl->low; i++)
+ for (x = pl->high; x < pl->low; x++)
{
- R_PlaneRipple(pl, i, plheight);
- xoffs = rxoffs + ripple_xfrac;
- yoffs = ryoffs + ripple_yfrac;
- R_SlopeVectors(pl, i, fudgecanyon);
+ R_CalculatePlaneRipple(pl, x, plheight, true);
+ R_SetSlopePlaneVectors(pl, x, (xoffs + planeripple.xfrac), (yoffs + planeripple.yfrac), fudgecanyon);
}
-
- xoffs = rxoffs;
- yoffs = ryoffs;
}
else
-#endif
- R_SlopeVectors(pl, 0, fudgecanyon);
+ R_SetSlopePlaneVectors(pl, 0, xoffs, yoffs, fudgecanyon);
-#ifndef NOWATER
- if (itswater && (spanfunctype == SPANDRAWFUNC_WATER))
- spanfunctype = SPANDRAWFUNC_TILTEDWATER;
- else
-#endif
- if (spanfunctype == SPANDRAWFUNC_TRANS)
- spanfunctype = SPANDRAWFUNC_TILTEDTRANS;
- else if (spanfunctype == SPANDRAWFUNC_SPLAT)
- spanfunctype = SPANDRAWFUNC_TILTEDSPLAT;
- else
- spanfunctype = SPANDRAWFUNC_TILTED;
+ switch (spanfunctype)
+ {
+ case SPANDRAWFUNC_WATER:
+ spanfunctype = SPANDRAWFUNC_TILTEDWATER;
+ break;
+ case SPANDRAWFUNC_TRANS:
+ spanfunctype = SPANDRAWFUNC_TILTEDTRANS;
+ break;
+ case SPANDRAWFUNC_SPLAT:
+ spanfunctype = SPANDRAWFUNC_TILTEDSPLAT;
+ break;
+ default:
+ spanfunctype = SPANDRAWFUNC_TILTED;
+ break;
+ }
planezlight = scalelight[light];
}
@@ -1071,7 +1098,7 @@ using the palette colors.
if (spanfunc == spanfuncs[BASEDRAWFUNC])
{
INT32 i;
- ds_transmap = transtables + ((tr_trans50-1)<<FF_TRANSSHIFT);
+ ds_transmap = R_GetTranslucencyTable(tr_trans50);
spanfunc = spanfuncs[SPANDRAWFUNC_TRANS];
for (i=0; i<4; i++)
{
diff --git a/src/r_plane.h b/src/r_plane.h
index 15f7f07f308830fd217ca6af05f516bf8d0b55b8..0d11c5b721c2ffadcaee26f4fbd830a6b2698c0a 100644
--- a/src/r_plane.h
+++ b/src/r_plane.h
@@ -19,7 +19,10 @@
#include "r_textures.h"
#include "p_polyobj.h"
-#define MAXVISPLANES 512
+#define VISPLANEHASHBITS 9
+#define VISPLANEHASHMASK ((1<<VISPLANEHASHBITS)-1)
+// the last visplane list is outside of the hash table and is used for fof planes
+#define MAXVISPLANES ((1<<VISPLANEHASHBITS)+1)
//
// Now what is a visplane, anyway?
@@ -84,11 +87,18 @@ visplane_t *R_CheckPlane(visplane_t *pl, INT32 start, INT32 stop);
void R_ExpandPlane(visplane_t *pl, INT32 start, INT32 stop);
void R_PlaneBounds(visplane_t *plane);
-// Draws a single visplane.
-void R_DrawSinglePlane(visplane_t *pl);
void R_CheckFlatLength(size_t size);
boolean R_CheckPowersOfTwo(void);
+// Draws a single visplane.
+void R_DrawSinglePlane(visplane_t *pl);
+
+// Calculates the slope vectors needed for tilted span drawing.
+void R_CalculateSlopeVectors(pslope_t *slope, fixed_t planeviewx, fixed_t planeviewy, fixed_t planeviewz, fixed_t planexscale, fixed_t planeyscale, fixed_t planexoffset, fixed_t planeyoffset, angle_t planeviewangle, angle_t planeangle, float fudge);
+
+// Sets the slope vector pointers for the current tilted span.
+void R_SetTiltedSpan(INT32 span);
+
typedef struct planemgr_s
{
visplane_t *plane;
diff --git a/src/r_segs.c b/src/r_segs.c
index d9fc758381da988c054953a92e4809f49940d5b8..a6772f9646af9451e4cdeb2f2cdb9f7b4bdd2749 100644
--- a/src/r_segs.c
+++ b/src/r_segs.c
@@ -25,6 +25,7 @@
#include "p_local.h" // Camera...
#include "p_slopes.h"
#include "console.h" // con_clipviewtop
+#include "taglist.h"
// OPTIMIZE: closed two sided lines as single sided
@@ -55,6 +56,15 @@ static INT32 worldtop, worldbottom, worldhigh, worldlow;
static INT32 worldtopslope, worldbottomslope, worldhighslope, worldlowslope; // worldtop/bottom at end of slope
static fixed_t rw_toptextureslide, rw_midtextureslide, rw_bottomtextureslide; // Defines how to adjust Y offsets along the wall for slopes
static fixed_t rw_midtextureback, rw_midtexturebackslide; // Values for masked midtexture height calculation
+
+// Lactozilla: 3D floor clipping
+static boolean rw_floormarked = false;
+static boolean rw_ceilingmarked = false;
+
+static INT32 *rw_silhouette = NULL;
+static fixed_t *rw_tsilheight = NULL;
+static fixed_t *rw_bsilheight = NULL;
+
static fixed_t pixhigh, pixlow, pixhighstep, pixlowstep;
static fixed_t topfrac, topstep;
static fixed_t bottomfrac, bottomstep;
@@ -63,170 +73,6 @@ static lighttable_t **walllights;
static INT16 *maskedtexturecol;
static fixed_t *maskedtextureheight = NULL;
-// ==========================================================================
-// R_Splats Wall Splats Drawer
-// ==========================================================================
-
-#ifdef WALLSPLATS
-static INT16 last_ceilingclip[MAXVIDWIDTH];
-static INT16 last_floorclip[MAXVIDWIDTH];
-
-static void R_DrawSplatColumn(column_t *column)
-{
- INT32 topscreen, bottomscreen;
- fixed_t basetexturemid;
- INT32 topdelta, prevdelta = -1;
-
- basetexturemid = dc_texturemid;
-
- for (; column->topdelta != 0xff ;)
- {
- // calculate unclipped screen coordinates for post
- topdelta = column->topdelta;
- if (topdelta <= prevdelta)
- topdelta += prevdelta;
- prevdelta = topdelta;
- topscreen = sprtopscreen + spryscale*topdelta;
- bottomscreen = topscreen + spryscale*column->length;
-
- dc_yl = (topscreen+FRACUNIT-1)>>FRACBITS;
- dc_yh = (bottomscreen-1)>>FRACBITS;
-
- if (dc_yh >= last_floorclip[dc_x])
- dc_yh = last_floorclip[dc_x] - 1;
- if (dc_yl <= last_ceilingclip[dc_x])
- dc_yl = last_ceilingclip[dc_x] + 1;
- if (dc_yl <= dc_yh && dl_yh < vid.height && yh > 0)
- {
- dc_source = (UINT8 *)column + 3;
- dc_texturemid = basetexturemid - (topdelta<<FRACBITS);
-
- // Drawn by R_DrawColumn.
- colfunc();
- }
- column = (column_t *)((UINT8 *)column + column->length + 4);
- }
-
- dc_texturemid = basetexturemid;
-}
-
-static void R_DrawWallSplats(void)
-{
- wallsplat_t *splat;
- seg_t *seg;
- angle_t angle, angle1, angle2;
- INT32 x1, x2;
- size_t pindex;
- column_t *col;
- patch_t *patch;
- fixed_t texturecolumn;
-
- splat = (wallsplat_t *)linedef->splats;
-
- I_Assert(splat != NULL);
-
- seg = ds_p->curline;
-
- // draw all splats from the line that touches the range of the seg
- for (; splat; splat = splat->next)
- {
- angle1 = R_PointToAngle(splat->v1.x, splat->v1.y);
- angle2 = R_PointToAngle(splat->v2.x, splat->v2.y);
- angle1 = (angle1 - viewangle + ANGLE_90)>>ANGLETOFINESHIFT;
- angle2 = (angle2 - viewangle + ANGLE_90)>>ANGLETOFINESHIFT;
- // out of the viewangletox lut
- /// \todo clip it to the screen
- if (angle1 > FINEANGLES/2 || angle2 > FINEANGLES/2)
- continue;
- x1 = viewangletox[angle1];
- x2 = viewangletox[angle2];
-
- if (x1 >= x2)
- continue; // does not cross a pixel
-
- // splat is not in this seg range
- if (x2 < ds_p->x1 || x1 > ds_p->x2)
- continue;
-
- if (x1 < ds_p->x1)
- x1 = ds_p->x1;
- if (x2 > ds_p->x2)
- x2 = ds_p->x2;
- if (x2 <= x1)
- continue;
-
- // calculate incremental stepping values for texture edges
- rw_scalestep = ds_p->scalestep;
- spryscale = ds_p->scale1 + (x1 - ds_p->x1)*rw_scalestep;
- mfloorclip = floorclip;
- mceilingclip = ceilingclip;
-
- patch = W_CachePatchNum(splat->patch, PU_PATCH);
-
- dc_texturemid = splat->top + (SHORT(patch->height)<<(FRACBITS-1)) - viewz;
- if (splat->yoffset)
- dc_texturemid += *splat->yoffset;
-
- sprtopscreen = centeryfrac - FixedMul(dc_texturemid, spryscale);
-
- // set drawing mode
- switch (splat->flags & SPLATDRAWMODE_MASK)
- {
- case SPLATDRAWMODE_OPAQUE:
- colfunc = colfuncs[BASEDRAWFUNC];
- break;
- case SPLATDRAWMODE_TRANS:
- if (!cv_translucency.value)
- colfunc = colfuncs[BASEDRAWFUNC];
- else
- {
- dc_transmap = transtables + ((tr_trans50 - 1)<<FF_TRANSSHIFT);
- colfunc = colfuncs[COLDRAWFUNC_FUZZY];
- }
-
- break;
- case SPLATDRAWMODE_SHADE:
- colfunc = colfuncs[COLDRAWFUNC_SHADE];
- break;
- }
-
- dc_texheight = 0;
-
- // draw the columns
- for (dc_x = x1; dc_x <= x2; dc_x++, spryscale += rw_scalestep)
- {
- pindex = FixedMul(spryscale, LIGHTRESOLUTIONFIX)>>LIGHTSCALESHIFT;
- if (pindex >= MAXLIGHTSCALE)
- pindex = MAXLIGHTSCALE - 1;
- dc_colormap = walllights[pindex];
-
- if (frontsector->extra_colormap)
- dc_colormap = frontsector->extra_colormap->colormap + (dc_colormap - colormaps);
-
- sprtopscreen = centeryfrac - FixedMul(dc_texturemid, spryscale);
- dc_iscale = 0xffffffffu / (unsigned)spryscale;
-
- // find column of patch, from perspective
- angle = (rw_centerangle + xtoviewangle[dc_x])>>ANGLETOFINESHIFT;
- texturecolumn = rw_offset2 - splat->offset
- - FixedMul(FINETANGENT(angle), rw_distance);
-
- // FIXME!
- texturecolumn >>= FRACBITS;
- if (texturecolumn < 0 || texturecolumn >= SHORT(patch->width))
- continue;
-
- // draw the texture
- col = (column_t *)((UINT8 *)patch + LONG(patch->columnofs[texturecolumn]));
- R_DrawSplatColumn(col);
- }
- } // next splat
-
- colfunc = colfuncs[BASEDRAWFUNC];
-}
-
-#endif //WALLSPLATS
-
// ==========================================================================
// R_RenderMaskedSegRange
// ==========================================================================
@@ -311,7 +157,7 @@ void R_RenderMaskedSegRange(drawseg_t *ds, INT32 x1, INT32 x2)
if (ldef->alpha > 0 && ldef->alpha < FRACUNIT)
{
- dc_transmap = transtables + ((R_GetLinedefTransTable(ldef->alpha) - 1) << FF_TRANSSHIFT);
+ dc_transmap = R_GetTranslucencyTable(R_GetLinedefTransTable(ldef->alpha));
colfunc = colfuncs[COLDRAWFUNC_FUZZY];
}
@@ -329,7 +175,7 @@ void R_RenderMaskedSegRange(drawseg_t *ds, INT32 x1, INT32 x2)
if (curline->polyseg->translucency >= NUMTRANSMAPS)
return;
- dc_transmap = transtables + ((curline->polyseg->translucency-1)<<FF_TRANSSHIFT);
+ dc_transmap = R_GetTranslucencyTable(curline->polyseg->translucency);
colfunc = colfuncs[COLDRAWFUNC_FUZZY];
}
@@ -686,6 +532,19 @@ static void R_DrawRepeatFlippedMaskedColumn(column_t *col)
} while (sprtopscreen < sprbotscreen);
}
+// Returns true if a fake floor is translucent.
+static boolean R_IsFFloorTranslucent(visffloor_t *pfloor)
+{
+ if (pfloor->polyobj)
+ return (pfloor->polyobj->translucency > 0);
+
+ // Polyobjects have no ffloors, and they're handled in the conditional above.
+ if (pfloor->ffloor != NULL)
+ return (pfloor->ffloor->flags & (FF_TRANSLUCENT|FF_FOG));
+
+ return false;
+}
+
//
// R_RenderThickSideRange
// Renders all the thick sides in the given range.
@@ -744,23 +603,23 @@ void R_RenderThickSideRange(drawseg_t *ds, INT32 x1, INT32 x2, ffloor_t *pfloor)
if (pfloor->alpha < 12)
return; // Don't even draw it
else if (pfloor->alpha < 38)
- dc_transmap = transtables + ((tr_trans90-1)<<FF_TRANSSHIFT);
+ dc_transmap = R_GetTranslucencyTable(tr_trans90);
else if (pfloor->alpha < 64)
- dc_transmap = transtables + ((tr_trans80-1)<<FF_TRANSSHIFT);
+ dc_transmap = R_GetTranslucencyTable(tr_trans80);
else if (pfloor->alpha < 89)
- dc_transmap = transtables + ((tr_trans70-1)<<FF_TRANSSHIFT);
+ dc_transmap = R_GetTranslucencyTable(tr_trans70);
else if (pfloor->alpha < 115)
- dc_transmap = transtables + ((tr_trans60-1)<<FF_TRANSSHIFT);
+ dc_transmap = R_GetTranslucencyTable(tr_trans60);
else if (pfloor->alpha < 140)
- dc_transmap = transtables + ((tr_trans50-1)<<FF_TRANSSHIFT);
+ dc_transmap = R_GetTranslucencyTable(tr_trans50);
else if (pfloor->alpha < 166)
- dc_transmap = transtables + ((tr_trans40-1)<<FF_TRANSSHIFT);
+ dc_transmap = R_GetTranslucencyTable(tr_trans40);
else if (pfloor->alpha < 192)
- dc_transmap = transtables + ((tr_trans30-1)<<FF_TRANSSHIFT);
+ dc_transmap = R_GetTranslucencyTable(tr_trans30);
else if (pfloor->alpha < 217)
- dc_transmap = transtables + ((tr_trans20-1)<<FF_TRANSSHIFT);
+ dc_transmap = R_GetTranslucencyTable(tr_trans20);
else if (pfloor->alpha < 243)
- dc_transmap = transtables + ((tr_trans10-1)<<FF_TRANSSHIFT);
+ dc_transmap = R_GetTranslucencyTable(tr_trans10);
else
fuzzy = false; // Opaque
@@ -1188,7 +1047,7 @@ void R_RenderThickSideRange(drawseg_t *ds, INT32 x1, INT32 x2, ffloor_t *pfloor)
// R_ExpandPlaneY
//
-// A simple function to modify a vsplane's top and bottom for a particular column
+// A simple function to modify a visplane's top and bottom for a particular column
// Sort of like R_ExpandPlane in r_plane.c, except this is vertical expansion
static inline void R_ExpandPlaneY(visplane_t *pl, INT32 x, INT16 top, INT16 bottom)
{
@@ -1198,6 +1057,14 @@ static inline void R_ExpandPlaneY(visplane_t *pl, INT32 x, INT16 top, INT16 bott
if (pl->bottom[x] < bottom) pl->bottom[x] = bottom;
}
+// R_FFloorCanClip
+//
+// Returns true if a fake floor can clip a column away.
+static boolean R_FFloorCanClip(visffloor_t *pfloor)
+{
+ return (cv_ffloorclip.value && !R_IsFFloorTranslucent(pfloor) && !pfloor->polyobj);
+}
+
//
// R_RenderSegLoop
// Draws zero, one, or two textures (and possibly a masked
@@ -1279,8 +1146,13 @@ static void R_RenderSegLoop (void)
R_ExpandPlaneY(floorplane, rw_x, top, bottom);
}
+ rw_floormarked = false;
+ rw_ceilingmarked = false;
+
if (numffloors)
{
+ INT16 fftop, ffbottom;
+
firstseg->frontscale[rw_x] = frontscale[rw_x];
top = ceilingclip[rw_x]+1; // PRBoom
bottom = floorclip[rw_x]-1; // PRBoom
@@ -1311,8 +1183,30 @@ static void R_RenderSegLoop (void)
{
if (top_w <= bottom_w)
{
- ffloor[i].plane->top[rw_x] = (INT16)top_w;
- ffloor[i].plane->bottom[rw_x] = (INT16)bottom_w;
+ fftop = (INT16)top_w;
+ ffbottom = (INT16)bottom_w;
+
+ ffloor[i].plane->top[rw_x] = fftop;
+ ffloor[i].plane->bottom[rw_x] = ffbottom;
+
+ // Lactozilla: Cull part of the column by the 3D floor if it can't be seen
+ // "bottom" is the top pixel of the floor column
+ if (ffbottom >= bottom-1 && R_FFloorCanClip(&ffloor[i]) && !curline->polyseg)
+ {
+ rw_floormarked = true;
+ floorclip[rw_x] = fftop;
+ if (yh > fftop)
+ yh = fftop;
+
+ if (markfloor && floorplane)
+ floorplane->top[rw_x] = bottom;
+
+ if (rw_silhouette)
+ {
+ (*rw_silhouette) |= SIL_BOTTOM;
+ (*rw_bsilheight) = INT32_MAX;
+ }
+ }
}
}
}
@@ -1337,8 +1231,30 @@ static void R_RenderSegLoop (void)
{
if (top_w <= bottom_w)
{
- ffloor[i].plane->top[rw_x] = (INT16)top_w;
- ffloor[i].plane->bottom[rw_x] = (INT16)bottom_w;
+ fftop = (INT16)top_w;
+ ffbottom = (INT16)bottom_w;
+
+ ffloor[i].plane->top[rw_x] = fftop;
+ ffloor[i].plane->bottom[rw_x] = ffbottom;
+
+ // Lactozilla: Cull part of the column by the 3D floor if it can't be seen
+ // "top" is the height of the ceiling column
+ if (fftop <= top+1 && R_FFloorCanClip(&ffloor[i]) && !curline->polyseg)
+ {
+ rw_ceilingmarked = true;
+ ceilingclip[rw_x] = ffbottom;
+ if (yl < ffbottom)
+ yl = ffbottom;
+
+ if (markceiling && ceilingplane)
+ ceilingplane->bottom[rw_x] = top;
+
+ if (rw_silhouette)
+ {
+ (*rw_silhouette) |= SIL_TOP;
+ (*rw_tsilheight) = INT32_MIN;
+ }
+ }
}
}
}
@@ -1444,20 +1360,25 @@ static void R_RenderSegLoop (void)
// dont draw anything more for this column, since
// a midtexture blocks the view
- ceilingclip[rw_x] = (INT16)viewheight;
- floorclip[rw_x] = -1;
+ if (!rw_ceilingmarked)
+ ceilingclip[rw_x] = (INT16)viewheight;
+ if (!rw_floormarked)
+ floorclip[rw_x] = -1;
}
else
{
// note: don't use min/max macros, since casting from INT32 to INT16 is involved here
- if (markceiling)
+ if (markceiling && (!rw_ceilingmarked))
ceilingclip[rw_x] = (yl >= 0) ? ((yl > viewheight) ? (INT16)viewheight : (INT16)((INT16)yl - 1)) : -1;
- if (markfloor)
+ if (markfloor && (!rw_floormarked))
floorclip[rw_x] = (yh < viewheight) ? ((yh < -1) ? -1 : (INT16)((INT16)yh + 1)) : (INT16)viewheight;
}
}
else
{
+ INT16 topclip = (yl >= 0) ? ((yl > viewheight) ? (INT16)viewheight : (INT16)((INT16)yl - 1)) : -1;
+ INT16 bottomclip = (yh < viewheight) ? ((yh < -1) ? -1 : (INT16)((INT16)yh + 1)) : (INT16)viewheight;
+
// two sided line
if (toptexture)
{
@@ -1471,7 +1392,10 @@ static void R_RenderSegLoop (void)
if (mid >= yl) // back ceiling lower than front ceiling ?
{
if (yl >= viewheight) // entirely off bottom of screen
- ceilingclip[rw_x] = (INT16)viewheight;
+ {
+ if (!rw_ceilingmarked)
+ ceilingclip[rw_x] = (INT16)viewheight;
+ }
else if (mid >= 0) // safe to draw top texture
{
dc_yl = yl;
@@ -1482,14 +1406,14 @@ static void R_RenderSegLoop (void)
colfunc();
ceilingclip[rw_x] = (INT16)mid;
}
- else // entirely off top of screen
+ else if (!rw_ceilingmarked) // entirely off top of screen
ceilingclip[rw_x] = -1;
}
- else
- ceilingclip[rw_x] = (yl >= 0) ? ((yl > viewheight) ? (INT16)viewheight : (INT16)((INT16)yl - 1)) : -1;
+ else if (!rw_ceilingmarked)
+ ceilingclip[rw_x] = topclip;
}
- else if (markceiling) // no top wall
- ceilingclip[rw_x] = (yl >= 0) ? ((yl > viewheight) ? (INT16)viewheight : (INT16)((INT16)yl - 1)) : -1;
+ else if (markceiling && (!rw_ceilingmarked)) // no top wall
+ ceilingclip[rw_x] = topclip;
if (bottomtexture)
{
@@ -1504,7 +1428,10 @@ static void R_RenderSegLoop (void)
if (mid <= yh) // back floor higher than front floor ?
{
if (yh < 0) // entirely off top of screen
- floorclip[rw_x] = -1;
+ {
+ if (!rw_floormarked)
+ floorclip[rw_x] = -1;
+ }
else if (mid < viewheight) // safe to draw bottom texture
{
dc_yl = mid;
@@ -1516,14 +1443,14 @@ static void R_RenderSegLoop (void)
colfunc();
floorclip[rw_x] = (INT16)mid;
}
- else // entirely off bottom of screen
+ else if (!rw_floormarked) // entirely off bottom of screen
floorclip[rw_x] = (INT16)viewheight;
}
- else
- floorclip[rw_x] = (yh < viewheight) ? ((yh < -1) ? -1 : (INT16)((INT16)yh + 1)) : (INT16)viewheight;
+ else if (!rw_floormarked)
+ floorclip[rw_x] = bottomclip;
}
- else if (markfloor) // no bottom wall
- floorclip[rw_x] = (yh < viewheight) ? ((yh < -1) ? -1 : (INT16)((INT16)yh + 1)) : (INT16)viewheight;
+ else if (markfloor && (!rw_floormarked)) // no bottom wall
+ floorclip[rw_x] = bottomclip;
}
if (maskedtexture || numthicksides)
@@ -1722,23 +1649,26 @@ void R_StoreWallRange(INT32 start, INT32 stop)
// left
temp = xtoviewangle[start]+viewangle;
+#define FIXED_TO_DOUBLE(x) (((double)(x)) / ((double)FRACUNIT))
+#define DOUBLE_TO_FIXED(x) (fixed_t)((x) * ((double)FRACUNIT))
+
{
// Both lines can be written in slope-intercept form, so figure out line intersection
- float a1, b1, c1, a2, b2, c2, det; // 1 is the seg, 2 is the view angle vector...
- ///TODO: convert to FPU
+ double a1, b1, c1, a2, b2, c2, det; // 1 is the seg, 2 is the view angle vector...
+ ///TODO: convert to fixed point
- a1 = FIXED_TO_FLOAT(curline->v2->y-curline->v1->y);
- b1 = FIXED_TO_FLOAT(curline->v1->x-curline->v2->x);
- c1 = a1*FIXED_TO_FLOAT(curline->v1->x) + b1*FIXED_TO_FLOAT(curline->v1->y);
+ a1 = FIXED_TO_DOUBLE(curline->v2->y-curline->v1->y);
+ b1 = FIXED_TO_DOUBLE(curline->v1->x-curline->v2->x);
+ c1 = a1*FIXED_TO_DOUBLE(curline->v1->x) + b1*FIXED_TO_DOUBLE(curline->v1->y);
- a2 = -FIXED_TO_FLOAT(FINESINE(temp>>ANGLETOFINESHIFT));
- b2 = FIXED_TO_FLOAT(FINECOSINE(temp>>ANGLETOFINESHIFT));
- c2 = a2*FIXED_TO_FLOAT(viewx) + b2*FIXED_TO_FLOAT(viewy);
+ a2 = -FIXED_TO_DOUBLE(FINESINE(temp>>ANGLETOFINESHIFT));
+ b2 = FIXED_TO_DOUBLE(FINECOSINE(temp>>ANGLETOFINESHIFT));
+ c2 = a2*FIXED_TO_DOUBLE(viewx) + b2*FIXED_TO_DOUBLE(viewy);
det = a1*b2 - a2*b1;
- ds_p->leftpos.x = segleft.x = FLOAT_TO_FIXED((b2*c1 - b1*c2)/det);
- ds_p->leftpos.y = segleft.y = FLOAT_TO_FIXED((a1*c2 - a2*c1)/det);
+ ds_p->leftpos.x = segleft.x = DOUBLE_TO_FIXED((b2*c1 - b1*c2)/det);
+ ds_p->leftpos.y = segleft.y = DOUBLE_TO_FIXED((a1*c2 - a2*c1)/det);
}
// right
@@ -1746,22 +1676,26 @@ void R_StoreWallRange(INT32 start, INT32 stop)
{
// Both lines can be written in slope-intercept form, so figure out line intersection
- float a1, b1, c1, a2, b2, c2, det; // 1 is the seg, 2 is the view angle vector...
- ///TODO: convert to FPU
+ double a1, b1, c1, a2, b2, c2, det; // 1 is the seg, 2 is the view angle vector...
+ ///TODO: convert to fixed point
- a1 = FIXED_TO_FLOAT(curline->v2->y-curline->v1->y);
- b1 = FIXED_TO_FLOAT(curline->v1->x-curline->v2->x);
- c1 = a1*FIXED_TO_FLOAT(curline->v1->x) + b1*FIXED_TO_FLOAT(curline->v1->y);
+ a1 = FIXED_TO_DOUBLE(curline->v2->y-curline->v1->y);
+ b1 = FIXED_TO_DOUBLE(curline->v1->x-curline->v2->x);
+ c1 = a1*FIXED_TO_DOUBLE(curline->v1->x) + b1*FIXED_TO_DOUBLE(curline->v1->y);
- a2 = -FIXED_TO_FLOAT(FINESINE(temp>>ANGLETOFINESHIFT));
- b2 = FIXED_TO_FLOAT(FINECOSINE(temp>>ANGLETOFINESHIFT));
- c2 = a2*FIXED_TO_FLOAT(viewx) + b2*FIXED_TO_FLOAT(viewy);
+ a2 = -FIXED_TO_DOUBLE(FINESINE(temp>>ANGLETOFINESHIFT));
+ b2 = FIXED_TO_DOUBLE(FINECOSINE(temp>>ANGLETOFINESHIFT));
+ c2 = a2*FIXED_TO_DOUBLE(viewx) + b2*FIXED_TO_DOUBLE(viewy);
det = a1*b2 - a2*b1;
- ds_p->rightpos.x = segright.x = FLOAT_TO_FIXED((b2*c1 - b1*c2)/det);
- ds_p->rightpos.y = segright.y = FLOAT_TO_FIXED((a1*c2 - a2*c1)/det);
+ ds_p->rightpos.x = segright.x = DOUBLE_TO_FIXED((b2*c1 - b1*c2)/det);
+ ds_p->rightpos.y = segright.y = DOUBLE_TO_FIXED((a1*c2 - a2*c1)/det);
}
+
+#undef FIXED_TO_DOUBLE
+#undef DOUBLE_TO_FIXED
+
}
@@ -1977,7 +1911,7 @@ void R_StoreWallRange(INT32 start, INT32 stop)
|| backsector->floorlightsec != frontsector->floorlightsec
//SoM: 4/3/2000: Check for colormaps
|| frontsector->extra_colormap != backsector->extra_colormap
- || (frontsector->ffloors != backsector->ffloors && frontsector->tag != backsector->tag))
+ || (frontsector->ffloors != backsector->ffloors && !Tag_Compare(&frontsector->tags, &backsector->tags)))
{
markfloor = true;
}
@@ -2008,7 +1942,7 @@ void R_StoreWallRange(INT32 start, INT32 stop)
|| backsector->ceilinglightsec != frontsector->ceilinglightsec
//SoM: 4/3/2000: Check for colormaps
|| frontsector->extra_colormap != backsector->extra_colormap
- || (frontsector->ffloors != backsector->ffloors && frontsector->tag != backsector->tag))
+ || (frontsector->ffloors != backsector->ffloors && !Tag_Compare(&frontsector->tags, &backsector->tags)))
{
markceiling = true;
}
@@ -2098,7 +2032,7 @@ void R_StoreWallRange(INT32 start, INT32 stop)
rw_bottomtexturemid += sidedef->rowoffset;
// allocate space for masked texture tables
- if (frontsector && backsector && frontsector->tag != backsector->tag && (backsector->ffloors || frontsector->ffloors))
+ if (frontsector && backsector && !Tag_Compare(&frontsector->tags, &backsector->tags) && (backsector->ffloors || frontsector->ffloors))
{
ffloor_t *rover;
ffloor_t *r2;
@@ -2140,6 +2074,9 @@ void R_StoreWallRange(INT32 start, INT32 stop)
for (r2 = frontsector->ffloors; r2; r2 = r2->next)
{
+ if (r2->master == rover->master) // Skip if same control line.
+ break;
+
if (!(r2->flags & FF_EXISTS) || !(r2->flags & FF_RENDERSIDES))
continue;
@@ -2195,6 +2132,9 @@ void R_StoreWallRange(INT32 start, INT32 stop)
for (r2 = backsector->ffloors; r2; r2 = r2->next)
{
+ if (r2->master == rover->master) // Skip if same control line.
+ break;
+
if (!(r2->flags & FF_EXISTS) || !(r2->flags & FF_RENDERSIDES))
continue;
@@ -2786,20 +2726,11 @@ void R_StoreWallRange(INT32 start, INT32 stop)
}
}
-#ifdef WALLSPLATS
- if (linedef->splats && cv_splats.value)
- {
- // Isn't a bit wasteful to copy the ENTIRE array for every drawseg?
- M_Memcpy(last_ceilingclip + ds_p->x1, ceilingclip + ds_p->x1,
- sizeof (INT16) * (ds_p->x2 - ds_p->x1 + 1));
- M_Memcpy(last_floorclip + ds_p->x1, floorclip + ds_p->x1,
- sizeof (INT16) * (ds_p->x2 - ds_p->x1 + 1));
- R_RenderSegLoop();
- R_DrawWallSplats();
- }
- else
-#endif
- R_RenderSegLoop();
+ rw_silhouette = &(ds_p->silhouette);
+ rw_tsilheight = &(ds_p->tsilheight);
+ rw_bsilheight = &(ds_p->bsilheight);
+
+ R_RenderSegLoop();
colfunc = colfuncs[BASEDRAWFUNC];
if (portalline) // if curline is a portal, set portalrender for drawseg
diff --git a/src/r_skins.c b/src/r_skins.c
index 25904e95e3ff2c1c89e5fcd5c60c564efedaf84b..6f150f234ed9908f9c58bd42ecbe65ac5e5a534a 100644
--- a/src/r_skins.c
+++ b/src/r_skins.c
@@ -511,6 +511,10 @@ static boolean R_ProcessPatchableFields(skin_t *skin, char *stoken, char *value)
GETFLAG(MULTIABILITY)
GETFLAG(NONIGHTSROTATION)
GETFLAG(NONIGHTSSUPER)
+ GETFLAG(NOSUPERSPRITES)
+ GETFLAG(NOSUPERJUMPBOOST)
+ GETFLAG(CANBUSTWALLS)
+ GETFLAG(NOSHIELDABILITY)
#undef GETFLAG
else // let's check if it's a sound, otherwise error out
diff --git a/src/r_skins.h b/src/r_skins.h
index 04ce459a37889d9455be439da72e3cbd34318966..fbbb38743d84704d3373aafd9e5cc1a7135a46d2 100644
--- a/src/r_skins.h
+++ b/src/r_skins.h
@@ -17,6 +17,7 @@
#include "info.h"
#include "sounds.h"
#include "d_player.h" // skinflags
+#include "r_patch.h"
#include "r_picformats.h" // spriteinfo_t
#include "r_defs.h" // spritedef_t
diff --git a/src/r_splats.c b/src/r_splats.c
index dfec185a11ef2f4d6fc30ca532bd3de003d61942..72cac9fd937f6bc35e98a343bb4bf98c4a6a4b8a 100644
--- a/src/r_splats.c
+++ b/src/r_splats.c
@@ -1,626 +1,592 @@
// SONIC ROBO BLAST 2
//-----------------------------------------------------------------------------
// Copyright (C) 1998-2000 by DooM Legacy Team.
-// Copyright (C) 1999-2020 by Sonic Team Junior.
+// Copyright (C) 1999-2021 by Sonic Team Junior.
//
// This program is free software distributed under the
// terms of the GNU General Public License, version 2.
// See the 'LICENSE' file for more details.
//-----------------------------------------------------------------------------
/// \file r_splats.c
-/// \brief floor and wall splats
+/// \brief Floor splats
#include "r_draw.h"
#include "r_main.h"
-#include "r_plane.h"
#include "r_splats.h"
+#include "r_bsp.h"
+#include "p_local.h"
+#include "p_slopes.h"
#include "w_wad.h"
#include "z_zone.h"
-#include "d_netcmd.h"
-#ifdef WALLSPLATS
-static wallsplat_t wallsplats[MAXLEVELSPLATS]; // WALL splats
-static INT32 freewallsplat;
-#endif
+struct rastery_s *prastertab; // for ASM code
-#ifdef USEASM
-/// \brief for floorsplats \note accessed by asm code
-struct rastery_s *prastertab;
-#endif
+static struct rastery_s rastertab[MAXVIDHEIGHT];
+static void prepare_rastertab(void);
-#ifdef FLOORSPLATS
-static floorsplat_t floorsplats[1]; // FLOOR splats
-static INT32 freefloorsplat;
+// ==========================================================================
+// FLOOR SPLATS
+// ==========================================================================
-struct rastery_s
-{
- fixed_t minx, maxx; // for each raster line starting at line 0
- fixed_t tx1, ty1;
- fixed_t tx2, ty2; // start/end points in texture at this line
-};
-static struct rastery_s rastertab[MAXVIDHEIGHT];
+static void R_RasterizeFloorSplat(floorsplat_t *pSplat, vector2_t *verts, vissprite_t *vis);
-static void prepare_rastertab(void);
+#ifdef USEASM
+void ASMCALL rasterize_segment_tex_asm(INT32 x1, INT32 y1, INT32 x2, INT32 y2, INT32 tv1, INT32 tv2, INT32 tc, INT32 dir);
#endif
-// --------------------------------------------------------------------------
-// setup splat cache
-// --------------------------------------------------------------------------
-void R_ClearLevelSplats(void)
+static void rasterize_segment_tex(INT32 x1, INT32 y1, INT32 x2, INT32 y2, INT32 tv1, INT32 tv2, INT32 tc, INT32 dir)
{
-#ifdef WALLSPLATS
- freewallsplat = 0;
- memset(wallsplats, 0, sizeof (wallsplats));
+#ifdef USEASM
+ if (R_ASM)
+ {
+ rasterize_segment_tex_asm(x1, y1, x2, y2, tv1, tv2, tc, dir);
+ return;
+ }
+ else
#endif
-#ifdef FLOORSPLATS
- freefloorsplat = 0;
- memset(floorsplats, 0, sizeof (floorsplats));
+ {
+ fixed_t xs, xe, count;
+ fixed_t dx0, dx1;
- // setup to draw floorsplats
- prastertab = rastertab;
- prepare_rastertab();
-#endif
-}
+ if (y1 == y2)
+ return;
-// ==========================================================================
-// WALL SPLATS
-// ==========================================================================
-#ifdef WALLSPLATS
-// --------------------------------------------------------------------------
-// Return a pointer to a splat free for use, or NULL if no more splats are
-// available
-// --------------------------------------------------------------------------
-static wallsplat_t *R_AllocWallSplat(void)
-{
- wallsplat_t *splat;
- wallsplat_t *p_splat;
- line_t *li;
-
- // clear the splat from the line if it was in use
- splat = &wallsplats[freewallsplat];
- li = splat->line;
- if (li)
- {
- // remove splat from line splats list
- if (li->splats == splat)
- li->splats = splat->next; // remove from head
- else
+ if (y2 > y1)
{
- I_Assert(li->splats != NULL);
- for (p_splat = li->splats; p_splat->next; p_splat = p_splat->next)
- if (p_splat->next == splat)
- {
- p_splat->next = splat->next;
- break;
- }
- }
- }
+ count = (y2-y1)+1;
- memset(splat, 0, sizeof (wallsplat_t));
+ dx0 = FixedDiv((x2-x1)<<FRACBITS, count<<FRACBITS);
+ dx1 = FixedDiv((tv2-tv1)<<FRACBITS, count<<FRACBITS);
- // for next allocation
- freewallsplat++;
- if (freewallsplat >= 20)
- freewallsplat = 0;
+ xs = x1 << FRACBITS;
+ xe = tv1 << FRACBITS;
+ tc <<= FRACBITS;
- return splat;
-}
+ if (dir == 0)
+ {
+ for (;;)
+ {
+ rastertab[y1].maxx = xs;
+ rastertab[y1].tx2 = xe;
+ rastertab[y1].ty2 = tc;
-// Add a new splat to the linedef:
-// top: top z coord
-// wallfrac: frac along the linedef vector (0 to FRACUNIT)
-// splatpatchname: name of patch to draw
-void R_AddWallSplat(line_t *wallline, INT16 sectorside, const char *patchname, fixed_t top,
- fixed_t wallfrac, INT32 flags)
-{
- fixed_t fracsplat, linelength;
- wallsplat_t *splat = NULL;
- wallsplat_t *p_splat;
- patch_t *patch;
- sector_t *backsector = NULL;
-
- if (W_CheckNumForName(patchname) != LUMPERROR)
- splat = R_AllocWallSplat();
- if (!splat)
- return;
+ xs += dx0;
+ xe += dx1;
+ y1++;
- // set the splat
- splat->patch = W_GetNumForName(patchname);
- sectorside ^= 1;
- if (wallline->sidenum[sectorside] != 0xffff)
- {
- backsector = sides[wallline->sidenum[sectorside]].sector;
+ if (count-- < 1) break;
+ }
+ }
+ else
+ {
+ for (;;)
+ {
+ rastertab[y1].maxx = xs;
+ rastertab[y1].tx2 = tc;
+ rastertab[y1].ty2 = xe;
- if (top < backsector->floorheight)
- {
- splat->yoffset = &backsector->floorheight;
- top -= backsector->floorheight;
+ xs += dx0;
+ xe += dx1;
+ y1++;
+
+ if (count-- < 1) break;
+ }
+ }
}
- else if (top > backsector->ceilingheight)
+ else
{
- splat->yoffset = &backsector->ceilingheight;
- top -= backsector->ceilingheight;
- }
- }
+ count = (y1-y2)+1;
- splat->top = top;
- splat->flags = flags;
+ dx0 = FixedDiv((x1-x2)<<FRACBITS, count<<FRACBITS);
+ dx1 = FixedDiv((tv1-tv2)<<FRACBITS, count<<FRACBITS);
- // bad.. but will be needed for drawing anyway..
- patch = W_CachePatchNum(splat->patch, PU_PATCH);
+ xs = x2 << FRACBITS;
+ xe = tv2 << FRACBITS;
+ tc <<= FRACBITS;
- // offset needed by draw code for texture mapping
- linelength = P_SegLength((seg_t *)wallline);
- splat->offset = FixedMul(wallfrac, linelength) - (SHORT(patch->width)<<(FRACBITS-1));
- fracsplat = FixedDiv(((SHORT(patch->width)<<FRACBITS)>>1), linelength);
+ if (dir == 0)
+ {
+ for (;;)
+ {
+ rastertab[y2].minx = xs;
+ rastertab[y2].tx1 = xe;
+ rastertab[y2].ty1 = tc;
- wallfrac -= fracsplat;
- if (wallfrac > linelength)
- return;
- splat->v1.x = wallline->v1->x + FixedMul(wallline->dx, wallfrac);
- splat->v1.y = wallline->v1->y + FixedMul(wallline->dy, wallfrac);
- wallfrac += fracsplat + fracsplat;
- if (wallfrac < 0)
- return;
- splat->v2.x = wallline->v1->x + FixedMul(wallline->dx, wallfrac);
- splat->v2.y = wallline->v1->y + FixedMul(wallline->dy, wallfrac);
+ xs += dx0;
+ xe += dx1;
+ y2++;
- if (wallline->frontsector && wallline->frontsector == backsector)
- return;
-
- // insert splat in the linedef splat list
- // BP: why not insert in head is much more simple?
- // BP: because for remove it is more simple!
- splat->line = wallline;
- splat->next = NULL;
- if (wallline->splats)
- {
- p_splat = wallline->splats;
- while (p_splat->next)
- p_splat = p_splat->next;
- p_splat->next = splat;
- }
- else
- wallline->splats = splat;
-}
-#endif // WALLSPLATS
+ if (count-- < 1) break;
+ }
+ }
+ else
+ {
+ for (;;)
+ {
+ rastertab[y2].minx = xs;
+ rastertab[y2].tx1 = tc;
+ rastertab[y2].ty1 = xe;
-// ==========================================================================
-// FLOOR SPLATS
-// ==========================================================================
-#ifdef FLOORSPLATS
+ xs += dx0;
+ xe += dx1;
+ y2++;
-// --------------------------------------------------------------------------
-// Return a pointer to a splat free for use, or NULL if no more splats are
-// available
-// --------------------------------------------------------------------------
-static floorsplat_t *R_AllocFloorSplat(void)
-{
- floorsplat_t *splat;
- floorsplat_t *p_splat;
- subsector_t *sub;
-
- // find splat to use
- freefloorsplat++;
- if (freefloorsplat >= 1)
- freefloorsplat = 0;
-
- // clear the splat from the line if it was in use
- splat = &floorsplats[freefloorsplat];
- sub = splat->subsector;
- if (sub)
- {
- // remove splat from subsector splats list
- if (sub->splats == splat)
- sub->splats = splat->next; // remove from head
- else
- {
- p_splat = sub->splats;
- while (p_splat->next)
- {
- if (p_splat->next == splat)
- p_splat->next = splat->next;
+ if (count-- < 1) break;
+ }
}
}
}
-
- memset(splat, 0, sizeof (floorsplat_t));
- return splat;
}
-// --------------------------------------------------------------------------
-// Add a floor splat to the subsector
-// --------------------------------------------------------------------------
-void R_AddFloorSplat(subsector_t *subsec, mobj_t *mobj, const char *picname, fixed_t x, fixed_t y, fixed_t z,
- INT32 flags)
+void R_DrawFloorSplat(vissprite_t *spr)
{
- floorsplat_t *splat = NULL;
- floorsplat_t *p_splat;
- INT32 size;
+ floorsplat_t splat;
+ mobj_t *mobj = spr->mobj;
+ fixed_t tr_x, tr_y, rot_x, rot_y, rot_z;
+
+ vector3_t *v3d;
+ vector2_t v2d[4];
+ vector2_t rotated[4];
+
+ fixed_t x, y;
+ fixed_t w, h;
+ angle_t angle, splatangle;
+ fixed_t ca, sa;
+ fixed_t xscale, yscale;
+ fixed_t xoffset, yoffset;
+ fixed_t leftoffset, topoffset;
+ pslope_t *slope = NULL;
+ INT32 i;
+
+ boolean hflip = (spr->xiscale < 0);
+ boolean vflip = (spr->cut & SC_VFLIP);
+ UINT8 flipflags = 0;
+
+ renderflags_t renderflags = spr->renderflags;
+
+ if (hflip)
+ flipflags |= PICFLAGS_XFLIP;
+ if (vflip)
+ flipflags |= PICFLAGS_YFLIP;
+
+ if (!mobj || P_MobjWasRemoved(mobj))
+ return;
- if (W_CheckNumForName(picname) != LUMPERROR)
- splat = R_AllocFloorSplat();
- if (!splat)
+ Patch_GenerateFlat(spr->patch, flipflags);
+ splat.pic = spr->patch->flats[flipflags];
+ if (splat.pic == NULL)
return;
- // set the splat
- splat->pic = W_GetNumForName(picname);
- splat->flags = flags;
- splat->mobj = mobj;
+ splat.mobj = mobj;
+ splat.width = spr->patch->width;
+ splat.height = spr->patch->height;
+ splat.scale = mobj->scale;
- splat->z = z;
+ if (mobj->skin && ((skin_t *)mobj->skin)->flags & SF_HIRES)
+ splat.scale = FixedMul(splat.scale, ((skin_t *)mobj->skin)->highresscale);
- size = W_LumpLength(splat->pic);
+ if (spr->rotateflags & SRF_3D || renderflags & RF_NOSPLATBILLBOARD)
+ splatangle = mobj->angle;
+ else
+ splatangle = spr->viewangle;
- switch (size)
- {
- case 4194304: // 2048x2048 lump
- splat->size = 1024;
- break;
- case 1048576: // 1024x1024 lump
- splat->size = 512;
- break;
- case 262144:// 512x512 lump
- splat->size = 256;
- break;
- case 65536: // 256x256 lump
- splat->size = 128;
- break;
- case 16384: // 128x128 lump
- splat->size = 64;
- break;
- case 1024: // 32x32 lump
- splat->size = 16;
- break;
- default: // 64x64 lump
- splat->size = 32;
- break;
- }
+ if (!(spr->cut & SC_ISROTATED))
+ splatangle += mobj->rollangle;
+
+ splat.angle = -splatangle;
+ splat.angle += ANGLE_90;
+
+ topoffset = spr->spriteyoffset;
+ leftoffset = spr->spritexoffset;
+ if (hflip)
+ leftoffset = ((splat.width * FRACUNIT) - leftoffset);
+
+ xscale = spr->spritexscale;
+ yscale = spr->spriteyscale;
+
+ splat.xscale = FixedMul(splat.scale, xscale);
+ splat.yscale = FixedMul(splat.scale, yscale);
+
+ xoffset = FixedMul(leftoffset, splat.xscale);
+ yoffset = FixedMul(topoffset, splat.yscale);
+
+ x = mobj->x;
+ y = mobj->y;
+ w = (splat.width * splat.xscale);
+ h = (splat.height * splat.yscale);
+
+ splat.x = x;
+ splat.y = y;
+ splat.z = mobj->z;
+ splat.tilted = false;
+
+ // Set positions
// 3--2
// | |
// 0--1
- //
- splat->verts[0].x = splat->verts[3].x = x - (splat->size<<FRACBITS);
- splat->verts[2].x = splat->verts[1].x = x + ((splat->size-1)<<FRACBITS);
- splat->verts[3].y = splat->verts[2].y = y + ((splat->size-1)<<FRACBITS);
- splat->verts[0].y = splat->verts[1].y = y - (splat->size<<FRACBITS);
-
- // insert splat in the subsector splat list
- splat->subsector = subsec;
- splat->next = NULL;
- if (subsec->splats)
+
+ splat.verts[0].x = w - xoffset;
+ splat.verts[0].y = yoffset;
+
+ splat.verts[1].x = -xoffset;
+ splat.verts[1].y = yoffset;
+
+ splat.verts[2].x = -xoffset;
+ splat.verts[2].y = -h + yoffset;
+
+ splat.verts[3].x = w - xoffset;
+ splat.verts[3].y = -h + yoffset;
+
+ angle = -splat.angle;
+ ca = FINECOSINE(angle>>ANGLETOFINESHIFT);
+ sa = FINESINE(angle>>ANGLETOFINESHIFT);
+
+ // Rotate
+ for (i = 0; i < 4; i++)
{
- p_splat = subsec->splats;
- while (p_splat->next)
- p_splat = p_splat->next;
- p_splat->next = splat;
+ rotated[i].x = FixedMul(splat.verts[i].x, ca) - FixedMul(splat.verts[i].y, sa);
+ rotated[i].y = FixedMul(splat.verts[i].x, sa) + FixedMul(splat.verts[i].y, ca);
}
- else
- subsec->splats = splat;
-}
-// --------------------------------------------------------------------------
-// Before each frame being rendered, clear the visible floorsplats list
-// --------------------------------------------------------------------------
-static floorsplat_t *visfloorsplats;
+ if (renderflags & (RF_SLOPESPLAT | RF_OBJECTSLOPESPLAT))
+ {
+ pslope_t *standingslope = mobj->standingslope; // The slope that the object is standing on.
-void R_ClearVisibleFloorSplats(void)
-{
- visfloorsplats = NULL;
-}
+ // The slope that was defined for the sprite.
+ if (renderflags & RF_SLOPESPLAT)
+ slope = mobj->floorspriteslope;
-// --------------------------------------------------------------------------
-// Add a floorsplat to the visible floorsplats list, for the current frame
-// --------------------------------------------------------------------------
-void R_AddVisibleFloorSplats(subsector_t *subsec)
-{
- floorsplat_t *pSplat;
- I_Assert(subsec->splats != NULL);
-
- pSplat = subsec->splats;
- // the splat is not visible from below
- // FIXME: depending on some flag in pSplat->flags, some splats may be visible from 2 sides
- // (above/below)
- if (pSplat->z < viewz)
+ if (standingslope && (renderflags & RF_OBJECTSLOPESPLAT))
+ slope = standingslope;
+
+ // Set splat as tilted
+ splat.tilted = (slope != NULL);
+ }
+
+ if (splat.tilted)
{
- pSplat->nextvis = visfloorsplats;
- visfloorsplats = pSplat;
+ pslope_t *s = &splat.slope;
+
+ s->o.x = slope->o.x;
+ s->o.y = slope->o.y;
+ s->o.z = slope->o.z;
+
+ s->d.x = slope->d.x;
+ s->d.y = slope->d.y;
+
+ s->normal.x = slope->normal.x;
+ s->normal.y = slope->normal.y;
+ s->normal.z = slope->normal.z;
+
+ s->zdelta = slope->zdelta;
+ s->zangle = slope->zangle;
+ s->xydirection = slope->xydirection;
+
+ s->next = NULL;
+ s->flags = 0;
}
- while (pSplat->next)
+ // Translate
+ for (i = 0; i < 4; i++)
{
- pSplat = pSplat->next;
- if (pSplat->z < viewz)
+ tr_x = rotated[i].x + x;
+ tr_y = rotated[i].y + y;
+
+ if (slope)
{
- pSplat->nextvis = visfloorsplats;
- visfloorsplats = pSplat;
+ rot_z = P_GetSlopeZAt(slope, tr_x, tr_y);
+ splat.verts[i].z = rot_z;
}
+ else
+ splat.verts[i].z = splat.z;
+
+ splat.verts[i].x = tr_x;
+ splat.verts[i].y = tr_y;
}
-}
-#ifdef USEASM
-// tv1, tv2 = x/y qui varie dans la texture, tc = x/y qui est constant.
-void ASMCALL rasterize_segment_tex(INT32 x1, INT32 y1, INT32 x2, INT32 y2, INT32 tv1, INT32 tv2,
- INT32 tc, INT32 dir);
-#endif
+ for (i = 0; i < 4; i++)
+ {
+ v3d = &splat.verts[i];
+
+ // transform the origin point
+ tr_x = v3d->x - viewx;
+ tr_y = v3d->y - viewy;
+
+ // rotation around vertical y axis
+ rot_x = FixedMul(tr_x, viewsin) - FixedMul(tr_y, viewcos);
+ rot_y = FixedMul(tr_x, viewcos) + FixedMul(tr_y, viewsin);
+ rot_z = v3d->z - viewz;
-// current test with floor tile
-//#define FLOORSPLATSOLIDCOLOR
+ if (rot_y < FRACUNIT)
+ return;
+
+ // note: y from view above of map, is distance far away
+ xscale = FixedDiv(projection, rot_y);
+ yscale = -FixedDiv(projectiony, rot_y);
+
+ // projection
+ v2d[i].x = (centerxfrac + FixedMul(rot_x, xscale))>>FRACBITS;
+ v2d[i].y = (centeryfrac + FixedMul(rot_z, yscale))>>FRACBITS;
+ }
+
+ R_RasterizeFloorSplat(&splat, v2d, spr);
+}
// --------------------------------------------------------------------------
// Rasterize the four edges of a floor splat polygon,
// fill the polygon with linear interpolation, call span drawer for each
// scan line
// --------------------------------------------------------------------------
-static void R_RenderFloorSplat(floorsplat_t *pSplat, vertex_t *verts, UINT8 *pTex)
+static void R_RasterizeFloorSplat(floorsplat_t *pSplat, vector2_t *verts, vissprite_t *vis)
{
// rasterizing
- INT32 miny = vid.height + 1, maxy = 0, y, x1, ry1, x2, y2;
- fixed_t offsetx, offsety;
-
-#ifdef FLOORSPLATSOLIDCOLOR
- UINT8 *pDest;
- INT32 tdx, tdy, ty, tx, x;
-#else
- lighttable_t **planezlight;
- fixed_t planeheight;
- angle_t angle, planecos, planesin;
- fixed_t distance, span;
- size_t indexr;
- INT32 light;
-#endif
- (void)pTex;
+ INT32 miny = viewheight + 1, maxy = 0;
+ INT32 y, x1, ry1, x2, y2, i;
+ fixed_t offsetx = 0, offsety = 0;
+ fixed_t planeheight = 0;
+ fixed_t step;
- offsetx = pSplat->verts[0].x & ((pSplat->size << FRACBITS)-1);
- offsety = pSplat->verts[0].y & ((pSplat->size << FRACBITS)-1);
+ int spanfunctype = SPANDRAWFUNC_SPRITE;
- // do segment a -> top of texture
- x1 = verts[3].x;
- ry1 = verts[3].y;
- x2 = verts[2].x;
- y2 = verts[2].y;
- if (ry1 < 0)
- ry1 = 0;
- if (ry1 >= vid.height)
- ry1 = vid.height - 1;
- if (y2 < 0)
- y2 = 0;
- if (y2 >= vid.height)
- y2 = vid.height - 1;
- rasterize_segment_tex(x1, ry1, x2, y2, 0, pSplat->size - 1, 0, 0);
- if (ry1 < miny)
- miny = ry1;
- if (ry1 > maxy)
- maxy = ry1;
+ prepare_rastertab();
- // do segment b -> right side of texture
- x1 = x2;
- ry1 = y2;
- x2 = verts[1].x;
- y2 = verts[1].y;
- if (ry1 < 0)
- ry1 = 0;
- if (ry1 >= vid.height)
- ry1 = vid.height - 1;
- if (y2 < 0)
- y2 = 0;
- if (y2 >= vid.height)
- y2 = vid.height - 1;
- rasterize_segment_tex(x1, ry1, x2, y2, 0, pSplat->size - 1, pSplat->size - 1, 1);
- if (ry1 < miny)
- miny = ry1;
- if (ry1 > maxy)
- maxy = ry1;
+#define RASTERPARAMS(vnum1, vnum2, tv1, tv2, tc, dir) \
+ x1 = verts[vnum1].x; \
+ ry1 = verts[vnum1].y; \
+ x2 = verts[vnum2].x; \
+ y2 = verts[vnum2].y; \
+ if (y2 > ry1) \
+ step = FixedDiv(x2-x1, y2-ry1+1); \
+ else if (y2 == ry1) \
+ step = 0; \
+ else \
+ step = FixedDiv(x2-x1, ry1-y2+1); \
+ if (ry1 < 0) { \
+ if (step) { \
+ x1 <<= FRACBITS; \
+ x1 += (-ry1)*step; \
+ x1 >>= FRACBITS; \
+ } \
+ ry1 = 0; \
+ } \
+ if (ry1 >= vid.height) { \
+ if (step) { \
+ x1 <<= FRACBITS; \
+ x1 -= (vid.height-1-ry1)*step; \
+ x1 >>= FRACBITS; \
+ } \
+ ry1 = vid.height - 1; \
+ } \
+ if (y2 < 0) { \
+ if (step) { \
+ x2 <<= FRACBITS; \
+ x2 -= (-y2)*step; \
+ x2 >>= FRACBITS; \
+ } \
+ y2 = 0; \
+ } \
+ if (y2 >= vid.height) { \
+ if (step) { \
+ x2 <<= FRACBITS; \
+ x2 += (vid.height-1-y2)*step; \
+ x2 >>= FRACBITS; \
+ } \
+ y2 = vid.height - 1; \
+ } \
+ rasterize_segment_tex(x1, ry1, x2, y2, tv1, tv2, tc, dir); \
+ if (ry1 < miny) \
+ miny = ry1; \
+ if (ry1 > maxy) \
+ maxy = ry1;
+ // do segment a -> top of texture
+ RASTERPARAMS(3,2,0,pSplat->width-1,0,0);
+ // do segment b -> right side of texture
+ RASTERPARAMS(2,1,0,pSplat->width-1,pSplat->height-1,0);
// do segment c -> bottom of texture
- x1 = x2;
- ry1 = y2;
- x2 = verts[0].x;
- y2 = verts[0].y;
- if (ry1 < 0)
- ry1 = 0;
- if (ry1 >= vid.height)
- ry1 = vid.height - 1;
- if (y2 < 0)
- y2 = 0;
- if (y2 >= vid.height)
- y2 = vid.height - 1;
- rasterize_segment_tex(x1, ry1, x2, y2, pSplat->size - 1, 0, pSplat->size - 1, 0);
- if (ry1 < miny)
- miny = ry1;
- if (ry1 > maxy)
- maxy = ry1;
-
+ RASTERPARAMS(1,0,pSplat->width-1,0,pSplat->height-1,0);
// do segment d -> left side of texture
- x1 = x2;
- ry1 = y2;
- x2 = verts[3].x;
- y2 = verts[3].y;
- if (ry1 < 0)
- ry1 = 0;
- if (ry1 >= vid.height)
- ry1 = vid.height - 1;
- if (y2 < 0)
- y2 = 0;
- if (y2 >= vid.height)
- y2 = vid.height - 1;
- rasterize_segment_tex(x1, ry1, x2, y2, pSplat->size - 1, 0, 0, 1);
- if (ry1 < miny)
- miny = ry1;
- if (ry1 > maxy)
- maxy = ry1;
-
-#ifndef FLOORSPLATSOLIDCOLOR
- // prepare values for all the splat
- ds_source = W_CacheLumpNum(pSplat->pic, PU_CACHE);
- planeheight = abs(pSplat->z - viewz);
- light = (pSplat->subsector->sector->lightlevel >> LIGHTSEGSHIFT);
- if (light >= LIGHTLEVELS)
- light = LIGHTLEVELS - 1;
- if (light < 0)
- light = 0;
- planezlight = zlight[light];
+ RASTERPARAMS(0,3,pSplat->width-1,0,0,1);
- for (y = miny; y <= maxy; y++)
- {
- x1 = rastertab[y].minx>>FRACBITS;
- x2 = rastertab[y].maxx>>FRACBITS;
+ ds_source = (UINT8 *)pSplat->pic;
+ ds_flatwidth = pSplat->width;
+ ds_flatheight = pSplat->height;
- if (x1 < 0)
- x1 = 0;
- if (x2 >= vid.width)
- x2 = vid.width - 1;
+ if (R_CheckPowersOfTwo())
+ R_CheckFlatLength(ds_flatwidth * ds_flatheight);
- angle = (currentplane->viewangle + currentplane->plangle)>>ANGLETOFINESHIFT;
- planecos = FINECOSINE(angle);
- planesin = FINESINE(angle);
+ if (pSplat->tilted)
+ {
+ R_SetTiltedSpan(0);
+ R_CalculateSlopeVectors(&pSplat->slope, viewx, viewy, viewz, pSplat->xscale, pSplat->yscale, -pSplat->verts[0].x, pSplat->verts[0].y, vis->viewangle, pSplat->angle, 1.0f);
+ spanfunctype = SPANDRAWFUNC_TILTEDSPRITE;
+ }
+ else
+ {
+ planeheight = abs(pSplat->z - viewz);
- if (planeheight != cachedheight[y])
+ if (pSplat->angle)
{
- cachedheight[y] = planeheight;
- distance = cacheddistance[y] = FixedMul(planeheight, yslope[y]);
- ds_xstep = cachedxstep[y] = FixedMul(distance,basexscale);
- ds_ystep = cachedystep[y] = FixedMul(distance,baseyscale);
-
- if ((span = abs(centery-y)))
- {
- ds_xstep = cachedxstep[y] = FixedMul(planesin, planeheight) / span;
- ds_ystep = cachedystep[y] = FixedMul(planecos, planeheight) / span;
- }
+ // Add the view offset, rotated by the plane angle.
+ fixed_t a = -pSplat->verts[0].x + viewx;
+ fixed_t b = -pSplat->verts[0].y + viewy;
+ angle_t angle = (pSplat->angle >> ANGLETOFINESHIFT);
+ offsetx = FixedMul(a, FINECOSINE(angle)) - FixedMul(b,FINESINE(angle));
+ offsety = -FixedMul(a, FINESINE(angle)) - FixedMul(b,FINECOSINE(angle));
+ memset(cachedheight, 0, sizeof(cachedheight));
}
else
{
- distance = cacheddistance[y];
- ds_xstep = cachedxstep[y];
- ds_ystep = cachedystep[y];
+ offsetx = viewx - pSplat->verts[0].x;
+ offsety = pSplat->verts[0].y - viewy;
}
+ }
- ds_xfrac = xoffs + FixedMul(planecos, distance) + (x1 - centerx) * ds_xstep;
- ds_yfrac = yoffs - FixedMul(planesin, distance) + (x1 - centerx) * ds_ystep;
- ds_xfrac -= offsetx;
- ds_yfrac += offsety;
+ ds_colormap = vis->colormap;
+ ds_translation = R_GetSpriteTranslation(vis);
+ if (ds_translation == NULL)
+ ds_translation = colormaps;
- indexr = distance >> LIGHTZSHIFT;
- if (indexr >= MAXLIGHTZ)
- indexr = MAXLIGHTZ - 1;
- ds_colormap = planezlight[indexr];
+ if (vis->extra_colormap)
+ {
+ if (!ds_colormap)
+ ds_colormap = vis->extra_colormap->colormap;
+ else
+ ds_colormap = &vis->extra_colormap->colormap[ds_colormap - colormaps];
+ }
- ds_y = y;
- if (x2 >= x1) // sanity check
- {
- ds_x1 = x1;
- ds_x2 = x2;
- ds_transmap = transtables + ((tr_trans50-1)<<FF_TRANSSHIFT);
- (spanfuncs[SPANDRAWFUNC_SPLAT])();
- }
+ if (vis->transmap)
+ {
+ ds_transmap = vis->transmap;
- // reset for next calls to edge rasterizer
- rastertab[y].minx = INT32_MAX;
- rastertab[y].maxx = INT32_MIN;
+ if (pSplat->tilted)
+ spanfunctype = SPANDRAWFUNC_TILTEDTRANSSPRITE;
+ else
+ spanfunctype = SPANDRAWFUNC_TRANSSPRITE;
}
+ else
+ ds_transmap = NULL;
+
+ if (ds_powersoftwo)
+ spanfunc = spanfuncs[spanfunctype];
+ else
+ spanfunc = spanfuncs_npo2[spanfunctype];
+
+ if (maxy >= vid.height)
+ maxy = vid.height-1;
-#else
for (y = miny; y <= maxy; y++)
{
+ boolean cliptab[MAXVIDWIDTH+1];
+
x1 = rastertab[y].minx>>FRACBITS;
x2 = rastertab[y].maxx>>FRACBITS;
+
+ if (x1 > x2)
+ {
+ INT32 swap = x1;
+ x1 = x2;
+ x2 = swap;
+ }
+
+ if (x1 == INT16_MIN || x2 == INT16_MAX)
+ continue;
+
if (x1 < 0)
x1 = 0;
- if (x2 >= vid.width)
- x2 = vid.width - 1;
-
-// pDest = ylookup[y] + columnofs[x1];
- pDest = &topleft[y*vid.width + x1];
+ if (x2 >= viewwidth)
+ x2 = viewwidth - 1;
- x = x2 - x1 + 1;
+ if (x1 >= viewwidth || x2 < 0)
+ continue;
- // starting point of the texture
- tx = rastertab[y].tx1;
- ty = rastertab[y].ty1;
+ for (i = x1; i <= x2; i++)
+ cliptab[i] = (y >= mfloorclip[i]);
- // HORRIBLE BUG!!!
- if (x > 0)
+ // clip left
+ while (cliptab[x1])
{
- tdx = (rastertab[y].tx2 - tx) / x;
- tdy = (rastertab[y].ty2 - ty) / x;
-
- while (x-- > 0)
- {
- *(pDest++) = (UINT8)(y&1);
- tx += tdx;
- ty += tdy;
- }
+ x1++;
+ if (x1 >= viewwidth)
+ break;
}
- // reinitialise the minimum and maximum for the next approach
- rastertab[y].minx = INT32_MAX;
- rastertab[y].maxx = INT32_MIN;
- }
-#endif
-}
+ // clip right
+ i = x2;
-// --------------------------------------------------------------------------
-// R_DrawVisibleFloorSplats
-// draw the flat floor/ceiling splats
-// --------------------------------------------------------------------------
-void R_DrawVisibleFloorSplats(void)
-{
- floorsplat_t *pSplat;
- INT32 iCount = 0, i;
- fixed_t tr_x, tr_y, rot_x, rot_y, rot_z, xscale, yscale;
- vertex_t *v3d;
- vertex_t v2d[4];
-
- pSplat = visfloorsplats;
- while (pSplat)
- {
- iCount++;
+ while (i > x1)
+ {
+ if (cliptab[i])
+ x2 = i-1;
+ i--;
+ if (i < 0)
+ break;
+ }
- // Draw a floor splat
- // 3--2
- // | |
- // 0--1
+ if (x2 < x1)
+ continue;
- rot_z = pSplat->z - viewz;
- for (i = 0; i < 4; i++)
+ if (!pSplat->tilted)
{
- v3d = &pSplat->verts[i];
+ fixed_t xstep, ystep;
+ fixed_t distance, span;
- // transform the origin point
- tr_x = v3d->x - viewx;
- tr_y = v3d->y - viewy;
+ angle_t angle = (vis->viewangle + pSplat->angle)>>ANGLETOFINESHIFT;
+ angle_t planecos = FINECOSINE(angle);
+ angle_t planesin = FINESINE(angle);
- // rotation around vertical y axis
- rot_x = FixedMul(tr_x, viewsin) - FixedMul(tr_y, viewcos);
- rot_y = FixedMul(tr_x, viewcos) + FixedMul(tr_y, viewsin);
+ if (planeheight != cachedheight[y])
+ {
+ cachedheight[y] = planeheight;
+ distance = cacheddistance[y] = FixedMul(planeheight, yslope[y]);
+ span = abs(centery - y);
- if (rot_y < 4*FRACUNIT)
- goto skipit;
+ if (span) // Don't divide by zero
+ {
+ xstep = FixedMul(planesin, planeheight) / span;
+ ystep = FixedMul(planecos, planeheight) / span;
+ }
+ else
+ xstep = ystep = FRACUNIT;
+
+ cachedxstep[y] = xstep;
+ cachedystep[y] = ystep;
+ }
+ else
+ {
+ distance = cacheddistance[y];
+ xstep = cachedxstep[y];
+ ystep = cachedystep[y];
+ }
- // note: y from view above of map, is distance far away
- xscale = FixedDiv(projection, rot_y);
- yscale = -FixedDiv(projectiony, rot_y);
+ ds_xstep = FixedDiv(xstep, pSplat->xscale);
+ ds_ystep = FixedDiv(ystep, pSplat->yscale);
- // projection
- v2d[i].x = (centerxfrac + FixedMul (rot_x, xscale))>>FRACBITS;
- v2d[i].y = (centeryfrac + FixedMul (rot_z, yscale))>>FRACBITS;
+ ds_xfrac = FixedDiv(offsetx + FixedMul(planecos, distance) + (x1 - centerx) * xstep, pSplat->xscale);
+ ds_yfrac = FixedDiv(offsety - FixedMul(planesin, distance) + (x1 - centerx) * ystep, pSplat->yscale);
}
- R_RenderFloorSplat(pSplat, v2d, NULL);
-skipit:
- pSplat = pSplat->nextvis;
+ ds_y = y;
+ ds_x1 = x1;
+ ds_x2 = x2;
+ spanfunc();
+
+ rastertab[y].minx = INT32_MAX;
+ rastertab[y].maxx = INT32_MIN;
}
+
+ if (pSplat->angle && !pSplat->tilted)
+ memset(cachedheight, 0, sizeof(cachedheight));
}
static void prepare_rastertab(void)
{
- INT32 iLine;
- for (iLine = 0; iLine < vid.height; iLine++)
+ INT32 i;
+ prastertab = rastertab;
+ for (i = 0; i < vid.height; i++)
{
- rastertab[iLine].minx = INT32_MAX;
- rastertab[iLine].maxx = INT32_MIN;
+ rastertab[i].minx = INT32_MAX;
+ rastertab[i].maxx = INT32_MIN;
}
}
-
-#endif // FLOORSPLATS
diff --git a/src/r_splats.h b/src/r_splats.h
index 4ad893abbb2db5dcde78116fd94b65cf8f373aa4..05d8b66b06a8b04f569ae1739861660d425df92c 100644
--- a/src/r_splats.h
+++ b/src/r_splats.h
@@ -14,68 +14,34 @@
#define __R_SPLATS_H__
#include "r_defs.h"
-
-//#define WALLSPLATS // comment this out to compile without splat effects
-/*#ifdef USEASM
-#define FLOORSPLATS
-#endif*/
-
-#define MAXLEVELSPLATS 1024
-
-// splat flags
-#define SPLATDRAWMODE_MASK 0x03 // mask to get drawmode from flags
-#define SPLATDRAWMODE_OPAQUE 0x00
-#define SPLATDRAWMODE_SHADE 0x01
-#define SPLATDRAWMODE_TRANS 0x02
+#include "r_things.h"
// ==========================================================================
// DEFINITIONS
// ==========================================================================
-// WALL SPLATS are patches drawn on top of wall segs
-typedef struct wallsplat_s
+struct rastery_s
{
- lumpnum_t patch; // lump id.
- vertex_t v1, v2; // vertices along the linedef
- fixed_t top;
- fixed_t offset; // offset in columns<<FRACBITS from start of linedef to start of splat
- INT32 flags;
- fixed_t *yoffset;
- line_t *line; // the parent line of the splat seg
- struct wallsplat_s *next;
-} wallsplat_t;
+ fixed_t minx, maxx; // for each raster line starting at line 0
+ fixed_t tx1, ty1; // start points in texture at this line
+ fixed_t tx2, ty2; // end points in texture at this line
+};
+extern struct rastery_s *prastertab; // for ASM code
-// FLOOR SPLATS are pic_t (raw horizontally stored) drawn on top of the floor or ceiling
typedef struct floorsplat_s
{
- lumpnum_t pic; // a pic_t lump id
- INT32 flags;
- INT32 size; // 64, 128, 256, etc.
- vertex_t verts[4]; // (x,y) as viewn from above on map
- fixed_t z; // z (height) is constant for all the floorsplats
- subsector_t *subsector; // the parent subsector
+ UINT16 *pic;
+ INT32 width, height;
+ fixed_t scale, xscale, yscale;
+ angle_t angle;
+ boolean tilted; // Uses the tilted drawer
+ pslope_t slope;
+
+ vector3_t verts[4]; // (x,y,z) as viewed from above on map
+ fixed_t x, y, z; // position
mobj_t *mobj; // Mobj it is tied to
- struct floorsplat_s *next;
- struct floorsplat_s *nextvis;
} floorsplat_t;
-// p_setup.c
-fixed_t P_SegLength(seg_t *seg);
-
-// call at P_SetupLevel()
-void R_ClearLevelSplats(void);
-
-#ifdef WALLSPLATS
-void R_AddWallSplat(line_t *wallline, INT16 sectorside, const char *patchname, fixed_t top,
- fixed_t wallfrac, INT32 flags);
-#endif
-#ifdef FLOORSPLATS
-void R_AddFloorSplat(subsector_t *subsec, mobj_t *mobj, const char *picname, fixed_t x, fixed_t y, fixed_t z,
- INT32 flags);
-#endif
-
-void R_ClearVisibleFloorSplats(void);
-void R_AddVisibleFloorSplats(subsector_t *subsec);
-void R_DrawVisibleFloorSplats(void);
+void R_DrawFloorSplat(vissprite_t *spr);
#endif /*__R_SPLATS_H__*/
diff --git a/src/r_textures.c b/src/r_textures.c
index a34c29c728c79395d56ad93864b32c575032d5aa..d5da69018cb39c81a1dcac1fe01736ee67abab65 100644
--- a/src/r_textures.c
+++ b/src/r_textures.c
@@ -2,7 +2,7 @@
//-----------------------------------------------------------------------------
// Copyright (C) 1993-1996 by id Software, Inc.
// Copyright (C) 1998-2000 by DooM Legacy Team.
-// Copyright (C) 1999-2020 by Sonic Team Junior.
+// Copyright (C) 1999-2021 by Sonic Team Junior.
//
// This program is free software distributed under the
// terms of the GNU General Public License, version 2.
@@ -20,6 +20,7 @@
#include "m_misc.h"
#include "r_data.h"
#include "r_textures.h"
+#include "r_patch.h"
#include "r_picformats.h"
#include "w_wad.h"
#include "z_zone.h"
@@ -27,13 +28,8 @@
#include "byteptr.h"
#include "dehacked.h"
-// I don't know what this is even for, but r_data.c had it.
-#ifdef _WIN32
-#include <malloc.h> // alloca(sizeof)
-#endif
-
#ifdef HWRENDER
-#include "hardware/hw_main.h" // HWR_LoadTextures
+#include "hardware/hw_glob.h" // HWR_LoadMapTextures
#endif
#include <errno.h>
@@ -266,7 +262,7 @@ UINT8 *R_GenerateTexture(size_t texnum)
UINT8 *blocktex;
texture_t *texture;
texpatch_t *patch;
- patch_t *realpatch;
+ softwarepatch_t *realpatch;
UINT8 *pdata;
int x, x1, x2, i, width, height;
size_t blocksize;
@@ -296,7 +292,7 @@ UINT8 *R_GenerateTexture(size_t texnum)
lumpnum = patch->lump;
lumplength = W_LumpLengthPwad(wadnum, lumpnum);
pdata = W_CacheLumpNumPwad(wadnum, lumpnum, PU_CACHE);
- realpatch = (patch_t *)pdata;
+ realpatch = (softwarepatch_t *)pdata;
#ifndef NO_PNG_LUMPS
if (Picture_IsLumpPNG((UINT8 *)realpatch, lumplength))
@@ -392,17 +388,17 @@ UINT8 *R_GenerateTexture(size_t texnum)
lumpnum = patch->lump;
pdata = W_CacheLumpNumPwad(wadnum, lumpnum, PU_CACHE);
lumplength = W_LumpLengthPwad(wadnum, lumpnum);
- realpatch = (patch_t *)pdata;
+ realpatch = (softwarepatch_t *)pdata;
dealloc = true;
#ifndef NO_PNG_LUMPS
if (Picture_IsLumpPNG((UINT8 *)realpatch, lumplength))
- realpatch = (patch_t *)Picture_PNGConvert((UINT8 *)realpatch, PICFMT_PATCH, NULL, NULL, NULL, NULL, lumplength, NULL, 0);
+ realpatch = (softwarepatch_t *)Picture_PNGConvert((UINT8 *)realpatch, PICFMT_DOOMPATCH, NULL, NULL, NULL, NULL, lumplength, NULL, 0);
else
#endif
#ifdef WALLFLATS
if (texture->type == TEXTURETYPE_FLAT)
- realpatch = (patch_t *)Picture_Convert(PICFMT_FLAT, pdata, PICFMT_PATCH, 0, NULL, texture->width, texture->height, 0, 0, 0);
+ realpatch = (softwarepatch_t *)Picture_Convert(PICFMT_FLAT, pdata, PICFMT_DOOMPATCH, 0, NULL, texture->width, texture->height, 0, 0, 0);
else
#endif
{
@@ -597,13 +593,13 @@ void *R_GetLevelFlat(levelflat_t *levelflat)
{
UINT8 *converted;
size_t size;
- patch_t *patch = W_CacheLumpNum(levelflat->u.flat.lumpnum, PU_CACHE);
+ softwarepatch_t *patch = W_CacheLumpNum(levelflat->u.flat.lumpnum, PU_CACHE);
levelflat->width = ds_flatwidth = SHORT(patch->width);
levelflat->height = ds_flatheight = SHORT(patch->height);
levelflat->picture = Z_Malloc(levelflat->width * levelflat->height, PU_LEVEL, NULL);
- converted = Picture_FlatConvert(PICFMT_PATCH, patch, PICFMT_FLAT, 0, &size, levelflat->width, levelflat->height, patch->topoffset, patch->leftoffset, 0);
+ converted = Picture_FlatConvert(PICFMT_DOOMPATCH, patch, PICFMT_FLAT, 0, &size, levelflat->width, levelflat->height, SHORT(patch->topoffset), SHORT(patch->leftoffset), 0);
M_Memcpy(levelflat->picture, converted, size);
Z_Free(converted);
}
@@ -625,7 +621,7 @@ void *R_GetLevelFlat(levelflat_t *levelflat)
//
// R_CheckPowersOfTwo
//
-// Self-explanatory?
+// Sets ds_powersoftwo true if the flat's dimensions are powers of two, and returns that.
//
boolean R_CheckPowersOfTwo(void)
{
@@ -839,7 +835,7 @@ Rloadtextures (INT32 i, INT32 w)
UINT16 j;
UINT16 texstart, texend, texturesLumpPos;
texture_t *texture;
- patch_t *patchlump;
+ softwarepatch_t *patchlump;
texpatch_t *patch;
// Get the lump numbers for the markers in the WAD, if they exist.
@@ -1062,7 +1058,7 @@ void R_LoadTextures(void)
#ifdef HWRENDER
if (rendermode == render_opengl)
- HWR_LoadTextures(numtextures);
+ HWR_LoadMapTextures(numtextures);
#endif
}
diff --git a/src/r_things.c b/src/r_things.c
index 382eed5608b372d7a2d3c83191d20fa9f0626f66..5c0e5fda95b2052e376f16279abae72ba29581f1 100644
--- a/src/r_things.c
+++ b/src/r_things.c
@@ -2,7 +2,7 @@
//-----------------------------------------------------------------------------
// Copyright (C) 1993-1996 by id Software, Inc.
// Copyright (C) 1998-2000 by DooM Legacy Team.
-// Copyright (C) 1999-2020 by Sonic Team Junior.
+// Copyright (C) 1999-2021 by Sonic Team Junior.
//
// This program is free software distributed under the
// terms of the GNU General Public License, version 2.
@@ -24,9 +24,12 @@
#include "i_video.h" // rendermode
#include "i_system.h"
#include "r_things.h"
+#include "r_patch.h"
+#include "r_patchrotation.h"
#include "r_picformats.h"
#include "r_plane.h"
#include "r_portal.h"
+#include "r_splats.h"
#include "p_tick.h"
#include "p_local.h"
#include "p_slopes.h"
@@ -96,7 +99,7 @@ static void R_InstallSpriteLump(UINT16 wad, // graphics patch
{
char cn = R_Frame2Char(frame), cr = R_Rotation2Char(rotation); // for debugging
- INT32 r, ang;
+ INT32 r;
lumpnum_t lumppat = wad;
lumppat <<= 16;
lumppat += lump;
@@ -104,15 +107,13 @@ static void R_InstallSpriteLump(UINT16 wad, // graphics patch
if (maxframe ==(size_t)-1 || frame > maxframe)
maxframe = frame;
- // rotsprite
#ifdef ROTSPRITE
- sprtemp[frame].rotsprite.cached = 0;
for (r = 0; r < 16; r++)
{
- for (ang = 0; ang < ROTANGLES; ang++)
- sprtemp[frame].rotsprite.patch[r][ang] = NULL;
+ sprtemp[frame].rotated[0][r] = NULL;
+ sprtemp[frame].rotated[1][r] = NULL;
}
-#endif/*ROTSPRITE*/
+#endif
if (rotation == 0)
{
@@ -228,8 +229,8 @@ boolean R_AddSingleSpriteDef(const char *sprname, spritedef_t *spritedef, UINT16
UINT8 frame;
UINT8 rotation;
lumpinfo_t *lumpinfo;
- patch_t patch;
- UINT8 numadded = 0;
+ softwarepatch_t patch;
+ UINT16 numadded = 0;
memset(sprtemp,0xFF, sizeof (sprtemp));
maxframe = (size_t)-1;
@@ -240,9 +241,6 @@ boolean R_AddSingleSpriteDef(const char *sprname, spritedef_t *spritedef, UINT16
// if so, it might patch only certain frames, not all
if (spritedef->numframes) // (then spriteframes is not null)
{
-#ifdef ROTSPRITE
- R_FreeSingleRotSprite(spritedef);
-#endif
// copy the already defined sprite frames
M_Memcpy(sprtemp, spritedef->spriteframes,
spritedef->numframes * sizeof (spriteframe_t));
@@ -283,7 +281,7 @@ boolean R_AddSingleSpriteDef(const char *sprname, spritedef_t *spritedef, UINT16
#ifndef NO_PNG_LUMPS
{
- patch_t *png = W_CacheLumpNumPwad(wadnum, l, PU_STATIC);
+ softwarepatch_t *png = W_CacheLumpNumPwad(wadnum, l, PU_STATIC);
size_t len = W_LumpLengthPwad(wadnum, l);
if (Picture_IsLumpPNG((UINT8 *)png, len))
@@ -298,11 +296,11 @@ boolean R_AddSingleSpriteDef(const char *sprname, spritedef_t *spritedef, UINT16
if (!isPNG)
#endif
{
- W_ReadLumpHeaderPwad(wadnum, l, &patch, sizeof (patch_t), 0);
- width = SHORT(patch.width);
- height = SHORT(patch.height);
- topoffset = SHORT(patch.topoffset);
- leftoffset = SHORT(patch.leftoffset);
+ W_ReadLumpHeaderPwad(wadnum, l, &patch, sizeof(INT16) * 4, 0);
+ width = (INT32)(SHORT(patch.width));
+ height = (INT32)(SHORT(patch.height));
+ topoffset = (INT16)(SHORT(patch.topoffset));
+ leftoffset = (INT16)(SHORT(patch.leftoffset));
}
spritecachedinfo[numspritelumps].width = width<<FRACBITS;
@@ -310,14 +308,8 @@ boolean R_AddSingleSpriteDef(const char *sprname, spritedef_t *spritedef, UINT16
spritecachedinfo[numspritelumps].topoffset = topoffset<<FRACBITS;
spritecachedinfo[numspritelumps].height = height<<FRACBITS;
- //BP: we cannot use special tric in hardware mode because feet in ground caused by z-buffer
- if (rendermode != render_none) // not for psprite
- spritecachedinfo[numspritelumps].topoffset += FEETADJUST;
- // Being selective with this causes bad things. :( Like the special stage tokens breaking apart.
- /*if (rendermode != render_none // not for psprite
- && SHORT(patch.topoffset)>0 && SHORT(patch.topoffset)<SHORT(patch.height))
- // perfect is patch.height but sometime it is too high
- spritecachedinfo[numspritelumps].topoffset = min(SHORT(patch.topoffset)+(FEETADJUST>>FRACBITS),SHORT(patch.height))<<FRACBITS;*/
+ // BP: we cannot use special tric in hardware mode because feet in ground caused by z-buffer
+ spritecachedinfo[numspritelumps].topoffset += FEETADJUST;
//----------------------------------------------------
@@ -414,9 +406,6 @@ boolean R_AddSingleSpriteDef(const char *sprname, spritedef_t *spritedef, UINT16
if (spritedef->numframes && // has been allocated
spritedef->numframes < maxframe) // more frames are defined ?
{
-#ifdef ROTSPRITE
- R_FreeSingleRotSprite(spritedef);
-#endif
Z_Free(spritedef->spriteframes);
spritedef->spriteframes = NULL;
}
@@ -746,6 +735,55 @@ void R_DrawFlippedMaskedColumn(column_t *column)
dc_texturemid = basetexturemid;
}
+boolean R_SpriteIsFlashing(vissprite_t *vis)
+{
+ return (!(vis->cut & SC_PRECIP)
+ && (vis->mobj->flags & (MF_ENEMY|MF_BOSS))
+ && (vis->mobj->flags2 & MF2_FRET)
+ && !(vis->mobj->flags & MF_GRENADEBOUNCE)
+ && (leveltime & 1));
+}
+
+UINT8 *R_GetSpriteTranslation(vissprite_t *vis)
+{
+ if (R_SpriteIsFlashing(vis)) // Bosses "flash"
+ {
+ if (vis->mobj->type == MT_CYBRAKDEMON || vis->mobj->colorized)
+ return R_GetTranslationColormap(TC_ALLWHITE, 0, GTC_CACHE);
+ else if (vis->mobj->type == MT_METALSONIC_BATTLE)
+ return R_GetTranslationColormap(TC_METALSONIC, 0, GTC_CACHE);
+ else
+ return R_GetTranslationColormap(TC_BOSS, 0, GTC_CACHE);
+ }
+ else if (vis->mobj->color)
+ {
+ // New colormap stuff for skins Tails 06-07-2002
+ if (!(vis->cut & SC_PRECIP) && vis->mobj->colorized)
+ return R_GetTranslationColormap(TC_RAINBOW, vis->mobj->color, GTC_CACHE);
+ else if (!(vis->cut & SC_PRECIP)
+ && vis->mobj->player && vis->mobj->player->dashmode >= DASHMODE_THRESHOLD
+ && (vis->mobj->player->charflags & SF_DASHMODE)
+ && ((leveltime/2) & 1))
+ {
+ if (vis->mobj->player->charflags & SF_MACHINE)
+ return R_GetTranslationColormap(TC_DASHMODE, 0, GTC_CACHE);
+ else
+ return R_GetTranslationColormap(TC_RAINBOW, vis->mobj->color, GTC_CACHE);
+ }
+ else if (!(vis->cut & SC_PRECIP) && vis->mobj->skin && vis->mobj->sprite == SPR_PLAY) // This thing is a player!
+ {
+ size_t skinnum = (skin_t*)vis->mobj->skin-skins;
+ return R_GetTranslationColormap((INT32)skinnum, vis->mobj->color, GTC_CACHE);
+ }
+ else // Use the defaults
+ return R_GetTranslationColormap(TC_DEFAULT, vis->mobj->color, GTC_CACHE);
+ }
+ else if (vis->mobj->sprite == SPR_PLAY) // Looks like a player, but doesn't have a color? Get rid of green sonic syndrome.
+ return R_GetTranslationColormap(TC_DEFAULT, SKINCOLOR_BLUE, GTC_CACHE);
+
+ return NULL;
+}
+
//
// R_DrawVisSprite
// mfloorclip and mceilingclip should also be set.
@@ -758,7 +796,7 @@ static void R_DrawVisSprite(vissprite_t *vis)
INT32 pwidth;
fixed_t frac;
patch_t *patch = vis->patch;
- fixed_t this_scale = vis->mobj->scale;
+ fixed_t this_scale = vis->thingscale;
INT32 x1, x2;
INT64 overflow_test;
@@ -779,79 +817,26 @@ static void R_DrawVisSprite(vissprite_t *vis)
colfunc = colfuncs[BASEDRAWFUNC]; // hack: this isn't resetting properly somewhere.
dc_colormap = vis->colormap;
- if (!(vis->cut & SC_PRECIP) && (vis->mobj->flags & (MF_ENEMY|MF_BOSS)) && (vis->mobj->flags2 & MF2_FRET) && !(vis->mobj->flags & MF_GRENADEBOUNCE) && (leveltime & 1)) // Bosses "flash"
- {
- // translate certain pixels to white
- colfunc = colfuncs[COLDRAWFUNC_TRANS];
- if (vis->mobj->type == MT_CYBRAKDEMON || vis->mobj->colorized)
- dc_translation = R_GetTranslationColormap(TC_ALLWHITE, 0, GTC_CACHE);
- else if (vis->mobj->type == MT_METALSONIC_BATTLE)
- dc_translation = R_GetTranslationColormap(TC_METALSONIC, 0, GTC_CACHE);
- else
- dc_translation = R_GetTranslationColormap(TC_BOSS, 0, GTC_CACHE);
- }
+ dc_translation = R_GetSpriteTranslation(vis);
+
+ if (R_SpriteIsFlashing(vis)) // Bosses "flash"
+ colfunc = colfuncs[COLDRAWFUNC_TRANS]; // translate certain pixels to white
else if (vis->mobj->color && vis->transmap) // Color mapping
{
colfunc = colfuncs[COLDRAWFUNC_TRANSTRANS];
dc_transmap = vis->transmap;
- if (!(vis->cut & SC_PRECIP) && vis->mobj->colorized)
- dc_translation = R_GetTranslationColormap(TC_RAINBOW, vis->mobj->color, GTC_CACHE);
- else if (!(vis->cut & SC_PRECIP)
- && vis->mobj->player && vis->mobj->player->dashmode >= DASHMODE_THRESHOLD
- && (vis->mobj->player->charflags & SF_DASHMODE)
- && ((leveltime/2) & 1))
- {
- if (vis->mobj->player->charflags & SF_MACHINE)
- dc_translation = R_GetTranslationColormap(TC_DASHMODE, 0, GTC_CACHE);
- else
- dc_translation = R_GetTranslationColormap(TC_RAINBOW, vis->mobj->color, GTC_CACHE);
- }
- else if (!(vis->cut & SC_PRECIP) && vis->mobj->skin && vis->mobj->sprite == SPR_PLAY) // MT_GHOST LOOKS LIKE A PLAYER SO USE THE PLAYER TRANSLATION TABLES. >_>
- {
- size_t skinnum = (skin_t*)vis->mobj->skin-skins;
- dc_translation = R_GetTranslationColormap((INT32)skinnum, vis->mobj->color, GTC_CACHE);
- }
- else // Use the defaults
- dc_translation = R_GetTranslationColormap(TC_DEFAULT, vis->mobj->color, GTC_CACHE);
}
else if (vis->transmap)
{
colfunc = colfuncs[COLDRAWFUNC_FUZZY];
dc_transmap = vis->transmap; //Fab : 29-04-98: translucency table
}
- else if (vis->mobj->color)
- {
- // translate green skin to another color
+ else if (vis->mobj->color) // translate green skin to another color
colfunc = colfuncs[COLDRAWFUNC_TRANS];
-
- // New colormap stuff for skins Tails 06-07-2002
- if (!(vis->cut & SC_PRECIP) && vis->mobj->colorized)
- dc_translation = R_GetTranslationColormap(TC_RAINBOW, vis->mobj->color, GTC_CACHE);
- else if (!(vis->cut & SC_PRECIP)
- && vis->mobj->player && vis->mobj->player->dashmode >= DASHMODE_THRESHOLD
- && (vis->mobj->player->charflags & SF_DASHMODE)
- && ((leveltime/2) & 1))
- {
- if (vis->mobj->player->charflags & SF_MACHINE)
- dc_translation = R_GetTranslationColormap(TC_DASHMODE, 0, GTC_CACHE);
- else
- dc_translation = R_GetTranslationColormap(TC_RAINBOW, vis->mobj->color, GTC_CACHE);
- }
- else if (!(vis->cut & SC_PRECIP) && vis->mobj->skin && vis->mobj->sprite == SPR_PLAY) // This thing is a player!
- {
- size_t skinnum = (skin_t*)vis->mobj->skin-skins;
- dc_translation = R_GetTranslationColormap((INT32)skinnum, vis->mobj->color, GTC_CACHE);
- }
- else // Use the defaults
- dc_translation = R_GetTranslationColormap(TC_DEFAULT, vis->mobj->color, GTC_CACHE);
- }
else if (vis->mobj->sprite == SPR_PLAY) // Looks like a player, but doesn't have a color? Get rid of green sonic syndrome.
- {
colfunc = colfuncs[COLDRAWFUNC_TRANS];
- dc_translation = R_GetTranslationColormap(TC_DEFAULT, SKINCOLOR_BLUE, GTC_CACHE);
- }
- if (vis->extra_colormap)
+ if (vis->extra_colormap && !(vis->renderflags & RF_NOCOLORMAPS))
{
if (!dc_colormap)
dc_colormap = vis->extra_colormap->colormap;
@@ -905,18 +890,21 @@ static void R_DrawVisSprite(vissprite_t *vis)
vis->x2 = vid.width-1;
localcolfunc = (vis->cut & SC_VFLIP) ? R_DrawFlippedMaskedColumn : R_DrawMaskedColumn;
- lengthcol = SHORT(patch->height);
+ lengthcol = patch->height;
// Split drawing loops for paper and non-paper to reduce conditional checks per sprite
if (vis->scalestep)
{
- pwidth = SHORT(patch->width);
+ fixed_t horzscale = FixedMul(vis->spritexscale, this_scale);
+ fixed_t scalestep = FixedMul(vis->scalestep, vis->spriteyscale);
+
+ pwidth = patch->width;
// Papersprite drawing loop
- for (dc_x = vis->x1; dc_x <= vis->x2; dc_x++, spryscale += vis->scalestep)
+ for (dc_x = vis->x1; dc_x <= vis->x2; dc_x++, spryscale += scalestep)
{
angle_t angle = ((vis->centerangle + xtoviewangle[dc_x]) >> ANGLETOFINESHIFT) & 0xFFF;
- texturecolumn = (vis->paperoffset - FixedMul(FINETANGENT(angle), vis->paperdistance)) / this_scale;
+ texturecolumn = (vis->paperoffset - FixedMul(FINETANGENT(angle), vis->paperdistance)) / horzscale;
if (texturecolumn < 0 || texturecolumn >= pwidth)
continue;
@@ -927,15 +915,37 @@ static void R_DrawVisSprite(vissprite_t *vis)
sprtopscreen = (centeryfrac - FixedMul(dc_texturemid, spryscale));
dc_iscale = (0xffffffffu / (unsigned)spryscale);
- column = (column_t *)((UINT8 *)patch + LONG(patch->columnofs[texturecolumn]));
+ column = (column_t *)((UINT8 *)patch->columns + (patch->columnofs[texturecolumn]));
+
+ localcolfunc (column);
+ }
+ }
+ else if (vis->cut & SC_SHEAR)
+ {
+#ifdef RANGECHECK
+ pwidth = patch->width;
+#endif
+
+ // Vertically sheared sprite
+ for (dc_x = vis->x1; dc_x <= vis->x2; dc_x++, frac += vis->xiscale, dc_texturemid -= vis->shear.tan)
+ {
+#ifdef RANGECHECK
+ texturecolumn = frac>>FRACBITS;
+ if (texturecolumn < 0 || texturecolumn >= pwidth)
+ I_Error("R_DrawSpriteRange: bad texturecolumn at %d from end", vis->x2 - dc_x);
+ column = (column_t *)((UINT8 *)patch->columns + (patch->columnofs[texturecolumn]));
+#else
+ column = (column_t *)((UINT8 *)patch->columns + (patch->columnofs[frac>>FRACBITS]));
+#endif
+ sprtopscreen = (centeryfrac - FixedMul(dc_texturemid, spryscale));
localcolfunc (column);
}
}
else
{
#ifdef RANGECHECK
- pwidth = SHORT(patch->width);
+ pwidth = patch->width;
#endif
// Non-paper drawing loop
@@ -945,9 +955,9 @@ static void R_DrawVisSprite(vissprite_t *vis)
texturecolumn = frac>>FRACBITS;
if (texturecolumn < 0 || texturecolumn >= pwidth)
I_Error("R_DrawSpriteRange: bad texturecolumn at %d from end", vis->x2 - dc_x);
- column = (column_t *)((UINT8 *)patch + LONG(patch->columnofs[texturecolumn]));
+ column = (column_t *)((UINT8 *)patch->columns + (patch->columnofs[texturecolumn]));
#else
- column = (column_t *)((UINT8 *)patch + LONG(patch->columnofs[frac>>FRACBITS]));
+ column = (column_t *)((UINT8 *)patch->columns + (patch->columnofs[frac>>FRACBITS]));
#endif
localcolfunc (column);
}
@@ -1009,12 +1019,12 @@ static void R_DrawPrecipitationVisSprite(vissprite_t *vis)
#ifdef RANGECHECK
texturecolumn = frac>>FRACBITS;
- if (texturecolumn < 0 || texturecolumn >= SHORT(patch->width))
+ if (texturecolumn < 0 || texturecolumn >= patch->width)
I_Error("R_DrawPrecipitationSpriteRange: bad texturecolumn");
- column = (column_t *)((UINT8 *)patch + LONG(patch->columnofs[texturecolumn]));
+ column = (column_t *)((UINT8 *)patch->columns + (patch->columnofs[texturecolumn]));
#else
- column = (column_t *)((UINT8 *)patch + LONG(patch->columnofs[frac>>FRACBITS]));
+ column = (column_t *)((UINT8 *)patch->columns + (patch->columnofs[frac>>FRACBITS]));
#endif
R_DrawMaskedColumn(column);
}
@@ -1226,6 +1236,29 @@ fixed_t R_GetShadowZ(mobj_t *thing, pslope_t **shadowslope)
#undef CHECKZ
}
+static void R_SkewShadowSprite(
+ mobj_t *thing, pslope_t *groundslope,
+ fixed_t groundz, INT32 spriteheight, fixed_t scalemul,
+ fixed_t *shadowyscale, fixed_t *shadowskew)
+{
+ // haha let's try some dumb stuff
+ fixed_t xslope, zslope;
+ angle_t sloperelang = (R_PointToAngle(thing->x, thing->y) - groundslope->xydirection) >> ANGLETOFINESHIFT;
+
+ xslope = FixedMul(FINESINE(sloperelang), groundslope->zdelta);
+ zslope = FixedMul(FINECOSINE(sloperelang), groundslope->zdelta);
+
+ //CONS_Printf("Shadow is sloped by %d %d\n", xslope, zslope);
+
+ if (viewz < groundz)
+ *shadowyscale += FixedMul(FixedMul(thing->radius*2 / spriteheight, scalemul), zslope);
+ else
+ *shadowyscale -= FixedMul(FixedMul(thing->radius*2 / spriteheight, scalemul), zslope);
+
+ *shadowyscale = abs((*shadowyscale));
+ *shadowskew = xslope;
+}
+
static void R_ProjectDropShadow(mobj_t *thing, vissprite_t *vis, fixed_t scale, fixed_t tx, fixed_t tz)
{
vissprite_t *shadow;
@@ -1249,45 +1282,27 @@ static void R_ProjectDropShadow(mobj_t *thing, vissprite_t *vis, fixed_t scale,
scalemul = FixedMul(FRACUNIT - floordiff/640, scale);
- patch = W_CachePatchName("DSHADOW", PU_CACHE);
+ patch = W_CachePatchName("DSHADOW", PU_SPRITE);
xscale = FixedDiv(projection, tz);
yscale = FixedDiv(projectiony, tz);
shadowxscale = FixedMul(thing->radius*2, scalemul);
shadowyscale = FixedMul(FixedMul(thing->radius*2, scalemul), FixedDiv(abs(groundz - viewz), tz));
- shadowyscale = min(shadowyscale, shadowxscale) / SHORT(patch->height);
- shadowxscale /= SHORT(patch->width);
+ shadowyscale = min(shadowyscale, shadowxscale) / patch->height;
+ shadowxscale /= patch->width;
shadowskew = 0;
if (groundslope)
- {
- // haha let's try some dumb stuff
- fixed_t xslope, zslope;
- angle_t sloperelang = (R_PointToAngle(thing->x, thing->y) - groundslope->xydirection) >> ANGLETOFINESHIFT;
-
- xslope = FixedMul(FINESINE(sloperelang), groundslope->zdelta);
- zslope = FixedMul(FINECOSINE(sloperelang), groundslope->zdelta);
+ R_SkewShadowSprite(thing, groundslope, groundz, patch->height, scalemul, &shadowyscale, &shadowskew);
- //CONS_Printf("Shadow is sloped by %d %d\n", xslope, zslope);
-
- if (viewz < groundz)
- shadowyscale += FixedMul(FixedMul(thing->radius*2 / SHORT(patch->height), scalemul), zslope);
- else
- shadowyscale -= FixedMul(FixedMul(thing->radius*2 / SHORT(patch->height), scalemul), zslope);
-
- shadowyscale = abs(shadowyscale);
-
- shadowskew = xslope;
- }
-
- tx -= SHORT(patch->width) * shadowxscale/2;
+ tx -= patch->width * shadowxscale/2;
x1 = (centerxfrac + FixedMul(tx,xscale))>>FRACBITS;
if (x1 >= viewwidth) return;
- tx += SHORT(patch->width) * shadowxscale;
+ tx += patch->width * shadowxscale;
x2 = ((centerxfrac + FixedMul(tx,xscale))>>FRACBITS); x2--;
if (x2 < 0 || x2 <= x1) return;
- if (shadowyscale < FRACUNIT/SHORT(patch->height)) return; // fix some crashes?
+ if (shadowyscale < FRACUNIT/patch->height) return; // fix some crashes?
shadow = R_NewVisSprite();
shadow->patch = patch;
@@ -1302,8 +1317,8 @@ static void R_ProjectDropShadow(mobj_t *thing, vissprite_t *vis, fixed_t scale,
shadow->dispoffset = vis->dispoffset - 5;
shadow->gx = thing->x;
shadow->gy = thing->y;
- shadow->gzt = (isflipped ? shadow->pzt : shadow->pz) + SHORT(patch->height) * shadowyscale / 2;
- shadow->gz = shadow->gzt - SHORT(patch->height) * shadowyscale;
+ shadow->gzt = (isflipped ? shadow->pzt : shadow->pz) + patch->height * shadowyscale / 2;
+ shadow->gz = shadow->gzt - patch->height * shadowyscale;
shadow->texturemid = FixedMul(thing->scale, FixedDiv(shadow->gzt - viewz, shadowyscale));
if (thing->skin && ((skin_t *)thing->skin)->flags & SF_HIRES)
shadow->texturemid = FixedMul(shadow->texturemid, ((skin_t *)thing->skin)->highresscale);
@@ -1317,6 +1332,7 @@ static void R_ProjectDropShadow(mobj_t *thing, vissprite_t *vis, fixed_t scale,
shadow->xscale = FixedMul(xscale, shadowxscale); //SoM: 4/17/2000
shadow->scale = FixedMul(yscale, shadowyscale);
+ shadow->thingscale = thing->scale;
shadow->sector = vis->sector;
shadow->szt = (INT16)((centeryfrac - FixedMul(shadow->gzt - viewz, yscale))>>FRACBITS);
shadow->sz = (INT16)((centeryfrac - FixedMul(shadow->gz - viewz, yscale))>>FRACBITS);
@@ -1324,7 +1340,7 @@ static void R_ProjectDropShadow(mobj_t *thing, vissprite_t *vis, fixed_t scale,
shadow->startfrac = 0;
//shadow->xiscale = 0x7ffffff0 / (shadow->xscale/2);
- shadow->xiscale = (SHORT(patch->width)<<FRACBITS)/(x2-x1+1); // fuck it
+ shadow->xiscale = (patch->width<<FRACBITS)/(x2-x1+1); // fuck it
if (shadow->x1 > x1)
shadow->startfrac += shadow->xiscale*(shadow->x1-x1);
@@ -1333,28 +1349,32 @@ static void R_ProjectDropShadow(mobj_t *thing, vissprite_t *vis, fixed_t scale,
x1 += (x2-x1)/2;
shadow->shear.offset = shadow->x1-x1;
- if (thing->subsector->sector->numlights)
+ if (thing->renderflags & RF_NOCOLORMAPS)
+ shadow->extra_colormap = NULL;
+ else
{
- INT32 lightnum;
- light = thing->subsector->sector->numlights - 1;
-
- // R_GetPlaneLight won't work on sloped lights!
- for (lightnum = 1; lightnum < thing->subsector->sector->numlights; lightnum++) {
- fixed_t h = P_GetLightZAt(&thing->subsector->sector->lightlist[lightnum], thing->x, thing->y);
- if (h <= shadow->gzt) {
- light = lightnum - 1;
- break;
+ if (thing->subsector->sector->numlights)
+ {
+ INT32 lightnum;
+ light = thing->subsector->sector->numlights - 1;
+
+ // R_GetPlaneLight won't work on sloped lights!
+ for (lightnum = 1; lightnum < thing->subsector->sector->numlights; lightnum++) {
+ fixed_t h = P_GetLightZAt(&thing->subsector->sector->lightlist[lightnum], thing->x, thing->y);
+ if (h <= shadow->gzt) {
+ light = lightnum - 1;
+ break;
+ }
}
}
- //light = R_GetPlaneLight(thing->subsector->sector, shadow->gzt, false);
- }
- if (thing->subsector->sector->numlights)
- shadow->extra_colormap = *thing->subsector->sector->lightlist[light].extra_colormap;
- else
- shadow->extra_colormap = thing->subsector->sector->extra_colormap;
+ if (thing->subsector->sector->numlights)
+ shadow->extra_colormap = *thing->subsector->sector->lightlist[light].extra_colormap;
+ else
+ shadow->extra_colormap = thing->subsector->sector->extra_colormap;
+ }
- shadow->transmap = transtables + (trans<<FF_TRANSSHIFT);
+ shadow->transmap = R_GetTranslucencyTable(trans + 1);
shadow->colormap = scalelight[0][0]; // full dark!
objectsdrawn++;
@@ -1370,7 +1390,9 @@ static void R_ProjectSprite(mobj_t *thing)
mobj_t *oldthing = thing;
fixed_t tr_x, tr_y;
fixed_t tx, tz;
- fixed_t xscale, yscale, sortscale; //added : 02-02-98 : aaargll..if I were a math-guy!!!
+ fixed_t xscale, yscale; //added : 02-02-98 : aaargll..if I were a math-guy!!!
+ fixed_t sortscale, sortsplat = 0;
+ fixed_t sort_x = 0, sort_y = 0, sort_z;
INT32 x1, x2;
@@ -1383,13 +1405,15 @@ static void R_ProjectSprite(mobj_t *thing)
size_t frame, rot;
UINT16 flip;
- boolean vflip = (!(thing->eflags & MFE_VERTICALFLIP) != !(thing->frame & FF_VERTICALFLIP));
+ boolean vflip = (!(thing->eflags & MFE_VERTICALFLIP) != !R_ThingVerticallyFlipped(thing));
boolean mirrored = thing->mirrored;
- boolean hflip = (!(thing->frame & FF_HORIZONTALFLIP) != !mirrored);
+ boolean hflip = (!R_ThingHorizontallyFlipped(thing) != !mirrored);
INT32 lindex;
+ INT32 trans;
vissprite_t *vis;
+ patch_t *patch;
spritecut_e cut = SC_NONE;
@@ -1398,22 +1422,29 @@ static void R_ProjectSprite(mobj_t *thing)
fixed_t scalestep;
fixed_t offset, offset2;
- fixed_t basetx; // drop shadows
+ fixed_t sheartan = 0;
+ fixed_t shadowscale = FRACUNIT;
+ fixed_t basetx, basetz; // drop shadows
- boolean papersprite = !!(thing->frame & FF_PAPERSPRITE);
- fixed_t paperoffset = 0, paperdistance = 0; angle_t centerangle = 0;
+ boolean shadowdraw, shadoweffects, shadowskew;
+ boolean splat = R_ThingIsFloorSprite(thing);
+ boolean papersprite = (R_ThingIsPaperSprite(thing) && !splat);
+ fixed_t paperoffset = 0, paperdistance = 0;
+ angle_t centerangle = 0;
INT32 dispoffset = thing->info->dispoffset;
//SoM: 3/17/2000
- fixed_t gz, gzt;
+ fixed_t gz = 0, gzt = 0;
INT32 heightsec, phs;
INT32 light = 0;
fixed_t this_scale = thing->scale;
+ fixed_t spritexscale, spriteyscale;
// rotsprite
fixed_t spr_width, spr_height;
fixed_t spr_offset, spr_topoffset;
+
#ifdef ROTSPRITE
patch_t *rotsprite = NULL;
INT32 rollangle = 0;
@@ -1423,7 +1454,7 @@ static void R_ProjectSprite(mobj_t *thing)
tr_x = thing->x - viewx;
tr_y = thing->y - viewy;
- tz = FixedMul(tr_x, viewcos) + FixedMul(tr_y, viewsin); // near/far distance
+ basetz = tz = FixedMul(tr_x, viewcos) + FixedMul(tr_y, viewsin); // near/far distance
// thing is behind view plane?
if (!papersprite && (tz < FixedMul(MINZ, this_scale))) // papersprite clipping is handled later
@@ -1460,7 +1491,7 @@ static void R_ProjectSprite(mobj_t *thing)
thing->frame = states[S_UNKNOWN].frame;
sprdef = &sprites[thing->sprite];
#ifdef ROTSPRITE
- sprinfo = NULL;
+ sprinfo = &spriteinfo[thing->sprite];
#endif
frame = thing->frame&FF_FRAMEMASK;
}
@@ -1469,7 +1500,7 @@ static void R_ProjectSprite(mobj_t *thing)
{
sprdef = &sprites[thing->sprite];
#ifdef ROTSPRITE
- sprinfo = NULL;
+ sprinfo = &spriteinfo[thing->sprite];
#endif
if (frame >= sprdef->numframes)
@@ -1484,6 +1515,7 @@ static void R_ProjectSprite(mobj_t *thing)
thing->sprite = states[S_UNKNOWN].sprite;
thing->frame = states[S_UNKNOWN].frame;
sprdef = &sprites[thing->sprite];
+ sprinfo = &spriteinfo[thing->sprite];
frame = thing->frame&FF_FRAMEMASK;
}
}
@@ -1541,19 +1573,28 @@ static void R_ProjectSprite(mobj_t *thing)
spr_offset = spritecachedinfo[lump].offset;
spr_topoffset = spritecachedinfo[lump].topoffset;
+ //Fab: lumppat is the lump number of the patch to use, this is different
+ // than lumpid for sprites-in-pwad : the graphics are patched
+ patch = W_CachePatchNum(sprframe->lumppat[rot], PU_SPRITE);
+
#ifdef ROTSPRITE
- if (thing->rollangle)
+ if (thing->rollangle
+ && !(splat && !(thing->renderflags & RF_NOSPLATROLLANGLE)))
{
rollangle = R_GetRollAngle(thing->rollangle);
- if (!(sprframe->rotsprite.cached & (1<<rot)))
- R_CacheRotSprite(thing->sprite, frame, sprinfo, sprframe, rot, flip);
- rotsprite = sprframe->rotsprite.patch[rot][rollangle];
+ rotsprite = Patch_GetRotatedSprite(sprframe, (thing->frame & FF_FRAMEMASK), rot, flip, false, sprinfo, rollangle);
+
if (rotsprite != NULL)
{
- spr_width = SHORT(rotsprite->width) << FRACBITS;
- spr_height = SHORT(rotsprite->height) << FRACBITS;
- spr_offset = SHORT(rotsprite->leftoffset) << FRACBITS;
- spr_topoffset = SHORT(rotsprite->topoffset) << FRACBITS;
+ patch = rotsprite;
+ cut |= SC_ISROTATED;
+
+ spr_width = rotsprite->width << FRACBITS;
+ spr_height = rotsprite->height << FRACBITS;
+ spr_offset = rotsprite->leftoffset << FRACBITS;
+ spr_topoffset = rotsprite->topoffset << FRACBITS;
+ spr_topoffset += FEETADJUST;
+
// flip -> rotate, not rotate -> flip
flip = 0;
}
@@ -1563,12 +1604,34 @@ static void R_ProjectSprite(mobj_t *thing)
flip = !flip != !hflip;
// calculate edges of the shape
+ spritexscale = thing->spritexscale;
+ spriteyscale = thing->spriteyscale;
+ if (spritexscale < 1 || spriteyscale < 1)
+ return;
+
+ if (thing->renderflags & RF_ABSOLUTEOFFSETS)
+ {
+ spr_offset = thing->spritexoffset;
+ spr_topoffset = thing->spriteyoffset;
+ }
+ else
+ {
+ SINT8 flipoffset = 1;
+
+ if ((thing->renderflags & RF_FLIPOFFSETS) && flip)
+ flipoffset = -1;
+
+ spr_offset += thing->spritexoffset * flipoffset;
+ spr_topoffset += thing->spriteyoffset * flipoffset;
+ }
+
if (flip)
offset = spr_offset - spr_width;
else
offset = -spr_offset;
- offset = FixedMul(offset, this_scale);
- offset2 = FixedMul(spr_width, this_scale);
+
+ offset = FixedMul(offset, FixedMul(spritexscale, this_scale));
+ offset2 = FixedMul(spr_width, FixedMul(spritexscale, this_scale));
if (papersprite)
{
@@ -1675,6 +1738,15 @@ static void R_ProjectSprite(mobj_t *thing)
return;
}
+ // Adjust the sort scale if needed
+ if (splat)
+ {
+ sort_z = (patch->height - patch->topoffset) * FRACUNIT;
+ ang = (viewangle >> ANGLETOFINESHIFT);
+ sort_x = FixedMul(FixedMul(FixedMul(spritexscale, this_scale), sort_z), FINECOSINE(ang));
+ sort_y = FixedMul(FixedMul(FixedMul(spriteyscale, this_scale), sort_z), FINESINE(ang));
+ }
+
if ((thing->flags2 & MF2_LINKDRAW) && thing->tracer) // toast 16/09/16 (SYMMETRY)
{
fixed_t linkscale;
@@ -1684,8 +1756,8 @@ static void R_ProjectSprite(mobj_t *thing)
if (! R_ThingVisible(thing))
return;
- tr_x = thing->x - viewx;
- tr_y = thing->y - viewy;
+ tr_x = (thing->x + sort_x) - viewx;
+ tr_y = (thing->y + sort_y) - viewy;
tz = FixedMul(tr_x, viewcos) + FixedMul(tr_y, viewsin);
linkscale = FixedDiv(projectiony, tz);
@@ -1696,7 +1768,23 @@ static void R_ProjectSprite(mobj_t *thing)
dispoffset *= -1; // if it's physically behind, make sure it's ordered behind (if dispoffset > 0)
sortscale = linkscale; // now make sure it's linked
- cut = SC_LINKDRAW;
+ cut |= SC_LINKDRAW;
+ }
+ else if (splat)
+ {
+ tr_x = (thing->x + sort_x) - viewx;
+ tr_y = (thing->y + sort_y) - viewy;
+ sort_z = FixedMul(tr_x, viewcos) + FixedMul(tr_y, viewsin);
+ sortscale = FixedDiv(projectiony, sort_z);
+ }
+
+ // Calculate the splat's sortscale
+ if (splat)
+ {
+ tr_x = (thing->x - sort_x) - viewx;
+ tr_y = (thing->y - sort_y) - viewy;
+ sort_z = FixedMul(tr_x, viewcos) + FixedMul(tr_y, viewsin);
+ sortsplat = FixedDiv(projectiony, sort_z);
}
// PORTAL SPRITE CLIPPING
@@ -1709,19 +1797,93 @@ static void R_ProjectSprite(mobj_t *thing)
return;
}
- //SoM: 3/17/2000: Disregard sprites that are out of view..
- if (vflip)
+ // Determine the translucency value.
+ if (oldthing->flags2 & MF2_SHADOW || thing->flags2 & MF2_SHADOW) // actually only the player should use this (temporary invisibility)
+ trans = tr_trans80; // because now the translucency is set through FF_TRANSMASK
+ else if (oldthing->frame & FF_TRANSMASK)
{
- // When vertical flipped, draw sprites from the top down, at least as far as offsets are concerned.
- // sprite height - sprite topoffset is the proper inverse of the vertical offset, of course.
- // remember gz and gzt should be seperated by sprite height, not thing height - thing height can be shorter than the sprite itself sometimes!
- gz = oldthing->z + oldthing->height - FixedMul(spr_topoffset, this_scale);
- gzt = gz + FixedMul(spr_height, this_scale);
+ trans = (oldthing->frame & FF_TRANSMASK) >> FF_TRANSSHIFT;
+ if (!R_BlendLevelVisible(oldthing->blendmode, trans))
+ return;
}
else
+ trans = 0;
+
+ // Check if this sprite needs to be rendered like a shadow
+ shadowdraw = (!!(thing->renderflags & RF_SHADOWDRAW) && !(papersprite || splat));
+ shadoweffects = (thing->renderflags & RF_SHADOWEFFECTS);
+ shadowskew = (shadowdraw && thing->standingslope);
+
+ if (shadowdraw || shadoweffects)
+ {
+ fixed_t groundz = R_GetShadowZ(thing, NULL);
+ boolean isflipped = (thing->eflags & MFE_VERTICALFLIP);
+
+ if (shadoweffects)
+ {
+ mobj_t *caster = thing->target;
+
+ if (caster && !P_MobjWasRemoved(caster))
+ {
+ fixed_t floordiff;
+
+ if (abs(groundz-viewz)/tz > 4)
+ return; // Prevent stretchy shadows and possible crashes
+
+ floordiff = abs((isflipped ? caster->height : 0) + caster->z - groundz);
+ trans += ((floordiff / (100*FRACUNIT)) + 3);
+ shadowscale = FixedMul(FRACUNIT - floordiff/640, caster->scale);
+ }
+ else
+ trans += 3;
+
+ if (trans >= NUMTRANSMAPS)
+ return;
+
+ trans--;
+ }
+
+ if (shadowdraw)
+ {
+ spritexscale = FixedMul(thing->radius * 2, FixedMul(shadowscale, spritexscale));
+ spriteyscale = FixedMul(thing->radius * 2, FixedMul(shadowscale, spriteyscale));
+ spriteyscale = FixedMul(spriteyscale, FixedDiv(abs(groundz - viewz), tz));
+ spriteyscale = min(spriteyscale, spritexscale) / patch->height;
+ spritexscale /= patch->width;
+ }
+ else
+ {
+ spritexscale = FixedMul(shadowscale, spritexscale);
+ spriteyscale = FixedMul(shadowscale, spriteyscale);
+ }
+
+ if (shadowskew)
+ {
+ R_SkewShadowSprite(thing, thing->standingslope, groundz, patch->height, shadowscale, &spriteyscale, &sheartan);
+
+ gzt = (isflipped ? (thing->z + thing->height) : thing->z) + patch->height * spriteyscale / 2;
+ gz = gzt - patch->height * spriteyscale;
+
+ cut |= SC_SHEAR;
+ }
+ }
+
+ if (!shadowskew)
{
- gzt = oldthing->z + FixedMul(spr_topoffset, this_scale);
- gz = gzt - FixedMul(spr_height, this_scale);
+ //SoM: 3/17/2000: Disregard sprites that are out of view..
+ if (vflip)
+ {
+ // When vertical flipped, draw sprites from the top down, at least as far as offsets are concerned.
+ // sprite height - sprite topoffset is the proper inverse of the vertical offset, of course.
+ // remember gz and gzt should be seperated by sprite height, not thing height - thing height can be shorter than the sprite itself sometimes!
+ gz = oldthing->z + oldthing->height - FixedMul(spr_topoffset, FixedMul(spriteyscale, this_scale));
+ gzt = gz + FixedMul(spr_height, FixedMul(spriteyscale, this_scale));
+ }
+ else
+ {
+ gzt = oldthing->z + FixedMul(spr_topoffset, FixedMul(spriteyscale, this_scale));
+ gz = gzt - FixedMul(spr_height, FixedMul(spriteyscale, this_scale));
+ }
}
if (thing->subsector->sector->cullheight)
@@ -1733,12 +1895,13 @@ static void R_ProjectSprite(mobj_t *thing)
if (thing->subsector->sector->numlights)
{
INT32 lightnum;
+ fixed_t top = (splat) ? gz : gzt;
light = thing->subsector->sector->numlights - 1;
// R_GetPlaneLight won't work on sloped lights!
for (lightnum = 1; lightnum < thing->subsector->sector->numlights; lightnum++) {
fixed_t h = P_GetLightZAt(&thing->subsector->sector->lightlist[lightnum], thing->x, thing->y);
- if (h <= gzt) {
+ if (h <= top) {
light = lightnum - 1;
break;
}
@@ -1774,10 +1937,12 @@ static void R_ProjectSprite(mobj_t *thing)
// store information in a vissprite
vis = R_NewVisSprite();
+ vis->renderflags = thing->renderflags;
+ vis->rotateflags = sprframe->rotate;
vis->heightsec = heightsec; //SoM: 3/17/2000
vis->mobjflags = thing->flags;
- vis->scale = yscale; //<<detailshift;
vis->sortscale = sortscale;
+ vis->sortsplat = sortsplat;
vis->dispoffset = dispoffset; // Monster Iestyn: 23/11/15
vis->gx = thing->x;
vis->gy = thing->y;
@@ -1786,12 +1951,13 @@ static void R_ProjectSprite(mobj_t *thing)
vis->thingheight = thing->height;
vis->pz = thing->z;
vis->pzt = vis->pz + vis->thingheight;
- vis->texturemid = vis->gzt - viewz;
+ vis->texturemid = FixedDiv(gzt - viewz, spriteyscale);
vis->scalestep = scalestep;
vis->paperoffset = paperoffset;
vis->paperdistance = paperdistance;
vis->centerangle = centerangle;
- vis->shear.tan = 0;
+ vis->viewangle = viewangle;
+ vis->shear.tan = sheartan;
vis->shear.offset = 0;
vis->mobj = thing; // Easy access! Tails 06-07-2002
@@ -1799,17 +1965,35 @@ static void R_ProjectSprite(mobj_t *thing)
vis->x1 = x1 < portalclipstart ? portalclipstart : x1;
vis->x2 = x2 >= portalclipend ? portalclipend-1 : x2;
- vis->xscale = xscale; //SoM: 4/17/2000
vis->sector = thing->subsector->sector;
vis->szt = (INT16)((centeryfrac - FixedMul(vis->gzt - viewz, sortscale))>>FRACBITS);
vis->sz = (INT16)((centeryfrac - FixedMul(vis->gz - viewz, sortscale))>>FRACBITS);
vis->cut = cut;
+
if (thing->subsector->sector->numlights)
vis->extra_colormap = *thing->subsector->sector->lightlist[light].extra_colormap;
else
vis->extra_colormap = thing->subsector->sector->extra_colormap;
- iscale = FixedDiv(FRACUNIT, xscale);
+ vis->xscale = FixedMul(spritexscale, xscale); //SoM: 4/17/2000
+ vis->scale = FixedMul(spriteyscale, yscale); //<<detailshift;
+ vis->thingscale = oldthing->scale;
+
+ vis->spritexscale = spritexscale;
+ vis->spriteyscale = spriteyscale;
+ vis->spritexoffset = spr_offset;
+ vis->spriteyoffset = spr_topoffset;
+
+ if (shadowdraw || shadoweffects)
+ {
+ iscale = (patch->width<<FRACBITS)/(x2-x1+1); // fuck it
+ x1 += (x2-x1)/2; // reusing x1 variable
+ vis->shear.offset = vis->x1-x1;
+ }
+ else
+ iscale = FixedDiv(FRACUNIT, vis->xscale);
+
+ vis->shadowscale = shadowscale;
if (flip)
{
@@ -1824,41 +2008,31 @@ static void R_ProjectSprite(mobj_t *thing)
if (vis->x1 > x1)
{
- vis->startfrac += FixedDiv(vis->xiscale, this_scale)*(vis->x1-x1);
- vis->scale += scalestep*(vis->x1 - x1);
+ vis->startfrac += FixedDiv(vis->xiscale, this_scale) * (vis->x1 - x1);
+ vis->scale += FixedMul(scalestep, spriteyscale) * (vis->x1 - x1);
}
- //Fab: lumppat is the lump number of the patch to use, this is different
- // than lumpid for sprites-in-pwad : the graphics are patched
-#ifdef ROTSPRITE
- if (rotsprite != NULL)
- vis->patch = rotsprite;
+ if ((oldthing->blendmode != AST_COPY) && cv_translucency.value)
+ vis->transmap = R_GetBlendTable(oldthing->blendmode, trans);
else
-#endif
- vis->patch = W_CachePatchNum(sprframe->lumppat[rot], PU_CACHE);
-
-//
-// determine the colormap (lightlevel & special effects)
-//
- vis->transmap = NULL;
-
- // specific translucency
- if (!cv_translucency.value)
- ; // no translucency
- else if (oldthing->flags2 & MF2_SHADOW || thing->flags2 & MF2_SHADOW) // actually only the player should use this (temporary invisibility)
- vis->transmap = transtables + ((tr_trans80-1)<<FF_TRANSSHIFT); // because now the translucency is set through FF_TRANSMASK
- else if (oldthing->frame & FF_TRANSMASK)
- vis->transmap = transtables + (oldthing->frame & FF_TRANSMASK) - 0x10000;
+ vis->transmap = NULL;
- if (oldthing->frame & FF_FULLBRIGHT || oldthing->flags2 & MF2_SHADOW || thing->flags2 & MF2_SHADOW)
+ if (R_ThingIsFullBright(oldthing) || oldthing->flags2 & MF2_SHADOW || thing->flags2 & MF2_SHADOW)
vis->cut |= SC_FULLBRIGHT;
+ else if (R_ThingIsFullDark(oldthing))
+ vis->cut |= SC_FULLDARK;
+ //
+ // determine the colormap (lightlevel & special effects)
+ //
if (vis->cut & SC_FULLBRIGHT
&& (!vis->extra_colormap || !(vis->extra_colormap->flags & CMF_FADEFULLBRIGHTSPRITES)))
{
// full bright: goggles
vis->colormap = colormaps;
}
+ else if (vis->cut & SC_FULLDARK)
+ vis->colormap = scalelight[0][0];
else
{
// diminished light
@@ -1872,12 +2046,16 @@ static void R_ProjectSprite(mobj_t *thing)
if (vflip)
vis->cut |= SC_VFLIP;
+ if (splat)
+ vis->cut |= SC_SPLAT; // I like ya cut g
- if (thing->subsector->sector->numlights)
+ vis->patch = patch;
+
+ if (thing->subsector->sector->numlights && !(shadowdraw || splat))
R_SplitSprite(vis);
if (oldthing->shadowscale && cv_shadow.value)
- R_ProjectDropShadow(oldthing, vis, oldthing->shadowscale, basetx, tz);
+ R_ProjectDropShadow(oldthing, vis, oldthing->shadowscale, basetx, basetz);
// Debug
++objectsdrawn;
@@ -2018,11 +2196,11 @@ static void R_ProjectPrecipitationSprite(precipmobj_t *thing)
//Fab: lumppat is the lump number of the patch to use, this is different
// than lumpid for sprites-in-pwad : the graphics are patched
- vis->patch = W_CachePatchNum(sprframe->lumppat[0], PU_CACHE);
+ vis->patch = W_CachePatchNum(sprframe->lumppat[0], PU_SPRITE);
// specific translucency
if (thing->frame & FF_TRANSMASK)
- vis->transmap = (thing->frame & FF_TRANSMASK) - 0x10000 + transtables;
+ vis->transmap = R_GetTranslucencyTable((thing->frame & FF_TRANSMASK) >> FF_TRANSSHIFT);
else
vis->transmap = NULL;
@@ -2480,13 +2658,45 @@ static void R_CreateDrawNodes(maskcount_t* mask, drawnode_t* head, boolean temps
}
else if (r2->sprite)
{
- if (r2->sprite->x1 > rover->x2 || r2->sprite->x2 < rover->x1)
- continue;
- if (r2->sprite->szt > rover->sz || r2->sprite->sz < rover->szt)
- continue;
+ boolean infront = (r2->sprite->sortscale > rover->sortscale
+ || (r2->sprite->sortscale == rover->sortscale && r2->sprite->dispoffset > rover->dispoffset));
+
+ if (rover->cut & SC_SPLAT || r2->sprite->cut & SC_SPLAT)
+ {
+ fixed_t scale1 = (rover->cut & SC_SPLAT ? rover->sortsplat : rover->sortscale);
+ fixed_t scale2 = (r2->sprite->cut & SC_SPLAT ? r2->sprite->sortsplat : r2->sprite->sortscale);
+ boolean behind = (scale2 > scale1 || (scale2 == scale1 && r2->sprite->dispoffset > rover->dispoffset));
+
+ if (!behind)
+ {
+ fixed_t z1 = 0, z2 = 0;
+
+ if (rover->mobj->z - viewz > 0)
+ {
+ z1 = rover->pz;
+ z2 = r2->sprite->pz;
+ }
+ else
+ {
+ z1 = r2->sprite->pz;
+ z2 = rover->pz;
+ }
+
+ z1 -= viewz;
+ z2 -= viewz;
- if (r2->sprite->sortscale > rover->sortscale
- || (r2->sprite->sortscale == rover->sortscale && r2->sprite->dispoffset > rover->dispoffset))
+ infront = (z1 >= z2);
+ }
+ }
+ else
+ {
+ if (r2->sprite->x1 > rover->x2 || r2->sprite->x2 < rover->x1)
+ continue;
+ if (r2->sprite->szt > rover->sz || r2->sprite->sz < rover->szt)
+ continue;
+ }
+
+ if (infront)
{
entry = R_CreateDrawNode(NULL);
(entry->prev = r2->prev)->next = entry;
@@ -2531,7 +2741,7 @@ static drawnode_t *R_CreateDrawNode(drawnode_t *link)
node->ffloor = NULL;
node->sprite = NULL;
- rs_numdrawnodes++;
+ ps_numdrawnodes++;
return node;
}
@@ -2572,7 +2782,11 @@ static void R_DrawSprite(vissprite_t *spr)
{
mfloorclip = spr->clipbot;
mceilingclip = spr->cliptop;
- R_DrawVisSprite(spr);
+
+ if (spr->cut & SC_SPLAT)
+ R_DrawFloorSplat(spr);
+ else
+ R_DrawVisSprite(spr);
}
// Special drawer for precipitation sprites Tails 08-18-2002
@@ -2583,207 +2797,212 @@ static void R_DrawPrecipitationSprite(vissprite_t *spr)
R_DrawPrecipitationVisSprite(spr);
}
-// R_ClipSprites
+// R_ClipVisSprite
// Clips vissprites without drawing, so that portals can work. -Red
-void R_ClipSprites(drawseg_t* dsstart, portal_t* portal)
+void R_ClipVisSprite(vissprite_t *spr, INT32 x1, INT32 x2, drawseg_t* dsstart, portal_t* portal)
{
- vissprite_t *spr;
- for (; clippedvissprites < visspritecount; clippedvissprites++)
- {
- drawseg_t *ds;
- INT32 x;
- INT32 r1;
- INT32 r2;
- fixed_t scale;
- fixed_t lowscale;
- INT32 silhouette;
-
- spr = R_GetVisSprite(clippedvissprites);
-
- for (x = spr->x1; x <= spr->x2; x++)
- spr->clipbot[x] = spr->cliptop[x] = -2;
-
- // Scan drawsegs from end to start for obscuring segs.
- // The first drawseg that has a greater scale
- // is the clip seg.
- //SoM: 4/8/2000:
- // Pointer check was originally nonportable
- // and buggy, by going past LEFT end of array:
+ drawseg_t *ds;
+ INT32 x;
+ INT32 r1;
+ INT32 r2;
+ fixed_t scale;
+ fixed_t lowscale;
+ INT32 silhouette;
+
+ for (x = x1; x <= x2; x++)
+ spr->clipbot[x] = spr->cliptop[x] = -2;
+
+ // Scan drawsegs from end to start for obscuring segs.
+ // The first drawseg that has a greater scale
+ // is the clip seg.
+ //SoM: 4/8/2000:
+ // Pointer check was originally nonportable
+ // and buggy, by going past LEFT end of array:
+
+ // for (ds = ds_p-1; ds >= drawsegs; ds--) old buggy code
+ for (ds = ds_p; ds-- > dsstart;)
+ {
+ // determine if the drawseg obscures the sprite
+ if (ds->x1 > x2 ||
+ ds->x2 < x1 ||
+ (!ds->silhouette
+ && !ds->maskedtexturecol))
+ {
+ // does not cover sprite
+ continue;
+ }
- // for (ds = ds_p-1; ds >= drawsegs; ds--) old buggy code
- for (ds = ds_p; ds-- > dsstart;)
+ if (ds->portalpass != 66)
{
- // determine if the drawseg obscures the sprite
- if (ds->x1 > spr->x2 ||
- ds->x2 < spr->x1 ||
- (!ds->silhouette
- && !ds->maskedtexturecol))
+ if (ds->portalpass > 0 && ds->portalpass <= portalrender)
+ continue; // is a portal
+
+ if (ds->scale1 > ds->scale2)
{
- // does not cover sprite
- continue;
+ lowscale = ds->scale2;
+ scale = ds->scale1;
}
-
- if (ds->portalpass != 66)
+ else
{
- if (ds->portalpass > 0 && ds->portalpass <= portalrender)
- continue; // is a portal
-
- if (ds->scale1 > ds->scale2)
- {
- lowscale = ds->scale2;
- scale = ds->scale1;
- }
- else
- {
- lowscale = ds->scale1;
- scale = ds->scale2;
- }
+ lowscale = ds->scale1;
+ scale = ds->scale2;
+ }
- if (scale < spr->sortscale ||
- (lowscale < spr->sortscale &&
- !R_PointOnSegSide (spr->gx, spr->gy, ds->curline)))
- {
- // masked mid texture?
- /*if (ds->maskedtexturecol)
- R_RenderMaskedSegRange (ds, r1, r2);*/
- // seg is behind sprite
- continue;
- }
+ if (scale < spr->sortscale ||
+ (lowscale < spr->sortscale &&
+ !R_PointOnSegSide (spr->gx, spr->gy, ds->curline)))
+ {
+ // masked mid texture?
+ /*if (ds->maskedtexturecol)
+ R_RenderMaskedSegRange (ds, r1, r2);*/
+ // seg is behind sprite
+ continue;
}
+ }
- r1 = ds->x1 < spr->x1 ? spr->x1 : ds->x1;
- r2 = ds->x2 > spr->x2 ? spr->x2 : ds->x2;
+ r1 = ds->x1 < x1 ? x1 : ds->x1;
+ r2 = ds->x2 > x2 ? x2 : ds->x2;
- // clip this piece of the sprite
- silhouette = ds->silhouette;
+ // clip this piece of the sprite
+ silhouette = ds->silhouette;
- if (spr->gz >= ds->bsilheight)
- silhouette &= ~SIL_BOTTOM;
+ if (spr->gz >= ds->bsilheight)
+ silhouette &= ~SIL_BOTTOM;
- if (spr->gzt <= ds->tsilheight)
- silhouette &= ~SIL_TOP;
+ if (spr->gzt <= ds->tsilheight)
+ silhouette &= ~SIL_TOP;
- if (silhouette == SIL_BOTTOM)
+ if (silhouette == SIL_BOTTOM)
+ {
+ // bottom sil
+ for (x = r1; x <= r2; x++)
+ if (spr->clipbot[x] == -2)
+ spr->clipbot[x] = ds->sprbottomclip[x];
+ }
+ else if (silhouette == SIL_TOP)
+ {
+ // top sil
+ for (x = r1; x <= r2; x++)
+ if (spr->cliptop[x] == -2)
+ spr->cliptop[x] = ds->sprtopclip[x];
+ }
+ else if (silhouette == (SIL_TOP|SIL_BOTTOM))
+ {
+ // both
+ for (x = r1; x <= r2; x++)
{
- // bottom sil
- for (x = r1; x <= r2; x++)
- if (spr->clipbot[x] == -2)
- spr->clipbot[x] = ds->sprbottomclip[x];
+ if (spr->clipbot[x] == -2)
+ spr->clipbot[x] = ds->sprbottomclip[x];
+ if (spr->cliptop[x] == -2)
+ spr->cliptop[x] = ds->sprtopclip[x];
}
- else if (silhouette == SIL_TOP)
- {
- // top sil
- for (x = r1; x <= r2; x++)
- if (spr->cliptop[x] == -2)
- spr->cliptop[x] = ds->sprtopclip[x];
+ }
+ }
+ //SoM: 3/17/2000: Clip sprites in water.
+ if (spr->heightsec != -1) // only things in specially marked sectors
+ {
+ fixed_t mh, h;
+ INT32 phs = viewplayer->mo->subsector->sector->heightsec;
+ if ((mh = sectors[spr->heightsec].floorheight) > spr->gz &&
+ (h = centeryfrac - FixedMul(mh -= viewz, spr->sortscale)) >= 0 &&
+ (h >>= FRACBITS) < viewheight)
+ {
+ if (mh <= 0 || (phs != -1 && viewz > sectors[phs].floorheight))
+ { // clip bottom
+ for (x = x1; x <= x2; x++)
+ if (spr->clipbot[x] == -2 || h < spr->clipbot[x])
+ spr->clipbot[x] = (INT16)h;
}
- else if (silhouette == (SIL_TOP|SIL_BOTTOM))
+ else // clip top
{
- // both
- for (x = r1; x <= r2; x++)
- {
- if (spr->clipbot[x] == -2)
- spr->clipbot[x] = ds->sprbottomclip[x];
- if (spr->cliptop[x] == -2)
- spr->cliptop[x] = ds->sprtopclip[x];
- }
+ for (x = x1; x <= x2; x++)
+ if (spr->cliptop[x] == -2 || h > spr->cliptop[x])
+ spr->cliptop[x] = (INT16)h;
}
}
- //SoM: 3/17/2000: Clip sprites in water.
- if (spr->heightsec != -1) // only things in specially marked sectors
+
+ if ((mh = sectors[spr->heightsec].ceilingheight) < spr->gzt &&
+ (h = centeryfrac - FixedMul(mh-viewz, spr->sortscale)) >= 0 &&
+ (h >>= FRACBITS) < viewheight)
{
- fixed_t mh, h;
- INT32 phs = viewplayer->mo->subsector->sector->heightsec;
- if ((mh = sectors[spr->heightsec].floorheight) > spr->gz &&
- (h = centeryfrac - FixedMul(mh -= viewz, spr->sortscale)) >= 0 &&
- (h >>= FRACBITS) < viewheight)
- {
- if (mh <= 0 || (phs != -1 && viewz > sectors[phs].floorheight))
- { // clip bottom
- for (x = spr->x1; x <= spr->x2; x++)
- if (spr->clipbot[x] == -2 || h < spr->clipbot[x])
- spr->clipbot[x] = (INT16)h;
- }
- else // clip top
- {
- for (x = spr->x1; x <= spr->x2; x++)
- if (spr->cliptop[x] == -2 || h > spr->cliptop[x])
- spr->cliptop[x] = (INT16)h;
- }
+ if (phs != -1 && viewz >= sectors[phs].ceilingheight)
+ { // clip bottom
+ for (x = x1; x <= x2; x++)
+ if (spr->clipbot[x] == -2 || h < spr->clipbot[x])
+ spr->clipbot[x] = (INT16)h;
}
-
- if ((mh = sectors[spr->heightsec].ceilingheight) < spr->gzt &&
- (h = centeryfrac - FixedMul(mh-viewz, spr->sortscale)) >= 0 &&
- (h >>= FRACBITS) < viewheight)
+ else // clip top
{
- if (phs != -1 && viewz >= sectors[phs].ceilingheight)
- { // clip bottom
- for (x = spr->x1; x <= spr->x2; x++)
- if (spr->clipbot[x] == -2 || h < spr->clipbot[x])
- spr->clipbot[x] = (INT16)h;
- }
- else // clip top
- {
- for (x = spr->x1; x <= spr->x2; x++)
- if (spr->cliptop[x] == -2 || h > spr->cliptop[x])
- spr->cliptop[x] = (INT16)h;
- }
+ for (x = x1; x <= x2; x++)
+ if (spr->cliptop[x] == -2 || h > spr->cliptop[x])
+ spr->cliptop[x] = (INT16)h;
}
}
- if (spr->cut & SC_TOP && spr->cut & SC_BOTTOM)
+ }
+ if (spr->cut & SC_TOP && spr->cut & SC_BOTTOM)
+ {
+ for (x = x1; x <= x2; x++)
{
- for (x = spr->x1; x <= spr->x2; x++)
- {
- if (spr->cliptop[x] == -2 || spr->szt > spr->cliptop[x])
- spr->cliptop[x] = spr->szt;
+ if (spr->cliptop[x] == -2 || spr->szt > spr->cliptop[x])
+ spr->cliptop[x] = spr->szt;
- if (spr->clipbot[x] == -2 || spr->sz < spr->clipbot[x])
- spr->clipbot[x] = spr->sz;
- }
+ if (spr->clipbot[x] == -2 || spr->sz < spr->clipbot[x])
+ spr->clipbot[x] = spr->sz;
}
- else if (spr->cut & SC_TOP)
+ }
+ else if (spr->cut & SC_TOP)
+ {
+ for (x = x1; x <= x2; x++)
{
- for (x = spr->x1; x <= spr->x2; x++)
- {
- if (spr->cliptop[x] == -2 || spr->szt > spr->cliptop[x])
- spr->cliptop[x] = spr->szt;
- }
+ if (spr->cliptop[x] == -2 || spr->szt > spr->cliptop[x])
+ spr->cliptop[x] = spr->szt;
}
- else if (spr->cut & SC_BOTTOM)
+ }
+ else if (spr->cut & SC_BOTTOM)
+ {
+ for (x = x1; x <= x2; x++)
{
- for (x = spr->x1; x <= spr->x2; x++)
- {
- if (spr->clipbot[x] == -2 || spr->sz < spr->clipbot[x])
- spr->clipbot[x] = spr->sz;
- }
+ if (spr->clipbot[x] == -2 || spr->sz < spr->clipbot[x])
+ spr->clipbot[x] = spr->sz;
}
+ }
- // all clipping has been performed, so store the values - what, did you think we were drawing them NOW?
+ // all clipping has been performed, so store the values - what, did you think we were drawing them NOW?
- // check for unclipped columns
- for (x = spr->x1; x <= spr->x2; x++)
- {
- if (spr->clipbot[x] == -2)
- spr->clipbot[x] = (INT16)viewheight;
+ // check for unclipped columns
+ for (x = x1; x <= x2; x++)
+ {
+ if (spr->clipbot[x] == -2)
+ spr->clipbot[x] = (INT16)viewheight;
- if (spr->cliptop[x] == -2)
- //Fab : 26-04-98: was -1, now clips against console bottom
- spr->cliptop[x] = (INT16)con_clipviewtop;
- }
+ if (spr->cliptop[x] == -2)
+ //Fab : 26-04-98: was -1, now clips against console bottom
+ spr->cliptop[x] = (INT16)con_clipviewtop;
+ }
- if (portal)
+ if (portal)
+ {
+ for (x = x1; x <= x2; x++)
{
- for (x = spr->x1; x <= spr->x2; x++)
- {
- if (spr->clipbot[x] > portal->floorclip[x - portal->start])
- spr->clipbot[x] = portal->floorclip[x - portal->start];
- if (spr->cliptop[x] < portal->ceilingclip[x - portal->start])
- spr->cliptop[x] = portal->ceilingclip[x - portal->start];
- }
+ if (spr->clipbot[x] > portal->floorclip[x - portal->start])
+ spr->clipbot[x] = portal->floorclip[x - portal->start];
+ if (spr->cliptop[x] < portal->ceilingclip[x - portal->start])
+ spr->cliptop[x] = portal->ceilingclip[x - portal->start];
}
}
}
+void R_ClipSprites(drawseg_t* dsstart, portal_t* portal)
+{
+ for (; clippedvissprites < visspritecount; clippedvissprites++)
+ {
+ vissprite_t *spr = R_GetVisSprite(clippedvissprites);
+ INT32 x1 = (spr->cut & SC_SPLAT) ? 0 : spr->x1;
+ INT32 x2 = (spr->cut & SC_SPLAT) ? viewwidth : spr->x2;
+ R_ClipVisSprite(spr, x1, x2, dsstart, portal);
+ }
+}
+
/* Check if thing may be drawn from our current view. */
boolean R_ThingVisible (mobj_t *thing)
{
@@ -2833,6 +3052,36 @@ boolean R_PrecipThingVisible (precipmobj_t *precipthing,
return ( approx_dist <= limit_dist );
}
+boolean R_ThingHorizontallyFlipped(mobj_t *thing)
+{
+ return (thing->frame & FF_HORIZONTALFLIP || thing->renderflags & RF_HORIZONTALFLIP);
+}
+
+boolean R_ThingVerticallyFlipped(mobj_t *thing)
+{
+ return (thing->frame & FF_VERTICALFLIP || thing->renderflags & RF_VERTICALFLIP);
+}
+
+boolean R_ThingIsPaperSprite(mobj_t *thing)
+{
+ return (thing->frame & FF_PAPERSPRITE || thing->renderflags & RF_PAPERSPRITE);
+}
+
+boolean R_ThingIsFloorSprite(mobj_t *thing)
+{
+ return (thing->flags2 & MF2_SPLAT || thing->renderflags & RF_FLOORSPRITE);
+}
+
+boolean R_ThingIsFullBright(mobj_t *thing)
+{
+ return (thing->frame & FF_FULLBRIGHT || thing->renderflags & RF_FULLBRIGHT);
+}
+
+boolean R_ThingIsFullDark(mobj_t *thing)
+{
+ return (thing->renderflags & RF_FULLDARK);
+}
+
//
// R_DrawMasked
//
diff --git a/src/r_things.h b/src/r_things.h
index b13c5dc55ccc208c52c01a04376af98c11eda375..95b4215afa132ede0a11346036a3fffb4d6e7da9 100644
--- a/src/r_things.h
+++ b/src/r_things.h
@@ -15,6 +15,7 @@
#define __R_THINGS__
#include "r_plane.h"
+#include "r_patch.h"
#include "r_picformats.h"
#include "r_portal.h"
#include "r_defs.h"
@@ -64,7 +65,6 @@ fixed_t R_GetShadowZ(mobj_t *thing, pslope_t **shadowslope);
void R_AddSprites(sector_t *sec, INT32 lightlevel);
void R_InitSprites(void);
void R_ClearSprites(void);
-void R_ClipSprites(drawseg_t* dsstart, portal_t* portal);
boolean R_ThingVisible (mobj_t *thing);
@@ -75,6 +75,15 @@ boolean R_ThingVisibleWithinDist (mobj_t *thing,
boolean R_PrecipThingVisible (precipmobj_t *precipthing,
fixed_t precip_draw_dist);
+boolean R_ThingHorizontallyFlipped (mobj_t *thing);
+boolean R_ThingVerticallyFlipped (mobj_t *thing);
+
+boolean R_ThingIsPaperSprite (mobj_t *thing);
+boolean R_ThingIsFloorSprite (mobj_t *thing);
+
+boolean R_ThingIsFullBright (mobj_t *thing);
+boolean R_ThingIsFullDark (mobj_t *thing);
+
// --------------
// MASKED DRAWING
// --------------
@@ -107,19 +116,23 @@ void R_DrawMasked(maskcount_t* masks, UINT8 nummasks);
typedef enum
{
// actual cuts
- SC_NONE = 0,
- SC_TOP = 1,
- SC_BOTTOM = 1<<1,
+ SC_NONE = 0,
+ SC_TOP = 1,
+ SC_BOTTOM = 1<<1,
// other flags
- SC_PRECIP = 1<<2,
- SC_LINKDRAW = 1<<3,
+ SC_PRECIP = 1<<2,
+ SC_LINKDRAW = 1<<3,
SC_FULLBRIGHT = 1<<4,
- SC_VFLIP = 1<<5,
- SC_ISSCALED = 1<<6,
- SC_SHADOW = 1<<7,
+ SC_FULLDARK = 1<<5,
+ SC_VFLIP = 1<<6,
+ SC_ISSCALED = 1<<7,
+ SC_ISROTATED = 1<<8,
+ SC_SHADOW = 1<<9,
+ SC_SHEAR = 1<<10,
+ SC_SPLAT = 1<<11,
// masks
- SC_CUTMASK = SC_TOP|SC_BOTTOM,
- SC_FLAGMASK = ~SC_CUTMASK
+ SC_CUTMASK = SC_TOP|SC_BOTTOM,
+ SC_FLAGMASK = ~SC_CUTMASK
} spritecut_e;
// A vissprite_t is a thing that will be drawn during a refresh,
@@ -142,12 +155,16 @@ typedef struct vissprite_s
fixed_t pz, pzt; // physical bottom/top for sorting with 3D floors
fixed_t startfrac; // horizontal position of x1
- fixed_t scale, sortscale; // sortscale only differs from scale for paper sprites and MF2_LINKDRAW
+ fixed_t xscale, scale; // projected horizontal and vertical scales
+ fixed_t thingscale; // the object's scale
+ fixed_t sortscale; // sortscale only differs from scale for paper sprites, floor sprites, and MF2_LINKDRAW
+ fixed_t sortsplat; // the sortscale from behind the floor sprite
fixed_t scalestep; // only for paper sprites, 0 otherwise
fixed_t paperoffset, paperdistance; // for paper sprites, offset/dist relative to the angle
fixed_t xiscale; // negative if flipped
angle_t centerangle; // for paper sprites
+ angle_t viewangle; // for floor sprites, the viewpoint's current angle
struct {
fixed_t tan; // The amount to shear the sprite vertically per row
@@ -168,14 +185,19 @@ typedef struct vissprite_s
extracolormap_t *extra_colormap; // global colormaps
- fixed_t xscale;
-
// Precalculated top and bottom screen coords for the sprite.
fixed_t thingheight; // The actual height of the thing (for 3D floors)
sector_t *sector; // The sector containing the thing.
INT16 sz, szt;
spritecut_e cut;
+ UINT32 renderflags;
+ UINT8 rotateflags;
+
+ fixed_t spritexscale, spriteyscale;
+ fixed_t spritexoffset, spriteyoffset;
+
+ fixed_t shadowscale;
INT16 clipbot[MAXVIDWIDTH], cliptop[MAXVIDWIDTH];
@@ -184,6 +206,12 @@ typedef struct vissprite_s
extern UINT32 visspritecount;
+void R_ClipSprites(drawseg_t* dsstart, portal_t* portal);
+void R_ClipVisSprite(vissprite_t *spr, INT32 x1, INT32 x2, drawseg_t* dsstart, portal_t* portal);
+
+boolean R_SpriteIsFlashing(vissprite_t *vis);
+UINT8 *R_GetSpriteTranslation(vissprite_t *vis);
+
// ----------
// DRAW NODES
// ----------
diff --git a/src/s_sound.c b/src/s_sound.c
index 64f092b80e185a5d7c02452567f821884214d78a..392a5b45328abd8c9667e745050ce2aa732d000a 100644
--- a/src/s_sound.c
+++ b/src/s_sound.c
@@ -29,10 +29,7 @@
#include "fastcmp.h"
#include "m_misc.h" // for tunes command
#include "m_cond.h" // for conditionsets
-
-#ifdef HAVE_LUA_MUSICPLUS
#include "lua_hook.h" // MusicChange hook
-#endif
#ifdef HW3SOUND
// 3D Sound Interface
@@ -65,21 +62,21 @@ static boolean S_CheckQueue(void);
#endif
#ifdef _WINDOWS
-consvar_t cv_samplerate = {"samplerate", "44100", 0, CV_Unsigned, NULL, 44100, NULL, NULL, 0, 0, NULL}; //Alam: For easy hacking?
+consvar_t cv_samplerate = CVAR_INIT ("samplerate", "44100", 0, CV_Unsigned, NULL); //Alam: For easy hacking?
#else
-consvar_t cv_samplerate = {"samplerate", "22050", 0, CV_Unsigned, NULL, 22050, NULL, NULL, 0, 0, NULL}; //Alam: For easy hacking?
+consvar_t cv_samplerate = CVAR_INIT ("samplerate", "22050", 0, CV_Unsigned, NULL); //Alam: For easy hacking?
#endif
// stereo reverse
-consvar_t stereoreverse = {"stereoreverse", "Off", CV_SAVE, CV_OnOff, NULL, 0, NULL, NULL, 0, 0, NULL};
+consvar_t stereoreverse = CVAR_INIT ("stereoreverse", "Off", CV_SAVE, CV_OnOff, NULL);
// if true, all sounds are loaded at game startup
-static consvar_t precachesound = {"precachesound", "Off", CV_SAVE, CV_OnOff, NULL, 0, NULL, NULL, 0, 0, NULL};
+static consvar_t precachesound = CVAR_INIT ("precachesound", "Off", CV_SAVE, CV_OnOff, NULL);
// actual general (maximum) sound & music volume, saved into the config
-consvar_t cv_soundvolume = {"soundvolume", "18", CV_SAVE, soundvolume_cons_t, NULL, 0, NULL, NULL, 0, 0, NULL};
-consvar_t cv_digmusicvolume = {"digmusicvolume", "18", CV_SAVE, soundvolume_cons_t, NULL, 0, NULL, NULL, 0, 0, NULL};
-consvar_t cv_midimusicvolume = {"midimusicvolume", "18", CV_SAVE, soundvolume_cons_t, NULL, 0, NULL, NULL, 0, 0, NULL};
+consvar_t cv_soundvolume = CVAR_INIT ("soundvolume", "18", CV_SAVE, soundvolume_cons_t, NULL);
+consvar_t cv_digmusicvolume = CVAR_INIT ("digmusicvolume", "18", CV_SAVE, soundvolume_cons_t, NULL);
+consvar_t cv_midimusicvolume = CVAR_INIT ("midimusicvolume", "18", CV_SAVE, soundvolume_cons_t, NULL);
static void Captioning_OnChange(void)
{
@@ -88,27 +85,27 @@ static void Captioning_OnChange(void)
S_StartSound(NULL, sfx_menu1);
}
-consvar_t cv_closedcaptioning = {"closedcaptioning", "Off", CV_SAVE|CV_CALL, CV_OnOff, Captioning_OnChange, 0, NULL, NULL, 0, 0, NULL};
+consvar_t cv_closedcaptioning = CVAR_INIT ("closedcaptioning", "Off", CV_SAVE|CV_CALL, CV_OnOff, Captioning_OnChange);
// number of channels available
-consvar_t cv_numChannels = {"snd_channels", "32", CV_SAVE|CV_CALL, CV_Unsigned, SetChannelsNum, 0, NULL, NULL, 0, 0, NULL};
+consvar_t cv_numChannels = CVAR_INIT ("snd_channels", "32", CV_SAVE|CV_CALL, CV_Unsigned, SetChannelsNum);
-static consvar_t surround = {"surround", "Off", CV_SAVE, CV_OnOff, NULL, 0, NULL, NULL, 0, 0, NULL};
+static consvar_t surround = CVAR_INIT ("surround", "Off", CV_SAVE, CV_OnOff, NULL);
-consvar_t cv_resetmusic = {"resetmusic", "Off", CV_SAVE, CV_OnOff, NULL, 0, NULL, NULL, 0, 0, NULL};
-consvar_t cv_resetmusicbyheader = {"resetmusicbyheader", "Yes", CV_SAVE, CV_YesNo, NULL, 0, NULL, NULL, 0, 0, NULL};
+consvar_t cv_resetmusic = CVAR_INIT ("resetmusic", "Off", CV_SAVE, CV_OnOff, NULL);
+consvar_t cv_resetmusicbyheader = CVAR_INIT ("resetmusicbyheader", "Yes", CV_SAVE, CV_YesNo, NULL);
static CV_PossibleValue_t cons_1upsound_t[] = {
{0, "Jingle"},
{1, "Sound"},
{0, NULL}
};
-consvar_t cv_1upsound = {"1upsound", "Jingle", CV_SAVE, cons_1upsound_t, NULL, 0, NULL, NULL, 0, 0, NULL};
+consvar_t cv_1upsound = CVAR_INIT ("1upsound", "Jingle", CV_SAVE, cons_1upsound_t, NULL);
// Sound system toggles, saved into the config
-consvar_t cv_gamedigimusic = {"digimusic", "On", CV_SAVE|CV_CALL|CV_NOINIT, CV_OnOff, GameDigiMusic_OnChange, 0, NULL, NULL, 0, 0, NULL};
-consvar_t cv_gamemidimusic = {"midimusic", "On", CV_SAVE|CV_CALL|CV_NOINIT, CV_OnOff, GameMIDIMusic_OnChange, 0, NULL, NULL, 0, 0, NULL};
-consvar_t cv_gamesounds = {"sounds", "On", CV_SAVE|CV_CALL|CV_NOINIT, CV_OnOff, GameSounds_OnChange, 0, NULL, NULL, 0, 0, NULL};
+consvar_t cv_gamedigimusic = CVAR_INIT ("digimusic", "On", CV_SAVE|CV_CALL|CV_NOINIT, CV_OnOff, GameDigiMusic_OnChange);
+consvar_t cv_gamemidimusic = CVAR_INIT ("midimusic", "On", CV_SAVE|CV_CALL|CV_NOINIT, CV_OnOff, GameMIDIMusic_OnChange);
+consvar_t cv_gamesounds = CVAR_INIT ("sounds", "On", CV_SAVE|CV_CALL|CV_NOINIT, CV_OnOff, GameSounds_OnChange);
// Music preference
static CV_PossibleValue_t cons_musicpref_t[] = {
@@ -116,16 +113,16 @@ static CV_PossibleValue_t cons_musicpref_t[] = {
{1, "MIDI"},
{0, NULL}
};
-consvar_t cv_musicpref = {"musicpref", "Digital", CV_SAVE|CV_CALL|CV_NOINIT, cons_musicpref_t, MusicPref_OnChange, 0, NULL, NULL, 0, 0, NULL};
+consvar_t cv_musicpref = CVAR_INIT ("musicpref", "Digital", CV_SAVE|CV_CALL|CV_NOINIT, cons_musicpref_t, MusicPref_OnChange);
// Window focus sound sytem toggles
-consvar_t cv_playmusicifunfocused = {"playmusicifunfocused", "No", CV_SAVE, CV_YesNo, NULL, 0, NULL, NULL, 0, 0, NULL};
-consvar_t cv_playsoundsifunfocused = {"playsoundsifunfocused", "No", CV_SAVE, CV_YesNo, NULL, 0, NULL, NULL, 0, 0, NULL};
+consvar_t cv_playmusicifunfocused = CVAR_INIT ("playmusicifunfocused", "No", CV_SAVE, CV_YesNo, NULL);
+consvar_t cv_playsoundsifunfocused = CVAR_INIT ("playsoundsifunfocused", "No", CV_SAVE, CV_YesNo, NULL);
#ifdef HAVE_OPENMPT
openmpt_module *openmpt_mhandle = NULL;
static CV_PossibleValue_t interpolationfilter_cons_t[] = {{0, "Default"}, {1, "None"}, {2, "Linear"}, {4, "Cubic"}, {8, "Windowed sinc"}, {0, NULL}};
-consvar_t cv_modfilter = {"modfilter", "0", CV_SAVE|CV_CALL, interpolationfilter_cons_t, ModFilter_OnChange, 0, NULL, NULL, 0, 0, NULL};
+consvar_t cv_modfilter = CVAR_INIT ("modfilter", "0", CV_SAVE|CV_CALL, interpolationfilter_cons_t, ModFilter_OnChange);
#endif
#define S_MAX_VOLUME 127
@@ -1045,7 +1042,6 @@ void S_ClearSfx(void)
static void S_StopChannel(INT32 cnum)
{
- INT32 i;
channel_t *c = &channels[cnum];
if (c->sfxinfo)
@@ -1054,17 +1050,12 @@ static void S_StopChannel(INT32 cnum)
if (I_SoundIsPlaying(c->handle))
I_StopSound(c->handle);
- // check to see
- // if other channels are playing the sound
- for (i = 0; i < numofchannels; i++)
- if (cnum != i && c->sfxinfo == channels[i].sfxinfo)
- break;
-
// degrade usefulness of sound data
c->sfxinfo->usefulness--;
-
c->sfxinfo = 0;
}
+
+ c->origin = NULL;
}
//
@@ -2278,10 +2269,8 @@ void S_ChangeMusicEx(const char *mmusic, UINT16 mflags, boolean looping, UINT32
return;
strncpy(newmusic, mmusic, 7);
-#ifdef HAVE_LUA_MUSICPLUS
- if(LUAh_MusicChange(music_name, newmusic, &mflags, &looping, &position, &prefadems, &fadeinms))
+ if (LUAh_MusicChange(music_name, newmusic, &mflags, &looping, &position, &prefadems, &fadeinms))
return;
-#endif
newmusic[6] = 0;
// No Music (empty string)
diff --git a/src/screen.c b/src/screen.c
index 6dadd25c3ca9e968411fa20d0c82f84cc6d43ee1..d37724390dfa2148fe31c863a72c32a55552e596 100644
--- a/src/screen.c
+++ b/src/screen.c
@@ -28,10 +28,16 @@
#include "d_main.h"
#include "d_clisrv.h"
#include "f_finale.h"
+#include "y_inter.h" // usebuffer
#include "i_sound.h" // closed captions
#include "s_sound.h" // ditto
#include "g_game.h" // ditto
#include "p_local.h" // P_AutoPause()
+#ifdef HWRENDER
+#include "hardware/hw_main.h"
+#include "hardware/hw_light.h"
+#include "hardware/hw_model.h"
+#endif
#if defined (USEASM) && !defined (NORUSEASM)//&& (!defined (_MSC_VER) || (_MSC_VER <= 1200))
@@ -58,24 +64,24 @@ UINT8 setrenderneeded = 0;
static CV_PossibleValue_t scr_depth_cons_t[] = {{8, "8 bits"}, {16, "16 bits"}, {24, "24 bits"}, {32, "32 bits"}, {0, NULL}};
//added : 03-02-98: default screen mode, as loaded/saved in config
-consvar_t cv_scr_width = {"scr_width", "1280", CV_SAVE, CV_Unsigned, NULL, 0, NULL, NULL, 0, 0, NULL};
-consvar_t cv_scr_height = {"scr_height", "800", CV_SAVE, CV_Unsigned, NULL, 0, NULL, NULL, 0, 0, NULL};
-consvar_t cv_scr_depth = {"scr_depth", "16 bits", CV_SAVE, scr_depth_cons_t, NULL, 0, NULL, NULL, 0, 0, NULL};
-consvar_t cv_renderview = {"renderview", "On", 0, CV_OnOff, NULL, 0, NULL, NULL, 0, 0, NULL};
+consvar_t cv_scr_width = CVAR_INIT ("scr_width", "1280", CV_SAVE, CV_Unsigned, NULL);
+consvar_t cv_scr_height = CVAR_INIT ("scr_height", "800", CV_SAVE, CV_Unsigned, NULL);
+consvar_t cv_scr_depth = CVAR_INIT ("scr_depth", "16 bits", CV_SAVE, scr_depth_cons_t, NULL);
+consvar_t cv_renderview = CVAR_INIT ("renderview", "On", 0, CV_OnOff, NULL);
-static void SCR_ActuallyChangeRenderer(void);
-static CV_PossibleValue_t cv_renderer_t[] = {
+CV_PossibleValue_t cv_renderer_t[] = {
{1, "Software"},
#ifdef HWRENDER
{2, "OpenGL"},
#endif
{0, NULL}
};
-consvar_t cv_renderer = {"renderer", "Software", CV_SAVE|CV_NOLUA|CV_CALL, cv_renderer_t, SCR_ChangeRenderer, 0, NULL, NULL, 0, 0, NULL};
+
+consvar_t cv_renderer = CVAR_INIT ("renderer", "Software", CV_SAVE|CV_NOLUA|CV_CALL, cv_renderer_t, SCR_ChangeRenderer);
static void SCR_ChangeFullscreen(void);
-consvar_t cv_fullscreen = {"fullscreen", "Yes", CV_SAVE|CV_CALL, CV_YesNo, SCR_ChangeFullscreen, 0, NULL, NULL, 0, 0, NULL};
+consvar_t cv_fullscreen = CVAR_INIT ("fullscreen", "Yes", CV_SAVE|CV_CALL, CV_YesNo, SCR_ChangeFullscreen);
// =========================================================================
// SCREEN VARIABLES
@@ -121,34 +127,34 @@ void SCR_SetDrawFuncs(void)
colfuncs[COLDRAWFUNC_FOG] = R_DrawFogColumn_8;
spanfuncs[SPANDRAWFUNC_TRANS] = R_DrawTranslucentSpan_8;
+ spanfuncs[SPANDRAWFUNC_TILTED] = R_DrawTiltedSpan_8;
+ spanfuncs[SPANDRAWFUNC_TILTEDTRANS] = R_DrawTiltedTranslucentSpan_8;
spanfuncs[SPANDRAWFUNC_SPLAT] = R_DrawSplat_8;
spanfuncs[SPANDRAWFUNC_TRANSSPLAT] = R_DrawTranslucentSplat_8;
- spanfuncs[SPANDRAWFUNC_FOG] = R_DrawFogSpan_8;
-#ifndef NOWATER
+ spanfuncs[SPANDRAWFUNC_TILTEDSPLAT] = R_DrawTiltedSplat_8;
+ spanfuncs[SPANDRAWFUNC_SPRITE] = R_DrawFloorSprite_8;
+ spanfuncs[SPANDRAWFUNC_TRANSSPRITE] = R_DrawTranslucentFloorSprite_8;
+ spanfuncs[SPANDRAWFUNC_TILTEDSPRITE] = R_DrawTiltedFloorSprite_8;
+ spanfuncs[SPANDRAWFUNC_TILTEDTRANSSPRITE] = R_DrawTiltedTranslucentFloorSprite_8;
spanfuncs[SPANDRAWFUNC_WATER] = R_DrawTranslucentWaterSpan_8;
-#endif
- spanfuncs[SPANDRAWFUNC_TILTED] = R_DrawTiltedSpan_8;
- spanfuncs[SPANDRAWFUNC_TILTEDTRANS] = R_DrawTiltedTranslucentSpan_8;
-#ifndef NOWATER
spanfuncs[SPANDRAWFUNC_TILTEDWATER] = R_DrawTiltedTranslucentWaterSpan_8;
-#endif
- spanfuncs[SPANDRAWFUNC_TILTEDSPLAT] = R_DrawTiltedSplat_8;
+ spanfuncs[SPANDRAWFUNC_FOG] = R_DrawFogSpan_8;
// Lactozilla: Non-powers-of-two
spanfuncs_npo2[BASEDRAWFUNC] = R_DrawSpan_NPO2_8;
spanfuncs_npo2[SPANDRAWFUNC_TRANS] = R_DrawTranslucentSpan_NPO2_8;
+ spanfuncs_npo2[SPANDRAWFUNC_TILTED] = R_DrawTiltedSpan_NPO2_8;
+ spanfuncs_npo2[SPANDRAWFUNC_TILTEDTRANS] = R_DrawTiltedTranslucentSpan_NPO2_8;
spanfuncs_npo2[SPANDRAWFUNC_SPLAT] = R_DrawSplat_NPO2_8;
spanfuncs_npo2[SPANDRAWFUNC_TRANSSPLAT] = R_DrawTranslucentSplat_NPO2_8;
- spanfuncs_npo2[SPANDRAWFUNC_FOG] = NULL; // Not needed
-#ifndef NOWATER
+ spanfuncs_npo2[SPANDRAWFUNC_TILTEDSPLAT] = R_DrawTiltedSplat_NPO2_8;
+ spanfuncs_npo2[SPANDRAWFUNC_SPRITE] = R_DrawFloorSprite_NPO2_8;
+ spanfuncs_npo2[SPANDRAWFUNC_TRANSSPRITE] = R_DrawTranslucentFloorSprite_NPO2_8;
+ spanfuncs_npo2[SPANDRAWFUNC_TILTEDSPRITE] = R_DrawTiltedFloorSprite_NPO2_8;
+ spanfuncs_npo2[SPANDRAWFUNC_TILTEDTRANSSPRITE] = R_DrawTiltedTranslucentFloorSprite_NPO2_8;
spanfuncs_npo2[SPANDRAWFUNC_WATER] = R_DrawTranslucentWaterSpan_NPO2_8;
-#endif
- spanfuncs_npo2[SPANDRAWFUNC_TILTED] = R_DrawTiltedSpan_NPO2_8;
- spanfuncs_npo2[SPANDRAWFUNC_TILTEDTRANS] = R_DrawTiltedTranslucentSpan_NPO2_8;
-#ifndef NOWATER
spanfuncs_npo2[SPANDRAWFUNC_TILTEDWATER] = R_DrawTiltedTranslucentWaterSpan_NPO2_8;
-#endif
- spanfuncs_npo2[SPANDRAWFUNC_TILTEDSPLAT] = R_DrawTiltedSplat_NPO2_8;
+ spanfuncs_npo2[SPANDRAWFUNC_FOG] = NULL; // Not needed
#ifdef RUSEASM
if (R_ASM)
@@ -202,16 +208,21 @@ void SCR_SetMode(void)
// Lactozilla: Renderer switching
if (setrenderneeded)
{
- Z_PreparePatchFlush();
- needpatchflush = true;
- needpatchrecache = true;
- VID_CheckRenderer();
+ // stop recording movies (APNG only)
+ if (setrenderneeded && (moviemode == MM_APNG))
+ M_StopMovie();
+
+ // VID_SetMode will call VID_CheckRenderer itself,
+ // so no need to do this in here.
if (!setmodeneeded)
- VID_SetMode(vid.modenum);
+ VID_CheckRenderer();
+
+ vid.recalc = 1;
}
+ // Set the video mode in the video interface.
if (setmodeneeded)
- VID_SetMode(--setmodeneeded);
+ VID_SetMode(setmodeneeded - 1);
V_SetPalette(0);
@@ -279,34 +290,9 @@ void SCR_Startup(void)
vid.modenum = 0;
- vid.dupx = vid.width / BASEVIDWIDTH;
- vid.dupy = vid.height / BASEVIDHEIGHT;
- vid.dupx = vid.dupy = (vid.dupx < vid.dupy ? vid.dupx : vid.dupy);
- vid.fdupx = FixedDiv(vid.width*FRACUNIT, BASEVIDWIDTH*FRACUNIT);
- vid.fdupy = FixedDiv(vid.height*FRACUNIT, BASEVIDHEIGHT*FRACUNIT);
-
-#ifdef HWRENDER
- if (rendermode != render_opengl && rendermode != render_none) // This was just placing it incorrectly at non aspect correct resolutions in opengl
-#endif
- vid.fdupx = vid.fdupy = (vid.fdupx < vid.fdupy ? vid.fdupx : vid.fdupy);
-
- vid.meddupx = (UINT8)(vid.dupx >> 1) + 1;
- vid.meddupy = (UINT8)(vid.dupy >> 1) + 1;
-#ifdef HWRENDER
- vid.fmeddupx = vid.meddupx*FRACUNIT;
- vid.fmeddupy = vid.meddupy*FRACUNIT;
-#endif
-
- vid.smalldupx = (UINT8)(vid.dupx / 3) + 1;
- vid.smalldupy = (UINT8)(vid.dupy / 3) + 1;
-#ifdef HWRENDER
- vid.fsmalldupx = vid.smalldupx*FRACUNIT;
- vid.fsmalldupy = vid.smalldupy*FRACUNIT;
-#endif
-
- vid.baseratio = FRACUNIT;
-
V_Init();
+ V_Recalc();
+
CV_RegisterVar(&cv_ticrate);
CV_RegisterVar(&cv_constextsize);
@@ -323,38 +309,7 @@ void SCR_Recalc(void)
// bytes per pixel quick access
scr_bpp = vid.bpp;
- // scale 1,2,3 times in x and y the patches for the menus and overlays...
- // calculated once and for all, used by routines in v_video.c
- vid.dupx = vid.width / BASEVIDWIDTH;
- vid.dupy = vid.height / BASEVIDHEIGHT;
- vid.dupx = vid.dupy = (vid.dupx < vid.dupy ? vid.dupx : vid.dupy);
- vid.fdupx = FixedDiv(vid.width*FRACUNIT, BASEVIDWIDTH*FRACUNIT);
- vid.fdupy = FixedDiv(vid.height*FRACUNIT, BASEVIDHEIGHT*FRACUNIT);
-
-#ifdef HWRENDER
- //if (rendermode != render_opengl && rendermode != render_none) // This was just placing it incorrectly at non aspect correct resolutions in opengl
- // 13/11/18:
- // The above is no longer necessary, since we want OpenGL to be just like software now
- // -- Monster Iestyn
-#endif
- vid.fdupx = vid.fdupy = (vid.fdupx < vid.fdupy ? vid.fdupx : vid.fdupy);
-
- //vid.baseratio = FixedDiv(vid.height << FRACBITS, BASEVIDHEIGHT << FRACBITS);
- vid.baseratio = FRACUNIT;
-
- vid.meddupx = (UINT8)(vid.dupx >> 1) + 1;
- vid.meddupy = (UINT8)(vid.dupy >> 1) + 1;
-#ifdef HWRENDER
- vid.fmeddupx = vid.meddupx*FRACUNIT;
- vid.fmeddupy = vid.meddupy*FRACUNIT;
-#endif
-
- vid.smalldupx = (UINT8)(vid.dupx / 3) + 1;
- vid.smalldupy = (UINT8)(vid.dupy / 3) + 1;
-#ifdef HWRENDER
- vid.fsmalldupx = vid.smalldupx*FRACUNIT;
- vid.fsmalldupy = vid.smalldupy*FRACUNIT;
-#endif
+ V_Recalc();
// toggle off (then back on) the automap because some screensize-dependent values will
// be calculated next time the automap is activated.
@@ -374,6 +329,12 @@ void SCR_Recalc(void)
// vid.recalc lasts only for the next refresh...
con_recalc = true;
am_recalc = true;
+
+#ifdef HWRENDER
+ // Shoot! The screen texture was flushed!
+ if ((rendermode == render_opengl) && (gamestate == GS_INTERMISSION))
+ usebuffer = false;
+#endif
}
// Check for screen cmd-line parms: to force a resolution.
@@ -411,7 +372,16 @@ void SCR_CheckDefaultMode(void)
setmodeneeded = VID_GetModeForSize(cv_scr_width.value, cv_scr_height.value) + 1;
}
- SCR_ActuallyChangeRenderer();
+ if (cv_renderer.value != (signed)rendermode)
+ {
+ if (chosenrendermode == render_none) // nothing set at command line
+ SCR_ChangeRenderer();
+ else
+ {
+ // Set cv_renderer to the current render mode
+ CV_StealthSetValue(&cv_renderer, rendermode);
+ }
+ }
}
// sets the modenum as the new default video mode to be saved in the config file
@@ -441,64 +411,31 @@ void SCR_ChangeFullscreen(void)
#endif
}
-static int target_renderer = 0;
-
-void SCR_ActuallyChangeRenderer(void)
+void SCR_ChangeRenderer(void)
{
- setrenderneeded = target_renderer;
+ if (chosenrendermode != render_none
+ || (signed)rendermode == cv_renderer.value)
+ return;
#ifdef HWRENDER
- // Well, it didn't even load anyway.
- if ((vid_opengl_state == -1) && (setrenderneeded == render_opengl))
+ // Check if OpenGL loaded successfully (or wasn't disabled) before switching to it.
+ if ((vid.glstate == VID_GL_LIBRARY_ERROR)
+ && (cv_renderer.value == render_opengl))
{
if (M_CheckParm("-nogl"))
CONS_Alert(CONS_ERROR, "OpenGL rendering was disabled!\n");
else
CONS_Alert(CONS_ERROR, "OpenGL never loaded\n");
- setrenderneeded = 0;
return;
}
-#endif
- // setting the same renderer twice WILL crash your game, so let's not, please
- if (rendermode == setrenderneeded)
- setrenderneeded = 0;
-}
-
-// Lactozilla: Renderer switching
-void SCR_ChangeRenderer(void)
-{
- setrenderneeded = 0;
+ if (rendermode == render_opengl && (vid.glstate == VID_GL_LIBRARY_LOADED)) // Clear these out before switching to software
+ HWR_ClearAllTextures();
- if (con_startup)
- {
- target_renderer = cv_renderer.value;
-#ifdef HWRENDER
- if (M_CheckParm("-opengl") && (vid_opengl_state == 1))
- target_renderer = rendermode = render_opengl;
- else
#endif
- if (M_CheckParm("-software"))
- target_renderer = rendermode = render_soft;
- // set cv_renderer back
- SCR_ChangeRendererCVars(rendermode);
- return;
- }
-
- if (cv_renderer.value == 1)
- target_renderer = render_soft;
- else if (cv_renderer.value == 2)
- target_renderer = render_opengl;
- SCR_ActuallyChangeRenderer();
-}
-void SCR_ChangeRendererCVars(INT32 mode)
-{
- // set cv_renderer back
- if (mode == render_soft)
- CV_StealthSetValue(&cv_renderer, 1);
- else if (mode == render_opengl)
- CV_StealthSetValue(&cv_renderer, 2);
+ // Set the new render mode
+ setrenderneeded = cv_renderer.value;
}
boolean SCR_IsAspectCorrect(INT32 width, INT32 height)
diff --git a/src/screen.h b/src/screen.h
index 2cb2cf839160ab6e73e1544d6f7f6869ac4bdbb9..e4944775d952249c785c14262960daa8f58bc796 100644
--- a/src/screen.h
+++ b/src/screen.h
@@ -72,10 +72,16 @@ typedef struct viddef_s
#ifdef HWRENDER
INT32/*fixed_t*/ fsmalldupx, fsmalldupy;
INT32/*fixed_t*/ fmeddupx, fmeddupy;
+ INT32 glstate;
#endif
} viddef_t;
-#define VIDWIDTH vid.width
-#define VIDHEIGHT vid.height
+
+enum
+{
+ VID_GL_LIBRARY_NOTLOADED = 0,
+ VID_GL_LIBRARY_LOADED = 1,
+ VID_GL_LIBRARY_ERROR = -1,
+};
// internal additional info for vesa modes only
typedef struct
@@ -134,18 +140,22 @@ enum
{
SPANDRAWFUNC_BASE = BASEDRAWFUNC,
SPANDRAWFUNC_TRANS,
- SPANDRAWFUNC_SPLAT,
- SPANDRAWFUNC_TRANSSPLAT,
- SPANDRAWFUNC_FOG,
-#ifndef NOWATER
- SPANDRAWFUNC_WATER,
-#endif
SPANDRAWFUNC_TILTED,
SPANDRAWFUNC_TILTEDTRANS,
+
+ SPANDRAWFUNC_SPLAT,
+ SPANDRAWFUNC_TRANSSPLAT,
SPANDRAWFUNC_TILTEDSPLAT,
-#ifndef NOWATER
+
+ SPANDRAWFUNC_SPRITE,
+ SPANDRAWFUNC_TRANSSPRITE,
+ SPANDRAWFUNC_TILTEDSPRITE,
+ SPANDRAWFUNC_TILTEDTRANSSPRITE,
+
+ SPANDRAWFUNC_WATER,
SPANDRAWFUNC_TILTEDWATER,
-#endif
+
+ SPANDRAWFUNC_FOG,
SPANDRAWFUNC_MAX
};
@@ -170,10 +180,11 @@ extern boolean R_SSE2;
// ----------------
extern viddef_t vid;
extern INT32 setmodeneeded; // mode number to set if needed, or 0
+extern UINT8 setrenderneeded;
void SCR_ChangeRenderer(void);
-void SCR_ChangeRendererCVars(INT32 mode);
-extern UINT8 setrenderneeded;
+
+extern CV_PossibleValue_t cv_renderer_t[];
extern INT32 scr_bpp;
extern UINT8 *scr_borderpatch; // patch used to fill the view borders
@@ -182,17 +193,23 @@ extern consvar_t cv_scr_width, cv_scr_height, cv_scr_depth, cv_renderview, cv_re
// wait for page flipping to end or not
extern consvar_t cv_vidwait;
+// Initialize the screen
+void SCR_Startup(void);
+
// Change video mode, only at the start of a refresh.
void SCR_SetMode(void);
+
+// Set drawer functions for Software
void SCR_SetDrawFuncs(void);
+
// Recalc screen size dependent stuff
void SCR_Recalc(void);
+
// Check parms once at startup
void SCR_CheckDefaultMode(void);
-// Set the mode number which is saved in the config
-void SCR_SetDefaultMode (void);
-void SCR_Startup (void);
+// Set the mode number which is saved in the config
+void SCR_SetDefaultMode(void);
FUNCMATH boolean SCR_IsAspectCorrect(INT32 width, INT32 height);
diff --git a/src/sdl/Srb2SDL-vc10.vcxproj b/src/sdl/Srb2SDL-vc10.vcxproj
index 755fa68e6768e84d8ec2563d863591ccac1854ee..d46a4af2b0d89ea1dc93b0573e4ef1d6a32665b4 100644
--- a/src/sdl/Srb2SDL-vc10.vcxproj
+++ b/src/sdl/Srb2SDL-vc10.vcxproj
@@ -196,6 +196,9 @@
<ClInclude Include="..\comptime.h" />
<ClInclude Include="..\console.h" />
<ClInclude Include="..\dehacked.h" />
+ <ClInclude Include="..\deh_soc.h" />
+ <ClInclude Include="..\deh_lua.h" />
+ <ClInclude Include="..\deh_tables.h" />
<ClInclude Include="..\doomdata.h" />
<ClInclude Include="..\doomdef.h" />
<ClInclude Include="..\doomstat.h" />
@@ -262,6 +265,7 @@
<ClInclude Include="..\m_fixed.h" />
<ClInclude Include="..\m_menu.h" />
<ClInclude Include="..\m_misc.h" />
+ <ClInclude Include="..\m_perfstats.h" />
<ClInclude Include="..\m_queue.h" />
<ClInclude Include="..\m_random.h" />
<ClInclude Include="..\m_swap.h" />
@@ -282,6 +286,8 @@
<ClInclude Include="..\r_draw.h" />
<ClInclude Include="..\r_local.h" />
<ClInclude Include="..\r_main.h" />
+ <ClInclude Include="..\r_patch.h" />
+ <ClInclude Include="..\r_patchrotation.h" />
<ClInclude Include="..\r_picformats.h" />
<ClInclude Include="..\r_plane.h" />
<ClInclude Include="..\r_portal.h" />
@@ -360,6 +366,9 @@
<ClCompile Include="..\comptime.c" />
<ClCompile Include="..\console.c" />
<ClCompile Include="..\dehacked.c" />
+ <ClCompile Include="..\deh_soc.c" />
+ <ClCompile Include="..\deh_lua.c" />
+ <ClCompile Include="..\deh_tables.c" />
<ClCompile Include="..\d_clisrv.c" />
<ClCompile Include="..\d_main.c" />
<ClCompile Include="..\d_net.c" />
@@ -401,6 +410,7 @@
<ClCompile Include="..\lua_mathlib.c" />
<ClCompile Include="..\lua_mobjlib.c" />
<ClCompile Include="..\lua_playerlib.c" />
+ <ClCompile Include="..\lua_polyobjlib.c" />
<ClCompile Include="..\lua_script.c" />
<ClCompile Include="..\lua_skinlib.c" />
<ClCompile Include="..\lua_thinkerlib.c" />
@@ -417,6 +427,7 @@
<ClCompile Include="..\m_fixed.c" />
<ClCompile Include="..\m_menu.c" />
<ClCompile Include="..\m_misc.c" />
+ <ClCompile Include="..\m_perfstats.c" />
<ClCompile Include="..\m_queue.c" />
<ClCompile Include="..\m_random.c" />
<ClCompile Include="..\p_ceilng.c" />
@@ -449,6 +460,8 @@
<ExcludedFromBuild>true</ExcludedFromBuild>
</ClCompile>
<ClCompile Include="..\r_main.c" />
+ <ClCompile Include="..\r_patch.c" />
+ <ClCompile Include="..\r_patchrotation.c" />
<ClCompile Include="..\r_picformats.c" />
<ClCompile Include="..\r_plane.c" />
<ClCompile Include="..\r_portal.c" />
diff --git a/src/sdl/Srb2SDL-vc10.vcxproj.filters b/src/sdl/Srb2SDL-vc10.vcxproj.filters
index 3bbcd9cb57efeb3f725edacfa05de81ccbc54691..adae2f446dbde8267e375bb794eacc50bed9c663 100644
--- a/src/sdl/Srb2SDL-vc10.vcxproj.filters
+++ b/src/sdl/Srb2SDL-vc10.vcxproj.filters
@@ -348,6 +348,9 @@
<ClInclude Include="..\m_misc.h">
<Filter>M_Misc</Filter>
</ClInclude>
+ <ClInclude Include="..\m_perfstats.h">
+ <Filter>M_Misc</Filter>
+ </ClInclude>
<ClInclude Include="..\m_queue.h">
<Filter>M_Misc</Filter>
</ClInclude>
@@ -474,12 +477,18 @@
<ClInclude Include="..\hardware\hw_clip.h">
<Filter>Hw_Hardware</Filter>
</ClInclude>
- <ClInclude Include="..\r_textures.h">
+ <ClInclude Include="..\r_patch.h">
+ <Filter>R_Rend</Filter>
+ </ClInclude>
+ <ClInclude Include="..\r_patchrotation.h">
<Filter>R_Rend</Filter>
</ClInclude>
<ClInclude Include="..\r_picformats.h">
<Filter>R_Rend</Filter>
</ClInclude>
+ <ClInclude Include="..\r_textures.h">
+ <Filter>R_Rend</Filter>
+ </ClInclude>
<ClInclude Include="..\r_portal.h">
<Filter>R_Rend</Filter>
</ClInclude>
@@ -723,6 +732,9 @@
<ClCompile Include="..\lua_playerlib.c">
<Filter>LUA</Filter>
</ClCompile>
+ <ClCompile Include="..\lua_polyobjlib.c">
+ <Filter>LUA</Filter>
+ </ClCompile>
<ClCompile Include="..\lua_script.c">
<Filter>LUA</Filter>
</ClCompile>
@@ -762,6 +774,9 @@
<ClCompile Include="..\m_misc.c">
<Filter>M_Misc</Filter>
</ClCompile>
+ <ClCompile Include="..\m_perfstats.c">
+ <Filter>M_Misc</Filter>
+ </ClCompile>
<ClCompile Include="..\m_queue.c">
<Filter>M_Misc</Filter>
</ClCompile>
@@ -952,12 +967,18 @@
<Filter>Hw_Hardware</Filter>
</ClCompile>
<ClCompile Include="..\apng.c" />
- <ClCompile Include="..\r_textures.c">
+ <ClCompile Include="..\r_patch.c">
+ <Filter>R_Rend</Filter>
+ </ClCompile>
+ <ClCompile Include="..\r_patchrotation.c">
<Filter>R_Rend</Filter>
</ClCompile>
<ClCompile Include="..\r_picformats.c">
<Filter>R_Rend</Filter>
</ClCompile>
+ <ClCompile Include="..\r_textures.c">
+ <Filter>R_Rend</Filter>
+ </ClCompile>
<ClCompile Include="..\r_portal.c">
<Filter>R_Rend</Filter>
</ClCompile>
diff --git a/src/sdl/Srb2SDL-vc9.vcproj b/src/sdl/Srb2SDL-vc9.vcproj
index 3c430b2b4af5a85ca641d0df1557ff9e90215604..95f035267026215279b91d1d309b08be34e6e29e 100644
--- a/src/sdl/Srb2SDL-vc9.vcproj
+++ b/src/sdl/Srb2SDL-vc9.vcproj
@@ -1710,6 +1710,138 @@
RelativePath="..\dehacked.h"
>
</File>
+ <File
+ RelativePath="..\deh_soc.c"
+ >
+ <FileConfiguration
+ Name="Debug|Win32"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ AdditionalIncludeDirectories=""
+ PreprocessorDefinitions=""
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Debug|x64"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ AdditionalIncludeDirectories=""
+ PreprocessorDefinitions=""
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Release|Win32"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ AdditionalIncludeDirectories=""
+ PreprocessorDefinitions=""
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Release|x64"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ AdditionalIncludeDirectories=""
+ PreprocessorDefinitions=""
+ />
+ </FileConfiguration>
+ </File>
+ <File
+ RelativePath="..\deh_soc.h"
+ >
+ </File>
+ <File
+ RelativePath="..\deh_lua.c"
+ >
+ <FileConfiguration
+ Name="Debug|Win32"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ AdditionalIncludeDirectories=""
+ PreprocessorDefinitions=""
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Debug|x64"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ AdditionalIncludeDirectories=""
+ PreprocessorDefinitions=""
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Release|Win32"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ AdditionalIncludeDirectories=""
+ PreprocessorDefinitions=""
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Release|x64"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ AdditionalIncludeDirectories=""
+ PreprocessorDefinitions=""
+ />
+ </FileConfiguration>
+ </File>
+ <File
+ RelativePath="..\deh_lua.h"
+ >
+ </File>
+ <File
+ RelativePath="..\deh_tables.c"
+ >
+ <FileConfiguration
+ Name="Debug|Win32"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ AdditionalIncludeDirectories=""
+ PreprocessorDefinitions=""
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Debug|x64"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ AdditionalIncludeDirectories=""
+ PreprocessorDefinitions=""
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Release|Win32"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ AdditionalIncludeDirectories=""
+ PreprocessorDefinitions=""
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Release|x64"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ AdditionalIncludeDirectories=""
+ PreprocessorDefinitions=""
+ />
+ </FileConfiguration>
+ </File>
+ <File
+ RelativePath="..\deh_tables.h"
+ >
+ </File>
<File
RelativePath="..\doomdata.h"
>
diff --git a/src/sdl/hwsym_sdl.c b/src/sdl/hwsym_sdl.c
index 416c8d2f5531f1ec09d15770a711fa756118c129..96e3d7d6926ef23771c8dcf489b4d8d2a16c0a1c 100644
--- a/src/sdl/hwsym_sdl.c
+++ b/src/sdl/hwsym_sdl.c
@@ -86,6 +86,7 @@ void *hwSym(const char *funcName,void *handle)
GETFUNC(ClearBuffer);
GETFUNC(SetTexture);
GETFUNC(UpdateTexture);
+ GETFUNC(DeleteTexture);
GETFUNC(ReadRect);
GETFUNC(GClipRect);
GETFUNC(ClearMipMapCache);
@@ -104,14 +105,13 @@ void *hwSym(const char *funcName,void *handle)
GETFUNC(MakeScreenFinalTexture);
GETFUNC(DrawScreenFinalTexture);
- GETFUNC(LoadShaders);
- GETFUNC(KillShaders);
+ GETFUNC(CompileShaders);
+ GETFUNC(CleanShaders);
GETFUNC(SetShader);
GETFUNC(UnSetShader);
GETFUNC(SetShaderInfo);
GETFUNC(LoadCustomShader);
- GETFUNC(InitCustomShaders);
#else //HWRENDER
if (0 == strcmp("FinishUpdate", funcName))
diff --git a/src/sdl/i_system.c b/src/sdl/i_system.c
index 10c0747bf18b4e8fc725f4cfd3984a9183e79c56..a0dd6e1da707a1e521f53623d2de42b01e6f7dfa 100644
--- a/src/sdl/i_system.c
+++ b/src/sdl/i_system.c
@@ -54,12 +54,6 @@ typedef LPVOID (WINAPI *p_MapViewOfFile) (HANDLE, DWORD, DWORD, DWORD, SIZE_T);
#include <fcntl.h>
#endif
-#if defined (_WIN32)
-DWORD TimeFunction(int requested_frequency);
-#else
-int TimeFunction(int requested_frequency);
-#endif
-
#include <stdio.h>
#ifdef _WIN32
#include <conio.h>
@@ -143,6 +137,12 @@ int TimeFunction(int requested_frequency);
#include <errno.h>
#endif
+#if defined (__unix__) || defined(__APPLE__) || defined (UNIXCOMMON)
+#include <execinfo.h>
+#include <time.h>
+#define UNIXBACKTRACE
+#endif
+
// Locations for searching the srb2.pk3
#if defined (__unix__) || defined(__APPLE__) || defined (UNIXCOMMON)
#define DEFAULTWADLOCATION1 "/usr/local/share/games/SRB2"
@@ -244,6 +244,71 @@ SDL_bool framebuffer = SDL_FALSE;
UINT8 keyboard_started = false;
+#ifdef UNIXBACKTRACE
+#define STDERR_WRITE(string) if (fd != -1) I_OutputMsg("%s", string)
+#define CRASHLOG_WRITE(string) if (fd != -1) write(fd, string, strlen(string))
+#define CRASHLOG_STDERR_WRITE(string) \
+ if (fd != -1)\
+ write(fd, string, strlen(string));\
+ I_OutputMsg("%s", string)
+
+static void write_backtrace(INT32 signal)
+{
+ int fd = -1;
+ size_t size;
+ time_t rawtime;
+ struct tm timeinfo;
+
+ enum { BT_SIZE = 1024, STR_SIZE = 32 };
+ void *array[BT_SIZE];
+ char timestr[STR_SIZE];
+
+ const char *error = "An error occurred within SRB2! Send this stack trace to someone who can help!\n";
+ const char *error2 = "(Or find crash-log.txt in your SRB2 directory.)\n"; // Shown only to stderr.
+
+ fd = open(va("%s" PATHSEP "%s", srb2home, "crash-log.txt"), O_CREAT|O_APPEND|O_RDWR, S_IRUSR|S_IWUSR);
+
+ if (fd == -1)
+ I_OutputMsg("\nWARNING: Couldn't open crash log for writing! Make sure your permissions are correct. Please save the below report!\n");
+
+ // Get the current time as a string.
+ time(&rawtime);
+ localtime_r(&rawtime, &timeinfo);
+ strftime(timestr, STR_SIZE, "%a, %d %b %Y %T %z", &timeinfo);
+
+ CRASHLOG_WRITE("------------------------\n"); // Nice looking seperator
+
+ CRASHLOG_STDERR_WRITE("\n"); // Newline to look nice for both outputs.
+ CRASHLOG_STDERR_WRITE(error); // "Oops, SRB2 crashed" message
+ STDERR_WRITE(error2); // Tell the user where the crash log is.
+
+ // Tell the log when we crashed.
+ CRASHLOG_WRITE("Time of crash: ");
+ CRASHLOG_WRITE(timestr);
+ CRASHLOG_WRITE("\n");
+
+ // Give the crash log the cause and a nice 'Backtrace:' thing
+ // The signal is given to the user when the parent process sees we crashed.
+ CRASHLOG_WRITE("Cause: ");
+ CRASHLOG_WRITE(strsignal(signal));
+ CRASHLOG_WRITE("\n"); // Newline for the signal name
+
+ CRASHLOG_STDERR_WRITE("\nBacktrace:\n");
+
+ // Flood the output and log with the backtrace
+ size = backtrace(array, BT_SIZE);
+ backtrace_symbols_fd(array, size, fd);
+ backtrace_symbols_fd(array, size, STDERR_FILENO);
+
+ CRASHLOG_WRITE("\n"); // Write another newline to the log so it looks nice :)
+
+ close(fd);
+}
+#undef STDERR_WRITE
+#undef CRASHLOG_WRITE
+#undef CRASHLOG_STDERR_WRITE
+#endif // UNIXBACKTRACE
+
static void I_ReportSignal(int num, int coredumped)
{
//static char msg[] = "oh no! back to reality!\r\n";
@@ -303,6 +368,9 @@ FUNCNORETURN static ATTRNORETURN void signal_handler(INT32 num)
{
D_QuitNetGame(); // Fix server freezes
CL_AbortDownloadResume();
+#ifdef UNIXBACKTRACE
+ write_backtrace(num);
+#endif
I_ReportSignal(num, 0);
I_ShutdownSystem();
signal(num, SIG_DFL); //default signal action
@@ -693,6 +761,28 @@ static void I_RegisterSignals (void)
#endif
}
+#ifdef NEWSIGNALHANDLER
+static void signal_handler_child(INT32 num)
+{
+#ifdef UNIXBACKTRACE
+ write_backtrace(num);
+#endif
+
+ signal(num, SIG_DFL); //default signal action
+ raise(num);
+}
+
+static void I_RegisterChildSignals(void)
+{
+ // If these defines don't exist,
+ // then compilation would have failed above us...
+ signal(SIGILL , signal_handler_child);
+ signal(SIGSEGV , signal_handler_child);
+ signal(SIGABRT , signal_handler_child);
+ signal(SIGFPE , signal_handler_child);
+}
+#endif
+
//
//I_OutputMsg
//
@@ -2044,112 +2134,36 @@ ticcmd_t *I_BaseTiccmd2(void)
return &emptycmd2;
}
-#if defined (_WIN32)
-static HMODULE winmm = NULL;
-static DWORD starttickcount = 0; // hack for win2k time bug
-static p_timeGetTime pfntimeGetTime = NULL;
-
-// ---------
-// I_GetTime
-// Use the High Resolution Timer if available,
-// else use the multimedia timer which has 1 millisecond precision on Windowz 95,
-// but lower precision on Windows NT
-// ---------
-
-DWORD TimeFunction(int requested_frequency)
-{
- DWORD newtics = 0;
- // this var acts as a multiplier if sub-millisecond precision is asked but is not available
- int excess_frequency = requested_frequency / 1000;
-
- if (!starttickcount) // high precision timer
- {
- LARGE_INTEGER currtime; // use only LowPart if high resolution counter is not available
- static LARGE_INTEGER basetime = {{0, 0}};
-
- // use this if High Resolution timer is found
- static LARGE_INTEGER frequency;
-
- if (!basetime.LowPart)
- {
- if (!QueryPerformanceFrequency(&frequency))
- frequency.QuadPart = 0;
- else
- QueryPerformanceCounter(&basetime);
- }
-
- if (frequency.LowPart && QueryPerformanceCounter(&currtime))
- {
- newtics = (INT32)((currtime.QuadPart - basetime.QuadPart) * requested_frequency
- / frequency.QuadPart);
- }
- else if (pfntimeGetTime)
- {
- currtime.LowPart = pfntimeGetTime();
- if (!basetime.LowPart)
- basetime.LowPart = currtime.LowPart;
- if (requested_frequency > 1000)
- newtics = currtime.LowPart - basetime.LowPart * excess_frequency;
- else
- newtics = (currtime.LowPart - basetime.LowPart)/(1000/requested_frequency);
- }
- }
- else
- {
- if (requested_frequency > 1000)
- newtics = (GetTickCount() - starttickcount) * excess_frequency;
- else
- newtics = (GetTickCount() - starttickcount)/(1000/requested_frequency);
- }
-
- return newtics;
-}
-
-static void I_ShutdownTimer(void)
-{
- pfntimeGetTime = NULL;
- if (winmm)
- {
- p_timeEndPeriod pfntimeEndPeriod = (p_timeEndPeriod)(LPVOID)GetProcAddress(winmm, "timeEndPeriod");
- if (pfntimeEndPeriod)
- pfntimeEndPeriod(1);
- FreeLibrary(winmm);
- winmm = NULL;
- }
-}
-#else
//
// I_GetTime
// returns time in 1/TICRATE second tics
//
-// millisecond precision only
-int TimeFunction(int requested_frequency)
-{
- static Uint64 basetime = 0;
- Uint64 ticks = SDL_GetTicks();
+static Uint64 timer_frequency;
- if (!basetime)
- basetime = ticks;
+static double tic_frequency;
+static Uint64 tic_epoch;
- ticks -= basetime;
+tic_t I_GetTime(void)
+{
+ static double elapsed;
- ticks = (ticks*requested_frequency);
+ const Uint64 now = SDL_GetPerformanceCounter();
- ticks = (ticks/1000);
+ elapsed += (now - tic_epoch) / tic_frequency;
+ tic_epoch = now; // moving epoch
- return ticks;
+ return (tic_t)elapsed;
}
-#endif
-tic_t I_GetTime(void)
+precise_t I_GetPreciseTime(void)
{
- return TimeFunction(NEWTICRATE);
+ return SDL_GetPerformanceCounter();
}
-int I_GetTimeMicros(void)
+int I_PreciseToMicros(precise_t d)
{
- return TimeFunction(1000000);
+ return (int)(d / (timer_frequency / 1000000.0));
}
//
@@ -2157,26 +2171,11 @@ int I_GetTimeMicros(void)
//
void I_StartupTimer(void)
{
-#ifdef _WIN32
- // for win2k time bug
- if (M_CheckParm("-gettickcount"))
- {
- starttickcount = GetTickCount();
- CONS_Printf("%s", M_GetText("Using GetTickCount()\n"));
- }
- winmm = LoadLibraryA("winmm.dll");
- if (winmm)
- {
- p_timeEndPeriod pfntimeBeginPeriod = (p_timeEndPeriod)(LPVOID)GetProcAddress(winmm, "timeBeginPeriod");
- if (pfntimeBeginPeriod)
- pfntimeBeginPeriod(1);
- pfntimeGetTime = (p_timeGetTime)(LPVOID)GetProcAddress(winmm, "timeGetTime");
- }
- I_AddExitFunc(I_ShutdownTimer);
-#endif
-}
-
+ timer_frequency = SDL_GetPerformanceFrequency();
+ tic_epoch = SDL_GetPerformanceCounter();
+ tic_frequency = timer_frequency / (double)NEWTICRATE;
+}
void I_Sleep(void)
{
@@ -2220,6 +2219,7 @@ static void I_Fork(void)
newsignalhandler_Warn("fork()");
break;
case 0:
+ I_RegisterChildSignals();
break;
default:
if (logstream)
diff --git a/src/sdl/i_video.c b/src/sdl/i_video.c
index c8f67da77bcda865d1865220a67705e5f6896e01..0ed10463fc79734e004abdfdb960d56630168abf 100644
--- a/src/sdl/i_video.c
+++ b/src/sdl/i_video.c
@@ -42,7 +42,7 @@
#ifdef HAVE_IMAGE
#include "SDL_image.h"
-#elif defined (__unix__) || defined(__APPLE__) || defined (UNIXCOMMON) // Windows doesn't need this, as SDL will do it for us.
+#elif defined (__unix__) || (!defined(__APPLE__) && defined (UNIXCOMMON)) // Windows & Mac don't need this, as SDL will do it for us.
#define LOAD_XPM //I want XPM!
#include "IMG_xpm.c" //Alam: I don't want to add SDL_Image.dll/so
#define HAVE_IMAGE //I have SDL_Image, sortof
@@ -95,17 +95,16 @@ static INT32 numVidModes = -1;
static char vidModeName[33][32]; // allow 33 different modes
rendermode_t rendermode = render_soft;
-static rendermode_t chosenrendermode = render_soft; // set by command line arguments
+rendermode_t chosenrendermode = render_none; // set by command line arguments
boolean highcolor = false;
// synchronize page flipping with screen refresh
-consvar_t cv_vidwait = {"vid_wait", "On", CV_SAVE, CV_OnOff, NULL, 0, NULL, NULL, 0, 0, NULL};
-static consvar_t cv_stretch = {"stretch", "Off", CV_SAVE|CV_NOSHOWHELP, CV_OnOff, NULL, 0, NULL, NULL, 0, 0, NULL};
-static consvar_t cv_alwaysgrabmouse = {"alwaysgrabmouse", "Off", CV_SAVE, CV_OnOff, NULL, 0, NULL, NULL, 0, 0, NULL};
+consvar_t cv_vidwait = CVAR_INIT ("vid_wait", "On", CV_SAVE, CV_OnOff, NULL);
+static consvar_t cv_stretch = CVAR_INIT ("stretch", "Off", CV_SAVE|CV_NOSHOWHELP, CV_OnOff, NULL);
+static consvar_t cv_alwaysgrabmouse = CVAR_INIT ("alwaysgrabmouse", "Off", CV_SAVE, CV_OnOff, NULL);
UINT8 graphics_started = 0; // Is used in console.c and screen.c
-INT32 vid_opengl_state = 0;
// To disable fullscreen at startup; is set in VID_PrepareModeList
boolean allow_fullscreen = false;
@@ -1058,8 +1057,7 @@ void I_GetEvent(void)
M_SetupJoystickMenu(0);
break;
case SDL_QUIT:
- if (Playing())
- LUAh_GameQuit();
+ LUAh_GameQuit(true);
I_Quit();
break;
}
@@ -1443,7 +1441,8 @@ static SDL_bool Impl_CreateContext(void)
{
// Renderer-specific stuff
#ifdef HWRENDER
- if ((rendermode == render_opengl) && (vid_opengl_state != -1))
+ if ((rendermode == render_opengl)
+ && (vid.glstate != VID_GL_LIBRARY_ERROR))
{
if (!sdlglcontext)
sdlglcontext = SDL_GL_CreateContext(window);
@@ -1480,7 +1479,7 @@ void VID_CheckGLLoaded(rendermode_t oldrender)
{
(void)oldrender;
#ifdef HWRENDER
- if (vid_opengl_state == -1) // Well, it didn't work the first time anyway.
+ if (vid.glstate == VID_GL_LIBRARY_ERROR) // Well, it didn't work the first time anyway.
{
CONS_Alert(CONS_ERROR, "OpenGL never loaded\n");
rendermode = oldrender;
@@ -1495,14 +1494,16 @@ void VID_CheckGLLoaded(rendermode_t oldrender)
#endif
}
-void VID_CheckRenderer(void)
+boolean VID_CheckRenderer(void)
{
boolean rendererchanged = false;
boolean contextcreated = false;
+#ifdef HWRENDER
rendermode_t oldrenderer = rendermode;
+#endif
if (dedicated)
- return;
+ return false;
if (setrenderneeded)
{
@@ -1516,11 +1517,12 @@ void VID_CheckRenderer(void)
// Initialise OpenGL before calling SDLSetMode!!!
// This is because SDLSetMode calls OglSdlSurface.
- if (vid_opengl_state == 0)
+ if (vid.glstate == VID_GL_LIBRARY_NOTLOADED)
{
VID_StartupOpenGL();
+
// Loaded successfully!
- if (vid_opengl_state == 1)
+ if (vid.glstate == VID_GL_LIBRARY_LOADED)
{
// Destroy the current window, if it exists.
if (window)
@@ -1543,7 +1545,7 @@ void VID_CheckRenderer(void)
contextcreated = true;
}
}
- else if (vid_opengl_state == -1)
+ else if (vid.glstate == VID_GL_LIBRARY_ERROR)
rendererchanged = false;
}
#endif
@@ -1554,7 +1556,7 @@ void VID_CheckRenderer(void)
setrenderneeded = 0;
}
- SDLSetMode(vid.width, vid.height, USE_FULLSCREEN, (rendererchanged ? SDL_FALSE : SDL_TRUE));
+ SDLSetMode(vid.width, vid.height, USE_FULLSCREEN, (setmodeneeded ? SDL_TRUE : SDL_FALSE));
Impl_VideoSetupBuffer();
if (rendermode == render_soft)
@@ -1565,27 +1567,17 @@ void VID_CheckRenderer(void)
bufSurface = NULL;
}
- if (rendererchanged)
- {
-#ifdef HWRENDER
- if (vid_opengl_state == 1) // Only if OpenGL ever loaded!
- HWR_FreeTextureCache();
-#endif
- SCR_SetDrawFuncs();
- }
+ SCR_SetDrawFuncs();
}
#ifdef HWRENDER
- else if (rendermode == render_opengl)
+ else if (rendermode == render_opengl && rendererchanged)
{
- if (rendererchanged)
- {
- R_InitHardwareMode();
- V_SetPalette(0);
- }
+ HWR_Switch();
+ V_SetPalette(0);
}
-#else
- (void)oldrenderer;
#endif
+
+ return rendererchanged;
}
INT32 VID_SetMode(INT32 modeNum)
@@ -1626,7 +1618,7 @@ static SDL_bool Impl_CreateWindow(SDL_bool fullscreen)
flags |= SDL_WINDOW_BORDERLESS;
#ifdef HWRENDER
- if (vid_opengl_state == 1)
+ if (vid.glstate == VID_GL_LIBRARY_LOADED)
flags |= SDL_WINDOW_OPENGL;
#endif
@@ -1660,7 +1652,7 @@ static void Impl_SetWindowName(const char *title)
static void Impl_SetWindowIcon(void)
{
if (window && icoSurface)
- SDL_SetWindowIcon(window, icoSurface);
+ SDL_SetWindowIcon(window, icoSurface);
}
static void Impl_VideoSetupSDLBuffer(void)
@@ -1747,12 +1739,44 @@ void I_StartupGraphics(void)
framebuffer = SDL_TRUE;
}
-#ifdef HWRENDER
- if (M_CheckParm("-opengl"))
- chosenrendermode = rendermode = render_opengl;
+ // Renderer choices
+ // Takes priority over the config.
+ if (M_CheckParm("-renderer"))
+ {
+ INT32 i = 0;
+ CV_PossibleValue_t *renderer_list = cv_renderer_t;
+ const char *modeparm = M_GetNextParm();
+ while (renderer_list[i].strvalue)
+ {
+ if (!stricmp(modeparm, renderer_list[i].strvalue))
+ {
+ chosenrendermode = renderer_list[i].value;
+ break;
+ }
+ i++;
+ }
+ }
+
+ // Choose Software renderer
else if (M_CheckParm("-software"))
+ chosenrendermode = render_soft;
+
+#ifdef HWRENDER
+ // Choose OpenGL renderer
+ else if (M_CheckParm("-opengl"))
+ chosenrendermode = render_opengl;
+
+ // Don't startup OpenGL
+ if (M_CheckParm("-nogl"))
+ {
+ vid.glstate = VID_GL_LIBRARY_ERROR;
+ if (chosenrendermode == render_opengl)
+ chosenrendermode = render_none;
+ }
#endif
- chosenrendermode = rendermode = render_soft;
+
+ if (chosenrendermode != render_none)
+ rendermode = chosenrendermode;
usesdl2soft = M_CheckParm("-softblit");
borderlesswindow = M_CheckParm("-borderless");
@@ -1761,16 +1785,14 @@ void I_StartupGraphics(void)
VID_Command_ModeList_f();
#ifdef HWRENDER
- if (M_CheckParm("-nogl"))
- vid_opengl_state = -1; // Don't startup OpenGL
- else if (chosenrendermode == render_opengl)
+ if (rendermode == render_opengl)
VID_StartupOpenGL();
#endif
// Window icon
#ifdef HAVE_IMAGE
icoSurface = IMG_ReadXPMFromArray(SDL_icon_xpm);
-#endif
+#endif
// Fury: we do window initialization after GL setup to allow
// SDL_GL_LoadLibrary to work well on Windows
@@ -1836,6 +1858,7 @@ void VID_StartupOpenGL(void)
HWD.pfnClearBuffer = hwSym("ClearBuffer",NULL);
HWD.pfnSetTexture = hwSym("SetTexture",NULL);
HWD.pfnUpdateTexture = hwSym("UpdateTexture",NULL);
+ HWD.pfnDeleteTexture = hwSym("DeleteTexture",NULL);
HWD.pfnReadRect = hwSym("ReadRect",NULL);
HWD.pfnGClipRect = hwSym("GClipRect",NULL);
HWD.pfnClearMipMapCache = hwSym("ClearMipMapCache",NULL);
@@ -1855,18 +1878,17 @@ void VID_StartupOpenGL(void)
HWD.pfnMakeScreenFinalTexture=hwSym("MakeScreenFinalTexture",NULL);
HWD.pfnDrawScreenFinalTexture=hwSym("DrawScreenFinalTexture",NULL);
- HWD.pfnLoadShaders = hwSym("LoadShaders",NULL);
- HWD.pfnKillShaders = hwSym("KillShaders",NULL);
+ HWD.pfnCompileShaders = hwSym("CompileShaders",NULL);
+ HWD.pfnCleanShaders = hwSym("CleanShaders",NULL);
HWD.pfnSetShader = hwSym("SetShader",NULL);
HWD.pfnUnSetShader = hwSym("UnSetShader",NULL);
HWD.pfnSetShaderInfo = hwSym("SetShaderInfo",NULL);
HWD.pfnLoadCustomShader = hwSym("LoadCustomShader",NULL);
- HWD.pfnInitCustomShaders= hwSym("InitCustomShaders",NULL);
- vid_opengl_state = HWD.pfnInit() ? 1 : -1; // let load the OpenGL library
+ vid.glstate = HWD.pfnInit() ? VID_GL_LIBRARY_LOADED : VID_GL_LIBRARY_ERROR; // let load the OpenGL library
- if (vid_opengl_state == -1)
+ if (vid.glstate == VID_GL_LIBRARY_ERROR)
{
rendermode = render_soft;
setrenderneeded = 0;
diff --git a/src/sdl/mixer_sound.c b/src/sdl/mixer_sound.c
index 25e7fde8981c01755b7a77972b1114db09730ef4..412a21ea0098415b46eea3565630f6f9ce99bfe8 100644
--- a/src/sdl/mixer_sound.c
+++ b/src/sdl/mixer_sound.c
@@ -196,9 +196,9 @@ static void MidiSoundfontPath_Onchange(void)
// make sure that s_sound.c does not already verify these
// which happens when: defined(HAVE_MIXERX) && !defined(HAVE_MIXER)
static CV_PossibleValue_t midiplayer_cons_t[] = {{MIDI_OPNMIDI, "OPNMIDI"}, {MIDI_Fluidsynth, "Fluidsynth"}, {MIDI_Timidity, "Timidity"}, {MIDI_Native, "Native"}, {0, NULL}};
-consvar_t cv_midiplayer = {"midiplayer", "OPNMIDI" /*MIDI_OPNMIDI*/, CV_CALL|CV_NOINIT|CV_SAVE, midiplayer_cons_t, Midiplayer_Onchange, 0, NULL, NULL, 0, 0, NULL};
-consvar_t cv_midisoundfontpath = {"midisoundfont", "sf2/8bitsf.SF2", CV_CALL|CV_NOINIT|CV_SAVE, NULL, MidiSoundfontPath_Onchange, 0, NULL, NULL, 0, 0, NULL};
-consvar_t cv_miditimiditypath = {"midisoundbank", "./timidity", CV_SAVE, NULL, NULL, 0, NULL, NULL, 0, 0, NULL};
+consvar_t cv_midiplayer = CVAR_INIT ("midiplayer", "OPNMIDI" /*MIDI_OPNMIDI*/, CV_CALL|CV_NOINIT|CV_SAVE, midiplayer_cons_t, Midiplayer_Onchange);
+consvar_t cv_midisoundfontpath = CVAR_INIT ("midisoundfont", "sf2/8bitsf.SF2", CV_CALL|CV_NOINIT|CV_SAVE, NULL, MidiSoundfontPath_Onchange);
+consvar_t cv_miditimiditypath = CVAR_INIT ("midisoundbank", "./timidity", CV_SAVE, NULL, NULL);
#endif
static void var_cleanup(void)
@@ -1298,6 +1298,10 @@ boolean I_PlaySong(boolean looping)
if (gme)
{
gme_equalizer_t eq = {GME_TREBLE, GME_BASS, 0,0,0,0,0,0,0,0};
+#if defined (GME_VERSION) && GME_VERSION >= 0x000603
+ if (looping)
+ gme_set_autoload_playback_limit(gme, 0);
+#endif
gme_set_equalizer(gme, &eq);
gme_start_track(gme, 0);
current_track = 0;
diff --git a/src/sdl/ogl_sdl.c b/src/sdl/ogl_sdl.c
index edc69b21d5067c264bf16e6df8739fac8b0dced9..52727c05600a5f33221e729d51263b08fcdde30b 100644
--- a/src/sdl/ogl_sdl.c
+++ b/src/sdl/ogl_sdl.c
@@ -167,6 +167,18 @@ boolean OglSdlSurface(INT32 w, INT32 h)
GL_DBG_Printf("OpenGL %s\n", gl_version);
GL_DBG_Printf("GPU: %s\n", gl_renderer);
GL_DBG_Printf("Extensions: %s\n", gl_extensions);
+
+ if (strcmp((const char*)gl_renderer, "GDI Generic") == 0 &&
+ strcmp((const char*)gl_version, "1.1.0") == 0)
+ {
+ // Oh no... Windows gave us the GDI Generic rasterizer, so something is wrong...
+ // The game will crash later on when unsupported OpenGL commands are encountered.
+ // Instead of a nondescript crash, show a more informative error message.
+ // Also set the renderer variable back to software so the next launch won't
+ // repeat this error.
+ CV_StealthSet(&cv_renderer, "Software");
+ I_Error("OpenGL Error: Failed to access the GPU. There may be an issue with your graphics drivers.");
+ }
}
first_init = true;
@@ -177,7 +189,7 @@ boolean OglSdlSurface(INT32 w, INT32 h)
SetupGLFunc4();
- granisotropicmode_cons_t[1].value = maximumAnisotropy;
+ glanisotropicmode_cons_t[1].value = maximumAnisotropy;
SDL_GL_SetSwapInterval(cv_vidwait.value ? 1 : 0);
diff --git a/src/st_stuff.c b/src/st_stuff.c
index 86e0b37542224bc780017c44449ef0fb3e55d306..a1fbbec03ae7321455d7fe93ff8545d6aa542e7d 100644
--- a/src/st_stuff.c
+++ b/src/st_stuff.c
@@ -203,9 +203,7 @@ void ST_doPaletteStuff(void)
{
INT32 palette;
- if (paused || P_AutoPause())
- palette = 0;
- else if (stplyr && stplyr->flashcount)
+ if (stplyr && stplyr->flashcount)
palette = stplyr->flashpal;
else
palette = 0;
@@ -215,8 +213,6 @@ void ST_doPaletteStuff(void)
palette = 0; // No flashpals here in OpenGL
#endif
- palette = min(max(palette, 0), 13);
-
if (palette != st_palette)
{
st_palette = palette;
@@ -232,7 +228,7 @@ void ST_doPaletteStuff(void)
void ST_UnloadGraphics(void)
{
- Z_FreeTag(PU_HUDGFX);
+ Patch_FreeTag(PU_HUDGFX);
}
void ST_LoadGraphics(void)
@@ -303,10 +299,6 @@ void ST_LoadGraphics(void)
gravboots = W_CachePatchName("TVGVICON", PU_HUDGFX);
tagico = W_CachePatchName("TAGICO", PU_HUDGFX);
- rflagico = W_CachePatchName("RFLAGICO", PU_HUDGFX);
- bflagico = W_CachePatchName("BFLAGICO", PU_HUDGFX);
- rmatcico = W_CachePatchName("RMATCICO", PU_HUDGFX);
- bmatcico = W_CachePatchName("BMATCICO", PU_HUDGFX);
gotrflag = W_CachePatchName("GOTRFLAG", PU_HUDGFX);
gotbflag = W_CachePatchName("GOTBFLAG", PU_HUDGFX);
fnshico = W_CachePatchName("FNSHICO", PU_HUDGFX);
@@ -458,7 +450,7 @@ boolean st_overlay;
static void ST_DrawNightsOverlayNum(fixed_t x /* right border */, fixed_t y, fixed_t s, INT32 a,
UINT32 num, patch_t **numpat, skincolornum_t colornum)
{
- fixed_t w = SHORT(numpat[0]->width)*s;
+ fixed_t w = numpat[0]->width * s;
const UINT8 *colormap;
// I want my V_SNAPTOx flags. :< -Red
@@ -676,7 +668,7 @@ static void ST_drawRaceNum(INT32 time)
if (!(P_AutoPause() || paused) && !bounce)
S_StartSound(0, ((racenum == racego) ? sfx_s3kad : sfx_s3ka7));
}
- V_DrawScaledPatch(((BASEVIDWIDTH - SHORT(racenum->width))/2), height, V_PERPLAYER, racenum);
+ V_DrawScaledPatch(((BASEVIDWIDTH - racenum->width)/2), height, V_PERPLAYER, racenum);
}
static void ST_drawTime(void)
@@ -1625,8 +1617,8 @@ static void ST_drawFirstPersonHUD(void)
p = W_CachePatchNum(sprframe->lumppat[0], PU_CACHE);
// Display the countdown drown numbers!
- if (p && !F_GetPromptHideHud(60 - SHORT(p->topoffset)))
- V_DrawScaledPatch((BASEVIDWIDTH/2) - (SHORT(p->width)/2) + SHORT(p->leftoffset), 60 - SHORT(p->topoffset),
+ if (p && !F_GetPromptHideHud(60 - p->topoffset))
+ V_DrawScaledPatch((BASEVIDWIDTH/2) - (p->width / 2) + SHORT(p->leftoffset), 60 - SHORT(p->topoffset),
V_PERPLAYER|V_PERPLAYER|V_TRANSLUCENT, p);
}
@@ -2080,21 +2072,21 @@ static void ST_drawNiGHTSHUD(void)
if (stplyr->powers[pw_nights_superloop])
{
pwr = stplyr->powers[pw_nights_superloop];
- V_DrawSmallScaledPatch(110, 44, 0, W_CachePatchName("NPRUA0",PU_CACHE));
+ V_DrawSmallScaledPatch(110, 44, 0, W_CachePatchName("NPRUA0",PU_SPRITE));
V_DrawThinString(106, 52, V_MONOSPACE, va("%2d.%02d", pwr/TICRATE, G_TicsToCentiseconds(pwr)));
}
if (stplyr->powers[pw_nights_helper])
{
pwr = stplyr->powers[pw_nights_helper];
- V_DrawSmallScaledPatch(150, 44, 0, W_CachePatchName("NPRUC0",PU_CACHE));
+ V_DrawSmallScaledPatch(150, 44, 0, W_CachePatchName("NPRUC0",PU_SPRITE));
V_DrawThinString(146, 52, V_MONOSPACE, va("%2d.%02d", pwr/TICRATE, G_TicsToCentiseconds(pwr)));
}
if (stplyr->powers[pw_nights_linkfreeze])
{
pwr = stplyr->powers[pw_nights_linkfreeze];
- V_DrawSmallScaledPatch(190, 44, 0, W_CachePatchName("NPRUE0",PU_CACHE));
+ V_DrawSmallScaledPatch(190, 44, 0, W_CachePatchName("NPRUE0",PU_SPRITE));
V_DrawThinString(186, 52, V_MONOSPACE, va("%2d.%02d", pwr/TICRATE, G_TicsToCentiseconds(pwr)));
}
}
@@ -2367,27 +2359,29 @@ static inline void ST_drawRaceHUD(void)
static void ST_drawTeamHUD(void)
{
- patch_t *p;
#define SEP 20
if (F_GetPromptHideHud(0)) // y base is 0
return;
- if (gametyperules & GTR_TEAMFLAGS)
- p = bflagico;
- else
- p = bmatcico;
-
- if (LUA_HudEnabled(hud_teamscores))
- V_DrawSmallScaledPatch(BASEVIDWIDTH/2 - SEP - SHORT(p->width)/4, 4, V_HUDTRANS|V_PERPLAYER|V_SNAPTOTOP, p);
-
- if (gametyperules & GTR_TEAMFLAGS)
- p = rflagico;
- else
- p = rmatcico;
+ rflagico = W_CachePatchName("RFLAGICO", PU_HUDGFX);
+ bflagico = W_CachePatchName("BFLAGICO", PU_HUDGFX);
+ rmatcico = W_CachePatchName("RMATCICO", PU_HUDGFX);
+ bmatcico = W_CachePatchName("BMATCICO", PU_HUDGFX);
if (LUA_HudEnabled(hud_teamscores))
- V_DrawSmallScaledPatch(BASEVIDWIDTH/2 + SEP - SHORT(p->width)/4, 4, V_HUDTRANS|V_PERPLAYER|V_SNAPTOTOP, p);
+ {
+ if (gametyperules & GTR_TEAMFLAGS)
+ {
+ V_DrawSmallScaledPatch(BASEVIDWIDTH/2 - SEP - (bflagico->width / 4), 4, V_HUDTRANS|V_PERPLAYER|V_SNAPTOTOP, bflagico);
+ V_DrawSmallScaledPatch(BASEVIDWIDTH/2 + SEP - (rflagico->width / 4), 4, V_HUDTRANS|V_PERPLAYER|V_SNAPTOTOP, rflagico);
+ }
+ else
+ {
+ V_DrawSmallScaledPatch(BASEVIDWIDTH/2 - SEP - (bmatcico->width / 4), 4, V_HUDTRANS|V_PERPLAYER|V_SNAPTOTOP, bmatcico);
+ V_DrawSmallScaledPatch(BASEVIDWIDTH/2 + SEP - (rmatcico->width / 4), 4, V_HUDTRANS|V_PERPLAYER|V_SNAPTOTOP, rmatcico);
+ }
+ }
if (!(gametyperules & GTR_TEAMFLAGS))
goto num;
@@ -2400,11 +2394,11 @@ static void ST_drawTeamHUD(void)
{
// Blue flag isn't at base
if (players[i].gotflag & GF_BLUEFLAG && LUA_HudEnabled(hud_teamscores))
- V_DrawScaledPatch(BASEVIDWIDTH/2 - SEP - SHORT(nonicon->width)/2, 0, V_HUDTRANS|V_PERPLAYER|V_SNAPTOTOP, nonicon);
+ V_DrawScaledPatch(BASEVIDWIDTH/2 - SEP - (nonicon->width / 2), 0, V_HUDTRANS|V_PERPLAYER|V_SNAPTOTOP, nonicon);
// Red flag isn't at base
if (players[i].gotflag & GF_REDFLAG && LUA_HudEnabled(hud_teamscores))
- V_DrawScaledPatch(BASEVIDWIDTH/2 + SEP - SHORT(nonicon2->width)/2, 0, V_HUDTRANS|V_PERPLAYER|V_SNAPTOTOP, nonicon2);
+ V_DrawScaledPatch(BASEVIDWIDTH/2 + SEP - (nonicon2->width / 2), 0, V_HUDTRANS|V_PERPLAYER|V_SNAPTOTOP, nonicon2);
whichflag |= players[i].gotflag;
@@ -2677,7 +2671,7 @@ static void ST_overlayDrawer(void)
else
{
tic_t num = time;
- INT32 sz = SHORT(tallnum[0]->width)/2, width = 0;
+ INT32 sz = tallnum[0]->width / 2, width = 0;
do
{
width += sz;
@@ -2755,10 +2749,6 @@ static void ST_overlayDrawer(void)
void ST_Drawer(void)
{
- if (needpatchrecache)
- R_ReloadHUDGraphics();
-
-#ifdef SEENAMES
if (cv_seenames.value && cv_allowseenames.value && displayplayer == consoleplayer && seenplayer && seenplayer->mo)
{
INT32 c = 0;
@@ -2782,7 +2772,6 @@ void ST_Drawer(void)
V_DrawCenteredString(BASEVIDWIDTH/2, BASEVIDHEIGHT/2 + 15, V_HUDTRANSHALF|c, player_names[seenplayer-players]);
}
-#endif
// Doom's status bar only updated if necessary.
// However, ours updates every frame regardless, so the "refresh" param was removed
diff --git a/src/taglist.c b/src/taglist.c
new file mode 100644
index 0000000000000000000000000000000000000000..a759f4d02bfc0658ea68a6b6becd20dffaad7700
--- /dev/null
+++ b/src/taglist.c
@@ -0,0 +1,388 @@
+// SONIC ROBO BLAST 2
+//-----------------------------------------------------------------------------
+// Copyright (C) 1998-2000 by DooM Legacy Team.
+// Copyright (C) 1999-2020 by Sonic Team Junior.
+// Copyright (C) 2020 by Nev3r.
+//
+// This program is free software distributed under the
+// terms of the GNU General Public License, version 2.
+// See the 'LICENSE' file for more details.
+//-----------------------------------------------------------------------------
+/// \file taglist.c
+/// \brief Ingame sector/line/mapthing tagging.
+
+#include "taglist.h"
+#include "z_zone.h"
+#include "r_data.h"
+
+// Bit array of whether a tag exists for sectors/lines/things.
+bitarray_t tags_available[BIT_ARRAY_SIZE (MAXTAGS)];
+
+size_t num_tags;
+
+// Taggroups are used to list elements of the same tag, for iteration.
+// Since elements can now have multiple tags, it means an element may appear
+// in several taggroups at the same time. These are built on level load.
+taggroup_t* tags_sectors[MAXTAGS + 1];
+taggroup_t* tags_lines[MAXTAGS + 1];
+taggroup_t* tags_mapthings[MAXTAGS + 1];
+
+/// Adds a tag to a given element's taglist.
+/// \warning This does not rebuild the global taggroups, which are used for iteration.
+void Tag_Add (taglist_t* list, const mtag_t tag)
+{
+ list->tags = Z_Realloc(list->tags, (list->count + 1) * sizeof(list->tags), PU_LEVEL, NULL);
+ list->tags[list->count++] = tag;
+}
+
+/// Sets the first tag entry in a taglist.
+/// Replicates the old way of accessing element->tag.
+void Tag_FSet (taglist_t* list, const mtag_t tag)
+{
+ if (!list->count)
+ {
+ Tag_Add(list, tag);
+ return;
+ }
+
+ list->tags[0] = tag;
+}
+
+/// Gets the first tag entry in a taglist.
+/// Replicates the old way of accessing element->tag.
+mtag_t Tag_FGet (const taglist_t* list)
+{
+ if (list->count)
+ return list->tags[0];
+
+ return 0;
+}
+
+/// Returns true if the given tag exist inside the list.
+boolean Tag_Find (const taglist_t* list, const mtag_t tag)
+{
+ size_t i;
+ for (i = 0; i < list->count; i++)
+ if (list->tags[i] == tag)
+ return true;
+
+ return false;
+}
+
+/// Returns true if at least one tag is shared between two given lists.
+boolean Tag_Share (const taglist_t* list1, const taglist_t* list2)
+{
+ size_t i;
+ for (i = 0; i < list1->count; i++)
+ if (Tag_Find(list2, list1->tags[i]))
+ return true;
+
+ return false;
+}
+
+/// Returns true if both lists are identical.
+boolean Tag_Compare (const taglist_t* list1, const taglist_t* list2)
+{
+ size_t i;
+
+ if (list1->count != list2->count)
+ return false;
+
+ for (i = 0; i < list1->count; i++)
+ if (list1->tags[i] != list2->tags[i])
+ return false;
+
+ return true;
+}
+
+/// Search for an element inside a global taggroup.
+size_t Taggroup_Find (const taggroup_t *group, const size_t id)
+{
+ size_t i;
+
+ if (!group)
+ return -1;
+
+ for (i = 0; i < group->count; i++)
+ if (group->elements[i] == id)
+ return i;
+
+ return -1;
+}
+
+/// group->count, but also checks for NULL
+size_t Taggroup_Count (const taggroup_t *group)
+{
+ return group ? group->count : 0;
+}
+
+/// Iterate thru elements in a global taggroup.
+INT32 Taggroup_Iterate
+( taggroup_t *garray[],
+ const size_t max_elements,
+ const mtag_t tag,
+ const size_t p)
+{
+ const taggroup_t *group;
+
+ if (tag == MTAG_GLOBAL)
+ {
+ if (p < max_elements)
+ return p;
+ return -1;
+ }
+
+ group = garray[(UINT16)tag];
+
+ if (group)
+ {
+ if (p < group->count)
+ return group->elements[p];
+ return -1;
+ }
+ return -1;
+}
+
+/// Add an element to a global taggroup.
+void Taggroup_Add (taggroup_t *garray[], const mtag_t tag, size_t id)
+{
+ taggroup_t *group;
+ size_t i; // Insert position.
+
+ if (tag == MTAG_GLOBAL)
+ return;
+
+ group = garray[(UINT16)tag];
+
+ // Don't add duplicate entries.
+ if (Taggroup_Find(group, id) != (size_t)-1)
+ return;
+
+ if (! in_bit_array(tags_available, tag))
+ {
+ num_tags++;
+ set_bit_array(tags_available, tag);
+ }
+
+ // Create group if empty.
+ if (!group)
+ {
+ i = 0;
+ group = garray[(UINT16)tag] = Z_Calloc(sizeof(taggroup_t), PU_LEVEL, NULL);
+ }
+ else
+ {
+ // Keep the group element ids in an ascending order.
+ // Find the location to insert the element to.
+ for (i = 0; i < group->count; i++)
+ if (group->elements[i] > id)
+ break;
+ }
+
+ group->elements = Z_Realloc(group->elements, (group->count + 1) * sizeof(size_t), PU_LEVEL, NULL);
+
+ // Offset existing elements to make room for the new one.
+ if (i < group->count)
+ memmove(&group->elements[i + 1], &group->elements[i], group->count - i);
+
+ group->count++;
+ group->elements[i] = id;
+}
+
+static size_t total_elements_with_tag (const mtag_t tag)
+{
+ return
+ (
+ Taggroup_Count(tags_sectors[tag]) +
+ Taggroup_Count(tags_lines[tag]) +
+ Taggroup_Count(tags_mapthings[tag])
+ );
+}
+
+/// Remove an element from a global taggroup.
+void Taggroup_Remove (taggroup_t *garray[], const mtag_t tag, size_t id)
+{
+ taggroup_t *group;
+ size_t rempos;
+ size_t oldcount;
+
+ if (tag == MTAG_GLOBAL)
+ return;
+
+ group = garray[(UINT16)tag];
+
+ if ((rempos = Taggroup_Find(group, id)) == (size_t)-1)
+ return;
+
+ if (group->count == 1 && total_elements_with_tag(tag) == 1)
+ {
+ num_tags--;
+ unset_bit_array(tags_available, tag);
+ }
+
+ // Strip away taggroup if no elements left.
+ if (!(oldcount = group->count--))
+ {
+ Z_Free(group->elements);
+ Z_Free(group);
+ garray[(UINT16)tag] = NULL;
+ }
+ else
+ {
+ size_t *newelements = Z_Malloc(group->count * sizeof(size_t), PU_LEVEL, NULL);
+ size_t i;
+
+ // Copy the previous entries save for the one to remove.
+ for (i = 0; i < rempos; i++)
+ newelements[i] = group->elements[i];
+
+ for (i = rempos + 1; i < oldcount; i++)
+ newelements[i - 1] = group->elements[i];
+
+ Z_Free(group->elements);
+ group->elements = newelements;
+ }
+}
+
+// Initialization.
+
+static void Taglist_AddToSectors (const mtag_t tag, const size_t itemid)
+{
+ Taggroup_Add(tags_sectors, tag, itemid);
+}
+
+static void Taglist_AddToLines (const mtag_t tag, const size_t itemid)
+{
+ Taggroup_Add(tags_lines, tag, itemid);
+}
+
+static void Taglist_AddToMapthings (const mtag_t tag, const size_t itemid)
+{
+ Taggroup_Add(tags_mapthings, tag, itemid);
+}
+
+/// After all taglists have been built for each element (sectors, lines, things),
+/// the global taggroups, made for iteration, are built here.
+void Taglist_InitGlobalTables(void)
+{
+ size_t i, j;
+
+ memset(tags_available, 0, sizeof tags_available);
+ num_tags = 0;
+
+ for (i = 0; i < MAXTAGS; i++)
+ {
+ tags_sectors[i] = NULL;
+ tags_lines[i] = NULL;
+ tags_mapthings[i] = NULL;
+ }
+ for (i = 0; i < numsectors; i++)
+ {
+ for (j = 0; j < sectors[i].tags.count; j++)
+ Taglist_AddToSectors(sectors[i].tags.tags[j], i);
+ }
+ for (i = 0; i < numlines; i++)
+ {
+ for (j = 0; j < lines[i].tags.count; j++)
+ Taglist_AddToLines(lines[i].tags.tags[j], i);
+ }
+ for (i = 0; i < nummapthings; i++)
+ {
+ for (j = 0; j < mapthings[i].tags.count; j++)
+ Taglist_AddToMapthings(mapthings[i].tags.tags[j], i);
+ }
+}
+
+// Iteration, ingame search.
+
+INT32 Tag_Iterate_Sectors (const mtag_t tag, const size_t p)
+{
+ return Taggroup_Iterate(tags_sectors, numsectors, tag, p);
+}
+
+INT32 Tag_Iterate_Lines (const mtag_t tag, const size_t p)
+{
+ return Taggroup_Iterate(tags_lines, numlines, tag, p);
+}
+
+INT32 Tag_Iterate_Things (const mtag_t tag, const size_t p)
+{
+ return Taggroup_Iterate(tags_mapthings, nummapthings, tag, p);
+}
+
+INT32 Tag_FindLineSpecial(const INT16 special, const mtag_t tag)
+{
+ size_t i;
+
+ if (tag == MTAG_GLOBAL)
+ {
+ for (i = 0; i < numlines; i++)
+ if (lines[i].special == special)
+ return i;
+ }
+ else if (tags_lines[(UINT16)tag])
+ {
+ taggroup_t *tagged = tags_lines[(UINT16)tag];
+ for (i = 0; i < tagged->count; i++)
+ if (lines[tagged->elements[i]].special == special)
+ return tagged->elements[i];
+ }
+ return -1;
+}
+
+/// Backwards compatibility iteration function for Lua scripts.
+INT32 P_FindSpecialLineFromTag(INT16 special, INT16 tag, INT32 start)
+{
+ if (tag == -1)
+ {
+ start++;
+
+ if (start >= (INT32)numlines)
+ return -1;
+
+ while (start < (INT32)numlines && lines[start].special != special)
+ start++;
+
+ return start;
+ }
+ else
+ {
+ size_t p = 0;
+ INT32 id;
+
+ // For backwards compatibility's sake, simulate the old linked taglist behavior:
+ // Iterate through the taglist and find the "start" line's position in the list,
+ // And start checking with the next one (if it exists).
+ if (start != -1)
+ {
+ for (; (id = Tag_Iterate_Lines(tag, p)) >= 0; p++)
+ if (id == start)
+ {
+ p++;
+ break;
+ }
+ }
+
+ for (; (id = Tag_Iterate_Lines(tag, p)) >= 0; p++)
+ if (lines[id].special == special)
+ return id;
+
+ return -1;
+ }
+}
+
+
+// Ingame list manipulation.
+
+/// Changes the first tag for a given sector, and updates the global taggroups.
+void Tag_SectorFSet (const size_t id, const mtag_t tag)
+{
+ sector_t* sec = §ors[id];
+ mtag_t curtag = Tag_FGet(&sec->tags);
+ if (curtag == tag)
+ return;
+
+ Taggroup_Remove(tags_sectors, curtag, id);
+ Taggroup_Add(tags_sectors, tag, id);
+ Tag_FSet(&sec->tags, tag);
+}
diff --git a/src/taglist.h b/src/taglist.h
new file mode 100644
index 0000000000000000000000000000000000000000..a0529ab6b6afae4fe4252e61fd5848e2bd875ef6
--- /dev/null
+++ b/src/taglist.h
@@ -0,0 +1,138 @@
+// SONIC ROBO BLAST 2
+//-----------------------------------------------------------------------------
+// Copyright (C) 1998-2000 by DooM Legacy Team.
+// Copyright (C) 1999-2020 by Sonic Team Junior.
+// Copyright (C) 2020 by Nev3r.
+//
+// This program is free software distributed under the
+// terms of the GNU General Public License, version 2.
+// See the 'LICENSE' file for more details.
+//-----------------------------------------------------------------------------
+/// \file taglist.h
+/// \brief Tag iteration and reading functions and macros' declarations.
+
+#ifndef __R_TAGLIST__
+#define __R_TAGLIST__
+
+#include "doomtype.h"
+
+typedef INT16 mtag_t;
+#define MAXTAGS UINT16_MAX
+#define MTAG_GLOBAL -1
+
+/// Multitag list. Each taggable element will have its own taglist.
+typedef struct
+{
+ mtag_t* tags;
+ UINT16 count;
+} taglist_t;
+
+void Tag_Add (taglist_t* list, const mtag_t tag);
+void Tag_FSet (taglist_t* list, const mtag_t tag);
+mtag_t Tag_FGet (const taglist_t* list);
+boolean Tag_Find (const taglist_t* list, const mtag_t tag);
+boolean Tag_Share (const taglist_t* list1, const taglist_t* list2);
+boolean Tag_Compare (const taglist_t* list1, const taglist_t* list2);
+
+void Tag_SectorFSet (const size_t id, const mtag_t tag);
+
+/// Taggroup list. It is essentially just an element id list.
+typedef struct
+{
+ size_t *elements;
+ size_t count;
+} taggroup_t;
+
+extern bitarray_t tags_available[];
+
+extern size_t num_tags;
+
+extern taggroup_t* tags_sectors[];
+extern taggroup_t* tags_lines[];
+extern taggroup_t* tags_mapthings[];
+
+void Taggroup_Add (taggroup_t *garray[], const mtag_t tag, size_t id);
+void Taggroup_Remove (taggroup_t *garray[], const mtag_t tag, size_t id);
+size_t Taggroup_Find (const taggroup_t *group, const size_t id);
+size_t Taggroup_Count (const taggroup_t *group);
+
+INT32 Taggroup_Iterate
+( taggroup_t *garray[],
+ const size_t max_elements,
+ const mtag_t tag,
+ const size_t p);
+
+void Taglist_InitGlobalTables(void);
+
+INT32 Tag_Iterate_Sectors (const mtag_t tag, const size_t p);
+INT32 Tag_Iterate_Lines (const mtag_t tag, const size_t p);
+INT32 Tag_Iterate_Things (const mtag_t tag, const size_t p);
+
+INT32 Tag_FindLineSpecial(const INT16 special, const mtag_t tag);
+INT32 P_FindSpecialLineFromTag(INT16 special, INT16 tag, INT32 start);
+
+// Use this macro to declare an iterator position variable.
+#define TAG_ITER_DECLARECOUNTER(level) size_t ICNT_##level
+
+#define TAG_ITER(level, fn, tag, return_varname) for(ICNT_##level = 0; (return_varname = fn(tag, ICNT_##level)) >= 0; ICNT_##level++)
+
+// Use these macros as wrappers for a taglist iteration.
+#define TAG_ITER_SECTORS(level, tag, return_varname) TAG_ITER(level, Tag_Iterate_Sectors, tag, return_varname)
+#define TAG_ITER_LINES(level, tag, return_varname) TAG_ITER(level, Tag_Iterate_Lines, tag, return_varname)
+#define TAG_ITER_THINGS(level, tag, return_varname) TAG_ITER(level, Tag_Iterate_Things, tag, return_varname)
+
+/* ITERATION MACROS
+TAG_ITER_DECLARECOUNTER must be used before using the iterators.
+
+'level':
+For each nested iteration, an additional TAG_ITER_DECLARECOUNTER
+must be used with a different level number to avoid conflict with
+the outer iterations.
+Most cases don't have nested iterations and thus the level is just 0.
+
+'tag':
+Pretty much the elements' tag to iterate through.
+
+'return_varname':
+Target variable's name to return the iteration results to.
+
+
+EXAMPLE:
+{
+ TAG_ITER_DECLARECOUNTER(0);
+ TAG_ITER_DECLARECOUNTER(1); // For the nested iteration.
+
+ size_t li;
+ size_t sec;
+
+ INT32 tag1 = 4;
+
+ ...
+
+ TAG_ITER_LINES(0, tag1, li)
+ {
+ line_t *line = lines + li;
+
+ ...
+
+ if (something)
+ {
+ mtag_t tag2 = 8;
+
+ // Nested iteration; just make sure the level is higher
+ // and that it has its own counter declared in scope.
+ TAG_ITER_SECTORS(1, tag2, sec)
+ {
+ sector_t *sector = sectors + sec;
+
+ ...
+ }
+ }
+ }
+}
+
+Notes:
+If no elements are found for a given tag, the loop inside won't be executed.
+*/
+
+#endif //__R_TAGLIST__
diff --git a/src/tmap.nas b/src/tmap.nas
index 106f38e962b03fef0f0edc9e93dbd71112449ced..69282d0b471dd2c86802df544f4a346e4b96baa9 100644
--- a/src/tmap.nas
+++ b/src/tmap.nas
@@ -763,8 +763,8 @@ TX2 EQU 16
TY2 EQU 20
RASTERY_SIZEOF EQU 24
-cglobal rasterize_segment_tex
-rasterize_segment_tex:
+cglobal rasterize_segment_tex_asm
+rasterize_segment_tex_asm:
push ebp
mov ebp,esp
diff --git a/src/v_video.c b/src/v_video.c
index ecc34a54bdf6a4b0ae8dd604310c955c9db31f15..4713db0d89dda23a656f3df9ace63db9fba52902 100644
--- a/src/v_video.c
+++ b/src/v_video.c
@@ -43,45 +43,45 @@ UINT8 *screens[5];
// screens[4] = fade screen end, postimage tempoarary buffer
static CV_PossibleValue_t ticrate_cons_t[] = {{0, "No"}, {1, "Full"}, {2, "Compact"}, {0, NULL}};
-consvar_t cv_ticrate = {"showfps", "No", CV_SAVE, ticrate_cons_t, NULL, 0, NULL, NULL, 0, 0, NULL};
+consvar_t cv_ticrate = CVAR_INIT ("showfps", "No", CV_SAVE, ticrate_cons_t, NULL);
static void CV_palette_OnChange(void);
static CV_PossibleValue_t gamma_cons_t[] = {{-15, "MIN"}, {5, "MAX"}, {0, NULL}};
-consvar_t cv_globalgamma = {"gamma", "0", CV_SAVE|CV_CALL, gamma_cons_t, CV_palette_OnChange, 0, NULL, NULL, 0, 0, NULL};
+consvar_t cv_globalgamma = CVAR_INIT ("gamma", "0", CV_SAVE|CV_CALL, gamma_cons_t, CV_palette_OnChange);
static CV_PossibleValue_t saturation_cons_t[] = {{0, "MIN"}, {10, "MAX"}, {0, NULL}};
-consvar_t cv_globalsaturation = {"saturation", "10", CV_SAVE|CV_CALL, saturation_cons_t, CV_palette_OnChange, 0, NULL, NULL, 0, 0, NULL};
+consvar_t cv_globalsaturation = CVAR_INIT ("saturation", "10", CV_SAVE|CV_CALL, saturation_cons_t, CV_palette_OnChange);
#define huecoloursteps 4
static CV_PossibleValue_t hue_cons_t[] = {{0, "MIN"}, {(huecoloursteps*6)-1, "MAX"}, {0, NULL}};
-consvar_t cv_rhue = {"rhue", "0", CV_SAVE|CV_CALL, hue_cons_t, CV_palette_OnChange, 0, NULL, NULL, 0, 0, NULL};
-consvar_t cv_yhue = {"yhue", "4", CV_SAVE|CV_CALL, hue_cons_t, CV_palette_OnChange, 0, NULL, NULL, 0, 0, NULL};
-consvar_t cv_ghue = {"ghue", "8", CV_SAVE|CV_CALL, hue_cons_t, CV_palette_OnChange, 0, NULL, NULL, 0, 0, NULL};
-consvar_t cv_chue = {"chue", "12", CV_SAVE|CV_CALL, hue_cons_t, CV_palette_OnChange, 0, NULL, NULL, 0, 0, NULL};
-consvar_t cv_bhue = {"bhue", "16", CV_SAVE|CV_CALL, hue_cons_t, CV_palette_OnChange, 0, NULL, NULL, 0, 0, NULL};
-consvar_t cv_mhue = {"mhue", "20", CV_SAVE|CV_CALL, hue_cons_t, CV_palette_OnChange, 0, NULL, NULL, 0, 0, NULL};
-
-consvar_t cv_rgamma = {"rgamma", "0", CV_SAVE|CV_CALL, gamma_cons_t, CV_palette_OnChange, 0, NULL, NULL, 0, 0, NULL};
-consvar_t cv_ygamma = {"ygamma", "0", CV_SAVE|CV_CALL, gamma_cons_t, CV_palette_OnChange, 0, NULL, NULL, 0, 0, NULL};
-consvar_t cv_ggamma = {"ggamma", "0", CV_SAVE|CV_CALL, gamma_cons_t, CV_palette_OnChange, 0, NULL, NULL, 0, 0, NULL};
-consvar_t cv_cgamma = {"cgamma", "0", CV_SAVE|CV_CALL, gamma_cons_t, CV_palette_OnChange, 0, NULL, NULL, 0, 0, NULL};
-consvar_t cv_bgamma = {"bgamma", "0", CV_SAVE|CV_CALL, gamma_cons_t, CV_palette_OnChange, 0, NULL, NULL, 0, 0, NULL};
-consvar_t cv_mgamma = {"mgamma", "0", CV_SAVE|CV_CALL, gamma_cons_t, CV_palette_OnChange, 0, NULL, NULL, 0, 0, NULL};
-
-consvar_t cv_rsaturation = {"rsaturation", "10", CV_SAVE|CV_CALL, saturation_cons_t, CV_palette_OnChange, 0, NULL, NULL, 0, 0, NULL};
-consvar_t cv_ysaturation = {"ysaturation", "10", CV_SAVE|CV_CALL, saturation_cons_t, CV_palette_OnChange, 0, NULL, NULL, 0, 0, NULL};
-consvar_t cv_gsaturation = {"gsaturation", "10", CV_SAVE|CV_CALL, saturation_cons_t, CV_palette_OnChange, 0, NULL, NULL, 0, 0, NULL};
-consvar_t cv_csaturation = {"csaturation", "10", CV_SAVE|CV_CALL, saturation_cons_t, CV_palette_OnChange, 0, NULL, NULL, 0, 0, NULL};
-consvar_t cv_bsaturation = {"bsaturation", "10", CV_SAVE|CV_CALL, saturation_cons_t, CV_palette_OnChange, 0, NULL, NULL, 0, 0, NULL};
-consvar_t cv_msaturation = {"msaturation", "10", CV_SAVE|CV_CALL, saturation_cons_t, CV_palette_OnChange, 0, NULL, NULL, 0, 0, NULL};
+consvar_t cv_rhue = CVAR_INIT ("rhue", "0", CV_SAVE|CV_CALL, hue_cons_t, CV_palette_OnChange);
+consvar_t cv_yhue = CVAR_INIT ("yhue", "4", CV_SAVE|CV_CALL, hue_cons_t, CV_palette_OnChange);
+consvar_t cv_ghue = CVAR_INIT ("ghue", "8", CV_SAVE|CV_CALL, hue_cons_t, CV_palette_OnChange);
+consvar_t cv_chue = CVAR_INIT ("chue", "12", CV_SAVE|CV_CALL, hue_cons_t, CV_palette_OnChange);
+consvar_t cv_bhue = CVAR_INIT ("bhue", "16", CV_SAVE|CV_CALL, hue_cons_t, CV_palette_OnChange);
+consvar_t cv_mhue = CVAR_INIT ("mhue", "20", CV_SAVE|CV_CALL, hue_cons_t, CV_palette_OnChange);
+
+consvar_t cv_rgamma = CVAR_INIT ("rgamma", "0", CV_SAVE|CV_CALL, gamma_cons_t, CV_palette_OnChange);
+consvar_t cv_ygamma = CVAR_INIT ("ygamma", "0", CV_SAVE|CV_CALL, gamma_cons_t, CV_palette_OnChange);
+consvar_t cv_ggamma = CVAR_INIT ("ggamma", "0", CV_SAVE|CV_CALL, gamma_cons_t, CV_palette_OnChange);
+consvar_t cv_cgamma = CVAR_INIT ("cgamma", "0", CV_SAVE|CV_CALL, gamma_cons_t, CV_palette_OnChange);
+consvar_t cv_bgamma = CVAR_INIT ("bgamma", "0", CV_SAVE|CV_CALL, gamma_cons_t, CV_palette_OnChange);
+consvar_t cv_mgamma = CVAR_INIT ("mgamma", "0", CV_SAVE|CV_CALL, gamma_cons_t, CV_palette_OnChange);
+
+consvar_t cv_rsaturation = CVAR_INIT ("rsaturation", "10", CV_SAVE|CV_CALL, saturation_cons_t, CV_palette_OnChange);
+consvar_t cv_ysaturation = CVAR_INIT ("ysaturation", "10", CV_SAVE|CV_CALL, saturation_cons_t, CV_palette_OnChange);
+consvar_t cv_gsaturation = CVAR_INIT ("gsaturation", "10", CV_SAVE|CV_CALL, saturation_cons_t, CV_palette_OnChange);
+consvar_t cv_csaturation = CVAR_INIT ("csaturation", "10", CV_SAVE|CV_CALL, saturation_cons_t, CV_palette_OnChange);
+consvar_t cv_bsaturation = CVAR_INIT ("bsaturation", "10", CV_SAVE|CV_CALL, saturation_cons_t, CV_palette_OnChange);
+consvar_t cv_msaturation = CVAR_INIT ("msaturation", "10", CV_SAVE|CV_CALL, saturation_cons_t, CV_palette_OnChange);
static CV_PossibleValue_t constextsize_cons_t[] = {
{V_NOSCALEPATCH, "Small"}, {V_SMALLSCALEPATCH, "Medium"}, {V_MEDSCALEPATCH, "Large"}, {0, "Huge"},
{0, NULL}};
static void CV_constextsize_OnChange(void);
-consvar_t cv_constextsize = {"con_textsize", "Medium", CV_SAVE|CV_CALL, constextsize_cons_t, CV_constextsize_OnChange, 0, NULL, NULL, 0, 0, NULL};
+consvar_t cv_constextsize = CVAR_INIT ("con_textsize", "Medium", CV_SAVE|CV_CALL, constextsize_cons_t, CV_constextsize_OnChange);
// local copy of the palette for V_GetColor()
RGBA_t *pLocalPalette = NULL;
@@ -529,7 +529,7 @@ void V_DrawStretchyFixedPatch(fixed_t x, fixed_t y, fixed_t pscale, fixed_t vsca
//if (rendermode != render_soft && !con_startup) // Why?
if (rendermode == render_opengl)
{
- HWR_DrawStretchyFixedPatch((GLPatch_t *)patch, x, y, pscale, vscale, scrn, colormap);
+ HWR_DrawStretchyFixedPatch(patch, x, y, pscale, vscale, scrn, colormap);
return;
}
#endif
@@ -551,7 +551,7 @@ void V_DrawStretchyFixedPatch(fixed_t x, fixed_t y, fixed_t pscale, fixed_t vsca
if (alphalevel)
{
- v_translevel = transtables + ((alphalevel-1)<<FF_TRANSSHIFT);
+ v_translevel = R_GetTranslucencyTable(alphalevel);
patchdrawfunc = translucentpdraw;
}
}
@@ -599,13 +599,13 @@ void V_DrawStretchyFixedPatch(fixed_t x, fixed_t y, fixed_t pscale, fixed_t vsca
// left offset
if (scrn & V_FLIP)
- offsetx = FixedMul((SHORT(patch->width) - SHORT(patch->leftoffset))<<FRACBITS, pscale) + 1;
+ offsetx = FixedMul((patch->width - patch->leftoffset)<<FRACBITS, pscale) + 1;
else
- offsetx = FixedMul(SHORT(patch->leftoffset)<<FRACBITS, pscale);
+ offsetx = FixedMul(patch->leftoffset<<FRACBITS, pscale);
// top offset
// TODO: make some kind of vertical version of V_FLIP, maybe by deprecating V_OFFSET in future?!?
- offsety = FixedMul(SHORT(patch->topoffset)<<FRACBITS, vscale);
+ offsety = FixedMul(patch->topoffset<<FRACBITS, vscale);
if ((scrn & (V_NOSCALESTART|V_OFFSET)) == (V_NOSCALESTART|V_OFFSET)) // Multiply by dupx/dupy for crosshairs
{
@@ -712,9 +712,9 @@ void V_DrawStretchyFixedPatch(fixed_t x, fixed_t y, fixed_t pscale, fixed_t vsca
if (!(scrn & V_SCALEPATCHMASK))
{
// if it's meant to cover the whole screen, black out the rest (ONLY IF TOP LEFT ISN'T TRANSPARENT)
- if (x == 0 && SHORT(patch->width) == BASEVIDWIDTH && y == 0 && SHORT(patch->height) == BASEVIDHEIGHT)
+ if (x == 0 && patch->width == BASEVIDWIDTH && y == 0 && patch->height == BASEVIDHEIGHT)
{
- column = (const column_t *)((const UINT8 *)(patch) + LONG(patch->columnofs[0]));
+ column = (const column_t *)((const UINT8 *)(patch->columns) + (patch->columnofs[0]));
if (!column->topdelta)
{
source = (const UINT8 *)(column) + 3;
@@ -754,18 +754,18 @@ void V_DrawStretchyFixedPatch(fixed_t x, fixed_t y, fixed_t pscale, fixed_t vsca
if (pscale != FRACUNIT) // scale width properly
{
- pwidth = SHORT(patch->width)<<FRACBITS;
+ pwidth = patch->width<<FRACBITS;
pwidth = FixedMul(pwidth, pscale);
pwidth = FixedMul(pwidth, dupx<<FRACBITS);
pwidth >>= FRACBITS;
}
else
- pwidth = SHORT(patch->width) * dupx;
+ pwidth = patch->width * dupx;
deststart = desttop;
destend = desttop + pwidth;
- for (col = 0; (col>>FRACBITS) < SHORT(patch->width); col += colfrac, ++offx, desttop++)
+ for (col = 0; (col>>FRACBITS) < patch->width; col += colfrac, ++offx, desttop++)
{
INT32 topdelta, prevdelta = -1;
if (scrn & V_FLIP) // offx is measured from right edge instead of left
@@ -782,7 +782,7 @@ void V_DrawStretchyFixedPatch(fixed_t x, fixed_t y, fixed_t pscale, fixed_t vsca
if (x+offx >= vid.width) // don't draw off the right of the screen (WRAP PREVENTION)
break;
}
- column = (const column_t *)((const UINT8 *)(patch) + LONG(patch->columnofs[col>>FRACBITS]));
+ column = (const column_t *)((const UINT8 *)(patch->columns) + (patch->columnofs[col>>FRACBITS]));
while (column->topdelta != 0xff)
{
@@ -829,7 +829,7 @@ void V_DrawCroppedPatch(fixed_t x, fixed_t y, fixed_t pscale, INT32 scrn, patch_
//if (rendermode != render_soft && !con_startup) // Not this again
if (rendermode == render_opengl)
{
- HWR_DrawCroppedPatch((GLPatch_t*)patch,x,y,pscale,scrn,sx,sy,w,h);
+ HWR_DrawCroppedPatch(patch,x,y,pscale,scrn,sx,sy,w,h);
return;
}
#endif
@@ -851,7 +851,7 @@ void V_DrawCroppedPatch(fixed_t x, fixed_t y, fixed_t pscale, INT32 scrn, patch_
if (alphalevel)
{
- v_translevel = transtables + ((alphalevel-1)<<FF_TRANSSHIFT);
+ v_translevel = R_GetTranslucencyTable(alphalevel);
patchdrawfunc = translucentpdraw;
}
}
@@ -862,8 +862,8 @@ void V_DrawCroppedPatch(fixed_t x, fixed_t y, fixed_t pscale, INT32 scrn, patch_
colfrac = FixedDiv(FRACUNIT, fdup);
rowfrac = FixedDiv(FRACUNIT, fdup);
- y -= FixedMul(SHORT(patch->topoffset)<<FRACBITS, pscale);
- x -= FixedMul(SHORT(patch->leftoffset)<<FRACBITS, pscale);
+ y -= FixedMul(patch->topoffset<<FRACBITS, pscale);
+ x -= FixedMul(patch->leftoffset<<FRACBITS, pscale);
if (splitscreen && (scrn & V_PERPLAYER))
{
@@ -998,14 +998,14 @@ void V_DrawCroppedPatch(fixed_t x, fixed_t y, fixed_t pscale, INT32 scrn, patch_
desttop += (y*vid.width) + x;
}
- for (col = sx<<FRACBITS; (col>>FRACBITS) < SHORT(patch->width) && ((col>>FRACBITS) - sx) < w; col += colfrac, ++x, desttop++)
+ for (col = sx<<FRACBITS; (col>>FRACBITS) < patch->width && ((col>>FRACBITS) - sx) < w; col += colfrac, ++x, desttop++)
{
INT32 topdelta, prevdelta = -1;
if (x < 0) // don't draw off the left of the screen (WRAP PREVENTION)
continue;
if (x >= vid.width) // don't draw off the right of the screen (WRAP PREVENTION)
break;
- column = (const column_t *)((const UINT8 *)(patch) + LONG(patch->columnofs[col>>FRACBITS]));
+ column = (const column_t *)((const UINT8 *)(patch->columns) + (patch->columnofs[col>>FRACBITS]));
while (column->topdelta != 0xff)
{
@@ -1500,7 +1500,7 @@ void V_DrawFillConsoleMap(INT32 x, INT32 y, INT32 w, INT32 h, INT32 c)
// Jimita (12-04-2018)
if (alphalevel)
{
- fadetable = ((UINT8 *)transtables + ((alphalevel-1)<<FF_TRANSSHIFT) + (c*256));
+ fadetable = R_GetTranslucencyTable(alphalevel) + (c*256);
for (;(--h >= 0) && dest < deststop; dest += vid.width)
{
u = 0;
@@ -1683,7 +1683,7 @@ void V_DrawFadeFill(INT32 x, INT32 y, INT32 w, INT32 h, INT32 c, UINT16 color, U
fadetable = ((color & 0xFF00) // Color is not palette index?
? ((UINT8 *)colormaps + strength*256) // Do COLORMAP fade.
- : ((UINT8 *)transtables + ((9-strength)<<FF_TRANSSHIFT) + color*256)); // Else, do TRANSMAP** fade.
+ : ((UINT8 *)R_GetTranslucencyTable((9-strength)+1) + color*256)); // Else, do TRANSMAP** fade.
for (;(--h >= 0) && dest < deststop; dest += vid.width)
{
u = 0;
@@ -1796,7 +1796,7 @@ void V_DrawFlatFill(INT32 x, INT32 y, INT32 w, INT32 h, lumpnum_t flatnum)
void V_DrawPatchFill(patch_t *pat)
{
INT32 dupz = (vid.dupx < vid.dupy ? vid.dupx : vid.dupy);
- INT32 x, y, pw = SHORT(pat->width) * dupz, ph = SHORT(pat->height) * dupz;
+ INT32 x, y, pw = pat->width * dupz, ph = pat->height * dupz;
for (x = 0; x < vid.width; x += pw)
{
@@ -1829,7 +1829,7 @@ void V_DrawFadeScreen(UINT16 color, UINT8 strength)
? ((UINT8 *)(((color & 0x0F00) == 0x0A00) ? fadecolormap // Do fadecolormap fade.
: (((color & 0x0F00) == 0x0B00) ? fadecolormap + (256 * FADECOLORMAPROWS) // Do white fadecolormap fade.
: colormaps)) + strength*256) // Do COLORMAP fade.
- : ((UINT8 *)transtables + ((9-strength)<<FF_TRANSSHIFT) + color*256)); // Else, do TRANSMAP** fade.
+ : ((UINT8 *)R_GetTranslucencyTable((9-strength)+1) + color*256)); // Else, do TRANSMAP** fade.
const UINT8 *deststop = screens[0] + vid.rowbytes * vid.height;
UINT8 *buf = screens[0];
@@ -1984,7 +1984,7 @@ void V_DrawCharacter(INT32 x, INT32 y, INT32 c, boolean lowercaseallowed)
if (c < 0 || c >= HU_FONTSIZE || !hu_font[c])
return;
- w = SHORT(hu_font[c]->width);
+ w = hu_font[c]->width;
if (x + w > vid.width)
return;
@@ -2011,7 +2011,7 @@ void V_DrawChatCharacter(INT32 x, INT32 y, INT32 c, boolean lowercaseallowed, UI
if (c < 0 || c >= HU_FONTSIZE || !hu_font[c])
return;
- w = (vid.width < 640 ) ? (SHORT(hu_font[c]->width)/2) : (SHORT(hu_font[c]->width)); // use normal sized characters if we're using a terribly low resolution.
+ w = (vid.width < 640 ) ? ((hu_font[c]->width / 2)) : (hu_font[c]->width); // use normal sized characters if we're using a terribly low resolution.
if (x + w > vid.width)
return;
@@ -2173,10 +2173,10 @@ void V_DrawString(INT32 x, INT32 y, INT32 option, const char *string)
if (charwidth)
{
w = charwidth * dupx;
- center = w/2 - SHORT(hu_font[c]->width)*dupx/2;
+ center = w/2 - hu_font[c]->width*dupx/2;
}
else
- w = SHORT(hu_font[c]->width) * dupx;
+ w = hu_font[c]->width * dupx;
if (cx > scrwidth)
continue;
@@ -2290,10 +2290,10 @@ void V_DrawSmallString(INT32 x, INT32 y, INT32 option, const char *string)
if (charwidth)
{
w = charwidth * dupx;
- center = w/2 - SHORT(hu_font[c]->width)*dupx/4;
+ center = w/2 - hu_font[c]->width*dupx/4;
}
else
- w = SHORT(hu_font[c]->width) * dupx / 2;
+ w = hu_font[c]->width * dupx / 2;
if (cx > scrwidth)
continue;
@@ -2408,7 +2408,7 @@ void V_DrawThinString(INT32 x, INT32 y, INT32 option, const char *string)
if (charwidth)
w = charwidth * dupx;
else
- w = (SHORT(tny_font[c]->width) * dupx);
+ w = tny_font[c]->width * dupx;
if (cx > scrwidth)
continue;
@@ -2547,10 +2547,10 @@ void V_DrawStringAtFixed(fixed_t x, fixed_t y, INT32 option, const char *string)
if (charwidth)
{
w = charwidth * dupx;
- center = w/2 - SHORT(hu_font[c]->width)*(dupx/2);
+ center = w/2 - hu_font[c]->width*(dupx/2);
}
else
- w = SHORT(hu_font[c]->width) * dupx;
+ w = hu_font[c]->width * dupx;
if ((cx>>FRACBITS) > scrwidth)
continue;
@@ -2663,10 +2663,10 @@ void V_DrawSmallStringAtFixed(fixed_t x, fixed_t y, INT32 option, const char *st
if (charwidth)
{
w = charwidth * dupx;
- center = w/2 - SHORT(hu_font[c]->width)*(dupx/4);
+ center = w/2 - hu_font[c]->width*(dupx/4);
}
else
- w = SHORT(hu_font[c]->width) * dupx / 2;
+ w = hu_font[c]->width * dupx / 2;
if ((cx>>FRACBITS) > scrwidth)
break;
@@ -2780,10 +2780,10 @@ void V_DrawThinStringAtFixed(fixed_t x, fixed_t y, INT32 option, const char *str
if (charwidth)
{
w = charwidth * dupx;
- center = w/2 - SHORT(tny_font[c]->width)*(dupx/2);
+ center = w/2 - tny_font[c]->width*(dupx/2);
}
else
- w = SHORT(tny_font[c]->width) * dupx;
+ w = tny_font[c]->width * dupx;
if ((cx>>FRACBITS) > scrwidth)
break;
@@ -2897,10 +2897,10 @@ void V_DrawSmallThinStringAtFixed(fixed_t x, fixed_t y, INT32 option, const char
if (charwidth)
{
w = FixedMul(charwidth, dupx);
- center = w/2 - SHORT(tny_font[c]->width)*(dupx/4);
+ center = w/2 - tny_font[c]->width*(dupx/4);
}
else
- w = SHORT(tny_font[c]->width) * dupx / 2;
+ w = tny_font[c]->width * dupx / 2;
if (cx > scrwidth)
break;
@@ -2933,7 +2933,7 @@ void V_DrawRightAlignedSmallThinStringAtFixed(fixed_t x, fixed_t y, INT32 option
// Draws a tallnum. Replaces two functions in y_inter and st_stuff
void V_DrawTallNum(INT32 x, INT32 y, INT32 flags, INT32 num)
{
- INT32 w = SHORT(tallnum[0]->width);
+ INT32 w = tallnum[0]->width;
boolean neg;
if (flags & (V_NOSCALESTART|V_NOSCALEPATCH))
@@ -2959,7 +2959,7 @@ void V_DrawTallNum(INT32 x, INT32 y, INT32 flags, INT32 num)
// Does not handle negative numbers in a special way, don't try to feed it any.
void V_DrawPaddedTallNum(INT32 x, INT32 y, INT32 flags, INT32 num, INT32 digits)
{
- INT32 w = SHORT(tallnum[0]->width);
+ INT32 w = tallnum[0]->width;
if (flags & (V_NOSCALESTART|V_NOSCALEPATCH))
w *= vid.dupx;
@@ -3036,7 +3036,7 @@ void V_DrawCreditString(fixed_t x, fixed_t y, INT32 option, const char *string)
continue;
}
- w = SHORT(cred_font[c]->width) * dupx;
+ w = cred_font[c]->width * dupx;
if ((cx>>FRACBITS) > scrwidth)
continue;
@@ -3098,7 +3098,7 @@ static void V_DrawNameTagLine(INT32 x, INT32 y, INT32 option, fixed_t scale, UIN
continue;
}
- w = FixedMul((SHORT(ntb_font[c]->width)+2 * dupx) * FRACUNIT, scale);
+ w = FixedMul(((ntb_font[c]->width)+2 * dupx) * FRACUNIT, scale);
if (FixedInt(cx) > scrwidth)
continue;
@@ -3239,7 +3239,7 @@ INT32 V_NameTagWidth(const char *string)
if (c < 0 || c >= NT_FONTSIZE || !ntb_font[c] || !nto_font[c])
w += 4;
else
- w += SHORT(ntb_font[c]->width)+2;
+ w += (ntb_font[c]->width)+2;
}
return w;
@@ -3262,7 +3262,7 @@ INT32 V_CreditStringWidth(const char *string)
if (c < 0 || c >= CRED_FONTSIZE)
w += 16;
else
- w += SHORT(cred_font[c]->width);
+ w += cred_font[c]->width;
}
return w;
@@ -3320,7 +3320,7 @@ void V_DrawLevelTitle(INT32 x, INT32 y, INT32 option, const char *string)
continue;
}
- w = SHORT(lt_font[c]->width) * dupx;
+ w = lt_font[c]->width * dupx;
if (cx > scrwidth)
continue;
@@ -3352,7 +3352,7 @@ INT32 V_LevelNameWidth(const char *string)
if (c < 0 || c >= LT_FONTSIZE || !lt_font[c])
w += 16;
else
- w += SHORT(lt_font[c]->width);
+ w += lt_font[c]->width;
}
return w;
@@ -3371,8 +3371,8 @@ INT32 V_LevelNameHeight(const char *string)
if (c < 0 || c >= LT_FONTSIZE || !lt_font[c])
continue;
- if (SHORT(lt_font[c]->height) > w)
- w = SHORT(lt_font[c]->height);
+ if (lt_font[c]->height > w)
+ w = lt_font[c]->height;
}
return w;
@@ -3385,11 +3385,11 @@ INT16 V_LevelActNumWidth(UINT8 num)
INT16 result = 0;
if (num == 0)
- result = SHORT(ttlnum[num]->width);
+ result = ttlnum[num]->width;
while (num > 0 && num <= 99)
{
- result = result + SHORT(ttlnum[num%10]->width);
+ result = result + ttlnum[num%10]->width;
num = num/10;
}
@@ -3427,7 +3427,7 @@ INT32 V_StringWidth(const char *string, INT32 option)
if (c < 0 || c >= HU_FONTSIZE || !hu_font[c])
w += spacewidth;
else
- w += (charwidth ? charwidth : SHORT(hu_font[c]->width));
+ w += (charwidth ? charwidth : hu_font[c]->width);
}
if (option & (V_NOSCALESTART|V_NOSCALEPATCH))
@@ -3467,7 +3467,7 @@ INT32 V_SmallStringWidth(const char *string, INT32 option)
if (c < 0 || c >= HU_FONTSIZE || !hu_font[c])
w += spacewidth;
else
- w += (charwidth ? charwidth : SHORT(hu_font[c]->width)/2);
+ w += (charwidth ? charwidth : (hu_font[c]->width / 2));
}
return w;
@@ -3504,7 +3504,7 @@ INT32 V_ThinStringWidth(const char *string, INT32 option)
if (c < 0 || c >= HU_FONTSIZE || !tny_font[c])
w += spacewidth;
else
- w += (charwidth ? charwidth : SHORT(tny_font[c]->width));
+ w += (charwidth ? charwidth : tny_font[c]->width);
}
return w;
@@ -3565,7 +3565,7 @@ void V_DoPostProcessor(INT32 view, postimg_t type, INT32 param)
angle_t disStart = (leveltime * 128) & FINEMASK; // in 0 to FINEANGLE
INT32 newpix;
INT32 sine;
- //UINT8 *transme = transtables + ((tr_trans50-1)<<FF_TRANSSHIFT);
+ //UINT8 *transme = R_GetTranslucencyTable(tr_trans50);
for (y = yoffset; y < yoffset+height; y++)
{
@@ -3622,7 +3622,7 @@ Unoptimized version
INT32 x, y;
// TODO: Add a postimg_param so that we can pick the translucency level...
- UINT8 *transme = transtables + ((param-1)<<FF_TRANSSHIFT);
+ UINT8 *transme = R_GetTranslucencyTable(param);
for (y = yoffset; y < yoffset+height; y++)
{
@@ -3770,3 +3770,36 @@ void V_Init(void)
CONS_Debug(DBG_RENDER, " screens[%d] = %x\n", i, screens[i]);
#endif
}
+
+void V_Recalc(void)
+{
+ // scale 1,2,3 times in x and y the patches for the menus and overlays...
+ // calculated once and for all, used by routines in v_video.c and v_draw.c
+ vid.dupx = vid.width / BASEVIDWIDTH;
+ vid.dupy = vid.height / BASEVIDHEIGHT;
+ vid.dupx = vid.dupy = (vid.dupx < vid.dupy ? vid.dupx : vid.dupy);
+ vid.fdupx = FixedDiv(vid.width*FRACUNIT, BASEVIDWIDTH*FRACUNIT);
+ vid.fdupy = FixedDiv(vid.height*FRACUNIT, BASEVIDHEIGHT*FRACUNIT);
+
+#ifdef HWRENDER
+ //if (rendermode != render_opengl && rendermode != render_none) // This was just placing it incorrectly at non aspect correct resolutions in opengl
+ // 13/11/18:
+ // The above is no longer necessary, since we want OpenGL to be just like software now
+ // -- Monster Iestyn
+#endif
+ vid.fdupx = vid.fdupy = (vid.fdupx < vid.fdupy ? vid.fdupx : vid.fdupy);
+
+ vid.meddupx = (UINT8)(vid.dupx >> 1) + 1;
+ vid.meddupy = (UINT8)(vid.dupy >> 1) + 1;
+#ifdef HWRENDER
+ vid.fmeddupx = vid.meddupx*FRACUNIT;
+ vid.fmeddupy = vid.meddupy*FRACUNIT;
+#endif
+
+ vid.smalldupx = (UINT8)(vid.dupx / 3) + 1;
+ vid.smalldupy = (UINT8)(vid.dupy / 3) + 1;
+#ifdef HWRENDER
+ vid.fsmalldupx = vid.smalldupx*FRACUNIT;
+ vid.fsmalldupy = vid.smalldupy*FRACUNIT;
+#endif
+}
diff --git a/src/v_video.h b/src/v_video.h
index 2af4fe29313055edab8478dfcb912ca28a8435aa..8a18f82ad7ab834988e672e3f5c21189764876b6 100644
--- a/src/v_video.h
+++ b/src/v_video.h
@@ -36,6 +36,9 @@ cv_rsaturation, cv_ysaturation, cv_gsaturation, cv_csaturation, cv_bsaturation,
// Allocates buffer screens, call before R_Init.
void V_Init(void);
+// Recalculates the viddef (dupx, dupy, etc.) according to the current screen resolution.
+void V_Recalc(void);
+
// Color look-up table
#define CLUTINDEX(r, g, b) (((r) >> 3) << 11) | (((g) >> 2) << 5) | ((b) >> 3)
diff --git a/src/version.h b/src/version.h
index ece084beb2ddaed925f436d78fcfd290d94c57c5..4470fbd6eaf02397d02f890daf0412822ea70cd1 100644
--- a/src/version.h
+++ b/src/version.h
@@ -1,4 +1,4 @@
-#define SRB2VERSION "2.2.8"/* this must be the first line, for cmake !! */
+#define SRB2VERSION "2.2.9"/* this must be the first line, for cmake !! */
// The Modification ID; must be obtained from a Master Server Admin ( https://mb.srb2.org/showgroups.php ).
// DO NOT try to set this otherwise, or your modification will be unplayable through the Master Server.
@@ -9,7 +9,7 @@
// it's only for detection of the version the player is using so the MS can alert them of an update.
// Only set it higher, not lower, obviously.
// Note that we use this to help keep internal testing in check; this is why v2.2.0 is not version "1".
-#define MODVERSION 49
+#define MODVERSION 50
// Define this as a prerelease version suffix
// #define BETAVERSION "RC1"
diff --git a/src/w_wad.c b/src/w_wad.c
index 11679b8f4f797564a815efb841f00b5c91115ea3..6149aec6e756adea77cf9e0662de22042930b17a 100644
--- a/src/w_wad.c
+++ b/src/w_wad.c
@@ -57,6 +57,7 @@
#include "r_defs.h"
#include "r_data.h"
#include "r_textures.h"
+#include "r_patch.h"
#include "r_picformats.h"
#include "i_system.h"
#include "md5.h"
@@ -65,6 +66,7 @@
#include "p_setup.h" // P_ScanThings
#endif
#include "m_misc.h" // M_MapNumber
+#include "g_game.h" // G_SetGameModified
#ifdef HWRENDER
#include "hardware/hw_main.h"
@@ -682,9 +684,9 @@ static UINT16 W_InitFileError (const char *filename, boolean exitworthy)
if (exitworthy)
{
#ifdef _DEBUG
- CONS_Error("A WAD file was not found or not valid.\nCheck the log to see which ones.\n");
+ CONS_Error(va("%s was not found or not valid.\nCheck the log for more details.\n", filename));
#else
- I_Error("A WAD file was not found or not valid.\nCheck the log to see which ones.\n");
+ I_Error("%s was not found or not valid.\nCheck the log for more details.\n", filename);
#endif
}
else
@@ -715,7 +717,7 @@ UINT16 W_InitFile(const char *filename, boolean mainfile, boolean startup)
#endif
size_t packetsize;
UINT8 md5sum[16];
- boolean important;
+ int important;
if (!(refreshdirmenu & REFRESHDIR_ADDFILE))
refreshdirmenu = REFRESHDIR_NORMAL|REFRESHDIR_ADDFILE; // clean out cons_alerts that happened earlier
@@ -745,10 +747,18 @@ UINT16 W_InitFile(const char *filename, boolean mainfile, boolean startup)
if ((handle = W_OpenWadFile(&filename, true)) == NULL)
return W_InitFileError(filename, startup);
+ important = W_VerifyNMUSlumps(filename, startup);
+
+ if (important == -1)
+ {
+ fclose(handle);
+ return INT16_MAX;
+ }
+
// Check if wad files will overflow fileneededbuffer. Only the filename part
// is send in the packet; cf.
// see PutFileNeeded in d_netfil.c
- if ((important = !W_VerifyNMUSlumps(filename)))
+ if ((important = !important))
{
packetsize = packetsizetally + nameonlylength(filename) + 22;
@@ -810,6 +820,12 @@ UINT16 W_InitFile(const char *filename, boolean mainfile, boolean startup)
return W_InitFileError(filename, startup);
}
+ if (important && !mainfile)
+ {
+ //G_SetGameModified(true);
+ modifiedgame = true; // avoid savemoddata being set to false
+ }
+
//
// link wad file to search files
//
@@ -833,11 +849,6 @@ UINT16 W_InitFile(const char *filename, boolean mainfile, boolean startup)
Z_Calloc(numlumps * sizeof (*wadfile->lumpcache), PU_STATIC, &wadfile->lumpcache);
Z_Calloc(numlumps * sizeof (*wadfile->patchcache), PU_STATIC, &wadfile->patchcache);
-#ifdef HWRENDER
- // allocates GLPatch info structures and store them in a tree
- wadfile->hwrcache = M_AATreeAlloc(AATREE_ZUSER);
-#endif
-
//
// add the wadfile
//
@@ -847,10 +858,10 @@ UINT16 W_InitFile(const char *filename, boolean mainfile, boolean startup)
#ifdef HWRENDER
// Read shaders from file
- if (rendermode == render_opengl && (vid_opengl_state == 1))
+ if (rendermode == render_opengl && (vid.glstate == VID_GL_LIBRARY_LOADED))
{
- HWR_ReadShaders(numwadfiles - 1, (type == RET_PK3));
- HWR_LoadShaders();
+ HWR_LoadCustomShadersFromFile(numwadfiles - 1, (type == RET_PK3));
+ HWR_CompileShaders();
}
#endif // HWRENDER
@@ -1670,30 +1681,21 @@ void *W_CacheSoftwarePatchNumPwad(UINT16 wad, UINT16 lump, INT32 tag)
if (!lumpcache[lump])
{
size_t len = W_LumpLengthPwad(wad, lump);
- void *ptr, *lumpdata;
-#ifndef NO_PNG_LUMPS
- void *srcdata = NULL;
-#endif
-
- ptr = Z_Malloc(len, tag, &lumpcache[lump]);
- lumpdata = Z_Malloc(len, tag, NULL);
+ void *ptr, *dest, *lumpdata = Z_Malloc(len, PU_STATIC, NULL);
// read the lump in full
W_ReadLumpHeaderPwad(wad, lump, lumpdata, 0, 0);
+ ptr = lumpdata;
#ifndef NO_PNG_LUMPS
- // lump is a png so convert it
if (Picture_IsLumpPNG((UINT8 *)lumpdata, len))
- {
- size_t newlen;
- srcdata = Picture_PNGConvert((UINT8 *)lumpdata, PICFMT_PATCH, NULL, NULL, NULL, NULL, len, &newlen, 0);
- ptr = Z_Realloc(ptr, newlen, tag, &lumpcache[lump]);
- M_Memcpy(ptr, srcdata, newlen);
- Z_Free(srcdata);
- }
- else // just copy it into the patch cache
+ ptr = Picture_PNGConvert((UINT8 *)lumpdata, PICFMT_DOOMPATCH, NULL, NULL, NULL, NULL, len, &len, 0);
#endif
- M_Memcpy(ptr, lumpdata, len);
+
+ dest = Z_Calloc(sizeof(patch_t), tag, &lumpcache[lump]);
+ Patch_Create(ptr, len, dest);
+
+ Z_Free(ptr);
}
else
Z_ChangeTag(lumpcache[lump], tag);
@@ -1708,45 +1710,22 @@ void *W_CacheSoftwarePatchNum(lumpnum_t lumpnum, INT32 tag)
void *W_CachePatchNumPwad(UINT16 wad, UINT16 lump, INT32 tag)
{
-#ifdef HWRENDER
- GLPatch_t *grPatch;
-#endif
+ patch_t *patch;
if (!TestValidLump(wad, lump))
return NULL;
+ patch = W_CacheSoftwarePatchNumPwad(wad, lump, tag);
+
#ifdef HWRENDER
// Software-only compile cache the data without conversion
if (rendermode == render_soft || rendermode == render_none)
#endif
- {
- return W_CacheSoftwarePatchNumPwad(wad, lump, tag);
- }
-#ifdef HWRENDER
-
- grPatch = HWR_GetCachedGLPatchPwad(wad, lump);
-
- if (grPatch->mipmap->data)
- {
- if (tag == PU_CACHE)
- tag = PU_HWRCACHE;
- Z_ChangeTag(grPatch->mipmap->data, tag);
- }
- else
- {
- patch_t *ptr = NULL;
-
- // Only load the patch if we haven't initialised the grPatch yet
- if (grPatch->mipmap->width == 0)
- ptr = W_CacheLumpNumPwad(grPatch->wadnum, grPatch->lumpnum, PU_STATIC);
-
- // Run HWR_MakePatch in all cases, to recalculate some things
- HWR_MakePatch(ptr, grPatch, grPatch->mipmap, false);
- Z_Free(ptr);
- }
+ return (void *)patch;
- // return GLPatch_t, which can be casted to (patch_t) with valid patch header info
- return (void *)grPatch;
+#ifdef HWRENDER
+ Patch_CreateGL(patch);
+ return (void *)patch;
#endif
}
@@ -1757,11 +1736,14 @@ void *W_CachePatchNum(lumpnum_t lumpnum, INT32 tag)
void W_UnlockCachedPatch(void *patch)
{
+ if (!patch)
+ return;
+
// The hardware code does its own memory management, as its patches
// have different lifetimes from software's.
#ifdef HWRENDER
if (rendermode == render_opengl)
- HWR_UnlockCachedPatch((GLPatch_t*)patch);
+ HWR_UnlockCachedPatch((GLPatch_t *)((patch_t *)patch)->hardware);
else
#endif
Z_Unlock(patch);
@@ -1941,8 +1923,16 @@ static lumpchecklist_t folderblacklist[] =
static int
W_VerifyPK3 (FILE *fp, lumpchecklist_t *checklist, boolean status)
{
+ int verified = true;
+
zend_t zend;
zentry_t zentry;
+ zlentry_t zlentry;
+
+ long file_size;/* size of zip file */
+ long data_size;/* size of data inside zip file */
+
+ long old_position;
UINT16 numlumps;
size_t i;
@@ -1958,6 +1948,8 @@ W_VerifyPK3 (FILE *fp, lumpchecklist_t *checklist, boolean status)
// Central directory bullshit
fseek(fp, 0, SEEK_END);
+ file_size = ftell(fp);
+
if (!ResFindSignature(fp, pat_end, max(0, ftell(fp) - (22 + 65536))))
return true;
@@ -1965,6 +1957,8 @@ W_VerifyPK3 (FILE *fp, lumpchecklist_t *checklist, boolean status)
if (fread(&zend, 1, sizeof zend, fp) < sizeof zend)
return true;
+ data_size = sizeof zend;
+
numlumps = zend.entries;
fseek(fp, zend.cdiroffset, SEEK_SET);
@@ -1979,40 +1973,79 @@ W_VerifyPK3 (FILE *fp, lumpchecklist_t *checklist, boolean status)
if (memcmp(zentry.signature, pat_central, 4))
return true;
- fullname = malloc(zentry.namelen + 1);
- if (fgets(fullname, zentry.namelen + 1, fp) != fullname)
- return true;
+ if (verified == true)
+ {
+ fullname = malloc(zentry.namelen + 1);
+ if (fgets(fullname, zentry.namelen + 1, fp) != fullname)
+ return true;
- // Strip away file address and extension for the 8char name.
- if ((trimname = strrchr(fullname, '/')) != 0)
- trimname++;
- else
- trimname = fullname; // Care taken for root files.
+ // Strip away file address and extension for the 8char name.
+ if ((trimname = strrchr(fullname, '/')) != 0)
+ trimname++;
+ else
+ trimname = fullname; // Care taken for root files.
- if (*trimname) // Ignore directories, well kinda
- {
- if ((dotpos = strrchr(trimname, '.')) == 0)
- dotpos = fullname + strlen(fullname); // Watch for files without extension.
+ if (*trimname) // Ignore directories, well kinda
+ {
+ if ((dotpos = strrchr(trimname, '.')) == 0)
+ dotpos = fullname + strlen(fullname); // Watch for files without extension.
- memset(lumpname, '\0', 9); // Making sure they're initialized to 0. Is it necessary?
- strncpy(lumpname, trimname, min(8, dotpos - trimname));
+ memset(lumpname, '\0', 9); // Making sure they're initialized to 0. Is it necessary?
+ strncpy(lumpname, trimname, min(8, dotpos - trimname));
- if (! W_VerifyName(lumpname, checklist, status))
- return false;
+ if (! W_VerifyName(lumpname, checklist, status))
+ verified = false;
- // Check for directories next, if it's blacklisted it will return false
- if (W_VerifyName(fullname, folderblacklist, status))
- return false;
+ // Check for directories next, if it's blacklisted it will return false
+ else if (W_VerifyName(fullname, folderblacklist, status))
+ verified = false;
+ }
+
+ free(fullname);
+
+ // skip and ignore comments/extra fields
+ if (fseek(fp, zentry.xtralen + zentry.commlen, SEEK_CUR) != 0)
+ return true;
+ }
+ else
+ {
+ if (fseek(fp, zentry.namelen + zentry.xtralen + zentry.commlen, SEEK_CUR) != 0)
+ return true;
}
- free(fullname);
+ data_size +=
+ sizeof zentry + zentry.namelen + zentry.xtralen + zentry.commlen;
- // skip and ignore comments/extra fields
- if (fseek(fp, zentry.xtralen + zentry.commlen, SEEK_CUR) != 0)
+ old_position = ftell(fp);
+
+ if (fseek(fp, zentry.offset, SEEK_SET) != 0)
+ return true;
+
+ if (fread(&zlentry, 1, sizeof(zlentry_t), fp) < sizeof (zlentry_t))
return true;
+
+ data_size +=
+ sizeof zlentry + zlentry.namelen + zlentry.xtralen + zlentry.compsize;
+
+ fseek(fp, old_position, SEEK_SET);
}
- return true;
+ if (data_size < file_size)
+ {
+ const char * error = "ZIP file has holes (%ld extra bytes)\n";
+ CONS_Alert(CONS_ERROR, error, (file_size - data_size));
+ return -1;
+ }
+ else if (data_size > file_size)
+ {
+ const char * error = "Reported size of ZIP file contents exceeds file size (%ld extra bytes)\n";
+ CONS_Alert(CONS_ERROR, error, (data_size - file_size));
+ return -1;
+ }
+ else
+ {
+ return verified;
+ }
}
// Note: This never opens lumps themselves and therefore doesn't have to
@@ -2051,12 +2084,13 @@ static int W_VerifyFile(const char *filename, lumpchecklist_t *checklist,
* be sent.
*
* \param filename Filename of the wad to check.
+ * \param exit_on_error Whether to exit upon file error.
* \return 1 if file contains only music/sound lumps, 0 if it contains other
* stuff (maps, sprites, dehacked lumps, and so on). -1 if there no
* file exists with that filename
* \author Alam Arias
*/
-int W_VerifyNMUSlumps(const char *filename)
+int W_VerifyNMUSlumps(const char *filename, boolean exit_on_error)
{
// MIDI, MOD/S3M/IT/XM/OGG/MP3/WAV, WAVE SFX
// ENDOOM text and palette lumps
@@ -2074,18 +2108,69 @@ int W_VerifyNMUSlumps(const char *filename)
{"CLM", 3}, // Colormap changes
{"TRANS", 5}, // Translucency map changes
+ {"CONSBACK", 8}, // Console Background graphic
+
+ {"SAVE", 4}, // Save Select graphics here and below
+ {"BLACXLVL", 8},
+ {"GAMEDONE", 8},
+ {"CONT", 4}, // Continue icons on saves (probably not used anymore)
+ {"STNONEX", 7}, // "X" graphic
+ {"ULTIMATE", 8}, // Ultimate no-save
+
+ {"CRFNT", 5}, // Sonic 1 font changes
+ {"NTFNT", 5}, // Character Select font changes
+ {"NTFNO", 5}, // Character Select font (outline)
{"LTFNT", 5}, // Level title font changes
{"TTL", 3}, // Act number changes
{"STCFN", 5}, // Console font changes
{"TNYFN", 5}, // Tiny console font changes
+
+ {"STLIVE", 6}, // Life graphics, background and the "X" that shows under skin's HUDNAME
+ {"CROSHAI", 7}, // First person crosshairs
+ {"INTERSC", 7}, // Default intermission backgrounds (co-op)
{"STT", 3}, // Acceptable HUD changes (Score Time Rings)
{"YB_", 3}, // Intermission graphics, goes with the above
- {"M_", 2}, // As does menu stuff
+ {"RESULT", 6}, // Used in intermission for competitive modes, above too :3
+ {"RACE", 4}, // Race mode graphics, 321go
+ {"M_", 2}, // Menu stuff
+ {"LT", 2}, // Titlecard changes
+
+ {"SLID", 4}, // Continue
+ {"CONT", 4},
+
+ {"MINICAPS", 8}, // NiGHTS graphics here and below
+ {"BLUESTAT", 8}, // Sphere status
+ {"BYELSTAT", 8},
+ {"ORNGSTAT", 8},
+ {"REDSTAT", 7},
+ {"YELSTAT", 7},
+ {"NBRACKET", 8},
+ {"NGHTLINK", 8},
+ {"NGT", 3}, // Link numbers
+ {"NARROW", 6},
+ {"NREDAR", 6},
+ {"NSS", 3},
+ {"NBON", 4},
+ {"NRNG", 4},
+ {"NHUD", 4},
+ {"CAPS", 4},
+ {"DRILL", 5},
+ {"GRADE", 5},
+ {"MINUS5", 6},
+
{"MUSICDEF", 8}, // Song definitions (thanks kart)
+ {"SHADERS", 7}, // OpenGL shader definitions
+ {"SH_", 3}, // GLSL shader
{NULL, 0},
};
- return W_VerifyFile(filename, NMUSlist, false);
+
+ int status = W_VerifyFile(filename, NMUSlist, false);
+
+ if (status == -1)
+ W_InitFileError(filename, exit_on_error);
+
+ return status;
}
/** \brief Generates a virtual resource used for level data loading.
diff --git a/src/w_wad.h b/src/w_wad.h
index 41232cba1c5f5e006c33ed8496462c98a1ccf2f4..d0a86bcb44817b678fdda16fd426692cc222c89a 100644
--- a/src/w_wad.h
+++ b/src/w_wad.h
@@ -102,10 +102,6 @@ virtlump_t* vres_Find(const virtres_t*, const char*);
#define lumpcache_t void *
-#ifdef HWRENDER
-#include "m_aatree.h"
-#endif
-
// Resource type of the WAD. Yeah, I know this sounds dumb, but I'll leave it like this until I clean up the code further.
typedef enum restype
{
@@ -123,9 +119,6 @@ typedef struct wadfile_s
lumpinfo_t *lumpinfo;
lumpcache_t *lumpcache;
lumpcache_t *patchcache;
-#ifdef HWRENDER
- aatree_t *hwrcache; // patches are cached in renderer's native format
-#endif
UINT16 numlumps; // this wad's number of resources
FILE *handle;
UINT32 filesize; // for network
@@ -213,6 +206,6 @@ void W_UnlockCachedPatch(void *patch);
void W_VerifyFileMD5(UINT16 wadfilenum, const char *matchmd5);
-int W_VerifyNMUSlumps(const char *filename);
+int W_VerifyNMUSlumps(const char *filename, boolean exit_on_error);
#endif // __W_WAD__
diff --git a/src/win32/Srb2win-vc10.vcxproj b/src/win32/Srb2win-vc10.vcxproj
index 52617037b210f0eb913daf9a4e7eab6d1bee973f..3e8af3b0ed866b9039879abbc4b4e28b1d623ba4 100644
--- a/src/win32/Srb2win-vc10.vcxproj
+++ b/src/win32/Srb2win-vc10.vcxproj
@@ -298,6 +298,8 @@
<ExcludedFromBuild>true</ExcludedFromBuild>
</ClCompile>
<ClCompile Include="..\r_main.c" />
+ <ClCompile Include="..\r_patch.c" />
+ <ClCompile Include="..\r_patchrotation.c" />
<ClCompile Include="..\r_picformats.c" />
<ClCompile Include="..\r_plane.c" />
<ClCompile Include="..\r_portal.c" />
@@ -454,6 +456,8 @@
<ClInclude Include="..\r_draw.h" />
<ClInclude Include="..\r_local.h" />
<ClInclude Include="..\r_main.h" />
+ <ClInclude Include="..\r_patch.h" />
+ <ClInclude Include="..\r_patchrotation.h" />
<ClInclude Include="..\r_picformats.h" />
<ClInclude Include="..\r_plane.h" />
<ClInclude Include="..\r_portal.h" />
diff --git a/src/win32/Srb2win-vc10.vcxproj.filters b/src/win32/Srb2win-vc10.vcxproj.filters
index 0689a4ac0893e10c660a72ed32c9bb0c3c054c82..7279368f1423f4a02e962395e8d4b451a30e44cd 100644
--- a/src/win32/Srb2win-vc10.vcxproj.filters
+++ b/src/win32/Srb2win-vc10.vcxproj.filters
@@ -469,9 +469,18 @@
<Filter>Hw_Hardware</Filter>
</ClCompile>
<ClCompile Include="..\apng.c" />
+ <ClCompile Include="..\r_patch.c">
+ <Filter>R_Rend</Filter>
+ </ClCompile>
+ <ClCompile Include="..\r_patchrotation.c">
+ <Filter>R_Rend</Filter>
+ </ClCompile>
<ClCompile Include="..\r_picformats.c">
<Filter>R_Rend</Filter>
</ClCompile>
+ <ClCompile Include="..\r_textures.c">
+ <Filter>R_Rend</Filter>
+ </ClCompile>
<ClCompile Include="..\r_portal.c">
<Filter>R_Rend</Filter>
</ClCompile>
@@ -886,12 +895,18 @@
<Filter>Hw_Hardware</Filter>
</ClInclude>
<ClInclude Include="..\apng.h" />
- <ClInclude Include="..\r_textures.h">
+ <ClInclude Include="..\r_patch.h">
+ <Filter>R_Rend</Filter>
+ </ClInclude>
+ <ClInclude Include="..\r_patchrotation.h">
<Filter>R_Rend</Filter>
</ClInclude>
<ClInclude Include="..\r_picformats.h">
<Filter>R_Rend</Filter>
</ClInclude>
+ <ClInclude Include="..\r_textures.h">
+ <Filter>R_Rend</Filter>
+ </ClInclude>
<ClInclude Include="..\r_portal.h">
<Filter>R_Rend</Filter>
</ClInclude>
diff --git a/src/win32/Srb2win.rc b/src/win32/Srb2win.rc
index 5ba366bda313870f4b815b95756cb4aca073da16..b0eb2532e36d95677d36ca544bc869addd3a259a 100644
--- a/src/win32/Srb2win.rc
+++ b/src/win32/Srb2win.rc
@@ -22,6 +22,16 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
#pragma code_page(1252)
#endif //_WIN32*/
+#ifndef RT_MANIFEST
+#define RT_MANIFEST 24
+#endif
+
+#ifndef CREATEPROCESS_MANIFEST_RESOURCE_ID
+#define CREATEPROCESS_MANIFEST_RESOURCE_ID 1
+#endif
+
+CREATEPROCESS_MANIFEST_RESOURCE_ID RT_MANIFEST srb2win.exe.manifest
+
/////////////////////////////////////////////////////////////////////////////
//
// Icon
@@ -66,8 +76,8 @@ END
#include "../doomdef.h" // Needed for version string
VS_VERSION_INFO VERSIONINFO
- FILEVERSION 2,2,8,0
- PRODUCTVERSION 2,2,8,0
+ FILEVERSION 2,2,9,0
+ PRODUCTVERSION 2,2,9,0
FILEFLAGSMASK 0x3fL
#ifdef _DEBUG
FILEFLAGS 0x1L
diff --git a/src/win32/srb2win.exe.manifest b/src/win32/srb2win.exe.manifest
new file mode 100644
index 0000000000000000000000000000000000000000..d3b8355cbdea8194f1d94b8dd70c13509e8511ef
--- /dev/null
+++ b/src/win32/srb2win.exe.manifest
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0">
+ <trustInfo xmlns="urn:schemas-microsoft-com:asm.v3">
+ <security>
+ <requestedPrivileges>
+ <requestedExecutionLevel level="asInvoker"/>
+ </requestedPrivileges>
+ </security>
+ </trustInfo>
+ <compatibility xmlns="urn:schemas-microsoft-com:compatibility.v1">
+ <application>
+ <!--The ID below indicates application support for Windows Vista -->
+ <supportedOS Id="{e2011457-1546-43c5-a5fe-008deee3d3f0}"/>
+ <!--The ID below indicates application support for Windows 7 -->
+ <supportedOS Id="{35138b9a-5d96-4fbd-8e2d-a2440225f93a}"/>
+ <!--The ID below indicates application support for Windows 8 -->
+ <supportedOS Id="{4a2f28e3-53b9-4441-ba9c-d69d4a4a6e38}"/>
+ <!--The ID below indicates application support for Windows 8.1 -->
+ <supportedOS Id="{1f676c76-80e1-4239-95bb-83d0f6d0da78}"/>
+ </application>
+ </compatibility>
+</assembly>
diff --git a/src/win32/win_cd.c b/src/win32/win_cd.c
index 2586b84405649d431e673d1f7c8e4bb3a4d27a9c..324c2492848a4a78e9f1c22542cc6180533a59ab 100644
--- a/src/win32/win_cd.c
+++ b/src/win32/win_cd.c
@@ -161,13 +161,13 @@ static BOOL wasPlaying;
//static INT cdVolume = 0; // current cd volume (0-31)
// 0-31 like Music & Sfx, though CD hardware volume is 0-255.
-consvar_t cd_volume = {"cd_volume","18",CV_SAVE,soundvolume_cons_t, NULL, 0, NULL, NULL, 0, 0, NULL};
+consvar_t cd_volume = CVAR_INIT ("cd_volume","18",CV_SAVE,soundvolume_cons_t, NULL);
// allow Update for next/loop track
// some crap cd drivers take up to
// a second for a simple 'busy' check..
// (on those Update can be disabled)
-consvar_t cdUpdate = {"cd_update","1",CV_SAVE, NULL, NULL, 0, NULL, NULL, 0, 0, NULL};
+consvar_t cdUpdate = CVAR_INIT ("cd_update","1",CV_SAVE, NULL, NULL);
#if (__GNUC__ > 6)
#pragma GCC diagnostic push
diff --git a/src/win32/win_dll.c b/src/win32/win_dll.c
index fa648a89c77d2f889799b5b31ebbba7507c1cf0b..4743cec34b2e6af738caeec60d7c179e58ec14d1 100644
--- a/src/win32/win_dll.c
+++ b/src/win32/win_dll.c
@@ -107,6 +107,7 @@ static loadfunc_t hwdFuncTable[] = {
{"ClearBuffer@12", &hwdriver.pfnClearBuffer},
{"SetTexture@4", &hwdriver.pfnSetTexture},
{"UpdateTexture@4", &hwdriver.pfnUpdateTexture},
+ {"DeleteTexture@4", &hwdriver.pfnDeleteTexture},
{"ReadRect@24", &hwdriver.pfnReadRect},
{"GClipRect@20", &hwdriver.pfnGClipRect},
{"ClearMipMapCache@0", &hwdriver.pfnClearMipMapCache},
@@ -139,6 +140,7 @@ static loadfunc_t hwdFuncTable[] = {
{"ClearBuffer", &hwdriver.pfnClearBuffer},
{"SetTexture", &hwdriver.pfnSetTexture},
{"UpdateTexture", &hwdriver.pfnUpdateTexture},
+ {"DeleteTexture", &hwdriver.pfnDeleteTexture},
{"ReadRect", &hwdriver.pfnReadRect},
{"GClipRect", &hwdriver.pfnGClipRect},
{"ClearMipMapCache", &hwdriver.pfnClearMipMapCache},
diff --git a/src/win32/win_sys.c b/src/win32/win_sys.c
index a374a2587b0b9d9c01786aa9696a4d58f34b2980..da0d5b47ee3c26699b4d538575a22b8dc7420218 100644
--- a/src/win32/win_sys.c
+++ b/src/win32/win_sys.c
@@ -3658,7 +3658,7 @@ const CPUInfoFlags *I_CPUInfo(void)
}
static void CPUAffinity_OnChange(void);
-static consvar_t cv_cpuaffinity = {"cpuaffinity", "-1", CV_CALL, NULL, CPUAffinity_OnChange, 0, NULL, NULL, 0, 0, NULL};
+static consvar_t cv_cpuaffinity = CVAR_INIT ("cpuaffinity", "-1", CV_CALL, NULL, CPUAffinity_OnChange);
typedef HANDLE (WINAPI *p_GetCurrentProcess) (VOID);
static p_GetCurrentProcess pfnGetCurrentProcess = NULL;
diff --git a/src/win32/win_vid.c b/src/win32/win_vid.c
index 716f380890f965d420d2121a3e84bfbe6ff9e665..7a33e19311f876fe595b72f7552fcf55f0af23fd 100644
--- a/src/win32/win_vid.c
+++ b/src/win32/win_vid.c
@@ -48,15 +48,15 @@
// this is the CURRENT rendermode!! very important: used by w_wad, and much other code
rendermode_t rendermode = render_soft;
+rendermode_t chosenrendermode = render_none; // set by command line arguments
static void OnTop_OnChange(void);
// synchronize page flipping with screen refresh
static CV_PossibleValue_t CV_NeverOnOff[] = {{-1, "Never"}, {0, "Off"}, {1, "On"}, {0, NULL}};
-consvar_t cv_vidwait = {"vid_wait", "On", CV_SAVE, CV_OnOff, OnTop_OnChange, 0, NULL, NULL, 0, 0, NULL};
-static consvar_t cv_stretch = {"stretch", "On", CV_SAVE|CV_NOSHOWHELP, CV_OnOff, NULL, 0, NULL, NULL, 0, 0, NULL};
-static consvar_t cv_ontop = {"ontop", "Never", 0, CV_NeverOnOff, NULL, 0, NULL, NULL, 0, 0, NULL};
+consvar_t cv_vidwait = CVAR_INIT ("vid_wait", "On", CV_SAVE, CV_OnOff, OnTop_OnChange);
+static consvar_t cv_stretch = CVAR_INIT ("stretch", "On", CV_SAVE|CV_NOSHOWHELP, CV_OnOff, NULL);
+static consvar_t cv_ontop = CVAR_INIT ("ontop", "Never", 0, CV_NeverOnOff, NULL);
boolean highcolor;
-int vid_opengl_state = 0;
static BOOL bDIBMode; // means we are using DIB instead of DirectDraw surfaces
static LPBITMAPINFO bmiMain = NULL;
@@ -952,7 +952,11 @@ INT32 VID_SetMode(INT32 modenum)
return 1;
}
-void VID_CheckRenderer(void) {}
+boolean VID_CheckRenderer(void)
+{
+ return false;
+}
+
void VID_CheckGLLoaded(rendermode_t oldrender)
{
(void)oldrender;
diff --git a/src/y_inter.c b/src/y_inter.c
index d263bf6357c186e30c4d44612ec16c27ddb2d03c..4354a1677e706b293a3370382f1bf8fbf6c1c19f 100644
--- a/src/y_inter.c
+++ b/src/y_inter.c
@@ -152,7 +152,6 @@ typedef struct
boolean usebuffer = false;
static boolean useinterpic;
-static boolean safetorender = true;
static y_buffer_t *y_buffer;
static INT32 intertic;
@@ -169,7 +168,6 @@ static void Y_CalculateCompetitionWinners(void);
static void Y_CalculateTimeRaceWinners(void);
static void Y_CalculateMatchWinners(void);
static void Y_UnloadData(void);
-static void Y_CleanupData(void);
// Stuff copy+pasted from st_stuff.c
#define ST_DrawNumFromHud(h,n) V_DrawTallNum(hudinfo[h].x, hudinfo[h].y, hudinfo[h].f, n)
@@ -185,7 +183,7 @@ static void Y_IntermissionTokenDrawer(void)
offs = 0;
lowy = BASEVIDHEIGHT - 32 - 8;
- temp = SHORT(tokenicon->height)/2;
+ temp = tokenicon->height / 2;
em = 0;
while (emeralds & (1 << em))
@@ -214,7 +212,90 @@ static void Y_IntermissionTokenDrawer(void)
calc = (lowy - y)*2;
if (calc > 0)
- V_DrawCroppedPatch(32<<FRACBITS, y<<FRACBITS, FRACUNIT/2, 0, tokenicon, 0, 0, SHORT(tokenicon->width), calc);
+ V_DrawCroppedPatch(32<<FRACBITS, y<<FRACBITS, FRACUNIT/2, 0, tokenicon, 0, 0, tokenicon->width, calc);
+}
+
+
+//
+// Y_LoadIntermissionData
+//
+// Load patches for drawing the intermission, if acceptable
+//
+void Y_LoadIntermissionData(void)
+{
+ INT32 i;
+
+ if (dedicated)
+ return;
+
+ switch (intertype)
+ {
+ case int_coop:
+ {
+ for (i = 0; i < 4; ++i)
+ {
+ if (strlen(data.coop.bonuses[i].patch))
+ data.coop.bonuspatches[i] = W_CachePatchName(data.coop.bonuses[i].patch, PU_PATCH);
+ }
+ data.coop.ptotal = W_CachePatchName("YB_TOTAL", PU_PATCH);
+
+ // get background patches
+ bgpatch = W_CachePatchName("INTERSCR", PU_PATCH);
+
+ // grab an interscreen if appropriate
+ if (mapheaderinfo[gamemap-1]->interscreen[0] != '#')
+ interpic = W_CachePatchName(mapheaderinfo[gamemap-1]->interscreen, PU_PATCH);
+ break;
+ }
+ case int_spec:
+ {
+ for (i = 0; i < 2; ++i)
+ data.spec.bonuspatches[i] = W_CachePatchName(data.spec.bonuses[i].patch, PU_PATCH);
+
+ data.spec.pscore = W_CachePatchName("YB_SCORE", PU_PATCH);
+ data.spec.pcontinues = W_CachePatchName("YB_CONTI", PU_PATCH);
+
+ // get background tile
+ bgtile = W_CachePatchName("SPECTILE", PU_PATCH);
+
+ // grab an interscreen if appropriate
+ if (mapheaderinfo[gamemap-1]->interscreen[0] != '#')
+ interpic = W_CachePatchName(mapheaderinfo[gamemap-1]->interscreen, PU_PATCH);
+ break;
+ }
+ case int_ctf:
+ case int_teammatch:
+ {
+ if (!rflagico) //prevent a crash if we haven't cached our team graphics yet
+ {
+ rflagico = W_CachePatchName("RFLAGICO", PU_HUDGFX);
+ bflagico = W_CachePatchName("BFLAGICO", PU_HUDGFX);
+ rmatcico = W_CachePatchName("RMATCICO", PU_HUDGFX);
+ bmatcico = W_CachePatchName("BMATCICO", PU_HUDGFX);
+ }
+
+ data.match.redflag = (intertype == int_ctf) ? rflagico : rmatcico;
+ data.match.blueflag = (intertype == int_ctf) ? bflagico : bmatcico;
+ }
+ /* FALLTHRU */
+ case int_match:
+ case int_race:
+ case int_comp:
+ {
+ if (intertype == int_match || intertype == int_race)
+ {
+ // get RESULT header
+ data.match.result = W_CachePatchName("RESULT", PU_PATCH);
+ }
+
+ // get background tile
+ bgtile = W_CachePatchName("SRB2BACK", PU_PATCH);
+ break;
+ }
+ case int_none:
+ default:
+ break;
+ }
}
//
@@ -316,19 +397,6 @@ void Y_IntermissionDrawer(void)
if (intertype == int_none || rendermode == render_none)
return;
- // Lactozilla: Renderer switching
- if (needpatchrecache)
- {
- Y_CleanupData();
- safetorender = false;
- }
-
- if (!safetorender)
- V_DrawFill(0, 0, BASEVIDWIDTH, BASEVIDHEIGHT, 31);
-
- if (!safetorender)
- goto dontdrawbg;
-
if (useinterpic)
V_DrawScaledPatch(0, 0, 0, interpic);
else if (!usetile)
@@ -366,7 +434,6 @@ void Y_IntermissionDrawer(void)
if (!LUA_HudEnabled(hud_intermissiontally))
goto skiptallydrawer;
-dontdrawbg:
if (intertype == int_coop)
{
INT32 bonusy;
@@ -416,22 +483,19 @@ dontdrawbg:
bonusy = 150;
// Total
- if (safetorender)
- {
- V_DrawScaledPatch(152, bonusy, 0, data.coop.ptotal);
- V_DrawTallNum(BASEVIDWIDTH - 68, bonusy + 1, 0, data.coop.total);
- }
- bonusy -= (3*SHORT(tallnum[0]->height)/2) + 1;
+ V_DrawScaledPatch(152, bonusy, 0, data.coop.ptotal);
+ V_DrawTallNum(BASEVIDWIDTH - 68, bonusy + 1, 0, data.coop.total);
+ bonusy -= (3*(tallnum[0]->height)/2) + 1;
// Draw bonuses
for (i = 3; i >= 0; --i)
{
- if (data.coop.bonuses[i].display && safetorender)
+ if (data.coop.bonuses[i].display)
{
V_DrawScaledPatch(152, bonusy, 0, data.coop.bonuspatches[i]);
V_DrawTallNum(BASEVIDWIDTH - 68, bonusy + 1, 0, data.coop.bonuses[i].points);
}
- bonusy -= (3*SHORT(tallnum[0]->height)/2) + 1;
+ bonusy -= (3*(tallnum[0]->height)/2) + 1;
}
}
else if (intertype == int_spec)
@@ -655,8 +719,7 @@ dontdrawbg:
char strtime[10];
// draw the header
- if (safetorender)
- V_DrawScaledPatch(112, 2, 0, data.match.result);
+ V_DrawScaledPatch(112, 2, 0, data.match.result);
// draw the level name
V_DrawCenteredString(BASEVIDWIDTH/2, 20, 0, data.match.levelstring);
@@ -769,10 +832,10 @@ dontdrawbg:
char name[MAXPLAYERNAME+1];
// Show the team flags and the team score at the top instead of "RESULTS"
- V_DrawSmallScaledPatch(128 - SHORT(data.match.blueflag->width)/4, 2, 0, data.match.blueflag);
+ V_DrawSmallScaledPatch(128 - (data.match.blueflag->width / 4), 2, 0, data.match.blueflag);
V_DrawCenteredString(128, 16, 0, va("%u", bluescore));
- V_DrawSmallScaledPatch(192 - SHORT(data.match.redflag->width)/4, 2, 0, data.match.redflag);
+ V_DrawSmallScaledPatch(192 - (data.match.redflag->width / 4), 2, 0, data.match.redflag);
V_DrawCenteredString(192, 16, 0, va("%u", redscore));
// draw the level name
@@ -1201,10 +1264,9 @@ void Y_DetermineIntermissionType(void)
//
// Called by G_DoCompleted. Sets up data for intermission drawer/ticker.
//
+//
void Y_StartIntermission(void)
{
- INT32 i;
-
intertic = -1;
#ifdef PARANOIA
@@ -1212,8 +1274,6 @@ void Y_StartIntermission(void)
I_Error("endtic is dirty");
#endif
- safetorender = true;
-
if (!multiplayer)
{
timer = 0;
@@ -1250,20 +1310,12 @@ void Y_StartIntermission(void)
// setup time data
data.coop.tics = players[consoleplayer].realtime;
- for (i = 0; i < 4; ++i)
- data.coop.bonuspatches[i] = W_CachePatchName(data.coop.bonuses[i].patch, PU_PATCH);
- data.coop.ptotal = W_CachePatchName("YB_TOTAL", PU_PATCH);
-
// get act number
data.coop.actnum = mapheaderinfo[gamemap-1]->actnum;
- // get background patches
- bgpatch = W_CachePatchName("INTERSCR", PU_PATCH);
-
// grab an interscreen if appropriate
if (mapheaderinfo[gamemap-1]->interscreen[0] != '#')
{
- interpic = W_CachePatchName(mapheaderinfo[gamemap-1]->interscreen, PU_PATCH);
useinterpic = true;
usebuffer = false;
}
@@ -1320,21 +1372,9 @@ void Y_StartIntermission(void)
// give out ring bonuses
Y_AwardSpecialStageBonus();
- for (i = 0; i < 2; ++i)
- data.spec.bonuspatches[i] = W_CachePatchName(data.spec.bonuses[i].patch, PU_PATCH);
-
- data.spec.pscore = W_CachePatchName("YB_SCORE", PU_PATCH);
- data.spec.pcontinues = W_CachePatchName("YB_CONTI", PU_PATCH);
-
- // get background tile
- bgtile = W_CachePatchName("SPECTILE", PU_PATCH);
-
// grab an interscreen if appropriate
if (mapheaderinfo[gamemap-1]->interscreen[0] != '#')
- {
- interpic = W_CachePatchName(mapheaderinfo[gamemap-1]->interscreen, PU_PATCH);
useinterpic = true;
- }
else
useinterpic = false;
@@ -1427,11 +1467,6 @@ void Y_StartIntermission(void)
data.match.levelstring[sizeof data.match.levelstring - 1] = '\0';
- // get RESULT header
- data.match.result =
- W_CachePatchName("RESULT", PU_PATCH);
-
- bgtile = W_CachePatchName("SRB2BACK", PU_PATCH);
usetile = true;
useinterpic = false;
break;
@@ -1456,10 +1491,6 @@ void Y_StartIntermission(void)
data.match.levelstring[sizeof data.match.levelstring - 1] = '\0';
- // get RESULT header
- data.match.result = W_CachePatchName("RESULT", PU_PATCH);
-
- bgtile = W_CachePatchName("SRB2BACK", PU_PATCH);
usetile = true;
useinterpic = false;
break;
@@ -1485,18 +1516,6 @@ void Y_StartIntermission(void)
data.match.levelstring[sizeof data.match.levelstring - 1] = '\0';
- if (intertype == int_ctf)
- {
- data.match.redflag = rflagico;
- data.match.blueflag = bflagico;
- }
- else // team match
- {
- data.match.redflag = rmatcico;
- data.match.blueflag = bmatcico;
- }
-
- bgtile = W_CachePatchName("SRB2BACK", PU_PATCH);
usetile = true;
useinterpic = false;
break;
@@ -1521,8 +1540,6 @@ void Y_StartIntermission(void)
data.competition.levelstring[sizeof data.competition.levelstring - 1] = '\0';
- // get background tile
- bgtile = W_CachePatchName("SRB2BACK", PU_PATCH);
usetile = true;
useinterpic = false;
break;
@@ -1755,7 +1772,6 @@ static void Y_SetNullBonus(player_t *player, y_bonus_t *bstruct)
{
(void)player;
memset(bstruct, 0, sizeof(y_bonus_t));
- strncpy(bstruct->patch, "MISSING", sizeof(bstruct->patch));
}
//
@@ -2053,26 +2069,21 @@ static void Y_AwardSpecialStageBonus(void)
//
void Y_EndIntermission(void)
{
- Y_UnloadData();
+ if (!dedicated)
+ Y_UnloadData();
endtic = -1;
intertype = int_none;
usebuffer = false;
}
-#define UNLOAD(x) if (x) {Z_ChangeTag(x, PU_CACHE);} x = NULL;
-#define CLEANUP(x) x = NULL;
+#define UNLOAD(x) if (x) {Patch_Free(x);} x = NULL;
//
// Y_UnloadData
//
static void Y_UnloadData(void)
{
- // In hardware mode, don't Z_ChangeTag a pointer returned by W_CachePatchName().
- // It doesn't work and is unnecessary.
- if (rendermode != render_soft)
- return;
-
// unload the background patches
UNLOAD(bgpatch);
UNLOAD(bgtile);
@@ -2112,45 +2123,3 @@ static void Y_UnloadData(void)
break;
}
}
-
-static void Y_CleanupData(void)
-{
- // unload the background patches
- CLEANUP(bgpatch);
- CLEANUP(bgtile);
- CLEANUP(interpic);
-
- switch (intertype)
- {
- case int_coop:
- // unload the coop and single player patches
- CLEANUP(data.coop.bonuspatches[3]);
- CLEANUP(data.coop.bonuspatches[2]);
- CLEANUP(data.coop.bonuspatches[1]);
- CLEANUP(data.coop.bonuspatches[0]);
- CLEANUP(data.coop.ptotal);
- break;
- case int_spec:
- // unload the special stage patches
- //CLEANUP(data.spec.cemerald);
- //CLEANUP(data.spec.nowsuper);
- CLEANUP(data.spec.bonuspatches[1]);
- CLEANUP(data.spec.bonuspatches[0]);
- CLEANUP(data.spec.pscore);
- CLEANUP(data.spec.pcontinues);
- break;
- case int_match:
- case int_race:
- CLEANUP(data.match.result);
- break;
- case int_ctf:
- CLEANUP(data.match.blueflag);
- CLEANUP(data.match.redflag);
- break;
- default:
- //without this default,
- //int_none, int_tag, int_chaos, and int_classicrace
- //are not handled
- break;
- }
-}
diff --git a/src/y_inter.h b/src/y_inter.h
index 859144b1d4ad71f7a98a797327537a213e0970b2..7268b1a473f14764701cd3a13a91f459447e6bf6 100644
--- a/src/y_inter.h
+++ b/src/y_inter.h
@@ -14,6 +14,7 @@ extern boolean usebuffer;
void Y_IntermissionDrawer(void);
void Y_Ticker(void);
+void Y_LoadIntermissionData(void);
void Y_StartIntermission(void);
void Y_EndIntermission(void);
diff --git a/src/z_zone.c b/src/z_zone.c
index 2c7384c3da22fead194f365dc8fea0a4768949b9..d7da17e51d1608cf068a0c929bbdbd982d3a935c 100644
--- a/src/z_zone.c
+++ b/src/z_zone.c
@@ -27,6 +27,7 @@
#include "doomdef.h"
#include "doomstat.h"
+#include "r_patch.h"
#include "r_picformats.h"
#include "i_system.h" // I_GetFreeMem
#include "i_video.h" // rendermode
@@ -495,36 +496,37 @@ void Z_FreeTags(INT32 lowtag, INT32 hightag)
}
}
-// -----------------
-// Utility functions
-// -----------------
+/** Iterates through all memory for a given set of tags.
+ *
+ * \param lowtag The lowest tag to consider.
+ * \param hightag The highest tag to consider.
+ * \param iterfunc The iterator function.
+ */
+void Z_IterateTags(INT32 lowtag, INT32 hightag, boolean (*iterfunc)(void *))
+{
+ memblock_t *block, *next;
-// for renderer switching
-boolean needpatchflush = false;
-boolean needpatchrecache = false;
+ if (!iterfunc)
+ I_Error("Z_IterateTags: no iterator function was given");
-// flush all patches from memory
-void Z_FlushCachedPatches(void)
-{
- CONS_Debug(DBG_RENDER, "Z_FlushCachedPatches()...\n");
- Z_FreeTag(PU_PATCH);
- Z_FreeTag(PU_HUDGFX);
- Z_FreeTag(PU_HWRPATCHINFO);
- Z_FreeTag(PU_HWRMODELTEXTURE);
- Z_FreeTag(PU_HWRCACHE);
- Z_FreeTag(PU_HWRCACHE_UNLOCKED);
- Z_FreeTag(PU_HWRPATCHINFO_UNLOCKED);
- Z_FreeTag(PU_HWRMODELTEXTURE_UNLOCKED);
-}
+ for (block = head.next; block != &head; block = next)
+ {
+ next = block->next; // get link before possibly freeing
-void Z_PreparePatchFlush(void)
-{
- CONS_Debug(DBG_RENDER, "Z_PreparePatchFlush()...\n");
-#ifdef ROTSPRITE
- R_FreeAllRotSprite();
-#endif
+ if (block->tag >= lowtag && block->tag <= hightag)
+ {
+ void *mem = (UINT8 *)block->hdr + sizeof *block->hdr;
+ boolean free = iterfunc(mem);
+ if (free)
+ Z_Free(mem);
+ }
+ }
}
+// -----------------
+// Utility functions
+// -----------------
+
// starting value of nextcleanup
#define CLEANUPCOUNT 2000
@@ -793,25 +795,30 @@ static void Command_Memfree_f(void)
Z_CheckHeap(-1);
CONS_Printf("\x82%s", M_GetText("Memory Info\n"));
- CONS_Printf(M_GetText("Total heap used : %7s KB\n"), sizeu1(Z_TotalUsage()>>10));
- CONS_Printf(M_GetText("Static : %7s KB\n"), sizeu1(Z_TagUsage(PU_STATIC)>>10));
- CONS_Printf(M_GetText("Static (sound) : %7s KB\n"), sizeu1(Z_TagUsage(PU_SOUND)>>10));
- CONS_Printf(M_GetText("Static (music) : %7s KB\n"), sizeu1(Z_TagUsage(PU_MUSIC)>>10));
- CONS_Printf(M_GetText("Locked cache : %7s KB\n"), sizeu1(Z_TagUsage(PU_CACHE)>>10));
- CONS_Printf(M_GetText("Level : %7s KB\n"), sizeu1(Z_TagUsage(PU_LEVEL)>>10));
- CONS_Printf(M_GetText("Special thinker : %7s KB\n"), sizeu1(Z_TagUsage(PU_LEVSPEC)>>10));
- CONS_Printf(M_GetText("All purgable : %7s KB\n"),
+ CONS_Printf(M_GetText("Total heap used : %7s KB\n"), sizeu1(Z_TotalUsage()>>10));
+ CONS_Printf(M_GetText("Static : %7s KB\n"), sizeu1(Z_TagUsage(PU_STATIC)>>10));
+ CONS_Printf(M_GetText("Static (sound) : %7s KB\n"), sizeu1(Z_TagUsage(PU_SOUND)>>10));
+ CONS_Printf(M_GetText("Static (music) : %7s KB\n"), sizeu1(Z_TagUsage(PU_MUSIC)>>10));
+ CONS_Printf(M_GetText("Patches : %7s KB\n"), sizeu1(Z_TagUsage(PU_PATCH)>>10));
+ CONS_Printf(M_GetText("Patches (low priority) : %7s KB\n"), sizeu1(Z_TagUsage(PU_PATCH_LOWPRIORITY)>>10));
+ CONS_Printf(M_GetText("Patches (rotated) : %7s KB\n"), sizeu1(Z_TagUsage(PU_PATCH_ROTATED)>>10));
+ CONS_Printf(M_GetText("Sprites : %7s KB\n"), sizeu1(Z_TagUsage(PU_SPRITE)>>10));
+ CONS_Printf(M_GetText("HUD graphics : %7s KB\n"), sizeu1(Z_TagUsage(PU_HUDGFX)>>10));
+ CONS_Printf(M_GetText("Locked cache : %7s KB\n"), sizeu1(Z_TagUsage(PU_CACHE)>>10));
+ CONS_Printf(M_GetText("Level : %7s KB\n"), sizeu1(Z_TagUsage(PU_LEVEL)>>10));
+ CONS_Printf(M_GetText("Special thinker : %7s KB\n"), sizeu1(Z_TagUsage(PU_LEVSPEC)>>10));
+ CONS_Printf(M_GetText("All purgable : %7s KB\n"),
sizeu1(Z_TagsUsage(PU_PURGELEVEL, INT32_MAX)>>10));
#ifdef HWRENDER
if (rendermode == render_opengl)
{
- CONS_Printf(M_GetText("Patch info headers: %7s KB\n"), sizeu1(Z_TagUsage(PU_HWRPATCHINFO)>>10));
- CONS_Printf(M_GetText("Mipmap patches : %7s KB\n"), sizeu1(Z_TagUsage(PU_HWRPATCHCOLMIPMAP)>>10));
- CONS_Printf(M_GetText("HW Texture cache : %7s KB\n"), sizeu1(Z_TagUsage(PU_HWRCACHE)>>10));
- CONS_Printf(M_GetText("Plane polygons : %7s KB\n"), sizeu1(Z_TagUsage(PU_HWRPLANE)>>10));
- CONS_Printf(M_GetText("HW model textures : %7s KB\n"), sizeu1(Z_TagUsage(PU_HWRMODELTEXTURE)>>10));
- CONS_Printf(M_GetText("HW Texture used : %7d KB\n"), HWR_GetTextureUsed()>>10);
+ CONS_Printf(M_GetText("Patch info headers : %7s KB\n"), sizeu1(Z_TagUsage(PU_HWRPATCHINFO)>>10));
+ CONS_Printf(M_GetText("Cached textures : %7s KB\n"), sizeu1(Z_TagUsage(PU_HWRCACHE)>>10));
+ CONS_Printf(M_GetText("Texture colormaps : %7s KB\n"), sizeu1(Z_TagUsage(PU_HWRPATCHCOLMIPMAP)>>10));
+ CONS_Printf(M_GetText("Model textures : %7s KB\n"), sizeu1(Z_TagUsage(PU_HWRMODELTEXTURE)>>10));
+ CONS_Printf(M_GetText("Plane polygons : %7s KB\n"), sizeu1(Z_TagUsage(PU_HWRPLANE)>>10));
+ CONS_Printf(M_GetText("All GPU textures : %7d KB\n"), HWR_GetTextureUsed()>>10);
}
#endif
diff --git a/src/z_zone.h b/src/z_zone.h
index 5cbcc6655bc24eb2208627f4cf57e31b48c88a1a..7b58be8f3fce52c01642e20bee0de00c1795bece 100644
--- a/src/z_zone.h
+++ b/src/z_zone.h
@@ -42,8 +42,13 @@ enum
PU_SOUND = 11, // static while playing
PU_MUSIC = 12, // static while playing
- PU_HUDGFX = 13, // static until WAD added
- PU_PATCH = 14, // static until renderer change
+
+ PU_PATCH = 14, // static entire execution time
+ PU_PATCH_LOWPRIORITY = 15, // lower priority patch, static until level exited
+ PU_PATCH_ROTATED = 16, // rotated patch, static until level exited or WAD added
+ PU_PATCH_DATA = 17, // patch data, lifetime depends on the patch that owns it
+ PU_SPRITE = 18, // sprite patch, static until WAD added
+ PU_HUDGFX = 19, // HUD patch, static until WAD added
PU_HWRPATCHINFO = 21, // Hardware GLPatch_t struct for OpenGL texture cache
PU_HWRPATCHCOLMIPMAP = 22, // Hardware GLMipmap_t struct colormap variation of patch
@@ -63,8 +68,7 @@ enum
PU_HWRCACHE_UNLOCKED = 102, // 'unlocked' PU_HWRCACHE memory:
// 'second-level' cache for graphics
// stored in hardware format and downloaded as needed
- PU_HWRPATCHINFO_UNLOCKED = 103, // 'unlocked' PU_HWRPATCHINFO memory
- PU_HWRMODELTEXTURE_UNLOCKED = 104, // 'unlocked' PU_HWRMODELTEXTURE memory
+ PU_HWRMODELTEXTURE_UNLOCKED = 103, // 'unlocked' PU_HWRMODELTEXTURE memory
};
//
@@ -107,6 +111,10 @@ void *Z_ReallocAlign(void *ptr, size_t size, INT32 tag, void *user, INT32 alignb
#define Z_FreeTag(tagnum) Z_FreeTags(tagnum, tagnum)
void Z_FreeTags(INT32 lowtag, INT32 hightag);
+// Iterate memory by tag
+#define Z_IterateTag(tagnum, func) Z_IterateTags(tagnum, tagnum, func)
+void Z_IterateTags(INT32 lowtag, INT32 hightag, boolean (*iterfunc)(void *));
+
//
// Utility functions
//
@@ -144,10 +152,4 @@ size_t Z_TagsUsage(INT32 lowtag, INT32 hightag);
char *Z_StrDup(const char *in);
#define Z_Unlock(p) (void)p // TODO: remove this now that NDS code has been removed
-// For renderer switching
-extern boolean needpatchflush;
-extern boolean needpatchrecache;
-void Z_FlushCachedPatches(void);
-void Z_PreparePatchFlush(void);
-
#endif