diff --git a/appveyor.yml b/appveyor.yml
index c64e69665a6f77b3c9949f1664a638b57a02800d..6b80b4ec37e438a9af240c4768ba0e2338466d36 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -9,7 +9,7 @@ environment:
# c:\mingw-w64 i686 has gcc 6.3.0, so use c:\msys64 7.3.0 instead
MINGW_SDK: c:\msys64\mingw32
# c:\msys64 x86_64 has gcc 8.2.0, so use c:\mingw-w64 7.3.0 instead
- MINGW_SDK_64: C:\mingw-w64\x86_64-7.3.0-posix-seh-rt_v5-rev0\mingw64
+ MINGW_SDK_64: C:\mingw-w64\x86_64-8.1.0-posix-seh-rt_v6-rev0\mingw64
CFLAGS: -Wall -W -Werror -Wno-error=implicit-fallthrough -Wimplicit-fallthrough=3 -Wno-tautological-compare -Wno-error=suggest-attribute=noreturn
NASM_ZIP: nasm-2.12.01
NASM_URL: http://www.nasm.us/pub/nasm/releasebuilds/2.12.01/win64/nasm-2.12.01-win64.zip
@@ -83,8 +83,8 @@ before_build:
- ccache -V
- ccache -s
- if [%NOUPX%] == [1] ( set "NOUPX=NOUPX=1" ) else ( set "NOUPX=" )
-- set "SRB2_MFLAGS=-C src WARNINGMODE=1 CCACHE=1 GCC73=1 NOOBJDUMP=1 %NOUPX%"
-- if [%X86_64%] == [1] ( set "MINGW_FLAGS=MINGW64=1 X86_64=1" ) else ( set "MINGW_FLAGS=MINGW=1 GCC91=1" )
+- set "SRB2_MFLAGS=-C src WARNINGMODE=1 CCACHE=1 NOOBJDUMP=1 %NOUPX%"
+- if [%X86_64%] == [1] ( set "MINGW_FLAGS=MINGW64=1 X86_64=1 GCC81=1" ) else ( set "MINGW_FLAGS=MINGW=1 GCC91=1" )
- set "SRB2_MFLAGS=%SRB2_MFLAGS% %MINGW_FLAGS% %CONFIGURATION%=1"
build_script:
diff --git a/src/hardware/hw_bsp.c b/src/hardware/hw_bsp.c
index f8d4f43d9b285197c3b43743eb5bfdd83e0ce4be..6f3dd9fbd5290ead1959d17a70d0429582e6d963 100644
--- a/src/hardware/hw_bsp.c
+++ b/src/hardware/hw_bsp.c
@@ -449,8 +449,12 @@ static poly_t *CutOutSubsecPoly(seg_t *lseg, INT32 count, poly_t *poly)
// for each seg of the subsector
for (; count--; lseg++)
{
- //x,y,dx,dy (like a divline)
line_t *line = lseg->linedef;
+
+ if (lseg->glseg)
+ continue;
+
+ //x,y,dx,dy (like a divline)
p1.x = FIXED_TO_FLOAT(lseg->side ? line->v2->x : line->v1->x);
p1.y = FIXED_TO_FLOAT(lseg->side ? line->v2->y : line->v1->y);
p2.x = FIXED_TO_FLOAT(lseg->side ? line->v1->x : line->v2->x);
diff --git a/src/hardware/hw_main.c b/src/hardware/hw_main.c
index 276a666704ccf3de09b431fbc4303d7536006457..2f986085a0a38765fd7192f18c91d3cde96bccc3 100644
--- a/src/hardware/hw_main.c
+++ b/src/hardware/hw_main.c
@@ -2714,8 +2714,6 @@ static void HWR_AddLine(seg_t * line)
static sector_t tempsec;
fixed_t v1x, v1y, v2x, v2y; // the seg's vertexes as fixed_t
- if (line->glseg)
- return;
#ifdef POLYOBJECTS
if (line->polyseg && !(line->polyseg->flags & POF_RENDERSIDES))
return;
@@ -3773,11 +3771,16 @@ static void HWR_Subsector(size_t num)
while (count--)
{
+
+ if (!line->glseg
#ifdef POLYOBJECTS
- if (!line->polyseg) // ignore segs that belong to polyobjects
+ && !line->polyseg // ignore segs that belong to polyobjects
#endif
+ )
+ {
HWR_AddLine(line);
- line++;
+ }
+ line++;
}
}
diff --git a/src/lua_hook.h b/src/lua_hook.h
index 023090897ad5083364df15cccc87997df9f53509..61e945248ddeb3f82e8291eeae12452649592804 100644
--- a/src/lua_hook.h
+++ b/src/lua_hook.h
@@ -20,9 +20,12 @@ enum hook {
hook_MapChange,
hook_MapLoad,
hook_PlayerJoin,
+ hook_PreThinkFrame,
hook_ThinkFrame,
+ hook_PostThinkFrame,
hook_MobjSpawn,
hook_MobjCollide,
+ hook_MobjLineCollide,
hook_MobjMoveCollide,
hook_TouchSpecial,
hook_MobjFuse,
@@ -62,12 +65,16 @@ extern const char *const hookNames[];
void LUAh_MapChange(INT16 mapnumber); // Hook for map change (before load)
void LUAh_MapLoad(void); // Hook for map load
void LUAh_PlayerJoin(int playernum); // Hook for Got_AddPlayer
+void LUAh_PreThinkFrame(void); // Hook for frame (before mobj and player thinkers)
void LUAh_ThinkFrame(void); // Hook for frame (after mobj and player thinkers)
+void LUAh_PostThinkFrame(void); // Hook for frame (at end of tick, ie after overlays, precipitation, specials)
boolean LUAh_MobjHook(mobj_t *mo, enum hook which);
boolean LUAh_PlayerHook(player_t *plr, enum hook which);
#define LUAh_MobjSpawn(mo) LUAh_MobjHook(mo, hook_MobjSpawn) // Hook for P_SpawnMobj by mobj type
UINT8 LUAh_MobjCollideHook(mobj_t *thing1, mobj_t *thing2, enum hook which);
+UINT8 LUAh_MobjLineCollideHook(mobj_t *thing, line_t *line, enum hook which);
#define LUAh_MobjCollide(thing1, thing2) LUAh_MobjCollideHook(thing1, thing2, hook_MobjCollide) // Hook for PIT_CheckThing by (thing) mobj type
+#define LUAh_MobjLineCollide(thing, line) LUAh_MobjLineCollideHook(thing, line, hook_MobjLineCollide) // Hook for PIT_CheckThing by (thing) mobj type
#define LUAh_MobjMoveCollide(thing1, thing2) LUAh_MobjCollideHook(thing1, thing2, hook_MobjMoveCollide) // Hook for PIT_CheckThing by (tmthing) mobj type
boolean LUAh_TouchSpecial(mobj_t *special, mobj_t *toucher); // Hook for P_TouchSpecialThing by mobj type
#define LUAh_MobjFuse(mo) LUAh_MobjHook(mo, hook_MobjFuse) // Hook for mobj->fuse == 0 by mobj type
diff --git a/src/lua_hooklib.c b/src/lua_hooklib.c
index 5faa625b330d2733c1769a26311382f3d2e1fe1d..56a4fa3f7f281f9e930f84f83ced919fef73ee64 100644
--- a/src/lua_hooklib.c
+++ b/src/lua_hooklib.c
@@ -31,9 +31,12 @@ const char *const hookNames[hook_MAX+1] = {
"MapChange",
"MapLoad",
"PlayerJoin",
+ "PreThinkFrame",
"ThinkFrame",
+ "PostThinkFrame",
"MobjSpawn",
"MobjCollide",
+ "MobjLineCollide",
"MobjMoveCollide",
"TouchSpecial",
"MobjFuse",
@@ -124,6 +127,7 @@ static int lib_addHook(lua_State *L)
// Take a mobjtype enum which this hook is specifically for.
case hook_MobjSpawn:
case hook_MobjCollide:
+ case hook_MobjLineCollide:
case hook_MobjMoveCollide:
case hook_TouchSpecial:
case hook_MobjFuse:
@@ -183,6 +187,7 @@ static int lib_addHook(lua_State *L)
lastp = &mobjthinkerhooks[hook.s.mt];
break;
case hook_MobjCollide:
+ case hook_MobjLineCollide:
case hook_MobjMoveCollide:
lastp = &mobjcollidehooks[hook.s.mt];
break;
@@ -413,6 +418,29 @@ void LUAh_PlayerJoin(int playernum)
lua_settop(gL, 0);
}
+// Hook for frame (before mobj and player thinkers)
+void LUAh_PreThinkFrame(void)
+{
+ hook_p hookp;
+ if (!gL || !(hooksAvailable[hook_PreThinkFrame/8] & (1<<(hook_PreThinkFrame%8))))
+ return;
+
+ for (hookp = roothook; hookp; hookp = hookp->next)
+ {
+ if (hookp->type != hook_PreThinkFrame)
+ continue;
+
+ lua_pushfstring(gL, FMT_HOOKID, hookp->id);
+ lua_gettable(gL, LUA_REGISTRYINDEX);
+ if (lua_pcall(gL, 0, 0, 0)) {
+ if (!hookp->error || cv_debug & DBG_LUA)
+ CONS_Alert(CONS_WARNING,"%s\n",lua_tostring(gL, -1));
+ lua_pop(gL, 1);
+ hookp->error = true;
+ }
+ }
+}
+
// Hook for frame (after mobj and player thinkers)
void LUAh_ThinkFrame(void)
{
@@ -436,6 +464,30 @@ void LUAh_ThinkFrame(void)
}
}
+
+// Hook for frame (at end of tick, ie after overlays, precipitation, specials)
+void LUAh_PostThinkFrame(void)
+{
+ hook_p hookp;
+ if (!gL || !(hooksAvailable[hook_PostThinkFrame/8] & (1<<(hook_PostThinkFrame%8))))
+ return;
+
+ for (hookp = roothook; hookp; hookp = hookp->next)
+ {
+ if (hookp->type != hook_PostThinkFrame)
+ continue;
+
+ lua_pushfstring(gL, FMT_HOOKID, hookp->id);
+ lua_gettable(gL, LUA_REGISTRYINDEX);
+ if (lua_pcall(gL, 0, 0, 0)) {
+ if (!hookp->error || cv_debug & DBG_LUA)
+ CONS_Alert(CONS_WARNING,"%s\n",lua_tostring(gL, -1));
+ lua_pop(gL, 1);
+ hookp->error = true;
+ }
+ }
+}
+
// Hook for mobj collisions
UINT8 LUAh_MobjCollideHook(mobj_t *thing1, mobj_t *thing2, enum hook which)
{
@@ -515,6 +567,84 @@ UINT8 LUAh_MobjCollideHook(mobj_t *thing1, mobj_t *thing2, enum hook which)
return shouldCollide;
}
+UINT8 LUAh_MobjLineCollideHook(mobj_t *thing, line_t *line, enum hook which)
+{
+ hook_p hookp;
+ UINT8 shouldCollide = 0; // 0 = default, 1 = force yes, 2 = force no.
+ if (!gL || !(hooksAvailable[which/8] & (1<<(which%8))))
+ return 0;
+
+ I_Assert(thing->type < NUMMOBJTYPES);
+
+ lua_settop(gL, 0);
+
+ // Look for all generic mobj collision hooks
+ for (hookp = mobjcollidehooks[MT_NULL]; hookp; hookp = hookp->next)
+ {
+ if (hookp->type != which)
+ continue;
+
+ if (lua_gettop(gL) == 0)
+ {
+ LUA_PushUserdata(gL, thing, META_MOBJ);
+ LUA_PushUserdata(gL, line, META_LINE);
+ }
+ lua_pushfstring(gL, FMT_HOOKID, hookp->id);
+ lua_gettable(gL, LUA_REGISTRYINDEX);
+ lua_pushvalue(gL, -3);
+ lua_pushvalue(gL, -3);
+ if (lua_pcall(gL, 2, 1, 0)) {
+ 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 shouldCollide = 0.
+ if (lua_toboolean(gL, -1))
+ shouldCollide = 1; // Force yes
+ else
+ shouldCollide = 2; // Force no
+ }
+ lua_pop(gL, 1);
+ }
+
+ for (hookp = mobjcollidehooks[thing->type]; hookp; hookp = hookp->next)
+ {
+ if (hookp->type != which)
+ continue;
+
+ if (lua_gettop(gL) == 0)
+ {
+ LUA_PushUserdata(gL, thing, META_MOBJ);
+ LUA_PushUserdata(gL, line, META_LINE);
+ }
+ lua_pushfstring(gL, FMT_HOOKID, hookp->id);
+ lua_gettable(gL, LUA_REGISTRYINDEX);
+ lua_pushvalue(gL, -3);
+ lua_pushvalue(gL, -3);
+ if (lua_pcall(gL, 2, 1, 0)) {
+ 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 shouldCollide = 0.
+ if (lua_toboolean(gL, -1))
+ shouldCollide = 1; // Force yes
+ else
+ shouldCollide = 2; // Force no
+ }
+ lua_pop(gL, 1);
+ }
+
+ lua_settop(gL, 0);
+ return shouldCollide;
+}
+
// Hook for mobj thinkers
boolean LUAh_MobjThinker(mobj_t *mo)
{
diff --git a/src/lua_maplib.c b/src/lua_maplib.c
index 8ce6551f7319b9c9179805fda2c181f945c0dab0..309ba86a112dcae1efbbba40bc3850ff10b802e3 100644
--- a/src/lua_maplib.c
+++ b/src/lua_maplib.c
@@ -157,15 +157,13 @@ static const char *const side_opt[] = {
enum vertex_e {
vertex_valid = 0,
vertex_x,
- vertex_y,
- vertex_z
+ vertex_y
};
static const char *const vertex_opt[] = {
"valid",
"x",
"y",
- "z",
NULL};
enum ffloor_e {
@@ -970,9 +968,6 @@ static int vertex_get(lua_State *L)
case vertex_y:
lua_pushfixed(L, vertex->y);
return 1;
- case vertex_z:
- lua_pushfixed(L, vertex->z);
- return 1;
}
return 0;
}
diff --git a/src/m_menu.c b/src/m_menu.c
index fb29abb8ff61949fb02713ac4edb28f294877230..bf7325fc51557258e25156ace06481514aa48868 100644
--- a/src/m_menu.c
+++ b/src/m_menu.c
@@ -10730,15 +10730,78 @@ static void M_HandleConnectIP(INT32 choice)
break;
case KEY_DEL:
- if (setupm_ip[0])
+ if (setupm_ip[0] && !shiftdown) // Shift+Delete is used for something else.
{
S_StartSound(NULL,sfx_menu1); // Tails
setupm_ip[0] = 0;
}
- break;
+ if (!shiftdown) // Shift+Delete is used for something else.
+ break;
+ /* FALLTHRU */
default:
l = strlen(setupm_ip);
+
+ if ( ctrldown ) {
+ switch (choice) {
+ case 'v':
+ case 'V': // ctrl+v, pasting
+ {
+ const char *paste = I_ClipboardPaste();
+
+ if (paste != NULL) {
+ strncat(setupm_ip, paste, 28-1 - l); // Concat the ip field with clipboard
+ if (strlen(paste) != 0) // Don't play sound if nothing was pasted
+ S_StartSound(NULL,sfx_menu1); // Tails
+ }
+
+ break;
+ }
+ case KEY_INS:
+ case 'c':
+ case 'C': // ctrl+c, ctrl+insert, copying
+ I_ClipboardCopy(setupm_ip, l);
+ S_StartSound(NULL,sfx_menu1); // Tails
+ break;
+
+ case 'x':
+ case 'X': // ctrl+x, cutting
+ I_ClipboardCopy(setupm_ip, l);
+ S_StartSound(NULL,sfx_menu1); // Tails
+ setupm_ip[0] = 0;
+ break;
+
+ default: // otherwise do nothing
+ break;
+ }
+ break; // don't check for typed keys
+ }
+
+ if ( shiftdown ) {
+ switch (choice) {
+ case KEY_INS: // shift+insert, pasting
+ {
+ const char *paste = I_ClipboardPaste();
+
+ if (paste != NULL) {
+ strncat(setupm_ip, paste, 28-1 - l); // Concat the ip field with clipboard
+ if (strlen(paste) != 0) // Don't play sound if nothing was pasted
+ S_StartSound(NULL,sfx_menu1); // Tails
+ }
+
+ break;
+ }
+ case KEY_DEL: // shift+delete, cutting
+ I_ClipboardCopy(setupm_ip, l);
+ S_StartSound(NULL,sfx_menu1); // Tails
+ setupm_ip[0] = 0;
+ break;
+ default: // otherwise do nothing.
+ break;
+ }
+ break; // don't check for typed keys
+ }
+
if (l >= 28-1)
break;
diff --git a/src/p_map.c b/src/p_map.c
index 95e180f83b942acdc25a2fa343c5d276adfe87d7..d609141708af089819489bc334569978181a1985 100644
--- a/src/p_map.c
+++ b/src/p_map.c
@@ -1948,6 +1948,19 @@ static boolean PIT_CheckLine(line_t *ld)
// this line is out of the if so upper and lower textures can be hit by a splat
blockingline = ld;
+
+#ifdef HAVE_BLUA
+ {
+ UINT8 shouldCollide = LUAh_MobjLineCollide(tmthing, blockingline); // checks hook for thing's type
+ if (P_MobjWasRemoved(tmthing))
+ return true; // one of them was removed???
+ if (shouldCollide == 1)
+ return false; // force collide
+ else if (shouldCollide == 2)
+ return true; // force no collide
+ }
+#endif
+
if (!ld->backsector) // one sided line
{
if (P_PointOnLineSide(tmthing->x, tmthing->y, ld))
@@ -1992,7 +2005,7 @@ static boolean PIT_CheckLine(line_t *ld)
if (lowfloor < tmdropoffz)
tmdropoffz = lowfloor;
-
+
return true;
}
diff --git a/src/p_maputl.c b/src/p_maputl.c
index f598595e2a22b1b49756ebd51d76beab0840fb33..afa0205042a5d6b9394660b48a24cbc2ee2aa805 100644
--- a/src/p_maputl.c
+++ b/src/p_maputl.c
@@ -78,68 +78,37 @@ void P_ClosestPointOnLine(fixed_t x, fixed_t y, line_t *line, vertex_t *result)
return;
}
-//
-// P_ClosestPointOnLine3D
-// Finds the closest point on a given line to the supplied point IN 3D!!!
-//
-void P_ClosestPointOnLine3D(fixed_t x, fixed_t y, fixed_t z, line_t *line, vertex_t *result)
+/// Similar to FV3_ClosestPointOnLine() except it actually works.
+void P_ClosestPointOnLine3D(const vector3_t *p, const vector3_t *Line, vector3_t *result)
{
- fixed_t startx = line->v1->x;
- fixed_t starty = line->v1->y;
- fixed_t startz = line->v1->z;
- fixed_t dx = line->dx;
- fixed_t dy = line->dy;
- fixed_t dz = line->v2->z - line->v1->z;
+ const vector3_t* v1 = &Line[0];
+ const vector3_t* v2 = &Line[1];
+ vector3_t c, V, n;
+ fixed_t t, d;
+ FV3_SubEx(v2, v1, &V);
+ FV3_SubEx(p, v1, &c);
- // Determine t (the length of the vector from �Line[0]� to �p�)
- fixed_t cx, cy, cz;
- fixed_t vx, vy, vz;
- fixed_t magnitude;
- fixed_t t;
+ d = R_PointToDist2(0, v2->z, R_PointToDist2(v2->x, v2->y, v1->x, v1->y), v1->z);
+ FV3_Copy(&n, &V);
+ FV3_Divide(&n, d);
- //Sub (p, &Line[0], &c);
- cx = x - startx;
- cy = y - starty;
- cz = z - startz;
-
- //Sub (&Line[1], &Line[0], &V);
- vx = dx;
- vy = dy;
- vz = dz;
-
- //Normalize (&V, &V);
- magnitude = R_PointToDist2(0, line->v2->z, R_PointToDist2(line->v2->x, line->v2->y, startx, starty), startz);
- vx = FixedDiv(vx, magnitude);
- vy = FixedDiv(vy, magnitude);
- vz = FixedDiv(vz, magnitude);
-
- t = (FixedMul(vx, cx) + FixedMul(vy, cy) + FixedMul(vz, cz));
+ t = FV3_Dot(&n, &c);
// Set closest point to the end if it extends past -Red
if (t <= 0)
{
- result->x = line->v1->x;
- result->y = line->v1->y;
- result->z = line->v1->z;
+ FV3_Copy(result, v1);
return;
}
- else if (t >= magnitude)
+ else if (t >= d)
{
- result->x = line->v2->x;
- result->y = line->v2->y;
- result->z = line->v2->z;
+ FV3_Copy(result, v2);
return;
}
- // Return the point between �Line[0]� and �Line[1]�
- vx = FixedMul(vx, t);
- vy = FixedMul(vy, t);
- vz = FixedMul(vz, t);
+ FV3_Mul(&n, t);
- //Add (&Line[0], &V, out);
- result->x = startx + vx;
- result->y = starty + vy;
- result->z = startz + vz;
+ FV3_AddEx(v1, &n, result);
return;
}
diff --git a/src/p_maputl.h b/src/p_maputl.h
index 2ca7187794d5fa741623d6c789e73d6926667d95..16cfc834e0e0341f5e93fb0dd090828700ef6c14 100644
--- a/src/p_maputl.h
+++ b/src/p_maputl.h
@@ -43,7 +43,7 @@ boolean P_PathTraverse(fixed_t px1, fixed_t py1, fixed_t px2, fixed_t py2,
FUNCMATH fixed_t P_AproxDistance(fixed_t dx, fixed_t dy);
void P_ClosestPointOnLine(fixed_t x, fixed_t y, line_t *line, vertex_t *result);
-void P_ClosestPointOnLine3D(fixed_t x, fixed_t y, fixed_t z, line_t *line, vertex_t *result);
+void P_ClosestPointOnLine3D(const vector3_t *p, const vector3_t *line, vector3_t *result);
INT32 P_PointOnLineSide(fixed_t x, fixed_t y, line_t *line);
void P_MakeDivline(line_t *li, divline_t *dl);
void P_CameraLineOpening(line_t *plinedef);
diff --git a/src/p_mobj.c b/src/p_mobj.c
index e8461957fa3e851587e1b1eba3afc9b0a5e14abc..3d8d81d9b65adee2be7012c10e103b0c9e323908 100644
--- a/src/p_mobj.c
+++ b/src/p_mobj.c
@@ -7977,15 +7977,19 @@ static void P_MobjSceneryThink(mobj_t *mobj)
mobj->x = mobj->extravalue1 + P_ReturnThrustX(mobj, mobj->movedir, mobj->cvmem*mobj->scale);
mobj->y = mobj->extravalue2 + P_ReturnThrustY(mobj, mobj->movedir, mobj->cvmem*mobj->scale);
P_SetThingPosition(mobj);
- if ((--mobj->fuse) < 6)
+
+ if (!mobj->fuse)
{
- if (!mobj->fuse)
- {
+#ifdef HAVE_BLUA
+ if (!LUAh_MobjFuse(mobj))
+#endif
P_RemoveMobj(mobj);
- return;
- }
- mobj->frame = (mobj->frame & ~FF_TRANSMASK) | ((10 - (mobj->fuse*2)) << (FF_TRANSSHIFT));
+ return;
}
+ if (mobj->fuse < 0)
+ return;
+ if ((--mobj->fuse) < 6)
+ mobj->frame = (mobj->frame & ~FF_TRANSMASK) | ((10 - (mobj->fuse*2)) << (FF_TRANSSHIFT));
}
break;
case MT_VWREF:
diff --git a/src/p_setup.c b/src/p_setup.c
index 75dc385df55c324791a1e8436ad7d05e63e88166..104b4e5a01fbe6af06c42cd58fba3487e3518dcb 100644
--- a/src/p_setup.c
+++ b/src/p_setup.c
@@ -846,7 +846,6 @@ static void P_LoadVertices(UINT8 *data)
{
v->x = SHORT(mv->x)<<FRACBITS;
v->y = SHORT(mv->y)<<FRACBITS;
- v->z = 0;
}
}
@@ -1575,7 +1574,6 @@ static void P_LoadTextmap(void)
{
// Defaults.
vt->x = vt->y = INT32_MAX;
- vt->z = 0;
TextmapParse(vertexesPos[i], i, ParseTextmapVertexParameter);
@@ -1665,6 +1663,37 @@ static void P_LoadTextmap(void)
}
}
+static void P_ProcessLinedefsAfterSidedefs(void)
+{
+ size_t i = numlines;
+ register line_t *ld = lines;
+ for (; i--; ld++)
+ {
+ ld->frontsector = sides[ld->sidenum[0]].sector; //e6y: Can't be -1 here
+ ld->backsector = ld->sidenum[1] != 0xffff ? sides[ld->sidenum[1]].sector : 0;
+
+ // Compile linedef 'text' from both sidedefs 'text' for appropriate specials.
+ switch (ld->special)
+ {
+ case 331: // Trigger linedef executor: Skin - Continuous
+ case 332: // Trigger linedef executor: Skin - Each time
+ case 333: // Trigger linedef executor: Skin - Once
+ case 443: // Calls a named Lua function
+ if (sides[ld->sidenum[0]].text)
+ {
+ size_t len = strlen(sides[ld->sidenum[0]].text) + 1;
+ if (ld->sidenum[1] != 0xffff && sides[ld->sidenum[1]].text)
+ len += strlen(sides[ld->sidenum[1]].text);
+ ld->text = Z_Malloc(len, PU_LEVEL, NULL);
+ M_Memcpy(ld->text, sides[ld->sidenum[0]].text, strlen(sides[ld->sidenum[0]].text) + 1);
+ if (ld->sidenum[1] != 0xffff && sides[ld->sidenum[1]].text)
+ M_Memcpy(ld->text + strlen(ld->text) + 1, sides[ld->sidenum[1]].text, strlen(sides[ld->sidenum[1]].text) + 1);
+ }
+ break;
+ }
+ }
+}
+
static boolean P_LoadMapData(const virtres_t *virt)
{
virtlump_t *virtvertexes = NULL, *virtsectors = NULL, *virtsidedefs = NULL, *virtlinedefs = NULL, *virtthings = NULL;
@@ -1738,6 +1767,8 @@ static boolean P_LoadMapData(const virtres_t *virt)
P_LoadThings(virtthings->data);
}
+ P_ProcessLinedefsAfterSidedefs();
+
R_ClearTextureNumCache(true);
// set the sky flat num
@@ -1750,15 +1781,6 @@ static boolean P_LoadMapData(const virtres_t *virt)
// search for animated flats and set up
P_SetupLevelFlatAnims();
- // Copy relevant map data for NetArchive purposes.
- spawnsectors = Z_Calloc(numsectors * sizeof (*sectors), PU_LEVEL, NULL);
- spawnlines = Z_Calloc(numlines * sizeof (*lines), PU_LEVEL, NULL);
- spawnsides = Z_Calloc(numsides * sizeof (*sides), PU_LEVEL, NULL);
-
- memcpy(spawnsectors, sectors, numsectors * sizeof (*sectors));
- memcpy(spawnlines, lines, numlines * sizeof (*lines));
- memcpy(spawnsides, sides, numsides * sizeof (*sides));
-
return true;
}
@@ -2517,37 +2539,6 @@ static void P_LoadMapLUT(const virtres_t *virt)
P_CreateBlockMap();
}
-static void P_ProcessLinedefsWithSidedefs(void)
-{
- size_t i = numlines;
- register line_t *ld = lines;
- for (;i--;ld++)
- {
- ld->frontsector = sides[ld->sidenum[0]].sector; //e6y: Can't be -1 here
- ld->backsector = ld->sidenum[1] != 0xffff ? sides[ld->sidenum[1]].sector : 0;
-
- // Compile linedef 'text' from both sidedefs 'text' for appropriate specials.
- switch(ld->special)
- {
- case 331: // Trigger linedef executor: Skin - Continuous
- case 332: // Trigger linedef executor: Skin - Each time
- case 333: // Trigger linedef executor: Skin - Once
- case 443: // Calls a named Lua function
- if (sides[ld->sidenum[0]].text)
- {
- size_t len = strlen(sides[ld->sidenum[0]].text)+1;
- if (ld->sidenum[1] != 0xffff && sides[ld->sidenum[1]].text)
- len += strlen(sides[ld->sidenum[1]].text);
- ld->text = Z_Malloc(len, PU_LEVEL, NULL);
- M_Memcpy(ld->text, sides[ld->sidenum[0]].text, strlen(sides[ld->sidenum[0]].text)+1);
- if (ld->sidenum[1] != 0xffff && sides[ld->sidenum[1]].text)
- M_Memcpy(ld->text+strlen(ld->text)+1, sides[ld->sidenum[1]].text, strlen(sides[ld->sidenum[1]].text)+1);
- }
- break;
- }
- }
-}
-
//
// P_LinkMapData
// Builds sector line lists and subsector sector numbers.
@@ -2713,9 +2704,17 @@ static boolean P_LoadMapFromFile(void)
P_LoadMapBSP(virt);
P_LoadMapLUT(virt);
- P_ProcessLinedefsWithSidedefs();
P_LinkMapData();
+ // Copy relevant map data for NetArchive purposes.
+ spawnsectors = Z_Calloc(numsectors * sizeof(*sectors), PU_LEVEL, NULL);
+ spawnlines = Z_Calloc(numlines * sizeof(*lines), PU_LEVEL, NULL);
+ spawnsides = Z_Calloc(numsides * sizeof(*sides), PU_LEVEL, NULL);
+
+ memcpy(spawnsectors, sectors, numsectors * sizeof(*sectors));
+ memcpy(spawnlines, lines, numlines * sizeof(*lines));
+ memcpy(spawnsides, sides, numsides * sizeof(*sides));
+
P_MakeMapMD5(virt, &mapmd5);
vres_Free(virt);
diff --git a/src/p_sight.c b/src/p_sight.c
index 499d4a09588316ec3991966cccc4360fddb74e04..07dfabbc1ed34831a5d379cbbc1fefe559b1a0ce 100644
--- a/src/p_sight.c
+++ b/src/p_sight.c
@@ -222,6 +222,9 @@ static boolean P_CrossSubsector(size_t num, register los_t *los)
fixed_t fracx, fracy;
#endif
+ if (seg->glseg)
+ continue;
+
// already checked other side?
if (line->validcount == validcount)
continue;
diff --git a/src/p_slopes.c b/src/p_slopes.c
index e66d7ed2189135bf4c2166e7b1d17e16f037cf7e..2cf2c74ba83e1b3bf07b4a743c521d2ee6cc6652 100644
--- a/src/p_slopes.c
+++ b/src/p_slopes.c
@@ -50,10 +50,10 @@ static void ReconfigureViaVertexes (pslope_t *slope, const vector3_t v1, const v
// Set some defaults for a non-sloped "slope"
if (vec1.z == 0 && vec2.z == 0)
{
- /// \todo Fix fully flat cases.
-
slope->zangle = slope->xydirection = 0;
slope->zdelta = slope->d.x = slope->d.y = 0;
+ slope->normal.x = slope->normal.y = 0;
+ slope->normal.z = FRACUNIT;
}
else
{
@@ -653,7 +653,9 @@ void P_ReverseQuantizeMomentumToSlope(vector3_t *momentum, pslope_t *slope)
// Handles slope ejection for objects
void P_SlopeLaunch(mobj_t *mo)
{
- if (!(mo->standingslope->flags & SL_NOPHYSICS)) // If there's physics, time for launching.
+ if (!(mo->standingslope->flags & SL_NOPHYSICS) // If there's physics, time for launching.
+ && (mo->standingslope->normal.x != 0
+ || mo->standingslope->normal.y != 0))
{
// Double the pre-rotation Z, then halve the post-rotation Z. This reduces the
// vertical launch given from slopes while increasing the horizontal launch
@@ -710,8 +712,7 @@ fixed_t P_GetWallTransferMomZ(mobj_t *mo, pslope_t *slope)
void P_HandleSlopeLanding(mobj_t *thing, pslope_t *slope)
{
vector3_t mom; // Ditto.
-
- if (slope->flags & SL_NOPHYSICS) { // No physics, no need to make anything complicated.
+ if (slope->flags & SL_NOPHYSICS || (slope->normal.x == 0 && slope->normal.y == 0)) { // No physics, no need to make anything complicated.
if (P_MobjFlip(thing)*(thing->momz) < 0) // falling, land on slope
{
thing->standingslope = slope;
diff --git a/src/p_spec.c b/src/p_spec.c
index a65f027068392bd45587797117a88a1ccd1cac6f..cc0b185adb960965df9a690146ea9a949780f4d2 100644
--- a/src/p_spec.c
+++ b/src/p_spec.c
@@ -5038,8 +5038,7 @@ DoneSection2:
mobj_t *waypointlow = NULL;
mobj_t *mo2;
mobj_t *closest = NULL;
- line_t junk;
- vertex_t v1, v2, resulthigh, resultlow;
+ vector3_t p, line[2], resulthigh, resultlow;
mobj_t *highest = NULL;
if (player->mo->tracer && player->mo->tracer->type == MT_TUBEWAYPOINT && player->powers[pw_carry] == CR_ROPEHANG)
@@ -5186,38 +5185,34 @@ DoneSection2:
// Next, we need to find the closest point on the line between each set, and determine which one we're
// closest to.
+ p.x = player->mo->x;
+ p.y = player->mo->y;
+ p.z = player->mo->z;
+
// Waypointmid and Waypointlow:
if (waypointlow)
{
- v1.x = waypointmid->x;
- v1.y = waypointmid->y;
- v1.z = waypointmid->z;
- v2.x = waypointlow->x;
- v2.y = waypointlow->y;
- v2.z = waypointlow->z;
- junk.v1 = &v1;
- junk.v2 = &v2;
- junk.dx = v2.x - v1.x;
- junk.dy = v2.y - v1.y;
+ line[0].x = waypointmid->x;
+ line[0].y = waypointmid->y;
+ line[0].z = waypointmid->z;
+ line[1].x = waypointlow->x;
+ line[1].y = waypointlow->y;
+ line[1].z = waypointlow->z;
- P_ClosestPointOnLine3D(player->mo->x, player->mo->y, player->mo->z, &junk, &resultlow);
+ P_ClosestPointOnLine3D(&p, line, &resultlow);
}
// Waypointmid and Waypointhigh:
if (waypointhigh)
{
- v1.x = waypointmid->x;
- v1.y = waypointmid->y;
- v1.z = waypointmid->z;
- v2.x = waypointhigh->x;
- v2.y = waypointhigh->y;
- v2.z = waypointhigh->z;
- junk.v1 = &v1;
- junk.v2 = &v2;
- junk.dx = v2.x - v1.x;
- junk.dy = v2.y - v1.y;
-
- P_ClosestPointOnLine3D(player->mo->x, player->mo->y, player->mo->z, &junk, &resulthigh);
+ line[0].x = waypointmid->x;
+ line[0].y = waypointmid->y;
+ line[0].z = waypointmid->z;
+ line[1].x = waypointhigh->x;
+ line[1].y = waypointhigh->y;
+ line[1].z = waypointhigh->z;
+
+ P_ClosestPointOnLine3D(&p, line, &resulthigh);
}
// 3D support now available. Disregard the previous notice here. -Red
diff --git a/src/p_tick.c b/src/p_tick.c
index e0f60bd2256d74455de893c85fac2584d94fda75..9b56ee1c2d2ed51c8c4e91e421751c80fd7f40e7 100644
--- a/src/p_tick.c
+++ b/src/p_tick.c
@@ -629,6 +629,10 @@ void P_Ticker(boolean run)
if (demoplayback)
G_ReadDemoTiccmd(&players[consoleplayer].cmd, 0);
+ #ifdef HAVE_BLUA
+ LUAh_PreThinkFrame();
+ #endif
+
for (i = 0; i < MAXPLAYERS; i++)
if (playeringame[i] && players[i].mo && !P_MobjWasRemoved(players[i].mo))
P_PlayerThink(&players[i]);
@@ -726,6 +730,10 @@ void P_Ticker(boolean run)
G_ConsGhostTic();
if (modeattacking)
G_GhostTicker();
+
+#ifdef HAVE_BLUA
+ LUAh_PostThinkFrame();
+#endif
}
P_MapEnd();
@@ -745,6 +753,9 @@ void P_PreTicker(INT32 frames)
{
P_MapStart();
+#ifdef HAVE_BLUA
+ LUAh_PreThinkFrame();
+#endif
for (i = 0; i < MAXPLAYERS; i++)
if (playeringame[i] && players[i].mo && !P_MobjWasRemoved(players[i].mo))
{
@@ -779,6 +790,10 @@ void P_PreTicker(INT32 frames)
P_UpdateSpecials();
P_RespawnSpecials();
+#ifdef HAVE_BLUA
+ LUAh_PostThinkFrame();
+#endif
+
P_MapEnd();
}
}
diff --git a/src/r_data.c b/src/r_data.c
index bfd83a62d1169e02d89084b38f60bd86a975585b..986b65deaca333a80d059d72f7875fd6c575116b 100644
--- a/src/r_data.c
+++ b/src/r_data.c
@@ -324,8 +324,8 @@ UINT8 ASTBlendPixel_8bpp(UINT8 background, UINT8 foreground, int style, UINT8 al
else if (style != AST_TRANSLUCENT)
{
RGBA_t texel;
- RGBA_t bg = V_GetColor(background);
- RGBA_t fg = V_GetColor(foreground);
+ RGBA_t bg = V_GetMasterColor(background);
+ RGBA_t fg = V_GetMasterColor(foreground);
texel.rgba = ASTBlendPixel(bg, fg, style, alpha);
return NearestColor(texel.s.red, texel.s.green, texel.s.blue);
}
@@ -1664,7 +1664,7 @@ static void R_CreateFadeColormaps(void)
#define GETCOLOR \
px = colormaps[i%256]; \
fade = (i/256) * (256 / FADECOLORMAPROWS); \
- rgba = V_GetColor(px);
+ rgba = V_GetMasterColor(px);
// to black
makeblack:
diff --git a/src/r_defs.h b/src/r_defs.h
index 96ef953ceb54bee4f5a548241df0ec1c26c191fd..c7c198d662e2713db2ce93716f40dfd68bc3a8d8 100644
--- a/src/r_defs.h
+++ b/src/r_defs.h
@@ -83,7 +83,7 @@ typedef struct extracolormap_s
*/
typedef struct
{
- fixed_t x, y, z;
+ fixed_t x, y;
} vertex_t;
// Forward of linedefs, for sectors.
diff --git a/src/r_main.c b/src/r_main.c
index b60022d22f20c7608d793984c81f266585890e1a..a2674b5431eb12a8fccec14221dbf54d51c2b9a5 100644
--- a/src/r_main.c
+++ b/src/r_main.c
@@ -698,6 +698,7 @@ subsector_t *R_IsPointInSubsector(fixed_t x, fixed_t y)
INT32 side, i;
size_t nodenum;
subsector_t *ret;
+ seg_t *seg;
// single subsector is a special case
if (numnodes == 0)
@@ -713,10 +714,15 @@ subsector_t *R_IsPointInSubsector(fixed_t x, fixed_t y)
}
ret = &subsectors[nodenum & ~NF_SUBSECTOR];
- for (i = 0; i < ret->numlines; i++)
- //if (R_PointOnSegSide(x, y, &segs[ret->firstline + i])) -- breaks in ogl because polyvertex_t cast over vertex pointers
- if (P_PointOnLineSide(x, y, segs[ret->firstline + i].linedef) != segs[ret->firstline + i].side)
+ for (i = 0, seg = &segs[ret->firstline]; i < ret->numlines; i++, seg++)
+ {
+ if (seg->glseg)
+ continue;
+
+ //if (R_PointOnSegSide(x, y, seg)) -- breaks in ogl because polyvertex_t cast over vertex pointers
+ if (P_PointOnLineSide(x, y, seg->linedef) != seg->side)
return 0;
+ }
return ret;
}
diff --git a/src/r_segs.c b/src/r_segs.c
index 1af1cb2a23fefcb91015e82b79857693d670e9d2..dcb5fc160a89d534c9013f1816f8bdcc1c4f4856 100644
--- a/src/r_segs.c
+++ b/src/r_segs.c
@@ -309,9 +309,6 @@ void R_RenderMaskedSegRange(drawseg_t *ds, INT32 x1, INT32 x2)
// OPTIMIZE: get rid of LIGHTSEGSHIFT globally
curline = ds->curline;
- if (curline->glseg)
- return;
-
frontsector = curline->frontsector;
backsector = curline->backsector;
texnum = R_GetTextureNum(curline->sidedef->midtexture);
diff --git a/src/sdl/i_video.c b/src/sdl/i_video.c
index e6a40327be1cbbe1efcfd56abe0ed0b9322362b8..2b8633e5b47dd70c59d74962cea83b6a76a8468d 100644
--- a/src/sdl/i_video.c
+++ b/src/sdl/i_video.c
@@ -388,7 +388,7 @@ void I_UpdateMouseGrab(void)
{
if (SDL_WasInit(SDL_INIT_VIDEO) == SDL_INIT_VIDEO && window != NULL
&& SDL_GetMouseFocus() == window && SDL_GetKeyboardFocus() == window
- && !IGNORE_MOUSE)
+ && USE_MOUSEINPUT && !IGNORE_MOUSE)
SDLdoGrabMouse();
}
diff --git a/src/v_video.h b/src/v_video.h
index 36d1914af6edec7f1b9996e4c767d507dcaf8a71..eb75a414ff3e31acfd8c48ded41c6d1b94ec35bb 100644
--- a/src/v_video.h
+++ b/src/v_video.h
@@ -64,6 +64,7 @@ void V_CubeApply(UINT8 *red, UINT8 *green, UINT8 *blue);
// Retrieve the ARGB value from a palette color index
#define V_GetColor(color) (pLocalPalette[color&0xFF])
+#define V_GetMasterColor(color) (pMasterPalette[color&0xFF])
// Bottom 8 bits are used for parameter (screen or character)
#define V_PARAMMASK 0x000000FF