Compare commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
9936f9c740 | ||
|
|
bee5c8e5ed | ||
|
|
4749d1a108 | ||
|
|
36d13734f6 | ||
|
|
3fc5f572bb | ||
|
|
d65319a9fc | ||
|
|
1d8b066a64 | ||
|
|
e6033322c6 | ||
|
|
d988876bca | ||
|
|
7e92482ced | ||
|
|
fa753c3694 | ||
|
|
58403cf4a5 | ||
|
|
13241d1880 | ||
|
|
91f016fd0c | ||
|
|
5e1ae2155f | ||
|
|
dd2a227529 | ||
|
|
9521183eb3 | ||
|
|
56bb20f4e1 | ||
|
|
604fa7281b | ||
|
|
2c9a82e2d3 | ||
|
|
4f7e296885 | ||
|
|
c917708184 | ||
|
|
110e93f4ed | ||
|
|
a0d6d452a0 | ||
|
|
7fb3f7a1aa | ||
|
|
7e906074ec | ||
|
|
de35e086d3 | ||
|
|
295b35b23a | ||
|
|
a5b6dad8f3 | ||
|
|
d024992144 | ||
|
|
3df604e8b6 | ||
|
|
080f586c19 | ||
|
|
0e62afd348 | ||
|
|
648d3c439b | ||
|
|
1dd3e90363 | ||
|
|
c78c0d1657 | ||
|
|
838d05eef7 | ||
|
|
3c3e8dd986 | ||
|
|
2d79ff9606 | ||
|
|
70f4207e02 |
No files matched your search
+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: {
|
case LUA_ERRMEM: { /* memory error? */
|
||||||
setsvalue2s(L, oldtop, luaS_newliteral(L, MEMERRMSG));
|
setsvalue2s(L, oldtop, G(L)->memerrmsg); /* reuse preregistered msg. */
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
case LUA_ERRERR: {
|
case LUA_ERRERR: {
|
||||||
|
|||||||
@@ -13,8 +13,6 @@
|
|||||||
#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 */ \
|
||||||
|
|||||||
+6
-1
@@ -64,6 +64,9 @@ 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
|
||||||
*/
|
*/
|
||||||
@@ -76,7 +79,9 @@ 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);
|
||||||
luaS_fix(luaS_newliteral(L, MEMERRMSG));
|
/* pre-create memory-error message */
|
||||||
|
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,6 +88,7 @@ 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,6 +149,30 @@ 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,6 +65,7 @@ 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
|
||||||
|
|||||||
+45
-25
@@ -3347,6 +3347,7 @@ 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)
|
||||||
@@ -3365,7 +3366,9 @@ 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
|
||||||
@@ -3381,37 +3384,52 @@ static void Command_connect(void)
|
|||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
// used in menu to connect to a server in the list
|
// Get the server node.
|
||||||
if (netgame && fasticmp(COM_Argv(1), "node"))
|
if (netgame)
|
||||||
{
|
{
|
||||||
servernode = (SINT8)atoi(COM_Argv(2));
|
// used in menu to connect to a server in the list
|
||||||
}
|
if (fasticmp(COM_Argv(1), "node"))
|
||||||
else if (netgame)
|
{
|
||||||
{
|
servernode = (SINT8)atoi(COM_Argv(2));
|
||||||
CONS_Printf(M_GetText("You cannot connect while in a game. End this game first.\n"));
|
}
|
||||||
return;
|
|
||||||
}
|
|
||||||
else if (I_NetOpenSocket)
|
|
||||||
{
|
|
||||||
I_NetOpenSocket();
|
|
||||||
netgame = true;
|
|
||||||
multiplayer = true;
|
|
||||||
|
|
||||||
if (fasticmp(COM_Argv(1), "any"))
|
|
||||||
servernode = BROADCASTADDR;
|
|
||||||
else if (I_NetMakeNodewPort && COM_Argc() >= 3)
|
|
||||||
servernode = I_NetMakeNodewPort(COM_Argv(1), COM_Argv(2));
|
|
||||||
else if (I_NetMakeNodewPort)
|
|
||||||
servernode = I_NetMakeNode(COM_Argv(1));
|
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
CONS_Alert(CONS_ERROR, M_GetText("There is no server identification with this network driver\n"));
|
D_QuitNetGame();
|
||||||
D_CloseConnection();
|
CL_Reset();
|
||||||
return;
|
D_StartTitle();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
CONS_Alert(CONS_ERROR, M_GetText("There is no network driver\n"));
|
{
|
||||||
|
// Standard behaviour
|
||||||
|
if (I_NetOpenSocket)
|
||||||
|
{
|
||||||
|
I_NetOpenSocket();
|
||||||
|
netgame = true;
|
||||||
|
multiplayer = true;
|
||||||
|
|
||||||
|
if (fasticmp(COM_Argv(1), "any"))
|
||||||
|
servernode = BROADCASTADDR;
|
||||||
|
else if (I_NetMakeNodewPort)
|
||||||
|
{
|
||||||
|
if (COM_Argc() >= 3) // address AND port
|
||||||
|
servernode = I_NetMakeNodewPort(COM_Argv(1), COM_Argv(2));
|
||||||
|
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
|
||||||
|
{
|
||||||
|
CONS_Alert(CONS_ERROR, M_GetText("There is no network driver\n"));
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
// invalid address
|
// invalid address
|
||||||
if (servernode == -1)
|
if (servernode == -1)
|
||||||
@@ -3458,6 +3476,7 @@ 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!
|
||||||
@@ -3466,6 +3485,7 @@ 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));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
+1
-1
@@ -147,7 +147,7 @@ extern char logfilename[1024];
|
|||||||
#define VERSIONSTRING CLIENTNAME " v10.1"
|
#define VERSIONSTRING CLIENTNAME " v10.1"
|
||||||
#define VERSIONSTRINGW CLIENTNAMEW L" v10.1"
|
#define VERSIONSTRINGW CLIENTNAMEW L" v10.1"
|
||||||
|
|
||||||
//#define SATURN_TESTING // comment out for saturn release builds!
|
#define SATURN_TESTING // comment out for saturn release builds!
|
||||||
|
|
||||||
// Hey! If you change this, add 1 to the MODVERSION below! Otherwise we can't force updates!
|
// Hey! If you change this, add 1 to the MODVERSION below! Otherwise we can't force updates!
|
||||||
// And change CMakeLists.txt (not src/, but in root), for CMake users!
|
// And change CMakeLists.txt (not src/, but in root), for CMake users!
|
||||||
|
|||||||
@@ -3283,7 +3283,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_RGB, screen_width, screen_height, 0, GL_RGB, GL_UNSIGNED_BYTE, NULL);
|
pglTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA, screen_width, screen_height, 0, GL_RGBA, 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);
|
||||||
|
|||||||
+21
-2
@@ -4399,8 +4399,7 @@ 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;
|
||||||
@@ -4439,10 +4438,21 @@ 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!
|
||||||
@@ -4507,7 +4517,9 @@ 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;
|
||||||
@@ -4575,10 +4587,13 @@ 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)))
|
||||||
{
|
{
|
||||||
@@ -4879,7 +4894,9 @@ 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;
|
||||||
@@ -4896,7 +4913,9 @@ 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;
|
||||||
|
|||||||
+15
-10
@@ -62,14 +62,6 @@ static lua_CFunction liblist[] = {
|
|||||||
NULL
|
NULL
|
||||||
};
|
};
|
||||||
|
|
||||||
// Lua asks for memory using this.
|
|
||||||
static void *LUA_Alloc(void *ud, void *ptr, size_t osize, size_t nsize)
|
|
||||||
{
|
|
||||||
(void)ud;
|
|
||||||
(void)osize;
|
|
||||||
return Z_Realloc(ptr, nsize, PU_LUA, NULL);
|
|
||||||
}
|
|
||||||
|
|
||||||
// Panic function Lua calls when there's an unprotected error.
|
// Panic function Lua calls when there's an unprotected error.
|
||||||
// This function cannot return. Lua would kill the application anyway if it did.
|
// This function cannot return. Lua would kill the application anyway if it did.
|
||||||
FUNCNORETURN static int LUA_Panic(lua_State *L)
|
FUNCNORETURN static int LUA_Panic(lua_State *L)
|
||||||
@@ -197,7 +189,7 @@ void LUA_ClearState(void)
|
|||||||
CONS_Printf(M_GetText("Pardon me while I initialize the Lua scripting interface...\n"));
|
CONS_Printf(M_GetText("Pardon me while I initialize the Lua scripting interface...\n"));
|
||||||
|
|
||||||
// allocate state
|
// allocate state
|
||||||
L = lua_newstate(LUA_Alloc, NULL);
|
L = luaL_newstate();
|
||||||
lua_atpanic(L, LUA_Panic);
|
lua_atpanic(L, LUA_Panic);
|
||||||
|
|
||||||
// open base libraries
|
// open base libraries
|
||||||
@@ -373,7 +365,7 @@ void LUA_DumpFile(const char *filename)
|
|||||||
|
|
||||||
static void createMathLibState(void)
|
static void createMathLibState(void)
|
||||||
{
|
{
|
||||||
mL = lua_newstate(LUA_Alloc, NULL);
|
mL = luaL_newstate();
|
||||||
lua_atpanic(mL, LUA_Panic);
|
lua_atpanic(mL, LUA_Panic);
|
||||||
|
|
||||||
// open only enum lib
|
// open only enum lib
|
||||||
@@ -1465,3 +1457,16 @@ int Lua_CreateFieldTable(lua_State *L, const char *const lst[])
|
|||||||
|
|
||||||
return luaL_ref(L, LUA_REGISTRYINDEX);
|
return luaL_ref(L, LUA_REGISTRYINDEX);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
size_t LUA_MemoryUsage(void)
|
||||||
|
{
|
||||||
|
size_t usage = 0;
|
||||||
|
|
||||||
|
if (gL)
|
||||||
|
usage += lua_gc(gL, LUA_GCCOUNT, 0);
|
||||||
|
|
||||||
|
if (mL)
|
||||||
|
usage += lua_gc(mL, LUA_GCCOUNT, 0);
|
||||||
|
|
||||||
|
return usage;
|
||||||
|
}
|
||||||
@@ -82,6 +82,9 @@ int Lua_optoption(lua_State *L, int narg, int def, int list_ref);
|
|||||||
int Lua_CreateFieldTable(lua_State *L, const char *const lst[]);
|
int Lua_CreateFieldTable(lua_State *L, const char *const lst[]);
|
||||||
void LUA_HookNetArchive(lua_CFunction archFunc, savebuffer_t *save);
|
void LUA_HookNetArchive(lua_CFunction archFunc, savebuffer_t *save);
|
||||||
|
|
||||||
|
// Returns lua memory usage in kbytes
|
||||||
|
size_t LUA_MemoryUsage(void);
|
||||||
|
|
||||||
// Console wrapper
|
// Console wrapper
|
||||||
void COM_Lua_f(void);
|
void COM_Lua_f(void);
|
||||||
|
|
||||||
|
|||||||
+710
-333
File diff suppressed because it is too large.
Load diff
+4
-1
@@ -107,6 +107,9 @@ 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];
|
||||||
|
|
||||||
@@ -2013,7 +2016,7 @@ static inline void P_NiGHTSDamage(mobj_t *target, mobj_t *source)
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
static inline boolean P_TagDamage(mobj_t *target, mobj_t *inflictor, mobj_t *source, INT32 damage)
|
static 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
|
||||||
|
|||||||
+3
-3
@@ -2026,7 +2026,7 @@ static boolean P_CheckCameraPosition(fixed_t x, fixed_t y, camera_t *thiscam)
|
|||||||
|
|
||||||
mapcampointer = thiscam;
|
mapcampointer = thiscam;
|
||||||
|
|
||||||
if (UNLIKELY(GETSECSPECIAL(newsec->special, 4) == 12))
|
if (newsec->flags & SF_NOCLIPCAMERA)
|
||||||
{ // 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)
|
||||||
|| UNLIKELY(GETSECSPECIAL(rover->master->frontsector->special, 4) == 12))
|
|| rover->master->frontsector->flags & SF_NOCLIPCAMERA)
|
||||||
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 (UNLIKELY(GETSECSPECIAL(polysec->special, 4) == 12))
|
if (polysec->flags & SF_NOCLIPCAMERA)
|
||||||
{ // Camera noclip polyobj.
|
{ // Camera noclip polyobj.
|
||||||
plink = (polymaplink_t *)(plink->link.next);
|
plink = (polymaplink_t *)(plink->link.next);
|
||||||
continue;
|
continue;
|
||||||
|
|||||||
+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) || UNLIKELY(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))
|
||||||
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) || UNLIKELY(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))
|
||||||
continue;
|
continue;
|
||||||
|
|
||||||
topheight = P_CameraGetFOFTopZ(mapcampointer, back, rover, tmx, tmy, linedef);
|
topheight = P_CameraGetFOFTopZ(mapcampointer, back, rover, tmx, tmy, linedef);
|
||||||
|
|||||||
+1062
-869
File diff suppressed because it is too large.
Load diff
@@ -3331,6 +3331,7 @@ static boolean P_CheckSoundReplacements(UINT16 wadnum, char *name, size_t i)
|
|||||||
|
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
//
|
//
|
||||||
// P_CheckReplacMapReplacements
|
// P_CheckReplacMapReplacements
|
||||||
//
|
//
|
||||||
|
|||||||
+18
-4
@@ -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: // no idea but keep it dont want anything to break
|
case 15: // also Invert Encore Remap....
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
DoneSection2:
|
DoneSection2:
|
||||||
@@ -5368,6 +5368,11 @@ 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
|
||||||
@@ -5377,6 +5382,10 @@ 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;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -5461,11 +5470,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].verticalflip = true;
|
sectors[s].flags |= SF_GRAVITYFLIP;
|
||||||
else
|
else
|
||||||
sectors[s].verticalflip = false;
|
sectors[s].flags &= ~SF_GRAVITYFLIP;
|
||||||
|
|
||||||
CheckForReverseGravity = sectors[s].verticalflip;
|
CheckForReverseGravity = (boolean)(sectors[s].flags & SF_GRAVITYFLIP);
|
||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
|
|
||||||
@@ -5558,6 +5567,11 @@ 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
-5
@@ -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) || UNLIKELY(GETSECSPECIAL(rover->master->frontsector->special, 4) == 12))
|
if (!(rover->flags & FF_BLOCKOTHERS) || !(rover->flags & FF_EXISTS) || !(rover->flags & FF_RENDERALL) || (rover->master->frontsector->flags & SF_NOCLIPCAMERA))
|
||||||
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 (UNLIKELY(GETSECSPECIAL(polysec->special, 4) == 12))
|
if (polysec->flags & SF_NOCLIPCAMERA)
|
||||||
{ // Camera noclip polyobj.
|
{ // Camera noclip polyobj.
|
||||||
plink = (polymaplink_t *)(plink->link.next);
|
plink = (polymaplink_t *)(plink->link.next);
|
||||||
continue;
|
continue;
|
||||||
@@ -3682,7 +3682,8 @@ 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);
|
||||||
@@ -4262,7 +4263,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 (P_FindSpecialLineFromTag(13, sector->tag, -1) != -1)
|
if (sector->flags & SF_HEATWAVE)
|
||||||
return true;
|
return true;
|
||||||
|
|
||||||
if (sector->ffloors)
|
if (sector->ffloors)
|
||||||
@@ -4280,7 +4281,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 (P_FindSpecialLineFromTag(13, rover->master->frontsector->tag, -1) != -1)
|
if (rover->master->frontsector->flags & SF_HEATWAVE)
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
+3
-4
@@ -48,8 +48,7 @@ boolean g_walloffscreen = false;
|
|||||||
|
|
||||||
boolean R_NoEncore(sector_t *sector, boolean ceiling)
|
boolean R_NoEncore(sector_t *sector, boolean ceiling)
|
||||||
{
|
{
|
||||||
const INT32 invspecial = GETSECSPECIAL(sector->special, 2);
|
const boolean invertEncore = (sector->flags & SF_INVERTENCORE);
|
||||||
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);
|
||||||
@@ -59,10 +58,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;
|
||||||
}
|
}
|
||||||
|
|||||||
+13
-5
@@ -307,10 +307,19 @@ typedef struct pslope_s
|
|||||||
|
|
||||||
typedef enum
|
typedef enum
|
||||||
{
|
{
|
||||||
SF_FLIPSPECIAL_FLOOR = 1,
|
// flipspecial - planes with effect
|
||||||
SF_FLIPSPECIAL_CEILING = 2,
|
SF_FLIPSPECIAL_FLOOR = 1,
|
||||||
SF_FLIPSPECIAL_BOTH = 3,
|
SF_FLIPSPECIAL_CEILING = 1<<1,
|
||||||
SF_TRIGGERSPECIAL_TOUCH = 4,
|
SF_FLIPSPECIAL_BOTH = (SF_FLIPSPECIAL_FLOOR|SF_FLIPSPECIAL_CEILING),
|
||||||
|
// 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;
|
||||||
|
|
||||||
//
|
//
|
||||||
@@ -391,7 +400,6 @@ 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
|
||||||
|
|||||||
+1
-1
@@ -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_TagsUsage(0, INT32_MAX)>>10)));
|
V_DrawRightAlignedString(320, height, V_MONOSPACE, va("Heap used: %7sKB", sizeu1(Z_TotalUsage()>>10)));
|
||||||
}
|
}
|
||||||
|
|
||||||
static void ST_drawLevelTitle(void)
|
static void ST_drawLevelTitle(void)
|
||||||
|
|||||||
+8
-7
@@ -396,6 +396,11 @@ 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.
|
||||||
*/
|
*/
|
||||||
@@ -1095,18 +1100,14 @@ 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;
|
||||||
|
|
||||||
memset(uname, 0, sizeof(uname));
|
namelen = strnlen(name, 8); // :chaosleep:
|
||||||
strncpy(uname, name, sizeof(uname)-1);
|
hash = W_HashLumpNameLen(name, namelen);
|
||||||
strupr(uname);
|
|
||||||
namelen = strlen(uname);
|
|
||||||
hash = W_HashLumpName(uname);
|
|
||||||
|
|
||||||
//
|
//
|
||||||
// scan forward
|
// scan forward
|
||||||
@@ -1121,7 +1122,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
|
||||||
&& !memcmp(lump_p->name, uname, sizeof(uname) - 1))
|
&& !strncasecmp(lump_p->name, name, namelen))
|
||||||
return i;
|
return i;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
+108
-56
@@ -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 head;
|
static memblock_t headlist[NUM_PURGETAGS];
|
||||||
|
|
||||||
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,10 +107,14 @@ 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(&head, 0x00, sizeof(head));
|
memset(&headlist, 0x00, sizeof(headlist));
|
||||||
|
|
||||||
head.next = head.prev = &head;
|
for (i = 0; i < NUM_PURGETAGS; i++)
|
||||||
|
{
|
||||||
|
headlist[i].next = headlist[i].prev = &headlist[i];
|
||||||
|
}
|
||||||
|
|
||||||
memfree = I_GetFreeMem(&total)>>20;
|
memfree = I_GetFreeMem(&total)>>20;
|
||||||
|
|
||||||
@@ -204,7 +208,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, INT32_MAX);
|
Z_FreeTags(PU_PURGELEVEL, NUM_PURGETAGS-1);
|
||||||
p = malloc(padedsize);
|
p = malloc(padedsize);
|
||||||
|
|
||||||
if (p == NULL)
|
if (p == NULL)
|
||||||
@@ -245,9 +249,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 = head.next;
|
block->next = headlist[tag].next;
|
||||||
block->prev = &head;
|
block->prev = &headlist[tag];
|
||||||
head.next = block;
|
headlist[tag].next = block;
|
||||||
block->next->prev = block;
|
block->next->prev = block;
|
||||||
|
|
||||||
block->tag = tag;
|
block->tag = tag;
|
||||||
@@ -411,6 +415,7 @@ 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);
|
||||||
@@ -427,11 +432,13 @@ void Z_FreeTags(INT32 lowtag, INT32 hightag)
|
|||||||
g_level_tiny_pool.release();
|
g_level_tiny_pool.release();
|
||||||
}
|
}
|
||||||
|
|
||||||
for (block = head.next; block != &head; block = next)
|
for (i = lowtag; i <= hightag; i++)
|
||||||
{
|
{
|
||||||
next = block->next; // get link before freeing
|
for (block = headlist[i].next; block != &headlist[i]; block = next)
|
||||||
if (block->tag >= lowtag && block->tag <= hightag)
|
{
|
||||||
|
next = block->next; // get link before freeing
|
||||||
Z_Free(MEMORY(block));
|
Z_Free(MEMORY(block));
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -444,18 +451,20 @@ 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 (block = head.next; block != &head; block = next)
|
for (i = lowtag; i <= hightag; i++)
|
||||||
{
|
{
|
||||||
next = block->next; // get link before possibly freeing
|
for (block = headlist[i].next; block != &headlist[i]; block = next)
|
||||||
|
|
||||||
if (block->tag >= lowtag && block->tag <= hightag)
|
|
||||||
{
|
{
|
||||||
|
next = block->next; // get link before possibly freeing
|
||||||
|
|
||||||
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);
|
||||||
}
|
}
|
||||||
@@ -486,7 +495,7 @@ void Z_CheckMemCleanup(void)
|
|||||||
if (nextcleanup-- == 0)
|
if (nextcleanup-- == 0)
|
||||||
{
|
{
|
||||||
nextcleanup = CLEANUPCOUNT;
|
nextcleanup = CLEANUPCOUNT;
|
||||||
Z_FreeTags(PU_PURGELEVEL, INT32_MAX);
|
Z_FreeTags(PU_PURGELEVEL, NUM_PURGETAGS-1);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -504,6 +513,7 @@ 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
|
||||||
@@ -520,40 +530,47 @@ void Z_CheckHeap(INT32 tag)
|
|||||||
blocknumon, block->ownerfile, block->ownerline, msg)
|
blocknumon, block->ownerfile, block->ownerline, msg)
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
for (block = head.next; block != &head; block = block->next)
|
for (j = 0; j < NUM_PURGETAGS; j++)
|
||||||
{
|
{
|
||||||
blocknumon++;
|
for (block = headlist[j].next; block != &headlist[j]; block = block->next)
|
||||||
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
|
#endif
|
||||||
if (block->user != NULL && *(block->user) != given)
|
if (block->user != NULL && *(block->user) != given)
|
||||||
{
|
{
|
||||||
HeapError(" doesn't have a proper user");
|
HeapError(" doesn't have a proper user");
|
||||||
}
|
}
|
||||||
|
|
||||||
if (block->next->prev != block)
|
if (block->next->prev != block)
|
||||||
{
|
{
|
||||||
HeapError(" lacks proper backlink");
|
HeapError(" lacks proper backlink");
|
||||||
}
|
}
|
||||||
|
|
||||||
if (block->prev->next != block)
|
if (block->prev->next != block)
|
||||||
{
|
{
|
||||||
HeapError(" lacks proper forward link");
|
HeapError(" lacks proper forward link");
|
||||||
}
|
}
|
||||||
#ifdef PARANOIA
|
#ifdef PARANOIA
|
||||||
if (block->id != ZONEID)
|
if (block->id != ZONEID)
|
||||||
{
|
{
|
||||||
HeapError(" has the wrong ID");
|
HeapError(" has the wrong ID");
|
||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
|
if (block->tag != j)
|
||||||
|
{
|
||||||
|
HeapError(va(" block is contained in the wrong headlist (got: %d expected: %s)", block->tag, sizeu1(j)));
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -590,6 +607,14 @@ void Z_ChangeTag(void *ptr, INT32 tag)
|
|||||||
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;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -640,18 +665,21 @@ 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 *rover;
|
memblock_t *head; // why was this called rover before?????
|
||||||
|
INT32 i;
|
||||||
|
|
||||||
for (rover = head.next; rover != &head; rover = rover->next)
|
for (i = lowtag; i <= hightag; i++)
|
||||||
{
|
{
|
||||||
if (rover->tag < lowtag || rover->tag > hightag)
|
for (head = headlist[i].next; head != &headlist[i]; head = head->next)
|
||||||
continue;
|
{
|
||||||
cnt += rover->size + sizeof(memblock_t);
|
cnt += head->size + sizeof *head;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
return cnt;
|
return cnt;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
// -----------------------
|
// -----------------------
|
||||||
// Miscellaneous functions
|
// Miscellaneous functions
|
||||||
// -----------------------
|
// -----------------------
|
||||||
@@ -665,8 +693,8 @@ static void Command_Memfree_f(void)
|
|||||||
|
|
||||||
Z_CheckHeap(-1);
|
Z_CheckHeap(-1);
|
||||||
CONS_Printf("\x82%s", M_GetText("Memory Info\n"));
|
CONS_Printf("\x82%s", M_GetText("Memory Info\n"));
|
||||||
CONS_Printf(M_GetText("Total heap used : %7s KB\n"), sizeu1(Z_TotalUsage()>>10));
|
CONS_Printf(M_GetText("Total heap used : %7s KB\n"), sizeu1((Z_TotalUsage()>>10) + LUA_MemoryUsage()));
|
||||||
CONS_Printf(M_GetText("Lua : %7s KB\n"), sizeu1(Z_TagUsage(PU_LUA)>>10));
|
CONS_Printf(M_GetText("Lua : %7s KB\n"), sizeu1(LUA_MemoryUsage())); // No longer uses z_zone memory but for consistency keep it here
|
||||||
CONS_Printf(M_GetText("Static : %7s KB\n"), sizeu1(Z_TagUsage(PU_STATIC)>>10));
|
CONS_Printf(M_GetText("Static : %7s KB\n"), sizeu1(Z_TagUsage(PU_STATIC)>>10));
|
||||||
CONS_Printf(M_GetText("Static (sound) : %7s KB\n"), sizeu1(Z_TagUsage(PU_SOUND)>>10));
|
CONS_Printf(M_GetText("Static (sound) : %7s KB\n"), sizeu1(Z_TagUsage(PU_SOUND)>>10));
|
||||||
CONS_Printf(M_GetText("Static (music) : %7s KB\n"), sizeu1(Z_TagUsage(PU_MUSIC)>>10));
|
CONS_Printf(M_GetText("Static (music) : %7s KB\n"), sizeu1(Z_TagUsage(PU_MUSIC)>>10));
|
||||||
@@ -680,7 +708,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, INT32_MAX)>>10));
|
sizeu1(Z_TagsUsage(PU_PURGELEVEL, NUM_PURGETAGS-1)>>10));
|
||||||
|
|
||||||
#ifdef HWRENDER
|
#ifdef HWRENDER
|
||||||
if (rendermode == render_opengl)
|
if (rendermode == render_opengl)
|
||||||
@@ -709,21 +737,24 @@ 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 = INT32_MAX;
|
INT32 mintag = 0, maxtag = NUM_PURGETAGS-1;
|
||||||
|
INT32 check;
|
||||||
INT32 i;
|
INT32 i;
|
||||||
|
|
||||||
if ((i = COM_CheckParm("-min")))
|
if ((check = COM_CheckParm("-min")))
|
||||||
mintag = atoi(COM_Argv(i + 1));
|
mintag = atoi(COM_Argv(check + 1));
|
||||||
|
|
||||||
if ((i = COM_CheckParm("-max")))
|
if ((check = COM_CheckParm("-max")))
|
||||||
maxtag = atoi(COM_Argv(i + 1));
|
maxtag = atoi(COM_Argv(check + 1));
|
||||||
|
|
||||||
for (block = head.next; block != &head; block = block->next)
|
for (i = mintag; i <= maxtag; i++)
|
||||||
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\n", block->tag, sizeu1(block->size + sizeof(memblock_t)), sizeu2(block->size), filename ? filename + 1 : block->ownerfile, block->ownerline);
|
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);
|
||||||
}
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
@@ -773,6 +804,27 @@ 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);
|
||||||
|
|||||||
+30
-25
@@ -42,39 +42,42 @@ extern "C" {
|
|||||||
enum
|
enum
|
||||||
{
|
{
|
||||||
// Tags < PU_LEVEL are not purged until freed explicitly.
|
// Tags < PU_LEVEL are not purged until freed explicitly.
|
||||||
PU_STATIC = 1, // static entire execution time
|
PU_STATIC = 0, // static entire execution time
|
||||||
PU_LUA = 2, // static entire execution time -- used by lua so it doesn't get caught in loops forever
|
PU_LUA, // static entire execution time -- used by lua so it doesn't get caught in loops forever
|
||||||
PU_PERFSTATS = 3, // static between changes to ps_samplesize cvar
|
PU_PERFSTATS, // static between changes to ps_samplesize cvar
|
||||||
|
|
||||||
PU_SOUND = 11, // static while playing
|
PU_SOUND, // static while playing
|
||||||
PU_MUSIC = 12, // static while playing
|
PU_MUSIC, // static while playing
|
||||||
|
|
||||||
PU_PATCH = 14, // static entire execution time
|
PU_PATCH, // static entire execution time
|
||||||
PU_PATCH_LOWPRIORITY = 15, // lower priority patch, static until level exited
|
PU_PATCH_LOWPRIORITY, // lower priority patch, static until level exited
|
||||||
PU_PATCH_ROTATED = 16, // rotated patch, static entire execution time
|
PU_PATCH_ROTATED, // rotated patch, static until level exited or WAD added
|
||||||
PU_PATCH_DATA = 17, // patch data, lifetime depends on the patch that owns it
|
PU_PATCH_DATA, // patch data, lifetime depends on the patch that owns it
|
||||||
PU_SPRITE = 18, // sprite patch, static until WAD added
|
PU_SPRITE, // sprite patch, static until WAD added
|
||||||
PU_HUDGFX = 19, // HUD patch, static until WAD added
|
PU_HUDGFX, // HUD patch, static until WAD added
|
||||||
|
|
||||||
PU_HWRPATCHINFO = 21, // Hardware GLPatch_t struct for OpenGL texture cache
|
PU_HWRPATCHINFO, // Hardware GLPatch_t struct for OpenGL texture cache
|
||||||
PU_HWRPATCHCOLMIPMAP = 22, // Hardware GLMipmap_t struct colormap variation of patch
|
PU_HWRPATCHCOLMIPMAP, // Hardware GLMipmap_t struct colormap variation of patch
|
||||||
PU_HWRMODELTEXTURE = 23, // Hardware model texture
|
PU_HWRMODELTEXTURE, // Hardware model texture
|
||||||
|
|
||||||
PU_HWRCACHE = 48, // static until unlocked
|
PU_HWRCACHE, // static until unlocked
|
||||||
PU_CACHE = 49, // static until unlocked
|
PU_CACHE, // 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 = 50, // static until level exited
|
PU_LEVEL, // static until level exited
|
||||||
PU_LEVSPEC = 51, // a special thinker in a level
|
PU_LEVSPEC, // a special thinker in a level
|
||||||
PU_HWRPLANE = 52, // if ZPLANALLOC is enabled in hw_bsp.c, this is used to alloc polygons for OpenGL
|
PU_HWRPLANE, // 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 = 100, // Note: this is never actually used as a tag
|
PU_PURGELEVEL, // Note: this is never actually used as a tag
|
||||||
PU_CACHE_UNLOCKED = 101, // Note: unused
|
PU_CACHE_UNLOCKED, // Note: unused
|
||||||
PU_HWRCACHE_UNLOCKED = 102, // 'unlocked' PU_HWRCACHE memory:
|
PU_HWRCACHE_UNLOCKED, // 'unlocked' PU_HWRCACHE memory:
|
||||||
// 'second-level' cache for graphics
|
// 'second-level' cache for graphics
|
||||||
// stored in hardware format and downloaded as needed
|
|
||||||
PU_HWRMODELTEXTURE_UNLOCKED = 103, // 'unlocked' PU_HWRMODELTEXTURE memory
|
// stored in hardware format and downloaded as needed
|
||||||
|
PU_HWRMODELTEXTURE_UNLOCKED, // 'unlocked' PU_HWRMODELTEXTURE memory
|
||||||
|
|
||||||
|
NUM_PURGETAGS
|
||||||
};
|
};
|
||||||
|
|
||||||
//
|
//
|
||||||
@@ -157,7 +160,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, INT32_MAX)
|
#define Z_TotalUsage() Z_TagsUsage(0, NUM_PURGETAGS-1)
|
||||||
|
|
||||||
//
|
//
|
||||||
// Miscellaneous functions
|
// Miscellaneous functions
|
||||||
@@ -170,6 +173,8 @@ 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