Compare commits
2
Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
72288e2bae | ||
|
|
0e7460009e |
No files matched your search
+2
-2
@@ -257,7 +257,7 @@ set(SRB2_CONFIG_SATURNJOIN ON CACHE BOOL
|
|||||||
set(SRB2_CONFIG_SCREENFBO ON CACHE BOOL
|
set(SRB2_CONFIG_SCREENFBO ON CACHE BOOL
|
||||||
"Enable hardware renderer (OpenGL) FBO downsampling support")
|
"Enable hardware renderer (OpenGL) FBO downsampling support")
|
||||||
|
|
||||||
set(SRB2_CONFIG_PHOBOS OFF CACHE BOOL
|
set(SRB2_CONFIG_PHOBOS ON CACHE BOOL
|
||||||
" Compile the Phobos client. Which contains things not compatible with vanilla, such as raised skinlimits, 32 player support, bugfixes, etc.")
|
" Compile the Phobos client. Which contains things not compatible with vanilla, such as raised skinlimits, 32 player support, bugfixes, etc.")
|
||||||
|
|
||||||
if(${SRB2_CONFIG_DEDICATED})
|
if(${SRB2_CONFIG_DEDICATED})
|
||||||
@@ -586,7 +586,7 @@ if(${SRB2_CONFIG_SATURNJOIN})
|
|||||||
add_definitions(-DDOSATURNJOIN)
|
add_definitions(-DDOSATURNJOIN)
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
if(${SRB2_CONFIG_PHOBOS})
|
if(${SRB2_CONFIG_HWRENDER} AND ${SRB2_CONFIG_SCREENFBO})
|
||||||
add_definitions(-DPHOBOS_BUILD)
|
add_definitions(-DPHOBOS_BUILD)
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
|
|||||||
+2
-2
@@ -55,8 +55,8 @@ struct lua_longjmp {
|
|||||||
|
|
||||||
void luaD_seterrorobj (lua_State *L, int lerrcode, StkId oldtop) {
|
void luaD_seterrorobj (lua_State *L, int lerrcode, StkId oldtop) {
|
||||||
switch (lerrcode) {
|
switch (lerrcode) {
|
||||||
case LUA_ERRMEM: { /* memory error? */
|
case LUA_ERRMEM: {
|
||||||
setsvalue2s(L, oldtop, G(L)->memerrmsg); /* reuse preregistered msg. */
|
setsvalue2s(L, oldtop, luaS_newliteral(L, MEMERRMSG));
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
case LUA_ERRERR: {
|
case LUA_ERRERR: {
|
||||||
|
|||||||
@@ -13,6 +13,8 @@
|
|||||||
#include "llimits.h"
|
#include "llimits.h"
|
||||||
#include "lua.h"
|
#include "lua.h"
|
||||||
|
|
||||||
|
#define MEMERRMSG "not enough memory"
|
||||||
|
|
||||||
|
|
||||||
#define luaM_reallocv(L,b,on,n,e) \
|
#define luaM_reallocv(L,b,on,n,e) \
|
||||||
((cast(size_t, (n)+1) <= MAX_SIZET/(e)) ? /* +1 to avoid warnings */ \
|
((cast(size_t, (n)+1) <= MAX_SIZET/(e)) ? /* +1 to avoid warnings */ \
|
||||||
|
|||||||
+1
-6
@@ -64,9 +64,6 @@ static void freestack (lua_State *L, lua_State *L1) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
#define MEMERRMSG "not enough memory"
|
|
||||||
|
|
||||||
|
|
||||||
/*
|
/*
|
||||||
** open parts that may cause memory-allocation errors
|
** open parts that may cause memory-allocation errors
|
||||||
*/
|
*/
|
||||||
@@ -79,9 +76,7 @@ static void f_luaopen (lua_State *L, void *ud) {
|
|||||||
luaS_resize(L, MINSTRTABSIZE); /* initial size of string table */
|
luaS_resize(L, MINSTRTABSIZE); /* initial size of string table */
|
||||||
luaT_init(L);
|
luaT_init(L);
|
||||||
luaX_init(L);
|
luaX_init(L);
|
||||||
/* pre-create memory-error message */
|
luaS_fix(luaS_newliteral(L, MEMERRMSG));
|
||||||
g->memerrmsg = luaS_newliteral(L, MEMERRMSG);
|
|
||||||
luaS_fix(g->memerrmsg); /* it should never be collected */
|
|
||||||
g->GCthreshold = 4*g->totalbytes;
|
g->GCthreshold = 4*g->totalbytes;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -88,7 +88,6 @@ typedef struct global_State {
|
|||||||
lua_CFunction panic; /* to be called in unprotected errors */
|
lua_CFunction panic; /* to be called in unprotected errors */
|
||||||
TValue l_registry;
|
TValue l_registry;
|
||||||
struct lua_State *mainthread;
|
struct lua_State *mainthread;
|
||||||
TString *memerrmsg; /* memory-error message */
|
|
||||||
UpVal uvhead; /* head of double-linked list of all open upvalues */
|
UpVal uvhead; /* head of double-linked list of all open upvalues */
|
||||||
struct Table *mt[NUM_TAGS]; /* metatables for basic types */
|
struct Table *mt[NUM_TAGS]; /* metatables for basic types */
|
||||||
TString *tmname[TM_N]; /* array with tag-method names */
|
TString *tmname[TM_N]; /* array with tag-method names */
|
||||||
|
|||||||
@@ -149,30 +149,6 @@ void PoolAllocator::release()
|
|||||||
allocated_blocks_ = 0;
|
allocated_blocks_ = 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
bool PoolAllocator::ptrcheck(const void* p) const
|
|
||||||
{
|
|
||||||
const uintptr_t paddr = reinterpret_cast<uintptr_t>(p);
|
|
||||||
|
|
||||||
ChunkFooter* next = nullptr;
|
|
||||||
for (ChunkFooter* chunk = first_chunk_; chunk != nullptr; chunk = next)
|
|
||||||
{
|
|
||||||
const uintptr_t blockstart = reinterpret_cast<uintptr_t>(chunk->start);
|
|
||||||
const uintptr_t blockend = blockstart + blocks_ * block_size_;
|
|
||||||
|
|
||||||
//CONS_Printf("mobj ptr %lu, block start %lu end %lu\n", paddr, blockstart, blockend);
|
|
||||||
|
|
||||||
if (paddr >= blockstart && paddr < blockend)
|
|
||||||
{
|
|
||||||
return true;
|
|
||||||
}
|
|
||||||
|
|
||||||
next = chunk->next;
|
|
||||||
}
|
|
||||||
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
static LinearMemory g_frame_memory {4 * 1024 * 1024};
|
static LinearMemory g_frame_memory {4 * 1024 * 1024};
|
||||||
|
|
||||||
void* Z_Frame_Alloc(size_t size)
|
void* Z_Frame_Alloc(size_t size)
|
||||||
|
|||||||
@@ -65,7 +65,6 @@ public:
|
|||||||
constexpr size_t allocated_bytes() const noexcept { return allocated_blocks_ * block_size_; };
|
constexpr size_t allocated_bytes() const noexcept { return allocated_blocks_ * block_size_; };
|
||||||
|
|
||||||
void release();
|
void release();
|
||||||
bool ptrcheck(const void* p) const;
|
|
||||||
};
|
};
|
||||||
|
|
||||||
} // namespace srb2
|
} // namespace srb2
|
||||||
|
|||||||
+24
-45
@@ -1822,7 +1822,7 @@ static void SV_SendPlayerInfo(INT32 node)
|
|||||||
|
|
||||||
// Extra data
|
// Extra data
|
||||||
// Kart has extra skincolors, so we can't use this
|
// Kart has extra skincolors, so we can't use this
|
||||||
//netbuffer->u.playerinfo[i].data = 0;
|
//netbuffer->u.playerinfo[i].data = 0; //netbuffer->u.playerinfo[i].data = players[i].skincolor;
|
||||||
|
|
||||||
// well why not, we only got like 100 of these?
|
// well why not, we only got like 100 of these?
|
||||||
netbuffer->u.playerinfo[i].data = players[i].skincolor;
|
netbuffer->u.playerinfo[i].data = players[i].skincolor;
|
||||||
@@ -3347,7 +3347,6 @@ static void Command_connect(void)
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
// StarManiaKG: allow us to join servers from anywhere at any time //
|
|
||||||
if (Playing() || demo.title || demo.playback)
|
if (Playing() || demo.title || demo.playback)
|
||||||
{
|
{
|
||||||
if (demo.title || demo.playback)
|
if (demo.title || demo.playback)
|
||||||
@@ -3366,9 +3365,7 @@ static void Command_connect(void)
|
|||||||
D_StartTitle();
|
D_StartTitle();
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
|
||||||
M_ClearMenus(true); // close the menus
|
M_ClearMenus(true); // close the menus
|
||||||
}
|
|
||||||
|
|
||||||
// modified game check: no longer handled
|
// modified game check: no longer handled
|
||||||
// we don't request a restart unless the filelist differs
|
// we don't request a restart unless the filelist differs
|
||||||
@@ -3384,52 +3381,37 @@ static void Command_connect(void)
|
|||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
// Get the server node.
|
// used in menu to connect to a server in the list
|
||||||
if (netgame)
|
if (netgame && fasticmp(COM_Argv(1), "node"))
|
||||||
{
|
{
|
||||||
// used in menu to connect to a server in the list
|
servernode = (SINT8)atoi(COM_Argv(2));
|
||||||
if (fasticmp(COM_Argv(1), "node"))
|
|
||||||
{
|
|
||||||
servernode = (SINT8)atoi(COM_Argv(2));
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
D_QuitNetGame();
|
|
||||||
CL_Reset();
|
|
||||||
D_StartTitle();
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
else
|
else if (netgame)
|
||||||
{
|
{
|
||||||
// Standard behaviour
|
CONS_Printf(M_GetText("You cannot connect while in a game. End this game first.\n"));
|
||||||
if (I_NetOpenSocket)
|
return;
|
||||||
{
|
}
|
||||||
I_NetOpenSocket();
|
else if (I_NetOpenSocket)
|
||||||
netgame = true;
|
{
|
||||||
multiplayer = true;
|
I_NetOpenSocket();
|
||||||
|
netgame = true;
|
||||||
|
multiplayer = true;
|
||||||
|
|
||||||
if (fasticmp(COM_Argv(1), "any"))
|
if (fasticmp(COM_Argv(1), "any"))
|
||||||
servernode = BROADCASTADDR;
|
servernode = BROADCASTADDR;
|
||||||
else if (I_NetMakeNodewPort)
|
else if (I_NetMakeNodewPort && COM_Argc() >= 3)
|
||||||
{
|
servernode = I_NetMakeNodewPort(COM_Argv(1), COM_Argv(2));
|
||||||
if (COM_Argc() >= 3) // address AND port
|
else if (I_NetMakeNodewPort)
|
||||||
servernode = I_NetMakeNodewPort(COM_Argv(1), COM_Argv(2));
|
servernode = I_NetMakeNode(COM_Argv(1));
|
||||||
else // address only, or address:port
|
|
||||||
servernode = I_NetMakeNode(COM_Argv(1));
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
CONS_Alert(CONS_ERROR, M_GetText("There is no server identification with this network driver\n"));
|
|
||||||
D_CloseConnection();
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
CONS_Alert(CONS_ERROR, M_GetText("There is no network driver\n"));
|
CONS_Alert(CONS_ERROR, M_GetText("There is no server identification with this network driver\n"));
|
||||||
|
D_CloseConnection();
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
else
|
||||||
|
CONS_Alert(CONS_ERROR, M_GetText("There is no network driver\n"));
|
||||||
|
|
||||||
// invalid address
|
// invalid address
|
||||||
if (servernode == -1)
|
if (servernode == -1)
|
||||||
@@ -3476,7 +3458,6 @@ static void ResetNode(INT32 node);
|
|||||||
//
|
//
|
||||||
void CL_ClearPlayer(INT32 playernum)
|
void CL_ClearPlayer(INT32 playernum)
|
||||||
{
|
{
|
||||||
// Handle mobj_t pointers.
|
|
||||||
if (players[playernum].mo)
|
if (players[playernum].mo)
|
||||||
{
|
{
|
||||||
// Don't leave a NiGHTS ghost!
|
// Don't leave a NiGHTS ghost!
|
||||||
@@ -3485,7 +3466,6 @@ void CL_ClearPlayer(INT32 playernum)
|
|||||||
P_RemoveMobj(players[playernum].mo);
|
P_RemoveMobj(players[playernum].mo);
|
||||||
}
|
}
|
||||||
|
|
||||||
// Wipe the struct.
|
|
||||||
memset(&players[playernum], 0, sizeof(player_t));
|
memset(&players[playernum], 0, sizeof(player_t));
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -5194,7 +5174,7 @@ static void PT_ServerInfo(SINT8 node)
|
|||||||
const tic_t ticthen = (tic_t)LONG(netbuffer->u.serverinfo.time);
|
const tic_t ticthen = (tic_t)LONG(netbuffer->u.serverinfo.time);
|
||||||
const tic_t ticdiff = (ticnow - ticthen)*1000/NEWTICRATE;
|
const tic_t ticdiff = (ticnow - ticthen)*1000/NEWTICRATE;
|
||||||
netbuffer->u.serverinfo.time = (tic_t)LONG(ticdiff);
|
netbuffer->u.serverinfo.time = (tic_t)LONG(ticdiff);
|
||||||
netbuffer->u.serverinfo.servername[MAXSERVERNAME-1] = '\0';
|
netbuffer->u.serverinfo.servername[MAXSERVERNAME-1] = 0;
|
||||||
netbuffer->u.serverinfo.application
|
netbuffer->u.serverinfo.application
|
||||||
[sizeof netbuffer->u.serverinfo.application - 1] = '\0';
|
[sizeof netbuffer->u.serverinfo.application - 1] = '\0';
|
||||||
memcpy(servername, netbuffer->u.serverinfo.servername, MAXSERVERNAME);
|
memcpy(servername, netbuffer->u.serverinfo.servername, MAXSERVERNAME);
|
||||||
@@ -7273,7 +7253,6 @@ static void DedicatedIdleUpdate(INT32 *realtics)
|
|||||||
{
|
{
|
||||||
CONS_Printf("DEDICATED: Awakening from idle (Player detected...)\n");
|
CONS_Printf("DEDICATED: Awakening from idle (Player detected...)\n");
|
||||||
}
|
}
|
||||||
|
|
||||||
dedicatedidle = 0;
|
dedicatedidle = 0;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
+1
-54
@@ -147,11 +147,6 @@ static void Command_Addfilelocal(void);
|
|||||||
static void Command_Addfile(void);
|
static void Command_Addfile(void);
|
||||||
static void Command_Addskins(void);
|
static void Command_Addskins(void);
|
||||||
static void Command_GLocalSkin(void);
|
static void Command_GLocalSkin(void);
|
||||||
static void SetPrefcolor(int splitplayer);
|
|
||||||
static void Command_UsePrefcolor(void);
|
|
||||||
static void Command_UsePrefcolor2(void);
|
|
||||||
static void Command_UsePrefcolor3(void);
|
|
||||||
static void Command_UsePrefcolor4(void);
|
|
||||||
static void Command_ListWADS_f(void);
|
static void Command_ListWADS_f(void);
|
||||||
static void Command_LocateLump_f(void);
|
static void Command_LocateLump_f(void);
|
||||||
static void Command_ListDoomednums_f(void);
|
static void Command_ListDoomednums_f(void);
|
||||||
@@ -871,11 +866,6 @@ void D_RegisterClientCommands(void)
|
|||||||
|
|
||||||
COM_AddCommand("localskin", Command_GLocalSkin);
|
COM_AddCommand("localskin", Command_GLocalSkin);
|
||||||
|
|
||||||
COM_AddCommand("useprefcolor", Command_UsePrefcolor);
|
|
||||||
COM_AddCommand("useprefcolor2", Command_UsePrefcolor2);
|
|
||||||
COM_AddCommand("useprefcolor3", Command_UsePrefcolor3);
|
|
||||||
COM_AddCommand("useprefcolor4", Command_UsePrefcolor4);
|
|
||||||
|
|
||||||
K_RegisterClientKartStuff(); // SRB2kart
|
K_RegisterClientKartStuff(); // SRB2kart
|
||||||
|
|
||||||
CV_RegisterVar(&cv_screenshot_option);
|
CV_RegisterVar(&cv_screenshot_option);
|
||||||
@@ -4344,49 +4334,6 @@ static void Command_GLocalSkin(void)
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
static void SetPrefcolor(int splitplayer)
|
|
||||||
{
|
|
||||||
// splitscreen
|
|
||||||
if (splitscreen < splitplayer)
|
|
||||||
return;
|
|
||||||
|
|
||||||
const INT32 pnum = P_GetLocalPlayerNumForNum(splitplayer);
|
|
||||||
|
|
||||||
player_t *player = &players[pnum];
|
|
||||||
consvar_t *colorvars[] = {&cv_playercolor, &cv_playercolor2, &cv_playercolor3, &cv_playercolor4};
|
|
||||||
consvar_t *playercolor = colorvars[splitplayer];
|
|
||||||
|
|
||||||
if (skins[player->skin].prefcolor)
|
|
||||||
{
|
|
||||||
CV_SetValue(playercolor, skins[player->skin].prefcolor);
|
|
||||||
CONS_Printf("Set color to %s%s\n", HU_SkinColorToConsoleColor(skins[player->skin].prefcolor), KartColor_Names[skins[player->skin].prefcolor]);
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
CONS_Printf("\x86Your skin has no prefcolor set\n");
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
static void Command_UsePrefcolor(void)
|
|
||||||
{
|
|
||||||
SetPrefcolor(0);
|
|
||||||
}
|
|
||||||
|
|
||||||
static void Command_UsePrefcolor2(void)
|
|
||||||
{
|
|
||||||
SetPrefcolor(1);
|
|
||||||
}
|
|
||||||
|
|
||||||
static void Command_UsePrefcolor3(void)
|
|
||||||
{
|
|
||||||
SetPrefcolor(2);
|
|
||||||
}
|
|
||||||
|
|
||||||
static void Command_UsePrefcolor4(void)
|
|
||||||
{
|
|
||||||
SetPrefcolor(3);
|
|
||||||
}
|
|
||||||
|
|
||||||
static void Got_RequestAddfilecmd(const UINT8 **cp, INT32 playernum)
|
static void Got_RequestAddfilecmd(const UINT8 **cp, INT32 playernum)
|
||||||
{
|
{
|
||||||
char filename[241];
|
char filename[241];
|
||||||
@@ -4434,7 +4381,7 @@ static void Got_RequestAddfilecmd(const UINT8 **cp, INT32 playernum)
|
|||||||
else
|
else
|
||||||
snprintf(message, sizeof(message), M_GetText("Unknown error finding wad file (%s)\n"), filename);
|
snprintf(message, sizeof(message), M_GetText("Unknown error finding wad file (%s)\n"), filename);
|
||||||
|
|
||||||
CONS_Printf("%s", message);
|
CONS_Printf("%s",message);
|
||||||
|
|
||||||
for (j = 0; j < MAXPLAYERS; j++)
|
for (j = 0; j < MAXPLAYERS; j++)
|
||||||
if (adminplayers[j])
|
if (adminplayers[j])
|
||||||
|
|||||||
+2
-7
@@ -128,13 +128,8 @@ extern char logfilename[1024];
|
|||||||
// most interface strings are ignored in development mode.
|
// most interface strings are ignored in development mode.
|
||||||
// we use comprevision and compbranch instead.
|
// we use comprevision and compbranch instead.
|
||||||
#else
|
#else
|
||||||
#ifdef PHOBOS_BUILD
|
|
||||||
#define VERSION 1 // Game version
|
|
||||||
#define SUBVERSION 69 // more precise version number
|
|
||||||
#else
|
|
||||||
#define VERSION 1 // Game version
|
#define VERSION 1 // Game version
|
||||||
#define SUBVERSION 6 // more precise version number
|
#define SUBVERSION 6 // more precise version number
|
||||||
#endif
|
|
||||||
|
|
||||||
#ifdef PHOBOS_BUILD
|
#ifdef PHOBOS_BUILD
|
||||||
#define CLIENTNAME "Phobos"
|
#define CLIENTNAME "Phobos"
|
||||||
@@ -144,8 +139,8 @@ extern char logfilename[1024];
|
|||||||
#define CLIENTNAMEW L"Saturn"
|
#define CLIENTNAMEW L"Saturn"
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#define VERSIONSTRING CLIENTNAME " v10.1"
|
#define VERSIONSTRING CLIENTNAME " v10"
|
||||||
#define VERSIONSTRINGW CLIENTNAMEW L" v10.1"
|
#define VERSIONSTRINGW CLIENTNAMEW L" v10"
|
||||||
|
|
||||||
#define SATURN_TESTING // comment out for saturn release builds!
|
#define SATURN_TESTING // comment out for saturn release builds!
|
||||||
|
|
||||||
|
|||||||
@@ -35,7 +35,7 @@ static int finalVertexArrayAllocSize = 65536;
|
|||||||
// not gonna use this for now, just sort by color and change state when it changes
|
// not gonna use this for now, just sort by color and change state when it changes
|
||||||
// later maybe when using vertex attributes if it's needed
|
// later maybe when using vertex attributes if it's needed
|
||||||
|
|
||||||
static PolygonArrayEntry* polygonArray = NULL; // contains the polygon data from DrawPolygon, waiting to be processed
|
static PolygonArrayEntry* polygonArray = NULL ;// contains the polygon data from DrawPolygon, waiting to be processed
|
||||||
static PolygonArrayEntry **polygonArraySorted = NULL; // contains sorted pointers to polygonArray
|
static PolygonArrayEntry **polygonArraySorted = NULL; // contains sorted pointers to polygonArray
|
||||||
static int polygonArraySize = 0;
|
static int polygonArraySize = 0;
|
||||||
static int polygonArrayAllocSize = 65536;
|
static int polygonArrayAllocSize = 65536;
|
||||||
@@ -171,8 +171,8 @@ static int comparePolygons(const void *p1, const void *p2)
|
|||||||
|
|
||||||
// special case with signedness to prevent overflowing
|
// special case with signedness to prevent overflowing
|
||||||
// FIXME: check for prediction slowdowns!
|
// FIXME: check for prediction slowdowns!
|
||||||
const int shader1 = (poly1->hash & 0x80000000) ? -1 : poly1->shader;
|
const int shader1 = poly1->hash & 0x80000000 ? -1 : poly1->shader;
|
||||||
const int shader2 = (poly2->hash & 0x80000000) ? -1 : poly2->shader;
|
const int shader2 = poly2->hash & 0x80000000 ? -1 : poly2->shader;
|
||||||
|
|
||||||
// skywalls and horizon lines must retain their order for horizon lines to work
|
// skywalls and horizon lines must retain their order for horizon lines to work
|
||||||
if (shader1 == -1 && shader2 == -1)
|
if (shader1 == -1 && shader2 == -1)
|
||||||
@@ -214,8 +214,8 @@ static int comparePolygonsNoShaders(const void *p1, const void *p2)
|
|||||||
const PolygonArrayEntry *poly1 = *(PolygonArrayEntry *const *)p1;
|
const PolygonArrayEntry *poly1 = *(PolygonArrayEntry *const *)p1;
|
||||||
const PolygonArrayEntry *poly2 = *(PolygonArrayEntry *const *)p2;
|
const PolygonArrayEntry *poly2 = *(PolygonArrayEntry *const *)p2;
|
||||||
|
|
||||||
const GLMipmap_t *texture1 = (poly1->hash & 0x80000000) ? NULL : poly1->texture;
|
const GLMipmap_t *texture1 = poly1->hash & 0x80000000 ? NULL : poly1->texture;
|
||||||
const GLMipmap_t *texture2 = (poly2->hash & 0x80000000) ? NULL : poly2->texture;
|
const GLMipmap_t *texture2 = poly2->hash & 0x80000000 ? NULL : poly2->texture;
|
||||||
|
|
||||||
// skywalls and horizon lines must retain their order for horizon lines to work
|
// skywalls and horizon lines must retain their order for horizon lines to work
|
||||||
if (!texture1 && !texture2)
|
if (!texture1 && !texture2)
|
||||||
|
|||||||
+1
-19
@@ -624,26 +624,13 @@ static void HWR_PrecacheLevelFlats(void)
|
|||||||
{
|
{
|
||||||
// lookup for flats that may´ve been already loaded
|
// lookup for flats that may´ve been already loaded
|
||||||
flatcheck flatpresent;
|
flatcheck flatpresent;
|
||||||
size_t i;
|
size_t i, j;
|
||||||
#if 0
|
|
||||||
size_t j;
|
|
||||||
#endif
|
|
||||||
INT32 k;
|
INT32 k;
|
||||||
|
|
||||||
// this kinda messes up encore remapping behavior at times
|
|
||||||
// so just disable it for now ig
|
|
||||||
#ifdef GLENCORE
|
|
||||||
if (encoremap)
|
|
||||||
{
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
#endif
|
|
||||||
|
|
||||||
flatcheck_init(&flatpresent);
|
flatcheck_init(&flatpresent);
|
||||||
flatcheck_reserve(&flatpresent, numlevelflats);
|
flatcheck_reserve(&flatpresent, numlevelflats);
|
||||||
|
|
||||||
// special case for encore
|
// special case for encore
|
||||||
#if 0
|
|
||||||
#ifdef GLENCORE
|
#ifdef GLENCORE
|
||||||
if (encoremap)
|
if (encoremap)
|
||||||
{
|
{
|
||||||
@@ -683,7 +670,6 @@ static void HWR_PrecacheLevelFlats(void)
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
#endif
|
|
||||||
#endif
|
#endif
|
||||||
{
|
{
|
||||||
// on non encore we have it simple
|
// on non encore we have it simple
|
||||||
@@ -1329,7 +1315,6 @@ void HWR_SetPalette(RGBA_t *palette)
|
|||||||
crushed_palette[i].s.blue = (UINT8)(fblue / 31.0f * 255.0f);
|
crushed_palette[i].s.blue = (UINT8)(fblue / 31.0f * 255.0f);
|
||||||
crushed_palette[i].s.alpha = 255;
|
crushed_palette[i].s.alpha = 255;
|
||||||
}
|
}
|
||||||
|
|
||||||
GL_SetScreenPalette(crushed_palette);
|
GL_SetScreenPalette(crushed_palette);
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
@@ -1407,7 +1392,6 @@ void HWR_SetMapPalette(void)
|
|||||||
I_Error("HWR_SetMapPalette: A programmer assumed palette lumps are at least 768 bytes long, but apparently this was a wrong assumption!\n");
|
I_Error("HWR_SetMapPalette: A programmer assumed palette lumps are at least 768 bytes long, but apparently this was a wrong assumption!\n");
|
||||||
|
|
||||||
RGB_data = (UINT8 *)(W_CacheLumpNum(lumpnum, PU_CACHE));
|
RGB_data = (UINT8 *)(W_CacheLumpNum(lumpnum, PU_CACHE));
|
||||||
|
|
||||||
// we got the RGB palette now, but we need it in RGBA format.
|
// we got the RGB palette now, but we need it in RGBA format.
|
||||||
for (i = 0; i < 256; i++)
|
for (i = 0; i < 256; i++)
|
||||||
{
|
{
|
||||||
@@ -1416,7 +1400,6 @@ void HWR_SetMapPalette(void)
|
|||||||
RGBA_converted[i].s.blue = *(RGB_data++);
|
RGBA_converted[i].s.blue = *(RGB_data++);
|
||||||
RGBA_converted[i].s.alpha = 255;
|
RGBA_converted[i].s.alpha = 255;
|
||||||
}
|
}
|
||||||
|
|
||||||
palette = RGBA_converted;
|
palette = RGBA_converted;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -1424,7 +1407,6 @@ void HWR_SetMapPalette(void)
|
|||||||
if (memcmp(mapPalette, palette, sizeof(mapPalette)))
|
if (memcmp(mapPalette, palette, sizeof(mapPalette)))
|
||||||
{
|
{
|
||||||
memcpy(mapPalette, palette, sizeof(mapPalette));
|
memcpy(mapPalette, palette, sizeof(mapPalette));
|
||||||
|
|
||||||
// in palette rendering mode, this means that all rgba textures now have wrong colors
|
// in palette rendering mode, this means that all rgba textures now have wrong colors
|
||||||
// and the lookup table is outdated
|
// and the lookup table is outdated
|
||||||
HWR_SetPaletteLookup(mapPalette);
|
HWR_SetPaletteLookup(mapPalette);
|
||||||
|
|||||||
@@ -1236,7 +1236,7 @@ static void HWR_DrawSkyWall(FOutVector *wallVerts, FSurfaceInfo *Surf)
|
|||||||
// Returns true if the midtexture is visible, and false if... it isn't...
|
// Returns true if the midtexture is visible, and false if... it isn't...
|
||||||
static inline boolean HWR_BlendMidtextureSurface(FSurfaceInfo *pSurf)
|
static inline boolean HWR_BlendMidtextureSurface(FSurfaceInfo *pSurf)
|
||||||
{
|
{
|
||||||
FUINT blendmode = PF_Masked;
|
FUINT blendmode = PF_Masked | PF_Translucent;
|
||||||
|
|
||||||
pSurf->PolyColor.s.alpha = 0xFF;
|
pSurf->PolyColor.s.alpha = 0xFF;
|
||||||
|
|
||||||
|
|||||||
@@ -1931,7 +1931,6 @@ static void GenerateMipmaps(INT32 w, INT32 h, RGBA_t *tex, INT32 maxLOD, UINT32
|
|||||||
{
|
{
|
||||||
if (samplePoint[p].s.alpha == 0)
|
if (samplePoint[p].s.alpha == 0)
|
||||||
continue;
|
continue;
|
||||||
|
|
||||||
sumR += samplePoint[p].s.red;
|
sumR += samplePoint[p].s.red;
|
||||||
sumG += samplePoint[p].s.green;
|
sumG += samplePoint[p].s.green;
|
||||||
sumB += samplePoint[p].s.blue;
|
sumB += samplePoint[p].s.blue;
|
||||||
@@ -3283,7 +3282,7 @@ static void GL_Framebuffer_Generate(void)
|
|||||||
{
|
{
|
||||||
pglGenTextures(1, &framebufferobject.tex);
|
pglGenTextures(1, &framebufferobject.tex);
|
||||||
pglBindTexture(GL_TEXTURE_2D, framebufferobject.tex);
|
pglBindTexture(GL_TEXTURE_2D, framebufferobject.tex);
|
||||||
pglTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA, screen_width, screen_height, 0, GL_RGBA, GL_UNSIGNED_BYTE, NULL);
|
pglTexImage2D(GL_TEXTURE_2D, 0, GL_RGB, screen_width, screen_height, 0, GL_RGB, GL_UNSIGNED_BYTE, NULL);
|
||||||
pglTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST);
|
pglTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST);
|
||||||
pglTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
|
pglTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
|
||||||
Clamp2D(GL_TEXTURE_WRAP_S);
|
Clamp2D(GL_TEXTURE_WRAP_S);
|
||||||
|
|||||||
+8
-5
@@ -472,7 +472,9 @@ static void DoSayCommand(SINT8 target, size_t usedargs, UINT8 flags)
|
|||||||
strlcat(msg, COM_Argv(ix + usedargs), msgspace);
|
strlcat(msg, COM_Argv(ix + usedargs), msgspace);
|
||||||
}
|
}
|
||||||
|
|
||||||
if (strlen(msg) > 4 && strnicmp(msg, "/pm", 3) == 0) // used /pm
|
const size_t msglength = strlen(msg);
|
||||||
|
|
||||||
|
if (msglength > 4 && strnicmp(msg, "/pm", 3) == 0) // used /pm
|
||||||
{
|
{
|
||||||
// what we're gonna do now is check if the node exists
|
// what we're gonna do now is check if the node exists
|
||||||
// with that logic, characters 4 and 5 are our numbers:
|
// with that logic, characters 4 and 5 are our numbers:
|
||||||
@@ -526,7 +528,7 @@ static void DoSayCommand(SINT8 target, size_t usedargs, UINT8 flags)
|
|||||||
strlcpy(msg, newmsg, HU_MAXMSGLEN + 1);
|
strlcpy(msg, newmsg, HU_MAXMSGLEN + 1);
|
||||||
}
|
}
|
||||||
|
|
||||||
SendNetXCmd(XD_SAY, buf, strlen(msg) + 1 + msg-buf);
|
SendNetXCmd(XD_SAY, buf, msglength + 1 + msg-buf);
|
||||||
}
|
}
|
||||||
|
|
||||||
/** Send a message to everyone.
|
/** Send a message to everyone.
|
||||||
@@ -777,11 +779,12 @@ static void Got_Saycmd(const UINT8 **p, INT32 playernum)
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
const size_t msglength = strlen(msg);
|
||||||
|
|
||||||
//check for invalid characters (0x80 or above)
|
//check for invalid characters (0x80 or above)
|
||||||
{
|
{
|
||||||
size_t i;
|
size_t i;
|
||||||
const size_t j = strlen(msg);
|
const size_t j = msglength;
|
||||||
|
|
||||||
for (i = 0; i < j; i++)
|
for (i = 0; i < j; i++)
|
||||||
{
|
{
|
||||||
if (msg[i] & 0x80)
|
if (msg[i] & 0x80)
|
||||||
@@ -828,7 +831,7 @@ static void Got_Saycmd(const UINT8 **p, INT32 playernum)
|
|||||||
}
|
}
|
||||||
|
|
||||||
// Handle "/me" actions, but only in messages to everyone.
|
// Handle "/me" actions, but only in messages to everyone.
|
||||||
if (target == 0 && strlen(msg) > 4 && strnicmp(msg, "/me ", 4) == 0)
|
if (target == 0 && msglength > 4 && strnicmp(msg, "/me ", 4) == 0)
|
||||||
{
|
{
|
||||||
msg += 4;
|
msg += 4;
|
||||||
action = true;
|
action = true;
|
||||||
|
|||||||
+4
-32
@@ -4337,6 +4337,7 @@ static void K_DoShrink(player_t *user)
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
void K_DoPogoSpring(mobj_t *mo, fixed_t vertispeed, UINT8 sound)
|
void K_DoPogoSpring(mobj_t *mo, fixed_t vertispeed, UINT8 sound)
|
||||||
{
|
{
|
||||||
if (mo->player && mo->player->spectator)
|
if (mo->player && mo->player->spectator)
|
||||||
@@ -4399,7 +4400,8 @@ void K_KillBananaChain(mobj_t *banana, mobj_t *inflictor, mobj_t *source)
|
|||||||
mobj_t *cachenext;
|
mobj_t *cachenext;
|
||||||
|
|
||||||
killnext:
|
killnext:
|
||||||
if (P_MobjWasRemovedCompat(banana))
|
|
||||||
|
if (!banana)
|
||||||
return;
|
return;
|
||||||
|
|
||||||
cachenext = banana->hnext;
|
cachenext = banana->hnext;
|
||||||
@@ -4438,21 +4440,10 @@ void K_UpdateHnextList(player_t *player, boolean clean)
|
|||||||
nextwork = work->hnext;
|
nextwork = work->hnext;
|
||||||
|
|
||||||
if (!clean && (!work->movedir || work->movedir <= (UINT16)player->kartstuff[k_itemamount]))
|
if (!clean && (!work->movedir || work->movedir <= (UINT16)player->kartstuff[k_itemamount]))
|
||||||
{
|
|
||||||
continue;
|
continue;
|
||||||
}
|
|
||||||
|
|
||||||
P_RemoveMobj(work);
|
P_RemoveMobj(work);
|
||||||
}
|
}
|
||||||
|
|
||||||
#ifdef PHOBOS_BUILD
|
|
||||||
if (P_MobjWasRemoved(player->mo->hnext))
|
|
||||||
{
|
|
||||||
// Like below, try to clean up the pointer if it's NULL.
|
|
||||||
// Maybe this was a cause of the shrink/eggbox fails?
|
|
||||||
P_SetTarget(&player->mo->hnext, NULL);
|
|
||||||
}
|
|
||||||
#endif
|
|
||||||
}
|
}
|
||||||
|
|
||||||
// For getting hit!
|
// For getting hit!
|
||||||
@@ -4517,9 +4508,7 @@ void K_DropHnextList(player_t *player)
|
|||||||
}
|
}
|
||||||
|
|
||||||
dropwork = P_SpawnMobj(work->x, work->y, work->z, type);
|
dropwork = P_SpawnMobj(work->x, work->y, work->z, type);
|
||||||
|
|
||||||
P_SetTarget(&dropwork->target, player->mo);
|
P_SetTarget(&dropwork->target, player->mo);
|
||||||
|
|
||||||
dropwork->angle = work->angle;
|
dropwork->angle = work->angle;
|
||||||
dropwork->flags2 = work->flags2;
|
dropwork->flags2 = work->flags2;
|
||||||
dropwork->flags |= MF_NOCLIPTHING;
|
dropwork->flags |= MF_NOCLIPTHING;
|
||||||
@@ -4587,13 +4576,10 @@ void K_DropHnextList(player_t *player)
|
|||||||
|
|
||||||
// we need this here too because this is done in afterthink - pointers are cleaned up at the START of each tic...
|
// 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);
|
P_SetTarget(&player->mo->hnext, NULL);
|
||||||
|
|
||||||
player->kartstuff[k_bananadrag] = 0;
|
player->kartstuff[k_bananadrag] = 0;
|
||||||
|
|
||||||
if (player->kartstuff[k_eggmanheld])
|
if (player->kartstuff[k_eggmanheld])
|
||||||
{
|
|
||||||
player->kartstuff[k_eggmanheld] = 0;
|
player->kartstuff[k_eggmanheld] = 0;
|
||||||
}
|
|
||||||
else if (player->kartstuff[k_itemheld]
|
else if (player->kartstuff[k_itemheld]
|
||||||
&& (dropall || (--player->kartstuff[k_itemamount] <= 0)))
|
&& (dropall || (--player->kartstuff[k_itemamount] <= 0)))
|
||||||
{
|
{
|
||||||
@@ -4894,9 +4880,7 @@ static void K_MoveHeldObjects(player_t *player)
|
|||||||
player->kartstuff[k_bananadrag] = 0;
|
player->kartstuff[k_bananadrag] = 0;
|
||||||
|
|
||||||
if (player->kartstuff[k_eggmanheld])
|
if (player->kartstuff[k_eggmanheld])
|
||||||
{
|
|
||||||
player->kartstuff[k_eggmanheld] = 0;
|
player->kartstuff[k_eggmanheld] = 0;
|
||||||
}
|
|
||||||
else if (player->kartstuff[k_itemheld])
|
else if (player->kartstuff[k_itemheld])
|
||||||
{
|
{
|
||||||
player->kartstuff[k_itemamount] = player->kartstuff[k_itemheld] = 0;
|
player->kartstuff[k_itemamount] = player->kartstuff[k_itemheld] = 0;
|
||||||
@@ -4913,9 +4897,7 @@ static void K_MoveHeldObjects(player_t *player)
|
|||||||
player->kartstuff[k_bananadrag] = 0;
|
player->kartstuff[k_bananadrag] = 0;
|
||||||
|
|
||||||
if (player->kartstuff[k_eggmanheld])
|
if (player->kartstuff[k_eggmanheld])
|
||||||
{
|
|
||||||
player->kartstuff[k_eggmanheld] = 0;
|
player->kartstuff[k_eggmanheld] = 0;
|
||||||
}
|
|
||||||
else if (player->kartstuff[k_itemheld])
|
else if (player->kartstuff[k_itemheld])
|
||||||
{
|
{
|
||||||
player->kartstuff[k_itemamount] = player->kartstuff[k_itemheld] = 0;
|
player->kartstuff[k_itemamount] = player->kartstuff[k_itemheld] = 0;
|
||||||
@@ -4931,12 +4913,7 @@ static void K_MoveHeldObjects(player_t *player)
|
|||||||
case MT_JAWZ_SHIELD:
|
case MT_JAWZ_SHIELD:
|
||||||
{
|
{
|
||||||
mobj_t *cur = player->mo->hnext;
|
mobj_t *cur = player->mo->hnext;
|
||||||
fixed_t speed = 0;
|
fixed_t speed = ((8 - min(4, player->kartstuff[k_itemamount])) * cur->info->speed) / 7;
|
||||||
|
|
||||||
if (cur == NULL)
|
|
||||||
return;
|
|
||||||
|
|
||||||
speed = ((8 - min(4, player->kartstuff[k_itemamount])) * cur->info->speed) / 7;
|
|
||||||
|
|
||||||
player->kartstuff[k_bananadrag] = 0; // Just to make sure
|
player->kartstuff[k_bananadrag] = 0; // Just to make sure
|
||||||
|
|
||||||
@@ -4983,13 +4960,8 @@ static void K_MoveHeldObjects(player_t *player)
|
|||||||
cur->flags &= ~MF_NOCLIPTHING;
|
cur->flags &= ~MF_NOCLIPTHING;
|
||||||
|
|
||||||
if (!P_TryMove(cur, player->mo->x + cur->momx, player->mo->y + cur->momy, true))
|
if (!P_TryMove(cur, player->mo->x + cur->momx, player->mo->y + cur->momy, true))
|
||||||
{
|
|
||||||
P_SlideMove(cur, true);
|
P_SlideMove(cur, true);
|
||||||
|
|
||||||
if (P_MobjWasRemovedCompat(cur))
|
|
||||||
continue;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (P_IsObjectOnGround(player->mo))
|
if (P_IsObjectOnGround(player->mo))
|
||||||
{
|
{
|
||||||
if (P_MobjFlip(cur) > 0)
|
if (P_MobjFlip(cur) > 0)
|
||||||
|
|||||||
+83
-102
@@ -7667,7 +7667,7 @@ static void M_DrawMPMainMenu(void)
|
|||||||
{
|
{
|
||||||
char buf[28];
|
char buf[28];
|
||||||
strlcpy(buf, setupm_ip, sizeof(buf));
|
strlcpy(buf, setupm_ip, sizeof(buf));
|
||||||
V_DrawString(x+8, y+12, V_ALLOWLOWERCASE, buf);
|
V_DrawString(x+8,y+12, V_ALLOWLOWERCASE, buf);
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
M_DrawTextInputScroll(x+8, y+12, &setupm_input_ip, 0, SETUPM_IP_MAXSIZE);
|
M_DrawTextInputScroll(x+8, y+12, &setupm_input_ip, 0, SETUPM_IP_MAXSIZE);
|
||||||
@@ -8205,12 +8205,12 @@ static void M_DrawSetupMultiPlayerMenu(void)
|
|||||||
case SKINMENUTYPE_EXTENDED:
|
case SKINMENUTYPE_EXTENDED:
|
||||||
for (s = 0; s < SKINGRIDNEWWIDTH*SKINGRIDNEWHEIGHT; s++)
|
for (s = 0; s < SKINGRIDNEWWIDTH*SKINGRIDNEWHEIGHT; s++)
|
||||||
{
|
{
|
||||||
|
INT32 x = ((s % SKINGRIDNEWWIDTH) * 18) + ((BASEVIDWIDTH / 2) - (18 * SKINGRIDNEWWIDTH) - 8) + 100 + SKINXSHIFT; //BASEVIDWIDTH / 2 - ((icons + 1) * 24) - 4;
|
||||||
|
INT32 y = ((s / SKINGRIDNEWWIDTH) * 18) + ((BASEVIDHEIGHT / 2) - (18 * (SKINGRIDNEWWIDTH/2)) + 10); //BASEVIDWIDTH / 2 - ((icons + 1) * 24) - 4;
|
||||||
|
INT32 calcs = s + (setupm_skinypos * SKINGRIDNEWWIDTH);
|
||||||
INT32 skinn;
|
INT32 skinn;
|
||||||
patch_t *face;
|
patch_t *face;
|
||||||
UINT8 *cmap;
|
UINT8 *cmap;
|
||||||
const INT32 x = ((s % SKINGRIDNEWWIDTH) * 18) + ((BASEVIDWIDTH / 2) - (18 * SKINGRIDNEWWIDTH) - 8) + 100 + SKINXSHIFT; //BASEVIDWIDTH / 2 - ((icons + 1) * 24) - 4;
|
|
||||||
const INT32 y = ((s / SKINGRIDNEWWIDTH) * 18) + ((BASEVIDHEIGHT / 2) - (18 * (SKINGRIDNEWWIDTH/2)) + 10); //BASEVIDWIDTH / 2 - ((icons + 1) * 24) - 4;
|
|
||||||
const INT32 calcs = s + (setupm_skinypos * SKINGRIDNEWWIDTH);
|
|
||||||
|
|
||||||
if (calcs < numskins)
|
if (calcs < numskins)
|
||||||
skinn = skinsorted[calcs];
|
skinn = skinsorted[calcs];
|
||||||
@@ -8231,10 +8231,10 @@ static void M_DrawSetupMultiPlayerMenu(void)
|
|||||||
if (itemOn == 1) //has to be on skin select part
|
if (itemOn == 1) //has to be on skin select part
|
||||||
{
|
{
|
||||||
patch_t *cursor;
|
patch_t *cursor;
|
||||||
const INT32 curx = (((setupm_skinselect % SKINGRIDNEWWIDTH) * 18) + ((BASEVIDWIDTH / 2) - (18 * SKINGRIDNEWWIDTH/2)) + SKINXSHIFT) + 20;
|
INT32 curx = (((setupm_skinselect % SKINGRIDNEWWIDTH) * 18) + ((BASEVIDWIDTH / 2) - (18 * SKINGRIDNEWWIDTH/2)) + SKINXSHIFT) + 20;
|
||||||
const INT32 cury = (((setupm_skinselect / SKINGRIDNEWWIDTH) - setupm_skinypos) * 18) + ((BASEVIDHEIGHT / 2) - (18 * (SKINGRIDNEWWIDTH/2))+ 10);
|
INT32 cury = (((setupm_skinselect / SKINGRIDNEWWIDTH) - setupm_skinypos) * 18) + ((BASEVIDHEIGHT / 2) - (18 * (SKINGRIDNEWWIDTH/2))+ 10);
|
||||||
|
|
||||||
const UINT8 cursorframe = (I_GetTime() / 4) % 7;
|
UINT8 cursorframe = (I_GetTime() / 4) % 7;
|
||||||
cursor = (patch_t *)W_CachePatchName(va("K_CHILI%d", cursorframe + 1), PU_PATCH);
|
cursor = (patch_t *)W_CachePatchName(va("K_CHILI%d", cursorframe + 1), PU_PATCH);
|
||||||
V_DrawFixedPatch((curx << FRACBITS) - (FRACUNIT), (cury << FRACBITS) - (FRACUNIT), FRACUNIT+(FRACUNIT>>3), 0, cursor, NULL);
|
V_DrawFixedPatch((curx << FRACBITS) - (FRACUNIT), (cury << FRACBITS) - (FRACUNIT), FRACUNIT+(FRACUNIT>>3), 0, cursor, NULL);
|
||||||
}
|
}
|
||||||
@@ -8243,9 +8243,9 @@ static void M_DrawSetupMultiPlayerMenu(void)
|
|||||||
case SKINMENUTYPE_GRID:
|
case SKINMENUTYPE_GRID:
|
||||||
for (s = 0; s < SKINGRIDWIDTH*SKINGRIDHEIGHT; s++)
|
for (s = 0; s < SKINGRIDWIDTH*SKINGRIDHEIGHT; s++)
|
||||||
{
|
{
|
||||||
const INT32 x = ((s % SKINGRIDWIDTH) * 18) + ((BASEVIDWIDTH / 2) - (18 * SKINGRIDWIDTH) - 8) + 100 + SKINXSHIFT; //BASEVIDWIDTH / 2 - ((icons + 1) * 24) - 4;
|
INT32 x = ((s % SKINGRIDWIDTH) * 18) + ((BASEVIDWIDTH / 2) - (18 * SKINGRIDWIDTH) - 8) + 100 + SKINXSHIFT; //BASEVIDWIDTH / 2 - ((icons + 1) * 24) - 4;
|
||||||
const INT32 y = ((s / SKINGRIDWIDTH) * 18) + ((BASEVIDHEIGHT / 2) - (18 * (SKINGRIDWIDTH/2))); //BASEVIDWIDTH / 2 - ((icons + 1) * 24) - 4;
|
INT32 y = ((s / SKINGRIDWIDTH) * 18) + ((BASEVIDHEIGHT / 2) - (18 * (SKINGRIDWIDTH/2))); //BASEVIDWIDTH / 2 - ((icons + 1) * 24) - 4;
|
||||||
const INT32 calcs = s + (setupm_skinypos * SKINGRIDWIDTH);
|
INT32 calcs = s + (setupm_skinypos * SKINGRIDWIDTH);
|
||||||
INT16 skinn;
|
INT16 skinn;
|
||||||
patch_t *face;
|
patch_t *face;
|
||||||
UINT8 *cmap;
|
UINT8 *cmap;
|
||||||
@@ -8269,44 +8269,36 @@ static void M_DrawSetupMultiPlayerMenu(void)
|
|||||||
if (itemOn == 1) //has to be on skin select part
|
if (itemOn == 1) //has to be on skin select part
|
||||||
{
|
{
|
||||||
patch_t *cursor;
|
patch_t *cursor;
|
||||||
const INT32 curx = (((setupm_skinselect % SKINGRIDWIDTH) * 18) + ((BASEVIDWIDTH / 2) - (18 * SKINGRIDWIDTH/2)) + SKINXSHIFT) + 20;
|
INT32 curx = (((setupm_skinselect % SKINGRIDWIDTH) * 18) + ((BASEVIDWIDTH / 2) - (18 * SKINGRIDWIDTH/2)) + SKINXSHIFT) + 20;
|
||||||
const INT32 cury = (((setupm_skinselect / SKINGRIDWIDTH) - setupm_skinypos) * 18) + ((BASEVIDHEIGHT / 2) - (18 * (SKINGRIDWIDTH/2)));
|
INT32 cury = (((setupm_skinselect / SKINGRIDWIDTH) - setupm_skinypos) * 18) + ((BASEVIDHEIGHT / 2) - (18 * (SKINGRIDWIDTH/2)));
|
||||||
|
|
||||||
if (setupm_skinselect < numskins)
|
if (setupm_skinselect < numskins)
|
||||||
{
|
{
|
||||||
const UINT8 *cmap = R_GetTranslationColormap(setupm_skinselect, setupm_fakecolor, GTC_MENUCACHE);
|
UINT8 *cmap = R_GetTranslationColormap(setupm_skinselect, setupm_fakecolor, GTC_MENUCACHE);
|
||||||
cursor = facewantprefix[skinsorted[setupm_skinselect]];
|
cursor = facewantprefix[skinsorted[setupm_skinselect]];
|
||||||
V_DrawFixedPatch(((curx-8) << FRACBITS), ((cury-8) << FRACBITS), FRACUNIT, 0, cursor, cmap);
|
V_DrawFixedPatch(((curx-8) << FRACBITS), ((cury-8) << FRACBITS), FRACUNIT, 0, cursor, cmap);
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
const UINT8 cursorframe = (I_GetTime() / 4) % 7;
|
UINT8 cursorframe = (I_GetTime() / 4) % 7;
|
||||||
cursor = (patch_t *)W_CachePatchName(va("K_CHILI%d", cursorframe + 1), PU_PATCH);
|
cursor = (patch_t *)W_CachePatchName(va("K_CHILI%d", cursorframe + 1), PU_PATCH);
|
||||||
V_DrawFixedPatch((curx << FRACBITS) - (FRACUNIT), (cury << FRACBITS) - (FRACUNIT), FRACUNIT+(FRACUNIT>>3), 0, cursor, NULL);
|
V_DrawFixedPatch((curx << FRACBITS) - (FRACUNIT), (cury << FRACBITS) - (FRACUNIT), FRACUNIT+(FRACUNIT>>3), 0, cursor, NULL);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
{ // stat dot
|
{ // stat dot
|
||||||
const INT32 selectedskin = (itemOn == 1 && setupm_skinselect < numskins ? skinsorted[setupm_skinselect] : setupm_fakeskin);
|
INT32 selectedskin = (itemOn == 1 && setupm_skinselect < numskins ? skinsorted[setupm_skinselect] : setupm_fakeskin);
|
||||||
|
|
||||||
speed = skins[selectedskin].kartspeed;
|
speed = skins[selectedskin].kartspeed;
|
||||||
weight = skins[selectedskin].kartweight;
|
weight = skins[selectedskin].kartweight;
|
||||||
|
|
||||||
const INT32 x = (((statx+46) + (speed*4))<<FRACBITS) + (FRACUNIT>>1);
|
|
||||||
const INT32 y = (((staty+71) + (weight*4))<<FRACBITS);
|
|
||||||
|
|
||||||
statdot = (patch_t *)W_CachePatchName("K_SDOT1", PU_PATCH);
|
statdot = (patch_t *)W_CachePatchName("K_SDOT1", PU_PATCH);
|
||||||
|
|
||||||
if (skullAnimCounter < 4) // SRB2Kart: we draw this dot later so that it's not covered if there's multiple skins with the same stats
|
if (skullAnimCounter < 4) // SRB2Kart: we draw this dot later so that it's not covered if there's multiple skins with the same stats
|
||||||
V_DrawFixedPatch(x, y, FRACUNIT>>1, 0, statdot, flashcol);
|
V_DrawFixedPatch((((statx+46) + (speed*4))<<FRACBITS) + (FRACUNIT>>1), (((staty+71) + (weight*4))<<FRACBITS), FRACUNIT>>1, 0, statdot, flashcol);
|
||||||
else
|
else
|
||||||
V_DrawFixedPatch(x, y, FRACUNIT>>1, 0, statdot, NULL);
|
V_DrawFixedPatch((((statx+46) + (speed*4))<<FRACBITS) + (FRACUNIT>>1), (((staty+71) + (weight*4))<<FRACBITS), FRACUNIT>>1, 0, statdot, NULL);
|
||||||
|
|
||||||
|
statdot = (patch_t *)W_CachePatchName("K_SDOT2", PU_PATCH); // coloured center
|
||||||
if (setupm_fakecolor)
|
if (setupm_fakecolor)
|
||||||
{
|
V_DrawFixedPatch((((statx+46) + (speed*4))<<FRACBITS) + (FRACUNIT>>1), (((staty+71) + (weight*4))<<FRACBITS), FRACUNIT>>1, 0, statdot, R_GetTranslationColormap(0, setupm_fakecolor, GTC_MENUCACHE));
|
||||||
statdot = (patch_t *)W_CachePatchName("K_SDOT2", PU_PATCH); // coloured center
|
|
||||||
V_DrawFixedPatch(x, y, FRACUNIT>>1, 0, statdot, R_GetTranslationColormap(0, setupm_fakecolor, GTC_MENUCACHE));
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
case SKINMENUTYPE_2D:
|
case SKINMENUTYPE_2D:
|
||||||
@@ -8315,13 +8307,12 @@ static void M_DrawSetupMultiPlayerMenu(void)
|
|||||||
{
|
{
|
||||||
for (w = 0; w < MAXSTAT; w++)
|
for (w = 0; w < MAXSTAT; w++)
|
||||||
{
|
{
|
||||||
|
INT32 x = ((s * 18) + ((BASEVIDWIDTH / 2) - (18 * 4)) - 8 + SKINXSHIFT); //BASEVIDWIDTH / 2 - ((icons + 1) * 24) - 4;
|
||||||
|
INT32 y = ((w * 18) + ((BASEVIDHEIGHT / 2) - (18 * 4)) - 8); //BASEVIDWIDTH / 2 - ((icons + 1) * 24) - 4;
|
||||||
INT32 skinn;
|
INT32 skinn;
|
||||||
patch_t *face;
|
patch_t *face;
|
||||||
UINT8 *cmap;
|
UINT8 *cmap;
|
||||||
|
|
||||||
const INT32 x = ((s * 18) + ((BASEVIDWIDTH / 2) - (18 * 4)) - 8 + SKINXSHIFT); //BASEVIDWIDTH / 2 - ((icons + 1) * 24) - 4;
|
|
||||||
const INT32 y = ((w * 18) + ((BASEVIDHEIGHT / 2) - (18 * 4)) - 8); //BASEVIDWIDTH / 2 - ((icons + 1) * 24) - 4;
|
|
||||||
|
|
||||||
if (!skinstatscount[s][w])
|
if (!skinstatscount[s][w])
|
||||||
{
|
{
|
||||||
V_DrawFill(x, y, 16, 16, 239);
|
V_DrawFill(x, y, 16, 16, 239);
|
||||||
@@ -8339,20 +8330,20 @@ static void M_DrawSetupMultiPlayerMenu(void)
|
|||||||
if (itemOn == 1) //has to be on skin select part
|
if (itemOn == 1) //has to be on skin select part
|
||||||
{
|
{
|
||||||
patch_t *cursor;
|
patch_t *cursor;
|
||||||
const INT32 curx = ((setupm_skinxpos * 18) + ((BASEVIDWIDTH / 2) - (18 * 4)) - 8 + SKINXSHIFT);
|
INT32 curx = ((setupm_skinxpos * 18) + ((BASEVIDWIDTH / 2) - (18 * 4)) - 8 + SKINXSHIFT);
|
||||||
const INT32 cury = ((setupm_skinypos * 18) + ((BASEVIDHEIGHT / 2) - (18 * 4)) - 8);
|
INT32 cury = ((setupm_skinypos * 18) + ((BASEVIDHEIGHT / 2) - (18 * 4)) - 8);
|
||||||
|
|
||||||
if (skinstatscount[setupm_skinxpos][setupm_skinypos])
|
if (skinstatscount[setupm_skinxpos][setupm_skinypos])
|
||||||
{
|
{
|
||||||
const UINT8 *cmap = R_GetTranslationColormap(setupm_skinselect, setupm_fakecolor, GTC_MENUCACHE);
|
UINT8 *cmap = R_GetTranslationColormap(setupm_skinselect, setupm_fakecolor, GTC_MENUCACHE);
|
||||||
const INT32 skinn = skinstats[setupm_skinxpos][setupm_skinypos][(I_GetTime() / TICRATE) % skinstatscount[setupm_skinxpos][setupm_skinypos]];
|
INT32 skinn = skinstats[setupm_skinxpos][setupm_skinypos][(I_GetTime() / TICRATE) % skinstatscount[setupm_skinxpos][setupm_skinypos]];
|
||||||
|
|
||||||
cursor = facewantprefix[skinn];
|
cursor = facewantprefix[skinn];
|
||||||
V_DrawFixedPatch(((curx-8) << FRACBITS), ((cury-8) << FRACBITS), FRACUNIT, 0, cursor, cmap);
|
V_DrawFixedPatch(((curx-8) << FRACBITS), ((cury-8) << FRACBITS), FRACUNIT, 0, cursor, cmap);
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
const UINT8 cursorframe = (I_GetTime() / 4) % 7;
|
UINT8 cursorframe = (I_GetTime() / 4) % 7;
|
||||||
cursor = (patch_t *)W_CachePatchName(va("K_CHILI%d", cursorframe + 1), PU_PATCH);
|
cursor = (patch_t *)W_CachePatchName(va("K_CHILI%d", cursorframe + 1), PU_PATCH);
|
||||||
V_DrawFixedPatch((curx << FRACBITS) - (FRACUNIT), (cury << FRACBITS) - (FRACUNIT), FRACUNIT+(FRACUNIT>>3), 0, cursor, NULL);
|
V_DrawFixedPatch((curx << FRACBITS) - (FRACUNIT), (cury << FRACBITS) - (FRACUNIT), FRACUNIT+(FRACUNIT>>3), 0, cursor, NULL);
|
||||||
}
|
}
|
||||||
@@ -8360,26 +8351,18 @@ static void M_DrawSetupMultiPlayerMenu(void)
|
|||||||
break;
|
break;
|
||||||
#undef SKINXSHIFT
|
#undef SKINXSHIFT
|
||||||
default:
|
default:
|
||||||
{
|
speed = skins[setupm_fakeskin].kartspeed;
|
||||||
speed = skins[setupm_fakeskin].kartspeed;
|
weight = skins[setupm_fakeskin].kartweight;
|
||||||
weight = skins[setupm_fakeskin].kartweight;
|
|
||||||
|
|
||||||
const INT32 x = ((BASEVIDWIDTH - mx - 80) + ((speed-1)*8))<<FRACBITS;
|
statdot = (patch_t *)W_CachePatchName("K_SDOT1", PU_PATCH);
|
||||||
const INT32 y = ((my+76) + ((weight-1)*8))<<FRACBITS;
|
if (skullAnimCounter < 4) // SRB2Kart: we draw this dot later so that it's not covered if there's multiple skins with the same stats
|
||||||
|
V_DrawFixedPatch(((BASEVIDWIDTH - mx - 80) + ((speed-1)*8))<<FRACBITS, ((my+76) + ((weight-1)*8))<<FRACBITS, FRACUNIT, 0, statdot, flashcol);
|
||||||
|
else
|
||||||
|
V_DrawFixedPatch(((BASEVIDWIDTH - mx - 80) + ((speed-1)*8))<<FRACBITS, ((my+76) + ((weight-1)*8))<<FRACBITS, FRACUNIT, 0, statdot, NULL);
|
||||||
|
|
||||||
statdot = (patch_t *)W_CachePatchName("K_SDOT1", PU_PATCH);
|
statdot = (patch_t *)W_CachePatchName("K_SDOT2", PU_PATCH); // coloured center
|
||||||
|
if (setupm_fakecolor)
|
||||||
if (skullAnimCounter < 4) // SRB2Kart: we draw this dot later so that it's not covered if there's multiple skins with the same stats
|
V_DrawFixedPatch(((BASEVIDWIDTH - mx - 80) + ((speed-1)*8))<<FRACBITS, ((my+76) + ((weight-1)*8))<<FRACBITS, FRACUNIT, 0, statdot, R_GetTranslationColormap(0, setupm_fakecolor, GTC_MENUCACHE));
|
||||||
V_DrawFixedPatch(x, y, FRACUNIT, 0, statdot, flashcol);
|
|
||||||
else
|
|
||||||
V_DrawFixedPatch(x, y, FRACUNIT, 0, statdot, NULL);
|
|
||||||
|
|
||||||
if (setupm_fakecolor)
|
|
||||||
{
|
|
||||||
statdot = (patch_t *)W_CachePatchName("K_SDOT2", PU_PATCH); // coloured center
|
|
||||||
V_DrawFixedPatch(x, y, FRACUNIT, 0, statdot, R_GetTranslationColormap(0, setupm_fakecolor, GTC_MENUCACHE));
|
|
||||||
}
|
|
||||||
}
|
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -8406,13 +8389,10 @@ static void M_DrawSetupMultiPlayerMenu(void)
|
|||||||
cw = charw;
|
cw = charw;
|
||||||
else
|
else
|
||||||
cw = indexwidth;
|
cw = indexwidth;
|
||||||
|
|
||||||
for (ch = 0; ch < 16; ch++)
|
for (ch = 0; ch < 16; ch++)
|
||||||
V_DrawFill(x, my+(cv_skinselectmenu.value?176:162)+ch, cw, 1, colortranslations[col][ch]);
|
V_DrawFill(x, my+(cv_skinselectmenu.value?176:162)+ch, cw, 1, colortranslations[col][ch]);
|
||||||
|
|
||||||
if (++col >= MAXSKINCOLORS)
|
if (++col >= MAXSKINCOLORS)
|
||||||
col -= MAXSKINCOLORS-1;
|
col -= MAXSKINCOLORS-1;
|
||||||
|
|
||||||
x += cw;
|
x += cw;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -8440,7 +8420,6 @@ static void M_DrawSetupMultiPlayerMenu(void)
|
|||||||
|
|
||||||
if (col < 0)
|
if (col < 0)
|
||||||
col += numskins;
|
col += numskins;
|
||||||
|
|
||||||
while (k <= icons)
|
while (k <= icons)
|
||||||
{
|
{
|
||||||
if (!(k++))
|
if (!(k++))
|
||||||
@@ -8457,16 +8436,12 @@ static void M_DrawSetupMultiPlayerMenu(void)
|
|||||||
offx = 8;
|
offx = 8;
|
||||||
offy = 8;
|
offy = 8;
|
||||||
}
|
}
|
||||||
|
|
||||||
colmap = R_GetTranslationColormap(col, setupm_fakecolor, GTC_MENUCACHE);
|
colmap = R_GetTranslationColormap(col, setupm_fakecolor, GTC_MENUCACHE);
|
||||||
V_DrawFixedPatch((x+offx)<<FRACBITS, (my+28+offy)<<FRACBITS, FRACUNIT, 0, face, colmap);
|
V_DrawFixedPatch((x+offx)<<FRACBITS, (my+28+offy)<<FRACBITS, FRACUNIT, 0, face, colmap);
|
||||||
|
|
||||||
if (scale == FRACUNIT) // bit of a hack
|
if (scale == FRACUNIT) // bit of a hack
|
||||||
V_DrawFixedPatch((x+offx)<<FRACBITS, (my+28+offy)<<FRACBITS, FRACUNIT, 0, cursor, colmap);
|
V_DrawFixedPatch((x+offx)<<FRACBITS, (my+28+offy)<<FRACBITS, FRACUNIT, 0, cursor, colmap);
|
||||||
|
|
||||||
if (++col >= numskins)
|
if (++col >= numskins)
|
||||||
col -= numskins;
|
col -= numskins;
|
||||||
|
|
||||||
x += FixedMul(iconwidth<<FRACBITS, 3*scale/2)/FRACUNIT;
|
x += FixedMul(iconwidth<<FRACBITS, 3*scale/2)/FRACUNIT;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -8607,7 +8582,6 @@ static void M_HandleSetupMultiPlayer(INT32 choice)
|
|||||||
}
|
}
|
||||||
else
|
else
|
||||||
M_NextOpt();
|
M_NextOpt();
|
||||||
|
|
||||||
S_StartSound(NULL, sfx_menu1); // Tails
|
S_StartSound(NULL, sfx_menu1); // Tails
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
@@ -8634,7 +8608,6 @@ static void M_HandleSetupMultiPlayer(INT32 choice)
|
|||||||
{
|
{
|
||||||
M_NextOpt();
|
M_NextOpt();
|
||||||
}
|
}
|
||||||
|
|
||||||
S_StartSound(NULL, sfx_menu1);
|
S_StartSound(NULL, sfx_menu1);
|
||||||
}
|
}
|
||||||
else if (itemOn == 0)
|
else if (itemOn == 0)
|
||||||
@@ -8645,11 +8618,9 @@ static void M_HandleSetupMultiPlayer(INT32 choice)
|
|||||||
}
|
}
|
||||||
else
|
else
|
||||||
M_NextOpt();
|
M_NextOpt();
|
||||||
|
|
||||||
S_StartSound(NULL, sfx_menu1); // Tails
|
S_StartSound(NULL, sfx_menu1); // Tails
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
|
||||||
M_NextOpt();
|
M_NextOpt();
|
||||||
S_StartSound(NULL, sfx_menu1); // Tails
|
S_StartSound(NULL, sfx_menu1); // Tails
|
||||||
break;
|
break;
|
||||||
@@ -8667,7 +8638,6 @@ static void M_HandleSetupMultiPlayer(INT32 choice)
|
|||||||
}
|
}
|
||||||
else
|
else
|
||||||
M_PrevOpt();
|
M_PrevOpt();
|
||||||
|
|
||||||
S_StartSound(NULL, sfx_menu1); // Tails
|
S_StartSound(NULL, sfx_menu1); // Tails
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
@@ -8686,7 +8656,6 @@ static void M_HandleSetupMultiPlayer(INT32 choice)
|
|||||||
{
|
{
|
||||||
M_PrevOpt();
|
M_PrevOpt();
|
||||||
}
|
}
|
||||||
|
|
||||||
S_StartSound(NULL, sfx_menu1);
|
S_StartSound(NULL, sfx_menu1);
|
||||||
}
|
}
|
||||||
else if (itemOn == 2)
|
else if (itemOn == 2)
|
||||||
@@ -8706,11 +8675,9 @@ static void M_HandleSetupMultiPlayer(INT32 choice)
|
|||||||
}
|
}
|
||||||
else
|
else
|
||||||
M_PrevOpt();
|
M_PrevOpt();
|
||||||
|
|
||||||
S_StartSound(NULL, sfx_menu1); // Tails
|
S_StartSound(NULL, sfx_menu1); // Tails
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
|
||||||
M_PrevOpt();
|
M_PrevOpt();
|
||||||
S_StartSound(NULL, sfx_menu1); // Tails
|
S_StartSound(NULL, sfx_menu1); // Tails
|
||||||
break;
|
break;
|
||||||
@@ -8729,7 +8696,6 @@ static void M_HandleSetupMultiPlayer(INT32 choice)
|
|||||||
setupm_skinselect--;
|
setupm_skinselect--;
|
||||||
else
|
else
|
||||||
setupm_skinselect = SELECTEDSTATSCOUNT - 1;
|
setupm_skinselect = SELECTEDSTATSCOUNT - 1;
|
||||||
|
|
||||||
S_StartSound(NULL, sfx_menu1);
|
S_StartSound(NULL, sfx_menu1);
|
||||||
}
|
}
|
||||||
else //player skin
|
else //player skin
|
||||||
@@ -8762,7 +8728,6 @@ static void M_HandleSetupMultiPlayer(INT32 choice)
|
|||||||
else if (cv_skinselectmenu.value == SKINMENUTYPE_EXTENDED)
|
else if (cv_skinselectmenu.value == SKINMENUTYPE_EXTENDED)
|
||||||
setupm_skinypos = (((roundedskins/8) - SKINGRIDHEIGHT-2) > 0 ? (roundedskins/8) - SKINGRIDHEIGHT-2 : 0);
|
setupm_skinypos = (((roundedskins/8) - SKINGRIDHEIGHT-2) > 0 ? (roundedskins/8) - SKINGRIDHEIGHT-2 : 0);
|
||||||
}
|
}
|
||||||
|
|
||||||
S_StartSound(NULL, sfx_menu1);
|
S_StartSound(NULL, sfx_menu1);
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
@@ -8793,7 +8758,6 @@ static void M_HandleSetupMultiPlayer(INT32 choice)
|
|||||||
setupm_skinselect++;
|
setupm_skinselect++;
|
||||||
else
|
else
|
||||||
setupm_skinselect = 0;
|
setupm_skinselect = 0;
|
||||||
|
|
||||||
S_StartSound(NULL, sfx_menu1);
|
S_StartSound(NULL, sfx_menu1);
|
||||||
}
|
}
|
||||||
else //player skin
|
else //player skin
|
||||||
@@ -8828,7 +8792,6 @@ static void M_HandleSetupMultiPlayer(INT32 choice)
|
|||||||
setupm_skinselect = 0;
|
setupm_skinselect = 0;
|
||||||
setupm_skinypos = 0;
|
setupm_skinypos = 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
S_StartSound(NULL, sfx_menu1);
|
S_StartSound(NULL, sfx_menu1);
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
@@ -8851,14 +8814,12 @@ static void M_HandleSetupMultiPlayer(INT32 choice)
|
|||||||
setupm_skinlockedselect = false;
|
setupm_skinlockedselect = false;
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
|
||||||
exitmenu = true;
|
exitmenu = true;
|
||||||
break;
|
break;
|
||||||
|
|
||||||
case KEY_BACKSPACE:
|
case KEY_BACKSPACE:
|
||||||
if (cv_skinselectmenu.value)
|
if (cv_skinselectmenu.value)
|
||||||
BREAKWHENLOCKED
|
BREAKWHENLOCKED
|
||||||
|
|
||||||
if (itemOn == 0)
|
if (itemOn == 0)
|
||||||
{
|
{
|
||||||
M_TextInputHandle(&setupm_input, choice);
|
M_TextInputHandle(&setupm_input, choice);
|
||||||
@@ -8888,7 +8849,6 @@ static void M_HandleSetupMultiPlayer(INT32 choice)
|
|||||||
case KEY_DEL:
|
case KEY_DEL:
|
||||||
if (cv_skinselectmenu.value)
|
if (cv_skinselectmenu.value)
|
||||||
BREAKWHENLOCKED
|
BREAKWHENLOCKED
|
||||||
|
|
||||||
if (itemOn == 0)
|
if (itemOn == 0)
|
||||||
{
|
{
|
||||||
M_TextInputHandle(&setupm_input, choice);
|
M_TextInputHandle(&setupm_input, choice);
|
||||||
@@ -9205,7 +9165,7 @@ static void M_DrawJoystick(void)
|
|||||||
compareval4 = cv_usejoystick[3].value;
|
compareval4 = cv_usejoystick[3].value;
|
||||||
compareval3 = cv_usejoystick[2].value;
|
compareval3 = cv_usejoystick[2].value;
|
||||||
compareval2 = cv_usejoystick[1].value;
|
compareval2 = cv_usejoystick[1].value;
|
||||||
compareval = cv_usejoystick[0].value;
|
compareval = cv_usejoystick[0].value;
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
if ((setupcontrolplayer == 4 && (i == compareval4))
|
if ((setupcontrolplayer == 4 && (i == compareval4))
|
||||||
@@ -9244,13 +9204,14 @@ void M_SetupJoystickMenu(INT32 choice)
|
|||||||
//
|
//
|
||||||
// Update cv_usejoystick.string here so that the user can
|
// Update cv_usejoystick.string here so that the user can
|
||||||
// properly change this value.
|
// properly change this value.
|
||||||
for (INT32 f = 0; f < MAXSPLITSCREENPLAYERS; f++)
|
if (i == cv_usejoystick[0].value)
|
||||||
{
|
CV_SetValue(&cv_usejoystick[0], i);
|
||||||
if (i == cv_usejoystick[f].value)
|
if (i == cv_usejoystick[1].value)
|
||||||
{
|
CV_SetValue(&cv_usejoystick[1], i);
|
||||||
CV_SetValue(&cv_usejoystick[f], i);
|
if (i == cv_usejoystick[2].value)
|
||||||
}
|
CV_SetValue(&cv_usejoystick[2], i);
|
||||||
}
|
if (i == cv_usejoystick[3].value)
|
||||||
|
CV_SetValue(&cv_usejoystick[3], i);
|
||||||
#endif
|
#endif
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -9289,11 +9250,9 @@ static void M_Setup4PJoystickMenu(INT32 choice)
|
|||||||
static void M_DoAssignJoystick(UINT8 pnum, INT32 choice)
|
static void M_DoAssignJoystick(UINT8 pnum, INT32 choice)
|
||||||
{
|
{
|
||||||
INT32 oldchoice, oldstringchoice;
|
INT32 oldchoice, oldstringchoice;
|
||||||
|
const int joynum = atoi(cv_usejoystick[pnum].string);
|
||||||
|
|
||||||
#define joystrnum (atoi(cv_usejoystick[pnum].string))
|
oldchoice = oldstringchoice = joynum > numcontrollers ? joynum : cv_usejoystick[pnum].value;
|
||||||
#define joyoldchoice ((joystrnum > numcontrollers) ? joystrnum : cv_usejoystick[pnum].value)
|
|
||||||
|
|
||||||
oldchoice = oldstringchoice = joyoldchoice;
|
|
||||||
CV_SetValue(&cv_usejoystick[pnum], choice);
|
CV_SetValue(&cv_usejoystick[pnum], choice);
|
||||||
|
|
||||||
// Just in case last-minute changes were made to cv_usejoystick.value,
|
// Just in case last-minute changes were made to cv_usejoystick.value,
|
||||||
@@ -9303,37 +9262,59 @@ static void M_DoAssignJoystick(UINT8 pnum, INT32 choice)
|
|||||||
{
|
{
|
||||||
CV_SetValue(&cv_usejoystick[pnum], cv_usejoystick[pnum].value);
|
CV_SetValue(&cv_usejoystick[pnum], cv_usejoystick[pnum].value);
|
||||||
|
|
||||||
// reset this so the comparison is valid
|
if (oldchoice > numcontrollers) /* reset this so the comparison is valid*/
|
||||||
if (oldchoice > numcontrollers)
|
|
||||||
oldchoice = cv_usejoystick[pnum].value;
|
oldchoice = cv_usejoystick[pnum].value;
|
||||||
|
|
||||||
if (oldchoice != choice)
|
if (oldchoice != choice)
|
||||||
{
|
{
|
||||||
if (choice && oldstringchoice > numcontrollers) // if we did not select "None", we likely selected a used device
|
if (choice && oldstringchoice > numcontrollers) // if we did not select "None", we likely selected a used device
|
||||||
{
|
CV_SetValue(&cv_usejoystick[pnum], (oldstringchoice > numcontrollers ? oldstringchoice : oldchoice));
|
||||||
CV_SetValue(&cv_usejoystick[pnum], ((oldstringchoice > numcontrollers) ? oldstringchoice : oldchoice));
|
|
||||||
}
|
|
||||||
|
|
||||||
if (oldstringchoice == joyoldchoice)
|
if (oldstringchoice ==
|
||||||
{
|
(joynum > numcontrollers ? joynum : cv_usejoystick[pnum].value))
|
||||||
M_StartMessage("This joystick is used by another\n"
|
M_StartMessage("This joystick is used by another\n"
|
||||||
"player. Reset the joystick\n"
|
"player. Reset the joystick\n"
|
||||||
"for that player first.\n\n"
|
"for that player first.\n\n"
|
||||||
"(Press a key)\n", NULL, MM_NOTHING);
|
"(Press a key)\n", NULL, MM_NOTHING);
|
||||||
}
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
#undef joystrnum
|
|
||||||
#undef joyoldchoice
|
|
||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
static void M_AssignJoystick(INT32 choice)
|
static void M_AssignJoystick(INT32 choice)
|
||||||
{
|
{
|
||||||
#ifdef JOYSTICK_HOTPLUG
|
#ifdef JOYSTICK_HOTPLUG
|
||||||
M_DoAssignJoystick((setupcontrolplayer-1), choice);
|
switch (setupcontrolplayer)
|
||||||
|
{
|
||||||
|
case 4:
|
||||||
|
M_DoAssignJoystick(3, choice);
|
||||||
|
break;
|
||||||
|
case 3:
|
||||||
|
M_DoAssignJoystick(2, choice);
|
||||||
|
break;
|
||||||
|
case 2:
|
||||||
|
M_DoAssignJoystick(1, choice);
|
||||||
|
break;
|
||||||
|
case 1:
|
||||||
|
M_DoAssignJoystick(0, choice);
|
||||||
|
break;
|
||||||
|
}
|
||||||
#else
|
#else
|
||||||
CV_SetValue(&cv_usejoystick[(setupcontrolplayer-1)], choice);
|
switch (setupcontrolplayer)
|
||||||
|
{
|
||||||
|
case 4:
|
||||||
|
CV_SetValue(&cv_usejoystick[3], choice);
|
||||||
|
break;
|
||||||
|
case 3:
|
||||||
|
CV_SetValue(&cv_usejoystick[2], choice);
|
||||||
|
break;
|
||||||
|
case 2:
|
||||||
|
CV_SetValue(&cv_usejoystick[1], choice);
|
||||||
|
break;
|
||||||
|
case 1:
|
||||||
|
CV_SetValue(&cv_usejoystick[0], choice);
|
||||||
|
break;
|
||||||
|
}
|
||||||
#endif
|
#endif
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -9371,7 +9352,7 @@ static void M_SetupControlsMenu(UINT8 pnum)
|
|||||||
{
|
{
|
||||||
// Hide P1-only controls
|
// Hide P1-only controls
|
||||||
OP_AllControlsMenu[19].status = IT_GRAYEDOUT2; // Chat
|
OP_AllControlsMenu[19].status = IT_GRAYEDOUT2; // Chat
|
||||||
OP_AllControlsMenu[20].status = IT_GRAYEDOUT2; // Rankings
|
OP_AllControlsMenu[10].status = IT_GRAYEDOUT2; // Rankings
|
||||||
OP_AllControlsMenu[21].status = IT_GRAYEDOUT2; // Pause
|
OP_AllControlsMenu[21].status = IT_GRAYEDOUT2; // Pause
|
||||||
OP_AllControlsMenu[22].status = IT_GRAYEDOUT2; // Screenshot
|
OP_AllControlsMenu[22].status = IT_GRAYEDOUT2; // Screenshot
|
||||||
OP_AllControlsMenu[23].status = IT_GRAYEDOUT2; // GIF
|
OP_AllControlsMenu[23].status = IT_GRAYEDOUT2; // GIF
|
||||||
@@ -9383,7 +9364,7 @@ static void M_SetupControlsMenu(UINT8 pnum)
|
|||||||
{
|
{
|
||||||
// Unhide P1-only controls
|
// Unhide P1-only controls
|
||||||
OP_AllControlsMenu[19].status = IT_CONTROL; // Chat
|
OP_AllControlsMenu[19].status = IT_CONTROL; // Chat
|
||||||
OP_AllControlsMenu[20].status = IT_CONTROL; // Rankings
|
OP_AllControlsMenu[10].status = IT_CONTROL; // Rankings
|
||||||
OP_AllControlsMenu[21].status = IT_CONTROL; // Pause
|
OP_AllControlsMenu[21].status = IT_CONTROL; // Pause
|
||||||
OP_AllControlsMenu[22].status = IT_CONTROL; // Screenshot
|
OP_AllControlsMenu[22].status = IT_CONTROL; // Screenshot
|
||||||
OP_AllControlsMenu[23].status = IT_CONTROL; // GIF
|
OP_AllControlsMenu[23].status = IT_CONTROL; // GIF
|
||||||
|
|||||||
+331
-708
File diff suppressed because it is too large.
Load diff
+1
-4
@@ -107,9 +107,6 @@ void P_DoNightsScore(player_t *player)
|
|||||||
|
|
||||||
dummymo = P_SpawnMobj(player->mo->x, player->mo->y, player->mo->z+player->mo->height/2, MT_NIGHTSCORE);
|
dummymo = P_SpawnMobj(player->mo->x, player->mo->y, player->mo->z+player->mo->height/2, MT_NIGHTSCORE);
|
||||||
|
|
||||||
if (P_MobjWasRemovedCompat(dummymo))
|
|
||||||
return;
|
|
||||||
|
|
||||||
if (player->bot)
|
if (player->bot)
|
||||||
player = &players[consoleplayer];
|
player = &players[consoleplayer];
|
||||||
|
|
||||||
@@ -2016,7 +2013,7 @@ static inline void P_NiGHTSDamage(mobj_t *target, mobj_t *source)
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
static boolean P_TagDamage(mobj_t *target, mobj_t *inflictor, mobj_t *source, INT32 damage)
|
static inline boolean P_TagDamage(mobj_t *target, mobj_t *inflictor, mobj_t *source, INT32 damage)
|
||||||
{
|
{
|
||||||
player_t *player = target->player;
|
player_t *player = target->player;
|
||||||
(void)damage; //unused parm
|
(void)damage; //unused parm
|
||||||
|
|||||||
@@ -418,7 +418,6 @@ boolean P_CheckSector(sector_t *sector, boolean crunch);
|
|||||||
void P_DelSeclist(msecnode_t *node);
|
void P_DelSeclist(msecnode_t *node);
|
||||||
|
|
||||||
void P_CreateSecNodeList(mobj_t *thing, fixed_t x, fixed_t y);
|
void P_CreateSecNodeList(mobj_t *thing, fixed_t x, fixed_t y);
|
||||||
void P_Initsecnode(void);
|
|
||||||
|
|
||||||
void P_RadiusAttack(mobj_t *spot, mobj_t *source, fixed_t damagedist);
|
void P_RadiusAttack(mobj_t *spot, mobj_t *source, fixed_t damagedist);
|
||||||
|
|
||||||
|
|||||||
+4
-36
@@ -2026,7 +2026,7 @@ static boolean P_CheckCameraPosition(fixed_t x, fixed_t y, camera_t *thiscam)
|
|||||||
|
|
||||||
mapcampointer = thiscam;
|
mapcampointer = thiscam;
|
||||||
|
|
||||||
if (newsec->flags & SF_NOCLIPCAMERA)
|
if (UNLIKELY(GETSECSPECIAL(newsec->special, 4) == 12))
|
||||||
{ // Camera noclip on entire sector.
|
{ // Camera noclip on entire sector.
|
||||||
tmfloorz = tmdropoffz = thiscam->z;
|
tmfloorz = tmdropoffz = thiscam->z;
|
||||||
tmceilingz = tmdrpoffceilz = thiscam->z + thiscam->height;
|
tmceilingz = tmdrpoffceilz = thiscam->z + thiscam->height;
|
||||||
@@ -2068,7 +2068,7 @@ static boolean P_CheckCameraPosition(fixed_t x, fixed_t y, camera_t *thiscam)
|
|||||||
fixed_t topheight, bottomheight, midheight;
|
fixed_t topheight, bottomheight, midheight;
|
||||||
|
|
||||||
if (!(rover->flags & FF_BLOCKOTHERS) || !(rover->flags & FF_EXISTS) || !(rover->flags & FF_RENDERALL)
|
if (!(rover->flags & FF_BLOCKOTHERS) || !(rover->flags & FF_EXISTS) || !(rover->flags & FF_RENDERALL)
|
||||||
|| rover->master->frontsector->flags & SF_NOCLIPCAMERA)
|
|| UNLIKELY(GETSECSPECIAL(rover->master->frontsector->special, 4) == 12))
|
||||||
continue;
|
continue;
|
||||||
|
|
||||||
topheight = P_CameraGetFOFTopZ(thiscam, newsec, rover, x, y, NULL);
|
topheight = P_CameraGetFOFTopZ(thiscam, newsec, rover, x, y, NULL);
|
||||||
@@ -2144,7 +2144,7 @@ static boolean P_CheckCameraPosition(fixed_t x, fixed_t y, camera_t *thiscam)
|
|||||||
// We're inside it! Yess...
|
// We're inside it! Yess...
|
||||||
polysec = po->lines[0]->backsector;
|
polysec = po->lines[0]->backsector;
|
||||||
|
|
||||||
if (polysec->flags & SF_NOCLIPCAMERA)
|
if (UNLIKELY(GETSECSPECIAL(polysec->special, 4) == 12))
|
||||||
{ // Camera noclip polyobj.
|
{ // Camera noclip polyobj.
|
||||||
plink = (polymaplink_t *)(plink->link.next);
|
plink = (polymaplink_t *)(plink->link.next);
|
||||||
continue;
|
continue;
|
||||||
@@ -3983,51 +3983,19 @@ boolean P_CheckSector(sector_t *sector, boolean crunch)
|
|||||||
Lots of new Boom functions that work faster and add functionality.
|
Lots of new Boom functions that work faster and add functionality.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#ifndef PHOBOS_BUILD
|
|
||||||
static msecnode_t *headsecnode = NULL;
|
|
||||||
#endif
|
|
||||||
|
|
||||||
void P_Initsecnode(void)
|
|
||||||
{
|
|
||||||
#ifndef PHOBOS_BUILD
|
|
||||||
headsecnode = NULL;
|
|
||||||
#endif
|
|
||||||
}
|
|
||||||
|
|
||||||
// P_GetSecnode() retrieves a node from the freelist. The calling routine
|
// P_GetSecnode() retrieves a node from the freelist. The calling routine
|
||||||
// should make sure it sets all fields properly.
|
// should make sure it sets all fields properly.
|
||||||
|
|
||||||
static msecnode_t *P_GetSecnode(void)
|
static msecnode_t *P_GetSecnode(void)
|
||||||
{
|
{
|
||||||
#ifdef PHOBOS_BUILD
|
|
||||||
return Z_LevelPoolCalloc(sizeof(msecnode_t));
|
return Z_LevelPoolCalloc(sizeof(msecnode_t));
|
||||||
#else
|
|
||||||
msecnode_t *node;
|
|
||||||
|
|
||||||
if (headsecnode)
|
|
||||||
{
|
|
||||||
// vanilla does not clear this
|
|
||||||
// so for compat reasons we also dont
|
|
||||||
// means we just reuse stale data which causes weird interactions with orbiting items in some cases
|
|
||||||
node = headsecnode;
|
|
||||||
headsecnode = headsecnode->m_thinglist_next;
|
|
||||||
}
|
|
||||||
else
|
|
||||||
node = Z_LevelPoolCalloc(sizeof(msecnode_t));
|
|
||||||
|
|
||||||
return node;
|
|
||||||
#endif
|
|
||||||
}
|
}
|
||||||
|
|
||||||
// P_PutSecnode() returns a node to the freelist.
|
// P_PutSecnode() returns a node to the freelist.
|
||||||
|
|
||||||
static inline void P_PutSecnode(msecnode_t *node)
|
static inline void P_PutSecnode(msecnode_t *node)
|
||||||
{
|
{
|
||||||
#ifdef PHOBOS_BUILD
|
|
||||||
Z_LevelPoolFree(node, sizeof(msecnode_t));
|
Z_LevelPoolFree(node, sizeof(msecnode_t));
|
||||||
#else
|
|
||||||
node->m_thinglist_next = headsecnode;
|
|
||||||
headsecnode = node;
|
|
||||||
#endif
|
|
||||||
}
|
}
|
||||||
|
|
||||||
// P_AddSecnode() searches the current list to see if this sector is
|
// P_AddSecnode() searches the current list to see if this sector is
|
||||||
|
|||||||
+2
-2
@@ -328,7 +328,7 @@ void P_CameraLineOpening(line_t *linedef)
|
|||||||
{
|
{
|
||||||
fixed_t topheight, bottomheight, midheight;
|
fixed_t topheight, bottomheight, midheight;
|
||||||
|
|
||||||
if (!(rover->flags & FF_BLOCKOTHERS) || !(rover->flags & FF_RENDERALL) || !(rover->flags & FF_EXISTS) || (rover->master->frontsector->flags & SF_NOCLIPCAMERA))
|
if (!(rover->flags & FF_BLOCKOTHERS) || !(rover->flags & FF_RENDERALL) || !(rover->flags & FF_EXISTS) || UNLIKELY(GETSECSPECIAL(rover->master->frontsector->special, 4) == 12))
|
||||||
continue;
|
continue;
|
||||||
|
|
||||||
topheight = P_CameraGetFOFTopZ(mapcampointer, front, rover, tmx, tmy, linedef);
|
topheight = P_CameraGetFOFTopZ(mapcampointer, front, rover, tmx, tmy, linedef);
|
||||||
@@ -358,7 +358,7 @@ void P_CameraLineOpening(line_t *linedef)
|
|||||||
{
|
{
|
||||||
fixed_t topheight, bottomheight, midheight;
|
fixed_t topheight, bottomheight, midheight;
|
||||||
|
|
||||||
if (!(rover->flags & FF_BLOCKOTHERS) || !(rover->flags & FF_RENDERALL) || !(rover->flags & FF_EXISTS) || (rover->master->frontsector->flags & SF_NOCLIPCAMERA))
|
if (!(rover->flags & FF_BLOCKOTHERS) || !(rover->flags & FF_RENDERALL) || !(rover->flags & FF_EXISTS) || UNLIKELY(GETSECSPECIAL(rover->master->frontsector->special, 4) == 12))
|
||||||
continue;
|
continue;
|
||||||
|
|
||||||
topheight = P_CameraGetFOFTopZ(mapcampointer, back, rover, tmx, tmy, linedef);
|
topheight = P_CameraGetFOFTopZ(mapcampointer, back, rover, tmx, tmy, linedef);
|
||||||
|
|||||||
+868
-1060
File diff suppressed because it is too large.
Load diff
@@ -3001,9 +3001,6 @@ boolean P_SetupLevel(boolean fromnetsave, boolean reloadinggamestate)
|
|||||||
CON_Drawer(); // let the user know what we are going to do
|
CON_Drawer(); // let the user know what we are going to do
|
||||||
I_FinishUpdate(); // page flip or blit buffer
|
I_FinishUpdate(); // page flip or blit buffer
|
||||||
|
|
||||||
// Initialize sector node list.
|
|
||||||
P_Initsecnode();
|
|
||||||
|
|
||||||
if (netgame || multiplayer)
|
if (netgame || multiplayer)
|
||||||
cv_debug = botskin = 0;
|
cv_debug = botskin = 0;
|
||||||
|
|
||||||
@@ -3331,7 +3328,6 @@ static boolean P_CheckSoundReplacements(UINT16 wadnum, char *name, size_t i)
|
|||||||
|
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
//
|
//
|
||||||
// P_CheckReplacMapReplacements
|
// P_CheckReplacMapReplacements
|
||||||
//
|
//
|
||||||
|
|||||||
+4
-18
@@ -3394,7 +3394,7 @@ void P_ProcessSpecialSector(player_t *player, sector_t *sector, sector_t *rovers
|
|||||||
break;
|
break;
|
||||||
case 12: // SRB2kart: Invert Encore Remap
|
case 12: // SRB2kart: Invert Encore Remap
|
||||||
break;
|
break;
|
||||||
case 15: // also Invert Encore Remap....
|
case 15: // no idea but keep it dont want anything to break
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
DoneSection2:
|
DoneSection2:
|
||||||
@@ -5368,11 +5368,6 @@ void P_SpawnSpecials(INT32 fromnetsave, boolean reloadinggamestate)
|
|||||||
case 11: // Custom global gravity!
|
case 11: // Custom global gravity!
|
||||||
gravity = sector->floorheight/1000;
|
gravity = sector->floorheight/1000;
|
||||||
break;
|
break;
|
||||||
|
|
||||||
case 12: // SRB2kart: Invert Encore Remap
|
|
||||||
case 15: // NOTE: vanilla kart checks only for this for some reason!
|
|
||||||
sector->flags |= SF_INVERTENCORE;
|
|
||||||
break;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
// Process Section 4
|
// Process Section 4
|
||||||
@@ -5382,10 +5377,6 @@ void P_SpawnSpecials(INT32 fromnetsave, boolean reloadinggamestate)
|
|||||||
if (G_RaceGametype())
|
if (G_RaceGametype())
|
||||||
circuitmap = true;
|
circuitmap = true;
|
||||||
break;
|
break;
|
||||||
|
|
||||||
case 12: // Camera noclip
|
|
||||||
sector->flags |= SF_NOCLIPCAMERA;
|
|
||||||
break;
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -5470,11 +5461,11 @@ void P_SpawnSpecials(INT32 fromnetsave, boolean reloadinggamestate)
|
|||||||
sectors[s].gravity = §ors[sec].floorheight; // This allows it to change in realtime!
|
sectors[s].gravity = §ors[sec].floorheight; // This allows it to change in realtime!
|
||||||
|
|
||||||
if (lines[i].flags & ML_NOCLIMB)
|
if (lines[i].flags & ML_NOCLIMB)
|
||||||
sectors[s].flags |= SF_GRAVITYFLIP;
|
sectors[s].verticalflip = true;
|
||||||
else
|
else
|
||||||
sectors[s].flags &= ~SF_GRAVITYFLIP;
|
sectors[s].verticalflip = false;
|
||||||
|
|
||||||
CheckForReverseGravity = (boolean)(sectors[s].flags & SF_GRAVITYFLIP);
|
CheckForReverseGravity = sectors[s].verticalflip;
|
||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
|
|
||||||
@@ -5567,11 +5558,6 @@ void P_SpawnSpecials(INT32 fromnetsave, boolean reloadinggamestate)
|
|||||||
sectors[s].cullheight = &lines[i]; // This allows it to change in realtime!
|
sectors[s].cullheight = &lines[i]; // This allows it to change in realtime!
|
||||||
break;
|
break;
|
||||||
|
|
||||||
case 13: // Heat wave effect
|
|
||||||
for (s = -1; (s = P_FindSectorFromLineTag(lines + i, s)) >= 0 ;)
|
|
||||||
sectors[s].flags |= SF_HEATWAVE;
|
|
||||||
break;
|
|
||||||
|
|
||||||
case 50: // Insta-Lower Sector
|
case 50: // Insta-Lower Sector
|
||||||
EV_DoFloor(&lines[i], instantLower);
|
EV_DoFloor(&lines[i], instantLower);
|
||||||
break;
|
break;
|
||||||
|
|||||||
+6
-7
@@ -1017,7 +1017,7 @@ boolean P_IsLocalPlayer(const player_t *player)
|
|||||||
}
|
}
|
||||||
|
|
||||||
//
|
//
|
||||||
// P_IsLocalPlayerNum
|
// P_IsLocalPlayer
|
||||||
//
|
//
|
||||||
// Returns true if playernum is
|
// Returns true if playernum is
|
||||||
// on the local machine.
|
// on the local machine.
|
||||||
@@ -3561,7 +3561,7 @@ static boolean P_CheckNoclipCameraPosition(player_t *player, camera_t *thiscam,
|
|||||||
for (rover = newsubsec->sector->ffloors; rover; rover = rover->next)
|
for (rover = newsubsec->sector->ffloors; rover; rover = rover->next)
|
||||||
{
|
{
|
||||||
fixed_t topheight, bottomheight;
|
fixed_t topheight, bottomheight;
|
||||||
if (!(rover->flags & FF_BLOCKOTHERS) || !(rover->flags & FF_EXISTS) || !(rover->flags & FF_RENDERALL) || (rover->master->frontsector->flags & SF_NOCLIPCAMERA))
|
if (!(rover->flags & FF_BLOCKOTHERS) || !(rover->flags & FF_EXISTS) || !(rover->flags & FF_RENDERALL) || UNLIKELY(GETSECSPECIAL(rover->master->frontsector->special, 4) == 12))
|
||||||
continue;
|
continue;
|
||||||
|
|
||||||
topheight = P_CameraGetFOFTopZ(thiscam, newsubsec->sector, rover, midx, midy, NULL);
|
topheight = P_CameraGetFOFTopZ(thiscam, newsubsec->sector, rover, midx, midy, NULL);
|
||||||
@@ -3626,7 +3626,7 @@ static boolean P_CheckNoclipCameraPosition(player_t *player, camera_t *thiscam,
|
|||||||
// We're inside it! Yess...
|
// We're inside it! Yess...
|
||||||
polysec = po->lines[0]->backsector;
|
polysec = po->lines[0]->backsector;
|
||||||
|
|
||||||
if (polysec->flags & SF_NOCLIPCAMERA)
|
if (UNLIKELY(GETSECSPECIAL(polysec->special, 4) == 12))
|
||||||
{ // Camera noclip polyobj.
|
{ // Camera noclip polyobj.
|
||||||
plink = (polymaplink_t *)(plink->link.next);
|
plink = (polymaplink_t *)(plink->link.next);
|
||||||
continue;
|
continue;
|
||||||
@@ -3682,8 +3682,7 @@ static boolean P_CheckNoclipCameraPosition(player_t *player, camera_t *thiscam,
|
|||||||
for (rover = newsubsec->sector->ffloors; rover; rover = rover->next)
|
for (rover = newsubsec->sector->ffloors; rover; rover = rover->next)
|
||||||
{
|
{
|
||||||
fixed_t topheight, bottomheight;
|
fixed_t topheight, bottomheight;
|
||||||
|
if (UNLIKELY((rover->flags & FF_BLOCKOTHERS) && (rover->flags & FF_RENDERALL) && (rover->flags & FF_EXISTS) && GETSECSPECIAL(rover->master->frontsector->special, 4) == 12))
|
||||||
if ((rover->flags & FF_BLOCKOTHERS) && (rover->flags & FF_RENDERALL) && (rover->flags & FF_EXISTS) && (rover->master->frontsector->flags & SF_NOCLIPCAMERA))
|
|
||||||
{
|
{
|
||||||
topheight = P_CameraGetFOFTopZ(thiscam, newsubsec->sector, rover, midx, midy, NULL);
|
topheight = P_CameraGetFOFTopZ(thiscam, newsubsec->sector, rover, midx, midy, NULL);
|
||||||
bottomheight = P_CameraGetFOFBottomZ(thiscam, newsubsec->sector, rover, midx, midy, NULL);
|
bottomheight = P_CameraGetFOFBottomZ(thiscam, newsubsec->sector, rover, midx, midy, NULL);
|
||||||
@@ -4263,7 +4262,7 @@ boolean P_SpectatorJoinGame(player_t *player)
|
|||||||
|
|
||||||
static boolean P_CameraCheckHeatFirstperson(player_t *player, sector_t *sector, fixed_t pviewheight)
|
static boolean P_CameraCheckHeatFirstperson(player_t *player, sector_t *sector, fixed_t pviewheight)
|
||||||
{
|
{
|
||||||
if (sector->flags & SF_HEATWAVE)
|
if (P_FindSpecialLineFromTag(13, sector->tag, -1) != -1)
|
||||||
return true;
|
return true;
|
||||||
|
|
||||||
if (sector->ffloors)
|
if (sector->ffloors)
|
||||||
@@ -4281,7 +4280,7 @@ static boolean P_CameraCheckHeatFirstperson(player_t *player, sector_t *sector,
|
|||||||
if (pviewheight <= P_GetFFloorBottomZAt(rover, player->mo->x, player->mo->y))
|
if (pviewheight <= P_GetFFloorBottomZAt(rover, player->mo->x, player->mo->y))
|
||||||
continue;
|
continue;
|
||||||
|
|
||||||
if (rover->master->frontsector->flags & SF_HEATWAVE)
|
if (P_FindSpecialLineFromTag(13, rover->master->frontsector->tag, -1) != -1)
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
+4
-3
@@ -48,7 +48,8 @@ boolean g_walloffscreen = false;
|
|||||||
|
|
||||||
boolean R_NoEncore(sector_t *sector, boolean ceiling)
|
boolean R_NoEncore(sector_t *sector, boolean ceiling)
|
||||||
{
|
{
|
||||||
const boolean invertEncore = (sector->flags & SF_INVERTENCORE);
|
const INT32 invspecial = GETSECSPECIAL(sector->special, 2);
|
||||||
|
boolean invertencore = (invspecial == 12 || invspecial == 15); // keeping this incase its used
|
||||||
|
|
||||||
#if 0 // perfect implementation
|
#if 0 // perfect implementation
|
||||||
const INT32 sprnspecial = GETSECSPECIAL(sector->special, 3);
|
const INT32 sprnspecial = GETSECSPECIAL(sector->special, 3);
|
||||||
@@ -58,10 +59,10 @@ boolean R_NoEncore(sector_t *sector, boolean ceiling)
|
|||||||
#endif
|
#endif
|
||||||
&& GETSECSPECIAL(sector->special, 4) != 6) // sneaker panel
|
&& GETSECSPECIAL(sector->special, 4) != 6) // sneaker panel
|
||||||
{
|
{
|
||||||
return invertEncore;
|
return invertencore;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (invertEncore)
|
if (invertencore)
|
||||||
{
|
{
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|||||||
+5
-13
@@ -307,19 +307,10 @@ typedef struct pslope_s
|
|||||||
|
|
||||||
typedef enum
|
typedef enum
|
||||||
{
|
{
|
||||||
// flipspecial - planes with effect
|
SF_FLIPSPECIAL_FLOOR = 1,
|
||||||
SF_FLIPSPECIAL_FLOOR = 1,
|
SF_FLIPSPECIAL_CEILING = 2,
|
||||||
SF_FLIPSPECIAL_CEILING = 1<<1,
|
SF_FLIPSPECIAL_BOTH = 3,
|
||||||
SF_FLIPSPECIAL_BOTH = (SF_FLIPSPECIAL_FLOOR|SF_FLIPSPECIAL_CEILING),
|
SF_TRIGGERSPECIAL_TOUCH = 4,
|
||||||
// triggerspecial - conditions under which plane touch causes effect
|
|
||||||
SF_TRIGGERSPECIAL_TOUCH = 1<<2,
|
|
||||||
|
|
||||||
SF_GRAVITYFLIP = 1<<3,
|
|
||||||
SF_HEATWAVE = 1<<4,
|
|
||||||
SF_NOCLIPCAMERA = 1<<5,
|
|
||||||
|
|
||||||
// invert encore color remap status
|
|
||||||
SF_INVERTENCORE = 1<<6,
|
|
||||||
} sectorflags_t;
|
} sectorflags_t;
|
||||||
|
|
||||||
//
|
//
|
||||||
@@ -400,6 +391,7 @@ typedef struct sector_s
|
|||||||
|
|
||||||
// This points to the master's floorheight, so it can be changed in realtime!
|
// This points to the master's floorheight, so it can be changed in realtime!
|
||||||
fixed_t *gravity; // per-sector gravity
|
fixed_t *gravity; // per-sector gravity
|
||||||
|
boolean verticalflip; // If gravity < 0, then allow flipped physics
|
||||||
sectorflags_t flags;
|
sectorflags_t flags;
|
||||||
|
|
||||||
// Sprite culling feature
|
// Sprite culling feature
|
||||||
|
|||||||
+12
-10
@@ -174,10 +174,15 @@ static void BlendTab_Translucent(UINT8 *table, int style, UINT8 blendamt)
|
|||||||
{
|
{
|
||||||
frontrgba = pGammaCorrectedPalette[fg];
|
frontrgba = pGammaCorrectedPalette[fg];
|
||||||
|
|
||||||
|
#if 0 // perfect implementation
|
||||||
|
result.rgba = ASTBlendPixel(backrgba, frontrgba, style, 0xFF);
|
||||||
|
result.rgba = ASTBlendPixel(result, frontrgba, AST_TRANSLUCENT, blendamt);
|
||||||
|
table[((bg * 0x100) + fg)] = GetColorLUT(&transtab_lut, result.s.red, result.s.green, result.s.blue);
|
||||||
|
#else // performance scrabbler
|
||||||
result.rgba = ASTBlendPixel(backrgba, frontrgba, style, 0xFF);
|
result.rgba = ASTBlendPixel(backrgba, frontrgba, style, 0xFF);
|
||||||
result.rgba = ASTBlendPixel(result, frontrgba, AST_TRANSLUCENT, blendamt);
|
result.rgba = ASTBlendPixel(result, frontrgba, AST_TRANSLUCENT, blendamt);
|
||||||
|
|
||||||
table[((bg * 0x100) + fg)] = GetColorLUT(&transtab_lut_corrected, result.s.red, result.s.green, result.s.blue); // pGammaCorrectedPalette
|
table[((bg * 0x100) + fg)] = GetColorLUT(&transtab_lut_corrected, result.s.red, result.s.green, result.s.blue); // pGammaCorrectedPalette
|
||||||
|
#endif
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -185,7 +190,6 @@ static void BlendTab_Translucent(UINT8 *table, int style, UINT8 blendamt)
|
|||||||
static void BlendTab_Subtractive(UINT8 *table, int style, UINT8 blendamt)
|
static void BlendTab_Subtractive(UINT8 *table, int style, UINT8 blendamt)
|
||||||
{
|
{
|
||||||
INT16 bg, fg;
|
INT16 bg, fg;
|
||||||
RGBA_t backrgba, frontrgba, result;
|
|
||||||
|
|
||||||
if (table == NULL)
|
if (table == NULL)
|
||||||
I_Error("BlendTab_Subtractive: input table was NULL!");
|
I_Error("BlendTab_Subtractive: input table was NULL!");
|
||||||
@@ -198,11 +202,11 @@ static void BlendTab_Subtractive(UINT8 *table, int style, UINT8 blendamt)
|
|||||||
|
|
||||||
for (bg = 0; bg < 0x100; bg++)
|
for (bg = 0; bg < 0x100; bg++)
|
||||||
{
|
{
|
||||||
backrgba = pLocalPalette[bg]; // intentionally uses pLocalPalette
|
|
||||||
|
|
||||||
for (fg = 0; fg < 0x100; fg++)
|
for (fg = 0; fg < 0x100; fg++)
|
||||||
{
|
{
|
||||||
frontrgba = pLocalPalette[fg];
|
RGBA_t backrgba = V_GetColor(bg);
|
||||||
|
RGBA_t frontrgba = V_GetColor(fg);
|
||||||
|
RGBA_t result;
|
||||||
|
|
||||||
result.rgba = ASTBlendPixel(backrgba, frontrgba, style, 0xFF);
|
result.rgba = ASTBlendPixel(backrgba, frontrgba, style, 0xFF);
|
||||||
result.s.red = std::max(0, result.s.red - blendamt);
|
result.s.red = std::max(0, result.s.red - blendamt);
|
||||||
@@ -217,19 +221,17 @@ static void BlendTab_Subtractive(UINT8 *table, int style, UINT8 blendamt)
|
|||||||
static void BlendTab_Modulative(UINT8 *table)
|
static void BlendTab_Modulative(UINT8 *table)
|
||||||
{
|
{
|
||||||
INT16 bg, fg;
|
INT16 bg, fg;
|
||||||
RGBA_t backrgba, frontrgba, result;
|
|
||||||
|
|
||||||
if (table == NULL)
|
if (table == NULL)
|
||||||
I_Error("BlendTab_Modulative: input table was NULL!");
|
I_Error("BlendTab_Modulative: input table was NULL!");
|
||||||
|
|
||||||
for (bg = 0; bg < 0x100; bg++)
|
for (bg = 0; bg < 0x100; bg++)
|
||||||
{
|
{
|
||||||
backrgba = pGammaCorrectedPalette[bg];
|
|
||||||
|
|
||||||
for (fg = 0; fg < 0x100; fg++)
|
for (fg = 0; fg < 0x100; fg++)
|
||||||
{
|
{
|
||||||
frontrgba = pGammaCorrectedPalette[fg];
|
RGBA_t backrgba = V_GetColor(bg);
|
||||||
|
RGBA_t frontrgba = V_GetColor(fg);
|
||||||
|
RGBA_t result;
|
||||||
result.rgba = ASTBlendPixel(backrgba, frontrgba, AST_MODULATE, 0);
|
result.rgba = ASTBlendPixel(backrgba, frontrgba, AST_MODULATE, 0);
|
||||||
table[((bg * 0x100) + fg)] = GetColorLUT(&transtab_lut_corrected, result.s.red, result.s.green, result.s.blue);
|
table[((bg * 0x100) + fg)] = GetColorLUT(&transtab_lut_corrected, result.s.red, result.s.green, result.s.blue);
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1021,8 +1021,6 @@ void I_InitJoystick(UINT8 index)
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
#if 0 // no dont do this
|
|
||||||
// reset everything just in case
|
|
||||||
JoyInfo[index].dev = NULL;
|
JoyInfo[index].dev = NULL;
|
||||||
JoyInfo[index].oldjoy = -1;
|
JoyInfo[index].oldjoy = -1;
|
||||||
#if (SDL_VERSION_ATLEAST(2,32,4))
|
#if (SDL_VERSION_ATLEAST(2,32,4))
|
||||||
@@ -1030,7 +1028,6 @@ void I_InitJoystick(UINT8 index)
|
|||||||
#endif
|
#endif
|
||||||
JoyInfo[index].hasled = false;
|
JoyInfo[index].hasled = false;
|
||||||
JoyInfo[index].hasrumble = false;
|
JoyInfo[index].hasrumble = false;
|
||||||
#endif
|
|
||||||
|
|
||||||
if (cv_usejoystick[index].value)
|
if (cv_usejoystick[index].value)
|
||||||
newcontroller = SDL_GameControllerOpen(cv_usejoystick[index].value-1);
|
newcontroller = SDL_GameControllerOpen(cv_usejoystick[index].value-1);
|
||||||
|
|||||||
+2
-2
@@ -410,7 +410,7 @@ static void ST_drawDebugInfo(void)
|
|||||||
}
|
}
|
||||||
|
|
||||||
if (cv_debug & DBG_MEMORY)
|
if (cv_debug & DBG_MEMORY)
|
||||||
V_DrawRightAlignedString(320, height, V_MONOSPACE, va("Heap used: %7sKB", sizeu1(Z_TotalUsage()>>10)));
|
V_DrawRightAlignedString(320, height, V_MONOSPACE, va("Heap used: %7sKB", sizeu1(Z_TagsUsage(0, INT32_MAX)>>10)));
|
||||||
}
|
}
|
||||||
|
|
||||||
static void ST_drawLevelTitle(void)
|
static void ST_drawLevelTitle(void)
|
||||||
@@ -568,7 +568,7 @@ static void ST_overlayDrawer(void)
|
|||||||
{
|
{
|
||||||
if (!(multiplayer && demo.playback))
|
if (!(multiplayer && demo.playback))
|
||||||
{
|
{
|
||||||
if (!P_IsLocalPlayer(stplyr))
|
if(!P_IsLocalPlayer(stplyr))
|
||||||
{
|
{
|
||||||
/*char name[MAXPLAYERNAME+1];
|
/*char name[MAXPLAYERNAME+1];
|
||||||
// shorten the name if its more than twelve characters.
|
// shorten the name if its more than twelve characters.
|
||||||
|
|||||||
+7
-8
@@ -396,11 +396,6 @@ FUNCINLINE static ATTRINLINE UINT32 W_HashLumpName(const char *name)
|
|||||||
return FNV1a_HashLowercaseString(name);
|
return FNV1a_HashLowercaseString(name);
|
||||||
}
|
}
|
||||||
|
|
||||||
FUNCINLINE static ATTRINLINE UINT32 W_HashLumpNameLen(const char *name, size_t len)
|
|
||||||
{
|
|
||||||
return FNV1a_QuickCaseHash(name, len);
|
|
||||||
}
|
|
||||||
|
|
||||||
/** Detect a file type.
|
/** Detect a file type.
|
||||||
* \todo Actually detect the wad/pkzip headers and whatnot, instead of just checking the extensions.
|
* \todo Actually detect the wad/pkzip headers and whatnot, instead of just checking the extensions.
|
||||||
*/
|
*/
|
||||||
@@ -1100,14 +1095,18 @@ const char *W_CheckNameForNum(lumpnum_t lumpnum)
|
|||||||
UINT16 W_CheckNumForNamePwad(const char *name, UINT16 wad, UINT16 startlump)
|
UINT16 W_CheckNumForNamePwad(const char *name, UINT16 wad, UINT16 startlump)
|
||||||
{
|
{
|
||||||
UINT16 i;
|
UINT16 i;
|
||||||
|
static char uname[8 + 1];
|
||||||
UINT32 hash;
|
UINT32 hash;
|
||||||
size_t namelen;
|
size_t namelen;
|
||||||
|
|
||||||
if (!TestValidLump(wad, 0))
|
if (!TestValidLump(wad, 0))
|
||||||
return INT16_MAX;
|
return INT16_MAX;
|
||||||
|
|
||||||
namelen = strnlen(name, 8); // :chaosleep:
|
memset(uname, 0, sizeof(uname));
|
||||||
hash = W_HashLumpNameLen(name, namelen);
|
strncpy(uname, name, sizeof(uname)-1);
|
||||||
|
strupr(uname);
|
||||||
|
namelen = strlen(uname);
|
||||||
|
hash = W_HashLumpName(uname);
|
||||||
|
|
||||||
//
|
//
|
||||||
// scan forward
|
// scan forward
|
||||||
@@ -1122,7 +1121,7 @@ UINT16 W_CheckNumForNamePwad(const char *name, UINT16 wad, UINT16 startlump)
|
|||||||
{
|
{
|
||||||
if (lump_p->namelength == namelen
|
if (lump_p->namelength == namelen
|
||||||
&& lump_p->hash.name == hash
|
&& lump_p->hash.name == hash
|
||||||
&& !strncasecmp(lump_p->name, name, namelen))
|
&& !memcmp(lump_p->name, uname, sizeof(uname) - 1))
|
||||||
return i;
|
return i;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -256,7 +256,6 @@ static void Y_CalculateMatchData(UINT8 rankingsmode, void (*comparison)(INT32))
|
|||||||
}
|
}
|
||||||
|
|
||||||
if (demo.recording && !rankingsmode)
|
if (demo.recording && !rankingsmode)
|
||||||
{
|
|
||||||
G_WriteStanding(
|
G_WriteStanding(
|
||||||
data.pos[data.numplayers],
|
data.pos[data.numplayers],
|
||||||
data.name[data.numplayers],
|
data.name[data.numplayers],
|
||||||
@@ -264,7 +263,6 @@ static void Y_CalculateMatchData(UINT8 rankingsmode, void (*comparison)(INT32))
|
|||||||
*data.color[data.numplayers],
|
*data.color[data.numplayers],
|
||||||
data.val[data.numplayers]
|
data.val[data.numplayers]
|
||||||
);
|
);
|
||||||
}
|
|
||||||
|
|
||||||
data.numplayers++;
|
data.numplayers++;
|
||||||
}
|
}
|
||||||
|
|||||||
+60
-114
@@ -75,7 +75,7 @@ typedef struct memblock_s
|
|||||||
#define MEMBLOCK(x) (memblock_t *)((uintptr_t)(x) - ALIGNPAD - sizeof(memblock_t))
|
#define MEMBLOCK(x) (memblock_t *)((uintptr_t)(x) - ALIGNPAD - sizeof(memblock_t))
|
||||||
|
|
||||||
// both the head and tail of the zone memory block list
|
// both the head and tail of the zone memory block list
|
||||||
static memblock_t headlist[NUM_PURGETAGS];
|
static memblock_t head;
|
||||||
|
|
||||||
static constexpr size_t kLevelLargePoolBlockSize = sizeof(mobj_t);
|
static constexpr size_t kLevelLargePoolBlockSize = sizeof(mobj_t);
|
||||||
static constexpr size_t kLevelMedPoolBlockSize = sizeof(precipmobj_t);
|
static constexpr size_t kLevelMedPoolBlockSize = sizeof(precipmobj_t);
|
||||||
@@ -107,14 +107,10 @@ static void Command_Memdump_f(void);
|
|||||||
void Z_Init(void)
|
void Z_Init(void)
|
||||||
{
|
{
|
||||||
size_t total, memfree;
|
size_t total, memfree;
|
||||||
size_t i;
|
|
||||||
|
|
||||||
memset(&headlist, 0x00, sizeof(headlist));
|
memset(&head, 0x00, sizeof(head));
|
||||||
|
|
||||||
for (i = 0; i < NUM_PURGETAGS; i++)
|
head.next = head.prev = &head;
|
||||||
{
|
|
||||||
headlist[i].next = headlist[i].prev = &headlist[i];
|
|
||||||
}
|
|
||||||
|
|
||||||
memfree = I_GetFreeMem(&total)>>20;
|
memfree = I_GetFreeMem(&total)>>20;
|
||||||
|
|
||||||
@@ -208,7 +204,7 @@ static void *xm(size_t size)
|
|||||||
if (p == NULL)
|
if (p == NULL)
|
||||||
{
|
{
|
||||||
// Oh crumbs: we're out of heap. Try purging the cache and reallocating.
|
// Oh crumbs: we're out of heap. Try purging the cache and reallocating.
|
||||||
Z_FreeTags(PU_PURGELEVEL, NUM_PURGETAGS-1);
|
Z_FreeTags(PU_PURGELEVEL, INT32_MAX);
|
||||||
p = malloc(padedsize);
|
p = malloc(padedsize);
|
||||||
|
|
||||||
if (p == NULL)
|
if (p == NULL)
|
||||||
@@ -249,9 +245,9 @@ void *Z_Malloc(size_t size, INT32 tag, void *user)
|
|||||||
ptr = MEMORY(block);
|
ptr = MEMORY(block);
|
||||||
I_Assert((intptr_t)ptr % alignof (max_align_t) == 0);
|
I_Assert((intptr_t)ptr % alignof (max_align_t) == 0);
|
||||||
|
|
||||||
block->next = headlist[tag].next;
|
block->next = head.next;
|
||||||
block->prev = &headlist[tag];
|
block->prev = &head;
|
||||||
headlist[tag].next = block;
|
head.next = block;
|
||||||
block->next->prev = block;
|
block->next->prev = block;
|
||||||
|
|
||||||
block->tag = tag;
|
block->tag = tag;
|
||||||
@@ -415,7 +411,6 @@ void Z_FreeTags(INT32 lowtag, INT32 hightag)
|
|||||||
#endif
|
#endif
|
||||||
{
|
{
|
||||||
memblock_t *block, *next;
|
memblock_t *block, *next;
|
||||||
INT32 i;
|
|
||||||
|
|
||||||
#ifdef ZDEBUG
|
#ifdef ZDEBUG
|
||||||
Z_CheckHeap2(file, line);
|
Z_CheckHeap2(file, line);
|
||||||
@@ -432,13 +427,11 @@ void Z_FreeTags(INT32 lowtag, INT32 hightag)
|
|||||||
g_level_tiny_pool.release();
|
g_level_tiny_pool.release();
|
||||||
}
|
}
|
||||||
|
|
||||||
for (i = lowtag; i <= hightag; i++)
|
for (block = head.next; block != &head; block = next)
|
||||||
{
|
{
|
||||||
for (block = headlist[i].next; block != &headlist[i]; block = next)
|
next = block->next; // get link before freeing
|
||||||
{
|
if (block->tag >= lowtag && block->tag <= hightag)
|
||||||
next = block->next; // get link before freeing
|
|
||||||
Z_Free(MEMORY(block));
|
Z_Free(MEMORY(block));
|
||||||
}
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -451,20 +444,18 @@ void Z_FreeTags(INT32 lowtag, INT32 hightag)
|
|||||||
void Z_IterateTags(INT32 lowtag, INT32 hightag, boolean (*iterfunc)(void *))
|
void Z_IterateTags(INT32 lowtag, INT32 hightag, boolean (*iterfunc)(void *))
|
||||||
{
|
{
|
||||||
memblock_t *block, *next;
|
memblock_t *block, *next;
|
||||||
INT32 i;
|
|
||||||
|
|
||||||
if (!iterfunc)
|
if (!iterfunc)
|
||||||
I_Error("Z_IterateTags: no iterator function was given");
|
I_Error("Z_IterateTags: no iterator function was given");
|
||||||
|
|
||||||
for (i = lowtag; i <= hightag; i++)
|
for (block = head.next; block != &head; block = next)
|
||||||
{
|
{
|
||||||
for (block = headlist[i].next; block != &headlist[i]; block = next)
|
next = block->next; // get link before possibly freeing
|
||||||
{
|
|
||||||
next = block->next; // get link before possibly freeing
|
|
||||||
|
|
||||||
|
if (block->tag >= lowtag && block->tag <= hightag)
|
||||||
|
{
|
||||||
void *mem = MEMORY(block);
|
void *mem = MEMORY(block);
|
||||||
boolean free = iterfunc(mem);
|
boolean free = iterfunc(mem);
|
||||||
|
|
||||||
if (free)
|
if (free)
|
||||||
Z_Free(mem);
|
Z_Free(mem);
|
||||||
}
|
}
|
||||||
@@ -495,7 +486,7 @@ void Z_CheckMemCleanup(void)
|
|||||||
if (nextcleanup-- == 0)
|
if (nextcleanup-- == 0)
|
||||||
{
|
{
|
||||||
nextcleanup = CLEANUPCOUNT;
|
nextcleanup = CLEANUPCOUNT;
|
||||||
Z_FreeTags(PU_PURGELEVEL, NUM_PURGETAGS-1);
|
Z_FreeTags(PU_PURGELEVEL, INT32_MAX);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -513,7 +504,6 @@ void Z_CheckHeap(INT32 tag)
|
|||||||
{
|
{
|
||||||
memblock_t *block;
|
memblock_t *block;
|
||||||
UINT32 blocknumon = 0;
|
UINT32 blocknumon = 0;
|
||||||
size_t j;
|
|
||||||
void *given;
|
void *given;
|
||||||
|
|
||||||
#ifndef ZDEBUG
|
#ifndef ZDEBUG
|
||||||
@@ -530,47 +520,40 @@ void Z_CheckHeap(INT32 tag)
|
|||||||
blocknumon, block->ownerfile, block->ownerline, msg)
|
blocknumon, block->ownerfile, block->ownerline, msg)
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
for (j = 0; j < NUM_PURGETAGS; j++)
|
for (block = head.next; block != &head; block = block->next)
|
||||||
{
|
{
|
||||||
for (block = headlist[j].next; block != &headlist[j]; block = block->next)
|
blocknumon++;
|
||||||
{
|
given = MEMORY(block);
|
||||||
blocknumon++;
|
|
||||||
given = MEMORY(block);
|
|
||||||
#ifdef ZDEBUG2
|
#ifdef ZDEBUG2
|
||||||
CONS_Debug(DBG_MEMORY, "block %u owned by %s:%d\n",
|
CONS_Debug(DBG_MEMORY, "block %u owned by %s:%d\n",
|
||||||
blocknumon, block->ownerfile, block->ownerline);
|
blocknumon, block->ownerfile, block->ownerline);
|
||||||
#endif
|
#endif
|
||||||
#ifdef HAVE_VALGRIND
|
#ifdef HAVE_VALGRIND
|
||||||
if (RUNNING_ON_VALGRIND && !VALGRIND_MEMPOOL_EXISTS(block))
|
if (RUNNING_ON_VALGRIND && !VALGRIND_MEMPOOL_EXISTS(block))
|
||||||
{
|
{
|
||||||
HeapError(" should not exist");
|
HeapError(" should not exist");
|
||||||
}
|
|
||||||
#endif
|
|
||||||
if (block->user != NULL && *(block->user) != given)
|
|
||||||
{
|
|
||||||
HeapError(" doesn't have a proper user");
|
|
||||||
}
|
|
||||||
|
|
||||||
if (block->next->prev != block)
|
|
||||||
{
|
|
||||||
HeapError(" lacks proper backlink");
|
|
||||||
}
|
|
||||||
|
|
||||||
if (block->prev->next != block)
|
|
||||||
{
|
|
||||||
HeapError(" lacks proper forward link");
|
|
||||||
}
|
|
||||||
#ifdef PARANOIA
|
|
||||||
if (block->id != ZONEID)
|
|
||||||
{
|
|
||||||
HeapError(" has the wrong ID");
|
|
||||||
}
|
|
||||||
#endif
|
|
||||||
if (block->tag != j)
|
|
||||||
{
|
|
||||||
HeapError(va(" block is contained in the wrong headlist (got: %d expected: %s)", block->tag, sizeu1(j)));
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
#endif
|
||||||
|
if (block->user != NULL && *(block->user) != given)
|
||||||
|
{
|
||||||
|
HeapError(" doesn't have a proper user");
|
||||||
|
}
|
||||||
|
|
||||||
|
if (block->next->prev != block)
|
||||||
|
{
|
||||||
|
HeapError(" lacks proper backlink");
|
||||||
|
}
|
||||||
|
|
||||||
|
if (block->prev->next != block)
|
||||||
|
{
|
||||||
|
HeapError(" lacks proper forward link");
|
||||||
|
}
|
||||||
|
#ifdef PARANOIA
|
||||||
|
if (block->id != ZONEID)
|
||||||
|
{
|
||||||
|
HeapError(" has the wrong ID");
|
||||||
|
}
|
||||||
|
#endif
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -599,22 +582,13 @@ void Z_ChangeTag(void *ptr, INT32 tag)
|
|||||||
block = MEMBLOCK(ptr);
|
block = MEMBLOCK(ptr);
|
||||||
|
|
||||||
#ifdef PARANOIA
|
#ifdef PARANOIA
|
||||||
if (block->id != ZONEID)
|
if (block->id != ZONEID) I_Error("Z_ChangeTag at %s:%d: wrong id", file, line);
|
||||||
I_Error("Z_ChangeTag at %s:%d: wrong id", file, line);
|
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
if (tag >= PU_PURGELEVEL && block->user == NULL)
|
if (tag >= PU_PURGELEVEL && block->user == NULL)
|
||||||
I_Error("Internal memory management error: "
|
I_Error("Internal memory management error: "
|
||||||
"tried to make block purgable but it has no owner");
|
"tried to make block purgable but it has no owner");
|
||||||
|
|
||||||
block->prev->next = block->next;
|
|
||||||
block->next->prev = block->prev;
|
|
||||||
|
|
||||||
block->next = headlist[tag].next;
|
|
||||||
block->prev = &headlist[tag];
|
|
||||||
headlist[tag].next = block;
|
|
||||||
block->next->prev = block;
|
|
||||||
|
|
||||||
block->tag = tag;
|
block->tag = tag;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -639,8 +613,7 @@ void Z_SetUser(void *ptr, void **newuser)
|
|||||||
block = MEMBLOCK(ptr);
|
block = MEMBLOCK(ptr);
|
||||||
|
|
||||||
#ifdef PARANOIA
|
#ifdef PARANOIA
|
||||||
if (block->id != ZONEID)
|
if (block->id != ZONEID) I_Error("Z_SetUser at %s:%d: wrong id", file, line);
|
||||||
I_Error("Z_SetUser at %s:%d: wrong id", file, line);
|
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
if (block->tag >= PU_PURGELEVEL && newuser == NULL)
|
if (block->tag >= PU_PURGELEVEL && newuser == NULL)
|
||||||
@@ -665,21 +638,18 @@ void Z_SetUser(void *ptr, void **newuser)
|
|||||||
size_t Z_TagsUsage(INT32 lowtag, INT32 hightag)
|
size_t Z_TagsUsage(INT32 lowtag, INT32 hightag)
|
||||||
{
|
{
|
||||||
size_t cnt = 0;
|
size_t cnt = 0;
|
||||||
memblock_t *head; // why was this called rover before?????
|
memblock_t *rover;
|
||||||
INT32 i;
|
|
||||||
|
|
||||||
for (i = lowtag; i <= hightag; i++)
|
for (rover = head.next; rover != &head; rover = rover->next)
|
||||||
{
|
{
|
||||||
for (head = headlist[i].next; head != &headlist[i]; head = head->next)
|
if (rover->tag < lowtag || rover->tag > hightag)
|
||||||
{
|
continue;
|
||||||
cnt += head->size + sizeof *head;
|
cnt += rover->size + sizeof(memblock_t);
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
return cnt;
|
return cnt;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
// -----------------------
|
// -----------------------
|
||||||
// Miscellaneous functions
|
// Miscellaneous functions
|
||||||
// -----------------------
|
// -----------------------
|
||||||
@@ -708,7 +678,7 @@ static void Command_Memfree_f(void)
|
|||||||
CONS_Printf(M_GetText("Level (pooled) : %7s KB\n"), sizeu1(Z_LevelPoolUsage()>>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("Special thinker : %7s KB\n"), sizeu1(Z_TagUsage(PU_LEVSPEC)>>10));
|
||||||
CONS_Printf(M_GetText("All purgable : %7s KB\n"),
|
CONS_Printf(M_GetText("All purgable : %7s KB\n"),
|
||||||
sizeu1(Z_TagsUsage(PU_PURGELEVEL, NUM_PURGETAGS-1)>>10));
|
sizeu1(Z_TagsUsage(PU_PURGELEVEL, INT32_MAX)>>10));
|
||||||
|
|
||||||
#ifdef HWRENDER
|
#ifdef HWRENDER
|
||||||
if (rendermode == render_opengl)
|
if (rendermode == render_opengl)
|
||||||
@@ -737,24 +707,21 @@ static void Command_Memfree_f(void)
|
|||||||
static void Command_Memdump_f(void)
|
static void Command_Memdump_f(void)
|
||||||
{
|
{
|
||||||
memblock_t *block;
|
memblock_t *block;
|
||||||
INT32 mintag = 0, maxtag = NUM_PURGETAGS-1;
|
INT32 mintag = 0, maxtag = INT32_MAX;
|
||||||
INT32 check;
|
|
||||||
INT32 i;
|
INT32 i;
|
||||||
|
|
||||||
if ((check = COM_CheckParm("-min")))
|
if ((i = COM_CheckParm("-min")))
|
||||||
mintag = atoi(COM_Argv(check + 1));
|
mintag = atoi(COM_Argv(i + 1));
|
||||||
|
|
||||||
if ((check = COM_CheckParm("-max")))
|
if ((i = COM_CheckParm("-max")))
|
||||||
maxtag = atoi(COM_Argv(check + 1));
|
maxtag = atoi(COM_Argv(i + 1));
|
||||||
|
|
||||||
for (i = mintag; i <= maxtag; i++)
|
for (block = head.next; block != &head; block = block->next)
|
||||||
{
|
if (block->tag >= mintag && block->tag <= maxtag)
|
||||||
for (block = headlist[i].next; block != &headlist[i]; block = block->next)
|
|
||||||
{
|
{
|
||||||
const char *filename = strrchr(block->ownerfile, PATHSEP[0]);
|
const char *filename = strrchr(block->ownerfile, PATHSEP[0]);
|
||||||
CONS_Printf("[%3d] %s (%s) bytes @ %s:%d tag: %d (%d)\n", block->tag, sizeu1(block->size + sizeof(memblock_t)), sizeu2(block->size), filename ? filename + 1 : block->ownerfile, block->ownerline, block->tag, i);
|
CONS_Printf("[%3d] %s (%s) bytes @ %s:%d\n", block->tag, sizeu1(block->size + sizeof(memblock_t)), sizeu2(block->size), filename ? filename + 1 : block->ownerfile, block->ownerline);
|
||||||
}
|
}
|
||||||
}
|
|
||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
@@ -804,27 +771,6 @@ void* Z_LevelPoolMalloc(size_t size)
|
|||||||
return p;
|
return p;
|
||||||
}
|
}
|
||||||
|
|
||||||
boolean Z_IsMobjValid2(void *p, const char *file, INT32 line)
|
|
||||||
{
|
|
||||||
//(void)file;
|
|
||||||
//(void)line;
|
|
||||||
|
|
||||||
// mobj was removed
|
|
||||||
// no need to worry here
|
|
||||||
if (p == NULL)
|
|
||||||
return false;
|
|
||||||
|
|
||||||
// mobjs reside in the large pool
|
|
||||||
if (!g_level_large_pool.ptrcheck(p))
|
|
||||||
{
|
|
||||||
//I_Error("invalid mobj! at %s:%d", file, line);
|
|
||||||
CONS_Alert(CONS_ERROR, "invalid mobj! at %s:%d", file, line);
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
|
|
||||||
return true;
|
|
||||||
}
|
|
||||||
|
|
||||||
void* Z_LevelPoolCalloc(size_t size)
|
void* Z_LevelPoolCalloc(size_t size)
|
||||||
{
|
{
|
||||||
void* p = Z_LevelPoolMalloc(size);
|
void* p = Z_LevelPoolMalloc(size);
|
||||||
|
|||||||
+25
-30
@@ -42,42 +42,39 @@ extern "C" {
|
|||||||
enum
|
enum
|
||||||
{
|
{
|
||||||
// Tags < PU_LEVEL are not purged until freed explicitly.
|
// Tags < PU_LEVEL are not purged until freed explicitly.
|
||||||
PU_STATIC = 0, // static entire execution time
|
PU_STATIC = 1, // static entire execution time
|
||||||
PU_LUA, // static entire execution time -- used by lua so it doesn't get caught in loops forever
|
PU_LUA = 2, // static entire execution time -- used by lua so it doesn't get caught in loops forever
|
||||||
PU_PERFSTATS, // static between changes to ps_samplesize cvar
|
PU_PERFSTATS = 3, // static between changes to ps_samplesize cvar
|
||||||
|
|
||||||
PU_SOUND, // static while playing
|
PU_SOUND = 11, // static while playing
|
||||||
PU_MUSIC, // static while playing
|
PU_MUSIC = 12, // static while playing
|
||||||
|
|
||||||
PU_PATCH, // static entire execution time
|
PU_PATCH = 14, // static entire execution time
|
||||||
PU_PATCH_LOWPRIORITY, // lower priority patch, static until level exited
|
PU_PATCH_LOWPRIORITY = 15, // lower priority patch, static until level exited
|
||||||
PU_PATCH_ROTATED, // rotated patch, static until level exited or WAD added
|
PU_PATCH_ROTATED = 16, // rotated patch, static entire execution time
|
||||||
PU_PATCH_DATA, // patch data, lifetime depends on the patch that owns it
|
PU_PATCH_DATA = 17, // patch data, lifetime depends on the patch that owns it
|
||||||
PU_SPRITE, // sprite patch, static until WAD added
|
PU_SPRITE = 18, // sprite patch, static until WAD added
|
||||||
PU_HUDGFX, // HUD patch, static until WAD added
|
PU_HUDGFX = 19, // HUD patch, static until WAD added
|
||||||
|
|
||||||
PU_HWRPATCHINFO, // Hardware GLPatch_t struct for OpenGL texture cache
|
PU_HWRPATCHINFO = 21, // Hardware GLPatch_t struct for OpenGL texture cache
|
||||||
PU_HWRPATCHCOLMIPMAP, // Hardware GLMipmap_t struct colormap variation of patch
|
PU_HWRPATCHCOLMIPMAP = 22, // Hardware GLMipmap_t struct colormap variation of patch
|
||||||
PU_HWRMODELTEXTURE, // Hardware model texture
|
PU_HWRMODELTEXTURE = 23, // Hardware model texture
|
||||||
|
|
||||||
PU_HWRCACHE, // static until unlocked
|
PU_HWRCACHE = 48, // static until unlocked
|
||||||
PU_CACHE, // static until unlocked
|
PU_CACHE = 49, // static until unlocked
|
||||||
|
|
||||||
// Tags s.t. PU_LEVEL <= tag < PU_PURGELEVEL are purged at level start
|
// Tags s.t. PU_LEVEL <= tag < PU_PURGELEVEL are purged at level start
|
||||||
PU_LEVEL, // static until level exited
|
PU_LEVEL = 50, // static until level exited
|
||||||
PU_LEVSPEC, // a special thinker in a level
|
PU_LEVSPEC = 51, // a special thinker in a level
|
||||||
PU_HWRPLANE, // if ZPLANALLOC is enabled in hw_bsp.c, this is used to alloc polygons for OpenGL
|
PU_HWRPLANE = 52, // if ZPLANALLOC is enabled in hw_bsp.c, this is used to alloc polygons for OpenGL
|
||||||
|
|
||||||
// Tags >= PU_PURGELEVEL are purgable whenever needed
|
// Tags >= PU_PURGELEVEL are purgable whenever needed
|
||||||
PU_PURGELEVEL, // Note: this is never actually used as a tag
|
PU_PURGELEVEL = 100, // Note: this is never actually used as a tag
|
||||||
PU_CACHE_UNLOCKED, // Note: unused
|
PU_CACHE_UNLOCKED = 101, // Note: unused
|
||||||
PU_HWRCACHE_UNLOCKED, // 'unlocked' PU_HWRCACHE memory:
|
PU_HWRCACHE_UNLOCKED = 102, // 'unlocked' PU_HWRCACHE memory:
|
||||||
// 'second-level' cache for graphics
|
// 'second-level' cache for graphics
|
||||||
|
// stored in hardware format and downloaded as needed
|
||||||
// stored in hardware format and downloaded as needed
|
PU_HWRMODELTEXTURE_UNLOCKED = 103, // 'unlocked' PU_HWRMODELTEXTURE memory
|
||||||
PU_HWRMODELTEXTURE_UNLOCKED, // 'unlocked' PU_HWRMODELTEXTURE memory
|
|
||||||
|
|
||||||
NUM_PURGETAGS
|
|
||||||
};
|
};
|
||||||
|
|
||||||
//
|
//
|
||||||
@@ -160,7 +157,7 @@ void Z_SetUser(void *ptr, void **newuser);
|
|||||||
//
|
//
|
||||||
#define Z_TagUsage(tagnum) Z_TagsUsage(tagnum, tagnum)
|
#define Z_TagUsage(tagnum) Z_TagsUsage(tagnum, tagnum)
|
||||||
size_t Z_TagsUsage(INT32 lowtag, INT32 hightag);
|
size_t Z_TagsUsage(INT32 lowtag, INT32 hightag);
|
||||||
#define Z_TotalUsage() Z_TagsUsage(0, NUM_PURGETAGS-1)
|
#define Z_TotalUsage() Z_TagsUsage(0, INT32_MAX)
|
||||||
|
|
||||||
//
|
//
|
||||||
// Miscellaneous functions
|
// Miscellaneous functions
|
||||||
@@ -173,8 +170,6 @@ char *Z_StrDup(const char *in);
|
|||||||
size_t Z_LevelPoolUsage(void);
|
size_t Z_LevelPoolUsage(void);
|
||||||
void *Z_LevelPoolMalloc(size_t size);
|
void *Z_LevelPoolMalloc(size_t size);
|
||||||
void *Z_LevelPoolCalloc(size_t size);
|
void *Z_LevelPoolCalloc(size_t size);
|
||||||
#define Z_IsMobjValid(p) Z_IsMobjValid2(p, __FILE__, __LINE__)
|
|
||||||
boolean Z_IsMobjValid2(void *p, const char *file, INT32 line);
|
|
||||||
void Z_LevelPoolFree(void *p, size_t size);
|
void Z_LevelPoolFree(void *p, size_t size);
|
||||||
|
|
||||||
// for use with CLEANUP macro
|
// for use with CLEANUP macro
|
||||||
|
|||||||
Reference in new issue
Block a user