diff --git a/src/d_clisrv.c b/src/d_clisrv.c
index 99c922a8a47b3326a53a5bdc834fb4adafb5ebe7..4448aaae042732fb6a52cf99236486b2e5656019 100644
--- a/src/d_clisrv.c
+++ b/src/d_clisrv.c
@@ -70,7 +70,7 @@
boolean server = true; // true or false but !server == client
#define client (!server)
boolean nodownload = false;
-static boolean serverrunning = false;
+boolean serverrunning = false;
INT32 serverplayer = 0;
char motd[254], server_context[8]; // Message of the Day, Unique Context (even without Mumble support)
@@ -1019,7 +1019,7 @@ static void SV_SendResynch(INT32 node)
netbuffer->packettype = PT_RESYNCHEND;
netbuffer->u.resynchend.randomseed = P_GetRandSeed();
- if (gametype == GT_CTF)
+ if (gametyperules & GTR_TEAMFLAGS)
resynch_write_ctf(&netbuffer->u.resynchend);
resynch_write_others(&netbuffer->u.resynchend);
@@ -2105,10 +2105,10 @@ static void CL_ConnectToServer(boolean viams)
if (i != -1)
{
- UINT8 num = serverlist[i].info.gametype;
+ UINT16 num = serverlist[i].info.gametype;
const char *gametypestr = NULL;
CONS_Printf(M_GetText("Connecting to: %s\n"), serverlist[i].info.servername);
- if (num < NUMGAMETYPES)
+ if (num < gametypecount)
gametypestr = Gametype_Names[num];
if (gametypestr)
CONS_Printf(M_GetText("Gametype: %s\n"), gametypestr);
@@ -2424,7 +2424,7 @@ static void CL_RemovePlayer(INT32 playernum, INT32 reason)
}
}
- if (gametype == GT_CTF)
+ if (gametyperules & GTR_TEAMFLAGS)
P_PlayerFlagBurst(&players[playernum], false); // Don't take the flag with you!
// If in a special stage, redistribute the player's spheres across
@@ -2480,6 +2480,17 @@ static void CL_RemovePlayer(INT32 playernum, INT32 reason)
(void)reason;
#endif
+ // don't look through someone's view who isn't there
+ if (playernum == displayplayer)
+ {
+#ifdef HAVE_BLUA
+ // Call ViewpointSwitch hooks here.
+ // The viewpoint was forcibly changed.
+ LUAh_ViewpointSwitch(&players[consoleplayer], &players[displayplayer], true);
+#endif
+ displayplayer = consoleplayer;
+ }
+
// Reset player data
CL_ClearPlayer(playernum);
@@ -2497,16 +2508,13 @@ static void CL_RemovePlayer(INT32 playernum, INT32 reason)
RemoveAdminPlayer(playernum); // don't stay admin after you're gone
}
- if (playernum == displayplayer)
- displayplayer = consoleplayer; // don't look through someone's view who isn't there
-
#ifdef HAVE_BLUA
LUA_InvalidatePlayer(&players[playernum]);
#endif
if (G_TagGametype()) //Check if you still have a game. Location flexible. =P
P_CheckSurvivors();
- else if (gametype == GT_RACE || gametype == GT_COMPETITION)
+ else if (gametyperules & GTR_RACE)
P_CheckRacers();
}
@@ -3455,7 +3463,7 @@ void SV_StartSinglePlayerServer(void)
server = true;
netgame = false;
multiplayer = false;
- gametype = GT_COOP;
+ G_SetGametype(GT_COOP);
// no more tic the game with this settings!
SV_StopServer();
@@ -3734,7 +3742,7 @@ static void HandlePacketFromAwayNode(SINT8 node)
if (client)
{
maketic = gametic = neededtic = (tic_t)LONG(netbuffer->u.servercfg.gametic);
- gametype = netbuffer->u.servercfg.gametype;
+ G_SetGametype(netbuffer->u.servercfg.gametype);
modifiedgame = netbuffer->u.servercfg.modifiedgame;
for (j = 0; j < MAXPLAYERS; j++)
adminplayers[j] = netbuffer->u.servercfg.adminplayers[j];
@@ -4118,7 +4126,7 @@ static void HandlePacketFromPlayer(SINT8 node)
P_SetRandSeed(netbuffer->u.resynchend.randomseed);
- if (gametype == GT_CTF)
+ if (gametyperules & GTR_TEAMFLAGS)
resynch_read_ctf(&netbuffer->u.resynchend);
resynch_read_others(&netbuffer->u.resynchend);
diff --git a/src/d_main.c b/src/d_main.c
index ef6502aeca248a6e8069dd53fec271bba55bbd83..e25ef998e040bc51dda58ff80fc84a1c9be4a9f2 100644
--- a/src/d_main.c
+++ b/src/d_main.c
@@ -274,7 +274,10 @@ static void D_Display(void)
&& wipetypepre != UINT8_MAX)
{
F_WipeStartScreen();
- F_WipeColorFill(31);
+ // Check for Mega Genesis fade
+ wipestyleflags = WSF_FADEOUT;
+ 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);
}
@@ -488,6 +491,7 @@ static void D_Display(void)
if (rendermode != render_none)
{
F_WipeEndScreen();
+
// Funny.
if (WipeStageTitle && st_overlay)
{
@@ -497,6 +501,14 @@ static void D_Display(void)
V_DrawFill(0, 0, BASEVIDWIDTH, BASEVIDHEIGHT, levelfadecol);
F_WipeStartScreen();
}
+
+ // Check for Mega Genesis fade
+ if (F_ShouldColormapFade())
+ {
+ wipestyleflags |= WSF_FADEIN;
+ wipestyleflags &= ~WSF_FADEOUT;
+ }
+
F_RunWipe(wipetypepost, gamestate != GS_TIMEATTACK && gamestate != GS_TITLESCREEN);
}
@@ -562,9 +574,6 @@ void D_SRB2Loop(void)
// Pushing of + parameters is now done back in D_SRB2Main, not here.
- CONS_Printf("I_StartupKeyboard()...\n");
- I_StartupKeyboard();
-
#ifdef _WINDOWS
CONS_Printf("I_StartupMouse()...\n");
I_DoStartupMouse();
@@ -753,7 +762,7 @@ void D_StartTitle(void)
gameaction = ga_nothing;
displayplayer = consoleplayer = 0;
- gametype = GT_COOP;
+ G_SetGametype(GT_COOP);
paused = false;
advancedemo = false;
F_InitMenuPresValues();
@@ -1288,9 +1297,10 @@ void D_SRB2Main(void)
I_StartupSound();
I_InitMusic();
S_InitSfxChannels(cv_soundvolume.value);
- S_InitMusicDefs();
}
+ S_InitMusicDefs();
+
CONS_Printf("ST_Init(): Init status bar.\n");
ST_Init();
@@ -1409,14 +1419,14 @@ void D_SRB2Main(void)
if (newgametype == -1) // reached end of the list with no match
{
j = atoi(sgametype); // assume they gave us a gametype number, which is okay too
- if (j >= 0 && j < NUMGAMETYPES)
+ if (j >= 0 && j < gametypecount)
newgametype = (INT16)j;
}
if (newgametype != -1)
{
j = gametype;
- gametype = newgametype;
+ G_SetGametype(newgametype);
D_GameTypeChanged(j);
}
}
diff --git a/src/d_net.h b/src/d_net.h
index 8fd6c67b2960aec2f6a9592f082253d1ca141b5b..c6fe4a27f759ef05e0ebfd2f07c0386c529af36f 100644
--- a/src/d_net.h
+++ b/src/d_net.h
@@ -40,6 +40,8 @@ extern SINT8 nodetoplayer2[MAXNETNODES]; // Say the numplayer for this node if a
extern UINT8 playerpernode[MAXNETNODES]; // Used specially for splitscreen
extern boolean nodeingame[MAXNETNODES]; // Set false as nodes leave game
+extern boolean serverrunning;
+
INT32 Net_GetFreeAcks(boolean urgent);
void Net_AckTicker(void);
diff --git a/src/d_netcmd.c b/src/d_netcmd.c
index 00cb6e65eb901aecd0d42aeec4f6d8f91c27e78b..4e14ca25fea0b0d5318af8bbff3fb4bb5105b9a2 100644
--- a/src/d_netcmd.c
+++ b/src/d_netcmd.c
@@ -327,6 +327,10 @@ consvar_t cv_numlaps = {"numlaps", "4", CV_NETVAR|CV_CALL|CV_NOINIT, numlaps_con
static CV_PossibleValue_t basenumlaps_cons_t[] = {{1, "MIN"}, {50, "MAX"}, {0, "Map default"}, {0, NULL}};
consvar_t cv_basenumlaps = {"basenumlaps", "Map default", CV_NETVAR|CV_CALL|CV_CHEAT, basenumlaps_cons_t, BaseNumLaps_OnChange, 0, NULL, NULL, 0, 0, NULL};
+// Point and time limits for every gametype
+INT32 pointlimits[NUMGAMETYPES];
+INT32 timelimits[NUMGAMETYPES];
+
// log elemental hazards -- not a netvar, is local to current player
consvar_t cv_hazardlog = {"hazardlog", "Yes", 0, CV_YesNo, NULL, 0, NULL, NULL, 0, 0, NULL};
@@ -381,6 +385,9 @@ char timedemo_csv_id[256];
boolean timedemo_quit;
INT16 gametype = GT_COOP;
+UINT32 gametyperules = 0;
+INT16 gametypecount = (GT_CTF + 1);
+
boolean splitscreen = false;
boolean circuitmap = false;
INT32 adminplayers[MAXPLAYERS];
@@ -823,6 +830,10 @@ void D_RegisterClientCommands(void)
CV_RegisterVar(&cv_autobrake);
CV_RegisterVar(&cv_autobrake2);
+ // Ported from kart
+ CV_RegisterVar(&cv_deadzone);
+ CV_RegisterVar(&cv_deadzone2);
+
// s_sound.c
CV_RegisterVar(&cv_soundvolume);
CV_RegisterVar(&cv_closedcaptioning);
@@ -1122,7 +1133,7 @@ UINT8 CanChangeSkin(INT32 playernum)
return true;
// Can change skin during initial countdown.
- if ((gametype == GT_RACE || gametype == GT_COMPETITION) && leveltime < 4*TICRATE)
+ if ((gametyperules & GTR_RACE) && leveltime < 4*TICRATE)
return true;
if (G_TagGametype())
@@ -1938,7 +1949,7 @@ static void Command_Map_f(void)
if (isdigit(gametypename[0]))
{
d = atoi(gametypename);
- if (d >= 0 && d < NUMGAMETYPES)
+ if (d >= 0 && d < gametypecount)
newgametype = d;
else
{
@@ -1946,7 +1957,7 @@ static void Command_Map_f(void)
"Gametype number %d is out of range. Use a number between"
" 0 and %d inclusive. ...Or just use the name. :v\n",
d,
- NUMGAMETYPES-1);
+ gametypecount-1);
Z_Free(realmapname);
Z_Free(mapname);
return;
@@ -2065,8 +2076,9 @@ static void Got_Mapcmd(UINT8 **cp, INT32 playernum)
lastgametype = gametype;
gametype = READUINT8(*cp);
+ G_SetGametype(gametype); // I fear putting that macro as an argument
- if (gametype < 0 || gametype >= NUMGAMETYPES)
+ if (gametype < 0 || gametype >= gametypecount)
gametype = lastgametype;
else if (gametype != lastgametype)
D_GameTypeChanged(lastgametype); // emulate consvar_t behavior for gametype
@@ -2409,7 +2421,7 @@ static void Command_Teamchange_f(void)
}
//additional check for hide and seek. Don't allow change of status after hidetime ends.
- if (gametype == GT_HIDEANDSEEK && leveltime >= (hidetime * TICRATE))
+ if ((gametyperules & GTR_HIDEFROZEN) && leveltime >= (hidetime * TICRATE))
{
CONS_Alert(CONS_NOTICE, M_GetText("Hiding time expired; no Hide and Seek status changes allowed!\n"));
return;
@@ -2506,7 +2518,7 @@ static void Command_Teamchange2_f(void)
}
//additional check for hide and seek. Don't allow change of status after hidetime ends.
- if (gametype == GT_HIDEANDSEEK && leveltime >= (hidetime * TICRATE))
+ if ((gametyperules & GTR_HIDEFROZEN) && leveltime >= (hidetime * TICRATE))
{
CONS_Alert(CONS_NOTICE, M_GetText("Hiding time expired; no Hide and Seek status changes allowed!\n"));
return;
@@ -2635,7 +2647,7 @@ static void Command_ServerTeamChange_f(void)
}
//additional check for hide and seek. Don't allow change of status after hidetime ends.
- if (gametype == GT_HIDEANDSEEK && leveltime >= (hidetime * TICRATE))
+ if ((gametyperules & GTR_HIDEFROZEN) && leveltime >= (hidetime * TICRATE))
{
CONS_Alert(CONS_NOTICE, M_GetText("Hiding time expired; no Hide and Seek status changes allowed!\n"));
return;
@@ -2724,6 +2736,16 @@ static void Got_Teamchange(UINT8 **cp, INT32 playernum)
return;
}
+#ifdef HAVE_BLUA
+ // Don't switch team, just go away, please, go awaayyyy, aaauuauugghhhghgh
+ if (!LUAh_TeamSwitch(&players[playernum], NetPacket.packet.newteam, players[playernum].spectator, NetPacket.packet.autobalance, NetPacket.packet.scrambled))
+ return;
+#endif
+
+ //no status changes after hidetime
+ if ((gametyperules & GTR_HIDEFROZEN) && (leveltime >= (hidetime * TICRATE)))
+ error = true;
+
//Make sure that the right team number is sent. Keep in mind that normal clients cannot change to certain teams in certain gametypes.
switch (gametype)
{
@@ -2878,7 +2900,15 @@ static void Got_Teamchange(UINT8 **cp, INT32 playernum)
//reset view if you are changed, or viewing someone who was changed.
if (playernum == consoleplayer || displayplayer == playernum)
+ {
+#ifdef HAVE_BLUA
+ // Call ViewpointSwitch hooks here.
+ // The viewpoint was forcibly changed.
+ if (displayplayer != consoleplayer) // You're already viewing yourself. No big deal.
+ LUAh_ViewpointSwitch(&players[playernum], &players[displayplayer], true);
+#endif
displayplayer = consoleplayer;
+ }
if (G_GametypeHasTeams())
{
@@ -3614,7 +3644,7 @@ static void Command_ShowGametype_f(void)
}
// get name string for current gametype
- if (gametype >= 0 && gametype < NUMGAMETYPES)
+ if (gametype >= 0 && gametype < gametypecount)
gametypestr = Gametype_Names[gametype];
if (gametypestr)
@@ -3676,7 +3706,7 @@ void ItemFinder_OnChange(void)
static void PointLimit_OnChange(void)
{
// Don't allow pointlimit in Single Player/Co-Op/Race!
- if (server && Playing() && G_PlatformGametype())
+ if (server && Playing() && !(gametyperules & GTR_POINTLIMIT))
{
if (cv_pointlimit.value)
CV_StealthSetValue(&cv_pointlimit, 0);
@@ -3839,7 +3869,7 @@ UINT32 timelimitintics = 0;
static void TimeLimit_OnChange(void)
{
// Don't allow timelimit in Single Player/Co-Op/Race!
- if (server && Playing() && cv_timelimit.value != 0 && G_PlatformGametype())
+ if (server && Playing() && cv_timelimit.value != 0 && !(gametyperules & GTR_TIMELIMIT))
{
CV_SetValue(&cv_timelimit, 0);
return;
@@ -3875,9 +3905,9 @@ void D_GameTypeChanged(INT32 lastgametype)
{
const char *oldgt = NULL, *newgt = NULL;
- if (lastgametype >= 0 && lastgametype < NUMGAMETYPES)
+ if (lastgametype >= 0 && lastgametype < gametypecount)
oldgt = Gametype_Names[lastgametype];
- if (gametype >= 0 && lastgametype < NUMGAMETYPES)
+ if (gametype >= 0 && lastgametype < gametypecount)
newgt = Gametype_Names[gametype];
if (oldgt && newgt)
@@ -3931,11 +3961,20 @@ void D_GameTypeChanged(INT32 lastgametype)
if (!cv_itemrespawntime.changed)
CV_Set(&cv_itemrespawntime, cv_itemrespawntime.defaultvalue); // respawn normally
break;
+ default:
+ if (!cv_timelimit.changed && !cv_pointlimit.changed) // user hasn't changed limits
+ {
+ CV_SetValue(&cv_timelimit, timelimits[gametype]);
+ CV_SetValue(&cv_pointlimit, pointlimits[gametype]);
+ }
+ if (!cv_itemrespawntime.changed)
+ CV_Set(&cv_itemrespawntime, cv_itemrespawntime.defaultvalue); // respawn normally
+ break;
}
}
else if (!multiplayer && !netgame)
{
- gametype = GT_COOP;
+ G_SetGametype(GT_COOP);
// These shouldn't matter anymore
//CV_Set(&cv_itemrespawntime, cv_itemrespawntime.defaultvalue);
//CV_SetValue(&cv_itemrespawn, 0);
@@ -3944,7 +3983,7 @@ void D_GameTypeChanged(INT32 lastgametype)
// reset timelimit and pointlimit in race/coop, prevent stupid cheats
if (server)
{
- if (G_PlatformGametype())
+ if (!(gametyperules & GTR_POINTLIMIT))
{
if (cv_timelimit.value)
CV_SetValue(&cv_timelimit, 0);
@@ -3962,6 +4001,7 @@ void D_GameTypeChanged(INT32 lastgametype)
// When swapping to a gametype that supports spectators,
// make everyone a spectator initially.
+ // Averted with GTR_NOSPECTATORSPAWN.
if (!splitscreen && (G_GametypeHasSpectators()))
{
INT32 i;
@@ -3969,7 +4009,7 @@ void D_GameTypeChanged(INT32 lastgametype)
if (playeringame[i])
{
players[i].ctfteam = 0;
- players[i].spectator = true;
+ players[i].spectator = (gametyperules & GTR_NOSPECTATORSPAWN) ? false : true;
}
}
diff --git a/src/dehacked.c b/src/dehacked.c
index b9fe96edd1837485e8ca74d69b41c4243ce7acbf..b77939c2a678daf50696969910e2a95dc0e9312b 100644
--- a/src/dehacked.c
+++ b/src/dehacked.c
@@ -22,6 +22,7 @@
#include "m_menu.h"
#include "m_misc.h"
#include "f_finale.h"
+#include "y_inter.h"
#include "dehacked.h"
#include "st_stuff.h"
#include "i_system.h"
@@ -76,6 +77,7 @@ static UINT16 get_mus(const char *word, UINT8 dehacked_mode);
static hudnum_t get_huditem(const char *word);
static menutype_t get_menutype(const char *word);
#ifndef HAVE_BLUA
+static INT16 get_gametype(const char *word);
static powertype_t get_power(const char *word);
#endif
@@ -590,6 +592,16 @@ static void readfreeslots(MYFILE *f)
} else
CONS_Alert(CONS_WARNING, "Ran out of free SPR2 slots!\n");
}
+ else if (fastcmp(type, "TOL"))
+ {
+ if (lastcustomtol > 31)
+ CONS_Alert(CONS_WARNING, "Ran out of free typeoflevel slots!\n");
+ else
+ {
+ G_AddTOL((1<<lastcustomtol), word);
+ lastcustomtol++;
+ }
+ }
else
deh_warning("Freeslots: unknown enum class '%s' for '%s_%s'", type, type, word);
}
@@ -1093,10 +1105,10 @@ static void readsprite2(MYFILE *f, INT32 num)
Z_Free(s);
}
-static const struct {
- const char *name;
- const UINT16 flag;
-} TYPEOFLEVEL[] = {
+INT32 numtolinfo = NUMBASETOL;
+UINT32 lastcustomtol = 13;
+
+tolinfo_t TYPEOFLEVEL[NUMMAXTOL] = {
{"SOLO",TOL_SP},
{"SP",TOL_SP},
{"SINGLEPLAYER",TOL_SP},
@@ -1112,8 +1124,6 @@ static const struct {
{"TAG",TOL_TAG},
{"CTF",TOL_CTF},
- {"CUSTOM",TOL_CUSTOM},
-
{"2D",TOL_2D},
{"MARIO",TOL_MARIO},
{"NIGHTS",TOL_NIGHTS},
@@ -1126,6 +1136,216 @@ static const struct {
{NULL, 0}
};
+// copypasted from readPlayer :sleep:
+static const char *const GAMETYPERULE_LIST[];
+static void readgametype(MYFILE *f, char *gtname)
+{
+ char *s = Z_Malloc(MAXLINELEN, PU_STATIC, NULL);
+ char *word;
+ char *word2, *word2lwr = NULL;
+ char *tmp;
+ INT32 i, j;
+
+ INT16 newgtidx = 0;
+ UINT32 newgtrules = 0;
+ UINT32 newgttol = 0;
+ INT32 newgtpointlimit = 0;
+ INT32 newgttimelimit = 0;
+ UINT8 newgtleftcolor = 0;
+ UINT8 newgtrightcolor = 0;
+ INT16 newgtrankingstype = -1;
+ int newgtinttype = 0;
+ char gtdescription[441];
+ char gtconst[MAXLINELEN];
+
+ // Empty strings.
+ gtdescription[0] = '\0';
+ gtconst[0] = '\0';
+
+ do
+ {
+ if (myfgets(s, MAXLINELEN, f))
+ {
+ if (s[0] == '\n')
+ break;
+
+ word = strtok(s, " ");
+ if (word)
+ strupr(word);
+ else
+ break;
+
+ if (fastcmp(word, "DESCRIPTION"))
+ {
+ char *descr = NULL;
+
+ for (i = 0; i < MAXLINELEN-3; i++)
+ {
+ if (s[i] == '=')
+ {
+ descr = &s[i+2];
+ break;
+ }
+ }
+ if (descr)
+ {
+ strcpy(gtdescription, descr);
+ strcat(gtdescription, myhashfgets(descr, sizeof (gtdescription), f));
+ }
+ else
+ strcpy(gtdescription, "");
+
+ // For some reason, cutting the string did not work above. Most likely due to strcpy or strcat...
+ // It works down here, though.
+ {
+ INT32 numline = 0;
+ for (i = 0; i < MAXLINELEN-1; i++)
+ {
+ if (numline < 20 && gtdescription[i] == '\n')
+ numline++;
+
+ if (numline >= 20 || gtdescription[i] == '\0' || gtdescription[i] == '#')
+ break;
+ }
+ }
+ gtdescription[strlen(gtdescription)-1] = '\0';
+ gtdescription[i] = '\0';
+ continue;
+ }
+
+ word2 = strtok(NULL, " = ");
+ if (word2)
+ {
+ if (!word2lwr)
+ word2lwr = Z_Malloc(MAXLINELEN, PU_STATIC, NULL);
+ strcpy(word2lwr, word2);
+ strupr(word2);
+ }
+ else
+ break;
+
+ if (word2[strlen(word2)-1] == '\n')
+ word2[strlen(word2)-1] = '\0';
+ i = atoi(word2);
+
+ // Game type rules
+ if (fastcmp(word, "RULES"))
+ {
+ // GTR_
+ newgtrules = (UINT32)get_number(word2);
+ }
+ // Identifier
+ else if (fastcmp(word, "IDENTIFIER"))
+ {
+ // GT_
+ strncpy(gtconst, word2, MAXLINELEN);
+ }
+ // Point and time limits
+ else if (fastcmp(word, "DEFAULTPOINTLIMIT"))
+ newgtpointlimit = (INT32)i;
+ else if (fastcmp(word, "DEFAULTTIMELIMIT"))
+ newgttimelimit = (INT32)i;
+ // Level platter
+ else if (fastcmp(word, "HEADERCOLOR") || fastcmp(word, "HEADERCOLOUR"))
+ newgtleftcolor = newgtrightcolor = (UINT8)get_number(word2);
+ else if (fastcmp(word, "HEADERLEFTCOLOR") || fastcmp(word, "HEADERLEFTCOLOUR"))
+ newgtleftcolor = (UINT8)get_number(word2);
+ else if (fastcmp(word, "HEADERRIGHTCOLOR") || fastcmp(word, "HEADERRIGHTCOLOUR"))
+ newgtrightcolor = (UINT8)get_number(word2);
+ // Rankings type
+ else if (fastcmp(word, "RANKINGTYPE"))
+ {
+ // Case insensitive
+ newgtrankingstype = (int)get_number(word2);
+ }
+ // Intermission type
+ else if (fastcmp(word, "INTERMISSIONTYPE"))
+ {
+ // Case sensitive
+ newgtinttype = (int)get_number(word2lwr);
+ }
+ // Type of level
+ else if (fastcmp(word, "TYPEOFLEVEL"))
+ {
+ if (i) // it's just a number
+ newgttol = (UINT32)i;
+ else
+ {
+ UINT16 tol = 0;
+ tmp = strtok(word2,",");
+ do {
+ for (i = 0; TYPEOFLEVEL[i].name; i++)
+ if (fasticmp(tmp, TYPEOFLEVEL[i].name))
+ break;
+ if (!TYPEOFLEVEL[i].name)
+ deh_warning("readgametype %s: unknown typeoflevel flag %s\n", gtname, tmp);
+ tol |= TYPEOFLEVEL[i].flag;
+ } while((tmp = strtok(NULL,",")) != NULL);
+ newgttol = tol;
+ }
+ }
+ // The SOC probably provided gametype rules as words,
+ // instead of using the RULES keyword.
+ // Like for example "NOSPECTATORSPAWN = TRUE".
+ // This is completely valid, and looks better anyway.
+ else
+ {
+ UINT32 wordgt = 0;
+ for (j = 0; GAMETYPERULE_LIST[j]; j++)
+ if (fastcmp(word, GAMETYPERULE_LIST[j])) {
+ if (!j) // GTR_CAMPAIGN
+ wordgt |= 1;
+ else
+ wordgt |= (1<<j);
+ if (i || word2[0] == 'T' || word2[0] == 'Y')
+ newgtrules |= wordgt;
+ break;
+ }
+ if (!wordgt)
+ deh_warning("readgametype %s: unknown word '%s'", gtname, word);
+ }
+ }
+ } while (!myfeof(f)); // finish when the line is empty
+
+ // Free strings.
+ Z_Free(s);
+ if (word2lwr)
+ Z_Free(word2lwr);
+
+ // Ran out of gametype slots
+ if (gametypecount == NUMGAMETYPEFREESLOTS)
+ {
+ CONS_Alert(CONS_WARNING, "Ran out of free gametype slots!\n");
+ return;
+ }
+
+ // Add the new gametype
+ newgtidx = G_AddGametype(newgtrules);
+ G_AddGametypeTOL(newgtidx, newgttol);
+ G_SetGametypeDescription(newgtidx, gtdescription, newgtleftcolor, newgtrightcolor);
+
+ // Not covered by G_AddGametype alone.
+ if (newgtrankingstype == -1)
+ newgtrankingstype = newgtidx;
+ gametyperankings[newgtidx] = newgtrankingstype;
+ intermissiontypes[newgtidx] = newgtinttype;
+ pointlimits[newgtidx] = newgtpointlimit;
+ timelimits[newgtidx] = newgttimelimit;
+
+ // Write the new gametype name.
+ Gametype_Names[newgtidx] = Z_StrDup((const char *)gtname);
+
+ // Write the constant name.
+ if (gtconst[0] == '\0')
+ strncpy(gtconst, gtname, MAXLINELEN);
+ G_AddGametypeConstant(newgtidx, (const char *)gtconst);
+
+ // Update gametype_cons_t accordingly.
+ G_UpdateGametypeSelections();
+
+ CONS_Printf("Added gametype %s\n", Gametype_Names[newgtidx]);
+}
+
static const struct {
const char *name;
const mobjtype_t type;
@@ -1393,7 +1613,7 @@ static void readlevelheader(MYFILE *f, INT32 num)
else if (fastcmp(word, "TYPEOFLEVEL"))
{
if (i) // it's just a number
- mapheaderinfo[num-1]->typeoflevel = (UINT16)i;
+ mapheaderinfo[num-1]->typeoflevel = (UINT32)i;
else
{
UINT16 tol = 0;
@@ -1518,10 +1738,27 @@ static void readlevelheader(MYFILE *f, INT32 num)
deh_warning("Level header %d: invalid bonus type number %d", num, i);
}
+ // Title card
+ else if (fastcmp(word, "TITLECARDZIGZAG"))
+ {
+ deh_strlcpy(mapheaderinfo[num-1]->ltzzpatch, word2,
+ sizeof(mapheaderinfo[num-1]->ltzzpatch), va("Level header %d: title card zigzag patch name", num));
+ }
+ else if (fastcmp(word, "TITLECARDZIGZAGTEXT"))
+ {
+ deh_strlcpy(mapheaderinfo[num-1]->ltzztext, word2,
+ sizeof(mapheaderinfo[num-1]->ltzztext), va("Level header %d: title card zigzag text patch name", num));
+ }
+ else if (fastcmp(word, "TITLECARDACTDIAMOND"))
+ {
+ deh_strlcpy(mapheaderinfo[num-1]->ltactdiamond, word2,
+ sizeof(mapheaderinfo[num-1]->ltactdiamond), va("Level header %d: title card act diamond patch name", num));
+ }
+
else if (fastcmp(word, "MAXBONUSLIVES"))
mapheaderinfo[num-1]->maxbonuslives = (SINT8)i;
else if (fastcmp(word, "LEVELFLAGS"))
- mapheaderinfo[num-1]->levelflags = (UINT8)i;
+ mapheaderinfo[num-1]->levelflags = (UINT16)i;
else if (fastcmp(word, "MENUFLAGS"))
mapheaderinfo[num-1]->menuflags = (UINT8)i;
@@ -4151,6 +4388,7 @@ static void ignorelines(MYFILE *f)
static void DEH_LoadDehackedFile(MYFILE *f, boolean mainfile)
{
char *s = Z_Malloc(MAXLINELEN, PU_STATIC, NULL);
+ char textline[MAXLINELEN];
char *word;
char *word2;
INT32 i;
@@ -4171,6 +4409,7 @@ static void DEH_LoadDehackedFile(MYFILE *f, boolean mainfile)
char *traverse;
myfgets(s, MAXLINELEN, f);
+ memcpy(textline, s, MAXLINELEN);
if (s[0] == '\n' || s[0] == '#')
continue;
@@ -4359,6 +4598,36 @@ static void DEH_LoadDehackedFile(MYFILE *f, boolean mainfile)
ignorelines(f);
}
}
+ else if (fastcmp(word, "GAMETYPE"))
+ {
+ // Get the gametype name from textline
+ // instead of word2, so that gametype names
+ // aren't allcaps
+ INT32 c;
+ for (c = 0; c < MAXLINELEN; c++)
+ {
+ if (textline[c] == '\0')
+ break;
+ if (textline[c] == ' ')
+ {
+ char *gtname = (textline+c+1);
+ if (gtname)
+ {
+ // remove funny characters
+ INT32 j;
+ for (j = 0; j < (MAXLINELEN - c); j++)
+ {
+ if (gtname[j] == '\0')
+ break;
+ if (gtname[j] < 32)
+ gtname[j] = '\0';
+ }
+ readgametype(f, gtname);
+ }
+ break;
+ }
+ }
+ }
else if (fastcmp(word, "CUTSCENE"))
{
if (i > 0 && i < 129)
@@ -4458,20 +4727,34 @@ static void DEH_LoadDehackedFile(MYFILE *f, boolean mainfile)
ignorelines(f);
}
}
- // Last I heard this crashes the game if you try to use it
- // so this is disabled for now
- // -- Monster Iestyn
-/* else if (fastcmp(word, "SRB2"))
+ else if (fastcmp(word, "SRB2"))
{
- INT32 ver = searchvalue(strtok(NULL, "\n"));
- if (ver != PATCHVERSION)
- deh_warning("Patch is for SRB2 version %d,\nonly version %d is supported", ver, PATCHVERSION);
+ if (isdigit(word2[0]))
+ {
+ i = atoi(word2);
+ if (i != PATCHVERSION)
+ {
+ deh_warning(
+ "Patch is for SRB2 version %d, "
+ "only version %d is supported",
+ i,
+ PATCHVERSION
+ );
+ }
+ }
+ else
+ {
+ deh_warning(
+ "SRB2 version definition has incorrect format, "
+ "use \"SRB2 %d\"",
+ PATCHVERSION
+ );
+ }
}
// Clear all data in certain locations (mostly for unlocks)
// Unless you REALLY want to piss people off,
// define a custom gamedata /before/ doing this!!
// (then again, modifiedgame will prevent game data saving anyway)
-*/
else if (fastcmp(word, "CLEAR"))
{
boolean clearall = (fastcmp(word2, "ALL"));
@@ -8615,6 +8898,39 @@ static const char *const PLAYERFLAG_LIST[] = {
NULL // stop loop here.
};
+static const char *const GAMETYPERULE_LIST[] = {
+ "CAMPAIGN",
+ "RINGSLINGER",
+ "SPECTATORS",
+ "FRIENDLYFIRE",
+ "LIVES",
+ "TEAMS",
+ "RACE",
+ "TAG",
+ "POINTLIMIT",
+ "TIMELIMIT",
+ "HIDETIME",
+ "HIDEFROZEN",
+ "BLINDFOLDED",
+ "FIRSTPERSON",
+ "MATCHEMERALDS",
+ "TEAMFLAGS",
+ "PITYSHIELD",
+ "DEATHPENALTY",
+ "NOSPECTATORSPAWN",
+ "DEATHMATCHSTARTS",
+ "SPECIALSTAGES",
+ "EMERALDTOKENS",
+ "EMERALDHUNT",
+ "SPAWNENEMIES",
+ "ALLOWEXIT",
+ "NOTITLECARD",
+ "OVERTIME",
+ "HURTMESSAGES",
+ "SPAWNINVUL",
+ NULL
+};
+
#ifdef HAVE_BLUA
// Linedef flags
static const char *const ML_LIST[16] = {
@@ -9030,21 +9346,6 @@ struct {
{"tr_trans90",tr_trans90},
{"NUMTRANSMAPS",NUMTRANSMAPS},
- // Type of levels
- {"TOL_SP",TOL_SP},
- {"TOL_COOP",TOL_COOP},
- {"TOL_COMPETITION",TOL_COMPETITION},
- {"TOL_RACE",TOL_RACE},
- {"TOL_MATCH",TOL_MATCH},
- {"TOL_TAG",TOL_TAG},
- {"TOL_CTF",TOL_CTF},
- {"TOL_CUSTOM",TOL_CUSTOM},
- {"TOL_2D",TOL_2D},
- {"TOL_MARIO",TOL_MARIO},
- {"TOL_NIGHTS",TOL_NIGHTS},
- {"TOL_ERZ3",TOL_ERZ3},
- {"TOL_XMAS",TOL_XMAS},
-
// Level flags
{"LF_SCRIPTISFILE",LF_SCRIPTISFILE},
{"LF_SPEEDMUSIC",LF_SPEEDMUSIC},
@@ -9227,15 +9528,16 @@ struct {
{"DMG_CANHURTSELF",DMG_CANHURTSELF},
{"DMG_DEATHMASK",DMG_DEATHMASK},
- // Gametypes, for use with global var "gametype"
- {"GT_COOP",GT_COOP},
- {"GT_COMPETITION",GT_COMPETITION},
- {"GT_RACE",GT_RACE},
- {"GT_MATCH",GT_MATCH},
- {"GT_TEAMMATCH",GT_TEAMMATCH},
- {"GT_TAG",GT_TAG},
- {"GT_HIDEANDSEEK",GT_HIDEANDSEEK},
- {"GT_CTF",GT_CTF},
+ // Intermission types
+ {"int_none",int_none},
+ {"int_coop",int_coop},
+ {"int_match",int_match},
+ {"int_teammatch",int_teammatch},
+ //{"int_tag",int_tag},
+ {"int_ctf",int_ctf},
+ {"int_spec",int_spec},
+ {"int_race",int_race},
+ {"int_comp",int_comp},
// Jingles (jingletype_t)
{"JT_NONE",JT_NONE},
@@ -9526,7 +9828,7 @@ struct {
};
static mobjtype_t get_mobjtype(const char *word)
-{ // Returns the vlaue of MT_ enumerations
+{ // Returns the value of MT_ enumerations
mobjtype_t i;
if (*word >= '0' && *word <= '9')
return atoi(word);
@@ -9678,8 +9980,22 @@ static menutype_t get_menutype(const char *word)
}
#ifndef HAVE_BLUA
+static INT16 get_gametype(const char *word)
+{ // Returns the value of GT_ enumerations
+ INT16 i;
+ if (*word >= '0' && *word <= '9')
+ return atoi(word);
+ if (fastncmp("GT_",word,3))
+ word += 3; // take off the GT_
+ for (i = 0; i < NUMGAMETYPES; i++)
+ if (fastcmp(word, Gametype_ConstantNames[i]+3))
+ return i;
+ deh_warning("Couldn't find gametype named 'GT_%s'",word);
+ return GT_COOP;
+}
+
static powertype_t get_power(const char *word)
-{ // Returns the vlaue of pw_ enumerations
+{ // Returns the value of pw_ enumerations
powertype_t i;
if (*word >= '0' && *word <= '9')
return atoi(word);
@@ -9873,11 +10189,42 @@ static fixed_t find_const(const char **rword)
free(word);
return r;
}
- else if (fastncmp("MN_",word,4)) {
+ else if (fastncmp("MN_",word,3)) {
r = get_menutype(word);
free(word);
return r;
}
+ else if (fastncmp("GT_",word,4)) {
+ r = get_gametype(word);
+ free(word);
+ return r;
+ }
+ else if (fastncmp("GTR_", word, 4)) {
+ char *p = word+4;
+ for (i = 0; GAMETYPERULE_LIST[i]; i++)
+ if (fastcmp(p, GAMETYPERULE_LIST[i])) {
+ free(word);
+ return (1<<i);
+ }
+
+ // Not found error
+ const_warning("game type rule",word);
+ free(word);
+ return 0;
+ }
+ else if (fastncmp("TOL_", word, 4)) {
+ char *p = word+4;
+ for (i = 0; TYPEOFLEVEL[i].name; i++)
+ if (fastcmp(p, TYPEOFLEVEL[i].name)) {
+ free(word);
+ return TYPEOFLEVEL[i].flag;
+ }
+
+ // Not found error
+ const_warning("typeoflevel",word);
+ free(word);
+ return 0;
+ }
else if (fastncmp("HUD_",word,4)) {
r = get_huditem(word);
free(word);
@@ -10087,6 +10434,20 @@ static inline int lib_freeslot(lua_State *L)
}
r++;
}
+ else if (fastcmp(type, "TOL"))
+ {
+ if (lastcustomtol > 31)
+ CONS_Alert(CONS_WARNING, "Ran out of free typeoflevel slots!\n");
+ else
+ {
+ UINT32 newtol = (1<<lastcustomtol);
+ CONS_Printf("TypeOfLevel TOL_%s allocated.\n",word);
+ G_AddTOL(newtol, word);
+ lua_pushinteger(L, newtol);
+ lastcustomtol++;
+ r++;
+ }
+ }
Z_Free(s);
lua_remove(L, 1);
continue;
@@ -10191,6 +10552,36 @@ static inline int lib_getenum(lua_State *L)
if (mathlib) return luaL_error(L, "playerflag '%s' could not be found.\n", word);
return 0;
}
+ else if (fastncmp("GT_", word, 3)) {
+ p = word;
+ for (i = 0; Gametype_ConstantNames[i]; i++)
+ if (fastcmp(p, Gametype_ConstantNames[i])) {
+ lua_pushinteger(L, i);
+ return 1;
+ }
+ if (mathlib) return luaL_error(L, "gametype '%s' could not be found.\n", word);
+ return 0;
+ }
+ else if (fastncmp("GTR_", word, 4)) {
+ p = word+4;
+ for (i = 0; GAMETYPERULE_LIST[i]; i++)
+ if (fastcmp(p, GAMETYPERULE_LIST[i])) {
+ lua_pushinteger(L, ((lua_Integer)1<<i));
+ return 1;
+ }
+ if (mathlib) return luaL_error(L, "game type rule '%s' could not be found.\n", word);
+ return 0;
+ }
+ else if (fastncmp("TOL_", word, 4)) {
+ p = word+4;
+ for (i = 0; TYPEOFLEVEL[i].name; i++)
+ if (fastcmp(p, TYPEOFLEVEL[i].name)) {
+ lua_pushinteger(L, TYPEOFLEVEL[i].flag);
+ return 1;
+ }
+ if (mathlib) return luaL_error(L, "typeoflevel '%s' could not be found.\n", word);
+ return 0;
+ }
else if (fastncmp("ML_", word, 3)) {
p = word+3;
for (i = 0; i < 16; i++)
@@ -10428,126 +10819,7 @@ static inline int lib_getenum(lua_State *L)
// DYNAMIC variables too!!
// Try not to add anything that would break netgames or timeattack replays here.
// You know, like consoleplayer, displayplayer, secondarydisplayplayer, or gametime.
- if (fastcmp(word,"gamemap")) {
- lua_pushinteger(L, gamemap);
- return 1;
- } else if (fastcmp(word,"maptol")) {
- lua_pushinteger(L, maptol);
- return 1;
- } else if (fastcmp(word,"ultimatemode")) {
- lua_pushboolean(L, ultimatemode != 0);
- return 1;
- } else if (fastcmp(word,"mariomode")) {
- lua_pushboolean(L, mariomode != 0);
- return 1;
- } else if (fastcmp(word,"twodlevel")) {
- lua_pushboolean(L, twodlevel != 0);
- return 1;
- } else if (fastcmp(word,"circuitmap")) {
- lua_pushboolean(L, circuitmap);
- return 1;
- } else if (fastcmp(word,"netgame")) {
- lua_pushboolean(L, netgame);
- return 1;
- } else if (fastcmp(word,"multiplayer")) {
- lua_pushboolean(L, multiplayer);
- return 1;
- } else if (fastcmp(word,"modeattacking")) {
- lua_pushboolean(L, modeattacking);
- return 1;
- } else if (fastcmp(word,"splitscreen")) {
- lua_pushboolean(L, splitscreen);
- return 1;
- } else if (fastcmp(word,"gamecomplete")) {
- lua_pushboolean(L, gamecomplete);
- return 1;
- } else if (fastcmp(word,"devparm")) {
- lua_pushboolean(L, devparm);
- return 1;
- } else if (fastcmp(word,"modifiedgame")) {
- lua_pushboolean(L, modifiedgame && !savemoddata);
- return 1;
- } else if (fastcmp(word,"menuactive")) {
- lua_pushboolean(L, menuactive);
- return 1;
- } else if (fastcmp(word,"paused")) {
- lua_pushboolean(L, paused);
- return 1;
- } else if (fastcmp(word,"titlemap")) {
- lua_pushinteger(L, titlemap);
- return 1;
- } else if (fastcmp(word,"titlemapinaction")) {
- lua_pushboolean(L, (titlemapinaction != TITLEMAP_OFF));
- return 1;
- } else if (fastcmp(word,"gametype")) {
- lua_pushinteger(L, gametype);
- return 1;
- } else if (fastcmp(word,"leveltime")) {
- lua_pushinteger(L, leveltime);
- return 1;
- } else if (fastcmp(word,"curWeather")) {
- lua_pushinteger(L, curWeather);
- return 1;
- } else if (fastcmp(word,"globalweather")) {
- lua_pushinteger(L, globalweather);
- return 1;
- } else if (fastcmp(word,"levelskynum")) {
- lua_pushinteger(L, levelskynum);
- return 1;
- } else if (fastcmp(word,"globallevelskynum")) {
- lua_pushinteger(L, globallevelskynum);
- return 1;
- } else if (fastcmp(word,"mapmusname")) {
- lua_pushstring(L, mapmusname);
- return 1;
- } else if (fastcmp(word,"mapmusflags")) {
- lua_pushinteger(L, mapmusflags);
- return 1;
- } else if (fastcmp(word,"mapmusposition")) {
- lua_pushinteger(L, mapmusposition);
- return 1;
- // local player variables, by popular request
- } else if (fastcmp(word,"consoleplayer")) { // player controlling console (aka local player 1)
- if (consoleplayer < 0 || !playeringame[consoleplayer])
- return 0;
- LUA_PushUserdata(L, &players[consoleplayer], META_PLAYER);
- return 1;
- } else if (fastcmp(word,"displayplayer")) { // player visible on screen (aka display player 1)
- if (displayplayer < 0 || !playeringame[displayplayer])
- return 0;
- LUA_PushUserdata(L, &players[displayplayer], META_PLAYER);
- return 1;
- } else if (fastcmp(word,"secondarydisplayplayer")) { // local/display player 2, for splitscreen
- if (!splitscreen || secondarydisplayplayer < 0 || !playeringame[secondarydisplayplayer])
- return 0;
- LUA_PushUserdata(L, &players[secondarydisplayplayer], META_PLAYER);
- return 1;
- // end local player variables
- } else if (fastcmp(word,"server")) {
- if ((!multiplayer || !netgame) && !playeringame[serverplayer])
- return 0;
- LUA_PushUserdata(L, &players[serverplayer], META_PLAYER);
- return 1;
- } else if (fastcmp(word,"admin")) { // BACKWARDS COMPATIBILITY HACK: This was replaced with IsPlayerAdmin(), but some 2.1 Lua scripts still use the admin variable. It now points to the first admin player in the array.
- LUA_Deprecated(L, "admin", "IsPlayerAdmin(player)");
- if (!playeringame[adminplayers[0]] || IsPlayerAdmin(serverplayer))
- return 0;
- LUA_PushUserdata(L, &players[adminplayers[0]], META_PLAYER);
- return 1;
- } else if (fastcmp(word,"emeralds")) {
- lua_pushinteger(L, emeralds);
- return 1;
- } else if (fastcmp(word,"gravity")) {
- lua_pushinteger(L, gravity);
- return 1;
- } else if (fastcmp(word,"VERSIONSTRING")) {
- lua_pushstring(L, VERSIONSTRING);
- return 1;
- } else if (fastcmp(word, "token")) {
- lua_pushinteger(L, token);
- return 1;
- }
- return 0;
+ return LUA_PushGlobals(L, word);
}
int LUA_EnumLib(lua_State *L)
@@ -10614,6 +10886,8 @@ static int lib_getActionName(lua_State *L)
return luaL_typerror(L, 1, "action userdata or Lua function");
}
+
+
int LUA_SOCLib(lua_State *L)
{
lua_register(L,"freeslot",lib_freeslot);
diff --git a/src/dehacked.h b/src/dehacked.h
index d4fb07df0f1dd650afe5a156ed7abc7a35338e38..2b34377fd5e97e884f4c2a78f9062e0e34f76088 100644
--- a/src/dehacked.h
+++ b/src/dehacked.h
@@ -47,7 +47,7 @@ extern const char *superactions[MAXRECURSION];
extern UINT8 superstack;
// If the dehacked patch does not match this version, we throw a warning
-#define PATCHVERSION 210
+#define PATCHVERSION 220
#define MAXLINELEN 1024
diff --git a/src/doomdef.h b/src/doomdef.h
index 579030a1ce003134b993db5b581150d915a19269..8253f1a06266f23fed3fe97fd08ab34b88b0ce14 100644
--- a/src/doomdef.h
+++ b/src/doomdef.h
@@ -127,6 +127,7 @@
#ifdef LOGMESSAGES
extern FILE *logstream;
+extern char logfilename[1024];
#endif
//#define DEVELOP // Disable this for release builds to remove excessive cheat commands and enable MD5 checking and stuff, all in one go. :3
@@ -628,8 +629,12 @@ extern const char *compdate, *comptime, *comprevision, *compbranch;
#define ROTANGLES 72 // Needs to be a divisor of 360 (45, 60, 90, 120...)
#define ROTANGDIFF (360 / ROTANGLES)
+/// PNG support
#ifndef HAVE_PNG
#define NO_PNG_LUMPS
#endif
+/// Render flats on walls
+#define WALLFLATS
+
#endif // __DOOMDEF__
diff --git a/src/doomstat.h b/src/doomstat.h
index 3c0b4773a686adc29c3ce903eb24472e960d86af..b7bb7a36228b5e732db282b0948b2ea4841d2a03 100644
--- a/src/doomstat.h
+++ b/src/doomstat.h
@@ -39,7 +39,7 @@ extern UINT32 mapmusposition;
#define MUSIC_FORCERESET 0x4000 // -*--------------
// Use other bits if necessary.
-extern INT16 maptol;
+extern UINT32 maptol;
extern UINT8 globalweather;
extern INT32 curWeather;
extern INT32 cursaveslot;
@@ -84,6 +84,9 @@ extern boolean addedtogame; // true after the server has added you
extern boolean multiplayer;
extern INT16 gametype;
+extern UINT32 gametyperules;
+extern INT16 gametypecount;
+
extern boolean splitscreen;
extern boolean circuitmap; // Does this level have 'circuit mode'?
extern boolean fromlevelselect;
@@ -284,7 +287,7 @@ typedef struct
char lvlttl[22]; ///< Level name without "Zone". (21 character limit instead of 32, 21 characters can display on screen max anyway)
char subttl[33]; ///< Subtitle for level
UINT8 actnum; ///< Act number or 0 for none.
- UINT16 typeoflevel; ///< Combination of typeoflevel flags.
+ UINT32 typeoflevel; ///< Combination of typeoflevel flags.
INT16 nextlevel; ///< Map number of next level, or 1100-1102 to end.
char musname[7]; ///< Music track to play. "" for no music.
UINT16 mustrack; ///< Subsong to play. Only really relevant for music modules and specific formats supported by GME. 0 to ignore.
@@ -310,12 +313,17 @@ typedef struct
SINT8 bonustype; ///< What type of bonus does this level have? (-1 for null.)
SINT8 maxbonuslives; ///< How many bonus lives to award at Intermission? (-1 for unlimited.)
- UINT8 levelflags; ///< LF_flags: merged booleans into one UINT8 for space, see below
+ UINT16 levelflags; ///< LF_flags: merged booleans into one UINT16 for space, see below
UINT8 menuflags; ///< LF2_flags: options that affect record attack / nights mode menus
char selectheading[22]; ///< Level select heading. Allows for controllable grouping.
UINT16 startrings; ///< Number of rings players start with.
+ // Title card.
+ char ltzzpatch[8]; ///< Zig zag patch.
+ char ltzztext[8]; ///< Zig zag text.
+ char ltactdiamond[8]; ///< Act diamond.
+
// Freed animals stuff.
UINT8 numFlickies; ///< Internal. For freed flicky support.
mobjtype_t *flickies; ///< List of freeable flickies in this level. Allocated dynamically for space reasons. Be careful.
@@ -361,6 +369,70 @@ typedef struct
extern mapheader_t* mapheaderinfo[NUMMAPS];
+// Gametypes
+#define NUMGAMETYPEFREESLOTS 128
+enum GameType
+{
+ GT_COOP = 0, // also used in single player
+ GT_COMPETITION, // Classic "Race"
+ GT_RACE,
+
+ GT_MATCH,
+ GT_TEAMMATCH,
+
+ GT_TAG,
+ GT_HIDEANDSEEK,
+
+ GT_CTF, // capture the flag
+
+ GT_FIRSTFREESLOT,
+ GT_LASTFREESLOT = GT_FIRSTFREESLOT + NUMGAMETYPEFREESLOTS - 1,
+ NUMGAMETYPES
+};
+// If you alter this list, update dehacked.c, MISC_ChangeGameTypeMenu in m_menu.c, and Gametype_Names in g_game.c
+
+// Gametype rules
+enum GameTypeRules
+{
+ GTR_CAMPAIGN = 1, // Linear Co-op map progression, don't allow random maps
+ GTR_RINGSLINGER = 1<<1, // Outside of Co-op, Competition, and Race (overriden by cv_ringslinger)
+ GTR_SPECTATORS = 1<<2, // Outside of Co-op, Competition, and Race
+ GTR_FRIENDLYFIRE = 1<<3, // Always allow friendly fire
+ GTR_LIVES = 1<<4, // Co-op and Competition
+ GTR_TEAMS = 1<<5, // Team Match, CTF
+ GTR_RACE = 1<<6, // Race and Competition
+ GTR_TAG = 1<<7, // Tag and Hide and Seek
+ GTR_POINTLIMIT = 1<<8, // Ringslinger point limit
+ GTR_TIMELIMIT = 1<<9, // Ringslinger time limit
+ GTR_HIDETIME = 1<<10, // Hide time (Tag and Hide and Seek)
+ GTR_HIDEFROZEN = 1<<11, // Frozen after hide time (Hide and Seek, but not Tag)
+ GTR_BLINDFOLDED = 1<<12, // Blindfolded view (Tag and Hide and Seek)
+ GTR_FIRSTPERSON = 1<<13, // First person camera
+ GTR_MATCHEMERALDS = 1<<14, // Ringslinger emeralds (Match and CTF)
+ GTR_TEAMFLAGS = 1<<15, // Gametype has team flags (CTF)
+ GTR_PITYSHIELD = 1<<16, // Award pity shield
+ GTR_DEATHPENALTY = 1<<17, // Death score penalty
+ GTR_NOSPECTATORSPAWN = 1<<18, // Use with GTR_SPECTATORS, spawn in the map instead of with the spectators
+ GTR_DEATHMATCHSTARTS = 1<<19, // Use deathmatch starts
+ GTR_SPECIALSTAGES = 1<<20, // Allow special stages
+ GTR_EMERALDTOKENS = 1<<21, // Spawn emerald tokens
+ GTR_EMERALDHUNT = 1<<22, // Emerald Hunt
+ GTR_SPAWNENEMIES = 1<<23, // Spawn enemies
+ GTR_ALLOWEXIT = 1<<24, // Allow exit sectors
+ GTR_NOTITLECARD = 1<<25, // Don't show the title card
+ GTR_OVERTIME = 1<<26, // Allow overtime
+ GTR_HURTMESSAGES = 1<<27, // Hit and death messages
+ GTR_SPAWNINVUL = 1<<28, // Babysitting deterrent
+};
+
+// String names for gametypes
+extern const char *Gametype_Names[NUMGAMETYPES];
+extern const char *Gametype_ConstantNames[NUMGAMETYPES];
+
+// Point and time limits for every gametype
+extern INT32 pointlimits[NUMGAMETYPES];
+extern INT32 timelimits[NUMGAMETYPES];
+
enum TypeOfLevel
{
TOL_SP = 0x01, ///< Single Player
@@ -376,36 +448,26 @@ enum TypeOfLevel
TOL_CTF = 0x40, ///< Capture the Flag
// CTF default = 64
- TOL_CUSTOM = 0x80, ///< Custom (Lua-scripted, etc.)
+ // 0x80 was here
TOL_2D = 0x0100, ///< 2D
TOL_MARIO = 0x0200, ///< Mario
TOL_NIGHTS = 0x0400, ///< NiGHTS
TOL_ERZ3 = 0x0800, ///< ERZ3
- TOL_XMAS = 0x1000 ///< Christmas NiGHTS
+ TOL_XMAS = 0x1000, ///< Christmas NiGHTS
};
-// Gametypes
-enum GameType
-{
- GT_COOP = 0, // also used in single player
- GT_COMPETITION, // Classic "Race"
- GT_RACE,
-
- GT_MATCH,
- GT_TEAMMATCH,
+#define NUMBASETOL 18
+#define NUMMAXTOL (18 + NUMGAMETYPEFREESLOTS)
- GT_TAG,
- GT_HIDEANDSEEK,
-
- GT_CTF, // capture the flag
-
- NUMGAMETYPES
-};
-// If you alter this list, update dehacked.c, MISC_ChangeGameTypeMenu in m_menu.c, and Gametype_Names in g_game.c
-
-// String names for gametypes
-extern const char *Gametype_Names[NUMGAMETYPES];
+typedef struct
+{
+ const char *name;
+ UINT32 flag;
+} tolinfo_t;
+extern tolinfo_t TYPEOFLEVEL[NUMMAXTOL];
+extern INT32 numtolinfo;
+extern UINT32 lastcustomtol;
extern tic_t totalplaytime;
diff --git a/src/f_finale.c b/src/f_finale.c
index 424fc7f39c86bd2febcd1be60ec5941c29e28520..1436a159b1285cb40ba302a15f767412f0c0f77c 100644
--- a/src/f_finale.c
+++ b/src/f_finale.c
@@ -917,8 +917,9 @@ void F_IntroDrawer(void)
{
if (rendermode != render_none)
{
+ wipestyleflags = WSF_FADEOUT;
F_WipeStartScreen();
- F_WipeColorFill(31);
+ F_TryColormapFade(31);
F_WipeEndScreen();
F_RunWipe(99,true);
}
@@ -927,12 +928,11 @@ void F_IntroDrawer(void)
}
else if (intro_scenenum == 10)
{
- // The only fade to white in the entire damn game.
- // (not true)
if (rendermode != render_none)
{
+ wipestyleflags = (WSF_FADEOUT|WSF_TOWHITE);
F_WipeStartScreen();
- F_WipeColorFill(0);
+ F_TryColormapFade(0);
F_WipeEndScreen();
F_RunWipe(99,true);
}
@@ -941,8 +941,9 @@ void F_IntroDrawer(void)
{
if (rendermode != render_none)
{
+ wipestyleflags = WSF_FADEOUT;
F_WipeStartScreen();
- F_WipeColorFill(31);
+ F_TryColormapFade(31);
F_WipeEndScreen();
F_RunWipe(99,true);
}
@@ -977,6 +978,7 @@ void F_IntroDrawer(void)
F_WipeStartScreen();
wipegamestate = -1;
+ wipestyleflags = WSF_CROSSFADE;
animtimer = stoptimer = 0;
}
@@ -3596,6 +3598,8 @@ void F_StartContinue(void)
return;
}
+ wipestyleflags = WSF_FADEOUT;
+ F_TryColormapFade(31);
G_SetGamestate(GS_CONTINUING);
gameaction = ga_nothing;
diff --git a/src/f_finale.h b/src/f_finale.h
index 1636f1967bd2b4d8368356fe11d25dc4cecfe266..efc2de2e663fc1b43c1c87cbe95aa972916f12b7 100644
--- a/src/f_finale.h
+++ b/src/f_finale.h
@@ -146,7 +146,7 @@ extern boolean WipeStageTitle;
typedef enum
{
WIPESTYLE_NORMAL,
- WIPESTYLE_LEVEL
+ WIPESTYLE_COLORMAP
} wipestyle_t;
extern wipestyle_t wipestyle;
@@ -159,6 +159,11 @@ typedef enum
} wipestyleflags_t;
extern wipestyleflags_t wipestyleflags;
+// Even my function names are borderline
+boolean F_ShouldColormapFade(void);
+boolean F_TryColormapFade(UINT8 wipecolor);
+void F_DecideWipeStyle(void);
+
#define FADECOLORMAPDIV 8
#define FADECOLORMAPROWS (256/FADECOLORMAPDIV)
diff --git a/src/f_wipe.c b/src/f_wipe.c
index b0982a957a8525a69bc5d38c7aefc0e3852b2dcf..a83d104f24ed09696cdf10ea33885b64242e0191 100644
--- a/src/f_wipe.c
+++ b/src/f_wipe.c
@@ -56,7 +56,7 @@ UINT8 wipedefs[NUMWIPEDEFS] = {
0, // wipe_level_toblack
UINT8_MAX, // wipe_intermission_toblack
- UINT8_MAX, // wipe_continuing_toblack
+ 0, // wipe_continuing_toblack
0, // wipe_titlescreen_toblack
0, // wipe_timeattack_toblack
99, // wipe_credits_toblack
@@ -161,7 +161,7 @@ static fademask_t *F_GetFadeMask(UINT8 masknum, UINT8 scrnnum) {
{
// Determine pixel to use from fademask
pcolor = &pMasterPalette[*lump++];
- if (wipestyle == WIPESTYLE_LEVEL)
+ if (wipestyle == WIPESTYLE_COLORMAP)
*mask++ = pcolor->s.red / FADECOLORMAPDIV;
else
*mask++ = FixedDiv((pcolor->s.red+1)<<FRACBITS, paldiv)>>FRACBITS;
@@ -191,7 +191,7 @@ void F_WipeStageTitle(void)
{
// draw level title
if ((WipeStageTitle && st_overlay)
- && (wipestyle == WIPESTYLE_LEVEL)
+ && (wipestyle == WIPESTYLE_COLORMAP)
&& !(mapheaderinfo[gamemap-1]->levelflags & LF_NOTITLECARD)
&& *mapheaderinfo[gamemap-1]->lvlttl != '\0')
{
@@ -282,7 +282,7 @@ static void F_DoWipe(fademask_t *fademask)
relativepos += vid.width;
}
}
- else if (*mask >= ((wipestyle == WIPESTYLE_LEVEL) ? FADECOLORMAPROWS : 10))
+ else if (*mask >= 10)
{
// shortcut - memcpy target to work
while (draw_linestogo--)
@@ -293,25 +293,113 @@ static void F_DoWipe(fademask_t *fademask)
}
else
{
- if (wipestyle == WIPESTYLE_LEVEL)
+ // pointer to transtable that this mask would use
+ transtbl = transtables + ((9 - *mask)<<FF_TRANSSHIFT);
+
+ // DRAWING LOOP
+ while (draw_linestogo--)
{
- int nmask;
- UINT8 *fade = fadecolormap;
+ w = w_base + relativepos;
+ s = s_base + relativepos;
+ e = e_base + relativepos;
+ draw_rowstogo = draw_rowend - draw_rowstart;
+
+ while (draw_rowstogo--)
+ *w++ = transtbl[ ( *e++ << 8 ) + *s++ ];
+
+ relativepos += vid.width;
+ }
+ // END DRAWING LOOP
+ }
- if (wipestyleflags & WSF_TOWHITE)
- fade = fadecolormap + (FADECOLORMAPROWS * 256);
+ if (++maskx >= fademask->width)
+ ++masky, maskx = 0;
+ } while (++mask < maskend);
+
+ free(scrxpos);
+ free(scrypos);
+ }
+}
+
+static void F_DoColormapWipe(fademask_t *fademask, UINT8 *colormap)
+{
+ // Lactozilla: F_DoWipe for WIPESTYLE_COLORMAP
+ {
+ // wipe screen, start, end
+ UINT8 *w = wipe_scr;
+ const UINT8 *s = wipe_scr_start;
+ const UINT8 *e = wipe_scr_end;
+
+ // first pixel for each screen
+ UINT8 *w_base = w;
+ const UINT8 *s_base = s;
+ const UINT8 *e_base = e;
+
+ // mask data, end
+ UINT8 *transtbl;
+ const UINT8 *mask = fademask->mask;
+ const UINT8 *maskend = mask + fademask->size;
+
+ // rectangle draw hints
+ UINT32 draw_linestart, draw_rowstart;
+ UINT32 draw_lineend, draw_rowend;
+ UINT32 draw_linestogo, draw_rowstogo;
+
+ // rectangle coordinates, etc.
+ UINT16* scrxpos = (UINT16*)malloc((fademask->width + 1) * sizeof(UINT16));
+ UINT16* scrypos = (UINT16*)malloc((fademask->height + 1) * sizeof(UINT16));
+ UINT16 maskx, masky;
+ UINT32 relativepos;
+
+ // ---
+ // Screw it, we do the fixed point math ourselves up front.
+ scrxpos[0] = 0;
+ for (relativepos = 0, maskx = 1; maskx < fademask->width; ++maskx)
+ scrxpos[maskx] = (relativepos += fademask->xscale)>>FRACBITS;
+ scrxpos[fademask->width] = vid.width;
+
+ scrypos[0] = 0;
+ for (relativepos = 0, masky = 1; masky < fademask->height; ++masky)
+ scrypos[masky] = (relativepos += fademask->yscale)>>FRACBITS;
+ scrypos[fademask->height] = vid.height;
+ // ---
+
+ maskx = masky = 0;
+ do
+ {
+ draw_rowstart = scrxpos[maskx];
+ draw_rowend = scrxpos[maskx + 1];
+ draw_linestart = scrypos[masky];
+ draw_lineend = scrypos[masky + 1];
- nmask = *mask;
- if (wipestyleflags & WSF_FADEIN)
- nmask = (FADECOLORMAPROWS-1) - nmask;
+ relativepos = (draw_linestart * vid.width) + draw_rowstart;
+ draw_linestogo = draw_lineend - draw_linestart;
- transtbl = fade + (nmask * 256);
+ if (*mask == 0)
+ {
+ // shortcut - memcpy source to work
+ while (draw_linestogo--)
+ {
+ M_Memcpy(w_base+relativepos, s_base+relativepos, draw_rowend-draw_rowstart);
+ relativepos += vid.width;
}
- else
+ }
+ else if (*mask >= FADECOLORMAPROWS)
+ {
+ // shortcut - memcpy target to work
+ while (draw_linestogo--)
{
- // pointer to transtable that this mask would use
- transtbl = transtables + ((9 - *mask)<<FF_TRANSSHIFT);
+ M_Memcpy(w_base+relativepos, e_base+relativepos, draw_rowend-draw_rowstart);
+ relativepos += vid.width;
}
+ }
+ else
+ {
+ int nmask = *mask;
+ if (wipestyleflags & WSF_FADEIN)
+ nmask = (FADECOLORMAPROWS-1) - nmask;
+
+ transtbl = colormap + (nmask * 256);
// DRAWING LOOP
while (draw_linestogo--)
@@ -321,16 +409,8 @@ static void F_DoWipe(fademask_t *fademask)
e = e_base + relativepos;
draw_rowstogo = draw_rowend - draw_rowstart;
- if (wipestyle == WIPESTYLE_LEVEL)
- {
- while (draw_rowstogo--)
- *w++ = transtbl[*e++];
- }
- else
- {
- while (draw_rowstogo--)
- *w++ = transtbl[ ( *e++ << 8 ) + *s++ ];
- }
+ while (draw_rowstogo--)
+ *w++ = transtbl[*e++];
relativepos += vid.width;
}
@@ -382,6 +462,62 @@ void F_WipeEndScreen(void)
#endif
}
+/** Verifies every condition for a colormapped fade.
+ */
+boolean F_ShouldColormapFade(void)
+{
+ if ((wipestyleflags & (WSF_FADEIN|WSF_FADEOUT)) // only if one of those wipestyleflags are actually set
+ && !(wipestyleflags & WSF_CROSSFADE)) // and if not crossfading
+ {
+ // World
+ return (gamestate == GS_LEVEL
+ || gamestate == GS_TITLESCREEN
+ // Finales
+ || gamestate == GS_CONTINUING
+ || gamestate == GS_CREDITS
+ || gamestate == GS_EVALUATION
+ || gamestate == GS_INTRO
+ || gamestate == GS_ENDING
+ // Menus
+ || gamestate == GS_TIMEATTACK);
+ }
+ return false;
+}
+
+/** Decides what wipe style to use.
+ */
+void F_DecideWipeStyle(void)
+{
+ // Set default wipe style
+ wipestyle = WIPESTYLE_NORMAL;
+
+ // Check for colormap wipe style
+ if (F_ShouldColormapFade())
+ wipestyle = WIPESTYLE_COLORMAP;
+}
+
+/** Attempt to run a colormap fade,
+ provided all the conditionals were properly met.
+ Returns true if so.
+ I demand you call F_RunWipe after this function.
+ */
+boolean F_TryColormapFade(UINT8 wipecolor)
+{
+ if (F_ShouldColormapFade())
+ {
+#ifdef HWRENDER
+ if (rendermode == render_opengl)
+ F_WipeColorFill(wipecolor);
+#endif
+ return true;
+ }
+ else
+ {
+ F_WipeColorFill(wipecolor);
+ return false;
+ }
+}
+
/** After setting up the screens you want to wipe,
* calling this will do a 'typical' wipe.
*/
@@ -399,18 +535,10 @@ void F_RunWipe(UINT8 wipetype, boolean drawMenu)
paldiv = FixedDiv(257<<FRACBITS, 11<<FRACBITS);
// Init the wipe
+ F_DecideWipeStyle();
WipeInAction = true;
wipe_scr = screens[0];
- // don't know where else to put this.
- // this any good?
- if ((gamestate == GS_LEVEL || gamestate == GS_TITLESCREEN)
- && (wipestyleflags & (WSF_FADEIN|WSF_FADEOUT)) // only if one of those wipestyleflags are actually set
- && !(wipestyleflags & WSF_CROSSFADE)) // and if not crossfading
- wipestyle = WIPESTYLE_LEVEL;
- else
- wipestyle = WIPESTYLE_NORMAL;
-
// lastwipetic should either be 0 or the tic we last wiped
// on for fade-to-black
for (;;)
@@ -425,21 +553,39 @@ void F_RunWipe(UINT8 wipetype, boolean drawMenu)
I_Sleep();
lastwipetic = nowtime;
-#ifdef HWRENDER
- if (rendermode == render_opengl)
+ // Wipe styles
+ if (wipestyle == WIPESTYLE_COLORMAP)
{
- // send in the wipe type and wipe frame because we need to cache the graphic
- if (wipestyle == WIPESTYLE_LEVEL)
+#ifdef HWRENDER
+ if (rendermode == render_opengl)
+ {
+ // send in the wipe type and wipe frame because we need to cache the graphic
HWR_DoTintedWipe(wipetype, wipeframe-1);
+ }
else
- HWR_DoWipe(wipetype, wipeframe-1);
- }
- else
#endif
- F_DoWipe(fmask);
+ {
+ UINT8 *colormap = fadecolormap;
+ if (wipestyleflags & WSF_TOWHITE)
+ colormap += (FADECOLORMAPROWS * 256);
+ F_DoColormapWipe(fmask, colormap);
+ }
- if (wipestyle == WIPESTYLE_LEVEL)
+ // Draw the title card above the wipe
F_WipeStageTitle();
+ }
+ else
+ {
+#ifdef HWRENDER
+ if (rendermode == render_opengl)
+ {
+ // send in the wipe type and wipe frame because we need to cache the graphic
+ HWR_DoWipe(wipetype, wipeframe-1);
+ }
+ else
+#endif
+ F_DoWipe(fmask);
+ }
I_OsPolling();
I_UpdateNoBlit();
diff --git a/src/g_game.c b/src/g_game.c
index 2a12dd298093c091338762fba50b59c711c8eb19..d574afcf2f1b11dabc53641dee27e313aee42c73 100644
--- a/src/g_game.c
+++ b/src/g_game.c
@@ -79,7 +79,7 @@ UINT16 mapmusflags; // Track and reset bit
UINT32 mapmusposition; // Position to jump to
INT16 gamemap = 1;
-INT16 maptol;
+UINT32 maptol;
UINT8 globalweather = 0;
INT32 curWeather = PRECIP_NONE;
INT32 cursaveslot = 0; // Auto-save 1p savegame slot
@@ -275,6 +275,12 @@ static UINT8 *metalbuffer = NULL;
static UINT8 *metal_p;
static UINT16 metalversion;
+typedef struct joystickvector2_s
+{
+ INT32 xaxis;
+ INT32 yaxis;
+} joystickvector2_t;
+
// extra data stuff (events registered this frame while recording)
static struct {
UINT8 flags; // EZT flags
@@ -394,6 +400,11 @@ consvar_t cv_directionchar2 = {"directionchar2", "Movement", CV_SAVE|CV_CALL, di
consvar_t cv_autobrake = {"autobrake", "On", CV_SAVE|CV_CALL, CV_OnOff, AutoBrake_OnChange, 0, NULL, NULL, 0, 0, NULL};
consvar_t cv_autobrake2 = {"autobrake2", "On", CV_SAVE|CV_CALL, CV_OnOff, AutoBrake2_OnChange, 0, NULL, NULL, 0, 0, NULL};
+static CV_PossibleValue_t deadzone_cons_t[] = {{0, "MIN"}, {FRACUNIT, "MAX"}, {0, NULL}};
+consvar_t cv_deadzone = {"deadzone", "0.25", CV_FLOAT|CV_SAVE, deadzone_cons_t, NULL, 0, NULL, NULL, 0, 0, NULL};
+consvar_t cv_deadzone2 = {"deadzone2", "0.25", CV_FLOAT|CV_SAVE, deadzone_cons_t, NULL, 0, NULL, NULL, 0, 0, NULL};
+
+
typedef enum
{
AXISNONE = 0,
@@ -401,7 +412,6 @@ typedef enum
AXISMOVE,
AXISLOOK,
AXISSTRAFE,
- AXISDEAD, //Axises that don't want deadzones
AXISJUMP,
AXISSPIN,
AXISFIRE,
@@ -882,12 +892,6 @@ static INT32 JoyAxis(axis_input_e axissel)
retaxis = -JOYAXISRANGE;
if (retaxis > (+JOYAXISRANGE))
retaxis = +JOYAXISRANGE;
- if (!Joystick.bGamepadStyle && axissel < AXISDEAD)
- {
- const INT32 jdeadzone = JOYAXISRANGE/4;
- if (-jdeadzone < retaxis && retaxis < jdeadzone)
- return 0;
- }
if (flp) retaxis = -retaxis; //flip it around
return retaxis;
}
@@ -955,16 +959,75 @@ static INT32 Joy2Axis(axis_input_e axissel)
retaxis = -JOYAXISRANGE;
if (retaxis > (+JOYAXISRANGE))
retaxis = +JOYAXISRANGE;
- if (!Joystick2.bGamepadStyle && axissel < AXISDEAD)
- {
- const INT32 jdeadzone = JOYAXISRANGE/4;
- if (-jdeadzone < retaxis && retaxis < jdeadzone)
- return 0;
- }
if (flp) retaxis = -retaxis; //flip it around
return retaxis;
}
+// Take a magnitude of two axes, and adjust it to take out the deadzone
+// Will return a value between 0 and JOYAXISRANGE
+static INT32 G_BasicDeadZoneCalculation(INT32 magnitude, fixed_t deadZone)
+{
+ const INT32 jdeadzone = (JOYAXISRANGE * deadZone) / FRACUNIT;
+ INT32 deadzoneAppliedValue = 0;
+
+ if (jdeadzone > 0)
+ {
+ if (magnitude > jdeadzone)
+ {
+ INT32 adjustedMagnitude = abs(magnitude);
+ adjustedMagnitude = min(adjustedMagnitude, JOYAXISRANGE);
+
+ adjustedMagnitude -= jdeadzone;
+
+ deadzoneAppliedValue = (adjustedMagnitude * JOYAXISRANGE) / (JOYAXISRANGE - jdeadzone);
+ }
+ }
+
+ return deadzoneAppliedValue;
+}
+
+// Get the actual sensible radial value for a joystick axis when accounting for a deadzone
+static void G_HandleAxisDeadZone(UINT8 splitnum, joystickvector2_t *joystickvector)
+{
+ INT32 gamepadStyle = Joystick.bGamepadStyle;
+ fixed_t deadZone = cv_deadzone.value;
+
+ if (splitnum == 1)
+ {
+ gamepadStyle = Joystick2.bGamepadStyle;
+ deadZone = cv_deadzone2.value;
+ }
+
+ // When gamepadstyle is "true" the values are just -1, 0, or 1. This is done in the interface code.
+ if (!gamepadStyle)
+ {
+ // Get the total magnitude of the 2 axes
+ INT32 magnitude = (joystickvector->xaxis * joystickvector->xaxis) + (joystickvector->yaxis * joystickvector->yaxis);
+ INT32 normalisedXAxis;
+ INT32 normalisedYAxis;
+ INT32 normalisedMagnitude;
+ double dMagnitude = sqrt((double)magnitude);
+ magnitude = (INT32)dMagnitude;
+
+ // Get the normalised xy values from the magnitude
+ normalisedXAxis = (joystickvector->xaxis * magnitude) / JOYAXISRANGE;
+ normalisedYAxis = (joystickvector->yaxis * magnitude) / JOYAXISRANGE;
+
+ // Apply the deadzone to the magnitude to give a correct value between 0 and JOYAXISRANGE
+ normalisedMagnitude = G_BasicDeadZoneCalculation(magnitude, deadZone);
+
+ // Apply the deadzone to the xy axes
+ joystickvector->xaxis = (normalisedXAxis * normalisedMagnitude) / JOYAXISRANGE;
+ joystickvector->yaxis = (normalisedYAxis * normalisedMagnitude) / JOYAXISRANGE;
+
+ // Cap the values so they don't go above the correct maximum
+ joystickvector->xaxis = min(joystickvector->xaxis, JOYAXISRANGE);
+ joystickvector->xaxis = max(joystickvector->xaxis, -JOYAXISRANGE);
+ joystickvector->yaxis = min(joystickvector->yaxis, JOYAXISRANGE);
+ joystickvector->yaxis = max(joystickvector->yaxis, -JOYAXISRANGE);
+ }
+}
+
//
// G_BuildTiccmd
@@ -985,12 +1048,13 @@ void G_BuildTiccmd(ticcmd_t *cmd, INT32 realtics)
{
boolean forcestrafe = false;
boolean forcefullinput = false;
- INT32 tspeed, forward, side, axis, altaxis, i;
+ INT32 tspeed, forward, side, axis, strafeaxis, moveaxis, turnaxis, lookaxis, i;
const INT32 speed = 1;
// these ones used for multiple conditions
boolean turnleft, turnright, strafelkey, straferkey, movefkey, movebkey, mouseaiming, analogjoystickmove, gamepadjoystickmove, thisjoyaiming;
player_t *player = &players[consoleplayer];
camera_t *thiscam = &camera;
+ joystickvector2_t movejoystickvector, lookjoystickvector;
static INT32 turnheld; // for accelerative turning
static boolean keyboard_look; // true if lookup/down using keyboard
@@ -1002,7 +1066,7 @@ void G_BuildTiccmd(ticcmd_t *cmd, INT32 realtics)
// why build a ticcmd if we're paused?
// Or, for that matter, if we're being reborn.
// ...OR if we're blindfolded. No looking into the floor.
- if (paused || P_AutoPause() || (gamestate == GS_LEVEL && (player->playerstate == PST_REBORN || ((gametype == GT_TAG || gametype == GT_HIDEANDSEEK)
+ if (paused || P_AutoPause() || (gamestate == GS_LEVEL && (player->playerstate == PST_REBORN || ((gametyperules & GTR_TAG)
&& (leveltime < hidetime * TICRATE) && (player->pflags & PF_TAGIT)))))
{
cmd->angleturn = (INT16)(localangle >> 16);
@@ -1030,11 +1094,16 @@ void G_BuildTiccmd(ticcmd_t *cmd, INT32 realtics)
localaiming = 0;
joyaiming = thisjoyaiming;
- axis = JoyAxis(AXISTURN);
- if (gamepadjoystickmove && axis != 0)
+ turnaxis = JoyAxis(AXISTURN);
+ lookaxis = JoyAxis(AXISLOOK);
+ lookjoystickvector.xaxis = turnaxis;
+ lookjoystickvector.yaxis = lookaxis;
+ G_HandleAxisDeadZone(0, &lookjoystickvector);
+
+ if (gamepadjoystickmove && lookjoystickvector.xaxis != 0)
{
- turnright = turnright || (axis > 0);
- turnleft = turnleft || (axis < 0);
+ turnright = turnright || (lookjoystickvector.xaxis > 0);
+ turnleft = turnleft || (lookjoystickvector.xaxis < 0);
}
forward = side = 0;
@@ -1074,10 +1143,10 @@ void G_BuildTiccmd(ticcmd_t *cmd, INT32 realtics)
if (turnleft)
side -= sidemove[speed];
- if (analogjoystickmove && axis != 0)
+ if (analogjoystickmove && lookjoystickvector.xaxis != 0)
{
// JOYAXISRANGE is supposed to be 1023 (divide by 1024)
- side += ((axis * sidemove[1]) >> 10);
+ side += ((lookjoystickvector.xaxis * sidemove[1]) >> 10);
}
}
else if (cv_analog.value) // Analog
@@ -1094,41 +1163,44 @@ void G_BuildTiccmd(ticcmd_t *cmd, INT32 realtics)
else if (turnleft)
cmd->angleturn = (INT16)(cmd->angleturn + angleturn[tspeed]);
- if (analogjoystickmove && axis != 0)
+ if (analogjoystickmove && lookjoystickvector.xaxis != 0)
{
// JOYAXISRANGE should be 1023 (divide by 1024)
- cmd->angleturn = (INT16)(cmd->angleturn - ((axis * angleturn[1]) >> 10)); // ANALOG!
+ cmd->angleturn = (INT16)(cmd->angleturn - ((lookjoystickvector.xaxis * angleturn[1]) >> 10)); // ANALOG!
}
}
- axis = JoyAxis(AXISSTRAFE);
- if (gamepadjoystickmove && axis != 0)
+ strafeaxis = JoyAxis(AXISSTRAFE);
+ moveaxis = JoyAxis(AXISMOVE);
+ movejoystickvector.xaxis = strafeaxis;
+ movejoystickvector.yaxis = moveaxis;
+ G_HandleAxisDeadZone(0, &movejoystickvector);
+
+ if (gamepadjoystickmove && movejoystickvector.xaxis != 0)
{
- if (axis < 0)
+ if (movejoystickvector.xaxis > 0)
side += sidemove[speed];
- else if (axis > 0)
+ else if (movejoystickvector.xaxis < 0)
side -= sidemove[speed];
}
- else if (analogjoystickmove && axis != 0)
+ else if (analogjoystickmove && movejoystickvector.xaxis != 0)
{
// JOYAXISRANGE is supposed to be 1023 (divide by 1024)
- side += ((axis * sidemove[1]) >> 10);
+ side += ((movejoystickvector.xaxis * sidemove[1]) >> 10);
}
// forward with key or button
- axis = JoyAxis(AXISMOVE);
- altaxis = JoyAxis(AXISLOOK);
- if (movefkey || (gamepadjoystickmove && axis < 0)
+ if (movefkey || (gamepadjoystickmove && movejoystickvector.yaxis < 0)
|| ((player->powers[pw_carry] == CR_NIGHTSMODE)
- && (PLAYER1INPUTDOWN(gc_lookup) || (gamepadjoystickmove && altaxis < 0))))
+ && (PLAYER1INPUTDOWN(gc_lookup) || (gamepadjoystickmove && lookjoystickvector.yaxis > 0))))
forward = forwardmove[speed];
- if (movebkey || (gamepadjoystickmove && axis > 0)
+ if (movebkey || (gamepadjoystickmove && movejoystickvector.yaxis > 0)
|| ((player->powers[pw_carry] == CR_NIGHTSMODE)
- && (PLAYER1INPUTDOWN(gc_lookdown) || (gamepadjoystickmove && altaxis > 0))))
+ && (PLAYER1INPUTDOWN(gc_lookdown) || (gamepadjoystickmove && lookjoystickvector.yaxis < 0))))
forward -= forwardmove[speed];
- if (analogjoystickmove && axis != 0)
- forward -= ((axis * forwardmove[1]) >> 10); // ANALOG!
+ if (analogjoystickmove && movejoystickvector.yaxis != 0)
+ forward -= ((movejoystickvector.yaxis * forwardmove[1]) >> 10); // ANALOG!
// some people strafe left & right with mouse buttons
// those people are weird
@@ -1211,9 +1283,8 @@ void G_BuildTiccmd(ticcmd_t *cmd, INT32 realtics)
localaiming += (mlooky<<19)*player_invert*screen_invert;
}
- axis = JoyAxis(AXISLOOK);
- if (analogjoystickmove && joyaiming && axis != 0 && cv_lookaxis.value != 0)
- localaiming += (axis<<16) * screen_invert;
+ if (analogjoystickmove && joyaiming && lookjoystickvector.yaxis != 0 && cv_lookaxis.value != 0)
+ localaiming += (lookjoystickvector.yaxis<<16) * screen_invert;
// spring back if not using keyboard neither mouselookin'
if (!keyboard_look && cv_lookaxis.value == 0 && !joyaiming && !mouseaiming)
@@ -1221,12 +1292,12 @@ void G_BuildTiccmd(ticcmd_t *cmd, INT32 realtics)
if (!(player->powers[pw_carry] == CR_NIGHTSMODE))
{
- if (PLAYER1INPUTDOWN(gc_lookup) || (gamepadjoystickmove && axis < 0))
+ if (PLAYER1INPUTDOWN(gc_lookup) || (gamepadjoystickmove && lookjoystickvector.yaxis > 0))
{
localaiming += KB_LOOKSPEED * screen_invert;
keyboard_look = true;
}
- else if (PLAYER1INPUTDOWN(gc_lookdown) || (gamepadjoystickmove && axis > 0))
+ else if (PLAYER1INPUTDOWN(gc_lookdown) || (gamepadjoystickmove && lookjoystickvector.yaxis < 0))
{
localaiming -= KB_LOOKSPEED * screen_invert;
keyboard_look = true;
@@ -1308,7 +1379,14 @@ void G_BuildTiccmd(ticcmd_t *cmd, INT32 realtics)
//Reset away view if a command is given.
if ((cmd->forwardmove || cmd->sidemove || cmd->buttons)
&& displayplayer != consoleplayer)
+ {
+#ifdef HAVE_BLUA
+ // Call ViewpointSwitch hooks here.
+ // The viewpoint was forcibly changed.
+ LUAh_ViewpointSwitch(player, &players[displayplayer], true);
+#endif
displayplayer = consoleplayer;
+ }
}
// like the g_buildticcmd 1 but using mouse2, gamcontrolbis, ...
@@ -1316,12 +1394,13 @@ void G_BuildTiccmd2(ticcmd_t *cmd, INT32 realtics)
{
boolean forcestrafe = false;
boolean forcefullinput = false;
- INT32 tspeed, forward, side, axis, altaxis, i;
+ INT32 tspeed, forward, side, axis, strafeaxis, moveaxis, turnaxis, lookaxis, i;
const INT32 speed = 1;
// these ones used for multiple conditions
boolean turnleft, turnright, strafelkey, straferkey, movefkey, movebkey, mouseaiming, analogjoystickmove, gamepadjoystickmove, thisjoyaiming;
player_t *player = &players[secondarydisplayplayer];
camera_t *thiscam = (player->bot == 2 ? &camera : &camera2);
+ joystickvector2_t movejoystickvector, lookjoystickvector;
static INT32 turnheld; // for accelerative turning
static boolean keyboard_look; // true if lookup/down using keyboard
@@ -1359,11 +1438,16 @@ void G_BuildTiccmd2(ticcmd_t *cmd, INT32 realtics)
localaiming2 = 0;
joyaiming = thisjoyaiming;
- axis = Joy2Axis(AXISTURN);
- if (gamepadjoystickmove && axis != 0)
+ turnaxis = Joy2Axis(AXISTURN);
+ lookaxis = Joy2Axis(AXISLOOK);
+ lookjoystickvector.xaxis = turnaxis;
+ lookjoystickvector.yaxis = lookaxis;
+ G_HandleAxisDeadZone(1, &lookjoystickvector);
+
+ if (gamepadjoystickmove && lookjoystickvector.xaxis != 0)
{
- turnright = turnright || (axis > 0);
- turnleft = turnleft || (axis < 0);
+ turnright = turnright || (lookjoystickvector.xaxis > 0);
+ turnleft = turnleft || (lookjoystickvector.xaxis < 0);
}
forward = side = 0;
@@ -1404,10 +1488,10 @@ void G_BuildTiccmd2(ticcmd_t *cmd, INT32 realtics)
if (turnleft)
side -= sidemove[speed];
- if (analogjoystickmove && axis != 0)
+ if (analogjoystickmove && lookjoystickvector.xaxis != 0)
{
// JOYAXISRANGE is supposed to be 1023 (divide by 1024)
- side += ((axis * sidemove[1]) >> 10);
+ side += ((lookjoystickvector.xaxis * sidemove[1]) >> 10);
}
}
else if (cv_analog2.value) // Analog
@@ -1424,41 +1508,44 @@ void G_BuildTiccmd2(ticcmd_t *cmd, INT32 realtics)
else if (turnleft)
cmd->angleturn = (INT16)(cmd->angleturn + angleturn[tspeed]);
- if (analogjoystickmove && axis != 0)
+ if (analogjoystickmove && lookjoystickvector.xaxis != 0)
{
// JOYAXISRANGE should be 1023 (divide by 1024)
- cmd->angleturn = (INT16)(cmd->angleturn - ((axis * angleturn[1]) >> 10)); // ANALOG!
+ cmd->angleturn = (INT16)(cmd->angleturn - ((lookjoystickvector.xaxis * angleturn[1]) >> 10)); // ANALOG!
}
}
- axis = Joy2Axis(AXISSTRAFE);
- if (gamepadjoystickmove && axis != 0)
+ strafeaxis = Joy2Axis(AXISSTRAFE);
+ moveaxis = Joy2Axis(AXISMOVE);
+ movejoystickvector.xaxis = strafeaxis;
+ movejoystickvector.yaxis = moveaxis;
+ G_HandleAxisDeadZone(1, &movejoystickvector);
+
+ if (gamepadjoystickmove && movejoystickvector.xaxis != 0)
{
- if (axis < 0)
+ if (movejoystickvector.xaxis > 0)
side += sidemove[speed];
- else if (axis > 0)
+ else if (movejoystickvector.xaxis < 0)
side -= sidemove[speed];
}
- else if (analogjoystickmove && axis != 0)
+ else if (analogjoystickmove && movejoystickvector.xaxis != 0)
{
// JOYAXISRANGE is supposed to be 1023 (divide by 1024)
- side += ((axis * sidemove[1]) >> 10);
+ side += ((movejoystickvector.xaxis * sidemove[1]) >> 10);
}
// forward with key or button
- axis = Joy2Axis(AXISMOVE);
- altaxis = Joy2Axis(AXISLOOK);
- if (movefkey || (gamepadjoystickmove && axis < 0)
+ if (movefkey || (gamepadjoystickmove && movejoystickvector.yaxis < 0)
|| ((player->powers[pw_carry] == CR_NIGHTSMODE)
- && (PLAYER2INPUTDOWN(gc_lookup) || (gamepadjoystickmove && altaxis < 0))))
+ && (PLAYER2INPUTDOWN(gc_lookup) || (gamepadjoystickmove && lookjoystickvector.yaxis > 0))))
forward = forwardmove[speed];
- if (movebkey || (gamepadjoystickmove && axis > 0)
+ if (movebkey || (gamepadjoystickmove && movejoystickvector.yaxis > 0)
|| ((player->powers[pw_carry] == CR_NIGHTSMODE)
- && (PLAYER2INPUTDOWN(gc_lookdown) || (gamepadjoystickmove && altaxis > 0))))
+ && (PLAYER2INPUTDOWN(gc_lookdown) || (gamepadjoystickmove && lookjoystickvector.yaxis < 0))))
forward -= forwardmove[speed];
- if (analogjoystickmove && axis != 0)
- forward -= ((axis * forwardmove[1]) >> 10); // ANALOG!
+ if (analogjoystickmove && movejoystickvector.yaxis != 0)
+ forward -= ((movejoystickvector.yaxis * forwardmove[1]) >> 10); // ANALOG!
// some people strafe left & right with mouse buttons
// those people are (still) weird
@@ -1538,9 +1625,8 @@ void G_BuildTiccmd2(ticcmd_t *cmd, INT32 realtics)
localaiming2 += (mlook2y<<19)*player_invert*screen_invert;
}
- axis = Joy2Axis(AXISLOOK);
- if (analogjoystickmove && joyaiming && axis != 0 && cv_lookaxis2.value != 0)
- localaiming2 += (axis<<16) * screen_invert;
+ if (analogjoystickmove && joyaiming && lookjoystickvector.yaxis != 0 && cv_lookaxis2.value != 0)
+ localaiming2 += (lookjoystickvector.yaxis<<16) * screen_invert;
// spring back if not using keyboard neither mouselookin'
if (!keyboard_look && cv_lookaxis2.value == 0 && !joyaiming && !mouseaiming)
@@ -1548,12 +1634,12 @@ void G_BuildTiccmd2(ticcmd_t *cmd, INT32 realtics)
if (!(player->powers[pw_carry] == CR_NIGHTSMODE))
{
- if (PLAYER2INPUTDOWN(gc_lookup) || (gamepadjoystickmove && axis < 0))
+ if (PLAYER2INPUTDOWN(gc_lookup) || (gamepadjoystickmove && lookjoystickvector.yaxis > 0))
{
localaiming2 += KB_LOOKSPEED * screen_invert;
keyboard_look = true;
}
- else if (PLAYER2INPUTDOWN(gc_lookdown) || (gamepadjoystickmove && axis > 0))
+ else if (PLAYER2INPUTDOWN(gc_lookdown) || (gamepadjoystickmove && lookjoystickvector.yaxis < 0))
{
localaiming2 -= KB_LOOKSPEED * screen_invert;
keyboard_look = true;
@@ -1804,12 +1890,9 @@ void G_DoLoadLevel(boolean resetplayer)
//
void G_StartTitleCard(void)
{
- wipestyleflags |= WSF_FADEIN;
- wipestyleflags &= ~WSF_FADEOUT;
-
// The title card has been disabled for this map.
// Oh well.
- if (mapheaderinfo[gamemap-1]->levelflags & LF_NOTITLECARD)
+ if (!G_IsTitleCardAvailable())
{
WipeStageTitle = false;
return;
@@ -1850,6 +1933,25 @@ void G_PreLevelTitleCard(void)
if (takescreenshot) // Only take screenshots after drawing.
M_DoScreenShot();
}
+ if (!cv_showhud.value)
+ wipestyleflags = WSF_CROSSFADE;
+}
+
+//
+// Returns true if the current level has a title card.
+//
+boolean G_IsTitleCardAvailable(void)
+{
+ // The current level header explicitly disabled the title card.
+ if (mapheaderinfo[gamemap-1]->levelflags & LF_NOTITLECARD)
+ return false;
+
+ // The current gametype doesn't have a title card.
+ if (gametyperules & GTR_NOTITLECARD)
+ return false;
+
+ // The title card is available.
+ return true;
}
INT32 pausedelay = 0;
@@ -1942,6 +2044,11 @@ boolean G_Responder(event_t *ev)
if (gamestate == GS_LEVEL && ev->type == ev_keydown
&& (ev->data1 == KEY_F12 || ev->data1 == gamecontrol[gc_viewpoint][0] || ev->data1 == gamecontrol[gc_viewpoint][1]))
{
+ // ViewpointSwitch Lua hook.
+#ifdef HAVE_BLUA
+ UINT8 canSwitchView = 0;
+#endif
+
if (splitscreen || !netgame)
displayplayer = consoleplayer;
else
@@ -1956,6 +2063,15 @@ boolean G_Responder(event_t *ev)
if (!playeringame[displayplayer])
continue;
+#ifdef HAVE_BLUA
+ // Call ViewpointSwitch hooks here.
+ canSwitchView = LUAh_ViewpointSwitch(&players[consoleplayer], &players[displayplayer], false);
+ if (canSwitchView == 1) // Set viewpoint to this player
+ break;
+ else if (canSwitchView == 2) // Skip this player
+ continue;
+#endif
+
if (players[displayplayer].spectator)
continue;
@@ -2564,7 +2680,7 @@ void G_SpawnPlayer(INT32 playernum, boolean starpost)
// -- CTF --
// Order: CTF->DM->Coop
- if (gametype == GT_CTF && players[playernum].ctfteam)
+ if ((gametyperules & (GTR_TEAMFLAGS|GTR_TEAMS)) && players[playernum].ctfteam)
{
if (!(spawnpoint = G_FindCTFStart(playernum)) // find a CTF start
&& !(spawnpoint = G_FindMatchStart(playernum))) // find a DM start
@@ -2573,7 +2689,7 @@ void G_SpawnPlayer(INT32 playernum, boolean starpost)
// -- DM/Tag/CTF-spectator/etc --
// Order: DM->CTF->Coop
- else if (gametype == GT_MATCH || gametype == GT_TEAMMATCH || gametype == GT_CTF
+ else if ((gametyperules & GTR_DEATHMATCHSTARTS) || gametype == GT_MATCH || gametype == GT_TEAMMATCH || gametype == GT_CTF
|| ((gametype == GT_TAG || gametype == GT_HIDEANDSEEK) && !(players[playernum].pflags & PF_TAGIT)))
{
if (!(spawnpoint = G_FindMatchStart(playernum)) // find a DM start
@@ -2620,7 +2736,7 @@ mapthing_t *G_FindCTFStart(INT32 playernum)
if (!numredctfstarts && !numbluectfstarts) //why even bother, eh?
{
- if (playernum == consoleplayer || (splitscreen && playernum == secondarydisplayplayer))
+ if ((gametyperules & GTR_TEAMFLAGS) && (playernum == consoleplayer || (splitscreen && playernum == secondarydisplayplayer)))
CONS_Alert(CONS_WARNING, M_GetText("No CTF starts in this map!\n"));
return NULL;
}
@@ -3026,7 +3142,7 @@ void G_ExitLevel(void)
CV_SetValue(&cv_teamscramble, cv_scrambleonchange.value);
}
- if (gametype != GT_COOP)
+ if (!(gametyperules & GTR_CAMPAIGN))
CONS_Printf(M_GetText("The round has ended.\n"));
// Remove CEcho text on round end.
@@ -3058,6 +3174,221 @@ const char *Gametype_Names[NUMGAMETYPES] =
"CTF" // GT_CTF
};
+// For dehacked
+const char *Gametype_ConstantNames[NUMGAMETYPES] =
+{
+ "GT_COOP", // GT_COOP
+ "GT_COMPETITION", // GT_COMPETITION
+ "GT_RACE", // GT_RACE
+
+ "GT_MATCH", // GT_MATCH
+ "GT_TEAMMATCH", // GT_TEAMMATCH
+
+ "GT_TAG", // GT_TAG
+ "GT_HIDEANDSEEK", // GT_HIDEANDSEEK
+
+ "GT_CTF" // GT_CTF
+};
+
+// Gametype rules
+UINT32 gametypedefaultrules[NUMGAMETYPES] =
+{
+ // Co-op
+ GTR_CAMPAIGN|GTR_LIVES|GTR_SPAWNENEMIES|GTR_ALLOWEXIT|GTR_EMERALDHUNT|GTR_EMERALDTOKENS|GTR_SPECIALSTAGES,
+ // Competition
+ GTR_RACE|GTR_LIVES|GTR_SPAWNENEMIES|GTR_EMERALDTOKENS|GTR_SPAWNINVUL|GTR_ALLOWEXIT,
+ // Race
+ GTR_RACE|GTR_SPAWNENEMIES|GTR_SPAWNINVUL|GTR_ALLOWEXIT,
+
+ // Match
+ GTR_RINGSLINGER|GTR_FIRSTPERSON|GTR_SPECTATORS|GTR_POINTLIMIT|GTR_TIMELIMIT|GTR_MATCHEMERALDS|GTR_SPAWNINVUL|GTR_PITYSHIELD|GTR_DEATHPENALTY,
+ // Team Match
+ GTR_RINGSLINGER|GTR_FIRSTPERSON|GTR_SPECTATORS|GTR_TEAMS|GTR_POINTLIMIT|GTR_TIMELIMIT|GTR_SPAWNINVUL|GTR_PITYSHIELD,
+
+ // Tag
+ GTR_RINGSLINGER|GTR_FIRSTPERSON|GTR_TAG|GTR_SPECTATORS|GTR_POINTLIMIT|GTR_TIMELIMIT|GTR_HIDETIME|GTR_BLINDFOLDED|GTR_SPAWNINVUL,
+ // Hide and Seek
+ GTR_RINGSLINGER|GTR_FIRSTPERSON|GTR_TAG|GTR_SPECTATORS|GTR_POINTLIMIT|GTR_TIMELIMIT|GTR_HIDETIME|GTR_BLINDFOLDED|GTR_SPAWNINVUL,
+
+ // CTF
+ GTR_RINGSLINGER|GTR_FIRSTPERSON|GTR_SPECTATORS|GTR_TEAMS|GTR_TEAMFLAGS|GTR_POINTLIMIT|GTR_TIMELIMIT|GTR_MATCHEMERALDS|GTR_SPAWNINVUL|GTR_PITYSHIELD,
+};
+
+//
+// G_SetGametype
+//
+// Set a new gametype, also setting gametype rules accordingly. Yay!
+//
+void G_SetGametype(INT16 gtype)
+{
+ gametype = gtype;
+ gametyperules = gametypedefaultrules[gametype];
+}
+
+//
+// G_AddGametype
+//
+// Add a gametype. Returns the new gametype number.
+//
+INT16 G_AddGametype(UINT32 rules)
+{
+ INT16 newgtype = gametypecount;
+ gametypecount++;
+
+ // Set gametype rules.
+ gametypedefaultrules[newgtype] = rules;
+ Gametype_Names[newgtype] = "???";
+
+ // Update gametype_cons_t accordingly.
+ G_UpdateGametypeSelections();
+
+ return newgtype;
+}
+
+//
+// G_AddGametypeConstant
+//
+// Self-explanatory. Filters out "bad" characters.
+//
+void G_AddGametypeConstant(INT16 gtype, const char *newgtconst)
+{
+ char *gtconst = Z_Malloc(strlen(newgtconst) + 3, PU_STATIC, NULL);
+ // Copy GT_ and the gametype name.
+ strcpy(gtconst, "GT_");
+ strcat(gtconst, newgtconst);
+ // Make uppercase.
+ strupr(gtconst);
+ // Remove characters.
+#define REMOVECHAR(chr) \
+ { \
+ char *chrfind = strchr(gtconst, chr); \
+ while (chrfind) \
+ { \
+ *chrfind = '_'; \
+ chrfind = strchr(chrfind, chr); \
+ } \
+ }
+
+ // Space
+ REMOVECHAR(' ')
+ // Used for operations
+ REMOVECHAR('+')
+ REMOVECHAR('-')
+ REMOVECHAR('*')
+ REMOVECHAR('/')
+ REMOVECHAR('%')
+ REMOVECHAR('^')
+ // Part of Lua's syntax
+ REMOVECHAR('#')
+ REMOVECHAR('=')
+ REMOVECHAR('~')
+ REMOVECHAR('<')
+ REMOVECHAR('>')
+ REMOVECHAR('(')
+ REMOVECHAR(')')
+ REMOVECHAR('{')
+ REMOVECHAR('}')
+ REMOVECHAR('[')
+ REMOVECHAR(']')
+ REMOVECHAR(':')
+ REMOVECHAR(';')
+ REMOVECHAR(',')
+ REMOVECHAR('.')
+
+#undef REMOVECHAR
+
+ // Finally, set the constant string.
+ Gametype_ConstantNames[gtype] = gtconst;
+}
+
+//
+// G_UpdateGametypeSelections
+//
+// Updates gametype_cons_t.
+//
+void G_UpdateGametypeSelections(void)
+{
+ INT32 i;
+ for (i = 0; i < gametypecount; i++)
+ {
+ gametype_cons_t[i].value = i;
+ gametype_cons_t[i].strvalue = Gametype_Names[i];
+ }
+ gametype_cons_t[NUMGAMETYPES].value = 0;
+ gametype_cons_t[NUMGAMETYPES].strvalue = NULL;
+}
+
+//
+// G_SetGametypeDescription
+//
+// Set a description for the specified gametype.
+// (Level platter)
+//
+void G_SetGametypeDescription(INT16 gtype, char *descriptiontext, UINT8 leftcolor, UINT8 rightcolor)
+{
+ if (descriptiontext != NULL)
+ strncpy(gametypedesc[gtype].notes, descriptiontext, 441);
+ gametypedesc[gtype].col[0] = leftcolor;
+ gametypedesc[gtype].col[1] = rightcolor;
+}
+
+// Gametype rankings
+INT16 gametyperankings[NUMGAMETYPES] =
+{
+ GT_COOP,
+ GT_COMPETITION,
+ GT_RACE,
+
+ GT_MATCH,
+ GT_TEAMMATCH,
+
+ GT_TAG,
+ GT_HIDEANDSEEK,
+
+ GT_CTF,
+};
+
+// Gametype to TOL (Type Of Level)
+UINT32 gametypetol[NUMGAMETYPES] =
+{
+ TOL_COOP, // Co-op
+ TOL_COMPETITION, // Competition
+ TOL_RACE, // Race
+
+ TOL_MATCH, // Match
+ TOL_MATCH, // Team Match
+
+ TOL_TAG, // Tag
+ TOL_TAG, // Hide and Seek
+
+ TOL_CTF, // CTF
+};
+
+//
+// G_AddTOL
+//
+// Adds a type of level.
+//
+void G_AddTOL(UINT32 newtol, const char *tolname)
+{
+ TYPEOFLEVEL[numtolinfo].name = Z_StrDup(tolname);
+ TYPEOFLEVEL[numtolinfo].flag = newtol;
+ numtolinfo++;
+
+ TYPEOFLEVEL[numtolinfo].name = NULL;
+ TYPEOFLEVEL[numtolinfo].flag = 0;
+}
+
+//
+// G_AddTOL
+//
+// Assigns a type of level to a gametype.
+//
+void G_AddGametypeTOL(INT16 gtype, UINT32 newtol)
+{
+ gametypetol[gtype] = newtol;
+}
+
//
// G_GetGametypeByName
//
@@ -3100,8 +3431,8 @@ boolean G_IsSpecialStage(INT32 mapnum)
//
boolean G_GametypeUsesLives(void)
{
- // Coop, Competitive
- if ((gametype == GT_COOP || gametype == GT_COMPETITION)
+ // Coop, Competitive
+ if ((gametyperules & GTR_LIVES)
&& !(modeattacking || metalrecording) // No lives in Time Attack
&& !G_IsSpecialStage(gamemap)
&& !(maptol & TOL_NIGHTS)) // No lives in NiGHTS
@@ -3117,7 +3448,7 @@ boolean G_GametypeUsesLives(void)
//
boolean G_GametypeHasTeams(void)
{
- return (gametype == GT_TEAMMATCH || gametype == GT_CTF);
+ return (gametyperules & GTR_TEAMS);
}
//
@@ -3128,7 +3459,7 @@ boolean G_GametypeHasTeams(void)
//
boolean G_GametypeHasSpectators(void)
{
- return (gametype != GT_COOP && gametype != GT_COMPETITION && gametype != GT_RACE);
+ return (gametyperules & GTR_SPECTATORS);
}
//
@@ -3139,7 +3470,7 @@ boolean G_GametypeHasSpectators(void)
//
boolean G_RingSlingerGametype(void)
{
- return ((gametype != GT_COOP && gametype != GT_COMPETITION && gametype != GT_RACE) || (cv_ringslinger.value));
+ return ((gametyperules & GTR_RINGSLINGER) || (cv_ringslinger.value));
}
//
@@ -3149,7 +3480,7 @@ boolean G_RingSlingerGametype(void)
//
boolean G_PlatformGametype(void)
{
- return (gametype == GT_COOP || gametype == GT_RACE || gametype == GT_COMPETITION);
+ return (!(gametyperules & GTR_RINGSLINGER));
}
//
@@ -3159,7 +3490,7 @@ boolean G_PlatformGametype(void)
//
boolean G_TagGametype(void)
{
- return (gametype == GT_TAG || gametype == GT_HIDEANDSEEK);
+ return (gametyperules & GTR_TAG);
}
/** Get the typeoflevel flag needed to indicate support of a gametype.
@@ -3170,18 +3501,9 @@ boolean G_TagGametype(void)
*/
INT16 G_TOLFlag(INT32 pgametype)
{
- if (!multiplayer) return TOL_SP;
- if (pgametype == GT_COOP) return TOL_COOP;
- if (pgametype == GT_COMPETITION) return TOL_COMPETITION;
- if (pgametype == GT_RACE) return TOL_RACE;
- if (pgametype == GT_MATCH) return TOL_MATCH;
- if (pgametype == GT_TEAMMATCH) return TOL_MATCH;
- if (pgametype == GT_TAG) return TOL_TAG;
- if (pgametype == GT_HIDEANDSEEK) return TOL_TAG;
- if (pgametype == GT_CTF) return TOL_CTF;
-
- CONS_Alert(CONS_ERROR, M_GetText("Unknown gametype! %d\n"), pgametype);
- return INT16_MAX;
+ if (!multiplayer)
+ return TOL_SP;
+ return gametypetol[pgametype];
}
/** Select a random map with the given typeoflevel flags.
@@ -3192,7 +3514,7 @@ INT16 G_TOLFlag(INT32 pgametype)
* has those flags.
* \author Graue <graue@oceanbase.org>
*/
-static INT16 RandMap(INT16 tolflags, INT16 pprevmap)
+static INT16 RandMap(UINT32 tolflags, INT16 pprevmap)
{
INT16 *okmaps = Z_Malloc(NUMMAPS * sizeof(INT16), PU_STATIC, NULL);
INT32 numokmaps = 0;
@@ -3350,10 +3672,10 @@ static void G_DoCompleted(void)
I_Error("Followed map %d to invalid map %d\n", prevmap + 1, nextmap + 1);
// wrap around in race
- if (nextmap >= 1100-1 && nextmap <= 1102-1 && (gametype == GT_RACE || gametype == GT_COMPETITION))
+ if (nextmap >= 1100-1 && nextmap <= 1102-1 && !(gametyperules & GTR_CAMPAIGN))
nextmap = (INT16)(spstage_start-1);
- if ((gottoken = (gametype == GT_COOP && token)))
+ if ((gottoken = ((gametyperules & GTR_SPECIALSTAGES) && token)))
{
token--;
@@ -3373,7 +3695,7 @@ static void G_DoCompleted(void)
automapactive = false;
- if (gametype != GT_COOP)
+ if (!(gametyperules & GTR_CAMPAIGN))
{
if (cv_advancemap.value == 0) // Stay on same map.
nextmap = prevmap;
diff --git a/src/g_game.h b/src/g_game.h
index e7f4a4677c2a95c19edde0c76a15471a495e6081..238dd196420d860517630ca857fde566b60a8b31 100644
--- a/src/g_game.h
+++ b/src/g_game.h
@@ -72,6 +72,7 @@ extern consvar_t cv_useranalog, cv_useranalog2;
extern consvar_t cv_analog, cv_analog2;
extern consvar_t cv_directionchar, cv_directionchar2;
extern consvar_t cv_autobrake, cv_autobrake2;
+extern consvar_t cv_deadzone, cv_deadzone2;
extern consvar_t cv_sideaxis,cv_turnaxis,cv_moveaxis,cv_lookaxis,cv_jumpaxis,cv_spinaxis,cv_fireaxis,cv_firenaxis;
extern consvar_t cv_sideaxis2,cv_turnaxis2,cv_moveaxis2,cv_lookaxis2,cv_jumpaxis2,cv_spinaxis2,cv_fireaxis2,cv_firenaxis2;
extern consvar_t cv_ghost_bestscore, cv_ghost_besttime, cv_ghost_bestrings, cv_ghost_last, cv_ghost_guest;
@@ -142,6 +143,7 @@ void G_DeferedInitNew(boolean pultmode, const char *mapname, INT32 pickedchar,
void G_DoLoadLevel(boolean resetplayer);
void G_StartTitleCard(void);
void G_PreLevelTitleCard(void);
+boolean G_IsTitleCardAvailable(void);
void G_DeferedPlayDemo(const char *demo);
// Can be called by the startup code or M_Responder, calls P_SetupLevel.
@@ -201,6 +203,18 @@ ATTRNORETURN void FUNCNORETURN G_StopMetalRecording(boolean kill);
void G_StopDemo(void);
boolean G_CheckDemoStatus(void);
+extern UINT32 gametypedefaultrules[NUMGAMETYPES];
+extern UINT32 gametypetol[NUMGAMETYPES];
+extern INT16 gametyperankings[NUMGAMETYPES];
+
+void G_SetGametype(INT16 gametype);
+INT16 G_AddGametype(UINT32 rules);
+void G_AddGametypeConstant(INT16 gtype, const char *newgtconst);
+void G_UpdateGametypeSelections(void);
+void G_AddTOL(UINT32 newtol, const char *tolname);
+void G_AddGametypeTOL(INT16 gtype, UINT32 newtol);
+void G_SetGametypeDescription(INT16 gtype, char *descriptiontext, UINT8 leftcolor, UINT8 rightcolor);
+
INT32 G_GetGametypeByName(const char *gametypestr);
boolean G_IsSpecialStage(INT32 mapnum);
boolean G_GametypeUsesLives(void);
diff --git a/src/hardware/hw_cache.c b/src/hardware/hw_cache.c
index 44fc7600e803bc853b7f0c4115c87733b971cb87..ea16fb6d740626aa1f97a67be7d76041fa011d95 100644
--- a/src/hardware/hw_cache.c
+++ b/src/hardware/hw_cache.c
@@ -33,10 +33,6 @@
#include "../r_patch.h"
#include "../p_setup.h"
-//Hurdler: 25/04/2000: used for new colormap code in hardware mode
-//static UINT8 *gr_colormap = NULL; // by default it must be NULL ! (because colormap tables are not initialized)
-boolean firetranslucent = false;
-
// Values set after a call to HWR_ResizeBlock()
static INT32 blocksize, blockwidth, blockheight;
@@ -122,18 +118,16 @@ static void HWR_DrawColumnInCache(const column_t *patchcol, UINT8 *block, GLMipm
texel = source[yfrac>>FRACBITS];
- if (firetranslucent && (transtables[(texel<<8)+0x40000]!=texel))
- alpha = 0x80;
- else
- alpha = 0xff;
-
- //Hurdler: not perfect, but better than holes
- if (texel == HWR_PATCHES_CHROMAKEY_COLORINDEX && (mipmap->flags & TF_CHROMAKEYED))
- texel = HWR_CHROMAKEY_EQUIVALENTCOLORINDEX;
//Hurdler: 25/04/2000: now support colormap in hardware mode
- else if (mipmap->colormap)
+ if (mipmap->colormap)
texel = mipmap->colormap[texel];
+ // transparent pixel
+ if (texel == HWR_PATCHES_CHROMAKEY_COLORINDEX)
+ alpha = 0x00;
+ else
+ alpha = 0xff;
+
// hope compiler will get this switch out of the loops (dreams...)
// gcc do it ! but vcc not ! (why don't use cygwin gcc for win32 ?)
// Alam: SRB2 uses Mingw, HUGS
@@ -236,18 +230,16 @@ static void HWR_DrawFlippedColumnInCache(const column_t *patchcol, UINT8 *block,
texel = source[yfrac>>FRACBITS];
- if (firetranslucent && (transtables[(texel<<8)+0x40000]!=texel))
- alpha = 0x80;
- else
- alpha = 0xff;
-
- //Hurdler: not perfect, but better than holes
- if (texel == HWR_PATCHES_CHROMAKEY_COLORINDEX && (mipmap->flags & TF_CHROMAKEYED))
- texel = HWR_CHROMAKEY_EQUIVALENTCOLORINDEX;
//Hurdler: 25/04/2000: now support colormap in hardware mode
- else if (mipmap->colormap)
+ if (mipmap->colormap)
texel = mipmap->colormap[texel];
+ // transparent pixel
+ if (texel == HWR_PATCHES_CHROMAKEY_COLORINDEX)
+ alpha = 0x00;
+ else
+ alpha = 0xff;
+
// hope compiler will get this switch out of the loops (dreams...)
// gcc do it ! but vcc not ! (why don't use cygwin gcc for win32 ?)
// Alam: SRB2 uses Mingw, HUGS
@@ -576,7 +568,7 @@ static UINT8 *MakeBlock(GLMipmap_t *grMipmap)
{
UINT8 *block;
INT32 bpp, i;
- UINT16 bu16 = ((0x00 <<8) | HWR_CHROMAKEY_EQUIVALENTCOLORINDEX);
+ UINT16 bu16 = ((0x00 <<8) | HWR_PATCHES_CHROMAKEY_COLORINDEX);
bpp = format2bpp[grMipmap->grInfo.format];
block = Z_Malloc(blocksize*bpp, PU_HWRCACHE, &(grMipmap->grInfo.data));
@@ -606,6 +598,7 @@ static void HWR_GenerateTexture(INT32 texnum, GLTexture_t *grtex)
texture_t *texture;
texpatch_t *patch;
patch_t *realpatch;
+ UINT8 *pdata;
INT32 i;
boolean skyspecial = false; //poor hack for Legacy large skies..
@@ -638,7 +631,7 @@ static void HWR_GenerateTexture(INT32 texnum, GLTexture_t *grtex)
INT32 j;
RGBA_t col;
- col = V_GetColor(HWR_CHROMAKEY_EQUIVALENTCOLORINDEX);
+ col = V_GetColor(HWR_PATCHES_CHROMAKEY_COLORINDEX);
for (j = 0; j < blockheight; j++)
{
for (i = 0; i < blockwidth; i++)
@@ -654,19 +647,30 @@ static void HWR_GenerateTexture(INT32 texnum, GLTexture_t *grtex)
// Composite the columns together.
for (i = 0, patch = texture->patches; i < texture->patchcount; i++, patch++)
{
-#ifndef NO_PNG_LUMPS
+ boolean dealloc = true;
size_t lumplength = W_LumpLengthPwad(patch->wad, patch->lump);
-#endif
- realpatch = W_CacheLumpNumPwad(patch->wad, patch->lump, PU_CACHE);
+ pdata = W_CacheLumpNumPwad(patch->wad, patch->lump, PU_CACHE);
+ realpatch = (patch_t *)pdata;
+
#ifndef NO_PNG_LUMPS
if (R_IsLumpPNG((UINT8 *)realpatch, lumplength))
realpatch = R_PNGToPatch((UINT8 *)realpatch, lumplength, NULL, false);
+ else
#endif
- HWR_DrawTexturePatchInCache(&grtex->mipmap,
- blockwidth, blockheight,
- texture, patch,
- realpatch);
- Z_Unlock(realpatch);
+#ifdef WALLFLATS
+ if (texture->type == TEXTURETYPE_FLAT)
+ realpatch = R_FlatToPatch(pdata, texture->width, texture->height, 0, 0, NULL, false);
+ else
+#endif
+ {
+ (void)lumplength;
+ dealloc = false;
+ }
+
+ HWR_DrawTexturePatchInCache(&grtex->mipmap, blockwidth, blockheight, texture, patch, realpatch);
+
+ if (dealloc)
+ Z_Unlock(realpatch);
}
//Hurdler: not efficient at all but I don't remember exactly how HWR_DrawPatchInCache works :(
if (format2bpp[grtex->mipmap.grInfo.format]==4)
diff --git a/src/hardware/hw_defs.h b/src/hardware/hw_defs.h
index aa483fcefd128a686fbb126abb7c1b1d8dc42255..95882b03eb93bb57fc429a12c648fdd8f5167c7b 100644
--- a/src/hardware/hw_defs.h
+++ b/src/hardware/hw_defs.h
@@ -42,7 +42,7 @@ typedef unsigned char FBOOLEAN;
// byte value for paletted graphics, which represent the transparent color
#define HWR_PATCHES_CHROMAKEY_COLORINDEX 255
-#define HWR_CHROMAKEY_EQUIVALENTCOLORINDEX 130
+//#define HWR_CHROMAKEY_EQUIVALENTCOLORINDEX 130
// the chroma key color shows on border sprites, set it to black
#define HWR_PATCHES_CHROMAKEY_COLORVALUE (0x00000000) //RGBA format as in grSstWinOpen()
diff --git a/src/hardware/hw_glob.h b/src/hardware/hw_glob.h
index d25f6cefd931f51f88c166fa8d2be4a60059f830..cf98e731739ce59016dd6347f531a1079c59f813 100644
--- a/src/hardware/hw_glob.h
+++ b/src/hardware/hw_glob.h
@@ -128,6 +128,5 @@ extern consvar_t cv_grrounddown; // on/off
extern INT32 patchformat;
extern INT32 textureformat;
-extern boolean firetranslucent;
#endif //_HW_GLOB_
diff --git a/src/hardware/hw_md2.c b/src/hardware/hw_md2.c
index c18422145b07bcc80a91498c52ec9e923d574192..3800b6ad98ff9b89af7ee38a7c328a87abcbf580 100644
--- a/src/hardware/hw_md2.c
+++ b/src/hardware/hw_md2.c
@@ -963,7 +963,7 @@ static void HWR_GetBlendedTexture(GLPatch_t *gpatch, GLPatch_t *blendgpatch, INT
for (grmip = gpatch->mipmap; grmip->nextcolormap; )
{
grmip = grmip->nextcolormap;
- if (grmip->colormap == colormap || grmip->tcindex == skinnum)
+ if (grmip->colormap == colormap || (skinnum < TC_DEFAULT && grmip->tcindex == skinnum))
{
if (grmip->downloaded && grmip->grInfo.data)
{
diff --git a/src/hu_stuff.c b/src/hu_stuff.c
index 91a167a60517bfa6043a70328a291eec08a605d9..d9801793b85e0885bc9c52889099c7e70ff36be5 100644
--- a/src/hu_stuff.c
+++ b/src/hu_stuff.c
@@ -2066,7 +2066,7 @@ static void HU_drawGametype(void)
{
const char *strvalue = NULL;
- if (gametype < 0 || gametype >= NUMGAMETYPES)
+ if (gametype < 0 || gametype >= gametypecount)
return; // not a valid gametype???
strvalue = Gametype_Names[gametype];
@@ -2371,7 +2371,7 @@ void HU_DrawTabRankings(INT32 x, INT32 y, playersort_t *tab, INT32 scorelines, I
for (i = 0; i < scorelines; i++)
{
- if (players[tab[i].num].spectator && gametype != GT_COOP)
+ if (players[tab[i].num].spectator && gametyperankings[gametype] != GT_COOP)
continue; //ignore them.
greycheck = greycheckdef;
@@ -2434,7 +2434,7 @@ void HU_DrawTabRankings(INT32 x, INT32 y, playersort_t *tab, INT32 scorelines, I
}
}
- if (G_GametypeUsesLives() && !(gametype == GT_COOP && (cv_cooplives.value == 0 || cv_cooplives.value == 3)) && (players[tab[i].num].lives != INFLIVES)) //show lives
+ if (G_GametypeUsesLives() && !(gametyperankings[gametype] == GT_COOP && (cv_cooplives.value == 0 || cv_cooplives.value == 3)) && (players[tab[i].num].lives != INFLIVES)) //show lives
V_DrawRightAlignedString(x, y+4, V_ALLOWLOWERCASE|(greycheck ? V_60TRANS : 0), va("%dx", players[tab[i].num].lives));
else if (G_TagGametype() && players[tab[i].num].pflags & PF_TAGIT)
{
@@ -2447,7 +2447,7 @@ void HU_DrawTabRankings(INT32 x, INT32 y, playersort_t *tab, INT32 scorelines, I
if (players[tab[i].num].exiting || (players[tab[i].num].pflags & PF_FINISHED))
V_DrawSmallScaledPatch(x - SHORT(exiticon->width)/2 - 1, y-3, 0, exiticon);
- if (gametype == GT_RACE)
+ if (gametyperankings[gametype] == GT_RACE)
{
if (circuitmap)
{
@@ -2541,7 +2541,7 @@ static void HU_Draw32TeamTabRankings(playersort_t *tab, INT32 whiteplayer)
| (greycheck ? 0 : V_TRANSLUCENT)
| V_ALLOWLOWERCASE, name);
- if (gametype == GT_CTF)
+ if (gametyperules & GTR_TEAMFLAGS)
{
if (players[tab[i].num].gotflag & GF_REDFLAG) // Red
V_DrawFixedPatch((x-10)*FRACUNIT, (y)*FRACUNIT, FRACUNIT/4, 0, rflagico, 0);
@@ -2669,7 +2669,7 @@ void HU_DrawTeamTabRankings(playersort_t *tab, INT32 whiteplayer)
| (greycheck ? V_TRANSLUCENT : 0)
| V_ALLOWLOWERCASE, name);
- if (gametype == GT_CTF)
+ if (gametyperules & GTR_TEAMFLAGS)
{
if (players[tab[i].num].gotflag & GF_REDFLAG) // Red
V_DrawSmallScaledPatch(x-28, y-4, 0, rflagico);
@@ -2726,7 +2726,7 @@ void HU_DrawDualTabRankings(INT32 x, INT32 y, playersort_t *tab, INT32 scoreline
for (i = 0; i < scorelines; i++)
{
- if (players[tab[i].num].spectator && gametype != GT_COOP)
+ if (players[tab[i].num].spectator && gametyperankings[gametype] != GT_COOP)
continue; //ignore them.
greycheck = greycheckdef;
@@ -2743,7 +2743,7 @@ void HU_DrawDualTabRankings(INT32 x, INT32 y, playersort_t *tab, INT32 scoreline
| (greycheck ? V_TRANSLUCENT : 0)
| V_ALLOWLOWERCASE, name);
- if (G_GametypeUsesLives() && !(gametype == GT_COOP && (cv_cooplives.value == 0 || cv_cooplives.value == 3)) && (players[tab[i].num].lives != INFLIVES)) //show lives
+ if (G_GametypeUsesLives() && !(gametyperankings[gametype] == GT_COOP && (cv_cooplives.value == 0 || cv_cooplives.value == 3)) && (players[tab[i].num].lives != INFLIVES)) //show lives
V_DrawRightAlignedString(x, y+4, V_ALLOWLOWERCASE, va("%dx", players[tab[i].num].lives));
else if (G_TagGametype() && players[tab[i].num].pflags & PF_TAGIT)
V_DrawSmallScaledPatch(x-28, y-4, 0, tagico);
@@ -2792,7 +2792,7 @@ void HU_DrawDualTabRankings(INT32 x, INT32 y, playersort_t *tab, INT32 scoreline
}
// All data drawn with thin string for space.
- if (gametype == GT_RACE)
+ if (gametyperankings[gametype] == GT_RACE)
{
if (circuitmap)
{
@@ -2832,7 +2832,7 @@ static void HU_Draw32TabRankings(INT32 x, INT32 y, playersort_t *tab, INT32 scor
for (i = 0; i < scorelines; i++)
{
- if (players[tab[i].num].spectator && gametype != GT_COOP)
+ if (players[tab[i].num].spectator && gametyperankings[gametype] != GT_COOP)
continue; //ignore them.
greycheck = greycheckdef;
@@ -2902,7 +2902,7 @@ static void HU_Draw32TabRankings(INT32 x, INT32 y, playersort_t *tab, INT32 scor
}
// All data drawn with thin string for space.
- if (gametype == GT_RACE)
+ if (gametyperankings[gametype] == GT_RACE)
{
if (circuitmap)
{
@@ -3026,21 +3026,21 @@ static void HU_DrawRankings(void)
// draw the current gametype in the lower right
HU_drawGametype();
- if (gametype != GT_RACE && gametype != GT_COMPETITION && gametype != GT_COOP)
+ if (gametyperules & (GTR_TIMELIMIT|GTR_POINTLIMIT))
{
- if (cv_timelimit.value && timelimitintics > 0)
+ if ((gametyperules & GTR_TIMELIMIT) && cv_timelimit.value && timelimitintics > 0)
{
V_DrawCenteredString(64, 8, 0, "TIME");
V_DrawCenteredString(64, 16, 0, va("%i:%02i", G_TicsToMinutes(stplyr->realtime, true), G_TicsToSeconds(stplyr->realtime)));
}
- if (cv_pointlimit.value > 0)
+ if ((gametyperules & GTR_POINTLIMIT) && cv_pointlimit.value > 0)
{
V_DrawCenteredString(256, 8, 0, "POINT LIMIT");
V_DrawCenteredString(256, 16, 0, va("%d", cv_pointlimit.value));
}
}
- else if (gametype == GT_COOP)
+ else if (gametyperankings[gametype] == GT_COOP)
{
INT32 totalscore = 0;
for (i = 0; i < MAXPLAYERS; i++)
@@ -3074,7 +3074,7 @@ static void HU_DrawRankings(void)
tab[i].num = -1;
tab[i].name = 0;
- if (gametype == GT_RACE && !circuitmap)
+ if (gametyperankings[gametype] == GT_RACE && !circuitmap)
tab[i].count = INT32_MAX;
}
@@ -3083,7 +3083,7 @@ static void HU_DrawRankings(void)
if (!playeringame[j])
continue;
- if (gametype != GT_COOP && players[j].spectator)
+ if (!G_PlatformGametype() && players[j].spectator)
continue;
for (i = 0; i < MAXPLAYERS; i++)
@@ -3091,10 +3091,10 @@ static void HU_DrawRankings(void)
if (!playeringame[i])
continue;
- if (gametype != GT_COOP && players[i].spectator)
+ if (!G_PlatformGametype() && players[i].spectator)
continue;
- if (gametype == GT_RACE)
+ if (gametyperankings[gametype] == GT_RACE)
{
if (circuitmap)
{
@@ -3117,7 +3117,7 @@ static void HU_DrawRankings(void)
}
}
}
- else if (gametype == GT_COMPETITION)
+ else if (gametyperankings[gametype] == GT_COMPETITION)
{
// todo put something more fitting for the gametype here, such as current
// number of categories led
diff --git a/src/i_system.h b/src/i_system.h
index 831acda3225692a43804c76b4f54db92967813b9..2532ba0ee3827f5d089bfced6ea84852e242f814 100644
--- a/src/i_system.h
+++ b/src/i_system.h
@@ -184,10 +184,6 @@ void I_StartupMouse(void);
*/
void I_StartupMouse2(void);
-/** \brief keyboard startup, shutdown, handler
-*/
-void I_StartupKeyboard(void);
-
/** \brief setup timer irq and user timer routine.
*/
void I_StartupTimer(void);
diff --git a/src/i_tcp.c b/src/i_tcp.c
index 2dd9f0591f73c1f947449f6594bb72f615546160..502eb673243d49ff1cd6bc029b19dc27777493d7 100644
--- a/src/i_tcp.c
+++ b/src/i_tcp.c
@@ -209,7 +209,8 @@ static size_t numbans = 0;
static boolean SOCK_bannednode[MAXNETNODES+1]; /// \note do we really need the +1?
static boolean init_tcp_driver = false;
-static char port_name[8] = DEFAULTPORT;
+static const char *serverport_name = DEFAULTPORT;
+static const char *clientport_name;/* any port */
#ifndef NONET
@@ -887,6 +888,7 @@ static boolean UDP_Socket(void)
#ifdef HAVE_IPV6
const INT32 b_ipv6 = M_CheckParm("-ipv6");
#endif
+ const char *serv;
for (s = 0; s < mysocketses; s++)
@@ -902,11 +904,16 @@ static boolean UDP_Socket(void)
hints.ai_socktype = SOCK_DGRAM;
hints.ai_protocol = IPPROTO_UDP;
+ if (serverrunning)
+ serv = serverport_name;
+ else
+ serv = clientport_name;
+
if (M_CheckParm("-bindaddr"))
{
while (M_IsNextParm())
{
- gaie = I_getaddrinfo(M_GetNextParm(), port_name, &hints, &ai);
+ gaie = I_getaddrinfo(M_GetNextParm(), serv, &hints, &ai);
if (gaie == 0)
{
runp = ai;
@@ -927,7 +934,7 @@ static boolean UDP_Socket(void)
}
else
{
- gaie = I_getaddrinfo("0.0.0.0", port_name, &hints, &ai);
+ gaie = I_getaddrinfo("0.0.0.0", serv, &hints, &ai);
if (gaie == 0)
{
runp = ai;
@@ -942,8 +949,8 @@ static boolean UDP_Socket(void)
#ifdef HAVE_MINIUPNPC
if (UPNP_support)
{
- I_UPnP_rem(port_name, "UDP");
- I_UPnP_add(NULL, port_name, "UDP");
+ I_UPnP_rem(serverport_name, "UDP");
+ I_UPnP_add(NULL, serverport_name, "UDP");
}
#endif
}
@@ -960,7 +967,7 @@ static boolean UDP_Socket(void)
{
while (M_IsNextParm())
{
- gaie = I_getaddrinfo(M_GetNextParm(), port_name, &hints, &ai);
+ gaie = I_getaddrinfo(M_GetNextParm(), serv, &hints, &ai);
if (gaie == 0)
{
runp = ai;
@@ -981,7 +988,7 @@ static boolean UDP_Socket(void)
}
else
{
- gaie = I_getaddrinfo("::", port_name, &hints, &ai);
+ gaie = I_getaddrinfo("::", serv, &hints, &ai);
if (gaie == 0)
{
runp = ai;
@@ -1421,15 +1428,19 @@ boolean I_InitTcpNetwork(void)
if (!I_InitTcpDriver())
return false;
- if (M_CheckParm("-port"))
+ if (M_CheckParm("-port") || M_CheckParm("-serverport"))
// Combined -udpport and -clientport into -port
// As it was really redundant having two seperate parms that does the same thing
+ /* Sorry Steel, I'm adding these back. But -udpport is a stupid name. */
{
- if (M_IsNextParm())
- strcpy(port_name, M_GetNextParm());
- else
- strcpy(port_name, "0");
+ /*
+ If it's NULL, that's okay! Because then
+ we'll get a random port from getaddrinfo.
+ */
+ serverport_name = M_GetNextParm();
}
+ if (M_CheckParm("-clientport"))
+ clientport_name = M_GetNextParm();
// parse network game options,
if (M_CheckParm("-server") || dedicated)
diff --git a/src/lua_baselib.c b/src/lua_baselib.c
index 0df2ac45cf3d183be86f8731fe175649cc9c46e9..695e9367e57d2fb972e48f833bae160d94f71744 100644
--- a/src/lua_baselib.c
+++ b/src/lua_baselib.c
@@ -12,6 +12,7 @@
#include "doomdef.h"
#ifdef HAVE_BLUA
+#include "fastcmp.h"
#include "p_local.h"
#include "p_setup.h" // So we can have P_SetupLevelSky
#ifdef ESLOPE
@@ -23,6 +24,8 @@
#include "m_random.h"
#include "s_sound.h"
#include "g_game.h"
+#include "m_menu.h"
+#include "y_inter.h"
#include "hu_stuff.h" // HU_AddChatText
#include "console.h"
#include "d_netcmd.h" // IsPlayerAdmin
@@ -2630,6 +2633,145 @@ static int lib_sStartMusicCaption(lua_State *L)
// G_GAME
////////////
+// Copypasted from lib_cvRegisterVar :]
+static int lib_gAddGametype(lua_State *L)
+{
+ const char *k;
+ lua_Integer i;
+
+ const char *gtname = NULL;
+ const char *gtconst = NULL;
+ const char *gtdescription = NULL;
+ INT16 newgtidx = 0;
+ UINT32 newgtrules = 0;
+ UINT32 newgttol = 0;
+ INT32 newgtpointlimit = 0;
+ INT32 newgttimelimit = 0;
+ UINT8 newgtleftcolor = 0;
+ UINT8 newgtrightcolor = 0;
+ INT16 newgtrankingstype = -1;
+ int newgtinttype = 0;
+
+ luaL_checktype(L, 1, LUA_TTABLE);
+ lua_settop(L, 1); // Clear out all other possible arguments, leaving only the first one.
+
+ if (!lua_lumploading)
+ return luaL_error(L, "This function cannot be called from within a hook or coroutine!");
+
+ // Ran out of gametype slots
+ if (gametypecount == NUMGAMETYPEFREESLOTS)
+ return luaL_error(L, "Ran out of free gametype slots!");
+
+#define FIELDERROR(f, e) luaL_error(L, "bad value for " LUA_QL(f) " in table passed to " LUA_QL("G_AddGametype") " (%s)", e);
+#define TYPEERROR(f, t) FIELDERROR(f, va("%s expected, got %s", lua_typename(L, t), luaL_typename(L, -1)))
+
+ lua_pushnil(L);
+ while (lua_next(L, 1)) {
+ // stack: gametype table, key/index, value
+ // 1 2 3
+ i = 0;
+ k = NULL;
+ if (lua_isnumber(L, 2))
+ i = lua_tointeger(L, 2);
+ else if (lua_isstring(L, 2))
+ k = lua_tostring(L, 2);
+
+ // Sorry, no gametype rules as key names.
+ if (i == 1 || (k && fasticmp(k, "name"))) {
+ if (!lua_isstring(L, 3))
+ TYPEERROR("name", LUA_TSTRING)
+ gtname = Z_StrDup(lua_tostring(L, 3));
+ } else if (i == 2 || (k && fasticmp(k, "identifier"))) {
+ if (!lua_isstring(L, 3))
+ TYPEERROR("identifier", LUA_TSTRING)
+ gtconst = Z_StrDup(lua_tostring(L, 3));
+ } else if (i == 3 || (k && fasticmp(k, "rules"))) {
+ if (!lua_isnumber(L, 3))
+ TYPEERROR("rules", LUA_TNUMBER)
+ newgtrules = (UINT32)lua_tointeger(L, 3);
+ } else if (i == 4 || (k && fasticmp(k, "typeoflevel"))) {
+ if (!lua_isnumber(L, 3))
+ TYPEERROR("typeoflevel", LUA_TNUMBER)
+ newgttol = (UINT32)lua_tointeger(L, 3);
+ } else if (i == 5 || (k && fasticmp(k, "rankingtype"))) {
+ if (!lua_isnumber(L, 3))
+ TYPEERROR("rankingtype", LUA_TNUMBER)
+ newgtrankingstype = (INT16)lua_tointeger(L, 3);
+ } else if (i == 6 || (k && fasticmp(k, "intermissiontype"))) {
+ if (!lua_isnumber(L, 3))
+ TYPEERROR("intermissiontype", LUA_TNUMBER)
+ newgtinttype = (int)lua_tointeger(L, 3);
+ } else if (i == 7 || (k && fasticmp(k, "defaultpointlimit"))) {
+ if (!lua_isnumber(L, 3))
+ TYPEERROR("defaultpointlimit", LUA_TNUMBER)
+ newgtpointlimit = (INT32)lua_tointeger(L, 3);
+ } else if (i == 8 || (k && fasticmp(k, "defaulttimelimit"))) {
+ if (!lua_isnumber(L, 3))
+ TYPEERROR("defaulttimelimit", LUA_TNUMBER)
+ newgttimelimit = (INT32)lua_tointeger(L, 3);
+ } else if (i == 9 || (k && fasticmp(k, "description"))) {
+ if (!lua_isstring(L, 3))
+ TYPEERROR("description", LUA_TSTRING)
+ gtdescription = Z_StrDup(lua_tostring(L, 3));
+ } else if (i == 10 || (k && fasticmp(k, "headerleftcolor"))) {
+ if (!lua_isnumber(L, 3))
+ TYPEERROR("headerleftcolor", LUA_TNUMBER)
+ newgtleftcolor = (UINT8)lua_tointeger(L, 3);
+ } else if (i == 11 || (k && fasticmp(k, "headerrightcolor"))) {
+ if (!lua_isnumber(L, 3))
+ TYPEERROR("headerrightcolor", LUA_TNUMBER)
+ newgtrightcolor = (UINT8)lua_tointeger(L, 3);
+ // Key name specified
+ } else if ((!i) && (k && fasticmp(k, "headercolor"))) {
+ if (!lua_isnumber(L, 3))
+ TYPEERROR("headercolor", LUA_TNUMBER)
+ newgtleftcolor = newgtrightcolor = (UINT8)lua_tointeger(L, 3);
+ }
+ lua_pop(L, 1);
+ }
+
+#undef FIELDERROR
+#undef TYPEERROR
+
+ // pop gametype table
+ lua_pop(L, 1);
+
+ // Set defaults
+ if (gtname == NULL)
+ gtname = Z_StrDup("Unnamed gametype");
+ if (gtdescription == NULL)
+ gtdescription = Z_StrDup("???");
+
+ // Add the new gametype
+ newgtidx = G_AddGametype(newgtrules);
+ G_AddGametypeTOL(newgtidx, newgttol);
+ G_SetGametypeDescription(newgtidx, NULL, newgtleftcolor, newgtrightcolor);
+ strncpy(gametypedesc[newgtidx].notes, gtdescription, 441);
+
+ // Not covered by G_AddGametype alone.
+ if (newgtrankingstype == -1)
+ newgtrankingstype = newgtidx;
+ gametyperankings[newgtidx] = newgtrankingstype;
+ intermissiontypes[newgtidx] = newgtinttype;
+ pointlimits[newgtidx] = newgtpointlimit;
+ timelimits[newgtidx] = newgttimelimit;
+
+ // Write the new gametype name.
+ Gametype_Names[newgtidx] = gtname;
+
+ // Write the constant name.
+ if (gtconst == NULL)
+ gtconst = gtname;
+ G_AddGametypeConstant(newgtidx, gtconst);
+
+ // Update gametype_cons_t accordingly.
+ G_UpdateGametypeSelections();
+
+ // done
+ CONS_Printf("Added gametype %s\n", Gametype_Names[newgtidx]);
+ return 0;
+}
+
static int lib_gBuildMapName(lua_State *L)
{
INT32 map = luaL_optinteger(L, 1, gamemap);
@@ -2662,23 +2804,17 @@ static int lib_gSetCustomExitVars(lua_State *L)
// Supported:
// G_SetCustomExitVars(); [reset to defaults]
// G_SetCustomExitVars(int) [nextmap override only]
- // G_SetCustomExitVars(bool) [skipstats only]
- // G_SetCustomExitVars(int, bool) [both of the above]
+ // G_SetCustomExitVars(nil, int) [skipstats only]
+ // G_SetCustomExitVars(int, int) [both of the above]
+
+ nextmapoverride = 0;
+ skipstats = 0;
+
if (n >= 1)
{
- if (lua_isnumber(L, 1) || n >= 2)
- {
- nextmapoverride = (INT16)luaL_checknumber(L, 1);
- lua_remove(L, 1); // remove nextmapoverride; skipstats now 1 if available
- }
- skipstats = luaL_optinteger(L, 2, 0);
- }
- else
- {
- nextmapoverride = 0;
- skipstats = 0;
+ nextmapoverride = (INT16)luaL_optinteger(L, 1, 0);
+ skipstats = (INT16)luaL_optinteger(L, 2, 0);
}
- // ---
return 0;
}
@@ -2995,6 +3131,7 @@ static luaL_Reg lib[] = {
{"S_StartMusicCaption", lib_sStartMusicCaption},
// g_game
+ {"G_AddGametype", lib_gAddGametype},
{"G_BuildMapName",lib_gBuildMapName},
{"G_DoReborn",lib_gDoReborn},
{"G_SetCustomExitVars",lib_gSetCustomExitVars},
diff --git a/src/lua_hook.h b/src/lua_hook.h
index 6617bca93a34c2db6742f40814d74eb079279f32..68efbce93d89a0e81cd0d7cd0ede54e2a5e09b05 100644
--- a/src/lua_hook.h
+++ b/src/lua_hook.h
@@ -51,6 +51,8 @@ enum hook {
hook_PlayerCanDamage,
hook_PlayerQuit,
hook_IntermissionThinker,
+ hook_TeamSwitch,
+ hook_ViewpointSwitch,
hook_MAX // last hook
};
@@ -93,5 +95,7 @@ boolean LUAh_FollowMobj(player_t *player, mobj_t *mobj); // Hook for P_PlayerAft
UINT8 LUAh_PlayerCanDamage(player_t *player, mobj_t *mobj); // Hook for P_PlayerCanDamage
void LUAh_PlayerQuit(player_t *plr, int reason); // Hook for player quitting
void LUAh_IntermissionThinker(void); // Hook for Y_Ticker
+boolean LUAh_TeamSwitch(player_t *player, int newteam, boolean fromspectators, boolean tryingautobalance, boolean tryingscramble); // Hook for team switching in... uh....
+UINT8 LUAh_ViewpointSwitch(player_t *player, player_t *newdisplayplayer, boolean forced); // Hook for spy mode
#endif
diff --git a/src/lua_hooklib.c b/src/lua_hooklib.c
index ef87d0b6f7a9cc592609be76cbeb59f770710ee1..91b4c699249a77a5103c1b61911aa1de51a223db 100644
--- a/src/lua_hooklib.c
+++ b/src/lua_hooklib.c
@@ -62,6 +62,8 @@ const char *const hookNames[hook_MAX+1] = {
"PlayerCanDamage",
"PlayerQuit",
"IntermissionThinker",
+ "TeamSwitch",
+ "ViewpointSwitch",
NULL
};
@@ -203,6 +205,8 @@ static int lib_addHook(lua_State *L)
case hook_PlayerSpawn:
case hook_FollowMobj:
case hook_PlayerCanDamage:
+ case hook_TeamSwitch:
+ case hook_ViewpointSwitch:
case hook_ShieldSpawn:
case hook_ShieldSpecial:
lastp = &playerhooks;
@@ -657,14 +661,16 @@ UINT8 LUAh_ShouldDamage(mobj_t *target, mobj_t *inflictor, mobj_t *source, INT32
LUA_PushUserdata(gL, inflictor, META_MOBJ);
LUA_PushUserdata(gL, source, META_MOBJ);
lua_pushinteger(gL, damage);
+ lua_pushinteger(gL, damagetype);
}
lua_pushfstring(gL, FMT_HOOKID, hookp->id);
lua_gettable(gL, LUA_REGISTRYINDEX);
- lua_pushvalue(gL, -5);
- lua_pushvalue(gL, -5);
- lua_pushvalue(gL, -5);
- lua_pushvalue(gL, -5);
- if (lua_pcall(gL, 4, 1, 0)) {
+ lua_pushvalue(gL, -6);
+ lua_pushvalue(gL, -6);
+ lua_pushvalue(gL, -6);
+ lua_pushvalue(gL, -6);
+ lua_pushvalue(gL, -6);
+ if (lua_pcall(gL, 5, 1, 0)) {
if (!hookp->error || cv_debug & DBG_LUA)
CONS_Alert(CONS_WARNING,"%s\n",lua_tostring(gL, -1));
lua_pop(gL, 1);
@@ -745,14 +751,16 @@ boolean LUAh_MobjDamage(mobj_t *target, mobj_t *inflictor, mobj_t *source, INT32
LUA_PushUserdata(gL, inflictor, META_MOBJ);
LUA_PushUserdata(gL, source, META_MOBJ);
lua_pushinteger(gL, damage);
+ lua_pushinteger(gL, damagetype);
}
lua_pushfstring(gL, FMT_HOOKID, hookp->id);
lua_gettable(gL, LUA_REGISTRYINDEX);
- lua_pushvalue(gL, -5);
- lua_pushvalue(gL, -5);
- lua_pushvalue(gL, -5);
- lua_pushvalue(gL, -5);
- if (lua_pcall(gL, 4, 1, 0)) {
+ lua_pushvalue(gL, -6);
+ lua_pushvalue(gL, -6);
+ lua_pushvalue(gL, -6);
+ lua_pushvalue(gL, -6);
+ lua_pushvalue(gL, -6);
+ if (lua_pcall(gL, 5, 1, 0)) {
if (!hookp->error || cv_debug & DBG_LUA)
CONS_Alert(CONS_WARNING,"%s\n",lua_tostring(gL, -1));
lua_pop(gL, 1);
@@ -823,13 +831,15 @@ boolean LUAh_MobjDeath(mobj_t *target, mobj_t *inflictor, mobj_t *source, UINT8
LUA_PushUserdata(gL, target, META_MOBJ);
LUA_PushUserdata(gL, inflictor, META_MOBJ);
LUA_PushUserdata(gL, source, META_MOBJ);
+ lua_pushinteger(gL, damagetype);
}
lua_pushfstring(gL, FMT_HOOKID, hookp->id);
lua_gettable(gL, LUA_REGISTRYINDEX);
- lua_pushvalue(gL, -4);
- lua_pushvalue(gL, -4);
- lua_pushvalue(gL, -4);
- if (lua_pcall(gL, 3, 1, 0)) {
+ lua_pushvalue(gL, -5);
+ lua_pushvalue(gL, -5);
+ lua_pushvalue(gL, -5);
+ lua_pushvalue(gL, -5);
+ if (lua_pcall(gL, 4, 1, 0)) {
if (!hookp->error || cv_debug & DBG_LUA)
CONS_Alert(CONS_WARNING,"%s\n",lua_tostring(gL, -1));
lua_pop(gL, 1);
@@ -1346,4 +1356,101 @@ void LUAh_IntermissionThinker(void)
}
}
+// Hook for team switching
+// It's just an edit of LUAh_ViewpointSwitch.
+boolean LUAh_TeamSwitch(player_t *player, int newteam, boolean fromspectators, boolean tryingautobalance, boolean tryingscramble)
+{
+ hook_p hookp;
+ boolean canSwitchTeam = true;
+ if (!gL || !(hooksAvailable[hook_TeamSwitch/8] & (1<<(hook_TeamSwitch%8))))
+ return true;
+
+ lua_settop(gL, 0);
+
+ for (hookp = playerhooks; hookp; hookp = hookp->next)
+ {
+ if (hookp->type != hook_TeamSwitch)
+ continue;
+
+ if (lua_gettop(gL) == 0)
+ {
+ LUA_PushUserdata(gL, player, META_PLAYER);
+ lua_pushinteger(gL, newteam);
+ lua_pushboolean(gL, fromspectators);
+ lua_pushboolean(gL, tryingautobalance);
+ lua_pushboolean(gL, tryingscramble);
+ }
+ lua_pushfstring(gL, FMT_HOOKID, hookp->id);
+ lua_gettable(gL, LUA_REGISTRYINDEX);
+ lua_pushvalue(gL, -6);
+ lua_pushvalue(gL, -6);
+ lua_pushvalue(gL, -6);
+ lua_pushvalue(gL, -6);
+ lua_pushvalue(gL, -6);
+ if (lua_pcall(gL, 5, 1, 0)) {
+ if (!hookp->error || cv_debug & DBG_LUA)
+ CONS_Alert(CONS_WARNING,"%s\n",lua_tostring(gL, -1));
+ lua_pop(gL, 1);
+ hookp->error = true;
+ continue;
+ }
+ if (!lua_isnil(gL, -1) && !lua_toboolean(gL, -1))
+ canSwitchTeam = false; // Can't switch team
+ lua_pop(gL, 1);
+ }
+
+ lua_settop(gL, 0);
+ return canSwitchTeam;
+}
+
+// Hook for spy mode
+UINT8 LUAh_ViewpointSwitch(player_t *player, player_t *newdisplayplayer, boolean forced)
+{
+ hook_p hookp;
+ UINT8 canSwitchView = 0; // 0 = default, 1 = force yes, 2 = force no.
+ if (!gL || !(hooksAvailable[hook_ViewpointSwitch/8] & (1<<(hook_ViewpointSwitch%8))))
+ return 0;
+
+ lua_settop(gL, 0);
+ hud_running = true;
+
+ for (hookp = playerhooks; hookp; hookp = hookp->next)
+ {
+ if (hookp->type != hook_ViewpointSwitch)
+ continue;
+
+ if (lua_gettop(gL) == 0)
+ {
+ LUA_PushUserdata(gL, player, META_PLAYER);
+ LUA_PushUserdata(gL, newdisplayplayer, META_PLAYER);
+ lua_pushboolean(gL, forced);
+ }
+ lua_pushfstring(gL, FMT_HOOKID, hookp->id);
+ lua_gettable(gL, LUA_REGISTRYINDEX);
+ lua_pushvalue(gL, -4);
+ lua_pushvalue(gL, -4);
+ lua_pushvalue(gL, -4);
+ if (lua_pcall(gL, 3, 1, 0)) {
+ if (!hookp->error || cv_debug & DBG_LUA)
+ CONS_Alert(CONS_WARNING,"%s\n",lua_tostring(gL, -1));
+ lua_pop(gL, 1);
+ hookp->error = true;
+ continue;
+ }
+ if (!lua_isnil(gL, -1))
+ { // if nil, leave canSwitchView = 0.
+ if (lua_toboolean(gL, -1))
+ canSwitchView = 1; // Force viewpoint switch
+ else
+ canSwitchView = 2; // Skip viewpoint switch
+ }
+ lua_pop(gL, 1);
+ }
+
+ lua_settop(gL, 0);
+ hud_running = false;
+
+ return canSwitchView;
+}
+
#endif
diff --git a/src/lua_hud.h b/src/lua_hud.h
index abfbba4413a399471f0b0b9ae93205e41179a920..a00a5cb028bca8f63b1e9349757742e79405b703 100644
--- a/src/lua_hud.h
+++ b/src/lua_hud.h
@@ -21,6 +21,7 @@ enum hud {
// Match / CTF / Tag / Ringslinger
hud_weaponrings,
hud_powerstones,
+ hud_teamscores,
// NiGHTS mode
hud_nightslink,
hud_nightsdrill,
@@ -33,6 +34,9 @@ enum hud {
hud_coopemeralds,
hud_tokens,
hud_tabemblems,
+ // Intermission
+ hud_intermissiontally,
+ hud_intermissionmessages,
hud_MAX
};
@@ -43,4 +47,5 @@ boolean LUA_HudEnabled(enum hud option);
void LUAh_GameHUD(player_t *stplyr);
void LUAh_ScoresHUD(void);
void LUAh_TitleHUD(void);
-void LUAh_TitleCardHUD(player_t *stplyr);
+void LUAh_TitleCardHUD(player_t *stplayr);
+void LUAh_IntermissionHUD(void);
diff --git a/src/lua_hudlib.c b/src/lua_hudlib.c
index a2f48c4ad5d2daced33e46e3f0f830e2a39b8f98..12ae1b5fc06e81b722c229325e3117fee6d8703b 100644
--- a/src/lua_hudlib.c
+++ b/src/lua_hudlib.c
@@ -48,6 +48,7 @@ static const char *const hud_disable_options[] = {
"weaponrings",
"powerstones",
+ "teamscores",
"nightslink",
"nightsdrill",
@@ -60,6 +61,9 @@ static const char *const hud_disable_options[] = {
"coopemeralds",
"tokens",
"tabemblems",
+
+ "intermissiontally",
+ "intermissionmessages",
NULL};
enum hudinfo {
@@ -92,12 +96,14 @@ static const char *const patch_opt[] = {
enum hudhook {
hudhook_game = 0,
hudhook_scores,
+ hudhook_intermission,
hudhook_title,
hudhook_titlecard
};
static const char *const hudhook_opt[] = {
"game",
"scores",
+ "intermission",
"title",
"titlecard",
NULL};
@@ -1050,13 +1056,16 @@ int LUA_HudLib(lua_State *L)
lua_rawseti(L, -2, 2); // HUD[2] = game rendering functions array
lua_newtable(L);
- lua_rawseti(L, -2, 3); // HUD[2] = scores rendering functions array
+ lua_rawseti(L, -2, 3); // HUD[3] = scores rendering functions array
+
+ lua_newtable(L);
+ lua_rawseti(L, -2, 4); // HUD[4] = intermission rendering functions array
lua_newtable(L);
- lua_rawseti(L, -2, 4); // HUD[3] = title rendering functions array
+ lua_rawseti(L, -2, 5); // HUD[5] = title rendering functions array
lua_newtable(L);
- lua_rawseti(L, -2, 5); // HUD[4] = title card rendering functions array
+ lua_rawseti(L, -2, 6); // HUD[6] = title card rendering functions array
lua_setfield(L, LUA_REGISTRYINDEX, "HUD");
luaL_newmetatable(L, META_HUDINFO);
@@ -1228,4 +1237,29 @@ void LUAh_TitleCardHUD(player_t *stplayr)
hud_running = false;
}
+void LUAh_IntermissionHUD(void)
+{
+ if (!gL || !(hudAvailable & (1<<hudhook_intermission)))
+ return;
+
+ hud_running = true;
+ lua_pop(gL, -1);
+
+ lua_getfield(gL, LUA_REGISTRYINDEX, "HUD");
+ I_Assert(lua_istable(gL, -1));
+ lua_rawgeti(gL, -1, 4); // HUD[4] = rendering funcs
+ I_Assert(lua_istable(gL, -1));
+
+ lua_rawgeti(gL, -2, 1); // HUD[1] = lib_draw
+ I_Assert(lua_istable(gL, -1));
+ lua_remove(gL, -3); // pop HUD
+ lua_pushnil(gL);
+ while (lua_next(gL, -3) != 0) {
+ lua_pushvalue(gL, -3); // graphics library (HUD[1])
+ LUA_Call(gL, 1);
+ }
+ lua_pop(gL, -1);
+ hud_running = false;
+}
+
#endif
diff --git a/src/lua_maplib.c b/src/lua_maplib.c
index 0fe1df0b61daf5f9a3bf5a6abec3daeaf591c5dc..8ad66d04f4b26a67cd94302da4357899e0326587 100644
--- a/src/lua_maplib.c
+++ b/src/lua_maplib.c
@@ -445,7 +445,7 @@ static int sectorlines_get(lua_State *L)
// get the "linecount" by shifting our retrieved memory address of "lines" to where "linecount" is in the sector_t, then dereferencing the result
// we need this to determine the array's actual size, and therefore also the maximum value allowed as an index
// this only works if seclines is actually a pointer to a sector's lines member in memory, oh boy
- numoflines = (size_t)(*(seclines - (offsetof(sector_t, lines) - offsetof(sector_t, linecount))));
+ numoflines = (size_t)(*(size_t *)(((size_t)seclines) - (offsetof(sector_t, lines) - offsetof(sector_t, linecount))));
/* OLD HACK
// check first linedef to figure which of its sectors owns this sector->lines pointer
@@ -479,7 +479,7 @@ static int sectorlines_num(lua_State *L)
return luaL_error(L, "accessed sector_t.lines doesn't exist anymore.");
// see comments in the _get function above
- numoflines = (size_t)(*(seclines - (offsetof(sector_t, lines) - offsetof(sector_t, linecount))));
+ numoflines = (size_t)(*(size_t *)(((size_t)seclines) - (offsetof(sector_t, lines) - offsetof(sector_t, linecount))));
lua_pushinteger(L, numoflines);
return 1;
}
@@ -2071,6 +2071,12 @@ static int mapheaderinfo_get(lua_State *L)
lua_pushinteger(L, header->levelselect);
else if (fastcmp(field,"bonustype"))
lua_pushinteger(L, header->bonustype);
+ else if (fastcmp(field,"ltzzpatch"))
+ lua_pushstring(L, header->ltzzpatch);
+ else if (fastcmp(field,"ltzztext"))
+ lua_pushstring(L, header->ltzztext);
+ else if (fastcmp(field,"ltactdiamond"))
+ lua_pushstring(L, header->ltactdiamond);
else if (fastcmp(field,"maxbonuslives"))
lua_pushinteger(L, header->maxbonuslives);
else if (fastcmp(field,"levelflags"))
diff --git a/src/lua_script.c b/src/lua_script.c
index fe3c2f10d11f5f5f513fbb0be8003150e1cdf15e..18d9a87c22e70de737351160ca018545c92aa12f 100644
--- a/src/lua_script.c
+++ b/src/lua_script.c
@@ -18,7 +18,9 @@
#include "w_wad.h"
#include "p_setup.h"
#include "r_state.h"
+#include "r_sky.h"
#include "g_game.h"
+#include "f_finale.h"
#include "byteptr.h"
#include "p_saveg.h"
#include "p_local.h"
@@ -79,8 +81,239 @@ FUNCNORETURN static int LUA_Panic(lua_State *L)
#endif
}
+// Moved here from lib_getenum.
+int LUA_PushGlobals(lua_State *L, const char *word)
+{
+ if (fastcmp(word,"gamemap")) {
+ lua_pushinteger(L, gamemap);
+ return 1;
+ } else if (fastcmp(word,"maptol")) {
+ lua_pushinteger(L, maptol);
+ return 1;
+ } else if (fastcmp(word,"ultimatemode")) {
+ lua_pushboolean(L, ultimatemode != 0);
+ return 1;
+ } else if (fastcmp(word,"mariomode")) {
+ lua_pushboolean(L, mariomode != 0);
+ return 1;
+ } else if (fastcmp(word,"twodlevel")) {
+ lua_pushboolean(L, twodlevel != 0);
+ return 1;
+ } else if (fastcmp(word,"circuitmap")) {
+ lua_pushboolean(L, circuitmap);
+ return 1;
+ } else if (fastcmp(word,"netgame")) {
+ lua_pushboolean(L, netgame);
+ return 1;
+ } else if (fastcmp(word,"multiplayer")) {
+ lua_pushboolean(L, multiplayer);
+ return 1;
+ } else if (fastcmp(word,"modeattacking")) {
+ lua_pushboolean(L, modeattacking);
+ return 1;
+ } else if (fastcmp(word,"splitscreen")) {
+ lua_pushboolean(L, splitscreen);
+ return 1;
+ } else if (fastcmp(word,"gamecomplete")) {
+ lua_pushboolean(L, gamecomplete);
+ return 1;
+ } else if (fastcmp(word,"devparm")) {
+ lua_pushboolean(L, devparm);
+ return 1;
+ } else if (fastcmp(word,"modifiedgame")) {
+ lua_pushboolean(L, modifiedgame && !savemoddata);
+ return 1;
+ } else if (fastcmp(word,"menuactive")) {
+ lua_pushboolean(L, menuactive);
+ return 1;
+ } else if (fastcmp(word,"paused")) {
+ lua_pushboolean(L, paused);
+ return 1;
+ } else if (fastcmp(word,"bluescore")) {
+ lua_pushinteger(L, bluescore);
+ return 1;
+ } else if (fastcmp(word,"redscore")) {
+ lua_pushinteger(L, redscore);
+ return 1;
+ } else if (fastcmp(word,"timelimit")) {
+ lua_pushinteger(L, cv_timelimit.value);
+ return 1;
+ } else if (fastcmp(word,"pointlimit")) {
+ lua_pushinteger(L, cv_pointlimit.value);
+ return 1;
+ // begin map vars
+ } else if (fastcmp(word,"spstage_start")) {
+ lua_pushinteger(L, spstage_start);
+ return 1;
+ } else if (fastcmp(word,"sstage_start")) {
+ lua_pushinteger(L, sstage_start);
+ return 1;
+ } else if (fastcmp(word,"sstage_end")) {
+ lua_pushinteger(L, sstage_end);
+ return 1;
+ } else if (fastcmp(word,"smpstage_start")) {
+ lua_pushinteger(L, smpstage_start);
+ return 1;
+ } else if (fastcmp(word,"smpstage_end")) {
+ lua_pushinteger(L, smpstage_end);
+ return 1;
+ } else if (fastcmp(word,"titlemap")) {
+ lua_pushinteger(L, titlemap);
+ return 1;
+ } else if (fastcmp(word,"titlemapinaction")) {
+ lua_pushboolean(L, (titlemapinaction != TITLEMAP_OFF));
+ return 1;
+ } else if (fastcmp(word,"bootmap")) {
+ lua_pushinteger(L, bootmap);
+ return 1;
+ } else if (fastcmp(word,"tutorialmap")) {
+ lua_pushinteger(L, tutorialmap);
+ return 1;
+ } else if (fastcmp(word,"tutorialmode")) {
+ lua_pushboolean(L, tutorialmode);
+ return 1;
+ // end map vars
+ // begin CTF colors
+ } else if (fastcmp(word,"skincolor_redteam")) {
+ lua_pushinteger(L, skincolor_redteam);
+ return 1;
+ } else if (fastcmp(word,"skincolor_blueteam")) {
+ lua_pushinteger(L, skincolor_blueteam);
+ return 1;
+ } else if (fastcmp(word,"skincolor_redring")) {
+ lua_pushinteger(L, skincolor_redring);
+ return 1;
+ } else if (fastcmp(word,"skincolor_bluering")) {
+ lua_pushinteger(L, skincolor_bluering);
+ return 1;
+ // end CTF colors
+ // begin timers
+ } else if (fastcmp(word,"invulntics")) {
+ lua_pushinteger(L, invulntics);
+ return 1;
+ } else if (fastcmp(word,"sneakertics")) {
+ lua_pushinteger(L, sneakertics);
+ return 1;
+ } else if (fastcmp(word,"flashingtics")) {
+ lua_pushinteger(L, flashingtics);
+ return 1;
+ } else if (fastcmp(word,"tailsflytics")) {
+ lua_pushinteger(L, tailsflytics);
+ return 1;
+ } else if (fastcmp(word,"underwatertics")) {
+ lua_pushinteger(L, underwatertics);
+ return 1;
+ } else if (fastcmp(word,"spacetimetics")) {
+ lua_pushinteger(L, spacetimetics);
+ return 1;
+ } else if (fastcmp(word,"extralifetics")) {
+ lua_pushinteger(L, extralifetics);
+ return 1;
+ } else if (fastcmp(word,"nightslinktics")) {
+ lua_pushinteger(L, nightslinktics);
+ return 1;
+ } else if (fastcmp(word,"gameovertics")) {
+ lua_pushinteger(L, gameovertics);
+ return 1;
+ } else if (fastcmp(word,"ammoremovaltics")) {
+ lua_pushinteger(L, ammoremovaltics);
+ return 1;
+ // end timers
+ } else if (fastcmp(word,"gametype")) {
+ lua_pushinteger(L, gametype);
+ return 1;
+ } else if (fastcmp(word,"gametyperules")) {
+ lua_pushinteger(L, gametyperules);
+ return 1;
+ } else if (fastcmp(word,"leveltime")) {
+ lua_pushinteger(L, leveltime);
+ return 1;
+ } else if (fastcmp(word,"sstimer")) {
+ lua_pushinteger(L, sstimer);
+ return 1;
+ } else if (fastcmp(word,"curWeather")) {
+ lua_pushinteger(L, curWeather);
+ return 1;
+ } else if (fastcmp(word,"globalweather")) {
+ lua_pushinteger(L, globalweather);
+ return 1;
+ } else if (fastcmp(word,"levelskynum")) {
+ lua_pushinteger(L, levelskynum);
+ return 1;
+ } else if (fastcmp(word,"globallevelskynum")) {
+ lua_pushinteger(L, globallevelskynum);
+ return 1;
+ } else if (fastcmp(word,"mapmusname")) {
+ lua_pushstring(L, mapmusname);
+ return 1;
+ } else if (fastcmp(word,"mapmusflags")) {
+ lua_pushinteger(L, mapmusflags);
+ return 1;
+ } else if (fastcmp(word,"mapmusposition")) {
+ lua_pushinteger(L, mapmusposition);
+ return 1;
+ // local player variables, by popular request
+ } else if (fastcmp(word,"consoleplayer")) { // player controlling console (aka local player 1)
+ if (consoleplayer < 0 || !playeringame[consoleplayer])
+ return 0;
+ LUA_PushUserdata(L, &players[consoleplayer], META_PLAYER);
+ return 1;
+ } else if (fastcmp(word,"displayplayer")) { // player visible on screen (aka display player 1)
+ if (displayplayer < 0 || !playeringame[displayplayer])
+ return 0;
+ LUA_PushUserdata(L, &players[displayplayer], META_PLAYER);
+ return 1;
+ } else if (fastcmp(word,"secondarydisplayplayer")) { // local/display player 2, for splitscreen
+ if (!splitscreen || secondarydisplayplayer < 0 || !playeringame[secondarydisplayplayer])
+ return 0;
+ LUA_PushUserdata(L, &players[secondarydisplayplayer], META_PLAYER);
+ return 1;
+ // end local player variables
+ } else if (fastcmp(word,"server")) {
+ if ((!multiplayer || !netgame) && !playeringame[serverplayer])
+ return 0;
+ LUA_PushUserdata(L, &players[serverplayer], META_PLAYER);
+ return 1;
+ } else if (fastcmp(word,"admin")) { // BACKWARDS COMPATIBILITY HACK: This was replaced with IsPlayerAdmin(), but some 2.1 Lua scripts still use the admin variable. It now points to the first admin player in the array.
+ LUA_Deprecated(L, "admin", "IsPlayerAdmin(player)");
+ if (!playeringame[adminplayers[0]] || IsPlayerAdmin(serverplayer))
+ return 0;
+ LUA_PushUserdata(L, &players[adminplayers[0]], META_PLAYER);
+ return 1;
+ } else if (fastcmp(word,"emeralds")) {
+ lua_pushinteger(L, emeralds);
+ return 1;
+ } else if (fastcmp(word,"gravity")) {
+ lua_pushinteger(L, gravity);
+ return 1;
+ } else if (fastcmp(word,"VERSIONSTRING")) {
+ lua_pushstring(L, VERSIONSTRING);
+ return 1;
+ } else if (fastcmp(word, "token")) {
+ lua_pushinteger(L, token);
+ return 1;
+ }
+ return 0;
+}
+
+// See the above.
+int LUA_CheckGlobals(lua_State *L, const char *word)
+{
+ if (fastcmp(word, "gametyperules"))
+ gametyperules = (UINT32)luaL_checkinteger(L, 2);
+ else if (fastcmp(word, "redscore"))
+ redscore = (UINT32)luaL_checkinteger(L, 2);
+ else if (fastcmp(word, "bluescore"))
+ bluescore = (UINT32)luaL_checkinteger(L, 2);
+ else
+ return 0;
+
+ // Global variable set, so return and don't error.
+ return 1;
+}
+
// This function decides which global variables you are allowed to set.
-static int noglobals(lua_State *L)
+static int setglobals(lua_State *L)
{
const char *csname;
char *name;
@@ -106,6 +339,9 @@ static int noglobals(lua_State *L)
return 0;
}
+ if (LUA_CheckGlobals(L, csname))
+ return 0;
+
Z_Free(name);
return luaL_error(L, "Implicit global " LUA_QS " prevented. Create a local variable instead.", csname);
}
@@ -144,7 +380,7 @@ static void LUA_ClearState(void)
// lock the global namespace
lua_getmetatable(L, LUA_GLOBALSINDEX);
- lua_pushcfunction(L, noglobals);
+ lua_pushcfunction(L, setglobals);
lua_setfield(L, -2, "__newindex");
lua_newtable(L);
lua_setfield(L, -2, "__metatable");
diff --git a/src/lua_script.h b/src/lua_script.h
index 4f66d3f8a43ad1d8c94e1ccfa405bde8413dc8ad..8f27dcb4c9b5343095705b9901b7201fc8b854dd 100644
--- a/src/lua_script.h
+++ b/src/lua_script.h
@@ -54,6 +54,8 @@ void LUA_InvalidatePlayer(player_t *player);
void LUA_Step(void);
void LUA_Archive(void);
void LUA_UnArchive(void);
+int LUA_PushGlobals(lua_State *L, const char *word);
+int LUA_CheckGlobals(lua_State *L, const char *word);
void Got_Luacmd(UINT8 **cp, INT32 playernum); // lua_consolelib.c
void LUA_CVarChanged(const char *name); // lua_consolelib.c
int Lua_optoption(lua_State *L, int narg,
diff --git a/src/m_anigif.c b/src/m_anigif.c
index 56d3c87075fc7a8779e04c46a9467d5fb70df6d1..f761db143b0cb016ee0395e9f045c8cdeb49d444 100644
--- a/src/m_anigif.c
+++ b/src/m_anigif.c
@@ -20,6 +20,10 @@
#include "i_video.h"
#include "m_misc.h"
+#ifdef HWRENDER
+#include "hardware/hw_main.h"
+#endif
+
// GIFs are always little-endian
#include "byteptr.h"
@@ -29,6 +33,7 @@ consvar_t cv_gif_downscale = {"gif_downscale", "On", CV_SAVE, CV_OnOff, NULL, 0
#ifdef HAVE_ANIGIF
static boolean gif_optimize = false; // So nobody can do something dumb
static boolean gif_downscale = false; // like changing cvars mid output
+static RGBA_t *gif_palette = NULL;
static FILE *gif_out = NULL;
static INT32 gif_frames = 0;
@@ -428,10 +433,7 @@ static void GIF_headwrite(void)
// write color table
{
- RGBA_t *pal = ((cv_screenshot_colorprofile.value)
- ? pLocalPalette
- : pMasterPalette);
-
+ RGBA_t *pal = gif_palette;
for (i = 0; i < 256; i++)
{
WRITEUINT8(p, pal[i].s.red);
@@ -457,6 +459,32 @@ const UINT8 gifframe_gchead[4] = {0x21,0xF9,0x04,0x04}; // GCE, bytes, packed by
static UINT8 *gifframe_data = NULL;
static size_t gifframe_size = 8192;
+#ifdef HWRENDER
+static void hwrconvert(void)
+{
+ UINT8 *linear = HWR_GetScreenshot();
+ UINT8 *dest = screens[2];
+ UINT8 r, g, b;
+ INT32 x, y;
+ size_t i = 0;
+
+ InitColorLUT(gif_palette);
+
+ for (y = 0; y < vid.height; y++)
+ {
+ 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];
+ }
+ }
+
+ free(linear);
+}
+#endif
+
//
// GIF_framewrite
// writes a frame into the file.
@@ -482,7 +510,12 @@ static void GIF_framewrite(void)
GIF_optimizeregion(cur_screen, movie_screen, &blitx, &blity, &blitw, &blith);
// blit to temp screen
- I_ReadScreen(movie_screen);
+ if (rendermode == render_soft)
+ I_ReadScreen(movie_screen);
+#ifdef HWRENDER
+ else if (rendermode == render_opengl)
+ hwrconvert();
+#endif
}
else
{
@@ -491,7 +524,18 @@ static void GIF_framewrite(void)
blith = vid.height;
if (gif_frames == 0)
- I_ReadScreen(movie_screen);
+ {
+ 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
+ }
+
movie_screen = screens[0];
}
@@ -580,7 +624,7 @@ static void GIF_framewrite(void)
//
INT32 GIF_open(const char *filename)
{
-#ifdef HWRENDER
+#if 0
if (rendermode != render_soft)
{
CONS_Alert(CONS_WARNING, M_GetText("GIFs cannot be taken in non-software modes!\n"));
@@ -594,6 +638,16 @@ INT32 GIF_open(const char *filename)
gif_optimize = (!!cv_gif_optimize.value);
gif_downscale = (!!cv_gif_downscale.value);
+
+ // GIF color table
+ // In hardware mode, uses the master palette
+ gif_palette = ((cv_screenshot_colorprofile.value
+#ifdef HWRENDER
+ && (rendermode == render_soft)
+#endif
+ ) ? pLocalPalette
+ : pMasterPalette);
+
GIF_headwrite();
gif_frames = 0;
return 1;
diff --git a/src/m_cheat.c b/src/m_cheat.c
index e31ce7869cefba560717f813e0b5480c8859d671..bd6eca73ac907d73b77e66489b092ea1e0070309 100644
--- a/src/m_cheat.c
+++ b/src/m_cheat.c
@@ -778,7 +778,7 @@ void Command_CauseCfail_f(void)
P_SetThingPosition(players[consoleplayer].mo);
// CTF consistency test
- if (gametype == GT_CTF)
+ if (gametyperules & GTR_TEAMFLAGS)
{
if (blueflag) {
P_RemoveMobj(blueflag);
@@ -1106,7 +1106,7 @@ static mapthing_t *OP_CreateNewMapThing(player_t *player, UINT16 type, boolean c
#else
fixed_t cheight = sec->ceilingheight;
#endif
- mt->options = (UINT16)((cheight - player->mo->z - player->mo->height)>>FRACBITS);
+ mt->z = (UINT16)((cheight - player->mo->z - player->mo->height)>>FRACBITS);
}
else
{
@@ -1115,12 +1115,11 @@ static mapthing_t *OP_CreateNewMapThing(player_t *player, UINT16 type, boolean c
#else
fixed_t fheight = sec->floorheight;
#endif
- mt->options = (UINT16)((player->mo->z - fheight)>>FRACBITS);
+ mt->z = (UINT16)((player->mo->z - fheight)>>FRACBITS);
}
- mt->options <<= ZSHIFT;
mt->angle = (INT16)(FixedInt(AngleFixed(player->mo->angle)));
- mt->options |= (UINT16)cv_opflags.value;
+ mt->options = (mt->z << ZSHIFT) | (UINT16)cv_opflags.value;
return mt;
}
@@ -1187,7 +1186,7 @@ void OP_NightsObjectplace(player_t *player)
mt->options = (mt->options & ~(UINT16)cv_opflags.value) | (UINT16)cv_ophoopflags.value;
mt->angle = (INT16)(mt->angle+(INT16)((FixedInt(FixedDiv(temp*FRACUNIT, 360*(FRACUNIT/256))))<<8));
- P_SpawnHoopsAndRings(mt, false);
+ P_SpawnHoop(mt);
}
// This places a bumper!
@@ -1250,7 +1249,7 @@ void OP_NightsObjectplace(player_t *player)
return;
mt = OP_CreateNewMapThing(player, (UINT16)mobjinfo[MT_BLUESPHERE].doomednum, false);
- P_SpawnHoopsAndRings(mt, false);
+ P_SpawnMapThing(mt);
}
// This places a ring!
@@ -1261,7 +1260,7 @@ void OP_NightsObjectplace(player_t *player)
return;
mt = OP_CreateNewMapThing(player, (UINT16)mobjinfo[MT_RING].doomednum, false);
- P_SpawnHoopsAndRings(mt, false);
+ P_SpawnMapThing(mt);
}
// This places a custom object as defined in the console cv_mapthingnum.
@@ -1293,15 +1292,10 @@ void OP_NightsObjectplace(player_t *player)
mt = OP_CreateNewMapThing(player, (UINT16)cv_mapthingnum.value, false);
mt->angle = angle;
- if (mt->type == 300 // Ring
- || mt->type == 308 || mt->type == 309 // Team Rings
- || mt->type == 1706 // Sphere
- || (mt->type >= 600 && mt->type <= 609) // Placement patterns
- || mt->type == 1705 || mt->type == 1713 // NiGHTS Hoops
- || mt->type == 1800) // Mario Coin
- {
- P_SpawnHoopsAndRings(mt, false);
- }
+ if (mt->type >= 600 && mt->type <= 609) // Placement patterns
+ P_SpawnItemPattern(mt, false);
+ else if (mt->type == 1705 || mt->type == 1713) // NiGHTS Hoops
+ P_SpawnHoop(mt);
else
P_SpawnMapThing(mt);
}
@@ -1438,15 +1432,10 @@ void OP_ObjectplaceMovement(player_t *player)
return;
mt = OP_CreateNewMapThing(player, (UINT16)spawnthing, ceiling);
- if (mt->type == 300 // Ring
- || mt->type == 308 || mt->type == 309 // Team Rings
- || mt->type == 1706 // Nights Wing
- || (mt->type >= 600 && mt->type <= 609) // Placement patterns
- || mt->type == 1705 || mt->type == 1713 // NiGHTS Hoops
- || mt->type == 1800) // Mario Coin
- {
- P_SpawnHoopsAndRings(mt, false);
- }
+ if (mt->type >= 600 && mt->type <= 609) // Placement patterns
+ P_SpawnItemPattern(mt, false);
+ else if (mt->type == 1705 || mt->type == 1713) // NiGHTS Hoops
+ P_SpawnHoop(mt);
else
P_SpawnMapThing(mt);
diff --git a/src/m_menu.c b/src/m_menu.c
index 23dc10701c0cb9ffd451eb392619b7d7128770f3..7614048099de24b36605aef10a2d8183645df9a7 100644
--- a/src/m_menu.c
+++ b/src/m_menu.c
@@ -605,7 +605,7 @@ static menuitem_t MISC_ChangeTeamMenu[] =
{IT_WHITESTRING|IT_CALL, NULL, "Confirm", M_ConfirmTeamChange, 90},
};
-static const gtdesc_t gametypedesc[] =
+gtdesc_t gametypedesc[NUMGAMETYPES] =
{
{{ 54, 54}, "Play through the single-player campaign with your friends, teaming up to beat Dr Eggman's nefarious challenges!"},
{{103, 103}, "Speed your way through the main acts, competing in several different categories to see who's the best."},
@@ -1118,6 +1118,8 @@ static menuitem_t OP_Joystick1Menu[] =
{IT_STRING | IT_CVAR, NULL, "First-Person Vert-Look", &cv_alwaysfreelook, 120},
{IT_STRING | IT_CVAR, NULL, "Third-Person Vert-Look", &cv_chasefreelook, 130},
+ {IT_STRING | IT_CVAR | IT_CV_FLOATSLIDER,
+ NULL, "Deadzone", &cv_deadzone, 140 },
};
static menuitem_t OP_Joystick2Menu[] =
@@ -1134,6 +1136,8 @@ static menuitem_t OP_Joystick2Menu[] =
{IT_STRING | IT_CVAR, NULL, "First-Person Vert-Look", &cv_alwaysfreelook2,120},
{IT_STRING | IT_CVAR, NULL, "Third-Person Vert-Look", &cv_chasefreelook2, 130},
+ {IT_STRING | IT_CVAR | IT_CV_FLOATSLIDER,
+ NULL, "Deadzone", &cv_deadzone2, 140 },
};
static menuitem_t OP_JoystickSetMenu[1+MAX_JOYSTICKS];
@@ -1305,18 +1309,18 @@ static menuitem_t OP_OpenGLOptionsMenu[] =
{IT_STRING|IT_CVAR, NULL, "Model lighting", &cv_grmodellighting, 32},
{IT_HEADER, NULL, "General", NULL, 51},
- {IT_STRING|IT_CVAR, NULL, "Field of view", &cv_grfov, 62},
- {IT_STRING|IT_CVAR, NULL, "Quality", &cv_scr_depth, 72},
- {IT_STRING|IT_CVAR, NULL, "Texture Filter", &cv_grfiltermode, 82},
- {IT_STRING|IT_CVAR, NULL, "Anisotropic", &cv_granisotropicmode,92},
+ {IT_STRING|IT_CVAR, NULL, "Field of view", &cv_grfov, 63},
+ {IT_STRING|IT_CVAR, NULL, "Quality", &cv_scr_depth, 73},
+ {IT_STRING|IT_CVAR, NULL, "Texture Filter", &cv_grfiltermode, 83},
+ {IT_STRING|IT_CVAR, NULL, "Anisotropic", &cv_granisotropicmode,93},
- {IT_HEADER, NULL, "Miscellaneous", NULL, 111},
- {IT_SUBMENU|IT_STRING, NULL, "Fog...", &OP_OpenGLFogDef, 123},
+ {IT_HEADER, NULL, "Miscellaneous", NULL, 112},
+ {IT_SUBMENU|IT_STRING, NULL, "Fog...", &OP_OpenGLFogDef, 124},
#ifdef ALAM_LIGHTING
- {IT_SUBMENU|IT_STRING, NULL, "Lighting...", &OP_OpenGLLightingDef, 133},
+ {IT_SUBMENU|IT_STRING, NULL, "Lighting...", &OP_OpenGLLightingDef, 134},
#endif
#if defined (_WINDOWS) && (!((defined (__unix__) && !defined (MSDOS)) || defined (UNIXCOMMON) || defined (HAVE_SDL)))
- {IT_STRING|IT_CVAR, NULL, "Fullscreen", &cv_fullscreen, 143},
+ {IT_STRING|IT_CVAR, NULL, "Fullscreen", &cv_fullscreen, 144},
#endif
};
@@ -3009,7 +3013,7 @@ boolean M_Responder(event_t *ev)
}
else if (ev->type == ev_joystick && ev->data1 == 0 && joywait < I_GetTime())
{
- const INT32 jdeadzone = JOYAXISRANGE/4;
+ const INT32 jdeadzone = (JOYAXISRANGE * cv_deadzone.value) / FRACUNIT;
if (ev->data3 != INT32_MAX)
{
if (Joystick.bGamepadStyle || abs(ev->data3) > jdeadzone)
@@ -4684,6 +4688,9 @@ static boolean M_CanShowLevelOnPlatter(INT32 mapnum, INT32 gt)
if (gt == GT_RACE && (mapheaderinfo[mapnum]->typeoflevel & TOL_RACE))
return true;
+ if (gt > 0 && gt < gametypecount && (mapheaderinfo[mapnum]->typeoflevel & gametypetol[gt]))
+ return true;
+
return false;
case LLM_LEVELSELECT:
@@ -9932,7 +9939,7 @@ static void M_DrawConnectMenu(void)
va("Ping: %u", (UINT32)LONG(serverlist[slindex].info.time)));
gt = "Unknown";
- if (serverlist[slindex].info.gametype < NUMGAMETYPES)
+ if (serverlist[slindex].info.gametype < gametypecount)
gt = Gametype_Names[serverlist[slindex].info.gametype];
V_DrawSmallString(currentMenu->x+46,S_LINEY(i)+8, globalflags,
diff --git a/src/m_menu.h b/src/m_menu.h
index ce9b422dc4f5e3f889209970f47f9ba1af38c13e..19858e2fc810165a8c21d162dca28900fb63c58e 100644
--- a/src/m_menu.h
+++ b/src/m_menu.h
@@ -371,6 +371,7 @@ typedef struct
UINT8 col[2];
char notes[441];
} gtdesc_t;
+extern gtdesc_t gametypedesc[NUMGAMETYPES];
// mode descriptions for video mode menu
typedef struct
diff --git a/src/m_misc.c b/src/m_misc.c
index d973833857a339c4aa61589348aa473c959c0d3d..138a25ab149e9f57cff300d9ed62abf31e2c0dea 100644
--- a/src/m_misc.c
+++ b/src/m_misc.c
@@ -1161,12 +1161,8 @@ void M_StartMovie(void)
switch (cv_moviemode.value)
{
case MM_GIF:
- if (rendermode == render_soft)
- {
- moviemode = M_StartMovieGIF(pathname);
- break;
- }
- /* FALLTHRU */
+ moviemode = M_StartMovieGIF(pathname);
+ break;
case MM_APNG:
moviemode = M_StartMovieAPNG(pathname);
break;
@@ -1783,7 +1779,7 @@ char *M_GetToken(const char *inputString)
|| stringToUse[startPos] == '\r'
|| stringToUse[startPos] == '\n'
|| stringToUse[startPos] == '\0'
- || stringToUse[startPos] == '"' // we're treating this as whitespace because SLADE likes adding it for no good reason
+ || stringToUse[startPos] == '=' || stringToUse[startPos] == ';' // UDMF TEXTMAP.
|| inComment != 0)
&& startPos < stringLength)
{
@@ -1841,6 +1837,23 @@ char *M_GetToken(const char *inputString)
texturesToken[1] = '\0';
return texturesToken;
}
+ // Return entire string within quotes, except without the quotes.
+ else if (stringToUse[startPos] == '"')
+ {
+ endPos = ++startPos;
+ while (stringToUse[endPos] != '"' && endPos < stringLength)
+ endPos++;
+
+ texturesTokenLength = endPos++ - startPos;
+ // Assign the memory. Don't forget an extra byte for the end of the string!
+ texturesToken = (char *)Z_Malloc((texturesTokenLength+1)*sizeof(char),PU_STATIC,NULL);
+ // Copy the string.
+ M_Memcpy(texturesToken, stringToUse+startPos, (size_t)texturesTokenLength);
+ // Make the final character NUL.
+ texturesToken[texturesTokenLength] = '\0';
+
+ return texturesToken;
+ }
// Now find the end of the token. This includes several additional characters that are okay to capture as one character, but not trailing at the end of another token.
endPos = startPos + 1;
@@ -1851,7 +1864,7 @@ char *M_GetToken(const char *inputString)
&& stringToUse[endPos] != ','
&& stringToUse[endPos] != '{'
&& stringToUse[endPos] != '}'
- && stringToUse[endPos] != '"' // see above
+ && stringToUse[endPos] != '=' && stringToUse[endPos] != ';' // UDMF TEXTMAP.
&& inComment == 0)
&& endPos < stringLength)
{
diff --git a/src/p_enemy.c b/src/p_enemy.c
index 9404c57354e717dce57a6a24709774bb73e95f73..f15ad86ae2cbbdccd2acaf02f6c15745b9cacde7 100644
--- a/src/p_enemy.c
+++ b/src/p_enemy.c
@@ -4983,7 +4983,7 @@ void A_ThrownRing(mobj_t *actor)
continue;
// Don't home in on teammates.
- if (gametype == GT_CTF
+ if ((gametyperules & GTR_TEAMFLAGS)
&& actor->target->player->ctfteam == player->ctfteam)
continue;
}
@@ -6589,7 +6589,7 @@ void A_OldRingExplode(mobj_t *actor) {
if (changecolor)
{
- if (gametype != GT_CTF)
+ if (!(gametyperules & GTR_TEAMFLAGS))
mo->color = actor->target->color; //copy color
else if (actor->target->player->ctfteam == 2)
mo->color = skincolor_bluering;
@@ -6605,7 +6605,7 @@ void A_OldRingExplode(mobj_t *actor) {
if (changecolor)
{
- if (gametype != GT_CTF)
+ if (!(gametyperules & GTR_TEAMFLAGS))
mo->color = actor->target->color; //copy color
else if (actor->target->player->ctfteam == 2)
mo->color = skincolor_bluering;
@@ -6620,7 +6620,7 @@ void A_OldRingExplode(mobj_t *actor) {
if (changecolor)
{
- if (gametype != GT_CTF)
+ if (!(gametyperules & GTR_TEAMFLAGS))
mo->color = actor->target->color; //copy color
else if (actor->target->player->ctfteam == 2)
mo->color = skincolor_bluering;
@@ -13591,12 +13591,12 @@ static boolean PIT_DustDevilLaunch(mobj_t *thing)
}
else
{ //Player on the top of the tornado.
+ P_ResetPlayer(player);
thing->z = dustdevil->z + dustdevil->height;
thrust = 20 * FRACUNIT;
player->powers[pw_nocontrol] = 0;
S_StartSound(thing, sfx_wdjump);
P_SetPlayerMobjState(thing, S_PLAY_FALL);
- player->pflags &= ~PF_JUMPED;
}
thing->momz = thrust;
@@ -14689,20 +14689,35 @@ void A_DragonWing(mobj_t *actor)
void A_DragonSegment(mobj_t *actor)
{
mobj_t *target = actor->target;
- fixed_t dist = P_AproxDistance(P_AproxDistance(actor->x - target->x, actor->y - target->y), actor->z - target->z);
- fixed_t radius = actor->radius + target->radius;
- angle_t hangle = R_PointToAngle2(target->x, target->y, actor->x, actor->y);
- angle_t zangle = R_PointToAngle2(0, target->z, dist, actor->z);
- fixed_t hdist = P_ReturnThrustX(target, zangle, radius);
- fixed_t xdist = P_ReturnThrustX(target, hangle, hdist);
- fixed_t ydist = P_ReturnThrustY(target, hangle, hdist);
- fixed_t zdist = P_ReturnThrustY(target, zangle, radius);
+ fixed_t dist;
+ fixed_t radius;
+ angle_t hangle;
+ angle_t zangle;
+ fixed_t hdist;
+ fixed_t xdist;
+ fixed_t ydist;
+ fixed_t zdist;
#ifdef HAVE_BLUA
if (LUA_CallAction("A_DragonSegment", actor))
return;
#endif
+ if (target == NULL || !target->health)
+ {
+ P_RemoveMobj(actor);
+ return;
+ }
+
+ dist = P_AproxDistance(P_AproxDistance(actor->x - target->x, actor->y - target->y), actor->z - target->z);
+ radius = actor->radius + target->radius;
+ hangle = R_PointToAngle2(target->x, target->y, actor->x, actor->y);
+ zangle = R_PointToAngle2(0, target->z, dist, actor->z);
+ hdist = P_ReturnThrustX(target, zangle, radius);
+ xdist = P_ReturnThrustX(target, hangle, hdist);
+ ydist = P_ReturnThrustY(target, hangle, hdist);
+ zdist = P_ReturnThrustY(target, zangle, radius);
+
actor->angle = hangle;
P_TeleportMove(actor, target->x + xdist, target->y + ydist, target->z + zdist);
}
diff --git a/src/p_inter.c b/src/p_inter.c
index 00733bbd35a76fa6cece5fe2fb58a30d2c3f05db..56a76b15c559da2797c301f9fab75c0ee3adadce 100644
--- a/src/p_inter.c
+++ b/src/p_inter.c
@@ -625,7 +625,7 @@ void P_TouchSpecialThing(mobj_t *special, mobj_t *toucher, boolean heightcheck)
P_AddPlayerScore(player, 1000);
- if (gametype != GT_COOP || modeattacking) // score only?
+ if (!(gametyperules & GTR_SPECIALSTAGES) || modeattacking) // score only?
{
S_StartSound(toucher, sfx_chchng);
break;
@@ -1888,7 +1888,7 @@ static void P_HitDeathMessages(player_t *player, mobj_t *inflictor, mobj_t *sour
char targetname[MAXPLAYERNAME+4];
char sourcename[MAXPLAYERNAME+4];
- if (G_PlatformGametype())
+ if (!(gametyperules & (GTR_RINGSLINGER|GTR_HURTMESSAGES)))
return; // Not in coop, etc.
if (!player)
@@ -2093,7 +2093,7 @@ void P_CheckTimeLimit(void)
if (!(multiplayer || netgame))
return;
- if (G_PlatformGametype())
+ if (!(gametyperules & GTR_TIMELIMIT))
return;
if (leveltime < timelimitintics)
@@ -2124,7 +2124,7 @@ void P_CheckTimeLimit(void)
}
//Optional tie-breaker for Match/CTF
- else if (cv_overtime.value)
+ else if ((cv_overtime.value) && (gametyperules & GTR_OVERTIME))
{
INT32 playerarray[MAXPLAYERS];
INT32 tempplayer = 0;
@@ -2206,7 +2206,7 @@ void P_CheckPointLimit(void)
if (!(multiplayer || netgame))
return;
- if (G_PlatformGametype())
+ if (!(gametyperules & GTR_POINTLIMIT))
return;
// pointlimit is nonzero, check if it's been reached by this player
@@ -2389,7 +2389,7 @@ void P_KillMobj(mobj_t *target, mobj_t *inflictor, mobj_t *source, UINT8 damaget
{
if (metalrecording) // Ack! Metal Sonic shouldn't die! Cut the tape, end recording!
G_StopMetalRecording(true);
- if (gametype == GT_MATCH // note, no team match suicide penalty
+ if ((gametyperules & GTR_DEATHPENALTY) // note, no team match suicide penalty
&& ((target == source) || (source == NULL && inflictor == NULL) || (source && !source->player)))
{ // Suicide penalty
if (target->player->score >= 50)
@@ -2978,7 +2978,7 @@ static inline void P_NiGHTSDamage(mobj_t *target, mobj_t *source)
player->flyangle += 180; // Shuffle's BETTERNIGHTSMOVEMENT?
player->flyangle %= 360;
- if (gametype == GT_RACE || gametype == GT_COMPETITION)
+ if (gametyperules & GTR_RACE)
player->drillmeter -= 5*20;
else
{
@@ -3040,7 +3040,7 @@ static inline boolean P_TagDamage(mobj_t *target, mobj_t *inflictor, mobj_t *sou
return false;
// Ignore IT players shooting each other, unless friendlyfire is on.
- if ((player->pflags & PF_TAGIT && !((cv_friendlyfire.value || (damagetype & DMG_CANHURTSELF)) &&
+ if ((player->pflags & PF_TAGIT && !((cv_friendlyfire.value || (gametyperules & GTR_FRIENDLYFIRE) || (damagetype & DMG_CANHURTSELF)) &&
source && source->player && source->player->pflags & PF_TAGIT)))
{
if (inflictor->type == MT_LHRT && !(player->powers[pw_shield] & SH_NOSTACK))
@@ -3056,7 +3056,7 @@ static inline boolean P_TagDamage(mobj_t *target, mobj_t *inflictor, mobj_t *sou
// Don't allow players on the same team to hurt one another,
// unless cv_friendlyfire is on.
- if (!(cv_friendlyfire.value || (damagetype & DMG_CANHURTSELF)) && (player->pflags & PF_TAGIT) == (source->player->pflags & PF_TAGIT))
+ if (!(cv_friendlyfire.value || (gametyperules & GTR_FRIENDLYFIRE) || (damagetype & DMG_CANHURTSELF)) && (player->pflags & PF_TAGIT) == (source->player->pflags & PF_TAGIT))
{
if (inflictor->type == MT_LHRT && !(player->powers[pw_shield] & SH_NOSTACK))
{
@@ -3141,7 +3141,7 @@ static inline boolean P_PlayerHitsPlayer(mobj_t *target, mobj_t *inflictor, mobj
return false;
// In COOP/RACE, you can't hurt other players unless cv_friendlyfire is on
- if (!cv_friendlyfire.value && (G_PlatformGametype()))
+ if (!(cv_friendlyfire.value || (gametyperules & GTR_FRIENDLYFIRE)) && (G_PlatformGametype()))
{
if (gametype == GT_COOP && inflictor->type == MT_LHRT && !(player->powers[pw_shield] & SH_NOSTACK)) // co-op only
{
@@ -3164,7 +3164,7 @@ static inline boolean P_PlayerHitsPlayer(mobj_t *target, mobj_t *inflictor, mobj
{
// Don't allow players on the same team to hurt one another,
// unless cv_friendlyfire is on.
- if (!cv_friendlyfire.value && target->player->ctfteam == source->player->ctfteam)
+ if (!(cv_friendlyfire.value || (gametyperules & GTR_FRIENDLYFIRE)) && target->player->ctfteam == source->player->ctfteam)
{
if (inflictor->type == MT_LHRT && !(player->powers[pw_shield] & SH_NOSTACK))
{
@@ -3222,7 +3222,7 @@ static void P_KillPlayer(player_t *player, mobj_t *source, INT32 damage)
player->mo->flags2 &= ~MF2_DONTDRAW;
P_SetPlayerMobjState(player->mo, player->mo->info->deathstate);
- if (gametype == GT_CTF && (player->gotflag & (GF_REDFLAG|GF_BLUEFLAG)))
+ if ((gametyperules & GTR_TEAMFLAGS) && (player->gotflag & (GF_REDFLAG|GF_BLUEFLAG)))
{
P_PlayerFlagBurst(player, false);
if (source && source->player)
@@ -3347,7 +3347,7 @@ static void P_ShieldDamage(player_t *player, mobj_t *inflictor, mobj_t *source,
else
S_StartSound (player->mo, sfx_shldls); // Ba-Dum! Shield loss.
- if (gametype == GT_CTF && (player->gotflag & (GF_REDFLAG|GF_BLUEFLAG)))
+ if ((gametyperules & GTR_TEAMFLAGS) && (player->gotflag & (GF_REDFLAG|GF_BLUEFLAG)))
{
P_PlayerFlagBurst(player, false);
if (source && source->player)
@@ -3381,7 +3381,7 @@ static void P_RingDamage(player_t *player, mobj_t *inflictor, mobj_t *source, IN
P_AddPlayerScore(source->player, 50);
}
- if (gametype == GT_CTF && (player->gotflag & (GF_REDFLAG|GF_BLUEFLAG)))
+ if ((gametyperules & GTR_TEAMFLAGS) && (player->gotflag & (GF_REDFLAG|GF_BLUEFLAG)))
{
P_PlayerFlagBurst(player, false);
if (source && source->player)
@@ -3424,6 +3424,24 @@ void P_SpecialStageDamage(player_t *player, mobj_t *inflictor, mobj_t *source)
if (player->powers[pw_invulnerability] || player->powers[pw_flashing] || player->powers[pw_super])
return;
+ if (!cv_friendlyfire.value)
+ {
+ if (inflictor->type == MT_LHRT && !(player->powers[pw_shield] & SH_NOSTACK))
+ {
+ if (player->revitem != MT_LHRT && player->spinitem != MT_LHRT && player->thokitem != MT_LHRT) // Healers do not get to heal other healers.
+ {
+ P_SwitchShield(player, SH_PINK);
+ S_StartSound(player->mo, mobjinfo[MT_PITY_ICON].seesound);
+ }
+ }
+
+ if (source->player->ctfteam == player->ctfteam)
+ return;
+ }
+
+ if (inflictor->type == MT_LHRT)
+ return;
+
if (player->powers[pw_shield] || player->bot) //If One-Hit Shield
{
P_RemoveShield(player);
@@ -3440,7 +3458,7 @@ void P_SpecialStageDamage(player_t *player, mobj_t *inflictor, mobj_t *source)
P_DoPlayerPain(player, inflictor, source);
- if (gametype == GT_CTF && player->gotflag & (GF_REDFLAG|GF_BLUEFLAG))
+ if ((gametyperules & GTR_TEAMFLAGS) && player->gotflag & (GF_REDFLAG|GF_BLUEFLAG))
P_PlayerFlagBurst(player, false);
if (oldnightstime > 10*TICRATE
@@ -3591,7 +3609,7 @@ boolean P_DamageMobj(mobj_t *target, mobj_t *inflictor, mobj_t *source, INT32 da
{
if (source == target)
return false; // Don't hit yourself with your own paraloop, baka
- if (source && source->player && !cv_friendlyfire.value
+ if (source && source->player && !(cv_friendlyfire.value || (gametyperules & GTR_FRIENDLYFIRE))
&& (gametype == GT_COOP
|| (G_GametypeHasTeams() && player->ctfteam == source->player->ctfteam)))
return false; // Don't run eachother over in special stages and team games and such
@@ -3686,7 +3704,7 @@ boolean P_DamageMobj(mobj_t *target, mobj_t *inflictor, mobj_t *source, INT32 da
// by friendly fire. Spilling their rings and other items is enough.
else if (!force && G_GametypeHasTeams()
&& source && source->player && (source->player->ctfteam == player->ctfteam)
- && cv_friendlyfire.value)
+ && (cv_friendlyfire.value || (gametyperules & GTR_FRIENDLYFIRE)))
{
damage = 0;
P_ShieldDamage(player, inflictor, source, damage, damagetype);
diff --git a/src/p_map.c b/src/p_map.c
index 2d36f747cc21bd8e96a2dcfbbd0b94d6c0bfb8a6..1b6f23cdefad839512185180d57b3f161b7c8b94 100644
--- a/src/p_map.c
+++ b/src/p_map.c
@@ -615,7 +615,7 @@ static void P_DoTailsCarry(player_t *sonic, player_t *tails)
// Why block opposing teams from tailsflying each other?
// Sneaking into the hands of a flying tails player in Race might be a viable strategy, who knows.
/*
- if (gametype == GT_RACE || gametype == GT_COMPETITION
+ if ((gametyperules & GTR_RACE)
|| (netgame && (tails->spectator || sonic->spectator))
|| (G_TagGametype() && (!(tails->pflags & PF_TAGIT) != !(sonic->pflags & PF_TAGIT)))
|| (gametype == GT_MATCH)
diff --git a/src/p_mobj.c b/src/p_mobj.c
index ef6be4844ddcd5d04e926c90d0d85a392dcc1b92..75bc174a523b2be156dc9d94520b33c99fe59667 100644
--- a/src/p_mobj.c
+++ b/src/p_mobj.c
@@ -7143,2901 +7143,3054 @@ static void P_PyreFlyBurn(mobj_t *mobj, fixed_t hoffs, INT16 vrange, mobjtype_t
particle->momz = momz;
}
-//
-// P_MobjThinker
-//
-void P_MobjThinker(mobj_t *mobj)
+static void P_MobjScaleThink(mobj_t *mobj)
{
- I_Assert(mobj != NULL);
- I_Assert(!P_MobjWasRemoved(mobj));
-
- if (mobj->flags & MF_NOTHINK)
- return;
-
- if ((mobj->flags & MF_BOSS) && mobj->spawnpoint && (bossdisabled & (1<<mobj->spawnpoint->extrainfo)))
- return;
+ fixed_t oldheight = mobj->height;
+ UINT8 correctionType = 0; // Don't correct Z position, just gain height
- // Remove dead target/tracer.
- if (mobj->target && P_MobjWasRemoved(mobj->target))
- P_SetTarget(&mobj->target, NULL);
- if (mobj->tracer && P_MobjWasRemoved(mobj->tracer))
- P_SetTarget(&mobj->tracer, NULL);
- if (mobj->hnext && P_MobjWasRemoved(mobj->hnext))
- P_SetTarget(&mobj->hnext, NULL);
- if (mobj->hprev && P_MobjWasRemoved(mobj->hprev))
- P_SetTarget(&mobj->hprev, NULL);
+ if ((mobj->flags & MF_NOCLIPHEIGHT || (mobj->z > mobj->floorz && mobj->z + mobj->height < mobj->ceilingz))
+ && mobj->type != MT_EGGMOBILE_FIRE)
+ correctionType = 1; // Correct Z position by centering
+ else if (mobj->eflags & MFE_VERTICALFLIP)
+ correctionType = 2; // Correct Z position by moving down
+
+ if (abs(mobj->scale - mobj->destscale) < mobj->scalespeed)
+ P_SetScale(mobj, mobj->destscale);
+ else if (mobj->scale < mobj->destscale)
+ P_SetScale(mobj, mobj->scale + mobj->scalespeed);
+ else if (mobj->scale > mobj->destscale)
+ P_SetScale(mobj, mobj->scale - mobj->scalespeed);
+
+ if (correctionType == 1)
+ mobj->z -= (mobj->height - oldheight)/2;
+ else if (correctionType == 2)
+ mobj->z -= mobj->height - oldheight;
+
+ if (mobj->scale == mobj->destscale)
+ /// \todo Lua hook for "reached destscale"?
+ switch (mobj->type)
+ {
+ case MT_EGGMOBILE_FIRE:
+ mobj->destscale = FRACUNIT;
+ mobj->scalespeed = FRACUNIT>>4;
+ break;
+ default:
+ break;
+ }
+}
- mobj->eflags &= ~(MFE_PUSHED|MFE_SPRUNG);
+static void P_MaceSceneryThink(mobj_t *mobj)
+{
+ angle_t oldmovedir = mobj->movedir;
- tmfloorthing = tmhitthing = NULL;
+ // Always update movedir to prevent desyncing (in the traditional sense, not the netplay sense).
+ mobj->movedir = (mobj->movedir + mobj->lastlook) & FINEMASK;
- // 970 allows ANY mobj to trigger a linedef exec
- if (mobj->subsector && GETSECSPECIAL(mobj->subsector->sector->special, 2) == 8)
+ // If too far away and not deliberately spitting in the face of optimisation, don't think!
+ if (!(mobj->flags2 & MF2_BOSSNOTRAP))
{
- sector_t *sec2;
-
- sec2 = P_ThingOnSpecial3DFloor(mobj);
- if (sec2 && GETSECSPECIAL(sec2->special, 2) == 1)
- P_LinedefExecute(sec2->tag, mobj, sec2);
- }
+ UINT8 i;
+ // Quick! Look through players! Don't move unless a player is relatively close by.
+ // The below is selected based on CEZ2's first room. I promise you it is a coincidence that it looks like the weed number.
+ for (i = 0; i < MAXPLAYERS; ++i)
+ if (playeringame[i] && players[i].mo
+ && P_AproxDistance(P_AproxDistance(mobj->x - players[i].mo->x, mobj->y - players[i].mo->y), mobj->z - players[i].mo->z) < (4200 << FRACBITS))
+ break; // Stop looking.
+ if (i == MAXPLAYERS)
+ {
+ if (!(mobj->flags2 & MF2_BEYONDTHEGRAVE))
+ {
+ mobj_t *ref = mobj;
- // Slowly scale up/down to reach your destscale.
- if (mobj->scale != mobj->destscale)
- {
- fixed_t oldheight = mobj->height;
- UINT8 correctionType = 0; // Don't correct Z position, just gain height
+ // stop/hide all your babies
+ while ((ref = ref->hnext))
+ {
+ ref->eflags = (((ref->flags & MF_NOTHINK) ? 0 : 1)
+ | ((ref->flags & MF_NOCLIPTHING) ? 0 : 2)
+ | ((ref->flags2 & MF2_DONTDRAW) ? 0 : 4)); // oh my god this is nasty.
+ ref->flags |= MF_NOTHINK|MF_NOCLIPTHING;
+ ref->flags2 |= MF2_DONTDRAW;
+ ref->momx = ref->momy = ref->momz = 0;
+ }
- if ((mobj->flags & MF_NOCLIPHEIGHT || (mobj->z > mobj->floorz && mobj->z + mobj->height < mobj->ceilingz))
- && mobj->type != MT_EGGMOBILE_FIRE)
- correctionType = 1; // Correct Z position by centering
- else if (mobj->eflags & MFE_VERTICALFLIP)
- correctionType = 2; // Correct Z position by moving down
-
- if (abs(mobj->scale - mobj->destscale) < mobj->scalespeed)
- P_SetScale(mobj, mobj->destscale);
- else if (mobj->scale < mobj->destscale)
- P_SetScale(mobj, mobj->scale + mobj->scalespeed);
- else if (mobj->scale > mobj->destscale)
- P_SetScale(mobj, mobj->scale - mobj->scalespeed);
-
- if (correctionType == 1)
- mobj->z -= (mobj->height - oldheight)/2;
- else if (correctionType == 2)
- mobj->z -= mobj->height - oldheight;
+ mobj->flags2 |= MF2_BEYONDTHEGRAVE;
+ }
+ return; // don't make bubble!
+ }
+ else if (mobj->flags2 & MF2_BEYONDTHEGRAVE)
+ {
+ mobj_t *ref = mobj;
- if (mobj->scale == mobj->destscale)
- /// \todo Lua hook for "reached destscale"?
- switch(mobj->type)
+ // start/show all your babies
+ while ((ref = ref->hnext))
{
- case MT_EGGMOBILE_FIRE:
- mobj->destscale = FRACUNIT;
- mobj->scalespeed = FRACUNIT>>4;
- break;
- default:
- break;
+ if (ref->eflags & 1)
+ ref->flags &= ~MF_NOTHINK;
+ if (ref->eflags & 2)
+ ref->flags &= ~MF_NOCLIPTHING;
+ if (ref->eflags & 4)
+ ref->flags2 &= ~MF2_DONTDRAW;
+ ref->eflags = 0; // le sign
}
- }
- if ((mobj->type == MT_GHOST || mobj->type == MT_THOK) && mobj->fuse > 0) // Not guaranteed to be MF_SCENERY or not MF_SCENERY!
- {
- if (mobj->flags2 & MF2_BOSSNOTRAP) // "fast" flag
- {
- if ((signed)((mobj->frame & FF_TRANSMASK) >> FF_TRANSSHIFT) < (NUMTRANSMAPS-1) - (2*mobj->fuse)/3)
- // fade out when nearing the end of fuse...
- mobj->frame = (mobj->frame & ~FF_TRANSMASK) | (((NUMTRANSMAPS-1) - (2*mobj->fuse)/3) << FF_TRANSSHIFT);
- }
- else
- {
- if ((signed)((mobj->frame & FF_TRANSMASK) >> FF_TRANSSHIFT) < (NUMTRANSMAPS-1) - mobj->fuse / 2)
- // fade out when nearing the end of fuse...
- mobj->frame = (mobj->frame & ~FF_TRANSMASK) | (((NUMTRANSMAPS-1) - mobj->fuse / 2) << FF_TRANSSHIFT);
+ mobj->flags2 &= ~MF2_BEYONDTHEGRAVE;
}
}
- // Special thinker for scenery objects
- if (mobj->flags & MF_SCENERY)
- {
-#ifdef HAVE_BLUA
- if (LUAh_MobjThinker(mobj))
- return;
- if (P_MobjWasRemoved(mobj))
- return;
-#endif
+ // Okay, time to MOVE
+ P_MaceRotate(mobj, mobj->movedir, oldmovedir);
+}
- if (mobj->flags2 & MF2_SHIELD)
- if (!P_AddShield(mobj))
- return;
+static boolean P_DrownNumbersSceneryThink(mobj_t *mobj)
+{
+ if (!mobj->target)
+ {
+ P_RemoveMobj(mobj);
+ return false;
+ }
+ if (!mobj->target->player || !(mobj->target->player->powers[pw_underwater] || mobj->target->player->powers[pw_spacetime]))
+ {
+ P_RemoveMobj(mobj);
+ return false;
+ }
+ mobj->x = mobj->target->x;
+ mobj->y = mobj->target->y;
- switch (mobj->type)
- {
- case MT_BOSSJUNK:
- mobj->flags2 ^= MF2_DONTDRAW;
- break;
- case MT_MACEPOINT:
- case MT_CHAINMACEPOINT:
- case MT_SPRINGBALLPOINT:
- case MT_CHAINPOINT:
- case MT_FIREBARPOINT:
- case MT_CUSTOMMACEPOINT:
- case MT_HIDDEN_SLING:
- {
- angle_t oldmovedir = mobj->movedir;
+ mobj->destscale = mobj->target->destscale;
+ P_SetScale(mobj, mobj->target->scale);
- // Always update movedir to prevent desyncing (in the traditional sense, not the netplay sense).
- mobj->movedir = (mobj->movedir + mobj->lastlook) & FINEMASK;
+ if (mobj->target->eflags & MFE_VERTICALFLIP)
+ {
+ mobj->z = mobj->target->z - FixedMul(16*FRACUNIT, mobj->target->scale) - mobj->height;
+ if (mobj->target->player->pflags & PF_FLIPCAM)
+ mobj->eflags |= MFE_VERTICALFLIP;
+ }
+ else
+ mobj->z = mobj->target->z + (mobj->target->height) + FixedMul(8*FRACUNIT, mobj->target->scale); // Adjust height for height changes
- // If too far away and not deliberately spitting in the face of optimisation, don't think!
- if (!(mobj->flags2 & MF2_BOSSNOTRAP))
- {
- UINT8 i;
- // Quick! Look through players! Don't move unless a player is relatively close by.
- // The below is selected based on CEZ2's first room. I promise you it is a coincidence that it looks like the weed number.
- for (i = 0; i < MAXPLAYERS; ++i)
- if (playeringame[i] && players[i].mo
- && P_AproxDistance(P_AproxDistance(mobj->x - players[i].mo->x, mobj->y - players[i].mo->y), mobj->z - players[i].mo->z) < (4200<<FRACBITS))
- break; // Stop looking.
- if (i == MAXPLAYERS)
- {
- if (!(mobj->flags2 & MF2_BEYONDTHEGRAVE))
- {
- mobj_t *ref = mobj;
+ if (mobj->threshold <= 35)
+ mobj->flags2 |= MF2_DONTDRAW;
+ else
+ mobj->flags2 &= ~MF2_DONTDRAW;
+ if (mobj->threshold <= 30)
+ mobj->threshold = 40;
+ mobj->threshold--;
+ return true;
+}
- // stop/hide all your babies
- while ((ref = ref->hnext))
- {
- ref->eflags = (((ref->flags & MF_NOTHINK) ? 0 : 1)
- | ((ref->flags & MF_NOCLIPTHING) ? 0 : 2)
- | ((ref->flags2 & MF2_DONTDRAW) ? 0 : 4)); // oh my god this is nasty.
- ref->flags |= MF_NOTHINK|MF_NOCLIPTHING;
- ref->flags2 |= MF2_DONTDRAW;
- ref->momx = ref->momy = ref->momz = 0;
- }
+static void P_FlameJetSceneryThink(mobj_t *mobj)
+{
+ mobj_t *flame;
+ fixed_t strength;
- mobj->flags2 |= MF2_BEYONDTHEGRAVE;
- }
+ if (!(mobj->flags2 & MF2_FIRING))
+ return;
- break; // don't make bubble!
- }
- else if (mobj->flags2 & MF2_BEYONDTHEGRAVE)
- {
- mobj_t *ref = mobj;
+ if ((leveltime & 3) == 0)
+ return;
- // start/show all your babies
- while ((ref = ref->hnext))
- {
- if (ref->eflags & 1)
- ref->flags &= ~MF_NOTHINK;
- if (ref->eflags & 2)
- ref->flags &= ~MF_NOCLIPTHING;
- if (ref->eflags & 4)
- ref->flags2 &= ~MF2_DONTDRAW;
- ref->eflags = 0; // le sign
- }
+ // Wave the flames back and forth. Reactiontime determines which direction it's going.
+ if (mobj->fuse <= -16)
+ mobj->reactiontime = 1;
+ else if (mobj->fuse >= 16)
+ mobj->reactiontime = 0;
- mobj->flags2 &= ~MF2_BEYONDTHEGRAVE;
- }
- }
+ if (mobj->reactiontime)
+ mobj->fuse += 2;
+ else
+ mobj->fuse -= 2;
- // Okay, time to MOVE
- P_MaceRotate(mobj, mobj->movedir, oldmovedir);
- }
- break;
- case MT_HOOP:
- if (mobj->fuse > 1)
- P_MoveHoop(mobj);
- else if (mobj->fuse == 1)
- mobj->movecount = 1;
+ flame = P_SpawnMobj(mobj->x, mobj->y, mobj->z, MT_FLAMEJETFLAME);
+ P_SetMobjState(flame, S_FLAMEJETFLAME4);
- if (mobj->movecount)
- {
- mobj->fuse++;
+ flame->angle = mobj->angle;
- if (mobj->fuse > 32)
- {
- // Don't kill the hoop center. For the sake of respawning.
- //if (mobj->target)
- // P_RemoveMobj(mobj->target);
+ if (mobj->flags2 & MF2_AMBUSH) // Wave up and down instead of side-to-side
+ flame->momz = mobj->fuse << (FRACBITS - 2);
+ else
+ flame->angle += FixedAngle(mobj->fuse<<FRACBITS);
- P_RemoveMobj(mobj);
- }
- }
- else
- mobj->fuse--;
- return;
- case MT_NIGHTSPARKLE:
- if (mobj->tics != -1)
- {
- mobj->tics--;
+ strength = 20*FRACUNIT;
+ strength -= ((20*FRACUNIT)/16)*mobj->movedir;
- // you can cycle through multiple states in a tic
- if (!mobj->tics)
- if (!P_SetMobjState(mobj, mobj->state->nextstate))
- return; // freed itself
- }
+ P_InstaThrust(flame, flame->angle, strength);
+ S_StartSound(flame, sfx_fire);
+}
- P_UnsetThingPosition(mobj);
- mobj->x += mobj->momx;
- mobj->y += mobj->momy;
- mobj->z += mobj->momz;
- P_SetThingPosition(mobj);
- return;
- case MT_NIGHTSLOOPHELPER:
- if (--mobj->tics <= 0)
- P_RemoveMobj(mobj);
+static void P_VerticalFlameJetSceneryThink(mobj_t *mobj)
+{
+ mobj_t *flame;
+ fixed_t strength;
- // Don't touch my fuse!
- return;
- case MT_OVERLAY:
- if (!mobj->target)
- {
- P_RemoveMobj(mobj);
- return;
- }
- else
- P_AddOverlay(mobj);
- break;
- case MT_PITY_ORB:
- case MT_WHIRLWIND_ORB:
- case MT_ARMAGEDDON_ORB:
- if (!(mobj->flags2 & MF2_SHIELD))
- return;
- break;
- case MT_ATTRACT_ORB:
- if (!(mobj->flags2 & MF2_SHIELD))
- return;
- if (/*(mobj->target) -- the following is implicit by P_AddShield
- && (mobj->target->player)
- && */ (mobj->target->player->homing) && (mobj->target->player->pflags & PF_SHIELDABILITY))
- {
- P_SetMobjState(mobj, mobj->info->painstate);
- mobj->tics++;
- }
- break;
- case MT_ELEMENTAL_ORB:
- if (!(mobj->flags2 & MF2_SHIELD))
- return;
- if (mobj->tracer
- /* && mobj->target -- the following is implicit by P_AddShield
- && mobj->target->player
- && (mobj->target->player->powers[pw_shield] & SH_NOSTACK) == SH_ELEMENTAL */
- && mobj->target->player->pflags & PF_SHIELDABILITY
- && ((statenum_t)(mobj->tracer->state-states) < mobj->info->raisestate
- || (mobj->tracer->state->nextstate < mobj->info->raisestate && mobj->tracer->tics == 1)))
- {
- P_SetMobjState(mobj, mobj->info->painstate);
- mobj->tics++;
- P_SetMobjState(mobj->tracer, mobj->info->raisestate);
- mobj->tracer->tics++;
- }
- break;
- case MT_FORCE_ORB:
- if (!(mobj->flags2 & MF2_SHIELD))
- return;
- if (/*
- && mobj->target -- the following is implicit by P_AddShield
- && mobj->target->player
- && (mobj->target->player->powers[pw_shield] & SH_FORCE)
- && */ (mobj->target->player->pflags & PF_SHIELDABILITY))
- {
- mobj_t *whoosh = P_SpawnMobjFromMobj(mobj, 0, 0, 0, MT_GHOST); // done here so the offset is correct
- P_SetMobjState(whoosh, mobj->info->raisestate);
- whoosh->destscale = whoosh->scale<<1;
- whoosh->scalespeed = FixedMul(whoosh->scalespeed, whoosh->scale);
- whoosh->height = 38*whoosh->scale;
- whoosh->fuse = 10;
- whoosh->flags |= MF_NOCLIPHEIGHT;
- whoosh->momz = mobj->target->momz; // Stay reasonably centered for a few frames
- mobj->target->player->pflags &= ~PF_SHIELDABILITY; // prevent eternal whoosh
- }
- /* FALLTHRU */
- case MT_FLAMEAURA_ORB:
- if (!(mobj->flags2 & MF2_SHIELD))
- return;
- if ((statenum_t)(mobj->state-states) < mobj->info->painstate)
- mobj->angle = mobj->target->angle; // implicitly okay because of P_AddShield
- if (mobj->tracer
- /* && mobj->target -- the following is implicit by P_AddShield
- && mobj->target->player
- && (mobj->target->player->powers[pw_shield] & SH_NOSTACK) == SH_FLAMEAURA */
- && mobj->target->player->pflags & PF_SHIELDABILITY
- && ((statenum_t)(mobj->tracer->state-states) < mobj->info->raisestate
- || (mobj->tracer->state->nextstate < mobj->info->raisestate && mobj->tracer->tics == 1)))
- {
- P_SetMobjState(mobj, mobj->info->painstate);
- mobj->tics++;
- P_SetMobjState(mobj->tracer, mobj->info->raisestate);
- mobj->tracer->tics++;
- }
- break;
- case MT_BUBBLEWRAP_ORB:
- if (!(mobj->flags2 & MF2_SHIELD))
- return;
- if (mobj->tracer
- /* && mobj->target -- the following is implicit by P_AddShield
- && mobj->target->player
- && (mobj->target->player->powers[pw_shield] & SH_NOSTACK) == SH_BUBBLEWRAP */
- )
- {
- if (mobj->target->player->pflags & PF_SHIELDABILITY
- && ((statenum_t)(mobj->state-states) < mobj->info->painstate
- || (mobj->state->nextstate < mobj->info->painstate && mobj->tics == 1)))
- {
- P_SetMobjState(mobj, mobj->info->painstate);
- mobj->tics++;
- P_SetMobjState(mobj->tracer, mobj->info->raisestate);
- mobj->tracer->tics++;
- }
- else if (mobj->target->eflags & MFE_JUSTHITFLOOR
- && (statenum_t)(mobj->state-states) == mobj->info->painstate)
- {
- P_SetMobjState(mobj, mobj->info->painstate+1);
- mobj->tics++;
- P_SetMobjState(mobj->tracer, mobj->info->raisestate+1);
- mobj->tracer->tics++;
- }
- }
- break;
- case MT_THUNDERCOIN_ORB:
- if (!(mobj->flags2 & MF2_SHIELD))
- return;
- if (mobj->tracer
- /* && mobj->target -- the following is implicit by P_AddShield
- && mobj->target->player
- && (mobj->target->player->powers[pw_shield] & SH_NOSTACK) == SH_THUNDERCOIN */
- && (mobj->target->player->pflags & PF_SHIELDABILITY))
- {
- P_SetMobjState(mobj, mobj->info->painstate);
- mobj->tics++;
- P_SetMobjState(mobj->tracer, mobj->info->raisestate);
- mobj->tracer->tics++;
- mobj->target->player->pflags &= ~PF_SHIELDABILITY; // prevent eternal spark
- }
- break;
- case MT_WATERDROP:
- P_SceneryCheckWater(mobj);
- if ((mobj->z <= mobj->floorz || mobj->z <= mobj->watertop)
- && mobj->health > 0)
- {
- mobj->health = 0;
- P_SetMobjState(mobj, mobj->info->deathstate);
- S_StartSound(mobj, mobj->info->deathsound+P_RandomKey(mobj->info->mass));
- return;
- }
- break;
- case MT_BUBBLES:
- P_SceneryCheckWater(mobj);
- break;
- case MT_SMALLBUBBLE:
- case MT_MEDIUMBUBBLE:
- case MT_EXTRALARGEBUBBLE: // start bubble dissipate
- P_SceneryCheckWater(mobj);
- if (P_MobjWasRemoved(mobj)) // bubble was removed by not being in water
- return;
- if (!(mobj->eflags & MFE_UNDERWATER)
- || (!(mobj->eflags & MFE_VERTICALFLIP) && mobj->z + mobj->height >= mobj->ceilingz)
- || (mobj->eflags & MFE_VERTICALFLIP && mobj->z <= mobj->floorz)
- || (P_CheckDeathPitCollide(mobj))
- || --mobj->fuse <= 0) // Bubbles eventually dissipate if they can't reach the surface.
- {
- // no playing sound: no point; the object is being removed
- P_RemoveMobj(mobj);
- return;
- }
- break;
- case MT_LOCKON:
- if (!mobj->target)
- {
- P_RemoveMobj(mobj);
- return;
- }
+ if (!(mobj->flags2 & MF2_FIRING))
+ return;
- mobj->flags2 &= ~MF2_DONTDRAW;
+ if ((leveltime & 3) == 0)
+ return;
- mobj->x = mobj->target->x;
- mobj->y = mobj->target->y;
+ // Wave the flames back and forth. Reactiontime determines which direction it's going.
+ if (mobj->fuse <= -16)
+ mobj->reactiontime = 1;
+ else if (mobj->fuse >= 16)
+ mobj->reactiontime = 0;
- mobj->eflags |= (mobj->target->eflags & MFE_VERTICALFLIP);
+ if (mobj->reactiontime)
+ mobj->fuse++;
+ else
+ mobj->fuse--;
- mobj->destscale = mobj->target->destscale;
- P_SetScale(mobj, mobj->target->scale);
+ flame = P_SpawnMobj(mobj->x, mobj->y, mobj->z, MT_FLAMEJETFLAME);
- if (!(mobj->eflags & MFE_VERTICALFLIP))
- mobj->z = mobj->target->z + mobj->target->height + FixedMul((16 + abs((signed)(leveltime % TICRATE) - TICRATE/2))*FRACUNIT, mobj->target->scale);
- else
- mobj->z = mobj->target->z - FixedMul((16 + abs((signed)(leveltime % TICRATE) - TICRATE/2))*FRACUNIT, mobj->target->scale) - mobj->height;
- break;
- case MT_LOCKONINF:
- if (!(mobj->flags2 & MF2_STRONGBOX))
- {
- mobj->threshold = mobj->z;
- mobj->flags2 |= MF2_STRONGBOX;
- }
- if (!(mobj->eflags & MFE_VERTICALFLIP))
- mobj->z = mobj->threshold + FixedMul((16 + abs((signed)(leveltime % TICRATE) - TICRATE/2))*FRACUNIT, mobj->scale);
- else
- mobj->z = mobj->threshold - FixedMul((16 + abs((signed)(leveltime % TICRATE) - TICRATE/2))*FRACUNIT, mobj->scale);
- break;
- case MT_DROWNNUMBERS:
- if (!mobj->target)
- {
- P_RemoveMobj(mobj);
- return;
- }
- if (!mobj->target->player || !(mobj->target->player->powers[pw_underwater] || mobj->target->player->powers[pw_spacetime]))
- {
- P_RemoveMobj(mobj);
- return;
- }
- mobj->x = mobj->target->x;
- mobj->y = mobj->target->y;
+ strength = 20*FRACUNIT;
+ strength -= ((20*FRACUNIT)/16)*mobj->movedir;
- mobj->destscale = mobj->target->destscale;
- P_SetScale(mobj, mobj->target->scale);
+ // If deaf'd, the object spawns on the ceiling.
+ if (mobj->flags2 & MF2_AMBUSH)
+ {
+ mobj->z = mobj->ceilingz - mobj->height;
+ flame->momz = -strength;
+ }
+ else
+ {
+ flame->momz = strength;
+ P_SetMobjState(flame, S_FLAMEJETFLAME7);
+ }
+ P_InstaThrust(flame, mobj->angle, FixedDiv(mobj->fuse*FRACUNIT, 3*FRACUNIT));
+ S_StartSound(flame, sfx_fire);
+}
- if (mobj->target->eflags & MFE_VERTICALFLIP)
- {
- mobj->z = mobj->target->z - FixedMul(16*FRACUNIT, mobj->target->scale) - mobj->height;
- if (mobj->target->player->pflags & PF_FLIPCAM)
- mobj->eflags |= MFE_VERTICALFLIP;
- }
- else
- mobj->z = mobj->target->z + (mobj->target->height) + FixedMul(8*FRACUNIT, mobj->target->scale); // Adjust height for height changes
+static boolean P_ParticleGenSceneryThink(mobj_t *mobj)
+{
+ if (!mobj->lastlook)
+ return false;
- if (mobj->threshold <= 35)
- mobj->flags2 |= MF2_DONTDRAW;
- else
- mobj->flags2 &= ~MF2_DONTDRAW;
- if (mobj->threshold <= 30)
- mobj->threshold = 40;
- mobj->threshold--;
- break;
- case MT_FLAMEJET:
- if ((mobj->flags2 & MF2_FIRING) && (leveltime & 3) == 0)
- {
- mobj_t *flame;
- fixed_t strength;
+ if (!mobj->threshold)
+ return false;
- // Wave the flames back and forth. Reactiontime determines which direction it's going.
- if (mobj->fuse <= -16)
- mobj->reactiontime = 1;
- else if (mobj->fuse >= 16)
- mobj->reactiontime = 0;
+ if (--mobj->fuse <= 0)
+ {
+ INT32 i = 0;
+ mobj_t *spawn;
+ fixed_t bottomheight, topheight;
+ INT32 type = mobj->threshold, line = mobj->cvmem;
- if (mobj->reactiontime)
- mobj->fuse += 2;
- else
- mobj->fuse -= 2;
+ mobj->fuse = (tic_t)mobj->reactiontime;
- flame = P_SpawnMobj(mobj->x, mobj->y, mobj->z, MT_FLAMEJETFLAME);
- P_SetMobjState(flame, S_FLAMEJETFLAME4);
+ bottomheight = lines[line].frontsector->floorheight;
+ topheight = lines[line].frontsector->ceilingheight - mobjinfo[(mobjtype_t)type].height;
- flame->angle = mobj->angle;
+ if (mobj->waterbottom != bottomheight || mobj->watertop != topheight)
+ {
+ if (mobj->movefactor && (topheight > bottomheight))
+ mobj->health = (tic_t)(FixedDiv((topheight - bottomheight), abs(mobj->movefactor)) >> FRACBITS);
+ else
+ mobj->health = 0;
- if (mobj->flags2 & MF2_AMBUSH) // Wave up and down instead of side-to-side
- flame->momz = mobj->fuse << (FRACBITS-2);
- else
- flame->angle += FixedAngle(mobj->fuse*FRACUNIT);
+ mobj->z = ((mobj->flags2 & MF2_OBJECTFLIP) ? topheight : bottomheight);
+ }
- strength = 20*FRACUNIT;
- strength -= ((20*FRACUNIT)/16)*mobj->movedir;
+ if (!mobj->health)
+ return false;
- P_InstaThrust(flame, flame->angle, strength);
- S_StartSound(flame, sfx_fire);
- }
- break;
- case MT_VERTICALFLAMEJET:
- if ((mobj->flags2 & MF2_FIRING) && (leveltime & 3) == 0)
- {
- mobj_t *flame;
- fixed_t strength;
+ for (i = 0; i < mobj->lastlook; i++)
+ {
+ spawn = P_SpawnMobj(
+ mobj->x + FixedMul(FixedMul(mobj->friction, mobj->scale), FINECOSINE(mobj->angle >> ANGLETOFINESHIFT)),
+ mobj->y + FixedMul(FixedMul(mobj->friction, mobj->scale), FINESINE(mobj->angle >> ANGLETOFINESHIFT)),
+ mobj->z,
+ (mobjtype_t)mobj->threshold);
+ P_SetScale(spawn, mobj->scale);
+ spawn->momz = FixedMul(mobj->movefactor, spawn->scale);
+ spawn->destscale = spawn->scale/100;
+ spawn->scalespeed = spawn->scale/mobj->health;
+ spawn->tics = (tic_t)mobj->health;
+ spawn->flags2 |= (mobj->flags2 & MF2_OBJECTFLIP);
+ spawn->angle += P_RandomKey(36)*ANG10; // irrelevant for default objects but might make sense for some custom ones
- // Wave the flames back and forth. Reactiontime determines which direction it's going.
- if (mobj->fuse <= -16)
- mobj->reactiontime = 1;
- else if (mobj->fuse >= 16)
- mobj->reactiontime = 0;
+ mobj->angle += mobj->movedir;
+ }
- if (mobj->reactiontime)
- mobj->fuse++;
- else
- mobj->fuse--;
+ mobj->angle += (angle_t)mobj->movecount;
+ }
- flame = P_SpawnMobj(mobj->x, mobj->y, mobj->z, MT_FLAMEJETFLAME);
+ return true;
+}
- strength = 20*FRACUNIT;
- strength -= ((20*FRACUNIT)/16)*mobj->movedir;
+static void P_RosySceneryThink(mobj_t *mobj)
+{
+ UINT8 i;
+ fixed_t pdist = 1700*mobj->scale, work, actualwork;
+ player_t *player = NULL;
+ statenum_t stat = (mobj->state - states);
+ for (i = 0; i < MAXPLAYERS; i++)
+ {
+ if (!playeringame[i])
+ continue;
+ if (!players[i].mo)
+ continue;
+ if (players[i].bot)
+ continue;
+ if (!players[i].mo->health)
+ continue;
+ actualwork = work = FixedHypot(mobj->x - players[i].mo->x, mobj->y - players[i].mo->y);
+ if (player)
+ {
+ if (players[i].skin == 0 || players[i].skin == 5)
+ work = (2*work)/3;
+ if (work >= pdist)
+ continue;
+ }
+ pdist = actualwork;
+ player = &players[i];
+ }
- // If deaf'd, the object spawns on the ceiling.
- if (mobj->flags2 & MF2_AMBUSH)
- {
- mobj->z = mobj->ceilingz-mobj->height;
- flame->momz = -strength;
- }
- else
- {
- flame->momz = strength;
- P_SetMobjState(flame, S_FLAMEJETFLAME7);
- }
- P_InstaThrust(flame, mobj->angle, FixedDiv(mobj->fuse*FRACUNIT,3*FRACUNIT));
- S_StartSound(flame, sfx_fire);
- }
- break;
- case MT_FLICKY_01_CENTER:
- case MT_FLICKY_02_CENTER:
- case MT_FLICKY_03_CENTER:
- case MT_FLICKY_04_CENTER:
- case MT_FLICKY_05_CENTER:
- case MT_FLICKY_06_CENTER:
- case MT_FLICKY_07_CENTER:
- case MT_FLICKY_08_CENTER:
- case MT_FLICKY_09_CENTER:
- case MT_FLICKY_10_CENTER:
- case MT_FLICKY_11_CENTER:
- case MT_FLICKY_12_CENTER:
- case MT_FLICKY_13_CENTER:
- case MT_FLICKY_14_CENTER:
- case MT_FLICKY_15_CENTER:
- case MT_FLICKY_16_CENTER:
- case MT_SECRETFLICKY_01_CENTER:
- case MT_SECRETFLICKY_02_CENTER:
- if (mobj->tracer && (mobj->flags & MF_NOCLIPTHING)
- && (mobj->flags & MF_GRENADEBOUNCE))
- // for now: only do this bounce routine if flicky is in-place. \todo allow in all movements
- {
- if (!(mobj->tracer->flags2 & MF2_OBJECTFLIP) && mobj->tracer->z <= mobj->tracer->floorz)
- mobj->tracer->momz = 7*FRACUNIT;
- else if ((mobj->tracer->flags2 & MF2_OBJECTFLIP) && mobj->tracer->z >= mobj->tracer->ceilingz - mobj->tracer->height)
- mobj->tracer->momz = -7*FRACUNIT;
- }
- break;
- case MT_SEED:
- if (P_MobjFlip(mobj)*mobj->momz < mobj->info->speed)
- mobj->momz = P_MobjFlip(mobj)*mobj->info->speed;
- break;
- case MT_ROCKCRUMBLE1:
- case MT_ROCKCRUMBLE2:
- case MT_ROCKCRUMBLE3:
- case MT_ROCKCRUMBLE4:
- case MT_ROCKCRUMBLE5:
- case MT_ROCKCRUMBLE6:
- case MT_ROCKCRUMBLE7:
- case MT_ROCKCRUMBLE8:
- case MT_ROCKCRUMBLE9:
- case MT_ROCKCRUMBLE10:
- case MT_ROCKCRUMBLE11:
- case MT_ROCKCRUMBLE12:
- case MT_ROCKCRUMBLE13:
- case MT_ROCKCRUMBLE14:
- case MT_ROCKCRUMBLE15:
- case MT_ROCKCRUMBLE16:
- case MT_WOODDEBRIS:
- case MT_BRICKDEBRIS:
- case MT_BROKENROBOT:
- if (mobj->z <= P_FloorzAtPos(mobj->x, mobj->y, mobj->z, mobj->height)
- && mobj->state != &states[mobj->info->deathstate])
- {
- P_SetMobjState(mobj, mobj->info->deathstate);
- return;
- }
- break;
- case MT_PARTICLEGEN:
- if (!mobj->lastlook)
- return;
-
- if (!mobj->threshold)
- return;
-
- if (--mobj->fuse <= 0)
- {
- INT32 i = 0;
- mobj_t *spawn;
- fixed_t bottomheight, topheight;
- INT32 type = mobj->threshold, line = mobj->cvmem;
-
- mobj->fuse = (tic_t)mobj->reactiontime;
-
- bottomheight = lines[line].frontsector->floorheight;
- topheight = lines[line].frontsector->ceilingheight - mobjinfo[(mobjtype_t)type].height;
-
- if (mobj->waterbottom != bottomheight || mobj->watertop != topheight)
- {
- if (mobj->movefactor && (topheight > bottomheight))
- mobj->health = (tic_t)(FixedDiv((topheight - bottomheight), abs(mobj->movefactor)) >> FRACBITS);
- else
- mobj->health = 0;
-
- mobj->z = ((mobj->flags2 & MF2_OBJECTFLIP) ? topheight : bottomheight);
- }
-
- if (!mobj->health)
- return;
-
- for (i = 0; i < mobj->lastlook; i++)
- {
- spawn = P_SpawnMobj(
- mobj->x + FixedMul(FixedMul(mobj->friction, mobj->scale), FINECOSINE(mobj->angle>>ANGLETOFINESHIFT)),
- mobj->y + FixedMul(FixedMul(mobj->friction, mobj->scale), FINESINE(mobj->angle>>ANGLETOFINESHIFT)),
- mobj->z,
- (mobjtype_t)mobj->threshold);
- P_SetScale(spawn, mobj->scale);
- spawn->momz = FixedMul(mobj->movefactor, spawn->scale);
- spawn->destscale = spawn->scale/100;
- spawn->scalespeed = spawn->scale/mobj->health;
- spawn->tics = (tic_t)mobj->health;
- spawn->flags2 |= (mobj->flags2 & MF2_OBJECTFLIP);
- spawn->angle += P_RandomKey(36)*ANG10; // irrelevant for default objects but might make sense for some custom ones
-
- mobj->angle += mobj->movedir;
- }
-
- mobj->angle += (angle_t)mobj->movecount;
- }
- break;
- case MT_FSGNA:
- if (mobj->movedir)
- mobj->angle += mobj->movedir;
- break;
- case MT_ROSY:
- {
- UINT8 i;
- fixed_t pdist = 1700*mobj->scale, work, actualwork;
- player_t *player = NULL;
- statenum_t stat = (mobj->state-states);
- for (i = 0; i < MAXPLAYERS; i++)
- {
- if (!playeringame[i])
- continue;
- if (!players[i].mo)
- continue;
- if (players[i].bot)
- continue;
- if (!players[i].mo->health)
- continue;
- actualwork = work = FixedHypot(mobj->x-players[i].mo->x, mobj->y-players[i].mo->y);
- if (player)
- {
- if (players[i].skin == 0 || players[i].skin == 5)
- work = (2*work)/3;
- if (work >= pdist)
- continue;
- }
- pdist = actualwork;
- player = &players[i];
- }
-
- if (stat == S_ROSY_JUMP || stat == S_ROSY_PAIN)
- {
- if (P_IsObjectOnGround(mobj))
- {
- mobj->momx = mobj->momy = 0;
- if (player && mobj->cvmem < (-2*TICRATE))
- stat = S_ROSY_UNHAPPY;
- else
- stat = S_ROSY_WALK;
- P_SetMobjState(mobj, stat);
- }
- else if (P_MobjFlip(mobj)*mobj->momz < 0)
- mobj->frame = mobj->state->frame+mobj->state->var1;
- }
-
- if (!player)
- {
- if ((stat < S_ROSY_IDLE1 || stat > S_ROSY_IDLE4) && stat != S_ROSY_JUMP)
- {
- mobj->momx = mobj->momy = 0;
- P_SetMobjState(mobj, S_ROSY_IDLE1);
- }
- }
- else
- {
- boolean dojump = false, targonground, love, makeheart = false;
- if (mobj->target != player->mo)
- P_SetTarget(&mobj->target, player->mo);
- targonground = (P_IsObjectOnGround(mobj->target) && (player->panim == PA_IDLE || player->panim == PA_WALK || player->panim == PA_RUN));
- love = (player->skin == 0 || player->skin == 5);
-
- switch (stat)
- {
- case S_ROSY_IDLE1:
- case S_ROSY_IDLE2:
- case S_ROSY_IDLE3:
- case S_ROSY_IDLE4:
- dojump = true;
- break;
- case S_ROSY_JUMP:
- case S_ROSY_PAIN:
- // handled above
- break;
- case S_ROSY_WALK:
- {
- fixed_t x = mobj->x, y = mobj->y, z = mobj->z;
- angle_t angletoplayer = R_PointToAngle2(x, y, mobj->target->x, mobj->target->y);
- boolean allowed = P_TryMove(mobj, mobj->target->x, mobj->target->y, false);
-
- P_UnsetThingPosition(mobj);
- mobj->x = x;
- mobj->y = y;
- mobj->z = z;
- P_SetThingPosition(mobj);
-
- if (allowed)
- {
- fixed_t mom, max;
- P_Thrust(mobj, angletoplayer, (3*FRACUNIT)>>1);
- mom = FixedHypot(mobj->momx, mobj->momy);
- max = pdist;
- if ((--mobj->extravalue1) <= 0)
- {
- if (++mobj->frame > mobj->state->frame+mobj->state->var1)
- mobj->frame = mobj->state->frame;
- if (mom > 12*mobj->scale)
- mobj->extravalue1 = 2;
- else if (mom > 6*mobj->scale)
- mobj->extravalue1 = 3;
- else
- mobj->extravalue1 = 4;
- }
- if (max < (mobj->radius + mobj->target->radius))
- {
- mobj->momx = mobj->target->player->cmomx;
- mobj->momy = mobj->target->player->cmomy;
- if ((mobj->cvmem > TICRATE && !player->exiting) || !targonground)
- P_SetMobjState(mobj, (stat = S_ROSY_STND));
- else
- {
- mobj->target->momx = mobj->momx;
- mobj->target->momy = mobj->momy;
- P_SetMobjState(mobj, (stat = S_ROSY_HUG));
- S_StartSound(mobj, sfx_cdpcm6);
- mobj->angle = angletoplayer;
- }
- }
- else
- {
- max /= 3;
- if (max > 30*mobj->scale)
- max = 30*mobj->scale;
- if (mom > max && max > mobj->scale)
- {
- max = FixedDiv(max, mom);
- mobj->momx = FixedMul(mobj->momx, max);
- mobj->momy = FixedMul(mobj->momy, max);
- }
- if (abs(mobj->momx) > mobj->scale || abs(mobj->momy) > mobj->scale)
- mobj->angle = R_PointToAngle2(0, 0, mobj->momx, mobj->momy);
- }
- }
- else
- dojump = true;
- }
- break;
- case S_ROSY_HUG:
- if (targonground)
- {
- player->pflags |= PF_STASIS;
- if (mobj->cvmem < 5*TICRATE)
- mobj->cvmem++;
- if (love && !(leveltime & 7))
- makeheart = true;
- }
- else
- {
- if (mobj->cvmem < (love ? 5*TICRATE : 0))
- {
- P_SetMobjState(mobj, (stat = S_ROSY_PAIN));
- S_StartSound(mobj, sfx_cdpcm7);
- }
- else
- P_SetMobjState(mobj, (stat = S_ROSY_JUMP));
- var1 = var2 = 0;
- A_DoNPCPain(mobj);
- mobj->cvmem -= TICRATE;
- }
- break;
- case S_ROSY_STND:
- if ((pdist > (mobj->radius + mobj->target->radius + 3*(mobj->scale + mobj->target->scale))))
- P_SetMobjState(mobj, (stat = S_ROSY_WALK));
- else if (!targonground)
- ;
- else
- {
- if (love && !(leveltime & 15))
- makeheart = true;
- if (player->exiting || --mobj->cvmem < TICRATE)
- {
- P_SetMobjState(mobj, (stat = S_ROSY_HUG));
- S_StartSound(mobj, sfx_cdpcm6);
- mobj->angle = R_PointToAngle2(mobj->x, mobj->y, mobj->target->x, mobj->target->y);
- mobj->target->momx = mobj->momx;
- mobj->target->momy = mobj->momy;
- }
- }
- break;
- case S_ROSY_UNHAPPY:
- default:
- break;
- }
-
- if (stat == S_ROSY_HUG)
- {
- if (player->panim != PA_IDLE)
- P_SetPlayerMobjState(mobj->target, S_PLAY_STND);
- player->pflags |= PF_STASIS;
- }
-
- if (dojump)
- {
- P_SetMobjState(mobj, S_ROSY_JUMP);
- mobj->z += P_MobjFlip(mobj);
- mobj->momx = mobj->momy = 0;
- P_SetObjectMomZ(mobj, 6<<FRACBITS, false);
- S_StartSound(mobj, sfx_cdfm02);
- }
-
- if (makeheart)
- {
- mobj_t *cdlhrt = P_SpawnMobjFromMobj(mobj, 0, 0, mobj->height, MT_CDLHRT);
- cdlhrt->destscale = (5*mobj->scale)>>4;
- P_SetScale(cdlhrt, cdlhrt->destscale);
- cdlhrt->fuse = (5*TICRATE)>>1;
- cdlhrt->momz = mobj->scale;
- P_SetTarget(&cdlhrt->target, mobj);
- cdlhrt->extravalue1 = mobj->x;
- cdlhrt->extravalue2 = mobj->y;
- }
- }
- }
- break;
- case MT_CDLHRT:
- {
- if (mobj->cvmem < 24)
- mobj->cvmem++;
- mobj->movedir += ANG10;
- P_UnsetThingPosition(mobj);
- mobj->x = mobj->extravalue1 + P_ReturnThrustX(mobj, mobj->movedir, mobj->cvmem*mobj->scale);
- mobj->y = mobj->extravalue2 + P_ReturnThrustY(mobj, mobj->movedir, mobj->cvmem*mobj->scale);
- P_SetThingPosition(mobj);
- if ((--mobj->fuse) < 6)
- {
- if (!mobj->fuse)
- {
- P_RemoveMobj(mobj);
- return;
- }
- mobj->frame = (mobj->frame & ~FF_TRANSMASK)|((10-(mobj->fuse*2))<<(FF_TRANSSHIFT));
- }
- }
- break;
- case MT_VWREF:
- case MT_VWREB:
- {
- INT32 strength;
- ++mobj->movedir;
- mobj->frame &= ~FF_TRANSMASK;
- strength = min(mobj->fuse, (INT32)mobj->movedir)*3;
- if (strength < 10)
- mobj->frame |= ((10-strength)<<(FF_TRANSSHIFT));
- }
- /* FALLTHRU */
- default:
- if (mobj->fuse)
- { // Scenery object fuse! Very basic!
- mobj->fuse--;
- if (!mobj->fuse)
- {
-#ifdef HAVE_BLUA
- if (!LUAh_MobjFuse(mobj))
-#endif
- P_RemoveMobj(mobj);
- return;
- }
- }
- break;
+ if (stat == S_ROSY_JUMP || stat == S_ROSY_PAIN)
+ {
+ if (P_IsObjectOnGround(mobj))
+ {
+ mobj->momx = mobj->momy = 0;
+ if (player && mobj->cvmem < (-2*TICRATE))
+ stat = S_ROSY_UNHAPPY;
+ else
+ stat = S_ROSY_WALK;
+ P_SetMobjState(mobj, stat);
}
-
- P_SceneryThinker(mobj);
- return;
+ else if (P_MobjFlip(mobj)*mobj->momz < 0)
+ mobj->frame = mobj->state->frame + mobj->state->var1;
}
-#ifdef HAVE_BLUA
- // Check for a Lua thinker first
- if (!mobj->player)
- {
- if (LUAh_MobjThinker(mobj) || P_MobjWasRemoved(mobj))
- return;
- }
- else if (!mobj->player->spectator)
- {
- // You cannot short-circuit the player thinker like you can other thinkers.
- LUAh_MobjThinker(mobj);
- if (P_MobjWasRemoved(mobj))
- return;
- }
-#endif
- // if it's pushable, or if it would be pushable other than temporary disablement, use the
- // separate thinker
- if (mobj->flags & MF_PUSHABLE || (mobj->info->flags & MF_PUSHABLE && mobj->fuse))
+ if (!player)
{
- P_MobjCheckWater(mobj);
- P_PushableThinker(mobj);
-
- // Extinguish fire objects in water. (Yes, it's extraordinarily rare to have a pushable flame object, but Brak uses such a case.)
- if (mobj->flags & MF_FIRE && mobj->type != MT_PUMA && mobj->type != MT_FIREBALL
- && (mobj->eflags & (MFE_UNDERWATER|MFE_TOUCHWATER)))
+ if ((stat < S_ROSY_IDLE1 || stat > S_ROSY_IDLE4) && stat != S_ROSY_JUMP)
{
- P_KillMobj(mobj, NULL, NULL, 0);
- return;
+ mobj->momx = mobj->momy = 0;
+ P_SetMobjState(mobj, S_ROSY_IDLE1);
}
}
- else if (mobj->flags & MF_BOSS)
+ else
{
-#ifdef HAVE_BLUA
- if (LUAh_BossThinker(mobj))
+ boolean dojump = false, targonground, love, makeheart = false;
+ if (mobj->target != player->mo)
+ P_SetTarget(&mobj->target, player->mo);
+ // Tatsuru: Don't try to hug them if they're above or below you!
+ targonground = (P_IsObjectOnGround(mobj->target) && (player->panim == PA_IDLE || player->panim == PA_WALK || player->panim == PA_RUN) && player->mo->z == mobj->z);
+ love = (player->skin == 0 || player->skin == 5);
+
+ switch (stat)
{
- if (P_MobjWasRemoved(mobj))
- return;
- }
- else if (P_MobjWasRemoved(mobj))
- return;
- else
-#endif
- switch (mobj->type)
+ case S_ROSY_IDLE1:
+ case S_ROSY_IDLE2:
+ case S_ROSY_IDLE3:
+ case S_ROSY_IDLE4:
+ dojump = true;
+ break;
+ case S_ROSY_JUMP:
+ case S_ROSY_PAIN:
+ // handled above
+ break;
+ case S_ROSY_WALK:
{
- case MT_EGGMOBILE:
- if (mobj->health < mobj->info->damage+1 && leveltime & 2)
- {
- fixed_t rad = mobj->radius>>FRACBITS;
- fixed_t hei = mobj->height>>FRACBITS;
- mobj_t *particle = P_SpawnMobjFromMobj(mobj,
- P_RandomRange(rad, -rad)<<FRACBITS,
- P_RandomRange(rad, -rad)<<FRACBITS,
- P_RandomRange(hei/2, hei)<<FRACBITS,
- MT_SMOKE);
- P_SetObjectMomZ(particle, 2<<FRACBITS, false);
- particle->momz += mobj->momz;
- }
- if (mobj->flags2 & MF2_SKULLFLY)
-#if 1
- P_SpawnGhostMobj(mobj);
-#else // all the way back from final demo... MT_THOK isn't even the same size anymore!
- {
- mobj_t *spawnmobj;
- spawnmobj = P_SpawnMobj(mobj->x, mobj->y, mobj->z, mobj->info->painchance);
- P_SetTarget(&spawnmobj->target, mobj);
- spawnmobj->color = SKINCOLOR_GREY;
- }
-#endif
- P_Boss1Thinker(mobj);
- break;
- case MT_EGGMOBILE2:
- if (mobj->health < mobj->info->damage+1 && leveltime & 2)
- {
- fixed_t rad = mobj->radius>>FRACBITS;
- fixed_t hei = mobj->height>>FRACBITS;
- mobj_t *particle = P_SpawnMobjFromMobj(mobj,
- P_RandomRange(rad, -rad)<<FRACBITS,
- P_RandomRange(rad, -rad)<<FRACBITS,
- P_RandomRange(hei/2, hei)<<FRACBITS,
- MT_SMOKE);
- P_SetObjectMomZ(particle, 2<<FRACBITS, false);
- particle->momz += mobj->momz;
- }
- P_Boss2Thinker(mobj);
- break;
- case MT_EGGMOBILE3:
- if (mobj->health < mobj->info->damage+1 && leveltime & 2)
+ fixed_t x = mobj->x, y = mobj->y, z = mobj->z;
+ angle_t angletoplayer = R_PointToAngle2(x, y, mobj->target->x, mobj->target->y);
+ boolean allowed = P_TryMove(mobj, mobj->target->x, mobj->target->y, false);
+
+ P_UnsetThingPosition(mobj);
+ mobj->x = x;
+ mobj->y = y;
+ mobj->z = z;
+ P_SetThingPosition(mobj);
+
+ if (allowed)
+ {
+ fixed_t mom, max;
+ P_Thrust(mobj, angletoplayer, (3*FRACUNIT) >> 1);
+ mom = FixedHypot(mobj->momx, mobj->momy);
+ max = pdist;
+ if ((--mobj->extravalue1) <= 0)
{
- fixed_t rad = mobj->radius>>FRACBITS;
- fixed_t hei = mobj->height>>FRACBITS;
- mobj_t *particle = P_SpawnMobjFromMobj(mobj,
- P_RandomRange(rad, -rad)<<FRACBITS,
- P_RandomRange(rad, -rad)<<FRACBITS,
- P_RandomRange(hei/2, hei)<<FRACBITS,
- MT_SMOKE);
- P_SetObjectMomZ(particle, 2<<FRACBITS, false);
- particle->momz += mobj->momz;
+ if (++mobj->frame > mobj->state->frame + mobj->state->var1)
+ mobj->frame = mobj->state->frame;
+ if (mom > 12*mobj->scale)
+ mobj->extravalue1 = 2;
+ else if (mom > 6*mobj->scale)
+ mobj->extravalue1 = 3;
+ else
+ mobj->extravalue1 = 4;
}
- P_Boss3Thinker(mobj);
- break;
- case MT_EGGMOBILE4:
- if (mobj->health < mobj->info->damage+1 && leveltime & 2)
+ if (max < (mobj->radius + mobj->target->radius))
{
- fixed_t rad = mobj->radius>>FRACBITS;
- fixed_t hei = mobj->height>>FRACBITS;
- mobj_t *particle = P_SpawnMobjFromMobj(mobj,
- P_RandomRange(rad, -rad)<<FRACBITS,
- P_RandomRange(rad, -rad)<<FRACBITS,
- P_RandomRange(hei/2, hei)<<FRACBITS,
- MT_SMOKE);
- P_SetObjectMomZ(particle, 2<<FRACBITS, false);
- particle->momz += mobj->momz;
+ mobj->momx = mobj->target->player->cmomx;
+ mobj->momy = mobj->target->player->cmomy;
+ if ((mobj->cvmem > TICRATE && !player->exiting) || !targonground)
+ P_SetMobjState(mobj, (stat = S_ROSY_STND));
+ else
+ {
+ mobj->target->momx = mobj->momx;
+ mobj->target->momy = mobj->momy;
+ P_SetMobjState(mobj, (stat = S_ROSY_HUG));
+ S_StartSound(mobj, sfx_cdpcm6);
+ mobj->angle = angletoplayer;
+ }
}
- P_Boss4Thinker(mobj);
- break;
- case MT_FANG:
- P_Boss5Thinker(mobj);
- break;
- case MT_BLACKEGGMAN:
- P_Boss7Thinker(mobj);
- break;
- case MT_METALSONIC_BATTLE:
- P_Boss9Thinker(mobj);
- break;
- default: // Generic SOC-made boss
- if (mobj->flags2 & MF2_SKULLFLY)
- P_SpawnGhostMobj(mobj);
- P_GenericBossThinker(mobj);
- break;
- }
- if (mobj->flags2 & MF2_BOSSFLEE)
- {
- if (mobj->extravalue1)
- {
- if (!(--mobj->extravalue1))
+ else
{
- if (mobj->target)
+ max /= 3;
+ if (max > 30*mobj->scale)
+ max = 30*mobj->scale;
+ if (mom > max && max > mobj->scale)
{
- mobj->momz = FixedMul(FixedDiv(mobj->target->z - mobj->z, P_AproxDistance(mobj->x-mobj->target->x,mobj->y-mobj->target->y)), mobj->scale<<1);
- mobj->angle = R_PointToAngle2(mobj->x, mobj->y, mobj->target->x, mobj->target->y);
+ max = FixedDiv(max, mom);
+ mobj->momx = FixedMul(mobj->momx, max);
+ mobj->momy = FixedMul(mobj->momy, max);
}
- else
- mobj->momz = 8*mobj->scale;
+ if (abs(mobj->momx) > mobj->scale || abs(mobj->momy) > mobj->scale)
+ mobj->angle = R_PointToAngle2(0, 0, mobj->momx, mobj->momy);
}
- else
- mobj->angle += mobj->movedir;
- }
- else if (mobj->target)
- P_InstaThrust(mobj, mobj->angle, FixedMul(12*FRACUNIT, mobj->scale));
- }
- if (mobj->type == MT_CYBRAKDEMON && !mobj->health)
- {
- if (!(mobj->tics & 1))
- {
- var1 = 2;
- var2 = 0;
- A_BossScream(mobj);
- }
- if (P_CheckDeathPitCollide(mobj))
- {
- P_RemoveMobj(mobj);
- return;
- }
- if (mobj->momz && mobj->z+mobj->momz <= mobj->floorz)
- {
- S_StartSound(mobj, sfx_befall);
- if (mobj->state != states+S_CYBRAKDEMON_DIE8)
- P_SetMobjState(mobj, S_CYBRAKDEMON_DIE8);
}
+ else
+ dojump = true;
}
- }
- else if (mobj->health <= 0) // Dead things think differently than the living.
- switch (mobj->type)
- {
- case MT_BLUESPHERE:
- if ((mobj->tics>>2)+1 > 0 && (mobj->tics>>2)+1 <= tr_trans60) // tr_trans50 through tr_trans90, shifting once every second frame
- mobj->frame = (NUMTRANSMAPS-((mobj->tics>>2)+1))<<FF_TRANSSHIFT;
- else // tr_trans60 otherwise
- mobj->frame = tr_trans60<<FF_TRANSSHIFT;
- break;
- case MT_EGGCAPSULE:
- if (mobj->z <= mobj->floorz)
+ break;
+ case S_ROSY_HUG:
+ if (targonground)
{
- P_RemoveMobj(mobj);
- return;
+ player->pflags |= PF_STASIS;
+ if (mobj->cvmem < 5*TICRATE)
+ mobj->cvmem++;
+ if (love && !(leveltime & 7))
+ makeheart = true;
}
- break;
- case MT_FAKEMOBILE:
- if (mobj->scale == mobj->destscale)
+ else
{
- if (!mobj->fuse)
+ if (mobj->cvmem < (love ? 5*TICRATE : 0))
{
- S_StartSound(mobj, sfx_s3k77);
- mobj->flags2 |= MF2_DONTDRAW;
- mobj->fuse = TICRATE;
+ P_SetMobjState(mobj, (stat = S_ROSY_PAIN));
+ S_StartSound(mobj, sfx_cdpcm7);
}
- return;
- }
- if (!mobj->reactiontime)
- {
- if (P_RandomChance(FRACUNIT/2))
- mobj->movefactor = FRACUNIT;
- else
- mobj->movefactor = -FRACUNIT;
- if (P_RandomChance(FRACUNIT/2))
- mobj->movedir = ANG20;
else
- mobj->movedir = -ANG20;
- mobj->reactiontime = 5;
- }
- mobj->momz += mobj->movefactor;
- mobj->angle += mobj->movedir;
- P_InstaThrust(mobj, mobj->angle, -mobj->info->speed);
- mobj->reactiontime--;
- break;
- case MT_EGGSHIELD:
- mobj->flags2 ^= MF2_DONTDRAW;
- break;
- case MT_EGGTRAP: // Egg Capsule animal release
- if (mobj->fuse > 0)// && mobj->fuse < TICRATE-(TICRATE/7))
- {
- INT32 i;
- fixed_t x,y,z;
- fixed_t ns;
- mobj_t *mo2;
- mobj_t *flicky;
-
- z = mobj->subsector->sector->floorheight + FRACUNIT + (P_RandomKey(64)<<FRACBITS);
- for (i = 0; i < 3; i++)
- {
- const angle_t fa = P_RandomKey(FINEANGLES) & FINEMASK;
- ns = 64 * FRACUNIT;
- x = mobj->x + FixedMul(FINESINE(fa),ns);
- y = mobj->y + FixedMul(FINECOSINE(fa),ns);
-
- mo2 = P_SpawnMobj(x, y, z, MT_EXPLODE);
- P_SetMobjStateNF(mo2, S_XPLD_EGGTRAP); // so the flickies don't lose their target if they spawn
- ns = 4 * FRACUNIT;
- mo2->momx = FixedMul(FINESINE(fa),ns);
- mo2->momy = FixedMul(FINECOSINE(fa),ns);
- mo2->angle = fa << ANGLETOFINESHIFT;
-
- if (!i && !(mobj->fuse & 2))
- S_StartSound(mo2, mobj->info->deathsound);
-
- flicky = P_InternalFlickySpawn(mo2, 0, 8*FRACUNIT, false, -1);
- if (!flicky)
- break;
-
- P_SetTarget(&flicky->target, mo2);
- flicky->momx = mo2->momx;
- flicky->momy = mo2->momy;
- }
-
- mobj->fuse--;
+ P_SetMobjState(mobj, (stat = S_ROSY_JUMP));
+ var1 = var2 = 0;
+ A_DoNPCPain(mobj);
+ mobj->cvmem -= TICRATE;
}
break;
- case MT_PLAYER:
- /// \todo Have the player's dead body completely finish its animation even if they've already respawned.
- if (!mobj->fuse)
- { // Go away.
- /// \todo Actually go ahead and remove mobj completely, and fix any bugs and crashes doing this creates. Chasecam should stop moving, and F12 should never return to it.
- mobj->momz = 0;
- if (mobj->player)
- mobj->flags2 |= MF2_DONTDRAW;
- else // safe to remove, nobody's going to complain!
- {
- P_RemoveMobj(mobj);
- return;
- }
- }
- else // Apply gravity to fall downwards.
+ case S_ROSY_STND:
+ if ((pdist > (mobj->radius + mobj->target->radius + 3*(mobj->scale + mobj->target->scale))))
+ P_SetMobjState(mobj, (stat = S_ROSY_WALK));
+ else if (!targonground)
+ ;
+ else
{
- if (mobj->player && !(mobj->fuse % 8) && (mobj->player->charflags & SF_MACHINE))
+ if (love && !(leveltime & 15))
+ makeheart = true;
+ if (player->exiting || --mobj->cvmem < TICRATE)
{
- fixed_t r = mobj->radius >> FRACBITS;
- mobj_t *explosion = P_SpawnMobj(
- mobj->x + (P_RandomRange(r, -r) << FRACBITS),
- mobj->y + (P_RandomRange(r, -r) << FRACBITS),
- mobj->z + (P_RandomKey(mobj->height >> FRACBITS) << FRACBITS),
- MT_SONIC3KBOSSEXPLODE);
- S_StartSound(explosion, sfx_s3kb4);
+ P_SetMobjState(mobj, (stat = S_ROSY_HUG));
+ S_StartSound(mobj, sfx_cdpcm6);
+ mobj->angle = R_PointToAngle2(mobj->x, mobj->y, mobj->target->x, mobj->target->y);
+ mobj->target->momx = mobj->momx;
+ mobj->target->momy = mobj->momy;
}
- if (mobj->movedir == DMG_DROWNED)
- P_SetObjectMomZ(mobj, -FRACUNIT / 2, true); // slower fall from drowning
- else
- P_SetObjectMomZ(mobj, -2 * FRACUNIT / 3, true);
}
break;
- case MT_METALSONIC_RACE:
- {
- if (!(mobj->fuse % 8))
- {
- fixed_t r = mobj->radius >> FRACBITS;
- mobj_t *explosion = P_SpawnMobj(
- mobj->x + (P_RandomRange(r, -r) << FRACBITS),
- mobj->y + (P_RandomRange(r, -r) << FRACBITS),
- mobj->z + (P_RandomKey(mobj->height >> FRACBITS) << FRACBITS),
- MT_SONIC3KBOSSEXPLODE);
- S_StartSound(explosion, sfx_s3kb4);
- }
- P_SetObjectMomZ(mobj, -2 * FRACUNIT / 3, true);
- }
+ case S_ROSY_UNHAPPY:
default:
break;
}
- else
- {
- if ((mobj->flags & MF_ENEMY) && (mobj->state->nextstate == mobj->info->spawnstate && mobj->tics == 1))
- mobj->flags2 &= ~MF2_FRET;
- // Angle-to-tracer to trigger a linedef exec
- // See Linedef Exec 457 (Track mobj angle to point)
- if ((mobj->eflags & MFE_TRACERANGLE) && mobj->tracer && mobj->extravalue2)
+ if (stat == S_ROSY_HUG)
{
- // mobj->lastlook - Don't disable behavior after first failure
- // mobj->extravalue1 - Angle tolerance
- // mobj->extravalue2 - Exec tag upon failure
- // mobj->cvval - Allowable failure delay
- // mobj->cvmem - Failure timer
-
- angle_t ang = mobj->angle - 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
- // yet tracer is still in the camera view
-
- // failure state: mobj is not facing tracer
- // Reasaonable defaults: ANGLE_67h, ANGLE_292h
- if (ang >= (angle_t)mobj->extravalue1 && ang <= ANGLE_MAX - (angle_t)mobj->extravalue1)
- {
- if (mobj->cvmem)
- mobj->cvmem--;
- else
- {
- INT32 exectag = mobj->extravalue2; // remember this before we erase the values
-
- if (mobj->lastlook)
- mobj->cvmem = mobj->cusval; // reset timer for next failure
- else
- {
- // disable after first failure
- mobj->eflags &= ~MFE_TRACERANGLE;
- mobj->lastlook = mobj->extravalue1 = mobj->extravalue2 = mobj->cvmem = mobj->cusval = 0;
- }
+ if (player->panim != PA_IDLE)
+ P_SetPlayerMobjState(mobj->target, S_PLAY_STND);
+ player->pflags |= PF_STASIS;
+ }
- P_LinedefExecute(exectag, mobj, NULL);
- }
- }
- else
- mobj->cvmem = mobj->cusval; // reset failure timer
+ if (dojump)
+ {
+ P_SetMobjState(mobj, S_ROSY_JUMP);
+ mobj->z += P_MobjFlip(mobj);
+ mobj->momx = mobj->momy = 0;
+ P_SetObjectMomZ(mobj, 6 << FRACBITS, false);
+ S_StartSound(mobj, sfx_cdfm02);
}
- switch (mobj->type)
+ if (makeheart)
{
- case MT_WALLSPIKEBASE:
- if (!mobj->target) {
- P_RemoveMobj(mobj);
- return;
- }
- mobj->frame = (mobj->frame & ~FF_FRAMEMASK)|(mobj->target->frame & FF_FRAMEMASK);
-#if 0
- if (mobj->angle != mobj->target->angle + ANGLE_90) // reposition if not the correct angle
- {
- mobj_t *target = mobj->target; // shortcut
- const fixed_t baseradius = target->radius - (target->scale/2); //FixedMul(FRACUNIT/2, target->scale);
- P_UnsetThingPosition(mobj);
- mobj->x = target->x - P_ReturnThrustX(target, target->angle, baseradius);
- mobj->y = target->y - P_ReturnThrustY(target, target->angle, baseradius);
- P_SetThingPosition(mobj);
- mobj->angle = target->angle + ANGLE_90;
- }
+ mobj_t *cdlhrt = P_SpawnMobjFromMobj(mobj, 0, 0, mobj->height, MT_CDLHRT);
+ cdlhrt->destscale = (5*mobj->scale) >> 4;
+ P_SetScale(cdlhrt, cdlhrt->destscale);
+ cdlhrt->fuse = (5*TICRATE) >> 1;
+ cdlhrt->momz = mobj->scale;
+ P_SetTarget(&cdlhrt->target, mobj);
+ cdlhrt->extravalue1 = mobj->x;
+ cdlhrt->extravalue2 = mobj->y;
+ }
+ }
+}
+
+static void P_MobjSceneryThink(mobj_t *mobj)
+{
+#ifdef HAVE_BLUA
+ if (LUAh_MobjThinker(mobj))
+ return;
+ if (P_MobjWasRemoved(mobj))
+ return;
+#endif
+
+ if ((mobj->flags2 & MF2_SHIELD) && !P_AddShield(mobj))
+ return;
+
+ switch (mobj->type)
+ {
+ case MT_BOSSJUNK:
+ mobj->flags2 ^= MF2_DONTDRAW;
+ break;
+ case MT_MACEPOINT:
+ case MT_CHAINMACEPOINT:
+ case MT_SPRINGBALLPOINT:
+ case MT_CHAINPOINT:
+ case MT_FIREBARPOINT:
+ case MT_CUSTOMMACEPOINT:
+ case MT_HIDDEN_SLING:
+ P_MaceSceneryThink(mobj);
+ break;
+ case MT_HOOP:
+ if (mobj->fuse > 1)
+ P_MoveHoop(mobj);
+ else if (mobj->fuse == 1)
+ mobj->movecount = 1;
+
+ if (mobj->movecount)
+ {
+ mobj->fuse++;
+
+ if (mobj->fuse > 32)
+ {
+ // Don't kill the hoop center. For the sake of respawning.
+ //if (mobj->target)
+ // P_RemoveMobj(mobj->target);
+
+ P_RemoveMobj(mobj);
+ }
+ }
+ else
+ mobj->fuse--;
+ return;
+ case MT_NIGHTSPARKLE:
+ if (mobj->tics != -1)
+ {
+ mobj->tics--;
+
+ // you can cycle through multiple states in a tic
+ if (!mobj->tics)
+ if (!P_SetMobjState(mobj, mobj->state->nextstate))
+ return; // freed itself
+ }
+
+ P_UnsetThingPosition(mobj);
+ mobj->x += mobj->momx;
+ mobj->y += mobj->momy;
+ mobj->z += mobj->momz;
+ P_SetThingPosition(mobj);
+ return;
+ case MT_NIGHTSLOOPHELPER:
+ if (--mobj->tics <= 0)
+ P_RemoveMobj(mobj);
+
+ // Don't touch my fuse!
+ return;
+ case MT_OVERLAY:
+ if (!mobj->target)
+ {
+ P_RemoveMobj(mobj);
+ return;
+ }
+ else
+ P_AddOverlay(mobj);
+ break;
+ case MT_PITY_ORB:
+ case MT_WHIRLWIND_ORB:
+ case MT_ARMAGEDDON_ORB:
+ if (!(mobj->flags2 & MF2_SHIELD))
+ return;
+ break;
+ case MT_ATTRACT_ORB:
+ if (!(mobj->flags2 & MF2_SHIELD))
+ return;
+ if (/*(mobj->target) -- the following is implicit by P_AddShield
+ && (mobj->target->player)
+ && */ (mobj->target->player->homing) && (mobj->target->player->pflags & PF_SHIELDABILITY))
+ {
+ P_SetMobjState(mobj, mobj->info->painstate);
+ mobj->tics++;
+ }
+ break;
+ case MT_ELEMENTAL_ORB:
+ if (!(mobj->flags2 & MF2_SHIELD))
+ return;
+ if (mobj->tracer
+ /* && mobj->target -- the following is implicit by P_AddShield
+ && mobj->target->player
+ && (mobj->target->player->powers[pw_shield] & SH_NOSTACK) == SH_ELEMENTAL */
+ && mobj->target->player->pflags & PF_SHIELDABILITY
+ && ((statenum_t)(mobj->tracer->state - states) < mobj->info->raisestate
+ || (mobj->tracer->state->nextstate < mobj->info->raisestate && mobj->tracer->tics == 1)))
+ {
+ P_SetMobjState(mobj, mobj->info->painstate);
+ mobj->tics++;
+ P_SetMobjState(mobj->tracer, mobj->info->raisestate);
+ mobj->tracer->tics++;
+ }
+ break;
+ case MT_FORCE_ORB:
+ if (!(mobj->flags2 & MF2_SHIELD))
+ return;
+ if (/*
+ && mobj->target -- the following is implicit by P_AddShield
+ && mobj->target->player
+ && (mobj->target->player->powers[pw_shield] & SH_FORCE)
+ && */ (mobj->target->player->pflags & PF_SHIELDABILITY))
+ {
+ mobj_t *whoosh = P_SpawnMobjFromMobj(mobj, 0, 0, 0, MT_GHOST); // done here so the offset is correct
+ P_SetMobjState(whoosh, mobj->info->raisestate);
+ whoosh->destscale = whoosh->scale << 1;
+ whoosh->scalespeed = FixedMul(whoosh->scalespeed, whoosh->scale);
+ whoosh->height = 38*whoosh->scale;
+ whoosh->fuse = 10;
+ whoosh->flags |= MF_NOCLIPHEIGHT;
+ whoosh->momz = mobj->target->momz; // Stay reasonably centered for a few frames
+ mobj->target->player->pflags &= ~PF_SHIELDABILITY; // prevent eternal whoosh
+ }
+ /* FALLTHRU */
+ case MT_FLAMEAURA_ORB:
+ if (!(mobj->flags2 & MF2_SHIELD))
+ return;
+ if ((statenum_t)(mobj->state - states) < mobj->info->painstate)
+ mobj->angle = mobj->target->angle; // implicitly okay because of P_AddShield
+ if (mobj->tracer
+ /* && mobj->target -- the following is implicit by P_AddShield
+ && mobj->target->player
+ && (mobj->target->player->powers[pw_shield] & SH_NOSTACK) == SH_FLAMEAURA */
+ && mobj->target->player->pflags & PF_SHIELDABILITY
+ && ((statenum_t)(mobj->tracer->state - states) < mobj->info->raisestate
+ || (mobj->tracer->state->nextstate < mobj->info->raisestate && mobj->tracer->tics == 1)))
+ {
+ P_SetMobjState(mobj, mobj->info->painstate);
+ mobj->tics++;
+ P_SetMobjState(mobj->tracer, mobj->info->raisestate);
+ mobj->tracer->tics++;
+ }
+ break;
+ case MT_BUBBLEWRAP_ORB:
+ if (!(mobj->flags2 & MF2_SHIELD))
+ return;
+ if (mobj->tracer
+ /* && mobj->target -- the following is implicit by P_AddShield
+ && mobj->target->player
+ && (mobj->target->player->powers[pw_shield] & SH_NOSTACK) == SH_BUBBLEWRAP */
+ )
+ {
+ if (mobj->target->player->pflags & PF_SHIELDABILITY
+ && ((statenum_t)(mobj->state - states) < mobj->info->painstate
+ || (mobj->state->nextstate < mobj->info->painstate && mobj->tics == 1)))
+ {
+ P_SetMobjState(mobj, mobj->info->painstate);
+ mobj->tics++;
+ P_SetMobjState(mobj->tracer, mobj->info->raisestate);
+ mobj->tracer->tics++;
+ }
+ else if (mobj->target->eflags & MFE_JUSTHITFLOOR
+ && (statenum_t)(mobj->state - states) == mobj->info->painstate)
+ {
+ P_SetMobjState(mobj, mobj->info->painstate + 1);
+ mobj->tics++;
+ P_SetMobjState(mobj->tracer, mobj->info->raisestate + 1);
+ mobj->tracer->tics++;
+ }
+ }
+ break;
+ case MT_THUNDERCOIN_ORB:
+ if (!(mobj->flags2 & MF2_SHIELD))
+ return;
+ if (mobj->tracer
+ /* && mobj->target -- the following is implicit by P_AddShield
+ && mobj->target->player
+ && (mobj->target->player->powers[pw_shield] & SH_NOSTACK) == SH_THUNDERCOIN */
+ && (mobj->target->player->pflags & PF_SHIELDABILITY))
+ {
+ P_SetMobjState(mobj, mobj->info->painstate);
+ mobj->tics++;
+ P_SetMobjState(mobj->tracer, mobj->info->raisestate);
+ mobj->tracer->tics++;
+ mobj->target->player->pflags &= ~PF_SHIELDABILITY; // prevent eternal spark
+ }
+ break;
+ case MT_WATERDROP:
+ P_SceneryCheckWater(mobj);
+ if ((mobj->z <= mobj->floorz || mobj->z <= mobj->watertop)
+ && mobj->health > 0)
+ {
+ mobj->health = 0;
+ P_SetMobjState(mobj, mobj->info->deathstate);
+ S_StartSound(mobj, mobj->info->deathsound + P_RandomKey(mobj->info->mass));
+ return;
+ }
+ break;
+ case MT_BUBBLES:
+ P_SceneryCheckWater(mobj);
+ break;
+ case MT_SMALLBUBBLE:
+ case MT_MEDIUMBUBBLE:
+ case MT_EXTRALARGEBUBBLE: // start bubble dissipate
+ P_SceneryCheckWater(mobj);
+ if (P_MobjWasRemoved(mobj)) // bubble was removed by not being in water
+ return;
+ if (!(mobj->eflags & MFE_UNDERWATER)
+ || (!(mobj->eflags & MFE_VERTICALFLIP) && mobj->z + mobj->height >= mobj->ceilingz)
+ || (mobj->eflags & MFE_VERTICALFLIP && mobj->z <= mobj->floorz)
+ || (P_CheckDeathPitCollide(mobj))
+ || --mobj->fuse <= 0) // Bubbles eventually dissipate if they can't reach the surface.
+ {
+ // no playing sound: no point; the object is being removed
+ P_RemoveMobj(mobj);
+ return;
+ }
+ break;
+ case MT_LOCKON:
+ if (!mobj->target)
+ {
+ P_RemoveMobj(mobj);
+ return;
+ }
+
+ mobj->flags2 &= ~MF2_DONTDRAW;
+
+ mobj->x = mobj->target->x;
+ mobj->y = mobj->target->y;
+
+ mobj->eflags |= (mobj->target->eflags & MFE_VERTICALFLIP);
+
+ mobj->destscale = mobj->target->destscale;
+ P_SetScale(mobj, mobj->target->scale);
+
+ if (!(mobj->eflags & MFE_VERTICALFLIP))
+ mobj->z = mobj->target->z + mobj->target->height + FixedMul((16 + abs((signed)(leveltime % TICRATE) - TICRATE/2))*FRACUNIT, mobj->target->scale);
+ else
+ mobj->z = mobj->target->z - FixedMul((16 + abs((signed)(leveltime % TICRATE) - TICRATE/2))*FRACUNIT, mobj->target->scale) - mobj->height;
+ break;
+ case MT_LOCKONINF:
+ if (!(mobj->flags2 & MF2_STRONGBOX))
+ {
+ mobj->threshold = mobj->z;
+ mobj->flags2 |= MF2_STRONGBOX;
+ }
+ if (!(mobj->eflags & MFE_VERTICALFLIP))
+ mobj->z = mobj->threshold + FixedMul((16 + abs((signed)(leveltime % TICRATE) - TICRATE/2))*FRACUNIT, mobj->scale);
+ else
+ mobj->z = mobj->threshold - FixedMul((16 + abs((signed)(leveltime % TICRATE) - TICRATE/2))*FRACUNIT, mobj->scale);
+ break;
+ case MT_DROWNNUMBERS:
+ if (!P_DrownNumbersSceneryThink(mobj))
+ return;
+ break;
+ case MT_FLAMEJET:
+ P_FlameJetSceneryThink(mobj);
+ break;
+ case MT_VERTICALFLAMEJET:
+ P_VerticalFlameJetSceneryThink(mobj);
+ break;
+ case MT_FLICKY_01_CENTER:
+ case MT_FLICKY_02_CENTER:
+ case MT_FLICKY_03_CENTER:
+ case MT_FLICKY_04_CENTER:
+ case MT_FLICKY_05_CENTER:
+ case MT_FLICKY_06_CENTER:
+ case MT_FLICKY_07_CENTER:
+ case MT_FLICKY_08_CENTER:
+ case MT_FLICKY_09_CENTER:
+ case MT_FLICKY_10_CENTER:
+ case MT_FLICKY_11_CENTER:
+ case MT_FLICKY_12_CENTER:
+ case MT_FLICKY_13_CENTER:
+ case MT_FLICKY_14_CENTER:
+ case MT_FLICKY_15_CENTER:
+ case MT_FLICKY_16_CENTER:
+ case MT_SECRETFLICKY_01_CENTER:
+ case MT_SECRETFLICKY_02_CENTER:
+ if (mobj->tracer && (mobj->flags & MF_NOCLIPTHING)
+ && (mobj->flags & MF_GRENADEBOUNCE))
+ // for now: only do this bounce routine if flicky is in-place. \todo allow in all movements
+ {
+ if (!(mobj->tracer->flags2 & MF2_OBJECTFLIP) && mobj->tracer->z <= mobj->tracer->floorz)
+ mobj->tracer->momz = 7*FRACUNIT;
+ else if ((mobj->tracer->flags2 & MF2_OBJECTFLIP) && mobj->tracer->z >= mobj->tracer->ceilingz - mobj->tracer->height)
+ mobj->tracer->momz = -7*FRACUNIT;
+ }
+ break;
+ case MT_SEED:
+ if (P_MobjFlip(mobj)*mobj->momz < mobj->info->speed)
+ mobj->momz = P_MobjFlip(mobj)*mobj->info->speed;
+ break;
+ case MT_ROCKCRUMBLE1:
+ case MT_ROCKCRUMBLE2:
+ case MT_ROCKCRUMBLE3:
+ case MT_ROCKCRUMBLE4:
+ case MT_ROCKCRUMBLE5:
+ case MT_ROCKCRUMBLE6:
+ case MT_ROCKCRUMBLE7:
+ case MT_ROCKCRUMBLE8:
+ case MT_ROCKCRUMBLE9:
+ case MT_ROCKCRUMBLE10:
+ case MT_ROCKCRUMBLE11:
+ case MT_ROCKCRUMBLE12:
+ case MT_ROCKCRUMBLE13:
+ case MT_ROCKCRUMBLE14:
+ case MT_ROCKCRUMBLE15:
+ case MT_ROCKCRUMBLE16:
+ case MT_WOODDEBRIS:
+ case MT_BRICKDEBRIS:
+ case MT_BROKENROBOT:
+ if (mobj->z <= P_FloorzAtPos(mobj->x, mobj->y, mobj->z, mobj->height)
+ && mobj->state != &states[mobj->info->deathstate])
+ {
+ P_SetMobjState(mobj, mobj->info->deathstate);
+ return;
+ }
+ break;
+ case MT_PARTICLEGEN:
+ if (!P_ParticleGenSceneryThink(mobj))
+ return;
+ break;
+ case MT_FSGNA:
+ if (mobj->movedir)
+ mobj->angle += mobj->movedir;
+ break;
+ case MT_ROSY:
+ P_RosySceneryThink(mobj);
+ break;
+ case MT_CDLHRT:
+ {
+ if (mobj->cvmem < 24)
+ mobj->cvmem++;
+ mobj->movedir += ANG10;
+ P_UnsetThingPosition(mobj);
+ mobj->x = mobj->extravalue1 + P_ReturnThrustX(mobj, mobj->movedir, mobj->cvmem*mobj->scale);
+ mobj->y = mobj->extravalue2 + P_ReturnThrustY(mobj, mobj->movedir, mobj->cvmem*mobj->scale);
+ P_SetThingPosition(mobj);
+ if ((--mobj->fuse) < 6)
+ {
+ if (!mobj->fuse)
+ {
+ P_RemoveMobj(mobj);
+ return;
+ }
+ mobj->frame = (mobj->frame & ~FF_TRANSMASK) | ((10 - (mobj->fuse*2)) << (FF_TRANSSHIFT));
+ }
+ }
+ break;
+ case MT_VWREF:
+ case MT_VWREB:
+ {
+ INT32 strength;
+ ++mobj->movedir;
+ mobj->frame &= ~FF_TRANSMASK;
+ strength = min(mobj->fuse, (INT32)mobj->movedir)*3;
+ if (strength < 10)
+ mobj->frame |= ((10 - strength) << (FF_TRANSSHIFT));
+ }
+ /* FALLTHRU */
+ default:
+ if (mobj->fuse)
+ { // Scenery object fuse! Very basic!
+ mobj->fuse--;
+ if (!mobj->fuse)
+ {
+#ifdef HAVE_BLUA
+ if (!LUAh_MobjFuse(mobj))
#endif
- break;
- case MT_FALLINGROCK:
- // Despawn rocks here in case zmovement code can't do so (blame slopes)
- if (!mobj->momx && !mobj->momy && !mobj->momz
- && ((mobj->eflags & MFE_VERTICALFLIP) ?
- mobj->z + mobj->height >= mobj->ceilingz
- : mobj->z <= mobj->floorz))
- {
P_RemoveMobj(mobj);
- return;
- }
- P_MobjCheckWater(mobj);
- break;
- case MT_ARROW:
- if (mobj->flags & MF_MISSILE)
- {
- // Calculate the angle of movement.
- /*
- momz
- / |
- / |
- / |
- 0------dist(momx,momy)
- */
-
- fixed_t dist = P_AproxDistance(mobj->momx, mobj->momy);
- angle_t angle = R_PointToAngle2(0, 0, dist, mobj->momz);
-
- if (angle > ANG20 && angle <= ANGLE_180)
- mobj->frame = 2;
- else if (angle < ANG340 && angle > ANGLE_180)
- mobj->frame = 0;
- else
- mobj->frame = 1;
+ return;
+ }
+ }
+ break;
+ }
- if (!(mobj->extravalue1) && (mobj->momz < 0))
- {
- mobj->extravalue1 = 1;
- S_StartSound(mobj, mobj->info->activesound);
- }
- if (leveltime & 1)
- {
- mobj_t *dust = P_SpawnMobjFromMobj(mobj, 0, 0, 0, MT_PARTICLE);
- dust->tics = 18;
- dust->scalespeed = 4096;
- dust->destscale = FRACUNIT/32;
- }
- }
- else
- mobj->flags2 ^= MF2_DONTDRAW;
- break;
- case MT_EMERALDSPAWN:
- if (mobj->threshold)
- {
- mobj->threshold--;
+ P_SceneryThinker(mobj);
+}
- if (!mobj->threshold && !mobj->target && mobj->reactiontime)
- {
- mobj_t *emerald = P_SpawnMobj(mobj->x, mobj->y, mobj->z, mobj->reactiontime);
- emerald->threshold = 42;
- P_SetTarget(&mobj->target, emerald);
- P_SetTarget(&emerald->target, mobj);
- }
- }
- break;
- case MT_BUGGLE:
- mobj->eflags |= MFE_UNDERWATER; //P_MobjCheckWater(mobj); // solely for MFE_UNDERWATER for A_FlickySpawn
- {
- if (mobj->tracer && mobj->tracer->player && mobj->tracer->health > 0
- && P_AproxDistance(P_AproxDistance(mobj->tracer->x - mobj->x, mobj->tracer->y - mobj->y), mobj->tracer->z - mobj->z) <= mobj->radius * 16)
- {
- // Home in on the target.
- P_HomingAttack(mobj, mobj->tracer);
+static boolean P_MobjPushableThink(mobj_t *mobj)
+{
+ P_MobjCheckWater(mobj);
+ P_PushableThinker(mobj);
- if (mobj->z < mobj->floorz)
- mobj->z = mobj->floorz;
+ // Extinguish fire objects in water. (Yes, it's extraordinarily rare to have a pushable flame object, but Brak uses such a case.)
+ if (mobj->flags & MF_FIRE && mobj->type != MT_PUMA && mobj->type != MT_FIREBALL
+ && (mobj->eflags & (MFE_UNDERWATER | MFE_TOUCHWATER)))
+ {
+ P_KillMobj(mobj, NULL, NULL, 0);
+ return false;
+ }
- if (leveltime % mobj->info->painchance == 0)
- S_StartSound(mobj, mobj->info->activesound);
+ return true;
+}
- if ((statenum_t)(mobj->state-states) != mobj->info->seestate)
- P_SetMobjState(mobj, mobj->info->seestate);
- }
- else
- {
- // Try to find a player
- P_LookForPlayers(mobj, true, true, mobj->radius * 16);
- mobj->momx >>= 1;
- mobj->momy >>= 1;
- mobj->momz >>= 1;
- if ((statenum_t)(mobj->state-states) != mobj->info->spawnstate)
- P_SetMobjState(mobj, mobj->info->spawnstate);
- }
- }
- break;
- case MT_BUMBLEBORE:
- {
- statenum_t st = mobj->state-states;
- if (st == S_BUMBLEBORE_FLY1 || st == S_BUMBLEBORE_FLY2)
- {
- if (!mobj->target)
- P_SetMobjState(mobj, mobj->info->spawnstate);
- else if (P_MobjFlip(mobj)*((mobj->z + (mobj->height>>1)) - (mobj->target->z + (mobj->target->height>>1))) > 0
- && R_PointToDist2(mobj->x, mobj->y, mobj->target->x, mobj->target->y) <= 32*FRACUNIT)
- {
- mobj->momx >>= 1;
- mobj->momy >>= 1;
- if (++mobj->movefactor == 4)
- {
- S_StartSound(mobj, mobj->info->seesound);
- mobj->momx = mobj->momy = mobj->momz = 0;
- mobj->flags = (mobj->flags|MF_PAIN) & ~MF_NOGRAVITY;
- P_SetMobjState(mobj, mobj->info->meleestate);
- }
- }
- else
- mobj->movefactor = 0;
- }
- else if (st == S_BUMBLEBORE_RAISE || st == S_BUMBLEBORE_FALL2) // no _FALL1 because it's an 0-tic
- {
- if (P_IsObjectOnGround(mobj))
- {
- S_StopSound(mobj);
- S_StartSound(mobj, mobj->info->attacksound);
- mobj->flags = (mobj->flags|MF_NOGRAVITY) & ~MF_PAIN;
- mobj->momx = mobj->momy = mobj->momz = 0;
- P_SetMobjState(mobj, mobj->info->painstate);
- }
- else
- {
- mobj->angle += ANGLE_22h;
- mobj->frame = mobj->state->frame + ((mobj->tics & 2)>>1);
- }
- }
- else if (st == S_BUMBLEBORE_STUCK2 && mobj->tics < TICRATE)
- mobj->frame = mobj->state->frame + ((mobj->tics & 2)>>1);
- }
- break;
- case MT_BIGMINE:
- mobj->extravalue1 += 3;
- mobj->extravalue1 %= 360;
- P_UnsetThingPosition(mobj);
- mobj->z += FINESINE(mobj->extravalue1*(FINEMASK+1)/360);
- P_SetThingPosition(mobj);
- break;
- case MT_FLAME:
- if (mobj->flags2 & MF2_BOSSNOTRAP)
- {
- if (!mobj->target || P_MobjWasRemoved(mobj->target))
- {
- if (mobj->tracer && !P_MobjWasRemoved(mobj->tracer))
- P_RemoveMobj(mobj->tracer);
- P_RemoveMobj(mobj);
- return;
- }
- mobj->z = mobj->target->z + mobj->target->momz;
- if (!(mobj->eflags & MFE_VERTICALFLIP))
- mobj->z += mobj->target->height;
- }
- if (mobj->tracer && !P_MobjWasRemoved(mobj->tracer))
- {
- mobj->tracer->z = mobj->z + P_MobjFlip(mobj)*20*mobj->scale;
- if (mobj->eflags & MFE_VERTICALFLIP)
- mobj->tracer->z += mobj->height;
- }
- break;
- case MT_WAVINGFLAG1:
- case MT_WAVINGFLAG2:
+static boolean P_MobjBossThink(mobj_t *mobj)
+{
+#ifdef HAVE_BLUA
+ if (LUAh_BossThinker(mobj))
+ {
+ if (P_MobjWasRemoved(mobj))
+ return false;
+ }
+ else if (P_MobjWasRemoved(mobj))
+ return false;
+ else
+#endif
+ switch (mobj->type)
+ {
+ case MT_EGGMOBILE:
+ if (mobj->health < mobj->info->damage + 1 && leveltime & 2)
+ {
+ fixed_t rad = mobj->radius >> FRACBITS;
+ fixed_t hei = mobj->height >> FRACBITS;
+ mobj_t *particle = P_SpawnMobjFromMobj(mobj,
+ P_RandomRange(rad, -rad) << FRACBITS,
+ P_RandomRange(rad, -rad) << FRACBITS,
+ P_RandomRange(hei / 2, hei) << FRACBITS,
+ MT_SMOKE);
+ P_SetObjectMomZ(particle, 2 << FRACBITS, false);
+ particle->momz += mobj->momz;
+ }
+ if (mobj->flags2 & MF2_SKULLFLY)
+#if 1
+ P_SpawnGhostMobj(mobj);
+#else // all the way back from final demo... MT_THOK isn't even the same size anymore!
+ {
+ mobj_t *spawnmobj;
+ spawnmobj = P_SpawnMobj(mobj->x, mobj->y, mobj->z, mobj->info->painchance);
+ P_SetTarget(&spawnmobj->target, mobj);
+ spawnmobj->color = SKINCOLOR_GREY;
+ }
+#endif
+ P_Boss1Thinker(mobj);
+ break;
+ case MT_EGGMOBILE2:
+ if (mobj->health < mobj->info->damage + 1 && leveltime & 2)
+ {
+ fixed_t rad = mobj->radius >> FRACBITS;
+ fixed_t hei = mobj->height >> FRACBITS;
+ mobj_t *particle = P_SpawnMobjFromMobj(mobj,
+ P_RandomRange(rad, -rad) << FRACBITS,
+ P_RandomRange(rad, -rad) << FRACBITS,
+ P_RandomRange(hei/2, hei) << FRACBITS,
+ MT_SMOKE);
+ P_SetObjectMomZ(particle, 2 << FRACBITS, false);
+ particle->momz += mobj->momz;
+ }
+ P_Boss2Thinker(mobj);
+ break;
+ case MT_EGGMOBILE3:
+ if (mobj->health < mobj->info->damage + 1 && leveltime & 2)
+ {
+ fixed_t rad = mobj->radius >> FRACBITS;
+ fixed_t hei = mobj->height >> FRACBITS;
+ mobj_t *particle = P_SpawnMobjFromMobj(mobj,
+ P_RandomRange(rad, -rad) << FRACBITS,
+ P_RandomRange(rad, -rad) << FRACBITS,
+ P_RandomRange(hei/2, hei) << FRACBITS,
+ MT_SMOKE);
+ P_SetObjectMomZ(particle, 2 << FRACBITS, false);
+ particle->momz += mobj->momz;
+ }
+ P_Boss3Thinker(mobj);
+ break;
+ case MT_EGGMOBILE4:
+ if (mobj->health < mobj->info->damage + 1 && leveltime & 2)
+ {
+ fixed_t rad = mobj->radius >> FRACBITS;
+ fixed_t hei = mobj->height >> FRACBITS;
+ mobj_t* particle = P_SpawnMobjFromMobj(mobj,
+ P_RandomRange(rad, -rad) << FRACBITS,
+ P_RandomRange(rad, -rad) << FRACBITS,
+ P_RandomRange(hei/2, hei) << FRACBITS,
+ MT_SMOKE);
+ P_SetObjectMomZ(particle, 2 << FRACBITS, false);
+ particle->momz += mobj->momz;
+ }
+ P_Boss4Thinker(mobj);
+ break;
+ case MT_FANG:
+ P_Boss5Thinker(mobj);
+ break;
+ case MT_BLACKEGGMAN:
+ P_Boss7Thinker(mobj);
+ break;
+ case MT_METALSONIC_BATTLE:
+ P_Boss9Thinker(mobj);
+ break;
+ default: // Generic SOC-made boss
+ if (mobj->flags2 & MF2_SKULLFLY)
+ P_SpawnGhostMobj(mobj);
+ P_GenericBossThinker(mobj);
+ break;
+ }
+ if (mobj->flags2 & MF2_BOSSFLEE)
+ {
+ if (mobj->extravalue1)
+ {
+ if (!(--mobj->extravalue1))
+ {
+ if (mobj->target)
{
- fixed_t base = (leveltime<<(FRACBITS+1));
- mobj_t *seg = mobj->tracer, *prev = mobj;
- mobj->movedir = mobj->angle
- + ((((FINESINE((FixedAngle(base<<1)>>ANGLETOFINESHIFT) & FINEMASK)
- + FINESINE((FixedAngle(base<<4)>>ANGLETOFINESHIFT) & FINEMASK))>>1)
- + FINESINE((FixedAngle(base*9)>>ANGLETOFINESHIFT) & FINEMASK)
- + FINECOSINE(((FixedAngle(base*9))>>ANGLETOFINESHIFT) & FINEMASK))<<12); //*2^12
- while (seg)
- {
- seg->movedir = seg->angle;
- seg->angle = prev->movedir;
- P_UnsetThingPosition(seg);
- seg->x = prev->x + P_ReturnThrustX(prev, prev->angle, prev->radius);
- seg->y = prev->y + P_ReturnThrustY(prev, prev->angle, prev->radius);
- seg->z = prev->z + prev->height - (seg->scale>>1);
- P_SetThingPosition(seg);
- prev = seg;
- seg = seg->tracer;
- }
- }
- break;
- case MT_SPINCUSHION:
- if (mobj->target && mobj->state-states >= S_SPINCUSHION_AIM1 && mobj->state-states <= S_SPINCUSHION_AIM5)
+ mobj->momz = FixedMul(FixedDiv(mobj->target->z - mobj->z, P_AproxDistance(mobj->x - mobj->target->x, mobj->y - mobj->target->y)), mobj->scale << 1);
mobj->angle = R_PointToAngle2(mobj->x, mobj->y, mobj->target->x, mobj->target->y);
- break;
- case MT_CRUSHCLAW:
- if (mobj->state-states == S_CRUSHCLAW_STAY && mobj->target)
+ }
+ else
+ mobj->momz = 8*mobj->scale;
+ }
+ else
+ mobj->angle += mobj->movedir;
+ }
+ else if (mobj->target)
+ P_InstaThrust(mobj, mobj->angle, FixedMul(12*FRACUNIT, mobj->scale));
+ }
+ if (mobj->type == MT_CYBRAKDEMON && !mobj->health)
+ {
+ if (!(mobj->tics & 1))
+ {
+ var1 = 2;
+ var2 = 0;
+ A_BossScream(mobj);
+ }
+ if (P_CheckDeathPitCollide(mobj))
+ {
+ P_RemoveMobj(mobj);
+ return false;
+ }
+ if (mobj->momz && mobj->z + mobj->momz <= mobj->floorz)
+ {
+ S_StartSound(mobj, sfx_befall);
+ if (mobj->state != states + S_CYBRAKDEMON_DIE8)
+ P_SetMobjState(mobj, S_CYBRAKDEMON_DIE8);
+ }
+ }
+ return true;
+}
+
+static boolean P_MobjDeadThink(mobj_t *mobj)
+{
+ switch (mobj->type)
+ {
+ case MT_BLUESPHERE:
+ if ((mobj->tics >> 2) + 1 > 0 && (mobj->tics >> 2) + 1 <= tr_trans60) // tr_trans50 through tr_trans90, shifting once every second frame
+ mobj->frame = (NUMTRANSMAPS - ((mobj->tics >> 2) + 1)) << FF_TRANSSHIFT;
+ else // tr_trans60 otherwise
+ mobj->frame = tr_trans60 << FF_TRANSSHIFT;
+ break;
+ case MT_EGGCAPSULE:
+ if (mobj->z <= mobj->floorz)
+ {
+ P_RemoveMobj(mobj);
+ return false;
+ }
+ break;
+ case MT_FAKEMOBILE:
+ if (mobj->scale == mobj->destscale)
+ {
+ if (!mobj->fuse)
+ {
+ S_StartSound(mobj, sfx_s3k77);
+ mobj->flags2 |= MF2_DONTDRAW;
+ mobj->fuse = TICRATE;
+ }
+ return false;
+ }
+ if (!mobj->reactiontime)
+ {
+ if (P_RandomChance(FRACUNIT/2))
+ mobj->movefactor = FRACUNIT;
+ else
+ mobj->movefactor = -FRACUNIT;
+ if (P_RandomChance(FRACUNIT/2))
+ mobj->movedir = ANG20;
+ else
+ mobj->movedir = -ANG20;
+ mobj->reactiontime = 5;
+ }
+ mobj->momz += mobj->movefactor;
+ mobj->angle += mobj->movedir;
+ P_InstaThrust(mobj, mobj->angle, -mobj->info->speed);
+ mobj->reactiontime--;
+ break;
+ case MT_EGGSHIELD:
+ mobj->flags2 ^= MF2_DONTDRAW;
+ break;
+ case MT_EGGTRAP: // Egg Capsule animal release
+ if (mobj->fuse > 0)// && mobj->fuse < TICRATE-(TICRATE/7))
+ {
+ INT32 i;
+ fixed_t x, y, z;
+ fixed_t ns;
+ mobj_t* mo2;
+ mobj_t* flicky;
+
+ z = mobj->subsector->sector->floorheight + FRACUNIT + (P_RandomKey(64) << FRACBITS);
+ for (i = 0; i < 3; i++)
+ {
+ const angle_t fa = P_RandomKey(FINEANGLES) & FINEMASK;
+ ns = 64*FRACUNIT;
+ x = mobj->x + FixedMul(FINESINE(fa), ns);
+ y = mobj->y + FixedMul(FINECOSINE(fa), ns);
+
+ mo2 = P_SpawnMobj(x, y, z, MT_EXPLODE);
+ P_SetMobjStateNF(mo2, S_XPLD_EGGTRAP); // so the flickies don't lose their target if they spawn
+ ns = 4*FRACUNIT;
+ mo2->momx = FixedMul(FINESINE(fa), ns);
+ mo2->momy = FixedMul(FINECOSINE(fa), ns);
+ mo2->angle = fa << ANGLETOFINESHIFT;
+
+ if (!i && !(mobj->fuse & 2))
+ S_StartSound(mo2, mobj->info->deathsound);
+
+ flicky = P_InternalFlickySpawn(mo2, 0, 8*FRACUNIT, false, -1);
+ if (!flicky)
+ break;
+
+ P_SetTarget(&flicky->target, mo2);
+ flicky->momx = mo2->momx;
+ flicky->momy = mo2->momy;
+ }
+
+ mobj->fuse--;
+ }
+ break;
+ case MT_PLAYER:
+ /// \todo Have the player's dead body completely finish its animation even if they've already respawned.
+ if (!mobj->fuse)
+ { // Go away.
+ /// \todo Actually go ahead and remove mobj completely, and fix any bugs and crashes doing this creates. Chasecam should stop moving, and F12 should never return to it.
+ mobj->momz = 0;
+ if (mobj->player)
+ mobj->flags2 |= MF2_DONTDRAW;
+ else // safe to remove, nobody's going to complain!
+ {
+ P_RemoveMobj(mobj);
+ return false;
+ }
+ }
+ else // Apply gravity to fall downwards.
+ {
+ if (mobj->player && !(mobj->fuse % 8) && (mobj->player->charflags & SF_MACHINE))
+ {
+ fixed_t r = mobj->radius >> FRACBITS;
+ mobj_t *explosion = P_SpawnMobj(
+ mobj->x + (P_RandomRange(r, -r) << FRACBITS),
+ mobj->y + (P_RandomRange(r, -r) << FRACBITS),
+ mobj->z + (P_RandomKey(mobj->height >> FRACBITS) << FRACBITS),
+ MT_SONIC3KBOSSEXPLODE);
+ S_StartSound(explosion, sfx_s3kb4);
+ }
+ if (mobj->movedir == DMG_DROWNED)
+ P_SetObjectMomZ(mobj, -FRACUNIT/2, true); // slower fall from drowning
+ else
+ P_SetObjectMomZ(mobj, -2*FRACUNIT/3, true);
+ }
+ break;
+ case MT_METALSONIC_RACE:
+ {
+ if (!(mobj->fuse % 8))
+ {
+ fixed_t r = mobj->radius >> FRACBITS;
+ mobj_t *explosion = P_SpawnMobj(
+ mobj->x + (P_RandomRange(r, -r) << FRACBITS),
+ mobj->y + (P_RandomRange(r, -r) << FRACBITS),
+ mobj->z + (P_RandomKey(mobj->height >> FRACBITS) << FRACBITS),
+ MT_SONIC3KBOSSEXPLODE);
+ S_StartSound(explosion, sfx_s3kb4);
+ }
+ P_SetObjectMomZ(mobj, -2*FRACUNIT/3, true);
+ }
+ break;
+ default:
+ break;
+ }
+ return true;
+}
+
+// Angle-to-tracer to trigger a linedef exec
+// See Linedef Exec 457 (Track mobj angle to point)
+static void P_TracerAngleThink(mobj_t *mobj)
+{
+ angle_t ang;
+
+ if (!mobj->tracer)
+ return;
+
+ if (!mobj->extravalue2)
+ return;
+
+ // mobj->lastlook - Don't disable behavior after first failure
+ // mobj->extravalue1 - Angle tolerance
+ // mobj->extravalue2 - Exec tag upon failure
+ // mobj->cvval - Allowable failure delay
+ // mobj->cvmem - Failure timer
+
+ ang = mobj->angle - 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
+ // yet tracer is still in the camera view
+
+ // failure state: mobj is not facing tracer
+ // Reasaonable defaults: ANGLE_67h, ANGLE_292h
+ if (ang >= (angle_t)mobj->extravalue1 && ang <= ANGLE_MAX - (angle_t)mobj->extravalue1)
+ {
+ if (mobj->cvmem)
+ mobj->cvmem--;
+ else
+ {
+ INT32 exectag = mobj->extravalue2; // remember this before we erase the values
+
+ if (mobj->lastlook)
+ mobj->cvmem = mobj->cusval; // reset timer for next failure
+ else
+ {
+ // disable after first failure
+ mobj->eflags &= ~MFE_TRACERANGLE;
+ mobj->lastlook = mobj->extravalue1 = mobj->extravalue2 = mobj->cvmem = mobj->cusval = 0;
+ }
+
+ P_LinedefExecute(exectag, mobj, NULL);
+ }
+ }
+ else
+ mobj->cvmem = mobj->cusval; // reset failure timer
+}
+
+static void P_ArrowThink(mobj_t *mobj)
+{
+ if (mobj->flags & MF_MISSILE)
+ {
+ // Calculate the angle of movement.
+ /*
+ momz
+ / |
+ / |
+ / |
+ 0------dist(momx,momy)
+ */
+
+ fixed_t dist = P_AproxDistance(mobj->momx, mobj->momy);
+ angle_t angle = R_PointToAngle2(0, 0, dist, mobj->momz);
+
+ if (angle > ANG20 && angle <= ANGLE_180)
+ mobj->frame = 2;
+ else if (angle < ANG340 && angle > ANGLE_180)
+ mobj->frame = 0;
+ else
+ mobj->frame = 1;
+
+ if (!(mobj->extravalue1) && (mobj->momz < 0))
+ {
+ mobj->extravalue1 = 1;
+ S_StartSound(mobj, mobj->info->activesound);
+ }
+ if (leveltime & 1)
+ {
+ mobj_t *dust = P_SpawnMobjFromMobj(mobj, 0, 0, 0, MT_PARTICLE);
+ dust->tics = 18;
+ dust->scalespeed = 4096;
+ dust->destscale = FRACUNIT/32;
+ }
+ }
+ else
+ mobj->flags2 ^= MF2_DONTDRAW;
+}
+
+static void P_BumbleboreThink(mobj_t *mobj)
+{
+ statenum_t st = mobj->state - states;
+ if (st == S_BUMBLEBORE_FLY1 || st == S_BUMBLEBORE_FLY2)
+ {
+ if (!mobj->target)
+ P_SetMobjState(mobj, mobj->info->spawnstate);
+ else if (P_MobjFlip(mobj)*((mobj->z + (mobj->height >> 1)) - (mobj->target->z + (mobj->target->height >> 1))) > 0
+ && R_PointToDist2(mobj->x, mobj->y, mobj->target->x, mobj->target->y) <= 32*FRACUNIT)
+ {
+ mobj->momx >>= 1;
+ mobj->momy >>= 1;
+ if (++mobj->movefactor == 4)
+ {
+ S_StartSound(mobj, mobj->info->seesound);
+ mobj->momx = mobj->momy = mobj->momz = 0;
+ mobj->flags = (mobj->flags|MF_PAIN) & ~MF_NOGRAVITY;
+ P_SetMobjState(mobj, mobj->info->meleestate);
+ }
+ }
+ else
+ mobj->movefactor = 0;
+ }
+ else if (st == S_BUMBLEBORE_RAISE || st == S_BUMBLEBORE_FALL2) // no _FALL1 because it's an 0-tic
+ {
+ if (P_IsObjectOnGround(mobj))
+ {
+ S_StopSound(mobj);
+ S_StartSound(mobj, mobj->info->attacksound);
+ mobj->flags = (mobj->flags | MF_NOGRAVITY) & ~MF_PAIN;
+ mobj->momx = mobj->momy = mobj->momz = 0;
+ P_SetMobjState(mobj, mobj->info->painstate);
+ }
+ else
+ {
+ mobj->angle += ANGLE_22h;
+ mobj->frame = mobj->state->frame + ((mobj->tics & 2) >> 1);
+ }
+ }
+ else if (st == S_BUMBLEBORE_STUCK2 && mobj->tics < TICRATE)
+ mobj->frame = mobj->state->frame + ((mobj->tics & 2) >> 1);
+}
+
+static boolean P_HangsterThink(mobj_t *mobj)
+{
+ statenum_t st = mobj->state - states;
+ //ghost image trail when flying down
+ if (st == S_HANGSTER_SWOOP1 || st == S_HANGSTER_SWOOP2)
+ {
+ P_SpawnGhostMobj(mobj);
+ //curve when in line with target, otherwise curve to avoid crashing into floor
+ if ((mobj->z - mobj->floorz <= 80*FRACUNIT) || (mobj->target && (mobj->z - mobj->target->z <= 80*FRACUNIT)))
+ P_SetMobjState(mobj, (st = S_HANGSTER_ARC1));
+ }
+
+ //swoop arc movement stuff
+ if (st == S_HANGSTER_ARC1)
+ {
+ A_FaceTarget(mobj);
+ P_Thrust(mobj, mobj->angle, 1*FRACUNIT);
+ }
+ else if (st == S_HANGSTER_ARC2)
+ P_Thrust(mobj, mobj->angle, 2*FRACUNIT);
+ else if (st == S_HANGSTER_ARC3)
+ P_Thrust(mobj, mobj->angle, 4*FRACUNIT);
+ //if movement has stopped while flying (like hitting a wall), fly up immediately
+ else if (st == S_HANGSTER_FLY1 && !mobj->momx && !mobj->momy)
+ {
+ mobj->extravalue1 = 0;
+ P_SetMobjState(mobj, S_HANGSTER_ARCUP1);
+ }
+ //after swooping back up, check for ceiling
+ else if ((st == S_HANGSTER_RETURN1 || st == S_HANGSTER_RETURN2) && mobj->momz == 0 && mobj->ceilingz == (mobj->z + mobj->height))
+ P_SetMobjState(mobj, (st = S_HANGSTER_RETURN3));
+
+ //should you roost on a ceiling with F_SKY1 as its flat, disappear forever
+ if (st == S_HANGSTER_RETURN3 && mobj->momz == 0 && mobj->ceilingz == (mobj->z + mobj->height)
+ && mobj->subsector->sector->ceilingpic == skyflatnum
+ && mobj->subsector->sector->ceilingheight == mobj->ceilingz)
+ {
+ P_RemoveMobj(mobj);
+ return false;
+ }
+
+ return true;
+}
+
+static boolean P_JetFume1Think(mobj_t *mobj)
+{
+ fixed_t jetx, jety;
+
+ if (!mobj->target // if you have no target
+ || (!(mobj->target->flags & MF_BOSS) && mobj->target->health <= 0)) // or your target isn't a boss and it's popped now
+ { // then remove yourself as well!
+ P_RemoveMobj(mobj);
+ return false;
+ }
+
+ jetx = mobj->target->x + P_ReturnThrustX(mobj->target, mobj->target->angle, FixedMul(-64*FRACUNIT, mobj->target->scale));
+ jety = mobj->target->y + P_ReturnThrustY(mobj->target, mobj->target->angle, FixedMul(-64*FRACUNIT, mobj->target->scale));
+
+ if (mobj->fuse == 56) // First one
+ {
+ P_UnsetThingPosition(mobj);
+ mobj->x = jetx;
+ mobj->y = jety;
+ if (mobj->target->eflags & MFE_VERTICALFLIP)
+ mobj->z = mobj->target->z + mobj->target->height - mobj->height - FixedMul(38*FRACUNIT, mobj->target->scale);
+ else
+ mobj->z = mobj->target->z + FixedMul(38*FRACUNIT, mobj->target->scale);
+ mobj->floorz = mobj->z;
+ mobj->ceilingz = mobj->z + mobj->height;
+ P_SetThingPosition(mobj);
+ }
+ else if (mobj->fuse == 57)
+ {
+ P_UnsetThingPosition(mobj);
+ mobj->x = jetx + P_ReturnThrustX(mobj->target, mobj->target->angle - ANGLE_90, FixedMul(24*FRACUNIT, mobj->target->scale));
+ mobj->y = jety + P_ReturnThrustY(mobj->target, mobj->target->angle - ANGLE_90, FixedMul(24*FRACUNIT, mobj->target->scale));
+ if (mobj->target->eflags & MFE_VERTICALFLIP)
+ mobj->z = mobj->target->z + mobj->target->height - mobj->height - FixedMul(12*FRACUNIT, mobj->target->scale);
+ else
+ mobj->z = mobj->target->z + FixedMul(12*FRACUNIT, mobj->target->scale);
+ mobj->floorz = mobj->z;
+ mobj->ceilingz = mobj->z + mobj->height;
+ P_SetThingPosition(mobj);
+ }
+ else if (mobj->fuse == 58)
+ {
+ P_UnsetThingPosition(mobj);
+ mobj->x = jetx + P_ReturnThrustX(mobj->target, mobj->target->angle + ANGLE_90, FixedMul(24*FRACUNIT, mobj->target->scale));
+ mobj->y = jety + P_ReturnThrustY(mobj->target, mobj->target->angle + ANGLE_90, FixedMul(24*FRACUNIT, mobj->target->scale));
+ if (mobj->target->eflags & MFE_VERTICALFLIP)
+ mobj->z = mobj->target->z + mobj->target->height - mobj->height - FixedMul(12*FRACUNIT, mobj->target->scale);
+ else
+ mobj->z = mobj->target->z + FixedMul(12*FRACUNIT, mobj->target->scale);
+ mobj->floorz = mobj->z;
+ mobj->ceilingz = mobj->z + mobj->height;
+ P_SetThingPosition(mobj);
+ }
+ else if (mobj->fuse == 59)
+ {
+ boolean dashmod = ((mobj->target->flags & MF_PAIN) && (mobj->target->health <= mobj->target->info->damage));
+ jetx = mobj->target->x + P_ReturnThrustX(mobj->target, mobj->target->angle, -mobj->target->radius);
+ jety = mobj->target->y + P_ReturnThrustY(mobj->target, mobj->target->angle, -mobj->target->radius);
+ P_UnsetThingPosition(mobj);
+ mobj->x = jetx;
+ mobj->y = jety;
+ mobj->destscale = mobj->target->scale;
+ if (!(dashmod && mobj->target->state == states + S_METALSONIC_BOUNCE))
+ {
+ mobj->destscale = (mobj->destscale + FixedDiv(R_PointToDist2(0, 0, mobj->target->momx, mobj->target->momy), 36*mobj->target->scale))/3;
+ }
+ if (mobj->target->eflags & MFE_VERTICALFLIP)
+ mobj->z = mobj->target->z + mobj->target->height/2 + mobj->height/2;
+ else
+ mobj->z = mobj->target->z + mobj->target->height/2 - mobj->height/2;
+ mobj->floorz = mobj->z;
+ mobj->ceilingz = mobj->z + mobj->height;
+ P_SetThingPosition(mobj);
+ if (dashmod)
+ {
+ mobj->color = SKINCOLOR_SUNSET;
+ if (mobj->target->movecount == 3 && !mobj->target->reactiontime && (mobj->target->movedir == 0 || mobj->target->movedir == 2))
+ P_SpawnGhostMobj(mobj);
+ }
+ else
+ mobj->color = SKINCOLOR_ICY;
+ }
+ mobj->fuse++;
+ return true;
+}
+
+static boolean P_EggRobo1Think(mobj_t *mobj)
+{
+#define SPECTATORRADIUS (96*mobj->scale)
+ if (!(mobj->flags2 & MF2_STRONGBOX))
+ {
+ mobj->cusval = mobj->x; // eat my SOCs, p_mobj.h warning, we have lua now
+ mobj->cvmem = mobj->y; // ditto
+ mobj->movedir = mobj->angle;
+ mobj->threshold = P_MobjFlip(mobj)*10*mobj->scale;
+ if (mobj->threshold < 0)
+ mobj->threshold += (mobj->ceilingz - mobj->height);
+ else
+ mobj->threshold += mobj->floorz;
+ var1 = 4;
+ A_BossJetFume(mobj);
+ mobj->flags2 |= MF2_STRONGBOX;
+ }
+
+ if (mobj->state == &states[mobj->info->deathstate]) // todo: make map actually set health to 0 for these
+ {
+ if (mobj->movecount)
+ {
+ if (!(--mobj->movecount))
+ S_StartSound(mobj, mobj->info->deathsound);
+ }
+ else
+ {
+ mobj->momz += P_MobjFlip(mobj)*mobj->scale;
+ if (mobj->momz > 0)
+ {
+ if (mobj->z + mobj->momz > mobj->ceilingz + (1000 << FRACBITS))
{
- mobj_t *chain = mobj->target->target;
- SINT8 sign = ((mobj->tics & 1) ? mobj->tics : -(SINT8)(mobj->tics));
- while (chain)
- {
- chain->z = chain->watertop + sign*mobj->scale;
- sign = -sign;
- chain = chain->target;
- }
+ P_RemoveMobj(mobj);
+ return false;
}
- break;
- case MT_SMASHINGSPIKEBALL:
- mobj->momx = mobj->momy = 0;
- if (mobj->state-states == S_SMASHSPIKE_FALL && P_IsObjectOnGround(mobj))
+ }
+ else if (mobj->z + mobj->height + mobj->momz < mobj->floorz - (1000 << FRACBITS))
+ {
+ P_RemoveMobj(mobj);
+ return false;
+ }
+ }
+ }
+ else
+ {
+ fixed_t basex = mobj->cusval, basey = mobj->cvmem;
+
+ if (mobj->spawnpoint && mobj->spawnpoint->options & (MTF_AMBUSH|MTF_OBJECTSPECIAL))
+ {
+ angle_t sideang = mobj->movedir + ((mobj->spawnpoint->options & MTF_AMBUSH) ? ANGLE_90 : -ANGLE_90);
+ fixed_t oscillate = FixedMul(FINESINE(((leveltime * ANG1) >> (ANGLETOFINESHIFT + 2)) & FINEMASK), 250*mobj->scale);
+ basex += P_ReturnThrustX(mobj, sideang, oscillate);
+ basey += P_ReturnThrustY(mobj, sideang, oscillate);
+ }
+
+ mobj->z = mobj->threshold + FixedMul(FINESINE(((leveltime + mobj->movecount)*ANG2 >> (ANGLETOFINESHIFT - 2)) & FINEMASK), 8*mobj->scale);
+ if (mobj->state != &states[mobj->info->meleestate])
+ {
+ boolean didmove = false;
+
+ if (mobj->state == &states[mobj->info->spawnstate])
+ {
+ UINT8 i;
+ fixed_t dist = INT32_MAX;
+
+ for (i = 0; i < MAXPLAYERS; i++)
{
- P_SetMobjState(mobj, S_SMASHSPIKE_STOMP1);
- S_StartSound(mobj, sfx_spsmsh);
+ fixed_t compdist;
+ if (!playeringame[i])
+ continue;
+ if (players[i].spectator)
+ continue;
+ if (!players[i].mo)
+ continue;
+ if (!players[i].mo->health)
+ continue;
+ if (P_PlayerInPain(&players[i]))
+ continue;
+ if (players[i].mo->z > mobj->z + mobj->height + 8*mobj->scale)
+ continue;
+ if (players[i].mo->z + players[i].mo->height < mobj->z - 8*mobj->scale)
+ continue;
+ compdist = P_AproxDistance(
+ players[i].mo->x + players[i].mo->momx - basex,
+ players[i].mo->y + players[i].mo->momy - basey);
+ if (compdist >= dist)
+ continue;
+ dist = compdist;
+ P_SetTarget(&mobj->target, players[i].mo);
}
- else if (mobj->state-states == S_SMASHSPIKE_RISE2 && P_MobjFlip(mobj)*(mobj->z - mobj->movecount) >= 0)
+
+ if (dist < (SPECTATORRADIUS << 1))
{
- mobj->momz = 0;
- P_SetMobjState(mobj, S_SMASHSPIKE_FLOAT);
+ didmove = true;
+ mobj->frame = 3 + ((leveltime & 2) >> 1);
+ mobj->angle = R_PointToAngle2(mobj->x, mobj->y, mobj->target->x, mobj->target->y);
+
+ if (P_AproxDistance(
+ mobj->x - basex,
+ mobj->y - basey)
+ < mobj->scale)
+ S_StartSound(mobj, mobj->info->seesound);
+
+ P_TeleportMove(mobj,
+ (15*(mobj->x >> 4)) + (basex >> 4) + P_ReturnThrustX(mobj, mobj->angle, SPECTATORRADIUS >> 4),
+ (15*(mobj->y >> 4)) + (basey >> 4) + P_ReturnThrustY(mobj, mobj->angle, SPECTATORRADIUS >> 4),
+ mobj->z);
}
- break;
- case MT_HANGSTER:
+ else
{
- statenum_t st = mobj->state-states;
- //ghost image trail when flying down
- if (st == S_HANGSTER_SWOOP1 || st == S_HANGSTER_SWOOP2)
- {
- P_SpawnGhostMobj(mobj);
- //curve when in line with target, otherwise curve to avoid crashing into floor
- if ((mobj->z - mobj->floorz <= 80*FRACUNIT) || (mobj->target && (mobj->z - mobj->target->z <= 80*FRACUNIT)))
- P_SetMobjState(mobj, (st = S_HANGSTER_ARC1));
- }
+ angle_t diff = (mobj->movedir - mobj->angle);
+ if (diff > ANGLE_180)
+ diff = InvAngle(InvAngle(diff)/8);
+ else
+ diff /= 8;
+ mobj->angle += diff;
- //swoop arc movement stuff
- if (st == S_HANGSTER_ARC1)
- {
- A_FaceTarget(mobj);
- P_Thrust(mobj, mobj->angle, 1*FRACUNIT);
- }
- else if (st == S_HANGSTER_ARC2)
- P_Thrust(mobj, mobj->angle, 2*FRACUNIT);
- else if (st == S_HANGSTER_ARC3)
- P_Thrust(mobj, mobj->angle, 4*FRACUNIT);
- //if movement has stopped while flying (like hitting a wall), fly up immediately
- else if (st == S_HANGSTER_FLY1 && !mobj->momx && !mobj->momy)
- {
- mobj->extravalue1 = 0;
- P_SetMobjState(mobj, S_HANGSTER_ARCUP1);
- }
- //after swooping back up, check for ceiling
- else if ((st == S_HANGSTER_RETURN1 || st == S_HANGSTER_RETURN2) && mobj->momz == 0 && mobj->ceilingz == (mobj->z + mobj->height))
- P_SetMobjState(mobj, (st = S_HANGSTER_RETURN3));
-
- //should you roost on a ceiling with F_SKY1 as its flat, disappear forever
- if (st == S_HANGSTER_RETURN3 && mobj->momz == 0 && mobj->ceilingz == (mobj->z + mobj->height)
- && mobj->subsector->sector->ceilingpic == skyflatnum
- && mobj->subsector->sector->ceilingheight == mobj->ceilingz)
- {
- P_RemoveMobj(mobj);
- return;
- }
+ dist = FINECOSINE(((leveltime + mobj->movecount)*ANG2 >> (ANGLETOFINESHIFT - 2)) & FINEMASK);
+
+ if (abs(dist) < FRACUNIT/2)
+ mobj->frame = 0;
+ else
+ mobj->frame = (dist > 0) ? 1 : 2;
}
- break;
- case MT_LHRT:
- mobj->momx = FixedMul(mobj->momx, mobj->extravalue2);
- mobj->momy = FixedMul(mobj->momy, mobj->extravalue2);
- break;
- case MT_EGGCAPSULE:
- if (!mobj->reactiontime)
+ }
+
+ if (!didmove)
+ {
+ if (P_AproxDistance(mobj->x - basex, mobj->y - basey) < mobj->scale)
+ P_TeleportMove(mobj, basex, basey, mobj->z);
+ else
+ P_TeleportMove(mobj,
+ (15*(mobj->x >> 4)) + (basex >> 4),
+ (15*(mobj->y >> 4)) + (basey >> 4),
+ mobj->z);
+ }
+ }
+ }
+ return true;
+#undef SPECTATORRADIUS
+}
+
+static void P_NiGHTSDroneThink(mobj_t *mobj)
+{
+ {
+ // variable setup
+ mobj_t *goalpost = NULL;
+ mobj_t *sparkle = NULL;
+ mobj_t *droneman = NULL;
+
+ boolean flip = mobj->flags2 & MF2_OBJECTFLIP;
+ boolean topaligned = (mobj->flags & MF_SLIDEME) && !(mobj->flags & MF_GRENADEBOUNCE);
+ boolean middlealigned = (mobj->flags & MF_GRENADEBOUNCE) && !(mobj->flags & MF_SLIDEME);
+ boolean bottomoffsetted = !(mobj->flags & MF_SLIDEME) && !(mobj->flags & MF_GRENADEBOUNCE);
+ boolean flipchanged = false;
+
+ fixed_t dronemanoffset, goaloffset, sparkleoffset, droneboxmandiff, dronemangoaldiff;
+
+ if (mobj->target && mobj->target->type == MT_NIGHTSDRONE_GOAL)
+ {
+ goalpost = mobj->target;
+ if (goalpost->target && goalpost->target->type == MT_NIGHTSDRONE_SPARKLING)
+ sparkle = goalpost->target;
+ if (goalpost->tracer && goalpost->tracer->type == MT_NIGHTSDRONE_MAN)
+ droneman = goalpost->tracer;
+ }
+
+ if (!goalpost || !sparkle || !droneman)
+ return;
+
+ // did NIGHTSDRONE position, scale, flip, or flags change? all elements need to be synced
+ droneboxmandiff = max(mobj->height - droneman->height, 0);
+ dronemangoaldiff = max(droneman->height - goalpost->height, 0);
+
+ if (!(goalpost->flags2 & MF2_OBJECTFLIP) && (mobj->flags2 & MF2_OBJECTFLIP))
+ {
+ goalpost->eflags |= MFE_VERTICALFLIP;
+ goalpost->flags2 |= MF2_OBJECTFLIP;
+ sparkle->eflags |= MFE_VERTICALFLIP;
+ sparkle->flags2 |= MF2_OBJECTFLIP;
+ droneman->eflags |= MFE_VERTICALFLIP;
+ droneman->flags2 |= MF2_OBJECTFLIP;
+ flipchanged = true;
+ }
+ else if ((goalpost->flags2 & MF2_OBJECTFLIP) && !(mobj->flags2 & MF2_OBJECTFLIP))
+ {
+ goalpost->eflags &= ~MFE_VERTICALFLIP;
+ goalpost->flags2 &= ~MF2_OBJECTFLIP;
+ sparkle->eflags &= ~MFE_VERTICALFLIP;
+ sparkle->flags2 &= ~MF2_OBJECTFLIP;
+ droneman->eflags &= ~MFE_VERTICALFLIP;
+ droneman->flags2 &= ~MF2_OBJECTFLIP;
+ flipchanged = true;
+ }
+
+ if (goalpost->destscale != mobj->destscale
+ || goalpost->movefactor != mobj->z
+ || goalpost->friction != mobj->height
+ || flipchanged
+ || goalpost->threshold != (INT32)(mobj->flags & (MF_SLIDEME|MF_GRENADEBOUNCE)))
+ {
+ goalpost->destscale = sparkle->destscale = droneman->destscale = mobj->destscale;
+
+ // straight copy-pasta from P_SpawnMapThing, case MT_NIGHTSDRONE
+ if (!flip)
+ {
+ if (topaligned) // Align droneman to top of hitbox
{
- // Target nearest player on your mare.
- // (You can make it float up/down by adding MF_FLOAT,
- // but beware level design pitfalls.)
- fixed_t shortest = 1024*FRACUNIT;
- INT32 i;
- P_SetTarget(&mobj->target, NULL);
- for (i = 0; i < MAXPLAYERS; i++)
- if (playeringame[i] && players[i].mo
- && players[i].mare == mobj->threshold && players[i].spheres > 0)
- {
- fixed_t dist = P_AproxDistance(players[i].mo->x - mobj->x, players[i].mo->y - mobj->y);
- if (dist < shortest)
- {
- P_SetTarget(&mobj->target, players[i].mo);
- shortest = dist;
- }
- }
+ dronemanoffset = droneboxmandiff;
+ goaloffset = dronemangoaldiff/2 + dronemanoffset;
}
- break;
- case MT_EGGMOBILE2_POGO:
- if (!mobj->target
- || !mobj->target->health
- || mobj->target->state == &states[mobj->target->info->spawnstate]
- || mobj->target->state == &states[mobj->target->info->raisestate])
+ else if (middlealigned) // Align droneman to center of hitbox
{
- P_RemoveMobj(mobj);
- return;
+ dronemanoffset = droneboxmandiff/2;
+ goaloffset = dronemangoaldiff/2 + dronemanoffset;
}
- P_TeleportMove(mobj, mobj->target->x, mobj->target->y, mobj->target->z - mobj->height);
- break;
- case MT_HAMMER:
- if (mobj->z <= mobj->floorz)
+ else if (bottomoffsetted)
{
- P_RemoveMobj(mobj);
- return;
+ dronemanoffset = 24*FRACUNIT;
+ goaloffset = dronemangoaldiff + dronemanoffset;
}
- break;
- case MT_KOOPA:
- P_KoopaThinker(mobj);
- break;
- case MT_FIREBALL:
- if (P_AproxDistance(mobj->momx, mobj->momy) <= 16*FRACUNIT) // Once fireballs lose enough speed, kill them
+ else
{
- P_KillMobj(mobj, NULL, NULL, 0);
- return;
+ dronemanoffset = 0;
+ goaloffset = dronemangoaldiff/2 + dronemanoffset;
}
- break;
- case MT_REDRING:
- if (((mobj->z < mobj->floorz) || (mobj->z + mobj->height > mobj->ceilingz))
- && mobj->flags & MF_MISSILE)
+
+ sparkleoffset = goaloffset - FixedMul(15*FRACUNIT, mobj->scale);
+ }
+ else
+ {
+ if (topaligned) // Align droneman to top of hitbox
{
- P_ExplodeMissile(mobj);
- return;
+ dronemanoffset = 0;
+ goaloffset = dronemangoaldiff/2 + dronemanoffset;
}
- break;
- case MT_BOSSFLYPOINT:
- return;
- case MT_NIGHTSCORE:
- mobj->color = (UINT8)(leveltime % SKINCOLOR_WHITE);
- break;
- case MT_JETFUME1:
+ else if (middlealigned) // Align droneman to center of hitbox
{
- fixed_t jetx, jety;
-
- if (!mobj->target // if you have no target
- || (!(mobj->target->flags & MF_BOSS) && mobj->target->health <= 0)) // or your target isn't a boss and it's popped now
- { // then remove yourself as well!
- P_RemoveMobj(mobj);
- return;
- }
-
- jetx = mobj->target->x + P_ReturnThrustX(mobj->target, mobj->target->angle, FixedMul(-64*FRACUNIT, mobj->target->scale));
- jety = mobj->target->y + P_ReturnThrustY(mobj->target, mobj->target->angle, FixedMul(-64*FRACUNIT, mobj->target->scale));
-
- if (mobj->fuse == 56) // First one
- {
- P_UnsetThingPosition(mobj);
- mobj->x = jetx;
- mobj->y = jety;
- if (mobj->target->eflags & MFE_VERTICALFLIP)
- mobj->z = mobj->target->z + mobj->target->height - mobj->height - FixedMul(38*FRACUNIT, mobj->target->scale);
- else
- mobj->z = mobj->target->z + FixedMul(38*FRACUNIT, mobj->target->scale);
- mobj->floorz = mobj->z;
- mobj->ceilingz = mobj->z+mobj->height;
- P_SetThingPosition(mobj);
- }
- else if (mobj->fuse == 57)
- {
- P_UnsetThingPosition(mobj);
- mobj->x = jetx + P_ReturnThrustX(mobj->target, mobj->target->angle-ANGLE_90, FixedMul(24*FRACUNIT, mobj->target->scale));
- mobj->y = jety + P_ReturnThrustY(mobj->target, mobj->target->angle-ANGLE_90, FixedMul(24*FRACUNIT, mobj->target->scale));
- if (mobj->target->eflags & MFE_VERTICALFLIP)
- mobj->z = mobj->target->z + mobj->target->height - mobj->height - FixedMul(12*FRACUNIT, mobj->target->scale);
- else
- mobj->z = mobj->target->z + FixedMul(12*FRACUNIT, mobj->target->scale);
- mobj->floorz = mobj->z;
- mobj->ceilingz = mobj->z+mobj->height;
- P_SetThingPosition(mobj);
- }
- else if (mobj->fuse == 58)
- {
- P_UnsetThingPosition(mobj);
- mobj->x = jetx + P_ReturnThrustX(mobj->target, mobj->target->angle+ANGLE_90, FixedMul(24*FRACUNIT, mobj->target->scale));
- mobj->y = jety + P_ReturnThrustY(mobj->target, mobj->target->angle+ANGLE_90, FixedMul(24*FRACUNIT, mobj->target->scale));
- if (mobj->target->eflags & MFE_VERTICALFLIP)
- mobj->z = mobj->target->z + mobj->target->height - mobj->height - FixedMul(12*FRACUNIT, mobj->target->scale);
- else
- mobj->z = mobj->target->z + FixedMul(12*FRACUNIT, mobj->target->scale);
- mobj->floorz = mobj->z;
- mobj->ceilingz = mobj->z+mobj->height;
- P_SetThingPosition(mobj);
- }
- else if (mobj->fuse == 59)
- {
- boolean dashmod = ((mobj->target->flags & MF_PAIN) && (mobj->target->health <= mobj->target->info->damage));
- jetx = mobj->target->x + P_ReturnThrustX(mobj->target, mobj->target->angle, -mobj->target->radius);
- jety = mobj->target->y + P_ReturnThrustY(mobj->target, mobj->target->angle, -mobj->target->radius);
- P_UnsetThingPosition(mobj);
- mobj->x = jetx;
- mobj->y = jety;
- mobj->destscale = mobj->target->scale;
- if (!(dashmod && mobj->target->state == states+S_METALSONIC_BOUNCE))
- {
- mobj->destscale = (mobj->destscale + FixedDiv(R_PointToDist2(0, 0, mobj->target->momx, mobj->target->momy), 36*mobj->target->scale))/3;
- }
- if (mobj->target->eflags & MFE_VERTICALFLIP)
- mobj->z = mobj->target->z + mobj->target->height/2 + mobj->height/2;
- else
- mobj->z = mobj->target->z + mobj->target->height/2 - mobj->height/2;
- mobj->floorz = mobj->z;
- mobj->ceilingz = mobj->z+mobj->height;
- P_SetThingPosition(mobj);
- if (dashmod)
- {
- mobj->color = SKINCOLOR_SUNSET;
- if (mobj->target->movecount == 3 && !mobj->target->reactiontime && (mobj->target->movedir == 0 || mobj->target->movedir == 2))
- P_SpawnGhostMobj(mobj);
- }
- else
- mobj->color = SKINCOLOR_ICY;
- }
- mobj->fuse++;
+ dronemanoffset = droneboxmandiff/2;
+ goaloffset = dronemangoaldiff/2 + dronemanoffset;
}
- break;
- case MT_JETFLAME:
+ else if (bottomoffsetted)
{
- if (!mobj->target // if you have no target
- || (!(mobj->target->flags & MF_BOSS) && mobj->target->health <= 0)) // or your target isn't a boss and it's popped now
- { // then remove yourself as well!
- P_RemoveMobj(mobj);
- return;
- }
-
- P_UnsetThingPosition(mobj);
- mobj->x = mobj->target->x;
- mobj->y = mobj->target->y;
- mobj->z = mobj->target->z - 50*mobj->target->scale;
- mobj->floorz = mobj->z;
- mobj->ceilingz = mobj->z+mobj->height;
- P_SetThingPosition(mobj);
+ dronemanoffset = droneboxmandiff - FixedMul(24*FRACUNIT, mobj->scale);
+ goaloffset = dronemangoaldiff + dronemanoffset;
}
- break;
- case MT_EGGROBO1:
-#define SPECTATORRADIUS (96*mobj->scale)
+ else
{
- if (!(mobj->flags2 & MF2_STRONGBOX))
- {
- mobj->cusval = mobj->x; // eat my SOCs, p_mobj.h warning, we have lua now
- mobj->cvmem = mobj->y; // ditto
- mobj->movedir = mobj->angle;
- mobj->threshold = P_MobjFlip(mobj)*10*mobj->scale;
- if (mobj->threshold < 0)
- mobj->threshold += (mobj->ceilingz - mobj->height);
- else
- mobj->threshold += mobj->floorz;
- var1 = 4;
- A_BossJetFume(mobj);
- mobj->flags2 |= MF2_STRONGBOX;
- }
+ dronemanoffset = droneboxmandiff;
+ goaloffset = dronemangoaldiff/2 + dronemanoffset;
+ }
- if (mobj->state == &states[mobj->info->deathstate]) // todo: make map actually set health to 0 for these
- {
- if (mobj->movecount)
- {
- if (!(--mobj->movecount))
- S_StartSound(mobj, mobj->info->deathsound);
- }
- else
- {
- mobj->momz += P_MobjFlip(mobj)*mobj->scale;
- if (mobj->momz > 0)
- {
- if (mobj->z + mobj->momz > mobj->ceilingz + (1000<<FRACBITS))
- {
- P_RemoveMobj(mobj);
- return;
- }
- }
- else if (mobj->z + mobj->height + mobj->momz < mobj->floorz - (1000<<FRACBITS))
- {
- P_RemoveMobj(mobj);
- return;
- }
- }
- }
- else
- {
+ sparkleoffset = goaloffset + FixedMul(15*FRACUNIT, mobj->scale);
+ }
- fixed_t basex = mobj->cusval, basey = mobj->cvmem;
+ P_TeleportMove(goalpost, mobj->x, mobj->y, mobj->z + goaloffset);
+ P_TeleportMove(sparkle, mobj->x, mobj->y, mobj->z + sparkleoffset);
+ if (goalpost->movefactor != mobj->z || goalpost->friction != mobj->height)
+ {
+ P_TeleportMove(droneman, mobj->x, mobj->y, mobj->z + dronemanoffset);
+ goalpost->movefactor = mobj->z;
+ goalpost->friction = mobj->height;
+ }
+ goalpost->threshold = mobj->flags & (MF_SLIDEME|MF_GRENADEBOUNCE);
+ }
+ else
+ {
+ if (goalpost->x != mobj->x || goalpost->y != mobj->y)
+ {
+ P_TeleportMove(goalpost, mobj->x, mobj->y, goalpost->z);
+ P_TeleportMove(sparkle, mobj->x, mobj->y, sparkle->z);
+ }
- if (mobj->spawnpoint && mobj->spawnpoint->options & (MTF_AMBUSH|MTF_OBJECTSPECIAL))
- {
- angle_t sideang = mobj->movedir + ((mobj->spawnpoint->options & MTF_AMBUSH) ? ANGLE_90 : -ANGLE_90);
- fixed_t oscillate = FixedMul(FINESINE(((leveltime*ANG1)>>(ANGLETOFINESHIFT+2)) & FINEMASK), 250*mobj->scale);
- basex += P_ReturnThrustX(mobj, sideang, oscillate);
- basey += P_ReturnThrustY(mobj, sideang, oscillate);
- }
+ if (droneman->x != mobj->x || droneman->y != mobj->y)
+ P_TeleportMove(droneman, mobj->x, mobj->y,
+ droneman->z >= mobj->floorz && droneman->z <= mobj->ceilingz ? droneman->z : mobj->z);
+ }
- mobj->z = mobj->threshold + FixedMul(FINESINE(((leveltime + mobj->movecount)*ANG2>>(ANGLETOFINESHIFT-2)) & FINEMASK), 8*mobj->scale);
- if (mobj->state != &states[mobj->info->meleestate])
- {
- boolean didmove = false;
+ // now toggle states!
+ // GOAL mode?
+ if (sparkle->state >= &states[S_NIGHTSDRONE_SPARKLING1] && sparkle->state <= &states[S_NIGHTSDRONE_SPARKLING16])
+ {
+ INT32 i;
+ boolean bonustime = false;
- if (mobj->state == &states[mobj->info->spawnstate])
- {
- UINT8 i;
- fixed_t dist = INT32_MAX;
+ for (i = 0; i < MAXPLAYERS; i++)
+ if (playeringame[i] && players[i].bonustime && players[i].powers[pw_carry] == CR_NIGHTSMODE)
+ {
+ bonustime = true;
+ break;
+ }
- for (i = 0; i < MAXPLAYERS; i++)
- {
- fixed_t compdist;
- if (!playeringame[i])
- continue;
- if (players[i].spectator)
- continue;
- if (!players[i].mo)
- continue;
- if (!players[i].mo->health)
- continue;
- if (P_PlayerInPain(&players[i]))
- continue;
- if (players[i].mo->z > mobj->z + mobj->height + 8*mobj->scale)
- continue;
- if (players[i].mo->z + players[i].mo->height < mobj->z - 8*mobj->scale)
- continue;
- compdist = P_AproxDistance(
- players[i].mo->x + players[i].mo->momx - basex,
- players[i].mo->y + players[i].mo->momy - basey);
- if (compdist >= dist)
- continue;
- dist = compdist;
- P_SetTarget(&mobj->target, players[i].mo);
- }
+ if (!bonustime)
+ {
+ CONS_Debug(DBG_NIGHTSBASIC, "Removing goal post\n");
+ if (goalpost && goalpost->state != &states[S_INVISIBLE])
+ P_SetMobjState(goalpost, S_INVISIBLE);
+ if (sparkle && sparkle->state != &states[S_INVISIBLE])
+ P_SetMobjState(sparkle, S_INVISIBLE);
+ }
+ }
+ // Invisible/bouncing mode.
+ else
+ {
+ INT32 i;
+ boolean bonustime = false;
+ fixed_t zcomp;
- if (dist < (SPECTATORRADIUS<<1))
- {
- didmove = true;
- mobj->frame = 3 + ((leveltime & 2)>>1);
- mobj->angle = R_PointToAngle2(mobj->x, mobj->y, mobj->target->x, mobj->target->y);
-
- if (P_AproxDistance(
- mobj->x - basex,
- mobj->y - basey)
- < mobj->scale)
- S_StartSound(mobj, mobj->info->seesound);
-
- P_TeleportMove(mobj,
- (15*(mobj->x>>4)) + (basex>>4) + P_ReturnThrustX(mobj, mobj->angle, SPECTATORRADIUS>>4),
- (15*(mobj->y>>4)) + (basey>>4) + P_ReturnThrustY(mobj, mobj->angle, SPECTATORRADIUS>>4),
- mobj->z);
- }
- else
- {
- angle_t diff = (mobj->movedir - mobj->angle);
- if (diff > ANGLE_180)
- diff = InvAngle(InvAngle(diff)/8);
- else
- diff /= 8;
- mobj->angle += diff;
-
- dist = FINECOSINE(((leveltime + mobj->movecount)*ANG2>>(ANGLETOFINESHIFT-2)) & FINEMASK);
-
- if (abs(dist) < FRACUNIT/2)
- mobj->frame = 0;
- else
- mobj->frame = (dist > 0) ? 1 : 2;
- }
- }
+ // Bouncy bouncy!
+ if (!flip)
+ {
+ if (topaligned)
+ zcomp = droneboxmandiff + mobj->z;
+ else if (middlealigned)
+ zcomp = (droneboxmandiff/2) + mobj->z;
+ else if (bottomoffsetted)
+ zcomp = mobj->z + FixedMul(24*FRACUNIT, mobj->scale);
+ else
+ zcomp = mobj->z;
+ }
+ else
+ {
+ if (topaligned)
+ zcomp = mobj->z;
+ else if (middlealigned)
+ zcomp = (droneboxmandiff/2) + mobj->z;
+ else if (bottomoffsetted)
+ zcomp = mobj->z + droneboxmandiff - FixedMul(24*FRACUNIT, mobj->scale);
+ else
+ zcomp = mobj->z + droneboxmandiff;
+ }
- if (!didmove)
- {
- if (P_AproxDistance(mobj->x - basex, mobj->y - basey) < mobj->scale)
- P_TeleportMove(mobj, basex, basey, mobj->z);
- else
- P_TeleportMove(mobj,
- (15*(mobj->x>>4)) + (basex>>4),
- (15*(mobj->y>>4)) + (basey>>4),
- mobj->z);
- }
- }
- }
- }
- break;
-#undef SPECTATORRADIUS
- case MT_EGGROBO1JET:
+ droneman->angle += ANG10;
+ if (!flip && droneman->z <= zcomp)
+ droneman->momz = FixedMul(5*FRACUNIT, droneman->scale);
+ else if (flip && droneman->z >= zcomp)
+ droneman->momz = FixedMul(-5*FRACUNIT, droneman->scale);
+
+ // state switching logic
+ for (i = 0; i < MAXPLAYERS; i++)
+ if (playeringame[i] && players[i].bonustime && players[i].powers[pw_carry] == CR_NIGHTSMODE)
{
- if (!mobj->target || P_MobjWasRemoved(mobj->target) // if you have no target
- || (mobj->target->health <= 0)) // or your target isn't a boss and it's popped now
- { // then remove yourself as well!
- P_RemoveMobj(mobj);
- return;
+ bonustime = true;
+ break;
+ }
+
+ if (bonustime)
+ {
+ CONS_Debug(DBG_NIGHTSBASIC, "Adding goal post\n");
+ if (!(droneman->flags2 & MF2_DONTDRAW))
+ droneman->flags2 |= MF2_DONTDRAW;
+ if (goalpost->state == &states[S_INVISIBLE])
+ P_SetMobjState(goalpost, mobjinfo[goalpost->type].meleestate);
+ if (sparkle->state == &states[S_INVISIBLE])
+ P_SetMobjState(sparkle, mobjinfo[sparkle->type].meleestate);
+ }
+ else if (!G_IsSpecialStage(gamemap))
+ {
+ for (i = 0; i < MAXPLAYERS; i++)
+ if (playeringame[i] && players[i].powers[pw_carry] != CR_NIGHTSMODE)
+ {
+ bonustime = true; // variable reuse
+ break;
}
- mobj->flags2 ^= MF2_DONTDRAW;
-
- P_UnsetThingPosition(mobj);
- mobj->x = mobj->target->x + P_ReturnThrustX(mobj, mobj->target->angle+ANGLE_90, mobj->movefactor*mobj->target->scale) - P_ReturnThrustX(mobj, mobj->target->angle, 19*mobj->target->scale);
- mobj->y = mobj->target->y + P_ReturnThrustY(mobj, mobj->target->angle+ANGLE_90, mobj->movefactor*mobj->target->scale) - P_ReturnThrustY(mobj, mobj->target->angle, 19*mobj->target->scale);
- mobj->z = mobj->target->z;
- if (mobj->target->eflags & MFE_VERTICALFLIP)
- mobj->z += (mobj->target->height - mobj->height);
- mobj->floorz = mobj->z;
- mobj->ceilingz = mobj->z+mobj->height;
- P_SetThingPosition(mobj);
+ if (bonustime)
+ {
+ // show droneman if at least one player is non-nights
+ if (goalpost->state != &states[S_INVISIBLE])
+ P_SetMobjState(goalpost, S_INVISIBLE);
+ if (sparkle->state != &states[S_INVISIBLE])
+ P_SetMobjState(sparkle, S_INVISIBLE);
+ if (droneman->state != &states[mobjinfo[droneman->type].meleestate])
+ P_SetMobjState(droneman, mobjinfo[droneman->type].meleestate);
+ if (droneman->flags2 & MF2_DONTDRAW)
+ droneman->flags2 &= ~MF2_DONTDRAW;
}
- break;
- case MT_NIGHTSDRONE:
+ else
{
- // variable setup
- mobj_t *goalpost = NULL;
- mobj_t *sparkle = NULL;
- mobj_t *droneman = NULL;
+ // else, hide it
+ if (!(droneman->flags2 & MF2_DONTDRAW))
+ droneman->flags2 |= MF2_DONTDRAW;
+ }
+ }
+ }
+ }
+}
- boolean flip = mobj->flags2 & MF2_OBJECTFLIP;
- boolean topaligned = (mobj->flags & MF_SLIDEME) && !(mobj->flags & MF_GRENADEBOUNCE);
- boolean middlealigned = (mobj->flags & MF_GRENADEBOUNCE) && !(mobj->flags & MF_SLIDEME);
- boolean bottomoffsetted = !(mobj->flags & MF_SLIDEME) && !(mobj->flags & MF_GRENADEBOUNCE);
- boolean flipchanged = false;
+static boolean P_TurretThink(mobj_t *mobj)
+{
+ P_MobjCheckWater(mobj);
+ P_CheckPosition(mobj, mobj->x, mobj->y);
+ if (P_MobjWasRemoved(mobj))
+ return false;
+ mobj->floorz = tmfloorz;
+ mobj->ceilingz = tmceilingz;
+ mobj->floorrover = tmfloorrover;
+ mobj->ceilingrover = tmceilingrover;
- fixed_t dronemanoffset, goaloffset, sparkleoffset, droneboxmandiff, dronemangoaldiff;
+ if ((mobj->eflags & MFE_UNDERWATER) && mobj->health > 0)
+ {
+ P_SetMobjState(mobj, mobj->info->deathstate);
+ mobj->health = 0;
+ mobj->flags2 &= ~MF2_FIRING;
+ }
+ else if (mobj->health > 0 && mobj->z + mobj->height > mobj->ceilingz) // Crushed
+ {
+ INT32 i, j;
+ fixed_t ns;
+ fixed_t x, y, z;
+ mobj_t* mo2;
- if (mobj->target && mobj->target->type == MT_NIGHTSDRONE_GOAL)
- {
- goalpost = mobj->target;
- if (goalpost->target && goalpost->target->type == MT_NIGHTSDRONE_SPARKLING)
- sparkle = goalpost->target;
- if (goalpost->tracer && goalpost->tracer->type == MT_NIGHTSDRONE_MAN)
- droneman = goalpost->tracer;
- }
+ z = mobj->subsector->sector->floorheight + FixedMul(64*FRACUNIT, mobj->scale);
+ for (j = 0; j < 2; j++)
+ {
+ for (i = 0; i < 32; i++)
+ {
+ const angle_t fa = (i*FINEANGLES/16) & FINEMASK;
+ ns = FixedMul(64*FRACUNIT, mobj->scale);
+ x = mobj->x + FixedMul(FINESINE(fa), ns);
+ y = mobj->y + FixedMul(FINECOSINE(fa), ns);
- if (!goalpost || !sparkle || !droneman)
- break;
+ mo2 = P_SpawnMobj(x, y, z, MT_EXPLODE);
+ ns = FixedMul(16*FRACUNIT, mobj->scale);
+ mo2->momx = FixedMul(FINESINE(fa), ns);
+ mo2->momy = FixedMul(FINECOSINE(fa), ns);
+ }
+ z -= FixedMul(32*FRACUNIT, mobj->scale);
+ }
+ P_SetMobjState(mobj, mobj->info->deathstate);
+ mobj->health = 0;
+ mobj->flags2 &= ~MF2_FIRING;
+ }
+ return true;
+}
- // did NIGHTSDRONE position, scale, flip, or flags change? all elements need to be synced
- droneboxmandiff = max(mobj->height - droneman->height, 0);
- dronemangoaldiff = max(droneman->height - goalpost->height, 0);
+static void P_SaloonDoorThink(mobj_t *mobj)
+{
+ fixed_t x = mobj->tracer->x;
+ fixed_t y = mobj->tracer->y;
+ fixed_t z = mobj->tracer->z;
+ angle_t oang = FixedAngle(mobj->extravalue1);
+ angle_t fa = (oang >> ANGLETOFINESHIFT) & FINEMASK;
+ fixed_t c0 = -96*FINECOSINE(fa);
+ fixed_t s0 = -96*FINESINE(fa);
+ angle_t fma;
+ fixed_t c, s;
+ angle_t angdiff;
+
+ // Adjust angular speed
+ fixed_t da = AngleFixed(mobj->angle - oang);
+ if (da > 180*FRACUNIT)
+ da -= 360*FRACUNIT;
+ mobj->extravalue2 = 8*(mobj->extravalue2 - da/32)/9;
+
+ // Update angle
+ mobj->angle += FixedAngle(mobj->extravalue2);
+
+ angdiff = mobj->angle - FixedAngle(mobj->extravalue1);
+ if (angdiff > (ANGLE_90 - ANG2) && angdiff < ANGLE_180)
+ {
+ mobj->angle = FixedAngle(mobj->extravalue1) + (ANGLE_90 - ANG2);
+ mobj->extravalue2 /= 2;
+ }
+ else if (angdiff < (ANGLE_270 + ANG2) && angdiff >= ANGLE_180)
+ {
+ mobj->angle = FixedAngle(mobj->extravalue1) + (ANGLE_270 + ANG2);
+ mobj->extravalue2 /= 2;
+ }
+
+ // Update position
+ fma = (mobj->angle >> ANGLETOFINESHIFT) & FINEMASK;
+ c = 48*FINECOSINE(fma);
+ s = 48*FINESINE(fma);
+ P_TeleportMove(mobj, x + c0 + c, y + s0 + s, z);
+}
- if (!(goalpost->flags2 & MF2_OBJECTFLIP) && (mobj->flags2 & MF2_OBJECTFLIP))
- {
- goalpost->eflags |= MFE_VERTICALFLIP;
- goalpost->flags2 |= MF2_OBJECTFLIP;
- sparkle->eflags |= MFE_VERTICALFLIP;
- sparkle->flags2 |= MF2_OBJECTFLIP;
- droneman->eflags |= MFE_VERTICALFLIP;
- droneman->flags2 |= MF2_OBJECTFLIP;
- flipchanged = true;
- }
- else if ((goalpost->flags2 & MF2_OBJECTFLIP) && !(mobj->flags2 & MF2_OBJECTFLIP))
- {
- goalpost->eflags &= ~MFE_VERTICALFLIP;
- goalpost->flags2 &= ~MF2_OBJECTFLIP;
- sparkle->eflags &= ~MFE_VERTICALFLIP;
- sparkle->flags2 &= ~MF2_OBJECTFLIP;
- droneman->eflags &= ~MFE_VERTICALFLIP;
- droneman->flags2 &= ~MF2_OBJECTFLIP;
- flipchanged = true;
- }
+static void P_PyreFlyThink(mobj_t *mobj)
+{
+ fixed_t hdist;
- if (goalpost->destscale != mobj->destscale
- || goalpost->movefactor != mobj->z
- || goalpost->friction != mobj->height
- || flipchanged
- || goalpost->threshold != (INT32)(mobj->flags & (MF_SLIDEME | MF_GRENADEBOUNCE)))
- {
- goalpost->destscale = sparkle->destscale = droneman->destscale = mobj->destscale;
+ mobj->extravalue1 = (mobj->extravalue1 + 3) % 360;
+ mobj->z += FINESINE(((mobj->extravalue1 * ANG1) >> ANGLETOFINESHIFT) & FINEMASK);
- // straight copy-pasta from P_SpawnMapThing, case MT_NIGHTSDRONE
- if (!flip)
- {
- if (topaligned) // Align droneman to top of hitbox
- {
- dronemanoffset = droneboxmandiff;
- goaloffset = dronemangoaldiff / 2 + dronemanoffset;
- }
- else if (middlealigned) // Align droneman to center of hitbox
- {
- dronemanoffset = droneboxmandiff / 2;
- goaloffset = dronemangoaldiff / 2 + dronemanoffset;
- }
- else if (bottomoffsetted)
- {
- dronemanoffset = 24*FRACUNIT;
- goaloffset = dronemangoaldiff + dronemanoffset;
- }
- else
- {
- dronemanoffset = 0;
- goaloffset = dronemangoaldiff / 2 + dronemanoffset;
- }
+ if (!(mobj->flags2 & MF2_BOSSNOTRAP))
+ P_LookForPlayers(mobj, true, false, 1500*FRACUNIT);
+
+ if (!mobj->target)
+ return;
+
+ if (mobj->extravalue2 == 1)
+ P_PyreFlyBurn(mobj, 0, 20, MT_SMOKE, 4*FRACUNIT);
+ else if (mobj->extravalue2 == 2)
+ {
+ INT32 fireradius = min(100 - mobj->fuse, 52);
+ P_PyreFlyBurn(mobj, P_RandomRange(0, fireradius) << FRACBITS, 20, MT_FLAMEPARTICLE, 4*FRACUNIT);
+ P_PyreFlyBurn(mobj, fireradius*FRACUNIT, 40, MT_PYREFLY_FIRE, 0);
+ }
+
+ hdist = R_PointToDist2(mobj->x, mobj->y, mobj->target->x, mobj->target->y);
- sparkleoffset = goaloffset - FixedMul(15*FRACUNIT, mobj->scale);
- }
- else
- {
- if (topaligned) // Align droneman to top of hitbox
- {
- dronemanoffset = 0;
- goaloffset = dronemangoaldiff / 2 + dronemanoffset;
- }
- else if (middlealigned) // Align droneman to center of hitbox
- {
- dronemanoffset = droneboxmandiff / 2;
- goaloffset = dronemangoaldiff / 2 + dronemanoffset;
- }
- else if (bottomoffsetted)
- {
- dronemanoffset = droneboxmandiff - FixedMul(24*FRACUNIT, mobj->scale);
- goaloffset = dronemangoaldiff + dronemanoffset;
- }
- else
- {
- dronemanoffset = droneboxmandiff;
- goaloffset = dronemangoaldiff / 2 + dronemanoffset;
- }
+ if (hdist > 1500*FRACUNIT)
+ {
+ mobj->flags2 &= ~MF2_BOSSNOTRAP;
+ P_SetTarget(&mobj->target, NULL);
+ return;
+ }
- sparkleoffset = goaloffset + FixedMul(15*FRACUNIT, mobj->scale);
- }
+ if (!(mobj->flags2 & MF2_BOSSNOTRAP) && hdist <= 450*FRACUNIT)
+ mobj->flags2 |= MF2_BOSSNOTRAP;
- P_TeleportMove(goalpost, mobj->x, mobj->y, mobj->z + goaloffset);
- P_TeleportMove(sparkle, mobj->x, mobj->y, mobj->z + sparkleoffset);
- if (goalpost->movefactor != mobj->z || goalpost->friction != mobj->height)
- {
- P_TeleportMove(droneman, mobj->x, mobj->y, mobj->z + dronemanoffset);
- goalpost->movefactor = mobj->z;
- goalpost->friction = mobj->height;
- }
- goalpost->threshold = mobj->flags & (MF_SLIDEME | MF_GRENADEBOUNCE);
- }
- else
- {
- if (goalpost->x != mobj->x || goalpost->y != mobj->y)
- {
- P_TeleportMove(goalpost, mobj->x, mobj->y, goalpost->z);
- P_TeleportMove(sparkle, mobj->x, mobj->y, sparkle->z);
- }
+ if (!(mobj->flags2 & MF2_BOSSNOTRAP))
+ return;
- if (droneman->x != mobj->x || droneman->y != mobj->y)
- P_TeleportMove(droneman, mobj->x, mobj->y,
- droneman->z >= mobj->floorz && droneman->z <= mobj->ceilingz ? droneman->z : mobj->z);
- }
+ if (hdist < 1000*FRACUNIT)
+ {
+ //Aim for player z position. If too close to floor/ceiling, aim just above/below them.
+ fixed_t destz = min(max(mobj->target->z, mobj->target->floorz + 70*FRACUNIT), mobj->target->ceilingz - 80*FRACUNIT - mobj->height);
+ fixed_t dist = P_AproxDistance(hdist, destz - mobj->z);
+ P_InstaThrust(mobj, R_PointToAngle2(mobj->x, mobj->y, mobj->target->x, mobj->target->y), 2*FRACUNIT);
+ mobj->momz = FixedMul(FixedDiv(destz - mobj->z, dist), 2*FRACUNIT);
+ }
+ else
+ {
+ mobj->momx = 0;
+ mobj->momy = 0;
+ mobj->momz = 0;
+ }
+}
- // now toggle states!
- // GOAL mode?
- if (sparkle->state >= &states[S_NIGHTSDRONE_SPARKLING1] && sparkle->state <= &states[S_NIGHTSDRONE_SPARKLING16])
- {
- INT32 i;
- boolean bonustime = false;
+static void P_PterabyteThink(mobj_t *mobj)
+{
+ if (mobj->extravalue1 & 4) // Cooldown after grabbing
+ {
+ if (mobj->movefactor)
+ mobj->movefactor--;
+ else
+ {
+ P_SetTarget(&mobj->target, NULL);
+ mobj->extravalue1 &= 3;
+ }
+ }
- for (i = 0; i < MAXPLAYERS; i++)
- if (playeringame[i] && players[i].bonustime && players[i].powers[pw_carry] == CR_NIGHTSMODE)
- {
- bonustime = true;
- break;
- }
+ if ((mobj->extravalue1 & 3) == 0) // Hovering
+ {
+ fixed_t vdist, hdist, time;
+ fixed_t hspeed = 3*mobj->info->speed;
+ angle_t fa;
- if (!bonustime)
- {
- CONS_Debug(DBG_NIGHTSBASIC, "Removing goal post\n");
- if (goalpost && goalpost->state != &states[S_INVISIBLE])
- P_SetMobjState(goalpost, S_INVISIBLE);
- if (sparkle && sparkle->state != &states[S_INVISIBLE])
- P_SetMobjState(sparkle, S_INVISIBLE);
- }
- }
- // Invisible/bouncing mode.
- else
- {
- INT32 i;
- boolean bonustime = false;
- fixed_t zcomp;
+ var1 = 1;
+ var2 = 0;
+ A_CapeChase(mobj);
- // Bouncy bouncy!
- if (!flip)
- {
- if (topaligned)
- zcomp = droneboxmandiff + mobj->z;
- else if (middlealigned)
- zcomp = (droneboxmandiff / 2) + mobj->z;
- else if (bottomoffsetted)
- zcomp = mobj->z + FixedMul(24*FRACUNIT, mobj->scale);
- else
- zcomp = mobj->z;
- }
- else
- {
- if (topaligned)
- zcomp = mobj->z;
- else if (middlealigned)
- zcomp = (droneboxmandiff / 2) + mobj->z;
- else if (bottomoffsetted)
- zcomp = mobj->z + droneboxmandiff - FixedMul(24*FRACUNIT, mobj->scale);
- else
- zcomp = mobj->z + droneboxmandiff;
- }
+ if (mobj->target)
+ return; // Still carrying a player or in cooldown
- droneman->angle += ANG10;
- if (!flip && droneman->z <= zcomp)
- droneman->momz = FixedMul(5*FRACUNIT, droneman->scale);
- else if (flip && droneman->z >= zcomp)
- droneman->momz = FixedMul(-5*FRACUNIT, droneman->scale);
+ P_LookForPlayers(mobj, true, false, 256*FRACUNIT);
- // state switching logic
- for (i = 0; i < MAXPLAYERS; i++)
- if (playeringame[i] && players[i].bonustime && players[i].powers[pw_carry] == CR_NIGHTSMODE)
- {
- bonustime = true;
- break;
- }
+ if (!mobj->target)
+ return;
- if (bonustime)
- {
- CONS_Debug(DBG_NIGHTSBASIC, "Adding goal post\n");
- if (!(droneman->flags2 & MF2_DONTDRAW))
- droneman->flags2 |= MF2_DONTDRAW;
- if (goalpost->state == &states[S_INVISIBLE])
- P_SetMobjState(goalpost, mobjinfo[goalpost->type].meleestate);
- if (sparkle->state == &states[S_INVISIBLE])
- P_SetMobjState(sparkle, mobjinfo[sparkle->type].meleestate);
- }
- else if (!G_IsSpecialStage(gamemap))
- {
- for (i = 0; i < MAXPLAYERS; i++)
- if (playeringame[i] && players[i].powers[pw_carry] != CR_NIGHTSMODE)
- {
- bonustime = true; // variable reuse
- break;
- }
+ if (mobj->target->player->powers[pw_flashing])
+ {
+ P_SetTarget(&mobj->target, NULL);
+ return;
+ }
- if (bonustime)
- {
- // show droneman if at least one player is non-nights
- if (goalpost->state != &states[S_INVISIBLE])
- P_SetMobjState(goalpost, S_INVISIBLE);
- if (sparkle->state != &states[S_INVISIBLE])
- P_SetMobjState(sparkle, S_INVISIBLE);
- if (droneman->state != &states[mobjinfo[droneman->type].meleestate])
- P_SetMobjState(droneman, mobjinfo[droneman->type].meleestate);
- if (droneman->flags2 & MF2_DONTDRAW)
- droneman->flags2 &= ~MF2_DONTDRAW;
- }
- else
- {
- // else, hide it
- if (!(droneman->flags2 & MF2_DONTDRAW))
- droneman->flags2 |= MF2_DONTDRAW;
- }
- }
- }
- }
- break;
- case MT_PLAYER:
- if (mobj->player)
- P_PlayerMobjThinker(mobj);
- return;
- case MT_SKIM:
- // check mobj against possible water content, before movement code
- P_MobjCheckWater(mobj);
+ vdist = mobj->z - mobj->target->z - mobj->target->height;
+ if (P_MobjFlip(mobj)*vdist <= 0)
+ {
+ P_SetTarget(&mobj->target, NULL);
+ return;
+ }
- // Keep Skim at water surface
- if (mobj->z <= mobj->watertop)
- {
- mobj->flags |= MF_NOGRAVITY;
- if (mobj->z < mobj->watertop)
- {
- if (mobj->watertop - mobj->z <= FixedMul(mobj->info->speed*FRACUNIT, mobj->scale))
- mobj->z = mobj->watertop;
- else
- mobj->momz = FixedMul(mobj->info->speed*FRACUNIT, mobj->scale);
- }
- }
- else
- {
- mobj->flags &= ~MF_NOGRAVITY;
- if (mobj->z > mobj->watertop && mobj->z - mobj->watertop < FixedMul(MAXSTEPMOVE, mobj->scale))
- mobj->z = mobj->watertop;
- }
- break;
- case MT_RING:
- case MT_REDTEAMRING:
- case MT_BLUETEAMRING:
- P_KillRingsInLava(mobj);
- if (P_MobjWasRemoved(mobj))
- return;
- /* FALLTHRU */
- case MT_COIN:
- case MT_BLUESPHERE:
- case MT_BOMBSPHERE:
- case MT_NIGHTSCHIP:
- case MT_NIGHTSSTAR:
- // No need to check water. Who cares?
- P_RingThinker(mobj);
- if (mobj->flags2 & MF2_NIGHTSPULL)
- P_NightsItemChase(mobj);
- else
- A_AttractChase(mobj);
- return;
- // Flung items
- case MT_FLINGRING:
- P_KillRingsInLava(mobj);
- if (P_MobjWasRemoved(mobj))
- return;
- /* FALLTHRU */
- case MT_FLINGCOIN:
- case MT_FLINGBLUESPHERE:
- case MT_FLINGNIGHTSCHIP:
- if (mobj->flags2 & MF2_NIGHTSPULL)
- P_NightsItemChase(mobj);
+ hdist = R_PointToDist2(mobj->x, mobj->y, mobj->target->x, mobj->target->y);
+ if (hdist > 450*FRACUNIT)
+ {
+ P_SetTarget(&mobj->target, NULL);
+ return;
+ }
+
+ P_SetMobjState(mobj, S_PTERABYTE_SWOOPDOWN);
+ mobj->extravalue1++;
+ S_StartSound(mobj, mobj->info->attacksound);
+ time = FixedDiv(hdist, hspeed);
+ mobj->angle = R_PointToAngle2(mobj->x, mobj->y, mobj->target->x, mobj->target->y);
+ fa = (mobj->angle >> ANGLETOFINESHIFT) & FINEMASK;
+ mobj->momx = FixedMul(FINECOSINE(fa), hspeed);
+ mobj->momy = FixedMul(FINESINE(fa), hspeed);
+ mobj->momz = -2*FixedDiv(vdist, time);
+ mobj->extravalue2 = -FixedDiv(mobj->momz, time); //Z accel
+ mobj->movecount = time >> FRACBITS;
+ mobj->reactiontime = mobj->movecount;
+ }
+ else if ((mobj->extravalue1 & 3) == 1) // Swooping
+ {
+ mobj->reactiontime--;
+ mobj->momz += mobj->extravalue2;
+ if (mobj->reactiontime)
+ return;
+
+ if (mobj->state - states == S_PTERABYTE_SWOOPDOWN)
+ {
+ P_SetMobjState(mobj, S_PTERABYTE_SWOOPUP);
+ mobj->reactiontime = mobj->movecount;
+ }
+ else if (mobj->state - states == S_PTERABYTE_SWOOPUP)
+ {
+ P_SetMobjState(mobj, S_PTERABYTE_FLY1);
+ mobj->extravalue1++;
+ if (mobj->target && mobj->target->tracer != mobj)
+ P_SetTarget(&mobj->target, NULL); // Failed to grab the target
+ mobj->momx = mobj->momy = mobj->momz = 0;
+ }
+ }
+ else // Returning
+ {
+ var1 = 2*mobj->info->speed;
+ var2 = 1;
+ A_HomingChase(mobj);
+ if (P_AproxDistance(mobj->x - mobj->tracer->x, mobj->y - mobj->tracer->y) <= mobj->info->speed)
+ {
+ mobj->extravalue1 -= 2;
+ mobj->momx = mobj->momy = mobj->momz = 0;
+ }
+ }
+}
+
+static void P_DragonbomberThink(mobj_t *mobj)
+{
+#define DRAGONTURNSPEED ANG2
+ mobj->movecount = (mobj->movecount + 9) % 360;
+ P_SetObjectMomZ(mobj, 4*FINESINE(((mobj->movecount*ANG1) >> ANGLETOFINESHIFT) & FINEMASK), false);
+ if (mobj->threshold > 0) // are we dropping mines?
+ {
+ mobj->threshold--;
+ if (mobj->threshold == 0) // if the timer hits 0, look for a mine to drop!
+ {
+ mobj_t *segment = mobj;
+ while (segment->tracer != NULL && !P_MobjWasRemoved(segment->tracer) && segment->tracer->state == &states[segment->tracer->info->spawnstate])
+ segment = segment->tracer;
+ if (segment != mobj) // found an unactivated segment?
+ {
+ mobj_t *mine = P_SpawnMobjFromMobj(segment, 0, 0, 0, segment->info->painchance);
+ mine->angle = segment->angle;
+ P_InstaThrust(mine, mobj->angle, P_AproxDistance(mobj->momx, mobj->momy) >> 1);
+ P_SetObjectMomZ(mine, -2*FRACUNIT, true);
+ S_StartSound(mine, mine->info->seesound);
+ P_SetMobjState(segment, segment->info->raisestate);
+ mobj->threshold = mobj->info->painchance;
+ }
+ }
+ }
+ if (mobj->target) // Are we chasing a player?
+ {
+ fixed_t dist = P_AproxDistance(mobj->x - mobj->target->x, mobj->y - mobj->target->y);
+ if (dist > 2000*mobj->scale) // Not anymore!
+ P_SetTarget(&mobj->target, NULL);
+ else
+ {
+ fixed_t vspeed = FixedMul(mobj->info->speed >> 3, mobj->scale);
+ fixed_t z = mobj->target->z + (mobj->height >> 1) + (mobj->flags & MFE_VERTICALFLIP ? -128*mobj->scale : 128*mobj->scale + mobj->target->height);
+ angle_t diff = R_PointToAngle2(mobj->x, mobj->y, mobj->target->x, mobj->target->y) - mobj->angle;
+ if (diff > ANGLE_180)
+ mobj->angle -= DRAGONTURNSPEED;
+ else
+ mobj->angle += DRAGONTURNSPEED;
+ if (!mobj->threshold && dist < 512*mobj->scale) // Close enough to drop bombs
+ {
+ mobj->threshold = mobj->info->painchance;
+ }
+ mobj->momz += max(min(z - mobj->z, vspeed), -vspeed);
+ }
+ }
+ else // Can we find a player to chase?
+ {
+ if (mobj->tracer == NULL || mobj->tracer->state != &states[mobj->tracer->info->spawnstate]
+ || !P_LookForPlayers(mobj, true, false, 2000*mobj->scale)) // if not, circle around the spawnpoint
+ {
+ if (!mobj->spawnpoint) // unless we don't have one, in which case uhhh just circle around wherever we currently are I guess??
+ mobj->angle += DRAGONTURNSPEED;
+ else
+ {
+ fixed_t vspeed = FixedMul(mobj->info->speed >> 3, mobj->scale);
+ fixed_t x = mobj->spawnpoint->x << FRACBITS;
+ fixed_t y = mobj->spawnpoint->y << FRACBITS;
+ fixed_t z = mobj->spawnpoint->z << FRACBITS;
+ angle_t diff = R_PointToAngle2(mobj->x, mobj->y, x, y) - mobj->angle;
+ if (diff > ANGLE_180)
+ mobj->angle -= DRAGONTURNSPEED;
else
- A_AttractChase(mobj);
- break;
- case MT_EMBLEM:
- if (mobj->flags2 & MF2_NIGHTSPULL)
- P_NightsItemChase(mobj);
- break;
- case MT_SHELL:
- if (mobj->threshold && mobj->threshold != TICRATE)
- mobj->threshold--;
+ mobj->angle += DRAGONTURNSPEED;
+ mobj->momz += max(min(z - mobj->z, vspeed), -vspeed);
+ }
+ }
+ }
+ P_InstaThrust(mobj, mobj->angle, FixedMul(mobj->info->speed, mobj->scale));
+#undef DRAGONTURNSPEED
+}
- if (mobj->threshold >= TICRATE)
- {
- mobj->angle += ((mobj->movedir == 1) ? ANGLE_22h : ANGLE_337h);
- P_InstaThrust(mobj, R_PointToAngle2(0, 0, mobj->momx, mobj->momy), (mobj->info->speed*mobj->scale));
- }
- break;
- case MT_TURRET:
- P_MobjCheckWater(mobj);
- P_CheckPosition(mobj, mobj->x, mobj->y);
- if (P_MobjWasRemoved(mobj))
- return;
- mobj->floorz = tmfloorz;
- mobj->ceilingz = tmceilingz;
- mobj->floorrover = tmfloorrover;
- mobj->ceilingrover = tmceilingrover;
+static boolean P_MobjRegularThink(mobj_t *mobj)
+{
+ if ((mobj->flags & MF_ENEMY) && (mobj->state->nextstate == mobj->info->spawnstate && mobj->tics == 1))
+ mobj->flags2 &= ~MF2_FRET;
- if ((mobj->eflags & MFE_UNDERWATER) && mobj->health > 0)
- {
- P_SetMobjState(mobj, mobj->info->deathstate);
- mobj->health = 0;
- mobj->flags2 &= ~MF2_FIRING;
- }
- else if (mobj->health > 0 && mobj->z + mobj->height > mobj->ceilingz) // Crushed
- {
- INT32 i,j;
- fixed_t ns;
- fixed_t x,y,z;
- mobj_t *mo2;
+ if (mobj->eflags & MFE_TRACERANGLE)
+ P_TracerAngleThink(mobj);
- z = mobj->subsector->sector->floorheight + FixedMul(64*FRACUNIT, mobj->scale);
- for (j = 0; j < 2; j++)
- {
- for (i = 0; i < 32; i++)
- {
- const angle_t fa = (i*FINEANGLES/16) & FINEMASK;
- ns = FixedMul(64 * FRACUNIT, mobj->scale);
- x = mobj->x + FixedMul(FINESINE(fa),ns);
- y = mobj->y + FixedMul(FINECOSINE(fa),ns);
-
- mo2 = P_SpawnMobj(x, y, z, MT_EXPLODE);
- ns = FixedMul(16 * FRACUNIT, mobj->scale);
- mo2->momx = FixedMul(FINESINE(fa),ns);
- mo2->momy = FixedMul(FINECOSINE(fa),ns);
- }
- z -= FixedMul(32*FRACUNIT, mobj->scale);
- }
- P_SetMobjState(mobj, mobj->info->deathstate);
- mobj->health = 0;
- mobj->flags2 &= ~MF2_FIRING;
- }
- break;
- case MT_BLUEFLAG:
- case MT_REDFLAG:
- {
- sector_t *sec2;
- sec2 = P_ThingOnSpecial3DFloor(mobj);
- if ((sec2 && GETSECSPECIAL(sec2->special, 4) == 2) || (GETSECSPECIAL(mobj->subsector->sector->special, 4) == 2))
- mobj->fuse = 1; // Return to base.
- break;
- }
- case MT_CANNONBALL:
-#ifdef FLOORSPLATS
- R_AddFloorSplat(mobj->tracer->subsector, mobj->tracer, "TARGET", mobj->tracer->x,
- mobj->tracer->y, mobj->tracer->floorz, SPLATDRAWMODE_SHADE);
+ switch (mobj->type)
+ {
+ case MT_WALLSPIKEBASE:
+ if (!mobj->target) {
+ P_RemoveMobj(mobj);
+ return false;
+ }
+ mobj->frame = (mobj->frame & ~FF_FRAMEMASK)|(mobj->target->frame & FF_FRAMEMASK);
+#if 0
+ if (mobj->angle != mobj->target->angle + ANGLE_90) // reposition if not the correct angle
+ {
+ mobj_t* target = mobj->target; // shortcut
+ const fixed_t baseradius = target->radius - (target->scale/2); //FixedMul(FRACUNIT/2, target->scale);
+ P_UnsetThingPosition(mobj);
+ mobj->x = target->x - P_ReturnThrustX(target, target->angle, baseradius);
+ mobj->y = target->y - P_ReturnThrustY(target, target->angle, baseradius);
+ P_SetThingPosition(mobj);
+ mobj->angle = target->angle + ANGLE_90;
+ }
#endif
- break;
- case MT_SPINDUST: // Spindash dust
- mobj->momx = FixedMul(mobj->momx, (3*FRACUNIT)/4); // originally 50000
- mobj->momy = FixedMul(mobj->momy, (3*FRACUNIT)/4); // same
- //mobj->momz = mobj->momz+P_MobjFlip(mobj)/3; // no meaningful change in value to be frank
- if (mobj->state >= &states[S_SPINDUST_BUBBLE1] && mobj->state <= &states[S_SPINDUST_BUBBLE4]) // bubble dust!
- {
- P_MobjCheckWater(mobj);
- if (mobj->watertop != mobj->subsector->sector->floorheight - 1000*FRACUNIT
- && mobj->z+mobj->height >= mobj->watertop - 5*FRACUNIT)
- mobj->flags2 |= MF2_DONTDRAW;
- }
- break;
- case MT_TRAINDUSTSPAWNER:
- if (leveltime % 5 == 0) {
- mobj_t *traindust = P_SpawnMobj(mobj->x, mobj->y, mobj->z, MT_PARTICLE);
- traindust->flags = MF_SCENERY;
- P_SetMobjState(traindust, S_TRAINDUST);
- traindust->frame = P_RandomRange(0, 8) | FF_TRANS90;
- traindust->angle = mobj->angle;
- traindust->tics = TICRATE * 4;
- traindust->destscale = FRACUNIT * 64;
- traindust->scalespeed = FRACUNIT / 24;
- P_SetScale(traindust, FRACUNIT * 6);
- }
- break;
- case MT_TRAINSTEAMSPAWNER:
- if (leveltime % 5 == 0) {
- mobj_t *steam = P_SpawnMobj(mobj->x + FRACUNIT*P_SignedRandom() / 2, mobj->y + FRACUNIT*P_SignedRandom() / 2, mobj->z, MT_PARTICLE);
- P_SetMobjState(steam, S_TRAINSTEAM);
- steam->frame = P_RandomRange(0, 1) | FF_TRANS90;
- steam->tics = TICRATE * 8;
- steam->destscale = FRACUNIT * 64;
- steam->scalespeed = FRACUNIT / 8;
- P_SetScale(steam, FRACUNIT * 16);
- steam->momx = P_SignedRandom() * 32;
- steam->momy = -64 * FRACUNIT;
- steam->momz = 2 * FRACUNIT;
- }
- break;
- case MT_CANARIVORE_GAS:
- {
- fixed_t momz;
+ break;
+ case MT_FALLINGROCK:
+ // Despawn rocks here in case zmovement code can't do so (blame slopes)
+ if (!mobj->momx && !mobj->momy && !mobj->momz
+ && ((mobj->eflags & MFE_VERTICALFLIP) ?
+ mobj->z + mobj->height >= mobj->ceilingz
+ : mobj->z <= mobj->floorz))
+ {
+ P_RemoveMobj(mobj);
+ return false;
+ }
+ P_MobjCheckWater(mobj);
+ break;
+ case MT_ARROW:
+ P_ArrowThink(mobj);
+ break;
+ case MT_EMERALDSPAWN:
+ if (mobj->threshold)
+ {
+ mobj->threshold--;
- if (mobj->flags2 & MF2_AMBUSH)
- {
- mobj->momx = FixedMul(mobj->momx, 50 * FRACUNIT / 51);
- mobj->momy = FixedMul(mobj->momy, 50 * FRACUNIT / 51);
- break;
- }
+ if (!mobj->threshold && !mobj->target && mobj->reactiontime)
+ {
+ mobj_t *emerald = P_SpawnMobj(mobj->x, mobj->y, mobj->z, mobj->reactiontime);
+ emerald->threshold = 42;
+ P_SetTarget(&mobj->target, emerald);
+ P_SetTarget(&emerald->target, mobj);
+ }
+ }
+ break;
+ case MT_BUGGLE:
+ mobj->eflags |= MFE_UNDERWATER; //P_MobjCheckWater(mobj); // solely for MFE_UNDERWATER for A_FlickySpawn
+ {
+ if (mobj->tracer && mobj->tracer->player && mobj->tracer->health > 0
+ && P_AproxDistance(P_AproxDistance(mobj->tracer->x - mobj->x, mobj->tracer->y - mobj->y), mobj->tracer->z - mobj->z) <= mobj->radius*16)
+ {
+ // Home in on the target.
+ P_HomingAttack(mobj, mobj->tracer);
- if (mobj->eflags & MFE_VERTICALFLIP)
- {
- if ((mobj->z + mobj->height + mobj->momz) <= mobj->ceilingz)
- break;
- }
- else
- {
- if ((mobj->z + mobj->momz) >= mobj->floorz)
- break;
- }
+ if (mobj->z < mobj->floorz)
+ mobj->z = mobj->floorz;
- momz = abs(mobj->momz);
- if (R_PointToDist2(0, 0, mobj->momx, mobj->momy) < momz)
- P_InstaThrust(mobj, R_PointToAngle2(0, 0, mobj->momx, mobj->momy), momz);
- mobj->flags2 |= MF2_AMBUSH;
- break;
- }
- case MT_SALOONDOOR:
+ if (leveltime % mobj->info->painchance == 0)
+ S_StartSound(mobj, mobj->info->activesound);
+
+ if ((statenum_t)(mobj->state - states) != mobj->info->seestate)
+ P_SetMobjState(mobj, mobj->info->seestate);
+ }
+ else
+ {
+ // Try to find a player
+ P_LookForPlayers(mobj, true, true, mobj->radius*16);
+ mobj->momx >>= 1;
+ mobj->momy >>= 1;
+ mobj->momz >>= 1;
+ if ((statenum_t)(mobj->state - states) != mobj->info->spawnstate)
+ P_SetMobjState(mobj, mobj->info->spawnstate);
+ }
+ }
+ break;
+ case MT_BUMBLEBORE:
+ P_BumbleboreThink(mobj);
+ break;
+ case MT_BIGMINE:
+ mobj->extravalue1 += 3;
+ mobj->extravalue1 %= 360;
+ P_UnsetThingPosition(mobj);
+ mobj->z += FINESINE(mobj->extravalue1*(FINEMASK + 1)/360);
+ P_SetThingPosition(mobj);
+ break;
+ case MT_FLAME:
+ if (mobj->flags2 & MF2_BOSSNOTRAP)
+ {
+ if (!mobj->target || P_MobjWasRemoved(mobj->target))
+ {
+ if (mobj->tracer && !P_MobjWasRemoved(mobj->tracer))
+ P_RemoveMobj(mobj->tracer);
+ P_RemoveMobj(mobj);
+ return false;
+ }
+ mobj->z = mobj->target->z + mobj->target->momz;
+ if (!(mobj->eflags & MFE_VERTICALFLIP))
+ mobj->z += mobj->target->height;
+ }
+ if (mobj->tracer && !P_MobjWasRemoved(mobj->tracer))
+ {
+ mobj->tracer->z = mobj->z + P_MobjFlip(mobj)*20*mobj->scale;
+ if (mobj->eflags & MFE_VERTICALFLIP)
+ mobj->tracer->z += mobj->height;
+ }
+ break;
+ case MT_WAVINGFLAG1:
+ case MT_WAVINGFLAG2:
+ {
+ fixed_t base = (leveltime << (FRACBITS + 1));
+ mobj_t *seg = mobj->tracer, *prev = mobj;
+ mobj->movedir = mobj->angle
+ + ((((FINESINE((FixedAngle(base << 1) >> ANGLETOFINESHIFT) & FINEMASK)
+ + FINESINE((FixedAngle(base << 4) >> ANGLETOFINESHIFT) & FINEMASK)) >> 1)
+ + FINESINE((FixedAngle(base*9) >> ANGLETOFINESHIFT) & FINEMASK)
+ + FINECOSINE(((FixedAngle(base*9)) >> ANGLETOFINESHIFT) & FINEMASK)) << 12); //*2^12
+ while (seg)
+ {
+ seg->movedir = seg->angle;
+ seg->angle = prev->movedir;
+ P_UnsetThingPosition(seg);
+ seg->x = prev->x + P_ReturnThrustX(prev, prev->angle, prev->radius);
+ seg->y = prev->y + P_ReturnThrustY(prev, prev->angle, prev->radius);
+ seg->z = prev->z + prev->height - (seg->scale >> 1);
+ P_SetThingPosition(seg);
+ prev = seg;
+ seg = seg->tracer;
+ }
+ }
+ break;
+ case MT_SPINCUSHION:
+ if (mobj->target && mobj->state - states >= S_SPINCUSHION_AIM1 && mobj->state - states <= S_SPINCUSHION_AIM5)
+ mobj->angle = R_PointToAngle2(mobj->x, mobj->y, mobj->target->x, mobj->target->y);
+ break;
+ case MT_CRUSHCLAW:
+ if (mobj->state - states == S_CRUSHCLAW_STAY && mobj->target)
+ {
+ mobj_t *chain = mobj->target->target;
+ SINT8 sign = ((mobj->tics & 1) ? mobj->tics : -(SINT8)(mobj->tics));
+ while (chain)
+ {
+ chain->z = chain->watertop + sign*mobj->scale;
+ sign = -sign;
+ chain = chain->target;
+ }
+ }
+ break;
+ case MT_SMASHINGSPIKEBALL:
+ mobj->momx = mobj->momy = 0;
+ if (mobj->state - states == S_SMASHSPIKE_FALL && P_IsObjectOnGround(mobj))
+ {
+ P_SetMobjState(mobj, S_SMASHSPIKE_STOMP1);
+ S_StartSound(mobj, sfx_spsmsh);
+ }
+ else if (mobj->state - states == S_SMASHSPIKE_RISE2 && P_MobjFlip(mobj)*(mobj->z - mobj->movecount) >= 0)
+ {
+ mobj->momz = 0;
+ P_SetMobjState(mobj, S_SMASHSPIKE_FLOAT);
+ }
+ break;
+ case MT_HANGSTER:
+ if (!P_HangsterThink(mobj))
+ return false;
+ break;
+ case MT_LHRT:
+ mobj->momx = FixedMul(mobj->momx, mobj->extravalue2);
+ mobj->momy = FixedMul(mobj->momy, mobj->extravalue2);
+ break;
+ case MT_EGGCAPSULE:
+ if (!mobj->reactiontime)
+ {
+ // Target nearest player on your mare.
+ // (You can make it float up/down by adding MF_FLOAT,
+ // but beware level design pitfalls.)
+ fixed_t shortest = 1024*FRACUNIT;
+ INT32 i;
+ P_SetTarget(&mobj->target, NULL);
+ for (i = 0; i < MAXPLAYERS; i++)
+ if (playeringame[i] && players[i].mo
+ && players[i].mare == mobj->threshold && players[i].spheres > 0)
{
- fixed_t x = mobj->tracer->x;
- fixed_t y = mobj->tracer->y;
- fixed_t z = mobj->tracer->z;
- angle_t oang = FixedAngle(mobj->extravalue1);
- angle_t fa = (oang >> ANGLETOFINESHIFT) & FINEMASK;
- fixed_t c0 = -96*FINECOSINE(fa);
- fixed_t s0 = -96*FINESINE(fa);
- angle_t fma;
- fixed_t c, s;
- angle_t angdiff;
-
- // Adjust angular speed
- fixed_t da = AngleFixed(mobj->angle - oang);
- if (da > 180*FRACUNIT)
- da -= 360*FRACUNIT;
- mobj->extravalue2 = 8*(mobj->extravalue2 - da/32)/9;
-
- // Update angle
- mobj->angle += FixedAngle(mobj->extravalue2);
-
- angdiff = mobj->angle - FixedAngle(mobj->extravalue1);
- if (angdiff > (ANGLE_90 - ANG2) && angdiff < ANGLE_180)
- {
- mobj->angle = FixedAngle(mobj->extravalue1) + (ANGLE_90 - ANG2);
- mobj->extravalue2 /= 2;
- }
- else if (angdiff < (ANGLE_270 + ANG2) && angdiff >= ANGLE_180)
+ fixed_t dist = P_AproxDistance(players[i].mo->x - mobj->x, players[i].mo->y - mobj->y);
+ if (dist < shortest)
{
- mobj->angle = FixedAngle(mobj->extravalue1) + (ANGLE_270 + ANG2);
- mobj->extravalue2 /= 2;
+ P_SetTarget(&mobj->target, players[i].mo);
+ shortest = dist;
}
-
- // Update position
- fma = (mobj->angle >> ANGLETOFINESHIFT) & FINEMASK;
- c = 48*FINECOSINE(fma);
- s = 48*FINESINE(fma);
- P_TeleportMove(mobj, x + c0 + c, y + s0 + s, z);
- break;
- }
- case MT_MINECARTSPAWNER:
- P_HandleMinecartSegments(mobj);
- if (!mobj->fuse || mobj->fuse > TICRATE)
- break;
- if (mobj->fuse == 2)
- {
- mobj->fuse = 0;
- break;
}
- mobj->flags2 ^= MF2_DONTDRAW;
- break;
- case MT_LAVAFALLROCK:
- if (P_IsObjectOnGround(mobj))
- P_RemoveMobj(mobj);
- break;
- case MT_PYREFLY:
- {
- fixed_t hdist;
-
- mobj->extravalue1 = (mobj->extravalue1 + 3) % 360;
- mobj->z += FINESINE(((mobj->extravalue1*ANG1) >> ANGLETOFINESHIFT) & FINEMASK);
-
- if (!(mobj->flags2 & MF2_BOSSNOTRAP))
- P_LookForPlayers(mobj, true, false, 1500*FRACUNIT);
-
- if (!mobj->target)
- break;
-
- if (mobj->extravalue2 == 1)
- P_PyreFlyBurn(mobj, 0, 20, MT_SMOKE, 4*FRACUNIT);
- else if (mobj->extravalue2 == 2)
- {
- INT32 fireradius = min(100 - mobj->fuse, 52);
- P_PyreFlyBurn(mobj, P_RandomRange(0, fireradius)*FRACUNIT, 20, MT_FLAMEPARTICLE, 4*FRACUNIT);
- P_PyreFlyBurn(mobj, fireradius*FRACUNIT, 40, MT_PYREFLY_FIRE, 0);
- }
+ }
+ break;
+ case MT_EGGMOBILE2_POGO:
+ if (!mobj->target
+ || !mobj->target->health
+ || mobj->target->state == &states[mobj->target->info->spawnstate]
+ || mobj->target->state == &states[mobj->target->info->raisestate])
+ {
+ P_RemoveMobj(mobj);
+ return false;
+ }
+ P_TeleportMove(mobj, mobj->target->x, mobj->target->y, mobj->target->z - mobj->height);
+ break;
+ case MT_HAMMER:
+ if (mobj->z <= mobj->floorz)
+ {
+ P_RemoveMobj(mobj);
+ return false;
+ }
+ break;
+ case MT_KOOPA:
+ P_KoopaThinker(mobj);
+ break;
+ case MT_FIREBALL:
+ if (P_AproxDistance(mobj->momx, mobj->momy) <= 16*FRACUNIT) // Once fireballs lose enough speed, kill them
+ {
+ P_KillMobj(mobj, NULL, NULL, 0);
+ return false;
+ }
+ break;
+ case MT_REDRING:
+ if (((mobj->z < mobj->floorz) || (mobj->z + mobj->height > mobj->ceilingz))
+ && mobj->flags & MF_MISSILE)
+ {
+ P_ExplodeMissile(mobj);
+ return false;
+ }
+ break;
+ case MT_BOSSFLYPOINT:
+ return false;
+ case MT_NIGHTSCORE:
+ mobj->color = (UINT8)(leveltime % SKINCOLOR_WHITE);
+ break;
+ case MT_JETFUME1:
+ if (!P_JetFume1Think(mobj))
+ return false;
+ break;
+ case MT_JETFLAME:
+ {
+ if (!mobj->target // if you have no target
+ || (!(mobj->target->flags & MF_BOSS) && mobj->target->health <= 0)) // or your target isn't a boss and it's popped now
+ { // then remove yourself as well!
+ P_RemoveMobj(mobj);
+ return false;
+ }
- hdist = R_PointToDist2(mobj->x, mobj->y, mobj->target->x, mobj->target->y);
+ P_UnsetThingPosition(mobj);
+ mobj->x = mobj->target->x;
+ mobj->y = mobj->target->y;
+ mobj->z = mobj->target->z - 50*mobj->target->scale;
+ mobj->floorz = mobj->z;
+ mobj->ceilingz = mobj->z + mobj->height;
+ P_SetThingPosition(mobj);
+ }
+ break;
+ case MT_EGGROBO1:
+ if (!P_EggRobo1Think(mobj))
+ return false;
+ break;
+ case MT_EGGROBO1JET:
+ {
+ if (!mobj->target || P_MobjWasRemoved(mobj->target) // if you have no target
+ || (mobj->target->health <= 0)) // or your target isn't a boss and it's popped now
+ { // then remove yourself as well!
+ P_RemoveMobj(mobj);
+ return false;
+ }
- if (hdist > 1500*FRACUNIT)
- {
- mobj->flags2 &= ~MF2_BOSSNOTRAP;
- P_SetTarget(&mobj->target, NULL);
- break;
- }
+ mobj->flags2 ^= MF2_DONTDRAW;
- if (!(mobj->flags2 & MF2_BOSSNOTRAP) && hdist <= 450*FRACUNIT)
- mobj->flags2 |= MF2_BOSSNOTRAP;
+ P_UnsetThingPosition(mobj);
+ mobj->x = mobj->target->x + P_ReturnThrustX(mobj, mobj->target->angle + ANGLE_90, mobj->movefactor*mobj->target->scale) - P_ReturnThrustX(mobj, mobj->target->angle, 19*mobj->target->scale);
+ mobj->y = mobj->target->y + P_ReturnThrustY(mobj, mobj->target->angle + ANGLE_90, mobj->movefactor*mobj->target->scale) - P_ReturnThrustY(mobj, mobj->target->angle, 19*mobj->target->scale);
+ mobj->z = mobj->target->z;
+ if (mobj->target->eflags & MFE_VERTICALFLIP)
+ mobj->z += (mobj->target->height - mobj->height);
+ mobj->floorz = mobj->z;
+ mobj->ceilingz = mobj->z + mobj->height;
+ P_SetThingPosition(mobj);
+ }
+ break;
+ case MT_NIGHTSDRONE:
+ P_NiGHTSDroneThink(mobj);
+ break;
+ case MT_PLAYER:
+ if (mobj->player)
+ P_PlayerMobjThinker(mobj);
+ return false;
+ case MT_SKIM:
+ // check mobj against possible water content, before movement code
+ P_MobjCheckWater(mobj);
- if (!(mobj->flags2 & MF2_BOSSNOTRAP))
- break;
+ // Keep Skim at water surface
+ if (mobj->z <= mobj->watertop)
+ {
+ mobj->flags |= MF_NOGRAVITY;
+ if (mobj->z < mobj->watertop)
+ {
+ if (mobj->watertop - mobj->z <= FixedMul(mobj->info->speed*FRACUNIT, mobj->scale))
+ mobj->z = mobj->watertop;
+ else
+ mobj->momz = FixedMul(mobj->info->speed*FRACUNIT, mobj->scale);
+ }
+ }
+ else
+ {
+ mobj->flags &= ~MF_NOGRAVITY;
+ if (mobj->z > mobj->watertop && mobj->z - mobj->watertop < FixedMul(MAXSTEPMOVE, mobj->scale))
+ mobj->z = mobj->watertop;
+ }
+ break;
+ case MT_RING:
+ case MT_REDTEAMRING:
+ case MT_BLUETEAMRING:
+ P_KillRingsInLava(mobj);
+ if (P_MobjWasRemoved(mobj))
+ return false;
+ /* FALLTHRU */
+ case MT_COIN:
+ case MT_BLUESPHERE:
+ case MT_BOMBSPHERE:
+ case MT_NIGHTSCHIP:
+ case MT_NIGHTSSTAR:
+ // No need to check water. Who cares?
+ P_RingThinker(mobj);
+ if (mobj->flags2 & MF2_NIGHTSPULL)
+ P_NightsItemChase(mobj);
+ else
+ A_AttractChase(mobj);
+ return false;
+ // Flung items
+ case MT_FLINGRING:
+ P_KillRingsInLava(mobj);
+ if (P_MobjWasRemoved(mobj))
+ return false;
+ /* FALLTHRU */
+ case MT_FLINGCOIN:
+ case MT_FLINGBLUESPHERE:
+ case MT_FLINGNIGHTSCHIP:
+ if (mobj->flags2 & MF2_NIGHTSPULL)
+ P_NightsItemChase(mobj);
+ else
+ A_AttractChase(mobj);
+ break;
+ case MT_EMBLEM:
+ if (mobj->flags2 & MF2_NIGHTSPULL)
+ P_NightsItemChase(mobj);
+ break;
+ case MT_SHELL:
+ if (mobj->threshold && mobj->threshold != TICRATE)
+ mobj->threshold--;
- if (hdist < 1000*FRACUNIT)
- {
- //Aim for player z position. If too close to floor/ceiling, aim just above/below them.
- fixed_t destz = min(max(mobj->target->z, mobj->target->floorz + 70*FRACUNIT), mobj->target->ceilingz - 80*FRACUNIT - mobj->height);
- fixed_t dist = P_AproxDistance(hdist, destz - mobj->z);
- P_InstaThrust(mobj, R_PointToAngle2(mobj->x, mobj->y, mobj->target->x, mobj->target->y), 2*FRACUNIT);
- mobj->momz = FixedMul(FixedDiv(destz - mobj->z, dist), 2*FRACUNIT);
- }
- else
- {
- mobj->momx = 0;
- mobj->momy = 0;
- mobj->momz = 0;
- }
- break;
- }
- case MT_PTERABYTE:
- {
- if (mobj->extravalue1 & 4) // Cooldown after grabbing
- {
- if (mobj->movefactor)
- mobj->movefactor--;
- else
- {
- P_SetTarget(&mobj->target, NULL);
- mobj->extravalue1 &= 3;
- }
- }
+ if (mobj->threshold >= TICRATE)
+ {
+ mobj->angle += ((mobj->movedir == 1) ? ANGLE_22h : ANGLE_337h);
+ P_InstaThrust(mobj, R_PointToAngle2(0, 0, mobj->momx, mobj->momy), (mobj->info->speed*mobj->scale));
+ }
+ break;
+ case MT_TURRET:
+ if (!P_TurretThink(mobj))
+ return false;
+ break;
+ case MT_BLUEFLAG:
+ case MT_REDFLAG:
+ {
+ sector_t* sec2;
+ sec2 = P_ThingOnSpecial3DFloor(mobj);
+ if ((sec2 && GETSECSPECIAL(sec2->special, 4) == 2) || (GETSECSPECIAL(mobj->subsector->sector->special, 4) == 2))
+ mobj->fuse = 1; // Return to base.
+ break;
+ }
+ case MT_CANNONBALL:
+#ifdef FLOORSPLATS
+ R_AddFloorSplat(mobj->tracer->subsector, mobj->tracer, "TARGET", mobj->tracer->x,
+ mobj->tracer->y, mobj->tracer->floorz, SPLATDRAWMODE_SHADE);
+#endif
+ break;
+ case MT_SPINDUST: // Spindash dust
+ mobj->momx = FixedMul(mobj->momx, (3*FRACUNIT)/4); // originally 50000
+ mobj->momy = FixedMul(mobj->momy, (3*FRACUNIT)/4); // same
+ //mobj->momz = mobj->momz+P_MobjFlip(mobj)/3; // no meaningful change in value to be frank
+ if (mobj->state >= &states[S_SPINDUST_BUBBLE1] && mobj->state <= &states[S_SPINDUST_BUBBLE4]) // bubble dust!
+ {
+ P_MobjCheckWater(mobj);
+ if (mobj->watertop != mobj->subsector->sector->floorheight - 1000*FRACUNIT
+ && mobj->z + mobj->height >= mobj->watertop - 5*FRACUNIT)
+ mobj->flags2 |= MF2_DONTDRAW;
+ }
+ break;
+ case MT_TRAINDUSTSPAWNER:
+ if (leveltime % 5 == 0) {
+ mobj_t* traindust = P_SpawnMobj(mobj->x, mobj->y, mobj->z, MT_PARTICLE);
+ traindust->flags = MF_SCENERY;
+ P_SetMobjState(traindust, S_TRAINDUST);
+ traindust->frame = P_RandomRange(0, 8)|FF_TRANS90;
+ traindust->angle = mobj->angle;
+ traindust->tics = TICRATE*4;
+ traindust->destscale = FRACUNIT*64;
+ traindust->scalespeed = FRACUNIT/24;
+ P_SetScale(traindust, FRACUNIT*6);
+ }
+ break;
+ case MT_TRAINSTEAMSPAWNER:
+ if (leveltime % 5 == 0) {
+ mobj_t *steam = P_SpawnMobj(mobj->x + FRACUNIT*P_SignedRandom()/2, mobj->y + FRACUNIT*P_SignedRandom()/2, mobj->z, MT_PARTICLE);
+ P_SetMobjState(steam, S_TRAINSTEAM);
+ steam->frame = P_RandomRange(0, 1)|FF_TRANS90;
+ steam->tics = TICRATE*8;
+ steam->destscale = FRACUNIT*64;
+ steam->scalespeed = FRACUNIT/8;
+ P_SetScale(steam, FRACUNIT*16);
+ steam->momx = P_SignedRandom()*32;
+ steam->momy = -64*FRACUNIT;
+ steam->momz = 2*FRACUNIT;
+ }
+ break;
+ case MT_CANARIVORE_GAS:
+ {
+ fixed_t momz;
- if ((mobj->extravalue1 & 3) == 0) // Hovering
- {
- fixed_t vdist, hdist, time;
- fixed_t hspeed = 3*mobj->info->speed;
- angle_t fa;
+ if (mobj->flags2 & MF2_AMBUSH)
+ {
+ mobj->momx = FixedMul(mobj->momx, 50*FRACUNIT/51);
+ mobj->momy = FixedMul(mobj->momy, 50*FRACUNIT/51);
+ break;
+ }
- var1 = 1;
- var2 = 0;
- A_CapeChase(mobj);
+ if (mobj->eflags & MFE_VERTICALFLIP)
+ {
+ if ((mobj->z + mobj->height + mobj->momz) <= mobj->ceilingz)
+ break;
+ }
+ else
+ {
+ if ((mobj->z + mobj->momz) >= mobj->floorz)
+ break;
+ }
- if (mobj->target)
- break; // Still carrying a player or in cooldown
+ momz = abs(mobj->momz);
+ if (R_PointToDist2(0, 0, mobj->momx, mobj->momy) < momz)
+ P_InstaThrust(mobj, R_PointToAngle2(0, 0, mobj->momx, mobj->momy), momz);
+ mobj->flags2 |= MF2_AMBUSH;
+ break;
+ }
+ case MT_SALOONDOOR:
+ P_SaloonDoorThink(mobj);
+ break;
+ case MT_MINECARTSPAWNER:
+ P_HandleMinecartSegments(mobj);
+ if (!mobj->fuse || mobj->fuse > TICRATE)
+ break;
+ if (mobj->fuse == 2)
+ {
+ mobj->fuse = 0;
+ break;
+ }
+ mobj->flags2 ^= MF2_DONTDRAW;
+ break;
+ case MT_LAVAFALLROCK:
+ if (P_IsObjectOnGround(mobj))
+ P_RemoveMobj(mobj);
+ break;
+ case MT_PYREFLY:
+ P_PyreFlyThink(mobj);
+ break;
+ case MT_PTERABYTE:
+ P_PterabyteThink(mobj);
+ break;
+ case MT_DRAGONBOMBER:
+ P_DragonbomberThink(mobj);
+ break;
+ case MT_MINUS:
+ if (P_IsObjectOnGround(mobj))
+ mobj->rollangle = 0;
+ else
+ mobj->rollangle = R_PointToAngle2(0, 0, mobj->momz, (mobj->scale << 1) - min(abs(mobj->momz), mobj->scale << 1));
+ break;
+ case MT_SPINFIRE:
+ if (mobj->flags & MF_NOGRAVITY)
+ {
+ if (mobj->eflags & MFE_VERTICALFLIP)
+ mobj->z = mobj->ceilingz - mobj->height;
+ else
+ mobj->z = mobj->floorz;
+ }
+ else if ((!(mobj->eflags & MFE_VERTICALFLIP) && mobj->z <= mobj->floorz)
+ || ((mobj->eflags & MFE_VERTICALFLIP) && mobj->z + mobj->height >= mobj->ceilingz))
+ {
+ mobj->flags |= MF_NOGRAVITY;
+ mobj->momx = 8; // this is a hack which is used to ensure it still behaves as a missile and can damage others
+ mobj->momy = mobj->momz = 0;
+ mobj->z = ((mobj->eflags & MFE_VERTICALFLIP) ? mobj->ceilingz - mobj->height : mobj->floorz);
+ }
+ /* FALLTHRU */
+ default:
+ // check mobj against possible water content, before movement code
+ P_MobjCheckWater(mobj);
- P_LookForPlayers(mobj, true, false, 256*FRACUNIT);
+ // Extinguish fire objects in water
+ if (mobj->flags & MF_FIRE && mobj->type != MT_PUMA && mobj->type != MT_FIREBALL
+ && (mobj->eflags & (MFE_UNDERWATER|MFE_TOUCHWATER)))
+ {
+ P_KillMobj(mobj, NULL, NULL, 0);
+ return false;
+ }
+ break;
+ }
+ return true;
+}
- if (!mobj->target)
- break;
+static void P_FiringThink(mobj_t *mobj)
+{
+ if (!mobj->target)
+ return;
- if (mobj->target->player->powers[pw_flashing])
- {
- P_SetTarget(&mobj->target, NULL);
- break;
- }
+ if (mobj->health <= 0)
+ return;
- vdist = mobj->z - mobj->target->z - mobj->target->height;
- if (P_MobjFlip(mobj)*vdist <= 0)
- {
- P_SetTarget(&mobj->target, NULL);
- break;
- }
+ if (mobj->state->action.acp1 == (actionf_p1)A_Boss1Laser)
+ {
+ if (mobj->state->tics > 1)
+ {
+ var1 = mobj->state->var1;
+ var2 = mobj->state->var2 & 65535;
+ mobj->state->action.acp1(mobj);
+ }
+ }
+ else if (leveltime & 1) // Fire mode
+ {
+ mobj_t *missile;
- hdist = R_PointToDist2(mobj->x, mobj->y, mobj->target->x, mobj->target->y);
- if (hdist > 450*FRACUNIT)
- {
- P_SetTarget(&mobj->target, NULL);
- break;
- }
+ if (mobj->target->player && mobj->target->player->powers[pw_carry] == CR_NIGHTSMODE)
+ {
+ fixed_t oldval = mobjinfo[mobj->extravalue1].speed;
- P_SetMobjState(mobj, S_PTERABYTE_SWOOPDOWN);
- mobj->extravalue1++;
- S_StartSound(mobj, mobj->info->attacksound);
- time = FixedDiv(hdist, hspeed);
- mobj->angle = R_PointToAngle2(mobj->x, mobj->y, mobj->target->x, mobj->target->y);
- fa = (mobj->angle >> ANGLETOFINESHIFT) & FINEMASK;
- mobj->momx = FixedMul(FINECOSINE(fa), hspeed);
- mobj->momy = FixedMul(FINESINE(fa), hspeed);
- mobj->momz = -2*FixedDiv(vdist, time);
- mobj->extravalue2 = -FixedDiv(mobj->momz, time); //Z accel
- mobj->movecount = time >> FRACBITS;
- mobj->reactiontime = mobj->movecount;
- }
- else if ((mobj->extravalue1 & 3) == 1) // Swooping
- {
- mobj->reactiontime--;
- mobj->momz += mobj->extravalue2;
- if (mobj->reactiontime)
- break;
+ mobj->angle = R_PointToAngle2(mobj->x, mobj->y, mobj->target->x + mobj->target->momx, mobj->target->y + mobj->target->momy);
+ mobjinfo[mobj->extravalue1].speed = FixedMul(60*FRACUNIT, mobj->scale);
+ missile = P_SpawnMissile(mobj, mobj->target, mobj->extravalue1);
+ mobjinfo[mobj->extravalue1].speed = oldval;
+ }
+ else
+ {
+ mobj->angle = R_PointToAngle2(mobj->x, mobj->y, mobj->target->x, mobj->target->y);
+ missile = P_SpawnMissile(mobj, mobj->target, mobj->extravalue1);
+ }
- if (mobj->state - states == S_PTERABYTE_SWOOPDOWN)
- {
- P_SetMobjState(mobj, S_PTERABYTE_SWOOPUP);
- mobj->reactiontime = mobj->movecount;
- }
- else if (mobj->state - states == S_PTERABYTE_SWOOPUP)
- {
- P_SetMobjState(mobj, S_PTERABYTE_FLY1);
- mobj->extravalue1++;
- if (mobj->target && mobj->target->tracer != mobj)
- P_SetTarget(&mobj->target, NULL); // Failed to grab the target
- mobj->momx = mobj->momy = mobj->momz = 0;
- }
- }
- else // Returning
- {
- var1 = 2*mobj->info->speed;
- var2 = 1;
- A_HomingChase(mobj);
- if (P_AproxDistance(mobj->x - mobj->tracer->x, mobj->y - mobj->tracer->y) <= mobj->info->speed)
- {
- mobj->extravalue1 -= 2;
- mobj->momx = mobj->momy = mobj->momz = 0;
- }
- }
- break;
- }
- case MT_DRAGONBOMBER:
- {
-#define DRAGONTURNSPEED ANG2
- mobj->movecount = (mobj->movecount + 9) % 360;
- P_SetObjectMomZ(mobj, 4*FINESINE(((mobj->movecount*ANG1) >> ANGLETOFINESHIFT) & FINEMASK), false);
- if (mobj->threshold > 0) // are we dropping mines?
- {
- mobj->threshold--;
- if (mobj->threshold == 0) // if the timer hits 0, look for a mine to drop!
- {
- mobj_t *segment = mobj;
- while (segment->tracer != NULL && !P_MobjWasRemoved(segment->tracer) && segment->tracer->state == &states[segment->tracer->info->spawnstate])
- {
- segment = segment->tracer;
- }
- if (segment != mobj) // found an unactivated segment?
- {
- mobj_t *mine = P_SpawnMobjFromMobj(segment, 0, 0, 0, segment->info->painchance);
- mine->angle = segment->angle;
- P_InstaThrust(mine, mobj->angle, P_AproxDistance(mobj->momx, mobj->momy) >> 1);
- P_SetObjectMomZ(mine, -2*FRACUNIT, true);
- S_StartSound(mine, mine->info->seesound);
- P_SetMobjState(segment, segment->info->raisestate);
- mobj->threshold = mobj->info->painchance;
- }
- }
- }
- if (mobj->target != NULL) // Are we chasing a player?
- {
- fixed_t dist = P_AproxDistance(mobj->x - mobj->target->x, mobj->y - mobj->target->y);
- if (dist > 2000 * mobj->scale) // Not anymore!
- P_SetTarget(&mobj->target, NULL);
- else
- {
- fixed_t vspeed = FixedMul(mobj->info->speed >> 3, mobj->scale);
- fixed_t z = mobj->target->z + (mobj->height >> 1) + (mobj->flags & MFE_VERTICALFLIP ? -128*mobj->scale : 128*mobj->scale + mobj->target->height);
- angle_t diff = R_PointToAngle2(mobj->x, mobj->y, mobj->target->x, mobj->target->y) - mobj->angle;
- if (diff > ANGLE_180)
- mobj->angle -= DRAGONTURNSPEED;
- else
- mobj->angle += DRAGONTURNSPEED;
- if (!mobj->threshold && dist < 512 * mobj->scale) // Close enough to drop bombs
- {
- mobj->threshold = mobj->info->painchance;
- }
- mobj->momz += max(min(z - mobj->z, vspeed), -vspeed);
- }
- }
- else // Can we find a player to chase?
- {
- if (mobj->tracer == NULL || mobj->tracer->state != &states[mobj->tracer->info->spawnstate]
- || !P_LookForPlayers(mobj, true, false, 2000*mobj->scale)) // if not, circle around the spawnpoint
- {
- if (!mobj->spawnpoint) // unless we don't have one, in which case uhhh just circle around wherever we currently are I guess??
- mobj->angle += DRAGONTURNSPEED;
- else
- {
- fixed_t vspeed = FixedMul(mobj->info->speed >> 3, mobj->scale);
- fixed_t x = mobj->spawnpoint->x << FRACBITS;
- fixed_t y = mobj->spawnpoint->y << FRACBITS;
- fixed_t z = mobj->spawnpoint->z << FRACBITS;
- angle_t diff = R_PointToAngle2(mobj->x, mobj->y, x, y) - mobj->angle;
- if (diff > ANGLE_180)
- mobj->angle -= DRAGONTURNSPEED;
- else
- mobj->angle += DRAGONTURNSPEED;
- mobj->momz += max(min(z - mobj->z, vspeed), -vspeed);
- }
- }
- }
- P_InstaThrust(mobj, mobj->angle, FixedMul(mobj->info->speed, mobj->scale));
-#undef DRAGONTURNSPEED
- }
- break;
- case MT_MINUS:
- {
- if (P_IsObjectOnGround(mobj))
- mobj->rollangle = 0;
- else
- mobj->rollangle = R_PointToAngle2(0, 0, mobj->momz, (mobj->scale << 1) - min(abs(mobj->momz), mobj->scale << 1));
- }
- break;
- case MT_SPINFIRE:
- if (mobj->flags & MF_NOGRAVITY)
- {
- if (mobj->eflags & MFE_VERTICALFLIP)
- mobj->z = mobj->ceilingz - mobj->height;
- else
- mobj->z = mobj->floorz;
- }
- else if ((!(mobj->eflags & MFE_VERTICALFLIP) && mobj->z <= mobj->floorz)
- || ((mobj->eflags & MFE_VERTICALFLIP) && mobj->z+mobj->height >= mobj->ceilingz))
- {
- mobj->flags |= MF_NOGRAVITY;
- mobj->momx = 8; // this is a hack which is used to ensure it still behaves as a missile and can damage others
- mobj->momy = mobj->momz = 0;
- mobj->z = ((mobj->eflags & MFE_VERTICALFLIP) ? mobj->ceilingz-mobj->height : mobj->floorz);
- }
- /* FALLTHRU */
- default:
- // check mobj against possible water content, before movement code
- P_MobjCheckWater(mobj);
+ if (missile)
+ {
+ if (mobj->flags2 & MF2_SUPERFIRE)
+ missile->flags2 |= MF2_SUPERFIRE;
- // Extinguish fire objects in water
- if (mobj->flags & MF_FIRE && mobj->type != MT_PUMA && mobj->type != MT_FIREBALL
- && (mobj->eflags & (MFE_UNDERWATER|MFE_TOUCHWATER)))
- {
- P_KillMobj(mobj, NULL, NULL, 0);
- return;
- }
- break;
+ if (mobj->info->attacksound)
+ S_StartSound(missile, mobj->info->attacksound);
}
}
- if (P_MobjWasRemoved(mobj))
- return;
+ else
+ mobj->angle = R_PointToAngle2(mobj->x, mobj->y, mobj->target->x, mobj->target->y);
+}
+
+static void P_MonitorFuseThink(mobj_t *mobj)
+{
+ mobj_t *newmobj;
- if (mobj->flags2 & MF2_FIRING && mobj->target && mobj->health > 0)
+ // Special case for ALL monitors.
+ // If a box's speed is nonzero, it's allowed to respawn as a WRM/SRM.
+ if (mobj->info->speed != 0 && (mobj->flags2 & (MF2_AMBUSH|MF2_STRONGBOX)))
{
- if (mobj->state->action.acp1 == (actionf_p1)A_Boss1Laser)
- {
- if (mobj->state->tics > 1)
- {
- var1 = mobj->state->var1;
- var2 = mobj->state->var2 & 65535;
- mobj->state->action.acp1(mobj);
- }
- }
- else if (leveltime & 1) // Fire mode
- {
- mobj_t *missile;
+ mobjtype_t spawnchance[64];
+ INT32 numchoices = 0, i = 0;
- if (mobj->target->player && mobj->target->player->powers[pw_carry] == CR_NIGHTSMODE)
- {
- fixed_t oldval = mobjinfo[mobj->extravalue1].speed;
+ // This define should make it a lot easier to organize and change monitor weights
+#define SETMONITORCHANCES(type, strongboxamt, weakboxamt) \
+for (i = ((mobj->flags2 & MF2_STRONGBOX) ? strongboxamt : weakboxamt); i; --i) spawnchance[numchoices++] = type
- mobj->angle = R_PointToAngle2(mobj->x, mobj->y, mobj->target->x+mobj->target->momx, mobj->target->y+mobj->target->momy);
- mobjinfo[mobj->extravalue1].speed = FixedMul(60*FRACUNIT, mobj->scale);
- missile = P_SpawnMissile(mobj, mobj->target, mobj->extravalue1);
- mobjinfo[mobj->extravalue1].speed = oldval;
- }
- else
- {
- mobj->angle = R_PointToAngle2(mobj->x, mobj->y, mobj->target->x, mobj->target->y);
- missile = P_SpawnMissile(mobj, mobj->target, mobj->extravalue1);
- }
+ // Type SRM WRM
+ SETMONITORCHANCES(MT_SNEAKERS_BOX, 0, 10); // Super Sneakers
+ SETMONITORCHANCES(MT_INVULN_BOX, 2, 0); // Invincibility
+ SETMONITORCHANCES(MT_WHIRLWIND_BOX, 3, 8); // Whirlwind Shield
+ SETMONITORCHANCES(MT_ELEMENTAL_BOX, 3, 8); // Elemental Shield
+ SETMONITORCHANCES(MT_ATTRACT_BOX, 2, 0); // Attraction Shield
+ SETMONITORCHANCES(MT_FORCE_BOX, 3, 3); // Force Shield
+ SETMONITORCHANCES(MT_ARMAGEDDON_BOX, 2, 0); // Armageddon Shield
+ SETMONITORCHANCES(MT_MIXUP_BOX, 0, 1); // Teleporters
+ SETMONITORCHANCES(MT_RECYCLER_BOX, 0, 1); // Recycler
+ SETMONITORCHANCES(MT_1UP_BOX, 1, 1); // 1-Up
+ // =======================================
+ // Total 16 32
- if (missile)
- {
- if (mobj->flags2 & MF2_SUPERFIRE)
- missile->flags2 |= MF2_SUPERFIRE;
+#undef SETMONITORCHANCES
- if (mobj->info->attacksound)
- S_StartSound(missile, mobj->info->attacksound);
- }
- }
- else
- mobj->angle = R_PointToAngle2(mobj->x, mobj->y, mobj->target->x, mobj->target->y);
+ i = P_RandomKey(numchoices); // Gotta love those random numbers!
+ newmobj = P_SpawnMobj(mobj->x, mobj->y, mobj->z, spawnchance[i]);
}
+ else
+ newmobj = P_SpawnMobj(mobj->x, mobj->y, mobj->z, mobj->type);
- if (mobj->flags & MF_AMBIENT)
- {
- if (!(leveltime % mobj->health) && mobj->info->seesound)
- S_StartSound(mobj, mobj->info->seesound);
+ // Transfer flags2 (ambush, strongbox, objectflip)
+ newmobj->flags2 = mobj->flags2;
+ P_RemoveMobj(mobj); // make sure they disappear
+}
+
+static void P_FlagFuseThink(mobj_t *mobj)
+{
+ subsector_t *ss;
+ fixed_t x, y, z;
+ mobj_t* flagmo;
+
+ if (!mobj->spawnpoint)
return;
+
+ x = mobj->spawnpoint->x << FRACBITS;
+ y = mobj->spawnpoint->y << FRACBITS;
+ ss = R_PointInSubsector(x, y);
+ if (mobj->spawnpoint->options & MTF_OBJECTFLIP)
+ {
+ z = ss->sector->ceilingheight - mobjinfo[mobj->type].height;
+ if (mobj->spawnpoint->options >> ZSHIFT)
+ z -= (mobj->spawnpoint->options >> ZSHIFT) << FRACBITS;
+ }
+ else
+ {
+ z = ss->sector->floorheight;
+ if (mobj->spawnpoint->options >> ZSHIFT)
+ z += (mobj->spawnpoint->options >> ZSHIFT) << FRACBITS;
+ }
+ flagmo = P_SpawnMobj(x, y, z, mobj->type);
+ flagmo->spawnpoint = mobj->spawnpoint;
+ if (mobj->spawnpoint->options & MTF_OBJECTFLIP)
+ {
+ flagmo->eflags |= MFE_VERTICALFLIP;
+ flagmo->flags2 |= MF2_OBJECTFLIP;
}
- // Check fuse
- if (mobj->fuse)
+ if (mobj->type == MT_REDFLAG)
{
+ if (!(mobj->flags2 & MF2_JUSTATTACKED))
+ CONS_Printf(M_GetText("The %c%s%c has returned to base.\n"), 0x85, M_GetText("Red flag"), 0x80);
- if (mobj->type == MT_SNAPPER_HEAD || mobj->type == MT_SNAPPER_LEG || mobj->type == MT_MINECARTSEG)
- mobj->flags2 ^= MF2_DONTDRAW;
+ // Assumedly in splitscreen players will be on opposing teams
+ if (players[consoleplayer].ctfteam == 1 || splitscreen)
+ S_StartSound(NULL, sfx_hoop1);
+ else if (players[consoleplayer].ctfteam == 2)
+ S_StartSound(NULL, sfx_hoop3);
- mobj->fuse--;
- if (!mobj->fuse)
- {
- subsector_t *ss;
- fixed_t x, y, z;
- mobj_t *flagmo, *newmobj;
+ redflag = flagmo;
+ }
+ else // MT_BLUEFLAG
+ {
+ if (!(mobj->flags2 & MF2_JUSTATTACKED))
+ CONS_Printf(M_GetText("The %c%s%c has returned to base.\n"), 0x84, M_GetText("Blue flag"), 0x80);
+
+ // Assumedly in splitscreen players will be on opposing teams
+ if (players[consoleplayer].ctfteam == 2 || splitscreen)
+ S_StartSound(NULL, sfx_hoop1);
+ else if (players[consoleplayer].ctfteam == 1)
+ S_StartSound(NULL, sfx_hoop3);
+
+ blueflag = flagmo;
+ }
+}
+
+static boolean P_FuseThink(mobj_t *mobj)
+{
+ if (mobj->type == MT_SNAPPER_HEAD || mobj->type == MT_SNAPPER_LEG || mobj->type == MT_MINECARTSEG)
+ mobj->flags2 ^= MF2_DONTDRAW;
+
+ mobj->fuse--;
+
+ if (mobj->fuse)
+ return true;
#ifdef HAVE_BLUA
- if (LUAh_MobjFuse(mobj) || P_MobjWasRemoved(mobj))
- ;
- else
+ if (LUAh_MobjFuse(mobj) || P_MobjWasRemoved(mobj))
+ ;
+ else
#endif
- if (mobj->info->flags & MF_MONITOR)
+ if (mobj->info->flags & MF_MONITOR)
+ {
+ P_MonitorFuseThink(mobj);
+ return false;
+ }
+ else switch (mobj->type)
+ {
+ // gargoyle and snowman handled in P_PushableThinker, not here
+ case MT_THROWNGRENADE:
+ case MT_CYBRAKDEMON_NAPALM_BOMB_LARGE:
+ P_SetMobjState(mobj, mobj->info->deathstate);
+ break;
+ case MT_LHRT:
+ P_KillMobj(mobj, NULL, NULL, 0);
+ break;
+ case MT_BLUEFLAG:
+ case MT_REDFLAG:
+ P_FlagFuseThink(mobj);
+ P_RemoveMobj(mobj);
+ return false;
+ case MT_FANG:
+ if (mobj->flags2 & MF2_SLIDEPUSH)
{
- // Special case for ALL monitors.
- // If a box's speed is nonzero, it's allowed to respawn as a WRM/SRM.
- if (mobj->info->speed != 0 && (mobj->flags2 & (MF2_AMBUSH|MF2_STRONGBOX)))
- {
- mobjtype_t spawnchance[64];
- INT32 numchoices = 0, i = 0;
+ var1 = 0;
+ var2 = 0;
+ A_BossDeath(mobj);
+ return false;
+ }
+ P_SetMobjState(mobj, mobj->state->nextstate);
+ if (P_MobjWasRemoved(mobj))
+ return false;
+ break;
+ case MT_METALSONIC_BATTLE:
+ break; // don't remove
+ case MT_SPIKE:
+ P_SetMobjState(mobj, mobj->state->nextstate);
+ mobj->fuse = mobj->info->speed;
+ if (mobj->spawnpoint)
+ mobj->fuse += mobj->spawnpoint->angle;
+ break;
+ case MT_WALLSPIKE:
+ P_SetMobjState(mobj, mobj->state->nextstate);
+ mobj->fuse = mobj->info->speed;
+ if (mobj->spawnpoint)
+ mobj->fuse += (mobj->spawnpoint->angle / 360);
+ break;
+ case MT_NIGHTSCORE:
+ P_RemoveMobj(mobj);
+ return false;
+ case MT_LAVAFALL:
+ if (mobj->state - states == S_LAVAFALL_DORMANT)
+ {
+ mobj->fuse = 30;
+ P_SetMobjState(mobj, S_LAVAFALL_TELL);
+ S_StartSound(mobj, mobj->info->seesound);
+ }
+ else if (mobj->state - states == S_LAVAFALL_TELL)
+ {
+ mobj->fuse = 40;
+ P_SetMobjState(mobj, S_LAVAFALL_SHOOT);
+ S_StopSound(mobj);
+ S_StartSound(mobj, mobj->info->attacksound);
+ }
+ else
+ {
+ mobj->fuse = 30;
+ P_SetMobjState(mobj, S_LAVAFALL_DORMANT);
+ S_StopSound(mobj);
+ }
+ return false;
+ case MT_PYREFLY:
+ if (mobj->health <= 0)
+ break;
-// This define should make it a lot easier to organize and change monitor weights
-#define SETMONITORCHANCES(type, strongboxamt, weakboxamt) \
-for (i = ((mobj->flags2 & MF2_STRONGBOX) ? strongboxamt : weakboxamt); i; --i) spawnchance[numchoices++] = type
+ mobj->extravalue2 = (mobj->extravalue2 + 1) % 3;
+ if (mobj->extravalue2 == 0)
+ {
+ P_SetMobjState(mobj, mobj->info->spawnstate);
+ mobj->fuse = 100;
+ S_StopSound(mobj);
+ S_StartSound(mobj, sfx_s3k8c);
+ }
+ else if (mobj->extravalue2 == 1)
+ {
+ mobj->fuse = 50;
+ S_StartSound(mobj, sfx_s3ka3);
+ }
+ else
+ {
+ P_SetMobjState(mobj, mobj->info->meleestate);
+ mobj->fuse = 100;
+ S_StopSound(mobj);
+ S_StartSound(mobj, sfx_s3kc2l);
+ }
+ return false;
+ case MT_PLAYER:
+ break; // don't remove
+ default:
+ P_SetMobjState(mobj, mobj->info->xdeathstate); // will remove the mobj if S_NULL.
+ break;
+ // Looking for monitors? They moved to a special condition above.
+ }
- // Type SRM WRM
- SETMONITORCHANCES(MT_SNEAKERS_BOX, 0, 10); // Super Sneakers
- SETMONITORCHANCES(MT_INVULN_BOX, 2, 0); // Invincibility
- SETMONITORCHANCES(MT_WHIRLWIND_BOX, 3, 8); // Whirlwind Shield
- SETMONITORCHANCES(MT_ELEMENTAL_BOX, 3, 8); // Elemental Shield
- SETMONITORCHANCES(MT_ATTRACT_BOX, 2, 0); // Attraction Shield
- SETMONITORCHANCES(MT_FORCE_BOX, 3, 3); // Force Shield
- SETMONITORCHANCES(MT_ARMAGEDDON_BOX, 2, 0); // Armageddon Shield
- SETMONITORCHANCES(MT_MIXUP_BOX, 0, 1); // Teleporters
- SETMONITORCHANCES(MT_RECYCLER_BOX, 0, 1); // Recycler
- SETMONITORCHANCES(MT_1UP_BOX, 1, 1); // 1-Up
- // =======================================
- // Total 16 32
+ return !P_MobjWasRemoved(mobj);
+}
-#undef SETMONITORCHANCES
+//
+// P_MobjThinker
+//
+void P_MobjThinker(mobj_t *mobj)
+{
+ I_Assert(mobj != NULL);
+ I_Assert(!P_MobjWasRemoved(mobj));
- i = P_RandomKey(numchoices); // Gotta love those random numbers!
- newmobj = P_SpawnMobj(mobj->x, mobj->y, mobj->z, spawnchance[i]);
- }
- else
- newmobj = P_SpawnMobj(mobj->x, mobj->y, mobj->z, mobj->type);
+ if (mobj->flags & MF_NOTHINK)
+ return;
- // Transfer flags2 (ambush, strongbox, objectflip)
- newmobj->flags2 = mobj->flags2;
- P_RemoveMobj(mobj); // make sure they disappear
- return;
- }
- else switch (mobj->type)
- {
- // gargoyle and snowman handled in P_PushableThinker, not here
- case MT_THROWNGRENADE:
- case MT_CYBRAKDEMON_NAPALM_BOMB_LARGE:
- P_SetMobjState(mobj, mobj->info->deathstate);
- break;
- case MT_LHRT:
- P_KillMobj(mobj, NULL, NULL, 0);
- break;
- case MT_BLUEFLAG:
- case MT_REDFLAG:
- if (mobj->spawnpoint)
- {
- x = mobj->spawnpoint->x << FRACBITS;
- y = mobj->spawnpoint->y << FRACBITS;
- ss = R_PointInSubsector(x, y);
- if (mobj->spawnpoint->options & MTF_OBJECTFLIP)
- {
- z = ss->sector->ceilingheight - mobjinfo[mobj->type].height;
- if (mobj->spawnpoint->options >> ZSHIFT)
- z -= (mobj->spawnpoint->options >> ZSHIFT) << FRACBITS;
- }
- else
- {
- z = ss->sector->floorheight;
- if (mobj->spawnpoint->options >> ZSHIFT)
- z += (mobj->spawnpoint->options >> ZSHIFT) << FRACBITS;
- }
- flagmo = P_SpawnMobj(x, y, z, mobj->type);
- flagmo->spawnpoint = mobj->spawnpoint;
- if (mobj->spawnpoint->options & MTF_OBJECTFLIP)
- {
- flagmo->eflags |= MFE_VERTICALFLIP;
- flagmo->flags2 |= MF2_OBJECTFLIP;
- }
+ if ((mobj->flags & MF_BOSS) && mobj->spawnpoint && (bossdisabled & (1<<mobj->spawnpoint->extrainfo)))
+ return;
- if (mobj->type == MT_REDFLAG)
- {
- if (!(mobj->flags2 & MF2_JUSTATTACKED))
- CONS_Printf(M_GetText("The %c%s%c has returned to base.\n"), 0x85, M_GetText("Red flag"), 0x80);
+ // Remove dead target/tracer.
+ if (mobj->target && P_MobjWasRemoved(mobj->target))
+ P_SetTarget(&mobj->target, NULL);
+ if (mobj->tracer && P_MobjWasRemoved(mobj->tracer))
+ P_SetTarget(&mobj->tracer, NULL);
+ if (mobj->hnext && P_MobjWasRemoved(mobj->hnext))
+ P_SetTarget(&mobj->hnext, NULL);
+ if (mobj->hprev && P_MobjWasRemoved(mobj->hprev))
+ P_SetTarget(&mobj->hprev, NULL);
- // Assumedly in splitscreen players will be on opposing teams
- if (players[consoleplayer].ctfteam == 1 || splitscreen)
- S_StartSound(NULL, sfx_hoop1);
- else if (players[consoleplayer].ctfteam == 2)
- S_StartSound(NULL, sfx_hoop3);
+ mobj->eflags &= ~(MFE_PUSHED|MFE_SPRUNG);
- redflag = flagmo;
- }
- else // MT_BLUEFLAG
- {
- if (!(mobj->flags2 & MF2_JUSTATTACKED))
- CONS_Printf(M_GetText("The %c%s%c has returned to base.\n"), 0x84, M_GetText("Blue flag"), 0x80);
+ tmfloorthing = tmhitthing = NULL;
- // Assumedly in splitscreen players will be on opposing teams
- if (players[consoleplayer].ctfteam == 2 || splitscreen)
- S_StartSound(NULL, sfx_hoop1);
- else if (players[consoleplayer].ctfteam == 1)
- S_StartSound(NULL, sfx_hoop3);
+ // Sector special (2,8) allows ANY mobj to trigger a linedef exec
+ if (mobj->subsector && GETSECSPECIAL(mobj->subsector->sector->special, 2) == 8)
+ {
+ sector_t *sec2;
- blueflag = flagmo;
- }
- }
- P_RemoveMobj(mobj);
- return;
- case MT_FANG:
- if (mobj->flags2 & MF2_SLIDEPUSH)
- {
- var1 = 0;
- var2 = 0;
- A_BossDeath(mobj);
- return;
- }
- P_SetMobjState(mobj, mobj->state->nextstate);
- if (P_MobjWasRemoved(mobj))
- return;
- break;
- case MT_METALSONIC_BATTLE:
- break; // don't remove
- case MT_SPIKE:
- P_SetMobjState(mobj, mobj->state->nextstate);
- mobj->fuse = mobj->info->speed;
- if (mobj->spawnpoint)
- mobj->fuse += mobj->spawnpoint->angle;
- break;
- case MT_WALLSPIKE:
- P_SetMobjState(mobj, mobj->state->nextstate);
- mobj->fuse = mobj->info->speed;
- if (mobj->spawnpoint)
- mobj->fuse += (mobj->spawnpoint->angle/360);
- break;
- case MT_NIGHTSCORE:
- P_RemoveMobj(mobj);
- return;
- case MT_LAVAFALL:
- if (mobj->state - states == S_LAVAFALL_DORMANT)
- {
- mobj->fuse = 30;
- P_SetMobjState(mobj, S_LAVAFALL_TELL);
- S_StartSound(mobj, mobj->info->seesound);
- }
- else if (mobj->state - states == S_LAVAFALL_TELL)
- {
- mobj->fuse = 40;
- P_SetMobjState(mobj, S_LAVAFALL_SHOOT);
- S_StopSound(mobj);
- S_StartSound(mobj, mobj->info->attacksound);
- }
- else
- {
- mobj->fuse = 30;
- P_SetMobjState(mobj, S_LAVAFALL_DORMANT);
- S_StopSound(mobj);
- }
- return;
- case MT_PYREFLY:
- if (mobj->health <= 0)
- break;
+ sec2 = P_ThingOnSpecial3DFloor(mobj);
+ if (sec2 && GETSECSPECIAL(sec2->special, 2) == 1)
+ P_LinedefExecute(sec2->tag, mobj, sec2);
+ }
+
+ if (mobj->scale != mobj->destscale)
+ P_MobjScaleThink(mobj); // Slowly scale up/down to reach your destscale.
+
+ if ((mobj->type == MT_GHOST || mobj->type == MT_THOK) && mobj->fuse > 0) // Not guaranteed to be MF_SCENERY or not MF_SCENERY!
+ {
+ if (mobj->flags2 & MF2_BOSSNOTRAP) // "fast" flag
+ {
+ if ((signed)((mobj->frame & FF_TRANSMASK) >> FF_TRANSSHIFT) < (NUMTRANSMAPS-1) - (2*mobj->fuse)/3)
+ // fade out when nearing the end of fuse...
+ mobj->frame = (mobj->frame & ~FF_TRANSMASK) | (((NUMTRANSMAPS-1) - (2*mobj->fuse)/3) << FF_TRANSSHIFT);
+ }
+ else
+ {
+ if ((signed)((mobj->frame & FF_TRANSMASK) >> FF_TRANSSHIFT) < (NUMTRANSMAPS-1) - mobj->fuse / 2)
+ // fade out when nearing the end of fuse...
+ mobj->frame = (mobj->frame & ~FF_TRANSMASK) | (((NUMTRANSMAPS-1) - mobj->fuse / 2) << FF_TRANSSHIFT);
+ }
+ }
+
+ // Special thinker for scenery objects
+ if (mobj->flags & MF_SCENERY)
+ {
+ P_MobjSceneryThink(mobj);
+ return;
+ }
+
+#ifdef HAVE_BLUA
+ // Check for a Lua thinker first
+ if (!mobj->player)
+ {
+ if (LUAh_MobjThinker(mobj) || P_MobjWasRemoved(mobj))
+ return;
+ }
+ else if (!mobj->player->spectator)
+ {
+ // You cannot short-circuit the player thinker like you can other thinkers.
+ LUAh_MobjThinker(mobj);
+ if (P_MobjWasRemoved(mobj))
+ return;
+ }
+#endif
+ // if it's pushable, or if it would be pushable other than temporary disablement, use the
+ // separate thinker
+ if (mobj->flags & MF_PUSHABLE || (mobj->info->flags & MF_PUSHABLE && mobj->fuse))
+ {
+ if (!P_MobjPushableThink(mobj))
+ return;
+ }
+ else if (mobj->flags & MF_BOSS)
+ {
+ if (!P_MobjBossThink(mobj))
+ return;
+ }
+ else if (mobj->health <= 0) // Dead things think differently than the living.
+ {
+ if (!P_MobjDeadThink(mobj))
+ return;
+ }
+ else
+ {
+ if (!P_MobjRegularThink(mobj))
+ return;
+ }
+ if (P_MobjWasRemoved(mobj))
+ return;
- mobj->extravalue2 = (mobj->extravalue2 + 1) % 3;
- if (mobj->extravalue2 == 0)
- {
- P_SetMobjState(mobj, mobj->info->spawnstate);
- mobj->fuse = 100;
- S_StopSound(mobj);
- S_StartSound(mobj, sfx_s3k8c);
- }
- else if (mobj->extravalue2 == 1)
- {
- mobj->fuse = 50;
- S_StartSound(mobj, sfx_s3ka3);
- }
- else
- {
- P_SetMobjState(mobj, mobj->info->meleestate);
- mobj->fuse = 100;
- S_StopSound(mobj);
- S_StartSound(mobj, sfx_s3kc2l);
- }
- return;
- case MT_PLAYER:
- break; // don't remove
- default:
- P_SetMobjState(mobj, mobj->info->xdeathstate); // will remove the mobj if S_NULL.
- break;
- // Looking for monitors? They moved to a special condition above.
- }
- if (P_MobjWasRemoved(mobj))
- return;
- }
+ if (mobj->flags2 & MF2_FIRING)
+ P_FiringThink(mobj);
+
+ if (mobj->flags & MF_AMBIENT)
+ {
+ if (!(leveltime % mobj->health) && mobj->info->seesound)
+ S_StartSound(mobj, mobj->info->seesound);
+ return;
}
+ // Check fuse
+ if (mobj->fuse && !P_FuseThink(mobj))
+ return;
+
I_Assert(mobj != NULL);
I_Assert(!P_MobjWasRemoved(mobj));
@@ -11118,6 +11271,19 @@ void P_PrecipitationEffects(void)
}
}
+/** Returns corresponding mobj type from mapthing number.
+ * \param mthingtype Mapthing number in question.
+ * \return Mobj type; MT_UNKNOWN if nothing found.
+ */
+static mobjtype_t P_GetMobjtype(UINT16 mthingtype)
+{
+ mobjtype_t i;
+ for (i = 0; i < NUMMOBJTYPES; i++)
+ if (mthingtype == mobjinfo[i].doomednum)
+ return i;
+ return MT_UNKNOWN;
+}
+
//
// P_RespawnSpecials
//
@@ -11156,17 +11322,12 @@ void P_RespawnSpecials(void)
if (mthing)
{
- mobjtype_t i;
+ mobjtype_t i = P_GetMobjtype(mthing->type);
x = mthing->x << FRACBITS;
y = mthing->y << FRACBITS;
ss = R_PointInSubsector(x, y);
- // find which type to spawn
- for (i = 0; i < NUMMOBJTYPES; i++)
- if (mthing->type == mobjinfo[i].doomednum)
- break;
-
- if (i == NUMMOBJTYPES) // prevent creation of objects with this type -- Monster Iestyn 17/12/17
+ if (i == MT_UNKNOWN) // prevent creation of objects with this type -- Monster Iestyn 17/12/17
{
// 3D Mode start Thing is unlikely to be added to the que,
// so don't bother checking for that specific type
@@ -11177,7 +11338,7 @@ void P_RespawnSpecials(void)
}
//CTF rings should continue to respawn as normal rings outside of CTF.
- if (gametype != GT_CTF)
+ if (!(gametyperules & GTR_TEAMFLAGS))
{
if (i == MT_REDTEAMRING || i == MT_BLUETEAMRING)
i = MT_RING;
@@ -11248,7 +11409,10 @@ void P_SpawnPlayer(INT32 playernum)
{
p->outofcoop = false;
if (netgame && p->jointime < 1)
- p->spectator = true;
+ {
+ // Averted by GTR_NOSPECTATORSPAWN.
+ p->spectator = (gametyperules & GTR_NOSPECTATORSPAWN) ? false : true;
+ }
else if (multiplayer && !netgame)
{
// If you're in a team game and you don't have a team assigned yet...
@@ -11291,7 +11455,7 @@ void P_SpawnPlayer(INT32 playernum)
p->skincolor = skincolor_blueteam;
}
- if ((netgame || multiplayer) && (gametype != GT_COOP || leveltime) && !p->spectator && !(maptol & TOL_NIGHTS))
+ if ((netgame || multiplayer) && ((gametyperules & GTR_SPAWNINVUL) || leveltime) && !p->spectator && !(maptol & TOL_NIGHTS))
p->powers[pw_flashing] = flashingtics-1; // Babysitting deterrent
mobj = P_SpawnMobj(0, 0, 0, MT_PLAYER);
@@ -11531,459 +11695,997 @@ void P_MovePlayerToStarpost(INT32 playernum)
z = floor;
}
- mobj->floorz = floor;
- mobj->ceilingz = ceiling;
+ mobj->floorz = floor;
+ mobj->ceilingz = ceiling;
+
+ mobj->z = z;
+
+ mobj->angle = p->starpostangle;
+
+ P_AfterPlayerSpawn(playernum);
+
+ if (!(netgame || multiplayer))
+ leveltime = p->starposttime;
+}
+
+#define MAXHUNTEMERALDS 64
+mapthing_t *huntemeralds[MAXHUNTEMERALDS];
+INT32 numhuntemeralds;
+
+static fixed_t P_GetMobjSpawnHeight(const mobjtype_t mobjtype, const fixed_t x, const fixed_t y, const fixed_t offset, const boolean flip)
+{
+ const subsector_t *ss = R_PointInSubsector(x, y);
+
+ // Axis objects snap to the floor.
+ if (mobjtype == MT_AXIS || mobjtype == MT_AXISTRANSFER || mobjtype == MT_AXISTRANSFERLINE)
+ return ONFLOORZ;
+
+ // Establish height.
+ if (flip)
+ return (
+#ifdef ESLOPE
+ ss->sector->c_slope ? P_GetZAt(ss->sector->c_slope, x, y) :
+#endif
+ ss->sector->ceilingheight) - offset - mobjinfo[mobjtype].height;
+ else
+ return (
+#ifdef ESLOPE
+ ss->sector->f_slope ? P_GetZAt(ss->sector->f_slope, x, y) :
+#endif
+ ss->sector->floorheight) + offset;
+}
+
+static fixed_t P_GetMapThingSpawnHeight(const mobjtype_t mobjtype, const mapthing_t* mthing, const fixed_t x, const fixed_t y)
+{
+ fixed_t offset = mthing->z << FRACBITS;
+ boolean flip = (!!(mobjinfo[mobjtype].flags & MF_SPAWNCEILING) ^ !!(mthing->options & MTF_OBJECTFLIP));
+
+ switch (mobjtype)
+ {
+ // Bumpers never spawn flipped.
+ case MT_NIGHTSBUMPER:
+ flip = false;
+ break;
+
+ // Objects with a non-zero default height.
+ case MT_CRAWLACOMMANDER:
+ case MT_DETON:
+ case MT_JETTBOMBER:
+ case MT_JETTGUNNER:
+ case MT_EGGMOBILE2:
+ if (!offset)
+ offset = 33*FRACUNIT;
+ break;
+ case MT_EGGMOBILE:
+ if (!offset)
+ offset = 128*FRACUNIT;
+ break;
+ case MT_GOLDBUZZ:
+ case MT_REDBUZZ:
+ if (!offset)
+ offset = 288*FRACUNIT;
+ break;
+
+ // Horizontal springs, may float additional units with MTF_AMBUSH.
+ case MT_YELLOWHORIZ:
+ case MT_REDHORIZ:
+ case MT_BLUEHORIZ:
+ offset += mthing->options & MTF_AMBUSH ? 16*FRACUNIT : 0;
+ break;
+
+ // Ring-like items, may float additional units with MTF_AMBUSH.
+ case MT_SPIKEBALL:
+ case MT_EMERALDSPAWN:
+ case MT_TOKEN:
+ case MT_EMBLEM:
+ case MT_RING:
+ case MT_REDTEAMRING:
+ case MT_BLUETEAMRING:
+ case MT_COIN:
+ case MT_BLUESPHERE:
+ case MT_BOMBSPHERE:
+ case MT_NIGHTSCHIP:
+ case MT_NIGHTSSTAR:
+ offset += mthing->options & MTF_AMBUSH ? 24*FRACUNIT : 0;
+ break;
+
+ // Remaining objects.
+ default:
+ if (P_WeaponOrPanel(mobjtype))
+ offset += mthing->options & MTF_AMBUSH ? 24*FRACUNIT : 0;
+ }
+
+ if (!offset) // Snap to the surfaces when there's no offset set.
+ {
+ if (flip)
+ return ONCEILINGZ;
+ else
+ return ONFLOORZ;
+ }
+
+ return P_GetMobjSpawnHeight(mobjtype, x, y, offset, flip);
+}
+
+static boolean P_SpawnNonMobjMapThing(mapthing_t *mthing)
+{
+#if MAXPLAYERS > 32
+ You should think about modifying the deathmatch starts to take full advantage of this!
+#endif
+ if (mthing->type <= MAXPLAYERS) // Player starts
+ {
+ // save spots for respawning in network games
+ if (!metalrecording)
+ playerstarts[mthing->type - 1] = mthing;
+ return true;
+ }
+ else if (mthing->type == 33) // Match starts
+ {
+ if (numdmstarts < MAX_DM_STARTS)
+ {
+ deathmatchstarts[numdmstarts] = mthing;
+ mthing->type = 0;
+ numdmstarts++;
+ }
+ return true;
+ }
+ else if (mthing->type == 34) // Red CTF starts
+ {
+ if (numredctfstarts < MAXPLAYERS)
+ {
+ redctfstarts[numredctfstarts] = mthing;
+ mthing->type = 0;
+ numredctfstarts++;
+ }
+ return true;
+ }
+ else if (mthing->type == 35) // Blue CTF starts
+ {
+ if (numbluectfstarts < MAXPLAYERS)
+ {
+ bluectfstarts[numbluectfstarts] = mthing;
+ mthing->type = 0;
+ numbluectfstarts++;
+ }
+ return true;
+ }
+ else if (metalrecording && mthing->type == mobjinfo[MT_METALSONIC_RACE].doomednum)
+ { // If recording, you ARE Metal Sonic. Do not spawn it, do not save normal spawnpoints.
+ playerstarts[0] = mthing;
+ return true;
+ }
+ else if (mthing->type == 750 // Slope vertex point (formerly chaos spawn)
+ || (mthing->type >= 600 && mthing->type <= 609) // Special placement patterns
+ || mthing->type == 1705 || mthing->type == 1713) // Hoops
+ return true; // These are handled elsewhere.
+ else if (mthing->type == mobjinfo[MT_EMERHUNT].doomednum)
+ {
+ // Emerald Hunt is Coop only. Don't spawn the emerald yet, but save the spawnpoint for later.
+ if ((gametyperules & GTR_EMERALDHUNT) && numhuntemeralds < MAXHUNTEMERALDS)
+ huntemeralds[numhuntemeralds++] = mthing;
+ return true;
+ }
+
+ return false;
+}
+
+static boolean P_AllowMobjSpawn(mapthing_t* mthing, mobjtype_t i)
+{
+ switch (i)
+ {
+ case MT_EMERALD1:
+ case MT_EMERALD2:
+ case MT_EMERALD3:
+ case MT_EMERALD4:
+ case MT_EMERALD5:
+ case MT_EMERALD6:
+ case MT_EMERALD7:
+ if (gametype != GT_COOP) // Don't place emeralds in non-coop modes
+ return false;
+
+ if (metalrecording)
+ return false; // Metal Sonic isn't for collecting emeralds.
+
+ if (emeralds & mobjinfo[i].speed) // You already have this emerald!
+ return false;
+
+ break;
+ case MT_EMERALDSPAWN:
+ if (!cv_powerstones.value)
+ return false;
+
+ if (!(gametyperules & GTR_MATCHEMERALDS))
+ return false;
+
+ runemeraldmanager = true;
+ break;
+ case MT_ROSY:
+ if (!(gametype == GT_COOP || (mthing->options & MTF_EXTRA)))
+ return false; // she doesn't hang out here
+
+ if (!mariomode && !(netgame || multiplayer) && players[consoleplayer].skin == 3)
+ return false; // no doubles
+
+ break;
+ case MT_TOKEN:
+ if (!(gametyperules & GTR_EMERALDTOKENS))
+ return false; // Gametype's not right
+
+ if (tokenbits == 30)
+ return false; // Too many tokens
+
+ if (tokenlist & (1 << tokenbits++))
+ return false; // You already got this token
+
+ break;
+ case MT_EMBLEM:
+ if (netgame || multiplayer)
+ return false; // Single player
+
+ if (modifiedgame && !savemoddata)
+ return false; // No cheating!!
+
+ break;
+ default:
+ break;
+ }
+
+ if (metalrecording) // Metal Sonic can't use these things.
+ {
+ if ((mobjinfo[i].flags & (MF_ENEMY|MF_BOSS)) || i == MT_TOKEN || i == MT_STARPOST
+ || i == MT_RING || i == MT_BLUETEAMRING || i == MT_REDTEAMRING || i == MT_COIN
+ || i == MT_BLUESPHERE || i == MT_BOMBSPHERE || i == MT_NIGHTSCHIP || i == MT_NIGHTSSTAR)
+ return false;
+ }
+
+ if (((mobjinfo[i].flags & MF_ENEMY) || (mobjinfo[i].flags & MF_BOSS)) && !(gametyperules & GTR_SPAWNENEMIES))
+ return false; // No enemies in ringslinger modes
+
+ if (!(gametyperules & GTR_ALLOWEXIT) && (i == MT_SIGN))
+ return false; // Don't spawn exit signs in wrong game modes
+
+ if (!G_PlatformGametype() && (i == MT_STARPOST))
+ return false; // Don't spawn starposts in wrong game modes
+
+ if (!G_RingSlingerGametype() || !cv_specialrings.value)
+ if (P_WeaponOrPanel(i))
+ return false; // Don't place weapons/panels in non-ringslinger modes
+
+ if (!(gametyperules & GTR_TEAMFLAGS)) // CTF specific things
+ {
+ if (i == MT_BLUEFLAG || i == MT_REDFLAG)
+ return false; // No flags in non-CTF modes!
+ }
+ else
+ {
+ if ((i == MT_BLUEFLAG && blueflag) || (i == MT_REDFLAG && redflag))
+ {
+ CONS_Alert(CONS_ERROR, M_GetText("Only one flag per team allowed in CTF!\n"));
+ return false;
+ }
+ }
+
+ if (modeattacking) // Record Attack special stuff
+ {
+ // Don't spawn starposts that wouldn't be usable
+ if (i == MT_STARPOST)
+ return false;
+ }
+
+ if (ultimatemode)
+ {
+ if (i == MT_RING || i == MT_REDTEAMRING || i == MT_BLUETEAMRING
+ || i == MT_COIN || i == MT_NIGHTSSTAR || i == MT_NIGHTSCHIP
+ || i == MT_PITY_BOX || i == MT_ELEMENTAL_BOX || i == MT_ATTRACT_BOX
+ || i == MT_FORCE_BOX || i == MT_ARMAGEDDON_BOX || i == MT_WHIRLWIND_BOX
+ || i == MT_FLAMEAURA_BOX || i == MT_BUBBLEWRAP_BOX || i == MT_THUNDERCOIN_BOX
+ || i == MT_RING_BOX || i == MT_STARPOST)
+ return false; // No rings or shields in Ultimate mode
+
+ // Don't include the gold repeating boxes here please.
+ // They're likely facets of the level's design and therefore required to progress.
+ }
+
+ return true;
+}
+
+#define nightsreplace ((maptol & TOL_NIGHTS) && !G_IsSpecialStage(gamemap))
+
+static mobjtype_t P_GetMobjtypeSubstitute(mapthing_t *mthing, mobjtype_t i)
+{
+ // Altering monitor spawns via cvars
+ // If MF_GRENADEBOUNCE is set in the monitor's info,
+ // skip this step. (Used for gold monitors)
+ // Yeah, this is a dirty hack.
+ if ((mobjinfo[i].flags & (MF_MONITOR|MF_GRENADEBOUNCE)) == MF_MONITOR)
+ {
+ if (gametyperules & GTR_RACE)
+ {
+ // Set powerup boxes to user settings for competition.
+ switch (cv_competitionboxes.value)
+ {
+ case 1: // Mystery
+ return MT_MYSTERY_BOX;
+ case 2: // Teleport
+ return MT_MIXUP_BOX;
+ case 3: // None
+ return MT_NULL; // Don't spawn!
+ default:
+ return i;
+ }
+ }
+ // Set powerup boxes to user settings for other netplay modes
+ else if (gametype != GT_COOP)
+ {
+ switch (cv_matchboxes.value)
+ {
+ case 1: // Mystery
+ return MT_MYSTERY_BOX;
+ case 2: // Unchanging
+ if (i == MT_MYSTERY_BOX)
+ return MT_NULL; // don't spawn
+ mthing->options &= ~(MTF_AMBUSH|MTF_OBJECTSPECIAL); // no random respawning!
+ return i;
+ case 3: // Don't spawn
+ return MT_NULL;
+ default:
+ return i;
+ }
+ }
+ }
+
+ if (nightsreplace)
+ {
+ if (i == MT_RING || i == MT_REDTEAMRING || i == MT_BLUETEAMRING || i == MT_COIN)
+ return MT_NIGHTSSTAR;
+
+ if (i == MT_BLUESPHERE)
+ return MT_NIGHTSCHIP;
+ }
+
+ if (!(gametyperules & GTR_TEAMS))
+ {
+ if (i == MT_BLUETEAMRING || i == MT_REDTEAMRING)
+ return MT_RING;
+
+ if (i == MT_RING_BLUEBOX || i == MT_RING_REDBOX)
+ return MT_RING_BOX;
+ }
+
+ if (modeattacking && i == MT_1UP_BOX) // 1UPs -->> Score TVs
+ {
+ // Either or, doesn't matter which.
+ if (mthing->options & (MTF_AMBUSH | MTF_OBJECTSPECIAL))
+ return MT_SCORE10K_BOX; // 10,000
+ else
+ return MT_SCORE1K_BOX; // 1,000
+ }
+
+ if (mariomode && i == MT_ROSY)
+ return MT_TOAD; // don't remove on penalty of death
- mobj->z = z;
+ return i;
+}
- mobj->angle = p->starpostangle;
+static boolean P_SetupEmblem(mapthing_t *mthing, mobj_t *mobj)
+{
+ INT32 j;
+ emblem_t* emblem = M_GetLevelEmblems(gamemap);
+ skincolors_t emcolor;
- P_AfterPlayerSpawn(playernum);
+ while (emblem)
+ {
+ if ((emblem->type == ET_GLOBAL || emblem->type == ET_SKIN) && emblem->tag == mthing->angle)
+ break;
- if (!(netgame || multiplayer))
- leveltime = p->starposttime;
-}
+ emblem = M_GetLevelEmblems(-1);
+ }
-#define MAXHUNTEMERALDS 64
-mapthing_t *huntemeralds[MAXHUNTEMERALDS];
-INT32 numhuntemeralds;
+ if (!emblem)
+ {
+ CONS_Debug(DBG_GAMELOGIC, "No map emblem for map %d with tag %d found!\n", gamemap, mthing->angle);
+ return false;
+ }
-//
-// P_SpawnMapThing
-// The fields of the mapthing should
-// already be in host byte order.
-//
-void P_SpawnMapThing(mapthing_t *mthing)
-{
- mobjtype_t i;
- mobj_t *mobj;
- fixed_t x, y, z;
- subsector_t *ss;
- boolean doangle = true;
+ j = emblem - emblemlocations;
- if (!mthing->type)
- return; // Ignore type-0 things as NOPs
+ I_Assert(emblemlocations[j].sprite >= 'A' && emblemlocations[j].sprite <= 'Z');
+ P_SetMobjState(mobj, mobj->info->spawnstate + (emblemlocations[j].sprite - 'A'));
+
+ mobj->health = j + 1;
+ emcolor = M_GetEmblemColor(&emblemlocations[j]); // workaround for compiler complaint about bad function casting
+ mobj->color = (UINT8)emcolor;
- // Always spawn in objectplace.
- // Skip all returning code.
- if (objectplacing)
+ if (emblemlocations[j].collected
+ || (emblemlocations[j].type == ET_SKIN && emblemlocations[j].var != players[0].skin))
{
- // find which type to spawn
- for (i = 0; i < NUMMOBJTYPES; i++)
- if (mthing->type == mobjinfo[i].doomednum)
- break;
+ P_UnsetThingPosition(mobj);
+ mobj->flags |= MF_NOCLIP;
+ mobj->flags &= ~MF_SPECIAL;
+ mobj->flags |= MF_NOBLOCKMAP;
+ mobj->frame |= (tr_trans50 << FF_TRANSSHIFT);
+ P_SetThingPosition(mobj);
+ }
+ else
+ {
+ mobj->frame &= ~FF_TRANSMASK;
- if (i == NUMMOBJTYPES)
+ if (emblemlocations[j].type == ET_GLOBAL)
{
- if (mthing->type == 3328) // 3D Mode start Thing
- return;
- CONS_Alert(CONS_WARNING, M_GetText("Unknown thing type %d placed at (%d, %d)\n"), mthing->type, mthing->x, mthing->y);
- i = MT_UNKNOWN;
+ mobj->reactiontime = emblemlocations[j].var;
+ if (emblemlocations[j].var & GE_NIGHTSITEM)
+ {
+ mobj->flags |= MF_NIGHTSITEM;
+ mobj->flags &= ~MF_SPECIAL;
+ mobj->flags2 |= MF2_DONTDRAW;
+ }
}
- goto noreturns;
}
+ return true;
+}
- // count deathmatch start positions
- if (mthing->type == 33)
- {
- if (numdmstarts < MAX_DM_STARTS)
- {
- deathmatchstarts[numdmstarts] = mthing;
- mthing->type = 0;
- numdmstarts++;
- }
- return;
+static boolean P_SetupMace(mapthing_t *mthing, mobj_t *mobj, boolean *doangle)
+{
+ fixed_t mlength, mmaxlength, mlengthset, mspeed, mphase, myaw, mpitch, mminlength, mnumspokes, mpinch, mroll, mnumnospokes, mwidth, mwidthset, mmin, msound, radiusfactor, widthfactor;
+ angle_t mspokeangle;
+ mobjtype_t chainlink, macetype, firsttype, linktype;
+ boolean mdosound, mdocenter, mchainlike = false;
+ mobj_t *spawnee = NULL, *hprev = mobj;
+ mobjflag_t mflagsapply;
+ mobjflag2_t mflags2apply;
+ mobjeflag_t meflagsapply;
+ INT32 line;
+ const size_t mthingi = (size_t)(mthing - mapthings);
+
+ // Find the corresponding linedef special, using angle as tag
+ // P_FindSpecialLineFromTag works here now =D
+ line = P_FindSpecialLineFromTag(9, mthing->angle, -1);
+
+ if (line == -1)
+ {
+ CONS_Debug(DBG_GAMELOGIC, "Mace chain (mapthing #%s) needs to be tagged to a #9 parameter line (trying to find tag %d).\n", sizeu1(mthingi), mthing->angle);
+ return false;
+ }
+ /*
+ mapthing -
+ MTF_AMBUSH :
+ MT_SPRINGBALLPOINT - upgrade from yellow to red spring
+ anything else - bigger mace/chain theory
+ MTF_OBJECTSPECIAL - force silent
+ MTF_GRAVFLIP - flips objects, doesn't affect chain arrangements
+ Parameter value : number of "spokes"
+
+ linedef -
+ ML_NOCLIMB :
+ MT_CHAINPOINT/MT_CHAINMACEPOINT with ML_EFFECT1 applied - Direction not controllable
+ anything else - no functionality
+ ML_EFFECT1 : Swings instead of spins
+ ML_EFFECT2 : Linktype is replaced with macetype for all spokes not ending in chains (inverted for MT_FIREBARPOINT)
+ ML_EFFECT3 : Spawn a bonus linktype at the hinge point
+ ML_EFFECT4 : Don't clip inside the ground
+ ML_EFFECT5 : Don't stop thinking when too far away
+ */
+ mlength = abs(lines[line].dx >> FRACBITS);
+ mspeed = abs(lines[line].dy >> (FRACBITS - 4));
+ mphase = (sides[lines[line].sidenum[0]].textureoffset >> FRACBITS) % 360;
+ if ((mminlength = -sides[lines[line].sidenum[0]].rowoffset >> FRACBITS) < 0)
+ mminlength = 0;
+ else if (mminlength > mlength - 1)
+ mminlength = mlength - 1;
+ mpitch = (lines[line].frontsector->floorheight >> FRACBITS) % 360;
+ myaw = (lines[line].frontsector->ceilingheight >> FRACBITS) % 360;
+
+ mnumspokes = mthing->extrainfo + 1;
+ mspokeangle = FixedAngle((360*FRACUNIT)/mnumspokes) >> ANGLETOFINESHIFT;
+
+ if (lines[line].backsector)
+ {
+ mpinch = (lines[line].backsector->floorheight >> FRACBITS) % 360;
+ mroll = (lines[line].backsector->ceilingheight >> FRACBITS) % 360;
+ mnumnospokes = (sides[lines[line].sidenum[1]].textureoffset >> FRACBITS);
+ if ((mwidth = sides[lines[line].sidenum[1]].rowoffset >> FRACBITS) < 0)
+ mwidth = 0;
}
+ else
+ mpinch = mroll = mnumnospokes = mwidth = 0;
+
+ CONS_Debug(DBG_GAMELOGIC, "Mace/Chain (mapthing #%s):\n"
+ "Length is %d (minus %d)\n"
+ "Speed is %d\n"
+ "Phase is %d\n"
+ "Yaw is %d\n"
+ "Pitch is %d\n"
+ "No. of spokes is %d (%d antispokes)\n"
+ "Pinch is %d\n"
+ "Roll is %d\n"
+ "Width is %d\n",
+ sizeu1(mthingi), mlength, mminlength, mspeed, mphase, myaw, mpitch, mnumspokes, mnumnospokes, mpinch, mroll, mwidth);
+
+ if (mnumnospokes > 0 && (mnumnospokes < mnumspokes))
+ mnumnospokes = mnumspokes/mnumnospokes;
+ else
+ mnumnospokes = ((mobj->type == MT_CHAINMACEPOINT) ? (mnumspokes) : 0);
+
+ mobj->lastlook = mspeed;
+ mobj->movecount = mobj->lastlook;
+ mobj->angle = FixedAngle(myaw << FRACBITS);
+ *doangle = false;
+ mobj->threshold = (FixedAngle(mpitch << FRACBITS) >> ANGLETOFINESHIFT);
+ mobj->movefactor = mpinch;
+ mobj->movedir = 0;
- else if (mthing->type == 34) // Red CTF Starts
+ // Mobjtype selection
+ switch (mobj->type)
{
- if (numredctfstarts < MAXPLAYERS)
+ case MT_SPRINGBALLPOINT:
+ macetype = ((mthing->options & MTF_AMBUSH)
+ ? MT_REDSPRINGBALL
+ : MT_YELLOWSPRINGBALL);
+ chainlink = MT_SMALLMACECHAIN;
+ break;
+ case MT_FIREBARPOINT:
+ macetype = ((mthing->options & MTF_AMBUSH)
+ ? MT_BIGFIREBAR
+ : MT_SMALLFIREBAR);
+ chainlink = MT_NULL;
+ break;
+ case MT_CUSTOMMACEPOINT:
+ macetype = (mobjtype_t)sides[lines[line].sidenum[0]].toptexture;
+ if (lines[line].backsector)
+ chainlink = (mobjtype_t)sides[lines[line].sidenum[1]].toptexture;
+ else
+ chainlink = MT_NULL;
+ break;
+ case MT_CHAINPOINT:
+ if (mthing->options & MTF_AMBUSH)
{
- redctfstarts[numredctfstarts] = mthing;
- mthing->type = 0;
- numredctfstarts++;
+ macetype = MT_BIGGRABCHAIN;
+ chainlink = MT_BIGMACECHAIN;
}
- return;
- }
-
- else if (mthing->type == 35) // Blue CTF Starts
- {
- if (numbluectfstarts < MAXPLAYERS)
+ else
{
- bluectfstarts[numbluectfstarts] = mthing;
- mthing->type = 0;
- numbluectfstarts++;
+ macetype = MT_SMALLGRABCHAIN;
+ chainlink = MT_SMALLMACECHAIN;
}
- return;
+ mchainlike = true;
+ break;
+ default:
+ if (mthing->options & MTF_AMBUSH)
+ {
+ macetype = MT_BIGMACE;
+ chainlink = MT_BIGMACECHAIN;
+ }
+ else
+ {
+ macetype = MT_SMALLMACE;
+ chainlink = MT_SMALLMACECHAIN;
+ }
+ break;
}
- else if (mthing->type == 750) // Slope vertex point (formerly chaos spawn)
- return;
-
- else if (mthing->type == mobjinfo[MT_RING].doomednum || mthing->type == mobjinfo[MT_COIN].doomednum
- || mthing->type == mobjinfo[MT_REDTEAMRING].doomednum || mthing->type == mobjinfo[MT_BLUETEAMRING].doomednum
- || mthing->type == mobjinfo[MT_BLUESPHERE].doomednum || mthing->type == mobjinfo[MT_BOMBSPHERE].doomednum
- || (mthing->type >= 600 && mthing->type <= 609) // circles and diagonals
- || mthing->type == 1705 || mthing->type == 1713) // hoops
- {
- // Don't spawn hoops, wings, or rings yet!
- return;
- }
+ if (!macetype && !chainlink)
+ return true;
- // check for players specially
-#if MAXPLAYERS > 32
-You should think about modifying the deathmatch starts to take full advantage of this!
-#endif
- if (mthing->type > 0 && mthing->type <= MAXPLAYERS)
+ if (mobj->type == MT_CHAINPOINT)
{
- // save spots for respawning in network games
- if (!metalrecording)
- playerstarts[mthing->type-1] = mthing;
- return;
+ if (!mlength)
+ return true;
}
+ else
+ mlength++;
- if (metalrecording && mthing->type == mobjinfo[MT_METALSONIC_RACE].doomednum)
- { // If recording, you ARE Metal Sonic. Do not spawn it, do not save normal spawnpoints.
- playerstarts[0] = mthing;
- return;
- }
+ firsttype = macetype;
- // find which type to spawn
- for (i = 0; i < NUMMOBJTYPES; i++)
- if (mthing->type == mobjinfo[i].doomednum)
- break;
+ // Adjustable direction
+ if (lines[line].flags & ML_NOCLIMB)
+ mobj->flags |= MF_SLIDEME;
- if (i == NUMMOBJTYPES)
+ // Swinging
+ if (lines[line].flags & ML_EFFECT1)
{
- if (mthing->type == 3328) // 3D Mode start Thing
- return;
- CONS_Alert(CONS_WARNING, M_GetText("Unknown thing type %d placed at (%d, %d)\n"), mthing->type, mthing->x, mthing->y);
- i = MT_UNKNOWN;
+ mobj->flags2 |= MF2_STRONGBOX;
+ mmin = ((mnumnospokes > 1) ? 1 : 0);
}
+ else
+ mmin = mnumspokes;
- if (metalrecording) // Metal Sonic can't use these things.
- if (mobjinfo[i].flags & (MF_ENEMY|MF_BOSS) || i == MT_TOKEN || i == MT_STARPOST)
- return;
+ // If over distance away, don't move UNLESS this flag is applied
+ if (lines[line].flags & ML_EFFECT5)
+ mobj->flags2 |= MF2_BOSSNOTRAP;
- if (i >= MT_EMERALD1 && i <= MT_EMERALD7) // Pickupable Emeralds
+ // Make the links the same type as the end - repeated below
+ if ((mobj->type != MT_CHAINPOINT) && (((lines[line].flags & ML_EFFECT2) == ML_EFFECT2) != (mobj->type == MT_FIREBARPOINT))) // exclusive or
{
- if (gametype != GT_COOP) // Don't place emeralds in non-coop modes
- return;
-
- if (metalrecording)
- return; // Metal Sonic isn't for collecting emeralds.
-
- if (emeralds & mobjinfo[i].speed) // You already have this emerald!
- return;
+ linktype = macetype;
+ radiusfactor = 2; // Double the radius.
}
+ else
+ radiusfactor = (((linktype = chainlink) == MT_NULL) ? 2 : 1);
- if (i == MT_EMERHUNT)
- {
- // Emerald Hunt is Coop only.
- if (gametype != GT_COOP)
- return;
-
- ss = R_PointInSubsector(mthing->x << FRACBITS, mthing->y << FRACBITS);
- mthing->z = (INT16)(((
-#ifdef ESLOPE
- ss->sector->f_slope ? P_GetZAt(ss->sector->f_slope, mthing->x << FRACBITS, mthing->y << FRACBITS) :
-#endif
- ss->sector->floorheight)>>FRACBITS) + (mthing->options >> ZSHIFT));
-
- if (numhuntemeralds < MAXHUNTEMERALDS)
- huntemeralds[numhuntemeralds++] = mthing;
- return;
- }
+ if (!mchainlike)
+ mchainlike = (firsttype == chainlink);
+ widthfactor = (mchainlike ? 1 : 2);
- if (i == MT_EMERALDSPAWN)
- {
- if (!cv_powerstones.value)
- return;
+ mflagsapply = ((lines[line].flags & ML_EFFECT4) ? 0 : (MF_NOCLIP | MF_NOCLIPHEIGHT));
+ mflags2apply = ((mthing->options & MTF_OBJECTFLIP) ? MF2_OBJECTFLIP : 0);
+ meflagsapply = ((mthing->options & MTF_OBJECTFLIP) ? MFE_VERTICALFLIP : 0);
- if (!(gametype == GT_MATCH || gametype == GT_CTF))
- return;
+ msound = (mchainlike ? 0 : (mwidth & 1));
- runemeraldmanager = true;
- }
+ // Quick and easy preparatory variable setting
+ mphase = (FixedAngle(mphase << FRACBITS) >> ANGLETOFINESHIFT);
+ mroll = (FixedAngle(mroll << FRACBITS) >> ANGLETOFINESHIFT);
- if (!G_PlatformGametype()) // No enemies in match or CTF modes
- if ((mobjinfo[i].flags & MF_ENEMY) || (mobjinfo[i].flags & MF_BOSS))
- return;
+#define makemace(mobjtype, dist, moreflags2) {\
+ spawnee = P_SpawnMobj(mobj->x, mobj->y, mobj->z, mobjtype);\
+ P_SetTarget(&spawnee->tracer, mobj);\
+ spawnee->threshold = mphase;\
+ spawnee->friction = mroll;\
+ spawnee->movefactor = mwidthset;\
+ spawnee->movecount = dist;\
+ spawnee->angle = myaw;\
+ spawnee->flags |= (MF_NOGRAVITY|mflagsapply);\
+ spawnee->flags2 |= (mflags2apply|moreflags2);\
+ spawnee->eflags |= meflagsapply;\
+ P_SetTarget(&hprev->hnext, spawnee);\
+ P_SetTarget(&spawnee->hprev, hprev);\
+ hprev = spawnee;\
+}
- if (!G_RingSlingerGametype() || !cv_specialrings.value)
- if (P_WeaponOrPanel(i))
- return; // Don't place weapons/panels in non-ringslinger modes
+ mdosound = (mspeed && !(mthing->options & MTF_OBJECTSPECIAL));
+ mdocenter = (macetype && (lines[line].flags & ML_EFFECT3));
- // Altering monitor spawns via cvars
- // If MF_GRENADEBOUNCE is set in the monitor's info,
- // skip this step. (Used for gold monitors)
- // Yeah, this is a dirty hack.
- if ((mobjinfo[i].flags & (MF_MONITOR|MF_GRENADEBOUNCE)) == MF_MONITOR)
+ // The actual spawning of spokes
+ while (mnumspokes-- > 0)
{
- if (gametype == GT_COMPETITION || gametype == GT_RACE)
+ // Offsets
+ if (lines[line].flags & ML_EFFECT1) // Swinging
+ mroll = (mroll - mspokeangle) & FINEMASK;
+ else // Spinning
+ mphase = (mphase - mspokeangle) & FINEMASK;
+
+ if (mnumnospokes && !(mnumspokes % mnumnospokes)) // Skipping a "missing" spoke
{
- // Set powerup boxes to user settings for competition.
- if (cv_competitionboxes.value == 1) // Mystery
- i = MT_MYSTERY_BOX;
- else if (cv_competitionboxes.value == 2) // Teleport
- i = MT_MIXUP_BOX;
- else if (cv_competitionboxes.value == 3) // None
- return; // Don't spawn!
- // default case: normal
+ if (mobj->type != MT_CHAINMACEPOINT)
+ continue;
+
+ linktype = chainlink;
+ firsttype = ((mthing->options & MTF_AMBUSH) ? MT_BIGGRABCHAIN : MT_SMALLGRABCHAIN);
+ mmaxlength = 1 + (mlength - 1) * radiusfactor;
+ radiusfactor = widthfactor = 1;
}
- // Set powerup boxes to user settings for other netplay modes
- else if (gametype != GT_COOP)
+ else
{
- if (cv_matchboxes.value == 1) // Mystery
- i = MT_MYSTERY_BOX;
- else if (cv_matchboxes.value == 2) // Unchanging
+ if (mobj->type == MT_CHAINMACEPOINT)
{
- if (i == MT_MYSTERY_BOX)
- return; // don't spawn
- mthing->options &= ~(MTF_AMBUSH|MTF_OBJECTSPECIAL); // no random respawning!
+ // Make the links the same type as the end - repeated above
+ if (lines[line].flags & ML_EFFECT2)
+ {
+ linktype = macetype;
+ radiusfactor = 2;
+ }
+ else
+ radiusfactor = (((linktype = chainlink) == MT_NULL) ? 2 : 1);
+
+ firsttype = macetype;
+ widthfactor = 2;
}
- else if (cv_matchboxes.value == 3) // Don't spawn
- return;
- // default case: normal
+
+ mmaxlength = mlength;
}
- }
- if (gametype != GT_CTF) // CTF specific things
- {
- if (i == MT_RING_BLUEBOX || i == MT_RING_REDBOX)
- i = MT_RING_BOX;
- else if (i == MT_BLUEFLAG || i == MT_REDFLAG)
- return; // No flags in non-CTF modes!
- }
- else
- {
- if ((i == MT_BLUEFLAG && blueflag) || (i == MT_REDFLAG && redflag))
+ mwidthset = mwidth;
+ mlengthset = mminlength;
+
+ if (mdocenter) // Innermost link
+ makemace(linktype, 0, 0);
+
+ // Out from the center...
+ if (linktype)
{
- CONS_Alert(CONS_ERROR, M_GetText("Only one flag per team allowed in CTF!\n"));
- return;
+ while ((++mlengthset) < mmaxlength)
+ makemace(linktype, radiusfactor*mlengthset, 0);
}
- }
-
- if (!G_PlatformGametype() && (i == MT_SIGN || i == MT_STARPOST))
- return; // Don't spawn exit signs or starposts in wrong game modes
+ else
+ mlengthset = mmaxlength;
- if (modeattacking) // Record Attack special stuff
- {
- // Don't spawn starposts that wouldn't be usable
- if (i == MT_STARPOST)
- return;
+ // Outermost mace/link
+ if (firsttype)
+ makemace(firsttype, radiusfactor*mlengthset, MF2_AMBUSH);
- // 1UPs -->> Score TVs
- else if (i == MT_1UP_BOX) // 1UP
+ if (!mwidth)
+ {
+ if (mdosound && mnumspokes <= mmin) // Can it make a sound?
+ spawnee->flags2 |= MF2_BOSSNOTRAP;
+ }
+ else
{
- // Either or, doesn't matter which.
- if (mthing->options & (MTF_AMBUSH|MTF_OBJECTSPECIAL))
- i = MT_SCORE10K_BOX; // 10,000
+ // Across the bar!
+ if (!firsttype)
+ mwidthset = -mwidth;
+ else if (mwidth > 0)
+ {
+ while ((mwidthset -= widthfactor) > -mwidth)
+ {
+ makemace(firsttype, radiusfactor*mlengthset, MF2_AMBUSH);
+ if (mdosound && (mwidthset == msound) && mnumspokes <= mmin) // Can it make a sound?
+ spawnee->flags2 |= MF2_BOSSNOTRAP;
+ }
+ }
else
- i = MT_SCORE1K_BOX; // 1,000
+ {
+ while ((mwidthset += widthfactor) < -mwidth)
+ {
+ makemace(firsttype, radiusfactor*mlengthset, MF2_AMBUSH);
+ if (mdosound && (mwidthset == msound) && mnumspokes <= mmin) // Can it make a sound?
+ spawnee->flags2 |= MF2_BOSSNOTRAP;
+ }
+ }
+ mwidth = -mwidth;
+
+ // Outermost mace/link again!
+ if (firsttype)
+ makemace(firsttype, radiusfactor*(mlengthset--), MF2_AMBUSH);
+
+ // ...and then back into the center!
+ if (linktype)
+ while (mlengthset > mminlength)
+ makemace(linktype, radiusfactor*(mlengthset--), 0);
+
+ if (mdocenter) // Innermost link
+ makemace(linktype, 0, 0);
}
}
+#undef makemace
+ return true;
+}
- if (ultimatemode)
- {
- if (i == MT_PITY_BOX || i == MT_ELEMENTAL_BOX || i == MT_ATTRACT_BOX
- || i == MT_FORCE_BOX || i == MT_ARMAGEDDON_BOX || i == MT_WHIRLWIND_BOX
- || i == MT_FLAMEAURA_BOX || i == MT_BUBBLEWRAP_BOX || i == MT_THUNDERCOIN_BOX
- || i == MT_RING_BOX || i == MT_STARPOST)
- return; // No rings or shields in Ultimate mode
+static boolean P_SetupParticleGen(mapthing_t *mthing, mobj_t *mobj)
+{
+ fixed_t radius, speed;
+ INT32 type, numdivisions, anglespeed, ticcount;
+ angle_t angledivision;
+ INT32 line;
+ const size_t mthingi = (size_t)(mthing - mapthings);
- // Don't include the gold repeating boxes here please.
- // They're likely facets of the level's design and therefore required to progress.
- }
+ // Find the corresponding linedef special, using angle as tag
+ line = P_FindSpecialLineFromTag(15, mthing->angle, -1);
- if (i == MT_ROSY)
+ if (line == -1)
{
- if (!(gametype == GT_COOP || (mthing->options & MTF_EXTRA)))
- return; // she doesn't hang out here
- else if (mariomode)
- i = MT_TOAD; // don't remove on penalty of death
- else if (!(netgame || multiplayer) && players[consoleplayer].skin == 3)
- return; // no doubles
+ CONS_Debug(DBG_GAMELOGIC, "Particle generator (mapthing #%s) needs to be tagged to a #15 parameter line (trying to find tag %d).\n", sizeu1(mthingi), mthing->angle);
+ return false;
}
- if (i == MT_TOKEN && ((gametype != GT_COOP && gametype != GT_COMPETITION) || tokenbits == 30 || tokenlist & (1 << tokenbits++)))
- return; // you already got this token, or there are too many, or the gametype's not right
-
- if (i == MT_EMBLEM && (netgame || multiplayer || (modifiedgame && !savemoddata))) // No cheating!!
- return;
+ if (sides[lines[line].sidenum[0]].toptexture)
+ type = sides[lines[line].sidenum[0]].toptexture; // Set as object type in p_setup.c...
+ else
+ type = (INT32)MT_PARTICLE;
- // Objectplace landing point
- noreturns:
+ if (!lines[line].backsector
+ || (ticcount = (sides[lines[line].sidenum[1]].textureoffset >> FRACBITS)) < 1)
+ ticcount = 3;
- // spawn it
- x = mthing->x << FRACBITS;
- y = mthing->y << FRACBITS;
- ss = R_PointInSubsector(x, y);
+ numdivisions = (mthing->options >> ZSHIFT);
- if (i == MT_NIGHTSBUMPER)
- z = (
-#ifdef ESLOPE
- ss->sector->f_slope ? P_GetZAt(ss->sector->f_slope, x, y) :
-#endif
- ss->sector->floorheight) + ((mthing->options >> ZSHIFT) << FRACBITS);
- else if (i == MT_AXIS || i == MT_AXISTRANSFER || i == MT_AXISTRANSFERLINE)
- z = ONFLOORZ;
- else if (i == MT_SPIKEBALL || P_WeaponOrPanel(i) || i == MT_EMERALDSPAWN || i == MT_TOKEN || i == MT_EMBLEM)
+ if (numdivisions)
{
- if (mthing->options & MTF_OBJECTFLIP)
- {
- z = (
-#ifdef ESLOPE
- ss->sector->c_slope ? P_GetZAt(ss->sector->c_slope, x, y) :
-#endif
- ss->sector->ceilingheight);
+ radius = R_PointToDist2(lines[line].v1->x, lines[line].v1->y, lines[line].v2->x, lines[line].v2->y);
+ anglespeed = (sides[lines[line].sidenum[0]].rowoffset >> FRACBITS) % 360;
+ angledivision = 360/numdivisions;
+ }
+ else
+ {
+ numdivisions = 1; // Simple trick to make A_ParticleSpawn simpler.
+ radius = 0;
+ anglespeed = 0;
+ angledivision = 0;
+ }
+
+ speed = abs(sides[lines[line].sidenum[0]].textureoffset);
+ if (mthing->options & MTF_OBJECTFLIP)
+ speed *= -1;
+
+ CONS_Debug(DBG_GAMELOGIC, "Particle Generator (mapthing #%s):\n"
+ "Radius is %d\n"
+ "Speed is %d\n"
+ "Anglespeed is %d\n"
+ "Numdivisions is %d\n"
+ "Angledivision is %d\n"
+ "Type is %d\n"
+ "Tic seperation is %d\n",
+ sizeu1(mthingi), radius, speed, anglespeed, numdivisions, angledivision, type, ticcount);
+
+ mobj->angle = 0;
+ mobj->movefactor = speed;
+ mobj->lastlook = numdivisions;
+ mobj->movedir = angledivision*ANG1;
+ mobj->movecount = anglespeed*ANG1;
+ mobj->friction = radius;
+ mobj->threshold = type;
+ mobj->reactiontime = ticcount;
+ mobj->cvmem = line;
+ mobj->watertop = mobj->waterbottom = 0;
+ return true;
+}
+
+static boolean P_SetupNiGHTSDrone(mapthing_t* mthing, mobj_t* mobj)
+{
+ boolean flip = mthing->options & MTF_OBJECTFLIP;
+ boolean topaligned = (mthing->options & MTF_OBJECTSPECIAL) && !(mthing->options & MTF_EXTRA);
+ boolean middlealigned = (mthing->options & MTF_EXTRA) && !(mthing->options & MTF_OBJECTSPECIAL);
+ boolean bottomoffsetted = !(mthing->options & MTF_OBJECTSPECIAL) && !(mthing->options & MTF_EXTRA);
- if (mthing->options & MTF_AMBUSH) // Special flag for rings
- z -= 24*FRACUNIT;
- if (mthing->options >> ZSHIFT)
- z -= (mthing->options >> ZSHIFT)*FRACUNIT;
+ INT16 timelimit = mthing->angle & 0xFFF;
+ fixed_t hitboxradius = ((mthing->angle & 0xF000) >> 12)*32*FRACUNIT;
+ fixed_t hitboxheight = mthing->extrainfo*32*FRACUNIT;
+ fixed_t oldheight = mobj->height;
+ fixed_t dronemanoffset, goaloffset, sparkleoffset, droneboxmandiff, dronemangoaldiff;
- z -= mobjinfo[i].height; //Don't forget the height!
- }
- else
- {
- z = (
-#ifdef ESLOPE
- ss->sector->f_slope ? P_GetZAt(ss->sector->f_slope, x, y) :
-#endif
- ss->sector->floorheight);
+ if (timelimit > 0)
+ mobj->health = timelimit;
- if (mthing->options & MTF_AMBUSH) // Special flag for rings
- z += 24*FRACUNIT;
- if (mthing->options >> ZSHIFT)
- z += (mthing->options >> ZSHIFT)*FRACUNIT;
- }
+ if (hitboxradius > 0)
+ mobj->radius = hitboxradius;
- if (z == ONFLOORZ)
- mthing->z = 0;
- else
- mthing->z = (INT16)(z>>FRACBITS);
- }
+ if (hitboxheight > 0)
+ mobj->height = hitboxheight;
else
- {
- fixed_t offset = 0;
- boolean flip = (!!(mobjinfo[i].flags & MF_SPAWNCEILING) ^ !!(mthing->options & MTF_OBJECTFLIP));
+ mobj->height = mobjinfo[MT_NIGHTSDRONE].height;
- // base positions
- if (flip)
- z = (
-#ifdef ESLOPE
- ss->sector->c_slope ? P_GetZAt(ss->sector->c_slope, x, y) :
-#endif
- ss->sector->ceilingheight) - mobjinfo[i].height;
- else
- z = (
-#ifdef ESLOPE
- ss->sector->f_slope ? P_GetZAt(ss->sector->f_slope, x, y) :
-#endif
- ss->sector->floorheight);
+ droneboxmandiff = max(mobj->height - mobjinfo[MT_NIGHTSDRONE_MAN].height, 0);
+ dronemangoaldiff = max(mobjinfo[MT_NIGHTSDRONE_MAN].height - mobjinfo[MT_NIGHTSDRONE_GOAL].height, 0);
- // offsetting
- if (mthing->options >> ZSHIFT)
- offset = ((mthing->options >> ZSHIFT) << FRACBITS);
- else if (i == MT_CRAWLACOMMANDER || i == MT_DETON || i == MT_JETTBOMBER || i == MT_JETTGUNNER || i == MT_EGGMOBILE2)
- offset = 33*FRACUNIT;
- else if (i == MT_EGGMOBILE)
- offset = 128*FRACUNIT;
- else if (i == MT_GOLDBUZZ || i == MT_REDBUZZ)
- offset = 288*FRACUNIT;
+ if (flip && mobj->height != oldheight)
+ P_TeleportMove(mobj, mobj->x, mobj->y, mobj->z - (mobj->height - oldheight));
- // applying offsets! (if any)
- if (flip)
+ if (!flip)
+ {
+ if (topaligned) // Align droneman to top of hitbox
{
- if (offset)
- z -= offset;
- else
- z = ONCEILINGZ;
+ dronemanoffset = droneboxmandiff;
+ goaloffset = dronemangoaldiff/2 + dronemanoffset;
}
- else
+ else if (middlealigned) // Align droneman to center of hitbox
{
- if (offset)
- z += offset;
- else
- z = ONFLOORZ;
+ dronemanoffset = droneboxmandiff/2;
+ goaloffset = dronemangoaldiff/2 + dronemanoffset;
+ }
+ else if (bottomoffsetted)
+ {
+ dronemanoffset = 24*FRACUNIT;
+ goaloffset = dronemangoaldiff + dronemanoffset;
}
-
- if (z == ONFLOORZ)
- mthing->z = 0;
else
- mthing->z = (INT16)(z>>FRACBITS);
- }
-
- mobj = P_SpawnMobj(x, y, z, i);
- mobj->spawnpoint = mthing;
+ {
+ dronemanoffset = 0;
+ goaloffset = dronemangoaldiff/2 + dronemanoffset;
+ }
-#ifdef HAVE_BLUA
- if (LUAh_MapThingSpawn(mobj, mthing))
- {
- if (P_MobjWasRemoved(mobj))
- return;
+ sparkleoffset = goaloffset - FixedMul(15*FRACUNIT, mobj->scale);
}
- else if (P_MobjWasRemoved(mobj))
- return;
else
-#endif
- switch(mobj->type)
- {
- case MT_EMBLEM:
{
- INT32 j;
- emblem_t *emblem = M_GetLevelEmblems(gamemap);
- skincolors_t emcolor;
+ mobj->eflags |= MFE_VERTICALFLIP;
+ mobj->flags2 |= MF2_OBJECTFLIP;
- while (emblem)
+ if (topaligned) // Align droneman to top of hitbox
{
- if ((emblem->type == ET_GLOBAL || emblem->type == ET_SKIN) && emblem->tag == mthing->angle)
- break;
-
- emblem = M_GetLevelEmblems(-1);
+ dronemanoffset = 0;
+ goaloffset = dronemangoaldiff/2 + dronemanoffset;
}
-
- if (!emblem)
+ else if (middlealigned) // Align droneman to center of hitbox
{
- CONS_Debug(DBG_GAMELOGIC, "No map emblem for map %d with tag %d found!\n", gamemap, mthing->angle);
- break;
+ dronemanoffset = droneboxmandiff/2;
+ goaloffset = dronemangoaldiff/2 + dronemanoffset;
+ }
+ else if (bottomoffsetted)
+ {
+ dronemanoffset = droneboxmandiff - FixedMul(24*FRACUNIT, mobj->scale);
+ goaloffset = dronemangoaldiff + dronemanoffset;
+ }
+ else
+ {
+ dronemanoffset = droneboxmandiff;
+ goaloffset = dronemangoaldiff/2 + dronemanoffset;
}
- j = emblem - emblemlocations;
+ sparkleoffset = goaloffset + FixedMul(15*FRACUNIT, mobj->scale);
+ }
- I_Assert(emblemlocations[j].sprite >= 'A' && emblemlocations[j].sprite <= 'Z');
- P_SetMobjState(mobj, mobj->info->spawnstate + (emblemlocations[j].sprite - 'A'));
+ // spawn visual elements
+ {
+ mobj_t* goalpost = P_SpawnMobjFromMobj(mobj, 0, 0, goaloffset, MT_NIGHTSDRONE_GOAL);
+ mobj_t* sparkle = P_SpawnMobjFromMobj(mobj, 0, 0, sparkleoffset, MT_NIGHTSDRONE_SPARKLING);
+ mobj_t* droneman = P_SpawnMobjFromMobj(mobj, 0, 0, dronemanoffset, MT_NIGHTSDRONE_MAN);
- mobj->health = j + 1;
- emcolor = M_GetEmblemColor(&emblemlocations[j]); // workaround for compiler complaint about bad function casting
- mobj->color = (UINT8)emcolor;
+ P_SetTarget(&mobj->target, goalpost);
+ P_SetTarget(&goalpost->target, sparkle);
+ P_SetTarget(&goalpost->tracer, droneman);
- if (emblemlocations[j].collected
- || (emblemlocations[j].type == ET_SKIN && emblemlocations[j].var != players[0].skin))
+ // correct Z position
+ if (flip)
{
- P_UnsetThingPosition(mobj);
- mobj->flags |= MF_NOCLIP;
- mobj->flags &= ~MF_SPECIAL;
- mobj->flags |= MF_NOBLOCKMAP;
- mobj->frame |= (tr_trans50 << FF_TRANSSHIFT);
- P_SetThingPosition(mobj);
+ P_TeleportMove(goalpost, goalpost->x, goalpost->y, mobj->z + goaloffset);
+ P_TeleportMove(sparkle, sparkle->x, sparkle->y, mobj->z + sparkleoffset);
+ P_TeleportMove(droneman, droneman->x, droneman->y, mobj->z + dronemanoffset);
}
- else
- {
- mobj->frame &= ~FF_TRANSMASK;
- if (emblemlocations[j].type == ET_GLOBAL)
- {
- mobj->reactiontime = emblemlocations[j].var;
- if (emblemlocations[j].var & GE_NIGHTSITEM)
- {
- mobj->flags |= MF_NIGHTSITEM;
- mobj->flags &= ~MF_SPECIAL;
- mobj->flags2 |= MF2_DONTDRAW;
- }
- }
- }
+ // Remember position preference for later
+ mobj->flags &= ~(MF_SLIDEME|MF_GRENADEBOUNCE);
+ if (topaligned)
+ mobj->flags |= MF_SLIDEME;
+ else if (middlealigned)
+ mobj->flags |= MF_GRENADEBOUNCE;
+ else if (!bottomoffsetted)
+ mobj->flags |= MF_SLIDEME|MF_GRENADEBOUNCE;
+
+ // Remember old Z position and flags for correction detection
+ goalpost->movefactor = mobj->z;
+ goalpost->friction = mobj->height;
+ goalpost->threshold = mobj->flags & (MF_SLIDEME|MF_GRENADEBOUNCE);
+ }
+ return true;
+}
+
+static boolean P_SetupBooster(mapthing_t* mthing, mobj_t* mobj, boolean strong)
+{
+ angle_t angle = FixedAngle(mthing->angle << FRACBITS);
+ fixed_t x1 = FINECOSINE((angle >> ANGLETOFINESHIFT) & FINEMASK);
+ fixed_t y1 = FINESINE((angle >> ANGLETOFINESHIFT) & FINEMASK);
+ fixed_t x2 = FINECOSINE(((angle + ANGLE_90) >> ANGLETOFINESHIFT) & FINEMASK);
+ fixed_t y2 = FINESINE(((angle + ANGLE_90) >> ANGLETOFINESHIFT) & FINEMASK);
+ statenum_t facestate = strong ? S_REDBOOSTERSEG_FACE : S_YELLOWBOOSTERSEG_FACE;
+ statenum_t leftstate = strong ? S_REDBOOSTERSEG_LEFT : S_YELLOWBOOSTERSEG_LEFT;
+ statenum_t rightstate = strong ? S_REDBOOSTERSEG_RIGHT : S_YELLOWBOOSTERSEG_RIGHT;
+ statenum_t rollerstate = strong ? S_REDBOOSTERROLLER : S_YELLOWBOOSTERROLLER;
+
+ mobj_t *seg = P_SpawnMobjFromMobj(mobj, 26*x1, 26*y1, 0, MT_BOOSTERSEG);
+ seg->angle = angle - ANGLE_90;
+ P_SetMobjState(seg, facestate);
+ seg = P_SpawnMobjFromMobj(mobj, -26*x1, -26*y1, 0, MT_BOOSTERSEG);
+ seg->angle = angle + ANGLE_90;
+ P_SetMobjState(seg, facestate);
+ seg = P_SpawnMobjFromMobj(mobj, 21*x2, 21*y2, 0, MT_BOOSTERSEG);
+ seg->angle = angle;
+ P_SetMobjState(seg, leftstate);
+ seg = P_SpawnMobjFromMobj(mobj, -21*x2, -21*y2, 0, MT_BOOSTERSEG);
+ seg->angle = angle;
+ P_SetMobjState(seg, rightstate);
+
+ seg = P_SpawnMobjFromMobj(mobj, 13*(x1 + x2), 13*(y1 + y2), 0, MT_BOOSTERROLLER);
+ seg->angle = angle;
+ P_SetMobjState(seg, rollerstate);
+ seg = P_SpawnMobjFromMobj(mobj, 13*(x1 - x2), 13*(y1 - y2), 0, MT_BOOSTERROLLER);
+ seg->angle = angle;
+ P_SetMobjState(seg, rollerstate);
+ seg = P_SpawnMobjFromMobj(mobj, -13*(x1 + x2), -13*(y1 + y2), 0, MT_BOOSTERROLLER);
+ seg->angle = angle;
+ P_SetMobjState(seg, rollerstate);
+ seg = P_SpawnMobjFromMobj(mobj, -13*(x1 - x2), -13*(y1 - y2), 0, MT_BOOSTERROLLER);
+ seg->angle = angle;
+ P_SetMobjState(seg, rollerstate);
+
+ return true;
+}
+
+static boolean P_SetupSpawnedMapThing(mapthing_t *mthing, mobj_t *mobj, boolean *doangle)
+{
+#ifdef HAVE_BLUA
+ boolean override = LUAh_MapThingSpawn(mobj, mthing);
+
+ if (P_MobjWasRemoved(mobj))
+ return false;
+
+ if (override)
+ return true;
+#endif
+
+ switch (mobj->type)
+ {
+ case MT_EMBLEM:
+ {
+ if (!P_SetupEmblem(mthing, mobj))
+ return false;
break;
}
case MT_SKYBOX:
@@ -12017,7 +12719,7 @@ You should think about modifying the deathmatch starts to take full advantage of
if (mthing->angle)
mobj->health = mthing->angle;
else
- mobj->health = FixedMul(ss->sector->ceilingheight-ss->sector->floorheight, 3*(FRACUNIT/4))>>FRACBITS;
+ mobj->health = FixedMul(mobj->subsector->sector->ceilingheight - mobj->subsector->sector->floorheight, 3*(FRACUNIT/4)) >> FRACBITS;
break;
case MT_METALSONIC_RACE:
case MT_METALSONIC_BATTLE:
@@ -12032,7 +12734,7 @@ You should think about modifying the deathmatch starts to take full advantage of
break;
case MT_BALLOON:
if (mthing->angle > 0)
- mobj->color = ((mthing->angle-1) % (MAXSKINCOLORS-1))+1;
+ mobj->color = ((mthing->angle - 1) % (MAXSKINCOLORS - 1)) + 1;
break;
#define makesoftwarecorona(mo, h) \
corona = P_SpawnMobjFromMobj(mo, 0, 0, h<<FRACBITS, MT_PARTICLE);\
@@ -12083,412 +12785,31 @@ You should think about modifying the deathmatch starts to take full advantage of
}
break;
case MT_WATERDRIP:
- if (mthing->angle)
- mobj->tics = 3*TICRATE + mthing->angle;
- else
- mobj->tics = 3*TICRATE;
+ mobj->tics = 3*TICRATE + mthing->angle;
break;
case MT_FLAMEJET:
case MT_VERTICALFLAMEJET:
mobj->threshold = (mthing->angle >> 10) & 7;
- mobj->movecount = (mthing->angle >> 13);
-
- mobj->threshold *= (TICRATE/2);
- mobj->movecount *= (TICRATE/2);
-
- mobj->movedir = mthing->extrainfo;
- break;
- case MT_MACEPOINT:
- case MT_CHAINMACEPOINT:
- case MT_SPRINGBALLPOINT:
- case MT_CHAINPOINT:
- case MT_FIREBARPOINT:
- case MT_CUSTOMMACEPOINT:
- {
- fixed_t mlength, mmaxlength, mlengthset, mspeed, mphase, myaw, mpitch, mminlength, mnumspokes, mpinch, mroll, mnumnospokes, mwidth, mwidthset, mmin, msound, radiusfactor, widthfactor;
- angle_t mspokeangle;
- mobjtype_t chainlink, macetype, firsttype, linktype;
- boolean mdosound, mdocenter, mchainlike = false;
- mobj_t *spawnee = NULL, *hprev = mobj;
- mobjflag_t mflagsapply;
- mobjflag2_t mflags2apply;
- mobjeflag_t meflagsapply;
- INT32 line;
- const size_t mthingi = (size_t)(mthing - mapthings);
-
- // Find the corresponding linedef special, using angle as tag
- // P_FindSpecialLineFromTag works here now =D
- line = P_FindSpecialLineFromTag(9, mthing->angle, -1);
-
- if (line == -1)
- {
- CONS_Debug(DBG_GAMELOGIC, "Mace chain (mapthing #%s) needs to be tagged to a #9 parameter line (trying to find tag %d).\n", sizeu1(mthingi), mthing->angle);
- return;
- }
-/*
-mapthing -
-MTF_AMBUSH :
- MT_SPRINGBALLPOINT - upgrade from yellow to red spring
- anything else - bigger mace/chain theory
-MTF_OBJECTSPECIAL - force silent
-MTF_GRAVFLIP - flips objects, doesn't affect chain arrangements
-Parameter value : number of "spokes"
-
-linedef -
-ML_NOCLIMB :
- MT_CHAINPOINT/MT_CHAINMACEPOINT with ML_EFFECT1 applied - Direction not controllable
- anything else - no functionality
-ML_EFFECT1 : Swings instead of spins
-ML_EFFECT2 : Linktype is replaced with macetype for all spokes not ending in chains (inverted for MT_FIREBARPOINT)
-ML_EFFECT3 : Spawn a bonus linktype at the hinge point
-ML_EFFECT4 : Don't clip inside the ground
-ML_EFFECT5 : Don't stop thinking when too far away
-*/
- mlength = abs(lines[line].dx >> FRACBITS);
- mspeed = abs(lines[line].dy >> (FRACBITS - 4));
- mphase = (sides[lines[line].sidenum[0]].textureoffset >> FRACBITS) % 360;
- if ((mminlength = -sides[lines[line].sidenum[0]].rowoffset>>FRACBITS) < 0)
- mminlength = 0;
- else if (mminlength > mlength-1)
- mminlength = mlength-1;
- mpitch = (lines[line].frontsector->floorheight >> FRACBITS) % 360;
- myaw = (lines[line].frontsector->ceilingheight >> FRACBITS) % 360;
-
- mnumspokes = mthing->extrainfo + 1;
- mspokeangle = FixedAngle((360*FRACUNIT)/mnumspokes)>>ANGLETOFINESHIFT;
-
- if (lines[line].backsector)
- {
- mpinch = (lines[line].backsector->floorheight >> FRACBITS) % 360;
- mroll = (lines[line].backsector->ceilingheight >> FRACBITS) % 360;
- mnumnospokes = (sides[lines[line].sidenum[1]].textureoffset >> FRACBITS);
- if ((mwidth = sides[lines[line].sidenum[1]].rowoffset >> FRACBITS) < 0)
- mwidth = 0;
- }
- else
- mpinch = mroll = mnumnospokes = mwidth = 0;
-
- CONS_Debug(DBG_GAMELOGIC, "Mace/Chain (mapthing #%s):\n"
- "Length is %d (minus %d)\n"
- "Speed is %d\n"
- "Phase is %d\n"
- "Yaw is %d\n"
- "Pitch is %d\n"
- "No. of spokes is %d (%d antispokes)\n"
- "Pinch is %d\n"
- "Roll is %d\n"
- "Width is %d\n",
- sizeu1(mthingi), mlength, mminlength, mspeed, mphase, myaw, mpitch, mnumspokes, mnumnospokes, mpinch, mroll, mwidth);
-
- if (mnumnospokes > 0 && (mnumnospokes < mnumspokes))
- mnumnospokes = mnumspokes/mnumnospokes;
- else
- mnumnospokes = ((mobj->type == MT_CHAINMACEPOINT) ? (mnumspokes) : 0);
-
- mobj->lastlook = mspeed;
- mobj->movecount = mobj->lastlook;
- mobj->angle = FixedAngle(myaw*FRACUNIT);
- doangle = false;
- mobj->threshold = (FixedAngle(mpitch*FRACUNIT)>>ANGLETOFINESHIFT);
- mobj->movefactor = mpinch;
- mobj->movedir = 0;
-
- // Mobjtype selection
- switch(mobj->type)
- {
- case MT_SPRINGBALLPOINT:
- macetype = ((mthing->options & MTF_AMBUSH)
- ? MT_REDSPRINGBALL
- : MT_YELLOWSPRINGBALL);
- chainlink = MT_SMALLMACECHAIN;
- break;
- case MT_FIREBARPOINT:
- macetype = ((mthing->options & MTF_AMBUSH)
- ? MT_BIGFIREBAR
- : MT_SMALLFIREBAR);
- chainlink = MT_NULL;
- break;
- case MT_CUSTOMMACEPOINT:
- macetype = (mobjtype_t)sides[lines[line].sidenum[0]].toptexture;
- if (lines[line].backsector)
- chainlink = (mobjtype_t)sides[lines[line].sidenum[1]].toptexture;
- else
- chainlink = MT_NULL;
- break;
- case MT_CHAINPOINT:
- if (mthing->options & MTF_AMBUSH)
- {
- macetype = MT_BIGGRABCHAIN;
- chainlink = MT_BIGMACECHAIN;
- }
- else
- {
- macetype = MT_SMALLGRABCHAIN;
- chainlink = MT_SMALLMACECHAIN;
- }
- mchainlike = true;
- break;
- default:
- if (mthing->options & MTF_AMBUSH)
- {
- macetype = MT_BIGMACE;
- chainlink = MT_BIGMACECHAIN;
- }
- else
- {
- macetype = MT_SMALLMACE;
- chainlink = MT_SMALLMACECHAIN;
- }
- break;
- }
-
- if (!macetype && !chainlink)
- break;
-
- if (mobj->type == MT_CHAINPOINT)
- {
- if (!mlength)
- break;
- }
- else
- mlength++;
-
- firsttype = macetype;
-
- // Adjustable direction
- if (lines[line].flags & ML_NOCLIMB)
- mobj->flags |= MF_SLIDEME;
-
- // Swinging
- if (lines[line].flags & ML_EFFECT1)
- {
- mobj->flags2 |= MF2_STRONGBOX;
- mmin = ((mnumnospokes > 1) ? 1 : 0);
- }
- else
- mmin = mnumspokes;
-
- // If over distance away, don't move UNLESS this flag is applied
- if (lines[line].flags & ML_EFFECT5)
- mobj->flags2 |= MF2_BOSSNOTRAP;
-
- // Make the links the same type as the end - repeated below
- if ((mobj->type != MT_CHAINPOINT) && (((lines[line].flags & ML_EFFECT2) == ML_EFFECT2) != (mobj->type == MT_FIREBARPOINT))) // exclusive or
- {
- linktype = macetype;
- radiusfactor = 2; // Double the radius.
- }
- else
- radiusfactor = (((linktype = chainlink) == MT_NULL) ? 2 : 1);
-
- if (!mchainlike)
- mchainlike = (firsttype == chainlink);
- widthfactor = (mchainlike ? 1 : 2);
-
- mflagsapply = ((lines[line].flags & ML_EFFECT4) ? 0 : (MF_NOCLIP|MF_NOCLIPHEIGHT));
- mflags2apply = ((mthing->options & MTF_OBJECTFLIP) ? MF2_OBJECTFLIP : 0);
- meflagsapply = ((mthing->options & MTF_OBJECTFLIP) ? MFE_VERTICALFLIP : 0);
-
- msound = (mchainlike ? 0 : (mwidth & 1));
-
- // Quick and easy preparatory variable setting
- mphase = (FixedAngle(mphase*FRACUNIT)>>ANGLETOFINESHIFT);
- mroll = (FixedAngle(mroll*FRACUNIT)>>ANGLETOFINESHIFT);
-
-#define makemace(mobjtype, dist, moreflags2) {\
- spawnee = P_SpawnMobj(mobj->x, mobj->y, mobj->z, mobjtype);\
- P_SetTarget(&spawnee->tracer, mobj);\
- spawnee->threshold = mphase;\
- spawnee->friction = mroll;\
- spawnee->movefactor = mwidthset;\
- spawnee->movecount = dist;\
- spawnee->angle = myaw;\
- spawnee->flags |= (MF_NOGRAVITY|mflagsapply);\
- spawnee->flags2 |= (mflags2apply|moreflags2);\
- spawnee->eflags |= meflagsapply;\
- P_SetTarget(&hprev->hnext, spawnee);\
- P_SetTarget(&spawnee->hprev, hprev);\
- hprev = spawnee;\
-}
-
- mdosound = (mspeed && !(mthing->options & MTF_OBJECTSPECIAL));
- mdocenter = (macetype && (lines[line].flags & ML_EFFECT3));
-
- // The actual spawning of spokes
- while (mnumspokes-- > 0)
- {
- // Offsets
- if (lines[line].flags & ML_EFFECT1) // Swinging
- mroll = (mroll - mspokeangle) & FINEMASK;
- else // Spinning
- mphase = (mphase - mspokeangle) & FINEMASK;
-
- if (mnumnospokes && !(mnumspokes % mnumnospokes)) // Skipping a "missing" spoke
- {
- if (mobj->type != MT_CHAINMACEPOINT)
- continue;
-
- linktype = chainlink;
- firsttype = ((mthing->options & MTF_AMBUSH) ? MT_BIGGRABCHAIN : MT_SMALLGRABCHAIN);
- mmaxlength = 1 + (mlength - 1)*radiusfactor;
- radiusfactor = widthfactor = 1;
- }
- else
- {
- if (mobj->type == MT_CHAINMACEPOINT)
- {
- // Make the links the same type as the end - repeated above
- if (lines[line].flags & ML_EFFECT2)
- {
- linktype = macetype;
- radiusfactor = 2;
- }
- else
- radiusfactor = (((linktype = chainlink) == MT_NULL) ? 2 : 1);
-
- firsttype = macetype;
- widthfactor = 2;
- }
-
- mmaxlength = mlength;
- }
-
- mwidthset = mwidth;
- mlengthset = mminlength;
-
- if (mdocenter) // Innermost link
- makemace(linktype, 0, 0);
-
- // Out from the center...
- if (linktype)
- {
- while ((++mlengthset) < mmaxlength)
- makemace(linktype, radiusfactor*mlengthset, 0);
- }
- else
- mlengthset = mmaxlength;
-
- // Outermost mace/link
- if (firsttype)
- makemace(firsttype, radiusfactor*mlengthset, MF2_AMBUSH);
-
- if (!mwidth)
- {
- if (mdosound && mnumspokes <= mmin) // Can it make a sound?
- spawnee->flags2 |= MF2_BOSSNOTRAP;
- }
- else
- {
- // Across the bar!
- if (!firsttype)
- mwidthset = -mwidth;
- else if (mwidth > 0)
- {
- while ((mwidthset -= widthfactor) > -mwidth)
- {
- makemace(firsttype, radiusfactor*mlengthset, MF2_AMBUSH);
- if (mdosound && (mwidthset == msound) && mnumspokes <= mmin) // Can it make a sound?
- spawnee->flags2 |= MF2_BOSSNOTRAP;
- }
- }
- else
- {
- while ((mwidthset += widthfactor) < -mwidth)
- {
- makemace(firsttype, radiusfactor*mlengthset, MF2_AMBUSH);
- if (mdosound && (mwidthset == msound) && mnumspokes <= mmin) // Can it make a sound?
- spawnee->flags2 |= MF2_BOSSNOTRAP;
- }
- }
- mwidth = -mwidth;
-
- // Outermost mace/link again!
- if (firsttype)
- makemace(firsttype, radiusfactor*(mlengthset--), MF2_AMBUSH);
-
- // ...and then back into the center!
- if (linktype)
- while (mlengthset > mminlength)
- makemace(linktype, radiusfactor*(mlengthset--), 0);
-
- if (mdocenter) // Innermost link
- makemace(linktype, 0, 0);
- }
- }
-
-#undef makemace
-
- break;
- }
- case MT_PARTICLEGEN:
- {
- fixed_t radius, speed;
- INT32 type, numdivisions, anglespeed, ticcount;
- angle_t angledivision;
- INT32 line;
- const size_t mthingi = (size_t)(mthing - mapthings);
-
- // Find the corresponding linedef special, using angle as tag
- line = P_FindSpecialLineFromTag(15, mthing->angle, -1);
-
- if (line == -1)
- {
- CONS_Debug(DBG_GAMELOGIC, "Particle generator (mapthing #%s) needs to be tagged to a #15 parameter line (trying to find tag %d).\n", sizeu1(mthingi), mthing->angle);
- return;
- }
-
- if (sides[lines[line].sidenum[0]].toptexture)
- type = sides[lines[line].sidenum[0]].toptexture; // Set as object type in p_setup.c...
- else
- type = (INT32)MT_PARTICLE;
-
- if (!lines[line].backsector
- || (ticcount = (sides[lines[line].sidenum[1]].textureoffset >> FRACBITS)) < 1)
- ticcount = 3;
-
- numdivisions = (mthing->options >> ZSHIFT);
-
- if (numdivisions)
- {
- radius = R_PointToDist2(lines[line].v1->x, lines[line].v1->y, lines[line].v2->x, lines[line].v2->y);
- anglespeed = (sides[lines[line].sidenum[0]].rowoffset >> FRACBITS) % 360;
- angledivision = 360/numdivisions;
- }
- else
- {
- numdivisions = 1; // Simple trick to make A_ParticleSpawn simpler.
- radius = 0;
- anglespeed = 0;
- angledivision = 0;
- }
+ mobj->movecount = (mthing->angle >> 13);
- speed = abs(sides[lines[line].sidenum[0]].textureoffset);
- if (mthing->options & MTF_OBJECTFLIP)
- speed *= -1;
-
- CONS_Debug(DBG_GAMELOGIC, "Particle Generator (mapthing #%s):\n"
- "Radius is %d\n"
- "Speed is %d\n"
- "Anglespeed is %d\n"
- "Numdivisions is %d\n"
- "Angledivision is %d\n"
- "Type is %d\n"
- "Tic seperation is %d\n",
- sizeu1(mthingi), radius, speed, anglespeed, numdivisions, angledivision, type, ticcount);
-
- mobj->angle = 0;
- mobj->movefactor = speed;
- mobj->lastlook = numdivisions;
- mobj->movedir = angledivision*ANG1;
- mobj->movecount = anglespeed*ANG1;
- mobj->friction = radius;
- mobj->threshold = type;
- mobj->reactiontime = ticcount;
- mobj->cvmem = line;
- mobj->watertop = mobj->waterbottom = 0;
+ mobj->threshold *= (TICRATE/2);
+ mobj->movecount *= (TICRATE/2);
+ mobj->movedir = mthing->extrainfo;
+ break;
+ case MT_MACEPOINT:
+ case MT_CHAINMACEPOINT:
+ case MT_SPRINGBALLPOINT:
+ case MT_CHAINPOINT:
+ case MT_FIREBARPOINT:
+ case MT_CUSTOMMACEPOINT:
+ if (!P_SetupMace(mthing, mobj, doangle))
+ return false;
+ break;
+ case MT_PARTICLEGEN:
+ if (!P_SetupParticleGen(mthing, mobj))
+ return false;
break;
- }
case MT_ROCKSPAWNER:
mobj->threshold = mthing->angle;
mobj->movecount = mthing->extrainfo;
@@ -12503,7 +12824,7 @@ ML_EFFECT5 : Don't stop thinking when too far away
// Lower 4 bits specify the angle of
// the bumper in 30 degree increments.
mobj->threshold = (mthing->options & 15) % 12; // It loops over, etc
- P_SetMobjState(mobj, mobj->info->spawnstate+mobj->threshold);
+ P_SetMobjState(mobj, mobj->info->spawnstate + mobj->threshold);
break;
case MT_EGGCAPSULE:
if (mthing->angle <= 0)
@@ -12520,122 +12841,8 @@ ML_EFFECT5 : Don't stop thinking when too far away
mobj->health = mthing->extrainfo;
break;
case MT_NIGHTSDRONE:
- {
- boolean flip = mthing->options & MTF_OBJECTFLIP;
- boolean topaligned = (mthing->options & MTF_OBJECTSPECIAL) && !(mthing->options & MTF_EXTRA);
- boolean middlealigned = (mthing->options & MTF_EXTRA) && !(mthing->options & MTF_OBJECTSPECIAL);
- boolean bottomoffsetted = !(mthing->options & MTF_OBJECTSPECIAL) && !(mthing->options & MTF_EXTRA);
-
- INT16 timelimit = mthing->angle & 0xFFF;
- fixed_t hitboxradius = ((mthing->angle & 0xF000) >> 12) * 32 * FRACUNIT;
- fixed_t hitboxheight = mthing->extrainfo * 32 * FRACUNIT;
- fixed_t oldheight = mobj->height;
- fixed_t dronemanoffset, goaloffset, sparkleoffset, droneboxmandiff, dronemangoaldiff;
-
- if (timelimit > 0)
- mobj->health = timelimit;
-
- if (hitboxradius > 0)
- mobj->radius = hitboxradius;
-
- if (hitboxheight > 0)
- mobj->height = hitboxheight;
- else
- mobj->height = mobjinfo[MT_NIGHTSDRONE].height;
-
- droneboxmandiff = max(mobj->height - mobjinfo[MT_NIGHTSDRONE_MAN].height, 0);
- dronemangoaldiff = max(mobjinfo[MT_NIGHTSDRONE_MAN].height - mobjinfo[MT_NIGHTSDRONE_GOAL].height, 0);
-
- if (flip && mobj->height != oldheight)
- P_TeleportMove(mobj, mobj->x, mobj->y, mobj->z - (mobj->height - oldheight));
-
- if (!flip)
- {
- if (topaligned) // Align droneman to top of hitbox
- {
- dronemanoffset = droneboxmandiff;
- goaloffset = dronemangoaldiff / 2 + dronemanoffset;
- }
- else if (middlealigned) // Align droneman to center of hitbox
- {
- dronemanoffset = droneboxmandiff / 2;
- goaloffset = dronemangoaldiff / 2 + dronemanoffset;
- }
- else if (bottomoffsetted)
- {
- dronemanoffset = 24*FRACUNIT;
- goaloffset = dronemangoaldiff + dronemanoffset;
- }
- else
- {
- dronemanoffset = 0;
- goaloffset = dronemangoaldiff / 2 + dronemanoffset;
- }
-
- sparkleoffset = goaloffset - FixedMul(15*FRACUNIT, mobj->scale);
- }
- else
- {
- mobj->eflags |= MFE_VERTICALFLIP;
- mobj->flags2 |= MF2_OBJECTFLIP;
-
- if (topaligned) // Align droneman to top of hitbox
- {
- dronemanoffset = 0;
- goaloffset = dronemangoaldiff / 2 + dronemanoffset;
- }
- else if (middlealigned) // Align droneman to center of hitbox
- {
- dronemanoffset = droneboxmandiff / 2;
- goaloffset = dronemangoaldiff / 2 + dronemanoffset;
- }
- else if (bottomoffsetted)
- {
- dronemanoffset = droneboxmandiff - FixedMul(24*FRACUNIT, mobj->scale);
- goaloffset = dronemangoaldiff + dronemanoffset;
- }
- else
- {
- dronemanoffset = droneboxmandiff;
- goaloffset = dronemangoaldiff / 2 + dronemanoffset;
- }
-
- sparkleoffset = goaloffset + FixedMul(15*FRACUNIT, mobj->scale);
- }
-
- // spawn visual elements
- {
- mobj_t *goalpost = P_SpawnMobjFromMobj(mobj, 0, 0, goaloffset, MT_NIGHTSDRONE_GOAL);
- mobj_t *sparkle = P_SpawnMobjFromMobj(mobj, 0, 0, sparkleoffset, MT_NIGHTSDRONE_SPARKLING);
- mobj_t *droneman = P_SpawnMobjFromMobj(mobj, 0, 0, dronemanoffset, MT_NIGHTSDRONE_MAN);
-
- P_SetTarget(&mobj->target, goalpost);
- P_SetTarget(&goalpost->target, sparkle);
- P_SetTarget(&goalpost->tracer, droneman);
-
- // correct Z position
- if (flip)
- {
- P_TeleportMove(goalpost, goalpost->x, goalpost->y, mobj->z + goaloffset);
- P_TeleportMove(sparkle, sparkle->x, sparkle->y, mobj->z + sparkleoffset);
- P_TeleportMove(droneman, droneman->x, droneman->y, mobj->z + dronemanoffset);
- }
-
- // Remember position preference for later
- mobj->flags &= ~(MF_SLIDEME | MF_GRENADEBOUNCE);
- if (topaligned)
- mobj->flags |= MF_SLIDEME;
- else if (middlealigned)
- mobj->flags |= MF_GRENADEBOUNCE;
- else if (!bottomoffsetted)
- mobj->flags |= MF_SLIDEME | MF_GRENADEBOUNCE;
-
- // Remember old Z position and flags for correction detection
- goalpost->movefactor = mobj->z;
- goalpost->friction = mobj->height;
- goalpost->threshold = mobj->flags & (MF_SLIDEME | MF_GRENADEBOUNCE);
- }
- }
+ if (!P_SetupNiGHTSDrone(mthing, mobj))
+ return false;
break;
case MT_HIVEELEMENTAL:
if (mthing->extrainfo)
@@ -12646,7 +12853,7 @@ ML_EFFECT5 : Don't stop thinking when too far away
case MT_GLAREGOYLEDOWN:
case MT_GLAREGOYLELONG:
if (mthing->angle >= 360)
- mobj->tics += 7*(mthing->angle / 360) + 1; // starting delay
+ mobj->tics += 7*(mthing->angle/360) + 1; // starting delay
break;
case MT_DSZSTALAGMITE:
case MT_DSZ2STALAGMITE:
@@ -12657,39 +12864,39 @@ ML_EFFECT5 : Don't stop thinking when too far away
}
break;
case MT_THZTREE:
- { // Spawn the branches
- angle_t mobjangle = FixedAngle((mthing->angle % 113)<<FRACBITS);
- P_SpawnMobjFromMobj(mobj, 1*FRACUNIT, 0, 0, MT_THZTREEBRANCH)->angle = mobjangle + ANGLE_22h;
- P_SpawnMobjFromMobj(mobj, 0, 1*FRACUNIT, 0, MT_THZTREEBRANCH)->angle = mobjangle + ANGLE_157h;
- P_SpawnMobjFromMobj(mobj, -1*FRACUNIT, 0, 0, MT_THZTREEBRANCH)->angle = mobjangle + ANGLE_270;
- }
- break;
+ { // Spawn the branches
+ angle_t mobjangle = FixedAngle((mthing->angle % 113) << FRACBITS);
+ P_SpawnMobjFromMobj(mobj, FRACUNIT, 0, 0, MT_THZTREEBRANCH)->angle = mobjangle + ANGLE_22h;
+ P_SpawnMobjFromMobj(mobj, 0, FRACUNIT, 0, MT_THZTREEBRANCH)->angle = mobjangle + ANGLE_157h;
+ P_SpawnMobjFromMobj(mobj, -FRACUNIT, 0, 0, MT_THZTREEBRANCH)->angle = mobjangle + ANGLE_270;
+ }
+ break;
case MT_CEZPOLE1:
case MT_CEZPOLE2:
- { // Spawn the banner
- angle_t mobjangle = FixedAngle(mthing->angle<<FRACBITS);
- P_SpawnMobjFromMobj(mobj,
- P_ReturnThrustX(mobj, mobjangle, 4<<FRACBITS),
- P_ReturnThrustY(mobj, mobjangle, 4<<FRACBITS),
- 0, ((mobj->type == MT_CEZPOLE1) ? MT_CEZBANNER1 : MT_CEZBANNER2))->angle = mobjangle + ANGLE_90;
- }
- break;
+ { // Spawn the banner
+ angle_t mobjangle = FixedAngle(mthing->angle << FRACBITS);
+ P_SpawnMobjFromMobj(mobj,
+ P_ReturnThrustX(mobj, mobjangle, 4 << FRACBITS),
+ P_ReturnThrustY(mobj, mobjangle, 4 << FRACBITS),
+ 0, ((mobj->type == MT_CEZPOLE1) ? MT_CEZBANNER1 : MT_CEZBANNER2))->angle = mobjangle + ANGLE_90;
+ }
+ break;
case MT_HHZTREE_TOP:
- { // Spawn the branches
- angle_t mobjangle = FixedAngle(mthing->angle<<FRACBITS) & (ANGLE_90-1);
- mobj_t *leaf;
+ { // Spawn the branches
+ angle_t mobjangle = FixedAngle(mthing->angle << FRACBITS) & (ANGLE_90 - 1);
+ mobj_t* leaf;
#define doleaf(x, y) \
leaf = P_SpawnMobjFromMobj(mobj, x, y, 0, MT_HHZTREE_PART);\
leaf->angle = mobjangle;\
P_SetMobjState(leaf, leaf->info->seestate);\
mobjangle += ANGLE_90
- doleaf(1*FRACUNIT, 0);
- doleaf(0, 1*FRACUNIT);
- doleaf(-1*FRACUNIT, 0);
- doleaf(0, -1*FRACUNIT);
+ doleaf(FRACUNIT, 0);
+ doleaf(0, FRACUNIT);
+ doleaf(-FRACUNIT, 0);
+ doleaf(0, -FRACUNIT);
#undef doleaf
- }
- break;
+ }
+ break;
case MT_SMASHINGSPIKEBALL:
if (mthing->angle > 0)
mobj->tics += mthing->angle;
@@ -12720,94 +12927,27 @@ ML_EFFECT5 : Don't stop thinking when too far away
angle_t fa = (angle >> ANGLETOFINESHIFT) & FINEMASK;
fixed_t xoffs = FINECOSINE(fa);
fixed_t yoffs = FINESINE(fa);
- mobj_t *leaf = P_SpawnMobjFromMobj(mobj, xoffs, yoffs, 0, MT_BIGFERNLEAF);
+ mobj_t* leaf = P_SpawnMobjFromMobj(mobj, xoffs, yoffs, 0, MT_BIGFERNLEAF);
leaf->angle = angle;
angle += ANGLE_45;
}
break;
}
case MT_REDBOOSTER:
- {
- angle_t angle = FixedAngle(mthing->angle << FRACBITS);
- fixed_t x1 = FINECOSINE((angle >> ANGLETOFINESHIFT) & FINEMASK);
- fixed_t y1 = FINESINE((angle >> ANGLETOFINESHIFT) & FINEMASK);
- fixed_t x2 = FINECOSINE(((angle+ANGLE_90) >> ANGLETOFINESHIFT) & FINEMASK);
- fixed_t y2 = FINESINE(((angle+ANGLE_90) >> ANGLETOFINESHIFT) & FINEMASK);
-
- mobj_t *seg = P_SpawnMobjFromMobj(mobj, 26*x1, 26*y1, 0, MT_BOOSTERSEG);
- seg->angle = angle-ANGLE_90;
- P_SetMobjState(seg, S_REDBOOSTERSEG_FACE);
- seg = P_SpawnMobjFromMobj(mobj, -26*x1, -26*y1, 0, MT_BOOSTERSEG);
- seg->angle = angle+ANGLE_90;
- P_SetMobjState(seg, S_REDBOOSTERSEG_FACE);
- seg = P_SpawnMobjFromMobj(mobj, 21*x2, 21*y2, 0, MT_BOOSTERSEG);
- seg->angle = angle;
- P_SetMobjState(seg, S_REDBOOSTERSEG_LEFT);
- seg = P_SpawnMobjFromMobj(mobj, -21*x2, -21*y2, 0, MT_BOOSTERSEG);
- seg->angle = angle;
- P_SetMobjState(seg, S_REDBOOSTERSEG_RIGHT);
-
- seg = P_SpawnMobjFromMobj(mobj, 13*(x1+x2), 13*(y1+y2), 0, MT_BOOSTERROLLER);
- seg->angle = angle;
- P_SetMobjState(seg, S_REDBOOSTERROLLER);
- seg = P_SpawnMobjFromMobj(mobj, 13*(x1-x2), 13*(y1-y2), 0, MT_BOOSTERROLLER);
- seg->angle = angle;
- P_SetMobjState(seg, S_REDBOOSTERROLLER);
- seg = P_SpawnMobjFromMobj(mobj, -13*(x1+x2), -13*(y1+y2), 0, MT_BOOSTERROLLER);
- seg->angle = angle;
- P_SetMobjState(seg, S_REDBOOSTERROLLER);
- seg = P_SpawnMobjFromMobj(mobj, -13*(x1-x2), -13*(y1-y2), 0, MT_BOOSTERROLLER);
- seg->angle = angle;
- P_SetMobjState(seg, S_REDBOOSTERROLLER);
- break;
- }
case MT_YELLOWBOOSTER:
- {
- angle_t angle = FixedAngle(mthing->angle << FRACBITS);
- fixed_t x1 = FINECOSINE((angle >> ANGLETOFINESHIFT) & FINEMASK);
- fixed_t y1 = FINESINE((angle >> ANGLETOFINESHIFT) & FINEMASK);
- fixed_t x2 = FINECOSINE(((angle+ANGLE_90) >> ANGLETOFINESHIFT) & FINEMASK);
- fixed_t y2 = FINESINE(((angle+ANGLE_90) >> ANGLETOFINESHIFT) & FINEMASK);
-
- mobj_t *seg = P_SpawnMobjFromMobj(mobj, 26*x1, 26*y1, 0, MT_BOOSTERSEG);
- seg->angle = angle-ANGLE_90;
- P_SetMobjState(seg, S_YELLOWBOOSTERSEG_FACE);
- seg = P_SpawnMobjFromMobj(mobj, -26*x1, -26*y1, 0, MT_BOOSTERSEG);
- seg->angle = angle+ANGLE_90;
- P_SetMobjState(seg, S_YELLOWBOOSTERSEG_FACE);
- seg = P_SpawnMobjFromMobj(mobj, 21*x2, 21*y2, 0, MT_BOOSTERSEG);
- seg->angle = angle;
- P_SetMobjState(seg, S_YELLOWBOOSTERSEG_LEFT);
- seg = P_SpawnMobjFromMobj(mobj, -21*x2, -21*y2, 0, MT_BOOSTERSEG);
- seg->angle = angle;
- P_SetMobjState(seg, S_YELLOWBOOSTERSEG_RIGHT);
-
- seg = P_SpawnMobjFromMobj(mobj, 13*(x1+x2), 13*(y1+y2), 0, MT_BOOSTERROLLER);
- seg->angle = angle;
- P_SetMobjState(seg, S_YELLOWBOOSTERROLLER);
- seg = P_SpawnMobjFromMobj(mobj, 13*(x1-x2), 13*(y1-y2), 0, MT_BOOSTERROLLER);
- seg->angle = angle;
- P_SetMobjState(seg, S_YELLOWBOOSTERROLLER);
- seg = P_SpawnMobjFromMobj(mobj, -13*(x1+x2), -13*(y1+y2), 0, MT_BOOSTERROLLER);
- seg->angle = angle;
- P_SetMobjState(seg, S_YELLOWBOOSTERROLLER);
- seg = P_SpawnMobjFromMobj(mobj, -13*(x1-x2), -13*(y1-y2), 0, MT_BOOSTERROLLER);
- seg->angle = angle;
- P_SetMobjState(seg, S_YELLOWBOOSTERROLLER);
- break;
- }
- default:
+ if (!P_SetupBooster(mthing, mobj, mobj->type == MT_REDBOOSTER))
+ return false;
break;
- }
-
- if (mobj->flags & MF_BOSS)
- {
- if (mthing->options & MTF_OBJECTSPECIAL) // No egg trap for this boss
- mobj->flags2 |= MF2_BOSSNOTRAP;
- }
+ case MT_AXIS:
+ // Inverted if uppermost bit is set
+ if (mthing->angle & 16384)
+ mobj->flags2 |= MF2_AMBUSH;
- if (i == MT_AXIS || i == MT_AXISTRANSFER || i == MT_AXISTRANSFERLINE) // Axis Points
- {
+ if (mthing->angle > 0)
+ mobj->radius = (mthing->angle & 16383) << FRACBITS;
+ // FALLTHRU
+ case MT_AXISTRANSFER:
+ case MT_AXISTRANSFERLINE:
// Mare it belongs to
mobj->threshold = min(mthing->extrainfo, 7);
@@ -12815,38 +12955,29 @@ ML_EFFECT5 : Don't stop thinking when too far away
mobj->health = mthing->options;
mobj->flags2 |= MF2_AXIS;
-
- if (i == MT_AXIS)
- {
- // Inverted if uppermost bit is set
- if (mthing->angle & 16384)
- mobj->flags2 |= MF2_AMBUSH;
-
- if (mthing->angle > 0)
- mobj->radius = (mthing->angle & 16383)*FRACUNIT;
- }
- }
- else if (i == MT_TOKEN)
- {
+ break;
+ case MT_TOKEN:
// We advanced tokenbits earlier due to the return check.
// Subtract 1 here for the correct value.
mobj->health = 1 << (tokenbits - 1);
- }
- else if (i == MT_CYBRAKDEMON && mthing->options & MTF_AMBUSH)
- {
- mobj_t *elecmobj;
- elecmobj = P_SpawnMobj(x, y, z, MT_CYBRAKDEMON_ELECTRIC_BARRIER);
- P_SetTarget(&elecmobj->target, mobj);
- elecmobj->angle = FixedAngle(mthing->angle<<FRACBITS);;
- elecmobj->destscale = mobj->scale*2;
- P_SetScale(elecmobj, elecmobj->destscale);
- }
- else if (i == MT_STARPOST)
+ break;
+ case MT_CYBRAKDEMON:
+ if (mthing->options & MTF_AMBUSH)
+ {
+ mobj_t* elecmobj;
+ elecmobj = P_SpawnMobj(mobj->x, mobj->y, mobj->z, MT_CYBRAKDEMON_ELECTRIC_BARRIER);
+ P_SetTarget(&elecmobj->target, mobj);
+ elecmobj->angle = FixedAngle(mthing->angle << FRACBITS);
+ elecmobj->destscale = mobj->scale*2;
+ P_SetScale(elecmobj, elecmobj->destscale);
+ }
+ break;
+ case MT_STARPOST:
{
- thinker_t *th;
- mobj_t *mo2;
+ thinker_t* th;
+ mobj_t* mo2;
boolean foundanother = false;
- mobj->health = (mthing->angle / 360) + 1;
+ mobj->health = (mthing->angle/360) + 1;
// See if other starposts exist in this level that have the same value.
for (th = thlist[THINK_MOBJ].next; th != &thlist[THINK_MOBJ]; th = th->next)
@@ -12854,7 +12985,7 @@ ML_EFFECT5 : Don't stop thinking when too far away
if (th->function.acp1 == (actionf_p1)P_RemoveThinkerDelayed)
continue;
- mo2 = (mobj_t *)th;
+ mo2 = (mobj_t*)th;
if (mo2 == mobj)
continue;
@@ -12868,14 +12999,14 @@ ML_EFFECT5 : Don't stop thinking when too far away
if (!foundanother)
numstarposts++;
+ break;
}
- else if (i == MT_SPIKE)
- {
+ case MT_SPIKE:
// Pop up spikes!
if (mthing->options & MTF_OBJECTSPECIAL)
{
mobj->flags &= ~MF_SCENERY;
- mobj->fuse = (16 - mthing->extrainfo) * (mthing->angle + mobj->info->speed) / 16;
+ mobj->fuse = (16 - mthing->extrainfo)*(mthing->angle + mobj->info->speed)/16;
if (mthing->options & MTF_EXTRA)
P_SetMobjState(mobj, mobj->info->meleestate);
}
@@ -12887,14 +13018,13 @@ ML_EFFECT5 : Don't stop thinking when too far away
mobj->flags |= MF_SOLID;
P_SetThingPosition(mobj);
}
- }
- else if (i == MT_WALLSPIKE)
- {
+ break;
+ case MT_WALLSPIKE:
// Pop up spikes!
if (mthing->options & MTF_OBJECTSPECIAL)
{
mobj->flags &= ~MF_SCENERY;
- mobj->fuse = (16 - mthing->extrainfo) * ((mthing->angle/360) + mobj->info->speed) / 16;
+ mobj->fuse = (16 - mthing->extrainfo)*((mthing->angle/360) + mobj->info->speed)/16;
if (mthing->options & MTF_EXTRA)
P_SetMobjState(mobj, mobj->info->meleestate);
}
@@ -12902,64 +13032,51 @@ ML_EFFECT5 : Don't stop thinking when too far away
if (!(mthing->options & MTF_AMBUSH) && !metalrecording)
{
P_UnsetThingPosition(mobj);
- mobj->flags &= ~(MF_NOBLOCKMAP|MF_NOCLIPHEIGHT);
+ mobj->flags &= ~(MF_NOBLOCKMAP | MF_NOCLIPHEIGHT);
mobj->flags |= MF_SOLID;
P_SetThingPosition(mobj);
}
// spawn base
{
- const angle_t mobjangle = FixedAngle(mthing->angle<<FRACBITS); // the mobj's own angle hasn't been set quite yet so...
+ const angle_t mobjangle = FixedAngle(mthing->angle << FRACBITS); // the mobj's own angle hasn't been set quite yet so...
const fixed_t baseradius = mobj->radius - mobj->scale;
- mobj_t *base = P_SpawnMobj(
- mobj->x - P_ReturnThrustX(mobj, mobjangle, baseradius),
- mobj->y - P_ReturnThrustY(mobj, mobjangle, baseradius),
- mobj->z, MT_WALLSPIKEBASE);
+ mobj_t* base = P_SpawnMobj(
+ mobj->x - P_ReturnThrustX(mobj, mobjangle, baseradius),
+ mobj->y - P_ReturnThrustY(mobj, mobjangle, baseradius),
+ mobj->z, MT_WALLSPIKEBASE);
base->angle = mobjangle + ANGLE_90;
base->destscale = mobj->destscale;
P_SetScale(base, mobj->scale);
P_SetTarget(&base->target, mobj);
P_SetTarget(&mobj->tracer, base);
}
- }
-
- //count 10 ring boxes into the number of rings equation too.
- if (i == MT_RING_BOX && nummaprings >= 0)
- nummaprings += 10;
-
- if (i == MT_BIGTUMBLEWEED || i == MT_LITTLETUMBLEWEED)
- {
+ break;
+ case MT_RING_BOX:
+ //count 10 ring boxes into the number of rings equation too.
+ if (nummaprings >= 0)
+ nummaprings += 10;
+ break;
+ case MT_BIGTUMBLEWEED:
+ case MT_LITTLETUMBLEWEED:
if (mthing->options & MTF_AMBUSH)
{
- mobj->momz += FixedMul(16*FRACUNIT, mobj->scale);
-
- if (P_RandomChance(FRACUNIT/2))
- mobj->momx += FixedMul(16*FRACUNIT, mobj->scale);
- else
- mobj->momx -= FixedMul(16*FRACUNIT, mobj->scale);
-
- if (P_RandomChance(FRACUNIT/2))
- mobj->momy += FixedMul(16*FRACUNIT, mobj->scale);
- else
- mobj->momy -= FixedMul(16*FRACUNIT,mobj->scale);
+ fixed_t offset = FixedMul(16*FRACUNIT, mobj->scale);
+ mobj->momx += P_RandomChance(FRACUNIT/2) ? offset : -offset;
+ mobj->momy += P_RandomChance(FRACUNIT/2) ? offset : -offset;
+ mobj->momz += offset;
}
- }
-
- // CTF flag pointers
- if (i == MT_REDFLAG)
- {
+ break;
+ case MT_REDFLAG:
redflag = mobj;
rflagpoint = mobj->spawnpoint;
- }
- if (i == MT_BLUEFLAG)
- {
+ break;
+ case MT_BLUEFLAG:
blueflag = mobj;
bflagpoint = mobj->spawnpoint;
- }
-
- // special push/pull stuff
- if (i == MT_PUSH || i == MT_PULL)
- {
+ break;
+ case MT_PUSH:
+ case MT_PULL:
mobj->health = 0; // Default behaviour: pushing uses XY, fading uses XYZ
if (mthing->options & MTF_AMBUSH)
@@ -12968,92 +13085,110 @@ ML_EFFECT5 : Don't stop thinking when too far away
mobj->health |= 2; // If object special is set, fade using XY
if (G_IsSpecialStage(gamemap))
- {
- if (i == MT_PUSH)
- P_SetMobjState(mobj, S_GRAVWELLGREEN);
- if (i == MT_PULL)
- P_SetMobjState(mobj, S_GRAVWELLRED);
- }
+ P_SetMobjState(mobj, (mobj->type == MT_PUSH) ? S_GRAVWELLGREEN : S_GRAVWELLRED);
+ break;
+ case MT_NIGHTSSTAR:
+ if (maptol & TOL_XMAS)
+ P_SetMobjState(mobj, mobj->info->seestate);
+ break;
+ default:
+ break;
}
- if (doangle)
- mobj->angle = FixedAngle(mthing->angle<<FRACBITS);
+ if (mobj->flags & MF_BOSS)
+ {
+ if (mthing->options & MTF_OBJECTSPECIAL) // No egg trap for this boss
+ mobj->flags2 |= MF2_BOSSNOTRAP;
+ }
- // ignore MTF_ flags and return early
- if (i == MT_NIGHTSBUMPER)
+ return true;
+}
+
+static void P_SetAmbush(mobj_t *mobj)
+{
+ if (mobj->type == MT_YELLOWDIAG || mobj->type == MT_REDDIAG || mobj->type == MT_BLUEDIAG)
+ mobj->angle += ANGLE_22h;
+
+ if (mobj->flags & MF_NIGHTSITEM)
{
- mthing->mobj = mobj;
- return;
+ // Spawn already displayed
+ mobj->flags |= MF_SPECIAL;
+ mobj->flags &= ~MF_NIGHTSITEM;
}
- if ((mthing->options & MTF_AMBUSH)
- && (mthing->options & MTF_OBJECTSPECIAL)
- && (mobj->flags & MF_PUSHABLE))
- mobj->flags2 |= MF2_CLASSICPUSH;
- else
+ if (mobj->flags & MF_PUSHABLE)
+ mobj->flags &= ~MF_PUSHABLE;
+
+ if ((mobj->flags & MF_MONITOR) && mobj->info->speed != 0)
{
- if (mthing->options & MTF_AMBUSH)
- {
- if (i == MT_YELLOWDIAG || i == MT_REDDIAG || i == MT_BLUEDIAG)
- mobj->angle += ANGLE_22h;
+ // flag for strong/weak random boxes
+ // any monitor with nonzero speed is allowed to respawn like this
+ mobj->flags2 |= MF2_AMBUSH;
+ }
- if (i == MT_YELLOWHORIZ || i == MT_REDHORIZ || i == MT_BLUEHORIZ)
- {
- if (mthing->options & MTF_OBJECTFLIP)
- mobj->z -= 16*FRACUNIT;
- else
- mobj->z += 16*FRACUNIT;
- }
+ else if (mobj->type != MT_AXIS &&
+ mobj->type != MT_AXISTRANSFER &&
+ mobj->type != MT_AXISTRANSFERLINE &&
+ mobj->type != MT_NIGHTSBUMPER &&
+ mobj->type != MT_STARPOST)
+ mobj->flags2 |= MF2_AMBUSH;
+}
+
+static void P_SetObjectSpecial(mobj_t *mobj)
+{
+ if (mobj->type == MT_YELLOWDIAG || mobj->type == MT_REDDIAG || mobj->type == MT_BLUEDIAG)
+ mobj->flags |= MF_NOGRAVITY;
+ if ((mobj->flags & MF_MONITOR) && mobj->info->speed != 0)
+ {
+ // flag for strong/weak random boxes
+ // any monitor with nonzero speed is allowed to respawn like this
+ mobj->flags2 |= MF2_STRONGBOX;
+ }
- if (mobj->flags & MF_NIGHTSITEM)
- {
- // Spawn already displayed
- mobj->flags |= MF_SPECIAL;
- mobj->flags &= ~MF_NIGHTSITEM;
- }
+ // Requires you to be in bonus time to activate
+ if (mobj->flags & MF_NIGHTSITEM)
+ mobj->flags2 |= MF2_STRONGBOX;
- if (mobj->flags & MF_PUSHABLE)
- mobj->flags &= ~MF_PUSHABLE;
+ // Pushables bounce and slide coolly with object special flag set
+ if (mobj->flags & MF_PUSHABLE)
+ {
+ mobj->flags2 |= MF2_SLIDEPUSH;
+ mobj->flags |= MF_BOUNCE;
+ }
+}
- if ((mobj->flags & MF_MONITOR) && mobj->info->speed != 0)
- {
- // flag for strong/weak random boxes
- // any monitor with nonzero speed is allowed to respawn like this
- mobj->flags2 |= MF2_AMBUSH;
- }
+static mobj_t *P_SpawnMobjFromMapThing(mapthing_t *mthing, fixed_t x, fixed_t y, fixed_t z, mobjtype_t i)
+{
+ mobj_t *mobj = NULL;
+ boolean doangle = true;
- else if (mthing->type != mobjinfo[MT_AXIS].doomednum &&
- mthing->type != mobjinfo[MT_AXISTRANSFER].doomednum &&
- mthing->type != mobjinfo[MT_AXISTRANSFERLINE].doomednum &&
- mthing->type != mobjinfo[MT_NIGHTSBUMPER].doomednum &&
- mthing->type != mobjinfo[MT_STARPOST].doomednum)
- mobj->flags2 |= MF2_AMBUSH;
- }
+ mobj = P_SpawnMobj(x, y, z, i);
+ mobj->spawnpoint = mthing;
- if (mthing->options & MTF_OBJECTSPECIAL)
- {
- if (i == MT_YELLOWDIAG || i == MT_REDDIAG || i == MT_BLUEDIAG)
- mobj->flags |= MF_NOGRAVITY;
+ if (!P_SetupSpawnedMapThing(mthing, mobj, &doangle))
+ return mobj;
- if ((mobj->flags & MF_MONITOR) && mobj->info->speed != 0)
- {
- // flag for strong/weak random boxes
- // any monitor with nonzero speed is allowed to respawn like this
- mobj->flags2 |= MF2_STRONGBOX;
- }
+ if (doangle)
+ mobj->angle = FixedAngle(mthing->angle << FRACBITS);
- // Requires you to be in bonus time to activate
- if (mobj->flags & MF_NIGHTSITEM)
- mobj->flags2 |= MF2_STRONGBOX;
+ mthing->mobj = mobj;
- // Pushables bounce and slide coolly with object special flag set
- if (mobj->flags & MF_PUSHABLE)
- {
- mobj->flags2 |= MF2_SLIDEPUSH;
- mobj->flags |= MF_BOUNCE;
- }
- }
+ // ignore MTF_ flags and return early
+ if (i == MT_NIGHTSBUMPER)
+ return mobj;
+
+ if ((mthing->options & MTF_AMBUSH)
+ && (mthing->options & MTF_OBJECTSPECIAL)
+ && (mobj->flags & MF_PUSHABLE))
+ mobj->flags2 |= MF2_CLASSICPUSH;
+ else
+ {
+ if (mthing->options & MTF_AMBUSH)
+ P_SetAmbush(mobj);
+
+ if (mthing->options & MTF_OBJECTSPECIAL)
+ P_SetObjectSpecial(mobj);
}
// Generic reverse gravity for individual objects flag.
@@ -13074,582 +13209,337 @@ ML_EFFECT5 : Don't stop thinking when too far away
}
// Final set of not being able to draw nightsitems.
- if (mobj->flags & MF_NIGHTSITEM)
- mobj->flags2 |= MF2_DONTDRAW;
-
- mthing->mobj = mobj;
-}
-
-void P_SpawnHoopsAndRings(mapthing_t *mthing, boolean bonustime)
-{
- mobjtype_t ringthing = MT_RING;
- mobj_t *mobj = NULL;
- INT32 r, i;
- fixed_t x, y, z, finalx, finaly, finalz;
- sector_t *sec;
- TVector v, *res;
- angle_t closestangle, fa;
- boolean nightsreplace = ((maptol & TOL_NIGHTS) && !G_IsSpecialStage(gamemap));
-
- x = mthing->x << FRACBITS;
- y = mthing->y << FRACBITS;
-
- sec = R_PointInSubsector(x, y)->sector;
-
- // NiGHTS hoop!
- if (mthing->type == 1705)
- {
- mobj_t *nextmobj = NULL;
- mobj_t *hoopcenter;
- INT16 spewangle;
-
- z = mthing->options << FRACBITS;
-
- hoopcenter = P_SpawnMobj(x, y, z, MT_HOOPCENTER);
-
- hoopcenter->spawnpoint = mthing;
-
- // Screw these damn hoops, I need this thinker.
- //hoopcenter->flags |= MF_NOTHINK;
-
- z +=
-#ifdef ESLOPE
- sec->f_slope ? P_GetZAt(sec->f_slope, x, y) :
-#endif
- sec->floorheight;
-
- hoopcenter->z = z - hoopcenter->height/2;
-
- P_UnsetThingPosition(hoopcenter);
- hoopcenter->x = x;
- hoopcenter->y = y;
- P_SetThingPosition(hoopcenter);
+ if (mobj->flags & MF_NIGHTSITEM)
+ mobj->flags2 |= MF2_DONTDRAW;
- // Scale 0-255 to 0-359 =(
- closestangle = FixedAngle(FixedMul((mthing->angle>>8)*FRACUNIT,
- 360*(FRACUNIT/256)));
+ return mobj;
+}
- hoopcenter->movedir = FixedInt(FixedMul((mthing->angle&255)*FRACUNIT,
- 360*(FRACUNIT/256)));
- hoopcenter->movecount = FixedInt(AngleFixed(closestangle));
+//
+// P_SpawnMapThing
+// The fields of the mapthing should
+// already be in host byte order.
+//
+mobj_t *P_SpawnMapThing(mapthing_t *mthing)
+{
+ mobjtype_t i;
+ mobj_t *mobj = NULL;
+ fixed_t x, y, z;
- // For the hoop when it flies away
- hoopcenter->extravalue1 = 32;
- hoopcenter->extravalue2 = 8 * FRACUNIT;
+ if (!mthing->type)
+ return mobj; // Ignore type-0 things as NOPs
- spewangle = (INT16)hoopcenter->movedir;
+ if (mthing->type == 3328) // 3D Mode start Thing
+ return mobj;
- // Create the hoop!
- for (i = 0; i < 32; i++)
- {
- fa = i*(FINEANGLES/32);
- v[0] = FixedMul(FINECOSINE(fa),96*FRACUNIT);
- v[1] = 0;
- v[2] = FixedMul(FINESINE(fa),96*FRACUNIT);
- v[3] = FRACUNIT;
+ if (!objectplacing && P_SpawnNonMobjMapThing(mthing))
+ return mobj;
- res = VectorMatrixMultiply(v, *RotateXMatrix(FixedAngle(spewangle*FRACUNIT)));
- M_Memcpy(&v, res, sizeof (v));
- res = VectorMatrixMultiply(v, *RotateZMatrix(closestangle));
- M_Memcpy(&v, res, sizeof (v));
+ i = P_GetMobjtype(mthing->type);
+ if (i == MT_UNKNOWN)
+ CONS_Alert(CONS_WARNING, M_GetText("Unknown thing type %d placed at (%d, %d)\n"), mthing->type, mthing->x, mthing->y);
- finalx = x + v[0];
- finaly = y + v[1];
- finalz = z + v[2];
+ // Skip all returning/substitution code in objectplace.
+ if (!objectplacing)
+ {
+ if (!P_AllowMobjSpawn(mthing, i))
+ return mobj;
- mobj = P_SpawnMobj(finalx, finaly, finalz, MT_HOOP);
+ i = P_GetMobjtypeSubstitute(mthing, i);
+ if (i == MT_NULL) // Don't spawn mobj
+ return mobj;
+ }
- if (maptol & TOL_XMAS)
- P_SetMobjState(mobj, mobj->info->seestate + (i & 1));
+ x = mthing->x << FRACBITS;
+ y = mthing->y << FRACBITS;
+ z = P_GetMapThingSpawnHeight(i, mthing, x, y);
+ return P_SpawnMobjFromMapThing(mthing, x, y, z, i);
+}
- mobj->z -= mobj->height/2;
- P_SetTarget(&mobj->target, hoopcenter); // Link the sprite to the center.
- mobj->fuse = 0;
+static void P_SpawnHoopInternal(mapthing_t *mthing, INT32 hoopsize, fixed_t sizefactor)
+{
+ mobj_t *mobj = NULL;
+ mobj_t *nextmobj = NULL;
+ mobj_t *hoopcenter;
+ TMatrix *pitchmatrix, *yawmatrix;
+ fixed_t radius = hoopsize*sizefactor;
+ INT32 i;
+ angle_t fa;
+ TVector v, *res;
+ fixed_t x = mthing->x << FRACBITS;
+ fixed_t y = mthing->y << FRACBITS;
+ fixed_t z = P_GetMobjSpawnHeight(MT_HOOP, x, y, mthing->z << FRACBITS, false);
- // Link all the sprites in the hoop together
- if (nextmobj)
- {
- P_SetTarget(&mobj->hprev, nextmobj);
- P_SetTarget(&mobj->hprev->hnext, mobj);
- }
- else
- P_SetTarget(&mobj->hprev, P_SetTarget(&mobj->hnext, NULL));
+ hoopcenter = P_SpawnMobj(x, y, z, MT_HOOPCENTER);
+ hoopcenter->spawnpoint = mthing;
+ hoopcenter->z -= hoopcenter->height/2;
- nextmobj = mobj;
- }
+ P_UnsetThingPosition(hoopcenter);
+ hoopcenter->x = x;
+ hoopcenter->y = y;
+ P_SetThingPosition(hoopcenter);
- // Create the collision detectors!
- for (i = 0; i < 16; i++)
- {
- fa = i*FINEANGLES/16;
- v[0] = FixedMul(FINECOSINE(fa),32*FRACUNIT);
- v[1] = 0;
- v[2] = FixedMul(FINESINE(fa),32*FRACUNIT);
- v[3] = FRACUNIT;
- res = VectorMatrixMultiply(v, *RotateXMatrix(FixedAngle(spewangle*FRACUNIT)));
- M_Memcpy(&v, res, sizeof (v));
- res = VectorMatrixMultiply(v, *RotateZMatrix(closestangle));
- M_Memcpy(&v, res, sizeof (v));
+ // Scale 0-255 to 0-359 =(
+ hoopcenter->movedir = ((mthing->angle & 255)*360)/256; // Pitch
+ pitchmatrix = RotateXMatrix(FixedAngle(hoopcenter->movedir << FRACBITS));
+ hoopcenter->movecount = (((UINT16)mthing->angle >> 8)*360)/256; // Yaw
+ yawmatrix = RotateZMatrix(FixedAngle(hoopcenter->movecount << FRACBITS));
- finalx = x + v[0];
- finaly = y + v[1];
- finalz = z + v[2];
+ // For the hoop when it flies away
+ hoopcenter->extravalue1 = hoopsize;
+ hoopcenter->extravalue2 = radius/12;
- mobj = P_SpawnMobj(finalx, finaly, finalz, MT_HOOPCOLLIDE);
- mobj->z -= mobj->height/2;
+ // Create the hoop!
+ for (i = 0; i < hoopsize; i++)
+ {
+ fa = i*(FINEANGLES/hoopsize);
+ v[0] = FixedMul(FINECOSINE(fa), radius);
+ v[1] = 0;
+ v[2] = FixedMul(FINESINE(fa), radius);
+ v[3] = FRACUNIT;
- // Link all the collision sprites together.
- P_SetTarget(&mobj->hnext, NULL);
- P_SetTarget(&mobj->hprev, nextmobj);
- P_SetTarget(&mobj->hprev->hnext, mobj);
+ res = VectorMatrixMultiply(v, *pitchmatrix);
+ M_Memcpy(&v, res, sizeof(v));
+ res = VectorMatrixMultiply(v, *yawmatrix);
+ M_Memcpy(&v, res, sizeof(v));
- nextmobj = mobj;
- }
- // Create the collision detectors!
- for (i = 0; i < 16; i++)
- {
- fa = i*FINEANGLES/16;
- v[0] = FixedMul(FINECOSINE(fa),64*FRACUNIT);
- v[1] = 0;
- v[2] = FixedMul(FINESINE(fa),64*FRACUNIT);
- v[3] = FRACUNIT;
- res = VectorMatrixMultiply(v, *RotateXMatrix(FixedAngle(spewangle*FRACUNIT)));
- M_Memcpy(&v, res, sizeof (v));
- res = VectorMatrixMultiply(v, *RotateZMatrix(closestangle));
- M_Memcpy(&v, res, sizeof (v));
+ mobj = P_SpawnMobj(x + v[0], y + v[1], z + v[2], MT_HOOP);
+ mobj->z -= mobj->height/2;
- finalx = x + v[0];
- finaly = y + v[1];
- finalz = z + v[2];
+ if (maptol & TOL_XMAS)
+ P_SetMobjState(mobj, mobj->info->seestate + (i & 1));
- mobj = P_SpawnMobj(finalx, finaly, finalz, MT_HOOPCOLLIDE);
- mobj->z -= mobj->height/2;
+ P_SetTarget(&mobj->target, hoopcenter); // Link the sprite to the center.
+ mobj->fuse = 0;
- // Link all the collision sprites together.
- P_SetTarget(&mobj->hnext, NULL);
+ // Link all the sprites in the hoop together
+ if (nextmobj)
+ {
P_SetTarget(&mobj->hprev, nextmobj);
P_SetTarget(&mobj->hprev->hnext, mobj);
-
- nextmobj = mobj;
}
- return;
- }
- // CUSTOMIZABLE NiGHTS hoop!
- else if (mthing->type == 1713)
- {
- mobj_t *nextmobj = NULL;
- mobj_t *hoopcenter;
- INT16 spewangle;
- INT32 hoopsize;
- INT32 hoopplacement;
-
- // Save our flags!
- z = (mthing->options>>ZSHIFT) << FRACBITS;
-
- hoopcenter = P_SpawnMobj(x, y, z, MT_HOOPCENTER);
- hoopcenter->spawnpoint = mthing;
-
- z +=
-#ifdef ESLOPE
- sec->f_slope ? P_GetZAt(sec->f_slope, x, y) :
-#endif
- sec->floorheight;
- hoopcenter->z = z - hoopcenter->height/2;
-
- P_UnsetThingPosition(hoopcenter);
- hoopcenter->x = x;
- hoopcenter->y = y;
- P_SetThingPosition(hoopcenter);
-
- // Scale 0-255 to 0-359 =(
- closestangle = FixedAngle(FixedMul((mthing->angle>>8)*FRACUNIT,
- 360*(FRACUNIT/256)));
-
- hoopcenter->movedir = FixedInt(FixedMul((mthing->angle&255)*FRACUNIT,
- 360*(FRACUNIT/256)));
- hoopcenter->movecount = FixedInt(AngleFixed(closestangle));
+ else
+ P_SetTarget(&mobj->hprev, P_SetTarget(&mobj->hnext, NULL));
- spewangle = (INT16)hoopcenter->movedir;
+ nextmobj = mobj;
+ }
- // Super happy fun time
- // For each flag add 4 fracunits to the size
- // Default (0 flags) is 8 fracunits
- hoopsize = 8 + (4 * (mthing->options & 0xF));
- hoopplacement = hoopsize * (4*FRACUNIT);
+ // Create the collision detectors!
+ // Create them until the size is less than 8
+ // But always create at least ONE set of collision detectors
+ do
+ {
+ if (hoopsize >= 32)
+ hoopsize -= 16;
+ else
+ hoopsize /= 2;
- // For the hoop when it flies away
- hoopcenter->extravalue1 = hoopsize;
- hoopcenter->extravalue2 = FixedDiv(hoopplacement, 12*FRACUNIT);
+ radius = hoopsize*sizefactor;
- // Create the hoop!
for (i = 0; i < hoopsize; i++)
{
fa = i*(FINEANGLES/hoopsize);
- v[0] = FixedMul(FINECOSINE(fa), hoopplacement);
+ v[0] = FixedMul(FINECOSINE(fa), radius);
v[1] = 0;
- v[2] = FixedMul(FINESINE(fa), hoopplacement);
+ v[2] = FixedMul(FINESINE(fa), radius);
v[3] = FRACUNIT;
- res = VectorMatrixMultiply(v, *RotateXMatrix(FixedAngle(spewangle*FRACUNIT)));
- M_Memcpy(&v, res, sizeof (v));
- res = VectorMatrixMultiply(v, *RotateZMatrix(closestangle));
- M_Memcpy(&v, res, sizeof (v));
-
- finalx = x + v[0];
- finaly = y + v[1];
- finalz = z + v[2];
-
- mobj = P_SpawnMobj(finalx, finaly, finalz, MT_HOOP);
-
- if (maptol & TOL_XMAS)
- P_SetMobjState(mobj, mobj->info->seestate + (i & 1));
+ res = VectorMatrixMultiply(v, *pitchmatrix);
+ M_Memcpy(&v, res, sizeof(v));
+ res = VectorMatrixMultiply(v, *yawmatrix);
+ M_Memcpy(&v, res, sizeof(v));
+ mobj = P_SpawnMobj(x + v[0], y + v[1], z + v[2], MT_HOOPCOLLIDE);
mobj->z -= mobj->height/2;
- P_SetTarget(&mobj->target, hoopcenter); // Link the sprite to the center.
- mobj->fuse = 0;
- // Link all the sprites in the hoop together
- if (nextmobj)
- {
- P_SetTarget(&mobj->hprev, nextmobj);
- P_SetTarget(&mobj->hprev->hnext, mobj);
- }
- else
- P_SetTarget(&mobj->hprev, P_SetTarget(&mobj->hnext, NULL));
+ // Link all the collision sprites together.
+ P_SetTarget(&mobj->hnext, NULL);
+ P_SetTarget(&mobj->hprev, nextmobj);
+ P_SetTarget(&mobj->hprev->hnext, mobj);
nextmobj = mobj;
}
+ } while (hoopsize >= 8);
+}
- // Create the collision detectors!
- // Create them until the size is less than 8
- // But always create at least ONE set of collision detectors
- do
- {
- if (hoopsize >= 32)
- hoopsize -= 16;
- else
- hoopsize /= 2;
-
- hoopplacement = hoopsize * (4*FRACUNIT);
-
- for (i = 0; i < hoopsize; i++)
- {
- fa = i*FINEANGLES/hoopsize;
- v[0] = FixedMul(FINECOSINE(fa), hoopplacement);
- v[1] = 0;
- v[2] = FixedMul(FINESINE(fa), hoopplacement);
- v[3] = FRACUNIT;
- res = VectorMatrixMultiply(v, *RotateXMatrix(FixedAngle(spewangle*FRACUNIT)));
- M_Memcpy(&v, res, sizeof (v));
- res = VectorMatrixMultiply(v, *RotateZMatrix(closestangle));
- M_Memcpy(&v, res, sizeof (v));
-
- finalx = x + v[0];
- finaly = y + v[1];
- finalz = z + v[2];
-
- mobj = P_SpawnMobj(finalx, finaly, finalz, MT_HOOPCOLLIDE);
- mobj->z -= mobj->height/2;
-
- // Link all the collision sprites together.
- P_SetTarget(&mobj->hnext, NULL);
- P_SetTarget(&mobj->hprev, nextmobj);
- P_SetTarget(&mobj->hprev->hnext, mobj);
+void P_SpawnHoop(mapthing_t *mthing)
+{
+ if (metalrecording)
+ return;
- nextmobj = mobj;
- }
- } while (hoopsize >= 8);
+ if (mthing->type == 1705) // Generic hoop
+ P_SpawnHoopInternal(mthing, 24, 4*FRACUNIT);
+ else // Customizable hoop
+ // For each flag add 16 fracunits to the size
+ // Default (0 flags) is 32 fracunits
+ P_SpawnHoopInternal(mthing, 8 + (4*(mthing->options & 0xF)), 4*FRACUNIT);
+}
+void P_SetBonusTime(mobj_t *mobj)
+{
+ if (!mobj)
return;
- }
- // ***
- // Special placement patterns
- // ***
-
- // Vertical Rings - Stack of 5 (handles both red and yellow)
- else if (mthing->type == 600 || mthing->type == 601)
- {
- INT32 dist = 64*FRACUNIT;
- if (mthing->type == 601)
- dist = 128*FRACUNIT;
- if (ultimatemode)
- return; // No rings in Ultimate!
+ if (mobj->type != MT_BLUESPHERE && mobj->type != MT_NIGHTSCHIP)
+ return;
- if (nightsreplace)
- ringthing = MT_NIGHTSSTAR;
+ P_SetMobjState(mobj, mobj->info->raisestate);
+}
- if (mthing->options & MTF_OBJECTFLIP)
- {
- z = (
-#ifdef ESLOPE
- sec->c_slope ? P_GetZAt(sec->c_slope, x, y) :
-#endif
- sec->ceilingheight) - mobjinfo[ringthing].height;
- if (mthing->options >> ZSHIFT)
- z -= ((mthing->options >> ZSHIFT) << FRACBITS);
- }
- else
- {
- z = (
-#ifdef ESLOPE
- sec->f_slope ? P_GetZAt(sec->f_slope, x, y) :
-#endif
- sec->floorheight);
- if (mthing->options >> ZSHIFT)
- z += ((mthing->options >> ZSHIFT) << FRACBITS);
- }
+static void P_SpawnItemRow(mapthing_t *mthing, mobjtype_t* itemtypes, UINT8 numitemtypes, INT32 numitems, fixed_t horizontalspacing, fixed_t verticalspacing, INT16 fixedangle, boolean bonustime)
+{
+ mapthing_t dummything;
+ mobj_t *mobj = NULL;
+ fixed_t x = mthing->x << FRACBITS;
+ fixed_t y = mthing->y << FRACBITS;
+ fixed_t z = mthing->z << FRACBITS;
+ INT32 r;
+ angle_t angle = FixedAngle(fixedangle << FRACBITS);
+ angle_t fineangle = (angle >> ANGLETOFINESHIFT) & FINEMASK;
- for (r = 1; r <= 5; r++)
+ for (r = 0; r < numitemtypes; r++)
+ {
+ dummything = *mthing;
+ dummything.type = mobjinfo[itemtypes[r]].doomednum;
+ // Skip all returning/substitution code in objectplace.
+ if (!objectplacing)
{
- if (mthing->options & MTF_OBJECTFLIP)
- z -= dist;
- else
- z += dist;
-
- mobj = P_SpawnMobj(x, y, z, ringthing);
-
- if (mthing->options & MTF_OBJECTFLIP)
+ if (!P_AllowMobjSpawn(&dummything, itemtypes[r]))
{
- mobj->eflags |= MFE_VERTICALFLIP;
- mobj->flags2 |= MF2_OBJECTFLIP;
+ itemtypes[r] = MT_NULL;
+ continue;
}
- mobj->angle = FixedAngle(mthing->angle*FRACUNIT);
- if (mthing->options & MTF_AMBUSH)
- mobj->flags2 |= MF2_AMBUSH;
-
- if ((maptol & TOL_XMAS) && (ringthing == MT_NIGHTSSTAR))
- P_SetMobjState(mobj, mobj->info->seestate);
+ itemtypes[r] = P_GetMobjtypeSubstitute(&dummything, itemtypes[r]);
}
}
- // Diagonal rings (handles both types)
- else if (mthing->type == 602 || mthing->type == 603) // Diagonal rings (5)
- {
- INT32 iterations = 5;
- if (mthing->type == 603)
- iterations = 10;
-
- if (ultimatemode)
- return; // No rings in Ultimate!
-
- if (nightsreplace)
- ringthing = MT_NIGHTSSTAR;
-
- closestangle = FixedAngle(mthing->angle*FRACUNIT);
- fa = (closestangle >> ANGLETOFINESHIFT);
-
- if (mthing->options & MTF_OBJECTFLIP)
- {
- z = (
-#ifdef ESLOPE
- sec->c_slope ? P_GetZAt(sec->c_slope, x, y) :
-#endif
- sec->ceilingheight) - mobjinfo[ringthing].height;
- if (mthing->options >> ZSHIFT)
- z -= ((mthing->options >> ZSHIFT) << FRACBITS);
- }
- else
- {
- z = (
-#ifdef ESLOPE
- sec->f_slope ? P_GetZAt(sec->f_slope, x, y) :
-#endif
- sec->floorheight);
- if (mthing->options >> ZSHIFT)
- z += ((mthing->options >> ZSHIFT) << FRACBITS);
- }
+ z = P_GetMobjSpawnHeight(itemtypes[0], x, y, z, mthing->options & MTF_OBJECTFLIP);
- for (r = 1; r <= iterations; r++)
- {
- x += FixedMul(64*FRACUNIT, FINECOSINE(fa));
- y += FixedMul(64*FRACUNIT, FINESINE(fa));
-
- if (mthing->options & MTF_OBJECTFLIP)
- z -= 64*FRACUNIT;
- else
- z += 64*FRACUNIT;
+ for (r = 0; r < numitems; r++)
+ {
+ mobjtype_t itemtype = itemtypes[r % numitemtypes];
+ if (itemtype == MT_NULL)
+ continue;
+ dummything.type = mobjinfo[itemtype].doomednum;
- mobj = P_SpawnMobj(x, y, z, ringthing);
+ x += FixedMul(horizontalspacing, FINECOSINE(fineangle));
+ y += FixedMul(horizontalspacing, FINESINE(fineangle));
+ z += (mthing->options & MTF_OBJECTFLIP) ? -verticalspacing : verticalspacing;
- if (mthing->options & MTF_OBJECTFLIP)
- {
- mobj->eflags |= MFE_VERTICALFLIP;
- mobj->flags2 |= MF2_OBJECTFLIP;
- }
+ mobj = P_SpawnMobjFromMapThing(&dummything, x, y, z, itemtype);
- mobj->angle = closestangle;
- if (mthing->options & MTF_AMBUSH)
- mobj->flags2 |= MF2_AMBUSH;
+ if (!mobj)
+ continue;
- if ((maptol & TOL_XMAS) && (ringthing == MT_NIGHTSSTAR))
- P_SetMobjState(mobj, mobj->info->seestate);
- }
+ mobj->spawnpoint = NULL;
+ if (bonustime)
+ P_SetBonusTime(mobj);
}
- // Rings of items (all six of them)
- else if (mthing->type >= 604 && mthing->type <= 609)
- {
- INT32 numitems = 8;
- INT32 size = 96*FRACUNIT;
-
- if (mthing->type & 1)
- {
- numitems = 16;
- size = 192*FRACUNIT;
- }
-
- z =
-#ifdef ESLOPE
- sec->f_slope ? P_GetZAt(sec->f_slope, x, y) :
-#endif
- sec->floorheight;
- if (mthing->options >> ZSHIFT)
- z += ((mthing->options >> ZSHIFT) << FRACBITS);
+}
- closestangle = FixedAngle(mthing->angle*FRACUNIT);
+static void P_SpawnSingularItemRow(mapthing_t* mthing, mobjtype_t itemtype, INT32 numitems, fixed_t horizontalspacing, fixed_t verticalspacing, INT16 fixedangle, boolean bonustime)
+{
+ mobjtype_t itemtypes[1] = { itemtype };
+ return P_SpawnItemRow(mthing, itemtypes, 1, numitems, horizontalspacing, verticalspacing, fixedangle, bonustime);
+}
- switch (mthing->type)
- {
- case 604:
- case 605:
- if (ultimatemode)
- return; // No rings in Ultimate!
- if (nightsreplace)
- ringthing = MT_NIGHTSSTAR;
- break;
- case 608:
- case 609:
- /*ringthing = (i & 1) ? MT_RING : MT_BLUESPHERE; -- i == 0 is bluesphere
- break;*/
- case 606:
- case 607:
- ringthing = (nightsreplace) ? MT_NIGHTSCHIP : MT_BLUESPHERE;
- break;
- default:
- break;
- }
+static void P_SpawnItemCircle(mapthing_t *mthing, mobjtype_t *itemtypes, UINT8 numitemtypes, INT32 numitems, fixed_t size, boolean bonustime)
+{
+ mapthing_t dummything;
+ mobj_t* mobj = NULL;
+ fixed_t x = mthing->x << FRACBITS;
+ fixed_t y = mthing->y << FRACBITS;
+ fixed_t z = mthing->z << FRACBITS;
+ angle_t angle = FixedAngle(mthing->angle << FRACBITS);
+ angle_t fa;
+ INT32 i;
+ TVector v, *res;
- // Create the hoop!
- for (i = 0; i < numitems; i++)
+ for (i = 0; i < numitemtypes; i++)
+ {
+ dummything = *mthing;
+ dummything.type = mobjinfo[itemtypes[i]].doomednum;
+ // Skip all returning/substitution code in objectplace.
+ if (!objectplacing)
{
- if (mthing->type == 608 || mthing->type == 609)
- {
- if (i & 1)
- {
- if (ultimatemode)
- continue; // No rings in Ultimate!
- ringthing = (nightsreplace) ? MT_NIGHTSSTAR : MT_RING;
- }
- else
- ringthing = (nightsreplace) ? MT_NIGHTSCHIP : MT_BLUESPHERE;
- }
-
- fa = i*FINEANGLES/numitems;
- v[0] = FixedMul(FINECOSINE(fa),size);
- v[1] = 0;
- v[2] = FixedMul(FINESINE(fa),size);
- v[3] = FRACUNIT;
-
- res = VectorMatrixMultiply(v, *RotateZMatrix(closestangle));
- M_Memcpy(&v, res, sizeof (v));
-
- finalx = x + v[0];
- finaly = y + v[1];
- finalz = z + v[2];
-
- mobj = P_SpawnMobj(finalx, finaly, finalz, ringthing);
- mobj->z -= mobj->height/2;
-
- if (mthing->options & MTF_OBJECTFLIP)
+ if (!P_AllowMobjSpawn(&dummything, itemtypes[i]))
{
- mobj->eflags |= MFE_VERTICALFLIP;
- mobj->flags2 |= MF2_OBJECTFLIP;
+ itemtypes[i] = MT_NULL;
+ continue;
}
- mobj->angle = closestangle;
- if (mthing->options & MTF_AMBUSH)
- mobj->flags2 |= MF2_AMBUSH;
-
- if (bonustime && (ringthing == MT_BLUESPHERE || ringthing == MT_NIGHTSCHIP))
- P_SetMobjState(mobj, mobj->info->raisestate);
- else if ((maptol & TOL_XMAS) && (ringthing == MT_NIGHTSSTAR))
- P_SetMobjState(mobj, mobj->info->seestate);
+ itemtypes[i] = P_GetMobjtypeSubstitute(&dummything, itemtypes[i]);
}
}
- // All manners of rings and coins
- else
- {
+ z = P_GetMobjSpawnHeight(itemtypes[0], x, y, z, false);
- // Which ringthing to use
- if (mthing->type == mobjinfo[MT_BLUESPHERE].doomednum)
- ringthing = (nightsreplace) ? MT_NIGHTSCHIP : MT_BLUESPHERE;
- else if (mthing->type == mobjinfo[MT_BOMBSPHERE].doomednum)
- ringthing = MT_BOMBSPHERE;
- else
- {
- if (ultimatemode)
- return; // No rings in Ultimate!
-
- if (nightsreplace)
- ringthing = MT_NIGHTSSTAR;
- else if (mthing->type == mobjinfo[MT_COIN].doomednum)
- ringthing = MT_COIN;
- else if (mthing->type == mobjinfo[MT_REDTEAMRING].doomednum) // No team rings in non-CTF
- ringthing = (gametype == GT_CTF) ? MT_REDTEAMRING : MT_RING;
- else if (mthing->type == mobjinfo[MT_BLUETEAMRING].doomednum) // Ditto
- ringthing = (gametype == GT_CTF) ? MT_BLUETEAMRING : MT_RING;
- }
-
- // Set proper height
- if (mthing->options & MTF_OBJECTFLIP)
- {
- z = (
-#ifdef ESLOPE
- sec->c_slope ? P_GetZAt(sec->c_slope, x, y) :
-#endif
- sec->ceilingheight) - mobjinfo[ringthing].height;
- if (mthing->options >> ZSHIFT)
- z -= ((mthing->options >> ZSHIFT) << FRACBITS);
- }
- else
- {
- z =
-#ifdef ESLOPE
- sec->f_slope ? P_GetZAt(sec->f_slope, x, y) :
-#endif
- sec->floorheight;
- if (mthing->options >> ZSHIFT)
- z += ((mthing->options >> ZSHIFT) << FRACBITS);
- }
+ for (i = 0; i < numitems; i++)
+ {
+ mobjtype_t itemtype = itemtypes[i % numitemtypes];
+ if (itemtype == MT_NULL)
+ continue;
+ dummything.type = mobjinfo[itemtype].doomednum;
- if (mthing->options & MTF_AMBUSH) // Special flag for rings
- {
- if (mthing->options & MTF_OBJECTFLIP)
- z -= 24*FRACUNIT;
- else
- z += 24*FRACUNIT;
- }
+ fa = i*FINEANGLES/numitems;
+ v[0] = FixedMul(FINECOSINE(fa), size);
+ v[1] = 0;
+ v[2] = FixedMul(FINESINE(fa), size);
+ v[3] = FRACUNIT;
- mthing->z = (INT16)(z>>FRACBITS);
+ res = VectorMatrixMultiply(v, *RotateZMatrix(angle));
+ M_Memcpy(&v, res, sizeof(v));
- mobj = P_SpawnMobj(x, y, z, ringthing);
- mobj->spawnpoint = mthing;
+ mobj = P_SpawnMobjFromMapThing(&dummything, x + v[0], y + v[1], z + v[2], itemtype);
- if (mthing->options & MTF_OBJECTFLIP)
- {
- mobj->eflags |= MFE_VERTICALFLIP;
- mobj->flags2 |= MF2_OBJECTFLIP;
- }
+ if (!mobj)
+ continue;
- mobj->angle = FixedAngle(mthing->angle*FRACUNIT);
- mthing->mobj = mobj;
- if (mthing->options & MTF_AMBUSH)
- mobj->flags2 |= MF2_AMBUSH;
+ mobj->z -= mobj->height/2;
+ mobj->spawnpoint = NULL;
+ if (bonustime)
+ P_SetBonusTime(mobj);
+ }
+}
- if (bonustime && (ringthing == MT_BLUESPHERE || ringthing == MT_NIGHTSCHIP))
- P_SetMobjState(mobj, mobj->info->raisestate);
- else if ((maptol & TOL_XMAS) && (ringthing == MT_NIGHTSSTAR))
- P_SetMobjState(mobj, mobj->info->seestate);
+void P_SpawnItemPattern(mapthing_t *mthing, boolean bonustime)
+{
+ switch (mthing->type)
+ {
+ // Special placement patterns
+ case 600: // 5 vertical rings (yellow spring)
+ P_SpawnSingularItemRow(mthing, MT_RING, 5, 0, 64*FRACUNIT, 0, bonustime);
+ return;
+ case 601: // 5 vertical rings (red spring)
+ P_SpawnSingularItemRow(mthing, MT_RING, 5, 0, 128*FRACUNIT, 0, bonustime);
+ return;
+ case 602: // 5 diagonal rings (yellow spring)
+ P_SpawnSingularItemRow(mthing, MT_RING, 5, 64*FRACUNIT, 64*FRACUNIT, mthing->angle, bonustime);
+ return;
+ case 603: // 10 diagonal rings (red spring)
+ P_SpawnSingularItemRow(mthing, MT_RING, 10, 64*FRACUNIT, 64*FRACUNIT, mthing->angle, bonustime);
+ return;
+ case 604: // Circle of rings (8 items)
+ case 605: // Circle of rings (16 items)
+ case 606: // Circle of blue spheres (8 items)
+ case 607: // Circle of blue spheres (16 items)
+ {
+ INT32 numitems = (mthing->type & 1) ? 16 : 8;
+ fixed_t size = (mthing->type & 1) ? 192*FRACUNIT : 96*FRACUNIT;
+ mobjtype_t itemtypes[1] = { (mthing->type < 606) ? MT_RING : MT_BLUESPHERE };
+ P_SpawnItemCircle(mthing, itemtypes, 1, numitems, size, bonustime);
+ return;
+ }
+ case 608: // Circle of rings and blue spheres (8 items)
+ case 609: // Circle of rings and blue spheres (16 items)
+ {
+ INT32 numitems = (mthing->type & 1) ? 16 : 8;
+ fixed_t size = (mthing->type & 1) ? 192*FRACUNIT : 96*FRACUNIT;
+ mobjtype_t itemtypes[2] = { MT_RING, MT_BLUESPHERE };
+ P_SpawnItemCircle(mthing, itemtypes, 2, numitems, size, bonustime);
+ return;
+ }
+ default:
+ return;
}
}
diff --git a/src/p_mobj.h b/src/p_mobj.h
index 744578d01a4eee9f843c73e421c49a0e9e9057f0..92160d9e2d70f4634d90d47feed67cfa5940b1a9 100644
--- a/src/p_mobj.h
+++ b/src/p_mobj.h
@@ -452,8 +452,10 @@ void P_MovePlayerToSpawn(INT32 playernum, mapthing_t *mthing);
void P_MovePlayerToStarpost(INT32 playernum);
void P_AfterPlayerSpawn(INT32 playernum);
-void P_SpawnMapThing(mapthing_t *mthing);
-void P_SpawnHoopsAndRings(mapthing_t *mthing, boolean bonustime);
+mobj_t *P_SpawnMapThing(mapthing_t *mthing);
+void P_SpawnHoop(mapthing_t *mthing);
+void P_SetBonusTime(mobj_t *mobj);
+void P_SpawnItemPattern(mapthing_t *mthing, boolean bonustime);
void P_SpawnHoopOfSomething(fixed_t x, fixed_t y, fixed_t z, fixed_t radius, INT32 number, mobjtype_t type, angle_t rotangle);
void P_SpawnPrecipitation(void);
void P_SpawnParaloop(fixed_t x, fixed_t y, fixed_t z, fixed_t radius, INT32 number, mobjtype_t type, statenum_t nstate, angle_t rotangle, boolean spawncenter);
diff --git a/src/p_saveg.c b/src/p_saveg.c
index 068ac0295be692842f0b7e36539c19a75ed186e9..85efacf8852195302cd1023ceff75733f4cc04bc 100644
--- a/src/p_saveg.c
+++ b/src/p_saveg.c
@@ -777,14 +777,13 @@ static void P_NetArchiveWorld(void)
size_t i;
INT32 statsec = 0, statline = 0;
const line_t *li = lines;
+ const line_t *spawnli = spawnlines;
const side_t *si;
+ const side_t *spawnsi;
UINT8 *put;
- // reload the map just to see difference
- mapsector_t *ms;
- mapsidedef_t *msd;
- maplinedef_t *mld;
const sector_t *ss = sectors;
+ const sector_t *spawnss = spawnsectors;
UINT8 diff, diff2, diff3;
// initialize colormap vars because paranoia
@@ -793,65 +792,45 @@ static void P_NetArchiveWorld(void)
WRITEUINT32(save_p, ARCHIVEBLOCK_WORLD);
put = save_p;
- if (W_IsLumpWad(lastloadedmaplumpnum)) // welp it's a map wad in a pk3
- { // HACK: Open wad file rather quickly so we can get the data from the relevant lumps
- UINT8 *wadData = W_CacheLumpNum(lastloadedmaplumpnum, PU_STATIC);
- filelump_t *fileinfo = (filelump_t *)(wadData + ((wadinfo_t *)wadData)->infotableofs);
-#define retrieve_mapdata(d, f)\
- d = Z_Malloc((f)->size, PU_CACHE, NULL); \
- M_Memcpy(d, wadData + (f)->filepos, (f)->size)
- retrieve_mapdata(ms, fileinfo + ML_SECTORS);
- retrieve_mapdata(mld, fileinfo + ML_LINEDEFS);
- retrieve_mapdata(msd, fileinfo + ML_SIDEDEFS);
-#undef retrieve_mapdata
- Z_Free(wadData); // we're done with this now
- }
- else // phew it's just a WAD
- {
- ms = W_CacheLumpNum(lastloadedmaplumpnum+ML_SECTORS, PU_CACHE);
- mld = W_CacheLumpNum(lastloadedmaplumpnum+ML_LINEDEFS, PU_CACHE);
- msd = W_CacheLumpNum(lastloadedmaplumpnum+ML_SIDEDEFS, PU_CACHE);
- }
-
- for (i = 0; i < numsectors; i++, ss++, ms++)
+ for (i = 0; i < numsectors; i++, ss++, spawnss++)
{
diff = diff2 = diff3 = 0;
- if (ss->floorheight != SHORT(ms->floorheight)<<FRACBITS)
+ if (ss->floorheight != spawnss->floorheight)
diff |= SD_FLOORHT;
- if (ss->ceilingheight != SHORT(ms->ceilingheight)<<FRACBITS)
+ if (ss->ceilingheight != spawnss->ceilingheight)
diff |= SD_CEILHT;
//
// flats
//
- if (ss->floorpic != P_CheckLevelFlat(ms->floorpic))
+ if (ss->floorpic != spawnss->floorpic)
diff |= SD_FLOORPIC;
- if (ss->ceilingpic != P_CheckLevelFlat(ms->ceilingpic))
+ if (ss->ceilingpic != spawnss->ceilingpic)
diff |= SD_CEILPIC;
- if (ss->lightlevel != SHORT(ms->lightlevel))
+ if (ss->lightlevel != spawnss->lightlevel)
diff |= SD_LIGHT;
- if (ss->special != SHORT(ms->special))
+ if (ss->special != spawnss->special)
diff |= SD_SPECIAL;
- if (ss->floor_xoffs != ss->spawn_flr_xoffs)
+ if (ss->floor_xoffs != spawnss->floor_xoffs)
diff2 |= SD_FXOFFS;
- if (ss->floor_yoffs != ss->spawn_flr_yoffs)
+ if (ss->floor_yoffs != spawnss->floor_yoffs)
diff2 |= SD_FYOFFS;
- if (ss->ceiling_xoffs != ss->spawn_ceil_xoffs)
+ if (ss->ceiling_xoffs != spawnss->ceiling_xoffs)
diff2 |= SD_CXOFFS;
- if (ss->ceiling_yoffs != ss->spawn_ceil_yoffs)
+ if (ss->ceiling_yoffs != spawnss->ceiling_yoffs)
diff2 |= SD_CYOFFS;
- if (ss->floorpic_angle != ss->spawn_flrpic_angle)
+ if (ss->floorpic_angle != spawnss->floorpic_angle)
diff2 |= SD_FLOORANG;
- if (ss->ceilingpic_angle != ss->spawn_flrpic_angle)
+ if (ss->ceilingpic_angle != spawnss->ceilingpic_angle)
diff2 |= SD_CEILANG;
- if (ss->tag != SHORT(ms->tag))
+ if (ss->tag != spawnss->tag)
diff2 |= SD_TAG;
- if (ss->nexttag != ss->spawn_nexttag || ss->firsttag != ss->spawn_firsttag)
+ if (ss->nexttag != spawnss->nexttag || ss->firsttag != spawnss->firsttag)
diff3 |= SD_TAGLIST;
- if (ss->extra_colormap != ss->spawn_extra_colormap)
+ if (ss->extra_colormap != spawnss->extra_colormap)
diff3 |= SD_COLORMAP;
// Check if any of the sector's FOFs differ from how they spawned
@@ -955,45 +934,41 @@ static void P_NetArchiveWorld(void)
WRITEUINT16(put, 0xffff);
// do lines
- for (i = 0; i < numlines; i++, mld++, li++)
+ for (i = 0; i < numlines; i++, spawnli++, li++)
{
diff = diff2 = diff3 = 0;
- if (li->special != SHORT(mld->special))
+ if (li->special != spawnli->special)
diff |= LD_SPECIAL;
- if (SHORT(mld->special) == 321 || SHORT(mld->special) == 322) // only reason li->callcount would be non-zero is if either of these are involved
+ if (spawnli->special == 321 || spawnli->special == 322) // only reason li->callcount would be non-zero is if either of these are involved
diff |= LD_CLLCOUNT;
if (li->sidenum[0] != 0xffff)
{
si = &sides[li->sidenum[0]];
- if (si->textureoffset != SHORT(msd[li->sidenum[0]].textureoffset)<<FRACBITS)
+ spawnsi = &spawnsides[li->sidenum[0]];
+ if (si->textureoffset != spawnsi->textureoffset)
diff |= LD_S1TEXOFF;
//SoM: 4/1/2000: Some textures are colormaps. Don't worry about invalid textures.
- if (R_CheckTextureNumForName(msd[li->sidenum[0]].toptexture) != -1
- && si->toptexture != R_TextureNumForName(msd[li->sidenum[0]].toptexture))
+ if (si->toptexture != spawnsi->toptexture)
diff |= LD_S1TOPTEX;
- if (R_CheckTextureNumForName(msd[li->sidenum[0]].bottomtexture) != -1
- && si->bottomtexture != R_TextureNumForName(msd[li->sidenum[0]].bottomtexture))
+ if (si->bottomtexture != spawnsi->bottomtexture)
diff |= LD_S1BOTTEX;
- if (R_CheckTextureNumForName(msd[li->sidenum[0]].midtexture) != -1
- && si->midtexture != R_TextureNumForName(msd[li->sidenum[0]].midtexture))
+ if (si->midtexture != spawnsi->midtexture)
diff |= LD_S1MIDTEX;
}
if (li->sidenum[1] != 0xffff)
{
si = &sides[li->sidenum[1]];
- if (si->textureoffset != SHORT(msd[li->sidenum[1]].textureoffset)<<FRACBITS)
+ spawnsi = &spawnsides[li->sidenum[1]];
+ if (si->textureoffset != spawnsi->textureoffset)
diff2 |= LD_S2TEXOFF;
- if (R_CheckTextureNumForName(msd[li->sidenum[1]].toptexture) != -1
- && si->toptexture != R_TextureNumForName(msd[li->sidenum[1]].toptexture))
+ if (si->toptexture != spawnsi->toptexture)
diff2 |= LD_S2TOPTEX;
- if (R_CheckTextureNumForName(msd[li->sidenum[1]].bottomtexture) != -1
- && si->bottomtexture != R_TextureNumForName(msd[li->sidenum[1]].bottomtexture))
+ if (si->bottomtexture != spawnsi->bottomtexture)
diff2 |= LD_S2BOTTEX;
- if (R_CheckTextureNumForName(msd[li->sidenum[1]].midtexture) != -1
- && si->midtexture != R_TextureNumForName(msd[li->sidenum[1]].midtexture))
+ if (si->midtexture != spawnsi->midtexture)
diff2 |= LD_S2MIDTEX;
if (diff2)
diff |= LD_DIFF2;
@@ -2557,7 +2532,7 @@ static thinker_t* LoadMobjThinker(actionf_p1 thinker)
if (mapthings[spawnpointnum].type == 1705 || mapthings[spawnpointnum].type == 1713) // NiGHTS Hoop special case
{
- P_SpawnHoopsAndRings(&mapthings[spawnpointnum], false);
+ P_SpawnHoop(&mapthings[spawnpointnum]);
return NULL;
}
diff --git a/src/p_setup.c b/src/p_setup.c
index bf3493d8c2ab5c99ccf79cbceeb8393b71b29a73..9acc4adb3ca6d59607ee03fb5a839fe8622e4d1c 100644
--- a/src/p_setup.c
+++ b/src/p_setup.c
@@ -103,6 +103,9 @@ node_t *nodes;
line_t *lines;
side_t *sides;
mapthing_t *mapthings;
+sector_t *spawnsectors;
+line_t *spawnlines;
+side_t *spawnsides;
INT32 numstarposts;
UINT16 bossdisabled;
boolean stoppedclock;
@@ -210,6 +213,9 @@ static void P_ClearSingleMapHeaderInfo(INT16 i)
mapheaderinfo[num]->lvlttl[0] = '\0';
mapheaderinfo[num]->selectheading[0] = '\0';
mapheaderinfo[num]->subttl[0] = '\0';
+ mapheaderinfo[num]->ltzzpatch[0] = '\0';
+ mapheaderinfo[num]->ltzztext[0] = '\0';
+ mapheaderinfo[num]->ltactdiamond[0] = '\0';
mapheaderinfo[num]->actnum = 0;
mapheaderinfo[num]->typeoflevel = 0;
mapheaderinfo[num]->nextlevel = (INT16)(i + 1);
@@ -367,27 +373,12 @@ UINT32 P_GetScoreForGrade(INT16 map, UINT8 mare, UINT8 grade)
return mapheaderinfo[map-1]->grades[mare].grade[grade-1];
}
-/** Loads the vertexes for a level.
- *
- * \param lump VERTEXES lump number.
- * \sa ML_VERTEXES
- */
-
-static inline void P_LoadRawVertexes(UINT8 *data, size_t i)
+// Loads the vertexes for a level.
+static inline void P_LoadRawVertexes(UINT8 *data)
{
- mapvertex_t *ml;
- vertex_t *li;
-
- numvertexes = i / sizeof (mapvertex_t);
-
- if (numvertexes <= 0)
- I_Error("Level has no vertices"); // instead of crashing
-
- // Allocate zone memory for buffer.
- vertexes = Z_Calloc(numvertexes * sizeof (*vertexes), PU_LEVEL, NULL);
-
- ml = (mapvertex_t *)data;
- li = vertexes;
+ mapvertex_t *ml = (mapvertex_t *)data;
+ vertex_t *li = vertexes;
+ size_t i;
// Copy and convert vertex coordinates, internal representation as fixed.
for (i = 0; i < numvertexes; i++, li++, ml++)
@@ -397,13 +388,6 @@ static inline void P_LoadRawVertexes(UINT8 *data, size_t i)
}
}
-static inline void P_LoadVertexes(lumpnum_t lumpnum)
-{
- UINT8 *data = W_CacheLumpNum(lumpnum, PU_STATIC);
- P_LoadRawVertexes(data, W_LumpLength(lumpnum));
- Z_Free(data);
-}
-
/** Computes the length of a seg in fracunits.
*
* \param seg Seg to compute length for.
@@ -435,25 +419,15 @@ static inline float P_SegLengthFloat(seg_t *seg)
}
#endif
-/** Loads the SEGS resource from a level.
- *
- * \param lump Lump number of the SEGS resource.
- * \sa ::ML_SEGS
- */
-static void P_LoadRawSegs(UINT8 *data, size_t i)
+// Loads the SEGS resource from a level.
+static void P_LoadRawSegs(UINT8 *data)
{
INT32 linedef, side;
- mapseg_t *ml;
- seg_t *li;
+ mapseg_t *ml = (mapseg_t*)data;
+ seg_t *li = segs;
line_t *ldef;
+ size_t i;
- numsegs = i / sizeof (mapseg_t);
- if (numsegs <= 0)
- I_Error("Level has no segs"); // instead of crashing
- segs = Z_Calloc(numsegs * sizeof (*segs), PU_LEVEL, NULL);
-
- ml = (mapseg_t *)data;
- li = segs;
for (i = 0; i < numsegs; i++, li++, ml++)
{
li->v1 = &vertexes[SHORT(ml->v1)];
@@ -478,7 +452,7 @@ static void P_LoadRawSegs(UINT8 *data, size_t i)
li->side = side = SHORT(ml->side);
li->sidedef = &sides[ldef->sidenum[side]];
li->frontsector = sides[ldef->sidenum[side]].sector;
- if (ldef-> flags & ML_TWOSIDED)
+ if (ldef->flags & ML_TWOSIDED)
li->backsector = sides[ldef->sidenum[side^1]].sector;
else
li->backsector = 0;
@@ -488,30 +462,12 @@ static void P_LoadRawSegs(UINT8 *data, size_t i)
}
}
-static void P_LoadSegs(lumpnum_t lumpnum)
+// Loads the SSECTORS resource from a level.
+static inline void P_LoadRawSubsectors(void *data)
{
- UINT8 *data = W_CacheLumpNum(lumpnum, PU_STATIC);
- P_LoadRawSegs(data, W_LumpLength(lumpnum));
- Z_Free(data);
-}
-
-
-/** Loads the SSECTORS resource from a level.
- *
- * \param lump Lump number of the SSECTORS resource.
- * \sa ::ML_SSECTORS
- */
-static inline void P_LoadRawSubsectors(void *data, size_t i)
-{
- mapsubsector_t *ms;
- subsector_t *ss;
-
- numsubsectors = i / sizeof (mapsubsector_t);
- if (numsubsectors <= 0)
- I_Error("Level has no subsectors (did you forget to run it through a nodesbuilder?)");
- ss = subsectors = Z_Calloc(numsubsectors * sizeof (*subsectors), PU_LEVEL, NULL);
-
- ms = (mapsubsector_t *)data;
+ mapsubsector_t *ms = (mapsubsector_t*)data;
+ subsector_t *ss = subsectors;
+ size_t i;
for (i = 0; i < numsubsectors; i++, ss++, ms++)
{
@@ -525,13 +481,6 @@ static inline void P_LoadRawSubsectors(void *data, size_t i)
}
}
-static void P_LoadSubsectors(lumpnum_t lumpnum)
-{
- UINT8 *data = W_CacheLumpNum(lumpnum, PU_STATIC);
- P_LoadRawSubsectors(data, W_LumpLength(lumpnum));
- Z_Free(data);
-}
-
//
// levelflats
//
@@ -539,6 +488,7 @@ static void P_LoadSubsectors(lumpnum_t lumpnum)
size_t numlevelflats;
levelflat_t *levelflats;
+levelflat_t *foundflats;
//SoM: Other files want this info.
size_t P_PrecacheLevelFlats(void)
@@ -698,32 +648,13 @@ INT32 P_CheckLevelFlat(const char *flatname)
}
// Sets up the ingame sectors structures.
-// Lumpnum is the lumpnum of a SECTORS lump.
-static void P_LoadRawSectors(UINT8 *data, size_t i)
+static void P_LoadRawSectors(UINT8 *data)
{
- mapsector_t *ms;
- sector_t *ss;
- levelflat_t *foundflats;
-
- // We count how many sectors we got.
- numsectors = i / sizeof (mapsector_t);
- if (numsectors <= 0)
- I_Error("Level has no sectors");
-
- // Allocate as much memory as we need into the global sectors table.
- sectors = Z_Calloc(numsectors*sizeof (*sectors), PU_LEVEL, NULL);
-
- // Allocate a big chunk of memory as big as our MAXLEVELFLATS limit.
- //Fab : FIXME: allocate for whatever number of flats - 512 different flats per level should be plenty
- foundflats = calloc(MAXLEVELFLATS, sizeof (*foundflats));
- if (foundflats == NULL)
- I_Error("Ran out of memory while loading sectors\n");
-
- numlevelflats = 0;
+ mapsector_t *ms = (mapsector_t *)data;
+ sector_t *ss = sectors;
+ size_t i;
// For each counted sector, copy the sector raw data from our cache pointer ms, to the global table pointer ss.
- ms = (mapsector_t *)data;
- ss = sectors;
for (i = 0; i < numsectors; i++, ss++, ms++)
{
ss->floorheight = SHORT(ms->floorheight)<<FRACBITS;
@@ -733,11 +664,9 @@ static void P_LoadRawSectors(UINT8 *data, size_t i)
ss->ceilingpic = P_AddLevelFlat(ms->ceilingpic, foundflats);
ss->lightlevel = SHORT(ms->lightlevel);
- ss->spawn_lightlevel = SHORT(ms->lightlevel);
ss->special = SHORT(ms->special);
ss->tag = SHORT(ms->tag);
ss->nexttag = ss->firsttag = -1;
- ss->spawn_nexttag = ss->spawn_firsttag = -1;
memset(&ss->soundorg, 0, sizeof(ss->soundorg));
ss->validcount = 0;
@@ -772,9 +701,7 @@ static void P_LoadRawSectors(UINT8 *data, size_t i)
ss->spawn_extra_colormap = NULL;
ss->floor_xoffs = ss->ceiling_xoffs = ss->floor_yoffs = ss->ceiling_yoffs = 0;
- ss->spawn_flr_xoffs = ss->spawn_ceil_xoffs = ss->spawn_flr_yoffs = ss->spawn_ceil_yoffs = 0;
ss->floorpic_angle = ss->ceilingpic_angle = 0;
- ss->spawn_flrpic_angle = ss->spawn_ceilpic_angle = 0;
ss->gravity = NULL;
ss->cullheight = NULL;
ss->verticalflip = false;
@@ -793,41 +720,17 @@ static void P_LoadRawSectors(UINT8 *data, size_t i)
ss->lineoutLength = -1.0l;
#endif // ----- end special tricks -----
}
-
- // set the sky flat num
- skyflatnum = P_AddLevelFlat(SKYFLATNAME, foundflats);
-
- // copy table for global usage
- levelflats = M_Memcpy(Z_Calloc(numlevelflats * sizeof (*levelflats), PU_LEVEL, NULL), foundflats, numlevelflats * sizeof (levelflat_t));
- free(foundflats);
-
- // search for animated flats and set up
- P_SetupLevelFlatAnims();
-}
-
-static void P_LoadSectors(lumpnum_t lumpnum)
-{
- UINT8 *data = W_CacheLumpNum(lumpnum, PU_STATIC);
- P_LoadRawSectors(data, W_LumpLength(lumpnum));
- Z_Free(data);
}
//
// P_LoadNodes
//
-static void P_LoadRawNodes(UINT8 *data, size_t i)
+static void P_LoadRawNodes(UINT8 *data)
{
UINT8 j, k;
- mapnode_t *mn;
- node_t *no;
-
- numnodes = i / sizeof (mapnode_t);
- if (numnodes <= 0)
- I_Error("Level has no nodes");
- nodes = Z_Calloc(numnodes * sizeof (*nodes), PU_LEVEL, NULL);
-
- mn = (mapnode_t *)data;
- no = nodes;
+ mapnode_t *mn = (mapnode_t*)data;
+ node_t *no = nodes;
+ size_t i;
for (i = 0; i < numnodes; i++, no++, mn++)
{
@@ -844,16 +747,9 @@ static void P_LoadRawNodes(UINT8 *data, size_t i)
}
}
-static void P_LoadNodes(lumpnum_t lumpnum)
-{
- UINT8 *data = W_CacheLumpNum(lumpnum, PU_STATIC);
- P_LoadRawNodes(data, W_LumpLength(lumpnum));
- Z_Free(data);
-}
-
//
// P_ReloadRings
-// Used by NiGHTS, clears all ring/wing/etc items and respawns them
+// Used by NiGHTS, clears all ring/sphere/hoop/etc items and respawns them
//
void P_ReloadRings(void)
{
@@ -900,22 +796,21 @@ void P_ReloadRings(void)
{
// Notice an omission? We handle hoops differently.
if (mt->type == mobjinfo[MT_RING].doomednum || mt->type == mobjinfo[MT_COIN].doomednum
- || mt->type == mobjinfo[MT_REDTEAMRING].doomednum || mt->type == mobjinfo[MT_BLUETEAMRING].doomednum
- || mt->type == mobjinfo[MT_BLUESPHERE].doomednum || mt->type == mobjinfo[MT_BOMBSPHERE].doomednum
- || (mt->type >= 600 && mt->type <= 609)) // circles and diagonals
+ || mt->type == mobjinfo[MT_REDTEAMRING].doomednum || mt->type == mobjinfo[MT_BLUETEAMRING].doomednum
+ || mt->type == mobjinfo[MT_BLUESPHERE].doomednum || mt->type == mobjinfo[MT_BOMBSPHERE].doomednum)
{
mt->mobj = NULL;
-
- // Z for objects Tails 05-26-2002
- mt->z = (INT16)(R_PointInSubsector(mt->x << FRACBITS, mt->y << FRACBITS)
- ->sector->floorheight>>FRACBITS);
-
- P_SpawnHoopsAndRings(mt, true);
+ P_SetBonusTime(P_SpawnMapThing(mt));
+ }
+ else if (mt->type >= 600 && mt->type <= 609) // Item patterns
+ {
+ mt->mobj = NULL;
+ P_SpawnItemPattern(mt, true);
}
}
for (i = 0; i < numHoops; i++)
{
- P_SpawnHoopsAndRings(hoopsToRespawn[i], false);
+ P_SpawnHoop(hoopsToRespawn[i]);
}
}
@@ -1006,20 +901,16 @@ void P_ScanThings(INT16 mapnum, INT16 wadnum, INT16 lumpnum)
}
#endif
-static void P_PrepareRawThings(UINT8 *data, size_t i)
+static void P_PrepareRawThings(UINT8 *data)
{
mapthing_t *mt;
+ size_t i;
- nummapthings = i / (5 * sizeof (INT16));
- mapthings = Z_Calloc(nummapthings * sizeof (*mapthings), PU_LEVEL, NULL);
-
- // Spawn axis points first so they are
- // at the front of the list for fast searching.
- mt = mapthings;
- for (i = 0; i < nummapthings; i++, mt++)
+ for (i = 0, mt = mapthings; i < nummapthings; i++, mt++)
{
mt->x = READINT16(data);
mt->y = READINT16(data);
+
mt->angle = READINT16(data);
mt->type = READUINT16(data);
mt->options = READUINT16(data);
@@ -1027,6 +918,66 @@ static void P_PrepareRawThings(UINT8 *data, size_t i)
mt->type &= 4095;
+ if (mt->type == 1705 || (mt->type == 750 && mt->extrainfo))
+ mt->z = mt->options; // NiGHTS Hoops use the full flags bits to set the height.
+ else
+ mt->z = mt->options >> ZSHIFT;
+ }
+}
+
+static void P_SpawnEmeraldHunt(void)
+{
+ INT32 emer1, emer2, emer3;
+ INT32 timeout = 0; // keeps from getting stuck
+
+ emer1 = emer2 = emer3 = 0;
+
+ //increment spawn numbers because zero is valid.
+ emer1 = (P_RandomKey(numhuntemeralds)) + 1;
+ while (timeout++ < 100)
+ {
+ emer2 = (P_RandomKey(numhuntemeralds)) + 1;
+
+ if (emer2 != emer1)
+ break;
+ }
+
+ timeout = 0;
+ while (timeout++ < 100)
+ {
+ emer3 = (P_RandomKey(numhuntemeralds)) + 1;
+
+ if (emer3 != emer2 && emer3 != emer1)
+ break;
+ }
+
+ //decrement spawn values to the actual number because zero is valid.
+ if (emer1--)
+ P_SpawnMobj(huntemeralds[emer1]->x<<FRACBITS,
+ huntemeralds[emer1]->y<<FRACBITS,
+ huntemeralds[emer1]->z<<FRACBITS, MT_EMERHUNT);
+
+ if (emer2--)
+ P_SetMobjStateNF(P_SpawnMobj(huntemeralds[emer2]->x<<FRACBITS,
+ huntemeralds[emer2]->y<<FRACBITS,
+ huntemeralds[emer2]->z<<FRACBITS, MT_EMERHUNT),
+ mobjinfo[MT_EMERHUNT].spawnstate+1);
+
+ if (emer3--)
+ P_SetMobjStateNF(P_SpawnMobj(huntemeralds[emer3]->x<<FRACBITS,
+ huntemeralds[emer3]->y<<FRACBITS,
+ huntemeralds[emer3]->z<<FRACBITS, MT_EMERHUNT),
+ mobjinfo[MT_EMERHUNT].spawnstate+2);
+}
+
+static void P_LoadThings(boolean loademblems)
+{
+ size_t i;
+ mapthing_t *mt;
+
+ // Spawn axis points first so they are at the front of the list for fast searching.
+ for (i = 0, mt = mapthings; i < nummapthings; i++, mt++)
+ {
switch (mt->type)
{
case 1700: // MT_AXIS
@@ -1039,35 +990,11 @@ static void P_PrepareRawThings(UINT8 *data, size_t i)
break;
}
}
-}
-
-static void P_PrepareThings(lumpnum_t lumpnum)
-{
- UINT8 *data = W_CacheLumpNum(lumpnum, PU_STATIC);
- P_PrepareRawThings(data, W_LumpLength(lumpnum));
- Z_Free(data);
-}
-
-static void P_LoadThings(boolean loademblems)
-{
- size_t i;
- mapthing_t *mt;
-
- // Loading the things lump itself into memory is now handled in P_PrepareThings, above
- mt = mapthings;
numhuntemeralds = 0;
- for (i = 0; i < nummapthings; i++, mt++)
- {
- sector_t *mtsector = R_PointInSubsector(mt->x << FRACBITS, mt->y << FRACBITS)->sector;
-
- // Z for objects
- mt->z = (INT16)(
-#ifdef ESLOPE
- mtsector->f_slope ? P_GetZAt(mtsector->f_slope, mt->x << FRACBITS, mt->y << FRACBITS) :
-#endif
- mtsector->floorheight)>>FRACBITS;
+ for (i = 0, mt = mapthings; i < nummapthings; i++, mt++)
+ {
if (mt->type == 1700 // MT_AXIS
|| mt->type == 1701 // MT_AXISTRANSFER
|| mt->type == 1702) // MT_AXISTRANSFERLINE
@@ -1077,77 +1004,18 @@ static void P_LoadThings(boolean loademblems)
continue;
mt->mobj = NULL;
- P_SpawnMapThing(mt);
+
+ if (mt->type >= 600 && mt->type <= 609) // item patterns
+ P_SpawnItemPattern(mt, false);
+ else if (mt->type == 1705 || mt->type == 1713) // hoops
+ P_SpawnHoop(mt);
+ else // Everything else
+ P_SpawnMapThing(mt);
}
// random emeralds for hunt
if (numhuntemeralds)
- {
- INT32 emer1, emer2, emer3;
- INT32 timeout = 0; // keeps from getting stuck
-
- emer1 = emer2 = emer3 = 0;
-
- //increment spawn numbers because zero is valid.
- emer1 = (P_RandomKey(numhuntemeralds)) + 1;
- while (timeout++ < 100)
- {
- emer2 = (P_RandomKey(numhuntemeralds)) + 1;
-
- if (emer2 != emer1)
- break;
- }
-
- timeout = 0;
- while (timeout++ < 100)
- {
- emer3 = (P_RandomKey(numhuntemeralds)) + 1;
-
- if (emer3 != emer2 && emer3 != emer1)
- break;
- }
-
- //decrement spawn values to the actual number because zero is valid.
- if (emer1--)
- P_SpawnMobj(huntemeralds[emer1]->x<<FRACBITS,
- huntemeralds[emer1]->y<<FRACBITS,
- huntemeralds[emer1]->z<<FRACBITS, MT_EMERHUNT);
-
- if (emer2--)
- P_SetMobjStateNF(P_SpawnMobj(huntemeralds[emer2]->x<<FRACBITS,
- huntemeralds[emer2]->y<<FRACBITS,
- huntemeralds[emer2]->z<<FRACBITS, MT_EMERHUNT),
- mobjinfo[MT_EMERHUNT].spawnstate+1);
-
- if (emer3--)
- P_SetMobjStateNF(P_SpawnMobj(huntemeralds[emer3]->x<<FRACBITS,
- huntemeralds[emer3]->y<<FRACBITS,
- huntemeralds[emer3]->z<<FRACBITS, MT_EMERHUNT),
- mobjinfo[MT_EMERHUNT].spawnstate+2);
- }
-
- if (metalrecording) // Metal Sonic gets no rings to distract him.
- return;
-
- // Run through the list of mapthings again to spawn hoops and rings
- mt = mapthings;
- for (i = 0; i < nummapthings; i++, mt++)
- {
- if (mt->type == mobjinfo[MT_RING].doomednum || mt->type == mobjinfo[MT_COIN].doomednum
- || mt->type == mobjinfo[MT_REDTEAMRING].doomednum || mt->type == mobjinfo[MT_BLUETEAMRING].doomednum
- || mt->type == mobjinfo[MT_BLUESPHERE].doomednum || mt->type == mobjinfo[MT_BOMBSPHERE].doomednum
- || (mt->type >= 600 && mt->type <= 609) // circles and diagonals
- || mt->type == 1705 || mt->type == 1713) // hoops
- {
- mt->mobj = NULL;
-
- // Z for objects Tails 05-26-2002
- mt->z = (INT16)(R_PointInSubsector(mt->x << FRACBITS, mt->y << FRACBITS)
- ->sector->floorheight>>FRACBITS);
-
- P_SpawnHoopsAndRings(mt, false);
- }
- }
+ P_SpawnEmeraldHunt();
}
// Experimental groovy write function!
@@ -1193,33 +1061,46 @@ void P_WriteThings(lumpnum_t lumpnum)
CONS_Printf(M_GetText("newthings%d.lmp saved.\n"), gamemap);
}
-static void P_LoadRawLineDefs(UINT8 *data, size_t i)
+static void P_LoadRawLineDefs(UINT8 *data)
{
- maplinedef_t *mld;
- line_t *ld;
- vertex_t *v1, *v2;
-
- numlines = i / sizeof (maplinedef_t);
- if (numlines <= 0)
- I_Error("Level has no linedefs");
- lines = Z_Calloc(numlines * sizeof (*lines), PU_LEVEL, NULL);
+ maplinedef_t *mld = (maplinedef_t *)data;
+ line_t *ld = lines;
+ size_t i;
- mld = (maplinedef_t *)data;
- ld = lines;
for (i = 0; i < numlines; i++, mld++, ld++)
{
ld->flags = SHORT(mld->flags);
ld->special = SHORT(mld->special);
ld->tag = SHORT(mld->tag);
- v1 = ld->v1 = &vertexes[SHORT(mld->v1)];
- v2 = ld->v2 = &vertexes[SHORT(mld->v2)];
- ld->dx = v2->x - v1->x;
- ld->dy = v2->y - v1->y;
+ ld->v1 = &vertexes[SHORT(mld->v1)];
+ ld->v2 = &vertexes[SHORT(mld->v2)];
+
+ ld->sidenum[0] = SHORT(mld->sidenum[0]);
+ ld->sidenum[1] = SHORT(mld->sidenum[1]);
+ }
+}
+
+static void P_SetupLines(void)
+{
+ line_t *ld = lines;
+ size_t i;
+
+ for (i = 0; i < numlines; i++, ld++)
+ {
+ vertex_t *v1 = ld->v1;
+ vertex_t *v2 = ld->v2;
#ifdef WALLSPLATS
ld->splats = NULL;
#endif
+#ifdef POLYOBJECTS
+ ld->polyobj = NULL;
+#endif
+
+ ld->dx = v2->x - v1->x;
+ ld->dy = v2->y - v1->y;
+
if (!ld->dx)
ld->slopetype = ST_VERTICAL;
else if (!ld->dy)
@@ -1251,62 +1132,46 @@ static void P_LoadRawLineDefs(UINT8 *data, size_t i)
ld->bbox[BOXTOP] = v1->y;
}
- ld->sidenum[0] = SHORT(mld->sidenum[0]);
- ld->sidenum[1] = SHORT(mld->sidenum[1]);
-
{
// cph 2006/09/30 - fix sidedef errors right away.
// cph 2002/07/20 - these errors are fatal if not fixed, so apply them
UINT8 j;
for (j=0; j < 2; j++)
- {
if (ld->sidenum[j] != 0xffff && ld->sidenum[j] >= (UINT16)numsides)
{
ld->sidenum[j] = 0xffff;
CONS_Debug(DBG_SETUP, "P_LoadRawLineDefs: linedef %s has out-of-range sidedef number\n", sizeu1(numlines-i-1));
}
- }
}
ld->frontsector = ld->backsector = NULL;
ld->validcount = 0;
ld->firsttag = ld->nexttag = -1;
ld->callcount = 0;
- // killough 11/98: fix common wad errors (missing sidedefs):
+ // killough 11/98: fix common wad errors (missing sidedefs):
if (ld->sidenum[0] == 0xffff)
{
ld->sidenum[0] = 0; // Substitute dummy sidedef for missing right side
// cph - print a warning about the bug
- CONS_Debug(DBG_SETUP, "P_LoadRawLineDefs: linedef %s missing first sidedef\n", sizeu1(numlines-i-1));
+ CONS_Debug(DBG_SETUP, "Linedef %s missing first sidedef\n", sizeu1(numlines-i-1));
}
if ((ld->sidenum[1] == 0xffff) && (ld->flags & ML_TWOSIDED))
{
ld->flags &= ~ML_TWOSIDED; // Clear 2s flag for missing left side
// cph - print a warning about the bug
- CONS_Debug(DBG_SETUP, "P_LoadRawLineDefs: linedef %s has two-sided flag set, but no second sidedef\n", sizeu1(numlines-i-1));
+ CONS_Debug(DBG_SETUP, "Linedef %s has two-sided flag set, but no second sidedef\n", sizeu1(numlines-i-1));
}
if (ld->sidenum[0] != 0xffff && ld->special)
sides[ld->sidenum[0]].special = ld->special;
if (ld->sidenum[1] != 0xffff && ld->special)
sides[ld->sidenum[1]].special = ld->special;
-
-#ifdef POLYOBJECTS
- ld->polyobj = NULL;
-#endif
}
}
-static void P_LoadLineDefs(lumpnum_t lumpnum)
-{
- UINT8 *data = W_CacheLumpNum(lumpnum, PU_STATIC);
- P_LoadRawLineDefs(data, W_LumpLength(lumpnum));
- Z_Free(data);
-}
-
static void P_LoadLineDefs2(void)
{
size_t i = numlines;
@@ -1409,22 +1274,6 @@ static void P_LoadLineDefs2(void)
}
}
-
-
-static inline void P_LoadRawSideDefs(size_t i)
-{
- numsides = i / sizeof (mapsidedef_t);
- if (numsides <= 0)
- I_Error("Level has no sidedefs");
- sides = Z_Calloc(numsides * sizeof (*sides), PU_LEVEL, NULL);
-}
-
-static inline void P_LoadSideDefs(lumpnum_t lumpnum)
-{
- P_LoadRawSideDefs(W_LumpLength(lumpnum));
-}
-
-
static void P_LoadRawSideDefs2(void *data)
{
UINT16 i;
@@ -1582,18 +1431,8 @@ static void P_LoadRawSideDefs2(void *data)
break;
}
}
- R_ClearTextureNumCache(true);
}
-// Delay loading texture names until after loaded linedefs.
-static void P_LoadSideDefs2(lumpnum_t lumpnum)
-{
- UINT8 *data = W_CacheLumpNum(lumpnum, PU_STATIC);
- P_LoadRawSideDefs2(data);
- Z_Free(data);
-}
-
-
static boolean LineInBlock(fixed_t cx1, fixed_t cy1, fixed_t cx2, fixed_t cy2, fixed_t bx1, fixed_t by1)
{
fixed_t bbox[4];
@@ -1873,84 +1712,11 @@ static void P_ReadBlockMapLump(INT16 *wadblockmaplump, size_t count)
}
}
-//
-// P_LoadBlockMap
-//
-// Levels might not have a blockmap, so if one does not exist
-// this should return false.
-static boolean P_LoadBlockMap(lumpnum_t lumpnum)
-{
-#if 0
- (void)lumpnum;
- return false;
-#else
- size_t count;
- const char *lumpname = W_CheckNameForNum(lumpnum);
-
- // Check if the lump exists, and if it's named "BLOCKMAP"
- if (!lumpname || memcmp(lumpname, "BLOCKMAP", 8) != 0)
- {
- return false;
- }
-
- count = W_LumpLength(lumpnum);
-
- if (!count || count >= 0x20000)
- return false;
-
- {
- INT16 *wadblockmaplump = malloc(count); //INT16 *wadblockmaplump = W_CacheLumpNum (lump, PU_LEVEL);
- if (!wadblockmaplump)
- return false;
- W_ReadLump(lumpnum, wadblockmaplump);
- count /= 2;
- P_ReadBlockMapLump(wadblockmaplump, count);
- free(wadblockmaplump);
- }
-
- bmaporgx = blockmaplump[0]<<FRACBITS;
- bmaporgy = blockmaplump[1]<<FRACBITS;
- bmapwidth = blockmaplump[2];
- bmapheight = blockmaplump[3];
-
- // clear out mobj chains
- count = sizeof (*blocklinks)* bmapwidth*bmapheight;
- blocklinks = Z_Calloc(count, PU_LEVEL, NULL);
- blockmap = blockmaplump+4;
-
-#ifdef POLYOBJECTS
- // haleyjd 2/22/06: setup polyobject blockmap
- count = sizeof(*polyblocklinks) * bmapwidth * bmapheight;
- polyblocklinks = Z_Calloc(count, PU_LEVEL, NULL);
-#endif
- return true;
-/* Original
- blockmaplump = W_CacheLumpNum(lump, PU_LEVEL);
- blockmap = blockmaplump+4;
- count = W_LumpLength (lump)/2;
-
- for (i = 0; i < count; i++)
- blockmaplump[i] = SHORT(blockmaplump[i]);
-
- bmaporgx = blockmaplump[0]<<FRACBITS;
- bmaporgy = blockmaplump[1]<<FRACBITS;
- bmapwidth = blockmaplump[2];
- bmapheight = blockmaplump[3];
- }
-
- // clear out mobj chains
- count = sizeof (*blocklinks)*bmapwidth*bmapheight;
- blocklinks = Z_Calloc(count, PU_LEVEL, NULL);
- return true;
- */
-#endif
-}
-
// This needs to be a separate function
// because making both the WAD and PK3 loading code use
// the same functions is trickier than it looks for blockmap
// -- Monster Iestyn 09/01/18
-static boolean P_LoadRawBlockMap(UINT8 *data, size_t count, const char *lumpname)
+static boolean P_LoadRawBlockMap(UINT8 *data, size_t count)
{
#if 0
(void)data;
@@ -1958,12 +1724,6 @@ static boolean P_LoadRawBlockMap(UINT8 *data, size_t count, const char *lumpname
(void)lumpname;
return false;
#else
- // Check if the lump is named "BLOCKMAP"
- if (!lumpname || memcmp(lumpname, "BLOCKMAP", 8) != 0)
- {
- CONS_Printf("No blockmap lump found for pk3!\n");
- return false;
- }
if (!count || count >= 0x20000)
return false;
@@ -2089,57 +1849,170 @@ static void P_GroupLines(void)
}
}
-//
-// P_LoadReject
-//
-// Detect if the REJECT lump is valid,
-// if not, rejectmatrix will be NULL
-static void P_LoadReject(lumpnum_t lumpnum)
+// PK3 version
+// -- Monster Iestyn 09/01/18
+static void P_LoadRawReject(UINT8 *data, size_t count)
{
- size_t count;
- const char *lumpname = W_CheckNameForNum(lumpnum);
-
- // Check if the lump exists, and if it's named "REJECT"
- if (!lumpname || memcmp(lumpname, "REJECT\0\0", 8) != 0)
+ if (!count) // zero length, someone probably used ZDBSP
{
rejectmatrix = NULL;
- CONS_Debug(DBG_SETUP, "P_LoadReject: No valid REJECT lump found\n");
- return;
+ CONS_Debug(DBG_SETUP, "P_LoadRawReject: REJECT lump has size 0, will not be loaded\n");
}
-
- count = W_LumpLength(lumpnum);
-
- if (!count) // zero length, someone probably used ZDBSP
+ else
{
- rejectmatrix = NULL;
- CONS_Debug(DBG_SETUP, "P_LoadReject: REJECT lump has size 0, will not be loaded\n");
+ rejectmatrix = Z_Malloc(count, PU_LEVEL, NULL); // allocate memory for the reject matrix
+ M_Memcpy(rejectmatrix, data, count); // copy the data into it
}
+}
+
+static void P_LoadMapBSP(const virtres_t* virt)
+{
+ virtlump_t* virtssectors = vres_Find(virt, "SSECTORS");
+ virtlump_t* virtsegs = vres_Find(virt, "SEGS");
+ virtlump_t* virtnodes = vres_Find(virt, "NODES");
+
+ numsubsectors = virtssectors->size / sizeof(mapsubsector_t);
+ numnodes = virtnodes->size / sizeof(mapnode_t);
+ numsegs = virtsegs->size / sizeof(mapseg_t);
+
+ if (numsubsectors <= 0)
+ I_Error("Level has no subsectors (did you forget to run it through a nodesbuilder?)");
+ if (numnodes <= 0)
+ I_Error("Level has no nodes");
+ if (numsegs <= 0)
+ I_Error("Level has no segs");
+
+ subsectors = Z_Calloc(numsubsectors * sizeof(*subsectors), PU_LEVEL, NULL);
+ nodes = Z_Calloc(numnodes * sizeof(*nodes), PU_LEVEL, NULL);
+ segs = Z_Calloc(numsegs * sizeof(*segs), PU_LEVEL, NULL);
+
+ // Nodes
+ P_LoadRawSubsectors(virtssectors->data);
+ P_LoadRawNodes(virtnodes->data);
+ P_LoadRawSegs(virtsegs->data);
+}
+
+static void P_LoadMapLUT(const virtres_t* virt)
+{
+ virtlump_t* virtblockmap = vres_Find(virt, "BLOCKMAP");
+ virtlump_t* virtreject = vres_Find(virt, "REJECT");
+
+ // Lookup tables
+ if (virtreject)
+ P_LoadRawReject(virtreject->data, virtreject->size);
else
- rejectmatrix = W_CacheLumpNum(lumpnum, PU_LEVEL);
+ rejectmatrix = NULL;
+
+ if (!(virtblockmap && P_LoadRawBlockMap(virtblockmap->data, virtblockmap->size)))
+ P_CreateBlockMap();
}
-// PK3 version
-// -- Monster Iestyn 09/01/18
-static void P_LoadRawReject(UINT8 *data, size_t count, const char *lumpname)
+static void P_LoadMapData(const virtres_t* virt)
{
- // Check if the lump is named "REJECT"
- if (!lumpname || memcmp(lumpname, "REJECT\0\0", 8) != 0)
+ virtlump_t* virtvertexes = NULL, * virtsectors = NULL, * virtsidedefs = NULL, * virtlinedefs = NULL, * virtthings = NULL;
+#ifdef UDMF
+ virtlump_t* textmap = vres_Find(virt, "TEXTMAP");
+
+ // Count map data.
+ if (textmap)
{
- rejectmatrix = NULL;
- CONS_Debug(DBG_SETUP, "P_LoadRawReject: No valid REJECT lump found\n");
- return;
+ nummapthings = 0;
+ numlines = 0;
+ numsides = 0;
+ numvertexes = 0;
+ numsectors = 0;
+
+ // Count how many entries for each type we got in textmap.
+ //TextmapCount(vtextmap->data, vtextmap->size);
+ }
+ else
+#endif
+ {
+ virtthings = vres_Find(virt, "THINGS");
+ virtvertexes = vres_Find(virt, "VERTEXES");
+ virtsectors = vres_Find(virt, "SECTORS");
+ virtsidedefs = vres_Find(virt, "SIDEDEFS");
+ virtlinedefs = vres_Find(virt, "LINEDEFS");
+
+ if (!virtthings)
+ I_Error("THINGS lump not found");
+ if (!virtvertexes)
+ I_Error("VERTEXES lump not found");
+ if (!virtsectors)
+ I_Error("SECTORS lump not found");
+ if (!virtsidedefs)
+ I_Error("SIDEDEFS lump not found");
+ if (!virtlinedefs)
+ I_Error("LINEDEFS lump not found");
+
+ // Traditional doom map format just assumes the number of elements from the lump sizes.
+ numvertexes = virtvertexes->size / sizeof (mapvertex_t);
+ numsectors = virtsectors->size / sizeof (mapsector_t);
+ numsides = virtsidedefs->size / sizeof (mapsidedef_t);
+ numlines = virtlinedefs->size / sizeof (maplinedef_t);
+ nummapthings = virtthings->size / (5 * sizeof (INT16));
}
- if (!count) // zero length, someone probably used ZDBSP
+ if (numvertexes <= 0)
+ I_Error("Level has no vertices");
+ if (numsectors <= 0)
+ I_Error("Level has no sectors");
+ if (numsides <= 0)
+ I_Error("Level has no sidedefs");
+ if (numlines <= 0)
+ I_Error("Level has no linedefs");
+
+ vertexes = Z_Calloc(numvertexes * sizeof (*vertexes), PU_LEVEL, NULL);
+ sectors = Z_Calloc(numsectors * sizeof (*sectors), PU_LEVEL, NULL);
+ sides = Z_Calloc(numsides * sizeof (*sides), PU_LEVEL, NULL);
+ lines = Z_Calloc(numlines * sizeof (*lines), PU_LEVEL, NULL);
+ mapthings = Z_Calloc(nummapthings * sizeof (*mapthings), PU_LEVEL, NULL);
+
+ // Allocate a big chunk of memory as big as our MAXLEVELFLATS limit.
+ //Fab : FIXME: allocate for whatever number of flats - 512 different flats per level should be plenty
+ foundflats = calloc(MAXLEVELFLATS, sizeof (*foundflats));
+ if (foundflats == NULL)
+ I_Error("Ran out of memory while loading sectors\n");
+
+ numlevelflats = 0;
+
+#ifdef UDMF
+ if (textmap)
{
- rejectmatrix = NULL;
- CONS_Debug(DBG_SETUP, "P_LoadRawReject: REJECT lump has size 0, will not be loaded\n");
+
}
else
+#endif
{
- rejectmatrix = Z_Malloc(count, PU_LEVEL, NULL); // allocate memory for the reject matrix
- M_Memcpy(rejectmatrix, data, count); // copy the data into it
+ // Strict map data
+ P_LoadRawVertexes(virtvertexes->data);
+ P_LoadRawSectors(virtsectors->data);
+ P_LoadRawLineDefs(virtlinedefs->data);
+ P_SetupLines();
+ P_LoadRawSideDefs2(virtsidedefs->data);
+ P_PrepareRawThings(virtthings->data);
}
+
+ R_ClearTextureNumCache(true);
+
+ // set the sky flat num
+ skyflatnum = P_AddLevelFlat(SKYFLATNAME, foundflats);
+
+ // copy table for global usage
+ levelflats = M_Memcpy(Z_Calloc(numlevelflats * sizeof (*levelflats), PU_LEVEL, NULL), foundflats, numlevelflats * sizeof (levelflat_t));
+ free(foundflats);
+
+ // search for animated flats and set up
+ P_SetupLevelFlatAnims();
+
+ // Copy relevant map data for NetArchive purposes.
+ spawnsectors = Z_Calloc(numsectors * sizeof (*sectors), PU_LEVEL, NULL);
+ spawnlines = Z_Calloc(numlines * sizeof (*lines), PU_LEVEL, NULL);
+ spawnsides = Z_Calloc(numsides * sizeof (*sides), PU_LEVEL, NULL);
+
+ memcpy(spawnsectors, sectors, numsectors * sizeof (*sectors));
+ memcpy(spawnlines, lines, numlines * sizeof (*lines));
+ memcpy(spawnsides, sides, numsides * sizeof (*sides));
}
#if 0
@@ -2328,7 +2201,6 @@ void P_LoadThingsOnly(void)
centerid = i; // save id just in case
}
-
for (think = thlist[THINK_MOBJ].next; think != &thlist[THINK_MOBJ]; think = think->next)
{
if (think->function.acp1 == (actionf_p1)P_RemoveThinkerDelayed)
@@ -2338,16 +2210,6 @@ void P_LoadThingsOnly(void)
P_LevelInitStuff();
- if (W_IsLumpWad(lastloadedmaplumpnum)) // welp it's a map wad in a pk3
- { // HACK: Open wad file rather quickly so we can use the things lump
- UINT8 *wadData = W_CacheLumpNum(lastloadedmaplumpnum, PU_STATIC);
- filelump_t *fileinfo = (filelump_t *)(wadData + ((wadinfo_t *)wadData)->infotableofs);
- fileinfo += ML_THINGS; // we only need the THINGS lump
- P_PrepareRawThings(wadData + fileinfo->filepos, fileinfo->size);
- Z_Free(wadData); // we're done with this now
- }
- else // phew it's just a WAD
- P_PrepareThings(lastloadedmaplumpnum + ML_THINGS);
P_LoadThings(true);
// restore skybox viewpoint/centerpoint if necessary, set them to defaults if we can't do that
@@ -2381,7 +2243,7 @@ static INT32 P_MakeBufferMD5(const char *buffer, size_t len, void *resblock)
#endif
}
-static void P_MakeMapMD5(lumpnum_t maplumpnum, void *dest)
+static void P_MakeMapMD5(virtres_t* virt, void *dest)
{
unsigned char linemd5[16];
unsigned char sectormd5[16];
@@ -2392,20 +2254,15 @@ static void P_MakeMapMD5(lumpnum_t maplumpnum, void *dest)
// Create a hash for the current map
// get the actual lumps!
- UINT8 *datalines = W_CacheLumpNum(maplumpnum + ML_LINEDEFS, PU_CACHE);
- UINT8 *datasectors = W_CacheLumpNum(maplumpnum + ML_SECTORS, PU_CACHE);
- UINT8 *datathings = W_CacheLumpNum(maplumpnum + ML_THINGS, PU_CACHE);
- UINT8 *datasides = W_CacheLumpNum(maplumpnum + ML_SIDEDEFS, PU_CACHE);
-
- P_MakeBufferMD5((char*)datalines, W_LumpLength(maplumpnum + ML_LINEDEFS), linemd5);
- P_MakeBufferMD5((char*)datasectors, W_LumpLength(maplumpnum + ML_SECTORS), sectormd5);
- P_MakeBufferMD5((char*)datathings, W_LumpLength(maplumpnum + ML_THINGS), thingmd5);
- P_MakeBufferMD5((char*)datasides, W_LumpLength(maplumpnum + ML_SIDEDEFS), sidedefmd5);
+ virtlump_t* virtlines = vres_Find(virt, "LINEDEFS");
+ virtlump_t* virtsectors = vres_Find(virt, "SECTORS");
+ virtlump_t* virtmthings = vres_Find(virt, "THINGS");
+ virtlump_t* virtsides = vres_Find(virt, "SIDEDEFS");
- Z_Free(datalines);
- Z_Free(datasectors);
- Z_Free(datathings);
- Z_Free(datasides);
+ P_MakeBufferMD5((char*)virtlines->data, virtlines->size, linemd5);
+ P_MakeBufferMD5((char*)virtsectors->data, virtsectors->size, sectormd5);
+ P_MakeBufferMD5((char*)virtmthings->data, virtmthings->size, thingmd5);
+ P_MakeBufferMD5((char*)virtsides->data, virtsides->size, sidedefmd5);
for (i = 0; i < 16; i++)
resmd5[i] = (linemd5[i] + sectormd5[i] + thingmd5[i] + sidedefmd5[i]) & 0xFF;
@@ -2641,7 +2498,6 @@ boolean P_SetupLevel(boolean skipprecip)
INT32 i, loadprecip = 1, ranspecialwipe = 0;
INT32 loademblems = 1;
INT32 fromnetsave = 0;
- boolean loadedbm = false;
sector_t *ss;
boolean chase;
levelloading = true;
@@ -2683,8 +2539,7 @@ boolean P_SetupLevel(boolean skipprecip)
// chasecam on in chaos, race, coop
// chasecam off in match, tag, capture the flag
- chase = (gametype == GT_RACE || gametype == GT_COMPETITION || gametype == GT_COOP)
- || (maptol & TOL_2D);
+ chase = (!(gametyperules & GTR_FIRSTPERSON)) || (maptol & TOL_2D);
if (!dedicated)
{
@@ -2890,110 +2745,37 @@ boolean P_SetupLevel(boolean skipprecip)
// SRB2 determines the sky texture to be used depending on the map header.
P_SetupLevelSky(mapheaderinfo[gamemap-1]->skynum, true);
- P_MakeMapMD5(lastloadedmaplumpnum, &mapmd5);
-
- // HACK ALERT: Cache the WAD, get the map data into the tables, free memory.
- // As it is implemented right now, we're assuming an uncompressed WAD.
- // (As in, a normal PWAD, not ZWAD or anything. The lump itself can be compressed.)
- // We're not accounting for extra lumps and scrambled lump positions. Any additional data will cause an error.
- if (W_IsLumpWad(lastloadedmaplumpnum))
- {
- // Remember that we're assuming that the WAD will have a specific set of lumps in a specific order.
- UINT8 *wadData = W_CacheLumpNum(lastloadedmaplumpnum, PU_STATIC);
- //filelump_t *fileinfo = wadData + ((wadinfo_t *)wadData)->infotableofs;
- filelump_t *fileinfo = (filelump_t *)(wadData + ((wadinfo_t *)wadData)->infotableofs);
- UINT32 numlumps = ((wadinfo_t *)wadData)->numlumps;
-
- if (numlumps < ML_REJECT) // at least 9 lumps should be in the wad for a map to be loaded
- {
- I_Error("Bad WAD file for map %s!\n", maplumpname);
- }
+ numdmstarts = numredctfstarts = numbluectfstarts = 0;
- if (numlumps > ML_BLOCKMAP) // enough room for a BLOCKMAP lump at least
- {
- loadedbm = P_LoadRawBlockMap(
- wadData + (fileinfo + ML_BLOCKMAP)->filepos,
- (fileinfo + ML_BLOCKMAP)->size,
- (fileinfo + ML_BLOCKMAP)->name);
- }
- P_LoadRawVertexes(wadData + (fileinfo + ML_VERTEXES)->filepos, (fileinfo + ML_VERTEXES)->size);
- P_LoadRawSectors(wadData + (fileinfo + ML_SECTORS)->filepos, (fileinfo + ML_SECTORS)->size);
- P_LoadRawSideDefs((fileinfo + ML_SIDEDEFS)->size);
- P_LoadRawLineDefs(wadData + (fileinfo + ML_LINEDEFS)->filepos, (fileinfo + ML_LINEDEFS)->size);
- P_LoadRawSideDefs2(wadData + (fileinfo + ML_SIDEDEFS)->filepos);
- P_LoadRawSubsectors(wadData + (fileinfo + ML_SSECTORS)->filepos, (fileinfo + ML_SSECTORS)->size);
- P_LoadRawNodes(wadData + (fileinfo + ML_NODES)->filepos, (fileinfo + ML_NODES)->size);
- P_LoadRawSegs(wadData + (fileinfo + ML_SEGS)->filepos, (fileinfo + ML_SEGS)->size);
- if (numlumps > ML_REJECT) // enough room for a REJECT lump at least
- {
- P_LoadRawReject(
- wadData + (fileinfo + ML_REJECT)->filepos,
- (fileinfo + ML_REJECT)->size,
- (fileinfo + ML_REJECT)->name);
- }
+ // reset the player starts
+ for (i = 0; i < MAXPLAYERS; i++)
+ playerstarts[i] = bluectfstarts[i] = redctfstarts[i] = NULL;
- // Important: take care of the ordering of the next functions.
- if (!loadedbm)
- P_CreateBlockMap(); // Graue 02-29-2004
- P_LoadLineDefs2();
- P_GroupLines();
- numdmstarts = numredctfstarts = numbluectfstarts = 0;
+ for (i = 0; i < MAX_DM_STARTS; i++)
+ deathmatchstarts[i] = NULL;
- // reset the player starts
- for (i = 0; i < MAXPLAYERS; i++)
- playerstarts[i] = bluectfstarts[i] = redctfstarts[i] = NULL;
+ for (i = 0; i < 2; i++)
+ skyboxmo[i] = NULL;
- for (i = 0; i < MAX_DM_STARTS; i++)
- deathmatchstarts[i] = NULL;
+ for (i = 0; i < 16; i++)
+ skyboxviewpnts[i] = skyboxcenterpnts[i] = NULL;
- for (i = 0; i < 2; i++)
- skyboxmo[i] = NULL;
+ P_MapStart();
- for (i = 0; i < 16; i++)
- skyboxviewpnts[i] = skyboxcenterpnts[i] = NULL;
+ if (lastloadedmaplumpnum)
+ {
+ virtres_t* virt = vres_GetMap(lastloadedmaplumpnum);
- P_MapStart();
+ P_LoadMapData(virt);
+ P_LoadMapBSP(virt);
+ P_LoadMapLUT(virt);
- P_PrepareRawThings(wadData + (fileinfo + ML_THINGS)->filepos, (fileinfo + ML_THINGS)->size);
- Z_Free(wadData);
- }
- else
- {
- // Important: take care of the ordering of the next functions.
- loadedbm = P_LoadBlockMap(lastloadedmaplumpnum + ML_BLOCKMAP);
- P_LoadVertexes(lastloadedmaplumpnum + ML_VERTEXES);
- P_LoadSectors(lastloadedmaplumpnum + ML_SECTORS);
- P_LoadSideDefs(lastloadedmaplumpnum + ML_SIDEDEFS);
- P_LoadLineDefs(lastloadedmaplumpnum + ML_LINEDEFS);
- P_LoadSideDefs2(lastloadedmaplumpnum + ML_SIDEDEFS);
- P_LoadSubsectors(lastloadedmaplumpnum + ML_SSECTORS);
- P_LoadNodes(lastloadedmaplumpnum + ML_NODES);
- P_LoadSegs(lastloadedmaplumpnum + ML_SEGS);
- P_LoadReject(lastloadedmaplumpnum + ML_REJECT);
-
- // Important: take care of the ordering of the next functions.
- if (!loadedbm)
- P_CreateBlockMap(); // Graue 02-29-2004
P_LoadLineDefs2();
P_GroupLines();
- numdmstarts = numredctfstarts = numbluectfstarts = 0;
-
- // reset the player starts
- for (i = 0; i < MAXPLAYERS; i++)
- playerstarts[i] = bluectfstarts[i] = redctfstarts[i] = NULL;
-
- for (i = 0; i < MAX_DM_STARTS; i++)
- deathmatchstarts[i] = NULL;
-
- for (i = 0; i < 2; i++)
- skyboxmo[i] = NULL;
-
- for (i = 0; i < 16; i++)
- skyboxviewpnts[i] = skyboxcenterpnts[i] = NULL;
- P_MapStart();
+ P_MakeMapMD5(virt, &mapmd5);
- P_PrepareThings(lastloadedmaplumpnum + ML_THINGS);
+ vres_Free(virt);
}
// init gravity, tag lists,
diff --git a/src/p_spec.c b/src/p_spec.c
index dba4e17b5438a966620d07aec2e232268967a92a..0b0ba940d699a7725969787bcd6796a92943f5be 100644
--- a/src/p_spec.c
+++ b/src/p_spec.c
@@ -138,6 +138,13 @@ static size_t maxanims;
static animdef_t *animdefs = NULL;
+// Increase the size of animdefs to make room for a new animation definition
+static void GrowAnimDefs(void)
+{
+ maxanims++;
+ animdefs = (animdef_t *)Z_Realloc(animdefs, sizeof(animdef_t)*(maxanims + 1), PU_STATIC, NULL);
+}
+
// A prototype; here instead of p_spec.h, so they're "private"
void P_ParseANIMDEFSLump(INT32 wadNum, UINT16 lumpnum);
void P_ParseAnimationDefintion(SINT8 istexture);
@@ -347,8 +354,7 @@ void P_ParseAnimationDefintion(SINT8 istexture)
if (i == maxanims)
{
// Increase the size to make room for the new animation definition
- maxanims++;
- animdefs = (animdef_t *)Z_Realloc(animdefs, sizeof(animdef_t)*(maxanims + 1), PU_STATIC, NULL);
+ GrowAnimDefs();
strncpy(animdefs[i].startname, animdefsToken, 9);
}
@@ -434,8 +440,17 @@ void P_ParseAnimationDefintion(SINT8 istexture)
}
animdefs[i].speed = animSpeed;
Z_Free(animdefsToken);
-}
+#ifdef WALLFLATS
+ // hehe... uhh.....
+ if (!istexture)
+ {
+ GrowAnimDefs();
+ M_Memcpy(&animdefs[maxanims-1], &animdefs[i], sizeof(animdef_t));
+ animdefs[maxanims-1].istexture = 1;
+ }
+#endif
+}
/** Checks for flats in levelflats that are part of a flat animation sequence
* and sets them up for animation.
@@ -476,7 +491,8 @@ static inline void P_FindAnimatedFlat(INT32 animnum)
atoi(sizeu1(i)), foundflats->name, foundflats->animseq,
foundflats->numpics,foundflats->speed);
}
- else if (foundflats->u.flat.lumpnum >= startflatnum && foundflats->u.flat.lumpnum <= endflatnum)
+ else if ((!anims[animnum].istexture) && (foundflats->type == LEVELFLAT_FLAT)
+ && (foundflats->u.flat.lumpnum >= startflatnum && foundflats->u.flat.lumpnum <= endflatnum))
{
foundflats->u.flat.baselumpnum = startflatnum;
foundflats->animseq = foundflats->u.flat.lumpnum - startflatnum;
@@ -1587,8 +1603,6 @@ static inline void P_InitTagLists(void)
size_t j = (unsigned)sectors[i].tag % numsectors;
sectors[i].nexttag = sectors[j].firsttag;
sectors[j].firsttag = (INT32)i;
- sectors[i].spawn_nexttag = sectors[i].nexttag;
- sectors[j].spawn_firsttag = sectors[j].firsttag;
}
for (i = numlines - 1; i != (size_t)-1; i--)
@@ -4678,7 +4692,7 @@ DoneSection2:
}
case 2: // Special stage GOAL sector / Exit Sector / CTF Flag Return
- if (player->bot || !G_PlatformGametype())
+ if (player->bot || !(gametyperules & GTR_ALLOWEXIT))
break;
if (!(maptol & TOL_NIGHTS) && G_IsSpecialStage(gamemap) && player->nightstime > 6)
{
@@ -4713,7 +4727,7 @@ DoneSection2:
break;
case 3: // Red Team's Base
- if (gametype == GT_CTF && P_IsObjectOnGround(player->mo))
+ if ((gametyperules & GTR_TEAMFLAGS) && P_IsObjectOnGround(player->mo))
{
if (player->ctfteam == 1 && (player->gotflag & GF_BLUEFLAG))
{
@@ -4746,7 +4760,7 @@ DoneSection2:
break;
case 4: // Blue Team's Base
- if (gametype == GT_CTF && P_IsObjectOnGround(player->mo))
+ if ((gametyperules & GTR_TEAMFLAGS) && P_IsObjectOnGround(player->mo))
{
if (player->ctfteam == 2 && (player->gotflag & GF_REDFLAG))
{
@@ -5626,7 +5640,7 @@ void P_UpdateSpecials(void)
if (foundflats->speed) // it is an animated flat
{
// update the levelflat texture number
- if (foundflats->type == LEVELFLAT_TEXTURE)
+ if ((foundflats->type == LEVELFLAT_TEXTURE) && (foundflats->u.texture.basenum != -1))
foundflats->u.texture.num = foundflats->u.texture.basenum + ((leveltime/foundflats->speed + foundflats->animseq) % foundflats->numpics);
// update the levelflat lump number
else if ((foundflats->type == LEVELFLAT_FLAT) && (foundflats->u.flat.baselumpnum != LUMPERROR))
@@ -6389,22 +6403,16 @@ static void P_ApplyFlatAlignment(line_t *master, sector_t *sector, angle_t flata
{
if (!(master->flags & ML_NETONLY)) // Modify floor flat alignment unless ML_NETONLY flag is set
{
- sector->spawn_flrpic_angle = sector->floorpic_angle = flatangle;
+ sector->floorpic_angle = flatangle;
sector->floor_xoffs += xoffs;
sector->floor_yoffs += yoffs;
- // saved for netgames
- sector->spawn_flr_xoffs = sector->floor_xoffs;
- sector->spawn_flr_yoffs = sector->floor_yoffs;
}
if (!(master->flags & ML_NONET)) // Modify ceiling flat alignment unless ML_NONET flag is set
{
- sector->spawn_ceilpic_angle = sector->ceilingpic_angle = flatangle;
+ sector->ceilingpic_angle = flatangle;
sector->ceiling_xoffs += xoffs;
sector->ceiling_yoffs += yoffs;
- // saved for netgames
- sector->spawn_ceil_xoffs = sector->ceiling_xoffs;
- sector->spawn_ceil_yoffs = sector->ceiling_yoffs;
}
}
@@ -6425,7 +6433,7 @@ void P_SpawnSpecials(INT32 fromnetsave)
INT32 j;
thinkerlist_t *secthinkers;
thinker_t *th;
-
+ virtres_t* virt = NULL;
// This used to be used, and *should* be used in the future,
// but currently isn't.
(void)fromnetsave;
@@ -7177,17 +7185,10 @@ void P_SpawnSpecials(INT32 fromnetsave)
UINT8 *data;
UINT16 b;
- if (W_IsLumpWad(lastloadedmaplumpnum)) // welp it's a map wad in a pk3
- { // HACK: Open wad file rather quickly so we can get the data from the sidedefs lump
- UINT8 *wadData = W_CacheLumpNum(lastloadedmaplumpnum, PU_STATIC);
- filelump_t *fileinfo = (filelump_t *)(wadData + ((wadinfo_t *)wadData)->infotableofs);
- fileinfo += ML_SIDEDEFS; // we only need the SIDEDEFS lump
- data = Z_Malloc(fileinfo->size, PU_STATIC, NULL);
- M_Memcpy(data, wadData + fileinfo->filepos, fileinfo->size); // copy data
- Z_Free(wadData); // we're done with this now
- }
- else // phew it's just a WAD
- data = W_CacheLumpNum(lastloadedmaplumpnum + ML_SIDEDEFS,PU_STATIC);
+ if (!virt)
+ virt = vres_GetMap(lastloadedmaplumpnum);
+
+ data = (UINT8*) vres_Find(virt, "SIDEDEFS")->data;
for (b = 0; b < (INT16)numsides; b++)
{
@@ -7207,7 +7208,6 @@ void P_SpawnSpecials(INT32 fromnetsave)
I_Error("Make-Your-Own-FOF (tag %d) needs a value in the linedef's second side upper texture field.", lines[i].tag);
}
}
- Z_Free(data);
}
else
I_Error("Make-Your-Own FOF (tag %d) found without a 2nd linedef side!", lines[i].tag);
@@ -7224,14 +7224,14 @@ void P_SpawnSpecials(INT32 fromnetsave)
break;
case 308: // Race-only linedef executor. Triggers once.
- if (gametype != GT_RACE && gametype != GT_COMPETITION)
+ if (!(gametyperules & GTR_RACE))
lines[i].special = 0;
break;
// Linedef executor triggers for CTF teams.
case 309:
case 311:
- if (gametype != GT_CTF)
+ if (!(gametyperules & GTR_TEAMFLAGS))
lines[i].special = 0;
break;
@@ -7433,6 +7433,9 @@ void P_SpawnSpecials(INT32 fromnetsave)
}
}
+ if (virt)
+ vres_Free(virt);
+
// Allocate each list
for (i = 0; i < numsectors; i++)
if(secthinkers[i].thinkers)
diff --git a/src/p_user.c b/src/p_user.c
index 2968a53bcf563cbad5eeae3a1e35bc2a8625d212..996faccd3f473c0319536ba4b0631335db11b3b1 100644
--- a/src/p_user.c
+++ b/src/p_user.c
@@ -387,7 +387,7 @@ UINT8 P_FindLowestMare(void)
mobj_t *mo2;
UINT8 mare = UINT8_MAX;
- if (gametype == GT_RACE || gametype == GT_COMPETITION)
+ if (gametyperules & GTR_RACE)
return 0;
// scan the thinkers
@@ -789,7 +789,7 @@ void P_NightserizePlayer(player_t *player, INT32 nighttime)
P_RestoreMusic(player);
}
- if (gametype == GT_RACE || gametype == GT_COMPETITION)
+ if (gametyperules & GTR_RACE)
{
if (player->drillmeter < 48*20)
player->drillmeter = 48*20;
@@ -1596,7 +1596,7 @@ void P_RestoreMusic(player_t *player)
P_PlayJingle(player, JT_SUPER);
// Invulnerability
- else if (player->powers[pw_invulnerability] > 1)
+ else if (player->powers[pw_invulnerability] > 1 && !player->powers[pw_super])
{
strlcpy(S_sfx[sfx_None].caption, "Invincibility", 14);
S_StartCaption(sfx_None, -1, player->powers[pw_invulnerability]);
@@ -2177,7 +2177,7 @@ void P_DoPlayerExit(player_t *player)
if (cv_allowexitlevel.value == 0 && !G_PlatformGametype())
return;
- else if (gametype == GT_RACE || gametype == GT_COMPETITION) // If in Race Mode, allow
+ else if (gametyperules & GTR_RACE) // If in Race Mode, allow
{
if (!countdown) // a 60-second wait ala Sonic 2.
countdown = (cv_countdowntime.value - 1)*TICRATE + 1; // Use cv_countdowntime
@@ -3106,7 +3106,7 @@ static void P_DoPlayerHeadSigns(player_t *player)
}
}
}
- else if (gametype == GT_CTF && (player->gotflag & (GF_REDFLAG|GF_BLUEFLAG))) // If you have the flag (duh).
+ else if ((gametyperules & GTR_TEAMFLAGS) && (player->gotflag & (GF_REDFLAG|GF_BLUEFLAG))) // If you have the flag (duh).
{
// Spawn a got-flag message over the head of the player that
// has it (but not on your own screen if you have the flag).
@@ -4631,7 +4631,7 @@ static void P_DoSpinAbility(player_t *player, ticcmd_t *cmd)
S_StartSound(player->mo, sfx_spin);
break;
}
- if (player->dashspeed < player->maxdash)
+ if (player->dashspeed < player->maxdash && player->mindash != player->maxdash)
{
#define chargecalculation (6*(player->dashspeed - player->mindash))/(player->maxdash - player->mindash)
fixed_t soundcalculation = chargecalculation;
@@ -4666,7 +4666,7 @@ static void P_DoSpinAbility(player_t *player, ticcmd_t *cmd)
if (player->powers[pw_carry] == CR_BRAKGOOP)
player->dashspeed = 0;
- if (!((gametype == GT_RACE || gametype == GT_COMPETITION) && leveltime < 4*TICRATE))
+ if (!((gametyperules & GTR_RACE) && leveltime < 4*TICRATE))
{
if (player->dashspeed)
{
@@ -5044,7 +5044,7 @@ static void P_DoJumpStuff(player_t *player, ticcmd_t *cmd)
{
if (onground || player->climbing || player->powers[pw_carry])
;
- else if (gametype == GT_CTF && player->gotflag)
+ else if ((gametyperules & GTR_TEAMFLAGS) && player->gotflag)
;
else if (player->pflags & (PF_GLIDING|PF_SLIDING|PF_SHIELDABILITY)) // If the player has used an ability previously
;
@@ -5124,11 +5124,7 @@ static void P_DoJumpStuff(player_t *player, ticcmd_t *cmd)
boolean elem = ((player->powers[pw_shield] & SH_NOSTACK) == SH_ELEMENTAL);
player->pflags |= PF_THOKKED|PF_SHIELDABILITY;
if (elem)
- {
- player->pflags |= PF_NOJUMPDAMAGE;
- P_SetPlayerMobjState(player->mo, S_PLAY_FALL);
S_StartSound(player->mo, sfx_s3k43);
- }
else
{
player->pflags &= ~PF_NOJUMPDAMAGE;
@@ -5269,7 +5265,7 @@ static void P_DoJumpStuff(player_t *player, ticcmd_t *cmd)
player->secondjump = 0;
player->pflags &= ~PF_THOKKED;
}
- else if (player->pflags & PF_SLIDING || (gametype == GT_CTF && player->gotflag))
+ else if (player->pflags & PF_SLIDING || ((gametyperules & GTR_TEAMFLAGS) && player->gotflag) || player->pflags & PF_SHIELDABILITY)
;
/*else if (P_SuperReady(player))
{
@@ -5556,7 +5552,7 @@ static void P_DoJumpStuff(player_t *player, ticcmd_t *cmd)
{
player->pflags |= PF_JUMPDOWN;
- if ((gametype != GT_CTF || !player->gotflag) && !player->exiting)
+ if ((!(gametyperules & GTR_TEAMFLAGS) || !player->gotflag) && !player->exiting)
{
if (player->secondjump == 1 && player->charability != CA_DOUBLEJUMP)
{
@@ -7129,7 +7125,7 @@ static void P_NiGHTSMovement(player_t *player)
&& !player->exiting)
player->nightstime--;
}
- else if (gametype != GT_RACE && gametype != GT_COMPETITION
+ else if (!(gametyperules & GTR_RACE)
&& !(player->mo->state >= &states[S_PLAY_NIGHTS_TRANS1]
&& player->mo->state <= &states[S_PLAY_NIGHTS_TRANS6])
&& !(player->capsule && player->capsule->reactiontime)
@@ -7283,7 +7279,7 @@ static void P_NiGHTSMovement(player_t *player)
{
player->mo->momx = player->mo->momy = 0;
- if (gametype != GT_RACE && gametype != GT_COMPETITION)
+ if (!(gametyperules & GTR_RACE))
P_SetObjectMomZ(player->mo, FRACUNIT/2, (P_MobjFlip(player->mo)*player->mo->momz >= 0));
else
player->mo->momz = 0;
@@ -9521,12 +9517,12 @@ static void P_DeathThink(player_t *player)
player->playerstate = PST_REBORN;
}
- if (gametype == GT_RACE || gametype == GT_COMPETITION || (gametype == GT_COOP && (multiplayer || netgame)))
+ if ((gametyperules & GTR_RACE) || (gametype == GT_COOP && (multiplayer || netgame)))
{
// Keep time rolling in race mode
if (!(countdown2 && !countdown) && !player->exiting && !(player->pflags & PF_GAMETYPEOVER) && !stoppedclock)
{
- if (gametype == GT_RACE || gametype == GT_COMPETITION)
+ if (gametyperules & GTR_RACE)
{
if (leveltime >= 4*TICRATE)
player->realtime = leveltime - 4*TICRATE;
@@ -10350,6 +10346,11 @@ boolean P_SpectatorJoinGame(player_t *player)
else
changeto = (P_RandomFixed() & 1) + 1;
+#ifdef HAVE_BLUA
+ if (!LUAh_TeamSwitch(player, changeto, true, false, false))
+ return false;
+#endif
+
if (player->mo)
{
P_RemoveMobj(player->mo);
@@ -10361,7 +10362,14 @@ boolean P_SpectatorJoinGame(player_t *player)
//Reset away view
if (P_IsLocalPlayer(player) && displayplayer != consoleplayer)
+ {
+#ifdef HAVE_BLUA
+ // Call ViewpointSwitch hooks here.
+ // The viewpoint was forcibly changed.
+ LUAh_ViewpointSwitch(player, &players[displayplayer], true);
+#endif
displayplayer = consoleplayer;
+ }
if (changeto == 1)
CONS_Printf(M_GetText("%s switched to the %c%s%c.\n"), player_names[player-players], '\x85', M_GetText("Red team"), '\x80');
@@ -10375,8 +10383,12 @@ boolean P_SpectatorJoinGame(player_t *player)
{
// Exception for hide and seek. Don't join a game when you simply
// respawn in place and sit there for the rest of the round.
- if (!(gametype == GT_HIDEANDSEEK && leveltime > (hidetime * TICRATE)))
+ if (!((gametyperules & GTR_HIDEFROZEN) && leveltime > (hidetime * TICRATE)))
{
+#ifdef HAVE_BLUA
+ if (!LUAh_TeamSwitch(player, 3, true, false, false))
+ return false;
+#endif
if (player->mo)
{
P_RemoveMobj(player->mo);
@@ -10399,7 +10411,14 @@ boolean P_SpectatorJoinGame(player_t *player)
//Reset away view
if (P_IsLocalPlayer(player) && displayplayer != consoleplayer)
+ {
+#ifdef HAVE_BLUA
+ // Call ViewpointSwitch hooks here.
+ // The viewpoint was forcibly changed.
+ LUAh_ViewpointSwitch(player, &players[displayplayer], true);
+#endif
displayplayer = consoleplayer;
+ }
if (gametype != GT_COOP)
CONS_Printf(M_GetText("%s entered the game.\n"), player_names[player-players]);
@@ -10525,7 +10544,7 @@ void P_DoPityCheck(player_t *player)
{
// No pity outside of match or CTF.
if (player->spectator
- || !(gametype == GT_MATCH || gametype == GT_TEAMMATCH || gametype == GT_CTF))
+ || !(gametyperules & GTR_PITYSHIELD))
return;
// Apply pity shield if available.
@@ -11358,7 +11377,7 @@ void P_PlayerThink(player_t *player)
I_Error("player %s is in PST_REBORN\n", sizeu1(playeri));
#endif
- if (gametype == GT_RACE || gametype == GT_COMPETITION)
+ if (gametyperules & GTR_RACE)
{
INT32 i;
@@ -11421,7 +11440,7 @@ void P_PlayerThink(player_t *player)
player->exiting > 0 && player->exiting <= 1*TICRATE &&
(!multiplayer || gametype == GT_COOP ? !mapheaderinfo[gamemap-1]->musinterfadeout : true) &&
// don't fade if we're fading during intermission. follows Y_StartIntermission intertype = int_coop
- (gametype == GT_RACE || gametype == GT_COMPETITION ? countdown2 == 0 : true) && // don't fade on timeout
+ ((gametyperules & GTR_RACE) ? countdown2 == 0 : true) && // don't fade on timeout
player->lives > 0 && // don't fade on game over (competition)
P_IsLocalPlayer(player))
{
@@ -11536,7 +11555,7 @@ void P_PlayerThink(player_t *player)
player->lives = cv_startinglives.value;
}
- if ((gametype == GT_RACE || gametype == GT_COMPETITION) && leveltime < 4*TICRATE)
+ if ((gametyperules & GTR_RACE) && leveltime < 4*TICRATE)
{
cmd->buttons &= BT_USE; // Remove all buttons except BT_USE
cmd->forwardmove = 0;
@@ -11546,7 +11565,7 @@ void P_PlayerThink(player_t *player)
// Synchronizes the "real" amount of time spent in the level.
if (!player->exiting && !stoppedclock)
{
- if (gametype == GT_RACE || gametype == GT_COMPETITION)
+ if (gametyperules & GTR_RACE)
{
if (leveltime >= 4*TICRATE)
player->realtime = leveltime - 4*TICRATE;
diff --git a/src/r_data.c b/src/r_data.c
index c3f3bf8ff7826292a44862ad8a88d0ea5979594f..cecd4840ccb4badf6d42434a6800ec3c7259d2bb 100644
--- a/src/r_data.c
+++ b/src/r_data.c
@@ -441,7 +441,7 @@ static UINT8 *R_GenerateTexture(size_t texnum)
texture_t *texture;
texpatch_t *patch;
patch_t *realpatch;
- boolean dealloc = false;
+ UINT8 *pdata;
int x, x1, x2, i, width, height;
size_t blocksize;
column_t *patchcol;
@@ -469,12 +469,17 @@ static UINT8 *R_GenerateTexture(size_t texnum)
wadnum = patch->wad;
lumpnum = patch->lump;
lumplength = W_LumpLengthPwad(wadnum, lumpnum);
- realpatch = W_CacheLumpNumPwad(wadnum, lumpnum, PU_CACHE); // can't use W_CachePatchNumPwad because OpenGL
+ pdata = W_CacheLumpNumPwad(wadnum, lumpnum, PU_CACHE);
+ realpatch = (patch_t *)pdata;
#ifndef NO_PNG_LUMPS
if (R_IsLumpPNG((UINT8 *)realpatch, lumplength))
goto multipatch;
#endif
+#ifdef WALLFLATS
+ if (texture->type == TEXTURETYPE_FLAT)
+ goto multipatch;
+#endif
// Check the patch for holes.
if (texture->width > SHORT(realpatch->width) || texture->height > SHORT(realpatch->height))
@@ -531,9 +536,7 @@ static UINT8 *R_GenerateTexture(size_t texnum)
}
// multi-patch textures (or 'composite')
-#ifndef NO_PNG_LUMPS
multipatch:
-#endif
texture->holes = false;
texture->flip = 0;
blocksize = (texture->width * 4) + (texture->width * texture->height);
@@ -552,6 +555,7 @@ static UINT8 *R_GenerateTexture(size_t texnum)
// Composite the columns together.
for (i = 0, patch = texture->patches; i < texture->patchcount; i++, patch++)
{
+ boolean dealloc = true;
static void (*ColumnDrawerPointer)(column_t *, UINT8 *, texpatch_t *, INT32, INT32); // Column drawing function pointer.
if (patch->style != AST_COPY)
ColumnDrawerPointer = (patch->flip & 2) ? R_DrawBlendFlippedColumnInCache : R_DrawBlendColumnInCache;
@@ -560,17 +564,25 @@ static UINT8 *R_GenerateTexture(size_t texnum)
wadnum = patch->wad;
lumpnum = patch->lump;
+ pdata = W_CacheLumpNumPwad(wadnum, lumpnum, PU_CACHE);
lumplength = W_LumpLengthPwad(wadnum, lumpnum);
- realpatch = W_CacheLumpNumPwad(wadnum, lumpnum, PU_CACHE);
- dealloc = false;
+ realpatch = (patch_t *)pdata;
+ dealloc = true;
#ifndef NO_PNG_LUMPS
if (R_IsLumpPNG((UINT8 *)realpatch, lumplength))
- {
realpatch = R_PNGToPatch((UINT8 *)realpatch, lumplength, NULL, false);
- dealloc = true;
- }
+ else
#endif
+#ifdef WALLFLATS
+ if (texture->type == TEXTURETYPE_FLAT)
+ realpatch = R_FlatToPatch(pdata, texture->width, texture->height, 0, 0, NULL, false);
+ else
+#endif
+ {
+ (void)lumplength;
+ dealloc = false;
+ }
x1 = patch->originx;
width = SHORT(realpatch->width);
@@ -725,7 +737,6 @@ void R_LoadTextures(void)
for (w = 0, numtextures = 0; w < numwadfiles; w++)
{
// Count the textures from TEXTURES lumps
-
texturesLumpPos = W_CheckNumForNamePwad("TEXTURES", (UINT16)w, 0);
while (texturesLumpPos != INT16_MAX)
{
@@ -734,7 +745,6 @@ void R_LoadTextures(void)
}
// Count single-patch textures
-
if (wadfiles[w]->type == RET_PK3)
{
texstart = W_CheckNumForFolderStartPK3("textures/", (UINT16)w, 0);
@@ -747,7 +757,11 @@ void R_LoadTextures(void)
}
if (texstart == INT16_MAX || texend == INT16_MAX)
+#ifdef WALLFLATS
+ goto countflats;
+#else
continue;
+#endif
texstart++; // Do not count the first marker
@@ -764,6 +778,40 @@ void R_LoadTextures(void)
{
numtextures += (UINT32)(texend - texstart);
}
+
+#ifdef WALLFLATS
+countflats:
+ // Count flats
+ if (wadfiles[w]->type == RET_PK3)
+ {
+ texstart = W_CheckNumForFolderStartPK3("flats/", (UINT16)w, 0);
+ texend = W_CheckNumForFolderEndPK3("flats/", (UINT16)w, texstart);
+ }
+ else
+ {
+ texstart = W_CheckNumForNamePwad("F_START", (UINT16)w, 0);
+ texend = W_CheckNumForNamePwad("F_END", (UINT16)w, texstart);
+ }
+
+ if (texstart == INT16_MAX || texend == INT16_MAX)
+ continue;
+
+ texstart++; // Do not count the first marker
+
+ // PK3s have subfolders, so we can't just make a simple sum
+ if (wadfiles[w]->type == RET_PK3)
+ {
+ for (j = texstart; j < texend; j++)
+ {
+ if (!W_IsLumpFolder((UINT16)w, j)) // Check if lump is a folder; if not, then count it
+ numtextures++;
+ }
+ }
+ else // Add all the textures between F_START and F_END
+ {
+ numtextures += (UINT32)(texend - texstart);
+ }
+#endif
}
// If no textures found by this point, bomb out
@@ -813,7 +861,11 @@ void R_LoadTextures(void)
}
if (texstart == INT16_MAX || texend == INT16_MAX)
+#ifdef WALLFLATS
+ goto checkflats;
+#else
continue;
+#endif
texstart++; // Do not count the first marker
@@ -857,6 +909,8 @@ void R_LoadTextures(void)
texture->width = SHORT(patchlump->width);
texture->height = SHORT(patchlump->height);
}
+
+ texture->type = TEXTURETYPE_SINGLEPATCH;
texture->patchcount = 1;
texture->holes = false;
texture->flip = 0;
@@ -875,6 +929,107 @@ void R_LoadTextures(void)
textureheight[i] = texture->height << FRACBITS;
i++;
}
+
+#ifdef WALLFLATS
+checkflats:
+ // Yes
+ if (wadfiles[w]->type == RET_PK3)
+ {
+ texstart = W_CheckNumForFolderStartPK3("flats/", (UINT16)w, 0);
+ texend = W_CheckNumForFolderEndPK3("flats/", (UINT16)w, texstart);
+ }
+ else
+ {
+ texstart = W_CheckNumForNamePwad("F_START", (UINT16)w, 0);
+ texend = W_CheckNumForNamePwad("F_END", (UINT16)w, texstart);
+ }
+
+ if (texstart == INT16_MAX || texend == INT16_MAX)
+ continue;
+
+ texstart++; // Do not count the first marker
+
+ // Work through each lump between the markers in the WAD.
+ for (j = 0; j < (texend - texstart); j++)
+ {
+ UINT8 *flatlump;
+ UINT16 wadnum = (UINT16)w;
+ lumpnum_t lumpnum = texstart + j;
+ size_t lumplength;
+ size_t flatsize = 0;
+
+ if (wadfiles[w]->type == RET_PK3)
+ {
+ if (W_IsLumpFolder(wadnum, lumpnum)) // Check if lump is a folder
+ continue; // If it is then SKIP IT
+ }
+
+ flatlump = W_CacheLumpNumPwad(wadnum, lumpnum, PU_CACHE);
+ lumplength = W_LumpLengthPwad(wadnum, lumpnum);
+
+ switch (lumplength)
+ {
+ case 4194304: // 2048x2048 lump
+ flatsize = 2048;
+ break;
+ case 1048576: // 1024x1024 lump
+ flatsize = 1024;
+ break;
+ case 262144:// 512x512 lump
+ flatsize = 512;
+ break;
+ case 65536: // 256x256 lump
+ flatsize = 256;
+ break;
+ case 16384: // 128x128 lump
+ flatsize = 128;
+ break;
+ case 1024: // 32x32 lump
+ flatsize = 32;
+ break;
+ default: // 64x64 lump
+ flatsize = 64;
+ break;
+ }
+
+ //CONS_Printf("\n\"%s\" is a flat, dimensions %d x %d",W_CheckNameForNumPwad((UINT16)w,texstart+j),flatsize,flatsize);
+ texture = textures[i] = Z_Calloc(sizeof(texture_t) + sizeof(texpatch_t), PU_STATIC, NULL);
+
+ // Set texture properties.
+ M_Memcpy(texture->name, W_CheckNameForNumPwad(wadnum, lumpnum), sizeof(texture->name));
+
+#ifndef NO_PNG_LUMPS
+ if (R_IsLumpPNG((UINT8 *)flatlump, lumplength))
+ {
+ INT16 width, height;
+ R_PNGDimensions((UINT8 *)flatlump, &width, &height, lumplength);
+ texture->width = width;
+ texture->height = height;
+ }
+ else
+#endif
+ texture->width = texture->height = flatsize;
+
+ texture->type = TEXTURETYPE_FLAT;
+ texture->patchcount = 1;
+ texture->holes = false;
+ texture->flip = 0;
+
+ // Allocate information for the texture's patches.
+ patch = &texture->patches[0];
+
+ patch->originx = patch->originy = 0;
+ patch->wad = (UINT16)w;
+ patch->lump = texstart + j;
+ patch->flip = 0;
+
+ Z_Unlock(flatlump);
+
+ texturewidth[i] = texture->width;
+ textureheight[i] = texture->height << FRACBITS;
+ i++;
+ }
+#endif
}
#ifdef HWRENDER
@@ -1191,6 +1346,7 @@ static texture_t *R_ParseTexture(boolean actuallyLoadTexture)
M_Memcpy(resultTexture->name, newTextureName, 8);
resultTexture->width = newTextureWidth;
resultTexture->height = newTextureHeight;
+ resultTexture->type = TEXTURETYPE_COMPOSITE;
}
Z_Free(texturesToken);
texturesToken = M_GetToken(NULL);
diff --git a/src/r_data.h b/src/r_data.h
index 2ab362b7b376b1decf9104bb7834deed5953f477..f028f2f5d16ef54da544d56780448adc84d8b858 100644
--- a/src/r_data.h
+++ b/src/r_data.h
@@ -45,6 +45,17 @@ typedef struct
enum patchalphastyle style;
} texpatch_t;
+// texture type
+enum
+{
+ TEXTURETYPE_UNKNOWN,
+ TEXTURETYPE_SINGLEPATCH,
+ TEXTURETYPE_COMPOSITE,
+#ifdef WALLFLATS
+ TEXTURETYPE_FLAT,
+#endif
+};
+
// A maptexturedef_t describes a rectangular texture,
// which is composed of one or more mappatch_t structures
// that arrange graphic patches.
@@ -52,6 +63,7 @@ typedef struct
{
// Keep name for switch changing, etc.
char name[8];
+ UINT8 type; // TEXTURETYPE_
INT16 width, height;
boolean holes;
UINT8 flip; // 1 = flipx, 2 = flipy, 3 = both
@@ -159,6 +171,8 @@ const char *R_NameForColormap(extracolormap_t *extra_colormap);
#define R_PutRgbaRGB(r, g, b) (R_PutRgbaR(r) + R_PutRgbaG(g) + R_PutRgbaB(b))
#define R_PutRgbaRGBA(r, g, b, a) (R_PutRgbaRGB(r, g, b) + R_PutRgbaA(a))
+UINT8 NearestColor(UINT8 r, UINT8 g, UINT8 b);
+
extern INT32 numtextures;
#endif
diff --git a/src/r_defs.h b/src/r_defs.h
index 3cc780545446509c55d0eaffcabaf5e77521b7bf..353dc572b6e6422337869b1871aa7ca674f05273 100644
--- a/src/r_defs.h
+++ b/src/r_defs.h
@@ -384,17 +384,6 @@ typedef struct sector_s
// for fade thinker
INT16 spawn_lightlevel;
- // these are saved for netgames, so do not let Lua touch these!
- INT32 spawn_nexttag, spawn_firsttag; // the actual nexttag/firsttag values may differ if the sector's tag was changed
-
- // offsets sector spawned with (via linedef type 7)
- fixed_t spawn_flr_xoffs, spawn_flr_yoffs;
- fixed_t spawn_ceil_xoffs, spawn_ceil_yoffs;
-
- // flag angles sector spawned with (via linedef type 7)
- angle_t spawn_flrpic_angle;
- angle_t spawn_ceilpic_angle;
-
// colormap structure
extracolormap_t *spawn_extra_colormap;
} sector_t;
diff --git a/src/r_plane.c b/src/r_plane.c
index 3214fa23d8c3a0cadc96b0322e0b696b55b7c736..5d5e1f20df6899bddabe214991567c8681cb41e4 100644
--- a/src/r_plane.c
+++ b/src/r_plane.c
@@ -788,6 +788,8 @@ static UINT8 *R_GetTextureFlat(levelflat_t *levelflat, boolean leveltexture, boo
patch_t *patch = NULL;
boolean texturechanged = (leveltexture ? (levelflat->u.texture.num != levelflat->u.texture.lastnum) : false);
+ (void)ispng;
+
// Check if the texture changed.
if (leveltexture && (!texturechanged))
{
diff --git a/src/r_state.h b/src/r_state.h
index 75566923b140adfdffb47a3f64282e3f4ea3a3b5..4e1eb388e7d0a05d46a9c5ee80970c7b2545d2c9 100644
--- a/src/r_state.h
+++ b/src/r_state.h
@@ -63,6 +63,7 @@ extern seg_t *segs;
extern size_t numsectors;
extern sector_t *sectors;
+extern sector_t *spawnsectors;
extern size_t numsubsectors;
extern subsector_t *subsectors;
@@ -72,9 +73,11 @@ extern node_t *nodes;
extern size_t numlines;
extern line_t *lines;
+extern line_t *spawnlines;
extern size_t numsides;
extern side_t *sides;
+extern side_t *spawnsides;
//
// POV data.
diff --git a/src/sdl/i_main.c b/src/sdl/i_main.c
index 029febc059a10e8458de222eccce1180927e1a52..d0830396fa8741cc99ec3e3f7aa32484bb16f2de 100644
--- a/src/sdl/i_main.c
+++ b/src/sdl/i_main.c
@@ -47,6 +47,7 @@ extern int SDL_main(int argc, char *argv[]);
#ifdef LOGMESSAGES
FILE *logstream = NULL;
+char logfilename[1024];
#endif
#ifndef DOXYGEN
@@ -116,7 +117,6 @@ int main(int argc, char **argv)
#endif
{
const char *logdir = NULL;
- char logfile[MAX_WADPATH];
myargc = argc;
myargv = argv; /// \todo pull out path to exe from this string
@@ -141,7 +141,7 @@ int main(int argc, char **argv)
timeinfo = localtime(&my_time);
strftime(buf, 26, "%Y-%m-%d %H-%M-%S", timeinfo);
- strcpy(logfile, va("log-%s.txt", buf));
+ strcpy(logfilename, va("log-%s.txt", buf));
#ifdef DEFAULTDIR
if (logdir)
@@ -149,14 +149,16 @@ int main(int argc, char **argv)
// Create dirs here because D_SRB2Main() is too late.
I_mkdir(va("%s%s"DEFAULTDIR, logdir, PATHSEP), 0755);
I_mkdir(va("%s%s"DEFAULTDIR"%slogs",logdir, PATHSEP, PATHSEP), 0755);
- logstream = fopen(va("%s%s"DEFAULTDIR"%slogs%s%s",logdir, PATHSEP, PATHSEP, PATHSEP, logfile), "wt");
+ strcpy(logfilename, va("%s%s"DEFAULTDIR"%slogs%s%s",logdir, PATHSEP, PATHSEP, PATHSEP, logfilename));
}
else
#endif
{
I_mkdir("."PATHSEP"logs"PATHSEP, 0755);
- logstream = fopen(va("."PATHSEP"logs"PATHSEP"%s", logfile), "wt");
+ strcpy(logfilename, va("."PATHSEP"logs"PATHSEP"%s", logfilename));
}
+
+ logstream = fopen(logfilename, "wt");
}
#endif
@@ -181,12 +183,13 @@ int main(int argc, char **argv)
#endif
MakeCodeWritable();
#endif
+
// startup SRB2
CONS_Printf("Setting up SRB2...\n");
D_SRB2Main();
#ifdef LOGMESSAGES
if (!M_CheckParm("-nolog"))
- CONS_Printf("Logfile: %s\n", logfile);
+ CONS_Printf("Logfile: %s\n", logfilename);
#endif
CONS_Printf("Entering main game loop...\n");
// never return
diff --git a/src/sdl/i_system.c b/src/sdl/i_system.c
index 13fb25bea3e6384df3f195148d5d64f3a301c8e5..52186baae20dfca6e924aea5d87105f2decfb607 100644
--- a/src/sdl/i_system.c
+++ b/src/sdl/i_system.c
@@ -102,6 +102,12 @@ typedef LPVOID (WINAPI *p_MapViewOfFile) (HANDLE, DWORD, DWORD, DWORD, SIZE_T);
#endif
#endif
+#if (defined (__unix__) && !defined (_MSDOS)) || defined (UNIXCOMMON)
+#include <errno.h>
+#include <sys/wait.h>
+#define NEWSIGNALHANDLER
+#endif
+
#ifndef NOMUMBLE
#ifdef __linux__ // need -lrt
#include <sys/mman.h>
@@ -229,13 +235,11 @@ SDL_bool framebuffer = SDL_FALSE;
UINT8 keyboard_started = false;
-FUNCNORETURN static ATTRNORETURN void signal_handler(INT32 num)
+static void I_ReportSignal(int num, int coredumped)
{
//static char msg[] = "oh no! back to reality!\r\n";
const char * sigmsg;
- char sigdef[32];
-
- D_QuitNetGame(); // Fix server freezes
+ char msg[128];
switch (num)
{
@@ -261,20 +265,41 @@ FUNCNORETURN static ATTRNORETURN void signal_handler(INT32 num)
sigmsg = "SIGABRT - abnormal termination triggered by abort call";
break;
default:
- sprintf(sigdef,"signal number %d", num);
- sigmsg = sigdef;
+ sprintf(msg,"signal number %d", num);
+ if (coredumped)
+ sigmsg = 0;
+ else
+ sigmsg = msg;
+ }
+
+ if (coredumped)
+ {
+ if (sigmsg)
+ sprintf(msg, "%s (core dumped)", sigmsg);
+ else
+ strcat(msg, " (core dumped)");
+
+ sigmsg = msg;
}
- I_OutputMsg("\nsignal_handler() error: %s\n", sigmsg);
+ I_OutputMsg("\nProcess killed by signal: %s\n\n", sigmsg);
SDL_ShowSimpleMessageBox(SDL_MESSAGEBOX_ERROR,
- "Signal caught",
+ "Process killed by signal",
sigmsg, NULL);
+}
+
+#ifndef NEWSIGNALHANDLER
+FUNCNORETURN static ATTRNORETURN void signal_handler(INT32 num)
+{
+ D_QuitNetGame(); // Fix server freezes
+ I_ReportSignal(num, 0);
I_ShutdownSystem();
signal(num, SIG_DFL); //default signal action
raise(num);
I_Quit();
}
+#endif
FUNCNORETURN static ATTRNORETURN void quit_handler(int num)
{
@@ -650,7 +675,7 @@ static inline void I_ShutdownConsole(void){}
//
// StartupKeyboard
//
-void I_StartupKeyboard (void)
+static void I_RegisterSignals (void)
{
#ifdef SIGINT
signal(SIGINT , quit_handler);
@@ -664,10 +689,12 @@ void I_StartupKeyboard (void)
// If these defines don't exist,
// then compilation would have failed above us...
+#ifndef NEWSIGNALHANDLER
signal(SIGILL , signal_handler);
signal(SIGSEGV , signal_handler);
signal(SIGABRT , signal_handler);
signal(SIGFPE , signal_handler);
+#endif
}
//
@@ -2139,6 +2166,85 @@ void I_Sleep(void)
SDL_Delay(cv_sleep.value);
}
+#ifdef NEWSIGNALHANDLER
+static void newsignalhandler_Warn(const char *pr)
+{
+ char text[128];
+
+ snprintf(text, sizeof text,
+ "Error while setting up signal reporting: %s: %s",
+ pr,
+ strerror(errno)
+ );
+
+ I_OutputMsg("%s\n", text);
+
+ SDL_ShowSimpleMessageBox(SDL_MESSAGEBOX_ERROR,
+ "Startup error",
+ text, NULL);
+
+ I_ShutdownConsole();
+ exit(-1);
+}
+
+static void I_Fork(void)
+{
+ int child;
+ int status;
+ int signum;
+ int c;
+
+ child = fork();
+
+ switch (child)
+ {
+ case -1:
+ newsignalhandler_Warn("fork()");
+ break;
+ case 0:
+ break;
+ default:
+ if (logstream)
+ fclose(logstream);/* the child has this */
+
+ c = wait(&status);
+
+#ifdef LOGMESSAGES
+ /* By the way, exit closes files. */
+ logstream = fopen(logfilename, "at");
+#else
+ logstream = 0;
+#endif
+
+ if (c == -1)
+ {
+ kill(child, SIGKILL);
+ newsignalhandler_Warn("wait()");
+ }
+ else
+ {
+ if (WIFSIGNALED (status))
+ {
+ signum = WTERMSIG (status);
+#ifdef WCOREDUMP
+ I_ReportSignal(signum, WCOREDUMP (status));
+#else
+ I_ReportSignal(signum, 0);
+#endif
+ status = 128 + signum;
+ }
+ else if (WIFEXITED (status))
+ {
+ status = WEXITSTATUS (status);
+ }
+
+ I_ShutdownConsole();
+ exit(status);
+ }
+ }
+}
+#endif/*NEWSIGNALHANDLER*/
+
INT32 I_StartupSystem(void)
{
SDL_version SDLcompiled;
@@ -2146,6 +2252,10 @@ INT32 I_StartupSystem(void)
SDL_VERSION(&SDLcompiled)
SDL_GetVersion(&SDLlinked);
I_StartupConsole();
+#ifdef NEWSIGNALHANDLER
+ I_Fork();
+#endif
+ I_RegisterSignals();
I_OutputMsg("Compiled for SDL version: %d.%d.%d\n",
SDLcompiled.major, SDLcompiled.minor, SDLcompiled.patch);
I_OutputMsg("Linked with SDL version: %d.%d.%d\n",
@@ -2169,7 +2279,6 @@ void I_Quit(void)
if (quiting) goto death;
SDLforceUngrabMouse();
quiting = SDL_FALSE;
- I_ShutdownConsole();
M_SaveConfig(NULL); //save game config, cvars..
#ifndef NONET
D_SaveBan(); // save the ban list
@@ -2287,8 +2396,6 @@ void I_Error(const char *error, ...)
I_OutputMsg("\nI_Error(): %s\n", buffer);
// ---
- I_ShutdownConsole();
-
M_SaveConfig(NULL); // save game config, cvars..
#ifndef NONET
D_SaveBan(); // save the ban list
@@ -2388,6 +2495,10 @@ void I_ShutdownSystem(void)
{
INT32 c;
+#ifndef NEWSIGNALHANDLER
+ I_ShutdownConsole();
+#endif
+
for (c = MAX_QUIT_FUNCS-1; c >= 0; c--)
if (quit_funcs[c])
(*quit_funcs[c])();
diff --git a/src/sdl/i_video.c b/src/sdl/i_video.c
index c876a323f3fbbce1b4a716994cc92a34a09c8913..e054381eec6183cba9b46d4948dc4f0723a0b088 100644
--- a/src/sdl/i_video.c
+++ b/src/sdl/i_video.c
@@ -1441,6 +1441,7 @@ INT32 VID_SetMode(INT32 modeNum)
//Impl_SetWindowName("SRB2 "VERSIONSTRING);
SDLSetMode(vid.width, vid.height, USE_FULLSCREEN);
+ Impl_VideoSetupBuffer();
if (rendermode == render_soft)
{
@@ -1449,8 +1450,6 @@ INT32 VID_SetMode(INT32 modeNum)
SDL_FreeSurface(bufSurface);
bufSurface = NULL;
}
-
- Impl_VideoSetupBuffer();
}
return SDL_TRUE;
@@ -1573,7 +1572,7 @@ static void Impl_VideoSetupSDLBuffer(void)
static void Impl_VideoSetupBuffer(void)
{
// Set up game's software render buffer
- if (rendermode == render_soft)
+ //if (rendermode == render_soft)
{
vid.rowbytes = vid.width * vid.bpp;
vid.direct = NULL;
diff --git a/src/sdl/mixer_sound.c b/src/sdl/mixer_sound.c
index 369d04ced820943cfe6214bd133613aa6a6cbf5d..b60dab14c9e7c0e90bd2afa2b78141df1f01099b 100644
--- a/src/sdl/mixer_sound.c
+++ b/src/sdl/mixer_sound.c
@@ -9,6 +9,26 @@
/// \file
/// \brief SDL Mixer interface for sound
+#ifdef HAVE_LIBGME
+#ifdef HAVE_ZLIB
+#ifndef _MSC_VER
+#ifndef _LARGEFILE64_SOURCE
+#define _LARGEFILE64_SOURCE
+#endif
+#endif
+
+#ifndef _LFS64_LARGEFILE
+#define _LFS64_LARGEFILE
+#endif
+
+#ifndef _FILE_OFFSET_BITS
+#define _FILE_OFFSET_BITS 0
+#endif
+
+#include <zlib.h>
+#endif // HAVE_ZLIB
+#endif // HAVE_LIBGME
+
#include "../doomdef.h"
#include "../doomstat.h" // menuactive
@@ -57,24 +77,6 @@
#include "gme/gme.h"
#define GME_TREBLE 5.0f
#define GME_BASS 1.0f
-
-#ifdef HAVE_ZLIB
-#ifndef _MSC_VER
-#ifndef _LARGEFILE64_SOURCE
-#define _LARGEFILE64_SOURCE
-#endif
-#endif
-
-#ifndef _LFS64_LARGEFILE
-#define _LFS64_LARGEFILE
-#endif
-
-#ifndef _FILE_OFFSET_BITS
-#define _FILE_OFFSET_BITS 0
-#endif
-
-#include "zlib.h"
-#endif // HAVE_ZLIB
#endif // HAVE_LIBGME
static UINT16 BUFFERSIZE = 2048;
diff --git a/src/st_stuff.c b/src/st_stuff.c
index 1b8107edb89ff57751eadb7f96c869f01efb3f47..5e05030c38d305f90d81ffa9a1db24217650738e 100644
--- a/src/st_stuff.c
+++ b/src/st_stuff.c
@@ -694,7 +694,7 @@ static void ST_drawTime(void)
else
{
// Counting down the hidetime?
- if ((gametype == GT_TAG || gametype == GT_HIDEANDSEEK) && (stplyr->realtime <= (hidetime*TICRATE)))
+ if ((gametyperules & GTR_HIDETIME) && (stplyr->realtime <= (hidetime*TICRATE)))
{
tics = (hidetime*TICRATE - stplyr->realtime);
if (tics < 3*TICRATE)
@@ -705,11 +705,11 @@ static void ST_drawTime(void)
else
{
// Hidetime finish!
- if ((gametype == GT_TAG || gametype == GT_HIDEANDSEEK) && (stplyr->realtime < ((hidetime+1)*TICRATE)))
+ if ((gametyperules & GTR_HIDETIME) && (stplyr->realtime < ((hidetime+1)*TICRATE)))
ST_drawRaceNum(hidetime*TICRATE - stplyr->realtime);
// Time limit?
- if (gametype != GT_COOP && gametype != GT_RACE && gametype != GT_COMPETITION && cv_timelimit.value && timelimitintics > 0)
+ if ((gametyperules & GTR_TIMELIMIT) && cv_timelimit.value && timelimitintics > 0)
{
if (timelimitintics > stplyr->realtime)
{
@@ -723,7 +723,7 @@ static void ST_drawTime(void)
downwards = true;
}
// Post-hidetime normal.
- else if (gametype == GT_TAG || gametype == GT_HIDEANDSEEK)
+ else if (gametyperules & GTR_TAG)
tics = stplyr->realtime - hidetime*TICRATE;
// "Shadow! What are you doing? Hurry and get back here
// right now before the island blows up with you on it!"
@@ -912,7 +912,7 @@ static void ST_drawLivesArea(void)
else if (stplyr->spectator)
v_colmap = V_GRAYMAP;
// Tag
- else if (gametype == GT_TAG || gametype == GT_HIDEANDSEEK)
+ else if (gametyperules & GTR_TAG)
{
if (stplyr->pflags & PF_TAGIT)
{
@@ -1177,21 +1177,33 @@ tic_t lt_exitticker = 0, lt_endtime = 0;
//
// Load the graphics for the title card.
+// Don't let LJ see this
//
static void ST_cacheLevelTitle(void)
{
- if (!(mapheaderinfo[gamemap-1]->levelflags & LF_WARNINGTITLE))
- {
- lt_patches[0] = (patch_t *)W_CachePatchName("LTACTBLU", PU_HUDGFX);
- lt_patches[1] = (patch_t *)W_CachePatchName("LTZIGZAG", PU_HUDGFX);
- lt_patches[2] = (patch_t *)W_CachePatchName("LTZZTEXT", PU_HUDGFX);
- }
- else // boss map
- {
- lt_patches[0] = (patch_t *)W_CachePatchName("LTACTRED", PU_HUDGFX);
- lt_patches[1] = (patch_t *)W_CachePatchName("LTZIGRED", PU_HUDGFX);
- lt_patches[2] = (patch_t *)W_CachePatchName("LTZZWARN", PU_HUDGFX);
- }
+#define SETPATCH(default, warning, custom, idx) \
+{ \
+ lumpnum_t patlumpnum = LUMPERROR; \
+ if (mapheaderinfo[gamemap-1]->custom[0] != '\0') \
+ { \
+ patlumpnum = W_CheckNumForName(mapheaderinfo[gamemap-1]->custom); \
+ if (patlumpnum != LUMPERROR) \
+ lt_patches[idx] = (patch_t *)W_CachePatchNum(patlumpnum, PU_HUDGFX); \
+ } \
+ if (patlumpnum == LUMPERROR) \
+ { \
+ if (!(mapheaderinfo[gamemap-1]->levelflags & LF_WARNINGTITLE)) \
+ lt_patches[idx] = (patch_t *)W_CachePatchName(default, PU_HUDGFX); \
+ else \
+ lt_patches[idx] = (patch_t *)W_CachePatchName(warning, PU_HUDGFX); \
+ } \
+}
+
+ SETPATCH("LTACTBLU", "LTACTRED", ltactdiamond, 0)
+ SETPATCH("LTZIGZAG", "LTZIGRED", ltzzpatch, 1)
+ SETPATCH("LTZZTEXT", "LTZZWARN", ltzztext, 2)
+
+#undef SETPATCH
}
//
@@ -1216,6 +1228,9 @@ void ST_startTitleCard(void)
//
void ST_preDrawTitleCard(void)
{
+ if (!G_IsTitleCardAvailable())
+ return;
+
if (lt_ticker >= (lt_endtime + TICRATE))
return;
@@ -1231,6 +1246,9 @@ void ST_preDrawTitleCard(void)
//
void ST_runTitleCard(void)
{
+ if (!G_IsTitleCardAvailable())
+ return;
+
if (lt_ticker >= (lt_endtime + TICRATE))
return;
@@ -1284,6 +1302,9 @@ void ST_drawTitleCard(void)
INT32 zzticker;
patch_t *actpat, *zigzag, *zztext;
+ if (!G_IsTitleCardAvailable())
+ return;
+
#ifdef HAVE_BLUA
if (!LUA_HudEnabled(hud_stagetitle))
goto luahook;
@@ -1762,7 +1783,7 @@ static void ST_drawNiGHTSHUD(void)
ST_drawNiGHTSLink();
}
- if (gametype == GT_RACE || gametype == GT_COMPETITION)
+ if (gametyperules & GTR_RACE)
{
ST_drawScore();
ST_drawTime();
@@ -2203,34 +2224,37 @@ static void ST_drawTextHUD(void)
if (G_IsSpecialStage(gamemap))
textHUDdraw(M_GetText("\x82""Wait for the stage to end..."))
- else if (gametype == GT_COOP)
+ else if (G_PlatformGametype())
{
- if (stplyr->lives <= 0
- && cv_cooplives.value == 2
- && (netgame || multiplayer))
+ if (gametype == GT_COOP)
{
- INT32 i;
- for (i = 0; i < MAXPLAYERS; i++)
+ if (stplyr->lives <= 0
+ && cv_cooplives.value == 2
+ && (netgame || multiplayer))
{
- if (!playeringame[i])
- continue;
-
- if (&players[i] == stplyr)
- continue;
-
- if (players[i].lives > 1)
- break;
- }
-
- if (i != MAXPLAYERS)
- textHUDdraw(M_GetText("You'll steal a life on respawn..."))
+ INT32 i;
+ for (i = 0; i < MAXPLAYERS; i++)
+ {
+ if (!playeringame[i])
+ continue;
+
+ if (&players[i] == stplyr)
+ continue;
+
+ if (players[i].lives > 1)
+ break;
+ }
+
+ if (i != MAXPLAYERS)
+ textHUDdraw(M_GetText("You'll steal a life on respawn..."))
+ else
+ textHUDdraw(M_GetText("Wait to respawn..."))
+ }
else
textHUDdraw(M_GetText("Wait to respawn..."))
}
- else
- textHUDdraw(M_GetText("Wait to respawn..."))
}
- else
+ else if (G_GametypeHasSpectators())
textHUDdraw(M_GetText("\x82""FIRE:""\x80 Enter game"))
}
@@ -2273,13 +2297,14 @@ static void ST_drawTextHUD(void)
}
}
}
- else if ((gametype == GT_TAG || gametype == GT_HIDEANDSEEK) && (!stplyr->spectator))
+ else if ((gametyperules & GTR_TAG) && (!stplyr->spectator))
{
if (leveltime < hidetime * TICRATE)
{
if (stplyr->pflags & PF_TAGIT)
{
- textHUDdraw(M_GetText("\x82""You are blindfolded!"))
+ if (gametyperules & GTR_BLINDFOLDED)
+ textHUDdraw(M_GetText("\x82""You are blindfolded!"))
textHUDdraw(M_GetText("Waiting for players to hide..."))
}
else if (gametype == GT_HIDEANDSEEK)
@@ -2294,7 +2319,8 @@ static void ST_drawTextHUD(void)
textHUDdraw(M_GetText("\x82""VIEWPOINT:""\x80 Switch view"))
donef12 = true;
}
- textHUDdraw(M_GetText("You cannot move while hiding."))
+ if (gametyperules & GTR_HIDEFROZEN)
+ textHUDdraw(M_GetText("You cannot move while hiding."))
}
}
@@ -2316,21 +2342,27 @@ static void ST_drawTeamHUD(void)
if (F_GetPromptHideHud(0)) // y base is 0
return;
- if (gametype == GT_CTF)
+ if (gametyperules & GTR_TEAMFLAGS)
p = bflagico;
else
p = bmatcico;
+#ifdef HAVE_BLUA
+ if (LUA_HudEnabled(hud_teamscores))
+#endif
V_DrawSmallScaledPatch(BASEVIDWIDTH/2 - SEP - SHORT(p->width)/4, 4, V_HUDTRANS|V_PERPLAYER|V_SNAPTOTOP, p);
- if (gametype == GT_CTF)
+ if (gametyperules & GTR_TEAMFLAGS)
p = rflagico;
else
p = rmatcico;
+#ifdef HAVE_BLUA
+ if (LUA_HudEnabled(hud_teamscores))
+#endif
V_DrawSmallScaledPatch(BASEVIDWIDTH/2 + SEP - SHORT(p->width)/4, 4, V_HUDTRANS|V_PERPLAYER|V_SNAPTOTOP, p);
- if (gametype != GT_CTF)
+ if (!(gametyperules & GTR_TEAMFLAGS))
goto num;
{
INT32 i;
@@ -2339,28 +2371,53 @@ static void ST_drawTeamHUD(void)
// Show which flags aren't at base.
for (i = 0; i < MAXPLAYERS; i++)
{
- if (players[i].gotflag & GF_BLUEFLAG) // Blue flag isn't at base
+ if (players[i].gotflag & GF_BLUEFLAG // Blue flag isn't at base
+#ifdef HAVE_BLUA
+ && LUA_HudEnabled(hud_teamscores)
+#endif
+ )
V_DrawScaledPatch(BASEVIDWIDTH/2 - SEP - SHORT(nonicon->width)/2, 0, V_HUDTRANS|V_PERPLAYER|V_SNAPTOTOP, nonicon);
- if (players[i].gotflag & GF_REDFLAG) // Red flag isn't at base
+
+ if (players[i].gotflag & GF_REDFLAG // Red flag isn't at base
+#ifdef HAVE_BLUA
+ && LUA_HudEnabled(hud_teamscores)
+#endif
+ )
V_DrawScaledPatch(BASEVIDWIDTH/2 + SEP - SHORT(nonicon2->width)/2, 0, V_HUDTRANS|V_PERPLAYER|V_SNAPTOTOP, nonicon2);
whichflag |= players[i].gotflag;
+
if ((whichflag & (GF_REDFLAG|GF_BLUEFLAG)) == (GF_REDFLAG|GF_BLUEFLAG))
break; // both flags were found, let's stop early
}
// Display a countdown timer showing how much time left until the flag returns to base.
{
- if (blueflag && blueflag->fuse > 1)
+ if (blueflag && blueflag->fuse > 1
+#ifdef HAVE_BLUA
+ && LUA_HudEnabled(hud_teamscores)
+#endif
+ )
V_DrawCenteredString(BASEVIDWIDTH/2 - SEP, 8, V_YELLOWMAP|V_HUDTRANS|V_PERPLAYER|V_SNAPTOTOP, va("%u", (blueflag->fuse / TICRATE)));
- if (redflag && redflag->fuse > 1)
+ if (redflag && redflag->fuse > 1
+#ifdef HAVE_BLUA
+ && LUA_HudEnabled(hud_teamscores)
+#endif
+ )
V_DrawCenteredString(BASEVIDWIDTH/2 + SEP, 8, V_YELLOWMAP|V_HUDTRANS|V_PERPLAYER|V_SNAPTOTOP, va("%u", (redflag->fuse / TICRATE)));
}
}
num:
+#ifdef HAVE_BLUA
+ if (LUA_HudEnabled(hud_teamscores))
+#endif
V_DrawCenteredString(BASEVIDWIDTH/2 - SEP, 16, V_HUDTRANS|V_PERPLAYER|V_SNAPTOTOP, va("%u", bluescore));
+
+#ifdef HAVE_BLUA
+ if (LUA_HudEnabled(hud_teamscores))
+#endif
V_DrawCenteredString(BASEVIDWIDTH/2 + SEP, 16, V_HUDTRANS|V_PERPLAYER|V_SNAPTOTOP, va("%u", redscore));
#undef SEP
@@ -2633,7 +2690,7 @@ static void ST_overlayDrawer(void)
}
// If you are in overtime, put a big honkin' flashin' message on the screen.
- if (G_RingSlingerGametype() && cv_overtime.value
+ if (((gametyperules & GTR_TIMELIMIT) && (gametyperules & GTR_OVERTIME)) && cv_overtime.value
&& (leveltime > (timelimitintics + TICRATE/2)) && cv_timelimit.value && (leveltime/TICRATE % 2 == 0))
V_DrawCenteredString(BASEVIDWIDTH/2, 184, V_PERPLAYER, M_GetText("OVERTIME!"));
@@ -2648,7 +2705,7 @@ static void ST_overlayDrawer(void)
ST_drawMatchHUD();
// Race HUD Stuff
- if (gametype == GT_RACE || gametype == GT_COMPETITION)
+ if (gametyperules & GTR_RACE)
ST_drawRaceHUD();
// Emerald Hunt Indicators
@@ -2753,7 +2810,7 @@ void ST_Drawer(void)
if (rendermode != render_none) ST_doPaletteStuff();
// Blindfold!
- if ((gametype == GT_TAG || gametype == GT_HIDEANDSEEK)
+ if ((gametyperules & GTR_BLINDFOLDED)
&& (leveltime < hidetime * TICRATE))
{
if (players[displayplayer].pflags & PF_TAGIT)
diff --git a/src/v_video.c b/src/v_video.c
index c6ec22767f6f4518e7ba1ee231ac73edf800fc65..c91e5f213e8fb7ec0eca1ddc9d29176dbc2d8440 100644
--- a/src/v_video.c
+++ b/src/v_video.c
@@ -3244,6 +3244,29 @@ Unoptimized version
#endif
}
+// Taken from my videos-in-SRB2 project
+// Generates a color look-up table
+// which has up to 64 colors at each channel
+// (see the defines in v_video.h)
+
+UINT8 colorlookup[CLUTSIZE][CLUTSIZE][CLUTSIZE];
+
+void InitColorLUT(RGBA_t *palette)
+{
+ UINT8 r, g, b;
+ static boolean clutinit = false;
+ static RGBA_t *lastpalette = NULL;
+ if ((!clutinit) || (lastpalette != palette))
+ {
+ for (r = 0; r < CLUTSIZE; r++)
+ for (g = 0; g < CLUTSIZE; g++)
+ for (b = 0; b < CLUTSIZE; b++)
+ colorlookup[r][g][b] = NearestColor(r << SHIFTCOLORBITS, g << SHIFTCOLORBITS, b << SHIFTCOLORBITS);
+ clutinit = true;
+ lastpalette = palette;
+ }
+}
+
// V_Init
// old software stuff, buffers are allocated at video mode setup
// here we set the screens[x] pointers accordingly
@@ -3255,13 +3278,9 @@ void V_Init(void)
const INT32 screensize = vid.rowbytes * vid.height;
LoadMapPalette();
- // hardware modes do not use screens[] pointers
+
for (i = 0; i < NUMSCREENS; i++)
screens[i] = NULL;
- if (rendermode != render_soft)
- {
- return; // be sure to cause a NULL read/write error so we detect it, in case of..
- }
// start address of NUMSCREENS * width*height vidbuffers
if (base)
diff --git a/src/v_video.h b/src/v_video.h
index 2434fec816b002f3fa61412901ef16f39bfa5f13..36d1914af6edec7f1b9996e4c767d507dcaf8a71 100644
--- a/src/v_video.h
+++ b/src/v_video.h
@@ -37,6 +37,18 @@ cv_allcaps;
// Allocates buffer screens, call before R_Init.
void V_Init(void);
+// Taken from my videos-in-SRB2 project
+// Generates a color look-up table
+// which has up to 64 colors at each channel
+
+#define COLORBITS 6
+#define SHIFTCOLORBITS (8-COLORBITS)
+#define CLUTSIZE (1<<COLORBITS)
+
+extern UINT8 colorlookup[CLUTSIZE][CLUTSIZE][CLUTSIZE];
+
+void InitColorLUT(RGBA_t *palette);
+
// Set the current RGB palette lookup to use for palettized graphics
void V_SetPalette(INT32 palettenum);
diff --git a/src/w_wad.c b/src/w_wad.c
index 950294b1f4ce263224fca3868add4889697f8110..62992441a0d2cb6d28da7788930ce791b54ed0b6 100644
--- a/src/w_wad.c
+++ b/src/w_wad.c
@@ -11,32 +11,34 @@
/// \file w_wad.c
/// \brief Handles WAD file header, directory, lump I/O
-#ifdef __GNUC__
-#include <unistd.h>
+#ifdef HAVE_ZLIB
+#ifndef _MSC_VER
+#ifndef _LARGEFILE64_SOURCE
+#define _LARGEFILE64_SOURCE
+#endif
#endif
-#define ZWAD
-
-#ifdef ZWAD
-#include <errno.h>
-#include "lzf.h"
+#ifndef _LFS64_LARGEFILE
+#define _LFS64_LARGEFILE
#endif
#ifndef _FILE_OFFSET_BITS
#define _FILE_OFFSET_BITS 0
#endif
-#ifndef _LARGEFILE64_SOURCE
-#define _LARGEFILE64_SOURCE
+#include <zlib.h>
#endif
-#ifndef _LFS64_LARGEFILE
-#define _LFS64_LARGEFILE
+#ifdef __GNUC__
+#include <unistd.h>
#endif
-//#ifdef HAVE_ZLIB
-#include "zlib.h"
-//#endif // HAVE_ZLIB
+#define ZWAD
+
+#ifdef ZWAD
+#include <errno.h>
+#include "lzf.h"
+#endif
#include "doomdef.h"
#include "doomstat.h"
@@ -77,24 +79,6 @@ int snprintf(char *str, size_t n, const char *fmt, ...);
#define O_BINARY 0
#endif
-#ifdef HAVE_ZLIB
-#ifndef _MSC_VER
-#ifndef _LARGEFILE64_SOURCE
-#define _LARGEFILE64_SOURCE
-#endif
-#endif
-
-#ifndef _LFS64_LARGEFILE
-#define _LFS64_LARGEFILE
-#endif
-
-#ifndef _FILE_OFFSET_BITS
-#define _FILE_OFFSET_BITS 0
-#endif
-
-#include "zlib.h"
-#endif
-
typedef struct
{
@@ -1888,3 +1872,101 @@ int W_VerifyNMUSlumps(const char *filename)
};
return W_VerifyFile(filename, NMUSlist, false);
}
+
+/** \brief Generates a virtual resource used for level data loading.
+ *
+ * \param lumpnum_t reference
+ * \return Virtual resource
+ *
+ */
+virtres_t* vres_GetMap(lumpnum_t lumpnum)
+{
+ UINT32 i;
+ virtres_t* vres = NULL;
+ virtlump_t* vlumps = NULL;
+ size_t numlumps = 0;
+
+ if (W_IsLumpWad(lumpnum))
+ {
+ // Remember that we're assuming that the WAD will have a specific set of lumps in a specific order.
+ UINT8 *wadData = W_CacheLumpNum(lumpnum, PU_LEVEL);
+ filelump_t *fileinfo = (filelump_t *)(wadData + ((wadinfo_t *)wadData)->infotableofs);
+ numlumps = ((wadinfo_t *)wadData)->numlumps;
+ vlumps = Z_Malloc(sizeof(virtlump_t)*numlumps, PU_LEVEL, NULL);
+
+ // Build the lumps.
+ for (i = 0; i < numlumps; i++)
+ {
+ vlumps[i].size = (size_t)(((filelump_t *)(fileinfo + i))->size);
+ // Play it safe with the name in this case.
+ memcpy(vlumps[i].name, (fileinfo + i)->name, 8);
+ vlumps[i].name[8] = '\0';
+ vlumps[i].data = Z_Malloc(vlumps[i].size, PU_LEVEL, NULL); // This is memory inefficient, sorry about that.
+ memcpy(vlumps[i].data, wadData + (fileinfo + i)->filepos, vlumps[i].size);
+ }
+
+ Z_Free(wadData);
+ }
+ else
+ {
+ // Count number of lumps until the end of resource OR up until next "MAPXX" lump.
+ lumpnum_t lumppos = lumpnum + 1;
+ for (i = LUMPNUM(lumppos); i < wadfiles[WADFILENUM(lumpnum)]->numlumps; i++, lumppos++, numlumps++)
+ if (memcmp(W_CheckNameForNum(lumppos), "MAP", 3) == 0)
+ break;
+ numlumps++;
+
+ vlumps = Z_Malloc(sizeof(virtlump_t)*numlumps, PU_LEVEL, NULL);
+ for (i = 0; i < numlumps; i++, lumpnum++)
+ {
+ vlumps[i].size = W_LumpLength(lumpnum);
+ memcpy(vlumps[i].name, W_CheckNameForNum(lumpnum), 8);
+ vlumps[i].name[8] = '\0';
+ vlumps[i].data = W_CacheLumpNum(lumpnum, PU_LEVEL);
+ }
+ }
+ vres = Z_Malloc(sizeof(virtres_t), PU_LEVEL, NULL);
+ vres->vlumps = vlumps;
+ vres->numlumps = numlumps;
+
+ return vres;
+}
+
+/** \brief Frees zone memory for a given virtual resource.
+ *
+ * \param Virtual resource
+ */
+void vres_Free(virtres_t* vres)
+{
+ while (vres->numlumps--)
+ Z_Free(vres->vlumps[vres->numlumps].data);
+ Z_Free(vres->vlumps);
+ Z_Free(vres);
+}
+
+/** (Debug) Prints lumps from a virtual resource into console.
+ */
+/*
+static void vres_Diag(const virtres_t* vres)
+{
+ UINT32 i;
+ for (i = 0; i < vres->numlumps; i++)
+ CONS_Printf("%s\n", vres->vlumps[i].name);
+}
+*/
+
+/** \brief Finds a lump in a given virtual resource.
+ *
+ * \param Virtual resource
+ * \param Lump name to look for
+ * \return Virtual lump if found, NULL otherwise
+ *
+ */
+virtlump_t* vres_Find(const virtres_t* vres, const char* name)
+{
+ UINT32 i;
+ for (i = 0; i < vres->numlumps; i++)
+ if (fastcmp(name, vres->vlumps[i].name))
+ return &vres->vlumps[i];
+ return NULL;
+}
diff --git a/src/w_wad.h b/src/w_wad.h
index a8be13ece29c17511a7dc5579faccdfa0789d9ad..8008a577cf9f5f92631bdd91d7a440ca2688dd68 100644
--- a/src/w_wad.h
+++ b/src/w_wad.h
@@ -72,6 +72,25 @@ typedef struct
compmethod compression; // lump compression method
} lumpinfo_t;
+// =========================================================================
+// 'VIRTUAL' RESOURCES
+// =========================================================================
+
+typedef struct {
+ char name[9];
+ UINT8* data;
+ size_t size;
+} virtlump_t;
+
+typedef struct {
+ size_t numlumps;
+ virtlump_t* vlumps;
+} virtres_t;
+
+virtres_t* vres_GetMap(lumpnum_t);
+void vres_Free(virtres_t*);
+virtlump_t* vres_Find(const virtres_t*, const char*);
+
// =========================================================================
// DYNAMIC WAD LOADING
// =========================================================================
diff --git a/src/y_inter.c b/src/y_inter.c
index 842bd1b287e22d7696185cdec69af5dce953aa29..b26c0797e36906c88185506db48515f8ce44f6c0 100644
--- a/src/y_inter.c
+++ b/src/y_inter.c
@@ -37,6 +37,10 @@
#include "m_cond.h" // condition sets
#include "lua_hook.h" // IntermissionThinker hook
+#ifdef HAVE_BLUA
+#include "lua_hud.h"
+#endif
+
#ifdef HWRENDER
#include "hardware/hw_main.h"
#endif
@@ -164,6 +168,7 @@ static INT32 tallydonetic = -1;
static INT32 endtic = -1;
intertype_t intertype = int_none;
+intertype_t intermissiontypes[NUMGAMETYPES];
static void Y_RescaleScreenBuffer(void);
static void Y_AwardCoopBonuses(void);
@@ -318,9 +323,17 @@ void Y_IntermissionDrawer(void)
// Bonus loops
INT32 i;
- if (intertype == int_none || rendermode == render_none)
+ if (rendermode == render_none)
return;
+ if (intertype == int_none)
+ {
+#ifdef HAVE_BLUA
+ LUAh_IntermissionHUD();
+#endif
+ return;
+ }
+
if (!usebuffer)
V_DrawFill(0, 0, BASEVIDWIDTH, BASEVIDHEIGHT, 31);
@@ -358,6 +371,12 @@ void Y_IntermissionDrawer(void)
else
V_DrawPatchFill(bgtile);
+#ifdef HAVE_BLUA
+ LUAh_IntermissionHUD();
+ if (!LUA_HudEnabled(hud_intermissiontally))
+ goto skiptallydrawer;
+#endif
+
if (intertype == int_coop)
{
INT32 bonusy;
@@ -907,6 +926,12 @@ void Y_IntermissionDrawer(void)
}
}
+#ifdef HAVE_BLUA
+skiptallydrawer:
+ if (!LUA_HudEnabled(hud_intermissionmessages))
+ return;
+#endif
+
if (timer)
V_DrawCenteredString(BASEVIDWIDTH/2, 188, V_YELLOWMAP,
va("start in %d seconds", timer/TICRATE));
@@ -1187,7 +1212,9 @@ void Y_StartIntermission(void)
timer = 1;
}
- if (gametype == GT_COOP)
+ if (intermissiontypes[gametype] != int_none)
+ intertype = intermissiontypes[gametype];
+ else if (gametype == GT_COOP)
intertype = (G_IsSpecialStage(gamemap)) ? int_spec : int_coop;
else if (gametype == GT_TEAMMATCH)
intertype = int_teammatch;
diff --git a/src/y_inter.h b/src/y_inter.h
index 7dffbff32c3ad61643d912ec2ae4deadcbaa0918..5cf2cc1b84ee8c9ac75923cac9fc9e99481e5e6f 100644
--- a/src/y_inter.h
+++ b/src/y_inter.h
@@ -31,3 +31,4 @@ typedef enum
int_comp, // Competition
} intertype_t;
extern intertype_t intertype;
+extern intertype_t intermissiontypes[NUMGAMETYPES];