diff --git a/CMakeLists.txt b/CMakeLists.txt
index b702218592579c74176c96e7cf8ea761c9bc911f..96e32a06d95f081af4004d791b2d778d56d7de1a 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -2,7 +2,7 @@ cmake_minimum_required(VERSION 3.0)
# DO NOT CHANGE THIS SRB2 STRING! Some variable names depend on this string.
# Version change is fine.
project(SRB2
- VERSION 2.1.24
+ VERSION 2.1.25
LANGUAGES C)
if(${PROJECT_SOURCE_DIR} MATCHES ${PROJECT_BINARY_DIR})
diff --git a/appveyor.yml b/appveyor.yml
index b37bd1a650daf6704c40e0b9527be64e04e4f29d..d58976fd5fc543844aba2fa5ec495458e7ac3a0a 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -1,4 +1,4 @@
-version: 2.1.24.{branch}-{build}
+version: 2.1.25.{branch}-{build}
os: MinGW
environment:
diff --git a/src/Makefile.cfg b/src/Makefile.cfg
index cbbbf426f7cd0125b7bb7e5d9ffb2514c120828f..409cc4f22653141214eb1592e631a3a86f5944d8 100644
--- a/src/Makefile.cfg
+++ b/src/Makefile.cfg
@@ -226,8 +226,7 @@ ifdef GCC61
WFLAGS+=-Wno-tautological-compare -Wno-error=tautological-compare
endif
ifdef GCC71
- WFLAGS+=-Wno-error=implicit-fallthrough
- WFLAGS+=-Wno-implicit-fallthrough
+ WFLAGS+=-Wimplicit-fallthrough=4
endif
ifdef GCC81
WFLAGS+=-Wno-error=format-overflow
diff --git a/src/apng.h b/src/apng.h
index aa7fac3df34e7ee14fe9504722a87005cf0f4ae9..0f22dca6d4f3243060197d7374229fa94fee0a3e 100644
--- a/src/apng.h
+++ b/src/apng.h
@@ -24,12 +24,10 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#define APNG_H
#ifndef _MSC_VER
-#ifndef _WII
#ifndef _LARGEFILE64_SOURCE
#define _LARGEFILE64_SOURCE
#endif
#endif
-#endif
#ifndef _LFS64_LARGEFILE
#define _LFS64_LARGEFILE
diff --git a/src/command.c b/src/command.c
index 600803cdbc49033ab7ab7ecdcbb0a77efa8fd551..cfb36f02fbf8e0d56694c856e51b5ed2641dd7e4 100644
--- a/src/command.c
+++ b/src/command.c
@@ -1666,7 +1666,6 @@ static boolean CV_FilterJoyAxisVars(consvar_t *v, const char *valstr)
if (joyaxis_default)
{
-#if !defined (_WII) && !defined (WMINPUT)
if (!stricmp(v->name, "joyaxis_turn"))
{
if (joyaxis_count > 6) return false;
@@ -1676,7 +1675,6 @@ static boolean CV_FilterJoyAxisVars(consvar_t *v, const char *valstr)
if (!stricmp(valstr, "X-Axis")) joyaxis_count++;
else joyaxis_default = false;
}
-#if !defined (PSP)
if (!stricmp(v->name, "joyaxis_move"))
{
if (joyaxis_count > 6) return false;
@@ -1685,8 +1683,6 @@ static boolean CV_FilterJoyAxisVars(consvar_t *v, const char *valstr)
if (!stricmp(valstr, "Y-Axis")) joyaxis_count++;
else joyaxis_default = false;
}
-#endif
-#if !defined (_arch_dreamcast) && !defined (_XBOX) && !defined (PSP)
if (!stricmp(v->name, "joyaxis_side"))
{
if (joyaxis_count > 6) return false;
@@ -1695,8 +1691,6 @@ static boolean CV_FilterJoyAxisVars(consvar_t *v, const char *valstr)
if (!stricmp(valstr, "Z-Axis")) joyaxis_count++;
else joyaxis_default = false;
}
-#endif
-#if !defined (_XBOX) && !defined (PSP)
if (!stricmp(v->name, "joyaxis_look"))
{
if (joyaxis_count > 6) return false;
@@ -1705,7 +1699,6 @@ static boolean CV_FilterJoyAxisVars(consvar_t *v, const char *valstr)
if (!stricmp(valstr, "None")) joyaxis_count++;
else joyaxis_default = false;
}
-#endif
if (!stricmp(v->name, "joyaxis_fire")
|| !stricmp(v->name, "joyaxis_firenormal"))
{
@@ -1715,7 +1708,6 @@ static boolean CV_FilterJoyAxisVars(consvar_t *v, const char *valstr)
if (!stricmp(valstr, "None")) joyaxis_count++;
else joyaxis_default = false;
}
-#endif
// reset all axis settings to defaults
if (joyaxis_count == 6)
{
@@ -1732,7 +1724,6 @@ static boolean CV_FilterJoyAxisVars(consvar_t *v, const char *valstr)
if (joyaxis2_default)
{
-#if !defined (_WII) && !defined (WMINPUT)
if (!stricmp(v->name, "joyaxis2_turn"))
{
if (joyaxis2_count > 6) return false;
@@ -1742,7 +1733,6 @@ static boolean CV_FilterJoyAxisVars(consvar_t *v, const char *valstr)
if (!stricmp(valstr, "X-Axis")) joyaxis2_count++;
else joyaxis2_default = false;
}
-// #if !defined (PSP)
if (!stricmp(v->name, "joyaxis2_move"))
{
if (joyaxis2_count > 6) return false;
@@ -1751,8 +1741,6 @@ static boolean CV_FilterJoyAxisVars(consvar_t *v, const char *valstr)
if (!stricmp(valstr, "Y-Axis")) joyaxis2_count++;
else joyaxis2_default = false;
}
-// #endif
-#if !defined (_arch_dreamcast) && !defined (_XBOX) && !defined (PSP)
if (!stricmp(v->name, "joyaxis2_side"))
{
if (joyaxis2_count > 6) return false;
@@ -1761,8 +1749,6 @@ static boolean CV_FilterJoyAxisVars(consvar_t *v, const char *valstr)
if (!stricmp(valstr, "Z-Axis")) joyaxis2_count++;
else joyaxis2_default = false;
}
-#endif
-#if !defined (_XBOX) // && !defined (PSP)
if (!stricmp(v->name, "joyaxis2_look"))
{
if (joyaxis2_count > 6) return false;
@@ -1771,7 +1757,6 @@ static boolean CV_FilterJoyAxisVars(consvar_t *v, const char *valstr)
if (!stricmp(valstr, "None")) joyaxis2_count++;
else joyaxis2_default = false;
}
-#endif
if (!stricmp(v->name, "joyaxis2_fire")
|| !stricmp(v->name, "joyaxis2_firenormal"))
{
@@ -1781,7 +1766,6 @@ static boolean CV_FilterJoyAxisVars(consvar_t *v, const char *valstr)
if (!stricmp(valstr, "None")) joyaxis2_count++;
else joyaxis2_default = false;
}
-#endif
// reset all axis settings to defaults
if (joyaxis2_count == 6)
diff --git a/src/d_clisrv.c b/src/d_clisrv.c
index 74b3339fc2252a362f615ad8b7f66e697d660942..e0feb036f1c0a54ce534544509f03027db53b900 100644
--- a/src/d_clisrv.c
+++ b/src/d_clisrv.c
@@ -42,6 +42,7 @@
#include "lzf.h"
#include "lua_script.h"
#include "lua_hook.h"
+#include "md5.h"
#ifdef CLIENT_LOADINGSCREEN
// cl loading screen
@@ -110,6 +111,9 @@ static UINT8 resynch_local_inprogress = false; // WE are desynched and getting p
static UINT8 player_joining = false;
UINT8 hu_resynching = 0;
+UINT8 adminpassmd5[16];
+boolean adminpasswordset = false;
+
// Client specific
static ticcmd_t localcmds;
static ticcmd_t localcmds2;
@@ -148,7 +152,7 @@ ticcmd_t netcmds[BACKUPTICS][MAXPLAYERS];
static textcmdtic_t *textcmds[TEXTCMD_HASH_SIZE] = {NULL};
-static consvar_t cv_showjoinaddress = {"showjoinaddress", "On", 0, CV_OnOff, NULL, 0, NULL, NULL, 0, 0, NULL};
+consvar_t cv_showjoinaddress = {"showjoinaddress", "On", CV_SAVE, CV_OnOff, NULL, 0, NULL, NULL, 0, 0, NULL};
static CV_PossibleValue_t playbackspeed_cons_t[] = {{1, "MIN"}, {10, "MAX"}, {0, NULL}};
consvar_t cv_playbackspeed = {"playbackspeed", "1", 0, playbackspeed_cons_t, NULL, 0, NULL, NULL, 0, 0, NULL};
@@ -509,6 +513,10 @@ static inline void resynch_write_player(resynch_pak *rsp, const size_t i)
rsp->currentweapon = LONG(players[i].currentweapon);
rsp->ringweapons = LONG(players[i].ringweapons);
+ rsp->ammoremoval = (UINT16)SHORT(players[i].ammoremoval);
+ rsp->ammoremovaltimer = (tic_t)LONG(players[i].ammoremovaltimer);
+ rsp->ammoremovalweapon = LONG(players[i].ammoremovalweapon);
+
for (j = 0; j < NUMPOWERS; ++j)
rsp->powers[j] = (UINT16)SHORT(players[i].powers[j]);
@@ -571,6 +579,7 @@ static inline void resynch_write_player(resynch_pak *rsp, const size_t i)
rsp->starpostnum = LONG(players[i].starpostnum);
rsp->starposttime = (tic_t)LONG(players[i].starposttime);
rsp->starpostangle = (angle_t)LONG(players[i].starpostangle);
+ rsp->starpostscale = (fixed_t)LONG(players[i].starpostscale);
rsp->maxlink = LONG(players[i].maxlink);
rsp->dashspeed = (fixed_t)LONG(players[i].dashspeed);
@@ -640,6 +649,10 @@ static void resynch_read_player(resynch_pak *rsp)
players[i].currentweapon = LONG(rsp->currentweapon);
players[i].ringweapons = LONG(rsp->ringweapons);
+ players[i].ammoremoval = (UINT16)SHORT(rsp->ammoremoval);
+ players[i].ammoremovaltimer = (tic_t)LONG(rsp->ammoremovaltimer);
+ players[i].ammoremovalweapon = LONG(rsp->ammoremovalweapon);
+
for (j = 0; j < NUMPOWERS; ++j)
players[i].powers[j] = (UINT16)SHORT(rsp->powers[j]);
@@ -702,6 +715,7 @@ static void resynch_read_player(resynch_pak *rsp)
players[i].starpostnum = LONG(rsp->starpostnum);
players[i].starposttime = (tic_t)LONG(rsp->starposttime);
players[i].starpostangle = (angle_t)LONG(rsp->starpostangle);
+ players[i].starpostscale = (fixed_t)LONG(rsp->starpostscale);
players[i].maxlink = LONG(rsp->maxlink);
players[i].dashspeed = (fixed_t)LONG(rsp->dashspeed);
@@ -2934,13 +2948,13 @@ static void Got_KickCmd(UINT8 **p, INT32 playernum)
CL_RemovePlayer(pnum, kickreason);
}
-consvar_t cv_allownewplayer = {"allowjoin", "On", CV_NETVAR, CV_OnOff, NULL, 0, NULL, NULL, 0, 0, NULL };
-consvar_t cv_joinnextround = {"joinnextround", "Off", CV_NETVAR, CV_OnOff, NULL, 0, NULL, NULL, 0, 0, NULL}; /// \todo not done
+consvar_t cv_allownewplayer = {"allowjoin", "On", CV_SAVE|CV_NETVAR, CV_OnOff, NULL, 0, NULL, NULL, 0, 0, NULL };
+consvar_t cv_joinnextround = {"joinnextround", "Off", CV_SAVE|CV_NETVAR, CV_OnOff, NULL, 0, NULL, NULL, 0, 0, NULL}; /// \todo not done
static CV_PossibleValue_t maxplayers_cons_t[] = {{2, "MIN"}, {32, "MAX"}, {0, NULL}};
consvar_t cv_maxplayers = {"maxplayers", "8", CV_SAVE, maxplayers_cons_t, NULL, 0, NULL, NULL, 0, 0, NULL};
static CV_PossibleValue_t resynchattempts_cons_t[] = {{0, "MIN"}, {20, "MAX"}, {0, NULL}};
-consvar_t cv_resynchattempts = {"resynchattempts", "10", 0, resynchattempts_cons_t, NULL, 0, NULL, NULL, 0, 0, NULL };
-consvar_t cv_blamecfail = {"blamecfail", "Off", 0, CV_OnOff, NULL, 0, NULL, NULL, 0, 0, NULL };
+consvar_t cv_resynchattempts = {"resynchattempts", "10", CV_SAVE, resynchattempts_cons_t, NULL, 0, NULL, NULL, 0, 0, NULL };
+consvar_t cv_blamecfail = {"blamecfail", "Off", CV_SAVE, CV_OnOff, NULL, 0, NULL, NULL, 0, 0, NULL };
// max file size to send to a player (in kilobytes)
static CV_PossibleValue_t maxsend_cons_t[] = {{0, "MIN"}, {51200, "MAX"}, {0, NULL}};
@@ -2981,11 +2995,6 @@ void D_ClientServerInit(void)
RegisterNetXCmd(XD_KICK, Got_KickCmd);
RegisterNetXCmd(XD_ADDPLAYER, Got_AddPlayer);
#ifndef NONET
- CV_RegisterVar(&cv_allownewplayer);
- CV_RegisterVar(&cv_joinnextround);
- CV_RegisterVar(&cv_showjoinaddress);
- CV_RegisterVar(&cv_resynchattempts);
- CV_RegisterVar(&cv_blamecfail);
#ifdef DUMPCONSISTENCY
CV_RegisterVar(&cv_dumpconsistency);
#endif
@@ -3784,6 +3793,7 @@ static void HandlePacketFromPlayer(SINT8 node)
INT32 netconsole;
tic_t realend, realstart;
UINT8 *pak, *txtpak, numtxtpak;
+ UINT8 finalmd5[16];/* Well, it's the cool thing to do? */
txtpak = NULL;
@@ -3981,6 +3991,32 @@ static void HandlePacketFromPlayer(SINT8 node)
textcmd[0] += (UINT8)netbuffer->u.textcmd[0];
}
break;
+ case PT_LOGIN:
+ if (client)
+ break;
+
+#ifndef NOMD5
+ if (doomcom->datalength < 16)/* ignore partial sends */
+ break;
+
+ if (!adminpasswordset)
+ {
+ CONS_Printf(M_GetText("Password from %s failed (no password set).\n"), player_names[netconsole]);
+ break;
+ }
+
+ // Do the final pass to compare with the sent md5
+ D_MD5PasswordPass(adminpassmd5, 16, va("PNUM%02d", netconsole), &finalmd5);
+
+ if (!memcmp(netbuffer->u.md5sum, finalmd5, 16))
+ {
+ CONS_Printf(M_GetText("%s passed authentication.\n"), player_names[netconsole]);
+ COM_BufInsertText(va("promote %d\n", netconsole)); // do this immediately
+ }
+ else
+ CONS_Printf(M_GetText("Password from %s failed.\n"), player_names[netconsole]);
+#endif
+ break;
case PT_NODETIMEOUT:
case PT_CLIENTQUIT:
if (client)
@@ -4858,3 +4894,29 @@ tic_t GetLag(INT32 node)
{
return gametic - nettics[node];
}
+
+void D_MD5PasswordPass(const UINT8 *buffer, size_t len, const char *salt, void *dest)
+{
+#ifdef NOMD5
+ (void)buffer;
+ (void)len;
+ (void)salt;
+ memset(dest, 0, 16);
+#else
+ char tmpbuf[256];
+ const size_t sl = strlen(salt);
+
+ if (len > 256-sl)
+ len = 256-sl;
+
+ memcpy(tmpbuf, buffer, len);
+ memmove(&tmpbuf[len], salt, sl);
+ //strcpy(&tmpbuf[len], salt);
+ len += strlen(salt);
+ if (len < 256)
+ memset(&tmpbuf[len],0,256-len);
+
+ // Yes, we intentionally md5 the ENTIRE buffer regardless of size...
+ md5_buffer(tmpbuf, 256, dest);
+#endif
+}
diff --git a/src/d_clisrv.h b/src/d_clisrv.h
index 4ed7ff95725d9af2c8afe07bf53a25171869bafd..d09d2aa48e024a5d7ce0451b26bf347663f83469 100644
--- a/src/d_clisrv.h
+++ b/src/d_clisrv.h
@@ -70,6 +70,9 @@ typedef enum
PT_NODETIMEOUT, // Packet sent to self if the connection times out.
PT_RESYNCHING, // Packet sent to resync players.
// Blocks game advance until synched.
+
+ PT_LOGIN, // Login attempt from the client.
+
#ifdef NEWPING
PT_PING, // Packet sent to tell clients the other client's latency to server.
#endif
@@ -161,6 +164,9 @@ typedef struct
angle_t aiming;
INT32 currentweapon;
INT32 ringweapons;
+ UINT16 ammoremoval;
+ tic_t ammoremovaltimer;
+ INT32 ammoremovalweapon;
UINT16 powers[NUMPOWERS];
// Score is resynched in the confirm resync packet
@@ -222,6 +228,7 @@ typedef struct
INT32 starpostnum;
tic_t starposttime;
angle_t starpostangle;
+ fixed_t starpostscale;
INT32 maxlink;
fixed_t dashspeed;
@@ -407,6 +414,7 @@ typedef struct
UINT8 textcmd[MAXTEXTCMD+1]; // 66049 bytes (wut??? 64k??? More like 257 bytes...)
filetx_pak filetxpak; // 139 bytes
clientconfig_pak clientcfg; // 136 bytes
+ UINT8 md5sum[16];
serverinfo_pak serverinfo; // 1024 bytes
serverrefuse_pak serverrefuse; // 65025 bytes (somehow I feel like those values are garbage...)
askinfo_pak askinfo; // 61 bytes
@@ -437,6 +445,7 @@ extern INT32 mapchangepending;
// Points inside doomcom
extern doomdata_t *netbuffer;
+extern consvar_t cv_showjoinaddress;
extern consvar_t cv_playbackspeed;
#define BASEPACKETSIZE offsetof(doomdata_t, u)
@@ -535,5 +544,10 @@ void D_ResetTiccmds(void);
tic_t GetLag(INT32 node);
UINT8 GetFreeXCmdSize(void);
+void D_MD5PasswordPass(const UINT8 *buffer, size_t len, const char *salt, void *dest);
+
extern UINT8 hu_resynching;
+
+extern UINT8 adminpassmd5[16];
+extern boolean adminpasswordset;
#endif
diff --git a/src/d_main.c b/src/d_main.c
index eaeae4b10f09580b108e46fbc3e0ff80e56b8bdc..9fa506bee472054d13148d3a9ce6a961f83d4b47 100644
--- a/src/d_main.c
+++ b/src/d_main.c
@@ -287,7 +287,7 @@ static void D_Display(void)
F_TitleScreenDrawer();
break;
}
- // Intentional fall-through
+ /* FALLTHRU */
case GS_LEVEL:
if (!gametic)
break;
diff --git a/src/d_netcmd.c b/src/d_netcmd.c
index e6f5244f019a72cc0f8e0c859f82146f9ec73b95..d0296e7fcbf4d7b80970c6ea2eeee6f57f250817 100644
--- a/src/d_netcmd.c
+++ b/src/d_netcmd.c
@@ -34,18 +34,19 @@
#include "p_spec.h"
#include "m_cheat.h"
#include "d_clisrv.h"
+#include "d_net.h"
#include "v_video.h"
#include "d_main.h"
#include "m_random.h"
#include "f_finale.h"
#include "filesrch.h"
#include "mserv.h"
-#include "md5.h"
#include "z_zone.h"
#include "lua_script.h"
#include "lua_hook.h"
#include "m_cond.h"
#include "m_anigif.h"
+#include "md5.h"
#ifdef NETGAME_DEVMODE
#define CV_RESTRICT CV_NETVAR
@@ -140,7 +141,6 @@ static void Command_Clearscores_f(void);
// Remote Administration
static void Command_Changepassword_f(void);
static void Command_Login_f(void);
-static void Got_Login(UINT8 **cp, INT32 playernum);
static void Got_Verification(UINT8 **cp, INT32 playernum);
static void Got_Removal(UINT8 **cp, INT32 playernum);
static void Command_Verify_f(void);
@@ -435,7 +435,6 @@ void D_RegisterServerCommands(void)
// Remote Administration
COM_AddCommand("password", Command_Changepassword_f);
- RegisterNetXCmd(XD_LOGIN, Got_Login);
COM_AddCommand("login", Command_Login_f); // useful in dedicated to kick off remote admin
COM_AddCommand("promote", Command_Verify_f);
RegisterNetXCmd(XD_VERIFIED, Got_Verification);
@@ -557,9 +556,16 @@ void D_RegisterServerCommands(void)
// d_clisrv
CV_RegisterVar(&cv_maxplayers);
+ CV_RegisterVar(&cv_resynchattempts);
CV_RegisterVar(&cv_maxsend);
CV_RegisterVar(&cv_noticedownload);
CV_RegisterVar(&cv_downloadspeed);
+#ifndef NONET
+ CV_RegisterVar(&cv_allownewplayer);
+ CV_RegisterVar(&cv_joinnextround);
+ CV_RegisterVar(&cv_showjoinaddress);
+ CV_RegisterVar(&cv_blamecfail);
+#endif
COM_AddCommand("ping", Command_Ping_f);
CV_RegisterVar(&cv_nettimeout);
@@ -599,6 +605,11 @@ void D_RegisterClientCommands(void)
Color_cons_t[MAXSKINCOLORS].value = 0;
Color_cons_t[MAXSKINCOLORS].strvalue = NULL;
+ // Set default player names
+ // Monster Iestyn (12/08/19): not sure where else I could have actually put this, but oh well
+ for (i = 0; i < MAXPLAYERS; i++)
+ sprintf(player_names[i], "Player %d", i);
+
if (dedicated)
return;
@@ -845,6 +856,7 @@ void D_RegisterClientCommands(void)
COM_AddCommand("rteleport", Command_RTeleport_f);
COM_AddCommand("skynum", Command_Skynum_f);
COM_AddCommand("weather", Command_Weather_f);
+ COM_AddCommand("toggletwod", Command_Toggletwod_f);
#ifdef _DEBUG
COM_AddCommand("causecfail", Command_CauseCfail_f);
#endif
@@ -2719,35 +2731,7 @@ static void Got_Teamchange(UINT8 **cp, INT32 playernum)
// Attempts to make password system a little sane without
// rewriting the entire goddamn XD_file system
//
-#include "md5.h"
-static void D_MD5PasswordPass(const UINT8 *buffer, size_t len, const char *salt, void *dest)
-{
-#ifdef NOMD5
- (void)buffer;
- (void)len;
- (void)salt;
- memset(dest, 0, 16);
-#else
- char tmpbuf[256];
- const size_t sl = strlen(salt);
-
- if (len > 256-sl)
- len = 256-sl;
- memcpy(tmpbuf, buffer, len);
- memmove(&tmpbuf[len], salt, sl);
- //strcpy(&tmpbuf[len], salt);
- len += strlen(salt);
- if (len < 256)
- memset(&tmpbuf[len],0,256-len);
-
- // Yes, we intentionally md5 the ENTIRE buffer regardless of size...
- md5_buffer(tmpbuf, 256, dest);
-#endif
-}
-
#define BASESALT "basepasswordstorage"
-static UINT8 adminpassmd5[16];
-static boolean adminpasswordset = false;
void D_SetPassword(const char *pw)
{
@@ -2785,7 +2769,6 @@ static void Command_Login_f(void)
// If we have no MD5 support then completely disable XD_LOGIN responses for security.
CONS_Alert(CONS_NOTICE, "Remote administration commands are not supported in this build.\n");
#else
- UINT8 finalmd5[16];
const char *pw;
if (!netgame)
@@ -2805,47 +2788,15 @@ static void Command_Login_f(void)
pw = COM_Argv(1);
// Do the base pass to get what the server has (or should?)
- D_MD5PasswordPass((const UINT8 *)pw, strlen(pw), BASESALT, &finalmd5);
+ D_MD5PasswordPass((const UINT8 *)pw, strlen(pw), BASESALT, &netbuffer->u.md5sum);
// Do the final pass to get the comparison the server will come up with
- D_MD5PasswordPass(finalmd5, 16, va("PNUM%02d", consoleplayer), &finalmd5);
+ D_MD5PasswordPass(netbuffer->u.md5sum, 16, va("PNUM%02d", consoleplayer), &netbuffer->u.md5sum);
CONS_Printf(M_GetText("Sending login... (Notice only given if password is correct.)\n"));
- SendNetXCmd(XD_LOGIN, finalmd5, 16);
-#endif
-}
-
-static void Got_Login(UINT8 **cp, INT32 playernum)
-{
-#ifdef NOMD5
- // If we have no MD5 support then completely disable XD_LOGIN responses for security.
- (void)cp;
- (void)playernum;
-#else
- UINT8 sentmd5[16], finalmd5[16];
-
- READMEM(*cp, sentmd5, 16);
-
- if (client)
- return;
-
- if (!adminpasswordset)
- {
- CONS_Printf(M_GetText("Password from %s failed (no password set).\n"), player_names[playernum]);
- return;
- }
-
- // Do the final pass to compare with the sent md5
- D_MD5PasswordPass(adminpassmd5, 16, va("PNUM%02d", playernum), &finalmd5);
-
- if (!memcmp(sentmd5, finalmd5, 16))
- {
- CONS_Printf(M_GetText("%s passed authentication.\n"), player_names[playernum]);
- COM_BufInsertText(va("promote %d\n", playernum)); // do this immediately
- }
- else
- CONS_Printf(M_GetText("Password from %s failed.\n"), player_names[playernum]);
+ netbuffer->packettype = PT_LOGIN;
+ HSendPacket(servernode, true, 0, 16);
#endif
}
diff --git a/src/d_netcmd.h b/src/d_netcmd.h
index d9889d9791f3f5c6d81821148b457bffc2aa01ac..5076c8afa3ffa7bc04c1cf48591b618726b83769 100644
--- a/src/d_netcmd.h
+++ b/src/d_netcmd.h
@@ -129,8 +129,8 @@ typedef enum
XD_ADDPLAYER, // 10
XD_TEAMCHANGE, // 11
XD_CLEARSCORES, // 12
- XD_LOGIN, // 13
- XD_VERIFIED, // 14
+ // UNUSED 13 (Because I don't want to change these comments)
+ XD_VERIFIED = 14,//14
XD_RANDOMSEED, // 15
XD_RUNSOC, // 16
XD_REQADDFILE, // 17
diff --git a/src/d_netfil.c b/src/d_netfil.c
index db9fa12e4957c86be3bd0579907bb9ea33af8230..ed2d11138ad267f51353c29673f15783b4a97061 100644
--- a/src/d_netfil.c
+++ b/src/d_netfil.c
@@ -745,9 +745,12 @@ void Got_Filetxpak(void)
{
INT32 filenum = netbuffer->u.filetxpak.fileid;
fileneeded_t *file = &fileneeded[filenum];
- char *filename = file->filename;
+ char *filename;
static INT32 filetime = 0;
+ filename = va("%s", file->filename);
+ nameonly(filename);
+
if (!(strcmp(filename, "srb2.pk3")
&& strcmp(filename, "srb2.srb")
&& strcmp(filename, "srb2.wad")
@@ -758,6 +761,8 @@ void Got_Filetxpak(void)
))
I_Error("Tried to download \"%s\"", filename);
+ filename = file->filename;
+
if (filenum >= fileneedednum)
{
DEBFILE(va("fileframent not needed %d>%d\n", filenum, fileneedednum));
diff --git a/src/d_player.h b/src/d_player.h
index c133af7039cac5b02ef609be63b8f1fadbc19453..69080bd9dc230450241fb0ca668a53c32d54889c 100644
--- a/src/d_player.h
+++ b/src/d_player.h
@@ -333,6 +333,10 @@ typedef struct player_s
INT32 currentweapon; // current weapon selected.
INT32 ringweapons; // weapons currently obtained.
+ UINT16 ammoremoval; // amount of ammo removed for the current weapon.
+ tic_t ammoremovaltimer; // flashing counter for ammo used.
+ INT32 ammoremovalweapon; // weapon from which the ammo was removed.
+
// Power ups. invinc and invis are tic counters.
UINT16 powers[NUMPOWERS];
@@ -437,6 +441,7 @@ typedef struct player_s
INT32 starpostnum; // The number of the last starpost you hit
tic_t starposttime; // Your time when you hit the starpost
angle_t starpostangle; // Angle that the starpost is facing - you respawn facing this way
+ fixed_t starpostscale; // Scale of the player; if negative, player is gravflipped
/////////////////
// NiGHTS Stuff//
diff --git a/src/dehacked.c b/src/dehacked.c
index 2f28a74cf8e7787db06cddb7b6882f1278b8a02c..37995cc9f4c4f8f418d12c1625e98457962ff1e1 100644
--- a/src/dehacked.c
+++ b/src/dehacked.c
@@ -1181,6 +1181,20 @@ static void readlevelheader(MYFILE *f, INT32 num)
mapheaderinfo[num-1]->muspostbosspos = (UINT32)get_number(word2);
else if (fastcmp(word, "MUSICPOSTBOSSFADEIN"))
mapheaderinfo[num-1]->muspostbossfadein = (UINT32)get_number(word2);
+ else if (fastcmp(word, "FORCERESETMUSIC"))
+ {
+ // This is a weird one because "FALSE"/"NO" could either apply to "leave to default preference" (cv_resetmusic)
+ // or "force off". Let's assume it means "force off", and let an unspecified value mean "default preference"
+ if (fastcmp(word2, "OFF") || word2[0] == 'F' || word2[0] == 'N') i = 0;
+ else if (fastcmp(word2, "ON") || word2[0] == 'T' || word2[0] == 'Y') i = 1;
+ else i = -1; // (fastcmp(word2, "DEFAULT"))
+
+ if (i >= -1 && i <= 1) // -1 to force off, 1 to force on, 0 to honor default.
+ // This behavior can be disabled with cv_resetmusicbyheader
+ mapheaderinfo[num-1]->musforcereset = (SINT8)i;
+ else
+ deh_warning("Level header %d: invalid forceresetmusic option %d", num, i);
+ }
else if (fastcmp(word, "FORCECHARACTER"))
{
strlcpy(mapheaderinfo[num-1]->forcecharacter, word2, SKINNAMESIZE+1);
@@ -2957,6 +2971,17 @@ static void readunlockable(MYFILE *f, INT32 num)
Z_Free(s);
}
+static const char NIGHTSGRADE_LIST[] = {
+ 'F', // GRADE_F
+ 'E', // GRADE_E
+ 'D', // GRADE_D
+ 'C', // GRADE_C
+ 'B', // GRADE_B
+ 'A', // GRADE_A
+ 'S', // GRADE_S
+ '\0'
+};
+
#define PARAMCHECK(n) do { if (!params[n]) { deh_warning("Too few parameters, need %d", n); return; }} while (0)
static void readcondition(UINT8 set, UINT32 id, char *word2)
{
@@ -3058,7 +3083,21 @@ static void readcondition(UINT8 set, UINT32 id, char *word2)
PARAMCHECK(2); // one optional one
ty = UC_NIGHTSSCORE + offset;
- re = atoi(params[2 + !!(params[3])]);
+ i = (params[3] ? 3 : 2);
+ if (fastncmp("GRADE_",params[i],6))
+ {
+ char *p = params[i]+6;
+ for (re = 0; NIGHTSGRADE_LIST[re]; re++)
+ if (*p == NIGHTSGRADE_LIST[re])
+ break;
+ if (!NIGHTSGRADE_LIST[re])
+ {
+ deh_warning("Invalid NiGHTS grade %s\n", params[i]);
+ return;
+ }
+ }
+ else
+ re = atoi(params[i]);
// Convert to map number if it appears to be one
if (params[1][0] >= 'A' && params[1][0] <= 'Z')
@@ -3347,6 +3386,10 @@ static void readmaincfg(MYFILE *f)
{
gameovertics = get_number(word2);
}
+ else if (fastcmp(word, "AMMOREMOVALTICS"))
+ {
+ ammoremovaltics = get_number(word2);
+ }
else if (fastcmp(word, "INTROTOPLAY"))
{
introtoplay = (UINT8)get_number(word2);
@@ -4585,10 +4628,10 @@ static const char *const STATE_LIST[] = { // array length left dynamic for sanit
"S_SONIC3KBOSSEXPLOSION6",
"S_JETFUME1",
- "S_JETFUME2",
// Boss 1
"S_EGGMOBILE_STND",
+ "S_EGGMOBILE_ROFL",
"S_EGGMOBILE_LATK1",
"S_EGGMOBILE_LATK2",
"S_EGGMOBILE_LATK3",
@@ -4598,7 +4641,6 @@ static const char *const STATE_LIST[] = { // array length left dynamic for sanit
"S_EGGMOBILE_LATK7",
"S_EGGMOBILE_LATK8",
"S_EGGMOBILE_LATK9",
- "S_EGGMOBILE_LATK10",
"S_EGGMOBILE_RATK1",
"S_EGGMOBILE_RATK2",
"S_EGGMOBILE_RATK3",
@@ -4608,7 +4650,6 @@ static const char *const STATE_LIST[] = { // array length left dynamic for sanit
"S_EGGMOBILE_RATK7",
"S_EGGMOBILE_RATK8",
"S_EGGMOBILE_RATK9",
- "S_EGGMOBILE_RATK10",
"S_EGGMOBILE_PANIC1",
"S_EGGMOBILE_PANIC2",
"S_EGGMOBILE_PANIC3",
@@ -4619,26 +4660,23 @@ static const char *const STATE_LIST[] = { // array length left dynamic for sanit
"S_EGGMOBILE_PANIC8",
"S_EGGMOBILE_PANIC9",
"S_EGGMOBILE_PANIC10",
+ "S_EGGMOBILE_PANIC11",
+ "S_EGGMOBILE_PANIC12",
+ "S_EGGMOBILE_PANIC13",
+ "S_EGGMOBILE_PANIC14",
+ "S_EGGMOBILE_PANIC15",
"S_EGGMOBILE_PAIN",
"S_EGGMOBILE_PAIN2",
"S_EGGMOBILE_DIE1",
"S_EGGMOBILE_DIE2",
"S_EGGMOBILE_DIE3",
"S_EGGMOBILE_DIE4",
- "S_EGGMOBILE_DIE5",
- "S_EGGMOBILE_DIE6",
- "S_EGGMOBILE_DIE7",
- "S_EGGMOBILE_DIE8",
- "S_EGGMOBILE_DIE9",
- "S_EGGMOBILE_DIE10",
- "S_EGGMOBILE_DIE11",
- "S_EGGMOBILE_DIE12",
- "S_EGGMOBILE_DIE13",
- "S_EGGMOBILE_DIE14",
"S_EGGMOBILE_FLEE1",
"S_EGGMOBILE_FLEE2",
"S_EGGMOBILE_BALL",
"S_EGGMOBILE_TARGET",
+ "S_BOSSEGLZ1",
+ "S_BOSSEGLZ2",
// Boss 2
"S_EGGMOBILE2_STND",
@@ -4655,16 +4693,6 @@ static const char *const STATE_LIST[] = { // array length left dynamic for sanit
"S_EGGMOBILE2_DIE2",
"S_EGGMOBILE2_DIE3",
"S_EGGMOBILE2_DIE4",
- "S_EGGMOBILE2_DIE5",
- "S_EGGMOBILE2_DIE6",
- "S_EGGMOBILE2_DIE7",
- "S_EGGMOBILE2_DIE8",
- "S_EGGMOBILE2_DIE9",
- "S_EGGMOBILE2_DIE10",
- "S_EGGMOBILE2_DIE11",
- "S_EGGMOBILE2_DIE12",
- "S_EGGMOBILE2_DIE13",
- "S_EGGMOBILE2_DIE14",
"S_EGGMOBILE2_FLEE1",
"S_EGGMOBILE2_FLEE2",
@@ -4680,11 +4708,7 @@ static const char *const STATE_LIST[] = { // array length left dynamic for sanit
// Boss 3
"S_EGGMOBILE3_STND",
- "S_EGGMOBILE3_LAUGH1",
- "S_EGGMOBILE3_LAUGH2",
- "S_EGGMOBILE3_LAUGH3",
- "S_EGGMOBILE3_LAUGH4",
- "S_EGGMOBILE3_LAUGH5",
+ "S_EGGMOBILE3_SHOCK",
"S_EGGMOBILE3_ATK1",
"S_EGGMOBILE3_ATK2",
"S_EGGMOBILE3_ATK3A",
@@ -4693,49 +4717,16 @@ static const char *const STATE_LIST[] = { // array length left dynamic for sanit
"S_EGGMOBILE3_ATK3D",
"S_EGGMOBILE3_ATK4",
"S_EGGMOBILE3_ATK5",
- "S_EGGMOBILE3_LAUGH6",
- "S_EGGMOBILE3_LAUGH7",
- "S_EGGMOBILE3_LAUGH8",
- "S_EGGMOBILE3_LAUGH9",
- "S_EGGMOBILE3_LAUGH10",
- "S_EGGMOBILE3_LAUGH11",
- "S_EGGMOBILE3_LAUGH12",
- "S_EGGMOBILE3_LAUGH13",
- "S_EGGMOBILE3_LAUGH14",
- "S_EGGMOBILE3_LAUGH15",
- "S_EGGMOBILE3_LAUGH16",
- "S_EGGMOBILE3_LAUGH17",
- "S_EGGMOBILE3_LAUGH18",
- "S_EGGMOBILE3_LAUGH19",
- "S_EGGMOBILE3_LAUGH20",
+ "S_EGGMOBILE3_ROFL",
"S_EGGMOBILE3_PAIN",
"S_EGGMOBILE3_PAIN2",
"S_EGGMOBILE3_DIE1",
"S_EGGMOBILE3_DIE2",
"S_EGGMOBILE3_DIE3",
"S_EGGMOBILE3_DIE4",
- "S_EGGMOBILE3_DIE5",
- "S_EGGMOBILE3_DIE6",
- "S_EGGMOBILE3_DIE7",
- "S_EGGMOBILE3_DIE8",
- "S_EGGMOBILE3_DIE9",
- "S_EGGMOBILE3_DIE10",
- "S_EGGMOBILE3_DIE11",
- "S_EGGMOBILE3_DIE12",
- "S_EGGMOBILE3_DIE13",
- "S_EGGMOBILE3_DIE14",
"S_EGGMOBILE3_FLEE1",
"S_EGGMOBILE3_FLEE2",
- // Boss 3 Propeller
- "S_PROPELLER1",
- "S_PROPELLER2",
- "S_PROPELLER3",
- "S_PROPELLER4",
- "S_PROPELLER5",
- "S_PROPELLER6",
- "S_PROPELLER7",
-
// Boss 3 pinch
"S_FAKEMOBILE_INIT",
"S_FAKEMOBILE",
@@ -4748,6 +4739,9 @@ static const char *const STATE_LIST[] = { // array length left dynamic for sanit
"S_FAKEMOBILE_DIE1",
"S_FAKEMOBILE_DIE2",
+ "S_BOSSSEBH1",
+ "S_BOSSSEBH2",
+
// Boss 4
"S_EGGMOBILE4_STND",
"S_EGGMOBILE4_LATK1",
@@ -4770,16 +4764,6 @@ static const char *const STATE_LIST[] = { // array length left dynamic for sanit
"S_EGGMOBILE4_DIE2",
"S_EGGMOBILE4_DIE3",
"S_EGGMOBILE4_DIE4",
- "S_EGGMOBILE4_DIE5",
- "S_EGGMOBILE4_DIE6",
- "S_EGGMOBILE4_DIE7",
- "S_EGGMOBILE4_DIE8",
- "S_EGGMOBILE4_DIE9",
- "S_EGGMOBILE4_DIE10",
- "S_EGGMOBILE4_DIE11",
- "S_EGGMOBILE4_DIE12",
- "S_EGGMOBILE4_DIE13",
- "S_EGGMOBILE4_DIE14",
"S_EGGMOBILE4_FLEE1",
"S_EGGMOBILE4_FLEE2",
"S_EGGMOBILE4_MACE",
@@ -4835,6 +4819,7 @@ static const char *const STATE_LIST[] = { // array length left dynamic for sanit
"S_FANG_FIRE3",
"S_FANG_FIRE4",
"S_FANG_FIREREPEAT",
+ "S_FANG_LOBSHOT0",
"S_FANG_LOBSHOT1",
"S_FANG_LOBSHOT2",
"S_FANG_WAIT1",
@@ -4851,6 +4836,7 @@ static const char *const STATE_LIST[] = { // array length left dynamic for sanit
"S_FANG_PINCHFALL2",
"S_FANG_PINCHSKID1",
"S_FANG_PINCHSKID2",
+ "S_FANG_PINCHLOBSHOT0",
"S_FANG_PINCHLOBSHOT1",
"S_FANG_PINCHLOBSHOT2",
"S_FANG_PINCHLOBSHOT3",
@@ -5156,21 +5142,9 @@ static const char *const STATE_LIST[] = { // array length left dynamic for sanit
"S_METALSONIC_DEATH4",
"S_METALSONIC_FLEE1",
"S_METALSONIC_FLEE2",
- "S_METALSONIC_FLEE3",
- "S_METALSONIC_FLEE4",
"S_MSSHIELD_F1",
"S_MSSHIELD_F2",
- "S_MSSHIELD_F3",
- "S_MSSHIELD_F4",
- "S_MSSHIELD_F5",
- "S_MSSHIELD_F6",
- "S_MSSHIELD_F7",
- "S_MSSHIELD_F8",
- "S_MSSHIELD_F9",
- "S_MSSHIELD_F10",
- "S_MSSHIELD_F11",
- "S_MSSHIELD_F12",
// Ring
"S_RING",
@@ -7254,6 +7228,7 @@ static const char *const MOBJTYPE_LIST[] = { // array length left dynamic for s
"MT_EGGTRAP",
"MT_BOSS3WAYPOINT",
"MT_BOSS9GATHERPOINT",
+ "MT_BOSSJUNK",
// Boss 1
"MT_EGGMOBILE",
@@ -7265,15 +7240,11 @@ static const char *const MOBJTYPE_LIST[] = { // array length left dynamic for s
// Boss 2
"MT_EGGMOBILE2",
"MT_EGGMOBILE2_POGO",
- "MT_BOSSTANK1",
- "MT_BOSSTANK2",
- "MT_BOSSSPIGOT",
"MT_GOOP",
"MT_GOOPTRAIL",
// Boss 3
"MT_EGGMOBILE3",
- "MT_PROPELLER",
"MT_FAKEMOBILE",
"MT_SHOCK",
@@ -8513,15 +8484,6 @@ struct {
{"LF2_NOVISITNEEDED",LF2_NOVISITNEEDED},
{"LF2_WIDEICON",LF2_WIDEICON},
- // NiGHTS grades
- {"GRADE_F",GRADE_F},
- {"GRADE_E",GRADE_E},
- {"GRADE_D",GRADE_D},
- {"GRADE_C",GRADE_C},
- {"GRADE_B",GRADE_B},
- {"GRADE_A",GRADE_A},
- {"GRADE_S",GRADE_S},
-
// Emeralds
{"EMERALD1",EMERALD1},
{"EMERALD2",EMERALD2},
@@ -9343,6 +9305,19 @@ static fixed_t find_const(const char **rword)
free(word);
return 0;
}
+ else if (fastncmp("GRADE_",word,6))
+ {
+ char *p = word+6;
+ for (i = 0; NIGHTSGRADE_LIST[i]; i++)
+ if (*p == NIGHTSGRADE_LIST[i])
+ {
+ free(word);
+ return i;
+ }
+ const_warning("NiGHTS grade",word);
+ free(word);
+ return 0;
+ }
for (i = 0; INT_CONST[i].n; i++)
if (fastcmp(word,INT_CONST[i].n)) {
free(word);
@@ -9791,6 +9766,18 @@ static inline int lib_getenum(lua_State *L)
if (mathlib) return luaL_error(L, "skincolor '%s' could not be found.\n", word);
return 0;
}
+ else if (fastncmp("GRADE_",word,6))
+ {
+ p = word+6;
+ for (i = 0; NIGHTSGRADE_LIST[i]; i++)
+ if (*p == NIGHTSGRADE_LIST[i])
+ {
+ lua_pushinteger(L, i);
+ return 1;
+ }
+ if (mathlib) return luaL_error(L, "NiGHTS grade '%s' could not be found.\n", word);
+ return 0;
+ }
else if (fastncmp("MN_",word,3)) {
p = word+3;
for (i = 0; i < NUMMENUTYPES; i++)
diff --git a/src/doomdata.h b/src/doomdata.h
index 38727b85c7ad196994658a75f1fb9d0a0938b223..b4142463c7673bfb9d1d5bcf7d53c9d502f2c9e4 100644
--- a/src/doomdata.h
+++ b/src/doomdata.h
@@ -210,7 +210,7 @@ typedef struct
extern const UINT8 Color_Index[MAXTRANSLATIONS-1][16];
extern const char *Color_Names[MAXSKINCOLORS + NUMSUPERCOLORS];
-extern const UINT8 Color_Opposite[(MAXSKINCOLORS - 1)*2];
+extern const UINT8 Color_Opposite[MAXSKINCOLORS - 1][2];
#define NUMMAPS 1035
diff --git a/src/doomdef.h b/src/doomdef.h
index c948d780562961f0593cb3f4f4e672cb718b2a1f..4a017436931be6f1cfa2d199ad7fbd6aa93f53fc 100644
--- a/src/doomdef.h
+++ b/src/doomdef.h
@@ -206,7 +206,7 @@ extern FILE *logstream;
// it's only for detection of the version the player is using so the MS can alert them of an update.
// Only set it higher, not lower, obviously.
// Note that we use this to help keep internal testing in check; this is why v2.1.0 is not version "1".
-#define MODVERSION 28
+#define MODVERSION 30
// To version config.cfg, MAJOREXECVERSION is set equal to MODVERSION automatically.
// Increment MINOREXECVERSION whenever a config change is needed that does not correspond
@@ -616,4 +616,8 @@ extern const char *compdate, *comptime, *comprevision, *compbranch;
/// SRB2CB itself ported this from PrBoom+
#define NEWCLIP
+#ifndef HAVE_PNG
+#define NO_PNG_LUMPS
+#endif
+
#endif // __DOOMDEF__
diff --git a/src/doomstat.h b/src/doomstat.h
index b6c376d1ce46ebea5bf83b86010110f98aaba201..a70a122a6f3b0ec0d3628f17bc844f1f019b27bb 100644
--- a/src/doomstat.h
+++ b/src/doomstat.h
@@ -333,6 +333,8 @@ typedef struct
UINT32 muspostbosspos; ///< Post-bossdeath position
UINT32 muspostbossfadein; ///< Post-bossdeath fade-in milliseconds.
+ SINT8 musforcereset; ///< Force resetmusic (-1 for default; 0 for force off; 1 for force on)
+
// Lua stuff.
// (This is not ifdeffed so the map header structure can stay identical, just in case.)
UINT8 numCustomOptions; ///< Internal. For Lua custom value support.
diff --git a/src/f_finale.c b/src/f_finale.c
index da042abeb05c9050b2815586df034bd2699eb457..e44add4d15f47d4fd83720c7ea2cbd3a1f18baa6 100644
--- a/src/f_finale.c
+++ b/src/f_finale.c
@@ -1584,22 +1584,22 @@ void F_StartEnding(void)
UINT8 skinnum = players[consoleplayer].skin;
spritedef_t *sprdef;
spriteframe_t *sprframe;
- if (skins[skinnum].sprites[SPR2_XTRA].numframes >= 5)
+ if (skins[skinnum].sprites[SPR2_XTRA].numframes >= 7)
{
sprdef = &skins[skinnum].sprites[SPR2_XTRA];
// character head, skin specific
- sprframe = &sprdef->spriteframes[2];
+ sprframe = &sprdef->spriteframes[4];
endfwrk[0] = W_CachePatchNum(sprframe->lumppat[0], PU_LEVEL);
- sprframe = &sprdef->spriteframes[3];
+ sprframe = &sprdef->spriteframes[5];
endfwrk[1] = W_CachePatchNum(sprframe->lumppat[0], PU_LEVEL);
- sprframe = &sprdef->spriteframes[4];
+ sprframe = &sprdef->spriteframes[6];
endfwrk[2] = W_CachePatchNum(sprframe->lumppat[0], PU_LEVEL);
}
- else // eh, yknow what? too lazy to put MISSINGs here. eggman wins if you don't give your character an ending firework display.
+ else // Show a star if your character doesn't have an ending firework display. (Basically the MISSINGs for this)
{
- endfwrk[0] = W_CachePatchName("ENDFWRK0", PU_LEVEL);
- endfwrk[1] = W_CachePatchName("ENDFWRK1", PU_LEVEL);
- endfwrk[2] = W_CachePatchName("ENDFWRK2", PU_LEVEL);
+ endfwrk[0] = W_CachePatchName("ENDFWRK3", PU_LEVEL);
+ endfwrk[1] = W_CachePatchName("ENDFWRK4", PU_LEVEL);
+ endfwrk[2] = W_CachePatchName("ENDFWRK5", PU_LEVEL);
}
endbrdr[0] = W_CachePatchName("ENDBRDR2", PU_LEVEL);
diff --git a/src/g_game.c b/src/g_game.c
index c96b0805c5191a7b2e88c7791684ee83af51b6f5..55154c3e6d47248ce13afa8f9a5e0641eac3e207 100644
--- a/src/g_game.c
+++ b/src/g_game.c
@@ -217,6 +217,8 @@ UINT16 nightslinktics = 2*TICRATE;
INT32 gameovertics = 15*TICRATE;
+UINT8 ammoremovaltics = 2*TICRATE;
+
UINT8 use1upSound = 0;
UINT8 maxXtraLife = 2; // Max extra lives from rings
@@ -416,49 +418,13 @@ consvar_t cv_spinaxis2 = {"joyaxis2_spin", "None", CV_SAVE, joyaxis_cons_t, NULL
consvar_t cv_fireaxis2 = {"joyaxis2_fire", "Z-Axis-", CV_SAVE, joyaxis_cons_t, NULL, 0, NULL, NULL, 0, 0, NULL};
consvar_t cv_firenaxis2 = {"joyaxis2_firenormal", "Z-Axis", CV_SAVE, joyaxis_cons_t, NULL, 0, NULL, NULL, 0, 0, NULL};
-#if MAXPLAYERS > 32
-#error "please update player_name table using the new value for MAXPLAYERS"
-#endif
-
#ifdef SEENAMES
player_t *seenplayer; // player we're aiming at right now
#endif
-char player_names[MAXPLAYERS][MAXPLAYERNAME+1] =
-{
- "Player 1",
- "Player 2",
- "Player 3",
- "Player 4",
- "Player 5",
- "Player 6",
- "Player 7",
- "Player 8",
- "Player 9",
- "Player 10",
- "Player 11",
- "Player 12",
- "Player 13",
- "Player 14",
- "Player 15",
- "Player 16",
- "Player 17",
- "Player 18",
- "Player 19",
- "Player 20",
- "Player 21",
- "Player 22",
- "Player 23",
- "Player 24",
- "Player 25",
- "Player 26",
- "Player 27",
- "Player 28",
- "Player 29",
- "Player 30",
- "Player 31",
- "Player 32"
-};
+// now automatically allocated in D_RegisterClientCommands
+// so that it doesn't have to be updated depending on the value of MAXPLAYERS
+char player_names[MAXPLAYERS][MAXPLAYERNAME+1];
INT16 rw_maximums[NUM_WEAPONS] =
{
@@ -2117,6 +2083,7 @@ static inline void G_PlayerFinishLevel(INT32 player)
p->mo->flags2 &= ~MF2_SHADOW; // cancel invisibility
P_FlashPal(p, 0, 0); // Resets
+ p->starpostscale = 0;
p->starpostangle = 0;
p->starposttime = 0;
p->starpostx = 0;
@@ -2163,6 +2130,7 @@ void G_PlayerReborn(INT32 player)
INT16 starpostz;
INT32 starpostnum;
INT32 starpostangle;
+ fixed_t starpostscale;
fixed_t jumpfactor;
fixed_t height;
fixed_t spinheight;
@@ -2218,6 +2186,7 @@ void G_PlayerReborn(INT32 player)
starpostz = players[player].starpostz;
starpostnum = players[player].starpostnum;
starpostangle = players[player].starpostangle;
+ starpostscale = players[player].starpostscale;
jumpfactor = players[player].jumpfactor;
height = players[player].height;
spinheight = players[player].spinheight;
@@ -2273,6 +2242,7 @@ void G_PlayerReborn(INT32 player)
p->starpostz = starpostz;
p->starpostnum = starpostnum;
p->starpostangle = starpostangle;
+ p->starpostscale = starpostscale;
p->jumpfactor = jumpfactor;
p->height = height;
p->spinheight = spinheight;
@@ -2310,7 +2280,7 @@ void G_PlayerReborn(INT32 player)
}
// This is in S_Start, but this was not here previously.
- // if (cv_resetmusic.value)
+ // if (RESETMUSIC)
// S_StopMusic();
S_ChangeMusicEx(mapmusname, mapmusflags, true, mapmusposition, 0, 0);
}
@@ -2691,6 +2661,7 @@ void G_DoReborn(INT32 playernum)
{
if (!playeringame[i])
continue;
+ players[i].starpostscale = 0;
players[i].starpostangle = 0;
players[i].starposttime = 0;
players[i].starpostx = 0;
@@ -2813,6 +2784,7 @@ void G_AddPlayer(INT32 playernum)
if (!(cv_coopstarposts.value && (gametype == GT_COOP) && (p->starpostnum < players[i].starpostnum)))
continue;
+ p->starpostscale = players[i].starpostscale;
p->starposttime = players[i].starposttime;
p->starpostx = players[i].starpostx;
p->starposty = players[i].starposty;
@@ -3321,9 +3293,11 @@ void G_LoadGameSettings(void)
{
// defaults
spstage_start = 1;
- sstage_start = smpstage_start = 50;
- sstage_end = smpstage_end = 56; // 7 special stages in vanilla SRB2
+ sstage_start = 50;
+ sstage_end = 56; // 7 special stages in vanilla SRB2
sstage_end++; // plus one weirdo
+ smpstage_start = 60;
+ smpstage_end = 66; // 7 multiplayer special stages too
// initialize free sfx slots for skin sounds
S_InitRuntimeSounds();
@@ -3898,7 +3872,7 @@ void G_InitNew(UINT8 pultmode, const char *mapname, boolean resetplayer, boolean
for (i = 0; i < MAXPLAYERS; i++)
{
players[i].playerstate = PST_REBORN;
- players[i].starpostangle = players[i].starpostnum = players[i].starposttime = 0;
+ players[i].starpostscale = players[i].starpostangle = players[i].starpostnum = players[i].starposttime = 0;
players[i].starpostx = players[i].starposty = players[i].starpostz = 0;
if (netgame || multiplayer)
@@ -4609,7 +4583,7 @@ void G_GhostTicker(void)
default:
case GHC_RETURNSKIN:
g->mo->skin = g->oldmo.skin;
- // fallthru
+ /* FALLTHRU */
case GHC_NORMAL: // Go back to skin color
g->mo->color = g->oldmo.color;
break;
diff --git a/src/g_game.h b/src/g_game.h
index 4b63bc180afcb0908e5ffeefddb907cb07d098a7..e161bc8ed4a7cf11eefe93bbf6715825426b582c 100644
--- a/src/g_game.h
+++ b/src/g_game.h
@@ -51,6 +51,7 @@ extern tic_t levelstarttic;
// for modding?
extern INT16 prevmap, nextmap;
extern INT32 gameovertics;
+extern UINT8 ammoremovaltics;
extern tic_t timeinmap; // Ticker for time spent in level (used for levelcard display)
extern INT16 rw_maximums[NUM_WEAPONS];
extern INT32 pausedelay;
diff --git a/src/hardware/hw_cache.c b/src/hardware/hw_cache.c
index 6bc2c712e3f5c593d24aed10dd643c7134d76d50..77ef265065fa67aba58a871f93488a0b4365f425 100644
--- a/src/hardware/hw_cache.c
+++ b/src/hardware/hw_cache.c
@@ -30,6 +30,7 @@
#include "../z_zone.h"
#include "../v_video.h"
#include "../r_draw.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)
@@ -60,7 +61,6 @@ static const INT32 format2bpp[16] =
2, //14 GR_TEXFMT_AP_88
};
-
// This code was originally placed directly in HWR_DrawPatchInCache.
// It is now split from it for my sanity! (and the sanity of others)
// -- Monster Iestyn (13/02/19)
@@ -138,18 +138,37 @@ static void HWR_DrawColumnInCache(const column_t *patchcol, UINT8 *block, GLMipm
// Alam: SRB2 uses Mingw, HUGS
switch (bpp)
{
- case 2 : texelu16 = (UINT16)((alpha<<8) | texel);
+ case 2 : // uhhhhhhhh..........
+ if ((originPatch != NULL) && (originPatch->style != AST_COPY))
+ texel = ASTBlendPixel_8bpp(*(dest+1), texel, originPatch->style, originPatch->alpha);
+ texelu16 = (UINT16)((alpha<<8) | texel);
memcpy(dest, &texelu16, sizeof(UINT16));
break;
case 3 : colortemp = V_GetColor(texel);
+ if ((originPatch != NULL) && (originPatch->style != AST_COPY))
+ {
+ RGBA_t rgbatexel;
+ rgbatexel.rgba = *(UINT32 *)dest;
+ colortemp = ASTBlendPixel(rgbatexel, colortemp, originPatch->style, originPatch->alpha);
+ }
memcpy(dest, &colortemp, sizeof(RGBA_t)-sizeof(UINT8));
break;
case 4 : colortemp = V_GetColor(texel);
colortemp.s.alpha = alpha;
+ if ((originPatch != NULL) && (originPatch->style != AST_COPY))
+ {
+ RGBA_t rgbatexel;
+ rgbatexel.rgba = *(UINT32 *)dest;
+ colortemp = ASTBlendPixel(rgbatexel, colortemp, originPatch->style, originPatch->alpha);
+ }
memcpy(dest, &colortemp, sizeof(RGBA_t));
break;
// default is 1
- default: *dest = texel;
+ default:
+ if ((originPatch != NULL) && (originPatch->style != AST_COPY))
+ *dest = ASTBlendPixel_8bpp(*dest, texel, originPatch->style, originPatch->alpha);
+ else
+ *dest = texel;
break;
}
@@ -233,18 +252,37 @@ static void HWR_DrawFlippedColumnInCache(const column_t *patchcol, UINT8 *block,
// Alam: SRB2 uses Mingw, HUGS
switch (bpp)
{
- case 2 : texelu16 = (UINT16)((alpha<<8) | texel);
+ case 2 : // uhhhhhhhh..........
+ if ((originPatch != NULL) && (originPatch->style != AST_COPY))
+ texel = ASTBlendPixel_8bpp(*(dest+1), texel, originPatch->style, originPatch->alpha);
+ texelu16 = (UINT16)((alpha<<8) | texel);
memcpy(dest, &texelu16, sizeof(UINT16));
break;
case 3 : colortemp = V_GetColor(texel);
+ if ((originPatch != NULL) && (originPatch->style != AST_COPY))
+ {
+ RGBA_t rgbatexel;
+ rgbatexel.rgba = *(UINT32 *)dest;
+ colortemp = ASTBlendPixel(rgbatexel, colortemp, originPatch->style, originPatch->alpha);
+ }
memcpy(dest, &colortemp, sizeof(RGBA_t)-sizeof(UINT8));
break;
case 4 : colortemp = V_GetColor(texel);
colortemp.s.alpha = alpha;
+ if ((originPatch != NULL) && (originPatch->style != AST_COPY))
+ {
+ RGBA_t rgbatexel;
+ rgbatexel.rgba = *(UINT32 *)dest;
+ colortemp = ASTBlendPixel(rgbatexel, colortemp, originPatch->style, originPatch->alpha);
+ }
memcpy(dest, &colortemp, sizeof(RGBA_t));
break;
// default is 1
- default: *dest = texel;
+ default:
+ if ((originPatch != NULL) && (originPatch->style != AST_COPY))
+ *dest = ASTBlendPixel_8bpp(*dest, texel, originPatch->style, originPatch->alpha);
+ else
+ *dest = texel;
break;
}
@@ -331,16 +369,7 @@ static void HWR_DrawTexturePatchInCache(GLMipmap_t *mipmap,
if (texture->width <= 0 || texture->height <= 0)
return;
- /*if ((patch->style == AST_TRANSLUCENT) && (patch->alpha <= (10*255/11))) // Alpha style set to translucent? Is the alpha small enough for translucency?
- {
- if (patch->alpha < 255/11) // Is the patch way too translucent? Don't render then.
- continue;
- ColumnDrawerPointer = (patch->flip & 2) ? HWR_DrawTransFlippedColumnInCache : HWR_DrawTransColumnInCache;
- }
- else*/
- {
- ColumnDrawerPointer = (patch->flip & 2) ? HWR_DrawFlippedColumnInCache : HWR_DrawColumnInCache;
- }
+ ColumnDrawerPointer = (patch->flip & 2) ? HWR_DrawFlippedColumnInCache : HWR_DrawColumnInCache;
x1 = patch->originx;
width = SHORT(realpatch->width);
@@ -420,6 +449,7 @@ static void HWR_DrawTexturePatchInCache(GLMipmap_t *mipmap,
static void HWR_ResizeBlock(INT32 originalwidth, INT32 originalheight,
GrTexInfo *grInfo)
{
+#ifdef GLIDE_API_COMPATIBILITY
// Build the full textures from patches.
static const GrLOD_t gr_lods[9] =
{
@@ -456,6 +486,9 @@ static void HWR_ResizeBlock(INT32 originalwidth, INT32 originalheight,
INT32 j,k;
INT32 max,min;
+#else
+ (void)grInfo;
+#endif
// find a power of 2 width/height
if (cv_grrounddown.value)
@@ -511,6 +544,7 @@ static void HWR_ResizeBlock(INT32 originalwidth, INT32 originalheight,
}
else
{
+#ifdef GLIDE_API_COMPATIBILITY
//size up to nearest power of 2
blockwidth = 1;
while (blockwidth < originalwidth)
@@ -528,9 +562,14 @@ static void HWR_ResizeBlock(INT32 originalwidth, INT32 originalheight,
if (blockheight > 2048)
blockheight = 2048;
//I_Error("3D GenerateTexture : too big");
+#else
+ blockwidth = originalwidth;
+ blockheight = originalheight;
+#endif
}
// do the boring LOD stuff.. blech!
+#ifdef GLIDE_API_COMPATIBILITY
if (blockwidth >= blockheight)
{
max = blockwidth;
@@ -562,6 +601,7 @@ static void HWR_ResizeBlock(INT32 originalwidth, INT32 originalheight,
if (blockwidth < blockheight)
j += 4;
grInfo->aspectRatioLog2 = gr_aspects[j].aspect;
+#endif
blocksize = blockwidth * blockheight;
@@ -650,7 +690,12 @@ static void HWR_GenerateTexture(INT32 texnum, GLTexture_t *grtex)
// Composite the columns together.
for (i = 0, patch = texture->patches; i < texture->patchcount; i++, patch++)
{
+ size_t lumplength = W_LumpLengthPwad(patch->wad, patch->lump);
realpatch = W_CacheLumpNumPwad(patch->wad, patch->lump, PU_CACHE);
+#ifndef NO_PNG_LUMPS
+ if (R_IsLumpPNG((UINT8 *)realpatch, lumplength))
+ realpatch = R_PNGToPatch((UINT8 *)realpatch, lumplength);
+#endif
HWR_DrawTexturePatchInCache(&grtex->mipmap,
blockwidth, blockheight,
texture, patch,
@@ -756,11 +801,13 @@ void HWR_MakePatch (const patch_t *patch, GLPatch_t *grPatch, GLMipmap_t *grMipm
static size_t gr_numtextures;
static GLTexture_t *gr_textures; // for ALL Doom textures
+static GLTexture_t *gr_textures2;
void HWR_InitTextureCache(void)
{
gr_numtextures = 0;
gr_textures = NULL;
+ gr_textures2 = NULL;
}
@@ -799,7 +846,10 @@ void HWR_FreeTextureCache(void)
// texturecache info, we can free it
if (gr_textures)
free(gr_textures);
+ if (gr_textures2)
+ free(gr_textures2);
gr_textures = NULL;
+ gr_textures2 = NULL;
gr_numtextures = 0;
}
@@ -817,6 +867,9 @@ void HWR_PrepLevelCache(size_t pnumtextures)
gr_textures = calloc(pnumtextures, sizeof (*gr_textures));
if (gr_textures == NULL)
I_Error("3D can't alloc gr_textures");
+ gr_textures2 = calloc(pnumtextures, sizeof (*gr_textures2));
+ if (gr_textures2 == NULL)
+ I_Error("3D can't alloc gr_textures2");
}
void HWR_SetPalette(RGBA_t *palette)
@@ -847,7 +900,7 @@ GLTexture_t *HWR_GetTexture(INT32 tex)
GLTexture_t *grtex;
#ifdef PARANOIA
if ((unsigned)tex >= gr_numtextures)
- I_Error(" HWR_GetTexture: tex >= numtextures\n");
+ I_Error("HWR_GetTexture: tex >= numtextures\n");
#endif
grtex = &gr_textures[tex];
@@ -862,15 +915,39 @@ GLTexture_t *HWR_GetTexture(INT32 tex)
return grtex;
}
+// HWR_RenderPlane and HWR_RenderPolyObjectPlane need this to get the flat dimensions from a patch.
+lumpnum_t gr_patchflat;
+
+static void HWR_LoadPatchFlat(GLMipmap_t *grMipmap, lumpnum_t flatlumpnum)
+{
+ UINT8 *flat;
+ patch_t *patch = (patch_t *)W_CacheLumpNum(flatlumpnum, PU_STATIC);
+ size_t lumplength = W_LumpLength(flatlumpnum);
+
+#ifndef NO_PNG_LUMPS
+ if (R_IsLumpPNG((UINT8 *)patch, lumplength))
+ patch = R_PNGToPatch((UINT8 *)patch, lumplength);
+#endif
+
+ grMipmap->width = (UINT16)SHORT(patch->width);
+ grMipmap->height = (UINT16)SHORT(patch->height);
+
+ flat = Z_Malloc(grMipmap->width * grMipmap->height, PU_HWRCACHE, &grMipmap->grInfo.data);
+ memset(flat, TRANSPARENTPIXEL, grMipmap->width * grMipmap->height);
+
+ R_PatchToFlat(patch, flat);
+}
static void HWR_CacheFlat(GLMipmap_t *grMipmap, lumpnum_t flatlumpnum)
{
size_t size, pflatsize;
// setup the texture info
+#ifdef GLIDE_API_COMPATIBILITY
grMipmap->grInfo.smallLodLog2 = GR_LOD_LOG2_64;
grMipmap->grInfo.largeLodLog2 = GR_LOD_LOG2_64;
grMipmap->grInfo.aspectRatioLog2 = GR_ASPECT_LOG2_1x1;
+#endif
grMipmap->grInfo.format = GR_TEXFMT_P_8;
grMipmap->flags = TF_WRAPXY|TF_CHROMAKEYED;
@@ -900,14 +977,19 @@ static void HWR_CacheFlat(GLMipmap_t *grMipmap, lumpnum_t flatlumpnum)
pflatsize = 64;
break;
}
- grMipmap->width = (UINT16)pflatsize;
- grMipmap->height = (UINT16)pflatsize;
- // the flat raw data needn't be converted with palettized textures
- W_ReadLump(flatlumpnum, Z_Malloc(W_LumpLength(flatlumpnum),
- PU_HWRCACHE, &grMipmap->grInfo.data));
-}
+ if (R_CheckIfPatch(flatlumpnum))
+ HWR_LoadPatchFlat(grMipmap, flatlumpnum);
+ else
+ {
+ grMipmap->width = (UINT16)pflatsize;
+ grMipmap->height = (UINT16)pflatsize;
+ // the flat raw data needn't be converted with palettized textures
+ W_ReadLump(flatlumpnum, Z_Malloc(W_LumpLength(flatlumpnum),
+ PU_HWRCACHE, &grMipmap->grInfo.data));
+ }
+}
// Download a Doom 'flat' to the hardware cache and make it ready for use
void HWR_GetFlat(lumpnum_t flatlumpnum)
@@ -923,6 +1005,52 @@ void HWR_GetFlat(lumpnum_t flatlumpnum)
// The system-memory data can be purged now.
Z_ChangeTag(grmip->grInfo.data, PU_HWRCACHE_UNLOCKED);
+
+ gr_patchflat = 0;
+ if (R_CheckIfPatch(flatlumpnum))
+ gr_patchflat = flatlumpnum;
+}
+
+static void HWR_LoadTextureFlat(GLMipmap_t *grMipmap, INT32 texturenum)
+{
+ UINT8 *flat;
+
+ // setup the texture info
+#ifdef GLIDE_API_COMPATIBILITY
+ grMipmap->grInfo.smallLodLog2 = GR_LOD_LOG2_64;
+ grMipmap->grInfo.largeLodLog2 = GR_LOD_LOG2_64;
+ grMipmap->grInfo.aspectRatioLog2 = GR_ASPECT_LOG2_1x1;
+#endif
+ grMipmap->grInfo.format = GR_TEXFMT_P_8;
+ grMipmap->flags = TF_WRAPXY|TF_CHROMAKEYED;
+
+ grMipmap->width = (UINT16)textures[texturenum]->width;
+ grMipmap->height = (UINT16)textures[texturenum]->height;
+
+ flat = Z_Malloc(grMipmap->width * grMipmap->height, PU_HWRCACHE, &grMipmap->grInfo.data);
+ memset(flat, TRANSPARENTPIXEL, grMipmap->width * grMipmap->height);
+
+ R_TextureToFlat(texturenum, flat);
+}
+
+void HWR_GetTextureFlat(INT32 texturenum)
+{
+ GLTexture_t *grtex;
+#ifdef PARANOIA
+ if ((unsigned)texturenum >= gr_numtextures)
+ I_Error("HWR_GetTextureFlat: texturenum >= numtextures\n");
+#endif
+ if (texturenum == 0 || texturenum == -1)
+ return;
+ grtex = &gr_textures2[texturenum];
+
+ if (!grtex->mipmap.grInfo.data && !grtex->mipmap.downloaded)
+ HWR_LoadTextureFlat(&grtex->mipmap, texturenum);
+
+ HWD.pfnSetTexture(&grtex->mipmap);
+
+ // The system-memory data can be purged now.
+ Z_ChangeTag(grtex->mipmap.grInfo.data, PU_HWRCACHE_UNLOCKED);
}
//
diff --git a/src/hardware/hw_drv.h b/src/hardware/hw_drv.h
index e2fa90eb035de94d0b5ad7d81de624ed0fbe4341..e0507bc7083f9f54cebe7b3ab6952fa5a932ee03 100644
--- a/src/hardware/hw_drv.h
+++ b/src/hardware/hw_drv.h
@@ -47,6 +47,7 @@ EXPORT void HWRAPI(SetPalette) (RGBA_t *ppal, RGBA_t *pgamma);
EXPORT void HWRAPI(FinishUpdate) (INT32 waitvbl);
EXPORT void HWRAPI(Draw2DLine) (F2DCoord *v1, F2DCoord *v2, RGBA_t Color);
EXPORT void HWRAPI(DrawPolygon) (FSurfaceInfo *pSurf, FOutVector *pOutVerts, FUINT iNumPts, FBITFIELD PolyFlags);
+EXPORT void HWRAPI(RenderSkyDome) (INT32 tex, INT32 texture_width, INT32 texture_height, FTransform transform);
EXPORT void HWRAPI(SetBlend) (FBITFIELD PolyFlags);
EXPORT void HWRAPI(ClearBuffer) (FBOOLEAN ColorMask, FBOOLEAN DepthMask, FRGBAFloat *ClearColor);
EXPORT void HWRAPI(SetTexture) (FTextureInfo *TexInfo);
@@ -89,6 +90,7 @@ struct hwdriver_s
FinishUpdate pfnFinishUpdate;
Draw2DLine pfnDraw2DLine;
DrawPolygon pfnDrawPolygon;
+ RenderSkyDome pfnRenderSkyDome;
SetBlend pfnSetBlend;
ClearBuffer pfnClearBuffer;
SetTexture pfnSetTexture;
diff --git a/src/hardware/hw_glide.h b/src/hardware/hw_glide.h
index 2625d58640bbc26d62ea18ca156b8019aee2c9bf..bf91229efa1ccde01f73436079cc009a12aa62ac 100644
--- a/src/hardware/hw_glide.h
+++ b/src/hardware/hw_glide.h
@@ -59,9 +59,11 @@ typedef FxI32 GrTextureFormat_t;
typedef struct
{
+#ifdef GLIDE_API_COMPATIBILITY
GrLOD_t smallLodLog2;
GrLOD_t largeLodLog2;
GrAspectRatio_t aspectRatioLog2;
+#endif
GrTextureFormat_t format;
void *data;
} GrTexInfo;
diff --git a/src/hardware/hw_glob.h b/src/hardware/hw_glob.h
index 9656e54e9b1d44df9bc921cbb544a03e8101a26d..c7b06edfd1f1455e5d399a0a51e58771fce88786 100644
--- a/src/hardware/hw_glob.h
+++ b/src/hardware/hw_glob.h
@@ -101,6 +101,7 @@ void HWR_FreeTextureCache(void);
void HWR_FreeExtraSubsectors(void);
void HWR_GetFlat(lumpnum_t flatlumpnum);
+void HWR_GetTextureFlat(INT32 texturenum);
GLTexture_t *HWR_GetTexture(INT32 tex);
void HWR_GetPatch(GLPatch_t *gpatch);
void HWR_GetMappedPatch(GLPatch_t *gpatch, const UINT8 *colormap);
@@ -114,6 +115,8 @@ void HWR_GetFadeMask(lumpnum_t fademasklumpnum);
// --------
// hw_draw.c
// --------
+extern lumpnum_t gr_patchflat;
+
extern float gr_patch_scalex;
extern float gr_patch_scaley;
diff --git a/src/hardware/hw_light.c b/src/hardware/hw_light.c
index a52d72869ee87e9c40fa6f6348d2d489da67f73c..1de20cad7a343a9311458aadbbaa5235e3f92a50 100644
--- a/src/hardware/hw_light.c
+++ b/src/hardware/hw_light.c
@@ -186,17 +186,16 @@ light_t *t_lspr[NUMSPRITES] =
// Boss 1, (Greenflower)
&lspr[NOLIGHT], // SPR_EGGM
+ &lspr[NOLIGHT], // SPR_EGLZ
// Boss 2, (Techno Hill)
&lspr[NOLIGHT], // SPR_EGGN
- &lspr[NOLIGHT], // SPR_TNKA
- &lspr[NOLIGHT], // SPR_TNKB
- &lspr[NOLIGHT], // SPR_SPNK
+ &lspr[NOLIGHT], // SPR_TANK
&lspr[NOLIGHT], // SPR_GOOP
// Boss 3 (Deep Sea)
&lspr[NOLIGHT], // SPR_EGGO
- &lspr[NOLIGHT], // SPR_PRPL
+ &lspr[NOLIGHT], // SPR_SEBH
&lspr[NOLIGHT], // SPR_FAKE
// Boss 4 (Castle Eggman)
@@ -1226,9 +1225,11 @@ static void HWR_SetLight(void)
lightmappatch.height = 128;
lightmappatch.mipmap.width = 128;
lightmappatch.mipmap.height = 128;
+#ifdef GLIDE_API_COMPATIBILITY
lightmappatch.mipmap.grInfo.smallLodLog2 = GR_LOD_LOG2_128;
lightmappatch.mipmap.grInfo.largeLodLog2 = GR_LOD_LOG2_128;
lightmappatch.mipmap.grInfo.aspectRatioLog2 = GR_ASPECT_LOG2_1x1;
+#endif
lightmappatch.mipmap.flags = 0; //TF_WRAPXY; // DEBUG: view the overdraw !
}
HWD.pfnSetTexture(&lightmappatch.mipmap);
diff --git a/src/hardware/hw_main.c b/src/hardware/hw_main.c
index c600800fd9ac9e0710a0eecdf44d7e7bf8a68753..6d3e6c8ceef6e7e73d1a24c59a394c0ec822f70d 100644
--- a/src/hardware/hw_main.c
+++ b/src/hardware/hw_main.c
@@ -70,9 +70,9 @@ static void HWR_ProjectPrecipitationSprite(precipmobj_t *thing);
#endif
#ifdef SORTING
-void HWR_AddTransparentFloor(lumpnum_t lumpnum, extrasubsector_t *xsub, boolean isceiling, fixed_t fixedheight,
+void HWR_AddTransparentFloor(lumpnum_t lumpnum, INT32 texturenum, extrasubsector_t *xsub, boolean isceiling, fixed_t fixedheight,
INT32 lightlevel, INT32 alpha, sector_t *FOFSector, FBITFIELD blend, boolean fogplane, extracolormap_t *planecolormap);
-void HWR_AddTransparentPolyobjectFloor(lumpnum_t lumpnum, polyobj_t *polysector, boolean isceiling, fixed_t fixedheight,
+void HWR_AddTransparentPolyobjectFloor(lumpnum_t lumpnum, INT32 texturenum, polyobj_t *polysector, boolean isceiling, fixed_t fixedheight,
INT32 lightlevel, INT32 alpha, sector_t *FOFSector, FBITFIELD blend, extracolormap_t *planecolormap);
#else
static void HWR_Add3DWater(lumpnum_t lumpnum, extrasubsector_t *xsub, fixed_t fixedheight,
@@ -522,7 +522,7 @@ static UINT8 HWR_FogBlockAlpha(INT32 light, UINT32 color) // Let's see if this c
// HWR_RenderPlane : Render a floor or ceiling convex polygon
// -----------------+
static void HWR_RenderPlane(sector_t *sector, extrasubsector_t *xsub, boolean isceiling, fixed_t fixedheight,
- FBITFIELD PolyFlags, INT32 lightlevel, lumpnum_t lumpnum, sector_t *FOFsector, UINT8 alpha, boolean fogplane, extracolormap_t *planecolormap)
+ FBITFIELD PolyFlags, INT32 lightlevel, lumpnum_t lumpnum, INT32 texturenum, sector_t *FOFsector, UINT8 alpha, boolean fogplane, extracolormap_t *planecolormap)
{
polyvertex_t * pv;
float height; //constant y for all points on the convex flat polygon
@@ -530,8 +530,9 @@ static void HWR_RenderPlane(sector_t *sector, extrasubsector_t *xsub, boolean is
INT32 nrPlaneVerts; //verts original define of convex flat polygon
INT32 i;
float flatxref,flatyref;
- float fflatsize;
+ float fflatwidth, fflatheight;
INT32 flatflag;
+ boolean texflat = true;
size_t len;
float scrollx = 0.0f, scrolly = 0.0f;
angle_t angle = 0;
@@ -540,6 +541,7 @@ static void HWR_RenderPlane(sector_t *sector, extrasubsector_t *xsub, boolean is
#ifdef ESLOPE
pslope_t *slope = NULL;
#endif
+ patch_t *patch;
static FOutVector *planeVerts = NULL;
static UINT16 numAllocedPlaneVerts = 0;
@@ -580,9 +582,10 @@ static void HWR_RenderPlane(sector_t *sector, extrasubsector_t *xsub, boolean is
if (nrPlaneVerts < 3) //not even a triangle ?
return;
- if (nrPlaneVerts > (INT32)UINT16_MAX) // FIXME: exceeds plVerts size
+ // This check is so inconsistent between functions, it hurts.
+ if (nrPlaneVerts > INT16_MAX) // FIXME: exceeds plVerts size
{
- CONS_Debug(DBG_RENDER, "polygon size of %d exceeds max value of %d vertices\n", nrPlaneVerts, UINT16_MAX);
+ CONS_Debug(DBG_RENDER, "polygon size of %d exceeds max value of %d vertices\n", nrPlaneVerts, INT16_MAX);
return;
}
@@ -599,38 +602,47 @@ static void HWR_RenderPlane(sector_t *sector, extrasubsector_t *xsub, boolean is
switch (len)
{
case 4194304: // 2048x2048 lump
- fflatsize = 2048.0f;
- flatflag = 2047;
+ fflatwidth = fflatheight = 2048.0f;
break;
case 1048576: // 1024x1024 lump
- fflatsize = 1024.0f;
- flatflag = 1023;
+ fflatwidth = fflatheight = 1024.0f;
break;
case 262144:// 512x512 lump
- fflatsize = 512.0f;
- flatflag = 511;
+ fflatwidth = fflatheight = 512.0f;
break;
case 65536: // 256x256 lump
- fflatsize = 256.0f;
- flatflag = 255;
+ fflatwidth = fflatheight = 256.0f;
break;
case 16384: // 128x128 lump
- fflatsize = 128.0f;
- flatflag = 127;
+ fflatwidth = fflatheight = 128.0f;
break;
case 1024: // 32x32 lump
- fflatsize = 32.0f;
- flatflag = 31;
+ fflatwidth = fflatheight = 32.0f;
break;
default: // 64x64 lump
- fflatsize = 64.0f;
- flatflag = 63;
+ fflatwidth = fflatheight = 64.0f;
break;
}
+ flatflag = ((INT32)fflatwidth)-1;
+
+ if (texturenum != 0 && texturenum != -1)
+ {
+ fflatwidth = textures[texturenum]->width;
+ fflatheight = textures[texturenum]->height;
+ }
+ else if (gr_patchflat && R_CheckIfPatch(gr_patchflat)) // Just in case?
+ {
+ patch = (patch_t *)W_CacheLumpNum(gr_patchflat, PU_STATIC);
+ fflatwidth = SHORT(patch->width);
+ fflatheight = SHORT(patch->height);
+ }
+ else
+ texflat = false;
+
// reference point for flat texture coord for each vertex around the polygon
- flatxref = (float)(((fixed_t)pv->x & (~flatflag)) / fflatsize);
- flatyref = (float)(((fixed_t)pv->y & (~flatflag)) / fflatsize);
+ flatxref = (float)(((fixed_t)pv->x & (~flatflag)) / fflatwidth);
+ flatyref = (float)(((fixed_t)pv->y & (~flatflag)) / fflatheight);
// transform
v3d = planeVerts;
@@ -639,14 +651,14 @@ static void HWR_RenderPlane(sector_t *sector, extrasubsector_t *xsub, boolean is
{
if (!isceiling) // it's a floor
{
- scrollx = FIXED_TO_FLOAT(FOFsector->floor_xoffs)/fflatsize;
- scrolly = FIXED_TO_FLOAT(FOFsector->floor_yoffs)/fflatsize;
+ scrollx = FIXED_TO_FLOAT(FOFsector->floor_xoffs)/fflatwidth;
+ scrolly = FIXED_TO_FLOAT(FOFsector->floor_yoffs)/fflatheight;
angle = FOFsector->floorpic_angle;
}
else // it's a ceiling
{
- scrollx = FIXED_TO_FLOAT(FOFsector->ceiling_xoffs)/fflatsize;
- scrolly = FIXED_TO_FLOAT(FOFsector->ceiling_yoffs)/fflatsize;
+ scrollx = FIXED_TO_FLOAT(FOFsector->ceiling_xoffs)/fflatwidth;
+ scrolly = FIXED_TO_FLOAT(FOFsector->ceiling_yoffs)/fflatheight;
angle = FOFsector->ceilingpic_angle;
}
}
@@ -654,14 +666,14 @@ static void HWR_RenderPlane(sector_t *sector, extrasubsector_t *xsub, boolean is
{
if (!isceiling) // it's a floor
{
- scrollx = FIXED_TO_FLOAT(gr_frontsector->floor_xoffs)/fflatsize;
- scrolly = FIXED_TO_FLOAT(gr_frontsector->floor_yoffs)/fflatsize;
+ scrollx = FIXED_TO_FLOAT(gr_frontsector->floor_xoffs)/fflatwidth;
+ scrolly = FIXED_TO_FLOAT(gr_frontsector->floor_yoffs)/fflatheight;
angle = gr_frontsector->floorpic_angle;
}
else // it's a ceiling
{
- scrollx = FIXED_TO_FLOAT(gr_frontsector->ceiling_xoffs)/fflatsize;
- scrolly = FIXED_TO_FLOAT(gr_frontsector->ceiling_yoffs)/fflatsize;
+ scrollx = FIXED_TO_FLOAT(gr_frontsector->ceiling_xoffs)/fflatwidth;
+ scrolly = FIXED_TO_FLOAT(gr_frontsector->ceiling_yoffs)/fflatheight;
angle = gr_frontsector->ceilingpic_angle;
}
}
@@ -680,17 +692,24 @@ static void HWR_RenderPlane(sector_t *sector, extrasubsector_t *xsub, boolean is
for (i = 0; i < nrPlaneVerts; i++,v3d++,pv++)
{
// Hurdler: add scrolling texture on floor/ceiling
- v3d->sow = (float)((pv->x / fflatsize) - flatxref + scrollx);
- v3d->tow = (float)(-(pv->y / fflatsize) + flatyref + scrolly);
-
- //v3d->sow = (float)(pv->x / fflatsize);
- //v3d->tow = (float)(pv->y / fflatsize);
+ if (texflat)
+ {
+ v3d->sow = (float)(pv->x / fflatwidth) + scrollx;
+ v3d->tow = -(float)(pv->y / fflatheight) + scrolly;
+ }
+ else
+ {
+ v3d->sow = (float)((pv->x / fflatwidth) - flatxref + scrollx);
+ v3d->tow = (float)(flatyref - (pv->y / fflatheight) + scrolly);
+ }
// Need to rotate before translate
if (angle) // Only needs to be done if there's an altered angle
{
tempxsow = FLOAT_TO_FIXED(v3d->sow);
tempytow = FLOAT_TO_FIXED(v3d->tow);
+ if (texflat)
+ tempytow = -tempytow;
v3d->sow = (FIXED_TO_FLOAT(FixedMul(tempxsow, FINECOSINE(angle)) - FixedMul(tempytow, FINESINE(angle))));
v3d->tow = (FIXED_TO_FLOAT(FixedMul(tempxsow, FINESINE(angle)) + FixedMul(tempytow, FINECOSINE(angle))));
}
@@ -3164,21 +3183,23 @@ static inline void HWR_AddPolyObjectSegs(void)
#ifdef POLYOBJECTS_PLANES
static void HWR_RenderPolyObjectPlane(polyobj_t *polysector, boolean isceiling, fixed_t fixedheight,
- FBITFIELD blendmode, UINT8 lightlevel, lumpnum_t lumpnum, sector_t *FOFsector,
+ FBITFIELD blendmode, UINT8 lightlevel, lumpnum_t lumpnum, INT32 texturenum, sector_t *FOFsector,
UINT8 alpha, extracolormap_t *planecolormap)
{
float height; //constant y for all points on the convex flat polygon
FOutVector *v3d;
INT32 i;
float flatxref,flatyref;
- float fflatsize;
+ float fflatwidth, fflatheight;
INT32 flatflag;
+ boolean texflat = true;
size_t len;
float scrollx = 0.0f, scrolly = 0.0f;
angle_t angle = 0;
FSurfaceInfo Surf;
fixed_t tempxsow, tempytow;
size_t nrPlaneVerts;
+ patch_t *patch;
static FOutVector *planeVerts = NULL;
static UINT16 numAllocedPlaneVerts = 0;
@@ -3209,38 +3230,47 @@ static void HWR_RenderPolyObjectPlane(polyobj_t *polysector, boolean isceiling,
switch (len)
{
case 4194304: // 2048x2048 lump
- fflatsize = 2048.0f;
- flatflag = 2047;
+ fflatwidth = fflatheight = 2048.0f;
break;
case 1048576: // 1024x1024 lump
- fflatsize = 1024.0f;
- flatflag = 1023;
+ fflatwidth = fflatheight = 1024.0f;
break;
case 262144:// 512x512 lump
- fflatsize = 512.0f;
- flatflag = 511;
+ fflatwidth = fflatheight = 512.0f;
break;
case 65536: // 256x256 lump
- fflatsize = 256.0f;
- flatflag = 255;
+ fflatwidth = fflatheight = 256.0f;
break;
case 16384: // 128x128 lump
- fflatsize = 128.0f;
- flatflag = 127;
+ fflatwidth = fflatheight = 128.0f;
break;
case 1024: // 32x32 lump
- fflatsize = 32.0f;
- flatflag = 31;
+ fflatwidth = fflatheight = 32.0f;
break;
default: // 64x64 lump
- fflatsize = 64.0f;
- flatflag = 63;
+ fflatwidth = fflatheight = 64.0f;
break;
}
+ flatflag = ((INT32)fflatwidth)-1;
+
+ if (texturenum != 0 && texturenum != -1)
+ {
+ fflatwidth = textures[texturenum]->width;
+ fflatheight = textures[texturenum]->height;
+ }
+ else if (gr_patchflat && R_CheckIfPatch(gr_patchflat)) // Just in case?
+ {
+ patch = (patch_t *)W_CacheLumpNum(gr_patchflat, PU_STATIC);
+ fflatwidth = SHORT(patch->width);
+ fflatheight = SHORT(patch->height);
+ }
+ else
+ texflat = false;
+
// reference point for flat texture coord for each vertex around the polygon
- flatxref = (float)(((fixed_t)FIXED_TO_FLOAT(polysector->origVerts[0].x) & (~flatflag)) / fflatsize);
- flatyref = (float)(((fixed_t)FIXED_TO_FLOAT(polysector->origVerts[0].y) & (~flatflag)) / fflatsize);
+ flatxref = (float)((polysector->origVerts[0].x & (~flatflag)) / fflatwidth);
+ flatyref = (float)((polysector->origVerts[0].y & (~flatflag)) / fflatheight);
// transform
v3d = planeVerts;
@@ -3249,14 +3279,14 @@ static void HWR_RenderPolyObjectPlane(polyobj_t *polysector, boolean isceiling,
{
if (!isceiling) // it's a floor
{
- scrollx = FIXED_TO_FLOAT(FOFsector->floor_xoffs)/fflatsize;
- scrolly = FIXED_TO_FLOAT(FOFsector->floor_yoffs)/fflatsize;
+ scrollx = FIXED_TO_FLOAT(FOFsector->floor_xoffs)/fflatwidth;
+ scrolly = FIXED_TO_FLOAT(FOFsector->floor_yoffs)/fflatheight;
angle = FOFsector->floorpic_angle>>ANGLETOFINESHIFT;
}
else // it's a ceiling
{
- scrollx = FIXED_TO_FLOAT(FOFsector->ceiling_xoffs)/fflatsize;
- scrolly = FIXED_TO_FLOAT(FOFsector->ceiling_yoffs)/fflatsize;
+ scrollx = FIXED_TO_FLOAT(FOFsector->ceiling_xoffs)/fflatwidth;
+ scrolly = FIXED_TO_FLOAT(FOFsector->ceiling_yoffs)/fflatheight;
angle = FOFsector->ceilingpic_angle>>ANGLETOFINESHIFT;
}
}
@@ -3264,14 +3294,14 @@ static void HWR_RenderPolyObjectPlane(polyobj_t *polysector, boolean isceiling,
{
if (!isceiling) // it's a floor
{
- scrollx = FIXED_TO_FLOAT(gr_frontsector->floor_xoffs)/fflatsize;
- scrolly = FIXED_TO_FLOAT(gr_frontsector->floor_yoffs)/fflatsize;
+ scrollx = FIXED_TO_FLOAT(gr_frontsector->floor_xoffs)/fflatwidth;
+ scrolly = FIXED_TO_FLOAT(gr_frontsector->floor_yoffs)/fflatheight;
angle = gr_frontsector->floorpic_angle>>ANGLETOFINESHIFT;
}
else // it's a ceiling
{
- scrollx = FIXED_TO_FLOAT(gr_frontsector->ceiling_xoffs)/fflatsize;
- scrolly = FIXED_TO_FLOAT(gr_frontsector->ceiling_yoffs)/fflatsize;
+ scrollx = FIXED_TO_FLOAT(gr_frontsector->ceiling_xoffs)/fflatwidth;
+ scrolly = FIXED_TO_FLOAT(gr_frontsector->ceiling_yoffs)/fflatheight;
angle = gr_frontsector->ceilingpic_angle>>ANGLETOFINESHIFT;
}
}
@@ -3294,15 +3324,26 @@ static void HWR_RenderPolyObjectPlane(polyobj_t *polysector, boolean isceiling,
for (i = 0; i < (INT32)nrPlaneVerts; i++,v3d++)
{
- // Hurdler: add scrolling texture on floor/ceiling
- v3d->sow = (float)((FIXED_TO_FLOAT(polysector->origVerts[i].x) / fflatsize) - flatxref + scrollx); // Go from the polysector's original vertex locations
- v3d->tow = (float)(flatyref - (FIXED_TO_FLOAT(polysector->origVerts[i].y) / fflatsize) + scrolly); // Means the flat is offset based on the original vertex locations
+ // Go from the polysector's original vertex locations
+ // Means the flat is offset based on the original vertex locations
+ if (texflat)
+ {
+ v3d->sow = (float)(FIXED_TO_FLOAT(polysector->origVerts[i].x) / fflatwidth) + scrollx;
+ v3d->tow = -(float)(FIXED_TO_FLOAT(polysector->origVerts[i].y) / fflatheight) + scrolly;
+ }
+ else
+ {
+ v3d->sow = (float)((FIXED_TO_FLOAT(polysector->origVerts[i].x) / fflatwidth) - flatxref + scrollx);
+ v3d->tow = (float)(flatyref - (FIXED_TO_FLOAT(polysector->origVerts[i].y) / fflatheight) + scrolly);
+ }
// Need to rotate before translate
if (angle) // Only needs to be done if there's an altered angle
{
tempxsow = FLOAT_TO_FIXED(v3d->sow);
tempytow = FLOAT_TO_FIXED(v3d->tow);
+ if (texflat)
+ tempytow = -tempytow;
v3d->sow = (FIXED_TO_FLOAT(FixedMul(tempxsow, FINECOSINE(angle)) - FixedMul(tempytow, FINESINE(angle))));
v3d->tow = (FIXED_TO_FLOAT(-FixedMul(tempxsow, FINESINE(angle)) - FixedMul(tempytow, FINECOSINE(angle))));
}
@@ -3333,6 +3374,7 @@ static void HWR_AddPolyObjectPlanes(void)
{
size_t i;
sector_t *polyobjsector;
+ INT32 light = 0;
// Polyobject Planes need their own function for drawing because they don't have extrasubsectors by themselves
// It should be okay because polyobjects should always be convex anyway
@@ -3351,19 +3393,23 @@ static void HWR_AddPolyObjectPlanes(void)
&& polyobjsector->floorheight >= gr_frontsector->floorheight
&& (viewz < polyobjsector->floorheight))
{
+ light = R_GetPlaneLight(gr_frontsector, polyobjsector->floorheight, true);
if (po_ptrs[i]->translucency > 0)
{
FSurfaceInfo Surf;
- FBITFIELD blendmode = HWR_TranstableToAlpha(po_ptrs[i]->translucency, &Surf);
- HWR_AddTransparentPolyobjectFloor(levelflats[polyobjsector->floorpic].lumpnum, po_ptrs[i], false, polyobjsector->floorheight,
- polyobjsector->lightlevel, Surf.FlatColor.s.alpha, polyobjsector, blendmode, NULL);
+ FBITFIELD blendmode;
+ memset(&Surf, 0x00, sizeof(Surf));
+ blendmode = HWR_TranstableToAlpha(po_ptrs[i]->translucency, &Surf);
+ HWR_AddTransparentPolyobjectFloor(levelflats[polyobjsector->floorpic].lumpnum, levelflats[polyobjsector->floorpic].texturenum, po_ptrs[i], false, polyobjsector->floorheight,
+ (light == -1 ? gr_frontsector->lightlevel : *gr_frontsector->lightlist[light].lightlevel), Surf.FlatColor.s.alpha, polyobjsector, blendmode, (light == -1 ? gr_frontsector->extra_colormap : *gr_frontsector->lightlist[light].extra_colormap));
}
else
{
HWR_GetFlat(levelflats[polyobjsector->floorpic].lumpnum);
+ HWR_GetTextureFlat(levelflats[polyobjsector->floorpic].texturenum);
HWR_RenderPolyObjectPlane(po_ptrs[i], false, polyobjsector->floorheight, PF_Occlude,
- polyobjsector->lightlevel, levelflats[polyobjsector->floorpic].lumpnum,
- polyobjsector, 255, NULL);
+ (light == -1 ? gr_frontsector->lightlevel : *gr_frontsector->lightlist[light].lightlevel), levelflats[polyobjsector->floorpic].lumpnum, levelflats[polyobjsector->floorpic].texturenum,
+ polyobjsector, 255, (light == -1 ? gr_frontsector->extra_colormap : *gr_frontsector->lightlist[light].extra_colormap));
}
}
@@ -3371,21 +3417,23 @@ static void HWR_AddPolyObjectPlanes(void)
&& polyobjsector->ceilingheight <= gr_frontsector->ceilingheight
&& (viewz > polyobjsector->ceilingheight))
{
+ light = R_GetPlaneLight(gr_frontsector, polyobjsector->ceilingheight, true);
if (po_ptrs[i]->translucency > 0)
{
FSurfaceInfo Surf;
FBITFIELD blendmode;
memset(&Surf, 0x00, sizeof(Surf));
blendmode = HWR_TranstableToAlpha(po_ptrs[i]->translucency, &Surf);
- HWR_AddTransparentPolyobjectFloor(levelflats[polyobjsector->ceilingpic].lumpnum, po_ptrs[i], true, polyobjsector->ceilingheight,
- polyobjsector->lightlevel, Surf.FlatColor.s.alpha, polyobjsector, blendmode, NULL);
+ HWR_AddTransparentPolyobjectFloor(levelflats[polyobjsector->ceilingpic].lumpnum, levelflats[polyobjsector->floorpic].texturenum, po_ptrs[i], true, polyobjsector->ceilingheight,
+ (light == -1 ? gr_frontsector->lightlevel : *gr_frontsector->lightlist[light].lightlevel), Surf.FlatColor.s.alpha, polyobjsector, blendmode, (light == -1 ? gr_frontsector->extra_colormap : *gr_frontsector->lightlist[light].extra_colormap));
}
else
{
HWR_GetFlat(levelflats[polyobjsector->ceilingpic].lumpnum);
+ HWR_GetTextureFlat(levelflats[polyobjsector->ceilingpic].texturenum);
HWR_RenderPolyObjectPlane(po_ptrs[i], true, polyobjsector->ceilingheight, PF_Occlude,
- polyobjsector->lightlevel, levelflats[polyobjsector->floorpic].lumpnum,
- polyobjsector, 255, NULL);
+ (light == -1 ? gr_frontsector->lightlevel : *gr_frontsector->lightlist[light].lightlevel), levelflats[polyobjsector->floorpic].lumpnum, levelflats[polyobjsector->floorpic].texturenum,
+ polyobjsector, 255, (light == -1 ? gr_frontsector->extra_colormap : *gr_frontsector->lightlist[light].extra_colormap));
}
}
}
@@ -3536,11 +3584,12 @@ static void HWR_Subsector(size_t num)
if (sub->validcount != validcount)
{
HWR_GetFlat(levelflats[gr_frontsector->floorpic].lumpnum);
+ HWR_GetTextureFlat(levelflats[gr_frontsector->floorpic].texturenum);
HWR_RenderPlane(gr_frontsector, &extrasubsectors[num], false,
// Hack to make things continue to work around slopes.
locFloorHeight == cullFloorHeight ? locFloorHeight : gr_frontsector->floorheight,
// We now return you to your regularly scheduled rendering.
- PF_Occlude, floorlightlevel, levelflats[gr_frontsector->floorpic].lumpnum, NULL, 255, false, floorcolormap);
+ PF_Occlude, floorlightlevel, levelflats[gr_frontsector->floorpic].lumpnum, levelflats[gr_frontsector->floorpic].texturenum, NULL, 255, false, floorcolormap);
}
}
else
@@ -3558,11 +3607,12 @@ static void HWR_Subsector(size_t num)
if (sub->validcount != validcount)
{
HWR_GetFlat(levelflats[gr_frontsector->ceilingpic].lumpnum);
+ HWR_GetTextureFlat(levelflats[gr_frontsector->ceilingpic].texturenum);
HWR_RenderPlane(NULL, &extrasubsectors[num], true,
// Hack to make things continue to work around slopes.
locCeilingHeight == cullCeilingHeight ? locCeilingHeight : gr_frontsector->ceilingheight,
// We now return you to your regularly scheduled rendering.
- PF_Occlude, ceilinglightlevel, levelflats[gr_frontsector->ceilingpic].lumpnum,NULL, 255, false, ceilingcolormap);
+ PF_Occlude, ceilinglightlevel, levelflats[gr_frontsector->ceilingpic].lumpnum, levelflats[gr_frontsector->ceilingpic].texturenum, NULL, 255, false, ceilingcolormap);
}
}
else
@@ -3621,7 +3671,7 @@ static void HWR_Subsector(size_t num)
else
alpha = HWR_FogBlockAlpha(*gr_frontsector->lightlist[light].lightlevel, NORMALFOG);
- HWR_AddTransparentFloor(0,
+ HWR_AddTransparentFloor(0, 0,
&extrasubsectors[num],
false,
*rover->bottomheight,
@@ -3640,6 +3690,7 @@ static void HWR_Subsector(size_t num)
rover->alpha-1, rover->master->frontsector);
#else
HWR_AddTransparentFloor(levelflats[*rover->bottompic].lumpnum,
+ levelflats[*rover->bottompic].texturenum,
&extrasubsectors[num],
false,
*rover->bottomheight,
@@ -3651,8 +3702,9 @@ static void HWR_Subsector(size_t num)
else
{
HWR_GetFlat(levelflats[*rover->bottompic].lumpnum);
+ HWR_GetTextureFlat(levelflats[*rover->bottompic].texturenum);
light = R_GetPlaneLight(gr_frontsector, centerHeight, dup_viewz < cullHeight ? true : false);
- HWR_RenderPlane(NULL, &extrasubsectors[num], false, *rover->bottomheight, PF_Occlude, *gr_frontsector->lightlist[light].lightlevel, levelflats[*rover->bottompic].lumpnum,
+ HWR_RenderPlane(NULL, &extrasubsectors[num], false, *rover->bottomheight, PF_Occlude, *gr_frontsector->lightlist[light].lightlevel, levelflats[*rover->bottompic].lumpnum, levelflats[*rover->bottompic].texturenum,
rover->master->frontsector, 255, false, *gr_frontsector->lightlist[light].extra_colormap);
}
}
@@ -3684,7 +3736,7 @@ static void HWR_Subsector(size_t num)
else
alpha = HWR_FogBlockAlpha(*gr_frontsector->lightlist[light].lightlevel, NORMALFOG);
- HWR_AddTransparentFloor(0,
+ HWR_AddTransparentFloor(0, 0,
&extrasubsectors[num],
true,
*rover->topheight,
@@ -3703,6 +3755,7 @@ static void HWR_Subsector(size_t num)
rover->alpha-1, rover->master->frontsector);
#else
HWR_AddTransparentFloor(levelflats[*rover->toppic].lumpnum,
+ levelflats[*rover->bottompic].texturenum,
&extrasubsectors[num],
true,
*rover->topheight,
@@ -3715,8 +3768,9 @@ static void HWR_Subsector(size_t num)
else
{
HWR_GetFlat(levelflats[*rover->toppic].lumpnum);
+ HWR_GetTextureFlat(levelflats[*rover->toppic].texturenum);
light = R_GetPlaneLight(gr_frontsector, centerHeight, dup_viewz < cullHeight ? true : false);
- HWR_RenderPlane(NULL, &extrasubsectors[num], true, *rover->topheight, PF_Occlude, *gr_frontsector->lightlist[light].lightlevel, levelflats[*rover->toppic].lumpnum,
+ HWR_RenderPlane(NULL, &extrasubsectors[num], true, *rover->topheight, PF_Occlude, *gr_frontsector->lightlist[light].lightlevel, levelflats[*rover->toppic].lumpnum, levelflats[*rover->toppic].texturenum,
rover->master->frontsector, 255, false, *gr_frontsector->lightlist[light].extra_colormap);
}
}
@@ -5045,6 +5099,7 @@ typedef struct
fixed_t fixedheight;
INT32 lightlevel;
lumpnum_t lumpnum;
+ INT32 texturenum;
INT32 alpha;
sector_t *FOFSector;
FBITFIELD blend;
@@ -5063,6 +5118,7 @@ typedef struct
fixed_t fixedheight;
INT32 lightlevel;
lumpnum_t lumpnum;
+ INT32 texturenum;
INT32 alpha;
sector_t *FOFSector;
FBITFIELD blend;
@@ -5093,7 +5149,7 @@ static INT32 drawcount = 0;
#define MAX_TRANSPARENTFLOOR 512
// This will likely turn into a copy of HWR_Add3DWater and replace it.
-void HWR_AddTransparentFloor(lumpnum_t lumpnum, extrasubsector_t *xsub, boolean isceiling,
+void HWR_AddTransparentFloor(lumpnum_t lumpnum, INT32 texturenum, extrasubsector_t *xsub, boolean isceiling,
fixed_t fixedheight, INT32 lightlevel, INT32 alpha, sector_t *FOFSector, FBITFIELD blend, boolean fogplane, extracolormap_t *planecolormap)
{
static size_t allocedplanes = 0;
@@ -5112,6 +5168,7 @@ void HWR_AddTransparentFloor(lumpnum_t lumpnum, extrasubsector_t *xsub, boolean
planeinfo[numplanes].fixedheight = fixedheight;
planeinfo[numplanes].lightlevel = lightlevel;
planeinfo[numplanes].lumpnum = lumpnum;
+ planeinfo[numplanes].texturenum = texturenum;
planeinfo[numplanes].xsub = xsub;
planeinfo[numplanes].alpha = alpha;
planeinfo[numplanes].FOFSector = FOFSector;
@@ -5125,7 +5182,7 @@ void HWR_AddTransparentFloor(lumpnum_t lumpnum, extrasubsector_t *xsub, boolean
// Adding this for now until I can create extrasubsector info for polyobjects
// When that happens it'll just be done through HWR_AddTransparentFloor and HWR_RenderPlane
-void HWR_AddTransparentPolyobjectFloor(lumpnum_t lumpnum, polyobj_t *polysector, boolean isceiling,
+void HWR_AddTransparentPolyobjectFloor(lumpnum_t lumpnum, INT32 texturenum, polyobj_t *polysector, boolean isceiling,
fixed_t fixedheight, INT32 lightlevel, INT32 alpha, sector_t *FOFSector, FBITFIELD blend, extracolormap_t *planecolormap)
{
static size_t allocedpolyplanes = 0;
@@ -5144,6 +5201,7 @@ void HWR_AddTransparentPolyobjectFloor(lumpnum_t lumpnum, polyobj_t *polysector,
polyplaneinfo[numpolyplanes].fixedheight = fixedheight;
polyplaneinfo[numpolyplanes].lightlevel = lightlevel;
polyplaneinfo[numpolyplanes].lumpnum = lumpnum;
+ polyplaneinfo[numpolyplanes].texturenum = texturenum;
polyplaneinfo[numpolyplanes].polysector = polysector;
polyplaneinfo[numpolyplanes].alpha = alpha;
polyplaneinfo[numpolyplanes].FOFSector = FOFSector;
@@ -5305,9 +5363,12 @@ static void HWR_CreateDrawNodes(void)
gr_frontsector = NULL;
if (!(sortnode[sortindex[i]].plane->blend & PF_NoTexture))
+ {
HWR_GetFlat(sortnode[sortindex[i]].plane->lumpnum);
+ HWR_GetTextureFlat(sortnode[sortindex[i]].plane->texturenum);
+ }
HWR_RenderPlane(NULL, sortnode[sortindex[i]].plane->xsub, sortnode[sortindex[i]].plane->isceiling, sortnode[sortindex[i]].plane->fixedheight, sortnode[sortindex[i]].plane->blend, sortnode[sortindex[i]].plane->lightlevel,
- sortnode[sortindex[i]].plane->lumpnum, sortnode[sortindex[i]].plane->FOFSector, sortnode[sortindex[i]].plane->alpha, sortnode[sortindex[i]].plane->fogplane, sortnode[sortindex[i]].plane->planecolormap);
+ sortnode[sortindex[i]].plane->lumpnum, sortnode[sortindex[i]].plane->texturenum, sortnode[sortindex[i]].plane->FOFSector, sortnode[sortindex[i]].plane->alpha, sortnode[sortindex[i]].plane->fogplane, sortnode[sortindex[i]].plane->planecolormap);
}
else if (sortnode[sortindex[i]].polyplane)
{
@@ -5315,9 +5376,12 @@ static void HWR_CreateDrawNodes(void)
gr_frontsector = NULL;
if (!(sortnode[sortindex[i]].polyplane->blend & PF_NoTexture))
+ {
HWR_GetFlat(sortnode[sortindex[i]].polyplane->lumpnum);
+ HWR_GetTextureFlat(sortnode[sortindex[i]].polyplane->texturenum);
+ }
HWR_RenderPolyObjectPlane(sortnode[sortindex[i]].polyplane->polysector, sortnode[sortindex[i]].polyplane->isceiling, sortnode[sortindex[i]].polyplane->fixedheight, sortnode[sortindex[i]].polyplane->blend, sortnode[sortindex[i]].polyplane->lightlevel,
- sortnode[sortindex[i]].polyplane->lumpnum, sortnode[sortindex[i]].polyplane->FOFSector, sortnode[sortindex[i]].polyplane->alpha, sortnode[sortindex[i]].polyplane->planecolormap);
+ sortnode[sortindex[i]].polyplane->lumpnum, sortnode[sortindex[i]].polyplane->texturenum, sortnode[sortindex[i]].polyplane->FOFSector, sortnode[sortindex[i]].polyplane->alpha, sortnode[sortindex[i]].polyplane->planecolormap);
}
else if (sortnode[sortindex[i]].wall)
{
@@ -5805,86 +5869,122 @@ static void HWR_ProjectPrecipitationSprite(precipmobj_t *thing)
// ==========================================================================
//
// ==========================================================================
-static void HWR_DrawSkyBackground(void)
+static void HWR_DrawSkyBackground(player_t *player)
{
- FOutVector v[4];
- angle_t angle;
- float dimensionmultiply;
- float aspectratio;
- float angleturn;
+ if (cv_grskydome.value)
+ {
+ FTransform transform;
+ const float fpov = FIXED_TO_FLOAT(cv_grfov.value+player->fovadd);
+ postimg_t *type;
- HWR_GetTexture(texturetranslation[skytexture]);
- aspectratio = (float)vid.width/(float)vid.height;
+ if (splitscreen && player == &players[secondarydisplayplayer])
+ type = &postimgtype2;
+ else
+ type = &postimgtype;
- //Hurdler: the sky is the only texture who need 4.0f instead of 1.0
- // because it's called just after clearing the screen
- // and thus, the near clipping plane is set to 3.99
- // Sryder: Just use the near clipping plane value then
+ memset(&transform, 0x00, sizeof(FTransform));
- // 3--2
- // | /|
- // |/ |
- // 0--1
- v[0].x = v[3].x = -ZCLIP_PLANE-1;
- v[1].x = v[2].x = ZCLIP_PLANE+1;
- v[0].y = v[1].y = -ZCLIP_PLANE-1;
- v[2].y = v[3].y = ZCLIP_PLANE+1;
+ //04/01/2000: Hurdler: added for T&L
+ // It should replace all other gr_viewxxx when finished
+ transform.anglex = (float)(aimingangle>>ANGLETOFINESHIFT)*(360.0f/(float)FINEANGLES);
+ transform.angley = (float)((viewangle-ANGLE_270)>>ANGLETOFINESHIFT)*(360.0f/(float)FINEANGLES);
- v[0].z = v[1].z = v[2].z = v[3].z = ZCLIP_PLANE+1;
+ if (*type == postimg_flip)
+ transform.flip = true;
+ else
+ transform.flip = false;
- // X
+ transform.scalex = 1;
+ transform.scaley = (float)vid.width/vid.height;
+ transform.scalez = 1;
+ transform.fovxangle = fpov; // Tails
+ transform.fovyangle = fpov; // Tails
+ transform.splitscreen = splitscreen;
- // NOTE: This doesn't work right with texture widths greater than 1024
- // software doesn't draw any further than 1024 for skies anyway, but this doesn't overlap properly
- // The only time this will probably be an issue is when a sky wider than 1024 is used as a sky AND a regular wall texture
+ HWR_GetTexture(texturetranslation[skytexture]);
+ HWD.pfnRenderSkyDome(skytexture, textures[skytexture]->width, textures[skytexture]->height, transform);
+ }
+ else
+ {
+ FOutVector v[4];
+ angle_t angle;
+ float dimensionmultiply;
+ float aspectratio;
+ float angleturn;
- angle = (dup_viewangle + gr_xtoviewangle[0]);
+ HWR_GetTexture(texturetranslation[skytexture]);
+ aspectratio = (float)vid.width/(float)vid.height;
- dimensionmultiply = ((float)textures[texturetranslation[skytexture]]->width/256.0f);
+ //Hurdler: the sky is the only texture who need 4.0f instead of 1.0
+ // because it's called just after clearing the screen
+ // and thus, the near clipping plane is set to 3.99
+ // Sryder: Just use the near clipping plane value then
- v[0].sow = v[3].sow = (-1.0f * angle) / ((ANGLE_90-1)*dimensionmultiply); // left
- v[2].sow = v[1].sow = v[0].sow + (1.0f/dimensionmultiply); // right (or left + 1.0f)
- // use +angle and -1.0f above instead if you wanted old backwards behavior
+ // 3--2
+ // | /|
+ // |/ |
+ // 0--1
+ v[0].x = v[3].x = -ZCLIP_PLANE-1;
+ v[1].x = v[2].x = ZCLIP_PLANE+1;
+ v[0].y = v[1].y = -ZCLIP_PLANE-1;
+ v[2].y = v[3].y = ZCLIP_PLANE+1;
- // Y
- angle = aimingangle;
- dimensionmultiply = ((float)textures[texturetranslation[skytexture]]->height/(128.0f*aspectratio));
+ v[0].z = v[1].z = v[2].z = v[3].z = ZCLIP_PLANE+1;
- if (splitscreen)
- {
- dimensionmultiply *= 2;
- angle *= 2;
- }
+ // X
- // Middle of the sky should always be at angle 0
- // need to keep correct aspect ratio with X
- if (atransform.flip)
- {
- // During vertical flip the sky should be flipped and it's y movement should also be flipped obviously
- v[3].tow = v[2].tow = -(0.5f-(0.5f/dimensionmultiply)); // top
- v[0].tow = v[1].tow = v[3].tow - (1.0f/dimensionmultiply); // bottom (or top - 1.0f)
- }
- else
- {
- v[0].tow = v[1].tow = -(0.5f-(0.5f/dimensionmultiply)); // bottom
- v[3].tow = v[2].tow = v[0].tow - (1.0f/dimensionmultiply); // top (or bottom - 1.0f)
- }
+ // NOTE: This doesn't work right with texture widths greater than 1024
+ // software doesn't draw any further than 1024 for skies anyway, but this doesn't overlap properly
+ // The only time this will probably be an issue is when a sky wider than 1024 is used as a sky AND a regular wall texture
- angleturn = (((float)ANGLE_45-1.0f)*aspectratio)*dimensionmultiply;
+ angle = (dup_viewangle + gr_xtoviewangle[0]);
- if (angle > ANGLE_180) // Do this because we don't want the sky to suddenly teleport when crossing over 0 to 360 and vice versa
- {
- angle = InvAngle(angle);
- v[3].tow = v[2].tow += ((float) angle / angleturn);
- v[0].tow = v[1].tow += ((float) angle / angleturn);
- }
- else
- {
- v[3].tow = v[2].tow -= ((float) angle / angleturn);
- v[0].tow = v[1].tow -= ((float) angle / angleturn);
- }
+ dimensionmultiply = ((float)textures[texturetranslation[skytexture]]->width/256.0f);
- HWD.pfnDrawPolygon(NULL, v, 4, 0);
+ v[0].sow = v[3].sow = (-1.0f * angle) / ((ANGLE_90-1)*dimensionmultiply); // left
+ v[2].sow = v[1].sow = v[0].sow + (1.0f/dimensionmultiply); // right (or left + 1.0f)
+ // use +angle and -1.0f above instead if you wanted old backwards behavior
+
+ // Y
+ angle = aimingangle;
+ dimensionmultiply = ((float)textures[texturetranslation[skytexture]]->height/(128.0f*aspectratio));
+
+ if (splitscreen)
+ {
+ dimensionmultiply *= 2;
+ angle *= 2;
+ }
+
+ // Middle of the sky should always be at angle 0
+ // need to keep correct aspect ratio with X
+ if (atransform.flip)
+ {
+ // During vertical flip the sky should be flipped and it's y movement should also be flipped obviously
+ v[3].tow = v[2].tow = -(0.5f-(0.5f/dimensionmultiply)); // top
+ v[0].tow = v[1].tow = v[3].tow - (1.0f/dimensionmultiply); // bottom (or top - 1.0f)
+ }
+ else
+ {
+ v[0].tow = v[1].tow = -(0.5f-(0.5f/dimensionmultiply)); // bottom
+ v[3].tow = v[2].tow = v[0].tow - (1.0f/dimensionmultiply); // top (or bottom - 1.0f)
+ }
+
+ angleturn = (((float)ANGLE_45-1.0f)*aspectratio)*dimensionmultiply;
+
+ if (angle > ANGLE_180) // Do this because we don't want the sky to suddenly teleport when crossing over 0 to 360 and vice versa
+ {
+ angle = InvAngle(angle);
+ v[3].tow = v[2].tow += ((float) angle / angleturn);
+ v[0].tow = v[1].tow += ((float) angle / angleturn);
+ }
+ else
+ {
+ v[3].tow = v[2].tow -= ((float) angle / angleturn);
+ v[0].tow = v[1].tow -= ((float) angle / angleturn);
+ }
+
+ HWD.pfnDrawPolygon(NULL, v, 4, 0);
+ }
}
@@ -6036,7 +6136,7 @@ if (0)
}
if (drawsky)
- HWR_DrawSkyBackground();
+ HWR_DrawSkyBackground(player);
//Hurdler: it doesn't work in splitscreen mode
drawsky = splitscreen;
@@ -6253,7 +6353,7 @@ if (0)
}
if (!skybox && drawsky) // Don't draw the regular sky if there's a skybox
- HWR_DrawSkyBackground();
+ HWR_DrawSkyBackground(player);
//Hurdler: it doesn't work in splitscreen mode
drawsky = splitscreen;
diff --git a/src/hardware/hw_main.h b/src/hardware/hw_main.h
index f8524990f9d6f3096150ae76e505400c5708cb8e..31e97cc130fb9ce740194a704a8525905bdc0369 100644
--- a/src/hardware/hw_main.h
+++ b/src/hardware/hw_main.h
@@ -98,6 +98,7 @@ extern consvar_t cv_voodoocompatibility;
extern consvar_t cv_grfovchange;
extern consvar_t cv_grsolvetjoin;
extern consvar_t cv_grspritebillboarding;
+extern consvar_t cv_grskydome;
extern float gr_viewwidth, gr_viewheight, gr_baseviewwindowy;
diff --git a/src/hardware/hw_md2.c b/src/hardware/hw_md2.c
index d4728315ad88f97e5f1f16ac16ed037a8f7376ce..7b6367cf33fba40174d08ab75fd3925dae33f2a0 100644
--- a/src/hardware/hw_md2.c
+++ b/src/hardware/hw_md2.c
@@ -747,10 +747,12 @@ static void md2_loadTexture(md2_t *model)
grpatch->mipmap.width = (UINT16)w;
grpatch->mipmap.height = (UINT16)h;
+#ifdef GLIDE_API_COMPATIBILITY
// not correct!
grpatch->mipmap.grInfo.smallLodLog2 = GR_LOD_LOG2_256;
grpatch->mipmap.grInfo.largeLodLog2 = GR_LOD_LOG2_256;
grpatch->mipmap.grInfo.aspectRatioLog2 = GR_ASPECT_LOG2_1x1;
+#endif
}
HWD.pfnSetTexture(&grpatch->mipmap);
HWR_UnlockCachedPatch(grpatch);
@@ -798,10 +800,12 @@ static void md2_loadBlendTexture(md2_t *model)
grpatch->mipmap.width = (UINT16)w;
grpatch->mipmap.height = (UINT16)h;
+#ifdef GLIDE_API_COMPATIBILITY
// not correct!
grpatch->mipmap.grInfo.smallLodLog2 = GR_LOD_LOG2_256;
grpatch->mipmap.grInfo.largeLodLog2 = GR_LOD_LOG2_256;
grpatch->mipmap.grInfo.aspectRatioLog2 = GR_ASPECT_LOG2_1x1;
+#endif
}
HWD.pfnSetTexture(&grpatch->mipmap); // We do need to do this so that it can be cleared and knows to recreate it when necessary
HWR_UnlockCachedPatch(grpatch);
diff --git a/src/hardware/r_opengl/r_opengl.c b/src/hardware/r_opengl/r_opengl.c
index dfee19857cca3881adbd9dc123fd56b48aef7416..2fe6741e20af4afe9b2d2e1400daeb1ced64464b 100644
--- a/src/hardware/r_opengl/r_opengl.c
+++ b/src/hardware/r_opengl/r_opengl.c
@@ -1427,6 +1427,232 @@ EXPORT void HWRAPI(DrawPolygon) (FSurfaceInfo *pSurf,
Clamp2D(GL_TEXTURE_WRAP_T);
}
+// PRBoom sky dome
+typedef struct vbo_vertex_s
+{
+ float x, y, z;
+ float u, v;
+ unsigned char r, g, b, a;
+} vbo_vertex_t;
+
+typedef struct
+{
+ int mode;
+ int vertexcount;
+ int vertexindex;
+ int use_texture;
+} GLSkyLoopDef;
+
+typedef struct
+{
+ int id;
+ int rows, columns;
+ int loopcount;
+ GLSkyLoopDef *loops;
+ vbo_vertex_t *data;
+} GLSkyVBO;
+
+// The texture offset to be applied to the texture coordinates in SkyVertex().
+static int rows, columns;
+static boolean yflip;
+static int texw, texh;
+static float yMult, yAdd;
+static boolean foglayer;
+static float delta = 0.0f;
+static int gl_sky_detail = 16;
+static INT32 lasttex = -1;
+
+static RGBA_t SkyColor;
+
+#define MAP_COEFF 128.0f
+#define MAP_SCALE (MAP_COEFF*(float)FRACUNIT)
+
+static void SkyVertex(vbo_vertex_t *vbo, int r, int c)
+{
+ static fixed_t scale = 10000 << FRACBITS;
+ static angle_t maxSideAngle = ANGLE_180 / 3;
+
+ angle_t topAngle = (angle_t)(c / (float)columns * ANGLE_MAX);
+ angle_t sideAngle = maxSideAngle * (rows - r) / rows;
+ fixed_t height = FINESINE(sideAngle>>ANGLETOFINESHIFT);
+ fixed_t realRadius = FixedMul(scale, FINECOSINE(sideAngle>>ANGLETOFINESHIFT));
+ fixed_t x = FixedMul(realRadius, FINECOSINE(topAngle>>ANGLETOFINESHIFT));
+ fixed_t y = (!yflip) ? FixedMul(scale, height) : FixedMul(scale, height) * -1;
+ fixed_t z = FixedMul(realRadius, FINESINE(topAngle>>ANGLETOFINESHIFT));
+ float timesRepeat;
+
+ timesRepeat = (short)(4 * (256.0f / texw));
+ if (timesRepeat == 0.0f)
+ timesRepeat = 1.0f;
+
+ if (!foglayer)
+ {
+ boolean flip = yflip;
+ vbo->r = 255;
+ vbo->g = 255;
+ vbo->b = 255;
+ vbo->a = (r == 0 ? 0 : 255);
+
+ // Flip Y coordinate anyway for the top part of the hemisphere
+ if (r <= 1)
+ flip = !flip;
+
+ // And the texture coordinates.
+ vbo->u = (-timesRepeat * c / (float)columns);
+ if (!flip) // Flipped Y is for the lower hemisphere.
+ vbo->v = (r / (float)rows) * 1.f * yMult + yAdd;
+ else
+ vbo->v = ((rows-r)/(float)rows) * 1.f * yMult + yAdd;
+ }
+
+ // And finally the vertex.
+ vbo->x = (float)x/(float)MAP_SCALE;
+ vbo->y = (float)y/(float)MAP_SCALE + delta;
+ vbo->z = (float)z/(float)MAP_SCALE;
+}
+
+GLSkyVBO sky_vbo;
+
+static void gld_BuildSky(int row_count, int col_count)
+{
+ int c, r;
+ vbo_vertex_t *vertex_p;
+ int vertex_count = 2 * row_count * (col_count * 2 + 2) + col_count * 2;
+
+ GLSkyVBO *vbo = &sky_vbo;
+
+ if ((vbo->columns != col_count) || (vbo->rows != row_count))
+ {
+ free(vbo->loops);
+ free(vbo->data);
+ memset(vbo, 0, sizeof(&vbo));
+ }
+
+ if (!vbo->data)
+ {
+ memset(vbo, 0, sizeof(&vbo));
+ vbo->loops = malloc((row_count * 2 + 2) * sizeof(vbo->loops[0]));
+ // create vertex array
+ vbo->data = malloc(vertex_count * sizeof(vbo->data[0]));
+ }
+
+ vbo->columns = col_count;
+ vbo->rows = row_count;
+
+ vertex_p = &vbo->data[0];
+ vbo->loopcount = 0;
+
+ memset(&SkyColor, 0xFF, sizeof(SkyColor));
+
+ // Why not?
+ for (yflip = false; yflip <= true; yflip++)
+ {
+ vbo->loops[vbo->loopcount].mode = GL_TRIANGLE_FAN;
+ vbo->loops[vbo->loopcount].vertexindex = vertex_p - &vbo->data[0];
+ vbo->loops[vbo->loopcount].vertexcount = col_count;
+ vbo->loops[vbo->loopcount].use_texture = false;
+ vbo->loopcount++;
+
+ yAdd = 0.5f;
+ yMult = 1.0f;
+ /*if (yflip == 0)
+ SkyColor = &sky->CeilingSkyColor[vbo_idx];
+ else
+ SkyColor = &sky->FloorSkyColor[vbo_idx];*/
+
+ delta = 0.0f;
+ foglayer = true;
+ for (c = 0; c < col_count; c++)
+ {
+ SkyVertex(vertex_p, 1, c);
+ vertex_p->r = SkyColor.s.red;
+ vertex_p->g = SkyColor.s.green;
+ vertex_p->b = SkyColor.s.blue;
+ vertex_p->a = 255;
+ vertex_p++;
+ }
+ foglayer = false;
+
+ delta = (yflip ? 5.0f : -5.0f) / MAP_COEFF;
+
+ for (r = 0; r < row_count; r++)
+ {
+ vbo->loops[vbo->loopcount].mode = GL_TRIANGLE_STRIP;
+ vbo->loops[vbo->loopcount].vertexindex = vertex_p - &vbo->data[0];
+ vbo->loops[vbo->loopcount].vertexcount = 2 * col_count + 2;
+ vbo->loops[vbo->loopcount].use_texture = true; //(r > 1) ? true : false;
+ vbo->loopcount++;
+
+ for (c = 0; c <= col_count; c++)
+ {
+ SkyVertex(vertex_p++, r + (yflip ? 1 : 0), (c ? c : 0));
+ SkyVertex(vertex_p++, r + (yflip ? 0 : 1), (c ? c : 0));
+ }
+ }
+ }
+}
+
+static void RenderDomeForReal(INT32 skytexture)
+{
+ int i, j;
+ GLSkyVBO *vbo = &sky_vbo;
+
+ pglRotatef(270.f, 0.f, 1.f, 0.f);
+
+ rows = 4;
+ columns = 4 * gl_sky_detail;
+
+ if (lasttex != skytexture)
+ {
+ lasttex = skytexture;
+ gld_BuildSky(rows, columns);
+ }
+
+ pglScalef(1.0f, (float)texh / 230.0f, 1.0f);
+
+ for (j = 0; j < 2; j++)
+ {
+ for (i = 0; i < vbo->loopcount; i++)
+ {
+ GLSkyLoopDef *loop = &vbo->loops[i];
+
+ if (j == 0 ? loop->use_texture : !loop->use_texture)
+ continue;
+ else
+ {
+ int k;
+ pglBegin(loop->mode);
+ for (k = loop->vertexindex; k < (loop->vertexindex + loop->vertexcount); k++)
+ {
+ vbo_vertex_t *v = &vbo->data[k];
+ if (loop->use_texture)
+ pglTexCoord2f(v->u, v->v);
+ pglColor4f(v->r, v->g, v->b, v->a);
+ pglVertex3f(v->x, v->y, v->z);
+ }
+ pglEnd();
+ }
+ }
+ }
+
+ pglScalef(1.0f, 1.0f, 1.0f);
+
+ // current color is undefined after glDrawArrays
+ pglColor4f(1.0f, 1.0f, 1.0f, 1.0f);
+}
+
+EXPORT void HWRAPI(RenderSkyDome) (INT32 tex, INT32 texture_width, INT32 texture_height, FTransform transform)
+{
+ SetBlend(PF_Translucent|PF_NoDepthTest|PF_Modulated);
+ SetTransform(&transform);
+
+ texw = texture_width;
+ texh = texture_height;
+ RenderDomeForReal(tex);
+
+ // HWR_DrawSkyBackground left no blend flags after rendering the sky
+ SetBlend(0);
+}
// ==========================================================================
//
diff --git a/src/info.c b/src/info.c
index 9aed563c7a4316ae707c4ddbb82194372977f6f8..5baf289435addc46a40af9aefb0f4ab2f622aeb0 100644
--- a/src/info.c
+++ b/src/info.c
@@ -73,18 +73,17 @@ char sprnames[NUMSPRITES + 1][5] =
"JETF", // Boss jet fumes
// Boss 1 (Greenflower)
- "EGGM",
+ "EGGM", // Boss 1
+ "EGLZ", // Boss 1 Junk
// Boss 2 (Techno Hill)
"EGGN", // Boss 2
- "TNKA", // Boss 2 Tank 1
- "TNKB", // Boss 2 Tank 2
- "SPNK", // Boss 2 Spigot
+ "TANK", // Boss 2 Junk
"GOOP", // Boss 2 Goop
// Boss 3 (Deep Sea)
"EGGO", // Boss 3
- "PRPL", // Boss 3 Propeller
+ "SEBH", // Boss 3 Junk
"FAKE", // Boss 3 Fakemobile
// Boss 4 (Castle Eggman)
@@ -1043,8 +1042,8 @@ state_t states[NUMSTATES] =
{SPR_CBFS, 7, 1, {A_FaceStabHurl}, 6, S_FACESTABBER_CHARGE4, S_FACESTABBER_CHARGE3}, // S_FACESTABBER_CHARGE3
{SPR_CBFS, 7, 1, {A_FaceStabMiss}, 0, S_FACESTABBER_STND1, S_FACESTABBER_CHARGE4}, // S_FACESTABBER_CHARGE4
{SPR_CBFS, 0, 35, {A_Pain}, 0, 0, S_FACESTABBER_STND1}, // S_FACESTABBER_PAIN
- {SPR_CBFS, 0, 2, {A_BossScream}, 1, MT_SONIC3KBOSSEXPLODE, S_FACESTABBER_DIE2}, // S_FACESTABBER_DIE1
- {SPR_NULL, 0, 2, {A_BossScream}, 1, MT_SONIC3KBOSSEXPLODE, S_FACESTABBER_DIE3}, // S_FACESTABBER_DIE2
+ {SPR_CBFS, 0, 2, {A_BossScream}, 1, 0, S_FACESTABBER_DIE2}, // S_FACESTABBER_DIE1
+ {SPR_NULL, 0, 2, {A_BossScream}, 1, 0, S_FACESTABBER_DIE3}, // S_FACESTABBER_DIE2
{SPR_NULL, 0, 0, {A_Repeat}, 7, S_FACESTABBER_DIE1, S_XPLD_FLICKY}, // S_FACESTABBER_DIE3
{SPR_STAB, FF_PAPERSPRITE|FF_TRANS50|FF_FULLBRIGHT, -1, {NULL}, 0, 0, S_NULL}, // S_FACESTABBERSPEAR
@@ -1179,62 +1178,58 @@ state_t states[NUMSTATES] =
{SPR_BOM3, FF_FULLBRIGHT|4, 3, {NULL}, 0, 0, S_SONIC3KBOSSEXPLOSION6}, // S_SONIC3KBOSSEXPLOSION5
{SPR_BOM3, FF_FULLBRIGHT|5, 4, {NULL}, 0, 0, S_NULL}, // S_SONIC3KBOSSEXPLOSION6
- {SPR_JETF, FF_FULLBRIGHT, 1, {NULL}, 0, 0, S_JETFUME2}, // S_JETFUME1
- {SPR_NULL, 0, 1, {NULL}, 0, 0, S_JETFUME1}, // S_JETFUME2
+ {SPR_JETF, FF_ANIMATE|FF_FULLBRIGHT, -1, {NULL}, 2, 1, S_NULL}, // S_JETFUME1
// Boss 1
{SPR_EGGM, 0, 1, {A_Boss1Chase}, 0, 0, S_EGGMOBILE_STND}, // S_EGGMOBILE_STND
+ {SPR_EGGM, FF_ANIMATE|17, 35, {A_FaceTarget}, 1, 2, S_EGGMOBILE_STND}, // S_EGGMOBILE_ROFL
{SPR_EGGM, 1, 3, {A_FaceTarget}, 0, 0, S_EGGMOBILE_LATK2}, // S_EGGMOBILE_LATK1
{SPR_EGGM, 2, 15, {NULL}, 0, 0, S_EGGMOBILE_LATK3}, // S_EGGMOBILE_LATK2
- {SPR_EGGM, 3, 2, {A_FaceTarget}, 0, 0, S_EGGMOBILE_LATK4}, // S_EGGMOBILE_LATK3
- {SPR_EGGM, 4, 1, {NULL}, 0, 0, S_EGGMOBILE_LATK5}, // S_EGGMOBILE_LATK4
- {SPR_EGGM, 5, 1, {NULL}, 0, 0, S_EGGMOBILE_LATK6}, // S_EGGMOBILE_LATK5
- {SPR_EGGM, 6, 1, {NULL}, 0, 0, S_EGGMOBILE_LATK7}, // S_EGGMOBILE_LATK6
- {SPR_EGGM, 7, 1, {NULL}, 0, 0, S_EGGMOBILE_LATK8}, // S_EGGMOBILE_LATK7
- {SPR_EGGM, 8, 45, {A_Boss1Laser}, MT_LASER, 0, S_EGGMOBILE_LATK9}, // S_EGGMOBILE_LATK8
- {SPR_EGGM, 9, 10, {NULL}, 0, 0, S_EGGMOBILE_LATK10}, // S_EGGMOBILE_LATK9
- {SPR_EGGM, 10, 2, {NULL}, 0, 0, S_EGGMOBILE_STND}, // S_EGGMOBILE_LATK10
- {SPR_EGGM, 11, 3, {A_FaceTarget}, 0, 0, S_EGGMOBILE_RATK2}, // S_EGGMOBILE_RATK1
- {SPR_EGGM, 12, 15, {NULL}, 0, 0, S_EGGMOBILE_RATK3}, // S_EGGMOBILE_RATK2
- {SPR_EGGM, 13, 2, {A_FaceTarget}, 0, 0, S_EGGMOBILE_RATK4}, // S_EGGMOBILE_RATK3
- {SPR_EGGM, 14, 1, {NULL}, 0, 0, S_EGGMOBILE_RATK5}, // S_EGGMOBILE_RATK4
- {SPR_EGGM, 15, 1, {NULL}, 0, 0, S_EGGMOBILE_RATK6}, // S_EGGMOBILE_RATK5
- {SPR_EGGM, 16, 1, {NULL}, 0, 0, S_EGGMOBILE_RATK7}, // S_EGGMOBILE_RATK6
- {SPR_EGGM, 17, 1, {NULL}, 0, 0, S_EGGMOBILE_RATK8}, // S_EGGMOBILE_RATK7
- {SPR_EGGM, 18, 45, {A_Boss1Laser}, MT_LASER, 1, S_EGGMOBILE_RATK9}, // S_EGGMOBILE_RATK8
- {SPR_EGGM, 19, 10, {NULL}, 0, 0, S_EGGMOBILE_RATK10}, // S_EGGMOBILE_RATK9
- {SPR_EGGM, 20, 2, {NULL}, 0, 0, S_EGGMOBILE_STND}, // S_EGGMOBILE_RATK10
- {SPR_EGGM, 3, 12, {NULL}, 0, 0, S_EGGMOBILE_PANIC2}, // S_EGGMOBILE_PANIC1
- {SPR_EGGM, 4, 4, {A_Boss1Spikeballs}, 0, 4, S_EGGMOBILE_PANIC3}, // S_EGGMOBILE_PANIC2
- {SPR_EGGM, 3, 8, {NULL}, 0, 0, S_EGGMOBILE_PANIC4}, // S_EGGMOBILE_PANIC3
- {SPR_EGGM, 4, 4, {A_Boss1Spikeballs}, 1, 4, S_EGGMOBILE_PANIC5}, // S_EGGMOBILE_PANIC4
- {SPR_EGGM, 3, 8, {NULL}, 0, 0, S_EGGMOBILE_PANIC6}, // S_EGGMOBILE_PANIC5
- {SPR_EGGM, 4, 4, {A_Boss1Spikeballs}, 2, 4, S_EGGMOBILE_PANIC7}, // S_EGGMOBILE_PANIC6
- {SPR_EGGM, 3, 8, {NULL}, 0, 0, S_EGGMOBILE_PANIC8}, // S_EGGMOBILE_PANIC7
- {SPR_EGGM, 4, 4, {A_Boss1Spikeballs}, 3, 4, S_EGGMOBILE_PANIC9}, // S_EGGMOBILE_PANIC8
- {SPR_EGGM, 3, 8, {NULL}, 0, 0, S_EGGMOBILE_PANIC10},// S_EGGMOBILE_PANIC9
- {SPR_EGGM, 0, 35, {A_SkullAttack}, 0, 0, S_EGGMOBILE_STND}, // S_EGGMOBILE_PANIC10
- {SPR_EGGM, 21, 24, {A_Pain}, 0, 0, S_EGGMOBILE_PAIN2}, // S_EGGMOBILE_PAIN
- {SPR_EGGM, 21, 16, {A_SkullAttack}, 1, 1, S_EGGMOBILE_STND}, // S_EGGMOBILE_PAIN2
- {SPR_EGGM, 22, 8, {A_Fall}, 0, 0, S_EGGMOBILE_DIE2}, // S_EGGMOBILE_DIE1
- {SPR_EGGM, 22, 8, {A_BossScream}, 0, 0, S_EGGMOBILE_DIE3}, // S_EGGMOBILE_DIE2
- {SPR_EGGM, 22, 8, {A_BossScream}, 0, 0, S_EGGMOBILE_DIE4}, // S_EGGMOBILE_DIE3
- {SPR_EGGM, 22, 8, {A_BossScream}, 0, 0, S_EGGMOBILE_DIE5}, // S_EGGMOBILE_DIE4
- {SPR_EGGM, 22, 8, {A_BossScream}, 0, 0, S_EGGMOBILE_DIE6}, // S_EGGMOBILE_DIE5
- {SPR_EGGM, 22, 8, {A_BossScream}, 0, 0, S_EGGMOBILE_DIE7}, // S_EGGMOBILE_DIE6
- {SPR_EGGM, 22, 8, {A_BossScream}, 0, 0, S_EGGMOBILE_DIE8}, // S_EGGMOBILE_DIE7
- {SPR_EGGM, 22, 8, {A_BossScream}, 0, 0, S_EGGMOBILE_DIE9}, // S_EGGMOBILE_DIE8
- {SPR_EGGM, 22, 8, {A_BossScream}, 0, 0, S_EGGMOBILE_DIE10}, // S_EGGMOBILE_DIE9
- {SPR_EGGM, 22, 8, {A_BossScream}, 0, 0, S_EGGMOBILE_DIE11}, // S_EGGMOBILE_DIE10
- {SPR_EGGM, 22, 8, {A_BossScream}, 0, 0, S_EGGMOBILE_DIE12}, // S_EGGMOBILE_DIE11
- {SPR_EGGM, 22, 8, {A_BossScream}, 0, 0, S_EGGMOBILE_DIE13}, // S_EGGMOBILE_DIE12
- {SPR_EGGM, 22, 8, {A_BossScream}, 0, 0, S_EGGMOBILE_DIE14}, // S_EGGMOBILE_DIE13
- {SPR_EGGM, 22, -1, {A_BossDeath}, 0, 0, S_NULL}, // S_EGGMOBILE_DIE14
- {SPR_EGGM, 23, 5, {NULL}, 0, 0, S_EGGMOBILE_FLEE2}, // S_EGGMOBILE_FLEE1
- {SPR_EGGM, 24, 5, {NULL}, 0, 0, S_EGGMOBILE_FLEE1}, // S_EGGMOBILE_FLEE2
+ {SPR_EGGM, 3, 2, {NULL}, 0, 0, S_EGGMOBILE_LATK4}, // S_EGGMOBILE_LATK3
+ {SPR_EGGM, 4, 2, {A_FaceTarget}, 0, 0, S_EGGMOBILE_LATK5}, // S_EGGMOBILE_LATK4
+ {SPR_EGGM, 6, 0, {A_PrepareRepeat}, 45, 0, S_EGGMOBILE_LATK6}, // S_EGGMOBILE_LATK5
+ {SPR_EGGM, 5, 1, {A_Boss1Laser}, MT_LASER, 0, S_EGGMOBILE_LATK7}, // S_EGGMOBILE_LATK6
+ {SPR_EGGM, 6, 1, {A_Boss1Laser}, MT_LASER, (1<<16), S_EGGMOBILE_LATK8}, // S_EGGMOBILE_LATK7
+ {SPR_EGGM, 5, 0, {A_Repeat}, 45, S_EGGMOBILE_LATK6, S_EGGMOBILE_LATK9}, // S_EGGMOBILE_LATK8
+ {SPR_EGGM, 8, 2, {NULL}, 0, 0, S_EGGMOBILE_ROFL}, // S_EGGMOBILE_LATK9
+ {SPR_EGGM, 9, 3, {A_FaceTarget}, 0, 0, S_EGGMOBILE_RATK2}, // S_EGGMOBILE_RATK1
+ {SPR_EGGM, 10, 15, {NULL}, 0, 0, S_EGGMOBILE_RATK3}, // S_EGGMOBILE_RATK2
+ {SPR_EGGM, 11, 2, {NULL}, 0, 0, S_EGGMOBILE_RATK4}, // S_EGGMOBILE_RATK3
+ {SPR_EGGM, 12, 2, {A_FaceTarget}, 0, 0, S_EGGMOBILE_RATK5}, // S_EGGMOBILE_RATK4
+ {SPR_EGGM, 14, 0, {A_PrepareRepeat}, 45, 0, S_EGGMOBILE_RATK6}, // S_EGGMOBILE_RATK5
+ {SPR_EGGM, 13, 1, {A_Boss1Laser}, MT_LASER, 1, S_EGGMOBILE_RATK7}, // S_EGGMOBILE_RATK6
+ {SPR_EGGM, 14, 1, {A_Boss1Laser}, MT_LASER, 1|(1<<16), S_EGGMOBILE_RATK8}, // S_EGGMOBILE_RATK7
+ {SPR_EGGM, 13, 0, {A_Repeat}, 45, S_EGGMOBILE_RATK6, S_EGGMOBILE_RATK9}, // S_EGGMOBILE_RATK8
+ {SPR_EGGM, 16, 2, {NULL}, 0, 0, S_EGGMOBILE_ROFL}, // S_EGGMOBILE_RATK9
+ {SPR_EGGM, 0, 0, {A_PrepareRepeat}, 45, 0, S_EGGMOBILE_PANIC2}, // S_EGGMOBILE_PANIC1
+ {SPR_EGGM, FF_ANIMATE|1, 16, {A_FaceTarget}, 3, 4, S_EGGMOBILE_PANIC3}, // S_EGGMOBILE_PANIC2
+ {SPR_EGGM, 7, 1, {A_Boss1Laser}, MT_LASER, 2, S_EGGMOBILE_PANIC4}, // S_EGGMOBILE_PANIC3
+ {SPR_EGGM, 6, 1, {A_Boss1Laser}, MT_LASER, 2|(1<<16), S_EGGMOBILE_PANIC5}, // S_EGGMOBILE_PANIC4
+ {SPR_EGGM, 6, 0, {A_Repeat}, 45, S_EGGMOBILE_PANIC3, S_EGGMOBILE_PANIC6}, // S_EGGMOBILE_PANIC5
+ {SPR_EGGM, 0, 0, {A_PrepareRepeat}, 45, 0, S_EGGMOBILE_PANIC7}, // S_EGGMOBILE_PANIC6
+ {SPR_EGGM, FF_ANIMATE|9, 16, {A_FaceTarget}, 3, 4, S_EGGMOBILE_PANIC8}, // S_EGGMOBILE_PANIC7
+ {SPR_EGGM, 15, 1, {A_Boss1Laser}, MT_LASER, 2, S_EGGMOBILE_PANIC9}, // S_EGGMOBILE_PANIC8
+ {SPR_EGGM, 14, 1, {A_Boss1Laser}, MT_LASER, 2|(1<<16), S_EGGMOBILE_PANIC10}, // S_EGGMOBILE_PANIC9
+ {SPR_EGGM, 14, 0, {A_Repeat}, 45, S_EGGMOBILE_PANIC8, S_EGGMOBILE_PANIC11}, // S_EGGMOBILE_PANIC10
+ {SPR_EGGM, 0, 0, {A_PrepareRepeat}, 45, 0, S_EGGMOBILE_PANIC12}, // S_EGGMOBILE_PANIC11
+ {SPR_EGGM, FF_ANIMATE|1, 16, {A_FaceTarget}, 3, 4, S_EGGMOBILE_PANIC13}, // S_EGGMOBILE_PANIC12
+ {SPR_EGGM, 7, 1, {A_Boss1Laser}, MT_LASER, 2, S_EGGMOBILE_PANIC14}, // S_EGGMOBILE_PANIC13
+ {SPR_EGGM, 6, 1, {A_Boss1Laser}, MT_LASER, 2|(1<<16), S_EGGMOBILE_PANIC15}, // S_EGGMOBILE_PANIC14
+ {SPR_EGGM, 6, 0, {A_Repeat}, 45, S_EGGMOBILE_PANIC13, S_EGGMOBILE_ROFL}, // S_EGGMOBILE_PANIC15
+ {SPR_EGGM, 19, 24, {A_Pain}, 0, 0, S_EGGMOBILE_PAIN2}, // S_EGGMOBILE_PAIN
+ {SPR_EGGM, 19, 16, {A_SkullAttack}, 3, 1, S_EGGMOBILE_STND}, // S_EGGMOBILE_PAIN2
+ {SPR_EGGM, 20, 2, {A_Fall}, 17, 0, S_EGGMOBILE_DIE2}, // S_EGGMOBILE_DIE1
+ {SPR_EGGM, 20, 2, {A_BossScream}, 0, 0, S_EGGMOBILE_DIE3}, // S_EGGMOBILE_DIE2
+ {SPR_EGGM, 20, 0, {A_Repeat}, 17, S_EGGMOBILE_DIE2, S_EGGMOBILE_DIE4}, // S_EGGMOBILE_DIE3
+ {SPR_EGGM, 20, -1, {A_BossDeath}, 0, 0, S_NULL}, // S_EGGMOBILE_DIE4
+ {SPR_EGGM, 21, 2, {A_BossScream}, 0, 0, S_EGGMOBILE_FLEE2}, // S_EGGMOBILE_FLEE1
+ {SPR_EGGM, 22, 2, {A_BossScream}, 0, 0, S_EGGMOBILE_FLEE1}, // S_EGGMOBILE_FLEE2
{SPR_UNID, 1, 1, {A_UnidusBall}, 2, 0, S_EGGMOBILE_BALL}, // S_EGGMOBILE_BALL
{SPR_NULL, 0, 1, {A_FocusTarget}, 0, 0, S_EGGMOBILE_TARGET}, // S_EGGMOBILE_TARGET
+ {SPR_EGLZ, 0, 35, {NULL}, 0, 0, S_NULL}, // S_BOSSEGLZ1
+ {SPR_EGLZ, 1, 35, {NULL}, 0, 0, S_NULL}, // S_BOSSEGLZ2
+
// Boss 2
{SPR_EGGN, 0, -1, {NULL}, 0, 0, S_NULL}, // S_EGGMOBILE2_STND
{SPR_EGGN, 1, 4, {NULL}, 0, 0, S_EGGMOBILE2_POGO2}, // S_EGGMOBILE2_POGO1
@@ -1246,26 +1241,16 @@ state_t states[NUMSTATES] =
{SPR_EGGN, 1, 2, {NULL}, 0, 0, S_EGGMOBILE2_POGO4}, // S_EGGMOBILE2_POGO7
{SPR_EGGN, 3, 24, {A_Boss2TakeDamage}, 24+TICRATE, 0, S_EGGMOBILE2_STND}, // S_EGGMOBILE2_PAIN
{SPR_EGGN, 4, 24, {A_Boss2TakeDamage}, 24+TICRATE, 0, S_EGGMOBILE2_POGO4}, // S_EGGMOBILE2_PAIN2
- {SPR_EGGN, 5, 8, {A_Fall}, 0, 0, S_EGGMOBILE2_DIE2}, // S_EGGMOBILE2_DIE1
- {SPR_EGGN, 5, 8, {A_BossScream}, 0, 0, S_EGGMOBILE2_DIE3}, // S_EGGMOBILE2_DIE2
- {SPR_EGGN, 5, 8, {A_BossScream}, 0, 0, S_EGGMOBILE2_DIE4}, // S_EGGMOBILE2_DIE3
- {SPR_EGGN, 5, 8, {A_BossScream}, 0, 0, S_EGGMOBILE2_DIE5}, // S_EGGMOBILE2_DIE4
- {SPR_EGGN, 5, 8, {A_BossScream}, 0, 0, S_EGGMOBILE2_DIE6}, // S_EGGMOBILE2_DIE5
- {SPR_EGGN, 5, 8, {A_BossScream}, 0, 0, S_EGGMOBILE2_DIE7}, // S_EGGMOBILE2_DIE6
- {SPR_EGGN, 5, 8, {A_BossScream}, 0, 0, S_EGGMOBILE2_DIE8}, // S_EGGMOBILE2_DIE7
- {SPR_EGGN, 5, 8, {A_BossScream}, 0, 0, S_EGGMOBILE2_DIE9}, // S_EGGMOBILE2_DIE8
- {SPR_EGGN, 5, 8, {A_BossScream}, 0, 0, S_EGGMOBILE2_DIE10}, // S_EGGMOBILE2_DIE9
- {SPR_EGGN, 5, 8, {A_BossScream}, 0, 0, S_EGGMOBILE2_DIE11}, // S_EGGMOBILE2_DIE10
- {SPR_EGGN, 5, 8, {A_BossScream}, 0, 0, S_EGGMOBILE2_DIE12}, // S_EGGMOBILE2_DIE11
- {SPR_EGGN, 5, 8, {A_BossScream}, 0, 0, S_EGGMOBILE2_DIE13}, // S_EGGMOBILE2_DIE12
- {SPR_EGGN, 5, 8, {A_BossScream}, 0, 0, S_EGGMOBILE2_DIE14}, // S_EGGMOBILE2_DIE13
- {SPR_EGGN, 5, -1, {A_BossDeath}, 0, 0, S_NULL}, // S_EGGMOBILE2_DIE14
- {SPR_EGGN, 6, 5, {NULL}, 0, 0, S_EGGMOBILE2_FLEE2}, // S_EGGMOBILE2_FLEE1
- {SPR_EGGN, 7, 5, {NULL}, 0, 0, S_EGGMOBILE2_FLEE1}, // S_EGGMOBILE2_FLEE2
-
- {SPR_TNKA, 0, 35, {NULL}, 0, 0, S_NULL}, // S_BOSSTANK1
- {SPR_TNKB, 0, 35, {NULL}, 0, 0, S_NULL}, // S_BOSSTANK2
- {SPR_SPNK, 0, 35, {NULL}, 0, 0, S_NULL}, // S_BOSSSPIGOT
+ {SPR_EGGN, 5, 2, {A_Fall}, 0, 0, S_EGGMOBILE2_DIE2}, // S_EGGMOBILE2_DIE1
+ {SPR_EGGN, 5, 2, {A_BossScream}, 0, 0, S_EGGMOBILE2_DIE3}, // S_EGGMOBILE2_DIE2
+ {SPR_EGGN, 5, 0, {A_Repeat}, 17, S_EGGMOBILE2_DIE2, S_EGGMOBILE2_DIE4}, // S_EGGMOBILE2_DIE3
+ {SPR_EGGN, 5, -1, {A_BossDeath}, 0, 0, S_NULL}, // S_EGGMOBILE2_DIE4
+ {SPR_EGGN, 6, 2, {A_BossScream}, 0, 0, S_EGGMOBILE2_FLEE2}, // S_EGGMOBILE2_FLEE1
+ {SPR_EGGN, 7, 2, {A_BossScream}, 0, 0, S_EGGMOBILE2_FLEE1}, // S_EGGMOBILE2_FLEE2
+
+ {SPR_TANK, 0, 35, {NULL}, 0, 0, S_NULL}, // S_BOSSTANK1
+ {SPR_TANK, 1, 35, {NULL}, 0, 0, S_NULL}, // S_BOSSTANK2
+ {SPR_TANK, 2, 35, {NULL}, 0, 0, S_NULL}, // S_BOSSSPIGOT
// Boss 2 Goop
{SPR_GOOP, 0, 2, {A_SpawnObjectRelative}, 0, MT_GOOPTRAIL, S_GOOP2}, // S_GOOP1
@@ -1275,64 +1260,27 @@ state_t states[NUMSTATES] =
// Boss 3
{SPR_EGGO, 0, 1, {NULL}, 0, 0, S_EGGMOBILE3_STND}, // S_EGGMOBILE3_STND
- {SPR_EGGO, 6, 4, {NULL}, 0, 0, S_EGGMOBILE3_LAUGH2}, // S_EGGMOBILE3_LAUGH1
- {SPR_EGGO, 7, 4, {NULL}, 0, 0, S_EGGMOBILE3_LAUGH3}, // S_EGGMOBILE3_LAUGH2
- {SPR_EGGO, 6, 4, {NULL}, 0, 0, S_EGGMOBILE3_LAUGH4}, // S_EGGMOBILE3_LAUGH3
- {SPR_EGGO, 7, 4, {NULL}, 0, 0, S_EGGMOBILE3_LAUGH5}, // S_EGGMOBILE3_LAUGH4
- {SPR_EGGO, 6, 4, {NULL}, 0, 0, S_EGGMOBILE3_ATK1}, // S_EGGMOBILE3_LAUGH5
- {SPR_EGGO, 1, 2, {NULL}, 0, 0, S_EGGMOBILE3_ATK2}, // S_EGGMOBILE3_ATK1
+ {SPR_EGGO, FF_ANIMATE, 24, {NULL}, 1, 2, S_EGGMOBILE3_ATK2}, // S_EGGMOBILE3_SHOCK
+ {SPR_EGGO, 6|FF_ANIMATE, 24, {NULL}, 1, 2, S_EGGMOBILE3_ATK2}, // S_EGGMOBILE3_ATK1
{SPR_EGGO, 2, 2, {NULL}, 0, 0, S_EGGMOBILE3_ATK3A}, // S_EGGMOBILE3_ATK2
{SPR_EGGO, 3, 2, {A_BossFireShot}, MT_TORPEDO, 2, S_EGGMOBILE3_ATK3B}, // S_EGGMOBILE3_ATK3A
{SPR_EGGO, 3, 2, {A_BossFireShot}, MT_TORPEDO, 4, S_EGGMOBILE3_ATK3C}, // S_EGGMOBILE3_ATK3B
{SPR_EGGO, 3, 2, {A_BossFireShot}, MT_TORPEDO, 3, S_EGGMOBILE3_ATK3D}, // S_EGGMOBILE3_ATK3C
{SPR_EGGO, 3, 2, {A_BossFireShot}, MT_TORPEDO, 5, S_EGGMOBILE3_ATK4}, // S_EGGMOBILE3_ATK3D
{SPR_EGGO, 4, 2, {NULL}, 0, 0, S_EGGMOBILE3_ATK5}, // S_EGGMOBILE3_ATK4
- {SPR_EGGO, 5, 2, {NULL}, 0, 0, S_EGGMOBILE3_LAUGH6}, // S_EGGMOBILE3_ATK5
- {SPR_EGGO, 7, 4, {NULL}, 0, 0, S_EGGMOBILE3_LAUGH7}, // S_EGGMOBILE3_LAUGH6
- {SPR_EGGO, 6, 4, {NULL}, 0, 0, S_EGGMOBILE3_LAUGH8}, // S_EGGMOBILE3_LAUGH7
- {SPR_EGGO, 7, 4, {NULL}, 0, 0, S_EGGMOBILE3_LAUGH9}, // S_EGGMOBILE3_LAUGH8
- {SPR_EGGO, 6, 4, {NULL}, 0, 0, S_EGGMOBILE3_LAUGH10}, // S_EGGMOBILE3_LAUGH9
- {SPR_EGGO, 7, 4, {NULL}, 0, 0, S_EGGMOBILE3_LAUGH11}, // S_EGGMOBILE3_LAUGH10
- {SPR_EGGO, 6, 4, {NULL}, 0, 0, S_EGGMOBILE3_LAUGH12}, // S_EGGMOBILE3_LAUGH11
- {SPR_EGGO, 7, 4, {NULL}, 0, 0, S_EGGMOBILE3_LAUGH13}, // S_EGGMOBILE3_LAUGH12
- {SPR_EGGO, 6, 4, {NULL}, 0, 0, S_EGGMOBILE3_LAUGH14}, // S_EGGMOBILE3_LAUGH13
- {SPR_EGGO, 7, 4, {NULL}, 0, 0, S_EGGMOBILE3_LAUGH15}, // S_EGGMOBILE3_LAUGH14
- {SPR_EGGO, 6, 4, {NULL}, 0, 0, S_EGGMOBILE3_LAUGH16}, // S_EGGMOBILE3_LAUGH15
- {SPR_EGGO, 7, 4, {NULL}, 0, 0, S_EGGMOBILE3_LAUGH17}, // S_EGGMOBILE3_LAUGH16
- {SPR_EGGO, 6, 4, {NULL}, 0, 0, S_EGGMOBILE3_LAUGH18}, // S_EGGMOBILE3_LAUGH17
- {SPR_EGGO, 7, 4, {NULL}, 0, 0, S_EGGMOBILE3_LAUGH19}, // S_EGGMOBILE3_LAUGH18
- {SPR_EGGO, 6, 4, {NULL}, 0, 0, S_EGGMOBILE3_LAUGH20}, // S_EGGMOBILE3_LAUGH19
- {SPR_EGGO, 7, 4, {NULL}, 0, 0, S_EGGMOBILE3_STND}, // S_EGGMOBILE3_LAUGH20
+ {SPR_EGGO, 5, 2, {NULL}, 0, 0, S_EGGMOBILE3_ROFL}, // S_EGGMOBILE3_ATK5
+ {SPR_EGGO, 6|FF_ANIMATE, 60, {NULL}, 1, 2, S_EGGMOBILE3_STND}, // S_EGGMOBILE3_ROFL
{SPR_EGGO, 8, 1, {A_Boss3TakeDamage}, 0, 0, S_EGGMOBILE3_PAIN2}, // S_EGGMOBILE3_PAIN
{SPR_EGGO, 8, 23, {A_Pain}, 0, 0, S_EGGMOBILE3_STND}, // S_EGGMOBILE3_PAIN2
- {SPR_EGGO, 9, 8, {A_Fall}, 0, 0, S_EGGMOBILE3_DIE2}, // S_EGGMOBILE3_DIE1
- {SPR_EGGO, 9, 8, {A_BossScream}, 0, 0, S_EGGMOBILE3_DIE3}, // S_EGGMOBILE3_DIE2
- {SPR_EGGO, 9, 8, {A_BossScream}, 0, 0, S_EGGMOBILE3_DIE4}, // S_EGGMOBILE3_DIE3
- {SPR_EGGO, 9, 8, {A_BossScream}, 0, 0, S_EGGMOBILE3_DIE5}, // S_EGGMOBILE3_DIE4
- {SPR_EGGO, 9, 8, {A_BossScream}, 0, 0, S_EGGMOBILE3_DIE6}, // S_EGGMOBILE3_DIE5
- {SPR_EGGO, 9, 8, {A_BossScream}, 0, 0, S_EGGMOBILE3_DIE7}, // S_EGGMOBILE3_DIE6
- {SPR_EGGO, 9, 8, {A_BossScream}, 0, 0, S_EGGMOBILE3_DIE8}, // S_EGGMOBILE3_DIE7
- {SPR_EGGO, 9, 8, {A_BossScream}, 0, 0, S_EGGMOBILE3_DIE9}, // S_EGGMOBILE3_DIE8
- {SPR_EGGO, 9, 8, {A_BossScream}, 0, 0, S_EGGMOBILE3_DIE10}, // S_EGGMOBILE3_DIE9
- {SPR_EGGO, 9, 8, {A_BossScream}, 0, 0, S_EGGMOBILE3_DIE11}, // S_EGGMOBILE3_DIE10
- {SPR_EGGO, 9, 8, {A_BossScream}, 0, 0, S_EGGMOBILE3_DIE12}, // S_EGGMOBILE3_DIE11
- {SPR_EGGO, 9, 8, {A_BossScream}, 0, 0, S_EGGMOBILE3_DIE13}, // S_EGGMOBILE3_DIE12
- {SPR_EGGO, 9, 8, {A_BossScream}, 0, 0, S_EGGMOBILE3_DIE14}, // S_EGGMOBILE3_DIE13
- {SPR_EGGO, 9, -1, {A_BossDeath}, 0, 0, S_NULL}, // S_EGGMOBILE3_DIE14
- {SPR_EGGO, 10, 5, {NULL}, 0, 0, S_EGGMOBILE3_FLEE2}, // S_EGGMOBILE3_FLEE1
- {SPR_EGGO, 11, 5, {NULL}, 0, 0, S_EGGMOBILE3_FLEE1}, // S_EGGMOBILE3_FLEE2
-
- // Boss 3 Propeller
- {SPR_PRPL, 0, 1, {NULL}, 0, 0, S_PROPELLER2}, // S_PROPELLER1
- {SPR_PRPL, 1, 1, {NULL}, 0, 0, S_PROPELLER3}, // S_PROPELLER2
- {SPR_PRPL, 2, 1, {NULL}, 0, 0, S_PROPELLER4}, // S_PROPELLER3
- {SPR_PRPL, 3, 1, {NULL}, 0, 0, S_PROPELLER5}, // S_PROPELLER4
- {SPR_PRPL, 4, 1, {NULL}, 0, 0, S_PROPELLER6}, // S_PROPELLER5
- {SPR_PRPL, 5, 1, {NULL}, 0, 0, S_PROPELLER7}, // S_PROPELLER6
- {SPR_PRPL, 6, 1, {NULL}, 0, 0, S_PROPELLER1}, // S_PROPELLER7
+ {SPR_EGGO, 9, 2, {A_Fall}, 0, 0, S_EGGMOBILE3_DIE2}, // S_EGGMOBILE3_DIE1
+ {SPR_EGGO, 9, 2, {A_BossScream}, 0, 0, S_EGGMOBILE3_DIE3}, // S_EGGMOBILE3_DIE2
+ {SPR_EGGO, 9, 0, {A_Repeat}, 17, S_EGGMOBILE3_DIE2, S_EGGMOBILE3_DIE4}, // S_EGGMOBILE3_DIE3
+ {SPR_EGGO, 9, -1, {A_BossDeath}, 0, 0, S_NULL}, // S_EGGMOBILE3_DIE4
+ {SPR_EGGO, 10, 2, {A_BossScream}, 0, 0, S_EGGMOBILE3_FLEE2}, // S_EGGMOBILE3_FLEE1
+ {SPR_EGGO, 11, 2, {A_BossScream}, 0, 0, S_EGGMOBILE3_FLEE1}, // S_EGGMOBILE3_FLEE2
// Boss 3 Pinch
- {SPR_FAKE, 0, 1, {A_BossJetFume}, 1, 0, S_FAKEMOBILE}, // S_FAKEMOBILE_INIT
+ {SPR_FAKE, 0, 1, {NULL}, 0, 0, S_FAKEMOBILE}, // S_FAKEMOBILE_INIT
{SPR_FAKE, 0, 1, {A_Boss3Path}, 0, 0, S_FAKEMOBILE}, // S_FAKEMOBILE
{SPR_FAKE, 0, 22, {NULL}, 0, 0, S_FAKEMOBILE_ATK2}, // S_FAKEMOBILE_ATK1
{SPR_FAKE, 0, 2, {NULL}, 0, 0, S_FAKEMOBILE_ATK3A}, // S_FAKEMOBILE_ATK2
@@ -1340,47 +1288,40 @@ state_t states[NUMSTATES] =
{SPR_FAKE, 0, 2, {A_BossFireShot}, MT_TORPEDO2, 4, S_FAKEMOBILE_ATK3C}, // S_FAKEMOBILE_ATK3B
{SPR_FAKE, 0, 2, {A_BossFireShot}, MT_TORPEDO2, 3, S_FAKEMOBILE_ATK3D}, // S_FAKEMOBILE_ATK3C
{SPR_FAKE, 0, 2, {A_BossFireShot}, MT_TORPEDO2, 5, S_FAKEMOBILE}, // S_FAKEMOBILE_ATK3D
- {SPR_FAKE, 0, 1, {NULL}, 0, 0, S_FAKEMOBILE_DIE2}, // S_FAKEMOBILE_DIE1
+ {SPR_FAKE, 1, 1, {NULL}, 0, 0, S_FAKEMOBILE_DIE2}, // S_FAKEMOBILE_DIE1
{SPR_NULL, 0, 1, {NULL}, 0, 0, S_FAKEMOBILE_DIE1}, // S_FAKEMOBILE_DIE2
+ {SPR_SEBH, 0, 35, {NULL}, 0, 0, S_NULL}, // S_BOSSSEBH1
+ {SPR_SEBH, 1, 35, {NULL}, 0, 0, S_NULL}, // S_BOSSSEBH2
+
// Boss 4
{SPR_EGGP, 0, -1, {NULL}, 0, 0, S_NULL}, // S_EGGMOBILE4_STND
{SPR_EGGP, 1, 3, {NULL}, 0, 0, S_EGGMOBILE4_LATK2}, // S_EGGMOBILE4_LATK1
{SPR_EGGP, 2, 15, {NULL}, 0, 0, S_EGGMOBILE4_LATK3}, // S_EGGMOBILE4_LATK2
{SPR_EGGP, 3, 2, {NULL}, 0, 0, S_EGGMOBILE4_LATK4}, // S_EGGMOBILE4_LATK3
- {SPR_EGGP, 4, 4, {NULL}, 0, 0, S_EGGMOBILE4_LATK5}, // S_EGGMOBILE4_LATK4
- {SPR_EGGP, 4, 50, {A_Boss4Reverse}, sfx_mswing, 0, S_EGGMOBILE4_LATK6}, // S_EGGMOBILE4_LATK5
- {SPR_EGGP, 5, 2, {NULL}, 0, 0, S_EGGMOBILE4_STND}, // S_EGGMOBILE4_LATK6
- {SPR_EGGP, 6, 3, {NULL}, 0, 0, S_EGGMOBILE4_RATK2}, // S_EGGMOBILE4_RATK1
- {SPR_EGGP, 7, 15, {NULL}, 0, 0, S_EGGMOBILE4_RATK3}, // S_EGGMOBILE4_RATK2
- {SPR_EGGP, 8, 2, {NULL}, 0, 0, S_EGGMOBILE4_RATK4}, // S_EGGMOBILE4_RATK3
- {SPR_EGGP, 9, 4, {NULL}, 0, 0, S_EGGMOBILE4_RATK5}, // S_EGGMOBILE4_RATK4
- {SPR_EGGP, 9,150, {A_Boss4SpeedUp}, sfx_mswing, 0, S_EGGMOBILE4_RATK6}, // S_EGGMOBILE4_RATK5
- {SPR_EGGP,10, 2, {NULL}, 0, 0, S_EGGMOBILE4_STND}, // S_EGGMOBILE4_RATK6
- {SPR_EGGP, 0, 20, {A_Boss4Raise}, sfx_doord1, 0, S_EGGMOBILE4_RAISE2}, // S_EGGMOBILE4_RAISE1
- {SPR_EGGP,13|FF_ANIMATE, -1, {NULL}, 1, 10, S_NULL}, // S_EGGMOBILE4_RAISE2
- {SPR_EGGP,11, 0, {A_Boss4Reverse}, sfx_alarm, sfx_s3k60, S_EGGMOBILE4_PAIN2}, // S_EGGMOBILE4_PAIN1
- {SPR_EGGP,11, 24, {A_Pain}, 0, 0, S_EGGMOBILE4_STND}, // S_EGGMOBILE4_PAIN2
- {SPR_EGGP,12, 8, {A_Fall}, 0, 0, S_EGGMOBILE4_DIE2}, // S_EGGMOBILE4_DIE1
- {SPR_EGGP,12, 8, {A_BossScream}, 0, 0, S_EGGMOBILE4_DIE3}, // S_EGGMOBILE4_DIE2
- {SPR_EGGP,12, 8, {A_BossScream}, 0, 0, S_EGGMOBILE4_DIE4}, // S_EGGMOBILE4_DIE3
- {SPR_EGGP,12, 8, {A_BossScream}, 0, 0, S_EGGMOBILE4_DIE5}, // S_EGGMOBILE4_DIE4
- {SPR_EGGP,12, 8, {A_BossScream}, 0, 0, S_EGGMOBILE4_DIE6}, // S_EGGMOBILE4_DIE5
- {SPR_EGGP,12, 8, {A_BossScream}, 0, 0, S_EGGMOBILE4_DIE7}, // S_EGGMOBILE4_DIE6
- {SPR_EGGP,12, 8, {A_BossScream}, 0, 0, S_EGGMOBILE4_DIE8}, // S_EGGMOBILE4_DIE7
- {SPR_EGGP,12, 8, {A_BossScream}, 0, 0, S_EGGMOBILE4_DIE9}, // S_EGGMOBILE4_DIE8
- {SPR_EGGP,12, 8, {A_BossScream}, 0, 0, S_EGGMOBILE4_DIE10}, // S_EGGMOBILE4_DIE9
- {SPR_EGGP,12, 8, {A_BossScream}, 0, 0, S_EGGMOBILE4_DIE11}, // S_EGGMOBILE4_DIE10
- {SPR_EGGP,12, 8, {A_BossScream}, 0, 0, S_EGGMOBILE4_DIE12}, // S_EGGMOBILE4_DIE11
- {SPR_EGGP,12, 8, {A_BossScream}, 0, 0, S_EGGMOBILE4_DIE13}, // S_EGGMOBILE4_DIE12
- {SPR_EGGP,12, 8, {A_BossScream}, 0, 0, S_EGGMOBILE4_DIE14}, // S_EGGMOBILE4_DIE13
- {SPR_EGGP,12, -1, {A_BossDeath}, 0, 0, S_NULL}, // S_EGGMOBILE4_DIE14
- {SPR_EGGP,13, 5, {NULL}, 0, 0, S_EGGMOBILE4_FLEE2}, // S_EGGMOBILE4_FLEE1
- {SPR_EGGP,14, 5, {NULL}, 0, 0, S_EGGMOBILE4_FLEE1}, // S_EGGMOBILE4_FLEE2
+ {SPR_EGGP, 4, 2, {NULL}, 0, 0, S_EGGMOBILE4_LATK5}, // S_EGGMOBILE4_LATK4
+ {SPR_EGGP, 5, 50, {A_Boss4Reverse}, sfx_mswing, 0, S_EGGMOBILE4_LATK6}, // S_EGGMOBILE4_LATK5
+ {SPR_EGGP, 6, 2, {NULL}, 0, 0, S_EGGMOBILE4_STND}, // S_EGGMOBILE4_LATK6
+ {SPR_EGGP, 7, 3, {NULL}, 0, 0, S_EGGMOBILE4_RATK2}, // S_EGGMOBILE4_RATK1
+ {SPR_EGGP, 8, 15, {NULL}, 0, 0, S_EGGMOBILE4_RATK3}, // S_EGGMOBILE4_RATK2
+ {SPR_EGGP, 9, 2, {NULL}, 0, 0, S_EGGMOBILE4_RATK4}, // S_EGGMOBILE4_RATK3
+ {SPR_EGGP,10, 2, {NULL}, 0, 0, S_EGGMOBILE4_RATK5}, // S_EGGMOBILE4_RATK4
+ {SPR_EGGP,11,150, {A_Boss4SpeedUp}, sfx_mswing, 0, S_EGGMOBILE4_RATK6}, // S_EGGMOBILE4_RATK5
+ {SPR_EGGP,12, 2, {NULL}, 0, 0, S_EGGMOBILE4_STND}, // S_EGGMOBILE4_RATK6
+ {SPR_EGGP,13, 20, {A_Boss4Raise}, sfx_doord1, 0, S_EGGMOBILE4_RAISE2}, // S_EGGMOBILE4_RAISE1
+ {SPR_EGGP,15|FF_ANIMATE, -1, {NULL}, 1, 10, S_NULL}, // S_EGGMOBILE4_RAISE2
+ {SPR_EGGP,13, 0, {A_Boss4Reverse}, sfx_alarm, sfx_s3k60, S_EGGMOBILE4_PAIN2}, // S_EGGMOBILE4_PAIN1
+ {SPR_EGGP,13, 24, {A_Pain}, 0, 0, S_EGGMOBILE4_STND}, // S_EGGMOBILE4_PAIN2
+ {SPR_EGGP,14, 2, {A_Fall}, 0, 0, S_EGGMOBILE4_DIE2}, // S_EGGMOBILE4_DIE1
+ {SPR_EGGP,14, 2, {A_BossScream}, 0, 0, S_EGGMOBILE4_DIE3}, // S_EGGMOBILE4_DIE2
+ {SPR_EGGP,14, 0, {A_Repeat}, 17, S_EGGMOBILE4_DIE2, S_EGGMOBILE4_DIE4}, // S_EGGMOBILE4_DIE3
+ {SPR_EGGP,14, -1, {A_BossDeath}, 0, 0, S_NULL}, // S_EGGMOBILE4_DIE4
+ {SPR_EGGP,15, 2, {A_BossScream}, 0, 0, S_EGGMOBILE4_FLEE2}, // S_EGGMOBILE4_FLEE1
+ {SPR_EGGP,16, 2, {A_BossScream}, 0, 0, S_EGGMOBILE4_FLEE1}, // S_EGGMOBILE4_FLEE2
{SPR_BMCE, 0, -1, {NULL}, 0, 0, S_NULL}, // S_EGGMOBILE4_MACE
- {SPR_BMCE, 0, 2, {A_BossScream}, 1, MT_SONIC3KBOSSEXPLODE, S_EGGMOBILE4_MACE_DIE2}, // S_EGGMOBILE4_MACE_DIE1
- {SPR_NULL, 0, 2, {A_BossScream}, 1, MT_SONIC3KBOSSEXPLODE, S_EGGMOBILE4_MACE_DIE3}, // S_EGGMOBILE4_MACE_DIE2
- {SPR_NULL, 0, 0, {A_Repeat}, 7, S_EGGMOBILE4_MACE_DIE1, S_BOSSEXPLODE}, // S_EGGMOBILE4_MACE_DIE3
+ {SPR_BMCE, 0, 2, {A_BossScream}, 1, 0, S_EGGMOBILE4_MACE_DIE2}, // S_EGGMOBILE4_MACE_DIE1
+ {SPR_NULL, 0, 2, {A_BossScream}, 1, 0, S_EGGMOBILE4_MACE_DIE3}, // S_EGGMOBILE4_MACE_DIE2
+ {SPR_NULL, 0, 0, {A_Repeat}, 7, S_EGGMOBILE4_MACE_DIE1, S_SONIC3KBOSSEXPLOSION1}, // S_EGGMOBILE4_MACE_DIE3
// Boss 4 jet flame
{SPR_EFIR, FF_FULLBRIGHT|FF_ANIMATE, -1, {NULL}, 1, 1, S_NULL}, // S_JETFLAME
@@ -1430,7 +1371,7 @@ state_t states[NUMSTATES] =
{SPR_FANG, 4, 1, {A_DoNPCSkid}, S_FANG_SKID3, 0, S_FANG_SKID2}, // S_FANG_SKID2
{SPR_FANG, 4, 10, {NULL}, 0, 0, S_FANG_CHOOSEATTACK}, // S_FANG_SKID3
- {SPR_FANG, 0, 0, {A_RandomState}, S_FANG_LOBSHOT1, S_FANG_FIRESTART1, S_NULL}, // S_FANG_CHOOSEATTACK
+ {SPR_FANG, 0, 0, {A_RandomState}, S_FANG_LOBSHOT0, S_FANG_FIRESTART1, S_NULL}, // S_FANG_CHOOSEATTACK
{SPR_FANG, 5, 0, {A_PrepareRepeat}, 3, 0, S_FANG_FIRESTART2}, // S_FANG_FIRESTART1 // Reset loop
{SPR_FANG, 5, 18, {A_LookForBetter}, 1, 0, S_FANG_FIRE1}, // S_FANG_FIRESTART2
@@ -1440,7 +1381,8 @@ state_t states[NUMSTATES] =
{SPR_FANG, 5, 5, {NULL}, 2, 0, S_FANG_FIREREPEAT}, // S_FANG_FIRE4
{SPR_FANG, 5, 0, {A_Repeat}, 3, S_FANG_FIRE1, S_FANG_WAIT1}, // S_FANG_FIREREPEAT // End of loop
- {SPR_FANG, 19, 18, {A_LookForBetter}, 1, 0, S_FANG_LOBSHOT2}, // S_FANG_LOBSHOT1
+ {SPR_FANG, 18, 16, {A_LookForBetter}, 1, 0, S_FANG_LOBSHOT1}, // S_FANG_LOBSHOT0
+ {SPR_FANG, 19, 2, {A_LookForBetter}, 1, 0, S_FANG_LOBSHOT2}, // S_FANG_LOBSHOT1
{SPR_FANG, 20, 18, {A_BrakLobShot}, MT_FBOMB, 32+(1<<16), S_FANG_WAIT1}, // S_FANG_LOBSHOT2
{SPR_FANG, FF_ANIMATE|15, 70, {NULL}, 1, 5, S_FANG_WAIT2}, // S_FANG_WAIT1
@@ -1458,17 +1400,18 @@ state_t states[NUMSTATES] =
{SPR_FANG, 12, 1, {A_Boss5CheckOnGround}, S_FANG_PINCHSKID1, 0, S_FANG_PINCHFALL2}, // S_FANG_PINCHFALL1
{SPR_FANG, 13, 1, {A_Boss5CheckOnGround}, S_FANG_PINCHSKID1, 0, S_FANG_PINCHFALL1}, // S_FANG_PINCHFALL2
{SPR_FANG, 4, 0, {A_PlayAttackSound}, 0, 0, S_FANG_PINCHSKID2}, // S_FANG_PINCHSKID1
- {SPR_FANG, 4, 1, {A_DoNPCSkid}, S_FANG_PINCHLOBSHOT1, 0, S_FANG_PINCHSKID2}, // S_FANG_PINCHSKID2
- {SPR_FANG, 19, 18, {A_FaceTarget}, 3, 0, S_FANG_PINCHLOBSHOT2}, // S_FANG_PINCHLOBSHOT1
+ {SPR_FANG, 4, 1, {A_DoNPCSkid}, S_FANG_PINCHLOBSHOT0, 0, S_FANG_PINCHSKID2}, // S_FANG_PINCHSKID2
+ {SPR_FANG, 18, 16, {A_FaceTarget}, 3, 0, S_FANG_PINCHLOBSHOT1}, // S_FANG_PINCHLOBSHOT0
+ {SPR_FANG, 19, 2, {A_FaceTarget}, 3, 0, S_FANG_PINCHLOBSHOT2}, // S_FANG_PINCHLOBSHOT1
{SPR_FANG, 20, 30, {A_Boss5MakeItRain}, MT_FBOMB, -16, S_FANG_PINCHLOBSHOT3}, // S_FANG_PINCHLOBSHOT2
- {SPR_FANG, 19, 18, {A_LinedefExecute}, LE_BOSS4DROP, 0, S_FANG_PINCHLOBSHOT4}, // S_FANG_PINCHLOBSHOT3
- {SPR_FANG, 19, 0, {A_Boss5Calm}, 0, 0, S_FANG_PATHINGSTART1}, // S_FANG_PINCHLOBSHOT4
+ {SPR_FANG, 20, 18, {A_LinedefExecute}, LE_BOSS4DROP, 0, S_FANG_PINCHLOBSHOT4}, // S_FANG_PINCHLOBSHOT3
+ {SPR_FANG, 0, 0, {A_Boss5Calm}, 0, 0, S_FANG_PATHINGSTART1}, // S_FANG_PINCHLOBSHOT4
- {SPR_FANG, 14, 0, {A_DoNPCPain}, 0, 0, S_FANG_DIE2}, // S_FANG_DIE1
- {SPR_FANG, 14, 1, {A_Boss5CheckOnGround}, S_FANG_DIE3, 0, S_FANG_DIE2}, // S_FANG_DIE2
+ {SPR_FANG, 21, 0, {A_DoNPCPain}, 0, 0, S_FANG_DIE2}, // S_FANG_DIE1
+ {SPR_FANG, 21, 1, {A_Boss5CheckOnGround}, S_FANG_DIE3, 0, S_FANG_DIE2}, // S_FANG_DIE2
- {SPR_FANG, 17, 0, {A_Scream}, 0, 0, S_FANG_DIE4}, // S_FANG_DIE3
- {SPR_FANG, 17, 104, {NULL}, 0, 0, S_FANG_DIE5}, // S_FANG_DIE4
+ {SPR_FANG, 22, 0, {A_Scream}, 0, 0, S_FANG_DIE4}, // S_FANG_DIE3
+ {SPR_FANG, 22, 104, {NULL}, 0, 0, S_FANG_DIE5}, // S_FANG_DIE4
{SPR_FANG, 11, 0, {A_PlaySound}, sfx_jump, 0, S_FANG_DIE6}, // S_FANG_DIE5
{SPR_FANG, 11, 1, {A_ZThrust}, 6, (1<<16)|1, S_FANG_DIE7}, // S_FANG_DIE6
@@ -1480,7 +1423,7 @@ state_t states[NUMSTATES] =
{SPR_FANG, 9, 2, {NULL}, 0, 0, S_FANG_FLEEBOUNCE2}, // S_FANG_FLEEBOUNCE1
{SPR_FANG, 10, -1, {A_BossDeath}, 0, 0, S_NULL}, // S_FANG_FLEEBOUNCE2
- {SPR_FANG, 18, 7*TICRATE, {NULL}, 0, 0, S_NULL}, // S_FANG_KO
+ {SPR_FANG, 17, 7*TICRATE, {NULL}, 0, 0, S_NULL}, // S_FANG_KO
{SPR_FBOM, 0, 1, {A_GhostMe}, 0, 0, S_FBOMB2}, // S_FBOMB1
{SPR_FBOM, 1, 1, {A_GhostMe}, 0, 0, S_FBOMB1}, // S_FBOMB2
@@ -1621,7 +1564,7 @@ state_t states[NUMSTATES] =
{SPR_BRAK, 18, 0, {A_CheckHealth}, 3, S_CYBRAKDEMON_PAIN3, S_CYBRAKDEMON_CHOOSE_ATTACK1}, // S_CYBRAKDEMON_PAIN2
{SPR_BRAK, 18, 0, {A_LinedefExecute}, LE_PINCHPHASE, 0, S_CYBRAKDEMON_CHOOSE_ATTACK1}, // S_CYBRAKDEMON_PAIN3
{SPR_BRAK, 18, 1, {A_Repeat}, 1, S_CYBRAKDEMON_DIE1, S_CYBRAKDEMON_DIE2}, // S_CYBRAKDEMON_DIE1
- {SPR_BRAK, 18, 2, {A_BossScream}, 0, MT_SONIC3KBOSSEXPLODE, S_CYBRAKDEMON_DIE3}, // S_CYBRAKDEMON_DIE2
+ {SPR_BRAK, 18, 2, {A_BossScream}, 0, 0, S_CYBRAKDEMON_DIE3}, // S_CYBRAKDEMON_DIE2
{SPR_BRAK, 18, 0, {A_Repeat}, 52, S_CYBRAKDEMON_DIE2, S_CYBRAKDEMON_DIE4}, // S_CYBRAKDEMON_DIE3
{SPR_BRAK, 13, 14, {A_PlaySound}, sfx_bedie2, 0, S_CYBRAKDEMON_DIE5}, // S_CYBRAKDEMON_DIE4
{SPR_BRAK, 14, 7, {NULL}, 0, 0, S_CYBRAKDEMON_DIE6}, // S_CYBRAKDEMON_DIE5
@@ -1737,7 +1680,7 @@ state_t states[NUMSTATES] =
{SPR_NULL, 0, 1, {A_SetFuse}, TICRATE, 0, S_CYBRAKDEMONVILEEXPLOSION2}, //S_CYBRAKDEMONVILEEXPLOSION1,
{SPR_NULL, 0, 0, {A_ScoreRise}, 0, 0, S_CYBRAKDEMONVILEEXPLOSION3}, //S_CYBRAKDEMONVILEEXPLOSION2,
- {SPR_NULL, 0, 1, {A_BossScream}, 0, MT_SONIC3KBOSSEXPLODE, S_CYBRAKDEMONVILEEXPLOSION1}, //S_CYBRAKDEMONVILEEXPLOSION3,
+ {SPR_NULL, 0, 1, {A_BossScream}, 0, 0, S_CYBRAKDEMONVILEEXPLOSION1}, //S_CYBRAKDEMONVILEEXPLOSION3,
// Metal Sonic
{SPR_METL, 0, 35, {NULL}, 0, 0, S_METALSONIC_WAIT1}, // S_METALSONIC_STAND
@@ -1766,27 +1709,15 @@ state_t states[NUMSTATES] =
{SPR_METL, 16, -1, {NULL}, 0, 0, S_NULL}, // S_METALSONIC_BADBOUNCE
{SPR_METL, 13, -1, {NULL}, 0, 0, S_METALSONIC_GATHER},// S_METALSONIC_SHOOT
{SPR_METL, 11, 40, {A_Pain}, 0, 0, S_METALSONIC_FLOAT}, // S_METALSONIC_PAIN
- {SPR_METL, 13, 8, {A_Fall}, 0, 0, S_METALSONIC_DEATH2},// S_METALSONIC_DEATH1
- {SPR_METL, 13, 8, {A_BossScream}, 0, 0, S_METALSONIC_DEATH3},// S_METALSONIC_DEATH2
- {SPR_METL, 13, 0, {A_Repeat}, 11, S_METALSONIC_DEATH2, S_METALSONIC_DEATH4}, // S_METALSONIC_DEATH3
+ {SPR_METL, 13, 2, {A_Fall}, 0, 0, S_METALSONIC_DEATH2},// S_METALSONIC_DEATH1
+ {SPR_METL, 13, 4, {A_BossScream}, 0, 0, S_METALSONIC_DEATH3},// S_METALSONIC_DEATH2
+ {SPR_METL, 13, 0, {A_Repeat}, 17, S_METALSONIC_DEATH2, S_METALSONIC_DEATH4}, // S_METALSONIC_DEATH3
{SPR_METL, 13, -1, {A_BossDeath}, 0, 0, S_NULL}, // S_METALSONIC_DEATH4
- {SPR_METL, 11, 4, {NULL}, 0, 0, S_METALSONIC_FLEE2}, // S_METALSONIC_FLEE1
- {SPR_METL, 11, 4, {A_BossScream}, 0, 0, S_METALSONIC_FLEE3}, // S_METALSONIC_FLEE2
- {SPR_METL, 11, 4, {NULL}, 0, 0, S_METALSONIC_FLEE4}, // S_METALSONIC_FLEE3
- {SPR_METL, 11, 4, {NULL}, 0, 0, S_METALSONIC_FLEE1}, // S_METALSONIC_FLEE4
-
- {SPR_MSCF, FF_FULLBRIGHT|FF_TRANS30| 0, 1, {NULL}, 0, 0, S_MSSHIELD_F2}, // S_MSSHIELD_F1
- {SPR_MSCF, FF_FULLBRIGHT|FF_TRANS30| 1, 1, {NULL}, 0, 0, S_MSSHIELD_F3}, // S_MSSHIELD_F2
- {SPR_MSCF, FF_FULLBRIGHT|FF_TRANS30| 2, 1, {NULL}, 0, 0, S_MSSHIELD_F4}, // S_MSSHIELD_F3
- {SPR_MSCF, FF_FULLBRIGHT|FF_TRANS30| 3, 1, {NULL}, 0, 0, S_MSSHIELD_F5}, // S_MSSHIELD_F4
- {SPR_MSCF, FF_FULLBRIGHT|FF_TRANS30| 4, 1, {NULL}, 0, 0, S_MSSHIELD_F6}, // S_MSSHIELD_F5
- {SPR_MSCF, FF_FULLBRIGHT|FF_TRANS30| 5, 1, {NULL}, 0, 0, S_MSSHIELD_F7}, // S_MSSHIELD_F6
- {SPR_MSCF, FF_FULLBRIGHT|FF_TRANS30| 6, 1, {NULL}, 0, 0, S_MSSHIELD_F8}, // S_MSSHIELD_F7
- {SPR_MSCF, FF_FULLBRIGHT|FF_TRANS30| 7, 1, {NULL}, 0, 0, S_MSSHIELD_F9}, // S_MSSHIELD_F8
- {SPR_MSCF, FF_FULLBRIGHT|FF_TRANS30| 8, 1, {NULL}, 0, 0, S_MSSHIELD_F10}, // S_MSSHIELD_F9
- {SPR_MSCF, FF_FULLBRIGHT|FF_TRANS30| 9, 1, {NULL}, 0, 0, S_MSSHIELD_F11}, // S_MSSHIELD_F10
- {SPR_MSCF, FF_FULLBRIGHT|FF_TRANS30|10, 1, {NULL}, 0, 0, S_MSSHIELD_F12}, // S_MSSHIELD_F11
- {SPR_MSCF, FF_FULLBRIGHT|FF_TRANS30|11, 1, {NULL}, 0, 0, S_MSSHIELD_F1}, // S_MSSHIELD_F12
+ {SPR_METL, 11, 1, {A_BossScream}, 0, 0, S_METALSONIC_FLEE2}, // S_METALSONIC_FLEE1
+ {SPR_METL, 11, 7, {NULL}, 0, 0, S_METALSONIC_FLEE1}, // S_METALSONIC_FLEE2
+
+ {SPR_MSCF, FF_FULLBRIGHT|FF_TRANS30|FF_ANIMATE, -1, {NULL}, 11, 1, S_NULL}, // S_MSSHIELD_F1
+ {SPR_MSCF, FF_FULLBRIGHT|FF_ANIMATE|12, -1, {NULL}, 8, 2, S_NULL}, // S_MSSHIELD_F2
// Ring
{SPR_RING, FF_ANIMATE|FF_GLOBALANIM, -1, {NULL}, 23, 1, S_RING}, // S_RING
@@ -3736,8 +3667,8 @@ state_t states[NUMSTATES] =
{SPR_HIVE, 2, 2, {NULL}, 0, 0, S_HIVEELEMENTAL_DORMANT}, // S_HIVEELEMENTAL_SHOOT2
{SPR_HIVE, 0, 5, {A_ParentTriesToSleep}, S_HIVEELEMENTAL_PREPARE1, 0, S_HIVEELEMENTAL_DORMANT}, // S_HIVEELEMENTAL_DORMANT
{SPR_HIVE, 3, 35, {A_Pain}, 0, 0, S_HIVEELEMENTAL_LOOK}, // S_HIVEELEMENTAL_PAIN
- {SPR_HIVE, 3, 2, {A_BossScream}, 1, MT_SONIC3KBOSSEXPLODE, S_HIVEELEMENTAL_DIE2}, // S_HIVEELEMENTAL_DIE1
- {SPR_NULL, 0, 2, {A_BossScream}, 1, MT_SONIC3KBOSSEXPLODE, S_HIVEELEMENTAL_DIE3}, // S_HIVEELEMENTAL_DIE2
+ {SPR_HIVE, 3, 2, {A_BossScream}, 1, 0, S_HIVEELEMENTAL_DIE2}, // S_HIVEELEMENTAL_DIE1
+ {SPR_NULL, 0, 2, {A_BossScream}, 1, 0, S_HIVEELEMENTAL_DIE3}, // S_HIVEELEMENTAL_DIE2
{SPR_NULL, 0, 0, {A_Repeat}, 7, S_HIVEELEMENTAL_DIE1, S_XPLD_FLICKY}, // S_HIVEELEMENTAL_DIE3
{SPR_BUMB, 1, 10, {NULL}, 0, 0, S_BUMBLEBORE_LOOK1}, // S_BUMBLEBORE_SPAWN
@@ -4635,7 +4566,7 @@ mobjinfo_t mobjinfo[NUMMOBJTYPES] =
S_FACESTABBER_CHARGE1, // missilestate
S_FACESTABBER_DIE1, // deathstate
S_NULL, // xdeathstate
- sfx_cybdth, // deathsound
+ sfx_s3kb4, // deathsound
3, // speed
32*FRACUNIT, // radius
72*FRACUNIT, // height
@@ -5187,6 +5118,33 @@ mobjinfo_t mobjinfo[NUMMOBJTYPES] =
S_NULL // raisestate
},
+ { // MT_BOSSJUNK
+ -1, // doomednum
+ S_BOSSEGLZ1, // spawnstate
+ 1, // spawnhealth
+ S_NULL, // seestate
+ sfx_None, // seesound
+ 8, // reactiontime
+ sfx_None, // attacksound
+ S_NULL, // painstate
+ 0, // painchance
+ sfx_None, // painsound
+ S_NULL, // meleestate
+ S_NULL, // missilestate
+ S_NULL, // deathstate
+ S_NULL, // xdeathstate
+ sfx_None, // deathsound
+ 0, // speed
+ 8*FRACUNIT, // radius
+ 64*FRACUNIT, // height
+ 2, // display offset
+ 100, // mass
+ 1, // damage
+ sfx_None, // activesound
+ MF_SCENERY|MF_NOBLOCKMAP|MF_NOCLIPHEIGHT, // flags
+ S_NULL // raisestate
+ },
+
{ // MT_EGGMOBILE
200, // doomednum
S_EGGMOBILE_STND, // spawnstate
@@ -5202,7 +5160,7 @@ mobjinfo_t mobjinfo[NUMMOBJTYPES] =
S_EGGMOBILE_RATK1, // missilestate
S_EGGMOBILE_DIE1, // deathstate
S_EGGMOBILE_FLEE1, // xdeathstate
- sfx_cybdth, // deathsound
+ sfx_s3kb4, // deathsound
4, // speed
24*FRACUNIT, // radius
76*FRACUNIT, // height
@@ -5337,7 +5295,7 @@ mobjinfo_t mobjinfo[NUMMOBJTYPES] =
(statenum_t)MT_EGGMOBILE2_POGO, // missilestate
S_EGGMOBILE2_DIE1, // deathstate
S_EGGMOBILE2_FLEE1,// xdeathstate
- sfx_cybdth, // deathsound
+ sfx_s3kb4, // deathsound
2*FRACUNIT, // speed
24*FRACUNIT, // radius
76*FRACUNIT, // height
@@ -5376,87 +5334,6 @@ mobjinfo_t mobjinfo[NUMMOBJTYPES] =
S_EGGMOBILE2_POGO5 // raisestate
},
- { // MT_BOSSTANK1
- -1, // doomednum
- S_BOSSTANK1, // spawnstate
- 1, // spawnhealth
- S_NULL, // seestate
- sfx_None, // seesound
- 8, // reactiontime
- sfx_None, // attacksound
- S_NULL, // painstate
- 0, // painchance
- sfx_None, // painsound
- S_NULL, // meleestate
- S_NULL, // missilestate
- S_NULL, // deathstate
- S_NULL, // xdeathstate
- sfx_None, // deathsound
- 0, // speed
- 8*FRACUNIT, // radius
- 64*FRACUNIT, // height
- 0, // display offset
- 100, // mass
- 1, // damage
- sfx_None, // activesound
- MF_NOBLOCKMAP, // flags
- S_NULL // raisestate
- },
-
- { // MT_BOSSTANK2
- -1, // doomednum
- S_BOSSTANK2, // spawnstate
- 1, // spawnhealth
- S_NULL, // seestate
- sfx_None, // seesound
- 8, // reactiontime
- sfx_None, // attacksound
- S_NULL, // painstate
- 0, // painchance
- sfx_None, // painsound
- S_NULL, // meleestate
- S_NULL, // missilestate
- S_NULL, // deathstate
- S_NULL, // xdeathstate
- sfx_None, // deathsound
- 0, // speed
- 8*FRACUNIT, // radius
- 64*FRACUNIT, // height
- 0, // display offset
- 100, // mass
- 1, // damage
- sfx_None, // activesound
- MF_NOBLOCKMAP, // flags
- S_NULL // raisestate
- },
-
- { // MT_BOSSSPIGOT
- -1, // doomednum
- S_BOSSSPIGOT, // spawnstate
- 1, // spawnhealth
- S_NULL, // seestate
- sfx_None, // seesound
- 8, // reactiontime
- sfx_None, // attacksound
- S_NULL, // painstate
- 0, // painchance
- sfx_None, // painsound
- S_NULL, // meleestate
- S_NULL, // missilestate
- S_NULL, // deathstate
- S_NULL, // xdeathstate
- sfx_None, // deathsound
- 0, // speed
- 8*FRACUNIT, // radius
- 24*FRACUNIT, // height
- 0, // display offset
- 100, // mass
- 1, // damage
- sfx_None, // activesound
- MF_NOBLOCKMAP, // flags
- S_NULL // raisestate
- },
-
{ // MT_GOOP
-1, // doomednum
S_GOOP1, // spawnstate
@@ -5520,13 +5397,13 @@ mobjinfo_t mobjinfo[NUMMOBJTYPES] =
0, // reactiontime
sfx_None, // attacksound
S_EGGMOBILE3_PAIN, // painstate
- MT_PROPELLER, // painchance
+ MT_NULL, // painchance
sfx_dmpain, // painsound
S_NULL, // meleestate
- S_EGGMOBILE3_LAUGH1,// missilestate
+ S_EGGMOBILE3_SHOCK, // missilestate
S_EGGMOBILE3_DIE1, // deathstate
S_EGGMOBILE3_FLEE1, // xdeathstate
- sfx_cybdth, // deathsound
+ sfx_s3kb4, // deathsound
8*FRACUNIT, // speed
32*FRACUNIT, // radius
116*FRACUNIT, // height
@@ -5535,34 +5412,7 @@ mobjinfo_t mobjinfo[NUMMOBJTYPES] =
3, // damage
sfx_telept, // activesound
MF_SPECIAL|MF_SHOOTABLE|MF_NOGRAVITY|MF_BOSS|MF_NOCLIPHEIGHT, // flags
- S_EGGMOBILE3_LAUGH20 // raisestate
- },
-
- { // MT_PROPELLER
- -1, // doomednum
- S_PROPELLER1, // spawnstate
- 1000, // spawnhealth
- S_NULL, // seestate
- sfx_None, // seesound
- 8, // reactiontime
- sfx_None, // attacksound
- S_NULL, // painstate
- 0, // painchance
- sfx_None, // painsound
- S_NULL, // meleestate
- S_NULL, // missilestate
- S_NULL, // deathstate
- S_NULL, // xdeathstate
- sfx_None, // deathsound
- 1, // speed
- 4*FRACUNIT, // radius
- 4*FRACUNIT, // height
- 0, // display offset
- 4, // mass
- 0, // damage
- sfx_None, // activesound
- MF_NOBLOCKMAP|MF_NOGRAVITY|MF_NOCLIP|MF_NOCLIPHEIGHT, // flags
- S_NULL // raisestate
+ S_EGGMOBILE3_ROFL // raisestate
},
{ // MT_FAKEMOBILE
@@ -5574,7 +5424,7 @@ mobjinfo_t mobjinfo[NUMMOBJTYPES] =
0, // reactiontime
sfx_None, // attacksound
S_NULL, // painstate
- MT_PROPELLER, // painchance
+ MT_NULL, // painchance
sfx_s3k7b, // painsound
S_NULL, // meleestate
S_FAKEMOBILE_ATK1, // missilestate
@@ -5634,7 +5484,7 @@ mobjinfo_t mobjinfo[NUMMOBJTYPES] =
S_EGGMOBILE4_RATK1,// missilestate
S_EGGMOBILE4_DIE1, // deathstate
S_EGGMOBILE4_FLEE1,// xdeathstate
- sfx_cybdth, // deathsound
+ sfx_s3kb4, // deathsound
0, // speed
24*FRACUNIT, // radius
76*FRACUNIT, // height
@@ -6363,7 +6213,7 @@ mobjinfo_t mobjinfo[NUMMOBJTYPES] =
S_METALSONIC_SHOOT, // missilestate
S_METALSONIC_DEATH1,// deathstate
S_METALSONIC_FLEE1, // xdeathstate
- sfx_s3k6e, // deathsound
+ sfx_s3kb4, // deathsound
MT_ENERGYBALL, // speed
16*FRACUNIT, // radius
48*FRACUNIT, // height
@@ -6550,7 +6400,7 @@ mobjinfo_t mobjinfo[NUMMOBJTYPES] =
sfx_None, // painsound
S_NULL, // meleestate
S_NULL, // missilestate
- S_BOSSEXPLODE, // deathstate
+ S_SONIC3KBOSSEXPLOSION1, // deathstate
S_NULL, // xdeathstate
sfx_cybdth, // deathsound
38*FRACUNIT, // speed
@@ -9254,7 +9104,7 @@ mobjinfo_t mobjinfo[NUMMOBJTYPES] =
0, // mass
20, // damage
sfx_None, // activesound
- MF_PAIN|MF_NOGRAVITY|MF_NOCLIPHEIGHT, // flags
+ MF_PAIN|MF_NOGRAVITY|MF_NOCLIPHEIGHT|MF_NOCLIP, // flags
S_NULL // raisestate
},
@@ -18979,7 +18829,7 @@ mobjinfo_t mobjinfo[NUMMOBJTYPES] =
S_NULL, // missilestate
S_HIVEELEMENTAL_DIE1, // deathstate
S_NULL, // xdeathstate
- sfx_cybdth, // deathsound
+ sfx_s3kb4, // deathsound
6*FRACUNIT, // speed
30*FRACUNIT, // radius
80*FRACUNIT, // height
diff --git a/src/info.h b/src/info.h
index bb27ac3e3b299681495fbd4f8bfad07324be61e9..a9d4bdde00c44efd28b97a8fd905d797271cc86f 100644
--- a/src/info.h
+++ b/src/info.h
@@ -319,18 +319,17 @@ typedef enum sprite
SPR_JETF, // Boss jet fumes
// Boss 1 (Greenflower)
- SPR_EGGM,
+ SPR_EGGM, // Boss 1
+ SPR_EGLZ, // Boss 1 Junk
// Boss 2 (Techno Hill)
SPR_EGGN, // Boss 2
- SPR_TNKA, // Boss 2 Tank 1
- SPR_TNKB, // Boss 2 Tank 2
- SPR_SPNK, // Boss 2 Spigot
+ SPR_TANK, // Boss 2 Junk
SPR_GOOP, // Boss 2 Goop
// Boss 3 (Deep Sea)
SPR_EGGO, // Boss 3
- SPR_PRPL, // Boss 3 Propeller
+ SPR_SEBH, // Boss 3 Junk
SPR_FAKE, // Boss 3 Fakemobile
// Boss 4 (Castle Eggman)
@@ -1333,10 +1332,10 @@ typedef enum state
S_SONIC3KBOSSEXPLOSION6,
S_JETFUME1,
- S_JETFUME2,
// Boss 1
S_EGGMOBILE_STND,
+ S_EGGMOBILE_ROFL,
S_EGGMOBILE_LATK1,
S_EGGMOBILE_LATK2,
S_EGGMOBILE_LATK3,
@@ -1346,7 +1345,6 @@ typedef enum state
S_EGGMOBILE_LATK7,
S_EGGMOBILE_LATK8,
S_EGGMOBILE_LATK9,
- S_EGGMOBILE_LATK10,
S_EGGMOBILE_RATK1,
S_EGGMOBILE_RATK2,
S_EGGMOBILE_RATK3,
@@ -1356,7 +1354,6 @@ typedef enum state
S_EGGMOBILE_RATK7,
S_EGGMOBILE_RATK8,
S_EGGMOBILE_RATK9,
- S_EGGMOBILE_RATK10,
S_EGGMOBILE_PANIC1,
S_EGGMOBILE_PANIC2,
S_EGGMOBILE_PANIC3,
@@ -1367,27 +1364,25 @@ typedef enum state
S_EGGMOBILE_PANIC8,
S_EGGMOBILE_PANIC9,
S_EGGMOBILE_PANIC10,
+ S_EGGMOBILE_PANIC11,
+ S_EGGMOBILE_PANIC12,
+ S_EGGMOBILE_PANIC13,
+ S_EGGMOBILE_PANIC14,
+ S_EGGMOBILE_PANIC15,
S_EGGMOBILE_PAIN,
S_EGGMOBILE_PAIN2,
S_EGGMOBILE_DIE1,
S_EGGMOBILE_DIE2,
S_EGGMOBILE_DIE3,
S_EGGMOBILE_DIE4,
- S_EGGMOBILE_DIE5,
- S_EGGMOBILE_DIE6,
- S_EGGMOBILE_DIE7,
- S_EGGMOBILE_DIE8,
- S_EGGMOBILE_DIE9,
- S_EGGMOBILE_DIE10,
- S_EGGMOBILE_DIE11,
- S_EGGMOBILE_DIE12,
- S_EGGMOBILE_DIE13,
- S_EGGMOBILE_DIE14,
S_EGGMOBILE_FLEE1,
S_EGGMOBILE_FLEE2,
S_EGGMOBILE_BALL,
S_EGGMOBILE_TARGET,
+ S_BOSSEGLZ1,
+ S_BOSSEGLZ2,
+
// Boss 2
S_EGGMOBILE2_STND,
S_EGGMOBILE2_POGO1,
@@ -1403,16 +1398,6 @@ typedef enum state
S_EGGMOBILE2_DIE2,
S_EGGMOBILE2_DIE3,
S_EGGMOBILE2_DIE4,
- S_EGGMOBILE2_DIE5,
- S_EGGMOBILE2_DIE6,
- S_EGGMOBILE2_DIE7,
- S_EGGMOBILE2_DIE8,
- S_EGGMOBILE2_DIE9,
- S_EGGMOBILE2_DIE10,
- S_EGGMOBILE2_DIE11,
- S_EGGMOBILE2_DIE12,
- S_EGGMOBILE2_DIE13,
- S_EGGMOBILE2_DIE14,
S_EGGMOBILE2_FLEE1,
S_EGGMOBILE2_FLEE2,
@@ -1428,11 +1413,7 @@ typedef enum state
// Boss 3
S_EGGMOBILE3_STND,
- S_EGGMOBILE3_LAUGH1,
- S_EGGMOBILE3_LAUGH2,
- S_EGGMOBILE3_LAUGH3,
- S_EGGMOBILE3_LAUGH4,
- S_EGGMOBILE3_LAUGH5,
+ S_EGGMOBILE3_SHOCK,
S_EGGMOBILE3_ATK1,
S_EGGMOBILE3_ATK2,
S_EGGMOBILE3_ATK3A,
@@ -1441,49 +1422,16 @@ typedef enum state
S_EGGMOBILE3_ATK3D,
S_EGGMOBILE3_ATK4,
S_EGGMOBILE3_ATK5,
- S_EGGMOBILE3_LAUGH6,
- S_EGGMOBILE3_LAUGH7,
- S_EGGMOBILE3_LAUGH8,
- S_EGGMOBILE3_LAUGH9,
- S_EGGMOBILE3_LAUGH10,
- S_EGGMOBILE3_LAUGH11,
- S_EGGMOBILE3_LAUGH12,
- S_EGGMOBILE3_LAUGH13,
- S_EGGMOBILE3_LAUGH14,
- S_EGGMOBILE3_LAUGH15,
- S_EGGMOBILE3_LAUGH16,
- S_EGGMOBILE3_LAUGH17,
- S_EGGMOBILE3_LAUGH18,
- S_EGGMOBILE3_LAUGH19,
- S_EGGMOBILE3_LAUGH20,
+ S_EGGMOBILE3_ROFL,
S_EGGMOBILE3_PAIN,
S_EGGMOBILE3_PAIN2,
S_EGGMOBILE3_DIE1,
S_EGGMOBILE3_DIE2,
S_EGGMOBILE3_DIE3,
S_EGGMOBILE3_DIE4,
- S_EGGMOBILE3_DIE5,
- S_EGGMOBILE3_DIE6,
- S_EGGMOBILE3_DIE7,
- S_EGGMOBILE3_DIE8,
- S_EGGMOBILE3_DIE9,
- S_EGGMOBILE3_DIE10,
- S_EGGMOBILE3_DIE11,
- S_EGGMOBILE3_DIE12,
- S_EGGMOBILE3_DIE13,
- S_EGGMOBILE3_DIE14,
S_EGGMOBILE3_FLEE1,
S_EGGMOBILE3_FLEE2,
- // Boss 3 Propeller
- S_PROPELLER1,
- S_PROPELLER2,
- S_PROPELLER3,
- S_PROPELLER4,
- S_PROPELLER5,
- S_PROPELLER6,
- S_PROPELLER7,
-
// Boss 3 Pinch
S_FAKEMOBILE_INIT,
S_FAKEMOBILE,
@@ -1496,6 +1444,9 @@ typedef enum state
S_FAKEMOBILE_DIE1,
S_FAKEMOBILE_DIE2,
+ S_BOSSSEBH1,
+ S_BOSSSEBH2,
+
// Boss 4
S_EGGMOBILE4_STND,
S_EGGMOBILE4_LATK1,
@@ -1518,16 +1469,6 @@ typedef enum state
S_EGGMOBILE4_DIE2,
S_EGGMOBILE4_DIE3,
S_EGGMOBILE4_DIE4,
- S_EGGMOBILE4_DIE5,
- S_EGGMOBILE4_DIE6,
- S_EGGMOBILE4_DIE7,
- S_EGGMOBILE4_DIE8,
- S_EGGMOBILE4_DIE9,
- S_EGGMOBILE4_DIE10,
- S_EGGMOBILE4_DIE11,
- S_EGGMOBILE4_DIE12,
- S_EGGMOBILE4_DIE13,
- S_EGGMOBILE4_DIE14,
S_EGGMOBILE4_FLEE1,
S_EGGMOBILE4_FLEE2,
S_EGGMOBILE4_MACE,
@@ -1583,6 +1524,7 @@ typedef enum state
S_FANG_FIRE3,
S_FANG_FIRE4,
S_FANG_FIREREPEAT,
+ S_FANG_LOBSHOT0,
S_FANG_LOBSHOT1,
S_FANG_LOBSHOT2,
S_FANG_WAIT1,
@@ -1599,6 +1541,7 @@ typedef enum state
S_FANG_PINCHFALL2,
S_FANG_PINCHSKID1,
S_FANG_PINCHSKID2,
+ S_FANG_PINCHLOBSHOT0,
S_FANG_PINCHLOBSHOT1,
S_FANG_PINCHLOBSHOT2,
S_FANG_PINCHLOBSHOT3,
@@ -1904,21 +1847,9 @@ typedef enum state
S_METALSONIC_DEATH4,
S_METALSONIC_FLEE1,
S_METALSONIC_FLEE2,
- S_METALSONIC_FLEE3,
- S_METALSONIC_FLEE4,
S_MSSHIELD_F1,
S_MSSHIELD_F2,
- S_MSSHIELD_F3,
- S_MSSHIELD_F4,
- S_MSSHIELD_F5,
- S_MSSHIELD_F6,
- S_MSSHIELD_F7,
- S_MSSHIELD_F8,
- S_MSSHIELD_F9,
- S_MSSHIELD_F10,
- S_MSSHIELD_F11,
- S_MSSHIELD_F12,
// Ring
S_RING,
@@ -4024,6 +3955,7 @@ typedef enum mobj_type
MT_EGGTRAP,
MT_BOSS3WAYPOINT,
MT_BOSS9GATHERPOINT,
+ MT_BOSSJUNK,
// Boss 1
MT_EGGMOBILE,
@@ -4035,15 +3967,11 @@ typedef enum mobj_type
// Boss 2
MT_EGGMOBILE2,
MT_EGGMOBILE2_POGO,
- MT_BOSSTANK1,
- MT_BOSSTANK2,
- MT_BOSSSPIGOT,
MT_GOOP,
MT_GOOPTRAIL,
// Boss 3
MT_EGGMOBILE3,
- MT_PROPELLER,
MT_FAKEMOBILE,
MT_SHOCK,
diff --git a/src/lua_consolelib.c b/src/lua_consolelib.c
index c6856b426224b17f29f7fd26b122865ad0d51b51..9e74dac76ce05b746e88e3bb7081b5219d7dfc35 100644
--- a/src/lua_consolelib.c
+++ b/src/lua_consolelib.c
@@ -308,6 +308,8 @@ static int lib_cvRegisterVar(lua_State *L)
#define FIELDERROR(f, e) luaL_error(L, "bad value for " LUA_QL(f) " in table passed to " LUA_QL("CV_RegisterVar") " (%s)", e);
#define TYPEERROR(f, t) FIELDERROR(f, va("%s expected, got %s", lua_typename(L, t), luaL_typename(L, -1)))
+ memset(cvar, 0x00, sizeof(consvar_t)); // zero everything by default
+
lua_pushnil(L);
while (lua_next(L, 1)) {
// stack: cvar table, cvar userdata, key/index, value
@@ -395,6 +397,13 @@ static int lib_cvRegisterVar(lua_State *L)
#undef FIELDERROR
#undef TYPEERROR
+ if (!cvar->name)
+ return luaL_error(L, M_GetText("Variable has no name!\n"));
+ if ((cvar->flags & CV_NOINIT) && !(cvar->flags & CV_CALL))
+ return luaL_error(L, M_GetText("Variable %s has CV_NOINIT without CV_CALL\n"), cvar->name);
+ if ((cvar->flags & CV_CALL) && !cvar->func)
+ return luaL_error(L, M_GetText("Variable %s has CV_CALL without a function\n"), cvar->name);
+
// stack: cvar table, cvar userdata
lua_getfield(L, LUA_REGISTRYINDEX, "CV_Vars");
I_Assert(lua_istable(L, 3));
diff --git a/src/lua_maplib.c b/src/lua_maplib.c
index 74b2599219bc203f39352632eb2c2985a04eb4e7..dbb69b7e26dd4129600a7915a7a8426a6cd23c54 100644
--- a/src/lua_maplib.c
+++ b/src/lua_maplib.c
@@ -2017,6 +2017,8 @@ static int mapheaderinfo_get(lua_State *L)
lua_pushinteger(L, header->muspostbosspos);
else if (fastcmp(field,"muspostbossfadein"))
lua_pushinteger(L, header->muspostbossfadein);
+ else if (fastcmp(field,"musforcereset"))
+ lua_pushinteger(L, header->musforcereset);
else if (fastcmp(field,"forcecharacter"))
lua_pushstring(L, header->forcecharacter);
else if (fastcmp(field,"weather"))
diff --git a/src/lua_mathlib.c b/src/lua_mathlib.c
index 1f0d6e2872d99cbec85b8aebfa6dbf13f0848ad4..4c5424577da6ae3591d6e7508742e1c6ecd8b7d6 100644
--- a/src/lua_mathlib.c
+++ b/src/lua_mathlib.c
@@ -173,15 +173,15 @@ static int lib_all7emeralds(lua_State *L)
return 1;
}
-// Whee, special Lua-exclusive function for making use of Color_Opposite[] without needing *2 or +1
-// Returns both color and frame numbers!
+// Whee, special Lua-exclusive function for making use of Color_Opposite[]
+// Returns both color and signpost shade numbers!
static int lib_coloropposite(lua_State *L)
{
UINT8 colornum = (UINT8)luaL_checkinteger(L, 1);
- if (colornum >= MAXSKINCOLORS)
- return luaL_error(L, "skincolor %d out of range (0 - %d).", colornum, MAXSKINCOLORS-1);
- lua_pushinteger(L, Color_Opposite[colornum*2]); // push color
- lua_pushinteger(L, Color_Opposite[colornum*2+1]); // push frame
+ if (!colornum || colornum >= MAXSKINCOLORS)
+ return luaL_error(L, "skincolor %d out of range (1 - %d).", colornum, MAXSKINCOLORS-1);
+ lua_pushinteger(L, Color_Opposite[colornum-1][0]); // push color
+ lua_pushinteger(L, Color_Opposite[colornum-1][1]); // push sign shade index, 0-15
return 2;
}
diff --git a/src/lua_playerlib.c b/src/lua_playerlib.c
index b7bdaa1be87a078974490fe569e171c15906b319..dd9959afbdf3300bc150438e2e5cedce2f40d298 100644
--- a/src/lua_playerlib.c
+++ b/src/lua_playerlib.c
@@ -136,6 +136,12 @@ static int player_get(lua_State *L)
lua_pushinteger(L, plr->currentweapon);
else if (fastcmp(field,"ringweapons"))
lua_pushinteger(L, plr->ringweapons);
+ else if (fastcmp(field,"ammoremoval"))
+ lua_pushinteger(L, plr->ammoremoval);
+ else if (fastcmp(field,"ammoremovaltimer"))
+ lua_pushinteger(L, plr->ammoremovaltimer);
+ else if (fastcmp(field,"ammoremovalweapon"))
+ lua_pushinteger(L, plr->ammoremovalweapon);
else if (fastcmp(field,"powers"))
LUA_PushUserdata(L, plr->powers, META_POWERS);
else if (fastcmp(field,"pflags"))
@@ -256,6 +262,8 @@ static int player_get(lua_State *L)
lua_pushinteger(L, plr->starposttime);
else if (fastcmp(field,"starpostangle"))
lua_pushangle(L, plr->starpostangle);
+ else if (fastcmp(field,"starpostscale"))
+ lua_pushfixed(L, plr->starpostscale);
else if (fastcmp(field,"angle_pos"))
lua_pushangle(L, plr->angle_pos);
else if (fastcmp(field,"old_angle_pos"))
@@ -428,6 +436,12 @@ static int player_set(lua_State *L)
plr->currentweapon = (INT32)luaL_checkinteger(L, 3);
else if (fastcmp(field,"ringweapons"))
plr->ringweapons = (INT32)luaL_checkinteger(L, 3);
+ else if (fastcmp(field,"ammoremoval"))
+ plr->ammoremoval = (UINT16)luaL_checkinteger(L, 3);
+ else if (fastcmp(field,"ammoremovaltimer"))
+ plr->ammoremovaltimer = (tic_t)luaL_checkinteger(L, 3);
+ else if (fastcmp(field,"ammoremovalweapon"))
+ plr->ammoremovalweapon = (INT32)luaL_checkinteger(L, 3);
else if (fastcmp(field,"powers"))
return NOSET;
else if (fastcmp(field,"pflags"))
@@ -558,6 +572,8 @@ static int player_set(lua_State *L)
plr->starposttime = (tic_t)luaL_checkinteger(L, 3);
else if (fastcmp(field,"starpostangle"))
plr->starpostangle = luaL_checkangle(L, 3);
+ else if (fastcmp(field,"starpostscale"))
+ plr->starpostscale = luaL_checkfixed(L, 3);
else if (fastcmp(field,"angle_pos"))
plr->angle_pos = luaL_checkangle(L, 3);
else if (fastcmp(field,"old_angle_pos"))
diff --git a/src/m_cheat.c b/src/m_cheat.c
index 29e8c8a0231425ea2440227d28ee7377b898e514..bb757839aeb140105b3d06f335a19691bffc2099 100644
--- a/src/m_cheat.c
+++ b/src/m_cheat.c
@@ -746,6 +746,18 @@ void Command_Weather_f(void)
P_SwitchWeather(atoi(COM_Argv(1)));
}
+void Command_Toggletwod_f(void)
+{
+ player_t *p = &players[consoleplayer];
+
+ REQUIRE_DEVMODE;
+ REQUIRE_INLEVEL;
+ REQUIRE_SINGLEPLAYER;
+
+ if (p->mo)
+ p->mo->flags2 ^= MF2_TWOD;
+}
+
#ifdef _DEBUG
// You never thought you needed this, did you? >=D
// Yes, this has the specific purpose of completely screwing you up
@@ -819,6 +831,12 @@ void Command_Savecheckpoint_f(void)
players[consoleplayer].starposty = players[consoleplayer].mo->y>>FRACBITS;
players[consoleplayer].starpostz = players[consoleplayer].mo->floorz>>FRACBITS;
players[consoleplayer].starpostangle = players[consoleplayer].mo->angle;
+ players[consoleplayer].starpostscale = players[consoleplayer].mo->destscale;
+ if (players[consoleplayer].mo->flags2 & MF2_OBJECTFLIP)
+ {
+ players[consoleplayer].starpostscale *= -1;
+ players[consoleplayer].starpostz += players[consoleplayer].mo->height;
+ }
CONS_Printf(M_GetText("Temporary checkpoint created at %d, %d, %d\n"), players[consoleplayer].starpostx, players[consoleplayer].starposty, players[consoleplayer].starpostz);
}
diff --git a/src/m_cheat.h b/src/m_cheat.h
index aa9b0bfebb9cea80853fd2a49b71c376bf5708a9..f5d59120b5ef825d8f2b8aed6310ad69db1abda4 100644
--- a/src/m_cheat.h
+++ b/src/m_cheat.h
@@ -64,6 +64,7 @@ void Command_Teleport_f(void);
void Command_RTeleport_f(void);
void Command_Skynum_f(void);
void Command_Weather_f(void);
+void Command_Toggletwod_f(void);
#ifdef _DEBUG
void Command_CauseCfail_f(void);
#endif
diff --git a/src/m_menu.c b/src/m_menu.c
index ca389a94dd8a56358ea9c2bebbf4b8ed6c4ea601..b32c0a65d84ed31e29978638f34b5e2746bb06a4 100644
--- a/src/m_menu.c
+++ b/src/m_menu.c
@@ -265,6 +265,7 @@ static void M_ServerOptions(INT32 choice);
#ifndef NONET
static void M_StartServerMenu(INT32 choice);
static void M_ConnectMenu(INT32 choice);
+static void M_ConnectMenuModChecks(INT32 choice);
static void M_Refresh(INT32 choice);
static void M_Connect(INT32 choice);
static void M_ChooseRoom(INT32 choice);
@@ -884,12 +885,12 @@ static menuitem_t MP_SplitServerMenu[] =
static menuitem_t MP_MainMenu[] =
{
- {IT_HEADER, NULL, "Host a game", NULL, 0},
- {IT_STRING|IT_CALL, NULL, "Internet/LAN...", M_StartServerMenu, 12},
- {IT_STRING|IT_CALL, NULL, "Splitscreen...", M_StartSplitServerMenu, 22},
- {IT_HEADER, NULL, "Join a game", NULL, 40},
- {IT_STRING|IT_CALL, NULL, "Server browser...", M_ConnectMenu, 52},
- {IT_STRING|IT_KEYHANDLER, NULL, "Specify IPv4 address:", M_HandleConnectIP, 62},
+ {IT_HEADER, NULL, "Join a game", NULL, 0},
+ {IT_STRING|IT_CALL, NULL, "Server browser...", M_ConnectMenuModChecks, 12},
+ {IT_STRING|IT_KEYHANDLER, NULL, "Specify IPv4 address:", M_HandleConnectIP, 22},
+ {IT_HEADER, NULL, "Host a game", NULL, 54},
+ {IT_STRING|IT_CALL, NULL, "Internet/LAN...", M_StartServerMenu, 66},
+ {IT_STRING|IT_CALL, NULL, "Splitscreen...", M_StartSplitServerMenu, 76},
{IT_HEADER, NULL, "Player setup", NULL, 94},
{IT_STRING|IT_CALL, NULL, "Player 1...", M_SetupMultiPlayer, 106},
{IT_STRING|IT_CALL, NULL, "Player 2... ", M_SetupMultiPlayer2, 116},
@@ -948,7 +949,7 @@ enum
static menuitem_t MP_RoomMenu[] =
{
- {IT_STRING | IT_CALL, NULL, "<Offline Mode>", M_ChooseRoom, 9},
+ {IT_STRING | IT_CALL, NULL, "<Unlisted Mode>", M_ChooseRoom, 9},
{IT_DISABLED, NULL, "", M_ChooseRoom, 18},
{IT_DISABLED, NULL, "", M_ChooseRoom, 27},
{IT_DISABLED, NULL, "", M_ChooseRoom, 36},
@@ -1322,6 +1323,12 @@ static menuitem_t OP_SoundOptionsMenu[] =
#define OPENMPT_MENUOFFSET 0
#endif
+#ifdef HAVE_MIXERX
+#define MIXERX_MENUOFFSET 81
+#else
+#define MIXERX_MENUOFFSET 0
+#endif
+
static menuitem_t OP_SoundAdvancedMenu[] =
{
#ifdef HAVE_OPENMPT
@@ -1333,12 +1340,15 @@ static menuitem_t OP_SoundAdvancedMenu[] =
{IT_HEADER, NULL, "MIDI Settings", NULL, OPENMPT_MENUOFFSET+10},
{IT_STRING | IT_CVAR, NULL, "MIDI Player", &cv_midiplayer, OPENMPT_MENUOFFSET+22},
{IT_STRING | IT_CVAR | IT_CV_STRING, NULL, "FluidSynth Sound Font File", &cv_midisoundfontpath, OPENMPT_MENUOFFSET+34},
- {IT_STRING | IT_CVAR | IT_CV_STRING, NULL, "TiMidity++ Config Folder", &cv_miditimiditypath, OPENMPT_MENUOFFSET+61}
+ {IT_STRING | IT_CVAR | IT_CV_STRING, NULL, "TiMidity++ Config Folder", &cv_miditimiditypath, OPENMPT_MENUOFFSET+61},
#endif
+
+ {IT_HEADER, NULL, "Miscellaneous", NULL, OPENMPT_MENUOFFSET+MIXERX_MENUOFFSET+10},
+ {IT_STRING | IT_CVAR, NULL, "Let Levels Force Reset Music", &cv_resetmusicbyheader, OPENMPT_MENUOFFSET+MIXERX_MENUOFFSET+22},
};
#undef OPENMPT_MENUOFFSET
-
+#undef MIXERX_MENUOFFSET
#endif
static menuitem_t OP_DataOptionsMenu[] =
@@ -5603,7 +5613,7 @@ static boolean M_AddonsRefresh(void)
{
S_StartSound(NULL, sfx_lose);
if (refreshdirmenu & REFRESHDIR_MAX)
- message = va("%c%s\x80\nMaximum number of add-ons reached.\nA file could not be loaded.\nIf you want to play with this add-on, restart the game to clear existing ones.\n\n(Press a key)\n", ('\x80' + (highlightflags>>V_CHARCOLORSHIFT)), refreshdirname);
+ message = va("%c%s\x80\nMaximum number of add-ons reached.\nA file could not be loaded.\nIf you wish to play with this add-on, restart the game to clear existing ones.\n\n(Press a key)\n", ('\x80' + (highlightflags>>V_CHARCOLORSHIFT)), refreshdirname);
else
message = va("%c%s\x80\nA file was not loaded.\nCheck the console log for more information.\n\n(Press a key)\n", ('\x80' + (highlightflags>>V_CHARCOLORSHIFT)), refreshdirname);
}
@@ -6980,8 +6990,8 @@ static void M_DrawLoadGameData(void)
col = 134;
else
{
- col = (charskin->prefcolor - 1)*2;
- col = Color_Index[Color_Opposite[col]-1][Color_Opposite[col+1]];
+ col = charskin->prefcolor - 1;
+ col = Color_Index[Color_Opposite[col][0]-1][Color_Opposite[col][1]];
}
V_DrawFill(x+6, y+64, 72, 50, col);
@@ -8479,8 +8489,8 @@ static void M_NightsAttack(INT32 choice)
M_PatchSkinNameTable();
G_SetGamestate(GS_TIMEATTACK); // do this before M_SetupNextMenu so that menu meta state knows that we're switching
- M_SetupNextMenu(&SP_NightsAttackDef);
titlemapinaction = TITLEMAP_OFF; // Nope don't give us HOMs please
+ M_SetupNextMenu(&SP_NightsAttackDef);
if (!M_CanShowLevelInList(cv_nextmap.value-1, -1) && levelselect.rows[0].maplist[0])
CV_SetValue(&cv_nextmap, levelselect.rows[0].maplist[0]);
else
@@ -8872,7 +8882,7 @@ static void M_DrawConnectMenu(void)
// Room name
if (ms_RoomId < 0)
V_DrawRightAlignedString(BASEVIDWIDTH - currentMenu->x, currentMenu->y + MP_ConnectMenu[mp_connect_room].alphaKey,
- V_YELLOWMAP, (itemOn == mp_connect_room) ? "<Select to change>" : "<Offline Mode>");
+ V_YELLOWMAP, (itemOn == mp_connect_room) ? "<Select to change>" : "<Unlisted Mode>");
else
V_DrawRightAlignedString(BASEVIDWIDTH - currentMenu->x, currentMenu->y + MP_ConnectMenu[mp_connect_room].alphaKey,
V_YELLOWMAP, room_list[menuRoomIndex].name);
@@ -9022,11 +9032,32 @@ static void M_ConnectMenu(INT32 choice)
// first page of servers
serverlistpage = 0;
- M_SetupNextMenu(&MP_ConnectDef);
+ if (ms_RoomId < 0)
+ {
+ M_RoomMenu(0); // Select a room instead of staring at an empty list
+ // This prevents us from returning to the modified game alert.
+ currentMenu->prevMenu = &MP_MainDef;
+ }
+ else
+ M_SetupNextMenu(&MP_ConnectDef);
itemOn = 0;
M_Refresh(0);
}
+static void M_ConnectMenuModChecks(INT32 choice)
+{
+ (void)choice;
+ // okay never mind we want to COMMUNICATE to the player pre-emptively instead of letting them try and then get confused when it doesn't work
+
+ if (modifiedgame)
+ {
+ M_StartMessage(M_GetText("Add-ons are currently loaded.\n\nYou will only be able to join a server if\nit has the same ones loaded in the same order, which may be unlikely.\n\nIf you wish to play on other servers,\nrestart the game to clear existing add-ons.\n\n(Press a key)\n"),M_ConnectMenu,MM_EVENTHANDLER);
+ return;
+ }
+
+ M_ConnectMenu(-1);
+}
+
static UINT32 roomIds[NUM_LIST_ROOMS];
static void M_RoomMenu(INT32 choice)
@@ -9081,7 +9112,16 @@ static void M_ChooseRoom(INT32 choice)
}
serverlistpage = 0;
- M_SetupNextMenu(currentMenu->prevMenu);
+ /*
+ We were on the Multiplayer menu? That means that we must have been trying to
+ view the server browser, but we hadn't selected a room yet. So we need to go
+ to the browser next, not back there.
+ */
+ if (currentMenu->prevMenu == &MP_MainDef)
+ M_SetupNextMenu(&MP_ConnectDef);
+ else
+ M_SetupNextMenu(currentMenu->prevMenu);
+
if (currentMenu == &MP_ConnectDef)
M_Refresh(0);
}
@@ -9140,7 +9180,7 @@ static void M_DrawServerMenu(void)
M_DrawLevelPlatterHeader(currentMenu->y - lsheadingheight/2, "Server settings", true, false);
if (ms_RoomId < 0)
V_DrawRightAlignedString(BASEVIDWIDTH - currentMenu->x, currentMenu->y + MP_ServerMenu[mp_server_room].alphaKey,
- V_YELLOWMAP, (itemOn == mp_server_room) ? "<Select to change>" : "<Offline Mode>");
+ V_YELLOWMAP, (itemOn == mp_server_room) ? "<Select to change>" : "<Unlisted Mode>");
else
V_DrawRightAlignedString(BASEVIDWIDTH - currentMenu->x, currentMenu->y + MP_ServerMenu[mp_server_room].alphaKey,
V_YELLOWMAP, room_list[menuRoomIndex].name);
@@ -9247,7 +9287,7 @@ static void M_StartServerMenu(INT32 choice)
// CONNECT VIA IP
// ==============
-static char setupm_ip[16];
+static char setupm_ip[28];
// Draw the funky Connect IP menu. Tails 11-19-2002
// So much work for such a little thing!
@@ -9259,30 +9299,26 @@ static void M_DrawMPMainMenu(void)
// use generic drawer for cursor, items and title
M_DrawGenericMenu();
-#if MAXPLAYERS == 32
- V_DrawRightAlignedString(BASEVIDWIDTH-x, y+12,
- ((itemOn == 1) ? V_YELLOWMAP : 0), "(2-32 players)");
-#else
-Update the maxplayers label...
-#endif
+ V_DrawRightAlignedString(BASEVIDWIDTH-x, y+66,
+ ((itemOn == 4) ? V_YELLOWMAP : 0), va("(2-%d players)", MAXPLAYERS));
- V_DrawRightAlignedString(BASEVIDWIDTH-x, y+22,
- ((itemOn == 2) ? V_YELLOWMAP : 0), "(2 players)");
+ V_DrawRightAlignedString(BASEVIDWIDTH-x, y+76,
+ ((itemOn == 5) ? V_YELLOWMAP : 0), "(2 players)");
V_DrawRightAlignedString(BASEVIDWIDTH-x, y+116,
((itemOn == 8) ? V_YELLOWMAP : 0), "(splitscreen)");
- y += 62;
+ y += 22;
V_DrawFill(x+5, y+4+5, /*16*8 + 6,*/ BASEVIDWIDTH - 2*(x+5), 8+6, 159);
// draw name string
- V_DrawString(x+8,y+12, V_MONOSPACE, setupm_ip);
+ V_DrawString(x+8,y+12, V_ALLOWLOWERCASE, setupm_ip);
// draw text cursor for name
- if (itemOn == 5 //0
+ if (itemOn == 2 //0
&& skullAnimCounter < 4) //blink cursor
- V_DrawCharacter(x+8+V_StringWidth(setupm_ip, V_MONOSPACE),y+12,'_',false);
+ V_DrawCharacter(x+8+V_StringWidth(setupm_ip, V_ALLOWLOWERCASE),y+12,'_',false);
}
// Tails 11-19-2002
@@ -9353,10 +9389,11 @@ static void M_HandleConnectIP(INT32 choice)
default:
l = strlen(setupm_ip);
- if (l >= 16-1)
+ if (l >= 28-1)
break;
- if (choice == 46 || (choice >= 48 && choice <= 57)) // Rudimentary number and period enforcing
+ // Rudimentary number and period enforcing - also allows letters so hostnames can be used instead
+ if ((choice >= '-' && choice <= ':') || (choice >= 'A' && choice <= 'Z') || (choice >= 'a' && choice <= 'z'))
{
S_StartSound(NULL,sfx_menu1); // Tails
setupm_ip[l] = (char)choice;
diff --git a/src/p_enemy.c b/src/p_enemy.c
index 4126d071683a3b9d1faffcc62870e881d18a0d76..bc3665237d326e7045cad7a9c305d6c96f554fbb 100644
--- a/src/p_enemy.c
+++ b/src/p_enemy.c
@@ -726,6 +726,9 @@ boolean P_LookForPlayers(mobj_t *actor, boolean allaround, boolean tracer, fixed
if (player->mo->health <= 0)
continue; // dead
+ if (player->bot)
+ continue; // ignore bots
+
if (dist > 0
&& P_AproxDistance(P_AproxDistance(player->mo->x - actor->x, player->mo->y - actor->y), player->mo->z - actor->z) > dist)
continue; // Too far away
@@ -3002,15 +3005,20 @@ void A_Boss7FireMissiles(mobj_t *actor)
// var2:
// 0 - Boss 1 Left side
// 1 - Boss 1 Right side
+// 2 - Triple laser
+// 3 - Boss 1 Middle
+// >=3 - Generic middle
//
void A_Boss1Laser(mobj_t *actor)
{
fixed_t x, y, z, floorz, speed;
INT32 locvar1 = var1;
- INT32 locvar2 = var2;
+ INT32 locvar2 = (var2 & 65535);
+ INT32 upperend = (var2>>16);
INT32 i;
angle_t angle;
mobj_t *point;
+ tic_t dur;
#ifdef HAVE_BLUA
if (LUA_CallAction("A_Boss1Laser", actor))
@@ -3019,24 +3027,43 @@ void A_Boss1Laser(mobj_t *actor)
if (!actor->target)
return;
+ if ((upperend & 1) && (actor->extravalue2 > 1))
+ actor->extravalue2--;
+
+ dur = actor->extravalue2;
+
switch (locvar2)
{
case 0:
- x = actor->x + P_ReturnThrustX(actor, actor->angle+ANGLE_90, FixedMul(43*FRACUNIT, actor->scale));
- y = actor->y + P_ReturnThrustY(actor, actor->angle+ANGLE_90, FixedMul(43*FRACUNIT, actor->scale));
+ x = actor->x + P_ReturnThrustX(actor, actor->angle+ANGLE_90, FixedMul(44*FRACUNIT, actor->scale));
+ y = actor->y + P_ReturnThrustY(actor, actor->angle+ANGLE_90, FixedMul(44*FRACUNIT, actor->scale));
if (actor->eflags & MFE_VERTICALFLIP)
z = actor->z + actor->height - FixedMul(56*FRACUNIT, actor->scale) - mobjinfo[locvar1].height;
else
z = actor->z + FixedMul(56*FRACUNIT, actor->scale);
break;
case 1:
- x = actor->x + P_ReturnThrustX(actor, actor->angle-ANGLE_90, FixedMul(43*FRACUNIT, actor->scale));
- y = actor->y + P_ReturnThrustY(actor, actor->angle-ANGLE_90, FixedMul(43*FRACUNIT, actor->scale));
+ x = actor->x + P_ReturnThrustX(actor, actor->angle-ANGLE_90, FixedMul(44*FRACUNIT, actor->scale));
+ y = actor->y + P_ReturnThrustY(actor, actor->angle-ANGLE_90, FixedMul(44*FRACUNIT, actor->scale));
if (actor->eflags & MFE_VERTICALFLIP)
z = actor->z + actor->height - FixedMul(56*FRACUNIT, actor->scale) - mobjinfo[locvar1].height;
else
z = actor->z + FixedMul(56*FRACUNIT, actor->scale);
break;
+ case 2:
+ var2 = 3; // Fire middle laser
+ A_Boss1Laser(actor);
+ var2 = 0; // Fire left laser
+ A_Boss1Laser(actor);
+ var2 = 1; // Fire right laser
+ A_Boss1Laser(actor);
+ return;
+ break;
+ case 3:
+ x = actor->x + P_ReturnThrustX(actor, actor->angle, FixedMul(42*FRACUNIT, actor->scale));
+ y = actor->y + P_ReturnThrustY(actor, actor->angle, FixedMul(42*FRACUNIT, actor->scale));
+ z = actor->z + actor->height/2;
+ break;
default:
x = actor->x;
y = actor->y;
@@ -3044,7 +3071,7 @@ void A_Boss1Laser(mobj_t *actor)
break;
}
- if (!(actor->flags2 & MF2_FIRING))
+ if (!(actor->flags2 & MF2_FIRING) && dur > 1)
{
actor->angle = R_PointToAngle2(x, y, actor->target->x, actor->target->y);
if (mobjinfo[locvar1].seesound)
@@ -3053,7 +3080,7 @@ void A_Boss1Laser(mobj_t *actor)
{
point = P_SpawnMobj(x + P_ReturnThrustX(actor, actor->angle, actor->radius), y + P_ReturnThrustY(actor, actor->angle, actor->radius), actor->z - actor->height / 2, MT_EGGMOBILE_TARGET);
point->angle = actor->angle;
- point->fuse = actor->tics+1;
+ point->fuse = dur+1;
P_SetTarget(&point->target, actor->target);
P_SetTarget(&actor->target, point);
}
@@ -3062,10 +3089,11 @@ void A_Boss1Laser(mobj_t *actor)
else if (actor->target && !(actor->spawnpoint && actor->spawnpoint->options & MTF_AMBUSH))
actor->angle = R_PointToAngle2(x, y, actor->target->x, actor->target->y);*/
- if (actor->spawnpoint && actor->spawnpoint->options & MTF_AMBUSH)
- angle = FixedAngle(FixedDiv(actor->tics*160*FRACUNIT, actor->state->tics*FRACUNIT) + 10*FRACUNIT);
- else
+ /*if (actor->spawnpoint && actor->spawnpoint->options & MTF_AMBUSH)
+ angle = FixedAngle(FixedDiv(dur*160*FRACUNIT, actor->state->tics*FRACUNIT) + 10*FRACUNIT);
+ else*/
angle = R_PointToAngle2(z + (mobjinfo[locvar1].height>>1), 0, actor->target->z, R_PointToDist2(x, y, actor->target->x, actor->target->y));
+
point = P_SpawnMobj(x, y, z, locvar1);
P_SetTarget(&point->target, actor);
point->angle = actor->angle;
@@ -3097,7 +3125,7 @@ void A_Boss1Laser(mobj_t *actor)
point->fuse = TICRATE;
}
- if (actor->tics > 1)
+ if (dur > 1)
actor->flags2 |= MF2_FIRING;
else
actor->flags2 &= ~MF2_FIRING;
@@ -3241,6 +3269,7 @@ void A_Boss4Raise(mobj_t *actor)
// 0 - Fly at the player
// 1 - Fly away from the player
// 2 - Strafe in relation to the player
+// 3 - Dynamic mode - don't get too close to walls
// var2:
// 0 - Fly horizontally and vertically
// 1 - Fly horizontal-only (momz = 0)
@@ -3271,16 +3300,83 @@ void A_SkullAttack(mobj_t *actor)
S_StartSound(actor, actor->info->activesound);
A_FaceTarget(actor);
+ dist = P_AproxDistance(dest->x - actor->x, dest->y - actor->y);
+
if (locvar1 == 1)
actor->angle += ANGLE_180;
else if (locvar1 == 2)
actor->angle += (P_RandomChance(FRACUNIT/2)) ? ANGLE_90 : -ANGLE_90;
+ else if (locvar1 == 3)
+ {
+ statenum_t oldspawnstate = mobjinfo[MT_NULL].spawnstate;
+ UINT32 oldflags = mobjinfo[MT_NULL].flags;
+ fixed_t oldradius = mobjinfo[MT_NULL].radius;
+ fixed_t oldheight = mobjinfo[MT_NULL].height;
+ mobj_t *check;
+ INT32 i, j, k;
+ boolean allow;
+ angle_t testang;
+
+ mobjinfo[MT_NULL].spawnstate = S_INVISIBLE;
+ mobjinfo[MT_NULL].flags = MF_NOGRAVITY|MF_NOTHINK|MF_NOCLIPTHING|MF_NOBLOCKMAP;
+ mobjinfo[MT_NULL].radius = mobjinfo[actor->type].radius;
+ mobjinfo[MT_NULL].height = mobjinfo[actor->type].height;
+
+ if (P_RandomChance(FRACUNIT/2)) // port priority 1?
+ {
+ i = 9;
+ j = 27;
+ }
+ else
+ {
+ i = 27;
+ j = 9;
+ }
+
+#define dostuff(q) check = P_SpawnMobjFromMobj(actor, 0, 0, 0, MT_NULL);\
+ testang = actor->angle + ((i+(q))*ANG10);\
+ allow = (P_TryMove(check,\
+ P_ReturnThrustX(check, testang, dist + 2*actor->radius),\
+ P_ReturnThrustY(check, testang, dist + 2*actor->radius),\
+ true));\
+ P_RemoveMobj(check);\
+ if (allow)\
+ break;
+
+ if (P_RandomChance(FRACUNIT/2)) // port priority 2?
+ {
+ for (k = 0; k < 9; k++)
+ {
+ dostuff(i+k)
+ dostuff(i-k)
+ dostuff(j+k)
+ dostuff(j-k)
+ }
+ }
+ else
+ {
+ for (k = 0; k < 9; k++)
+ {
+ dostuff(i-k)
+ dostuff(i+k)
+ dostuff(j-k)
+ dostuff(j+k)
+ }
+ }
+ actor->angle = testang;
+
+#undef dostuff
+
+ mobjinfo[MT_NULL].spawnstate = oldspawnstate;
+ mobjinfo[MT_NULL].flags = oldflags;
+ mobjinfo[MT_NULL].radius = oldradius;
+ mobjinfo[MT_NULL].height = oldheight;
+ }
an = actor->angle >> ANGLETOFINESHIFT;
actor->momx = FixedMul(speed, FINECOSINE(an));
actor->momy = FixedMul(speed, FINESINE(an));
- dist = P_AproxDistance(dest->x - actor->x, dest->y - actor->y);
dist = dist / speed;
if (dist < 1)
@@ -3337,7 +3433,7 @@ void A_BossZoom(mobj_t *actor)
// var1:
// 0 - Use movecount to spawn explosions evenly
// 1 - Use P_Random to spawn explosions at complete random
-// var2 = Object to spawn. Default is MT_BOSSEXPLODE.
+// var2 = Object to spawn. Default is MT_SONIC3KBOSSEXPLODE.
//
void A_BossScream(mobj_t *actor)
{
@@ -3369,7 +3465,7 @@ void A_BossScream(mobj_t *actor)
// Determine what mobj to spawn. If undefined or invalid, use MT_BOSSEXPLODE as default.
if (locvar2 <= 0 || locvar2 >= NUMMOBJTYPES)
- explodetype = MT_BOSSEXPLODE;
+ explodetype = MT_SONIC3KBOSSEXPLODE; //MT_BOSSEXPLODE; -- piss to you, sonic 2
else
explodetype = (mobjtype_t)locvar2;
@@ -3430,11 +3526,13 @@ void A_Pain(mobj_t *actor)
//
// Description: Changes a dying object's flags to reflect its having fallen to the ground.
//
-// var1 = unused
+// var1 = value to set repeat to if nonzero
// var2 = unused
//
void A_Fall(mobj_t *actor)
{
+ INT32 locvar1 = var1;
+
#ifdef HAVE_BLUA
if (LUA_CallAction("A_Fall", actor))
return;
@@ -3447,6 +3545,9 @@ void A_Fall(mobj_t *actor)
// So change this if corpse objects
// are meant to be obstacles.
+
+ if (locvar1)
+ actor->extravalue2 = locvar1;
}
#define LIVESBOXDISPLAYPLAYER // Use displayplayer instead of closest player
@@ -3842,6 +3943,72 @@ bossjustdie:
else if (P_MobjWasRemoved(mo))
return;
#endif
+
+ // Spawn your junk
+ switch (mo->type)
+ {
+ default:
+ break;
+ case MT_EGGMOBILE: // twin laser pods
+ {
+ mo2 = P_SpawnMobjFromMobj(mo,
+ P_ReturnThrustX(mo, mo->angle - ANGLE_90, 32<<FRACBITS),
+ P_ReturnThrustY(mo, mo->angle - ANGLE_90, 32<<FRACBITS),
+ 32<<FRACBITS, MT_BOSSJUNK);
+ mo2->angle = mo->angle;
+ P_InstaThrust(mo2, mo2->angle - ANGLE_90, 4*mo2->scale);
+ P_SetObjectMomZ(mo2, 4*FRACUNIT, false);
+ P_SetMobjState(mo2, S_BOSSEGLZ1);
+
+ mo2 = P_SpawnMobjFromMobj(mo,
+ P_ReturnThrustX(mo, mo->angle + ANGLE_90, 32<<FRACBITS),
+ P_ReturnThrustY(mo, mo->angle + ANGLE_90, 32<<FRACBITS),
+ 32<<FRACBITS, MT_BOSSJUNK);
+ mo2->angle = mo->angle;
+ P_InstaThrust(mo2, mo2->angle + ANGLE_90, 4*mo2->scale);
+ P_SetObjectMomZ(mo2, 4*FRACUNIT, false);
+ P_SetMobjState(mo2, S_BOSSEGLZ2);
+ }
+ break;
+ case MT_EGGMOBILE2: // twin tanks + spigot
+ {
+ mo2 = P_SpawnMobjFromMobj(mo,
+ P_ReturnThrustX(mo, mo->angle - ANGLE_90, 32<<FRACBITS),
+ P_ReturnThrustY(mo, mo->angle - ANGLE_90, 32<<FRACBITS),
+ 32<<FRACBITS, MT_BOSSJUNK);
+ mo2->angle = mo->angle;
+ P_InstaThrust(mo2, mo2->angle - ANGLE_90, 4*mo2->scale);
+ P_SetObjectMomZ(mo2, 4*FRACUNIT, false);
+ P_SetMobjState(mo2, S_BOSSTANK1);
+
+ mo2 = P_SpawnMobjFromMobj(mo,
+ P_ReturnThrustX(mo, mo->angle + ANGLE_90, 32<<FRACBITS),
+ P_ReturnThrustY(mo, mo->angle + ANGLE_90, 32<<FRACBITS),
+ 32<<FRACBITS, MT_BOSSJUNK);
+ mo2->angle = mo->angle;
+ P_InstaThrust(mo2, mo2->angle + ANGLE_90, 4*mo2->scale);
+ P_SetObjectMomZ(mo2, 4*FRACUNIT, false);
+ P_SetMobjState(mo2, S_BOSSTANK2);
+
+ mo2 = P_SpawnMobjFromMobj(mo, 0, 0,
+ mobjinfo[MT_EGGMOBILE2].height + (32<<FRACBITS),
+ MT_BOSSJUNK);
+ mo2->angle = mo->angle;
+ P_SetObjectMomZ(mo2, 4*FRACUNIT, false);
+ mo2->momz += mo->momz;
+ P_SetMobjState(mo2, S_BOSSSPIGOT);
+ }
+ break;
+ case MT_EGGMOBILE3:
+ {
+ mo2 = P_SpawnMobjFromMobj(mo, 0, 0, 0, MT_BOSSJUNK);
+ mo2->angle = mo->angle;
+ P_SetMobjState(mo2, S_BOSSSEBH1);
+ }
+ break;
+ }
+
+ // now do another switch case for escaping
switch (mo->type)
{
case MT_BLACKEGGMAN:
@@ -3936,60 +4103,26 @@ bossjustdie:
mo->flags |= MF_NOGRAVITY|MF_NOCLIP;
mo->flags |= MF_NOCLIPHEIGHT;
+ mo->movedir = 0;
+ mo->extravalue1 = 35;
+ mo->flags2 |= MF2_BOSSFLEE;
+ mo->momz = P_MobjFlip(mo)*2*mo->scale;
+
if (mo->target)
{
- mo->angle = R_PointToAngle2(mo->x, mo->y, mo->target->x, mo->target->y);
- mo->flags2 |= MF2_BOSSFLEE;
- mo->momz = FixedMul(FixedDiv(mo->target->z - mo->z, P_AproxDistance(mo->x-mo->target->x,mo->y-mo->target->y)), FixedMul(2*FRACUNIT, mo->scale));
+ angle_t diff = R_PointToAngle2(mo->x, mo->y, mo->target->x, mo->target->y) - mo->angle;
+ if (diff)
+ {
+ if (diff > ANGLE_180)
+ diff = InvAngle(InvAngle(diff)/mo->extravalue1);
+ else
+ diff /= mo->extravalue1;
+ mo->movedir = diff;
+ }
}
- else
- mo->momz = FixedMul(2*FRACUNIT, mo->scale);
- break;
- }
- }
-
- if (mo->type == MT_EGGMOBILE2)
- {
- mo2 = P_SpawnMobj(mo->x + P_ReturnThrustX(mo, mo->angle - ANGLE_90, FixedMul(32*FRACUNIT, mo->scale)),
- mo->y + P_ReturnThrustY(mo, mo->angle - ANGLE_90, FixedMul(32*FRACUNIT, mo->scale)),
- mo->z + mo->height/2 + ((mo->eflags & MFE_VERTICALFLIP)? FixedMul(8*FRACUNIT, mo->scale)-mobjinfo[MT_BOSSTANK1].height : -FixedMul(8*FRACUNIT, mo->scale)), MT_BOSSTANK1); // Right tank
- mo2->angle = mo->angle;
- mo2->destscale = mo->scale;
- P_SetScale(mo2, mo2->destscale);
- if (mo->eflags & MFE_VERTICALFLIP)
- {
- mo2->eflags |= MFE_VERTICALFLIP;
- mo2->flags2 |= MF2_OBJECTFLIP;
- }
- P_InstaThrust(mo2, mo2->angle - ANGLE_90, FixedMul(4*FRACUNIT, mo2->scale));
- P_SetObjectMomZ(mo2, 4*FRACUNIT, false);
-
- mo2 = P_SpawnMobj(mo->x + P_ReturnThrustX(mo, mo->angle + ANGLE_90, FixedMul(32*FRACUNIT, mo->scale)),
- mo->y + P_ReturnThrustY(mo, mo->angle + ANGLE_90, FixedMul(32*FRACUNIT, mo->scale)),
- mo->z + mo->height/2 + ((mo->eflags & MFE_VERTICALFLIP)? FixedMul(8*FRACUNIT, mo->scale)-mobjinfo[MT_BOSSTANK2].height : -FixedMul(8*FRACUNIT, mo->scale)), MT_BOSSTANK2); // Left tank
- mo2->angle = mo->angle;
- mo2->destscale = mo->scale;
- P_SetScale(mo2, mo2->destscale);
- if (mo->eflags & MFE_VERTICALFLIP)
- {
- mo2->eflags |= MFE_VERTICALFLIP;
- mo2->flags2 |= MF2_OBJECTFLIP;
- }
- P_InstaThrust(mo2, mo2->angle + ANGLE_90, FixedMul(4*FRACUNIT, mo2->scale));
- P_SetObjectMomZ(mo2, 4*FRACUNIT, false);
- mo2 = P_SpawnMobj(mo->x, mo->y,
- mo->z + ((mo->eflags & MFE_VERTICALFLIP)? mobjinfo[MT_BOSSSPIGOT].height-FixedMul(32*FRACUNIT,mo->scale): mo->height + FixedMul(32*FRACUNIT, mo->scale)), MT_BOSSSPIGOT);
- mo2->angle = mo->angle;
- mo2->destscale = mo->scale;
- P_SetScale(mo2, mo2->destscale);
- if (mo->eflags & MFE_VERTICALFLIP)
- {
- mo2->eflags |= MFE_VERTICALFLIP;
- mo2->flags2 |= MF2_OBJECTFLIP;
+ break;
}
- P_SetObjectMomZ(mo2, 4*FRACUNIT, false);
- return;
}
}
@@ -4127,9 +4260,9 @@ void A_Invincibility(mobj_t *actor)
{
if (mariomode)
G_GhostAddColor(GHC_INVINCIBLE);
+ P_PlayJingle(player, (mariomode) ? JT_MINV : JT_INV);
strlcpy(S_sfx[sfx_None].caption, "Invincibility", 14);
S_StartCaption(sfx_None, -1, player->powers[pw_invulnerability]);
- P_PlayJingle(player, (mariomode) ? JT_MINV : JT_INV);
}
}
@@ -4898,12 +5031,12 @@ void A_SignPlayer(mobj_t *actor)
of in the name. If you have a better idea, feel free
to let me know. ~toast 2016/07/20
*/
- actor->frame += (15 - Color_Opposite[(Color_Opposite[(skin->prefoppositecolor - 1)*2] - 1)*2 + 1]);
+ actor->frame += (15 - Color_Opposite[Color_Opposite[skin->prefoppositecolor - 1][0] - 1][1]);
}
else if (actor->target->player->skincolor) // Set the sign to be an appropriate background color for this player's skincolor.
{
- actor->color = Color_Opposite[(actor->target->player->skincolor - 1)*2];
- actor->frame += (15 - Color_Opposite[(actor->target->player->skincolor - 1)*2 + 1]);
+ actor->color = Color_Opposite[actor->target->player->skincolor - 1][0];
+ actor->frame += (15 - Color_Opposite[actor->target->player->skincolor - 1][1]);
}
if (skin->sprites[SPR2_SIGN].numframes)
@@ -6333,6 +6466,7 @@ void A_MixUp(mobj_t *actor)
INT32 starpostnum;
tic_t starposttime;
angle_t starpostangle;
+ fixed_t starpostscale;
INT32 mflags2;
@@ -6380,6 +6514,7 @@ void A_MixUp(mobj_t *actor)
starposty = players[one].starposty;
starpostz = players[one].starpostz;
starpostangle = players[one].starpostangle;
+ starpostscale = players[one].starpostscale;
starpostnum = players[one].starpostnum;
starposttime = players[one].starposttime;
@@ -6388,15 +6523,11 @@ void A_MixUp(mobj_t *actor)
P_MixUp(players[one].mo, players[two].mo->x, players[two].mo->y, players[two].mo->z, players[two].mo->angle,
players[two].starpostx, players[two].starposty, players[two].starpostz,
players[two].starpostnum, players[two].starposttime, players[two].starpostangle,
- players[two].mo->flags2);
-
- players[one].drawangle = players[two].drawangle;
+ players[two].starpostscale, players[two].drawangle, players[two].mo->flags2);
P_MixUp(players[two].mo, x, y, z, angle, starpostx, starposty, starpostz,
starpostnum, starposttime, starpostangle,
- mflags2);
-
- players[two].drawangle = drawangle;
+ starpostscale, drawangle, mflags2);
//carry set after mixup. Stupid P_ResetPlayer() takes away some of the stuff we look for...
//but not all of it! So we need to make sure they aren't set wrong or anything.
@@ -6423,6 +6554,7 @@ void A_MixUp(mobj_t *actor)
INT32 starpostnum[MAXPLAYERS];
tic_t starposttime[MAXPLAYERS];
angle_t starpostangle[MAXPLAYERS];
+ fixed_t starpostscale[MAXPLAYERS];
INT32 flags2[MAXPLAYERS];
@@ -6460,6 +6592,7 @@ void A_MixUp(mobj_t *actor)
starpostnum[counter] = players[i].starpostnum;
starposttime[counter] = players[i].starposttime;
starpostangle[counter] = players[i].starpostangle;
+ starpostscale[counter] = players[i].starpostscale;
flags2[counter] = players[i].mo->flags2;
@@ -6500,9 +6633,7 @@ void A_MixUp(mobj_t *actor)
P_MixUp(players[i].mo, position[teleportfrom][0], position[teleportfrom][1], position[teleportfrom][2], anglepos[teleportfrom][0],
spposition[teleportfrom][0], spposition[teleportfrom][1], spposition[teleportfrom][2],
starpostnum[teleportfrom], starposttime[teleportfrom], starpostangle[teleportfrom],
- flags2[teleportfrom]);
-
- players[i].drawangle = anglepos[teleportfrom][1];
+ starpostscale[teleportfrom], anglepos[teleportfrom][1], flags2[teleportfrom]);
//...carry after. same reasoning.
players[i].powers[pw_carry] = transcarry[teleportfrom];
@@ -8677,7 +8808,7 @@ void A_SetObjectFlags2(mobj_t *actor)
//
// var1:
// 0 - Triple jet fume pattern
-// 1 - Boss 3's propeller
+// 1 - Unused (formerly Boss 3's propeller)
// 2 - Metal Sonic jet fume
// 3 - Boss 4 jet flame
// var2 = unused
@@ -8737,7 +8868,7 @@ void A_BossJetFume(mobj_t *actor)
P_SetTarget(&actor->tracer, filler);
}
- else if (locvar1 == 1) // Boss 3 propeller
+ /*else if (locvar1 == 1) // Boss 3 propeller
{
fixed_t jetx, jety, jetz;
@@ -8757,14 +8888,14 @@ void A_BossJetFume(mobj_t *actor)
filler->angle = actor->angle - ANGLE_180;
P_SetTarget(&actor->tracer, filler);
- }
+ }*/
else if (locvar1 == 2) // Metal Sonic jet fumes
{
filler = P_SpawnMobj(actor->x, actor->y, actor->z, MT_JETFUME1);
P_SetTarget(&filler->target, actor);
filler->fuse = 59;
P_SetTarget(&actor->tracer, filler);
- filler->destscale = actor->scale/2;
+ filler->destscale = actor->scale/3;
P_SetScale(filler, filler->destscale);
if (actor->eflags & MFE_VERTICALFLIP)
filler->flags2 |= MF2_OBJECTFLIP;
@@ -11992,7 +12123,7 @@ void A_MineExplode(mobj_t *actor)
{
#define dist 64
UINT8 i;
- mobjtype_t type = ((actor->eflags & MFE_UNDERWATER) ? MT_UWEXPLODE : MT_BOSSEXPLODE);
+ mobjtype_t type = ((actor->eflags & MFE_UNDERWATER) ? MT_UWEXPLODE : MT_SONIC3KBOSSEXPLODE);
S_StartSound(actor, ((actor->eflags & MFE_UNDERWATER) ? sfx_s3k57 : sfx_s3k4e));
P_SpawnMobj(actor->x, actor->y, actor->z, type);
for (i = 0; i < 16; i++)
diff --git a/src/p_inter.c b/src/p_inter.c
index cbf5ce54a829505e31f0fbfee7aa22fcadebc90a..ae5fce6ff07acf581c60ed45beab376aa43ee26b 100644
--- a/src/p_inter.c
+++ b/src/p_inter.c
@@ -428,7 +428,7 @@ void P_TouchSpecialThing(mobj_t *special, mobj_t *toucher, boolean heightcheck)
|| special->state == &states[S_FANG_BOUNCE4]
|| special->state == &states[S_FANG_PINCHBOUNCE3]
|| special->state == &states[S_FANG_PINCHBOUNCE4])
- && P_MobjFlip(special)*((special->z + special->height/2) - (toucher->z - toucher->height/2)) > 0)
+ && P_MobjFlip(special)*((special->z + special->height/2) - (toucher->z - toucher->height/2)) > -(special->height/4))
{
P_DamageMobj(toucher, special, special, 1, 0);
P_SetTarget(&special->tracer, toucher);
@@ -1427,6 +1427,12 @@ void P_TouchSpecialThing(mobj_t *special, mobj_t *toucher, boolean heightcheck)
players[i].starposty = player->mo->y>>FRACBITS;
players[i].starpostz = special->z>>FRACBITS;
players[i].starpostangle = special->angle;
+ players[i].starpostscale = player->mo->destscale;
+ if (special->flags2 & MF2_OBJECTFLIP)
+ {
+ players[i].starpostscale *= -1;
+ players[i].starpostz += special->height>>FRACBITS;
+ }
players[i].starpostnum = special->health;
if (cv_coopstarposts.value == 2 && (players[i].playerstate == PST_DEAD || players[i].spectator) && P_GetLives(&players[i]))
@@ -1443,6 +1449,12 @@ void P_TouchSpecialThing(mobj_t *special, mobj_t *toucher, boolean heightcheck)
player->starposty = toucher->y>>FRACBITS;
player->starpostz = special->z>>FRACBITS;
player->starpostangle = special->angle;
+ player->starpostscale = player->mo->destscale;
+ if (special->flags2 & MF2_OBJECTFLIP)
+ {
+ player->starpostscale *= -1;
+ player->starpostz += special->height>>FRACBITS;
+ }
player->starpostnum = special->health;
S_StartSound(toucher, special->info->painsound);
}
@@ -2594,6 +2606,7 @@ void P_KillMobj(mobj_t *target, mobj_t *inflictor, mobj_t *source, UINT8 damaget
case MT_EGGMOBILE3:
{
+ mobj_t *mo2;
thinker_t *th;
UINT32 i = 0; // to check how many clones we've removed
@@ -2614,6 +2627,11 @@ void P_KillMobj(mobj_t *target, mobj_t *inflictor, mobj_t *source, UINT8 damaget
mo->scalespeed = (mo->scale - mo->destscale)/(2*TICRATE);
mo->momz = mo->info->speed;
mo->angle = FixedAngle((P_RandomKey(36)*10)<<FRACBITS);
+
+ mo2 = P_SpawnMobjFromMobj(mo, 0, 0, 0, MT_BOSSJUNK);
+ mo2->angle = mo->angle;
+ P_SetMobjState(mo2, S_BOSSSEBH2);
+
if (++i == 2) // we've already removed 2 of these, let's stop now
break;
else
diff --git a/src/p_local.h b/src/p_local.h
index 3a0146e541fc9f3737239df62a3139db3f7a3258..662eb691a0a685747bd8e9b2b06e49101eeee8e0 100644
--- a/src/p_local.h
+++ b/src/p_local.h
@@ -509,7 +509,7 @@ extern INT32 ceilmovesound;
void P_MixUp(mobj_t *thing, fixed_t x, fixed_t y, fixed_t z, angle_t angle,
INT16 starpostx, INT16 starposty, INT16 starpostz,
INT32 starpostnum, tic_t starposttime, angle_t starpostangle,
- INT32 flags2);
+ fixed_t starpostscale, angle_t drawangle, INT32 flags2);
boolean P_Teleport(mobj_t *thing, fixed_t x, fixed_t y, fixed_t z, angle_t angle, boolean flash, boolean dontstopmove);
boolean P_SetMobjStateNF(mobj_t *mobj, statenum_t state);
boolean P_CheckMissileSpawn(mobj_t *th);
diff --git a/src/p_map.c b/src/p_map.c
index 6beca92f14c2a5614971b21e4925b3c57d1f705e..15fa97c8f1481423193abbccd011273712331218 100644
--- a/src/p_map.c
+++ b/src/p_map.c
@@ -285,6 +285,9 @@ boolean P_DoSpring(mobj_t *spring, mobj_t *object)
if (spring->info->painchance != 2)
{
+ if (object->player)
+ object->player->pflags &= ~PF_APPLYAUTOBRAKE;
+
if ((horizspeed && vertispeed) || (object->player && object->player->homing)) // Mimic SA
{
object->momx = object->momy = 0;
@@ -2884,7 +2887,7 @@ static boolean P_ThingHeightClip(mobj_t *thing)
if (thing->z != oldz)
{
if (thing->player)
- P_PlayerHitFloor(thing->player, false);
+ P_PlayerHitFloor(thing->player, !onfloor);
}
// debug: be sure it falls to the floor
@@ -4136,7 +4139,7 @@ boolean P_CheckSector(sector_t *sector, boolean crunch)
{
// Monster Iestyn: do we need to check if a mobj has already been checked? ...probably not I suspect
- if (!P_MobjTouchingPolyobj(po, mo))
+ if (!P_MobjInsidePolyobj(po, mo))
continue;
if (!PIT_ChangeSector(mo, false))
@@ -4246,7 +4249,7 @@ boolean P_CheckSector(sector_t *sector, boolean crunch)
{
// Monster Iestyn: do we need to check if a mobj has already been checked? ...probably not I suspect
- if (!P_MobjTouchingPolyobj(po, mo))
+ if (!P_MobjInsidePolyobj(po, mo))
continue;
PIT_ChangeSector(mo, true);
diff --git a/src/p_mobj.c b/src/p_mobj.c
index 5482f1a5df31dc8c9b61076d6543df5db693900a..5a70932de06d5e54b8bf0b9078ec94cadccf289a 100644
--- a/src/p_mobj.c
+++ b/src/p_mobj.c
@@ -4236,12 +4236,7 @@ static void P_GenericBossThinker(mobj_t *mobj)
if (!mobj->target || !(mobj->target->flags & MF_SHOOTABLE))
{
if (mobj->health <= 0)
- {
- // look for a new target
- if (P_BossTargetPlayer(mobj, false) && mobj->info->mass) // Bid farewell!
- S_StartSound(mobj, mobj->info->mass);
return;
- }
// look for a new target
if (P_BossTargetPlayer(mobj, false) && mobj->info->seesound)
@@ -4263,7 +4258,7 @@ static void P_GenericBossThinker(mobj_t *mobj)
// AI for the first boss.
static void P_Boss1Thinker(mobj_t *mobj)
{
- if (mobj->flags2 & MF2_FRET && (statenum_t)(mobj->state-states) == mobj->info->spawnstate) {
+ if (mobj->flags2 & MF2_FRET && mobj->state->nextstate == mobj->info->spawnstate && mobj->tics == 1) {
mobj->flags2 &= ~(MF2_FRET|MF2_SKULLFLY);
mobj->momx = mobj->momy = mobj->momz = 0;
}
@@ -4281,11 +4276,7 @@ static void P_Boss1Thinker(mobj_t *mobj)
return; // It's okay, then.
if (mobj->health <= 0)
- {
- if (P_BossTargetPlayer(mobj, false) && mobj->info->mass) // Bid farewell!
- S_StartSound(mobj, mobj->info->mass);
return;
- }
// look for a new target
if (P_BossTargetPlayer(mobj, false) && mobj->info->seesound)
@@ -4332,12 +4323,7 @@ static void P_Boss2Thinker(mobj_t *mobj)
if (mobj->health <= mobj->info->damage && (!mobj->target || !(mobj->target->flags & MF_SHOOTABLE)))
{
if (mobj->health <= 0)
- {
- // look for a new target
- if (P_BossTargetPlayer(mobj, false) && mobj->info->mass) // Bid farewell!
- S_StartSound(mobj, mobj->info->mass);
return;
- }
// look for a new target
if (P_BossTargetPlayer(mobj, false) && mobj->info->seesound)
@@ -4373,12 +4359,6 @@ static void P_Boss3Thinker(mobj_t *mobj)
if (mobj->flags2 & MF2_FRET)
mobj->movedir = 1;
- if (!mobj->tracer)
- {
- var1 = 1;
- A_BossJetFume(mobj);
- }
-
if (mobj->health <= 0)
return;
/*
@@ -4507,7 +4487,7 @@ static void P_Boss3Thinker(mobj_t *mobj)
if (mobj->health <= mobj->info->damage) // pinch phase
mobj->movecount--; // limited number of shots before diving again
if (mobj->movecount)
- P_SetMobjState(mobj, mobj->info->missilestate);
+ P_SetMobjState(mobj, mobj->info->missilestate+1);
}
}
else if (mobj->threshold >= 0) // Traveling mode
@@ -4606,6 +4586,15 @@ static void P_Boss3Thinker(mobj_t *mobj)
ang += (ANGLE_MAX/64);
}
S_StartSound(mobj, sfx_fizzle);
+
+ // look for a new target
+ P_BossTargetPlayer(mobj, false);
+
+ if (mobj->target && mobj->target->player)
+ {
+ A_FaceTarget(mobj);
+ P_SetMobjState(mobj, mobj->info->missilestate);
+ }
}
else if (mobj->flags2 & (MF2_STRONGBOX|MF2_CLASSICPUSH)) // just hit the bottom of your tube
{
@@ -5541,8 +5530,7 @@ static void P_Boss9Thinker(mobj_t *mobj)
mobj->tracer->destscale = FRACUNIT + (4*TICRATE - mobj->fuse)*(FRACUNIT/2)/TICRATE + FixedMul(FINECOSINE(angle>>ANGLETOFINESHIFT),FRACUNIT/2);
P_SetScale(mobj->tracer, mobj->tracer->destscale);
}
- else
- mobj->tracer->frame &= ~FF_TRANSMASK; // this causes a flicker but honestly i like it this way
+
P_TeleportMove(mobj->tracer, mobj->x, mobj->y, mobj->z + mobj->height/2 - mobj->tracer->height/2);
mobj->tracer->momx = mobj->momx;
mobj->tracer->momy = mobj->momy;
@@ -5659,12 +5647,12 @@ static void P_Boss9Thinker(mobj_t *mobj)
if (mobj->health > mobj->info->damage)
{
- P_SetScale(missile, FRACUNIT/2);
+ P_SetScale(missile, FRACUNIT/3);
missile->color = SKINCOLOR_GOLD; // sonic cd electric power
}
else
{
- P_SetScale(missile, FRACUNIT/4);
+ P_SetScale(missile, FRACUNIT/5);
missile->color = SKINCOLOR_MAGENTA; // sonic OVA/4 purple power
}
missile->destscale = missile->scale*2;
@@ -5954,9 +5942,7 @@ static void P_Boss9Thinker(mobj_t *mobj)
P_SetTarget(&mobj->tracer, shield);
P_SetTarget(&shield->target, mobj);
shield->height -= 20*FRACUNIT; // different offset...
- shield->color = SKINCOLOR_MAGENTA;
- shield->colorized = true;
- P_SetMobjState(shield, S_FIRS1);
+ P_SetMobjState(shield, S_MSSHIELD_F2);
//P_LinedefExecute(LE_PINCHPHASE, mobj, NULL); -- why does this happen twice? see case 2...
}
mobj->fuse = 4*TICRATE;
@@ -7107,6 +7093,9 @@ void P_MobjThinker(mobj_t *mobj)
switch (mobj->type)
{
+ case MT_BOSSJUNK:
+ mobj->flags2 ^= MF2_DONTDRAW;
+ break;
case MT_MACEPOINT:
case MT_CHAINMACEPOINT:
case MT_SPRINGBALLPOINT:
@@ -7690,12 +7679,22 @@ void P_MobjThinker(mobj_t *mobj)
switch (mobj->type)
{
case MT_EGGMOBILE:
- if (mobj->health < mobj->info->damage+1 && leveltime & 1 && mobj->health > 0)
- P_SpawnMobj(mobj->x, mobj->y, mobj->z, MT_SMOKE);
+ 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
+#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);
@@ -7706,12 +7705,48 @@ void P_MobjThinker(mobj_t *mobj)
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:
@@ -7730,7 +7765,25 @@ void P_MobjThinker(mobj_t *mobj)
break;
}
if (mobj->flags2 & MF2_BOSSFLEE)
- P_InstaThrust(mobj, mobj->angle, FixedMul(12*FRACUNIT, mobj->scale));
+ {
+ if (mobj->extravalue1)
+ {
+ if (!(--mobj->extravalue1))
+ {
+ if (mobj->target)
+ {
+ 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);
+ }
+ 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));
+ }
}
else if (mobj->health <= 0) // Dead things think differently than the living.
switch (mobj->type)
@@ -7842,8 +7895,8 @@ void P_MobjThinker(mobj_t *mobj)
mobj->x + (P_RandomRange(r, -r) << FRACBITS),
mobj->y + (P_RandomRange(r, -r) << FRACBITS),
mobj->z + (P_RandomKey(mobj->height >> FRACBITS) << FRACBITS),
- MT_BOSSEXPLODE);
- S_StartSound(explosion, sfx_cybdth);
+ MT_SONIC3KBOSSEXPLODE);
+ S_StartSound(explosion, sfx_s3kb4);
}
if (mobj->movedir == DMG_DROWNED)
P_SetObjectMomZ(mobj, -FRACUNIT / 2, true); // slower fall from drowning
@@ -8309,30 +8362,6 @@ void P_MobjThinker(mobj_t *mobj)
mobj->fuse++;
}
break;
- case MT_PROPELLER:
- {
- 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(-60*FRACUNIT, mobj->target->scale));
- jety = mobj->target->y + P_ReturnThrustY(mobj->target, mobj->target->angle, FixedMul(-60*FRACUNIT, mobj->target->scale));
-
- P_UnsetThingPosition(mobj);
- mobj->x = jetx;
- mobj->y = jety;
- mobj->z = mobj->target->z + FixedMul(17*FRACUNIT, mobj->target->scale);
- mobj->angle = mobj->target->angle - ANGLE_180;
- mobj->floorz = mobj->z;
- mobj->ceilingz = mobj->z+mobj->height;
- P_SetThingPosition(mobj);
- }
- break;
case MT_JETFLAME:
{
if (!mobj->target // if you have no target
@@ -8396,6 +8425,17 @@ void P_MobjThinker(mobj_t *mobj)
}
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])
{
@@ -8424,8 +8464,8 @@ void P_MobjThinker(mobj_t *mobj)
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 - mobj->cusval,
- players[i].mo->y + players[i].mo->momy - mobj->cvmem);
+ players[i].mo->x + players[i].mo->momx - basex,
+ players[i].mo->y + players[i].mo->momy - basey);
if (compdist >= dist)
continue;
dist = compdist;
@@ -8439,14 +8479,14 @@ void P_MobjThinker(mobj_t *mobj)
mobj->angle = R_PointToAngle2(mobj->x, mobj->y, mobj->target->x, mobj->target->y);
if (P_AproxDistance(
- mobj->x - mobj->cusval,
- mobj->y - mobj->cvmem)
+ mobj->x - basex,
+ mobj->y - basey)
< mobj->scale)
S_StartSound(mobj, mobj->info->seesound);
P_TeleportMove(mobj,
- (15*(mobj->x>>4)) + (mobj->cusval>>4) + P_ReturnThrustX(mobj, mobj->angle, SPECTATORRADIUS>>4),
- (15*(mobj->y>>4)) + (mobj->cvmem>>4) + P_ReturnThrustY(mobj, mobj->angle, SPECTATORRADIUS>>4),
+ (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
@@ -8469,18 +8509,12 @@ void P_MobjThinker(mobj_t *mobj)
if (!didmove)
{
- if (P_AproxDistance(
- mobj->x - mobj->cusval,
- mobj->y - mobj->cvmem)
- < mobj->scale)
- P_TeleportMove(mobj,
- mobj->cusval,
- mobj->cvmem,
- mobj->z);
+ 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)) + (mobj->cusval>>4),
- (15*(mobj->y>>4)) + (mobj->cvmem>>4),
+ (15*(mobj->x>>4)) + (basex>>4),
+ (15*(mobj->y>>4)) + (basey>>4),
mobj->z);
}
}
@@ -9029,9 +9063,9 @@ void P_MobjThinker(mobj_t *mobj)
{
if (mobj->state->action.acp1 == (actionf_p1)A_Boss1Laser)
{
- var1 = mobj->state->var1;
- var2 = mobj->state->var2;
- mobj->state->action.acp1(mobj);
+ /*var1 = mobj->state->var1;
+ var2 = mobj->state->var2 & 65535;
+ mobj->state->action.acp1(mobj);*/
}
else if (leveltime & 1) // Fire mode
{
@@ -10512,10 +10546,6 @@ void P_AfterPlayerSpawn(INT32 playernum)
else
p->viewz = p->mo->z + p->viewheight;
- if (p->powers[pw_carry] != CR_NIGHTSMODE)
- P_SetPlayerMobjState(p->mo, S_PLAY_STND);
- p->pflags &= ~PF_SPINNING;
-
if (playernum == consoleplayer)
{
// wake up the status bar
@@ -10600,6 +10630,8 @@ void P_MovePlayerToSpawn(INT32 playernum, mapthing_t *mthing)
mobj->eflags |= MFE_VERTICALFLIP;
mobj->flags2 |= MF2_OBJECTFLIP;
}
+ if (mthing->options & MTF_AMBUSH)
+ P_SetPlayerMobjState(mobj, S_PLAY_FALL);
}
else
z = floor;
@@ -10618,7 +10650,12 @@ void P_MovePlayerToSpawn(INT32 playernum, mapthing_t *mthing)
P_SetThingPosition(mobj);
mobj->z = z;
- if (mobj->z == mobj->floorz)
+ if (mobj->flags2 & MF2_OBJECTFLIP)
+ {
+ if (mobj->z + mobj->height == mobj->ceilingz)
+ mobj->eflags |= MFE_ONGROUND;
+ }
+ else if (mobj->z == mobj->floorz)
mobj->eflags |= MFE_ONGROUND;
mobj->angle = angle;
@@ -10654,17 +10691,29 @@ void P_MovePlayerToStarpost(INT32 playernum)
sector->ceilingheight;
z = p->starpostz << FRACBITS;
- if (z < floor)
+
+ P_SetScale(mobj, (mobj->destscale = abs(p->starpostscale)));
+
+ if (p->starpostscale < 0)
+ {
+ mobj->flags2 |= MF2_OBJECTFLIP;
+ if (z >= ceiling)
+ {
+ mobj->eflags |= MFE_ONGROUND;
+ z = ceiling;
+ }
+ z -= mobj->height;
+ }
+ else if (z <= floor)
+ {
+ mobj->eflags |= MFE_ONGROUND;
z = floor;
- else if (z > ceiling - mobjinfo[MT_PLAYER].height)
- z = ceiling - mobjinfo[MT_PLAYER].height;
+ }
mobj->floorz = floor;
mobj->ceilingz = ceiling;
mobj->z = z;
- if (mobj->z == mobj->floorz)
- mobj->eflags |= MFE_ONGROUND;
mobj->angle = p->starpostangle;
diff --git a/src/p_saveg.c b/src/p_saveg.c
index ea998b445e40c90135d0454ce412367373fc42d8..12f14e99da1d2c42131b099961a90b052547bc49 100644
--- a/src/p_saveg.c
+++ b/src/p_saveg.c
@@ -125,6 +125,10 @@ static void P_NetArchivePlayers(void)
WRITEINT32(save_p, players[i].currentweapon);
WRITEINT32(save_p, players[i].ringweapons);
+ WRITEUINT16(save_p, players[i].ammoremoval);
+ WRITEUINT32(save_p, players[i].ammoremovaltimer);
+ WRITEINT32(save_p, players[i].ammoremovaltimer);
+
for (j = 0; j < NUMPOWERS; j++)
WRITEUINT16(save_p, players[i].powers[j]);
@@ -185,6 +189,7 @@ static void P_NetArchivePlayers(void)
WRITEINT16(save_p, players[i].starpostz);
WRITEINT32(save_p, players[i].starpostnum);
WRITEANGLE(save_p, players[i].starpostangle);
+ WRITEFIXED(save_p, players[i].starpostscale);
WRITEANGLE(save_p, players[i].angle_pos);
WRITEANGLE(save_p, players[i].old_angle_pos);
@@ -329,6 +334,10 @@ static void P_NetUnArchivePlayers(void)
players[i].currentweapon = READINT32(save_p);
players[i].ringweapons = READINT32(save_p);
+ players[i].ammoremoval = READUINT16(save_p);
+ players[i].ammoremovaltimer = READUINT32(save_p);
+ players[i].ammoremovalweapon = READINT32(save_p);
+
for (j = 0; j < NUMPOWERS; j++)
players[i].powers[j] = READUINT16(save_p);
@@ -389,6 +398,7 @@ static void P_NetUnArchivePlayers(void)
players[i].starpostz = READINT16(save_p);
players[i].starpostnum = READINT32(save_p);
players[i].starpostangle = READANGLE(save_p);
+ players[i].starpostscale = READFIXED(save_p);
players[i].angle_pos = READANGLE(save_p);
players[i].old_angle_pos = READANGLE(save_p);
diff --git a/src/p_setup.c b/src/p_setup.c
index d0cd14b22d3011a64e26a23e44be00739420adeb..793735082f2cfbcc43d0266a789d3aeb5f8b6de4 100644
--- a/src/p_setup.c
+++ b/src/p_setup.c
@@ -221,6 +221,7 @@ static void P_ClearSingleMapHeaderInfo(INT16 i)
mapheaderinfo[num]->muspostbosstrack = 0;
mapheaderinfo[num]->muspostbosspos = 0;
mapheaderinfo[num]->muspostbossfadein = 0;
+ mapheaderinfo[num]->musforcereset = -1;
mapheaderinfo[num]->forcecharacter[0] = '\0';
mapheaderinfo[num]->weather = 0;
mapheaderinfo[num]->skynum = 1;
@@ -573,6 +574,11 @@ INT32 P_AddLevelFlat(const char *flatname, levelflat_t *levelflat)
// store the flat lump number
levelflat->lumpnum = R_GetFlatNumForName(flatname);
+ levelflat->texturenum = R_CheckTextureNumForName(flatname);
+ levelflat->lasttexturenum = levelflat->texturenum;
+
+ levelflat->baselumpnum = LUMPERROR;
+ levelflat->basetexturenum = -1;
#ifndef ZDEBUG
CONS_Debug(DBG_SETUP, "flat #%03d: %s\n", atoi(sizeu1(numlevelflats)), levelflat->name);
@@ -617,6 +623,11 @@ INT32 P_AddLevelFlatRuntime(const char *flatname)
// store the flat lump number
levelflat->lumpnum = R_GetFlatNumForName(flatname);
+ levelflat->texturenum = R_CheckTextureNumForName(flatname);
+ levelflat->lasttexturenum = levelflat->texturenum;
+
+ levelflat->baselumpnum = LUMPERROR;
+ levelflat->basetexturenum = -1;
#ifndef ZDEBUG
CONS_Debug(DBG_SETUP, "flat #%03d: %s\n", atoi(sizeu1(numlevelflats)), levelflat->name);
@@ -1480,6 +1491,7 @@ static void P_LoadRawSideDefs2(void *data)
case 425: // Calls P_SetMobjState on calling mobj
case 434: // Custom Power
case 442: // Calls P_SetMobjState on mobjs of a given type in the tagged sectors
+ case 461: // Spawns an object on the map based on texture offsets
{
char process[8*3+1];
memset(process,0,8*3+1);
@@ -2692,7 +2704,7 @@ boolean P_SetupLevel(boolean skipprecip)
S_StartSound(NULL, sfx_s3kaf);
// Fade music! Time it to S3KAF: 0.25 seconds is snappy.
- if (cv_resetmusic.value ||
+ if (RESETMUSIC ||
strnicmp(S_MusicName(),
(mapmusflags & MUSIC_RELOADRESET) ? mapheaderinfo[gamemap-1]->musname : mapmusname, 7))
S_FadeOutStopMusic(MUSICRATE/4); //FixedMul(FixedDiv(F_GetWipeLength(wipedefs[wipe_speclevel_towhite])*NEWTICRATERATIO, NEWTICRATE), MUSICRATE)
@@ -2725,7 +2737,7 @@ boolean P_SetupLevel(boolean skipprecip)
// Fade out music here. Deduct 2 tics so the fade volume actually reaches 0.
// But don't halt the music! S_Start will take care of that. This dodges a MIDI crash bug.
- if (!titlemapinaction && (cv_resetmusic.value ||
+ if (!titlemapinaction && (RESETMUSIC ||
strnicmp(S_MusicName(),
(mapmusflags & MUSIC_RELOADRESET) ? mapheaderinfo[gamemap-1]->musname : mapmusname, 7)))
S_FadeMusic(0, FixedMul(
diff --git a/src/p_setup.h b/src/p_setup.h
index 7e8a5d7e6bd31185d48c936eb95e7b33cf847413..7e3a149eb882965e436dbc4ff4327d0fcefa8a00 100644
--- a/src/p_setup.h
+++ b/src/p_setup.h
@@ -37,12 +37,19 @@ typedef struct
{
char name[9]; // resource name from wad
lumpnum_t lumpnum; // lump number of the flat
+ INT32 texturenum, lasttexturenum; // texture number of the flat
+ UINT16 width, height;
+ fixed_t topoffset, leftoffset;
// for flat animation
lumpnum_t baselumpnum;
+ INT32 basetexturenum;
INT32 animseq; // start pos. in the anim sequence
INT32 numpics;
INT32 speed;
+
+ // for patchflats
+ UINT8 *flatpatch;
} levelflat_t;
extern size_t numlevelflats;
diff --git a/src/p_slopes.c b/src/p_slopes.c
index f89dd3c96dfff65d32ed71fbef996270315b5202..b06460084dee76bde47435815b85470cc03d5ab1 100644
--- a/src/p_slopes.c
+++ b/src/p_slopes.c
@@ -716,9 +716,11 @@ void P_HandleSlopeLanding(mobj_t *thing, pslope_t *slope)
vector3_t mom; // Ditto.
if (slope->flags & SL_NOPHYSICS) { // No physics, no need to make anything complicated.
- if (P_MobjFlip(thing)*(thing->momz) < 0) { // falling, land on slope
- //thing->momz = -P_MobjFlip(thing);
+ if (P_MobjFlip(thing)*(thing->momz) < 0) // falling, land on slope
+ {
thing->standingslope = slope;
+ if (!thing->player || !(thing->player->pflags & PF_BOUNCING))
+ thing->momz = -P_MobjFlip(thing);
}
return;
}
@@ -732,9 +734,9 @@ void P_HandleSlopeLanding(mobj_t *thing, pslope_t *slope)
if (P_MobjFlip(thing)*mom.z < 0) { // falling, land on slope
thing->momx = mom.x;
thing->momy = mom.y;
- //thing->momz = -P_MobjFlip(thing);
-
thing->standingslope = slope;
+ if (!thing->player || !(thing->player->pflags & PF_BOUNCING))
+ thing->momz = -P_MobjFlip(thing);
}
}
diff --git a/src/p_spec.c b/src/p_spec.c
index 5e06a18a76683b0967cd412c916541f527a133de..256ca3453f0017311392d0b7d7d3043f7fe576a6 100644
--- a/src/p_spec.c
+++ b/src/p_spec.c
@@ -205,8 +205,8 @@ void P_InitPicAnims(void)
if ((W_CheckNumForName(animdefs[i].startname)) == LUMPERROR)
continue;
- lastanim->picnum = R_FlatNumForName(animdefs[i].endname);
- lastanim->basepic = R_FlatNumForName(animdefs[i].startname);
+ lastanim->picnum = R_GetFlatNumForName(animdefs[i].endname);
+ lastanim->basepic = R_GetFlatNumForName(animdefs[i].startname);
}
lastanim->istexture = animdefs[i].istexture;
@@ -464,7 +464,19 @@ static inline void P_FindAnimatedFlat(INT32 animnum)
for (i = 0; i < numlevelflats; i++, foundflats++)
{
// is that levelflat from the flat anim sequence ?
- if (foundflats->lumpnum >= startflatnum && foundflats->lumpnum <= endflatnum)
+ if ((anims[animnum].istexture) && (foundflats->texturenum != 0 && foundflats->texturenum != -1)
+ && ((UINT16)foundflats->texturenum >= startflatnum && (UINT16)foundflats->texturenum <= endflatnum))
+ {
+ foundflats->basetexturenum = startflatnum;
+ foundflats->animseq = foundflats->texturenum - startflatnum;
+ foundflats->numpics = endflatnum - startflatnum + 1;
+ foundflats->speed = anims[animnum].speed;
+
+ CONS_Debug(DBG_SETUP, "animflat: #%03d name:%.8s animseq:%d numpics:%d speed:%d\n",
+ atoi(sizeu1(i)), foundflats->name, foundflats->animseq,
+ foundflats->numpics,foundflats->speed);
+ }
+ else if (foundflats->lumpnum >= startflatnum && foundflats->lumpnum <= endflatnum)
{
foundflats->baselumpnum = startflatnum;
foundflats->animseq = foundflats->lumpnum - startflatnum;
@@ -488,10 +500,7 @@ void P_SetupLevelFlatAnims(void)
// the original game flat anim sequences
for (i = 0; anims[i].istexture != -1; i++)
- {
- if (!anims[i].istexture)
- P_FindAnimatedFlat(i);
- }
+ P_FindAnimatedFlat(i);
}
//
@@ -3096,7 +3105,7 @@ static void P_ProcessLineSpecial(line_t *line, mobj_t *mo, sector_t *callsec)
break;
case 432: // Enable 2D Mode (Disable if noclimb)
- if (mo->player)
+ if (mo && mo->player)
{
if (line->flags & ML_NOCLIMB)
mo->flags2 &= ~MF2_TWOD;
@@ -3122,7 +3131,7 @@ static void P_ProcessLineSpecial(line_t *line, mobj_t *mo, sector_t *callsec)
break;
case 434: // Custom Power
- if (mo->player)
+ if (mo && mo->player)
{
mobj_t *dummy = P_SpawnMobj(mo->x, mo->y, mo->z, MT_NULL);
@@ -3205,7 +3214,7 @@ static void P_ProcessLineSpecial(line_t *line, mobj_t *mo, sector_t *callsec)
break;
case 437: // Disable Player Controls
- if (mo->player)
+ if (mo && mo->player)
{
UINT16 fractime = (UINT16)(sides[line->sidenum[0]].textureoffset>>FRACBITS);
if (fractime < 1)
@@ -3953,6 +3962,39 @@ static void P_ProcessLineSpecial(line_t *line, mobj_t *mo, sector_t *callsec)
}
break;
+ case 461: // Spawns an object on the map based on texture offsets
+ {
+ const mobjtype_t type = (mobjtype_t)(sides[line->sidenum[0]].toptexture);
+ mobj_t *mobj;
+
+ fixed_t x, y, z;
+ x = sides[line->sidenum[0]].textureoffset;
+ y = sides[line->sidenum[0]].rowoffset;
+ z = line->frontsector->floorheight;
+
+ if (line->flags & ML_NOCLIMB) // If noclimb is set, spawn randomly within a range
+ {
+ if (line->sidenum[1] != 0xffff) // Make sure the linedef has a back side
+ {
+ x = P_RandomRange(sides[line->sidenum[0]].textureoffset>>FRACBITS, sides[line->sidenum[1]].textureoffset>>FRACBITS)<<FRACBITS;
+ y = P_RandomRange(sides[line->sidenum[0]].rowoffset>>FRACBITS, sides[line->sidenum[1]].rowoffset>>FRACBITS)<<FRACBITS;
+ z = P_RandomRange(line->frontsector->floorheight>>FRACBITS, line->frontsector->ceilingheight>>FRACBITS)<<FRACBITS;
+ }
+ else
+ {
+ CONS_Alert(CONS_WARNING,"Linedef Type %d - Spawn Object: Linedef is set for random range but has no back side.\n", line->special);
+ break;
+ }
+ }
+
+ mobj = P_SpawnMobj(x, y, z, type);
+ if (mobj)
+ CONS_Debug(DBG_GAMELOGIC, "Linedef Type %d - Spawn Object: %d spawned at (%d, %d, %d)\n", line->special, mobj->type, mobj->x>>FRACBITS, mobj->y>>FRACBITS, mobj->z>>FRACBITS); //TODO: Convert mobj->type to a string somehow.
+ else
+ CONS_Alert(CONS_ERROR,"Linedef Type %d - Spawn Object: Object did not spawn!\n", line->special);
+ }
+ break;
+
#ifdef POLYOBJECTS
case 480: // Polyobj_DoorSlide
case 481: // Polyobj_DoorSwing
@@ -4942,7 +4984,7 @@ DoneSection2:
CONS_Printf(M_GetText("%s started lap %u\n"), player_names[player-players], (UINT32)player->laps+1);
// Reset starposts (checkpoints) info
- player->starpostangle = player->starposttime = player->starpostnum = 0;
+ player->starpostscale = player->starpostangle = player->starposttime = player->starpostnum = 0;
player->starpostx = player->starposty = player->starpostz = 0;
P_ResetStarposts();
@@ -5636,9 +5678,12 @@ void P_UpdateSpecials(void)
{
if (foundflats->speed) // it is an animated flat
{
+ // update the levelflat texture number
+ if (foundflats->basetexturenum != -1)
+ foundflats->texturenum = foundflats->basetexturenum + ((leveltime/foundflats->speed + foundflats->animseq) % foundflats->numpics);
// update the levelflat lump number
- foundflats->lumpnum = foundflats->baselumpnum +
- ((leveltime/foundflats->speed + foundflats->animseq) % foundflats->numpics);
+ else if (foundflats->baselumpnum != LUMPERROR)
+ foundflats->lumpnum = foundflats->baselumpnum + ((leveltime/foundflats->speed + foundflats->animseq) % foundflats->numpics);
}
}
}
diff --git a/src/p_telept.c b/src/p_telept.c
index e80dd04284778301e8210e45349be8d66a2e8a3d..632b81e0488bc3ebeb1306365f2f7e2a476e248f 100644
--- a/src/p_telept.c
+++ b/src/p_telept.c
@@ -33,7 +33,7 @@
void P_MixUp(mobj_t *thing, fixed_t x, fixed_t y, fixed_t z, angle_t angle,
INT16 starpostx, INT16 starposty, INT16 starpostz,
INT32 starpostnum, tic_t starposttime, angle_t starpostangle,
- INT32 flags2)
+ fixed_t starpostscale, angle_t drawangle, INT32 flags2)
{
const INT32 takeflags2 = MF2_TWOD|MF2_OBJECTFLIP;
@@ -89,8 +89,11 @@ void P_MixUp(mobj_t *thing, fixed_t x, fixed_t y, fixed_t z, angle_t angle,
thing->player->starpostz = starpostz;
thing->player->starposttime = starposttime;
thing->player->starpostangle = starpostangle;
+ thing->player->starpostscale = starpostscale;
thing->player->starpostnum = starpostnum;
+ thing->player->drawangle = drawangle;
+
// Reset map starposts for the player's new info.
P_ResetStarposts();
P_ClearStarPost(starpostnum);
diff --git a/src/p_user.c b/src/p_user.c
index b74cafd2180b28951d65145c081d9670095f3f34..58ba00fc94390314fa95213ef7bf96b45fd98d7d 100644
--- a/src/p_user.c
+++ b/src/p_user.c
@@ -1051,6 +1051,8 @@ void P_ResetPlayer(player_t *player)
//
boolean P_PlayerCanDamage(player_t *player, mobj_t *thing)
{
+ fixed_t bottomheight, topheight;
+
if (!player->mo || player->spectator || !thing || P_MobjWasRemoved(thing))
return false;
@@ -1090,13 +1092,26 @@ boolean P_PlayerCanDamage(player_t *player, mobj_t *thing)
return true;
// From the top/bottom.
- if (P_MobjFlip(player->mo)*(player->mo->z - (thing->z + thing->height/2)) > 0)
+ bottomheight = player->mo->z;
+ topheight = player->mo->z + player->mo->height;
+
+ if (player->mo->eflags & MFE_VERTICALFLIP)
+ {
+ fixed_t swap = bottomheight;
+ bottomheight = topheight;
+ topheight = swap;
+ }
+
+ if (P_MobjFlip(player->mo)*(bottomheight - (thing->z + thing->height/2)) > 0)
{
- if ((player->charflags & SF_STOMPDAMAGE || player->pflags & PF_BOUNCING) && (P_MobjFlip(player->mo)*player->mo->momz < 0))
+ if ((player->charflags & SF_STOMPDAMAGE || player->pflags & PF_BOUNCING) && (P_MobjFlip(player->mo)*(player->mo->momz - thing->momz) < 0))
+ return true;
+ }
+ else if (P_MobjFlip(player->mo)*(topheight - (thing->z + thing->height/2)) < 0)
+ {
+ if (player->charability == CA_FLY && player->panim == PA_ABILITY && (P_MobjFlip(player->mo)*(player->mo->momz - thing->momz) > 0))
return true;
}
- else if (player->charability == CA_FLY && player->panim == PA_ABILITY)
- return true;
// Shield stomp.
if (((player->powers[pw_shield] & SH_NOSTACK) == SH_ELEMENTAL || (player->powers[pw_shield] & SH_NOSTACK) == SH_BUBBLEWRAP) && (player->pflags & PF_SHIELDABILITY))
@@ -1416,11 +1431,11 @@ void P_PlayLivesJingle(player_t *player)
S_StartSound(NULL, sfx_marioa);
else
{
+ P_PlayJingle(player, JT_1UP);
if (player)
player->powers[pw_extralife] = extralifetics + 1;
strlcpy(S_sfx[sfx_None].caption, "One-up", 7);
S_StartCaption(sfx_None, -1, extralifetics+1);
- P_PlayJingle(player, JT_1UP);
}
}
@@ -2198,7 +2213,7 @@ boolean P_PlayerHitFloor(player_t *player, boolean dorollstuff)
{
if ((player->charability2 == CA2_SPINDASH) && !(player->pflags & PF_THOKKED) && (player->cmd.buttons & BT_USE) && (FixedHypot(player->mo->momx, player->mo->momy) > (5*player->mo->scale)))
player->pflags |= PF_SPINNING;
- else
+ else if (!(player->pflags & PF_STARTDASH))
player->pflags &= ~PF_SPINNING;
}
@@ -2217,7 +2232,7 @@ boolean P_PlayerHitFloor(player_t *player, boolean dorollstuff)
player->skidtime = TICRATE;
player->mo->tics = -1;
}
- else
+ else if (!player->skidtime)
player->pflags &= ~PF_GLIDING;
}
else if (player->charability2 == CA2_MELEE && player->panim == PA_ABILITY2)
@@ -2268,7 +2283,7 @@ boolean P_PlayerHitFloor(player_t *player, boolean dorollstuff)
}
else if (player->charability2 == CA2_GUNSLINGER && player->panim == PA_ABILITY2)
;
- else if (player->pflags & PF_JUMPED || player->powers[pw_tailsfly] || player->mo->state-states == S_PLAY_FLY_TIRED)
+ else if (player->panim != PA_IDLE && player->panim != PA_WALK && player->panim != PA_RUN && player->panim != PA_DASH)
{
if (player->cmomx || player->cmomy)
{
@@ -3885,6 +3900,33 @@ static void P_SetWeaponDelay(player_t *player, INT32 delay)
}
}
+//
+// P_DrainWeaponAmmo
+//
+// Reduces rings and weapon ammo. Also penalizes the player
+// for using weapon rings with no normal rings! >:V
+//
+static void P_DrainWeaponAmmo (player_t *player, INT32 power)
+{
+ player->powers[power]--;
+
+ if (player->rings < 1)
+ {
+ player->ammoremovalweapon = player->currentweapon;
+ player->ammoremovaltimer = ammoremovaltics;
+
+ if (player->powers[power] > 0) // can't take a ring that doesn't exist
+ {
+ player->powers[power]--;
+ player->ammoremoval = 2;
+ }
+ else
+ player->ammoremoval = 1;
+ }
+ else
+ player->rings--;
+}
+
//
// P_DoFiring()
//
@@ -3923,22 +3965,12 @@ static void P_DoFiring(player_t *player, ticcmd_t *cmd)
player->pflags |= PF_ATTACKDOWN;
-#define TAKE_AMMO(player, power) \
- player->powers[power]--; \
- if (player->rings < 1) \
- { \
- if (player->powers[power] > 0) \
- player->powers[power]--; \
- } \
- else \
- player->rings--;
-
if (cmd->buttons & BT_FIRENORMAL) // No powers, just a regular ring.
goto firenormal; //code repetition sucks.
// Bounce ring
else if (player->currentweapon == WEP_BOUNCE && player->powers[pw_bouncering])
{
- TAKE_AMMO(player, pw_bouncering);
+ P_DrainWeaponAmmo(player, pw_bouncering);
P_SetWeaponDelay(player, TICRATE/4);
mo = P_SpawnPlayerMissile(player->mo, MT_THROWNBOUNCE, MF2_BOUNCERING);
@@ -3949,7 +3981,7 @@ static void P_DoFiring(player_t *player, ticcmd_t *cmd)
// Rail ring
else if (player->currentweapon == WEP_RAIL && player->powers[pw_railring])
{
- TAKE_AMMO(player, pw_railring);
+ P_DrainWeaponAmmo(player, pw_railring);
P_SetWeaponDelay(player, (3*TICRATE)/2);
mo = P_SpawnPlayerMissile(player->mo, MT_REDRING, MF2_RAILRING|MF2_DONTDRAW);
@@ -3960,7 +3992,7 @@ static void P_DoFiring(player_t *player, ticcmd_t *cmd)
// Automatic
else if (player->currentweapon == WEP_AUTO && player->powers[pw_automaticring])
{
- TAKE_AMMO(player, pw_automaticring);
+ P_DrainWeaponAmmo(player, pw_automaticring);
player->pflags &= ~PF_ATTACKDOWN;
P_SetWeaponDelay(player, 2);
@@ -3969,7 +4001,7 @@ static void P_DoFiring(player_t *player, ticcmd_t *cmd)
// Explosion
else if (player->currentweapon == WEP_EXPLODE && player->powers[pw_explosionring])
{
- TAKE_AMMO(player, pw_explosionring);
+ P_DrainWeaponAmmo(player, pw_explosionring);
P_SetWeaponDelay(player, (3*TICRATE)/2);
mo = P_SpawnPlayerMissile(player->mo, MT_THROWNEXPLOSION, MF2_EXPLOSION);
@@ -3977,7 +4009,7 @@ static void P_DoFiring(player_t *player, ticcmd_t *cmd)
// Grenade
else if (player->currentweapon == WEP_GRENADE && player->powers[pw_grenadering])
{
- TAKE_AMMO(player, pw_grenadering);
+ P_DrainWeaponAmmo(player, pw_grenadering);
P_SetWeaponDelay(player, TICRATE/3);
mo = P_SpawnPlayerMissile(player->mo, MT_THROWNGRENADE, MF2_EXPLOSION);
@@ -3996,7 +4028,7 @@ static void P_DoFiring(player_t *player, ticcmd_t *cmd)
angle_t shotangle = player->mo->angle;
angle_t oldaiming = player->aiming;
- TAKE_AMMO(player, pw_scatterring);
+ P_DrainWeaponAmmo(player, pw_scatterring);
P_SetWeaponDelay(player, (2*TICRATE)/3);
// Center
@@ -4058,8 +4090,6 @@ firenormal:
}
}
- #undef TAKE_AMMO
-
if (mo)
{
if (mo->flags & MF_MISSILE && mo->flags2 & MF2_RAILRING)
@@ -6509,12 +6539,12 @@ static void P_DoNiGHTSCapsule(player_t *player)
player->capsule->health = sphereresult;
}
- // Spawn a 'pop' for every 5 tics
- if (!((tictimer - firstpoptic) % 5))
+ // Spawn a 'pop' for every 2 tics
+ if (!((tictimer - firstpoptic) % 2))
S_StartSound(P_SpawnMobj(player->capsule->x + ((P_SignedRandom()/2)<<FRACBITS),
player->capsule->y + ((P_SignedRandom()/2)<<FRACBITS),
player->capsule->z + (player->capsule->height/2) + ((P_SignedRandom()/2)<<FRACBITS),
- MT_BOSSEXPLODE),sfx_cybdth);
+ MT_SONIC3KBOSSEXPLODE),sfx_s3kb4);
}
else
{
@@ -10134,6 +10164,7 @@ void P_DoPityCheck(player_t *player)
}
}
+
static sector_t *P_GetMinecartSector(fixed_t x, fixed_t y, fixed_t z, fixed_t *nz)
{
sector_t *sec = R_PointInSubsector(x, y)->sector;
@@ -10546,6 +10577,191 @@ static void P_MinecartThink(player_t *player)
player->powers[pw_flashing]--;
}
+// Handle Tails' fluff
+static void P_DoTailsOverlay(player_t *player, mobj_t *tails)
+{
+ // init...
+ boolean smilesonground = P_IsObjectOnGround(player->mo);
+ angle_t horizangle = player->drawangle;
+ fixed_t zoffs = 0;
+ fixed_t backwards = -1*FRACUNIT;
+ boolean doroll = (player->panim == PA_ROLL || player->panim == PA_JUMP);
+ angle_t rollangle;
+ boolean panimchange;
+ INT32 ticnum = 0;
+ statenum_t chosenstate;
+
+ if (!tails->skin)
+ {
+ tails->skin = player->mo->skin;
+ P_SetMobjState(tails, S_TAILSOVERLAY_STAND);
+ tails->movecount = -1;
+ }
+
+ panimchange = (tails->movecount != (INT32)player->panim);
+
+ // initial position...
+ if (doroll)
+ {
+ fixed_t testval, zdist;
+ if (player->speed < FRACUNIT)
+ testval = FRACUNIT;
+ else
+ {
+ testval = (FixedMul(player->speed, FINECOSINE((horizangle - R_PointToAngle2(0, 0, player->rmomx, player->rmomy)) >> ANGLETOFINESHIFT)));
+ if (testval < FRACUNIT)
+ testval = FRACUNIT;
+ }
+ if (smilesonground && !player->mo->reactiontime)
+ zdist = (player->mo->z - tails->threshold);
+ else
+ zdist = player->mo->momz;
+ rollangle = R_PointToAngle2(0, 0, testval, -P_MobjFlip(player->mo)*zdist);
+ zoffs = 3*FRACUNIT + 12*FINESINE(rollangle >> ANGLETOFINESHIFT);
+ backwards = -12*FINECOSINE(rollangle >> ANGLETOFINESHIFT);
+ }
+ else if (player->panim == PA_RUN)
+ backwards = -5*FRACUNIT;
+ else if (player->panim == PA_SPRING)
+ {
+ zoffs += 4*FRACUNIT;
+ backwards /= 2;
+ }
+ else if (player->panim == PA_PAIN)
+ backwards /= 16;
+ else if (player->mo->state-states == S_PLAY_GASP)
+ {
+ backwards /= 16;
+ zoffs += 12*FRACUNIT;
+ }
+ else if (player->mo->state-states == S_PLAY_EDGE)
+ {
+ backwards /= 16;
+ zoffs = 3*FRACUNIT;
+ }
+ else if (player->panim == PA_ABILITY2)
+ {
+ zoffs = -7*FRACUNIT;
+ backwards = -9*FRACUNIT;
+ }
+ else if (player->mo->sprite2 == SPR2_FLY || player->mo->sprite2 == SPR2_TIRE)
+ backwards = -5*FRACUNIT;
+
+ // sprite...
+ if (doroll)
+ {
+ statenum_t add = ((rollangle > ANGLE_180) ? 2 : 0);
+ if (add)
+ rollangle = InvAngle(rollangle);
+ rollangle += ANG15; // modify the thresholds to be nice clean numbers
+ if (rollangle > ANG60)
+ chosenstate = S_TAILSOVERLAY_PLUS60DEGREES + add;
+ else if (rollangle > ANG30)
+ chosenstate = S_TAILSOVERLAY_PLUS30DEGREES + add;
+ else
+ chosenstate = S_TAILSOVERLAY_0DEGREES;
+ }
+ else if (player->panim == PA_SPRING)
+ chosenstate = S_TAILSOVERLAY_MINUS60DEGREES;
+ else if (player->panim == PA_FALL || player->mo->state-states == S_PLAY_RIDE)
+ chosenstate = S_TAILSOVERLAY_PLUS60DEGREES;
+ else if (player->panim == PA_PAIN)
+ chosenstate = S_TAILSOVERLAY_PAIN;
+ else if (player->mo->state-states == S_PLAY_GASP)
+ chosenstate = S_TAILSOVERLAY_GASP;
+ else if (player->mo->state-states == S_PLAY_EDGE)
+ chosenstate = S_TAILSOVERLAY_EDGE;
+ else if (player->panim == PA_RUN)
+ chosenstate = S_TAILSOVERLAY_RUN;
+ else if (player->panim == PA_WALK)
+ {
+ if (!smilesonground || player->mo->state-states == S_PLAY_SKID)
+ chosenstate = S_TAILSOVERLAY_PLUS30DEGREES;
+ else if (player->speed >= FixedMul(player->runspeed/2, player->mo->scale))
+ chosenstate = S_TAILSOVERLAY_0DEGREES;
+ else
+ chosenstate = S_TAILSOVERLAY_MINUS30DEGREES;
+ }
+ else if (player->mo->sprite2 == SPR2_FLY)
+ chosenstate = S_TAILSOVERLAY_FLY;
+ else if (player->mo->sprite2 == SPR2_TIRE)
+ chosenstate = S_TAILSOVERLAY_TIRE;
+ else if (player->panim == PA_ABILITY2)
+ chosenstate = S_TAILSOVERLAY_PLUS30DEGREES;
+ else if (player->panim == PA_IDLE)
+ chosenstate = S_TAILSOVERLAY_STAND;
+ else
+ chosenstate = S_INVISIBLE;
+
+ // state...
+ if (panimchange)
+ {
+ tails->sprite2 = -1;
+ P_SetMobjState(tails, chosenstate);
+ }
+ else
+ {
+ if (tails->state != states+chosenstate)
+ {
+ if (states[chosenstate].sprite == SPR_PLAY)
+ tails->sprite2 = P_GetSkinSprite2(((skin_t *)tails->skin), (states[chosenstate].frame & FF_FRAMEMASK), player);
+ P_SetMobjState(tails, chosenstate);
+ }
+ }
+
+ if (player->fly1 != 0 && player->powers[pw_tailsfly] != 0 && !smilesonground)
+ P_SetMobjState(tails, chosenstate);
+
+ // animation...
+ if (player->panim == PA_SPRING || player->panim == PA_FALL || player->mo->state-states == S_PLAY_RIDE)
+ {
+ if (FixedDiv(abs(player->mo->momz), player->mo->scale) < 20<<FRACBITS)
+ ticnum = 2;
+ else
+ ticnum = 1;
+ }
+ else if (player->panim == PA_PAIN)
+ ticnum = 2;
+ else if (player->mo->state-states == S_PLAY_GASP)
+ tails->tics = -1;
+ else if (player->mo->sprite2 == SPR2_TIRE)
+ ticnum = 4;
+ else if (player->panim != PA_IDLE)
+ ticnum = player->mo->tics;
+
+ if (ticnum && tails->tics > ticnum)
+ tails->tics = ticnum;
+
+ // final handling...
+ tails->color = player->mo->color;
+ tails->threshold = player->mo->z;
+ tails->movecount = player->panim;
+ tails->angle = horizangle;
+ P_SetScale(tails, player->mo->scale);
+ tails->destscale = player->mo->destscale;
+ tails->radius = player->mo->radius;
+ tails->height = player->mo->height;
+ zoffs = FixedMul(zoffs, tails->scale);
+
+ if (player->mo->eflags & MFE_VERTICALFLIP)
+ {
+ tails->eflags |= MFE_VERTICALFLIP;
+ tails->flags2 |= MF2_OBJECTFLIP;
+ zoffs = player->mo->height - tails->height - zoffs;
+ }
+ else
+ {
+ tails->eflags &= ~MFE_VERTICALFLIP;
+ tails->flags2 &= ~MF2_OBJECTFLIP;
+ }
+
+ P_UnsetThingPosition(tails);
+ tails->x = player->mo->x + P_ReturnThrustX(tails, tails->angle, FixedMul(backwards, tails->scale));
+ tails->y = player->mo->y + P_ReturnThrustY(tails, tails->angle, FixedMul(backwards, tails->scale));
+ tails->z = player->mo->z + zoffs;
+ P_SetThingPosition(tails);
+}
+
//
// P_PlayerThink
//
@@ -10688,6 +10904,9 @@ void P_PlayerThink(player_t *player)
if (player->exiting && countdown2)
player->exiting = 5;
+ // The following code is disabled for now as this causes the game to freeze sometimes
+ // Monster Iestyn -- 16/08/19
+#if 0
// Same check as below, just at 1 second before
// so we can fade music
if (!exitfadestarted &&
@@ -10725,6 +10944,7 @@ void P_PlayerThink(player_t *player)
S_FadeOutStopMusic(1*MUSICRATE);
}
}
+#endif
if (player->exiting == 2 || countdown2 == 2)
{
@@ -11043,6 +11263,16 @@ void P_PlayerThink(player_t *player)
if (!currentlyonground)
acceleration /= 2;
+ // fake skidding! see P_SkidStuff for reference on conditionals
+ else if (!player->skidtime && !(player->mo->eflags & MFE_GOOWATER) && !(player->pflags & (PF_JUMPED|PF_SPINNING|PF_SLIDING)) && !(player->charflags & SF_NOSKID) && P_AproxDistance(player->mo->momx, player->mo->momy) >= FixedMul(player->runspeed/2, player->mo->scale))
+ {
+ if (player->mo->state-states != S_PLAY_SKID)
+ P_SetPlayerMobjState(player->mo, S_PLAY_SKID);
+ player->mo->tics = player->skidtime = (player->mo->movefactor == FRACUNIT) ? TICRATE/2 : (FixedDiv(35<<(FRACBITS-1), FixedSqrt(player->mo->movefactor)))>>FRACBITS;
+
+ if (P_IsLocalPlayer(player)) // the sound happens way more frequently now, so give co-op players' ears a brake...
+ S_StartSound(player->mo, sfx_skid);
+ }
if (player->mo->movefactor != FRACUNIT) // Friction-scaled acceleration...
acceleration = FixedMul(acceleration<<FRACBITS, player->mo->movefactor)>>FRACBITS;
@@ -11127,6 +11357,12 @@ void P_PlayerThink(player_t *player)
// Counters, time dependent power ups.
// Time Bonus & Ring Bonus count settings
+ if (player->ammoremovaltimer)
+ {
+ if (--player->ammoremovaltimer == 0)
+ player->ammoremoval = 0;
+ }
+
// Strength counts up to diminish fade.
if (player->powers[pw_sneakers] && player->powers[pw_sneakers] < UINT16_MAX)
player->powers[pw_sneakers]--;
@@ -11500,130 +11736,149 @@ void P_PlayerAfterThink(player_t *player)
/* if (player->powers[pw_carry] == CR_NONE && player->mo->tracer && !player->homing)
P_SetTarget(&player->mo->tracer, NULL);
else */
- if (player->powers[pw_carry] == CR_PLAYER && player->mo->tracer)
+ if (player->mo->tracer)
{
- player->mo->height = FixedDiv(P_GetPlayerHeight(player), FixedDiv(14*FRACUNIT,10*FRACUNIT));
+ switch (player->powers[pw_carry])
+ {
+ case CR_PLAYER: // being carried by a flying character (such as Tails)
+ {
+ mobj_t *tails = player->mo->tracer;
+ player->mo->height = FixedDiv(P_GetPlayerHeight(player), FixedDiv(14*FRACUNIT,10*FRACUNIT));
- if (player->mo->tracer->player && !(player->mo->tracer->player->pflags & PF_CANCARRY))
- player->powers[pw_carry] = CR_NONE;
+ if (tails->player && !(tails->player->pflags & PF_CANCARRY))
+ player->powers[pw_carry] = CR_NONE;
- if (player->mo->eflags & MFE_VERTICALFLIP)
- {
- if ((player->mo->tracer->z + player->mo->tracer->height + player->mo->height + FixedMul(FRACUNIT, player->mo->scale)) <= player->mo->tracer->ceilingz
- && (player->mo->tracer->eflags & MFE_VERTICALFLIP)) // Reverse gravity check for the carrier - Flame
- player->mo->z = player->mo->tracer->z + player->mo->tracer->height + FixedMul(FRACUNIT, player->mo->scale);
- else
- player->powers[pw_carry] = CR_NONE;
- }
- else
- {
- if ((player->mo->tracer->z - player->mo->height - FixedMul(FRACUNIT, player->mo->scale)) >= player->mo->tracer->floorz
- && !(player->mo->tracer->eflags & MFE_VERTICALFLIP)) // Correct gravity check for the carrier - Flame
- player->mo->z = player->mo->tracer->z - player->mo->height - FixedMul(FRACUNIT, player->mo->scale);
- else
- player->powers[pw_carry] = CR_NONE;
- }
+ if (player->mo->eflags & MFE_VERTICALFLIP)
+ {
+ if ((tails->z + tails->height + player->mo->height + FixedMul(FRACUNIT, player->mo->scale)) <= tails->ceilingz
+ && (tails->eflags & MFE_VERTICALFLIP)) // Reverse gravity check for the carrier - Flame
+ player->mo->z = tails->z + tails->height + FixedMul(FRACUNIT, player->mo->scale);
+ else
+ player->powers[pw_carry] = CR_NONE;
+ }
+ else
+ {
+ if ((tails->z - player->mo->height - FixedMul(FRACUNIT, player->mo->scale)) >= tails->floorz
+ && !(tails->eflags & MFE_VERTICALFLIP)) // Correct gravity check for the carrier - Flame
+ player->mo->z = tails->z - player->mo->height - FixedMul(FRACUNIT, player->mo->scale);
+ else
+ player->powers[pw_carry] = CR_NONE;
+ }
- if (player->mo->tracer->health <= 0)
- player->powers[pw_carry] = CR_NONE;
- else
- {
- P_TryMove(player->mo, player->mo->tracer->x, player->mo->tracer->y, true);
- player->mo->momx = player->mo->tracer->momx;
- player->mo->momy = player->mo->tracer->momy;
- player->mo->momz = player->mo->tracer->momz;
- }
+ if (tails->health <= 0)
+ player->powers[pw_carry] = CR_NONE;
+ else
+ {
+ P_TryMove(player->mo, tails->x, tails->y, true);
+ player->mo->momx = tails->momx;
+ player->mo->momy = tails->momy;
+ player->mo->momz = tails->momz;
+ }
- if (gametype == GT_COOP)
- {
- player->mo->angle = player->mo->tracer->angle;
+ if (gametype == GT_COOP)
+ {
+ player->mo->angle = tails->angle;
- if (!demoplayback || P_AnalogMove(player))
- {
- if (player == &players[consoleplayer])
- localangle = player->mo->angle;
- else if (player == &players[secondarydisplayplayer])
- localangle2 = player->mo->angle;
- }
- }
+ if (!demoplayback || P_AnalogMove(player))
+ {
+ if (player == &players[consoleplayer])
+ localangle = player->mo->angle;
+ else if (player == &players[secondarydisplayplayer])
+ localangle2 = player->mo->angle;
+ }
+ }
- if (P_AproxDistance(player->mo->x - player->mo->tracer->x, player->mo->y - player->mo->tracer->y) > player->mo->radius)
- player->powers[pw_carry] = CR_NONE;
+ if (P_AproxDistance(player->mo->x - tails->x, player->mo->y - tails->y) > player->mo->radius)
+ player->powers[pw_carry] = CR_NONE;
- if (player->powers[pw_carry] != CR_NONE)
- {
- if (player->mo->state-states != S_PLAY_RIDE)
- P_SetPlayerMobjState(player->mo, S_PLAY_RIDE);
- }
- else
- P_SetTarget(&player->mo->tracer, NULL);
+ if (player->powers[pw_carry] != CR_NONE)
+ {
+ if (player->mo->state-states != S_PLAY_RIDE)
+ P_SetPlayerMobjState(player->mo, S_PLAY_RIDE);
+ }
+ else
+ P_SetTarget(&player->mo->tracer, NULL);
- if (player-players == consoleplayer && botingame)
- CV_SetValue(&cv_analog2, (player->powers[pw_carry] != CR_PLAYER));
- }
- else if (player->powers[pw_carry] == CR_GENERIC && player->mo->tracer)
- {
- // tracer is what you're hanging onto
- P_UnsetThingPosition(player->mo);
- player->mo->x = player->mo->tracer->x;
- player->mo->y = player->mo->tracer->y;
- if (player->mo->eflags & MFE_VERTICALFLIP)
- player->mo->z = player->mo->tracer->z + player->mo->tracer->height - FixedDiv(player->mo->height, 3*FRACUNIT);
- else
- player->mo->z = player->mo->tracer->z - FixedDiv(player->mo->height, 3*FRACUNIT/2);
- player->mo->momx = player->mo->momy = player->mo->momz = 0;
- P_SetThingPosition(player->mo);
- if (player->mo->state-states != S_PLAY_RIDE)
- P_SetPlayerMobjState(player->mo, S_PLAY_RIDE);
+ if (player-players == consoleplayer && botingame)
+ CV_SetValue(&cv_analog2, (player->powers[pw_carry] != CR_PLAYER));
+ break;
+ }
+ case CR_GENERIC: // being carried by some generic item
+ {
+ mobj_t *item = player->mo->tracer;
+ // tracer is what you're hanging onto
+ P_UnsetThingPosition(player->mo);
+ player->mo->x = item->x;
+ player->mo->y = item->y;
+ if (player->mo->eflags & MFE_VERTICALFLIP)
+ player->mo->z = item->z + item->height - FixedDiv(player->mo->height, 3*FRACUNIT);
+ else
+ player->mo->z = item->z - FixedDiv(player->mo->height, 3*FRACUNIT/2);
+ player->mo->momx = player->mo->momy = player->mo->momz = 0;
+ P_SetThingPosition(player->mo);
+ if (player->mo->state-states != S_PLAY_RIDE)
+ P_SetPlayerMobjState(player->mo, S_PLAY_RIDE);
- // Controllable missile
- if (player->mo->tracer->type == MT_BLACKEGGMAN_MISSILE)
- {
- if (cmd->forwardmove > 0)
- player->mo->tracer->momz += FixedMul(FRACUNIT/4, player->mo->tracer->scale);
- else if (cmd->forwardmove < 0)
- player->mo->tracer->momz -= FixedMul(FRACUNIT/4, player->mo->tracer->scale);
+ // Controllable missile
+ if (item->type == MT_BLACKEGGMAN_MISSILE)
+ {
+ if (cmd->forwardmove > 0)
+ item->momz += FixedMul(FRACUNIT/4, item->scale);
+ else if (cmd->forwardmove < 0)
+ item->momz -= FixedMul(FRACUNIT/4, item->scale);
- player->mo->tracer->angle = player->mo->angle;
- P_InstaThrust(player->mo->tracer, player->mo->tracer->angle, FixedMul(player->mo->tracer->info->speed, player->mo->tracer->scale));
+ item->angle = player->mo->angle;
+ P_InstaThrust(item, item->angle, FixedMul(item->info->speed, item->scale));
- if (player->mo->z <= player->mo->floorz
- || player->mo->tracer->health <= 0)
- {
- player->powers[pw_carry] = CR_NONE;
- P_SetTarget(&player->mo->tracer, NULL);
+ if (player->mo->z <= player->mo->floorz || item->health <= 0)
+ {
+ player->powers[pw_carry] = CR_NONE;
+ P_SetTarget(&player->mo->tracer, NULL);
+ }
+ }
+ break;
}
- }
- }
- else if (player->powers[pw_carry] == CR_MACESPIN && player->mo->tracer && player->mo->tracer->tracer)
- {
- player->mo->height = P_GetPlayerSpinHeight(player);
- // tracer is what you're hanging onto....
- player->mo->momx = (player->mo->tracer->x - player->mo->x)*2;
- player->mo->momy = (player->mo->tracer->y - player->mo->y)*2;
- player->mo->momz = (player->mo->tracer->z - (player->mo->height-player->mo->tracer->height/2) - player->mo->z)*2;
- P_TeleportMove(player->mo, player->mo->tracer->x, player->mo->tracer->y, player->mo->tracer->z - (player->mo->height-player->mo->tracer->height/2));
- if (!player->powers[pw_flashing]) // handle getting hurt
- {
- player->pflags |= PF_JUMPED;
- player->pflags &= ~PF_NOJUMPDAMAGE;
- player->secondjump = 0;
- player->pflags &= ~PF_THOKKED;
-
- if ((player->mo->tracer->tracer->flags & MF_SLIDEME) // Noclimb on chain parameters gives this
- && !(twodlevel || player->mo->flags2 & MF2_TWOD)) // why on earth would you want to turn them in 2D mode?
+ case CR_MACESPIN: // being carried by a spinning chain
{
- player->mo->tracer->tracer->angle += cmd->sidemove<<ANGLETOFINESHIFT;
- player->mo->angle += cmd->sidemove<<ANGLETOFINESHIFT; // 2048 --> ANGLE_MAX
-
- if (!demoplayback || P_AnalogMove(player))
+ mobj_t *chain;
+ mobj_t *macecenter;
+ if (!player->mo->tracer->tracer) // can't spin around a point if... there is no point in doing so
+ break;
+ chain = player->mo->tracer;
+ macecenter = player->mo->tracer->tracer;
+
+ player->mo->height = P_GetPlayerSpinHeight(player);
+ // tracer is what you're hanging onto....
+ player->mo->momx = (chain->x - player->mo->x)*2;
+ player->mo->momy = (chain->y - player->mo->y)*2;
+ player->mo->momz = (chain->z - (player->mo->height-chain->height/2) - player->mo->z)*2;
+ P_TeleportMove(player->mo, chain->x, chain->y, chain->z - (player->mo->height-chain->height/2));
+ if (!player->powers[pw_flashing]) // handle getting hurt
{
- if (player == &players[consoleplayer])
- localangle = player->mo->angle; // Adjust the local control angle.
- else if (player == &players[secondarydisplayplayer])
- localangle2 = player->mo->angle;
+ player->pflags |= PF_JUMPED;
+ player->pflags &= ~PF_NOJUMPDAMAGE;
+ player->secondjump = 0;
+ player->pflags &= ~PF_THOKKED;
+
+ if ((macecenter->flags & MF_SLIDEME) // Noclimb on chain parameters gives this
+ && !(twodlevel || player->mo->flags2 & MF2_TWOD)) // why on earth would you want to turn them in 2D mode?
+ {
+ macecenter->angle += cmd->sidemove<<ANGLETOFINESHIFT;
+ player->mo->angle += cmd->sidemove<<ANGLETOFINESHIFT; // 2048 --> ANGLE_MAX
+
+ if (!demoplayback || P_AnalogMove(player))
+ {
+ if (player == &players[consoleplayer])
+ localangle = player->mo->angle; // Adjust the local control angle.
+ else if (player == &players[secondarydisplayplayer])
+ localangle2 = player->mo->angle;
+ }
+ }
}
+ break;
}
+ default:
+ break;
}
}
@@ -11684,188 +11939,7 @@ void P_PlayerAfterThink(player_t *player)
switch (player->followmobj->type)
{
case MT_TAILSOVERLAY: // c:
- {
- // init...
- boolean smilesonground = P_IsObjectOnGround(player->mo);
- angle_t horizangle = player->drawangle;
- fixed_t zoffs = 0;
- fixed_t backwards = -1*FRACUNIT;
- boolean doroll = (player->panim == PA_ROLL || player->panim == PA_JUMP);
- angle_t rollangle;
- boolean panimchange;
- INT32 ticnum = 0;
- statenum_t chosenstate;
-
- if (!player->followmobj->skin)
- {
- player->followmobj->skin = player->mo->skin;
- P_SetMobjState(player->followmobj, S_TAILSOVERLAY_STAND);
- player->followmobj->movecount = -1;
- }
-
- panimchange = (player->followmobj->movecount != (INT32)player->panim);
-
- // initial position...
- if (doroll)
- {
- fixed_t testval, zdist;
- if (player->speed < FRACUNIT)
- testval = FRACUNIT;
- else
- {
- testval = (FixedMul(player->speed, FINECOSINE((horizangle - R_PointToAngle2(0, 0, player->rmomx, player->rmomy)) >> ANGLETOFINESHIFT)));
- if (testval < FRACUNIT)
- testval = FRACUNIT;
- }
- if (smilesonground && !player->mo->reactiontime)
- zdist = (player->mo->z - player->followmobj->threshold);
- else
- zdist = player->mo->momz;
- rollangle = R_PointToAngle2(0, 0, testval, -P_MobjFlip(player->mo)*zdist);
- zoffs = 3*FRACUNIT + 12*FINESINE(rollangle >> ANGLETOFINESHIFT);
- backwards = -12*FINECOSINE(rollangle >> ANGLETOFINESHIFT);
- }
- else if (player->panim == PA_RUN)
- backwards = -5*FRACUNIT;
- else if (player->panim == PA_SPRING)
- {
- zoffs += 4*FRACUNIT;
- backwards /= 2;
- }
- else if (player->panim == PA_PAIN)
- backwards /= 16;
- else if (player->mo->state-states == S_PLAY_GASP)
- {
- backwards /= 16;
- zoffs += 12*FRACUNIT;
- }
- else if (player->mo->state-states == S_PLAY_EDGE)
- {
- backwards /= 16;
- zoffs = 3*FRACUNIT;
- }
- else if (player->panim == PA_ABILITY2)
- {
- zoffs = -7*FRACUNIT;
- backwards = -9*FRACUNIT;
- }
- else if (player->mo->sprite2 == SPR2_FLY || player->mo->sprite2 == SPR2_TIRE)
- backwards = -5*FRACUNIT;
-
- // sprite...
- if (doroll)
- {
- statenum_t add = ((rollangle > ANGLE_180) ? 2 : 0);
- if (add)
- rollangle = InvAngle(rollangle);
- rollangle += ANG15; // modify the thresholds to be nice clean numbers
- if (rollangle > ANG60)
- chosenstate = S_TAILSOVERLAY_PLUS60DEGREES + add;
- else if (rollangle > ANG30)
- chosenstate = S_TAILSOVERLAY_PLUS30DEGREES + add;
- else
- chosenstate = S_TAILSOVERLAY_0DEGREES;
- }
- else if (player->panim == PA_SPRING)
- chosenstate = S_TAILSOVERLAY_MINUS60DEGREES;
- else if (player->panim == PA_FALL || player->mo->state-states == S_PLAY_RIDE)
- chosenstate = S_TAILSOVERLAY_PLUS60DEGREES;
- else if (player->panim == PA_PAIN)
- chosenstate = S_TAILSOVERLAY_PAIN;
- else if (player->mo->state-states == S_PLAY_GASP)
- chosenstate = S_TAILSOVERLAY_GASP;
- else if (player->mo->state-states == S_PLAY_EDGE)
- chosenstate = S_TAILSOVERLAY_EDGE;
- else if (player->panim == PA_RUN)
- chosenstate = S_TAILSOVERLAY_RUN;
- else if (player->panim == PA_WALK)
- {
- if (!smilesonground || player->mo->state-states == S_PLAY_SKID)
- chosenstate = S_TAILSOVERLAY_PLUS30DEGREES;
- else if (player->speed >= FixedMul(player->runspeed/2, player->mo->scale))
- chosenstate = S_TAILSOVERLAY_0DEGREES;
- else
- chosenstate = S_TAILSOVERLAY_MINUS30DEGREES;
- }
- else if (player->mo->sprite2 == SPR2_FLY)
- chosenstate = S_TAILSOVERLAY_FLY;
- else if (player->mo->sprite2 == SPR2_TIRE)
- chosenstate = S_TAILSOVERLAY_TIRE;
- else if (player->panim == PA_ABILITY2)
- chosenstate = S_TAILSOVERLAY_PLUS30DEGREES;
- else if (player->panim == PA_IDLE)
- chosenstate = S_TAILSOVERLAY_STAND;
- else
- chosenstate = S_INVISIBLE;
-
- // state...
- if (panimchange)
- {
- player->followmobj->sprite2 = -1;
- P_SetMobjState(player->followmobj, chosenstate);
- }
- else
- {
- if (player->followmobj->state != states+chosenstate)
- {
- if (states[chosenstate].sprite == SPR_PLAY)
- player->followmobj->sprite2 = P_GetSkinSprite2(((skin_t *)player->followmobj->skin), (states[chosenstate].frame & FF_FRAMEMASK), player);
- P_SetMobjState(player->followmobj, chosenstate);
- }
- }
-
- if (player->fly1 != 0 && player->powers[pw_tailsfly] != 0 && !smilesonground)
- P_SetMobjState(player->followmobj, chosenstate);
-
- // animation...
- if (player->panim == PA_SPRING || player->panim == PA_FALL || player->mo->state-states == S_PLAY_RIDE)
- {
- if (FixedDiv(abs(player->mo->momz), player->mo->scale) < 20<<FRACBITS)
- ticnum = 2;
- else
- ticnum = 1;
- }
- else if (player->panim == PA_PAIN)
- ticnum = 2;
- else if (player->mo->state-states == S_PLAY_GASP)
- player->followmobj->tics = -1;
- else if (player->mo->sprite2 == SPR2_TIRE)
- ticnum = 4;
- else if (player->panim != PA_IDLE)
- ticnum = player->mo->tics;
-
- if (ticnum && player->followmobj->tics > ticnum)
- player->followmobj->tics = ticnum;
-
- // final handling...
- player->followmobj->color = player->mo->color;
- player->followmobj->threshold = player->mo->z;
- player->followmobj->movecount = player->panim;
- player->followmobj->angle = horizangle;
- P_SetScale(player->followmobj, player->mo->scale);
- player->followmobj->destscale = player->mo->destscale;
- player->followmobj->radius = player->mo->radius;
- player->followmobj->height = player->mo->height;
- zoffs = FixedMul(zoffs, player->followmobj->scale);
-
- if (player->mo->eflags & MFE_VERTICALFLIP)
- {
- player->followmobj->eflags |= MFE_VERTICALFLIP;
- player->followmobj->flags2 |= MF2_OBJECTFLIP;
- zoffs = player->mo->height - player->followmobj->height - zoffs;
- }
- else
- {
- player->followmobj->eflags &= ~MFE_VERTICALFLIP;
- player->followmobj->flags2 &= ~MF2_OBJECTFLIP;
- }
-
- P_UnsetThingPosition(player->followmobj);
- player->followmobj->x = player->mo->x + P_ReturnThrustX(player->followmobj, player->followmobj->angle, FixedMul(backwards, player->followmobj->scale));
- player->followmobj->y = player->mo->y + P_ReturnThrustY(player->followmobj, player->followmobj->angle, FixedMul(backwards, player->followmobj->scale));
- player->followmobj->z = player->mo->z + zoffs;
- P_SetThingPosition(player->followmobj);
- }
+ P_DoTailsOverlay(player, player->followmobj);
break;
default:
var1 = 1;
diff --git a/src/r_bsp.c b/src/r_bsp.c
index d521d9f4d4943a6ea5e341738a20e2100dadb91b..23e751420e30a8a2393fbce60712ef799eca2887 100644
--- a/src/r_bsp.c
+++ b/src/r_bsp.c
@@ -1088,9 +1088,9 @@ static void R_Subsector(size_t num)
{
light = R_GetPlaneLight(frontsector, polysec->floorheight, viewz < polysec->floorheight);
ffloor[numffloors].plane = R_FindPlane(polysec->floorheight, polysec->floorpic,
- polysec->lightlevel, polysec->floor_xoffs, polysec->floor_yoffs,
+ (light == -1 ? frontsector->lightlevel : *frontsector->lightlist[light].lightlevel), polysec->floor_xoffs, polysec->floor_yoffs,
polysec->floorpic_angle-po->angle,
- NULL, NULL, po
+ (light == -1 ? frontsector->extra_colormap : *frontsector->lightlist[light].extra_colormap), NULL, po
#ifdef ESLOPE
, NULL // will ffloors be slopable eventually?
#endif
@@ -1115,10 +1115,10 @@ static void R_Subsector(size_t num)
&& polysec->ceilingheight <= ceilingcenterz
&& (viewz > polysec->ceilingheight))
{
- light = R_GetPlaneLight(frontsector, polysec->ceilingheight, viewz < polysec->ceilingheight);
+ light = R_GetPlaneLight(frontsector, polysec->floorheight, viewz < polysec->floorheight);
ffloor[numffloors].plane = R_FindPlane(polysec->ceilingheight, polysec->ceilingpic,
- polysec->lightlevel, polysec->ceiling_xoffs, polysec->ceiling_yoffs, polysec->ceilingpic_angle-po->angle,
- NULL, NULL, po
+ (light == -1 ? frontsector->lightlevel : *frontsector->lightlist[light].lightlevel), polysec->ceiling_xoffs, polysec->ceiling_yoffs, polysec->ceilingpic_angle-po->angle,
+ (light == -1 ? frontsector->extra_colormap : *frontsector->lightlist[light].extra_colormap), NULL, po
#ifdef ESLOPE
, NULL // will ffloors be slopable eventually?
#endif
diff --git a/src/r_data.c b/src/r_data.c
index 6889bdddebf587ce22b3526066fca43aec364ceb..38dc28980571b74cd7596b9c15d4cefffc949323 100644
--- a/src/r_data.c
+++ b/src/r_data.c
@@ -40,6 +40,28 @@
#include <errno.h>
#endif
+#ifdef HAVE_PNG
+
+#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 "png.h"
+#ifndef PNG_READ_SUPPORTED
+#undef HAVE_PNG
+#endif
+#endif
+
//
// Texture definition.
// Each texture is composed of one or more patches,
@@ -98,12 +120,11 @@ INT32 numtextures = 0; // total number of textures found,
// size of following tables
texture_t **textures = NULL;
+textureflat_t *texflats = NULL;
static UINT32 **texturecolumnofs; // column offset lookup table for each texture
static UINT8 **texturecache; // graphics data for each generated full-size texture
-// texture width is a power of 2, so it can easily repeat along sidedefs using a simple mask
-INT32 *texturewidthmask;
-
+INT32 *texturewidth;
fixed_t *textureheight; // needed for texture pegging
INT32 *texturetranslation;
@@ -220,15 +241,110 @@ static inline void R_DrawFlippedColumnInCache(column_t *patch, UINT8 *cache, tex
}
}
+RGBA_t ASTBlendPixel(RGBA_t background, RGBA_t foreground, int style, UINT8 alpha)
+{
+ RGBA_t output;
+ if (style == AST_TRANSLUCENT)
+ {
+ if (alpha == 0)
+ output.rgba = background.rgba;
+ else if (alpha == 0xFF)
+ output.rgba = foreground.rgba;
+ else if (alpha < 0xFF)
+ {
+ UINT8 beta = (0xFF - alpha);
+ output.s.red = ((background.s.red * beta) + (foreground.s.red * alpha)) / 0xFF;
+ output.s.green = ((background.s.green * beta) + (foreground.s.green * alpha)) / 0xFF;
+ output.s.blue = ((background.s.blue * beta) + (foreground.s.blue * alpha)) / 0xFF;
+ }
+ // write foreground pixel alpha
+ // if there's no pixel in here
+ if (!background.rgba)
+ output.s.alpha = foreground.s.alpha;
+ }
+#define clamp(c) max(min(c, 0xFF), 0x00);
+ else
+ {
+ float falpha = ((float)alpha / 256.0f);
+ float fr = ((float)foreground.s.red * falpha);
+ float fg = ((float)foreground.s.green * falpha);
+ float fb = ((float)foreground.s.blue * falpha);
+ if (style == AST_ADD)
+ {
+ output.s.red = clamp((int)(background.s.red + fr));
+ output.s.green = clamp((int)(background.s.green + fg));
+ output.s.blue = clamp((int)(background.s.blue + fb));
+ }
+ else if (style == AST_SUBTRACT)
+ {
+ output.s.red = clamp((int)(background.s.red - fr));
+ output.s.green = clamp((int)(background.s.green - fg));
+ output.s.blue = clamp((int)(background.s.blue - fb));
+ }
+ else if (style == AST_REVERSESUBTRACT)
+ {
+ output.s.red = clamp((int)((-background.s.red) + fr));
+ output.s.green = clamp((int)((-background.s.green) + fg));
+ output.s.blue = clamp((int)((-background.s.blue) + fb));
+ }
+ else if (style == AST_MODULATE)
+ {
+ fr = ((float)foreground.s.red / 256.0f);
+ fg = ((float)foreground.s.green / 256.0f);
+ fb = ((float)foreground.s.blue / 256.0f);
+ output.s.red = clamp((int)(background.s.red * fr));
+ output.s.green = clamp((int)(background.s.green * fg));
+ output.s.blue = clamp((int)(background.s.blue * fb));
+ }
+ // just copy the pixel
+ else if (style == AST_COPY)
+ return background;
+ }
+#undef clamp
+ // unimplemented blend modes return the background pixel
+ output = background;
+ output.s.alpha = 0xFF;
+ return output;
+}
+
+UINT8 ASTBlendPixel_8bpp(UINT8 background, UINT8 foreground, int style, UINT8 alpha)
+{
+ if ((style == AST_TRANSLUCENT) && (alpha <= (10*255/11))) // Alpha style set to translucent? Is the alpha small enough for translucency?
+ {
+ UINT8 *mytransmap;
+ if (alpha < 255/11) // Is the patch way too translucent? Don't render then.
+ return background;
+ // The equation's not exact but it works as intended. I'll call it a day for now.
+ mytransmap = transtables + ((8*(alpha) + 255/8)/(255 - 255/11) << FF_TRANSSHIFT);
+ if (background != 0xFF)
+ return *(mytransmap + (background<<8) + foreground);
+ }
+ // just copy the pixel
+ else if (style == AST_COPY)
+ return background;
+ // use ASTBlendPixel for all other blend modes
+ // and find the nearest colour in the palette
+ else if (style != AST_TRANSLUCENT)
+ {
+ RGBA_t texel;
+ RGBA_t bg = V_GetColor(background);
+ RGBA_t fg = V_GetColor(foreground);
+ texel = ASTBlendPixel(bg, fg, style, alpha);
+ return NearestColor(texel.s.red, texel.s.green, texel.s.blue);
+ }
+ // fallback if all above fails, somehow
+ // return the background pixel
+ return background;
+}
+
//
-// R_DrawTransColumnInCache
+// R_DrawBlendColumnInCache
// Draws a translucent column into the cache, applying a half-cooked equation to get a proper translucency value (Needs code in R_GenerateTexture()).
//
-static inline void R_DrawTransColumnInCache(column_t *patch, UINT8 *cache, texpatch_t *originPatch, INT32 cacheheight, INT32 patchheight)
+static inline void R_DrawBlendColumnInCache(column_t *patch, UINT8 *cache, texpatch_t *originPatch, INT32 cacheheight, INT32 patchheight)
{
INT32 count, position;
UINT8 *source, *dest;
- UINT8 *mytransmap = transtables + ((8*(originPatch->alpha) + 255/8)/(255 - 255/11) << FF_TRANSSHIFT); // The equation's not exact but it works as intended. I'll call it a day for now.
INT32 topdelta, prevdelta = -1;
INT32 originy = originPatch->originy;
@@ -258,7 +374,8 @@ static inline void R_DrawTransColumnInCache(column_t *patch, UINT8 *cache, texpa
if (count > 0)
{
for (; dest < cache + position + count; source++, dest++)
- if (*dest != 0xFF) *dest = *(mytransmap + ((*dest)<<8) + (*source));
+ if (*dest != 0xFF)
+ *dest = ASTBlendPixel_8bpp(*dest, *source, originPatch->style, originPatch->alpha);
}
patch = (column_t *)((UINT8 *)patch + patch->length + 4);
@@ -269,11 +386,10 @@ static inline void R_DrawTransColumnInCache(column_t *patch, UINT8 *cache, texpa
// R_DrawTransColumnInCache
// Similar to the one above except that the column is inverted.
//
-static inline void R_DrawTransFlippedColumnInCache(column_t *patch, UINT8 *cache, texpatch_t *originPatch, INT32 cacheheight, INT32 patchheight)
+static inline void R_DrawBlendFlippedColumnInCache(column_t *patch, UINT8 *cache, texpatch_t *originPatch, INT32 cacheheight, INT32 patchheight)
{
INT32 count, position;
UINT8 *source, *dest;
- UINT8 *mytransmap = transtables + ((8*(originPatch->alpha) + 255/8)/(255 - 255/11) << FF_TRANSSHIFT); // The equation's not exact but it works as intended. I'll call it a day for now.
INT32 topdelta, prevdelta = -1;
INT32 originy = originPatch->originy;
@@ -302,7 +418,8 @@ static inline void R_DrawTransFlippedColumnInCache(column_t *patch, UINT8 *cache
if (count > 0)
{
for (; dest < cache + position + count; --source, dest++)
- if (*dest != 0xFF) *dest = *(mytransmap + ((*dest)<<8) + (*source));
+ if (*dest != 0xFF)
+ *dest = ASTBlendPixel_8bpp(*dest, *source, originPatch->style, originPatch->alpha);
}
patch = (column_t *)((UINT8 *)patch + patch->length + 4);
@@ -315,7 +432,7 @@ static inline void R_DrawTransFlippedColumnInCache(column_t *patch, UINT8 *cache
// Allocate space for full size texture, either single patch or 'composite'
// Build the full textures from patches.
// The texture caching system is a little more hungry of memory, but has
-// been simplified for the sake of highcolor, dynamic ligthing, & speed.
+// been simplified for the sake of highcolor (lol), dynamic ligthing, & speed.
//
// This is not optimised, but it's supposed to be executed only once
// per level, when enough memory is available.
@@ -332,6 +449,10 @@ static UINT8 *R_GenerateTexture(size_t texnum)
column_t *patchcol;
UINT32 *colofs;
+ UINT16 wadnum;
+ lumpnum_t lumpnum;
+ size_t lumplength;
+
I_Assert(texnum <= (size_t)numtextures);
texture = textures[texnum];
I_Assert(texture != NULL);
@@ -346,7 +467,19 @@ static UINT8 *R_GenerateTexture(size_t texnum)
{
boolean holey = false;
patch = texture->patches;
- realpatch = W_CacheLumpNumPwad(patch->wad, patch->lump, PU_CACHE);
+
+ wadnum = patch->wad;
+ lumpnum = patch->lump;
+ lumplength = W_LumpLengthPwad(wadnum, lumpnum);
+ realpatch = W_CacheLumpNumPwad(wadnum, lumpnum, PU_CACHE);
+
+#ifndef NO_PNG_LUMPS
+ if (R_IsLumpPNG((UINT8 *)realpatch, lumplength))
+ {
+ realpatch = R_PNGToPatch((UINT8 *)realpatch, lumplength);
+ goto multipatch;
+ }
+#endif
// Check the patch for holes.
if (texture->width > SHORT(realpatch->width) || texture->height > SHORT(realpatch->height))
@@ -376,7 +509,7 @@ static UINT8 *R_GenerateTexture(size_t texnum)
{
texture->holes = true;
texture->flip = patch->flip;
- blocksize = W_LumpLengthPwad(patch->wad, patch->lump);
+ blocksize = lumplength;
block = Z_Calloc(blocksize, PU_STATIC, // will change tag at end of this function
&texturecache[texnum]);
M_Memcpy(block, realpatch, blocksize);
@@ -403,6 +536,9 @@ 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);
@@ -422,18 +558,20 @@ static UINT8 *R_GenerateTexture(size_t texnum)
for (i = 0, patch = texture->patches; i < texture->patchcount; i++, patch++)
{
static void (*ColumnDrawerPointer)(column_t *, UINT8 *, texpatch_t *, INT32, INT32); // Column drawing function pointer.
- if ((patch->style == AST_TRANSLUCENT) && (patch->alpha <= (10*255/11))) // Alpha style set to translucent? Is the alpha small enough for translucency?
- {
- if (patch->alpha < 255/11) // Is the patch way too translucent? Don't render then.
- continue;
- ColumnDrawerPointer = (patch->flip & 2) ? R_DrawTransFlippedColumnInCache : R_DrawTransColumnInCache;
- }
+ if (patch->style != AST_COPY)
+ ColumnDrawerPointer = (patch->flip & 2) ? R_DrawBlendFlippedColumnInCache : R_DrawBlendColumnInCache;
else
- {
ColumnDrawerPointer = (patch->flip & 2) ? R_DrawFlippedColumnInCache : R_DrawColumnInCache;
- }
- realpatch = W_CacheLumpNumPwad(patch->wad, patch->lump, PU_CACHE);
+ wadnum = patch->wad;
+ lumpnum = patch->lump;
+ lumplength = W_LumpLengthPwad(wadnum, lumpnum);
+ realpatch = W_CacheLumpNumPwad(wadnum, lumpnum, PU_CACHE);
+#ifndef NO_PNG_LUMPS
+ if (R_IsLumpPNG((UINT8 *)realpatch, lumplength))
+ realpatch = R_PNGToPatch((UINT8 *)realpatch, lumplength);
+#endif
+
x1 = patch->originx;
width = SHORT(realpatch->width);
height = SHORT(realpatch->height);
@@ -509,10 +647,14 @@ void R_CheckTextureCache(INT32 tex)
UINT8 *R_GetColumn(fixed_t tex, INT32 col)
{
UINT8 *data;
+ INT32 width = texturewidth[tex];
- col &= texturewidthmask[tex];
- data = texturecache[tex];
+ if (width & (width - 1))
+ col = (UINT32)col % width;
+ else
+ col &= (width - 1);
+ data = texturecache[tex];
if (!data)
data = R_GenerateTexture(tex);
@@ -550,7 +692,7 @@ void R_ParseTEXTURESLump(UINT16 wadNum, UINT16 lumpNum, INT32 *index);
#define TX_END "TX_END"
void R_LoadTextures(void)
{
- INT32 i, k, w;
+ INT32 i, w;
UINT16 j;
UINT16 texstart, texend, texturesLumpPos;
patch_t *patchlump;
@@ -567,6 +709,7 @@ void R_LoadTextures(void)
}
Z_Free(texturetranslation);
Z_Free(textures);
+ Z_Free(texflats);
}
// Load patches and textures.
@@ -627,15 +770,16 @@ void R_LoadTextures(void)
// Allocate memory and initialize to 0 for all the textures we are initialising.
// There are actually 5 buffers allocated in one for convenience.
textures = Z_Calloc((numtextures * sizeof(void *)) * 5, PU_STATIC, NULL);
+ texflats = Z_Calloc((numtextures * sizeof(*texflats)), PU_STATIC, NULL);
// Allocate texture column offset table.
texturecolumnofs = (void *)((UINT8 *)textures + (numtextures * sizeof(void *)));
// Allocate texture referencing cache.
- texturecache = (void *)((UINT8 *)textures + ((numtextures * sizeof(void *)) * 2));
- // Allocate texture width mask table.
- texturewidthmask = (void *)((UINT8 *)textures + ((numtextures * sizeof(void *)) * 3));
- // Allocate texture height mask table.
- textureheight = (void *)((UINT8 *)textures + ((numtextures * sizeof(void *)) * 4));
+ texturecache = (void *)((UINT8 *)textures + ((numtextures * sizeof(void *)) * 2));
+ // Allocate texture width table.
+ texturewidth = (void *)((UINT8 *)textures + ((numtextures * sizeof(void *)) * 3));
+ // Allocate texture height table.
+ textureheight = (void *)((UINT8 *)textures + ((numtextures * sizeof(void *)) * 4));
// Create translation table for global animation.
texturetranslation = Z_Malloc((numtextures + 1) * sizeof(*texturetranslation), PU_STATIC, NULL);
@@ -673,20 +817,39 @@ void R_LoadTextures(void)
// Work through each lump between the markers in the WAD.
for (j = 0; j < (texend - texstart); j++)
{
+ UINT16 wadnum = (UINT16)w;
+ lumpnum_t lumpnum = texstart + j;
+ size_t lumplength;
+
if (wadfiles[w]->type == RET_PK3)
{
- if (W_IsLumpFolder((UINT16)w, texstart + j)) // Check if lump is a folder
+ if (W_IsLumpFolder(wadnum, lumpnum)) // Check if lump is a folder
continue; // If it is then SKIP IT
}
- patchlump = W_CacheLumpNumPwad((UINT16)w, texstart + j, PU_CACHE);
+
+ lumplength = W_LumpLengthPwad(wadnum, lumpnum);
+ patchlump = W_CacheLumpNumPwad(wadnum, lumpnum, PU_CACHE);
//CONS_Printf("\n\"%s\" is a single patch, dimensions %d x %d",W_CheckNameForNumPwad((UINT16)w,texstart+j),patchlump->width, patchlump->height);
texture = textures[i] = Z_Calloc(sizeof(texture_t) + sizeof(texpatch_t), PU_STATIC, NULL);
// Set texture properties.
- M_Memcpy(texture->name, W_CheckNameForNumPwad((UINT16)w, texstart + j), sizeof(texture->name));
- texture->width = SHORT(patchlump->width);
- texture->height = SHORT(patchlump->height);
+ M_Memcpy(texture->name, W_CheckNameForNumPwad(wadnum, lumpnum), sizeof(texture->name));
+
+#ifndef NO_PNG_LUMPS
+ if (R_IsLumpPNG((UINT8 *)patchlump, lumplength))
+ {
+ INT16 width, height;
+ R_PNGDimensions((UINT8 *)patchlump, &width, &height, lumplength);
+ texture->width = width;
+ texture->height = height;
+ }
+ else
+#endif
+ {
+ texture->width = SHORT(patchlump->width);
+ texture->height = SHORT(patchlump->height);
+ }
texture->patchcount = 1;
texture->holes = false;
texture->flip = 0;
@@ -701,11 +864,7 @@ void R_LoadTextures(void)
Z_Unlock(patchlump);
- k = 1;
- while (k << 1 <= texture->width)
- k <<= 1;
-
- texturewidthmask[i] = k - 1;
+ texturewidth[i] = texture->width;
textureheight[i] = texture->height << FRACBITS;
i++;
}
@@ -848,8 +1007,16 @@ static texpatch_t *R_ParsePatch(boolean actuallyLoadPatch)
{
Z_Free(texturesToken);
texturesToken = M_GetToken(NULL);
- if(stricmp(texturesToken, "TRANSLUCENT")==0)
+ if (stricmp(texturesToken, "TRANSLUCENT")==0)
style = AST_TRANSLUCENT;
+ else if (stricmp(texturesToken, "ADD")==0)
+ style = AST_ADD;
+ else if (stricmp(texturesToken, "SUBTRACT")==0)
+ style = AST_SUBTRACT;
+ else if (stricmp(texturesToken, "REVERSESUBTRACT")==0)
+ style = AST_REVERSESUBTRACT;
+ else if (stricmp(texturesToken, "MODULATE")==0)
+ style = AST_MODULATE;
}
else if (stricmp(texturesToken, "FLIPX")==0)
flip |= 1;
@@ -1097,7 +1264,7 @@ int R_CountTexturesInTEXTURESLump(UINT16 wadNum, UINT16 lumpNum)
texturesToken = M_GetToken(texturesText);
while (texturesToken != NULL)
{
- if (stricmp(texturesToken, "WALLTEXTURE")==0)
+ if (stricmp(texturesToken, "WALLTEXTURE") == 0 || stricmp(texturesToken, "TEXTURE") == 0)
{
numTexturesInLump++;
Z_Free(texturesToken);
@@ -1105,7 +1272,7 @@ int R_CountTexturesInTEXTURESLump(UINT16 wadNum, UINT16 lumpNum)
}
else
{
- I_Error("Error parsing TEXTURES lump: Expected \"WALLTEXTURE\", got \"%s\"",texturesToken);
+ I_Error("Error parsing TEXTURES lump: Expected \"WALLTEXTURE\" or \"TEXTURE\", got \"%s\"",texturesToken);
}
texturesToken = M_GetToken(NULL);
}
@@ -1146,21 +1313,21 @@ void R_ParseTEXTURESLump(UINT16 wadNum, UINT16 lumpNum, INT32 *texindex)
texturesToken = M_GetToken(texturesText);
while (texturesToken != NULL)
{
- if (stricmp(texturesToken, "WALLTEXTURE")==0)
+ if (stricmp(texturesToken, "WALLTEXTURE") == 0 || stricmp(texturesToken, "TEXTURE") == 0)
{
Z_Free(texturesToken);
// Get the new texture
newTexture = R_ParseTexture(true);
// Store the new texture
textures[*texindex] = newTexture;
- texturewidthmask[*texindex] = newTexture->width - 1;
+ texturewidth[*texindex] = newTexture->width;
textureheight[*texindex] = newTexture->height << FRACBITS;
// Increment i back in R_LoadTextures()
(*texindex)++;
}
else
{
- I_Error("Error parsing TEXTURES lump: Expected \"WALLTEXTURE\", got \"%s\"",texturesToken);
+ I_Error("Error parsing TEXTURES lump: Expected \"WALLTEXTURE\" or \"TEXTURE\", got \"%s\"",texturesToken);
}
texturesToken = M_GetToken(NULL);
}
@@ -1267,6 +1434,41 @@ lumpnum_t R_GetFlatNumForName(const char *name)
lump = LUMPERROR;
}
+ // Detect textures
+ if (lump == LUMPERROR)
+ {
+ // Scan wad files backwards so patched textures take preference.
+ for (i = numwadfiles - 1; i >= 0; i--)
+ {
+ switch (wadfiles[i]->type)
+ {
+ case RET_WAD:
+ if ((start = W_CheckNumForNamePwad("TX_START", (UINT16)i, 0)) == INT16_MAX)
+ continue;
+ if ((end = W_CheckNumForNamePwad("TX_END", (UINT16)i, start)) == INT16_MAX)
+ continue;
+ break;
+ case RET_PK3:
+ if ((start = W_CheckNumForFolderStartPK3("Textures/", i, 0)) == INT16_MAX)
+ continue;
+ if ((end = W_CheckNumForFolderEndPK3("Textures/", i, start)) == INT16_MAX)
+ continue;
+ break;
+ default:
+ continue;
+ }
+
+ // Now find lump with specified name in that range.
+ lump = W_CheckNumForNamePwad(name, (UINT16)i, start);
+ if (lump < end)
+ {
+ lump += (i<<16); // found it, in our constraints
+ break;
+ }
+ lump = LUMPERROR;
+ }
+ }
+
if (lump == LUMPERROR)
{
if (strcmp(name, SKYFLATNAME))
@@ -1615,7 +1817,6 @@ extracolormap_t *R_ColormapForName(char *name)
//
static double deltas[256][3], map[256][3];
-static UINT8 NearestColor(UINT8 r, UINT8 g, UINT8 b);
static int RoundUp(double number);
lighttable_t *R_CreateLightTable(extracolormap_t *extra_colormap)
@@ -2027,7 +2228,7 @@ extracolormap_t *R_AddColormaps(extracolormap_t *exc_augend, extracolormap_t *ex
// Thanks to quake2 source!
// utils3/qdata/images.c
-static UINT8 NearestColor(UINT8 r, UINT8 g, UINT8 b)
+UINT8 NearestColor(UINT8 r, UINT8 g, UINT8 b)
{
int dr, dg, db;
int distortion, bestdistortion = 256 * 256 * 4, bestcolor = 0, i;
@@ -2306,3 +2507,479 @@ void R_PrecacheLevel(void)
"texturememory: %s k\n"
"spritememory: %s k\n", sizeu1(flatmemory>>10), sizeu2(texturememory>>10), sizeu3(spritememory>>10));
}
+
+// https://github.com/coelckers/prboom-plus/blob/master/prboom2/src/r_patch.c#L350
+boolean R_CheckIfPatch(lumpnum_t lump)
+{
+ size_t size;
+ INT16 width, height;
+ patch_t *patch;
+ boolean result;
+
+ size = W_LumpLength(lump);
+
+ // minimum length of a valid Doom patch
+ if (size < 13)
+ return false;
+
+ patch = (patch_t *)W_CacheLumpNum(lump, PU_STATIC);
+
+ width = SHORT(patch->width);
+ height = SHORT(patch->height);
+
+ result = (height > 0 && height <= 16384 && width > 0 && width <= 16384 && width < (INT16)(size / 4));
+
+ if (result)
+ {
+ // The dimensions seem like they might be valid for a patch, so
+ // check the column directory for extra security. All columns
+ // must begin after the column directory, and none of them must
+ // point past the end of the patch.
+ INT16 x;
+
+ for (x = 0; x < width; x++)
+ {
+ UINT32 ofs = LONG(patch->columnofs[x]);
+
+ // Need one byte for an empty column (but there's patches that don't know that!)
+ if (ofs < (UINT32)width * 4 + 8 || ofs >= (UINT32)size)
+ {
+ result = false;
+ break;
+ }
+ }
+ }
+
+ return result;
+}
+
+void R_PatchToFlat(patch_t *patch, UINT8 *flat)
+{
+ fixed_t col, ofs;
+ column_t *column;
+ UINT8 *desttop, *dest, *deststop;
+ UINT8 *source;
+
+ desttop = flat;
+ deststop = desttop + (SHORT(patch->width) * SHORT(patch->height));
+
+ for (col = 0; col < SHORT(patch->width); col++, desttop++)
+ {
+ INT32 topdelta, prevdelta = -1;
+ column = (column_t *)((UINT8 *)patch + LONG(patch->columnofs[col]));
+
+ while (column->topdelta != 0xff)
+ {
+ topdelta = column->topdelta;
+ if (topdelta <= prevdelta)
+ topdelta += prevdelta;
+ prevdelta = topdelta;
+
+ dest = desttop + (topdelta * SHORT(patch->width));
+ source = (UINT8 *)(column) + 3;
+ for (ofs = 0; dest < deststop && ofs < column->length; ofs++)
+ {
+ *dest = source[ofs];
+ dest += SHORT(patch->width);
+ }
+ column = (column_t *)((UINT8 *)column + column->length + 4);
+ }
+ }
+}
+
+#ifndef NO_PNG_LUMPS
+boolean R_IsLumpPNG(UINT8 *d, size_t s)
+{
+ if (s < 67) // http://garethrees.org/2007/11/14/pngcrush/
+ return false;
+ // Check for PNG file signature using memcmp
+ // As it may be faster on CPUs with slow unaligned memory access
+ // Ref: http://www.libpng.org/pub/png/spec/1.2/PNG-Rationale.html#R.PNG-file-signature
+ return (memcmp(&d[0], "\x89\x50\x4e\x47\x0d\x0a\x1a\x0a", 8) == 0);
+}
+
+#ifdef HAVE_PNG
+typedef struct {
+ png_bytep buffer;
+ png_uint_32 bufsize;
+ png_uint_32 current_pos;
+} png_ioread;
+
+static void PNG_IOReader(png_structp png_ptr, png_bytep data, png_size_t length)
+{
+ png_ioread *f = png_get_io_ptr(png_ptr);
+ if (length > (f->bufsize - f->current_pos))
+ png_error(png_ptr, "PNG_IOReader: buffer overrun");
+ memcpy(data, f->buffer + f->current_pos, length);
+ f->current_pos += length;
+}
+
+static void PNG_error(png_structp PNG, png_const_charp pngtext)
+{
+ CONS_Debug(DBG_RENDER, "libpng error at %p: %s", PNG, pngtext);
+ //I_Error("libpng error at %p: %s", PNG, pngtext);
+}
+
+static void PNG_warn(png_structp PNG, png_const_charp pngtext)
+{
+ CONS_Debug(DBG_RENDER, "libpng warning at %p: %s", PNG, pngtext);
+}
+
+static png_bytep *PNG_Read(UINT8 *png, UINT16 *w, UINT16 *h, size_t size)
+{
+ png_structp png_ptr;
+ png_infop png_info_ptr;
+ png_uint_32 width, height;
+ int bit_depth, color_type;
+ png_uint_32 y;
+#ifdef PNG_SETJMP_SUPPORTED
+#ifdef USE_FAR_KEYWORD
+ jmp_buf jmpbuf;
+#endif
+#endif
+
+ png_ioread png_io;
+ png_bytep *row_pointers;
+
+ png_ptr = png_create_read_struct(PNG_LIBPNG_VER_STRING, NULL,
+ PNG_error, PNG_warn);
+ if (!png_ptr)
+ {
+ CONS_Debug(DBG_RENDER, "PNG_Load: Error on initialize libpng\n");
+ return NULL;
+ }
+
+ png_info_ptr = png_create_info_struct(png_ptr);
+ if (!png_info_ptr)
+ {
+ CONS_Debug(DBG_RENDER, "PNG_Load: Error on allocate for libpng\n");
+ png_destroy_read_struct(&png_ptr, NULL, NULL);
+ return NULL;
+ }
+
+#ifdef USE_FAR_KEYWORD
+ if (setjmp(jmpbuf))
+#else
+ if (setjmp(png_jmpbuf(png_ptr)))
+#endif
+ {
+ //CONS_Debug(DBG_RENDER, "libpng load error on %s\n", filename);
+ png_destroy_read_struct(&png_ptr, &png_info_ptr, NULL);
+ return NULL;
+ }
+#ifdef USE_FAR_KEYWORD
+ png_memcpy(png_jmpbuf(png_ptr), jmpbuf, sizeof jmp_buf);
+#endif
+
+ // set our own read_function
+ png_io.buffer = (png_bytep)png;
+ png_io.bufsize = size;
+ png_io.current_pos = 0;
+ png_set_read_fn(png_ptr, &png_io, PNG_IOReader);
+
+#ifdef PNG_SET_USER_LIMITS_SUPPORTED
+ png_set_user_limits(png_ptr, 2048, 2048);
+#endif
+
+ png_read_info(png_ptr, png_info_ptr);
+
+ png_get_IHDR(png_ptr, png_info_ptr, &width, &height, &bit_depth, &color_type,
+ NULL, NULL, NULL);
+
+ if (bit_depth == 16)
+ png_set_strip_16(png_ptr);
+
+ if (color_type == PNG_COLOR_TYPE_GRAY || color_type == PNG_COLOR_TYPE_GRAY_ALPHA)
+ png_set_gray_to_rgb(png_ptr);
+ else if (color_type == PNG_COLOR_TYPE_PALETTE)
+ png_set_palette_to_rgb(png_ptr);
+
+ if (png_get_valid(png_ptr, png_info_ptr, PNG_INFO_tRNS))
+ png_set_tRNS_to_alpha(png_ptr);
+ else if (color_type != PNG_COLOR_TYPE_RGB_ALPHA && color_type != PNG_COLOR_TYPE_GRAY_ALPHA)
+ {
+#if PNG_LIBPNG_VER < 10207
+ png_set_filler(png_ptr, 0xFF, PNG_FILLER_AFTER);
+#else
+ png_set_add_alpha(png_ptr, 0xFF, PNG_FILLER_AFTER);
+#endif
+ }
+
+ png_read_update_info(png_ptr, png_info_ptr);
+
+ // Read the image
+ row_pointers = (png_bytep*)malloc(sizeof(png_bytep) * height);
+ for (y = 0; y < height; y++)
+ row_pointers[y] = (png_byte*)malloc(png_get_rowbytes(png_ptr, png_info_ptr));
+ png_read_image(png_ptr, row_pointers);
+ png_destroy_read_struct(&png_ptr, &png_info_ptr, NULL);
+
+ *w = (INT32)width;
+ *h = (INT32)height;
+ return row_pointers;
+}
+
+// Convert a PNG to a raw image.
+static UINT8 *PNG_RawConvert(UINT8 *png, UINT16 *w, UINT16 *h, size_t size)
+{
+ UINT8 *flat;
+ png_uint_32 x, y;
+ png_bytep *row_pointers = PNG_Read(png, w, h, size);
+ png_uint_32 width = *w, height = *h;
+
+ if (!row_pointers)
+ I_Error("PNG_RawConvert: conversion failed");
+
+ // Convert the image to 8bpp
+ flat = Z_Malloc(width * height, PU_LEVEL, NULL);
+ memset(flat, TRANSPARENTPIXEL, width * height);
+ for (y = 0; y < height; y++)
+ {
+ png_bytep row = row_pointers[y];
+ for (x = 0; x < width; x++)
+ {
+ png_bytep px = &(row[x * 4]);
+ if ((UINT8)px[3])
+ flat[((y * width) + x)] = NearestColor((UINT8)px[0], (UINT8)px[1], (UINT8)px[2]);
+ }
+ }
+ free(row_pointers);
+
+ return flat;
+}
+
+// Convert a PNG to a flat.
+UINT8 *R_PNGToFlat(levelflat_t *levelflat, UINT8 *png, size_t size)
+{
+ return PNG_RawConvert(png, &levelflat->width, &levelflat->height, size);
+}
+
+// Convert a PNG to a patch.
+static unsigned char imgbuf[1<<26];
+patch_t *R_PNGToPatch(UINT8 *png, size_t size)
+{
+ UINT16 width, height;
+ UINT8 *raw = PNG_RawConvert(png, &width, &height, size);
+
+ UINT32 x, y;
+ UINT8 *img;
+ UINT8 *imgptr = imgbuf;
+ UINT8 *colpointers, *startofspan;
+
+ #define WRITE8(buf, a) ({*buf = (a); buf++;})
+ #define WRITE16(buf, a) ({*buf = (a)&255; buf++; *buf = (a)>>8; buf++;})
+ #define WRITE32(buf, a) ({WRITE16(buf, (a)&65535); WRITE16(buf, (a)>>16);})
+
+ if (!raw)
+ I_Error("R_PNGToPatch: conversion failed");
+
+ // Write image size and offset
+ WRITE16(imgptr, width);
+ WRITE16(imgptr, height);
+ // no offsets
+ WRITE16(imgptr, 0);
+ WRITE16(imgptr, 0);
+
+ // Leave placeholder to column pointers
+ colpointers = imgptr;
+ imgptr += width*4;
+
+ // Write columns
+ for (x = 0; x < width; x++)
+ {
+ int lastStartY = 0;
+ int spanSize = 0;
+ startofspan = NULL;
+
+ //printf("%d ", x);
+ // Write column pointer (@TODO may be wrong)
+ WRITE32(colpointers, imgptr - imgbuf);
+
+ // Write pixels
+ for (y = 0; y < height; y++)
+ {
+ UINT8 paletteIndex = raw[((y * width) + x)];
+
+ // Start new column if we need to
+ if (!startofspan || spanSize == 255)
+ {
+ int writeY = y;
+
+ // If we reached the span size limit, finish the previous span
+ if (startofspan)
+ WRITE8(imgptr, 0);
+
+ if (y > 254)
+ {
+ // Make sure we're aligned to 254
+ if (lastStartY < 254)
+ {
+ WRITE8(imgptr, 254);
+ WRITE8(imgptr, 0);
+ imgptr += 2;
+ lastStartY = 254;
+ }
+
+ // Write stopgap empty spans if needed
+ writeY = y - lastStartY;
+
+ while (writeY > 254)
+ {
+ WRITE8(imgptr, 254);
+ WRITE8(imgptr, 0);
+ imgptr += 2;
+ writeY -= 254;
+ }
+ }
+
+ startofspan = imgptr;
+ WRITE8(imgptr, writeY);///@TODO calculate starting y pos
+ imgptr += 2;
+ spanSize = 0;
+
+ lastStartY = y;
+ }
+
+ // Write the pixel
+ WRITE8(imgptr, paletteIndex);
+ spanSize++;
+ startofspan[1] = spanSize;
+ }
+
+ if (startofspan)
+ WRITE8(imgptr, 0);
+
+ WRITE8(imgptr, 0xFF);
+ }
+
+ #undef WRITE8
+ #undef WRITE16
+ #undef WRITE32
+
+ size = imgptr-imgbuf;
+ img = malloc(size);
+ memcpy(img, imgbuf, size);
+
+ Z_Free(raw);
+
+ return (patch_t *)img;
+}
+
+boolean R_PNGDimensions(UINT8 *png, INT16 *width, INT16 *height, size_t size)
+{
+ png_structp png_ptr;
+ png_infop png_info_ptr;
+ png_uint_32 w, h;
+ int bit_depth, color_type;
+#ifdef PNG_SETJMP_SUPPORTED
+#ifdef USE_FAR_KEYWORD
+ jmp_buf jmpbuf;
+#endif
+#endif
+
+ png_ioread png_io;
+
+ png_ptr = png_create_read_struct(PNG_LIBPNG_VER_STRING, NULL,
+ PNG_error, PNG_warn);
+ if (!png_ptr)
+ {
+ CONS_Debug(DBG_RENDER, "PNG_Load: Error on initialize libpng\n");
+ return false;
+ }
+
+ png_info_ptr = png_create_info_struct(png_ptr);
+ if (!png_info_ptr)
+ {
+ CONS_Debug(DBG_RENDER, "PNG_Load: Error on allocate for libpng\n");
+ png_destroy_read_struct(&png_ptr, NULL, NULL);
+ return false;
+ }
+
+#ifdef USE_FAR_KEYWORD
+ if (setjmp(jmpbuf))
+#else
+ if (setjmp(png_jmpbuf(png_ptr)))
+#endif
+ {
+ //CONS_Debug(DBG_RENDER, "libpng load error on %s\n", filename);
+ png_destroy_read_struct(&png_ptr, &png_info_ptr, NULL);
+ return false;
+ }
+#ifdef USE_FAR_KEYWORD
+ png_memcpy(png_jmpbuf(png_ptr), jmpbuf, sizeof jmp_buf);
+#endif
+
+ // set our own read_function
+ png_io.buffer = (png_bytep)png;
+ png_io.bufsize = size;
+ png_io.current_pos = 0;
+ png_set_read_fn(png_ptr, &png_io, PNG_IOReader);
+
+#ifdef PNG_SET_USER_LIMITS_SUPPORTED
+ png_set_user_limits(png_ptr, 2048, 2048);
+#endif
+
+ png_read_info(png_ptr, png_info_ptr);
+
+ png_get_IHDR(png_ptr, png_info_ptr, &w, &h, &bit_depth, &color_type,
+ NULL, NULL, NULL);
+
+ // okay done. stop.
+ png_destroy_read_struct(&png_ptr, &png_info_ptr, NULL);
+
+ *width = (INT32)w;
+ *height = (INT32)h;
+ return true;
+}
+#endif
+#endif
+
+void R_TextureToFlat(size_t tex, UINT8 *flat)
+{
+ texture_t *texture = textures[tex];
+
+ fixed_t col, ofs;
+ column_t *column;
+ UINT8 *desttop, *dest, *deststop;
+ UINT8 *source;
+
+ desttop = flat;
+ deststop = desttop + (texture->width * texture->height);
+
+ for (col = 0; col < texture->width; col++, desttop++)
+ {
+ column = (column_t *)R_GetColumn(tex, col);
+ if (!texture->holes)
+ {
+ dest = desttop;
+ source = (UINT8 *)(column);
+ for (ofs = 0; dest < deststop && ofs < texture->height; ofs++)
+ {
+ if (source[ofs] != TRANSPARENTPIXEL)
+ *dest = source[ofs];
+ dest += texture->width;
+ }
+ }
+ else
+ {
+ INT32 topdelta, prevdelta = -1;
+ while (column->topdelta != 0xff)
+ {
+ topdelta = column->topdelta;
+ if (topdelta <= prevdelta)
+ topdelta += prevdelta;
+ prevdelta = topdelta;
+
+ dest = desttop + (topdelta * texture->width);
+ source = (UINT8 *)(column) + 3;
+ for (ofs = 0; dest < deststop && ofs < column->length; ofs++)
+ {
+ if (source[ofs] != TRANSPARENTPIXEL)
+ *dest = source[ofs];
+ dest += texture->width;
+ }
+ column = (column_t *)((UINT8 *)column + column->length + 4);
+ }
+ }
+ }
+}
diff --git a/src/r_data.h b/src/r_data.h
index b6b0a16a15fad21fb90aa0325721d177a1c6eccc..91301100b3d7b366ea65869fc0be6085bce41ce3 100644
--- a/src/r_data.h
+++ b/src/r_data.h
@@ -16,13 +16,19 @@
#include "r_defs.h"
#include "r_state.h"
+#include "p_setup.h" // levelflats
#ifdef __GNUG__
#pragma interface
#endif
// Possible alpha types for a patch.
-enum patchalphastyle {AST_COPY, AST_TRANSLUCENT}; // , AST_ADD, AST_SUBTRACT, AST_REVERSESUBTRACT, AST_MODULATE, AST_OVERLAY};
+enum patchalphastyle {AST_COPY, AST_TRANSLUCENT, AST_ADD, AST_SUBTRACT, AST_REVERSESUBTRACT, AST_MODULATE, AST_OVERLAY};
+
+RGBA_t ASTBlendPixel(RGBA_t background, RGBA_t foreground, int style, UINT8 alpha);
+UINT8 ASTBlendPixel_8bpp(UINT8 background, UINT8 foreground, int style, UINT8 alpha);
+
+UINT8 NearestColor(UINT8 r, UINT8 g, UINT8 b);
// moved here for r_sky.c (texpatch_t is used)
@@ -55,12 +61,17 @@ typedef struct
texpatch_t patches[0];
} texture_t;
+typedef struct
+{
+ UINT8 *flat;
+ INT16 width, height;
+} textureflat_t;
+
// all loaded and prepared textures from the start of the game
extern texture_t **textures;
+extern textureflat_t *texflats;
-// texture width is a power of 2, so it can easily repeat along sidedefs using a simple mask
-extern INT32 *texturewidthmask;
-
+extern INT32 *texturewidth;
extern fixed_t *textureheight; // needed for texture pegging
extern INT16 color8to16[256]; // remap color index to highcolor
@@ -88,7 +99,6 @@ void R_PrecacheLevel(void);
// Floor/ceiling opaque texture tiles,
// lookup by name. For animation?
lumpnum_t R_GetFlatNumForName(const char *name);
-#define R_FlatNumForName(x) R_GetFlatNumForName(x)
// Called by P_Ticker for switches and animations,
// returns the texture number for the texture name.
@@ -148,6 +158,20 @@ 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))
+boolean R_CheckIfPatch(lumpnum_t lump);
+UINT8 NearestColor(UINT8 r, UINT8 g, UINT8 b);
+
+void R_PatchToFlat(patch_t *patch, UINT8 *flat);
+void R_TextureToFlat(size_t tex, UINT8 *flat);
+
+#ifndef NO_PNG_LUMPS
+boolean R_IsLumpPNG(UINT8 *d, size_t s);
+
+UINT8 *R_PNGToFlat(levelflat_t *levelflat, UINT8 *png, size_t size);
+patch_t *R_PNGToPatch(UINT8 *png, size_t size);
+boolean R_PNGDimensions(UINT8 *png, INT16 *width, INT16 *height, size_t size);
+#endif
+
extern INT32 numtextures;
#endif
diff --git a/src/r_draw.c b/src/r_draw.c
index f8e4356244c73826bb4cfdc7cb05866e6eb8869e..1754403c44141a2ca599bddcc28d0ca6ed90ca80 100644
--- a/src/r_draw.c
+++ b/src/r_draw.c
@@ -99,6 +99,8 @@ INT32 dc_numlights = 0, dc_maxlights, dc_texheight;
INT32 ds_y, ds_x1, ds_x2;
lighttable_t *ds_colormap;
fixed_t ds_xfrac, ds_yfrac, ds_xstep, ds_ystep;
+UINT16 ds_flatwidth, ds_flatheight;
+boolean ds_powersoftwo;
UINT8 *ds_source; // start of a 64*64 tile image
UINT8 *ds_transmap; // one of the translucency tables
@@ -352,77 +354,79 @@ const char *Color_Names[MAXSKINCOLORS + NUMSUPERCOLORS] =
A word of warning: If the following array is non-symmetrical,
A_SignPlayer's prefoppositecolor behaviour will break.
*/
-const UINT8 Color_Opposite[(MAXSKINCOLORS - 1)*2] =
+// [0] = opposite skin color,
+// [1] = shade index used by signpost, 0-15 (actual sprite frame is 15 minus this value)
+const UINT8 Color_Opposite[MAXSKINCOLORS - 1][2] =
{
- // SKINCOLOR_NONE,8, // SKINCOLOR_NONE
+ // {SKINCOLOR_NONE, 8}, // SKINCOLOR_NONE
// Greyscale ranges
- SKINCOLOR_BLACK,5, // SKINCOLOR_WHITE,
- SKINCOLOR_JET,7, // SKINCOLOR_BONE,
- SKINCOLOR_CARBON,7, // SKINCOLOR_CLOUDY,
- SKINCOLOR_AETHER,12, // SKINCOLOR_GREY,
- SKINCOLOR_SLATE,12, // SKINCOLOR_SILVER,
- SKINCOLOR_CLOUDY,7, // SKINCOLOR_CARBON,
- SKINCOLOR_BONE,7, // SKINCOLOR_JET,
- SKINCOLOR_WHITE,7, // SKINCOLOR_BLACK,
+ {SKINCOLOR_BLACK, 5}, // SKINCOLOR_WHITE,
+ {SKINCOLOR_JET, 7}, // SKINCOLOR_BONE,
+ {SKINCOLOR_CARBON, 7}, // SKINCOLOR_CLOUDY,
+ {SKINCOLOR_AETHER, 12}, // SKINCOLOR_GREY,
+ {SKINCOLOR_SLATE, 12}, // SKINCOLOR_SILVER,
+ {SKINCOLOR_CLOUDY, 7}, // SKINCOLOR_CARBON,
+ {SKINCOLOR_BONE, 7}, // SKINCOLOR_JET,
+ {SKINCOLOR_WHITE, 7}, // SKINCOLOR_BLACK,
// Desaturated
- SKINCOLOR_GREY,15, // SKINCOLOR_AETHER,
- SKINCOLOR_SILVER,12, // SKINCOLOR_SLATE,
- SKINCOLOR_AZURE,9, // SKINCOLOR_PINK,
- SKINCOLOR_RUST,7, // SKINCOLOR_YOGURT,
- SKINCOLOR_TAN,2, // SKINCOLOR_BROWN,
- SKINCOLOR_BROWN,12, // SKINCOLOR_TAN,
- SKINCOLOR_MOSS,5, // SKINCOLOR_BEIGE,
- SKINCOLOR_BEIGE,13, // SKINCOLOR_MOSS,
- SKINCOLOR_PINK,5, // SKINCOLOR_AZURE,
- SKINCOLOR_GOLD,4, // SKINCOLOR_LAVENDER,
+ {SKINCOLOR_GREY, 15}, // SKINCOLOR_AETHER,
+ {SKINCOLOR_SILVER, 12}, // SKINCOLOR_SLATE,
+ {SKINCOLOR_AZURE, 9}, // SKINCOLOR_PINK,
+ {SKINCOLOR_RUST, 7}, // SKINCOLOR_YOGURT,
+ {SKINCOLOR_TAN, 2}, // SKINCOLOR_BROWN,
+ {SKINCOLOR_BROWN, 12}, // SKINCOLOR_TAN,
+ {SKINCOLOR_MOSS, 5}, // SKINCOLOR_BEIGE,
+ {SKINCOLOR_BEIGE, 13}, // SKINCOLOR_MOSS,
+ {SKINCOLOR_PINK, 5}, // SKINCOLOR_AZURE,
+ {SKINCOLOR_GOLD, 4}, // SKINCOLOR_LAVENDER,
// Viv's vivid colours (toast 21/07/17)
- SKINCOLOR_EMERALD,10, // SKINCOLOR_RUBY,
- SKINCOLOR_FOREST,6, // SKINCOLOR_SALMON,
- SKINCOLOR_GREEN,10, // SKINCOLOR_RED,
- SKINCOLOR_ICY,10, // SKINCOLOR_CRIMSON,
- SKINCOLOR_PURPLE,8, // SKINCOLOR_FLAME,
- SKINCOLOR_TEAL,7, // SKINCOLOR_PEACHY,
- SKINCOLOR_WAVE,5, // SKINCOLOR_QUAIL,
- SKINCOLOR_SAPPHIRE,5, // SKINCOLOR_SUNSET,
- SKINCOLOR_CYAN,4, // SKINCOLOR_APRICOT,
- SKINCOLOR_BLUE,4, // SKINCOLOR_ORANGE,
- SKINCOLOR_YOGURT,8, // SKINCOLOR_RUST,
- SKINCOLOR_LAVENDER,10, // SKINCOLOR_GOLD,
- SKINCOLOR_SKY,8, // SKINCOLOR_SANDY,
- SKINCOLOR_CORNFLOWER,8, // SKINCOLOR_YELLOW,
- SKINCOLOR_DUSK,3, // SKINCOLOR_OLIVE,
- SKINCOLOR_MAGENTA,9, // SKINCOLOR_LIME,
- SKINCOLOR_COBALT,2, // SKINCOLOR_PERIDOT,
- SKINCOLOR_RED,6, // SKINCOLOR_GREEN,
- SKINCOLOR_SALMON,9, // SKINCOLOR_FOREST,
- SKINCOLOR_RUBY,4, // SKINCOLOR_EMERALD,
- SKINCOLOR_VIOLET,5, // SKINCOLOR_MINT,
- SKINCOLOR_PLUM,6, // SKINCOLOR_SEAFOAM,
- SKINCOLOR_ROSY,7, // SKINCOLOR_AQUA,
- SKINCOLOR_PEACHY,7, // SKINCOLOR_TEAL,
- SKINCOLOR_QUAIL,5, // SKINCOLOR_WAVE,
- SKINCOLOR_APRICOT,6, // SKINCOLOR_CYAN,
- SKINCOLOR_SANDY,1, // SKINCOLOR_SKY,
- SKINCOLOR_NEON,4, // SKINCOLOR_CERULEAN,
- SKINCOLOR_CRIMSON,0, // SKINCOLOR_ICY,
- SKINCOLOR_SUNSET,5, // SKINCOLOR_SAPPHIRE,
- SKINCOLOR_YELLOW,4, // SKINCOLOR_CORNFLOWER,
- SKINCOLOR_ORANGE,5, // SKINCOLOR_BLUE,
- SKINCOLOR_PERIDOT,5, // SKINCOLOR_COBALT,
- SKINCOLOR_LILAC,4, // SKINCOLOR_VAPOR,
- SKINCOLOR_OLIVE,0, // SKINCOLOR_DUSK,
- SKINCOLOR_BUBBLEGUM,9, // SKINCOLOR_PASTEL,
- SKINCOLOR_FLAME,7, // SKINCOLOR_PURPLE,
- SKINCOLOR_PASTEL,8, // SKINCOLOR_BUBBLEGUM,
- SKINCOLOR_LIME,6, // SKINCOLOR_MAGENTA,
- SKINCOLOR_CERULEAN,2, // SKINCOLOR_NEON,
- SKINCOLOR_MINT,6, // SKINCOLOR_VIOLET,
- SKINCOLOR_VAPOR,4, // SKINCOLOR_LILAC,
- SKINCOLOR_MINT,7, // SKINCOLOR_PLUM,
- SKINCOLOR_AQUA,1 // SKINCOLOR_ROSY,
+ {SKINCOLOR_EMERALD, 10}, // SKINCOLOR_RUBY,
+ {SKINCOLOR_FOREST, 6}, // SKINCOLOR_SALMON,
+ {SKINCOLOR_GREEN, 10}, // SKINCOLOR_RED,
+ {SKINCOLOR_ICY, 10}, // SKINCOLOR_CRIMSON,
+ {SKINCOLOR_PURPLE, 8}, // SKINCOLOR_FLAME,
+ {SKINCOLOR_TEAL, 7}, // SKINCOLOR_PEACHY,
+ {SKINCOLOR_WAVE, 5}, // SKINCOLOR_QUAIL,
+ {SKINCOLOR_SAPPHIRE, 5}, // SKINCOLOR_SUNSET,
+ {SKINCOLOR_CYAN, 4}, // SKINCOLOR_APRICOT,
+ {SKINCOLOR_BLUE, 4}, // SKINCOLOR_ORANGE,
+ {SKINCOLOR_YOGURT, 8}, // SKINCOLOR_RUST,
+ {SKINCOLOR_LAVENDER, 10}, // SKINCOLOR_GOLD,
+ {SKINCOLOR_SKY, 8}, // SKINCOLOR_SANDY,
+ {SKINCOLOR_CORNFLOWER, 8}, // SKINCOLOR_YELLOW,
+ {SKINCOLOR_DUSK, 3}, // SKINCOLOR_OLIVE,
+ {SKINCOLOR_MAGENTA, 9}, // SKINCOLOR_LIME,
+ {SKINCOLOR_COBALT, 2}, // SKINCOLOR_PERIDOT,
+ {SKINCOLOR_RED, 6}, // SKINCOLOR_GREEN,
+ {SKINCOLOR_SALMON, 9}, // SKINCOLOR_FOREST,
+ {SKINCOLOR_RUBY, 4}, // SKINCOLOR_EMERALD,
+ {SKINCOLOR_VIOLET, 5}, // SKINCOLOR_MINT,
+ {SKINCOLOR_PLUM, 6}, // SKINCOLOR_SEAFOAM,
+ {SKINCOLOR_ROSY, 7}, // SKINCOLOR_AQUA,
+ {SKINCOLOR_PEACHY, 7}, // SKINCOLOR_TEAL,
+ {SKINCOLOR_QUAIL, 5}, // SKINCOLOR_WAVE,
+ {SKINCOLOR_APRICOT, 6}, // SKINCOLOR_CYAN,
+ {SKINCOLOR_SANDY, 1}, // SKINCOLOR_SKY,
+ {SKINCOLOR_NEON, 4}, // SKINCOLOR_CERULEAN,
+ {SKINCOLOR_CRIMSON, 0}, // SKINCOLOR_ICY,
+ {SKINCOLOR_SUNSET, 5}, // SKINCOLOR_SAPPHIRE,
+ {SKINCOLOR_YELLOW, 4}, // SKINCOLOR_CORNFLOWER,
+ {SKINCOLOR_ORANGE, 5}, // SKINCOLOR_BLUE,
+ {SKINCOLOR_PERIDOT, 5}, // SKINCOLOR_COBALT,
+ {SKINCOLOR_LILAC, 4}, // SKINCOLOR_VAPOR,
+ {SKINCOLOR_OLIVE, 0}, // SKINCOLOR_DUSK,
+ {SKINCOLOR_BUBBLEGUM, 9}, // SKINCOLOR_PASTEL,
+ {SKINCOLOR_FLAME, 7}, // SKINCOLOR_PURPLE,
+ {SKINCOLOR_PASTEL, 8}, // SKINCOLOR_BUBBLEGUM,
+ {SKINCOLOR_LIME, 6}, // SKINCOLOR_MAGENTA,
+ {SKINCOLOR_CERULEAN, 2}, // SKINCOLOR_NEON,
+ {SKINCOLOR_MINT, 6}, // SKINCOLOR_VIOLET,
+ {SKINCOLOR_VAPOR, 4}, // SKINCOLOR_LILAC,
+ {SKINCOLOR_MINT, 7}, // SKINCOLOR_PLUM,
+ {SKINCOLOR_AQUA, 1} // SKINCOLOR_ROSY,
};
CV_PossibleValue_t Color_cons_t[MAXSKINCOLORS+1];
@@ -521,33 +525,56 @@ static void R_GenerateTranslationColormap(UINT8 *dest_colormap, INT32 skinnum, U
INT32 i, starttranscolor, skinramplength;
// Handle a couple of simple special cases
- if (skinnum == TC_BOSS
- || skinnum == TC_ALLWHITE
- || skinnum == TC_METALSONIC
- || skinnum == TC_BLINK
- || color == SKINCOLOR_NONE)
+ if (skinnum < TC_DEFAULT)
{
- if (skinnum == TC_ALLWHITE)
- memset(dest_colormap, 0, NUM_PALETTE_ENTRIES * sizeof(UINT8));
- else if (skinnum == TC_BLINK && color != SKINCOLOR_NONE)
- memset(dest_colormap, Color_Index[color-1][3], NUM_PALETTE_ENTRIES * sizeof(UINT8));
- else
+ switch (skinnum)
{
- for (i = 0; i < NUM_PALETTE_ENTRIES; i++)
- dest_colormap[i] = (UINT8)i;
+ case TC_ALLWHITE:
+ memset(dest_colormap, 0, NUM_PALETTE_ENTRIES * sizeof(UINT8));
+ return;
+ case TC_RAINBOW:
+ if (color >= MAXTRANSLATIONS)
+ I_Error("Invalid skin color #%hu.", (UINT16)color);
+ if (color != SKINCOLOR_NONE)
+ {
+ R_RainbowColormap(dest_colormap, color);
+ return;
+ }
+ break;
+ case TC_BLINK:
+ if (color >= MAXTRANSLATIONS)
+ I_Error("Invalid skin color #%hu.", (UINT16)color);
+ if (color != SKINCOLOR_NONE)
+ {
+ memset(dest_colormap, Color_Index[color-1][3], NUM_PALETTE_ENTRIES * sizeof(UINT8));
+ return;
+ }
+ break;
+ default:
+ break;
}
+ for (i = 0; i < NUM_PALETTE_ENTRIES; i++)
+ dest_colormap[i] = (UINT8)i;
+
// White!
if (skinnum == TC_BOSS)
- dest_colormap[31] = 0;
+ {
+ for (i = 0; i < 16; i++)
+ dest_colormap[31-i] = i;
+ }
else if (skinnum == TC_METALSONIC)
- dest_colormap[159] = 0;
-
+ {
+ for (i = 0; i < 6; i++)
+ dest_colormap[Color_Index[SKINCOLOR_BLUE-1][12-i]] = Color_Index[SKINCOLOR_BLUE-1][i];
+ dest_colormap[159] = dest_colormap[253] = dest_colormap[254] = 0;
+ }
return;
}
- else if (skinnum == TC_RAINBOW)
+ else if (color == SKINCOLOR_NONE)
{
- R_RainbowColormap(dest_colormap, color);
+ for (i = 0; i < NUM_PALETTE_ENTRIES; i++)
+ dest_colormap[i] = (UINT8)i;
return;
}
@@ -556,6 +583,9 @@ static void R_GenerateTranslationColormap(UINT8 *dest_colormap, INT32 skinnum, U
starttranscolor = (skinnum != TC_DEFAULT) ? skins[skinnum].starttranscolor : DEFAULT_STARTTRANSCOLOR;
+ if (starttranscolor >= NUM_PALETTE_ENTRIES)
+ I_Error("Invalid startcolor #%d.", starttranscolor);
+
// Fill in the entries of the palette that are fixed
for (i = 0; i < starttranscolor; i++)
dest_colormap[i] = (UINT8)i;
@@ -568,7 +598,7 @@ static void R_GenerateTranslationColormap(UINT8 *dest_colormap, INT32 skinnum, U
skinramplength = 16;
}
else
- skinramplength = i - NUM_PALETTE_ENTRIES;
+ skinramplength = i - NUM_PALETTE_ENTRIES; // shouldn't this be NUM_PALETTE_ENTRIES - starttranscolor?
// Build the translated ramp
for (i = 0; i < skinramplength; i++)
@@ -590,13 +620,16 @@ UINT8* R_GetTranslationColormap(INT32 skinnum, skincolors_t color, UINT8 flags)
INT32 skintableindex;
// Adjust if we want the default colormap
- if (skinnum == TC_DEFAULT) skintableindex = DEFAULT_TT_CACHE_INDEX;
- else if (skinnum == TC_BOSS) skintableindex = BOSS_TT_CACHE_INDEX;
- else if (skinnum == TC_METALSONIC) skintableindex = METALSONIC_TT_CACHE_INDEX;
- else if (skinnum == TC_ALLWHITE) skintableindex = ALLWHITE_TT_CACHE_INDEX;
- else if (skinnum == TC_RAINBOW) skintableindex = RAINBOW_TT_CACHE_INDEX;
- else if (skinnum == TC_BLINK) skintableindex = BLINK_TT_CACHE_INDEX;
- else skintableindex = skinnum;
+ switch (skinnum)
+ {
+ case TC_DEFAULT: skintableindex = DEFAULT_TT_CACHE_INDEX; break;
+ case TC_BOSS: skintableindex = BOSS_TT_CACHE_INDEX; break;
+ case TC_METALSONIC: skintableindex = METALSONIC_TT_CACHE_INDEX; break;
+ case TC_ALLWHITE: skintableindex = ALLWHITE_TT_CACHE_INDEX; break;
+ case TC_RAINBOW: skintableindex = RAINBOW_TT_CACHE_INDEX; break;
+ case TC_BLINK: skintableindex = BLINK_TT_CACHE_INDEX; break;
+ default: skintableindex = skinnum; break;
+ }
if (flags & GTC_CACHE)
{
diff --git a/src/r_draw.h b/src/r_draw.h
index 82498eb11e22d30569e69b2baca059d1acbeb40e..3c142972257c446a29e32fd1c36a810e47c63bc0 100644
--- a/src/r_draw.h
+++ b/src/r_draw.h
@@ -57,7 +57,9 @@ extern INT32 dc_texheight;
extern INT32 ds_y, ds_x1, ds_x2;
extern lighttable_t *ds_colormap;
extern fixed_t ds_xfrac, ds_yfrac, ds_xstep, ds_ystep;
-extern UINT8 *ds_source; // start of a 64*64 tile image
+extern UINT16 ds_flatwidth, ds_flatheight;
+extern boolean ds_powersoftwo;
+extern UINT8 *ds_source;
extern UINT8 *ds_transmap;
#ifdef ESLOPE
@@ -128,6 +130,8 @@ void R_FillBackScreen(void);
void R_DrawViewBorder(void);
#endif
+#define TRANSPARENTPIXEL 255
+
// -----------------
// 8bpp DRAWING CODE
// -----------------
@@ -169,6 +173,13 @@ void R_DrawFogSpan_8(void);
void R_DrawFogColumn_8(void);
void R_DrawColumnShadowed_8(void);
+#ifndef NOWATER
+void R_DrawTranslucentWaterSpan_8(void);
+
+extern INT32 ds_bgofs;
+extern INT32 ds_waterofs;
+#endif
+
// ------------------
// 16bpp DRAWING CODE
// ------------------
diff --git a/src/r_draw8.c b/src/r_draw8.c
index 8a2d37fb3d796d81b7bf1a470d8bfa93971f3d0e..77406f83c6d6420835a6cf11de32e7a7edb27441 100644
--- a/src/r_draw8.c
+++ b/src/r_draw8.c
@@ -105,8 +105,6 @@ void R_DrawColumn_8(void)
}
}
-#define TRANSPARENTPIXEL 255
-
void R_Draw2sMultiPatchColumn_8(void)
{
INT32 count;
@@ -543,16 +541,19 @@ void R_DrawTranslatedColumn_8(void)
*/
void R_DrawSpan_8 (void)
{
- UINT32 xposition;
- UINT32 yposition;
- UINT32 xstep, ystep;
+ fixed_t xposition;
+ fixed_t yposition;
+ fixed_t xstep, ystep;
UINT8 *source;
UINT8 *colormap;
UINT8 *dest;
const UINT8 *deststop = screens[0] + vid.rowbytes * vid.height;
- size_t count;
+ size_t count = (ds_x2 - ds_x1 + 1);
+
+ xposition = ds_xfrac; yposition = ds_yfrac;
+ xstep = ds_xstep; ystep = ds_ystep;
// SoM: we only need 6 bits for the integer part (0 thru 63) so the rest
// can be used for the fraction part. This allows calculation of the memory address in the
@@ -561,62 +562,88 @@ void R_DrawSpan_8 (void)
// bit per power of two (obviously)
// Ok, because I was able to eliminate the variable spot below, this function is now FASTER
// than the original span renderer. Whodathunkit?
- xposition = ds_xfrac << nflatshiftup; yposition = ds_yfrac << nflatshiftup;
- xstep = ds_xstep << nflatshiftup; ystep = ds_ystep << nflatshiftup;
+ if (ds_powersoftwo)
+ {
+ xposition <<= nflatshiftup; yposition <<= nflatshiftup;
+ xstep <<= nflatshiftup; ystep <<= nflatshiftup;
+ }
source = ds_source;
colormap = ds_colormap;
dest = ylookup[ds_y] + columnofs[ds_x1];
- count = ds_x2 - ds_x1 + 1;
if (dest+8 > deststop)
return;
- while (count >= 8)
+ if (!ds_powersoftwo)
{
- // SoM: Why didn't I see this earlier? the spot variable is a waste now because we don't
- // have the uber complicated math to calculate it now, so that was a memory write we didn't
- // need!
- dest[0] = colormap[source[((yposition >> nflatyshift) & nflatmask) | (xposition >> nflatxshift)]];
- xposition += xstep;
- yposition += ystep;
-
- dest[1] = colormap[source[((yposition >> nflatyshift) & nflatmask) | (xposition >> nflatxshift)]];
- xposition += xstep;
- yposition += ystep;
-
- dest[2] = colormap[source[((yposition >> nflatyshift) & nflatmask) | (xposition >> nflatxshift)]];
- xposition += xstep;
- yposition += ystep;
-
- dest[3] = colormap[source[((yposition >> nflatyshift) & nflatmask) | (xposition >> nflatxshift)]];
- xposition += xstep;
- yposition += ystep;
-
- dest[4] = colormap[source[((yposition >> nflatyshift) & nflatmask) | (xposition >> nflatxshift)]];
- xposition += xstep;
- yposition += ystep;
-
- dest[5] = colormap[source[((yposition >> nflatyshift) & nflatmask) | (xposition >> nflatxshift)]];
- xposition += xstep;
- yposition += ystep;
-
- dest[6] = colormap[source[((yposition >> nflatyshift) & nflatmask) | (xposition >> nflatxshift)]];
- xposition += xstep;
- yposition += ystep;
-
- dest[7] = colormap[source[((yposition >> nflatyshift) & nflatmask) | (xposition >> nflatxshift)]];
- xposition += xstep;
- yposition += ystep;
-
- dest += 8;
- count -= 8;
+ while (count-- && dest <= deststop)
+ {
+ fixed_t x = (xposition >> FRACBITS);
+ fixed_t y = (yposition >> FRACBITS);
+
+ // Carefully align all of my Friends.
+ if (x < 0)
+ x = ds_flatwidth - ((UINT32)(ds_flatwidth - x) % ds_flatwidth);
+ if (y < 0)
+ y = ds_flatheight - ((UINT32)(ds_flatheight - y) % ds_flatheight);
+
+ x %= ds_flatwidth;
+ y %= ds_flatheight;
+
+ *dest++ = colormap[source[((y * ds_flatwidth) + x)]];
+ xposition += xstep;
+ yposition += ystep;
+ }
}
- while (count-- && dest <= deststop)
+ else
{
- *dest++ = colormap[source[((yposition >> nflatyshift) & nflatmask) | (xposition >> nflatxshift)]];
- xposition += xstep;
- yposition += ystep;
+ while (count >= 8)
+ {
+ // SoM: Why didn't I see this earlier? the spot variable is a waste now because we don't
+ // have the uber complicated math to calculate it now, so that was a memory write we didn't
+ // need!
+ dest[0] = colormap[source[(((UINT32)yposition >> nflatyshift) & nflatmask) | ((UINT32)xposition >> nflatxshift)]];
+ xposition += xstep;
+ yposition += ystep;
+
+ dest[1] = colormap[source[(((UINT32)yposition >> nflatyshift) & nflatmask) | ((UINT32)xposition >> nflatxshift)]];
+ xposition += xstep;
+ yposition += ystep;
+
+ dest[2] = colormap[source[(((UINT32)yposition >> nflatyshift) & nflatmask) | ((UINT32)xposition >> nflatxshift)]];
+ xposition += xstep;
+ yposition += ystep;
+
+ dest[3] = colormap[source[(((UINT32)yposition >> nflatyshift) & nflatmask) | ((UINT32)xposition >> nflatxshift)]];
+ xposition += xstep;
+ yposition += ystep;
+
+ dest[4] = colormap[source[(((UINT32)yposition >> nflatyshift) & nflatmask) | ((UINT32)xposition >> nflatxshift)]];
+ xposition += xstep;
+ yposition += ystep;
+
+ dest[5] = colormap[source[(((UINT32)yposition >> nflatyshift) & nflatmask) | ((UINT32)xposition >> nflatxshift)]];
+ xposition += xstep;
+ yposition += ystep;
+
+ dest[6] = colormap[source[(((UINT32)yposition >> nflatyshift) & nflatmask) | ((UINT32)xposition >> nflatxshift)]];
+ xposition += xstep;
+ yposition += ystep;
+
+ dest[7] = colormap[source[(((UINT32)yposition >> nflatyshift) & nflatmask) | ((UINT32)xposition >> nflatxshift)]];
+ xposition += xstep;
+ yposition += ystep;
+
+ dest += 8;
+ count -= 8;
+ }
+ while (count-- && dest <= deststop)
+ {
+ *dest++ = colormap[source[(((UINT32)yposition >> nflatyshift) & nflatmask) | ((UINT32)xposition >> nflatxshift)]];
+ xposition += xstep;
+ yposition += ystep;
+ }
}
}
@@ -697,7 +724,24 @@ void R_DrawTiltedSpan_8(void)
colormap = planezlight[tiltlighting[ds_x1++]] + (ds_colormap - colormaps);
- *dest = colormap[source[((v >> nflatyshift) & nflatmask) | (u >> nflatxshift)]];
+ if (!ds_powersoftwo)
+ {
+ fixed_t x = (((fixed_t)u-viewx) >> FRACBITS);
+ fixed_t y = (((fixed_t)v-viewy) >> FRACBITS);
+
+ // Carefully align all of my Friends.
+ if (x < 0)
+ x = ds_flatwidth - ((UINT32)(ds_flatwidth - x) % ds_flatwidth);
+ if (y < 0)
+ y = ds_flatheight - ((UINT32)(ds_flatheight - y) % ds_flatheight);
+
+ x %= ds_flatwidth;
+ y %= ds_flatheight;
+
+ *dest = colormap[source[((y * ds_flatwidth) + x)]];
+ }
+ else
+ *dest = colormap[source[((v >> nflatyshift) & nflatmask) | (u >> nflatxshift)]];
dest++;
iz += ds_sz.x;
uz += ds_su.x;
@@ -734,7 +778,24 @@ void R_DrawTiltedSpan_8(void)
for (i = SPANSIZE-1; i >= 0; i--)
{
colormap = planezlight[tiltlighting[ds_x1++]] + (ds_colormap - colormaps);
- *dest = colormap[source[((v >> nflatyshift) & nflatmask) | (u >> nflatxshift)]];
+ if (!ds_powersoftwo)
+ {
+ fixed_t x = (((fixed_t)u-viewx) >> FRACBITS);
+ fixed_t y = (((fixed_t)v-viewy) >> FRACBITS);
+
+ // Carefully align all of my Friends.
+ if (x < 0)
+ x = ds_flatwidth - ((UINT32)(ds_flatwidth - x) % ds_flatwidth);
+ if (y < 0)
+ y = ds_flatheight - ((UINT32)(ds_flatheight - y) % ds_flatheight);
+
+ x %= ds_flatwidth;
+ y %= ds_flatheight;
+
+ *dest = colormap[source[((y * ds_flatwidth) + x)]];
+ }
+ else
+ *dest = colormap[source[((v >> nflatyshift) & nflatmask) | (u >> nflatxshift)]];
dest++;
u += stepu;
v += stepv;
@@ -750,7 +811,24 @@ void R_DrawTiltedSpan_8(void)
u = (INT64)(startu);
v = (INT64)(startv);
colormap = planezlight[tiltlighting[ds_x1++]] + (ds_colormap - colormaps);
- *dest = colormap[source[((v >> nflatyshift) & nflatmask) | (u >> nflatxshift)]];
+ if (!ds_powersoftwo)
+ {
+ fixed_t x = (((fixed_t)u-viewx) >> FRACBITS);
+ fixed_t y = (((fixed_t)v-viewy) >> FRACBITS);
+
+ // Carefully align all of my Friends.
+ if (x < 0)
+ x = ds_flatwidth - ((UINT32)(ds_flatwidth - x) % ds_flatwidth);
+ if (y < 0)
+ y = ds_flatheight - ((UINT32)(ds_flatheight - y) % ds_flatheight);
+
+ x %= ds_flatwidth;
+ y %= ds_flatheight;
+
+ *dest = colormap[source[((y * ds_flatwidth) + x)]];
+ }
+ else
+ *dest = colormap[source[((v >> nflatyshift) & nflatmask) | (u >> nflatxshift)]];
}
else
{
@@ -771,7 +849,24 @@ void R_DrawTiltedSpan_8(void)
for (; width != 0; width--)
{
colormap = planezlight[tiltlighting[ds_x1++]] + (ds_colormap - colormaps);
- *dest = colormap[source[((v >> nflatyshift) & nflatmask) | (u >> nflatxshift)]];
+ if (!ds_powersoftwo)
+ {
+ fixed_t x = (((fixed_t)u-viewx) >> FRACBITS);
+ fixed_t y = (((fixed_t)v-viewy) >> FRACBITS);
+
+ // Carefully align all of my Friends.
+ if (x < 0)
+ x = ds_flatwidth - ((UINT32)(ds_flatwidth - x) % ds_flatwidth);
+ if (y < 0)
+ y = ds_flatheight - ((UINT32)(ds_flatheight - y) % ds_flatheight);
+
+ x %= ds_flatwidth;
+ y %= ds_flatheight;
+
+ *dest = colormap[source[((y * ds_flatwidth) + x)]];
+ }
+ else
+ *dest = colormap[source[((v >> nflatyshift) & nflatmask) | (u >> nflatxshift)]];
dest++;
u += stepu;
v += stepv;
@@ -832,7 +927,24 @@ void R_DrawTiltedTranslucentSpan_8(void)
v = (INT64)(vz*z) + viewy;
colormap = planezlight[tiltlighting[ds_x1++]] + (ds_colormap - colormaps);
- *dest = *(ds_transmap + (colormap[source[((v >> nflatyshift) & nflatmask) | (u >> nflatxshift)]] << 8) + *dest);
+ if (!ds_powersoftwo)
+ {
+ fixed_t x = (((fixed_t)u-viewx) >> FRACBITS);
+ fixed_t y = (((fixed_t)v-viewy) >> FRACBITS);
+
+ // Carefully align all of my Friends.
+ if (x < 0)
+ x = ds_flatwidth - ((UINT32)(ds_flatwidth - x) % ds_flatwidth);
+ if (y < 0)
+ y = ds_flatheight - ((UINT32)(ds_flatheight - y) % ds_flatheight);
+
+ x %= ds_flatwidth;
+ y %= ds_flatheight;
+
+ *dest = *(ds_transmap + (colormap[source[((y * ds_flatwidth) + x)]] << 8) + *dest);
+ }
+ else
+ *dest = *(ds_transmap + (colormap[source[((v >> nflatyshift) & nflatmask) | (u >> nflatxshift)]] << 8) + *dest);
dest++;
iz += ds_sz.x;
uz += ds_su.x;
@@ -869,7 +981,24 @@ void R_DrawTiltedTranslucentSpan_8(void)
for (i = SPANSIZE-1; i >= 0; i--)
{
colormap = planezlight[tiltlighting[ds_x1++]] + (ds_colormap - colormaps);
- *dest = *(ds_transmap + (colormap[source[((v >> nflatyshift) & nflatmask) | (u >> nflatxshift)]] << 8) + *dest);
+ if (!ds_powersoftwo)
+ {
+ fixed_t x = (((fixed_t)u-viewx) >> FRACBITS);
+ fixed_t y = (((fixed_t)v-viewy) >> FRACBITS);
+
+ // Carefully align all of my Friends.
+ if (x < 0)
+ x = ds_flatwidth - ((UINT32)(ds_flatwidth - x) % ds_flatwidth);
+ if (y < 0)
+ y = ds_flatheight - ((UINT32)(ds_flatheight - y) % ds_flatheight);
+
+ x %= ds_flatwidth;
+ y %= ds_flatheight;
+
+ *dest = *(ds_transmap + (colormap[source[((y * ds_flatwidth) + x)]] << 8) + *dest);
+ }
+ else
+ *dest = *(ds_transmap + (colormap[source[((v >> nflatyshift) & nflatmask) | (u >> nflatxshift)]] << 8) + *dest);
dest++;
u += stepu;
v += stepv;
@@ -885,7 +1014,24 @@ void R_DrawTiltedTranslucentSpan_8(void)
u = (INT64)(startu);
v = (INT64)(startv);
colormap = planezlight[tiltlighting[ds_x1++]] + (ds_colormap - colormaps);
- *dest = *(ds_transmap + (colormap[source[((v >> nflatyshift) & nflatmask) | (u >> nflatxshift)]] << 8) + *dest);
+ if (!ds_powersoftwo)
+ {
+ fixed_t x = (((fixed_t)u-viewx) >> FRACBITS);
+ fixed_t y = (((fixed_t)v-viewy) >> FRACBITS);
+
+ // Carefully align all of my Friends.
+ if (x < 0)
+ x = ds_flatwidth - ((UINT32)(ds_flatwidth - x) % ds_flatwidth);
+ if (y < 0)
+ y = ds_flatheight - ((UINT32)(ds_flatheight - y) % ds_flatheight);
+
+ x %= ds_flatwidth;
+ y %= ds_flatheight;
+
+ *dest = *(ds_transmap + (colormap[source[((y * ds_flatwidth) + x)]] << 8) + *dest);
+ }
+ else
+ *dest = *(ds_transmap + (colormap[source[((v >> nflatyshift) & nflatmask) | (u >> nflatxshift)]] << 8) + *dest);
}
else
{
@@ -906,7 +1052,24 @@ void R_DrawTiltedTranslucentSpan_8(void)
for (; width != 0; width--)
{
colormap = planezlight[tiltlighting[ds_x1++]] + (ds_colormap - colormaps);
- *dest = *(ds_transmap + (colormap[source[((v >> nflatyshift) & nflatmask) | (u >> nflatxshift)]] << 8) + *dest);
+ if (!ds_powersoftwo)
+ {
+ fixed_t x = (((fixed_t)u-viewx) >> FRACBITS);
+ fixed_t y = (((fixed_t)v-viewy) >> FRACBITS);
+
+ // Carefully align all of my Friends.
+ if (x < 0)
+ x = ds_flatwidth - ((UINT32)(ds_flatwidth - x) % ds_flatwidth);
+ if (y < 0)
+ y = ds_flatheight - ((UINT32)(ds_flatheight - y) % ds_flatheight);
+
+ x %= ds_flatwidth;
+ y %= ds_flatheight;
+
+ *dest = *(ds_transmap + (colormap[source[((y * ds_flatwidth) + x)]] << 8) + *dest);
+ }
+ else
+ *dest = *(ds_transmap + (colormap[source[((v >> nflatyshift) & nflatmask) | (u >> nflatxshift)]] << 8) + *dest);
dest++;
u += stepu;
v += stepv;
@@ -967,9 +1130,28 @@ void R_DrawTiltedSplat_8(void)
colormap = planezlight[tiltlighting[ds_x1++]] + (ds_colormap - colormaps);
- val = source[((v >> nflatyshift) & nflatmask) | (u >> nflatxshift)];
+ if (!ds_powersoftwo)
+ {
+ fixed_t x = (((fixed_t)u-viewx) >> FRACBITS);
+ fixed_t y = (((fixed_t)v-viewy) >> FRACBITS);
+
+ // Carefully align all of my Friends.
+ if (x < 0)
+ x = ds_flatwidth - ((UINT32)(ds_flatwidth - x) % ds_flatwidth);
+ if (y < 0)
+ y = ds_flatheight - ((UINT32)(ds_flatheight - y) % ds_flatheight);
+
+ x %= ds_flatwidth;
+ y %= ds_flatheight;
+
+ val = source[((y * ds_flatwidth) + x)];
+ }
+ else
+ val = source[((v >> nflatyshift) & nflatmask) | (u >> nflatxshift)];
+
if (val != TRANSPARENTPIXEL)
*dest = colormap[val];
+
dest++;
iz += ds_sz.x;
uz += ds_su.x;
@@ -1006,7 +1188,24 @@ void R_DrawTiltedSplat_8(void)
for (i = SPANSIZE-1; i >= 0; i--)
{
colormap = planezlight[tiltlighting[ds_x1++]] + (ds_colormap - colormaps);
- val = source[((v >> nflatyshift) & nflatmask) | (u >> nflatxshift)];
+ if (!ds_powersoftwo)
+ {
+ fixed_t x = (((fixed_t)u-viewx) >> FRACBITS);
+ fixed_t y = (((fixed_t)v-viewy) >> FRACBITS);
+
+ // Carefully align all of my Friends.
+ if (x < 0)
+ x = ds_flatwidth - ((UINT32)(ds_flatwidth - x) % ds_flatwidth);
+ if (y < 0)
+ y = ds_flatheight - ((UINT32)(ds_flatheight - y) % ds_flatheight);
+
+ x %= ds_flatwidth;
+ y %= ds_flatheight;
+
+ val = source[((y * ds_flatwidth) + x)];
+ }
+ else
+ val = source[((v >> nflatyshift) & nflatmask) | (u >> nflatxshift)];
if (val != TRANSPARENTPIXEL)
*dest = colormap[val];
dest++;
@@ -1024,7 +1223,24 @@ void R_DrawTiltedSplat_8(void)
u = (INT64)(startu);
v = (INT64)(startv);
colormap = planezlight[tiltlighting[ds_x1++]] + (ds_colormap - colormaps);
- val = source[((v >> nflatyshift) & nflatmask) | (u >> nflatxshift)];
+ if (!ds_powersoftwo)
+ {
+ fixed_t x = (((fixed_t)u-viewx) >> FRACBITS);
+ fixed_t y = (((fixed_t)v-viewy) >> FRACBITS);
+
+ // Carefully align all of my Friends.
+ if (x < 0)
+ x = ds_flatwidth - ((UINT32)(ds_flatwidth - x) % ds_flatwidth);
+ if (y < 0)
+ y = ds_flatheight - ((UINT32)(ds_flatheight - y) % ds_flatheight);
+
+ x %= ds_flatwidth;
+ y %= ds_flatheight;
+
+ val = source[((y * ds_flatwidth) + x)];
+ }
+ else
+ val = source[((v >> nflatyshift) & nflatmask) | (u >> nflatxshift)];
if (val != TRANSPARENTPIXEL)
*dest = colormap[val];
}
@@ -1048,6 +1264,24 @@ void R_DrawTiltedSplat_8(void)
{
colormap = planezlight[tiltlighting[ds_x1++]] + (ds_colormap - colormaps);
val = source[((v >> nflatyshift) & nflatmask) | (u >> nflatxshift)];
+ if (!ds_powersoftwo)
+ {
+ fixed_t x = (((fixed_t)u-viewx) >> FRACBITS);
+ fixed_t y = (((fixed_t)v-viewy) >> FRACBITS);
+
+ // Carefully align all of my Friends.
+ if (x < 0)
+ x = ds_flatwidth - ((UINT32)(ds_flatwidth - x) % ds_flatwidth);
+ if (y < 0)
+ y = ds_flatheight - ((UINT32)(ds_flatheight - y) % ds_flatheight);
+
+ x %= ds_flatwidth;
+ y %= ds_flatheight;
+
+ val = source[((y * ds_flatwidth) + x)];
+ }
+ else
+ val = source[((v >> nflatyshift) & nflatmask) | (u >> nflatxshift)];
if (val != TRANSPARENTPIXEL)
*dest = colormap[val];
dest++;
@@ -1065,17 +1299,21 @@ void R_DrawTiltedSplat_8(void)
*/
void R_DrawSplat_8 (void)
{
- UINT32 xposition;
- UINT32 yposition;
- UINT32 xstep, ystep;
+ fixed_t xposition;
+ fixed_t yposition;
+ fixed_t xstep, ystep;
UINT8 *source;
UINT8 *colormap;
UINT8 *dest;
+ const UINT8 *deststop = screens[0] + vid.rowbytes * vid.height;
- size_t count;
+ size_t count = (ds_x2 - ds_x1 + 1);
UINT32 val;
+ xposition = ds_xfrac; yposition = ds_yfrac;
+ xstep = ds_xstep; ystep = ds_ystep;
+
// SoM: we only need 6 bits for the integer part (0 thru 63) so the rest
// can be used for the fraction part. This allows calculation of the memory address in the
// texture with two shifts, an OR and one AND. (see below)
@@ -1083,99 +1321,125 @@ void R_DrawSplat_8 (void)
// bit per power of two (obviously)
// Ok, because I was able to eliminate the variable spot below, this function is now FASTER
// than the original span renderer. Whodathunkit?
- xposition = ds_xfrac << nflatshiftup; yposition = ds_yfrac << nflatshiftup;
- xstep = ds_xstep << nflatshiftup; ystep = ds_ystep << nflatshiftup;
+ if (ds_powersoftwo)
+ {
+ xposition <<= nflatshiftup; yposition <<= nflatshiftup;
+ xstep <<= nflatshiftup; ystep <<= nflatshiftup;
+ }
source = ds_source;
colormap = ds_colormap;
dest = ylookup[ds_y] + columnofs[ds_x1];
- count = ds_x2 - ds_x1 + 1;
- while (count >= 8)
+ if (!ds_powersoftwo)
{
- // SoM: Why didn't I see this earlier? the spot variable is a waste now because we don't
- // have the uber complicated math to calculate it now, so that was a memory write we didn't
- // need!
- //
- // <Callum> 4194303 = (2048x2048)-1 (2048x2048 is maximum flat size)
- val = ((yposition >> nflatyshift) & nflatmask) | (xposition >> nflatxshift);
- val &= 4194303;
- val = source[val];
- if (val != TRANSPARENTPIXEL)
- dest[0] = colormap[val];
- xposition += xstep;
- yposition += ystep;
+ while (count-- && dest <= deststop)
+ {
+ fixed_t x = (xposition >> FRACBITS);
+ fixed_t y = (yposition >> FRACBITS);
- val = ((yposition >> nflatyshift) & nflatmask) | (xposition >> nflatxshift);
- val &= 4194303;
- val = source[val];
- if (val != TRANSPARENTPIXEL)
- dest[1] = colormap[val];
- xposition += xstep;
- yposition += ystep;
+ // Carefully align all of my Friends.
+ if (x < 0)
+ x = ds_flatwidth - ((UINT32)(ds_flatwidth - x) % ds_flatwidth);
+ if (y < 0)
+ y = ds_flatheight - ((UINT32)(ds_flatheight - y) % ds_flatheight);
- val = ((yposition >> nflatyshift) & nflatmask) | (xposition >> nflatxshift);
- val &= 4194303;
- val = source[val];
- if (val != TRANSPARENTPIXEL)
- dest[2] = colormap[val];
- xposition += xstep;
- yposition += ystep;
+ x %= ds_flatwidth;
+ y %= ds_flatheight;
- val = ((yposition >> nflatyshift) & nflatmask) | (xposition >> nflatxshift);
- val &= 4194303;
- val = source[val];
- if (val != TRANSPARENTPIXEL)
- dest[3] = colormap[val];
- xposition += xstep;
- yposition += ystep;
+ val = source[((y * ds_flatwidth) + x)];
+ if (val != TRANSPARENTPIXEL)
+ *dest = colormap[val];
+ dest++;
+ xposition += xstep;
+ yposition += ystep;
+ }
+ }
+ else
+ {
+ while (count >= 8)
+ {
+ // SoM: Why didn't I see this earlier? the spot variable is a waste now because we don't
+ // have the uber complicated math to calculate it now, so that was a memory write we didn't
+ // need!
+ //
+ // <Callum> 4194303 = (2048x2048)-1 (2048x2048 is maximum flat size)
+ val = (((UINT32)yposition >> nflatyshift) & nflatmask) | ((UINT32)xposition >> nflatxshift);
+ val &= 4194303;
+ val = source[val];
+ if (val != TRANSPARENTPIXEL)
+ dest[0] = colormap[val];
+ xposition += xstep;
+ yposition += ystep;
- val = ((yposition >> nflatyshift) & nflatmask) | (xposition >> nflatxshift);
- val &= 4194303;
- val = source[val];
- if (val != TRANSPARENTPIXEL)
- dest[4] = colormap[val];
- xposition += xstep;
- yposition += ystep;
+ val = (((UINT32)yposition >> nflatyshift) & nflatmask) | ((UINT32)xposition >> nflatxshift);
+ val &= 4194303;
+ val = source[val];
+ if (val != TRANSPARENTPIXEL)
+ dest[1] = colormap[val];
+ xposition += xstep;
+ yposition += ystep;
- val = ((yposition >> nflatyshift) & nflatmask) | (xposition >> nflatxshift);
- val &= 4194303;
- val = source[val];
- if (val != TRANSPARENTPIXEL)
- dest[5] = colormap[val];
- xposition += xstep;
- yposition += ystep;
+ val = (((UINT32)yposition >> nflatyshift) & nflatmask) | ((UINT32)xposition >> nflatxshift);
+ val &= 4194303;
+ val = source[val];
+ if (val != TRANSPARENTPIXEL)
+ dest[2] = colormap[val];
+ xposition += xstep;
+ yposition += ystep;
- val = ((yposition >> nflatyshift) & nflatmask) | (xposition >> nflatxshift);
- val &= 4194303;
- val = source[val];
- if (val != TRANSPARENTPIXEL)
- dest[6] = colormap[val];
- xposition += xstep;
- yposition += ystep;
+ val = (((UINT32)yposition >> nflatyshift) & nflatmask) | ((UINT32)xposition >> nflatxshift);
+ val &= 4194303;
+ val = source[val];
+ if (val != TRANSPARENTPIXEL)
+ dest[3] = colormap[val];
+ xposition += xstep;
+ yposition += ystep;
- val = ((yposition >> nflatyshift) & nflatmask) | (xposition >> nflatxshift);
- val &= 4194303;
- val = source[val];
- if (val != TRANSPARENTPIXEL)
- dest[7] = colormap[val];
- xposition += xstep;
- yposition += ystep;
+ val = (((UINT32)yposition >> nflatyshift) & nflatmask) | ((UINT32)xposition >> nflatxshift);
+ val &= 4194303;
+ val = source[val];
+ if (val != TRANSPARENTPIXEL)
+ dest[4] = colormap[val];
+ xposition += xstep;
+ yposition += ystep;
- dest += 8;
- count -= 8;
- }
- while (count--)
- {
- val = ((yposition >> nflatyshift) & nflatmask) | (xposition >> nflatxshift);
- val &= 4194303;
- val = source[val];
- if (val != TRANSPARENTPIXEL)
- *dest = colormap[val];
+ val = (((UINT32)yposition >> nflatyshift) & nflatmask) | ((UINT32)xposition >> nflatxshift);
+ val &= 4194303;
+ val = source[val];
+ if (val != TRANSPARENTPIXEL)
+ dest[5] = colormap[val];
+ xposition += xstep;
+ yposition += ystep;
- dest++;
- xposition += xstep;
- yposition += ystep;
+ val = (((UINT32)yposition >> nflatyshift) & nflatmask) | ((UINT32)xposition >> nflatxshift);
+ val &= 4194303;
+ val = source[val];
+ if (val != TRANSPARENTPIXEL)
+ dest[6] = colormap[val];
+ xposition += xstep;
+ yposition += ystep;
+
+ val = (((UINT32)yposition >> nflatyshift) & nflatmask) | ((UINT32)xposition >> nflatxshift);
+ val &= 4194303;
+ val = source[val];
+ if (val != TRANSPARENTPIXEL)
+ dest[7] = colormap[val];
+ xposition += xstep;
+ yposition += ystep;
+
+ dest += 8;
+ count -= 8;
+ }
+ while (count-- && dest <= deststop)
+ {
+ val = source[(((UINT32)yposition >> nflatyshift) & nflatmask) | ((UINT32)xposition >> nflatxshift)];
+ if (val != TRANSPARENTPIXEL)
+ *dest = colormap[val];
+ dest++;
+ xposition += xstep;
+ yposition += ystep;
+ }
}
}
@@ -1184,16 +1448,20 @@ void R_DrawSplat_8 (void)
*/
void R_DrawTranslucentSplat_8 (void)
{
- UINT32 xposition;
- UINT32 yposition;
- UINT32 xstep, ystep;
+ fixed_t xposition;
+ fixed_t yposition;
+ fixed_t xstep, ystep;
UINT8 *source;
UINT8 *colormap;
UINT8 *dest;
+ const UINT8 *deststop = screens[0] + vid.rowbytes * vid.height;
- size_t count;
- UINT8 val;
+ size_t count = (ds_x2 - ds_x1 + 1);
+ UINT32 val;
+
+ xposition = ds_xfrac; yposition = ds_yfrac;
+ xstep = ds_xstep; ystep = ds_ystep;
// SoM: we only need 6 bits for the integer part (0 thru 63) so the rest
// can be used for the fraction part. This allows calculation of the memory address in the
@@ -1202,79 +1470,107 @@ void R_DrawTranslucentSplat_8 (void)
// bit per power of two (obviously)
// Ok, because I was able to eliminate the variable spot below, this function is now FASTER
// than the original span renderer. Whodathunkit?
- xposition = ds_xfrac << nflatshiftup; yposition = ds_yfrac << nflatshiftup;
- xstep = ds_xstep << nflatshiftup; ystep = ds_ystep << nflatshiftup;
+ if (ds_powersoftwo)
+ {
+ xposition <<= nflatshiftup; yposition <<= nflatshiftup;
+ xstep <<= nflatshiftup; ystep <<= nflatshiftup;
+ }
source = ds_source;
colormap = ds_colormap;
dest = ylookup[ds_y] + columnofs[ds_x1];
- count = ds_x2 - ds_x1 + 1;
- while (count >= 8)
+ if (!ds_powersoftwo)
{
- // SoM: Why didn't I see this earlier? the spot variable is a waste now because we don't
- // have the uber complicated math to calculate it now, so that was a memory write we didn't
- // need!
- val = source[((yposition >> nflatyshift) & nflatmask) | (xposition >> nflatxshift)];
- if (val != TRANSPARENTPIXEL)
- dest[0] = *(ds_transmap + (colormap[val] << 8) + dest[0]);
- xposition += xstep;
- yposition += ystep;
+ while (count-- && dest <= deststop)
+ {
+ fixed_t x = (xposition >> FRACBITS);
+ fixed_t y = (yposition >> FRACBITS);
- val = source[((yposition >> nflatyshift) & nflatmask) | (xposition >> nflatxshift)];
- if (val != TRANSPARENTPIXEL)
- dest[1] = *(ds_transmap + (colormap[val] << 8) + dest[1]);
- xposition += xstep;
- yposition += ystep;
+ // Carefully align all of my Friends.
+ if (x < 0)
+ x = ds_flatwidth - ((UINT32)(ds_flatwidth - x) % ds_flatwidth);
+ if (y < 0)
+ y = ds_flatheight - ((UINT32)(ds_flatheight - y) % ds_flatheight);
- val = source[((yposition >> nflatyshift) & nflatmask) | (xposition >> nflatxshift)];
- if (val != TRANSPARENTPIXEL)
- dest[2] = *(ds_transmap + (colormap[val] << 8) + dest[2]);
- xposition += xstep;
- yposition += ystep;
+ x %= ds_flatwidth;
+ y %= ds_flatheight;
- val = source[((yposition >> nflatyshift) & nflatmask) | (xposition >> nflatxshift)];
- if (val != TRANSPARENTPIXEL)
- dest[3] = *(ds_transmap + (colormap[val] << 8) + dest[3]);
- xposition += xstep;
- yposition += ystep;
+ val = source[((y * ds_flatwidth) + x)];
+ if (val != TRANSPARENTPIXEL)
+ *dest = *(ds_transmap + (colormap[val] << 8) + *dest);
+ dest++;
+ xposition += xstep;
+ yposition += ystep;
+ }
+ }
+ else
+ {
+ while (count >= 8)
+ {
+ // SoM: Why didn't I see this earlier? the spot variable is a waste now because we don't
+ // have the uber complicated math to calculate it now, so that was a memory write we didn't
+ // need!
+ val = source[(((UINT32)yposition >> nflatyshift) & nflatmask) | ((UINT32)xposition >> nflatxshift)];
+ if (val != TRANSPARENTPIXEL)
+ dest[0] = *(ds_transmap + (colormap[val] << 8) + dest[0]);
+ xposition += xstep;
+ yposition += ystep;
- val = source[((yposition >> nflatyshift) & nflatmask) | (xposition >> nflatxshift)];
- if (val != TRANSPARENTPIXEL)
- dest[4] = *(ds_transmap + (colormap[val] << 8) + dest[4]);
- xposition += xstep;
- yposition += ystep;
+ val = source[(((UINT32)yposition >> nflatyshift) & nflatmask) | ((UINT32)xposition >> nflatxshift)];
+ if (val != TRANSPARENTPIXEL)
+ dest[1] = *(ds_transmap + (colormap[val] << 8) + dest[1]);
+ xposition += xstep;
+ yposition += ystep;
- val = source[((yposition >> nflatyshift) & nflatmask) | (xposition >> nflatxshift)];
- if (val != TRANSPARENTPIXEL)
- dest[5] = *(ds_transmap + (colormap[val] << 8) + dest[5]);
- xposition += xstep;
- yposition += ystep;
+ val = source[(((UINT32)yposition >> nflatyshift) & nflatmask) | ((UINT32)xposition >> nflatxshift)];
+ if (val != TRANSPARENTPIXEL)
+ dest[2] = *(ds_transmap + (colormap[val] << 8) + dest[2]);
+ xposition += xstep;
+ yposition += ystep;
- val = source[((yposition >> nflatyshift) & nflatmask) | (xposition >> nflatxshift)];
- if (val != TRANSPARENTPIXEL)
- dest[6] = *(ds_transmap + (colormap[val] << 8) + dest[6]);
- xposition += xstep;
- yposition += ystep;
+ val = source[(((UINT32)yposition >> nflatyshift) & nflatmask) | ((UINT32)xposition >> nflatxshift)];
+ if (val != TRANSPARENTPIXEL)
+ dest[3] = *(ds_transmap + (colormap[val] << 8) + dest[3]);
+ xposition += xstep;
+ yposition += ystep;
- val = source[((yposition >> nflatyshift) & nflatmask) | (xposition >> nflatxshift)];
- if (val != TRANSPARENTPIXEL)
- dest[7] = *(ds_transmap + (colormap[val] << 8) + dest[7]);
- xposition += xstep;
- yposition += ystep;
+ val = source[(((UINT32)yposition >> nflatyshift) & nflatmask) | ((UINT32)xposition >> nflatxshift)];
+ if (val != TRANSPARENTPIXEL)
+ dest[4] = *(ds_transmap + (colormap[val] << 8) + dest[4]);
+ xposition += xstep;
+ yposition += ystep;
- dest += 8;
- count -= 8;
- }
- while (count--)
- {
- val = source[((yposition >> nflatyshift) & nflatmask) | (xposition >> nflatxshift)];
- if (val != TRANSPARENTPIXEL)
- *dest = *(ds_transmap + (colormap[val] << 8) + *dest);
+ val = source[(((UINT32)yposition >> nflatyshift) & nflatmask) | ((UINT32)xposition >> nflatxshift)];
+ if (val != TRANSPARENTPIXEL)
+ dest[5] = *(ds_transmap + (colormap[val] << 8) + dest[5]);
+ xposition += xstep;
+ yposition += ystep;
- dest++;
- xposition += xstep;
- yposition += ystep;
+ val = source[(((UINT32)yposition >> nflatyshift) & nflatmask) | ((UINT32)xposition >> nflatxshift)];
+ if (val != TRANSPARENTPIXEL)
+ dest[6] = *(ds_transmap + (colormap[val] << 8) + dest[6]);
+ xposition += xstep;
+ yposition += ystep;
+
+ val = source[(((UINT32)yposition >> nflatyshift) & nflatmask) | ((UINT32)xposition >> nflatxshift)];
+ if (val != TRANSPARENTPIXEL)
+ dest[7] = *(ds_transmap + (colormap[val] << 8) + dest[7]);
+ xposition += xstep;
+ yposition += ystep;
+
+ dest += 8;
+ count -= 8;
+ }
+ while (count-- && dest <= deststop)
+ {
+ val = source[(((UINT32)yposition >> nflatyshift) & nflatmask) | ((UINT32)xposition >> nflatxshift)];
+ if (val != TRANSPARENTPIXEL)
+ *dest = *(ds_transmap + (colormap[val] << 8) + *dest);
+ dest++;
+ xposition += xstep;
+ yposition += ystep;
+ }
}
}
@@ -1283,15 +1579,20 @@ void R_DrawTranslucentSplat_8 (void)
*/
void R_DrawTranslucentSpan_8 (void)
{
- UINT32 xposition;
- UINT32 yposition;
- UINT32 xstep, ystep;
+ fixed_t xposition;
+ fixed_t yposition;
+ fixed_t xstep, ystep;
UINT8 *source;
UINT8 *colormap;
UINT8 *dest;
+ const UINT8 *deststop = screens[0] + vid.rowbytes * vid.height;
- size_t count;
+ size_t count = (ds_x2 - ds_x1 + 1);
+ UINT32 val;
+
+ xposition = ds_xfrac; yposition = ds_yfrac;
+ xstep = ds_xstep; ystep = ds_ystep;
// SoM: we only need 6 bits for the integer part (0 thru 63) so the rest
// can be used for the fraction part. This allows calculation of the memory address in the
@@ -1300,62 +1601,160 @@ void R_DrawTranslucentSpan_8 (void)
// bit per power of two (obviously)
// Ok, because I was able to eliminate the variable spot below, this function is now FASTER
// than the original span renderer. Whodathunkit?
- xposition = ds_xfrac << nflatshiftup; yposition = ds_yfrac << nflatshiftup;
- xstep = ds_xstep << nflatshiftup; ystep = ds_ystep << nflatshiftup;
+ if (ds_powersoftwo)
+ {
+ xposition <<= nflatshiftup; yposition <<= nflatshiftup;
+ xstep <<= nflatshiftup; ystep <<= nflatshiftup;
+ }
source = ds_source;
colormap = ds_colormap;
dest = ylookup[ds_y] + columnofs[ds_x1];
- count = ds_x2 - ds_x1 + 1;
- while (count >= 8)
+ if (!ds_powersoftwo)
{
- // SoM: Why didn't I see this earlier? the spot variable is a waste now because we don't
- // have the uber complicated math to calculate it now, so that was a memory write we didn't
- // need!
- dest[0] = *(ds_transmap + (colormap[source[((yposition >> nflatyshift) & nflatmask) | (xposition >> nflatxshift)]] << 8) + dest[0]);
- xposition += xstep;
- yposition += ystep;
-
- dest[1] = *(ds_transmap + (colormap[source[((yposition >> nflatyshift) & nflatmask) | (xposition >> nflatxshift)]] << 8) + dest[1]);
- xposition += xstep;
- yposition += ystep;
-
- dest[2] = *(ds_transmap + (colormap[source[((yposition >> nflatyshift) & nflatmask) | (xposition >> nflatxshift)]] << 8) + dest[2]);
- xposition += xstep;
- yposition += ystep;
-
- dest[3] = *(ds_transmap + (colormap[source[((yposition >> nflatyshift) & nflatmask) | (xposition >> nflatxshift)]] << 8) + dest[3]);
- xposition += xstep;
- yposition += ystep;
-
- dest[4] = *(ds_transmap + (colormap[source[((yposition >> nflatyshift) & nflatmask) | (xposition >> nflatxshift)]] << 8) + dest[4]);
- xposition += xstep;
- yposition += ystep;
-
- dest[5] = *(ds_transmap + (colormap[source[((yposition >> nflatyshift) & nflatmask) | (xposition >> nflatxshift)]] << 8) + dest[5]);
- xposition += xstep;
- yposition += ystep;
-
- dest[6] = *(ds_transmap + (colormap[source[((yposition >> nflatyshift) & nflatmask) | (xposition >> nflatxshift)]] << 8) + dest[6]);
- xposition += xstep;
- yposition += ystep;
-
- dest[7] = *(ds_transmap + (colormap[source[((yposition >> nflatyshift) & nflatmask) | (xposition >> nflatxshift)]] << 8) + dest[7]);
- xposition += xstep;
- yposition += ystep;
-
- dest += 8;
- count -= 8;
+ while (count-- && dest <= deststop)
+ {
+ fixed_t x = (xposition >> FRACBITS);
+ fixed_t y = (yposition >> FRACBITS);
+
+ // Carefully align all of my Friends.
+ if (x < 0)
+ x = ds_flatwidth - ((UINT32)(ds_flatwidth - x) % ds_flatwidth);
+ if (y < 0)
+ y = ds_flatheight - ((UINT32)(ds_flatheight - y) % ds_flatheight);
+
+ x %= ds_flatwidth;
+ y %= ds_flatheight;
+
+ val = ((y * ds_flatwidth) + x);
+ *dest = *(ds_transmap + (colormap[source[val]] << 8) + *dest);
+ dest++;
+ xposition += xstep;
+ yposition += ystep;
+ }
}
- while (count--)
+ else
{
- *dest = *(ds_transmap + (colormap[source[((yposition >> nflatyshift) & nflatmask) | (xposition >> nflatxshift)]] << 8) + *dest);
- dest++;
- xposition += xstep;
- yposition += ystep;
+ while (count >= 8)
+ {
+ // SoM: Why didn't I see this earlier? the spot variable is a waste now because we don't
+ // have the uber complicated math to calculate it now, so that was a memory write we didn't
+ // need!
+ dest[0] = *(ds_transmap + (colormap[source[(((UINT32)yposition >> nflatyshift) & nflatmask) | ((UINT32)xposition >> nflatxshift)]] << 8) + dest[0]);
+ xposition += xstep;
+ yposition += ystep;
+
+ dest[1] = *(ds_transmap + (colormap[source[(((UINT32)yposition >> nflatyshift) & nflatmask) | ((UINT32)xposition >> nflatxshift)]] << 8) + dest[1]);
+ xposition += xstep;
+ yposition += ystep;
+
+ dest[2] = *(ds_transmap + (colormap[source[(((UINT32)yposition >> nflatyshift) & nflatmask) | ((UINT32)xposition >> nflatxshift)]] << 8) + dest[2]);
+ xposition += xstep;
+ yposition += ystep;
+
+ dest[3] = *(ds_transmap + (colormap[source[(((UINT32)yposition >> nflatyshift) & nflatmask) | ((UINT32)xposition >> nflatxshift)]] << 8) + dest[3]);
+ xposition += xstep;
+ yposition += ystep;
+
+ dest[4] = *(ds_transmap + (colormap[source[(((UINT32)yposition >> nflatyshift) & nflatmask) | ((UINT32)xposition >> nflatxshift)]] << 8) + dest[4]);
+ xposition += xstep;
+ yposition += ystep;
+
+ dest[5] = *(ds_transmap + (colormap[source[(((UINT32)yposition >> nflatyshift) & nflatmask) | ((UINT32)xposition >> nflatxshift)]] << 8) + dest[5]);
+ xposition += xstep;
+ yposition += ystep;
+
+ dest[6] = *(ds_transmap + (colormap[source[(((UINT32)yposition >> nflatyshift) & nflatmask) | ((UINT32)xposition >> nflatxshift)]] << 8) + dest[6]);
+ xposition += xstep;
+ yposition += ystep;
+
+ dest[7] = *(ds_transmap + (colormap[source[(((UINT32)yposition >> nflatyshift) & nflatmask) | ((UINT32)xposition >> nflatxshift)]] << 8) + dest[7]);
+ xposition += xstep;
+ yposition += ystep;
+
+ dest += 8;
+ count -= 8;
+ }
+ while (count-- && dest <= deststop)
+ {
+ val = (((UINT32)yposition >> nflatyshift) & nflatmask) | ((UINT32)xposition >> nflatxshift);
+ *dest = *(ds_transmap + (colormap[source[val]] << 8) + *dest);
+ dest++;
+ xposition += xstep;
+ yposition += ystep;
+ }
+ }
+}
+
+#ifndef NOWATER
+void R_DrawTranslucentWaterSpan_8(void)
+{
+ fixed_t xposition;
+ fixed_t yposition;
+ fixed_t xstep, ystep;
+
+ UINT8 *source;
+ UINT8 *colormap;
+ UINT8 *dest;
+ UINT8 *dsrc;
+ const UINT8 *deststop = screens[0] + vid.rowbytes * vid.height;
+
+ size_t count = (ds_x2 - ds_x1 + 1);
+
+ xposition = ds_xfrac; yposition = (ds_yfrac + ds_waterofs);
+ xstep = ds_xstep; ystep = ds_ystep;
+
+ // SoM: we only need 6 bits for the integer part (0 thru 63) so the rest
+ // can be used for the fraction part. This allows calculation of the memory address in the
+ // texture with two shifts, an OR and one AND. (see below)
+ // for texture sizes > 64 the amount of precision we can allow will decrease, but only by one
+ // bit per power of two (obviously)
+ // Ok, because I was able to eliminate the variable spot below, this function is now FASTER
+ // than the original span renderer. Whodathunkit?
+ if (ds_powersoftwo)
+ {
+ xposition <<= nflatshiftup; yposition <<= nflatshiftup;
+ xstep <<= nflatshiftup; ystep <<= nflatshiftup;
+ }
+
+ source = ds_source;
+ colormap = ds_colormap;
+ dest = ylookup[ds_y] + columnofs[ds_x1];
+ dsrc = screens[1] + (ds_y+ds_bgofs)*vid.width + ds_x1;
+
+ if (!ds_powersoftwo)
+ {
+ while (count-- && dest <= deststop)
+ {
+ fixed_t x = (xposition >> FRACBITS);
+ fixed_t y = (yposition >> FRACBITS);
+
+ // Carefully align all of my Friends.
+ if (x < 0)
+ x = ds_flatwidth - ((UINT32)(ds_flatwidth - x) % ds_flatwidth);
+ if (y < 0)
+ y = ds_flatheight - ((UINT32)(ds_flatheight - y) % ds_flatheight);
+
+ x %= ds_flatwidth;
+ y %= ds_flatheight;
+
+ *dest++ = colormap[*(ds_transmap + (source[((y * ds_flatwidth) + x)] << 8) + *dsrc++)];
+ xposition += xstep;
+ yposition += ystep;
+ }
+ }
+ else
+ {
+ while (count-- && dest <= deststop)
+ {
+ *dest++ = colormap[*(ds_transmap + (source[(((UINT32)yposition >> nflatyshift) & nflatmask) | ((UINT32)xposition >> nflatxshift)] << 8) + *dsrc++)];
+ xposition += xstep;
+ yposition += ystep;
+ }
}
}
+#endif
/** \brief The R_DrawFogSpan_8 function
Draws the actual span with fogging.
diff --git a/src/r_main.c b/src/r_main.c
index db351e9911dc45675f0168b818890dede6fbab93..5135e57cef7f456094925c0f59c32a8b1cbb8c92 100644
--- a/src/r_main.c
+++ b/src/r_main.c
@@ -1215,6 +1215,7 @@ void R_RegisterEngineStuff(void)
#endif
CV_RegisterVar(&cv_grmd2);
CV_RegisterVar(&cv_grspritebillboarding);
+ CV_RegisterVar(&cv_grskydome);
#endif
#ifdef HWRENDER
diff --git a/src/r_plane.c b/src/r_plane.c
index 2f6f97240a0418f3608d1901a8406b80716cf10f..51a69336e2466c2123e52cfdf4b3ebdfc470cb0b 100644
--- a/src/r_plane.c
+++ b/src/r_plane.c
@@ -127,91 +127,13 @@ void R_InitPlanes(void)
// viewheight
#ifndef NOWATER
-static INT32 bgofs;
+INT32 ds_bgofs;
+INT32 ds_waterofs;
+
static INT32 wtofs=0;
-static INT32 waterofs;
static boolean itswater;
#endif
-#ifndef NOWATER
-static void R_DrawTranslucentWaterSpan_8(void)
-{
- UINT32 xposition;
- UINT32 yposition;
- UINT32 xstep, ystep;
-
- UINT8 *source;
- UINT8 *colormap;
- UINT8 *dest;
- UINT8 *dsrc;
-
- size_t count;
-
- // SoM: we only need 6 bits for the integer part (0 thru 63) so the rest
- // can be used for the fraction part. This allows calculation of the memory address in the
- // texture with two shifts, an OR and one AND. (see below)
- // for texture sizes > 64 the amount of precision we can allow will decrease, but only by one
- // bit per power of two (obviously)
- // Ok, because I was able to eliminate the variable spot below, this function is now FASTER
- // than the original span renderer. Whodathunkit?
- xposition = ds_xfrac << nflatshiftup; yposition = (ds_yfrac + waterofs) << nflatshiftup;
- xstep = ds_xstep << nflatshiftup; ystep = ds_ystep << nflatshiftup;
-
- source = ds_source;
- colormap = ds_colormap;
- dest = ylookup[ds_y] + columnofs[ds_x1];
- dsrc = screens[1] + (ds_y+bgofs)*vid.width + ds_x1;
- count = ds_x2 - ds_x1 + 1;
-
- while (count >= 8)
- {
- // SoM: Why didn't I see this earlier? the spot variable is a waste now because we don't
- // have the uber complicated math to calculate it now, so that was a memory write we didn't
- // need!
- dest[0] = colormap[*(ds_transmap + (source[((yposition >> nflatyshift) & nflatmask) | (xposition >> nflatxshift)] << 8) + *dsrc++)];
- xposition += xstep;
- yposition += ystep;
-
- dest[1] = colormap[*(ds_transmap + (source[((yposition >> nflatyshift) & nflatmask) | (xposition >> nflatxshift)] << 8) + *dsrc++)];
- xposition += xstep;
- yposition += ystep;
-
- dest[2] = colormap[*(ds_transmap + (source[((yposition >> nflatyshift) & nflatmask) | (xposition >> nflatxshift)] << 8) + *dsrc++)];
- xposition += xstep;
- yposition += ystep;
-
- dest[3] = colormap[*(ds_transmap + (source[((yposition >> nflatyshift) & nflatmask) | (xposition >> nflatxshift)] << 8) + *dsrc++)];
- xposition += xstep;
- yposition += ystep;
-
- dest[4] = colormap[*(ds_transmap + (source[((yposition >> nflatyshift) & nflatmask) | (xposition >> nflatxshift)] << 8) + *dsrc++)];
- xposition += xstep;
- yposition += ystep;
-
- dest[5] = colormap[*(ds_transmap + (source[((yposition >> nflatyshift) & nflatmask) | (xposition >> nflatxshift)] << 8) + *dsrc++)];
- xposition += xstep;
- yposition += ystep;
-
- dest[6] = colormap[*(ds_transmap + (source[((yposition >> nflatyshift) & nflatmask) | (xposition >> nflatxshift)] << 8) + *dsrc++)];
- xposition += xstep;
- yposition += ystep;
-
- dest[7] = colormap[*(ds_transmap + (source[((yposition >> nflatyshift) & nflatmask) | (xposition >> nflatxshift)] << 8) + *dsrc++)];
- xposition += xstep;
- yposition += ystep;
-
- dest += 8;
- count -= 8;
- }
- while (count--)
- {
- *dest++ = colormap[*(ds_transmap + (source[((yposition >> nflatyshift) & nflatmask) | (xposition >> nflatxshift)] << 8) + *dsrc++)];
- xposition += xstep;
- yposition += ystep;
- }
-}
-#endif
-
void R_MapPlane(INT32 y, INT32 x1, INT32 x2)
{
angle_t angle, planecos, planesin;
@@ -258,17 +180,17 @@ void R_MapPlane(INT32 y, INT32 x1, INT32 x2)
{
const INT32 yay = (wtofs + (distance>>9) ) & 8191;
// ripples da water texture
- bgofs = FixedDiv(FINESINE(yay), (1<<12) + (distance>>11))>>FRACBITS;
+ ds_bgofs = FixedDiv(FINESINE(yay), (1<<12) + (distance>>11))>>FRACBITS;
angle = (currentplane->viewangle + currentplane->plangle + xtoviewangle[x1])>>ANGLETOFINESHIFT;
angle = (angle + 2048) & 8191; // 90 degrees
- ds_xfrac += FixedMul(FINECOSINE(angle), (bgofs<<FRACBITS));
- ds_yfrac += FixedMul(FINESINE(angle), (bgofs<<FRACBITS));
+ ds_xfrac += FixedMul(FINECOSINE(angle), (ds_bgofs<<FRACBITS));
+ ds_yfrac += FixedMul(FINESINE(angle), (ds_bgofs<<FRACBITS));
- if (y+bgofs>=viewheight)
- bgofs = viewheight-y-1;
- if (y+bgofs<0)
- bgofs = -y;
+ if (y+ds_bgofs>=viewheight)
+ ds_bgofs = viewheight-y-1;
+ if (y+ds_bgofs<0)
+ ds_bgofs = -y;
}
#endif
@@ -680,7 +602,7 @@ void R_DrawPlanes(void)
}
}
#ifndef NOWATER
- waterofs = (leveltime & 1)*16384;
+ ds_waterofs = (leveltime & 1)*16384;
wtofs = leveltime * 140;
#endif
}
@@ -728,13 +650,162 @@ static void R_DrawSkyPlane(visplane_t *pl)
}
}
+boolean R_CheckPowersOfTwo(void)
+{
+ if (ds_flatwidth & (ds_flatwidth - 1))
+ ds_powersoftwo = false;
+ else if (ds_flatheight & (ds_flatheight - 1))
+ ds_powersoftwo = false;
+ else if (ds_flatwidth == ds_flatheight)
+ ds_powersoftwo = true;
+ return ds_powersoftwo;
+}
+
+void R_CheckFlatLength(size_t size)
+{
+ switch (size)
+ {
+ case 4194304: // 2048x2048 lump
+ nflatmask = 0x3FF800;
+ nflatxshift = 21;
+ nflatyshift = 10;
+ nflatshiftup = 5;
+ ds_flatwidth = ds_flatheight = 2048;
+ break;
+ case 1048576: // 1024x1024 lump
+ nflatmask = 0xFFC00;
+ nflatxshift = 22;
+ nflatyshift = 12;
+ nflatshiftup = 6;
+ ds_flatwidth = ds_flatheight = 1024;
+ break;
+ case 262144:// 512x512 lump
+ nflatmask = 0x3FE00;
+ nflatxshift = 23;
+ nflatyshift = 14;
+ nflatshiftup = 7;
+ ds_flatwidth = ds_flatheight = 512;
+ break;
+ case 65536: // 256x256 lump
+ nflatmask = 0xFF00;
+ nflatxshift = 24;
+ nflatyshift = 16;
+ nflatshiftup = 8;
+ ds_flatwidth = ds_flatheight = 256;
+ break;
+ case 16384: // 128x128 lump
+ nflatmask = 0x3F80;
+ nflatxshift = 25;
+ nflatyshift = 18;
+ nflatshiftup = 9;
+ ds_flatwidth = ds_flatheight = 128;
+ break;
+ case 1024: // 32x32 lump
+ nflatmask = 0x3E0;
+ nflatxshift = 27;
+ nflatyshift = 22;
+ nflatshiftup = 11;
+ ds_flatwidth = ds_flatheight = 32;
+ break;
+ default: // 64x64 lump
+ nflatmask = 0xFC0;
+ nflatxshift = 26;
+ nflatyshift = 20;
+ nflatshiftup = 10;
+ ds_flatwidth = ds_flatheight = 64;
+ break;
+ }
+}
+
+static UINT8 *R_GetPatchFlat(levelflat_t *levelflat, boolean leveltexture, boolean ispng)
+{
+ UINT8 *flat;
+ textureflat_t *texflat = &texflats[levelflat->texturenum];
+ patch_t *patch = NULL;
+ boolean texturechanged = (leveltexture ? (levelflat->texturenum != levelflat->lasttexturenum) : false);
+
+ // Check if the texture changed.
+ if (leveltexture && (!texturechanged))
+ {
+ if (texflat != NULL && texflat->flat)
+ {
+ flat = texflat->flat;
+ ds_flatwidth = texflat->width;
+ ds_flatheight = texflat->height;
+ texturechanged = false;
+ }
+ else
+ texturechanged = true;
+ }
+
+ // If the texture changed, or the patch doesn't exist, convert either of them to a flat.
+ if (levelflat->flatpatch == NULL || texturechanged)
+ {
+ if (leveltexture)
+ {
+ texture_t *texture = textures[levelflat->texturenum];
+ texflat->width = ds_flatwidth = texture->width;
+ texflat->height = ds_flatheight = texture->height;
+
+ texflat->flat = Z_Malloc(ds_flatwidth * ds_flatheight, PU_LEVEL, NULL);
+ memset(texflat->flat, TRANSPARENTPIXEL, ds_flatwidth * ds_flatheight);
+ R_TextureToFlat(levelflat->texturenum, texflat->flat);
+ flat = texflat->flat;
+
+ levelflat->flatpatch = flat;
+ levelflat->width = ds_flatwidth;
+ levelflat->height = ds_flatheight;
+ }
+ else
+ {
+ patch = (patch_t *)ds_source;
+#ifndef NO_PNG_LUMPS
+ if (ispng)
+ {
+ levelflat->flatpatch = R_PNGToFlat(levelflat, ds_source, W_LumpLength(levelflat->lumpnum));
+ levelflat->topoffset = levelflat->leftoffset = 0;
+ ds_flatwidth = levelflat->width;
+ ds_flatheight = levelflat->height;
+ }
+ else
+#endif
+ {
+ levelflat->width = ds_flatwidth = SHORT(patch->width);
+ levelflat->height = ds_flatheight = SHORT(patch->height);
+
+ levelflat->topoffset = patch->topoffset * FRACUNIT;
+ levelflat->leftoffset = patch->leftoffset * FRACUNIT;
+
+ levelflat->flatpatch = Z_Malloc(ds_flatwidth * ds_flatheight, PU_LEVEL, NULL);
+ memset(levelflat->flatpatch, TRANSPARENTPIXEL, ds_flatwidth * ds_flatheight);
+ R_PatchToFlat(patch, levelflat->flatpatch);
+ }
+ flat = levelflat->flatpatch;
+ }
+ }
+ else
+ {
+ flat = levelflat->flatpatch;
+ ds_flatwidth = levelflat->width;
+ ds_flatheight = levelflat->height;
+
+ xoffs += levelflat->leftoffset;
+ yoffs += levelflat->topoffset;
+ }
+
+ levelflat->lasttexturenum = levelflat->texturenum;
+ return flat;
+}
+
void R_DrawSinglePlane(visplane_t *pl)
{
+ UINT8 *flat;
INT32 light = 0;
INT32 x;
INT32 stop, angle;
size_t size;
ffloor_t *rover;
+ levelflat_t *levelflat;
if (!(pl->minx <= pl->maxx))
return;
@@ -874,64 +945,47 @@ void R_DrawSinglePlane(visplane_t *pl)
viewangle = pl->viewangle+pl->plangle;
}
+ xoffs = pl->xoffs;
+ yoffs = pl->yoffs;
+ planeheight = abs(pl->height - pl->viewz);
+
currentplane = pl;
+ levelflat = &levelflats[pl->picnum];
+ size = W_LumpLength(levelflat->lumpnum);
+ ds_source = (UINT8 *)W_CacheLumpNum(levelflat->lumpnum, PU_STATIC); // Stay here until Z_ChangeTag
+
+ // Check if the flat is actually a wall texture.
+ if (levelflat->texturenum != 0 && levelflat->texturenum != -1)
+ flat = R_GetPatchFlat(levelflat, true, false);
+#ifndef NO_PNG_LUMPS
+ // Maybe it's a PNG?!
+ else if (R_IsLumpPNG(ds_source, size))
+ flat = R_GetPatchFlat(levelflat, false, true);
+#endif
+ // Maybe it's just a patch, then?
+ else if (R_CheckIfPatch(levelflat->lumpnum))
+ flat = R_GetPatchFlat(levelflat, false, false);
+ // It's a raw flat.
+ else
+ {
+ R_CheckFlatLength(size);
+ flat = ds_source;
+ }
- ds_source = (UINT8 *)
- W_CacheLumpNum(levelflats[pl->picnum].lumpnum,
- PU_STATIC); // Stay here until Z_ChangeTag
+ Z_ChangeTag(ds_source, PU_CACHE);
+ ds_source = flat;
- size = W_LumpLength(levelflats[pl->picnum].lumpnum);
+ if (ds_source == NULL)
+ return;
- switch (size)
+ // Check if the flat has dimensions that are powers-of-two numbers.
+ if (R_CheckPowersOfTwo())
{
- case 4194304: // 2048x2048 lump
- nflatmask = 0x3FF800;
- nflatxshift = 21;
- nflatyshift = 10;
- nflatshiftup = 5;
- break;
- case 1048576: // 1024x1024 lump
- nflatmask = 0xFFC00;
- nflatxshift = 22;
- nflatyshift = 12;
- nflatshiftup = 6;
- break;
- case 262144:// 512x512 lump'
- nflatmask = 0x3FE00;
- nflatxshift = 23;
- nflatyshift = 14;
- nflatshiftup = 7;
- break;
- case 65536: // 256x256 lump
- nflatmask = 0xFF00;
- nflatxshift = 24;
- nflatyshift = 16;
- nflatshiftup = 8;
- break;
- case 16384: // 128x128 lump
- nflatmask = 0x3F80;
- nflatxshift = 25;
- nflatyshift = 18;
- nflatshiftup = 9;
- break;
- case 1024: // 32x32 lump
- nflatmask = 0x3E0;
- nflatxshift = 27;
- nflatyshift = 22;
- nflatshiftup = 11;
- break;
- default: // 64x64 lump
- nflatmask = 0xFC0;
- nflatxshift = 26;
- nflatyshift = 20;
- nflatshiftup = 10;
- break;
+ R_CheckFlatLength(ds_flatwidth * ds_flatheight);
+ if (spanfunc == basespanfunc)
+ spanfunc = mmxspanfunc;
}
- xoffs = pl->xoffs;
- yoffs = pl->yoffs;
- planeheight = abs(pl->height - pl->viewz);
-
if (light >= LIGHTLEVELS)
light = LIGHTLEVELS-1;
@@ -945,61 +999,64 @@ void R_DrawSinglePlane(visplane_t *pl)
floatv3_t p, m, n;
float ang;
float vx, vy, vz;
+ float fudge = 0;
// compiler complains when P_GetZAt is used in FLOAT_TO_FIXED directly
// use this as a temp var to store P_GetZAt's return value each time
fixed_t temp;
- // Okay, look, don't ask me why this works, but without this setup there's a disgusting-looking misalignment with the textures. -Red
- const float fudge = ((1<<nflatshiftup)+1.0f)/(1<<nflatshiftup);
angle_t hack = (pl->plangle & (ANGLE_90-1));
yoffs *= 1;
- if (hack)
- {
- /*
- Essentially: We can't & the components along the regular axes when the plane is rotated.
- This is because the distance on each regular axis in order to loop is different.
- We rotate them, & the components, add them together, & them again, and then rotate them back.
- These three seperate & operations are done per axis in order to prevent overflows.
- toast 10/04/17
- */
- const fixed_t cosinecomponent = FINECOSINE(hack>>ANGLETOFINESHIFT);
- const fixed_t sinecomponent = FINESINE(hack>>ANGLETOFINESHIFT);
-
- const fixed_t modmask = ((1 << (32-nflatshiftup)) - 1);
-
- fixed_t ox = (FixedMul(pl->slope->o.x,cosinecomponent) & modmask) - (FixedMul(pl->slope->o.y,sinecomponent) & modmask);
- fixed_t oy = (-FixedMul(pl->slope->o.x,sinecomponent) & modmask) - (FixedMul(pl->slope->o.y,cosinecomponent) & modmask);
-
- temp = ox & modmask;
- oy &= modmask;
- ox = FixedMul(temp,cosinecomponent)+FixedMul(oy,-sinecomponent); // negative sine for opposite direction
- oy = -FixedMul(temp,-sinecomponent)+FixedMul(oy,cosinecomponent);
-
- temp = xoffs;
- xoffs = (FixedMul(temp,cosinecomponent) & modmask) + (FixedMul(yoffs,sinecomponent) & modmask);
- yoffs = (-FixedMul(temp,sinecomponent) & modmask) + (FixedMul(yoffs,cosinecomponent) & modmask);
-
- temp = xoffs & modmask;
- yoffs &= modmask;
- xoffs = FixedMul(temp,cosinecomponent)+FixedMul(yoffs,-sinecomponent); // ditto
- yoffs = -FixedMul(temp,-sinecomponent)+FixedMul(yoffs,cosinecomponent);
-
- xoffs -= (pl->slope->o.x - ox);
- yoffs += (pl->slope->o.y + oy);
- }
- else
+ if (ds_powersoftwo)
{
- xoffs &= ((1 << (32-nflatshiftup))-1);
- yoffs &= ((1 << (32-nflatshiftup))-1);
- xoffs -= (pl->slope->o.x + (1 << (31-nflatshiftup))) & ~((1 << (32-nflatshiftup))-1);
- yoffs += (pl->slope->o.y + (1 << (31-nflatshiftup))) & ~((1 << (32-nflatshiftup))-1);
+ // Okay, look, don't ask me why this works, but without this setup there's a disgusting-looking misalignment with the textures. -Red
+ fudge = ((1<<nflatshiftup)+1.0f)/(1<<nflatshiftup);
+ if (hack)
+ {
+ /*
+ Essentially: We can't & the components along the regular axes when the plane is rotated.
+ This is because the distance on each regular axis in order to loop is different.
+ We rotate them, & the components, add them together, & them again, and then rotate them back.
+ These three seperate & operations are done per axis in order to prevent overflows.
+ toast 10/04/17
+ */
+ const fixed_t cosinecomponent = FINECOSINE(hack>>ANGLETOFINESHIFT);
+ const fixed_t sinecomponent = FINESINE(hack>>ANGLETOFINESHIFT);
+
+ const fixed_t modmask = ((1 << (32-nflatshiftup)) - 1);
+
+ fixed_t ox = (FixedMul(pl->slope->o.x,cosinecomponent) & modmask) - (FixedMul(pl->slope->o.y,sinecomponent) & modmask);
+ fixed_t oy = (-FixedMul(pl->slope->o.x,sinecomponent) & modmask) - (FixedMul(pl->slope->o.y,cosinecomponent) & modmask);
+
+ temp = ox & modmask;
+ oy &= modmask;
+ ox = FixedMul(temp,cosinecomponent)+FixedMul(oy,-sinecomponent); // negative sine for opposite direction
+ oy = -FixedMul(temp,-sinecomponent)+FixedMul(oy,cosinecomponent);
+
+ temp = xoffs;
+ xoffs = (FixedMul(temp,cosinecomponent) & modmask) + (FixedMul(yoffs,sinecomponent) & modmask);
+ yoffs = (-FixedMul(temp,sinecomponent) & modmask) + (FixedMul(yoffs,cosinecomponent) & modmask);
+
+ temp = xoffs & modmask;
+ yoffs &= modmask;
+ xoffs = FixedMul(temp,cosinecomponent)+FixedMul(yoffs,-sinecomponent); // ditto
+ yoffs = -FixedMul(temp,-sinecomponent)+FixedMul(yoffs,cosinecomponent);
+
+ xoffs -= (pl->slope->o.x - ox);
+ yoffs += (pl->slope->o.y + oy);
+ }
+ else
+ {
+ xoffs &= ((1 << (32-nflatshiftup))-1);
+ yoffs &= ((1 << (32-nflatshiftup))-1);
+ xoffs -= (pl->slope->o.x + (1 << (31-nflatshiftup))) & ~((1 << (32-nflatshiftup))-1);
+ yoffs += (pl->slope->o.y + (1 << (31-nflatshiftup))) & ~((1 << (32-nflatshiftup))-1);
+ }
+ xoffs = (fixed_t)(xoffs*fudge);
+ yoffs = (fixed_t)(yoffs/fudge);
}
- xoffs = (fixed_t)(xoffs*fudge);
- yoffs = (fixed_t)(yoffs/fudge);
-
vx = FIXED_TO_FLOAT(pl->viewx+xoffs);
vy = FIXED_TO_FLOAT(pl->viewy-yoffs);
vz = FIXED_TO_FLOAT(pl->viewz);
@@ -1033,13 +1090,16 @@ void R_DrawSinglePlane(visplane_t *pl)
temp = P_GetZAt(pl->slope, pl->viewx + FLOAT_TO_FIXED(cos(ang)), pl->viewy - FLOAT_TO_FIXED(sin(ang)));
n.y = FIXED_TO_FLOAT(temp) - zeroheight;
- m.x /= fudge;
- m.y /= fudge;
- m.z /= fudge;
+ if (ds_powersoftwo)
+ {
+ m.x /= fudge;
+ m.y /= fudge;
+ m.z /= fudge;
- n.x *= fudge;
- n.y *= fudge;
- n.z *= fudge;
+ n.x *= fudge;
+ n.y *= fudge;
+ n.z *= fudge;
+ }
// Eh. I tried making this stuff fixed-point and it exploded on me. Here's a macro for the only floating-point vector function I recall using.
#define CROSS(d, v1, v2) \
@@ -1056,14 +1116,26 @@ void R_DrawSinglePlane(visplane_t *pl)
ds_sz.z *= focallengthf;
// Premultiply the texture vectors with the scale factors
+ if (ds_powersoftwo)
+ {
#define SFMULT 65536.f*(1<<nflatshiftup)
- ds_su.x *= SFMULT;
- ds_su.y *= SFMULT;
- ds_su.z *= SFMULT;
- ds_sv.x *= SFMULT;
- ds_sv.y *= SFMULT;
- ds_sv.z *= SFMULT;
+ ds_su.x *= SFMULT;
+ ds_su.y *= SFMULT;
+ ds_su.z *= SFMULT;
+ ds_sv.x *= SFMULT;
+ ds_sv.y *= SFMULT;
+ ds_sv.z *= SFMULT;
#undef SFMULT
+ }
+ else
+ {
+ ds_su.x *= 65536.f;
+ ds_su.y *= 65536.f;
+ ds_su.z *= 65536.f;
+ ds_sv.x *= 65536.f;
+ ds_sv.y *= 65536.f;
+ ds_sv.z *= 65536.f;
+ }
if (spanfunc == R_DrawTranslucentSpan_8)
spanfunc = R_DrawTiltedTranslucentSpan_8;
@@ -1170,8 +1242,6 @@ using the palette colors.
}
}
#endif
-
- Z_ChangeTag(ds_source, PU_CACHE);
}
void R_PlaneBounds(visplane_t *plane)
diff --git a/src/r_plane.h b/src/r_plane.h
index 238fde1827846f0be8278f6ee6a78e21aaf2c52b..11cbb56f1bcbffb94019630eaff2811f90c30e3a 100644
--- a/src/r_plane.h
+++ b/src/r_plane.h
@@ -96,6 +96,8 @@ void R_PlaneBounds(visplane_t *plane);
// Draws a single visplane.
void R_DrawSinglePlane(visplane_t *pl);
+void R_CheckFlatLength(size_t size);
+boolean R_CheckPowersOfTwo(void);
typedef struct planemgr_s
{
diff --git a/src/s_sound.c b/src/s_sound.c
index 1c6cd5ef1a4d6e18419c436f250258aa3c923427..299e4b88976935c271852f024d412bc70a6e635a 100644
--- a/src/s_sound.c
+++ b/src/s_sound.c
@@ -108,7 +108,9 @@ consvar_t cv_closedcaptioning = {"closedcaptioning", "Off", CV_SAVE|CV_CALL, CV_
consvar_t cv_numChannels = {"snd_channels", "32", CV_SAVE|CV_CALL, CV_Unsigned, SetChannelsNum, 0, NULL, NULL, 0, 0, NULL};
static consvar_t surround = {"surround", "Off", CV_SAVE, CV_OnOff, NULL, 0, NULL, NULL, 0, 0, NULL};
-consvar_t cv_resetmusic = {"resetmusic", "Yes", CV_SAVE, CV_YesNo, NULL, 0, NULL, NULL, 0, 0, NULL};
+
+consvar_t cv_resetmusic = {"resetmusic", "Off", CV_SAVE, CV_OnOff, NULL, 0, NULL, NULL, 0, 0, NULL};
+consvar_t cv_resetmusicbyheader = {"resetmusicbyheader", "Yes", CV_SAVE, CV_YesNo, NULL, 0, NULL, NULL, 0, 0, NULL};
// Sound system toggles, saved into the config
consvar_t cv_gamedigimusic = {"digimusic", "On", CV_SAVE|CV_CALL|CV_NOINIT, CV_OnOff, GameDigiMusic_OnChange, 0, NULL, NULL, 0, 0, NULL};
@@ -275,6 +277,7 @@ void S_RegisterSoundStuff(void)
CV_RegisterVar(&surround);
CV_RegisterVar(&cv_samplerate);
CV_RegisterVar(&cv_resetmusic);
+ CV_RegisterVar(&cv_resetmusicbyheader);
CV_RegisterVar(&cv_gamesounds);
CV_RegisterVar(&cv_gamedigimusic);
CV_RegisterVar(&cv_gamemidimusic);
@@ -1783,12 +1786,12 @@ static lumpnum_t S_GetMusicLumpNum(const char *mname)
return W_GetNumForName(va("d_%s", mname));
else if (S_DigMusicDisabled() && S_DigExists(mname))
{
- CONS_Alert(CONS_NOTICE, "Digital music is disabled!\n");
+ //CONS_Alert(CONS_NOTICE, "Digital music is disabled!\n");
return LUMPERROR;
}
else if (S_MIDIMusicDisabled() && S_MIDIExists(mname))
{
- CONS_Alert(CONS_NOTICE, "MIDI music is disabled!\n");
+ //CONS_Alert(CONS_NOTICE, "MIDI music is disabled!\n");
return LUMPERROR;
}
else
@@ -2096,7 +2099,7 @@ void S_StartEx(boolean reset)
mapmusposition = mapheaderinfo[gamemap-1]->muspos;
}
- if (cv_resetmusic.value || reset)
+ if (RESETMUSIC || reset)
S_StopMusic();
S_ChangeMusicEx(mapmusname, mapmusflags, true, mapmusposition, 0, 0);
diff --git a/src/s_sound.h b/src/s_sound.h
index e0737eff743643f90683d293aec483d2e4360a17..48128527ce62dd816a66608a886595a5df0b65de 100644
--- a/src/s_sound.h
+++ b/src/s_sound.h
@@ -31,7 +31,16 @@ openmpt_module *openmpt_mhandle;
extern consvar_t stereoreverse;
extern consvar_t cv_soundvolume, cv_closedcaptioning, cv_digmusicvolume, cv_midimusicvolume;
extern consvar_t cv_numChannels;
+
extern consvar_t cv_resetmusic;
+extern consvar_t cv_resetmusicbyheader;
+
+#define RESETMUSIC (!modeattacking && \
+ (cv_resetmusicbyheader.value ? \
+ (mapheaderinfo[gamemap-1]->musforcereset != -1 ? mapheaderinfo[gamemap-1]->musforcereset : cv_resetmusic.value) \
+ : cv_resetmusic.value) \
+ )
+
extern consvar_t cv_gamedigimusic;
extern consvar_t cv_gamemidimusic;
extern consvar_t cv_gamesounds;
diff --git a/src/screen.c b/src/screen.c
index fc3f5b8e87f863112cdd88a5e7d0cd1f9faea95f..547036a60bf7b7624d0f4f58622df2f2d44feadf 100644
--- a/src/screen.c
+++ b/src/screen.c
@@ -49,6 +49,7 @@ void (*fuzzcolfunc)(void); // standard fuzzy effect column drawer
void (*transcolfunc)(void); // translation column drawer
void (*shadecolfunc)(void); // smokie test..
void (*spanfunc)(void); // span drawer, use a 64x64 tile
+void (*mmxspanfunc)(void); // span drawer in MMX assembly
void (*splatfunc)(void); // span drawer w/ transparency
void (*basespanfunc)(void); // default span func for color mode
void (*transtransfunc)(void); // translucent translated column drawer
@@ -112,7 +113,7 @@ void SCR_SetMode(void)
//
if (true)//vid.bpp == 1) //Always run in 8bpp. todo: remove all 16bpp code?
{
- spanfunc = basespanfunc = R_DrawSpan_8;
+ spanfunc = basespanfunc = mmxspanfunc = R_DrawSpan_8;
splatfunc = R_DrawSplat_8;
transcolfunc = R_DrawTranslatedColumn_8;
transtransfunc = R_DrawTranslatedTranslucentColumn_8;
@@ -133,7 +134,7 @@ void SCR_SetMode(void)
//fuzzcolfunc = R_DrawTranslucentColumn_8_ASM;
walldrawerfunc = R_DrawWallColumn_8_MMX;
twosmultipatchfunc = R_Draw2sMultiPatchColumn_8_MMX;
- spanfunc = basespanfunc = R_DrawSpan_8_MMX;
+ mmxspanfunc = R_DrawSpan_8_MMX;
}
else
{
diff --git a/src/screen.h b/src/screen.h
index 7aa6fdb638a1f68fa70373bb258777f71b701282..3554b5520a541783e3a8b66f780ed1906dd3b3d7 100644
--- a/src/screen.h
+++ b/src/screen.h
@@ -123,6 +123,7 @@ extern void (*transcolfunc)(void);
extern void (*shadecolfunc)(void);
extern void (*spanfunc)(void);
extern void (*basespanfunc)(void);
+extern void (*mmxspanfunc)(void);
extern void (*splatfunc)(void);
extern void (*transtransfunc)(void);
extern void (*twosmultipatchfunc)(void);
diff --git a/src/sdl/hwsym_sdl.c b/src/sdl/hwsym_sdl.c
index 05ac6450e2267c0c08182775cece05eeaefabeab..103398405f1e98518b65157859f39a981836fca1 100644
--- a/src/sdl/hwsym_sdl.c
+++ b/src/sdl/hwsym_sdl.c
@@ -79,6 +79,7 @@ void *hwSym(const char *funcName,void *handle)
GETFUNC(Init);
GETFUNC(Draw2DLine);
GETFUNC(DrawPolygon);
+ GETFUNC(RenderSkyDome);
GETFUNC(SetBlend);
GETFUNC(ClearBuffer);
GETFUNC(SetTexture);
diff --git a/src/sdl/i_system.c b/src/sdl/i_system.c
index 98166a1cef1719d1584880890943226ee3f8c1d8..c4fb1c0fccbff02c74885bb0ff07006236371330 100644
--- a/src/sdl/i_system.c
+++ b/src/sdl/i_system.c
@@ -530,7 +530,7 @@ static void Impl_HandleKeyboardConsoleEvent(KEY_EVENT_RECORD evt, HANDLE co)
break;
case VK_RETURN:
entering_con_command = false;
- // Fall through.
+ /* FALLTHRU */
default:
event.data1 = MapVirtualKey(evt.wVirtualKeyCode,2); // convert in to char
}
diff --git a/src/sdl/i_video.c b/src/sdl/i_video.c
index 5a4fd7a02247c0ef985868c8e0fa3ee5619b0c39..b526e612447569837d516dc7a459b5971d7db9bc 100644
--- a/src/sdl/i_video.c
+++ b/src/sdl/i_video.c
@@ -1499,6 +1499,7 @@ void I_StartupGraphics(void)
HWD.pfnFinishUpdate = NULL;
HWD.pfnDraw2DLine = hwSym("Draw2DLine",NULL);
HWD.pfnDrawPolygon = hwSym("DrawPolygon",NULL);
+ HWD.pfnRenderSkyDome = hwSym("RenderSkyDome",NULL);
HWD.pfnSetBlend = hwSym("SetBlend",NULL);
HWD.pfnClearBuffer = hwSym("ClearBuffer",NULL);
HWD.pfnSetTexture = hwSym("SetTexture",NULL);
diff --git a/src/sdl/macosx/Srb2mac.xcodeproj/project.pbxproj b/src/sdl/macosx/Srb2mac.xcodeproj/project.pbxproj
index 878db3d8de37b4a8cfb19a8a95dcfaa99559ceda..9297833e26b3baa3ef726d41f87887643bb47dc1 100644
--- a/src/sdl/macosx/Srb2mac.xcodeproj/project.pbxproj
+++ b/src/sdl/macosx/Srb2mac.xcodeproj/project.pbxproj
@@ -1219,7 +1219,7 @@
C01FCF4B08A954540054247B /* Debug */ = {
isa = XCBuildConfiguration;
buildSettings = {
- CURRENT_PROJECT_VERSION = 2.1.24;
+ CURRENT_PROJECT_VERSION = 2.1.25;
GCC_PREPROCESSOR_DEFINITIONS = (
"$(inherited)",
NORMALSRB2,
@@ -1231,7 +1231,7 @@
C01FCF4C08A954540054247B /* Release */ = {
isa = XCBuildConfiguration;
buildSettings = {
- CURRENT_PROJECT_VERSION = 2.1.24;
+ CURRENT_PROJECT_VERSION = 2.1.25;
GCC_ENABLE_FIX_AND_CONTINUE = NO;
GCC_GENERATE_DEBUGGING_SYMBOLS = NO;
GCC_PREPROCESSOR_DEFINITIONS = (
diff --git a/src/st_stuff.c b/src/st_stuff.c
index aefb4c53c70badbc2a9b85e178b4cdceb2b704dc..a90661ef35fff94338b21b19b93d4404fa17cf42 100644
--- a/src/st_stuff.c
+++ b/src/st_stuff.c
@@ -1960,6 +1960,7 @@ static void ST_drawWeaponRing(powertype_t weapon, INT32 rwflag, INT32 wepflag, I
static void ST_drawMatchHUD(void)
{
+ char penaltystr[7];
const INT32 y = 176; // HUD_LIVES
INT32 offset = (BASEVIDWIDTH / 2) - (NUM_WEAPONS * 10) - 6;
@@ -1986,18 +1987,20 @@ static void ST_drawMatchHUD(void)
ST_drawWeaponSelect(offset, y);
}
- offset += 20;
- ST_drawWeaponRing(pw_automaticring, RW_AUTO, WEP_AUTO, offset, y, autoring);
- offset += 20;
- ST_drawWeaponRing(pw_bouncering, RW_BOUNCE, WEP_BOUNCE, offset, y, bouncering);
- offset += 20;
- ST_drawWeaponRing(pw_scatterring, RW_SCATTER, WEP_SCATTER, offset, y, scatterring);
- offset += 20;
- ST_drawWeaponRing(pw_grenadering, RW_GRENADE, WEP_GRENADE, offset, y, grenadering);
- offset += 20;
- ST_drawWeaponRing(pw_explosionring, RW_EXPLODE, WEP_EXPLODE, offset, y, explosionring);
- offset += 20;
- ST_drawWeaponRing(pw_railring, RW_RAIL, WEP_RAIL, offset, y, railring);
+ ST_drawWeaponRing(pw_automaticring, RW_AUTO, WEP_AUTO, offset + 20, y, autoring);
+ ST_drawWeaponRing(pw_bouncering, RW_BOUNCE, WEP_BOUNCE, offset + 40, y, bouncering);
+ ST_drawWeaponRing(pw_scatterring, RW_SCATTER, WEP_SCATTER, offset + 60, y, scatterring);
+ ST_drawWeaponRing(pw_grenadering, RW_GRENADE, WEP_GRENADE, offset + 80, y, grenadering);
+ ST_drawWeaponRing(pw_explosionring, RW_EXPLODE, WEP_EXPLODE, offset + 100, y, explosionring);
+ ST_drawWeaponRing(pw_railring, RW_RAIL, WEP_RAIL, offset + 120, y, railring);
+
+ if (stplyr->ammoremovaltimer && leveltime % 8 < 4)
+ {
+ sprintf(penaltystr, "-%d", stplyr->ammoremoval);
+ V_DrawString(offset + 8 + stplyr->ammoremovalweapon * 20, y,
+ V_REDMAP, penaltystr);
+ }
+
}
}
diff --git a/src/v_video.c b/src/v_video.c
index 2ec06a787cf5d4759b5f69c7ec3a62efda1a5269..dfe56e37f8ac3ee99e8593b0caa2d4dff50e11cc 100644
--- a/src/v_video.c
+++ b/src/v_video.c
@@ -112,6 +112,7 @@ static CV_PossibleValue_t CV_MD2[] = {{0, "Off"}, {1, "On"}, {2, "Old"}, {0, NUL
// console variables in development
consvar_t cv_grmd2 = {"gr_md2", "Off", CV_SAVE, CV_MD2, NULL, 0, NULL, NULL, 0, 0, NULL};
consvar_t cv_grspritebillboarding = {"gr_spritebillboarding", "Off", CV_SAVE, CV_OnOff, NULL, 0, NULL, NULL, 0, 0, NULL};
+consvar_t cv_grskydome = {"gr_skydome", "On", CV_SAVE, CV_OnOff, NULL, 0, NULL, NULL, 0, 0, NULL};
#endif
// local copy of the palette for V_GetColor()
@@ -856,8 +857,8 @@ void V_DrawCroppedPatch(fixed_t x, fixed_t y, fixed_t pscale, INT32 scrn, patch_
return;
#ifdef HWRENDER
- // Done
- if (rendermode != render_soft && !con_startup)
+ //if (rendermode != render_soft && !con_startup) // Not this again
+ if (rendermode != render_soft)
{
HWR_DrawCroppedPatch((GLPatch_t*)patch,x,y,pscale,scrn,sx,sy,w,h);
return;
@@ -1174,7 +1175,8 @@ void V_DrawFill(INT32 x, INT32 y, INT32 w, INT32 h, INT32 c)
return;
#ifdef HWRENDER
- if (rendermode != render_soft && !con_startup)
+ //if (rendermode != render_soft && !con_startup) // Not this again
+ if (rendermode != render_soft)
{
HWR_DrawFill(x, y, w, h, c);
return;
diff --git a/src/w_wad.c b/src/w_wad.c
index d02ce9ce6061e43f3fa229e549c4821680d8090c..2fda8674c7fd15b0cdad41b57fccf237d0dbdd75 100644
--- a/src/w_wad.c
+++ b/src/w_wad.c
@@ -1182,8 +1182,6 @@ void zerr(int ret)
}
#endif
-#define NO_PNG_LUMPS
-
#ifdef NO_PNG_LUMPS
static void ErrorIfPNG(UINT8 *d, size_t s, char *f, char *l)
{
diff --git a/src/win32/win_dll.c b/src/win32/win_dll.c
index 71eda04371d4223dedcd5e193d8c27ed8cf0f70d..ce007af25fb4d3003d8ebeae33b363799779b879 100644
--- a/src/win32/win_dll.c
+++ b/src/win32/win_dll.c
@@ -102,6 +102,7 @@ static loadfunc_t hwdFuncTable[] = {
{"FinishUpdate@4", &hwdriver.pfnFinishUpdate},
{"Draw2DLine@12", &hwdriver.pfnDraw2DLine},
{"DrawPolygon@16", &hwdriver.pfnDrawPolygon},
+ {"RenderSkyDome@16", &hwdriver.pfnRenderDome},
{"SetBlend@4", &hwdriver.pfnSetBlend},
{"ClearBuffer@12", &hwdriver.pfnClearBuffer},
{"SetTexture@4", &hwdriver.pfnSetTexture},
@@ -133,6 +134,7 @@ static loadfunc_t hwdFuncTable[] = {
{"FinishUpdate", &hwdriver.pfnFinishUpdate},
{"Draw2DLine", &hwdriver.pfnDraw2DLine},
{"DrawPolygon", &hwdriver.pfnDrawPolygon},
+ {"RenderSkyDome", &hwdriver.pfnRenderDome},
{"SetBlend", &hwdriver.pfnSetBlend},
{"ClearBuffer", &hwdriver.pfnClearBuffer},
{"SetTexture", &hwdriver.pfnSetTexture},
diff --git a/src/win32/win_sys.c b/src/win32/win_sys.c
index d10f73b587e521ca1dfbd2ced7b46e381d78600a..93b3ff52381998528099495a738236c918351498 100644
--- a/src/win32/win_sys.c
+++ b/src/win32/win_sys.c
@@ -327,7 +327,7 @@ static inline VOID I_GetConsoleEvents(VOID)
break;
case VK_RETURN:
entering_con_command = false;
- // Fall through.
+ /* FALLTHRU */
default:
ev.data1 = MapVirtualKey(input.Event.KeyEvent.wVirtualKeyCode,2); // convert in to char
}
diff --git a/src/win32/win_vid.c b/src/win32/win_vid.c
index e2f32fa618d2ff646f1b81a2f156e798cc88f154..11c7a6744b4132baff1a48a4a2b72ec8d43736d8 100644
--- a/src/win32/win_vid.c
+++ b/src/win32/win_vid.c
@@ -322,9 +322,9 @@ static inline boolean I_SkipFrame(void)
case GS_LEVEL:
if (!paused)
return false;
- /* FALLTHRU */
//case GS_TIMEATTACK: -- sorry optimisation but now we have a cool level platter and that being laggardly looks terrible
#ifndef CLIENT_LOADINGSCREEN
+ /* FALLTHRU */
case GS_WAITINGPLAYERS:
#endif
return skip; // Skip odd frames