diff --git a/appveyor.yml b/appveyor.yml
index 2acc2f71235be24cd7190e511ee5106f16bcc295..e94a709cdb6b9960ab300a620a60f25295be3d5c 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/dep/.gitignore b/dep/.gitignore
new file mode 100644
index 0000000000000000000000000000000000000000..fb941664fc5718a31185a0cf67ccd2cfd68a2be8
--- /dev/null
+++ b/dep/.gitignore
@@ -0,0 +1,2 @@
+#All folders
+*.d
diff --git a/dep/FreeBSD/SDL/Debug/.gitignore b/dep/FreeBSD/SDL/Debug/.gitignore
new file mode 100644
index 0000000000000000000000000000000000000000..42c6dc2c662642792a8860e166dfd81126695e8f
--- /dev/null
+++ b/dep/FreeBSD/SDL/Debug/.gitignore
@@ -0,0 +1,2 @@
+# DON'T REMOVE
+# This keeps the folder from disappearing
diff --git a/dep/FreeBSD/SDL/Release/.gitignore b/dep/FreeBSD/SDL/Release/.gitignore
new file mode 100644
index 0000000000000000000000000000000000000000..42c6dc2c662642792a8860e166dfd81126695e8f
--- /dev/null
+++ b/dep/FreeBSD/SDL/Release/.gitignore
@@ -0,0 +1,2 @@
+# DON'T REMOVE
+# This keeps the folder from disappearing
diff --git a/dep/Linux/SDL/Debug/.gitignore b/dep/Linux/SDL/Debug/.gitignore
new file mode 100644
index 0000000000000000000000000000000000000000..42c6dc2c662642792a8860e166dfd81126695e8f
--- /dev/null
+++ b/dep/Linux/SDL/Debug/.gitignore
@@ -0,0 +1,2 @@
+# DON'T REMOVE
+# This keeps the folder from disappearing
diff --git a/dep/Linux/SDL/Release/.gitignore b/dep/Linux/SDL/Release/.gitignore
new file mode 100644
index 0000000000000000000000000000000000000000..42c6dc2c662642792a8860e166dfd81126695e8f
--- /dev/null
+++ b/dep/Linux/SDL/Release/.gitignore
@@ -0,0 +1,2 @@
+# DON'T REMOVE
+# This keeps the folder from disappearing
diff --git a/dep/Linux64/SDL/Debug/.gitignore b/dep/Linux64/SDL/Debug/.gitignore
new file mode 100644
index 0000000000000000000000000000000000000000..42c6dc2c662642792a8860e166dfd81126695e8f
--- /dev/null
+++ b/dep/Linux64/SDL/Debug/.gitignore
@@ -0,0 +1,2 @@
+# DON'T REMOVE
+# This keeps the folder from disappearing
diff --git a/dep/Linux64/SDL/Release/.gitignore b/dep/Linux64/SDL/Release/.gitignore
new file mode 100644
index 0000000000000000000000000000000000000000..42c6dc2c662642792a8860e166dfd81126695e8f
--- /dev/null
+++ b/dep/Linux64/SDL/Release/.gitignore
@@ -0,0 +1,2 @@
+# DON'T REMOVE
+# This keeps the folder from disappearing
diff --git a/dep/MasterClient/.gitignore b/dep/MasterClient/.gitignore
new file mode 100644
index 0000000000000000000000000000000000000000..42c6dc2c662642792a8860e166dfd81126695e8f
--- /dev/null
+++ b/dep/MasterClient/.gitignore
@@ -0,0 +1,2 @@
+# DON'T REMOVE
+# This keeps the folder from disappearing
diff --git a/dep/MasterServer/.gitignore b/dep/MasterServer/.gitignore
new file mode 100644
index 0000000000000000000000000000000000000000..42c6dc2c662642792a8860e166dfd81126695e8f
--- /dev/null
+++ b/dep/MasterServer/.gitignore
@@ -0,0 +1,2 @@
+# DON'T REMOVE
+# This keeps the folder from disappearing
diff --git a/dep/Mingw/Debug/.gitignore b/dep/Mingw/Debug/.gitignore
new file mode 100644
index 0000000000000000000000000000000000000000..42c6dc2c662642792a8860e166dfd81126695e8f
--- /dev/null
+++ b/dep/Mingw/Debug/.gitignore
@@ -0,0 +1,2 @@
+# DON'T REMOVE
+# This keeps the folder from disappearing
diff --git a/dep/Mingw/Release/.gitignore b/dep/Mingw/Release/.gitignore
new file mode 100644
index 0000000000000000000000000000000000000000..42c6dc2c662642792a8860e166dfd81126695e8f
--- /dev/null
+++ b/dep/Mingw/Release/.gitignore
@@ -0,0 +1,2 @@
+# DON'T REMOVE
+# This keeps the folder from disappearing
diff --git a/dep/Mingw/SDL/Debug/.gitignore b/dep/Mingw/SDL/Debug/.gitignore
new file mode 100644
index 0000000000000000000000000000000000000000..42c6dc2c662642792a8860e166dfd81126695e8f
--- /dev/null
+++ b/dep/Mingw/SDL/Debug/.gitignore
@@ -0,0 +1,2 @@
+# DON'T REMOVE
+# This keeps the folder from disappearing
diff --git a/dep/Mingw/SDL/Release/.gitignore b/dep/Mingw/SDL/Release/.gitignore
new file mode 100644
index 0000000000000000000000000000000000000000..42c6dc2c662642792a8860e166dfd81126695e8f
--- /dev/null
+++ b/dep/Mingw/SDL/Release/.gitignore
@@ -0,0 +1,2 @@
+# DON'T REMOVE
+# This keeps the folder from disappearing
diff --git a/dep/Mingw64/Debug/.gitignore b/dep/Mingw64/Debug/.gitignore
new file mode 100644
index 0000000000000000000000000000000000000000..42c6dc2c662642792a8860e166dfd81126695e8f
--- /dev/null
+++ b/dep/Mingw64/Debug/.gitignore
@@ -0,0 +1,2 @@
+# DON'T REMOVE
+# This keeps the folder from disappearing
diff --git a/dep/Mingw64/Release/.gitignore b/dep/Mingw64/Release/.gitignore
new file mode 100644
index 0000000000000000000000000000000000000000..42c6dc2c662642792a8860e166dfd81126695e8f
--- /dev/null
+++ b/dep/Mingw64/Release/.gitignore
@@ -0,0 +1,2 @@
+# DON'T REMOVE
+# This keeps the folder from disappearing
diff --git a/dep/Mingw64/SDL/Debug/.gitignore b/dep/Mingw64/SDL/Debug/.gitignore
new file mode 100644
index 0000000000000000000000000000000000000000..42c6dc2c662642792a8860e166dfd81126695e8f
--- /dev/null
+++ b/dep/Mingw64/SDL/Debug/.gitignore
@@ -0,0 +1,2 @@
+# DON'T REMOVE
+# This keeps the folder from disappearing
diff --git a/dep/Mingw64/SDL/Release/.gitignore b/dep/Mingw64/SDL/Release/.gitignore
new file mode 100644
index 0000000000000000000000000000000000000000..42c6dc2c662642792a8860e166dfd81126695e8f
--- /dev/null
+++ b/dep/Mingw64/SDL/Release/.gitignore
@@ -0,0 +1,2 @@
+# DON'T REMOVE
+# This keeps the folder from disappearing
diff --git a/dep/SDL/Release/.gitignore b/dep/SDL/Release/.gitignore
new file mode 100644
index 0000000000000000000000000000000000000000..42c6dc2c662642792a8860e166dfd81126695e8f
--- /dev/null
+++ b/dep/SDL/Release/.gitignore
@@ -0,0 +1,2 @@
+# DON'T REMOVE
+# This keeps the folder from disappearing
diff --git a/dep/VC/.gitignore b/dep/VC/.gitignore
new file mode 100644
index 0000000000000000000000000000000000000000..42c6dc2c662642792a8860e166dfd81126695e8f
--- /dev/null
+++ b/dep/VC/.gitignore
@@ -0,0 +1,2 @@
+# DON'T REMOVE
+# This keeps the folder from disappearing
diff --git a/dep/VC9/.gitignore b/dep/VC9/.gitignore
new file mode 100644
index 0000000000000000000000000000000000000000..42c6dc2c662642792a8860e166dfd81126695e8f
--- /dev/null
+++ b/dep/VC9/.gitignore
@@ -0,0 +1,2 @@
+# DON'T REMOVE
+# This keeps the folder from disappearing
diff --git a/dep/cygwin/Debug/.gitignore b/dep/cygwin/Debug/.gitignore
new file mode 100644
index 0000000000000000000000000000000000000000..42c6dc2c662642792a8860e166dfd81126695e8f
--- /dev/null
+++ b/dep/cygwin/Debug/.gitignore
@@ -0,0 +1,2 @@
+# DON'T REMOVE
+# This keeps the folder from disappearing
diff --git a/dep/cygwin/Release/.gitignore b/dep/cygwin/Release/.gitignore
new file mode 100644
index 0000000000000000000000000000000000000000..42c6dc2c662642792a8860e166dfd81126695e8f
--- /dev/null
+++ b/dep/cygwin/Release/.gitignore
@@ -0,0 +1,2 @@
+# DON'T REMOVE
+# This keeps the folder from disappearing
diff --git a/dep/dummy/.gitignore b/dep/dummy/.gitignore
new file mode 100644
index 0000000000000000000000000000000000000000..42c6dc2c662642792a8860e166dfd81126695e8f
--- /dev/null
+++ b/dep/dummy/.gitignore
@@ -0,0 +1,2 @@
+# DON'T REMOVE
+# This keeps the folder from disappearing
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/extras/conf/udb/Includes/SRB222_things.cfg b/extras/conf/udb/Includes/SRB222_things.cfg
index 0ea452155181cfd080a65a0713afd8e966531196..113c1a4c26eb08a7109da2afeba747dfb1cdda14 100644
--- a/extras/conf/udb/Includes/SRB222_things.cfg
+++ b/extras/conf/udb/Includes/SRB222_things.cfg
@@ -1247,6 +1247,7 @@ patterns
sprite = "SPHRA0";
width = 96;
height = 192;
+ }
609
{
title = "Circle of Rings and Spheres (Big)";
diff --git a/src/Makefile b/src/Makefile
index 1314161bd8b5f573732459c1f1cd080c3a35b7b3..df9d876828fc36302d4d7ea0d5f99eb42c0a06a7 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -2,7 +2,7 @@
# GNU Make makefile for SRB2
#############################################################################
# Copyright (C) 1998-2000 by DooM Legacy Team.
-# Copyright (C) 2003-2020 by Sonic Team Junior.
+# Copyright (C) 2003-2021 by Sonic Team Junior.
#
# This program is free software distributed under the
# terms of the GNU General Public License, version 2.
@@ -24,7 +24,9 @@
# clean
# Remove all object files
# cleandep
-# Remove depend.dep
+# Remove dependency files
+# distclean
+# Remove autogenerated files
# dll
# compile primary HW render DLL/SO
# all_dll
@@ -79,13 +81,23 @@
#
#############################################################################
+,=,
+
+ifeq (,$(filter-out cleandep clean distclean,$(or $(MAKECMDGOALS),all)))
+CLEANONLY=1
+else ifndef SILENT
+echo=@echo "$(1)"
+ifndef MAKE_RESTARTS
+print=$(info $(1))
+endif
+endif
+
ALL_SYSTEMS=\
PANDORA\
LINUX64\
MINGW64\
HAIKU\
DUMMY\
- DJGPPDOS\
MINGW\
UNIX\
LINUX\
@@ -98,7 +110,7 @@ ALL_SYSTEMS=\
ifeq (,$(filter $(ALL_SYSTEMS),$(.VARIABLES)))
ifeq ($(OS),Windows_NT) # all windows are Windows_NT...
- $(info Detected a Windows system, compiling for 32-bit MinGW SDL2...)
+ $(call print,Detected a Windows system$(,) compiling for 32-bit MinGW SDL2...)
# go for a 32-bit sdl mingw exe by default
MINGW=1
@@ -123,7 +135,7 @@ else # if you on the *nix
new_system:=$(new_system)64
endif
- $(info Detected $(system) ($(new_system))...)
+ $(call print,Detected $(system) ($(new_system))...)
$(new_system)=1
endif
@@ -237,6 +249,12 @@ endif
MSGFMT?=msgfmt
+ifdef WINDOWSHELL
+ COMPTIME=-..\comptime.bat
+else
+ COMPTIME=-../comptime.sh
+endif
+
ifndef ECHO
NASM:=@$(NASM)
REMOVE:=@$(REMOVE)
@@ -251,6 +269,7 @@ ifndef ECHO
MSGFMT:=@$(MSGFMT)
UPX:=@$(UPX)
UPX_OPTS+=-q
+ COMPTIME:=@$(COMPTIME)
endif
ifdef NONET
@@ -415,7 +434,7 @@ ifdef GCC48
else
CFLAGS+=-O0
endif
- CFLAGS+= -Wall -DPARANOIA -DRANGECHECK -DPACKETDROP -DMOBJCONSISTANCY
+ CFLAGS+= -Wall -DPARANOIA -DRANGECHECK -DPACKETDROP
else
@@ -455,7 +474,6 @@ DBGNAME?=$(EXENAME).debug
# not too sophisticated dependency
OBJS:=$(i_main_o) \
- $(OBJDIR)/comptime.o \
$(OBJDIR)/string.o \
$(OBJDIR)/d_main.o \
$(OBJDIR)/d_clisrv.o \
@@ -542,7 +560,10 @@ OBJS:=$(i_main_o) \
$(i_sound_o) \
$(OBJS)
+DEPS:=$(patsubst $(OBJDIR)/%.o,$(DEPDIR)/%.d,$(filter %.o,$(OBJS)))
+OBJS+=$(OBJDIR)/comptime.o
+ifndef SILENT
ifndef ECHO
ifndef NOECHOFILENAMES
define echoName =
@@ -550,6 +571,7 @@ define echoName =
endef
endif
endif
+endif
# List of languages to compile.
# For reference, this is the command I use to build a srb2.pot file from the source code.
@@ -562,12 +584,12 @@ OPTS+=-DGETTEXT
endif
ifdef PANDORA
-all: pre-build $(BIN)/$(PNDNAME)
+all: $(BIN)/$(PNDNAME)
endif
ifdef SDL
-all: pre-build $(BIN)/$(EXENAME)
+all: $(BIN)/$(EXENAME)
endif
ifdef DUMMY
@@ -575,20 +597,15 @@ all: $(BIN)/$(EXENAME)
endif
cleandep:
- $(REMOVE) $(OBJDIR)/depend.dep
+ $(REMOVE) $(DEPS)
$(REMOVE) comptime.h
-pre-build:
-ifdef WINDOWSHELL
- -..\comptime.bat .
-else
- -@../comptime.sh .
-endif
-
clean:
$(REMOVE) *~ *.flc
$(REMOVE) $(OBJDIR)/*.o
+distclean: clean cleandep
+
ifdef MINGW
$(REMOVE) $(OBJDIR)/*.res
endif
@@ -604,15 +621,13 @@ asm:
$(REMOVE) $(OBJDIR)/tmp.exe
# executable
-# NOTE: DJGPP's objcopy do not have --add-gnu-debuglink
-
$(BIN)/$(EXENAME): $(POS) $(OBJS)
-$(MKDIR) $(BIN)
- @echo Linking $(EXENAME)...
+ $(call echo,Linking $(EXENAME)...)
$(LD) $(LDFLAGS) $(OBJS) -o $(BIN)/$(EXENAME) $(LIBS)
ifndef VALGRIND
ifndef NOOBJDUMP
- @echo Dumping debugging info
+ $(call echo,Dumping debugging info)
$(OBJDUMP) $(OBJDUMP_OPTS) $(BIN)/$(EXENAME) > $(BIN)/$(DBGNAME).txt
ifdef WINDOWSHELL
-$(GZIP) $(GZIP_OPTS) $(BIN)/$(DBGNAME).txt
@@ -631,10 +646,10 @@ ifndef NOUPX
-$(UPX) $(UPX_OPTS) $(BIN)/$(EXENAME)
endif
endif
- @echo Build is done, please look for $(EXENAME) in $(BIN), \(checking for post steps\)
+ $(call echo,Build is done$(,) please look for $(EXENAME) in $(BIN)$(,) (checking for post steps))
reobjdump:
- @echo Redumping debugging info
+ $(call echo,Redumping debugging info)
$(OBJDUMP) $(OBJDUMP_OPTS) $(BIN)/$(DBGNAME) > $(BIN)/$(DBGNAME).txt
ifdef WINDOWSHELL
-$(GZIP) $(GZIP_OPTS) $(BIN)/$(DBGNAME).txt
@@ -670,24 +685,40 @@ endif
endif
#dependecy made by gcc itself !
-$(OBJS):
ifndef DUMMY
--include $(OBJDIR)/depend.dep
+ifndef CLEANONLY
+$(call print,Checking dependency files...)
+-include $(DEPS)
+endif
endif
-$(OBJDIR)/depend.dep:
- @echo "Creating dependency file, depend.dep"
- @echo > comptime.h
- -$(MKDIR) $(OBJDIR)
- $(CC) $(CFLAGS) -MM *.c > $(OBJDIR)/depend.ped
- $(CC) $(CFLAGS) -MM $(INTERFACE)/*.c >> $(OBJDIR)/depend.ped
-ifndef NOHW
- $(CC) $(CFLAGS) -MM hardware/*.c >> $(OBJDIR)/depend.ped
+undefine deps_rule
+
+# windows makes it too hard !
+ifndef WINDOWSHELL
+ifdef echoName
+define deps_rule =
+ @printf "%-20.20s\r" $<
+
+endef
+endif
endif
- $(CC) $(CFLAGS) -MM blua/*.c >> $(OBJDIR)/depend.ped
- @sed -e 's,\(.*\)\.o: ,$(subst /,\/,$(OBJDIR))\/&,g' < $(OBJDIR)/depend.ped > $(OBJDIR)/depend.dep
- $(REMOVE) $(OBJDIR)/depend.ped
- @echo "Created dependency file, depend.dep"
+
+define deps_rule +=
+ $(CC) $(CFLAGS) -M -MF $@ -MT $(OBJDIR)/$(<:.c=.o) $<
+endef
+
+$(DEPDIR)/%.d: %.c
+ $(deps_rule)
+
+$(DEPDIR)/%.d: $(INTERFACE)/%.c
+ $(deps_rule)
+
+$(DEPDIR)/%.d: hardware/%.c
+ $(deps_rule)
+
+$(DEPDIR)/%.d: blua/%.c
+ $(deps_rule)
ifdef VALGRIND
$(OBJDIR)/z_zone.o: z_zone.c
@@ -695,9 +726,12 @@ $(OBJDIR)/z_zone.o: z_zone.c
$(CC) $(CFLAGS) $(WFLAGS) -DHAVE_VALGRIND $(VALGRIND_CFLAGS) -c $< -o $@
endif
-$(OBJDIR)/comptime.o: comptime.c pre-build
- $(echoName)
- $(CC) $(CFLAGS) $(WFLAGS) -c $< -o $@
+$(OBJDIR)/comptime.o::
+ifdef echoName
+ @echo -- comptime.c ...
+endif
+ $(COMPTIME) .
+ $(CC) $(CFLAGS) $(WFLAGS) -c comptime.c -o $@
$(BIN)/%.mo: locale/%.po
-$(MKDIR) $(BIN)
diff --git a/src/Makefile.cfg b/src/Makefile.cfg
index f081eacdfaaf795bec1d2635a71afdd920630f00..075cd2d3a8defa3fd7d11feb431d2ad9cc67a704 100644
--- a/src/Makefile.cfg
+++ b/src/Makefile.cfg
@@ -47,7 +47,8 @@ ifdef MACOSX
endif
# Automatically set version flag, but not if one was manually set
-ifeq (,$(filter GCC%,$(.VARIABLES)))
+# And don't bother if this is a clean only run
+ifeq (,$(filter GCC% CLEANONLY,$(.VARIABLES)))
version:=$(shell $(CC) --version)
# check if this is in fact GCC
ifneq (,$(or $(findstring gcc,$(version)),$(findstring GCC,$(version))))
@@ -60,12 +61,14 @@ ifeq (,$(filter GCC%,$(.VARIABLES)))
# If this version is not in the list, default to the latest supported
ifeq (,$(filter $(v),$(SUPPORTED_GCC_VERSIONS)))
- $(info\
- Your compiler version, GCC $(version), is not supported by the Makefile.\
- The Makefile will assume GCC $(LATEST_GCC_VERSION).)
+ define line =
+ Your compiler version, GCC $(version), is not supported by the Makefile.
+ The Makefile will assume GCC $(LATEST_GCC_VERSION).))
+ endef
+ $(call print,$(line))
GCC$(subst .,,$(LATEST_GCC_VERSION))=1
else
- $(info Detected GCC $(version) (GCC$(v)))
+ $(call print,Detected GCC $(version) (GCC$(v)))
GCC$(v)=1
endif
endif
@@ -361,6 +364,7 @@ i_main_o=$(OBJDIR)/i_main.o
#set OBJDIR and BIN's starting place
OBJDIR=../objs
BIN=../bin
+DEPDIR=../dep
#Nasm ASM and rm
ifdef YASM
NASM?=yasm
@@ -383,6 +387,7 @@ ifdef DUMMY
INTERFACE=dummy
OBJDIR:=$(OBJDIR)/dummy
BIN:=$(BIN)/dummy
+ DEPDIR:=$(DEPDIR)/dummy
else
ifdef LINUX
NASMFORMAT=elf -DLINUX
@@ -390,9 +395,11 @@ ifdef LINUX
ifdef LINUX64
OBJDIR:=$(OBJDIR)/Linux64
BIN:=$(BIN)/Linux64
+ DEPDIR:=$(DEPDIR)/Linux64
else
OBJDIR:=$(OBJDIR)/Linux
BIN:=$(BIN)/Linux
+ DEPDIR:=$(DEPDIR)/Linux
endif
else
ifdef FREEBSD
@@ -402,6 +409,7 @@ ifdef FREEBSD
OBJDIR:=$(OBJDIR)/FreeBSD
BIN:=$(BIN)/FreeBSD
+ DEPDIR:=$(DEPDIR)/Linux
else
ifdef SOLARIS
INTERFACE=sdl
@@ -410,6 +418,7 @@ ifdef SOLARIS
OBJDIR:=$(OBJDIR)/Solaris
BIN:=$(BIN)/Solaris
+ DEPDIR:=$(DEPDIR)/Solaris
else
ifdef CYGWIN32
INTERFACE=sdl
@@ -418,18 +427,21 @@ ifdef CYGWIN32
OBJDIR:=$(OBJDIR)/cygwin
BIN:=$(BIN)/Cygwin
+ DEPDIR:=$(DEPDIR)/Cygwin
else
ifdef MINGW64
#NASMFORMAT=win64
SDL=1
OBJDIR:=$(OBJDIR)/Mingw64
BIN:=$(BIN)/Mingw64
+ DEPDIR:=$(DEPDIR)/Mingw64
else
ifdef MINGW
NASMFORMAT=win32
SDL=1
OBJDIR:=$(OBJDIR)/Mingw
BIN:=$(BIN)/Mingw
+ DEPDIR:=$(DEPDIR)/Mingw
endif
endif
endif
@@ -441,6 +453,7 @@ endif
ifdef ARCHNAME
OBJDIR:=$(OBJDIR)/$(ARCHNAME)
BIN:=$(BIN)/$(ARCHNAME)
+ DEPDIR:=$(DEPDIR)/$(ARCHNAME)
endif
OBJDUMP_OPTS?=--wide --source --line-numbers
@@ -449,14 +462,17 @@ LD=$(CC)
ifdef SDL
INTERFACE=sdl
OBJDIR:=$(OBJDIR)/SDL
+ DEPDIR:=$(DEPDIR)/SDL
endif
ifndef DUMMY
ifdef DEBUGMODE
OBJDIR:=$(OBJDIR)/Debug
BIN:=$(BIN)/Debug
+ DEPDIR:=$(DEPDIR)/Debug
else
OBJDIR:=$(OBJDIR)/Release
BIN:=$(BIN)/Release
+ DEPDIR:=$(DEPDIR)/Release
endif
endif
diff --git a/src/command.c b/src/command.c
index 58434ef8983a1a0ed1816a9522783214896351b1..d73cde5c299a2d66dd4e7f42269d2bd267ee71c0 100644
--- a/src/command.c
+++ b/src/command.c
@@ -1433,6 +1433,7 @@ static void Setvalue(consvar_t *var, const char *valstr, boolean stealth)
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;
@@ -1440,6 +1441,10 @@ static void Setvalue(consvar_t *var, const char *valstr, boolean stealth)
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;
@@ -1502,13 +1507,7 @@ static void Setvalue(consvar_t *var, const char *valstr, boolean stealth)
found:
if (client && execversion_enabled)
{
- if (var->revert.allocated)
- {
- Z_Free(var->revert.v.string);
- }
-
var->revert.v.const_munge = var->PossibleValue[i].strvalue;
-
return;
}
@@ -1523,6 +1522,7 @@ found:
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);
@@ -1577,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();
@@ -1787,6 +1787,7 @@ void CV_RevertNetVars(void)
if (cvar->revert.allocated)
{
Z_Free(cvar->revert.v.string);
+ cvar->revert.allocated = false; // no value being held now
}
cvar->revert.v.string = NULL;
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 121605b10ea53c7f42d5b6c6462dd8145dc77a3a..1560220f6ecc257cd6cacd20cc25fb83534e152c 100644
--- a/src/console.c
+++ b/src/console.c
@@ -1303,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);
diff --git a/src/d_clisrv.c b/src/d_clisrv.c
index 4fdc7e7eea49df2cf128023784bbd4c5b44f742d..7fa6d8d594da1f8e35808b485a8d6a26f17b812b 100644
--- a/src/d_clisrv.c
+++ b/src/d_clisrv.c
@@ -1565,15 +1565,6 @@ static void CL_LoadReceivedSavegame(boolean reloading)
}
CONS_Printf("\"\n");
}
- 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
Z_Free(savebuffer);
@@ -3112,7 +3103,7 @@ consvar_t cv_maxplayers = CVAR_INIT ("maxplayers", "8", CV_SAVE|CV_NETVAR, maxpl
static CV_PossibleValue_t joindelay_cons_t[] = {{1, "MIN"}, {3600, "MAX"}, {0, "Off"}, {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 = CVAR_INIT ("rejointimeout", "Off", CV_SAVE|CV_NETVAR|CV_FLOAT, rejointimeout_cons_t, 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 = CVAR_INIT ("resynchattempts", "10", CV_SAVE|CV_NETVAR, resynchattempts_cons_t, NULL);
@@ -4268,7 +4259,7 @@ static void HandlePacketFromPlayer(SINT8 node)
case PT_RECEIVEDGAMESTATE:
sendingsavegame[node] = false;
resendingsavegame[node] = false;
- savegameresendcooldown[node] = I_GetTime() + 15 * TICRATE;
+ savegameresendcooldown[node] = I_GetTime() + 5 * TICRATE;
break;
// -------------------------------------------- CLIENT RECEIVE ----------
case PT_SERVERTICS:
@@ -4480,70 +4471,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)
+ 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->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;
+ 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
diff --git a/src/d_main.c b/src/d_main.c
index a89f4ed2dc93af3efc4fd3acd59647b1dd208668..077c35a0fb951c08d8886fdd47527663d9e91eff 100644
--- a/src/d_main.c
+++ b/src/d_main.c
@@ -15,7 +15,7 @@
/// plus functions to parse command line parameters, configure game
/// parameters, and call the startup functions.
-#if (defined (__unix__) && !defined (MSDOS)) || defined(__APPLE__) || defined (UNIXCOMMON)
+#if defined (__unix__) || defined (__APPLE__) || defined (UNIXCOMMON)
#include <sys/stat.h>
#include <sys/types.h>
#endif
@@ -61,7 +61,7 @@
#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"
@@ -934,7 +934,7 @@ static void IdentifyVersion(void)
char *srb2wad;
const char *srb2waddir = NULL;
-#if (defined (__unix__) && !defined (MSDOS)) || defined (UNIXCOMMON) || defined (HAVE_SDL)
+#if defined (__unix__) || defined (UNIXCOMMON) || defined (HAVE_SDL)
// change to the directory where 'srb2.pk3' is found
srb2waddir = I_LocateWad();
#endif
@@ -1045,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"
@@ -1072,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();
@@ -1107,7 +1107,7 @@ void D_SRB2Main(void)
if (!userhome)
{
-#if ((defined (__unix__) && !defined (MSDOS)) || defined(__APPLE__) || defined (UNIXCOMMON)) && !defined (__CYGWIN__)
+#if (defined (__unix__) || defined (__APPLE__) || defined (UNIXCOMMON)) && !defined (__CYGWIN__)
I_Error("Please set $HOME to your home directory\n");
#else
if (dedicated)
@@ -1287,7 +1287,7 @@ void D_SRB2Main(void)
G_LoadGameData();
-#if (defined (__unix__) && !defined (MSDOS)) || defined (UNIXCOMMON) || defined (HAVE_SDL)
+#if defined (__unix__) || defined (UNIXCOMMON) || defined (HAVE_SDL)
VID_PrepareModeList(); // Regenerate Modelist according to cv_fullscreen
#endif
@@ -1553,7 +1553,7 @@ const char *D_Home(void)
userhome = M_GetNextParm();
else
{
-#if !((defined (__unix__) && !defined (MSDOS)) || defined(__APPLE__) || defined (UNIXCOMMON)) && !defined (__APPLE__)
+#if !(defined (__unix__) || defined (__APPLE__) || defined (UNIXCOMMON))
if (FIL_FileOK(CONFIGFILENAME))
usehome = false; // Let's NOT use home
else
diff --git a/src/d_main.h b/src/d_main.h
index 81de0634d0ca9ebe4cc03972590e99db631b6991..4e5df87e3fc6bf291ac4069b717b9ba5ab7376a9 100644
--- a/src/d_main.h
+++ b/src/d_main.h
@@ -40,10 +40,6 @@ void D_SRB2Main(void);
// Called by IO functions when input is detected.
void D_PostEvent(const event_t *ev);
-#if defined (PC_DOS) && !defined (DOXYGEN)
-void D_PostEvent_end(void); // delimiter for locking memory
-#endif
-
void D_ProcessEvents(void);
const char *D_Home(void);
diff --git a/src/d_netcmd.c b/src/d_netcmd.c
index 0acbec928ad524f5d47708390c8972fba0384b86..e2ccd017245547fc050a20f79928145c3030b074 100644
--- a/src/d_netcmd.c
+++ b/src/d_netcmd.c
@@ -168,7 +168,7 @@ void SendWeaponPref(void);
void SendWeaponPref2(void);
static CV_PossibleValue_t usemouse_cons_t[] = {{0, "Off"}, {1, "On"}, {2, "Force"}, {0, NULL}};
-#if (defined (__unix__) && !defined (MSDOS)) || defined(__APPLE__) || defined (UNIXCOMMON)
+#if defined (__unix__) || defined (__APPLE__) || defined (UNIXCOMMON)
static CV_PossibleValue_t mouse2port_cons_t[] = {{0, "/dev/gpmdata"}, {1, "/dev/ttyS0"},
{2, "/dev/ttyS1"}, {3, "/dev/ttyS2"}, {4, "/dev/ttyS3"}, {0, NULL}};
#else
@@ -255,7 +255,7 @@ consvar_t cv_joyscale2 = CVAR_INIT ("padscale2", "1", CV_SAVE|CV_CALL, NULL, I_J
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)
+#if defined (__unix__) || defined (__APPLE__) || defined (UNIXCOMMON)
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
@@ -788,7 +788,7 @@ void D_RegisterClientCommands(void)
// WARNING: the order is important when initialising mouse2
// we need the mouse2port
CV_RegisterVar(&cv_mouse2port);
-#if (defined (__unix__) && !defined (MSDOS)) || defined(__APPLE__) || defined (UNIXCOMMON)
+#if defined (__unix__) || defined (__APPLE__) || defined (UNIXCOMMON)
CV_RegisterVar(&cv_mouse2opt);
#endif
CV_RegisterVar(&cv_controlperkey);
@@ -2130,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;
diff --git a/src/d_netcmd.h b/src/d_netcmd.h
index ac39626a4e381a454ce0c81e51aa604f70840fed..59c231255c19ad9051035939e735c282491d00b5 100644
--- a/src/d_netcmd.h
+++ b/src/d_netcmd.h
@@ -45,7 +45,7 @@ extern consvar_t cv_joyscale2;
// splitscreen with second mouse
extern consvar_t cv_mouse2port;
extern consvar_t cv_usemouse2;
-#if (defined (__unix__) && !defined (MSDOS)) || defined (UNIXCOMMON)
+#if defined (__unix__) || defined (__APPLE__) || defined (UNIXCOMMON)
extern consvar_t cv_mouse2opt;
#endif
diff --git a/src/d_netfil.c b/src/d_netfil.c
index 8f661bb5fb26f8f341ba77daa379b77c25fa6dbc..38b8ff619e5087e36db3b8c4300a2133d0d606ea 100644
--- a/src/d_netfil.c
+++ b/src/d_netfil.c
@@ -15,7 +15,7 @@
#include <time.h>
-#if defined (_WIN32) || defined (__DJGPP__)
+#ifdef _WIN32
#include <io.h>
#include <direct.h>
#else
@@ -30,10 +30,6 @@
#elif defined (_WIN32)
#include <sys/utime.h>
#endif
-#ifdef __DJGPP__
-#include <dir.h>
-#include <utime.h>
-#endif
#include "doomdef.h"
#include "doomstat.h"
@@ -562,7 +558,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 +566,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 +585,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 +646,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 +927,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/deh_soc.c b/src/deh_soc.c
index 5b12ea1b0b9b0339890b094516e0593e252d6556..705cedf439a60b0f5bb006ff3f3b09ec1944d46e 100644
--- a/src/deh_soc.c
+++ b/src/deh_soc.c
@@ -229,7 +229,10 @@ void readPlayer(MYFILE *f, INT32 num)
SLOTFOUND
- for (i = 0; i < MAXLINELEN-3; i++)
+ // A friendly neighborhood alias for brevity's sake
+#define NOTE_SIZE sizeof(description[num].notes)
+
+ for (i = 0; i < (INT32)(MAXLINELEN-NOTE_SIZE-3); i++)
{
if (s[i] == '=')
{
@@ -239,8 +242,9 @@ void readPlayer(MYFILE *f, INT32 num)
}
if (playertext)
{
- strcpy(description[num].notes, playertext);
- strcat(description[num].notes, myhashfgets(playertext, sizeof (description[num].notes), f));
+ strlcpy(description[num].notes, playertext, NOTE_SIZE);
+ strlcat(description[num].notes,
+ myhashfgets(playertext, NOTE_SIZE, f), NOTE_SIZE);
}
else
strcpy(description[num].notes, "");
@@ -249,7 +253,7 @@ void readPlayer(MYFILE *f, INT32 num)
// It works down here, though.
{
INT32 numline = 0;
- for (i = 0; (size_t)i < sizeof(description[num].notes)-1; i++)
+ for (i = 0; (size_t)i < NOTE_SIZE-1; i++)
{
if (numline < 20 && description[num].notes[i] == '\n')
numline++;
@@ -260,6 +264,7 @@ void readPlayer(MYFILE *f, INT32 num)
}
description[num].notes[strlen(description[num].notes)-1] = '\0';
description[num].notes[i] = '\0';
+#undef NOTE_SIZE
continue;
}
@@ -1140,8 +1145,10 @@ void readgametype(MYFILE *f, char *gtname)
}
if (descr)
{
- strcpy(gtdescription, descr);
- strcat(gtdescription, myhashfgets(descr, sizeof (gtdescription), f));
+ strlcpy(gtdescription, descr, sizeof (gtdescription));
+ strlcat(gtdescription,
+ myhashfgets(descr, sizeof (gtdescription), f),
+ sizeof (gtdescription));
}
else
strcpy(gtdescription, "");
@@ -2839,26 +2846,31 @@ void readsound(MYFILE *f, INT32 num)
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.
- word = strtok(s, " ");
- if (word)
- strupr(word);
+ // Set / reset word
+ word = s;
+
+ // Get the part before the " = "
+ tmp = strchr(s, '=');
+ if (tmp)
+ *(tmp-1) = '\0';
else
break;
+ strupr(word);
- word2 = strtok(NULL, " ");
- if (word2)
- value = atoi(word2);
- else
- {
- deh_warning("No value for token %s", word);
- continue;
- }
+ // Now get the part after
+ word2 = tmp += 2;
+ value = atoi(word2); // used for numerical settings
if (fastcmp(word, "SINGULAR"))
{
diff --git a/src/deh_tables.c b/src/deh_tables.c
index 3039bf7dec22dfecc241bd253ef5175d83aee026..dd6d7d69ff722bedd843456a4b5a7963889a1269 100644
--- a/src/deh_tables.c
+++ b/src/deh_tables.c
@@ -5457,3 +5457,27 @@ struct int_const_s const INT_CONST[] = {
{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
index 2c6b3e20407ec454a47a9b301fcf5003cb4220a8..d094bcbad4e74b736aa6aa423cfe94a408dc18f2 100644
--- a/src/deh_tables.h
+++ b/src/deh_tables.h
@@ -72,4 +72,7 @@ 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 b4266326759b822ed91e17211f639c052a9af2bb..3f066a924adbd77d11ba18cbe5b4c4dae2ac5fbf 100644
--- a/src/dehacked.c
+++ b/src/dehacked.c
@@ -188,26 +188,11 @@ static void DEH_LoadDehackedFile(MYFILE *f, boolean mainfile)
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')
@@ -645,25 +630,3 @@ void DEH_LoadDehackedLump(lumpnum_t lumpnum)
{
DEH_LoadDehackedLumpPwad(WADFILENUM(lumpnum),LUMPNUM(lumpnum), false);
}
-
-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
-}
diff --git a/src/dehacked.h b/src/dehacked.h
index d5256be23f0b05b9b51e80faf12823e3a43e0366..1620314caaba5bbabafded19233b0c162f148f84 100644
--- a/src/dehacked.h
+++ b/src/dehacked.h
@@ -30,8 +30,6 @@ 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);
FUNCPRINTF void deh_warning(const char *first, ...);
void deh_strlcpy(char *dst, const char *src, size_t size, const char *warntext);
diff --git a/src/doomdef.h b/src/doomdef.h
index 52abc95972cf4a2ed4b57c1dc939654d84f32906..0c88d1add57ddaf5b43bfdf563ad99cac6687b12 100644
--- a/src/doomdef.h
+++ b/src/doomdef.h
@@ -100,7 +100,7 @@
#include <sys/stat.h>
#include <ctype.h>
-#if defined (_WIN32) || defined (__DJGPP__)
+#ifdef _WIN32
#include <io.h>
#endif
@@ -112,7 +112,7 @@
//#define PARANOIA // do some tests that never fail but maybe
// turn this on by make etc.. DEBUGMODE = 1 or use the Debug profile in the VC++ projects
//#endif
-#if defined (_WIN32) || (defined (__unix__) && !defined (MSDOS)) || defined(__APPLE__) || defined (UNIXCOMMON) || defined (macintosh)
+#if defined (_WIN32) || defined (__unix__) || defined(__APPLE__) || defined (UNIXCOMMON) || defined (macintosh)
#define LOGMESSAGES // write message in log.txt
#endif
@@ -415,7 +415,7 @@ enum {
};
// Name of local directory for config files and savegames
-#if (((defined (__unix__) && !defined (MSDOS)) || defined (UNIXCOMMON)) && !defined (__CYGWIN__)) && !defined (__APPLE__)
+#if (defined (__unix__) || defined (UNIXCOMMON)) && !defined (__CYGWIN__) && !defined (__APPLE__)
#define DEFAULTDIR ".srb2"
#else
#define DEFAULTDIR "srb2"
diff --git a/src/doomtype.h b/src/doomtype.h
index 950f50856b7679e035c268e036660fe505d8dbab..f04314f54609dcae9b0f549b1d802a0963f57b48 100644
--- a/src/doomtype.h
+++ b/src/doomtype.h
@@ -54,17 +54,6 @@ typedef long ssize_t;
#define PDWORD_PTR PDWORD
#endif
#endif
-#elif defined (__DJGPP__)
-#define UINT8 unsigned char
-#define SINT8 signed char
-
-#define UINT16 unsigned short int
-#define INT16 signed short int
-
-#define INT32 signed long
-#define UINT32 unsigned long
-#define INT64 signed long long
-#define UINT64 unsigned long long
#else
#define __STDC_LIMIT_MACROS
#include <stdint.h>
@@ -108,7 +97,7 @@ typedef long ssize_t;
#define strncasecmp strnicmp
#define strcasecmp strcmpi
#endif
-#if (defined (__unix__) && !defined (MSDOS)) || defined(__APPLE__) || defined (UNIXCOMMON)
+#if defined (__unix__) || defined (__APPLE__) || defined (UNIXCOMMON)
#undef stricmp
#define stricmp(x,y) strcasecmp(x,y)
#undef strnicmp
@@ -136,7 +125,7 @@ char *strcasestr(const char *in, const char *what);
#endif
#endif //macintosh
-#if defined (PC_DOS) || defined (_WIN32) || defined (__HAIKU__)
+#if defined (_WIN32) || defined (__HAIKU__)
#define HAVE_DOSSTR_FUNCS
#endif
diff --git a/src/g_game.c b/src/g_game.c
index 2b304b4fdd054d03061613d47313f147004d35b3..399c4f2bdc07cad33809be359fe694922466d97a 100644
--- a/src/g_game.c
+++ b/src/g_game.c
@@ -3507,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},
@@ -3973,6 +3974,7 @@ static void G_DoCompleted(void)
{
G_SetGamestate(GS_INTERMISSION);
Y_StartIntermission();
+ Y_LoadIntermissionData();
G_UpdateVisited();
G_HandleSaveLevel();
}
diff --git a/src/hardware/hw_batching.c b/src/hardware/hw_batching.c
index fb3417158a76a53abd38698da07425541ffddb02..b13ad03eace3b21342b8f1048b780aea2f36c08a 100644
--- a/src/hardware/hw_batching.c
+++ b/src/hardware/hw_batching.c
@@ -137,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;
@@ -152,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;
@@ -184,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;
diff --git a/src/hardware/hw_defs.h b/src/hardware/hw_defs.h
index bd6afc74fa8631bd912664470d9f137652f1a4a8..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.
@@ -216,28 +216,28 @@ enum EPolyFlags
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_Environment = 0x00000004, // Poly should be drawn environment mapped. (Hurdler: used for text drawing)
- PF_Additive = 0x00000008, // Additive color blending
- PF_AdditiveSource = 0x00000010, // Source blending factor is additive. This is the opposite of regular additive blending.
- PF_Subtractive = 0x00000020, // Subtractive color blending
- PF_ReverseSubtract = 0x00000040, // Reverse subtract, used in wall splats (decals)
- PF_Multiplicative = 0x00000080, // Multiplicative color blending
+ 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_AdditiveSource|PF_Subtractive|PF_ReverseSubtract|PF_Multiplicative|PF_Fog) & ~PF_NoAlphaTest,
+ 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 ARGB)
+ PF_Modulated = 0x00001000, // Modulation (multiply output with constant RGBA)
// When set, pass the color constant into the FSurfaceInfo -> PolyColor
PF_NoTexture = 0x00002000, // Disables texturing
PF_Corona = 0x00004000, // Tells the renderer we are drawing a corona
- PF_Ripple = 0x00008000, // Water effect shader
+ 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_ForceWrapY = 0x00040000, // Forces repeat texture on Y
+ PF_Ripple = 0x00100000 // Water ripple effect. The current backend doesn't use it for anything.
};
@@ -266,7 +266,6 @@ struct FTextureInfo
};
typedef struct FTextureInfo FTextureInfo;
-// jimita 14032019
struct FLightInfo
{
FUINT light_level;
@@ -282,7 +281,7 @@ struct FSurfaceInfo
RGBA_t PolyColor;
RGBA_t TintColor;
RGBA_t FadeColor;
- FLightInfo LightInfo; // jimita 14032019
+ FLightInfo LightInfo;
};
typedef struct FSurfaceInfo FSurfaceInfo;
diff --git a/src/hardware/hw_draw.c b/src/hardware/hw_draw.c
index 8c92c6709252a0b91107279ea32d374b306a2ed4..ba4923d10e76149cf0dd088aa7633db43e4a8ff0 100644
--- a/src/hardware/hw_draw.c
+++ b/src/hardware/hw_draw.c
@@ -437,18 +437,9 @@ void HWR_DrawCroppedPatch(patch_t *gpatch, fixed_t x, fixed_t y, fixed_t pscale,
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 && gpatch->width == BASEVIDWIDTH && cy >= -0.1f && cy <= 0.1f && gpatch->height == BASEVIDHEIGHT)
- {
- 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]));
- }
- }
+ // 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)
{
@@ -470,11 +461,11 @@ void HWR_DrawCroppedPatch(patch_t *gpatch, fixed_t x, fixed_t y, fixed_t pscale,
fwidth = w;
fheight = h;
- if (fwidth > gpatch->width)
- fwidth = gpatch->width;
+ if (sx + w > gpatch->width)
+ fwidth = gpatch->width - sx;
- if (fheight > gpatch->height)
- fheight = gpatch->height;
+ if (sy + h > gpatch->height)
+ fheight = gpatch->height - sy;
if (pscale != FRACUNIT)
{
@@ -506,13 +497,13 @@ void HWR_DrawCroppedPatch(patch_t *gpatch, fixed_t x, fixed_t y, fixed_t pscale,
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 - ((sx+w)/(float)(gpatch->width))*hwrPatch->max_s;
+ v[2].s = v[1].s = hwrPatch->max_s;
else
v[2].s = v[1].s = ((sx+w)/(float)(gpatch->width))*hwrPatch->max_s;
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 - ((sy+h)/(float)(gpatch->height))*hwrPatch->max_t;
+ v[2].t = v[3].t = hwrPatch->max_t;
else
v[2].t = v[3].t = ((sy+h)/(float)(gpatch->height))*hwrPatch->max_t;
diff --git a/src/hardware/hw_drv.h b/src/hardware/hw_drv.h
index da4ee861435dee90e9cf7dc87ec22009b66128ff..8cae144ff81fdb2ca5ee53deea1e9c1fc8cc8531 100644
--- a/src/hardware/hw_drv.h
+++ b/src/hardware/hw_drv.h
@@ -68,7 +68,6 @@ EXPORT void HWRAPI(DrawScreenFinalTexture) (int width, int height);
#define SCREENVERTS 10
EXPORT void HWRAPI(PostImgRedraw) (float points[SCREENVERTS][SCREENVERTS][2]);
-// jimita
EXPORT boolean HWRAPI(CompileShaders) (void);
EXPORT void HWRAPI(CleanShaders) (void);
EXPORT void HWRAPI(SetShader) (int type);
diff --git a/src/hardware/hw_light.c b/src/hardware/hw_light.c
index 93c61f4e7f9d2357cd323555f41631d3bd17bb09..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,7 +35,7 @@
#define DL_HIGH_QUALITY
//#define STATICLIGHT //Hurdler: TODO!
-#define LIGHTMAPFLAGS (PF_Modulated|PF_AdditiveSource)
+#define LIGHTMAPFLAGS (PF_Modulated|PF_Additive)
#ifdef ALAM_LIGHTING
static dynlights_t view_dynlights[2]; // 2 players in splitscreen mode
@@ -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_AdditiveSource | 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_AdditiveSource | 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 a7e37d231a1d6401f99203e11bc97b8161f1a46b..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.
@@ -173,6 +173,11 @@ 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;
@@ -182,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;
@@ -371,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)
@@ -568,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 = SHADER_FOG; // fog shader
- else if (PolyFlags & PF_Ripple)
- shader = SHADER_WATER; // water shader
- else
- shader = SHADER_FLOOR; // 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);
@@ -706,6 +716,9 @@ FBITFIELD HWR_GetBlendModeFlag(INT32 ast)
{
switch (ast)
{
+ case AST_COPY:
+ case AST_OVERLAY:
+ return PF_Masked;
case AST_ADD:
return PF_Additive;
case AST_SUBTRACT:
@@ -744,7 +757,7 @@ UINT8 HWR_GetTranstableAlpha(INT32 transtablenum)
FBITFIELD HWR_SurfaceBlend(INT32 style, INT32 transtablenum, FSurfaceInfo *pSurf)
{
- if (!transtablenum)
+ if (!transtablenum || style == AST_COPY || style == AST_OVERLAY)
{
pSurf->PolyColor.s.alpha = 0xff;
return PF_Masked;
@@ -785,8 +798,17 @@ static void HWR_AddTransparentWall(FOutVector *wallVerts, FSurfaceInfo *pSurf, I
//
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, SHADER_WALL, false); // wall shader
+
+ if (HWR_UseShader())
+ {
+ shader = SHADER_WALL;
+ blendmode |= PF_ColorMapped;
+ }
+
+ HWR_ProcessPolygon(pSurf, wallVerts, 4, blendmode|PF_Modulated|PF_Occlude, shader, false);
}
// ==========================================================================
@@ -831,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
@@ -969,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;
@@ -998,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
@@ -1183,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
@@ -1249,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
@@ -1465,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))
@@ -1554,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)
@@ -1717,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);
}
@@ -1732,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)
@@ -1829,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);
}
@@ -1844,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)
@@ -2659,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;
@@ -2834,7 +2860,6 @@ 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)
@@ -2845,7 +2870,13 @@ static void HWR_RenderPolyObjectPlane(polyobj_t *polysector, boolean isceiling,
else
blendmode |= PF_Masked|PF_Modulated;
- HWR_ProcessPolygon(&Surf, planeVerts, nrPlaneVerts, blendmode, SHADER_FLOOR, 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)
@@ -3566,6 +3597,8 @@ static void HWR_DrawDropShadow(mobj_t *thing, fixed_t scale)
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);
@@ -3658,14 +3691,20 @@ static void HWR_DrawDropShadow(mobj_t *thing, fixed_t scale)
HWR_Lighting(&sSurf, 0, colormap);
sSurf.PolyColor.s.alpha = alpha;
- HWR_ProcessPolygon(&sSurf, shadowVerts, 4, PF_Translucent|PF_Modulated, SHADER_SPRITE, 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);
@@ -3706,8 +3745,8 @@ static void HWR_SplitSprite(gl_vissprite_t *spr)
boolean lightset = true;
FBITFIELD blend = 0;
FBITFIELD occlusion;
+ INT32 shader = SHADER_DEFAULT;
boolean use_linkdraw_hack = false;
- boolean splat = R_ThingIsFloorSprite(spr->mobj);
UINT8 alpha;
INT32 i;
@@ -3766,22 +3805,19 @@ static void HWR_SplitSprite(gl_vissprite_t *spr)
baseWallVerts[0].t = baseWallVerts[1].t = ((GLPatch_t *)gpatch->hardware)->max_t;
}
- 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);
- baseWallVerts[0].z = baseWallVerts[3].z = baseWallVerts[0].z+si;
- baseWallVerts[1].z = baseWallVerts[2].z = baseWallVerts[1].z+si;
- baseWallVerts[0].x = baseWallVerts[3].x = baseWallVerts[0].x+co;
- baseWallVerts[1].x = baseWallVerts[2].x = baseWallVerts[1].x+co;
- }
-
- // Let dispoffset work first since this adjust each vertex
- HWR_RotateSpritePolyToAim(spr, baseWallVerts, false);
+ // 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);
+ baseWallVerts[0].z = baseWallVerts[3].z = baseWallVerts[0].z+si;
+ baseWallVerts[1].z = baseWallVerts[2].z = baseWallVerts[1].z+si;
+ baseWallVerts[0].x = baseWallVerts[3].x = baseWallVerts[0].x+co;
+ baseWallVerts[1].x = baseWallVerts[2].x = baseWallVerts[1].x+co;
}
+ // Let dispoffset work first since this adjust each vertex
+ HWR_RotateSpritePolyToAim(spr, baseWallVerts, false);
+
realtop = top = baseWallVerts[3].y;
realbot = bot = baseWallVerts[0].y;
ttop = baseWallVerts[3].t;
@@ -3817,8 +3853,6 @@ static void HWR_SplitSprite(gl_vissprite_t *spr)
else if (spr->mobj->frame & FF_TRANSMASK)
{
INT32 trans = (spr->mobj->frame & FF_TRANSMASK)>>FF_TRANSSHIFT;
- if (spr->mobj->blendmode == AST_TRANSLUCENT && trans >= NUMTRANSMAPS)
- return;
blend = HWR_SurfaceBlend(spr->mobj->blendmode, trans, &Surf);
}
else
@@ -3832,6 +3866,12 @@ static void HWR_SplitSprite(gl_vissprite_t *spr)
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
@@ -3914,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;
@@ -3940,7 +3980,7 @@ static void HWR_SplitSprite(gl_vissprite_t *spr)
Surf.PolyColor.s.alpha = alpha;
- HWR_ProcessPolygon(&Surf, wallVerts, 4, blend|PF_Modulated, SHADER_SPRITE, false); // sprite shader
+ HWR_ProcessPolygon(&Surf, wallVerts, 4, blend|PF_Modulated, shader, false);
if (use_linkdraw_hack)
HWR_LinkDrawHackAdd(wallVerts, spr);
@@ -3969,7 +4009,7 @@ static void HWR_SplitSprite(gl_vissprite_t *spr)
Surf.PolyColor.s.alpha = alpha;
- HWR_ProcessPolygon(&Surf, wallVerts, 4, blend|PF_Modulated, SHADER_SPRITE, false); // sprite shader
+ HWR_ProcessPolygon(&Surf, wallVerts, 4, blend|PF_Modulated, shader, false);
if (use_linkdraw_hack)
HWR_LinkDrawHackAdd(wallVerts, spr);
@@ -3983,7 +4023,7 @@ static void HWR_SplitSprite(gl_vissprite_t *spr)
static void HWR_DrawSprite(gl_vissprite_t *spr)
{
FOutVector wallVerts[4];
- patch_t *gpatch; // sprite patch converted to hardware
+ patch_t *gpatch;
FSurfaceInfo Surf;
const boolean splat = R_ThingIsFloorSprite(spr->mobj);
@@ -4141,6 +4181,11 @@ static void HWR_DrawSprite(gl_vissprite_t *spr)
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 = ((GLPatch_t *)gpatch->hardware)->max_s;
@@ -4160,11 +4205,6 @@ static void HWR_DrawSprite(gl_vissprite_t *spr)
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
@@ -4219,6 +4259,7 @@ static void HWR_DrawSprite(gl_vissprite_t *spr)
}
{
+ INT32 shader = SHADER_DEFAULT;
FBITFIELD blend = 0;
FBITFIELD occlusion;
boolean use_linkdraw_hack = false;
@@ -4244,8 +4285,6 @@ static void HWR_DrawSprite(gl_vissprite_t *spr)
else if (spr->mobj->frame & FF_TRANSMASK)
{
INT32 trans = (spr->mobj->frame & FF_TRANSMASK)>>FF_TRANSSHIFT;
- if (spr->mobj->blendmode == AST_TRANSLUCENT && trans >= NUMTRANSMAPS)
- return;
blend = HWR_SurfaceBlend(spr->mobj->blendmode, trans, &Surf);
}
else
@@ -4271,7 +4310,13 @@ static void HWR_DrawSprite(gl_vissprite_t *spr)
if (!occlusion) use_linkdraw_hack = true;
}
- HWR_ProcessPolygon(&Surf, wallVerts, 4, blend|PF_Modulated, SHADER_SPRITE, 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);
@@ -4282,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];
- patch_t *gpatch; // sprite patch converted to hardware
+ patch_t *gpatch;
FSurfaceInfo Surf;
if (!spr->mobj)
@@ -4337,7 +4383,7 @@ static inline void HWR_DrawPrecipitationSprite(gl_vissprite_t *spr)
// 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)
@@ -4345,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)
@@ -4358,9 +4404,7 @@ static inline void HWR_DrawPrecipitationSprite(gl_vissprite_t *spr)
if (spr->mobj->frame & FF_TRANSMASK)
{
INT32 trans = (spr->mobj->frame & FF_TRANSMASK)>>FF_TRANSSHIFT;
- if (spr->mobj->blendmode == AST_TRANSLUCENT && trans >= NUMTRANSMAPS)
- return;
- blend = HWR_SurfaceBlend(spr->mobj->blendmode, trans, &Surf);
+ blend = HWR_SurfaceBlend(AST_TRANSLUCENT, trans, &Surf);
}
else
{
@@ -4372,7 +4416,13 @@ static inline void HWR_DrawPrecipitationSprite(gl_vissprite_t *spr)
blend = HWR_GetBlendModeFlag(spr->mobj->blendmode)|PF_Occlude;
}
- HWR_ProcessPolygon(&Surf, wallVerts, 4, blend|PF_Modulated, SHADER_SPRITE, false); // sprite shader
+ if (HWR_UseShader())
+ {
+ shader = SHADER_SPRITE;
+ blend |= PF_ColorMapped;
+ }
+
+ HWR_ProcessPolygon(&Surf, wallVerts, 4, blend|PF_Modulated, shader, false);
}
#endif
@@ -4921,8 +4971,8 @@ static void HWR_ProjectSprite(mobj_t *thing)
angle_t ang;
INT32 heightsec, phs;
- const boolean papersprite = R_ThingIsPaperSprite(thing);
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;
@@ -4939,6 +4989,13 @@ static void HWR_ProjectSprite(mobj_t *thing)
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);
@@ -5325,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;
@@ -5358,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];
@@ -6454,24 +6518,29 @@ 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 = SHADER_WALL; // 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 = SHADER_FOG; // fog shader
+ if (fogwall)
+ shader = SHADER_FOG;
+ else
+ shader = SHADER_WALL;
+
+ blendmode |= PF_ColorMapped;
}
+ if (fogwall)
+ blendmode |= PF_Fog;
+
blendmode |= PF_Modulated; // No PF_Occlude means overlapping (incorrect) transparency
HWR_ProcessPolygon(pSurf, wallVerts, 4, blendmode, shader, false);
}
@@ -6514,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_AdditiveSource|PF_NoTexture|PF_NoDepthTest);
+ HWD.pfnDrawPolygon(&Surf, v, 4, PF_Modulated|PF_Additive|PF_NoTexture|PF_NoDepthTest);
}
// Capture the screen for intermission and screen waving
@@ -6647,7 +6716,6 @@ void HWR_DrawScreenFinalTexture(int width, int height)
HWD.pfnDrawScreenFinalTexture(width, height);
}
-// jimita 18032019
static inline UINT16 HWR_FindShaderDefs(UINT16 wadnum)
{
UINT16 i;
diff --git a/src/hardware/hw_md2.c b/src/hardware/hw_md2.c
index 2e944d3e601c03f541bdf65d3ed57fda4c81d4a1..5caf344f75a3859751919338d8cea8b6badf1f92 100644
--- a/src/hardware/hw_md2.c
+++ b/src/hardware/hw_md2.c
@@ -158,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);
@@ -1314,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)
@@ -1322,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)
@@ -1340,10 +1340,9 @@ boolean HWR_DrawModel(gl_vissprite_t *spr)
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;
@@ -1405,6 +1404,11 @@ boolean HWR_DrawModel(gl_vissprite_t *spr)
|| ((!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)
diff --git a/src/hardware/r_opengl/r_opengl.c b/src/hardware/r_opengl/r_opengl.c
index 2568a7d08c2f6deb92c26d17a97c03ab8a3ea1e4..af06a198fc3f110278c3894ee99a2e0596860e0c 100644
--- a/src/hardware/r_opengl/r_opengl.c
+++ b/src/hardware/r_opengl/r_opengl.c
@@ -910,7 +910,6 @@ void SetupGLFunc4(void)
pgluBuild2DMipmaps = GetGLFunc("gluBuild2DMipmaps");
}
-// jimita
EXPORT boolean HWRAPI(CompileShaders) (void)
{
#ifdef GL_SHADERS
@@ -962,8 +961,6 @@ EXPORT boolean HWRAPI(CompileShaders) (void)
}
}
- SetShader(SHADER_DEFAULT);
-
return true;
#else
return false;
@@ -1303,8 +1300,12 @@ EXPORT void HWRAPI(DeleteTexture) (GLMipmap_t *pTexInfo)
{
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;
}
@@ -1578,12 +1579,11 @@ static void SetBlendMode(FBITFIELD flags)
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_AdditiveSource & PF_Blending:
- pglBlendFunc(GL_SRC_ALPHA, GL_ONE); // src * alpha + dest
- break;
case PF_Multiplicative & PF_Blending:
pglBlendFunc(GL_DST_COLOR, GL_ZERO);
break;
@@ -1622,7 +1622,6 @@ static void SetBlendMode(FBITFIELD flags)
break;
case PF_Translucent & PF_Blending:
case PF_Additive & PF_Blending:
- case PF_AdditiveSource & PF_Blending:
case PF_Subtractive & PF_Blending:
case PF_ReverseSubtract & PF_Blending:
case PF_Environment & PF_Blending:
@@ -2176,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)
@@ -2754,7 +2755,7 @@ static void DrawModelEx(model_t *model, INT32 frameIndex, INT32 duration, INT32
fade.alpha = byte2float[Surface->FadeColor.s.alpha];
flags = (Surface->PolyFlags | PF_Modulated);
- if (Surface->PolyFlags & (PF_Additive|PF_AdditiveSource|PF_Subtractive|PF_ReverseSubtract|PF_Multiplicative))
+ 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);
@@ -3015,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)
diff --git a/src/hu_stuff.c b/src/hu_stuff.c
index 0b24d06906cb66224a4ef3349cf6d12249d913eb..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);
@@ -2246,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),
@@ -2260,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
@@ -2275,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);
}
//
@@ -2301,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))
@@ -2458,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)
{
@@ -2500,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");
}
}
}
@@ -2586,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)
{
@@ -2624,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");
}
}
}
@@ -2655,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));
@@ -2763,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));
diff --git a/src/i_addrinfo.c b/src/i_addrinfo.c
index e77774549b4b572aa6f61557b3a5286347c077c2..ff0dfbd3218d40e735da8799f59526778b08bd81 100644
--- a/src/i_addrinfo.c
+++ b/src/i_addrinfo.c
@@ -20,7 +20,7 @@
#else
#include <winsock.h>
#endif
-#elif !defined (__DJGPP__)
+#else
#include <sys/socket.h>
#include <arpa/inet.h>
#include <netdb.h>
diff --git a/src/i_tcp.c b/src/i_tcp.c
index ab8a69a9fad3c300c92fa540fa60ae68345aff82..f54dd68787d1650931fde85dd1aed331c2307d61 100644
--- a/src/i_tcp.c
+++ b/src/i_tcp.c
@@ -64,7 +64,7 @@
#include <errno.h>
#include <time.h>
- #if (defined (__unix__) && !defined (MSDOS)) || defined(__APPLE__) || defined (UNIXCOMMON)
+ #if defined (__unix__) || defined (__APPLE__) || defined (UNIXCOMMON)
#include <sys/time.h>
#endif // UNIXCOMMON
#endif
@@ -107,15 +107,6 @@
#endif
#endif // USE_WINSOCK
- #ifdef __DJGPP__
- #ifdef WATTCP // Alam_GBC: Wattcp may need this
- #include <tcp.h>
- #define strerror strerror_s
- #else // wattcp
- #include <lsck/lsck.h>
- #endif // libsocket
- #endif // djgpp
-
typedef union
{
struct sockaddr any;
@@ -149,32 +140,22 @@
#include "doomstat.h"
-// win32 or djgpp
-#if defined (USE_WINSOCK) || defined (__DJGPP__)
+// win32
+#ifdef USE_WINSOCK
// winsock stuff (in winsock a socket is not a file)
#define ioctl ioctlsocket
#define close closesocket
#endif
#include "i_addrinfo.h"
-
-#ifdef __DJGPP__
-
-#ifdef WATTCP
#define SELECTTEST
-#endif
-
-#else
-#define SELECTTEST
-#endif
-
#define DEFAULTPORT "5029"
#if defined (USE_WINSOCK) && !defined (NONET)
typedef SOCKET SOCKET_TYPE;
#define ERRSOCKET (SOCKET_ERROR)
#else
- #if (defined (__unix__) && !defined (MSDOS)) || defined (__APPLE__) || defined (__HAIKU__)
+ #if defined (__unix__) || defined (__APPLE__) || defined (__HAIKU__)
typedef int SOCKET_TYPE;
#else
typedef unsigned long SOCKET_TYPE;
@@ -184,7 +165,7 @@
#ifndef NONET
// define socklen_t in DOS/Windows if it is not already defined
- #if (defined (WATTCP) && !defined (__libsocket_socklen_t)) || defined (USE_WINSOCK1)
+ #ifdef USE_WINSOCK1
typedef int socklen_t;
#endif
static SOCKET_TYPE mysockets[MAXNETNODES+1] = {ERRSOCKET};
@@ -207,19 +188,6 @@ static const char *serverport_name = DEFAULTPORT;
static const char *clientport_name;/* any port */
#ifndef NONET
-
-#ifdef WATTCP
-static void wattcp_outch(char s)
-{
- static char old = '\0';
- char pr[2] = {s,0};
- if (s == old && old == ' ') return;
- else old = s;
- if (s == '\r') CONS_Printf("\n");
- else if (s != '\n') CONS_Printf(pr);
-}
-#endif
-
#ifdef USE_WINSOCK
// stupid microsoft makes things complicated
static char *get_WSAErrorStr(int e)
@@ -764,11 +732,7 @@ static SOCKET_TYPE UDP_Bind(int family, struct sockaddr *addr, socklen_t addrlen
int opt;
socklen_t opts;
#ifdef FIONBIO
-#ifdef WATTCP
- char trueval = true;
-#else
unsigned long trueval = true;
-#endif
#endif
mysockaddr_t straddr;
struct sockaddr_in sin;
@@ -1138,61 +1102,7 @@ boolean I_InitTcpDriver(void)
CONS_Debug(DBG_NETPLAY, "WinSock description: %s\n",WSAData.szDescription);
CONS_Debug(DBG_NETPLAY, "WinSock System Status: %s\n",WSAData.szSystemStatus);
#endif
-#ifdef __DJGPP__
-#ifdef WATTCP // Alam_GBC: survive bootp, dhcp, rarp and wattcp/pktdrv from failing to load
- survive_eth = 1; // would be needed to not exit if pkt_eth_init() fails
- survive_bootp = 1; // ditto for BOOTP
- survive_dhcp = 1; // ditto for DHCP/RARP
- survive_rarp = 1;
- //_watt_do_exit = false;
- //_watt_handle_cbreak = false;
- //_watt_no_config = true;
- _outch = wattcp_outch;
- init_misc();
-//#ifdef DEBUGFILE
- dbug_init();
-//#endif
- switch (sock_init())
- {
- case 0:
- init_tcp_driver = true;
- break;
- case 3:
- CONS_Debug(DBG_NETPLAY, "No packet driver detected\n");
- break;
- case 4:
- CONS_Debug(DBG_NETPLAY, "Error while talking to packet driver\n");
- break;
- case 5:
- CONS_Debug(DBG_NETPLAY, "BOOTP failed\n");
- break;
- case 6:
- CONS_Debug(DBG_NETPLAY, "DHCP failed\n");
- break;
- case 7:
- CONS_Debug(DBG_NETPLAY, "RARP failed\n");
- break;
- case 8:
- CONS_Debug(DBG_NETPLAY, "TCP/IP failed\n");
- break;
- case 9:
- CONS_Debug(DBG_NETPLAY, "PPPoE login/discovery failed\n");
- break;
- default:
- CONS_Debug(DBG_NETPLAY, "Unknown error with TCP/IP stack\n");
- break;
- }
- hires_timer(0);
-#else // wattcp
- if (__lsck_init())
- init_tcp_driver = true;
- else
- CONS_Debug(DBG_NETPLAY, "No TCP/IP driver detected\n");
-#endif // libsocket
-#endif // __DJGPP__
-#ifndef __DJGPP__
init_tcp_driver = true;
-#endif
}
#endif
if (!tcp_was_up && init_tcp_driver)
@@ -1217,10 +1127,8 @@ static void SOCK_CloseSocket(void)
if (mysockets[i] != (SOCKET_TYPE)ERRSOCKET
&& FD_ISSET(mysockets[i], &masterset))
{
-#if !defined (__DJGPP__) || defined (WATTCP)
FD_CLR(mysockets[i], &masterset);
close(mysockets[i]);
-#endif
}
mysockets[i] = ERRSOCKET;
}
@@ -1237,14 +1145,6 @@ void I_ShutdownTcpDriver(void)
WS_addrinfocleanup();
WSACleanup();
#endif
-#ifdef __DJGPP__
-#ifdef WATTCP // wattcp
- //_outch = NULL;
- sock_exit();
-#else
- __lsck_uninit();
-#endif // libsocket
-#endif // __DJGPP__
CONS_Printf("shut down\n");
init_tcp_driver = false;
#endif
diff --git a/src/lua_baselib.c b/src/lua_baselib.c
index 6e0116d126fbbb6ed3bb57805c3a9bd8fe83d8ec..a265465dad6b1c542024f438fb2e961234d0d051 100644
--- a/src/lua_baselib.c
+++ b/src/lua_baselib.c
@@ -242,16 +242,10 @@ 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
@@ -432,7 +426,6 @@ static int lib_pAproxDistance(lua_State *L)
fixed_t dx = luaL_checkfixed(L, 1);
fixed_t dy = luaL_checkfixed(L, 2);
//HUDSAFE
- LUA_Deprecated(L, "P_AproxDistance", "FixedHypot");
lua_pushfixed(L, R_PointToDist2(0, 0, dx, dy));
return 1;
}
@@ -1672,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
///////////
@@ -3873,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},
diff --git a/src/lua_consolelib.c b/src/lua_consolelib.c
index 5344fee7617aacf789e577eed98de26b3296818a..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)
{
@@ -273,16 +273,13 @@ 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);
@@ -291,13 +288,10 @@ static void Lua_OnChange(void)
// 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, 0, 1); // call function(cvar)
lua_pop(gL, 1); // pop CV_OnChange table
@@ -312,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
@@ -369,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
@@ -397,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;
}
@@ -415,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);
@@ -440,7 +419,8 @@ 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;
}
@@ -450,7 +430,7 @@ static int CVarSetFunction
void (*Set)(consvar_t *, const char *),
void (*SetValue)(consvar_t *, INT32)
){
- consvar_t *cvar = (consvar_t *)luaL_checkudata(L, 1, META_CVAR);
+ 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);
@@ -482,7 +462,7 @@ static int lib_cvStealthSet(lua_State *L)
static int lib_cvAddValue(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);
if (cvar->flags & CV_NOLUA)
return luaL_error(L, "Variable %s cannot be set from Lua.", cvar->name);
@@ -541,7 +521,7 @@ static luaL_Reg lib[] = {
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 5cfcb8360149093bd7340c0301b679b7d2b03698..0d631aa4e275259c5bda256e2dcc0e5824283ea4 100644
--- a/src/lua_hook.h
+++ b/src/lua_hook.h
@@ -61,6 +61,8 @@ enum hook {
hook_GameQuit,
hook_PlayerCmd,
hook_MusicChange,
+ hook_PlayerHeight,
+ hook_PlayerCanEnterSpinGaps,
hook_MAX // last hook
};
@@ -118,3 +120,5 @@ boolean LUAh_ShouldJingleContinue(player_t *player, const char *musname); // Hoo
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 29c15a4de9887430b90323e505a2d4235bcf0a76..a3f4a95d232e50f6a94f78289c353f1d6fa8c7c8 100644
--- a/src/lua_hooklib.c
+++ b/src/lua_hooklib.c
@@ -77,6 +77,8 @@ const char *const hookNames[hook_MAX+1] = {
"GameQuit",
"PlayerCmd",
"MusicChange",
+ "PlayerHeight",
+ "PlayerCanEnterSpinGaps",
NULL
};
@@ -221,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:
@@ -469,7 +473,7 @@ void LUAh_ThinkFrame(void)
hook_p hookp;
// variables used by perf stats
int hook_index = 0;
- int time_taken = 0;
+ precise_t time_taken = 0;
if (!gL || !(hooksAvailable[hook_ThinkFrame/8] & (1<<(hook_ThinkFrame%8))))
return;
@@ -1955,13 +1959,13 @@ boolean LUAh_MusicChange(const char *oldname, char *newname, UINT16 *mflags, boo
if (lua_isboolean(gL, -4))
*looping = lua_toboolean(gL, -4);
// output 4: position override
- if (lua_isboolean(gL, -3))
+ if (lua_isnumber(gL, -3))
*position = lua_tonumber(gL, -3);
// output 5: prefadems override
- if (lua_isboolean(gL, -2))
+ if (lua_isnumber(gL, -2))
*prefadems = lua_tonumber(gL, -2);
// output 6: fadeinms override
- if (lua_isboolean(gL, -1))
+ if (lua_isnumber(gL, -1))
*fadeinms = lua_tonumber(gL, -1);
lua_pop(gL, 7); // Pop returned values and error handler
@@ -1971,3 +1975,89 @@ boolean LUAh_MusicChange(const char *oldname, char *newname, UINT16 *mflags, boo
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_maplib.c b/src/lua_maplib.c
index 6a9091cc949f364c8e01fd19d2b3e0eb740d44c8..0161417960fc30556b1fdf11e112c4a7c6f5215f 100644
--- a/src/lua_maplib.c
+++ b/src/lua_maplib.c
@@ -583,7 +583,7 @@ static int sector_get(lua_State *L)
lua_pushinteger(L, sector->special);
return 1;
case sector_tag:
- lua_pushinteger(L, Tag_FGet(§or->tags));
+ lua_pushinteger(L, (UINT16)Tag_FGet(§or->tags));
return 1;
case sector_taglist:
LUA_PushUserdata(L, §or->tags, META_SECTORTAGLIST);
@@ -828,6 +828,17 @@ static int line_get(lua_State *L)
lua_pushinteger(L, line->special);
return 1;
case 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:
diff --git a/src/lua_mathlib.c b/src/lua_mathlib.c
index b6046ab53b2d37948bc6fdb40c540a49d148be57..45168ad79ad79f2a51b1a8feb56abb81197222c2 100644
--- a/src/lua_mathlib.c
+++ b/src/lua_mathlib.c
@@ -87,6 +87,12 @@ static int lib_finetangent(lua_State *L)
return 1;
}
+static int lib_fixedacos(lua_State *L)
+{
+ lua_pushangle(L, FixedAcos(luaL_checkfixed(L, 1)));
+ return 1;
+}
+
// Fixed math
////////////////
@@ -192,6 +198,7 @@ static luaL_Reg lib[] = {
{"sin", lib_finesine},
{"cos", lib_finecosine},
{"tan", lib_finetangent},
+ {"acos", lib_fixedacos},
{"FixedAngle", lib_fixedangle},
{"fixangle" , lib_fixedangle},
{"AngleFixed", lib_anglefixed},
diff --git a/src/lua_polyobjlib.c b/src/lua_polyobjlib.c
index 365d970563dd504cc896abaac756fffd6cd2458f..2a5bcfbf19a54458e63960d5b06c1466f96487de 100644
--- a/src/lua_polyobjlib.c
+++ b/src/lua_polyobjlib.c
@@ -417,7 +417,7 @@ static int lib_getPolyObject(lua_State *L)
{
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);
+ return luaL_error(L, "polyobjects[] index %d out of range (0 - %d)", i, numPolyObjects-1);
LUA_PushUserdata(L, &PolyObjects[i], META_POLYOBJ);
return 1;
}
@@ -481,6 +481,6 @@ int LUA_PolyObjLib(lua_State *L)
lua_pushcfunction(L, lib_numPolyObjects);
lua_setfield(L, -2, "__len");
lua_setmetatable(L, -2);
- lua_setglobal(L, "PolyObjects");
+ lua_setglobal(L, "polyobjects");
return 0;
}
diff --git a/src/lua_script.c b/src/lua_script.c
index 7fd5a98e6f71620ad4c89eff58e71e222773b622..9f84328329485dac3df433b96403226b51b4535c 100644
--- a/src/lua_script.c
+++ b/src/lua_script.c
@@ -714,27 +714,6 @@ 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)
-{
- if (data)
- {
- 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.
diff --git a/src/lua_script.h b/src/lua_script.h
index 77fbb7c1d125f682db270b7d4f051d6673290d43..89ba7b6eec329cfe7372a6081a2fa8e615fc1a44 100644
--- a/src/lua_script.h
+++ b/src/lua_script.h
@@ -56,7 +56,7 @@ 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);
@@ -87,7 +87,6 @@ typedef enum {
LPUSHED_EXISTING,
} lpushed_t;
-void LUA_PushLightUserdata(lua_State *L, void *data, const char *meta);
void LUA_PushUserdata(lua_State *L, void *data, const char *meta);
lpushed_t LUA_RawPushUserdata(lua_State *L, void *data);
diff --git a/src/lua_skinlib.c b/src/lua_skinlib.c
index 56be6bf4f40504420e7e67cb0c6b60c739a6dfc7..7e7480be389741aa9a135e7681ebcf2249c2806b 100644
--- a/src/lua_skinlib.c
+++ b/src/lua_skinlib.c
@@ -213,7 +213,7 @@ static int skin_get(lua_State *L)
lua_pushinteger(L, skin->availability);
break;
case skin_sprites:
- LUA_PushLightUserdata(L, skin->sprites, META_SKINSPRITES);
+ LUA_PushUserdata(L, skin->sprites, META_SKINSPRITES);
break;
}
return 1;
@@ -336,13 +336,13 @@ static const char *const sprites_opt[] = {
// skin.sprites[i] -> sprites[i]
static int lib_getSkinSprite(lua_State *L)
{
- spritedef_t *sprites = (spritedef_t *)luaL_checkudata(L, 1, META_SKINSPRITES);
+ 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_PushLightUserdata(L, &sprites[i], META_SKINSPRITESLIST);
+ LUA_PushUserdata(L, &sprites[i], META_SKINSPRITESLIST);
return 1;
}
@@ -355,7 +355,7 @@ static int lib_numSkinsSprites(lua_State *L)
static int sprite_get(lua_State *L)
{
- spritedef_t *sprite = (spritedef_t *)luaL_checkudata(L, 1, META_SKINSPRITESLIST);
+ spritedef_t *sprite = *(spritedef_t **)luaL_checkudata(L, 1, META_SKINSPRITESLIST);
enum spritesopt field = luaL_checkoption(L, 2, NULL, sprites_opt);
switch (field)
diff --git a/src/m_fixed.h b/src/m_fixed.h
index 289ca442a03e7740a7e1844303a8d84c97f9aa22..f634028c7ab3bf645a2380a023367a529fe84034 100644
--- a/src/m_fixed.h
+++ b/src/m_fixed.h
@@ -71,7 +71,7 @@ FUNCMATH FUNCINLINE static ATTRINLINE fixed_t FloatToFixed(float f)
value [eax] \
modify exact [eax edx]
#elif defined (__GNUC__) && defined (__i386__) && !defined (NOASM)
- // DJGPP, i386 linux, cygwin or mingw
+ // i386 linux, cygwin or mingw
FUNCMATH FUNCINLINE static inline fixed_t FixedMul(fixed_t a, fixed_t b) // asm
{
fixed_t ret;
diff --git a/src/m_menu.c b/src/m_menu.c
index 05c819c3751e19312f689243de60b7995fbaf48f..40215090c936a22d00d4ab6c8b809f1ecdd6aea6 100644
--- a/src/m_menu.c
+++ b/src/m_menu.c
@@ -1322,7 +1322,7 @@ static menuitem_t OP_Camera2ExtendedOptionsMenu[] =
enum
{
op_video_resolution = 1,
-#if (defined (__unix__) && !defined (MSDOS)) || defined (UNIXCOMMON) || defined (HAVE_SDL)
+#if defined (__unix__) || defined (UNIXCOMMON) || defined (HAVE_SDL)
op_video_fullscreen,
#endif
op_video_vsync,
@@ -1334,7 +1334,7 @@ static menuitem_t OP_VideoOptionsMenu[] =
{IT_HEADER, NULL, "Screen", NULL, 0},
{IT_STRING | IT_CALL, NULL, "Set Resolution...", M_VideoModeMenu, 6},
-#if (defined (__unix__) && !defined (MSDOS)) || defined (UNIXCOMMON) || defined (HAVE_SDL)
+#if defined (__unix__) || defined (UNIXCOMMON) || defined (HAVE_SDL)
{IT_STRING|IT_CVAR, NULL, "Fullscreen", &cv_fullscreen, 11},
#endif
{IT_STRING | IT_CVAR, NULL, "Vertical Sync", &cv_vidwait, 16},
@@ -1453,7 +1453,7 @@ static menuitem_t OP_OpenGLOptionsMenu[] =
#ifdef ALAM_LIGHTING
{IT_SUBMENU|IT_STRING, NULL, "Lighting...", &OP_OpenGLLightingDef, 144},
#endif
-#if defined (_WINDOWS) && (!((defined (__unix__) && !defined (MSDOS)) || defined (UNIXCOMMON) || defined (HAVE_SDL)))
+#if defined (_WINDOWS) && (!(defined (__unix__) || defined (UNIXCOMMON) || defined (HAVE_SDL)))
{IT_STRING|IT_CVAR, NULL, "Fullscreen", &cv_fullscreen, 154},
#endif
};
@@ -1612,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
};
@@ -6233,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)
{
@@ -11418,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
{
@@ -11428,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
@@ -12922,7 +12923,7 @@ static void M_VideoModeMenu(INT32 choice)
memset(modedescs, 0, sizeof(modedescs));
-#if (defined (__unix__) && !defined (MSDOS)) || defined (UNIXCOMMON) || defined (HAVE_SDL)
+#if defined (__unix__) || defined (UNIXCOMMON) || defined (HAVE_SDL)
VID_PrepareModeList(); // FIXME: hack
#endif
vidm_nummodes = 0;
diff --git a/src/m_misc.c b/src/m_misc.c
index ad2d133ab1dd8e6f743c4c2bab8adecd35d699e7..a19320648afe3740db66adc30f7bb93fe579a7d8 100644
--- a/src/m_misc.c
+++ b/src/m_misc.c
@@ -64,8 +64,6 @@ typedef off_t off64_t;
#define PRIdS "u"
#elif defined (_WIN32)
#define PRIdS "Iu"
-#elif defined (DJGPP)
-#define PRIdS "u"
#else
#define PRIdS "zu"
#endif
@@ -165,7 +163,9 @@ consvar_t cv_zlib_window_bitsa = CVAR_INIT ("apng_window_size", "32k", CV_SAVE,
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);
+#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
diff --git a/src/m_perfstats.c b/src/m_perfstats.c
index 1596a87e5a841d019513c706b13608259334d7e7..b58599b6d934651ab4d8a0e45f71713477921a52 100644
--- a/src/m_perfstats.c
+++ b/src/m_perfstats.c
@@ -62,7 +62,7 @@ int thinkframe_hooks_capacity = 16;
static INT32 draw_row;
-void PS_SetThinkFrameHookInfo(int index, UINT32 time_taken, char* short_src)
+void PS_SetThinkFrameHookInfo(int index, precise_t time_taken, char* short_src)
{
if (!thinkframe_hooks)
{
@@ -565,7 +565,7 @@ void M_DrawPerfStats(void)
len = (int)strlen(str);
if (len > 20)
str += len - 20;
- snprintf(s, sizeof s - 1, "%20s: %u", str, thinkframe_hooks[i].time_taken);
+ 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)
diff --git a/src/m_perfstats.h b/src/m_perfstats.h
index 132bea38c696acaf9a7093cc81f795918452356d..1ca71957fcb7581eaa9248a6905e83358b1abcb0 100644
--- a/src/m_perfstats.h
+++ b/src/m_perfstats.h
@@ -30,11 +30,11 @@ extern int ps_lua_mobjhooks;
typedef struct
{
- UINT32 time_taken;
+ precise_t time_taken;
char short_src[LUA_IDSIZE];
} ps_hookinfo_t;
-void PS_SetThinkFrameHookInfo(int index, UINT32 time_taken, char* short_src);
+void PS_SetThinkFrameHookInfo(int index, precise_t time_taken, char* short_src);
void M_DrawPerfStats(void);
diff --git a/src/p_enemy.c b/src/p_enemy.c
index 294615b8883e620c1c72ccdf56ff42b53b265d8e..fe02d29733bd82f16df07cb0844a3ac0f4857718 100644
--- a/src/p_enemy.c
+++ b/src/p_enemy.c
@@ -1834,7 +1834,7 @@ void A_SnailerThink(mobj_t *actor)
fixed_t dist;
fixed_t dx, dy;
- dist = R_PointToDist2(0, 0, actor->x - actor->target->x, actor->y - actor->target->y);
+ dist = P_AproxDistance(actor->x - actor->target->x, actor->y - actor->target->y);
if (an > ANGLE_45 && an <= ANGLE_90) // fire at 45 degrees to the left
{
@@ -4201,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;
@@ -9879,22 +9879,23 @@ void A_Custom3DRotate(mobj_t *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;
}
diff --git a/src/p_local.h b/src/p_local.h
index 8caab0d2716f97f376580b7fc53f6660e5e7082d..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);
diff --git a/src/p_map.c b/src/p_map.c
index 630d282000e5fc9bf19873eb67d81bec4ac6d160..4dcb8e2a772d1ce2bf5cb5306d9059cbe36f8c43 100644
--- a/src/p_map.c
+++ b/src/p_map.c
@@ -2730,7 +2730,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;
@@ -3338,6 +3341,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;
}
diff --git a/src/p_saveg.c b/src/p_saveg.c
index 03229e740bc0b5cddc3940ee8df0b96d1843347d..818596cac286ba060a07c178f52d90710795e2d6 100644
--- a/src/p_saveg.c
+++ b/src/p_saveg.c
@@ -4190,7 +4190,10 @@ static inline boolean P_NetUnArchiveMisc(boolean reloading)
tokenlist = READUINT32(save_p);
if (!P_LoadLevel(true, reloading))
+ {
+ CONS_Alert(CONS_ERROR, M_GetText("Can't load the level!\n"));
return false;
+ }
// get the time
leveltime = READUINT32(save_p);
@@ -4268,19 +4271,26 @@ static inline boolean P_UnArchiveLuabanksAndConsistency(void)
{
switch (READUINT8(save_p))
{
- case 0xb7:
+ case 0xb7: // luabanks marker
{
UINT8 i, banksinuse = READUINT8(save_p);
if (banksinuse > NUM_LUABANKS)
+ {
+ CONS_Alert(CONS_ERROR, M_GetText("Corrupt Luabanks! (Too many banks in use)\n"));
return false;
+ }
for (i = 0; i < banksinuse; i++)
luabanks[i] = READINT32(save_p);
- if (READUINT8(save_p) != 0x1d)
+ if (READUINT8(save_p) != 0x1d) // consistency marker
+ {
+ CONS_Alert(CONS_ERROR, M_GetText("Corrupt Luabanks! (Failed consistency check)\n"));
return false;
+ }
}
- case 0x1d:
+ case 0x1d: // consistency marker
break;
- default:
+ default: // anything else is nonsense
+ CONS_Alert(CONS_ERROR, M_GetText("Failed consistency check (???)\n"));
return false;
}
diff --git a/src/p_setup.c b/src/p_setup.c
index 66243fb0ec224b09c5e366be804aebf49b04ec5d..40dd1a28477a50c3216372314facfd5efdab8984 100644
--- a/src/p_setup.c
+++ b/src/p_setup.c
@@ -4135,7 +4135,7 @@ boolean P_LoadLevel(boolean fromnetsave, boolean reloadinggamestate)
#ifdef HWRENDER
// Free GPU textures before freeing patches.
- if (vid.glstate == VID_GL_LIBRARY_LOADED)
+ if (rendermode == render_opengl && (vid.glstate == VID_GL_LIBRARY_LOADED))
HWR_ClearAllTextures();
#endif
@@ -4500,7 +4500,7 @@ boolean P_AddWadFile(const char *wadfilename)
#ifdef HWRENDER
// Free GPU textures before freeing patches.
- if (vid.glstate == VID_GL_LIBRARY_LOADED)
+ if (rendermode == render_opengl && (vid.glstate == VID_GL_LIBRARY_LOADED))
HWR_ClearAllTextures();
#endif
diff --git a/src/p_user.c b/src/p_user.c
index ca1dfd478a831cbdeb201f3d201737603c1f946c..b3bfb763c16d8676a1ab2566a0b3fa88cdf64a8e 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 ));
@@ -4880,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;
@@ -5924,7 +5930,7 @@ static void P_3dMovement(player_t *player)
player->rmomy = player->mo->momy - player->cmomy;
// Calculates player's speed based on distance-of-a-line formula
- player->speed = R_PointToDist2(0, 0, player->rmomx, player->rmomy);
+ player->speed = P_AproxDistance(player->rmomx, player->rmomy);
// Monster Iestyn - 04-11-13
// Quadrants are stupid, excessive and broken, let's do this a much simpler way!
@@ -8645,14 +8651,16 @@ void P_MovePlayer(player_t *player)
{
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;
@@ -11356,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;
@@ -12950,3 +12958,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_data.c b/src/r_data.c
index af672f6dc024ee2c6840818982d586b17ceacb07..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.
@@ -30,10 +30,6 @@
#include "byteptr.h"
#include "dehacked.h"
-#ifdef _WIN32
-#include <malloc.h> // alloca(sizeof)
-#endif
-
//
// Graphics.
// SRB2 graphics for walls and sprites
diff --git a/src/r_draw.c b/src/r_draw.c
index d9ea942a2f22b301bdbd1762e0635f31ba085d6e..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.
@@ -134,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;
+ }
+
+ return ttc;
+}
-#define TRANSTAB_AMTMUL10 (256.0f / 10.0f)
+CV_PossibleValue_t Color_cons_t[MAXSKINCOLORS+1];
/** \brief Initializes the translucency tables used by the Software renderer.
*/
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);
@@ -164,42 +196,43 @@ void R_InitTranslucencyTables(void)
R_GenerateBlendTables();
}
-void R_GenerateBlendTables(void)
+static colorlookup_t transtab_lut;
+
+static void BlendTab_Translucent(UINT8 *table, int style, UINT8 blendamt)
{
- INT32 i;
+ INT16 bg, fg;
- for (i = 0; i < NUMBLENDMAPS; i++)
- {
- if (i == blendtab_modulate)
- continue;
- blendtables[i] = Z_MallocAlign((NUMTRANSTABLES + 1) * 0x10000, PU_STATIC, NULL, 16);
- }
+ if (table == NULL)
+ I_Error("BlendTab_Translucent: input table was NULL!");
- for (i = 0; i <= 9; i++)
+ for (bg = 0; bg < 0xFF; bg++)
{
- const size_t offs = (0x10000 * i);
- const UINT8 alpha = TRANSTAB_AMTMUL10 * i;
+ for (fg = 0; fg < 0xFF; fg++)
+ {
+ RGBA_t backrgba = V_GetMasterColor(bg);
+ RGBA_t frontrgba = V_GetMasterColor(fg);
+ RGBA_t result;
- R_GenerateTranslucencyTable(blendtables[blendtab_add] + offs, AST_ADD, alpha);
- R_GenerateTranslucencyTable(blendtables[blendtab_subtract] + offs, AST_SUBTRACT, alpha);
- R_GenerateTranslucencyTable(blendtables[blendtab_reversesubtract] + offs, AST_REVERSESUBTRACT, alpha);
- }
+ result.rgba = ASTBlendPixel(backrgba, frontrgba, style, 0xFF);
+ result.rgba = ASTBlendPixel(result, frontrgba, AST_TRANSLUCENT, blendamt);
- // Modulation blending only requires a single table
- blendtables[blendtab_modulate] = Z_MallocAlign(0x10000, PU_STATIC, NULL, 16);
- R_GenerateTranslucencyTable(blendtables[blendtab_modulate], AST_MODULATE, 0);
+ table[((bg * 0x100) + fg)] = GetColorLUT(&transtab_lut, result.s.red, result.s.green, result.s.blue);
+ }
+ }
}
-static colorlookup_t transtab_lut;
-
-void R_GenerateTranslucencyTable(UINT8 *table, int style, UINT8 blendamt)
+static void BlendTab_Subtractive(UINT8 *table, int style, UINT8 blendamt)
{
INT16 bg, fg;
if (table == NULL)
- I_Error("R_GenerateTranslucencyTable: input table was NULL!");
+ I_Error("BlendTab_Subtractive: input table was NULL!");
- InitColorLUT(&transtab_lut, pMasterPalette, false);
+ if (blendamt == 0xFF)
+ {
+ memset(table, GetColorLUT(&transtab_lut, 0, 0, 0), 0x10000);
+ return;
+ }
for (bg = 0; bg < 0xFF; bg++)
{
@@ -209,12 +242,94 @@ void R_GenerateTranslucencyTable(UINT8 *table, int style, UINT8 blendamt)
RGBA_t frontrgba = V_GetMasterColor(fg);
RGBA_t result;
- result.rgba = ASTBlendPixel(backrgba, frontrgba, style, blendamt);
+ 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)
@@ -224,7 +339,12 @@ UINT8 *R_GetTranslucencyTable(INT32 alphalevel)
UINT8 *R_GetBlendTable(int style, INT32 alphalevel)
{
- size_t offs = (ClipTransLevel(alphalevel) << FF_TRANSSHIFT);
+ 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.
@@ -249,6 +369,14 @@ UINT8 *R_GetBlendTable(int style, INT32 alphalevel)
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
// 0.2126 to red
@@ -308,7 +436,7 @@ static void R_RainbowColormap(UINT8 *dest_colormap, UINT16 skincolor)
/** \brief Generates a translation colormap.
\param dest_colormap colormap to populate
- \param skinnum number of skin, TC_DEFAULT or TC_BOSS
+ \param skinnum skin number, or a translation mode
\param color translation color
\return void
@@ -412,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)
@@ -448,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);
@@ -479,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 d1eb83033884742adc0c3d75f5325868f6bc29e1..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.
@@ -140,11 +140,12 @@ extern UINT8 *blendtables[NUMBLENDMAPS];
void R_InitTranslucencyTables(void);
void R_GenerateBlendTables(void);
-void R_GenerateTranslucencyTable(UINT8 *table, int style, UINT8 blendamt);
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[];
diff --git a/src/r_draw8.c b/src/r_draw8.c
index e78ba8a6c49b8f39a9c54fe0af814340c9462641..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.
@@ -1447,10 +1447,7 @@ void R_DrawFloorSprite_8 (void)
// 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!
- //
- // <Callum> 4194303 = (2048x2048)-1 (2048x2048 is maximum flat size)
val = (((UINT32)yposition >> nflatyshift) & nflatmask) | ((UINT32)xposition >> nflatxshift);
- val &= 4194303;
val = source[val];
if (val & 0xFF00)
dest[0] = colormap[translation[val & 0xFF]];
@@ -1458,7 +1455,6 @@ void R_DrawFloorSprite_8 (void)
yposition += ystep;
val = (((UINT32)yposition >> nflatyshift) & nflatmask) | ((UINT32)xposition >> nflatxshift);
- val &= 4194303;
val = source[val];
if (val & 0xFF00)
dest[1] = colormap[translation[val & 0xFF]];
@@ -1466,7 +1462,6 @@ void R_DrawFloorSprite_8 (void)
yposition += ystep;
val = (((UINT32)yposition >> nflatyshift) & nflatmask) | ((UINT32)xposition >> nflatxshift);
- val &= 4194303;
val = source[val];
if (val & 0xFF00)
dest[2] = colormap[translation[val & 0xFF]];
@@ -1474,7 +1469,6 @@ void R_DrawFloorSprite_8 (void)
yposition += ystep;
val = (((UINT32)yposition >> nflatyshift) & nflatmask) | ((UINT32)xposition >> nflatxshift);
- val &= 4194303;
val = source[val];
if (val & 0xFF00)
dest[3] = colormap[translation[val & 0xFF]];
@@ -1482,7 +1476,6 @@ void R_DrawFloorSprite_8 (void)
yposition += ystep;
val = (((UINT32)yposition >> nflatyshift) & nflatmask) | ((UINT32)xposition >> nflatxshift);
- val &= 4194303;
val = source[val];
if (val & 0xFF00)
dest[4] = colormap[translation[val & 0xFF]];
@@ -1490,7 +1483,6 @@ void R_DrawFloorSprite_8 (void)
yposition += ystep;
val = (((UINT32)yposition >> nflatyshift) & nflatmask) | ((UINT32)xposition >> nflatxshift);
- val &= 4194303;
val = source[val];
if (val & 0xFF00)
dest[5] = colormap[translation[val & 0xFF]];
@@ -1498,7 +1490,6 @@ void R_DrawFloorSprite_8 (void)
yposition += ystep;
val = (((UINT32)yposition >> nflatyshift) & nflatmask) | ((UINT32)xposition >> nflatxshift);
- val &= 4194303;
val = source[val];
if (val & 0xFF00)
dest[6] = colormap[translation[val & 0xFF]];
@@ -1506,7 +1497,6 @@ void R_DrawFloorSprite_8 (void)
yposition += ystep;
val = (((UINT32)yposition >> nflatyshift) & nflatmask) | ((UINT32)xposition >> nflatxshift);
- val &= 4194303;
val = source[val];
if (val & 0xFF00)
dest[7] = colormap[translation[val & 0xFF]];
diff --git a/src/r_main.c b/src/r_main.c
index f82fb589e03bb58f50b04dffd1c10779fda7dc25..04bdebc58282642cdca3329e9b3f801c10f4c6c3 100644
--- a/src/r_main.c
+++ b/src/r_main.c
@@ -1089,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;
@@ -1109,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)
diff --git a/src/r_plane.c b/src/r_plane.c
index 45d635213e81166ca5c5fa2c0393bb805edbeef5..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.
@@ -154,14 +154,10 @@ static void R_UpdatePlaneRipple(void)
// R_MapPlane
//
// Uses global vars:
+// planeheight
// basexscale
// baseyscale
// centerx
-// viewx
-// viewy
-// viewsin
-// viewcos
-// viewheight
void R_MapPlane(INT32 y, INT32 x1, INT32 x2)
{
@@ -580,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;
@@ -607,7 +603,6 @@ void R_MakeSpans(INT32 x, INT32 t1, INT32 b1, INT32 t2, INT32 b2)
void R_DrawPlanes(void)
{
visplane_t *pl;
- angle_t va = viewangle;
INT32 i;
R_UpdatePlaneRipple();
@@ -622,8 +617,6 @@ void R_DrawPlanes(void)
R_DrawSinglePlane(pl);
}
}
-
- viewangle = va;
}
// R_DrawSkyPlane
diff --git a/src/r_segs.c b/src/r_segs.c
index c79071e9b53afff41f19ad2cc167e9ae534931b8..834f00b47be6b4d2f841b92e87a251da3a5e7a5b 100644
--- a/src/r_segs.c
+++ b/src/r_segs.c
@@ -1477,10 +1477,18 @@ static void R_RenderSegLoop (void)
}
for (i = 0; i < numffloors; i++)
+ {
+ if (curline->polyseg && (ffloor[i].polyobj != curline->polyseg))
+ continue;
+
ffloor[i].f_frac += ffloor[i].f_step;
+ }
for (i = 0; i < numbackffloors; i++)
{
+ if (curline->polyseg && (ffloor[i].polyobj != curline->polyseg))
+ continue;
+
ffloor[i].f_clip[rw_x] = ffloor[i].c_clip[rw_x] = (INT16)((ffloor[i].b_frac >> HEIGHTBITS) & 0xFFFF);
ffloor[i].b_frac += ffloor[i].b_step;
}
@@ -1649,23 +1657,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
@@ -1673,22 +1684,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
+
}
diff --git a/src/r_skins.c b/src/r_skins.c
index 6f150f234ed9908f9c58bd42ecbe65ac5e5a534a..c56f55e01287182da02d3068dc9614265cc28318 100644
--- a/src/r_skins.c
+++ b/src/r_skins.c
@@ -216,6 +216,85 @@ INT32 R_SkinAvailable(const char *name)
return -1;
}
+// Auxillary function that actually sets the skin
+static void SetSkin(player_t *player, INT32 skinnum)
+{
+ skin_t *skin = &skins[skinnum];
+ UINT16 newcolor = 0;
+
+ player->skin = skinnum;
+
+ player->camerascale = skin->camerascale;
+ player->shieldscale = skin->shieldscale;
+
+ player->charability = (UINT8)skin->ability;
+ player->charability2 = (UINT8)skin->ability2;
+
+ player->charflags = (UINT32)skin->flags;
+
+ player->thokitem = skin->thokitem < 0 ? (UINT32)mobjinfo[MT_PLAYER].painchance : (UINT32)skin->thokitem;
+ player->spinitem = skin->spinitem < 0 ? (UINT32)mobjinfo[MT_PLAYER].damage : (UINT32)skin->spinitem;
+ player->revitem = skin->revitem < 0 ? (mobjtype_t)mobjinfo[MT_PLAYER].raisestate : (UINT32)skin->revitem;
+ player->followitem = skin->followitem;
+
+ if (((player->powers[pw_shield] & SH_NOSTACK) == SH_PINK) && (player->revitem == MT_LHRT || player->spinitem == MT_LHRT || player->thokitem == MT_LHRT)) // Healers can't keep their buff.
+ player->powers[pw_shield] &= SH_STACK;
+
+ player->actionspd = skin->actionspd;
+ player->mindash = skin->mindash;
+ player->maxdash = skin->maxdash;
+
+ player->normalspeed = skin->normalspeed;
+ player->runspeed = skin->runspeed;
+ player->thrustfactor = skin->thrustfactor;
+ player->accelstart = skin->accelstart;
+ player->acceleration = skin->acceleration;
+
+ player->jumpfactor = skin->jumpfactor;
+
+ player->height = skin->height;
+ player->spinheight = skin->spinheight;
+
+ if (!(cv_debug || devparm) && !(netgame || multiplayer || demoplayback))
+ {
+ if (player == &players[consoleplayer])
+ CV_StealthSetValue(&cv_playercolor, skin->prefcolor);
+ else if (player == &players[secondarydisplayplayer])
+ CV_StealthSetValue(&cv_playercolor2, skin->prefcolor);
+ player->skincolor = newcolor = skin->prefcolor;
+ if (player->bot && botingame)
+ {
+ botskin = (UINT8)(skinnum + 1);
+ botcolor = skin->prefcolor;
+ }
+ }
+
+ if (player->followmobj)
+ {
+ P_RemoveMobj(player->followmobj);
+ P_SetTarget(&player->followmobj, NULL);
+ }
+
+ if (player->mo)
+ {
+ fixed_t radius = FixedMul(skin->radius, player->mo->scale);
+ if ((player->powers[pw_carry] == CR_NIGHTSMODE) && (skin->sprites[SPR2_NFLY].numframes == 0)) // If you don't have a sprite for flying horizontally, use the default NiGHTS skin.
+ {
+ skin = &skins[DEFAULTNIGHTSSKIN];
+ player->followitem = skin->followitem;
+ if (!(cv_debug || devparm) && !(netgame || multiplayer || demoplayback))
+ newcolor = skin->prefcolor; // will be updated in thinker to flashing
+ }
+ player->mo->skin = skin;
+ if (newcolor)
+ player->mo->color = newcolor;
+ P_SetScale(player->mo, player->mo->scale);
+ player->mo->radius = radius;
+
+ P_SetPlayerMobjState(player->mo, player->mo->state-states); // Prevent visual errors when switching between skins with differing number of frames
+ }
+}
+
// network code calls this when a 'skin change' is received
void SetPlayerSkin(INT32 playernum, const char *skinname)
{
@@ -224,7 +303,7 @@ void SetPlayerSkin(INT32 playernum, const char *skinname)
if ((i != -1) && R_SkinUsable(playernum, i))
{
- SetPlayerSkinByNum(playernum, i);
+ SetSkin(player, i);
return;
}
@@ -233,7 +312,7 @@ void SetPlayerSkin(INT32 playernum, const char *skinname)
else if(server || IsPlayerAdmin(consoleplayer))
CONS_Alert(CONS_WARNING, M_GetText("Player %d (%s) skin '%s' not found\n"), playernum, player_names[playernum], skinname);
- SetPlayerSkinByNum(playernum, 0);
+ SetSkin(player, 0);
}
// Same as SetPlayerSkin, but uses the skin #.
@@ -241,82 +320,10 @@ void SetPlayerSkin(INT32 playernum, const char *skinname)
void SetPlayerSkinByNum(INT32 playernum, INT32 skinnum)
{
player_t *player = &players[playernum];
- skin_t *skin = &skins[skinnum];
- UINT16 newcolor = 0;
if (skinnum >= 0 && skinnum < numskins && R_SkinUsable(playernum, skinnum)) // Make sure it exists!
{
- player->skin = skinnum;
-
- player->camerascale = skin->camerascale;
- player->shieldscale = skin->shieldscale;
-
- player->charability = (UINT8)skin->ability;
- player->charability2 = (UINT8)skin->ability2;
-
- player->charflags = (UINT32)skin->flags;
-
- player->thokitem = skin->thokitem < 0 ? (UINT32)mobjinfo[MT_PLAYER].painchance : (UINT32)skin->thokitem;
- player->spinitem = skin->spinitem < 0 ? (UINT32)mobjinfo[MT_PLAYER].damage : (UINT32)skin->spinitem;
- player->revitem = skin->revitem < 0 ? (mobjtype_t)mobjinfo[MT_PLAYER].raisestate : (UINT32)skin->revitem;
- player->followitem = skin->followitem;
-
- if (((player->powers[pw_shield] & SH_NOSTACK) == SH_PINK) && (player->revitem == MT_LHRT || player->spinitem == MT_LHRT || player->thokitem == MT_LHRT)) // Healers can't keep their buff.
- player->powers[pw_shield] &= SH_STACK;
-
- player->actionspd = skin->actionspd;
- player->mindash = skin->mindash;
- player->maxdash = skin->maxdash;
-
- player->normalspeed = skin->normalspeed;
- player->runspeed = skin->runspeed;
- player->thrustfactor = skin->thrustfactor;
- player->accelstart = skin->accelstart;
- player->acceleration = skin->acceleration;
-
- player->jumpfactor = skin->jumpfactor;
-
- player->height = skin->height;
- player->spinheight = skin->spinheight;
-
- if (!(cv_debug || devparm) && !(netgame || multiplayer || demoplayback))
- {
- if (playernum == consoleplayer)
- CV_StealthSetValue(&cv_playercolor, skin->prefcolor);
- else if (playernum == secondarydisplayplayer)
- CV_StealthSetValue(&cv_playercolor2, skin->prefcolor);
- player->skincolor = newcolor = skin->prefcolor;
- if (player->bot && botingame)
- {
- botskin = (UINT8)(skinnum + 1);
- botcolor = skin->prefcolor;
- }
- }
-
- if (player->followmobj)
- {
- P_RemoveMobj(player->followmobj);
- P_SetTarget(&player->followmobj, NULL);
- }
-
- if (player->mo)
- {
- fixed_t radius = FixedMul(skin->radius, player->mo->scale);
- if ((player->powers[pw_carry] == CR_NIGHTSMODE) && (skin->sprites[SPR2_NFLY].numframes == 0)) // If you don't have a sprite for flying horizontally, use the default NiGHTS skin.
- {
- skin = &skins[DEFAULTNIGHTSSKIN];
- player->followitem = skin->followitem;
- if (!(cv_debug || devparm) && !(netgame || multiplayer || demoplayback))
- newcolor = skin->prefcolor; // will be updated in thinker to flashing
- }
- player->mo->skin = skin;
- if (newcolor)
- player->mo->color = newcolor;
- P_SetScale(player->mo, player->mo->scale);
- player->mo->radius = radius;
-
- P_SetPlayerMobjState(player->mo, player->mo->state-states); // Prevent visual errors when switching between skins with differing number of frames
- }
+ SetSkin(player, skinnum);
return;
}
@@ -324,7 +331,8 @@ void SetPlayerSkinByNum(INT32 playernum, INT32 skinnum)
CONS_Alert(CONS_WARNING, M_GetText("Requested skin %d not found\n"), skinnum);
else if(server || IsPlayerAdmin(consoleplayer))
CONS_Alert(CONS_WARNING, "Player %d (%s) skin %d not found\n", playernum, player_names[playernum], skinnum);
- SetPlayerSkinByNum(playernum, 0); // not found put the sonic skin
+
+ SetSkin(player, 0); // not found put the sonic skin
}
//
diff --git a/src/r_splats.c b/src/r_splats.c
index a3fad82d81730ff1d0ff967f0a4419c60791e59a..72cac9fd937f6bc35e98a343bb4bf98c4a6a4b8a 100644
--- a/src/r_splats.c
+++ b/src/r_splats.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.
@@ -28,11 +28,12 @@ static void prepare_rastertab(void);
// FLOOR SPLATS
// ==========================================================================
+static void R_RasterizeFloorSplat(floorsplat_t *pSplat, vector2_t *verts, vissprite_t *vis);
+
#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
-// Lactozilla
static void rasterize_segment_tex(INT32 x1, INT32 y1, INT32 x2, INT32 y2, INT32 tv1, INT32 tv2, INT32 tc, INT32 dir)
{
#ifdef USEASM
@@ -137,7 +138,7 @@ static void rasterize_segment_tex(INT32 x1, INT32 y1, INT32 x2, INT32 y2, INT32
}
}
-void R_DrawFloorSprite(vissprite_t *spr)
+void R_DrawFloorSplat(vissprite_t *spr)
{
floorsplat_t splat;
mobj_t *mobj = spr->mobj;
@@ -187,7 +188,7 @@ void R_DrawFloorSprite(vissprite_t *spr)
if (spr->rotateflags & SRF_3D || renderflags & RF_NOSPLATBILLBOARD)
splatangle = mobj->angle;
else
- splatangle = viewangle;
+ splatangle = spr->viewangle;
if (!(spr->cut & SC_ISROTATED))
splatangle += mobj->rollangle;
@@ -265,7 +266,6 @@ void R_DrawFloorSprite(vissprite_t *spr)
if (splat.tilted)
{
- // Lactozilla: Just copy the entire slope LMFAOOOO
pslope_t *s = &splat.slope;
s->o.x = slope->o.x;
@@ -330,7 +330,7 @@ void R_DrawFloorSprite(vissprite_t *spr)
v2d[i].y = (centeryfrac + FixedMul(rot_z, yscale))>>FRACBITS;
}
- R_RenderFloorSplat(&splat, v2d, spr);
+ R_RasterizeFloorSplat(&splat, v2d, spr);
}
// --------------------------------------------------------------------------
@@ -338,7 +338,7 @@ void R_DrawFloorSprite(vissprite_t *spr)
// fill the polygon with linear interpolation, call span drawer for each
// scan line
// --------------------------------------------------------------------------
-void R_RenderFloorSplat(floorsplat_t *pSplat, vector2_t *verts, vissprite_t *vis)
+static void R_RasterizeFloorSplat(floorsplat_t *pSplat, vector2_t *verts, vissprite_t *vis)
{
// rasterizing
INT32 miny = viewheight + 1, maxy = 0;
@@ -416,11 +416,10 @@ void R_RenderFloorSplat(floorsplat_t *pSplat, vector2_t *verts, vissprite_t *vis
if (R_CheckPowersOfTwo())
R_CheckFlatLength(ds_flatwidth * ds_flatheight);
- // Lactozilla: I don't know what I'm doing
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, viewangle, pSplat->angle, 1.0f);
+ 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
@@ -533,7 +532,7 @@ void R_RenderFloorSplat(floorsplat_t *pSplat, vector2_t *verts, vissprite_t *vis
fixed_t xstep, ystep;
fixed_t distance, span;
- angle_t angle = (viewangle + pSplat->angle)>>ANGLETOFINESHIFT;
+ angle_t angle = (vis->viewangle + pSplat->angle)>>ANGLETOFINESHIFT;
angle_t planecos = FINECOSINE(angle);
angle_t planesin = FINESINE(angle);
@@ -543,17 +542,13 @@ void R_RenderFloorSplat(floorsplat_t *pSplat, vector2_t *verts, vissprite_t *vis
distance = cacheddistance[y] = FixedMul(planeheight, yslope[y]);
span = abs(centery - y);
- if (span) // don't divide by zero
+ if (span) // Don't divide by zero
{
xstep = FixedMul(planesin, planeheight) / span;
ystep = FixedMul(planecos, planeheight) / span;
}
else
- {
- // ah
- xstep = FRACUNIT;
- ystep = FRACUNIT;
- }
+ xstep = ystep = FRACUNIT;
cachedxstep[y] = xstep;
cachedystep[y] = ystep;
diff --git a/src/r_splats.h b/src/r_splats.h
index e1f836f489bab54513dafd5b867ebfd7dbc79f44..05d8b66b06a8b04f569ae1739861660d425df92c 100644
--- a/src/r_splats.h
+++ b/src/r_splats.h
@@ -42,7 +42,6 @@ typedef struct floorsplat_s
mobj_t *mobj; // Mobj it is tied to
} floorsplat_t;
-void R_DrawFloorSprite(vissprite_t *spr);
-void R_RenderFloorSplat(floorsplat_t *pSplat, vector2_t *verts, vissprite_t *vis);
+void R_DrawFloorSplat(vissprite_t *spr);
#endif /*__R_SPLATS_H__*/
diff --git a/src/r_textures.c b/src/r_textures.c
index a006d739fc75278d6cfbd35cac997ff8e444fe94..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.
@@ -28,11 +28,6 @@
#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_glob.h" // HWR_LoadMapTextures
#endif
@@ -626,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)
{
diff --git a/src/r_things.c b/src/r_things.c
index 30bf15f85379baacbb96bb102179f022f683bacc..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.
@@ -230,7 +230,7 @@ boolean R_AddSingleSpriteDef(const char *sprname, spritedef_t *spritedef, UINT16
UINT8 rotation;
lumpinfo_t *lumpinfo;
softwarepatch_t patch;
- UINT8 numadded = 0;
+ UINT16 numadded = 0;
memset(sprtemp,0xFF, sizeof (sprtemp));
maxframe = (size_t)-1;
@@ -796,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;
@@ -1332,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);
@@ -1423,7 +1424,7 @@ static void R_ProjectSprite(mobj_t *thing)
fixed_t sheartan = 0;
fixed_t shadowscale = FRACUNIT;
- fixed_t basetx; // drop shadows
+ fixed_t basetx, basetz; // drop shadows
boolean shadowdraw, shadoweffects, shadowskew;
boolean splat = R_ThingIsFloorSprite(thing);
@@ -1453,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
@@ -1802,7 +1803,7 @@ static void R_ProjectSprite(mobj_t *thing)
else if (oldthing->frame & FF_TRANSMASK)
{
trans = (oldthing->frame & FF_TRANSMASK) >> FF_TRANSSHIFT;
- if (oldthing->blendmode == AST_TRANSLUCENT && trans >= NUMTRANSMAPS)
+ if (!R_BlendLevelVisible(oldthing->blendmode, trans))
return;
}
else
@@ -1955,6 +1956,7 @@ static void R_ProjectSprite(mobj_t *thing)
vis->paperoffset = paperoffset;
vis->paperdistance = paperdistance;
vis->centerangle = centerangle;
+ vis->viewangle = viewangle;
vis->shear.tan = sheartan;
vis->shear.offset = 0;
@@ -1975,6 +1977,7 @@ static void R_ProjectSprite(mobj_t *thing)
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;
@@ -2052,7 +2055,7 @@ static void R_ProjectSprite(mobj_t *thing)
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;
@@ -2197,7 +2200,7 @@ static void R_ProjectPrecipitationSprite(precipmobj_t *thing)
// 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;
@@ -2781,7 +2784,7 @@ static void R_DrawSprite(vissprite_t *spr)
mceilingclip = spr->cliptop;
if (spr->cut & SC_SPLAT)
- R_DrawFloorSprite(spr);
+ R_DrawFloorSplat(spr);
else
R_DrawVisSprite(spr);
}
diff --git a/src/r_things.h b/src/r_things.h
index f960089a114aef9821588b003f69ffd32dd9be6b..95b4215afa132ede0a11346036a3fffb4d6e7da9 100644
--- a/src/r_things.h
+++ b/src/r_things.h
@@ -155,7 +155,8 @@ 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;
+ 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
@@ -163,6 +164,7 @@ typedef struct vissprite_s
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
@@ -183,8 +185,6 @@ 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.
diff --git a/src/s_sound.c b/src/s_sound.c
index 392a5b45328abd8c9667e745050ce2aa732d000a..7f644b12cc654335df94421f048da073f5da5ad0 100644
--- a/src/s_sound.c
+++ b/src/s_sound.c
@@ -1033,11 +1033,9 @@ void S_SetSfxVolume(INT32 volume)
void S_ClearSfx(void)
{
-#ifndef DJGPPDOS
size_t i;
for (i = 1; i < NUMSFX; i++)
I_FreeSfx(S_sfx + i);
-#endif
}
static void S_StopChannel(INT32 cnum)
diff --git a/src/screen.c b/src/screen.c
index 744523dab0552c3212e74c15f9362f8d9c1fae78..d37724390dfa2148fe31c863a72c32a55552e596 100644
--- a/src/screen.c
+++ b/src/screen.c
@@ -33,6 +33,11 @@
#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))
@@ -423,6 +428,10 @@ void SCR_ChangeRenderer(void)
CONS_Alert(CONS_ERROR, "OpenGL never loaded\n");
return;
}
+
+ if (rendermode == render_opengl && (vid.glstate == VID_GL_LIBRARY_LOADED)) // Clear these out before switching to software
+ HWR_ClearAllTextures();
+
#endif
// Set the new render mode
diff --git a/src/sdl/i_system.c b/src/sdl/i_system.c
index d2c819c37093ffbeaa6156f6561d2ffb7db9df50..e3a0c256399ae9821a880faabad6ad8f330152cb 100644
--- a/src/sdl/i_system.c
+++ b/src/sdl/i_system.c
@@ -102,7 +102,7 @@ typedef LPVOID (WINAPI *p_MapViewOfFile) (HANDLE, DWORD, DWORD, DWORD, SIZE_T);
#endif
#endif
-#if (defined (__unix__) && !defined (_MSDOS)) || (defined (UNIXCOMMON) && !defined(__APPLE__))
+#if defined (__unix__) || (defined (UNIXCOMMON) && !defined (__APPLE__))
#include <errno.h>
#include <sys/wait.h>
#define NEWSIGNALHANDLER
@@ -137,6 +137,12 @@ typedef LPVOID (WINAPI *p_MapViewOfFile) (HANDLE, DWORD, DWORD, DWORD, SIZE_T);
#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"
@@ -238,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";
@@ -297,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
@@ -687,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
//
@@ -2123,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/mixer_sound.c b/src/sdl/mixer_sound.c
index 5cae480772f31e232213c4467eb4928f5db65d6f..412a21ea0098415b46eea3565630f6f9ce99bfe8 100644
--- a/src/sdl/mixer_sound.c
+++ b/src/sdl/mixer_sound.c
@@ -1298,7 +1298,7 @@ boolean I_PlaySong(boolean looping)
if (gme)
{
gme_equalizer_t eq = {GME_TREBLE, GME_BASS, 0,0,0,0,0,0,0,0};
-#if GME_VERSION >= 0x000603
+#if defined (GME_VERSION) && GME_VERSION >= 0x000603
if (looping)
gme_set_autoload_playback_limit(gme, 0);
#endif
diff --git a/src/st_stuff.c b/src/st_stuff.c
index 64964462094e8ce837da9c07f5a74209d85761f9..a1fbbec03ae7321455d7fe93ff8545d6aa542e7d 100644
--- a/src/st_stuff.c
+++ b/src/st_stuff.c
@@ -299,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);
@@ -2363,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 - (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 - (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;
diff --git a/src/v_video.c b/src/v_video.c
index 4713db0d89dda23a656f3df9ace63db9fba52902..1c383a2aca2a3c7cecebef6f553d8b65a8672015 100644
--- a/src/v_video.c
+++ b/src/v_video.c
@@ -418,7 +418,7 @@ void V_SetPalette(INT32 palettenum)
#ifdef HWRENDER
if (rendermode == render_opengl)
HWR_SetPalette(&pLocalPalette[palettenum*256]);
-#if (defined (__unix__) && !defined (MSDOS)) || defined (UNIXCOMMON) || defined (HAVE_SDL)
+#if defined (__unix__) || defined (UNIXCOMMON) || defined (HAVE_SDL)
else
#endif
#endif
@@ -432,7 +432,7 @@ void V_SetPaletteLump(const char *pal)
#ifdef HWRENDER
if (rendermode == render_opengl)
HWR_SetPalette(pLocalPalette);
-#if (defined (__unix__) && !defined (MSDOS)) || defined (UNIXCOMMON) || defined (HAVE_SDL)
+#if defined (__unix__) || defined (UNIXCOMMON) || defined (HAVE_SDL)
else
#endif
#endif
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 2cbcdecb54435f2c5eab72551c43aa132e065d62..6149aec6e756adea77cf9e0662de22042930b17a 100644
--- a/src/w_wad.c
+++ b/src/w_wad.c
@@ -821,7 +821,10 @@ UINT16 W_InitFile(const char *filename, boolean mainfile, boolean startup)
}
if (important && !mainfile)
- G_SetGameModified(true);
+ {
+ //G_SetGameModified(true);
+ modifiedgame = true; // avoid savemoddata being set to false
+ }
//
// link wad file to search files
diff --git a/src/win32/Srb2win.rc b/src/win32/Srb2win.rc
index d5d59922c113a29af52c673700d8600b8be7804f..b0eb2532e36d95677d36ca544bc869addd3a259a 100644
--- a/src/win32/Srb2win.rc
+++ b/src/win32/Srb2win.rc
@@ -76,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/y_inter.c b/src/y_inter.c
index bd3b557d794928ee2be5c01b33f7d57130fa7e74..4354a1677e706b293a3370382f1bf8fbf6c1c19f 100644
--- a/src/y_inter.c
+++ b/src/y_inter.c
@@ -215,6 +215,89 @@ static void Y_IntermissionTokenDrawer(void)
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;
+ }
+}
+
//
// Y_ConsiderScreenBuffer
//
@@ -1181,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
@@ -1228,23 +1310,12 @@ void Y_StartIntermission(void)
// setup time data
data.coop.tics = players[consoleplayer].realtime;
- 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 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;
}
@@ -1301,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;
@@ -1408,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;
@@ -1437,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;
@@ -1466,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;
@@ -1502,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;
@@ -2033,7 +2069,8 @@ static void Y_AwardSpecialStageBonus(void)
//
void Y_EndIntermission(void)
{
- Y_UnloadData();
+ if (!dedicated)
+ Y_UnloadData();
endtic = -1;
intertype = int_none;
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);