diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index dc456905a..28f48cdad 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -247,6 +247,9 @@ set(SRB2_CONFIG_ASAN OFF CACHE BOOL set(SRB2_CONFIG_UBSAN OFF CACHE BOOL "Compile with UndefinedBehaviorSanitizer (libubsan).") +set(SRB2_CONFIG_MUMBLE ON CACHE BOOL + "Enable Mumble support") + set(SRB2_CONFIG_SATURNPAK ON CACHE BOOL "Enable Saturn specific special packet. Required for using the newer resynch system") set(SRB2_CONFIG_SATURNJOIN ON CACHE BOOL @@ -275,6 +278,7 @@ if(${SRB2_CONFIG_HAVE_BLUA}) lua_hooklib.c lua_hudlib.c lua_hudlib_drawlist.c + lua_profile.cpp lua_infolib.c lua_maplib.c lua_mathlib.c @@ -290,6 +294,7 @@ if(${SRB2_CONFIG_HAVE_BLUA}) lua_hook.h lua_hud.h lua_hudlib_drawlist.h + lua_profile.h lua_libs.h lua_script.h lua_udatalib.h diff --git a/src/Makefile b/src/Makefile index 4ee7cf1a9..5b1f9f0fa 100644 --- a/src/Makefile +++ b/src/Makefile @@ -246,10 +246,6 @@ ifdef STATIC libs+=-static endif -ifneq (,$(filter $(CC) $(CXX),gcc g++)) - opts+=-mno-ms-bitfields -endif - # build with profiling information ifdef PROFILEMODE opts+=-pg diff --git a/src/Makefile.d/features.mk b/src/Makefile.d/features.mk index 410077939..af67a5494 100644 --- a/src/Makefile.d/features.mk +++ b/src/Makefile.d/features.mk @@ -86,7 +86,7 @@ ifdef VALGRIND VALGRIND_PKGCONFIG?=valgrind VALGRIND_LDFLAGS= $(eval $(call Use_pkg_config,VALGRIND)) -ZDEBUG=1 +#ZDEBUG=1 we enable this by default opts+=-DHAVE_VALGRIND endif diff --git a/src/Makefile.d/platform.mk b/src/Makefile.d/platform.mk index d5423a397..12c3220d7 100644 --- a/src/Makefile.d/platform.mk +++ b/src/Makefile.d/platform.mk @@ -42,8 +42,6 @@ include Makefile.d/haiku.mk else ifdef SOLARIS # FIXME: UNTESTED UNIX=1 platform=solaris -else ifdef CYGWIN32 # FIXME: UNTESTED -platform=cygwin else ifdef MINGW ifdef MINGW64 NONX86=1 diff --git a/src/Makefile.d/sdl.mk b/src/Makefile.d/sdl.mk index 36f87fe30..aa4d4a7ee 100644 --- a/src/Makefile.d/sdl.mk +++ b/src/Makefile.d/sdl.mk @@ -15,16 +15,6 @@ sources+=$(call List,sdl/Sourcefile) NOUPNP=1 -# FIXME: UNTESTED -#ifdef PANDORA -#include sdl/SRB2Pandora/Makefile.cfg -#endif #ifdef PANDORA - -# FIXME: UNTESTED -#ifdef CYGWIN32 -#include sdl/MakeCYG.cfg -#endif #ifdef CYGWIN32 - ifndef NOHW sources+=sdl/ogl_sdl.c endif diff --git a/src/Sourcefile b/src/Sourcefile index 08c18ebf0..f09a143bd 100644 --- a/src/Sourcefile +++ b/src/Sourcefile @@ -99,3 +99,4 @@ lua_skinlib.c lua_thinkerlib.c lua_udatalib.c lua_glib.c +lua_profile.cpp diff --git a/src/android/i_system.c b/src/android/i_system.c index ef10df5b5..c0f7cc11c 100644 --- a/src/android/i_system.c +++ b/src/android/i_system.c @@ -34,8 +34,8 @@ size_t I_GetFreeMem(size_t *total) /* return si.freeram; */ char buf[1024]; char *memTag; - UINT32 freeKBytes; - UINT32 totalKBytes; + size_t freeKBytes; + size_t totalKBytes; INT32 n; INT32 meminfo_fd = -1; @@ -46,7 +46,7 @@ size_t I_GetFreeMem(size_t *total) if (n < 0) { // Error - *total = 0L; + *total = 0; return 0; } @@ -54,7 +54,7 @@ size_t I_GetFreeMem(size_t *total) if (NULL == (memTag = strstr(buf, MEMTOTAL))) { // Error - *total = 0L; + *total = 0; return 0; } @@ -64,7 +64,7 @@ size_t I_GetFreeMem(size_t *total) if (NULL == (memTag = strstr(buf, MEMFREE))) { // Error - *total = 0L; + *total = 0; return 0; } diff --git a/src/console.c b/src/console.c index d02f68bb6..40a3d1700 100644 --- a/src/console.c +++ b/src/console.c @@ -62,7 +62,7 @@ static boolean con_started = false; // console has been initialised static boolean con_forcepic = true; // at startup toggle console translucency when first off boolean con_recalc = false; // set true when screen size has changed -static tic_t con_tick; // console ticker for anim or blinking prompt cursor +static tic_t con_tick; // console ticker for blinking prompt cursor // con_scrollup should use time (currenttime - lasttime).. static boolean consoletoggle; // true when console key pushed, ticker will handle @@ -103,6 +103,7 @@ static void CON_InputInit(void); static void CON_RecalcSize(void); static void CON_ChangeHeight(void); +static void CONS_height_Change(void); static void CONS_hudlines_Change(void); static void CONS_backcolor_Change(void); @@ -131,7 +132,7 @@ static CV_PossibleValue_t speed_cons_t[] = {{0, "MIN"}, {64, "MAX"}, {0, NULL}}; static consvar_t cons_speed = {"con_speed", "8", CV_SAVE, speed_cons_t, NULL, 0, NULL, NULL, 0, 0, NULL}; // percentage of screen height to use for console -static consvar_t cons_height = {"con_height", "50", CV_SAVE, CV_Unsigned, NULL, 0, NULL, NULL, 0, 0, NULL}; +static consvar_t cons_height = {"con_height", "50", CV_CALL|CV_SAVE, CV_Unsigned, CONS_height_Change, 0, NULL, NULL, 0, 0, NULL}; static CV_PossibleValue_t backpic_cons_t[] = {{0, "translucent"}, {1, "picture"}, {0, NULL}}; // whether to use console background picture, or translucent mode @@ -173,6 +174,18 @@ consvar_t cons_consoleprintinmenu = {"consoleprintinmenu", "Off", CV_SAVE, CV_On static void CON_Print(char *msg); +// Change the console height on demand +// +static void CONS_height_Change(void) +{ + Lock_state(); + + if (con_destlines > 0 && !con_startup) // If the console is open (as in, not using "bind")... + CON_ChangeHeight(); // ...update its height now, not only when it's closed and re-opened + + Unlock_state(); +} + // // static void CONS_hudlines_Change(void) @@ -1437,6 +1450,8 @@ void CONS_Error(const char *msg) // dirty quick hack, but for the good cause while (I_GetKey() != KEY_ENTER) { + I_HandleInterrupt(); + // Sleep so we don't take too much of cpu usage I_Sleep(1.f/TICRATE*1000); @@ -1635,53 +1650,54 @@ static void CON_DrawConsole(void) } // draw console text lines from top to bottom - if (con_curlines < minheight) - return; - - i = con_cy - con_scrollup; - - // skip the last empty line due to the cursor being at the start of a new line - i--; - - i -= (con_curlines - minheight) / charheight; - - if (rendermode == render_none) return; - - for (y = (con_curlines-minheight) % charheight; y <= con_curlines-minheight; y += charheight, i++) + if (con_curlines >= minheight) { - INT32 x; - size_t c; + i = con_cy - con_scrollup; - p = (UINT8 *)&con_buffer[((i > 0 ? i : 0)%con_totallines)*con_width]; + // skip the last empty line due to the cursor being at the start of a new line + i--; - for (c = 0, x = charwidth; c < con_width; c++, x += charwidth, p++) + i -= (con_curlines - minheight) / charheight; + + if (rendermode == render_none) + return; + + for (y = (con_curlines-minheight) % charheight; y <= con_curlines-minheight; y += charheight, i++) { - while (*p & 0x80) + INT32 x; + size_t c; + + p = (UINT8 *)&con_buffer[((i > 0 ? i : 0)%con_totallines)*con_width]; + + for (c = 0, x = charwidth; c < con_width; c++, x += charwidth, p++) { - charflags = (*p & 0x7f) << V_CHARCOLORSHIFT; - p++; - c++; + while (*p & 0x80) + { + charflags = (*p & 0x7f) << V_CHARCOLORSHIFT; + p++; + c++; + } + + if (c >= con_width) + break; + + int emotelen; + emote_t *emote; + + if ((emote = M_VerifyEmote((const char *)p, &emotelen))) + { + M_DrawScaledEmote(x<= con_width) - break; - - int emotelen; - emote_t *emote; - - if ((emote = M_VerifyEmote((const char *)p, &emotelen))) - { - M_DrawScaledEmote(x<= minheight) && !con_startup) + if ((con_curlines >= (minheight-charheight)) && !con_startup) CON_DrawInput(); } diff --git a/src/core/memory.cpp b/src/core/memory.cpp index 9e591e78c..e0289a579 100644 --- a/src/core/memory.cpp +++ b/src/core/memory.cpp @@ -1,7 +1,7 @@ -// BLANKART +// DR. ROBOTNIK'S RING RACERS //----------------------------------------------------------------------------- -// Copyright (C) 2024 by Ronald "Eidolon" Kinard -// Copyright (C) 2024 by Kart Krew +// Copyright (C) 2025 by Ronald "Eidolon" Kinard +// Copyright (C) 2025 by Kart Krew // // This program is free software distributed under the // terms of the GNU General Public License, version 2. @@ -114,6 +114,7 @@ void* PoolAllocator::allocate() FreeBlock* ret = head_; head_ = head_->next; + allocated_blocks_++; return ret; } @@ -125,6 +126,7 @@ void PoolAllocator::deallocate(void* p) FreeBlock* block = reinterpret_cast(p); block->next = head_; head_ = block; + allocated_blocks_--; } void PoolAllocator::release() @@ -144,6 +146,7 @@ void PoolAllocator::release() first_chunk_ = nullptr; head_ = nullptr; + allocated_blocks_ = 0; } static LinearMemory g_frame_memory {4 * 1024 * 1024}; diff --git a/src/core/memory.h b/src/core/memory.h index 77e7206b5..14b51a039 100644 --- a/src/core/memory.h +++ b/src/core/memory.h @@ -1,7 +1,7 @@ -// SONIC ROBO BLAST 2 KART +// DR. ROBOTNIK'S RING RACERS //----------------------------------------------------------------------------- -// Copyright (C) 2024 by Ronald "Eidolon" Kinard -// Copyright (C) 2024 by Kart Krew +// Copyright (C) 2025 by Ronald "Eidolon" Kinard +// Copyright (C) 2025 by Kart Krew // // This program is free software distributed under the // terms of the GNU General Public License, version 2. @@ -37,6 +37,7 @@ class PoolAllocator final FreeBlock* head_; size_t block_size_; size_t blocks_; + size_t allocated_blocks_; int32_t tag_; ChunkFooter* allocate_chunk(); @@ -47,6 +48,7 @@ public: , head_(nullptr) , block_size_(block_size) , blocks_(blocks) + , allocated_blocks_(0) , tag_(tag) {} PoolAllocator(const PoolAllocator&) = delete; @@ -59,6 +61,8 @@ public: void* allocate(); void deallocate(void* p); constexpr size_t block_size() const noexcept { return block_size_; }; + constexpr size_t allocated_blocks() const noexcept { return allocated_blocks_; }; + constexpr size_t allocated_bytes() const noexcept { return allocated_blocks_ * block_size_; }; void release(); }; diff --git a/src/core/static_vec.hpp b/src/core/static_vec.hpp index c1f486a2b..f31f17939 100644 --- a/src/core/static_vec.hpp +++ b/src/core/static_vec.hpp @@ -1,7 +1,7 @@ -// SONIC ROBO BLAST 2 KART +// DR. ROBOTNIK'S RING RACERS //----------------------------------------------------------------------------- -// Copyright (C) 2024 by Ronald "Eidolon" Kinard -// Copyright (C) 2024 by Kart Krew +// Copyright (C) 2025 by Ronald "Eidolon" Kinard +// Copyright (C) 2025 by Kart Krew // // This program is free software distributed under the // terms of the GNU General Public License, version 2. diff --git a/src/core/thread_pool.cpp b/src/core/thread_pool.cpp index 11aa6f1bb..c716b6470 100644 --- a/src/core/thread_pool.cpp +++ b/src/core/thread_pool.cpp @@ -1,7 +1,7 @@ -// BLANKART +// DR. ROBOTNIK'S RING RACERS //----------------------------------------------------------------------------- -// Copyright (C) 2024 by Ronald "Eidolon" Kinard -// Copyright (C) 2024 by Kart Krew +// Copyright (C) 2025 by Ronald "Eidolon" Kinard +// Copyright (C) 2025 by Kart Krew // // This program is free software distributed under the // terms of the GNU General Public License, version 2. diff --git a/src/core/thread_pool.h b/src/core/thread_pool.h index 71eebdaf1..0c1fc88ad 100644 --- a/src/core/thread_pool.h +++ b/src/core/thread_pool.h @@ -1,7 +1,7 @@ -// SONIC ROBO BLAST 2 KART +// DR. ROBOTNIK'S RING RACERS //----------------------------------------------------------------------------- -// Copyright (C) 2024 by Ronald "Eidolon" Kinard -// Copyright (C) 2024 by Kart Krew +// Copyright (C) 2025 by Ronald "Eidolon" Kinard +// Copyright (C) 2025 by Kart Krew // // This program is free software distributed under the // terms of the GNU General Public License, version 2. diff --git a/src/d_clisrv.c b/src/d_clisrv.c index fb163acfa..060e0a303 100644 --- a/src/d_clisrv.c +++ b/src/d_clisrv.c @@ -110,7 +110,7 @@ SINT8 joinnode = 0; // used for CL_VIEWSERVER boolean player_muted[MAXPLAYERS] = {}; // Server specific vars -UINT8 playernode[MAXPLAYERS] = {}; +UINT8 playernode[MAXPLAYERS] = {UINT8_MAX}; // Minimum timeout for sending the savegame // The actual timeout will be longer depending on the savegame length @@ -125,6 +125,7 @@ static tic_t freezetimeout[MAXNETNODES]; // Until when can this node freeze the UINT16 pingmeasurecount = 1; UINT32 realpingtable[MAXPLAYERS] = {}; //the base table of ping where an average will be sent to everyone. UINT32 playerpingtable[MAXPLAYERS] = {}; //table of player latency values. +UINT32 localplayerping = 0; #define GENTLEMANSMOOTHING (TICRATE) static tic_t reference_lag = 0; @@ -356,12 +357,13 @@ void SendNetXCmdForPlayer(UINT8 playerid, netxcmd_t id, const void *param, size_ if (2+nparam > MAXTEXTCMD) { - CONS_Alert(CONS_ERROR, M_GetText("packet too large to fit NetXCmd, cannot add netcmd %d! (size: %s, max: %d)\n"), id, sizeu1(2+nparam), MAXTEXTCMD); + CONS_Alert(CONS_ERROR, M_GetText("packet too large to fit NetXCmd, cannot add netcmd %s with id %d! (size: %s, max: %d)\n"), netxcmdnames[id-1], id, sizeu1(2+nparam), MAXTEXTCMD); return; } // for future reference: if (cv_debug) != debug disabled. - CONS_Alert(CONS_NOTICE, M_GetText("NetXCmd buffer full, delaying netcmd %d... (size: %d, needed: %s)\n"), id, localtextcmd[playerid][0], sizeu1(nparam)); + CONS_Alert(CONS_NOTICE, M_GetText("NetXCmd buffer full, delaying netcmd %s with id %d... (size: %d, needed: %s)\n"), netxcmdnames[id-1], id, localtextcmd[playerid][0], sizeu1(nparam)); + if (buf == NULL) { textcmdbuf[playerid] = (textcmdbuf_t*)Z_Malloc(sizeof(textcmdbuf_t), PU_STATIC, NULL); @@ -839,11 +841,13 @@ static void resynch_write_ctf(resynchend_pak *rst) rst->flagplayer[i] = (SINT8)j; break; } + if (j == MAXPLAYERS) // fine, no I_Error { CONS_Alert(CONS_ERROR, "One of the flags has gone completely missing...\n"); rst->flagplayer[i] = -2; } + continue; } @@ -1133,6 +1137,7 @@ static void CV_SavePlayerNames(UINT8 **p) WRITEUINT8(*p, 0); continue; } + WRITESTRING(*p, player_names[i]); } } @@ -1146,10 +1151,13 @@ static void CV_LoadPlayerNames(UINT8 **p) for (; i < MAXPLAYERS; ++i) { READSTRING(*p, tmp_name); + if (tmp_name[0] == 0) continue; + if (tmp_name[MAXPLAYERNAME]) // overflow detected I_Error("Received bad server config packet when trying to join"); + memcpy(player_names[i], tmp_name, MAXPLAYERNAME+1); } } @@ -1447,6 +1455,7 @@ static void CL_DrawConnectionStatus(void) if (playerinfo[i].node < 255) { strncpy(player_name, playerinfo[i].name, MAXPLAYERNAME); + player_name[MAXPLAYERNAME] = '\0'; // if we get a skin color // try to colourize the player name @@ -1620,8 +1629,8 @@ static boolean CL_SendJoin(void) netbuffer->u.clientcfg.packetversion = PACKETVERSION; netbuffer->u.clientcfg.version = VERSION; netbuffer->u.clientcfg.subversion = SUBVERSION; - strncpy(netbuffer->u.clientcfg.application, SRB2APPLICATION, - sizeof(netbuffer->u.clientcfg.application)); + strncpy(netbuffer->u.clientcfg.application, SRB2APPLICATION, sizeof(netbuffer->u.clientcfg.application)-1); + netbuffer->u.clientcfg.application[sizeof(netbuffer->u.clientcfg.application)-1] = '\0'; #ifdef SATURNJOIN netbuffer->u.clientcfg.issaturn = ISSATURN; #endif @@ -1646,88 +1655,91 @@ static void SV_SendServerInfo(INT32 node, tic_t servertime) doomdata_t *netbuffer = DOOMCOM_DATA(doomcom); + serverinfo_pak *serverinfo = &netbuffer->u.serverinfo; + netbuffer->packettype = PT_SERVERINFO; - netbuffer->u.serverinfo._255 = 255; - netbuffer->u.serverinfo.packetversion = PACKETVERSION; - netbuffer->u.serverinfo.version = VERSION; - netbuffer->u.serverinfo.subversion = SUBVERSION; - strncpy(netbuffer->u.serverinfo.application, SRB2APPLICATION, - sizeof netbuffer->u.serverinfo.application); + serverinfo->_255 = 255; + serverinfo->packetversion = PACKETVERSION; + serverinfo->version = VERSION; + serverinfo->subversion = SUBVERSION; + strncpy(serverinfo->application, SRB2APPLICATION, sizeof(serverinfo->application)-1); + serverinfo->application[sizeof(serverinfo->application)-1] = '\0'; // return back the time value so client can compute their ping - netbuffer->u.serverinfo.time = (tic_t)LONG(servertime); - netbuffer->u.serverinfo.leveltime = (tic_t)LONG(leveltime); + serverinfo->time = (tic_t)LONG(servertime); + serverinfo->leveltime = (tic_t)LONG(leveltime); // force 1 player if (UseFakeSeed()) - netbuffer->u.serverinfo.numberofplayer = (UINT8)1; + serverinfo->numberofplayer = (UINT8)1; else - netbuffer->u.serverinfo.numberofplayer = (UINT8)D_NumPlayers(); + serverinfo->numberofplayer = (UINT8)D_NumPlayers(); - netbuffer->u.serverinfo.maxplayer = (UINT8)(min((dedicated ? MAXPLAYERS-1 : MAXPLAYERS), cv_maxplayers.value)); + serverinfo->maxplayer = (UINT8)(min((dedicated ? MAXPLAYERS-1 : MAXPLAYERS), cv_maxplayers.value)); // SRB2Kart: Vanilla's gametype constants for MS support - netbuffer->u.serverinfo.gametype = (UINT8)((gt == GT_MATCH) ? VANILLA_GT_MATCH : VANILLA_GT_RACE); + serverinfo->gametype = (UINT8)((gt == GT_MATCH) ? VANILLA_GT_MATCH : VANILLA_GT_RACE); - netbuffer->u.serverinfo.modifiedgame = (UINT8)modifiedgame; - netbuffer->u.serverinfo.cheatsenabled = CV_CheatsEnabled(); + serverinfo->modifiedgame = (UINT8)modifiedgame; + serverinfo->cheatsenabled = CV_CheatsEnabled(); - netbuffer->u.serverinfo.kartvars = (UINT8) ( + serverinfo->kartvars = (UINT8) ( (cv_kartspeed.value & SV_SPEEDMASK) | (dedicated ? SV_DEDICATED : 0) ); - CopyCaretColors(netbuffer->u.serverinfo.servername, cv_servername.string, - MAXSERVERNAME); - strncpy(netbuffer->u.serverinfo.mapname, G_BuildMapName(gamemap), sizeof(netbuffer->u.serverinfo.mapname)-1); + CopyCaretColors(serverinfo->servername, cv_servername.string, MAXSERVERNAME); - memcpy(netbuffer->u.serverinfo.mapmd5, mapmd5, sizeof(netbuffer->u.serverinfo.mapmd5)); + strncpy(serverinfo->mapname, G_BuildMapName(gamemap), sizeof(serverinfo->mapname)-1); + serverinfo->mapname[sizeof(serverinfo->mapname)-1] = '\0'; - netbuffer->u.serverinfo.iszone = 0; + memcpy(serverinfo->mapmd5, mapmd5, sizeof(serverinfo->mapmd5)); - memset(netbuffer->u.serverinfo.maptitle, 0, sizeof(netbuffer->u.serverinfo.maptitle)); - memset(netbuffer->u.serverinfo.httpsource, 0, MAX_MIRROR_LENGTH); + serverinfo->iszone = 0; + + memset(serverinfo->maptitle, 0, sizeof(serverinfo->maptitle)); + memset(serverinfo->httpsource, 0, MAX_MIRROR_LENGTH); if (!(mapheaderinfo[gamemap-1]->menuflags & LF2_HIDEINMENU) && mapheaderinfo[gamemap-1]->lvlttl[0]) { - strncpy(netbuffer->u.serverinfo.maptitle, mapheaderinfo[gamemap-1]->lvlttl, sizeof(netbuffer->u.serverinfo.maptitle)-1); + strncpy(serverinfo->maptitle, mapheaderinfo[gamemap-1]->lvlttl, sizeof(serverinfo->maptitle)-1); if (!(mapheaderinfo[gamemap-1]->levelflags & LF_NOZONE)) { if (mapheaderinfo[gamemap-1]->zonttl[0]) { - strncat(netbuffer->u.serverinfo.maptitle, " ", sizeof(netbuffer->u.serverinfo.maptitle)-1); - strncat(netbuffer->u.serverinfo.maptitle, mapheaderinfo[gamemap-1]->zonttl, - sizeof(netbuffer->u.serverinfo.maptitle)-1); + strncat(serverinfo->maptitle, " ", sizeof(serverinfo->maptitle)-1); + strncat(serverinfo->maptitle, mapheaderinfo[gamemap-1]->zonttl, sizeof(serverinfo->maptitle)-1); } else { - netbuffer->u.serverinfo.iszone = 1; // ms and clients will append this themselves + serverinfo->iszone = 1; // ms and clients will append this themselves } } if (mapheaderinfo[gamemap-1]->actnum[0]) { - strncat(netbuffer->u.serverinfo.maptitle, " ", sizeof(netbuffer->u.serverinfo.maptitle)-1); - strncat(netbuffer->u.serverinfo.maptitle, mapheaderinfo[gamemap-1]->actnum, - sizeof(netbuffer->u.serverinfo.maptitle)-1); + strncat(serverinfo->maptitle, " ", sizeof(serverinfo->maptitle)-1); + strncat(serverinfo->maptitle, mapheaderinfo[gamemap-1]->actnum, sizeof(serverinfo->maptitle)-1); } } else - strncpy(netbuffer->u.serverinfo.maptitle, "Unknown", 33); + { + strncpy(serverinfo->maptitle, "Unknown", sizeof(serverinfo->maptitle)-1); + } - netbuffer->u.serverinfo.maptitle[32] = '\0'; + serverinfo->maptitle[sizeof(serverinfo->maptitle)-1] = '\0'; - netbuffer->u.serverinfo.actnum = 0; //mapheaderinfo[gamemap-1]->actnum + serverinfo->actnum = 0; //mapheaderinfo[gamemap-1]->actnum mirror_length = strlen(httpurl); if (mirror_length > MAX_MIRROR_LENGTH) mirror_length = MAX_MIRROR_LENGTH; - if (snprintf(netbuffer->u.serverinfo.httpsource, mirror_length+1, "%s", httpurl) < 0) + if (snprintf(serverinfo->httpsource, mirror_length+1, "%s", httpurl) < 0) // If there's an encoding error, send nothing, we accept that the above may be truncated - strncpy(netbuffer->u.serverinfo.httpsource, "", mirror_length); + strncpy(serverinfo->httpsource, "", mirror_length); - netbuffer->u.serverinfo.httpsource[MAX_MIRROR_LENGTH-1] = '\0'; + serverinfo->httpsource[MAX_MIRROR_LENGTH-1] = '\0'; p = PutFileNeeded(0); @@ -2026,6 +2038,7 @@ static void SV_SendSaveGame(INT32 node, boolean resending) P_SaveNetGame(&save, resending); length = save.p - save.buffer; + if (length > SAVEGAMESIZE) { Z_Free(save.buffer); @@ -2178,7 +2191,8 @@ static void CL_LoadReceivedSavegame(boolean reloading) if (unlink(tmpsave) == -1) CONS_Alert(CONS_ERROR, M_GetText("Can't delete %s\n"), tmpsave); consistancy[gametic%BACKUPTICS] = Consistancy(); - CON_ToggleOff(); + if (!reloading) + CON_ToggleOff(); #ifdef SATURNPAK // Tell the server we have received and reloaded the gamestate @@ -2856,10 +2870,7 @@ static boolean CL_ServerConnectionTicker(const char *tmpsave, tic_t *oldtic, tic { INT32 key; - if (I_Interrupted()) - { - I_Quit(); - } + I_HandleInterrupt(); I_OsPolling(); @@ -3441,7 +3452,7 @@ void CL_ClearPlayer(INT32 playernum) if (players[playernum].mo) { // Don't leave a NiGHTS ghost! - if (UNLIKELY((players[playernum].pflags & PF_NIGHTSMODE) && players[playernum].mo->tracer)) + if (nightsplayer(&players[playernum]) && players[playernum].mo->tracer) P_RemoveMobj(players[playernum].mo->tracer); P_RemoveMobj(players[playernum].mo); } @@ -3498,6 +3509,9 @@ void CL_RemovePlayer(INT32 playernum, INT32 reason) while ((doomcom->numslots > 1) && !playeringame[doomcom->numslots-1]) doomcom->numslots--; + // Unmute slot if player was muted + player_muted[playernum] = false; + // Reset the name sprintf(player_names[playernum], "Player %d", playernum+1); @@ -3756,6 +3770,10 @@ static void Command_Ban(void) if (pn == -1 || pn == 0) return; + // player does not exist + if (!playeringame[pn]) + return; + WRITEUINT8(p, pn); if (COM_Argc() == 2) @@ -3873,6 +3891,10 @@ static void Command_Kick(void) if (pn == -1 || pn == 0) return; + // player does not exist + if (!playeringame[pn]) + return; + // Special case if we are trying to kick a player who is downloading the game state: // trigger a timeout instead of kicking them, because a kick would only // take effect after they have finished downloading @@ -3922,6 +3944,13 @@ static void Got_KickCmd(const UINT8 **p, INT32 playernum) pnum = READUINT8(*p); msg = READUINT8(*p); + if (pnum >= MAXPLAYERS) + { + CONS_Alert(CONS_WARNING, M_GetText("Illegal kick command received from %s for player %d\n"), player_names[playernum], pnum); + return; + } + + // FIXME: this does not work at all on dedi, servernode == 0 which is prevented from kick/ban command if (pnum == serverplayer && IsPlayerAdmin(playernum)) { CONS_Printf(M_GetText("Server is being shut down remotely. Goodbye!\n")); @@ -3976,6 +4005,16 @@ static void Got_KickCmd(const UINT8 **p, INT32 playernum) msg = KICK_MSG_CON_FAIL; } + // without this the server will remove itself and thus self destruct on dedicated + if (server && (playernode[pnum] == UINT8_MAX || !playeringame[pnum])) + { + CONS_Alert(CONS_WARNING, M_GetText("Attempting to kick player %d which is not in game received from %s\n"), pnum, player_names[playernum]); + return; + } + + // make sure we dont read garbage anywhere + memset(reason, 0, sizeof(buf)); + if (msg == KICK_MSG_CUSTOM_BAN || msg == KICK_MSG_CUSTOM_KICK) { READSTRINGN(*p, reason, MAX_REASONLENGTH+1); @@ -4447,6 +4486,7 @@ void SV_ResetServer(void) pingmeasurecount = 1; memset(realpingtable, 0, sizeof(realpingtable)); memset(playerpingtable, 0, sizeof(playerpingtable)); + localplayerping = 0; ClearAdminPlayers(); @@ -4795,7 +4835,7 @@ void CL_RemoveSplitscreenPlayer(UINT8 p) // is there a game running boolean Playing(void) { - return (server && serverrunning) || (client && cl_mode == CL_CONNECTED); + return ((server && serverrunning) || (client && cl_mode == CL_CONNECTED)); } boolean SV_SpawnServer(void) @@ -5396,7 +5436,7 @@ static void PT_ServerCFG(SINT8 node) { maketic = gametic = neededtic = (tic_t)LONG(netbuffer->u.servercfg.gametic); if ((gametype = netbuffer->u.servercfg.gametype) >= NUMGAMETYPES) - I_Error("Bad gametype in cliserv!"); + I_Error("Bad gametype %d in cliserv!", gametype); modifiedgame = netbuffer->u.servercfg.modifiedgame; for (j = 0; j < MAXPLAYERS; j++) adminplayers[j] = netbuffer->u.servercfg.adminplayers[j]; @@ -6836,7 +6876,10 @@ boolean TryRunTics(tic_t realtics) DEBFILE(va("============ Running tic %d (local %d)\n", gametic, leveltime)); if (update_stats) + { + ps_prevtictime = ps_tictime; PS_START_TIMING(ps_tictime); + } G_Ticker((gametic % NEWTICRATERATIO) == 0); ExtraDataTicker(); @@ -6983,10 +7026,12 @@ static void UpdatePingTable(void) INT32 i; + const boolean playing = Playing(); + if (server) { - //if (Playing() && !(gametime % 8)) // Value chosen based on _my vibes man_ << dont do this for v8 atleast, this is placeboeing ppl to hell and back - if (Playing() && !(gametime % 35)) // update once per second. + //if (playing && !(gametime % 8)) // Value chosen based on _my vibes man_ << dont do this for v8 atleast, this is placeboeing ppl to hell and back + if (playing && !(gametime % 35)) // update once per second. PingUpdate(); fastest = 0; @@ -7045,6 +7090,10 @@ static void UpdatePingTable(void) else lowest_lag = simulated_lag = 0; } + + // this is really dumb but oh well + if (playing && !(gametime % 35)) + localplayerping = playerpingtable[consoleplayer]; } #ifdef HOLEPUNCH diff --git a/src/d_clisrv.h b/src/d_clisrv.h index 8392f13a1..29a33e351 100644 --- a/src/d_clisrv.h +++ b/src/d_clisrv.h @@ -650,6 +650,8 @@ extern UINT8 playernode[MAXPLAYERS]; extern boolean player_muted[MAXPLAYERS]; +extern UINT32 localplayerping; + INT32 D_NumPlayers(void); void D_ResetTiccmds(void); diff --git a/src/d_main.c b/src/d_main.c index e24c66fea..8a7170ce2 100644 --- a/src/d_main.c +++ b/src/d_main.c @@ -79,6 +79,7 @@ #include "core/memory.h" #include "lua_script.h" +#include "lua_profile.h" /* Manually defined asset hashes for non-CMake builds * Last updated 2015 / 05 / 03 - SRB2 v2.1.15 - srb2.srb @@ -154,7 +155,7 @@ boolean music_disabled = false; INT32 debugload = 0; #endif -char savegamename[256]; +char savegamename[256] = {}; char srb2home[256] = "."; char srb2path[256] = "."; @@ -275,20 +276,6 @@ static void D_Renderview(void) R_ApplyLevelInterpolators(R_GetTimeFrac(RTF_LEVEL)); - if (rendermode == render_soft && cv_homremoval.value) - { - if (cv_homremoval.value == 1) - { - // Clear the software screen buffer to remove HOM - memset(vid.screens[0], 31, vid.width * vid.height); - } - else if (cv_homremoval.value == 2) - { - //'development' HOM removal -- makes it blindingly obvious if HOM is spotted. - memset(vid.screens[0], 32+(timeinmap&15), vid.width * vid.height); - } - } - for (i = 0; i <= splitscreen; i++) { if (!P_MobjWasRemoved(players[displayplayers[i]].mo) || players[displayplayers[i]].playerstate == PST_DEAD) @@ -658,6 +645,11 @@ static boolean D_Display(void) CON_Drawer(); // Ha, i LIED! + if (cv_lua_profile.value > 0) + { + LUA_RenderTimers(); + } + PS_START_TIMING(ps_swaptime); I_FinishUpdate(); // page flip or blit buffer PS_STOP_TIMING(ps_swaptime); @@ -726,10 +718,7 @@ void D_SRB2Loop(void) enterprecise = I_GetPreciseTime(); - if (I_Interrupted()) - { - I_Quit(); - } + I_HandleInterrupt(); memset(&g_dc, 0, sizeof(g_dc)); Z_Frame_Reset(); @@ -1162,7 +1151,7 @@ static void D_FindAddonsToAutoload(void) // you can probably imagine how that goes in a netgame.... if (W_CheckAutoLoadContainsMap(wadsToAutoload)) { - CONS_Printf("Autoload: file %s contains map data! skipping...", wadsToAutoload); + CONS_Alert(CONS_WARNING, "Autoload: file %s contains map data, this WILL cause crashes and desynchs! skipping...\n", wadsToAutoload); continue; } @@ -1356,20 +1345,24 @@ static void IdentifyVersion(void) // // search for maps // -static void D_CheckMaps(boolean checkreplaced) +static void D_CheckMapReplacements(boolean pwad) { INT32 i; char *name; UINT16 wadnum; lumpinfo_t *lumpinfo; + size_t numfiles; - for (wadnum = 0; wadnum < mainwads; wadnum++) + wadnum = pwad ? (mainwads+1) : 0; + numfiles = pwad ? numwadfiles : mainwads; + + for (; wadnum < numfiles; wadnum++) { lumpinfo = wadfiles[wadnum]->lumpinfo; for (i = 0; i < wadfiles[wadnum]->numlumps; i++, lumpinfo++) { name = lumpinfo->name; - P_CheckMapReplacements(name, checkreplaced); + P_CheckMapReplacements(name, pwad); } } } @@ -1832,17 +1825,19 @@ void D_SRB2Main(void) // conversion sometimes needs the palette V_ReloadPalette(); - D_CheckMaps(false); + D_CheckMapReplacements(false); - W_InitMultipleFiles(startuppwads, startuppwadcount, true); - - // Only search for pwad maps if we actually have a pwad added if (startuppwadcount > 0) { - D_CheckMaps(true); + CONS_Printf("W_InitMultipleFiles(): Adding extra PWADs.\n"); + W_InitMultipleFiles(startuppwads, startuppwadcount, true); + + // Only search for pwad maps if we actually have a pwad added + D_CheckMapReplacements(true); + + D_CleanFile(startuppwads, startuppwadcount); } - D_CleanFile(startuppwads, startuppwadcount); startuppwadcount = 0; cht_Init(); @@ -1929,7 +1924,7 @@ void D_SRB2Main(void) CONS_Printf("R_Init(): Init SRB2 refresh daemon.\n"); R_Init(); -#if SOUND==SOUND_DUMMY +#if SOUND == SOUND_DUMMY sound_disabled = true; music_disabled = true; #else diff --git a/src/d_netcmd.c b/src/d_netcmd.c index 8fbac60a6..f08d0d2c8 100644 --- a/src/d_netcmd.c +++ b/src/d_netcmd.c @@ -47,6 +47,7 @@ #include "z_zone.h" #include "lua_script.h" #include "lua_hook.h" +#include "lua_profile.h" #include "m_cond.h" #include "m_anigif.h" #include "k_kart.h" // SRB2kart @@ -150,6 +151,7 @@ static void Command_ListWADS_f(void); static void Command_LocateLump_f(void); static void Command_ListDoomednums_f(void); static void Command_ListUnusedSprites_f(void); +static void Command_ListUnusedMapSlots_f(void); static void Command_RunSOC(void); static void Command_Pause(void); static void Command_Respawn(void); @@ -505,6 +507,9 @@ static CV_PossibleValue_t ps_descriptor_cons_t[] = { {1, "Average"}, {2, "SD"}, {3, "Minimum"}, {4, "Maximum"}, {0, NULL}}; consvar_t cv_ps_descriptor = {"ps_descriptor", "Average", 0, ps_descriptor_cons_t, NULL, 0, NULL, NULL, 0, 0, NULL}; +//consvar_t cv_lua_profile = {"lua_profile", "0").values(CV_Unsigned).onchange(lua_profile_OnChange).description("Show hook timings over an average of N tics"); +consvar_t cv_lua_profile = {"lua_profile", "0", CV_CALL, CV_Unsigned, lua_profile_OnChange, 0, NULL, NULL, 0, 0, NULL}; + // only there to better keep track of it globally consvar_t cv_director = {"director", "Off", CV_HIDEN, CV_OnOff, NULL, 0, NULL, NULL, 0, 0, NULL}; @@ -565,6 +570,7 @@ const char *netxcmdnames[MAXNETXCMD - 1] = "MODIFYVOTE", "PICKVOTE", "REMOVEPLAYER", + "DISCORD", "LUACMD", "LUAVAR" }; @@ -598,6 +604,12 @@ void D_RegisterServerCommands(void) Forceskin_cons_t[i].value = 0; Forceskin_cons_t[i].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", 1 + i); + RegisterNetXCmd(XD_NAMEANDCOLOR, Got_NameAndColor); RegisterNetXCmd(XD_WEAPONPREF, Got_WeaponPref); RegisterNetXCmd(XD_MAP, Got_Mapcmd); @@ -645,6 +657,7 @@ void D_RegisterServerCommands(void) COM_AddCommand("locatelump", Command_LocateLump_f); COM_AddCommand("listmapthings", Command_ListDoomednums_f); COM_AddCommand("listunusedsprites", Command_ListUnusedSprites_f); + COM_AddCommand("listunusedmapslots", Command_ListUnusedMapSlots_f); COM_AddCommand("runsoc", Command_RunSOC); COM_AddCommand("pause", Command_Pause); @@ -928,11 +941,11 @@ void D_RegisterClientCommands(void) COM_AddCommand("displayplayer", Command_Displayplayer_f); - CV_RegisterVar(&cv_audbuffersize); - CV_RegisterVar(&cv_palette); CV_RegisterVar(&cv_palettenum); + CV_RegisterVar(&cv_lua_profile); + // m_menu.c CV_RegisterVar(&cv_chatheight); CV_RegisterVar(&cv_chatwidth); @@ -940,6 +953,9 @@ void D_RegisterClientCommands(void) CV_RegisterVar(&cv_chatspamprotection); CV_RegisterVar(&cv_consolechat); CV_RegisterVar(&cv_chatnotifications); + CV_RegisterVar(&cv_chat_xoffset); + CV_RegisterVar(&cv_chat_yoffset); + CV_RegisterVar(&cv_chat_showlimit); CV_RegisterVar(&cv_chatbacktint); CV_RegisterVar(&cv_chatcentertext); CV_RegisterVar(&cv_songcredits); @@ -1005,9 +1021,17 @@ void D_RegisterClientCommands(void) CV_RegisterVar(&cv_usejoystick[i]); CV_RegisterVar(&cv_joyscale[i]); - CV_RegisterVar(&cv_rumble[i]); - CV_RegisterVar(&cv_rumblestrength[i]); CV_RegisterVar(&cv_gamepadled[i]); + + CV_RegisterVar(&cv_rumble[i]); + CV_RegisterVar(&cv_rumble_strength[i]); + CV_RegisterVar(&cv_rumble_spinout[i]); + CV_RegisterVar(&cv_rumble_sneakerboost[i]); + CV_RegisterVar(&cv_rumble_offroad[i]); + CV_RegisterVar(&cv_rumble_bananadrag[i]); + CV_RegisterVar(&cv_rumble_stairjank[i]); + CV_RegisterVar(&cv_rumble_brakedrift[i]); + CV_RegisterVar(&cv_rumble_driftcharge[i]); } CV_RegisterVar(&cv_gamepadifunfocused); @@ -1027,6 +1051,7 @@ void D_RegisterClientCommands(void) CV_RegisterVar(&cv_midimusicvolume); #endif CV_RegisterVar(&cv_numChannels); + CV_RegisterVar(&cv_audbuffersize); #ifdef HAVE_OPENMPT CV_RegisterVar(&cv_modfilter); @@ -1548,8 +1573,8 @@ static void SendNameAndColor(UINT8 splitplayer) // TODO: make those cvars arrays consvar_t *playercolor, *playername, *playerskin; consvar_t *colorvars[] = {&cv_playercolor, &cv_playercolor2, &cv_playercolor3, &cv_playercolor4}; - consvar_t *namevars[] = {&cv_playername, &cv_playername2, &cv_playername3, &cv_playername4}; - consvar_t *skinvars[] = {&cv_skin, &cv_skin2, &cv_skin3, &cv_skin4}; + consvar_t *namevars[] = {&cv_playername, &cv_playername2, &cv_playername3, &cv_playername4}; + consvar_t *skinvars[] = {&cv_skin, &cv_skin2, &cv_skin3, &cv_skin4}; playercolor = colorvars[splitplayer]; playername = namevars[splitplayer]; @@ -1793,7 +1818,7 @@ INT32 D_LookupPlayer(const char *s) if ((playernum = atoi(s))) { - playernum = max(min(playernum, MAXPLAYERS-1), 0);/* not out of range */ + playernum = max(min(playernum, MAXPLAYERS-1), 0); /* not out of range */ return playernum; } @@ -4591,6 +4616,23 @@ void Command_ListUnusedSprites_f(void) } } +void Command_ListUnusedMapSlots_f(void) +{ + INT32 i; + + CONS_Printf("\x82Printing map slot non-usage...\n"); + + for (i = 0; i < NUMMAPS; i++) + { + // is checking this enough? + if (mapheaderinfo[i]) + continue; + + CONS_Printf("%s\n", G_BuildMapName(i+1)); + } +} + + // ========================================================================= // MISC. COMMANDS // ========================================================================= @@ -5471,7 +5513,6 @@ static void Name_OnChange(void) } SendNameAndColor(0); - } static void Name2_OnChange(void) @@ -5662,19 +5703,22 @@ static void Command_SkinSearch(void) size_t i; UINT16 s; UINT16 ic = 0; - //skin_t *skininput = &skins[s]; - for (i = 1; i < COM_Argc(); i++){ - for( s = 0 ; s < numallskins ; s++ ) + + for (i = 1; i < COM_Argc(); i++) + { + for (s = 0; s < numskins; s++) { skin_t *skininput = &skins[s]; - if (strcasestr(skininput->realname,COM_Argv(i))) + + if (strcasestr(skininput->realname, COM_Argv(i))) { ic++; - CONS_Printf("%d. %s%s:\x80 %s\n", ic,HU_SkinColorToConsoleColor(skininput->prefcolor),skininput->realname,skininput->name); + CONS_Printf("%d. %s%s:\x80 %s\n", ic, HU_SkinColorToConsoleColor(skininput->prefcolor), skininput->realname, skininput->name); } } } - CONS_Printf("Total %d skins.\n", ic); + + CONS_Printf("Total %d skins.\n", ic); } /** Sends a color change for the console player, unless that player is moving. diff --git a/src/d_netcmd.h b/src/d_netcmd.h index c9520f1a7..25e050a13 100644 --- a/src/d_netcmd.h +++ b/src/d_netcmd.h @@ -51,10 +51,6 @@ extern consvar_t cv_mousevisible; //WTF extern consvar_t cv_mouseturn; extern consvar_t cv_usejoystick[4]; //MAXSPLITSCREENPLAYERS -#ifdef LJOYSTICK -extern consvar_t cv_joyport; -extern consvar_t cv_joyport2; -#endif extern consvar_t cv_joyscale[4]; //MAXSPLITSCREENPLAYERS // normally in p_mobj but the .h is not read @@ -153,6 +149,7 @@ extern consvar_t cv_showminimapnames; extern consvar_t cv_showminimapfinished; extern consvar_t cv_minihead; extern consvar_t cv_showminimapangle; +extern consvar_t cv_spinoutroll; extern consvar_t cv_showlapemblem; @@ -192,6 +189,8 @@ extern consvar_t cv_ps_thinkframe_page; extern consvar_t cv_ps_samplesize; extern consvar_t cv_ps_descriptor; +extern consvar_t cv_lua_profile; + extern consvar_t cv_director, cv_kartdebugdirector, cv_showdirectorhud; extern consvar_t cv_showtrackaddon; diff --git a/src/d_netfil.c b/src/d_netfil.c index 8865ab618..613b72df5 100644 --- a/src/d_netfil.c +++ b/src/d_netfil.c @@ -167,7 +167,9 @@ UINT8 *PutFileNeeded(UINT16 firstfile) continue; } - nameonly(strcpy(wadfilename, wadfiles[i]->filename)); + strncpy(wadfilename, wadfiles[i]->filename, MAX_WADPATH); + wadfilename[MAX_WADPATH-1] = '\0'; + nameonly(wadfilename); // Look below at the WRITE macros to understand what these numbers mean. const size_t len = strlen(wadfilename) + 1; @@ -257,9 +259,10 @@ void CL_PrepareDownloadSaveGame(const char *tmpsave) */ boolean CL_CheckDownloadable(void) { - UINT8 i,dlstatus = 0; + UINT8 i, dlstatus = 0; for (i = 0; i < fileneedednum; i++) + { if (fileneeded[i].status != FS_FOUND && fileneeded[i].status != FS_OPEN) { if (fileneeded[i].willsend == 1) @@ -270,6 +273,7 @@ boolean CL_CheckDownloadable(void) else //if (fileneeded[i].willsend == 2) dlstatus = 2; } + } // Downloading locally disabled if (!dlstatus && M_CheckParm("-nodownload")) @@ -280,15 +284,17 @@ boolean CL_CheckDownloadable(void) // not downloadable, put reason in console CONS_Alert(CONS_NOTICE, M_GetText("You need additional files to connect to this server:\n")); + for (i = 0; i < fileneedednum; i++) + { if (fileneeded[i].status != FS_FOUND && fileneeded[i].status != FS_OPEN) { CONS_Printf(" * \"%s\" (%dK)", fileneeded[i].filename, fileneeded[i].totalsize >> 10); - if (fileneeded[i].status == FS_MD5SUMBAD) - CONS_Printf(M_GetText(" wrong version, md5: ")); - else - CONS_Printf(M_GetText(" not found, md5: ")); + if (fileneeded[i].status == FS_MD5SUMBAD) + CONS_Printf(M_GetText(" wrong version, md5: ")); + else + CONS_Printf(M_GetText(" not found, md5: ")); { INT32 j; @@ -299,6 +305,7 @@ boolean CL_CheckDownloadable(void) } CONS_Printf("\n"); } + } switch (dlstatus) { @@ -312,6 +319,7 @@ boolean CL_CheckDownloadable(void) CONS_Printf(M_GetText("All files downloadable, but you have chosen to disable downloading locally.\n")); break; } + return false; } @@ -549,7 +557,7 @@ INT32 CL_CheckFiles(void) if (fileneeded[i].status != FS_OPEN) filestoload++; - if (fileneeded[i].status != FS_NOTCHECKED) //since we're running this over multiple tics now, its possible for us to come across files checked in previous tics + if (fileneeded[i].status != FS_NOTCHECKED) // since we're running this over multiple tics now, its possible for us to come across files checked in previous tics continue; CONS_Debug(DBG_NETPLAY, "searching for '%s' ", fileneeded[i].filename); @@ -557,14 +565,18 @@ INT32 CL_CheckFiles(void) // Check in already loaded files for (j = mainwads+1; j < numwadfiles; j++) { - nameonly(strcpy(wadfilename, wadfiles[j]->filename)); - - if (fasticmp(wadfilename, fileneeded[i].filename) && - !memcmp(wadfiles[j]->md5sum, fileneeded[i].md5sum, 16)) + if (!memcmp(wadfiles[j]->md5sum, fileneeded[i].md5sum, 16)) { - CONS_Debug(DBG_NETPLAY, "already loaded\n"); - fileneeded[i].status = FS_OPEN; - return 4; + strncpy(wadfilename, wadfiles[j]->filename, MAX_WADPATH); + wadfilename[MAX_WADPATH-1] = '\0'; + nameonly(wadfilename); + + if (fasticmp(wadfilename, fileneeded[i].filename)) + { + CONS_Debug(DBG_NETPLAY, "already loaded\n"); + fileneeded[i].status = FS_OPEN; + return 4; + } } } @@ -645,7 +657,7 @@ boolean CL_LoadServerFiles(void) else { const char *s; - switch(fileneeded[i].status) + switch (fileneeded[i].status) { case FS_NOTFOUND: s = "FS_NOTFOUND"; @@ -688,7 +700,7 @@ static boolean SV_SendFile(INT32 node, const char *filename, UINT8 fileid) char wadfilename[MAX_WADPATH]; - if (cv_noticedownload.value) + if (cv_noticedownload.value && I_GetNodeAddress) CONS_Printf("Sending file \"%s\" (id %d) to node %d (%s)\n", filename, fileid, node, I_GetNodeAddress(node)); // Find the last file in the list and set a pointer to its "next" field @@ -713,7 +725,9 @@ static boolean SV_SendFile(INT32 node, const char *filename, UINT8 fileid) // Look for the requested file through all loaded files for (wadnum = 0; wadfiles[wadnum]; wadnum++) { - strlcpy(wadfilename, wadfiles[wadnum]->filename, MAX_WADPATH); + // im a certified strlcpy hater + strncpy(wadfilename, wadfiles[wadnum]->filename, MAX_WADPATH); + wadfilename[MAX_WADPATH-1] = '\0'; nameonly(wadfilename); if (fasticmp(wadfilename, p->id.filename)) @@ -1066,7 +1080,7 @@ void Got_Filetxpak(void) { const char *s; - switch(file->status) + switch (file->status) { case FS_NOTFOUND: s = "FS_NOTFOUND"; @@ -1194,7 +1208,7 @@ filestatus_t checkfilemd5(char *filename, const UINT8 *wantedmd5sum) fhandle = fopen(filename, "rb"); if (fhandle) { - md5_stream(fhandle,md5sum); + md5_stream(fhandle, md5sum); fclose(fhandle); if (!memcmp(wantedmd5sum, md5sum, 16)) return FS_FOUND; @@ -1602,8 +1616,7 @@ static void CURLGetFile(void) #endif } -HTTP_login * -CURLGetLogin (const char *url, HTTP_login ***return_prev_next) +HTTP_login *CURLGetLogin(const char *url, HTTP_login ***return_prev_next) { HTTP_login * login; HTTP_login ** prev_next; @@ -1613,7 +1626,7 @@ CURLGetLogin (const char *url, HTTP_login ***return_prev_next) ( login = (*prev_next)); prev_next = &login->next ){ - if (fastcmp(login->url, url) != 0) + if (fastcmp(login->url, url)) { if (return_prev_next) (*return_prev_next) = prev_next; diff --git a/src/d_player.h b/src/d_player.h index bcecb66a5..e4aded95b 100644 --- a/src/d_player.h +++ b/src/d_player.h @@ -566,6 +566,8 @@ typedef struct player_s fixed_t fovadd; // adjust FOV for hw rendering SINT8 driftlevel; // just for controller rumble for now + + UINT8 stairjank; } player_t; #endif diff --git a/src/d_protocol.c b/src/d_protocol.c index 963d8e587..7cf84be93 100644 --- a/src/d_protocol.c +++ b/src/d_protocol.c @@ -211,12 +211,12 @@ void D_SetupProtocol(void) if (result) { - if (!fastcmp(buffer, "no")) + if (fastcmp(buffer, "no")) { fclose(fp); return; } - else if (fastcmp(buffer, exe_path)) + else if (!fastcmp(buffer, exe_path)) { // overwrite fclose(fp); diff --git a/src/dedicated/i_system.c b/src/dedicated/i_system.c index fb3cc2731..b6d50a712 100644 --- a/src/dedicated/i_system.c +++ b/src/dedicated/i_system.c @@ -68,6 +68,12 @@ typedef LPVOID (WINAPI *p_MapViewOfFile) (HANDLE, DWORD, DWORD, DWORD, SIZE_T); #include #if defined (__linux__) #include +#elif defined(__APPLE__) +#include +#include +#include +#include +#include #else #include #include @@ -156,8 +162,7 @@ const char *wadSearchPaths[] = { /** \brief WAD file to look for */ -#define WADKEYWORD1 "srb2.srb" -#define WADKEYWORD2 "srb2.wad" +#define WADKEYWORD "srb2.srb" /** \brief holds wad path */ static char returnWadPath[256]; @@ -520,16 +525,23 @@ void I_OutputMsg(const char *fmt, ...) { size_t len; char *txt; - va_list argptr; + va_list argptr; - va_start(argptr,fmt); + if (!fmt) + return; + + va_start(argptr, fmt); len = vsnprintf(NULL, 0, fmt, argptr); va_end(argptr); if (len == 0) return; - txt = malloc(len+1); - va_start(argptr,fmt); + txt = (char*)(malloc(len+1)); + + if (!txt) + I_Error("I_OutputMsg: Out of memory!\n"); + + va_start(argptr, fmt); vsprintf(txt, fmt, argptr); va_end(argptr); @@ -1413,6 +1425,12 @@ static void I_Fork(void) } #endif/*NEWSIGNALHANDLER*/ +int I_OpenURL(const char *url) +{ + (void)url; + return -1; +} + INT32 I_StartupSystem(void) { I_StartupConsole(); @@ -1802,20 +1820,12 @@ const char *I_ClipboardPaste(void) */ static boolean isWadPathOk(const char *path) { - char *wad3path = malloc(256); + char *wad3path = (char*)(malloc(256)); if (!wad3path) return false; - sprintf(wad3path, pandf, path, WADKEYWORD1); - - if (FIL_ReadFileOK(wad3path)) - { - free(wad3path); - return true; - } - - sprintf(wad3path, pandf, path, WADKEYWORD2); + sprintf(wad3path, pandf, path, WADKEYWORD); if (FIL_ReadFileOK(wad3path)) { @@ -1832,12 +1842,17 @@ static void pathonly(char *s) size_t j; for (j = strlen(s); j != (size_t)-1; j--) + { if ((s[j] == '\\') || (s[j] == ':') || (s[j] == '/')) { - if (s[j] == ':') s[j+1] = 0; - else s[j] = 0; + if (s[j] == ':') + s[j+1] = 0; + else + s[j] = 0; + return; } + } } /** \brief search for srb2.srb in the given path @@ -1853,7 +1868,7 @@ static const char *searchWad(const char *searchDir) static char tempsw[256] = ""; filestatus_t fstemp; - strcpy(tempsw, WADKEYWORD1); + strcpy(tempsw, WADKEYWORD); fstemp = filesearch(tempsw, searchDir, NULL, true, 20); if (fstemp == FS_FOUND) { @@ -1974,17 +1989,22 @@ const char *I_LocateWad(void) static long get_entry(const char* name, const char* buf) { long val; - char* hit = strstr(buf, name); - if (hit == NULL) { + const char* hit = strstr(buf, name); + + if (hit == NULL) + { return -1; } errno = 0; val = strtol(hit + strlen(name), NULL, 10); - if (errno != 0) { + + if (errno != 0) + { CONS_Alert(CONS_ERROR, M_GetText("get_entry: strtol() failed: %s\n"), strerror(errno)); return -1; } + return val; } #endif @@ -2009,13 +2029,13 @@ size_t I_GetFreeMem(size_t *total) *total = 32 << 20; return 32 << 20; #elif defined (_WIN32) - MEMORYSTATUS info; + MEMORYSTATUSEX info; - info.dwLength = sizeof (MEMORYSTATUS); - GlobalMemoryStatus( &info ); + info.dwLength = sizeof (MEMORYSTATUSEX); + GlobalMemoryStatusEx( &info ); if (total) - *total = (size_t)info.dwTotalPhys; - return (size_t)info.dwAvailPhys; + *total = (size_t)info.ullTotalPhys; + return (size_t)info.ullAvailPhys; #elif defined (__OS2__) UINT32 pr_arena; @@ -2048,7 +2068,7 @@ size_t I_GetFreeMem(size_t *total) { // Error if (total) - *total = 0L; + *total = 0; return 0; } @@ -2057,12 +2077,12 @@ size_t I_GetFreeMem(size_t *total) { // Error if (total) - *total = 0L; + *total = 0; return 0; } memTag += sizeof (MEMTOTAL); - totalKBytes = (size_t)atoi(memTag); + totalKBytes = strtoul(memTag, NULL, 10); if ((memTag = strstr(buf, MEMAVAILABLE)) == NULL) { @@ -2076,7 +2096,7 @@ size_t I_GetFreeMem(size_t *total) { // Error if (total) - *total = 0L; + *total = 0; return 0; } freeKBytes = MemAvailable; @@ -2084,16 +2104,46 @@ size_t I_GetFreeMem(size_t *total) else { memTag += sizeof (MEMAVAILABLE); - freeKBytes = atoi(memTag); + freeKBytes = strtoul(memTag, NULL, 10); } if (total) *total = totalKBytes << 10; return freeKBytes << 10; +#elif defined(__APPLE__) + /* macOS */ + mach_port_t host = mach_host_self(); + kern_return_t kr; + mach_msg_type_number_t count; + vm_size_t v_page_size; + struct vm_statistics64 vm_stats; + uint64_t total_mem, free_mem; + size_t size; + + size = sizeof(total_mem); + if (sysctlbyname("hw.memsize", &total_mem, &size, NULL, 0) < 0) + total_mem = 0; + + kr = host_page_size(host, &v_page_size); + if (kr != KERN_SUCCESS) + v_page_size = 4096; + + count = HOST_VM_INFO64_COUNT; + kr = host_statistics64(host, HOST_VM_INFO64, (host_info64_t)&vm_stats, &count); + if (kr == KERN_SUCCESS) + free_mem = (uint64_t)(vm_stats.free_count + vm_stats.inactive_count) * v_page_size; + else + free_mem = 0; + + if (total) + *total = (size_t)total_mem; + return (size_t)free_mem; #else // Guess 48 MB. if (total) + { *total = 48<<20; + } return 48<<20; #endif } diff --git a/src/dehacked.c b/src/dehacked.c index 323261243..cfac59656 100644 --- a/src/dehacked.c +++ b/src/dehacked.c @@ -337,12 +337,14 @@ static void readfreeslots(MYFILE *f) { if (used_spr[(i-SPR_FIRSTFREESLOT)/8] & (1<<(i%8))) { - if (!sprnames[i][4] && memcmp(sprnames[i],word,4)==0) + if (!sprnames[i][4] && memcmp(sprnames[i], word, 4) == 0) sprnames[i][4] = (char)f->wad; + continue; // Already allocated, next. } + // Found a free slot! - strncpy(sprnames[i],word,4); + strncpy(sprnames[i], word, 4); //sprnames[i][4] = 0; CONS_Printf("Sprite SPR_%s allocated.\n",word); @@ -351,22 +353,26 @@ static void readfreeslots(MYFILE *f) used_spr[(i-SPR_FIRSTFREESLOT)/8] |= 1<<(i%8); // Okay, this sprite slot has been named now. break; } + if (i > SPR_LASTFREESLOT) I_Error("Out of Sprite Freeslots while allocating \"%s\"\nLoad less addons to fix this.", word); } else if (fastcmp(type, "S")) { for (i = 0; i < NUMSTATEFREESLOTS; i++) - if (!FREE_STATES[i]) { - CONS_Printf("State S_%s allocated.\n",word); + { + if (!FREE_STATES[i]) + { + CONS_Printf("State S_%s allocated.\n", word); LUA_InvalidateMathlibCache(va("S_%s", word)); FREE_STATES[i] = Z_Malloc(strlen(word)+1, PU_STATIC, NULL); - strcpy(FREE_STATES[i],word); + strcpy(FREE_STATES[i], word); freeslotusage[0][0]++; break; } + } if (i == NUMSTATEFREESLOTS) I_Error("Out of State Freeslots while allocating \"%s\"\nLoad less addons to fix this.", word); @@ -374,16 +380,19 @@ static void readfreeslots(MYFILE *f) else if (fastcmp(type, "MT")) { for (i = 0; i < NUMMOBJFREESLOTS; i++) - if (!FREE_MOBJS[i]) { - CONS_Printf("MobjType MT_%s allocated.\n",word); + { + if (!FREE_MOBJS[i]) + { + CONS_Printf("MobjType MT_%s allocated.\n", word); LUA_InvalidateMathlibCache(va("MT_%s", word)); FREE_MOBJS[i] = Z_Malloc(strlen(word)+1, PU_STATIC, NULL); - strcpy(FREE_MOBJS[i],word); + strcpy(FREE_MOBJS[i], word); freeslotusage[1][0]++; break; } + } if (i == NUMMOBJFREESLOTS) I_Error("Out of Mobj Freeslots while allocating \"%s\"\nLoad less addons to fix this.", word); @@ -426,8 +435,11 @@ static void readthing(MYFILE *f, INT32 num) strupr(word2); else break; - if (word2[strlen(word2)-1] == '\n') - word2[strlen(word2)-1] = '\0'; + + const size_t word2len = strlen(word2); + + if (word2[word2len-1] == '\n') + word2[word2len-1] = '\0'; if (fastcmp(word, "MAPTHINGNUM") || fastcmp(word, "DOOMEDNUM")) { @@ -734,14 +746,20 @@ static void readlevelheader(MYFILE *f, INT32 num, INT32 wadnum) { UINT16 tol = 0; tmp = strtok(word2,","); + do { for (i = 0; TYPEOFLEVEL[i].name; i++) + { if (fastcmp(tmp, TYPEOFLEVEL[i].name)) break; + } + if (!TYPEOFLEVEL[i].name) deh_warning("Level header %d: unknown typeoflevel flag %s\n", num, tmp); + tol |= TYPEOFLEVEL[i].flag; } while((tmp = strtok(NULL,",")) != NULL); + mapheaderinfo[num-1]->typeoflevel = tol; } } @@ -1037,8 +1055,11 @@ static void readcutscenescene(MYFILE *f, INT32 num, INT32 scenenum) else break; - if (word2[strlen(word2)-1] == '\n') - word2[strlen(word2)-1] = '\0'; + const size_t word2len = strlen(word2); + + if (word2[word2len-1] == '\n') + word2[word2len-1] = '\0'; + i = atoi(word2); usi = (UINT16)i; @@ -1088,12 +1109,14 @@ static void readcutscenescene(MYFILE *f, INT32 num, INT32 scenenum) else if (fastcmp(word, "MUSICSLOT")) { i = get_mus(word2, true); + if (i && i <= 1035) snprintf(cutscenes[num]->scene[scenenum].musswitch, 7, "%sM", G_BuildMapName(i)); else if (i && i <= 1050) strncpy(cutscenes[num]->scene[scenenum].musswitch, compat_special_music_slots[i - 1036], 7); else cutscenes[num]->scene[scenenum].musswitch[0] = 0; // becomes empty string + cutscenes[num]->scene[scenenum].musswitch[6] = 0; } #endif @@ -1498,8 +1521,11 @@ static void readframe(MYFILE *f, INT32 num) strupr(word2); else break; - if (word2[strlen(word2)-1] == '\n') - word2[strlen(word2)-1] = '\0'; + + const size_t word2len = strlen(word2); + + if (word2[word2len-1] == '\n') + word2[word2len-1] = '\0'; if (fastcmp(word1, "SPRITENUMBER") || fastcmp(word1, "SPRITENAME")) { @@ -1828,13 +1854,19 @@ static void readextraemblemdata(MYFILE *f, INT32 num) value = atoi(word2); // used for numerical settings if (fastcmp(word, "NAME")) + { deh_strlcpy(extraemblems[num-1].name, word2, - sizeof (extraemblems[num-1].name), va("Extra emblem %d: name", num)); + sizeof (extraemblems[num-1].name), va("Extra emblem %d: name", num)); + } else if (fastcmp(word, "OBJECTIVE")) + { deh_strlcpy(extraemblems[num-1].description, word2, - sizeof (extraemblems[num-1].description), va("Extra emblem %d: objective", num)); + sizeof (extraemblems[num-1].description), va("Extra emblem %d: objective", num)); + } else if (fastcmp(word, "CONDITIONSET")) + { extraemblems[num-1].conditionset = (UINT8)value; + } else if (fastcmp(word, "SPRITE")) { if (word2[0] >= 'A' && word2[0] <= 'Z') @@ -1906,11 +1938,15 @@ static void readunlockable(MYFILE *f, INT32 num) i = atoi(word2); // used for numerical settings if (fastcmp(word, "NAME")) + { deh_strlcpy(unlockables[num].name, word2, - sizeof (unlockables[num].name), va("Unlockable %d: name", num)); + sizeof (unlockables[num].name), va("Unlockable %d: name", num)); + } else if (fastcmp(word, "OBJECTIVE")) + { deh_strlcpy(unlockables[num].objective, word2, - sizeof (unlockables[num].objective), va("Unlockable %d: objective", num)); + sizeof (unlockables[num].objective), va("Unlockable %d: objective", num)); + } else if (fastcmp(word, "SHOWCONDITIONSET")) unlockables[num].showconditionset = (UINT8)i; else if (fastcmp(word, "CONDITIONSET")) @@ -8102,7 +8138,7 @@ static mobjtype_t get_mobjtype(const char *word) if (*word >= '0' && *word <= '9') return atoi(word); - if (fastncmp("MT_",word,3)) + if (fastncmp("MT_", word, 3)) word += 3; // take off the MT_ for (i = 0; i < NUMMOBJFREESLOTS; i++) @@ -8128,7 +8164,7 @@ static statenum_t get_state(const char *word) if (*word >= '0' && *word <= '9') return atoi(word); - if (fastncmp("S_",word,2)) + if (fastncmp("S_", word, 2)) word += 2; // take off the S_ for (i = 0; i < NUMSTATEFREESLOTS; i++) @@ -8155,11 +8191,11 @@ static spritenum_t get_sprite(const char *word) if (*word >= '0' && *word <= '9') return atoi(word); - if (fastncmp("SPR_",word,4)) + if (fastncmp("SPR_", word, 4)) word += 4; // take off the SPR_ for (i = 0; i < NUMSPRITES; i++) - if (!sprnames[i][4] && memcmp(word,sprnames[i],4) == 0) + if (!sprnames[i][4] && memcmp(word, sprnames[i], 4) == 0) return i; deh_warning("Couldn't find sprite named 'SPR_%s'",word); @@ -8200,14 +8236,15 @@ static UINT16 get_mus(const char *word, UINT8 dehacked_mode) if (!word[2] && toupper(word[0]) >= 'A' && toupper(word[0]) <= 'Z') return (UINT16)M_MapNumber(word[0], word[1]); - if (fastncmp("MUS_",word,4)) + if (fastncmp("MUS_", word, 4)) word += 4; // take off the MUS_ - else if (fastncmp("O_",word,2) || fastncmp("D_",word,2)) + else if (fastncmp("O_", word, 2) || fastncmp("D_", word, 2)) word += 2; // take off the O_ or D_ strncpy(lumptmp, word, 4); lumptmp[3] = 0; - if (fasticmp("MAP",lumptmp)) + + if (fasticmp("MAP", lumptmp)) { word += 3; if (toupper(word[0]) >= 'A' && toupper(word[0]) <= 'Z') @@ -8320,7 +8357,7 @@ static inline int lib_freeslot(lua_State *L) { sfxenum_t sfx; strlwr(word); - CONS_Printf("Sound sfx_%s allocated.\n",word); + CONS_Printf("Sound sfx_%s allocated.\n", word); sfx = S_AddSoundFx(word, false, 0, false); if (sfx != sfx_None) @@ -8344,8 +8381,10 @@ static inline int lib_freeslot(lua_State *L) { if (!sprnames[j][4] && memcmp(sprnames[j], word, 4) == 0) sprnames[j][4] = wad; + continue; // Already allocated, next. } + // Found a free slot! CONS_Printf("Sprite SPR_%s allocated.\n",word); @@ -8353,7 +8392,7 @@ static inline int lib_freeslot(lua_State *L) lua_pushfstring(L, "SPR_%s", word); lua_call(L, 1, 0); - strncpy(sprnames[j],word,4); + strncpy(sprnames[j], word, 4); //sprnames[j][4] = 0; used_spr[(j-SPR_FIRSTFREESLOT)/8] |= 1<<(j%8); // Okay, this sprite slot has been named now. lua_pushinteger(L, j); @@ -8371,7 +8410,7 @@ static inline int lib_freeslot(lua_State *L) { if (!FREE_STATES[i]) { - CONS_Printf("State S_%s allocated.\n",word); + CONS_Printf("State S_%s allocated.\n", word); lua_pushcfunction(L, lua_glib_invalidate_cache); lua_pushfstring(L, "S_%s", word); @@ -8396,14 +8435,14 @@ static inline int lib_freeslot(lua_State *L) { if (!FREE_MOBJS[i]) { - CONS_Printf("MobjType MT_%s allocated.\n",word); + CONS_Printf("MobjType MT_%s allocated.\n", word); lua_pushcfunction(L, lua_glib_invalidate_cache); lua_pushfstring(L, "MT_%s", word); lua_call(L, 1, 0); FREE_MOBJS[i] = Z_Malloc(strlen(word)+1, PU_STATIC, NULL); - strcpy(FREE_MOBJS[i],word); + strcpy(FREE_MOBJS[i], word); freeslotusage[1][0]++; lua_pushinteger(L, i); r++; @@ -8590,6 +8629,7 @@ static int lua_enumlib_mobjtype_get(lua_State *L) { if (!FREE_MOBJS[i]) break; + if (fastcmp(s+3, FREE_MOBJS[i])) { lua_pushinteger(L, MT_FIRSTFREESLOT+i); @@ -8678,30 +8718,29 @@ static int lua_enumlib_sfx_get_ds(lua_State *L) } #ifdef MUSICSLOT_COMPATIBILITY +static int lua_enumlib_mus_get(lua_State *L) +{ + const char *name = strchr(lua_tostring(L, 1), '_') + 1; + int mus = get_mus(name, false); - static int lua_enumlib_mus_get(lua_State *L) - { - const char *name = strchr(lua_tostring(L, 1), '_') + 1; - int mus = get_mus(name, false); + if (mus == 0) + return 0; - if (mus == 0) - return 0; + lua_pushinteger(L, mus); + return 1; +} - lua_pushinteger(L, mus); - return 1; - } +static int lua_enumlib_mus_get_mathlib(lua_State *L) +{ + const char *name = strchr(lua_tostring(L, 1), '_') + 1; + int mus = get_mus(name, false); - static int lua_enumlib_mus_get_mathlib(lua_State *L) - { - const char *name = strchr(lua_tostring(L, 1), '_') + 1; - int mus = get_mus(name, false); + if (mus == 0) + return luaL_error(L, "music '%s' could not be found.\n", lua_tostring(L, 1)); - if (mus == 0) - return luaL_error(L, "music '%s' could not be found.\n", lua_tostring(L, 1)); - - lua_pushinteger(L, mus); - return 1; - } + lua_pushinteger(L, mus); + return 1; +} #endif static int lua_enumlib_power_get(lua_State *L) diff --git a/src/doomdata.h b/src/doomdata.h index 2f5e014c7..77dd84c50 100644 --- a/src/doomdata.h +++ b/src/doomdata.h @@ -81,10 +81,12 @@ typedef struct INT16 flags; INT16 special; INT16 tag; - // sidenum[1] will be 0xffff if one sided + // sidenum[1] will be NO_INDEX if one sided UINT16 sidenum[2]; } ATTRPACK maplinedef_t; +#define NO_INDEX 0xffff + // // LineDef attributes. // diff --git a/src/doomdef.h b/src/doomdef.h index 69347f05a..b57ab0bfb 100644 --- a/src/doomdef.h +++ b/src/doomdef.h @@ -602,6 +602,13 @@ extern const char *compdate, *comptime, *comprevision, *compbranch; // None of these that are disabled in the normal build are guaranteed to work perfectly // Compile them at your own risk! +// undefine to enable fixes and features that are not vanilla compatible +#define COMPAT_VANILLA +// if we build with 32 player (or more!) support we dont need to care vanilla compat +#if MAXPLAYERS > 16 +#undef COMPAT_VANILLA +#endif + //-- SATURN __ /// Detect if a client is on Saturn in the clientconfig. /// To seperately allow them to join or block joining from vanilla clients. @@ -666,6 +673,13 @@ extern const char *compdate, *comptime, *comprevision, *compbranch; #undef UPDATE_ALERT #endif +// overwrite some of those +// when not compiling in vanilla compat mode +#ifndef COMPAT_VANILLA + #define SATURNJOIN + #define SATURNPAK +#endif + #ifdef __cplusplus } // extern "C" #endif diff --git a/src/f_wipe.c b/src/f_wipe.c index 18100da4c..32b385c9e 100644 --- a/src/f_wipe.c +++ b/src/f_wipe.c @@ -361,10 +361,7 @@ void F_RunWipe(UINT8 wipetype, boolean drawMenu) // on for fade-to-black for (;;) { - if (I_Interrupted()) - { - I_Quit(); - } + I_HandleInterrupt(); // get fademask first so we can tell if it exists or not fmask = F_GetFadeMask(wipetype, wipeframe++); diff --git a/src/g_demo.c b/src/g_demo.c index 850e08048..f4240a42d 100644 --- a/src/g_demo.c +++ b/src/g_demo.c @@ -447,7 +447,8 @@ void G_WriteDemoExtraData(void) { static UINT8 timeout = 0; - if (timeout) timeout--; + if (timeout) + timeout--; if (demo_writerng == 1 || (demo_writerng == 2 && timeout == 0)) { @@ -467,6 +468,7 @@ void G_ReadDemoTiccmd(ticcmd_t *cmd, INT32 playernum) if (!demobuf.p || !demo.deferstart) return; + ziptic = READUINT8(demobuf.p); if (ziptic & ZT_FWD) @@ -488,11 +490,12 @@ void G_ReadDemoTiccmd(ticcmd_t *cmd, INT32 playernum) // what in the actual fuck is this??? // SRB2kart: Copy-pasted from ticcmd building, removes that crappy demo cam - if (((players[displayplayers[0]].mo && players[displayplayers[0]].speed > 0) // Moving + const player_t *player = &players[displayplayers[0]]; + if (((player->mo && player->speed > 0) // Moving || (leveltime > starttime && (cmd->buttons & BT_ACCELERATE && cmd->buttons & BT_BRAKE)) // Rubber-burn turn - || (players[displayplayers[0]].kartstuff[k_respawn]) // Respawning - || (players[displayplayers[0]].spectator || objectplacing)) // Not a physical player - && !(players[displayplayers[0]].kartstuff[k_spinouttimer] && players[displayplayers[0]].kartstuff[k_sneakertimer])) // Spinning and boosting cancels out spinout + || (player->kartstuff[k_respawn]) // Respawning + || (player->spectator || objectplacing)) // Not a physical player + && !(player->kartstuff[k_spinouttimer] && player->kartstuff[k_sneakertimer])) // Spinning and boosting cancels out spinout localangle[0] += (cmd->angleturn<<16); if (!(demoflags & DF_GHOST) && *demobuf.p == DEMOMARKER) @@ -515,49 +518,49 @@ void G_WriteDemoTiccmd(ticcmd_t *cmd, INT32 playernum) if (cmd->forwardmove != oldcmd[playernum].forwardmove) { - WRITEUINT8(demobuf.p,cmd->forwardmove); + WRITEUINT8(demobuf.p, cmd->forwardmove); oldcmd[playernum].forwardmove = cmd->forwardmove; ziptic |= ZT_FWD; } if (cmd->sidemove != oldcmd[playernum].sidemove) { - WRITEUINT8(demobuf.p,cmd->sidemove); + WRITEUINT8(demobuf.p, cmd->sidemove); oldcmd[playernum].sidemove = cmd->sidemove; ziptic |= ZT_SIDE; } if (cmd->angleturn != oldcmd[playernum].angleturn) { - WRITEINT16(demobuf.p,cmd->angleturn); + WRITEINT16(demobuf.p, cmd->angleturn); oldcmd[playernum].angleturn = cmd->angleturn; ziptic |= ZT_ANGLE; } if (cmd->buttons != oldcmd[playernum].buttons) { - WRITEUINT16(demobuf.p,cmd->buttons); + WRITEUINT16(demobuf.p, cmd->buttons); oldcmd[playernum].buttons = cmd->buttons; ziptic |= ZT_BUTTONS; } if (cmd->aiming != oldcmd[playernum].aiming) { - WRITEINT16(demobuf.p,cmd->aiming); + WRITEINT16(demobuf.p, cmd->aiming); oldcmd[playernum].aiming = cmd->aiming; ziptic |= ZT_AIMING; } if (cmd->driftturn != oldcmd[playernum].driftturn) { - WRITEINT16(demobuf.p,cmd->driftturn); + WRITEINT16(demobuf.p, cmd->driftturn); oldcmd[playernum].driftturn = cmd->driftturn; ziptic |= ZT_DRIFT; } if (cmd->latency != oldcmd[playernum].latency) { - WRITEUINT8(demobuf.p,cmd->latency); + WRITEUINT8(demobuf.p, cmd->latency); oldcmd[playernum].latency = cmd->latency; ziptic |= ZT_LATENCY; } @@ -713,7 +716,7 @@ void G_WriteGhostTic(mobj_t *ghost, INT32 playernum) if (!(demoflags & DF_GHOST)) return; // No ghost data to write. - if (ghost->player && ghost->player->pflags & PF_NIGHTSMODE && ghost->tracer) + if (ghost->player && nightsplayer(ghost->player) && ghost->tracer) { // We're talking about the NiGHTS thing, not the normal platforming thing! ziptic |= GZT_NIGHTS; @@ -726,8 +729,8 @@ void G_WriteGhostTic(mobj_t *ghost, INT32 playernum) // GZT_XYZ is only useful if you've moved 256 FRACUNITS or more in a single tic. if (abs(ghost->x-oldghost[playernum].x) > MAXMOM - || abs(ghost->y-oldghost[playernum].y) > MAXMOM - || abs(ghost->z-oldghost[playernum].z) > MAXMOM + || abs(ghost->y-oldghost[playernum].y) > MAXMOM + || abs(ghost->z-oldghost[playernum].z) > MAXMOM || ((UINT8)(leveltime & 255) > 0 && (UINT8)(leveltime & 255) <= (UINT8)cv_netdemosyncquality.value)) // Hack to enable slightly nicer resyncing { oldghost[playernum].x = ghost->x; @@ -931,7 +934,7 @@ void G_ConsAllGhostTics(void) void G_ConsGhostTic(INT32 playernum) { UINT8 ziptic; - fixed_t px,py,pz,gx,gy,gz; + fixed_t px, py, pz, gx, gy, gz; mobj_t *testmo; fixed_t syncleeway; boolean nightsfail = false; @@ -976,7 +979,7 @@ void G_ConsGhostTic(INT32 playernum) if (ziptic & GZT_NIGHTS) { - if (!testmo || !testmo->player || !(testmo->player->pflags & PF_NIGHTSMODE) || !testmo->tracer) + if (!testmo || !testmo->player || !nightsplayer(testmo->player) || !testmo->tracer) nightsfail = true; else testmo = testmo->tracer; @@ -1344,7 +1347,7 @@ fadeghost: } else { - mobj = P_SpawnMobj(g->mo->x, g->mo->y, g->mo->z - FixedDiv(FixedMul(g->mo->info->height, g->mo->scale) - g->mo->height,3*FRACUNIT), MT_THOK); + mobj = P_SpawnMobj(g->mo->x, g->mo->y, g->mo->z - FixedDiv(FixedMul(g->mo->info->height, g->mo->scale) - g->mo->height, 3*FRACUNIT), MT_THOK); mobj->sprite = states[mobjinfo[type].spawnstate].sprite; mobj->frame = (states[mobjinfo[type].spawnstate].frame & FF_FRAMEMASK) | tr_trans60<tics = -1; // nope. @@ -1375,7 +1378,7 @@ fadeghost: UINT16 i, health; UINT16 count = READUINT16(g->p); //UINT32 type; - fixed_t x,y,z; + fixed_t x, y, z; angle_t angle; mobj_t *poof; @@ -1518,7 +1521,9 @@ void G_PreviewRewind(tic_t previewtime) for (i = 0; i < MAXPLAYERS; i++) { - if (!playeringame[i] || players[i].spectator) + player_t *player = &players[i]; + + if (!playeringame[i] || player->spectator) { if (info->playerinfo[i].player.mo) { @@ -1530,35 +1535,35 @@ void G_PreviewRewind(tic_t previewtime) if (!info->playerinfo[i].ingame || !info->playerinfo[i].player.mo) { - if (players[i].mo) - players[i].mo->flags2 |= MF2_DONTDRAW; + if (player->mo) + player->mo->flags2 |= MF2_DONTDRAW; continue; } - if (!players[i].mo) + if (!player->mo) continue; //@TODO spawn temp object to act as a player display - players[i].mo->flags2 &= ~MF2_DONTDRAW; + player->mo->flags2 &= ~MF2_DONTDRAW; - P_UnsetThingPosition(players[i].mo); + P_UnsetThingPosition(player->mo); #define TWEEN(pr) info->playerinfo[i].mobj.pr + FixedMul((INT32) (next_info->playerinfo[i].mobj.pr - info->playerinfo[i].mobj.pr), tweenvalue) - players[i].mo->x = TWEEN(x); - players[i].mo->y = TWEEN(y); - players[i].mo->z = TWEEN(z); - players[i].mo->angle = TWEEN(angle); + player->mo->x = TWEEN(x); + player->mo->y = TWEEN(y); + player->mo->z = TWEEN(z); + player->mo->angle = TWEEN(angle); #undef TWEEN - P_SetThingPosition(players[i].mo); + P_SetThingPosition(player->mo); - players[i].frameangle = info->playerinfo[i].player.frameangle + FixedMul((INT32) (next_info->playerinfo[i].player.frameangle - info->playerinfo[i].player.frameangle), tweenvalue); + player->frameangle = info->playerinfo[i].player.frameangle + FixedMul((INT32) (next_info->playerinfo[i].player.frameangle - info->playerinfo[i].player.frameangle), tweenvalue); - players[i].mo->sprite = info->playerinfo[i].mobj.sprite; - players[i].mo->frame = info->playerinfo[i].mobj.frame; + player->mo->sprite = info->playerinfo[i].mobj.sprite; + player->mo->frame = info->playerinfo[i].mobj.frame; - players[i].realtime = info->playerinfo[i].player.realtime; + player->realtime = info->playerinfo[i].player.realtime; for (j = 0; j < NUMKARTSTUFF; j++) - players[i].kartstuff[j] = info->playerinfo[i].player.kartstuff[j]; + player->kartstuff[j] = info->playerinfo[i].player.kartstuff[j]; } for (i = splitscreen; i >= 0; i--) @@ -1691,7 +1696,7 @@ void G_BeginRecording(void) return; } - memset(name,0,sizeof(name)); + memset(name, 0, sizeof(name)); demobuf.p = demobuf.buffer; demoflags = DF_GHOST|(multiplayer ? DF_MULTIPLAYER : (modeattacking<standings[count].skin = UINT8_MAX; @@ -2353,12 +2358,12 @@ void G_LoadDemoInfo(menudemo_t *pdemo) } // Color - memcpy(temp,extrainfo_p,16); + memcpy(temp, extrainfo_p, 16); extrainfo_p += 16; for (i = 0; i < MAXSKINCOLORS; i++) { - if (fasticmp(KartColor_Names[i],temp)) // SRB2kart + if (fasticmp(KartColor_Names[i], temp)) // SRB2kart { pdemo->standings[count].color = i; break; @@ -2827,15 +2832,15 @@ void G_DoPlayDemo(char *defdemoname) if (demo.version == 0x0001) { // Player name - memcpy(player_names[0],demobuf.p,16); + memcpy(player_names[0], demobuf.p, 16); demobuf.p += 16; // Skin - memcpy(skin,demobuf.p,16); + memcpy(skin, demobuf.p, 16); demobuf.p += 16; // Color - memcpy(color,demobuf.p,16); + memcpy(color, demobuf.p, 16); demobuf.p += 16; demobuf.p += 5; // Backwards compat - some stats @@ -2868,7 +2873,7 @@ void G_DoPlayDemo(char *defdemoname) // Set color for (i = 0; i < MAXSKINCOLORS; i++) { - if (fasticmp(KartColor_Names[i],color)) // SRB2kart + if (fasticmp(KartColor_Names[i], color)) // SRB2kart { players[0].skincolor = i; break; @@ -2888,9 +2893,9 @@ void G_DoPlayDemo(char *defdemoname) return; } - memset(&oldcmd,0,sizeof(oldcmd)); - memset(&oldghost,0,sizeof(oldghost)); - memset(&ghostext,0,sizeof(ghostext)); + memset(&oldcmd, 0, sizeof(oldcmd)); + memset(&oldghost, 0, sizeof(oldghost)); + memset(&ghostext, 0, sizeof(ghostext)); CONS_Alert(CONS_WARNING, M_GetText("Demo version does not match game version. Desyncs may occur.\n")); @@ -2994,16 +2999,16 @@ void G_DoPlayDemo(char *defdemoname) players[p].spectator = spectator; // Name - memcpy(player_names[p],demobuf.p,16); + memcpy(player_names[p], demobuf.p, 16); demobuf.p += 16; // Skin - memcpy(skin,demobuf.p,16); + memcpy(skin, demobuf.p, 16); demobuf.p += 16; SetPlayerSkin(p, skin); // Color - memcpy(color,demobuf.p,16); + memcpy(color, demobuf.p, 16); demobuf.p += 16; for (i = 0; i < MAXSKINCOLORS; i++) @@ -3221,15 +3226,15 @@ void G_AddGhost(char *defdemoname) if (ghostversion == 0x0001) { // Player name (TODO: Display this somehow if it doesn't match cv_playername!) - memcpy(name, p,16); + memcpy(name, p, 16); p += 16; // Skin - memcpy(skin, p,16); + memcpy(skin, p, 16); p += 16; // Color - memcpy(color, p,16); + memcpy(color, p, 16); p += 16; // Ghosts do not have a player structure to put this in. @@ -3381,7 +3386,7 @@ void G_AddGhost(char *defdemoname) for (i = 0; i < MAXSKINCOLORS; i++) { - if (fasticmp(KartColor_Names[i],color)) // SRB2kart + if (fasticmp(KartColor_Names[i], color)) // SRB2kart { gh->mo->color = (UINT8)i; break; @@ -3473,7 +3478,7 @@ void G_UpdateStaffGhostName(lumpnum_t l) if (ghostversion == 0x0001) { // Player name - memcpy(dummystaffname, p,16); + memcpy(dummystaffname, p, 16); dummystaffname[16] = '\0'; return; // Not really a failure but whatever } diff --git a/src/g_game.c b/src/g_game.c index 6554a22be..50d43cf7a 100644 --- a/src/g_game.c +++ b/src/g_game.c @@ -66,8 +66,6 @@ boolean botingame = false; UINT8 botskin = 0; UINT8 botcolor = 0; -JoyType_t Joystick[MAXSPLITSCREENPLAYERS] = {}; - // SRB2kart char gamedatafilename[64] = "kartdata.dat"; char timeattackfolder[64] = "kart"; @@ -455,34 +453,13 @@ consvar_t cv_driftsparkpulse = {"driftsparkpulse", "1.4", CV_FLOAT | CV_SAVE, dr static CV_PossibleValue_t cechotoggle_t[] = {{0, "Off"}, {1, "On"}, {2, "Console"}, {0, NULL}}; consvar_t cv_cechotoggle = {"show_cecho", "On", CV_SAVE, cechotoggle_t, NULL, 0, NULL, NULL, 0, 0, NULL}; -#if MAXPLAYERS > 16 -#error "please update player_name table using the new value for MAXPLAYERS" -#endif - #ifdef SEENAMES player_t *seenplayer = NULL; // 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" -}; // SRB2kart - removed Players 17 through 32 - +// now automatically allocated in D_RegisterServerCommands +// so that it doesn't have to be updated depending on the value of MAXPLAYERS +char player_names[MAXPLAYERS][MAXPLAYERNAME+1]; INT32 player_name_changes[MAXPLAYERS] = {}; INT16 rw_maximums[NUM_WEAPONS] = @@ -755,7 +732,7 @@ INT32 JoyAxis(axis_input_e axissel, UINT8 player) if (retaxis > (+JOYAXISRANGE)) retaxis = +JOYAXISRANGE; - if (!Joystick[pnum].bGamepadStyle && axissel < AXISDEAD) + if (!DigitalGamepadStyle(pnum) && axissel < AXISDEAD) { const INT32 jdeadzone = ((JOYAXISRANGE-1) * deadzone) >> FRACBITS; @@ -803,8 +780,8 @@ static void G_HandleLocalDriftturn(ticcmd_t *cmd, UINT8 ssplayer) const UINT8 forplayer = (ssplayer-1); - const boolean analogjoystickmove = cv_usejoystick[forplayer].value && !Joystick[forplayer].bGamepadStyle; - const boolean gamepadjoystickmove = cv_usejoystick[forplayer].value && Joystick[forplayer].bGamepadStyle; + const boolean analogjoystickmove = cv_usejoystick[forplayer].value && !DigitalGamepadStyle(forplayer); + const boolean gamepadjoystickmove = cv_usejoystick[forplayer].value && DigitalGamepadStyle(forplayer); turnright = InputDown(gc_turnright, ssplayer); turnleft = InputDown(gc_turnleft, ssplayer); @@ -859,7 +836,8 @@ static void G_HandleLocalDriftturn(ticcmd_t *cmd, UINT8 ssplayer) static void G_BuildLocalTiccmd(ticcmd_t *cmd, UINT8 ssplayer, boolean freecam) { INT32 axis = 0; - const boolean usejoystick = cv_usejoystick[(ssplayer-1)].value; + const UINT8 forplayer = (ssplayer-1); + const boolean usejoystick = cv_usejoystick[forplayer].value; // check for inputs and return button commands // for stuff like joining with item button, saltyhop, honking, etc. @@ -895,7 +873,7 @@ static void G_BuildLocalTiccmd(ticcmd_t *cmd, UINT8 ssplayer, boolean freecam) #undef CHECKINPUT axis = JoyAxis(AXISLOOKBACK, ssplayer); - camspin[ssplayer-1] = (InputDown(gc_lookback, ssplayer) || (usejoystick && axis > 0)); + camspin[forplayer] = (InputDown(gc_lookback, ssplayer) || (usejoystick && axis > 0)); // Reset to our spec player if we watch someone else. if ((cmd->driftturn || cmd->buttons) @@ -992,10 +970,7 @@ void G_BuildTiccmd(ticcmd_t *cmd, INT32 realtics, UINT8 ssplayer) player_t *player = P_GetLocalPlayerForNum(forplayer); camera_t *thiscam = &camera[forplayer]; - const boolean freecam = camera[forplayer].freecam; - - const boolean analogjoystickmove = cv_usejoystick[forplayer].value && !Joystick[forplayer].bGamepadStyle; - const boolean gamepadjoystickmove = cv_usejoystick[forplayer].value && Joystick[forplayer].bGamepadStyle; + const boolean freecam = thiscam->freecam; lang = localangle[forplayer]; laim = localaiming[forplayer]; @@ -1027,6 +1002,9 @@ void G_BuildTiccmd(ticcmd_t *cmd, INT32 realtics, UINT8 ssplayer) return; } + const boolean analogjoystickmove = cv_usejoystick[forplayer].value && !DigitalGamepadStyle(forplayer); + const boolean gamepadjoystickmove = cv_usejoystick[forplayer].value && DigitalGamepadStyle(forplayer); + usejoystick = (analogjoystickmove || gamepadjoystickmove); turnright = InputDown(gc_turnright, ssplayer); turnleft = InputDown(gc_turnleft, ssplayer); @@ -1311,6 +1289,7 @@ static void G_DoLoadLevel(boolean resetplayer) { // fail so reset game stuff Command_ExitGame_f(); + P_FreeCorruptMapWarnings(); return; } @@ -1344,6 +1323,8 @@ static void G_DoLoadLevel(boolean resetplayer) // clear hud messages remains (usually from game startup) CON_ClearHUD(); + // print any map errors now due to clearhud above :chaosleep: + P_PrintCorruptMapWarnings(); server_lagless = !cv_gentlemens.value; @@ -4089,6 +4070,7 @@ char *G_BuildMapTitle(INT32 mapnum) const char *actnum = NULL; len += strlen(mapheaderinfo[mapnum-1]->lvlttl); + if (strlen(mapheaderinfo[mapnum-1]->zonttl) > 0) { zonetext = M_GetText(mapheaderinfo[mapnum-1]->zonttl); @@ -4099,6 +4081,7 @@ char *G_BuildMapTitle(INT32 mapnum) zonetext = M_GetText("Zone"); len += strlen(zonetext) + 1; // ' ' + zonetext } + if (strlen(mapheaderinfo[mapnum-1]->actnum) > 0) { actnum = M_GetText(mapheaderinfo[mapnum-1]->actnum); @@ -4112,8 +4095,10 @@ char *G_BuildMapTitle(INT32 mapnum) sprintf(title, "%s", mapheaderinfo[mapnum-1]->lvlttl); - if (zonetext) sprintf(title + strlen(title), " %s", zonetext); - if (actnum) sprintf(title + strlen(title), " %s", actnum); + if (zonetext) + sprintf(title + strlen(title), " %s", zonetext); + if (actnum) + sprintf(title + strlen(title), " %s", actnum); } return title; diff --git a/src/g_game.h b/src/g_game.h index f1ed7834e..038bc68df 100644 --- a/src/g_game.h +++ b/src/g_game.h @@ -118,10 +118,11 @@ extern consvar_t cv_driftsparkpulse; extern consvar_t cv_gravstretch; extern consvar_t cv_sloperoll; extern consvar_t cv_sliptideroll; +extern consvar_t cv_stairjank; +extern consvar_t cv_stairjanksfx; extern consvar_t cv_slamsound; extern consvar_t cv_sloperolldist; extern consvar_t cv_sparkroll; -extern consvar_t cv_spinoutroll; extern consvar_t cv_squishdance, cv_squishdancespeed; @@ -227,10 +228,11 @@ void G_SaveGameData(boolean force); void G_SaveGame(UINT32 slot); -#define G_GametypeHasTeams() (G_IsGameType(GT_TEAMMATCH) || G_IsGameType(GT_CTF)) +#define G_RaceGametype() (G_IsGameType(GT_RACE)) #define G_BattleGametype() (G_IsGameType(GT_MATCH)) -#define G_RaceGametype() (G_IsGameType(GT_RACE)) -#define G_TagGametype() (G_IsGameType(GT_TAG) || G_IsGameType(GT_HIDEANDSEEK)) + +#define G_GametypeHasTeams() (UNLIKELY(G_IsGameType(GT_TEAMMATCH) || G_IsGameType(GT_CTF))) +#define G_TagGametype() (UNLIKELY(G_IsGameType(GT_TAG) || G_IsGameType(GT_HIDEANDSEEK))) FUNCINLINE static ATTRINLINE boolean G_IsGameType(int type) { diff --git a/src/g_input.c b/src/g_input.c index c72ed6308..c4dfece9d 100644 --- a/src/g_input.c +++ b/src/g_input.c @@ -66,13 +66,30 @@ consvar_t cv_rumble[MAXSPLITSCREENPLAYERS] = { static CV_PossibleValue_t rumblestrength_cons_t[] = {{FRACUNIT/4, "MIN"}, {FRACUNIT*4, "MAX"}, {0, NULL}}; -consvar_t cv_rumblestrength[MAXSPLITSCREENPLAYERS] = { +consvar_t cv_rumble_strength[MAXSPLITSCREENPLAYERS] = { {"rumblestrength", "1.0", CV_SAVE|CV_FLOAT, rumblestrength_cons_t, NULL, 0, NULL, NULL, 0, 0, NULL}, {"rumblestrength2", "1.0", CV_SAVE|CV_FLOAT, rumblestrength_cons_t, NULL, 0, NULL, NULL, 0, 0, NULL}, {"rumblestrength3", "1.0", CV_SAVE|CV_FLOAT, rumblestrength_cons_t, NULL, 0, NULL, NULL, 0, 0, NULL}, {"rumblestrength4", "1.0", CV_SAVE|CV_FLOAT, rumblestrength_cons_t, NULL, 0, NULL, NULL, 0, 0, NULL} }; +#define IMPL_RUMBLE_TYPE(type)\ +consvar_t cv_rumble_##type [MAXSPLITSCREENPLAYERS] = {\ + {"rumble_" #type, "On", CV_SAVE, CV_OnOff, NULL, 0, NULL, NULL, 0, 0, NULL},\ + {"rumble2_" #type, "On", CV_SAVE, CV_OnOff, NULL, 0, NULL, NULL, 0, 0, NULL},\ + {"rumble3_" #type, "On", CV_SAVE, CV_OnOff, NULL, 0, NULL, NULL, 0, 0, NULL},\ + {"rumble4_" #type, "On", CV_SAVE, CV_OnOff, NULL, 0, NULL, NULL, 0, 0, NULL}\ +}; + +IMPL_RUMBLE_TYPE(spinout); +IMPL_RUMBLE_TYPE(sneakerboost); +IMPL_RUMBLE_TYPE(offroad); +IMPL_RUMBLE_TYPE(bananadrag); +IMPL_RUMBLE_TYPE(stairjank); +IMPL_RUMBLE_TYPE(brakedrift); +IMPL_RUMBLE_TYPE(driftcharge); + + static CV_PossibleValue_t gamepadled_cons_t[] = {{0, "Off"}, {1, "Skincolor"}, {2, "Mobjcolor"}, {0, NULL}}; consvar_t cv_gamepadled[MAXSPLITSCREENPLAYERS] = { {"gamepadled", "Skincolor", CV_SAVE|CV_CALL|CV_NOINIT, gamepadled_cons_t, led_off_handle, 0, NULL, NULL, 0, 0, NULL}, @@ -1036,8 +1053,8 @@ void G_PlayerDeviceRumble(INT32 playernum, UINT16 low_strength, UINT16 high_stre // doesent need to be super precise // but ensure this is within range (0-65535) // placed here so it applies to lua aswell - low_strength = (UINT16)min(FixedMul(low_strength, cv_rumblestrength[playernum].value), UINT16_MAX); - high_strength = (UINT16)min(FixedMul(high_strength, cv_rumblestrength[playernum].value), UINT16_MAX); + low_strength = (UINT16)min(FixedMul(low_strength, cv_rumble_strength[playernum].value), UINT16_MAX); + high_strength = (UINT16)min(FixedMul(high_strength, cv_rumble_strength[playernum].value), UINT16_MAX); I_GamepadRumble(playernum, low_strength, high_strength, duration); } @@ -1059,7 +1076,7 @@ void G_DeviceRumbleTick(void) { UINT8 i; - if (dedicated || numcontrollers == 0 || gamestate != GS_LEVEL) + if (dedicated || numcontrollers == 0 || gamestate != GS_LEVEL || demo.playback) { return; } @@ -1090,6 +1107,11 @@ void G_DeviceRumbleTick(void) const player_t *player = P_GetLocalPlayerForNum(i); + if (!player) + { + continue; + } + // allow lua to do some crap for spectators if (player->spectator || !player->mo) { @@ -1105,17 +1127,20 @@ void G_DeviceRumbleTick(void) continue; } - if (player->kartstuff[k_spinouttimer]) + if (cv_rumble_spinout[i].value + && player->kartstuff[k_spinouttimer]) { //low = high = FRACUNIT / 6; low = high = FixedMul((RUMBLE_VERYSTRONG), (FixedDiv(player->kartstuff[k_spinouttimer], (3*TICRATE / 2)))); // try do some some kinda fadeout, 3*TICRATE / 2 is the "default" spinout time } - else if (player->kartstuff[k_sneakertimer] > (sneakertime-(TICRATE/2))) + else if (cv_rumble_sneakerboost[i].value + && (player->kartstuff[k_sneakertimer] > (sneakertime-(TICRATE/2)))) { low = high = RUMBLE_STRONG; } - else if ((player->kartstuff[k_offroad]) - && player->speed != 0 + else if (cv_rumble_offroad[i].value + && (player->kartstuff[k_offroad]) + && (player->speed != 0) && P_IsObjectOnGround(player->mo)) { // weaken this depending on if you got hyu or invinc @@ -1132,26 +1157,37 @@ void G_DeviceRumbleTick(void) low = high = RUMBLE_MODERATE; } } - else if ((player->kartstuff[k_bananadrag] > TICRATE) - && player->speed != 0 + else if (cv_rumble_bananadrag[i].value + && (player->kartstuff[k_bananadrag] > TICRATE) + && (player->speed != 0) && P_IsObjectOnGround(player->mo)) { if (leveltime & 1) // this is actually funny lel high = RUMBLE_MODERATE; } + else if (cv_rumble_stairjank[i].value + && (player->stairjank > 8) + && (player->speed != 0) + && P_IsObjectOnGround(player->mo)) + { + low = high = RUMBLE_VERYWEAK; + } - if (player->kartstuff[k_brakedrift]) + if (cv_rumble_brakedrift[i].value + && player->kartstuff[k_brakedrift]) { high = CLAMP((high + RUMBLE_VERYWEAK), 0, UINT16_MAX); } // pulse when gettin new driftlevel // let this come last - if (player->kartstuff[k_driftcharge] + if (cv_rumble_driftcharge[i].value + && player->kartstuff[k_driftcharge] && player->driftlevel) { high = CLAMP((high + RUMBLE_VERYWEAK), 0, UINT16_MAX); + // make it rumble slightly longer the higher your driftlevel! if (player->driftlevel == 2) lenght = 114; else if (player->driftlevel == 3) diff --git a/src/g_input.h b/src/g_input.h index 1cf4b2956..bed5beb0e 100644 --- a/src/g_input.h +++ b/src/g_input.h @@ -100,9 +100,10 @@ typedef enum gc_custom2, // Lua scriptable gc_custom3, // Lua scriptable gc_director, - gc_freecam, // Toggle for freecam while ingame - gc_camfloat, // alternative button for raising cam - gc_camsink, // alternative button for sinking + // freecam specific controls + gc_freecam, // Toggle for freecam while ingame + gc_camfloat, // alternative button for raising camera + gc_camsink, // alternative button for sinking camera gc_strafeleft, gc_straferight, num_gamecontrols @@ -112,10 +113,19 @@ typedef enum extern consvar_t cv_mousexsens, cv_mouseysens; extern consvar_t cv_controlperkey; extern consvar_t cv_turnsmooth[MAXSPLITSCREENPLAYERS]; -extern consvar_t cv_rumble[MAXSPLITSCREENPLAYERS]; -extern consvar_t cv_rumblestrength[MAXSPLITSCREENPLAYERS]; + extern consvar_t cv_gamepadled[MAXSPLITSCREENPLAYERS]; +extern consvar_t cv_rumble[MAXSPLITSCREENPLAYERS]; +extern consvar_t cv_rumble_strength[MAXSPLITSCREENPLAYERS]; +extern consvar_t cv_rumble_spinout[MAXSPLITSCREENPLAYERS]; +extern consvar_t cv_rumble_sneakerboost[MAXSPLITSCREENPLAYERS]; +extern consvar_t cv_rumble_offroad[MAXSPLITSCREENPLAYERS]; +extern consvar_t cv_rumble_bananadrag[MAXSPLITSCREENPLAYERS]; +extern consvar_t cv_rumble_stairjank[MAXSPLITSCREENPLAYERS]; +extern consvar_t cv_rumble_brakedrift[MAXSPLITSCREENPLAYERS]; +extern consvar_t cv_rumble_driftcharge[MAXSPLITSCREENPLAYERS]; + extern consvar_t cv_gamepadifunfocused; extern consvar_t cv_gamepadledifunfocused; extern consvar_t cv_rumbleifunfocused; diff --git a/src/hardware/hw_batching.c b/src/hardware/hw_batching.c index 8bf7f7375..9b1699029 100644 --- a/src/hardware/hw_batching.c +++ b/src/hardware/hw_batching.c @@ -183,6 +183,7 @@ static int comparePolygons(const void *p1, const void *p2) UINT32 downloaded1 = poly1->texture ? poly1->texture->downloaded : 0; // there should be a opengl texture name here, usable for comparisons UINT32 downloaded2 = poly2->texture ? poly2->texture->downloaded : 0; + diff64 = downloaded1 - downloaded2; if (diff64 != 0) return diff64; diff --git a/src/hardware/hw_bsp.c b/src/hardware/hw_bsp.c index 79069857c..f53153ea9 100644 --- a/src/hardware/hw_bsp.c +++ b/src/hardware/hw_bsp.c @@ -12,20 +12,21 @@ /// \brief convert SRB2 map #include "../doomdef.h" -#include "../doomstat.h" + #ifdef HWRENDER + #include "hw_main.h" #include "hw_glob.h" -#include "../r_local.h" #include "../z_zone.h" + +#ifdef HWR_LOADING_SCREEN #include "../console.h" -#include "../v_video.h" #include "../m_menu.h" -#include "../i_system.h" -#include "../m_argv.h" -#include "../i_video.h" -#include "../w_wad.h" #include "../p_setup.h" // levelfadecol +#include "../i_video.h" +#endif + +//#define DEBUG_HWBSP // -------------------------------------------------------------------------- // This is global data for planes rendering @@ -33,19 +34,20 @@ extrasubsector_t *extrasubsectors = NULL; -// newsubsectors are subsectors without segs, added for the plane polygons -#define NEWSUBSECTORS 50 -static size_t totsubsectors; +// extra subsectors are subsectors without segs, added for the plane polygons +#define NUM_EXTRA_SUBSECTORS 50 +static size_t num_alloc_extra_subsector; #ifdef PARANOIA -size_t addsubsector; +size_t num_extra_subsector; #else -static size_t addsubsector; +static size_t num_extra_subsector; #endif -typedef struct -{ +typedef struct { float x, y; float dx, dy; + polyvertex_t divpt; + float divfrac; } fdivline_t; // when loading the map, this is set to true if portals are found. @@ -53,7 +55,7 @@ typedef struct boolean gl_maphasportals = false; // Determine on mapload if current map has any Horizonlines present -// so we can avoid rather hot checks in HWR_Subsector +// avoids doing a bunch of work during rendering boolean gl_maphashorizonlines = false; // ========================================================================== @@ -80,26 +82,25 @@ static poly_t *HWR_AllocPoly(INT32 numpts) return p; } -/// \todo polygons should be freed in reverse order for efficiency, +/// TODO: polygons should be freed in reverse order for efficiency, /// for now don't free because it doesn't free in reverse order static void HWR_FreePoly(poly_t *poly) { Z_Free(poly); } -// Return interception along bsp line, +// Return interception along bsp line (partline), // with the polygon segment -// -static float bspfrac; -static polyvertex_t *fracdivline(fdivline_t *bsp, polyvertex_t *v1, - polyvertex_t *v2) + +// Return the division in partline div fields. +// divfrac = how far along partline vector is crossing pt +static boolean fracdivline(fdivline_t *partline, polyvertex_t *v1, polyvertex_t *v2) { - static polyvertex_t pt; - double frac; - double num; - double den; - double v1x, v1y, v1dx, v1dy; - double v2x, v2y, v2dx, v2dy; + double frac1, frac2; + double num; // numerator + double den; // denominator + double v1x, v1y, v1dx, v1dy; // polygon side vector, v1->v2 + double v3x, v3y, v3dx, v3dy; // partline vector // a segment of a polygon v1x = v1->x; @@ -108,111 +109,118 @@ static polyvertex_t *fracdivline(fdivline_t *bsp, polyvertex_t *v1, v1dy = v2->y - v1->y; // the bsp partition line - v2x = bsp->x; - v2y = bsp->y; - v2dx = bsp->dx; - v2dy = bsp->dy; + v3x = partline->x; + v3y = partline->y; + v3dx = partline->dx; + v3dy = partline->dy; - den = v2dy*v1dx - v2dx*v1dy; + den = v3dy*v1dx - v3dx*v1dy; - if (fabsf((float)den) < 1.0E-36f) // avoid checking exactly for 0.0 - return NULL; // parallel + if (fabs(den) < 1.0E-36) // avoid check of float for exact 0 + return false; // partline and polygon side are effectively parallel // first check the frac along the polygon segment, // (do not accept hit with the extensions) - num = (v2x - v1x)*v2dy + (v1y - v2y)*v2dx; - frac = num / den; + num = (v3x - v1x)*v3dy + (v1y - v3y)*v3dx; + frac1 = num / den; - if (frac < 0.0l || frac > 1.0l) - return NULL; + // 0= cross at v1, 1.0= cross at v2 + if (frac1 < 0.0 || frac1 > 1.0) // double + return false; // not within the polygon side // now get the frac along the BSP line // which is useful to determine what is left, what is right - num = (v2x - v1x)*v1dy + (v1y - v2y)*v1dx; - frac = num / den; - bspfrac = (float)frac; + num = (v3x - v1x)*v1dy + (v1y - v3y)*v1dx; + frac2 = num / den; - // find the interception point along the partition line - pt.x = (float)(v2x + v2dx*frac); - pt.y = (float)(v2y + v2dy*frac); + partline->divfrac = frac2; // how far along partline vector - return &pt; + // [WDJ] find the interception point along the segment. + // It should be slightly more accurate because it is always closer to the + // crossing point than arbitrary positions on the partition line. + partline->divpt.x = v1x + v1dx*frac1; + partline->divpt.y = v1y + v1dy*frac1; + + return true; } +// BOOMEDIT.WAD has a vertex error of .21 #define DIVLINE_VERTEX_DIFF 0.45f // if two vertice coords have a x and/or y difference // of less or equal than 1 FRACUNIT, they are considered the same // point. Note: hardcoded value, 1.0f could be anything else. -static boolean SameVertice (polyvertex_t *p1, polyvertex_t *p2) +static boolean SameVertex(polyvertex_t *p1, polyvertex_t *p2) { - if (fabsf( p2->x - p1->x ) > DIVLINE_VERTEX_DIFF) + if (fabsf(p2->x - p1->x) > DIVLINE_VERTEX_DIFF) return false; - if (fabsf( p2->y - p1->y ) > DIVLINE_VERTEX_DIFF) + if (fabsf(p2->y - p1->y) > DIVLINE_VERTEX_DIFF) return false; // p1 and p2 are considered the same vertex return true; } - // split a _CONVEX_ polygon in two convex polygons // outputs: // frontpoly : polygon on right side of bsp line // backpoly : polygon on left side // -static void SplitPoly (fdivline_t *bsp, //splitting parametric line - poly_t *poly, //the convex poly we split - poly_t **frontpoly, //return one poly here - poly_t **backpoly) //return the other here +// Called from: WalkBSPNode +static void SplitPoly (fdivline_t *dlnp, // splitting parametric line + poly_t *poly, // the convex poly we split + poly_t **frontpoly, // return one poly here + poly_t **backpoly) // return the other here { INT32 i, j; polyvertex_t *pv; - INT32 ps = -1, pe = -1; - INT32 nptfront, nptback; + INT32 ps, pe; // poly start, end + INT32 ps_online, pe_online; + INT32 nptfront, nptback; polyvertex_t vs = {}; polyvertex_t ve = {}; polyvertex_t lastpv = {}; - float fracs = 0.0f, frace = 0.0f; //used to tell which poly is on - // the front side of the bsp partition line - INT32 psonline = 0, peonline = 0; + float ps_frac = 0.0f, pe_frac = 0.0f; // used to tell which poly is on + // the front side of the bsp partition line + ps = pe = -1; + ps_online = pe_online = 0; for (i = 0; i < poly->numpts; i++) { - j = i + 1; + // i, j are one side of the poly + j = i+1; if (j == poly->numpts) - j = 0; + j = 0; // wrap poly // start & end points - pv = fracdivline(bsp, &poly->pts[i], &poly->pts[j]); - - if (pv == NULL) + if (!fracdivline(dlnp, &poly->pts[i], &poly->pts[j])) continue; + // have dividing pt if (ps < 0) { // first point ps = i; - vs = *pv; - fracs = bspfrac; + vs = dlnp->divpt; + ps_frac = dlnp->divfrac; } else { - //the partition line traverse a junction between two segments + // the partition line can traverse a junction between two segments // or the two points are so close, they can be considered as one // thus, don't accept, since split 2 must be another vertex - if (SameVertice(pv, &lastpv)) + if (SameVertex(&dlnp->divpt, &lastpv)) { if (pe < 0) { ps = i; - psonline = 1; + ps_online = 1; } else { pe = i; - peonline = 1; + pe_online = 1; } } else @@ -220,24 +228,25 @@ static void SplitPoly (fdivline_t *bsp, //splitting parametric line if (pe < 0) { pe = i; - ve = *pv; - frace = bspfrac; + ve = dlnp->divpt; + pe_frac = dlnp->divfrac; } else { - // a frac, not same vertice as last one - // we already got pt2 so pt 2 is not on the line, - // so we probably got back to the start point - // which is on the line - if (SameVertice(pv, &vs)) - psonline = 1; + // a frac, not same vertice as last one + // we already got pt2 so pt 2 is not on the line, + // so we probably got back to the start point + // which is on the line + if (SameVertex(&dlnp->divpt, &vs)) + ps_online = 1; + break; } } } // remember last point intercept to detect identical points - lastpv = *pv; + lastpv = dlnp->divpt; } // no split: the partition line is either parallel and @@ -254,28 +263,34 @@ static void SplitPoly (fdivline_t *bsp, //splitting parametric line // linedefs where each side point the same sector, that is: // the deep water effect with the original Doom - /// \todo make sure front poly is to front of partition line? + //TODO: make sure front poly is to front of partition line? *frontpoly = poly; - *backpoly = NULL; + *backpoly = NULL; return; } + //if (ps >= 0 && pe < 0) if (pe < 0) { //I_Error("SplitPoly: only one point for split line (%d %d)", ps, pe); *frontpoly = poly; - *backpoly = NULL; + *backpoly = NULL; return; } - if (UNLIKELY(pe <= ps)) - I_Error("SplitPoly: invalid splitting line (%d %d)", ps, pe); + if (pe <= ps) + { + //I_Error("SplitPoly: invalid splitting line (%d %d)", ps, pe); + *frontpoly = poly; + *backpoly = NULL; + return; + } - // number of points on each side, _not_ counting those - // that may lie just one the line - nptback = pe - ps - peonline; - nptfront = poly->numpts - peonline - psonline - nptback; + // Number of points on each side, _not_ counting those + // that may lie just on the line. + nptback = pe - ps - pe_online; + nptfront = poly->numpts - pe_online - ps_online - nptback; if (nptback > 0) *backpoly = HWR_AllocPoly(2 + nptback); @@ -295,11 +310,9 @@ static void SplitPoly (fdivline_t *bsp, //splitting parametric line *pv++ = ve; i = pe; - do - { + do { if (++i == poly->numpts) i = 0; - *pv++ = poly->pts[i]; } while (i != ps && --nptfront); } @@ -312,68 +325,81 @@ static void SplitPoly (fdivline_t *bsp, //splitting parametric line *pv++ = vs; i = ps; - do - { + do { if (++i == poly->numpts) i = 0; - *pv++ = poly->pts[i]; } while (i != pe && --nptback); } // make sure frontpoly is the one on the 'right' side // of the partition line - if (fracs > frace) + if (ps_frac > pe_frac) { - poly_t *swappoly; - swappoly = *backpoly; - *backpoly = *frontpoly; + poly_t* swappoly; + swappoly = *backpoly; + *backpoly = *frontpoly; *frontpoly = swappoly; } - HWR_FreePoly (poly); + HWR_FreePoly(poly); } +// checks if any line is a portal or horizonline, for optimization +static inline void CheckForPortalsAndHorizonLines(seg_t *lseg, const line_t *line) +{ + // portal check + if (!gl_maphasportals && lseg->side == 0 && line->special == PORTALSPECIAL) + { + // Find the other side! + INT32 line2 = P_FindSpecialLineFromTag(PORTALSPECIAL, line->tag, -1); -// use each seg of the poly as a partition line, keep only the + if (line == &lines[line2]) + line2 = P_FindSpecialLineFromTag(PORTALSPECIAL, line->tag, line2); + + if (line2 >= 0) // found it! + gl_maphasportals = 1; + } + + // horizonline check + if (!gl_maphashorizonlines && line->special == HORIZONSPECIAL) + gl_maphashorizonlines = true; +} + +// Use each seg of the poly as a partition line, keep only the // part of the convex poly to the front of the seg (that is, -// the part inside the sector), the part behind the seg, is -// the void space and is cut out +// the part inside the sector). The part behind the seg, is +// the void space and is cut out. // -static poly_t *CutOutSubsecPoly(seg_t *lseg, INT32 count, poly_t *poly) +// poly : surrounding convex polygon, non-destructive +// lseg : array of seg +// segcount : number of seg in the array +// Return frontpoly, which may be new or ptr to poly. +// Called from: HWR_SubsecPoly +static poly_t *CutOutSubsecPoly(seg_t *lseg, INT32 segcount, poly_t *poly) { INT32 i, j; + poly_t* frontpoly = poly; // default, return same poly polyvertex_t *pv; - INT32 nump = 0, ps, pe; + INT32 poly_num_pts = 0, ps, pe; polyvertex_t vs = {}, ve = {}, p1 = {}, p2 = {}; - float fracs = 0.0f; + float ps_frac = 0.0f; + vertex_t *v1, *v2; fdivline_t cutseg; // x, y, dx, dy as start of node_t struct - poly_t *temppoly; // for each seg of the subsector - for (; count--; lseg++) + for (; segcount--; lseg++) { // x, y, dx, dy (like a divline) const line_t *line = lseg->linedef; - // portal check - if (UNLIKELY(!gl_maphasportals && line->special == PORTALSPECIAL && lseg->side == 0)) - { - // Find the other side! - INT32 line2 = P_FindSpecialLineFromTag(PORTALSPECIAL, line->tag, -1); + if (!line) + continue; - if (line == &lines[line2]) - line2 = P_FindSpecialLineFromTag(PORTALSPECIAL, line->tag, line2); + CheckForPortalsAndHorizonLines(lseg, line); - if (line2 >= 0) // found it! - gl_maphasportals = 1; - } - - if (!gl_maphashorizonlines && line->special == HORIZONSPECIAL) - gl_maphashorizonlines = true; - - if (line->sidenum[1] != 0xffff) + if (line->sidenum[1] != NO_INDEX) { if (sides[line->sidenum[0]].sector == sides[line->sidenum[1]].sector) { @@ -385,10 +411,21 @@ static poly_t *CutOutSubsecPoly(seg_t *lseg, INT32 count, poly_t *poly) } } - p1.x = FIXED_TO_FLOAT(lseg->side ? line->v2->x : line->v1->x); - p1.y = FIXED_TO_FLOAT(lseg->side ? line->v2->y : line->v1->y); - p2.x = FIXED_TO_FLOAT(lseg->side ? line->v1->x : line->v2->x); - p2.y = FIXED_TO_FLOAT(lseg->side ? line->v1->y : line->v2->y); + if (lseg->side) // side 1 + { + v1 = line->v2; + v2 = line->v1; + } + else // side 0 + { + v1 = line->v1; + v2 = line->v2; + } + + p1.x = FixedToFloat(v1->x); + p1.y = FixedToFloat(v1->y); + p2.x = FixedToFloat(v2->x); + p2.y = FixedToFloat(v2->y); cutseg.x = p1.x; cutseg.y = p1.y; @@ -401,125 +438,130 @@ static poly_t *CutOutSubsecPoly(seg_t *lseg, INT32 count, poly_t *poly) for (i = 0; i < poly->numpts; i++) { - j = i + 1; + // i, j are one side of the poly + j = i+1; if (j == poly->numpts) j = 0; - pv = fracdivline(&cutseg, &poly->pts[i], &poly->pts[j]); - - if (pv == NULL) + if (!fracdivline(&cutseg, &poly->pts[i], &poly->pts[j])) continue; + // have dividing pt if (ps < 0) { ps = i; - vs = *pv; - fracs = bspfrac; + vs = cutseg.divpt; + ps_frac = cutseg.divfrac; + continue; + } + + // frac 1 on previous segment, + // 0 on the next, + // the split line goes through one of the convex poly + // vertices, happens quite often since the convex + // poly is already adjacent to the subsector segs + // on most borders + if (SameVertex(&cutseg.divpt, &vs)) + continue; + + if (ps_frac <= cutseg.divfrac) + { + poly_num_pts = 2 + poly->numpts - (i-ps); + pe = ps; + ps = i; + ve = cutseg.divpt; } else { - //frac 1 on previous segment, - // 0 on the next, - //the split line goes through one of the convex poly - // vertices, happens quite often since the convex - // poly is already adjacent to the subsector segs - // on most borders - if (SameVertice(pv, &vs)) - continue; - - if (fracs <= bspfrac) - { - nump = 2 + poly->numpts - (i-ps); - pe = ps; - ps = i; - ve = *pv; - } - else - { - nump = 2 + (i-ps); - pe = i; - ve = vs; - vs = *pv; - } - - //found 2nd point - break; + poly_num_pts = 2 + (i-ps); + pe = i; + ve = vs; + vs = cutseg.divpt; } + + // found 2nd point + break; } // there was a split if (ps >= 0) { - //need 2 points + // need 2 points if (pe >= 0) { // generate FRONT poly - temppoly = HWR_AllocPoly(nump); + frontpoly = HWR_AllocPoly(poly_num_pts); - pv = temppoly->pts; + pv = frontpoly->pts; *pv++ = vs; *pv++ = ve; - do - { - if (++ps == poly->numpts) + do { + if (++ps == poly->numpts) // poly wrap ps = 0; *pv++ = poly->pts[ps]; } while (ps != pe); HWR_FreePoly(poly); - poly = temppoly; + poly = frontpoly; } #ifdef DEBUG_HWBSP - // hmmm... maybe we should NOT accept this, but this happens - // only when the cut is not needed it seems (when the cut - // line is aligned to one of the borders of the poly, and - // only some times..) else { + // hmmm... maybe we should NOT accept this, but this happens + // only when the cut is not needed it seems (when the cut + // line is aligned to one of the borders of the poly, and + // only some times..) + // [WDJ] This happens often (27 times in Doom2 map01). skipcut++; - I_Error("CutOutPoly: only one point for split line (%d %d) %d", ps, pe, debugpos); + //I_Error("CutOutPoly: only one point for split line (%d %d) %d", ps, pe, debugpos); } #endif } } - return poly; + + return frontpoly; } // At this point, the poly should be convex and the exact -// layout of the subsector, it is not always the case, +// layout of the subsector. It is not always the case, // so continue to cut off the poly into smaller parts with // each seg of the subsector. // -static inline void HWR_SubsecPoly(INT32 num, poly_t *poly) +// ssindex : subsec index, 0..(numsubsectors-1) +// poly : surrounding convex polygon, non-destructive +// Called from WalkBSPNode +static inline void HWR_SubsecPoly(INT32 ssindex, poly_t *poly) { - INT16 count; + INT16 segcount; subsector_t *sub; seg_t *lseg; - sub = &subsectors[num]; - count = sub->numlines; + sub = &subsectors[ssindex]; + segcount = sub->numlines; lseg = &segs[sub->firstline]; if (poly) { - poly = CutOutSubsecPoly(lseg,count,poly); + poly = CutOutSubsecPoly(lseg, segcount, poly); #ifdef DEBUG_HWBSP totalsubsecpolys++; #endif //extra data for this subsector - extrasubsectors[num].planepoly = poly; + extrasubsectors[ssindex].planepoly = poly; } } -// the bsp divline have not enouth presition -// search for the segs source of this divline -static inline void SearchDivline(node_t *bsp, fdivline_t *divline) +// The bsp divline does not have enough precision. +// Search for the segs source of this divline. +static inline void SetDivline(node_t *bsp, fdivline_t *divline) { - divline->x = FIXED_TO_FLOAT(bsp->x); - divline->y = FIXED_TO_FLOAT(bsp->y); - divline->dx = FIXED_TO_FLOAT(bsp->dx); - divline->dy = FIXED_TO_FLOAT(bsp->dy); + // MAR - If you don't use the same partition line that the BSP uses, + // the front/back polys won't match the subsectors in the BSP! + divline->x = FixedToFloat(bsp->x); + divline->y = FixedToFloat(bsp->y); + divline->dx = FixedToFloat(bsp->dx); + divline->dy = FixedToFloat(bsp->dy); } //Hurdler: implement a loading status @@ -532,20 +574,25 @@ static void loading_status(void) char s[16]; int x, y; + /*if (g_reloadinggamestate) + { + return; + }*/ + I_OsPolling(); CON_Drawer(); sprintf(s, "%d%%", (++ls_percent)<<1); x = BASEVIDWIDTH/2; y = BASEVIDHEIGHT/2; - V_DrawFill(0, 0, BASEVIDWIDTH, BASEVIDHEIGHT, 31); // Black background to match fade in effect + V_DrawFill(0, 0, BASEVIDWIDTH, BASEVIDHEIGHT, levelfadecol); // Black background to match fade in effect //V_DrawPatchFill(srb2back); // SRB2 background, ehhh too bright. M_DrawTextBox(x-58, y-8, 13, 1); V_DrawString(x-50, y, V_YELLOWMAP, "Loading..."); V_DrawRightAlignedString(x+50, y, V_YELLOWMAP, s); // Is this really necessary at this point..? - V_DrawCenteredString(BASEVIDWIDTH/2, 40, V_YELLOWMAP, "OPENGL MODE IS INCOMPLETE AND MAY"); - V_DrawCenteredString(BASEVIDWIDTH/2, 50, V_YELLOWMAP, "NOT DISPLAY SOME SURFACES."); + V_DrawCenteredString(BASEVIDWIDTH/2, 40, V_YELLOWMAP, "OPENGL MODE IS INCOMPLETE AND SOME"); + V_DrawCenteredString(BASEVIDWIDTH/2, 50, V_YELLOWMAP, "VISUAL FEATURES ARE MISSING/BROKEN."); V_DrawCenteredString(BASEVIDWIDTH/2, 70, V_YELLOWMAP, "USE AT SONIC'S RISK."); I_UpdateNoVsync(); @@ -576,14 +623,14 @@ static void WalkBSPNode(INT32 bspnum, poly_t *poly, UINT16 *leafnode, fixed_t *b { CONS_Debug(DBG_RENDER, "Adding a new subsector\n"); - if (UNLIKELY(addsubsector == numsubsectors + NEWSUBSECTORS)) - I_Error("WalkBSPNode: not enough addsubsectors\n"); - else if (UNLIKELY(addsubsector > 0x7fff)) - I_Error("WalkBSPNode: addsubsector > 0x7fff\n"); + if (num_extra_subsector == numsubsectors + NUM_EXTRA_SUBSECTORS) + I_Error("WalkBSPNode: not enough num_extra_subsectors\n"); + else if (num_extra_subsector > 0x7fff) + I_Error("WalkBSPNode: num_extra_subsector > 0x7fff\n"); - *leafnode = (UINT16)((UINT16)addsubsector | NF_SUBSECTOR); - extrasubsectors[addsubsector].planepoly = poly; - addsubsector++; + *leafnode = (UINT16)((UINT16)num_extra_subsector | NF_SUBSECTOR); + extrasubsectors[num_extra_subsector].planepoly = poly; + num_extra_subsector++; } //add subsectors without segs here? @@ -593,8 +640,8 @@ static void WalkBSPNode(INT32 bspnum, poly_t *poly, UINT16 *leafnode, fixed_t *b { HWR_SubsecPoly(bspnum & ~NF_SUBSECTOR, poly); - //Hurdler: implement a loading status #ifdef HWR_LOADING_SCREEN + //Hurdler: implement a loading status if (ls_count-- <= 0) { ls_count = numsubsectors/50; @@ -613,7 +660,7 @@ static void WalkBSPNode(INT32 bspnum, poly_t *poly, UINT16 *leafnode, fixed_t *b } bsp = &nodes[bspnum]; - SearchDivline(bsp, &fdivline); + SetDivline(bsp, &fdivline); SplitPoly(&fdivline, poly, &frontpoly, &backpoly); poly = NULL; @@ -656,12 +703,12 @@ void HWR_FreeExtraSubsectors(void) extrasubsectors = NULL; } -#define MAXDIST 1.5f +#define MAXDIST (1.5f) // BP: can't move vertex: DON'T change polygon geometry! (convex) //#define MOVEVERTEX // Is vertex va within the seg v1, v2 -static boolean PointInSeg(polyvertex_t *va,polyvertex_t *v1,polyvertex_t *v2) +static boolean PointInSeg(polyvertex_t *va, polyvertex_t *v1, polyvertex_t *v2) { register float ax, ay, bx, by, cx, cy, d, norm; @@ -736,8 +783,8 @@ static boolean PointInSeg(polyvertex_t *va,polyvertex_t *v1,polyvertex_t *v2) if (cx*cx+cy*cy <= MAXDIST*MAXDIST) { // ajust a little the point position - a->x = ax*d+v1->x; - a->y = ay*d+v1->y; + va->x = ax*d+v1->x; + va->y = ay*d+v1->y; // anyway the correction is not enouth return true; } @@ -749,10 +796,10 @@ static boolean PointInSeg(polyvertex_t *va,polyvertex_t *v1,polyvertex_t *v2) static INT32 numsplitpoly; -static void SearchSegInBSP(INT32 bspnum,polyvertex_t *p,poly_t *poly) +static void SearchSegInBSP(INT32 bspnum, polyvertex_t *p, poly_t *poly) { poly_t *q; - INT32 j,k; + INT32 j, k; if (bspnum & NF_SUBSECTOR) { @@ -772,12 +819,12 @@ static void SearchSegInBSP(INT32 bspnum,polyvertex_t *p,poly_t *poly) if (k == numpts) k = 0; - if (!SameVertice(p, &q->pts[j]) - && !SameVertice(p, &q->pts[k]) - && PointInSeg(p, &q->pts[j], &q->pts[k])) + if (!SameVertex(p, &q->pts[j]) && + !SameVertex(p, &q->pts[k]) && + PointInSeg(p, &q->pts[j], &q->pts[k])) { - poly_t *newpoly = HWR_AllocPoly(numpts+1); INT32 n; + poly_t *newpoly = HWR_AllocPoly(numpts+1); for (n = 0; n <= j; n++) newpoly->pts[n] = q->pts[n]; @@ -798,16 +845,17 @@ static void SearchSegInBSP(INT32 bspnum,polyvertex_t *p,poly_t *poly) return; } - if ((FIXED_TO_FLOAT(nodes[bspnum].bbox[0][BOXBOTTOM])-MAXDIST <= p->y) && - (FIXED_TO_FLOAT(nodes[bspnum].bbox[0][BOXTOP ])+MAXDIST >= p->y) && - (FIXED_TO_FLOAT(nodes[bspnum].bbox[0][BOXLEFT ])-MAXDIST <= p->x) && - (FIXED_TO_FLOAT(nodes[bspnum].bbox[0][BOXRIGHT ])+MAXDIST >= p->x)) + // Not a subsector, visit left and right children. + if ((FixedToFloat(nodes[bspnum].bbox[0][BOXBOTTOM])-MAXDIST <= p->y) && + (FixedToFloat(nodes[bspnum].bbox[0][BOXTOP ])+MAXDIST >= p->y) && + (FixedToFloat(nodes[bspnum].bbox[0][BOXLEFT ])-MAXDIST <= p->x) && + (FixedToFloat(nodes[bspnum].bbox[0][BOXRIGHT ])+MAXDIST >= p->x)) SearchSegInBSP(nodes[bspnum].children[0], p, poly); - if ((FIXED_TO_FLOAT(nodes[bspnum].bbox[1][BOXBOTTOM])-MAXDIST <= p->y) && - (FIXED_TO_FLOAT(nodes[bspnum].bbox[1][BOXTOP ])+MAXDIST >= p->y) && - (FIXED_TO_FLOAT(nodes[bspnum].bbox[1][BOXLEFT ])-MAXDIST <= p->x) && - (FIXED_TO_FLOAT(nodes[bspnum].bbox[1][BOXRIGHT ])+MAXDIST >= p->x)) + if ((FixedToFloat(nodes[bspnum].bbox[1][BOXBOTTOM])-MAXDIST <= p->y) && + (FixedToFloat(nodes[bspnum].bbox[1][BOXTOP ])+MAXDIST >= p->y) && + (FixedToFloat(nodes[bspnum].bbox[1][BOXLEFT ])-MAXDIST <= p->x) && + (FixedToFloat(nodes[bspnum].bbox[1][BOXRIGHT ])+MAXDIST >= p->x)) SearchSegInBSP(nodes[bspnum].children[1], p, poly); } @@ -816,38 +864,43 @@ static void SearchSegInBSP(INT32 bspnum,polyvertex_t *p,poly_t *poly) // but we must use a different structure : polygone pointing on segs // segs pointing on polygone and on vertex (too mush complicated, well not // realy but i am soo lasy), the methode discibed is also better for segs presition -static INT32 SolveTProblem(void) +static void SolveTProblem(void) { poly_t *p; - INT32 i; - size_t l; + INT32 i, numpts; + size_t ssnum; - if (cv_glsolvetjoin.value == 0) - return 0; + if (!cv_glsolvetjoin.value) + return; CONS_Debug(DBG_RENDER, "Solving T-joins. This may take a while. Please wait...\n"); +#ifdef HWR_LOADING_SCREEN + CON_Drawer(); //let the user know what we are doing + I_FinishUpdate(); // page flip or blit buffer +#endif + numsplitpoly = 0; - for (l = 0; l < addsubsector; l++) + for (ssnum = 0; ssnum < num_extra_subsector; ssnum++) { - p = extrasubsectors[l].planepoly; + p = extrasubsectors[ssnum].planepoly; - if (!p) + if (!p || p->numpts == 0) continue; - for (i = 0; i < p->numpts; i++) + numpts = p->numpts; + + for (i = 0; i < numpts; i++) SearchSegInBSP((INT32)numnodes-1, &p->pts[i], p); } #ifdef DEBUG_HWBSP CONS_Debug(DBG_RENDER, "numsplitpoly %d\n", numsplitpoly); + CONS_Debug(DBG_RENDER, "%d point divides a polygon line\n", numsplitpoly); #endif - - return numsplitpoly; } - // call this routine after the BSP of a Doom wad file is loaded, // and it will generate all the convex polys for the hardware renderer void HWR_CreatePlanePolygons(INT32 bspnum) @@ -865,7 +918,7 @@ void HWR_CreatePlanePolygons(INT32 bspnum) #endif // reset the portal and horizonline flag - gl_maphasportals = gl_maphashorizonlines = 0; + gl_maphasportals = gl_maphashorizonlines = false; // find min/max boundaries of map #ifdef DEBUG_HWBSP @@ -882,39 +935,35 @@ void HWR_CreatePlanePolygons(INT32 bspnum) HWR_FreeExtraSubsectors(); // allocate extra data for each subsector present in map - totsubsectors = numsubsectors + NEWSUBSECTORS; - extrasubsectors = calloc(totsubsectors, sizeof(*extrasubsectors)); + num_alloc_extra_subsector = numsubsectors + NUM_EXTRA_SUBSECTORS; + extrasubsectors = (extrasubsector_t*)calloc(num_alloc_extra_subsector, sizeof(*extrasubsectors)); if (UNLIKELY(!extrasubsectors)) - I_Error("couldn't malloc extrasubsectors totsubsectors %s\n", sizeu1(totsubsectors)); + I_Error("couldn't malloc extrasubsectors num_alloc_extra_subsector %s\n", sizeu1(num_alloc_extra_subsector)); // number of the first new subsector that might be added - addsubsector = numsubsectors; + num_extra_subsector = numsubsectors; // construct the initial convex poly that encloses the full map rootp = HWR_AllocPoly(4); rootpv = rootp->pts; - rootpv->x = FIXED_TO_FLOAT(rootbbox[BOXLEFT ]); - rootpv->y = FIXED_TO_FLOAT(rootbbox[BOXBOTTOM]); //lr + // clockwise polygon + rootpv->x = FixedToFloat(rootbbox[BOXLEFT ]); + rootpv->y = FixedToFloat(rootbbox[BOXBOTTOM]); //lr rootpv++; - rootpv->x = FIXED_TO_FLOAT(rootbbox[BOXLEFT ]); - rootpv->y = FIXED_TO_FLOAT(rootbbox[BOXTOP ]); //ur + rootpv->x = FixedToFloat(rootbbox[BOXLEFT ]); + rootpv->y = FixedToFloat(rootbbox[BOXTOP ]); //ur rootpv++; - rootpv->x = FIXED_TO_FLOAT(rootbbox[BOXRIGHT ]); - rootpv->y = FIXED_TO_FLOAT(rootbbox[BOXTOP ]); //ul + rootpv->x = FixedToFloat(rootbbox[BOXRIGHT ]); + rootpv->y = FixedToFloat(rootbbox[BOXTOP ]); //ul rootpv++; - rootpv->x = FIXED_TO_FLOAT(rootbbox[BOXRIGHT ]); - rootpv->y = FIXED_TO_FLOAT(rootbbox[BOXBOTTOM]); //ll + rootpv->x = FixedToFloat(rootbbox[BOXRIGHT ]); + rootpv->y = FixedToFloat(rootbbox[BOXBOTTOM]); //ll rootpv++; WalkBSPNode(bspnum, rootp, NULL, rootbbox); -#ifdef DEBUG_HWBSP - i = SolveTProblem(); - CONS_Debug(DBG_RENDER, "%d point divides a polygon line\n",i); -#else SolveTProblem(); -#endif #ifdef DEBUG_HWBSP //debug debug.. diff --git a/src/hardware/hw_cache.c b/src/hardware/hw_cache.c index f7cfceecb..c4cd7d383 100644 --- a/src/hardware/hw_cache.c +++ b/src/hardware/hw_cache.c @@ -446,7 +446,7 @@ typedef struct } GLMapTextureSet_t; // idk i suck at naming things static size_t gl_numtextures = 0; // Texture count -static GLMapTextureSet_t *gl_textures; // For all textures +static GLMapTextureSet_t *gl_textures = NULL; // For all textures static void HWR_FreeTextureData(patch_t *patch) { @@ -570,7 +570,8 @@ void HWR_ClearAllTextures(void) /*static void HWR_FreeColormapCache(void) { HWR_FreePatchCache(false); -}*/ +} +*/ void HWR_InitMapTextures(void) { @@ -622,10 +623,12 @@ static void HWR_PrecacheLevelFlats(void) { // lookup for flats that may´ve been already loaded flatcheck flatpresent; - flatcheck_init(&flatpresent); size_t i, j; INT32 k; + flatcheck_init(&flatpresent); + flatcheck_reserve(&flatpresent, numlevelflats); + // special case for encore #ifdef GLENCORE if (encoremap) @@ -726,7 +729,7 @@ static void HWR_PrecacheLevelTextures(void) for (j = 0; j < 2; j++) { // check if single-sided linedef - if (line->sidenum[j] == 0xffff) + if (line->sidenum[j] == NO_INDEX) continue; const side_t *side = &sides[line->sidenum[j]]; @@ -989,18 +992,18 @@ static void HWR_CacheFlat(GLMipmap_t *glMipmap, lumpnum_t flatlumpnum) flat[steppy] = glMipmap->colormap->source[flat[steppy]]; } -#endif if (haschromakey) { const char *flatname = W_CheckNameForNum(flatlumpnum); // hack for gba rainbow roads cyan floors - if (UNLIKELY(memcmp(flatname, "GBA_RRF5", 8) == 0 && flatname[8] == 0)) + if (UNLIKELY(flatname && memcmp(flatname, "GBA_RRF5", 8) == 0 && flatname[8] == 0)) { glMipmap->flags &= ~TF_CHROMAKEYED; } } +#endif } // Download a Doom 'flat' to the hardware cache and make it ready for use @@ -1127,7 +1130,9 @@ void HWR_GetMappedPatch(patch_t *patch, const UINT8 *colormap) HWR_UpdatePatchMipmap(patch, glMipmap); } else + { HWR_LoadPatchMipmap(patch, glMipmap); + } return; } diff --git a/src/hardware/hw_defs.h b/src/hardware/hw_defs.h index 6a8649099..ed4bff5a2 100644 --- a/src/hardware/hw_defs.h +++ b/src/hardware/hw_defs.h @@ -96,7 +96,6 @@ typedef struct typedef struct { float x, y, z; - fixed_t x2, y2, z2; } polyvertex_t; // a convex 'plane' polygon, clockwise order diff --git a/src/hardware/hw_glob.h b/src/hardware/hw_glob.h index fa8993b4c..0fd28dd4d 100644 --- a/src/hardware/hw_glob.h +++ b/src/hardware/hw_glob.h @@ -54,7 +54,7 @@ void HWR_ObjectLightLevelPost(gl_vissprite_t *spr, const sector_t *sector, INT32 // -------- extern extrasubsector_t *extrasubsectors; #ifdef PARANOIA -extern size_t addsubsector; +extern size_t num_extra_subsector; #endif void HWR_FreeExtraSubsectors(void); diff --git a/src/hardware/hw_main.cpp b/src/hardware/hw_main.cpp index d451ccc29..baa4461e4 100644 --- a/src/hardware/hw_main.cpp +++ b/src/hardware/hw_main.cpp @@ -84,11 +84,6 @@ float gl_viewsin = 0.0f, gl_viewcos = 0.0f; static float gl_viewludsin, gl_viewludcos; static angle_t gl_aimingangle; -static float yaw = 0.0f; -static float inv_yaw = 0.0f; -static float cos_inv_yaw = 0.0f; -static float sin_inv_yaw = 0.0f; - static constexpr float deg2radians = (M_PIf / 180.0f); seg_t *gl_curline = NULL; @@ -1001,8 +996,9 @@ static void HWR_SplitWall(sector_t *sector, FOutVector *wallVerts, INT32 texnum, const fixed_t v2y = FloatToFixed(wallVerts[1].z); const UINT8 alpha = Surf->PolyColor.s.alpha; - FUINT lightnum = HWR_CalcWallLight(sector->lightlevel, gl_curline, NULL); + FUINT lightnum = sector->lightlevel; extracolormap_t *colormap = NULL; + lightnum = HWR_CalcWallLight(lightnum, gl_curline, NULL); realtop = top = wallVerts[3].y; realbot = bot = wallVerts[0].y; @@ -1071,11 +1067,11 @@ static void HWR_SplitWall(sector_t *sector, FOutVector *wallVerts, INT32 texnum, else solid = false; - height = FixedToFloat(P_GetLightZAt(&list[i], v1x, v1y)); - endheight = FixedToFloat(P_GetLightZAt(&list[i], v2x, v2y)); - if (solid) { + height = FixedToFloat(P_GetLightZAt(&list[i], v1x, v1y)); + endheight = FixedToFloat(P_GetLightZAt(&list[i], v2x, v2y)); + bheight = FixedToFloat(P_GetFFloorBottomZAt(list[i].caster, v1x, v1y)); endbheight = FixedToFloat(P_GetFFloorBottomZAt(list[i].caster, v2x, v2y)); @@ -1105,8 +1101,8 @@ static void HWR_SplitWall(sector_t *sector, FOutVector *wallVerts, INT32 texnum, // Found a break // The heights are clamped to ensure the polygon doesn't cross itself. - bot = std::max(bheight, realbot); - endbot = std::max(endbheight, endrealbot); + bot = std::min(std::max(bheight, realbot), top); + endbot = std::min(std::max(endbheight, endrealbot), endtop); Surf->PolyColor.s.alpha = alpha; @@ -1167,7 +1163,6 @@ static void HWR_SplitWall(sector_t *sector, FOutVector *wallVerts, INT32 texnum, static FOutVector* skyWallVertexArray = NULL; static int skyWallVertexArraySize = 0; -static int skyWallVertexArrayAllocSize = 65536;// what a mouthful static boolean gl_collect_skywalls = false; @@ -1178,13 +1173,14 @@ static void HWR_SkyWallList_Clear(void) static void HWR_SkyWallList_Add(FOutVector *wallVerts) { + static int skyWallVertexArrayAllocSize = 65536; // what a mouthful + if (!skyWallVertexArray) { // array has not been allocated yet. allocate it now skyWallVertexArray = static_cast(Z_Malloc(sizeof(FOutVector) * 4 * skyWallVertexArrayAllocSize, PU_STATIC, NULL)); } - - if (skyWallVertexArraySize == skyWallVertexArrayAllocSize) + else if (skyWallVertexArraySize >= skyWallVertexArrayAllocSize) { // allocated array got full, allocate more space skyWallVertexArrayAllocSize *= 2; @@ -1222,7 +1218,7 @@ static void HWR_DrawSkyWall(FOutVector *wallVerts, FSurfaceInfo *Surf) wallVerts[0].s = wallVerts[3].s = 0; wallVerts[2].s = wallVerts[1].s = 0; - if (UNLIKELY(gl_collect_skywalls)) + if (gl_collect_skywalls) { HWR_SkyWallList_Add(wallVerts); } @@ -1231,6 +1227,7 @@ static void HWR_DrawSkyWall(FOutVector *wallVerts, FSurfaceInfo *Surf) HWR_SetCurrentTexture(NULL); HWR_ProjectWall(wallVerts, Surf, PF_Invisible|PF_NoTexture|PF_Skydecal, 255, NULL); } + // PF_Invisible so it's not drawn into the colour buffer // PF_NoTexture for no texture // PF_Occlude is set in HWR_ProjectWall to draw into the depth buffer @@ -1402,11 +1399,12 @@ void HWR_ProcessSeg(void) // Sort of like GLWall::Process in GZDoom // Sky Ceilings wallVerts[3].y = wallVerts[2].y = FLOATMAX; - auto draw_sky_walls = [&](int vert1, int vert2, fixed_t world, fixed_t worldslope) + auto draw_sky_walls = [] + (int vert1, int vert2, fixed_t world, fixed_t worldslope, auto& wwallVerts, auto& sSurf) FUNCINLINE { - wallVerts[vert1].y = FixedToFloat(world); - wallVerts[vert2].y = FixedToFloat(worldslope); - HWR_DrawSkyWall(wallVerts, &Surf); + wwallVerts[vert1].y = FixedToFloat(world); + wwallVerts[vert2].y = FixedToFloat(worldslope); + HWR_DrawSkyWall(wwallVerts, &sSurf); }; if (gl_frontsector->ceilingpic == skyflatnum) @@ -1419,7 +1417,7 @@ void HWR_ProcessSeg(void) // Sort of like GLWall::Process in GZDoom && (worldhigh != worldtop || worldhighslope != worldtopslope)) // Removing the second line above will render more rarely visible skywalls. Example: Cave garden ceiling in Dark race { - draw_sky_walls(0, 1, worldhigh, worldhighslope); + draw_sky_walls(0, 1, worldhigh, worldhighslope, wallVerts, Surf); } // hack to allow height changes in outdoor areas @@ -1430,13 +1428,13 @@ void HWR_ProcessSeg(void) // Sort of like GLWall::Process in GZDoom else { // Only the frontsector is sky, just draw a skywall from the front ceiling - draw_sky_walls(0, 1, worldtop, worldtopslope); + draw_sky_walls(0, 1, worldtop, worldtopslope, wallVerts, Surf); } } else if (gl_backsector->ceilingpic == skyflatnum) { // Only the backsector is sky, just draw a skywall from the front ceiling - draw_sky_walls(0, 1, worldtop, worldtopslope); + draw_sky_walls(0, 1, worldtop, worldtopslope, wallVerts, Surf); } // Sky Floors @@ -1454,19 +1452,19 @@ void HWR_ProcessSeg(void) // Sort of like GLWall::Process in GZDoom // Removing the second line above will render more rarely visible skywalls. Example: Cave garden ceiling in Dark race && !(gl_sidedef->bottomtexture)) { - draw_sky_walls(3, 2, worldlow, worldlowslope); + draw_sky_walls(3, 2, worldlow, worldlowslope, wallVerts, Surf); } } else { // Only the backsector has sky, just draw a skywall from the back floor - draw_sky_walls(3, 2, worldbottom, worldbottomslope); + draw_sky_walls(3, 2, worldbottom, worldbottomslope, wallVerts, Surf); } } else if ((gl_backsector->floorpic == skyflatnum) && !(gl_sidedef->bottomtexture)) { // Only the backsector has sky, just draw a skywall from the back floor if there's no bottomtexture - draw_sky_walls(3, 2, worldlow, worldlowslope); + draw_sky_walls(3, 2, worldlow, worldlowslope, wallVerts, Surf); } } @@ -1854,6 +1852,7 @@ void HWR_ProcessSeg(void) // Sort of like GLWall::Process in GZDoom HWR_DrawSkyWall(wallVerts, &Surf); } + if (gl_frontsector->floorpic == skyflatnum) { wallVerts[3].y = FixedToFloat(worldbottom); @@ -1868,28 +1867,38 @@ void HWR_ProcessSeg(void) // Sort of like GLWall::Process in GZDoom //Hurdler: 3d-floors test if (!gl_drawing_stencil && gl_backsector && gl_frontsector->tag != gl_backsector->tag && (gl_backsector->ffloors || gl_frontsector->ffloors)) { - ffloor_t *rover; fixed_t highcut = 0, lowcut = 0; fixed_t lowcutslope = 0, highcutslope = 0; - // Used for height comparisons and etc across FOFs and slopes - fixed_t high1, highslope1, low1, lowslope1; - fixed_t high2, highslope2, low2, lowslope2; - - INT32 texnum; - lowcut = std::max(worldbottom, worldlow); highcut = std::min(worldtop, worldhigh); lowcutslope = std::max(worldbottomslope, worldlowslope); highcutslope = std::min(worldtopslope, worldhighslope); - if (gl_backsector->ffloors) + auto process_ffloors = [&](boolean backsec) FUNCINLINE { - for (rover = gl_backsector->ffloors; rover; rover = rover->next) + ffloor_t *rover; + INT32 texnum; + + // Used for height comparisons and etc across FOFs and slopes + fixed_t high1, highslope1, low1, lowslope1; + fixed_t high2, highslope2, low2, lowslope2; + + // i suck at naming stuff lul + sector_t* main_sector = backsec ? gl_backsector : gl_frontsector; + sector_t* other_sector = backsec ? gl_frontsector : gl_backsector; + + for (rover = main_sector->ffloors; rover; rover = rover->next) { const ffloortype_e roverflags = rover->flags; - if (!(roverflags & FF_EXISTS) || !(roverflags & FF_RENDERSIDES) || (roverflags & FF_INVERTSIDES)) + if (!(roverflags & FF_EXISTS) || !(roverflags & FF_RENDERSIDES)) + continue; + + if (backsec && (roverflags & FF_INVERTSIDES)) + continue; + + if (!backsec && !(roverflags & FF_ALLSIDES)) continue; SLOPEPARAMS(*rover->t_slope, high1, highslope1, *rover->topheight) @@ -1899,7 +1908,7 @@ void HWR_ProcessSeg(void) // Sort of like GLWall::Process in GZDoom continue; ffloor_t * r2; - for (r2 = gl_frontsector->ffloors; r2; r2 = r2->next) + for (r2 = other_sector->ffloors; r2; r2 = r2->next) { if (r2->master == rover->master) // Skip if same control line. break; @@ -1937,14 +1946,14 @@ void HWR_ProcessSeg(void) // Sort of like GLWall::Process in GZDoom if (r2) continue; - side_t *side = R_GetFFloorSide(gl_curline->linedef, rover, gl_backsector); + const side_t *side = R_GetFFloorSide(gl_curline->linedef, rover, main_sector); boolean do_texture_skew; boolean dont_peg_bottom; if (rover->master->flags & ML_TFERLINE) { - line_t *newline = R_GetFFloorLine(gl_curline->linedef, rover, gl_backsector); + const line_t *newline = R_GetFFloorLine(gl_curline->linedef, rover, main_sector); do_texture_skew = newline->flags & ML_DONTPEGTOP; dont_peg_bottom = newline->flags & ML_DONTPEGBOTTOM; } @@ -1967,6 +1976,7 @@ void HWR_ProcessSeg(void) // Sort of like GLWall::Process in GZDoom h = highcut; hS = highcutslope; } + if (l <= lowcut && lS <= lowcutslope) { l = lowcut; @@ -2036,13 +2046,12 @@ void HWR_ProcessSeg(void) // Sort of like GLWall::Process in GZDoom lightnum = rover->master->frontsector->lightlevel; colormap = rover->master->frontsector->extra_colormap; + lightnum = HWR_CalcWallLight(lightnum, gl_curline, colormap); Surf.PolyColor.s.alpha = HWR_FogBlockAlpha(lightnum, colormap); - lightnum = HWR_CalcWallLight(lightnum, gl_curline, colormap); - - if (gl_frontsector->numlights) - HWR_SplitWall(gl_frontsector, wallVerts, 0, false, &Surf, roverflags, rover, blendmode); + if (other_sector->numlights) + HWR_SplitWall(other_sector, wallVerts, 0, false, &Surf, roverflags, rover, blendmode); else HWR_AddTransparentWall(wallVerts, &Surf, 0, false, blendmode, true, lightnum, colormap); } @@ -2056,8 +2065,8 @@ void HWR_ProcessSeg(void) // Sort of like GLWall::Process in GZDoom Surf.PolyColor.s.alpha = CLAMP(rover->alpha, 0, 255); } - if (gl_frontsector->numlights) - HWR_SplitWall(gl_frontsector, wallVerts, texnum, noencore, &Surf, roverflags, rover, blendmode); + if (other_sector->numlights) + HWR_SplitWall(other_sector, wallVerts, texnum, noencore, &Surf, roverflags, rover, blendmode); else { if (blendmode != PF_Masked) @@ -2067,191 +2076,16 @@ void HWR_ProcessSeg(void) // Sort of like GLWall::Process in GZDoom } } } + }; + + if (gl_backsector->ffloors) + { + process_ffloors(true); } if (gl_frontsector->ffloors) // Putting this seperate should allow 2 FOF sectors to be connected without too many errors? I think? { - for (rover = gl_frontsector->ffloors; rover; rover = rover->next) - { - const ffloortype_e roverflags = rover->flags; - - if (!(roverflags & FF_EXISTS) || !(roverflags & FF_RENDERSIDES) || !(roverflags & FF_ALLSIDES)) - continue; - - SLOPEPARAMS(*rover->t_slope, high1, highslope1, *rover->topheight) - SLOPEPARAMS(*rover->b_slope, low1, lowslope1, *rover->bottomheight) - - if ((high1 < lowcut || highslope1 < lowcutslope) || (low1 > highcut || lowslope1 > highcutslope)) - continue; - - ffloor_t * r2; - for (r2 = gl_backsector->ffloors; r2; r2 = r2->next) - { - if (r2->master == rover->master) // Skip if same control line. - break; - - const ffloortype_e r2flags = r2->flags; - - if (!(r2flags & FF_EXISTS) || !(r2flags & FF_RENDERSIDES)) - continue; - - if (rover->flags & FF_EXTRA) - { - if (!(r2flags & FF_CUTEXTRA)) - continue; - - if (r2flags & FF_EXTRA && (r2flags & (FF_TRANSLUCENT|FF_FOG)) != (rover->flags & (FF_TRANSLUCENT|FF_FOG))) - continue; - } - else - { - if (!(r2flags & FF_CUTSOLIDS)) - continue; - } - - SLOPEPARAMS(*r2->t_slope, high2, highslope2, *r2->topheight) - SLOPEPARAMS(*r2->b_slope, low2, lowslope2, *r2->bottomheight) - - if ((high2 < lowcut || highslope2 < lowcutslope) || (low2 > highcut || lowslope2 > highcutslope)) - continue; - if ((high1 > high2 || highslope1 > highslope2) || (low1 < low2 || lowslope1 < lowslope2)) - continue; - - break; - } - if (r2) - continue; - - side_t *side = R_GetFFloorSide(gl_curline->linedef, rover, gl_backsector); - - boolean do_texture_skew; - boolean dont_peg_bottom; - - if (rover->master->flags & ML_TFERLINE) - { - line_t *newline = R_GetFFloorLine(gl_curline->linedef, rover, gl_backsector); - do_texture_skew = newline->flags & ML_DONTPEGTOP; - dont_peg_bottom = newline->flags & ML_DONTPEGBOTTOM; - } - else - { - do_texture_skew = rover->master->flags & ML_DONTPEGTOP; - dont_peg_bottom = gl_curline->linedef->flags & ML_DONTPEGBOTTOM; - } - - texnum = R_GetTextureNum(side->midtexture); - - h = P_GetFFloorTopZAt (rover, v1x, v1y); - hS = P_GetFFloorTopZAt (rover, v2x, v2y); - l = P_GetFFloorBottomZAt(rover, v1x, v1y); - lS = P_GetFFloorBottomZAt(rover, v2x, v2y); - - // Adjust the heights so the FOF does not overlap with top and bottom textures. - if (h >= highcut && hS >= highcutslope) - { - h = highcut; - hS = highcutslope; - } - if (l <= lowcut && lS <= lowcutslope) - { - l = lowcut; - lS = lowcutslope; - } - - //Hurdler: HW code starts here - //FIXME: check if peging is correct - // set top/bottom coords - - wallVerts[3].y = FixedToFloat(h); - wallVerts[2].y = FixedToFloat(hS); - wallVerts[0].y = FixedToFloat(l); - wallVerts[1].y = FixedToFloat(lS); - - if (roverflags & FF_FOG) - { - wallVerts[3].t = wallVerts[2].t = 0; - wallVerts[0].t = wallVerts[1].t = 0; - wallVerts[0].s = wallVerts[3].s = 0; - wallVerts[2].s = wallVerts[1].s = 0; - } - else - { - // Wow, how was this missing from OpenGL for so long? - // ...Oh well, anyway, Lower Unpegged now changes pegging of FOFs like in software - // -- Monster Iestyn 26/06/18 - fixed_t texturevpeg = side->rowoffset; - - glTex = HWR_GetTexture(texnum, noencore); - - if (!do_texture_skew) // no skewing - { - if (dont_peg_bottom) - texturevpeg -= (*rover->topheight - *rover->bottomheight); - - wallVerts[3].t = static_cast((*rover->topheight - h) + texturevpeg) * glTex->scaleY; - wallVerts[2].t = static_cast((*rover->topheight - hS) + texturevpeg) * glTex->scaleY; - wallVerts[0].t = static_cast((*rover->topheight - l) + texturevpeg) * glTex->scaleY; - wallVerts[1].t = static_cast((*rover->topheight - lS) + texturevpeg) * glTex->scaleY; - } - else - { - if (!dont_peg_bottom) // skew by top - { - wallVerts[3].t = wallVerts[2].t = (static_cast(texturevpeg) * glTex->scaleY); - wallVerts[0].t = static_cast((h - l) + texturevpeg) * glTex->scaleY; - wallVerts[1].t = static_cast((hS - lS) + texturevpeg) * glTex->scaleY; - } - else // skew by bottom - { - wallVerts[0].t = wallVerts[1].t = (static_cast(texturevpeg) * glTex->scaleY); - wallVerts[3].t = wallVerts[0].t - static_cast(h - l) * glTex->scaleY; - wallVerts[2].t = wallVerts[1].t - static_cast(hS - lS) * glTex->scaleY; - } - } - - wallVerts[0].s = wallVerts[3].s = cliplow * glTex->scaleX; - wallVerts[2].s = wallVerts[1].s = cliphigh * glTex->scaleX; - } - - FBITFIELD blendmode; - - if (roverflags & FF_FOG) - { - blendmode = PF_Fog|PF_NoTexture; - - lightnum = rover->master->frontsector->lightlevel; - colormap = rover->master->frontsector->extra_colormap; - - Surf.PolyColor.s.alpha = HWR_FogBlockAlpha(lightnum, colormap); - - lightnum = HWR_CalcWallLight(lightnum, gl_curline, colormap); - - if (gl_backsector->numlights) - HWR_SplitWall(gl_backsector, wallVerts, 0, false, &Surf, roverflags, rover, blendmode); - else - HWR_AddTransparentWall(wallVerts, &Surf, 0, false, blendmode, true, lightnum, colormap); - } - else - { - blendmode = PF_Masked; - - if ((roverflags & FF_TRANSLUCENT && rover->alpha < 256) || rover->blend) - { - blendmode = rover->blend ? HWR_GetBlendModeFlag(rover->blend) : static_cast(PF_Translucent); - Surf.PolyColor.s.alpha = CLAMP(rover->alpha, 0, 255); - } - - if (gl_backsector->numlights) - HWR_SplitWall(gl_backsector, wallVerts, texnum, noencore, &Surf, roverflags, rover, blendmode); - else - { - if (blendmode != PF_Masked) - HWR_AddTransparentWall(wallVerts, &Surf, texnum, noencore, blendmode, false, lightnum, colormap); - else - HWR_ProjectWall(wallVerts, &Surf, PF_Masked, lightnum, colormap); - } - } - } + process_ffloors(false); } } #undef SLOPEPARAMS @@ -2404,7 +2238,7 @@ static inline void DoAddLine(seg_t* line, angle_t angle1, angle_t angle2) // SoM: Backsector needs to be run through R_FakeFlat static sector_t tempsec; - auto do_addline = [&](bool dontdraw) + auto do_addline = [&](bool dontdraw) FUNCINLINE { // Single sided line? if (!line->backsector) @@ -2484,7 +2318,7 @@ static inline void DoAddLine(seg_t* line, angle_t angle1, angle_t angle2) } } else - return;// dont do anything with the other side i guess? + return; // dont do anything with the other side i guess? } doaddline: @@ -2820,19 +2654,20 @@ static void HWR_AddPolyObjectPlanes(void) for (i = 0; i < numpolys; i++) { - polyobjsector = po_ptrs[i]->lines[0]->backsector; // the in-level polyobject sector - if (!(po_ptrs[i]->flags & POF_RENDERPLANES)) // Only render planes when you should continue; if (po_ptrs[i]->translucency >= NUMTRANSMAPS) continue; + polyobjsector = po_ptrs[i]->lines[0]->backsector; // the in-level polyobject sector + if (polyobjsector->floorheight <= gl_frontsector->ceilingheight && polyobjsector->floorheight >= gl_frontsector->floorheight && (viewz < polyobjsector->floorheight)) { light = R_GetPlaneLight(gl_frontsector, polyobjsector->floorheight, true); + if (po_ptrs[i]->translucency > 0) { FSurfaceInfo Surf = {}; @@ -2855,6 +2690,7 @@ static void HWR_AddPolyObjectPlanes(void) && (viewz > polyobjsector->ceilingheight)) { light = R_GetPlaneLight(gl_frontsector, polyobjsector->ceilingheight, true); + if (po_ptrs[i]->translucency > 0) { FSurfaceInfo Surf = {}; @@ -2943,9 +2779,9 @@ static void HWR_Subsector(size_t num) ffloor_t *rover; #ifdef PARANOIA // no risk while developing, enough debugging nights! - if (num >= addsubsector) + if (num >= num_extra_subsector) I_Error("HWR_Subsector: ss %s with numss = %s, addss = %s\n", - sizeu1(num), sizeu2(numsubsectors), sizeu3(addsubsector)); + sizeu1(num), sizeu2(numsubsectors), sizeu3(num_extra_subsector)); #endif if (num < numsubsectors) @@ -2988,21 +2824,21 @@ static void HWR_Subsector(size_t num) if (anyMoved == false) { - for (rover = gl_frontsector->ffloors; rover; rover = rover->next) + if (sub->validcount != validcount) { - if (!(rover->flags & FF_EXISTS) || !(rover->flags & FF_RENDERPLANES)) - continue; + for (rover = gl_frontsector->ffloors; rover; rover = rover->next) + { + if (!(rover->flags & FF_EXISTS) || !(rover->flags & FF_RENDERPLANES)) + continue; - if (sub->validcount == validcount) - continue; + const sector_t *controlSec = §ors[rover->secnum]; - const sector_t *controlSec = §ors[rover->secnum]; + if (controlSec->moved != true) + continue; - if (controlSec->moved != true) - continue; - - anyMoved = true; - break; + anyMoved = true; + break; + } } } @@ -3059,120 +2895,103 @@ static void HWR_Subsector(size_t num) PF_Occlude, ceilinglightlevel, levelflats[gl_frontsector->ceilingpic].lumpnum, NULL, 255, ceilingcolormap); } } - } - if (gl_frontsector->ffloors) - { - /// \todo fix light, xoffs, yoffs, extracolormap ? - for (rover = gl_frontsector->ffloors; rover; rover = rover->next) + if (gl_frontsector->ffloors) { - fixed_t bottomCullHeight, topCullHeight, centerHeight; - - if (!(rover->flags & FF_EXISTS) || !(rover->flags & FF_RENDERPLANES) || !(rover->flags & FF_RENDERALL)) - continue; - - if (sub->validcount == validcount) - continue; - - // rendering heights for bottom and top planes - // yes there were functions for this stuff, no idea why it wasnt used but bleh - bottomCullHeight = P_GetFFloorBottomZAt(rover, viewx, viewy); - topCullHeight = P_GetFFloorTopZAt(rover, viewx, viewy); - - if (gl_frontsector->cullheight) + /// \todo fix light, xoffs, yoffs, extracolormap ? + for (rover = gl_frontsector->ffloors; rover; rover = rover->next) { - if (HWR_DoCulling(gl_frontsector->cullheight, viewsector->cullheight, gl_viewz, FixedToFloat(*rover->bottomheight), FixedToFloat(*rover->topheight))) + fixed_t bottomCullHeight, topCullHeight, centerHeight; + + if (!(rover->flags & FF_EXISTS) || !(rover->flags & FF_RENDERPLANES) || !(rover->flags & FF_RENDERALL)) continue; - } - // bottom plane - centerHeight = P_GetFFloorBottomZAt(rover, gl_frontsector->soundorg.x, gl_frontsector->soundorg.y); - - if (centerHeight <= locCeilingHeight && centerHeight >= locFloorHeight && - ((viewz < bottomCullHeight && !(rover->flags & FF_INVERTPLANES)) || - (viewz > bottomCullHeight && (rover->flags & FF_BOTHPLANES || rover->flags & FF_INVERTPLANES)))) - { - if (rover->flags & FF_FOG) + if (gl_frontsector->cullheight) { - UINT8 alpha; - - light = R_GetPlaneLight(gl_frontsector, centerHeight, (viewz < bottomCullHeight)); - - alpha = HWR_FogBlockAlpha(*gl_frontsector->lightlist[light].lightlevel, rover->master->frontsector->extra_colormap); - - HWR_AddTransparentFloor(0, - &extrasubsectors[num], - false, - *rover->bottomheight, - *gl_frontsector->lightlist[light].lightlevel, - alpha, rover->master->frontsector, PF_Fog|PF_NoTexture, - true, rover->master->frontsector->extra_colormap); + if (HWR_DoCulling(gl_frontsector->cullheight, viewsector->cullheight, gl_viewz, FixedToFloat(*rover->bottomheight), FixedToFloat(*rover->topheight))) + continue; } - else if ((rover->flags & FF_TRANSLUCENT && rover->alpha < 256) || rover->blend) // SoM: Flags are more efficient - { - light = R_GetPlaneLight(gl_frontsector, centerHeight, (viewz < bottomCullHeight)); - HWR_AddTransparentFloor(levelflats[*rover->bottompic].lumpnum, - &extrasubsectors[num], - false, - *rover->bottomheight, - *gl_frontsector->lightlist[light].lightlevel, - CLAMP(rover->alpha, 0 ,255), rover->master->frontsector, HWR_RippleBlend(gl_frontsector, rover, false) | (rover->blend ? HWR_GetBlendModeFlag(rover->blend) : static_cast(PF_Translucent)), - false, gl_frontsector->lightlist[light].extra_colormap); + auto render_fof_plane = [&](boolean bottom, boolean underside) FUNCINLINE + { + fixed_t roverheight; + lumpnum_t flatlump; + + if (bottom) + { + roverheight = *rover->bottomheight; + flatlump = levelflats[*rover->bottompic].lumpnum; + } + else + { + roverheight = *rover->topheight; + flatlump = levelflats[*rover->toppic].lumpnum; + } + + if (rover->flags & FF_FOG) + { + UINT8 alpha; + + light = R_GetPlaneLight(gl_frontsector, centerHeight, underside); + + alpha = HWR_FogBlockAlpha(*gl_frontsector->lightlist[light].lightlevel, rover->master->frontsector->extra_colormap); + + HWR_AddTransparentFloor(0, + &extrasubsectors[num], + !bottom, + roverheight, + *gl_frontsector->lightlist[light].lightlevel, + alpha, rover->master->frontsector, PF_Fog|PF_NoTexture, + true, rover->master->frontsector->extra_colormap); + } + else if ((rover->flags & FF_TRANSLUCENT && rover->alpha < 256) || rover->blend) // SoM: Flags are more efficient + { + light = R_GetPlaneLight(gl_frontsector, centerHeight, underside); + + HWR_AddTransparentFloor(flatlump, + &extrasubsectors[num], + !bottom, + roverheight, + *gl_frontsector->lightlist[light].lightlevel, + CLAMP(rover->alpha, 0, 255), rover->master->frontsector, HWR_RippleBlend(gl_frontsector, rover, false) | (rover->blend ? HWR_GetBlendModeFlag(rover->blend) : static_cast(PF_Translucent)), + false, gl_frontsector->lightlist[light].extra_colormap); + } + else + { + HWR_GetFlat(flatlump, R_NoEncore(gl_frontsector, !bottom)); + light = R_GetPlaneLight(gl_frontsector, centerHeight, underside); + + HWR_RenderPlane(sub, &extrasubsectors[num], !bottom, roverheight, HWR_RippleBlend(gl_frontsector, rover, false)|PF_Occlude, *gl_frontsector->lightlist[light].lightlevel, flatlump, + rover->master->frontsector, 255, gl_frontsector->lightlist[light].extra_colormap); + } + }; + + // bottom plane + centerHeight = P_GetFFloorBottomZAt(rover, gl_frontsector->soundorg.x, gl_frontsector->soundorg.y); + + if (centerHeight <= locCeilingHeight && centerHeight >= locFloorHeight) + { + bottomCullHeight = P_GetFFloorBottomZAt(rover, viewx, viewy); + + if ((viewz < bottomCullHeight && !(rover->flags & FF_INVERTPLANES)) || + (viewz > bottomCullHeight && (rover->flags & FF_BOTHPLANES || rover->flags & FF_INVERTPLANES))) + { + render_fof_plane(true, (viewz < bottomCullHeight)); + } } - else + + // top plane + centerHeight = P_GetFFloorTopZAt(rover, gl_frontsector->soundorg.x, gl_frontsector->soundorg.y); + + if (centerHeight >= locFloorHeight && centerHeight <= locCeilingHeight) { - HWR_GetFlat(levelflats[*rover->bottompic].lumpnum, R_NoEncore(gl_frontsector, false)); - light = R_GetPlaneLight(gl_frontsector, centerHeight, (viewz < bottomCullHeight)); + topCullHeight = P_GetFFloorTopZAt(rover, viewx, viewy); - HWR_RenderPlane(sub, &extrasubsectors[num], false, *rover->bottomheight, HWR_RippleBlend(gl_frontsector, rover, false)|PF_Occlude, *gl_frontsector->lightlist[light].lightlevel, levelflats[*rover->bottompic].lumpnum, - rover->master->frontsector, 255, gl_frontsector->lightlist[light].extra_colormap); - } - } - - // top plane - centerHeight = P_GetFFloorTopZAt(rover, gl_frontsector->soundorg.x, gl_frontsector->soundorg.y); - - if (centerHeight >= locFloorHeight && - centerHeight <= locCeilingHeight && - ((viewz > topCullHeight && !(rover->flags & FF_INVERTPLANES)) || - (viewz < topCullHeight && (rover->flags & FF_BOTHPLANES || rover->flags & FF_INVERTPLANES)))) - { - if (rover->flags & FF_FOG) - { - UINT8 alpha; - - light = R_GetPlaneLight(gl_frontsector, centerHeight, (viewz < topCullHeight)); - - alpha = HWR_FogBlockAlpha(*gl_frontsector->lightlist[light].lightlevel, rover->master->frontsector->extra_colormap); - - HWR_AddTransparentFloor(0, - &extrasubsectors[num], - true, - *rover->topheight, - *gl_frontsector->lightlist[light].lightlevel, - alpha, rover->master->frontsector, PF_Fog|PF_NoTexture, - true, rover->master->frontsector->extra_colormap); - } - else if ((rover->flags & FF_TRANSLUCENT && rover->alpha < 256) || rover->blend) - { - light = R_GetPlaneLight(gl_frontsector, centerHeight, (viewz < topCullHeight)); - - HWR_AddTransparentFloor(levelflats[*rover->toppic].lumpnum, - &extrasubsectors[num], - true, - *rover->topheight, - *gl_frontsector->lightlist[light].lightlevel, - CLAMP(rover->alpha, 0 ,255), rover->master->frontsector, HWR_RippleBlend(gl_frontsector, rover, false) | (rover->blend ? HWR_GetBlendModeFlag(rover->blend) : static_cast(PF_Translucent)), - false, gl_frontsector->lightlist[light].extra_colormap); - } - else - { - HWR_GetFlat(levelflats[*rover->toppic].lumpnum, R_NoEncore(gl_frontsector, true)); - light = R_GetPlaneLight(gl_frontsector, centerHeight, (viewz < topCullHeight)); - - HWR_RenderPlane(sub, &extrasubsectors[num], true, *rover->topheight, HWR_RippleBlend(gl_frontsector, rover, false)|PF_Occlude, *gl_frontsector->lightlist[light].lightlevel, levelflats[*rover->toppic].lumpnum, - rover->master->frontsector, 255, gl_frontsector->lightlist[light].extra_colormap); + if ((viewz > topCullHeight && !(rover->flags & FF_INVERTPLANES)) || + (viewz < topCullHeight && (rover->flags & FF_BOTHPLANES || rover->flags & FF_INVERTPLANES))) + { + render_fof_plane(false, (viewz < topCullHeight)); + } } } } @@ -3416,6 +3235,18 @@ static void HWR_DrawSpriteShadow(gl_vissprite_t *spr, patch_t *gpatch, GLPatch_t if (!spr->mobj) return; + // Ceiling scenery have no shadow. + if ((spr->mobj->flags & (MF_SCENERY|MF_SPAWNCEILING|MF_NOGRAVITY)) == (MF_SCENERY|MF_SPAWNCEILING|MF_NOGRAVITY)) + return; + + // Debris have no corona or shadow. + if (spr->mobj->flags2 & MF2_DEBRIS) + return; + + // Without this, your shadow shows on the floor, even after you die and fall through the ground. + if (spr->mobj->z < spr->mobj->floorz) + return; + R_GetShadowZ(spr->mobj, &floorslope); mobjfloor = HWR_OpaqueFloorAtPos( @@ -3664,6 +3495,8 @@ static void HWR_SplitSprite(gl_vissprite_t *spr, const boolean papersprite) fixed_t v1x, v1y, v2x, v2y; INT32 shader = SHADER_NONE; + const boolean billboarding = (cv_glspritebillboarding.value && !cv_glshearing.value && !papersprite); + gpatch = spr->gpatch; // cache the patch in the graphics card memory @@ -3674,10 +3507,7 @@ static void HWR_SplitSprite(gl_vissprite_t *spr, const boolean papersprite) hwrpatch = static_cast(gpatch->hardware); // Draw shadow BEFORE sprite - if (UNLIKELY(cv_shadow.value // Shadows enabled - && (sprmo->flags & (MF_SCENERY|MF_SPAWNCEILING|MF_NOGRAVITY)) != (MF_SCENERY|MF_SPAWNCEILING|MF_NOGRAVITY) // Ceiling scenery have no shadow. - && !(sprmo->flags2 & MF2_DEBRIS) // Debris have no corona or shadow. - && (sprmo->z >= sprmo->floorz))) // Without this, your shadow shows on the floor, even after you die and fall through the ground. + if (UNLIKELY(cv_shadow.value)) { //////////////////// // SHADOW SPRITE! // @@ -3847,8 +3677,8 @@ static void HWR_SplitSprite(gl_vissprite_t *spr, const boolean papersprite) // Found a break // The heights are clamped to ensure the polygon doesn't cross itself. - bot = std::max(bheight, realbot); - endbot = std::max(endbheight, endrealbot); + bot = std::clamp(bheight, realbot, top); + endbot = std::clamp(endbheight, endrealbot, endtop); wallVerts[3].t = towtop + ((realtop - top) * towmult); wallVerts[2].t = towtop + ((endrealtop - endtop) * towmult); @@ -3861,7 +3691,7 @@ static void HWR_SplitSprite(gl_vissprite_t *spr, const boolean papersprite) wallVerts[1].y = endbot; // The x and y only need to be adjusted in the case that it's not a papersprite - if (cv_glspritebillboarding.value && !cv_glshearing.value && !papersprite) + if (billboarding) { // Get the x and z of the vertices so billboarding draws correctly realheight = realbot - realtop; @@ -3883,7 +3713,7 @@ static void HWR_SplitSprite(gl_vissprite_t *spr, const boolean papersprite) wallVerts[1].z = baseWallVerts[2].z + (baseWallVerts[2].z - baseWallVerts[1].z) * heightmult; } - HWR_Lighting(&Surf, lightlevel, colormap, P_SectorUsesDirectionalLighting(sector) && !(sprmo->frame & FF_FULLBRIGHT)); + HWR_Lighting(&Surf, lightlevel, colormap, P_SectorUsesDirectionalLighting(sector) && !R_ThingIsFullBright(sprmo)); Surf.PolyColor.s.alpha = alpha; @@ -3937,7 +3767,7 @@ static void HWR_DrawSprite(gl_vissprite_t *spr) if (!sprmo->subsector) return; - const boolean papersprite = (sprmo->frame & FF_PAPERSPRITE); + const boolean papersprite = R_ThingIsPaperSprite(sprmo); const sector_t *sector = sprmo->subsector->sector; if (sector->numlights) @@ -4003,10 +3833,7 @@ static void HWR_DrawSprite(gl_vissprite_t *spr) } // Draw shadow BEFORE sprite - if (UNLIKELY(cv_shadow.value // Shadows enabled - && (sprmo->flags & (MF_SCENERY|MF_SPAWNCEILING|MF_NOGRAVITY)) != (MF_SCENERY|MF_SPAWNCEILING|MF_NOGRAVITY) // Ceiling scenery have no shadow. - && !(sprmo->flags2 & MF2_DEBRIS) // Debris have no corona or shadow. - && (sprmo->z >= sprmo->floorz))) // Without this, your shadow shows on the floor, even after you die and fall through the ground. + if (UNLIKELY(cv_shadow.value)) { //////////////////// // SHADOW SPRITE! // @@ -4096,7 +3923,7 @@ static void HWR_DrawPrecipitationSprite(gl_vissprite_t *spr) INT32 shader = SHADER_NONE; - const precipmobj_t *sprmo = spr->precip; + precipmobj_t *sprmo = spr->precip; if (!sprmo->subsector) return; @@ -4142,11 +3969,10 @@ static void HWR_DrawPrecipitationSprite(gl_vissprite_t *spr) if (sector->numlights) { - INT32 light; + // Always use the light at the top instead of whatever I was doing before + INT32 light = R_GetPlaneLight(sector, sprmo->z, false); // sprmo->z + sprmo->height - light = R_GetPlaneLight(sector, sprmo->z, false); // Always use the light at the top instead of whatever I was doing before - - if (!(sprmo->frame & FF_FULLBRIGHT)) + if (!R_PrecipThingIsFullBright(sprmo)) lightlevel = static_cast(*sector->lightlist[light].lightlevel); if (sector->lightlist[light].extra_colormap) @@ -4154,7 +3980,7 @@ static void HWR_DrawPrecipitationSprite(gl_vissprite_t *spr) } else { - if (!(sprmo->frame & FF_FULLBRIGHT)) + if (!R_PrecipThingIsFullBright(sprmo)) lightlevel = static_cast(sector->lightlevel); if (sector->extra_colormap) @@ -4325,7 +4151,7 @@ static void HWR_AddTransparentWall(FOutVector *wallVerts, FSurfaceInfo *pSurf, I wallinfo_t *wallinfo = static_cast(HWR_CreateDrawNode(DRAWNODE_WALL)); memcpy(wallinfo->wallVerts, wallVerts, sizeof (wallinfo->wallVerts)); - memcpy(&wallinfo->Surf, pSurf, sizeof (FSurfaceInfo)); + memcpy(&wallinfo->Surf, pSurf, sizeof(FSurfaceInfo)); wallinfo->texnum = texnum; wallinfo->noencore = noencore; wallinfo->blend = blend; @@ -4457,7 +4283,7 @@ static void HWR_RenderDrawNodes(void) gl_frontsector = NULL; if (!(plane->blend & PF_NoTexture)) - HWR_GetFlat(plane->lumpnum, R_NoEncore(plane->FOFSector, plane->isceiling)); + HWR_GetFlat(plane->lumpnum, R_NoEncore(plane->FOFSector, plane->isceiling)); HWR_RenderPlane(NULL, plane->xsub, plane->isceiling, plane->fixedheight, plane->blend, plane->lightlevel, plane->lumpnum, plane->FOFSector, plane->alpha, plane->planecolormap); @@ -4471,10 +4297,10 @@ static void HWR_RenderDrawNodes(void) gl_frontsector = NULL; if (!(polyplane->blend & PF_NoTexture)) - HWR_GetFlat(polyplane->lumpnum, R_NoEncore(polyplane->FOFSector, polyplane->isceiling)); + HWR_GetFlat(polyplane->lumpnum, R_NoEncore(polyplane->FOFSector, polyplane->isceiling)); HWR_RenderPolyObjectPlane(polyplane->polysector, polyplane->isceiling, polyplane->fixedheight, polyplane->blend, polyplane->lightlevel, - polyplane->lumpnum, polyplane->FOFSector, polyplane->alpha, polyplane->planecolormap); + polyplane->lumpnum, polyplane->FOFSector, polyplane->alpha, polyplane->planecolormap); } break; @@ -4486,7 +4312,7 @@ static void HWR_RenderDrawNodes(void) HWR_GetTexture(wall->texnum, wall->noencore); HWR_RenderWall(wall->wallVerts, &wall->Surf, wall->blend, wall->fogwall, - wall->lightlevel, wall->wallcolormap); + wall->lightlevel, wall->wallcolormap); } break; default: @@ -4738,7 +4564,7 @@ static void HWR_ProjectSprite(mobj_t *thing) return; } - const boolean papersprite = (thing->frame & FF_PAPERSPRITE); + const boolean papersprite = R_ThingIsPaperSprite(thing); // transform the origin point tr_x = FixedToFloat(interp.x); @@ -4752,8 +4578,8 @@ static void HWR_ProjectSprite(mobj_t *thing) return; const boolean mirrored = thing->mirrored; - const boolean vflip = (thing->eflags & MFE_VERTICALFLIP); - const boolean hflip = (!(thing->frame & FF_HORIZONTALFLIP) != !mirrored); + const boolean vflip = R_ThingVerticallyFlipped(thing); + const boolean hflip = (!R_ThingHorizontallyFlipped(thing) != !mirrored); // decide which patch to use for sprite relative to player #ifdef RANGECHECK @@ -4806,7 +4632,7 @@ static void HWR_ProjectSprite(mobj_t *thing) #ifdef ROTSPRITE // determine here if sprite should rotate for optimization const boolean sliprollrotate = (cv_sliptideroll.value && (thing->player && thing->player->sliproll)); - const boolean shouldrotate = (interp.sloperoll || interp.slopepitch || interp.roll || interp.pitch || thing->rollangle || sliprollrotate); + const boolean shouldrotate = (interp.sloperoll || interp.slopepitch || interp.roll || interp.pitch || thing->rollangle || thing->temprollangle || sliprollrotate); #endif if (sprframe->rotate != SRF_SINGLE || papersprite @@ -4864,7 +4690,7 @@ static void HWR_ProjectSprite(mobj_t *thing) // this is very messy, but it on-the-fly calculates rotations for all the // pitch and roll variables pitchnroll = R_RotationAngle(ang, camang, &interp); - rollangle = thing->rollangle; + rollangle = (thing->rollangle - thing->temprollangle); if (rollangle || pitchnroll || sliprollrotate) { @@ -4940,9 +4766,9 @@ static void HWR_ProjectSprite(mobj_t *thing) // if the sprite is out of our view, dont need to draw it X) if (!gld_SphereInFrustum( - (FixedToFloat(interp.x)) + cos_inv_yaw * (x1 + x2) / 2.0f, + (FixedToFloat(interp.x)) + gl_viewsin * (x1 + x2) / 2.0f, FixedToFloat(interp.z) + (y1 + y2) / 2.0f, - FixedToFloat(interp.y) - sin_inv_yaw * (x1 + x2) / 2.0f, + FixedToFloat(interp.y) - (-gl_viewcos) * (x1 + x2) / 2.0f, //1.5 == sqrt(2) + small delta for MF_FOREGROUND std::max(FixedToFloat(spr_width) * spritexscale, FixedToFloat(spr_height) * spriteyscale) / 2.0f * 1.5f)) @@ -5160,9 +4986,9 @@ static void HWR_ProjectPrecipitationSprite(precipmobj_t *thing) y2 *= thing_scale; if (!gld_SphereInFrustum( - (FixedToFloat(interp.x)) + cos_inv_yaw * (x1 + x2) / 2.0f, + (FixedToFloat(interp.x)) + gl_viewsin * (x1 + x2) / 2.0f, FixedToFloat(interp.z) + (y1 + y2) / 2.0f, - FixedToFloat(interp.y) - sin_inv_yaw * (x1 + x2) / 2.0f, + FixedToFloat(interp.y) - (-gl_viewcos) * (x1 + x2) / 2.0f, //1.5 == sqrt(2) + small delta for MF_FOREGROUND std::max(FixedToFloat(spr_width) * thing_scale, FixedToFloat(spr_height) * thing_scale) / 2.0f * 1.5f)) @@ -5292,24 +5118,22 @@ void HWR_BuildSkyDome(void) int c, r; signed char yflip; static constexpr int row_count = 4; - int col_count = 4; + static constexpr int col_count = (4 * 16); float delta; gl_sky_t *sky = &gl_sky; gl_skyvertex_t *vertex_p; const texture_t *texture = textures[texturetranslation[skytexture]]; - col_count *= 16; - if ((sky->columns != col_count) || (sky->rows != row_count)) HWR_ClearSkyDome(); sky->columns = col_count; sky->rows = row_count; - sky->vertex_count = 2 * sky->rows * (sky->columns * 2 + 2) + sky->columns * 2; + sky->vertex_count = 2 * row_count * (col_count * 2 + 2) + col_count * 2; if (!sky->loops) - sky->loops = static_cast(malloc((sky->rows * 2 + 2) * sizeof(sky->loops[0]))); + sky->loops = static_cast(malloc((row_count * 2 + 2) * sizeof(sky->loops[0]))); // create vertex array if (!sky->data) @@ -5362,15 +5186,10 @@ void HWR_BuildSkyDome(void) // precompute to save a bit of division static constexpr float FINEDEGREE = (360.0f/static_cast(FINEANGLES)); -static void HWR_DrawSkyBackground(void) +static void HWR_DrawSkyDome(void) { FTransform dometransform; - if (HWR_IsWireframeMode()) - return; - - GL_SetBlend(PF_Translucent|PF_NoDepthTest|PF_Modulated); - memcpy(&dometransform, &atransform, sizeof(FTransform)); dometransform.x = dometransform.y = dometransform.z = 0.0; @@ -5395,6 +5214,124 @@ static void HWR_DrawSkyBackground(void) GL_RenderSkyDome(&gl_sky); } +// the following is karts old sky code from before the skydome stuff +// this appears to differ a bit from srb2´s old sky code +static void HWR_DrawSkyTexture(void) +{ + FOutVector v[4]; + angle_t angle; + float dimensionmultiply; + float aspectratio; + float angleturn; + + HWR_GetTexture(texturetranslation[skytexture], false); + + aspectratio = (float)vid.width/(float)vid.height; + + //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 + + // 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; + + v[0].z = v[1].z = v[2].z = v[3].z = ZCLIP_PLANE+1; + + // X + + // 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 + + //angle = (viewangle + ANGLE_45); + angle = (viewangle + xtoviewangle[0]); + dimensionmultiply = ((float)textures[texturetranslation[skytexture]]->width/256.0f); + + if (atransform.fliptype == TRANSFORM_MIRROR || + atransform.fliptype == TRANSFORM_MIRRORFLIP) + { + angle = InvAngle(angle); + dimensionmultiply *= -1; + } + + v[0].s = v[3].s = ((float)angle / ((float)(ANGLE_90-1)*dimensionmultiply)); + v[2].s = v[1].s = (-1.0f/dimensionmultiply)+((float) angle / ((float)(ANGLE_90-1)*dimensionmultiply)); + + // Y + angle = aimingangle; + dimensionmultiply = ((float)textures[texturetranslation[skytexture]]->height/(128.0f*aspectratio)); + + if (splitscreen == 1) + { + dimensionmultiply *= 2; + angle *= 2; + } + + // Middle of the sky should always be at angle 0 + // need to keep correct aspect ratio with X + if (atransform.fliptype == TRANSFORM_FLIP || + atransform.fliptype == TRANSFORM_MIRRORFLIP) + { + // During vertical flip the sky should be flipped and it's y movement should also be flipped obviously + v[3].t = v[2].t = -(0.5f-(0.5f/dimensionmultiply)); + v[0].t = v[1].t = (-1.0f/dimensionmultiply)-(0.5f-(0.5f/dimensionmultiply)); + } + else + { + v[3].t = v[2].t = (-1.0f/dimensionmultiply)-(0.5f-(0.5f/dimensionmultiply)); + v[0].t = v[1].t = -(0.5f-(0.5f/dimensionmultiply)); + } + + angleturn = (((float)ANGLE_45-1.0f)*aspectratio)*dimensionmultiply; + + if (cv_glshearing.value) + { + // Doesn't really make sense, but what can I do? + angle_t dy = FixedAngle(FixedMul(360*FRACUNIT, FixedDiv(AIMINGTODY(aimingangle), 900*FRACUNIT))); + v[3].t = v[2].t -= ((float) dy / angleturn); + v[0].t = v[1].t -= ((float) dy / angleturn); + } + else + { + 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].t = v[2].t += ((float) angle / angleturn); + v[0].t = v[1].t += ((float) angle / angleturn); + } + else + { + v[3].t = v[2].t -= ((float) angle / angleturn); + v[0].t = v[1].t -= ((float) angle / angleturn); + } + } + + // since sky is drawn as a "flat quad" this way, we have to unset any view transformations for it to work + GL_SetTransform(NULL); + GL_UnSetShader(); + GL_DrawPolygon(NULL, v, 4, 0); +} + +static void HWR_DrawSkyBackground(void) +{ + if (HWR_IsWireframeMode()) + return; + + GL_SetBlend(PF_Translucent|PF_NoDepthTest|PF_Modulated); + + if (cv_skydome.value) + HWR_DrawSkyDome(); + else + HWR_DrawSkyTexture(); +} + // -----------------+ // HWR_ClearView : clear the viewwindow, with maximum z value. also clears stencil buffer. // -----------------+ @@ -5460,12 +5397,6 @@ void HWR_SetTransform(float fpov) HWR_SetTransformAiming(&atransform); atransform.angley = static_cast(viewangle >> ANGLETOFINESHIFT)*(FINEDEGREE); - yaw = 270.0f - atransform.angley; - inv_yaw = 180.0f - yaw; - const float inv_yaw_radians = inv_yaw * deg2radians; - cos_inv_yaw = cosf(inv_yaw_radians); - sin_inv_yaw = sinf(inv_yaw_radians); - // only needed for sprite billboarding if (cv_glspritebillboarding.value && !cv_glshearing.value) { @@ -5498,6 +5429,7 @@ void HWR_SetTransform(float fpov) void HWR_ClearClipper(void) { const angle_t a1 = gld_FrustumAngle(gl_aimingangle); + gld_clipper_Clear(); gld_clipper_SafeAddClipRange(viewangle + a1, viewangle - a1); #ifdef HAVE_SPHEREFRUSTRUM @@ -5527,12 +5459,14 @@ static void HWR_RenderViewpoint(gl_portal_t *rootportal, int stencil_level, bool { gl_portallist_t portallist; + const boolean wireframe = HWR_IsWireframeMode(); + player_t *viewplayer = &players[displayplayers[viewssnum]]; const float fpov = FixedToFloat(R_GetPlayerFov(viewplayer)); - auto reset_viewstate = [&]() + auto reset_viewstate = [](const float pfov) FUNCINLINE { - HWR_SetTransform(fpov); + HWR_SetTransform(pfov); HWR_ClearSprites(); HWR_ClearClipper(); }; @@ -5550,7 +5484,7 @@ static void HWR_RenderViewpoint(gl_portal_t *rootportal, int stencil_level, bool currentportallist = &portallist; HWR_SetPortalState(GLPORTAL_SEARCH); - reset_viewstate(); + reset_viewstate(fpov); if (rootportal) { @@ -5576,18 +5510,18 @@ static void HWR_RenderViewpoint(gl_portal_t *rootportal, int stencil_level, bool // draw normal things in current frame in current incremented stencil buffer area HWR_SetStencilState(HWR_STENCIL_NORMAL, stencil_level); - reset_viewstate(); + reset_viewstate(fpov); if constexpr (Type == RenderViewpointType::kPortal) { if (allow_portals && rootportal) { - HWR_PortalFrame(rootportal);// for portalclipsector, it could have gone null from search + HWR_PortalFrame(rootportal); // for portalclipsector, it could have gone null from search HWR_PortalClipping(rootportal); } } - if (HWR_IsWireframeMode()) + if (wireframe) GL_SetSpecialState(HWD_SET_WIREFRAME, 1); // FIXME: perfstats does not account for portal rendering! @@ -5602,7 +5536,8 @@ static void HWR_RenderViewpoint(gl_portal_t *rootportal, int stencil_level, bool if constexpr (Type == RenderViewpointType::kPortal) { - gl_collect_skywalls = (allow_portals && !rootportal && portallist.base && (!skyboxmo[0] || !cv_skybox.value)); // if portals have been drawn in the main view, then render skywalls differently + // if portals have been drawn in the main view, then render skywalls differently + gl_collect_skywalls = (allow_portals && !rootportal && portallist.base && (!skyboxmo[0] || !cv_skybox.value)); // HAYA: Save the old portal state, and turn portals off while normally rendering the BSP tree. // This fixes specific effects not working, such as horizon lines. @@ -5658,6 +5593,7 @@ static void HWR_RenderViewpoint(gl_portal_t *rootportal, int stencil_level, bool PS_START_TIMING(ps_hw_spritesorttime); HWR_SortVisSprites(); PS_STOP_TIMING(ps_hw_spritesorttime); + PS_START_TIMING(ps_hw_spritedrawtime); if (UNLIKELY(cv_glmdls.value)) HWR_DrawSprites(); @@ -5671,7 +5607,7 @@ static void HWR_RenderViewpoint(gl_portal_t *rootportal, int stencil_level, bool HWR_RenderDrawNodes(); - if (HWR_IsWireframeMode()) + if (wireframe) GL_SetSpecialState(HWD_SET_WIREFRAME, 0); HWR_FreePortalList(portallist); // always call this just in case @@ -6060,6 +5996,10 @@ static void HWR_RenderWall(FOutVector *wallVerts, FSurfaceInfo *pSurf, FBITFIELD static void HWR_DoPostProcessor(void) { + // no flashes or screen waving if we want less vfx! + if (cv_reducevfx.value) + return; + // Armageddon Blast Flash! // Could this even be considered postprocessor? if (!HWR_ShouldUsePaletteRendering()) @@ -6099,7 +6039,7 @@ static void HWR_DoPostProcessor(void) return; // Not supported in splitscreen - someone want to add support? - if (splitscreen || cv_reducevfx.value) + if (splitscreen) return; //UINT8 viewnum = R_GetViewNumber(); @@ -6157,44 +6097,60 @@ static void HWR_DoPostProcessor(void) // Flipping of the screen isn't done here anymore } -void HWR_DoWipe(UINT8 wipenum, UINT8 scrnnum) +// +// wipes +// +static lumpnum_t wipelumpnum; + +// puts wipe lumpname in wipename[9] +static boolean HWR_WipeCheck(UINT8 wipenum, UINT8 scrnnum) { static char lumpname[9] = "FADEmmss"; - lumpnum_t lumpnum; size_t lsize; + // screen textures disabled completely if (cv_glscreentextures.value == 0) { - V_DrawFill(0, 0, BASEVIDWIDTH, BASEVIDHEIGHT, 31); // just draw a black screen instead of flashing and crap - return; + return false; } - if (wipenum > 99 || scrnnum > 99) // not a valid wipe number + // not a valid wipe number + if (wipenum > 99 || scrnnum > 99) { - V_DrawFill(0, 0, BASEVIDWIDTH, BASEVIDHEIGHT, 31); // just draw a black screen instead of flashing and crap - return; // shouldn't end up here really, the loop should've stopped running beforehand + return false; // shouldn't end up here really, the loop should've stopped running beforehand } // puts the numbers into the lumpname sprintf(&lumpname[4], "%.2hu%.2hu", (UINT16)wipenum, (UINT16)scrnnum); - lumpnum = W_CheckNumForName(lumpname); + wipelumpnum = W_CheckNumForName(lumpname); - if (lumpnum == LUMPERROR) // again, shouldn't be here really + // again, shouldn't be here really + if (wipelumpnum == LUMPERROR) { - V_DrawFill(0, 0, BASEVIDWIDTH, BASEVIDHEIGHT, 31); // just draw a black screen instead of flashing and crap - return; + return false; } - lsize = W_LumpLength(lumpnum); + lsize = W_LumpLength(wipelumpnum); if (!(lsize == 256000 || lsize == 64000 || lsize == 16000 || lsize == 4000)) { CONS_Alert(CONS_WARNING, "Fade mask lump %s of incorrect size, ignored\n", lumpname); - V_DrawFill(0, 0, BASEVIDWIDTH, BASEVIDHEIGHT, 31); // just draw a black screen instead of flashing and crap - return; // again, shouldn't get here if it is a bad size + return false; // again, shouldn't get here if it is a bad size } - HWR_GetFadeMask(lumpnum); + return true; +} + +void HWR_DoWipe(UINT8 wipenum, UINT8 scrnnum) +{ + if (!HWR_WipeCheck(wipenum, scrnnum)) + { + // just draw a black screen instead of rapidly flashing a white screen + V_DrawFill(0, 0, BASEVIDWIDTH, BASEVIDHEIGHT, 31); + return; + } + + HWR_GetFadeMask(wipelumpnum); GL_DoScreenWipe(HWD_SCREENTEXTURE_WIPE_START, HWD_SCREENTEXTURE_WIPE_END); } diff --git a/src/hardware/hw_md2.c b/src/hardware/hw_md2.c index 2aefecea1..0f8328041 100644 --- a/src/hardware/hw_md2.c +++ b/src/hardware/hw_md2.c @@ -1153,8 +1153,11 @@ void HWR_DrawMD2(gl_vissprite_t *spr) INT32 durs = spr->mobj->state->tics; INT32 tics = spr->mobj->tics; //mdlframe_t *next = NULL; + + //const UINT8 flip = (UINT8)(!(spr->mobj->eflags & MFE_VERTICALFLIP) != !R_ThingVerticallyFlipped(spr->mobj)); // :chaosleep: const UINT8 flip = (UINT8)((spr->mobj->eflags & MFE_VERTICALFLIP) == MFE_VERTICALFLIP); - const UINT8 hflip = (UINT8)(!(spr->mobj->mirrored) != !(spr->mobj->frame & FF_HORIZONTALFLIP)); + const UINT8 hflip = (UINT8)(!(spr->mobj->mirrored) != !R_ThingHorizontallyFlipped(spr->mobj)); + spritedef_t *sprdef; spriteframe_t *sprframe; spriteinfo_t *sprinfo; @@ -1400,12 +1403,11 @@ void HWR_DrawMD2(gl_vissprite_t *spr) const angle_t sliptideroll = ((cv_sliptideroll.value && spr->mobj->player) ? spr->mobj->player->sliproll : 0); const SINT8 flipfactor = flip ? -1 : 1; + const angle_t thingrollangle = (spr->mobj->rollangle - spr->mobj->temprollangle); - if (spr->mobj->rollangle || sliptideroll) + if (thingrollangle || sliptideroll) { - angle_t rollang = sliptideroll - ? (spr->mobj->rollangle) + (sliptideroll * spr->mobj->player->kartstuff[k_aizdriftstrat]) - : (spr->mobj->rollangle); + angle_t rollang = sliptideroll ? (thingrollangle + (sliptideroll * spr->mobj->player->kartstuff[k_aizdriftstrat])) : thingrollangle; rollang *= flipfactor; diff --git a/src/hardware/hw_portal.c b/src/hardware/hw_portal.c index 117d59725..c64eedad0 100644 --- a/src/hardware/hw_portal.c +++ b/src/hardware/hw_portal.c @@ -80,8 +80,8 @@ void HWR_Portal_Add2Lines(const INT32 line1, const INT32 line2, seg_t *seg) gl_portal_t *portal = HWR_Portal_Add(seg); // Offset the portal view by the linedef centers - line_t* start = &lines[line1]; - line_t* dest = &lines[line2]; + line_t* start = &lines[line1]; + line_t* dest = &lines[line2]; angle_t dangle = R_PointToAngle2(0, 0, dest->dx, dest->dy) - R_PointToAngle2(start->dx, start->dy, 0, 0); @@ -99,7 +99,7 @@ void HWR_Portal_Add2Lines(const INT32 line1, const INT32 line2, seg_t *seg) dest_c.y = dest->v1->y/2 + dest->v2->y/2; disttopoint = R_PointToDist2(start_c.x, start_c.y, viewx, viewy); - angtopoint = R_PointToAngle2(start_c.x, start_c.y, viewx, viewy); + angtopoint = R_PointToAngle2(start_c.x, start_c.y, viewx, viewy); angtopoint += dangle; portal->viewx = dest_c.x + FixedMul(FINECOSINE(angtopoint>>ANGLETOFINESHIFT), disttopoint); @@ -220,9 +220,9 @@ boolean HWR_PortalCheckBBox(const fixed_t *bspcoord) if (!portalclipline) return true; - if (HWR_PortalCheckPointSide(bspcoord[BOXLEFT], bspcoord[BOXTOP]) || - HWR_PortalCheckPointSide(bspcoord[BOXLEFT], bspcoord[BOXBOTTOM]) || - HWR_PortalCheckPointSide(bspcoord[BOXRIGHT], bspcoord[BOXTOP]) || + if (HWR_PortalCheckPointSide(bspcoord[BOXLEFT], bspcoord[BOXTOP]) || + HWR_PortalCheckPointSide(bspcoord[BOXLEFT], bspcoord[BOXBOTTOM]) || + HWR_PortalCheckPointSide(bspcoord[BOXRIGHT], bspcoord[BOXTOP]) || HWR_PortalCheckPointSide(bspcoord[BOXRIGHT], bspcoord[BOXBOTTOM])) { return true; diff --git a/src/hardware/hw_shaders.h b/src/hardware/hw_shaders.h index ff8b229de..baedebf64 100644 --- a/src/hardware/hw_shaders.h +++ b/src/hardware/hw_shaders.h @@ -76,6 +76,11 @@ // // Include GLSL_FLOOR_FUDGES or GLSL_WALL_FUDGES or define the fudges in shaders that use this macro. + +// dither shader based on +// https://github.com/hughsk/glsl-dither/blob/master/8x8.glsl +// https://github.com/libretro/glsl-shaders/blob/master/dithering/shaders/bayer_4x4.glsl +// adapted and messed about to work with srb2 and scale per resolution #define GLSL_DOOM_COLORMAP_DITHER \ "float baseValue = max(startmap * STARTMAP_FUDGE - scale * 0.5 * SCALE_FUDGE, cap);\n" \ "float patscale = min(scr_resolution.x / 1280.0, scr_resolution.y / 720.0);\n" \ diff --git a/src/hardware/r_opengl/ogl_win.c b/src/hardware/r_opengl/ogl_win.c deleted file mode 100644 index 31daa22fd..000000000 --- a/src/hardware/r_opengl/ogl_win.c +++ /dev/null @@ -1,549 +0,0 @@ -// Emacs style mode select -*- C++ -*- -//----------------------------------------------------------------------------- -// -// Copyright (C) 1998-2000 by DooM Legacy Team. -// -// This program is free software; you can redistribute it and/or -// modify it under the terms of the GNU General Public License -// as published by the Free Software Foundation; either version 2 -// of the License, or (at your option) any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -//----------------------------------------------------------------------------- -/// \file -/// \brief Windows specific part of the OpenGL API for Doom Legacy -/// -/// TODO: -/// - check if windowed mode works -/// - support different pixel formats - - -#if defined (_WIN32) - -//#define WIN32_LEAN_AND_MEAN -#define RPC_NO_WINDOWS_H -#include -#include -#include "r_opengl.h" - - -// ************************************************************************** -// GLOBALS -// ************************************************************************** - -#ifdef DEBUG_TO_FILE -static unsigned long nb_frames = 0; -static clock_t my_clock; -FILE *gllogstream; -#endif - -static HDC hDC = NULL; // the window's device context -static HGLRC hGLRC = NULL; // the OpenGL rendering context -static HWND hWnd = NULL; -static BOOL WasFullScreen = FALSE; -static void UnSetRes(void); - -#ifdef USE_WGL_SWAP -PFNWGLEXTSWAPCONTROLPROC wglSwapIntervalEXT = NULL; -#endif - -PFNglClear pglClear; -PFNglGetIntegerv pglGetIntegerv; -PFNglGetString pglGetString; - -#define MAX_VIDEO_MODES 32 -static vmode_t video_modes[MAX_VIDEO_MODES]; -INT32 oglflags = 0; - -// ************************************************************************** -// FUNCTIONS -// ************************************************************************** - -// -----------------+ -// APIENTRY DllMain : DLL Entry Point, -// : open/close debug log -// Returns : -// -----------------+ -BOOL WINAPI DllMain(HINSTANCE hinstDLL, // handle to DLL module - DWORD fdwReason, // reason for calling function - LPVOID lpvReserved) // reserved -{ - // Perform actions based on the reason for calling. - UNREFERENCED_PARAMETER(lpvReserved); - switch (fdwReason) - { - case DLL_PROCESS_ATTACH: - // Initialize once for each new process. - // Return FALSE to fail DLL load. -#ifdef DEBUG_TO_FILE - gllogstream = fopen("ogllog.txt", "wt"); - if (gllogstream == NULL) - return FALSE; -#endif - DisableThreadLibraryCalls(hinstDLL); - break; - - case DLL_THREAD_ATTACH: - // Do thread-specific initialization. - break; - - case DLL_THREAD_DETACH: - // Do thread-specific cleanup. - break; - - case DLL_PROCESS_DETACH: - // Perform any necessary cleanup. -#ifdef DEBUG_TO_FILE - if (gllogstream) - { - fclose(gllogstream); - gllogstream = NULL; - } -#endif - break; - } - - return TRUE; // Successful DLL_PROCESS_ATTACH. -} - -#ifdef STATIC_OPENGL -#define pwglGetProcAddress wglGetProcAddress; -#define pwglCreateContext wglCreateContext; -#define pwglDeleteContext wglDeleteContext; -#define pwglMakeCurrent wglMakeCurrent; -#else -static HMODULE OGL32; -typedef void *(WINAPI *PFNwglGetProcAddress) (const char *); -static PFNwglGetProcAddress pwglGetProcAddress; -typedef HGLRC (WINAPI *PFNwglCreateContext) (HDC hdc); -static PFNwglCreateContext pwglCreateContext; -typedef BOOL (WINAPI *PFNwglDeleteContext) (HGLRC hglrc); -static PFNwglDeleteContext pwglDeleteContext; -typedef BOOL (WINAPI *PFNwglMakeCurrent) (HDC hdc, HGLRC hglrc); -static PFNwglMakeCurrent pwglMakeCurrent; -#endif - -#ifndef STATIC_OPENGL -void *GetGLFunc(const char *proc) -{ - void *func = NULL; - if (pwglGetProcAddress) - func = pwglGetProcAddress(proc); - if (!func) - func = GetProcAddress(OGL32, proc); - return func; -} -#endif - -boolean LoadGL(void) -{ -#ifndef STATIC_OPENGL - OGL32 = LoadLibrary("OPENGL32.DLL"); - - if (!OGL32) - return 0; - - pwglGetProcAddress = GetGLFunc("wglGetProcAddress"); - pwglCreateContext = GetGLFunc("wglCreateContext"); - pwglDeleteContext = GetGLFunc("wglDeleteContext"); - pwglMakeCurrent = GetGLFunc("wglMakeCurrent"); -#endif - return SetupGLfunc(); -} - -// -----------------+ -// SetupPixelFormat : Set the device context's pixel format -// Note : Because we currently use only the desktop's BPP format, all the -// : video modes in Doom Legacy OpenGL are of the same BPP, thus the -// : PixelFormat is set only once. -// : Setting the pixel format more than once on the same window -// : doesn't work. (ultimately for different pixel formats, we -// : should close the window, and re-create it) -// -----------------+ -int SetupPixelFormat(INT32 WantColorBits, INT32 WantStencilBits, INT32 WantDepthBits) -{ - static DWORD iLastPFD = 0; - INT32 nPixelFormat; - PIXELFORMATDESCRIPTOR pfd = - { - sizeof (PIXELFORMATDESCRIPTOR), // size - 1, // version - PFD_DRAW_TO_WINDOW | PFD_SUPPORT_OPENGL | PFD_DOUBLEBUFFER, - PFD_TYPE_RGBA, // color type - 32 /*WantColorBits*/, // cColorBits : prefered color depth - 0, 0, // cRedBits, cRedShift - 0, 0, // cGreenBits, cGreenShift - 0, 0, // cBlueBits, cBlueShift - 0, 0, // cAlphaBits, cAlphaShift - 0, // cAccumBits - 0, 0, 0, 0, // cAccum Red/Green/Blue/Alpha Bits - 0, // cDepthBits (0,16,24,32) - 0, // cStencilBits - 0, // cAuxBuffers - PFD_MAIN_PLANE, // iLayerType - 0, // reserved, must be zero - 0, 0, 0, // dwLayerMask, dwVisibleMask, dwDamageMask - }; - - DWORD iPFD = (WantColorBits<<16) | (WantStencilBits<<8) | WantDepthBits; - - pfd.cDepthBits = (BYTE)WantDepthBits; - pfd.cStencilBits = (BYTE)WantStencilBits; - - if (iLastPFD) - { - DBG_Printf("WARNING : SetPixelFormat() called twise not supported by all drivers !\n"); - } - - // set the pixel format only if different than the current - if (iPFD == iLastPFD) - return 2; - else - iLastPFD = iPFD; - - DBG_Printf("SetupPixelFormat() - %d ColorBits - %d StencilBits - %d DepthBits\n", - WantColorBits, WantStencilBits, WantDepthBits); - - nPixelFormat = ChoosePixelFormat(hDC, &pfd); - - if (nPixelFormat == 0) - DBG_Printf("ChoosePixelFormat() FAILED\n"); - - if (SetPixelFormat(hDC, nPixelFormat, &pfd) == 0) - { - DBG_Printf("SetPixelFormat() FAILED\n"); - return 0; - } - - return 1; -} - - -// -----------------+ -// SetRes : Set a display mode -// Notes : pcurrentmode is actually not used -// -----------------+ -static INT32 WINAPI SetRes(viddef_t *lvid, vmode_t *pcurrentmode) -{ - LPCSTR renderer; - BOOL WantFullScreen = !(lvid->u.windowed); //(lvid->u.windowed ? 0 : CDS_FULLSCREEN); - - UNREFERENCED_PARAMETER(pcurrentmode); - DBG_Printf ("SetMode(): %dx%d %d bits (%s)\n", - lvid->width, lvid->height, lvid->bpp*8, - WantFullScreen ? "fullscreen" : "windowed"); - - hWnd = lvid->WndParent; - - // BP : why flush texture ? - // if important flush also the first one (white texture) and restore it ! - Flush(); // Flush textures. - -// TODO: if not fullscreen, skip display stuff and just resize viewport stuff ... - - // Exit previous mode - //if (hGLRC) //Hurdler: TODO: check if this is valid - // UnSetRes(); - if (WasFullScreen) - ChangeDisplaySettings(NULL, CDS_FULLSCREEN); //switch in and out of fullscreen - - // Change display settings. - if (WantFullScreen) - { - DEVMODE dm; - ZeroMemory(&dm, sizeof (dm)); - dm.dmSize = sizeof (dm); - dm.dmPelsWidth = lvid->width; - dm.dmPelsHeight = lvid->height; - dm.dmBitsPerPel = lvid->bpp*8; - dm.dmFields = DM_PELSWIDTH | DM_PELSHEIGHT | DM_BITSPERPEL; - if (ChangeDisplaySettings(&dm, CDS_TEST) != DISP_CHANGE_SUCCESSFUL) - return -2; - if (ChangeDisplaySettings(&dm, CDS_FULLSCREEN) !=DISP_CHANGE_SUCCESSFUL) - return -3; - - SetWindowLong(hWnd, GWL_STYLE, WS_POPUP|WS_VISIBLE); - // faB : book says to put these, surely for windowed mode - //WS_CLIPCHILDREN|WS_CLIPSIBLINGS); - SetWindowPos(hWnd, HWND_TOPMOST, 0, 0, lvid->width, lvid->height, SWP_NOACTIVATE|SWP_NOZORDER); - } - else - { - RECT bounds; - INT32 x, y; - INT32 w = lvid->width, h = lvid->height; - GetWindowRect(hWnd, &bounds); - bounds.right = bounds.left+w; - bounds.bottom = bounds.top+h; - AdjustWindowRectEx(&bounds, GetWindowLong(hWnd, GWL_STYLE), (GetMenu(hWnd) != NULL), 0); - w = bounds.right-bounds.left; - h = bounds.bottom-bounds.top; - x = (GetSystemMetrics(SM_CXSCREEN)-w)/2; - y = (GetSystemMetrics(SM_CYSCREEN)-h)/2; - SetWindowPos(hWnd, NULL, x, y, w, h, SWP_NOACTIVATE|SWP_NOZORDER); - } - - if (!hDC) - hDC = GetDC(hWnd); - if (!hDC) - { - DBG_Printf("GetDC() FAILED\n"); - return 0; - } - - { - INT32 res; - - // Set res. - res = SetupPixelFormat(lvid->bpp*8, 0, 16); - - if (res == 0) - return 0; - else if (res == 1) - { - // Exit previous mode - if (hGLRC) - UnSetRes(); - hGLRC = pwglCreateContext(hDC); - if (!hGLRC) - { - DBG_Printf("pwglCreateContext() FAILED\n"); - return 0; - } - if (!pwglMakeCurrent(hDC, hGLRC)) - { - DBG_Printf("wglMakeCurrent() FAILED\n"); - return 0; - } - } - } - - gl_extensions = pglGetString(GL_EXTENSIONS); - // Get info and extensions. - //BP: why don't we make it earlier ? - //Hurdler: we cannot do that before intialising gl context - renderer = (LPCSTR)pglGetString(GL_RENDERER); - DBG_Printf("Vendor : %s\n", pglGetString(GL_VENDOR)); - DBG_Printf("Renderer : %s\n", renderer); - DBG_Printf("Version : %s\n", pglGetString(GL_VERSION)); - DBG_Printf("Extensions : %s\n", gl_extensions); - - // BP: disable advenced feature that don't work on somes hardware - // Hurdler: Now works on G400 with bios 1.6 and certified drivers 6.04 - if (strstr(renderer, "810")) oglflags |= GLF_NOZBUFREAD; - DBG_Printf("oglflags : 0x%X\n", oglflags); - -#ifdef USE_WGL_SWAP - if (isExtAvailable("WGL_EXT_swap_control",gl_extensions)) - wglSwapIntervalEXT = GetGLFunc("wglSwapIntervalEXT"); - else - wglSwapIntervalEXT = NULL; -#endif - - if (isExtAvailable("GL_EXT_texture_filter_anisotropic",gl_extensions)) - pglGetIntegerv(GL_MAX_TEXTURE_MAX_ANISOTROPY_EXT, &maximumAnisotropy); - else - maximumAnisotropy = 0; - - SetupGLFunc13(); - - screen_depth = (GLbyte)(lvid->bpp*8); - if (screen_depth > 16) - textureformatGL = GL_RGBA; - else - textureformatGL = GL_RGB5_A1; - - GL_SetModelView(lvid->width, lvid->height); - GL_SetStates(); - // we need to clear the depth buffer. Very important!!! - pglClear(GL_COLOR_BUFFER_BIT|GL_DEPTH_BUFFER_BIT); - - lvid->buffer = NULL; // unless we use the software view - lvid->direct = NULL; // direct access to video memory, old DOS crap - - WasFullScreen = WantFullScreen; - - return 1; // on renvoie une valeur pour dire que cela s'est bien pass� -} - - -// -----------------+ -// UnSetRes : Restore the original display mode -// -----------------+ -static void UnSetRes(void) -{ - DBG_Printf("UnSetRes()\n"); - - pwglMakeCurrent(hDC, NULL); - pwglDeleteContext(hGLRC); - hGLRC = NULL; - if (WasFullScreen) - ChangeDisplaySettings(NULL, CDS_FULLSCREEN); -} - - -// -----------------+ -// GetModeList : Return the list of available display modes. -// Returns : pvidmodes - points to list of detected OpenGL video modes -// : numvidmodes - number of detected OpenGL video modes -// -----------------+ -EXPORT void HWRAPI(GetModeList) (vmode_t** pvidmodes, INT32 *numvidmodes) -{ - INT32 i; - -#if 1 - INT32 iMode; -/* - faB test code - - Commented out because there might be a problem with combo (Voodoo2 + other card), - we need to get the 3D card's display modes only. -*/ - (*pvidmodes) = &video_modes[0]; - - // Get list of device modes - for (i = 0,iMode = 0; iMode < MAX_VIDEO_MODES; i++) - { - DEVMODE Tmp; - ZeroMemory(&Tmp, sizeof (Tmp)); - Tmp.dmSize = sizeof (Tmp); - if (!EnumDisplaySettings(NULL, i, &Tmp)) - break; - - // add video mode - if (Tmp.dmBitsPerPel == 16 && - (iMode == 0 || ! - (Tmp.dmPelsWidth == video_modes[iMode-1].width && - Tmp.dmPelsHeight == video_modes[iMode-1].height) - ) - ) - { - video_modes[iMode].pnext = &video_modes[iMode+1]; - video_modes[iMode].windowed = 0; // fullscreen is the default - video_modes[iMode].misc = 0; - video_modes[iMode].name = malloc(12 * sizeof (CHAR)); - sprintf(video_modes[iMode].name, "%dx%d", (INT32)Tmp.dmPelsWidth, (INT32)Tmp.dmPelsHeight); - DBG_Printf ("Mode: %s\n", video_modes[iMode].name); - video_modes[iMode].width = Tmp.dmPelsWidth; - video_modes[iMode].height = Tmp.dmPelsHeight; - video_modes[iMode].bytesperpixel = Tmp.dmBitsPerPel/8; - video_modes[iMode].rowbytes = Tmp.dmPelsWidth * video_modes[iMode].bytesperpixel; - video_modes[iMode].pextradata = NULL; - video_modes[iMode].setmode = SetRes; - iMode++; - } - } - (*numvidmodes) = iMode; -#else - - // classic video modes (fullscreen/windowed) - // Added some. Tails - INT32 res[][2] = { - { 320, 200}, - { 320, 240}, - { 400, 300}, - { 512, 384}, - { 640, 400}, - { 640, 480}, - { 800, 600}, - { 960, 600}, - {1024, 768}, - {1152, 864}, - {1280, 800}, - {1280, 960}, - {1280,1024}, - {1600,1000}, - {1680,1050}, - {1920,1200}, -}; - - HDC bpphdc; - INT32 iBitsPerPel; - - DBG_Printf ("HWRAPI GetModeList()\n"); - - bpphdc = GetDC(NULL); // on obtient le bpp actuel - iBitsPerPel = GetDeviceCaps(bpphdc, BITSPIXEL); - - ReleaseDC(NULL, bpphdc); - - (*pvidmodes) = &video_modes[0]; - (*numvidmodes) = sizeof (res) / sizeof (res[0]); - for (i = 0; i < (*numvidmodes); i++) - { - video_modes[i].pnext = &video_modes[i+1]; - video_modes[i].windowed = 0; // fullscreen is the default - video_modes[i].misc = 0; - video_modes[i].name = malloc(12 * sizeof (CHAR)); - sprintf(video_modes[i].name, "%dx%d", res[i][0], res[i][1]); - DBG_Printf ("Mode: %s\n", video_modes[i].name); - video_modes[i].width = res[i][0]; - video_modes[i].height = res[i][1]; - video_modes[i].bytesperpixel = iBitsPerPel/8; - video_modes[i].rowbytes = res[i][0] * video_modes[i].bytesperpixel; - video_modes[i].pextradata = NULL; - video_modes[i].setmode = SetRes; - } -#endif - video_modes[(*numvidmodes)-1].pnext = NULL; -} - - -// -----------------+ -// Shutdown : Shutdown OpenGL, restore the display mode -// -----------------+ -EXPORT void HWRAPI(Shutdown) (void) -{ -#ifdef DEBUG_TO_FILE - long nb_centiemes; - - DBG_Printf ("HWRAPI Shutdown()\n"); - nb_centiemes = ((clock()-my_clock)*100)/CLOCKS_PER_SEC; - DBG_Printf("Nb frames: %li; Nb sec: %2.2f -> %2.1f fps\n", - nb_frames, nb_centiemes/100.0f, (100*nb_frames)/(double)nb_centiemes); -#endif - - Flush(); - - // Exit previous mode - if (hGLRC) - UnSetRes(); - - if (hDC) - { - ReleaseDC(hWnd, hDC); - hDC = NULL; - } - FreeLibrary(OGL32); - DBG_Printf ("HWRAPI Shutdown(DONE)\n"); -} - -// -----------------+ -// FinishUpdate : Swap front and back buffers -// -----------------+ -void GL_FinishUpdate (INT32 waitvbl) -{ -#ifdef USE_WGL_SWAP - static INT32 oldwaitvbl = 0; -#else - UNREFERENCED_PARAMETER(waitvbl); -#endif - // DBG_Printf ("FinishUpdate()\n"); -#ifdef DEBUG_TO_FILE - if ((++nb_frames)==2) // on ne commence pas � la premi�re frame - my_clock = clock(); -#endif - -#ifdef USE_WGL_SWAP - if (oldwaitvbl != waitvbl && wglSwapIntervalEXT) - wglSwapIntervalEXT(waitvbl); - oldwaitvbl = waitvbl; -#endif - - SwapBuffers(hDC); -} -#endif diff --git a/src/hardware/r_opengl/r_opengl.c b/src/hardware/r_opengl/r_opengl.c index c8d60871b..0e846a17e 100644 --- a/src/hardware/r_opengl/r_opengl.c +++ b/src/hardware/r_opengl/r_opengl.c @@ -776,15 +776,15 @@ static int GLFramebuffer_CheckExt(void) // gl versions from 2.1 may still support framebuffer objects // maybe, just maybe, we support the standart extensions - if (GL_isExtAvailable("GL_ARB_framebuffer_no_attachments", gl_extensions) - && GL_isExtAvailable("GL_ARB_framebuffer_object", gl_extensions) - && GL_isExtAvailable("GL_ARB_framebuffer_sRGB", gl_extensions)) + if (GL_isExtAvailable("GL_ARB_framebuffer_no_attachments", gl_extensions) && + GL_isExtAvailable("GL_ARB_framebuffer_object", gl_extensions) && + GL_isExtAvailable("GL_ARB_framebuffer_sRGB", gl_extensions)) return FBO_ARB; // nope, try the older 2.1 extensions - if (GL_isExtAvailable("GL_EXT_framebuffer_no_attachments", gl_extensions) - && GL_isExtAvailable("GL_EXT_framebuffer_object", gl_extensions) - && GL_isExtAvailable("GL_EXT_framebuffer_sRGB", gl_extensions)) + if (GL_isExtAvailable("GL_EXT_framebuffer_no_attachments", gl_extensions) && + GL_isExtAvailable("GL_EXT_framebuffer_object", gl_extensions) && + GL_isExtAvailable("GL_EXT_framebuffer_sRGB", gl_extensions)) { // perhaps we may even support a stencil attachment if (GL_isExtAvailable("GL_EXT_packed_depth_stencil", gl_extensions)) @@ -885,7 +885,7 @@ void SetupGLFunc4(void) { \ GL_MSG_Warning("failed to get OpenGL FBO function: %s\n", #func); \ GL_DBG_Printf("\nFBO: No framebuffer object support\n"); \ - supportFBO = false; \ + supportFBO = FBO_NONE; \ return; \ } \ @@ -1122,7 +1122,7 @@ static void GL_Perspective(GLfloat fovy, GLfloat aspect) const GLfloat deltaZ = FAR_CLIPPING_PLANE - NEAR_CLIPPING_PLANE; - if ((fabsf((float)deltaZ) < 1.0E-36f) || fpclassify(aspect) == FP_ZERO) + if ((fabsf(deltaZ) < 1.0E-36f) || fpclassify(aspect) == FP_ZERO) { return; } @@ -1465,6 +1465,19 @@ void GL_ReadScreenTexture(int tex, UINT8 *restrict dest, INT32 scale) if (tex != HWD_SCREENTEXTURE_GENERIC2) GL_DrawScreenTexture(tex, NULL, 0); +#ifdef USE_FBO_OGL + // FIXME: this is incredibly stupid + // but the final screen texture will NOT be drawn in the downsample fbo + if (tex == HWD_SCREENTEXTURE_GENERIC2 && + UseScreenFBO() && HWR_ShouldUsePaletteRendering()) + { + GL_SetShader(HWR_GetShaderFromTarget(SHADER_PALETTE_POSTPROCESS)); + GL_EnableShader(); + GL_DrawScreenTexture(HWD_SCREENTEXTURE_GENERIC2, NULL, 0); + GL_UnSetShader(); + } +#endif + image = malloc(screen_width*screen_height*3); pglPixelStorei(GL_PACK_ALIGNMENT, 1); pglReadPixels(0, 0, screen_width, screen_height, GL_RGB, GL_UNSIGNED_BYTE, image); @@ -1583,6 +1596,7 @@ void GL_Draw2DLine(F2DCoord * v1, F2DCoord * v2, RGBA_t Color) angle = atanf((v2->y-v1->y)/(v2->x-v1->x)); else angle = (float)N_PI_DEMI; + dx = sinf(angle) / (float)screen_width; dy = cosf(angle) / (float)screen_height; @@ -1697,7 +1711,7 @@ static void GL_SetBlendMode(FBITFIELD flags) void GL_SetBlend(FBITFIELD PolyFlags) { - const FBITFIELD Xor = CurrentPolyFlags^PolyFlags;; + const FBITFIELD Xor = CurrentPolyFlags^PolyFlags; if (Xor & (PF_Blending|PF_RemoveYWrap|PF_ForceWrapX|PF_ForceWrapY|PF_Occlude|PF_NoTexture|PF_Modulated|PF_NoDepthTest|PF_Decal|PF_Skydecal|PF_Invisible)) { @@ -2489,7 +2503,7 @@ void GL_RenderSkyDome(gl_sky_t *sky) GL_Shader_SetUniforms(NULL, NULL, NULL, NULL); // Build the sky dome! Yes! - if (sky->rebuild) + if (sky->rebuild || !sky->vbo) { // delete VBO when already exists if (sky->vbo) @@ -2914,7 +2928,7 @@ void GL_CreateModelVBOs(model_t *model) } } -#define BUFFER_OFFSET(i) ((char*)(i)) +#define BUFFER_OFFSET(i) ((void*)(i)) void GL_DrawModelEx(model_t *model, INT32 frameIndex, float duration, float tics, INT32 nextFrameIndex, FTransform *pos, float hscale, float vscale, UINT8 flipped, UINT8 hflipped, FSurfaceInfo *Surface) { @@ -3207,8 +3221,8 @@ void GL_SetTransform(FTransform *stransform) { float dy = stransform->viewaiming * 2; - if (stransform->fliptype == TRANSFORM_FLIP - || stransform->fliptype == TRANSFORM_MIRRORFLIP) + if (stransform->fliptype == TRANSFORM_FLIP || + stransform->fliptype == TRANSFORM_MIRRORFLIP) dy *= -1.0f; pglTranslatef(0.0f, -dy/BASEVIDHEIGHT, 0.0f); @@ -3233,7 +3247,7 @@ void GL_SetTransform(FTransform *stransform) #ifdef USE_FBO_OGL static void GL_Framebuffer_DeleteAttachments(void) { - if (!supportFBO || !framebufferobject.init) + if (supportFBO == FBO_NONE || !framebufferobject.init) return; // Unbind the framebuffer @@ -3253,7 +3267,7 @@ static void GL_Framebuffer_DeleteAttachments(void) static void GL_Framebuffer_Generate(void) { - if (!supportFBO || framebufferobject.init || !UseScreenFBO()) + if (supportFBO == FBO_NONE || framebufferobject.init || !UseScreenFBO()) return; // Generate the framebuffer @@ -3273,10 +3287,10 @@ static void GL_Framebuffer_Generate(void) pglTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST); Clamp2D(GL_TEXTURE_WRAP_S); Clamp2D(GL_TEXTURE_WRAP_T); - pglBindTexture(GL_TEXTURE_2D, 0); // Attach the framebuffer texture to the framebuffer pglFramebufferTexture2D(GL_FRAMEBUFFER_EXT, GL_COLOR_ATTACHMENT0_EXT, GL_TEXTURE_2D, framebufferobject.tex, 0); + pglBindTexture(GL_TEXTURE_2D, 0); } // Generate the renderbuffer @@ -3318,7 +3332,7 @@ static void GL_Framebuffer_Generate(void) // if this fails, dont retry it a gazillion times // this wouldnt recover - supportFBO = false; + supportFBO = FBO_NONE; pglBindFramebuffer(GL_FRAMEBUFFER_EXT, 0); return; } @@ -3331,7 +3345,7 @@ static void GL_Framebuffer_Generate(void) void GL_Framebuffer_Unbind(void) { - if (!supportFBO || !framebufferobject.init) + if (supportFBO == FBO_NONE || !framebufferobject.init) return; pglBindFramebuffer(GL_FRAMEBUFFER_EXT, 0); @@ -3340,13 +3354,13 @@ void GL_Framebuffer_Unbind(void) void GL_Framebuffer_Enable(void) { - if (!supportFBO || !UseScreenFBO()) + if (supportFBO == FBO_NONE || !UseScreenFBO()) return; GL_Framebuffer_Generate(); // failed - if (!supportFBO || !framebufferobject.init) + if (supportFBO == FBO_NONE || !framebufferobject.init) return; pglBindFramebuffer(GL_FRAMEBUFFER_EXT, framebufferobject.fboobj); @@ -3355,7 +3369,7 @@ void GL_Framebuffer_Enable(void) void GL_Framebuffer_Disable(void) { - if (!supportFBO || !framebufferobject.init) + if (supportFBO == FBO_NONE || !framebufferobject.init) return; pglBindFramebuffer(GL_FRAMEBUFFER_EXT, 0); diff --git a/src/hardware/r_opengl/r_opengl.dev b/src/hardware/r_opengl/r_opengl.dev deleted file mode 100644 index f0b23ae23..000000000 --- a/src/hardware/r_opengl/r_opengl.dev +++ /dev/null @@ -1,79 +0,0 @@ -[Project] -FileName=r_opengl.dev -Name=r_opengl -Ver=1 -IsCpp=1 -Type=3 -Compiler=-D_M_IX86=500_@@_-Wall_@@_-D_WINDOWS_@@_-DUSE_WGL_SWAP_@@_-Os_@@_-fomit-frame-pointer_@@_ -CppCompiler= -Includes= -Linker=--def ../r_mingw.def_@@_-lgdi32_@@_ -Libs= -UnitCount=3 -Folders= -ObjFiles= -PrivateResource= -ResourceIncludes= -MakeIncludes= -Icon= -ExeOutput=C:\srb2demo2 -ObjectOutput=..\..\..\objs\Mingw\r_opengl -OverrideOutput=1 -OverrideOutputName=r_opengl.dll -HostApplication= -CommandLine= -IncludeVersionInfo=0 -SupportXPThemes=0 -CompilerSet=0 -CompilerSettings=00000000000000000111d0 -UseCustomMakefile=0 -CustomMakefile= - -[Unit1] -FileName=ogl_win.c -Folder= -Compile=1 -CompileCpp=0 -Link=1 -Priority=1000 -OverrideBuildCmd=0 -BuildCmd= - -[Unit2] -FileName=r_opengl.c -Folder= -Compile=1 -CompileCpp=0 -Link=1 -Priority=1000 -OverrideBuildCmd=0 -BuildCmd= - -[Unit3] -FileName=r_opengl.h -Folder= -Compile=1 -CompileCpp=1 -Link=1 -Priority=1000 -OverrideBuildCmd=0 -BuildCmd= - -[VersionInfo] -Major=0 -Minor=1 -Release=1 -Build=1 -LanguageID=1033 -CharsetID=1252 -CompanyName= -FileVersion=0.1 -FileDescription=Developed using the Dev-C++ IDE -InternalName= -LegalCopyright= -LegalTrademarks= -OriginalFilename=r_opengl.exe -ProductName=r_opengl -ProductVersion=0.1 -AutoIncBuildNr=0 - diff --git a/src/hardware/r_opengl/r_opengl.dsp b/src/hardware/r_opengl/r_opengl.dsp deleted file mode 100644 index b1603e7f2..000000000 --- a/src/hardware/r_opengl/r_opengl.dsp +++ /dev/null @@ -1,105 +0,0 @@ -# Microsoft Developer Studio Project File - Name="r_opengl" - Package Owner=<4> -# Microsoft Developer Studio Generated Build File, Format Version 6.00 -# ** DO NOT EDIT ** - -# TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102 - -CFG=r_opengl - Win32 Debug -!MESSAGE This is not a valid makefile. To build this project using NMAKE, -!MESSAGE use the Export Makefile command and run -!MESSAGE -!MESSAGE NMAKE /f "r_opengl.mak". -!MESSAGE -!MESSAGE You can specify a configuration when running NMAKE -!MESSAGE by defining the macro CFG on the command line. For example: -!MESSAGE -!MESSAGE NMAKE /f "r_opengl.mak" CFG="r_opengl - Win32 Debug" -!MESSAGE -!MESSAGE Possible choices for configuration are: -!MESSAGE -!MESSAGE "r_opengl - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library") -!MESSAGE "r_opengl - Win32 Debug" (based on "Win32 (x86) Dynamic-Link Library") -!MESSAGE - -# Begin Project -# PROP AllowPerConfigDependencies 0 -# PROP Scc_ProjName "" -# PROP Scc_LocalPath "" -CPP=cl.exe -MTL=midl.exe -RSC=rc.exe - -!IF "$(CFG)" == "r_opengl - Win32 Release" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 0 -# PROP BASE Output_Dir "r_opengl___Win32_Release" -# PROP BASE Intermediate_Dir "r_opengl___Win32_Release" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 0 -# PROP Output_Dir "..\..\..\bin\VC\Release\r_opengl" -# PROP Intermediate_Dir "..\..\..\objs\VC\Release\r_opengl" -# PROP Ignore_Export_Lib 1 -# PROP Target_Dir "" -# ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "R_OPENGL_EXPORTS" /YX /FD /c -# ADD CPP /nologo /G5 /W3 /GX /Zi /O2 /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "__WIN32__" /D "__MSC__" /D "USE_WGL_SWAP" /FR /FD /c -# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32 -# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32 -# ADD BASE RSC /l 0x80c /d "NDEBUG" -# ADD RSC /l 0x409 /d "NDEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LINK32=link.exe -# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /machine:I386 -# ADD LINK32 user32.lib gdi32.lib /nologo /dll /pdb:"..\..\..\bin\VC\Release\r_opengl.pdb" /machine:I386 /out:"C:\srb2demo2\r_opengl.dll" -# SUBTRACT LINK32 /pdb:none /debug - -!ELSEIF "$(CFG)" == "r_opengl - Win32 Debug" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 1 -# PROP BASE Output_Dir "..\..\..\objs\Debug" -# PROP BASE Intermediate_Dir "..\..\..\objs\Debug" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 1 -# PROP Output_Dir "..\..\..\bin\VC\Debug\r_opengl" -# PROP Intermediate_Dir "..\..\..\objs\VC\Debug\r_opengl" -# PROP Ignore_Export_Lib 1 -# PROP Target_Dir "" -# ADD BASE CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "R_OPENGL_EXPORTS" /YX /FD /GZ /c -# ADD CPP /nologo /G6 /W4 /Gm /GX /ZI /Od /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "__WIN32__" /D "__MSC__" /D "USE_WGL_SWAP" /FR /FD /GZ /c -# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32 -# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32 -# ADD BASE RSC /l 0x80c /d "_DEBUG" -# ADD RSC /l 0x409 /d "_DEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LINK32=link.exe -# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /debug /machine:I386 /pdbtype:sept -# ADD LINK32 user32.lib gdi32.lib /nologo /dll /pdb:"..\..\..\bin\VC\Debug\r_opengl.pdb" /debug /machine:I386 /out:"C:\srb2demo2\r_opengld.dll" /pdbtype:sept -# SUBTRACT LINK32 /pdb:none - -!ENDIF - -# Begin Target - -# Name "r_opengl - Win32 Release" -# Name "r_opengl - Win32 Debug" -# Begin Source File - -SOURCE=.\ogl_win.c -# End Source File -# Begin Source File - -SOURCE=.\r_opengl.c -# End Source File -# Begin Source File - -SOURCE=.\r_opengl.h -# End Source File -# End Target -# End Project diff --git a/src/hu_stuff.c b/src/hu_stuff.c index 145ce240f..e7c8c3ddb 100644 --- a/src/hu_stuff.c +++ b/src/hu_stuff.c @@ -117,6 +117,11 @@ static void HU_DrawRankings(void); consvar_t cv_showspecstuff = {"showspecstuff", "No", CV_SAVE, CV_YesNo, NULL, 0, NULL, NULL, 0, 0, NULL}; +// stuff from SRB2-Banpyura thx alot! :3 +consvar_t cv_chat_xoffset = {"chat_xoffset", "0", CV_SAVE, NULL, NULL, 0, NULL, NULL, 0, 0, NULL}; +consvar_t cv_chat_yoffset = {"chat_yoffset", "0", CV_SAVE, NULL, NULL, 0, NULL, NULL, 0, 0, NULL}; +consvar_t cv_chat_showlimit = {"chat_showlimit", "No", CV_SAVE, CV_YesNo, NULL, 0, NULL, NULL, 0, 0, NULL}; + static char cechotext[1024]; static tic_t cechotimer = 0; static tic_t cechoduration = 5*TICRATE; @@ -133,6 +138,7 @@ static void Command_Say_f(void); static void Command_Sayto_f(void); static void Command_Sayteam_f(void); static void Command_CSay_f(void); +static void Command_Mute_f(void); static void Got_Saycmd(const UINT8 **p, INT32 playernum); void HU_LoadGraphics(void) @@ -260,6 +266,8 @@ void HU_Init(void) COM_AddCommand("csay", Command_CSay_f); RegisterNetXCmd(XD_SAY, Got_Saycmd); + COM_AddCommand("muteplayer", Command_Mute_f); + if (dedicated || rendermode == render_none) return; @@ -963,7 +971,7 @@ void HU_Ticker(void) size_t i = 0; // handle spam while we're at it: - for(; (i < MAXPLAYERS); i++) + for (; (i < MAXPLAYERS); i++) { if (stop_spamming[i] > 0) stop_spamming[i]--; @@ -1022,21 +1030,42 @@ static boolean HU_clearChatSpaces(void) return nothingbutspaces; } -static void DoMute(const char *name) +static void DoMute(const char *name, boolean chat) { INT32 pnum = D_LookupPlayer(name); - if (pnum < 0) + // Shortcut to reuse this function for console and chat command +#define PRINT(msg, sound) do { \ + if (chat) \ + HU_AddChatText((msg), (sound)); \ + else \ + CONS_Printf("%s\n", msg); \ +} while (0) + + if (pnum < 0 || !playeringame[pnum]) { - HU_AddChatText("\x85""ERROR: \x80Player not found.", false); + PRINT("\x85""ERROR: \x80Player not found.", false); return; } player_muted[pnum] = !player_muted[pnum]; - HU_AddChatText(va("Player '%s' has been %smuted.", player_names[pnum], player_muted[pnum] ? "" : "un"), false); + PRINT(va("Player '%s' has been %smuted.", player_names[pnum], player_muted[pnum] ? "" : "un"), false); if (player_muted[pnum]) - HU_AddChatText("Use same command to unmute them.", false); + PRINT("Use same command to unmute them.", false); + +#undef PRINT +} + +static void Command_Mute_f(void) +{ + if (COM_Argc() < 2) + { + CONS_Printf(M_GetText("mute : mute/unmute a player\n")); + return; + } + + DoMute(COM_Argv(1), false); } static void HU_SendChatMessage(void) @@ -1070,7 +1099,7 @@ static void HU_SendChatMessage(void) if (msglength >= 5 && strnicmp(msg, "/mute", 5) == 0) // Used /mute { if (msglength > 6) - DoMute(msg+6); + DoMute(msg+6, true); else HU_AddChatText("\x82NOTICE: \x80Usage: /mute ", false); @@ -1111,6 +1140,7 @@ static void HU_SendChatMessage(void) return; } } + // I'm very bad at C, I swear I am, additional checks eww! if (spc != 0) { @@ -1257,13 +1287,15 @@ boolean HU_Responder(event_t *ev) chat_on = false; I_SetTextInput(false); } - else if ((c == KEY_UPARROW || c == KEY_MOUSEWHEELUP) && chat_scroll > 0 && !OLDCHAT) // CHAT SCROLLING YAYS! + else if ((c == KEY_UPARROW || c == KEY_PGUP || c == KEY_MOUSEWHEELUP) && + ((chat_scroll > 0) && !OLDCHAT)) // CHAT SCROLLING YAYS! { chat_scroll--; justscrolledup = true; chat_scrolltime = 4; } - else if ((c == KEY_DOWNARROW || c == KEY_MOUSEWHEELDOWN) && chat_scroll < chat_maxscroll && chat_maxscroll > 0 && !OLDCHAT) + else if ((c == KEY_DOWNARROW || c == KEY_PGDN || c == KEY_MOUSEWHEELDOWN) && + ((chat_scroll < chat_maxscroll) && (chat_maxscroll > 0) && !OLDCHAT)) { chat_scroll++; justscrolleddown = true; @@ -1343,7 +1375,12 @@ static char *CHAT_WordWrap(INT32 x, INT32 w, INT32 option, const char *string) // 30/7/18: chaty is now the distance at which the lowest point of the chat will be drawn if that makes any sense. -INT16 chatx = 13, chaty = 169; // let's use this as our coordinates, shh +// let's use this as our coordinates, shh +// :chao: guess this just works lol +#define chatx ((INT16)(13 + (cv_chat_xoffset.value))) +#define chaty ((INT16)(169 + (cv_chat_yoffset.value))) + +#define CHATSNAP (V_SNAPTOBOTTOM|V_SNAPTOLEFT) // chat stuff by VincyTM LOL XD! @@ -1370,7 +1407,7 @@ static void HU_drawMiniChat(void) for (; i > 0; i--) { - char *msg = CHAT_WordWrap(x+2, boxw-(charwidth*2), V_SNAPTOBOTTOM|V_SNAPTOLEFT|V_ALLOWLOWERCASE, chat_mini[i-1]); + char *msg = CHAT_WordWrap(x+2, boxw-(charwidth*2), CHATSNAP|V_ALLOWLOWERCASE, chat_mini[i-1]); size_t j = 0; INT32 linescount = 0; emote_t *emote = NULL; @@ -1430,6 +1467,7 @@ static void HU_drawMiniChat(void) if (splitscreen) { y -= BASEVIDHEIGHT/2; + if (splitscreen > 1) y += 16; } @@ -1447,7 +1485,7 @@ static void HU_drawMiniChat(void) INT32 timer = ((cv_chattime.value*TICRATE)-chat_timers[i]) - cv_chattime.value*TICRATE+9; // see below... INT32 transflag = (timer >= 0 && timer <= 9) ? (timer*V_10TRANS) : 0; // you can make bad jokes out of this one. size_t j = 0; - char *msg = CHAT_WordWrap(x+2, boxw-(charwidth*2), V_SNAPTOBOTTOM|V_SNAPTOLEFT|V_ALLOWLOWERCASE, chat_mini[i]); // get the current message, and word wrap it. + char *msg = CHAT_WordWrap(x+2, boxw-(charwidth*2), CHATSNAP|V_ALLOWLOWERCASE, chat_mini[i]); // get the current message, and word wrap it. UINT8 *colormap = NULL; emote_t *emote = NULL; int emotelen = 0; @@ -1480,9 +1518,9 @@ static void HU_drawMiniChat(void) else if ((emote = M_VerifyEmote(msg+j, &emotelen))) { if (cv_chatbacktint.value) // on request of wolfy - V_DrawFillConsoleMap(x + dx + 2, y+dy, EMOTEWIDTH, charheight, 239|V_SNAPTOBOTTOM|V_SNAPTOLEFT); + V_DrawFillConsoleMap(x + dx + 2, y+dy, EMOTEWIDTH, charheight, 239|CHATSNAP); - M_DrawEmote(x+dx+2, y+dy, emote, V_SNAPTOBOTTOM|V_SNAPTOLEFT|transflag); + M_DrawEmote(x+dx+2, y+dy, emote, CHATSNAP|transflag); dx += EMOTEWIDTH - charwidth; j += emotelen; @@ -1490,9 +1528,9 @@ static void HU_drawMiniChat(void) else { if (cv_chatbacktint.value) // on request of wolfy - V_DrawFillConsoleMap(x + dx + 2, y+dy, charwidth, charheight, 239|V_SNAPTOBOTTOM|V_SNAPTOLEFT); + V_DrawFillConsoleMap(x + dx + 2, y+dy, charwidth, charheight, 239|CHATSNAP); - V_DrawChatCharacter(x + dx + 2, y+dy+cv_chatcentertext.value, msg[j++] |V_SNAPTOBOTTOM|V_SNAPTOLEFT|transflag, !cv_allcaps.value, colormap); + V_DrawChatCharacter(x + dx + 2, y+dy+cv_chatcentertext.value, msg[j++] |CHATSNAP|transflag, !cv_allcaps.value, colormap); } dx += charwidth; @@ -1553,13 +1591,13 @@ static void HU_drawChatLog(INT32 offset) chat_topy = y + chat_scroll*charheight; chat_bottomy = chat_topy + boxh*charheight; - V_DrawFillConsoleMap(chatx, chat_topy, boxw, boxh*charheight +2, 239|V_SNAPTOBOTTOM|V_SNAPTOLEFT); // log box + V_DrawFillConsoleMap(chatx, chat_topy, boxw, boxh*charheight +2, 239|CHATSNAP); // log box for (i = 0; i < chat_nummsg_log; i++) // iterate through our chatlog { INT32 clrflag = 0; INT32 j = 0; - char *msg = CHAT_WordWrap(x+2, boxw-(charwidth*2), V_SNAPTOBOTTOM|V_SNAPTOLEFT|V_ALLOWLOWERCASE, chat_log[i]); // get the current message, and word wrap it. + char *msg = CHAT_WordWrap(x+2, boxw-(charwidth*2), CHATSNAP|V_ALLOWLOWERCASE, chat_log[i]); // get the current message, and word wrap it. UINT8 *colormap = NULL; emote_t *emote = NULL; int emotelen = 0; @@ -1589,7 +1627,7 @@ static void HU_drawChatLog(INT32 offset) { if ((y+dy+2 >= chat_topy) && (y+dy < (chat_bottomy))) { - M_DrawEmote(x+dx+2, y+dy+1, emote, V_SNAPTOBOTTOM|V_SNAPTOLEFT); + M_DrawEmote(x+dx+2, y+dy+1, emote, CHATSNAP); dx += EMOTEWIDTH - charwidth; } j += emotelen; @@ -1597,7 +1635,7 @@ static void HU_drawChatLog(INT32 offset) else { if ((y+dy+2 >= chat_topy) && (y+dy < (chat_bottomy))) - V_DrawChatCharacter(x + dx + 2, y+dy+2, msg[j++] |V_SNAPTOBOTTOM|V_SNAPTOLEFT, !cv_allcaps.value, colormap); + V_DrawChatCharacter(x + dx + 2, y+dy+2, msg[j++] |CHATSNAP, !cv_allcaps.value, colormap); else j++; // don't forget to increment this or we'll get stuck in the limbo. } @@ -1634,9 +1672,9 @@ static void HU_drawChatLog(INT32 offset) // draw arrows to indicate that we can (or not) scroll. if (chat_scroll > 0) - V_DrawCharacter(chatx-9, ((justscrolledup) ? (chat_topy-1) : (chat_topy)), V_SNAPTOBOTTOM | V_SNAPTOLEFT | highlight | '\x1A', false); // up arrow + V_DrawCharacter(chatx-9, ((justscrolledup) ? (chat_topy-1) : (chat_topy)), CHATSNAP | highlight | '\x1A', false); // up arrow if (chat_scroll < chat_maxscroll) - V_DrawCharacter(chatx-9, chat_bottomy-((justscrolleddown) ? 5 : 6), V_SNAPTOBOTTOM | V_SNAPTOLEFT | highlight | '\x1B', false); // down arrow + V_DrawCharacter(chatx-9, chat_bottomy-((justscrolleddown) ? 5 : 6), CHATSNAP | highlight | '\x1B', false); // down arrow justscrolleddown = false; justscrolledup = false; @@ -1654,6 +1692,7 @@ static void HU_DrawChat(void) INT32 boxw = cv_chatwidth.value; INT32 t = 0, c = 0, y = chaty - (typelines*charheight); UINT32 i = 0, saylen = strlen(w_chat_buf); // You learn new things everyday! + UINT32 charcount = 0; INT32 cflag = 0; INT32 pm_offset = 0; // for cases when you type emote while also doing /pm size_t select_start = 0, select_end = 0; @@ -1685,7 +1724,7 @@ static void HU_DrawChat(void) cflag = V_GRAYMAP; // set text in gray if chat is muted. } - V_DrawFillConsoleMap(chatx, y-1, boxw, (typelines*charheight), 239 | V_SNAPTOBOTTOM | V_SNAPTOLEFT); + V_DrawFillConsoleMap(chatx, y-1, boxw, (typelines*charheight), 239 | CHATSNAP); while (talk[i]) { @@ -1693,7 +1732,7 @@ static void HU_DrawChat(void) ++i; else { - V_DrawChatCharacter(chatx + c + 2, y, talk[i] |V_SNAPTOBOTTOM|V_SNAPTOLEFT|cflag, !cv_allcaps.value, V_GetStringColormap(talk[i]|cflag)); + V_DrawChatCharacter(chatx + c + 2, y, talk[i] |CHATSNAP|cflag, !cv_allcaps.value, V_GetStringColormap(talk[i]|cflag)); i++; } @@ -1711,7 +1750,7 @@ static void HU_DrawChat(void) typelines = 1; if ((w_chat.cursor == 0 || w_chat.length == 0) && hu_tick < 4) - V_DrawChatCharacter(chatx+2+c, y+1, '_'|V_SNAPTOBOTTOM|V_SNAPTOLEFT|t, !cv_allcaps.value, NULL); + V_DrawChatCharacter(chatx+2+c, y+1, '_'|CHATSNAP|t, !cv_allcaps.value, NULL); if (w_chat.select != w_chat.cursor) { @@ -1728,17 +1767,23 @@ static void HU_DrawChat(void) if ((emote = M_VerifyEmote(w_chat_buf+i, &emotelen))) { - M_DrawEmote(chatx + c + 2, y-1, emote, V_SNAPTOBOTTOM|V_SNAPTOLEFT|t); + M_DrawEmote(chatx + c + 2, y-1, emote, CHATSNAP|t); c += EMOTEWIDTH - charwidth; i += emotelen-1; drawwidth = EMOTEWIDTH; + if (cv_chat_showlimit.value) + charcount += emotelen; } else if (w_chat_buf[i] >= HU_FONTSTART) //Hurdler: isn't it better like that? - V_DrawChatCharacter(chatx + c + 2, y, w_chat_buf[i] | V_SNAPTOBOTTOM|V_SNAPTOLEFT | t, !cv_allcaps.value, NULL); + { + V_DrawChatCharacter(chatx + c + 2, y, w_chat_buf[i] | CHATSNAP | t, !cv_allcaps.value, NULL); + if (cv_chat_showlimit.value) + charcount++; + } // Draw selection if (i >= select_start && i < select_end) - V_DrawFill(chatx + c + 2 - (drawwidth-charwidth), y-1, drawwidth, charheight, 103|V_TRANSLUCENT|V_SNAPTOBOTTOM|V_SNAPTOLEFT|t); + V_DrawFill(chatx + c + 2 - (drawwidth-charwidth), y-1, drawwidth, charheight, 103|V_TRANSLUCENT|CHATSNAP|t); ++i; @@ -1747,7 +1792,7 @@ static void HU_DrawChat(void) INT32 cursorx = (c+charwidth < boxw-charwidth) ? (chatx + 2 + c+charwidth) : (chatx+1); // we may have to go down. INT32 cursory = (cursorx != chatx+1) ? (y) : (y+charheight); if (hu_tick < 4) - V_DrawChatCharacter(cursorx, cursory+1, '_' |V_SNAPTOBOTTOM|V_SNAPTOLEFT|t, !cv_allcaps.value, NULL); + V_DrawChatCharacter(cursorx, cursory+1, '_' |CHATSNAP|t, !cv_allcaps.value, NULL); if (cursorx == chatx+1 && saylen == i-1) // a weirdo hack { @@ -1765,6 +1810,13 @@ static void HU_DrawChat(void) } } + if (cv_chat_showlimit.value) + { + // Limit + const INT32 clr = ((HU_MAXMSGLEN - charcount) > 64 ? V_TRANSLUCENT : (charcount == HU_MAXMSGLEN ? V_REDMAP : V_YELLOWMAP)); + V_DrawSmallString(chatx, y+7, CHATSNAP|clr, va("%d/%d", charcount, HU_MAXMSGLEN)); + } + // handle /pm list. It's messy, horrible and I don't care. if (strnicmp(w_chat_buf, "/pm", 3) == 0 && vid.width >= 400 && !teamtalk) // 320x200 unsupported kthxbai { @@ -1800,6 +1852,7 @@ static void HU_DrawChat(void) { char nodenum[3]; UINT32 n; + // right, that's half important: (w_chat_buf[4] may be a space since /pm0 msg is perfectly acceptable!) if (!isdigit(w_chat_buf[3]) || !(isdigit(w_chat_buf[4]) || (w_chat_buf[4] == ' ') || (w_chat_buf[4] == 0))) break; @@ -1837,17 +1890,17 @@ static void HU_DrawChat(void) } // fill it like the chat so the text doesn't become hard to read because of the hud. - V_DrawFillConsoleMap(chatx + boxw + 2, p_dispy - (6*count), (longest_name_length+4)*4, 6, 239 | V_SNAPTOBOTTOM | V_SNAPTOLEFT); + V_DrawFillConsoleMap(chatx + boxw + 2, p_dispy - (6*count), (longest_name_length+4)*4, 6, 239 | CHATSNAP); - V_DrawSmallString(chatx + boxw + 4, p_dispy - (6*count), V_SNAPTOBOTTOM|V_SNAPTOLEFT|V_ALLOWLOWERCASE, va("\x82%d\x80 - %s", i, player_names[i])); + V_DrawSmallString(chatx + boxw + 4, p_dispy - (6*count), CHATSNAP|V_ALLOWLOWERCASE, va("\x82%d\x80 - %s", i, player_names[i])); count++; } if (count == 0) // no results. { pm_offset = 48 + 2; - V_DrawFillConsoleMap(chatx + boxw + 2, p_dispy - (6*count), 48, 6, 239 | V_SNAPTOBOTTOM | V_SNAPTOLEFT); // fill it like the chat so the text doesn't become hard to read because of the hud. - V_DrawSmallString(chatx + boxw + 4, p_dispy - (6*count), V_SNAPTOBOTTOM|V_SNAPTOLEFT|V_ALLOWLOWERCASE, "NO RESULT."); + V_DrawFillConsoleMap(chatx + boxw + 2, p_dispy - (6*count), 48, 6, 239 | CHATSNAP); // fill it like the chat so the text doesn't become hard to read because of the hud. + V_DrawSmallString(chatx + boxw + 4, p_dispy - (6*count), CHATSNAP|V_ALLOWLOWERCASE, "NO RESULT."); } else { @@ -1899,15 +1952,15 @@ static void HU_DrawChat(void) while ((suggest = M_FindEmote(complete, complete_len, skip)) != NULL) { - V_DrawFillConsoleMap(chatx + boxw + pm_offset + 2, suggesty - (7*skip), emote_suggest_boxw, 6, V_SNAPTOBOTTOM|V_SNAPTOLEFT); + V_DrawFillConsoleMap(chatx + boxw + pm_offset + 2, suggesty - (7*skip), emote_suggest_boxw, 6, CHATSNAP); // Highlight currently suggested emote int hlflag = 0; if (skip == emote_autocomplete.skip && emote_autocomplete.complete[0]) hlflag = V_YELLOWMAP; - V_DrawSmallString(chatx + boxw + pm_offset + 4 + EMOTEWIDTH, suggesty - (7*skip), hlflag|V_SNAPTOBOTTOM|V_SNAPTOLEFT|V_ALLOWLOWERCASE, va(":%s:", suggest->name)); - M_DrawEmote(chatx + boxw + pm_offset + 2, suggesty - skip*7, suggest, V_SNAPTOBOTTOM|V_SNAPTOLEFT); + V_DrawSmallString(chatx + boxw + pm_offset + 4 + EMOTEWIDTH, suggesty - (7*skip), hlflag|CHATSNAP|V_ALLOWLOWERCASE, va(":%s:", suggest->name)); + M_DrawEmote(chatx + boxw + pm_offset + 2, suggesty - skip*7, suggest, CHATSNAP); ++skip; } @@ -1921,6 +1974,7 @@ static void HU_DrawChat(void) static void HU_DrawChat_Old(void) { INT32 t = 0, c = 0, y = HU_INPUTY; + UINT32 charcount = 0; size_t i = 0; const char *ntalk = "Say: ", *ttalk = "Say-Team: "; const char *talk = ntalk; @@ -1966,11 +2020,17 @@ static void HU_DrawChat_Old(void) { M_DrawScaledEmote((HU_INPUTX + c)<= HU_FONTSTART) //Hurdler: isn't it better like that? { //charwidth = hu_font[w_chat[i]-HU_FONTSTART]->width * con_scalefactor; V_DrawCharacter(HU_INPUTX + c, y, w_chat_buf[i] | cv_constextsize.value | V_NOSCALESTART | t, !cv_allcaps.value); + + if (cv_chat_showlimit.value) + charcount++; } // Draw selection @@ -1983,7 +2043,7 @@ static void HU_DrawChat_Old(void) { INT32 cursorx = (HU_INPUTX+c+charwidth < vid.width) ? (HU_INPUTX + c + charwidth) : (HU_INPUTX); // we may have to go down. INT32 cursory = (cursorx != HU_INPUTX) ? (y) : (y+charheight); - V_DrawCharacter(cursorx, cursory+2*con_scalefactor, '_' |cv_constextsize.value | V_NOSCALESTART|t, !cv_allcaps.value); + V_DrawCharacter(cursorx, cursory+2*con_scalefactor, '_' | cv_constextsize.value | V_NOSCALESTART |t, !cv_allcaps.value); } c += charwidth; @@ -1993,6 +2053,24 @@ static void HU_DrawChat_Old(void) y += charheight; } } + + // console chat users are FINALLY being fed! + if (cv_chat_showlimit.value) + { + const char *lim = va(" (%i/%i)", charcount, HU_MAXMSGLEN); + for (i = 0; lim[i]; i++) + { + V_DrawCharacter(HU_INPUTX + c, y, lim[i] | cv_constextsize.value | V_NOSCALESTART | t, !cv_allcaps.value); + + c += charwidth; + if (c >= vid.width) // text wrapping + { + c = 0; + y += charheight; + } + } + } + } static void HU_DrawCEcho(void) @@ -2181,12 +2259,13 @@ static void HU_DrawSongCreditsBox(void) y = -BOXCREDITHEIGHT*dup + (FixedMul(BOXCREDITHEIGHT*FRACUNIT, FixedDiv(t*FRACUNIT, TICRATE*FRACUNIT/2))*dup - interpoffset)/FRACUNIT; } - bgt = (NUMTRANSMAPS/2) + (cursongcredit.trans/2); + bgt = (NUMTRANSMAPS/2) + (cursongcredit.trans/2) - 2; // arbitrary value, looks a bit better if (bgt < NUMTRANSMAPS) { - V_DrawFill(x, y, strwidth*dup, BOXCREDITHEIGHT*dup, 28|flags|(bgt< 1))) V_DrawVhsEffect(demo.rewinding); + HU_ForceShowChat(); + // draw chat string plus cursor if (chat_on) { @@ -2300,8 +2396,7 @@ void HU_Drawer(void) // IN-LEVEL MULTIPLAYER RANKINGS //====================================================================== -static int -Ping_gfx_num (int lag) +static int Ping_gfx_num(int lag) { if (lag < 2) return 0; @@ -2315,8 +2410,7 @@ Ping_gfx_num (int lag) return 4; } -static int -Ping_gfx_color (UINT32 lag) +static int Ping_gfx_color(UINT32 lag) { if (lag < 2) return SKINCOLOR_JAWZ; @@ -2339,8 +2433,7 @@ Ping_gfx_color (UINT32 lag) return SKINCOLOR_WHITE; // to make the flashing work } -static const UINT8 * -Ping_gfx_colormap (UINT32 lag, boolean gentleman) +static const UINT8 *Ping_gfx_colormap(UINT32 lag, boolean gentleman) { const UINT8 *colormap = NULL; @@ -2360,8 +2453,7 @@ Ping_gfx_colormap (UINT32 lag, boolean gentleman) return colormap; } -static UINT32 -Ping_conversion (UINT32 lag) +static UINT32 Ping_conversion(UINT32 lag) { if (cv_pingmeasurement.value) { @@ -2478,6 +2570,26 @@ void HU_drawPlayerPing(INT32 x, INT32 y, INT32 pnum, INT32 flags) } } +void HU_drawLocalPlayerPing(INT32 x, INT32 y, INT32 flags) +{ + UINT32 lag = localplayerping; + const boolean gentleman = (cv_mindelay.value && (lag < (tic_t)simulated_lag)); + + if (gentleman) + { + lag = simulated_lag; + } + + if (cv_pingstyle.value == 0) // kart + { + HU_drawKartPing(x, y, lag, flags, gentleman); + } + else if (cv_pingstyle.value == 1) // old style ping + { + HU_drawOldPing(x, y, lag, flags, gentleman); + } +} + // // HU_DrawSpectatorTicker // diff --git a/src/hu_stuff.h b/src/hu_stuff.h index 16b4bf0fc..8cfd650cb 100644 --- a/src/hu_stuff.h +++ b/src/hu_stuff.h @@ -88,6 +88,10 @@ extern patch_t *tallminus; // set true whenever the tab rankings are being shown for any reason extern boolean hu_showscores; +extern consvar_t cv_chat_xoffset; +extern consvar_t cv_chat_yoffset; +extern consvar_t cv_chat_showlimit; + // init heads up data at game startup. void HU_Init(void); @@ -104,6 +108,7 @@ void HU_Drawer(void); char HU_dequeueChatChar(void); void HU_clearChatChars(void); void HU_drawPlayerPing(INT32 x, INT32 y, INT32 pnum, INT32 flags); // Lat': Ping drawer for scoreboard. +void HU_drawLocalPlayerPing(INT32 x, INT32 y, INT32 flags); void HU_DrawTabRankings(INT32 x, INT32 y, playersort_t *tab, INT32 scorelines, INT32 hilicol); void HU_DrawEmeralds(INT32 x, INT32 y, INT32 pemeralds); const char *HU_SkinColorToConsoleColor(skincolors_t color); diff --git a/src/i_joy.h b/src/i_joy.h index d1282e945..62562e55c 100644 --- a/src/i_joy.h +++ b/src/i_joy.h @@ -36,25 +36,7 @@ extern "C" { "JOYBUTTONS is greater than INT64 bits can hold" #endif -/** \brief The struct JoyType_s - - share some joystick information (maybe 2 for splitscreen), to the game input code, - actually, we need to know if it is a gamepad or analog controls -*/ - -struct JoyType_s -{ - /*! this joystick is a gamepad, read: digital axes - if FALSE, interpret the joystick event data as JOYAXISRANGE (see above) */ - INT32 bGamepadStyle; - -}; -typedef struct JoyType_s JoyType_t; -/** \brief Joystick info - for palyer[sic] 1-4's joystick/gamepad -*/ - -extern JoyType_t Joystick[MAXSPLITSCREENPLAYERS]; +#define DigitalGamepadStyle(i) (cv_joyscale[i].value == 0) #ifdef __cplusplus } // extern "C" diff --git a/src/i_system.h b/src/i_system.h index 9457e9c6d..9f7b0ae2e 100644 --- a/src/i_system.h +++ b/src/i_system.h @@ -14,6 +14,9 @@ #ifndef __I_SYSTEM__ #define __I_SYSTEM__ +// page for Saturn issue reports +#define SATURNISSUEPAGE "https://github.com/Indev450/SRB2Kart-Saturn/issues" + #ifdef __cplusplus extern "C" { #endif @@ -203,6 +206,15 @@ void I_ShutdownSystem(void); /** \brief To check if a Interrupt or Terminate Signal was fired */ boolean I_Interrupted(void); +static inline void I_HandleInterrupt(void) +{ + if (I_Interrupted()) + I_Quit(); +} + +/** \brief Open A URL + */ +int I_OpenURL(const char *url); /** \brief The I_GetDiskFreeSpace function diff --git a/src/i_tcp.c b/src/i_tcp.c index f7f4a3210..4eab1efbc 100644 --- a/src/i_tcp.c +++ b/src/i_tcp.c @@ -1694,6 +1694,7 @@ boolean I_InitTcpNetwork(void) hardware_MAXPACKETLENGTH = MAXPACKETLENGTH; } } + if (M_CheckProtoParam("ip")) { COM_ImmedExecute(va("exec \"%s"PATHSEP"kartexec.cfg\" -noerror\n", srb2home)); diff --git a/src/info.h b/src/info.h index c84d63214..59dd2daca 100644 --- a/src/info.h +++ b/src/info.h @@ -452,7 +452,11 @@ void A_SpawnFreshCopy(void *actor); extern boolean actionsoverridden[NUMACTIONS]; // ratio of states to sprites to mobj types is roughly 6 : 1 : 1 +#ifdef COMPAT_VANILLA #define NUMMOBJFREESLOTS 1024 +#else +#define NUMMOBJFREESLOTS 4096 // should be sufficient +#endif #define NUMSPRITEFREESLOTS NUMMOBJFREESLOTS #define NUMSTATEFREESLOTS (NUMMOBJFREESLOTS*8) diff --git a/src/k_hud.c b/src/k_hud.c index 07d065219..9dbdb935b 100644 --- a/src/k_hud.c +++ b/src/k_hud.c @@ -98,6 +98,8 @@ consvar_t cv_showminimapfinished = {"showminimapfinished", "On", CV_SAVE, CV_OnO CV_PossibleValue_t minimapdot_cons_t[NUMMINIMAPDOTSTUFF]; consvar_t cv_showminimapangle = {"showminimapangle", "Off", CV_SAVE, minimapdot_cons_t, NULL, 0, NULL, NULL, 0, 0, NULL}; +consvar_t cv_spinoutroll = {"spinoutroll", "Off", CV_SAVE, CV_OnOff, NULL, 0, NULL, NULL, 0, 0, NULL}; + static CV_PossibleValue_t posanim_cons_t[] = {{0, "Off"}, {1, "On"}, {2, "Smooth"}, {0, NULL}}; consvar_t cv_posanim = {"postitionanimation", "On", CV_SAVE, posanim_cons_t, NULL, 0, NULL, NULL, 0, 0, NULL}; consvar_t cv_smallposnum = {"smallpositionnumber", "Off", CV_SAVE, CV_OnOff, NULL, 0, NULL, NULL, 0, 0, NULL}; @@ -110,6 +112,11 @@ consvar_t cv_fancyroulette = {"animatedroulette", "Off", CV_SAVE, CV_OnOff, NULL consvar_t cv_darkitembox = {"darkitembox", "On", CV_SAVE, CV_OnOff, NULL, 0, NULL, NULL, 0, 0, NULL}; // itembox gets a dark border with specific items consvar_t cv_multiitemicon = {"multiitemicon", "Off", CV_SAVE, CV_OnOff, NULL, 0, NULL, NULL, 0, 0, NULL}; +enum { ROULETTECOLOR_NONE = -1, ROULETTECOLOR_HUD, ROULETTECOLOR_PLAYER, ROULETTECOLOR_ITEM }; +static CV_PossibleValue_t roulettecolor_cons_t[] = { + {ROULETTECOLOR_NONE, "None"}, {ROULETTECOLOR_HUD, "Hud"}, {ROULETTECOLOR_PLAYER, "Player"}, {ROULETTECOLOR_ITEM, "Item"}, {0, NULL}}; +consvar_t cv_roulettecolor = {"roulettecolor", "Hud", CV_SAVE, roulettecolor_cons_t, NULL, 0, NULL, NULL, 0, 0, NULL}; + consvar_t cv_showlaptimes = {"showlaptimes", "Off", CV_SAVE, CV_OnOff, NULL, 0, NULL, NULL, 0, 0, NULL}; consvar_t cv_biglaps = {"biglaphud", "On", CV_SAVE, CV_OnOff, NULL, 0, NULL, NULL, 0, 0, NULL}; // here for ppl who dont want to make 2 more patches for their custom hud @@ -226,6 +233,7 @@ void K_RegisterKartHudStuff(void) CV_RegisterVar(&cv_showminimapnames); CV_RegisterVar(&cv_showminimapfinished); CV_RegisterVar(&cv_showminimapangle); + CV_RegisterVar(&cv_spinoutroll); CV_RegisterVar(&cv_showlapemblem); @@ -243,6 +251,8 @@ void K_RegisterKartHudStuff(void) CV_RegisterVar(&cv_multiitemicon); CV_RegisterVar(&cv_huditemamount); + CV_RegisterVar(&cv_roulettecolor); + CV_RegisterVar(&cv_highresportrait); CV_RegisterVar(&cv_nametag); @@ -1136,7 +1146,7 @@ enum SPEEDO_PMETERSMOL, }; -static SINT8 K_GetSpeedometerStyle(void) +static UINT8 K_GetSpeedometerStyle(void) { if (cv_newspeedometer.value == 2 && xtra_speedo) return SPEEDO_EXTRA; @@ -1507,74 +1517,77 @@ static void K_drawKartItem(void) if (stplyr->kartstuff[k_itemroulette]) { - localcolor = K_GetHudColor(); + if (cv_roulettecolor.value == ROULETTECOLOR_PLAYER) + localcolor = stplyr->skincolor; + else if (cv_roulettecolor.value != ROULETTECOLOR_NONE) + localcolor = K_GetHudColor(); switch ((stplyr->kartstuff[k_itemroulette] % (14*3)) / 3) { // Each case is handled in threes, to give three frames of in-game time to see the item on the roulette case 0: // Sneaker localpatch = kp_sneaker[offset]; - //localcolor = SKINCOLOR_RASPBERRY; + if (cv_roulettecolor.value == ROULETTECOLOR_ITEM) localcolor = SKINCOLOR_RASPBERRY; break; case 1: // Banana localpatch = kp_banana[offset]; - //localcolor = SKINCOLOR_YELLOW; + if (cv_roulettecolor.value == ROULETTECOLOR_ITEM) localcolor = SKINCOLOR_YELLOW; break; case 2: // Orbinaut localpatch = kp_orbinaut[3+offset]; - //localcolor = SKINCOLOR_STEEL; + if (cv_roulettecolor.value == ROULETTECOLOR_ITEM) localcolor = SKINCOLOR_STEEL; break; case 3: // Mine localpatch = kp_mine[offset]; - //localcolor = SKINCOLOR_JET; + if (cv_roulettecolor.value == ROULETTECOLOR_ITEM) localcolor = SKINCOLOR_JET; break; case 4: // Grow localpatch = kp_grow[offset]; - //localcolor = SKINCOLOR_TEAL; + if (cv_roulettecolor.value == ROULETTECOLOR_ITEM) localcolor = SKINCOLOR_TEAL; break; case 5: // Hyudoro localpatch = kp_hyudoro[offset]; - //localcolor = SKINCOLOR_STEEL; + if (cv_roulettecolor.value == ROULETTECOLOR_ITEM) localcolor = SKINCOLOR_STEEL; break; case 6: // Rocket Sneaker localpatch = kp_rocketsneaker[offset]; - //localcolor = SKINCOLOR_TANGERINE; + if (cv_roulettecolor.value == ROULETTECOLOR_ITEM) localcolor = SKINCOLOR_TANGERINE; break; case 7: // Jawz localpatch = kp_jawz[offset]; - //localcolor = SKINCOLOR_JAWZ; + if (cv_roulettecolor.value == ROULETTECOLOR_ITEM) localcolor = SKINCOLOR_JAWZ; break; case 8: // Self-Propelled Bomb localpatch = kp_selfpropelledbomb[offset]; - //localcolor = SKINCOLOR_JET; + if (cv_roulettecolor.value == ROULETTECOLOR_ITEM) localcolor = SKINCOLOR_JET; break; case 9: // Shrink localpatch = kp_shrink[offset]; - //localcolor = SKINCOLOR_ORANGE; + if (cv_roulettecolor.value == ROULETTECOLOR_ITEM) localcolor = SKINCOLOR_ORANGE; break; case 10: // Invincibility localpatch = localinv; - //localcolor = SKINCOLOR_GREY; + if (cv_roulettecolor.value == ROULETTECOLOR_ITEM) localcolor = SKINCOLOR_GREY; break; case 11: // Eggman Monitor localpatch = kp_eggman[offset]; - //localcolor = SKINCOLOR_ROSE; + if (cv_roulettecolor.value == ROULETTECOLOR_ITEM) localcolor = SKINCOLOR_ROSE; break; case 12: // Ballhog localpatch = kp_ballhog[offset]; - //localcolor = SKINCOLOR_LILAC; + if (cv_roulettecolor.value == ROULETTECOLOR_ITEM) localcolor = SKINCOLOR_LILAC; break; case 13: // Thunder Shield localpatch = kp_thundershield[offset]; - //localcolor = SKINCOLOR_CYAN; + if (cv_roulettecolor.value == ROULETTECOLOR_ITEM) localcolor = SKINCOLOR_CYAN; break; /*case 14: // Pogo Spring localpatch = kp_pogospring[offset]; - localcolor = SKINCOLOR_TANGERINE; + if (cv_roulettecolor.value == ROULETTECOLOR_ITEM) localcolor = SKINCOLOR_TANGERINE; break; case 15: // Kitchen Sink localpatch = kp_kitchensink[offset]; - localcolor = SKINCOLOR_STEEL; + if (cv_roulettecolor.value == ROULETTECOLOR_ITEM) localcolor = SKINCOLOR_STEEL; break;*/ default: break; @@ -3568,6 +3581,10 @@ static void K_drawKartMinimapHead(mobj_t *mo, INT32 x, INT32 y, INT32 flags) #endif skin = K_GetMobjSkin(mo); + + if (!skin) + return; + minimaphead = (skinlocal ? localfacemmapprefix : facemmapprefix)[K_GetMobjSkinNum(skin, skinlocal)]; if (minimaphead == NULL) @@ -3771,6 +3788,9 @@ static void K_drawKartMinimap(void) mobj_t *mobj = players[localplayers[i]].mo; + if (!mobj) + continue; + // dont draw for no contestants boolean playertimedout = (mobj->health <= 0 && players[localplayers[i]].pflags & PF_TIMEOVER); @@ -3928,10 +3948,23 @@ static void K_drawBattleFullscreen(void) INT32 x = BASEVIDWIDTH/2; INT32 y = (-64*FRACUNIT) + cardanim; // card animation goes from 0 to 164, 164 is the middle of the screen - INT32 splitflags = V_SNAPTOTOP; // I don't feel like properly supporting non-green resolutions, so you can have a misuse of SNAPTO instead + INT32 splitflags = splitscreen ? V_SNAPTOTOP : 0; // I don't feel like properly supporting non-green resolutions, so you can have a misuse of SNAPTO instead fixed_t scale = FRACUNIT; boolean drawcomebacktimer = true; // lazy hack because it's cleaner in the long run. + // Small hack, if we're not in splitscreen we will not use V_SNAPTOTOP, instead we will just slightly offset + // y position so "attack or protect" doesn't slightly show before popping in + // We will also reduce this when is closer to finishing so when its at the bottom, the "hack offset" is 0 + if (!splitscreen) + { + fixed_t offset = ((vid.height - vid.dup*BASEVIDHEIGHT)/vid.dup) * FRACUNIT/2; + + // cardanim goes from 0 to 164, so when it is 164 offset will be multiplied by (1 - 164/164) = 0 :3 + offset = FixedMul(offset, FRACUNIT - FixedDiv(cardanim, 164*FRACUNIT)); + + y -= offset; + } + if (!LUA_HudEnabled(hud_battlecomebacktimer)) drawcomebacktimer = false; @@ -4019,12 +4052,12 @@ static void K_drawBattleFullscreen(void) if (K_UseColorHud()) // Colourized hud { UINT8 *colormap = R_GetTranslationColormap(TC_DEFAULT, K_GetHudColor(), GTC_CACHE); - V_DrawFixedPatch(x<kartstuff[k_comebacktimer]/TICRATE)); + V_DrawKartString(x-txoff, ty, splitflags, va("%d", stplyr->kartstuff[k_comebacktimer]/TICRATE)); } } @@ -4282,7 +4315,7 @@ static void K_drawInput(void) // kart does not have anything we can get analogue joystick y axis values from // during normal gameplay, so replicate shit here - const boolean analogjoystickmove = (!demo.playback && P_IsLocalPlayer(stplyr) && cv_usejoystick[stplyrnum].value && !Joystick[stplyrnum].bGamepadStyle); + const boolean analogjoystickmove = (!demo.playback && P_IsLocalPlayer(stplyr) && cv_usejoystick[stplyrnum].value && !DigitalGamepadStyle(stplyrnum)); axis = analogjoystickmove ? JoyAxis(AXISAIM, stplyrnum+1) : 0; if (axis != 0) @@ -4384,6 +4417,9 @@ static void K_drawChallengerScreen(void) static void K_drawLapStartAnim(void) { + if (!cv_showlapemblem.value) + return; + // This is an EVEN MORE insanely complicated animation. const UINT8 progress = 80-stplyr->kartstuff[k_lapanimation]; UINT8 *colormap = R_GetTranslationColormap(TC_DEFAULT, K_GetHudColor(), GTC_CACHE); @@ -4427,9 +4463,10 @@ static void K_drawLapStartAnim(void) V_DrawFixedPatch(leftx, y, FRACUNIT, vflags, kp_lapanim_lap[min(progress/2, 6)], NULL); char *lapnum = va("%02d", stplyr->laps + 1); - const size_t laplength = strlen(lapnum); - for (size_t i = 0; i < laplength; i++) + const int laplength = (int)strlen(lapnum); + + for (int i = 0; i < laplength; i++) { int digit = lapnum[i] - '0'; int frame = min(2, progress/2 - 8 - (i*2)); @@ -4559,7 +4596,11 @@ static void K_drawCheckpointDebugger(void) else V_DrawString(8, 184, 0, va("Checkpoint: %d / %d (Skip: %d)", stplyr->starpostnum, numstarposts, ((numstarposts/2) + stplyr->starpostnum))); - V_DrawString(8, 192, 0, va("Waypoint dist: Prev %d, Next %d", stplyr->kartstuff[k_prevcheck], stplyr->kartstuff[k_nextcheck])); + // really gnarly hack + const INT32 prevcheck = (stprevnextchecks[0] != INT32_MAX) ? stprevnextchecks[0]: stplyr->kartstuff[k_prevcheck]; + const INT32 nextcheck = (stprevnextchecks[1] != INT32_MAX) ? stprevnextchecks[1]: stplyr->kartstuff[k_nextcheck]; + + V_DrawString(8, 192, 0, va("Waypoint dist: Prev %d, Next %d", prevcheck, nextcheck)); } // determines if gametype info (laps/bumpers) should be hidden @@ -4811,7 +4852,7 @@ void K_drawKartHUD(void) { if (stplyr->exiting) K_drawKartFinish(); - else if (stplyr->kartstuff[k_lapanimation] && !splitscreen && cv_showlapemblem.value) + else if (stplyr->kartstuff[k_lapanimation] && !splitscreen) K_drawLapStartAnim(); } diff --git a/src/k_hud.h b/src/k_hud.h index ca38f43ea..45d5260d6 100644 --- a/src/k_hud.h +++ b/src/k_hud.h @@ -41,6 +41,7 @@ extern consvar_t cv_showlaptimes; extern consvar_t cv_battlespeedo; extern consvar_t cv_multiitemicon; extern consvar_t cv_huditemamount; +extern consvar_t cv_roulettecolor; // for use in timeattack menu extern patch_t *kp_facenum[MAXPLAYERS+1]; diff --git a/src/k_kart.c b/src/k_kart.c index ad29d1cb5..e77c0b5ee 100644 --- a/src/k_kart.c +++ b/src/k_kart.c @@ -34,7 +34,7 @@ // extra colourisation stuff -static CV_PossibleValue_t colorspeedlines_cons_t[] = {{0, "Off"}, {1, "Normal"}, {2, "+Driftcharge"}, {3, "Drift only"}, {0, NULL}}; +static CV_PossibleValue_t colorspeedlines_cons_t[] = {{0, "Off"}, {1, "On"}, {0, NULL}}; consvar_t cv_coloredspeedlines = {"colorizedspeedlines", "Off", CV_SAVE, colorspeedlines_cons_t, NULL, 0, NULL, NULL, 0, 0, NULL}; consvar_t cv_coloredsneakertrail = {"sneakertrailcolor", "Off", CV_SAVE, CV_OnOff, NULL, 0, NULL, NULL, 0, 0, NULL}; @@ -67,7 +67,8 @@ static CV_PossibleValue_t sloperoll_cons_t[] = {{0, "Off"}, {1, "Players"}, {2, consvar_t cv_sloperoll = {"sloperoll", "Off", CV_SAVE|CV_CALL, sloperoll_cons_t, PDistort_menu_Onchange, 0, NULL, NULL, 0, 0, NULL}; consvar_t cv_sparkroll = {"sparkroll", "Off", CV_SAVE|CV_CALL, CV_OnOff, PDistort_menu_Onchange, 0, NULL, NULL, 0, 0, NULL}; consvar_t cv_sliptideroll = {"sliptideroll", "Off", CV_SAVE, CV_OnOff, NULL, 0, NULL, NULL, 0, 0, NULL}; -consvar_t cv_spinoutroll = {"spinoutroll", "Off", CV_SAVE, CV_OnOff, NULL, 0, NULL, NULL, 0, 0, NULL}; +consvar_t cv_stairjank = {"stairjank", "Off", CV_SAVE|CV_CALL, CV_OnOff, PDistort_menu_Onchange, 0, NULL, NULL, 0, 0, NULL}; +consvar_t cv_stairjanksfx = {"stairjanksfx", "Off", CV_SAVE, CV_OnOff, NULL, 0, NULL, NULL, 0, 0, NULL}; //hardcode saltyhop mhhm static void saltyhop_onchange(void); @@ -1897,6 +1898,7 @@ void K_RespawnChecker(player_t *player) void K_KartMoveAnimation(player_t *player) { ticcmd_t *cmd = &player->cmd; + // Standing frames - S_KART_STND1 S_KART_STND1_L S_KART_STND1_R if (player->speed == 0) { @@ -2102,16 +2104,22 @@ static void K_HandleDelayedHitByEm(player_t *player) void K_MomentumToFacing(player_t *player) { - angle_t dangle = player->mo->angle - R_PointToAngle2(0, 0, player->mo->momx, player->mo->momy); - - if (dangle > ANGLE_180) - dangle = InvAngle(dangle); - // If you aren't on the ground or are moving in too different of a direction don't do this if (player->mo->eflags & MFE_JUSTHITFLOOR) ; // Just hit floor ALWAYS redirects - else if (!P_IsObjectOnGround(player->mo) || dangle > ANGLE_90) - return; + else + { + if (!P_IsObjectOnGround(player->mo)) + return; + + angle_t dangle = player->mo->angle - R_PointToAngle2(0, 0, player->mo->momx, player->mo->momy); + + if (dangle > ANGLE_180) + dangle = InvAngle(dangle); + + if (dangle > ANGLE_90) + return; + } P_Thrust(player->mo, player->mo->angle, player->speed - FixedMul(player->speed, player->mo->friction)); player->mo->momx = FixedMul(player->mo->momx - player->cmomx, player->mo->friction) + player->cmomx; @@ -2492,6 +2500,7 @@ void K_SpinPlayer(player_t *player, mobj_t *source, INT32 type, mobj_t *inflicto if (!player->kartstuff[k_bumper]) { player->kartstuff[k_comebacktimer] = comebacktime; + if (player->kartstuff[k_comebackmode] == 2) { mobj_t *poof = P_SpawnMobj(player->mo->x, player->mo->y, player->mo->z, MT_EXPLODE); @@ -2507,9 +2516,12 @@ void K_SpinPlayer(player_t *player, mobj_t *source, INT32 type, mobj_t *inflicto if (player->kartstuff[k_spinouttype] <= 0) // type 0 is spinout, type 1 is wipeout, type 2 is spb { + const fixed_t spd = K_GetKartSpeed(player, true)/4; + // At spinout, player speed is increased to 1/4 their regular speed, moving them forward - if (player->speed < K_GetKartSpeed(player, true)/4) - P_InstaThrust(player->mo, player->mo->angle, FixedMul(K_GetKartSpeed(player, true)/4, player->mo->scale)); + if (player->speed < spd) + P_InstaThrust(player->mo, player->mo->angle, FixedMul(spd, player->mo->scale)); + S_StartSound(player->mo, sfx_slip); } @@ -2520,10 +2532,12 @@ void K_SpinPlayer(player_t *player, mobj_t *source, INT32 type, mobj_t *inflicto P_SetPlayerMobjState(player->mo, S_KART_SPIN); player->kartstuff[k_instashield] = 15; + if (cv_kartdebughuddrop.value && !modeattacking) K_DropItems(player); else K_DropHnextList(player); + return; } @@ -3498,6 +3512,16 @@ boolean K_ShouldSlopeRoll(mobj_t *mobj) return K_CheckSlopeRollDist(mobj); } +static INT32 K_AltFlip(INT32 n, tic_t tics) +{ + return leveltime % (2 * tics) < tics ? n : -(n); +} + +static INT32 K_StairJankFlip(INT32 value) +{ + return K_AltFlip(value, 2); +} + #define SLOPEROLL_DIV 3 void K_RollMobjBySlopes(mobj_t* mo, pslope_t *slope) { @@ -3932,17 +3956,16 @@ static mobj_t *K_ThrowKartItem(player_t *player, boolean missile, mobjtype_t map if (cv_bananthrowroll.value && (mapthing == MT_BANANA)) { - //mo->angle = FixedAngle(M_RandomRange(-180, 180) << FRACBITS); - if (cv_bananthrowroll.value == 1 && K_CheckSlopeRollDist(mo)) - mo->sloperoll = (angle_t)FixedAngle(M_RandomRange(-180, 180) << FRACBITS); // im lazy but this makes sure the banan goes back to upright when it lands lmao - else if (cv_bananthrowroll.value == 2) - mo->rollangle = (angle_t)FixedAngle(M_RandomRange(-180, 180) << FRACBITS); + const angle_t speen = (angle_t)FixedAngle(M_RandomRange(-180, 180) << FRACBITS); + //mo->angle = speen; + mo->rollangle = speen; } } // this is the small graphic effect that plops in you when you throw an item: throwmo = P_SpawnMobj(player->mo->x, player->mo->y, player->mo->z + player->mo->height/2, MT_FIREDITEM); P_SetTarget(&throwmo->target, player->mo); + // Ditto: if (player->mo->eflags & MFE_VERTICALFLIP) { @@ -3986,6 +4009,7 @@ static mobj_t *K_ThrowKartItem(player_t *player, boolean missile, mobjtype_t map // floorz and ceilingz aren't properly set to account for FOFs and Polyobjects on spawn // This should set it for FOFs P_SetOrigin(mo, mo->x, mo->y, mo->z); // however, THIS can fuck up your day. just absolutely ruin you. + if (P_MobjWasRemoved(mo)) return NULL; @@ -4296,8 +4320,10 @@ static void K_DoShrink(player_t *user) { players[i].mo->scalespeed = mapobjectscale/TICRATE; players[i].mo->destscale = (6*mapobjectscale)/8; + if (cv_kartdebugshrink.value && !modeattacking && !players[i].bot) players[i].mo->destscale = (6*players[i].mo->destscale)/8; + S_StartSound(players[i].mo, sfx_kc59); } } @@ -4542,49 +4568,59 @@ void K_DropHnextList(player_t *player) P_RemoveMobj(work); } + // we need this here too because this is done in afterthink - pointers are cleaned up at the START of each tic... + P_SetTarget(&player->mo->hnext, NULL); + player->kartstuff[k_bananadrag] = 0; + + if (player->kartstuff[k_eggmanheld]) + player->kartstuff[k_eggmanheld] = 0; + else if (player->kartstuff[k_itemheld] + && (dropall || (--player->kartstuff[k_itemamount] <= 0))) { - // we need this here too because this is done in afterthink - pointers are cleaned up at the START of each tic... - P_SetTarget(&player->mo->hnext, NULL); - player->kartstuff[k_bananadrag] = 0; - if (player->kartstuff[k_eggmanheld]) - player->kartstuff[k_eggmanheld] = 0; - else if (player->kartstuff[k_itemheld] - && (dropall || (--player->kartstuff[k_itemamount] <= 0))) - { - player->kartstuff[k_itemamount] = player->kartstuff[k_itemheld] = 0; - player->kartstuff[k_itemtype] = KITEM_NONE; - } + player->kartstuff[k_itemamount] = player->kartstuff[k_itemheld] = 0; + player->kartstuff[k_itemtype] = KITEM_NONE; } } +static void K_DropPaperItem(player_t *player, boolean thunderhack, INT32 itemamount) +{ + const mobj_t *pmo = player->mo; + + if (P_MobjWasRemoved(pmo)) + { + return; + } + + mobj_t *drop = P_SpawnMobj(pmo->x, pmo->y, (pmo->z + pmo->height/2), MT_FLOATINGITEM); + P_SetScale(drop, drop->scale>>4); + + drop->destscale = (3*drop->destscale)/2; + + drop->angle = pmo->angle + ANGLE_90; + P_Thrust(drop, FixedAngle(P_RandomFixed()*180) + pmo->angle + ANGLE_90, 16*mapobjectscale); + drop->momz = P_MobjFlip(pmo)*3*mapobjectscale; + if (drop->eflags & MFE_UNDERWATER) + drop->momz = (117 * drop->momz) / 200; + + drop->threshold = (thunderhack ? KITEM_THUNDERSHIELD : player->kartstuff[k_itemtype]); + drop->movecount = itemamount; + + drop->flags |= MF_NOCLIPTHING; +} + // For getting EXTRA hit! void K_DropItems(player_t *player) { - boolean thunderhack = (player->kartstuff[k_curshield] && player->kartstuff[k_itemtype] == KITEM_THUNDERSHIELD); + const boolean thunderhack = (player->kartstuff[k_curshield] && player->kartstuff[k_itemtype] == KITEM_THUNDERSHIELD); if (thunderhack) player->kartstuff[k_itemtype] = KITEM_NONE; K_DropHnextList(player); - if (!P_MobjWasRemoved(player->mo) && player->kartstuff[k_itemamount]) + if (player->kartstuff[k_itemamount]) { - mobj_t *drop = P_SpawnMobj(player->mo->x, player->mo->y, player->mo->z + player->mo->height/2, MT_FLOATINGITEM); - P_SetScale(drop, drop->scale>>4); - drop->destscale = (3*drop->destscale)/2; - - drop->angle = player->mo->angle + ANGLE_90; - P_Thrust(drop, - FixedAngle(P_RandomFixed()*180) + player->mo->angle + ANGLE_90, - 16*mapobjectscale); - drop->momz = P_MobjFlip(player->mo)*3*mapobjectscale; - if (drop->eflags & MFE_UNDERWATER) - drop->momz = (117 * drop->momz) / 200; - - drop->threshold = (thunderhack ? KITEM_THUNDERSHIELD : player->kartstuff[k_itemtype]); - drop->movecount = player->kartstuff[k_itemamount]; - - drop->flags |= MF_NOCLIPTHING; + K_DropPaperItem(player, thunderhack, player->kartstuff[k_itemamount]); } K_StripItems(player); @@ -4602,7 +4638,7 @@ void K_DropRocketSneaker(player_t *player) while ((shoe = shoe->hnext) && !P_MobjWasRemoved(shoe)) { if (shoe->type != MT_ROCKETSNEAKER) - return; //woah, not a rocketsneaker, bail! safeguard in case this gets used when you're holding non-rocketsneakers + return; // woah, not a rocketsneaker, bail! safeguard in case this gets used when you're holding non-rocketsneakers shoe->flags2 &= ~MF2_DONTDRAW; shoe->flags &= ~MF_NOGRAVITY; @@ -4629,6 +4665,7 @@ void K_DropRocketSneaker(player_t *player) leftshoe = false; } + P_SetTarget(&player->mo->hnext, NULL); player->kartstuff[k_rocketsneakertimer] = 0; } @@ -4639,7 +4676,7 @@ void K_DropKitchenSink(player_t *player) return; if (player->mo->hnext->type != MT_SINK_SHIELD) - return; //so we can just call this function regardless of what is being held + return; // so we can just call this function regardless of what is being held P_KillMobj(player->mo->hnext, NULL, NULL); @@ -4665,9 +4702,8 @@ void K_RepairOrbitChain(mobj_t *orbit) } // Then recount to make sure item amount is correct - if (orbit->target && orbit->target->player) + if (!P_MobjWasRemovedCompat(orbit->target) && orbit->target->player) { - player_t *player = orbit->target->player; INT32 num = 0; mobj_t *cur = orbit->target->hnext; @@ -4677,13 +4713,14 @@ void K_RepairOrbitChain(mobj_t *orbit) { prev = cur; cur = cur->hnext; - if (++num > player->kartstuff[k_itemamount]) + if (++num > orbit->target->player->kartstuff[k_itemamount]) P_RemoveMobj(prev); else prev->movedir = num; } - player->kartstuff[k_itemamount] = num; + if (!P_MobjWasRemovedCompat(orbit->target)) + orbit->target->player->kartstuff[k_itemamount] = num; } } @@ -4829,7 +4866,7 @@ static void K_CalculateBananaSlope(mobj_t *mobj, fixed_t x, fixed_t y, fixed_t z // Move the hnext chain! static void K_MoveHeldObjects(player_t *player) { - if (!player->mo) + if (P_MobjWasRemovedCompat(player->mo)) return; if (!player->mo->hnext) @@ -4843,6 +4880,7 @@ static void K_MoveHeldObjects(player_t *player) player->kartstuff[k_itemamount] = player->kartstuff[k_itemheld] = 0; player->kartstuff[k_itemtype] = KITEM_NONE; } + return; } @@ -4859,6 +4897,7 @@ static void K_MoveHeldObjects(player_t *player) player->kartstuff[k_itemamount] = player->kartstuff[k_itemheld] = 0; player->kartstuff[k_itemtype] = KITEM_NONE; } + return; } @@ -4874,7 +4913,6 @@ static void K_MoveHeldObjects(player_t *player) while (!P_MobjWasRemoved(cur)) { - const fixed_t radius = FixedHypot(player->mo->radius, player->mo->radius) + FixedHypot(cur->radius, cur->radius); // mobj's distance from its Target, or Radius. fixed_t z; if (!cur->health) @@ -4883,6 +4921,8 @@ static void K_MoveHeldObjects(player_t *player) continue; } + const fixed_t radius = FixedHypot(player->mo->radius, player->mo->radius) + FixedHypot(cur->radius, cur->radius); // mobj's distance from its Target, or Radius. + cur->color = player->skincolor; cur->angle -= ANGLE_90; @@ -4912,8 +4952,10 @@ static void K_MoveHeldObjects(player_t *player) cur->momx = FixedMul(FINECOSINE(cur->angle>>ANGLETOFINESHIFT), cur->extravalue1); cur->momy = FixedMul(FINESINE(cur->angle>>ANGLETOFINESHIFT), cur->extravalue1); cur->flags &= ~MF_NOCLIPTHING; + if (!P_TryMove(cur, player->mo->x + cur->momx, player->mo->y + cur->momy, true)) P_SlideMove(cur, true); + if (P_IsObjectOnGround(player->mo)) { if (P_MobjFlip(cur) > 0) @@ -4947,14 +4989,11 @@ static void K_MoveHeldObjects(player_t *player) mobj_t *cur = player->mo->hnext; mobj_t *targ = player->mo; - const boolean ponground = P_IsObjectOnGround(player->mo); - - if (ponground && player->speed > 0) + if (player->speed > 0 && P_IsObjectOnGround(player->mo)) player->kartstuff[k_bananadrag]++; while (!P_MobjWasRemoved(cur)) { - const fixed_t radius = FixedHypot(targ->radius, targ->radius) + FixedHypot(cur->radius, cur->radius); angle_t ang; fixed_t targx, targy, targz; fixed_t speed, dist; @@ -4967,6 +5006,8 @@ static void K_MoveHeldObjects(player_t *player) continue; } + const fixed_t radius = FixedHypot(targ->radius, targ->radius) + FixedHypot(cur->radius, cur->radius); + if (cur->extravalue1 < radius) cur->extravalue1 += FixedMul(P_AproxDistance(cur->extravalue1, radius), FRACUNIT/12); if (cur->extravalue1 > radius) @@ -4997,7 +5038,8 @@ static void K_MoveHeldObjects(player_t *player) cur->angle = R_PointToAngle2(cur->x, cur->y, targx, targy); - /*if (P_IsObjectOnGround(player->mo) && player->speed > 0 && player->kartstuff[k_bananadrag] > TICRATE + /*if (player->speed > 0 && P_IsObjectOnGround(player->mo) + && player->kartstuff[k_bananadrag] > TICRATE && P_RandomChance(min(FRACUNIT/2, FixedDiv(player->speed, K_GetKartSpeed(player, false))/2))) { if (leveltime & 1) @@ -5006,8 +5048,9 @@ static void K_MoveHeldObjects(player_t *player) targz -= 8*(2*FRACUNIT)/7; }*/ - if (cv_bananajitter.value && ponground - && player->speed > 0 && player->kartstuff[k_bananadrag] > TICRATE) + // "jitter" dragged bananas around + if (cv_bananajitter.value && + player->speed > 0 && P_IsObjectOnGround(player->mo) && player->kartstuff[k_bananadrag] > TICRATE) { const fixed_t halfpspeed = FixedDiv(player->speed, K_GetKartSpeed(player, false))/2; @@ -5045,11 +5088,10 @@ static void K_MoveHeldObjects(player_t *player) while (!P_MobjWasRemoved(cur)) { - const fixed_t radius = FixedHypot(player->mo->radius, player->mo->radius) + FixedHypot(cur->radius, cur->radius); - boolean vibrate = ((leveltime & 1) && !cur->tracer); angle_t angoffset; fixed_t targx, targy, targz; - + const boolean vibrate = ((leveltime & 1) && !cur->tracer); + cur->flags &= ~MF_NOCLIPTHING; if (player->kartstuff[k_rocketsneakertimer] <= TICRATE && (leveltime & 1)) @@ -5069,6 +5111,8 @@ static void K_MoveHeldObjects(player_t *player) continue; } + const fixed_t radius = FixedHypot(player->mo->radius, player->mo->radius) + FixedHypot(cur->radius, cur->radius); + if (cur->extravalue1 < radius) cur->extravalue1 += FixedMul(P_AproxDistance(cur->extravalue1, radius), FRACUNIT/12); if (cur->extravalue1 > radius) @@ -5105,7 +5149,6 @@ static void K_MoveHeldObjects(player_t *player) targz = (player->mo->z + (player->mo->height/2)) + sine; if (player->mo->eflags & MFE_VERTICALFLIP) targz += (player->mo->height/2 - 32*player->mo->scale)*6; - } if (!P_MobjWasRemoved(cur->tracer)) @@ -5182,9 +5225,11 @@ player_t *K_FindJawzTarget(mobj_t *actor, player_t *source) // Don't go for people who are behind you if (thisang > ANGLE_67h) continue; + // Don't pay attention to people who aren't above your position if (player->kartstuff[k_position] >= source->kartstuff[k_position]) continue; + if ((best == -1) || (player->kartstuff[k_position] > best)) { wtarg = player; @@ -5417,59 +5462,15 @@ boolean K_PlayerEffectsShouldBlend(player_t *player) return false; } -static UINT8 K_GetSpeedLineColor(player_t *player, boolean colorSpeed) +FUNCINLINE static ATTRINLINE void K_SpawnNormalSpeedLines(player_t *player) { - UINT8 speedcolor = SKINCOLOR_NONE; - const UINT8 playercolor = player->mo->color; - - if (colorSpeed) - { - if (cv_coloredspeedlines.value != 3) - speedcolor = playercolor; - - if (cv_coloredspeedlines.value >= 2 && player->kartstuff[k_driftboost]) - { - if (player->kartstuff[k_driftboost] <= 20) - speedcolor = SKINCOLOR_SAPPHIRE; - else if (player->kartstuff[k_driftboost] <= 50) - speedcolor = SKINCOLOR_RASPBERRY; - else if (player->kartstuff[k_driftboost] <= 125) - speedcolor = K_RainbowColor(); - - if (cv_coloredspeedlines.value == 2) - speedcolor = (leveltime & 1) ? playercolor : speedcolor; - } - } - - if (cv_coloredspeedlines.value != 3) - { - if (player->kartstuff[k_eggmanexplode]) - { - // Make it red when you have the eggman speed boost - speedcolor = SKINCOLOR_RED; - } - else if (player->kartstuff[k_invincibilitytimer]) - { - speedcolor = playercolor; - } - } - - return speedcolor; -} - -typedef INT32 (*randomFunc)(INT32 min, INT32 max); - -FUNCINLINE static ATTRINLINE void K_SpawnNormalSpeedLines(player_t *player, boolean synched) -{ - const randomFunc randomfunc = synched ? P_RandomRange : M_RandomRange; - fixed_t rand_x; fixed_t rand_y; fixed_t rand_z; - rand_z = player->mo->z + (player->mo->height/2) + (randomfunc(-20,20) * player->mo->scale); - rand_y = player->mo->y + (randomfunc(-36,36) * player->mo->scale); - rand_x = player->mo->x + (randomfunc(-36,36) * player->mo->scale); + rand_z = player->mo->z + (player->mo->height/2) + (P_RandomRange(-20, 20) * player->mo->scale); + rand_y = player->mo->y + (P_RandomRange(-36, 36) * player->mo->scale); + rand_x = player->mo->x + (P_RandomRange(-36, 36) * player->mo->scale); mobj_t *fast = P_SpawnMobj(rand_x, rand_y, rand_z, MT_FASTLINE); @@ -5477,7 +5478,7 @@ FUNCINLINE static ATTRINLINE void K_SpawnNormalSpeedLines(player_t *player, bool fast->momx = 3*player->mo->momx/4; fast->momy = 3*player->mo->momy/4; fast->momz = 3*player->mo->momz/4; - fast->islocal = !synched; + //fast->islocal = false; P_SetTarget(&fast->target, player->mo); // easier lua access K_MatchGenericExtraFlags(fast, player->mo); @@ -5488,8 +5489,11 @@ FUNCINLINE static ATTRINLINE void K_SpawnNormalSpeedLines(player_t *player, bool if (cv_coloredspeedlines.value) { - fast->color = K_GetSpeedLineColor(player, colorSpeed); - fast->colorized = true; + if (colorSpeed || player->kartstuff[k_invincibilitytimer]) // let invul color them even when players go rather slow + { + fast->color = player->mo->color; + fast->colorized = true; + } } if (colorSpeed && K_PlayerEffectsShouldBlend(player)) @@ -5518,11 +5522,7 @@ void K_KartPlayerThink(player_t *player, ticcmd_t *cmd) // Speed lines if ((player->kartstuff[k_sneakertimer] || player->kartstuff[k_driftboost] || player->kartstuff[k_startboost]) && player->speed > 0) { - K_SpawnNormalSpeedLines(player, true); - } - else if ((cv_coloredspeedlines.value == 1 || cv_coloredspeedlines.value == 2) && player->kartstuff[k_eggmanexplode]) // gotta love the speedlines calling synched rng :chaosleep: - { - K_SpawnNormalSpeedLines(player, false); + K_SpawnNormalSpeedLines(player); } if (player->playerstate == PST_DEAD || player->kartstuff[k_respawn] > 1) // Ensure these are set correctly here @@ -5734,17 +5734,19 @@ void K_KartPlayerThink(player_t *player, ticcmd_t *cmd) else { player->kartstuff[k_eggmanexplode]--; + if (player->kartstuff[k_eggmanexplode] <= 0) { - mobj_t *eggsexplode; //player->powers[pw_flashing] = 0; - eggsexplode = P_SpawnMobj(player->mo->x, player->mo->y, player->mo->z, MT_SPBEXPLOSION); - if (player->kartstuff[k_eggmanblame] >= 0 - && player->kartstuff[k_eggmanblame] < MAXPLAYERS - && playeringame[player->kartstuff[k_eggmanblame]] - && !players[player->kartstuff[k_eggmanblame]].spectator - && players[player->kartstuff[k_eggmanblame]].mo) - P_SetTarget(&eggsexplode->target, players[player->kartstuff[k_eggmanblame]].mo); + mobj_t *eggsplode = P_SpawnMobj(player->mo->x, player->mo->y, player->mo->z, MT_SPBEXPLOSION); + + const INT32 blametarg = player->kartstuff[k_eggmanblame]; + + if ((blametarg >= 0 && blametarg < MAXPLAYERS) + && playeringame[blametarg] + && !players[blametarg].spectator + && players[blametarg].mo) + P_SetTarget(&eggsplode->target, players[blametarg].mo); } } } @@ -5763,7 +5765,7 @@ void K_KartPlayerThink(player_t *player, ticcmd_t *cmd) if (player->kartstuff[k_comebacktimer]) player->kartstuff[k_comebackmode] = 0; - if (P_IsObjectOnGround(player->mo) && player->kartstuff[k_pogospring]) + if (player->kartstuff[k_pogospring] && P_IsObjectOnGround(player->mo)) { if (P_MobjFlip(player->mo)*player->mo->momz <= 0) player->kartstuff[k_pogospring] = 0; @@ -5953,6 +5955,8 @@ INT32 K_GetKartDriftSparkValue(player_t *player) static void K_KartDrift(player_t *player, boolean onground) { + const ticcmd_t *cmd = &player->cmd; + fixed_t minspeed = (10 * player->mo->scale); INT32 dsone = K_GetKartDriftSparkValue(player); INT32 dstwo = dsone*2; @@ -5974,55 +5978,50 @@ static void K_KartDrift(player_t *player, boolean onground) { player->kartstuff[k_driftcharge] = 0; } - else if (player->kartstuff[k_driftcharge] >= dsone && player->kartstuff[k_driftcharge] < dstwo) + else if (player->kartstuff[k_driftcharge] >= dsone && + player->kartstuff[k_driftcharge] < dstwo) { if (player->kartstuff[k_driftboost] < 20) player->kartstuff[k_driftboost] = 20; + S_StartSound(player->mo, sfx_s23c); + player->kartstuff[k_driftcharge] = 0; } else if (player->kartstuff[k_driftcharge] < dsthree) { if (player->kartstuff[k_driftboost] < 50) player->kartstuff[k_driftboost] = 50; + S_StartSound(player->mo, sfx_s23c); + player->kartstuff[k_driftcharge] = 0; } else if (player->kartstuff[k_driftcharge] >= dsthree) { if (player->kartstuff[k_driftboost] < 125) player->kartstuff[k_driftboost] = 125; + S_StartSound(player->mo, sfx_s23c); + player->kartstuff[k_driftcharge] = 0; } } // Drifting: left or right? - if ((player->cmd.driftturn > 0) && player->speed > minspeed && player->kartstuff[k_jmp] == 1 - && (player->kartstuff[k_drift] == 0 || player->kartstuff[k_driftend] == 1)) // && player->kartstuff[k_drift] != 1) + if ((cmd->driftturn != 0) && player->speed > minspeed && player->kartstuff[k_jmp] == 1 + && (player->kartstuff[k_drift] == 0 || player->kartstuff[k_driftend] == 1)) { - // Starting left drift - player->kartstuff[k_drift] = 1; + // Starting left or right drift + player->kartstuff[k_drift] = intsign(cmd->driftturn); player->kartstuff[k_driftend] = 0; } - else if ((player->cmd.driftturn < 0) && player->speed > minspeed && player->kartstuff[k_jmp] == 1 - && (player->kartstuff[k_drift] == 0 || player->kartstuff[k_driftend] == 1)) // && player->kartstuff[k_drift] != -1) - { - // Starting right drift - player->kartstuff[k_drift] = -1; - player->kartstuff[k_driftend] = 0; - } - else if (player->kartstuff[k_jmp] == 0) // || player->kartstuff[k_turndir] == 0) + else if (player->kartstuff[k_jmp] == 0) { // drift is not being performed so if we're just finishing set driftend and decrement counters - if (player->kartstuff[k_drift] > 0) + if (player->kartstuff[k_drift] != 0) { - player->kartstuff[k_drift]--; - player->kartstuff[k_driftend] = 1; - } - else if (player->kartstuff[k_drift] < 0) - { - player->kartstuff[k_drift]++; + player->kartstuff[k_drift] -= intsign(player->kartstuff[k_drift]); player->kartstuff[k_driftend] = 1; } else @@ -6043,10 +6042,10 @@ static void K_KartDrift(player_t *player, boolean onground) if (player->kartstuff[k_drift] > 5) player->kartstuff[k_drift] = 5; - if (player->cmd.driftturn > 0) // Inward - driftadditive += abs(player->cmd.driftturn)/100; - if (player->cmd.driftturn < 0) // Outward - driftadditive -= abs(player->cmd.driftturn)/75; + if (cmd->driftturn > 0) // Inward + driftadditive += abs(cmd->driftturn)/100; + else if (cmd->driftturn < 0) // Outward + driftadditive -= abs(cmd->driftturn)/75; } else if (player->kartstuff[k_drift] <= -1) // Drifting to the right { @@ -6054,26 +6053,31 @@ static void K_KartDrift(player_t *player, boolean onground) if (player->kartstuff[k_drift] < -5) player->kartstuff[k_drift] = -5; - if (player->cmd.driftturn < 0) // Inward - driftadditive += abs(player->cmd.driftturn)/100; - if (player->cmd.driftturn > 0) // Outward - driftadditive -= abs(player->cmd.driftturn)/75; + if (cmd->driftturn < 0) // Inward + driftadditive += abs(cmd->driftturn)/100; + else if (cmd->driftturn > 0) // Outward + driftadditive -= abs(cmd->driftturn)/75; } // Disable drift-sparks until you're going fast enough - if (player->kartstuff[k_getsparks] == 0 || (player->kartstuff[k_offroad] && !player->kartstuff[k_invincibilitytimer] && !player->kartstuff[k_hyudorotimer] && !player->kartstuff[k_sneakertimer])) + if (player->kartstuff[k_getsparks] == 0 || + (player->kartstuff[k_offroad] && !player->kartstuff[k_invincibilitytimer] && !player->kartstuff[k_hyudorotimer] && !player->kartstuff[k_sneakertimer])) driftadditive = 0; + if (player->speed > minspeed*2) player->kartstuff[k_getsparks] = 1; - const boolean driftblue = (player->kartstuff[k_driftcharge] < dsone && player->kartstuff[k_driftcharge]+driftadditive >= dsone); - const boolean driftred = (player->kartstuff[k_driftcharge] < dstwo && player->kartstuff[k_driftcharge]+driftadditive >= dstwo); - const boolean driftrainbow = (player->kartstuff[k_driftcharge] < dsthree && player->kartstuff[k_driftcharge]+driftadditive >= dsthree); + if (player->kartstuff[k_driftcharge] < dsthree && player->kartstuff[k_driftcharge]+driftadditive >= dsthree) // rainbow drift + player->driftlevel = 3; + else if (player->kartstuff[k_driftcharge] < dstwo && player->kartstuff[k_driftcharge]+driftadditive >= dstwo) // red drift + player->driftlevel = 2; + else if (player->kartstuff[k_driftcharge] < dsone && player->kartstuff[k_driftcharge]+driftadditive >= dsone) // blue drift + player->driftlevel = 1; + else + player->driftlevel = 0; // Sound whenever you get a different tier of sparks - if (driftblue - || driftred - || driftrainbow) + if (player->driftlevel) { //S_StartSound(player->mo, sfx_s3ka2); if (P_IsLocalPlayer(player)) // UGHGHGH... @@ -6081,13 +6085,6 @@ static void K_KartDrift(player_t *player, boolean onground) S_StartSoundAtVolume(player->mo, sfx_s3ka2, 192); // Ugh... } - if (driftrainbow) - player->driftlevel = 3; - else if (driftred) - player->driftlevel = 2; - else if (driftblue) - player->driftlevel = 1; - player->driftsparkGrowTimer = DRIFTSPARKGROWTICS; } } @@ -6119,14 +6116,11 @@ static void K_KartDrift(player_t *player, boolean onground) } if ((!player->kartstuff[k_sneakertimer]) - || (!player->cmd.driftturn) + || (!cmd->driftturn) || (!player->kartstuff[k_aizdriftstrat]) - || (player->cmd.driftturn > 0) != (player->kartstuff[k_aizdriftstrat] > 0)) + || (cmd->driftturn > 0) != (player->kartstuff[k_aizdriftstrat] > 0)) { - if (!player->kartstuff[k_drift]) - player->kartstuff[k_aizdriftstrat] = 0; - else - player->kartstuff[k_aizdriftstrat] = ((player->kartstuff[k_drift] > 0) ? 1 : -1); + player->kartstuff[k_aizdriftstrat] = intsign(player->kartstuff[k_drift]); } else if (player->kartstuff[k_aizdriftstrat] && !player->kartstuff[k_drift]) { @@ -6137,18 +6131,77 @@ static void K_KartDrift(player_t *player, boolean onground) } if (player->kartstuff[k_drift] - && ((player->cmd.buttons & BT_BRAKE) - || !(player->cmd.buttons & BT_ACCELERATE)) + && ((cmd->buttons & BT_BRAKE) + || !(cmd->buttons & BT_ACCELERATE)) && P_IsObjectOnGround(player->mo)) { if (!player->kartstuff[k_brakedrift]) K_SpawnBrakeDriftSparks(player); + player->kartstuff[k_brakedrift] = 1; } else player->kartstuff[k_brakedrift] = 0; } +INT32 stprevnextchecks[2] = {INT32_MAX, INT32_MAX}; // there wont be any map this big, wont there?..... + +// K_KartUpdatePosition has a bug where whatever player comes last in the players array +// gets its distance calculations applied twice +// since we cannot fix this due to compat concerns (kartstuff is exposed after all) +// we gotta do this shit hack to atleast fix the debugcheckpoint display +static void K_KartUpdatePositionDebugHack(player_t *player, player_t *otherplayer) +{ + mobj_t *mo; + fixed_t pmo; + fixed_t ppcd, pncd; + + // dont need this crap + if (!cv_kartdebugcheckpoint.value) + return; + + // not checking against ourselves + if (player != otherplayer) + return; + + // dont care if its not first displayplayer + // since this is only used for the debug display + if (player != &players[displayplayers[0]]) + return; + + ppcd = pncd = 0; + stprevnextchecks[0] = stprevnextchecks[1] = 0; + + // This checks every thing on the map, and looks for MT_BOSS3WAYPOINT (the thing we're using for checkpoint wp's, for now) + for (mo = waypointcap; mo != NULL; mo = mo->tracer) + { + const boolean isprevcheckpointp = mo->health == player->starpostnum; + const boolean isnextcheckpointp = mo->health == (player->starpostnum + 1); + + if ((isprevcheckpointp || isnextcheckpointp) && (!mo->movecount || mo->movecount == player->laps+1)) + { + pmo = P_AproxDistance(P_AproxDistance( mo->x - player->mo->x, + mo->y - player->mo->y), + mo->z - player->mo->z) / FRACUNIT; + + if (isprevcheckpointp) + { + stprevnextchecks[0] += pmo; + ppcd++; + } + + if (isnextcheckpointp) + { + stprevnextchecks[1] += pmo; + pncd++; + } + } + } + + if (ppcd > 1) stprevnextchecks[0] /= ppcd; + if (pncd > 1) stprevnextchecks[1] /= pncd; +} + // // K_KartUpdatePosition // @@ -6160,6 +6213,9 @@ void K_KartUpdatePosition(player_t *player) fixed_t pmo, imo; mobj_t *mo; + // always reset this + stprevnextchecks[0] = stprevnextchecks[1] = INT32_MAX; + if (player->spectator || !player->mo) return; @@ -6172,11 +6228,12 @@ void K_KartUpdatePosition(player_t *player) if (G_RaceGametype()) { - if ((((players[i].starpostnum) + (numstarposts + 1) * players[i].laps) > - ((player->starpostnum) + (numstarposts + 1) * player->laps))) + const INT32 iplayerlaps = (players[i].starpostnum + (numstarposts + 1) * players[i].laps); + const INT32 pplayerlaps = (player->starpostnum + (numstarposts + 1) * player->laps); + + if (iplayerlaps > pplayerlaps) position++; - else if (((players[i].starpostnum) + (numstarposts+1)*players[i].laps) == - ((player->starpostnum) + (numstarposts+1)*player->laps)) + else if (iplayerlaps == pplayerlaps) { ppcd = pncd = ipcd = incd = 0; @@ -6259,6 +6316,9 @@ void K_KartUpdatePosition(player_t *player) if (players[i].starposttime < player->starposttime) position++; } + + // stupid hack + K_KartUpdatePositionDebugHack(player, &players[i]); } } else if (G_BattleGametype()) @@ -6294,6 +6354,7 @@ void K_StripItems(player_t *player) { K_DropRocketSneaker(player); K_DropKitchenSink(player); + player->kartstuff[k_itemtype] = KITEM_NONE; player->kartstuff[k_itemamount] = 0; player->kartstuff[k_itemheld] = 0; @@ -6303,6 +6364,7 @@ void K_StripItems(player_t *player) player->kartstuff[k_itemroulette] = 0; player->kartstuff[k_roulettetype] = 0; } + player->kartstuff[k_eggmanheld] = 0; player->kartstuff[k_hyudorotimer] = 0; @@ -6333,18 +6395,582 @@ void K_StripOther(player_t *player) } } +static void K_PlayerItemThink(player_t *player, boolean onground, boolean oldattackdown) +{ + if (!player || !player->mo) + return; + + if (player->mo->health <= 0) + return; + + if (player->spectator) + return; + + if (player->exiting || mapreset) + return; + + if (player->kartstuff[k_spinouttimer] != 0 || + player->kartstuff[k_squishedtimer] != 0 || + player->kartstuff[k_respawn] != 0) + return; + + const ticcmd_t *cmd = &player->cmd; + + const boolean ATTACK_IS_DOWN = ((cmd->buttons & BT_ATTACK) && !oldattackdown); + const boolean HOLDING_ITEM = (player->kartstuff[k_itemheld] || player->kartstuff[k_eggmanheld]); + const boolean NO_HYUDORO = (player->kartstuff[k_stolentimer] == 0 && player->kartstuff[k_stealingtimer] == 0); + + // First, the really specific, finicky items that function without the item being directly in your item slot. + // Karma item dropping + if (ATTACK_IS_DOWN && player->kartstuff[k_comebackmode] && !player->kartstuff[k_comebacktimer]) + { + mobj_t *newitem; + + if (player->kartstuff[k_comebackmode] == 1) + { + newitem = P_SpawnMobj(player->mo->x, player->mo->y, player->mo->z, MT_RANDOMITEM); + newitem->threshold = 69; // selected "randomly". + } + else + { + newitem = P_SpawnMobj(player->mo->x, player->mo->y, player->mo->z, MT_EGGMANITEM); + + const INT32 blametarg = player->kartstuff[k_eggmanblame]; + + if ((blametarg >= 0 && blametarg < MAXPLAYERS) + && playeringame[blametarg] + && !players[blametarg].spectator + && players[blametarg].mo) + P_SetTarget(&newitem->target, players[blametarg].mo); + + player->kartstuff[k_eggmanblame] = -1; + } + + newitem->flags2 = (player->mo->flags2 & MF2_OBJECTFLIP); + newitem->fuse = 15*TICRATE; // selected randomly. + + player->kartstuff[k_comebackmode] = 0; + player->kartstuff[k_comebacktimer] = comebacktime; + S_StartSound(player->mo, sfx_s254); + } + // Eggman Monitor exploding + else if (player->kartstuff[k_eggmanexplode]) + { + if (ATTACK_IS_DOWN && player->kartstuff[k_eggmanexplode] <= 3*TICRATE && player->kartstuff[k_eggmanexplode] > 1) + player->kartstuff[k_eggmanexplode] = 1; + } + // Eggman Monitor throwing + else if (ATTACK_IS_DOWN && player->kartstuff[k_eggmanheld]) + { + K_ThrowKartItem(player, false, MT_EGGMANITEM, -1, 0); + K_PlayAttackTaunt(player->mo); + player->kartstuff[k_eggmanheld] = 0; + K_UpdateHnextList(player, true); + } + // Rocket Sneaker + else if (ATTACK_IS_DOWN && !HOLDING_ITEM && onground && NO_HYUDORO + && player->kartstuff[k_rocketsneakertimer] > 1) + { + K_DoSneaker(player, 2); + K_PlayBoostTaunt(player->mo); + + player->kartstuff[k_rocketsneakertimer] -= 2*TICRATE; + + if (player->kartstuff[k_rocketsneakertimer] < 1) + player->kartstuff[k_rocketsneakertimer] = 1; + } + // Grow Canceling + else if (player->kartstuff[k_growshrinktimer] > 0) + { + if (player->kartstuff[k_growcancel] >= 0) + { + if (cmd->buttons & BT_ATTACK) + { + player->kartstuff[k_growcancel]++; + + if (player->kartstuff[k_growcancel] > 26) + K_RemoveGrowShrink(player); + } + else + player->kartstuff[k_growcancel] = 0; + } + else + { + if ((cmd->buttons & BT_ATTACK) || (player->pflags & PF_ATTACKDOWN)) + player->kartstuff[k_growcancel] = -1; + else + player->kartstuff[k_growcancel] = 0; + } + } + else if (player->kartstuff[k_itemamount] <= 0) + { + player->kartstuff[k_itemamount] = player->kartstuff[k_itemheld] = 0; + } + else + { + switch (player->kartstuff[k_itemtype]) + { + case KITEM_SNEAKER: + if (ATTACK_IS_DOWN && !HOLDING_ITEM && onground && NO_HYUDORO) + { + K_DoSneaker(player, 1); + K_PlayBoostTaunt(player->mo); + player->kartstuff[k_itemamount]--; + } + break; + case KITEM_ROCKETSNEAKER: + if (ATTACK_IS_DOWN && !HOLDING_ITEM && onground && NO_HYUDORO + && player->kartstuff[k_rocketsneakertimer] == 0) + { + INT32 moloop; + mobj_t *mo = NULL; + mobj_t *prev = player->mo; + + K_PlayBoostTaunt(player->mo); + //player->kartstuff[k_itemheld] = 1; + S_StartSound(player->mo, sfx_s3k3a); + + //K_DoSneaker(player, 2); + + player->kartstuff[k_rocketsneakertimer] = (itemtime*3); + player->kartstuff[k_itemamount]--; + K_UpdateHnextList(player, true); + + for (moloop = 0; moloop < 2; moloop++) + { + mo = P_SpawnMobj(player->mo->x, player->mo->y, player->mo->z, MT_ROCKETSNEAKER); + K_MatchGenericExtraFlags(mo, player->mo); + mo->flags |= MF_NOCLIPTHING; + mo->angle = player->mo->angle; + mo->threshold = 10; + mo->movecount = moloop%2; + mo->movedir = mo->lastlook = moloop+1; + P_SetTarget(&mo->target, player->mo); + P_SetTarget(&mo->hprev, prev); + P_SetTarget(&prev->hnext, mo); + prev = mo; + } + } + break; + case KITEM_INVINCIBILITY: + if (ATTACK_IS_DOWN && !HOLDING_ITEM && NO_HYUDORO) // Doesn't hold your item slot hostage normally, so you're free to waste it if you have multiple + { + if (!player->kartstuff[k_invincibilitytimer]) + { + mobj_t *overlay = P_SpawnMobj(player->mo->x, player->mo->y, player->mo->z, MT_INVULNFLASH); + P_SetTarget(&overlay->target, player->mo); + overlay->destscale = player->mo->scale; + P_SetScale(overlay, player->mo->scale); + } + + player->kartstuff[k_invincibilitytimer] = itemtime+(2*TICRATE); // 10 seconds + + if (cv_supermusic.value == 1 && P_IsLocalPlayer(player)) + S_ChangeMusicSpecial("kinvnc"); + + P_RestoreMusic(player); + K_PlayPowerGloatSound(player->mo); + player->kartstuff[k_itemamount]--; + } + break; + case KITEM_BANANA: + if (ATTACK_IS_DOWN && !HOLDING_ITEM && NO_HYUDORO) + { + INT32 moloop; + mobj_t *mo; + mobj_t *prev = player->mo; + + //K_PlayAttackTaunt(player->mo); + player->kartstuff[k_itemheld] = 1; + S_StartSound(player->mo, sfx_s254); + + for (moloop = 0; moloop < player->kartstuff[k_itemamount]; moloop++) + { + mo = P_SpawnMobj(player->mo->x, player->mo->y, player->mo->z, MT_BANANA_SHIELD); + + if (P_MobjWasRemovedCompat(mo)) + { + player->kartstuff[k_itemamount] = moloop; + break; + } + + mo->flags |= MF_NOCLIPTHING; + mo->threshold = 10; + mo->movecount = player->kartstuff[k_itemamount]; + mo->movedir = moloop+1; + P_SetTarget(&mo->target, player->mo); + P_SetTarget(&mo->hprev, prev); + P_SetTarget(&prev->hnext, mo); + prev = mo; + } + } + else if (ATTACK_IS_DOWN && player->kartstuff[k_itemheld]) // Banana x3 thrown + { + K_ThrowKartItem(player, false, MT_BANANA, -1, 0); + K_PlayAttackTaunt(player->mo); + player->kartstuff[k_itemamount]--; + K_UpdateHnextList(player, false); + } + break; + case KITEM_EGGMAN: + if (ATTACK_IS_DOWN && !HOLDING_ITEM && NO_HYUDORO) + { + mobj_t *mo; + player->kartstuff[k_itemamount]--; + player->kartstuff[k_eggmanheld] = 1; + S_StartSound(player->mo, sfx_s254); + mo = P_SpawnMobj(player->mo->x, player->mo->y, player->mo->z, MT_EGGMANITEM_SHIELD); + + if (mo) + { + mo->flags |= MF_NOCLIPTHING; + mo->threshold = 10; + mo->movecount = 1; + mo->movedir = 1; + P_SetTarget(&mo->target, player->mo); + P_SetTarget(&player->mo->hnext, mo); + } + } + break; + case KITEM_ORBINAUT: + if (ATTACK_IS_DOWN && !HOLDING_ITEM && NO_HYUDORO) + { + angle_t newangle; + INT32 moloop; + mobj_t *mo = NULL; + mobj_t *prev = player->mo; + + //K_PlayAttackTaunt(player->mo); + player->kartstuff[k_itemheld] = 1; + S_StartSound(player->mo, sfx_s3k3a); + + for (moloop = 0; moloop < player->kartstuff[k_itemamount]; moloop++) + { + newangle = (player->mo->angle + ANGLE_157h) + FixedAngle(((360 / player->kartstuff[k_itemamount]) * moloop) << FRACBITS) + ANGLE_90; + mo = P_SpawnMobj(player->mo->x, player->mo->y, player->mo->z, MT_ORBINAUT_SHIELD); + + if (P_MobjWasRemovedCompat(mo)) + { + player->kartstuff[k_itemamount] = moloop; + break; + } + + mo->flags |= MF_NOCLIPTHING; + mo->angle = newangle; + mo->threshold = 10; + mo->movecount = player->kartstuff[k_itemamount]; + mo->movedir = mo->lastlook = moloop+1; + mo->color = player->skincolor; + P_SetTarget(&mo->target, player->mo); + P_SetTarget(&mo->hprev, prev); + P_SetTarget(&prev->hnext, mo); + prev = mo; + } + } + else if (ATTACK_IS_DOWN && player->kartstuff[k_itemheld]) // Orbinaut x3 thrown + { + K_ThrowKartItem(player, true, MT_ORBINAUT, 1, 0); + K_PlayAttackTaunt(player->mo); + player->kartstuff[k_itemamount]--; + K_UpdateHnextList(player, false); + } + break; + case KITEM_JAWZ: + if (ATTACK_IS_DOWN && !HOLDING_ITEM && NO_HYUDORO) + { + angle_t newangle; + INT32 moloop; + mobj_t *mo = NULL; + mobj_t *prev = player->mo; + + //K_PlayAttackTaunt(player->mo); + player->kartstuff[k_itemheld] = 1; + S_StartSound(player->mo, sfx_s3k3a); + + for (moloop = 0; moloop < player->kartstuff[k_itemamount]; moloop++) + { + newangle = (player->mo->angle + ANGLE_157h) + FixedAngle(((360 / player->kartstuff[k_itemamount]) * moloop) << FRACBITS) + ANGLE_90; + mo = P_SpawnMobj(player->mo->x, player->mo->y, player->mo->z, MT_JAWZ_SHIELD); + + if (P_MobjWasRemovedCompat(mo)) + { + player->kartstuff[k_itemamount] = moloop; + break; + } + + mo->flags |= MF_NOCLIPTHING; + mo->angle = newangle; + mo->threshold = 10; + mo->movecount = player->kartstuff[k_itemamount]; + mo->movedir = mo->lastlook = moloop+1; + P_SetTarget(&mo->target, player->mo); + P_SetTarget(&mo->hprev, prev); + P_SetTarget(&prev->hnext, mo); + prev = mo; + } + } + else if (ATTACK_IS_DOWN && HOLDING_ITEM && player->kartstuff[k_itemheld]) // Jawz thrown + { + if (player->kartstuff[k_throwdir] == 1 || player->kartstuff[k_throwdir] == 0) + K_ThrowKartItem(player, true, MT_JAWZ, 1, 0); + else if (player->kartstuff[k_throwdir] == -1) // Throwing backward gives you a dud that doesn't home in + K_ThrowKartItem(player, true, MT_JAWZ_DUD, -1, 0); + + K_PlayAttackTaunt(player->mo); + player->kartstuff[k_itemamount]--; + K_UpdateHnextList(player, false); + } + break; + case KITEM_MINE: + if (ATTACK_IS_DOWN && !HOLDING_ITEM && NO_HYUDORO) + { + mobj_t *mo; + + player->kartstuff[k_itemheld] = 1; + S_StartSound(player->mo, sfx_s254); + mo = P_SpawnMobj(player->mo->x, player->mo->y, player->mo->z, MT_SSMINE_SHIELD); + + if (mo) + { + mo->flags |= MF_NOCLIPTHING; + mo->threshold = 10; + mo->movecount = 1; + mo->movedir = 1; + P_SetTarget(&mo->target, player->mo); + P_SetTarget(&player->mo->hnext, mo); + } + } + else if (ATTACK_IS_DOWN && player->kartstuff[k_itemheld]) + { + K_ThrowKartItem(player, false, MT_SSMINE, 1, 1); + K_PlayAttackTaunt(player->mo); + player->kartstuff[k_itemamount]--; + player->kartstuff[k_itemheld] = 0; + K_UpdateHnextList(player, true); + } + break; + case KITEM_BALLHOG: + if (ATTACK_IS_DOWN && !HOLDING_ITEM && NO_HYUDORO) + { + player->kartstuff[k_itemamount]--; + K_ThrowKartItem(player, true, MT_BALLHOG, 1, 0); + K_PlayAttackTaunt(player->mo); + } + break; + case KITEM_SPB: + if (ATTACK_IS_DOWN && !HOLDING_ITEM && NO_HYUDORO) + { + player->kartstuff[k_itemamount]--; + K_ThrowKartItem(player, true, MT_SPB, 1, 0); + K_PlayAttackTaunt(player->mo); + } + break; + case KITEM_GROW: + if (ATTACK_IS_DOWN && !HOLDING_ITEM && NO_HYUDORO + && player->kartstuff[k_growshrinktimer] <= 0) // Grow holds the item box hostage + { + if (player->kartstuff[k_growshrinktimer] < 0) // If you're shrunk, then "grow" will just make you normal again. + K_RemoveGrowShrink(player); + else + { + K_PlayPowerGloatSound(player->mo); + player->mo->scalespeed = mapobjectscale/TICRATE; + player->mo->destscale = (3*mapobjectscale)/2; + + if (cv_kartdebugshrink.value && !modeattacking && !player->bot) + player->mo->destscale = (6*player->mo->destscale)/8; + + player->kartstuff[k_growshrinktimer] = itemtime+(4*TICRATE); // 12 seconds + + if (cv_growmusic.value == 1 && P_IsLocalPlayer(player)) + S_ChangeMusicSpecial("kgrow"); + + P_RestoreMusic(player); + S_StartSound(player->mo, sfx_kc5a); + } + + player->kartstuff[k_itemamount]--; + } + break; + case KITEM_SHRINK: + if (ATTACK_IS_DOWN && !HOLDING_ITEM && NO_HYUDORO) + { + K_DoShrink(player); + player->kartstuff[k_itemamount]--; + K_PlayPowerGloatSound(player->mo); + } + break; + case KITEM_THUNDERSHIELD: + if (player->kartstuff[k_curshield] != 1) + { + mobj_t *shield = P_SpawnMobj(player->mo->x, player->mo->y, player->mo->z, MT_THUNDERSHIELD); + P_SetScale(shield, (shield->destscale = (5*shield->destscale)>>2)); + P_SetTarget(&shield->target, player->mo); + S_StartSound(shield, sfx_s3k41); + player->kartstuff[k_curshield] = 1; + } + if (ATTACK_IS_DOWN && !HOLDING_ITEM && NO_HYUDORO) + { + K_DoThunderShield(player); + player->kartstuff[k_itemamount]--; + K_PlayAttackTaunt(player->mo); + } + break; + case KITEM_HYUDORO: + if (ATTACK_IS_DOWN && !HOLDING_ITEM && NO_HYUDORO) + { + player->kartstuff[k_itemamount]--; + K_DoHyudoroSteal(player); // yes. yes they do. + } + break; + case KITEM_POGOSPRING: + if (ATTACK_IS_DOWN && !HOLDING_ITEM && onground && NO_HYUDORO + && !player->kartstuff[k_pogospring]) + { + K_PlayBoostTaunt(player->mo); + K_DoPogoSpring(player->mo, 32<kartstuff[k_pogospring] = 1; + player->kartstuff[k_itemamount]--; + } + break; + case KITEM_KITCHENSINK: + if (ATTACK_IS_DOWN && !HOLDING_ITEM && NO_HYUDORO) + { + mobj_t *mo; + + player->kartstuff[k_itemheld] = 1; + S_StartSound(player->mo, sfx_s254); + mo = P_SpawnMobj(player->mo->x, player->mo->y, player->mo->z, MT_SINK_SHIELD); + + if (mo) + { + mo->flags |= MF_NOCLIPTHING; + mo->threshold = 10; + mo->movecount = 1; + mo->movedir = 1; + P_SetTarget(&mo->target, player->mo); + P_SetTarget(&player->mo->hnext, mo); + } + } + else if (ATTACK_IS_DOWN && HOLDING_ITEM && player->kartstuff[k_itemheld]) // Sink thrown + { + K_ThrowKartItem(player, false, MT_SINK, 1, 2); + K_PlayAttackTaunt(player->mo); + player->kartstuff[k_itemamount]--; + player->kartstuff[k_itemheld] = 0; + K_UpdateHnextList(player, true); + } + break; + case KITEM_SAD: + if (ATTACK_IS_DOWN && !HOLDING_ITEM && NO_HYUDORO + && !player->kartstuff[k_sadtimer]) + { + player->kartstuff[k_sadtimer] = stealtime; + player->kartstuff[k_itemamount]--; + } + break; + default: + break; + } + } + + // No more! + if (!player->kartstuff[k_itemamount]) + { + player->kartstuff[k_itemheld] = 0; + player->kartstuff[k_itemtype] = KITEM_NONE; + } + + if (player->kartstuff[k_itemtype] != KITEM_THUNDERSHIELD) + player->kartstuff[k_curshield] = 0; + + if (player->kartstuff[k_growshrinktimer] <= 0) + player->kartstuff[k_growcancel] = -1; + + if (player->kartstuff[k_itemtype] == KITEM_SPB + || player->kartstuff[k_itemtype] == KITEM_SHRINK + || player->kartstuff[k_growshrinktimer] < 0) + indirectitemcooldown = 20*TICRATE; + + if (player->kartstuff[k_hyudorotimer] > 0) + { + if (splitscreen) + { + if (!cv_reducevfx.value && leveltime & 1) + player->mo->flags2 |= MF2_DONTDRAW; + else + player->mo->flags2 &= ~MF2_DONTDRAW; + + if (player->kartstuff[k_hyudorotimer] >= (1*TICRATE/2) && player->kartstuff[k_hyudorotimer] <= hyudorotime-(1*TICRATE/2)) + { + if (player == &players[displayplayers[1]]) + player->mo->eflags |= MFE_DRAWONLYFORP2; + else if (player == &players[displayplayers[2]] && splitscreen > 1) + player->mo->eflags |= MFE_DRAWONLYFORP3; + else if (player == &players[displayplayers[3]] && splitscreen > 2) + player->mo->eflags |= MFE_DRAWONLYFORP4; + else if (player == &players[displayplayers[0]]) + player->mo->eflags |= MFE_DRAWONLYFORP1; + else + player->mo->flags2 |= MF2_DONTDRAW; + } + else + player->mo->eflags &= ~(MFE_DRAWONLYFORP1|MFE_DRAWONLYFORP2|MFE_DRAWONLYFORP3|MFE_DRAWONLYFORP4); + } + else + { + if (P_IsDisplayPlayer(player) || + (player->kartstuff[k_hyudorotimer] < (1*TICRATE/2) || player->kartstuff[k_hyudorotimer] > hyudorotime-(1*TICRATE/2))) + { + if (!cv_reducevfx.value && leveltime & 1) + player->mo->flags2 |= MF2_DONTDRAW; + else + player->mo->flags2 &= ~MF2_DONTDRAW; + } + else + player->mo->flags2 |= MF2_DONTDRAW; + } + + player->powers[pw_flashing] = player->kartstuff[k_hyudorotimer]; // We'll do this for now, let's people know about the invisible people through subtle hints + } + else if (player->kartstuff[k_hyudorotimer] == 0) + { + player->mo->flags2 &= ~MF2_DONTDRAW; + player->mo->eflags &= ~(MFE_DRAWONLYFORP1|MFE_DRAWONLYFORP2|MFE_DRAWONLYFORP3|MFE_DRAWONLYFORP4); + } + + if (G_BattleGametype() && player->kartstuff[k_bumper] <= 0) // dead in match? you da bomb + { + K_DropItems(player); //K_StripItems(player); + K_StripOther(player); + player->mo->flags2 |= MF2_SHADOW; + player->powers[pw_flashing] = player->kartstuff[k_comebacktimer]; + } + else if (G_RaceGametype() || player->kartstuff[k_bumper] > 0) + { + player->mo->flags2 &= ~MF2_SHADOW; + } +} + // // K_MoveKartPlayer // void K_MoveKartPlayer(player_t *player, boolean onground) { ticcmd_t *cmd = &player->cmd; - boolean ATTACK_IS_DOWN = ((cmd->buttons & BT_ATTACK) && !(player->pflags & PF_ATTACKDOWN)); - boolean HOLDING_ITEM = (player->kartstuff[k_itemheld] || player->kartstuff[k_eggmanheld]); - boolean NO_HYUDORO = (player->kartstuff[k_stolentimer] == 0 && player->kartstuff[k_stealingtimer] == 0); + + const boolean oldattackdown = (player->pflags & PF_ATTACKDOWN); // fun + + if ((player->pflags & PF_ATTACKDOWN) && !(cmd->buttons & BT_ATTACK)) + player->pflags &= ~PF_ATTACKDOWN; + else if (cmd->buttons & BT_ATTACK) + player->pflags |= PF_ATTACKDOWN; K_KartUpdatePosition(player); + // Play overtake sounds, but only if + // - your place changed + // - not exiting if (!player->exiting) { if (player->kartstuff[k_oldposition] < player->kartstuff[k_position]) // But first, if you lost a place, @@ -6362,521 +6988,7 @@ void K_MoveKartPlayer(player_t *player, boolean onground) if (player->kartstuff[k_positiondelay]) player->kartstuff[k_positiondelay]--; - if ((player->pflags & PF_ATTACKDOWN) && !(cmd->buttons & BT_ATTACK)) - player->pflags &= ~PF_ATTACKDOWN; - else if (cmd->buttons & BT_ATTACK) - player->pflags |= PF_ATTACKDOWN; - - if (player && player->mo && player->mo->health > 0 && !player->spectator && !(player->exiting || mapreset) - && player->kartstuff[k_spinouttimer] == 0 && player->kartstuff[k_squishedtimer] == 0 && player->kartstuff[k_respawn] == 0) - { - // First, the really specific, finicky items that function without the item being directly in your item slot. - // Karma item dropping - if (ATTACK_IS_DOWN && player->kartstuff[k_comebackmode] && !player->kartstuff[k_comebacktimer]) - { - mobj_t *newitem; - - if (player->kartstuff[k_comebackmode] == 1) - { - newitem = P_SpawnMobj(player->mo->x, player->mo->y, player->mo->z, MT_RANDOMITEM); - newitem->threshold = 69; // selected "randomly". - } - else - { - newitem = P_SpawnMobj(player->mo->x, player->mo->y, player->mo->z, MT_EGGMANITEM); - if (player->kartstuff[k_eggmanblame] >= 0 - && player->kartstuff[k_eggmanblame] < MAXPLAYERS - && playeringame[player->kartstuff[k_eggmanblame]] - && !players[player->kartstuff[k_eggmanblame]].spectator - && players[player->kartstuff[k_eggmanblame]].mo) - P_SetTarget(&newitem->target, players[player->kartstuff[k_eggmanblame]].mo); - player->kartstuff[k_eggmanblame] = -1; - } - - newitem->flags2 = (player->mo->flags2 & MF2_OBJECTFLIP); - newitem->fuse = 15*TICRATE; // selected randomly. - - player->kartstuff[k_comebackmode] = 0; - player->kartstuff[k_comebacktimer] = comebacktime; - S_StartSound(player->mo, sfx_s254); - } - // Eggman Monitor exploding - else if (player->kartstuff[k_eggmanexplode]) - { - if (ATTACK_IS_DOWN && player->kartstuff[k_eggmanexplode] <= 3*TICRATE && player->kartstuff[k_eggmanexplode] > 1) - player->kartstuff[k_eggmanexplode] = 1; - } - // Eggman Monitor throwing - else if (ATTACK_IS_DOWN && player->kartstuff[k_eggmanheld]) - { - K_ThrowKartItem(player, false, MT_EGGMANITEM, -1, 0); - K_PlayAttackTaunt(player->mo); - player->kartstuff[k_eggmanheld] = 0; - K_UpdateHnextList(player, true); - } - // Rocket Sneaker - else if (ATTACK_IS_DOWN && !HOLDING_ITEM && onground && NO_HYUDORO - && player->kartstuff[k_rocketsneakertimer] > 1) - { - K_DoSneaker(player, 2); - K_PlayBoostTaunt(player->mo); - player->kartstuff[k_rocketsneakertimer] -= 2*TICRATE; - if (player->kartstuff[k_rocketsneakertimer] < 1) - player->kartstuff[k_rocketsneakertimer] = 1; - } - // Grow Canceling - else if (player->kartstuff[k_growshrinktimer] > 0) - { - if (player->kartstuff[k_growcancel] >= 0) - { - if (cmd->buttons & BT_ATTACK) - { - player->kartstuff[k_growcancel]++; - if (player->kartstuff[k_growcancel] > 26) - K_RemoveGrowShrink(player); - } - else - player->kartstuff[k_growcancel] = 0; - } - else - { - if ((cmd->buttons & BT_ATTACK) || (player->pflags & PF_ATTACKDOWN)) - player->kartstuff[k_growcancel] = -1; - else - player->kartstuff[k_growcancel] = 0; - } - } - else if (player->kartstuff[k_itemamount] <= 0) - { - player->kartstuff[k_itemamount] = player->kartstuff[k_itemheld] = 0; - } - else - { - switch (player->kartstuff[k_itemtype]) - { - case KITEM_SNEAKER: - if (ATTACK_IS_DOWN && !HOLDING_ITEM && onground && NO_HYUDORO) - { - K_DoSneaker(player, 1); - K_PlayBoostTaunt(player->mo); - player->kartstuff[k_itemamount]--; - } - break; - case KITEM_ROCKETSNEAKER: - if (ATTACK_IS_DOWN && !HOLDING_ITEM && onground && NO_HYUDORO - && player->kartstuff[k_rocketsneakertimer] == 0) - { - INT32 moloop; - mobj_t *mo = NULL; - mobj_t *prev = player->mo; - - K_PlayBoostTaunt(player->mo); - //player->kartstuff[k_itemheld] = 1; - S_StartSound(player->mo, sfx_s3k3a); - - //K_DoSneaker(player, 2); - - player->kartstuff[k_rocketsneakertimer] = (itemtime*3); - player->kartstuff[k_itemamount]--; - K_UpdateHnextList(player, true); - - for (moloop = 0; moloop < 2; moloop++) - { - mo = P_SpawnMobj(player->mo->x, player->mo->y, player->mo->z, MT_ROCKETSNEAKER); - K_MatchGenericExtraFlags(mo, player->mo); - mo->flags |= MF_NOCLIPTHING; - mo->angle = player->mo->angle; - mo->threshold = 10; - mo->movecount = moloop%2; - mo->movedir = mo->lastlook = moloop+1; - P_SetTarget(&mo->target, player->mo); - P_SetTarget(&mo->hprev, prev); - P_SetTarget(&prev->hnext, mo); - prev = mo; - } - } - break; - case KITEM_INVINCIBILITY: - if (ATTACK_IS_DOWN && !HOLDING_ITEM && NO_HYUDORO) // Doesn't hold your item slot hostage normally, so you're free to waste it if you have multiple - { - if (!player->kartstuff[k_invincibilitytimer]) - { - mobj_t *overlay = P_SpawnMobj(player->mo->x, player->mo->y, player->mo->z, MT_INVULNFLASH); - P_SetTarget(&overlay->target, player->mo); - overlay->destscale = player->mo->scale; - P_SetScale(overlay, player->mo->scale); - } - player->kartstuff[k_invincibilitytimer] = itemtime+(2*TICRATE); // 10 seconds - - if (cv_supermusic.value == 1 && P_IsLocalPlayer(player)) - S_ChangeMusicSpecial("kinvnc"); - - P_RestoreMusic(player); - K_PlayPowerGloatSound(player->mo); - player->kartstuff[k_itemamount]--; - } - break; - case KITEM_BANANA: - if (ATTACK_IS_DOWN && !HOLDING_ITEM && NO_HYUDORO) - { - INT32 moloop; - mobj_t *mo; - mobj_t *prev = player->mo; - - //K_PlayAttackTaunt(player->mo); - player->kartstuff[k_itemheld] = 1; - S_StartSound(player->mo, sfx_s254); - - for (moloop = 0; moloop < player->kartstuff[k_itemamount]; moloop++) - { - mo = P_SpawnMobj(player->mo->x, player->mo->y, player->mo->z, MT_BANANA_SHIELD); - if (!mo) - { - player->kartstuff[k_itemamount] = moloop; - break; - } - mo->flags |= MF_NOCLIPTHING; - mo->threshold = 10; - mo->movecount = player->kartstuff[k_itemamount]; - mo->movedir = moloop+1; - P_SetTarget(&mo->target, player->mo); - P_SetTarget(&mo->hprev, prev); - P_SetTarget(&prev->hnext, mo); - prev = mo; - } - } - else if (ATTACK_IS_DOWN && player->kartstuff[k_itemheld]) // Banana x3 thrown - { - K_ThrowKartItem(player, false, MT_BANANA, -1, 0); - K_PlayAttackTaunt(player->mo); - player->kartstuff[k_itemamount]--; - K_UpdateHnextList(player, false); - } - break; - case KITEM_EGGMAN: - if (ATTACK_IS_DOWN && !HOLDING_ITEM && NO_HYUDORO) - { - mobj_t *mo; - player->kartstuff[k_itemamount]--; - player->kartstuff[k_eggmanheld] = 1; - S_StartSound(player->mo, sfx_s254); - mo = P_SpawnMobj(player->mo->x, player->mo->y, player->mo->z, MT_EGGMANITEM_SHIELD); - if (mo) - { - mo->flags |= MF_NOCLIPTHING; - mo->threshold = 10; - mo->movecount = 1; - mo->movedir = 1; - P_SetTarget(&mo->target, player->mo); - P_SetTarget(&player->mo->hnext, mo); - } - } - break; - case KITEM_ORBINAUT: - if (ATTACK_IS_DOWN && !HOLDING_ITEM && NO_HYUDORO) - { - angle_t newangle; - INT32 moloop; - mobj_t *mo = NULL; - mobj_t *prev = player->mo; - - //K_PlayAttackTaunt(player->mo); - player->kartstuff[k_itemheld] = 1; - S_StartSound(player->mo, sfx_s3k3a); - - for (moloop = 0; moloop < player->kartstuff[k_itemamount]; moloop++) - { - newangle = (player->mo->angle + ANGLE_157h) + FixedAngle(((360 / player->kartstuff[k_itemamount]) * moloop) << FRACBITS) + ANGLE_90; - mo = P_SpawnMobj(player->mo->x, player->mo->y, player->mo->z, MT_ORBINAUT_SHIELD); - if (!mo) - { - player->kartstuff[k_itemamount] = moloop; - break; - } - mo->flags |= MF_NOCLIPTHING; - mo->angle = newangle; - mo->threshold = 10; - mo->movecount = player->kartstuff[k_itemamount]; - mo->movedir = mo->lastlook = moloop+1; - mo->color = player->skincolor; - P_SetTarget(&mo->target, player->mo); - P_SetTarget(&mo->hprev, prev); - P_SetTarget(&prev->hnext, mo); - prev = mo; - } - } - else if (ATTACK_IS_DOWN && player->kartstuff[k_itemheld]) // Orbinaut x3 thrown - { - K_ThrowKartItem(player, true, MT_ORBINAUT, 1, 0); - K_PlayAttackTaunt(player->mo); - player->kartstuff[k_itemamount]--; - K_UpdateHnextList(player, false); - } - break; - case KITEM_JAWZ: - if (ATTACK_IS_DOWN && !HOLDING_ITEM && NO_HYUDORO) - { - angle_t newangle; - INT32 moloop; - mobj_t *mo = NULL; - mobj_t *prev = player->mo; - - //K_PlayAttackTaunt(player->mo); - player->kartstuff[k_itemheld] = 1; - S_StartSound(player->mo, sfx_s3k3a); - - for (moloop = 0; moloop < player->kartstuff[k_itemamount]; moloop++) - { - newangle = (player->mo->angle + ANGLE_157h) + FixedAngle(((360 / player->kartstuff[k_itemamount]) * moloop) << FRACBITS) + ANGLE_90; - mo = P_SpawnMobj(player->mo->x, player->mo->y, player->mo->z, MT_JAWZ_SHIELD); - if (!mo) - { - player->kartstuff[k_itemamount] = moloop; - break; - } - mo->flags |= MF_NOCLIPTHING; - mo->angle = newangle; - mo->threshold = 10; - mo->movecount = player->kartstuff[k_itemamount]; - mo->movedir = mo->lastlook = moloop+1; - P_SetTarget(&mo->target, player->mo); - P_SetTarget(&mo->hprev, prev); - P_SetTarget(&prev->hnext, mo); - prev = mo; - } - } - else if (ATTACK_IS_DOWN && HOLDING_ITEM && player->kartstuff[k_itemheld]) // Jawz thrown - { - if (player->kartstuff[k_throwdir] == 1 || player->kartstuff[k_throwdir] == 0) - K_ThrowKartItem(player, true, MT_JAWZ, 1, 0); - else if (player->kartstuff[k_throwdir] == -1) // Throwing backward gives you a dud that doesn't home in - K_ThrowKartItem(player, true, MT_JAWZ_DUD, -1, 0); - K_PlayAttackTaunt(player->mo); - player->kartstuff[k_itemamount]--; - K_UpdateHnextList(player, false); - } - break; - case KITEM_MINE: - if (ATTACK_IS_DOWN && !HOLDING_ITEM && NO_HYUDORO) - { - mobj_t *mo; - player->kartstuff[k_itemheld] = 1; - S_StartSound(player->mo, sfx_s254); - mo = P_SpawnMobj(player->mo->x, player->mo->y, player->mo->z, MT_SSMINE_SHIELD); - if (mo) - { - mo->flags |= MF_NOCLIPTHING; - mo->threshold = 10; - mo->movecount = 1; - mo->movedir = 1; - P_SetTarget(&mo->target, player->mo); - P_SetTarget(&player->mo->hnext, mo); - } - } - else if (ATTACK_IS_DOWN && player->kartstuff[k_itemheld]) - { - K_ThrowKartItem(player, false, MT_SSMINE, 1, 1); - K_PlayAttackTaunt(player->mo); - player->kartstuff[k_itemamount]--; - player->kartstuff[k_itemheld] = 0; - K_UpdateHnextList(player, true); - } - break; - case KITEM_BALLHOG: - if (ATTACK_IS_DOWN && !HOLDING_ITEM && NO_HYUDORO) - { - player->kartstuff[k_itemamount]--; - K_ThrowKartItem(player, true, MT_BALLHOG, 1, 0); - K_PlayAttackTaunt(player->mo); - } - break; - case KITEM_SPB: - if (ATTACK_IS_DOWN && !HOLDING_ITEM && NO_HYUDORO) - { - player->kartstuff[k_itemamount]--; - K_ThrowKartItem(player, true, MT_SPB, 1, 0); - K_PlayAttackTaunt(player->mo); - } - break; - case KITEM_GROW: - if (ATTACK_IS_DOWN && !HOLDING_ITEM && NO_HYUDORO - && player->kartstuff[k_growshrinktimer] <= 0) // Grow holds the item box hostage - { - if (player->kartstuff[k_growshrinktimer] < 0) // If you're shrunk, then "grow" will just make you normal again. - K_RemoveGrowShrink(player); - else - { - K_PlayPowerGloatSound(player->mo); - player->mo->scalespeed = mapobjectscale/TICRATE; - player->mo->destscale = (3*mapobjectscale)/2; - if (cv_kartdebugshrink.value && !modeattacking && !player->bot) - player->mo->destscale = (6*player->mo->destscale)/8; - player->kartstuff[k_growshrinktimer] = itemtime+(4*TICRATE); // 12 seconds - if (cv_growmusic.value == 1 && P_IsLocalPlayer(player)) - S_ChangeMusicSpecial("kgrow"); - P_RestoreMusic(player); - S_StartSound(player->mo, sfx_kc5a); - } - player->kartstuff[k_itemamount]--; - } - break; - case KITEM_SHRINK: - if (ATTACK_IS_DOWN && !HOLDING_ITEM && NO_HYUDORO) - { - K_DoShrink(player); - player->kartstuff[k_itemamount]--; - K_PlayPowerGloatSound(player->mo); - } - break; - case KITEM_THUNDERSHIELD: - if (player->kartstuff[k_curshield] != 1) - { - mobj_t *shield = P_SpawnMobj(player->mo->x, player->mo->y, player->mo->z, MT_THUNDERSHIELD); - P_SetScale(shield, (shield->destscale = (5*shield->destscale)>>2)); - P_SetTarget(&shield->target, player->mo); - S_StartSound(shield, sfx_s3k41); - player->kartstuff[k_curshield] = 1; - } - if (ATTACK_IS_DOWN && !HOLDING_ITEM && NO_HYUDORO) - { - K_DoThunderShield(player); - player->kartstuff[k_itemamount]--; - K_PlayAttackTaunt(player->mo); - } - break; - case KITEM_HYUDORO: - if (ATTACK_IS_DOWN && !HOLDING_ITEM && NO_HYUDORO) - { - player->kartstuff[k_itemamount]--; - K_DoHyudoroSteal(player); // yes. yes they do. - } - break; - case KITEM_POGOSPRING: - if (ATTACK_IS_DOWN && !HOLDING_ITEM && onground && NO_HYUDORO - && !player->kartstuff[k_pogospring]) - { - K_PlayBoostTaunt(player->mo); - K_DoPogoSpring(player->mo, 32<kartstuff[k_pogospring] = 1; - player->kartstuff[k_itemamount]--; - } - break; - case KITEM_KITCHENSINK: - if (ATTACK_IS_DOWN && !HOLDING_ITEM && NO_HYUDORO) - { - mobj_t *mo; - player->kartstuff[k_itemheld] = 1; - S_StartSound(player->mo, sfx_s254); - mo = P_SpawnMobj(player->mo->x, player->mo->y, player->mo->z, MT_SINK_SHIELD); - if (mo) - { - mo->flags |= MF_NOCLIPTHING; - mo->threshold = 10; - mo->movecount = 1; - mo->movedir = 1; - P_SetTarget(&mo->target, player->mo); - P_SetTarget(&player->mo->hnext, mo); - } - } - else if (ATTACK_IS_DOWN && HOLDING_ITEM && player->kartstuff[k_itemheld]) // Sink thrown - { - K_ThrowKartItem(player, false, MT_SINK, 1, 2); - K_PlayAttackTaunt(player->mo); - player->kartstuff[k_itemamount]--; - player->kartstuff[k_itemheld] = 0; - K_UpdateHnextList(player, true); - } - break; - case KITEM_SAD: - if (ATTACK_IS_DOWN && !HOLDING_ITEM && NO_HYUDORO - && !player->kartstuff[k_sadtimer]) - { - player->kartstuff[k_sadtimer] = stealtime; - player->kartstuff[k_itemamount]--; - } - break; - default: - break; - } - } - - // No more! - if (!player->kartstuff[k_itemamount]) - { - player->kartstuff[k_itemheld] = 0; - player->kartstuff[k_itemtype] = KITEM_NONE; - } - - if (player->kartstuff[k_itemtype] != KITEM_THUNDERSHIELD) - player->kartstuff[k_curshield] = 0; - - if (player->kartstuff[k_growshrinktimer] <= 0) - player->kartstuff[k_growcancel] = -1; - - if (player->kartstuff[k_itemtype] == KITEM_SPB - || player->kartstuff[k_itemtype] == KITEM_SHRINK - || player->kartstuff[k_growshrinktimer] < 0) - indirectitemcooldown = 20*TICRATE; - - if (player->kartstuff[k_hyudorotimer] > 0) - { - if (splitscreen) - { - if (!cv_reducevfx.value && leveltime & 1) - player->mo->flags2 |= MF2_DONTDRAW; - else - player->mo->flags2 &= ~MF2_DONTDRAW; - - if (player->kartstuff[k_hyudorotimer] >= (1*TICRATE/2) && player->kartstuff[k_hyudorotimer] <= hyudorotime-(1*TICRATE/2)) - { - if (player == &players[displayplayers[1]]) - player->mo->eflags |= MFE_DRAWONLYFORP2; - else if (player == &players[displayplayers[2]] && splitscreen > 1) - player->mo->eflags |= MFE_DRAWONLYFORP3; - else if (player == &players[displayplayers[3]] && splitscreen > 2) - player->mo->eflags |= MFE_DRAWONLYFORP4; - else if (player == &players[displayplayers[0]]) - player->mo->eflags |= MFE_DRAWONLYFORP1; - else - player->mo->flags2 |= MF2_DONTDRAW; - } - else - player->mo->eflags &= ~(MFE_DRAWONLYFORP1|MFE_DRAWONLYFORP2|MFE_DRAWONLYFORP3|MFE_DRAWONLYFORP4); - } - else - { - if (P_IsDisplayPlayer(player) - || (!P_IsDisplayPlayer(player) && (player->kartstuff[k_hyudorotimer] < (1*TICRATE/2) || player->kartstuff[k_hyudorotimer] > hyudorotime-(1*TICRATE/2)))) - { - if (!cv_reducevfx.value && leveltime & 1) - player->mo->flags2 |= MF2_DONTDRAW; - else - player->mo->flags2 &= ~MF2_DONTDRAW; - } - else - player->mo->flags2 |= MF2_DONTDRAW; - } - - player->powers[pw_flashing] = player->kartstuff[k_hyudorotimer]; // We'll do this for now, let's people know about the invisible people through subtle hints - } - else if (player->kartstuff[k_hyudorotimer] == 0) - { - player->mo->flags2 &= ~MF2_DONTDRAW; - player->mo->eflags &= ~(MFE_DRAWONLYFORP1|MFE_DRAWONLYFORP2|MFE_DRAWONLYFORP3|MFE_DRAWONLYFORP4); - } - - if (G_BattleGametype() && player->kartstuff[k_bumper] <= 0) // dead in match? you da bomb - { - K_DropItems(player); //K_StripItems(player); - K_StripOther(player); - player->mo->flags2 |= MF2_SHADOW; - player->powers[pw_flashing] = player->kartstuff[k_comebacktimer]; - } - else if (G_RaceGametype() || player->kartstuff[k_bumper] > 0) - { - player->mo->flags2 &= ~MF2_SHADOW; - } - } + K_PlayerItemThink(player, onground, oldattackdown); // JugadorXEI: Do *not* calculate friction when a player is pogo'd // because they'll be in the air and friction will not reset! @@ -6925,12 +7037,14 @@ void K_MoveKartPlayer(player_t *player, boolean onground) K_KartDrift(player, onground); - if (player->sliproll && ((!player->kartstuff[k_aizdriftstrat]) || (!P_IsObjectOnGround(player->mo)) || (player->kartstuff[k_drift]))) + //// funneh Saturn sprite stuff + + if ((player->sliproll > 0) && + (!player->kartstuff[k_aizdriftstrat] || player->kartstuff[k_drift] || !P_IsObjectOnGround(player->mo))) { player->sliproll -= (4*ANG1); } - // funneh Saturn sprite stuff if (cv_gravstretch.value) K_StretchPlayerGravity(player); else if (cv_saltyhop.value && cv_saltysquish.value) @@ -6938,6 +7052,36 @@ void K_MoveKartPlayer(player_t *player, boolean onground) K_RollMobjBySlopes(player->mo, player->mo->standingslope); + // "Stair jank" visuals akin to RR + if (cv_stairjank.value && player->stairjank > 0) + { + // only spawn em once + if (player->stairjank > 8) + { + // 90 degrees to direction you're facing + fixed_t dirx = -FINESINE(player->mo->angle>>ANGLETOFINESHIFT); + fixed_t diry = FINECOSINE(player->mo->angle>>ANGLETOFINESHIFT); + fixed_t offset = player->mo->radius; + + dirx = K_AltFlip(-dirx, 4); + diry = K_AltFlip(-diry, 4); + + mobj_t * spark = P_SpawnMobj(player->mo->x + FixedMul(dirx, offset), player->mo->y + FixedMul(diry, offset), player->mo->z, MT_DRIFTDUST); + spark->momx = FixedMul(dirx, FRACUNIT) + (6 + ((int)leveltime % 5))*(player->mo->momx)/10; + spark->momy = FixedMul(diry, FRACUNIT) + (6 + ((int)leveltime % 5))*(player->mo->momy)/10; + spark->momz = 5*FRACUNIT; + spark->scale = mapobjectscale/5; + spark->destscale = mapobjectscale/2; + spark->islocal = true; + spark->color = SKINCOLOR_WHITE; + P_SetTarget(&spark->target, player->mo); + } + + player->mo->temprollangle += K_StairJankFlip(ANGLE_11hh / 2 / (17 / player->stairjank)); // TODO: make strength adjustable? + } + + //// + // Quick Turning // You can't turn your kart when you're not moving. // So now it's time to burn some rubber! @@ -6989,6 +7133,7 @@ void K_MoveKartPlayer(player_t *player, boolean onground) { player->mo->scalespeed = mapobjectscale/12; player->mo->destscale = mapobjectscale + (FixedMul(mapobjectscale, player->kartstuff[k_boostcharge]*131)); + if (cv_kartdebugshrink.value && !modeattacking && !player->bot) player->mo->destscale = (6*player->mo->destscale)/8; } @@ -7019,6 +7164,7 @@ void K_MoveKartPlayer(player_t *player, boolean onground) else { K_SpawnDashDustRelease(player); // already handled for perfect boosts by K_DoSneaker + if ((!player->kartstuff[k_floorboost] || player->kartstuff[k_floorboost] == 3) && P_IsLocalPlayer(player)) { if (player->kartstuff[k_boostcharge] <= 40) @@ -7309,6 +7455,7 @@ void K_CheckSpectateStatus(void) { UINT8 oldrespawnlist[MAXPLAYERS]; memcpy(oldrespawnlist, respawnlist, numjoiners); + for (i = 0; i < numjoiners; i++) { UINT8 pos = 0; diff --git a/src/k_kart.h b/src/k_kart.h index 9307ce273..4d81375cd 100644 --- a/src/k_kart.h +++ b/src/k_kart.h @@ -32,6 +32,8 @@ extern consvar_t cv_bananajitter; extern consvar_t cv_bananthrowroll; extern consvar_t cv_airsparks; +extern INT32 stprevnextchecks[2]; + boolean K_IsPlayerLosing(player_t *player); boolean K_IsPlayerWanted(player_t *player); INT32 K_KartGetItemOdds(UINT8 pos, SINT8 item, fixed_t mashed, boolean spbrush); diff --git a/src/lua_baselib.c b/src/lua_baselib.c index bc94e2949..9703cbafe 100644 --- a/src/lua_baselib.c +++ b/src/lua_baselib.c @@ -3055,58 +3055,46 @@ static int lib_kSetHyuCountdown(lua_State *L) static int lib_gSetPlayerGamepadIndicatorColor(lua_State *L) { - INT32 player = -1; - player_t *plr = *((player_t **)luaL_checkudata(L, 1, META_PLAYER)); // retrieve player + INT32 pnum = -1; + player_t *player = *((player_t **)luaL_checkudata(L, 1, META_PLAYER)); // retrieve player UINT8 color = (UINT8)luaL_checkinteger(L, 2); // skincolor - if (!plr) + if (!player) return LUA_ErrInvalid(L, "player_t"); if (color >= MAXTRANSLATIONS) return luaL_error(L, "color %d out of range (0 - %d).", color, MAXTRANSLATIONS-1); - for (int i = 0; i < MAXSPLITSCREENPLAYERS; ++i) - { - if (plr - players == displayplayers[i]) - { - player = i; - break; - } - } + pnum = P_GetLocalPlayerNumForPlayer(player); // Not a local player - if (player == -1) return 0; + if (pnum == -1) return 0; // pls update with color 0 when youre done with changing led stuff so it can get player color again - G_SetPlayerGamepadIndicatorColor(player, color); + G_SetPlayerGamepadIndicatorColor(pnum, color); return 0; } static int lib_gPlayerDeviceRumble(lua_State *L) { - INT32 player = -1; - player_t *plr = *((player_t **)luaL_checkudata(L, 1, META_PLAYER)); // retrieve player + INT32 pnum = -1; + player_t *player = *((player_t **)luaL_checkudata(L, 1, META_PLAYER)); // retrieve player UINT16 low_strength = (UINT16)luaL_checkinteger(L, 2); // low frequency rumble motor strenght UINT16 high_strength = (UINT16)luaL_checkinteger(L, 3); // high frequency rumble motor strenght UINT32 duration = (UINT32)luaL_optinteger(L, 4, 84); // duration of rumble in ms - if (!plr) + if (!player) return LUA_ErrInvalid(L, "player_t"); - for (int i = 0; i < MAXSPLITSCREENPLAYERS; ++i) - { - if (plr - players == displayplayers[i]) - { - player = i; - break; - } - } + if (demo.playback) return 0; + + pnum = P_GetLocalPlayerNumForPlayer(player); // Not a local player - if (player == -1) return 0; + if (pnum == -1) return 0; - G_PlayerDeviceRumble(player, low_strength, high_strength, duration); + G_PlayerDeviceRumble(pnum, low_strength, high_strength, duration); return 0; } diff --git a/src/lua_hooklib.c b/src/lua_hooklib.c index 6294a5ab7..82c1a00d6 100644 --- a/src/lua_hooklib.c +++ b/src/lua_hooklib.c @@ -25,6 +25,7 @@ #include "lua_libs.h" #include "lua_hook.h" #include "lua_hud.h" // hud_running errors +#include "lua_profile.h" /* ========================================================================= ABSTRACTION @@ -65,6 +66,8 @@ static stringhook_t stringHooks[STRING_HOOK(MAX)]; bool hook_important = true; +#define NONMOHOOK ((mobjtype_t)-1) + // This will be indexed by hook id, the value of which fetches the registry. static int * hookRefs; static int nextid; @@ -296,7 +299,7 @@ struct Hook_State { INT32 status; /* return status to calling function */ void * userdata; int hook_type; - mobjtype_t mobj_type; /* < NUMMOBJTYPES if mobj hook */ + mobjtype_t mobj_type; /* != NONMOHOOK if mobj hook */ const char * string; /* used to fetch table, ran first if set */ int top; /* index of last argument passed to hook */ int id; /* id to fetch ref */ @@ -364,7 +367,7 @@ FUNCINLINE static ATTRINLINE boolean prepare_hook int hook_type ){ return init_hook_type(hook, default_status, - hook_type, NUMMOBJTYPES, NULL, + hook_type, NONMOHOOK, NULL, hookIds[hook_type].numHooks); } @@ -391,7 +394,7 @@ FUNCINLINE static ATTRINLINE boolean prepare_string_hook const char * string ){ if (init_hook_type(hook, default_status, - hook_type, NUMMOBJTYPES, string, + hook_type, NONMOHOOK, string, stringHooks[hook_type].ref)) { lua_pushstring(gL, string); @@ -407,7 +410,7 @@ FUNCINLINE static ATTRINLINE boolean prepare_hud_hook int hook_type ){ return init_hook_type(hook, 0, - hook_type, NUMMOBJTYPES, NULL, + hook_type, NONMOHOOK, NULL, hudHookIds[hook_type].numHooks); } @@ -443,11 +446,54 @@ FUNCINLINE static ATTRINLINE void get_hook_from_table(Hook_State *hook, int n) lua_getref(gL, hookRefs[hook->id]); } +static int pcall(Hook_State *hook) +{ + return lua_pcall(gL, hook->values, hook->results, EINDEX); +} + +static const char *hook_name(Hook_State *hook) +{ + if (hud_running) + { + return hudHookNames[hook->hook_type]; + } + else if (hook->string) + { + return stringHookNames[hook->hook_type]; + } + //else if (hook->mobj_type > 0) + else if (hook->mobj_type != NONMOHOOK) + { + return mobjHookNames[hook->hook_type]; + } + else + { + return hookNames[hook->hook_type]; + } +} + +static int pcall_timed_or_untimed(Hook_State *hook) +{ + if (!hud_running && cv_lua_profile.value > 0) + { + lua_timer_t *timer = LUA_BeginFunctionTimer(gL, -1 - hook->values, hook_name(hook)); + int k = pcall(hook); + LUA_EndFunctionTimer(timer); + + return k; + } + else + { + return pcall(hook); + } +} + static int call_single_hook_no_copy(Hook_State *hook) { hook_important = hook->important; - if (lua_pcall(gL, hook->values, hook->results, EINDEX) == 0) + //if (lua_pcall(gL, hook->values, hook->results, EINDEX) == 0) + if (pcall_timed_or_untimed(hook) == 0) { if (hook->results > 0) { @@ -528,10 +574,47 @@ static int call_string_hooks(Hook_State *hook) return calls; } +FUNCINLINE static ATTRINLINE int call_mobj_type_hooks(Hook_State *hook, mobjtype_t mobj_type) +{ + static UINT8 seen = 0; // so we dont have to check all this shit constantly + int numCalls = call_mapped(hook, &mobjHookIds[mobj_type][hook->hook_type]); + + if (!seen && numCalls > 0 && mobj_type == MT_NULL && ( + hook->hook_type == MOBJ_HOOK(MobjThinker ) + || hook->hook_type == MOBJ_HOOK(MobjCollide ) + || hook->hook_type == MOBJ_HOOK(MobjMoveCollide) + || hook->hook_type == MOBJ_HOOK(MobjFuse ) + || hook->hook_type == MOBJ_HOOK(BossThinker ) + )) + { + seen = 1; + CONS_Alert( + CONS_WARNING, "%s\n", va( + "%s hooks not attached to a specific mobj type may cause performance issues!", + mobjHookNames[hook->hook_type]) + ); + + // print which script triggered it, ty indev <3 + for (int k = 0; k < mobjHookIds[mobj_type][hook->hook_type].numHooks; ++k) + { + lua_getref(gL, hookRefs[mobjHookIds[mobj_type][hook->hook_type].ids[k].id]); + + lua_Debug ar; + lua_getinfo(gL, ">S", &ar); + + CONS_Printf("%s:%d\n", ar.short_src, ar.linedefined); + } + } + + return numCalls; +} + +/* FUNCINLINE static ATTRINLINE int call_mobj_type_hooks(Hook_State *hook, mobjtype_t mobj_type) { return call_mapped(hook, &mobjHookIds[mobj_type][hook->hook_type]); } +*/ static int call_hooks ( @@ -547,11 +630,13 @@ static int call_hooks { calls += call_string_hooks(hook); } - else if (hook->mobj_type < NUMMOBJTYPES) + //else if (hook->mobj_type > 0) + else if (hook->mobj_type != NONMOHOOK) { /* call generic mobj hooks first */ calls += call_mobj_type_hooks(hook, MT_NULL); - calls += call_mobj_type_hooks(hook, hook->mobj_type); + if (hook->mobj_type < NUMMOBJTYPES) + calls += call_mobj_type_hooks(hook, hook->mobj_type); ps_lua_mobjhooks.value.i += calls; } else @@ -718,7 +803,7 @@ static void hook_think_frame(int type) const hook_t * map = &hookIds[type]; int k; - const boolean perfstats = (cv_perfstats.value >= 3); + const boolean perfstats = (cv_perfstats.value >= PS_THINKFRAME); if (prepare_hook(&hook, 0, type)) { @@ -976,6 +1061,9 @@ void LUA_HookNetArchive(lua_CFunction archFunc, savebuffer_t *save) lua_pushcclosure(gL, archFunc, 2); // stack: tables, savebuffer_t, archFunc + // Manually set the hook's variables here since we don't call prepare_hook + hook.hook_type = HOOK(NetVars); + hook.mobj_type = NONMOHOOK; // Force mobj_type to be NONMOHOOK so the mobj_type check get skipped init_hook_call(&hook, 0, res_none); call_mapped(&hook, map); diff --git a/src/lua_hudlib.c b/src/lua_hudlib.c index 444733097..78a7a5e19 100644 --- a/src/lua_hudlib.c +++ b/src/lua_hudlib.c @@ -644,20 +644,22 @@ static int libd_drawScaled(lua_State *L) // KART: draw patch on minimap from x, y coordinates on the map static int libd_drawOnMinimap(lua_State *L) { - fixed_t x, y, scale; // coordinates of the object - patch_t *patch; // patch we want to draw - UINT8 *colormap = NULL; // do we want to colormap this patch? - boolean centered; // the patch is centered and doesn't need readjusting on x/y coordinates. + fixed_t x, y, scale; // coordinates of the object + patch_t *patch; // patch we want to draw + UINT8 *colormap = NULL; // do we want to colormap this patch? + boolean centered; // the patch is centered and doesn't need readjusting on x/y coordinates. huddrawlist_h list; - patch_t *AutomapPic = NULL; drawinfo_t info; + // variables used to replicate k_kart's mmap drawer: + patch_t *AutomapPic; + // variables used for actually drawing the icon: INT32 splitflags, minimaptrans; fixed_t amnumxpos, amnumypos; fixed_t amxpos, amypos; INT32 mm_x, mm_y; - fixed_t patchw = 0, patchh = 0; + fixed_t patchw, patchh; HUDONLY // only run this function in hud hooks @@ -722,8 +724,11 @@ static int libd_drawOnMinimap(lua_State *L) mm_y -= AutomapPic->topoffset; - // patch is supposedly already centered, don't butt in. - if (!centered) + if (centered) + { + patchw = patchh = 0; // patch is supposedly already centered, don't butt in. + } + else { // scale patch coords patchw = (patch->width * scale / 2); diff --git a/src/lua_infolib.c b/src/lua_infolib.c index 4c84c48d5..5f2f4f80c 100644 --- a/src/lua_infolib.c +++ b/src/lua_infolib.c @@ -22,7 +22,8 @@ #include "lua_script.h" #include "lua_libs.h" #include "lua_hud.h" // hud_running errors -#include "lua_hook.h" // cmd errors +#include "lua_hook.h" // hook_cmd_running errors +#include "lua_profile.h" boolean LUA_CallAction(enum actionnum actionnum, mobj_t *actor); state_t *astate = NULL; @@ -110,7 +111,10 @@ static void A_Lua(mobj_t *actor) LUA_PushUserdata(gL, actor, META_MOBJ); lua_pushinteger(gL, var1); lua_pushinteger(gL, var2); + + lua_timer_t *timer = LUA_BeginFunctionTimer(gL, -4, "A_Lua"); LUA_Call(gL, 3, 0, 1); + LUA_EndFunctionTimer(timer); lua_pop(gL, 1); // pop error handler diff --git a/src/lua_maplib.c b/src/lua_maplib.c index 279b02883..87639b77b 100644 --- a/src/lua_maplib.c +++ b/src/lua_maplib.c @@ -652,7 +652,7 @@ static int line_get(lua_State *L) LUA_PushUserdata(L, &sides[line->sidenum[0]], META_SIDE); return 1; case line_backside: // backside - if (line->sidenum[1] == 0xffff) + if (line->sidenum[1] == NO_INDEX) return 0; LUA_PushUserdata(L, &sides[line->sidenum[1]], META_SIDE); return 1; diff --git a/src/lua_profile.cpp b/src/lua_profile.cpp new file mode 100644 index 000000000..d910c5d65 --- /dev/null +++ b/src/lua_profile.cpp @@ -0,0 +1,264 @@ +// DR. ROBOTNIK'S RING RACERS +//----------------------------------------------------------------------------- +// Copyright (C) 2025 by James Robert Roman +// Copyright (C) 2025 by Kart Krew +// +// This program is free software distributed under the +// terms of the GNU General Public License, version 2. +// See the 'LICENSE' file for more details. +//----------------------------------------------------------------------------- + +#include "screen.h" +#include +#include +#include +#include +#include +#include + +extern "C" { +#include "blua/lua.h" +}; + +#include "v_video.h" + +#include "command.h" +#include "doomtype.h" +#include "i_system.h" +#include "lua_profile.h" +#include "m_perfstats.h" + +extern "C" consvar_t cv_lua_profile; + +namespace +{ + +precise_t g_time_reference; +int g_tics_counted; + +double g_running_tic_time; +double g_avg_tic_time; + +bool g_invalid; + +}; // namespace + +struct lua_timer_t +{ + struct Stat + { + double calls = 0; + double time = 0.0; + }; + + Stat running, avg; +}; + +namespace +{ + +std::unordered_map g_tic_timers; + +}; // namespace + +lua_timer_t* LUA_BeginFunctionTimer(lua_State* L, int fn_idx, const char* name) +{ + lua_Debug ar; + + lua_pushvalue(L, fn_idx); + lua_getinfo(L, ">S", &ar); + + auto label = [&] + { + using sv = std::string_view; + sv view{ar.source}; + + switch (view.front()) + { + case '@': // file + if (std::size_t p = view.rfind('/'); p != sv::npos) // lump or base + { + return view.substr(p + 1); + } + break; + + case '=': // ?? + view.remove_prefix(1); + break; + } + + return view; + }; + + // i sure hope this std::string mess is fine... + auto [it, ins] = g_tic_timers.try_emplace(std::string(va("%s:%d (%s)", std::string(label()).c_str(), ar.linedefined, name))); + auto& [key, timer] = *it; + + g_time_reference = I_GetPreciseTime(); + + return &timer; +} + +void LUA_EndFunctionTimer(lua_timer_t* timer) +{ + precise_t t = I_GetPreciseTime() - g_time_reference; + double precision = I_GetPrecisePrecision(); + + timer->running.time += t / precision; + timer->running.calls += 1.0; +} + +void LUA_ResetTicTimers(void) +{ + if (cv_lua_profile.value <= 0) + { + return; + } + + if (g_tics_counted < cv_lua_profile.value) + { + g_tics_counted++; + + double precision = I_GetPrecisePrecision(); + g_running_tic_time += ps_prevtictime.value.p / precision; + } + else + { + double counted = g_tics_counted; + + for (auto& [key, timer] : g_tic_timers) + { + timer.avg = {timer.running.calls / counted, timer.running.time / counted}; + timer.running = {}; + } + + g_avg_tic_time = g_running_tic_time / counted; + g_running_tic_time = 0.0; + + g_tics_counted = 1; + + g_invalid = false; + } +} + +void LUA_RenderTimers(void) +{ + constexpr int kRowHeight = 4; + float row_y = kRowHeight; + + // pretty much what the whole srb2::Draw does lol + auto draw_row = [](float x, float y, INT32 flags, const char *str) + { + V_DrawSmallStringAtFixed( + FloatToFixed(x), + FloatToFixed(y), + V_MONOSPACE|V_ALLOWLOWERCASE|flags, + str + ); + }; + + draw_row(0.f, 0.f, 0, va("-- AVERAGES PER TIC (over %d tics) --", cv_lua_profile.value)); + + if (g_invalid) + { + draw_row(0.f, row_y, V_GRAYMAP, " "); + return; + } + + std::vector view; + view.reserve(g_tic_timers.size()); + + auto color_flag = [](double t) + { + if (t < 10.0) + { + return V_GRAYMAP; + } + else if (t >= 100.0) + { + return V_YELLOWMAP; + } + else + { + return 0; + } + }; + + { + double cum = 0.0; + + for (auto it = g_tic_timers.begin(); it != g_tic_timers.end(); ++it) + { + auto& [key, timer] = *it; + + cum += timer.avg.time; + + if (timer.avg.time > 0.0) + { + view.push_back(it); + } + } + + { + const INT32 tally_flags = color_flag(cum * 1'000'000.0); + + draw_row(0.f, row_y, tally_flags, va("%8.2f us - TOTAL", cum * 1'000'000.0)); + draw_row(0.f, row_y + kRowHeight, tally_flags, va("%8.2f ms", cum * 1000.0)); + + // dont need to show this if we didnt capture over time + // this would just show nan or inf anyways + if (std::fpclassify(g_avg_tic_time) != FP_ZERO) + { + draw_row(0.f, row_y + kRowHeight * 2, tally_flags, va( + "%8.2f%% overhead (%.2f / %.2f) <-- not counting rendering time", + (cum / g_avg_tic_time) * 100.0, + (cum * (double)TICRATE), + (g_avg_tic_time * (double)TICRATE) + )); + } + } + + row_y += kRowHeight * 4; + } + + std::sort( + view.rbegin(), + view.rend(), + [](auto a, auto b) + { + auto& [k1, t1] = *a; + auto& [k2, t2] = *b; + return t1.avg.time < t2.avg.time; + } + ); + + for (auto it : view) + { + auto& [key, timer] = *it; + + double t = timer.avg.time * 1'000'000.0; + + draw_row(0.f, row_y, color_flag(t), va( + "%8.2f us %8.2f calls - %s", + t, + timer.avg.calls, + key.c_str() + )); + + row_y += kRowHeight; + + // FIXME this is all ugly and sucks + if (row_y >= BASEVIDHEIGHT) + break; + } +} + +extern "C" void lua_profile_OnChange(void) +{ + g_invalid = true; + + if (cv_lua_profile.value == 0) + { + g_tic_timers = {}; + } +} diff --git a/src/lua_profile.h b/src/lua_profile.h new file mode 100644 index 000000000..80475613d --- /dev/null +++ b/src/lua_profile.h @@ -0,0 +1,38 @@ +// DR. ROBOTNIK'S RING RACERS +//----------------------------------------------------------------------------- +// Copyright (C) 2025 by James Robert Roman +// Copyright (C) 2025 by Kart Krew +// +// This program is free software distributed under the +// terms of the GNU General Public License, version 2. +// See the 'LICENSE' file for more details. +//----------------------------------------------------------------------------- + +#ifndef lua_profile_h +#define lua_profile_h + +#include "blua/lua.h" +#include "doomtype.h" +//#include "typedef.h" + +#ifdef __cplusplus +extern "C" { +#endif + +struct lua_timer_t; +typedef struct lua_timer_t lua_timer_t; + +void LUA_ResetTicTimers(void); + +lua_timer_t *LUA_BeginFunctionTimer(lua_State *L, int fn_idx, const char *name); +void LUA_EndFunctionTimer(lua_timer_t *timer); + +void LUA_RenderTimers(void); + +void lua_profile_OnChange(void); + +#ifdef __cplusplus +} // extern "C" +#endif + +#endif/*lua_profile_h*/ diff --git a/src/lua_script.c b/src/lua_script.c index 2649a57c7..4e1cfc995 100644 --- a/src/lua_script.c +++ b/src/lua_script.c @@ -713,9 +713,12 @@ static UINT8 GetUserdataArchType(int index) static UINT8 ArchiveValue(UINT8 **p, int TABLESINDEX, int myindex) { + int type = lua_type(gL, myindex); + if (myindex < 0) myindex = lua_gettop(gL)+1+myindex; - switch (lua_type(gL, myindex)) + + switch (type) { case LUA_TNONE: case LUA_TNIL: @@ -725,8 +728,12 @@ static UINT8 ArchiveValue(UINT8 **p, int TABLESINDEX, int myindex) case LUA_TLIGHTUSERDATA: case LUA_TTHREAD: case LUA_TFUNCTION: + { + const char *typestr = (type == LUA_TLIGHTUSERDATA ? "light userdata" : (type == LUA_TTHREAD ? "thread" : (type == LUA_TFUNCTION ? "function" : "??"))); + CONS_Alert(CONS_ERROR, M_GetText("Archived an invalid value! (%s)\n"), typestr); WRITEUINT8(*p, ARCH_NULL); return 2; + } case LUA_TBOOLEAN: WRITEUINT8(*p, ARCH_BOOLEAN); WRITEUINT8(*p, lua_toboolean(gL, myindex)); diff --git a/src/m_cheat.c b/src/m_cheat.c index 783ff3bcb..0360ecc56 100644 --- a/src/m_cheat.c +++ b/src/m_cheat.c @@ -766,7 +766,7 @@ boolean OP_FreezeObjectplace(void) if (!objectplacing) return false; - if ((maptol & TOL_NIGHTS) && (players[consoleplayer].pflags & PF_NIGHTSMODE)) + if (nightsmode && nightsplayer(&players[consoleplayer])) return false; return true; @@ -1049,7 +1049,7 @@ void Command_ObjectPlace_f(void) { objectplacing = true; - if ((players[0].pflags & PF_NIGHTSMODE)) + if (nightsplayer(&players[0])) return; if (!COM_CheckParm("-silent")) @@ -1120,7 +1120,7 @@ void Command_ObjectPlace_f(void) // Don't touch the NiGHTS Objectplace stuff. // ... or if the mo mysteriously vanished. - if (!players[0].mo || (players[0].pflags & PF_NIGHTSMODE)) + if (!players[0].mo || nightsplayer(&players[0])) return; // If still in dummy state, get out of it. diff --git a/src/m_curl.c b/src/m_curl.c index 77588a3fb..f7ff29955 100644 --- a/src/m_curl.c +++ b/src/m_curl.c @@ -11,7 +11,7 @@ #include "m_curl.h" #include "doomtype.h" -#include "i_system.h" // I_OutputMsg +#include "doomdef.h" // I_OutputMsg #include "m_argv.h" // M_CheckParm, M_GetNextParm static boolean curl_args_init = false; diff --git a/src/m_menu.c b/src/m_menu.c index a6790ff78..b75cfa430 100644 --- a/src/m_menu.c +++ b/src/m_menu.c @@ -25,6 +25,7 @@ #include "d_netcmd.h" #include "d_clisrv.h" #include "i_net.h" +#include "i_system.h" #include "console.h" #include "r_fps.h" #include "r_local.h" @@ -151,8 +152,6 @@ const char *quitmsg[NUM_QUITMESSAGES] = {}; INT32 mapwads[NUMMAPS] = {}; -boolean browselocalskins = false; - boolean menuactive = false; boolean fromlevelselect = false; @@ -214,12 +213,19 @@ static INT32 setupm_fakeskin; static INT32 setupm_fakecolor; static UINT8 setupm_pselect = 1; -//variables used for other skin select menus +// variables used for other skin select menus static UINT8 setupm_skinypos; static INT32 setupm_skinselect; static boolean setupm_skinlockedselect; -static UINT8 setupm_playernum; //brap +static UINT8 setupm_playernum; // brap + +// Addons Menu: Local mode +static void M_LocalAddons(INT32 choice); +static boolean addons_localmode = false; + +#define LOCALMODE_KEY (KEY_RALT) +#define AUTOLOAD_KEY (KEY_END) // // PROTOTYPES @@ -271,6 +277,8 @@ static void M_ConfirmTeamChange(INT32 choice); static void M_ConfirmSpectateChange(INT32 choice); static void M_QuitSRB2(INT32 choice); +static void M_SaturnReportIssue(INT32 choice); + // Single Player static void M_TimeAttack(INT32 choice); static boolean M_QuitTimeAttackMenu(void); @@ -325,7 +333,6 @@ static void M_EraseData(INT32 choice); static void M_AddonsInternal(); static void M_Addons(INT32 choice); -static void M_LocalSkins(INT32 choice); static void M_AddonsOptions(INT32 choice); #define addonmenusize 9 // number of items actually displayed in the addons menu view, formerly (2*numaddonsshown + 1) #define numaddonsshown 4 // number of items to each side of the currently selected item, unless at top/bottom ends of directory @@ -409,6 +416,7 @@ static INT32 M_GetFirstLevelInList(void); // crap to force hud to show when in saturns hud options boolean forceshowhud = false; +boolean forceshowchat = false; // smol text indicating if game is modified // so ppl dont wonder where their ra times went and stuff @@ -447,13 +455,13 @@ consvar_t cv_showallmaps = {"showallmaps", "No", CV_SAVE, CV_YesNo, NULL, 0, NUL consvar_t cv_showmusicfilename = {"showmusicfilename", "No", CV_SAVE, CV_YesNo, NULL, 0, NULL, NULL, 0, 0, NULL}; static CV_PossibleValue_t serversort_cons_t[] = { - {0,"Ping"}, - {1,"Modified State"}, - {2,"Most Players"}, - {3,"Least Players"}, - {4,"Max Player Slots"}, - {5,"Gametype"}, - {0,NULL} + {0, "Ping"}, + {1, "Modified State"}, + {2, "Most Players"}, + {3, "Least Players"}, + {4, "Max Player Slots"}, + {5, "Gametype"}, + {0, NULL} }; consvar_t cv_serversort = {"serversort", "Ping", CV_CALL, serversort_cons_t, M_SortServerList, 0, NULL, NULL, 0, 0, NULL}; @@ -702,7 +710,7 @@ static void Dummystaff_OnChange(void) dummystaffname[0] = '\0'; - if ((l = W_CheckNumForName(va("%sS01",G_BuildMapName(cv_nextmap.value)))) == LUMPERROR) + if ((l = W_CheckNumForName(va("%sS01", G_BuildMapName(cv_nextmap.value)))) == LUMPERROR) { CV_StealthSetValue(&cv_dummystaff, 0); return; @@ -711,7 +719,7 @@ static void Dummystaff_OnChange(void) { char *temp = dummystaffname; UINT8 numstaff = 1; - while (numstaff < 99 && (l = W_CheckNumForName(va("%sS%02u",G_BuildMapName(cv_nextmap.value),numstaff+1))) != LUMPERROR) + while (numstaff < 99 && (l = W_CheckNumForName(va("%sS%02u", G_BuildMapName(cv_nextmap.value), numstaff+1))) != LUMPERROR) numstaff++; if (cv_dummystaff.value < 1) @@ -719,7 +727,7 @@ static void Dummystaff_OnChange(void) else if (cv_dummystaff.value > numstaff) CV_StealthSetValue(&cv_dummystaff, 1); - if ((l = W_CheckNumForName(va("%sS%02u",G_BuildMapName(cv_nextmap.value), cv_dummystaff.value))) == LUMPERROR) + if ((l = W_CheckNumForName(va("%sS%02u", G_BuildMapName(cv_nextmap.value), cv_dummystaff.value))) == LUMPERROR) return; // shouldn't happen but might as well check... G_UpdateStaffGhostName(l); @@ -804,7 +812,8 @@ static void M_ChangeCvar(INT32 choice) CV_SetValue(cv,skins[skinno].prefcolor); return; } - CV_Set(cv,cv->defaultvalue); + + CV_Set(cv, cv->defaultvalue); return; } @@ -953,6 +962,7 @@ static void Command_Manual_f(void) { if (modeattacking) return; + M_StartControlPanel(); M_Manual(INT32_MAX); itemOn = 0; @@ -1014,6 +1024,24 @@ boolean M_Responder(event_t *ev) case KEY_HAT1 + 3: ch = KEY_RIGHTARROW; break; + //Local Addon Mode + case LOCALMODE_KEY: + { + if (!(server || IsPlayerAdmin(consoleplayer))) + break; + + if (!addons_localmode) + { + S_StartSound(NULL, sfx_ding); + addons_localmode = true; + } + else + { + S_StartSound(NULL, sfx_jshard); + addons_localmode = false; + } + } + break; } } else if (menuactive) @@ -1025,11 +1053,12 @@ boolean M_Responder(event_t *ev) const INT32 jxdeadzone = ((JOYAXISRANGE-1) * max(cv_xdeadzone[0].value, FRACUNIT/2)) >> FRACBITS; const INT32 jydeadzone = ((JOYAXISRANGE-1) * max(cv_ydeadzone[0].value, FRACUNIT/2)) >> FRACBITS; INT32 accelaxis = abs(cv_moveaxis[0].value); + if (ev->data1 == 0) { if (ev->data3 != INT32_MAX) { - if (Joystick[0].bGamepadStyle || abs(ev->data3) > jydeadzone) + if (DigitalGamepadStyle(0) || abs(ev->data3) > jydeadzone) { if (joywaity < thistime && (pjoyy == 0 || (ev->data3 < 0) != (pjoyy < 0))) // no previous direction OR change direction @@ -1045,7 +1074,7 @@ boolean M_Responder(event_t *ev) if (ev->data2 != INT32_MAX && joywaitx < thistime) { - if (Joystick[0].bGamepadStyle || abs(ev->data2) > jxdeadzone) + if (DigitalGamepadStyle(0) || abs(ev->data2) > jxdeadzone) { if (joywaitx < thistime && (pjoyx == 0 || (ev->data2 < 0) != (pjoyx < 0))) // no previous direction OR change direction @@ -1064,19 +1093,22 @@ boolean M_Responder(event_t *ev) // The following borrows heavily from Joy1Axis. const boolean xmode = (accelaxis%2); INT32 retaxis = 0; + if (!xmode) accelaxis--; accelaxis /= 2; + if (ev->data1 == accelaxis) { const INT32 jacceldeadzone = xmode ? jxdeadzone : jydeadzone; retaxis = xmode ? ev->data2 : ev->data3; + if (retaxis != INT32_MAX) { if (cv_moveaxis[0].value < 0) retaxis = -retaxis; - if (Joystick[0].bGamepadStyle || retaxis > jacceldeadzone) + if (DigitalGamepadStyle(0) || retaxis > jacceldeadzone) { if (joywaitaccel < thistime && retaxis > pjoyaccel) // only on upwards event { @@ -1575,11 +1607,16 @@ static boolean ShouldDrawMenuBG(void) if (forceshowhud) return false; + if (forceshowchat) + return false; + // camera options stuff, only do when in level if (gamestate == GS_LEVEL && - (currentMenu == &OP_CamOptionsDef || currentMenu == &OP_Player1CamOptionsDef - || currentMenu == &OP_Player2CamOptionsDef || currentMenu == &OP_Player3CamOptionsDef - || currentMenu == &OP_Player4CamOptionsDef)) + (currentMenu == &OP_CamOptionsDef || + currentMenu == &OP_Player1CamOptionsDef || + currentMenu == &OP_Player2CamOptionsDef || + currentMenu == &OP_Player3CamOptionsDef || + currentMenu == &OP_Player4CamOptionsDef)) return false; return true; @@ -1595,7 +1632,9 @@ void M_Drawer(void) if (currentMenu == &MessageDef) menuactive = true; + // pain and suffering forceshowhud = (gamestate == GS_LEVEL && menuactive && (currentMenu == &OP_SaturnHudDef || currentMenu == &OP_HudOffsetDef || currentMenu == &OP_NametagDef || currentMenu == &OP_DriftGaugeDef)); // holy fuick + forceshowchat = (gamestate == GS_LEVEL && menuactive && currentMenu == &OP_ChatOptionsDef && (!OLDCHAT) && (itemOn == op_chat_boxwidth || itemOn == op_chat_boxheight || itemOn == op_chat_xoffs || itemOn == op_chat_yoffs || itemOn == op_chat_charlmt)); // man i dont gaf anymore lmao if (menuactive) { @@ -1714,19 +1753,16 @@ void M_StartControlPanel(void) MPauseMenu[mpause_switchteam].status = IT_DISABLED; MPauseMenu[mpause_switchspectate].status = IT_DISABLED; MPauseMenu[mpause_psetup].status = IT_DISABLED; + MPauseMenu[mpause_localaddons].status = IT_STRING | IT_CALL; + MISC_ChangeTeamMenu[0].status = IT_DISABLED; MISC_ChangeSpectateMenu[0].status = IT_DISABLED; - MPauseMenu[mpause_addlocalskins].status = IT_STRING | IT_CALL; MPauseMenu[mpause_localskin].status = IT_STRING | IT_CALL; // Reset these in case splitscreen messes things up MPauseMenu[mpause_addons].alphaKey = 8; - - if (IsPlayerAdmin(consoleplayer)) - MPauseMenu[mpause_addlocalskins].alphaKey = 16; - else - MPauseMenu[mpause_addlocalskins].alphaKey = 24; + MPauseMenu[mpause_localaddons].alphaKey = 24; MPauseMenu[mpause_scramble].alphaKey = 8; MPauseMenu[mpause_switchmap].alphaKey = 24; @@ -1744,14 +1780,13 @@ void M_StartControlPanel(void) { MPauseMenu[mpause_switchmap].status = IT_STRING | IT_CALL; MPauseMenu[mpause_addons].status = IT_STRING | IT_CALL; - + MPauseMenu[mpause_localaddons].status = IT_DISABLED; if (G_GametypeHasTeams()) MPauseMenu[mpause_scramble].status = IT_STRING | IT_SUBMENU; } if (server || (!cv_showlocalskinmenus.value)) { - MPauseMenu[mpause_addlocalskins].status = IT_DISABLED; MPauseMenu[mpause_localskin].status = IT_DISABLED; MPauseMenu[mpause_options].alphaKey = 64; @@ -1759,7 +1794,6 @@ void M_StartControlPanel(void) MPauseMenu[mpause_quit].alphaKey = 88; } - if (splitscreen) { MPauseMenu[mpause_psetupsplit].status = MPauseMenu[mpause_psetupsplit2].status = IT_STRING | IT_CALL; @@ -3304,14 +3338,14 @@ static void M_AddonsInternal(void) static void M_Addons(INT32 choice) { (void)choice; - browselocalskins = false; + addons_localmode = false; M_AddonsInternal(); } -static void M_LocalSkins(INT32 choice) +static void M_LocalAddons(INT32 choice) { (void)choice; - browselocalskins = true; + addons_localmode = true; M_AddonsInternal(); } @@ -3480,8 +3514,8 @@ static void M_DrawAddons(void) if (Playing()) { - if (browselocalskins) - V_DrawCenteredString(BASEVIDWIDTH/2, 5, V_ALLOWLOWERCASE, "Load \x83local skins\x80 from addons!"); + if (addons_localmode) // Draw notice that you're adding locally + V_DrawCenteredString(BASEVIDWIDTH/2, 5, V_ALLOWLOWERCASE, "Load addons or \x83local skins\x80 locally!"); else V_DrawCenteredString(BASEVIDWIDTH/2, 5, warningflags, "Adding files mid-game may cause problems."); } @@ -3644,7 +3678,10 @@ static void M_DrawAddons(void) //m = numwadfiles-(mainwads+2+1); //V_DrawCenteredString(BASEVIDWIDTH/2, y+24, (majormods ? highlightflags : V_TRANSLUCENT), va("%d ADD-ON%s LOADED", (int)m, (m == 1) ? "" : "S")); //+2 for music, sounds, +1 for main.kart - V_DrawThinString(0, BASEVIDHEIGHT-10, V_SNAPTOBOTTOM|V_SNAPTOLEFT|V_TRANSLUCENT|V_ALLOWLOWERCASE, ("END Key - Add addon to autoload")); + V_DrawThinString(0, BASEVIDHEIGHT-10, V_SNAPTOBOTTOM|V_SNAPTOLEFT|V_TRANSLUCENT|V_ALLOWLOWERCASE, va("%s Key - Add addon to autoload", G_KeynumToString(AUTOLOAD_KEY))); + + if (Playing() && (server || IsPlayerAdmin(consoleplayer))) + V_DrawThinString(0, BASEVIDHEIGHT-20, V_SNAPTOBOTTOM|V_SNAPTOLEFT|V_TRANSLUCENT|V_ALLOWLOWERCASE, va("%s Key - Switch to local addon mode", G_KeynumToString(LOCALMODE_KEY))); } static void M_AddonExec(INT32 ch) @@ -3666,7 +3703,7 @@ static void M_AddonAutoLoad(INT32 ch) FILE *autoloadconfigfile; // check our controls // - if (ch != 'y' && ch != KEY_ENTER && ch != KEY_END) + if (ch != 'y' && ch != KEY_ENTER && ch != AUTOLOAD_KEY) { S_StartSound(NULL, sfx_s26d); return; @@ -3680,7 +3717,7 @@ static void M_AddonAutoLoad(INT32 ch) switch (dirmenu[dir_on[menudepthleft]][DIR_TYPE]) { case EXT_FOLDER: - M_StartMessage(va("%c%s\x80\nAutoloading folders is not supported as of yet. \n\n(Press a key)\n", ('\x80' + (highlightflags>>V_CHARCOLORSHIFT)), dirmenu[dir_on[menudepthleft]]+DIR_STRING),NULL,MM_NOTHING); + M_StartMessage(va("%c%s\x80\nAutoloading folders is not supported as of yet. \n\n(Press a key)\n", ('\x80' + (highlightflags>>V_CHARCOLORSHIFT)), dirmenu[dir_on[menudepthleft]]+DIR_STRING), NULL, MM_NOTHING); break; case EXT_TXT: case EXT_CFG: @@ -3821,7 +3858,7 @@ static void M_HandleAddons(INT32 choice) } break; case EXT_TXT: - M_StartMessage(va("%c%s\x80\nThis file may not be a console script.\nAttempt to run anyways? \n\n(Press 'Y' to confirm)\n", ('\x80' + (highlightflags>>V_CHARCOLORSHIFT)), dirmenu[dir_on[menudepthleft]]+DIR_STRING),M_AddonExec,MM_YESNO); + M_StartMessage(va("%c%s\x80\nThis file may not be a console script.\nAttempt to run anyways? \n\n(Press 'Y' to confirm)\n", ('\x80' + (highlightflags>>V_CHARCOLORSHIFT)), dirmenu[dir_on[menudepthleft]]+DIR_STRING), M_AddonExec, MM_YESNO); break; case EXT_CFG: M_AddonExec(KEY_ENTER); @@ -3834,30 +3871,40 @@ static void M_HandleAddons(INT32 choice) case EXT_KART: #endif case EXT_PK3: - if (browselocalskins) { - if (DumbStartsWith("KC_", dirmenu[dir_on[menudepthleft]]+DIR_STRING) || DumbStartsWith("kc_", dirmenu[dir_on[menudepthleft]]+DIR_STRING)) { - M_StartMessage(va("%c%s\x80\nYou are loading a local skin.\nLocal skins will not be usable\nafter going back from\nthe title screen.\n\n(Press a key)\n", ('\x80' + (highlightflags>>V_CHARCOLORSHIFT)), dirmenu[dir_on[menudepthleft]]+DIR_STRING),NULL,MM_NOTHING); - COM_BufAddText(va("addfilelocal \"%s%s\"", menupath, dirmenu[dir_on[menudepthleft]]+DIR_STRING)); + const char *addonname = dirmenu[dir_on[menudepthleft]]+DIR_STRING; + + if (addons_localmode) + { + if (DumbStartsWith("KC_", addonname) || DumbStartsWith("kc_", addonname)) + { + M_StartMessage(va("%c%s\x80\nYou are loading a local skin.\nLocal skins will not be usable\nafter going back from\nthe title screen.\n\n(Press a key)\n", ('\x80' + (highlightflags>>V_CHARCOLORSHIFT)), addonname), NULL, MM_NOTHING); + } + else if (DumbStartsWith("KCL_", addonname) || DumbStartsWith("kcl_", addonname)) // skins with lua + { + M_StartMessage(va("%c%s\x80\nYou are loading a local skin with lua.\nBeware that this may cause issues like crashes or desyncs in some cases!\nLocal skins will not be usable\nafter going back from\nthe title screen.\n\n(Press a key)\n", ('\x80' + (highlightflags>>V_CHARCOLORSHIFT)), addonname), NULL, MM_NOTHING); + } + // no need to account for KRC cases + + COM_BufAddText(va("addfilelocal \"%s%s\"", menupath, addonname)); } else - S_StartSound(NULL, sfx_s26d); - } - else - { - COM_BufAddText(va("addfile \"%s%s\"", menupath, dirmenu[dir_on[menudepthleft]]+DIR_STRING)); + { + COM_BufAddText(va("addfile \"%s%s\"", menupath, addonname)); + } } break; default: S_StartSound(NULL, sfx_s26d); } } + if (refresh) refreshdirmenu |= REFRESHDIR_NORMAL; } break; - case KEY_END: + case AUTOLOAD_KEY: { boolean refresh = true; if (!dirmenu[dir_on[menudepthleft]]) @@ -3924,6 +3971,8 @@ static void M_HandleAddons(INT32 choice) M_SetupNextMenu(currentMenu->prevMenu); else M_ClearMenus(true); + + addons_localmode = false; //Exiting this menu, disable addons_localmode already. } } @@ -4201,6 +4250,14 @@ static boolean M_HandleReplayHutQuery(INT32 choice) char tmp[MAXREPLAYQUERY+1]; memcpy(tmp, replayqueryinput_buffer, MAXREPLAYQUERY+1); + Lock_search_state(); + if (!replaynamesloaded) + { + Unlock_search_state(); + return false; + } + Unlock_search_state(); + if (M_TextInputHandle(&replayqueryinput, choice)) { S_StartSound(NULL, sfx_menu1); @@ -5709,7 +5766,8 @@ static void M_DrawMusicTest(void) x = 24; y = 64; - if (renderisnewtic) st_musictime++; + if (renderisnewtic) + st_musictime++; while (t <= b) { @@ -5717,12 +5775,13 @@ static void M_DrawMusicTest(void) V_DrawFill(20, y-4, 280-1, 16, 237); { + const musicdef_t *def = S_GetMusicCredit(t); - const size_t MAXLENGTH = 34; const char *songname = def->title[0] ? def->title : def->source; size_t namelength = strlen(songname); + static const size_t MAXLENGTH = 34; char buf[MAXLENGTH+1]; if (t == st_sel && namelength > MAXLENGTH) @@ -5731,11 +5790,13 @@ static void M_DrawMusicTest(void) strlcpy(buf, songname, MAXLENGTH); V_DrawString(x, y, (t == st_sel ? V_YELLOWMAP : 0)|V_ALLOWLOWERCASE|V_MONOSPACE, buf); + if (curplaying == def) { V_DrawFill(20+280-9, y-4, 8, 16, 230); } } + t++; y += 16; } @@ -7604,7 +7665,11 @@ Update the maxplayers label... // draw name string if (itemOn != 9) - V_DrawString(x+8,y+12, V_ALLOWLOWERCASE, setupm_ip); + { + char buf[28]; + strlcpy(buf, setupm_ip, sizeof(buf)); + V_DrawString(x+8,y+12, V_ALLOWLOWERCASE, buf); + } else M_DrawTextInputScroll(x+8, y+12, &setupm_input_ip, 0, SETUPM_IP_MAXSIZE); @@ -7736,7 +7801,7 @@ static void M_SetupMultiHandler(INT32 choice) if (exitmenu) { if (currentMenu->prevMenu) - M_SetupNextMenu (currentMenu->prevMenu); + M_SetupNextMenu(currentMenu->prevMenu); else M_ClearMenus(true); } @@ -8987,15 +9052,15 @@ static boolean M_QuitMultiPlayerMenu(void) if (!fastcmp(setupm_name, setupm_cvname->string)) { // remove trailing whitespaces - for (l = strlen(setupm_name)-1; - (signed)l >= 0 && setupm_name[l] ==' '; l--) - setupm_name[l] =0; - COM_BufAddText(va("%s \"%s\"\n",setupm_cvname->name,setupm_name)); + l = strlen(setupm_name)-1; + for (;(signed)l >= 0 && setupm_name[l] ==' '; l--) + setupm_name[l] = 0; + COM_BufAddText(va("%s \"%s\"\n", setupm_cvname->name, setupm_name)); } // you know what? always putting these in the buffer won't hurt anything. - COM_BufAddText(va("%s \"%s\"\n",setupm_cvskin->name,skins[setupm_fakeskin].name)); - COM_BufAddText(va("%s %d\n",setupm_cvcolor->name,setupm_fakecolor)); + COM_BufAddText(va("%s \"%s\"\n", setupm_cvskin->name, skins[setupm_fakeskin].name)); + COM_BufAddText(va("%s %d\n", setupm_cvcolor->name, setupm_fakecolor)); return true; } @@ -10531,6 +10596,20 @@ static void M_QuitSRB2(INT32 choice) M_StartMessage(quitmsg[M_RandomKey(NUM_QUITMESSAGES)], M_QuitResponse, MM_YESNO); } +// =========== +// SATURN MENU +// =========== + +static void M_SaturnReportIssue(INT32 choice) +{ + (void)choice; + int url = I_OpenURL(SATURNISSUEPAGE); + + // SDL_OpenURL unsupported or failed + if (url == -1) + M_StartMessage(M_GetText("Failed to Open Web Page.\nPlease open the following page in your web browser:\n\n" SATURNISSUEPAGE "\n\n(Press a key)\n"), NULL, MM_NOTHING); +} + #ifdef HAVE_DISCORDRPC // ===================================================================== diff --git a/src/m_menu.h b/src/m_menu.h index b1070bdc5..c8fe7b4c2 100644 --- a/src/m_menu.h +++ b/src/m_menu.h @@ -26,7 +26,7 @@ extern "C" { #include "mserv.h" #include "r_things.h" // for SKINNAMESIZE -extern boolean forceshowhud; +extern boolean forceshowhud, forceshowchat; // // MENUS diff --git a/src/m_menudefs.c b/src/m_menudefs.c index 3189bbc1a..4a00f3020 100644 --- a/src/m_menudefs.c +++ b/src/m_menudefs.c @@ -36,6 +36,7 @@ static menu_t SP_TimeAttackDef, SP_ReplayDef, SP_GuestReplayDef, SP_GhostDef; menu_t OP_ControlsDef, OP_AllControlsDef; menu_t OP_MouseOptionsDef; menu_t OP_Joystick1Def, OP_Joystick2Def, OP_Joystick3Def, OP_Joystick4Def; +menu_t OP_Joystick1RumbleDef, OP_Joystick2RumbleDef, OP_Joystick3RumbleDef, OP_Joystick4RumbleDef; // Custom cvar menu menu_t OP_CustomCvarMenuDef; @@ -208,7 +209,7 @@ typedef enum static menuitem_t MPauseMenu[] = { {IT_STRING | IT_CALL, NULL, "Addons...", M_Addons, 8}, - {IT_STRING | IT_CALL, NULL, "Add local skins...", M_LocalSkins, 16}, + {IT_STRING | IT_CALL, NULL, "Local Add-ons...", M_LocalAddons, 8}, {IT_STRING | IT_SUBMENU, NULL, "Scramble Teams...", &MISC_ScrambleTeamDef, 24}, {IT_STRING | IT_CALL, NULL, "Switch Map..." , M_MapChange, 32}, @@ -238,7 +239,7 @@ static menuitem_t MPauseMenu[] = typedef enum { mpause_addons = 0, - mpause_addlocalskins, + mpause_localaddons, mpause_scramble, mpause_switchmap, #ifdef HAVE_DISCORDRPC @@ -446,25 +447,25 @@ enum static menuitem_t SP_ReplayMenu[] = { - {IT_WHITESTRING|IT_CALL, NULL, "Replay Best Time", M_ReplayTimeAttack, 90}, - {IT_WHITESTRING|IT_CALL, NULL, "Replay Best Lap", M_ReplayTimeAttack, 98}, + {IT_WHITESTRING|IT_CALL, NULL, "Replay Best Time", M_ReplayTimeAttack, 90}, + {IT_WHITESTRING|IT_CALL, NULL, "Replay Best Lap", M_ReplayTimeAttack, 98}, - {IT_WHITESTRING|IT_CALL, NULL, "Replay Last", M_ReplayTimeAttack, 106}, - {IT_WHITESTRING|IT_CALL, NULL, "Replay Guest", M_ReplayTimeAttack, 114}, - {IT_WHITESTRING|IT_KEYHANDLER, NULL, "Replay Staff",M_HandleStaffReplay,122}, + {IT_WHITESTRING|IT_CALL, NULL, "Replay Last", M_ReplayTimeAttack, 106}, + {IT_WHITESTRING|IT_CALL, NULL, "Replay Guest", M_ReplayTimeAttack, 114}, + {IT_WHITESTRING|IT_KEYHANDLER, NULL, "Replay Staff",M_HandleStaffReplay, 122}, - {IT_WHITESTRING|IT_SUBMENU, NULL, "Back", &SP_TimeAttackDef, 130} + {IT_WHITESTRING|IT_SUBMENU, NULL, "Back", &SP_TimeAttackDef, 130} }; static menuitem_t SP_GuestReplayMenu[] = { - {IT_WHITESTRING|IT_CALL, NULL, "Save Best Time as Guest", M_SetGuestReplay, 94}, - {IT_WHITESTRING|IT_CALL, NULL, "Save Best Lap as Guest", M_SetGuestReplay,102}, - {IT_WHITESTRING|IT_CALL, NULL, "Save Last as Guest", M_SetGuestReplay,110}, + {IT_WHITESTRING|IT_CALL, NULL, "Save Best Time as Guest", M_SetGuestReplay, 94}, + {IT_WHITESTRING|IT_CALL, NULL, "Save Best Lap as Guest", M_SetGuestReplay, 102}, + {IT_WHITESTRING|IT_CALL, NULL, "Save Last as Guest", M_SetGuestReplay, 110}, - {IT_WHITESTRING|IT_CALL, NULL, "Delete Guest Replay", M_SetGuestReplay,120}, + {IT_WHITESTRING|IT_CALL, NULL, "Delete Guest Replay", M_SetGuestReplay, 120}, - {IT_WHITESTRING|IT_SUBMENU, NULL, "Back", &SP_TimeAttackDef, 130} + {IT_WHITESTRING|IT_SUBMENU, NULL, "Back", &SP_TimeAttackDef, 130} }; static menuitem_t SP_GhostMenu[] = @@ -555,10 +556,10 @@ static menuitem_t MP_PlayerSetupMenu[] = static menuitem_t MP_ConnectMenu[] = { - {IT_STRING | IT_CVAR, NULL, "Sort By", &cv_serversort, 0}, - {IT_STRING | IT_KEYHANDLER, NULL, "Page", M_HandleServerPage, 8}, - {IT_STRING | IT_CALL, NULL, "Refresh", M_Refresh, 16}, - {IT_STRING | IT_KEYHANDLER, NULL, "", M_HandleServerSearch,25}, + {IT_STRING | IT_CVAR, NULL, "Sort By", &cv_serversort, 0}, + {IT_STRING | IT_KEYHANDLER, NULL, "Page", M_HandleServerPage, 8}, + {IT_STRING | IT_CALL, NULL, "Refresh", M_Refresh, 16}, + {IT_STRING | IT_KEYHANDLER, NULL, "", M_HandleServerSearch, 25}, {IT_STRING | IT_SPACE, NULL, "", M_Connect, 48}, {IT_STRING | IT_SPACE, NULL, "", M_Connect, 60}, @@ -725,29 +726,36 @@ static const char* OP_AllControlsTooltips[sizeof(OP_AllControlsMenu)/sizeof(OP_A // The rest is null, for now }; -#define OP_JOYMENU(pnum) \ - {IT_HEADER, NULL, "Gameplay Controls", NULL, 7}, \ - {IT_STRING | IT_CVAR, NULL, "Aim Forward/Back" , &cv_aimaxis[pnum] , 15}, \ - {IT_STRING | IT_CVAR, NULL, "Turn Left/Right" , &cv_turnaxis[pnum] , 20}, \ - {IT_STRING | IT_CVAR, NULL, "Accelerate" , &cv_moveaxis[pnum] , 25}, \ - {IT_STRING | IT_CVAR, NULL, "Brake" , &cv_brakeaxis[pnum] , 30}, \ - {IT_STRING | IT_CVAR, NULL, "Drift" , &cv_driftaxis[pnum] , 35}, \ - {IT_STRING | IT_CVAR, NULL, "Use Item" , &cv_fireaxis[pnum] , 40}, \ - {IT_STRING | IT_CVAR, NULL, "Look Backward" , &cv_lookbackaxis[pnum] , 45}, \ - {IT_STRING | IT_CVAR, NULL, "Custom Button 1" , &cv_custom1axis[pnum] , 50}, \ - {IT_STRING | IT_CVAR, NULL, "Custom Button 2" , &cv_custom2axis[pnum] , 55}, \ - {IT_STRING | IT_CVAR, NULL, "Custom Button 3" , &cv_custom3axis[pnum] , 60}, \ - {IT_HEADER, NULL, "Camera Controls", NULL, 67}, \ - {IT_STRING | IT_CVAR, NULL, "Look Up/Down" , &cv_lookaxis[pnum] , 75}, \ - {IT_STRING | IT_CVAR, NULL, "Turn Left/Right" , &cv_camturnaxis[pnum] , 80}, \ - {IT_STRING | IT_CVAR, NULL, "Strafe Left/Right" , &cv_camstrafeaxis[pnum] , 85}, \ - {IT_HEADER, NULL, "Deadzones", NULL, 92}, \ - {IT_STRING | IT_CVAR, NULL, "X deadzone" , &cv_xdeadzone[pnum] , 100}, \ - {IT_STRING | IT_CVAR, NULL, "Y deadzone" , &cv_ydeadzone[pnum] , 105}, \ - {IT_HEADER, NULL, "Miscellaneous", NULL, 112}, \ - {IT_STRING | IT_CVAR, NULL, "Controller Rumble" , &cv_rumble[pnum] , 120}, \ - {IT_STRING | IT_CVAR, NULL, "Controller Rumble Strength" , &cv_rumblestrength[pnum] , 125}, \ - {IT_STRING | IT_CVAR, NULL, "Set LED to Player color" , &cv_gamepadled[pnum] , 130}, +// i really do not feel like messing with setup routines +// and macro preprocessor cannot eval maths for string shit like this :chaosleep: +#define RUMBDEF_0 OP_Joystick1RumbleDef +#define RUMBDEF_1 OP_Joystick2RumbleDef +#define RUMBDEF_2 OP_Joystick3RumbleDef +#define RUMBDEF_3 OP_Joystick4RumbleDef +#define RUMBDEF(x) RUMBDEF_##x + +#define OP_JOYMENU(pnum) \ + {IT_HEADER, NULL, "Gameplay Controls", NULL, 7}, \ + {IT_STRING | IT_CVAR, NULL, "Aim Forward/Back" , &cv_aimaxis[pnum] , 15}, \ + {IT_STRING | IT_CVAR, NULL, "Turn Left/Right" , &cv_turnaxis[pnum] , 20}, \ + {IT_STRING | IT_CVAR, NULL, "Accelerate" , &cv_moveaxis[pnum] , 25}, \ + {IT_STRING | IT_CVAR, NULL, "Brake" , &cv_brakeaxis[pnum] , 30}, \ + {IT_STRING | IT_CVAR, NULL, "Drift" , &cv_driftaxis[pnum] , 35}, \ + {IT_STRING | IT_CVAR, NULL, "Use Item" , &cv_fireaxis[pnum] , 40}, \ + {IT_STRING | IT_CVAR, NULL, "Look Backward" , &cv_lookbackaxis[pnum] , 45}, \ + {IT_STRING | IT_CVAR, NULL, "Custom Button 1" , &cv_custom1axis[pnum] , 50}, \ + {IT_STRING | IT_CVAR, NULL, "Custom Button 2" , &cv_custom2axis[pnum] , 55}, \ + {IT_STRING | IT_CVAR, NULL, "Custom Button 3" , &cv_custom3axis[pnum] , 60}, \ + {IT_HEADER, NULL, "Camera Controls", NULL, 67}, \ + {IT_STRING | IT_CVAR, NULL, "Look Up/Down" , &cv_lookaxis[pnum] , 75}, \ + {IT_STRING | IT_CVAR, NULL, "Turn Left/Right" , &cv_camturnaxis[pnum] , 80}, \ + {IT_STRING | IT_CVAR, NULL, "Strafe Left/Right" , &cv_camstrafeaxis[pnum] , 85}, \ + {IT_HEADER, NULL, "Deadzones", NULL, 92}, \ + {IT_STRING | IT_CVAR, NULL, "X deadzone" , &cv_xdeadzone[pnum] , 100}, \ + {IT_STRING | IT_CVAR, NULL, "Y deadzone" , &cv_ydeadzone[pnum] , 105}, \ + {IT_HEADER, NULL, "Miscellaneous", NULL, 112}, \ + {IT_SUBMENU|IT_STRING, NULL, "Rumble Options..." , &RUMBDEF(pnum) , 120}, \ + {IT_STRING | IT_CVAR, NULL, "Set LED to Player color" , &cv_gamepadled[pnum] , 125}, static menuitem_t OP_Joystick1Menu[] = { @@ -773,6 +781,46 @@ static menuitem_t OP_Joystick4Menu[] = OP_JOYMENU(3) }; +#undef RUMBDEF +#undef RUMBDEF_0 +#undef RUMBDEF_1 +#undef RUMBDEF_2 +#undef RUMBDEF_3 + +// FIXME: stair jank rumble should be greyed out if its disabled, but menus suck butt! +#define OP_JOYRUMBLEMENU(pnum) \ + {IT_HEADER, NULL, "Global", NULL, 7}, \ + {IT_STRING | IT_CVAR, NULL, "Controller Rumble" , &cv_rumble[pnum] , 15}, \ + {IT_STRING | IT_CVAR, NULL, "Controller Rumble Strength" , &cv_rumble_strength[pnum] , 20}, \ + {IT_HEADER, NULL, "Rumble Types", NULL, 27}, \ + {IT_STRING | IT_CVAR, NULL, "Spinout" , &cv_rumble_spinout[pnum] , 35}, \ + {IT_STRING | IT_CVAR, NULL, "Sneaker Boost" , &cv_rumble_sneakerboost[pnum] , 40}, \ + {IT_STRING | IT_CVAR, NULL, "Offroad" , &cv_rumble_offroad[pnum] , 45}, \ + {IT_STRING | IT_CVAR, NULL, "Banana Dragging" , &cv_rumble_bananadrag[pnum] , 50}, \ + {IT_STRING | IT_CVAR, NULL, "Stair Jank" , &cv_rumble_stairjank[pnum] , 55}, \ + {IT_STRING | IT_CVAR, NULL, "Brake Drift" , &cv_rumble_brakedrift[pnum] , 60}, \ + {IT_STRING | IT_CVAR, NULL, "Drift Charge" , &cv_rumble_driftcharge[pnum] , 65}, \ + +static menuitem_t OP_Joystick1RumbleMenu[] = +{ + OP_JOYRUMBLEMENU(0) +}; + +static menuitem_t OP_Joystick2RumbleMenu[] = +{ + OP_JOYRUMBLEMENU(1) +}; + +static menuitem_t OP_Joystick3RumbleMenu[] = +{ + OP_JOYRUMBLEMENU(2) +}; + +static menuitem_t OP_Joystick4RumbleMenu[] = +{ + OP_JOYRUMBLEMENU(3) +}; + static menuitem_t OP_JoystickSetMenu[] = { {IT_CALL | IT_NOTHING, "None", NULL, M_AssignJoystick, LINEHEIGHT+5}, @@ -789,10 +837,9 @@ static menuitem_t OP_JoystickSetMenu[] = static menuitem_t OP_MouseOptionsMenu[] = { {IT_STRING | IT_CVAR, NULL, "Use Mouse", &cv_usemouse, 10}, - {IT_STRING | IT_CVAR, NULL, "Mouse Turning", &cv_mouseturn, 20}, {IT_STRING | IT_CVAR, NULL, "Invert Mouse", &cv_invertmouse, 30}, - {IT_STRING | IT_CVAR | IT_CV_SLIDER, NULL, "Mouse X Speed", &cv_mousexsens, 40}, + {IT_STRING | IT_CVAR | IT_CV_SLIDER, NULL, "Mouse X Speed", &cv_mousexsens, 40}, {IT_STRING | IT_CVAR | IT_CV_SLIDER, NULL, "Mouse Y Speed", &cv_mouseysens, 50}, }; @@ -861,7 +908,6 @@ static const char* OP_VideoTooltips[] = "Advanced graphical options.", }; - enum { op_video_res = 0, @@ -945,24 +991,25 @@ static menuitem_t OP_ExpOptionsMenu[] = //{IT_STRING | IT_CVAR, NULL, "Randomized Directional Light", &cv_randomdirlight, 45}, // should this ever come back {IT_STRING | IT_CVAR, NULL, "Skyboxes", &cv_skybox, 40}, + {IT_STRING | IT_CVAR, NULL, "Skydome", &cv_skydome, 45}, - {IT_STRING | IT_CVAR, NULL, "Precache Level Textures", &cv_precachetextures, 50}, + {IT_STRING | IT_CVAR, NULL, "Precache Level Textures", &cv_precachetextures, 55}, - {IT_STRING | IT_CVAR, NULL, "FPS counter sampling", &cv_accuratefps, 60}, + {IT_STRING | IT_CVAR, NULL, "FPS counter sampling", &cv_accuratefps, 65}, - {IT_STRING | IT_CVAR, NULL, "Frameskip", &cv_frameskip, 70}, + {IT_STRING | IT_CVAR, NULL, "Frameskip", &cv_frameskip, 75}, - {IT_STRING | IT_CVAR, NULL, "Votescreen Scaling", &cv_votebgscaling, 80}, + {IT_STRING | IT_CVAR, NULL, "Votescreen Scaling", &cv_votebgscaling, 85}, #ifdef HWRENDER - {IT_STRING | IT_CVAR, NULL, "Screen Textures", &cv_glscreentextures, 90}, + {IT_STRING | IT_CVAR, NULL, "Screen Textures", &cv_glscreentextures, 95}, #ifdef USE_FBO_OGL - {IT_STRING | IT_CVAR, NULL, "FBO Downsampling support", &cv_glframebuffer, 95}, - {IT_STRING | IT_CVAR, NULL, "Palette Depth", &cv_glpalettedepth, 105}, - {IT_DISABLED, NULL, "", NULL, 115}, // dummy text + {IT_STRING | IT_CVAR, NULL, "FBO Downsampling support", &cv_glframebuffer, 100}, + {IT_STRING | IT_CVAR, NULL, "Palette Depth", &cv_glpalettedepth, 110}, + {IT_DISABLED, NULL, "", NULL, 120}, // dummy text #else - {IT_STRING | IT_CVAR, NULL, "Palette Depth", &cv_glpalettedepth, 100}, - {IT_DISABLED, NULL, "", NULL, 110}, // dummy text + {IT_STRING | IT_CVAR, NULL, "Palette Depth", &cv_glpalettedepth, 110}, + {IT_DISABLED, NULL, "", NULL, 120}, // dummy text #endif #endif }; @@ -975,12 +1022,13 @@ static const char* OP_ExpTooltips[] = "Sets minimum sector brightness, useful for dark areas.", //"Should the directional lightning be randomized each map?\nTakes effect on next map load.", "Toggle being able to see the sky.", + "Toggle skydome.", // idk man someone give a better description of this "Preload all level textures on level load.\nMassively reduces texture related stuttering during gameplay\nat the cost of longer level loading times.\nDisable this if you experience timeouts during level switches.", "Change the FPS counter sampling method\nInaccurate updates slower\nand might miss sudden framerate changes and drops,\nproviding a more averaged result.\nAccurate updates faster, but might be less readable.", // how to ingles?? "Skips rendering frames if game logic takes too long\npreventing gameplay issues during performance drops.", // idk im shit as describing things "Different methods of scaling the votescreen backgrounds.", #ifdef HWRENDER - "Disabling Screen Textures may result in a performance boost\nbut will break certain effects.\nScreen textures are required at resolutions lower than your desktop resolution!" + "Disabling Screen Textures may result in a performance boost\nbut will break certain effects.\nScreen textures are required at resolutions lower than your desktop resolution!", #ifdef USE_FBO_OGL "Allows the game to downsample from a higher resolution\nthan your display in OpenGL renderer mode.\nRequires a GPU with atleast OpenGL 2.1 support.", #endif @@ -996,6 +1044,7 @@ enum op_exp_secbright, //op_exp_dirlight, op_exp_skybox, + op_exp_skydome, op_exp_texcache, op_exp_accuratefps, op_exp_frameskip, @@ -1009,7 +1058,6 @@ enum #endif }; - #ifdef HWRENDER static menuitem_t OP_OpenGLOptionsMenu[] = { @@ -1066,7 +1114,6 @@ enum op_gl_shearing, op_gl_renderdist, }; - #endif static menuitem_t OP_SoundOptionsMenu[] = @@ -1077,8 +1124,7 @@ static menuitem_t OP_SoundOptionsMenu[] = {IT_STRING|IT_CVAR|IT_CV_NOPRINT, NULL, "Music", &cv_gamedigimusic, 30}, {IT_STRING|IT_CVAR|IT_CV_SLIDER, NULL, "Music Volume", &cv_digmusicvolume, 38}, -//#ifndef NO_MIDI -#if 0 +#if 0 //#ifndef NO_MIDI {IT_STRING|IT_CVAR|IT_CV_SLIDER, NULL, "MIDI Volume", &cv_midimusicvolume, 46}, {IT_STRING|IT_CVAR, NULL, "Reverse L/R Channels", &stereoreverse, 60}, @@ -1113,8 +1159,7 @@ static const char* OP_SoundTooltips[] = "Volume of Sound effects.", "Turn Music on or off.", "Volume of Music.", -//#ifndef NO_MIDI -#if 0 +#if 0 //#ifndef NO_MIDI "Volume of Midi Music.", #endif "Reverse left and right channels of audio.", @@ -1174,7 +1219,7 @@ static const char* OP_SoundAdvancedTooltips[] = "Should the Grow music be on or off?", "Should the Invulnerability music be on or off?", "Should music be kept when restarting the map?", - "Should the Intro fanfare be skipped\nand map music be played on map start?", + "Should the Intro fanfare be skipped\nand map music be played on map start?\nNote that this WILL skip sounds played by the map before round start as well!", "Controls Sound effects caching.\nKeep will retain previously played sound effects in cache." // man idk how to describe this in a non awful way lmao "\nOn will preload all sound effects.\nEliminates sound-related lag and stutters but increases memory usage.", "Size of the Audio Buffer\nreducing it will result in less sound latency\nbut may cause issues such as crackling or distorted Sound.", @@ -1408,44 +1453,70 @@ static const char* OP_PlayerCamOptionsTooltips[] = static menuitem_t OP_ChatOptionsMenu[] = { // will ANYONE who doesn't know how to use the console want to touch this one? - {IT_STRING | IT_CVAR, NULL, "Chat Mode", &cv_consolechat, 5}, // nonetheless... + {IT_STRING | IT_CVAR, NULL, "Chat Mode", &cv_consolechat, 5}, // nonetheless... {IT_STRING | IT_CVAR | IT_CV_SLIDER, - NULL, "Chat Box Width", &cv_chatwidth, 20}, + NULL, "Chat Box Width", &cv_chatwidth, 10}, {IT_STRING | IT_CVAR | IT_CV_SLIDER, - NULL, "Chat Box Height", &cv_chatheight, 30}, - {IT_STRING | IT_CVAR, NULL, "Center Text in Chat", &cv_chatcentertext, 40}, + NULL, "Chat Box Height", &cv_chatheight, 15}, + {IT_STRING | IT_CVAR, NULL, "Chat Horizontal Offset", &cv_chat_xoffset, 20}, + {IT_STRING | IT_CVAR, NULL, "Chat Vertical Offset", &cv_chat_yoffset, 25}, - {IT_STRING | IT_CVAR, NULL, "Chat Background Tint", &cv_chatbacktint, 55}, - {IT_STRING | IT_CVAR, NULL, "Message Fadeout Time", &cv_chattime, 65}, - {IT_STRING | IT_CVAR, NULL, "Spam Protection", &cv_chatspamprotection, 75}, - {IT_STRING | IT_CVAR, NULL, "Max Chat Messages", &cv_chatlogsize, 85}, + {IT_STRING | IT_CVAR, NULL, "Center Text in Chat", &cv_chatcentertext, 35}, + {IT_STRING | IT_CVAR, NULL, "Chat Background Tint", &cv_chatbacktint, 40}, + {IT_STRING | IT_CVAR, NULL, "Message Fadeout Time", &cv_chattime, 45}, + {IT_STRING | IT_CVAR, NULL, "Spam Protection", &cv_chatspamprotection, 50}, + {IT_STRING | IT_CVAR, NULL, "Max Chat Messages", &cv_chatlogsize, 55}, + {IT_STRING | IT_CVAR, NULL, "Display Character Limit", &cv_chat_showlimit, 60}, - {IT_STRING | IT_CVAR, NULL, "Local ping display", &cv_showping, 105}, // shows ping above the framerate if we want to. - {IT_STRING | IT_CVAR, NULL, "Ping display style", &cv_pingstyle, 115}, - {IT_STRING | IT_CVAR, NULL, "Ping measurement", &cv_pingmeasurement, 125}, - {IT_STRING | IT_CVAR, NULL, "Ping icon", &cv_pingicon, 135}, + {IT_STRING | IT_CVAR, NULL, "Local ping display", &cv_showping, 70}, // shows ping above the framerate if we want to. + {IT_STRING | IT_CVAR, NULL, "Ping display style", &cv_pingstyle, 75}, + {IT_STRING | IT_CVAR, NULL, "Ping measurement", &cv_pingmeasurement, 80}, + {IT_STRING | IT_CVAR, NULL, "Ping icon", &cv_pingicon, 85}, - {IT_STRING | IT_CVAR, NULL, "Show IP address in playerlist", &cv_shownodeip, 145}, + {IT_STRING | IT_CVAR, NULL, "Show IP address in playerlist", &cv_shownodeip, 90}, }; static const char* OP_ChatOptionsTooltips[] = { "Chat mode used for in-game chat.", - "Width of chat box.", - "Height of chat box.", + "Width of the chat box.", + "Height of the chat box.", + "Horizontal Offset of the chat box.", + "Vertical Offset of the chat box.", "Center text in the chat message pop ups.", - "Chatbox background.", + "Background for the chat message pop ups.", "Fadeout time for new chat message.", "Spam protection for in-game chat.", "Maxiumum amount of chat messages to look back at.", + "Show how many characters you have left to type in the chat.", "Show player ping.", - "Choose the looks of the ping display.", // this is ass idk english lmao + "Choose the style of the ping display.", "Measurement used for ping.", "Visibility of ping icon.", "Should Player IP addresses be printed when using\nthe nodes or listplayers command?", }; +enum +{ + op_chat_mode, + op_chat_boxwidth, + op_chat_boxheight, + op_chat_yoffs, + op_chat_xoffs, + op_chat_centertxt, + op_chat_bgtint, + op_chat_fadetime, + op_chat_spamprotect, + op_chat_maxmsg, + op_chat_charlmt, + op_chat_showping, + op_chat_pingstyle, + op_chat_pingmeasr, + op_chat_pingico, + op_chat_nodeip, +}; + static menuitem_t OP_GameOptionsMenu[] = { {IT_STRING | IT_SUBMENU, NULL, "Random Item Toggles...", &OP_MonitorToggleDef, 10}, @@ -1631,7 +1702,7 @@ static menuitem_t OP_AccessibilityMenu[] = {IT_SUBMENU|IT_STRING, NULL, "Video Color Settings...", &OP_ColorOptionsDef, 30}, {IT_STRING|IT_CVAR, NULL, "Reduce Effects", &cv_reducevfx, 35}, - {IT_STRING|IT_CVAR, NULL, "Midnight Channel Flicker", &cv_lessflicker, 40}, // obsolete now? or still better be a seperate toggle? + {IT_STRING|IT_CVAR, NULL, "Less Midnight Channel Flicker", &cv_lessflicker, 40}, // obsolete now? or still better be a seperate toggle? {IT_STRING|IT_CVAR, NULL, "Minimum Sector Brightness", &cv_secbright, 45}, @@ -1713,6 +1784,7 @@ static menuitem_t OP_SaturnMenu[] = {IT_SUBMENU|IT_STRING, NULL, "Saturn Hud...", &OP_SaturnHudDef, 140}, {IT_SUBMENU|IT_STRING, NULL, "Sprite Distortion...", &OP_PlayerDistortDef, 145}, {IT_SUBMENU|IT_STRING, NULL, "Saturn Credits", &OP_SaturnCreditsDef, 150}, // uwu + {IT_STRING|IT_CALL, NULL, "Report an Issue", M_SaturnReportIssue, 155} }; static const char* OP_SaturnTooltips[] = @@ -1736,6 +1808,7 @@ static const char* OP_SaturnTooltips[] = "Options for Saturn specific HUD things.", "Options for sprite distortion effects.", "See the people who helped make this project possible!", + "Noticed a bug, have a Suggestion or other Feedback?\nFeel free to tell us!", }; enum @@ -1757,6 +1830,7 @@ enum sm_hud, sm_distortionmenu, sm_credits, + sm_issue, }; static menuitem_t OP_PlayerDistortMenu[] = @@ -1767,20 +1841,23 @@ static menuitem_t OP_PlayerDistortMenu[] = {IT_STRING | IT_CVAR, NULL, "Slope Rotation Distance", &cv_sloperolldist, 15}, {IT_STRING | IT_CVAR, NULL, "Rotate Players when Sliptiding", &cv_sliptideroll, 25}, - {IT_STRING | IT_CVAR, NULL, "Rotate Sparks and Boost Trails", &cv_sparkroll, 30}, - {IT_STRING | IT_CVAR, NULL, "Rotate Bananas on Throw", &cv_bananthrowroll, 35}, + {IT_STRING | IT_CVAR, NULL, "Stair Janking Effect", &cv_stairjank, 30}, + {IT_STRING | IT_CVAR, NULL, "Stair Janking Sound Effect", &cv_stairjanksfx, 35}, // idk if that should be here but i dont care atm - {IT_STRING | IT_CVAR | IT_CV_SLIDER, NULL, "Player Stretch Factor", &cv_gravstretch, 45}, - {IT_STRING | IT_CVAR, NULL, "Squish Sound Effect", &cv_slamsound, 50}, + {IT_STRING | IT_CVAR, NULL, "Rotate Sparks and Boost Trails", &cv_sparkroll, 40}, + {IT_STRING | IT_CVAR, NULL, "Rotate Bananas on Throw", &cv_bananthrowroll, 45}, - {IT_STRING | IT_CVAR, NULL, "Saltyhop", &cv_saltyhop, 60}, - {IT_STRING | IT_CVAR | IT_CV_SLIDER, NULL, "Saltyhop Height", &cv_saltyheight, 65}, - {IT_STRING | IT_CVAR, NULL, "Saltyhop Sound Effect", &cv_saltyhopsfx, 70}, - {IT_STRING | IT_CVAR, NULL, "Saltyhop Squish", &cv_saltysquish, 75}, - {IT_STRING | IT_CVAR, NULL, "Saltyhop Roll", &cv_saltyroll, 80}, + {IT_STRING | IT_CVAR | IT_CV_SLIDER, NULL, "Player Stretch Factor", &cv_gravstretch, 55}, + {IT_STRING | IT_CVAR, NULL, "Squish Sound Effect", &cv_slamsound, 60}, - {IT_STRING | IT_CVAR, NULL, "Squishdance", &cv_squishdance, 90}, - {IT_STRING | IT_CVAR, NULL, "Squishdance Speed", &cv_squishdancespeed, 96}, + {IT_STRING | IT_CVAR, NULL, "Saltyhop", &cv_saltyhop, 70}, + {IT_STRING | IT_CVAR | IT_CV_SLIDER, NULL, "Saltyhop Height", &cv_saltyheight, 75}, + {IT_STRING | IT_CVAR, NULL, "Saltyhop Sound Effect", &cv_saltyhopsfx, 80}, + {IT_STRING | IT_CVAR, NULL, "Saltyhop Squish", &cv_saltysquish, 85}, + {IT_STRING | IT_CVAR, NULL, "Saltyhop Roll", &cv_saltyroll, 90}, + + {IT_STRING | IT_CVAR, NULL, "Squishdance", &cv_squishdance, 100}, + {IT_STRING | IT_CVAR, NULL, "Squishdance Speed", &cv_squishdancespeed, 106}, // why is this offset by 6? idk cant remember lulul }; static const char* OP_PlayerDistortTooltips[] = @@ -1789,6 +1866,8 @@ static const char* OP_PlayerDistortTooltips[] = "Sprite rotation on slopes. Can either be just players or all objects.", "Distance object rotation should be visable.", "Player rotation when sliptiding.", + "Slightly tilt the player when driving over stairs or small bumps.", + "Sound effect when driving over stairs or small bumps.", "Rotation of a player's boost trails and drift sparks.", "Should banans rotate when thrown?\nAnd should they stay rotated when on the ground?", "Player squash and stretch.", @@ -1799,7 +1878,7 @@ static const char* OP_PlayerDistortTooltips[] = "Player hop squash and stretch.", "Should the player rotation be kept during player hop.", "Do a funny squishy dance when holding CUSTOM 3.", - "Speed of the Squishy dance in BPM.", + "Speed of the Squishy dance in SPM (Squishes Per Minute).", }; enum @@ -1808,6 +1887,8 @@ enum sloperotate, slrotatedist, sliptide, + stairjank, + stairjanksfx, sparkrotate, bananrotat, stretchyplayer, @@ -1848,26 +1929,28 @@ static menuitem_t OP_SaturnHudMenu[] = {IT_STRING|IT_CVAR, NULL, "Item Amount Number", &cv_huditemamount, 110}, {IT_STRING|IT_CVAR, NULL, "Animated Roulette", &cv_fancyroulette, 115}, - {IT_STRING|IT_CVAR, NULL, "Show Lap Emblem", &cv_showlapemblem, 125}, - {IT_STRING|IT_CVAR, NULL, "Show Cecho Messages", &cv_cechotoggle, 130}, + {IT_STRING|IT_CVAR, NULL, "Item Roulette Color", &cv_roulettecolor, 120}, - {IT_STRING|IT_CVAR, NULL, "Show Names on Minimap", &cv_showminimapnames, 140}, - {IT_STRING|IT_CVAR, NULL, "Show Finished on Minimap", &cv_showminimapfinished, 145}, - {IT_STRING|IT_CVAR, NULL, "Small Minimap Players", &cv_minihead, 150}, - {IT_STRING|IT_CVAR, NULL, "Spin Minimap Icons", &cv_spinoutroll, 155}, - {IT_STRING|IT_CVAR, NULL, "Player Angle Visual", &cv_showminimapangle, 160}, + {IT_STRING|IT_CVAR, NULL, "Show Lap Emblem", &cv_showlapemblem, 130}, + {IT_STRING|IT_CVAR, NULL, "Show Cecho Messages", &cv_cechotoggle, 135}, - {IT_STRING|IT_CVAR, NULL, "Music Credits", &cv_songcredits, 170}, - {IT_STRING|IT_CVAR, NULL, "Music Credits on Pause", &cv_pausesongcredits, 175}, + {IT_STRING|IT_CVAR, NULL, "Show Names on Minimap", &cv_showminimapnames, 145}, + {IT_STRING|IT_CVAR, NULL, "Show Finished on Minimap", &cv_showminimapfinished, 150}, + {IT_STRING|IT_CVAR, NULL, "Small Minimap Players", &cv_minihead, 155}, + {IT_STRING|IT_CVAR, NULL, "Spin Minimap Icons", &cv_spinoutroll, 160}, + {IT_STRING|IT_CVAR, NULL, "Player Angle Visual", &cv_showminimapangle, 165}, - {IT_STRING|IT_CVAR, NULL, "Beta Intermissionscreen", &cv_betainterscreen, 185}, + {IT_STRING|IT_CVAR, NULL, "Music Credits", &cv_songcredits, 175}, + {IT_STRING|IT_CVAR, NULL, "Music Credits on Pause", &cv_pausesongcredits, 180}, - {IT_STRING|IT_CVAR, NULL, "Show Director Prompt", &cv_showdirectorhud, 195}, + {IT_STRING|IT_CVAR, NULL, "Beta Intermissionscreen", &cv_betainterscreen, 190}, - {IT_STRING|IT_SUBMENU, NULL, "Nametags...", &OP_NametagDef, 205}, - {IT_STRING|IT_SUBMENU, NULL, "Driftgauge...", &OP_DriftGaugeDef, 210}, + {IT_STRING|IT_CVAR, NULL, "Show Director Prompt", &cv_showdirectorhud, 200}, - {IT_SUBMENU|IT_STRING, NULL, "Hud Offsets...", &OP_HudOffsetDef, 220}, + {IT_STRING|IT_SUBMENU, NULL, "Nametags...", &OP_NametagDef, 210}, + {IT_STRING|IT_SUBMENU, NULL, "Driftgauge...", &OP_DriftGaugeDef, 215}, + + {IT_SUBMENU|IT_STRING, NULL, "Hud Offsets...", &OP_HudOffsetDef, 225}, }; static const char* OP_SaturnHudTooltips[] = @@ -1888,6 +1971,7 @@ static const char* OP_SaturnHudTooltips[] = "Use extra graphics for multiple sneakers, bananas and jawz.", "Change when the item amount is to be displayed.\nMultiple will always display the number.\nWhen you have multiple of the same Item.\nAlways will always display the number regardless of Item amount.", "Enables an animation while the roulette is active.", + "Changes the way items are colorized in roulette.", "Show the big 'LAP' text on a lap change.", "Show the big Cecho Messages.", "Show player names on the minimap.", @@ -2497,6 +2581,11 @@ menu_t OP_Joystick2Def = DEFAULTSCROLLSTYLE("M_CONTRO", OP_Joystick2Menu, &OP menu_t OP_Joystick3Def = DEFAULTSCROLLSTYLE("M_CONTRO", OP_Joystick3Menu, &OP_AllControlsDef, 30, 36, NULL); menu_t OP_Joystick4Def = DEFAULTSCROLLSTYLE("M_CONTRO", OP_Joystick4Menu, &OP_AllControlsDef, 30, 36, NULL); +menu_t OP_Joystick1RumbleDef = DEFAULTSCROLLSTYLE("M_CONTRO", OP_Joystick1RumbleMenu, &OP_Joystick1Def, 30, 36, NULL); +menu_t OP_Joystick2RumbleDef = DEFAULTSCROLLSTYLE("M_CONTRO", OP_Joystick2RumbleMenu, &OP_Joystick2Def, 30, 36, NULL); +menu_t OP_Joystick3RumbleDef = DEFAULTSCROLLSTYLE("M_CONTRO", OP_Joystick3RumbleMenu, &OP_Joystick3Def, 30, 36, NULL); +menu_t OP_Joystick4RumbleDef = DEFAULTSCROLLSTYLE("M_CONTRO", OP_Joystick4RumbleMenu, &OP_Joystick4Def, 30, 36, NULL); + menu_t OP_JoystickSetDef = { "M_CONTRO", @@ -2588,7 +2677,7 @@ menu_t OP_Player2CamOptionsDef = DEFAULTMENUSTYLE(NULL, OP_Player2CamOptionsMenu menu_t OP_Player3CamOptionsDef = DEFAULTMENUSTYLE(NULL, OP_Player3CamOptionsMenu, &OP_CamOptionsDef, 30, 30, OP_PlayerCamOptionsTooltips); menu_t OP_Player4CamOptionsDef = DEFAULTMENUSTYLE(NULL, OP_Player4CamOptionsMenu, &OP_CamOptionsDef, 30, 30, OP_PlayerCamOptionsTooltips); -menu_t OP_ChatOptionsDef = DEFAULTMENUSTYLE("M_HUD", OP_ChatOptionsMenu, &OP_HUDOptionsDef, 30, 30, OP_ChatOptionsTooltips); +menu_t OP_ChatOptionsDef = DEFAULTSCROLLSTYLE("M_HUD", OP_ChatOptionsMenu, &OP_HUDOptionsDef, 30, 25, OP_ChatOptionsTooltips); menu_t OP_SoundAdvancedDef = DEFAULTSCROLLSTYLE("M_SOUND", OP_SoundAdvancedMenu, &OP_SoundOptionsDef, 30, 30, OP_SoundAdvancedTooltips); @@ -2713,6 +2802,15 @@ void PDistort_menu_Onchange(void) OP_PlayerDistortMenu[slrotatedist].status = IT_GRAYEDOUT; OP_PlayerDistortMenu[saltroll].status = IT_GRAYEDOUT; } + + if (cv_stairjank.value) + { + OP_PlayerDistortMenu[stairjanksfx].status = IT_STRING | IT_CVAR; + } + else + { + OP_PlayerDistortMenu[stairjanksfx].status = IT_GRAYEDOUT; + } } void Bird_menu_Onchange(void) diff --git a/src/m_misc.c b/src/m_misc.c index 493e66487..7fba30790 100644 --- a/src/m_misc.c +++ b/src/m_misc.c @@ -1261,7 +1261,7 @@ void M_ScrollString(const char name[], size_t len, char result[], size_t maxlen, const size_t amount = len - maxlen + 1; // Note: anything above 17 will cause zero division - const size_t MAXSPEED = 6; + static const size_t MAXSPEED = 6; const tic_t t = timer / (35/min(amount, MAXSPEED)); const size_t state = (t / amount) % 4; @@ -1296,7 +1296,7 @@ void M_ScrollString(const char name[], size_t len, char result[], size_t maxlen, } // Technically not necessary, since it gets set again after function call, but just in case - result[maxlen] = 0; + result[maxlen-1] = '\0'; } void M_MinimapGenerate(void) diff --git a/src/m_perfstats.c b/src/m_perfstats.c index 49a855686..ccc351094 100644 --- a/src/m_perfstats.c +++ b/src/m_perfstats.c @@ -47,6 +47,7 @@ struct perfstatrow { static ps_metric_t ps_frametime = {0}; ps_metric_t ps_tictime = {0}; +ps_metric_t ps_prevtictime = {0}; ps_metric_t ps_playerthink_time = {0}; ps_metric_t ps_thinkertime = {0}; @@ -168,14 +169,14 @@ perfstatrow_t gamelogic_rows[] = { }; perfstatrow_t thinkercount_rows[] = { - {"thnkers", "Thinkers: ", &ps_thinkercount, PS_LEVEL}, - {" mobjs ", " Mobjs: ", &ps_mobjcount, PS_LEVEL}, + {"thnkers" , "Thinkers: ", &ps_thinkercount, PS_LEVEL}, + {" mobjs " , " Mobjs: ", &ps_mobjcount, PS_LEVEL}, {" regular", " Regular: ", &ps_regularcount, PS_LEVEL}, {" scenery", " Scenery: ", &ps_scenerycount, PS_LEVEL}, {" nothink", " Nothink: ", &ps_nothinkcount, PS_HIDE_ZERO|PS_LEVEL}, - {" precip ", " Precipitation: ", &ps_precipcount, PS_LEVEL}, - {" other ", " Other: ", &ps_otherthcount, PS_LEVEL}, - {" remove ", " Pending removal:", &ps_removecount, PS_LEVEL}, + {" precip " , " Precipitation: ", &ps_precipcount, PS_LEVEL}, + {" other " , " Other: ", &ps_otherthcount, PS_LEVEL}, + {" remove " , " Pending removal:", &ps_removecount, PS_LEVEL}, {} }; @@ -605,7 +606,9 @@ static void PS_CountThinkers(void) else if (thinker->function == (actionf_p1)P_MobjThinker) { mobj_t *mobj = (mobj_t*)thinker; + ps_mobjcount.value.i++; + if (mobj->flags & MF_NOTHINK) ps_nothinkcount.value.i++; else if (mobj->flags & MF_SCENERY) @@ -624,49 +627,17 @@ static void PS_CountThinkers(void) ps_precipcount.value.i++; } - - /*for (i = 0; i < NUM_THINKERLISTS; i++) - { - for (thinker = thlist[i].next; thinker != &thlist[i]; thinker = thinker->next) - { - ps_thinkercount.value.i++; - if (thinker->function == (actionf_p1)P_RemoveThinkerDelayed) - ps_removecount.value.i++; - else if (i == THINK_POLYOBJ) - ps_polythcount.value.i++; - else if (i == THINK_MAIN) - ps_mainthcount.value.i++; - else if (i == THINK_MOBJ) - { - if (thinker->function == (actionf_p1)P_MobjThinker) - { - mobj_t *mobj = (mobj_t*)thinker; - ps_mobjcount.value.i++; - if (mobj->flags & MF_NOTHINK) - ps_nothinkcount.value.i++; - else if (mobj->flags & MF_SCENERY) - ps_scenerycount.value.i++; - else - ps_regularcount.value.i++; - } - } - else if (i == THINK_DYNSLOPE) - ps_dynslopethcount.value.i++; - else if (i == THINK_PRECIP) - ps_precipcount.value.i++; - } - }*/ } // Update all metrics that are calculated on every tick. void PS_UpdateTickStats(void) { - if (cv_perfstats.value == 1 && cv_ps_samplesize.value > 1) + if (cv_perfstats.value == PS_RENDER && cv_ps_samplesize.value > 1) { PS_UpdateRowHistories(gamelogicbrief_row, false); } - if (cv_perfstats.value == 2) + if (cv_perfstats.value == PS_LOGIC) { if (PS_IsLevelActive()) { @@ -691,25 +662,25 @@ void PS_UpdateTickStats(void) if (cv_ps_samplesize.value > 1) { - if (cv_perfstats.value >= 3 && PS_IsLevelActive()) + if (cv_perfstats.value >= PS_THINKFRAME && PS_IsLevelActive()) { int i; switch (cv_perfstats.value) { - case 3: + case PS_THINKFRAME: for (i = 0; i < thinkframe_hooks_length; i++) { PS_UpdateMetricHistory(&thinkframe_hooks[i].time_taken, true, false); } break; - case 4: + case PS_PRETHINKFRAME: for (i = 0; i < prethinkframe_hooks_length; i++) { PS_UpdateMetricHistory(&prethinkframe_hooks[i].time_taken, true, false); } break; - case 5: + case PS_POSTTHINKFRAME: for (i = 0; i < postthinkframe_hooks_length; i++) { PS_UpdateMetricHistory(&postthinkframe_hooks[i].time_taken, true, false); @@ -719,6 +690,7 @@ void PS_UpdateTickStats(void) break; } } + if (cv_perfstats.value) { ps_tick_index++; @@ -749,7 +721,7 @@ static void PS_DrawDescriptorHeader(void) int samples_left = max(ps_frame_samples_left, ps_tick_samples_left); int x, y; - if (cv_perfstats.value >= 3) + if (cv_perfstats.value >= PS_THINKFRAME) { x = 2; y = 0; @@ -865,20 +837,19 @@ static void draw_think_frame_stats(int hook_length, ps_hookinfo_t *hook) last_mod_name[0] = '\0'; INT32 total = 0; - //Decide page length based and drawn text on choosen thinker type + // Decide page length based and drawn text on choosen thinker type switch (cv_perfstats.value) { - case 3: + case PS_THINKFRAME: { maxpage = thinkframe_hooks_length/PAGE_ENTRIES + 1; page = max(1, min(cv_ps_thinkframe_page.value, maxpage)); pagestart = min((page - 1)*PAGE_ENTRIES, thinkframe_hooks_length); pageend = min(pagestart + PAGE_ENTRIES, thinkframe_hooks_length); - V_DrawSmallString(MAX_X-50, MAX_Y+2*HEIGHT, V_MONOSPACE | V_GREENMAP, "ThinkFrame"); } break; - case 4: + case PS_PRETHINKFRAME: { maxpage = prethinkframe_hooks_length/PAGE_ENTRIES + 1; page = max(1, min(cv_ps_thinkframe_page.value, maxpage)); @@ -887,7 +858,7 @@ static void draw_think_frame_stats(int hook_length, ps_hookinfo_t *hook) V_DrawSmallString(MAX_X-60, MAX_Y+2*HEIGHT, V_MONOSPACE | V_GREENMAP, "PreThinkFrame"); } break; - case 5: + case PS_POSTTHINKFRAME: { maxpage = postthinkframe_hooks_length/PAGE_ENTRIES + 1; page = max(1, min(cv_ps_thinkframe_page.value, maxpage)); @@ -975,7 +946,22 @@ static void draw_think_frame_stats(int hook_length, ps_hookinfo_t *hook) void PS_ThinkFrame_Page_OnChange(void) { - int maxpage = thinkframe_hooks_length/PAGE_ENTRIES + 1; + int maxpage = 0; + + switch (cv_perfstats.value) + { + case PS_THINKFRAME: + maxpage = thinkframe_hooks_length/PAGE_ENTRIES + 1; + break; + case PS_PRETHINKFRAME: + maxpage = prethinkframe_hooks_length/PAGE_ENTRIES + 1; + break; + case PS_POSTTHINKFRAME: + maxpage = postthinkframe_hooks_length/PAGE_ENTRIES + 1; + break; + default: + break; + } if (cv_ps_thinkframe_page.value > maxpage) CV_StealthSetValue(&cv_ps_thinkframe_page, maxpage); @@ -1008,18 +994,18 @@ static void PS_DrawPostThinkFrameStats(void) void M_DrawPerfStats(void) { - if (cv_perfstats.value == 1) // rendering + if (cv_perfstats.value == PS_RENDER) // rendering { PS_UpdateFrameStats(); PS_DrawRenderStats(); } - else if (cv_perfstats.value == 2) // logic + else if (cv_perfstats.value == PS_LOGIC) // logic { // PS_UpdateTickStats is called in TryRunTics, since otherwise it would miss // tics when frame skips happen PS_DrawGameLogicStats(); } - else if (cv_perfstats.value >= 3) // lua thinkframe + else if (cv_perfstats.value >= PS_THINKFRAME) // lua thinkframe { if (!PS_IsLevelActive()) return; @@ -1036,13 +1022,13 @@ void M_DrawPerfStats(void) switch (cv_perfstats.value) { - case 3: + case PS_THINKFRAME: PS_DrawThinkFrameStats(); break; - case 4: + case PS_PRETHINKFRAME: PS_DrawPreThinkFrameStats(); break; - case 5: + case PS_POSTTHINKFRAME: PS_DrawPostThinkFrameStats(); break; default: diff --git a/src/m_perfstats.h b/src/m_perfstats.h index 083656d61..e7991b455 100644 --- a/src/m_perfstats.h +++ b/src/m_perfstats.h @@ -26,6 +26,16 @@ typedef struct void *history; } ps_metric_t; +typedef enum +{ + PS_OFF = 0, + PS_RENDER, + PS_LOGIC, + PS_THINKFRAME, + PS_PRETHINKFRAME, + PS_POSTTHINKFRAME +} ps_types_t; + typedef struct { ps_metric_t time_taken; @@ -36,6 +46,7 @@ typedef struct #define PS_STOP_TIMING(metric) metric.value.p = I_GetPreciseTime() - metric.value.p extern ps_metric_t ps_tictime; +extern ps_metric_t ps_prevtictime; extern ps_metric_t ps_playerthink_time; extern ps_metric_t ps_thinkertime; diff --git a/src/m_textinput.h b/src/m_textinput.h index ce296ffde..f5846059e 100644 --- a/src/m_textinput.h +++ b/src/m_textinput.h @@ -44,7 +44,7 @@ boolean M_TextInputHandle(textinput_t *input, INT32 key); // If currently typing something that looks like an existing emote, return suggestions for it boolean M_TextInputHandleEmotes(textinput_t *input, INT32 key, emote_autocomplete_t *autocomplete); -#define M_DrawTextInput(x, y, input, flags) M_DrawTextInputScroll((x), (y), (input), (flags), ((input)->buffer_size-1)*8) +#define M_DrawTextInput(x, y, input, flags) M_DrawTextInputScroll((x), (y), (input), (flags), ((input)->buffer_size-2)*8) void M_DrawTextInputScroll(INT32 x, INT32 y, textinput_t *input, INT32 flags, INT32 MAXINPUTWIDTH); #endif diff --git a/src/p_enemy.c b/src/p_enemy.c index 15410747a..013ae4705 100644 --- a/src/p_enemy.c +++ b/src/p_enemy.c @@ -250,7 +250,8 @@ boolean P_Move(mobj_t *actor, fixed_t speed) I_Assert(movedir < NUMDIRS); tryx = actor->x + FixedMul(speed*xspeed[movedir], actor->scale); - if (UNLIKELY(twodlevel || actor->flags2 & MF2_TWOD)) + + if (twodmo(actor)) tryy = actor->y; else tryy = actor->y + FixedMul(speed*yspeed[movedir], actor->scale); @@ -328,7 +329,7 @@ void P_NewChaseDir(mobj_t *actor) else d[1] = DI_NODIR; - if (twodlevel || actor->flags2 & MF2_TWOD) + if (twodmo(actor)) d[2] = DI_NODIR; if (deltay < -FixedMul(10*FRACUNIT, actor->scale)) d[2] = DI_SOUTH; @@ -872,7 +873,7 @@ void A_PointyThink(void *thing) TVector v; TVector *res; angle_t fa; - fixed_t radius = FixedMul(actor->info->radius*actor->info->reactiontime, actor->scale); + fixed_t radius; boolean firsttime = true; INT32 sign; @@ -930,6 +931,8 @@ void A_PointyThink(void *thing) if (!actor->tracer) // For some reason we do not have spike balls... return; + radius = FixedMul(actor->info->radius*actor->info->reactiontime, actor->scale); + // Position spike balls relative to the value of 'lastlook'. ball = actor->tracer; @@ -2759,9 +2762,11 @@ void A_Invincibility(void *thing) if (P_IsLocalPlayer(player) && !player->powers[pw_super]) { S_StopMusic(); + if (mariomode) G_GhostAddColor((INT32) (player - players), GHC_INVINCIBLE); - S_ChangeMusicInternal((mariomode) ? "minvnc" : "invinc", false); + + S_ChangeMusicInternal(mariomode ? "minvnc" : "invinc", false); } } @@ -4355,7 +4360,7 @@ void A_MouseThink(void *thing) || (actor->eflags & MFE_VERTICALFLIP && actor->z + actor->height == actor->ceilingz)) && !actor->reactiontime) { - if (UNLIKELY(twodlevel || actor->flags2 & MF2_TWOD)) + if (twodmo(actor)) { if (P_RandomChance(FRACUNIT/2)) actor->angle += ANGLE_180; @@ -10874,10 +10879,7 @@ void A_BrakLobShot(void *thing) return; // Don't even bother if we've got nothing to aim at. // Look up actor's current gravity situation - if (actor->subsector->sector->gravity) - g = FixedMul(gravity,(FixedDiv(*actor->subsector->sector->gravity>>FRACBITS, 1000))); - else - g = gravity; + g = P_GetSectorGravity(actor->subsector->sector); // Look up distance between actor and its target x = P_AproxDistance(actor->target->x - actor->x, actor->target->y - actor->y); @@ -10992,10 +10994,7 @@ void A_NapalmScatter(void *thing) airtime = 16<subsector->sector->gravity) - g = FixedMul(gravity,(FixedDiv(*actor->subsector->sector->gravity>>FRACBITS, 1000))); - else - g = gravity; + g = P_GetSectorGravity(actor->subsector->sector); // vy = (g*(airtime-1))/2 vy = FixedMul(g,(airtime-(1<>1; diff --git a/src/p_floor.c b/src/p_floor.c index ef42b02a3..5417029e4 100644 --- a/src/p_floor.c +++ b/src/p_floor.c @@ -845,7 +845,7 @@ void T_BounceCheese(levelspecthink_t *bouncer) T_MovePlane(bouncer->sector, 0, bouncer->sector->ceilingheight, 0, 1, -1); // update things on ceiling T_MovePlane(bouncer->sector, 0, bouncer->sector->floorheight, 0, 0, -1); // update things on floor bouncer->sector->ceilingdata = NULL; - bouncer->sector->floordata = NULL;; + bouncer->sector->floordata = NULL; bouncer->sector->moved = true; P_RemoveThinker(&bouncer->thinker); // remove bouncer from actives } @@ -1107,14 +1107,13 @@ void T_SpikeSector(levelspecthink_t *spikes) if (affectsec == spikes->sector) // Applied to an actual sector { - fixed_t affectfloor = P_GetSpecialBottomZ(thing, affectsec, affectsec); - fixed_t affectceil = P_GetSpecialTopZ(thing, affectsec, affectsec); - if (affectsec->flags & SF_FLIPSPECIAL_FLOOR) { if (!(thing->eflags & MFE_VERTICALFLIP) && thing->momz > 0) continue; + fixed_t affectfloor = P_GetSpecialBottomZ(thing, affectsec, affectsec); + if (thing->z == affectfloor) dothepain = true; } @@ -1124,19 +1123,21 @@ void T_SpikeSector(levelspecthink_t *spikes) if ((thing->eflags & MFE_VERTICALFLIP) && thing->momz < 0) continue; + fixed_t affectceil = P_GetSpecialTopZ(thing, affectsec, affectsec); + if (thing->z + thing->height == affectceil) dothepain = true; } } else { - fixed_t affectfloor = P_GetSpecialBottomZ(thing, affectsec, spikes->sector); - fixed_t affectceil = P_GetSpecialTopZ(thing, affectsec, spikes->sector); if (affectsec->flags & SF_FLIPSPECIAL_FLOOR) { if (!(thing->eflags & MFE_VERTICALFLIP) && thing->momz > 0) continue; + fixed_t affectceil = P_GetSpecialTopZ(thing, affectsec, spikes->sector); + if (thing->z == affectceil) dothepain = true; } @@ -1146,6 +1147,8 @@ void T_SpikeSector(levelspecthink_t *spikes) if ((thing->eflags & MFE_VERTICALFLIP) && thing->momz < 0) continue; + fixed_t affectfloor = P_GetSpecialBottomZ(thing, affectsec, spikes->sector); + if (thing->z + thing->height == affectfloor) dothepain = true; } @@ -1652,6 +1655,7 @@ wegotit: static mobj_t *SearchMarioNode(msecnode_t *node) { mobj_t *thing = NULL; + for (; node; node = node->m_thinglist_next) { // Things which should NEVER be ejected from a MarioBlock, by type. @@ -2079,11 +2083,12 @@ void T_EachTimeThinker(levelspecthink_t *eachtime) continue; topheight = P_GetSpecialTopZ(players[j].mo, sec, targetsec); - bottomheight = P_GetSpecialBottomZ(players[j].mo, sec, targetsec); if (players[j].mo->z > topheight) continue; + bottomheight = P_GetSpecialBottomZ(players[j].mo, sec, targetsec); + if (players[j].mo->z + players[j].mo->height < bottomheight) continue; @@ -2333,7 +2338,7 @@ void T_RaiseSector(levelspecthink_t *raise) fixed_t origspeed = raise->vars[3]; // Slow down as you get closer to the bottom - raise->vars[3] = FixedMul(raise->vars[3],FixedDiv(raise->sector->ceilingheight - raise->vars[7], (raise->vars[5] - raise->vars[7])>>5)); + raise->vars[3] = FixedMul(raise->vars[3], FixedDiv(raise->sector->ceilingheight - raise->vars[7], (raise->vars[5] - raise->vars[7])>>5)); if (raise->vars[3] <= origspeed/16) raise->vars[3] = origspeed/16; @@ -2344,7 +2349,7 @@ void T_RaiseSector(levelspecthink_t *raise) { fixed_t origspeed = raise->vars[3]; // Slow down as you get closer to the top - raise->vars[3] = FixedMul(raise->vars[3],FixedDiv(raise->vars[5] - raise->sector->ceilingheight, (raise->vars[5] - raise->vars[7])>>5)); + raise->vars[3] = FixedMul(raise->vars[3], FixedDiv(raise->vars[5] - raise->sector->ceilingheight, (raise->vars[5] - raise->vars[7])>>5)); if (raise->vars[3] <= origspeed/16) raise->vars[3] = origspeed/16; diff --git a/src/p_inter.c b/src/p_inter.c index c2d111efd..0cf70f7a0 100644 --- a/src/p_inter.c +++ b/src/p_inter.c @@ -589,7 +589,7 @@ void P_TouchSpecialThing(mobj_t *special, mobj_t *toucher, boolean heightcheck) special->momx = special->momy = special->momz = 0; P_GivePlayerRings(player, 1); - if (UNLIKELY((maptol & TOL_NIGHTS) && special->type != MT_FLINGRING)) + if (nightsmode && special->type != MT_FLINGRING) P_DoNightsScore(player); break; @@ -601,7 +601,7 @@ void P_TouchSpecialThing(mobj_t *special, mobj_t *toucher, boolean heightcheck) special->momx = special->momy = 0; P_GivePlayerRings(player, 1); - if (UNLIKELY((maptol & TOL_NIGHTS) && special->type != MT_FLINGCOIN)) + if (nightsmode && special->type != MT_FLINGCOIN) P_DoNightsScore(player); break; case MT_BLUEBALL: @@ -617,7 +617,7 @@ void P_TouchSpecialThing(mobj_t *special, mobj_t *toucher, boolean heightcheck) else special->scalespeed = 4*FRACUNIT/5; - if (UNLIKELY(maptol & TOL_NIGHTS)) + if (nightsmode) P_DoNightsScore(player); break; case MT_AUTOPICKUP: @@ -831,7 +831,7 @@ void P_TouchSpecialThing(mobj_t *special, mobj_t *toucher, boolean heightcheck) { S_StartSound(toucher, special->info->seesound); - if (UNLIKELY(player->pflags & PF_NIGHTSMODE)) + if (nightsplayer(player)) { player->bumpertime = TICRATE/2; if (special->threshold > 0) @@ -883,18 +883,20 @@ void P_TouchSpecialThing(mobj_t *special, mobj_t *toucher, boolean heightcheck) break; case MT_HOOPCOLLIDE: // This produces a kind of 'domino effect' with the hoop's pieces. - for (; special->hprev != NULL; special = special->hprev); // Move to the first sprite in the hoop - + for (; special != NULL && special->hprev != NULL; special = special->hprev); // Move to the first sprite in the hoop i = 0; - for (; special->hnext != NULL && special->type == MT_HOOP; special = special->hnext) + for (; special != NULL && special->type == MT_HOOP; special = special->hnext) { - if (!P_MobjWasRemoved(special->target)) + if (!P_MobjWasRemoved(special)) { special->fuse = 11; special->movedir = i; - special->extravalue1 = special->target->extravalue1; - special->extravalue2 = special->target->extravalue2; - special->target->threshold = 4242; + if (!P_MobjWasRemoved(special->target)) + { + special->extravalue1 = special->target->extravalue1; + special->extravalue2 = special->target->extravalue2; + special->target->threshold = 4242; + } } i++; } @@ -1131,7 +1133,7 @@ void P_TouchSpecialThing(mobj_t *special, mobj_t *toucher, boolean heightcheck) S_StartSound(toucher, special->info->painsound); return; } - else if (UNLIKELY((player->pflags & PF_NIGHTSMODE) && (player->pflags & PF_DRILLING)) || (player->pflags & (PF_JUMPED|PF_SPINNING|PF_GLIDING)) + else if ((nightsplayer(player) && (player->pflags & PF_DRILLING)) || (player->pflags & (PF_JUMPED|PF_SPINNING|PF_GLIDING)) || player->powers[pw_invulnerability] || player->powers[pw_super]) // Do you possess the ability to subdue the object? { // Shatter the shield! @@ -1462,49 +1464,11 @@ boolean P_CheckRacers(void) return false; } -/** Kills an object. - * - * \param target The victim. - * \param inflictor The attack weapon. May be NULL (environmental damage). - * \param source The attacker. May be NULL. - * \todo Cleanup, refactor, split up. - * \sa P_DamageMobj - */ -void P_KillMobj(mobj_t *target, mobj_t *inflictor, mobj_t *source) +static void P_UpdateRemovedOrbital(mobj_t *target, mobj_t *inflictor, mobj_t *source) { - mobjtype_t item; - mobj_t *mo; - int ms; - - if (target->flags & (MF_ENEMY|MF_BOSS)) - target->momx = target->momy = target->momz = 0; - - // SRB2kart - if (target->type != MT_PLAYER && !(target->flags & MF_MONITOR) - && !(target->type == MT_ORBINAUT || target->type == MT_ORBINAUT_SHIELD - || target->type == MT_JAWZ || target->type == MT_JAWZ_DUD || target->type == MT_JAWZ_SHIELD - || target->type == MT_BANANA || target->type == MT_BANANA_SHIELD - || target->type == MT_EGGMANITEM || target->type == MT_EGGMANITEM_SHIELD - || target->type == MT_BALLHOG || target->type == MT_SPB)) // kart dead items - target->flags |= MF_NOGRAVITY; // Don't drop Tails 03-08-2000 - else - target->flags &= ~MF_NOGRAVITY; // lose it if you for whatever reason have it, I'm looking at you shields - // - - if (target->flags2 & MF2_NIGHTSPULL) - P_SetTarget(&target->tracer, NULL); - - // dead target is no more shootable - target->flags &= ~(MF_SHOOTABLE|MF_FLOAT|MF_SPECIAL); - target->flags2 &= ~(MF2_SKULLFLY|MF2_NIGHTSPULL); - target->health = 0; // This makes it easy to check if something's dead elsewhere. - - if (LUA_HookMobjDeath(target, inflictor, source) || P_MobjWasRemoved(target)) - return; - // SRB2kart // I wish I knew a better way to do this - if (target->target && target->target->player && target->target->player->mo) + if (!P_MobjWasRemovedCompat(target->target) && target->target->player && !P_MobjWasRemovedCompat(target->target->player->mo)) { if (target->target->player->kartstuff[k_eggmanheld] && target->type == MT_EGGMANITEM_SHIELD) target->target->player->kartstuff[k_eggmanheld] = 0; @@ -1517,7 +1481,7 @@ void P_KillMobj(mobj_t *target, mobj_t *inflictor, mobj_t *source) { if (target->movedir != 0 && target->movedir < (UINT16)target->target->player->kartstuff[k_itemamount]) { - if (target->target->hnext) + if (!P_MobjWasRemovedCompat(target->target->hnext)) K_KillBananaChain(target->target->hnext, inflictor, source); target->target->player->kartstuff[k_itemamount] = 0; @@ -1546,14 +1510,60 @@ void P_KillMobj(mobj_t *target, mobj_t *inflictor, mobj_t *source) P_SetTarget(&target->target->hnext, NULL); } } - // Above block does not clean up rocket sneakers when a player dies, so we need to do it here target->target is null when using rocket sneakers +} + + +/** Kills an object. + * + * \param target The victim. + * \param inflictor The attack weapon. May be NULL (environmental damage). + * \param source The attacker. May be NULL. + * \todo Cleanup, refactor, split up. + * \sa P_DamageMobj + */ +void P_KillMobj(mobj_t *target, mobj_t *inflictor, mobj_t *source) +{ + mobjtype_t item; + mobj_t *mo; + int ms; + + if (target->flags & (MF_ENEMY|MF_BOSS)) + target->momx = target->momy = target->momz = 0; + + // SRB2kart + if (target->type != MT_PLAYER + && !(target->flags & MF_MONITOR) + && !(target->type == MT_ORBINAUT || target->type == MT_ORBINAUT_SHIELD + || target->type == MT_JAWZ || target->type == MT_JAWZ_DUD || target->type == MT_JAWZ_SHIELD + || target->type == MT_BANANA || target->type == MT_BANANA_SHIELD + || target->type == MT_EGGMANITEM || target->type == MT_EGGMANITEM_SHIELD + || target->type == MT_BALLHOG || target->type == MT_SPB)) // kart dead items + target->flags |= MF_NOGRAVITY; // Don't drop Tails 03-08-2000 + else + target->flags &= ~MF_NOGRAVITY; // lose it if you for whatever reason have it, I'm looking at you shields + // + + if (target->flags2 & MF2_NIGHTSPULL) + P_SetTarget(&target->tracer, NULL); + + // dead target is no more shootable + target->flags &= ~(MF_SHOOTABLE|MF_FLOAT|MF_SPECIAL); + target->flags2 &= ~(MF2_SKULLFLY|MF2_NIGHTSPULL); + target->health = 0; // This makes it easy to check if something's dead elsewhere. + + if (LUA_HookMobjDeath(target, inflictor, source) || P_MobjWasRemoved(target)) + return; + + P_UpdateRemovedOrbital(target, inflictor, source); + if (target->player) + { + // Above block does not clean up rocket sneakers when a player dies, so we need to do it here target->target is null when using rocket sneakers K_DropRocketSneaker(target->player); - // Let EVERYONE know what happened to a player! 01-29-2002 Tails - if (target->player && !target->player->spectator) - { - target->flags2 &= ~MF2_DONTDRAW; + // Let EVERYONE know what happened to a player! 01-29-2002 Tails + if (!target->player->spectator) + target->flags2 &= ~MF2_DONTDRAW; } // if killed by a player @@ -1563,6 +1573,7 @@ void P_KillMobj(mobj_t *target, mobj_t *inflictor, mobj_t *source) { P_SetTarget(&target->target, source); source->player->numboxes++; + if (cv_itemrespawn.value && (netgame || multiplayer)) { target->fuse = cv_itemrespawntime.value*TICRATE + 2; // Random box generation @@ -1580,35 +1591,41 @@ void P_KillMobj(mobj_t *target, mobj_t *inflictor, mobj_t *source) target->player->playerstate = PST_DEAD; - if (cv_fading.value && P_IsLocalPlayer(target->player)) + if (P_IsLocalPlayer(target->player)) { - if (netgame || multiplayer) - ms = cv_respawntime.value * 1000; - else - ms = 1000; + if (cv_fading.value) + { + if (netgame || multiplayer) + ms = cv_respawntime.value * 1000; + else + ms = 1000; - /* - If the time spent with the music paused is less than half - a second, continue playing the song (just mute it). - */ - if ((ms - cv_respawnfademusicout.value) < 500) - S_FadeMusic(0, cv_respawnfademusicout.value); - else - S_FadeOutStopMusic(cv_respawnfademusicout.value); - } + /* + * If the time spent with the music paused is less than half + * a second, continue playing the song (just mute it). + */ + if ((ms - cv_respawnfademusicout.value) < 500) + S_FadeMusic(0, cv_respawnfademusicout.value); + else + S_FadeOutStopMusic(cv_respawnfademusicout.value); + } - for (UINT8 i = 0; i <= splitscreen; i++) - { - if (target->player == P_GetLocalPlayerForNum(i)) + if (target->player == &players[consoleplayer]) { // don't die in auto map, // switch view prior to dying - if (i == 0 && automapactive) + if (automapactive) AM_Stop(); + } - // added : 22-02-98: recenter view for next life... - localaiming[i] = 0; - break; + for (UINT8 i = 0; i <= splitscreen; i++) + { + if (target->player == P_GetLocalPlayerForNum(i)) + { + // added : 22-02-98: recenter view for next life... + localaiming[i] = 0; + break; + } } } @@ -1624,7 +1641,7 @@ void P_KillMobj(mobj_t *target, mobj_t *inflictor, mobj_t *source) // Drop stuff. // This determines the kind of object spawned // during the death frame of a thing. - if (!mariomode // Don't show birds, etc. in Mario Mode Tails 12-23-2001 + if (LIKELY(!mariomode) // Don't show birds, etc. in Mario Mode Tails 12-23-2001 && target->flags & MF_ENEMY) { if (cv_soniccd.value) @@ -1678,7 +1695,7 @@ void P_KillMobj(mobj_t *target, mobj_t *inflictor, mobj_t *source) else prandom = P_RandomKey(5); // No placable object, just use a random number. - switch(prandom) + switch (prandom) { default: item = MT_BUNNY; break; case 1: item = MT_BIRD; break; @@ -2222,18 +2239,24 @@ boolean P_DamageMobj(mobj_t *target, mobj_t *inflictor, mobj_t *source, INT32 da return false; // well no clue but this may happen ig - if (!target || (target->health <= 0)) + if (P_MobjWasRemovedCompat(target)) + return false; + + if (target->health <= 0) return false; // Spectator handling if (netgame) { - if (damage == DMG_SPECTATOR && target->player && target->player->spectator) - damage = DMG_INSTAKILL; - else if (target->player && target->player->spectator) - return false; + if (target->player && target->player->spectator) + { + if (damage == DMG_SPECTATOR) + damage = DMG_INSTAKILL; + else + return false; + } - if (source && source->player && source->player->spectator) + if (!P_MobjWasRemovedCompat(source) && source->player && source->player->spectator) return false; } @@ -2327,16 +2350,17 @@ boolean P_DamageMobj(mobj_t *target, mobj_t *inflictor, mobj_t *source, INT32 da if (player->exiting) return false; - if (UNLIKELY(!(target->player->pflags & (PF_NIGHTSMODE|PF_NIGHTSFALL)) && (maptol & TOL_NIGHTS))) + if (UNLIKELY(!(target->player->pflags & (PF_NIGHTSMODE|PF_NIGHTSFALL)) && nightsmode)) return false; } - if (UNLIKELY(player->pflags & PF_NIGHTSMODE)) // NiGHTS damage handling + if (nightsplayer(player)) // NiGHTS damage handling { if (!force) { if (source == target) return false; // Don't hit yourself with your own paraloop, baka + if (source && source->player && !cv_friendlyfire.value && (gametype == GT_COOP || (G_GametypeHasTeams() && target->player->ctfteam == source->player->ctfteam))) @@ -2386,7 +2410,7 @@ boolean P_DamageMobj(mobj_t *target, mobj_t *inflictor, mobj_t *source, INT32 da else if (player->kartstuff[k_invincibilitytimer] > 0 || player->kartstuff[k_growshrinktimer] > 0 || player->powers[pw_flashing]) { - if (!force) // shoulddamage bypasses all of that. + if (!force) // shoulddamage bypasses all of that. { K_DoInstashield(player); return false; @@ -2575,7 +2599,7 @@ void P_PlayerRingBurst(player_t *player, INT32 num_rings) ns = FixedMul(((i*FRACUNIT)/16)+2*FRACUNIT, mo->scale); mo->momx = FixedMul(FINECOSINE(fa),ns); - if (LIKELY(!(twodlevel || (player->mo->flags2 & MF2_TWOD)))) + if (!twodmo(player->mo)) mo->momy = FixedMul(FINESINE(fa),ns); P_SetObjectMomZ(mo, 8*FRACUNIT, false); @@ -2599,7 +2623,7 @@ void P_PlayerRingBurst(player_t *player, INT32 num_rings) ns = FixedMul(momxy, mo->scale); mo->momx = FixedMul(FINECOSINE(fa),ns); - if (LIKELY(!(twodlevel || (player->mo->flags2 & MF2_TWOD)))) + if (!twodmo(player->mo)) mo->momy = FixedMul(FINESINE(fa),ns); ns = momz; @@ -2706,7 +2730,7 @@ void P_PlayerWeaponPanelBurst(player_t *player) ns = FixedMul(3*FRACUNIT, mo->scale); mo->momx = FixedMul(FINECOSINE(fa),ns); - if (LIKELY(!(twodlevel || (player->mo->flags2 & MF2_TWOD)))) + if (!twodmo(player->mo)) mo->momy = FixedMul(FINESINE(fa),ns); P_SetObjectMomZ(mo, 4*FRACUNIT, false); @@ -2790,7 +2814,7 @@ void P_PlayerWeaponAmmoBurst(player_t *player) ns = FixedMul(2*FRACUNIT, mo->scale); mo->momx = FixedMul(FINECOSINE(fa), ns); - if (LIKELY(!(twodlevel || (player->mo->flags2 & MF2_TWOD)))) + if (!twodmo(player->mo)) mo->momy = FixedMul(FINESINE(fa),ns); P_SetObjectMomZ(mo, 3*FRACUNIT, false); @@ -2906,7 +2930,7 @@ void P_PlayerEmeraldBurst(player_t *player, boolean toss) momx = FixedMul(FINECOSINE(fa), ns); - if (LIKELY(!(twodlevel || (player->mo->flags2 & MF2_TWOD)))) + if (!twodmo(player->mo)) momy = FixedMul(FINESINE(fa),ns); else momy = 0; @@ -2963,7 +2987,7 @@ void P_PlayerFlagBurst(player_t *player, boolean toss) { angle_t fa = P_RandomByte()*FINEANGLES/256; flag->momx = FixedMul(FINECOSINE(fa), FixedMul(6*FRACUNIT, player->mo->scale)); - if (LIKELY(!(twodlevel || (player->mo->flags2 & MF2_TWOD)))) + if (!twodmo(player->mo)) flag->momy = FixedMul(FINESINE(fa), FixedMul(6*FRACUNIT, player->mo->scale)); } diff --git a/src/p_local.h b/src/p_local.h index b71e99ebd..1198335ec 100644 --- a/src/p_local.h +++ b/src/p_local.h @@ -59,8 +59,12 @@ extern "C" { #define AIMINGTOSLOPE(aiming) FINESINE((aiming>>ANGLETOFINESHIFT) & FINEMASK) -#define mariomode (maptol & TOL_MARIO) -#define twodlevel (maptol & TOL_2D) +// unused modes, kept for compat +#define nightsmode (UNLIKELY(maptol & TOL_NIGHTS)) +#define nightsplayer(player) (UNLIKELY((player)->pflags & PF_NIGHTSMODE)) +#define mariomode (UNLIKELY(maptol & TOL_MARIO)) +#define twodlevel (UNLIKELY(maptol & TOL_2D)) +#define twodmo(mobj) (UNLIKELY(twodlevel || ((mobj)->flags2 & MF2_TWOD))) // // P_TICK @@ -99,7 +103,6 @@ typedef struct camera_s // Hold up/down to pan the camera vertically SINT8 dpad_y_held; - // Camera demobjerization // Info for drawing: position. fixed_t x, y, z; @@ -288,6 +291,17 @@ FUNCINLINE static ATTRINLINE boolean P_MobjWasRemoved(const mobj_t *mobj) return (!mobj || mobj->thinker.function != (actionf_p1)P_MobjThinker); } +// stupid, but kart allows mobjs that are marked to be removed to be accessed and modified in many cases +// so can only check if its not NULL in vanilla compat mode +FUNCINLINE static ATTRINLINE boolean P_MobjWasRemovedCompat(const mobj_t *mobj) +{ +#ifdef COMPAT_VANILLA + return (!mobj); +#else + return P_MobjWasRemoved(mobj); +#endif +} + fixed_t P_MobjFloorZ(mobj_t *mobj, sector_t *sector, sector_t *boundsec, fixed_t x, fixed_t y, line_t *line, boolean lowest, boolean perfect); fixed_t P_MobjCeilingZ(mobj_t *mobj, sector_t *sector, sector_t *boundsec, fixed_t x, fixed_t y, line_t *line, boolean lowest, boolean perfect); #define P_GetFloorZ(mobj, sector, x, y, line) P_MobjFloorZ(mobj, sector, NULL, x, y, line, false, false) diff --git a/src/p_map.c b/src/p_map.c index ee013a2ab..753d576b6 100644 --- a/src/p_map.c +++ b/src/p_map.c @@ -136,14 +136,17 @@ boolean P_DoSpring(mobj_t *spring, mobj_t *object) if (object->eflags & MFE_SPRUNG) // Object was already sprung this tic return false; - // Spectators don't trigger springs. - if (object->player && object->player->spectator) - return false; - - if (UNLIKELY(object->player && (object->player->pflags & PF_NIGHTSMODE))) + if (object->player) { - /*Someone want to make these work like bumpers?*/ - return false; + // Spectators don't trigger springs. + if (object->player->spectator) + return false; + + if (nightsplayer(object->player)) + { + /*Someone want to make these work like bumpers?*/ + return false; + } } object->standingslope = NULL; // Okay, now we can't return - no launching off at silly angles for you. @@ -160,10 +163,15 @@ boolean P_DoSpring(mobj_t *spring, mobj_t *object) if (spring->eflags & MFE_VERTICALFLIP) vertispeed *= -1; + // Vertical springs teleport you on TOP of them. if (vertispeed > 0) + { object->z = spring->z + spring->height + 1; + } else if (vertispeed < 0) + { object->z = spring->z - object->height - 1; + } else { // Horizontal springs teleport you in FRONT of them. @@ -215,7 +223,9 @@ boolean P_DoSpring(mobj_t *spring, mobj_t *object) if (object->player) { if (spring->flags & MF_ENEMY) // Spring shells + { P_SetTarget(&spring->target, object); + } if (horizspeed && object->player->cmd.forwardmove == 0 && object->player->cmd.sidemove == 0) { @@ -312,13 +322,13 @@ static boolean PIT_CheckThing(mobj_t *thing) if (thing == tmthing) return true; - // Ignore... things. - if (!tmthing || P_MobjWasRemoved(thing)) - return true; - I_Assert(!P_MobjWasRemoved(tmthing)); I_Assert(!P_MobjWasRemoved(thing)); + // Ignore... things. + if (P_MobjWasRemovedCompat(tmthing) || P_MobjWasRemoved(thing)) + return true; + // Ignore spectators if ((tmthing->player && tmthing->player->spectator) || (thing->player && thing->player->spectator)) @@ -350,12 +360,13 @@ static boolean PIT_CheckThing(mobj_t *thing) } #endif - if (!(thing->flags & (MF_SOLID|MF_SPECIAL|MF_PAIN|MF_SHOOTABLE)) || (thing->flags & MF_NOCLIPTHING)) + if ((thing->flags & MF_NOCLIPTHING) || !(thing->flags & (MF_SOLID|MF_SPECIAL|MF_PAIN|MF_SHOOTABLE))) return true; // Don't collide with your buddies while NiGHTS-flying. - if (UNLIKELY(tmthing->player && thing->player && (maptol & TOL_NIGHTS) - && ((tmthing->player->pflags & PF_NIGHTSMODE) || (thing->player->pflags & PF_NIGHTSMODE)))) + if (nightsmode && + tmthing->player && thing->player && + (nightsplayer(tmthing->player) || nightsplayer(thing->player))) return true; blockdist = thing->radius + tmthing->radius; @@ -719,11 +730,11 @@ static boolean PIT_CheckThing(mobj_t *thing) if (thing->type != MT_PLAYER) return true; - if (thing->player && thing->player->powers[pw_flashing]) - return true; - - if (thing->type == MT_PLAYER && thing->player) + if (thing->player) { + if (thing->player->powers[pw_flashing]) + return true; + if (tmthing->state == &states[S_MINEEXPLOSION1]) K_ExplodePlayer(thing->player, tmthing->target, tmthing); else @@ -1077,6 +1088,7 @@ static boolean PIT_CheckThing(mobj_t *thing) thing->momy -= FixedMul(PUSHACCEL, thing->scale); tmthing->momy += FixedMul(PUSHACCEL, thing->scale); } + if (tmthing->momx > 0 && tmthing->momx > FixedMul(4*FRACUNIT, thing->scale) && tmthing->momx > thing->momx) { @@ -1094,6 +1106,7 @@ static boolean PIT_CheckThing(mobj_t *thing) thing->momx = FixedMul(thing->info->speed, thing->scale); else if (thing->momx < -FixedMul(thing->info->speed, thing->scale)) thing->momx = -FixedMul(thing->info->speed, thing->scale); + if (thing->momy > FixedMul(thing->info->speed, thing->scale)) thing->momy = FixedMul(thing->info->speed, thing->scale); else if (thing->momy < -FixedMul(thing->info->speed, thing->scale)) @@ -1105,6 +1118,7 @@ static boolean PIT_CheckThing(mobj_t *thing) tmthing->momx = FixedMul(4*FRACUNIT, thing->scale); else if (tmthing->momx < FixedMul(-4*FRACUNIT, thing->scale)) tmthing->momx = FixedMul(-4*FRACUNIT, thing->scale); + if (tmthing->momy > FixedMul(4*FRACUNIT, thing->scale)) tmthing->momy = FixedMul(4*FRACUNIT, thing->scale); else if (tmthing->momy < FixedMul(-4*FRACUNIT, thing->scale)) @@ -1126,6 +1140,7 @@ static boolean PIT_CheckThing(mobj_t *thing) P_TouchSpecialThing(thing, tmthing, true); // can remove thing return true; } + // check again for special pickup if (tmthing->flags & MF_SPECIAL && thing->player) { @@ -1575,13 +1590,13 @@ static boolean PIT_CheckLine(line_t *ld) tmbbox[BOXLEFT] >= ld->bbox[BOXRIGHT] || tmbbox[BOXTOP] <= ld->bbox[BOXBOTTOM] || tmbbox[BOXBOTTOM] >= ld->bbox[BOXTOP]) - return true; + return true; // didn't hit it if (ld->polyobj && !(ld->polyobj->flags & POF_SOLID)) return true; if (P_BoxOnLineSide(tmbbox, ld) != -1) - return true; + return true; // didn't hit it if (tmthing->flags & MF_PAPERCOLLISION) // Caution! Turning whilst up against a wall will get you stuck. You probably shouldn't give the player this flag. { @@ -1813,14 +1828,14 @@ boolean P_CheckPosition(mobj_t *thing, fixed_t x, fixed_t y) delta1 = abs(thing->z - midheight); delta2 = abs(thingtop - midheight); - if (topheight > tmfloorz && delta1 < delta2 + if ((topheight > tmfloorz) && (delta1 < delta2) && !(rover->flags & FF_REVERSEPLATFORM)) { tmfloorz = tmdropoffz = topheight; tmfloorslope = *rover->t_slope; } - if (bottomheight < tmceilingz && delta1 >= delta2 + if ((bottomheight < tmceilingz) && (delta1 >= delta2) && !(rover->flags & FF_PLATFORM) && !(thing->type == MT_SKIM && (rover->flags & FF_SWIMMABLE))) { @@ -1875,8 +1890,7 @@ boolean P_CheckPosition(mobj_t *thing, fixed_t x, fixed_t y) po->validcount = validcount; - if (!P_BBoxInsidePolyobj(po, tmbbox) - || !(po->flags & POF_SOLID)) + if (!(po->flags & POF_SOLID) || !P_BBoxInsidePolyobj(po, tmbbox)) { plink = (polymaplink_t *)(plink->link.next); continue; @@ -2121,7 +2135,7 @@ static boolean P_CheckCameraPosition(fixed_t x, fixed_t y, camera_t *thiscam) po->validcount = validcount; - if (!P_PointInsidePolyobj(po, x, y) || !(po->flags & POF_SOLID)) + if (!(po->flags & POF_SOLID) || !P_PointInsidePolyobj(po, x, y)) { plink = (polymaplink_t *)(plink->link.next); continue; @@ -2371,8 +2385,10 @@ boolean P_TryMove(mobj_t *thing, fixed_t x, fixed_t y, boolean allowdropoff) fixed_t tryx = thing->x; fixed_t tryy = thing->y; fixed_t radius = thing->radius; - fixed_t thingtop ;//= thing->z + thing->height; + fixed_t thingtop;//= thing->z + thing->height; fixed_t startingonground = P_IsObjectOnGround(thing); + fixed_t stairjank = 0; + pslope_t *oldslope = thing->standingslope; INT32 special = -1; floatok = false; @@ -2422,7 +2438,7 @@ boolean P_TryMove(mobj_t *thing, fixed_t x, fixed_t y, boolean allowdropoff) if (thing->player) { - if (special == -1) + if (special == -1) // this should use the target coords not the ones were started with, but cant fix that for compat reasons! special = GETSECSPECIAL(R_PointInSubsector(x, y)->sector->special, 1); // If using type Section1:13, double the maxstep. @@ -2446,11 +2462,19 @@ boolean P_TryMove(mobj_t *thing, fixed_t x, fixed_t y, boolean allowdropoff) thingtop = thing->z + thing->height; + const boolean flipped = + (thing->eflags & MFE_VERTICALFLIP) != 0; + // Step up if (thing->z < tmfloorz) { if (tmfloorz - thing->z <= maxstep) { + if (maxstep > 0 && !flipped) + { + stairjank = (tmfloorz - thing->z); + } + thing->z = thing->floorz = tmfloorz; thing->eflags |= MFE_JUSTSTEPPEDDOWN; } @@ -2463,6 +2487,11 @@ boolean P_TryMove(mobj_t *thing, fixed_t x, fixed_t y, boolean allowdropoff) { if (thingtop - tmceilingz <= maxstep) { + if (maxstep > 0 && flipped) + { + stairjank = (thingtop - tmceilingz); + } + thing->z = ( thing->ceilingz = tmceilingz ) - thing->height; thing->eflags |= MFE_JUSTSTEPPEDDOWN; } @@ -2479,11 +2508,21 @@ boolean P_TryMove(mobj_t *thing, fixed_t x, fixed_t y, boolean allowdropoff) if (thingtop == thing->ceilingz && tmceilingz > thingtop && tmceilingz - thingtop <= maxstep) { + if (flipped) + { + stairjank = (tmceilingz - thingtop); + } + thing->z = (thing->ceilingz = tmceilingz) - thing->height; thing->eflags |= MFE_JUSTSTEPPEDDOWN; } else if (thing->z == thing->floorz && tmfloorz < thing->z && thing->z - tmfloorz <= maxstep) { + if (!flipped) + { + stairjank = (thing->z - tmfloorz); + } + thing->z = thing->floorz = tmfloorz; thing->eflags |= MFE_JUSTSTEPPEDDOWN; } @@ -2559,6 +2598,26 @@ boolean P_TryMove(mobj_t *thing, fixed_t x, fixed_t y, boolean allowdropoff) else // don't set standingslope if you're not going to clip against it thing->standingslope = NULL; + /* FIXME: slope step down (even up) has some false + positives, so just ignore them entirely. */ + if (stairjank && !oldslope && !thing->standingslope && thing->player && !thing->player->spectator) + { + /* use a shorter sound if not two tics have passed + * since the last step */ + //S_ReducedVFXSound(thing, (thing->player->stairjank >= 16 ? sfx_s23b : sfx_s268), NULL); + //S_StartSound(thing, (thing->player->stairjank >= 16 ? sfx_s23b : sfx_s268)); + // sound does not work out all that well for kart maps + + // best i can do... + if (cv_stairjank.value && cv_stairjanksfx.value) + S_StartSoundAtVolume(thing, (thing->player->stairjank >= 8 ? sfx_s23b : sfx_s268), 192); // dont blast this at full volume lul + + // Can't spawn things during P_TryMove, because global variables :) + + thing->player->stairjank = 9; + //thing->player->stairjank = 17; + } + thing->x = x; thing->y = y; @@ -2609,7 +2668,7 @@ boolean P_SceneryTryMove(mobj_t *thing, fixed_t x, fixed_t y) if (tmfloorz - thing->z > maxstep) return false; // too big a step up } - } while(tryx != x || tryy != y); + } while (tryx != x || tryy != y); // the move is ok, // so link the thing into its new position @@ -3104,6 +3163,9 @@ void P_SlideMove(mobj_t *mo, boolean forceslide) INT16 hitcount = 0; boolean success = false; + if (P_MobjWasRemovedCompat(mo)) + return; + if (tmhitthing && mo->z + mo->height > tmhitthing->z && mo->z < tmhitthing->z + tmhitthing->height) { // Don't mess with your momentum if it's a pushable object. Pushables do their own crazy things already. @@ -3140,6 +3202,9 @@ void P_SlideMove(mobj_t *mo, boolean forceslide) bestslideline = NULL; retry: + if (P_MobjWasRemovedCompat(mo)) + return; + if (++hitcount == 3) goto stairstep; // don't loop forever @@ -3188,7 +3253,13 @@ retry: // the move must have hit the middle, so stairstep stairstep: if (!P_TryMove(mo, mo->x, mo->y + mo->momy, true)) //Allow things to drop off. + { + if (P_MobjWasRemovedCompat(mo)) + return; + P_TryMove(mo, mo->x + mo->momx, mo->y, true); + } + return; } @@ -3200,7 +3271,12 @@ stairstep: newy = FixedMul(mo->momy, bestslidefrac); if (!P_TryMove(mo, mo->x + newx, mo->y + newy, true)) + { goto stairstep; + } + + if (P_MobjWasRemovedCompat(mo)) + return; } // Now continue along the wall. @@ -3219,7 +3295,7 @@ stairstep: if (bestslideline != NULL) P_HitSlideLine(bestslideline); // clip the moves - if (UNLIKELY((twodlevel || (mo->flags2 & MF2_TWOD)) && mo->player)) + if (twodmo(mo) && mo->player) { mo->momx = tmxmove; tmymove = 0; @@ -3271,8 +3347,11 @@ stairstep: goto retry; } + if (P_MobjWasRemovedCompat(mo)) + return; + success = true; - } while(tmxmove || tmymove); + } while (tmxmove || tmymove); } // @@ -3285,12 +3364,18 @@ void P_BouncePlayerMove(mobj_t *mo) { fixed_t leadx, leady; fixed_t trailx, traily; - fixed_t mmomx = 0, mmomy = 0; - fixed_t oldmomx = mo->momx, oldmomy = mo->momy; + fixed_t mmomx, mmomy; + fixed_t oldmomx, oldmomy; - if (!mo->player) + if (P_MobjWasRemovedCompat(mo)) return; + if (mo->player == NULL) + return; + + oldmomx = mo->momx; + oldmomy = mo->momy; + if (mo->player->spectator) { P_SlideMove(mo, true); @@ -3379,6 +3464,9 @@ void P_BouncePlayerMove(mobj_t *mo) if (!P_TryMove(mo, mo->x + tmxmove, mo->y + tmymove, true)) { + if (P_MobjWasRemovedCompat(mo)) + return; + P_TryMove(mo, mo->x - oldmomx, mo->y - oldmomy, true); } } @@ -3396,6 +3484,9 @@ void P_BounceMove(mobj_t *mo) INT32 hitcount; fixed_t mmomx = 0, mmomy = 0; + if (P_MobjWasRemovedCompat(mo)) + return; + if (mo->player) { P_BouncePlayerMove(mo); @@ -3412,6 +3503,9 @@ void P_BounceMove(mobj_t *mo) hitcount = 0; retry: + if (P_MobjWasRemovedCompat(mo)) + return; + if (++hitcount == 3) goto bounceback; // don't loop forever @@ -3470,7 +3564,12 @@ bounceback: newy = FixedMul(mmomy, bestslidefrac); if (!P_TryMove(mo, mo->x + newx, mo->y + newy, true)) + { + if (P_MobjWasRemovedCompat(mo)) + return; + goto bounceback; + } } // Now continue along the wall. @@ -3667,7 +3766,7 @@ static boolean PIT_ChangeSector(mobj_t *thing, boolean realcrush) delta1 = abs(thing->z - midheight); delta2 = abs(thingtop - midheight); - if (bottomheight <= thing->ceilingz && delta1 >= delta2) + if ((bottomheight <= thing->ceilingz) && (delta1 >= delta2)) { if (thing->flags & MF_PUSHABLE) { @@ -4125,7 +4224,7 @@ void P_CreateSecNodeList(mobj_t *thing, fixed_t x, fixed_t y) * Must clear tmthing at tic end, as it might contain a pointer to a removed thinker, or the level might have ended/been ended and we clear the objects it was pointing too. Hopefully we don't need to carry this between tics for sync. */ void P_MapStart(void) { - if (UNLIKELY(tmthing)) + if (tmthing) I_Error("P_MapStart: tmthing set!"); } @@ -4177,7 +4276,7 @@ fixed_t P_FloorzAtPos(fixed_t x, fixed_t y, fixed_t z, fixed_t height) delta1 = abs(z - midheight); delta2 = abs(thingtop - midheight); - if (topheight > floorz && delta1 < delta2) + if ((topheight > floorz) && (delta1 < delta2)) floorz = topheight; } } diff --git a/src/p_maputl.cpp b/src/p_maputl.cpp index 592f57e92..6e7f926b3 100644 --- a/src/p_maputl.cpp +++ b/src/p_maputl.cpp @@ -242,7 +242,7 @@ void P_CameraLineOpening(line_t *linedef) sector_t *back; fixed_t frontfloor, frontceiling, backfloor, backceiling; - if (linedef->sidenum[1] == 0xffff) + if (linedef->sidenum[1] == NO_INDEX) { // single sided line openrange = 0; @@ -326,7 +326,7 @@ void P_CameraLineOpening(line_t *linedef) { for (rover = front->ffloors; rover; rover = rover->next) { - fixed_t topheight, bottomheight; + fixed_t topheight, bottomheight, midheight; if (!(rover->flags & FF_BLOCKOTHERS) || !(rover->flags & FF_RENDERALL) || !(rover->flags & FF_EXISTS) || UNLIKELY(GETSECSPECIAL(rover->master->frontsector->special, 4) == 12)) continue; @@ -334,8 +334,10 @@ void P_CameraLineOpening(line_t *linedef) topheight = P_CameraGetFOFTopZ(mapcampointer, front, rover, tmx, tmy, linedef); bottomheight = P_CameraGetFOFBottomZ(mapcampointer, front, rover, tmx, tmy, linedef); - delta1 = abs(mapcampointer->z - (bottomheight + ((topheight - bottomheight)/2))); - delta2 = abs(thingtop - (bottomheight + ((topheight - bottomheight)/2))); + midheight = (bottomheight + ((topheight - bottomheight) / 2)); + + delta1 = abs(mapcampointer->z - midheight); + delta2 = abs(thingtop - midheight); if (bottomheight < lowestceiling && delta1 >= delta2) lowestceiling = bottomheight; @@ -354,7 +356,7 @@ void P_CameraLineOpening(line_t *linedef) { for (rover = back->ffloors; rover; rover = rover->next) { - fixed_t topheight, bottomheight; + fixed_t topheight, bottomheight, midheight; if (!(rover->flags & FF_BLOCKOTHERS) || !(rover->flags & FF_RENDERALL) || !(rover->flags & FF_EXISTS) || UNLIKELY(GETSECSPECIAL(rover->master->frontsector->special, 4) == 12)) continue; @@ -362,8 +364,10 @@ void P_CameraLineOpening(line_t *linedef) topheight = P_CameraGetFOFTopZ(mapcampointer, back, rover, tmx, tmy, linedef); bottomheight = P_CameraGetFOFBottomZ(mapcampointer, back, rover, tmx, tmy, linedef); - delta1 = abs(mapcampointer->z - (bottomheight + ((topheight - bottomheight)/2))); - delta2 = abs(thingtop - (bottomheight + ((topheight - bottomheight)/2))); + midheight = (bottomheight + ((topheight - bottomheight) / 2)); + + delta1 = abs(mapcampointer->z - midheight); + delta2 = abs(thingtop - midheight); if (bottomheight < lowestceiling && delta1 >= delta2) lowestceiling = bottomheight; @@ -398,7 +402,7 @@ void P_LineOpening(line_t *linedef, mobj_t *mobj) { sector_t *front, *back; - if (linedef->sidenum[1] == 0xffff) + if (linedef->sidenum[1] == NO_INDEX) { // single sided line openrange = 0; @@ -524,7 +528,7 @@ void P_LineOpening(line_t *linedef, mobj_t *mobj) // Check for frontsector's fake floors for (rover = front->ffloors; rover; rover = rover->next) { - fixed_t topheight, bottomheight; + fixed_t topheight, bottomheight, midheight; if (!(rover->flags & FF_EXISTS)) continue; @@ -538,8 +542,10 @@ void P_LineOpening(line_t *linedef, mobj_t *mobj) topheight = P_GetFOFTopZ(mobj, front, rover, tmx, tmy, linedef); bottomheight = P_GetFOFBottomZ(mobj, front, rover, tmx, tmy, linedef); - delta1 = abs(mobj->z - (bottomheight + ((topheight - bottomheight)/2))); - delta2 = abs(thingtop - (bottomheight + ((topheight - bottomheight)/2))); + midheight = (bottomheight + ((topheight - bottomheight) / 2)); + + delta1 = abs(mobj->z - midheight); + delta2 = abs(thingtop - midheight); if (delta1 >= delta2 && !(rover->flags & FF_PLATFORM)) // thing is below FOF { @@ -567,7 +573,7 @@ void P_LineOpening(line_t *linedef, mobj_t *mobj) // Check for backsectors fake floors for (rover = back->ffloors; rover; rover = rover->next) { - fixed_t topheight, bottomheight; + fixed_t topheight, bottomheight, midheight; if (!(rover->flags & FF_EXISTS)) continue; @@ -580,8 +586,10 @@ void P_LineOpening(line_t *linedef, mobj_t *mobj) topheight = P_GetFOFTopZ(mobj, back, rover, tmx, tmy, linedef); bottomheight = P_GetFOFBottomZ(mobj, back, rover, tmx, tmy, linedef); - delta1 = abs(mobj->z - (bottomheight + ((topheight - bottomheight)/2))); - delta2 = abs(thingtop - (bottomheight + ((topheight - bottomheight)/2))); + midheight = (bottomheight + ((topheight - bottomheight) / 2)); + + delta1 = abs(mobj->z - midheight); + delta2 = abs(thingtop - midheight); if (delta1 >= delta2 && !(rover->flags & FF_PLATFORM)) // thing is below FOF { @@ -611,8 +619,10 @@ void P_LineOpening(line_t *linedef, mobj_t *mobj) { const sector_t *polysec = linedef->backsector; - delta1 = abs(mobj->z - (polysec->floorheight + ((polysec->ceilingheight - polysec->floorheight)/2))); - delta2 = abs(thingtop - (polysec->floorheight + ((polysec->ceilingheight - polysec->floorheight)/2))); + const fixed_t polymid = (polysec->floorheight + ((polysec->ceilingheight - polysec->floorheight) / 2)); + + delta1 = abs(mobj->z - polymid); + delta2 = abs(thingtop - polymid); if (polysec->floorheight < lowestceiling && delta1 >= delta2) { @@ -620,7 +630,9 @@ void P_LineOpening(line_t *linedef, mobj_t *mobj) ceilingslope = NULL; } else if (polysec->floorheight < highestceiling && delta1 >= delta2) + { highestceiling = polysec->floorheight; + } if (polysec->ceilingheight > highestfloor && delta1 < delta2) { @@ -628,7 +640,9 @@ void P_LineOpening(line_t *linedef, mobj_t *mobj) floorslope = NULL; } else if (polysec->ceilingheight > lowestfloor && delta1 < delta2) + { lowestfloor = polysec->ceilingheight; + } } if (highestceiling < highceiling) @@ -842,7 +856,7 @@ void P_SetThingPosition(mobj_t *thing) // at sector_t->touching_thinglist) are broken. When a node is // added, new sector links are created. - P_CreateSecNodeList(thing,thing->x,thing->y); + P_CreateSecNodeList(thing, thing->x, thing->y); thing->touching_sectorlist = sector_list; // Attach to Thing's mobj_t sector_list = NULL; // clear for next time } @@ -972,6 +986,10 @@ boolean P_BlockLinesIterator(INT32 x, INT32 y, boolean (*func)(line_t *)) // First index is really empty, so +1 it. for (list = blockmaplump + offset + 1; *list != -1; list++) { +#ifdef RANGECHECK + if (*list < 0 || (UINT32)*list >= numlines) + I_Error("P_BlockLinesIterator: index >= numlines"); +#endif ld = &lines[*list]; if (ld->validcount == validcount) @@ -1000,11 +1018,13 @@ boolean P_BlockThingsIterator(INT32 x, INT32 y, boolean (*func)(mobj_t *)) for (mobj = blocklinks[y*bmapwidth + x]; mobj; mobj = bnext) { P_SetTarget(&bnext, mobj->bnext); // We want to note our reference to bnext here incase it is MF_NOTHINK and gets removed! + if (!func(mobj)) { P_SetTarget(&bnext, NULL); return false; } + if (P_MobjWasRemoved(tmthing) // func just popped our tmthing, cannot continue. || (bnext && P_MobjWasRemoved(bnext))) // func just broke blockmap chain, cannot continue. { @@ -1012,6 +1032,7 @@ boolean P_BlockThingsIterator(INT32 x, INT32 y, boolean (*func)(mobj_t *)) return true; } } + P_SetTarget(&bnext, NULL); return true; } diff --git a/src/p_mobj.c b/src/p_mobj.c index 96a8e11d5..dbfe3d596 100644 --- a/src/p_mobj.c +++ b/src/p_mobj.c @@ -172,7 +172,7 @@ boolean P_SetPlayerMobjState(mobj_t *mobj, statenum_t state) do { - if (UNLIKELY(state == S_NULL)) + if (state == S_NULL) { // Bad SOC! CONS_Alert(CONS_ERROR, "Cannot remove player mobj by setting its state to S_NULL.\n"); //P_RemoveMobj(mobj); @@ -347,7 +347,7 @@ void P_ExplodeMissile(mobj_t *mo) explodemo = P_SpawnMobj(mo->x, mo->y, mo->z, MT_EXPLODE); - if (explodemo) + if (!P_MobjWasRemovedCompat(explodemo)) { P_SetScale(explodemo, mo->scale); explodemo->destscale = mo->destscale; @@ -358,7 +358,7 @@ void P_ExplodeMissile(mobj_t *mo) explodemo = P_SpawnMobj(mo->x, mo->y, mo->z, MT_EXPLODE); - if (explodemo) + if (!P_MobjWasRemovedCompat(explodemo)) { P_SetScale(explodemo, mo->scale); explodemo->destscale = mo->destscale; @@ -369,7 +369,7 @@ void P_ExplodeMissile(mobj_t *mo) explodemo = P_SpawnMobj(mo->x, mo->y, mo->z, MT_EXPLODE); - if (explodemo) + if (!P_MobjWasRemovedCompat(explodemo)) { P_SetScale(explodemo, mo->scale); explodemo->destscale = mo->destscale; @@ -380,7 +380,7 @@ void P_ExplodeMissile(mobj_t *mo) explodemo = P_SpawnMobj(mo->x, mo->y, mo->z, MT_EXPLODE); - if (explodemo) + if (!P_MobjWasRemovedCompat(explodemo)) { P_SetScale(explodemo, mo->scale); explodemo->destscale = mo->destscale; @@ -905,7 +905,7 @@ static void P_PlayerFlip(mobj_t *mo) G_GhostAddFlip((INT32) (mo->player - players)); // Flip aiming to match! - if (UNLIKELY(mo->player->pflags & PF_NIGHTSMODE)) // NiGHTS doesn't use flipcam + if (nightsplayer(mo->player)) // NiGHTS doesn't use flipcam { if (mo->tracer) mo->tracer->eflags ^= MFE_VERTICALFLIP; @@ -969,8 +969,7 @@ fixed_t P_GetMobjGravity(mobj_t *mo) if (!(rover->master->frontsector->gravity)) continue; - gravityadd = -FixedMul(gravity, - (FixedDiv(*rover->master->frontsector->gravity>>FRACBITS, 1000))); + gravityadd = -P_GetSectorGravity(rover->master->frontsector); if (rover->master->frontsector->verticalflip && gravityadd > 0) mo->eflags |= MFE_VERTICALFLIP; @@ -982,11 +981,7 @@ fixed_t P_GetMobjGravity(mobj_t *mo) if (no3dfloorgrav) { - if (mo->subsector->sector->gravity) - gravityadd = -FixedMul(gravity, - (FixedDiv(*mo->subsector->sector->gravity>>FRACBITS, 1000))); - else - gravityadd = -gravity; + gravityadd = -P_GetSectorGravity(mo->subsector->sector); if (mo->subsector->sector->verticalflip && gravityadd > 0) mo->eflags |= MFE_VERTICALFLIP; @@ -998,7 +993,7 @@ fixed_t P_GetMobjGravity(mobj_t *mo) if (mo->player) { - if (UNLIKELY(mo->player->climbing || (mo->player->pflags & PF_NIGHTSMODE))) + if (UNLIKELY(mo->player->climbing || nightsplayer(mo->player))) return 0; if (!(mo->flags2 & MF2_OBJECTFLIP) != !(mo->player->powers[pw_gravityboots])) // negated to turn numeric into bool - would be double negated, but not needed if both would be @@ -1006,8 +1001,10 @@ fixed_t P_GetMobjGravity(mobj_t *mo) gravityadd = -gravityadd; mo->eflags ^= MFE_VERTICALFLIP; } + if (wasflip == !(mo->eflags & MFE_VERTICALFLIP)) // note!! == ! is not equivalent to != here - turns numeric into bool this way P_PlayerFlip(mo); + if (mo->player->kartstuff[k_pogospring]) gravityadd = (5*gravityadd)/2; } @@ -1017,12 +1014,17 @@ fixed_t P_GetMobjGravity(mobj_t *mo) if (mo->flags2 & MF2_OBJECTFLIP) { mo->eflags |= MFE_VERTICALFLIP; + if (mo->z + mo->height >= mo->ceilingz) + { gravityadd = 0; + } else if (gravityadd < 0) // Don't sink, only rise up - gravityadd *= -1; + { + gravityadd = -gravityadd; + } } - else //Otherwise, sort through the other exceptions. + else // Otherwise, sort through the other exceptions. { switch (mo->type) { @@ -1083,7 +1085,9 @@ fixed_t P_GetMobjGravity(mobj_t *mo) // Goop has slower, reversed gravity if (goopgravity) + { gravityadd = -gravityadd/5; + } gravityadd = FixedMul(gravityadd, mo->scale); @@ -1121,10 +1125,8 @@ static void P_SceneryXYFriction(mobj_t *mo, fixed_t oldx, fixed_t oldy) { I_Assert(!P_MobjWasRemoved(mo)); - const fixed_t fric_scale = FixedMul(FRACUNIT/32, mo->scale); - - if (abs(mo->momx) < fric_scale - && abs(mo->momy) < fric_scale) + if (abs(mo->momx) < FixedMul(FRACUNIT/32, mo->scale) + && abs(mo->momy) < FixedMul(FRACUNIT/32, mo->scale)) { mo->momx = 0; mo->momy = 0; @@ -1177,13 +1179,16 @@ static void P_XYFriction(mobj_t *mo, fixed_t oldx, fixed_t oldy) } else if (abs(player->rmomx) < mo->scale && abs(player->rmomy) < mo->scale - && (!(player->cmd.forwardmove && !(twodlevel || mo->flags2 & MF2_TWOD)) && !player->cmd.sidemove && !(player->pflags & PF_SPINNING)) + && (!(player->cmd.forwardmove && !twodmo(mo)) && !player->cmd.sidemove && !(player->pflags & PF_SPINNING)) && !(player->mo->standingslope && (!(player->mo->standingslope->flags & SL_NOPHYSICS)) && (abs(player->mo->standingslope->zdelta) >= FRACUNIT/2)) ) { // if in a walking frame, stop moving if (player->panim == PA_WALK && player->kartstuff[k_spinouttimer] == 0) + { P_SetPlayerMobjState(mo, S_KART_STND1); // SRB2kart - was S_PLAY_STND + } + mo->momx = player->cmomx; mo->momy = player->cmomy; } @@ -1204,7 +1209,9 @@ static void P_XYFriction(mobj_t *mo, fixed_t oldx, fixed_t oldy) } } else + { P_SceneryXYFriction(mo, oldx, oldy); + } } static void P_PushableCheckBustables(mobj_t *mo) @@ -1228,15 +1235,15 @@ static void P_PushableCheckBustables(mobj_t *mo) for (node = mo->touching_sectorlist; node; node = node->m_sectorlist_next) { + ffloor_t *rover; + fixed_t topheight, bottomheight; + if (!node->m_sector) break; if (!node->m_sector->ffloors) continue; - ffloor_t *rover; - fixed_t topheight, bottomheight; - for (rover = node->m_sector->ffloors; rover; rover = rover->next) { if (!(rover->flags & FF_EXISTS) || !(rover->flags & FF_BUSTUP)) @@ -1249,7 +1256,6 @@ static void P_PushableCheckBustables(mobj_t *mo) if (rover->master->frontsector->crumblestate) continue; - topheight = P_GetFOFTopZ(mo, node->m_sector, rover, mo->x, mo->y, NULL); bottomheight = P_GetFOFBottomZ(mo, node->m_sector, rover, mo->x, mo->y, NULL); // Height checks @@ -1261,29 +1267,34 @@ static void P_PushableCheckBustables(mobj_t *mo) if (mo->z+mo->height > bottomheight) continue; } - else if (rover->flags & FF_SPINBUST) - { - if (mo->z+mo->momz > topheight) - continue; - - if (mo->z+mo->height < bottomheight) - continue; - } - else if (rover->flags & FF_SHATTER) - { - if (mo->z+mo->momz > topheight) - continue; - - if (mo->z+mo->momz + mo->height < bottomheight) - continue; - } else { - if (mo->z >= topheight) - continue; + topheight = P_GetFOFTopZ(mo, node->m_sector, rover, mo->x, mo->y, NULL); - if (mo->z+mo->height < bottomheight) - continue; + if (rover->flags & FF_SPINBUST) + { + if (mo->z+mo->momz > topheight) + continue; + + if (mo->z+mo->height < bottomheight) + continue; + } + else if (rover->flags & FF_SHATTER) + { + if (mo->z+mo->momz > topheight) + continue; + + if (mo->z+mo->momz + mo->height < bottomheight) + continue; + } + else + { + if (mo->z >= topheight) + continue; + + if (mo->z+mo->height < bottomheight) + continue; + } } EV_CrumbleChain(node->m_sector, rover); @@ -1318,6 +1329,29 @@ static boolean P_CheckSkyHit(mobj_t *mo) return false; } +// +// P_SkullFlyReset +// +// Resets the Skull Fly to its spawn state after it collides with something. +// +static boolean P_SkullFlyReset(mobj_t *mo) +{ + if (!mo->momx && !mo->momy && (mo->flags2 & MF2_SKULLFLY)) + { + // the skull slammed into something + mo->flags2 &= ~MF2_SKULLFLY; + mo->momx = mo->momy = mo->momz = 0; + + // set in 'search new direction' state? + if (mo->type != MT_EGGMOBILE) + P_SetMobjState(mo, mo->info->spawnstate); + + return true; + } + + return false; +} + // // P_XYMovement // @@ -1334,23 +1368,12 @@ void P_XYMovement(mobj_t *mo) I_Assert(!P_MobjWasRemoved(mo)); // if it's stopped - if (!mo->momx && !mo->momy) + if (P_SkullFlyReset(mo)) { - if (mo->flags2 & MF2_SKULLFLY) - { - // the skull slammed into something - mo->flags2 &= ~MF2_SKULLFLY; - mo->momx = mo->momy = mo->momz = 0; - - // set in 'search new direction' state? - if (mo->type != MT_EGGMOBILE) - P_SetMobjState(mo, mo->info->spawnstate); - - return; - } + return; } - player = mo->player; //valid only if player avatar + player = mo->player; // valid only if player avatar xmove = mo->momx; ymove = mo->momy; @@ -1408,7 +1431,9 @@ void P_XYMovement(mobj_t *mo) } } //} - if (!P_TryMove(mo, mo->x + xmove, mo->y + ymove, true) && !(mo->eflags & MFE_SPRUNG)) + + if (!P_TryMove(mo, mo->x + xmove, mo->y + ymove, true) + && !(P_MobjWasRemovedCompat(mo) || mo->eflags & MFE_SPRUNG)) { // blocked move moved = false; @@ -1534,29 +1559,6 @@ void P_XYMovement(mobj_t *mo) return; } - // draw damage on wall - //SPLAT TEST ---------------------------------------------------------- -#ifdef WALLSPLATS - if (blockingline && mo->type != MT_REDRING && mo->type != MT_FIREBALL - && !(mo->flags2 & (MF2_AUTOMATIC|MF2_RAILRING|MF2_BOUNCERING|MF2_EXPLOSION|MF2_SCATTER))) - // set by last P_TryMove() that failed - { - divline_t divl; - divline_t misl; - fixed_t frac; - - P_MakeDivline(blockingline, &divl); - misl.x = mo->x; - misl.y = mo->y; - misl.dx = mo->momx; - misl.dy = mo->momy; - frac = P_InterceptVector(&divl, &misl); - R_AddWallSplat(blockingline, P_PointOnLineSide(mo->x,mo->y,blockingline), - "A_DMG3", mo->z, frac, SPLATDRAWMODE_SHADE); - } -#endif - // --------------------------------------------------------- SPLAT TEST - P_ExplodeMissile(mo); return; } @@ -1615,7 +1617,7 @@ void P_XYMovement(mobj_t *mo) // Check the gravity status. P_CheckGravity(mo, false); - if (UNLIKELY(player && !moved && player->pflags & PF_NIGHTSMODE && mo->target)) + if (player && !moved && nightsplayer(player) && mo->target) { angle_t fa; @@ -1665,11 +1667,14 @@ void P_XYMovement(mobj_t *mo) if (mo->flags & MF_MISSILE || mo->flags2 & MF2_SKULLFLY || mo->type == MT_SHELL || mo->type == MT_VULTURE) return; // no friction for missiles ever - if (player && player->homing) // no friction for homing - return; + if (player) + { + if (player->homing) // no friction for homing + return; - if (UNLIKELY(player && player->pflags & PF_NIGHTSMODE)) - return; // no friction for NiGHTS players + if (nightsplayer(player)) + return; // no friction for NiGHTS players + } if ((mo->type == MT_BIGTUMBLEWEED || mo->type == MT_LITTLETUMBLEWEED) && (mo->standingslope && abs(mo->standingslope->zdelta) > FRACUNIT>>8)) // Special exception for tumbleweeds on slopes @@ -1702,6 +1707,9 @@ static void P_SceneryXYMovement(mobj_t *mo) if (!P_SceneryTryMove(mo, mo->x + mo->momx, mo->y + mo->momy)) P_SlideMove(mo, false); + if (P_MobjWasRemovedCompat(mo)) + return; + if ((!(mo->eflags & MFE_VERTICALFLIP) && mo->z > mo->floorz) || (mo->eflags & MFE_VERTICALFLIP && mo->z+mo->height < mo->ceilingz)) return; // no friction when airborne @@ -1729,7 +1737,7 @@ static void P_AdjustMobjFloorZ_FFloors(mobj_t *mo, sector_t *sector, UINT8 motyp { ffloor_t *rover; fixed_t delta1, delta2, thingtop; - fixed_t topheight, bottomheight; + fixed_t topheight, bottomheight, midheight; I_Assert(!P_MobjWasRemoved(mo)); @@ -1774,18 +1782,19 @@ static void P_AdjustMobjFloorZ_FFloors(mobj_t *mo, sector_t *sector, UINT8 motyp } } - const fixed_t mid = (bottomheight + ((topheight - bottomheight) / 2)); + midheight = (bottomheight + ((topheight - bottomheight) / 2)); - delta1 = abs(mo->z - mid); - delta2 = abs(thingtop - mid); + delta1 = abs(mo->z - midheight); + delta2 = abs(thingtop - midheight); - if (topheight > mo->floorz && delta1 < delta2 + if (topheight > mo->floorz && (delta1 < delta2) && !(rover->flags & FF_REVERSEPLATFORM) && ((P_MobjFlip(mo)*mo->momz >= 0) || (!(rover->flags & FF_PLATFORM)))) // In reverse gravity, only clip for FOFs that are intangible from their bottom (the "top" you're falling through) if you're coming from above ("below" in your frame of reference) { mo->floorz = topheight; } - if (bottomheight < mo->ceilingz && delta1 >= delta2 + + if (bottomheight < mo->ceilingz && (delta1 >= delta2) && !(rover->flags & FF_PLATFORM) && ((P_MobjFlip(mo)*mo->momz >= 0) || (!(rover->flags & FF_REVERSEPLATFORM)))) // In normal gravity, only clip for FOFs that are intangible from the top if you're coming from below { @@ -1805,7 +1814,7 @@ static void P_AdjustMobjFloorZ_PolyObjs(mobj_t *mo, subsector_t *subsec) polyobj_t *po = subsec->polyList; sector_t *polysec; fixed_t delta1, delta2, thingtop; - fixed_t polytop, polybottom; + fixed_t polytop, polybottom, polymid; I_Assert(!P_MobjWasRemoved(mo)); @@ -1833,15 +1842,15 @@ static void P_AdjustMobjFloorZ_PolyObjs(mobj_t *mo, subsector_t *subsec) polybottom = INT32_MIN; } - const fixed_t mid = polybottom + ((polytop - polybottom) / 2); + polymid = (polybottom + ((polytop - polybottom) / 2)); - delta1 = abs(mo->z - mid); - delta2 = abs(thingtop - mid); + delta1 = abs(mo->z - polymid); + delta2 = abs(thingtop - polymid); - if (polytop > mo->floorz && delta1 < delta2) + if (polytop > mo->floorz && (delta1 < delta2)) mo->floorz = polytop; - if (polybottom < mo->ceilingz && delta1 >= delta2) + if (polybottom < mo->ceilingz && (delta1 >= delta2)) mo->ceilingz = polybottom; po = (polyobj_t *)(po->link.next); @@ -1888,12 +1897,17 @@ boolean P_CheckDeathPitCollide(mobj_t *mo) const INT32 secspecial = GETSECSPECIAL(mo->subsector->sector->special, 1); - if (((mo->z <= mo->subsector->sector->floorheight - && !(mo->eflags & MFE_VERTICALFLIP) && (mo->subsector->sector->flags & SF_FLIPSPECIAL_FLOOR)) - || (mo->z + mo->height >= mo->subsector->sector->ceilingheight - && (mo->eflags & MFE_VERTICALFLIP) && (mo->subsector->sector->flags & SF_FLIPSPECIAL_CEILING))) - && (secspecial == 6 || secspecial == 7)) - return true; + // Death Pit + if (secspecial == 6 || secspecial == 7) + { + const boolean flipped = (mo->eflags & MFE_VERTICALFLIP); + + if (!flipped && (mo->subsector->sector->flags & SF_FLIPSPECIAL_FLOOR)) + return (mo->z <= mo->subsector->sector->floorheight); + + if (flipped && (mo->subsector->sector->flags & SF_FLIPSPECIAL_CEILING)) + return (mo->z + mo->height >= mo->subsector->sector->ceilingheight); + } return false; } @@ -1902,10 +1916,14 @@ boolean P_CheckSolidLava(mobj_t *mo, ffloor_t *rover) { I_Assert(!P_MobjWasRemoved(mo)); - if (rover->flags & FF_SWIMMABLE && GETSECSPECIAL(rover->master->frontsector->special, 1) == 3 - && !(rover->master->flags & ML_BLOCKMONSTERS) - && ((rover->master->flags & ML_EFFECT3) || mo->z-mo->momz > P_GetFFloorTopZAt(rover, mo->x, mo->y) - FixedMul(16*FRACUNIT, mo->scale))) + if (rover->flags & FF_SWIMMABLE && GETSECSPECIAL(rover->master->frontsector->special, 1) == 3) + { + if (!(rover->master->flags & ML_BLOCKMONSTERS) && + ((rover->master->flags & ML_EFFECT3) || mo->z-mo->momz > P_GetFFloorTopZAt(rover, mo->x, mo->y) - FixedMul(16*FRACUNIT, mo->scale))) + { return true; + } + } return false; } @@ -2114,13 +2132,12 @@ static boolean P_ZMovement(mobj_t *mo) if (mo->type == MT_JETJAW && mo->z + mo->height > mo->watertop) mo->z = mo->watertop - mo->height; } - } // clip movement if (((mo->z <= mo->floorz && !(mo->eflags & MFE_VERTICALFLIP)) || (mo->z + mo->height >= mo->ceilingz && mo->eflags & MFE_VERTICALFLIP)) - && !(mo->flags & MF_NOCLIPHEIGHT)) + && !(mo->flags & MF_NOCLIPHEIGHT)) { vector3_t mom; mom.x = mo->momx; @@ -2139,6 +2156,10 @@ static boolean P_ZMovement(mobj_t *mo) } P_CheckPosition(mo, mo->x, mo->y); // Sets mo->standingslope correctly + + if (P_MobjWasRemovedCompat(mo)) // mobjs can be removed by P_CheckPosition -- Monster Iestyn 31/07/21 + return false; + if (((mo->eflags & MFE_VERTICALFLIP) ? tmceilingslope : tmfloorslope) && (mo->type != MT_STEAM)) { mo->standingslope = (mo->eflags & MFE_VERTICALFLIP) ? tmceilingslope : tmfloorslope; @@ -2176,6 +2197,7 @@ static boolean P_ZMovement(mobj_t *mo) // Otherwise bounce up at half speed. else mom.z = -mom.z/2; + S_StartSound(mo, mo->info->activesound); } } @@ -2217,7 +2239,7 @@ static boolean P_ZMovement(mobj_t *mo) || mo->type == MT_CANNONBALLDECOR || mo->type == MT_FALLINGROCK) { - if (UNLIKELY(maptol & TOL_NIGHTS)) + if (nightsmode) mom.z = -FixedDiv(mom.z, 10*FRACUNIT); else mom.z = -FixedMul(mom.z, FixedDiv(17*FRACUNIT,20*FRACUNIT)); @@ -2293,7 +2315,9 @@ static boolean P_ZMovement(mobj_t *mo) || tmfloorthing->flags2 & MF2_STANDONME || tmfloorthing->type == MT_PLAYER)) mom.z = tmfloorthing->momz; - if (mo->standingslope) { // MT_STEAM will never have a standingslope, see above. + // MT_STEAM will never have a standingslope, see above. + if (mo->standingslope) + { P_QuantizeMomentumToSlope(&mom, mo->standingslope); } @@ -2314,7 +2338,7 @@ static boolean P_ZMovement(mobj_t *mo) if (((mo->z + mo->height > mo->ceilingz && !(mo->eflags & MFE_VERTICALFLIP)) || (mo->z < mo->floorz && mo->eflags & MFE_VERTICALFLIP)) - && !(mo->flags & MF_NOCLIPHEIGHT)) + && !(mo->flags & MF_NOCLIPHEIGHT)) { if (mo->eflags & MFE_VERTICALFLIP) mo->z = mo->floorz; @@ -2355,11 +2379,9 @@ static boolean P_ZMovement(mobj_t *mo) { if (mo->flags2 & MF2_SKULLFLY) // the skull slammed into something mo->momz = -mo->momz; - else - // Flags bounce - if (UNLIKELY(mo->type == MT_REDFLAG || mo->type == MT_BLUEFLAG)) + else if (UNLIKELY(mo->type == MT_REDFLAG || mo->type == MT_BLUEFLAG)) // Flags bounce { - if (UNLIKELY(maptol & TOL_NIGHTS)) + if (nightsmode) mo->momz = -FixedDiv(mo->momz, 10*FRACUNIT); else mo->momz = -FixedMul(mo->momz, FixedDiv(17*FRACUNIT,20*FRACUNIT)); @@ -2372,6 +2394,103 @@ static boolean P_ZMovement(mobj_t *mo) return true; } +// Check for "Mario" blocks to hit and bounce them +static void P_CheckMarioBlocks(mobj_t *mo) +{ + msecnode_t *node; + + // Only let the player punch + if (netgame && mo->player->spectator) + return; + + // Search the touching sectors, from side-to-side... + for (node = mo->touching_sectorlist; node; node = node->m_sectorlist_next) + { + ffloor_t *rover; + + if (!node->m_sector->ffloors) + continue; + + for (rover = node->m_sector->ffloors; rover; rover = rover->next) + { + if (!(rover->flags & FF_EXISTS)) + continue; + + // Come on, it's time to go... + if (!(rover->flags & FF_MARIO)) + continue; + + if (mo->eflags & MFE_VERTICALFLIP) + continue; // if you were flipped, your head isn't actually hitting your ceilingz is it? + + if (*rover->bottomheight != mo->ceilingz) + continue; // The player's head hit the bottom! + + // DO THE MARIO! + EV_MarioBlock(rover->master->frontsector, node->m_sector, *rover->topheight, mo); + } + } // Ugly ugly billions of braces! Argh! +} + +// Check if we're on a polyobject that triggers a linedef executor. +static boolean P_PlayerPolyObjectZMovement(mobj_t *mo) +{ + msecnode_t *node; + boolean stopmovecut = false; + + // no polyobjects on the map + if (!numPolyObjects) + { + return false; + } + + for (node = mo->touching_sectorlist; node; node = node->m_sectorlist_next) + { + sector_t *sec = node->m_sector; + subsector_t *newsubsec; + size_t i; + + for (i = 0; i < numsubsectors; i++) + { + polyobj_t *po; + sector_t *polysec; + newsubsec = &subsectors[i]; + + if (newsubsec->sector != sec) + continue; + + for (po = newsubsec->polyList; po; po = (polyobj_t *)(po->link.next)) + { + if (!(po->flags & POF_SOLID)) + continue; + + if (!P_MobjInsidePolyobj(po, mo)) + continue; + + // We're inside it! Yess... + polysec = po->lines[0]->backsector; + + // Moving polyobjects should act like conveyors if the player lands on one. (I.E. none of the momentum cut thing below) -Red + if ((mo->z == polysec->ceilingheight || mo->z + mo->height == polysec->floorheight) && po->thinker) + stopmovecut = true; + + if (!(po->flags & POF_LDEXEC)) + continue; + + if (mo->z != polysec->ceilingheight) + continue; + + // We're landing on a PO, so check for + // a linedef executor. + // Trigger tags are 32000 + the PO's ID number. + P_LinedefExecute((INT16)(32000 + po->id), mo, NULL); + } + } + } + + return stopmovecut; +} + static void P_PlayerZMovement(mobj_t *mo) { I_Assert(!P_MobjWasRemoved(mo)); @@ -2405,8 +2524,8 @@ static void P_PlayerZMovement(mobj_t *mo) mo->z += mo->momz; // Have player fall through floor? - if (mo->player->playerstate == PST_DEAD - || mo->player->playerstate == PST_REBORN) + if (mo->player->playerstate == PST_DEAD || + mo->player->playerstate == PST_REBORN) return; if (mo->standingslope) @@ -2421,15 +2540,21 @@ static void P_PlayerZMovement(mobj_t *mo) if (P_IsObjectOnGround(mo) && !(mo->flags & MF_NOCLIPHEIGHT)) { if (mo->eflags & MFE_VERTICALFLIP) - mo->z = mo->ceilingz - mo->height; - else - mo->z = mo->floorz; - - if (UNLIKELY(mo->player->pflags & PF_NIGHTSMODE)) { + mo->z = mo->ceilingz - mo->height; + } + else + { + mo->z = mo->floorz; + } + + if (nightsplayer(mo->player)) + { + const boolean flipped = (mo->eflags & MFE_VERTICALFLIP); + // bounce off floor if you were flying towards it - if ((mo->eflags & MFE_VERTICALFLIP && mo->player->flyangle > 0 && mo->player->flyangle < 180) - || (!(mo->eflags & MFE_VERTICALFLIP) && mo->player->flyangle > 180 && mo->player->flyangle <= 359)) + if ((flipped && mo->player->flyangle > 0 && mo->player->flyangle < 180) || + (!flipped && mo->player->flyangle > 180 && mo->player->flyangle <= 359)) { if (mo->player->flyangle < 90 || mo->player->flyangle >= 270) mo->player->flyangle += P_MobjFlip(mo)*90; @@ -2437,20 +2562,26 @@ static void P_PlayerZMovement(mobj_t *mo) mo->player->flyangle -= P_MobjFlip(mo)*90; mo->player->speed = FixedMul(mo->player->speed, 4*FRACUNIT/5); } + goto nightsdone; } // Get up if you fell. if ((mo->state == &states[mo->info->painstate] || mo->state == &states[S_KART_SPIN]) && mo->player->kartstuff[k_spinouttimer] == 0 && mo->player->kartstuff[k_squishedtimer] == 0) // SRB2kart + { P_SetPlayerMobjState(mo, S_KART_STND1); + } - if (!mo->standingslope && (mo->eflags & MFE_VERTICALFLIP ? tmceilingslope : tmfloorslope)) { +#if 1 // praying that removing this dupe wont cause any issues... + if (!mo->standingslope && (mo->eflags & MFE_VERTICALFLIP ? tmceilingslope : tmfloorslope)) + { // Handle landing on slope during Z movement P_HandleSlopeLanding(mo, (mo->eflags & MFE_VERTICALFLIP ? tmceilingslope : tmfloorslope)); } - - if (!mo->standingslope && (mo->eflags & MFE_VERTICALFLIP ? tmceilingslope : tmfloorslope)) { +#endif + if (!mo->standingslope && (mo->eflags & MFE_VERTICALFLIP ? tmceilingslope : tmfloorslope)) + { // Handle landing on slope during Z movement P_HandleSlopeLanding(mo, (mo->eflags & MFE_VERTICALFLIP ? tmceilingslope : tmfloorslope)); } @@ -2459,88 +2590,28 @@ static void P_PlayerZMovement(mobj_t *mo) { mo->pmomz = 0; // We're on a new floor, don't keep doing platform movement. - if (!tmfloorthing || tmfloorthing->flags & (MF_PUSHABLE|MF_MONITOR) - || tmfloorthing->flags2 & MF2_STANDONME || tmfloorthing->type == MT_PLAYER) // Spin Attack + if (!tmfloorthing || tmfloorthing->flags & (MF_PUSHABLE|MF_MONITOR) || + tmfloorthing->flags2 & MF2_STANDONME || tmfloorthing->type == MT_PLAYER) // Spin Attack { mo->eflags |= MFE_JUSTHITFLOOR; // Spin Attack if (mo->eflags & MFE_JUSTHITFLOOR) { - // Check if we're on a polyobject - // that triggers a linedef executor. - msecnode_t *node; - boolean stopmovecut = false; - - if (numPolyObjects) + if (!P_PlayerPolyObjectZMovement(mo)) { - for (node = mo->touching_sectorlist; node; node = node->m_sectorlist_next) - { - sector_t *sec = node->m_sector; - subsector_t *newsubsec; - size_t i; - - for (i = 0; i < numsubsectors; i++) - { - newsubsec = &subsectors[i]; - - if (newsubsec->sector != sec) - continue; - - if (!newsubsec->polyList) - continue; - - polyobj_t *po = newsubsec->polyList; - sector_t *polysec; - - while (po) - { - if (!P_MobjInsidePolyobj(po, mo) || !(po->flags & POF_SOLID)) - { - po = (polyobj_t *)(po->link.next); - continue; - } - - // We're inside it! Yess... - polysec = po->lines[0]->backsector; - - // Moving polyobjects should act like conveyors if the player lands on one. (I.E. none of the momentum cut thing below) -Red - if ((mo->z == polysec->ceilingheight || mo->z+mo->height == polysec->floorheight) && po->thinker) - stopmovecut = true; - - if (!(po->flags & POF_LDEXEC)) - { - po = (polyobj_t *)(po->link.next); - continue; - } - - if (mo->z == polysec->ceilingheight) - { - // We're landing on a PO, so check for - // a linedef executor. - // Trigger tags are 32000 + the PO's ID number. - P_LinedefExecute((INT16)(32000 + po->id), mo, NULL); - } - - po = (polyobj_t *)(po->link.next); - } - } - } - } - - if (!stopmovecut) - - // Cut momentum in half when you hit the ground and - // aren't pressing any controls. - if (!(mo->player->cmd.forwardmove || mo->player->cmd.sidemove) && !mo->player->cmomx && !mo->player->cmomy - && !(mo->player->kartstuff[k_spinouttimer])) - { - mo->momx = mo->momx/2; - mo->momy = mo->momy/2; - - if (mo->player->cmd.buttons & BT_BRAKE && !(mo->player->cmd.forwardmove)) // FURTHER slowdown if you're braking. + // Cut momentum in half when you hit the ground and + // aren't pressing any controls. + if (!(mo->player->cmd.forwardmove || mo->player->cmd.sidemove) && !mo->player->cmomx && !mo->player->cmomy + && !(mo->player->kartstuff[k_spinouttimer])) { mo->momx = mo->momx/2; mo->momy = mo->momy/2; + + if (mo->player->cmd.buttons & BT_BRAKE && !(mo->player->cmd.forwardmove)) // FURTHER slowdown if you're braking. + { + mo->momx = mo->momx/2; + mo->momy = mo->momy/2; + } } } } @@ -2616,16 +2687,19 @@ nightsdone: else mo->z = mo->ceilingz - mo->height; - if (UNLIKELY(mo->player->pflags & PF_NIGHTSMODE)) + if (nightsplayer(mo->player)) { + const boolean flipped = (mo->eflags & MFE_VERTICALFLIP); + // bounce off ceiling if you were flying towards it - if ((mo->eflags & MFE_VERTICALFLIP && mo->player->flyangle > 180 && mo->player->flyangle <= 359) - || (!(mo->eflags & MFE_VERTICALFLIP) && mo->player->flyangle > 0 && mo->player->flyangle < 180)) + if ((flipped && mo->player->flyangle > 180 && mo->player->flyangle <= 359) + || (!flipped && mo->player->flyangle > 0 && mo->player->flyangle < 180)) { if (mo->player->flyangle < 90 || mo->player->flyangle >= 270) mo->player->flyangle -= P_MobjFlip(mo)*90; else mo->player->flyangle += P_MobjFlip(mo)*90; + mo->player->flyangle %= 360; mo->player->speed = FixedMul(mo->player->speed, 4*FRACUNIT/5); } @@ -2634,34 +2708,11 @@ nightsdone: // Check for "Mario" blocks to hit and bounce them if (P_MobjFlip(mo)*mo->momz > 0) { - msecnode_t *node; - - if (CheckForMarioBlocks && !(netgame && mo->player->spectator)) // Only let the player punch - { - // Search the touching sectors, from side-to-side... - for (node = mo->touching_sectorlist; node; node = node->m_sectorlist_next) - { - ffloor_t *rover; - if (!node->m_sector->ffloors) - continue; - - for (rover = node->m_sector->ffloors; rover; rover = rover->next) - { - if (!(rover->flags & FF_EXISTS)) - continue; - - // Come on, it's time to go... - if (rover->flags & FF_MARIO - && !(mo->eflags & MFE_VERTICALFLIP) // if you were flipped, your head isn't actually hitting your ceilingz is it? - && *rover->bottomheight == mo->ceilingz) // The player's head hit the bottom! - // DO THE MARIO! - EV_MarioBlock(rover->master->frontsector, node->m_sector, *rover->topheight, mo); - } - } // Ugly ugly billions of braces! Argh! - } + if (CheckForMarioBlocks) + P_CheckMarioBlocks(mo); // hit the ceiling - if (UNLIKELY(mariomode)) + if (mariomode) S_StartSound(mo, sfx_mario1); if (!mo->player->climbing) @@ -2784,19 +2835,17 @@ static boolean P_SceneryZMovement(mobj_t *mo) } // Fix for any silly pushables like the egg statues that are also scenery for some reason -- Monster Iestyn - if (P_CheckDeathPitCollide(mo)) + if ((mo->flags & MF_PUSHABLE) && + P_CheckDeathPitCollide(mo)) { - if (mo->flags & MF_PUSHABLE) - { - P_RemoveMobj(mo); - return false; - } + P_RemoveMobj(mo); + return false; } // clip movement if (((mo->z <= mo->floorz && !(mo->eflags & MFE_VERTICALFLIP)) || (mo->z + mo->height >= mo->ceilingz && mo->eflags & MFE_VERTICALFLIP)) - && !(mo->flags & MF_NOCLIPHEIGHT)) + && !(mo->flags & MF_NOCLIPHEIGHT)) { if (mo->eflags & MFE_VERTICALFLIP) mo->z = mo->ceilingz - mo->height; @@ -2826,7 +2875,7 @@ static boolean P_SceneryZMovement(mobj_t *mo) if (((mo->z + mo->height > mo->ceilingz && !(mo->eflags & MFE_VERTICALFLIP)) || (mo->z < mo->floorz && mo->eflags & MFE_VERTICALFLIP)) - && !(mo->flags & MF_NOCLIPHEIGHT)) + && !(mo->flags & MF_NOCLIPHEIGHT)) { if (mo->eflags & MFE_VERTICALFLIP) mo->z = mo->floorz; @@ -2853,7 +2902,10 @@ void P_MobjCheckWater(mobj_t *mobj) fixed_t thingtop = mobj->z + mobj->height; // especially for players, infotable height does not neccessarily match actual height sector_t *sector = mobj->subsector->sector; ffloor_t *rover; - player_t *p = mobj->player; // Will just be null if not a player. + player_t *player = mobj->player; // Will just be null if not a player. + + const fixed_t moheight = FixedMul(mobj->info->height, mobj->scale); + const fixed_t mohalfheight = FixedMul(mobj->info->height/2, mobj->scale); // Default if no water exists. mobj->watertop = mobj->waterbottom = mobj->z - 1000*FRACUNIT; @@ -2864,22 +2916,22 @@ void P_MobjCheckWater(mobj_t *mobj) for (rover = sector->ffloors; rover; rover = rover->next) { fixed_t topheight, bottomheight; - if (!(rover->flags & FF_EXISTS) || !(rover->flags & FF_SWIMMABLE) - || (((rover->flags & FF_BLOCKPLAYER) && mobj->player) - || ((rover->flags & FF_BLOCKOTHERS) && !mobj->player))) - continue; - fixed_t topcheck, bottomcheck; + if (!(rover->flags & FF_EXISTS) || !(rover->flags & FF_SWIMMABLE) + || (((rover->flags & FF_BLOCKPLAYER) && player) + || ((rover->flags & FF_BLOCKOTHERS) && !player))) + continue; + if (mobj->eflags & MFE_VERTICALFLIP) { - topcheck = (thingtop - FixedMul(mobj->info->height/2, mobj->scale)); + topcheck = (thingtop - mohalfheight); bottomcheck = thingtop; } else { topcheck = mobj->z; - bottomcheck = (mobj->z + FixedMul(mobj->info->height/2, mobj->scale)); + bottomcheck = (mobj->z + mohalfheight); } topheight = P_GetFFloorTopZAt(rover, mobj->x, mobj->y); @@ -2897,16 +2949,17 @@ void P_MobjCheckWater(mobj_t *mobj) mobj->waterbottom = bottomheight; // Just touching the water? - if (((mobj->eflags & MFE_VERTICALFLIP) && thingtop - FixedMul(mobj->info->height, mobj->scale) < bottomheight) - || (!(mobj->eflags & MFE_VERTICALFLIP) && mobj->z + FixedMul(mobj->info->height, mobj->scale) > topheight)) + if (((mobj->eflags & MFE_VERTICALFLIP) && thingtop - moheight < bottomheight) || + (!(mobj->eflags & MFE_VERTICALFLIP) && mobj->z + moheight > topheight)) { mobj->eflags |= MFE_TOUCHWATER; if (rover->flags & FF_GOOWATER && !(mobj->flags & MF_NOGRAVITY)) mobj->eflags |= MFE_GOOWATER; } + // Actually in the water? - if (((mobj->eflags & MFE_VERTICALFLIP) && thingtop - FixedMul(mobj->info->height/2, mobj->scale) > bottomheight) - || (!(mobj->eflags & MFE_VERTICALFLIP) && mobj->z + FixedMul(mobj->info->height/2, mobj->scale) < topheight)) + if (((mobj->eflags & MFE_VERTICALFLIP) && thingtop - mohalfheight > bottomheight) || + (!(mobj->eflags & MFE_VERTICALFLIP) && mobj->z + mohalfheight < topheight)) { mobj->eflags |= MFE_UNDERWATER; if (rover->flags & FF_GOOWATER && !(mobj->flags & MF_NOGRAVITY)) @@ -2915,18 +2968,19 @@ void P_MobjCheckWater(mobj_t *mobj) } // Specific things for underwater players - if (p && (mobj->eflags & MFE_UNDERWATER) == MFE_UNDERWATER) + if (player && (mobj->eflags & MFE_UNDERWATER) == MFE_UNDERWATER) { - if (!((p->powers[pw_super]) || (p->powers[pw_invulnerability]))) + if (!((player->powers[pw_super]) || (player->powers[pw_invulnerability]))) { - if ((p->powers[pw_shield] & SH_NOSTACK) == SH_ATTRACT) + if ((player->powers[pw_shield] & SH_NOSTACK) == SH_ATTRACT) { // Water removes attract shield. - p->powers[pw_shield] = p->powers[pw_shield] & SH_STACK; - P_FlashPal(p, PAL_WHITE, 1); + player->powers[pw_shield] = player->powers[pw_shield] & SH_STACK; + P_FlashPal(player, PAL_WHITE, 1); } } + // Can't drown. - p->powers[pw_underwater] = 0; + player->powers[pw_underwater] = 0; } // The rest of this code only executes on a water state change. @@ -2934,23 +2988,24 @@ void P_MobjCheckWater(mobj_t *mobj) return; // Spectators and dead players also don't count. - if (p && (p->spectator || p->playerstate != PST_LIVE)) + if (player && (player->spectator || player->playerstate != PST_LIVE)) return; - if ((p) // Players + if (player // Players || (mobj->flags & MF_PUSHABLE) // Pushables || ((mobj->info->flags & MF_PUSHABLE) && mobj->fuse) // Previously pushable, might be moving still ) { // Check to make sure you didn't just cross into a sector to jump out of // that has shallower water than the block you were originally in. - if (!(mobj->eflags & MFE_VERTICALFLIP) && mobj->watertop-mobj->floorz <= FixedMul(mobj->info->height, mobj->scale)>>1) + if (!(mobj->eflags & MFE_VERTICALFLIP) && mobj->watertop-mobj->floorz <= moheight>>1) return; - if ((mobj->eflags & MFE_VERTICALFLIP) && mobj->ceilingz-mobj->waterbottom <= FixedMul(mobj->info->height, mobj->scale)>>1) + if ((mobj->eflags & MFE_VERTICALFLIP) && mobj->ceilingz-mobj->waterbottom <= moheight>>1) return; - if ((mobj->eflags & MFE_GOOWATER || wasingoo)) { // Decide what happens to your momentum when you enter/leave goopy water. + if ((mobj->eflags & MFE_GOOWATER || wasingoo)) // Decide what happens to your momentum when you enter/leave goopy water. + { if (P_MobjFlip(mobj)*mobj->momz < 0) // You are entering the goo? mobj->momz = FixedMul(mobj->momz, FixedDiv(2*FRACUNIT, 5*FRACUNIT)); // kill momentum significantly, to make the goo feel thick. } @@ -2959,12 +3014,13 @@ void P_MobjCheckWater(mobj_t *mobj) if (P_MobjFlip(mobj)*mobj->momz < 0) { - if ((mobj->eflags & MFE_VERTICALFLIP && thingtop-(FixedMul(mobj->info->height, mobj->scale)>>1)-mobj->momz <= mobj->waterbottom) - || (!(mobj->eflags & MFE_VERTICALFLIP) && mobj->z+(FixedMul(mobj->info->height, mobj->scale)>>1)-mobj->momz >= mobj->watertop)) + if (((mobj->eflags & MFE_VERTICALFLIP) && thingtop-(moheight>>1)-mobj->momz <= mobj->waterbottom) || + (!(mobj->eflags & MFE_VERTICALFLIP) && mobj->z+(moheight>>1)-mobj->momz >= mobj->watertop)) { // Spawn a splash mobj_t *splish; - if (mobj->eflags & MFE_VERTICALFLIP) + + if ((mobj->eflags & MFE_VERTICALFLIP)) { splish = P_SpawnMobj(mobj->x, mobj->y, mobj->waterbottom-FixedMul(mobjinfo[MT_SPLISH].height, mobj->scale), MT_SPLISH); splish->flags2 |= MF2_OBJECTFLIP; @@ -2972,14 +3028,15 @@ void P_MobjCheckWater(mobj_t *mobj) } else splish = P_SpawnMobj(mobj->x, mobj->y, mobj->watertop, MT_SPLISH); + splish->destscale = mobj->scale; P_SetScale(splish, mobj->scale); } // skipping stone! - if (p && p->kartstuff[k_waterskip] < 2 - && ((p->speed/3 > abs(mobj->momz)) // Going more forward than horizontal, so you can skip across the water. - || (p->speed > K_GetKartSpeed(p,false)/3 && p->kartstuff[k_waterskip])) // Already skipped once, so you can skip once more! + if (player && player->kartstuff[k_waterskip] < 2 + && ((player->speed/3 > abs(mobj->momz)) // Going more forward than horizontal, so you can skip across the water. + || (player->speed > K_GetKartSpeed(player, false)/3 && player->kartstuff[k_waterskip])) // Already skipped once, so you can skip once more! && ((!(mobj->eflags & MFE_VERTICALFLIP) && thingtop - mobj->momz > mobj->watertop) || ((mobj->eflags & MFE_VERTICALFLIP) && mobj->z - mobj->momz < mobj->waterbottom))) { @@ -2992,23 +3049,23 @@ void P_MobjCheckWater(mobj_t *mobj) if (!(mobj->eflags & MFE_VERTICALFLIP) && mobj->momz < FixedMul(min, mobj->scale)) mobj->momz = FixedMul(min, mobj->scale); - else if (mobj->eflags & MFE_VERTICALFLIP && mobj->momz > FixedMul(-min, mobj->scale)) + else if ((mobj->eflags & MFE_VERTICALFLIP) && mobj->momz > FixedMul(-min, mobj->scale)) mobj->momz = FixedMul(-min, mobj->scale); - p->kartstuff[k_waterskip]++; + player->kartstuff[k_waterskip]++; } } else if (P_MobjFlip(mobj)*mobj->momz > 0) { - if (((mobj->eflags & MFE_VERTICALFLIP && thingtop-(FixedMul(mobj->info->height, mobj->scale)>>1)-mobj->momz > mobj->waterbottom) - || (!(mobj->eflags & MFE_VERTICALFLIP) && mobj->z+(FixedMul(mobj->info->height, mobj->scale)>>1)-mobj->momz < mobj->watertop)) + if ((((mobj->eflags & MFE_VERTICALFLIP) && thingtop-(moheight>>1)-mobj->momz > mobj->waterbottom) + || (!(mobj->eflags & MFE_VERTICALFLIP) && mobj->z+(moheight>>1)-mobj->momz < mobj->watertop)) && !(mobj->eflags & MFE_UNDERWATER)) // underwater check to prevent splashes on opposite side { // Spawn a splash mobj_t *splish; - if (mobj->eflags & MFE_VERTICALFLIP) + if ((mobj->eflags & MFE_VERTICALFLIP)) { splish = P_SpawnMobj(mobj->x, mobj->y, mobj->waterbottom-FixedMul(mobjinfo[MT_SPLISH].height, mobj->scale), MT_SPLISH); splish->flags2 |= MF2_OBJECTFLIP; @@ -3216,7 +3273,7 @@ void P_CalcChasePostImg(player_t *player, camera_t *thiscam) player_flipcam = cv_flipcam[pnum].value; } - const boolean flipcam = (player_flipcam && player->mo->eflags & MFE_VERTICALFLIP && LIKELY(!(player->pflags & PF_NIGHTSMODE))); + const boolean flipcam = (player_flipcam && player->mo->eflags & MFE_VERTICALFLIP && !nightsplayer(player)); UINT8 postimgtype = 0; if (encoremode) @@ -3362,17 +3419,121 @@ boolean P_CameraThinker(player_t *player, camera_t *thiscam, boolean resetcalled return false; } +static void P_CheckCrumblingPlatforms(mobj_t *mobj) +{ + msecnode_t *node; + + if (netgame && mobj->player->spectator) + return; + + for (node = mobj->touching_sectorlist; node; node = node->m_sectorlist_next) + { + ffloor_t *rover; + + for (rover = node->m_sector->ffloors; rover; rover = rover->next) + { + if (!(rover->flags & FF_EXISTS)) + continue; + + if (!(rover->flags & FF_CRUMBLE)) + continue; + + if (mobj->eflags & MFE_VERTICALFLIP) + { + if (P_GetSpecialBottomZ(mobj, sectors + rover->secnum, node->m_sector) != mobj->z + mobj->height) // You nut. + continue; + } + else + { + if (P_GetSpecialTopZ(mobj, sectors + rover->secnum, node->m_sector) != mobj->z) + continue; + } + + EV_StartCrumble(rover->master->frontsector, rover, (rover->flags & FF_FLOATBOB), mobj->player, rover->alpha, !(rover->flags & FF_NORETURN)); + } + } +} + +static boolean P_MobjTouchesSectorWithWater(mobj_t *mobj) +{ + msecnode_t *node; + + for (node = mobj->touching_sectorlist; node; node = node->m_sectorlist_next) + { + ffloor_t *rover; + + if (!node->m_sector->ffloors) + continue; + + for (rover = node->m_sector->ffloors; rover; rover = rover->next) + { + if (!(rover->flags & FF_EXISTS)) + continue; + + if (!(rover->flags & FF_SWIMMABLE)) // Is there water? + continue; + + return true; + } + } + + return false; +} + +// Check for floating water platforms and bounce them +static void P_CheckFloatbobPlatforms(mobj_t *mobj) +{ + msecnode_t *node; + + // Can't land on anything if you're not moving downwards + if (P_MobjFlip(mobj)*mobj->momz >= 0) + return; + + if (!P_MobjTouchesSectorWithWater(mobj)) + return; + + for (node = mobj->touching_sectorlist; node; node = node->m_sectorlist_next) + { + ffloor_t *rover; + + if (!node->m_sector->ffloors) + continue; + + for (rover = node->m_sector->ffloors; rover; rover = rover->next) + { + if (!(rover->flags & FF_EXISTS)) + continue; + + if (!(rover->flags & FF_FLOATBOB)) + continue; + + + if (mobj->eflags & MFE_VERTICALFLIP) + { + if (abs(*rover->bottomheight - (mobj->z + mobj->height)) > abs(mobj->momz)) + continue; + } + else + { + if (abs(*rover->topheight - mobj->z) > abs(mobj->momz)) // The player is landing on the cheese! + continue; + } + + // Initiate a 'bouncy' elevator function which slowly diminishes. + EV_BounceSector(rover->master->frontsector, -mobj->momz, rover->master); + } + } // Ugly ugly billions of braces! Argh! +} + // // P_PlayerMobjThinker // static void P_PlayerMobjThinker(mobj_t *mobj) { - msecnode_t *node; - I_Assert(mobj->player != NULL); I_Assert(!P_MobjWasRemoved(mobj)); - if (!mobj) + if (P_MobjWasRemovedCompat(mobj)) return; P_MobjCheckWater(mobj); @@ -3395,7 +3556,7 @@ static void P_PlayerMobjThinker(mobj_t *mobj) P_CheckPosition(mobj, mobj->x, mobj->y); goto animonly; } - else if (UNLIKELY(mobj->player->pflags & PF_MACESPIN)) + else if (mobj->player->pflags & PF_MACESPIN) { P_CheckPosition(mobj, mobj->x, mobj->y); goto animonly; @@ -3415,84 +3576,11 @@ static void P_PlayerMobjThinker(mobj_t *mobj) else P_TryMove(mobj, mobj->x, mobj->y, true); - if (!(netgame && mobj->player->spectator)) - { - // Crumbling platforms - for (node = mobj->touching_sectorlist; node; node = node->m_sectorlist_next) - { - ffloor_t *rover; + // Crumbling platforms + P_CheckCrumblingPlatforms(mobj); - for (rover = node->m_sector->ffloors; rover; rover = rover->next) - { - boolean oncrumble; - - if (!(rover->flags & FF_EXISTS) || !(rover->flags & FF_CRUMBLE)) - continue; - - if (mobj->eflags & MFE_VERTICALFLIP) - { - oncrumble = P_GetSpecialBottomZ(mobj, sectors + rover->secnum, node->m_sector) == mobj->z + mobj->height; // You nut. - } - else - { - oncrumble = P_GetSpecialTopZ(mobj, sectors + rover->secnum, node->m_sector) == mobj->z; - } - - if (oncrumble) - EV_StartCrumble(rover->master->frontsector, rover, (rover->flags & FF_FLOATBOB), mobj->player, rover->alpha, !(rover->flags & FF_NORETURN)); - } - } - } - - // Check for floating water platforms and bounce them - if (CheckForFloatBob && P_MobjFlip(mobj)*mobj->momz < 0) - { - boolean thereiswater = false; - - for (node = mobj->touching_sectorlist; node; node = node->m_sectorlist_next) - { - if (!node->m_sector->ffloors) - continue; - - ffloor_t *rover; - // Get water boundaries first - for (rover = node->m_sector->ffloors; rover; rover = rover->next) - { - if (!(rover->flags & FF_EXISTS)) - continue; - - if (rover->flags & FF_SWIMMABLE) // Is there water? - { - thereiswater = true; - break; - } - } - } - - if (thereiswater) - { - for (node = mobj->touching_sectorlist; node; node = node->m_sectorlist_next) - { - if (!node->m_sector->ffloors) - continue; - - ffloor_t *rover; - for (rover = node->m_sector->ffloors; rover; rover = rover->next) - { - if (!(rover->flags & FF_EXISTS) || !(rover->flags & FF_FLOATBOB)) - continue; - - if ((!(mobj->eflags & MFE_VERTICALFLIP) && abs(*rover->topheight-mobj->z) <= abs(mobj->momz)) // The player is landing on the cheese! - || (mobj->eflags & MFE_VERTICALFLIP && abs(*rover->bottomheight-(mobj->z+mobj->height)) <= abs(mobj->momz))) - { - // Initiate a 'bouncy' elevator function - // which slowly diminishes. - EV_BounceSector(rover->master->frontsector, -mobj->momz, rover->master); - } - } - } - } // Ugly ugly billions of braces! Argh! - } + if (CheckForFloatBob) + P_CheckFloatbobPlatforms(mobj); // always do the gravity bit now, that's simpler // BUT CheckPosition only if wasn't done before. @@ -3509,7 +3597,7 @@ static void P_PlayerMobjThinker(mobj_t *mobj) } else { - if (LIKELY(!(mobj->player->pflags & PF_NIGHTSMODE))) // "jumping" is used for drilling + if (!nightsplayer(mobj->player)) // "jumping" is used for drilling mobj->player->jumping = 0; mobj->player->pflags &= ~PF_JUMPED; @@ -5161,9 +5249,9 @@ static void P_Boss9Thinker(mobj_t *mobj) { // Stunned after vector form if (mobj->movedir > ANGLE_180) - mobj->angle -= FixedAngle(FixedMul(AngleFixed(InvAngle(mobj->movedir)),FixedDiv(mobj->reactiontime<angle -= FixedAngle(FixedMul(AngleFixed(InvAngle(mobj->movedir)), FixedDiv(mobj->reactiontime<angle += FixedAngle(FixedMul(AngleFixed(mobj->movedir),FixedDiv(mobj->reactiontime<angle += FixedAngle(FixedMul(AngleFixed(mobj->movedir), FixedDiv(mobj->reactiontime<reactiontime--; @@ -5205,99 +5293,99 @@ static void P_Boss9Thinker(mobj_t *mobj) // It's time to attack! What are we gonna do?! switch(mobj->movecount) { - case 0: - default: - // Fly up and prepare for an attack! - // We have to charge up first, so let's go up into the air - P_SetMobjState(mobj, mobj->info->raisestate); - if (mobj->floorz >= mobj->target->floorz) - mobj->watertop = mobj->floorz + 256*FRACUNIT; - else - mobj->watertop = mobj->target->floorz + 256*FRACUNIT; - break; - - case 1: - { - // Okay, we're up? Good, time to gather energy... - if (mobj->health > mobj->info->damage) - { // No more bubble if we're broken (pinch phase) - mobj_t *shield = P_SpawnMobj(mobj->x, mobj->y, mobj->z, MT_MSSHIELD_FRONT); - P_SetTarget(&mobj->tracer, shield); - P_SetTarget(&shield->target, mobj); - } - else - P_LinedefExecute(LE_PINCHPHASE, mobj, NULL); - mobj->fuse = 4*TICRATE; - mobj->flags |= MF_PAIN; - if (mobj->info->attacksound) - S_StartSound(mobj, mobj->info->attacksound); - A_FaceTarget(mobj); - break; - } - - case 2: - // We're all charged and ready now! Unleash the fury!! - if (mobj->health > mobj->info->damage) - { - mobj_t *removemobj = mobj->tracer; - P_SetTarget(&mobj->tracer, mobj->hnext); - P_RemoveMobj(removemobj); - } - if (mobj->health <= mobj->info->damage) - { - // Attack 1: Pinball dash! - if (mobj->health == 1) - mobj->movedir = 0; + case 0: + default: + // Fly up and prepare for an attack! + // We have to charge up first, so let's go up into the air + P_SetMobjState(mobj, mobj->info->raisestate); + if (mobj->floorz >= mobj->target->floorz) + mobj->watertop = mobj->floorz + 256*FRACUNIT; else - mobj->movedir = 2; - if (mobj->info->seesound) - S_StartSound(mobj, mobj->info->seesound); - P_SetMobjState(mobj, mobj->info->seestate); - if (mobj->movedir == 2) - mobj->threshold = 16; // bounce 16 times - else - mobj->threshold = 32; // bounce 32 times - mobj->watertop = mobj->target->floorz + 16*FRACUNIT; - P_LinedefExecute(LE_PINCHPHASE, mobj, NULL); - } - else + mobj->watertop = mobj->target->floorz + 256*FRACUNIT; + break; + + case 1: { - // Attack 2: Energy shot! - mobj->movedir = 1; - - if (mobj->health >= 8) - mobj->extravalue1 = 0; - else if (mobj->health >= 5) - mobj->extravalue1 = 2; - else if (mobj->health >= 4) - mobj->extravalue1 = 1; - else - mobj->extravalue1 = 3; - - switch(mobj->extravalue1) - { - case 0: // shoot once - case 2: // spread-shot - default: - mobj->threshold = 2; - break; - case 1: // shoot 3 times - mobj->threshold = 3*2; - break; - case 3: // shoot like a goddamn machinegun - mobj->threshold = 8*2; - break; + // Okay, we're up? Good, time to gather energy... + if (mobj->health > mobj->info->damage) + { // No more bubble if we're broken (pinch phase) + mobj_t *shield = P_SpawnMobj(mobj->x, mobj->y, mobj->z, MT_MSSHIELD_FRONT); + P_SetTarget(&mobj->tracer, shield); + P_SetTarget(&shield->target, mobj); } + else + P_LinedefExecute(LE_PINCHPHASE, mobj, NULL); + mobj->fuse = 4*TICRATE; + mobj->flags |= MF_PAIN; + if (mobj->info->attacksound) + S_StartSound(mobj, mobj->info->attacksound); + A_FaceTarget(mobj); + break; } - break; - case 3: - // Return to idle. - mobj->watertop = mobj->target->floorz + 32*FRACUNIT; - P_SetMobjState(mobj, mobj->info->spawnstate); - mobj->flags &= ~MF_PAIN; - mobj->fuse = 10*TICRATE; - break; + case 2: + // We're all charged and ready now! Unleash the fury!! + if (mobj->health > mobj->info->damage) + { + mobj_t *removemobj = mobj->tracer; + P_SetTarget(&mobj->tracer, mobj->hnext); + P_RemoveMobj(removemobj); + } + if (mobj->health <= mobj->info->damage) + { + // Attack 1: Pinball dash! + if (mobj->health == 1) + mobj->movedir = 0; + else + mobj->movedir = 2; + if (mobj->info->seesound) + S_StartSound(mobj, mobj->info->seesound); + P_SetMobjState(mobj, mobj->info->seestate); + if (mobj->movedir == 2) + mobj->threshold = 16; // bounce 16 times + else + mobj->threshold = 32; // bounce 32 times + mobj->watertop = mobj->target->floorz + 16*FRACUNIT; + P_LinedefExecute(LE_PINCHPHASE, mobj, NULL); + } + else + { + // Attack 2: Energy shot! + mobj->movedir = 1; + + if (mobj->health >= 8) + mobj->extravalue1 = 0; + else if (mobj->health >= 5) + mobj->extravalue1 = 2; + else if (mobj->health >= 4) + mobj->extravalue1 = 1; + else + mobj->extravalue1 = 3; + + switch (mobj->extravalue1) + { + case 0: // shoot once + case 2: // spread-shot + default: + mobj->threshold = 2; + break; + case 1: // shoot 3 times + mobj->threshold = 3*2; + break; + case 3: // shoot like a goddamn machinegun + mobj->threshold = 8*2; + break; + } + } + break; + + case 3: + // Return to idle. + mobj->watertop = mobj->target->floorz + 32*FRACUNIT; + P_SetMobjState(mobj, mobj->info->spawnstate); + mobj->flags &= ~MF_PAIN; + mobj->fuse = 10*TICRATE; + break; } mobj->movecount++; mobj->movecount %= 4; @@ -5315,6 +5403,7 @@ static void P_Boss9Thinker(mobj_t *mobj) // Face your target angle = R_PointToAngle2(mobj->x, mobj->y, mobj->target->x, mobj->target->y); // absolute angle angle = (angle-mobj->angle); // relative angle + if (angle < ANGLE_180) mobj->angle += angle/8; else @@ -5326,18 +5415,19 @@ static void P_Boss9Thinker(mobj_t *mobj) || mobj->target->player->powers[pw_invulnerability] || mobj->target->player->powers[pw_super])) danger = false; - if (mobj->target->x+mobj->target->radius+abs(mobj->target->momx*2) < mobj->x-mobj->radius) + else if (mobj->target->x+mobj->target->radius+abs(mobj->target->momx*2) < mobj->x-mobj->radius) danger = false; - if (mobj->target->x-mobj->target->radius-abs(mobj->target->momx*2) > mobj->x+mobj->radius) + else if (mobj->target->x-mobj->target->radius-abs(mobj->target->momx*2) > mobj->x+mobj->radius) danger = false; - if (mobj->target->y+mobj->target->radius+abs(mobj->target->momy*2) < mobj->y-mobj->radius) + else if (mobj->target->y+mobj->target->radius+abs(mobj->target->momy*2) < mobj->y-mobj->radius) danger = false; - if (mobj->target->y-mobj->target->radius-abs(mobj->target->momy*2) > mobj->y+mobj->radius) + else if (mobj->target->y-mobj->target->radius-abs(mobj->target->momy*2) > mobj->y+mobj->radius) danger = false; - if (mobj->target->z+mobj->target->height+mobj->target->momz*2 < mobj->z) + else if (mobj->target->z+mobj->target->height+mobj->target->momz*2 < mobj->z) danger = false; - if (mobj->target->z+mobj->target->momz*2 > mobj->z+mobj->height) + else if (mobj->target->z+mobj->target->momz*2 > mobj->z+mobj->height) danger = false; + if (danger) { // An incoming attack is detected! What should we do?! @@ -5345,21 +5435,27 @@ static void P_Boss9Thinker(mobj_t *mobj) mobj->movedir = ANGLE_11hh - FixedAngle(FixedMul(AngleFixed(ANGLE_11hh), FixedDiv((mobj->info->spawnhealth - mobj->health)<info->spawnhealth-1)<movedir = InvAngle(mobj->movedir); + mobj->threshold = 6 + (FixedMul(24<info->spawnhealth - mobj->health)<info->spawnhealth-1)<>FRACBITS); + if (mobj->info->activesound) S_StartSound(mobj, mobj->info->activesound); if (mobj->info->painchance) P_SetMobjState(mobj, mobj->info->painchance); + return; } // Move normally: Approach the player using normal thrust and simulated friction. dist = P_AproxDistance(mobj->x-mobj->target->x, mobj->y-mobj->target->y); + P_Thrust(mobj, R_PointToAngle2(0, 0, mobj->momx, mobj->momy), -3*FRACUNIT/8); + if (dist < 64*FRACUNIT) P_Thrust(mobj, mobj->angle, -4*FRACUNIT); else if (dist > 180*FRACUNIT) P_Thrust(mobj, mobj->angle, FRACUNIT); + mobj->momz += P_AproxDistance(mobj->momx, mobj->momy)/12; // Move up higher the faster you're going. } } @@ -5614,7 +5710,7 @@ void P_SetScale(mobj_t *mobj, fixed_t newscale) player_t *player; fixed_t oldscale; - if (!mobj) + if (P_MobjWasRemovedCompat(mobj)) return; oldscale = mobj->scale; //keep for adjusting stuff below @@ -6853,11 +6949,9 @@ static boolean P_MobjDeadThink(mobj_t *mobj) case MT_BANANA: if (cv_bananthrowroll.value) { - //mobj->angle -= spin; - if (cv_bananthrowroll.value == 1 && K_CheckSlopeRollDist(mobj)) - mobj->sloperoll += (angle_t)FixedMul(FixedDiv(abs(mobj->momz), 8 * mobj->scale), ANGLE_67h); // im lazy but this makes sure the banan goes back to upright when it lands lmao - else if (cv_bananthrowroll.value == 2) - mobj->rollangle += (angle_t)FixedMul(FixedDiv(abs(mobj->momz), 8 * mobj->scale), ANGLE_67h); + const angle_t speen = (angle_t)FixedMul(FixedDiv(abs(mobj->momz), 8 * mobj->scale), ANGLE_67h); + //mobj->angle -= speen; + mobj->rollangle += speen; } /* FALLTHRU */ case MT_ORBINAUT: @@ -7047,7 +7141,7 @@ static boolean P_MobjRegularThink(mobj_t *mobj) } P_InstaThrust(mobj, mobj->angle, finalspeed); - + if (grounded) { sector_t *sec2 = P_ThingOnSpecial3DFloor(mobj); @@ -7167,32 +7261,42 @@ static boolean P_MobjRegularThink(mobj_t *mobj) } case MT_BANANA: case MT_EGGMANITEM: - if (cv_bananthrowroll.value && !P_IsObjectOnGround(mobj)) + { + boolean grounded = P_IsObjectOnGround(mobj); + + // rotate thrown eggboxes and bananas mid air! + if (cv_bananthrowroll.value && !grounded) { // tilt n tumble - //mobj->angle += spin; - - if (cv_bananthrowroll.value == 1 && K_CheckSlopeRollDist(mobj)) - mobj->sloperoll -= (angle_t)FixedMul(FixedDiv(mobj->momz, 8 * mobj->scale), ANGLE_67h); // im lazy but this makes sure the banan goes back to upright when it lands lmao - else if (cv_bananthrowroll.value == 2) - mobj->rollangle -= (angle_t)FixedMul(FixedDiv(mobj->momz, 8 * mobj->scale), ANGLE_67h); + const angle_t speen = (angle_t)FixedMul(FixedDiv(abs(mobj->momz), 8 * mobj->scale), ANGLE_67h); + //mobj->angle += speen; + mobj->rollangle -= speen; } mobj->friction = ORIG_FRICTION/4; + if (mobj->momx || mobj->momy) P_SpawnGhostMobj(mobj); - if (P_IsObjectOnGround(mobj) && mobj->health > 1) + + if (grounded && mobj->health > 1) { S_StartSound(mobj, mobj->info->activesound); mobj->momx = mobj->momy = 0; mobj->health = 1; } - P_RollPitchMobj(mobj); + // do not rotate eggman items on slopes + // they are meant to deceive the player + // having them rotated makes them stand out a lot more + // since random items do not roll´n pitch on slopes! + if (mobj->type == MT_BANANA) + P_RollPitchMobj(mobj); if (mobj->threshold > 0) mobj->threshold--; + break; + } case MT_SPB: indirectitemcooldown = 20*TICRATE; /* FALLTHRU */ @@ -8527,7 +8631,7 @@ static boolean P_MobjRegularThink(mobj_t *mobj) if (mobj->tracer && mobj->tracer->player) { - if (LIKELY(!(mobj->tracer->player->pflags & PF_NIGHTSMODE))) + if (!nightsplayer(mobj->tracer->player)) { mobj->flags &= ~MF_NOGRAVITY; mobj->flags2 &= ~MF2_DONTDRAW; @@ -8551,7 +8655,7 @@ static boolean P_MobjRegularThink(mobj_t *mobj) P_SetTarget(&mobj->target, NULL); } - if (UNLIKELY(mobj->tracer->player->pflags & PF_NIGHTSMODE)) + if (nightsplayer(mobj->tracer->player)) { if (mobj->tracer->player->bonustime) { @@ -8663,14 +8767,15 @@ static boolean P_MobjRegularThink(mobj_t *mobj) { const angle_t fa = (i*FINEANGLES/16) & FINEMASK; ns = FixedMul(64 * FRACUNIT, mobj->scale); - x = mobj->x + FixedMul(FINESINE(fa),ns); - y = mobj->y + FixedMul(FINECOSINE(fa),ns); + x = mobj->x + FixedMul(FINESINE(fa), ns); + y = mobj->y + FixedMul(FINECOSINE(fa), ns); mo2 = P_SpawnMobj(x, y, z, MT_EXPLODE); ns = FixedMul(16 * FRACUNIT, mobj->scale); - mo2->momx = FixedMul(FINESINE(fa),ns); - mo2->momy = FixedMul(FINECOSINE(fa),ns); + mo2->momx = FixedMul(FINESINE(fa), ns); + mo2->momy = FixedMul(FINECOSINE(fa), ns); } + z -= FixedMul(32*FRACUNIT, mobj->scale); } P_SetMobjState(mobj, mobj->info->deathstate); @@ -8864,9 +8969,9 @@ static void P_IceBlockFuseThink(mobj_t *mobj) for (i = 0; i < 5; i++) { mobj_t *debris = P_SpawnMobj(mobj->x, mobj->y, mobj->z, MT_SMK_ICEBLOCK_DEBRIS); - debris->angle = FixedAngle(P_RandomRange(0,360)<angle, P_RandomRange(3,18)*(FRACUNIT/4)); - debris->momz = P_RandomRange(4,8)<angle = FixedAngle(P_RandomRange(0, 360)<angle, P_RandomRange(3, 18)*(FRACUNIT/4)); + debris->momz = P_RandomRange(4, 8)<subsector ? mobj->subsector->sector : NULL; - - // 970 allows ANY mobj to trigger a linedef exec - if (UNLIKELY(!mobj->islocal && sec1 && GETSECSPECIAL(sec1->special, 2) == 8)) // BEWARE: islocal does not exist in vanilla + // do NOT trigger linedef executors for "local" mobjs + if (!mobj->islocal) { - sector_t *sec2; - sec2 = P_ThingOnSpecial3DFloor(mobj); - if (sec2 && GETSECSPECIAL(sec2->special, 2) == 1) - P_LinedefExecute(sec2->tag, mobj, sec2); + // 970 allows ANY mobj to trigger a linedef exec + if (mobj->subsector && GETSECSPECIAL(mobj->subsector->sector->special, 2) == 8) + { + sector_t *sec2; + sec2 = P_ThingOnSpecial3DFloor(mobj); + if (sec2 && GETSECSPECIAL(sec2->special, 2) == 1) + P_LinedefExecute(sec2->tag, mobj, sec2); + } } if (mobj->scale != mobj->destscale) @@ -9065,7 +9172,7 @@ void P_MobjThinker(mobj_t *mobj) mobj->frame = (mobj->frame & ~FF_TRANSMASK) | (((NUMTRANSMAPS-1) - mobj->fuse / 2) << FF_TRANSSHIFT); // Special thinker for scenery objects - if (mobj->flags & MF_SCENERY) + if (mobj->flags & MF_SCENERY && !mobj->player) { P_MobjSceneryThink(mobj); return; @@ -9114,7 +9221,7 @@ void P_MobjThinker(mobj_t *mobj) if (mobj->flags2 & MF2_FIRING && mobj->target && mobj->health > 0) P_FiringThink(mobj); - if (UNLIKELY(mobj->flags & MF_AMBIENT)) + if (mobj->flags & MF_AMBIENT) { if (leveltime % mobj->health) return; @@ -9157,7 +9264,8 @@ void P_MobjThinker(mobj_t *mobj) mobj->eflags &= ~MFE_JUSTHITFLOOR; } - if (mobj->type == MT_FALLINGROCK + // Sliding physics for slidey mobjs! + if ( mobj->type == MT_FALLINGROCK || mobj->type == MT_LITTLETUMBLEWEED || mobj->type == MT_BIGTUMBLEWEED || mobj->type == MT_FLINGRING @@ -9167,11 +9275,15 @@ void P_MobjThinker(mobj_t *mobj) || P_WeaponOrPanel(mobj->type)) { P_TryMove(mobj, mobj->x, mobj->y, true); // Sets mo->standingslope correctly + + if (P_MobjWasRemovedCompat(mobj)) // anything that calls checkposition can be lethal + return; + P_ButteredSlope(mobj); } - if (UNLIKELY(mobj->flags & (MF_ENEMY|MF_BOSS) && mobj->health - && P_CheckDeathPitCollide(mobj))) // extra pit check in case these didn't have momz + if (mobj->flags & (MF_ENEMY|MF_BOSS) && mobj->health + && P_CheckDeathPitCollide(mobj)) // extra pit check in case these didn't have momz { P_KillMobj(mobj, NULL, NULL); return; @@ -9180,10 +9292,7 @@ void P_MobjThinker(mobj_t *mobj) // Crush enemies! if (mobj->ceilingz - mobj->floorz < mobj->height) { - if (UNLIKELY(( - (mobj->flags & (MF_ENEMY|MF_BOSS) - && mobj->flags & MF_SHOOTABLE) - || mobj->type == MT_EGGSHIELD)) + if (((mobj->flags & (MF_ENEMY|MF_BOSS) && mobj->flags & MF_SHOOTABLE) || mobj->type == MT_EGGSHIELD) && !(mobj->flags & MF_NOCLIPHEIGHT) && mobj->health > 0) { @@ -9192,27 +9301,33 @@ void P_MobjThinker(mobj_t *mobj) } } + if (P_MobjWasRemovedCompat(mobj)) + return; // obligatory paranoia check + // Can end up here if a player dies. P_CycleMobjState(mobj); if (P_MobjWasRemoved(mobj)) return; - if (UNLIKELY(P_WeaponOrPanel(mobj->type))) + if ((mobj->health == 0) && // Fading tile + (mobj->type == MT_BOUNCEPICKUP + || mobj->type == MT_RAILPICKUP + || mobj->type == MT_AUTOPICKUP + || mobj->type == MT_EXPLODEPICKUP + || mobj->type == MT_SCATTERPICKUP + || mobj->type == MT_GRENADEPICKUP)) { - if (mobj->health == 0) // Fading tile - { - INT32 value = mobj->info->damage/10; - value = mobj->fuse/value; - value = 10-value; - value--; + INT32 value = mobj->info->damage/10; + value = mobj->fuse/value; + value = 10-value; + value--; - if (value <= 0) - value = 1; + if (value <= 0) + value = 1; - mobj->frame &= ~FF_TRANSMASK; - mobj->frame |= value << FF_TRANSSHIFT; - } + mobj->frame &= ~FF_TRANSMASK; + mobj->frame |= value << FF_TRANSSHIFT; } } @@ -9249,25 +9364,29 @@ void P_PushableThinker(mobj_t *mobj) I_Assert(!P_MobjWasRemoved(mobj)); - if (!mobj) - return; - - sec = mobj->subsector->sector; - - if (mobj->z == sec->floorheight && GETSECSPECIAL(sec->special, 2) == 1) - P_LinedefExecute(sec->tag, mobj, sec); + // do NOT trigger linedef executors for "local" mobjs + if (!mobj->islocal) { - sector_t *sec2; + sec = mobj->subsector->sector; - sec2 = P_ThingOnSpecial3DFloor(mobj); - if (sec2 && GETSECSPECIAL(sec2->special, 2) == 1) - P_LinedefExecute(sec2->tag, mobj, sec2); + if (mobj->z == sec->floorheight && GETSECSPECIAL(sec->special, 2) == 1) + P_LinedefExecute(sec->tag, mobj, sec); + { + sector_t *sec2; + + sec2 = P_ThingOnSpecial3DFloor(mobj); + if (sec2 && GETSECSPECIAL(sec2->special, 2) == 1) + P_LinedefExecute(sec2->tag, mobj, sec2); + } } // it has to be pushable RIGHT NOW for this part to happen if (mobj->flags & MF_PUSHABLE && !(mobj->momx || mobj->momy)) P_TryMove(mobj, mobj->x, mobj->y, true); + if (P_MobjWasRemovedCompat(mobj)) + return; + if (mobj->fuse == 1) // it would explode in the MobjThinker code { mobj_t *spawnmo; @@ -9293,7 +9412,8 @@ void P_PushableThinker(mobj_t *mobj) } spawnmo = P_SpawnMobj(x, y, z, mobj->type); - if (spawnmo) + + if (!P_MobjWasRemovedCompat(spawnmo)) { spawnmo->spawnpoint = mobj->spawnpoint; P_UnsetThingPosition(spawnmo); @@ -10082,14 +10202,14 @@ void P_RemoveMobj(mobj_t *mobj) } } // Rings only, please! - else if (UNLIKELY(mobj->spawnpoint && + else if (mobj->spawnpoint && !(mobj->flags2 & MF2_DONTRESPAWN) && (mobj->type == MT_RING || mobj->type == MT_COIN || mobj->type == MT_BLUEBALL || mobj->type == MT_REDTEAMRING || mobj->type == MT_BLUETEAMRING - || P_WeaponOrPanel(mobj->type)))) + || P_WeaponOrPanel(mobj->type))) { itemrespawnque[iquehead] = mobj->spawnpoint; itemrespawntime[iquehead] = leveltime; diff --git a/src/p_mobj.h b/src/p_mobj.h index 682b2fb1b..c348c925c 100644 --- a/src/p_mobj.h +++ b/src/p_mobj.h @@ -298,6 +298,7 @@ typedef struct mobj_s angle_t angle, pitch, roll; // orientation angle_t old_angle, old_pitch, old_roll; // orientation interpolation angle_t rollangle; + angle_t temprollangle; // same as rollangle but resets each tic, idk either man. // cba exposing this to lua either spritenum_t sprite; // used to find patch_t and flip value UINT32 frame; // frame number, plus bits see p_pspr.h UINT16 anim_duration; // for FF_ANIMATE states diff --git a/src/p_saveg.c b/src/p_saveg.c index 667ee5c47..1b7f21c47 100644 --- a/src/p_saveg.c +++ b/src/p_saveg.c @@ -691,7 +691,7 @@ static void ArchiveLines(savebuffer_t *save) if (spawnli->special == 321 || spawnli->special == 322) // only reason li->callcount would be non-zero is if either of these are involved diff |= LD_CLLCOUNT; - if (li->sidenum[0] != 0xffff) + if (li->sidenum[0] != NO_INDEX) { si = &sides[li->sidenum[0]]; spawnsi = &spawnsides[li->sidenum[0]]; @@ -706,7 +706,8 @@ static void ArchiveLines(savebuffer_t *save) if (si->midtexture != spawnsi->midtexture) diff |= LD_S1MIDTEX; } - if (li->sidenum[1] != 0xffff) + + if (li->sidenum[1] != NO_INDEX) { si = &sides[li->sidenum[1]]; spawnsi = &spawnsides[li->sidenum[1]]; @@ -786,6 +787,7 @@ static void UnArchiveFFloors(savebuffer_t *save, const sector_t *ss) I_Error("Sector does not have any ffloors!"); fflr_i = READUINT16(save->p); // get first modified ffloor's number ready + for (;;) // for some reason the usual for (rover = x; ...) thing doesn't work here? { if (fflr_i == 0xffff) // end of modified ffloors list, let's stop already @@ -3057,7 +3059,7 @@ static void P_NetUnArchiveThinkers(savebuffer_t *save) break; default: - I_Error("P_UnarchiveSpecials: Unknown tclass %d in savegame", tclass); + I_Error("P_NetUnArchiveThinkers: Unknown tclass %d in savegame", tclass); } } @@ -3168,7 +3170,7 @@ FUNCINLINE static ATTRINLINE void P_UnArchivePolyObjects(savebuffer_t *save) numSavedPolys = READINT32(save->p); if (numSavedPolys != numPolyObjects) - I_Error("P_UnArchivePolyObjects: polyobj count inconsistency\n"); + I_Error("P_UnArchivePolyObjects: polyobj count inconsistency (expected %d, got %d)\n", numPolyObjects, numSavedPolys); for (i = 0; i < numSavedPolys; ++i) P_UnArchivePolyObj(save, &PolyObjects[i]); @@ -3510,7 +3512,7 @@ static void P_ReloadSaveLevelData(void) li->firsttag = spawnli->firsttag; li->nexttag = spawnli->nexttag; - if (li->sidenum[0] != 0xffff) + if (li->sidenum[0] != NO_INDEX) { si = &sides[li->sidenum[0]]; spawnsi = &spawnsides[li->sidenum[0]]; @@ -3521,7 +3523,7 @@ static void P_ReloadSaveLevelData(void) si->midtexture = spawnsi->midtexture; } - if (li->sidenum[1] != 0xffff) + if (li->sidenum[1] != NO_INDEX) { si = &sides[li->sidenum[1]]; spawnsi = &spawnsides[li->sidenum[1]]; @@ -3588,8 +3590,11 @@ FUNCINLINE static ATTRINLINE boolean P_NetUnArchiveMisc(savebuffer_t *save, bool if (!P_SetupLevel(true, reloading)) { CONS_Alert(CONS_ERROR, M_GetText("Can't load the level!\n")); + P_FreeCorruptMapWarnings(); return false; } + + P_PrintCorruptMapWarnings(); } else { diff --git a/src/p_setup.c b/src/p_setup.c index afc53234b..c878d35d4 100644 --- a/src/p_setup.c +++ b/src/p_setup.c @@ -117,6 +117,7 @@ line_t *spawnlines = NULL; side_t *spawnsides = NULL; INT32 numstarposts = 0; boolean levelloading = false; +UINT8 levelfadecol = 120; virtres_t *curmapvirt = NULL; @@ -188,6 +189,57 @@ FUNCNORETURN static ATTRNORETURN void CorruptMapError(const char *msg) I_Error("Invalid or corrupt map.\nLook in log file or text console for technical details."); } +static char **mapwarnings = NULL; +static size_t nummapwarnings = 0; + +// collect map errors we can fix clientside +// we then can print em when the map finishes loading +// so they actually appear and raise awareness shits fucked +// see G_DoLoadLevel as to why :chaosleep: +static void CorruptMapWarning(const char *msg) +{ +#ifdef PARANOIA + // just error out + I_Error("%sThis WILL crash Vanilla clients!\n", msg); +#endif + nummapwarnings++; + mapwarnings = Z_Realloc(mapwarnings, nummapwarnings * sizeof(*mapwarnings), PU_STATIC, NULL); + mapwarnings[nummapwarnings-1] = Z_StrDup(msg); +} + +void P_PrintCorruptMapWarnings(void) +{ + size_t i; + + if (!nummapwarnings) + return; + + for (i = 0; i < nummapwarnings; i++) + { + CONS_Alert(CONS_ERROR, "%sAttempting to fix... This WILL crash Vanilla clients!\n", mapwarnings[i]); + } + + P_FreeCorruptMapWarnings(); +} + +void P_FreeCorruptMapWarnings(void) +{ + size_t i; + + if (!nummapwarnings) + return; + + for (i = 0; i < nummapwarnings; i++) + { + Z_Free(mapwarnings[i]); + mapwarnings[i] = NULL; + } + + Z_Free(mapwarnings); + mapwarnings = NULL; + nummapwarnings = 0; +} + #define NUMLAPS_DEFAULT 3 static void P_ClearMapHeaderLighting(mapheader_lighting_t *lighting) @@ -266,15 +318,15 @@ void P_AllocMapHeader(INT16 i) // Loads the vertexes for a level. FUNCINLINE static ATTRINLINE void P_LoadVertices(UINT8 *data) { - mapvertex_t *ml = (mapvertex_t *)data; - vertex_t *li = vertexes; + mapvertex_t *mv = (mapvertex_t *)data; + vertex_t *v = vertexes; size_t i; // Copy and convert vertex coordinates, internal representation as fixed. - for (i = 0; i < numvertexes; i++, li++, ml++) + for (i = 0; i < numvertexes; i++, v++, mv++) { - li->x = SHORT(ml->x)<y = SHORT(ml->y)<x = SHORT(mv->x)<y = SHORT(mv->y)<light_contrast = M_RandomRange(0, 58); + lighting->light_contrast = (UINT8)M_RandomRange(0, 58); lighting->sprite_backlight = 0; - lighting->use_light_angle = M_RandomRange(0, 1); // either on or off - lighting->light_angle = M_RandomRange(-382, 382); + lighting->use_light_angle = (boolean)M_RandomRange(0, 1); // either on or off + lighting->light_angle = (angle_t)M_RandomRange(-382, 382); reinitmaplight = false; } @@ -427,44 +479,128 @@ static void P_SetupDirectionalLight(void) static void P_LoadSegs(UINT8 *data) { INT32 rawlinedef, rawside; - mapseg_t *ml = (mapseg_t*)data; - seg_t *li = segs; + mapseg_t *ms = (mapseg_t*)data; + seg_t *seg = segs; line_t *ldef; size_t i; // Set map lighting settings. P_SetupDirectionalLight(); - for (i = 0; i < numsegs; i++, li++, ml++) + for (i = 0; i < numsegs; i++, seg++, ms++) { - li->v1 = &vertexes[SHORT(ml->v1)]; - li->v2 = &vertexes[SHORT(ml->v2)]; + INT16 v1, v2; + + v1 = SHORT(ms->v1); + v2 = SHORT(ms->v2); + + // e6y + // moved down for additional checks to avoid overflow + // if wrong vertexe's indexes are in SEGS lump + // see below for more detailed information + + seg->angle = (SHORT(ms->angle)) << FRACBITS; + seg->offset = (SHORT(ms->offset)) << FRACBITS; + + rawlinedef = SHORT(ms->linedef); + + //e6y: check for wrong indexes + if ((unsigned)rawlinedef >= numlines) + { + I_Error("P_LoadSegs: seg %s references a non-existent linedef %d", sizeu1(i), (unsigned)rawlinedef); + } + + ldef = &lines[rawlinedef]; + seg->linedef = ldef; + rawside = SHORT(ms->side); + + //e6y: fix wrong side index + if (rawside != 0 && rawside != 1) + { + CorruptMapWarning(va("P_LoadSegs: seg %s contains wrong side index %d.\n", sizeu1(i), rawside)); + rawside = 1; + } + + //e6y: check for wrong indexes + if (ldef->sidenum[rawside] >= numsides) + { + I_Error("P_LoadSegs: linedef %d for seg %s references a non-existent sidedef %d", rawlinedef, sizeu1(i), ldef->sidenum[rawside]); + } + + seg->side = rawside; + + seg->sidedef = &sides[ldef->sidenum[rawside]]; + + /* cph 2006/09/30 - our frontsector can be the second side of the + * linedef, so must check for NO_INDEX in case we are incorrectly + * referencing the back of a 1S line */ + if (ldef->sidenum[rawside] == NO_INDEX) + { + CorruptMapWarning(va("P_LoadSegs: front of seg %s has no sidedef\n", sizeu1(i))); + seg->frontsector = NULL; + } + else + { + seg->frontsector = sides[ldef->sidenum[rawside]].sector; + } + + if (ldef->flags & ML_TWOSIDED) + { + if (ldef->sidenum[rawside^1] == NO_INDEX) + { + CorruptMapWarning(va("P_LoadSegs: back of seg %s has no sidedef while being marked as double sided\n", sizeu1(i))); + seg->backsector = NULL; + } + else + { + seg->backsector = sides[ldef->sidenum[rawside^1]].sector; + } + } + + // e6y + // check and fix wrong references to non-existent vertexes + // see e1m9 @ NIVELES.WAD + // http://www.doomworld.com/idgames/index.php?id=12647 + if ((unsigned)v1 >= numvertexes || (unsigned)v2 >= numvertexes) + { + if ((unsigned)v1 >= numvertexes) + CorruptMapWarning(va("P_LoadSegs: seg %s references a non-existent vertex %d\n", sizeu1(i), v1)); + if ((unsigned)v2 >= numvertexes) + CorruptMapWarning(va("P_LoadSegs: seg %s references a non-existent vertex %d\n", sizeu1(i), v2)); + + if (seg->sidedef == &sides[seg->linedef->sidenum[0]]) + { + seg->v1 = lines[ms->linedef].v1; + seg->v2 = lines[ms->linedef].v2; + } + else + { + seg->v1 = lines[ms->linedef].v2; + seg->v2 = lines[ms->linedef].v1; + } + } + else + { + seg->v1 = &vertexes[v1]; + seg->v2 = &vertexes[v2]; + } + #ifdef HWRENDER if (rendermode == render_opengl) { - li->fv1.x = FixedToFloat(li->v1->x); - li->fv1.y = FixedToFloat(li->v1->y); - //li->fv1.z = FixedToFloat(li->v1->z); // z is unused in gl + seg->fv1.x = FixedToFloat(seg->v1->x); + seg->fv1.y = FixedToFloat(seg->v1->y); + //seg->fv1.z = FixedToFloat(seg->v1->z); // z is unused in gl - li->fv2.x = FixedToFloat(li->v2->x); - li->fv2.y = FixedToFloat(li->v2->y); - //li->fv2.z = FixedToFloat(li->v2->z); + seg->fv2.x = FixedToFloat(seg->v2->x); + seg->fv2.y = FixedToFloat(seg->v2->y); + //seg->fv2.z = FixedToFloat(seg->v2->z); } #endif - li->length = P_SegLength(li); - li->angle = (SHORT(ml->angle))<offset = (SHORT(ml->offset))<linedef); - ldef = &lines[rawlinedef]; - li->linedef = ldef; - li->side = rawside = SHORT(ml->side); - li->sidedef = &sides[ldef->sidenum[rawside]]; - li->frontsector = sides[ldef->sidenum[rawside]].sector; - if (ldef->flags & ML_TWOSIDED) - li->backsector = sides[ldef->sidenum[rawside^1]].sector; + seg->length = P_SegLength(seg); - P_UpdateSegLightOffset(li); + P_UpdateSegLightOffset(seg); } } @@ -482,10 +618,6 @@ FUNCINLINE static ATTRINLINE void P_LoadSubsectors(void *data) } } -// -// P_LoadSectors -// - // // levelflats // @@ -537,13 +669,17 @@ static void P_CheckCyanFlat(levelflat_t *levelflat) const char *flatname = W_CheckNameForNum(levelflat->lumpnum); // hack for gba rainbow roads cyan floors - if (UNLIKELY(memcmp(flatname, "GBA_RRF5", 8) == 0 && flatname[8] == 0)) + if (UNLIKELY(flatname && memcmp(flatname, "GBA_RRF5", 8) == 0 && flatname[8] == 0)) { levelflat->cyan = false; return; } const UINT8 *flat = R_GetFlat(levelflat->lumpnum); + + if (!flat) + return; + const size_t size = W_LumpLength(levelflat->lumpnum); for (size_t steppy = 0; steppy < size; steppy++) @@ -663,6 +799,10 @@ INT32 P_CheckLevelFlat(const char *flatname) return (INT32)i; } +// +// P_LoadSectors +// + static const sector_t sector_default = { .nexttag = -1, .firsttag = -1, @@ -738,7 +878,33 @@ static void P_LoadNodes(UINT8 *data) for (j = 0; j < 2; j++) { - no->children[j] = SHORT(mn->children[j]); + UINT16 child; + + child = SHORT(mn->children[j]); + + if (child & NF_SUBSECTOR) + { + // Convert to extended type + child &= ~NF_SUBSECTOR; + + // haleyjd 11/06/10: check for invalid subsector reference + if (child >= numsubsectors) + { + CorruptMapWarning(va("P_LoadNodes: BSP tree %s references invalid subsector %d\n", sizeu1(i), child)); + child = 0; + } + + child |= NF_SUBSECTOR; + } + else if (child >= numnodes) + { + CorruptMapWarning(va("P_LoadNodes: BSP node %s references invalid node.\n", sizeu1(i))); + //I_Error("P_LoadNodes: BSP node %d references invalid node %d.\n", sizeu1(i), Index(((node_t *)no->children[j]))); + child = 0; + } + + no->children[j] = child; + for (k = 0; k < 4; k++) no->bbox[j][k] = SHORT(mn->bbox[j][k])<x<y<z<type) + if (mt->type == 1700 || // MT_AXIS + mt->type == 1701 || // MT_AXISTRANSFER + mt->type == 1702) // MT_AXISTRANSFERLINE { - case 1700: // MT_AXIS - case 1701: // MT_AXISTRANSFER - case 1702: // MT_AXISTRANSFERLINE - mt->mobj = NULL; - P_SpawnMapThing(mt); - break; - default: - break; + mt->mobj = NULL; + P_SpawnMapThing(mt); } } for (i = 0, mt = mapthings; i < nummapthings; i++, mt++) { - sector_t *mtsector = R_PointInSubsector((mt->x << FRACBITS), (mt->y << FRACBITS))->sector; + sector_t *mtsector; + + // srb2kart - ignore rings, coins and item patterns! + if (mt->type == 300 || mt->type == 308 || mt->type == 309 || + (mt->type >= 600 && mt->type <= 609) || + mt->type == 1706 || mt->type == 1800) + { + mt->mobj = NULL; + continue; + } + + mtsector = R_PointInSubsector((mt->x << FRACBITS), (mt->y << FRACBITS))->sector; // Z for objects mt->z = (INT16)(P_GetSectorFloorZAt(mtsector, (mt->x << FRACBITS), (mt->y << FRACBITS))) >> FRACBITS; - if (mt->type == 1700 // MT_AXIS - || mt->type == 1701 // MT_AXISTRANSFER - || mt->type == 1702) // MT_AXISTRANSFERLINE + if (mt->type == 1700 || // MT_AXIS + mt->type == 1701 || // MT_AXISTRANSFER + mt->type == 1702) // MT_AXISTRANSFERLINE + { continue; // These were already spawned + } + + mt->mobj = NULL; + + // spawn hoops + if (mt->type == 1705 || mt->type == 1713) + { + // Check for spawnhoops here so the hoops don't spawn ghost variants for players joining a netgame mid-level + // ...It's a long story. + if (spawnhoops) + { + // Z for objects Tails 05-26-2002 + mt->z = (INT16)(mtsector->floorheight >> FRACBITS); + + P_SpawnHoops(mt); + } + + continue; + } if (mt->type == mobjinfo[MT_RANDOMITEM].doomednum) nummapboxes++; - mt->mobj = NULL; + // Everything else P_SpawnMapThing(mt); } // random emeralds for hunt if (numhuntemeralds) - { - INT32 emer1, emer2, emer3; - INT32 timeout = 0; // keeps from getting stuck - - emer1 = emer2 = emer3 = 0; - - //increment spawn numbers because zero is valid. - emer1 = (P_RandomKey(numhuntemeralds)) + 1; - while (timeout++ < 100) - { - emer2 = (P_RandomKey(numhuntemeralds)) + 1; - - if (emer2 != emer1) - break; - } - - timeout = 0; - while (timeout++ < 100) - { - emer3 = (P_RandomKey(numhuntemeralds)) + 1; - - if (emer3 != emer2 && emer3 != emer1) - break; - } - - //decrement spawn values to the actual number because zero is valid. - if (emer1) - P_SpawnMobj(huntemeralds[emer1 - 1]->x<y<z<x<y<z<x<y<z<type == 300 || mt->type == 308 || mt->type == 309 - || mt->type == 1706 || (mt->type >= 600 && mt->type <= 609) - || mt->type == 1705 || mt->type == 1713 || mt->type == 1800) - { - mt->mobj = NULL; - - // Z for objects Tails 05-26-2002 - mt->z = (INT16)(R_PointInSubsector(mt->x << FRACBITS, mt->y << FRACBITS)->sector->floorheight>>FRACBITS); - - P_SpawnHoops(mt); - } - } + P_SpawnEmeraldHunt(); } static void P_SpawnEmblems(boolean loademblems) @@ -881,22 +1059,22 @@ static void P_SpawnEmblems(boolean loademblems) for (i = 0; i < numemblems; i++) { - if (emblemlocations[i].level != gamemap || emblemlocations[i].type > ET_SKIN) + const emblem_t *emblemlocation = &emblemlocations[i]; + + if (emblemlocation->level != gamemap || emblemlocation->type > ET_SKIN) continue; - emblemmobj = P_SpawnMobj(emblemlocations[i].x<x<y<z<= 'A' && emblemlocations[i].sprite <= 'Z'); - P_SetMobjStateNF(emblemmobj, emblemmobj->info->spawnstate + (emblemlocations[i].sprite - 'A')); + I_Assert(emblemlocation->sprite >= 'A' && emblemlocation->sprite <= 'Z'); + P_SetMobjStateNF(emblemmobj, emblemmobj->info->spawnstate + (emblemlocation->sprite - 'A')); emblemmobj->health = i+1; color = M_GetEmblemColor(&emblemlocations[i]); emblemmobj->color = (UINT8)color; - if (emblemlocations[i].collected - || (emblemlocations[i].type == ET_SKIN && emblemlocations[i].var != players[0].skin)) + if (emblemlocation->collected || (emblemlocation->type == ET_SKIN && emblemlocation->var != players[0].skin)) { P_UnsetThingPosition(emblemmobj); emblemmobj->flags |= MF_NOCLIP; @@ -1001,9 +1179,9 @@ static void P_InitializeLinedef(line_t *ld) // cph 2002/07/20 - these errors are fatal if not fixed, so apply them for (j = 0; j < 2; j++) { - if (ld->sidenum[j] != 0xffff && ld->sidenum[j] >= (UINT16)numsides) + if (ld->sidenum[j] != NO_INDEX && ld->sidenum[j] >= (UINT16)numsides) { - ld->sidenum[j] = 0xffff; + ld->sidenum[j] = NO_INDEX; CONS_Debug(DBG_SETUP, "P_InitializeLinedef: Linedef %s has out-of-range sidedef number\n", sizeu1((size_t)(ld - lines))); } } @@ -1011,23 +1189,24 @@ static void P_InitializeLinedef(line_t *ld) ld->firsttag = ld->nexttag = -1; // killough 11/98: fix common wad errors (missing sidedefs): - if (ld->sidenum[0] == 0xffff) + if (ld->sidenum[0] == NO_INDEX) { ld->sidenum[0] = 0; // Substitute dummy sidedef for missing right side // cph - print a warning about the bug CONS_Debug(DBG_SETUP, "P_InitializeLinedef: Linedef %s missing first sidedef\n", sizeu1((size_t)(ld - lines))); } - if ((ld->sidenum[1] == 0xffff) && (ld->flags & ML_TWOSIDED)) + if ((ld->sidenum[1] == NO_INDEX) && (ld->flags & ML_TWOSIDED)) { ld->flags &= ~ML_TWOSIDED; // Clear 2s flag for missing left side // cph - print a warning about the bug CONS_Debug(DBG_SETUP, "P_InitializeLinedef: Linedef %s has two-sided flag set, but no second sidedef\n", sizeu1((size_t)(ld - lines))); } - if (ld->sidenum[0] != 0xffff && ld->special) + // killough 4/4/98: support special sidedef interpretation below + if (ld->sidenum[0] != NO_INDEX && ld->special) sides[ld->sidenum[0]].special = ld->special; - if (ld->sidenum[1] != 0xffff && ld->special) + if (ld->sidenum[1] != NO_INDEX && ld->special) sides[ld->sidenum[1]].special = ld->special; } @@ -1060,10 +1239,10 @@ static void P_LoadLineDefs2(void) for (; i--; ld++) { ld->frontsector = sides[ld->sidenum[0]].sector; //e6y: Can't be -1 here - ld->backsector = ld->sidenum[1] != 0xffff ? sides[ld->sidenum[1]].sector : NULL; + ld->backsector = ld->sidenum[1] != NO_INDEX ? sides[ld->sidenum[1]].sector : NULL; // Repeat count for midtexture - if ((ld->flags & ML_EFFECT5) && (ld->sidenum[1] != 0xffff)) + if ((ld->flags & ML_EFFECT5) && (ld->sidenum[1] != NO_INDEX)) { sides[ld->sidenum[0]].repeatcnt = (INT16)(((unsigned)sides[ld->sidenum[0]].textureoffset >> FRACBITS) >> 12); sides[ld->sidenum[0]].textureoffset = (((unsigned)sides[ld->sidenum[0]].textureoffset >> FRACBITS) & 2047) << FRACBITS; @@ -1079,13 +1258,13 @@ static void P_LoadLineDefs2(void) { size_t len = strlen(sides[ld->sidenum[0]].text)+1; - if (ld->sidenum[1] != 0xffff && sides[ld->sidenum[1]].text) + if (ld->sidenum[1] != NO_INDEX && sides[ld->sidenum[1]].text) len += strlen(sides[ld->sidenum[1]].text); ld->text = Z_Malloc(len, PU_LEVEL, NULL); memcpy(ld->text, sides[ld->sidenum[0]].text, strlen(sides[ld->sidenum[0]].text)+1); - if (ld->sidenum[1] != 0xffff && sides[ld->sidenum[1]].text) + if (ld->sidenum[1] != NO_INDEX && sides[ld->sidenum[1]].text) memcpy(ld->text+strlen(ld->text)+1, sides[ld->sidenum[1]].text, strlen(sides[ld->sidenum[1]].text)+1); } break; @@ -1215,14 +1394,14 @@ static void P_LoadSideChangeMusic(boolean firstside, mapsidedef_t *msd, side_t * if (msd->bottomtexture[0] != '-' || msd->bottomtexture[1] != '\0') { - memcpy(process,msd->bottomtexture,8); + memcpy(process, msd->bottomtexture, 8); process[8] = '\0'; sd->bottomtexture = get_number(process); } if (!(msd->midtexture[0] == '-' && msd->midtexture[1] == '\0') || msd->midtexture[1] != '\0') { - memcpy(process,msd->midtexture,8); + memcpy(process, msd->midtexture, 8); process[8] = '\0'; sd->midtexture = get_number(process); } @@ -1232,7 +1411,7 @@ static void P_LoadSideChangeMusic(boolean firstside, mapsidedef_t *msd, side_t * if (firstside || msd->toptexture[0] != '-' || msd->toptexture[1] != '\0') { - memcpy(process,msd->toptexture,8); + memcpy(process, msd->toptexture, 8); process[8] = '\0'; // If they type in O_ or D_ and their music name, just shrug, @@ -1272,7 +1451,7 @@ static void P_LoadSidedefs(void *data) // Colormaps! switch (sd->special) { - case 63: // variable colormap via 242 linedef + case 63: // variable colormap via 242 linedef case 606: //SoM: 4/4/2000: Just colormap transfer // SoM: R_CreateColormap will only create a colormap in software mode... // Perhaps we should just call it instead of doing the calculations here. @@ -1288,26 +1467,26 @@ static void P_LoadSidedefs(void *data) if (msd->toptexture[0] != '-' || msd->toptexture[1] != '\0') { char process[8+1]; - memcpy(process,msd->toptexture,8); + memcpy(process, msd->toptexture, 8); process[8] = '\0'; sd->toptexture = get_number(process); } break; } - case 9: // Mace parameters - case 14: // Bustable block parameters - case 15: // Fan particle spawner parameters + case 9: // Mace parameters + case 14: // Bustable block parameters + case 15: // Fan particle spawner parameters 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 { char process[8*3+1]; - memset(process,0,8*3+1); + memset(process, 0, 8*3+1); sd->toptexture = sd->midtexture = sd->bottomtexture = 0; if (msd->toptexture[0] == '-' && msd->toptexture[1] == '\0') break; else - memcpy(process,msd->toptexture,8); + memcpy(process, msd->toptexture, 8); if (msd->midtexture[0] != '-' || msd->midtexture[1] != '\0') memcpy(process+strlen(process), msd->midtexture, 8); if (msd->bottomtexture[0] != '-' || msd->bottomtexture[1] != '\0') @@ -1319,12 +1498,12 @@ static void P_LoadSidedefs(void *data) case 443: // Calls a named Lua function { char process[8*3+1]; - memset(process,0,8*3+1); + memset(process, 0, 8*3+1); sd->toptexture = sd->midtexture = sd->bottomtexture = 0; if (msd->toptexture[0] == '-' && msd->toptexture[1] == '\0') break; else - memcpy(process,msd->toptexture,8); + memcpy(process,msd->toptexture, 8); if (msd->midtexture[0] != '-' || msd->midtexture[1] != '\0') memcpy(process+strlen(process), msd->midtexture, 8); if (msd->bottomtexture[0] != '-' || msd->bottomtexture[1] != '\0') @@ -1625,6 +1804,80 @@ static void P_CreateBlockMap(void) } } +// +// P_VerifyBlockMap +// +// haleyjd 03/04/10: do verification on validity of blockmap. +// +static boolean P_VerifyBlockMap(INT32 count) +{ + // FIXME: should any of this shit be unsinged? + INT32 x, y; + INT32 *maxoffs = blockmaplump + count; + + //skipblstart = true; + + for (y = 0; y < bmapheight; y++) + { + for (x = 0; x < bmapwidth; x++) + { + INT32 offset; + INT32 *list, *tmplist; + INT32 *blockoffset; + + offset = y * bmapwidth + x; + blockoffset = blockmaplump + offset + 4; + + // check that block offset is in bounds + if (blockoffset >= maxoffs) + { + CONS_Alert(CONS_ERROR, "P_VerifyBlockMap: block offset overflow\n"); + return false; + } + + offset = *blockoffset; + + // check that list offset is in bounds + if (offset < 4 || offset >= count) + { + CONS_Alert(CONS_ERROR, "P_VerifyBlockMap: list offset overflow\n"); + return false; + } + + list = blockmaplump + offset; + + //if (*list != 0) + //skipblstart = false; + + // scan forward for a -1 terminator before maxoffs + for (tmplist = list; ; tmplist++) + { + // we have overflowed the lump? + if (tmplist >= maxoffs) + { + CONS_Alert(CONS_ERROR, "P_VerifyBlockMap: open blocklist\n"); + return false; + } + + if (*tmplist == -1) // found -1 + break; + } + + // scan the list for out-of-range linedef indicies in list + for (tmplist = list; *tmplist != -1; tmplist++) + { + if (*tmplist < 0 || *tmplist >= (INT32)numlines) + { + CONS_Alert(CONS_ERROR, "P_VerifyBlockMap: index >= numlines\n"); + return false; + } + } + } + } + + return true; +} + // Split from P_LoadBlockMap for convenience // -- Monster Iestyn 08/01/18 static void P_ReadBlockMapLump(INT16 *wadblockmaplump, size_t count) @@ -1653,7 +1906,7 @@ static void P_ReadBlockMapLump(INT16 *wadblockmaplump, size_t count) // because making both the WAD and PK3 loading code use // the same functions is trickier than it looks for blockmap // -- Monster Iestyn 09/01/18 -static boolean P_LoadRawBlockMap(UINT8 *data, size_t count) +static boolean P_LoadBlockMap(UINT8 *data, size_t count) { if (!count || count >= 0x20000) return false; @@ -1666,9 +1919,20 @@ static boolean P_LoadRawBlockMap(UINT8 *data, size_t count) bmaporgx = blockmaplump[0]<firstline >= numsegs) + { CorruptMapError(va("P_GroupLines: ss->firstline invalid " "(subsector %s, firstline refers to %d of %s)", sizeu1(i), ss->firstline, sizeu2(numsegs))); + } + seg = &segs[ss->firstline]; sidei = (size_t)(seg->sidedef - sides); + if (!seg->sidedef) + { CorruptMapError(va("P_GroupLines: seg->sidedef is NULL " "(subsector %s, firstline is %d)", sizeu1(i), ss->firstline)); + } + if (seg->sidedef - sides < 0 || seg->sidedef - sides > (UINT16)numsides) + { CorruptMapError(va("P_GroupLines: seg->sidedef refers to sidedef %s of %s " "(subsector %s, firstline is %d)", sizeu1(sidei), sizeu2(numsides), sizeu3(i), ss->firstline)); + } + if (!seg->sidedef->sector) + { CorruptMapError(va("P_GroupLines: seg->sidedef->sector is NULL " "(subsector %s, firstline is %d, sidedef is %s)", sizeu1(i), ss->firstline, sizeu1(sidei))); + } + ss->sector = seg->sidedef->sector; } @@ -1780,20 +2057,36 @@ static void P_GroupLines(void) } } - // PK3 version // -- Monster Iestyn 09/01/18 -static void P_LoadReject(UINT8 *data, size_t count) +static void P_LoadReject(UINT8 *data, size_t rejectsize) { - if (!count) // zero length, someone probably used ZDBSP + const size_t neededsize = (numsectors * numsectors + 7) >> 3; + size_t allocsize = rejectsize; + + if (!rejectsize) // zero length, someone probably used ZDBSP { rejectmatrix = NULL; CONS_Debug(DBG_SETUP, "P_LoadReject: REJECT lump has size 0, will not be loaded\n"); } else { - rejectmatrix = Z_Malloc(count, PU_LEVEL, NULL); // allocate memory for the reject matrix - memcpy(rejectmatrix, data, count); // copy the data into it + if (rejectsize < neededsize) + { + CorruptMapWarning(va("P_LoadReject: REJECT is %s byte%s too small. REJECT might be invalid!\n", sizeu1(neededsize - rejectsize), (neededsize - rejectsize) == 1 ? "" : "s")); +#ifdef COMPAT_VANILLA + // we can pad this and somewhat prevent desyncs + // probs not cool if the reject is from a completely different map + // but whatever + allocsize = neededsize; +#else + rejectmatrix = NULL; + return; +#endif + } + + rejectmatrix = Z_Calloc(allocsize, PU_LEVEL, NULL); // allocate memory for the reject matrix + memcpy(rejectmatrix, data, rejectsize); // copy the data into it } } @@ -1831,11 +2124,15 @@ static void P_LoadMapLUT(const virtres_t* virt) // Lookup tables if (virtreject) + { P_LoadReject(virtreject->data, virtreject->size); + } else + { rejectmatrix = NULL; + } - if (!(virtblockmap && P_LoadRawBlockMap(virtblockmap->data, virtblockmap->size))) + if (!(virtblockmap && P_LoadBlockMap(virtblockmap->data, virtblockmap->size))) P_CreateBlockMap(); } @@ -2224,7 +2521,9 @@ static void P_LoadRecordGhosts(void) if (!gpath) return; - sprintf(gpath,"%s"PATHSEP"replay"PATHSEP"%s"PATHSEP"%s", srb2home, timeattackfolder, G_BuildMapName(gamemap)); + const char *mapname = G_BuildMapName(gamemap); + + sprintf(gpath,"%s"PATHSEP"replay"PATHSEP"%s"PATHSEP"%s", srb2home, timeattackfolder, mapname); // Best Time ghost if (cv_ghost_besttime.value) @@ -2274,9 +2573,10 @@ static void P_LoadRecordGhosts(void) { lumpnum_t l; UINT8 j = 1; - while (j <= 99 && (l = W_CheckNumForName(va("%sS%02u",G_BuildMapName(gamemap),j))) != LUMPERROR) + + while (j <= 99 && (l = W_CheckNumForName(va("%sS%02u", mapname, j))) != LUMPERROR) { - G_AddGhost(va("%sS%02u",G_BuildMapName(gamemap),j)); + G_AddGhost(va("%sS%02u", mapname, j)); j++; } } @@ -2284,6 +2584,31 @@ static void P_LoadRecordGhosts(void) free(gpath); } +static void P_ResetSpawnpoints(void) +{ + UINT8 i; + + numdmstarts = numredctfstarts = numbluectfstarts = 0; + + // reset the player starts + for (i = 0; i < MAXPLAYERS; i++) + { + playerstarts[i] = NULL; + redctfstarts[i] = NULL; + bluectfstarts[i] = NULL; + } + + for (i = 0; i < MAX_DM_STARTS; i++) + { + deathmatchstarts[i] = NULL; + } + + for (i = 0; i < 2; i++) + { + skyboxmo[i] = NULL; + } +} + static void P_InitCamera(void) { INT32 i; @@ -2293,6 +2618,7 @@ static void P_InitCamera(void) for (i = 0; i <= splitscreen; i++) { + camera[i].postimg = 0; P_SetupCamera(&camera[i]); } @@ -2318,10 +2644,12 @@ static void P_InitMinimapInfo(void) Patch_Free(minimapinfo.minimap_pic); minimapinfo.minimap_pic = NULL; - lumpnum = W_CheckNumForName(va("%sR", G_BuildMapName(gamemap))); + const char *mapname = G_BuildMapName(gamemap); + + lumpnum = W_CheckNumForName(va("%sR", mapname)); if (lumpnum != LUMPERROR) - minimapinfo.minimap_pic = W_CachePatchName(va("%sR", G_BuildMapName(gamemap)), PU_PATCH); + minimapinfo.minimap_pic = W_CachePatchName(va("%sR", mapname), PU_PATCH); minimapinfo.min_x = bsp->bbox[0][BOXLEFT]; minimapinfo.max_x = bsp->bbox[0][BOXRIGHT]; @@ -2390,10 +2718,14 @@ static boolean P_RunSpecialWipe(boolean reloadinggamestate) { // Cancel all d_main.c fadeouts (keep fade in though). if (reloadinggamestate) + { wipegamestate = gamestate; // Don't fade if reloading the gamestate + return false; + } + // Encore mode fade to pink to white // This is handled BEFORE sounds are stopped. - else if (encoremode && !prevencoremode && !demo.rewinding) + if (encoremode && !prevencoremode && !demo.rewinding) { tic_t locstarttime, endtime, nowtime; @@ -2427,6 +2759,8 @@ static boolean P_RunSpecialWipe(boolean reloadinggamestate) // Hold on white for extra effect. while (nowtime < endtime) { + I_HandleInterrupt(); + // wait loop while (!((nowtime = I_GetTime()) - lastwipetic)) { @@ -2449,6 +2783,69 @@ static boolean P_RunSpecialWipe(boolean reloadinggamestate) return false; } +static void P_InitTagGametype(void) +{ + UINT8 i; + INT32 realnumplayers = 0; + INT32 playersactive[MAXPLAYERS]; + + //I just realized how problematic this code can be. + //D_NumPlayers() will not always cover the scope of the netgame. + //What if one player is node 0 and the other node 31? + //The solution? Make a temp array of all players that are currently playing and pick from them. + //Future todo? When a player leaves, shift all nodes down so D_NumPlayers() can be used as intended? + //Also, you'd never have to loop through all 32 players slots to find anything ever again. + for (i = 0; i < MAXPLAYERS; i++) + { + if (playeringame[i] && !players[i].spectator) + { + playersactive[realnumplayers] = i; //stores the player's node in the array. + realnumplayers++; + } + } + + if (!realnumplayers) // this should also fix the dedicated crash bug. You only pick a player if one exists to be picked. + { + CONS_Printf(M_GetText("No player currently available to become IT. Awaiting available players.\n")); + return; + } + + i = P_RandomKey(realnumplayers); + players[playersactive[i]].pflags |= PF_TAGIT; //choose our initial tagger before map starts. + + // Taken and modified from G_DoReborn() + // Remove the player so he can respawn elsewhere. + // first dissasociate the corpse + if (players[playersactive[i]].mo) + P_RemoveMobj(players[playersactive[i]].mo); + + G_SpawnPlayer(playersactive[i], false); //respawn the lucky player in his dedicated spawn location. +} + +static void P_InitGametype(void) +{ + if (modeattacking == ATTACKING_RECORD && !demo.playback) + P_LoadRecordGhosts(); + + if (G_RaceGametype() && server) + { + INT32 numLaps; + const mapheader_t *mapheader = mapheaderinfo[gamemap - 1]; + + if ((netgame || multiplayer) && cv_basenumlaps.value && + (!(mapheader->levelflags & LF_SECTIONRACE) || (mapheader->numlaps > cv_basenumlaps.value))) + numLaps = cv_basenumlaps.value; + else + numLaps = mapheader->numlaps; + + CV_StealthSetValue(&cv_numlaps, numLaps); + } + else if (G_TagGametype()) + { + P_InitTagGametype(); + } +} + static void P_SetupPlayer(void) { INT32 i; @@ -2462,76 +2859,27 @@ static void P_SetupPlayer(void) // Start players with pity shields if possible players[i].pity = -1; + players[i].mo = NULL; + if (!G_RaceGametype()) { - players[i].mo = NULL; G_DoReborn(i); } else // gametype is GT_COOP or GT_RACE { - players[i].mo = NULL; G_SpawnPlayer(i, (players[i].starposttime)); } } } - if (modeattacking == ATTACKING_RECORD && !demo.playback) - P_LoadRecordGhosts(); - - if (G_TagGametype()) - { - INT32 realnumplayers = 0; - INT32 playersactive[MAXPLAYERS]; - - //I just realized how problematic this code can be. - //D_NumPlayers() will not always cover the scope of the netgame. - //What if one player is node 0 and the other node 31? - //The solution? Make a temp array of all players that are currently playing and pick from them. - //Future todo? When a player leaves, shift all nodes down so D_NumPlayers() can be used as intended? - //Also, you'd never have to loop through all 32 players slots to find anything ever again. - for (i = 0; i < MAXPLAYERS; i++) - { - if (playeringame[i] && !players[i].spectator) - { - playersactive[realnumplayers] = i; //stores the player's node in the array. - realnumplayers++; - } - } - - if (realnumplayers) // this should also fix the dedicated crash bug. You only pick a player if one exists to be picked. - { - i = P_RandomKey(realnumplayers); - players[playersactive[i]].pflags |= PF_TAGIT; //choose our initial tagger before map starts. - - // Taken and modified from G_DoReborn() - // Remove the player so he can respawn elsewhere. - // first dissasociate the corpse - if (players[playersactive[i]].mo) - P_RemoveMobj(players[playersactive[i]].mo); - - G_SpawnPlayer(playersactive[i], false); //respawn the lucky player in his dedicated spawn location. - } - else - CONS_Printf(M_GetText("No player currently available to become IT. Awaiting available players.\n")); - - } - else if (G_RaceGametype() && server) - { - INT32 numLaps = ((netgame || multiplayer) && cv_basenumlaps.value - && (!(mapheaderinfo[gamemap - 1]->levelflags & LF_SECTIONRACE) - || (mapheaderinfo[gamemap - 1]->numlaps > cv_basenumlaps.value))) - ? cv_basenumlaps.value - : mapheaderinfo[gamemap - 1]->numlaps; - - CV_StealthSetValue(&cv_numlaps, numLaps); - } + P_InitGametype(); // Start recording replay in multiplayer with a temp filename // Ensure dedis only record a replay if there is a player at the start of the map, otherwise we get invalid replays! if (!demo.playback && multiplayer && D_NumPlayers()) { static char buf[256]; - sprintf(buf, "replay"PATHSEP"online"PATHSEP"%d-%s", (int) (time(NULL)), G_BuildMapName(gamemap)); + sprintf(buf, "replay"PATHSEP"online"PATHSEP"%d-%s", (int)(time(NULL)), G_BuildMapName(gamemap)); I_mkdir(va("%s"PATHSEP"replay", srb2home), 0755); I_mkdir(va("%s"PATHSEP"replay"PATHSEP"online", srb2home), 0755); @@ -2635,7 +2983,7 @@ boolean P_SetupLevel(boolean fromnetsave, boolean reloadinggamestate) INT32 i; boolean ranspecialwipe = false; lumpnum_t encoreLump = LUMPERROR; - UINT8 levelfadecol; + const mapheader_t *mapheader = mapheaderinfo[gamemap - 1]; midgamejoin = fromnetsave; // makes dynslopes run in P_Ticker to avoid synch issues and other stuff @@ -2643,7 +2991,7 @@ boolean P_SetupLevel(boolean fromnetsave, boolean reloadinggamestate) levelloading = true; // This is needed. Don't touch. - maptol = mapheaderinfo[gamemap-1]->typeoflevel; + maptol = mapheader->typeoflevel; CON_Drawer(); // let the user know what we are going to do I_FinishUpdate(); // page flip or blit buffer @@ -2654,17 +3002,17 @@ boolean P_SetupLevel(boolean fromnetsave, boolean reloadinggamestate) // Clear CECHO messages HU_ClearCEcho(); - if (mapheaderinfo[gamemap-1]->runsoc[0] != '#') - P_RunSOC(mapheaderinfo[gamemap-1]->runsoc); + if (mapheader->runsoc[0] != '#') + P_RunSOC(mapheader->runsoc); - if (cv_runscripts.value && mapheaderinfo[gamemap-1]->scriptname[0] != '#') - P_RunLevelScript(mapheaderinfo[gamemap-1]->scriptname); + if (cv_runscripts.value && mapheader->scriptname[0] != '#') + P_RunLevelScript(mapheader->scriptname); P_LevelInitStuff(reloadinggamestate); - if (mapheaderinfo[gamemap-1]->forcecharacter[0] != '\0' - && atoi(mapheaderinfo[gamemap-1]->forcecharacter) != 255) - P_ForceCharacter(mapheaderinfo[gamemap-1]->forcecharacter); + if (mapheader->forcecharacter[0] != '\0' + && atoi(mapheader->forcecharacter) != 255) + P_ForceCharacter(mapheader->forcecharacter); // Initial height of PointOfView // will be set by player think. @@ -2714,10 +3062,10 @@ boolean P_SetupLevel(boolean fromnetsave, boolean reloadinggamestate) char tx[64]; V_DrawSmallString(1, 191, V_ALLOWLOWERCASE, M_GetText("Speeding off to...")); snprintf(tx, 63, "%s%s%s", - mapheaderinfo[gamemap-1]->lvlttl, - (strlen(mapheaderinfo[gamemap-1]->zonttl) > 0) ? va(" %s",mapheaderinfo[gamemap-1]->zonttl) : // SRB2kart - ((mapheaderinfo[gamemap-1]->levelflags & LF_NOZONE) ? "" : " Zone"), - (strlen(mapheaderinfo[gamemap-1]->actnum) > 0) ? va(", Act %s",mapheaderinfo[gamemap-1]->actnum) : ""); + mapheader->lvlttl, + (strlen(mapheader->zonttl) > 0) ? va(" %s",mapheader->zonttl) : // SRB2kart + ((mapheader->levelflags & LF_NOZONE) ? "" : " Zone"), + (strlen(mapheader->actnum) > 0) ? va(", Act %s",mapheader->actnum) : ""); V_DrawSmallString(1, 195, V_ALLOWLOWERCASE, tx); I_UpdateNoVsync(); }*/ @@ -2736,20 +3084,16 @@ boolean P_SetupLevel(boolean fromnetsave, boolean reloadinggamestate) curmapvirt = vres_GetMap(lastloadedmaplumpnum); encoreLump = W_CheckNumForName(va("%s%c", maplumpname, (encoremode ? 'E' : 'T'))); - R_ReInitColormaps(mapheaderinfo[gamemap-1]->palette, encoreLump); + R_ReInitColormaps(mapheader->palette, encoreLump); CON_SetupBackColormap(); // SRB2 determines the sky texture to be used depending on the map header. - P_SetupLevelSky(mapheaderinfo[gamemap-1]->skynum, true); + P_SetupLevelSky(mapheader->skynum, true); - numdmstarts = numredctfstarts = numbluectfstarts = 0; + P_ResetSpawnpoints(); - // reset the player starts - memset(playerstarts, 0, sizeof(playerstarts)); - memset(skyboxmo, 0, sizeof(skyboxmo)); - - P_MapStart(); + P_MapStart(); // tmthing can be used starting from this point P_LoadMapFromFile(); @@ -2759,7 +3103,7 @@ boolean P_SetupLevel(boolean fromnetsave, boolean reloadinggamestate) // a shit ton of time loading mobj thinkers. CalculateDoomednumToMobjtype(); - P_SpawnMapThings(); + P_SpawnMapThings(!fromnetsave); P_SpawnEmblems(!fromnetsave); @@ -2769,7 +3113,7 @@ boolean P_SetupLevel(boolean fromnetsave, boolean reloadinggamestate) if (!playerstarts[numcoopstarts]) break; - globalweather = mapheaderinfo[gamemap-1]->weather; + globalweather = mapheader->weather; // set up world state P_SpawnSpecials(fromnetsave, reloadinggamestate); @@ -2816,7 +3160,7 @@ boolean P_SetupLevel(boolean fromnetsave, boolean reloadinggamestate) // clear special respawning que iquehead = iquetail = 0; - P_MapEnd(); + P_MapEnd(); // tmthing is no longer needed from this point onwards // Remove the loading shit from the screen if (rendermode != render_none && !reloadinggamestate) @@ -2847,9 +3191,15 @@ boolean P_SetupLevel(boolean fromnetsave, boolean reloadinggamestate) savedata.lives = 0; } - // assume the skybox is visible on level load. - skyVisible = true; - memset(skyVisiblePerPlayer, true, sizeof(skyVisiblePerPlayer)); + if (!reloadinggamestate) + { + // assume the skybox is visible on level load. + skyVisible = true; + for (i = 0; i < MAXSPLITSCREENPLAYERS; i++) + { + skyVisiblePerPlayer[i] = true; + } + } if (!fromnetsave) // uglier hack { // to make a newly loaded level start on the second frame. @@ -2869,14 +3219,18 @@ boolean P_SetupLevel(boolean fromnetsave, boolean reloadinggamestate) LUA_HookInt(gamemap, HOOK(MapLoad)); } - if (rendermode != render_none && !reloadinggamestate) + // reloading gamestate, stop here. + if (reloadinggamestate) + return true; + + G_AddMapToBuffer(gamemap-1); + + if (rendermode != render_none) { R_ResetViewInterpolation(0); R_UpdateMobjInterpolators(); } - G_AddMapToBuffer(gamemap-1); - G_ResetDeviceLED(); return true; @@ -2927,7 +3281,7 @@ static size_t sreplaces = 0, mreplaces = 0, digmreplaces = 0; static boolean P_CheckSoundReplacements(UINT16 wadnum, char *name, size_t i) { size_t j; - lumpnum_t lumpnum = (i|(wadnum<<16)); + lumpnum_t lumpnum = (i | (wadnum<<16)); if (name[0] == 'D') { @@ -2935,8 +3289,8 @@ static boolean P_CheckSoundReplacements(UINT16 wadnum, char *name, size_t i) { for (j = 1; j < NUMSFX; j++) { - if (S_sfx[j].name && !strnicmp(S_sfx[j].name, name + 2, 6) - && (S_sfx[j].lumpnum != lumpnum) && (S_sfx[j].lumpnum != LUMPERROR)) + if ((S_sfx[j].lumpnum != lumpnum) && (S_sfx[j].lumpnum != LUMPERROR) && + S_sfx[j].name && !strnicmp(S_sfx[j].name, name + 2, 6)) { // the sound will be reloaded when needed, // since sfx->data will be NULL @@ -3057,6 +3411,17 @@ UINT16 P_PartialAddWadFile(const char *wadfilename, boolean local) sreplaces = mreplaces = digmreplaces = 0; + if (local) + { + // check if someone tries to load maps locally lol + // do this here so we can skip loading the file anyways + if (W_CheckAutoLoadContainsMap(wadfilename)) + { + CONS_Alert(CONS_WARNING, "addilelocal: locally added file %s contains map data, this WILL cause crashes and desynchs! not added.\n", wadfilename); + return UINT16_MAX; + } + } + if ((numlumps = W_InitFile(wadfilename, local, false)) == INT16_MAX) { refreshdirmenu |= REFRESHDIR_NOTLOADED; @@ -3087,12 +3452,15 @@ UINT16 P_PartialAddWadFile(const char *wadfilename, boolean local) allvotereplaced = true; } - if (!devparm && sreplaces) - CONS_Printf(M_GetText("%s sounds replaced\n"), sizeu1(sreplaces)); - if (!devparm && mreplaces) - CONS_Printf(M_GetText("%s midi musics ignored\n"), sizeu1(mreplaces)); - if (!devparm && digmreplaces) - CONS_Printf(M_GetText("%s digital musics replaced\n"), sizeu1(digmreplaces)); + if (!devparm) + { + if (sreplaces) + CONS_Printf(M_GetText("%s sounds replaced\n"), sizeu1(sreplaces)); + if (mreplaces) + CONS_Printf(M_GetText("%s midi musics ignored\n"), sizeu1(mreplaces)); + if (digmreplaces) + CONS_Printf(M_GetText("%s digital musics replaced\n"), sizeu1(digmreplaces)); + } if (!mapsadded) CONS_Printf(M_GetText("No maps added\n")); diff --git a/src/p_setup.h b/src/p_setup.h index c5ad15d44..166c0ec2e 100644 --- a/src/p_setup.h +++ b/src/p_setup.h @@ -35,6 +35,7 @@ extern mapthing_t *deathmatchstarts[MAX_DM_STARTS]; extern INT32 numdmstarts, numcoopstarts, numredctfstarts, numbluectfstarts; extern boolean levelloading; +extern UINT8 levelfadecol; extern lumpnum_t lastloadedmaplumpnum; // for comparative savegame extern virtres_t *curmapvirt; @@ -114,6 +115,9 @@ size_t P_PrecacheLevelFlats(void); void P_AllocMapHeader(INT16 i); +void P_PrintCorruptMapWarnings(void); +void P_FreeCorruptMapWarnings(void); + #ifdef __cplusplus } // extern "C" #endif diff --git a/src/p_sight.c b/src/p_sight.c index 896da76d6..3eb4788b0 100644 --- a/src/p_sight.c +++ b/src/p_sight.c @@ -31,8 +31,6 @@ typedef struct { fixed_t bbox[4]; } los_t; -static INT32 sightcounts[2]; - typedef INT32 (*divlinefunc)(fixed_t x, fixed_t y, const divline_t *node); typedef INT32 (*divlinecrossfunc)(fixed_t x1, fixed_t y1, fixed_t x2, fixed_t y2, const divline_t *node); @@ -366,8 +364,10 @@ boolean P_CheckSight2(mobj_t *t1, mobj_t *t2, boolean fast) I_Assert(!P_MobjWasRemoved(t2)); if (!t1->subsector || !t2->subsector - || !t1->subsector->sector || !t2->subsector->sector) + || !t1->subsector->sector || !t2->subsector->sector) + { return false; + } s1 = t1->subsector->sector; s2 = t2->subsector->sector; @@ -377,7 +377,9 @@ boolean P_CheckSight2(mobj_t *t1, mobj_t *t2, boolean fast) { // Check in REJECT table. if (rejectmatrix[pnum>>3] & (1 << (pnum&7))) // can't possibly be connected + { return false; + } } // killough 11/98: shortcut for melee situations @@ -385,11 +387,9 @@ boolean P_CheckSight2(mobj_t *t1, mobj_t *t2, boolean fast) // haleyjd 02/23/06: can't do this if there are polyobjects in the subsec if (!t1->subsector->polyList && t1->subsector == t2->subsector) + { return true; - - // An unobstructed LOS is possible. - // Now look from eyes of t1 to any part of t2. - sightcounts[1]++; + } validcount++; @@ -432,21 +432,30 @@ boolean P_CheckSight2(mobj_t *t1, mobj_t *t2, boolean fast) continue; } - topz1 = P_GetFFloorTopZAt (rover, t1->x, t1->y); + // Check for blocking floors here. + topz2 = P_GetFFloorTopZAt (rover, t2->x, t2->y); bottomz1 = P_GetFFloorBottomZAt(rover, t1->x, t1->y); + + if (los.sightzstart < bottomz1 && t2->z >= topz2) + { + // no way to see through that + return false; + } + + topz1 = P_GetFFloorTopZAt (rover, t1->x, t1->y); bottomz2 = P_GetFFloorBottomZAt(rover, t2->x, t2->y); - // Check for blocking floors here. - if ((los.sightzstart < bottomz1 && t2->z >= topz2) - || (los.sightzstart >= topz1 && t2->z + t2->height < bottomz2)) + if (los.sightzstart >= topz1 && t2->z + t2->height < bottomz2) { // no way to see through that return false; } if (rover->flags & FF_SOLID) + { continue; // shortcut since neither mobj can be inside the 3dfloor + } if (rover->flags & FF_BOTHPLANES || !(rover->flags & FF_INVERTPLANES)) { diff --git a/src/p_slopes.c b/src/p_slopes.c index ac3a56c17..52a262785 100644 --- a/src/p_slopes.c +++ b/src/p_slopes.c @@ -664,8 +664,10 @@ static pslope_t *P_NewVertexSlope(INT16 tag1, INT16 tag2, INT16 tag3, UINT8 flag for (i = 0; i < 3; i++) { mt = ret->vertices[i]; + if (!mt) // If a vertex wasn't found, it's game over. There's nothing you can do to recover (except maybe try and kill the slope instead - TODO?) I_Error("P_NewVertexSlope: Slope vertex %s (for linedef tag %d) not found!", sizeu1(i), tag1); + if (mt->extrainfo) mt->z = mt->options; else @@ -899,6 +901,11 @@ void P_SlopeLaunch(mobj_t *mo) //CONS_Printf("Launched off of slope.\n"); mo->standingslope = NULL; + + if (mo->player) + { + mo->player->stairjank = 0; // fuck you + } } // Function to help handle landing on slopes diff --git a/src/p_spec.c b/src/p_spec.c index 605a34861..560ac0b2a 100644 --- a/src/p_spec.c +++ b/src/p_spec.c @@ -538,6 +538,7 @@ static sector_t *getNextSector(line_t *line, sector_t *sec) else return NULL; } + return line->frontsector; } @@ -568,6 +569,7 @@ fixed_t P_FindLowestFloorSurrounding(sector_t *sec) if (other->floorheight < floorh) floorh = other->floorheight; } + return floorh; } @@ -881,7 +883,7 @@ static boolean PolyDoor(line_t *line) pdd.polyObjNum = line->tag; // polyobject id - switch(line->special) + switch (line->special) { case 480: // Polyobj_DoorSlide pdd.doorType = POLY_DOOR_SLIDE; @@ -889,7 +891,7 @@ static boolean PolyDoor(line_t *line) pdd.angle = line->angle; // angle of motion pdd.distance = sides[line->sidenum[0]].rowoffset; - if (line->sidenum[1] != 0xffff) + if (line->sidenum[1] != NO_INDEX) pdd.delay = sides[line->sidenum[1]].textureoffset >> FRACBITS; // delay in tics else pdd.delay = 0; @@ -899,7 +901,7 @@ static boolean PolyDoor(line_t *line) pdd.speed = sides[line->sidenum[0]].textureoffset >> FRACBITS; // angular speed pdd.distance = sides[line->sidenum[0]].rowoffset >> FRACBITS; // angular distance - if (line->sidenum[1] != 0xffff) + if (line->sidenum[1] != NO_INDEX) pdd.delay = sides[line->sidenum[1]].textureoffset >> FRACBITS; // delay in tics else pdd.delay = 0; @@ -1180,7 +1182,7 @@ INT32 P_FindMinSurroundingLight(sector_t *sector, INT32 max) for (i = 0; i < sector->linecount; i++) { line = sector->lines[i]; - check = getNextSector(line,sector); + check = getNextSector(line, sector); if (!check) continue; @@ -1234,7 +1236,6 @@ static void P_AddExecutorDelay(line_t *line, mobj_t *mobj, sector_t *sector) boolean P_RunTriggerLinedef(line_t *triggerline, mobj_t *actor, sector_t *caller) { sector_t *ctlsector; - fixed_t dist = P_AproxDistance(triggerline->dx, triggerline->dy)>>FRACBITS; size_t i, linecnt, sectori; INT16 specialtype = triggerline->special; //fromlapexec = false; @@ -1272,6 +1273,8 @@ boolean P_RunTriggerLinedef(line_t *triggerline, mobj_t *actor, sector_t *caller rings = actor->health-1; } + const fixed_t dist = P_AproxDistance(triggerline->dx, triggerline->dy)>>FRACBITS; + if (triggerline->flags & ML_NOCLIMB) { if (rings > dist) @@ -1293,7 +1296,6 @@ boolean P_RunTriggerLinedef(line_t *triggerline, mobj_t *actor, sector_t *caller msecnode_t *node; mobj_t *mo; INT32 numpush = 0; - INT32 numneeded = dist; if (!caller) return false; // we need a calling sector to find pushables in, silly! @@ -1308,6 +1310,8 @@ boolean P_RunTriggerLinedef(line_t *triggerline, mobj_t *actor, sector_t *caller node = node->m_thinglist_next; } + const fixed_t numneeded = P_AproxDistance(triggerline->dx, triggerline->dy)>>FRACBITS; + if (triggerline->flags & ML_NOCLIMB) // Need at least or more { if (numpush < numneeded) @@ -1336,6 +1340,7 @@ boolean P_RunTriggerLinedef(line_t *triggerline, mobj_t *actor, sector_t *caller else if (secspecial == 7) // SRB2Kart: reusing for Race Lap executor { UINT8 lap; + INT32 targlap; if (actor && actor->player && triggerline->flags & ML_EFFECT4) { @@ -1346,19 +1351,21 @@ boolean P_RunTriggerLinedef(line_t *triggerline, mobj_t *actor, sector_t *caller lap = P_FindLowestLap(); } + targlap = (INT32)(sides[triggerline->sidenum[0]].textureoffset >> FRACBITS); + if (triggerline->flags & ML_NOCLIMB) // Need higher than or equal to { - if (lap < (sides[triggerline->sidenum[0]].textureoffset >> FRACBITS)) + if (lap < targlap) return false; } else if (triggerline->flags & ML_BLOCKMONSTERS) // Need lower than or equal to { - if (lap > (sides[triggerline->sidenum[0]].textureoffset >> FRACBITS)) + if (lap > targlap) return false; } else // Need equal to { - if (lap != (sides[triggerline->sidenum[0]].textureoffset >> FRACBITS)) + if (lap != targlap) return false; } @@ -1450,6 +1457,7 @@ boolean P_RunTriggerLinedef(line_t *triggerline, mobj_t *actor, sector_t *caller if (triggerline->flags & ML_EFFECT5) // disregard order for efficiency { for (i = 0; i < linecnt; i++) + { if (ctlsector->lines[i]->special >= 400 && ctlsector->lines[i]->special < 500) { @@ -1458,6 +1466,7 @@ boolean P_RunTriggerLinedef(line_t *triggerline, mobj_t *actor, sector_t *caller else P_ProcessLineSpecial(ctlsector->lines[i], actor, caller); } + } } else // walk around the sector in a defined order { @@ -1465,11 +1474,13 @@ boolean P_RunTriggerLinedef(line_t *triggerline, mobj_t *actor, sector_t *caller size_t j, masterlineindex = (size_t)-1; for (i = 0; i < linecnt; i++) + { if (ctlsector->lines[i] == triggerline) { masterlineindex = i; break; } + } #ifdef PARANOIA if (masterlineindex == (size_t)-1) @@ -1488,11 +1499,13 @@ boolean P_RunTriggerLinedef(line_t *triggerline, mobj_t *actor, sector_t *caller { if (i == j) continue; + if (ctlsector->lines[i]->v1 == ctlsector->lines[j]->v2) { i = j; break; } + if (ctlsector->lines[i]->v1 == ctlsector->lines[j]->v1) { i = j; @@ -1500,6 +1513,7 @@ boolean P_RunTriggerLinedef(line_t *triggerline, mobj_t *actor, sector_t *caller break; } } + if (j == linecnt) { const size_t vertexei = (size_t)(ctlsector->lines[i]->v1 - vertexes); @@ -1514,11 +1528,13 @@ boolean P_RunTriggerLinedef(line_t *triggerline, mobj_t *actor, sector_t *caller { if (i == j) continue; + if (ctlsector->lines[i]->v2 == ctlsector->lines[j]->v1) { i = j; break; } + if (ctlsector->lines[i]->v2 == ctlsector->lines[j]->v2) { i = j; @@ -1595,19 +1611,21 @@ void P_LinedefExecute(INT16 tag, mobj_t *actor, sector_t *caller) if (lines[masterline].tag != tag) continue; + const INT16 specialtype = lines[masterline].special; + // "No More Enemies" and "Level Load" take care of themselves. - if (lines[masterline].special == 313 - || lines[masterline].special == 399 - || lines[masterline].special == 328 - || lines[masterline].special == 323 + if (specialtype == 313 + || specialtype == 399 + || specialtype == 328 + || specialtype == 323 // Each-time executors handle themselves, too - || lines[masterline].special == 301 // Each time - || lines[masterline].special == 306 // Character ability - Each time - || lines[masterline].special == 310 // CTF Red team - Each time - || lines[masterline].special == 312 // CTF Blue team - Each time - || lines[masterline].special == 322 // Trigger on X calls - Each Time - || lines[masterline].special < 300 - || lines[masterline].special > 399) + || specialtype == 301 // Each time + || specialtype == 306 // Character ability - Each time + || specialtype == 310 // CTF Red team - Each time + || specialtype == 312 // CTF Blue team - Each time + || specialtype == 322 // Trigger on X calls - Each Time + || specialtype < 300 + || specialtype > 399) continue; if (!P_RunTriggerLinedef(&lines[masterline], actor, caller)) @@ -1973,8 +1991,8 @@ static void P_ProcessLineSpecial(line_t *line, mobj_t *mo, sector_t *callsec) INT32 position = (INT32)max(sides[line->sidenum[0]].midtexture, 0); UINT32 prefadems = (UINT32)max(sides[line->sidenum[0]].textureoffset >> FRACBITS, 0); UINT32 postfadems = (UINT32)max(sides[line->sidenum[0]].rowoffset >> FRACBITS, 0); - UINT8 fadetarget = (UINT8)max((line->sidenum[1] != 0xffff) ? sides[line->sidenum[1]].textureoffset >> FRACBITS : 0, 0); - INT16 fadesource = (INT16)max((line->sidenum[1] != 0xffff) ? sides[line->sidenum[1]].rowoffset >> FRACBITS : -1, -1); + UINT8 fadetarget = (UINT8)max((line->sidenum[1] != NO_INDEX) ? sides[line->sidenum[1]].textureoffset >> FRACBITS : 0, 0); + INT16 fadesource = (INT16)max((line->sidenum[1] != NO_INDEX) ? sides[line->sidenum[1]].rowoffset >> FRACBITS : -1, -1); // Seek offset from current song position if (line->flags & ML_EFFECT1) @@ -2082,7 +2100,7 @@ static void P_ProcessLineSpecial(line_t *line, mobj_t *mo, sector_t *callsec) ffloor_t *rover; boolean foundit = false; - for(rover = mo->subsector->sector->ffloors; rover; rover = rover->next) + for (rover = mo->subsector->sector->ffloors; rover; rover = rover->next) { if (rover->master->frontsector->tag != line->tag) continue; @@ -2419,7 +2437,8 @@ static void P_ProcessLineSpecial(line_t *line, mobj_t *mo, sector_t *callsec) P_SetPlayerMobjState(mo, S_KART_STND1); // SRB2kart - was S_PLAY_STND // Reset bot too. - if (bot) { + if (bot) + { if (line->flags & ML_NOCLIMB) P_SetOrigin(bot, mo->x, mo->y, mo->z); bot->momx = bot->momy = bot->momz = 1; @@ -2487,7 +2506,7 @@ static void P_ProcessLineSpecial(line_t *line, mobj_t *mo, sector_t *callsec) var1 = sides[line->sidenum[0]].toptexture; //(line->dx>>FRACBITS)-1; - if (line->sidenum[1] != 0xffff && line->flags & ML_BLOCKMONSTERS) // read power from back sidedef + if (line->sidenum[1] != NO_INDEX && line->flags & ML_BLOCKMONSTERS) // read power from back sidedef var2 = sides[line->sidenum[1]].toptexture; else if (line->flags & ML_NOCLIMB) // 'Infinite' var2 = UINT16_MAX; @@ -2502,6 +2521,7 @@ static void P_ProcessLineSpecial(line_t *line, mobj_t *mo, sector_t *callsec) P_SetTarget(&dummy->target, bot); A_CustomPower(dummy); } + P_RemoveMobj(dummy); } break; @@ -2565,11 +2585,15 @@ static void P_ProcessLineSpecial(line_t *line, mobj_t *mo, sector_t *callsec) if (mo && mo->player) { UINT16 fractime = (UINT16)(sides[line->sidenum[0]].textureoffset>>FRACBITS); + if (fractime < 1) fractime = 1; //instantly wears off upon leaving + if (line->flags & ML_NOCLIMB) fractime |= 1<<15; //more crazy &ing, as if music stuff wasn't enough + mo->player->powers[pw_nocontrol] = fractime; + if (bot) bot->player->powers[pw_nocontrol] = fractime; } @@ -2579,8 +2603,10 @@ static void P_ProcessLineSpecial(line_t *line, mobj_t *mo, sector_t *callsec) if (mo) { mo->destscale = FixedDiv(P_AproxDistance(line->dx, line->dy), 100<destscale < FRACUNIT/100) mo->destscale = FRACUNIT/100; + if (mo->player && bot) bot->destscale = mo->destscale; } @@ -2609,7 +2635,7 @@ static void P_ProcessLineSpecial(line_t *line, mobj_t *mo, sector_t *callsec) if (always || this->bottomtexture) this->bottomtexture = set->bottomtexture; - if (lines[linenum].sidenum[1] == 0xffff) + if (lines[linenum].sidenum[1] == NO_INDEX) continue; // One-sided stops here. // Back side @@ -2658,16 +2684,18 @@ static void P_ProcessLineSpecial(line_t *line, mobj_t *mo, sector_t *callsec) sector_t *sec; mobj_t *thing; - if (line->sidenum[1] != 0xffff) + if (line->sidenum[1] != NO_INDEX) state = (statenum_t)sides[line->sidenum[1]].toptexture; while ((secnum = P_FindSectorFromLineTag(line, secnum)) >= 0) { boolean tryagain; sec = sectors + secnum; + do { tryagain = false; for (thing = sec->thinglist; thing; thing = thing->snext) + { if (thing->type == type) { if (state != NUMSTATES) @@ -2684,6 +2712,7 @@ static void P_ProcessLineSpecial(line_t *line, mobj_t *mo, sector_t *callsec) break; } } + } } while (tryagain); } break; @@ -2961,10 +2990,10 @@ sector_t *P_PlayerTouchingSectorSpecial(player_t *player, INT32 section, INT32 n { fixed_t topheight, bottomheight; - if (GETSECSPECIAL(rover->master->frontsector->special, section) != number) + if (!(rover->flags & FF_EXISTS)) continue; - if (!(rover->flags & FF_EXISTS)) + if (GETSECSPECIAL(rover->master->frontsector->special, section) != number) continue; topheight = P_GetSpecialTopZ(player->mo, sectors + rover->secnum, player->mo->subsector->sector); @@ -3259,6 +3288,7 @@ void P_ProcessSpecialSector(player_t *player, sector_t *sector, sector_t *rovers case 3: // Linedef executor requires all players present // Trigger Linedef Exec (Floor Touch, All Players) /// \todo check continues for proper splitscreen support? for (i = 0; i < MAXPLAYERS; i++) + { if (playeringame[i] && !players[i].bot && players[i].mo && (gametype != GT_COOP || players[i].lives > 0)) { if (roversector) @@ -3312,6 +3342,7 @@ void P_ProcessSpecialSector(player_t *player, sector_t *sector, sector_t *rovers goto DoneSection2; } } + } /* FALLTHRU */ case 4: // Linedef executor that doesn't require touching floor // Trigger Linedef Exec (Anywhere in Sector) case 5: // Linedef executor // Trigger Linedef Exec (Floor Touch) @@ -3385,14 +3416,16 @@ DoneSection2: { const fixed_t hscale = mapobjectscale + (mapobjectscale - player->mo->scale); const fixed_t minspeed = 24*hscale; - angle_t pushangle = FixedHypot(player->mo->momx, player->mo->momy) ? R_PointToAngle2(0, 0, player->mo->momx, player->mo->momy) : player->mo->angle; - // if we have no speed for SOME REASON, use the player's angle, otherwise we'd be forcefully thrusted to what I can only assume is angle 0 if (player->mo->eflags & MFE_SPRUNG) break; if (player->speed < minspeed) // Push forward to prevent getting stuck + { + // if we have no speed for SOME REASON, use the player's angle, otherwise we'd be forcefully thrusted to what I can only assume is angle 0 + const angle_t pushangle = FixedHypot(player->mo->momx, player->mo->momy) ? R_PointToAngle2(0, 0, player->mo->momx, player->mo->momy) : player->mo->angle; P_InstaThrust(player->mo, pushangle, minspeed); + } player->kartstuff[k_pogospring] = 1; K_DoPogoSpring(player->mo, 0, 1); @@ -3408,16 +3441,22 @@ DoneSection2: const fixed_t hscale = mapobjectscale + (mapobjectscale - player->mo->scale); const fixed_t minspeed = 24*hscale; const fixed_t maxspeed = 28*hscale; - angle_t pushangle = FixedHypot(player->mo->momx, player->mo->momy) ? R_PointToAngle2(0, 0, player->mo->momx, player->mo->momy) : player->mo->angle; - // if we have no speed for SOME REASON, use the player's angle, otherwise we'd be forcefully thrusted to what I can only assume is angle 0 if (player->mo->eflags & MFE_SPRUNG) break; if (player->speed > maxspeed) // Prevent overshooting jumps + { + // if we have no speed for SOME REASON, use the player's angle, otherwise we'd be forcefully thrusted to what I can only assume is angle 0 + const angle_t pushangle = FixedHypot(player->mo->momx, player->mo->momy) ? R_PointToAngle2(0, 0, player->mo->momx, player->mo->momy) : player->mo->angle; P_InstaThrust(player->mo, pushangle, maxspeed); + } else if (player->speed < minspeed) // Push forward to prevent getting stuck + { + // if we have no speed for SOME REASON, use the player's angle, otherwise we'd be forcefully thrusted to what I can only assume is angle 0 + const angle_t pushangle = FixedHypot(player->mo->momx, player->mo->momy) ? R_PointToAngle2(0, 0, player->mo->momx, player->mo->momy) : player->mo->angle; P_InstaThrust(player->mo, pushangle, minspeed); + } player->kartstuff[k_pogospring] = 2; K_DoPogoSpring(player->mo, 0, 1); @@ -3436,11 +3475,14 @@ DoneSection2: if (i != -1) { + INT32 sfxnum; angle_t lineangle; fixed_t linespeed; - lineangle = lines[i].angle; - linespeed = P_AproxDistance(lines[i].v2->x-lines[i].v1->x, lines[i].v2->y-lines[i].v1->y); + const line_t *line = &lines[i]; + + lineangle = line->angle; + linespeed = P_AproxDistance(line->v2->x-line->v1->x, line->v2->y-line->v1->y); player->mo->angle = lineangle; @@ -3454,7 +3496,7 @@ DoneSection2: P_ForceLocalAngle(player, player->mo->angle); } - if (!(lines[i].flags & ML_EFFECT4)) + if (!(line->flags & ML_EFFECT4)) { P_UnsetThingPosition(player->mo); if (roversector) // make FOF speed pads work @@ -3476,7 +3518,14 @@ DoneSection2: player->kartstuff[k_drift] = 0; player->kartstuff[k_driftcharge] = 0; player->kartstuff[k_pogospring] = 0; - S_StartSound(player->mo, sfx_spdpad); + + sfxnum = sides[line->sidenum[0]].toptexture; + + // none or invalid sound? + if (sfxnum <= sfx_None || sfxnum >= NUMSFX) + sfxnum = sfx_spdpad; // use the zippy sound then! + + S_StartSound(player->mo, sfxnum); { sfxenum_t pick = P_RandomKey(2); // Gotta roll the RNG every time this is called for sync reasons @@ -3525,21 +3574,25 @@ DoneSection2: P_DoPlayerExit(player); P_SetupSignExit(player); - // important: use sector->tag on next line instead of player->mo->subsector->tag - // this part is different from in P_PlayerThink, this is what was causing - // FOF custom exits not to work. - lineindex = P_FindSpecialLineFromTag(2, sector->tag, -1); - if (gametype == GT_COOP && lineindex != -1) // Custom exit! + if (gametype == GT_COOP) { - // Special goodies with the block monsters flag depending on emeralds collected - if ((lines[lineindex].flags & ML_BLOCKMONSTERS) && ALL7EMERALDS(emeralds)) - nextmapoverride = (INT16)(lines[lineindex].frontsector->ceilingheight>>FRACBITS); - else - nextmapoverride = (INT16)(lines[lineindex].frontsector->floorheight>>FRACBITS); + // important: use sector->tag on next line instead of player->mo->subsector->tag + // this part is different from in P_PlayerThink, this is what was causing + // FOF custom exits not to work. + lineindex = P_FindSpecialLineFromTag(2, sector->tag, -1); - if (lines[lineindex].flags & ML_NOCLIMB) - skipstats = true; + if (lineindex != -1) // Custom exit!) + { + // Special goodies with the block monsters flag depending on emeralds collected + if ((lines[lineindex].flags & ML_BLOCKMONSTERS) && ALL7EMERALDS(emeralds)) + nextmapoverride = (INT16)(lines[lineindex].frontsector->ceilingheight>>FRACBITS); + else + nextmapoverride = (INT16)(lines[lineindex].frontsector->floorheight>>FRACBITS); + + if (lines[lineindex].flags & ML_NOCLIMB) + skipstats = true; + } } } break; @@ -3645,7 +3698,6 @@ DoneSection2: thinker_t *th; mobj_t *waypoint = NULL; mobj_t *mo2; - angle_t an; if (player->mo->tracer && player->mo->tracer->type == MT_TUBEWAYPOINT) break; @@ -3693,10 +3745,13 @@ DoneSection2: CONS_Debug(DBG_GAMELOGIC, "Waypoint %d found in sequence %d - speed = %d\n", waypoint->health, sequence, speed); } - an = R_PointToAngle2(player->mo->x, player->mo->y, waypoint->x, waypoint->y) - player->mo->angle; + if (!(lines[lineindex].flags & ML_EFFECT4)) + { + const angle_t an = R_PointToAngle2(player->mo->x, player->mo->y, waypoint->x, waypoint->y) - player->mo->angle; - if (an > ANGLE_90 && an < ANGLE_270 && !(lines[lineindex].flags & ML_EFFECT4)) - break; // behind back + if (an > ANGLE_90 && an < ANGLE_270) + break; // behind back + } P_SetTarget(&player->mo->tracer, waypoint); player->speed = speed; @@ -3718,7 +3773,6 @@ DoneSection2: thinker_t *th; mobj_t *waypoint = NULL; mobj_t *mo2; - angle_t an; if (player->mo->tracer && player->mo->tracer->type == MT_TUBEWAYPOINT) break; @@ -3766,10 +3820,13 @@ DoneSection2: CONS_Debug(DBG_GAMELOGIC, "Waypoint %d found in sequence %d - speed = %d\n", waypoint->health, sequence, speed); } - an = R_PointToAngle2(player->mo->x, player->mo->y, waypoint->x, waypoint->y) - player->mo->angle; + if (!(lines[lineindex].flags & ML_EFFECT4)) + { + const angle_t an = R_PointToAngle2(player->mo->x, player->mo->y, waypoint->x, waypoint->y) - player->mo->angle; - if (an > ANGLE_90 && an < ANGLE_270 && !(lines[lineindex].flags & ML_EFFECT4)) - break; // behind back + if (an > ANGLE_90 && an < ANGLE_270) + break; // behind back + } P_SetTarget(&player->mo->tracer, waypoint); player->speed = speed; @@ -3783,10 +3840,13 @@ DoneSection2: case 10: // Finish Line // SRB2kart - 150117 - if (G_RaceGametype() && (player->starpostnum >= (numstarposts - (numstarposts/2)) || player->exiting)) + if (!G_RaceGametype()) + break; + + if (player->starpostnum >= (numstarposts - (numstarposts/2)) || player->exiting) player->kartstuff[k_starpostwp] = player->kartstuff[k_waypoint] = 0; // - if (G_RaceGametype() && !player->exiting) + if (!player->exiting) { if (player->starpostnum >= (numstarposts - (numstarposts/2))) // srb2kart: must have touched *enough* starposts (was originally "(player->starpostnum == numstarposts)") { @@ -3820,7 +3880,7 @@ DoneSection2: player->kartstuff[k_lapanimation] = 80; - if (UNLIKELY(player->pflags & PF_NIGHTSMODE)) + if (nightsplayer(player)) player->drillmeter += 48*20; if (netgame && player->laps >= (UINT8)cv_numlaps.value) @@ -4503,27 +4563,13 @@ void P_PlayerInSpecialSector(player_t *player) #undef TELEPORTED -/** Animate planes, scroll walls, etc. and keeps track of level timelimit and exits if time is up. - * - * \sa P_CheckTimeLimit, P_CheckPointLimit - */ -void P_UpdateSpecials(void) +static void P_UpdateAnimFlats(void) { anim_t *anim; INT32 i; size_t j; levelflat_t *foundflats; // for flat animation - // LEVEL TIMER - P_CheckTimeLimit(); - - // POINT LIMIT - P_CheckPointLimit(); - - // Dynamic slopeness - if (!midgamejoin) // run here when not joined midgame to prevent any potential issues that may arise - P_RunDynamicSlopes(); - // ANIMATE TEXTURES for (anim = anims; anim < lastanim; anim++) { @@ -4553,15 +4599,40 @@ void P_UpdateSpecials(void) } } +/** Animate planes, scroll walls, etc. and keeps track of level timelimit and exits if time is up. + * + * \sa P_CheckTimeLimit, P_CheckPointLimit + */ +void P_UpdateSpecials(void) +{ + // LEVEL TIMER + P_CheckTimeLimit(); + + // POINT LIMIT + P_CheckPointLimit(); + +#ifdef COMPAT_VANILLA + // Dynamic slopeness + // we run this here only when not joined midrace + // for vanilla compat reasons :chaosleep: + if (!midgamejoin) + P_RunDynamicSlopes(); +#endif + + P_UpdateAnimFlats(); +} + static inline ffloor_t *P_GetFFloorBySec(sector_t *sec, sector_t *sec2) { ffloor_t *rover; if (!sec->ffloors) return NULL; + for (rover = sec->ffloors; rover; rover = rover->next) if (rover->secnum == (size_t)(sec2 - sectors)) return rover; + return NULL; } @@ -4612,6 +4683,7 @@ static ffloor_t *P_AddFakeFloor(sector_t *sec, sector_t *sec2, line_t *master, f if (sec == sec2) return NULL; //Don't need a fake floor on a control sector. + if ((ffloor = (P_GetFFloorBySec(sec, sec2)))) return ffloor; // If this ffloor already exists, return it @@ -4718,7 +4790,7 @@ static ffloor_t *P_AddFakeFloor(sector_t *sec, sector_t *sec2, line_t *master, f P_AddSpikeThinker(sec, (INT32)sec2num); } // Should this FOF have friction? - else if(th->function == (actionf_p1)T_Friction) + else if (th->function == (actionf_p1)T_Friction) { f = (friction_t *)th; @@ -4726,7 +4798,7 @@ static ffloor_t *P_AddFakeFloor(sector_t *sec, sector_t *sec2, line_t *master, f Add_Friction(f->friction, f->movefactor, (INT32)(sec-sectors), f->affectee); } // Should this FOF have wind/current/pusher? - else if(th->function == (actionf_p1)T_Pusher) + else if (th->function == (actionf_p1)T_Pusher) { p = (pusher_t *)th; @@ -5164,11 +5236,18 @@ void T_LaserFlash(laserthink_t *flash) if (thing->health <= 0) continue; + // thing is neither shootable nor an egg guard shield + if (!(thing->flags & MF_SHOOTABLE) && (thing->type != MT_EGGSHIELD)) + continue; + top = P_GetSpecialTopZ(thing, sourcesec, sector); + + if (thing->z >= top) + continue; + bottom = P_GetSpecialBottomZ(thing, sourcesec, sector); - if (thing->z >= top - || thing->z + thing->height <= bottom) + if (thing->z + thing->height <= bottom) continue; if (thing->flags & MF_SHOOTABLE) @@ -5223,6 +5302,18 @@ static void P_RunLevelLoadExecutors(void) } } +static fixed_t P_GetSectorGravityFactor(sector_t *sec) +{ + return FixedDiv(*sec->gravity >> FRACBITS, 1000); +} + +fixed_t P_GetSectorGravity(sector_t *sec) +{ + if (sec && sec->gravity) + return FixedMul(gravity, P_GetSectorGravityFactor(sec)); + return gravity; +} + /** After the map has loaded, scans for specials that spawn 3Dfloors and * thinkers. * @@ -5262,7 +5353,7 @@ void P_SpawnSpecials(INT32 fromnetsave, boolean reloadinggamestate) continue; // Process Section 1 - switch(GETSECSPECIAL(sector->special, 1)) + switch (GETSECSPECIAL(sector->special, 1)) { case 5: // Spikes P_AddSpikeThinker(sector, (INT32)(sector-sectors)); @@ -5274,7 +5365,7 @@ void P_SpawnSpecials(INT32 fromnetsave, boolean reloadinggamestate) } // Process Section 2 - switch(GETSECSPECIAL(sector->special, 2)) + switch (GETSECSPECIAL(sector->special, 2)) { case 10: // Time for special stage sstimer = (sector->floorheight>>FRACBITS) * TICRATE + 6; // Time to finish @@ -5287,7 +5378,7 @@ void P_SpawnSpecials(INT32 fromnetsave, boolean reloadinggamestate) } // Process Section 4 - switch(GETSECSPECIAL(sector->special, 4)) + switch (GETSECSPECIAL(sector->special, 4)) { case 10: // Circuit finish line if (G_RaceGametype()) @@ -5323,11 +5414,13 @@ void P_SpawnSpecials(INT32 fromnetsave, boolean reloadinggamestate) // Allocate each list, and then zero the count so we can use it to track // the end of the list as we add the thinkers for (i = 0; i < numsectors; i++) - if(secthinkers[i].count > 0) + { + if (secthinkers[i].count > 0) { secthinkers[i].thinkers = Z_Malloc(secthinkers[i].count * sizeof(thinker_t *), PU_STATIC, NULL); secthinkers[i].count = 0; } + } // Finally, populate the lists. for (th = thinkercap.next; th != &thinkercap; th = th->next) @@ -5407,6 +5500,7 @@ void P_SpawnSpecials(INT32 fromnetsave, boolean reloadinggamestate) if ((lines[i].flags & (ML_NOSONIC|ML_NOTAILS)) != (ML_NOSONIC|ML_NOTAILS)) // If you can do something... { angle_t flatangle = InvAngle(lines[i].angle); + fixed_t xoffs; fixed_t yoffs; @@ -5979,7 +6073,7 @@ void P_SpawnSpecials(INT32 fromnetsave, boolean reloadinggamestate) break; case 259: // Make-Your-Own FOF! - if (lines[i].sidenum[1] != 0xffff) + if (lines[i].sidenum[1] != NO_INDEX) { UINT8 *data; UINT16 b; @@ -6426,15 +6520,19 @@ void T_Scroll(scroll_t *s) if (thing->flags2 & MF2_PUSHED) // Already pushed this tic by an exclusive pusher. continue; - height = P_GetSpecialBottomZ(thing, sec, psec); - if (!(thing->flags & MF_NOCLIP)) // Thing must be clipped - if (!(thing->flags & MF_NOGRAVITY || thing->z+thing->height != height)) // Thing must a) be non-floating and have z+height == height { - // Move objects only if on floor - // non-floating, and clipped. - P_DoScrollMove(thing, dx, dy, s->exclusive); + height = P_GetSpecialBottomZ(thing, sec, psec); + + if (!(thing->flags & MF_NOGRAVITY || thing->z+thing->height != height)) // Thing must a) be non-floating and have z+height == height + { + // Move objects only if on floor + // non-floating, and clipped. + P_DoScrollMove(thing, dx, dy, s->exclusive); + } + } + } // end of for loop through touching_thinglist } // end of loop through sectors } @@ -6448,14 +6546,16 @@ void T_Scroll(scroll_t *s) if (thing->flags2 & MF2_PUSHED) continue; - height = P_GetSpecialBottomZ(thing, sec, sec); - - if (!(thing->flags & MF_NOCLIP) && - (!(thing->flags & MF_NOGRAVITY || thing->z > height))) + if (!(thing->flags & MF_NOCLIP)) // Thing must be clipped { - // Move objects only if on floor or underwater, - // non-floating, and clipped. - P_DoScrollMove(thing, dx, dy, s->exclusive); + height = P_GetSpecialBottomZ(thing, sec, sec); + + if (!(thing->flags & MF_NOGRAVITY || thing->z > height)) + { + // Move objects only if on floor or underwater, + // non-floating, and clipped. + P_DoScrollMove(thing, dx, dy, s->exclusive); + } } } } @@ -6501,14 +6601,16 @@ void T_Scroll(scroll_t *s) if (thing->flags2 & MF2_PUSHED) continue; - height = P_GetSpecialTopZ(thing, sec, psec); - if (!(thing->flags & MF_NOCLIP)) // Thing must be clipped - if (!(thing->flags & MF_NOGRAVITY || thing->z != height))// Thing must a) be non-floating and have z == height { - // Move objects only if on floor or underwater, - // non-floating, and clipped. - P_DoScrollMove(thing, dx, dy, s->exclusive); + height = P_GetSpecialTopZ(thing, sec, psec); + + if (!(thing->flags & MF_NOGRAVITY || thing->z != height))// Thing must a) be non-floating and have z == height + { + // Move objects only if on floor or underwater, + // non-floating, and clipped. + P_DoScrollMove(thing, dx, dy, s->exclusive); + } } } // end of for loop through touching_thinglist } // end of loop through sectors @@ -6523,14 +6625,16 @@ void T_Scroll(scroll_t *s) if (thing->flags2 & MF2_PUSHED) continue; - height = P_GetSpecialTopZ(thing, sec, sec); - - if (!(thing->flags & MF_NOCLIP) && - (!(thing->flags & MF_NOGRAVITY || thing->z+thing->height < height))) + if (!(thing->flags & MF_NOCLIP)) // Thing must be clipped { - // Move objects only if on floor or underwater, - // non-floating, and clipped. - P_DoScrollMove(thing, dx, dy, s->exclusive); + height = P_GetSpecialTopZ(thing, sec, sec); + + if (!(thing->flags & MF_NOGRAVITY || thing->z+thing->height < height)) + { + // Move objects only if on floor or underwater, + // non-floating, and clipped. + P_DoScrollMove(thing, dx, dy, s->exclusive); + } } } } @@ -6698,7 +6802,7 @@ static void P_SpawnScrollers(void) case 506: s = lines[i].sidenum[1]; - if (s != 0xffff) + if (s != NO_INDEX) Add_Scroller(sc_side, -sides[s].textureoffset, sides[s].rowoffset, -1, lines[i].sidenum[0], accel, 0); else CONS_Debug(DBG_GAMELOGIC, "Line special 506 (line #%s) missing 2nd side!\n", sizeu1(i)); @@ -6909,6 +7013,7 @@ static void P_SpawnFriction(void) INT32 movefactor; // applied to each player move to simulate inertia for (i = 0; i < numlines; i++, l++) + { if (l->special == 540) { //length = P_AproxDistance(l->dx, l->dy)>>FRACBITS; @@ -6942,6 +7047,7 @@ static void P_SpawnFriction(void) for (s = -1; (s = P_FindSectorFromLineTag(l, s)) >= 0 ;) Add_Friction(friction, movefactor, s, -1); } + } } /* @@ -6990,9 +7096,10 @@ static void Add_Pusher(pushertype_e type, fixed_t x_mag, fixed_t y_mag, mobj_t * // "The right triangle of the square of the length of the hypotenuse is equal to the sum of the squares of the lengths of the other two sides." // "Bah! Stupid brains! Don't you know anything besides the Pythagorean Theorem?" - Earthworm Jim if (type == p_downcurrent || type == p_upcurrent || type == p_upwind || type == p_downwind) - p->magnitude = P_AproxDistance(p->x_mag,p->y_mag)<<(FRACBITS-PUSH_FACTOR); + p->magnitude = P_AproxDistance(p->x_mag, p->y_mag)<<(FRACBITS-PUSH_FACTOR); else - p->magnitude = P_AproxDistance(p->x_mag,p->y_mag); + p->magnitude = P_AproxDistance(p->x_mag, p->y_mag); + if (source) // point source exist? { // where force goes to zero @@ -7031,7 +7138,7 @@ static inline boolean PIT_PushThing(mobj_t *thing) return false; // Allow this to affect pushable objects at some point? - if (thing->player && (!(thing->flags & (MF_NOGRAVITY | MF_NOCLIP)) || UNLIKELY(thing->player->pflags & PF_NIGHTSMODE))) + if (thing->player && (!(thing->flags & (MF_NOGRAVITY | MF_NOCLIP)) || nightsplayer(thing->player))) { INT32 dist; INT32 speed; @@ -7043,15 +7150,14 @@ static inline boolean PIT_PushThing(mobj_t *thing) // don't fade wrt Z if health & 2 (mapthing has multi flag) if (tmpusher->source->health & 2) - dist = P_AproxDistance(thing->x - sx,thing->y - sy); + dist = P_AproxDistance(thing->x - sx, thing->y - sy); else { // Make sure the Z is in range if (thing->z < sz - tmpusher->radius || thing->z > sz + tmpusher->radius) return false; - dist = P_AproxDistance(P_AproxDistance(thing->x - sx, thing->y - sy), - thing->z - sz); + dist = P_AproxDistance(P_AproxDistance(thing->x - sx, thing->y - sy), thing->z - sz); } speed = (tmpusher->magnitude - ((dist>>FRACBITS)>>1))<<(FRACBITS - PUSH_FACTOR - 1); @@ -7062,7 +7168,7 @@ static inline boolean PIT_PushThing(mobj_t *thing) // Written with bits and pieces of P_HomingAttack if ((speed > 0) && (P_CheckSight(thing, tmpusher->source))) { - if (LIKELY(!(thing->player->pflags & PF_NIGHTSMODE))) + if (!nightsplayer(thing->player)) { // only push wrt Z if health & 1 (mapthing has ambush flag) if (tmpusher->source->health & 1) @@ -7214,7 +7320,6 @@ void T_Pusher(pusher_t *p) if (p->type == p_push) { - // Seek out all pushable things within the force radius of this // point pusher. Crosses sectors, so use blockmap. @@ -7257,13 +7362,16 @@ void T_Pusher(pusher_t *p) if (thing->flags2 & MF2_PUSHED) continue; - if (thing->player && thing->player->pflags & PF_ROPEHANG) - continue; + if (thing->player) + { + if (thing->player->pflags & PF_ROPEHANG) + continue; - if (thing->player && (thing->state == &states[thing->info->painstate]) - && (thing->player->powers[pw_flashing] > (K_GetKartFlashing(thing->player)/4)*3 - && thing->player->powers[pw_flashing] <= K_GetKartFlashing(thing->player))) - continue; + if ((thing->state == &states[thing->info->painstate]) + && (thing->player->powers[pw_flashing] > (K_GetKartFlashing(thing->player)/4)*3 + && thing->player->powers[pw_flashing] <= K_GetKartFlashing(thing->player))) + continue; + } inFOF = touching = moved = false; @@ -7393,7 +7501,7 @@ void T_Pusher(pusher_t *p) if (p->slider && thing->player) { boolean jumped = (thing->player->pflags & PF_JUMPED); - P_ResetPlayer (thing->player); + P_ResetPlayer(thing->player); if (jumped) thing->player->pflags |= PF_JUMPED; @@ -7461,16 +7569,17 @@ static void P_SpawnPushers(void) mobj_t *thing; for (i = 0; i < numlines; i++, l++) + { switch (l->special) { case 541: // wind for (s = -1; (s = P_FindSectorFromLineTag(l, s)) >= 0 ;) Add_Pusher(p_wind, l->dx, l->dy, NULL, s, -1, l->flags & ML_NOCLIMB, l->flags & ML_EFFECT4); - break; + break; case 544: // current for (s = -1; (s = P_FindSectorFromLineTag(l, s)) >= 0 ;) Add_Pusher(p_current, l->dx, l->dy, NULL, s, -1, l->flags & ML_NOCLIMB, l->flags & ML_EFFECT4); - break; + break; case 547: // push/pull for (s = -1; (s = P_FindSectorFromLineTag(l, s)) >= 0 ;) { @@ -7482,20 +7591,21 @@ static void P_SpawnPushers(void) case 545: // current up for (s = -1; (s = P_FindSectorFromLineTag(l, s)) >= 0 ;) Add_Pusher(p_upcurrent, l->dx, l->dy, NULL, s, -1, l->flags & ML_NOCLIMB, l->flags & ML_EFFECT4); - break; + break; case 546: // current down for (s = -1; (s = P_FindSectorFromLineTag(l, s)) >= 0 ;) Add_Pusher(p_downcurrent, l->dx, l->dy, NULL, s, -1, l->flags & ML_NOCLIMB, l->flags & ML_EFFECT4); - break; + break; case 542: // wind up for (s = -1; (s = P_FindSectorFromLineTag(l, s)) >= 0 ;) Add_Pusher(p_upwind, l->dx, l->dy, NULL, s, -1, l->flags & ML_NOCLIMB, l->flags & ML_EFFECT4); - break; + break; case 543: // wind down for (s = -1; (s = P_FindSectorFromLineTag(l, s)) >= 0 ;) Add_Pusher(p_downwind, l->dx, l->dy, NULL, s, -1, l->flags & ML_NOCLIMB, l->flags & ML_EFFECT4); - break; + break; } + } } void P_StartQuake(tic_t time, fixed_t intensity, fixed_t radius) diff --git a/src/p_spec.h b/src/p_spec.h index 7b763c498..679ee65dc 100644 --- a/src/p_spec.h +++ b/src/p_spec.h @@ -56,6 +56,8 @@ sector_t *P_PlayerTouchingSectorSpecial(player_t *player, INT32 section, INT32 n void P_PlayerInSpecialSector(player_t *player); void P_ProcessSpecialSector(player_t *player, sector_t *sector, sector_t *roversector); +fixed_t P_GetSectorGravity(sector_t *sec); + fixed_t P_FindLowestFloorSurrounding(sector_t *sec); fixed_t P_FindHighestFloorSurrounding(sector_t *sec); diff --git a/src/p_tick.c b/src/p_tick.c index 24142a823..455a8d5ac 100644 --- a/src/p_tick.c +++ b/src/p_tick.c @@ -38,6 +38,8 @@ #include "i_video.h" // rendermode #include "m_perfstats.h" +#include "lua_profile.h" + // Object place #include "m_cheat.h" @@ -611,8 +613,19 @@ void P_Ticker(boolean run) #ifdef DEMO_COMPAT_100 } #endif + + // Lookback is normally handled inside G_BuildTiccmd, which isn't called in replays so we're doing that manually + // idk if this is best place to handle this tho... + for (i = 0; i <= splitscreen; ++i) + { + const boolean usejoystick = cv_usejoystick[i].value; + INT32 axis = JoyAxis(AXISLOOKBACK, i+1); + camspin[i] = (InputDown(gc_lookback, i+1) || (usejoystick && axis > 0)); + } } + LUA_ResetTicTimers(); + ps_lua_mobjhooks.value.i = 0; ps_checkposition_calls.value.i = 0; @@ -620,6 +633,7 @@ void P_Ticker(boolean run) LUA_HookPreThinkFrame(); PS_STOP_TIMING(ps_lua_prethinkframe_time); + // OK! Now that we got all of that sorted, players can think! PS_START_TIMING(ps_playerthink_time); for (i = 0; i < MAXPLAYERS; i++) { @@ -637,7 +651,9 @@ void P_Ticker(boolean run) if (run) { // Dynamic slopeness +#ifdef COMPAT_VANILLA if (midgamejoin) // only run here if we joined midgame to fix some desynchs +#endif P_RunDynamicSlopes(); PS_START_TIMING(ps_thinkertime); @@ -664,6 +680,7 @@ void P_Ticker(boolean run) PS_STOP_TIMING(ps_lua_thinkframe_time); } + // Run shield positioning P_RunOverlays(); P_RunShadows(); @@ -785,7 +802,7 @@ void P_Ticker(boolean run) if (!player->mo) continue; - const boolean skybox = (skyboxmo[0] && cv_skybox.value); + const boolean skybox = (skyboxmo[0] && cv_skybox.value); // True if there's a skybox object and skyboxes are on if (skyVisiblePerPlayer[i] && skybox) { diff --git a/src/p_user.c b/src/p_user.c index 9df7d2735..8480b0e60 100644 --- a/src/p_user.c +++ b/src/p_user.c @@ -74,7 +74,7 @@ void P_Thrust(mobj_t *mo, angle_t angle, fixed_t move) mo->momx += FixedMul(move, FINECOSINE(angle)); - if (LIKELY(!(twodlevel || (mo->flags2 & MF2_TWOD)))) + if (!twodmo(mo)) mo->momy += FixedMul(move, FINESINE(angle)); } @@ -90,7 +90,7 @@ void P_InstaThrust(mobj_t *mo, angle_t angle, fixed_t move) mo->momx = FixedMul(move, FINECOSINE(angle)); - if (LIKELY(!(twodlevel || (mo->flags2 & MF2_TWOD)))) + if (!twodmo(mo)) mo->momy = FixedMul(move,FINESINE(angle)); } @@ -475,7 +475,7 @@ void P_PlayLivesJingle(player_t *player) if (UNLIKELY(use1upSound)) S_StartSound(NULL, sfx_oneup); - else if (UNLIKELY(mariomode)) + else if (mariomode) S_StartSound(NULL, sfx_marioa); else { @@ -503,7 +503,7 @@ void P_PlayRinglossSound(mobj_t *source, mobj_t *damager) S_StartSound(NULL, sfx); } else - S_StartSound(source, UNLIKELY(mariomode) ? sfx_mario8 : sfx_khurt1 + key); + S_StartSound(source, mariomode ? sfx_mario8 : sfx_khurt1 + key); } else S_StartSound(source, sfx_slip); @@ -1122,22 +1122,26 @@ void P_SpawnShieldOrb(player_t *player) P_SetTarget(&ov->target, shieldobj); P_SetMobjState(ov, shieldobj->info->seestate); } + if (shieldobj->info->meleestate) { ov = P_SpawnMobj(shieldobj->x, shieldobj->y, shieldobj->z, MT_OVERLAY); P_SetTarget(&ov->target, shieldobj); P_SetMobjState(ov, shieldobj->info->meleestate); } + if (shieldobj->info->missilestate) { ov = P_SpawnMobj(shieldobj->x, shieldobj->y, shieldobj->z, MT_OVERLAY); P_SetTarget(&ov->target, shieldobj); P_SetMobjState(ov, shieldobj->info->missilestate); } + if (player->powers[pw_shield] & SH_FORCE) { //Copy and pasted from P_ShieldLook in p_mobj.c shieldobj->movecount = (player->powers[pw_shield] & 0xFF); + if (shieldobj->movecount < 1) { if (shieldobj->info->painstate) @@ -1202,6 +1206,7 @@ mobj_t *P_SpawnGhostMobj(mobj_t *mobj) ghost->pitch = mobj->pitch; ghost->roll = mobj->roll; ghost->rollangle = mobj->rollangle; + ghost->temprollangle = mobj->temprollangle; ghost->sloperoll = mobj->sloperoll; ghost->slopepitch = mobj->slopepitch; @@ -1569,10 +1574,12 @@ static void P_CheckBouncySectors(player_t *player) newmom = -8*FRACUNIT; } - if (newmom > P_GetPlayerHeight(player)/2) - newmom = P_GetPlayerHeight(player)/2; - else if (newmom < -P_GetPlayerHeight(player)/2) - newmom = -P_GetPlayerHeight(player)/2; + const fixed_t halfpheight = P_GetPlayerHeight(player)/2; + + if (newmom > halfpheight) + newmom = halfpheight; + else if (newmom < -halfpheight) + newmom = -halfpheight; momentum.z = newmom*2; @@ -1718,7 +1725,7 @@ static void P_DoBubbleBreath(player_t *player) else zh = player->mo->z + FixedDiv(player->mo->height,5*(FRACUNIT/4)); - if (!(player->mo->eflags & MFE_UNDERWATER) || player->spectator || ((player->powers[pw_shield] & SH_NOSTACK) == SH_ELEMENTAL && !(player->pflags & PF_NIGHTSMODE))) + if (!(player->mo->eflags & MFE_UNDERWATER) || player->spectator || ((player->powers[pw_shield] & SH_NOSTACK) == SH_ELEMENTAL && !nightsplayer(player))) return; if (P_RandomChance(FRACUNIT/16)) @@ -1835,6 +1842,9 @@ void P_Telekinesis(player_t *player, fixed_t thrust, fixed_t range) if (!((mo2->flags & MF_SHOOTABLE && mo2->flags & MF_ENEMY) || mo2->type == MT_EGGGUARD || mo2->player)) continue; + if (mo2->health <= 0) + continue; + dist = P_AproxDistance(P_AproxDistance(player->mo->x-mo2->x, player->mo->y-mo2->y), player->mo->z-mo2->z); if (range < dist) @@ -1843,15 +1853,12 @@ void P_Telekinesis(player_t *player, fixed_t thrust, fixed_t range) if (!P_CheckSight(player->mo, mo2)) continue; // if your psychic powers can't "see" it don't bother - if (mo2->health > 0) - { - an = R_PointToAngle2(player->mo->x, player->mo->y, mo2->x, mo2->y); + an = R_PointToAngle2(player->mo->x, player->mo->y, mo2->x, mo2->y); - P_Thrust(mo2, an, thrust); + P_Thrust(mo2, an, thrust); - if (mo2->type == MT_GOLDBUZZ || mo2->type == MT_REDBUZZ) - mo2->tics += 8; - } + if (mo2->type == MT_GOLDBUZZ || mo2->type == MT_REDBUZZ) + mo2->tics += 8; } //P_SpawnThokMobj(player); @@ -2291,7 +2298,7 @@ static void P_MovePlayer(player_t *player) P_3dMovement(player); } - if (UNLIKELY(maptol & TOL_2D)) // psure this doesent even work at all + if (twodlevel) // psure this doesent even work at all runspd = FixedMul(runspd, 2*FRACUNIT/3); ///////////////////////// @@ -2355,7 +2362,7 @@ static void P_MovePlayer(player_t *player) if (onground && leveltime % 50 == 0 && player->kartstuff[k_drift] != 0) S_StartSound(player->mo, sfx_drift); // Leveltime being 50 might take a while at times. We'll start it up once, isntantly. - else if (onground && !S_SoundPlaying(player->mo, sfx_drift) && player->kartstuff[k_drift] != 0) + else if (onground && player->kartstuff[k_drift] != 0 && !S_SoundPlaying(player->mo, sfx_drift)) S_StartSound(player->mo, sfx_drift); // Ok, we'll stop now. else if (player->kartstuff[k_drift] == 0 || !onground) @@ -2736,16 +2743,16 @@ boolean P_LookForEnemies(player_t *player) || ((mo->z+mo->height < player->mo->z+player->mo->height-FixedMul(MAXSTEPMOVE, mapobjectscale)) && (player->mo->eflags & MFE_VERTICALFLIP))) // Reverse gravity check - Flame. continue; // Don't home upwards! - if (P_AproxDistance(P_AproxDistance(player->mo->x-mo->x, player->mo->y-mo->y), - player->mo->z-mo->z) > FixedMul(RING_DIST, player->mo->scale)) + const fixed_t modist = P_AproxDistance(P_AproxDistance(player->mo->x-mo->x, player->mo->y-mo->y), player->mo->z-mo->z); + + if (modist > FixedMul(RING_DIST, player->mo->scale)) continue; // out of range - if (UNLIKELY((twodlevel || player->mo->flags2 & MF2_TWOD) - && abs(player->mo->y-mo->y) > player->mo->radius)) + + if (twodmo(player->mo) && abs(player->mo->y-mo->y) > player->mo->radius) continue; // not in your 2d plane - if (closestmo && P_AproxDistance(P_AproxDistance(player->mo->x-mo->x, player->mo->y-mo->y), - player->mo->z-mo->z) > P_AproxDistance(P_AproxDistance(player->mo->x-closestmo->x, + if (closestmo && modist > P_AproxDistance(P_AproxDistance(player->mo->x-closestmo->x, player->mo->y-closestmo->y), player->mo->z-closestmo->z)) continue; @@ -3149,8 +3156,8 @@ static ticcmd_t *P_CameraCmd(camera_t *cam, UINT8 num) cmd->angleturn = (INT16)(lang >> TICCMD_REDUCE); cmd->aiming = G_ClipAimingPitch(&laim); - const boolean analogjoystickmove = cv_usejoystick[num].value && !Joystick[num].bGamepadStyle; - const boolean gamepadjoystickmove = cv_usejoystick[num].value && Joystick[num].bGamepadStyle; + const boolean analogjoystickmove = cv_usejoystick[num].value && !DigitalGamepadStyle(num); + const boolean gamepadjoystickmove = cv_usejoystick[num].value && DigitalGamepadStyle(num); usejoystick = (analogjoystickmove || gamepadjoystickmove); @@ -3501,7 +3508,7 @@ static boolean P_CheckNoclipCameraPosition(player_t *player, camera_t *thiscam, boolean cameranoclip; mobj_t *mo = player->mo; - cameranoclip = ((player->pflags & (PF_NOCLIP|PF_NIGHTSMODE)) + cameranoclip = (nightsplayer(player) || (mo->flags & (MF_NOCLIP|MF_NOCLIPHEIGHT)) // Noclipping player camera noclips too!! || (leveltime < introtime)); // Kart intro cam @@ -3733,7 +3740,7 @@ boolean P_MoveChaseCamera(player_t *player, camera_t *thiscam, boolean resetcall fixed_t f1, f2; // We probably shouldn't move the camera if there is no player or player mobj somehow - if (!player || !player->mo) + if (!player || P_MobjWasRemoved(player->mo)) return true; // This can happen when joining @@ -4090,7 +4097,7 @@ boolean P_MoveChaseCamera(player_t *player, camera_t *thiscam, boolean resetcall angle -= (angle - thiscam->pitch)/2; } - if (player->playerstate != PST_DEAD && LIKELY(!((player->pflags & PF_NIGHTSMODE) && player->exiting))) + if (player->playerstate != PST_DEAD && !(nightsplayer(player) && player->exiting)) angle += (focusaiming < ANGLE_180 ? focusaiming/2 : InvAngle(InvAngle(focusaiming)/2)); // overcomplicated version of '((signed)focusaiming)/2;' if (!camstill && !timeover) // Keep the view still... @@ -4167,7 +4174,7 @@ boolean P_SpectatorJoinGame(player_t *player) // Team changing in Team Match and CTF // Pressing fire assigns you to a team that needs players if allowed. // Partial code reproduction from p_tick.c autobalance code. - else if (UNLIKELY(G_GametypeHasTeams())) + else if (G_GametypeHasTeams()) { INT32 changeto = 0; INT32 z, numplayersred = 0, numplayersblue = 0; @@ -4580,6 +4587,7 @@ void P_PlayerThink(player_t *player) { short int i; mo->flags |= MF_NOCLIPHEIGHT; + for (i = 0; i < 32; i++) { // Debug drawing @@ -4863,7 +4871,7 @@ void P_PlayerThink(player_t *player) // Even if not NiGHTS, pull in nearby objects when walking around as John Q. Elliot. if (UNLIKELY(!objectplacing && !((netgame || multiplayer) && player->spectator) - && maptol & TOL_NIGHTS && (!(player->pflags & PF_NIGHTSMODE) || player->powers[pw_nights_helper]))) + && nightsmode && (!nightsplayer(player) || player->powers[pw_nights_helper]))) { thinker_t *th; mobj_t *mo2; @@ -4965,7 +4973,7 @@ void P_PlayerThink(player_t *player) #endif // check for use - if (LIKELY(!(player->pflags & PF_NIGHTSMODE))) + if (!nightsplayer(player)) { if (cmd->buttons & BT_BRAKE) player->pflags |= PF_USEDOWN; @@ -5082,6 +5090,11 @@ void P_PlayerThink(player_t *player) player->squishdance.time = 0; } + if (player->stairjank > 0) + { + player->stairjank--; + } + // Flash player after being hit. if (!(player->kartstuff[k_hyudorotimer] // SRB2kart - fixes Hyudoro not flashing when it should. || player->kartstuff[k_growshrinktimer] > 0 // Grow doesn't flash either. @@ -5151,7 +5164,7 @@ void P_PlayerAfterThink(player_t *player) } } - if (UNLIKELY(player->pflags & PF_NIGHTSMODE)) + if (nightsplayer(player)) { player->powers[pw_gravityboots] = 0; } diff --git a/src/r_bsp.cpp b/src/r_bsp.cpp index 8fd66299c..68de16478 100644 --- a/src/r_bsp.cpp +++ b/src/r_bsp.cpp @@ -321,12 +321,19 @@ static void R_AddLine(seg_t *line) angle_t angle1, angle2, span, tspan; static sector_t tempsec; boolean bothfloorssky = false; + fixed_t v1x, v1y, v2x, v2y; // the seg's vertexes as fixed_t g_portal = NULL; + v1x = line->v1->x; + v1y = line->v1->y; + + v2x = line->v2->x; + v2y = line->v2->y; + // big room fix - angle1 = R_PointToAngle64(line->v1->x, line->v1->y); - angle2 = R_PointToAngle64(line->v2->x, line->v2->y); + angle1 = R_PointToAngle64(v1x, v1y); + angle2 = R_PointToAngle64(v2x, v2y); curline = line; @@ -519,6 +526,7 @@ static boolean R_CheckBBox(const fixed_t *bspcoord) angle_t angle1, angle2; INT32 sx1, sx2; const INT32* check; + fixed_t x1, y1, x2, y2; // Find the corners of the box // that define the edges from current viewpoint. @@ -532,9 +540,14 @@ static boolean R_CheckBBox(const fixed_t *bspcoord) check = checkcoord[boxpos]; + x1 = bspcoord[check[0]]; + y1 = bspcoord[check[1]]; + x2 = bspcoord[check[2]]; + y2 = bspcoord[check[3]]; + // big room fix - angle1 = R_PointToAngle64(bspcoord[check[0]], bspcoord[check[1]]) - viewangle; - angle2 = R_PointToAngle64(bspcoord[check[2]], bspcoord[check[3]]) - viewangle; + angle1 = R_PointToAngle64(x1, y1) - viewangle; + angle2 = R_PointToAngle64(x2, y2) - viewangle; // cph - replaced old code, which was unclear and badly commented // Much more efficient code now diff --git a/src/r_defs.h b/src/r_defs.h index 217314028..680a8a9cc 100644 --- a/src/r_defs.h +++ b/src/r_defs.h @@ -430,7 +430,7 @@ typedef struct line_s INT16 tag; // Visual appearance: sidedefs. - UINT16 sidenum[2]; // sidenum[1] will be 0xffff if one-sided + UINT16 sidenum[2]; // sidenum[1] will be NO_INDEX if one-sided fixed_t alpha; // translucency UINT8 blendmode; // blendmode diff --git a/src/r_fps.cpp b/src/r_fps.cpp index 7ccebf8e5..b96c9de23 100644 --- a/src/r_fps.cpp +++ b/src/r_fps.cpp @@ -387,10 +387,10 @@ void R_InterpolatePrecipMobjState(precipmobj_t *mobj, fixed_t frac, interpmobjst return; } - out->x = R_LerpFixed(mobj->old_x, mobj->x, frac); - out->y = R_LerpFixed(mobj->old_y, mobj->y, frac); - out->z = R_LerpFixed(mobj->old_z, mobj->z, frac); - out->scale = mapobjectscale; + out->x = R_LerpFixed(mobj->old_x, mobj->x, frac); + out->y = R_LerpFixed(mobj->old_y, mobj->y, frac); + out->z = R_LerpFixed(mobj->old_z, mobj->z, frac); + out->scale = mapobjectscale; } static levelinterpolator_t *CreateInterpolator(levelinterpolator_type_e type, thinker_t *thinker) @@ -757,6 +757,45 @@ void R_UpdateMobjInterpolators(void) } } +// reset banan and eggbox rollangle when they´re on the ground +// if not cv_bananthrowroll option "+Onground" +static void R_ResetBananaRollangle(mobj_t* mobj) +{ + if (!mobj->rollangle) + return; + + if (mobj->type != MT_BANANA && mobj->type != MT_EGGMANITEM) // always reset eggboxes + return; + + // keep banans "rotated" if we want them to + if (mobj->type == MT_BANANA && cv_bananthrowroll.value == 2) + return; + + // only reset if on ground + if (!P_IsObjectOnGround(mobj)) + return; + + mobj->rollangle = 0; +} + +// Reset our Sprite scales and offsets +// at the start of the tic +// this is just to make things simpler +// as we dont have to reset it ourselves after use +// done at the start so lua can still overwrite everything +static void R_ResetMobjSpriteStuff(mobj_t *mobj) +{ + mobj->spritexscale = mobj->realxscale; + mobj->spriteyscale = mobj->realyscale; + mobj->spritexoffset = mobj->realxoffset; + mobj->spriteyoffset = mobj->realyoffset; + + mobj->temprollangle = 0; + + // kinda stupid but idk where else to put this + R_ResetBananaRollangle(mobj); +} + // // P_ResetMobjInterpolationState // @@ -795,18 +834,9 @@ void R_ResetMobjInterpolationState(mobj_t *mobj) mobj->player->old_frameangle = mobj->player->frameangle; } - // Reset our Sprite scales and offsets - // at the start of the tic - // this is just to make things simpler - // as we dont have to reset it ourselves after use - // done at the start so lua can still overwrite everything - // technically not interpolation related // but this saves us another thinkerloop and multiple checks lel - mobj->spritexscale = mobj->realxscale; - mobj->spriteyscale = mobj->realyscale; - mobj->spritexoffset = mobj->realxoffset; - mobj->spriteyoffset = mobj->realyoffset; + R_ResetMobjSpriteStuff(mobj); mobj->resetinterp = false; } diff --git a/src/r_main.cpp b/src/r_main.cpp index cf7df9088..ad8f1aa0a 100644 --- a/src/r_main.cpp +++ b/src/r_main.cpp @@ -188,6 +188,7 @@ consvar_t cv_flipcammode = {"flipcammode", "Displayplayer", CV_SAVE, flipcammod consvar_t cv_shadow = {"shadow", "Off", CV_SAVE, CV_OnOff, NULL, 0, NULL, NULL, 0, 0, NULL}; consvar_t cv_shadowoffs = {"offsetshadows", "Off", CV_SAVE, CV_OnOff, NULL, 0, NULL, NULL, 0, 0, NULL}; consvar_t cv_skybox = {"skybox", "On", CV_SAVE, CV_OnOff, NULL, 0, NULL, NULL, 0, 0, NULL}; +consvar_t cv_skydome = {"skydome", "On", CV_SAVE, CV_OnOff, NULL, 0, NULL, NULL, 0, 0, NULL}; consvar_t cv_ffloorclip = {"r_ffloorclip", "On", CV_SAVE, CV_OnOff, NULL, 0, NULL, NULL, 0, 0, NULL}; consvar_t cv_spriteclip = {"r_spriteclip", "On", CV_SAVE, CV_OnOff, NULL, 0, NULL, NULL, 0, 0, NULL}; consvar_t cv_softcyancut = {"softwarecyancut", "On", CV_SAVE, CV_OnOff, NULL, 0, NULL, NULL, 0, 0, NULL}; @@ -410,7 +411,7 @@ angle_t R_PlayerSliptideAngle(player_t *player) if (!sprframe) return 0; - if (sprframe->rotate != SRF_SINGLE || (mo->frame & FF_PAPERSPRITE)) + if (sprframe->rotate != SRF_SINGLE || R_ThingIsPaperSprite(mo)) ang = R_PointToAngle(mo->x, mo->y) - mo->angle; return FixedMul(FINECOSINE((ang) >> ANGLETOFINESHIFT), mo->player->sliproll * mo->player->kartstuff[k_aizdriftstrat]); @@ -1388,6 +1389,21 @@ void R_RenderPlayerView(player_t *player) maskcount_t* masks = static_cast(malloc(sizeof(maskcount_t))); const boolean skybox = (skyboxmo[0] && cv_skybox.value); + // Only do it if it's the first screen being rendered + if (cv_homremoval.value && viewssnum == 0) + { + if (cv_homremoval.value == 1) + { + // Clear the software screen buffer to remove HOM + memset(vid.screens[0], 31, vid.width * vid.height); + } + else if (cv_homremoval.value == 2) + { + //'development' HOM removal -- makes it blindingly obvious if HOM is spotted. + memset(vid.screens[0], 32+(timeinmap&15), vid.width * vid.height); + } + } + // load previous saved value of skyVisible for the player skyVisible = skyVisiblePerPlayer[viewssnum]; @@ -1454,10 +1470,12 @@ void R_RenderPlayerView(player_t *player) NetUpdate(); R_SetColumnContext(COLUMNCONTEXT_FLUSH); + ps_numbspcalls.value.i = ps_numpolyobjects.value.i = ps_numdrawnodes.value.i = 0; PS_START_TIMING(ps_bsptime); R_RenderViewpoint(&masks[nummasks - 1], true); PS_STOP_TIMING(ps_bsptime); + PS_START_TIMING(ps_sw_spritecliptime); R_ClipSprites(drawsegs, NULL); PS_STOP_TIMING(ps_sw_spritecliptime); @@ -1465,8 +1483,8 @@ void R_RenderPlayerView(player_t *player) ps_numsprites.value.i = numvisiblesprites; - PS_START_TIMING(ps_sw_portaltime); // Portal rendering. Hijacks the BSP traversal. + PS_START_TIMING(ps_sw_portaltime); if (portal_base) { portal_t *portal; @@ -1507,8 +1525,7 @@ void R_RenderPlayerView(player_t *player) R_SetColumnContext(COLUMNCONTEXT_DIRECT); PS_START_TIMING(ps_sw_planetime); - if (!skybox) - R_DrawSkyPlanes(); + R_DrawSkyPlanes(); R_DrawPlanes(); PS_STOP_TIMING(ps_sw_planetime); // draw mid texture and sprite @@ -1516,6 +1533,7 @@ void R_RenderPlayerView(player_t *player) PS_START_TIMING(ps_sw_maskedtime); R_DrawMasked(masks, nummasks); PS_STOP_TIMING(ps_sw_maskedtime); + free(masks); // Check for new console commands. @@ -1564,6 +1582,7 @@ void R_RegisterEngineStuff(void) CV_RegisterVar(&cv_shadow); CV_RegisterVar(&cv_shadowoffs); CV_RegisterVar(&cv_skybox); + CV_RegisterVar(&cv_skydome); CV_RegisterVar(&cv_ffloorclip); CV_RegisterVar(&cv_spriteclip); CV_RegisterVar(&cv_secbright); @@ -1598,7 +1617,8 @@ void R_RegisterEngineStuff(void) CV_RegisterVar(&cv_sliptideroll); CV_RegisterVar(&cv_sloperolldist); CV_RegisterVar(&cv_sparkroll); - CV_RegisterVar(&cv_spinoutroll); + CV_RegisterVar(&cv_stairjank); + CV_RegisterVar(&cv_stairjanksfx); CV_RegisterVar(&cv_showhud); CV_RegisterVar(&cv_translucenthud); diff --git a/src/r_main.h b/src/r_main.h index e8b7393e3..3699822a3 100644 --- a/src/r_main.h +++ b/src/r_main.h @@ -213,6 +213,7 @@ extern consvar_t cv_translucency; extern consvar_t cv_drawdist, cv_drawdist_precip, cv_lessprecip; extern consvar_t cv_fov, cv_fovchange; extern consvar_t cv_skybox; +extern consvar_t cv_skydome; extern consvar_t cv_tailspickup; extern consvar_t cv_maxinterpdist; extern consvar_t cv_playerfade; diff --git a/src/r_patch.cpp b/src/r_patch.cpp index f578a8f32..c7c49b827 100644 --- a/src/r_patch.cpp +++ b/src/r_patch.cpp @@ -289,7 +289,7 @@ void R_ParseSPRTINFOLump(UINT16 wadNum, UINT16 lumpNum) sprinfoLumpLength = W_LumpLengthPwad(wadNum, lumpNum); sprinfoText = (char *)Z_Malloc((sprinfoLumpLength+1)*sizeof(char),PU_STATIC,NULL); // Now move the contents of the lump into this new location. - memmove(sprinfoText,sprinfoLump,sprinfoLumpLength); + memmove(sprinfoText, sprinfoLump, sprinfoLumpLength); // Make damn well sure the last character in our new memory location is \0. sprinfoText[sprinfoLumpLength] = '\0'; // Finally, free up the memory from the first data load, because we really diff --git a/src/r_plane.cpp b/src/r_plane.cpp index a6a52fe83..df289faa0 100644 --- a/src/r_plane.cpp +++ b/src/r_plane.cpp @@ -785,6 +785,8 @@ static void R_DrawSkyPlane(visplane_t *pl, void(*skycolfunc)(drawcolumndata_t*), drawcolumndata_t dc = {}; const INT32 texture = texturetranslation[skytexture]; + const boolean skydome = cv_skydome.value != 0; + // Reset column drawer function (note: couldn't we just call colfuncs[BASEDRAWFUNC] directly?) // (that is, unless we'll need to switch drawers in future for some reason) R_SetColumnFunc(BASEDRAWFUNC); @@ -830,8 +832,8 @@ static void R_DrawSkyPlane(visplane_t *pl, void(*skycolfunc)(drawcolumndata_t*), INT32 angle = (pl->viewangle + xtoviewangle[x + i])>>ANGLETOSKYSHIFT; angle -= (skytextureoffset >> FRACBITS); - - dc.iscale = FixedMul(skyscale, FINECOSINE(xtoviewangle[x + i]>>ANGLETOFINESHIFT)); + if (skydome) + dc.iscale = FixedMul(skyscale, FINECOSINE(xtoviewangle[x + i]>>ANGLETOFINESHIFT)); dc.x = x + i; dc.source = R_GetColumn(texture, -angle); // get negative of angle for each column to display sky correct way round! --Monster Iestyn 27/01/18 @@ -866,7 +868,8 @@ static void R_DrawSkyPlane(visplane_t *pl, void(*skycolfunc)(drawcolumndata_t*), INT32 angle = (pl->viewangle + xtoviewangle[x])>>ANGLETOSKYSHIFT; angle -= (skytextureoffset >> FRACBITS); - dc.iscale = FixedMul(skyscale, FINECOSINE(xtoviewangle[x]>>ANGLETOFINESHIFT)); + if (skydome) + dc.iscale = FixedMul(skyscale, FINECOSINE(xtoviewangle[x]>>ANGLETOFINESHIFT)); dc.x = x; dc.source = R_GetColumn(texturetranslation[skytexture], -angle); // get negative of angle for each column to display sky correct way round! --Monster Iestyn 27/01/18 diff --git a/src/r_portal.c b/src/r_portal.c index d84a99be4..f403c17c7 100644 --- a/src/r_portal.c +++ b/src/r_portal.c @@ -272,7 +272,7 @@ static boolean TrimVisplaneBounds(const visplane_t* plane, INT16* start, INT16* * Applies the necessary offsets and rotation to give * a depth illusion to the skybox. */ -void Portal_AddSkybox(const visplane_t* plane) +static void Portal_AddSkybox(const visplane_t* plane) { INT16 start, end; mapheader_t *mh; @@ -333,10 +333,13 @@ void Portal_AddSkyboxPortals(void) INT32 i; UINT16 count = 0; - for (i = 0; i < MAXVISPLANES; i++, pl++) + for (i = 0; i < MAXVISPLANES; i++) { for (pl = visplanes[i]; pl; pl = pl->next) { + if (pl->minx >= pl->maxx) + continue; + if (pl->picnum == skyflatnum) { Portal_AddSkybox(pl); diff --git a/src/r_portal.h b/src/r_portal.h index 223dd83be..4c4583903 100644 --- a/src/r_portal.h +++ b/src/r_portal.h @@ -58,7 +58,6 @@ void Portal_Add2Lines (const INT32 line1, const INT32 line2, const INT32 x1, con void Portal_ClipApply (const portal_t* portal); -void Portal_AddSkybox(const visplane_t* plane); void Portal_AddSkyboxPortals(void); #ifdef __cplusplus diff --git a/src/r_segs.cpp b/src/r_segs.cpp index f94e72b4c..3f6b9d449 100644 --- a/src/r_segs.cpp +++ b/src/r_segs.cpp @@ -311,6 +311,7 @@ static void R_RenderMaskedSegLoop(drawcolumndata_t* dc, drawseg_t *drawseg, INT3 { rw_scalestep = drawseg->scalestep; spryscale = drawseg->scale1 + (x1 - drawseg->x1)*rw_scalestep; + if (dc->numlights) { // reset all lights to their starting heights for (i = 0; i < dc->numlights; i++) @@ -435,6 +436,7 @@ static void R_RenderMaskedSegLoop(drawcolumndata_t* dc, drawseg_t *drawseg, INT3 windowtop = windowbottom + 1; set_colormap_below_light(); } + windowbottom = realbot; if (windowtop < windowbottom) colfunc_2s(dc, col); @@ -711,16 +713,11 @@ void R_RenderThickSideRange(drawseg_t *drawseg, INT32 x1, INT32 x2, ffloor_t *pf rw_scalestep = drawseg->scalestep; spryscale = drawseg->scale1 + (x1 - drawseg->x1)*rw_scalestep; -#define CLAMPMAX INT32_MAX -#define CLAMPMIN (-INT32_MAX) // This is not INT32_MIN on purpose! INT32_MIN makes the drawers freak out. auto overflow_clamp = [&](INT64 overflow_test) { - return (overflow_test > (INT64)CLAMPMAX) ? CLAMPMAX : - (overflow_test > (INT64)CLAMPMIN) ? (fixed_t)overflow_test : - CLAMPMIN; + // This is not INT32_MIN on purpose! INT32_MIN makes the drawers freak out. + return (fixed_t)std::clamp(overflow_test, (-INT32_MAX), INT32_MAX); }; -#undef CLAMPMAX -#undef CLAMPMIN dc->numlights = 0; if (frontsector->numlights) @@ -1885,7 +1882,7 @@ void R_StoreWallRange(INT32 start, INT32 stop) // big room fix if (longboi) - rw_distance = (fixed_t)R_CalcSegDist(curline,viewx,viewy); + rw_distance = (fixed_t)R_CalcSegDist(curline, viewx, viewy); ds_p->x1 = rw_x = start; ds_p->x2 = stop; @@ -2204,7 +2201,7 @@ void R_StoreWallRange(INT32 start, INT32 stop) topremap = (encoremap && !(curline->linedef->flags & ML_TFERLINE)); if ((linedef->flags & (ML_DONTPEGTOP) && (linedef->flags & ML_DONTPEGBOTTOM)) - && linedef->sidenum[1] != 0xffff) + && linedef->sidenum[1] != NO_INDEX) { // Special case... use offsets from 2nd side but only if it has a texture. side_t *def = &sides[linedef->sidenum[1]]; @@ -2602,69 +2599,91 @@ void R_StoreWallRange(INT32 start, INT32 stop) if (linedef->special == HORIZONSPECIAL) // HORIZON LINES { topstep = bottomstep = 0; - topfrac = bottomfrac = (centeryfrac>>4); + topfrac = bottomfrac = (centeryfrac >> 4); topfrac++; // Prevent 1px HOM } else { + topstep = -FixedMul(rw_scalestep, worldtop); + topfrac = (centeryfrac >> 4) - FixedMul(worldtop, rw_scale); + // for anyone that sees this // dont. // this is absolute shit-tier hacks // but i just cant determine this in any sane way // but this checks a shitton of things to make software handle skies better - auto set_topstep_normal = [&] - { - topstep = -FixedMul (rw_scalestep, worldtop); - topfrac = (centeryfrac>>4) - FixedMul (worldtop, rw_scale); - }; - // untextured seg - if (!segtextured && !curline->polyseg) + if (!segtextured && !curline->polyseg) // not for polyobjects..... { - const bool tophigh = (worldhigh <= worldtop && worldhighslope <= worldtopslope); + const boolean nofrontsky = (frontsector->floorpic != skyflatnum && frontsector->ceilingpic != skyflatnum); + const boolean inskybox = (skyboxmo[0] && cv_skybox.value && newview->sky); // dont mess with skyVisible within skybox rendering! - // if we cant see the goddamn skyplane, well there wont be any skybox - // we could kill skyVisible instead, but i want to keep the performance improvemnts it yields - // so we do this absolute trash - if ((tophigh - && (frontsector->floorpic != skyflatnum && frontsector->ceilingpic != skyflatnum)) // try to guess if its a "window" - && ((!backsector) // single sided - || ((backsector && (worldhigh != worldtop || worldhighslope != worldtopslope)) - && (backsector->floorheight >= frontsector->ceilingheight || backsector->ceilingheight <= frontsector->floorheight)))) // check if there is a "thok" sector behind it - skyVisible = true; - - // this is an attempt to fix issues with textureless single sided lines drawing nothing where they should just draw sky instead - if (tophigh && !backsector && frontsector->ceilingpic == skyflatnum) + // single sided line + if (!backsector) { - topstep = -FixedMul (rw_scalestep, worldbottom); - topfrac = (centeryfrac>>4) - FixedMul (worldbottom, rw_scale); + // this is an attempt to fix issues with textureless single sided lines drawing nothing where they should just draw sky instead - // account for slopes to try and get rid of sharp edges from the black void - if (frontsector->f_slope || (backsector && backsector->f_slope)) + // there is a sky flat on the ceiling + // so we can assume this is supposed to draw the sky + if (frontsector->ceilingpic == skyflatnum) { - topstep = -FixedMul (rw_scalestep, worldbottomslope); - topfrac = (centeryfrac>>4) - FixedMul (worldbottomslope, rw_scale); + // just draw sky from top to bottom! + if (frontsector->f_slope) + { + topstep = -FixedMul(rw_scalestep, worldbottomslope); + topfrac = (centeryfrac >> 4) - FixedMul(worldbottomslope, rw_scale); + } + else + { + topstep = -FixedMul(rw_scalestep, worldbottom); + topfrac = (centeryfrac >> 4) - FixedMul(worldbottom, rw_scale); + } + } + else if (nofrontsky && !inskybox) + { + // completely empty wall without sky flats, just assume skybox is visible then + skyVisible = true; } } - else - set_topstep_normal(); - } - else - set_topstep_normal(); + else if (nofrontsky && !inskybox) // if there was a skyflat, drawplane would already set skyvisible + { + // "thok walls" are double sided + // so we need to check a few things here + // to be rather conservative + // as skyrendering is pretty costly! - bottomstep = -FixedMul (rw_scalestep, worldbottom); - bottomfrac = (centeryfrac>>4) - FixedMul (worldbottom, rw_scale); + // ideally we´d just dont care and always draw the skytexture + // or skybox at any time, like gl does + // wonder if there would be a fast way to draw atleast just the texture? + + // gotta shift those here for proper comparisons + const INT32 whigh = worldhigh >> 4; + const INT32 whslope = worldhighslope >> 4; + + // check if there is a window to force skybox to draw + if ((whigh <= worldtop && whslope <= worldtopslope) && (backsector->ceilingpic == skyflatnum)) // backsector has a skyflat? + skyVisible = true; + // otherwise check for thokwalls + else if ((whigh != worldtop || whslope != worldtopslope) && // FIXME: i forgor what this was for lol + (backsector->floorheight >= frontsector->ceilingheight || // thok walls usually are set up like that... + frontsector->floorheight >= backsector->ceilingheight)) // floor higher than the other sides ceiling + skyVisible = true; + } + } + + bottomstep = -FixedMul(rw_scalestep, worldbottom); + bottomfrac = (centeryfrac >> 4) - FixedMul(worldbottom, rw_scale); if (frontsector->c_slope) { - fixed_t topfracend = (centeryfrac>>4) - FixedMul (worldtopslope, ds_p->scale2); + fixed_t topfracend = (centeryfrac >> 4) - FixedMul(worldtopslope, ds_p->scale2); topstep = (topfracend-topfrac)/(range); } if (frontsector->f_slope) { - fixed_t bottomfracend = (centeryfrac>>4) - FixedMul (worldbottomslope, ds_p->scale2); + fixed_t bottomfracend = (centeryfrac >> 4) - FixedMul(worldbottomslope, ds_p->scale2); bottomstep = (bottomfracend-bottomfrac)/(range); } } @@ -2702,12 +2721,13 @@ void R_StoreWallRange(INT32 start, INT32 stop) if (leftheight < worldbottom && rightheight < worldbottomslope) continue; - if (leftheight > worldtop && rightheight > worldtopslope && i+1 < dc.numlights && frontsector->lightlist[i+1].height > frontsector->ceilingheight) + if ((leftheight > worldtop) && (rightheight > worldtopslope) && + (i+1 < dc.numlights) && (frontsector->lightlist[i+1].height > frontsector->ceilingheight)) continue; } - rlight->height = (centeryfrac>>4) - FixedMul(leftheight, rw_scale); - rlight->heightstep = (centeryfrac>>4) - FixedMul(rightheight, ds_p->scale2); + rlight->height = (centeryfrac >> 4) - FixedMul(leftheight, rw_scale); + rlight->heightstep = (centeryfrac >> 4) - FixedMul(rightheight, ds_p->scale2); rlight->heightstep = (rlight->heightstep-rlight->height)/(range); rlight->flags = static_cast(light->flags); @@ -2726,10 +2746,9 @@ void R_StoreWallRange(INT32 start, INT32 stop) leftheight >>= 4; rightheight >>= 4; - rlight->botheight = (centeryfrac>>4) - FixedMul(leftheight, rw_scale); - rlight->botheightstep = (centeryfrac>>4) - FixedMul(rightheight, ds_p->scale2); + rlight->botheight = (centeryfrac >> 4) - FixedMul(leftheight, rw_scale); + rlight->botheightstep = (centeryfrac >> 4) - FixedMul(rightheight, ds_p->scale2); rlight->botheightstep = (rlight->botheightstep-rlight->botheight)/(range); - } rlight->lightlevel = *light->lightlevel; @@ -2750,13 +2769,14 @@ void R_StoreWallRange(INT32 start, INT32 stop) if (linedef->special == HORIZONSPECIAL) // Horizon lines extend FOFs in contact with them too. { visffloor[i].f_step = 0; - visffloor[i].f_frac = (centeryfrac>>4); + visffloor[i].f_frac = (centeryfrac >> 4); topfrac++; // Prevent 1px HOM } else { - visffloor[i].f_frac = (centeryfrac>>4) - FixedMul(visffloor[i].f_pos, rw_scale); - visffloor[i].f_step = ((centeryfrac>>4) - FixedMul(visffloor[i].f_pos_slope, ds_p->scale2) - visffloor[i].f_frac)/(range); + visffloor[i].f_frac = (centeryfrac >> 4) - FixedMul(visffloor[i].f_pos, rw_scale); + visffloor[i].f_step = (centeryfrac >> 4) - FixedMul(visffloor[i].f_pos_slope, ds_p->scale2); + visffloor[i].f_step = (visffloor[i].f_step - visffloor[i].f_frac)/(range); } } } @@ -2770,9 +2790,8 @@ void R_StoreWallRange(INT32 start, INT32 stop) if (toptexture) { - fixed_t topfracend = (centeryfrac>>4) - FixedMul(worldhighslope, ds_p->scale2); - - pixhigh = (centeryfrac>>4) - FixedMul (worldhigh, rw_scale); + fixed_t topfracend = (centeryfrac >> 4) - FixedMul(worldhighslope, ds_p->scale2); + pixhigh = (centeryfrac >> 4) - FixedMul(worldhigh, rw_scale); pixhighstep = (topfracend-pixhigh)/(range); // If the lowest part of a ceiling stretching down covers the entire screen @@ -2782,9 +2801,8 @@ void R_StoreWallRange(INT32 start, INT32 stop) if (bottomtexture) { - fixed_t bottomfracend = (centeryfrac>>4) - FixedMul (worldlowslope, ds_p->scale2); - - pixlow = (centeryfrac>>4) - FixedMul (worldlow, rw_scale); + fixed_t bottomfracend = (centeryfrac >> 4) - FixedMul(worldlowslope, ds_p->scale2); + pixlow = (centeryfrac >> 4) - FixedMul(worldlow, rw_scale); pixlowstep = (bottomfracend-pixlow)/(range); // If the highest part of a floor stretching up covers the entire screen @@ -3045,6 +3063,7 @@ void R_StoreWallRange(INT32 start, INT32 stop) ds_p->silhouette |= SIL_BOTTOM; ds_p->bsilheight = backsector->f_slope ? INT32_MAX : backsector->floorheight; } + if (!(ds_p->silhouette & SIL_TOP)) { ds_p->silhouette |= SIL_TOP; diff --git a/src/r_skins.c b/src/r_skins.c index 9ab6e0fbf..181fd3319 100644 --- a/src/r_skins.c +++ b/src/r_skins.c @@ -712,7 +712,7 @@ void R_AddSkins(UINT16 wadnum, boolean local) // skip to end of this skin's frames lastlump = lump; - while (W_CheckNameForNumPwad(wadnum, lastlump) && memcmp(W_CheckNameForNumPwad(wadnum, lastlump), csprname,4)==0) + while (W_CheckNameForNumPwad(wadnum, lastlump) && memcmp(W_CheckNameForNumPwad(wadnum, lastlump), csprname, 4) == 0) lastlump++; // allocate (or replace) sprite frames, and set spritedef @@ -817,7 +817,6 @@ void R_AddSkins(UINT16 wadnum, boolean local) } #undef lnumskins - //sortSkinGrid(); return; } diff --git a/src/r_splats.c b/src/r_splats.c index bcef8cf24..5560477ba 100644 --- a/src/r_splats.c +++ b/src/r_splats.c @@ -131,7 +131,7 @@ void R_AddWallSplat(line_t *wallline, INT16 sectorside, const char *patchname, f // set the splat splat->patch = W_GetNumForName(patchname); sectorside ^= 1; - if (wallline->sidenum[sectorside] != 0xffff) + if (wallline->sidenum[sectorside] != NO_INDEX) { backsector = sides[wallline->sidenum[sectorside]].sector; diff --git a/src/r_state.h b/src/r_state.h index 0431525e7..5e226103b 100644 --- a/src/r_state.h +++ b/src/r_state.h @@ -90,7 +90,7 @@ extern side_t *sides; extern fixed_t viewx, viewy, viewz; extern angle_t viewangle, aimingangle, viewroll; extern UINT8 viewssnum; // splitscreen view number -extern boolean viewsky, skyVisible; +extern boolean skyVisible; extern boolean skyVisiblePerPlayer[MAXSPLITSCREENPLAYERS]; // saved values of skyVisible of each splitscreen player extern sector_t *viewsector; extern player_t *viewplayer; diff --git a/src/r_things.cpp b/src/r_things.cpp index 52f8be112..79c280ee5 100644 --- a/src/r_things.cpp +++ b/src/r_things.cpp @@ -87,6 +87,8 @@ static drawseg_xrange_item_t *drawsegs_xrange; static size_t drawsegs_xrange_size = 0; static INT32 drawsegs_xrange_count = 0; +#define CLIP_UNDEF -2 + // // Sprite rotation 0 is facing the viewer, // rotation 1 is one angle turn CLOCKWISE around the axis. @@ -182,15 +184,14 @@ static void R_InstallSpriteLump(UINT16 wad, // graphics patch UINT8 rightfactor = ((rotation == ROT_R) ? 4 : 0); // the lump should be used for half of all rotations - if (sprtemp[frame].rotate == SRF_SINGLE) + if (sprtemp[frame].rotate == SRF_NONE) + sprtemp[frame].rotate = SRF_SINGLE; + else if (sprtemp[frame].rotate == SRF_SINGLE) CONS_Debug(DBG_SETUP, "R_InitSprites: Sprite %s frame %c has L/R rotations and a rot = 0 lump\n", spritename, cn); else if (sprtemp[frame].rotate == SRF_3D) CONS_Debug(DBG_SETUP, "R_InitSprites: Sprite %s frame %c has both L/R and 1-8 rotations\n", spritename, cn); // Let's not complain about multiple L/R rotations. It's not worth the effort. - if (sprtemp[frame].rotate == SRF_NONE) - sprtemp[frame].rotate = SRF_SINGLE; - sprtemp[frame].rotate |= ((rotation == ROT_R) ? SRF_RIGHT : SRF_LEFT); if (sprtemp[frame].rotate == (SRF_3D|SRF_2D)) @@ -233,6 +234,7 @@ static void R_InstallSpriteLump(UINT16 wad, // graphics patch // when using sprites in pwad : the lumppat points the new graphics sprtemp[frame].lumppat[rotation] = lumppat; sprtemp[frame].lumpid[rotation] = lumpid; + if (flipped) sprtemp[frame].flip |= (1<numframes) // (then spriteframes is not null) @@ -289,7 +293,7 @@ boolean R_AddSingleSpriteDef(const char *sprname, spritedef_t *spritedef, UINT16 if (frame >= 64 || !(R_ValidSpriteAngle(rotation))) // Give an actual NAME error -_-... { - CONS_Alert(CONS_WARNING, M_GetText("Bad sprite name: %s\n"), W_CheckNameForNumPwad(wadnum,l)); + CONS_Alert(CONS_WARNING, M_GetText("Bad sprite name: %s\n"), W_CheckNameForNumPwad(wadnum, l)); continue; } @@ -315,6 +319,15 @@ boolean R_AddSingleSpriteDef(const char *sprname, spritedef_t *spritedef, UINT16 { frame = R_Char2Frame(lumpinfo[l].name[6]); rotation = (UINT8)(lumpinfo[l].name[7] - '0'); + + /* + if (frame >= 64 || !(R_ValidSpriteAngle(rotation))) // Give an actual NAME error -_-... + { + CONS_Alert(CONS_WARNING, M_GetText("Bad sprite name: %s\n"), W_CheckNameForNumPwad(wadnum, l)); + continue; + } + */ + R_InstallSpriteLump(wadnum, l, numspritelumps, frame, rotation, 1); } @@ -363,30 +376,32 @@ boolean R_AddSingleSpriteDef(const char *sprname, spritedef_t *spritedef, UINT16 switch (sprtemp[frame].rotate) { case SRF_NONE: - // no rotations were found for that frame at all - I_Error("R_AddSingleSpriteDef: No patches found for %.4s frame %c", sprname, R_Frame2Char(frame)); - break; + // no rotations were found for that frame at all + I_Error("R_AddSingleSpriteDef: No patches found for %.4s frame %c", sprname, R_Frame2Char(frame)); + break; case SRF_SINGLE: - // only the first rotation is needed - break; + // only the first rotation is needed + break; case SRF_2D: // both Left and Right rotations // we test to see whether the left and right slots are present if ((sprtemp[frame].lumppat[2] == LUMPERROR) || (sprtemp[frame].lumppat[6] == LUMPERROR)) I_Error("R_AddSingleSpriteDef: Sprite %s frame %c is missing rotations", sprname, R_Frame2Char(frame)); - break; + break; default: - // must have all 8 frames - for (rotation = 0; rotation < 8; rotation++) - // we test the patch lump, or the id lump whatever - // if it was not loaded the two are LUMPERROR - if (sprtemp[frame].lumppat[rotation] == LUMPERROR) - I_Error("R_AddSingleSpriteDef: Sprite %.4s frame %c is missing rotations", - sprname, R_Frame2Char(frame)); - break; + // must have all 8 frames + for (rotation = 0; rotation < 8; rotation++) + { + // we test the patch lump, or the id lump whatever + // if it was not loaded the two are LUMPERROR + if (sprtemp[frame].lumppat[rotation] == LUMPERROR) + I_Error("R_AddSingleSpriteDef: Sprite %.4s frame %c is missing rotations", + sprname, R_Frame2Char(frame)); + } + break; } } @@ -394,7 +409,6 @@ boolean R_AddSingleSpriteDef(const char *sprname, spritedef_t *spritedef, UINT16 if (spritedef->numframes && // has been allocated spritedef->numframes < maxframe) // more frames are defined ? { - Z_Free(spritedef->spriteframes); spritedef->spriteframes = NULL; } @@ -451,12 +465,10 @@ void R_AddSpriteDefs(UINT16 wadnum) // for (i = 0; i < numsprites; i++) { - spritename = sprnames[i]; - - if (spritename[4] && wadnum >= (UINT16)spritename[4]) + if (sprnames[i][4] && wadnum >= (UINT16)sprnames[i][4]) continue; - if (R_AddSingleSpriteDef(spritename, &sprites[i], wadnum, start, end)) + if (R_AddSingleSpriteDef(sprnames[i], &sprites[i], wadnum, start, end)) { #ifdef HWRENDER if (rendermode == render_opengl) @@ -464,9 +476,7 @@ void R_AddSpriteDefs(UINT16 wadnum) #endif // if a new sprite was added (not just replaced) addsprites++; -#ifndef ZDEBUG - CONS_Debug(DBG_SETUP, "sprite %s set in pwad %d\n", spritename, wadnum); -#endif + CONS_Debug(DBG_SETUP, "sprite %s set in pwad %d\n", sprnames[i], wadnum); } } @@ -773,6 +783,7 @@ static void R_DrawVisSprite(vissprite_t *vis) R_SetColumnFunc(BASEDRAWFUNC); // hack: this isn't resetting properly somewhere. dc.colormap = vis->colormap; + if ((vis->mobj->flags & MF_BOSS) && (vis->mobj->flags2 & MF2_FRET) && (leveltime & 1)) // Bosses "flash" { R_SetColumnFunc(COLDRAWFUNC_TRANS); // translate certain pixels to white @@ -825,6 +836,7 @@ static void R_DrawVisSprite(vissprite_t *vis) else dc.colormap = &vis->extra_colormap->colormap[dc.colormap - colormaps]; } + if (!dc.colormap) dc.colormap = colormaps; @@ -849,6 +861,7 @@ static void R_DrawVisSprite(vissprite_t *vis) vis->xiscale = FixedDiv(vis->xiscale, this_scale); vis->isScaled = true; } + dc.texturemid = FixedDiv(dc.texturemid, this_scale); } @@ -1230,9 +1243,9 @@ static void R_ProjectSprite(mobj_t *thing) return; const boolean mirrored = thing->mirrored; - const boolean vflip = (thing->eflags & MFE_VERTICALFLIP); - const boolean hflip = (!(thing->frame & FF_HORIZONTALFLIP) != !mirrored); - const boolean papersprite = (thing->frame & FF_PAPERSPRITE); + const boolean vflip = R_ThingVerticallyFlipped(thing); + const boolean hflip = (!R_ThingHorizontallyFlipped(thing) != !mirrored); + const boolean papersprite = R_ThingIsPaperSprite(thing); // transform the origin point tr_x = interp.x - viewx; @@ -1265,7 +1278,7 @@ static void R_ProjectSprite(mobj_t *thing) #ifdef ROTSPRITE // determine here if sprite should rotate for optimization const boolean sliprollrotate = (cv_sliptideroll.value && (thing->player && thing->player->sliproll)); - const boolean shouldrotate = (interp.sloperoll || interp.slopepitch || interp.roll || interp.pitch || thing->rollangle || sliprollrotate); + const boolean shouldrotate = (interp.sloperoll || interp.slopepitch || interp.roll || interp.pitch || thing->rollangle || thing->temprollangle || sliprollrotate); #endif sprskin = K_GetMobjSkin(thing); @@ -1365,16 +1378,18 @@ static void R_ProjectSprite(mobj_t *thing) #ifdef ROTSPRITE if (shouldrotate) { + const fixed_t thingrollangle = (thing->rollangle - thing->temprollangle); + if (papersprite) { if (ang >= ANGLE_180) { // Makes Software act much more sane like OpenGL - rollangle = InvAngle(thing->rollangle); + rollangle = InvAngle(thingrollangle); } else { - rollangle = thing->rollangle; + rollangle = thingrollangle; } } else @@ -1382,7 +1397,7 @@ static void R_ProjectSprite(mobj_t *thing) // this is very messy, but it on-the-fly calculates rotations for all the // pitch and roll variables pitchnroll = R_RotationAngle(ang, camang, &interp); - rollangle = thing->rollangle; + rollangle = thingrollangle; } if (rollangle || pitchnroll || sliprollrotate) @@ -2208,6 +2223,7 @@ static void R_SortVisSprites(vissprite_t* vsprsortedhead, UINT32 start, UINT32 e best = ds; } } + if (best) { best->next->prev = best->prev; @@ -2616,7 +2632,7 @@ static void R_ClipVisSprite(vissprite_t *spr, INT32 x1, INT32 x2, portal_t* port for (x = x1; x <= x2; x++) { - spr->clipbot[x] = spr->cliptop[x] = -2; + spr->clipbot[x] = spr->cliptop[x] = CLIP_UNDEF; } // Scan drawsegs from end to start for obscuring segs. @@ -2645,29 +2661,26 @@ static void R_ClipVisSprite(vissprite_t *spr, INT32 x1, INT32 x2, portal_t* port ds = curr->user; - if (ds->portalpass != 66) // unused? + if (ds->portalpass > 0 && ds->portalpass <= portalrender) + continue; // is a portal + + if (ds->scale1 > ds->scale2) { - if (ds->portalpass > 0 && ds->portalpass <= portalrender) - continue; // is a portal + lowscale = ds->scale2; + scale = ds->scale1; + } + else + { + lowscale = ds->scale1; + scale = ds->scale2; + } - if (ds->scale1 > ds->scale2) - { - lowscale = ds->scale2; - scale = ds->scale1; - } - else - { - lowscale = ds->scale1; - scale = ds->scale2; - } - - if (scale < spr->sortscale || - (lowscale < spr->sortscale && - !R_PointOnSegSide(spr->gx, spr->gy, ds->curline))) - { - // seg is behind sprite - continue; - } + if (scale < spr->sortscale || + (lowscale < spr->sortscale && + !R_PointOnSegSide(spr->gx, spr->gy, ds->curline))) + { + // seg is behind sprite + continue; } r1 = ds->x1 < x1 ? x1 : ds->x1; @@ -2686,14 +2699,14 @@ static void R_ClipVisSprite(vissprite_t *spr, INT32 x1, INT32 x2, portal_t* port { // bottom sil for (x = r1; x <= r2; x++) - if (spr->clipbot[x] == -2) + if (spr->clipbot[x] == CLIP_UNDEF) spr->clipbot[x] = ds->sprbottomclip[x]; } else if (silhouette == SIL_TOP) { // top sil for (x = r1; x <= r2; x++) - if (spr->cliptop[x] == -2) + if (spr->cliptop[x] == CLIP_UNDEF) spr->cliptop[x] = ds->sprtopclip[x]; } else if (silhouette == (SIL_TOP|SIL_BOTTOM)) @@ -2701,9 +2714,9 @@ static void R_ClipVisSprite(vissprite_t *spr, INT32 x1, INT32 x2, portal_t* port // both for (x = r1; x <= r2; x++) { - if (spr->clipbot[x] == -2) + if (spr->clipbot[x] == CLIP_UNDEF) spr->clipbot[x] = ds->sprbottomclip[x]; - if (spr->cliptop[x] == -2) + if (spr->cliptop[x] == CLIP_UNDEF) spr->cliptop[x] = ds->sprtopclip[x]; } } @@ -2722,13 +2735,13 @@ static void R_ClipVisSprite(vissprite_t *spr, INT32 x1, INT32 x2, portal_t* port if (mh <= 0 || (phs != -1 && viewz > sectors[phs].floorheight)) { // clip bottom for (x = x1; x <= x2; x++) - if (spr->clipbot[x] == -2 || h < spr->clipbot[x]) + if (spr->clipbot[x] == CLIP_UNDEF || h < spr->clipbot[x]) spr->clipbot[x] = (INT16)h; } else // clip top { for (x = x1; x <= x2; x++) - if (spr->cliptop[x] == -2 || h > spr->cliptop[x]) + if (spr->cliptop[x] == CLIP_UNDEF || h > spr->cliptop[x]) spr->cliptop[x] = (INT16)h; } } @@ -2740,13 +2753,13 @@ static void R_ClipVisSprite(vissprite_t *spr, INT32 x1, INT32 x2, portal_t* port if (phs != -1 && viewz >= sectors[phs].ceilingheight) { // clip bottom for (x = x1; x <= x2; x++) - if (spr->clipbot[x] == -2 || h < spr->clipbot[x]) + if (spr->clipbot[x] == CLIP_UNDEF || h < spr->clipbot[x]) spr->clipbot[x] = (INT16)h; } else // clip top { for (x = x1; x <= x2; x++) - if (spr->cliptop[x] == -2 || h > spr->cliptop[x]) + if (spr->cliptop[x] == CLIP_UNDEF || h > spr->cliptop[x]) spr->cliptop[x] = (INT16)h; } } @@ -2756,10 +2769,10 @@ static void R_ClipVisSprite(vissprite_t *spr, INT32 x1, INT32 x2, portal_t* port { for (x = x1; x <= x2; x++) { - if (spr->cliptop[x] == -2 || spr->szt > spr->cliptop[x]) + if (spr->cliptop[x] == CLIP_UNDEF || spr->szt > spr->cliptop[x]) spr->cliptop[x] = spr->szt; - if (spr->clipbot[x] == -2 || spr->sz < spr->clipbot[x]) + if (spr->clipbot[x] == CLIP_UNDEF || spr->sz < spr->clipbot[x]) spr->clipbot[x] = spr->sz; } } @@ -2767,7 +2780,7 @@ static void R_ClipVisSprite(vissprite_t *spr, INT32 x1, INT32 x2, portal_t* port { for (x = x1; x <= x2; x++) { - if (spr->cliptop[x] == -2 || spr->szt > spr->cliptop[x]) + if (spr->cliptop[x] == CLIP_UNDEF || spr->szt > spr->cliptop[x]) spr->cliptop[x] = spr->szt; } } @@ -2775,7 +2788,7 @@ static void R_ClipVisSprite(vissprite_t *spr, INT32 x1, INT32 x2, portal_t* port { for (x = x1; x <= x2; x++) { - if (spr->clipbot[x] == -2 || spr->sz < spr->clipbot[x]) + if (spr->clipbot[x] == CLIP_UNDEF || spr->sz < spr->clipbot[x]) spr->clipbot[x] = spr->sz; } } @@ -2785,21 +2798,13 @@ static void R_ClipVisSprite(vissprite_t *spr, INT32 x1, INT32 x2, portal_t* port // check for unclipped columns for (x = x1; x <= x2; x++) { - if (spr->clipbot[x] == -2) + if (spr->clipbot[x] == CLIP_UNDEF) spr->clipbot[x] = (INT16)viewheight; - if (spr->cliptop[x] == -2) + if (spr->cliptop[x] == CLIP_UNDEF) spr->cliptop[x] = -1; } - // Check if it'll be visible - // Not done for floorsprites. - if (cv_spriteclip.value) - { - if (!R_CheckSpriteVisible(spr, x1, x2)) - spr->cut = static_cast(spr->cut | SC_NOTVISIBLE); - } - if (portal) { INT32 start_index = std::max(portal->start, x1); @@ -2810,6 +2815,7 @@ static void R_ClipVisSprite(vissprite_t *spr, INT32 x1, INT32 x2, portal_t* port spr->clipbot[x] = -1; spr->cliptop[x] = -1; } + for (x = start_index; x <= end_index; x++) { if (spr->clipbot[x] > portal->floorclip[x - portal->start]) @@ -2817,12 +2823,21 @@ static void R_ClipVisSprite(vissprite_t *spr, INT32 x1, INT32 x2, portal_t* port if (spr->cliptop[x] < portal->ceilingclip[x - portal->start]) spr->cliptop[x] = portal->ceilingclip[x - portal->start]; } + for (x = end_index + 1; x <= x2; x++) { spr->clipbot[x] = -1; spr->cliptop[x] = -1; } } + + // Check if it'll be visible + // Not done for floorsprites. + if (cv_spriteclip.value) + { + if (!R_CheckSpriteVisible(spr, x1, x2)) + spr->cut = static_cast(spr->cut | SC_NOTVISIBLE); + } } void R_ClipSprites(drawseg_t* dsstart, portal_t* portal) @@ -2895,8 +2910,9 @@ void R_ClipSprites(drawseg_t* dsstart, portal_t* portal) { vissprite_t *spr = R_GetVisSprite(clippedvissprites); - if (cv_spriteclip.value - && (spr->szt > vid.height || spr->sz < 0)) + if (cv_spriteclip.value && + (spr->szt > vid.height || spr->sz < 0) && + !spr->scalestep) { spr->cut = static_cast(spr->cut | SC_NOTVISIBLE); continue; @@ -2928,16 +2944,16 @@ void R_ClipSprites(drawseg_t* dsstart, portal_t* portal) /* Check if thing may be drawn from our current view. */ boolean R_ThingVisible(mobj_t *thing) { - if (UNLIKELY((thing->sprite == SPR_NULL) || (thing->flags2 & MF2_DONTDRAW))) + if ((thing->sprite == SPR_NULL) || (thing->flags2 & MF2_DONTDRAW)) return false; - if (UNLIKELY(splitscreen)) + if (splitscreen) { - if ((viewssnum == 0 && (thing->eflags & MFE_DRAWONLYFORP1)) - || (viewssnum == 1 && (thing->eflags & MFE_DRAWONLYFORP2)) - || (viewssnum == 2 && (thing->eflags & MFE_DRAWONLYFORP2)) - || (viewssnum == 3 && (thing->eflags & MFE_DRAWONLYFORP4))) - return true; + if (((thing->eflags & MFE_DRAWONLYFORP1) && viewssnum != 0) + || ((thing->eflags & MFE_DRAWONLYFORP2) && viewssnum != 1) + || ((thing->eflags & MFE_DRAWONLYFORP3) && viewssnum != 2) + || ((thing->eflags & MFE_DRAWONLYFORP4) && viewssnum != 3)) + return false; } return true; @@ -3009,11 +3025,37 @@ boolean R_CheckMobjInterpDist(mobj_t *thing) return R_CheckInterpDist(thing); } -boolean R_ThingIsFullBright(mobj_t *thing) +boolean R_ThingHorizontallyFlipped(mobj_t *thing) +{ + return (thing->frame & FF_HORIZONTALFLIP); +} + +boolean R_ThingVerticallyFlipped(mobj_t *thing) +{ + return (thing->eflags & MFE_VERTICALFLIP); //(thing->frame & FF_VERTICALFLIP); +} + +boolean R_ThingIsPaperSprite(mobj_t *thing) +{ + return (thing->frame & FF_PAPERSPRITE); +} + +template +static boolean R_ThingIsFullBrightT(T *thing) { return ((thing->frame & FF_BRIGHTMASK) == FF_FULLBRIGHT); } +boolean R_PrecipThingIsFullBright(precipmobj_t *thing) +{ + return R_ThingIsFullBrightT(thing); +} + +boolean R_ThingIsFullBright(mobj_t *thing) +{ + return R_ThingIsFullBrightT(thing); +} + boolean R_ThingIsSemiBright(mobj_t *thing) { return ((thing->frame & FF_BRIGHTMASK) == FF_SEMIBRIGHT); diff --git a/src/r_things.h b/src/r_things.h index e8e30ca6b..bde0ad592 100644 --- a/src/r_things.h +++ b/src/r_things.h @@ -88,6 +88,11 @@ boolean R_CheckPrecipMobjInterpDist(precipmobj_t *thing); boolean R_CheckMobjInterpDist(mobj_t *thing); fixed_t R_DoPlayerFade(mobj_t *thing); +boolean R_ThingHorizontallyFlipped(mobj_t *thing); +boolean R_ThingVerticallyFlipped(mobj_t *thing); +boolean R_ThingIsPaperSprite(mobj_t *thing); + +boolean R_PrecipThingIsFullBright(precipmobj_t *thing); boolean R_ThingIsFullBright(mobj_t *thing); boolean R_ThingIsSemiBright(mobj_t *thing); boolean R_ThingIsFullDark(mobj_t *thing); diff --git a/src/s_sound.c b/src/s_sound.c index f81690b24..39c671879 100644 --- a/src/s_sound.c +++ b/src/s_sound.c @@ -477,6 +477,11 @@ void S_StartSoundAtVolume(const void *origin_p, sfxenum_t sfx_id, INT32 volume) { player_t *player = &players[displayplayers[i]]; + if (!player) + { + continue; + } + if (player->awayviewtics) { listenmobj[i] = player->awayviewmobj; @@ -535,79 +540,84 @@ void S_StartSoundAtVolume(const void *origin_p, sfxenum_t sfx_id, INT32 volume) i = 0; // sensible default + // Check to see if it is audible, and if not, modify the params + if (origin && !itsUs) { - // Check to see if it is audible, and if not, modify the params - if (origin && !itsUs) + boolean audible = false; + + if (splitscreen > 0) { - boolean audible = false; - if (splitscreen > 0) - { - fixed_t recdist = INT32_MAX; - UINT8 j = 0; + fixed_t recdist = INT32_MAX; + UINT8 j = 0; - for (; j <= splitscreen; j++) + for (; j <= splitscreen; j++) + { + fixed_t thisdist = INT32_MAX; + + if (!listenmobj[j]) { - fixed_t thisdist = INT32_MAX; - - if (!listenmobj[j]) - { - continue; - } - - thisdist = P_AproxDistance(listener[j].x - origin->x, listener[j].y - origin->y); - - if (thisdist >= recdist) - { - continue; - } - - recdist = thisdist; - i = j; + continue; } - } - if (listenmobj[i]) - { - audible = S_AdjustSoundParams(listenmobj[i], origin, &volume, &sep, sfx); - } + thisdist = P_AproxDistance(listener[j].x - origin->x, listener[j].y - origin->y); - if (!audible) - { - return; + if (thisdist >= recdist) + { + continue; + } + + recdist = thisdist; + i = j; } } - // This is supposed to handle the loading/caching. - // For some odd reason, the caching is done nearly - // each time the sound is needed? + if (listenmobj[i]) + { + audible = S_AdjustSoundParams(listenmobj[i], origin, &volume, &sep, sfx); + } + + if (!audible) + { + return; + } + } + + // This is supposed to handle the loading/caching. + // For some odd reason, the caching is done nearly + // each time the sound is needed? + + // cache data if necessary + // NOTE: set sfx->data NULL sfx->lump -1 to force a reload + if (!sfx->data) + { + sfx->data = I_GetSfx(sfx); - // cache data if necessary - // NOTE: set sfx->data NULL sfx->lump -1 to force a reload if (!sfx->data) { - sfx->data = I_GetSfx(sfx); + CONS_Alert(CONS_WARNING, "Tried to load invalid sfx_%s\n", sfx->name); + return; /* don't play it */ } - - // Avoid channel reverse if surround - if (reverse) - { - sep = (~sep) & 255; - } - - // At this point it is determined that a sound can and should be played, so find a free channel to play it on - cnum = S_getChannel(origin, sfx); - - if (cnum < 0) - { - return; // If there's no free channels, there won't be any for anymore players either - } - - // Now that we know we are going to play a sound, fill out this info - channels[cnum].sfxinfo = sfx; - channels[cnum].origin = origin; - channels[cnum].volume = initial_volume; - channels[cnum].handle = I_StartSound(sfx_id, volume, sep, cnum); } + + // Avoid channel reverse if surround + if (reverse) + { + sep = (~sep) & 255; + } + + // At this point it is determined that a sound can and should be played, so find a free channel to play it on + cnum = S_getChannel(origin, sfx); + + if (cnum < 0) + { + return; // If there's no free channels, there won't be any for anymore players either + } + + // Now that we know we are going to play a sound, fill out this info + channels[cnum].sfxinfo = sfx; + channels[cnum].origin = origin; + channels[cnum].volume = initial_volume; + channels[cnum].handle = I_StartSound(sfx_id, volume, sep, cnum); } void S_StartSound(const void *origin, sfxenum_t sfx_id) @@ -728,6 +738,11 @@ void S_UpdateSounds(void) { player_t *player = &players[displayplayers[i]]; + if (!player) + { + continue; + } + if (player->awayviewtics) { listenmobj[i] = player->awayviewmobj; @@ -761,84 +776,83 @@ void S_UpdateSounds(void) { c = &channels[cnum]; - if (c->sfxinfo) + if (c->sfxinfo == NULL) + continue; + + // if channel is allocated but sound has stopped, free it + if (!I_SoundIsPlaying(c->handle)) { - if (I_SoundIsPlaying(c->handle)) + S_StopChannel(cnum); + continue; + } + + if (c->origin == NULL) + continue; + + // initialize parameters + volume = c->volume; // 8 bits internal volume precision + sep = NORM_SEP; + + // check non-local sounds for distance clipping + // or modify their params + boolean itsUs = false; + + for (i = splitscreen; i >= 0; i--) + { + if (camera[i].freecam) + continue; + + if (c->origin != listenmobj[i]) + continue; + + itsUs = true; + } + + if (itsUs == false) + { + const mobj_t *origin = c->origin; + + i = 0; + + if (splitscreen > 0) { - // initialize parameters - volume = c->volume; // 8 bits internal volume precision - sep = NORM_SEP; + fixed_t recdist = INT32_MAX; + UINT8 j = 0; - // check non-local sounds for distance clipping - // or modify their params - if (c->origin) + for (; j <= splitscreen; j++) { - boolean itsUs = false; + fixed_t thisdist = INT32_MAX; - for (i = splitscreen; i >= 0; i--) + if (!listenmobj[j]) { - if (camera[i].freecam) - continue; - - if (c->origin != listenmobj[i]) - continue; - - itsUs = true; + continue; } - if (itsUs == false) + thisdist = P_AproxDistance(listener[j].x - origin->x, listener[j].y - origin->y); + + if (thisdist >= recdist) { - const mobj_t *origin = c->origin; - - i = 0; - - if (splitscreen > 0) - { - fixed_t recdist = INT32_MAX; - UINT8 j = 0; - - for (; j <= splitscreen; j++) - { - fixed_t thisdist = INT32_MAX; - - if (!listenmobj[j]) - { - continue; - } - - thisdist = P_AproxDistance(listener[j].x - origin->x, listener[j].y - origin->y); - - if (thisdist >= recdist) - { - continue; - } - - recdist = thisdist; - i = j; - } - } - - if (listenmobj[i]) - { - audible = S_AdjustSoundParams( - listenmobj[i], c->origin, - &volume, &sep, - c->sfxinfo - ); - } - - if (audible) - I_UpdateSoundParams(c->handle, volume, sep); - else - S_StopChannel(cnum); + continue; } + + recdist = thisdist; + i = j; } } - else + + if (listenmobj[i]) { - // if channel is allocated but sound has stopped, free it - S_StopChannel(cnum); + audible = S_AdjustSoundParams( + listenmobj[i], c->origin, + &volume, &sep, + c->sfxinfo + ); } + + if (audible) + I_UpdateSoundParams(c->handle, volume, sep); + else + S_StopChannel(cnum); } } @@ -866,7 +880,6 @@ void S_ClearSfx(void) static void S_StopChannel(INT32 cnum) { - INT32 i; channel_t *c = &channels[cnum]; if (c->sfxinfo) @@ -875,12 +888,6 @@ static void S_StopChannel(INT32 cnum) if (I_SoundIsPlaying(c->handle)) I_StopSound(c->handle); - // check to see - // if other channels are playing the sound - for (i = 0; i < numofchannels; i++) - if (cnum != i && c->sfxinfo == channels[i].sfxinfo) - break; - c->sfxinfo = NULL; } @@ -930,6 +937,7 @@ static boolean S_AdjustSoundParams(const mobj_t *listener, const mobj_t *source, listener_t listensource; INT32 i; + // e6y if (!listener) return false; @@ -1046,12 +1054,14 @@ static boolean S_AdjustSoundParams(const mobj_t *listener, const mobj_t *source, INT32 S_OriginPlaying(void *origin) { INT32 cnum; + if (!origin) return false; for (cnum = 0; cnum < numofchannels; cnum++) if (channels[cnum].origin == origin) return 1; + return 0; } @@ -1064,6 +1074,7 @@ INT32 S_IdPlaying(sfxenum_t id) for (cnum = 0; cnum < numofchannels; cnum++) if ((size_t)(channels[cnum].sfxinfo - S_sfx) == (size_t)id) return 1; + return 0; } @@ -1072,6 +1083,7 @@ INT32 S_IdPlaying(sfxenum_t id) INT32 S_SoundPlaying(void *origin, sfxenum_t id) { INT32 cnum; + if (!origin) return 0; @@ -1081,6 +1093,7 @@ INT32 S_SoundPlaying(void *origin, sfxenum_t id) && (size_t)(channels[cnum].sfxinfo - S_sfx) == (size_t)id) return 1; } + return 0; } @@ -1093,6 +1106,7 @@ static sfxenum_t newsounds[MAXNEWSOUNDS] = {0, 0, 0, 0, 0, 0, 0, 0, 0, 0}; void S_StartSoundName(void *mo, const char *soundname) { INT32 i, soundnum = 0; + // Search existing sounds... for (i = sfx_None + 1; i < NUMSFX; i++) { @@ -1283,9 +1297,7 @@ static boolean ReadMusicDefFields(UINT16 wadnum, int line, char *stoken, musicde if (!value) { - CONS_Alert(CONS_WARNING, - "MUSICDEF: Field '%s' is missing name. (file %s, line %d)\n", - stoken, wadfiles[wadnum]->filename, line); + CONS_Alert(CONS_WARNING, "MUSICDEF: Field '%s' is missing name. (file %s, line %d)\n", stoken, wadfiles[wadnum]->filename, line); (void)strtok(NULL, " "); return true; } @@ -1318,9 +1330,7 @@ static boolean ReadMusicDefFields(UINT16 wadnum, int line, char *stoken, musicde if (!value) { - CONS_Alert(CONS_WARNING, - "MUSICDEF: Field '%s' is missing value. (file %s, line %d)\n", - stoken, wadfiles[wadnum]->filename, line); + CONS_Alert(CONS_WARNING, "MUSICDEF: Field '%s' is missing value. (file %s, line %d)\n", stoken, wadfiles[wadnum]->filename, line); (void)strtok(NULL, " "); return true; } @@ -1330,9 +1340,7 @@ static boolean ReadMusicDefFields(UINT16 wadnum, int line, char *stoken, musicde if (!def) { - CONS_Alert(CONS_ERROR, - "MUSICDEF: No music definition before field '%s'. (file %s, line %d)\n", - stoken, wadfiles[wadnum]->filename, line); + CONS_Alert(CONS_ERROR, "MUSICDEF: No music definition before field '%s'. (file %s, line %d)\n", stoken, wadfiles[wadnum]->filename, line); return false; } @@ -1344,11 +1352,19 @@ static boolean ReadMusicDefFields(UINT16 wadnum, int line, char *stoken, musicde textline = value; -// turn _ into spaces. -#define ADDDEF(field)\ - STRBUFCPY(def->field, textline);\ - for (textline = def->field; *textline; textline++)\ - if (*textline == '_') *textline = ' '; +// turn _ into spaces while also removing trailing whitespaces. +#define ADDDEF(field) \ + int err = 0; \ + STRBUFCPY(def->field, textline); \ + size_t len = strlen(def->field); \ + while (len > 0 && (def->field[len-1] == ' ')) { \ + def->field[len-1] = 0; \ + len--; \ + } \ + for (textline = def->field; *textline; textline++) { \ + if (err == 0 && *textline == ' ') {err = 1; CONS_Alert(CONS_WARNING, "MUSICDEF: Erroneous whitespace detected in field '%s': '%s'.\n(file %s, line %d) Musicdef might not work correctly!\n", stoken, value, wadfiles[wadnum]->filename, line);} \ + if (*textline == '_') *textline = ' '; \ + } if (fasticmp(stoken, "usage")) { @@ -1360,7 +1376,6 @@ static boolean ReadMusicDefFields(UINT16 wadnum, int line, char *stoken, musicde } else if (fasticmp(stoken, "title")) { - def->use_info = true; ADDDEF(title); } else if (fasticmp(stoken, "alttitle")) @@ -2025,6 +2040,10 @@ static boolean S_SkipIntroMusic(void) if (!cv_skipintromusic.value) return false; + // dont skip if we disabled music, weird? but this would skip sounds that play on map start as well otherwise + if (music_disabled) + return false; + // check if menu music is playing, otherwise it may continue playing if (fasticmp(music.name, "titles")) return false; @@ -2036,6 +2055,11 @@ static boolean S_SkipIntroMusic(void) return false; } + // without sound there wont be any intro playing + if (sound_disabled) + return true; + // yes i sometimes play with only music but no sound + return true; } diff --git a/src/s_sound.h b/src/s_sound.h index c7f487e92..077fd325e 100644 --- a/src/s_sound.h +++ b/src/s_sound.h @@ -186,7 +186,6 @@ typedef struct musicdef_s char title[256]; char alttitle[256]; char authors[256]; - boolean use_info; size_t num; } musicdef_t; diff --git a/src/screen.c b/src/screen.c index a874ed530..67b7e0bf3 100644 --- a/src/screen.c +++ b/src/screen.c @@ -530,6 +530,6 @@ void SCR_DisplayLocalPing(void) if (cv_showping.value == 1 || (cv_showping.value == 2 && ping > servermaxping)) // only show 2 (warning) if our ping is at a bad level { INT32 dispy = (cv_ticrate.value == 1) ? 165 : ((cv_ticrate.value == 2 || cv_ticrate.value == 4) ? 172 : ((cv_ticrate.value == 3) ? 163 : 181)); // absolute buttpain - HU_drawPlayerPing(308, dispy, consoleplayer, pingflags); // consoleplayer's ping is everyone's ping in a splitnetgame :P + HU_drawLocalPlayerPing(308, dispy, pingflags); // consoleplayer's ping is everyone's ping in a splitnetgame :P } } diff --git a/src/sdl/CMakeLists.txt b/src/sdl/CMakeLists.txt index c7d612c80..13b41323e 100644 --- a/src/sdl/CMakeLists.txt +++ b/src/sdl/CMakeLists.txt @@ -243,6 +243,10 @@ if(${SDL2_FOUND}) target_link_options(SRB2SDL2 PRIVATE -fsanitize=undefined) endif() + if(NOT SRB2_CONFIG_MUMBLE) + target_compile_options(SRB2SDL2 PRIVATE -DNOMUMBLE) + endif() + ## strip debug symbols into separate file when using gcc # if(CMAKE_COMPILER_IS_GNUCC) # if(${CMAKE_BUILD_TYPE} MATCHES Debug) diff --git a/src/sdl/SDL_main/SDL_openxdk_main.c b/src/sdl/SDL_main/SDL_openxdk_main.c deleted file mode 100644 index 63db8da2d..000000000 --- a/src/sdl/SDL_main/SDL_openxdk_main.c +++ /dev/null @@ -1,7 +0,0 @@ -/* Include the SDL main definition header */ -#include "SDL_main.h" - -void XBoxStartup() -{ - SDL_main(0, NULL); /// \todo ? -} diff --git a/src/sdl/SRB2Pandora/Makefile.cfg b/src/sdl/SRB2Pandora/Makefile.cfg deleted file mode 100644 index c7f0f8449..000000000 --- a/src/sdl/SRB2Pandora/Makefile.cfg +++ /dev/null @@ -1,39 +0,0 @@ -# Quick Pandora target to make a compliant SRB2 PND file. - -PNDNAME=SRB2.pnd -PNDDIR=$(BIN)/pnd -ICON=sdl/SRB2Pandora/icon.png -PXML=sdl/SRB2Pandora/PXML.xml - -SED=sed -CAT=cat -CP=cp -XARGS=xargs -FOR=for -WGET=wget -P $(PNDDIR) -c -nc - -SHXARGS:=$(XARGS) -SHSED:=$(SED) - -ifndef ECHO - CP:=@$(CP) - CAT:=@$(CAT) - SED:=@$(SED) - XARGS:=@$(XARGS) - FOR:=@(FOR) -endif - -$(BIN)/$(PNDNAME): $(BIN)/$(EXENAME) - @echo Linking $(PNDNAME)... - $(MKDIR) $(PNDDIR) - $(CP) $(BIN)/$(EXENAME) $(PNDDIR) - $(CP) $(ICON) $(PNDDIR) - $(CP) $(PXML) $(PNDDIR) -ifdef WITHDATA - $(FOR) datafile in $(shell echo $(D_FILES) | $(SHSED) 's/\.srb/\.wad/' | $(SHXARGS) -n 1 basename); do \ - $(WGET) http://alam.srb2.org/SRB2/2.0.6-Final/Resources/$$datafile; \ - done -endif - $(MKISOFS) -l -r -o $@ $(PNDDIR) - $(CAT) $(PXML) >> $@ - $(REMOVE) -r $(PNDDIR) diff --git a/src/sdl/SRB2Pandora/PXML.xml b/src/sdl/SRB2Pandora/PXML.xml deleted file mode 100644 index 33a9587db..000000000 --- a/src/sdl/SRB2Pandora/PXML.xml +++ /dev/null @@ -1,17 +0,0 @@ - - - - Sonic Robo Blast 2 - ソニック・ロボ・ブラスト・2 - A 3D Sonic fangame with a huge fanbase developing custom content, including characters, levels, and even large-scale modifications - - - - - - - - - - - diff --git a/src/sdl/SRB2Pandora/icon.png b/src/sdl/SRB2Pandora/icon.png deleted file mode 100644 index 63af73ac3..000000000 Binary files a/src/sdl/SRB2Pandora/icon.png and /dev/null differ diff --git a/src/sdl/Srb2SDL.dsp b/src/sdl/Srb2SDL.dsp deleted file mode 100644 index 96d3e8418..000000000 --- a/src/sdl/Srb2SDL.dsp +++ /dev/null @@ -1,1035 +0,0 @@ -# Microsoft Developer Studio Project File - Name="Srb2SDL" - Package Owner=<4> -# Microsoft Developer Studio Generated Build File, Format Version 6.00 -# ** DO NOT EDIT ** - -# TARGTYPE "Win32 (x86) Console Application" 0x0103 - -CFG=Srb2SDL - Win32 Debug -!MESSAGE This is not a valid makefile. To build this project using NMAKE, -!MESSAGE use the Export Makefile command and run -!MESSAGE -!MESSAGE NMAKE /f "Srb2SDL.mak". -!MESSAGE -!MESSAGE You can specify a configuration when running NMAKE -!MESSAGE by defining the macro CFG on the command line. For example: -!MESSAGE -!MESSAGE NMAKE /f "Srb2SDL.mak" CFG="Srb2SDL - Win32 Debug" -!MESSAGE -!MESSAGE Possible choices for configuration are: -!MESSAGE -!MESSAGE "Srb2SDL - Win32 Release" (based on "Win32 (x86) Console Application") -!MESSAGE "Srb2SDL - Win32 Debug" (based on "Win32 (x86) Console Application") -!MESSAGE - -# Begin Project -# PROP AllowPerConfigDependencies 0 -# PROP Scc_ProjName "" -# PROP Scc_LocalPath "" -CPP=cl.exe -RSC=rc.exe - -!IF "$(CFG)" == "Srb2SDL - Win32 Release" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 0 -# PROP BASE Output_Dir "Release" -# PROP BASE Intermediate_Dir "Release" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 0 -# PROP Output_Dir "..\..\bin\VC\Release\SDL" -# PROP Intermediate_Dir "..\..\objs\VC\Release\SDL" -# PROP Ignore_Export_Lib 0 -# PROP Target_Dir "" -MTL=midl.exe -# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32 -# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32 -# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c -# ADD CPP /nologo /G5 /W3 /GX /Zi /Ot /Og /Oi /Op /Oy /Ob1 /I "..\..\libs\libpng-src" /I "..\..\libs\zlib" /D "NDEBUG" /D "SDLMAIN" /D "NO_STDIO_REDIRECT" /D "USE_WGL_SWAP" /D "HAVE_SDL" /D "HWRENDER" /D "HAVE_FILTER" /D "HAVE_MIXER" /D "USEASM" /D "HAVE_PNG" /FR /FD /GF /c -# ADD BASE RSC /l 0x409 /d "NDEBUG" -# ADD RSC /l 0x409 /d "NDEBUG" -# SUBTRACT RSC /x -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo /o"..\..\objs\SDL\Release\SRB2.bsc" -LINK32=link.exe -# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /machine:I386 -# ADD LINK32 SDL.lib SDL_mixer.lib user32.lib advapi32.lib ws2_32.lib /nologo /subsystem:windows /pdb:"C:\srb2demo2\srb2sdl.pdb" /debug /machine:I386 /out:"C:\srb2demo2\srb2sdl.exe" -# SUBTRACT LINK32 /profile /pdb:none /incremental:yes - -!ELSEIF "$(CFG)" == "Srb2SDL - Win32 Debug" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 1 -# PROP BASE Output_Dir "Debug" -# PROP BASE Intermediate_Dir "Debug" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 1 -# PROP Output_Dir "..\..\bin\VC\Debug\SDL" -# PROP Intermediate_Dir "..\..\objs\VC\Debug\SDL" -# PROP Ignore_Export_Lib 0 -# PROP Target_Dir "" -MTL=midl.exe -# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c -# ADD CPP /nologo /G6 /W4 /WX /Gm /GX /ZI /Od /Op /I "..\..\libs\libpng-src" /I "..\..\libs\zlib" /D "_DEBUG" /D "USE_WGL_SWAP" /D "HAVE_SDL" /D "HWRENDER" /D "HAVE_FILTER" /D "HAVE_MIXER" /D "USEASM" /D "HAVE_PNG" /FR /FD /GZ /c -# SUBTRACT CPP /YX -# ADD BASE RSC /l 0x409 /d "_DEBUG" -# ADD RSC /l 0x409 /d "_DEBUG" -# SUBTRACT RSC /x -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo /o"..\..\objs\SDL\Debug\SRB2.bsc" -LINK32=link.exe -# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept -# ADD LINK32 SDL.lib SDL_mixer.lib user32.lib advapi32.lib ws2_32.lib /nologo /subsystem:console /pdb:"C:\srb2demo2\srb2sdldebug.pdb" /debug /machine:I386 /out:"C:\srb2demo2\srb2sdldebug.exe" /pdbtype:sept -# SUBTRACT LINK32 /pdb:none - -!ENDIF - -# Begin Target - -# Name "Srb2SDL - Win32 Release" -# Name "Srb2SDL - Win32 Debug" -# Begin Group "SDLapp" - -# PROP Default_Filter "" -# Begin Group "filter" - -# PROP Default_Filter "" -# Begin Source File - -SOURCE=.\filter\filters.c -# End Source File -# Begin Source File - -SOURCE=.\filter\filters.h -# End Source File -# Begin Source File - -SOURCE=.\filter\hq2x.c -# End Source File -# Begin Source File - -SOURCE=.\filter\hq2x.h -# End Source File -# Begin Source File - -SOURCE=.\filter\interp.h -# End Source File -# Begin Source File - -SOURCE=.\filter\lq2x.c -# End Source File -# Begin Source File - -SOURCE=.\filter\lq2x.h -# End Source File -# End Group -# Begin Source File - -SOURCE=.\dosstr.c -# End Source File -# Begin Source File - -SOURCE=.\endtxt.c -# End Source File -# Begin Source File - -SOURCE=.\endtxt.h -# End Source File -# Begin Source File - -SOURCE=..\filesrch.c -# End Source File -# Begin Source File - -SOURCE=..\filesrch.h -# End Source File -# Begin Source File - -SOURCE=.\hwsym_sdl.c -# End Source File -# Begin Source File - -SOURCE=.\hwsym_sdl.h -# End Source File -# Begin Source File - -SOURCE=.\i_cdmus.c -# End Source File -# Begin Source File - -SOURCE=.\i_main.c -# End Source File -# Begin Source File - -SOURCE=.\i_net.c -# End Source File -# Begin Source File - -SOURCE=.\i_sound.c -# End Source File -# Begin Source File - -SOURCE=.\i_system.c -# End Source File -# Begin Source File - -SOURCE=.\i_video.c -# End Source File -# Begin Source File - -SOURCE=.\IMG_xpm.c -# PROP Exclude_From_Build 1 -# End Source File -# Begin Source File - -SOURCE=.\ogl_sdl.c -# End Source File -# Begin Source File - -SOURCE=.\ogl_sdl.h -# End Source File -# Begin Source File - -SOURCE=..\hardware\r_opengl\r_opengl.c -# End Source File -# Begin Source File - -SOURCE=..\hardware\r_opengl\r_opengl.h -# End Source File -# Begin Source File - -SOURCE=.\SDL_icon.xpm -# End Source File -# Begin Source File - -SOURCE=.\SDL_main\SDL_win32_main.c - -!IF "$(CFG)" == "Srb2SDL - Win32 Release" - -!ELSEIF "$(CFG)" == "Srb2SDL - Win32 Debug" - -# PROP Exclude_From_Build 1 - -!ENDIF - -# End Source File -# Begin Source File - -SOURCE=.\sdlmain.h -# End Source File -# Begin Source File - -SOURCE=..\win32\Srb2win.rc -# End Source File -# Begin Source File - -SOURCE=..\win32\win_dbg.c -# End Source File -# Begin Source File - -SOURCE=..\win32\win_dbg.h -# End Source File -# Begin Source File - -SOURCE=..\win32\win_main.h -# End Source File -# End Group -# Begin Group "A_Asm" - -# PROP Default_Filter "" -# Begin Source File - -SOURCE=..\p5prof.h -# End Source File -# Begin Source File - -SOURCE=..\tmap.nas - -!IF "$(CFG)" == "Srb2SDL - Win32 Release" - -# PROP Ignore_Default_Tool 1 -# Begin Custom Build - Compiling $(InputName).nas with NASM... -IntDir=.\..\..\objs\VC\Release\SDL -InputPath=..\tmap.nas -InputName=tmap - -"$(IntDir)/$(InputName).obj" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" - nasm -g -o $(IntDir)/$(InputName).obj -f win32 $(InputPath) - -# End Custom Build - -!ELSEIF "$(CFG)" == "Srb2SDL - Win32 Debug" - -# PROP Ignore_Default_Tool 1 -# Begin Custom Build - Compiling $(InputName).nas with NASM... -IntDir=.\..\..\objs\VC\Debug\SDL -InputPath=..\tmap.nas -InputName=tmap - -"$(IntDir)/$(InputName).obj" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" - nasm -g -o $(IntDir)/$(InputName).obj -f win32 $(InputPath) - -# End Custom Build - -!ENDIF - -# End Source File -# Begin Source File - -SOURCE=..\tmap_mmx.nas - -!IF "$(CFG)" == "Srb2SDL - Win32 Release" - -# PROP Ignore_Default_Tool 1 -# Begin Custom Build - Compiling $(InputName).nas with NASM... -IntDir=.\..\..\objs\VC\Release\SDL -InputPath=..\tmap_mmx.nas -InputName=tmap_mmx - -"$(IntDir)/$(InputName).obj" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" - nasm -g -o $(IntDir)/$(InputName).obj -f win32 $(InputPath) - -# End Custom Build - -!ELSEIF "$(CFG)" == "Srb2SDL - Win32 Debug" - -# PROP Ignore_Default_Tool 1 -# Begin Custom Build - Compiling $(InputName).nas with NASM... - -IntDir=.\..\..\objs\VC\Debug\SDL -InputPath=..\tmap_mmx.nas -InputName=tmap_mmx - -"$(IntDir)/$(InputName).obj" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" - nasm -g -o $(IntDir)/$(InputName).obj -f win32 $(InputPath) - -# End Custom Build - -!ENDIF - -# End Source File -# Begin Source File - -SOURCE=..\tmap_vc.nas - -!IF "$(CFG)" == "Srb2SDL - Win32 Release" - -# Begin Custom Build - Compiling $(InputName).nas with NASM... -IntDir=.\..\..\objs\VC\Release\SDL -InputPath=..\tmap_vc.nas -InputName=tmap_vc - -"$(IntDir)/$(InputName).obj" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" - nasm -g -o $(IntDir)/$(InputName).obj -f win32 $(InputPath) - -# End Custom Build - -!ELSEIF "$(CFG)" == "Srb2SDL - Win32 Debug" - -# Begin Custom Build - Compiling $(InputName).nas with NASM... -IntDir=.\..\..\objs\VC\Debug\SDL -InputPath=..\tmap_vc.nas -InputName=tmap_vc - -"$(IntDir)/$(InputName).obj" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" - nasm -g -o $(IntDir)/$(InputName).obj -f win32 $(InputPath) - -# End Custom Build - -!ENDIF - -# End Source File -# End Group -# Begin Group "D_Doom" - -# PROP Default_Filter "" -# Begin Source File - -SOURCE=..\comptime.c -# End Source File -# Begin Source File - -SOURCE=..\d_clisrv.c -# End Source File -# Begin Source File - -SOURCE=..\d_clisrv.h -# End Source File -# Begin Source File - -SOURCE=..\d_event.h -# End Source File -# Begin Source File - -SOURCE=..\d_main.c -# End Source File -# Begin Source File - -SOURCE=..\d_main.h -# End Source File -# Begin Source File - -SOURCE=..\d_net.c -# End Source File -# Begin Source File - -SOURCE=..\d_net.h -# End Source File -# Begin Source File - -SOURCE=..\d_netcmd.c -# End Source File -# Begin Source File - -SOURCE=..\d_netcmd.h -# End Source File -# Begin Source File - -SOURCE=..\d_netfil.c -# End Source File -# Begin Source File - -SOURCE=..\d_netfil.h -# End Source File -# Begin Source File - -SOURCE=..\d_player.h -# End Source File -# Begin Source File - -SOURCE=..\d_think.h -# End Source File -# Begin Source File - -SOURCE=..\d_ticcmd.h -# End Source File -# Begin Source File - -SOURCE=..\dehacked.c -# End Source File -# Begin Source File - -SOURCE=..\dehacked.h -# End Source File -# Begin Source File - -SOURCE=..\doomdata.h -# End Source File -# Begin Source File - -SOURCE=..\doomdef.h -# End Source File -# Begin Source File - -SOURCE=..\doomstat.h -# End Source File -# Begin Source File - -SOURCE=..\doomtype.h -# End Source File -# Begin Source File - -SOURCE=..\z_zone.c -# End Source File -# Begin Source File - -SOURCE=..\z_zone.h -# End Source File -# End Group -# Begin Group "F_Frame" - -# PROP Default_Filter "" -# Begin Source File - -SOURCE=..\f_finale.c -# End Source File -# Begin Source File - -SOURCE=..\f_finale.h -# End Source File -# Begin Source File - -SOURCE=..\f_wipe.c -# End Source File -# End Group -# Begin Group "G_Game" - -# PROP Default_Filter "" -# Begin Source File - -SOURCE=..\g_game.c -# End Source File -# Begin Source File - -SOURCE=..\g_game.h -# End Source File -# Begin Source File - -SOURCE=..\g_input.c -# End Source File -# Begin Source File - -SOURCE=..\g_input.h -# End Source File -# Begin Source File - -SOURCE=..\g_state.h -# End Source File -# End Group -# Begin Group "H_Hud" - -# PROP Default_Filter "" -# Begin Source File - -SOURCE=..\am_map.c -# End Source File -# Begin Source File - -SOURCE=..\am_map.h -# End Source File -# Begin Source File - -SOURCE=..\command.c -# End Source File -# Begin Source File - -SOURCE=..\command.h -# End Source File -# Begin Source File - -SOURCE=..\console.c -# End Source File -# Begin Source File - -SOURCE=..\console.h -# End Source File -# Begin Source File - -SOURCE=..\hu_stuff.c -# End Source File -# Begin Source File - -SOURCE=..\hu_stuff.h -# End Source File -# Begin Source File - -SOURCE=..\st_stuff.c -# End Source File -# Begin Source File - -SOURCE=..\st_stuff.h -# End Source File -# Begin Source File - -SOURCE=..\y_inter.c -# End Source File -# Begin Source File - -SOURCE=..\y_inter.h -# End Source File -# End Group -# Begin Group "Hw_Hardware" - -# PROP Default_Filter "" -# Begin Source File - -SOURCE=..\hardware\hw_bsp.c -# End Source File -# Begin Source File - -SOURCE=..\hardware\hw_cache.c -# End Source File -# Begin Source File - -SOURCE=..\hardware\hw_data.h -# End Source File -# Begin Source File - -SOURCE=..\hardware\hw_defs.h -# End Source File -# Begin Source File - -SOURCE=..\hardware\hw_dll.h -# End Source File -# Begin Source File - -SOURCE=..\hardware\hw_draw.c -# End Source File -# Begin Source File - -SOURCE=..\hardware\hw_gl.h -# End Source File -# Begin Source File - -SOURCE=..\hardware\hw_glob.h -# End Source File -# Begin Source File - -SOURCE=..\hardware\hw_main.c -# End Source File -# Begin Source File - -SOURCE=..\hardware\hw_main.h -# End Source File -# Begin Source File - -SOURCE=..\hardware\hw_md2.c -# End Source File -# Begin Source File - -SOURCE=..\hardware\hw_md2.h -# End Source File -# Begin Source File - -# PROP Default_Filter "" -# Begin Source File - -SOURCE=..\byteptr.h -# End Source File -# Begin Source File - -SOURCE=..\i_joy.h -# End Source File -# Begin Source File - -SOURCE=..\i_net.h -# End Source File -# Begin Source File - -SOURCE=..\i_sound.h -# End Source File -# Begin Source File - -SOURCE=..\i_system.h -# End Source File -# Begin Source File - -SOURCE=..\i_tcp.c -# End Source File -# Begin Source File - -SOURCE=..\i_tcp.h -# End Source File -# Begin Source File - -SOURCE=..\i_video.h -# End Source File -# Begin Source File - -SOURCE=..\keys.h -# End Source File -# Begin Source File - -SOURCE=..\mserv.c -# End Source File -# Begin Source File - -SOURCE=..\mserv.h -# End Source File -# End Group -# Begin Group "M_Misc" - -# PROP Default_Filter "" -# Begin Source File - -SOURCE=..\m_argv.c -# End Source File -# Begin Source File - -SOURCE=..\m_argv.h -# End Source File -# Begin Source File - -SOURCE=..\m_bbox.c -# End Source File -# Begin Source File - -SOURCE=..\m_bbox.h -# End Source File -# Begin Source File - -SOURCE=..\m_cheat.c -# End Source File -# Begin Source File - -SOURCE=..\m_cheat.h -# End Source File -# Begin Source File - -SOURCE=..\m_dllist.h -# End Source File -# Begin Source File - -SOURCE=..\m_fixed.c -# End Source File -# Begin Source File - -SOURCE=..\m_fixed.h -# End Source File -# Begin Source File - -SOURCE=..\m_menu.c -# End Source File -# Begin Source File - -SOURCE=..\m_menu.h -# End Source File -# Begin Source File - -SOURCE=..\m_misc.c -# End Source File -# Begin Source File - -SOURCE=..\m_misc.h -# End Source File -# Begin Source File - -SOURCE=..\m_queue.c -# End Source File -# Begin Source File - -SOURCE=..\m_queue.h -# End Source File -# Begin Source File - -SOURCE=..\m_random.c -# End Source File -# Begin Source File - -SOURCE=..\m_random.h -# End Source File -# Begin Source File - -SOURCE=..\m_swap.h -# End Source File -# Begin Source File - -SOURCE=..\string.c -# End Source File -# End Group -# Begin Group "P_Play" - -# PROP Default_Filter "" -# Begin Source File - -SOURCE=..\info.c -# End Source File -# Begin Source File - -SOURCE=..\info.h -# End Source File -# Begin Source File - -SOURCE=..\p_ceilng.c -# End Source File -# Begin Source File - -SOURCE=..\p_enemy.c -# End Source File -# Begin Source File - -SOURCE=..\p_fab.c -# End Source File -# Begin Source File - -SOURCE=..\p_floor.c -# End Source File -# Begin Source File - -SOURCE=..\p_inter.c -# End Source File -# Begin Source File - -SOURCE=..\p_lights.c -# End Source File -# Begin Source File - -SOURCE=..\p_local.h -# End Source File -# Begin Source File - -SOURCE=..\p_map.c -# End Source File -# Begin Source File - -SOURCE=..\p_maputl.c -# End Source File -# Begin Source File - -SOURCE=..\p_maputl.h -# End Source File -# Begin Source File - -SOURCE=..\p_mobj.c -# End Source File -# Begin Source File - -SOURCE=..\p_mobj.h -# End Source File -# Begin Source File - -SOURCE=..\p_polyobj.c -# End Source File -# Begin Source File - -SOURCE=..\p_polyobj.h -# End Source File -# Begin Source File - -SOURCE=..\p_pspr.h -# End Source File -# Begin Source File - -SOURCE=..\p_saveg.c -# End Source File -# Begin Source File - -SOURCE=..\p_saveg.h -# End Source File -# Begin Source File - -SOURCE=..\p_setup.c -# End Source File -# Begin Source File - -SOURCE=..\p_setup.h -# End Source File -# Begin Source File - -SOURCE=..\p_sight.c -# End Source File -# Begin Source File - -SOURCE=..\p_spec.c -# End Source File -# Begin Source File - -SOURCE=..\p_spec.h -# End Source File -# Begin Source File - -SOURCE=..\p_telept.c -# End Source File -# Begin Source File - -SOURCE=..\p_tick.c -# End Source File -# Begin Source File - -SOURCE=..\p_tick.h -# End Source File -# Begin Source File - -SOURCE=..\p_user.c -# End Source File -# Begin Source File - -SOURCE=..\tables.c -# End Source File -# Begin Source File - -SOURCE=..\tables.h -# End Source File -# End Group -# Begin Group "R_Rend" - -# PROP Default_Filter "" -# Begin Source File - -SOURCE=..\r_bsp.c -# End Source File -# Begin Source File - -SOURCE=..\r_bsp.h -# End Source File -# Begin Source File - -SOURCE=..\r_data.c -# End Source File -# Begin Source File - -SOURCE=..\r_data.h -# End Source File -# Begin Source File - -SOURCE=..\r_defs.h -# End Source File -# Begin Source File - -SOURCE=..\r_draw.c -# End Source File -# Begin Source File - -SOURCE=..\r_draw.h -# End Source File -# Begin Source File - -SOURCE=..\r_draw8.c -# PROP Exclude_From_Build 1 -# End Source File -# Begin Source File - -SOURCE=..\r_local.h -# End Source File -# Begin Source File - -SOURCE=..\r_main.c -# End Source File -# Begin Source File - -SOURCE=..\r_main.h -# End Source File -# Begin Source File - -SOURCE=..\r_patch.c -# End Source File -# Begin Source File - -SOURCE=..\r_patch.h -# End Source File -# Begin Source File - -SOURCE=..\r_patchrotation.c -# End Source File -# Begin Source File - -SOURCE=..\r_patchrotation.h -# End Source File -# Begin Source File - -SOURCE=..\r_plane.c -# End Source File -# Begin Source File - -SOURCE=..\r_plane.h -# End Source File -# Begin Source File - -SOURCE=..\r_segs.c -# End Source File -# Begin Source File - -SOURCE=..\r_segs.h -# End Source File -# Begin Source File - -SOURCE=..\r_sky.c -# End Source File -# Begin Source File - -SOURCE=..\r_sky.h -# End Source File -# Begin Source File - -SOURCE=..\r_splats.c -# End Source File -# Begin Source File - -SOURCE=..\r_splats.h -# End Source File -# Begin Source File - -SOURCE=..\r_state.h -# End Source File -# Begin Source File - -SOURCE=..\r_things.c -# End Source File -# Begin Source File - -SOURCE=..\r_things.h -# End Source File -# Begin Source File - -SOURCE=..\screen.c -# End Source File -# Begin Source File - -SOURCE=..\screen.h -# End Source File -# Begin Source File - -SOURCE=..\v_video.c -# End Source File -# Begin Source File - -SOURCE=..\v_video.h -# End Source File -# End Group -# Begin Group "S_Sounds" - -# PROP Default_Filter "" -# Begin Source File - -SOURCE=..\s_sound.c -# End Source File -# Begin Source File - -SOURCE=..\s_sound.h -# End Source File -# Begin Source File - -SOURCE=..\sounds.c -# End Source File -# Begin Source File - -SOURCE=..\sounds.h -# End Source File -# End Group -# Begin Group "W_Wad" - -# PROP Default_Filter "" -# Begin Source File - -SOURCE=..\lzf.c -# End Source File -# Begin Source File - -SOURCE=..\lzf.h -# End Source File -# Begin Source File - -SOURCE=..\md5.c -# End Source File -# Begin Source File - -SOURCE=..\md5.h -# End Source File -# Begin Source File - -SOURCE=..\w_wad.c -# End Source File -# Begin Source File - -SOURCE=..\w_wad.h -# End Source File -# End Group -# Begin Group "Docs" - -# PROP Default_Filter "" -# Begin Source File - -SOURCE=..\..\doc\copying -# End Source File -# Begin Source File - -SOURCE=..\..\doc\faq.txt -# End Source File -# Begin Source File - -SOURCE=..\..\readme.txt -# End Source File -# Begin Source File - -SOURCE=..\..\doc\source.txt -# End Source File -# End Group -# Begin Source File - -SOURCE=..\win32\Srb2win.ico -# End Source File -# End Target -# End Project diff --git a/src/sdl/Srb2SDL.dsw b/src/sdl/Srb2SDL.dsw deleted file mode 100644 index 888d2fcf3..000000000 --- a/src/sdl/Srb2SDL.dsw +++ /dev/null @@ -1,62 +0,0 @@ -Microsoft Developer Studio Workspace File, Format Version 6.00 -# WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE! - -############################################################################### - -Project: "Srb2SDL"=.\Srb2SDL.dsp - Package Owner=<4> - -Package=<5> -{{{ -}}} - -Package=<4> -{{{ - Begin Project Dependency - Project_Dep_Name libpng - End Project Dependency - Begin Project Dependency - Project_Dep_Name zlib - End Project Dependency -}}} - -############################################################################### - -Project: "libpng"="..\..\libs\libpng-src\projects\visualc6\libpng.dsp" - Package Owner=<4> - -Package=<5> -{{{ -}}} - -Package=<4> -{{{ - Begin Project Dependency - Project_Dep_Name zlib - End Project Dependency -}}} - -############################################################################### - -Project: "zlib"=..\..\libs\zlib\projects\visualc6\zlib.dsp - Package Owner=<4> - -Package=<5> -{{{ -}}} - -Package=<4> -{{{ -}}} - -############################################################################### - -Global: - -Package=<5> -{{{ -}}} - -Package=<3> -{{{ -}}} - -############################################################################### - diff --git a/src/sdl/Srb2SDL.ico b/src/sdl/Srb2SDL.ico deleted file mode 100644 index 87bd2766e..000000000 Binary files a/src/sdl/Srb2SDL.ico and /dev/null differ diff --git a/src/sdl/Srb2SDL.props b/src/sdl/Srb2SDL.props deleted file mode 100644 index 8c4799f20..000000000 --- a/src/sdl/Srb2SDL.props +++ /dev/null @@ -1,15 +0,0 @@ - - - - - - - - - HAVE_ZLIB;HAVE_LIBGME;USE_WGL_SWAP;HAVE_SDL;HWRENDER;HAVE_FILTER;HAVE_MIXER;SDLMAIN;%(PreprocessorDefinitions) - - USE_WGL_SWAP;HAVE_SDL;HWRENDER;HAVE_FILTER;HAVE_MIXER;SDLMAIN;%(PreprocessorDefinitions) - - - - diff --git a/src/sdl/i_system.cpp b/src/sdl/i_system.cpp index 7e1a93835..48ba6a21e 100644 --- a/src/sdl/i_system.cpp +++ b/src/sdl/i_system.cpp @@ -83,6 +83,12 @@ typedef LPVOID (WINAPI *p_MapViewOfFile) (HANDLE, DWORD, DWORD, DWORD, SIZE_T); #if defined (__unix__) || defined(__APPLE__) || (defined (UNIXCOMMON) && !defined (__HAIKU__)) #if defined (__linux__) #include +#elif defined(__APPLE__) +#include +#include +#include +#include +#include #else #include #include @@ -172,8 +178,7 @@ const char *wadSearchPaths[] = { /** \brief WAD file to look for */ -#define WADKEYWORD1 "srb2.srb" -#define WADKEYWORD2 "srb2.wad" +#define WADKEYWORD "srb2.srb" /** \brief holds wad path */ static char returnWadPath[256]; @@ -555,12 +560,12 @@ void I_OutputMsg(const char *fmt, ...) { size_t len; char *txt; - va_list argptr; + va_list argptr; if (!fmt) return; - va_start(argptr,fmt); + va_start(argptr, fmt); len = vsnprintf(NULL, 0, fmt, argptr); va_end(argptr); if (len == 0) @@ -571,7 +576,7 @@ void I_OutputMsg(const char *fmt, ...) if (!txt) I_Error("I_OutputMsg: Out of memory!\n"); - va_start(argptr,fmt); + va_start(argptr, fmt); vsprintf(txt, fmt, argptr); va_end(argptr); @@ -691,7 +696,7 @@ void I_OutputMsg(const char *fmt, ...) // // I_GetKey // -INT32 I_GetKey (void) +INT32 I_GetKey(void) { // Warning: I_GetKey empties the event queue till next keypress event_t *ev; @@ -743,26 +748,22 @@ INT32 numcontrollers = 0; // void I_JoyScale(void) { - Joystick[0].bGamepadStyle = cv_joyscale[0].value == 0; - JoyInfo[0].scale = Joystick[0].bGamepadStyle ? 1 : cv_joyscale[0].value; + JoyInfo[0].scale = DigitalGamepadStyle(0) ? 1 : cv_joyscale[0].value; } void I_JoyScale2(void) { - Joystick[1].bGamepadStyle = cv_joyscale[1].value == 0; - JoyInfo[1].scale = Joystick[1].bGamepadStyle ? 1 : cv_joyscale[1].value; + JoyInfo[1].scale = DigitalGamepadStyle(1) ? 1 : cv_joyscale[1].value; } void I_JoyScale3(void) { - Joystick[2].bGamepadStyle = cv_joyscale[2].value == 0; - JoyInfo[2].scale = Joystick[2].bGamepadStyle ? 1 : cv_joyscale[2].value; + JoyInfo[2].scale = DigitalGamepadStyle(2) ? 1 : cv_joyscale[2].value; } void I_JoyScale4(void) { - Joystick[3].bGamepadStyle = cv_joyscale[3].value == 0; - JoyInfo[3].scale = Joystick[3].bGamepadStyle ? 1 : cv_joyscale[3].value; + JoyInfo[3].scale = DigitalGamepadStyle(3) ? 1 : cv_joyscale[3].value; } // Cheat to get the device index for a joystick handle @@ -1404,7 +1405,11 @@ void I_SleepDuration(precise_t duration) duration -= slack; struct timespec ts = { .tv_sec = static_cast<__time_t>(duration / precision), +#ifdef __BIONIC__ + .tv_nsec = static_cast(duration * 1000000000 / precision % 1000000000), +#else .tv_nsec = static_cast<__syscall_slong_t>(duration * 1000000000 / precision % 1000000000), +#endif }; int status; do status = clock_nanosleep(CLOCK_MONOTONIC, 0, &ts, &ts); @@ -1704,7 +1709,7 @@ static void I_PrintSignal(INT32 signal_num, boolean core_dumped, char *signal_ms sprintf(signal_name, "%s", signame); } -static int I_OpenURL(const char *url) +int I_OpenURL(const char *url) { #if SDL_VERSION_ATLEAST(2,0,14) return SDL_OpenURL(va("%s", url)); @@ -1740,7 +1745,13 @@ static void I_ShowErrorBox(const char *title, const char *msg) SDL_ShowMessageBox(&messageboxdata, &buttonid); if (buttonid == 1) - I_OpenURL("https://github.com/Indev450/SRB2Kart-Saturn/issues"); + { + int url = I_OpenURL(SATURNISSUEPAGE); + + // SDL_OpenURL unsupported or failed + if (url == -1) + SDL_ShowSimpleMessageBox(SDL_MESSAGEBOX_ERROR, "Failed to Open Web Page", "Please open the following page in your web browser:\n" SATURNISSUEPAGE, NULL); + } } static void I_ShowSimpleErrorBox(const char *title, char *msg) @@ -2257,7 +2268,6 @@ void I_ShutdownSystem(void) logstream = NULL; } #endif - } void I_GetDiskFreeSpace(INT64 *freespace) @@ -2429,7 +2439,7 @@ static boolean isWadPathOk(const char *path) if (!wad3path) return false; - sprintf(wad3path, pandf, path, WADKEYWORD1); + sprintf(wad3path, pandf, path, WADKEYWORD); if (FIL_ReadFileOK(wad3path)) { @@ -2469,10 +2479,10 @@ static void pathonly(char *s) */ static const char *searchWad(const char *searchDir) { - static char tempsw[255] = ""; + static char tempsw[256] = ""; filestatus_t fstemp; - strcpy(tempsw, WADKEYWORD1); + strcpy(tempsw, WADKEYWORD); fstemp = filesearch(tempsw, searchDir, NULL, true, 20); if (fstemp == FS_FOUND) { @@ -2633,13 +2643,13 @@ size_t I_GetFreeMem(size_t *total) *total = 32 << 20; return 32 << 20; #elif defined (_WIN32) - MEMORYSTATUS info; + MEMORYSTATUSEX info; - info.dwLength = sizeof (MEMORYSTATUS); - GlobalMemoryStatus( &info ); + info.dwLength = sizeof (MEMORYSTATUSEX); + GlobalMemoryStatusEx( &info ); if (total) - *total = (size_t)info.dwTotalPhys; - return (size_t)info.dwAvailPhys; + *total = (size_t)info.ullTotalPhys; + return (size_t)info.ullAvailPhys; #elif defined (__OS2__) UINT32 pr_arena; @@ -2672,7 +2682,7 @@ size_t I_GetFreeMem(size_t *total) { // Error if (total) - *total = 0L; + *total = 0; return 0; } @@ -2681,12 +2691,12 @@ size_t I_GetFreeMem(size_t *total) { // Error if (total) - *total = 0L; + *total = 0; return 0; } memTag += sizeof (MEMTOTAL); - totalKBytes = (size_t)atoi(memTag); + totalKBytes = strtoul(memTag, NULL, 10); if ((memTag = strstr(buf, MEMAVAILABLE)) == NULL) { @@ -2700,7 +2710,7 @@ size_t I_GetFreeMem(size_t *total) { // Error if (total) - *total = 0L; + *total = 0; return 0; } freeKBytes = MemAvailable; @@ -2708,12 +2718,40 @@ size_t I_GetFreeMem(size_t *total) else { memTag += sizeof (MEMAVAILABLE); - freeKBytes = atoi(memTag); + freeKBytes = strtoul(memTag, NULL, 10); } if (total) *total = totalKBytes << 10; return freeKBytes << 10; +#elif defined(__APPLE__) + /* macOS */ + mach_port_t host = mach_host_self(); + kern_return_t kr; + mach_msg_type_number_t count; + vm_size_t v_page_size; + struct vm_statistics64 vm_stats; + uint64_t total_mem, free_mem; + size_t size; + + size = sizeof(total_mem); + if (sysctlbyname("hw.memsize", &total_mem, &size, NULL, 0) < 0) + total_mem = 0; + + kr = host_page_size(host, &v_page_size); + if (kr != KERN_SUCCESS) + v_page_size = 4096; + + count = HOST_VM_INFO64_COUNT; + kr = host_statistics64(host, HOST_VM_INFO64, (host_info64_t)&vm_stats, &count); + if (kr == KERN_SUCCESS) + free_mem = (uint64_t)(vm_stats.free_count + vm_stats.inactive_count) * v_page_size; + else + free_mem = 0; + + if (total) + *total = (size_t)total_mem; + return (size_t)free_mem; #else // Guess 48 MB. if (total) diff --git a/src/sdl/i_video.c b/src/sdl/i_video.c index a30da7f0a..c6554c2b9 100644 --- a/src/sdl/i_video.c +++ b/src/sdl/i_video.c @@ -454,7 +454,7 @@ static INT32 SDLJoyAxis(const Sint16 axis, evtype_t which) return 0; } - if (Joystick[pid].bGamepadStyle) + if (DigitalGamepadStyle(pid)) { // gamepad control type, on or off, live or die if (raxis < -(JOYAXISRANGE/2)) @@ -1816,15 +1816,18 @@ void I_StartupGraphics(void) framebuffer = SDL_TRUE; } + // Choose Software renderer if (M_CheckParm("-software")) rendermode = render_soft; #ifdef HWRENDER + // Choose OpenGL renderer else if (M_CheckParm("-opengl")) rendermode = render_opengl; msaa = 0; boolean msaa_set = false; a2c = false; boolean a2c_set = false; + // MSAA antialiasing if (M_CheckParm("-msaa") && M_IsNextParm()) { const char* str = M_GetNextParm(); diff --git a/src/sdl/mixer_sound.c b/src/sdl/mixer_sound.c index f177412e7..be67b69eb 100644 --- a/src/sdl/mixer_sound.c +++ b/src/sdl/mixer_sound.c @@ -945,7 +945,7 @@ UINT32 I_GetSongLength(void) boolean I_SetSongLoopPoint(UINT32 looppoint) { - if (!music|| !is_looping) + if (!music || !is_looping) return false; const musictype_t mustype = I_SongType(); @@ -958,7 +958,7 @@ boolean I_SetSongLoopPoint(UINT32 looppoint) if (length > 0) looppoint %= length; - loop_point = max((float)(looppoint / 1000.0L), 0); + loop_point = max((float)(looppoint / 1000.0L), 0.0f); return true; } diff --git a/src/sounds.c b/src/sounds.c index dbd5478bd..26d4ead57 100644 --- a/src/sounds.c +++ b/src/sounds.c @@ -28,980 +28,972 @@ sfxinfo_t S_sfx[NUMSFX] = { - /***** Legacy doesn't use the PITCH variable, so now it is used for various flags. See soundflags_t. *****/ - // S_sfx[0] needs to be a dummy for odd reasons. (don't modify this comment) -// name, singularity, priority, pitch, data, length, skinsound, lumpnum - {"none" , false, 0, 0, NULL, 0, -1, LUMPERROR}, + // S_sfx[0] needs to be a dummy for odd reasons. (don't modify this comment) + // name, singularity, priority, pitch, data, length, skinsound, lumpnum + {"none" , false, 0, 0, NULL, 0, -1, LUMPERROR}, - // Skin Sounds - {"altdi1", false, 192, 16, NULL, 0, SKSPLDET1, LUMPERROR}, - {"altdi2", false, 192, 16, NULL, 0, SKSPLDET2, LUMPERROR}, - {"altdi3", false, 192, 16, NULL, 0, SKSPLDET3, LUMPERROR}, - {"altdi4", false, 192, 16, NULL, 0, SKSPLDET4, LUMPERROR}, - {"altow1", false, 192, 16, NULL, 0, SKSPLPAN1, LUMPERROR}, - {"altow2", false, 192, 16, NULL, 0, SKSPLPAN2, LUMPERROR}, - {"altow3", false, 192, 16, NULL, 0, SKSPLPAN3, LUMPERROR}, - {"altow4", false, 192, 16, NULL, 0, SKSPLPAN4, LUMPERROR}, - {"victr1", false, 64, 16, NULL, 0, SKSPLVCT1, LUMPERROR}, - {"victr2", false, 64, 16, NULL, 0, SKSPLVCT2, LUMPERROR}, - {"victr3", false, 64, 16, NULL, 0, SKSPLVCT3, LUMPERROR}, - {"victr4", false, 64, 16, NULL, 0, SKSPLVCT4, LUMPERROR}, - {"gasp" , false, 64, 0, NULL, 0, SKSGASP, LUMPERROR}, - {"jump" , false, 140, 0, NULL, 0, SKSJUMP, LUMPERROR}, - {"pudpud", false, 64, 0, NULL, 0, SKSPUDPUD, LUMPERROR}, - {"putput", false, 64, 0, NULL, 0, SKSPUTPUT, LUMPERROR}, // not as high a priority - {"spin" , false, 100, 0, NULL, 0, SKSSPIN, LUMPERROR}, - {"spndsh", false, 64, 1, NULL, 0, SKSSPNDSH, LUMPERROR}, - {"thok" , false, 96, 0, NULL, 0, SKSTHOK, LUMPERROR}, - {"zoom" , false, 120, 1, NULL, 0, SKSZOOM, LUMPERROR}, - {"skid", false, 64, 32, NULL, 0, SKSSKID, LUMPERROR}, + // Skin Sounds + {"altdi1", false, 192, 16, NULL, 0, SKSPLDET1, LUMPERROR}, + {"altdi2", false, 192, 16, NULL, 0, SKSPLDET2, LUMPERROR}, + {"altdi3", false, 192, 16, NULL, 0, SKSPLDET3, LUMPERROR}, + {"altdi4", false, 192, 16, NULL, 0, SKSPLDET4, LUMPERROR}, + {"altow1", false, 192, 16, NULL, 0, SKSPLPAN1, LUMPERROR}, + {"altow2", false, 192, 16, NULL, 0, SKSPLPAN2, LUMPERROR}, + {"altow3", false, 192, 16, NULL, 0, SKSPLPAN3, LUMPERROR}, + {"altow4", false, 192, 16, NULL, 0, SKSPLPAN4, LUMPERROR}, + {"victr1", false, 64, 16, NULL, 0, SKSPLVCT1, LUMPERROR}, + {"victr2", false, 64, 16, NULL, 0, SKSPLVCT2, LUMPERROR}, + {"victr3", false, 64, 16, NULL, 0, SKSPLVCT3, LUMPERROR}, + {"victr4", false, 64, 16, NULL, 0, SKSPLVCT4, LUMPERROR}, + {"gasp" , false, 64, 0, NULL, 0, SKSGASP, LUMPERROR}, + {"jump" , false, 140, 0, NULL, 0, SKSJUMP, LUMPERROR}, + {"pudpud", false, 64, 0, NULL, 0, SKSPUDPUD, LUMPERROR}, + {"putput", false, 64, 0, NULL, 0, SKSPUTPUT, LUMPERROR}, // not as high a priority + {"spin" , false, 100, 0, NULL, 0, SKSSPIN, LUMPERROR}, + {"spndsh", false, 64, 1, NULL, 0, SKSSPNDSH, LUMPERROR}, + {"thok" , false, 96, 0, NULL, 0, SKSTHOK, LUMPERROR}, + {"zoom" , false, 120, 1, NULL, 0, SKSZOOM, LUMPERROR}, + {"skid", false, 64, 32, NULL, 0, SKSSKID, LUMPERROR}, - // Ambience/background objects/etc - {"ambint", true, 32, 0, NULL, 0, -1, LUMPERROR}, + // Ambience/background objects/etc + {"ambint", true, 32, 0, NULL, 0, -1, LUMPERROR}, - {"alarm", false, 32, 0, NULL, 0, -1, LUMPERROR}, - {"buzz1", false, 64, 0, NULL, 0, -1, LUMPERROR}, - {"buzz2", false, 64, 0, NULL, 0, -1, LUMPERROR}, - {"buzz3", false, 64, 0, NULL, 0, -1, LUMPERROR}, - {"buzz4", false, 8, 0, NULL, 0, -1, LUMPERROR}, - {"crumbl", true, 127, 0, NULL, 0, -1, LUMPERROR}, // Platform Crumble Tails 03-16-2001 - {"fire", false, 8, 32, NULL, 0, -1, LUMPERROR}, - {"grind", false, 64, 0, NULL, 0, -1, LUMPERROR}, - {"laser", true, 16, 2, NULL, 0, -1, LUMPERROR}, - {"mswing", false, 16, 0, NULL, 0, -1, LUMPERROR}, - {"pstart", false, 100, 0, NULL, 0, -1, LUMPERROR}, - {"pstop", false, 100, 0, NULL, 0, -1, LUMPERROR}, - {"steam1", false, 64, 0, NULL, 0, -1, LUMPERROR}, // Tails 06-19-2001 - {"steam2", false, 64, 0, NULL, 0, -1, LUMPERROR}, // Tails 06-19-2001 - {"wbreak", false, 64, 0, NULL, 0, -1, LUMPERROR}, + {"alarm", false, 32, 0, NULL, 0, -1, LUMPERROR}, + {"buzz1", false, 64, 0, NULL, 0, -1, LUMPERROR}, + {"buzz2", false, 64, 0, NULL, 0, -1, LUMPERROR}, + {"buzz3", false, 64, 0, NULL, 0, -1, LUMPERROR}, + {"buzz4", false, 8, 0, NULL, 0, -1, LUMPERROR}, + {"crumbl", true, 127, 0, NULL, 0, -1, LUMPERROR}, // Platform Crumble Tails 03-16-2001 + {"fire", false, 8, 32, NULL, 0, -1, LUMPERROR}, + {"grind", false, 64, 0, NULL, 0, -1, LUMPERROR}, + {"laser", true, 16, 2, NULL, 0, -1, LUMPERROR}, + {"mswing", false, 16, 0, NULL, 0, -1, LUMPERROR}, + {"pstart", false, 100, 0, NULL, 0, -1, LUMPERROR}, + {"pstop", false, 100, 0, NULL, 0, -1, LUMPERROR}, + {"steam1", false, 64, 0, NULL, 0, -1, LUMPERROR}, // Tails 06-19-2001 + {"steam2", false, 64, 0, NULL, 0, -1, LUMPERROR}, // Tails 06-19-2001 + {"wbreak", false, 64, 0, NULL, 0, -1, LUMPERROR}, - {"rainin", true, 24, 4, NULL, 0, -1, LUMPERROR}, - {"litng1", false, 16, 2, NULL, 0, -1, LUMPERROR}, - {"litng2", false, 16, 2, NULL, 0, -1, LUMPERROR}, - {"litng3", false, 16, 2, NULL, 0, -1, LUMPERROR}, - {"litng4", false, 16, 2, NULL, 0, -1, LUMPERROR}, - {"athun1", false, 16, 2, NULL, 0, -1, LUMPERROR}, - {"athun2", false, 16, 2, NULL, 0, -1, LUMPERROR}, + {"rainin", true, 24, 4, NULL, 0, -1, LUMPERROR}, + {"litng1", false, 16, 2, NULL, 0, -1, LUMPERROR}, + {"litng2", false, 16, 2, NULL, 0, -1, LUMPERROR}, + {"litng3", false, 16, 2, NULL, 0, -1, LUMPERROR}, + {"litng4", false, 16, 2, NULL, 0, -1, LUMPERROR}, + {"athun1", false, 16, 2, NULL, 0, -1, LUMPERROR}, + {"athun2", false, 16, 2, NULL, 0, -1, LUMPERROR}, - {"amwtr1", false, 12, 0, NULL, 0, -1, LUMPERROR}, - {"amwtr2", false, 12, 0, NULL, 0, -1, LUMPERROR}, - {"amwtr3", false, 12, 0, NULL, 0, -1, LUMPERROR}, - {"amwtr4", false, 12, 0, NULL, 0, -1, LUMPERROR}, - {"amwtr5", false, 12, 0, NULL, 0, -1, LUMPERROR}, - {"amwtr6", false, 12, 0, NULL, 0, -1, LUMPERROR}, - {"amwtr7", false, 12, 0, NULL, 0, -1, LUMPERROR}, - {"amwtr8", false, 12, 0, NULL, 0, -1, LUMPERROR}, - {"bubbl1", false, 11, 0, NULL, 0, -1, LUMPERROR}, - {"bubbl2", false, 11, 0, NULL, 0, -1, LUMPERROR}, - {"bubbl3", false, 11, 0, NULL, 0, -1, LUMPERROR}, - {"bubbl4", false, 11, 0, NULL, 0, -1, LUMPERROR}, - {"bubbl5", false, 11, 0, NULL, 0, -1, LUMPERROR}, - {"floush", false, 16, 0, NULL, 0, -1, LUMPERROR}, - {"splash", false, 64, 0, NULL, 0, -1, LUMPERROR}, - {"splish", false, 64, 0, NULL, 0, -1, LUMPERROR}, // Splish Tails 12-08-2000 - {"wdrip1", false, 8, 0, NULL, 0, -1, LUMPERROR}, - {"wdrip2", false, 8 , 0, NULL, 0, -1, LUMPERROR}, - {"wdrip3", false, 8, 0, NULL, 0, -1, LUMPERROR}, - {"wdrip4", false, 8, 0, NULL, 0, -1, LUMPERROR}, - {"wdrip5", false, 8, 0, NULL, 0, -1, LUMPERROR}, - {"wdrip6", false, 8, 0, NULL, 0, -1, LUMPERROR}, - {"wdrip7", false, 8, 0, NULL, 0, -1, LUMPERROR}, - {"wdrip8", false, 8, 0, NULL, 0, -1, LUMPERROR}, - {"wslap", false, 32, 0, NULL, 0, -1, LUMPERROR}, // Water Slap Tails 12-13-2000 + {"amwtr1", false, 12, 0, NULL, 0, -1, LUMPERROR}, + {"amwtr2", false, 12, 0, NULL, 0, -1, LUMPERROR}, + {"amwtr3", false, 12, 0, NULL, 0, -1, LUMPERROR}, + {"amwtr4", false, 12, 0, NULL, 0, -1, LUMPERROR}, + {"amwtr5", false, 12, 0, NULL, 0, -1, LUMPERROR}, + {"amwtr6", false, 12, 0, NULL, 0, -1, LUMPERROR}, + {"amwtr7", false, 12, 0, NULL, 0, -1, LUMPERROR}, + {"amwtr8", false, 12, 0, NULL, 0, -1, LUMPERROR}, + {"bubbl1", false, 11, 0, NULL, 0, -1, LUMPERROR}, + {"bubbl2", false, 11, 0, NULL, 0, -1, LUMPERROR}, + {"bubbl3", false, 11, 0, NULL, 0, -1, LUMPERROR}, + {"bubbl4", false, 11, 0, NULL, 0, -1, LUMPERROR}, + {"bubbl5", false, 11, 0, NULL, 0, -1, LUMPERROR}, + {"floush", false, 16, 0, NULL, 0, -1, LUMPERROR}, + {"splash", false, 64, 0, NULL, 0, -1, LUMPERROR}, + {"splish", false, 64, 0, NULL, 0, -1, LUMPERROR}, // Splish Tails 12-08-2000 + {"wdrip1", false, 8, 0, NULL, 0, -1, LUMPERROR}, + {"wdrip2", false, 8 , 0, NULL, 0, -1, LUMPERROR}, + {"wdrip3", false, 8, 0, NULL, 0, -1, LUMPERROR}, + {"wdrip4", false, 8, 0, NULL, 0, -1, LUMPERROR}, + {"wdrip5", false, 8, 0, NULL, 0, -1, LUMPERROR}, + {"wdrip6", false, 8, 0, NULL, 0, -1, LUMPERROR}, + {"wdrip7", false, 8, 0, NULL, 0, -1, LUMPERROR}, + {"wdrip8", false, 8, 0, NULL, 0, -1, LUMPERROR}, + {"wslap", false, 32, 0, NULL, 0, -1, LUMPERROR}, // Water Slap Tails 12-13-2000 - {"doora1", false, 64, 0, NULL, 0, -1, LUMPERROR}, - {"doorb1", false, 64, 0, NULL, 0, -1, LUMPERROR}, - {"doorc1", false, 64, 0, NULL, 0, -1, LUMPERROR}, - {"doorc2", false, 64, 0, NULL, 0, -1, LUMPERROR}, - {"doord1", false, 64, 0, NULL, 0, -1, LUMPERROR}, - {"doord2", false, 64, 0, NULL, 0, -1, LUMPERROR}, - {"eleva1", false, 64, 0, NULL, 0, -1, LUMPERROR}, - {"eleva2", false, 64, 0, NULL, 0, -1, LUMPERROR}, - {"eleva3", false, 64, 0, NULL, 0, -1, LUMPERROR}, - {"elevb1", false, 64, 0, NULL, 0, -1, LUMPERROR}, - {"elevb2", false, 64, 0, NULL, 0, -1, LUMPERROR}, - {"elevb3", false, 64, 0, NULL, 0, -1, LUMPERROR}, + {"doora1", false, 64, 0, NULL, 0, -1, LUMPERROR}, + {"doorb1", false, 64, 0, NULL, 0, -1, LUMPERROR}, + {"doorc1", false, 64, 0, NULL, 0, -1, LUMPERROR}, + {"doorc2", false, 64, 0, NULL, 0, -1, LUMPERROR}, + {"doord1", false, 64, 0, NULL, 0, -1, LUMPERROR}, + {"doord2", false, 64, 0, NULL, 0, -1, LUMPERROR}, + {"eleva1", false, 64, 0, NULL, 0, -1, LUMPERROR}, + {"eleva2", false, 64, 0, NULL, 0, -1, LUMPERROR}, + {"eleva3", false, 64, 0, NULL, 0, -1, LUMPERROR}, + {"elevb1", false, 64, 0, NULL, 0, -1, LUMPERROR}, + {"elevb2", false, 64, 0, NULL, 0, -1, LUMPERROR}, + {"elevb3", false, 64, 0, NULL, 0, -1, LUMPERROR}, - {"ambin2", false, 64, 0, NULL, 0, -1, LUMPERROR}, - {"lavbub", false, 64, 8, NULL, 0, -1, LUMPERROR}, - {"rocks1", false, 64, 64, NULL, 0, -1, LUMPERROR}, - {"rocks2", false, 64, 64, NULL, 0, -1, LUMPERROR}, - {"rocks3", false, 64, 64, NULL, 0, -1, LUMPERROR}, - {"rocks4", false, 64, 64, NULL, 0, -1, LUMPERROR}, - {"rumbam", false, 64, 0, NULL, 0, -1, LUMPERROR}, - {"rumble", false, 64, 24, NULL, 0, -1, LUMPERROR}, + {"ambin2", false, 64, 0, NULL, 0, -1, LUMPERROR}, + {"lavbub", false, 64, 8, NULL, 0, -1, LUMPERROR}, + {"rocks1", false, 64, 64, NULL, 0, -1, LUMPERROR}, + {"rocks2", false, 64, 64, NULL, 0, -1, LUMPERROR}, + {"rocks3", false, 64, 64, NULL, 0, -1, LUMPERROR}, + {"rocks4", false, 64, 64, NULL, 0, -1, LUMPERROR}, + {"rumbam", false, 64, 0, NULL, 0, -1, LUMPERROR}, + {"rumble", false, 64, 24, NULL, 0, -1, LUMPERROR}, - // Game objects, etc - {"appear", false, 127, 0, NULL, 0, -1, LUMPERROR}, - {"bkpoof", false, 70, 8, NULL, 0, -1, LUMPERROR}, - {"bnce1", false, 64, 0, NULL, 0, -1, LUMPERROR}, // Boing! - {"bnce2", false, 64, 0, NULL, 0, -1, LUMPERROR}, // Boing! - {"cannon", false, 64, 8, NULL, 0, -1, LUMPERROR}, - {"cgot" , true, 120, 0, NULL, 0, -1, LUMPERROR}, // Got Emerald! Tails 09-02-2001 - {"cybdth", false, 32, 0, NULL, 0, -1, LUMPERROR}, - {"deton", true, 64, 0, NULL, 0, -1, LUMPERROR}, - {"ding", false, 127, 8, NULL, 0, -1, LUMPERROR}, - {"dmpain", false, 96, 0, NULL, 0, -1, LUMPERROR}, - {"drown", false, 192, 0, NULL, 0, -1, LUMPERROR}, - {"fizzle", false, 127, 8, NULL, 0, -1, LUMPERROR}, - {"gbeep", false, 64, 0, NULL, 0, -1, LUMPERROR}, // Grenade beep - {"ghit" , false, 64, 0, NULL, 0, -1, LUMPERROR}, - {"gloop", false, 60, 0, NULL, 0, -1, LUMPERROR}, - {"gspray", false, 64, 0, NULL, 0, -1, LUMPERROR}, - {"gravch", false, 64, 0, NULL, 0, -1, LUMPERROR}, - {"itemup", true, 255, 0, NULL, 0, -1, LUMPERROR}, - {"jet", false, 8, 0, NULL, 0, -1, LUMPERROR}, - {"jshard", true, 167, 0, NULL, 0, -1, LUMPERROR}, - {"lose" , false, 127, 0, NULL, 0, -1, LUMPERROR}, - {"lvpass", false, 96, 0, NULL, 0, -1, LUMPERROR}, - {"mindig", false, 8, 64, NULL, 0, -1, LUMPERROR}, - {"mixup", true, 127, 0, NULL, 0, -1, LUMPERROR}, - {"pogo" , false, 64, 0, NULL, 0, -1, LUMPERROR}, - {"pop" , false, 78, 0, NULL, 0, -1, LUMPERROR}, - {"rail1", false, 64, 0, NULL, 0, -1, LUMPERROR}, - {"rail2", false, 64, 0, NULL, 0, -1, LUMPERROR}, - {"rlaunc", false, 64, 0, NULL, 0, -1, LUMPERROR}, - {"shield", false, 60, 0, NULL, 0, -1, LUMPERROR}, - {"shldls", false, 64, 0, NULL, 0, -1, LUMPERROR}, - {"spdpad", false, 127, 0, NULL, 0, -1, LUMPERROR}, - {"spkdth", false, 127, 0, NULL, 0, -1, LUMPERROR}, - {"spring", false, 112, 0, NULL, 0, -1, LUMPERROR}, - {"statu1", true, 64, 2, NULL, 0, -1, LUMPERROR}, - {"statu2", true, 64, 2, NULL, 0, -1, LUMPERROR}, - {"strpst", true, 192, 0, NULL, 0, -1, LUMPERROR}, // Starpost Sound Tails 07-04-2002 - {"supert", true, 127, 2, NULL, 0, -1, LUMPERROR}, - {"telept", false, 32, 0, NULL, 0, -1, LUMPERROR}, - {"tink" , false, 60, 0, NULL, 0, -1, LUMPERROR}, - {"token" , true, 224, 0, NULL, 0, -1, LUMPERROR}, // SS token - {"trfire", true, 60, 8, NULL, 0, -1, LUMPERROR}, - {"trpowr", true, 127, 8, NULL, 0, -1, LUMPERROR}, - {"turhit", false, 40, 8, NULL, 0, -1, LUMPERROR}, - {"wdjump", false, 60, 0, NULL, 0, -1, LUMPERROR}, - {"mswarp", false, 60, 16, NULL, 0, -1, LUMPERROR}, - {"mspogo", false, 60, 8, NULL, 0, -1, LUMPERROR}, + // Game objects, etc + {"appear", false, 127, 0, NULL, 0, -1, LUMPERROR}, + {"bkpoof", false, 70, 8, NULL, 0, -1, LUMPERROR}, + {"bnce1", false, 64, 0, NULL, 0, -1, LUMPERROR}, // Boing! + {"bnce2", false, 64, 0, NULL, 0, -1, LUMPERROR}, // Boing! + {"cannon", false, 64, 8, NULL, 0, -1, LUMPERROR}, + {"cgot" , true, 120, 0, NULL, 0, -1, LUMPERROR}, // Got Emerald! Tails 09-02-2001 + {"cybdth", false, 32, 0, NULL, 0, -1, LUMPERROR}, + {"deton", true, 64, 0, NULL, 0, -1, LUMPERROR}, + {"ding", false, 127, 8, NULL, 0, -1, LUMPERROR}, + {"dmpain", false, 96, 0, NULL, 0, -1, LUMPERROR}, + {"drown", false, 192, 0, NULL, 0, -1, LUMPERROR}, + {"fizzle", false, 127, 8, NULL, 0, -1, LUMPERROR}, + {"gbeep", false, 64, 0, NULL, 0, -1, LUMPERROR}, // Grenade beep + {"ghit" , false, 64, 0, NULL, 0, -1, LUMPERROR}, + {"gloop", false, 60, 0, NULL, 0, -1, LUMPERROR}, + {"gspray", false, 64, 0, NULL, 0, -1, LUMPERROR}, + {"gravch", false, 64, 0, NULL, 0, -1, LUMPERROR}, + {"itemup", true, 255, 0, NULL, 0, -1, LUMPERROR}, + {"jet", false, 8, 0, NULL, 0, -1, LUMPERROR}, + {"jshard", true, 167, 0, NULL, 0, -1, LUMPERROR}, + {"lose" , false, 127, 0, NULL, 0, -1, LUMPERROR}, + {"lvpass", false, 96, 0, NULL, 0, -1, LUMPERROR}, + {"mindig", false, 8, 64, NULL, 0, -1, LUMPERROR}, + {"mixup", true, 127, 0, NULL, 0, -1, LUMPERROR}, + {"pogo" , false, 64, 0, NULL, 0, -1, LUMPERROR}, + {"pop" , false, 78, 0, NULL, 0, -1, LUMPERROR}, + {"rail1", false, 64, 0, NULL, 0, -1, LUMPERROR}, + {"rail2", false, 64, 0, NULL, 0, -1, LUMPERROR}, + {"rlaunc", false, 64, 0, NULL, 0, -1, LUMPERROR}, + {"shield", false, 60, 0, NULL, 0, -1, LUMPERROR}, + {"shldls", false, 64, 0, NULL, 0, -1, LUMPERROR}, + {"spdpad", false, 127, 0, NULL, 0, -1, LUMPERROR}, + {"spkdth", false, 127, 0, NULL, 0, -1, LUMPERROR}, + {"spring", false, 112, 0, NULL, 0, -1, LUMPERROR}, + {"statu1", true, 64, 2, NULL, 0, -1, LUMPERROR}, + {"statu2", true, 64, 2, NULL, 0, -1, LUMPERROR}, + {"strpst", true, 192, 0, NULL, 0, -1, LUMPERROR}, // Starpost Sound Tails 07-04-2002 + {"supert", true, 127, 2, NULL, 0, -1, LUMPERROR}, + {"telept", false, 32, 0, NULL, 0, -1, LUMPERROR}, + {"tink" , false, 60, 0, NULL, 0, -1, LUMPERROR}, + {"token" , true, 224, 0, NULL, 0, -1, LUMPERROR}, // SS token + {"trfire", true, 60, 8, NULL, 0, -1, LUMPERROR}, + {"trpowr", true, 127, 8, NULL, 0, -1, LUMPERROR}, + {"turhit", false, 40, 8, NULL, 0, -1, LUMPERROR}, + {"wdjump", false, 60, 0, NULL, 0, -1, LUMPERROR}, + {"mswarp", false, 60, 16, NULL, 0, -1, LUMPERROR}, + {"mspogo", false, 60, 8, NULL, 0, -1, LUMPERROR}, - // Menu, interface - {"chchng", false, 120, 0, NULL, 0, -1, LUMPERROR}, - {"dwnind", false, 212, 0, NULL, 0, -1, LUMPERROR}, - {"emfind", false, 64, 0, NULL, 0, -1, LUMPERROR}, - {"flgcap", false, 64, 0, NULL, 0, -1, LUMPERROR}, - {"menu1", true, 64, 0, NULL, 0, -1, LUMPERROR}, - {"oneup", true, 192, 0, NULL, 0, -1, LUMPERROR}, - {"ptally", true, 64, 0, NULL, 0, -1, LUMPERROR}, // Point tally is identical to menu for now - {"radio", false, 60, 0, NULL, 0, -1, LUMPERROR}, - {"wepchg", true, 64, 0, NULL, 0, -1, LUMPERROR}, // Weapon switch is identical to menu for now - {"wtrdng", true, 212, 0, NULL, 0, -1, LUMPERROR}, // make sure you can hear the DING DING! Tails 03-08-2000 - {"zelda", false, 120, 0, NULL, 0, -1, LUMPERROR}, + // Menu, interface + {"chchng", false, 120, 0, NULL, 0, -1, LUMPERROR}, + {"dwnind", false, 212, 0, NULL, 0, -1, LUMPERROR}, + {"emfind", false, 64, 0, NULL, 0, -1, LUMPERROR}, + {"flgcap", false, 64, 0, NULL, 0, -1, LUMPERROR}, + {"menu1", true, 64, 0, NULL, 0, -1, LUMPERROR}, + {"oneup", true, 192, 0, NULL, 0, -1, LUMPERROR}, + {"ptally", true, 64, 0, NULL, 0, -1, LUMPERROR}, // Point tally is identical to menu for now + {"radio", false, 60, 0, NULL, 0, -1, LUMPERROR}, + {"wepchg", true, 64, 0, NULL, 0, -1, LUMPERROR}, // Weapon switch is identical to menu for now + {"wtrdng", true, 212, 0, NULL, 0, -1, LUMPERROR}, // make sure you can hear the DING DING! Tails 03-08-2000 + {"zelda", false, 120, 0, NULL, 0, -1, LUMPERROR}, - // NiGHTS - {"ideya", false, 127, 0, NULL, 0, -1, LUMPERROR}, - {"xideya", false, 127, 0, NULL, 0, -1, LUMPERROR}, // Xmas - {"nbmper", false, 96, 0, NULL, 0, -1, LUMPERROR}, - {"nxbump", false, 96, 0, NULL, 0, -1, LUMPERROR}, // Xmas - {"ncitem", false, 204, 0, NULL, 0, -1, LUMPERROR}, - {"nxitem", false, 204, 0, NULL, 0, -1, LUMPERROR}, // Xmas - {"ngdone", true, 127, 0, NULL, 0, -1, LUMPERROR}, - {"nxdone", true, 127, 0, NULL, 0, -1, LUMPERROR}, // Xmas - {"drill1", false, 48, 0, NULL, 0, -1, LUMPERROR}, - {"drill2", false, 48, 0, NULL, 0, -1, LUMPERROR}, - {"ncspec", false, 204, 0, NULL, 0, -1, LUMPERROR}, // Tails 12-15-2003 - {"nghurt", false, 96, 0, NULL, 0, -1, LUMPERROR}, - {"ngskid", false, 64, 0, NULL, 0, -1, LUMPERROR}, - {"hoop1", false, 192, 0, NULL, 0, -1, LUMPERROR}, - {"hoop2", false, 192, 0, NULL, 0, -1, LUMPERROR}, - {"hoop3", false, 192, 0, NULL, 0, -1, LUMPERROR}, - {"hidden", false, 204, 0, NULL, 0, -1, LUMPERROR}, - {"prloop", false, 104, 0, NULL, 0, -1, LUMPERROR}, - {"timeup", true, 256, 0, NULL, 0, -1, LUMPERROR}, + // NiGHTS + {"ideya", false, 127, 0, NULL, 0, -1, LUMPERROR}, + {"xideya", false, 127, 0, NULL, 0, -1, LUMPERROR}, // Xmas + {"nbmper", false, 96, 0, NULL, 0, -1, LUMPERROR}, + {"nxbump", false, 96, 0, NULL, 0, -1, LUMPERROR}, // Xmas + {"ncitem", false, 204, 0, NULL, 0, -1, LUMPERROR}, + {"nxitem", false, 204, 0, NULL, 0, -1, LUMPERROR}, // Xmas + {"ngdone", true, 127, 0, NULL, 0, -1, LUMPERROR}, + {"nxdone", true, 127, 0, NULL, 0, -1, LUMPERROR}, // Xmas + {"drill1", false, 48, 0, NULL, 0, -1, LUMPERROR}, + {"drill2", false, 48, 0, NULL, 0, -1, LUMPERROR}, + {"ncspec", false, 204, 0, NULL, 0, -1, LUMPERROR}, // Tails 12-15-2003 + {"nghurt", false, 96, 0, NULL, 0, -1, LUMPERROR}, + {"ngskid", false, 64, 0, NULL, 0, -1, LUMPERROR}, + {"hoop1", false, 192, 0, NULL, 0, -1, LUMPERROR}, + {"hoop2", false, 192, 0, NULL, 0, -1, LUMPERROR}, + {"hoop3", false, 192, 0, NULL, 0, -1, LUMPERROR}, + {"hidden", false, 204, 0, NULL, 0, -1, LUMPERROR}, + {"prloop", false, 104, 0, NULL, 0, -1, LUMPERROR}, + {"timeup", true, 256, 0, NULL, 0, -1, LUMPERROR}, - // Mario - {"koopfr" , true, 127, 8, NULL, 0, -1, LUMPERROR}, - {"mario1", false, 60, 0, NULL, 0, -1, LUMPERROR}, - {"mario2", false, 127, 0, NULL, 0, -1, LUMPERROR}, - {"mario3", false, 60, 0, NULL, 0, -1, LUMPERROR}, - {"mario4", true, 78, 0, NULL, 0, -1, LUMPERROR}, - {"mario5", false, 78, 0, NULL, 0, -1, LUMPERROR}, - {"mario6", false, 60, 0, NULL, 0, -1, LUMPERROR}, - {"mario7", false, 32, 0, NULL, 0, -1, LUMPERROR}, - {"mario8", false, 48, 8, NULL, 0, -1, LUMPERROR}, - {"mario9", true, 120, 0, NULL, 0, -1, LUMPERROR}, - {"marioa", true, 127, 0, NULL, 0, -1, LUMPERROR}, - {"thwomp", true, 127, 8, NULL, 0, -1, LUMPERROR}, + // Mario + {"koopfr" , true, 127, 8, NULL, 0, -1, LUMPERROR}, + {"mario1", false, 60, 0, NULL, 0, -1, LUMPERROR}, + {"mario2", false, 127, 0, NULL, 0, -1, LUMPERROR}, + {"mario3", false, 60, 0, NULL, 0, -1, LUMPERROR}, + {"mario4", true, 78, 0, NULL, 0, -1, LUMPERROR}, + {"mario5", false, 78, 0, NULL, 0, -1, LUMPERROR}, + {"mario6", false, 60, 0, NULL, 0, -1, LUMPERROR}, + {"mario7", false, 32, 0, NULL, 0, -1, LUMPERROR}, + {"mario8", false, 48, 8, NULL, 0, -1, LUMPERROR}, + {"mario9", true, 120, 0, NULL, 0, -1, LUMPERROR}, + {"marioa", true, 127, 0, NULL, 0, -1, LUMPERROR}, + {"thwomp", true, 127, 8, NULL, 0, -1, LUMPERROR}, - // Black Eggman - {"bebomb", false, 64, 64, NULL, 0, -1, LUMPERROR}, - {"bechrg", false, 64, 64, NULL, 0, -1, LUMPERROR}, - {"becrsh", false, 64, 64, NULL, 0, -1, LUMPERROR}, - {"bedeen", false, 64, 64, NULL, 0, -1, LUMPERROR}, - {"bedie1", false, 64, 64, NULL, 0, -1, LUMPERROR}, - {"bedie2", false, 64, 64, NULL, 0, -1, LUMPERROR}, - {"beeyow", false, 64, 64, NULL, 0, -1, LUMPERROR}, - {"befall", false, 64, 64, NULL, 0, -1, LUMPERROR}, - {"befire", false, 64, 64, NULL, 0, -1, LUMPERROR}, - {"beflap", false, 64, 64, NULL, 0, -1, LUMPERROR}, - {"begoop", false, 64, 64, NULL, 0, -1, LUMPERROR}, - {"begrnd", false, 64, 64, NULL, 0, -1, LUMPERROR}, - {"behurt", false, 64, 64, NULL, 0, -1, LUMPERROR}, - {"bejet1", false, 64, 64, NULL, 0, -1, LUMPERROR}, - {"belnch", false, 64, 64, NULL, 0, -1, LUMPERROR}, - {"beoutb", false, 64, 64, NULL, 0, -1, LUMPERROR}, - {"beragh", false, 64, 64, NULL, 0, -1, LUMPERROR}, - {"beshot", false, 64, 64, NULL, 0, -1, LUMPERROR}, - {"bestep", false, 64, 64, NULL, 0, -1, LUMPERROR}, - {"bestp2", false, 64, 64, NULL, 0, -1, LUMPERROR}, - {"bewar1", false, 64, 64, NULL, 0, -1, LUMPERROR}, - {"bewar2", false, 64, 64, NULL, 0, -1, LUMPERROR}, - {"bewar3", false, 64, 64, NULL, 0, -1, LUMPERROR}, - {"bewar4", false, 64, 64, NULL, 0, -1, LUMPERROR}, - {"bexpld", false, 64, 64, NULL, 0, -1, LUMPERROR}, - {"bgxpld", false, 64, 64, NULL, 0, -1, LUMPERROR}, + // Black Eggman + {"bebomb", false, 64, 64, NULL, 0, -1, LUMPERROR}, + {"bechrg", false, 64, 64, NULL, 0, -1, LUMPERROR}, + {"becrsh", false, 64, 64, NULL, 0, -1, LUMPERROR}, + {"bedeen", false, 64, 64, NULL, 0, -1, LUMPERROR}, + {"bedie1", false, 64, 64, NULL, 0, -1, LUMPERROR}, + {"bedie2", false, 64, 64, NULL, 0, -1, LUMPERROR}, + {"beeyow", false, 64, 64, NULL, 0, -1, LUMPERROR}, + {"befall", false, 64, 64, NULL, 0, -1, LUMPERROR}, + {"befire", false, 64, 64, NULL, 0, -1, LUMPERROR}, + {"beflap", false, 64, 64, NULL, 0, -1, LUMPERROR}, + {"begoop", false, 64, 64, NULL, 0, -1, LUMPERROR}, + {"begrnd", false, 64, 64, NULL, 0, -1, LUMPERROR}, + {"behurt", false, 64, 64, NULL, 0, -1, LUMPERROR}, + {"bejet1", false, 64, 64, NULL, 0, -1, LUMPERROR}, + {"belnch", false, 64, 64, NULL, 0, -1, LUMPERROR}, + {"beoutb", false, 64, 64, NULL, 0, -1, LUMPERROR}, + {"beragh", false, 64, 64, NULL, 0, -1, LUMPERROR}, + {"beshot", false, 64, 64, NULL, 0, -1, LUMPERROR}, + {"bestep", false, 64, 64, NULL, 0, -1, LUMPERROR}, + {"bestp2", false, 64, 64, NULL, 0, -1, LUMPERROR}, + {"bewar1", false, 64, 64, NULL, 0, -1, LUMPERROR}, + {"bewar2", false, 64, 64, NULL, 0, -1, LUMPERROR}, + {"bewar3", false, 64, 64, NULL, 0, -1, LUMPERROR}, + {"bewar4", false, 64, 64, NULL, 0, -1, LUMPERROR}, + {"bexpld", false, 64, 64, NULL, 0, -1, LUMPERROR}, + {"bgxpld", false, 64, 64, NULL, 0, -1, LUMPERROR}, - // Cybrakdemon - {"beelec", false, 64, 64, NULL, 0, -1, LUMPERROR}, - {"brakrl", false, 64, 64, NULL, 0, -1, LUMPERROR}, - {"brakrx", false, 64, 64, NULL, 0, -1, LUMPERROR}, + // Cybrakdemon + {"beelec", false, 64, 64, NULL, 0, -1, LUMPERROR}, + {"brakrl", false, 64, 64, NULL, 0, -1, LUMPERROR}, + {"brakrx", false, 64, 64, NULL, 0, -1, LUMPERROR}, - // Sonic 1 sounds - {"s1a0", false, 64, 0, NULL, 0, -1, LUMPERROR}, - {"s1a1", false, 64, 0, NULL, 0, -1, LUMPERROR}, - {"s1a2", false, 64, 0, NULL, 0, -1, LUMPERROR}, // Monty Mole attach - {"s1a3", false, 64, 0, NULL, 0, -1, LUMPERROR}, - {"s1a4", false, 64, 0, NULL, 0, -1, LUMPERROR}, - {"s1a5", false, 64, 0, NULL, 0, -1, LUMPERROR}, - {"s1a6", false, 64, 0, NULL, 0, -1, LUMPERROR}, - {"s1a7", false, 64, 0, NULL, 0, -1, LUMPERROR}, - {"s1a8", false, 64, 0, NULL, 0, -1, LUMPERROR}, - {"s1a9", false, 64, 0, NULL, 0, -1, LUMPERROR}, - {"s1aa", false, 64, 0, NULL, 0, -1, LUMPERROR}, - {"s1ab", false, 64, 0, NULL, 0, -1, LUMPERROR}, // Monty Mole twitch - {"s1ac", false, 64, 0, NULL, 0, -1, LUMPERROR}, // Misc. obstacle destroyed - {"s1ad", false, 64, 0, NULL, 0, -1, LUMPERROR}, - {"s1ae", false, 64, 0, NULL, 0, -1, LUMPERROR}, - {"s1af", false, 64, 0, NULL, 0, -1, LUMPERROR}, - {"s1b0", false, 64, 0, NULL, 0, -1, LUMPERROR}, - {"s1b1", false, 64, 0, NULL, 0, -1, LUMPERROR}, - {"s1b2", false, 64, 0, NULL, 0, -1, LUMPERROR}, - {"s1b3", false, 64, 0, NULL, 0, -1, LUMPERROR}, - {"s1b4", false, 64, 0, NULL, 0, -1, LUMPERROR}, // Toggle all items - {"s1b5", false, 64, 0, NULL, 0, -1, LUMPERROR}, - {"s1b6", false, 64, 0, NULL, 0, -1, LUMPERROR}, - {"s1b7", false, 64, 0, NULL, 0, -1, LUMPERROR}, - {"s1b8", false, 64, 0, NULL, 0, -1, LUMPERROR}, - {"s1b9", false, 64, 0, NULL, 0, -1, LUMPERROR}, - {"s1ba", false, 64, 0, NULL, 0, -1, LUMPERROR}, // Toggle item - {"s1bb", false, 64, 0, NULL, 0, -1, LUMPERROR}, // Thwomp drop - {"s1bc", false, 64, 0, NULL, 0, -1, LUMPERROR}, - {"s1bd", false, 64, 0, NULL, 0, -1, LUMPERROR}, // Ballhog bounce - {"s1be", false, 64, 0, NULL, 0, -1, LUMPERROR}, - {"s1bf", false, 64, 0, NULL, 0, -1, LUMPERROR}, - {"s1c0", false, 64, 0, NULL, 0, -1, LUMPERROR}, - {"s1c1", false, 64, 0, NULL, 0, -1, LUMPERROR}, // Monokuma death - {"s1c2", false, 64, 0, NULL, 0, -1, LUMPERROR}, - {"s1c3", false, 64, 0, NULL, 0, -1, LUMPERROR}, - {"s1c4", false, 64, 0, NULL, 0, -1, LUMPERROR}, - {"s1c5", false, 64, 0, NULL, 0, -1, LUMPERROR}, - {"s1c6", false, 64, 0, NULL, 0, -1, LUMPERROR}, - {"s1c7", false, 64, 0, NULL, 0, -1, LUMPERROR}, - {"s1c8", false, 64, 0, NULL, 0, -1, LUMPERROR}, - {"s1c9", false, 64, 0, NULL, 0, -1, LUMPERROR}, // Item hit w/ voices off - {"s1ca", false, 64, 0, NULL, 0, -1, LUMPERROR}, - {"s1cb", false, 64, 0, NULL, 0, -1, LUMPERROR}, - {"s1cc", false, 64, 0, NULL, 0, -1, LUMPERROR}, - {"s1cd", false, 64, 0, NULL, 0, -1, LUMPERROR}, - {"s1ce", false, 64, 0, NULL, 0, -1, LUMPERROR}, - {"s1cf", false, 64, 0, NULL, 0, -1, LUMPERROR}, + // Sonic 1 sounds + {"s1a0", false, 64, 0, NULL, 0, -1, LUMPERROR}, + {"s1a1", false, 64, 0, NULL, 0, -1, LUMPERROR}, + {"s1a2", false, 64, 0, NULL, 0, -1, LUMPERROR}, // Monty Mole attach + {"s1a3", false, 64, 0, NULL, 0, -1, LUMPERROR}, + {"s1a4", false, 64, 0, NULL, 0, -1, LUMPERROR}, + {"s1a5", false, 64, 0, NULL, 0, -1, LUMPERROR}, + {"s1a6", false, 64, 0, NULL, 0, -1, LUMPERROR}, + {"s1a7", false, 64, 0, NULL, 0, -1, LUMPERROR}, + {"s1a8", false, 64, 0, NULL, 0, -1, LUMPERROR}, + {"s1a9", false, 64, 0, NULL, 0, -1, LUMPERROR}, + {"s1aa", false, 64, 0, NULL, 0, -1, LUMPERROR}, + {"s1ab", false, 64, 0, NULL, 0, -1, LUMPERROR}, // Monty Mole twitch + {"s1ac", false, 64, 0, NULL, 0, -1, LUMPERROR}, // Misc. obstacle destroyed + {"s1ad", false, 64, 0, NULL, 0, -1, LUMPERROR}, + {"s1ae", false, 64, 0, NULL, 0, -1, LUMPERROR}, + {"s1af", false, 64, 0, NULL, 0, -1, LUMPERROR}, + {"s1b0", false, 64, 0, NULL, 0, -1, LUMPERROR}, + {"s1b1", false, 64, 0, NULL, 0, -1, LUMPERROR}, + {"s1b2", false, 64, 0, NULL, 0, -1, LUMPERROR}, + {"s1b3", false, 64, 0, NULL, 0, -1, LUMPERROR}, + {"s1b4", false, 64, 0, NULL, 0, -1, LUMPERROR}, // Toggle all items + {"s1b5", false, 64, 0, NULL, 0, -1, LUMPERROR}, + {"s1b6", false, 64, 0, NULL, 0, -1, LUMPERROR}, + {"s1b7", false, 64, 0, NULL, 0, -1, LUMPERROR}, + {"s1b8", false, 64, 0, NULL, 0, -1, LUMPERROR}, + {"s1b9", false, 64, 0, NULL, 0, -1, LUMPERROR}, + {"s1ba", false, 64, 0, NULL, 0, -1, LUMPERROR}, // Toggle item + {"s1bb", false, 64, 0, NULL, 0, -1, LUMPERROR}, // Thwomp drop + {"s1bc", false, 64, 0, NULL, 0, -1, LUMPERROR}, + {"s1bd", false, 64, 0, NULL, 0, -1, LUMPERROR}, // Ballhog bounce + {"s1be", false, 64, 0, NULL, 0, -1, LUMPERROR}, + {"s1bf", false, 64, 0, NULL, 0, -1, LUMPERROR}, + {"s1c0", false, 64, 0, NULL, 0, -1, LUMPERROR}, + {"s1c1", false, 64, 0, NULL, 0, -1, LUMPERROR}, // Monokuma death + {"s1c2", false, 64, 0, NULL, 0, -1, LUMPERROR}, + {"s1c3", false, 64, 0, NULL, 0, -1, LUMPERROR}, + {"s1c4", false, 64, 0, NULL, 0, -1, LUMPERROR}, + {"s1c5", false, 64, 0, NULL, 0, -1, LUMPERROR}, + {"s1c6", false, 64, 0, NULL, 0, -1, LUMPERROR}, + {"s1c7", false, 64, 0, NULL, 0, -1, LUMPERROR}, + {"s1c8", false, 64, 0, NULL, 0, -1, LUMPERROR}, + {"s1c9", false, 64, 0, NULL, 0, -1, LUMPERROR}, // Item hit w/ voices off + {"s1ca", false, 64, 0, NULL, 0, -1, LUMPERROR}, + {"s1cb", false, 64, 0, NULL, 0, -1, LUMPERROR}, + {"s1cc", false, 64, 0, NULL, 0, -1, LUMPERROR}, + {"s1cd", false, 64, 0, NULL, 0, -1, LUMPERROR}, + {"s1ce", false, 64, 0, NULL, 0, -1, LUMPERROR}, + {"s1cf", false, 64, 0, NULL, 0, -1, LUMPERROR}, - // Sonic 2 sounds - {"s220", false, 64, 0, NULL, 0, -1, LUMPERROR}, - {"s221", false, 64, 0, NULL, 0, -1, LUMPERROR}, // Lap sound - {"s222", false, 64, 0, NULL, 0, -1, LUMPERROR}, - {"s223", false, 64, 0, NULL, 0, -1, LUMPERROR}, - {"s224", false, 64, 0, NULL, 0, -1, LUMPERROR}, - {"s225", false, 64, 0, NULL, 0, -1, LUMPERROR}, - {"s226", false, 64, 0, NULL, 0, -1, LUMPERROR}, - {"s227", false, 64, 0, NULL, 0, -1, LUMPERROR}, - {"s228", false, 64, 0, NULL, 0, -1, LUMPERROR}, - {"s229", false, 64, 0, NULL, 0, -1, LUMPERROR}, - {"s22a", false, 64, 0, NULL, 0, -1, LUMPERROR}, - {"s22b", false, 64, 0, NULL, 0, -1, LUMPERROR}, - {"s22c", false, 64, 0, NULL, 0, -1, LUMPERROR}, - {"s22d", false, 64, 0, NULL, 0, -1, LUMPERROR}, - {"s22e", false, 64, 0, NULL, 0, -1, LUMPERROR}, - {"s22f", false, 64, 0, NULL, 0, -1, LUMPERROR}, - {"s230", false, 64, 0, NULL, 0, -1, LUMPERROR}, - {"s231", false, 64, 0, NULL, 0, -1, LUMPERROR}, - {"s232", false, 64, 0, NULL, 0, -1, LUMPERROR}, - {"s233", false, 64, 0, NULL, 0, -1, LUMPERROR}, - {"s234", false, 64, 0, NULL, 0, -1, LUMPERROR}, - {"s235", false, 64, 0, NULL, 0, -1, LUMPERROR}, - {"s236", false, 64, 0, NULL, 0, -1, LUMPERROR}, - {"s237", false, 64, 0, NULL, 0, -1, LUMPERROR}, - {"s238", false, 64, 0, NULL, 0, -1, LUMPERROR}, - {"s239", false, 64, 0, NULL, 0, -1, LUMPERROR}, - {"s23a", false, 64, 0, NULL, 0, -1, LUMPERROR}, - {"s23b", false, 64, 0, NULL, 0, -1, LUMPERROR}, - {"s23c", false, 64, 0, NULL, 0, -1, LUMPERROR}, // Drift boost - {"s23d", false, 64, 0, NULL, 0, -1, LUMPERROR}, - {"s23e", false, 64, 0, NULL, 0, -1, LUMPERROR}, // Title screen opening - {"s23f", false, 64, 0, NULL, 0, -1, LUMPERROR}, - {"s240", false, 64, 0, NULL, 0, -1, LUMPERROR}, - {"s241", false, 64, 0, NULL, 0, -1, LUMPERROR}, - {"s242", false, 64, 0, NULL, 0, -1, LUMPERROR}, - {"s243", false, 64, 0, NULL, 0, -1, LUMPERROR}, - {"s244", false, 64, 0, NULL, 0, -1, LUMPERROR}, - {"s245", false, 64, 0, NULL, 0, -1, LUMPERROR}, - {"s246", false, 64, 0, NULL, 0, -1, LUMPERROR}, - {"s247", false, 64, 0, NULL, 0, -1, LUMPERROR}, - {"s248", false, 64, 0, NULL, 0, -1, LUMPERROR}, - {"s249", false, 64, 0, NULL, 0, -1, LUMPERROR}, - {"s24a", false, 64, 0, NULL, 0, -1, LUMPERROR}, - {"s24b", false, 64, 0, NULL, 0, -1, LUMPERROR}, - {"s24c", false, 64, 0, NULL, 0, -1, LUMPERROR}, - {"s24d", false, 64, 0, NULL, 0, -1, LUMPERROR}, - {"s24e", false, 64, 0, NULL, 0, -1, LUMPERROR}, - {"s24f", false, 64, 0, NULL, 0, -1, LUMPERROR}, - {"s250", false, 64, 0, NULL, 0, -1, LUMPERROR}, - {"s251", false, 64, 0, NULL, 0, -1, LUMPERROR}, - {"s252", false, 64, 0, NULL, 0, -1, LUMPERROR}, - {"s253", false, 255, 0, NULL, 0, -1, LUMPERROR}, // 1st place finish - {"s254", false, 64, 0, NULL, 0, -1, LUMPERROR}, - {"s255", false, 64, 0, NULL, 0, -1, LUMPERROR}, - {"s256", false, 64, 0, NULL, 0, -1, LUMPERROR}, - {"s257", false, 64, 0, NULL, 0, -1, LUMPERROR}, - {"s258", false, 64, 0, NULL, 0, -1, LUMPERROR}, - {"s259", false, 96, 8, NULL, 0, -1, LUMPERROR}, // Item clashing - {"s25a", false, 64, 0, NULL, 0, -1, LUMPERROR}, - {"s25b", false, 64, 0, NULL, 0, -1, LUMPERROR}, - {"s25c", false, 64, 0, NULL, 0, -1, LUMPERROR}, - {"s25d", false, 64, 0, NULL, 0, -1, LUMPERROR}, - {"s25e", false, 64, 0, NULL, 0, -1, LUMPERROR}, - {"s25f", false, 64, 0, NULL, 0, -1, LUMPERROR}, // Perfect start boost - {"s260", false, 64, 0, NULL, 0, -1, LUMPERROR}, - {"s261", false, 64, 0, NULL, 0, -1, LUMPERROR}, - {"s262", false, 64, 0, NULL, 0, -1, LUMPERROR}, - {"s263", false, 64, 0, NULL, 0, -1, LUMPERROR}, - {"s264", false, 64, 0, NULL, 0, -1, LUMPERROR}, - {"s265", false, 64, 0, NULL, 0, -1, LUMPERROR}, - {"s266", false, 64, 0, NULL, 0, -1, LUMPERROR}, - {"s267", false, 64, 0, NULL, 0, -1, LUMPERROR}, - {"s268", false, 64, 0, NULL, 0, -1, LUMPERROR}, - {"s269", false, 64, 0, NULL, 0, -1, LUMPERROR}, - {"s26a", false, 64, 0, NULL, 0, -1, LUMPERROR}, - {"s26b", false, 64, 0, NULL, 0, -1, LUMPERROR}, - {"s26c", false, 64, 0, NULL, 0, -1, LUMPERROR}, - {"s26d", false, 64, 0, NULL, 0, -1, LUMPERROR}, // Missed checkpoint - {"s26e", false, 64, 0, NULL, 0, -1, LUMPERROR}, - {"s26f", false, 64, 0, NULL, 0, -1, LUMPERROR}, - {"s270", false, 64, 0, NULL, 0, -1, LUMPERROR}, + // Sonic 2 sounds + {"s220", false, 64, 0, NULL, 0, -1, LUMPERROR}, + {"s221", false, 64, 0, NULL, 0, -1, LUMPERROR}, // Lap sound + {"s222", false, 64, 0, NULL, 0, -1, LUMPERROR}, + {"s223", false, 64, 0, NULL, 0, -1, LUMPERROR}, + {"s224", false, 64, 0, NULL, 0, -1, LUMPERROR}, + {"s225", false, 64, 0, NULL, 0, -1, LUMPERROR}, + {"s226", false, 64, 0, NULL, 0, -1, LUMPERROR}, + {"s227", false, 64, 0, NULL, 0, -1, LUMPERROR}, + {"s228", false, 64, 0, NULL, 0, -1, LUMPERROR}, + {"s229", false, 64, 0, NULL, 0, -1, LUMPERROR}, + {"s22a", false, 64, 0, NULL, 0, -1, LUMPERROR}, + {"s22b", false, 64, 0, NULL, 0, -1, LUMPERROR}, + {"s22c", false, 64, 0, NULL, 0, -1, LUMPERROR}, + {"s22d", false, 64, 0, NULL, 0, -1, LUMPERROR}, + {"s22e", false, 64, 0, NULL, 0, -1, LUMPERROR}, + {"s22f", false, 64, 0, NULL, 0, -1, LUMPERROR}, + {"s230", false, 64, 0, NULL, 0, -1, LUMPERROR}, + {"s231", false, 64, 0, NULL, 0, -1, LUMPERROR}, + {"s232", false, 64, 0, NULL, 0, -1, LUMPERROR}, + {"s233", false, 64, 0, NULL, 0, -1, LUMPERROR}, + {"s234", false, 64, 0, NULL, 0, -1, LUMPERROR}, + {"s235", false, 64, 0, NULL, 0, -1, LUMPERROR}, + {"s236", false, 64, 0, NULL, 0, -1, LUMPERROR}, + {"s237", false, 64, 0, NULL, 0, -1, LUMPERROR}, + {"s238", false, 64, 0, NULL, 0, -1, LUMPERROR}, + {"s239", false, 64, 0, NULL, 0, -1, LUMPERROR}, + {"s23a", false, 64, 0, NULL, 0, -1, LUMPERROR}, + {"s23b", false, 64, 0, NULL, 0, -1, LUMPERROR}, + {"s23c", false, 64, 0, NULL, 0, -1, LUMPERROR}, // Drift boost + {"s23d", false, 64, 0, NULL, 0, -1, LUMPERROR}, + {"s23e", false, 64, 0, NULL, 0, -1, LUMPERROR}, // Title screen opening + {"s23f", false, 64, 0, NULL, 0, -1, LUMPERROR}, + {"s240", false, 64, 0, NULL, 0, -1, LUMPERROR}, + {"s241", false, 64, 0, NULL, 0, -1, LUMPERROR}, + {"s242", false, 64, 0, NULL, 0, -1, LUMPERROR}, + {"s243", false, 64, 0, NULL, 0, -1, LUMPERROR}, + {"s244", false, 64, 0, NULL, 0, -1, LUMPERROR}, + {"s245", false, 64, 0, NULL, 0, -1, LUMPERROR}, + {"s246", false, 64, 0, NULL, 0, -1, LUMPERROR}, + {"s247", false, 64, 0, NULL, 0, -1, LUMPERROR}, + {"s248", false, 64, 0, NULL, 0, -1, LUMPERROR}, + {"s249", false, 64, 0, NULL, 0, -1, LUMPERROR}, + {"s24a", false, 64, 0, NULL, 0, -1, LUMPERROR}, + {"s24b", false, 64, 0, NULL, 0, -1, LUMPERROR}, + {"s24c", false, 64, 0, NULL, 0, -1, LUMPERROR}, + {"s24d", false, 64, 0, NULL, 0, -1, LUMPERROR}, + {"s24e", false, 64, 0, NULL, 0, -1, LUMPERROR}, + {"s24f", false, 64, 0, NULL, 0, -1, LUMPERROR}, + {"s250", false, 64, 0, NULL, 0, -1, LUMPERROR}, + {"s251", false, 64, 0, NULL, 0, -1, LUMPERROR}, + {"s252", false, 64, 0, NULL, 0, -1, LUMPERROR}, + {"s253", false, 255, 0, NULL, 0, -1, LUMPERROR}, // 1st place finish + {"s254", false, 64, 0, NULL, 0, -1, LUMPERROR}, + {"s255", false, 64, 0, NULL, 0, -1, LUMPERROR}, + {"s256", false, 64, 0, NULL, 0, -1, LUMPERROR}, + {"s257", false, 64, 0, NULL, 0, -1, LUMPERROR}, + {"s258", false, 64, 0, NULL, 0, -1, LUMPERROR}, + {"s259", false, 96, 8, NULL, 0, -1, LUMPERROR}, // Item clashing + {"s25a", false, 64, 0, NULL, 0, -1, LUMPERROR}, + {"s25b", false, 64, 0, NULL, 0, -1, LUMPERROR}, + {"s25c", false, 64, 0, NULL, 0, -1, LUMPERROR}, + {"s25d", false, 64, 0, NULL, 0, -1, LUMPERROR}, + {"s25e", false, 64, 0, NULL, 0, -1, LUMPERROR}, + {"s25f", false, 64, 0, NULL, 0, -1, LUMPERROR}, // Perfect start boost + {"s260", false, 64, 0, NULL, 0, -1, LUMPERROR}, + {"s261", false, 64, 0, NULL, 0, -1, LUMPERROR}, + {"s262", false, 64, 0, NULL, 0, -1, LUMPERROR}, + {"s263", false, 64, 0, NULL, 0, -1, LUMPERROR}, + {"s264", false, 64, 0, NULL, 0, -1, LUMPERROR}, + {"s265", false, 64, 0, NULL, 0, -1, LUMPERROR}, + {"s266", false, 64, 0, NULL, 0, -1, LUMPERROR}, + {"s267", false, 64, 0, NULL, 0, -1, LUMPERROR}, + {"s268", false, 64, 0, NULL, 0, -1, LUMPERROR}, + {"s269", false, 64, 0, NULL, 0, -1, LUMPERROR}, + {"s26a", false, 64, 0, NULL, 0, -1, LUMPERROR}, + {"s26b", false, 64, 0, NULL, 0, -1, LUMPERROR}, + {"s26c", false, 64, 0, NULL, 0, -1, LUMPERROR}, + {"s26d", false, 64, 0, NULL, 0, -1, LUMPERROR}, // Missed checkpoint + {"s26e", false, 64, 0, NULL, 0, -1, LUMPERROR}, + {"s26f", false, 64, 0, NULL, 0, -1, LUMPERROR}, + {"s270", false, 64, 0, NULL, 0, -1, LUMPERROR}, - // S3&K sounds - {"s3k33", false, 64, 0, NULL, 0, -1, LUMPERROR}, - {"s3k34", false, 64, 0, NULL, 0, -1, LUMPERROR}, - {"s3k35", false, 64, 0, NULL, 0, -1, LUMPERROR}, - {"s3k36", false, 64, 0, NULL, 0, -1, LUMPERROR}, - {"s3k37", false, 64, 0, NULL, 0, -1, LUMPERROR}, - {"s3k38", false, 64, 0, NULL, 0, -1, LUMPERROR}, - {"s3k39", false, 64, 0, NULL, 0, -1, LUMPERROR}, - {"s3k3a", false, 96, 0, NULL, 0, -1, LUMPERROR}, // Kart item shield - {"s3k3b", false, 64, 0, NULL, 0, -1, LUMPERROR}, - {"s3k3c", false, 64, 0, NULL, 0, -1, LUMPERROR}, - {"s3k3d", false, 64, 0, NULL, 0, -1, LUMPERROR}, - {"s3k3e", false, 64, 0, NULL, 0, -1, LUMPERROR}, - {"s3k3f", false, 64, 0, NULL, 0, -1, LUMPERROR}, - {"s3k40", false, 64, 0, NULL, 0, -1, LUMPERROR}, - {"s3k41", false, 64, 0, NULL, 0, -1, LUMPERROR}, - {"s3k42", false, 64, 0, NULL, 0, -1, LUMPERROR}, // Kart Thunder Shield spawned - {"s3k43", false, 64, 0, NULL, 0, -1, LUMPERROR}, - {"s3k44", false, 64, 0, NULL, 0, -1, LUMPERROR}, - {"s3k45", false, 64, 0, NULL, 0, -1, LUMPERROR}, - {"s3k46", false, 64, 0, NULL, 0, -1, LUMPERROR}, - {"s3k47", false, 64, 0, NULL, 0, -1, LUMPERROR}, // Kart AIZ dust - {"s3k48", false, 64, 0, NULL, 0, -1, LUMPERROR}, - {"s3k49", false, 64, 0, NULL, 0, -1, LUMPERROR}, // Kart bump sound - {"s3k4a", false, 64, 0, NULL, 0, -1, LUMPERROR}, - {"s3k4b", false, 64, 0, NULL, 0, -1, LUMPERROR}, - {"s3k4c", false, 64, 0, NULL, 0, -1, LUMPERROR}, - {"s3k4d", false, 64, 0, NULL, 0, -1, LUMPERROR}, - {"s3k4e", false, 64, 8, NULL, 0, -1, LUMPERROR}, // Kart explosion - {"s3k4f", false, 64, 0, NULL, 0, -1, LUMPERROR}, - {"s3k50", false, 64, 0, NULL, 0, -1, LUMPERROR}, - {"s3k51", false, 64, 0, NULL, 0, -1, LUMPERROR}, - {"s3k52", false, 64, 0, NULL, 0, -1, LUMPERROR}, - {"s3k53", false, 64, 0, NULL, 0, -1, LUMPERROR}, - {"s3k54", false, 64, 64, NULL, 0, -1, LUMPERROR}, // MetalSonic shot fire - {"s3k55", false, 64, 0, NULL, 0, -1, LUMPERROR}, - {"s3k56", false, 64, 0, NULL, 0, -1, LUMPERROR}, - {"s3k57", false, 64, 0, NULL, 0, -1, LUMPERROR}, - {"s3k58", false, 64, 0, NULL, 0, -1, LUMPERROR}, - {"s3k59", false, 64, 0, NULL, 0, -1, LUMPERROR}, - {"s3k5a", false, 64, 0, NULL, 0, -1, LUMPERROR}, - {"s3k5b", false, 64, 0, NULL, 0, -1, LUMPERROR}, - {"s3k5c", false, 96, 0, NULL, 0, -1, LUMPERROR}, // Kart Mine tick - {"s3k5d", false, 64, 0, NULL, 0, -1, LUMPERROR}, - {"s3k5e", false, 64, 0, NULL, 0, -1, LUMPERROR}, - {"s3k5f", false, 64, 0, NULL, 0, -1, LUMPERROR}, - {"s3k60", false, 64, 0, NULL, 0, -1, LUMPERROR}, - {"s3k61", false, 64, 0, NULL, 0, -1, LUMPERROR}, - {"s3k62", false, 64, 0, NULL, 0, -1, LUMPERROR}, - {"s3k63", false, 64, 0, NULL, 0, -1, LUMPERROR}, - {"s3k64", false, 64, 2, NULL, 0, -1, LUMPERROR}, - {"s3k65", false, 255, 0, NULL, 0, -1, LUMPERROR}, // Blue Spheres - {"s3k66", false, 64, 0, NULL, 0, -1, LUMPERROR}, - {"s3k67", false, 64, 0, NULL, 0, -1, LUMPERROR}, - {"s3k68", false, 64, 0, NULL, 0, -1, LUMPERROR}, // Kart final lap - {"s3k69", false, 64, 0, NULL, 0, -1, LUMPERROR}, - {"s3k6a", false, 64, 0, NULL, 0, -1, LUMPERROR}, // Kart finish - {"s3k6b", false, 64, 0, NULL, 0, -1, LUMPERROR}, - {"s3k6c", false, 64, 0, NULL, 0, -1, LUMPERROR}, - {"s3k6d", false, 64, 0, NULL, 0, -1, LUMPERROR}, - {"s3k6e", false, 64, 0, NULL, 0, -1, LUMPERROR}, - {"s3k6f", false, 64, 0, NULL, 0, -1, LUMPERROR}, - {"s3k70", false, 64, 0, NULL, 0, -1, LUMPERROR}, - {"s3k71", false, 64, 0, NULL, 0, -1, LUMPERROR}, - {"s3k72", false, 64, 0, NULL, 0, -1, LUMPERROR}, - {"s3k73", false, 64, 0, NULL, 0, -1, LUMPERROR}, - {"s3k74", false, 64, 0, NULL, 0, -1, LUMPERROR}, - {"s3k75", false, 64, 0, NULL, 0, -1, LUMPERROR}, - {"s3k76", false, 64, 0, NULL, 0, -1, LUMPERROR}, - {"s3k77", false, 64, 0, NULL, 0, -1, LUMPERROR}, - {"s3k78", false, 64, 0, NULL, 0, -1, LUMPERROR}, - {"s3k79", false, 64, 0, NULL, 0, -1, LUMPERROR}, - {"s3k7a", false, 64, 0, NULL, 0, -1, LUMPERROR}, - {"s3k7b", false, 96, 16, NULL, 0, -1, LUMPERROR}, // Kart successful hit - {"s3k7c", false, 64, 0, NULL, 0, -1, LUMPERROR}, - {"s3k7d", false, 64, 0, NULL, 0, -1, LUMPERROR}, - {"s3k7e", false, 64, 0, NULL, 0, -1, LUMPERROR}, - {"s3k7f", false, 64, 0, NULL, 0, -1, LUMPERROR}, - {"s3k80", false, 64, 0, NULL, 0, -1, LUMPERROR}, - {"s3k81", false, 64, 0, NULL, 0, -1, LUMPERROR}, - {"s3k82", false, 64, 0, NULL, 0, -1, LUMPERROR}, - {"s3k83", false, 64, 0, NULL, 0, -1, LUMPERROR}, // Overcharged start boost - {"s3k84", false, 64, 0, NULL, 0, -1, LUMPERROR}, - {"s3k85", false, 64, 0, NULL, 0, -1, LUMPERROR}, - {"s3k86", false, 64, 0, NULL, 0, -1, LUMPERROR}, - {"s3k87", false, 64, 0, NULL, 0, -1, LUMPERROR}, - {"s3k88", false, 64, 0, NULL, 0, -1, LUMPERROR}, - {"s3k89", false, 64, 0, NULL, 0, -1, LUMPERROR}, // Kart Jawz target - {"s3k8a", false, 64, 0, NULL, 0, -1, LUMPERROR}, - {"s3k8b", false, 64, 0, NULL, 0, -1, LUMPERROR}, - {"s3k8c", false, 64, 0, NULL, 0, -1, LUMPERROR}, - {"s3k8d", false, 64, 0, NULL, 0, -1, LUMPERROR}, - {"s3k8e", false, 64, 0, NULL, 0, -1, LUMPERROR}, - {"s3k8f", false, 64, 0, NULL, 0, -1, LUMPERROR}, - {"s3k90", false, 64, 0, NULL, 0, -1, LUMPERROR}, - {"s3k91", false, 64, 0, NULL, 0, -1, LUMPERROR}, - {"s3k92", false, 64, 8, NULL, 0, -1, LUMPERROR}, // Kart Hyudoro use - {"s3k93", false, 64, 0, NULL, 0, -1, LUMPERROR}, - {"s3k94", false, 64, 0, NULL, 0, -1, LUMPERROR}, - {"s3k95", false, 64, 0, NULL, 0, -1, LUMPERROR}, - {"s3k96", false, 128, 0, NULL, 0, -1, LUMPERROR}, // Kart Orbinaut - {"s3k97", false, 64, 0, NULL, 0, -1, LUMPERROR}, - {"s3k98", false, 64, 0, NULL, 0, -1, LUMPERROR}, - {"s3k99", false, 64, 0, NULL, 0, -1, LUMPERROR}, - {"s3k9a", false, 64, 0, NULL, 0, -1, LUMPERROR}, - {"s3k9b", false, 64, 0, NULL, 0, -1, LUMPERROR}, - {"s3k9c", false, 64, 0, NULL, 0, -1, LUMPERROR}, - {"s3k9d", false, 64, 0, NULL, 0, -1, LUMPERROR}, - {"s3k9e", false, 64, 0, NULL, 0, -1, LUMPERROR}, - {"s3k9f", false, 64, 0, NULL, 0, -1, LUMPERROR}, - {"s3ka0", false, 64, 0, NULL, 0, -1, LUMPERROR}, - {"s3ka1", false, 64, 0, NULL, 0, -1, LUMPERROR}, - {"s3ka2", false, 64, 0, NULL, 0, -1, LUMPERROR}, // Kart drift spark gain - {"s3ka3", false, 64, 0, NULL, 0, -1, LUMPERROR}, - {"s3ka4", false, 64, 0, NULL, 0, -1, LUMPERROR}, - {"s3ka5", false, 64, 0, NULL, 0, -1, LUMPERROR}, - {"s3ka6", false, 64, 0, NULL, 0, -1, LUMPERROR}, - {"s3ka7", false, 64, 0, NULL, 0, -1, LUMPERROR}, // Kart 3,2,1 - {"s3ka8", false, 64, 0, NULL, 0, -1, LUMPERROR}, - {"s3ka9", false, 64, 0, NULL, 0, -1, LUMPERROR}, - {"s3kaa", false, 64, 0, NULL, 0, -1, LUMPERROR}, - {"s3kab", false, 64, 0, NULL, 0, -1, LUMPERROR}, - {"s3kac", false, 64, 0, NULL, 0, -1, LUMPERROR}, - {"s3kad", false, 64, 0, NULL, 0, -1, LUMPERROR}, // Kart GO! - {"s3kae", false, 64, 0, NULL, 0, -1, LUMPERROR}, - {"s3kaf", false, 64, 0, NULL, 0, -1, LUMPERROR}, - {"s3kb0", false, 64, 0, NULL, 0, -1, LUMPERROR}, - {"s3kb1", false, 64, 0, NULL, 0, -1, LUMPERROR}, - {"s3kb2", false, 64, 0, NULL, 0, -1, LUMPERROR}, - {"s3kb3", false, 64, 0, NULL, 0, -1, LUMPERROR}, - {"s3kb4", false, 64, 0, NULL, 0, -1, LUMPERROR}, - {"s3kb5", false, 64, 0, NULL, 0, -1, LUMPERROR}, - {"s3kb6", false, 64, 0, NULL, 0, -1, LUMPERROR}, - {"s3kb7", false, 64, 0, NULL, 0, -1, LUMPERROR}, - {"s3kb8", false, 64, 0, NULL, 0, -1, LUMPERROR}, - {"s3kb9", false, 64, 0, NULL, 0, -1, LUMPERROR}, - {"s3kba", false, 64, 0, NULL, 0, -1, LUMPERROR}, - {"s3kbb", false, 64, 0, NULL, 0, -1, LUMPERROR}, - {"s3kbcs", false, 64, 0, NULL, 0, -1, LUMPERROR}, - {"s3kbcl", false, 64, 0, NULL, 0, -1, LUMPERROR}, - {"s3kbds", false, 64, 0, NULL, 0, -1, LUMPERROR}, - {"s3kbdl", false, 64, 0, NULL, 0, -1, LUMPERROR}, - {"s3kbes", false, 64, 0, NULL, 0, -1, LUMPERROR}, - {"s3kbel", false, 64, 0, NULL, 0, -1, LUMPERROR}, - {"s3kbfs", false, 64, 0, NULL, 0, -1, LUMPERROR}, - {"s3kbfl", false, 64, 0, NULL, 0, -1, LUMPERROR}, - {"s3kc0s", false, 192, 8, NULL, 0, -1, LUMPERROR}, // Kart Jawz - {"s3kc0l", false, 64, 0, NULL, 0, -1, LUMPERROR}, - {"s3kc1s", false, 64, 0, NULL, 0, -1, LUMPERROR}, - {"s3kc1l", false, 64, 0, NULL, 0, -1, LUMPERROR}, - {"s3kc2s", false, 64, 0, NULL, 0, -1, LUMPERROR}, - {"s3kc2l", false, 64, 0, NULL, 0, -1, LUMPERROR}, - {"s3kc3s", false, 64, 0, NULL, 0, -1, LUMPERROR}, - {"s3kc3l", false, 64, 0, NULL, 0, -1, LUMPERROR}, - {"s3kc4s", false, 64, 0, NULL, 0, -1, LUMPERROR}, - {"s3kc4l", false, 64, 0, NULL, 0, -1, LUMPERROR}, - {"s3kc5s", false, 64, 0, NULL, 0, -1, LUMPERROR}, - {"s3kc5l", false, 64, 0, NULL, 0, -1, LUMPERROR}, - {"s3kc6s", false, 64, 0, NULL, 0, -1, LUMPERROR}, - {"s3kc6l", false, 64, 0, NULL, 0, -1, LUMPERROR}, - {"s3kc7s", false, 64, 0, NULL, 0, -1, LUMPERROR}, - {"s3kc7l", false, 64, 0, NULL, 0, -1, LUMPERROR}, - {"s3kc8s", false, 64, 0, NULL, 0, -1, LUMPERROR}, - {"s3kc8l", false, 64, 0, NULL, 0, -1, LUMPERROR}, - {"s3kc9s", false, 64, 0, NULL, 0, -1, LUMPERROR}, - {"s3kc9l", false, 64, 0, NULL, 0, -1, LUMPERROR}, - {"s3kcas", false, 64, 0, NULL, 0, -1, LUMPERROR}, // Kart respawn - {"s3kcal", false, 64, 0, NULL, 0, -1, LUMPERROR}, - {"s3kcbs", false, 64, 0, NULL, 0, -1, LUMPERROR}, - {"s3kcbl", false, 64, 0, NULL, 0, -1, LUMPERROR}, - {"s3kccs", false, 64, 0, NULL, 0, -1, LUMPERROR}, - {"s3kccl", false, 64, 0, NULL, 0, -1, LUMPERROR}, - {"s3kcds", false, 64, 0, NULL, 0, -1, LUMPERROR}, - {"s3kcdl", false, 64, 0, NULL, 0, -1, LUMPERROR}, - {"s3kces", false, 64, 0, NULL, 0, -1, LUMPERROR}, - {"s3kcel", false, 64, 0, NULL, 0, -1, LUMPERROR}, - {"s3kcfs", false, 64, 0, NULL, 0, -1, LUMPERROR}, - {"s3kcfl", false, 64, 0, NULL, 0, -1, LUMPERROR}, - {"s3kd0s", false, 64, 0, NULL, 0, -1, LUMPERROR}, - {"s3kd0l", false, 64, 0, NULL, 0, -1, LUMPERROR}, - {"s3kd1s", false, 64, 0, NULL, 0, -1, LUMPERROR}, - {"s3kd1l", false, 48, 0, NULL, 0, -1, LUMPERROR}, - {"s3kd2s", false, 64, 0, NULL, 0, -1, LUMPERROR}, - {"s3kd2l", false, 64, 0, NULL, 0, -1, LUMPERROR}, - {"s3kd3s", false, 64, 0, NULL, 0, -1, LUMPERROR}, - {"s3kd3l", false, 64, 0, NULL, 0, -1, LUMPERROR}, - {"s3kd4s", false, 64, 0, NULL, 0, -1, LUMPERROR}, - {"s3kd4l", false, 64, 0, NULL, 0, -1, LUMPERROR}, - {"s3kd5s", false, 64, 0, NULL, 0, -1, LUMPERROR}, - {"s3kd5l", false, 64, 0, NULL, 0, -1, LUMPERROR}, - {"s3kd6s", false, 64, 0, NULL, 0, -1, LUMPERROR}, - {"s3kd6l", false, 64, 0, NULL, 0, -1, LUMPERROR}, - {"s3kd7s", false, 64, 0, NULL, 0, -1, LUMPERROR}, - {"s3kd7l", false, 64, 0, NULL, 0, -1, LUMPERROR}, - {"s3kd8s", false, 64, 64, NULL, 0, -1, LUMPERROR}, // Sharp Spin (maybe use the long/L version?) - {"s3kd8l", false, 64, 0, NULL, 0, -1, LUMPERROR}, - {"s3kd9s", false, 64, 0, NULL, 0, -1, LUMPERROR}, - {"s3kd9l", false, 64, 0, NULL, 0, -1, LUMPERROR}, - {"s3kdas", false, 64, 0, NULL, 0, -1, LUMPERROR}, - {"s3kdal", false, 64, 0, NULL, 0, -1, LUMPERROR}, - {"s3kdbs", false, 64, 0, NULL, 0, -1, LUMPERROR}, - {"s3kdbl", false, 64, 0, NULL, 0, -1, LUMPERROR}, + // S3&K sounds + {"s3k33", false, 64, 0, NULL, 0, -1, LUMPERROR}, + {"s3k34", false, 64, 0, NULL, 0, -1, LUMPERROR}, + {"s3k35", false, 64, 0, NULL, 0, -1, LUMPERROR}, + {"s3k36", false, 64, 0, NULL, 0, -1, LUMPERROR}, + {"s3k37", false, 64, 0, NULL, 0, -1, LUMPERROR}, + {"s3k38", false, 64, 0, NULL, 0, -1, LUMPERROR}, + {"s3k39", false, 64, 0, NULL, 0, -1, LUMPERROR}, + {"s3k3a", false, 96, 0, NULL, 0, -1, LUMPERROR}, // Kart item shield + {"s3k3b", false, 64, 0, NULL, 0, -1, LUMPERROR}, + {"s3k3c", false, 64, 0, NULL, 0, -1, LUMPERROR}, + {"s3k3d", false, 64, 0, NULL, 0, -1, LUMPERROR}, + {"s3k3e", false, 64, 0, NULL, 0, -1, LUMPERROR}, + {"s3k3f", false, 64, 0, NULL, 0, -1, LUMPERROR}, + {"s3k40", false, 64, 0, NULL, 0, -1, LUMPERROR}, + {"s3k41", false, 64, 0, NULL, 0, -1, LUMPERROR}, + {"s3k42", false, 64, 0, NULL, 0, -1, LUMPERROR}, // Kart Thunder Shield spawned + {"s3k43", false, 64, 0, NULL, 0, -1, LUMPERROR}, + {"s3k44", false, 64, 0, NULL, 0, -1, LUMPERROR}, + {"s3k45", false, 64, 0, NULL, 0, -1, LUMPERROR}, + {"s3k46", false, 64, 0, NULL, 0, -1, LUMPERROR}, + {"s3k47", false, 64, 0, NULL, 0, -1, LUMPERROR}, // Kart AIZ dust + {"s3k48", false, 64, 0, NULL, 0, -1, LUMPERROR}, + {"s3k49", false, 64, 0, NULL, 0, -1, LUMPERROR}, // Kart bump sound + {"s3k4a", false, 64, 0, NULL, 0, -1, LUMPERROR}, + {"s3k4b", false, 64, 0, NULL, 0, -1, LUMPERROR}, + {"s3k4c", false, 64, 0, NULL, 0, -1, LUMPERROR}, + {"s3k4d", false, 64, 0, NULL, 0, -1, LUMPERROR}, + {"s3k4e", false, 64, 8, NULL, 0, -1, LUMPERROR}, // Kart explosion + {"s3k4f", false, 64, 0, NULL, 0, -1, LUMPERROR}, + {"s3k50", false, 64, 0, NULL, 0, -1, LUMPERROR}, + {"s3k51", false, 64, 0, NULL, 0, -1, LUMPERROR}, + {"s3k52", false, 64, 0, NULL, 0, -1, LUMPERROR}, + {"s3k53", false, 64, 0, NULL, 0, -1, LUMPERROR}, + {"s3k54", false, 64, 64, NULL, 0, -1, LUMPERROR}, // MetalSonic shot fire + {"s3k55", false, 64, 0, NULL, 0, -1, LUMPERROR}, + {"s3k56", false, 64, 0, NULL, 0, -1, LUMPERROR}, + {"s3k57", false, 64, 0, NULL, 0, -1, LUMPERROR}, + {"s3k58", false, 64, 0, NULL, 0, -1, LUMPERROR}, + {"s3k59", false, 64, 0, NULL, 0, -1, LUMPERROR}, + {"s3k5a", false, 64, 0, NULL, 0, -1, LUMPERROR}, + {"s3k5b", false, 64, 0, NULL, 0, -1, LUMPERROR}, + {"s3k5c", false, 96, 0, NULL, 0, -1, LUMPERROR}, // Kart Mine tick + {"s3k5d", false, 64, 0, NULL, 0, -1, LUMPERROR}, + {"s3k5e", false, 64, 0, NULL, 0, -1, LUMPERROR}, + {"s3k5f", false, 64, 0, NULL, 0, -1, LUMPERROR}, + {"s3k60", false, 64, 0, NULL, 0, -1, LUMPERROR}, + {"s3k61", false, 64, 0, NULL, 0, -1, LUMPERROR}, + {"s3k62", false, 64, 0, NULL, 0, -1, LUMPERROR}, + {"s3k63", false, 64, 0, NULL, 0, -1, LUMPERROR}, + {"s3k64", false, 64, 2, NULL, 0, -1, LUMPERROR}, + {"s3k65", false, 255, 0, NULL, 0, -1, LUMPERROR}, // Blue Spheres + {"s3k66", false, 64, 0, NULL, 0, -1, LUMPERROR}, + {"s3k67", false, 64, 0, NULL, 0, -1, LUMPERROR}, + {"s3k68", false, 64, 0, NULL, 0, -1, LUMPERROR}, // Kart final lap + {"s3k69", false, 64, 0, NULL, 0, -1, LUMPERROR}, + {"s3k6a", false, 64, 0, NULL, 0, -1, LUMPERROR}, // Kart finish + {"s3k6b", false, 64, 0, NULL, 0, -1, LUMPERROR}, + {"s3k6c", false, 64, 0, NULL, 0, -1, LUMPERROR}, + {"s3k6d", false, 64, 0, NULL, 0, -1, LUMPERROR}, + {"s3k6e", false, 64, 0, NULL, 0, -1, LUMPERROR}, + {"s3k6f", false, 64, 0, NULL, 0, -1, LUMPERROR}, + {"s3k70", false, 64, 0, NULL, 0, -1, LUMPERROR}, + {"s3k71", false, 64, 0, NULL, 0, -1, LUMPERROR}, + {"s3k72", false, 64, 0, NULL, 0, -1, LUMPERROR}, + {"s3k73", false, 64, 0, NULL, 0, -1, LUMPERROR}, + {"s3k74", false, 64, 0, NULL, 0, -1, LUMPERROR}, + {"s3k75", false, 64, 0, NULL, 0, -1, LUMPERROR}, + {"s3k76", false, 64, 0, NULL, 0, -1, LUMPERROR}, + {"s3k77", false, 64, 0, NULL, 0, -1, LUMPERROR}, + {"s3k78", false, 64, 0, NULL, 0, -1, LUMPERROR}, + {"s3k79", false, 64, 0, NULL, 0, -1, LUMPERROR}, + {"s3k7a", false, 64, 0, NULL, 0, -1, LUMPERROR}, + {"s3k7b", false, 96, 16, NULL, 0, -1, LUMPERROR}, // Kart successful hit + {"s3k7c", false, 64, 0, NULL, 0, -1, LUMPERROR}, + {"s3k7d", false, 64, 0, NULL, 0, -1, LUMPERROR}, + {"s3k7e", false, 64, 0, NULL, 0, -1, LUMPERROR}, + {"s3k7f", false, 64, 0, NULL, 0, -1, LUMPERROR}, + {"s3k80", false, 64, 0, NULL, 0, -1, LUMPERROR}, + {"s3k81", false, 64, 0, NULL, 0, -1, LUMPERROR}, + {"s3k82", false, 64, 0, NULL, 0, -1, LUMPERROR}, + {"s3k83", false, 64, 0, NULL, 0, -1, LUMPERROR}, // Overcharged start boost + {"s3k84", false, 64, 0, NULL, 0, -1, LUMPERROR}, + {"s3k85", false, 64, 0, NULL, 0, -1, LUMPERROR}, + {"s3k86", false, 64, 0, NULL, 0, -1, LUMPERROR}, + {"s3k87", false, 64, 0, NULL, 0, -1, LUMPERROR}, + {"s3k88", false, 64, 0, NULL, 0, -1, LUMPERROR}, + {"s3k89", false, 64, 0, NULL, 0, -1, LUMPERROR}, // Kart Jawz target + {"s3k8a", false, 64, 0, NULL, 0, -1, LUMPERROR}, + {"s3k8b", false, 64, 0, NULL, 0, -1, LUMPERROR}, + {"s3k8c", false, 64, 0, NULL, 0, -1, LUMPERROR}, + {"s3k8d", false, 64, 0, NULL, 0, -1, LUMPERROR}, + {"s3k8e", false, 64, 0, NULL, 0, -1, LUMPERROR}, + {"s3k8f", false, 64, 0, NULL, 0, -1, LUMPERROR}, + {"s3k90", false, 64, 0, NULL, 0, -1, LUMPERROR}, + {"s3k91", false, 64, 0, NULL, 0, -1, LUMPERROR}, + {"s3k92", false, 64, 8, NULL, 0, -1, LUMPERROR}, // Kart Hyudoro use + {"s3k93", false, 64, 0, NULL, 0, -1, LUMPERROR}, + {"s3k94", false, 64, 0, NULL, 0, -1, LUMPERROR}, + {"s3k95", false, 64, 0, NULL, 0, -1, LUMPERROR}, + {"s3k96", false, 128, 0, NULL, 0, -1, LUMPERROR}, // Kart Orbinaut + {"s3k97", false, 64, 0, NULL, 0, -1, LUMPERROR}, + {"s3k98", false, 64, 0, NULL, 0, -1, LUMPERROR}, + {"s3k99", false, 64, 0, NULL, 0, -1, LUMPERROR}, + {"s3k9a", false, 64, 0, NULL, 0, -1, LUMPERROR}, + {"s3k9b", false, 64, 0, NULL, 0, -1, LUMPERROR}, + {"s3k9c", false, 64, 0, NULL, 0, -1, LUMPERROR}, + {"s3k9d", false, 64, 0, NULL, 0, -1, LUMPERROR}, + {"s3k9e", false, 64, 0, NULL, 0, -1, LUMPERROR}, + {"s3k9f", false, 64, 0, NULL, 0, -1, LUMPERROR}, + {"s3ka0", false, 64, 0, NULL, 0, -1, LUMPERROR}, + {"s3ka1", false, 64, 0, NULL, 0, -1, LUMPERROR}, + {"s3ka2", false, 64, 0, NULL, 0, -1, LUMPERROR}, // Kart drift spark gain + {"s3ka3", false, 64, 0, NULL, 0, -1, LUMPERROR}, + {"s3ka4", false, 64, 0, NULL, 0, -1, LUMPERROR}, + {"s3ka5", false, 64, 0, NULL, 0, -1, LUMPERROR}, + {"s3ka6", false, 64, 0, NULL, 0, -1, LUMPERROR}, + {"s3ka7", false, 64, 0, NULL, 0, -1, LUMPERROR}, // Kart 3,2,1 + {"s3ka8", false, 64, 0, NULL, 0, -1, LUMPERROR}, + {"s3ka9", false, 64, 0, NULL, 0, -1, LUMPERROR}, + {"s3kaa", false, 64, 0, NULL, 0, -1, LUMPERROR}, + {"s3kab", false, 64, 0, NULL, 0, -1, LUMPERROR}, + {"s3kac", false, 64, 0, NULL, 0, -1, LUMPERROR}, + {"s3kad", false, 64, 0, NULL, 0, -1, LUMPERROR}, // Kart GO! + {"s3kae", false, 64, 0, NULL, 0, -1, LUMPERROR}, + {"s3kaf", false, 64, 0, NULL, 0, -1, LUMPERROR}, + {"s3kb0", false, 64, 0, NULL, 0, -1, LUMPERROR}, + {"s3kb1", false, 64, 0, NULL, 0, -1, LUMPERROR}, + {"s3kb2", false, 64, 0, NULL, 0, -1, LUMPERROR}, + {"s3kb3", false, 64, 0, NULL, 0, -1, LUMPERROR}, + {"s3kb4", false, 64, 0, NULL, 0, -1, LUMPERROR}, + {"s3kb5", false, 64, 0, NULL, 0, -1, LUMPERROR}, + {"s3kb6", false, 64, 0, NULL, 0, -1, LUMPERROR}, + {"s3kb7", false, 64, 0, NULL, 0, -1, LUMPERROR}, + {"s3kb8", false, 64, 0, NULL, 0, -1, LUMPERROR}, + {"s3kb9", false, 64, 0, NULL, 0, -1, LUMPERROR}, + {"s3kba", false, 64, 0, NULL, 0, -1, LUMPERROR}, + {"s3kbb", false, 64, 0, NULL, 0, -1, LUMPERROR}, + {"s3kbcs", false, 64, 0, NULL, 0, -1, LUMPERROR}, + {"s3kbcl", false, 64, 0, NULL, 0, -1, LUMPERROR}, + {"s3kbds", false, 64, 0, NULL, 0, -1, LUMPERROR}, + {"s3kbdl", false, 64, 0, NULL, 0, -1, LUMPERROR}, + {"s3kbes", false, 64, 0, NULL, 0, -1, LUMPERROR}, + {"s3kbel", false, 64, 0, NULL, 0, -1, LUMPERROR}, + {"s3kbfs", false, 64, 0, NULL, 0, -1, LUMPERROR}, + {"s3kbfl", false, 64, 0, NULL, 0, -1, LUMPERROR}, + {"s3kc0s", false, 192, 8, NULL, 0, -1, LUMPERROR}, // Kart Jawz + {"s3kc0l", false, 64, 0, NULL, 0, -1, LUMPERROR}, + {"s3kc1s", false, 64, 0, NULL, 0, -1, LUMPERROR}, + {"s3kc1l", false, 64, 0, NULL, 0, -1, LUMPERROR}, + {"s3kc2s", false, 64, 0, NULL, 0, -1, LUMPERROR}, + {"s3kc2l", false, 64, 0, NULL, 0, -1, LUMPERROR}, + {"s3kc3s", false, 64, 0, NULL, 0, -1, LUMPERROR}, + {"s3kc3l", false, 64, 0, NULL, 0, -1, LUMPERROR}, + {"s3kc4s", false, 64, 0, NULL, 0, -1, LUMPERROR}, + {"s3kc4l", false, 64, 0, NULL, 0, -1, LUMPERROR}, + {"s3kc5s", false, 64, 0, NULL, 0, -1, LUMPERROR}, + {"s3kc5l", false, 64, 0, NULL, 0, -1, LUMPERROR}, + {"s3kc6s", false, 64, 0, NULL, 0, -1, LUMPERROR}, + {"s3kc6l", false, 64, 0, NULL, 0, -1, LUMPERROR}, + {"s3kc7s", false, 64, 0, NULL, 0, -1, LUMPERROR}, + {"s3kc7l", false, 64, 0, NULL, 0, -1, LUMPERROR}, + {"s3kc8s", false, 64, 0, NULL, 0, -1, LUMPERROR}, + {"s3kc8l", false, 64, 0, NULL, 0, -1, LUMPERROR}, + {"s3kc9s", false, 64, 0, NULL, 0, -1, LUMPERROR}, + {"s3kc9l", false, 64, 0, NULL, 0, -1, LUMPERROR}, + {"s3kcas", false, 64, 0, NULL, 0, -1, LUMPERROR}, // Kart respawn + {"s3kcal", false, 64, 0, NULL, 0, -1, LUMPERROR}, + {"s3kcbs", false, 64, 0, NULL, 0, -1, LUMPERROR}, + {"s3kcbl", false, 64, 0, NULL, 0, -1, LUMPERROR}, + {"s3kccs", false, 64, 0, NULL, 0, -1, LUMPERROR}, + {"s3kccl", false, 64, 0, NULL, 0, -1, LUMPERROR}, + {"s3kcds", false, 64, 0, NULL, 0, -1, LUMPERROR}, + {"s3kcdl", false, 64, 0, NULL, 0, -1, LUMPERROR}, + {"s3kces", false, 64, 0, NULL, 0, -1, LUMPERROR}, + {"s3kcel", false, 64, 0, NULL, 0, -1, LUMPERROR}, + {"s3kcfs", false, 64, 0, NULL, 0, -1, LUMPERROR}, + {"s3kcfl", false, 64, 0, NULL, 0, -1, LUMPERROR}, + {"s3kd0s", false, 64, 0, NULL, 0, -1, LUMPERROR}, + {"s3kd0l", false, 64, 0, NULL, 0, -1, LUMPERROR}, + {"s3kd1s", false, 64, 0, NULL, 0, -1, LUMPERROR}, + {"s3kd1l", false, 48, 0, NULL, 0, -1, LUMPERROR}, + {"s3kd2s", false, 64, 0, NULL, 0, -1, LUMPERROR}, + {"s3kd2l", false, 64, 0, NULL, 0, -1, LUMPERROR}, + {"s3kd3s", false, 64, 0, NULL, 0, -1, LUMPERROR}, + {"s3kd3l", false, 64, 0, NULL, 0, -1, LUMPERROR}, + {"s3kd4s", false, 64, 0, NULL, 0, -1, LUMPERROR}, + {"s3kd4l", false, 64, 0, NULL, 0, -1, LUMPERROR}, + {"s3kd5s", false, 64, 0, NULL, 0, -1, LUMPERROR}, + {"s3kd5l", false, 64, 0, NULL, 0, -1, LUMPERROR}, + {"s3kd6s", false, 64, 0, NULL, 0, -1, LUMPERROR}, + {"s3kd6l", false, 64, 0, NULL, 0, -1, LUMPERROR}, + {"s3kd7s", false, 64, 0, NULL, 0, -1, LUMPERROR}, + {"s3kd7l", false, 64, 0, NULL, 0, -1, LUMPERROR}, + {"s3kd8s", false, 64, 64, NULL, 0, -1, LUMPERROR}, // Sharp Spin (maybe use the long/L version?) + {"s3kd8l", false, 64, 0, NULL, 0, -1, LUMPERROR}, + {"s3kd9s", false, 64, 0, NULL, 0, -1, LUMPERROR}, + {"s3kd9l", false, 64, 0, NULL, 0, -1, LUMPERROR}, + {"s3kdas", false, 64, 0, NULL, 0, -1, LUMPERROR}, + {"s3kdal", false, 64, 0, NULL, 0, -1, LUMPERROR}, + {"s3kdbs", false, 64, 0, NULL, 0, -1, LUMPERROR}, + {"s3kdbl", false, 64, 0, NULL, 0, -1, LUMPERROR}, - // 3D Blast sounds (the "missing" ones are direct copies of S3K's, no minor differences what-so-ever) - {"3db06", false, 96, 8, NULL, 0, -1, LUMPERROR}, // Bumper stolen - {"3db09", false, 64, 0, NULL, 0, -1, LUMPERROR}, - {"3db14", false, 64, 0, NULL, 0, -1, LUMPERROR}, - {"3db16", false, 64, 0, NULL, 0, -1, LUMPERROR}, + // 3D Blast sounds (the "missing" ones are direct copies of S3K's, no minor differences what-so-ever) + {"3db06", false, 96, 8, NULL, 0, -1, LUMPERROR}, // Bumper stolen + {"3db09", false, 64, 0, NULL, 0, -1, LUMPERROR}, + {"3db14", false, 64, 0, NULL, 0, -1, LUMPERROR}, + {"3db16", false, 64, 0, NULL, 0, -1, LUMPERROR}, - // Sonic CD sounds - {"cdfm00", false, 64, 0, NULL, 0, -1, LUMPERROR}, // Undercharged start boost - {"cdfm01", false, 64, 0, NULL, 0, -1, LUMPERROR}, // Sneaker boost - {"cdfm02", false, 64, 0, NULL, 0, -1, LUMPERROR}, - {"cdfm03", false, 64, 0, NULL, 0, -1, LUMPERROR}, - {"cdfm04", false, 64, 0, NULL, 0, -1, LUMPERROR}, - {"cdfm05", false, 64, 0, NULL, 0, -1, LUMPERROR}, - {"cdfm06", false, 64, 0, NULL, 0, -1, LUMPERROR}, - {"cdfm07", false, 64, 0, NULL, 0, -1, LUMPERROR}, - {"cdfm08", false, 64, 0, NULL, 0, -1, LUMPERROR}, - {"cdfm09", false, 64, 0, NULL, 0, -1, LUMPERROR}, - {"cdfm10", false, 64, 0, NULL, 0, -1, LUMPERROR}, - {"cdfm11", false, 64, 0, NULL, 0, -1, LUMPERROR}, - {"cdfm12", false, 64, 0, NULL, 0, -1, LUMPERROR}, - {"cdfm13", false, 64, 0, NULL, 0, -1, LUMPERROR}, - {"cdfm14", false, 64, 0, NULL, 0, -1, LUMPERROR}, - {"cdfm15", false, 64, 0, NULL, 0, -1, LUMPERROR}, - {"cdfm16", false, 64, 0, NULL, 0, -1, LUMPERROR}, - {"cdfm17", false, 64, 0, NULL, 0, -1, LUMPERROR}, // Brake drift ambient - {"cdfm18", false, 64, 0, NULL, 0, -1, LUMPERROR}, - {"cdfm19", false, 64, 0, NULL, 0, -1, LUMPERROR}, // CD SS1 UFO death - {"cdfm20", false, 64, 0, NULL, 0, -1, LUMPERROR}, - {"cdfm21", false, 64, 0, NULL, 0, -1, LUMPERROR}, - {"cdfm22", false, 64, 0, NULL, 0, -1, LUMPERROR}, - {"cdfm23", false, 64, 0, NULL, 0, -1, LUMPERROR}, - {"cdfm24", false, 64, 0, NULL, 0, -1, LUMPERROR}, - {"cdfm25", false, 64, 0, NULL, 0, -1, LUMPERROR}, - {"cdfm26", false, 64, 0, NULL, 0, -1, LUMPERROR}, - {"cdfm27", false, 64, 0, NULL, 0, -1, LUMPERROR}, - {"cdfm28", false, 96, 0, NULL, 0, -1, LUMPERROR}, // Eggman item landing - {"cdfm29", false, 64, 0, NULL, 0, -1, LUMPERROR}, - {"cdfm30", false, 64, 0, NULL, 0, -1, LUMPERROR}, - {"cdfm31", false, 64, 0, NULL, 0, -1, LUMPERROR}, - {"cdfm32", false, 64, 0, NULL, 0, -1, LUMPERROR}, - {"cdfm33", false, 64, 0, NULL, 0, -1, LUMPERROR}, - {"cdfm34", false, 64, 0, NULL, 0, -1, LUMPERROR}, - {"cdfm35", false, 64, 0, NULL, 0, -1, LUMPERROR}, - {"cdfm36", false, 64, 0, NULL, 0, -1, LUMPERROR}, - {"cdfm37", false, 64, 0, NULL, 0, -1, LUMPERROR}, - {"cdfm38", false, 64, 0, NULL, 0, -1, LUMPERROR}, - {"cdfm39", false, 128, 8, NULL, 0, -1, LUMPERROR}, // Mine deployed - {"cdfm40", false, 64, 0, NULL, 0, -1, LUMPERROR}, - {"cdfm41", false, 64, 0, NULL, 0, -1, LUMPERROR}, - {"cdfm42", false, 64, 0, NULL, 0, -1, LUMPERROR}, - {"cdfm43", false, 64, 0, NULL, 0, -1, LUMPERROR}, - {"cdfm44", false, 64, 0, NULL, 0, -1, LUMPERROR}, - {"cdfm45", false, 64, 0, NULL, 0, -1, LUMPERROR}, - {"cdfm46", false, 64, 0, NULL, 0, -1, LUMPERROR}, - {"cdfm47", false, 64, 0, NULL, 0, -1, LUMPERROR}, - {"cdfm48", false, 64, 0, NULL, 0, -1, LUMPERROR}, - {"cdfm49", false, 64, 0, NULL, 0, -1, LUMPERROR}, - {"cdfm50", false, 64, 0, NULL, 0, -1, LUMPERROR}, - {"cdfm51", false, 64, 0, NULL, 0, -1, LUMPERROR}, - {"cdfm52", false, 64, 0, NULL, 0, -1, LUMPERROR}, - {"cdfm53", false, 64, 0, NULL, 0, -1, LUMPERROR}, - {"cdfm54", false, 64, 0, NULL, 0, -1, LUMPERROR}, - {"cdfm55", false, 64, 0, NULL, 0, -1, LUMPERROR}, - {"cdfm56", false, 64, 0, NULL, 0, -1, LUMPERROR}, - {"cdfm57", false, 64, 0, NULL, 0, -1, LUMPERROR}, - {"cdfm58", false, 64, 0, NULL, 0, -1, LUMPERROR}, - {"cdfm59", false, 64, 0, NULL, 0, -1, LUMPERROR}, - {"cdfm60", false, 64, 0, NULL, 0, -1, LUMPERROR}, - {"cdfm61", false, 64, 0, NULL, 0, -1, LUMPERROR}, - {"cdfm62", false, 64, 0, NULL, 0, -1, LUMPERROR}, - {"cdfm63", false, 64, 0, NULL, 0, -1, LUMPERROR}, - {"cdfm64", false, 64, 0, NULL, 0, -1, LUMPERROR}, - {"cdfm65", false, 64, 0, NULL, 0, -1, LUMPERROR}, - {"cdfm66", false, 64, 0, NULL, 0, -1, LUMPERROR}, - {"cdfm67", false, 64, 0, NULL, 0, -1, LUMPERROR}, - {"cdfm68", false, 64, 0, NULL, 0, -1, LUMPERROR}, - {"cdfm69", false, 64, 0, NULL, 0, -1, LUMPERROR}, - {"cdfm70", false, 96, 0, NULL, 0, -1, LUMPERROR}, // Trail item dragging - {"cdfm71", false, 64, 0, NULL, 0, -1, LUMPERROR}, - {"cdfm72", false, 64, 0, NULL, 0, -1, LUMPERROR}, - {"cdfm73", false, 64, 0, NULL, 0, -1, LUMPERROR}, // CD SS1 UFO hit - {"cdfm74", false, 64, 0, NULL, 0, -1, LUMPERROR}, - {"cdfm75", false, 64, 0, NULL, 0, -1, LUMPERROR}, - {"cdfm76", false, 64, 0, NULL, 0, -1, LUMPERROR}, - {"cdfm77", false, 64, 0, NULL, 0, -1, LUMPERROR}, - {"cdfm78", false, 64, 0, NULL, 0, -1, LUMPERROR}, - {"cdfm79", false, 64, 0, NULL, 0, -1, LUMPERROR}, - {"cdpcm0", false, 64, 0, NULL, 0, -1, LUMPERROR}, - {"cdpcm1", false, 64, 0, NULL, 0, -1, LUMPERROR}, - {"cdpcm2", false, 64, 0, NULL, 0, -1, LUMPERROR}, - {"cdpcm3", false, 64, 0, NULL, 0, -1, LUMPERROR}, - {"cdpcm4", false, 64, 0, NULL, 0, -1, LUMPERROR}, - {"cdpcm5", false, 64, 0, NULL, 0, -1, LUMPERROR}, - {"cdpcm6", false, 64, 0, NULL, 0, -1, LUMPERROR}, - {"cdpcm7", false, 64, 0, NULL, 0, -1, LUMPERROR}, - {"cdpcm8", false, 64, 0, NULL, 0, -1, LUMPERROR}, - {"cdpcm9", false, 96, 8, NULL, 0, -1, LUMPERROR}, // No damage taken + // Sonic CD sounds + {"cdfm00", false, 64, 0, NULL, 0, -1, LUMPERROR}, // Undercharged start boost + {"cdfm01", false, 64, 0, NULL, 0, -1, LUMPERROR}, // Sneaker boost + {"cdfm02", false, 64, 0, NULL, 0, -1, LUMPERROR}, + {"cdfm03", false, 64, 0, NULL, 0, -1, LUMPERROR}, + {"cdfm04", false, 64, 0, NULL, 0, -1, LUMPERROR}, + {"cdfm05", false, 64, 0, NULL, 0, -1, LUMPERROR}, + {"cdfm06", false, 64, 0, NULL, 0, -1, LUMPERROR}, + {"cdfm07", false, 64, 0, NULL, 0, -1, LUMPERROR}, + {"cdfm08", false, 64, 0, NULL, 0, -1, LUMPERROR}, + {"cdfm09", false, 64, 0, NULL, 0, -1, LUMPERROR}, + {"cdfm10", false, 64, 0, NULL, 0, -1, LUMPERROR}, + {"cdfm11", false, 64, 0, NULL, 0, -1, LUMPERROR}, + {"cdfm12", false, 64, 0, NULL, 0, -1, LUMPERROR}, + {"cdfm13", false, 64, 0, NULL, 0, -1, LUMPERROR}, + {"cdfm14", false, 64, 0, NULL, 0, -1, LUMPERROR}, + {"cdfm15", false, 64, 0, NULL, 0, -1, LUMPERROR}, + {"cdfm16", false, 64, 0, NULL, 0, -1, LUMPERROR}, + {"cdfm17", false, 64, 0, NULL, 0, -1, LUMPERROR}, // Brake drift ambient + {"cdfm18", false, 64, 0, NULL, 0, -1, LUMPERROR}, + {"cdfm19", false, 64, 0, NULL, 0, -1, LUMPERROR}, // CD SS1 UFO death + {"cdfm20", false, 64, 0, NULL, 0, -1, LUMPERROR}, + {"cdfm21", false, 64, 0, NULL, 0, -1, LUMPERROR}, + {"cdfm22", false, 64, 0, NULL, 0, -1, LUMPERROR}, + {"cdfm23", false, 64, 0, NULL, 0, -1, LUMPERROR}, + {"cdfm24", false, 64, 0, NULL, 0, -1, LUMPERROR}, + {"cdfm25", false, 64, 0, NULL, 0, -1, LUMPERROR}, + {"cdfm26", false, 64, 0, NULL, 0, -1, LUMPERROR}, + {"cdfm27", false, 64, 0, NULL, 0, -1, LUMPERROR}, + {"cdfm28", false, 96, 0, NULL, 0, -1, LUMPERROR}, // Eggman item landing + {"cdfm29", false, 64, 0, NULL, 0, -1, LUMPERROR}, + {"cdfm30", false, 64, 0, NULL, 0, -1, LUMPERROR}, + {"cdfm31", false, 64, 0, NULL, 0, -1, LUMPERROR}, + {"cdfm32", false, 64, 0, NULL, 0, -1, LUMPERROR}, + {"cdfm33", false, 64, 0, NULL, 0, -1, LUMPERROR}, + {"cdfm34", false, 64, 0, NULL, 0, -1, LUMPERROR}, + {"cdfm35", false, 64, 0, NULL, 0, -1, LUMPERROR}, + {"cdfm36", false, 64, 0, NULL, 0, -1, LUMPERROR}, + {"cdfm37", false, 64, 0, NULL, 0, -1, LUMPERROR}, + {"cdfm38", false, 64, 0, NULL, 0, -1, LUMPERROR}, + {"cdfm39", false, 128, 8, NULL, 0, -1, LUMPERROR}, // Mine deployed + {"cdfm40", false, 64, 0, NULL, 0, -1, LUMPERROR}, + {"cdfm41", false, 64, 0, NULL, 0, -1, LUMPERROR}, + {"cdfm42", false, 64, 0, NULL, 0, -1, LUMPERROR}, + {"cdfm43", false, 64, 0, NULL, 0, -1, LUMPERROR}, + {"cdfm44", false, 64, 0, NULL, 0, -1, LUMPERROR}, + {"cdfm45", false, 64, 0, NULL, 0, -1, LUMPERROR}, + {"cdfm46", false, 64, 0, NULL, 0, -1, LUMPERROR}, + {"cdfm47", false, 64, 0, NULL, 0, -1, LUMPERROR}, + {"cdfm48", false, 64, 0, NULL, 0, -1, LUMPERROR}, + {"cdfm49", false, 64, 0, NULL, 0, -1, LUMPERROR}, + {"cdfm50", false, 64, 0, NULL, 0, -1, LUMPERROR}, + {"cdfm51", false, 64, 0, NULL, 0, -1, LUMPERROR}, + {"cdfm52", false, 64, 0, NULL, 0, -1, LUMPERROR}, + {"cdfm53", false, 64, 0, NULL, 0, -1, LUMPERROR}, + {"cdfm54", false, 64, 0, NULL, 0, -1, LUMPERROR}, + {"cdfm55", false, 64, 0, NULL, 0, -1, LUMPERROR}, + {"cdfm56", false, 64, 0, NULL, 0, -1, LUMPERROR}, + {"cdfm57", false, 64, 0, NULL, 0, -1, LUMPERROR}, + {"cdfm58", false, 64, 0, NULL, 0, -1, LUMPERROR}, + {"cdfm59", false, 64, 0, NULL, 0, -1, LUMPERROR}, + {"cdfm60", false, 64, 0, NULL, 0, -1, LUMPERROR}, + {"cdfm61", false, 64, 0, NULL, 0, -1, LUMPERROR}, + {"cdfm62", false, 64, 0, NULL, 0, -1, LUMPERROR}, + {"cdfm63", false, 64, 0, NULL, 0, -1, LUMPERROR}, + {"cdfm64", false, 64, 0, NULL, 0, -1, LUMPERROR}, + {"cdfm65", false, 64, 0, NULL, 0, -1, LUMPERROR}, + {"cdfm66", false, 64, 0, NULL, 0, -1, LUMPERROR}, + {"cdfm67", false, 64, 0, NULL, 0, -1, LUMPERROR}, + {"cdfm68", false, 64, 0, NULL, 0, -1, LUMPERROR}, + {"cdfm69", false, 64, 0, NULL, 0, -1, LUMPERROR}, + {"cdfm70", false, 96, 0, NULL, 0, -1, LUMPERROR}, // Trail item dragging + {"cdfm71", false, 64, 0, NULL, 0, -1, LUMPERROR}, + {"cdfm72", false, 64, 0, NULL, 0, -1, LUMPERROR}, + {"cdfm73", false, 64, 0, NULL, 0, -1, LUMPERROR}, // CD SS1 UFO hit + {"cdfm74", false, 64, 0, NULL, 0, -1, LUMPERROR}, + {"cdfm75", false, 64, 0, NULL, 0, -1, LUMPERROR}, + {"cdfm76", false, 64, 0, NULL, 0, -1, LUMPERROR}, + {"cdfm77", false, 64, 0, NULL, 0, -1, LUMPERROR}, + {"cdfm78", false, 64, 0, NULL, 0, -1, LUMPERROR}, + {"cdfm79", false, 64, 0, NULL, 0, -1, LUMPERROR}, + {"cdpcm0", false, 64, 0, NULL, 0, -1, LUMPERROR}, + {"cdpcm1", false, 64, 0, NULL, 0, -1, LUMPERROR}, + {"cdpcm2", false, 64, 0, NULL, 0, -1, LUMPERROR}, + {"cdpcm3", false, 64, 0, NULL, 0, -1, LUMPERROR}, + {"cdpcm4", false, 64, 0, NULL, 0, -1, LUMPERROR}, + {"cdpcm5", false, 64, 0, NULL, 0, -1, LUMPERROR}, + {"cdpcm6", false, 64, 0, NULL, 0, -1, LUMPERROR}, + {"cdpcm7", false, 64, 0, NULL, 0, -1, LUMPERROR}, + {"cdpcm8", false, 64, 0, NULL, 0, -1, LUMPERROR}, + {"cdpcm9", false, 96, 8, NULL, 0, -1, LUMPERROR}, // No damage taken - // Knuckles Chaotix sound - {"kc2a", false, 64, 0, NULL, 0, -1, LUMPERROR}, - {"kc2b", false, 64, 0, NULL, 0, -1, LUMPERROR}, - {"kc2c", false, 64, 0, NULL, 0, -1, LUMPERROR}, - {"kc2d", false, 64, 0, NULL, 0, -1, LUMPERROR}, - {"kc2e", false, 96, 0, NULL, 0, -1, LUMPERROR}, // Item box gotten - {"kc2f", false, 96, 8, NULL, 0, -1, LUMPERROR}, // Spring pad - {"kc30", false, 64, 0, NULL, 0, -1, LUMPERROR}, - {"kc31", false, 64, 64, NULL, 0, -1, LUMPERROR}, // NO CONTEST explosion - {"kc32", false, 64, 0, NULL, 0, -1, LUMPERROR}, - {"kc33", false, 64, 0, NULL, 0, -1, LUMPERROR}, - {"kc34", false, 64, 0, NULL, 0, -1, LUMPERROR}, - {"kc35", false, 64, 0, NULL, 0, -1, LUMPERROR}, - {"kc36", false, 64, 0, NULL, 0, -1, LUMPERROR}, - {"kc37", false, 64, 0, NULL, 0, -1, LUMPERROR}, - {"kc38", false, 64, 0, NULL, 0, -1, LUMPERROR}, - {"kc39", false, 64, 0, NULL, 0, -1, LUMPERROR}, // Voting roulette - {"kc3a", false, 64, 0, NULL, 0, -1, LUMPERROR}, - {"kc3b", false, 64, 0, NULL, 0, -1, LUMPERROR}, - {"kc3c", false, 64, 0, NULL, 0, -1, LUMPERROR}, - {"kc3d", false, 64, 0, NULL, 0, -1, LUMPERROR}, - {"kc3e", false, 64, 0, NULL, 0, -1, LUMPERROR}, - {"kc3f", false, 64, 0, NULL, 0, -1, LUMPERROR}, - {"kc40", false, 64, 0, NULL, 0, -1, LUMPERROR}, - {"kc41", false, 64, 0, NULL, 0, -1, LUMPERROR}, - {"kc42", false, 64, 0, NULL, 0, -1, LUMPERROR}, // Unlock everything cheat - {"kc43", false, 64, 0, NULL, 0, -1, LUMPERROR}, - {"kc44", false, 64, 0, NULL, 0, -1, LUMPERROR}, - {"kc45", false, 64, 0, NULL, 0, -1, LUMPERROR}, - {"kc46", false, 96, 8, NULL, 0, -1, LUMPERROR}, // Shrink use - {"kc47", false, 64, 0, NULL, 0, -1, LUMPERROR}, - {"kc48", false, 64, 0, NULL, 0, -1, LUMPERROR}, // Vote picked - {"kc49", false, 64, 0, NULL, 0, -1, LUMPERROR}, - {"kc4a", false, 64, 0, NULL, 0, -1, LUMPERROR}, // Voting beep - {"kc4b", false, 64, 0, NULL, 0, -1, LUMPERROR}, - {"kc4c", false, 64, 0, NULL, 0, -1, LUMPERROR}, - {"kc4d", false, 64, 0, NULL, 0, -1, LUMPERROR}, - {"kc4e", false, 64, 0, NULL, 0, -1, LUMPERROR}, - {"kc4f", false, 64, 0, NULL, 0, -1, LUMPERROR}, - {"kc50", false, 64, 0, NULL, 0, -1, LUMPERROR}, - {"kc51", false, 64, 64, NULL, 0, -1, LUMPERROR}, // NO CONTEST debris ambience - {"kc52", false, 64, 0, NULL, 0, -1, LUMPERROR}, - {"kc53", false, 64, 0, NULL, 0, -1, LUMPERROR}, - {"kc54", false, 64, 0, NULL, 0, -1, LUMPERROR}, - {"kc55", false, 64, 0, NULL, 0, -1, LUMPERROR}, - {"kc56", false, 64, 0, NULL, 0, -1, LUMPERROR}, - {"kc57", false, 128, 8, NULL, 0, -1, LUMPERROR}, // SPB locked in - {"kc58", false, 64, 0, NULL, 0, -1, LUMPERROR}, - {"kc59", false, 128, 8, NULL, 0, -1, LUMPERROR}, // Shrink - {"kc5a", false, 128, 8, NULL, 0, -1, LUMPERROR}, // Grow - {"kc5b", false, 64, 0, NULL, 0, -1, LUMPERROR}, - {"kc5c", false, 64, 0, NULL, 0, -1, LUMPERROR}, - {"kc5d", false, 64, 0, NULL, 0, -1, LUMPERROR}, - {"kc5e", false, 64, 0, NULL, 0, -1, LUMPERROR}, - {"kc5f", false, 64, 0, NULL, 0, -1, LUMPERROR}, - {"kc60", false, 64, 0, NULL, 0, -1, LUMPERROR}, - {"kc61", false, 64, 0, NULL, 0, -1, LUMPERROR}, - {"kc62", false, 64, 0, NULL, 0, -1, LUMPERROR}, - {"kc63", false, 64, 0, NULL, 0, -1, LUMPERROR}, - {"kc64", false, 96, 0, NULL, 0, -1, LUMPERROR}, // SPB ambient - {"kc65", false, 64, 0, NULL, 0, -1, LUMPERROR}, - {"kc66", false, 64, 0, NULL, 0, -1, LUMPERROR}, - {"kc67", false, 64, 0, NULL, 0, -1, LUMPERROR}, - {"kc68", false, 64, 0, NULL, 0, -1, LUMPERROR}, - {"kc69", false, 64, 0, NULL, 0, -1, LUMPERROR}, - {"kc6b", false, 64, 0, NULL, 0, -1, LUMPERROR}, - {"kc6c", false, 64, 0, NULL, 0, -1, LUMPERROR}, - {"kc6d", false, 64, 0, NULL, 0, -1, LUMPERROR}, - {"kc6e", false, 64, 0, NULL, 0, -1, LUMPERROR}, + // Knuckles Chaotix sound + {"kc2a", false, 64, 0, NULL, 0, -1, LUMPERROR}, + {"kc2b", false, 64, 0, NULL, 0, -1, LUMPERROR}, + {"kc2c", false, 64, 0, NULL, 0, -1, LUMPERROR}, + {"kc2d", false, 64, 0, NULL, 0, -1, LUMPERROR}, + {"kc2e", false, 96, 0, NULL, 0, -1, LUMPERROR}, // Item box gotten + {"kc2f", false, 96, 8, NULL, 0, -1, LUMPERROR}, // Spring pad + {"kc30", false, 64, 0, NULL, 0, -1, LUMPERROR}, + {"kc31", false, 64, 64, NULL, 0, -1, LUMPERROR}, // NO CONTEST explosion + {"kc32", false, 64, 0, NULL, 0, -1, LUMPERROR}, + {"kc33", false, 64, 0, NULL, 0, -1, LUMPERROR}, + {"kc34", false, 64, 0, NULL, 0, -1, LUMPERROR}, + {"kc35", false, 64, 0, NULL, 0, -1, LUMPERROR}, + {"kc36", false, 64, 0, NULL, 0, -1, LUMPERROR}, + {"kc37", false, 64, 0, NULL, 0, -1, LUMPERROR}, + {"kc38", false, 64, 0, NULL, 0, -1, LUMPERROR}, + {"kc39", false, 64, 0, NULL, 0, -1, LUMPERROR}, // Voting roulette + {"kc3a", false, 64, 0, NULL, 0, -1, LUMPERROR}, + {"kc3b", false, 64, 0, NULL, 0, -1, LUMPERROR}, + {"kc3c", false, 64, 0, NULL, 0, -1, LUMPERROR}, + {"kc3d", false, 64, 0, NULL, 0, -1, LUMPERROR}, + {"kc3e", false, 64, 0, NULL, 0, -1, LUMPERROR}, + {"kc3f", false, 64, 0, NULL, 0, -1, LUMPERROR}, + {"kc40", false, 64, 0, NULL, 0, -1, LUMPERROR}, + {"kc41", false, 64, 0, NULL, 0, -1, LUMPERROR}, + {"kc42", false, 64, 0, NULL, 0, -1, LUMPERROR}, // Unlock everything cheat + {"kc43", false, 64, 0, NULL, 0, -1, LUMPERROR}, + {"kc44", false, 64, 0, NULL, 0, -1, LUMPERROR}, + {"kc45", false, 64, 0, NULL, 0, -1, LUMPERROR}, + {"kc46", false, 96, 8, NULL, 0, -1, LUMPERROR}, // Shrink use + {"kc47", false, 64, 0, NULL, 0, -1, LUMPERROR}, + {"kc48", false, 64, 0, NULL, 0, -1, LUMPERROR}, // Vote picked + {"kc49", false, 64, 0, NULL, 0, -1, LUMPERROR}, + {"kc4a", false, 64, 0, NULL, 0, -1, LUMPERROR}, // Voting beep + {"kc4b", false, 64, 0, NULL, 0, -1, LUMPERROR}, + {"kc4c", false, 64, 0, NULL, 0, -1, LUMPERROR}, + {"kc4d", false, 64, 0, NULL, 0, -1, LUMPERROR}, + {"kc4e", false, 64, 0, NULL, 0, -1, LUMPERROR}, + {"kc4f", false, 64, 0, NULL, 0, -1, LUMPERROR}, + {"kc50", false, 64, 0, NULL, 0, -1, LUMPERROR}, + {"kc51", false, 64, 64, NULL, 0, -1, LUMPERROR}, // NO CONTEST debris ambience + {"kc52", false, 64, 0, NULL, 0, -1, LUMPERROR}, + {"kc53", false, 64, 0, NULL, 0, -1, LUMPERROR}, + {"kc54", false, 64, 0, NULL, 0, -1, LUMPERROR}, + {"kc55", false, 64, 0, NULL, 0, -1, LUMPERROR}, + {"kc56", false, 64, 0, NULL, 0, -1, LUMPERROR}, + {"kc57", false, 128, 8, NULL, 0, -1, LUMPERROR}, // SPB locked in + {"kc58", false, 64, 0, NULL, 0, -1, LUMPERROR}, + {"kc59", false, 128, 8, NULL, 0, -1, LUMPERROR}, // Shrink + {"kc5a", false, 128, 8, NULL, 0, -1, LUMPERROR}, // Grow + {"kc5b", false, 64, 0, NULL, 0, -1, LUMPERROR}, + {"kc5c", false, 64, 0, NULL, 0, -1, LUMPERROR}, + {"kc5d", false, 64, 0, NULL, 0, -1, LUMPERROR}, + {"kc5e", false, 64, 0, NULL, 0, -1, LUMPERROR}, + {"kc5f", false, 64, 0, NULL, 0, -1, LUMPERROR}, + {"kc60", false, 64, 0, NULL, 0, -1, LUMPERROR}, + {"kc61", false, 64, 0, NULL, 0, -1, LUMPERROR}, + {"kc62", false, 64, 0, NULL, 0, -1, LUMPERROR}, + {"kc63", false, 64, 0, NULL, 0, -1, LUMPERROR}, + {"kc64", false, 96, 0, NULL, 0, -1, LUMPERROR}, // SPB ambient + {"kc65", false, 64, 0, NULL, 0, -1, LUMPERROR}, + {"kc66", false, 64, 0, NULL, 0, -1, LUMPERROR}, + {"kc67", false, 64, 0, NULL, 0, -1, LUMPERROR}, + {"kc68", false, 64, 0, NULL, 0, -1, LUMPERROR}, + {"kc69", false, 64, 0, NULL, 0, -1, LUMPERROR}, + {"kc6b", false, 64, 0, NULL, 0, -1, LUMPERROR}, + {"kc6c", false, 64, 0, NULL, 0, -1, LUMPERROR}, + {"kc6d", false, 64, 0, NULL, 0, -1, LUMPERROR}, + {"kc6e", false, 64, 0, NULL, 0, -1, LUMPERROR}, - // SRB2kart - {"slip", false, 96, 0, NULL, 0, -1, LUMPERROR}, // Spinout - {"screec", false, 48, 0, NULL, 0, -1, LUMPERROR}, // Tight turning screech - {"drift", false, 48, 0, NULL, 0, -1, LUMPERROR}, // Drifting ambient - {"ruburn", false, 48, 0, NULL, 0, -1, LUMPERROR}, // Rubber-burn turn ambient - {"ddash", false, 64, 0, NULL, 0, -1, LUMPERROR}, // Respawn Drop Dash - {"tossed", false, 192, 8, NULL, 0, -1, LUMPERROR}, // Item fired - {"itpick", false, 128, 8, NULL, 0, -1, LUMPERROR}, // Pick up HUD drop - {"peel", false, 96, 0, NULL, 0, -1, LUMPERROR}, // Edited S25A for banana landing - {"hogbom", false, 96, 8, NULL, 0, -1, LUMPERROR}, // Ballhog explosions - {"zio3", false, 128, 8, NULL, 0, -1, LUMPERROR}, // Thunder Shield use - {"kpogos", false, 96, 8, NULL, 0, -1, LUMPERROR}, // Pogo Spring use - {"alarmi", false, 255, 8, NULL, 0, -1, LUMPERROR}, // Invincibility alarm - {"alarmg", false, 255, 8, NULL, 0, -1, LUMPERROR}, // Grow alarm - {"kinvnc", false, 255, 8, NULL, 0, -1, LUMPERROR}, // Invincibility music - {"kgrow", false, 255, 8, NULL, 0, -1, LUMPERROR}, // Grow music - {"itrol1", true, 96, 0, NULL, 0, -1, LUMPERROR}, // Roulette spinning - {"itrol2", true, 96, 0, NULL, 0, -1, LUMPERROR}, - {"itrol3", true, 96, 0, NULL, 0, -1, LUMPERROR}, - {"itrol4", true, 96, 0, NULL, 0, -1, LUMPERROR}, - {"itrol5", true, 96, 0, NULL, 0, -1, LUMPERROR}, - {"itrol6", true, 96, 0, NULL, 0, -1, LUMPERROR}, - {"itrol7", true, 96, 0, NULL, 0, -1, LUMPERROR}, - {"itrol8", true, 96, 0, NULL, 0, -1, LUMPERROR}, - {"itrolf", true, 96, 0, NULL, 0, -1, LUMPERROR}, // Roulette end - {"itrolm", true, 96, 0, NULL, 0, -1, LUMPERROR}, // Roulette end (mashed) - {"itrolk", true, 96, 0, NULL, 0, -1, LUMPERROR}, // Roulette end (karma enhanced) - {"itrole", true, 96, 0, NULL, 0, -1, LUMPERROR}, // Roulette end (Eggman) - {"vroom", false, 64, 0, NULL, 0, -1, LUMPERROR}, // Kart Krew opening vroom - {"chaooo", false, 64, 0, NULL, 0, -1, LUMPERROR}, // Chao audience cheer - {"yeeeah", false, 64, 0, NULL, 0, -1, LUMPERROR}, // Voting picks you - {"noooo1", false, 64, 0, NULL, 0, -1, LUMPERROR}, // Voting picks hell (by chance) - {"noooo2", false, 64, 0, NULL, 0, -1, LUMPERROR}, // Voting picks hell (on purpose) - {"ruby1", false, 64, 0, NULL, 0, -1, LUMPERROR}, // Phantom Ruby charge up - {"ruby2", false, 64, 0, NULL, 0, -1, LUMPERROR}, // Phantom Ruby teleport - {"tcart", false, 64, 0, NULL, 0, -1, LUMPERROR}, // Twinkle Cart - {"bfare", false, 128, 0, NULL, 0, -1, LUMPERROR}, // Pleasure Castle fanfare - {"merry", false, 64, 0, NULL, 0, -1, LUMPERROR}, // Pleasure Castle merry-go-round ambient - {"bowlh", false, 64, 0, NULL, 0, -1, LUMPERROR}, // Pleasure Castle pins - {"tppop", false, 64, 0, NULL, 0, -1, LUMPERROR}, // Pleasure Castle bombs - {"hsdoor", false, 64, 0, NULL, 0, -1, LUMPERROR}, // Red Barrage Area door - {"hstrn", false, 64, 0, NULL, 0, -1, LUMPERROR}, // Red Barrage Area train - {"aspkb", false, 64, 0, NULL, 0, -1, LUMPERROR}, // Red Barrage Area spikeballs - {"wind1", false, 64, 8, NULL, 0, -1, LUMPERROR}, // Midnight Channel monsters - {"fire2", false, 64, 8, NULL, 0, -1, LUMPERROR}, - {"chain", false, 255, 8, NULL, 0, -1, LUMPERROR}, // Mementos Reaper - {"mkuma", false, 96, 8, NULL, 0, -1, LUMPERROR}, // Trigger Happy Havoc Monokuma - {"toada", false, 64, 0, NULL, 0, -1, LUMPERROR}, // Arid Sands Toad scream - {"gemhit", false, 64, 0, NULL, 0, -1, LUMPERROR}, // Opulence gem/coin tumbling - {"wrink", false, 64, 0, NULL, 0, -1, LUMPERROR}, // Some sort of ghoulie? - {"bsnipe", false, 96, 8, NULL, 0, -1, LUMPERROR}, // Banana sniping - {"join", true, 96, 8, NULL, 0, -1, LUMPERROR}, // Player joined server - {"leave", true, 96, 8, NULL, 0, -1, LUMPERROR}, // Player left server - {"requst", true, 96, 8, NULL, 0, -1, LUMPERROR}, // Got a Discord join request - {"syfail", true, 96, 8, NULL, 0, -1, LUMPERROR}, // Funny sync failure - {"itfree", false, 64, 0, NULL, 0, -1, LUMPERROR}, // :shitsfree: - {"dbgsal", false, 255, 8, NULL, 0, -1, LUMPERROR}, // Debug notification + // SRB2kart + {"slip", false, 96, 0, NULL, 0, -1, LUMPERROR}, // Spinout + {"screec", false, 48, 0, NULL, 0, -1, LUMPERROR}, // Tight turning screech + {"drift", false, 48, 0, NULL, 0, -1, LUMPERROR}, // Drifting ambient + {"ruburn", false, 48, 0, NULL, 0, -1, LUMPERROR}, // Rubber-burn turn ambient + {"ddash", false, 64, 0, NULL, 0, -1, LUMPERROR}, // Respawn Drop Dash + {"tossed", false, 192, 8, NULL, 0, -1, LUMPERROR}, // Item fired + {"itpick", false, 128, 8, NULL, 0, -1, LUMPERROR}, // Pick up HUD drop + {"peel", false, 96, 0, NULL, 0, -1, LUMPERROR}, // Edited S25A for banana landing + {"hogbom", false, 96, 8, NULL, 0, -1, LUMPERROR}, // Ballhog explosions + {"zio3", false, 128, 8, NULL, 0, -1, LUMPERROR}, // Thunder Shield use + {"kpogos", false, 96, 8, NULL, 0, -1, LUMPERROR}, // Pogo Spring use + {"alarmi", false, 255, 8, NULL, 0, -1, LUMPERROR}, // Invincibility alarm + {"alarmg", false, 255, 8, NULL, 0, -1, LUMPERROR}, // Grow alarm + {"kinvnc", false, 255, 8, NULL, 0, -1, LUMPERROR}, // Invincibility music + {"kgrow", false, 255, 8, NULL, 0, -1, LUMPERROR}, // Grow music + {"itrol1", true, 96, 0, NULL, 0, -1, LUMPERROR}, // Roulette spinning + {"itrol2", true, 96, 0, NULL, 0, -1, LUMPERROR}, + {"itrol3", true, 96, 0, NULL, 0, -1, LUMPERROR}, + {"itrol4", true, 96, 0, NULL, 0, -1, LUMPERROR}, + {"itrol5", true, 96, 0, NULL, 0, -1, LUMPERROR}, + {"itrol6", true, 96, 0, NULL, 0, -1, LUMPERROR}, + {"itrol7", true, 96, 0, NULL, 0, -1, LUMPERROR}, + {"itrol8", true, 96, 0, NULL, 0, -1, LUMPERROR}, + {"itrolf", true, 96, 0, NULL, 0, -1, LUMPERROR}, // Roulette end + {"itrolm", true, 96, 0, NULL, 0, -1, LUMPERROR}, // Roulette end (mashed) + {"itrolk", true, 96, 0, NULL, 0, -1, LUMPERROR}, // Roulette end (karma enhanced) + {"itrole", true, 96, 0, NULL, 0, -1, LUMPERROR}, // Roulette end (Eggman) + {"vroom", false, 64, 0, NULL, 0, -1, LUMPERROR}, // Kart Krew opening vroom + {"chaooo", false, 64, 0, NULL, 0, -1, LUMPERROR}, // Chao audience cheer + {"yeeeah", false, 64, 0, NULL, 0, -1, LUMPERROR}, // Voting picks you + {"noooo1", false, 64, 0, NULL, 0, -1, LUMPERROR}, // Voting picks hell (by chance) + {"noooo2", false, 64, 0, NULL, 0, -1, LUMPERROR}, // Voting picks hell (on purpose) + {"ruby1", false, 64, 0, NULL, 0, -1, LUMPERROR}, // Phantom Ruby charge up + {"ruby2", false, 64, 0, NULL, 0, -1, LUMPERROR}, // Phantom Ruby teleport + {"tcart", false, 64, 0, NULL, 0, -1, LUMPERROR}, // Twinkle Cart + {"bfare", false, 128, 0, NULL, 0, -1, LUMPERROR}, // Pleasure Castle fanfare + {"merry", false, 64, 0, NULL, 0, -1, LUMPERROR}, // Pleasure Castle merry-go-round ambient + {"bowlh", false, 64, 0, NULL, 0, -1, LUMPERROR}, // Pleasure Castle pins + {"tppop", false, 64, 0, NULL, 0, -1, LUMPERROR}, // Pleasure Castle bombs + {"hsdoor", false, 64, 0, NULL, 0, -1, LUMPERROR}, // Red Barrage Area door + {"hstrn", false, 64, 0, NULL, 0, -1, LUMPERROR}, // Red Barrage Area train + {"aspkb", false, 64, 0, NULL, 0, -1, LUMPERROR}, // Red Barrage Area spikeballs + {"wind1", false, 64, 8, NULL, 0, -1, LUMPERROR}, // Midnight Channel monsters + {"fire2", false, 64, 8, NULL, 0, -1, LUMPERROR}, + {"chain", false, 255, 8, NULL, 0, -1, LUMPERROR}, // Mementos Reaper + {"mkuma", false, 96, 8, NULL, 0, -1, LUMPERROR}, // Trigger Happy Havoc Monokuma + {"toada", false, 64, 0, NULL, 0, -1, LUMPERROR}, // Arid Sands Toad scream + {"gemhit", false, 64, 0, NULL, 0, -1, LUMPERROR}, // Opulence gem/coin tumbling + {"wrink", false, 64, 0, NULL, 0, -1, LUMPERROR}, // Some sort of ghoulie? + {"bsnipe", false, 96, 8, NULL, 0, -1, LUMPERROR}, // Banana sniping + {"join", true, 96, 8, NULL, 0, -1, LUMPERROR}, // Player joined server + {"leave", true, 96, 8, NULL, 0, -1, LUMPERROR}, // Player left server + {"requst", true, 96, 8, NULL, 0, -1, LUMPERROR}, // Got a Discord join request + {"syfail", true, 96, 8, NULL, 0, -1, LUMPERROR}, // Funny sync failure + {"itfree", false, 64, 0, NULL, 0, -1, LUMPERROR}, // :shitsfree: + {"dbgsal", false, 255, 8, NULL, 0, -1, LUMPERROR}, // Debug notification - // SRB2Kart - Engine sounds - // Engine class A - {"krta00", false, 48, 65, NULL, 0, -1, LUMPERROR}, - {"krta01", false, 48, 65, NULL, 0, -1, LUMPERROR}, - {"krta02", false, 48, 65, NULL, 0, -1, LUMPERROR}, - {"krta03", false, 48, 65, NULL, 0, -1, LUMPERROR}, - {"krta04", false, 48, 65, NULL, 0, -1, LUMPERROR}, - {"krta05", false, 48, 65, NULL, 0, -1, LUMPERROR}, - {"krta06", false, 48, 65, NULL, 0, -1, LUMPERROR}, - {"krta07", false, 48, 65, NULL, 0, -1, LUMPERROR}, - {"krta08", false, 48, 65, NULL, 0, -1, LUMPERROR}, - {"krta09", false, 48, 65, NULL, 0, -1, LUMPERROR}, - {"krta10", false, 48, 65, NULL, 0, -1, LUMPERROR}, - {"krta11", false, 48, 65, NULL, 0, -1, LUMPERROR}, - {"krta12", false, 48, 65, NULL, 0, -1, LUMPERROR}, - // Engine class B - {"krtb00", false, 48, 65, NULL, 0, -1, LUMPERROR}, - {"krtb01", false, 48, 65, NULL, 0, -1, LUMPERROR}, - {"krtb02", false, 48, 65, NULL, 0, -1, LUMPERROR}, - {"krtb03", false, 48, 65, NULL, 0, -1, LUMPERROR}, - {"krtb04", false, 48, 65, NULL, 0, -1, LUMPERROR}, - {"krtb05", false, 48, 65, NULL, 0, -1, LUMPERROR}, - {"krtb06", false, 48, 65, NULL, 0, -1, LUMPERROR}, - {"krtb07", false, 48, 65, NULL, 0, -1, LUMPERROR}, - {"krtb08", false, 48, 65, NULL, 0, -1, LUMPERROR}, - {"krtb09", false, 48, 65, NULL, 0, -1, LUMPERROR}, - {"krtb10", false, 48, 65, NULL, 0, -1, LUMPERROR}, - {"krtb11", false, 48, 65, NULL, 0, -1, LUMPERROR}, - {"krtb12", false, 48, 65, NULL, 0, -1, LUMPERROR}, - // Engine class C - {"krtc00", false, 48, 65, NULL, 0, -1, LUMPERROR}, - {"krtc01", false, 48, 65, NULL, 0, -1, LUMPERROR}, - {"krtc02", false, 48, 65, NULL, 0, -1, LUMPERROR}, - {"krtc03", false, 48, 65, NULL, 0, -1, LUMPERROR}, - {"krtc04", false, 48, 65, NULL, 0, -1, LUMPERROR}, - {"krtc05", false, 48, 65, NULL, 0, -1, LUMPERROR}, - {"krtc06", false, 48, 65, NULL, 0, -1, LUMPERROR}, - {"krtc07", false, 48, 65, NULL, 0, -1, LUMPERROR}, - {"krtc08", false, 48, 65, NULL, 0, -1, LUMPERROR}, - {"krtc09", false, 48, 65, NULL, 0, -1, LUMPERROR}, - {"krtc10", false, 48, 65, NULL, 0, -1, LUMPERROR}, - {"krtc11", false, 48, 65, NULL, 0, -1, LUMPERROR}, - {"krtc12", false, 48, 65, NULL, 0, -1, LUMPERROR}, - // Engine class D - {"krtd00", false, 48, 65, NULL, 0, -1, LUMPERROR}, - {"krtd01", false, 48, 65, NULL, 0, -1, LUMPERROR}, - {"krtd02", false, 48, 65, NULL, 0, -1, LUMPERROR}, - {"krtd03", false, 48, 65, NULL, 0, -1, LUMPERROR}, - {"krtd04", false, 48, 65, NULL, 0, -1, LUMPERROR}, - {"krtd05", false, 48, 65, NULL, 0, -1, LUMPERROR}, - {"krtd06", false, 48, 65, NULL, 0, -1, LUMPERROR}, - {"krtd07", false, 48, 65, NULL, 0, -1, LUMPERROR}, - {"krtd08", false, 48, 65, NULL, 0, -1, LUMPERROR}, - {"krtd09", false, 48, 65, NULL, 0, -1, LUMPERROR}, - {"krtd10", false, 48, 65, NULL, 0, -1, LUMPERROR}, - {"krtd11", false, 48, 65, NULL, 0, -1, LUMPERROR}, - {"krtd12", false, 48, 65, NULL, 0, -1, LUMPERROR}, - // Engine class E - {"krte00", false, 48, 65, NULL, 0, -1, LUMPERROR}, - {"krte01", false, 48, 65, NULL, 0, -1, LUMPERROR}, - {"krte02", false, 48, 65, NULL, 0, -1, LUMPERROR}, - {"krte03", false, 48, 65, NULL, 0, -1, LUMPERROR}, - {"krte04", false, 48, 65, NULL, 0, -1, LUMPERROR}, - {"krte05", false, 48, 65, NULL, 0, -1, LUMPERROR}, - {"krte06", false, 48, 65, NULL, 0, -1, LUMPERROR}, - {"krte07", false, 48, 65, NULL, 0, -1, LUMPERROR}, - {"krte08", false, 48, 65, NULL, 0, -1, LUMPERROR}, - {"krte09", false, 48, 65, NULL, 0, -1, LUMPERROR}, - {"krte10", false, 48, 65, NULL, 0, -1, LUMPERROR}, - {"krte11", false, 48, 65, NULL, 0, -1, LUMPERROR}, - {"krte12", false, 48, 65, NULL, 0, -1, LUMPERROR}, - // Engine class F - {"krtf00", false, 48, 65, NULL, 0, -1, LUMPERROR}, - {"krtf01", false, 48, 65, NULL, 0, -1, LUMPERROR}, - {"krtf02", false, 48, 65, NULL, 0, -1, LUMPERROR}, - {"krtf03", false, 48, 65, NULL, 0, -1, LUMPERROR}, - {"krtf04", false, 48, 65, NULL, 0, -1, LUMPERROR}, - {"krtf05", false, 48, 65, NULL, 0, -1, LUMPERROR}, - {"krtf06", false, 48, 65, NULL, 0, -1, LUMPERROR}, - {"krtf07", false, 48, 65, NULL, 0, -1, LUMPERROR}, - {"krtf08", false, 48, 65, NULL, 0, -1, LUMPERROR}, - {"krtf09", false, 48, 65, NULL, 0, -1, LUMPERROR}, - {"krtf10", false, 48, 65, NULL, 0, -1, LUMPERROR}, - {"krtf11", false, 48, 65, NULL, 0, -1, LUMPERROR}, - {"krtf12", false, 48, 65, NULL, 0, -1, LUMPERROR}, - // Engine class G - {"krtg00", false, 48, 65, NULL, 0, -1, LUMPERROR}, - {"krtg01", false, 48, 65, NULL, 0, -1, LUMPERROR}, - {"krtg02", false, 48, 65, NULL, 0, -1, LUMPERROR}, - {"krtg03", false, 48, 65, NULL, 0, -1, LUMPERROR}, - {"krtg04", false, 48, 65, NULL, 0, -1, LUMPERROR}, - {"krtg05", false, 48, 65, NULL, 0, -1, LUMPERROR}, - {"krtg06", false, 48, 65, NULL, 0, -1, LUMPERROR}, - {"krtg07", false, 48, 65, NULL, 0, -1, LUMPERROR}, - {"krtg08", false, 48, 65, NULL, 0, -1, LUMPERROR}, - {"krtg09", false, 48, 65, NULL, 0, -1, LUMPERROR}, - {"krtg10", false, 48, 65, NULL, 0, -1, LUMPERROR}, - {"krtg11", false, 48, 65, NULL, 0, -1, LUMPERROR}, - {"krtg12", false, 48, 65, NULL, 0, -1, LUMPERROR}, - // Engine class H - {"krth00", false, 48, 65, NULL, 0, -1, LUMPERROR}, - {"krth01", false, 48, 65, NULL, 0, -1, LUMPERROR}, - {"krth02", false, 48, 65, NULL, 0, -1, LUMPERROR}, - {"krth03", false, 48, 65, NULL, 0, -1, LUMPERROR}, - {"krth04", false, 48, 65, NULL, 0, -1, LUMPERROR}, - {"krth05", false, 48, 65, NULL, 0, -1, LUMPERROR}, - {"krth06", false, 48, 65, NULL, 0, -1, LUMPERROR}, - {"krth07", false, 48, 65, NULL, 0, -1, LUMPERROR}, - {"krth08", false, 48, 65, NULL, 0, -1, LUMPERROR}, - {"krth09", false, 48, 65, NULL, 0, -1, LUMPERROR}, - {"krth10", false, 48, 65, NULL, 0, -1, LUMPERROR}, - {"krth11", false, 48, 65, NULL, 0, -1, LUMPERROR}, - {"krth12", false, 48, 65, NULL, 0, -1, LUMPERROR}, - // Engine class I - {"krti00", false, 48, 65, NULL, 0, -1, LUMPERROR}, - {"krti01", false, 48, 65, NULL, 0, -1, LUMPERROR}, - {"krti02", false, 48, 65, NULL, 0, -1, LUMPERROR}, - {"krti03", false, 48, 65, NULL, 0, -1, LUMPERROR}, - {"krti04", false, 48, 65, NULL, 0, -1, LUMPERROR}, - {"krti05", false, 48, 65, NULL, 0, -1, LUMPERROR}, - {"krti06", false, 48, 65, NULL, 0, -1, LUMPERROR}, - {"krti07", false, 48, 65, NULL, 0, -1, LUMPERROR}, - {"krti08", false, 48, 65, NULL, 0, -1, LUMPERROR}, - {"krti09", false, 48, 65, NULL, 0, -1, LUMPERROR}, - {"krti10", false, 48, 65, NULL, 0, -1, LUMPERROR}, - {"krti11", false, 48, 65, NULL, 0, -1, LUMPERROR}, - {"krti12", false, 48, 65, NULL, 0, -1, LUMPERROR}, + // SRB2Kart - Engine sounds + // Engine class A + {"krta00", false, 48, 65, NULL, 0, -1, LUMPERROR}, + {"krta01", false, 48, 65, NULL, 0, -1, LUMPERROR}, + {"krta02", false, 48, 65, NULL, 0, -1, LUMPERROR}, + {"krta03", false, 48, 65, NULL, 0, -1, LUMPERROR}, + {"krta04", false, 48, 65, NULL, 0, -1, LUMPERROR}, + {"krta05", false, 48, 65, NULL, 0, -1, LUMPERROR}, + {"krta06", false, 48, 65, NULL, 0, -1, LUMPERROR}, + {"krta07", false, 48, 65, NULL, 0, -1, LUMPERROR}, + {"krta08", false, 48, 65, NULL, 0, -1, LUMPERROR}, + {"krta09", false, 48, 65, NULL, 0, -1, LUMPERROR}, + {"krta10", false, 48, 65, NULL, 0, -1, LUMPERROR}, + {"krta11", false, 48, 65, NULL, 0, -1, LUMPERROR}, + {"krta12", false, 48, 65, NULL, 0, -1, LUMPERROR}, + // Engine class B + {"krtb00", false, 48, 65, NULL, 0, -1, LUMPERROR}, + {"krtb01", false, 48, 65, NULL, 0, -1, LUMPERROR}, + {"krtb02", false, 48, 65, NULL, 0, -1, LUMPERROR}, + {"krtb03", false, 48, 65, NULL, 0, -1, LUMPERROR}, + {"krtb04", false, 48, 65, NULL, 0, -1, LUMPERROR}, + {"krtb05", false, 48, 65, NULL, 0, -1, LUMPERROR}, + {"krtb06", false, 48, 65, NULL, 0, -1, LUMPERROR}, + {"krtb07", false, 48, 65, NULL, 0, -1, LUMPERROR}, + {"krtb08", false, 48, 65, NULL, 0, -1, LUMPERROR}, + {"krtb09", false, 48, 65, NULL, 0, -1, LUMPERROR}, + {"krtb10", false, 48, 65, NULL, 0, -1, LUMPERROR}, + {"krtb11", false, 48, 65, NULL, 0, -1, LUMPERROR}, + {"krtb12", false, 48, 65, NULL, 0, -1, LUMPERROR}, + // Engine class C + {"krtc00", false, 48, 65, NULL, 0, -1, LUMPERROR}, + {"krtc01", false, 48, 65, NULL, 0, -1, LUMPERROR}, + {"krtc02", false, 48, 65, NULL, 0, -1, LUMPERROR}, + {"krtc03", false, 48, 65, NULL, 0, -1, LUMPERROR}, + {"krtc04", false, 48, 65, NULL, 0, -1, LUMPERROR}, + {"krtc05", false, 48, 65, NULL, 0, -1, LUMPERROR}, + {"krtc06", false, 48, 65, NULL, 0, -1, LUMPERROR}, + {"krtc07", false, 48, 65, NULL, 0, -1, LUMPERROR}, + {"krtc08", false, 48, 65, NULL, 0, -1, LUMPERROR}, + {"krtc09", false, 48, 65, NULL, 0, -1, LUMPERROR}, + {"krtc10", false, 48, 65, NULL, 0, -1, LUMPERROR}, + {"krtc11", false, 48, 65, NULL, 0, -1, LUMPERROR}, + {"krtc12", false, 48, 65, NULL, 0, -1, LUMPERROR}, + // Engine class D + {"krtd00", false, 48, 65, NULL, 0, -1, LUMPERROR}, + {"krtd01", false, 48, 65, NULL, 0, -1, LUMPERROR}, + {"krtd02", false, 48, 65, NULL, 0, -1, LUMPERROR}, + {"krtd03", false, 48, 65, NULL, 0, -1, LUMPERROR}, + {"krtd04", false, 48, 65, NULL, 0, -1, LUMPERROR}, + {"krtd05", false, 48, 65, NULL, 0, -1, LUMPERROR}, + {"krtd06", false, 48, 65, NULL, 0, -1, LUMPERROR}, + {"krtd07", false, 48, 65, NULL, 0, -1, LUMPERROR}, + {"krtd08", false, 48, 65, NULL, 0, -1, LUMPERROR}, + {"krtd09", false, 48, 65, NULL, 0, -1, LUMPERROR}, + {"krtd10", false, 48, 65, NULL, 0, -1, LUMPERROR}, + {"krtd11", false, 48, 65, NULL, 0, -1, LUMPERROR}, + {"krtd12", false, 48, 65, NULL, 0, -1, LUMPERROR}, + // Engine class E + {"krte00", false, 48, 65, NULL, 0, -1, LUMPERROR}, + {"krte01", false, 48, 65, NULL, 0, -1, LUMPERROR}, + {"krte02", false, 48, 65, NULL, 0, -1, LUMPERROR}, + {"krte03", false, 48, 65, NULL, 0, -1, LUMPERROR}, + {"krte04", false, 48, 65, NULL, 0, -1, LUMPERROR}, + {"krte05", false, 48, 65, NULL, 0, -1, LUMPERROR}, + {"krte06", false, 48, 65, NULL, 0, -1, LUMPERROR}, + {"krte07", false, 48, 65, NULL, 0, -1, LUMPERROR}, + {"krte08", false, 48, 65, NULL, 0, -1, LUMPERROR}, + {"krte09", false, 48, 65, NULL, 0, -1, LUMPERROR}, + {"krte10", false, 48, 65, NULL, 0, -1, LUMPERROR}, + {"krte11", false, 48, 65, NULL, 0, -1, LUMPERROR}, + {"krte12", false, 48, 65, NULL, 0, -1, LUMPERROR}, + // Engine class F + {"krtf00", false, 48, 65, NULL, 0, -1, LUMPERROR}, + {"krtf01", false, 48, 65, NULL, 0, -1, LUMPERROR}, + {"krtf02", false, 48, 65, NULL, 0, -1, LUMPERROR}, + {"krtf03", false, 48, 65, NULL, 0, -1, LUMPERROR}, + {"krtf04", false, 48, 65, NULL, 0, -1, LUMPERROR}, + {"krtf05", false, 48, 65, NULL, 0, -1, LUMPERROR}, + {"krtf06", false, 48, 65, NULL, 0, -1, LUMPERROR}, + {"krtf07", false, 48, 65, NULL, 0, -1, LUMPERROR}, + {"krtf08", false, 48, 65, NULL, 0, -1, LUMPERROR}, + {"krtf09", false, 48, 65, NULL, 0, -1, LUMPERROR}, + {"krtf10", false, 48, 65, NULL, 0, -1, LUMPERROR}, + {"krtf11", false, 48, 65, NULL, 0, -1, LUMPERROR}, + {"krtf12", false, 48, 65, NULL, 0, -1, LUMPERROR}, + // Engine class G + {"krtg00", false, 48, 65, NULL, 0, -1, LUMPERROR}, + {"krtg01", false, 48, 65, NULL, 0, -1, LUMPERROR}, + {"krtg02", false, 48, 65, NULL, 0, -1, LUMPERROR}, + {"krtg03", false, 48, 65, NULL, 0, -1, LUMPERROR}, + {"krtg04", false, 48, 65, NULL, 0, -1, LUMPERROR}, + {"krtg05", false, 48, 65, NULL, 0, -1, LUMPERROR}, + {"krtg06", false, 48, 65, NULL, 0, -1, LUMPERROR}, + {"krtg07", false, 48, 65, NULL, 0, -1, LUMPERROR}, + {"krtg08", false, 48, 65, NULL, 0, -1, LUMPERROR}, + {"krtg09", false, 48, 65, NULL, 0, -1, LUMPERROR}, + {"krtg10", false, 48, 65, NULL, 0, -1, LUMPERROR}, + {"krtg11", false, 48, 65, NULL, 0, -1, LUMPERROR}, + {"krtg12", false, 48, 65, NULL, 0, -1, LUMPERROR}, + // Engine class H + {"krth00", false, 48, 65, NULL, 0, -1, LUMPERROR}, + {"krth01", false, 48, 65, NULL, 0, -1, LUMPERROR}, + {"krth02", false, 48, 65, NULL, 0, -1, LUMPERROR}, + {"krth03", false, 48, 65, NULL, 0, -1, LUMPERROR}, + {"krth04", false, 48, 65, NULL, 0, -1, LUMPERROR}, + {"krth05", false, 48, 65, NULL, 0, -1, LUMPERROR}, + {"krth06", false, 48, 65, NULL, 0, -1, LUMPERROR}, + {"krth07", false, 48, 65, NULL, 0, -1, LUMPERROR}, + {"krth08", false, 48, 65, NULL, 0, -1, LUMPERROR}, + {"krth09", false, 48, 65, NULL, 0, -1, LUMPERROR}, + {"krth10", false, 48, 65, NULL, 0, -1, LUMPERROR}, + {"krth11", false, 48, 65, NULL, 0, -1, LUMPERROR}, + {"krth12", false, 48, 65, NULL, 0, -1, LUMPERROR}, + // Engine class I + {"krti00", false, 48, 65, NULL, 0, -1, LUMPERROR}, + {"krti01", false, 48, 65, NULL, 0, -1, LUMPERROR}, + {"krti02", false, 48, 65, NULL, 0, -1, LUMPERROR}, + {"krti03", false, 48, 65, NULL, 0, -1, LUMPERROR}, + {"krti04", false, 48, 65, NULL, 0, -1, LUMPERROR}, + {"krti05", false, 48, 65, NULL, 0, -1, LUMPERROR}, + {"krti06", false, 48, 65, NULL, 0, -1, LUMPERROR}, + {"krti07", false, 48, 65, NULL, 0, -1, LUMPERROR}, + {"krti08", false, 48, 65, NULL, 0, -1, LUMPERROR}, + {"krti09", false, 48, 65, NULL, 0, -1, LUMPERROR}, + {"krti10", false, 48, 65, NULL, 0, -1, LUMPERROR}, + {"krti11", false, 48, 65, NULL, 0, -1, LUMPERROR}, + {"krti12", false, 48, 65, NULL, 0, -1, LUMPERROR}, - // SRB2kart - Skin sounds - {"kwin", false, 64, 96, NULL, 0, SKSKWIN, LUMPERROR}, - {"klose", false, 64, 96, NULL, 0, SKSKLOSE, LUMPERROR}, - {"khurt1", false, 64, 96, NULL, 0, SKSKPAN1, LUMPERROR}, - {"khurt2", false, 64, 96, NULL, 0, SKSKPAN2, LUMPERROR}, - {"kattk1", false, 64, 96, NULL, 0, SKSKATK1, LUMPERROR}, - {"kattk2", false, 64, 96, NULL, 0, SKSKATK2, LUMPERROR}, - {"kbost1", false, 64, 96, NULL, 0, SKSKBST1, LUMPERROR}, - {"kbost2", false, 64, 96, NULL, 0, SKSKBST2, LUMPERROR}, - {"kslow", false, 64, 32, NULL, 0, SKSKSLOW, LUMPERROR}, - {"khitem", false, 128, 32, NULL, 0, SKSKHITM, LUMPERROR}, - {"kgloat", false, 64, 48, NULL, 0, SKSKPOWR, LUMPERROR}, + // SRB2kart - Skin sounds + {"kwin", false, 64, 96, NULL, 0, SKSKWIN, LUMPERROR}, + {"klose", false, 64, 96, NULL, 0, SKSKLOSE, LUMPERROR}, + {"khurt1", false, 64, 96, NULL, 0, SKSKPAN1, LUMPERROR}, + {"khurt2", false, 64, 96, NULL, 0, SKSKPAN2, LUMPERROR}, + {"kattk1", false, 64, 96, NULL, 0, SKSKATK1, LUMPERROR}, + {"kattk2", false, 64, 96, NULL, 0, SKSKATK2, LUMPERROR}, + {"kbost1", false, 64, 96, NULL, 0, SKSKBST1, LUMPERROR}, + {"kbost2", false, 64, 96, NULL, 0, SKSKBST2, LUMPERROR}, + {"kslow", false, 64, 32, NULL, 0, SKSKSLOW, LUMPERROR}, + {"khitem", false, 128, 32, NULL, 0, SKSKHITM, LUMPERROR}, + {"kgloat", false, 64, 48, NULL, 0, SKSKPOWR, LUMPERROR}, - // skin sounds free slots to add sounds at run time (Boris HACK!!!) - // initialized to NULL + // skin sounds free slots to add sounds at run time (Boris HACK!!!) + // initialized to NULL }; -char freeslotnames[sfx_freeslot0 + NUMSFXFREESLOTS + NUMSKINSFXSLOTS][7] = {}; +static char freeslotnames[sfx_freeslot0 + NUMSFXFREESLOTS + NUMSKINSFXSLOTS][MAXSOUNDNAME] = {}; // Prepare free sfx slots to add sfx at run time -void S_InitRuntimeSounds (void) +void S_InitRuntimeSounds(void) { sfxenum_t i; INT32 value; - char soundname[10]; for (i = sfx_freeslot0; i <= sfx_lastskinsoundslot; i++) { value = (i+1) - sfx_freeslot0; - if (value < 10) - sprintf(soundname, "fre00%d", value); - else if (value < 100) - sprintf(soundname, "fre0%d", value); - else if (value < 1000) - sprintf(soundname, "fre%d", value); - else - sprintf(soundname, "fr%d", value); + // can happen if skinlimit is too high, then this would truncate + I_Assert(value <= 0xffff); - strcpy(freeslotnames[value-1], soundname); + snprintf(freeslotnames[value-1], MAXSOUNDNAME, "fr%04x", value); S_sfx[i].name = freeslotnames[value-1]; S_sfx[i].singularity = false; S_sfx[i].priority = 0; S_sfx[i].pitch = 0; S_sfx[i].data = NULL; - S_sfx[i].length = 0; + S_sfx[i].length = 0; S_sfx[i].skinsound = -1; S_sfx[i].lumpnum = LUMPERROR; } @@ -1018,18 +1010,19 @@ sfxenum_t S_AddSoundFx(const char *name, boolean singular, INT32 flags, boolean else slot = sfx_freeslot0; - const int precache = S_CacheSound(); + const int precache = S_CacheSound(); for (i = slot; i < NUMSFX; i++) { if (!S_sfx[i].priority) { - strncpy(freeslotnames[i-sfx_freeslot0], name, 6); + snprintf(freeslotnames[i - sfx_freeslot0], MAXSOUNDNAME, "%s", name); + S_sfx[i].singularity = singular; S_sfx[i].priority = 60; S_sfx[i].pitch = flags; S_sfx[i].lumpnum = LUMPERROR; - S_sfx[i].length = 0; + S_sfx[i].length = 0; S_sfx[i].skinsound = -1; if (precache == SOUNDCACHE_PRECACHE) @@ -1040,6 +1033,7 @@ sfxenum_t S_AddSoundFx(const char *name, boolean singular, INT32 flags, boolean return i; } } + I_Error("Out of Sound Freeslots while allocating \"%s\"\nLoad less addons to fix this.", name); return 0; } diff --git a/src/sounds.h b/src/sounds.h index ea530da05..a8522f1c6 100644 --- a/src/sounds.h +++ b/src/sounds.h @@ -59,6 +59,8 @@ typedef enum #define NUMSFXFREESLOTS 1600 // Matches SOC Editor. #define NUMSKINSFXSLOTS (MAXSKINS*NUMSKINSOUNDS) +#define MAXSOUNDNAME 7 + // // SoundFX struct. // diff --git a/src/st_stuff.c b/src/st_stuff.c index 57a7c6e29..c8bdd5d51 100644 --- a/src/st_stuff.c +++ b/src/st_stuff.c @@ -14,6 +14,7 @@ /// Does palette indicators as well (red pain/berserk, bright pickup) #include "doomdef.h" +#include "d_main.h" #include "g_game.h" #include "g_input.h" #include "k_director.h" @@ -172,7 +173,8 @@ INT32 st_palette = 0; void ST_ResetPaletteStuff(void) { st_palette = 0; - V_SetPalette(0); + if (loaded_config) + V_SetPalette(0); } static void ST_doPaletteStuff(void) diff --git a/src/v_video.c b/src/v_video.c index 585478c3a..5c98d8e52 100644 --- a/src/v_video.c +++ b/src/v_video.c @@ -581,13 +581,19 @@ const char *GetPalette(void) if (user && user[0]) { - if (W_CheckNumForName(user) == LUMPERROR) + const lumpnum_t palnum = W_CheckNumForName(user); + + if (palnum == LUMPERROR) { CONS_Alert(CONS_WARNING, "cv_palette %s lump does not exist\n", user); } + else if (W_LumpLength(palnum) % (256 * 3) != 0) // not divisable by 768, so most def not a valid palette, idk if theres a better way to check this + { + CONS_Alert(CONS_WARNING, "cv_palette %s is not a valid palette lump\n", user); + } else { - return cv_palette.string; + return user; } } @@ -609,15 +615,16 @@ void V_ReloadPalette(void) void V_SetPalette(INT32 palettenum) { RGBA_t *pal = NULL; + if (!pLocalPalette) V_ReloadPalette(); -#ifdef HWRENDER - if (rendermode == render_soft || - (rendermode == render_opengl && HWR_ShouldUsePaletteRendering())) // opengl without paletterendering hates subpalettes -#endif + if (palettenum == 0) { - if (palettenum == 0) +#ifdef HWRENDER + if (rendermode == render_soft || + (rendermode == render_opengl && HWR_ShouldUsePaletteRendering())) // opengl without paletterendering hates subpalettes +#endif { palettenum = cv_palettenum.value; } @@ -676,6 +683,7 @@ static void CV_palette_OnChange(void) { if (!loaded_config) return; + // reload palette // recalculate Color Cube V_ReloadPalette(); @@ -1563,8 +1571,8 @@ void V_DrawFillConsoleMap(INT32 x, INT32 y, INT32 w, INT32 h, INT32 c) { // mpc 12-04-2018 const UINT8 *fadetable = ((UINT8 *)transtables + ((alphalevel-1)<y) ? y : x - w = clip(w,vid.width); - h = clip(h,vid.height); + w = clip(w, vid.width); + h = clip(h, vid.height); #undef clip for (v = 0; v < h; v++, dest += vid.width) { @@ -2203,6 +2211,7 @@ void V_DrawString(INT32 x, INT32 y, INT32 option, const char *string) { if (!*ch) break; + if (*ch & 0x80) //color parsing -x 2.16.09 { // manually set flags override color codes @@ -2213,6 +2222,7 @@ void V_DrawString(INT32 x, INT32 y, INT32 option, const char *string) } continue; } + if (*ch == '\n') { cx = x; @@ -2247,6 +2257,7 @@ void V_DrawString(INT32 x, INT32 y, INT32 option, const char *string) if (cx > scrwidth) break; + if (cx+left + w < 0) //left boundary check { cx += w; @@ -2304,6 +2315,7 @@ void V_DrawKartString(INT32 x, INT32 y, INT32 option, const char *string) { if (!*ch) break; + if (*ch & 0x80) //color parsing -x 2.16.09 { // manually set flags override color codes @@ -2314,6 +2326,7 @@ void V_DrawKartString(INT32 x, INT32 y, INT32 option, const char *string) } continue; } + if (*ch == '\n') { cx = x; @@ -2348,6 +2361,7 @@ void V_DrawKartString(INT32 x, INT32 y, INT32 option, const char *string) if (cx > scrwidth) break; + if (cx+left + w < 0) //left boundary check { cx += w; @@ -2422,6 +2436,7 @@ void V_DrawSmallString(INT32 x, INT32 y, INT32 option, const char *string) { if (!*ch) break; + if (*ch & 0x80) //color parsing -x 2.16.09 { // manually set flags override color codes @@ -2432,6 +2447,7 @@ void V_DrawSmallString(INT32 x, INT32 y, INT32 option, const char *string) } continue; } + if (*ch == '\n') { cx = x; @@ -2540,6 +2556,7 @@ void V_DrawThinString(INT32 x, INT32 y, INT32 option, const char *string) { if (!*ch) break; + if (*ch & 0x80) //color parsing -x 2.16.09 { // manually set flags override color codes @@ -2550,6 +2567,7 @@ void V_DrawThinString(INT32 x, INT32 y, INT32 option, const char *string) } continue; } + if (*ch == '\n') { cx = x; @@ -2708,6 +2726,7 @@ void V_DrawSmallStringAtFixed(fixed_t x, fixed_t y, INT32 option, const char *st INT32 charflags = 0; const UINT8 *colormap = NULL; INT32 spacewidth = 2, charwidth = 0; + INT32 lowercase = (option & V_ALLOWLOWERCASE); option &= ~V_FLIP; // which is also shared with V_ALLOWLOWERCASE... @@ -2728,6 +2747,7 @@ void V_DrawSmallStringAtFixed(fixed_t x, fixed_t y, INT32 option, const char *st scrwidth *= vid.dup; charflags = (option & V_CHARCOLORMASK); + colormap = V_GetStringColormap(charflags); switch (option & V_SPACINGMASK) { @@ -2752,7 +2772,11 @@ void V_DrawSmallStringAtFixed(fixed_t x, fixed_t y, INT32 option, const char *st { // manually set flags override color codes if (!(option & V_CHARCOLORMASK)) + { charflags = ((*ch & 0x7f) << V_CHARCOLORSHIFT) & V_CHARCOLORMASK; + colormap = V_GetStringColormap(charflags); + } + continue; } @@ -2796,7 +2820,6 @@ void V_DrawSmallStringAtFixed(fixed_t x, fixed_t y, INT32 option, const char *st continue; } - colormap = V_GetStringColormap(charflags); V_DrawFixedPatch(cx + (center<name; + I_Assert(name != NULL); - if (strnlen(name, 8) == 5 && memcmp(name, "MAP", 3) == 0) + if (!name || CHECKMAPMARKER(name)) { numlumps--; // We skip map marker, so 1 of entries becomes empty continue; // This will skip i++ so we will write to same entry @@ -2686,9 +2742,7 @@ virtres_t* vres_GetMap(lumpnum_t lumpnum) // Play it safe with the name in this case. memcpy(vlumps[i].name, name, 8); vlumps[i].name[8] = '\0'; - vlumps[i].data = (UINT8 *)( - Z_Malloc(vlumps[i].size, PU_LEVEL, NULL) // This is memory inefficient, sorry about that. - ); + vlumps[i].data = (UINT8 *)(Z_Malloc(vlumps[i].size, PU_LEVEL, NULL)); // This is memory inefficient, sorry about that. memcpy(vlumps[i].data, wadData + LONG((fileinfo + realentry)->filepos), vlumps[i].size); i++; } @@ -2698,15 +2752,20 @@ virtres_t* vres_GetMap(lumpnum_t lumpnum) } else { - // Count number of lumps until the end of resource OR up until next "MAPXX" lump. + // Count number of lumps until the end of resource OR up until next 0-length lump OR up until next "MAPXX" lump. lumpnum_t lumppos = lumpnum + 1; for (i = LUMPNUM(lumppos); i < wadfiles[WADFILENUM(lumpnum)]->numlumps; i++, lumppos++, numlumps++) { - const char *name = W_CheckNameForNum(lumppos); - if (name == NULL) - continue; + if (W_LumpLength(lumppos) == 0) + { + break; + } - if (memcmp(name, "MAP", 3) == 0 || W_LumpLength(lumppos) == 0) + const char *name = W_CheckNameForNum(lumppos); + I_Assert(name != NULL); + + // if no name then theres no lump + if (!name || CHECKMAPMARKER(name)) { break; } @@ -2721,10 +2780,9 @@ virtres_t* vres_GetMap(lumpnum_t lumpnum) { // Check if it is map marker. It is not always first lump sadly, so we need to expect it anywhere const char *name = W_CheckNameForNum(lumpnum); - if (name == NULL) - continue; + I_Assert(name != NULL); - if (strlen(name) == 5 && memcmp(name, "MAP", 3) == 0) + if (!name || CHECKMAPMARKER(name)) { --i; // Decrement so on next iteration we write on same i, so we don't leave corrupted vlumps entry numlumps--; // Just so we don't try to access the leftover vlumps entry diff --git a/src/y_inter.c b/src/y_inter.c index 19b696b0e..a92392f39 100644 --- a/src/y_inter.c +++ b/src/y_inter.c @@ -586,7 +586,7 @@ void Y_Ticker(void) if (data.rankingsmode && intertic > sorttic+16+(2*TICRATE)) { - INT32 q=0,r=0; + INT32 q = 0, r = 0; boolean kaching = true; for (q = 0; q < data.numplayers; q++) diff --git a/src/z_zone.cpp b/src/z_zone.cpp index f25f99e43..f688dd831 100644 --- a/src/z_zone.cpp +++ b/src/z_zone.cpp @@ -114,6 +114,7 @@ void Z_Init(void) head.next = head.prev = &head; memfree = I_GetFreeMem(&total)>>20; + CONS_Printf("System memory: %sMB - Free: %sMB\n", sizeu1(total>>20), sizeu2(memfree)); // Note: This allocates memory. Watch out. @@ -745,6 +746,7 @@ static void Command_Memfree_f(void) CONS_Printf(M_GetText("HUD graphics : %7s KB\n"), sizeu1(Z_TagUsage(PU_HUDGFX)>>10)); CONS_Printf(M_GetText("Locked cache : %7s KB\n"), sizeu1(Z_TagUsage(PU_CACHE)>>10)); CONS_Printf(M_GetText("Level : %7s KB\n"), sizeu1(Z_TagUsage(PU_LEVEL)>>10)); + CONS_Printf(M_GetText("Level (pooled) : %7s KB\n"), sizeu1(Z_LevelPoolUsage()>>10)); CONS_Printf(M_GetText("Special thinker : %7s KB\n"), sizeu1(Z_TagUsage(PU_LEVSPEC)>>10)); CONS_Printf(M_GetText("All purgable : %7s KB\n"), sizeu1(Z_TagsUsage(PU_PURGELEVEL, INT32_MAX)>>10)); @@ -804,6 +806,14 @@ char *Z_StrDup(const char *s) return strcpy((char*)ZZ_Alloc(strlen(s) + 1), s); } +size_t Z_LevelPoolUsage(void) +{ + return g_level_large_pool.allocated_bytes() + + g_level_med_pool.allocated_bytes() + + g_level_small_pool.allocated_bytes() + + g_level_tiny_pool.allocated_bytes(); +} + void* Z_LevelPoolMalloc(size_t size) { void* p = nullptr; diff --git a/src/z_zone.h b/src/z_zone.h index 38f00c48c..847e47291 100644 --- a/src/z_zone.h +++ b/src/z_zone.h @@ -167,6 +167,7 @@ char *Z_StrDup(const char *in); // // Specialty allocation functions // +size_t Z_LevelPoolUsage(void); void *Z_LevelPoolMalloc(size_t size); void *Z_LevelPoolCalloc(size_t size); void Z_LevelPoolFree(void *p, size_t size);