diff --git a/src/dehacked.c b/src/dehacked.c
index 5301bef68b07678faca154289b09d41684c0ca34..9b4656627bc262fa50bd05036af499cbefd3ac1c 100644
--- a/src/dehacked.c
+++ b/src/dehacked.c
@@ -10824,12 +10824,84 @@ static inline int lib_getenum(lua_State *L)
} else if (fastcmp(word,"paused")) {
lua_pushboolean(L, paused);
return 1;
+ // begin map vars
+ } else if (fastcmp(word,"spstage_start")) {
+ lua_pushinteger(L, spstage_start);
+ return 1;
+ } else if (fastcmp(word,"sstage_start")) {
+ lua_pushinteger(L, sstage_start);
+ return 1;
+ } else if (fastcmp(word,"sstage_end")) {
+ lua_pushinteger(L, sstage_end);
+ return 1;
+ } else if (fastcmp(word,"smpstage_start")) {
+ lua_pushinteger(L, smpstage_start);
+ return 1;
+ } else if (fastcmp(word,"smpstage_end")) {
+ lua_pushinteger(L, smpstage_end);
+ return 1;
} else if (fastcmp(word,"titlemap")) {
lua_pushinteger(L, titlemap);
return 1;
} else if (fastcmp(word,"titlemapinaction")) {
lua_pushboolean(L, (titlemapinaction != TITLEMAP_OFF));
return 1;
+ } else if (fastcmp(word,"bootmap")) {
+ lua_pushinteger(L, bootmap);
+ return 1;
+ } else if (fastcmp(word,"tutorialmap")) {
+ lua_pushinteger(L, tutorialmap);
+ return 1;
+ } else if (fastcmp(word,"tutorialmode")) {
+ lua_pushboolean(L, tutorialmode);
+ return 1;
+ // end map vars
+ // begin CTF colors
+ } else if (fastcmp(word,"skincolor_redteam")) {
+ lua_pushinteger(L, skincolor_redteam);
+ return 1;
+ } else if (fastcmp(word,"skincolor_blueteam")) {
+ lua_pushinteger(L, skincolor_blueteam);
+ return 1;
+ } else if (fastcmp(word,"skincolor_redring")) {
+ lua_pushinteger(L, skincolor_redring);
+ return 1;
+ } else if (fastcmp(word,"skincolor_bluering")) {
+ lua_pushinteger(L, skincolor_bluering);
+ return 1;
+ // end CTF colors
+ // begin timers
+ } else if (fastcmp(word,"invulntics")) {
+ lua_pushinteger(L, invulntics);
+ return 1;
+ } else if (fastcmp(word,"sneakertics")) {
+ lua_pushinteger(L, sneakertics);
+ return 1;
+ } else if (fastcmp(word,"flashingtics")) {
+ lua_pushinteger(L, flashingtics);
+ return 1;
+ } else if (fastcmp(word,"tailsflytics")) {
+ lua_pushinteger(L, tailsflytics);
+ return 1;
+ } else if (fastcmp(word,"underwatertics")) {
+ lua_pushinteger(L, underwatertics);
+ return 1;
+ } else if (fastcmp(word,"spacetimetics")) {
+ lua_pushinteger(L, spacetimetics);
+ return 1;
+ } else if (fastcmp(word,"extralifetics")) {
+ lua_pushinteger(L, extralifetics);
+ return 1;
+ } else if (fastcmp(word,"nightslinktics")) {
+ lua_pushinteger(L, nightslinktics);
+ return 1;
+ } else if (fastcmp(word,"gameovertics")) {
+ lua_pushinteger(L, gameovertics);
+ return 1;
+ } else if (fastcmp(word,"ammoremovaltics")) {
+ lua_pushinteger(L, ammoremovaltics);
+ return 1;
+ // end timers
} else if (fastcmp(word,"gametype")) {
lua_pushinteger(L, gametype);
return 1;
diff --git a/src/lua_baselib.c b/src/lua_baselib.c
index 450da6576b544b90f3001559797f493fc44b985e..7ff967b4015810342aaa247ef348ba35ace2abf5 100644
--- a/src/lua_baselib.c
+++ b/src/lua_baselib.c
@@ -2793,23 +2793,17 @@ static int lib_gSetCustomExitVars(lua_State *L)
// Supported:
// G_SetCustomExitVars(); [reset to defaults]
// G_SetCustomExitVars(int) [nextmap override only]
- // G_SetCustomExitVars(bool) [skipstats only]
- // G_SetCustomExitVars(int, bool) [both of the above]
+ // G_SetCustomExitVars(nil, int) [skipstats only]
+ // G_SetCustomExitVars(int, int) [both of the above]
+
+ nextmapoverride = 0;
+ skipstats = 0;
+
if (n >= 1)
{
- if (lua_isnumber(L, 1) || n >= 2)
- {
- nextmapoverride = (INT16)luaL_checknumber(L, 1);
- lua_remove(L, 1); // remove nextmapoverride; skipstats now 1 if available
- }
- skipstats = luaL_optinteger(L, 2, 0);
- }
- else
- {
- nextmapoverride = 0;
- skipstats = 0;
+ nextmapoverride = (INT16)luaL_optinteger(L, 1, 0);
+ skipstats = (INT16)luaL_optinteger(L, 2, 0);
}
- // ---
return 0;
}
diff --git a/src/lua_hud.h b/src/lua_hud.h
index 396ca8988f98f98fa23244161e878d27aae7cbb9..a00a5cb028bca8f63b1e9349757742e79405b703 100644
--- a/src/lua_hud.h
+++ b/src/lua_hud.h
@@ -21,6 +21,7 @@ enum hud {
// Match / CTF / Tag / Ringslinger
hud_weaponrings,
hud_powerstones,
+ hud_teamscores,
// NiGHTS mode
hud_nightslink,
hud_nightsdrill,
diff --git a/src/lua_hudlib.c b/src/lua_hudlib.c
index 211c8a828dba1d701693735f103f2775fcccf3aa..0c0e792613d3476207033f3524cdc7f11161cedf 100644
--- a/src/lua_hudlib.c
+++ b/src/lua_hudlib.c
@@ -48,6 +48,7 @@ static const char *const hud_disable_options[] = {
"weaponrings",
"powerstones",
+ "teamscores",
"nightslink",
"nightsdrill",
diff --git a/src/lua_maplib.c b/src/lua_maplib.c
index 0fe1df0b61daf5f9a3bf5a6abec3daeaf591c5dc..b35bb6a41cbaddd7cd09d3095f1e60accf4ac87a 100644
--- a/src/lua_maplib.c
+++ b/src/lua_maplib.c
@@ -445,7 +445,7 @@ static int sectorlines_get(lua_State *L)
// get the "linecount" by shifting our retrieved memory address of "lines" to where "linecount" is in the sector_t, then dereferencing the result
// we need this to determine the array's actual size, and therefore also the maximum value allowed as an index
// this only works if seclines is actually a pointer to a sector's lines member in memory, oh boy
- numoflines = (size_t)(*(seclines - (offsetof(sector_t, lines) - offsetof(sector_t, linecount))));
+ numoflines = (size_t)(*(size_t *)(((size_t)seclines) - (offsetof(sector_t, lines) - offsetof(sector_t, linecount))));
/* OLD HACK
// check first linedef to figure which of its sectors owns this sector->lines pointer
@@ -479,7 +479,7 @@ static int sectorlines_num(lua_State *L)
return luaL_error(L, "accessed sector_t.lines doesn't exist anymore.");
// see comments in the _get function above
- numoflines = (size_t)(*(seclines - (offsetof(sector_t, lines) - offsetof(sector_t, linecount))));
+ numoflines = (size_t)(*(size_t *)(((size_t)seclines) - (offsetof(sector_t, lines) - offsetof(sector_t, linecount))));
lua_pushinteger(L, numoflines);
return 1;
}
diff --git a/src/m_cheat.c b/src/m_cheat.c
index 1d4fa3b5da49f6b321ee39f4f21c00906b704790..f2292264fe2e47f579790eeb418da2fe2dd049b1 100644
--- a/src/m_cheat.c
+++ b/src/m_cheat.c
@@ -1106,7 +1106,7 @@ static mapthing_t *OP_CreateNewMapThing(player_t *player, UINT16 type, boolean c
#else
fixed_t cheight = sec->ceilingheight;
#endif
- mt->options = (UINT16)((cheight - player->mo->z - player->mo->height)>>FRACBITS);
+ mt->z = (UINT16)((cheight - player->mo->z - player->mo->height)>>FRACBITS);
}
else
{
@@ -1115,12 +1115,11 @@ static mapthing_t *OP_CreateNewMapThing(player_t *player, UINT16 type, boolean c
#else
fixed_t fheight = sec->floorheight;
#endif
- mt->options = (UINT16)((player->mo->z - fheight)>>FRACBITS);
+ mt->z = (UINT16)((player->mo->z - fheight)>>FRACBITS);
}
- mt->options <<= ZSHIFT;
mt->angle = (INT16)(FixedInt(AngleFixed(player->mo->angle)));
- mt->options |= (UINT16)cv_opflags.value;
+ mt->options = (mt->z << ZSHIFT) | (UINT16)cv_opflags.value;
return mt;
}
diff --git a/src/p_enemy.c b/src/p_enemy.c
index 30284a2dd2fb2a8ed4c01469a627fa670900bc74..1c27e73c81c55a5f0cd131fb3004570e70d5f921 100644
--- a/src/p_enemy.c
+++ b/src/p_enemy.c
@@ -14712,20 +14712,35 @@ void A_DragonWing(mobj_t *actor)
void A_DragonSegment(mobj_t *actor)
{
mobj_t *target = actor->target;
- fixed_t dist = P_AproxDistance(P_AproxDistance(actor->x - target->x, actor->y - target->y), actor->z - target->z);
- fixed_t radius = actor->radius + target->radius;
- angle_t hangle = R_PointToAngle2(target->x, target->y, actor->x, actor->y);
- angle_t zangle = R_PointToAngle2(0, target->z, dist, actor->z);
- fixed_t hdist = P_ReturnThrustX(target, zangle, radius);
- fixed_t xdist = P_ReturnThrustX(target, hangle, hdist);
- fixed_t ydist = P_ReturnThrustY(target, hangle, hdist);
- fixed_t zdist = P_ReturnThrustY(target, zangle, radius);
+ fixed_t dist;
+ fixed_t radius;
+ angle_t hangle;
+ angle_t zangle;
+ fixed_t hdist;
+ fixed_t xdist;
+ fixed_t ydist;
+ fixed_t zdist;
#ifdef HAVE_BLUA
if (LUA_CallAction("A_DragonSegment", actor))
return;
#endif
+ if (target == NULL || !target->health)
+ {
+ P_RemoveMobj(actor);
+ return;
+ }
+
+ dist = P_AproxDistance(P_AproxDistance(actor->x - target->x, actor->y - target->y), actor->z - target->z);
+ radius = actor->radius + target->radius;
+ hangle = R_PointToAngle2(target->x, target->y, actor->x, actor->y);
+ zangle = R_PointToAngle2(0, target->z, dist, actor->z);
+ hdist = P_ReturnThrustX(target, zangle, radius);
+ xdist = P_ReturnThrustX(target, hangle, hdist);
+ ydist = P_ReturnThrustY(target, hangle, hdist);
+ zdist = P_ReturnThrustY(target, zangle, radius);
+
actor->angle = hangle;
P_TeleportMove(actor, target->x + xdist, target->y + ydist, target->z + zdist);
}
diff --git a/src/p_mobj.c b/src/p_mobj.c
index c85d2566cd2093a3e79cba0205775c20dae56940..69d352c5b3b068a5d0db2f07d7b5a59759309b03 100644
--- a/src/p_mobj.c
+++ b/src/p_mobj.c
@@ -7833,7 +7833,8 @@ void P_MobjThinker(mobj_t *mobj)
boolean dojump = false, targonground, love, makeheart = false;
if (mobj->target != player->mo)
P_SetTarget(&mobj->target, player->mo);
- targonground = (P_IsObjectOnGround(mobj->target) && (player->panim == PA_IDLE || player->panim == PA_WALK || player->panim == PA_RUN));
+ // Tatsuru: Don't try to hug them if they're above or below you!
+ targonground = (P_IsObjectOnGround(mobj->target) && (player->panim == PA_IDLE || player->panim == PA_WALK || player->panim == PA_RUN) && player->mo->z == mobj->z);
love = (player->skin == 0 || player->skin == 5);
switch (stat)
@@ -11553,6 +11554,82 @@ void P_MovePlayerToStarpost(INT32 playernum)
mapthing_t *huntemeralds[MAXHUNTEMERALDS];
INT32 numhuntemeralds;
+
+static fixed_t P_GetMobjSpawnHeight(const mobjtype_t mobjtype, const mapthing_t* mthing, const fixed_t x, const fixed_t y)
+{
+ const subsector_t *ss = R_PointInSubsector(x, y);
+ fixed_t offset = mthing->z << FRACBITS;
+ boolean flip = (!!(mobjinfo[mobjtype].flags & MF_SPAWNCEILING) ^ !!(mthing->options & MTF_OBJECTFLIP));
+
+ switch (mobjtype)
+ {
+ // Bumpers never spawn flipped.
+ case MT_NIGHTSBUMPER:
+ flip = false;
+ break;
+
+ // Axis objects snap to the floor.
+ case MT_AXIS:
+ case MT_AXISTRANSFER:
+ case MT_AXISTRANSFERLINE:
+ return ONFLOORZ;
+
+ // Objects with a non-zero default height.
+ case MT_CRAWLACOMMANDER:
+ case MT_DETON:
+ case MT_JETTBOMBER:
+ case MT_JETTGUNNER:
+ case MT_EGGMOBILE2:
+ if (!offset)
+ offset = 33*FRACUNIT;
+ break;
+ case MT_EGGMOBILE:
+ if (!offset)
+ offset = 128*FRACUNIT;
+ break;
+ case MT_GOLDBUZZ:
+ case MT_REDBUZZ:
+ if (!offset)
+ offset = 288*FRACUNIT;
+ break;
+
+ // Ring-like items, may float additional units with MTF_AMBUSH.
+ case MT_SPIKEBALL:
+ case MT_EMERALDSPAWN:
+ case MT_TOKEN:
+ case MT_EMBLEM:
+ offset += mthing->options & MTF_AMBUSH ? 24*FRACUNIT : 0;
+ break;
+
+ // Remaining objects.
+ default:
+ if (P_WeaponOrPanel(mobjtype))
+ offset += mthing->options & MTF_AMBUSH ? 24 * FRACUNIT : 0;
+ }
+
+ if (!offset) // Snap to the surfaces when there's no offset set.
+ {
+ if (flip)
+ return ONCEILINGZ;
+ else
+ return ONFLOORZ;
+ }
+
+ // Establish height.
+ if (flip)
+ return (
+#ifdef ESLOPE
+ ss->sector->c_slope ? P_GetZAt(ss->sector->c_slope, x, y) :
+#endif
+ ss->sector->ceilingheight) - offset - mobjinfo[mobjtype].height;
+ else
+ return (
+#ifdef ESLOPE
+ ss->sector->f_slope ? P_GetZAt(ss->sector->f_slope, x, y) :
+#endif
+ ss->sector->floorheight) + offset;
+}
+
//
// P_SpawnMapThing
// The fields of the mapthing should
@@ -11563,7 +11640,6 @@ void P_SpawnMapThing(mapthing_t *mthing)
mobjtype_t i;
mobj_t *mobj;
fixed_t x, y, z;
- subsector_t *ss;
boolean doangle = true;
if (!mthing->type)
@@ -11688,13 +11764,6 @@ You should think about modifying the deathmatch starts to take full advantage of
if (!(gametyperules & GTR_EMERALDHUNT))
return;
- ss = R_PointInSubsector(mthing->x << FRACBITS, mthing->y << FRACBITS);
- mthing->z = (INT16)(((
-#ifdef ESLOPE
- ss->sector->f_slope ? P_GetZAt(ss->sector->f_slope, mthing->x << FRACBITS, mthing->y << FRACBITS) :
-#endif
- ss->sector->floorheight)>>FRACBITS) + (mthing->options >> ZSHIFT));
-
if (numhuntemeralds < MAXHUNTEMERALDS)
huntemeralds[numhuntemeralds++] = mthing;
return;
@@ -11823,102 +11892,7 @@ You should think about modifying the deathmatch starts to take full advantage of
// spawn it
x = mthing->x << FRACBITS;
y = mthing->y << FRACBITS;
- ss = R_PointInSubsector(x, y);
-
- if (i == MT_NIGHTSBUMPER)
- z = (
-#ifdef ESLOPE
- ss->sector->f_slope ? P_GetZAt(ss->sector->f_slope, x, y) :
-#endif
- ss->sector->floorheight) + ((mthing->options >> ZSHIFT) << FRACBITS);
- else if (i == MT_AXIS || i == MT_AXISTRANSFER || i == MT_AXISTRANSFERLINE)
- z = ONFLOORZ;
- else if (i == MT_SPIKEBALL || P_WeaponOrPanel(i) || i == MT_EMERALDSPAWN || i == MT_TOKEN || i == MT_EMBLEM)
- {
- if (mthing->options & MTF_OBJECTFLIP)
- {
- z = (
-#ifdef ESLOPE
- ss->sector->c_slope ? P_GetZAt(ss->sector->c_slope, x, y) :
-#endif
- ss->sector->ceilingheight);
-
- if (mthing->options & MTF_AMBUSH) // Special flag for rings
- z -= 24*FRACUNIT;
- if (mthing->options >> ZSHIFT)
- z -= (mthing->options >> ZSHIFT)*FRACUNIT;
-
- z -= mobjinfo[i].height; //Don't forget the height!
- }
- else
- {
- z = (
-#ifdef ESLOPE
- ss->sector->f_slope ? P_GetZAt(ss->sector->f_slope, x, y) :
-#endif
- ss->sector->floorheight);
-
- if (mthing->options & MTF_AMBUSH) // Special flag for rings
- z += 24*FRACUNIT;
- if (mthing->options >> ZSHIFT)
- z += (mthing->options >> ZSHIFT)*FRACUNIT;
- }
-
- if (z == ONFLOORZ)
- mthing->z = 0;
- else
- mthing->z = (INT16)(z>>FRACBITS);
- }
- else
- {
- fixed_t offset = 0;
- boolean flip = (!!(mobjinfo[i].flags & MF_SPAWNCEILING) ^ !!(mthing->options & MTF_OBJECTFLIP));
-
- // base positions
- if (flip)
- z = (
-#ifdef ESLOPE
- ss->sector->c_slope ? P_GetZAt(ss->sector->c_slope, x, y) :
-#endif
- ss->sector->ceilingheight) - mobjinfo[i].height;
- else
- z = (
-#ifdef ESLOPE
- ss->sector->f_slope ? P_GetZAt(ss->sector->f_slope, x, y) :
-#endif
- ss->sector->floorheight);
-
- // offsetting
- if (mthing->options >> ZSHIFT)
- offset = ((mthing->options >> ZSHIFT) << FRACBITS);
- else if (i == MT_CRAWLACOMMANDER || i == MT_DETON || i == MT_JETTBOMBER || i == MT_JETTGUNNER || i == MT_EGGMOBILE2)
- offset = 33*FRACUNIT;
- else if (i == MT_EGGMOBILE)
- offset = 128*FRACUNIT;
- else if (i == MT_GOLDBUZZ || i == MT_REDBUZZ)
- offset = 288*FRACUNIT;
-
- // applying offsets! (if any)
- if (flip)
- {
- if (offset)
- z -= offset;
- else
- z = ONCEILINGZ;
- }
- else
- {
- if (offset)
- z += offset;
- else
- z = ONFLOORZ;
- }
-
- if (z == ONFLOORZ)
- mthing->z = 0;
- else
- mthing->z = (INT16)(z>>FRACBITS);
- }
+ z = P_GetMobjSpawnHeight(i, mthing, x, y);
mobj = P_SpawnMobj(x, y, z, i);
mobj->spawnpoint = mthing;
@@ -12022,7 +11996,7 @@ You should think about modifying the deathmatch starts to take full advantage of
if (mthing->angle)
mobj->health = mthing->angle;
else
- mobj->health = FixedMul(ss->sector->ceilingheight-ss->sector->floorheight, 3*(FRACUNIT/4))>>FRACBITS;
+ mobj->health = FixedMul(mobj->subsector->sector->ceilingheight - mobj->subsector->sector->floorheight, 3*(FRACUNIT/4))>>FRACBITS;
break;
case MT_METALSONIC_RACE:
case MT_METALSONIC_BATTLE:
@@ -13108,7 +13082,7 @@ void P_SpawnHoopsAndRings(mapthing_t *mthing, boolean bonustime)
mobj_t *hoopcenter;
INT16 spewangle;
- z = mthing->options << FRACBITS;
+ z = mthing->z << FRACBITS;
hoopcenter = P_SpawnMobj(x, y, z, MT_HOOPCENTER);
@@ -13248,8 +13222,7 @@ void P_SpawnHoopsAndRings(mapthing_t *mthing, boolean bonustime)
INT32 hoopsize;
INT32 hoopplacement;
- // Save our flags!
- z = (mthing->options>>ZSHIFT) << FRACBITS;
+ z = mthing->z << FRACBITS;
hoopcenter = P_SpawnMobj(x, y, z, MT_HOOPCENTER);
hoopcenter->spawnpoint = mthing;
@@ -13391,8 +13364,8 @@ void P_SpawnHoopsAndRings(mapthing_t *mthing, boolean bonustime)
sec->c_slope ? P_GetZAt(sec->c_slope, x, y) :
#endif
sec->ceilingheight) - mobjinfo[ringthing].height;
- if (mthing->options >> ZSHIFT)
- z -= ((mthing->options >> ZSHIFT) << FRACBITS);
+ if (mthing->z)
+ z -= (mthing->z << FRACBITS);
}
else
{
@@ -13401,8 +13374,8 @@ void P_SpawnHoopsAndRings(mapthing_t *mthing, boolean bonustime)
sec->f_slope ? P_GetZAt(sec->f_slope, x, y) :
#endif
sec->floorheight);
- if (mthing->options >> ZSHIFT)
- z += ((mthing->options >> ZSHIFT) << FRACBITS);
+ if (mthing->z)
+ z += (mthing->z << FRACBITS);
}
for (r = 1; r <= 5; r++)
@@ -13451,8 +13424,8 @@ void P_SpawnHoopsAndRings(mapthing_t *mthing, boolean bonustime)
sec->c_slope ? P_GetZAt(sec->c_slope, x, y) :
#endif
sec->ceilingheight) - mobjinfo[ringthing].height;
- if (mthing->options >> ZSHIFT)
- z -= ((mthing->options >> ZSHIFT) << FRACBITS);
+ if (mthing->z)
+ z -= (mthing->z << FRACBITS);
}
else
{
@@ -13461,8 +13434,8 @@ void P_SpawnHoopsAndRings(mapthing_t *mthing, boolean bonustime)
sec->f_slope ? P_GetZAt(sec->f_slope, x, y) :
#endif
sec->floorheight);
- if (mthing->options >> ZSHIFT)
- z += ((mthing->options >> ZSHIFT) << FRACBITS);
+ if (mthing->z)
+ z += (mthing->z << FRACBITS);
}
for (r = 1; r <= iterations; r++)
@@ -13508,8 +13481,8 @@ void P_SpawnHoopsAndRings(mapthing_t *mthing, boolean bonustime)
sec->f_slope ? P_GetZAt(sec->f_slope, x, y) :
#endif
sec->floorheight;
- if (mthing->options >> ZSHIFT)
- z += ((mthing->options >> ZSHIFT) << FRACBITS);
+ if (mthing->z)
+ z += (mthing->z << FRACBITS);
closestangle = FixedAngle(mthing->angle*FRACUNIT);
@@ -13613,8 +13586,8 @@ void P_SpawnHoopsAndRings(mapthing_t *mthing, boolean bonustime)
sec->c_slope ? P_GetZAt(sec->c_slope, x, y) :
#endif
sec->ceilingheight) - mobjinfo[ringthing].height;
- if (mthing->options >> ZSHIFT)
- z -= ((mthing->options >> ZSHIFT) << FRACBITS);
+ if (mthing->z)
+ z -= (mthing->z << FRACBITS);
}
else
{
@@ -13623,8 +13596,8 @@ void P_SpawnHoopsAndRings(mapthing_t *mthing, boolean bonustime)
sec->f_slope ? P_GetZAt(sec->f_slope, x, y) :
#endif
sec->floorheight;
- if (mthing->options >> ZSHIFT)
- z += ((mthing->options >> ZSHIFT) << FRACBITS);
+ if (mthing->z)
+ z += (mthing->z << FRACBITS);
}
if (mthing->options & MTF_AMBUSH) // Special flag for rings
@@ -13635,8 +13608,6 @@ void P_SpawnHoopsAndRings(mapthing_t *mthing, boolean bonustime)
z += 24*FRACUNIT;
}
- mthing->z = (INT16)(z>>FRACBITS);
-
mobj = P_SpawnMobj(x, y, z, ringthing);
mobj->spawnpoint = mthing;
diff --git a/src/p_setup.c b/src/p_setup.c
index 7e6bdcc678be7f3f0c1e4f16076d26f3eee3c4b7..821f8bcd57a2f9d43be05ab16ec758160899f1b7 100644
--- a/src/p_setup.c
+++ b/src/p_setup.c
@@ -906,10 +906,6 @@ void P_ReloadRings(void)
{
mt->mobj = NULL;
- // Z for objects Tails 05-26-2002
- mt->z = (INT16)(R_PointInSubsector(mt->x << FRACBITS, mt->y << FRACBITS)
- ->sector->floorheight>>FRACBITS);
-
P_SpawnHoopsAndRings(mt, true);
}
}
@@ -1013,13 +1009,11 @@ static void P_PrepareRawThings(UINT8 *data, size_t i)
nummapthings = i / (5 * sizeof (INT16));
mapthings = Z_Calloc(nummapthings * sizeof (*mapthings), PU_LEVEL, NULL);
- // Spawn axis points first so they are
- // at the front of the list for fast searching.
- mt = mapthings;
- for (i = 0; i < nummapthings; i++, mt++)
+ for (i = 0, mt = mapthings; i < nummapthings; i++, mt++)
{
mt->x = READINT16(data);
mt->y = READINT16(data);
+
mt->angle = READINT16(data);
mt->type = READUINT16(data);
mt->options = READUINT16(data);
@@ -1027,17 +1021,10 @@ static void P_PrepareRawThings(UINT8 *data, size_t i)
mt->type &= 4095;
- switch (mt->type)
- {
- case 1700: // MT_AXIS
- case 1701: // MT_AXISTRANSFER
- case 1702: // MT_AXISTRANSFERLINE
- mt->mobj = NULL;
- P_SpawnMapThing(mt);
- break;
- default:
- break;
- }
+ if (mt->type == 1705 || (mt->type == 750 && mt->extrainfo))
+ mt->z = mt->options; // NiGHTS Hoops use the full flags bits to set the height.
+ else
+ mt->z = mt->options >> ZSHIFT;
}
}
@@ -1048,26 +1035,76 @@ static void P_PrepareThings(lumpnum_t lumpnum)
Z_Free(data);
}
+static void P_SpawnEmeraldHunt(void)
+{
+ INT32 emer1, emer2, emer3;
+ INT32 timeout = 0; // keeps from getting stuck
+
+ emer1 = emer2 = emer3 = 0;
+
+ //increment spawn numbers because zero is valid.
+ emer1 = (P_RandomKey(numhuntemeralds)) + 1;
+ while (timeout++ < 100)
+ {
+ emer2 = (P_RandomKey(numhuntemeralds)) + 1;
+
+ if (emer2 != emer1)
+ break;
+ }
+
+ timeout = 0;
+ while (timeout++ < 100)
+ {
+ emer3 = (P_RandomKey(numhuntemeralds)) + 1;
+
+ if (emer3 != emer2 && emer3 != emer1)
+ break;
+ }
+
+ //decrement spawn values to the actual number because zero is valid.
+ if (emer1--)
+ P_SpawnMobj(huntemeralds[emer1]->x<<FRACBITS,
+ huntemeralds[emer1]->y<<FRACBITS,
+ huntemeralds[emer1]->z<<FRACBITS, MT_EMERHUNT);
+
+ if (emer2--)
+ P_SetMobjStateNF(P_SpawnMobj(huntemeralds[emer2]->x<<FRACBITS,
+ huntemeralds[emer2]->y<<FRACBITS,
+ huntemeralds[emer2]->z<<FRACBITS, MT_EMERHUNT),
+ mobjinfo[MT_EMERHUNT].spawnstate+1);
+
+ if (emer3--)
+ P_SetMobjStateNF(P_SpawnMobj(huntemeralds[emer3]->x<<FRACBITS,
+ huntemeralds[emer3]->y<<FRACBITS,
+ huntemeralds[emer3]->z<<FRACBITS, MT_EMERHUNT),
+ mobjinfo[MT_EMERHUNT].spawnstate+2);
+}
+
static void P_LoadThings(boolean loademblems)
{
size_t i;
mapthing_t *mt;
- // Loading the things lump itself into memory is now handled in P_PrepareThings, above
-
- mt = mapthings;
- numhuntemeralds = 0;
- for (i = 0; i < nummapthings; i++, mt++)
+ // Spawn axis points first so they are at the front of the list for fast searching.
+ for (i = 0, mt = mapthings; i < nummapthings; i++, mt++)
{
- sector_t *mtsector = R_PointInSubsector(mt->x << FRACBITS, mt->y << FRACBITS)->sector;
+ switch (mt->type)
+ {
+ case 1700: // MT_AXIS
+ case 1701: // MT_AXISTRANSFER
+ case 1702: // MT_AXISTRANSFERLINE
+ mt->mobj = NULL;
+ P_SpawnMapThing(mt);
+ break;
+ default:
+ break;
+ }
+ }
- // Z for objects
- mt->z = (INT16)(
-#ifdef ESLOPE
- mtsector->f_slope ? P_GetZAt(mtsector->f_slope, mt->x << FRACBITS, mt->y << FRACBITS) :
-#endif
- mtsector->floorheight)>>FRACBITS;
+ numhuntemeralds = 0;
+ for (i = 0, mt = mapthings; i < nummapthings; i++, mt++)
+ {
if (mt->type == 1700 // MT_AXIS
|| mt->type == 1701 // MT_AXISTRANSFER
|| mt->type == 1702) // MT_AXISTRANSFERLINE
@@ -1082,49 +1119,7 @@ static void P_LoadThings(boolean loademblems)
// random emeralds for hunt
if (numhuntemeralds)
- {
- INT32 emer1, emer2, emer3;
- INT32 timeout = 0; // keeps from getting stuck
-
- emer1 = emer2 = emer3 = 0;
-
- //increment spawn numbers because zero is valid.
- emer1 = (P_RandomKey(numhuntemeralds)) + 1;
- while (timeout++ < 100)
- {
- emer2 = (P_RandomKey(numhuntemeralds)) + 1;
-
- if (emer2 != emer1)
- break;
- }
-
- timeout = 0;
- while (timeout++ < 100)
- {
- emer3 = (P_RandomKey(numhuntemeralds)) + 1;
-
- if (emer3 != emer2 && emer3 != emer1)
- break;
- }
-
- //decrement spawn values to the actual number because zero is valid.
- if (emer1--)
- P_SpawnMobj(huntemeralds[emer1]->x<<FRACBITS,
- huntemeralds[emer1]->y<<FRACBITS,
- huntemeralds[emer1]->z<<FRACBITS, MT_EMERHUNT);
-
- if (emer2--)
- P_SetMobjStateNF(P_SpawnMobj(huntemeralds[emer2]->x<<FRACBITS,
- huntemeralds[emer2]->y<<FRACBITS,
- huntemeralds[emer2]->z<<FRACBITS, MT_EMERHUNT),
- mobjinfo[MT_EMERHUNT].spawnstate+1);
-
- if (emer3--)
- P_SetMobjStateNF(P_SpawnMobj(huntemeralds[emer3]->x<<FRACBITS,
- huntemeralds[emer3]->y<<FRACBITS,
- huntemeralds[emer3]->z<<FRACBITS, MT_EMERHUNT),
- mobjinfo[MT_EMERHUNT].spawnstate+2);
- }
+ P_SpawnEmeraldHunt();
if (metalrecording) // Metal Sonic gets no rings to distract him.
return;
@@ -1140,11 +1135,6 @@ static void P_LoadThings(boolean loademblems)
|| mt->type == 1705 || mt->type == 1713) // hoops
{
mt->mobj = NULL;
-
- // Z for objects Tails 05-26-2002
- mt->z = (INT16)(R_PointInSubsector(mt->x << FRACBITS, mt->y << FRACBITS)
- ->sector->floorheight>>FRACBITS);
-
P_SpawnHoopsAndRings(mt, false);
}
}
diff --git a/src/p_user.c b/src/p_user.c
index b6f352450fd9a1340953917dceeb89208d75b6c0..c8a329c358e02c2b65073cf7ba65352fe32a9a8a 100644
--- a/src/p_user.c
+++ b/src/p_user.c
@@ -4635,7 +4635,7 @@ static void P_DoSpinAbility(player_t *player, ticcmd_t *cmd)
S_StartSound(player->mo, sfx_spin);
break;
}
- if (player->dashspeed < player->maxdash)
+ if (player->dashspeed < player->maxdash && player->mindash != player->maxdash)
{
#define chargecalculation (6*(player->dashspeed - player->mindash))/(player->maxdash - player->mindash)
fixed_t soundcalculation = chargecalculation;
@@ -5273,7 +5273,7 @@ static void P_DoJumpStuff(player_t *player, ticcmd_t *cmd)
player->secondjump = 0;
player->pflags &= ~PF_THOKKED;
}
- else if (player->pflags & PF_SLIDING || ((gametyperules & GTR_TEAMFLAGS) && player->gotflag))
+ else if (player->pflags & PF_SLIDING || ((gametyperules & GTR_TEAMFLAGS) && player->gotflag) || player->pflags & PF_SHIELDABILITY)
;
/*else if (P_SuperReady(player))
{
diff --git a/src/st_stuff.c b/src/st_stuff.c
index b822678ff4782b6ddebb822a5f2fd8ba245160c3..6ff73e03a6df98d4f7a97b23987baa2b319ed730 100644
--- a/src/st_stuff.c
+++ b/src/st_stuff.c
@@ -2326,6 +2326,9 @@ static void ST_drawTeamHUD(void)
else
p = bmatcico;
+#ifdef HAVE_BLUA
+ if (LUA_HudEnabled(hud_teamscores))
+#endif
V_DrawSmallScaledPatch(BASEVIDWIDTH/2 - SEP - SHORT(p->width)/4, 4, V_HUDTRANS|V_PERPLAYER|V_SNAPTOTOP, p);
if (gametyperules & GTR_TEAMFLAGS)
@@ -2333,6 +2336,9 @@ static void ST_drawTeamHUD(void)
else
p = rmatcico;
+#ifdef HAVE_BLUA
+ if (LUA_HudEnabled(hud_teamscores))
+#endif
V_DrawSmallScaledPatch(BASEVIDWIDTH/2 + SEP - SHORT(p->width)/4, 4, V_HUDTRANS|V_PERPLAYER|V_SNAPTOTOP, p);
if (!(gametyperules & GTR_TEAMFLAGS))
@@ -2344,28 +2350,53 @@ static void ST_drawTeamHUD(void)
// Show which flags aren't at base.
for (i = 0; i < MAXPLAYERS; i++)
{
- if (players[i].gotflag & GF_BLUEFLAG) // Blue flag isn't at base
+ if (players[i].gotflag & GF_BLUEFLAG // Blue flag isn't at base
+#ifdef HAVE_BLUA
+ && LUA_HudEnabled(hud_teamscores)
+#endif
+ )
V_DrawScaledPatch(BASEVIDWIDTH/2 - SEP - SHORT(nonicon->width)/2, 0, V_HUDTRANS|V_PERPLAYER|V_SNAPTOTOP, nonicon);
- if (players[i].gotflag & GF_REDFLAG) // Red flag isn't at base
+
+ if (players[i].gotflag & GF_REDFLAG // Red flag isn't at base
+#ifdef HAVE_BLUA
+ && LUA_HudEnabled(hud_teamscores)
+#endif
+ )
V_DrawScaledPatch(BASEVIDWIDTH/2 + SEP - SHORT(nonicon2->width)/2, 0, V_HUDTRANS|V_PERPLAYER|V_SNAPTOTOP, nonicon2);
whichflag |= players[i].gotflag;
+
if ((whichflag & (GF_REDFLAG|GF_BLUEFLAG)) == (GF_REDFLAG|GF_BLUEFLAG))
break; // both flags were found, let's stop early
}
// Display a countdown timer showing how much time left until the flag returns to base.
{
- if (blueflag && blueflag->fuse > 1)
+ if (blueflag && blueflag->fuse > 1
+#ifdef HAVE_BLUA
+ && LUA_HudEnabled(hud_teamscores)
+#endif
+ )
V_DrawCenteredString(BASEVIDWIDTH/2 - SEP, 8, V_YELLOWMAP|V_HUDTRANS|V_PERPLAYER|V_SNAPTOTOP, va("%u", (blueflag->fuse / TICRATE)));
- if (redflag && redflag->fuse > 1)
+ if (redflag && redflag->fuse > 1
+#ifdef HAVE_BLUA
+ && LUA_HudEnabled(hud_teamscores)
+#endif
+ )
V_DrawCenteredString(BASEVIDWIDTH/2 + SEP, 8, V_YELLOWMAP|V_HUDTRANS|V_PERPLAYER|V_SNAPTOTOP, va("%u", (redflag->fuse / TICRATE)));
}
}
num:
+#ifdef HAVE_BLUA
+ if (LUA_HudEnabled(hud_teamscores))
+#endif
V_DrawCenteredString(BASEVIDWIDTH/2 - SEP, 16, V_HUDTRANS|V_PERPLAYER|V_SNAPTOTOP, va("%u", bluescore));
+
+#ifdef HAVE_BLUA
+ if (LUA_HudEnabled(hud_teamscores))
+#endif
V_DrawCenteredString(BASEVIDWIDTH/2 + SEP, 16, V_HUDTRANS|V_PERPLAYER|V_SNAPTOTOP, va("%u", redscore));
#undef SEP