diff --git a/CMakeLists.txt b/CMakeLists.txt
index abec11087e0ec11f24bb2228730ebd19af2ee2cf..1e46f5dc37fb5b650165ef49004b5f5177511483 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -2,7 +2,7 @@ cmake_minimum_required(VERSION 3.0)
# DO NOT CHANGE THIS SRB2 STRING! Some variable names depend on this string.
# Version change is fine.
project(SRB2
- VERSION 2.2.2
+ VERSION 2.2.4
LANGUAGES C)
if(${PROJECT_SOURCE_DIR} MATCHES ${PROJECT_BINARY_DIR})
diff --git a/appveyor.yml b/appveyor.yml
index a28935f6388649052389adbc70c88d2f853a7e75..5d599a516c4bcf78e67b4dc0b5e2f2505df1df48 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -1,4 +1,4 @@
-version: 2.2.2.{branch}-{build}
+version: 2.2.4.{branch}-{build}
os: MinGW
environment:
diff --git a/extras/conf/SRB2-22.cfg b/extras/conf/SRB2-22.cfg
index ea783908a933e63319548291e57d475ff74cbfab..7b1b678f220d843f812b285ba13470bcb8b658ad 100644
--- a/extras/conf/SRB2-22.cfg
+++ b/extras/conf/SRB2-22.cfg
@@ -750,16 +750,11 @@ linedeftypes
prefix = "(20)";
}
- 21
- {
- title = "Explicitly Include Line <disabled>";
- prefix = "(21)";
- }
-
22
{
title = "Parameters";
prefix = "(22)";
+ flags8text = "[3] Set translucency by X offset";
flags32text = "[5] Render outer sides only";
flags64text = "[6] Trigger linedef executor";
flags128text = "[7] Intangible";
@@ -1908,6 +1903,27 @@ linedeftypes
prefix = "(333)";
}
+ 334
+ {
+ title = "Object Dye - Continuous";
+ flags64text = "[6] Disable for this color";
+ prefix = "(334)";
+ }
+
+ 335
+ {
+ title = "Object Dye - Each Time";
+ flags64text = "[6] Disable for this color";
+ prefix = "(335)";
+ }
+
+ 336
+ {
+ title = "Object Dye - Once";
+ flags64text = "[6] Disable for this color";
+ prefix = "(336)";
+ }
+
399
{
title = "Level Load";
@@ -2218,6 +2234,19 @@ linedeftypes
prefix = "(462)";
flags8text = "[3] Set delay by backside sector";
}
+
+ 463
+ {
+ title = "Dye Object";
+ prefix = "(463)";
+ }
+
+ 464
+ {
+ title = "Trigger Egg Capsule";
+ prefix = "(464)";
+ flags64text = "[6] Don't end level";
+ }
}
linedefexecmisc
@@ -3704,6 +3733,7 @@ thingtypes
width = 8;
height = 16;
sprite = "internal:capsule";
+ angletext = "Tag";
}
292
{
diff --git a/src/am_map.c b/src/am_map.c
index cdbaaf80aea702a02b77618ac4081c6cbb7abfa6..53a7480a5468d113226cdcbdde34d495f735e55d 100644
--- a/src/am_map.c
+++ b/src/am_map.c
@@ -931,11 +931,8 @@ static inline void AM_drawWalls(void)
l.b.y = lines[i].v2->y >> FRACTOMAPBITS;
#define SLOPEPARAMS(slope, end1, end2, normalheight) \
- if (slope) { \
- end1 = P_GetZAt(slope, lines[i].v1->x, lines[i].v1->y); \
- end2 = P_GetZAt(slope, lines[i].v2->x, lines[i].v2->y); \
- } else \
- end1 = end2 = normalheight;
+ end1 = P_GetZAt(slope, lines[i].v1->x, lines[i].v1->y, normalheight); \
+ end2 = P_GetZAt(slope, lines[i].v2->x, lines[i].v2->y, normalheight);
SLOPEPARAMS(lines[i].frontsector->f_slope, frontf1, frontf2, lines[i].frontsector->floorheight)
SLOPEPARAMS(lines[i].frontsector->c_slope, frontc1, frontc2, lines[i].frontsector->ceilingheight)
diff --git a/src/b_bot.c b/src/b_bot.c
index 9a4c20c17618ef2a7cf3f8edf475761ff0b89cc9..4397938c1ae42e90807493b8edbfac81225c12bd 100644
--- a/src/b_bot.c
+++ b/src/b_bot.c
@@ -459,7 +459,6 @@ boolean B_CheckRespawn(player_t *player)
if (!sonic || sonic->health <= 0)
return false;
-#ifdef HAVE_BLUA
// B_RespawnBot doesn't do anything if the condition above this isn't met
{
UINT8 shouldForce = LUAh_BotRespawn(sonic, tails);
@@ -472,7 +471,6 @@ boolean B_CheckRespawn(player_t *player)
else if (shouldForce == 2)
return false;
}
-#endif
// Check if Sonic is busy first.
// If he's doing any of these things, he probably doesn't want to see us.
diff --git a/src/config.h.in b/src/config.h.in
index 4926f9a063ca706f36fcfd8398ce80820d312e39..3b25799657cdd10cec5e35f6e06775c6edf48b4a 100644
--- a/src/config.h.in
+++ b/src/config.h.in
@@ -28,12 +28,14 @@
/* Manually defined asset hashes for non-CMake builds
* Last updated 2020 / 02 / 15 - v2.2.1 - main assets
* Last updated 2020 / 02 / 22 - v2.2.2 - patch.pk3
+ * Last updated 2020 / 05 / 10 - v2.2.3 - player.dta & patch.pk3
+ * Last updated 2020 / 05 / 11 - v2.2.4 - patch.pk3
*/
#define ASSET_HASH_SRB2_PK3 "0277c9416756627004e83cbb5b2e3e28"
#define ASSET_HASH_ZONES_PK3 "f7e88afb6af7996a834c7d663144bead"
-#define ASSET_HASH_PLAYER_DTA "ad49e07b17cc662f1ad70c454910b4ae"
+#define ASSET_HASH_PLAYER_DTA "8a4507ddf9bc0682c09174400f26ad65"
#ifdef USE_PATCH_DTA
-#define ASSET_HASH_PATCH_PK3 "ee54330ecb743314c5f962af4db731ff"
+#define ASSET_HASH_PATCH_PK3 "bbbf6af3b20349612ee06e0b55979a76"
#endif
#endif
diff --git a/src/d_clisrv.c b/src/d_clisrv.c
index f7755c148d24ef78d1709a38b192b40a1b0e952f..ed0b8e528ef1462ada824a9f7764168b18a96b1e 100644
--- a/src/d_clisrv.c
+++ b/src/d_clisrv.c
@@ -1690,7 +1690,7 @@ static void CL_LoadReceivedSavegame(void)
// load a base level
if (P_LoadNetGame())
{
- const INT32 actnum = mapheaderinfo[gamemap-1]->actnum;
+ const UINT8 actnum = mapheaderinfo[gamemap-1]->actnum;
CONS_Printf(M_GetText("Map is now \"%s"), G_BuildMapName(gamemap));
if (strcmp(mapheaderinfo[gamemap-1]->lvlttl, ""))
{
@@ -5062,7 +5062,7 @@ void NetUpdate(void)
// In case the cvar value was lowered
if (joindelay)
- joindelay = min(joindelay - 1, 3 * cv_joindelay.value * TICRATE);
+ joindelay = min(joindelay - 1, 3 * (tic_t)cv_joindelay.value * TICRATE);
}
nowtime /= NEWTICRATERATIO;
diff --git a/src/d_main.c b/src/d_main.c
index 00aeb541db0e6d572b2acc8c5aca51287cc775e2..07a7ecf91038f802742077a283c3c1691d545529 100644
--- a/src/d_main.c
+++ b/src/d_main.c
@@ -125,6 +125,8 @@ boolean advancedemo;
INT32 debugload = 0;
#endif
+char savegamename[256];
+
char srb2home[256] = ".";
char srb2path[256] = ".";
boolean usehome = true;
@@ -310,7 +312,9 @@ static void D_Display(void)
F_WipeStartScreen();
// Check for Mega Genesis fade
wipestyleflags = WSF_FADEOUT;
- if (F_TryColormapFade(31))
+ if (wipegamestate == (gamestate_t)FORCEWIPE)
+ F_WipeColorFill(31);
+ else if (F_TryColormapFade(31))
wipetypepost = -1; // Don't run the fade below this one
F_WipeEndScreen();
F_RunWipe(wipetypepre, gamestate != GS_TIMEATTACK && gamestate != GS_TITLESCREEN);
@@ -991,6 +995,7 @@ static void IdentifyVersion(void)
}
MUSICTEST("music.dta")
+ MUSICTEST("patch_music.pk3")
#ifdef DEVELOP // remove when music_new.dta is merged into music.dta
MUSICTEST("music_new.dta")
#endif
diff --git a/src/d_net.c b/src/d_net.c
index 1db75f3da13e7bcd357054362cdd49094ac78d45..a6768d75d3d1cfd550a77224ca83dba1dab33632 100644
--- a/src/d_net.c
+++ b/src/d_net.c
@@ -811,6 +811,7 @@ static const char *packettypename[NUMPACKETTYPE] =
"CLIENTJOIN",
"NODETIMEOUT",
"RESYNCHING",
+ "LOGIN",
"PING"
};
diff --git a/src/d_player.h b/src/d_player.h
index 8697e9836929c0e269f61127d7245686e71b0232..e5c7e72980d644dc926ca8e792f1136a54fd3b16 100644
--- a/src/d_player.h
+++ b/src/d_player.h
@@ -239,7 +239,8 @@ typedef enum
CR_MACESPIN,
CR_MINECART,
CR_ROLLOUT,
- CR_PTERABYTE
+ CR_PTERABYTE,
+ CR_DUSTDEVIL
} carrytype_t; // pw_carry
// Player powers. (don't edit this comment)
diff --git a/src/dehacked.c b/src/dehacked.c
index e9d029be0b38ba2879291d0f9721f0d748c80850..d78a0d6c65f3a55a14240bac697ae240b10debaf 100644
--- a/src/dehacked.c
+++ b/src/dehacked.c
@@ -1557,7 +1557,7 @@ static void readlevelheader(MYFILE *f, INT32 num)
}
else if (fastcmp(word, "ACT"))
{
- if (i >= 0 && i < 20) // 0 for no act number, TTL1 through TTL19
+ if (i >= 0 && i <= 99) // 0 for no act number
mapheaderinfo[num-1]->actnum = (UINT8)i;
else
deh_warning("Level header %d: invalid act number %d", num, i);
@@ -1863,6 +1863,12 @@ static void readlevelheader(MYFILE *f, INT32 num)
}
else if (fastcmp(word, "STARTRINGS"))
mapheaderinfo[num-1]->startrings = (UINT16)i;
+ else if (fastcmp(word, "SPECIALSTAGETIME"))
+ mapheaderinfo[num-1]->sstimer = i;
+ else if (fastcmp(word, "SPECIALSTAGESPHERES"))
+ mapheaderinfo[num-1]->ssspheres = i;
+ else if (fastcmp(word, "GRAVITY"))
+ mapheaderinfo[num-1]->gravity = FLOAT_TO_FIXED(atof(word2));
else
deh_warning("Level header %d: unknown word '%s'", num, word);
}
@@ -2807,7 +2813,7 @@ static actionpointer_t actionpointers[] =
{{A_ThrownRing}, "A_THROWNRING"},
{{A_SetSolidSteam}, "A_SETSOLIDSTEAM"},
{{A_UnsetSolidSteam}, "A_UNSETSOLIDSTEAM"},
- {{A_SignSpin}, "S_SIGNSPIN"},
+ {{A_SignSpin}, "A_SIGNSPIN"},
{{A_SignPlayer}, "A_SIGNPLAYER"},
{{A_OverlayThink}, "A_OVERLAYTHINK"},
{{A_JetChase}, "A_JETCHASE"},
@@ -3027,6 +3033,7 @@ static actionpointer_t actionpointers[] =
{{A_DragonbomberSpawn}, "A_DRAGONBOMERSPAWN"},
{{A_DragonWing}, "A_DRAGONWING"},
{{A_DragonSegment}, "A_DRAGONSEGMENT"},
+ {{A_ChangeHeight}, "A_CHANGEHEIGHT"},
{{NULL}, "NONE"},
// This NULL entry must be the last in the list
@@ -6225,6 +6232,14 @@ static const char *const STATE_LIST[] = { // array length left dynamic for sanit
"S_ROCKET",
"S_LASER",
+ "S_LASER2",
+ "S_LASERFLASH",
+
+ "S_LASERFLAME1",
+ "S_LASERFLAME2",
+ "S_LASERFLAME3",
+ "S_LASERFLAME4",
+ "S_LASERFLAME5",
"S_TORPEDO",
@@ -9224,6 +9239,7 @@ static const char *const MENUTYPES_LIST[] = {
"MP_CONNECT",
"MP_ROOM",
"MP_PLAYERSETUP", // MP_PlayerSetupDef shared with SPLITSCREEN if #defined NONET
+ "MP_SERVER_OPTIONS",
// Options
"OP_MAIN",
@@ -9233,10 +9249,14 @@ static const char *const MENUTYPES_LIST[] = {
"OP_P1MOUSE",
"OP_P1JOYSTICK",
"OP_JOYSTICKSET", // OP_JoystickSetDef shared with P2
+ "OP_P1CAMERA",
"OP_P2CONTROLS",
"OP_P2MOUSE",
"OP_P2JOYSTICK",
+ "OP_P2CAMERA",
+
+ "OP_PLAYSTYLE",
"OP_VIDEO",
"OP_VIDEOMODE",
@@ -9468,6 +9488,7 @@ struct {
{"CR_MINECART",CR_MINECART},
{"CR_ROLLOUT",CR_ROLLOUT},
{"CR_PTERABYTE",CR_PTERABYTE},
+ {"CR_DUSTDEVIL",CR_DUSTDEVIL},
// Ring weapons (ringweapons_t)
// Useful for A_GiveWeapon
diff --git a/src/doomdef.h b/src/doomdef.h
index a91142e9d1171459b4226f8287640cd3812b17fb..74086ef5d3a850d11060784960930b5154fb83ef 100644
--- a/src/doomdef.h
+++ b/src/doomdef.h
@@ -143,9 +143,9 @@ extern char logfilename[1024];
// we use comprevision and compbranch instead.
#else
#define VERSION 202 // Game version
-#define SUBVERSION 2 // more precise version number
-#define VERSIONSTRING "v2.2.2"
-#define VERSIONSTRINGW L"v2.2.2"
+#define SUBVERSION 4 // more precise version number
+#define VERSIONSTRING "v2.2.4"
+#define VERSIONSTRINGW L"v2.2.4"
// Hey! If you change this, add 1 to the MODVERSION below!
// Otherwise we can't force updates!
#endif
@@ -213,7 +213,7 @@ extern char logfilename[1024];
// 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 42
+#define MODVERSION 44
// To version config.cfg, MAJOREXECVERSION is set equal to MODVERSION automatically.
// Increment MINOREXECVERSION whenever a config change is needed that does not correspond
@@ -458,7 +458,7 @@ void CONS_Debug(INT32 debugflags, const char *fmt, ...) FUNCDEBUG;
// Things that used to be in dstrings.h
#define SAVEGAMENAME "srb2sav"
-char savegamename[256];
+extern char savegamename[256];
// m_misc.h
#ifdef GETTEXT
@@ -565,10 +565,6 @@ extern const char *compdate, *comptime, *comprevision, *compbranch;
// None of these that are disabled in the normal build are guaranteed to work perfectly
// Compile them at your own risk!
-/// Backwards compatibility with SRB2CB's slope linedef types.
-/// \note A simple shim that prints a warning.
-#define ESLOPE_TYPESHIM
-
/// Allows the use of devmode in multiplayer. AKA "fishcake"
//#define NETGAME_DEVMODE
diff --git a/src/doomstat.h b/src/doomstat.h
index aedb120ff27ac13e7c3a4c03d347230d638093e1..57ea3e0496ef4679512ba6c82f029d3396f7bb47 100644
--- a/src/doomstat.h
+++ b/src/doomstat.h
@@ -319,6 +319,9 @@ typedef struct
char selectheading[22]; ///< Level select heading. Allows for controllable grouping.
UINT16 startrings; ///< Number of rings players start with.
+ INT32 sstimer; ///< Timer for special stages.
+ UINT32 ssspheres; ///< Sphere requirement in special stages.
+ fixed_t gravity; ///< Map-wide gravity.
// Title card.
char ltzzpatch[8]; ///< Zig zag patch.
@@ -542,7 +545,7 @@ extern recorddata_t *mainrecords[NUMMAPS];
extern UINT8 mapvisited[NUMMAPS];
// Temporary holding place for nights data for the current map
-nightsdata_t ntemprecords;
+extern nightsdata_t ntemprecords;
extern UINT32 token; ///< Number of tokens collected in a level
extern UINT32 tokenlist; ///< List of tokens collected
@@ -617,6 +620,19 @@ extern mapthing_t *playerstarts[MAXPLAYERS]; // Cooperative
extern mapthing_t *bluectfstarts[MAXPLAYERS]; // CTF
extern mapthing_t *redctfstarts[MAXPLAYERS]; // CTF
+#define WAYPOINTSEQUENCESIZE 256
+#define NUMWAYPOINTSEQUENCES 256
+extern mobj_t *waypoints[NUMWAYPOINTSEQUENCES][WAYPOINTSEQUENCESIZE];
+extern UINT16 numwaypoints[NUMWAYPOINTSEQUENCES];
+
+void P_AddWaypoint(UINT8 sequence, UINT8 id, mobj_t *waypoint);
+mobj_t *P_GetFirstWaypoint(UINT8 sequence);
+mobj_t *P_GetLastWaypoint(UINT8 sequence);
+mobj_t *P_GetPreviousWaypoint(mobj_t *current, boolean wrap);
+mobj_t *P_GetNextWaypoint(mobj_t *current, boolean wrap);
+mobj_t *P_GetClosestWaypoint(UINT8 sequence, mobj_t *mo);
+boolean P_IsDegeneratedWaypointSequence(UINT8 sequence);
+
// =====================================
// Internal parameters, used for engine.
// =====================================
diff --git a/src/g_demo.c b/src/g_demo.c
index 30bc8ca48f57d299afd94d47bc5faea7a3d36663..a901e8dea9b135f093940f3aa6d68896ffb592a8 100644
--- a/src/g_demo.c
+++ b/src/g_demo.c
@@ -2332,6 +2332,38 @@ void G_DoneLevelLoad(void)
===================
*/
+// Writes the demo's checksum, or just random garbage if you can't do that for some reason.
+static void WriteDemoChecksum(void)
+{
+ UINT8 *p = demobuffer+16; // checksum position
+#ifdef NOMD5
+ UINT8 i;
+ for (i = 0; i < 16; i++, p++)
+ *p = P_RandomByte(); // This MD5 was chosen by fair dice roll and most likely < 50% correct.
+#else
+ md5_buffer((char *)p+16, demo_p - (p+16), p); // make a checksum of everything after the checksum in the file.
+#endif
+}
+
+// Stops recording a demo.
+static void G_StopDemoRecording(void)
+{
+ boolean saved = false;
+ WRITEUINT8(demo_p, DEMOMARKER); // add the demo end marker
+ WriteDemoChecksum();
+ saved = FIL_WriteFile(va(pandf, srb2home, demoname), demobuffer, demo_p - demobuffer); // finally output the file.
+ free(demobuffer);
+ demorecording = false;
+
+ if (modeattacking != ATTACKING_RECORD)
+ {
+ if (saved)
+ CONS_Printf(M_GetText("Demo %s recorded\n"), demoname);
+ else
+ CONS_Alert(CONS_WARNING, M_GetText("Demo %s not saved\n"), demoname);
+ }
+}
+
// Stops metal sonic's demo. Separate from other functions because metal + replays can coexist
void G_StopMetalDemo(void)
{
@@ -2349,20 +2381,8 @@ ATTRNORETURN void FUNCNORETURN G_StopMetalRecording(boolean kill)
boolean saved = false;
if (demo_p)
{
- UINT8 *p = demobuffer+16; // checksum position
- if (kill)
- WRITEUINT8(demo_p, METALDEATH); // add the metal death marker
- else
- WRITEUINT8(demo_p, DEMOMARKER); // add the demo end marker
-#ifdef NOMD5
- {
- UINT8 i;
- for (i = 0; i < 16; i++, p++)
- *p = P_RandomByte(); // This MD5 was chosen by fair dice roll and most likely < 50% correct.
- }
-#else
- md5_buffer((char *)p+16, demo_p - (p+16), (void *)p); // make a checksum of everything after the checksum in the file.
-#endif
+ WRITEUINT8(demo_p, (kill) ? METALDEATH : DEMOMARKER); // add the demo end (or metal death) marker
+ WriteDemoChecksum();
saved = FIL_WriteFile(va("%sMS.LMP", G_BuildMapName(gamemap)), demobuffer, demo_p - demobuffer); // finally output the file.
}
free(demobuffer);
@@ -2372,6 +2392,63 @@ ATTRNORETURN void FUNCNORETURN G_StopMetalRecording(boolean kill)
I_Error("Failed to save demo!");
}
+// Stops timing a demo.
+static void G_StopTimingDemo(void)
+{
+ INT32 demotime;
+ double f1, f2;
+ demotime = I_GetTime() - demostarttime;
+ if (!demotime)
+ return;
+ G_StopDemo();
+ timingdemo = false;
+ f1 = (double)demotime;
+ f2 = (double)framecount*TICRATE;
+
+ CONS_Printf(M_GetText("timed %u gametics in %d realtics - %u frames\n%f seconds, %f avg fps\n"),
+ leveltime,demotime,(UINT32)framecount,f1/TICRATE,f2/f1);
+
+ // CSV-readable timedemo results, for external parsing
+ if (timedemo_csv)
+ {
+ FILE *f;
+ const char *csvpath = va("%s"PATHSEP"%s", srb2home, "timedemo.csv");
+ const char *header = "id,demoname,seconds,avgfps,leveltime,demotime,framecount,ticrate,rendermode,vidmode,vidwidth,vidheight,procbits\n";
+ const char *rowformat = "\"%s\",\"%s\",%f,%f,%u,%d,%u,%u,%u,%u,%u,%u,%u\n";
+ boolean headerrow = !FIL_FileExists(csvpath);
+ UINT8 procbits = 0;
+
+ // Bitness
+ if (sizeof(void*) == 4)
+ procbits = 32;
+ else if (sizeof(void*) == 8)
+ procbits = 64;
+
+ f = fopen(csvpath, "a+");
+
+ if (f)
+ {
+ if (headerrow)
+ fputs(header, f);
+ fprintf(f, rowformat,
+ timedemo_csv_id,timedemo_name,f1/TICRATE,f2/f1,leveltime,demotime,(UINT32)framecount,TICRATE,rendermode,vid.modenum,vid.width,vid.height,procbits);
+ fclose(f);
+ CONS_Printf("Timedemo results saved to '%s'\n", csvpath);
+ }
+ else
+ {
+ // Just print the CSV output to console
+ CON_LogMessage(header);
+ CONS_Printf(rowformat,
+ timedemo_csv_id,timedemo_name,f1/TICRATE,f2/f1,leveltime,demotime,(UINT32)framecount,TICRATE,rendermode,vid.modenum,vid.width,vid.height,procbits);
+ }
+ }
+
+ if (restorecv_vidwait != cv_vidwait.value)
+ CV_SetValue(&cv_vidwait, restorecv_vidwait);
+ D_AdvanceDemo();
+}
+
// reset engine variable set for the demos
// called from stopdemo command, map command, and g_checkdemoStatus.
void G_StopDemo(void)
@@ -2394,66 +2471,13 @@ void G_StopDemo(void)
boolean G_CheckDemoStatus(void)
{
- boolean saved;
-
G_FreeGhosts();
// DO NOT end metal sonic demos here
if (timingdemo)
{
- INT32 demotime;
- double f1, f2;
- demotime = I_GetTime() - demostarttime;
- if (!demotime)
- return true;
- G_StopDemo();
- timingdemo = false;
- f1 = (double)demotime;
- f2 = (double)framecount*TICRATE;
-
- CONS_Printf(M_GetText("timed %u gametics in %d realtics - %u frames\n%f seconds, %f avg fps\n"),
- leveltime,demotime,(UINT32)framecount,f1/TICRATE,f2/f1);
-
- // CSV-readable timedemo results, for external parsing
- if (timedemo_csv)
- {
- FILE *f;
- const char *csvpath = va("%s"PATHSEP"%s", srb2home, "timedemo.csv");
- const char *header = "id,demoname,seconds,avgfps,leveltime,demotime,framecount,ticrate,rendermode,vidmode,vidwidth,vidheight,procbits\n";
- const char *rowformat = "\"%s\",\"%s\",%f,%f,%u,%d,%u,%u,%u,%u,%u,%u,%u\n";
- boolean headerrow = !FIL_FileExists(csvpath);
- UINT8 procbits = 0;
-
- // Bitness
- if (sizeof(void*) == 4)
- procbits = 32;
- else if (sizeof(void*) == 8)
- procbits = 64;
-
- f = fopen(csvpath, "a+");
-
- if (f)
- {
- if (headerrow)
- fputs(header, f);
- fprintf(f, rowformat,
- timedemo_csv_id,timedemo_name,f1/TICRATE,f2/f1,leveltime,demotime,(UINT32)framecount,TICRATE,rendermode,vid.modenum,vid.width,vid.height,procbits);
- fclose(f);
- CONS_Printf("Timedemo results saved to '%s'\n", csvpath);
- }
- else
- {
- // Just print the CSV output to console
- CON_LogMessage(header);
- CONS_Printf(rowformat,
- timedemo_csv_id,timedemo_name,f1/TICRATE,f2/f1,leveltime,demotime,(UINT32)framecount,TICRATE,rendermode,vid.modenum,vid.width,vid.height,procbits);
- }
- }
-
- if (restorecv_vidwait != cv_vidwait.value)
- CV_SetValue(&cv_vidwait, restorecv_vidwait);
- D_AdvanceDemo();
+ G_StopTimingDemo();
return true;
}
@@ -2473,27 +2497,7 @@ boolean G_CheckDemoStatus(void)
if (demorecording)
{
- UINT8 *p = demobuffer+16; // checksum position
-#ifdef NOMD5
- UINT8 i;
- WRITEUINT8(demo_p, DEMOMARKER); // add the demo end marker
- for (i = 0; i < 16; i++, p++)
- *p = P_RandomByte(); // This MD5 was chosen by fair dice roll and most likely < 50% correct.
-#else
- WRITEUINT8(demo_p, DEMOMARKER); // add the demo end marker
- md5_buffer((char *)p+16, demo_p - (p+16), p); // make a checksum of everything after the checksum in the file.
-#endif
- saved = FIL_WriteFile(va(pandf, srb2home, demoname), demobuffer, demo_p - demobuffer); // finally output the file.
- free(demobuffer);
- demorecording = false;
-
- if (modeattacking != ATTACKING_RECORD)
- {
- if (saved)
- CONS_Printf(M_GetText("Demo %s recorded\n"), demoname);
- else
- CONS_Alert(CONS_WARNING, M_GetText("Demo %s not saved\n"), demoname);
- }
+ G_StopDemoRecording();
return true;
}
diff --git a/src/g_game.c b/src/g_game.c
index 92d71fbaeb831be0b113d48c04df59ddb258ec8d..5bcf9f580ad2612fa64619499c0e634e8ad630ba 100644
--- a/src/g_game.c
+++ b/src/g_game.c
@@ -4629,7 +4629,7 @@ char *G_BuildMapTitle(INT32 mapnum)
{
size_t len = 1;
const char *zonetext = NULL;
- const INT32 actnum = mapheaderinfo[mapnum-1]->actnum;
+ const UINT8 actnum = mapheaderinfo[mapnum-1]->actnum;
len += strlen(mapheaderinfo[mapnum-1]->lvlttl);
if (!(mapheaderinfo[mapnum-1]->levelflags & LF_NOZONE))
diff --git a/src/hardware/hw_light.c b/src/hardware/hw_light.c
index c5af8d6d336a8c8b29d9ce492402c323bb964b13..3d1316a2f199508e866dc983265ff0da9de27f99 100644
--- a/src/hardware/hw_light.c
+++ b/src/hardware/hw_light.c
@@ -298,6 +298,8 @@ light_t *t_lspr[NUMSPRITES] =
// Projectiles
&lspr[NOLIGHT], // SPR_MISL
+ &lspr[SMALLREDBALL_L], // SPR_LASR
+ &lspr[REDSHINE_L], // SPR_LASF
&lspr[NOLIGHT], // SPR_TORP
&lspr[NOLIGHT], // SPR_ENRG
&lspr[NOLIGHT], // SPR_MINE
diff --git a/src/hardware/hw_main.c b/src/hardware/hw_main.c
index 50c76fb5aafb19ee4046f0326788263c2d10257a..bcb0afa6e30a03cdaa8e0a547245af2ac8999e8b 100644
--- a/src/hardware/hw_main.c
+++ b/src/hardware/hw_main.c
@@ -511,7 +511,7 @@ static void HWR_RenderPlane(subsector_t *subsector, extrasubsector_t *xsub, bool
// Set fixedheight to the slope's height from our viewpoint, if we have a slope
if (slope)
- fixedheight = P_GetZAt(slope, viewx, viewy);
+ fixedheight = P_GetSlopeZAt(slope, viewx, viewy);
height = FIXED_TO_FLOAT(fixedheight);
@@ -657,7 +657,7 @@ static void HWR_RenderPlane(subsector_t *subsector, extrasubsector_t *xsub, bool
\
if (slope)\
{\
- fixedheight = P_GetZAt(slope, FLOAT_TO_FIXED((vx)), FLOAT_TO_FIXED((vy)));\
+ fixedheight = P_GetSlopeZAt(slope, FLOAT_TO_FIXED((vx)), FLOAT_TO_FIXED((vy)));\
vert->y = FIXED_TO_FLOAT(fixedheight);\
}\
}
@@ -1100,8 +1100,8 @@ static void HWR_SplitWall(sector_t *sector, wallVert3D *wallVerts, INT32 texnum,
float endpegt, endpegb, endpegmul;
float endheight = 0.0f, endbheight = 0.0f;
- // compiler complains when P_GetZAt is used in FLOAT_TO_FIXED directly
- // use this as a temp var to store P_GetZAt's return value each time
+ // compiler complains when P_GetSlopeZAt is used in FLOAT_TO_FIXED directly
+ // use this as a temp var to store P_GetSlopeZAt's return value each time
fixed_t temp;
fixed_t v1x = FLOAT_TO_FIXED(wallVerts[0].x);
@@ -1164,26 +1164,16 @@ static void HWR_SplitWall(sector_t *sector, wallVert3D *wallVerts, INT32 texnum,
else
solid = false;
- if (list[i].slope)
- {
- temp = P_GetZAt(list[i].slope, v1x, v1y);
- height = FIXED_TO_FLOAT(temp);
- temp = P_GetZAt(list[i].slope, v2x, v2y);
- endheight = FIXED_TO_FLOAT(temp);
- }
- else
- height = endheight = FIXED_TO_FLOAT(list[i].height);
+ temp = P_GetLightZAt(&list[i], v1x, v1y);
+ height = FIXED_TO_FLOAT(temp);
+ temp = P_GetLightZAt(&list[i], v2x, v2y);
+ endheight = FIXED_TO_FLOAT(temp);
if (solid)
{
- if (*list[i].caster->b_slope)
- {
- temp = P_GetZAt(*list[i].caster->b_slope, v1x, v1y);
- bheight = FIXED_TO_FLOAT(temp);
- temp = P_GetZAt(*list[i].caster->b_slope, v2x, v2y);
- endbheight = FIXED_TO_FLOAT(temp);
- }
- else
- bheight = endbheight = FIXED_TO_FLOAT(*list[i].caster->bottomheight);
+ temp = P_GetFFloorBottomZAt(list[i].caster, v1x, v1y);
+ bheight = FIXED_TO_FLOAT(temp);
+ temp = P_GetFFloorBottomZAt(list[i].caster, v2x, v2y);
+ endbheight = FIXED_TO_FLOAT(temp);
}
if (endheight >= endtop && height >= top)
@@ -1196,15 +1186,10 @@ static void HWR_SplitWall(sector_t *sector, wallVert3D *wallVerts, INT32 texnum,
if (i + 1 < sector->numlights)
{
- if (list[i+1].slope)
- {
- temp = P_GetZAt(list[i+1].slope, v1x, v1y);
- bheight = FIXED_TO_FLOAT(temp);
- temp = P_GetZAt(list[i+1].slope, v2x, v2y);
- endbheight = FIXED_TO_FLOAT(temp);
- }
- else
- bheight = endbheight = FIXED_TO_FLOAT(list[i+1].height);
+ temp = P_GetLightZAt(&list[i+1], v1x, v1y);
+ bheight = FIXED_TO_FLOAT(temp);
+ temp = P_GetLightZAt(&list[i+1], v2x, v2y);
+ endbheight = FIXED_TO_FLOAT(temp);
}
else
{
@@ -1343,11 +1328,8 @@ static void HWR_StoreWallRange(double startfrac, double endfrac)
v2y = FLOAT_TO_FIXED(ve.y);
#define SLOPEPARAMS(slope, end1, end2, normalheight) \
- if (slope) { \
- end1 = P_GetZAt(slope, v1x, v1y); \
- end2 = P_GetZAt(slope, v2x, v2y); \
- } else \
- end1 = end2 = normalheight;
+ end1 = P_GetZAt(slope, v1x, v1y, normalheight); \
+ end2 = P_GetZAt(slope, v2x, v2y, normalheight);
SLOPEPARAMS(gr_frontsector->c_slope, worldtop, worldtopslope, gr_frontsector->ceilingheight)
SLOPEPARAMS(gr_frontsector->f_slope, worldbottom, worldbottomslope, gr_frontsector->floorheight)
@@ -1950,10 +1932,10 @@ static void HWR_StoreWallRange(double startfrac, double endfrac)
texnum = R_GetTextureNum(sides[newline->sidenum[0]].midtexture);
}
- h = *rover->t_slope ? P_GetZAt(*rover->t_slope, v1x, v1y) : *rover->topheight;
- hS = *rover->t_slope ? P_GetZAt(*rover->t_slope, v2x, v2y) : *rover->topheight;
- l = *rover->b_slope ? P_GetZAt(*rover->b_slope, v1x, v1y) : *rover->bottomheight;
- lS = *rover->b_slope ? P_GetZAt(*rover->b_slope, v2x, v2y) : *rover->bottomheight;
+ h = P_GetFFloorTopZAt (rover, v1x, v1y);
+ hS = P_GetFFloorTopZAt (rover, v2x, v2y);
+ l = P_GetFFloorBottomZAt(rover, v1x, v1y);
+ lS = P_GetFFloorBottomZAt(rover, v2x, v2y);
if (!(*rover->t_slope) && !gr_frontsector->c_slope && !gr_backsector->c_slope && h > highcut)
h = hS = highcut;
if (!(*rover->b_slope) && !gr_frontsector->f_slope && !gr_backsector->f_slope && l < lowcut)
@@ -2091,10 +2073,10 @@ static void HWR_StoreWallRange(double startfrac, double endfrac)
newline = rover->master->frontsector->lines[0] + linenum;
texnum = R_GetTextureNum(sides[newline->sidenum[0]].midtexture);
}
- h = *rover->t_slope ? P_GetZAt(*rover->t_slope, v1x, v1y) : *rover->topheight;
- hS = *rover->t_slope ? P_GetZAt(*rover->t_slope, v2x, v2y) : *rover->topheight;
- l = *rover->b_slope ? P_GetZAt(*rover->b_slope, v1x, v1y) : *rover->bottomheight;
- lS = *rover->b_slope ? P_GetZAt(*rover->b_slope, v2x, v2y) : *rover->bottomheight;
+ h = P_GetFFloorTopZAt (rover, v1x, v1y);
+ hS = P_GetFFloorTopZAt (rover, v2x, v2y);
+ l = P_GetFFloorBottomZAt(rover, v1x, v1y);
+ lS = P_GetFFloorBottomZAt(rover, v2x, v2y);
if (!(*rover->t_slope) && !gr_frontsector->c_slope && !gr_backsector->c_slope && h > highcut)
h = hS = highcut;
if (!(*rover->b_slope) && !gr_frontsector->f_slope && !gr_backsector->f_slope && l < lowcut)
@@ -2212,24 +2194,21 @@ static boolean CheckClip(seg_t * seg, sector_t * afrontsector, sector_t * abacks
v2x = FLOAT_TO_FIXED(((polyvertex_t *)gr_curline->pv2)->x);
v2y = FLOAT_TO_FIXED(((polyvertex_t *)gr_curline->pv2)->y);
#define SLOPEPARAMS(slope, end1, end2, normalheight) \
- if (slope) { \
- end1 = P_GetZAt(slope, v1x, v1y); \
- end2 = P_GetZAt(slope, v2x, v2y); \
- } else \
- end1 = end2 = normalheight;
+ end1 = P_GetZAt(slope, v1x, v1y, normalheight); \
+ end2 = P_GetZAt(slope, v2x, v2y, normalheight);
- SLOPEPARAMS(afrontsector->f_slope, frontf1, frontf2, afrontsector->floorheight)
+ SLOPEPARAMS(afrontsector->f_slope, frontf1, frontf2, afrontsector-> floorheight)
SLOPEPARAMS(afrontsector->c_slope, frontc1, frontc2, afrontsector->ceilingheight)
- SLOPEPARAMS( abacksector->f_slope, backf1, backf2, abacksector->floorheight)
- SLOPEPARAMS( abacksector->c_slope, backc1, backc2, abacksector->ceilingheight)
+ SLOPEPARAMS( abacksector->f_slope, backf1, backf2, abacksector-> floorheight)
+ SLOPEPARAMS( abacksector->c_slope, backc1, backc2, abacksector->ceilingheight)
#undef SLOPEPARAMS
}
else
{
- frontf1 = frontf2 = afrontsector->floorheight;
+ frontf1 = frontf2 = afrontsector-> floorheight;
frontc1 = frontc2 = afrontsector->ceilingheight;
- backf1 = backf2 = abacksector->floorheight;
- backc1 = backc2 = abacksector->ceilingheight;
+ backf1 = backf2 = abacksector-> floorheight;
+ backc1 = backc2 = abacksector->ceilingheight;
}
// properly render skies (consider door "open" if both ceilings are sky)
// same for floors
@@ -2763,16 +2742,13 @@ static void HWR_AddLine(seg_t * line)
fixed_t backf1, backf2, backc1, backc2; // back floor ceiling ends
#define SLOPEPARAMS(slope, end1, end2, normalheight) \
- if (slope) { \
- end1 = P_GetZAt(slope, v1x, v1y); \
- end2 = P_GetZAt(slope, v2x, v2y); \
- } else \
- end1 = end2 = normalheight;
+ end1 = P_GetZAt(slope, v1x, v1y, normalheight); \
+ end2 = P_GetZAt(slope, v2x, v2y, normalheight);
- SLOPEPARAMS(gr_frontsector->f_slope, frontf1, frontf2, gr_frontsector->floorheight)
+ SLOPEPARAMS(gr_frontsector->f_slope, frontf1, frontf2, gr_frontsector-> floorheight)
SLOPEPARAMS(gr_frontsector->c_slope, frontc1, frontc2, gr_frontsector->ceilingheight)
- SLOPEPARAMS( gr_backsector->f_slope, backf1, backf2, gr_backsector->floorheight)
- SLOPEPARAMS( gr_backsector->c_slope, backc1, backc2, gr_backsector->ceilingheight)
+ SLOPEPARAMS( gr_backsector->f_slope, backf1, backf2, gr_backsector-> floorheight)
+ SLOPEPARAMS( gr_backsector->c_slope, backc1, backc2, gr_backsector->ceilingheight)
#undef SLOPEPARAMS
// if both ceilings are skies, consider it always "open"
// same for floors
@@ -3330,20 +3306,10 @@ static void HWR_Subsector(size_t num)
}
else
{
- cullFloorHeight = locFloorHeight = gr_frontsector->floorheight;
- cullCeilingHeight = locCeilingHeight = gr_frontsector->ceilingheight;
-
- if (gr_frontsector->f_slope)
- {
- cullFloorHeight = P_GetZAt(gr_frontsector->f_slope, viewx, viewy);
- locFloorHeight = P_GetZAt(gr_frontsector->f_slope, gr_frontsector->soundorg.x, gr_frontsector->soundorg.y);
- }
-
- if (gr_frontsector->c_slope)
- {
- cullCeilingHeight = P_GetZAt(gr_frontsector->c_slope, viewx, viewy);
- locCeilingHeight = P_GetZAt(gr_frontsector->c_slope, gr_frontsector->soundorg.x, gr_frontsector->soundorg.y);
- }
+ cullFloorHeight = P_GetSectorFloorZAt (gr_frontsector, viewx, viewy);
+ cullCeilingHeight = P_GetSectorCeilingZAt(gr_frontsector, viewx, viewy);
+ locFloorHeight = P_GetSectorFloorZAt (gr_frontsector, gr_frontsector->soundorg.x, gr_frontsector->soundorg.y);
+ locCeilingHeight = P_GetSectorCeilingZAt(gr_frontsector, gr_frontsector->soundorg.x, gr_frontsector->soundorg.y);
}
// ----- end special tricks -----
@@ -3435,13 +3401,8 @@ static void HWR_Subsector(size_t num)
fixed_t cullHeight, centerHeight;
// bottom plane
- if (*rover->b_slope)
- {
- cullHeight = P_GetZAt(*rover->b_slope, viewx, viewy);
- centerHeight = P_GetZAt(*rover->b_slope, gr_frontsector->soundorg.x, gr_frontsector->soundorg.y);
- }
- else
- cullHeight = centerHeight = *rover->bottomheight;
+ cullHeight = P_GetFFloorBottomZAt(rover, viewx, viewy);
+ centerHeight = P_GetFFloorBottomZAt(rover, gr_frontsector->soundorg.x, gr_frontsector->soundorg.y);
if (!(rover->flags & FF_EXISTS) || !(rover->flags & FF_RENDERPLANES))
continue;
@@ -3501,13 +3462,8 @@ static void HWR_Subsector(size_t num)
}
// top plane
- if (*rover->t_slope)
- {
- cullHeight = P_GetZAt(*rover->t_slope, viewx, viewy);
- centerHeight = P_GetZAt(*rover->t_slope, gr_frontsector->soundorg.x, gr_frontsector->soundorg.y);
- }
- else
- cullHeight = centerHeight = *rover->topheight;
+ cullHeight = P_GetFFloorTopZAt(rover, viewx, viewy);
+ centerHeight = P_GetFFloorTopZAt(rover, gr_frontsector->soundorg.x, gr_frontsector->soundorg.y);
if (centerHeight >= locFloorHeight &&
centerHeight <= locCeilingHeight &&
@@ -3930,7 +3886,7 @@ static void HWR_DrawDropShadow(mobj_t *thing, gr_vissprite_t *spr, fixed_t scale
HWR_GetPatch(gpatch);
scalemul = FixedMul(FRACUNIT - floordiff/640, scale);
- scalemul = FixedMul(scalemul, (thing->radius*2) / gpatch->height);
+ scalemul = FixedMul(scalemul, (thing->radius*2) / SHORT(gpatch->height));
fscale = FIXED_TO_FLOAT(scalemul);
fx = FIXED_TO_FLOAT(thing->x);
@@ -3942,9 +3898,9 @@ static void HWR_DrawDropShadow(mobj_t *thing, gr_vissprite_t *spr, fixed_t scale
// 0--1
if (thing && fabsf(fscale - 1.0f) > 1.0E-36f)
- offset = (gpatch->height/2) * fscale;
+ offset = (SHORT(gpatch->height)/2) * fscale;
else
- offset = (float)(gpatch->height/2);
+ offset = (float)(SHORT(gpatch->height)/2);
shadowVerts[0].x = shadowVerts[3].x = fx - offset;
shadowVerts[2].x = shadowVerts[1].x = fx + offset;
@@ -3955,7 +3911,7 @@ static void HWR_DrawDropShadow(mobj_t *thing, gr_vissprite_t *spr, fixed_t scale
{
for (i = 0; i < 4; i++)
{
- slopez = P_GetZAt(floorslope, FLOAT_TO_FIXED(shadowVerts[i].x), FLOAT_TO_FIXED(shadowVerts[i].z));
+ slopez = P_GetSlopeZAt(floorslope, FLOAT_TO_FIXED(shadowVerts[i].x), FLOAT_TO_FIXED(shadowVerts[i].z));
shadowVerts[i].y = FIXED_TO_FLOAT(slopez) + 0.05f;
}
}
@@ -4019,7 +3975,7 @@ static void HWR_DrawDropShadow(mobj_t *thing, gr_vissprite_t *spr, fixed_t scale
}
// This is expecting a pointer to an array containing 4 wallVerts for a sprite
-static void HWR_RotateSpritePolyToAim(gr_vissprite_t *spr, FOutVector *wallVerts)
+static void HWR_RotateSpritePolyToAim(gr_vissprite_t *spr, FOutVector *wallVerts, const boolean precip)
{
if (cv_grspritebillboarding.value
&& spr && spr->mobj && !(spr->mobj->frame & FF_PAPERSPRITE)
@@ -4027,7 +3983,7 @@ static void HWR_RotateSpritePolyToAim(gr_vissprite_t *spr, FOutVector *wallVerts
{
float basey = FIXED_TO_FLOAT(spr->mobj->z);
float lowy = wallVerts[0].y;
- if (P_MobjFlip(spr->mobj) == -1)
+ if (!precip && P_MobjFlip(spr->mobj) == -1) // precip doesn't have eflags so they can't flip
{
basey = FIXED_TO_FLOAT(spr->mobj->z + spr->mobj->height);
}
@@ -4140,7 +4096,7 @@ static void HWR_SplitSprite(gr_vissprite_t *spr)
}
// Let dispoffset work first since this adjust each vertex
- HWR_RotateSpritePolyToAim(spr, baseWallVerts);
+ HWR_RotateSpritePolyToAim(spr, baseWallVerts, false);
realtop = top = baseWallVerts[3].y;
realbot = bot = baseWallVerts[0].y;
@@ -4191,8 +4147,7 @@ static void HWR_SplitSprite(gr_vissprite_t *spr)
for (i = 1; i < sector->numlights; i++)
{
- fixed_t h = sector->lightlist[i].slope ? P_GetZAt(sector->lightlist[i].slope, spr->mobj->x, spr->mobj->y)
- : sector->lightlist[i].height;
+ fixed_t h = P_GetLightZAt(§or->lightlist[i], spr->mobj->x, spr->mobj->y);
if (h <= temp)
{
if (!(spr->mobj->frame & FF_FULLBRIGHT))
@@ -4217,15 +4172,10 @@ static void HWR_SplitSprite(gr_vissprite_t *spr)
if (i + 1 < sector->numlights)
{
- if (list[i+1].slope)
- {
- temp = P_GetZAt(list[i+1].slope, v1x, v1y);
- bheight = FIXED_TO_FLOAT(temp);
- temp = P_GetZAt(list[i+1].slope, v2x, v2y);
- endbheight = FIXED_TO_FLOAT(temp);
- }
- else
- bheight = endbheight = FIXED_TO_FLOAT(list[i+1].height);
+ temp = P_GetLightZAt(&list[i+1], v1x, v1y);
+ bheight = FIXED_TO_FLOAT(temp);
+ temp = P_GetLightZAt(&list[i+1], v2x, v2y);
+ endbheight = FIXED_TO_FLOAT(temp);
}
else
{
@@ -4419,7 +4369,7 @@ static void HWR_DrawSprite(gr_vissprite_t *spr)
}
// Let dispoffset work first since this adjust each vertex
- HWR_RotateSpritePolyToAim(spr, wallVerts);
+ HWR_RotateSpritePolyToAim(spr, wallVerts, false);
// This needs to be AFTER the shadows so that the regular sprites aren't drawn completely black.
// sprite lighting by modulating the RGB components
@@ -4503,7 +4453,7 @@ static inline void HWR_DrawPrecipitationSprite(gr_vissprite_t *spr)
wallVerts[1].z = wallVerts[2].z = spr->z2;
// Let dispoffset work first since this adjust each vertex
- HWR_RotateSpritePolyToAim(spr, wallVerts);
+ HWR_RotateSpritePolyToAim(spr, wallVerts, true);
wallVerts[0].sow = wallVerts[3].sow = 0;
wallVerts[2].sow = wallVerts[1].sow = gpatch->max_s;
@@ -5253,10 +5203,10 @@ static void HWR_ProjectSprite(mobj_t *thing)
rotsprite = sprframe->rotsprite.patch[rot][rollangle];
if (rotsprite != NULL)
{
- spr_width = rotsprite->width << FRACBITS;
- spr_height = rotsprite->height << FRACBITS;
- spr_offset = rotsprite->leftoffset << FRACBITS;
- spr_topoffset = rotsprite->topoffset << FRACBITS;
+ spr_width = SHORT(rotsprite->width) << FRACBITS;
+ spr_height = SHORT(rotsprite->height) << FRACBITS;
+ spr_offset = SHORT(rotsprite->leftoffset) << FRACBITS;
+ spr_topoffset = SHORT(rotsprite->topoffset) << FRACBITS;
// flip -> rotate, not rotate -> flip
flip = 0;
}
diff --git a/src/hu_stuff.c b/src/hu_stuff.c
index 6aa5a451000a429ab351065c3c97b2d9a7fb72f4..3ff9db2b66a39737bcbdc04260c3842e1bc6cf1d 100644
--- a/src/hu_stuff.c
+++ b/src/hu_stuff.c
@@ -68,7 +68,7 @@ patch_t *nightsnum[10]; // 0-9
// Level title and credits fonts
patch_t *lt_font[LT_FONTSIZE];
patch_t *cred_font[CRED_FONTSIZE];
-patch_t *ttlnum[20]; // act numbers (0-19)
+patch_t *ttlnum[10]; // act numbers (0-9)
// Name tag fonts
patch_t *ntb_font[NT_FONTSIZE];
@@ -243,7 +243,7 @@ void HU_LoadGraphics(void)
tallinfin = (patch_t *)W_CachePatchName("STTINFIN", PU_HUDGFX);
// cache act numbers for level titles
- for (i = 0; i < 20; i++)
+ for (i = 0; i < 10; i++)
{
sprintf(buffer, "TTL%.2d", i);
ttlnum[i] = (patch_t *)W_CachePatchName(buffer, PU_HUDGFX);
diff --git a/src/hu_stuff.h b/src/hu_stuff.h
index 9e3c667479906955a1063d478062fd06aa71cfd5..63d85f1b81a7637579a1b510a2d979f79368281c 100644
--- a/src/hu_stuff.h
+++ b/src/hu_stuff.h
@@ -85,7 +85,7 @@ extern patch_t *lt_font[LT_FONTSIZE];
extern patch_t *cred_font[CRED_FONTSIZE];
extern patch_t *ntb_font[NT_FONTSIZE];
extern patch_t *nto_font[NT_FONTSIZE];
-extern patch_t *ttlnum[20];
+extern patch_t *ttlnum[10];
extern patch_t *emeraldpics[3][8];
extern patch_t *rflagico;
extern patch_t *bflagico;
diff --git a/src/info.c b/src/info.c
index bd6ccb527a8ace37c59397091a8d0c868c668905..d443e035d004c8437401d89d31a1e6a1186284c5 100644
--- a/src/info.c
+++ b/src/info.c
@@ -187,6 +187,8 @@ char sprnames[NUMSPRITES + 1][5] =
// Projectiles
"MISL",
+ "LASR", // GFZ3 laser
+ "LASF", // GFZ3 laser flames
"TORP", // Torpedo
"ENRG", // Energy ball
"MINE", // Skim mine
@@ -2058,7 +2060,15 @@ state_t states[NUMSTATES] =
{SPR_MISL, FF_FULLBRIGHT, 1, {A_SmokeTrailer}, MT_SMOKE, 0, S_ROCKET}, // S_ROCKET
- {SPR_MISL, FF_FULLBRIGHT, 2, {NULL}, 0, 0, S_NULL}, // S_LASER
+ {SPR_LASR, FF_FULLBRIGHT|0, 2, {NULL}, 0, 0, S_NULL}, // S_LASER
+ {SPR_LASR, FF_FULLBRIGHT|1, 2, {NULL}, 0, 0, S_NULL}, // S_LASER2
+ {SPR_LASR, FF_FULLBRIGHT|2, 2, {NULL}, 0, 0, S_NULL}, // S_LASERFLASH
+
+ {SPR_LASF, FF_FULLBRIGHT|0, 2, {NULL}, 0, 0, S_LASERFLAME2}, // S_LASERFLAME1
+ {SPR_LASF, FF_FULLBRIGHT|1, 1, {A_ChangeHeight}, 156*FRACUNIT, 3, S_LASERFLAME3}, // S_LASERFLAME2
+ {SPR_LASF, FF_FULLBRIGHT|2, 0, {A_ChangeHeight}, 32*FRACUNIT, 3, S_LASERFLAME4}, // S_LASERFLAME3
+ {SPR_LASF, FF_ANIMATE|FF_PAPERSPRITE|FF_FULLBRIGHT|2, 4, {NULL}, 1, 2, S_LASERFLAME5}, // S_LASERFLAME4
+ {SPR_LASF, FF_ANIMATE|FF_PAPERSPRITE|FF_FULLBRIGHT|4, 28, {NULL}, 2, 2, S_NULL}, // S_LASERFLAME5
{SPR_TORP, 0, 1, {A_SmokeTrailer}, MT_SMOKE, 0, S_TORPEDO}, // S_TORPEDO
@@ -5665,28 +5675,28 @@ mobjinfo_t mobjinfo[NUMMOBJTYPES] =
{ // MT_EGGMOBILE_FIRE
-1, // doomednum
- S_SPINFIRE1, // spawnstate
+ S_LASERFLAME1, // spawnstate
1, // spawnhealth
S_NULL, // seestate
- sfx_None, // seesound
+ sfx_s3kc2s, // seesound
8, // reactiontime
sfx_None, // attacksound
S_NULL, // painstate
0, // painchance
- sfx_None, // painsound
+ sfx_s3k8d, // painsound
S_NULL, // meleestate
S_NULL, // missilestate
S_NULL, // deathstate
S_NULL, // xdeathstate
sfx_None, // deathsound
0, // speed
- 8*FRACUNIT, // radius
- 14*FRACUNIT, // height
+ 24*FRACUNIT, // radius
+ 84*FRACUNIT, // height
0, // display offset
DMG_FIRE, // mass
1, // damage
sfx_None, // activesound
- MF_NOBLOCKMAP|MF_MISSILE|MF_NOGRAVITY|MF_FIRE, // flags
+ MF_NOGRAVITY|MF_FIRE|MF_PAIN, // flags
S_NULL // raisestate
},
@@ -9637,8 +9647,8 @@ mobjinfo_t mobjinfo[NUMMOBJTYPES] =
S_NULL, // painstate
0, // painchance
sfx_None, // painsound
- S_NULL, // meleestate
- S_NULL, // missilestate
+ S_LASERFLASH, // meleestate
+ S_LASER2, // missilestate
S_NULL, // deathstate
S_NULL, // xdeathstate
sfx_None, // deathsound
@@ -9649,7 +9659,7 @@ mobjinfo_t mobjinfo[NUMMOBJTYPES] =
0, // mass
20, // damage
sfx_None, // activesound
- MF_NOBLOCKMAP|MF_MISSILE|MF_NOGRAVITY, // flags
+ MF_MISSILE|MF_NOGRAVITY, // flags
S_NULL // raisestate
},
diff --git a/src/info.h b/src/info.h
index 586209ff954905bb3cb1506f9e5adbb4bb27eb5e..79af9bbbb8ae444fa3e9aee46cc17ca922bf9d68 100644
--- a/src/info.h
+++ b/src/info.h
@@ -284,6 +284,7 @@ void A_RolloutRock();
void A_DragonbomberSpawn();
void A_DragonWing();
void A_DragonSegment();
+void A_ChangeHeight();
// ratio of states to sprites to mobj types is roughly 6 : 1 : 1
#define NUMMOBJFREESLOTS 512
@@ -451,6 +452,8 @@ typedef enum sprite
// Projectiles
SPR_MISL,
+ SPR_LASR, // GFZ3 laser
+ SPR_LASF, // GFZ3 laser flames
SPR_TORP, // Torpedo
SPR_ENRG, // Energy ball
SPR_MINE, // Skim mine
@@ -2220,6 +2223,14 @@ typedef enum state
S_ROCKET,
S_LASER,
+ S_LASER2,
+ S_LASERFLASH,
+
+ S_LASERFLAME1,
+ S_LASERFLAME2,
+ S_LASERFLAME3,
+ S_LASERFLAME4,
+ S_LASERFLAME5,
S_TORPEDO,
diff --git a/src/lua_baselib.c b/src/lua_baselib.c
index 74938739c405b1d8b9d2c83d2915865b6d639931..d56f49a5b0b496bab94450f468fc90b03e6f5bf7 100644
--- a/src/lua_baselib.c
+++ b/src/lua_baselib.c
@@ -14,7 +14,7 @@
#include "fastcmp.h"
#include "p_local.h"
#include "p_setup.h" // So we can have P_SetupLevelSky
-#include "p_slopes.h" // P_GetZAt
+#include "p_slopes.h" // P_GetSlopeZAt
#include "z_zone.h"
#include "r_main.h"
#include "r_draw.h"
@@ -2184,14 +2184,20 @@ static int lib_evStartCrumble(lua_State *L)
static int lib_pGetZAt(lua_State *L)
{
- pslope_t *slope = *((pslope_t **)luaL_checkudata(L, 1, META_SLOPE));
fixed_t x = luaL_checkfixed(L, 2);
fixed_t y = luaL_checkfixed(L, 3);
//HUDSAFE
- if (!slope)
- return LUA_ErrInvalid(L, "pslope_t");
+ if (lua_isnil(L, 1))
+ {
+ fixed_t z = luaL_checkfixed(L, 4);
+ lua_pushfixed(L, P_GetZAt(NULL, x, y, z));
+ }
+ else
+ {
+ pslope_t *slope = *((pslope_t **)luaL_checkudata(L, 1, META_SLOPE));
+ lua_pushfixed(L, P_GetSlopeZAt(slope, x, y));
+ }
- lua_pushfixed(L, P_GetZAt(slope, x, y));
return 1;
}
@@ -2458,6 +2464,20 @@ static int lib_sStopSound(lua_State *L)
return 0;
}
+static int lib_sStopSoundByID(lua_State *L)
+{
+ void *origin = *((mobj_t **)luaL_checkudata(L, 1, META_MOBJ));
+ sfxenum_t sound_id = luaL_checkinteger(L, 2);
+ //NOHUD
+ if (!origin)
+ return LUA_ErrInvalid(L, "mobj_t");
+ if (sound_id >= NUMSFX)
+ return luaL_error(L, "sfx %d out of range (0 - %d)", sound_id, NUMSFX-1);
+
+ S_StopSoundByID(origin, sound_id);
+ return 0;
+}
+
static int lib_sChangeMusic(lua_State *L)
{
#ifdef MUSICSLOT_COMPATIBILITY
@@ -3253,6 +3273,7 @@ static luaL_Reg lib[] = {
{"S_StartSound",lib_sStartSound},
{"S_StartSoundAtVolume",lib_sStartSoundAtVolume},
{"S_StopSound",lib_sStopSound},
+ {"S_StopSoundByID",lib_sStopSoundByID},
{"S_ChangeMusic",lib_sChangeMusic},
{"S_SpeedMusic",lib_sSpeedMusic},
{"S_StopMusic",lib_sStopMusic},
diff --git a/src/lua_maplib.c b/src/lua_maplib.c
index d851c820e5a4c9ee280e2b180ba82415470fc494..ece42b8d3dec950b8c6a904eb6370715963f2cd7 100644
--- a/src/lua_maplib.c
+++ b/src/lua_maplib.c
@@ -2082,6 +2082,12 @@ static int mapheaderinfo_get(lua_State *L)
lua_pushinteger(L, header->menuflags);
else if (fastcmp(field,"startrings"))
lua_pushinteger(L, header->startrings);
+ else if (fastcmp(field, "sstimer"))
+ lua_pushinteger(L, header->sstimer);
+ else if (fastcmp(field, "ssspheres"))
+ lua_pushinteger(L, header->ssspheres);
+ else if (fastcmp(field, "gravity"))
+ lua_pushfixed(L, header->gravity);
// TODO add support for reading numGradedMares and grades
else {
// Read custom vars now
diff --git a/src/lua_script.c b/src/lua_script.c
index 6b7b122f0bf26f7104b6546242c2bda4b1c772bc..d2069e8a72f1f370c36b086482c2c68d8c529705 100644
--- a/src/lua_script.c
+++ b/src/lua_script.c
@@ -730,9 +730,13 @@ void LUA_InvalidatePlayer(player_t *player)
enum
{
ARCH_NULL=0,
- ARCH_BOOLEAN,
- ARCH_SIGNED,
- ARCH_STRING,
+ ARCH_TRUE,
+ ARCH_FALSE,
+ ARCH_INT8,
+ ARCH_INT16,
+ ARCH_INT32,
+ ARCH_SMALLSTRING,
+ ARCH_LARGESTRING,
ARCH_TABLE,
ARCH_MOBJINFO,
@@ -817,22 +821,33 @@ static UINT8 ArchiveValue(int TABLESINDEX, int myindex)
WRITEUINT8(save_p, ARCH_NULL);
return 2;
case LUA_TBOOLEAN:
- WRITEUINT8(save_p, ARCH_BOOLEAN);
- WRITEUINT8(save_p, lua_toboolean(gL, myindex));
+ WRITEUINT8(save_p, lua_toboolean(gL, myindex) ? ARCH_TRUE : ARCH_FALSE);
break;
case LUA_TNUMBER:
{
lua_Integer number = lua_tointeger(gL, myindex);
- WRITEUINT8(save_p, ARCH_SIGNED);
- WRITEFIXED(save_p, number);
+ if (number >= INT8_MIN && number <= INT8_MAX)
+ {
+ WRITEUINT8(save_p, ARCH_INT8);
+ WRITESINT8(save_p, number);
+ }
+ else if (number >= INT16_MIN && number <= INT16_MAX)
+ {
+ WRITEUINT8(save_p, ARCH_INT16);
+ WRITEINT16(save_p, number);
+ }
+ else
+ {
+ WRITEUINT8(save_p, ARCH_INT32);
+ WRITEFIXED(save_p, number);
+ }
break;
}
case LUA_TSTRING:
{
- UINT16 len = (UINT16)lua_objlen(gL, myindex); // get length of string, including embedded zeros
+ UINT32 len = (UINT32)lua_objlen(gL, myindex); // get length of string, including embedded zeros
const char *s = lua_tostring(gL, myindex);
- UINT16 i = 0;
- WRITEUINT8(save_p, ARCH_STRING);
+ UINT32 i = 0;
// if you're wondering why we're writing a string to save_p this way,
// it turns out that Lua can have embedded zeros ('\0') in the strings,
// so we can't use WRITESTRING as that cuts off when it finds a '\0'.
@@ -840,7 +855,16 @@ static UINT8 ArchiveValue(int TABLESINDEX, int myindex)
// fixing the awful crashes previously encountered for reading strings longer than 1024
// (yes I know that's kind of a stupid thing to care about, but it'd be evil to trim or ignore them?)
// -- Monster Iestyn 05/08/18
- WRITEUINT16(save_p, len); // save size of string
+ if (len < 255)
+ {
+ WRITEUINT8(save_p, ARCH_SMALLSTRING);
+ WRITEUINT8(save_p, len); // save size of string
+ }
+ else
+ {
+ WRITEUINT8(save_p, ARCH_LARGESTRING);
+ WRITEUINT32(save_p, len); // save size of string
+ }
while (i < len)
WRITECHAR(save_p, s[i++]); // write chars individually, including the embedded zeros
break;
@@ -1170,21 +1194,36 @@ static UINT8 UnArchiveValue(int TABLESINDEX)
case ARCH_NULL:
lua_pushnil(gL);
break;
- case ARCH_BOOLEAN:
- lua_pushboolean(gL, READUINT8(save_p));
+ case ARCH_TRUE:
+ lua_pushboolean(gL, true);
+ break;
+ case ARCH_FALSE:
+ lua_pushboolean(gL, false);
break;
- case ARCH_SIGNED:
+ case ARCH_INT8:
+ lua_pushinteger(gL, READSINT8(save_p));
+ break;
+ case ARCH_INT16:
+ lua_pushinteger(gL, READINT16(save_p));
+ break;
+ case ARCH_INT32:
lua_pushinteger(gL, READFIXED(save_p));
break;
- case ARCH_STRING:
+ case ARCH_SMALLSTRING:
+ case ARCH_LARGESTRING:
{
- UINT16 len = READUINT16(save_p); // length of string, including embedded zeros
+ UINT32 len;
char *value;
- UINT16 i = 0;
+ UINT32 i = 0;
+
// See my comments in the ArchiveValue function;
// it's much the same for reading strings as writing them!
// (i.e. we can't use READSTRING either)
// -- Monster Iestyn 05/08/18
+ if (type == ARCH_SMALLSTRING)
+ len = READUINT8(save_p); // length of string, including embedded zeros
+ else
+ len = READUINT32(save_p); // length of string, including embedded zeros
value = malloc(len); // make temp buffer of size len
// now read the actual string
while (i < len)
diff --git a/src/m_anigif.c b/src/m_anigif.c
index ce2ca20b9677302f08e140f65abc6c638fd7ce89..1b71a09bce278b59741db664f334faa5075e2aec 100644
--- a/src/m_anigif.c
+++ b/src/m_anigif.c
@@ -490,29 +490,28 @@ const UINT8 gifframe_gchead[4] = {0x21,0xF9,0x04,0x04}; // GCE, bytes, packed by
static UINT8 *gifframe_data = NULL;
static size_t gifframe_size = 8192;
+//
+// GIF_rgbconvert
+// converts an RGB frame to a frame with a palette.
+//
#ifdef HWRENDER
-static void hwrconvert(void)
+static void GIF_rgbconvert(UINT8 *linear, UINT8 *scr)
{
- UINT8 *linear = HWR_GetScreenshot();
- UINT8 *dest = screens[2];
UINT8 r, g, b;
- INT32 x, y;
- size_t i = 0;
+ size_t src = 0, dest = 0;
+ size_t size = (vid.width * vid.height * 3);
InitColorLUT(gif_framepalette);
- for (y = 0; y < vid.height; y++)
+ while (src < size)
{
- for (x = 0; x < vid.width; x++, i += 3)
- {
- r = (UINT8)linear[i];
- g = (UINT8)linear[i + 1];
- b = (UINT8)linear[i + 2];
- dest[(y * vid.width) + x] = colorlookup[r >> SHIFTCOLORBITS][g >> SHIFTCOLORBITS][b >> SHIFTCOLORBITS];
- }
+ r = (UINT8)linear[src];
+ g = (UINT8)linear[src + 1];
+ b = (UINT8)linear[src + 2];
+ scr[dest] = colorlookup[r >> SHIFTCOLORBITS][g >> SHIFTCOLORBITS][b >> SHIFTCOLORBITS];
+ src += (3 * scrbuf_downscaleamt);
+ dest += scrbuf_downscaleamt;
}
-
- free(linear);
}
#endif
@@ -556,7 +555,11 @@ static void GIF_framewrite(void)
I_ReadScreen(movie_screen);
#ifdef HWRENDER
else if (rendermode == render_opengl)
- hwrconvert();
+ {
+ UINT8 *linear = HWR_GetScreenshot();
+ GIF_rgbconvert(linear, movie_screen);
+ free(linear);
+ }
#endif
}
else
@@ -565,18 +568,20 @@ static void GIF_framewrite(void)
blitw = vid.width;
blith = vid.height;
- if (gif_frames == 0)
- {
- if (rendermode == render_soft)
- I_ReadScreen(movie_screen);
#ifdef HWRENDER
- else if (rendermode == render_opengl)
- {
- hwrconvert();
- VID_BlitLinearScreen(screens[2], screens[0], vid.width*vid.bpp, vid.height, vid.width*vid.bpp, vid.rowbytes);
- }
-#endif
+ // Copy the current OpenGL frame into the base screen
+ if (rendermode == render_opengl)
+ {
+ UINT8 *linear = HWR_GetScreenshot();
+ GIF_rgbconvert(linear, screens[0]);
+ free(linear);
}
+#endif
+
+ // Copy the first frame into the movie screen
+ // OpenGL already does the same above.
+ if (gif_frames == 0 && rendermode == render_soft)
+ I_ReadScreen(movie_screen);
movie_screen = screens[0];
}
diff --git a/src/m_cheat.c b/src/m_cheat.c
index f6fdb63e962f63ad051190ad89be384d6e05da06..156c5db16bbc7d92a4a89151d1c8b05344ef27f8 100644
--- a/src/m_cheat.c
+++ b/src/m_cheat.c
@@ -1032,8 +1032,8 @@ static boolean OP_HeightOkay(player_t *player, UINT8 ceiling)
if (ceiling)
{
// Truncate position to match where mapthing would be when spawned
- // (this applies to every further P_GetZAt call as well)
- fixed_t cheight = sec->c_slope ? P_GetZAt(sec->c_slope, player->mo->x & 0xFFFF0000, player->mo->y & 0xFFFF0000) : sec->ceilingheight;
+ // (this applies to every further P_GetSlopeZAt call as well)
+ fixed_t cheight = P_GetSectorCeilingZAt(sec, player->mo->x & 0xFFFF0000, player->mo->y & 0xFFFF0000);
if (((cheight - player->mo->z - player->mo->height)>>FRACBITS) >= (1 << (16-ZSHIFT)))
{
@@ -1044,7 +1044,7 @@ static boolean OP_HeightOkay(player_t *player, UINT8 ceiling)
}
else
{
- fixed_t fheight = sec->f_slope ? P_GetZAt(sec->f_slope, player->mo->x & 0xFFFF0000, player->mo->y & 0xFFFF0000) : sec->floorheight;
+ fixed_t fheight = P_GetSectorFloorZAt(sec, player->mo->x & 0xFFFF0000, player->mo->y & 0xFFFF0000);
if (((player->mo->z - fheight)>>FRACBITS) >= (1 << (16-ZSHIFT)))
{
CONS_Printf(M_GetText("Sorry, you're too %s to place this object (max: %d %s).\n"), M_GetText("high"),
@@ -1091,12 +1091,12 @@ static mapthing_t *OP_CreateNewMapThing(player_t *player, UINT16 type, boolean c
mt->y = (INT16)(player->mo->y>>FRACBITS);
if (ceiling)
{
- fixed_t cheight = sec->c_slope ? P_GetZAt(sec->c_slope, mt->x << FRACBITS, mt->y << FRACBITS) : sec->ceilingheight;
+ fixed_t cheight = P_GetSectorCeilingZAt(sec, mt->x << FRACBITS, mt->y << FRACBITS);
mt->z = (UINT16)((cheight - player->mo->z - player->mo->height)>>FRACBITS);
}
else
{
- fixed_t fheight = sec->f_slope ? P_GetZAt(sec->f_slope, mt->x << FRACBITS, mt->y << FRACBITS) : sec->floorheight;
+ fixed_t fheight = P_GetSectorFloorZAt(sec, mt->x << FRACBITS, mt->y << FRACBITS);
mt->z = (UINT16)((player->mo->z - fheight)>>FRACBITS);
}
mt->angle = (INT16)(FixedInt(AngleFixed(player->mo->angle)));
@@ -1342,12 +1342,12 @@ void OP_ObjectplaceMovement(player_t *player)
if (!!(mobjinfo[op_currentthing].flags & MF_SPAWNCEILING) ^ !!(cv_opflags.value & MTF_OBJECTFLIP))
{
- fixed_t cheight = sec->c_slope ? P_GetZAt(sec->c_slope, player->mo->x & 0xFFFF0000, player->mo->y & 0xFFFF0000) : sec->ceilingheight;
+ fixed_t cheight = P_GetSectorCeilingZAt(sec, player->mo->x & 0xFFFF0000, player->mo->y & 0xFFFF0000);
op_displayflags = (UINT16)((cheight - player->mo->z - mobjinfo[op_currentthing].height)>>FRACBITS);
}
else
{
- fixed_t fheight = sec->f_slope ? P_GetZAt(sec->f_slope, player->mo->x & 0xFFFF0000, player->mo->y & 0xFFFF0000) : sec->floorheight;
+ fixed_t fheight = P_GetSectorFloorZAt(sec, player->mo->x & 0xFFFF0000, player->mo->y & 0xFFFF0000);
op_displayflags = (UINT16)((player->mo->z - fheight)>>FRACBITS);
}
op_displayflags <<= ZSHIFT;
diff --git a/src/m_menu.c b/src/m_menu.c
index c5f10b2bd1853d4169d2d181ad3bbcb30361b3a7..175dc1c2229f1cbddda69a1795e43a16a9840bb4 100644
--- a/src/m_menu.c
+++ b/src/m_menu.c
@@ -882,7 +882,8 @@ static menuitem_t SP_NightsAttackLevelSelectMenu[] =
static menuitem_t SP_NightsAttackMenu[] =
{
{IT_STRING|IT_KEYHANDLER, NULL, "Level Select...", &M_HandleTimeAttackLevelSelect, 52},
- {IT_STRING|IT_CVAR, NULL, "Show Records For", &cv_dummymares, 62},
+ {IT_STRING|IT_CVAR, NULL, "Character", &cv_chooseskin, 62},
+ {IT_STRING|IT_CVAR, NULL, "Show Records For", &cv_dummymares, 72},
{IT_DISABLED, NULL, "Guest Option...", &SP_NightsGuestReplayDef, 100},
{IT_DISABLED, NULL, "Replay...", &SP_NightsReplayDef, 110},
@@ -893,6 +894,7 @@ static menuitem_t SP_NightsAttackMenu[] =
enum
{
nalevel,
+ nachar,
narecords,
naguest,
@@ -1702,7 +1704,7 @@ static INT32 highlightflags, recommendedflags, warningflags;
// Sky Room
menu_t SR_PandoraDef =
{
- MN_SR_MAIN + (MN_SR_PANDORA << 6),
+ MTREE2(MN_SR_MAIN, MN_SR_PANDORA),
"M_PANDRA",
sizeof (SR_PandorasBox)/sizeof (menuitem_t),
&SPauseDef,
@@ -1716,12 +1718,12 @@ menu_t SR_PandoraDef =
menu_t SR_MainDef = DEFAULTMENUSTYLE(MN_SR_MAIN, "M_SECRET", SR_MainMenu, &MainDef, 60, 40);
menu_t SR_LevelSelectDef = MAPPLATTERMENUSTYLE(
- MN_SR_MAIN + (MN_SR_LEVELSELECT << 6),
+ MTREE2(MN_SR_MAIN, MN_SR_LEVELSELECT),
NULL, SR_LevelSelectMenu);
menu_t SR_UnlockChecklistDef =
{
- MN_SR_MAIN + (MN_SR_UNLOCKCHECKLIST << 6),
+ MTREE2(MN_SR_MAIN, MN_SR_UNLOCKCHECKLIST),
"M_SECRET",
1,
&SR_MainDef,
@@ -1734,7 +1736,7 @@ menu_t SR_UnlockChecklistDef =
menu_t SR_SoundTestDef =
{
- MN_SR_MAIN + (MN_SR_SOUNDTEST << 6),
+ MTREE2(MN_SR_MAIN, MN_SR_SOUNDTEST),
NULL,
sizeof (SR_SoundTestMenu)/sizeof (menuitem_t),
&SR_MainDef,
@@ -1747,7 +1749,7 @@ menu_t SR_SoundTestDef =
menu_t SR_EmblemHintDef =
{
- MN_SR_MAIN + (MN_SR_EMBLEMHINT << 6),
+ MTREE2(MN_SR_MAIN, MN_SR_EMBLEMHINT),
NULL,
sizeof (SR_EmblemHintMenu)/sizeof (menuitem_t),
&SPauseDef,
@@ -1774,7 +1776,7 @@ menu_t SP_MainDef = //CENTERMENUSTYLE(NULL, SP_MainMenu, &MainDef, 72);
menu_t SP_LoadDef =
{
- MN_SP_MAIN + (MN_SP_LOAD << 6),
+ MTREE2(MN_SP_MAIN, MN_SP_LOAD),
"M_PICKG",
1,
&SP_MainDef,
@@ -1786,12 +1788,12 @@ menu_t SP_LoadDef =
};
menu_t SP_LevelSelectDef = MAPPLATTERMENUSTYLE(
- MN_SP_MAIN + (MN_SP_LOAD << 6) + (MN_SP_PLAYER << 12) + (MN_SP_LEVELSELECT << 18),
+ MTREE4(MN_SP_MAIN, MN_SP_LOAD, MN_SP_PLAYER, MN_SP_LEVELSELECT),
NULL, SP_LevelSelectMenu);
menu_t SP_LevelStatsDef =
{
- MN_SP_MAIN + (MN_SP_LEVELSTATS << 6),
+ MTREE2(MN_SP_MAIN, MN_SP_LEVELSTATS),
"M_STATS",
1,
&SP_MainDef,
@@ -1803,12 +1805,12 @@ menu_t SP_LevelStatsDef =
};
menu_t SP_TimeAttackLevelSelectDef = MAPPLATTERMENUSTYLE(
- MN_SP_MAIN + (MN_SP_TIMEATTACK << 6) + (MN_SP_TIMEATTACK_LEVELSELECT << 12),
+ MTREE3(MN_SP_MAIN, MN_SP_TIMEATTACK, MN_SP_TIMEATTACK_LEVELSELECT),
"M_ATTACK", SP_TimeAttackLevelSelectMenu);
static menu_t SP_TimeAttackDef =
{
- MN_SP_MAIN + (MN_SP_TIMEATTACK << 6),
+ MTREE2(MN_SP_MAIN, MN_SP_TIMEATTACK),
"M_ATTACK",
sizeof (SP_TimeAttackMenu)/sizeof (menuitem_t),
&MainDef, // Doesn't matter.
@@ -1820,7 +1822,7 @@ static menu_t SP_TimeAttackDef =
};
static menu_t SP_ReplayDef =
{
- MN_SP_MAIN + (MN_SP_TIMEATTACK << 6) + (MN_SP_REPLAY << 12),
+ MTREE3(MN_SP_MAIN, MN_SP_TIMEATTACK, MN_SP_REPLAY),
"M_ATTACK",
sizeof(SP_ReplayMenu)/sizeof(menuitem_t),
&SP_TimeAttackDef,
@@ -1832,7 +1834,7 @@ static menu_t SP_ReplayDef =
};
static menu_t SP_GuestReplayDef =
{
- MN_SP_MAIN + (MN_SP_TIMEATTACK << 6) + (MN_SP_GUESTREPLAY << 12),
+ MTREE3(MN_SP_MAIN, MN_SP_TIMEATTACK, MN_SP_GUESTREPLAY),
"M_ATTACK",
sizeof(SP_GuestReplayMenu)/sizeof(menuitem_t),
&SP_TimeAttackDef,
@@ -1844,7 +1846,7 @@ static menu_t SP_GuestReplayDef =
};
static menu_t SP_GhostDef =
{
- MN_SP_MAIN + (MN_SP_TIMEATTACK << 6) + (MN_SP_GHOST << 12),
+ MTREE3(MN_SP_MAIN, MN_SP_TIMEATTACK, MN_SP_GHOST),
"M_ATTACK",
sizeof(SP_GhostMenu)/sizeof(menuitem_t),
&SP_TimeAttackDef,
@@ -1856,12 +1858,12 @@ static menu_t SP_GhostDef =
};
menu_t SP_NightsAttackLevelSelectDef = MAPPLATTERMENUSTYLE(
- MN_SP_MAIN + (MN_SP_NIGHTSATTACK << 6) + (MN_SP_NIGHTS_LEVELSELECT << 12),
+ MTREE3(MN_SP_MAIN, MN_SP_NIGHTSATTACK, MN_SP_NIGHTS_LEVELSELECT),
"M_NIGHTS", SP_NightsAttackLevelSelectMenu);
static menu_t SP_NightsAttackDef =
{
- MN_SP_MAIN + (MN_SP_NIGHTSATTACK << 6),
+ MTREE2(MN_SP_MAIN, MN_SP_NIGHTSATTACK),
"M_NIGHTS",
sizeof (SP_NightsAttackMenu)/sizeof (menuitem_t),
&MainDef, // Doesn't matter.
@@ -1873,7 +1875,7 @@ static menu_t SP_NightsAttackDef =
};
static menu_t SP_NightsReplayDef =
{
- MN_SP_MAIN + (MN_SP_NIGHTSATTACK << 6) + (MN_SP_NIGHTS_REPLAY << 12),
+ MTREE3(MN_SP_MAIN, MN_SP_NIGHTSATTACK, MN_SP_NIGHTS_REPLAY),
"M_NIGHTS",
sizeof(SP_NightsReplayMenu)/sizeof(menuitem_t),
&SP_NightsAttackDef,
@@ -1885,7 +1887,7 @@ static menu_t SP_NightsReplayDef =
};
static menu_t SP_NightsGuestReplayDef =
{
- MN_SP_MAIN + (MN_SP_NIGHTSATTACK << 6) + (MN_SP_NIGHTS_GUESTREPLAY << 12),
+ MTREE3(MN_SP_MAIN, MN_SP_NIGHTSATTACK, MN_SP_NIGHTS_GUESTREPLAY),
"M_NIGHTS",
sizeof(SP_NightsGuestReplayMenu)/sizeof(menuitem_t),
&SP_NightsAttackDef,
@@ -1897,7 +1899,7 @@ static menu_t SP_NightsGuestReplayDef =
};
static menu_t SP_NightsGhostDef =
{
- MN_SP_MAIN + (MN_SP_NIGHTSATTACK << 6) + (MN_SP_NIGHTS_GHOST << 12),
+ MTREE3(MN_SP_MAIN, MN_SP_NIGHTSATTACK, MN_SP_NIGHTS_GHOST),
"M_NIGHTS",
sizeof(SP_NightsGhostMenu)/sizeof(menuitem_t),
&SP_NightsAttackDef,
@@ -1911,7 +1913,7 @@ static menu_t SP_NightsGhostDef =
menu_t SP_PlayerDef =
{
- MN_SP_MAIN + (MN_SP_LOAD << 6) + (MN_SP_PLAYER << 12),
+ MTREE3(MN_SP_MAIN, MN_SP_LOAD, MN_SP_PLAYER),
"M_PICKP",
sizeof (SP_PlayerMenu)/sizeof (menuitem_t),
&SP_MainDef,
@@ -1926,7 +1928,7 @@ menu_t SP_PlayerDef =
menu_t MP_SplitServerDef =
{
- MN_MP_MAIN + (MN_MP_SPLITSCREEN << 6),
+ MTREE2(MN_MP_MAIN, MN_MP_SPLITSCREEN),
"M_MULTI",
sizeof (MP_SplitServerMenu)/sizeof (menuitem_t),
#ifndef NONET
@@ -1958,7 +1960,7 @@ menu_t MP_MainDef =
menu_t MP_ServerDef =
{
- MN_MP_MAIN + (MN_MP_SERVER << 6),
+ MTREE2(MN_MP_MAIN, MN_MP_SERVER),
"M_MULTI",
sizeof (MP_ServerMenu)/sizeof (menuitem_t),
&MP_MainDef,
@@ -1971,7 +1973,7 @@ menu_t MP_ServerDef =
menu_t MP_ConnectDef =
{
- MN_MP_MAIN + (MN_MP_CONNECT << 6),
+ MTREE2(MN_MP_MAIN, MN_MP_CONNECT),
"M_MULTI",
sizeof (MP_ConnectMenu)/sizeof (menuitem_t),
&MP_MainDef,
@@ -1984,7 +1986,7 @@ menu_t MP_ConnectDef =
menu_t MP_RoomDef =
{
- MN_MP_MAIN + (MN_MP_ROOM << 6),
+ MTREE2(MN_MP_MAIN, MN_MP_ROOM),
"M_MULTI",
sizeof (MP_RoomMenu)/sizeof (menuitem_t),
&MP_ConnectDef,
@@ -1999,9 +2001,9 @@ menu_t MP_RoomDef =
menu_t MP_PlayerSetupDef =
{
#ifdef NONET
- MN_MP_MAIN + (MN_MP_PLAYERSETUP << 6),
+ MTREE2(MN_MP_MAIN, MN_MP_PLAYERSETUP),
#else
- MN_MP_MAIN + (MN_MP_SPLITSCREEN << 6) + (MN_MP_PLAYERSETUP << 12),
+ MTREE3(MN_MP_MAIN, MN_MP_SPLITSCREEN, MN_MP_PLAYERSETUP),
#endif
"M_SPLAYR",
sizeof (MP_PlayerSetupMenu)/sizeof (menuitem_t),
@@ -2017,12 +2019,13 @@ menu_t MP_PlayerSetupDef =
menu_t OP_MainDef = DEFAULTMENUSTYLE(
MN_OP_MAIN,
"M_OPTTTL", OP_MainMenu, &MainDef, 50, 30);
+
menu_t OP_ChangeControlsDef = CONTROLMENUSTYLE(
- MN_OP_MAIN + (MN_OP_CHANGECONTROLS << 12), // second level (<<6) set on runtime
+ MTREE3(MN_OP_MAIN, 0, MN_OP_CHANGECONTROLS), // second level set on runtime
OP_ChangeControlsMenu, &OP_MainDef);
menu_t OP_P1ControlsDef = {
- MN_OP_MAIN + (MN_OP_P1CONTROLS << 6),
+ MTREE2(MN_OP_MAIN, MN_OP_P1CONTROLS),
"M_CONTRO",
sizeof(OP_P1ControlsMenu)/sizeof(menuitem_t),
&OP_MainDef,
@@ -2030,7 +2033,7 @@ menu_t OP_P1ControlsDef = {
M_DrawControlsDefMenu,
50, 30, 0, NULL};
menu_t OP_P2ControlsDef = {
- MN_OP_MAIN + (MN_OP_P2CONTROLS << 6),
+ MTREE2(MN_OP_MAIN, MN_OP_P2CONTROLS),
"M_CONTRO",
sizeof(OP_P2ControlsMenu)/sizeof(menuitem_t),
&OP_MainDef,
@@ -2039,20 +2042,22 @@ menu_t OP_P2ControlsDef = {
50, 30, 0, NULL};
menu_t OP_MouseOptionsDef = DEFAULTMENUSTYLE(
- MN_OP_MAIN + (MN_OP_P1CONTROLS << 6) + (MN_OP_P1MOUSE << 12),
+ MTREE3(MN_OP_MAIN, MN_OP_P1CONTROLS, MN_OP_P1MOUSE),
"M_CONTRO", OP_MouseOptionsMenu, &OP_P1ControlsDef, 35, 30);
menu_t OP_Mouse2OptionsDef = DEFAULTMENUSTYLE(
- MN_OP_MAIN + (MN_OP_P2CONTROLS << 6) + (MN_OP_P2MOUSE << 12),
+ MTREE3(MN_OP_MAIN, MN_OP_P2CONTROLS, MN_OP_P2MOUSE),
"M_CONTRO", OP_Mouse2OptionsMenu, &OP_P2ControlsDef, 35, 30);
+
menu_t OP_Joystick1Def = DEFAULTMENUSTYLE(
- MN_OP_MAIN + (MN_OP_P1CONTROLS << 6) + (MN_OP_P1JOYSTICK << 12),
+ MTREE3(MN_OP_MAIN, MN_OP_P1CONTROLS, MN_OP_P1JOYSTICK),
"M_CONTRO", OP_Joystick1Menu, &OP_P1ControlsDef, 50, 30);
menu_t OP_Joystick2Def = DEFAULTMENUSTYLE(
- MN_OP_MAIN + (MN_OP_P2CONTROLS << 6) + (MN_OP_P2JOYSTICK << 12),
+ MTREE3(MN_OP_MAIN, MN_OP_P2CONTROLS, MN_OP_P2JOYSTICK),
"M_CONTRO", OP_Joystick2Menu, &OP_P2ControlsDef, 50, 30);
+
menu_t OP_JoystickSetDef =
{
- MN_OP_MAIN + (MN_OP_JOYSTICKSET << MENUBITS*3), // second (<<6) and third level (<<12) set on runtime
+ MTREE4(MN_OP_MAIN, 0, 0, MN_OP_JOYSTICKSET), // second and third level set on runtime
"M_CONTRO",
sizeof (OP_JoystickSetMenu)/sizeof (menuitem_t),
&OP_Joystick1Def,
@@ -2064,7 +2069,7 @@ menu_t OP_JoystickSetDef =
};
menu_t OP_CameraOptionsDef = {
- MN_OP_MAIN + (MN_OP_P1CONTROLS << 6) + (MN_OP_P1CAMERA << 12),
+ MTREE3(MN_OP_MAIN, MN_OP_P1CONTROLS, MN_OP_P1CAMERA),
"M_CONTRO",
sizeof (OP_CameraOptionsMenu)/sizeof (menuitem_t),
&OP_P1ControlsDef,
@@ -2075,7 +2080,7 @@ menu_t OP_CameraOptionsDef = {
NULL
};
menu_t OP_Camera2OptionsDef = {
- MN_OP_MAIN + (MN_OP_P2CONTROLS << 6) + (MN_OP_P2CAMERA << 12),
+ MTREE3(MN_OP_MAIN, MN_OP_P2CONTROLS, MN_OP_P2CAMERA),
"M_CONTRO",
sizeof (OP_Camera2OptionsMenu)/sizeof (menuitem_t),
&OP_P2ControlsDef,
@@ -2089,7 +2094,7 @@ menu_t OP_Camera2OptionsDef = {
static menuitem_t OP_PlaystyleMenu[] = {{IT_KEYHANDLER | IT_NOTHING, NULL, "", M_HandlePlaystyleMenu, 0}};
menu_t OP_PlaystyleDef = {
- MN_OP_MAIN + (MN_OP_P1CONTROLS << 6) + (MN_OP_PLAYSTYLE << 12),
+ MTREE3(MN_OP_MAIN, MN_OP_P1CONTROLS, MN_OP_PLAYSTYLE), ///@TODO the second level should be set in runtime
NULL,
1,
&OP_P1ControlsDef,
@@ -2115,7 +2120,7 @@ static void M_VideoOptions(INT32 choice)
menu_t OP_VideoOptionsDef =
{
- MN_OP_MAIN + (MN_OP_VIDEO << 6),
+ MTREE2(MN_OP_MAIN, MN_OP_VIDEO),
"M_VIDEO",
sizeof (OP_VideoOptionsMenu)/sizeof (menuitem_t),
&OP_MainDef,
@@ -2127,7 +2132,7 @@ menu_t OP_VideoOptionsDef =
};
menu_t OP_VideoModeDef =
{
- MN_OP_MAIN + (MN_OP_VIDEO << 6) + (MN_OP_VIDEOMODE << 12),
+ MTREE3(MN_OP_MAIN, MN_OP_VIDEO, MN_OP_VIDEOMODE),
"M_VIDEO",
1,
&OP_VideoOptionsDef,
@@ -2139,7 +2144,7 @@ menu_t OP_VideoModeDef =
};
menu_t OP_ColorOptionsDef =
{
- MN_OP_MAIN + (MN_OP_VIDEO << 6) + (MN_OP_COLOR << 12),
+ MTREE3(MN_OP_MAIN, MN_OP_VIDEO, MN_OP_COLOR),
"M_VIDEO",
sizeof (OP_ColorOptionsMenu)/sizeof (menuitem_t),
&OP_VideoOptionsDef,
@@ -2150,17 +2155,19 @@ menu_t OP_ColorOptionsDef =
NULL
};
menu_t OP_SoundOptionsDef = DEFAULTMENUSTYLE(
- MN_OP_MAIN + (MN_OP_SOUND << 6),
+ MTREE2(MN_OP_MAIN, MN_OP_SOUND),
"M_SOUND", OP_SoundOptionsMenu, &OP_MainDef, 30, 30);
-menu_t OP_SoundAdvancedDef = DEFAULTMENUSTYLE(MN_OP_MAIN + (MN_OP_SOUND << 6), "M_SOUND", OP_SoundAdvancedMenu, &OP_SoundOptionsDef, 30, 30);
+menu_t OP_SoundAdvancedDef = DEFAULTMENUSTYLE(
+ MTREE2(MN_OP_MAIN, MN_OP_SOUND),
+ "M_SOUND", OP_SoundAdvancedMenu, &OP_SoundOptionsDef, 30, 30);
menu_t OP_ServerOptionsDef = DEFAULTSCROLLMENUSTYLE(
- MN_OP_MAIN + (MN_OP_SERVER << 6),
+ MTREE2(MN_OP_MAIN, MN_OP_SERVER),
"M_SERVER", OP_ServerOptionsMenu, &OP_MainDef, 30, 30);
menu_t OP_MonitorToggleDef =
{
- MN_OP_MAIN + (MN_OP_SERVER << 6) + (MN_OP_MONITORTOGGLE << 12),
+ MTREE3(MN_OP_MAIN, MN_OP_SOUND, MN_OP_MONITORTOGGLE),
"M_SERVER",
sizeof (OP_MonitorToggleMenu)/sizeof (menuitem_t),
&OP_ServerOptionsDef,
@@ -2181,16 +2188,16 @@ static void M_OpenGLOptionsMenu(void)
}
menu_t OP_OpenGLOptionsDef = DEFAULTMENUSTYLE(
- MN_OP_MAIN + (MN_OP_VIDEO << 6) + (MN_OP_OPENGL << 12),
+ MTREE3(MN_OP_MAIN, MN_OP_VIDEO, MN_OP_OPENGL),
"M_VIDEO", OP_OpenGLOptionsMenu, &OP_VideoOptionsDef, 30, 30);
#ifdef ALAM_LIGHTING
menu_t OP_OpenGLLightingDef = DEFAULTMENUSTYLE(
- MN_OP_MAIN + (MN_OP_VIDEO << 6) + (MN_OP_OPENGL << 12) + (MN_OP_OPENGL_LIGHTING << 18),
+ MTREE4(MN_OP_MAIN, MN_OP_VIDEO, MN_OP_OPENGL, MN_OP_OPENGL_LIGHTING),
"M_VIDEO", OP_OpenGLLightingMenu, &OP_OpenGLOptionsDef, 60, 40);
#endif
menu_t OP_OpenGLFogDef =
{
- MN_OP_MAIN + (MN_OP_VIDEO << 6) + (MN_OP_OPENGL << 12) + (MN_OP_OPENGL_FOG << 18),
+ MTREE4(MN_OP_MAIN, MN_OP_VIDEO, MN_OP_OPENGL, MN_OP_OPENGL_FOG),
"M_VIDEO",
sizeof (OP_OpenGLFogMenu)/sizeof (menuitem_t),
&OP_OpenGLOptionsDef,
@@ -2202,12 +2209,12 @@ menu_t OP_OpenGLFogDef =
};
#endif
menu_t OP_DataOptionsDef = DEFAULTMENUSTYLE(
- MN_OP_MAIN + (MN_OP_DATA << 6),
+ MTREE2(MN_OP_MAIN, MN_OP_DATA),
"M_DATA", OP_DataOptionsMenu, &OP_MainDef, 60, 30);
menu_t OP_ScreenshotOptionsDef =
{
- MN_OP_MAIN + (MN_OP_DATA << 6) + (MN_OP_SCREENSHOTS << 12),
+ MTREE3(MN_OP_MAIN, MN_OP_DATA, MN_OP_SCREENSHOTS),
"M_SCREEN",
sizeof (OP_ScreenshotOptionsMenu)/sizeof (menuitem_t),
&OP_DataOptionsDef,
@@ -2219,11 +2226,11 @@ menu_t OP_ScreenshotOptionsDef =
};
menu_t OP_AddonsOptionsDef = DEFAULTMENUSTYLE(
- MN_OP_MAIN + (MN_OP_DATA << 6) + (MN_OP_ADDONS << 12),
+ MTREE3(MN_OP_MAIN, MN_OP_DATA, MN_OP_ADDONS),
"M_ADDONS", OP_AddonsOptionsMenu, &OP_DataOptionsDef, 30, 30);
menu_t OP_EraseDataDef = DEFAULTMENUSTYLE(
- MN_OP_MAIN + (MN_OP_DATA << 6) + (MN_OP_ERASEDATA << 12),
+ MTREE3(MN_OP_MAIN, MN_OP_DATA, MN_OP_ERASEDATA),
"M_DATA", OP_EraseDataMenu, &OP_DataOptionsDef, 60, 30);
// ==========================================================================
@@ -5181,7 +5188,7 @@ static boolean M_PrepareLevelPlatter(INT32 gt, boolean nextmappick)
{
if (M_CanShowLevelOnPlatter(mapnum, gt))
{
- const INT32 actnum = mapheaderinfo[mapnum]->actnum;
+ const UINT8 actnum = mapheaderinfo[mapnum]->actnum;
const boolean headingisname = (fastcmp(mapheaderinfo[mapnum]->selectheading, mapheaderinfo[mapnum]->lvlttl));
const boolean wide = (mapheaderinfo[mapnum]->menuflags & LF2_WIDEICON);
@@ -8940,16 +8947,11 @@ static void M_SetupChoosePlayer(INT32 choice)
/* the menus suck -James */
if (currentMenu == &SP_LoadDef)/* from save states */
{
- SP_PlayerDef.menuid =
- MN_SP_MAIN +
- ( MN_SP_LOAD << 6 ) +
- ( MN_SP_PLAYER << 12 );
+ SP_PlayerDef.menuid = MTREE3(MN_SP_MAIN, MN_SP_LOAD, MN_SP_PLAYER);
}
else/* from Secret level select */
{
- SP_PlayerDef.menuid =
- MN_SR_MAIN +
- ( MN_SR_PLAYER << 6 );
+ SP_PlayerDef.menuid = MTREE2(MN_SR_MAIN, MN_SR_PLAYER);
}
SP_PlayerDef.prevMenu = currentMenu;
@@ -9095,7 +9097,7 @@ static void M_DrawSetupChoosePlayerMenu(void)
col = Color_Opposite[charskin->prefcolor - 1][0];
// Make the translation colormap
- colormap = R_GetTranslationColormap(TC_DEFAULT, col, 0);
+ colormap = R_GetTranslationColormap(TC_DEFAULT, col, GTC_CACHE);
// Don't render the title map
hidetitlemap = true;
@@ -9171,8 +9173,8 @@ static void M_DrawSetupChoosePlayerMenu(void)
{
V_DrawNameTag(
x, y, V_CENTERNAMETAG, FRACUNIT,
- R_GetTranslationColormap(TC_DEFAULT, curtextcolor, 0),
- R_GetTranslationColormap(TC_DEFAULT, curoutlinecolor, 0),
+ R_GetTranslationColormap(TC_DEFAULT, curtextcolor, GTC_CACHE),
+ R_GetTranslationColormap(TC_DEFAULT, curoutlinecolor, GTC_CACHE),
curtext
);
}
@@ -9204,8 +9206,8 @@ static void M_DrawSetupChoosePlayerMenu(void)
{
V_DrawNameTag(
x, y, V_CENTERNAMETAG, FRACUNIT,
- R_GetTranslationColormap(TC_DEFAULT, prevtextcolor, 0),
- R_GetTranslationColormap(TC_DEFAULT, prevoutlinecolor, 0),
+ R_GetTranslationColormap(TC_DEFAULT, prevtextcolor, GTC_CACHE),
+ R_GetTranslationColormap(TC_DEFAULT, prevoutlinecolor, GTC_CACHE),
prevtext
);
}
@@ -9234,8 +9236,8 @@ static void M_DrawSetupChoosePlayerMenu(void)
{
V_DrawNameTag(
x, y, V_CENTERNAMETAG, FRACUNIT,
- R_GetTranslationColormap(TC_DEFAULT, nexttextcolor, 0),
- R_GetTranslationColormap(TC_DEFAULT, nextoutlinecolor, 0),
+ R_GetTranslationColormap(TC_DEFAULT, nexttextcolor, GTC_CACHE),
+ R_GetTranslationColormap(TC_DEFAULT, nextoutlinecolor, GTC_CACHE),
nexttext
);
}
@@ -10842,9 +10844,9 @@ static void M_ServerOptions(INT32 choice)
/* Disable fading because of different menu head. */
if (currentMenu == &OP_MainDef)/* from Options menu */
- OP_ServerOptionsDef.menuid = MN_OP_MAIN + ( MN_OP_SERVER << 6 );
+ OP_ServerOptionsDef.menuid = MTREE2(MN_OP_MAIN, MN_OP_SERVER);
else/* from Multiplayer menu */
- OP_ServerOptionsDef.menuid = MN_MP_MAIN + ( MN_MP_SERVER_OPTIONS << 6 );
+ OP_ServerOptionsDef.menuid = MTREE2(MN_MP_MAIN, MN_MP_SERVER_OPTIONS);
OP_ServerOptionsDef.prevMenu = currentMenu;
M_SetupNextMenu(&OP_ServerOptionsDef);
@@ -11761,8 +11763,8 @@ static void M_Setup1PControlsMenu(INT32 choice)
OP_ChangeControlsMenu[27+3].status = IT_CALL|IT_STRING2;
OP_ChangeControlsDef.prevMenu = &OP_P1ControlsDef;
- OP_ChangeControlsDef.menuid &= ~(((1 << MENUBITS) - 1) << MENUBITS); // remove first level (<< 6)
- OP_ChangeControlsDef.menuid |= MN_OP_P1CONTROLS << MENUBITS; // combine first level (<< 6)
+ OP_ChangeControlsDef.menuid &= ~(((1 << MENUBITS) - 1) << MENUBITS); // remove second level
+ OP_ChangeControlsDef.menuid |= MN_OP_P1CONTROLS << MENUBITS; // combine second level
M_SetupNextMenu(&OP_ChangeControlsDef);
}
@@ -11792,8 +11794,8 @@ static void M_Setup2PControlsMenu(INT32 choice)
OP_ChangeControlsMenu[27+3].status = IT_GRAYEDOUT2;
OP_ChangeControlsDef.prevMenu = &OP_P2ControlsDef;
- OP_ChangeControlsDef.menuid &= ~(((1 << MENUBITS) - 1) << MENUBITS); // remove first level (<< 6)
- OP_ChangeControlsDef.menuid |= MN_OP_P2CONTROLS << MENUBITS; // combine first level (<< 6)
+ OP_ChangeControlsDef.menuid &= ~(((1 << MENUBITS) - 1) << MENUBITS); // remove second level
+ OP_ChangeControlsDef.menuid |= MN_OP_P2CONTROLS << MENUBITS; // combine second level
M_SetupNextMenu(&OP_ChangeControlsDef);
}
diff --git a/src/m_menu.h b/src/m_menu.h
index eeda9cc580867ca1ae3fa2dee31cbdd643c5de4d..565b98945718e9612a47da82e1d306fa64a54845 100644
--- a/src/m_menu.h
+++ b/src/m_menu.h
@@ -31,6 +31,9 @@
#define MENUBITS 6
// Menu IDs sectioned by numeric places to signify hierarchy
+/**
+ * IF YOU MODIFY THIS, MODIFY MENUTYPES_LIST[] IN dehacked.c TO MATCH.
+ */
typedef enum
{
MN_NONE,
@@ -129,6 +132,9 @@ typedef enum
MN_SPECIAL,
NUMMENUTYPES,
} menutype_t; // up to 63; MN_SPECIAL = 53
+#define MTREE2(a,b) (a | (b<<MENUBITS))
+#define MTREE3(a,b,c) MTREE2(a, MTREE2(b,c))
+#define MTREE4(a,b,c,d) MTREE2(a, MTREE3(b,c,d))
typedef struct
{
diff --git a/src/mserv.h b/src/mserv.h
index 6d91da64395be09b8b7eda1d87e9718767a49fdd..5f9b8da5f430f5cbc384ba3497de3845fcb5c8b6 100644
--- a/src/mserv.h
+++ b/src/mserv.h
@@ -68,7 +68,7 @@ extern consvar_t cv_masterserver, cv_servername;
// < 0 to not connect (usually -1) (offline mode)
// == 0 to show all rooms, not a valid hosting room
// anything else is whatever room the MS assigns to that number (online mode)
-INT16 ms_RoomId;
+extern INT16 ms_RoomId;
const char *GetMasterServerPort(void);
const char *GetMasterServerIP(void);
diff --git a/src/p_enemy.c b/src/p_enemy.c
index 2341be6d366a7f97f7551959f3437b19f81a7e2c..061d4d366aa3c6fa45479b3b23f32213f190d8e5 100644
--- a/src/p_enemy.c
+++ b/src/p_enemy.c
@@ -312,6 +312,7 @@ void A_RolloutRock(mobj_t *actor);
void A_DragonbomberSpawn(mobj_t *actor);
void A_DragonWing(mobj_t *actor);
void A_DragonSegment(mobj_t *actor);
+void A_ChangeHeight(mobj_t *actor);
//for p_enemy.c
@@ -2990,6 +2991,19 @@ void A_Boss1Laser(mobj_t *actor)
angle_t angle;
mobj_t *point;
tic_t dur;
+ static const UINT8 LASERCOLORS[] =
+ {
+ SKINCOLOR_SUPERRED3,
+ SKINCOLOR_SUPERRED4,
+ SKINCOLOR_SUPERRED5,
+ SKINCOLOR_FLAME,
+ SKINCOLOR_RED,
+ SKINCOLOR_RED,
+ SKINCOLOR_FLAME,
+ SKINCOLOR_SUPERRED5,
+ SKINCOLOR_SUPERRED4,
+ SKINCOLOR_SUPERRED3,
+ };
if (LUA_CallAction("A_Boss1Laser", actor))
return;
@@ -3064,7 +3078,7 @@ void A_Boss1Laser(mobj_t *actor)
point = P_SpawnMobj(x, y, z, locvar1);
P_SetTarget(&point->target, actor);
point->angle = actor->angle;
- speed = point->radius*2;
+ speed = point->radius;
point->momz = FixedMul(FINECOSINE(angle>>ANGLETOFINESHIFT), speed);
point->momx = FixedMul(FINESINE(angle>>ANGLETOFINESHIFT), FixedMul(FINECOSINE(point->angle>>ANGLETOFINESHIFT), speed));
point->momy = FixedMul(FINESINE(angle>>ANGLETOFINESHIFT), FixedMul(FINESINE(point->angle>>ANGLETOFINESHIFT), speed));
@@ -3073,23 +3087,69 @@ void A_Boss1Laser(mobj_t *actor)
{
mobj_t *mo = P_SpawnMobj(point->x, point->y, point->z, point->type);
mo->angle = point->angle;
+ mo->color = LASERCOLORS[((UINT8)(i + 3*dur) >> 2) % sizeof(LASERCOLORS)]; // codeing
P_UnsetThingPosition(mo);
- mo->flags = MF_NOBLOCKMAP|MF_NOCLIP|MF_NOCLIPHEIGHT|MF_NOGRAVITY|MF_SCENERY;
+ mo->flags = MF_NOCLIP|MF_NOCLIPHEIGHT|MF_NOGRAVITY|MF_SCENERY;
P_SetThingPosition(mo);
+ if (dur & 1 && mo->info->missilestate)
+ {
+ P_SetMobjState(mo, mo->info->missilestate);
+ if (mo->info->meleestate)
+ {
+ mobj_t *mo2 = P_SpawnMobjFromMobj(mo, 0, 0, 0, MT_PARTICLE);
+ mo2->flags2 |= MF2_LINKDRAW;
+ P_SetTarget(&mo2->tracer, actor);
+ P_SetMobjState(mo2, mo->info->meleestate);
+ }
+ }
+
+ if (dur == 1)
+ P_SpawnGhostMobj(mo);
+
x = point->x, y = point->y, z = point->z;
if (P_RailThinker(point))
break;
}
+ x += point->momx;
+ y += point->momy;
floorz = P_FloorzAtPos(x, y, z, mobjinfo[MT_EGGMOBILE_FIRE].height);
- if (z - floorz < mobjinfo[MT_EGGMOBILE_FIRE].height>>1)
+ if (z - floorz < mobjinfo[MT_EGGMOBILE_FIRE].height>>1 && dur & 1)
{
- point = P_SpawnMobj(x, y, floorz+1, MT_EGGMOBILE_FIRE);
+ point = P_SpawnMobj(x, y, floorz, MT_EGGMOBILE_FIRE);
+ point->angle = actor->angle;
+ point->destscale = actor->scale;
+ P_SetScale(point, point->destscale);
P_SetTarget(&point->target, actor);
- point->destscale = 3*FRACUNIT;
- point->scalespeed = FRACUNIT>>2;
- point->fuse = TICRATE;
+ P_MobjCheckWater(point);
+ if (point->eflags & (MFE_UNDERWATER|MFE_TOUCHWATER))
+ {
+ for (i = 0; i < 2; i++)
+ {
+ UINT8 size = 3;
+ mobj_t *steam = P_SpawnMobj(x, y, point->watertop - size*mobjinfo[MT_DUST].height, MT_DUST);
+ P_SetScale(steam, size*actor->scale);
+ P_SetObjectMomZ(steam, FRACUNIT + 2*P_RandomFixed(), true);
+ P_InstaThrust(steam, FixedAngle(P_RandomKey(360)*FRACUNIT), 2*P_RandomFixed());
+ if (point->info->painsound)
+ S_StartSound(steam, point->info->painsound);
+ }
+ }
+ else
+ {
+ fixed_t distx = P_ReturnThrustX(point, point->angle, point->radius);
+ fixed_t disty = P_ReturnThrustY(point, point->angle, point->radius);
+ if (P_TryMove(point, point->x + distx, point->y + disty, false) // prevents the sprite from clipping into the wall or dangling off ledges
+ && P_TryMove(point, point->x - 2*distx, point->y - 2*disty, false)
+ && P_TryMove(point, point->x + distx, point->y + disty, false))
+ {
+ if (point->info->seesound)
+ S_StartSound(point, point->info->seesound);
+ }
+ else
+ P_RemoveMobj(point);
+ }
}
if (dur > 1)
@@ -8788,25 +8848,23 @@ void A_Dye(mobj_t *actor)
mobj_t *target = ((locvar1 && actor->target) ? actor->target : actor);
UINT8 color = (UINT8)locvar2;
-#ifdef HAVE_BLUA
if (LUA_CallAction("A_Dye", actor))
return;
-#endif
if (color >= MAXTRANSLATIONS)
return;
-
+
if (!color)
target->colorized = false;
else
target->colorized = true;
-
+
// What if it's a player?
if (target->player)
{
target->player->powers[pw_dye] = color;
return;
}
-
+
target->color = color;
}
@@ -12642,8 +12700,8 @@ void A_Boss5FindWaypoint(mobj_t *actor)
else // locvar1 == 0
{
fixed_t hackoffset = P_MobjFlip(actor)*56*FRACUNIT;
- INT32 numwaypoints = 0;
- mobj_t **waypoints;
+ INT32 numfangwaypoints = 0;
+ mobj_t **fangwaypoints;
INT32 key;
actor->z += hackoffset;
@@ -12668,7 +12726,7 @@ void A_Boss5FindWaypoint(mobj_t *actor)
continue;
if (!P_CheckSight(actor, mapthings[i].mobj))
continue;
- numwaypoints++;
+ numfangwaypoints++;
}
// players also count as waypoints apparently
@@ -12690,11 +12748,11 @@ void A_Boss5FindWaypoint(mobj_t *actor)
continue;
if (!P_CheckSight(actor, players[i].mo))
continue;
- numwaypoints++;
+ numfangwaypoints++;
}
}
- if (!numwaypoints)
+ if (!numfangwaypoints)
{
// restore z position
actor->z -= hackoffset;
@@ -12702,8 +12760,8 @@ void A_Boss5FindWaypoint(mobj_t *actor)
}
// allocate the table and reset count to zero
- waypoints = Z_Calloc(sizeof(*waypoints)*numwaypoints, PU_STATIC, NULL);
- numwaypoints = 0;
+ fangwaypoints = Z_Calloc(sizeof(*waypoints)*numfangwaypoints, PU_STATIC, NULL);
+ numfangwaypoints = 0;
// now find them again and add them to the table!
for (i = 0; i < nummapthings; i++)
@@ -12728,7 +12786,7 @@ void A_Boss5FindWaypoint(mobj_t *actor)
}
if (!P_CheckSight(actor, mapthings[i].mobj))
continue;
- waypoints[numwaypoints++] = mapthings[i].mobj;
+ fangwaypoints[numfangwaypoints++] = mapthings[i].mobj;
}
if (actor->extravalue2 > 1)
@@ -12749,25 +12807,25 @@ void A_Boss5FindWaypoint(mobj_t *actor)
continue;
if (!P_CheckSight(actor, players[i].mo))
continue;
- waypoints[numwaypoints++] = players[i].mo;
+ fangwaypoints[numfangwaypoints++] = players[i].mo;
}
}
// restore z position
actor->z -= hackoffset;
- if (!numwaypoints)
+ if (!numfangwaypoints)
{
- Z_Free(waypoints); // free table
+ Z_Free(fangwaypoints); // free table
goto nowaypoints; // ???
}
- key = P_RandomKey(numwaypoints);
+ key = P_RandomKey(numfangwaypoints);
- P_SetTarget(&actor->tracer, waypoints[key]);
+ P_SetTarget(&actor->tracer, fangwaypoints[key]);
if (actor->tracer->type == MT_FANGWAYPOINT)
- actor->tracer->reactiontime = numwaypoints/4; // Monster Iestyn: is this how it should be? I count center waypoints as waypoints unlike the original Lua script
- Z_Free(waypoints); // free table
+ actor->tracer->reactiontime = numfangwaypoints/4; // Monster Iestyn: is this how it should be? I count center waypoints as waypoints unlike the original Lua script
+ Z_Free(fangwaypoints); // free table
}
// now face the tracer you just set!
@@ -13311,8 +13369,9 @@ static boolean PIT_DustDevilLaunch(mobj_t *thing)
P_ResetPlayer(player);
A_PlayActiveSound(dustdevil);
}
+ player->powers[pw_carry] = CR_DUSTDEVIL;
player->powers[pw_nocontrol] = 2;
- player->drawangle += ANG20;
+ P_SetTarget(&thing->tracer, dustdevil);
P_SetPlayerMobjState(thing, S_PLAY_PAIN);
if (dist > dragamount)
@@ -13332,7 +13391,9 @@ static boolean PIT_DustDevilLaunch(mobj_t *thing)
P_ResetPlayer(player);
thing->z = dustdevil->z + dustdevil->height;
thrust = 20 * FRACUNIT;
+ player->powers[pw_carry] = CR_NONE;
player->powers[pw_nocontrol] = 0;
+ P_SetTarget(&thing->tracer, NULL);
S_StartSound(thing, sfx_wdjump);
P_SetPlayerMobjState(thing, S_PLAY_FALL);
}
@@ -14409,3 +14470,43 @@ void A_DragonSegment(mobj_t *actor)
actor->angle = hangle;
P_TeleportMove(actor, target->x + xdist, target->y + ydist, target->z + zdist);
}
+
+// Function: A_ChangeHeight
+//
+// Description: Changes the actor's height by var1
+//
+// var1 = height
+// var2 =
+// &1: height is absolute
+// &2: scale with actor's scale
+//
+void A_ChangeHeight(mobj_t *actor)
+{
+ INT32 locvar1 = var1;
+ INT32 locvar2 = var2;
+ fixed_t height = locvar1;
+ boolean reverse;
+
+ if (LUA_CallAction("A_ChangeHeight", actor))
+ return;
+
+ reverse = (actor->eflags & MFE_VERTICALFLIP) || (actor->flags2 & MF2_OBJECTFLIP);
+
+ if (locvar2 & 2)
+ height = FixedMul(height, actor->scale);
+
+ P_UnsetThingPosition(actor);
+ if (locvar2 & 1)
+ {
+ if (reverse)
+ actor->z += actor->height - locvar1;
+ actor->height = locvar1;
+ }
+ else
+ {
+ if (reverse)
+ actor->z -= locvar1;
+ actor->height += locvar1;
+ }
+ P_SetThingPosition(actor);
+}
diff --git a/src/p_floor.c b/src/p_floor.c
index d6ffb95bfd1096379f3a836da1020c24fe8d0abc..ee673cb0478cd977b7d26c6ff94be444f8bd512c 100644
--- a/src/p_floor.c
+++ b/src/p_floor.c
@@ -2231,9 +2231,9 @@ void EV_CrumbleChain(sector_t *sec, ffloor_t *rover)
{
mobj_t *spawned = NULL;
if (*rover->t_slope)
- topz = P_GetZAt(*rover->t_slope, a, b) - (spacing>>1);
+ topz = P_GetSlopeZAt(*rover->t_slope, a, b) - (spacing>>1);
if (*rover->b_slope)
- bottomz = P_GetZAt(*rover->b_slope, a, b);
+ bottomz = P_GetSlopeZAt(*rover->b_slope, a, b);
for (c = topz; c > bottomz; c -= spacing)
{
diff --git a/src/p_map.c b/src/p_map.c
index db6df59dc4c51b3aa7d60a6563b0264889c19a46..b63ce84ba2a53f3ce23fbae730aad832b813c9f1 100644
--- a/src/p_map.c
+++ b/src/p_map.c
@@ -3202,102 +3202,83 @@ isblocking:
static boolean P_IsClimbingValid(player_t *player, angle_t angle)
{
fixed_t platx, platy;
- subsector_t *glidesector;
+ sector_t *glidesector;
fixed_t floorz, ceilingz;
+ mobj_t *mo = player->mo;
+ ffloor_t *rover;
- platx = P_ReturnThrustX(player->mo, angle, player->mo->radius + FixedMul(8*FRACUNIT, player->mo->scale));
- platy = P_ReturnThrustY(player->mo, angle, player->mo->radius + FixedMul(8*FRACUNIT, player->mo->scale));
+ platx = P_ReturnThrustX(mo, angle, mo->radius + FixedMul(8*FRACUNIT, mo->scale));
+ platy = P_ReturnThrustY(mo, angle, mo->radius + FixedMul(8*FRACUNIT, mo->scale));
- glidesector = R_PointInSubsector(player->mo->x + platx, player->mo->y + platy);
+ glidesector = R_PointInSubsector(mo->x + platx, mo->y + platy)->sector;
- floorz = glidesector->sector->f_slope ? P_GetZAt(glidesector->sector->f_slope, player->mo->x, player->mo->y) : glidesector->sector->floorheight;
- ceilingz = glidesector->sector->c_slope ? P_GetZAt(glidesector->sector->c_slope, player->mo->x, player->mo->y) : glidesector->sector->ceilingheight;
+ floorz = P_GetSectorFloorZAt (glidesector, mo->x, mo->y);
+ ceilingz = P_GetSectorCeilingZAt(glidesector, mo->x, mo->y);
- if (glidesector->sector != player->mo->subsector->sector)
+ if (glidesector != mo->subsector->sector)
{
boolean floorclimb = false;
fixed_t topheight, bottomheight;
- if (glidesector->sector->ffloors)
+ for (rover = glidesector->ffloors; rover; rover = rover->next)
{
- ffloor_t *rover;
- for (rover = glidesector->sector->ffloors; rover; rover = rover->next)
- {
- if (!(rover->flags & FF_EXISTS) || !(rover->flags & FF_BLOCKPLAYER))
- continue;
-
- topheight = *rover->topheight;
- bottomheight = *rover->bottomheight;
+ if (!(rover->flags & FF_EXISTS) || !(rover->flags & FF_BLOCKPLAYER))
+ continue;
- if (*rover->t_slope)
- topheight = P_GetZAt(*rover->t_slope, player->mo->x, player->mo->y);
- if (*rover->b_slope)
- bottomheight = P_GetZAt(*rover->b_slope, player->mo->x, player->mo->y);
+ topheight = P_GetFFloorTopZAt (rover, mo->x, mo->y);
+ bottomheight = P_GetFFloorBottomZAt(rover, mo->x, mo->y);
- floorclimb = true;
+ floorclimb = true;
- if (player->mo->eflags & MFE_VERTICALFLIP)
- {
- if ((topheight < player->mo->z + player->mo->height) && ((player->mo->z + player->mo->height + player->mo->momz) < topheight))
- {
- floorclimb = true;
- }
- if (topheight < player->mo->z) // Waaaay below the ledge.
- {
- floorclimb = false;
- }
- if (bottomheight > player->mo->z + player->mo->height - FixedMul(16*FRACUNIT,player->mo->scale))
- {
- floorclimb = false;
- }
- }
- else
- {
- if ((bottomheight > player->mo->z) && ((player->mo->z - player->mo->momz) > bottomheight))
- {
- floorclimb = true;
- }
- if (bottomheight > player->mo->z + player->mo->height) // Waaaay below the ledge.
- {
- floorclimb = false;
- }
- if (topheight < player->mo->z + FixedMul(16*FRACUNIT,player->mo->scale))
- {
- floorclimb = false;
- }
- }
-
- if (floorclimb)
- break;
+ if (mo->eflags & MFE_VERTICALFLIP)
+ {
+ if ((topheight < mo->z + mo->height) && ((mo->z + mo->height + mo->momz) < topheight))
+ floorclimb = true;
+ if (topheight < mo->z) // Waaaay below the ledge.
+ floorclimb = false;
+ if (bottomheight > mo->z + mo->height - FixedMul(16*FRACUNIT,mo->scale))
+ floorclimb = false;
}
+ else
+ {
+ if ((bottomheight > mo->z) && ((mo->z - mo->momz) > bottomheight))
+ floorclimb = true;
+ if (bottomheight > mo->z + mo->height) // Waaaay below the ledge.
+ floorclimb = false;
+ if (topheight < mo->z + FixedMul(16*FRACUNIT,mo->scale))
+ floorclimb = false;
+ }
+
+ if (floorclimb)
+ break;
}
- if (player->mo->eflags & MFE_VERTICALFLIP)
+ if (mo->eflags & MFE_VERTICALFLIP)
{
- if ((floorz <= player->mo->z + player->mo->height)
- && ((player->mo->z + player->mo->height - player->mo->momz) <= floorz))
+ if ((floorz <= mo->z + mo->height)
+ && ((mo->z + mo->height - mo->momz) <= floorz))
floorclimb = true;
- if ((floorz > player->mo->z)
- && glidesector->sector->floorpic == skyflatnum)
+ if ((floorz > mo->z)
+ && glidesector->floorpic == skyflatnum)
return false;
- if ((player->mo->z + player->mo->height - FixedMul(16*FRACUNIT,player->mo->scale) > ceilingz)
- || (player->mo->z + player->mo->height <= floorz))
+ if ((mo->z + mo->height - FixedMul(16*FRACUNIT,mo->scale) > ceilingz)
+ || (mo->z + mo->height <= floorz))
floorclimb = true;
}
else
{
- if ((ceilingz >= player->mo->z)
- && ((player->mo->z - player->mo->momz) >= ceilingz))
+ if ((ceilingz >= mo->z)
+ && ((mo->z - mo->momz) >= ceilingz))
floorclimb = true;
- if ((ceilingz < player->mo->z+player->mo->height)
- && glidesector->sector->ceilingpic == skyflatnum)
+ if ((ceilingz < mo->z+mo->height)
+ && glidesector->ceilingpic == skyflatnum)
return false;
- if ((player->mo->z + FixedMul(16*FRACUNIT,player->mo->scale) < floorz)
- || (player->mo->z >= ceilingz))
+ if ((mo->z + FixedMul(16*FRACUNIT,mo->scale) < floorz)
+ || (mo->z >= ceilingz))
floorclimb = true;
}
@@ -3355,13 +3336,8 @@ static void PTR_GlideClimbTraverse(line_t *li)
if (!(rover->flags & FF_EXISTS) || !(rover->flags & FF_BLOCKPLAYER) || (rover->flags & FF_BUSTUP))
continue;
- topheight = *rover->topheight;
- bottomheight = *rover->bottomheight;
-
- if (*rover->t_slope)
- topheight = P_GetZAt(*rover->t_slope, slidemo->x, slidemo->y);
- if (*rover->b_slope)
- bottomheight = P_GetZAt(*rover->b_slope, slidemo->x, slidemo->y);
+ topheight = P_GetFFloorTopZAt (rover, slidemo->x, slidemo->y);
+ bottomheight = P_GetFFloorBottomZAt(rover, slidemo->x, slidemo->y);
if (topheight < slidemo->z)
continue;
@@ -3589,9 +3565,7 @@ static void P_CheckLavaWall(mobj_t *mo, sector_t *sec)
if (rover->master->flags & ML_BLOCKMONSTERS)
continue;
- topheight = *rover->t_slope ?
- P_GetZAt(*rover->t_slope, mo->x, mo->y) :
- *rover->topheight;
+ topheight = P_GetFFloorTopZAt(rover, mo->x, mo->y);
if (mo->eflags & MFE_VERTICALFLIP)
{
@@ -3604,9 +3578,7 @@ static void P_CheckLavaWall(mobj_t *mo, sector_t *sec)
continue;
}
- bottomheight = *rover->b_slope ?
- P_GetZAt(*rover->b_slope, mo->x, mo->y) :
- *rover->bottomheight;
+ bottomheight = P_GetFFloorBottomZAt(rover, mo->x, mo->y);
if (mo->eflags & MFE_VERTICALFLIP)
{
@@ -4192,11 +4164,8 @@ static boolean PIT_ChangeSector(mobj_t *thing, boolean realcrush)
topheight = *rover->topheight;
bottomheight = *rover->bottomheight;
-
- /*if (rover->t_slope)
- topheight = P_GetZAt(rover->t_slope, thing->x, thing->y);
- if (rover->b_slope)
- bottomheight = P_GetZAt(rover->b_slope, thing->x, thing->y);*/
+ //topheight = P_GetFFloorTopZAt (rover, thing->x, thing->y);
+ //bottomheight = P_GetFFloorBottomZAt(rover, thing->x, thing->y);
delta1 = thing->z - (bottomheight + topheight)/2;
delta2 = thingtop - (bottomheight + topheight)/2;
@@ -4973,10 +4942,7 @@ void P_MapEnd(void)
fixed_t P_FloorzAtPos(fixed_t x, fixed_t y, fixed_t z, fixed_t height)
{
sector_t *sec = R_PointInSubsector(x, y)->sector;
- fixed_t floorz = sec->floorheight;
-
- if (sec->f_slope)
- floorz = P_GetZAt(sec->f_slope, x, y);
+ fixed_t floorz = P_GetSectorFloorZAt(sec, x, y);
// Intercept the stupid 'fall through 3dfloors' bug Tails 03-17-2002
if (sec->ffloors)
@@ -4993,13 +4959,8 @@ fixed_t P_FloorzAtPos(fixed_t x, fixed_t y, fixed_t z, fixed_t height)
if ((!(rover->flags & FF_SOLID || rover->flags & FF_QUICKSAND) || (rover->flags & FF_SWIMMABLE)))
continue;
- topheight = *rover->topheight;
- bottomheight = *rover->bottomheight;
-
- if (*rover->t_slope)
- topheight = P_GetZAt(*rover->t_slope, x, y);
- if (*rover->b_slope)
- bottomheight = P_GetZAt(*rover->b_slope, x, y);
+ topheight = P_GetFFloorTopZAt (rover, x, y);
+ bottomheight = P_GetFFloorBottomZAt(rover, x, y);
if (rover->flags & FF_QUICKSAND)
{
diff --git a/src/p_maputl.c b/src/p_maputl.c
index b0289db36c7b3598f41c696c5f76d025512482c8..c6e064d184a722ef2c6fb371ff7e5f9767f2afcd 100644
--- a/src/p_maputl.c
+++ b/src/p_maputl.c
@@ -303,45 +303,33 @@ void P_CameraLineOpening(line_t *linedef)
// If you can see through it, why not move the camera through it too?
if (front->camsec >= 0)
{
- frontfloor = sectors[front->camsec].floorheight;
- frontceiling = sectors[front->camsec].ceilingheight;
- if (sectors[front->camsec].f_slope) // SRB2CBTODO: ESLOPE (sectors[front->heightsec].f_slope)
- frontfloor = P_GetZAt(sectors[front->camsec].f_slope, camera.x, camera.y);
- if (sectors[front->camsec].c_slope)
- frontceiling = P_GetZAt(sectors[front->camsec].c_slope, camera.x, camera.y);
+ // SRB2CBTODO: ESLOPE (sectors[front->heightsec].f_slope)
+ frontfloor = P_GetSectorFloorZAt (§ors[front->camsec], camera.x, camera.y);
+ frontceiling = P_GetSectorCeilingZAt(§ors[front->camsec], camera.x, camera.y);
}
else if (front->heightsec >= 0)
{
- frontfloor = sectors[front->heightsec].floorheight;
- frontceiling = sectors[front->heightsec].ceilingheight;
- if (sectors[front->heightsec].f_slope) // SRB2CBTODO: ESLOPE (sectors[front->heightsec].f_slope)
- frontfloor = P_GetZAt(sectors[front->heightsec].f_slope, camera.x, camera.y);
- if (sectors[front->heightsec].c_slope)
- frontceiling = P_GetZAt(sectors[front->heightsec].c_slope, camera.x, camera.y);
+ // SRB2CBTODO: ESLOPE (sectors[front->heightsec].f_slope)
+ frontfloor = P_GetSectorFloorZAt (§ors[front->heightsec], camera.x, camera.y);
+ frontceiling = P_GetSectorCeilingZAt(§ors[front->heightsec], camera.x, camera.y);
}
else
{
- frontfloor = P_CameraGetFloorZ(mapcampointer, front, tmx, tmy, linedef);
+ frontfloor = P_CameraGetFloorZ (mapcampointer, front, tmx, tmy, linedef);
frontceiling = P_CameraGetCeilingZ(mapcampointer, front, tmx, tmy, linedef);
}
if (back->camsec >= 0)
{
- backfloor = sectors[back->camsec].floorheight;
- backceiling = sectors[back->camsec].ceilingheight;
- if (sectors[back->camsec].f_slope) // SRB2CBTODO: ESLOPE (sectors[front->heightsec].f_slope)
- frontfloor = P_GetZAt(sectors[back->camsec].f_slope, camera.x, camera.y);
- if (sectors[back->camsec].c_slope)
- frontceiling = P_GetZAt(sectors[back->camsec].c_slope, camera.x, camera.y);
+ // SRB2CBTODO: ESLOPE (sectors[back->heightsec].f_slope)
+ backfloor = P_GetSectorFloorZAt (§ors[back->camsec], camera.x, camera.y);
+ backceiling = P_GetSectorCeilingZAt(§ors[back->camsec], camera.x, camera.y);
}
else if (back->heightsec >= 0)
{
- backfloor = sectors[back->heightsec].floorheight;
- backceiling = sectors[back->heightsec].ceilingheight;
- if (sectors[back->heightsec].f_slope) // SRB2CBTODO: ESLOPE (sectors[front->heightsec].f_slope)
- frontfloor = P_GetZAt(sectors[back->heightsec].f_slope, camera.x, camera.y);
- if (sectors[back->heightsec].c_slope)
- frontceiling = P_GetZAt(sectors[back->heightsec].c_slope, camera.x, camera.y);
+ // SRB2CBTODO: ESLOPE (sectors[back->heightsec].f_slope)
+ backfloor = P_GetSectorFloorZAt (§ors[back->heightsec], camera.x, camera.y);
+ backceiling = P_GetSectorCeilingZAt(§ors[back->heightsec], camera.x, camera.y);
}
else
{
diff --git a/src/p_mobj.c b/src/p_mobj.c
index 301f3a8d6a224e2f172e9a514cdedf030bb3bb07..4e863a3ae79579f68c89c20fd0f8aae6ae6031d0 100644
--- a/src/p_mobj.c
+++ b/src/p_mobj.c
@@ -926,13 +926,8 @@ boolean P_InsideANonSolidFFloor(mobj_t *mobj, ffloor_t *rover)
|| ((rover->flags & FF_BLOCKOTHERS) && !mobj->player)))
return false;
- topheight = *rover->topheight;
- bottomheight = *rover->bottomheight;
-
- if (*rover->t_slope)
- topheight = P_GetZAt(*rover->t_slope, mobj->x, mobj->y);
- if (*rover->b_slope)
- bottomheight = P_GetZAt(*rover->b_slope, mobj->x, mobj->y);
+ topheight = P_GetFFloorTopZAt (rover, mobj->x, mobj->y);
+ bottomheight = P_GetFFloorBottomZAt(rover, mobj->x, mobj->y);
if (mobj->z > topheight)
return false;
@@ -963,12 +958,12 @@ static fixed_t HighestOnLine(fixed_t radius, fixed_t x, fixed_t y, line_t *line,
/*CONS_Printf("BEFORE: v1 = %f %f %f\n",
FIXED_TO_FLOAT(v1.x),
FIXED_TO_FLOAT(v1.y),
- FIXED_TO_FLOAT(P_GetZAt(slope, v1.x, v1.y))
+ FIXED_TO_FLOAT(P_GetSlopeZAt(slope, v1.x, v1.y))
);
CONS_Printf(" v2 = %f %f %f\n",
FIXED_TO_FLOAT(v2.x),
FIXED_TO_FLOAT(v2.y),
- FIXED_TO_FLOAT(P_GetZAt(slope, v2.x, v2.y))
+ FIXED_TO_FLOAT(P_GetSlopeZAt(slope, v2.x, v2.y))
);*/
if (abs(v1.x-x) > radius) {
@@ -1026,24 +1021,24 @@ static fixed_t HighestOnLine(fixed_t radius, fixed_t x, fixed_t y, line_t *line,
/*CONS_Printf("AFTER: v1 = %f %f %f\n",
FIXED_TO_FLOAT(v1.x),
FIXED_TO_FLOAT(v1.y),
- FIXED_TO_FLOAT(P_GetZAt(slope, v1.x, v1.y))
+ FIXED_TO_FLOAT(P_GetSlopeZAt(slope, v1.x, v1.y))
);
CONS_Printf(" v2 = %f %f %f\n",
FIXED_TO_FLOAT(v2.x),
FIXED_TO_FLOAT(v2.y),
- FIXED_TO_FLOAT(P_GetZAt(slope, v2.x, v2.y))
+ FIXED_TO_FLOAT(P_GetSlopeZAt(slope, v2.x, v2.y))
);*/
// Return the higher of the two points
if (actuallylowest)
return min(
- P_GetZAt(slope, v1.x, v1.y),
- P_GetZAt(slope, v2.x, v2.y)
+ P_GetSlopeZAt(slope, v1.x, v1.y),
+ P_GetSlopeZAt(slope, v2.x, v2.y)
);
else
return max(
- P_GetZAt(slope, v1.x, v1.y),
- P_GetZAt(slope, v2.x, v2.y)
+ P_GetSlopeZAt(slope, v1.x, v1.y),
+ P_GetSlopeZAt(slope, v2.x, v2.y)
);
}
@@ -1077,7 +1072,7 @@ fixed_t P_MobjFloorZ(mobj_t *mobj, sector_t *sector, sector_t *boundsec, fixed_t
// If the highest point is in the sector, then we have it easy! Just get the Z at that point
if (R_PointInSubsector(testx, testy)->sector == (boundsec ? boundsec : sector))
- return P_GetZAt(slope, testx, testy);
+ return P_GetSlopeZAt(slope, testx, testy);
// If boundsec is set, we're looking for specials. In that case, iterate over every line in this sector to find the TRUE highest/lowest point
if (perfect) {
@@ -1117,7 +1112,7 @@ fixed_t P_MobjFloorZ(mobj_t *mobj, sector_t *sector, sector_t *boundsec, fixed_t
// If we're just testing for base sector location (no collision line), just go for the center's spot...
// It'll get fixed when we test for collision anyway, and the final result can't be lower than this
if (line == NULL)
- return P_GetZAt(slope, x, y);
+ return P_GetSlopeZAt(slope, x, y);
return HighestOnLine(mobj->radius, x, y, line, slope, lowest);
} else // Well, that makes it easy. Just get the floor height
@@ -1154,7 +1149,7 @@ fixed_t P_MobjCeilingZ(mobj_t *mobj, sector_t *sector, sector_t *boundsec, fixed
// If the highest point is in the sector, then we have it easy! Just get the Z at that point
if (R_PointInSubsector(testx, testy)->sector == (boundsec ? boundsec : sector))
- return P_GetZAt(slope, testx, testy);
+ return P_GetSlopeZAt(slope, testx, testy);
// If boundsec is set, we're looking for specials. In that case, iterate over every line in this sector to find the TRUE highest/lowest point
if (perfect) {
@@ -1194,7 +1189,7 @@ fixed_t P_MobjCeilingZ(mobj_t *mobj, sector_t *sector, sector_t *boundsec, fixed
// If we're just testing for base sector location (no collision line), just go for the center's spot...
// It'll get fixed when we test for collision anyway, and the final result can't be lower than this
if (line == NULL)
- return P_GetZAt(slope, x, y);
+ return P_GetSlopeZAt(slope, x, y);
return HighestOnLine(mobj->radius, x, y, line, slope, lowest);
} else // Well, that makes it easy. Just get the ceiling height
@@ -1232,7 +1227,7 @@ fixed_t P_CameraFloorZ(camera_t *mobj, sector_t *sector, sector_t *boundsec, fix
// If the highest point is in the sector, then we have it easy! Just get the Z at that point
if (R_PointInSubsector(testx, testy)->sector == (boundsec ? boundsec : sector))
- return P_GetZAt(slope, testx, testy);
+ return P_GetSlopeZAt(slope, testx, testy);
// If boundsec is set, we're looking for specials. In that case, iterate over every line in this sector to find the TRUE highest/lowest point
if (perfect) {
@@ -1272,7 +1267,7 @@ fixed_t P_CameraFloorZ(camera_t *mobj, sector_t *sector, sector_t *boundsec, fix
// If we're just testing for base sector location (no collision line), just go for the center's spot...
// It'll get fixed when we test for collision anyway, and the final result can't be lower than this
if (line == NULL)
- return P_GetZAt(slope, x, y);
+ return P_GetSlopeZAt(slope, x, y);
return HighestOnLine(mobj->radius, x, y, line, slope, lowest);
} else // Well, that makes it easy. Just get the floor height
@@ -1309,7 +1304,7 @@ fixed_t P_CameraCeilingZ(camera_t *mobj, sector_t *sector, sector_t *boundsec, f
// If the highest point is in the sector, then we have it easy! Just get the Z at that point
if (R_PointInSubsector(testx, testy)->sector == (boundsec ? boundsec : sector))
- return P_GetZAt(slope, testx, testy);
+ return P_GetSlopeZAt(slope, testx, testy);
// If boundsec is set, we're looking for specials. In that case, iterate over every line in this sector to find the TRUE highest/lowest point
if (perfect) {
@@ -1349,7 +1344,7 @@ fixed_t P_CameraCeilingZ(camera_t *mobj, sector_t *sector, sector_t *boundsec, f
// If we're just testing for base sector location (no collision line), just go for the center's spot...
// It'll get fixed when we test for collision anyway, and the final result can't be lower than this
if (line == NULL)
- return P_GetZAt(slope, x, y);
+ return P_GetSlopeZAt(slope, x, y);
return HighestOnLine(mobj->radius, x, y, line, slope, lowest);
} else // Well, that makes it easy. Just get the ceiling height
@@ -3215,9 +3210,7 @@ static boolean P_SceneryZMovement(mobj_t *mo)
//
boolean P_CanRunOnWater(player_t *player, ffloor_t *rover)
{
- fixed_t topheight = *rover->t_slope ?
- P_GetZAt(*rover->t_slope, player->mo->x, player->mo->y) :
- *rover->topheight;
+ fixed_t topheight = P_GetFFloorTopZAt(rover, player->mo->x, player->mo->y);
if (!player->powers[pw_carry] && !player->homing
&& ((player->powers[pw_super] || player->charflags & SF_RUNONWATER || player->dashmode >= DASHMODE_THRESHOLD) && player->mo->ceilingz-topheight >= player->mo->height)
@@ -3260,14 +3253,8 @@ void P_MobjCheckWater(mobj_t *mobj)
|| ((rover->flags & FF_BLOCKOTHERS) && !mobj->player)))
continue;
- topheight = *rover->topheight;
- bottomheight = *rover->bottomheight;
-
- if (*rover->t_slope)
- topheight = P_GetZAt(*rover->t_slope, mobj->x, mobj->y);
-
- if (*rover->b_slope)
- bottomheight = P_GetZAt(*rover->b_slope, mobj->x, mobj->y);
+ topheight = P_GetFFloorTopZAt (rover, mobj->x, mobj->y);
+ bottomheight = P_GetFFloorBottomZAt(rover, mobj->x, mobj->y);
if (mobj->eflags & MFE_VERTICALFLIP)
{
@@ -3514,14 +3501,8 @@ static void P_SceneryCheckWater(mobj_t *mobj)
if (!(rover->flags & FF_EXISTS) || !(rover->flags & FF_SWIMMABLE) || rover->flags & FF_BLOCKOTHERS)
continue;
- topheight = *rover->topheight;
- bottomheight = *rover->bottomheight;
-
- if (*rover->t_slope)
- topheight = P_GetZAt(*rover->t_slope, mobj->x, mobj->y);
-
- if (*rover->b_slope)
- bottomheight = P_GetZAt(*rover->b_slope, mobj->x, mobj->y);
+ topheight = P_GetFFloorTopZAt (rover, mobj->x, mobj->y);
+ bottomheight = P_GetFFloorBottomZAt(rover, mobj->x, mobj->y);
if (topheight <= mobj->z
|| bottomheight > (mobj->z + (mobj->height>>1)))
@@ -3566,13 +3547,9 @@ static boolean P_CameraCheckHeat(camera_t *thiscam)
if (!(rover->flags & FF_EXISTS))
continue;
- if (halfheight >= (*rover->t_slope ?
- P_GetZAt(*rover->t_slope, thiscam->x, thiscam->y) :
- *rover->topheight))
+ if (halfheight >= P_GetFFloorTopZAt(rover, thiscam->x, thiscam->y))
continue;
- if (halfheight <= (*rover->b_slope ?
- P_GetZAt(*rover->b_slope, thiscam->x, thiscam->y) :
- *rover->bottomheight))
+ if (halfheight <= P_GetFFloorBottomZAt(rover, thiscam->x, thiscam->y))
continue;
if (P_FindSpecialLineFromTag(13, rover->master->frontsector->tag, -1) != -1)
@@ -3600,13 +3577,9 @@ static boolean P_CameraCheckWater(camera_t *thiscam)
if (!(rover->flags & FF_EXISTS) || !(rover->flags & FF_SWIMMABLE) || rover->flags & FF_BLOCKOTHERS)
continue;
- if (halfheight >= (*rover->t_slope ?
- P_GetZAt(*rover->t_slope, thiscam->x, thiscam->y) :
- *rover->topheight))
+ if (halfheight >= P_GetFFloorTopZAt(rover, thiscam->x, thiscam->y))
continue;
- if (halfheight <= (
- *rover->b_slope ? P_GetZAt(*rover->b_slope, thiscam->x, thiscam->y) :
- *rover->bottomheight))
+ if (halfheight <= P_GetFFloorBottomZAt(rover, thiscam->x, thiscam->y))
continue;
return true;
@@ -3988,9 +3961,7 @@ static void CalculatePrecipFloor(precipmobj_t *mobj)
mobjsecsubsec = mobj->subsector->sector;
else
return;
- mobj->floorz = mobjsecsubsec->f_slope ?
- P_GetZAt(mobjsecsubsec->f_slope, mobj->x, mobj->y) :
- mobjsecsubsec->floorheight;
+ mobj->floorz = P_GetSectorFloorZAt(mobjsecsubsec, mobj->x, mobj->y);
if (mobjsecsubsec->ffloors)
{
ffloor_t *rover;
@@ -4005,11 +3976,7 @@ static void CalculatePrecipFloor(precipmobj_t *mobj)
if (!(rover->flags & FF_BLOCKOTHERS) && !(rover->flags & FF_SWIMMABLE))
continue;
- if (*rover->t_slope)
- topheight = P_GetZAt(*rover->t_slope, mobj->x, mobj->y);
- else
- topheight = *rover->topheight;
-
+ topheight = P_GetFFloorTopZAt(rover, mobj->x, mobj->y);
if (topheight > mobj->floorz)
mobj->floorz = topheight;
}
@@ -7095,8 +7062,7 @@ static void P_MobjScaleThink(mobj_t *mobj)
fixed_t oldheight = mobj->height;
UINT8 correctionType = 0; // Don't correct Z position, just gain height
- if ((mobj->flags & MF_NOCLIPHEIGHT || (mobj->z > mobj->floorz && mobj->z + mobj->height < mobj->ceilingz))
- && mobj->type != MT_EGGMOBILE_FIRE)
+ if (mobj->flags & MF_NOCLIPHEIGHT || (mobj->z > mobj->floorz && mobj->z + mobj->height < mobj->ceilingz))
correctionType = 1; // Correct Z position by centering
else if (mobj->eflags & MFE_VERTICALFLIP)
correctionType = 2; // Correct Z position by moving down
@@ -7117,10 +7083,6 @@ static void P_MobjScaleThink(mobj_t *mobj)
/// \todo Lua hook for "reached destscale"?
switch (mobj->type)
{
- case MT_EGGMOBILE_FIRE:
- mobj->destscale = FRACUNIT;
- mobj->scalespeed = FRACUNIT>>4;
- break;
default:
break;
}
@@ -8296,6 +8258,7 @@ static boolean P_MobjDeadThink(mobj_t *mobj)
// See Linedef Exec 457 (Track mobj angle to point)
static void P_TracerAngleThink(mobj_t *mobj)
{
+ angle_t looking;
angle_t ang;
if (!mobj->tracer)
@@ -8310,7 +8273,12 @@ static void P_TracerAngleThink(mobj_t *mobj)
// mobj->cvval - Allowable failure delay
// mobj->cvmem - Failure timer
- ang = mobj->angle - R_PointToAngle2(mobj->x, mobj->y, mobj->tracer->x, mobj->tracer->y);
+ if (mobj->player)
+ looking = ( mobj->player->cmd.angleturn << 16 );/* fixes CS_LMAOGALOG */
+ else
+ looking = mobj->angle;
+
+ ang = looking - R_PointToAngle2(mobj->x, mobj->y, mobj->tracer->x, mobj->tracer->y);
// \todo account for distance between mobj and tracer
// Because closer mobjs can be facing beyond the angle tolerance
@@ -10535,12 +10503,8 @@ mobj_t *P_SpawnMobj(fixed_t x, fixed_t y, fixed_t z, mobjtype_t type)
// Make sure scale matches destscale immediately when spawned
P_SetScale(mobj, mobj->destscale);
- mobj->floorz = mobj->subsector->sector->f_slope ?
- P_GetZAt(mobj->subsector->sector->f_slope, x, y) :
- mobj->subsector->sector->floorheight;
- mobj->ceilingz = mobj->subsector->sector->c_slope ?
- P_GetZAt(mobj->subsector->sector->c_slope, x, y) :
- mobj->subsector->sector->ceilingheight;
+ mobj->floorz = P_GetSectorFloorZAt (mobj->subsector->sector, x, y);
+ mobj->ceilingz = P_GetSectorCeilingZAt(mobj->subsector->sector, x, y);
mobj->floorrover = NULL;
mobj->ceilingrover = NULL;
@@ -10893,12 +10857,8 @@ static precipmobj_t *P_SpawnPrecipMobj(fixed_t x, fixed_t y, fixed_t z, mobjtype
// set subsector and/or block links
P_SetPrecipitationThingPosition(mobj);
- mobj->floorz = starting_floorz = mobj->subsector->sector->f_slope ?
- P_GetZAt(mobj->subsector->sector->f_slope, x, y) :
- mobj->subsector->sector->floorheight;
- mobj->ceilingz = mobj->subsector->sector->c_slope ?
- P_GetZAt(mobj->subsector->sector->c_slope, x, y) :
- mobj->subsector->sector->ceilingheight;
+ mobj->floorz = starting_floorz = P_GetSectorFloorZAt (mobj->subsector->sector, x, y);
+ mobj->ceilingz = P_GetSectorCeilingZAt(mobj->subsector->sector, x, y);
mobj->floorrover = NULL;
mobj->ceilingrover = NULL;
@@ -11533,12 +11493,8 @@ void P_MovePlayerToSpawn(INT32 playernum, mapthing_t *mthing)
// set Z height
sector = R_PointInSubsector(x, y)->sector;
- floor = sector->f_slope ?
- P_GetZAt(sector->f_slope, x, y) :
- sector->floorheight;
- ceiling = sector->c_slope ?
- P_GetZAt(sector->c_slope, x, y) :
- sector->ceilingheight;
+ floor = P_GetSectorFloorZAt (sector, x, y);
+ ceiling = P_GetSectorCeilingZAt(sector, x, y);
ceilingspawn = ceiling - mobjinfo[MT_PLAYER].height;
if (mthing)
@@ -11608,12 +11564,8 @@ void P_MovePlayerToStarpost(INT32 playernum)
P_SetThingPosition(mobj);
sector = R_PointInSubsector(mobj->x, mobj->y)->sector;
- floor = sector->f_slope ?
- P_GetZAt(sector->f_slope, mobj->x, mobj->y) :
- sector->floorheight;
- ceiling = sector->c_slope ?
- P_GetZAt(sector->c_slope, mobj->x, mobj->y) :
- sector->ceilingheight;
+ floor = P_GetSectorFloorZAt (sector, mobj->x, mobj->y);
+ ceiling = P_GetSectorCeilingZAt(sector, mobj->x, mobj->y);
z = p->starpostz << FRACBITS;
@@ -11662,11 +11614,9 @@ fixed_t P_GetMobjSpawnHeight(const mobjtype_t mobjtype, const fixed_t x, const f
// Establish height.
if (flip)
- return (ss->sector->c_slope ? P_GetZAt(ss->sector->c_slope, x, y) : ss->sector->ceilingheight)
- - offset - mobjinfo[mobjtype].height;
+ return P_GetSectorCeilingZAt(ss->sector, x, y) - offset - mobjinfo[mobjtype].height;
else
- return (ss->sector->f_slope ? P_GetZAt(ss->sector->f_slope, x, y) : ss->sector->floorheight)
- + offset;
+ return P_GetSectorFloorZAt(ss->sector, x, y) + offset;
}
fixed_t P_GetMapThingSpawnHeight(const mobjtype_t mobjtype, const mapthing_t* mthing, const fixed_t x, const fixed_t y)
@@ -12767,9 +12717,14 @@ static boolean P_SetupSpawnedMapThing(mapthing_t *mthing, mobj_t *mobj, boolean
mobj->threshold = min(mthing->extrainfo, 7);
break;
case MT_TUBEWAYPOINT:
- mobj->health = mthing->angle & 255;
- mobj->threshold = mthing->angle >> 8;
+ {
+ UINT8 sequence = mthing->angle >> 8;
+ UINT8 id = mthing->angle & 255;
+ mobj->health = id;
+ mobj->threshold = sequence;
+ P_AddWaypoint(sequence, id, mobj);
break;
+ }
case MT_IDEYAANCHOR:
mobj->health = mthing->extrainfo;
break;
diff --git a/src/p_polyobj.c b/src/p_polyobj.c
index 0431707ace69eaa9bd51d138c5bb691b8e3a2c9e..3b6195285bd2cea5cb36e7f380b0ef422ccb21d4 100644
--- a/src/p_polyobj.c
+++ b/src/p_polyobj.c
@@ -140,11 +140,6 @@ FUNCINLINE static ATTRINLINE void Polyobj_vecSub2(vertex_t *dst, vertex_t *v1, v
dst->y = v1->y - v2->y;
}
-//
-// P_PointInsidePolyobj
-//
-// Returns TRUE if the XY point is inside the polyobject
-//
boolean P_PointInsidePolyobj(polyobj_t *po, fixed_t x, fixed_t y)
{
size_t i;
@@ -158,11 +153,6 @@ boolean P_PointInsidePolyobj(polyobj_t *po, fixed_t x, fixed_t y)
return true;
}
-//
-// P_MobjTouchingPolyobj
-//
-// Returns TRUE if the mobj is touching the edge of a polyobject
-//
boolean P_MobjTouchingPolyobj(polyobj_t *po, mobj_t *mo)
{
fixed_t mbbox[4];
@@ -182,11 +172,6 @@ boolean P_MobjTouchingPolyobj(polyobj_t *po, mobj_t *mo)
return false;
}
-//
-// P_MobjInsidePolyobj
-//
-// Returns TRUE if the mobj is inside the polyobject
-//
boolean P_MobjInsidePolyobj(polyobj_t *po, mobj_t *mo)
{
fixed_t mbbox[4];
@@ -206,11 +191,6 @@ boolean P_MobjInsidePolyobj(polyobj_t *po, mobj_t *mo)
return true;
}
-//
-// P_BBoxInsidePolyobj
-//
-// Returns TRUE if the bbox is inside the polyobject
-//
boolean P_BBoxInsidePolyobj(polyobj_t *po, fixed_t *bbox)
{
size_t i;
@@ -224,55 +204,53 @@ boolean P_BBoxInsidePolyobj(polyobj_t *po, fixed_t *bbox)
return true;
}
-//
-// Polyobj_GetInfo
-//
// Finds the 'polyobject settings' linedef for a polyobject
// the polyobject's id should be set as its tag
-//
-void Polyobj_GetInfo(INT16 poid, INT32 *poflags, INT32 *parentID, INT32 *potrans)
+static void Polyobj_GetInfo(polyobj_t *po)
{
- INT32 i = P_FindSpecialLineFromTag(POLYINFO_SPECIALNUM, poid, -1);
+ INT32 i = P_FindSpecialLineFromTag(POLYINFO_SPECIALNUM, po->id, -1);
+
+ po->flags = POF_SOLID|POF_TESTHEIGHT|POF_RENDERSIDES;
if (i == -1)
return; // no extra settings to apply, let's leave it
- if (parentID)
- *parentID = lines[i].frontsector->special;
+ po->parent = lines[i].frontsector->special;
+ if (po->parent == po->id) // do not allow a self-reference
+ po->parent = -1;
+
+ po->translucency = (lines[i].flags & ML_DONTPEGTOP)
+ ? (sides[lines[i].sidenum[0]].textureoffset>>FRACBITS)
+ : ((lines[i].frontsector->floorheight>>FRACBITS) / 100);
- if (potrans)
- *potrans = (lines[i].frontsector->floorheight>>FRACBITS) / 100;
+ po->translucency = max(min(po->translucency, NUMTRANSMAPS), 0);
if (lines[i].flags & ML_EFFECT1)
- *poflags |= POF_ONESIDE;
+ po->flags |= POF_ONESIDE;
if (lines[i].flags & ML_EFFECT2)
- *poflags &= ~POF_SOLID;
+ po->flags &= ~POF_SOLID;
if (lines[i].flags & ML_EFFECT3)
- *poflags |= POF_PUSHABLESTOP;
+ po->flags |= POF_PUSHABLESTOP;
if (lines[i].flags & ML_EFFECT4)
- *poflags |= POF_RENDERPLANES;
+ po->flags |= POF_RENDERPLANES;
/*if (lines[i].flags & ML_EFFECT5)
- *poflags &= ~POF_CLIPPLANES;*/
+ po->flags &= ~POF_CLIPPLANES;*/
if (lines[i].flags & ML_NOCLIMB) // Has a linedef executor
- *poflags |= POF_LDEXEC;
+ po->flags |= POF_LDEXEC;
}
// Reallocating array maintenance
-//
-// Polyobj_addVertex
-//
// Adds a vertex to a polyobject's reallocating vertex arrays, provided
// that such a vertex isn't already in the array. Each vertex must only
// be translated once during polyobject movement. Keeping track of them
// this way results in much more clear and efficient code than what
// Hexen used.
-//
static void Polyobj_addVertex(polyobj_t *po, vertex_t *v)
{
size_t i;
@@ -308,14 +286,10 @@ static void Polyobj_addVertex(polyobj_t *po, vertex_t *v)
po->numVertices++;
}
-//
-// Polyobj_addLine
-//
// Adds a linedef to a polyobject's reallocating linedefs array, provided
// that such a linedef isn't already in the array. Each linedef must only
// be adjusted once during polyobject movement. Keeping track of them
// this way provides the same benefits as for vertices.
-//
static void Polyobj_addLine(polyobj_t *po, line_t *l)
{
size_t i;
@@ -340,14 +314,10 @@ static void Polyobj_addLine(polyobj_t *po, line_t *l)
po->lines[po->numLines++] = l;
}
-//
-// Polyobj_addSeg
-//
// Adds a single seg to a polyobject's reallocating seg pointer array.
// Most polyobjects will have between 4 and 16 segs, so the array size
// begins much smaller than usual. Calls Polyobj_addVertex and Polyobj_addLine
// to add those respective structures for this seg, as well.
-//
static void Polyobj_addSeg(polyobj_t *po, seg_t *seg)
{
if (po->segCount >= po->numSegsAlloc)
@@ -373,14 +343,10 @@ static void Polyobj_addSeg(polyobj_t *po, seg_t *seg)
// Seg-finding functions
-//
-// Polyobj_findSegs
-//
// This method adds segs to a polyobject by following segs from vertex to
// vertex. The process stops when the original starting point is reached
// or if a particular search ends unexpectedly (ie, the polyobject is not
// closed).
-//
static void Polyobj_findSegs(polyobj_t *po, seg_t *seg)
{
fixed_t startx, starty;
@@ -394,25 +360,29 @@ static void Polyobj_findSegs(polyobj_t *po, seg_t *seg)
// Find backfacings
for (s = 0; s < numsegs; s++)
{
+ size_t r;
+
if (segs[s].glseg)
continue;
- if (segs[s].linedef == seg->linedef
- && segs[s].side == 1)
- {
- size_t r;
- for (r = 0; r < po->segCount; r++)
- {
- if (po->segs[r] == &segs[s])
- break;
- }
- if (r != po->segCount)
- continue;
+ if (segs[s].linedef != seg->linedef)
+ continue;
- segs[s].dontrenderme = true;
+ if (segs[s].side != 1)
+ continue;
- Polyobj_addSeg(po, &segs[s]);
+ for (r = 0; r < po->segCount; r++)
+ {
+ if (po->segs[r] == &segs[s])
+ break;
}
+
+ if (r != po->segCount)
+ continue;
+
+ segs[s].dontrenderme = true;
+
+ Polyobj_addSeg(po, &segs[s]);
}
}
@@ -432,56 +402,60 @@ newseg:
// seg's ending vertex.
for (i = 0; i < numsegs; ++i)
{
+ size_t q;
+
if (segs[i].glseg)
continue;
if (segs[i].side != 0) // needs to be frontfacing
continue;
- if (segs[i].v1->x == seg->v2->x && segs[i].v1->y == seg->v2->y)
+ if (segs[i].v1->x != seg->v2->x)
+ continue;
+ if (segs[i].v1->y != seg->v2->y)
+ continue;
+
+ // Make sure you didn't already add this seg...
+ for (q = 0; q < po->segCount; q++)
{
- // Make sure you didn't already add this seg...
- size_t q;
- for (q = 0; q < po->segCount; q++)
- {
- if (po->segs[q] == &segs[i])
- break;
- }
+ if (po->segs[q] == &segs[i])
+ break;
+ }
- if (q != po->segCount)
- continue;
+ if (q != po->segCount)
+ continue;
- // add the new seg and recurse
- Polyobj_addSeg(po, &segs[i]);
- seg = &segs[i];
+ // add the new seg and recurse
+ Polyobj_addSeg(po, &segs[i]);
+ seg = &segs[i];
- if (!(po->flags & POF_ONESIDE))
+ if (!(po->flags & POF_ONESIDE))
+ {
+ // Find backfacings
+ for (q = 0; q < numsegs; q++)
{
- // Find backfacings
- for (q = 0; q < numsegs; q++)
- {
- if (segs[q].glseg)
- continue;
+ size_t r;
- if (segs[q].linedef == segs[i].linedef
- && segs[q].side == 1)
- {
- size_t r;
- for (r=0; r < po->segCount; r++)
- {
- if (po->segs[r] == &segs[q])
- break;
- }
-
- if (r != po->segCount)
- continue;
-
- segs[q].dontrenderme = true;
- Polyobj_addSeg(po, &segs[q]);
- }
+ if (segs[q].glseg)
+ continue;
+ if (segs[q].linedef != segs[i].linedef)
+ continue;
+ if (segs[q].side != 1)
+ continue;
+
+ for (r = 0; r < po->segCount; r++)
+ {
+ if (po->segs[r] == &segs[q])
+ break;
}
- }
- goto newseg;
+ if (r != po->segCount)
+ continue;
+
+ segs[q].dontrenderme = true;
+ Polyobj_addSeg(po, &segs[q]);
+ }
}
+
+ goto newseg;
}
// error: if we reach here, the seg search never found another seg to
@@ -490,91 +464,8 @@ newseg:
CONS_Debug(DBG_POLYOBJ, "Polyobject %d is not closed\n", po->id);
}
-/*
-// structure used to store segs during explicit search process
-typedef struct segitem_s
-{
- seg_t *seg;
- INT32 num;
-} segitem_t;
-
-//
-// Polyobj_segCompare
-//
-// Callback for qsort that compares two segitems.
-//
-static int Polyobj_segCompare(const void *s1, const void *s2)
-{
- const segitem_t *si1 = s1;
- const segitem_t *si2 = s2;
-
- return si2->num - si1->num;
-}
-
-//
-// Polyobj_findExplicit
-//
-// Searches for segs to put into a polyobject in an explicitly provided order.
-//
-static void Polyobj_findExplicit(polyobj_t *po)
-{
- // temporary dynamic seg array
- segitem_t *segitems = NULL;
- size_t numSegItems = 0;
- size_t numSegItemsAlloc = 0;
-
- size_t i;
-
- // first loop: save off all segs with polyobject's id number
- for (i = 0; i < numsegs; ++i)
- {
- INT32 polyID, parentID;
-
- if (segs[i].linedef->special != POLYOBJ_EXPLICIT_LINE)
- continue;
-
- Polyobj_GetInfo(segs[i].linedef->tag, &polyID, &parentID, NULL);
-
- if (polyID == po->id && parentID > 0)
- {
- if (numSegItems >= numSegItemsAlloc)
- {
- numSegItemsAlloc = numSegItemsAlloc ? numSegItemsAlloc*2 : 4;
- segitems = Z_Realloc(segitems, numSegItemsAlloc*sizeof(segitem_t), PU_STATIC, NULL);
- }
- segitems[numSegItems].seg = &segs[i];
- segitems[numSegItems].num = parentID;
- ++numSegItems;
- }
- }
-
- // make sure array isn't empty
- if (numSegItems == 0)
- {
- po->isBad = true;
- CONS_Debug(DBG_POLYOBJ, "Polyobject %d is empty\n", po->id);
- return;
- }
-
- // sort the array if necessary
- if (numSegItems >= 2)
- qsort(segitems, numSegItems, sizeof(segitem_t), Polyobj_segCompare);
-
- // second loop: put the sorted segs into the polyobject
- for (i = 0; i < numSegItems; ++i)
- Polyobj_addSeg(po, segitems[i].seg);
-
- // free the temporary array
- Z_Free(segitems);
-}*/
-
// Setup functions
-//
-// Polyobj_spawnPolyObj
-//
-// Sets up a Polyobject.
-//
static void Polyobj_spawnPolyObj(INT32 num, mobj_t *spawnSpot, INT32 id)
{
size_t i;
@@ -598,14 +489,12 @@ static void Polyobj_spawnPolyObj(INT32 num, mobj_t *spawnSpot, INT32 id)
po->thrust = FRACUNIT;
po->spawnflags = po->flags = 0;
- // 1. Search segs for "line start" special with tag matching this
- // polyobject's id number. If found, iterate through segs which
- // share common vertices and record them into the polyobject.
+ // Search segs for "line start" special with tag matching this
+ // polyobject's id number. If found, iterate through segs which
+ // share common vertices and record them into the polyobject.
for (i = 0; i < numsegs; ++i)
{
seg_t *seg = &segs[i];
- INT32 poflags = POF_SOLID|POF_TESTHEIGHT|POF_RENDERSIDES;
- INT32 parentID = 0, potrans = 0;
if (seg->glseg)
continue;
@@ -619,17 +508,13 @@ static void Polyobj_spawnPolyObj(INT32 num, mobj_t *spawnSpot, INT32 id)
if (seg->linedef->tag != po->id)
continue;
- Polyobj_GetInfo(po->id, &poflags, &parentID, &potrans); // apply extra settings if they exist!
+ Polyobj_GetInfo(po); // apply extra settings if they exist!
// save original flags and translucency to reference later for netgames!
- po->spawnflags = po->flags = poflags;
- po->spawntrans = po->translucency = potrans;
+ po->spawnflags = po->flags;
+ po->spawntrans = po->translucency;
Polyobj_findSegs(po, seg);
- po->parent = parentID;
- if (po->parent == po->id) // do not allow a self-reference
- po->parent = -1;
- // TODO: sound sequence is in args[2]
break;
}
@@ -639,29 +524,7 @@ static void Polyobj_spawnPolyObj(INT32 num, mobj_t *spawnSpot, INT32 id)
if (po->isBad)
return;
- /*
- // 2. If no such line existed in the first step, look for a seg with the
- // "explicit" special with tag matching this polyobject's id number. If
- // found, continue to search for all such lines, storing them in a
- // temporary list of segs which is then copied into the polyobject in
- // sorted order.
- if (po->segCount == 0)
- {
- UINT16 parent;
- Polyobj_findExplicit(po);
- // if an error occurred above, quit processing this object
- if (po->isBad)
- return;
-
- Polyobj_GetInfo(po->segs[0]->linedef->tag, NULL, NULL, &parent);
- po->parent = parent;
- if (po->parent == po->id) // do not allow a self-reference
- po->parent = -1;
- // TODO: sound sequence is in args[3]
- }*/
-
// make sure array isn't empty
- // since Polyobj_findExplicit is disabled currently, we have to do things here instead now!
if (po->segCount == 0)
{
po->isBad = true;
@@ -690,12 +553,8 @@ static void Polyobj_spawnPolyObj(INT32 num, mobj_t *spawnSpot, INT32 id)
static void Polyobj_attachToSubsec(polyobj_t *po);
-//
-// Polyobj_moveToSpawnSpot
-//
// Translates the polyobject's vertices with respect to the difference between
// the anchor and spawn spots. Updates linedef bounding boxes as well.
-//
static void Polyobj_moveToSpawnSpot(mapthing_t *anchor)
{
polyobj_t *po;
@@ -742,11 +601,7 @@ static void Polyobj_moveToSpawnSpot(mapthing_t *anchor)
Polyobj_attachToSubsec(po);
}
-//
-// Polyobj_attachToSubsec
-//
// Attaches a polyobject to its appropriate subsector.
-//
static void Polyobj_attachToSubsec(polyobj_t *po)
{
subsector_t *ss;
@@ -781,11 +636,7 @@ static void Polyobj_attachToSubsec(polyobj_t *po)
po->attached = true;
}
-//
-// Polyobj_removeFromSubsec
-//
// Removes a polyobject from the subsector to which it is attached.
-//
static void Polyobj_removeFromSubsec(polyobj_t *po)
{
if (po->attached)
@@ -797,11 +648,7 @@ static void Polyobj_removeFromSubsec(polyobj_t *po)
// Blockmap Functions
-//
-// Polyobj_getLink
-//
// Retrieves a polymaplink object from the free list or creates a new one.
-//
static polymaplink_t *Polyobj_getLink(void)
{
polymaplink_t *l;
@@ -820,11 +667,7 @@ static polymaplink_t *Polyobj_getLink(void)
return l;
}
-//
-// Polyobj_putLink
-//
// Puts a polymaplink object into the free list.
-//
static void Polyobj_putLink(polymaplink_t *l)
{
memset(l, 0, sizeof(*l));
@@ -832,14 +675,10 @@ static void Polyobj_putLink(polymaplink_t *l)
bmap_freelist = l;
}
-//
-// Polyobj_linkToBlockmap
-//
// Inserts a polyobject into the polyobject blockmap. Unlike, mobj_t's,
// polyobjects need to be linked into every blockmap cell which their
// bounding box intersects. This ensures the accurate level of clipping
// which is present with linedefs but absent from most mobj interactions.
-//
static void Polyobj_linkToBlockmap(polyobj_t *po)
{
fixed_t *blockbox = po->blockbox;
@@ -884,12 +723,8 @@ static void Polyobj_linkToBlockmap(polyobj_t *po)
po->linked = true;
}
-//
-// Polyobj_removeFromBlockmap
-//
// Unlinks a polyobject from all blockmap cells it intersects and returns
// its polymaplink objects to the free list.
-//
static void Polyobj_removeFromBlockmap(polyobj_t *po)
{
polymaplink_t *rover;
@@ -928,13 +763,9 @@ static void Polyobj_removeFromBlockmap(polyobj_t *po)
// Movement functions
-//
-// Polyobj_untouched
-//
// A version of Lee's routine from p_maputl.c that accepts an mobj pointer
// argument instead of using tmthing. Returns true if the line isn't contacted
// and false otherwise.
-//
static inline boolean Polyobj_untouched(line_t *ld, mobj_t *mo)
{
fixed_t x, y, ptmbbox[4];
@@ -947,13 +778,9 @@ static inline boolean Polyobj_untouched(line_t *ld, mobj_t *mo)
P_BoxOnLineSide(ptmbbox, ld) != -1;
}
-//
-// Polyobj_pushThing
-//
// Inflicts thrust and possibly damage on a thing which has been found to be
// blocking the motion of a polyobject. The default thrust amount is only one
// unit, but the motion of the polyobject can be used to change this.
-//
static void Polyobj_pushThing(polyobj_t *po, line_t *line, mobj_t *mo)
{
angle_t lineangle;
@@ -988,11 +815,7 @@ static void Polyobj_pushThing(polyobj_t *po, line_t *line, mobj_t *mo)
}
}
-//
-// Polyobj_slideThing
-//
// Moves an object resting on top of a polyobject by (x, y). Template function to make alteration easier.
-//
static void Polyobj_slideThing(mobj_t *mo, fixed_t dx, fixed_t dy)
{
if (mo->player) { // Finally this doesn't suck eggs -fickle
@@ -1040,11 +863,7 @@ static void Polyobj_slideThing(mobj_t *mo, fixed_t dx, fixed_t dy)
P_TryMove(mo, mo->x+dx, mo->y+dy, true);
}
-//
-// Polyobj_carryThings
-//
// Causes objects resting on top of the polyobject to 'ride' with its movement.
-//
static void Polyobj_carryThings(polyobj_t *po, fixed_t dx, fixed_t dy)
{
static INT32 pomovecount = 0;
@@ -1096,12 +915,8 @@ static void Polyobj_carryThings(polyobj_t *po, fixed_t dx, fixed_t dy)
}
}
-//
-// Polyobj_clipThings
-//
// Checks for things that are in the way of a polyobject line move.
// Returns true if something was hit.
-//
static INT32 Polyobj_clipThings(polyobj_t *po, line_t *line)
{
INT32 hitflags = 0;
@@ -1163,11 +978,8 @@ static INT32 Polyobj_clipThings(polyobj_t *po, line_t *line)
return hitflags;
}
-//
-// Polyobj_moveXY
-//
+
// Moves a polyobject on the x-y plane.
-//
static boolean Polyobj_moveXY(polyobj_t *po, fixed_t x, fixed_t y, boolean checkmobjs)
{
size_t i;
@@ -1223,14 +1035,10 @@ static boolean Polyobj_moveXY(polyobj_t *po, fixed_t x, fixed_t y, boolean check
return !(hitflags & 2);
}
-//
-// Polyobj_rotatePoint
-//
// Rotates a point and then translates it relative to point c.
// The formula for this can be found here:
// http://www.inversereality.org/tutorials/graphics%20programming/2dtransformations.html
// It is, of course, just a vector-matrix multiplication.
-//
static inline void Polyobj_rotatePoint(vertex_t *v, const vertex_t *c, angle_t ang)
{
vertex_t tmp = *v;
@@ -1242,12 +1050,8 @@ static inline void Polyobj_rotatePoint(vertex_t *v, const vertex_t *c, angle_t a
v->y += c->y;
}
-//
-// Polyobj_rotateLine
-//
// Taken from P_LoadLineDefs; simply updates the linedef's dx, dy, slopetype,
// and bounding box to be consistent with its vertices.
-//
static void Polyobj_rotateLine(line_t *ld)
{
vertex_t *v1, *v2;
@@ -1287,11 +1091,7 @@ static void Polyobj_rotateLine(line_t *ld)
}
}
-//
-// Polyobj_rotateThings
-//
// Causes objects resting on top of the rotating polyobject to 'ride' with its movement.
-//
static void Polyobj_rotateThings(polyobj_t *po, vertex_t origin, angle_t delta, UINT8 turnthings)
{
static INT32 pomovecount = 10000;
@@ -1367,11 +1167,7 @@ static void Polyobj_rotateThings(polyobj_t *po, vertex_t origin, angle_t delta,
}
}
-//
-// Polyobj_rotate
-//
// Rotates a polyobject around its start point.
-//
static boolean Polyobj_rotate(polyobj_t *po, angle_t delta, UINT8 turnthings, boolean checkmobjs)
{
size_t i;
@@ -1445,12 +1241,8 @@ static boolean Polyobj_rotate(polyobj_t *po, angle_t delta, UINT8 turnthings, bo
// Global Functions
//
-//
-// Polyobj_GetForNum
-//
// Retrieves a polyobject by its numeric id using hashing.
// Returns NULL if no such polyobject exists.
-//
polyobj_t *Polyobj_GetForNum(INT32 id)
{
INT32 curidx = PolyObjects[id % numPolyObjects].first;
@@ -1461,12 +1253,9 @@ polyobj_t *Polyobj_GetForNum(INT32 id)
return curidx == numPolyObjects ? NULL : &PolyObjects[curidx];
}
-//
-// Polyobj_GetParent
-//
+
// Retrieves the parenting polyobject if one exists. Returns NULL
// otherwise.
-//
#if 0 //unused function
static polyobj_t *Polyobj_GetParent(polyobj_t *po)
{
@@ -1474,12 +1263,8 @@ static polyobj_t *Polyobj_GetParent(polyobj_t *po)
}
#endif
-//
-// Polyobj_GetChild
-//
// Iteratively retrieves the children POs of a parent,
// sorta like P_FindSectorSpecialFromTag.
-//
static polyobj_t *Polyobj_GetChild(polyobj_t *po, INT32 *start)
{
for (; *start < numPolyObjects; (*start)++)
@@ -1498,12 +1283,8 @@ typedef struct mobjqitem_s
mobj_t *mo;
} mobjqitem_t;
-//
-// Polyobj_InitLevel
-//
// Called at the beginning of each map after all other line and thing
// processing is finished.
-//
void Polyobj_InitLevel(void)
{
thinker_t *th;
@@ -1622,9 +1403,6 @@ void Polyobj_InitLevel(void)
M_QueueFree(&anchorqueue);
}
-//
-// Polyobj_MoveOnLoad
-//
// Called when a savegame is being loaded. Rotates and translates an
// existing polyobject to its position when the game was saved.
//
@@ -1649,11 +1427,7 @@ void Polyobj_MoveOnLoad(polyobj_t *po, angle_t angle, fixed_t x, fixed_t y)
// Thinker Functions
-//
-// T_PolyObjRotate
-//
// Thinker function for PolyObject rotation.
-//
void T_PolyObjRotate(polyrotate_t *th)
{
polyobj_t *po = Polyobj_GetForNum(th->polyObjNum);
@@ -1714,11 +1488,7 @@ void T_PolyObjRotate(polyrotate_t *th)
}
}
-//
-// Polyobj_componentSpeed
-//
// Calculates the speed components from the desired resultant velocity.
-//
FUNCINLINE static ATTRINLINE void Polyobj_componentSpeed(INT32 resVel, INT32 angle,
fixed_t *xVel, fixed_t *yVel)
{
@@ -1799,22 +1569,39 @@ void T_PolyObjMove(polymove_t *th)
}
}
-//
-// T_PolyObjWaypoint
-//
-// Kinda like 'Zoom Tubes for PolyObjects'
-//
+static void T_MovePolyObj(polyobj_t *po, fixed_t distx, fixed_t disty, fixed_t distz)
+{
+ polyobj_t *child;
+ INT32 start;
+
+ Polyobj_moveXY(po, distx, disty, true);
+ // TODO: use T_MovePlane
+ po->lines[0]->backsector->floorheight += distz;
+ po->lines[0]->backsector->ceilingheight += distz;
+ // Sal: Remember to check your sectors!
+ // Monster Iestyn: we only need to bother with the back sector, now that P_CheckSector automatically checks the blockmap
+ // updating objects in the front one too just added teleporting to ground bugs
+ P_CheckSector(po->lines[0]->backsector, (boolean)(po->damage));
+ // Apply action to mirroring polyobjects as well
+ start = 0;
+ while ((child = Polyobj_GetChild(po, &start)))
+ {
+ if (child->isBad)
+ continue;
+
+ Polyobj_moveXY(child, distx, disty, true);
+ // TODO: use T_MovePlane
+ child->lines[0]->backsector->floorheight += distz;
+ child->lines[0]->backsector->ceilingheight += distz;
+ P_CheckSector(child->lines[0]->backsector, (boolean)(child->damage));
+ }
+}
+
void T_PolyObjWaypoint(polywaypoint_t *th)
{
- mobj_t *mo2;
mobj_t *target = NULL;
- mobj_t *waypoint = NULL;
- thinker_t *wp;
- fixed_t adjustx, adjusty, adjustz;
- fixed_t momx, momy, momz, dist;
- INT32 start;
polyobj_t *po = Polyobj_GetForNum(th->polyObjNum);
- polyobj_t *oldpo = po;
+ fixed_t speed = th->speed;
if (!po)
#ifdef RANGECHECK
@@ -1828,31 +1615,10 @@ void T_PolyObjWaypoint(polywaypoint_t *th)
#endif
// check for displacement due to override and reattach when possible
- if (po->thinker == NULL)
+ if (!po->thinker)
po->thinker = &th->thinker;
-/*
- // Find out target first.
- // We redo this each tic to make savegame compatibility easier.
- for (wp = thlist[THINK_MOBJ].next; wp != &thlist[THINK_MOBJ]; wp = wp->next)
- {
- if (wp->function.acp1 == (actionf_p1)P_RemoveThinkerDelayed)
- continue;
-
- mo2 = (mobj_t *)wp;
-
- if (mo2->type != MT_TUBEWAYPOINT)
- continue;
-
- if (mo2->threshold == th->sequence && mo2->health == th->pointnum)
- {
- target = mo2;
- break;
- }
- }
-*/
-
- target = th->target;
+ target = waypoints[th->sequence][th->pointnum];
if (!target)
{
@@ -1860,240 +1626,93 @@ void T_PolyObjWaypoint(polywaypoint_t *th)
return;
}
- // Compensate for position offset
- adjustx = po->centerPt.x + th->diffx;
- adjusty = po->centerPt.y + th->diffy;
- adjustz = po->lines[0]->backsector->floorheight + (po->lines[0]->backsector->ceilingheight - po->lines[0]->backsector->floorheight)/2 + th->diffz;
-
- dist = P_AproxDistance(P_AproxDistance(target->x - adjustx, target->y - adjusty), target->z - adjustz);
+ // Move along the waypoint sequence until speed for the current tic is exhausted
+ while (speed > 0)
+ {
+ mobj_t *waypoint = NULL;
+ fixed_t pox, poy, poz;
+ fixed_t distx, disty, distz, dist;
- if (dist < 1)
- dist = 1;
+ // Current position of polyobject
+ pox = po->centerPt.x;
+ poy = po->centerPt.y;
+ poz = (po->lines[0]->backsector->floorheight + po->lines[0]->backsector->ceilingheight)/2;
- momx = FixedMul(FixedDiv(target->x - adjustx, dist), (th->speed));
- momy = FixedMul(FixedDiv(target->y - adjusty, dist), (th->speed));
- momz = FixedMul(FixedDiv(target->z - adjustz, dist), (th->speed));
+ // Calculate the distance between the polyobject and the waypoint
+ distx = target->x - pox;
+ disty = target->y - poy;
+ distz = target->z - poz;
+ dist = P_AproxDistance(P_AproxDistance(distx, disty), distz);
- // Calculate the distance between the polyobject and the waypoint
- // 'dist' already equals this.
+ if (dist < 1)
+ dist = 1;
- // Will the polyobject be FURTHER away if the momx/momy/momz is added to
- // its current coordinates, or closer? (shift down to fracunits to avoid approximation errors)
- if (dist>>FRACBITS <= P_AproxDistance(P_AproxDistance(target->x - adjustx - momx, target->y - adjusty - momy), target->z - adjustz - momz)>>FRACBITS)
- {
- // If further away, set XYZ of polyobject to waypoint location
- fixed_t amtx, amty, amtz;
- fixed_t diffz;
- amtx = (target->x - th->diffx) - po->centerPt.x;
- amty = (target->y - th->diffy) - po->centerPt.y;
- Polyobj_moveXY(po, amtx, amty, true);
- // TODO: use T_MovePlane
- amtz = (po->lines[0]->backsector->ceilingheight - po->lines[0]->backsector->floorheight)/2;
- diffz = po->lines[0]->backsector->floorheight - (target->z - amtz);
- po->lines[0]->backsector->floorheight = target->z - amtz;
- po->lines[0]->backsector->ceilingheight = target->z + amtz;
- // Sal: Remember to check your sectors!
- // Monster Iestyn: we only need to bother with the back sector, now that P_CheckSector automatically checks the blockmap
- // updating objects in the front one too just added teleporting to ground bugs
- P_CheckSector(po->lines[0]->backsector, (boolean)(po->damage));
- // Apply action to mirroring polyobjects as well
- start = 0;
- while ((po = Polyobj_GetChild(oldpo, &start)))
+ // Will the polyobject overshoot its target?
+ if (speed < dist)
{
- if (po->isBad)
- continue;
+ // No. Move towards waypoint
+ fixed_t momx, momy, momz;
- Polyobj_moveXY(po, amtx, amty, true);
- // TODO: use T_MovePlane
- po->lines[0]->backsector->floorheight += diffz; // move up/down by same amount as the parent did
- po->lines[0]->backsector->ceilingheight += diffz;
- // Sal: Remember to check your sectors!
- // Monster Iestyn: we only need to bother with the back sector, now that P_CheckSector automatically checks the blockmap
- // updating objects in the front one too just added teleporting to ground bugs
- P_CheckSector(po->lines[0]->backsector, (boolean)(po->damage));
+ momx = FixedMul(FixedDiv(target->x - pox, dist), speed);
+ momy = FixedMul(FixedDiv(target->y - poy, dist), speed);
+ momz = FixedMul(FixedDiv(target->z - poz, dist), speed);
+ T_MovePolyObj(po, momx, momy, momz);
+ return;
}
-
- po = oldpo;
-
- if (!th->stophere)
+ else
{
- CONS_Debug(DBG_POLYOBJ, "Looking for next waypoint...\n");
+ // Yes. Teleport to waypoint and look for the next one
+ T_MovePolyObj(po, distx, disty, distz);
- // Find next waypoint
- for (wp = thlist[THINK_MOBJ].next; wp != &thlist[THINK_MOBJ]; wp = wp->next)
+ if (!th->stophere)
{
- if (wp->function.acp1 == (actionf_p1)P_RemoveThinkerDelayed)
- continue;
-
- mo2 = (mobj_t *)wp;
+ CONS_Debug(DBG_POLYOBJ, "Looking for next waypoint...\n");
+ waypoint = (th->direction == -1) ? P_GetPreviousWaypoint(target, false) : P_GetNextWaypoint(target, false);
- if (mo2->type != MT_TUBEWAYPOINT)
- continue;
-
- if (mo2->threshold != th->sequence)
- continue;
-
- if (th->direction == -1)
- {
- if (mo2->health == target->health - 1)
- {
- waypoint = mo2;
- break;
- }
- }
- else
+ if (!waypoint && th->returnbehavior == PWR_WRAP) // If specified, wrap waypoints
{
- if (mo2->health == target->health + 1)
+ if (!th->continuous)
{
- waypoint = mo2;
- break;
+ th->returnbehavior = PWR_STOP;
+ th->stophere = true;
}
- }
- }
- if (!waypoint && th->wrap) // If specified, wrap waypoints
- {
- if (!th->continuous)
- {
- th->wrap = 0;
- th->stophere = true;
+ waypoint = (th->direction == -1) ? P_GetLastWaypoint(th->sequence) : P_GetFirstWaypoint(th->sequence);
}
-
- for (wp = thlist[THINK_MOBJ].next; wp != &thlist[THINK_MOBJ]; wp = wp->next)
+ else if (!waypoint && th->returnbehavior == PWR_COMEBACK) // Come back to the start
{
- if (wp->function.acp1 == (actionf_p1)P_RemoveThinkerDelayed)
- continue;
-
- mo2 = (mobj_t *)wp;
+ th->direction = -th->direction;
- if (mo2->type != MT_TUBEWAYPOINT)
- continue;
-
- if (mo2->threshold != th->sequence)
- continue;
+ if (!th->continuous)
+ th->returnbehavior = PWR_STOP;
- if (th->direction == -1)
- {
- if (waypoint == NULL)
- waypoint = mo2;
- else if (mo2->health > waypoint->health)
- waypoint = mo2;
- }
- else
- {
- if (mo2->health == 0)
- {
- waypoint = mo2;
- break;
- }
- }
+ waypoint = (th->direction == -1) ? P_GetPreviousWaypoint(target, false) : P_GetNextWaypoint(target, false);
}
}
- else if (!waypoint && th->comeback) // Come back to the start
- {
- th->direction = -th->direction;
- if (!th->continuous)
- th->comeback = false;
-
- for (wp = thlist[THINK_MOBJ].next; wp != &thlist[THINK_MOBJ]; wp = wp->next)
- {
- if (wp->function.acp1 == (actionf_p1)P_RemoveThinkerDelayed)
- continue;
-
- mo2 = (mobj_t *)wp;
+ if (waypoint)
+ {
+ CONS_Debug(DBG_POLYOBJ, "Found waypoint (sequence %d, number %d).\n", waypoint->threshold, waypoint->health);
- if (mo2->type != MT_TUBEWAYPOINT)
- continue;
+ target = waypoint;
+ th->pointnum = target->health;
- if (mo2->threshold != th->sequence)
- continue;
-
- if (th->direction == -1)
- {
- if (mo2->health == target->health - 1)
- {
- waypoint = mo2;
- break;
- }
- }
- else
- {
- if (mo2->health == target->health + 1)
- {
- waypoint = mo2;
- break;
- }
- }
- }
+ // Calculate remaining speed
+ speed -= dist;
}
- }
-
- if (waypoint)
- {
- CONS_Debug(DBG_POLYOBJ, "Found waypoint (sequence %d, number %d).\n", waypoint->threshold, waypoint->health);
-
- target = waypoint;
- th->pointnum = target->health;
- // Set the mobj as your target! -- Monster Iestyn 27/12/19
- P_SetTarget(&th->target, target);
-
- // calculate MOMX/MOMY/MOMZ for next waypoint
- // change slope
- dist = P_AproxDistance(P_AproxDistance(target->x - adjustx, target->y - adjusty), target->z - adjustz);
-
- if (dist < 1)
- dist = 1;
-
- momx = FixedMul(FixedDiv(target->x - adjustx, dist), (th->speed));
- momy = FixedMul(FixedDiv(target->y - adjusty, dist), (th->speed));
- momz = FixedMul(FixedDiv(target->z - adjustz, dist), (th->speed));
- }
- else
- {
- momx = momy = momz = 0;
-
- if (!th->stophere)
- CONS_Debug(DBG_POLYOBJ, "Next waypoint not found!\n");
+ else
+ {
+ if (!th->stophere)
+ CONS_Debug(DBG_POLYOBJ, "Next waypoint not found!\n");
- if (po->thinker == &th->thinker)
- po->thinker = NULL;
+ if (po->thinker == &th->thinker)
+ po->thinker = NULL;
- P_RemoveThinker(&th->thinker);
- return;
+ P_RemoveThinker(&th->thinker);
+ return;
+ }
}
}
- else
- {
- // momx/momy/momz already equals the right speed
- }
-
- // Move the polyobject
- Polyobj_moveXY(po, momx, momy, true);
- // TODO: use T_MovePlane
- po->lines[0]->backsector->floorheight += momz;
- po->lines[0]->backsector->ceilingheight += momz;
- // Sal: Remember to check your sectors!
- // Monster Iestyn: we only need to bother with the back sector, now that P_CheckSector automatically checks the blockmap
- // updating objects in the front one too just added teleporting to ground bugs
- P_CheckSector(po->lines[0]->backsector, (boolean)(po->damage));
-
- // Apply action to mirroring polyobjects as well
- start = 0;
- while ((po = Polyobj_GetChild(oldpo, &start)))
- {
- if (po->isBad)
- continue;
-
- Polyobj_moveXY(po, momx, momy, true);
- // TODO: use T_MovePlane
- po->lines[0]->backsector->floorheight += momz;
- po->lines[0]->backsector->ceilingheight += momz;
- // Sal: Remember to check your sectors!
- // Monster Iestyn: we only need to bother with the back sector, now that P_CheckSector automatically checks the blockmap
- // updating objects in the front one too just added teleporting to ground bugs
- P_CheckSector(po->lines[0]->backsector, (boolean)(po->damage));
- }
}
void T_PolyDoorSlide(polyslidedoor_t *th)
@@ -2297,7 +1916,7 @@ void T_PolyDoorSwing(polyswingdoor_t *th)
}
}
-// T_PolyObjDisplace: shift a polyobject based on a control sector's heights.
+// Shift a polyobject based on a control sector's heights.
void T_PolyObjDisplace(polydisplace_t *th)
{
polyobj_t *po = Polyobj_GetForNum(th->polyObjNum);
@@ -2337,7 +1956,7 @@ void T_PolyObjDisplace(polydisplace_t *th)
th->oldHeights = newheights;
}
-// T_PolyObjRotDisplace: rotate a polyobject based on a control sector's heights.
+// Rotate a polyobject based on a control sector's heights.
void T_PolyObjRotDisplace(polyrotdisplace_t *th)
{
polyobj_t *po = Polyobj_GetForNum(th->polyObjNum);
@@ -2383,7 +2002,7 @@ static inline INT32 Polyobj_AngSpeed(INT32 speed)
// Linedef Handlers
-INT32 EV_DoPolyObjRotate(polyrotdata_t *prdata)
+boolean EV_DoPolyObjRotate(polyrotdata_t *prdata)
{
polyobj_t *po;
polyobj_t *oldpo;
@@ -2393,16 +2012,16 @@ INT32 EV_DoPolyObjRotate(polyrotdata_t *prdata)
if (!(po = Polyobj_GetForNum(prdata->polyObjNum)))
{
CONS_Debug(DBG_POLYOBJ, "EV_DoPolyObjRotate: bad polyobj %d\n", prdata->polyObjNum);
- return 0;
+ return false;
}
// don't allow line actions to affect bad polyobjects
if (po->isBad)
- return 0;
+ return false;
// check for override if this polyobj already has a thinker
if (po->thinker && !prdata->overRide)
- return 0;
+ return false;
// create a new thinker
th = Z_Malloc(sizeof(polyrotate_t), PU_LEVSPEC, NULL);
@@ -2445,10 +2064,10 @@ INT32 EV_DoPolyObjRotate(polyrotdata_t *prdata)
}
// action was successful
- return 1;
+ return true;
}
-INT32 EV_DoPolyObjMove(polymovedata_t *pmdata)
+boolean EV_DoPolyObjMove(polymovedata_t *pmdata)
{
polyobj_t *po;
polyobj_t *oldpo;
@@ -2458,16 +2077,16 @@ INT32 EV_DoPolyObjMove(polymovedata_t *pmdata)
if (!(po = Polyobj_GetForNum(pmdata->polyObjNum)))
{
CONS_Debug(DBG_POLYOBJ, "EV_DoPolyObjMove: bad polyobj %d\n", pmdata->polyObjNum);
- return 0;
+ return false;
}
// don't allow line actions to affect bad polyobjects
if (po->isBad)
- return 0;
+ return false;
// check for override if this polyobj already has a thinker
if (po->thinker && !pmdata->overRide)
- return 0;
+ return false;
// create a new thinker
th = Z_Malloc(sizeof(polymove_t), PU_LEVSPEC, NULL);
@@ -2504,31 +2123,27 @@ INT32 EV_DoPolyObjMove(polymovedata_t *pmdata)
}
// action was successful
- return 1;
+ return true;
}
-INT32 EV_DoPolyObjWaypoint(polywaypointdata_t *pwdata)
+boolean EV_DoPolyObjWaypoint(polywaypointdata_t *pwdata)
{
polyobj_t *po;
polywaypoint_t *th;
- mobj_t *mo2;
mobj_t *first = NULL;
- mobj_t *last = NULL;
- mobj_t *target = NULL;
- thinker_t *wp;
if (!(po = Polyobj_GetForNum(pwdata->polyObjNum)))
{
CONS_Debug(DBG_POLYOBJ, "EV_DoPolyObjWaypoint: bad polyobj %d\n", pwdata->polyObjNum);
- return 0;
+ return false;
}
// don't allow line actions to affect bad polyobjects
if (po->isBad)
- return 0;
+ return false;
if (po->thinker) // Don't crowd out another thinker.
- return 0;
+ return false;
// create a new thinker
th = Z_Malloc(sizeof(polywaypoint_t), PU_LEVSPEC, NULL);
@@ -2539,137 +2154,36 @@ INT32 EV_DoPolyObjWaypoint(polywaypointdata_t *pwdata)
// set fields
th->polyObjNum = pwdata->polyObjNum;
th->speed = pwdata->speed;
- th->sequence = pwdata->sequence; // Used to specify sequence #
- if (pwdata->reverse)
- th->direction = -1;
- else
- th->direction = 1;
+ th->sequence = pwdata->sequence;
+ th->direction = (pwdata->flags & PWF_REVERSE) ? -1 : 1;
- th->comeback = pwdata->comeback;
- th->continuous = pwdata->continuous;
- th->wrap = pwdata->wrap;
+ th->returnbehavior = pwdata->returnbehavior;
+ if (pwdata->flags & PWF_LOOP)
+ th->continuous = true;
th->stophere = false;
// Find the first waypoint we need to use
- for (wp = thlist[THINK_MOBJ].next; wp != &thlist[THINK_MOBJ]; wp = wp->next)
- {
- if (wp->function.acp1 == (actionf_p1)P_RemoveThinkerDelayed)
- continue;
-
- mo2 = (mobj_t *)wp;
-
- if (mo2->type != MT_TUBEWAYPOINT)
- continue;
-
- if (mo2->threshold != th->sequence)
- continue;
-
- if (th->direction == -1) // highest waypoint #
- {
- if (mo2->health == 0)
- last = mo2;
- else
- {
- if (first == NULL)
- first = mo2;
- else if (mo2->health > first->health)
- first = mo2;
- }
- }
- else // waypoint 0
- {
- if (mo2->health == 0)
- first = mo2;
- else
- {
- if (last == NULL)
- last = mo2;
- else if (mo2->health > last->health)
- last = mo2;
- }
- }
- }
+ first = (th->direction == -1) ? P_GetLastWaypoint(th->sequence) : P_GetFirstWaypoint(th->sequence);
if (!first)
{
CONS_Debug(DBG_POLYOBJ, "EV_DoPolyObjWaypoint: Missing starting waypoint!\n");
po->thinker = NULL;
P_RemoveThinker(&th->thinker);
- return 0;
- }
-
- // Hotfix to not crash on single-waypoint sequences -Red
- if (!last)
- last = first;
-
- // Set diffx, diffy, diffz
- // Put these at 0 for now...might not be needed after all.
- th->diffx = 0;//first->x - po->centerPt.x;
- th->diffy = 0;//first->y - po->centerPt.y;
- th->diffz = 0;//first->z - (po->lines[0]->backsector->floorheight + (po->lines[0]->backsector->ceilingheight - po->lines[0]->backsector->floorheight)/2);
-
- if (last->x == po->centerPt.x
- && last->y == po->centerPt.y
- && last->z == (po->lines[0]->backsector->floorheight + (po->lines[0]->backsector->ceilingheight - po->lines[0]->backsector->floorheight)/2))
- {
- // Already at the destination point...
- if (!th->wrap)
- {
- po->thinker = NULL;
- P_RemoveThinker(&th->thinker);
- }
+ return false;
}
- // Find the actual target movement waypoint
- target = first;
- /*for (wp = thlist[THINK_MOBJ].next; wp != &thlist[THINK_MOBJ]; wp = wp->next)
- {
- if (wp->function.acp1 == (actionf_p1)P_RemoveThinkerDelayed)
- continue;
-
- mo2 = (mobj_t *)wp;
-
- if (mo2->type != MT_TUBEWAYPOINT)
- continue;
-
- if (mo2->threshold != th->sequence)
- continue;
-
- if (th->direction == -1) // highest waypoint #
- {
- if (mo2->health == first->health - 1)
- {
- target = mo2;
- break;
- }
- }
- else // waypoint 0
- {
- if (mo2->health == first->health + 1)
- {
- target = mo2;
- break;
- }
- }
- }*/
-
- if (!target)
+ // Sanity check: If all waypoints are in the same location,
+ // don't allow the movement to be continuous so we don't get stuck in an infinite loop.
+ if (th->continuous && P_IsDegeneratedWaypointSequence(th->sequence))
{
- CONS_Debug(DBG_POLYOBJ, "EV_DoPolyObjWaypoint: Missing target waypoint!\n");
- po->thinker = NULL;
- P_RemoveThinker(&th->thinker);
- return 0;
+ CONS_Debug(DBG_POLYOBJ, "EV_DoPolyObjWaypoint: All waypoints are in the same location!\n");
+ th->continuous = false;
}
- // Set pointnum
- th->pointnum = target->health;
- th->target = NULL; // set to NULL first so the below doesn't go wrong
- // Set the mobj as your target! -- Monster Iestyn 27/12/19
- P_SetTarget(&th->target, target);
+ th->pointnum = first->health;
- // We don't deal with the mirror crap here, we'll
- // handle that in the T_Thinker function.
- return 1;
+ return true;
}
static void Polyobj_doSlideDoor(polyobj_t *po, polydoordata_t *doordata)
@@ -2761,20 +2275,20 @@ static void Polyobj_doSwingDoor(polyobj_t *po, polydoordata_t *doordata)
Polyobj_doSwingDoor(po, doordata);
}
-INT32 EV_DoPolyDoor(polydoordata_t *doordata)
+boolean EV_DoPolyDoor(polydoordata_t *doordata)
{
polyobj_t *po;
if (!(po = Polyobj_GetForNum(doordata->polyObjNum)))
{
CONS_Debug(DBG_POLYOBJ, "EV_DoPolyDoor: bad polyobj %d\n", doordata->polyObjNum);
- return 0;
+ return false;
}
// don't allow line actions to affect bad polyobjects;
// polyobject doors don't allow action overrides
if (po->isBad || po->thinker)
- return 0;
+ return false;
switch (doordata->doorType)
{
@@ -2786,13 +2300,13 @@ INT32 EV_DoPolyDoor(polydoordata_t *doordata)
break;
default:
CONS_Debug(DBG_POLYOBJ, "EV_DoPolyDoor: unknown door type %d", doordata->doorType);
- return 0;
+ return false;
}
- return 1;
+ return true;
}
-INT32 EV_DoPolyObjDisplace(polydisplacedata_t *prdata)
+boolean EV_DoPolyObjDisplace(polydisplacedata_t *prdata)
{
polyobj_t *po;
polyobj_t *oldpo;
@@ -2802,12 +2316,12 @@ INT32 EV_DoPolyObjDisplace(polydisplacedata_t *prdata)
if (!(po = Polyobj_GetForNum(prdata->polyObjNum)))
{
CONS_Debug(DBG_POLYOBJ, "EV_DoPolyObjRotate: bad polyobj %d\n", prdata->polyObjNum);
- return 0;
+ return false;
}
// don't allow line actions to affect bad polyobjects
if (po->isBad)
- return 0;
+ return false;
// create a new thinker
th = Z_Malloc(sizeof(polydisplace_t), PU_LEVSPEC, NULL);
@@ -2835,10 +2349,10 @@ INT32 EV_DoPolyObjDisplace(polydisplacedata_t *prdata)
}
// action was successful
- return 1;
+ return true;
}
-INT32 EV_DoPolyObjRotDisplace(polyrotdisplacedata_t *prdata)
+boolean EV_DoPolyObjRotDisplace(polyrotdisplacedata_t *prdata)
{
polyobj_t *po;
polyobj_t *oldpo;
@@ -2848,12 +2362,12 @@ INT32 EV_DoPolyObjRotDisplace(polyrotdisplacedata_t *prdata)
if (!(po = Polyobj_GetForNum(prdata->polyObjNum)))
{
CONS_Debug(DBG_POLYOBJ, "EV_DoPolyObjRotate: bad polyobj %d\n", prdata->polyObjNum);
- return 0;
+ return false;
}
// don't allow line actions to affect bad polyobjects
if (po->isBad)
- return 0;
+ return false;
// create a new thinker
th = Z_Malloc(sizeof(polyrotdisplace_t), PU_LEVSPEC, NULL);
@@ -2881,7 +2395,7 @@ INT32 EV_DoPolyObjRotDisplace(polyrotdisplacedata_t *prdata)
}
// action was successful
- return 1;
+ return true;
}
void T_PolyObjFlag(polymove_t *th)
@@ -2930,7 +2444,7 @@ void T_PolyObjFlag(polymove_t *th)
Polyobj_attachToSubsec(po); // relink to subsector
}
-INT32 EV_DoPolyObjFlag(line_t *pfdata)
+boolean EV_DoPolyObjFlag(polyflagdata_t *pfdata)
{
polyobj_t *po;
polyobj_t *oldpo;
@@ -2938,22 +2452,22 @@ INT32 EV_DoPolyObjFlag(line_t *pfdata)
size_t i;
INT32 start;
- if (!(po = Polyobj_GetForNum(pfdata->tag)))
+ if (!(po = Polyobj_GetForNum(pfdata->polyObjNum)))
{
- CONS_Debug(DBG_POLYOBJ, "EV_DoPolyFlag: bad polyobj %d\n", pfdata->tag);
- return 0;
+ CONS_Debug(DBG_POLYOBJ, "EV_DoPolyFlag: bad polyobj %d\n", pfdata->polyObjNum);
+ return false;
}
// don't allow line actions to affect bad polyobjects,
// polyobject doors don't allow action overrides
if (po->isBad || po->thinker)
- return 0;
+ return false;
// Must have even # of vertices
if (po->numVertices & 1)
{
CONS_Debug(DBG_POLYOBJ, "EV_DoPolyFlag: Polyobject has odd # of vertices!\n");
- return 0;
+ return false;
}
// create a new thinker
@@ -2963,11 +2477,11 @@ INT32 EV_DoPolyObjFlag(line_t *pfdata)
po->thinker = &th->thinker;
// set fields
- th->polyObjNum = pfdata->tag;
+ th->polyObjNum = pfdata->polyObjNum;
th->distance = 0;
- th->speed = P_AproxDistance(pfdata->dx, pfdata->dy)>>FRACBITS;
- th->angle = R_PointToAngle2(pfdata->v1->x, pfdata->v1->y, pfdata->v2->x, pfdata->v2->y)>>ANGLETOFINESHIFT;
- th->momx = sides[pfdata->sidenum[0]].textureoffset>>FRACBITS;
+ th->speed = pfdata->speed;
+ th->angle = pfdata->angle;
+ th->momx = pfdata->momx;
// save current positions
for (i = 0; i < po->numVertices; ++i)
@@ -2979,12 +2493,12 @@ INT32 EV_DoPolyObjFlag(line_t *pfdata)
start = 0;
while ((po = Polyobj_GetChild(oldpo, &start)))
{
- pfdata->tag = po->id;
+ pfdata->polyObjNum = po->id;
EV_DoPolyObjFlag(pfdata);
}
// action was successful
- return 1;
+ return true;
}
void T_PolyObjFade(polyfade_t *th)
@@ -3082,7 +2596,7 @@ void T_PolyObjFade(polyfade_t *th)
}
}
-INT32 EV_DoPolyObjFade(polyfadedata_t *pfdata)
+boolean EV_DoPolyObjFade(polyfadedata_t *pfdata)
{
polyobj_t *po;
polyobj_t *oldpo;
@@ -3092,16 +2606,16 @@ INT32 EV_DoPolyObjFade(polyfadedata_t *pfdata)
if (!(po = Polyobj_GetForNum(pfdata->polyObjNum)))
{
CONS_Debug(DBG_POLYOBJ, "EV_DoPolyObjFade: bad polyobj %d\n", pfdata->polyObjNum);
- return 0;
+ return false;
}
// don't allow line actions to affect bad polyobjects
if (po->isBad)
- return 0;
+ return false;
// already equal, nothing to do
if (po->translucency == pfdata->destvalue)
- return 1;
+ return true;
if (po->thinker && po->thinker->function.acp1 == (actionf_p1)T_PolyObjFade)
P_RemoveThinker(po->thinker);
@@ -3143,7 +2657,7 @@ INT32 EV_DoPolyObjFade(polyfadedata_t *pfdata)
}
// action was successful
- return 1;
+ return true;
}
// EOF
diff --git a/src/p_polyobj.h b/src/p_polyobj.h
index 7dfc90ce9d0fa444661a51e4f3c74dc237d2f9d0..8037c545f28877240893360018bf25e9a9027c8d 100644
--- a/src/p_polyobj.h
+++ b/src/p_polyobj.h
@@ -29,7 +29,6 @@
#define POLYOBJ_SPAWNCRUSH_DOOMEDNUM 762 // todo: REMOVE
#define POLYOBJ_START_LINE 20
-#define POLYOBJ_EXPLICIT_LINE 21
#define POLYINFO_SPECIALNUM 22
typedef enum
@@ -141,26 +140,26 @@ typedef struct polymove_s
UINT32 angle; // angle along which to move
} polymove_t;
+// PolyObject waypoint movement return behavior
+typedef enum
+{
+ PWR_STOP, // Stop after reaching last waypoint
+ PWR_WRAP, // Wrap back to first waypoint
+ PWR_COMEBACK, // Repeat sequence in reverse
+} polywaypointreturn_e;
+
typedef struct polywaypoint_s
{
thinker_t thinker; // must be first
- INT32 polyObjNum; // numeric id of polyobject
- INT32 speed; // resultant velocity
- INT32 sequence; // waypoint sequence #
- INT32 pointnum; // waypoint #
- INT32 direction; // 1 for normal, -1 for backwards
- UINT8 comeback; // reverses and comes back when the end is reached
- UINT8 wrap; // Wrap around waypoints
- UINT8 continuous; // continuously move - used with COMEBACK or WRAP
- UINT8 stophere; // Will stop after it reaches the next waypoint
-
- // Difference between location of PO and location of waypoint (offset)
- fixed_t diffx;
- fixed_t diffy;
- fixed_t diffz;
-
- mobj_t *target; // next waypoint mobj
+ INT32 polyObjNum; // numeric id of polyobject
+ INT32 speed; // resultant velocity
+ INT32 sequence; // waypoint sequence #
+ INT32 pointnum; // waypoint #
+ INT32 direction; // 1 for normal, -1 for backwards
+ UINT8 returnbehavior; // behavior after reaching the last waypoint
+ UINT8 continuous; // continuously move - used with PWR_WRAP or PWR_COMEBACK
+ UINT8 stophere; // Will stop after it reaches the next waypoint
} polywaypoint_t;
typedef struct polyslidedoor_s
@@ -255,15 +254,19 @@ typedef struct polymovedata_s
UINT8 overRide; // if true, will override any action on the object
} polymovedata_t;
+typedef enum
+{
+ PWF_REVERSE = 1, // Move through waypoints in reverse order
+ PWF_LOOP = 1<<1, // Loop movement (used with PWR_WRAP or PWR_COMEBACK)
+} polywaypointflags_e;
+
typedef struct polywaypointdata_s
{
- INT32 polyObjNum; // numeric id of polyobject to affect
- INT32 sequence; // waypoint sequence #
- fixed_t speed; // linear speed
- UINT8 reverse; // if true, will go in reverse waypoint order
- UINT8 comeback; // reverses and comes back when the end is reached
- UINT8 wrap; // Wrap around waypoints
- UINT8 continuous; // continuously move - used with COMEBACK or WRAP
+ INT32 polyObjNum; // numeric id of polyobject to affect
+ INT32 sequence; // waypoint sequence #
+ fixed_t speed; // linear speed
+ UINT8 returnbehavior; // behavior after reaching the last waypoint
+ UINT8 flags; // PWF_ flags
} polywaypointdata_t;
// polyobject door types
@@ -299,6 +302,14 @@ typedef struct polyrotdisplacedata_s
UINT8 turnobjs;
} polyrotdisplacedata_t;
+typedef struct polyflagdata_s
+{
+ INT32 polyObjNum;
+ INT32 speed;
+ UINT32 angle;
+ fixed_t momx;
+} polyflagdata_t;
+
typedef struct polyfadedata_s
{
INT32 polyObjNum;
@@ -320,7 +331,6 @@ boolean P_PointInsidePolyobj(polyobj_t *po, fixed_t x, fixed_t y);
boolean P_MobjTouchingPolyobj(polyobj_t *po, mobj_t *mo);
boolean P_MobjInsidePolyobj(polyobj_t *po, mobj_t *mo);
boolean P_BBoxInsidePolyobj(polyobj_t *po, fixed_t *bbox);
-void Polyobj_GetInfo(INT16 poid, INT32 *poflags, INT32 *parentID, INT32 *potrans);
// thinkers (needed in p_saveg.c)
void T_PolyObjRotate(polyrotate_t *);
@@ -333,14 +343,14 @@ void T_PolyObjRotDisplace (polyrotdisplace_t *);
void T_PolyObjFlag (polymove_t *);
void T_PolyObjFade (polyfade_t *);
-INT32 EV_DoPolyDoor(polydoordata_t *);
-INT32 EV_DoPolyObjMove(polymovedata_t *);
-INT32 EV_DoPolyObjWaypoint(polywaypointdata_t *);
-INT32 EV_DoPolyObjRotate(polyrotdata_t *);
-INT32 EV_DoPolyObjDisplace(polydisplacedata_t *);
-INT32 EV_DoPolyObjRotDisplace(polyrotdisplacedata_t *);
-INT32 EV_DoPolyObjFlag(struct line_s *);
-INT32 EV_DoPolyObjFade(polyfadedata_t *);
+boolean EV_DoPolyDoor(polydoordata_t *);
+boolean EV_DoPolyObjMove(polymovedata_t *);
+boolean EV_DoPolyObjWaypoint(polywaypointdata_t *);
+boolean EV_DoPolyObjRotate(polyrotdata_t *);
+boolean EV_DoPolyObjDisplace(polydisplacedata_t *);
+boolean EV_DoPolyObjRotDisplace(polyrotdisplacedata_t *);
+boolean EV_DoPolyObjFlag(polyflagdata_t *);
+boolean EV_DoPolyObjFade(polyfadedata_t *);
//
diff --git a/src/p_saveg.c b/src/p_saveg.c
index 34bd3724b7a4b6ceb7a908a669ce7de888c8ed1c..bec64ed35773e3082845084c1993faf16e101740 100644
--- a/src/p_saveg.c
+++ b/src/p_saveg.c
@@ -1888,8 +1888,7 @@ static void SaveLaserThinker(const thinker_t *th, const UINT8 type)
{
const laserthink_t *ht = (const void *)th;
WRITEUINT8(save_p, type);
- WRITEUINT32(save_p, SaveSector(ht->sector));
- WRITEUINT32(save_p, SaveSector(ht->sec));
+ WRITEINT16(save_p, ht->tag);
WRITEUINT32(save_p, SaveLine(ht->sourceline));
WRITEUINT8(save_p, ht->nobosses);
}
@@ -2019,14 +2018,9 @@ static void SavePolywaypointThinker(const thinker_t *th, UINT8 type)
WRITEINT32(save_p, ht->sequence);
WRITEINT32(save_p, ht->pointnum);
WRITEINT32(save_p, ht->direction);
- WRITEUINT8(save_p, ht->comeback);
- WRITEUINT8(save_p, ht->wrap);
+ WRITEUINT8(save_p, ht->returnbehavior);
WRITEUINT8(save_p, ht->continuous);
WRITEUINT8(save_p, ht->stophere);
- WRITEFIXED(save_p, ht->diffx);
- WRITEFIXED(save_p, ht->diffy);
- WRITEFIXED(save_p, ht->diffz);
- WRITEUINT32(save_p, SaveMobjnum(ht->target));
}
static void SavePolyslidedoorThinker(const thinker_t *th, const UINT8 type)
@@ -2995,16 +2989,10 @@ static thinker_t* LoadPusherThinker(actionf_p1 thinker)
static inline thinker_t* LoadLaserThinker(actionf_p1 thinker)
{
laserthink_t *ht = Z_Malloc(sizeof (*ht), PU_LEVSPEC, NULL);
- ffloor_t *rover = NULL;
ht->thinker.function.acp1 = thinker;
- ht->sector = LoadSector(READUINT32(save_p));
- ht->sec = LoadSector(READUINT32(save_p));
+ ht->tag = READINT16(save_p);
ht->sourceline = LoadLine(READUINT32(save_p));
ht->nobosses = READUINT8(save_p);
- for (rover = ht->sector->ffloors; rover; rover = rover->next)
- if (rover->secnum == (size_t)(ht->sec - sectors)
- && rover->master == ht->sourceline)
- ht->ffloor = rover;
return &ht->thinker;
}
@@ -3164,14 +3152,9 @@ static inline thinker_t* LoadPolywaypointThinker(actionf_p1 thinker)
ht->sequence = READINT32(save_p);
ht->pointnum = READINT32(save_p);
ht->direction = READINT32(save_p);
- ht->comeback = READUINT8(save_p);
- ht->wrap = READUINT8(save_p);
+ ht->returnbehavior = READUINT8(save_p);
ht->continuous = READUINT8(save_p);
ht->stophere = READUINT8(save_p);
- ht->diffx = READFIXED(save_p);
- ht->diffy = READFIXED(save_p);
- ht->diffz = READFIXED(save_p);
- ht->target = LoadMobj(READUINT32(save_p));
return &ht->thinker;
}
@@ -3418,7 +3401,6 @@ static void P_NetUnArchiveThinkers(void)
case tc_polywaypoint:
th = LoadPolywaypointThinker((actionf_p1)T_PolyObjWaypoint);
- restoreNum = true;
break;
case tc_polyslidedoor:
@@ -3478,7 +3460,6 @@ static void P_NetUnArchiveThinkers(void)
if (restoreNum)
{
executor_t *delay = NULL;
- polywaypoint_t *polywp = NULL;
UINT32 mobjnum;
for (currentthinker = thlist[THINK_MAIN].next; currentthinker != &thlist[THINK_MAIN]; currentthinker = currentthinker->next)
{
@@ -3489,15 +3470,6 @@ static void P_NetUnArchiveThinkers(void)
continue;
delay->caller = P_FindNewPosition(mobjnum);
}
- for (currentthinker = thlist[THINK_POLYOBJ].next; currentthinker != &thlist[THINK_POLYOBJ]; currentthinker = currentthinker->next)
- {
- if (currentthinker->function.acp1 != (actionf_p1)T_PolyObjWaypoint)
- continue;
- polywp = (void *)currentthinker;
- if (!(mobjnum = (UINT32)(size_t)polywp->target))
- continue;
- polywp->target = P_FindNewPosition(mobjnum);
- }
}
}
diff --git a/src/p_setup.c b/src/p_setup.c
index b3b618e51827fcaecc2fefe4b4af669e0f0551fb..84e89d7463abb5190b456d2c1d44e239f5c5cca1 100644
--- a/src/p_setup.c
+++ b/src/p_setup.c
@@ -144,6 +144,133 @@ mapthing_t *playerstarts[MAXPLAYERS];
mapthing_t *bluectfstarts[MAXPLAYERS];
mapthing_t *redctfstarts[MAXPLAYERS];
+// Maintain waypoints
+mobj_t *waypoints[NUMWAYPOINTSEQUENCES][WAYPOINTSEQUENCESIZE];
+UINT16 numwaypoints[NUMWAYPOINTSEQUENCES];
+
+void P_AddWaypoint(UINT8 sequence, UINT8 id, mobj_t *waypoint)
+{
+ waypoints[sequence][id] = waypoint;
+ if (id >= numwaypoints[sequence])
+ numwaypoints[sequence] = id + 1;
+}
+
+static void P_ResetWaypoints(void)
+{
+ UINT16 sequence, id;
+ for (sequence = 0; sequence < NUMWAYPOINTSEQUENCES; sequence++)
+ {
+ for (id = 0; id < numwaypoints[sequence]; id++)
+ waypoints[sequence][id] = NULL;
+
+ numwaypoints[sequence] = 0;
+ }
+}
+
+mobj_t *P_GetFirstWaypoint(UINT8 sequence)
+{
+ return waypoints[sequence][0];
+}
+
+mobj_t *P_GetLastWaypoint(UINT8 sequence)
+{
+ return waypoints[sequence][numwaypoints[sequence] - 1];
+}
+
+mobj_t *P_GetPreviousWaypoint(mobj_t *current, boolean wrap)
+{
+ UINT8 sequence = current->threshold;
+ UINT8 id = current->health;
+
+ if (id == 0)
+ {
+ if (!wrap)
+ return NULL;
+
+ id = numwaypoints[sequence] - 1;
+ }
+ else
+ id--;
+
+ return waypoints[sequence][id];
+}
+
+mobj_t *P_GetNextWaypoint(mobj_t *current, boolean wrap)
+{
+ UINT8 sequence = current->threshold;
+ UINT8 id = current->health;
+
+ if (id == numwaypoints[sequence] - 1)
+ {
+ if (!wrap)
+ return NULL;
+
+ id = 0;
+ }
+ else
+ id++;
+
+ return waypoints[sequence][id];
+}
+
+mobj_t *P_GetClosestWaypoint(UINT8 sequence, mobj_t *mo)
+{
+ UINT8 wp;
+ mobj_t *mo2, *result = NULL;
+ fixed_t bestdist = 0;
+ fixed_t curdist;
+
+ for (wp = 0; wp < numwaypoints[sequence]; wp++)
+ {
+ mo2 = waypoints[sequence][wp];
+
+ if (!mo2)
+ continue;
+
+ curdist = P_AproxDistance(P_AproxDistance(mo->x - mo2->x, mo->y - mo2->y), mo->z - mo2->z);
+
+ if (result && curdist > bestdist)
+ continue;
+
+ result = mo2;
+ bestdist = curdist;
+ }
+
+ return result;
+}
+
+// Return true if all waypoints are in the same location
+boolean P_IsDegeneratedWaypointSequence(UINT8 sequence)
+{
+ mobj_t *first, *waypoint;
+ UINT8 wp;
+
+ if (numwaypoints[sequence] <= 1)
+ return true;
+
+ first = waypoints[sequence][0];
+
+ for (wp = 1; wp < numwaypoints[sequence]; wp++)
+ {
+ waypoint = waypoints[sequence][wp];
+
+ if (!waypoint)
+ continue;
+
+ if (waypoint->x != first->x)
+ return false;
+
+ if (waypoint->y != first->y)
+ return false;
+
+ if (waypoint->z != first->z)
+ return false;
+ }
+
+ return true;
+}
+
+
/** Logs an error about a map being corrupt, then terminate.
* This allows reporting highly technical errors for usefulness, without
* confusing a novice map designer who simply needs to run ZenNode.
@@ -218,6 +345,9 @@ static void P_ClearSingleMapHeaderInfo(INT16 i)
mapheaderinfo[num]->typeoflevel = 0;
mapheaderinfo[num]->nextlevel = (INT16)(i + 1);
mapheaderinfo[num]->startrings = 0;
+ mapheaderinfo[num]->sstimer = 90;
+ mapheaderinfo[num]->ssspheres = 1;
+ mapheaderinfo[num]->gravity = FRACUNIT/2;
mapheaderinfo[num]->keywords[0] = '\0';
snprintf(mapheaderinfo[num]->musname, 7, "%sM", G_BuildMapName(i));
mapheaderinfo[num]->musname[6] = 0;
@@ -3542,6 +3672,8 @@ boolean P_LoadLevel(boolean fromnetsave)
P_ResetSpawnpoints();
+ P_ResetWaypoints();
+
P_MapStart();
if (!P_LoadMapFromFile())
diff --git a/src/p_sight.c b/src/p_sight.c
index 3e44281d0511e65c8841033242cd6ca8c1dadafd..2e1e499970418d23f5129e9271199592dbb9ce23 100644
--- a/src/p_sight.c
+++ b/src/p_sight.c
@@ -259,10 +259,10 @@ static boolean P_CrossSubsector(size_t num, register los_t *los)
fracx = los->strace.x + FixedMul(los->strace.dx, frac);
fracy = los->strace.y + FixedMul(los->strace.dy, frac);
// calculate sector heights
- frontf = (front->f_slope) ? P_GetZAt(front->f_slope, fracx, fracy) : front->floorheight;
- frontc = (front->c_slope) ? P_GetZAt(front->c_slope, fracx, fracy) : front->ceilingheight;
- backf = (back->f_slope) ? P_GetZAt(back->f_slope, fracx, fracy) : back->floorheight;
- backc = (back->c_slope) ? P_GetZAt(back->c_slope, fracx, fracy) : back->ceilingheight;
+ frontf = P_GetSectorFloorZAt (front, fracx, fracy);
+ frontc = P_GetSectorCeilingZAt(front, fracx, fracy);
+ backf = P_GetSectorFloorZAt (back , fracx, fracy);
+ backc = P_GetSectorCeilingZAt(back , fracx, fracy);
// crosses a two sided line
// no wall to block sight with?
if (frontf == backf && frontc == backc
@@ -312,10 +312,10 @@ static boolean P_CrossSubsector(size_t num, register los_t *los)
continue;
}
- topz = (*rover->t_slope) ? P_GetZAt(*rover->t_slope, fracx, fracy) : *rover->topheight;
- bottomz = (*rover->b_slope) ? P_GetZAt(*rover->b_slope, fracx, fracy) : *rover->bottomheight;
- topslope = FixedDiv(topz - los->sightzstart , frac);
- bottomslope = FixedDiv(bottomz - los->sightzstart , frac);
+ topz = P_GetFFloorTopZAt (rover, fracx, fracy);
+ bottomz = P_GetFFloorBottomZAt(rover, fracx, fracy);
+ topslope = FixedDiv( topz - los->sightzstart, frac);
+ bottomslope = FixedDiv(bottomz - los->sightzstart, frac);
if (topslope >= los->topslope && bottomslope <= los->bottomslope)
return false; // view completely blocked
}
@@ -328,10 +328,10 @@ static boolean P_CrossSubsector(size_t num, register los_t *los)
continue;
}
- topz = (*rover->t_slope) ? P_GetZAt(*rover->t_slope, fracx, fracy) : *rover->topheight;
- bottomz = (*rover->b_slope) ? P_GetZAt(*rover->b_slope, fracx, fracy) : *rover->bottomheight;
- topslope = FixedDiv(topz - los->sightzstart , frac);
- bottomslope = FixedDiv(bottomz - los->sightzstart , frac);
+ topz = P_GetFFloorTopZAt (rover, fracx, fracy);
+ bottomz = P_GetFFloorBottomZAt(rover, fracx, fracy);
+ topslope = FixedDiv( topz - los->sightzstart, frac);
+ bottomslope = FixedDiv(bottomz - los->sightzstart, frac);
if (topslope >= los->topslope && bottomslope <= los->bottomslope)
return false; // view completely blocked
}
@@ -457,21 +457,10 @@ boolean P_CheckSight(mobj_t *t1, mobj_t *t2)
continue;
}
- if (*rover->t_slope)
- {
- topz1 = P_GetZAt(*rover->t_slope, t1->x, t1->y);
- topz2 = P_GetZAt(*rover->t_slope, t2->x, t2->y);
- }
- else
- topz1 = topz2 = *rover->topheight;
-
- if (*rover->b_slope)
- {
- bottomz1 = P_GetZAt(*rover->b_slope, t1->x, t1->y);
- bottomz2 = P_GetZAt(*rover->b_slope, t2->x, t2->y);
- }
- else
- bottomz1 = bottomz2 = *rover->bottomheight;
+ topz1 = P_GetFFloorTopZAt (rover, t1->x, t1->y);
+ topz2 = P_GetFFloorTopZAt (rover, t2->x, t2->y);
+ bottomz1 = P_GetFFloorBottomZAt(rover, t1->x, t1->y);
+ bottomz2 = P_GetFFloorBottomZAt(rover, t2->x, t2->y);
// Check for blocking floors here.
if ((los.sightzstart < bottomz1 && t2->z >= topz2)
diff --git a/src/p_slopes.c b/src/p_slopes.c
index 92b40f70faaba601124af421f5a73814c1235295..6aeb1b02596633e7c4d6a9db1e0f0853b6c244c3 100644
--- a/src/p_slopes.c
+++ b/src/p_slopes.c
@@ -655,17 +655,49 @@ void P_SpawnSlopes(const boolean fromsave) {
// Various utilities related to slopes
//
-//
-// P_GetZAt
-//
// Returns the height of the sloped plane at (x, y) as a fixed_t
-//
-fixed_t P_GetZAt(pslope_t *slope, fixed_t x, fixed_t y)
+fixed_t P_GetSlopeZAt(const pslope_t *slope, fixed_t x, fixed_t y)
{
- fixed_t dist = FixedMul(x - slope->o.x, slope->d.x) +
- FixedMul(y - slope->o.y, slope->d.y);
+ fixed_t dist = FixedMul(x - slope->o.x, slope->d.x) +
+ FixedMul(y - slope->o.y, slope->d.y);
+
+ return slope->o.z + FixedMul(dist, slope->zdelta);
+}
+
+// Like P_GetSlopeZAt but falls back to z if slope is NULL
+fixed_t P_GetZAt(const pslope_t *slope, fixed_t x, fixed_t y, fixed_t z)
+{
+ return slope ? P_GetSlopeZAt(slope, x, y) : z;
+}
+
+// Returns the height of the sector floor at (x, y)
+fixed_t P_GetSectorFloorZAt(const sector_t *sector, fixed_t x, fixed_t y)
+{
+ return sector->f_slope ? P_GetSlopeZAt(sector->f_slope, x, y) : sector->floorheight;
+}
- return slope->o.z + FixedMul(dist, slope->zdelta);
+// Returns the height of the sector ceiling at (x, y)
+fixed_t P_GetSectorCeilingZAt(const sector_t *sector, fixed_t x, fixed_t y)
+{
+ return sector->c_slope ? P_GetSlopeZAt(sector->c_slope, x, y) : sector->ceilingheight;
+}
+
+// Returns the height of the FOF top at (x, y)
+fixed_t P_GetFFloorTopZAt(const ffloor_t *ffloor, fixed_t x, fixed_t y)
+{
+ return *ffloor->t_slope ? P_GetSlopeZAt(*ffloor->t_slope, x, y) : *ffloor->topheight;
+}
+
+// Returns the height of the FOF bottom at (x, y)
+fixed_t P_GetFFloorBottomZAt(const ffloor_t *ffloor, fixed_t x, fixed_t y)
+{
+ return *ffloor->b_slope ? P_GetSlopeZAt(*ffloor->b_slope, x, y) : *ffloor->bottomheight;
+}
+
+// Returns the height of the light list at (x, y)
+fixed_t P_GetLightZAt(const lightlist_t *light, fixed_t x, fixed_t y)
+{
+ return light->slope ? P_GetSlopeZAt(light->slope, x, y) : light->height;
}
diff --git a/src/p_slopes.h b/src/p_slopes.h
index e7c850ab811e33c19cca5700453472f3804d4c56..06d900b666b91c8a901392a4f243b0941a0d05e7 100644
--- a/src/p_slopes.h
+++ b/src/p_slopes.h
@@ -33,7 +33,21 @@ void P_CopySectorSlope(line_t *line);
pslope_t *P_SlopeById(UINT16 id);
// Returns the height of the sloped plane at (x, y) as a fixed_t
-fixed_t P_GetZAt(pslope_t *slope, fixed_t x, fixed_t y);
+fixed_t P_GetSlopeZAt(const pslope_t *slope, fixed_t x, fixed_t y);
+
+// Like P_GetSlopeZAt but falls back to z if slope is NULL
+fixed_t P_GetZAt(const pslope_t *slope, fixed_t x, fixed_t y, fixed_t z);
+
+// Returns the height of the sector at (x, y)
+fixed_t P_GetSectorFloorZAt (const sector_t *sector, fixed_t x, fixed_t y);
+fixed_t P_GetSectorCeilingZAt(const sector_t *sector, fixed_t x, fixed_t y);
+
+// Returns the height of the FOF at (x, y)
+fixed_t P_GetFFloorTopZAt (const ffloor_t *ffloor, fixed_t x, fixed_t y);
+fixed_t P_GetFFloorBottomZAt(const ffloor_t *ffloor, fixed_t x, fixed_t y);
+
+// Returns the height of the light list at (x, y)
+fixed_t P_GetLightZAt(const lightlist_t *light, fixed_t x, fixed_t y);
// Lots of physics-based bullshit
void P_QuantizeMomentumToSlope(vector3_t *momentum, pslope_t *slope);
diff --git a/src/p_spec.c b/src/p_spec.c
index c93846438d808394bf7dcc287794d88d2d7a8d2a..d45a33c47d5b3bee989d6d6e00d67af1ef15f64e 100644
--- a/src/p_spec.c
+++ b/src/p_spec.c
@@ -1044,9 +1044,6 @@ static INT32 P_FindLineFromTag(INT32 tag, INT32 start)
}
}
-//
-// P_FindSpecialLineFromTag
-//
INT32 P_FindSpecialLineFromTag(INT16 special, INT16 tag, INT32 start)
{
if (tag == -1)
@@ -1076,11 +1073,8 @@ INT32 P_FindSpecialLineFromTag(INT16 special, INT16 tag, INT32 start)
}
}
-//
-// PolyDoor
-//
+
// Parses arguments for parameterized polyobject door types
-//
static boolean PolyDoor(line_t *line)
{
polydoordata_t pdd;
@@ -1117,11 +1111,7 @@ static boolean PolyDoor(line_t *line)
return EV_DoPolyDoor(&pdd);
}
-//
-// PolyMove
-//
// Parses arguments for parameterized polyobject move specials
-//
static boolean PolyMove(line_t *line)
{
polymovedata_t pmd;
@@ -1136,12 +1126,8 @@ static boolean PolyMove(line_t *line)
return EV_DoPolyObjMove(&pmd);
}
-//
-// PolyInvisible
-//
// Makes a polyobject invisible and intangible
// If NOCLIMB is ticked, the polyobject will still be tangible, just not visible.
-//
static void PolyInvisible(line_t *line)
{
INT32 polyObjNum = line->tag;
@@ -1164,12 +1150,8 @@ static void PolyInvisible(line_t *line)
po->flags &= ~POF_RENDERALL;
}
-//
-// PolyVisible
-//
// Makes a polyobject visible and tangible
// If NOCLIMB is ticked, the polyobject will not be tangible, just visible.
-//
static void PolyVisible(line_t *line)
{
INT32 polyObjNum = line->tag;
@@ -1192,16 +1174,14 @@ static void PolyVisible(line_t *line)
po->flags |= (po->spawnflags & POF_RENDERALL);
}
-//
-// PolyTranslucency
-//
+
// Sets the translucency of a polyobject
// Frontsector floor / 100 = translevel
-//
static void PolyTranslucency(line_t *line)
{
INT32 polyObjNum = line->tag;
polyobj_t *po;
+ INT32 value;
if (!(po = Polyobj_GetForNum(polyObjNum)))
{
@@ -1213,37 +1193,28 @@ static void PolyTranslucency(line_t *line)
if (po->isBad)
return;
- // if DONTPEGBOTTOM, specify raw translucency value in Front X Offset
- // else, take it out of 1000. If Front X Offset is specified, use that. Else, use floorheight.
+ // If Front X Offset is specified, use that. Else, use floorheight.
+ value = (sides[line->sidenum[0]].textureoffset ? sides[line->sidenum[0]].textureoffset : line->frontsector->floorheight) >> FRACBITS;
+
+ // If DONTPEGBOTTOM, specify raw translucency value. Else, take it out of 1000.
+ if (!(line->flags & ML_DONTPEGBOTTOM))
+ value /= 100;
+
if (line->flags & ML_EFFECT3) // relative calc
- po->translucency = max(min(po->translucency + ((line->flags & ML_DONTPEGBOTTOM) ?
- (sides[line->sidenum[0]].textureoffset ?
- max(min(sides[line->sidenum[0]].textureoffset>>FRACBITS, NUMTRANSMAPS), -NUMTRANSMAPS)
- : max(min(line->frontsector->floorheight>>FRACBITS, NUMTRANSMAPS), -NUMTRANSMAPS))
- : (sides[line->sidenum[0]].textureoffset ?
- max(min(sides[line->sidenum[0]].textureoffset>>FRACBITS, 1000), -1000) / 100
- : max(min(line->frontsector->floorheight>>FRACBITS, 1000), -1000) / 100)),
- NUMTRANSMAPS), 0);
+ po->translucency += value;
else
- po->translucency = (line->flags & ML_DONTPEGBOTTOM) ?
- (sides[line->sidenum[0]].textureoffset ?
- max(min(sides[line->sidenum[0]].textureoffset>>FRACBITS, NUMTRANSMAPS), 0)
- : max(min(line->frontsector->floorheight>>FRACBITS, NUMTRANSMAPS), 0))
- : (sides[line->sidenum[0]].textureoffset ?
- max(min(sides[line->sidenum[0]].textureoffset>>FRACBITS, 1000), 0) / 100
- : max(min(line->frontsector->floorheight>>FRACBITS, 1000), 0) / 100);
+ po->translucency = value;
+
+ po->translucency = max(min(po->translucency, NUMTRANSMAPS), 0);
}
-//
-// PolyFade
-//
// Makes a polyobject translucency fade and applies tangibility
-//
static boolean PolyFade(line_t *line)
{
INT32 polyObjNum = line->tag;
polyobj_t *po;
polyfadedata_t pfd;
+ INT32 value;
if (!(po = Polyobj_GetForNum(polyObjNum)))
{
@@ -1266,25 +1237,19 @@ static boolean PolyFade(line_t *line)
pfd.polyObjNum = polyObjNum;
- // if DONTPEGBOTTOM, specify raw translucency value in Front X Offset
- // else, take it out of 1000. If Front X Offset is specified, use that. Else, use floorheight.
+ // If Front X Offset is specified, use that. Else, use floorheight.
+ value = (sides[line->sidenum[0]].textureoffset ? sides[line->sidenum[0]].textureoffset : line->frontsector->floorheight) >> FRACBITS;
+
+ // If DONTPEGBOTTOM, specify raw translucency value. Else, take it out of 1000.
+ if (!(line->flags & ML_DONTPEGBOTTOM))
+ value /= 100;
+
if (line->flags & ML_EFFECT3) // relative calc
- pfd.destvalue = max(min(po->translucency + ((line->flags & ML_DONTPEGBOTTOM) ?
- (sides[line->sidenum[0]].textureoffset ?
- max(min(sides[line->sidenum[0]].textureoffset>>FRACBITS, NUMTRANSMAPS), -NUMTRANSMAPS)
- : max(min(line->frontsector->floorheight>>FRACBITS, NUMTRANSMAPS), -NUMTRANSMAPS))
- : (sides[line->sidenum[0]].textureoffset ?
- max(min(sides[line->sidenum[0]].textureoffset>>FRACBITS, 1000), -1000) / 100
- : max(min(line->frontsector->floorheight>>FRACBITS, 1000), -1000) / 100)),
- NUMTRANSMAPS), 0);
+ pfd.destvalue = po->translucency + value;
else
- pfd.destvalue = (line->flags & ML_DONTPEGBOTTOM) ?
- (sides[line->sidenum[0]].textureoffset ?
- max(min(sides[line->sidenum[0]].textureoffset>>FRACBITS, NUMTRANSMAPS), 0)
- : max(min(line->frontsector->floorheight>>FRACBITS, NUMTRANSMAPS), 0))
- : (sides[line->sidenum[0]].textureoffset ?
- max(min(sides[line->sidenum[0]].textureoffset>>FRACBITS, 1000), 0) / 100
- : max(min(line->frontsector->floorheight>>FRACBITS, 1000), 0) / 100);
+ pfd.destvalue = value;
+
+ pfd.destvalue = max(min(pfd.destvalue, NUMTRANSMAPS), 0);
// already equal, nothing to do
if (po->translucency == pfd.destvalue)
@@ -1303,11 +1268,7 @@ static boolean PolyFade(line_t *line)
return EV_DoPolyObjFade(&pfd);
}
-//
-// PolyWaypoint
-//
// Parses arguments for parameterized polyobject waypoint movement
-//
static boolean PolyWaypoint(line_t *line)
{
polywaypointdata_t pwd;
@@ -1315,19 +1276,26 @@ static boolean PolyWaypoint(line_t *line)
pwd.polyObjNum = line->tag;
pwd.speed = sides[line->sidenum[0]].textureoffset / 8;
pwd.sequence = sides[line->sidenum[0]].rowoffset >> FRACBITS; // Sequence #
- pwd.reverse = (line->flags & ML_EFFECT1) == ML_EFFECT1; // Reverse?
- pwd.comeback = (line->flags & ML_EFFECT2) == ML_EFFECT2; // Return when reaching end?
- pwd.wrap = (line->flags & ML_EFFECT3) == ML_EFFECT3; // Wrap around waypoints
- pwd.continuous = (line->flags & ML_EFFECT4) == ML_EFFECT4; // Continuously move - used with COMEBACK or WRAP
+
+ // Behavior after reaching the last waypoint?
+ if (line->flags & ML_EFFECT3)
+ pwd.returnbehavior = PWR_WRAP; // Wrap back to first waypoint
+ else if (line->flags & ML_EFFECT2)
+ pwd.returnbehavior = PWR_COMEBACK; // Go through sequence in reverse
+ else
+ pwd.returnbehavior = PWR_STOP; // Stop
+
+ // Flags
+ pwd.flags = 0;
+ if (line->flags & ML_EFFECT1)
+ pwd.flags |= PWF_REVERSE;
+ if (line->flags & ML_EFFECT4)
+ pwd.flags |= PWF_LOOP;
return EV_DoPolyObjWaypoint(&pwd);
}
-//
-// PolyRotate
-//
// Parses arguments for parameterized polyobject rotate specials
-//
static boolean PolyRotate(line_t *line)
{
polyrotdata_t prd;
@@ -1352,11 +1320,20 @@ static boolean PolyRotate(line_t *line)
return EV_DoPolyObjRotate(&prd);
}
-//
-// PolyDisplace
-//
+// Parses arguments for polyobject flag waving special
+static boolean PolyFlag(line_t *line)
+{
+ polyflagdata_t pfd;
+
+ pfd.polyObjNum = line->tag;
+ pfd.speed = P_AproxDistance(line->dx, line->dy) >> FRACBITS;
+ pfd.angle = R_PointToAngle2(line->v1->x, line->v1->y, line->v2->x, line->v2->y) >> ANGLETOFINESHIFT;
+ pfd.momx = sides[line->sidenum[0]].textureoffset >> FRACBITS;
+
+ return EV_DoPolyObjFlag(&pfd);
+}
+
// Parses arguments for parameterized polyobject move-by-sector-heights specials
-//
static boolean PolyDisplace(line_t *line)
{
polydisplacedata_t pdd;
@@ -1371,8 +1348,7 @@ static boolean PolyDisplace(line_t *line)
}
-/** Similar to PolyDisplace().
- */
+// Parses arguments for parameterized polyobject rotate-by-sector-heights specials
static boolean PolyRotDisplace(line_t *line)
{
polyrotdisplacedata_t pdd;
@@ -4005,6 +3981,47 @@ static void P_ProcessLineSpecial(line_t *line, mobj_t *mo, sector_t *callsec)
}
break;
+ case 464: // Trigger Egg Capsule
+ {
+ thinker_t *th;
+ mobj_t *mo2;
+
+ // Find the center of the Eggtrap and release all the pretty animals!
+ // The chimps are my friends.. heeheeheheehehee..... - LouisJM
+ for (th = thlist[THINK_MOBJ].next; th != &thlist[THINK_MOBJ]; th = th->next)
+ {
+ if (th->function.acp1 == (actionf_p1)P_RemoveThinkerDelayed)
+ continue;
+
+ mo2 = (mobj_t *)th;
+
+ if (mo2->type != MT_EGGTRAP)
+ continue;
+
+ if (!mo2->spawnpoint)
+ continue;
+
+ if (mo2->spawnpoint->angle != line->tag)
+ continue;
+
+ P_KillMobj(mo2, NULL, mo, 0);
+ }
+
+ if (!(line->flags & ML_NOCLIMB))
+ {
+ INT32 i;
+
+ // Mark all players with the time to exit thingy!
+ for (i = 0; i < MAXPLAYERS; i++)
+ {
+ if (!playeringame[i])
+ continue;
+ P_DoPlayerExit(&players[i]);
+ }
+ }
+ }
+ break;
+
case 480: // Polyobj_DoorSlide
case 481: // Polyobj_DoorSwing
PolyDoor(line);
@@ -4793,9 +4810,7 @@ DoneSection2:
INT32 sequence;
fixed_t speed;
INT32 lineindex;
- thinker_t *th;
mobj_t *waypoint = NULL;
- mobj_t *mo2;
angle_t an;
if (player->mo->tracer && player->mo->tracer->type == MT_TUBEWAYPOINT && player->powers[pw_carry] == CR_ZOOMTUBE)
@@ -4820,25 +4835,7 @@ DoneSection2:
break;
}
- // scan the thinkers
- // to find the first waypoint
- for (th = thlist[THINK_MOBJ].next; th != &thlist[THINK_MOBJ]; th = th->next)
- {
- if (th->function.acp1 == (actionf_p1)P_RemoveThinkerDelayed)
- continue;
-
- mo2 = (mobj_t *)th;
-
- if (mo2->type != MT_TUBEWAYPOINT)
- continue;
- if (mo2->threshold != sequence)
- continue;
- if (mo2->health != 0)
- continue;
-
- waypoint = mo2;
- break;
- }
+ waypoint = P_GetFirstWaypoint(sequence);
if (!waypoint)
{
@@ -4875,9 +4872,7 @@ DoneSection2:
INT32 sequence;
fixed_t speed;
INT32 lineindex;
- thinker_t *th;
mobj_t *waypoint = NULL;
- mobj_t *mo2;
angle_t an;
if (player->mo->tracer && player->mo->tracer->type == MT_TUBEWAYPOINT && player->powers[pw_carry] == CR_ZOOMTUBE)
@@ -4902,25 +4897,7 @@ DoneSection2:
break;
}
- // scan the thinkers
- // to find the last waypoint
- for (th = thlist[THINK_MOBJ].next; th != &thlist[THINK_MOBJ]; th = th->next)
- {
- if (th->function.acp1 == (actionf_p1)P_RemoveThinkerDelayed)
- continue;
-
- mo2 = (mobj_t *)th;
-
- if (mo2->type != MT_TUBEWAYPOINT)
- continue;
- if (mo2->threshold != sequence)
- continue;
-
- if (!waypoint)
- waypoint = mo2;
- else if (mo2->health > waypoint->health)
- waypoint = mo2;
- }
+ waypoint = P_GetLastWaypoint(sequence);
if (!waypoint)
{
@@ -5002,14 +4979,11 @@ DoneSection2:
INT32 sequence;
fixed_t speed;
INT32 lineindex;
- thinker_t *th;
mobj_t *waypointmid = NULL;
mobj_t *waypointhigh = NULL;
mobj_t *waypointlow = NULL;
- mobj_t *mo2;
mobj_t *closest = NULL;
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)
break;
@@ -5055,98 +5029,16 @@ DoneSection2:
// Determine the closest spot on the line between the three waypoints
// Put player at that location.
- // scan the thinkers
- // to find the first waypoint
- for (th = thlist[THINK_MOBJ].next; th != &thlist[THINK_MOBJ]; th = th->next)
- {
- if (th->function.acp1 == (actionf_p1)P_RemoveThinkerDelayed)
- continue;
-
- mo2 = (mobj_t *)th;
-
- if (mo2->type != MT_TUBEWAYPOINT)
- continue;
-
- if (mo2->threshold != sequence)
- continue;
-
- if (!highest)
- highest = mo2;
- else if (mo2->health > highest->health) // Find the highest waypoint # in case we wrap
- highest = mo2;
+ waypointmid = P_GetClosestWaypoint(sequence, player->mo);
- if (closest && P_AproxDistance(P_AproxDistance(player->mo->x-mo2->x, player->mo->y-mo2->y),
- player->mo->z-mo2->z) > P_AproxDistance(P_AproxDistance(player->mo->x-closest->x,
- player->mo->y-closest->y), player->mo->z-closest->z))
- continue;
-
- // Found a target
- closest = mo2;
- }
-
- waypointmid = closest;
-
- closest = NULL;
-
- if (waypointmid == NULL)
+ if (!waypointmid)
{
CONS_Debug(DBG_GAMELOGIC, "ERROR: WAYPOINT(S) IN SEQUENCE %d NOT FOUND.\n", sequence);
break;
}
- // Find waypoint before this one (waypointlow)
- for (th = thlist[THINK_MOBJ].next; th != &thlist[THINK_MOBJ]; th = th->next)
- {
- if (th->function.acp1 == (actionf_p1)P_RemoveThinkerDelayed)
- continue;
-
- mo2 = (mobj_t *)th;
-
- if (mo2->type != MT_TUBEWAYPOINT)
- continue;
-
- if (mo2->threshold != sequence)
- continue;
-
- if (waypointmid->health == 0)
- {
- if (mo2->health != highest->health)
- continue;
- }
- else if (mo2->health != waypointmid->health - 1)
- continue;
-
- // Found a target
- waypointlow = mo2;
- break;
- }
-
- // Find waypoint after this one (waypointhigh)
- for (th = thlist[THINK_MOBJ].next; th != &thlist[THINK_MOBJ]; th = th->next)
- {
- if (th->function.acp1 == (actionf_p1)P_RemoveThinkerDelayed)
- continue;
-
- mo2 = (mobj_t *)th;
-
- if (mo2->type != MT_TUBEWAYPOINT)
- continue;
-
- if (mo2->threshold != sequence)
- continue;
-
- if (waypointmid->health == highest->health)
- {
- if (mo2->health != 0)
- continue;
- }
- else if (mo2->health != waypointmid->health + 1)
- continue;
-
- // Found a target
- waypointhigh = mo2;
- break;
- }
+ waypointlow = P_GetPreviousWaypoint(waypointmid, true);
+ waypointhigh = P_GetNextWaypoint(waypointmid, true);
CONS_Debug(DBG_GAMELOGIC, "WaypointMid: %d; WaypointLow: %d; WaypointHigh: %d\n",
waypointmid->health, waypointlow ? waypointlow->health : -1, waypointhigh ? waypointhigh->health : -1);
@@ -5193,6 +5085,7 @@ DoneSection2:
if (lines[lineindex].flags & ML_EFFECT1) // Don't wrap
{
+ mobj_t *highest = P_GetLastWaypoint(sequence);
highest->flags |= MF_SLIDEME;
}
@@ -5204,7 +5097,7 @@ DoneSection2:
player->mo->y = resulthigh.y;
player->mo->z = resulthigh.z - P_GetPlayerHeight(player);
}
- else if ((lines[lineindex].flags & ML_EFFECT1) && waypointmid->health == highest->health)
+ else if ((lines[lineindex].flags & ML_EFFECT1) && waypointmid->health == numwaypoints[sequence] - 1)
{
closest = waypointmid;
player->mo->x = resultlow.x;
@@ -6129,92 +6022,83 @@ static inline void P_AddCameraScanner(sector_t *sourcesec, sector_t *actionsecto
elevator->distance = FixedInt(AngleFixed(angle));
}
-static const ffloortype_e laserflags = FF_EXISTS|FF_RENDERALL|FF_NOSHADE|FF_EXTRA|FF_CUTEXTRA|FF_TRANSLUCENT;
-
/** Flashes a laser block.
*
* \param flash Thinker structure for this laser.
- * \sa EV_AddLaserThinker
+ * \sa P_AddLaserThinker
* \author SSNTails <http://www.ssntails.org>
*/
void T_LaserFlash(laserthink_t *flash)
{
msecnode_t *node;
mobj_t *thing;
- sector_t *sourcesec;
- ffloor_t *fflr = flash->ffloor;
- sector_t *sector = flash->sector;
+ INT32 s;
+ ffloor_t *fflr;
+ sector_t *sector;
+ sector_t *sourcesec = flash->sourceline->frontsector;
fixed_t top, bottom;
- if (!fflr || !(fflr->flags & FF_EXISTS))
- return;
+ for (s = -1; (s = P_FindSectorFromTag(flash->tag, s)) >= 0 ;)
+ {
+ sector = §ors[s];
+ for (fflr = sector->ffloors; fflr; fflr = fflr->next)
+ {
+ if (fflr->master != flash->sourceline)
+ continue;
- if (leveltime & 2)
- //fflr->flags |= FF_RENDERALL;
- fflr->alpha = 0xB0;
- else
- //fflr->flags &= ~FF_RENDERALL;
- fflr->alpha = 0x90;
+ if (!(fflr->flags & FF_EXISTS))
+ break;
- sourcesec = fflr->master->frontsector; // Less to type!
+ if (leveltime & 2)
+ //fflr->flags |= FF_RENDERALL;
+ fflr->alpha = 0xB0;
+ else
+ //fflr->flags &= ~FF_RENDERALL;
+ fflr->alpha = 0x90;
- top = (*fflr->t_slope) ? P_GetZAt(*fflr->t_slope, sector->soundorg.x, sector->soundorg.y)
- : *fflr->topheight;
- bottom = (*fflr->b_slope) ? P_GetZAt(*fflr->b_slope, sector->soundorg.x, sector->soundorg.y)
- : *fflr->bottomheight;
- sector->soundorg.z = (top + bottom)/2;
- S_StartSound(§or->soundorg, sfx_laser);
+ top = P_GetFFloorTopZAt (fflr, sector->soundorg.x, sector->soundorg.y);
+ bottom = P_GetFFloorBottomZAt(fflr, sector->soundorg.x, sector->soundorg.y);
+ sector->soundorg.z = (top + bottom)/2;
+ S_StartSound(§or->soundorg, sfx_laser);
- // Seek out objects to DESTROY! MUAHAHHAHAHAA!!!*cough*
- for (node = sector->touching_thinglist; node && node->m_thing; node = node->m_thinglist_next)
- {
- thing = node->m_thing;
+ // Seek out objects to DESTROY! MUAHAHHAHAHAA!!!*cough*
+ for (node = sector->touching_thinglist; node && node->m_thing; node = node->m_thinglist_next)
+ {
+ thing = node->m_thing;
- if (flash->nobosses && thing->flags & MF_BOSS)
- continue; // Don't hurt bosses
+ if (flash->nobosses && thing->flags & MF_BOSS)
+ continue; // Don't hurt bosses
- // Don't endlessly kill egg guard shields (or anything else for that matter)
- if (thing->health <= 0)
- continue;
+ // Don't endlessly kill egg guard shields (or anything else for that matter)
+ if (thing->health <= 0)
+ continue;
- top = P_GetSpecialTopZ(thing, sourcesec, sector);
- bottom = P_GetSpecialBottomZ(thing, sourcesec, sector);
+ top = P_GetSpecialTopZ(thing, sourcesec, sector);
+ bottom = P_GetSpecialBottomZ(thing, sourcesec, sector);
- if (thing->z >= top
- || thing->z + thing->height <= bottom)
- continue;
+ if (thing->z >= top
+ || thing->z + thing->height <= bottom)
+ continue;
+
+ if (thing->flags & MF_SHOOTABLE)
+ P_DamageMobj(thing, NULL, NULL, 1, 0);
+ else if (thing->type == MT_EGGSHIELD)
+ P_KillMobj(thing, NULL, NULL, 0);
+ }
- if (thing->flags & MF_SHOOTABLE)
- P_DamageMobj(thing, NULL, NULL, 1, 0);
- else if (thing->type == MT_EGGSHIELD)
- P_KillMobj(thing, NULL, NULL, 0);
+ break;
+ }
}
}
-/** Adds a laser thinker to a 3Dfloor.
- *
- * \param fflr 3Dfloor to turn into a laser block.
- * \param sector Target sector.
- * \param secthkiners Lists of thinkers sorted by sector. May be NULL.
- * \sa T_LaserFlash
- * \author SSNTails <http://www.ssntails.org>
- */
-static inline void EV_AddLaserThinker(sector_t *sec, sector_t *sec2, line_t *line, thinkerlist_t *secthinkers, boolean nobosses)
+static inline void P_AddLaserThinker(INT16 tag, line_t *line, boolean nobosses)
{
- laserthink_t *flash;
- ffloor_t *fflr = P_AddFakeFloor(sec, sec2, line, laserflags, secthinkers);
-
- if (!fflr)
- return;
-
- flash = Z_Calloc(sizeof (*flash), PU_LEVSPEC, NULL);
+ laserthink_t *flash = Z_Calloc(sizeof (*flash), PU_LEVSPEC, NULL);
P_AddThinker(THINK_MAIN, &flash->thinker);
flash->thinker.function.acp1 = (actionf_p1)T_LaserFlash;
- flash->ffloor = fflr;
- flash->sector = sec; // For finding mobjs
- flash->sec = sec2;
+ flash->tag = tag;
flash->sourceline = line;
flash->nobosses = nobosses;
}
@@ -6246,11 +6130,11 @@ static void P_RunLevelLoadExecutors(void)
void P_InitSpecials(void)
{
// Set the default gravity. Custom gravity overrides this setting.
- gravity = FRACUNIT/2;
+ gravity = mapheaderinfo[gamemap-1]->gravity;
// Defaults in case levels don't have them set.
- sstimer = 90*TICRATE + 6;
- ssspheres = 1;
+ sstimer = mapheaderinfo[gamemap-1]->sstimer*TICRATE + 6;
+ ssspheres = mapheaderinfo[gamemap-1]->ssspheres;
CheckForBustableBlocks = CheckForBouncySector = CheckForQuicksand = CheckForMarioBlocks = CheckForFloatBob = CheckForReverseGravity = false;
@@ -6981,14 +6865,8 @@ void P_SpawnSpecials(boolean fromnetsave)
fixed_t crushspeed = (lines[i].flags & ML_EFFECT5) ? lines[i].dy >> 3 : 10*FRACUNIT;
fixed_t retractspeed = (lines[i].flags & ML_EFFECT5) ? lines[i].dx >> 3 : 2*FRACUNIT;
UINT16 sound = (lines[i].flags & ML_EFFECT4) ? sides[lines[i].sidenum[0]].textureoffset >> FRACBITS : sfx_thwomp;
-
- sec = sides[*lines[i].sidenum].sector - sectors;
- for (s = -1; (s = P_FindSectorFromTag(lines[i].tag, s)) >= 0 ;)
- {
- P_AddThwompThinker(§ors[sec], lines[i].tag, &lines[i], crushspeed, retractspeed, sound);
- P_AddFakeFloor(§ors[s], §ors[sec], lines + i,
- FF_EXISTS|FF_SOLID|FF_RENDERALL|FF_CUTLEVEL, secthinkers);
- }
+ P_AddThwompThinker(lines[i].frontsector, lines[i].tag, &lines[i], crushspeed, retractspeed, sound);
+ P_AddFakeFloorsByLine(i, FF_EXISTS|FF_SOLID|FF_RENDERALL|FF_CUTLEVEL, secthinkers);
break;
}
@@ -7029,11 +6907,8 @@ void P_SpawnSpecials(boolean fromnetsave)
break;
case 258: // Laser block
- sec = sides[*lines[i].sidenum].sector - sectors;
-
- // No longer totally disrupts netgames
- for (s = -1; (s = P_FindSectorFromTag(lines[i].tag, s)) >= 0 ;)
- EV_AddLaserThinker(§ors[s], §ors[sec], lines + i, secthinkers, !!(lines[i].flags & ML_EFFECT1));
+ P_AddLaserThinker(lines[i].tag, lines + i, !!(lines[i].flags & ML_EFFECT1));
+ P_AddFakeFloorsByLine(i, FF_EXISTS|FF_RENDERALL|FF_NOSHADE|FF_EXTRA|FF_CUTEXTRA|FF_TRANSLUCENT, secthinkers);
break;
case 259: // Custom FOF
@@ -7282,7 +7157,7 @@ void P_SpawnSpecials(boolean fromnetsave)
switch (lines[i].special)
{
case 30: // Polyobj_Flag
- EV_DoPolyObjFlag(&lines[i]);
+ PolyFlag(&lines[i]);
break;
case 31: // Polyobj_Displace
@@ -7704,7 +7579,7 @@ static void P_SpawnScrollers(void)
// scroll wall according to linedef
// (same direction and speed as scrolling floors)
case 502:
- for (s = -1; (s = P_FindSectorFromTag(l->tag, s)) >= 0 ;)
+ for (s = -1; (s = P_FindLineFromTag(l->tag, s)) >= 0 ;)
if (s != (INT32)i)
Add_Scroller(sc_side, dx, dy, control, lines[s].sidenum[0], accel, 0);
break;
@@ -7789,10 +7664,7 @@ void T_Disappear(disappear_t *d)
if (!(lines[d->sourceline].flags & ML_NOCLIMB))
{
- if (*rover->t_slope)
- sectors[s].soundorg.z = P_GetZAt(*rover->t_slope, sectors[s].soundorg.x, sectors[s].soundorg.y);
- else
- sectors[s].soundorg.z = *rover->topheight;
+ sectors[s].soundorg.z = P_GetFFloorTopZAt(rover, sectors[s].soundorg.x, sectors[s].soundorg.y);
S_StartSound(§ors[s].soundorg, sfx_appear);
}
}
diff --git a/src/p_spec.h b/src/p_spec.h
index 0228f8a028f34051f2db8069e579d7a8385faf33..596d8171d2acfb8b8b337f8a4fc4c686f2d3ce9b 100644
--- a/src/p_spec.h
+++ b/src/p_spec.h
@@ -104,9 +104,7 @@ typedef struct
typedef struct
{
thinker_t thinker; ///< Thinker structure for laser.
- ffloor_t *ffloor; ///< 3Dfloor that is a laser.
- sector_t *sector; ///< Sector in which the effect takes place.
- sector_t *sec;
+ INT16 tag;
line_t *sourceline;
UINT8 nobosses;
} laserthink_t;
diff --git a/src/p_user.c b/src/p_user.c
index 3296269cb22b0c934c6a7bb0c03f42f674850bd5..7447bc03a1acb04ca0a17153b83e6fd9dc8cc5d7 100644
--- a/src/p_user.c
+++ b/src/p_user.c
@@ -1490,17 +1490,10 @@ void P_PlayLivesJingle(player_t *player)
if (player && !P_IsLocalPlayer(player))
return;
- if (use1upSound)
+ if (use1upSound || cv_1upsound.value)
S_StartSound(NULL, sfx_oneup);
else if (mariomode)
S_StartSound(NULL, sfx_marioa);
- else if (cv_1upsound.value)
- {
- if (S_sfx[sfx_oneup].lumpnum != LUMPERROR)
- S_StartSound(NULL, sfx_oneup);
- else
- S_StartSound(NULL, sfx_chchng);/* at least play something! */
- }
else
{
P_PlayJingle(player, JT_1UP);
@@ -1548,10 +1541,6 @@ boolean P_EvaluateMusicStatus(UINT16 status, const char *musname)
int i;
boolean result = false;
-#ifndef HAVE_BLUA
- (void)musname;
-#endif
-
for (i = 0; i < MAXPLAYERS; i++)
{
if (!P_IsLocalPlayer(&players[i]))
@@ -2278,8 +2267,8 @@ boolean P_InSpaceSector(mobj_t *mo) // Returns true if you are in space
if (GETSECSPECIAL(rover->master->frontsector->special, 1) != SPACESPECIAL)
continue;
- topheight = *rover->t_slope ? P_GetZAt(*rover->t_slope, mo->x, mo->y) : *rover->topheight;
- bottomheight = *rover->b_slope ? P_GetZAt(*rover->b_slope, mo->x, mo->y) : *rover->bottomheight;
+ topheight = P_GetFFloorTopZAt (rover, mo->x, mo->y);
+ bottomheight = P_GetFFloorBottomZAt(rover, mo->x, mo->y);
if (mo->z + (mo->height/2) > topheight)
continue;
@@ -2516,8 +2505,8 @@ boolean P_InQuicksand(mobj_t *mo) // Returns true if you are in quicksand
if (!(rover->flags & FF_QUICKSAND))
continue;
- topheight = *rover->t_slope ? P_GetZAt(*rover->t_slope, mo->x, mo->y) : *rover->topheight;
- bottomheight = *rover->b_slope ? P_GetZAt(*rover->b_slope, mo->x, mo->y) : *rover->bottomheight;
+ topheight = P_GetFFloorTopZAt (rover, mo->x, mo->y);
+ bottomheight = P_GetFFloorBottomZAt(rover, mo->x, mo->y);
if (mo->z + flipoffset > topheight)
continue;
@@ -2858,8 +2847,8 @@ static void P_CheckQuicksand(player_t *player)
if (!(rover->flags & FF_QUICKSAND))
continue;
- topheight = *rover->t_slope ? P_GetZAt(*rover->t_slope, player->mo->x, player->mo->y) : *rover->topheight;
- bottomheight = *rover->b_slope ? P_GetZAt(*rover->b_slope, player->mo->x, player->mo->y) : *rover->bottomheight;
+ topheight = P_GetFFloorTopZAt (rover, player->mo->x, player->mo->y);
+ bottomheight = P_GetFFloorBottomZAt(rover, player->mo->x, player->mo->y);
if (topheight >= player->mo->z && bottomheight < player->mo->z + player->mo->height)
{
@@ -3199,10 +3188,8 @@ static void P_DoClimbing(player_t *player)
floorclimb = true;
else
{
- floorheight = glidesector->sector->f_slope ? P_GetZAt(glidesector->sector->f_slope, player->mo->x, player->mo->y)
- : glidesector->sector->floorheight;
- ceilingheight = glidesector->sector->c_slope ? P_GetZAt(glidesector->sector->c_slope, player->mo->x, player->mo->y)
- : glidesector->sector->ceilingheight;
+ floorheight = P_GetSectorFloorZAt (glidesector->sector, player->mo->x, player->mo->y);
+ ceilingheight = P_GetSectorCeilingZAt(glidesector->sector, player->mo->x, player->mo->y);
if (glidesector->sector->ffloors)
{
@@ -3216,8 +3203,8 @@ static void P_DoClimbing(player_t *player)
floorclimb = true;
- topheight = *rover->t_slope ? P_GetZAt(*rover->t_slope, player->mo->x, player->mo->y) : *rover->topheight;
- bottomheight = *rover->b_slope ? P_GetZAt(*rover->b_slope, player->mo->x, player->mo->y) : *rover->bottomheight;
+ topheight = P_GetFFloorTopZAt (rover, player->mo->x, player->mo->y);
+ bottomheight = P_GetFFloorBottomZAt(rover, player->mo->x, player->mo->y);
// Only supports rovers that are moving like an 'elevator', not just the top or bottom.
if (rover->master->frontsector->floorspeed && rover->master->frontsector->ceilspeed == 42)
@@ -3258,8 +3245,7 @@ static void P_DoClimbing(player_t *player)
if (roverbelow == rover)
continue;
- bottomheight2 = *roverbelow->b_slope ? P_GetZAt(*roverbelow->b_slope, player->mo->x, player->mo->y) : *roverbelow->bottomheight;
-
+ bottomheight2 = P_GetFFloorBottomZAt(roverbelow, player->mo->x, player->mo->y);
if (bottomheight2 < topheight + FixedMul(16*FRACUNIT, player->mo->scale))
foundfof = true;
}
@@ -3304,8 +3290,7 @@ static void P_DoClimbing(player_t *player)
if (roverbelow == rover)
continue;
- topheight2 = *roverbelow->t_slope ? P_GetZAt(*roverbelow->t_slope, player->mo->x, player->mo->y) : *roverbelow->topheight;
-
+ topheight2 = P_GetFFloorTopZAt(roverbelow, player->mo->x, player->mo->y);
if (topheight2 > bottomheight - FixedMul(16*FRACUNIT, player->mo->scale))
foundfof = true;
}
@@ -3359,8 +3344,7 @@ static void P_DoClimbing(player_t *player)
if (!(rover->flags & FF_EXISTS) || !(rover->flags & FF_BLOCKPLAYER) || (rover->flags & FF_BUSTUP))
continue;
- bottomheight = *rover->b_slope ? P_GetZAt(*rover->b_slope, player->mo->x, player->mo->y) : *rover->bottomheight;
-
+ bottomheight = P_GetFFloorBottomZAt(rover, player->mo->x, player->mo->y);
if (bottomheight < floorheight + FixedMul(16*FRACUNIT, player->mo->scale))
{
foundfof = true;
@@ -3400,8 +3384,7 @@ static void P_DoClimbing(player_t *player)
if (!(rover->flags & FF_EXISTS) || !(rover->flags & FF_BLOCKPLAYER) || (rover->flags & FF_BUSTUP))
continue;
- topheight = *rover->t_slope ? P_GetZAt(*rover->t_slope, player->mo->x, player->mo->y) : *rover->topheight;
-
+ topheight = P_GetFFloorTopZAt(rover, player->mo->x, player->mo->y);
if (topheight > ceilingheight - FixedMul(16*FRACUNIT, player->mo->scale))
{
foundfof = true;
@@ -3773,12 +3756,8 @@ static void P_DoTeeter(player_t *player)
sec = R_PointInSubsector(checkx, checky)->sector;
- ceilingheight = sec->ceilingheight;
- floorheight = sec->floorheight;
- if (sec->c_slope)
- ceilingheight = P_GetZAt(sec->c_slope, checkx, checky);
- if (sec->f_slope)
- floorheight = P_GetZAt(sec->f_slope, checkx, checky);
+ ceilingheight = P_GetSectorCeilingZAt(sec, checkx, checky);
+ floorheight = P_GetSectorFloorZAt (sec, checkx, checky);
highestceilingheight = (ceilingheight > highestceilingheight) ? ceilingheight : highestceilingheight;
lowestfloorheight = (floorheight < lowestfloorheight) ? floorheight : lowestfloorheight;
@@ -3789,8 +3768,8 @@ static void P_DoTeeter(player_t *player)
{
if (!(rover->flags & FF_EXISTS)) continue;
- topheight = *rover->t_slope ? P_GetZAt(*rover->t_slope, player->mo->x, player->mo->y) : *rover->topheight;
- bottomheight = *rover->b_slope ? P_GetZAt(*rover->b_slope, player->mo->x, player->mo->y) : *rover->bottomheight;
+ topheight = P_GetFFloorTopZAt (rover, player->mo->x, player->mo->y);
+ bottomheight = P_GetFFloorBottomZAt(rover, player->mo->x, player->mo->y);
if (P_CheckSolidLava(rover))
;
@@ -4455,13 +4434,16 @@ void P_DoJump(player_t *player, boolean soundandstate)
else if (player->powers[pw_carry] == CR_ROLLOUT)
{
player->mo->momz = 9*FRACUNIT;
- if (P_MobjFlip(player->mo->tracer)*player->mo->tracer->momz > 0)
- player->mo->momz += player->mo->tracer->momz;
- if (!P_IsObjectOnGround(player->mo->tracer))
- P_SetObjectMomZ(player->mo->tracer, -9*FRACUNIT, true);
+ if (player->mo->tracer)
+ {
+ if (P_MobjFlip(player->mo->tracer)*player->mo->tracer->momz > 0)
+ player->mo->momz += player->mo->tracer->momz;
+ if (!P_IsObjectOnGround(player->mo->tracer))
+ P_SetObjectMomZ(player->mo->tracer, -9*FRACUNIT, true);
+ player->mo->tracer->flags |= MF_PUSHABLE;
+ P_SetTarget(&player->mo->tracer->tracer, NULL);
+ }
player->powers[pw_carry] = CR_NONE;
- player->mo->tracer->flags |= MF_PUSHABLE;
- P_SetTarget(&player->mo->tracer->tracer, NULL);
P_SetTarget(&player->mo->tracer, NULL);
}
else if (player->mo->eflags & MFE_GOOWATER)
@@ -5019,6 +5001,15 @@ void P_Telekinesis(player_t *player, fixed_t thrust, fixed_t range)
player->pflags |= PF_THOKKED;
}
+static void P_DoTwinSpin(player_t *player)
+{
+ player->pflags &= ~PF_NOJUMPDAMAGE;
+ player->pflags |= P_GetJumpFlags(player) | PF_THOKKED;
+ S_StartSound(player->mo, sfx_s3k42);
+ player->mo->frame = 0;
+ P_SetPlayerMobjState(player->mo, S_PLAY_TWINSPIN);
+}
+
//
// P_DoJumpStuff
//
@@ -5189,12 +5180,7 @@ static void P_DoJumpStuff(player_t *player, ticcmd_t *cmd)
break;
case CA_TWINSPIN:
if ((player->charability2 == CA2_MELEE) && (!(player->pflags & (PF_THOKKED|PF_USEDOWN)) || player->charflags & SF_MULTIABILITY))
- {
- player->pflags |= PF_THOKKED;
- S_StartSound(player->mo, sfx_s3k42);
- player->mo->frame = 0;
- P_SetPlayerMobjState(player->mo, S_PLAY_TWINSPIN);
- }
+ P_DoTwinSpin(player);
break;
default:
break;
@@ -5451,12 +5437,7 @@ static void P_DoJumpStuff(player_t *player, ticcmd_t *cmd)
break;
case CA_TWINSPIN:
if (!(player->pflags & PF_THOKKED) || player->charflags & SF_MULTIABILITY)
- {
- player->pflags |= PF_THOKKED;
- S_StartSound(player->mo, sfx_s3k42);
- player->mo->frame = 0;
- P_SetPlayerMobjState(player->mo, S_PLAY_TWINSPIN);
- }
+ P_DoTwinSpin(player);
break;
default:
break;
@@ -7767,7 +7748,7 @@ void P_ElementalFire(player_t *player, boolean cropcircle)
if (player->mo->standingslope)
{
- ground = P_GetZAt(player->mo->standingslope, newx, newy);
+ ground = P_GetSlopeZAt(player->mo->standingslope, newx, newy);
if (player->mo->eflags & MFE_VERTICALFLIP)
ground -= FixedMul(mobjinfo[MT_SPINFIRE].height, player->mo->scale);
}
@@ -8743,10 +8724,7 @@ static void P_MovePlayer(player_t *player)
static void P_DoZoomTube(player_t *player)
{
- INT32 sequence;
fixed_t speed;
- thinker_t *th;
- mobj_t *mo2;
mobj_t *waypoint = NULL;
fixed_t dist;
boolean reverse;
@@ -8762,8 +8740,6 @@ static void P_DoZoomTube(player_t *player)
speed = abs(player->speed);
- sequence = player->mo->tracer->threshold;
-
// change slope
dist = P_AproxDistance(P_AproxDistance(player->mo->tracer->x - player->mo->x, player->mo->tracer->y - player->mo->y), player->mo->tracer->z - player->mo->z);
@@ -8795,28 +8771,7 @@ static void P_DoZoomTube(player_t *player)
CONS_Debug(DBG_GAMELOGIC, "Looking for next waypoint...\n");
// Find next waypoint
- for (th = thlist[THINK_MOBJ].next; th != &thlist[THINK_MOBJ]; th = th->next)
- {
- if (th->function.acp1 == (actionf_p1)P_RemoveThinkerDelayed)
- continue;
-
- mo2 = (mobj_t *)th;
-
- if (mo2->type != MT_TUBEWAYPOINT)
- continue;
-
- if (mo2->threshold != sequence)
- continue;
-
- if (reverse && mo2->health != player->mo->tracer->health - 1)
- continue;
-
- if (!reverse && mo2->health != player->mo->tracer->health + 1)
- continue;
-
- waypoint = mo2;
- break;
- }
+ waypoint = reverse ? P_GetPreviousWaypoint(player->mo->tracer, false) : P_GetNextWaypoint(player->mo->tracer, false);
if (waypoint)
{
@@ -8867,8 +8822,6 @@ static void P_DoRopeHang(player_t *player)
{
INT32 sequence;
fixed_t speed;
- thinker_t *th;
- mobj_t *mo2;
mobj_t *waypoint = NULL;
fixed_t dist;
fixed_t playerz;
@@ -8931,50 +8884,14 @@ static void P_DoRopeHang(player_t *player)
CONS_Debug(DBG_GAMELOGIC, "Looking for next waypoint...\n");
// Find next waypoint
- for (th = thlist[THINK_MOBJ].next; th != &thlist[THINK_MOBJ]; th = th->next)
- {
- if (th->function.acp1 == (actionf_p1)P_RemoveThinkerDelayed)
- continue;
-
- mo2 = (mobj_t *)th;
-
- if (mo2->type != MT_TUBEWAYPOINT)
- continue;
-
- if (mo2->threshold != sequence)
- continue;
-
- if (mo2->health != player->mo->tracer->health + 1)
- continue;
-
- waypoint = mo2;
- break;
- }
+ waypoint = P_GetNextWaypoint(player->mo->tracer, false);
if (!(player->mo->tracer->flags & MF_SLIDEME) && !waypoint)
{
CONS_Debug(DBG_GAMELOGIC, "Next waypoint not found, wrapping to start...\n");
// Wrap around back to first waypoint
- for (th = thlist[THINK_MOBJ].next; th != &thlist[THINK_MOBJ]; th = th->next)
- {
- if (th->function.acp1 == (actionf_p1)P_RemoveThinkerDelayed)
- continue;
-
- mo2 = (mobj_t *)th;
-
- if (mo2->type != MT_TUBEWAYPOINT)
- continue;
-
- if (mo2->threshold != sequence)
- continue;
-
- if (mo2->health != 0)
- continue;
-
- waypoint = mo2;
- break;
- }
+ waypoint = P_GetFirstWaypoint(sequence);
}
if (waypoint)
@@ -10670,8 +10587,8 @@ static void P_CalcPostImg(player_t *player)
if (!(rover->flags & FF_EXISTS))
continue;
- topheight = *rover->t_slope ? P_GetZAt(*rover->t_slope, player->mo->x, player->mo->y) : *rover->topheight;
- bottomheight = *rover->b_slope ? P_GetZAt(*rover->b_slope, player->mo->x, player->mo->y) : *rover->bottomheight;
+ topheight = P_GetFFloorTopZAt (rover, player->mo->x, player->mo->y);
+ bottomheight = P_GetFFloorBottomZAt(rover, player->mo->x, player->mo->y);
if (pviewheight >= topheight || pviewheight <= bottomheight)
continue;
@@ -10693,8 +10610,8 @@ static void P_CalcPostImg(player_t *player)
if (!(rover->flags & FF_EXISTS) || !(rover->flags & FF_SWIMMABLE) || rover->flags & FF_BLOCKPLAYER)
continue;
- topheight = *rover->t_slope ? P_GetZAt(*rover->t_slope, player->mo->x, player->mo->y) : *rover->topheight;
- bottomheight = *rover->b_slope ? P_GetZAt(*rover->b_slope, player->mo->x, player->mo->y) : *rover->bottomheight;
+ topheight = P_GetFFloorTopZAt (rover, player->mo->x, player->mo->y);
+ bottomheight = P_GetFFloorBottomZAt(rover, player->mo->x, player->mo->y);
if (pviewheight >= topheight || pviewheight <= bottomheight)
continue;
@@ -10756,7 +10673,7 @@ static sector_t *P_GetMinecartSector(fixed_t x, fixed_t y, fixed_t z, fixed_t *n
if (!(rover->flags & (FF_EXISTS|FF_BLOCKOTHERS)))
continue;
- *nz = *rover->t_slope ? P_GetZAt(*rover->t_slope, x, y) : *rover->topheight;
+ *nz = P_GetFFloorTopZAt(rover, x, y);
if (abs(z - *nz) <= 56*FRACUNIT)
{
sec = §ors[rover->secnum];
@@ -10766,7 +10683,7 @@ static sector_t *P_GetMinecartSector(fixed_t x, fixed_t y, fixed_t z, fixed_t *n
}
- *nz = sec->f_slope ? P_GetZAt(sec->f_slope, x, y) : sec->floorheight;
+ *nz = P_GetSectorFloorZAt(sec, x, y);
if (abs(z - *nz) > 56*FRACUNIT)
return NULL;
@@ -11120,8 +11037,8 @@ static void P_MinecartThink(player_t *player)
if (minecart->standingslope)
{
fixed_t fa2 = (minecart->angle >> ANGLETOFINESHIFT) & FINEMASK;
- fixed_t front = P_GetZAt(minecart->standingslope, minecart->x, minecart->y);
- fixed_t back = P_GetZAt(minecart->standingslope, minecart->x - FINECOSINE(fa2), minecart->y - FINESINE(fa2));
+ fixed_t front = P_GetSlopeZAt(minecart->standingslope, minecart->x, minecart->y);
+ fixed_t back = P_GetSlopeZAt(minecart->standingslope, minecart->x - FINECOSINE(fa2), minecart->y - FINESINE(fa2));
if (abs(front - back) < 3*FRACUNIT)
currentSpeed += (back - front)/3;
@@ -11942,6 +11859,9 @@ void P_PlayerThink(player_t *player)
factor = 4;
}
break;
+ case CR_DUSTDEVIL:
+ player->drawangle += ANG20;
+ break;
/* -- in case we wanted to have the camera freely movable during zoom tubes
case CR_ZOOMTUBE:*/
case CR_ROPEHANG:
@@ -12714,6 +12634,19 @@ void P_PlayerAfterThink(player_t *player)
}
break;
}
+ case CR_DUSTDEVIL:
+ {
+ mobj_t *mo = player->mo, *dustdevil = player->mo->tracer;
+
+ if (abs(mo->x - dustdevil->x) > dustdevil->radius || abs(mo->y - dustdevil->y) > dustdevil->radius)
+ {
+ P_SetTarget(&player->mo->tracer, NULL);
+ player->powers[pw_carry] = CR_NONE;
+ break;
+ }
+
+ break;
+ }
case CR_ROLLOUT:
{
mobj_t *mo = player->mo, *rock = player->mo->tracer;
diff --git a/src/r_bsp.c b/src/r_bsp.c
index 3bd023dbf1012bd0315f927d2b8c4fbb739ba355..60291da0ff12b64fd5f55ba52e044ce9d966cf56 100644
--- a/src/r_bsp.c
+++ b/src/r_bsp.c
@@ -495,16 +495,13 @@ static void R_AddLine(seg_t *line)
fixed_t frontf1,frontf2, frontc1, frontc2; // front floor/ceiling ends
fixed_t backf1, backf2, backc1, backc2; // back floor ceiling ends
#define SLOPEPARAMS(slope, end1, end2, normalheight) \
- if (slope) { \
- end1 = P_GetZAt(slope, line->v1->x, line->v1->y); \
- end2 = P_GetZAt(slope, line->v2->x, line->v2->y); \
- } else \
- end1 = end2 = normalheight;
+ end1 = P_GetZAt(slope, line->v1->x, line->v1->y, normalheight); \
+ end2 = P_GetZAt(slope, line->v2->x, line->v2->y, normalheight);
- SLOPEPARAMS(frontsector->f_slope, frontf1, frontf2, frontsector->floorheight)
+ SLOPEPARAMS(frontsector->f_slope, frontf1, frontf2, frontsector-> floorheight)
SLOPEPARAMS(frontsector->c_slope, frontc1, frontc2, frontsector->ceilingheight)
- SLOPEPARAMS( backsector->f_slope, backf1, backf2, backsector->floorheight)
- SLOPEPARAMS( backsector->c_slope, backc1, backc2, backsector->ceilingheight)
+ SLOPEPARAMS( backsector->f_slope, backf1, backf2, backsector-> floorheight)
+ SLOPEPARAMS( backsector->c_slope, backc1, backc2, backsector->ceilingheight)
#undef SLOPEPARAMS
// if both ceilings are skies, consider it always "open"
// same for floors
@@ -851,13 +848,8 @@ static void R_Subsector(size_t num)
floorcolormap = ceilingcolormap = frontsector->extra_colormap;
- floorcenterz = frontsector->f_slope ?
- P_GetZAt(frontsector->f_slope, frontsector->soundorg.x, frontsector->soundorg.y) :
- frontsector->floorheight;
-
- ceilingcenterz = frontsector->c_slope ?
- P_GetZAt(frontsector->c_slope, frontsector->soundorg.x, frontsector->soundorg.y) :
- frontsector->ceilingheight;
+ floorcenterz = P_GetSectorFloorZAt (frontsector, frontsector->soundorg.x, frontsector->soundorg.y);
+ ceilingcenterz = P_GetSectorCeilingZAt(frontsector, frontsector->soundorg.x, frontsector->soundorg.y);
// Check and prep all 3D floors. Set the sector floor/ceiling light levels and colormaps.
if (frontsector->ffloors)
@@ -883,7 +875,7 @@ static void R_Subsector(size_t num)
sub->sector->extra_colormap = frontsector->extra_colormap;
- if ((frontsector->f_slope ? P_GetZAt(frontsector->f_slope, viewx, viewy) : frontsector->floorheight) < viewz
+ if (P_GetSectorFloorZAt(frontsector, viewx, viewy) < viewz
|| frontsector->floorpic == skyflatnum
|| (frontsector->heightsec != -1 && sectors[frontsector->heightsec].ceilingpic == skyflatnum))
{
@@ -893,7 +885,7 @@ static void R_Subsector(size_t num)
else
floorplane = NULL;
- if ((frontsector->c_slope ? P_GetZAt(frontsector->c_slope, viewx, viewy) : frontsector->ceilingheight) > viewz
+ if (P_GetSectorCeilingZAt(frontsector, viewx, viewy) > viewz
|| frontsector->ceilingpic == skyflatnum
|| (frontsector->heightsec != -1 && sectors[frontsector->heightsec].floorpic == skyflatnum))
{
@@ -930,13 +922,9 @@ static void R_Subsector(size_t num)
ffloor[numffloors].plane = NULL;
ffloor[numffloors].polyobj = NULL;
- heightcheck = *rover->b_slope ?
- P_GetZAt(*rover->b_slope, viewx, viewy) :
- *rover->bottomheight;
+ heightcheck = P_GetFFloorBottomZAt(rover, viewx, viewy);
- planecenterz = *rover->b_slope ?
- P_GetZAt(*rover->b_slope, frontsector->soundorg.x, frontsector->soundorg.y) :
- *rover->bottomheight;
+ planecenterz = P_GetFFloorBottomZAt(rover, frontsector->soundorg.x, frontsector->soundorg.y);
if (planecenterz <= ceilingcenterz
&& planecenterz >= floorcenterz
&& ((viewz < heightcheck && (rover->flags & FF_BOTHPLANES || !(rover->flags & FF_INVERTPLANES)))
@@ -964,13 +952,9 @@ static void R_Subsector(size_t num)
ffloor[numffloors].plane = NULL;
ffloor[numffloors].polyobj = NULL;
- heightcheck = *rover->t_slope ?
- P_GetZAt(*rover->t_slope, viewx, viewy) :
- *rover->topheight;
+ heightcheck = P_GetFFloorTopZAt(rover, viewx, viewy);
- planecenterz = *rover->t_slope ?
- P_GetZAt(*rover->t_slope, frontsector->soundorg.x, frontsector->soundorg.y) :
- *rover->topheight;
+ planecenterz = P_GetFFloorTopZAt(rover, frontsector->soundorg.x, frontsector->soundorg.y);
if (planecenterz >= floorcenterz
&& planecenterz <= ceilingcenterz
&& ((viewz > heightcheck && (rover->flags & FF_BOTHPLANES || !(rover->flags & FF_INVERTPLANES)))
@@ -1133,7 +1117,7 @@ void R_Prep3DFloors(sector_t *sector)
else
memset(sector->lightlist, 0, sizeof (lightlist_t) * count);
- heighttest = sector->c_slope ? P_GetZAt(sector->c_slope, sector->soundorg.x, sector->soundorg.y) : sector->ceilingheight;
+ heighttest = P_GetSectorCeilingZAt(sector, sector->soundorg.x, sector->soundorg.y);
sector->lightlist[0].height = heighttest + 1;
sector->lightlist[0].slope = sector->c_slope;
@@ -1154,7 +1138,7 @@ void R_Prep3DFloors(sector_t *sector)
&& !(rover->flags & FF_CUTLEVEL) && !(rover->flags & FF_CUTSPRITES)))
continue;
- heighttest = *rover->t_slope ? P_GetZAt(*rover->t_slope, sector->soundorg.x, sector->soundorg.y) : *rover->topheight;
+ heighttest = P_GetFFloorTopZAt(rover, sector->soundorg.x, sector->soundorg.y);
if (heighttest > bestheight && heighttest < maxheight)
{
@@ -1164,7 +1148,7 @@ void R_Prep3DFloors(sector_t *sector)
continue;
}
if (rover->flags & FF_DOUBLESHADOW) {
- heighttest = *rover->b_slope ? P_GetZAt(*rover->b_slope, sector->soundorg.x, sector->soundorg.y) : *rover->bottomheight;
+ heighttest = P_GetFFloorBottomZAt(rover, sector->soundorg.x, sector->soundorg.y);
if (heighttest > bestheight
&& heighttest < maxheight)
@@ -1206,7 +1190,7 @@ void R_Prep3DFloors(sector_t *sector)
if (best->flags & FF_DOUBLESHADOW)
{
- heighttest = *best->b_slope ? P_GetZAt(*best->b_slope, sector->soundorg.x, sector->soundorg.y) : *best->bottomheight;
+ heighttest = P_GetFFloorBottomZAt(best, sector->soundorg.x, sector->soundorg.y);
if (bestheight == heighttest) ///TODO: do this in a more efficient way -Red
{
sector->lightlist[i].lightlevel = sector->lightlist[best->lastlight].lightlevel;
diff --git a/src/r_main.c b/src/r_main.c
index 9a3d98870fe1d206400fed4e4d0240deea52b682..e47bb06e3fb116b3735988d1c0ac90f93b0b64af 100644
--- a/src/r_main.c
+++ b/src/r_main.c
@@ -1388,7 +1388,7 @@ void R_RenderPlayerView(player_t *player)
else
{
portalclipstart = 0;
- portalclipend = viewwidth-1;
+ portalclipend = viewwidth;
R_ClearClipSegs();
}
R_ClearDrawSegs();
diff --git a/src/r_patch.c b/src/r_patch.c
index 9e31d4d191b8a4e8876722c3c17156096eee92af..ad4b3329a439daf4a5605fb3e8569b2fdc0bd680 100644
--- a/src/r_patch.c
+++ b/src/r_patch.c
@@ -1231,9 +1231,9 @@ void R_CacheRotSprite(spritenum_t sprnum, UINT8 frame, spriteinfo_t *sprinfo, sp
if (!R_CheckIfPatch(lump))
return;
- width = patch->width;
- height = patch->height;
- leftoffset = patch->leftoffset;
+ width = SHORT(patch->width);
+ height = SHORT(patch->height);
+ leftoffset = SHORT(patch->leftoffset);
// rotation pivot
px = SPRITE_XCENTER;
@@ -1348,7 +1348,7 @@ void R_CacheRotSprite(spritenum_t sprnum, UINT8 frame, spriteinfo_t *sprinfo, sp
newpatch = R_MaskedFlatToPatch(rawdst, newwidth, newheight, 0, 0, &size);
{
newpatch->leftoffset = (newpatch->width / 2) + (leftoffset - px);
- newpatch->topoffset = (newpatch->height / 2) + (patch->topoffset - py);
+ newpatch->topoffset = (newpatch->height / 2) + (SHORT(patch->topoffset) - py);
}
//BP: we cannot use special tric in hardware mode because feet in ground caused by z-buffer
@@ -1358,6 +1358,12 @@ void R_CacheRotSprite(spritenum_t sprnum, UINT8 frame, spriteinfo_t *sprinfo, sp
// P_PrecacheLevel
if (devparm) spritememory += size;
+ // convert everything to little-endian, for big-endian support
+ newpatch->width = SHORT(newpatch->width);
+ newpatch->height = SHORT(newpatch->height);
+ newpatch->leftoffset = SHORT(newpatch->leftoffset);
+ newpatch->topoffset = SHORT(newpatch->topoffset);
+
#ifdef HWRENDER
if (rendermode == render_opengl)
{
diff --git a/src/r_plane.c b/src/r_plane.c
index 9b5a943408d1b06139cc6a97c5f7fb62ae9d0875..6857b6dca9b131cd025f69599ffc6123ac7a0cdb 100644
--- a/src/r_plane.c
+++ b/src/r_plane.c
@@ -833,15 +833,15 @@ static void R_SlopeVectors(visplane_t *pl, INT32 i, float fudge)
floatv3_t p, m, n;
float ang;
float vx, vy, vz;
- // compiler complains when P_GetZAt is used in FLOAT_TO_FIXED directly
- // use this as a temp var to store P_GetZAt's return value each time
+ // compiler complains when P_GetSlopeZAt is used in FLOAT_TO_FIXED directly
+ // use this as a temp var to store P_GetSlopeZAt's return value each time
fixed_t temp;
vx = FIXED_TO_FLOAT(pl->viewx+xoffs);
vy = FIXED_TO_FLOAT(pl->viewy-yoffs);
vz = FIXED_TO_FLOAT(pl->viewz);
- temp = P_GetZAt(pl->slope, pl->viewx, pl->viewy);
+ temp = P_GetSlopeZAt(pl->slope, pl->viewx, pl->viewy);
zeroheight = FIXED_TO_FLOAT(temp);
// p is the texture origin in view space
@@ -850,7 +850,7 @@ static void R_SlopeVectors(visplane_t *pl, INT32 i, float fudge)
ang = ANG2RAD(ANGLE_270 - pl->viewangle);
p.x = vx * cos(ang) - vy * sin(ang);
p.z = vx * sin(ang) + vy * cos(ang);
- temp = P_GetZAt(pl->slope, -xoffs, yoffs);
+ temp = P_GetSlopeZAt(pl->slope, -xoffs, yoffs);
p.y = FIXED_TO_FLOAT(temp) - vz;
// m is the v direction vector in view space
@@ -863,9 +863,9 @@ static void R_SlopeVectors(visplane_t *pl, INT32 i, float fudge)
n.z = -cos(ang);
ang = ANG2RAD(pl->plangle);
- temp = P_GetZAt(pl->slope, pl->viewx + FLOAT_TO_FIXED(sin(ang)), pl->viewy + FLOAT_TO_FIXED(cos(ang)));
+ temp = P_GetSlopeZAt(pl->slope, pl->viewx + FLOAT_TO_FIXED(sin(ang)), pl->viewy + FLOAT_TO_FIXED(cos(ang)));
m.y = FIXED_TO_FLOAT(temp) - zeroheight;
- temp = P_GetZAt(pl->slope, pl->viewx + FLOAT_TO_FIXED(cos(ang)), pl->viewy - FLOAT_TO_FIXED(sin(ang)));
+ temp = P_GetSlopeZAt(pl->slope, pl->viewx + FLOAT_TO_FIXED(cos(ang)), pl->viewy - FLOAT_TO_FIXED(sin(ang)));
n.y = FIXED_TO_FLOAT(temp) - zeroheight;
if (ds_powersoftwo)
@@ -1177,7 +1177,7 @@ void R_DrawSinglePlane(visplane_t *pl)
if (itswater)
{
INT32 i;
- fixed_t plheight = abs(P_GetZAt(pl->slope, pl->viewx, pl->viewy) - pl->viewz);
+ fixed_t plheight = abs(P_GetSlopeZAt(pl->slope, pl->viewx, pl->viewy) - pl->viewz);
fixed_t rxoffs = xoffs;
fixed_t ryoffs = yoffs;
diff --git a/src/r_segs.c b/src/r_segs.c
index 6a838be79434b570b10fb2932c00b611a4b4a49a..741a25254037fbc1dd15017603e116d3ee4f8f7d 100644
--- a/src/r_segs.c
+++ b/src/r_segs.c
@@ -376,16 +376,13 @@ void R_RenderMaskedSegRange(drawseg_t *ds, INT32 x1, INT32 x2)
fixed_t leftheight, rightheight;
light = &frontsector->lightlist[i];
rlight = &dc_lightlist[i];
- if (light->slope) {
- leftheight = P_GetZAt(light->slope, ds->leftpos.x, ds->leftpos.y);
- rightheight = P_GetZAt(light->slope, ds->rightpos.x, ds->rightpos.y);
- } else
- leftheight = rightheight = light->height;
+ leftheight = P_GetLightZAt(light, ds-> leftpos.x, ds-> leftpos.y);
+ rightheight = P_GetLightZAt(light, ds->rightpos.x, ds->rightpos.y);
- leftheight -= viewz;
+ leftheight -= viewz;
rightheight -= viewz;
- rlight->height = (centeryfrac) - FixedMul(leftheight, ds->scale1);
+ rlight->height = (centeryfrac) - FixedMul(leftheight , ds->scale1);
rlight->heightstep = (centeryfrac) - FixedMul(rightheight, ds->scale2);
rlight->heightstep = (rlight->heightstep-rlight->height)/(range);
//if (x1 > ds->x1)
@@ -799,11 +796,8 @@ void R_RenderThickSideRange(drawseg_t *ds, INT32 x1, INT32 x2, ffloor_t *pfloor)
rlight = &dc_lightlist[p];
#define SLOPEPARAMS(slope, end1, end2, normalheight) \
- if (slope) { \
- end1 = P_GetZAt(slope, ds->leftpos.x, ds->leftpos.y); \
- end2 = P_GetZAt(slope, ds->rightpos.x, ds->rightpos.y); \
- } else \
- end1 = end2 = normalheight;
+ end1 = P_GetZAt(slope, ds-> leftpos.x, ds-> leftpos.y, normalheight); \
+ end2 = P_GetZAt(slope, ds->rightpos.x, ds->rightpos.y, normalheight);
SLOPEPARAMS(light->slope, leftheight, rightheight, light->height)
SLOPEPARAMS(*pfloor->b_slope, pfloorleft, pfloorright, *pfloor->bottomheight)
@@ -816,8 +810,8 @@ void R_RenderThickSideRange(drawseg_t *ds, INT32 x1, INT32 x2, ffloor_t *pfloor)
if (leftheight > pfloorleft && rightheight > pfloorright && i+1 < dc_numlights)
{
lightlist_t *nextlight = &frontsector->lightlist[i+1];
- if ((nextlight->slope ? P_GetZAt(nextlight->slope, ds->leftpos.x, ds->leftpos.y) : nextlight->height) > pfloorleft
- && (nextlight->slope ? P_GetZAt(nextlight->slope, ds->rightpos.x, ds->rightpos.y) : nextlight->height) > pfloorright)
+ if (P_GetZAt(nextlight->slope, ds-> leftpos.x, ds-> leftpos.y, nextlight->height) > pfloorleft
+ && P_GetZAt(nextlight->slope, ds->rightpos.x, ds->rightpos.y, nextlight->height) > pfloorright)
continue;
}
@@ -913,15 +907,9 @@ void R_RenderThickSideRange(drawseg_t *ds, INT32 x1, INT32 x2, ffloor_t *pfloor)
dc_texheight = textureheight[texnum]>>FRACBITS;
// calculate both left ends
- if (*pfloor->t_slope)
- left_top = P_GetZAt(*pfloor->t_slope, ds->leftpos.x, ds->leftpos.y) - viewz;
- else
- left_top = *pfloor->topheight - viewz;
+ left_top = P_GetFFloorTopZAt (pfloor, ds->leftpos.x, ds->leftpos.y) - viewz;
+ left_bottom = P_GetFFloorBottomZAt(pfloor, ds->leftpos.x, ds->leftpos.y) - viewz;
- if (*pfloor->b_slope)
- left_bottom = P_GetZAt(*pfloor->b_slope, ds->leftpos.x, ds->leftpos.y) - viewz;
- else
- left_bottom = *pfloor->bottomheight - viewz;
skewslope = *pfloor->t_slope; // skew using top slope by default
if (newline)
{
@@ -997,15 +985,8 @@ void R_RenderThickSideRange(drawseg_t *ds, INT32 x1, INT32 x2, ffloor_t *pfloor)
fixed_t right_top, right_bottom;
// calculate right ends now
- if (*pfloor->t_slope)
- right_top = P_GetZAt(*pfloor->t_slope, ds->rightpos.x, ds->rightpos.y) - viewz;
- else
- right_top = *pfloor->topheight - viewz;
-
- if (*pfloor->b_slope)
- right_bottom = P_GetZAt(*pfloor->b_slope, ds->rightpos.x, ds->rightpos.y) - viewz;
- else
- right_bottom = *pfloor->bottomheight - viewz;
+ right_top = P_GetFFloorTopZAt (pfloor, ds->rightpos.x, ds->rightpos.y) - viewz;
+ right_bottom = P_GetFFloorBottomZAt(pfloor, ds->rightpos.x, ds->rightpos.y) - viewz;
// using INT64 to avoid 32bit overflow
top_frac = (INT64)centeryfrac - (((INT64)left_top * ds->scale1) >> FRACBITS);
@@ -1787,11 +1768,8 @@ void R_StoreWallRange(INT32 start, INT32 stop)
#define SLOPEPARAMS(slope, end1, end2, normalheight) \
- if (slope) { \
- end1 = P_GetZAt(slope, segleft.x, segleft.y); \
- end2 = P_GetZAt(slope, segright.x, segright.y); \
- } else \
- end1 = end2 = normalheight;
+ end1 = P_GetZAt(slope, segleft.x, segleft.y, normalheight); \
+ end2 = P_GetZAt(slope, segright.x, segright.y, normalheight);
SLOPEPARAMS(frontsector->c_slope, worldtop, worldtopslope, frontsector->ceilingheight)
SLOPEPARAMS(frontsector->f_slope, worldbottom, worldbottomslope, frontsector->floorheight)
@@ -1820,12 +1798,8 @@ void R_StoreWallRange(INT32 start, INT32 stop)
if (ffloor[i].polyobj && (!ds_p->curline->polyseg || ffloor[i].polyobj != ds_p->curline->polyseg))
continue;
- if (ffloor[i].slope) {
- ffloor[i].f_pos = P_GetZAt(ffloor[i].slope, segleft.x, segleft.y) - viewz;
- ffloor[i].f_pos_slope = P_GetZAt(ffloor[i].slope, segright.x, segright.y) - viewz;
- }
- else
- ffloor[i].f_pos_slope = ffloor[i].f_pos = ffloor[i].height - viewz;
+ ffloor[i].f_pos = P_GetZAt(ffloor[i].slope, segleft .x, segleft .y, ffloor[i].height) - viewz;
+ ffloor[i].f_pos_slope = P_GetZAt(ffloor[i].slope, segright.x, segright.y, ffloor[i].height) - viewz;
}
}
@@ -1918,12 +1892,12 @@ void R_StoreWallRange(INT32 start, INT32 stop)
if (worldbottomslope > worldlowslope || worldbottom > worldlow)
{
ds_p->silhouette = SIL_BOTTOM;
- if ((backsector->f_slope ? P_GetZAt(backsector->f_slope, viewx, viewy) : backsector->floorheight) > viewz)
+ if (P_GetSectorFloorZAt(backsector, viewx, viewy) > viewz)
ds_p->bsilheight = INT32_MAX;
else
ds_p->bsilheight = (frontsector->f_slope ? INT32_MAX : frontsector->floorheight);
}
- else if ((backsector->f_slope ? P_GetZAt(backsector->f_slope, viewx, viewy) : backsector->floorheight) > viewz)
+ else if (P_GetSectorFloorZAt(backsector, viewx, viewy) > viewz)
{
ds_p->silhouette = SIL_BOTTOM;
ds_p->bsilheight = INT32_MAX;
@@ -1936,12 +1910,12 @@ void R_StoreWallRange(INT32 start, INT32 stop)
if (worldtopslope < worldhighslope || worldtop < worldhigh)
{
ds_p->silhouette |= SIL_TOP;
- if ((backsector->c_slope ? P_GetZAt(backsector->c_slope, viewx, viewy) : backsector->ceilingheight) < viewz)
+ if (P_GetSectorCeilingZAt(backsector, viewx, viewy) < viewz)
ds_p->tsilheight = INT32_MIN;
else
ds_p->tsilheight = (frontsector->c_slope ? INT32_MIN : frontsector->ceilingheight);
}
- else if ((backsector->c_slope ? P_GetZAt(backsector->c_slope, viewx, viewy) : backsector->ceilingheight) < viewz)
+ else if (P_GetSectorCeilingZAt(backsector, viewx, viewy) < viewz)
{
ds_p->silhouette |= SIL_TOP;
ds_p->tsilheight = INT32_MIN;
@@ -2272,10 +2246,10 @@ void R_StoreWallRange(INT32 start, INT32 stop)
continue;
// Oy vey.
- if ( ((*rover->t_slope ? P_GetZAt(*rover->t_slope, segleft .x, segleft .y) : *rover-> topheight) <= worldbottom + viewz
- && (*rover->t_slope ? P_GetZAt(*rover->t_slope, segright.x, segright.y) : *rover-> topheight) <= worldbottomslope + viewz)
- ||((*rover->b_slope ? P_GetZAt(*rover->b_slope, segleft .x, segleft .y) : *rover->bottomheight) >= worldtop + viewz
- && (*rover->b_slope ? P_GetZAt(*rover->b_slope, segright.x, segright.y) : *rover->bottomheight) >= worldtopslope + viewz))
+ if ( ((P_GetFFloorTopZAt (rover, segleft .x, segleft .y)) <= worldbottom + viewz
+ && (P_GetFFloorTopZAt (rover, segright.x, segright.y)) <= worldbottomslope + viewz)
+ ||((P_GetFFloorBottomZAt(rover, segleft .x, segleft .y)) >= worldtop + viewz
+ && (P_GetFFloorBottomZAt(rover, segright.x, segright.y)) >= worldtopslope + viewz))
continue;
ds_p->thicksides[i] = rover;
@@ -2293,16 +2267,16 @@ void R_StoreWallRange(INT32 start, INT32 stop)
if (rover->norender == leveltime)
continue;
// Oy vey.
- if ( ((*rover->t_slope ? P_GetZAt(*rover->t_slope, segleft .x, segleft .y) : *rover-> topheight) <= worldbottom + viewz
- && (*rover->t_slope ? P_GetZAt(*rover->t_slope, segright.x, segright.y) : *rover-> topheight) <= worldbottomslope + viewz)
- ||((*rover->b_slope ? P_GetZAt(*rover->b_slope, segleft .x, segleft .y) : *rover->bottomheight) >= worldtop + viewz
- && (*rover->b_slope ? P_GetZAt(*rover->b_slope, segright.x, segright.y) : *rover->bottomheight) >= worldtopslope + viewz))
+ if ( (P_GetFFloorTopZAt (rover, segleft .x, segleft .y) <= worldbottom + viewz
+ && P_GetFFloorTopZAt (rover, segright.x, segright.y) <= worldbottomslope + viewz)
+ ||(P_GetFFloorBottomZAt(rover, segleft .x, segleft .y) >= worldtop + viewz
+ && P_GetFFloorBottomZAt(rover, segright.x, segright.y) >= worldtopslope + viewz))
continue;
- if ( ((*rover->t_slope ? P_GetZAt(*rover->t_slope, segleft .x, segleft .y) : *rover-> topheight) <= worldlow + viewz
- && (*rover->t_slope ? P_GetZAt(*rover->t_slope, segright.x, segright.y) : *rover-> topheight) <= worldlowslope + viewz)
- ||((*rover->b_slope ? P_GetZAt(*rover->b_slope, segleft .x, segleft .y) : *rover->bottomheight) >= worldhigh + viewz
- && (*rover->b_slope ? P_GetZAt(*rover->b_slope, segright.x, segright.y) : *rover->bottomheight) >= worldhighslope + viewz))
+ if ( (P_GetFFloorTopZAt (rover, segleft .x, segleft .y) <= worldlow + viewz
+ && P_GetFFloorTopZAt (rover, segright.x, segright.y) <= worldlowslope + viewz)
+ ||(P_GetFFloorBottomZAt(rover, segleft .x, segleft .y) >= worldhigh + viewz
+ && P_GetFFloorBottomZAt(rover, segright.x, segright.y) >= worldhighslope + viewz))
continue;
ds_p->thicksides[i] = rover;
@@ -2425,17 +2399,13 @@ void R_StoreWallRange(INT32 start, INT32 stop)
// and doesn't need to be marked.
if (frontsector->heightsec == -1)
{
- if (frontsector->floorpic != skyflatnum && (frontsector->f_slope ?
- P_GetZAt(frontsector->f_slope, viewx, viewy) :
- frontsector->floorheight) >= viewz)
+ if (frontsector->floorpic != skyflatnum && P_GetSectorFloorZAt(frontsector, viewx, viewy) >= viewz)
{
// above view plane
markfloor = false;
}
- if (frontsector->ceilingpic != skyflatnum && (frontsector->c_slope ?
- P_GetZAt(frontsector->c_slope, viewx, viewy) :
- frontsector->ceilingheight) <= viewz)
+ if (frontsector->ceilingpic != skyflatnum && P_GetSectorCeilingZAt(frontsector, viewx, viewy) <= viewz)
{
// below view plane
markceiling = false;
@@ -2487,14 +2457,12 @@ void R_StoreWallRange(INT32 start, INT32 stop)
light = &frontsector->lightlist[i];
rlight = &dc_lightlist[p];
- if (light->slope) {
- leftheight = P_GetZAt(light->slope, segleft.x, segleft.y);
- rightheight = P_GetZAt(light->slope, segright.x, segright.y);
+ leftheight = P_GetLightZAt(light, segleft.x, segleft.y);
+ rightheight = P_GetLightZAt(light, segright.x, segright.y);
+ if (light->slope)
// Flag sector as having slopes
frontsector->hasslope = true;
- } else
- leftheight = rightheight = light->height;
leftheight -= viewz;
rightheight -= viewz;
@@ -2518,19 +2486,17 @@ void R_StoreWallRange(INT32 start, INT32 stop)
if (light->caster && light->caster->flags & FF_CUTSOLIDS)
{
- if (*light->caster->b_slope) {
- leftheight = P_GetZAt(*light->caster->b_slope, segleft.x, segleft.y);
- rightheight = P_GetZAt(*light->caster->b_slope, segright.x, segright.y);
+ leftheight = P_GetFFloorBottomZAt(light->caster, segleft.x, segleft.y);
+ rightheight = P_GetFFloorBottomZAt(light->caster, segright.x, segright.y);
+ if (*light->caster->b_slope)
// Flag sector as having slopes
frontsector->hasslope = true;
- } else
- leftheight = rightheight = *light->caster->bottomheight;
- leftheight -= viewz;
+ leftheight -= viewz;
rightheight -= viewz;
- leftheight >>= 4;
+ leftheight >>= 4;
rightheight >>= 4;
rlight->botheight = (centeryfrac>>4) - FixedMul(leftheight, rw_scale);
@@ -2614,9 +2580,9 @@ void R_StoreWallRange(INT32 start, INT32 stop)
if (*rover->b_slope || *rover->t_slope)
backsector->hasslope = true;
- roverleft = (*rover->b_slope ? P_GetZAt(*rover->b_slope, segleft.x, segleft.y) : *rover->bottomheight) - viewz;
- roverright = (*rover->b_slope ? P_GetZAt(*rover->b_slope, segright.x, segright.y) : *rover->bottomheight) - viewz;
- planevistest = (*rover->b_slope ? P_GetZAt(*rover->b_slope, viewx, viewy) : *rover->bottomheight);
+ roverleft = P_GetFFloorBottomZAt(rover, segleft .x, segleft .y) - viewz;
+ roverright = P_GetFFloorBottomZAt(rover, segright.x, segright.y) - viewz;
+ planevistest = P_GetFFloorBottomZAt(rover, viewx, viewy);
if ((roverleft>>4 <= worldhigh || roverright>>4 <= worldhighslope) &&
(roverleft>>4 >= worldlow || roverright>>4 >= worldlowslope) &&
@@ -2637,9 +2603,9 @@ void R_StoreWallRange(INT32 start, INT32 stop)
if (i >= MAXFFLOORS)
break;
- roverleft = (*rover->t_slope ? P_GetZAt(*rover->t_slope, segleft.x, segleft.y) : *rover->topheight) - viewz;
- roverright = (*rover->t_slope ? P_GetZAt(*rover->t_slope, segright.x, segright.y) : *rover->topheight) - viewz;
- planevistest = (*rover->t_slope ? P_GetZAt(*rover->t_slope, viewx, viewy) : *rover->topheight);
+ roverleft = P_GetFFloorTopZAt(rover, segleft .x, segleft .y) - viewz;
+ roverright = P_GetFFloorTopZAt(rover, segright.x, segright.y) - viewz;
+ planevistest = P_GetFFloorTopZAt(rover, viewx, viewy);
if ((roverleft>>4 <= worldhigh || roverright>>4 <= worldhighslope) &&
(roverleft>>4 >= worldlow || roverright>>4 >= worldlowslope) &&
@@ -2671,9 +2637,9 @@ void R_StoreWallRange(INT32 start, INT32 stop)
if (*rover->b_slope || *rover->t_slope)
frontsector->hasslope = true;
- roverleft = (*rover->b_slope ? P_GetZAt(*rover->b_slope, segleft.x, segleft.y) : *rover->bottomheight) - viewz;
- roverright = (*rover->b_slope ? P_GetZAt(*rover->b_slope, segright.x, segright.y) : *rover->bottomheight) - viewz;
- planevistest = (*rover->b_slope ? P_GetZAt(*rover->b_slope, viewx, viewy) : *rover->bottomheight);
+ roverleft = P_GetFFloorBottomZAt(rover, segleft .x, segleft .y) - viewz;
+ roverright = P_GetFFloorBottomZAt(rover, segright.x, segright.y) - viewz;
+ planevistest = P_GetFFloorBottomZAt(rover, viewx, viewy);
if ((roverleft>>4 <= worldhigh || roverright>>4 <= worldhighslope) &&
(roverleft>>4 >= worldlow || roverright>>4 >= worldlowslope) &&
@@ -2694,9 +2660,9 @@ void R_StoreWallRange(INT32 start, INT32 stop)
if (i >= MAXFFLOORS)
break;
- roverleft = (*rover->t_slope ? P_GetZAt(*rover->t_slope, segleft.x, segleft.y) : *rover->topheight) - viewz;
- roverright = (*rover->t_slope ? P_GetZAt(*rover->t_slope, segright.x, segright.y) : *rover->topheight) - viewz;
- planevistest = (*rover->t_slope ? P_GetZAt(*rover->t_slope, viewx, viewy) : *rover->topheight);
+ roverleft = P_GetFFloorTopZAt(rover, segleft .x, segleft .y) - viewz;
+ roverright = P_GetFFloorTopZAt(rover, segright.x, segright.y) - viewz;
+ planevistest = P_GetFFloorTopZAt(rover, viewx, viewy);
if ((roverleft>>4 <= worldhigh || roverright>>4 <= worldhighslope) &&
(roverleft>>4 >= worldlow || roverright>>4 >= worldlowslope) &&
diff --git a/src/r_things.c b/src/r_things.c
index 361cb1961b2e6501900fdea49d264e203f1a62ec..8a3c2e35f5457a6c5480941f90d430d03d2d3495 100644
--- a/src/r_things.c
+++ b/src/r_things.c
@@ -888,7 +888,7 @@ static void R_DrawVisSprite(vissprite_t *vis)
vis->x2 = vid.width-1;
localcolfunc = (vis->cut & SC_VFLIP) ? R_DrawFlippedMaskedColumn : R_DrawMaskedColumn;
- lengthcol = patch->height;
+ lengthcol = SHORT(patch->height);
// Split drawing loops for paper and non-paper to reduce conditional checks per sprite
if (vis->scalestep)
@@ -1019,13 +1019,12 @@ static void R_SplitSprite(vissprite_t *sprite)
for (i = 1; i < sector->numlights; i++)
{
- fixed_t testheight = sector->lightlist[i].height;
+ fixed_t testheight;
if (!(sector->lightlist[i].caster->flags & FF_CUTSPRITES))
continue;
- if (sector->lightlist[i].slope)
- testheight = P_GetZAt(sector->lightlist[i].slope, sprite->gx, sprite->gy);
+ testheight = P_GetLightZAt(§or->lightlist[i], sprite->gx, sprite->gy);
if (testheight >= sprite->gzt)
continue;
@@ -1107,10 +1106,12 @@ fixed_t R_GetShadowZ(mobj_t *thing, pslope_t **shadowslope)
{
sector = node->m_sector;
- slope = (sector->heightsec != -1) ? NULL : sector->f_slope;
- z = slope ? P_GetZAt(slope, thing->x, thing->y) : (
- (sector->heightsec != -1) ? sectors[sector->heightsec].floorheight : sector->floorheight
- );
+ slope = sector->heightsec != -1 ? NULL : sector->f_slope;
+
+ if (sector->heightsec != -1)
+ z = sectors[sector->heightsec].floorheight;
+ else
+ z = P_GetSectorFloorZAt(sector, thing->x, thing->y);
if (z < thing->z+thing->height/2 && z > floorz)
{
@@ -1124,7 +1125,7 @@ fixed_t R_GetShadowZ(mobj_t *thing, pslope_t **shadowslope)
if (!(rover->flags & FF_EXISTS) || !(rover->flags & FF_RENDERPLANES) || (rover->alpha < 90 && !(rover->flags & FF_SWIMMABLE)))
continue;
- z = *rover->t_slope ? P_GetZAt(*rover->t_slope, thing->x, thing->y) : *rover->topheight;
+ z = P_GetFFloorTopZAt(rover, thing->x, thing->y);
if (z < thing->z+thing->height/2 && z > floorz)
{
floorz = z;
@@ -1230,8 +1231,8 @@ static void R_ProjectDropShadow(mobj_t *thing, vissprite_t *vis, fixed_t scale,
yscale = FixedDiv(projectiony, tz);
shadowxscale = FixedMul(thing->radius*2, scalemul);
shadowyscale = FixedMul(FixedMul(thing->radius*2, scalemul), FixedDiv(abs(floorz - viewz), tz));
- shadowyscale = min(shadowyscale, shadowxscale) / patch->height;
- shadowxscale /= patch->width;
+ shadowyscale = min(shadowyscale, shadowxscale) / SHORT(patch->height);
+ shadowxscale /= SHORT(patch->width);
shadowskew = 0;
if (floorslope)
@@ -1246,24 +1247,24 @@ static void R_ProjectDropShadow(mobj_t *thing, vissprite_t *vis, fixed_t scale,
//CONS_Printf("Shadow is sloped by %d %d\n", xslope, zslope);
if (viewz < floorz)
- shadowyscale += FixedMul(FixedMul(thing->radius*2 / patch->height, scalemul), zslope);
+ shadowyscale += FixedMul(FixedMul(thing->radius*2 / SHORT(patch->height), scalemul), zslope);
else
- shadowyscale -= FixedMul(FixedMul(thing->radius*2 / patch->height, scalemul), zslope);
+ shadowyscale -= FixedMul(FixedMul(thing->radius*2 / SHORT(patch->height), scalemul), zslope);
shadowyscale = abs(shadowyscale);
shadowskew = xslope;
}
- tx -= patch->width * shadowxscale/2;
+ tx -= SHORT(patch->width) * shadowxscale/2;
x1 = (centerxfrac + FixedMul(tx,xscale))>>FRACBITS;
if (x1 >= viewwidth) return;
- tx += patch->width * shadowxscale;
+ tx += SHORT(patch->width) * shadowxscale;
x2 = ((centerxfrac + FixedMul(tx,xscale))>>FRACBITS); x2--;
if (x2 < 0 || x2 <= x1) return;
- if (shadowyscale < FRACUNIT/patch->height) return; // fix some crashes?
+ if (shadowyscale < FRACUNIT/SHORT(patch->height)) return; // fix some crashes?
shadow = R_NewVisSprite();
shadow->patch = patch;
@@ -1278,8 +1279,8 @@ static void R_ProjectDropShadow(mobj_t *thing, vissprite_t *vis, fixed_t scale,
shadow->dispoffset = vis->dispoffset - 5;
shadow->gx = thing->x;
shadow->gy = thing->y;
- shadow->gzt = shadow->pz + shadow->patch->height * shadowyscale / 2;
- shadow->gz = shadow->gzt - shadow->patch->height * shadowyscale;
+ shadow->gzt = shadow->pz + SHORT(patch->height) * shadowyscale / 2;
+ shadow->gz = shadow->gzt - SHORT(patch->height) * shadowyscale;
shadow->texturemid = FixedMul(thing->scale, FixedDiv(shadow->gzt - viewz, shadowyscale));
if (thing->skin && ((skin_t *)thing->skin)->flags & SF_HIRES)
shadow->texturemid = FixedMul(shadow->texturemid, ((skin_t *)thing->skin)->highresscale);
@@ -1300,7 +1301,7 @@ static void R_ProjectDropShadow(mobj_t *thing, vissprite_t *vis, fixed_t scale,
shadow->startfrac = 0;
//shadow->xiscale = 0x7ffffff0 / (shadow->xscale/2);
- shadow->xiscale = (patch->width<<FRACBITS)/(x2-x1+1); // fuck it
+ shadow->xiscale = (SHORT(patch->width)<<FRACBITS)/(x2-x1+1); // fuck it
if (shadow->x1 > x1)
shadow->startfrac += shadow->xiscale*(shadow->x1-x1);
@@ -1316,8 +1317,7 @@ static void R_ProjectDropShadow(mobj_t *thing, vissprite_t *vis, fixed_t scale,
// R_GetPlaneLight won't work on sloped lights!
for (lightnum = 1; lightnum < thing->subsector->sector->numlights; lightnum++) {
- fixed_t h = thing->subsector->sector->lightlist[lightnum].slope ? P_GetZAt(thing->subsector->sector->lightlist[lightnum].slope, thing->x, thing->y)
- : thing->subsector->sector->lightlist[lightnum].height;
+ fixed_t h = P_GetLightZAt(&thing->subsector->sector->lightlist[lightnum], thing->x, thing->y);
if (h <= shadow->gzt) {
light = lightnum - 1;
break;
@@ -1527,10 +1527,10 @@ static void R_ProjectSprite(mobj_t *thing)
rotsprite = sprframe->rotsprite.patch[rot][rollangle];
if (rotsprite != NULL)
{
- spr_width = rotsprite->width << FRACBITS;
- spr_height = rotsprite->height << FRACBITS;
- spr_offset = rotsprite->leftoffset << FRACBITS;
- spr_topoffset = rotsprite->topoffset << FRACBITS;
+ spr_width = SHORT(rotsprite->width) << FRACBITS;
+ spr_height = SHORT(rotsprite->height) << FRACBITS;
+ spr_offset = SHORT(rotsprite->leftoffset) << FRACBITS;
+ spr_topoffset = SHORT(rotsprite->topoffset) << FRACBITS;
// flip -> rotate, not rotate -> flip
flip = 0;
}
@@ -1688,7 +1688,7 @@ static void R_ProjectSprite(mobj_t *thing)
// PORTAL SPRITE CLIPPING
if (portalrender && portalclipline)
{
- if (x2 < portalclipstart || x1 > portalclipend)
+ if (x2 < portalclipstart || x1 >= portalclipend)
return;
if (P_PointOnLineSide(thing->x, thing->y, portalclipline) != 0)
@@ -1723,8 +1723,7 @@ static void R_ProjectSprite(mobj_t *thing)
// R_GetPlaneLight won't work on sloped lights!
for (lightnum = 1; lightnum < thing->subsector->sector->numlights; lightnum++) {
- fixed_t h = thing->subsector->sector->lightlist[lightnum].slope ? P_GetZAt(thing->subsector->sector->lightlist[lightnum].slope, thing->x, thing->y)
- : thing->subsector->sector->lightlist[lightnum].height;
+ fixed_t h = P_GetLightZAt(&thing->subsector->sector->lightlist[lightnum], thing->x, thing->y);
if (h <= gzt) {
light = lightnum - 1;
break;
@@ -1958,7 +1957,7 @@ static void R_ProjectPrecipitationSprite(precipmobj_t *thing)
// PORTAL SPRITE CLIPPING
if (portalrender && portalclipline)
{
- if (x2 < portalclipstart || x1 > portalclipend)
+ if (x2 < portalclipstart || x1 >= portalclipend)
return;
if (P_PointOnLineSide(thing->x, thing->y, portalclipline) != 0)
@@ -2377,12 +2376,8 @@ static void R_CreateDrawNodes(maskcount_t* mask, drawnode_t* head, boolean temps
continue;
// Effective height may be different for each comparison in the case of slopes
- if (r2->plane->slope) {
- planeobjectz = P_GetZAt(r2->plane->slope, rover->gx, rover->gy);
- planecameraz = P_GetZAt(r2->plane->slope, viewx, viewy);
- }
- else
- planeobjectz = planecameraz = r2->plane->height;
+ planeobjectz = P_GetZAt(r2->plane->slope, rover->gx, rover->gy, r2->plane->height);
+ planecameraz = P_GetZAt(r2->plane->slope, viewx, viewy, r2->plane->height);
if (rover->mobjflags & MF_NOCLIPHEIGHT)
{
@@ -2440,19 +2435,10 @@ static void R_CreateDrawNodes(maskcount_t* mask, drawnode_t* head, boolean temps
if (scale <= rover->sortscale)
continue;
- if (*r2->ffloor->t_slope) {
- topplaneobjectz = P_GetZAt(*r2->ffloor->t_slope, rover->gx, rover->gy);
- topplanecameraz = P_GetZAt(*r2->ffloor->t_slope, viewx, viewy);
- }
- else
- topplaneobjectz = topplanecameraz = *r2->ffloor->topheight;
-
- if (*r2->ffloor->b_slope) {
- botplaneobjectz = P_GetZAt(*r2->ffloor->b_slope, rover->gx, rover->gy);
- botplanecameraz = P_GetZAt(*r2->ffloor->b_slope, viewx, viewy);
- }
- else
- botplaneobjectz = botplanecameraz = *r2->ffloor->bottomheight;
+ topplaneobjectz = P_GetFFloorTopZAt (r2->ffloor, rover->gx, rover->gy);
+ topplanecameraz = P_GetFFloorTopZAt (r2->ffloor, viewx, viewy);
+ botplaneobjectz = P_GetFFloorBottomZAt(r2->ffloor, rover->gx, rover->gy);
+ botplanecameraz = P_GetFFloorBottomZAt(r2->ffloor, viewx, viewy);
if ((topplanecameraz > viewz && botplanecameraz < viewz) ||
(topplanecameraz < viewz && rover->gzt < topplaneobjectz) ||
diff --git a/src/s_sound.c b/src/s_sound.c
index 6952b17f244f5a0113652274cc83d89d3fc89353..5ed9fd83a22d8f475c7400878db264d329a42bd1 100644
--- a/src/s_sound.c
+++ b/src/s_sound.c
@@ -134,6 +134,7 @@ consvar_t cv_playmusicifunfocused = {"playmusicifunfocused", "No", CV_SAVE, CV_Y
consvar_t cv_playsoundsifunfocused = {"playsoundsifunfocused", "No", CV_SAVE, CV_YesNo, NULL, 0, NULL, NULL, 0, 0, NULL};
#ifdef HAVE_OPENMPT
+openmpt_module *openmpt_mhandle = NULL;
static CV_PossibleValue_t interpolationfilter_cons_t[] = {{0, "Default"}, {1, "None"}, {2, "Linear"}, {4, "Cubic"}, {8, "Windowed sinc"}, {0, NULL}};
consvar_t cv_modfilter = {"modfilter", "0", CV_SAVE|CV_CALL, interpolationfilter_cons_t, ModFilter_OnChange, 0, NULL, NULL, 0, 0, NULL};
#endif
@@ -1675,7 +1676,7 @@ void S_LoadMusicDefs(UINT16 wadnum)
char *lf;
char *stoken;
- size_t nlf;
+ size_t nlf = 0xFFFFFFFF;
size_t ncr;
musicdef_t *def = NULL;
@@ -1910,6 +1911,10 @@ UINT32 S_GetMusicPosition(void)
/// In this section: mazmazz doesn't know how to do dynamic arrays or struct pointers!
/// ------------------------
+char music_stack_nextmusname[7];
+boolean music_stack_noposition = false;
+UINT32 music_stack_fadeout = 0;
+UINT32 music_stack_fadein = 0;
static musicstack_t *music_stacks = NULL;
static musicstack_t *last_music_stack = NULL;
diff --git a/src/s_sound.h b/src/s_sound.h
index 119722af43a23e5910581be41a67d615b38061a4..3334fcb69d7bf18820776130c627ba948b1ecb52 100644
--- a/src/s_sound.h
+++ b/src/s_sound.h
@@ -22,7 +22,7 @@
#ifdef HAVE_OPENMPT
#include "libopenmpt/libopenmpt.h"
-openmpt_module *openmpt_mhandle;
+extern openmpt_module *openmpt_mhandle;
#endif
// mask used to indicate sound origin is player item pickup
@@ -262,10 +262,10 @@ typedef struct musicstack_s
struct musicstack_s *next;
} musicstack_t;
-char music_stack_nextmusname[7];
-boolean music_stack_noposition;
-UINT32 music_stack_fadeout;
-UINT32 music_stack_fadein;
+extern char music_stack_nextmusname[7];
+extern boolean music_stack_noposition;
+extern UINT32 music_stack_fadeout;
+extern UINT32 music_stack_fadein;
void S_SetStackAdjustmentStart(void);
void S_AdjustMusicStackTics(void);
@@ -333,7 +333,7 @@ void S_StopSoundByNum(sfxenum_t sfxnum);
#ifdef MUSICSLOT_COMPATIBILITY
// For compatibility with code/scripts relying on older versions
// This is a list of all the "special" slot names and their associated numbers
-const char *compat_special_music_slots[16];
+extern const char *compat_special_music_slots[16];
#endif
#endif
diff --git a/src/screen.c b/src/screen.c
index 6e5fd54cd5e09046b42e300251ebecff01f4fa47..e01d1a81a8160918010a61cc389646664a91cbb0 100644
--- a/src/screen.c
+++ b/src/screen.c
@@ -526,6 +526,9 @@ void SCR_DisplayTicRate(void)
INT32 ticcntcolor = 0;
const INT32 h = vid.height-(8*vid.dupy);
+ if (gamestate == GS_NULL)
+ return;
+
for (i = lasttic + 1; i < TICRATE+lasttic && i < ontic; ++i)
fpsgraph[i % TICRATE] = false;
@@ -538,10 +541,16 @@ void SCR_DisplayTicRate(void)
if (totaltics <= TICRATE/2) ticcntcolor = V_REDMAP;
else if (totaltics == TICRATE) ticcntcolor = V_GREENMAP;
- V_DrawString(vid.width-(72*vid.dupx), h,
- V_YELLOWMAP|V_NOSCALESTART|V_USERHUDTRANS, "FPS:");
- V_DrawString(vid.width-(40*vid.dupx), h,
- ticcntcolor|V_NOSCALESTART|V_USERHUDTRANS, va("%02d/%02u", totaltics, TICRATE));
+ if (cv_ticrate.value == 2) // compact counter
+ V_DrawString(vid.width-(16*vid.dupx), h,
+ ticcntcolor|V_NOSCALESTART|V_USERHUDTRANS, va("%02d", totaltics));
+ else if (cv_ticrate.value == 1) // full counter
+ {
+ V_DrawString(vid.width-(72*vid.dupx), h,
+ V_YELLOWMAP|V_NOSCALESTART|V_USERHUDTRANS, "FPS:");
+ V_DrawString(vid.width-(40*vid.dupx), h,
+ ticcntcolor|V_NOSCALESTART|V_USERHUDTRANS, va("%02d/%02u", totaltics, TICRATE));
+ }
lasttic = ontic;
}
diff --git a/src/sdl/i_main.c b/src/sdl/i_main.c
index 5d0009927f1f64579c538d2cc604ee30fa3aa007..3eded734f3d1adf4cbe620843754cffae259ed77 100644
--- a/src/sdl/i_main.c
+++ b/src/sdl/i_main.c
@@ -27,7 +27,7 @@
#include <unistd.h>
#endif
-#ifdef __unix__
+#if defined (__unix__) || defined(__APPLE__) || defined (UNIXCOMMON)
#include <errno.h>
#endif
@@ -142,7 +142,7 @@ int main(int argc, char **argv)
const char *reldir;
int left;
boolean fileabs;
-#ifdef __unix__
+#if defined (__unix__) || defined(__APPLE__) || defined (UNIXCOMMON)
const char *link;
#endif
@@ -201,7 +201,7 @@ int main(int argc, char **argv)
M_PathParts(logdir) - 1,
M_PathParts(logfilename) - 1, 0755);
-#ifdef __unix__
+#if defined (__unix__) || defined(__APPLE__) || defined (UNIXCOMMON)
logstream = fopen(logfilename, "w");
#ifdef DEFAULTDIR
if (logdir)
@@ -214,9 +214,9 @@ int main(int argc, char **argv)
{
I_OutputMsg("Error symlinking latest-log.txt: %s\n", strerror(errno));
}
-#else/*__unix__*/
+#else/*defined (__unix__) || defined(__APPLE__) || defined (UNIXCOMMON)*/
logstream = fopen("latest-log.txt", "wt+");
-#endif/*__unix__*/
+#endif/*defined (__unix__) || defined(__APPLE__) || defined (UNIXCOMMON)*/
}
//I_OutputMsg("I_StartupSystem() ...\n");
diff --git a/src/sdl/i_system.c b/src/sdl/i_system.c
index a86af316e9e22460c734057960f39a8301fc67e9..d2ed62516c742cb1fcf4ba63d948202999998287 100644
--- a/src/sdl/i_system.c
+++ b/src/sdl/i_system.c
@@ -2484,7 +2484,7 @@ void I_RemoveExitFunc(void (*func)())
}
}
-#ifndef __unix__
+#if !(defined (__unix__) || defined(__APPLE__) || defined (UNIXCOMMON))
static void Shittycopyerror(const char *name)
{
I_OutputMsg(
@@ -2524,7 +2524,7 @@ static void Shittylogcopy(void)
Shittycopyerror(logfilename);
}
}
-#endif/*__unix__*/
+#endif/*!(defined (__unix__) || defined(__APPLE__) || defined (UNIXCOMMON))*/
//
// Closes down everything. This includes restoring the initial
@@ -2548,7 +2548,7 @@ void I_ShutdownSystem(void)
if (logstream)
{
I_OutputMsg("I_ShutdownSystem(): end of logstream.\n");
-#ifndef __unix__
+#if !(defined (__unix__) || defined(__APPLE__) || defined (UNIXCOMMON))
Shittylogcopy();
#endif
fclose(logstream);
diff --git a/src/sdl/i_video.c b/src/sdl/i_video.c
index ec7bfc1c4573776d438baf27fe1f388f838869c0..0abc9280c4012f8ce57bcba2c955ec879dab1ddf 100644
--- a/src/sdl/i_video.c
+++ b/src/sdl/i_video.c
@@ -217,7 +217,6 @@ static void SDLSetMode(INT32 width, INT32 height, SDL_bool fullscreen, SDL_bool
else
{
Impl_CreateWindow(fullscreen);
- Impl_SetWindowIcon();
wasfullscreen = fullscreen;
SDL_SetWindowSize(window, width, height);
if (fullscreen)
@@ -1632,12 +1631,15 @@ static SDL_bool Impl_CreateWindow(SDL_bool fullscreen)
window = SDL_CreateWindow("SRB2 "VERSIONSTRING, SDL_WINDOWPOS_CENTERED, SDL_WINDOWPOS_CENTERED,
realwidth, realheight, flags);
+
if (window == NULL)
{
CONS_Printf(M_GetText("Couldn't create window: %s\n"), SDL_GetError());
return SDL_FALSE;
}
+ Impl_SetWindowIcon();
+
return Impl_CreateContext();
}
@@ -1654,12 +1656,8 @@ static void Impl_SetWindowName(const char *title)
static void Impl_SetWindowIcon(void)
{
- if (window == NULL || icoSurface == NULL)
- {
- return;
- }
- //SDL2STUB(); // Monster Iestyn: why is this stubbed?
- SDL_SetWindowIcon(window, icoSurface);
+ if (window && icoSurface)
+ SDL_SetWindowIcon(window, icoSurface);
}
static void Impl_VideoSetupSDLBuffer(void)
@@ -1766,6 +1764,11 @@ void I_StartupGraphics(void)
VID_StartupOpenGL();
#endif
+ // Window icon
+#ifdef HAVE_IMAGE
+ icoSurface = IMG_ReadXPMFromArray(SDL_icon_xpm);
+#endif
+
// Fury: we do window initialization after GL setup to allow
// SDL_GL_LoadLibrary to work well on Windows
@@ -1784,11 +1787,6 @@ void I_StartupGraphics(void)
#ifdef HAVE_TTF
I_ShutdownTTF();
#endif
- // Window icon
-#ifdef HAVE_IMAGE
- icoSurface = IMG_ReadXPMFromArray(SDL_icon_xpm);
-#endif
- Impl_SetWindowIcon();
VID_SetMode(VID_GetModeForSize(BASEVIDWIDTH, BASEVIDHEIGHT));
diff --git a/src/sdl/macosx/Srb2mac.xcodeproj/project.pbxproj b/src/sdl/macosx/Srb2mac.xcodeproj/project.pbxproj
index 1822202651070b8330768516a26893a21b6384ca..745513eeb3542cbf68d6515c09cb8e6abc56db97 100644
--- a/src/sdl/macosx/Srb2mac.xcodeproj/project.pbxproj
+++ b/src/sdl/macosx/Srb2mac.xcodeproj/project.pbxproj
@@ -1219,7 +1219,7 @@
C01FCF4B08A954540054247B /* Debug */ = {
isa = XCBuildConfiguration;
buildSettings = {
- CURRENT_PROJECT_VERSION = 2.2.2;
+ CURRENT_PROJECT_VERSION = 2.2.4;
GCC_PREPROCESSOR_DEFINITIONS = (
"$(inherited)",
NORMALSRB2,
@@ -1231,7 +1231,7 @@
C01FCF4C08A954540054247B /* Release */ = {
isa = XCBuildConfiguration;
buildSettings = {
- CURRENT_PROJECT_VERSION = 2.2.2;
+ CURRENT_PROJECT_VERSION = 2.2.4;
GCC_ENABLE_FIX_AND_CONTINUE = NO;
GCC_GENERATE_DEBUGGING_SYMBOLS = NO;
GCC_PREPROCESSOR_DEFINITIONS = (
diff --git a/src/sounds.c b/src/sounds.c
index ca943c2d06f0fd9d86e0a3616a86c84b857f65e3..9894fd13ecb2509be3118b48dfa53eda04db8467 100644
--- a/src/sounds.c
+++ b/src/sounds.c
@@ -527,7 +527,7 @@ sfxinfo_t S_sfx[NUMSFX] =
{"s3k8a", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Boing"},
{"s3k8b", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Powerful hit"},
{"s3k8c", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Humming power"},
- {"s3k8d", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, ""},
+ {"s3k8d", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, "/"},
{"s3k8e", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Accelerating"},
{"s3k8f", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Opening"},
{"s3k90", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Impact"},
diff --git a/src/st_stuff.c b/src/st_stuff.c
index 6e365dc6812b380db3fd8e84db6e944821c1684a..9d819b147ead4ab24e3abd29252a827f273c071b 100644
--- a/src/st_stuff.c
+++ b/src/st_stuff.c
@@ -1325,7 +1325,7 @@ void ST_drawTitleCard(void)
{
char *lvlttl = mapheaderinfo[gamemap-1]->lvlttl;
char *subttl = mapheaderinfo[gamemap-1]->subttl;
- INT32 actnum = mapheaderinfo[gamemap-1]->actnum;
+ UINT8 actnum = mapheaderinfo[gamemap-1]->actnum;
INT32 lvlttlxpos, ttlnumxpos, zonexpos;
INT32 subttlxpos = BASEVIDWIDTH/2;
INT32 ttlscroll = FixedInt(lt_scroll);
@@ -1333,13 +1333,12 @@ void ST_drawTitleCard(void)
patch_t *actpat, *zigzag, *zztext;
UINT8 colornum;
const UINT8 *colormap;
- stplyr = &players[consoleplayer];
-
- if (stplyr->skincolor)
- colornum = stplyr->skincolor;
+
+ if (players[consoleplayer].skincolor)
+ colornum = players[consoleplayer].skincolor;
else
colornum = cv_playercolor.value;
-
+
colormap = R_GetTranslationColormap(TC_DEFAULT, colornum, GTC_CACHE);
if (!G_IsTitleCardAvailable())
@@ -1383,7 +1382,12 @@ void ST_drawTitleCard(void)
if (actnum)
{
if (!splitscreen)
- V_DrawMappedPatch(ttlnumxpos + ttlscroll, 104 - ttlscroll, 0, actpat, colormap);
+ {
+ if (actnum > 9) // slightly offset the act diamond for two-digit act numbers
+ V_DrawMappedPatch(ttlnumxpos + (V_LevelActNumWidth(actnum)/4) + ttlscroll, 104 - ttlscroll, 0, actpat, colormap);
+ else
+ V_DrawMappedPatch(ttlnumxpos + ttlscroll, 104 - ttlscroll, 0, actpat, colormap);
+ }
V_DrawLevelActNum(ttlnumxpos + ttlscroll, 104, V_PERPLAYER, actnum);
}
diff --git a/src/v_video.c b/src/v_video.c
index 2d1014c23f3e44820a7106a11a05df2acc7be525..1e550fe9d4c488bb0f03456485956f06bfa03da0 100644
--- a/src/v_video.c
+++ b/src/v_video.c
@@ -42,7 +42,8 @@ UINT8 *screens[5];
// screens[3] = fade screen start
// screens[4] = fade screen end, postimage tempoarary buffer
-consvar_t cv_ticrate = {"showfps", "No", 0, CV_YesNo, NULL, 0, NULL, NULL, 0, 0, NULL};
+static CV_PossibleValue_t ticrate_cons_t[] = {{0, "No"}, {1, "Full"}, {2, "Compact"}, {0, NULL}};
+consvar_t cv_ticrate = {"showfps", "No", CV_SAVE, ticrate_cons_t, NULL, 0, NULL, NULL, 0, 0, NULL};
static void CV_palette_OnChange(void);
@@ -2951,13 +2952,19 @@ void V_DrawPaddedTallNum(INT32 x, INT32 y, INT32 flags, INT32 num, INT32 digits)
}
// Draw an act number for a level title
-// Todo: actually draw two-digit numbers as two act num patches
-void V_DrawLevelActNum(INT32 x, INT32 y, INT32 flags, INT32 num)
+void V_DrawLevelActNum(INT32 x, INT32 y, INT32 flags, UINT8 num)
{
- if (num < 0 || num > 19)
+ if (num > 99)
return; // not supported
- V_DrawScaledPatch(x, y, flags, ttlnum[num]);
+ while (num > 0)
+ {
+ if (num > 9) // if there are two digits, draw second digit first
+ V_DrawScaledPatch(x + (V_LevelActNumWidth(num) - V_LevelActNumWidth(num%10)), y, flags, ttlnum[num%10]);
+ else
+ V_DrawScaledPatch(x, y, flags, ttlnum[num]);
+ num = num/10;
+ }
}
// Write a string using the credit font
@@ -3338,13 +3345,21 @@ INT32 V_LevelNameHeight(const char *string)
}
// For ST_drawTitleCard
-// Returns the width of the act num patch
-INT32 V_LevelActNumWidth(INT32 num)
+// Returns the width of the act num patch(es)
+INT16 V_LevelActNumWidth(UINT8 num)
{
- if (num < 0 || num > 19)
- return 0; // not a valid number
+ INT16 result = 0;
+
+ if (num == 0)
+ result = SHORT(ttlnum[num]->width);
+
+ while (num > 0 && num <= 99)
+ {
+ result = result + SHORT(ttlnum[num%10]->width);
+ num = num/10;
+ }
- return SHORT(ttlnum[num]->width);
+ return result;
}
//
diff --git a/src/v_video.h b/src/v_video.h
index ed623a57f4e771781f45fb32c50c210dd804c0f4..664fa8995fa47b9cfc7720f1d67ff17c580b1be3 100644
--- a/src/v_video.h
+++ b/src/v_video.h
@@ -238,12 +238,12 @@ void V_DrawRightAlignedSmallThinStringAtFixed(fixed_t x, fixed_t y, INT32 option
// Draw tall nums, used for menu, HUD, intermission
void V_DrawTallNum(INT32 x, INT32 y, INT32 flags, INT32 num);
void V_DrawPaddedTallNum(INT32 x, INT32 y, INT32 flags, INT32 num, INT32 digits);
-void V_DrawLevelActNum(INT32 x, INT32 y, INT32 flags, INT32 num);
+void V_DrawLevelActNum(INT32 x, INT32 y, INT32 flags, UINT8 num);
// Find string width from lt_font chars
INT32 V_LevelNameWidth(const char *string);
INT32 V_LevelNameHeight(const char *string);
-INT32 V_LevelActNumWidth(INT32 num); // act number width
+INT16 V_LevelActNumWidth(UINT8 num); // act number width
void V_DrawCreditString(fixed_t x, fixed_t y, INT32 option, const char *string);
INT32 V_CreditStringWidth(const char *string);
diff --git a/src/w_wad.c b/src/w_wad.c
index a8113235465ccb32fc1771fb27f54142aa277677..041222479f0f8b8afee40672efe078583ee6c745 100644
--- a/src/w_wad.c
+++ b/src/w_wad.c
@@ -76,6 +76,10 @@ int snprintf(char *str, size_t n, const char *fmt, ...);
//int vsnprintf(char *str, size_t n, const char *fmt, va_list ap);
#endif
+#ifdef _DEBUG
+#include "console.h"
+#endif
+
#ifndef O_BINARY
#define O_BINARY 0
#endif
diff --git a/src/win32/win_sys.c b/src/win32/win_sys.c
index 42733c30909897d2437387dbe3b6365a096b40d8..f9d66be7ffc57c7f613b85b6a60bf28297b20781 100644
--- a/src/win32/win_sys.c
+++ b/src/win32/win_sys.c
@@ -3199,7 +3199,7 @@ INT32 I_GetKey(void)
// -----------------
#define DI_KEYBOARD_BUFFERSIZE 32 // number of data elements in keyboard buffer
-void I_StartupKeyboard(void)
+static void I_StartupKeyboard(void)
{
DIPROPDWORD dip;
@@ -3435,6 +3435,8 @@ INT32 I_StartupSystem(void)
// some 'more global than globals' things to initialize here ?
graphics_started = keyboard_started = sound_started = cdaudio_started = false;
+ I_StartupKeyboard();
+
#ifdef NDEBUG
#ifdef BUGTRAP
diff --git a/src/win32/win_vid.c b/src/win32/win_vid.c
index 4e7bab5696d6861350412b47f52b591352da8cde..5fa2195866b08329f02c0057b1aaa6d9f384a977 100644
--- a/src/win32/win_vid.c
+++ b/src/win32/win_vid.c
@@ -56,6 +56,7 @@ static consvar_t cv_stretch = {"stretch", "On", CV_SAVE|CV_NOSHOWHELP, CV_OnOff,
static consvar_t cv_ontop = {"ontop", "Never", 0, CV_NeverOnOff, NULL, 0, NULL, NULL, 0, 0, NULL};
boolean highcolor;
+int vid_opengl_state = 0;
static BOOL bDIBMode; // means we are using DIB instead of DirectDraw surfaces
static LPBITMAPINFO bmiMain = NULL;
@@ -949,7 +950,10 @@ INT32 VID_SetMode(INT32 modenum)
}
void VID_CheckRenderer(void) {}
-void VID_CheckGLLoaded(rendermode_t oldrender) {}
+void VID_CheckGLLoaded(rendermode_t oldrender)
+{
+ (void)oldrender;
+}
// ========================================================================
// Free the video buffer of the last video mode,
diff --git a/src/y_inter.c b/src/y_inter.c
index f1764a816d5f2049b5fe516ba6ae8f010f679d4e..a2628832fe09074bc77817604e3d72f16f49ea6d 100644
--- a/src/y_inter.c
+++ b/src/y_inter.c
@@ -73,7 +73,7 @@ typedef union
UINT32 score, total; // fake score, total
UINT32 tics; // time
- INT32 actnum; // act number being displayed
+ UINT8 actnum; // act number being displayed
patch_t *ptotal; // TOTAL
UINT8 gotlife; // Number of extra lives obtained
} coop;