Compare commits
35
Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
a7805ae3f0 | ||
|
|
325338bfbf | ||
|
|
01a54e4d0b | ||
|
|
e2df018e38 | ||
|
|
33b62cba33 | ||
|
|
29b4f78b64 | ||
|
|
bce18e3d61 | ||
|
|
e9c2b982c6 | ||
|
|
67e1793f49 | ||
|
|
80613a8a49 | ||
|
|
b017a72026 | ||
|
|
a7c5254a32 | ||
|
|
9dd1a47969 | ||
|
|
bbbd42e653 | ||
|
|
2b7f2da5ee | ||
|
|
23ba827726 | ||
|
|
326a28ec36 | ||
|
|
19d6a1600e | ||
|
|
3095303a4b | ||
|
|
2a1807422c | ||
|
|
30cea37248 | ||
|
|
080d3c6b18 | ||
|
|
ec757ceb2c | ||
|
|
e00783da82 | ||
|
|
52a9486974 | ||
|
|
26b26b8f25 | ||
|
|
81f7335b05 | ||
|
|
f603106ac8 | ||
|
|
5675eefeb2 | ||
|
|
1d0fb17da4 | ||
|
|
f53d37052a | ||
|
|
cae5e73d7d | ||
|
|
95d8864faa | ||
|
|
da67f6feb8 | ||
|
|
8cc73bc482 |
No files matched your search
@@ -144,8 +144,10 @@ ifdef GCC81
|
|||||||
WFLAGS+=-Wno-error=multistatement-macros
|
WFLAGS+=-Wno-error=multistatement-macros
|
||||||
endif
|
endif
|
||||||
|
|
||||||
ifeq ($(CC),clang)
|
ifneq (,$(filter $(CC) $(CXX),clang clang++))
|
||||||
WFLAGS+= -Wno-unknown-pragmas -Wno-cast-align
|
WFLAGS+= -Wno-unknown-pragmas
|
||||||
|
WFLAGS+= -Wno-cast-align
|
||||||
|
WFLAGS+= -Wno-cast-qual # not a fan, but clang really hates our read macros
|
||||||
endif
|
endif
|
||||||
|
|
||||||
ifdef NONX86
|
ifdef NONX86
|
||||||
|
|||||||
+1
-1
@@ -434,7 +434,7 @@ LUA_API void lua_pushnumber (lua_State *L, lua_Number n) {
|
|||||||
LUA_API void lua_pushlstring (lua_State *L, const char *s, size_t len) {
|
LUA_API void lua_pushlstring (lua_State *L, const char *s, size_t len) {
|
||||||
lua_lock(L);
|
lua_lock(L);
|
||||||
luaC_checkGC(L);
|
luaC_checkGC(L);
|
||||||
setsvalue2s(L, L->top, luaS_newlstr(L, s, len));
|
setsvalue2s(L, L->top, (len == 0) ? luaS_new(L, "") : luaS_newlstr(L, s, len));
|
||||||
api_incr_top(L);
|
api_incr_top(L);
|
||||||
lua_unlock(L);
|
lua_unlock(L);
|
||||||
}
|
}
|
||||||
|
|||||||
+33
-31
@@ -1,7 +1,8 @@
|
|||||||
// SONIC ROBO BLAST 2
|
// SONIC ROBO BLAST 2 KART
|
||||||
//-----------------------------------------------------------------------------
|
//-----------------------------------------------------------------------------
|
||||||
// Copyright (C) 1998-2000 by DooM Legacy Team.
|
// Copyright (C) 2025 by Kart Krew.
|
||||||
// Copyright (C) 1999-2025 by Sonic Team Junior.
|
// Copyright (C) 2020 by Sonic Team Junior.
|
||||||
|
// Copyright (C) 2000 by DooM Legacy Team.
|
||||||
//
|
//
|
||||||
// This program is free software distributed under the
|
// This program is free software distributed under the
|
||||||
// terms of the GNU General Public License, version 2.
|
// terms of the GNU General Public License, version 2.
|
||||||
@@ -24,8 +25,9 @@ extern "C" {
|
|||||||
//
|
//
|
||||||
// Little-endian machines
|
// Little-endian machines
|
||||||
//
|
//
|
||||||
|
|
||||||
#define WRITEUINT8(p,b) do { UINT8 *p_tmp = ( UINT8 *)p; const UINT8 tv = ( UINT8)(b); memcpy(p, &tv, sizeof( UINT8)); p_tmp++; *(void**)(&(p)) = (void *)p_tmp; } while (0)
|
#define WRITEUINT8(p,b) do { UINT8 *p_tmp = ( UINT8 *)p; const UINT8 tv = ( UINT8)(b); memcpy(p, &tv, sizeof( UINT8)); p_tmp++; *(void**)(&(p)) = (void *)p_tmp; } while (0)
|
||||||
#define WRITESINT8(p,b) do { SINT8 *p_tmp = ( SINT8 *)p; const SINT8 tv = ( UINT8)(b); memcpy(p, &tv, sizeof( UINT8)); p_tmp++; *(void**)(&(p)) = (void *)p_tmp; } while (0)
|
#define WRITESINT8(p,b) do { SINT8 *p_tmp = ( SINT8 *)p; const SINT8 tv = ( SINT8)(b); memcpy(p, &tv, sizeof( SINT8)); p_tmp++; *(void**)(&(p)) = (void *)p_tmp; } while (0)
|
||||||
#define WRITEINT16(p,b) do { INT16 *p_tmp = ( INT16 *)p; const INT16 tv = ( INT16)(b); memcpy(p, &tv, sizeof( INT16)); p_tmp++; *(void**)(&(p)) = (void *)p_tmp; } while (0)
|
#define WRITEINT16(p,b) do { INT16 *p_tmp = ( INT16 *)p; const INT16 tv = ( INT16)(b); memcpy(p, &tv, sizeof( INT16)); p_tmp++; *(void**)(&(p)) = (void *)p_tmp; } while (0)
|
||||||
#define WRITEUINT16(p,b) do { UINT16 *p_tmp = ( UINT16 *)p; const UINT16 tv = ( UINT16)(b); memcpy(p, &tv, sizeof( UINT16)); p_tmp++; *(void**)(&(p)) = (void *)p_tmp; } while (0)
|
#define WRITEUINT16(p,b) do { UINT16 *p_tmp = ( UINT16 *)p; const UINT16 tv = ( UINT16)(b); memcpy(p, &tv, sizeof( UINT16)); p_tmp++; *(void**)(&(p)) = (void *)p_tmp; } while (0)
|
||||||
#define WRITEINT32(p,b) do { INT32 *p_tmp = ( INT32 *)p; const INT32 tv = ( INT32)(b); memcpy(p, &tv, sizeof( INT32)); p_tmp++; *(void**)(&(p)) = (void *)p_tmp; } while (0)
|
#define WRITEINT32(p,b) do { INT32 *p_tmp = ( INT32 *)p; const INT32 tv = ( INT32)(b); memcpy(p, &tv, sizeof( INT32)); p_tmp++; *(void**)(&(p)) = (void *)p_tmp; } while (0)
|
||||||
@@ -36,25 +38,25 @@ extern "C" {
|
|||||||
|
|
||||||
// what is this?
|
// what is this?
|
||||||
#if defined (__GNUC__)
|
#if defined (__GNUC__)
|
||||||
#define READUINT8(p) ({ UINT8 *p_tmp = (UINT8 *)p; UINT8 b; memcpy(&b, p, sizeof( UINT8)); p_tmp++; *(void**)(&(p)) = (void *)p_tmp; b; })
|
#define READUINT8(p) ({ const UINT8 *p_tmp = (const UINT8 *)p; UINT8 b; memcpy(&b, p, sizeof( UINT8)); p_tmp++; *(const void**)(&(p)) = (const void *)p_tmp; b; })
|
||||||
#define READSINT8(p) ({ SINT8 *p_tmp = (SINT8 *)p; SINT8 b; memcpy(&b, p, sizeof( SINT8)); p_tmp++; *(void**)(&(p)) = (void *)p_tmp; b; })
|
#define READSINT8(p) ({ const SINT8 *p_tmp = (const SINT8 *)p; SINT8 b; memcpy(&b, p, sizeof( SINT8)); p_tmp++; *(const void**)(&(p)) = (const void *)p_tmp; b; })
|
||||||
#define READINT16(p) ({ INT16 *p_tmp = (INT16 *)p; INT16 b; memcpy(&b, p, sizeof( INT16)); p_tmp++; *(void**)(&(p)) = (void *)p_tmp; b; })
|
#define READINT16(p) ({ const INT16 *p_tmp = (const INT16 *)p; INT16 b; memcpy(&b, p, sizeof( INT16)); p_tmp++; *(const void**)(&(p)) = (const void *)p_tmp; b; })
|
||||||
#define READUINT16(p) ({ UINT16 *p_tmp = (UINT16 *)p; UINT16 b; memcpy(&b, p, sizeof( UINT16)); p_tmp++; *(void**)(&(p)) = (void *)p_tmp; b; })
|
#define READUINT16(p) ({ const UINT16 *p_tmp = (const UINT16 *)p; UINT16 b; memcpy(&b, p, sizeof( UINT16)); p_tmp++; *(const void**)(&(p)) = (const void *)p_tmp; b; })
|
||||||
#define READINT32(p) ({ INT32 *p_tmp = (INT32 *)p; INT32 b; memcpy(&b, p, sizeof( INT32)); p_tmp++; *(void**)(&(p)) = (void *)p_tmp; b; })
|
#define READINT32(p) ({ const INT32 *p_tmp = (const INT32 *)p; INT32 b; memcpy(&b, p, sizeof( INT32)); p_tmp++; *(const void**)(&(p)) = (const void *)p_tmp; b; })
|
||||||
#define READUINT32(p) ({ UINT32 *p_tmp = (UINT32 *)p; UINT32 b; memcpy(&b, p, sizeof( UINT32)); p_tmp++; *(void**)(&(p)) = (void *)p_tmp; b; })
|
#define READUINT32(p) ({ const UINT32 *p_tmp = (const UINT32 *)p; UINT32 b; memcpy(&b, p, sizeof( UINT32)); p_tmp++; *(const void**)(&(p)) = (const void *)p_tmp; b; })
|
||||||
#define READCHAR(p) ({ char *p_tmp = (char *)p; char b; memcpy(&b, p, sizeof( char)); p_tmp++; *(void**)(&(p)) = (void *)p_tmp; b; })
|
#define READCHAR(p) ({ const char *p_tmp = (const char *)p; char b; memcpy(&b, p, sizeof( char)); p_tmp++; *(const void**)(&(p)) = (const void *)p_tmp; b; })
|
||||||
#define READFIXED(p) ({ fixed_t *p_tmp = (fixed_t *)p; fixed_t b; memcpy(&b, p, sizeof(fixed_t)); p_tmp++; *(void**)(&(p)) = (void *)p_tmp; b; })
|
#define READFIXED(p) ({ const fixed_t *p_tmp = (const fixed_t *)p; fixed_t b; memcpy(&b, p, sizeof(fixed_t)); p_tmp++; *(const void**)(&(p)) = (const void *)p_tmp; b; })
|
||||||
#define READANGLE(p) ({ angle_t *p_tmp = (angle_t *)p; angle_t b; memcpy(&b, p, sizeof(angle_t)); p_tmp++; *(void**)(&(p)) = (void *)p_tmp; b; })
|
#define READANGLE(p) ({ const angle_t *p_tmp = (const angle_t *)p; angle_t b; memcpy(&b, p, sizeof(angle_t)); p_tmp++; *(const void**)(&(p)) = (const void *)p_tmp; b; })
|
||||||
#else
|
#else
|
||||||
#define READUINT8(p) ((UINT8*)(*(void**)(&(p)) = (void*)&((UINT8*)(p))[1]))[-1]
|
#define READUINT8(p) ((const UINT8*) (*(const void**)(&(p)) = (const void*)&((const UINT8*) (p))[1]))[-1]
|
||||||
#define READSINT8(p) ((SINT8*)(*(void**)(&(p)) = (void*)&((SINT8*)(p))[1]))[-1]
|
#define READSINT8(p) ((const SINT8*) (*(const void**)(&(p)) = (const void*)&((const SINT8*) (p))[1]))[-1]
|
||||||
#define READINT16(p) ((INT16*)(*(void**)(&(p)) = (void*)&((INT16*)(p))[1]))[-1]
|
#define READINT16(p) ((const INT16*) (*(const void**)(&(p)) = (const void*)&((const INT16*) (p))[1]))[-1]
|
||||||
#define READUINT16(p) ((UINT16*)(*(void**)(&(p)) = (void*)&((UINT16*)(p))[1]))[-1]
|
#define READUINT16(p) ((const UINT16*) (*(const void**)(&(p)) = (const void*)&((const UINT16*) (p))[1]))[-1]
|
||||||
#define READINT32(p) ((INT32*)(*(void**)(&(p)) = (void*)&((INT32*)(p))[1]))[-1]
|
#define READINT32(p) ((const INT32*) (*(const void**)(&(p)) = (const void*)&((const INT32*) (p))[1]))[-1]
|
||||||
#define READUINT32(p) ((UINT32*)(*(void**)(&(p)) = (void*)&((UINT32*)(p))[1]))[-1]
|
#define READUINT32(p) ((const UINT32*) (*(const void**)(&(p)) = (const void*)&((const UINT32*) (p))[1]))[-1]
|
||||||
#define READCHAR(p) ((char*)(*(void**)(&(p)) = (void*)&((char*)(p))[1]))[-1]
|
#define READCHAR(p) ((const char*) (*(const void**)(&(p)) = (const void*)&((const char*) (p))[1]))[-1]
|
||||||
#define READFIXED(p) ((fixed_t*)(*(void**)(&(p)) = (void*)&((fixed_t*)(p))[1]))[-1]
|
#define READFIXED(p) ((const fixed_t*)(*(const void**)(&(p)) = (const void*)&((const fixed_t*)(p))[1]))[-1]
|
||||||
#define READANGLE(p) ((angle_t*)(*(void**)(&(p)) = (void*)&((angle_t*)(p))[1]))[-1]
|
#define READANGLE(p) ((const angle_t*)(*(const void**)(&(p)) = (const void*)&((const angle_t*)(p))[1]))[-1]
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#else //SRB2_BIG_ENDIAN
|
#else //SRB2_BIG_ENDIAN
|
||||||
@@ -117,15 +119,15 @@ FUNCINLINE static ATTRINLINE UINT32 readulong(void *ptr)
|
|||||||
return (ucp[3] << 24) | (ucp[2] << 16) | (ucp[1] << 8) | ucp[0];
|
return (ucp[3] << 24) | (ucp[2] << 16) | (ucp[1] << 8) | ucp[0];
|
||||||
}
|
}
|
||||||
|
|
||||||
#define READUINT8(p) ((UINT8*)(p = (void*)&((UINT8*)p)[1]))[-1]
|
#define READUINT8(p) ((const UINT8*)(p = (const void*)&((const UINT8*)p)[1]))[-1]
|
||||||
#define READSINT8(p) ((SINT8*)(p = (void*)&((SINT8*)p)[1]))[-1]
|
#define READSINT8(p) ((const SINT8*)(p = (const void*)&((const SINT8*)p)[1]))[-1]
|
||||||
#define READINT16(p) readshort(&((INT16*)(p = (void*)&((INT16*)p)[1]))[-1])
|
#define READINT16(p) readshort(&((const INT16*)(p = (const void*)&((const INT16*)p)[1]))[-1])
|
||||||
#define READUINT16(p) readushort(&((UINT16*)(p = (void*)&((UINT16*)p)[1]))[-1])
|
#define READUINT16(p) readushort(&((const UINT16*)(p = (const void*)&((const UINT16*)p)[1]))[-1])
|
||||||
#define READINT32(p) readlong(&((INT32*)(p = (void*)&((INT32*)p)[1]))[-1])
|
#define READINT32(p) readlong(&((const INT32*)(p = (const void*)&((const INT32*)p)[1]))[-1])
|
||||||
#define READUINT32(p) readulong(&((UINT32*)(p = (void*)&((UINT32*)p)[1]))
|
#define READUINT32(p) readulong(&((const UINT32*)(p = (const void*)&((const UINT32*)p)[1]))[-1])
|
||||||
#define READCHAR(p) ((char*)(p = (void*)&((char*)p)[1]))[-1]
|
#define READCHAR(p) ((const char*)(p = (const void*)&((const char*)p)[1]))[-1]
|
||||||
#define READFIXED(p) readlong(&((fixed_t*)(p = (void*)&((fixed_t*)p)[1]))[-1])
|
#define READFIXED(p) readlong(&((const fixed_t*)(p = (const void*)&((const fixed_t*)p)[1]))[-1])
|
||||||
#define READANGLE(p) readulong(&((angle_t*)(p = (void*)&((angle_t*)p)[1]))[-1])
|
#define READANGLE(p) readulong(&((const angle_t*)(p = (const void*)&((const angle_t*)p)[1]))[-1])
|
||||||
#endif //SRB2_BIG_ENDIAN
|
#endif //SRB2_BIG_ENDIAN
|
||||||
|
|
||||||
#define WRITESTRINGN(p, s, n) do { \
|
#define WRITESTRINGN(p, s, n) do { \
|
||||||
|
|||||||
+17
-13
@@ -142,7 +142,7 @@ void COM_BufInsertText(const char *ptext)
|
|||||||
templen = com_text.cursize;
|
templen = com_text.cursize;
|
||||||
if (templen)
|
if (templen)
|
||||||
{
|
{
|
||||||
temp = M_Memcpy(ZZ_Alloc(templen), com_text.data, templen);
|
temp = memcpy(ZZ_Alloc(templen), com_text.data, templen);
|
||||||
VS_Clear(&com_text);
|
VS_Clear(&com_text);
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -199,7 +199,7 @@ void COM_BufExecute(void)
|
|||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
|
||||||
M_Memcpy(line, ptext, i);
|
memcpy(line, ptext, i);
|
||||||
line[i] = 0;
|
line[i] = 0;
|
||||||
|
|
||||||
// flush the command text from the command buffer, _BEFORE_
|
// flush the command text from the command buffer, _BEFORE_
|
||||||
@@ -281,7 +281,7 @@ char *com_argv[MAX_ARGS];
|
|||||||
static const char *com_null_string = "";
|
static const char *com_null_string = "";
|
||||||
static char *com_args = NULL; // current command args or NULL
|
static char *com_args = NULL; // current command args or NULL
|
||||||
|
|
||||||
static void Got_NetVar(UINT8 **p, INT32 playernum);
|
static void Got_NetVar(const UINT8 **p, INT32 playernum);
|
||||||
|
|
||||||
/** Initializes command buffer and adds basic commands.
|
/** Initializes command buffer and adds basic commands.
|
||||||
*/
|
*/
|
||||||
@@ -1129,7 +1129,7 @@ void *VS_GetSpace(vsbuf_t *buf, size_t length)
|
|||||||
*/
|
*/
|
||||||
void VS_Write(vsbuf_t *buf, const void *data, size_t length)
|
void VS_Write(vsbuf_t *buf, const void *data, size_t length)
|
||||||
{
|
{
|
||||||
M_Memcpy(VS_GetSpace(buf, length), data, length);
|
memcpy(VS_GetSpace(buf, length), data, length);
|
||||||
}
|
}
|
||||||
|
|
||||||
/** Prints text in a variable buffer. Like VS_Write() plus a
|
/** Prints text in a variable buffer. Like VS_Write() plus a
|
||||||
@@ -1146,9 +1146,9 @@ void VS_Print(vsbuf_t *buf, const char *data)
|
|||||||
len = strlen(data) + 1;
|
len = strlen(data) + 1;
|
||||||
|
|
||||||
if (buf->data[buf->cursize-1])
|
if (buf->data[buf->cursize-1])
|
||||||
M_Memcpy((UINT8 *)VS_GetSpace(buf, len), data, len); // no trailing 0
|
memcpy((UINT8 *)VS_GetSpace(buf, len), data, len); // no trailing 0
|
||||||
else
|
else
|
||||||
M_Memcpy((UINT8 *)VS_GetSpace(buf, len-1) - 1, data, len); // write over trailing 0
|
memcpy((UINT8 *)VS_GetSpace(buf, len-1) - 1, data, len); // write over trailing 0
|
||||||
}
|
}
|
||||||
|
|
||||||
// =========================================================================
|
// =========================================================================
|
||||||
@@ -1474,7 +1474,7 @@ finish:
|
|||||||
var->flags |= CV_MODIFIED;
|
var->flags |= CV_MODIFIED;
|
||||||
|
|
||||||
// raise 'on change' code
|
// raise 'on change' code
|
||||||
LUA_CVarChanged(var->name); // let consolelib know what cvar this is.
|
LUA_CVarChanged(var); // let consolelib know what cvar this is.
|
||||||
|
|
||||||
if (var->flags & CV_CALL && !stealth)
|
if (var->flags & CV_CALL && !stealth)
|
||||||
var->func();
|
var->func();
|
||||||
@@ -1500,11 +1500,11 @@ badinput:
|
|||||||
|
|
||||||
static boolean serverloading = false;
|
static boolean serverloading = false;
|
||||||
|
|
||||||
static void Got_NetVar(UINT8 **p, INT32 playernum)
|
static void Got_NetVar(const UINT8 **p, INT32 playernum)
|
||||||
{
|
{
|
||||||
consvar_t *cvar;
|
consvar_t *cvar;
|
||||||
UINT16 netid;
|
UINT16 netid;
|
||||||
char *svalue;
|
const char *svalue;
|
||||||
UINT8 stealth = false;
|
UINT8 stealth = false;
|
||||||
|
|
||||||
if (playernum != serverplayer && !IsPlayerAdmin(playernum) && !serverloading)
|
if (playernum != serverplayer && !IsPlayerAdmin(playernum) && !serverloading)
|
||||||
@@ -1518,9 +1518,10 @@ static void Got_NetVar(UINT8 **p, INT32 playernum)
|
|||||||
}
|
}
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
netid = READUINT16(*p);
|
netid = READUINT16(*p);
|
||||||
cvar = CV_FindNetVar(netid);
|
cvar = CV_FindNetVar(netid);
|
||||||
svalue = (char *)*p;
|
svalue = (const char *)*p;
|
||||||
SKIPSTRING(*p);
|
SKIPSTRING(*p);
|
||||||
stealth = READUINT8(*p);
|
stealth = READUINT8(*p);
|
||||||
|
|
||||||
@@ -1576,8 +1577,9 @@ void CV_SaveNetVars(UINT8 **p, boolean isdemorecording)
|
|||||||
WRITEUINT16(count_p, count);
|
WRITEUINT16(count_p, count);
|
||||||
}
|
}
|
||||||
|
|
||||||
void CV_LoadNetVars(UINT8 **p)
|
size_t CV_LoadNetVars(const UINT8 *bufstart)
|
||||||
{
|
{
|
||||||
|
const UINT8 *p = bufstart;
|
||||||
consvar_t *cvar;
|
consvar_t *cvar;
|
||||||
UINT16 count;
|
UINT16 count;
|
||||||
|
|
||||||
@@ -1588,11 +1590,13 @@ void CV_LoadNetVars(UINT8 **p)
|
|||||||
if (cvar->flags & CV_NETVAR)
|
if (cvar->flags & CV_NETVAR)
|
||||||
Setvalue(cvar, cvar->defaultvalue, true);
|
Setvalue(cvar, cvar->defaultvalue, true);
|
||||||
|
|
||||||
count = READUINT16(*p);
|
count = READUINT16(p);
|
||||||
while (count--)
|
while (count--)
|
||||||
Got_NetVar(p, 0);
|
Got_NetVar(&p, 0);
|
||||||
|
|
||||||
serverloading = false;
|
serverloading = false;
|
||||||
|
|
||||||
|
return p - bufstart;
|
||||||
}
|
}
|
||||||
|
|
||||||
static void CV_SetCVar(consvar_t *var, const char *value, boolean stealth);
|
static void CV_SetCVar(consvar_t *var, const char *value, boolean stealth);
|
||||||
|
|||||||
+1
-1
@@ -182,7 +182,7 @@ void CV_SaveVariables(FILE *f);
|
|||||||
|
|
||||||
// load/save gamesate (load and save option and for network join in game)
|
// load/save gamesate (load and save option and for network join in game)
|
||||||
void CV_SaveNetVars(UINT8 **p, boolean isdemorecording);
|
void CV_SaveNetVars(UINT8 **p, boolean isdemorecording);
|
||||||
void CV_LoadNetVars(UINT8 **p);
|
size_t CV_LoadNetVars(const UINT8 *p);
|
||||||
|
|
||||||
// reset cheat netvars after cheats is deactivated
|
// reset cheat netvars after cheats is deactivated
|
||||||
void CV_ResetCheatNetVars(void);
|
void CV_ResetCheatNetVars(void);
|
||||||
|
|||||||
+2
-2
@@ -521,7 +521,7 @@ static void CON_RecalcSize(void)
|
|||||||
oldcon_width = con_width;
|
oldcon_width = con_width;
|
||||||
oldnumlines = con_totallines;
|
oldnumlines = con_totallines;
|
||||||
oldcon_cy = con_cy;
|
oldcon_cy = con_cy;
|
||||||
M_Memcpy(tmp_buffer, con_buffer, CON_BUFFERSIZE);
|
memcpy(tmp_buffer, con_buffer, CON_BUFFERSIZE);
|
||||||
|
|
||||||
if (conw < 1)
|
if (conw < 1)
|
||||||
con_width = (BASEVIDWIDTH>>3) - 2;
|
con_width = (BASEVIDWIDTH>>3) - 2;
|
||||||
@@ -547,7 +547,7 @@ static void CON_RecalcSize(void)
|
|||||||
{
|
{
|
||||||
if (tmp_buffer[(i%oldnumlines)*oldcon_width])
|
if (tmp_buffer[(i%oldnumlines)*oldcon_width])
|
||||||
{
|
{
|
||||||
M_Memcpy(string, &tmp_buffer[(i%oldnumlines)*oldcon_width], oldcon_width);
|
memcpy(string, &tmp_buffer[(i%oldnumlines)*oldcon_width], oldcon_width);
|
||||||
conw = oldcon_width - 1;
|
conw = oldcon_width - 1;
|
||||||
while (string[conw] == ' ' && conw)
|
while (string[conw] == ' ' && conw)
|
||||||
conw--;
|
conw--;
|
||||||
|
|||||||
@@ -147,6 +147,51 @@ public:
|
|||||||
template <class T>
|
template <class T>
|
||||||
NotNull(T) -> NotNull<T>;
|
NotNull(T) -> NotNull<T>;
|
||||||
|
|
||||||
|
// does a super safe cast from floating point to interger types
|
||||||
|
// this prob could be better since i suck at ceepeepee
|
||||||
|
// but atleast we can just template shit to our desired types
|
||||||
|
template <typename FloatT, typename IntT>
|
||||||
|
static inline IntT floattoint(FloatT val)
|
||||||
|
{
|
||||||
|
// :chaosleep:
|
||||||
|
static_assert(std::is_floating_point_v<FloatT>, "Input must be a floating-point type");
|
||||||
|
static_assert(std::is_integral_v<IntT>, "Output must be a integer type");
|
||||||
|
|
||||||
|
if (std::fpclassify(val) == FP_NAN)
|
||||||
|
return 0; // if stuffs not a number we sure screwed up lmao
|
||||||
|
|
||||||
|
// treat inifinity as "int min/max"
|
||||||
|
if (std::fpclassify(val) == FP_INFINITE)
|
||||||
|
{
|
||||||
|
// yes infinity can be signed kek
|
||||||
|
if (std::signbit(val))
|
||||||
|
return std::numeric_limits<IntT>::min(); // negative infinity, so return min
|
||||||
|
else
|
||||||
|
return std::numeric_limits<IntT>::max();
|
||||||
|
}
|
||||||
|
|
||||||
|
// make sure we fit into our targettype uwu
|
||||||
|
if (val > static_cast<FloatT>(std::numeric_limits<IntT>::max()))
|
||||||
|
return std::numeric_limits<IntT>::max();
|
||||||
|
else if (val < static_cast<FloatT>(std::numeric_limits<IntT>::min()))
|
||||||
|
return std::numeric_limits<IntT>::min();
|
||||||
|
|
||||||
|
return static_cast<IntT>(val);
|
||||||
|
}
|
||||||
|
|
||||||
|
// safe float to fixed
|
||||||
|
// which handles nan and inf
|
||||||
|
// pretty much the same stuff as the above, but uh, idk how id use the above with this
|
||||||
|
template <typename FloatT> // can use both float and doubles yay
|
||||||
|
static inline int32_t floattofixed(FloatT val)
|
||||||
|
{
|
||||||
|
// :chaosleep:
|
||||||
|
static_assert(std::is_floating_point_v<FloatT>, "Input must be a floating-point type");
|
||||||
|
|
||||||
|
// fixed_t is just an int32_t, i dont wanna include doomtype here if it can be avoided
|
||||||
|
return floattoint<FloatT, int32_t>(val * 65535.);
|
||||||
|
}
|
||||||
|
|
||||||
} // namespace srb2
|
} // namespace srb2
|
||||||
|
|
||||||
#endif // __SRB2_CXXUTIL_HPP__
|
#endif // __SRB2_CXXUTIL_HPP__
|
||||||
+21
-19
@@ -312,9 +312,9 @@ static inline tic_t ExpandTics(INT32 low, tic_t basetic)
|
|||||||
// Some extra data function for handle textcmd buffer
|
// Some extra data function for handle textcmd buffer
|
||||||
// -----------------------------------------------------------------
|
// -----------------------------------------------------------------
|
||||||
|
|
||||||
static void (*listnetxcmd[MAXNETXCMD])(UINT8 **p, INT32 playernum);
|
static void (*listnetxcmd[MAXNETXCMD])(const UINT8 **p, INT32 playernum);
|
||||||
|
|
||||||
void RegisterNetXCmd(netxcmd_t id, void (*cmd_f)(UINT8 **p, INT32 playernum))
|
void RegisterNetXCmd(netxcmd_t id, void (*cmd_f)(const UINT8 **p, INT32 playernum))
|
||||||
{
|
{
|
||||||
#ifdef PARANOIA
|
#ifdef PARANOIA
|
||||||
if (id >= MAXNETXCMD)
|
if (id >= MAXNETXCMD)
|
||||||
@@ -331,7 +331,7 @@ static void WriteNetXCmd(UINT8 *cmd, netxcmd_t id, const void *param, size_t npa
|
|||||||
cmd[cmd[0]] = (UINT8)id;
|
cmd[cmd[0]] = (UINT8)id;
|
||||||
if (param && nparam)
|
if (param && nparam)
|
||||||
{
|
{
|
||||||
M_Memcpy(&cmd[cmd[0]+1], param, nparam);
|
memcpy(&cmd[cmd[0]+1], param, nparam);
|
||||||
cmd[0] = (UINT8)(cmd[0] + (UINT8)nparam);
|
cmd[0] = (UINT8)(cmd[0] + (UINT8)nparam);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -460,12 +460,12 @@ static void ExtraDataTicker(void)
|
|||||||
{
|
{
|
||||||
if (playeringame[i] || i == 0)
|
if (playeringame[i] || i == 0)
|
||||||
{
|
{
|
||||||
UINT8 *bufferstart = D_GetExistingTextcmd(gametic, i);
|
const UINT8 *bufferstart = D_GetExistingTextcmd(gametic, i);
|
||||||
|
|
||||||
if (bufferstart)
|
if (bufferstart)
|
||||||
{
|
{
|
||||||
UINT8 *curpos = bufferstart;
|
const UINT8 *curpos = bufferstart;
|
||||||
UINT8 *bufferend = &curpos[curpos[0]+1];
|
const UINT8 *bufferend = &curpos[curpos[0]+1];
|
||||||
|
|
||||||
curpos++;
|
curpos++;
|
||||||
while (curpos < bufferend)
|
while (curpos < bufferend)
|
||||||
@@ -1585,7 +1585,7 @@ static void SV_SendServerInfo(INT32 node, tic_t servertime)
|
|||||||
MAXSERVERNAME);
|
MAXSERVERNAME);
|
||||||
strncpy(netbuffer->u.serverinfo.mapname, G_BuildMapName(gamemap), sizeof(netbuffer->u.serverinfo.mapname)-1);
|
strncpy(netbuffer->u.serverinfo.mapname, G_BuildMapName(gamemap), sizeof(netbuffer->u.serverinfo.mapname)-1);
|
||||||
|
|
||||||
M_Memcpy(netbuffer->u.serverinfo.mapmd5, mapmd5, sizeof(netbuffer->u.serverinfo.mapmd5));
|
memcpy(netbuffer->u.serverinfo.mapmd5, mapmd5, sizeof(netbuffer->u.serverinfo.mapmd5));
|
||||||
|
|
||||||
netbuffer->u.serverinfo.iszone = 0;
|
netbuffer->u.serverinfo.iszone = 0;
|
||||||
|
|
||||||
@@ -3757,7 +3757,7 @@ static void Command_Kick(void)
|
|||||||
CONS_Printf(M_GetText("Only the server or a remote admin can use this.\n"));
|
CONS_Printf(M_GetText("Only the server or a remote admin can use this.\n"));
|
||||||
}
|
}
|
||||||
|
|
||||||
static void Got_KickCmd(UINT8 **p, INT32 playernum)
|
static void Got_KickCmd(const UINT8 **p, INT32 playernum)
|
||||||
{
|
{
|
||||||
INT32 pnum, msg;
|
INT32 pnum, msg;
|
||||||
char buf[3 + MAX_REASONLENGTH];
|
char buf[3 + MAX_REASONLENGTH];
|
||||||
@@ -4147,8 +4147,8 @@ consvar_t cv_connectawaittime = {"connectawaittime", "5", CV_SAVE, connectawaitt
|
|||||||
|
|
||||||
consvar_t cv_serverinfoscreen = {"serverinfoscreen", "On", CV_SAVE, CV_OnOff, NULL, 0, NULL, NULL, 0, 0, NULL};
|
consvar_t cv_serverinfoscreen = {"serverinfoscreen", "On", CV_SAVE, CV_OnOff, NULL, 0, NULL, NULL, 0, 0, NULL};
|
||||||
|
|
||||||
static void Got_AddPlayer(UINT8 **p, INT32 playernum);
|
static void Got_AddPlayer(const UINT8 **p, INT32 playernum);
|
||||||
static void Got_RemovePlayer(UINT8 **p, INT32 playernum);
|
static void Got_RemovePlayer(const UINT8 **p, INT32 playernum);
|
||||||
|
|
||||||
static void Joinable_OnChange(void)
|
static void Joinable_OnChange(void)
|
||||||
{
|
{
|
||||||
@@ -4400,7 +4400,7 @@ static inline void SV_AddNode(INT32 node)
|
|||||||
}
|
}
|
||||||
|
|
||||||
// Xcmd XD_ADDPLAYER
|
// Xcmd XD_ADDPLAYER
|
||||||
static void Got_AddPlayer(UINT8 **p, INT32 playernum)
|
static void Got_AddPlayer(const UINT8 **p, INT32 playernum)
|
||||||
{
|
{
|
||||||
INT16 node, newplayernum;
|
INT16 node, newplayernum;
|
||||||
UINT8 splitscreenplayer = 0;
|
UINT8 splitscreenplayer = 0;
|
||||||
@@ -4487,7 +4487,7 @@ static void Got_AddPlayer(UINT8 **p, INT32 playernum)
|
|||||||
}
|
}
|
||||||
|
|
||||||
// Xcmd XD_REMOVEPLAYER
|
// Xcmd XD_REMOVEPLAYER
|
||||||
static void Got_RemovePlayer(UINT8 **p, INT32 playernum)
|
static void Got_RemovePlayer(const UINT8 **p, INT32 playernum)
|
||||||
{
|
{
|
||||||
SINT8 pnum, reason;
|
SINT8 pnum, reason;
|
||||||
|
|
||||||
@@ -4648,7 +4648,7 @@ void SV_StopServer(void)
|
|||||||
|
|
||||||
if (gamestate == GS_INTERMISSION)
|
if (gamestate == GS_INTERMISSION)
|
||||||
Y_EndIntermission();
|
Y_EndIntermission();
|
||||||
if (gamestate == GS_VOTING)
|
else if (gamestate == GS_VOTING)
|
||||||
Y_EndVote();
|
Y_EndVote();
|
||||||
|
|
||||||
G_SetGamestate(GS_NULL);
|
G_SetGamestate(GS_NULL);
|
||||||
@@ -4664,6 +4664,8 @@ void SV_StopServer(void)
|
|||||||
textcmdbuf[i] = textcmdbuf[i]->next;
|
textcmdbuf[i] = textcmdbuf[i]->next;
|
||||||
Z_Free(buf);
|
Z_Free(buf);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
textcmdbuf[i] = NULL;
|
||||||
}
|
}
|
||||||
|
|
||||||
for (i = firstticstosend; i < firstticstosend + BACKUPTICS; i++)
|
for (i = firstticstosend; i < firstticstosend + BACKUPTICS; i++)
|
||||||
@@ -5227,7 +5229,7 @@ static void PT_ServerCFG(SINT8 node)
|
|||||||
|
|
||||||
scp = netbuffer->u.servercfg.varlengthinputs;
|
scp = netbuffer->u.servercfg.varlengthinputs;
|
||||||
CV_LoadPlayerNames(&scp);
|
CV_LoadPlayerNames(&scp);
|
||||||
CV_LoadNetVars(&scp);
|
scp += CV_LoadNetVars(scp);
|
||||||
|
|
||||||
/// \note Wait. What if a Lua script uses some global custom variables synched with the NetVars hook?
|
/// \note Wait. What if a Lua script uses some global custom variables synched with the NetVars hook?
|
||||||
/// Shouldn't them be downloaded even at intermission time?
|
/// Shouldn't them be downloaded even at intermission time?
|
||||||
@@ -5687,7 +5689,7 @@ static void PT_TextCmd(INT32 netconsole, SINT8 node)
|
|||||||
DEBFILE(va("textcmd put in tic %u at position %d (player %d) ftts %u mk %u\n",
|
DEBFILE(va("textcmd put in tic %u at position %d (player %d) ftts %u mk %u\n",
|
||||||
tic, textcmd[0]+1, netconsole, firstticstosend, maketic));
|
tic, textcmd[0]+1, netconsole, firstticstosend, maketic));
|
||||||
|
|
||||||
M_Memcpy(&textcmd[textcmd[0]+1], netbuffer->u.textcmd+1, netbuffer->u.textcmd[0]);
|
memcpy(&textcmd[textcmd[0]+1], netbuffer->u.textcmd+1, netbuffer->u.textcmd[0]);
|
||||||
textcmd[0] += (UINT8)netbuffer->u.textcmd[0];
|
textcmd[0] += (UINT8)netbuffer->u.textcmd[0];
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -5794,7 +5796,7 @@ static void PT_ServerTics(SINT8 node)
|
|||||||
}
|
}
|
||||||
|
|
||||||
if (i >= gametic) // Don't copy old net commands
|
if (i >= gametic) // Don't copy old net commands
|
||||||
M_Memcpy(D_GetTextcmd(i, playernum), txtpak, txtsize);
|
memcpy(D_GetTextcmd(i, playernum), txtpak, txtsize);
|
||||||
txtpak += txtsize;
|
txtpak += txtsize;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -6332,7 +6334,7 @@ static void CL_SendClientCmd(void)
|
|||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
|
||||||
M_Memcpy(netbuffer->u.textcmd, localtextcmd[i], localtextcmd[i][0]+1);
|
memcpy(netbuffer->u.textcmd, localtextcmd[i], localtextcmd[i][0]+1);
|
||||||
|
|
||||||
// All extra data have been sent
|
// All extra data have been sent
|
||||||
if (HSendPacket(servernode, true, 0, localtextcmd[i][0]+1)) // Send can fail...
|
if (HSendPacket(servernode, true, 0, localtextcmd[i][0]+1)) // Send can fail...
|
||||||
@@ -6342,7 +6344,7 @@ static void CL_SendClientCmd(void)
|
|||||||
if (textcmdbuf[i] != NULL)
|
if (textcmdbuf[i] != NULL)
|
||||||
{
|
{
|
||||||
textcmdbuf_t *buf = textcmdbuf[i];
|
textcmdbuf_t *buf = textcmdbuf[i];
|
||||||
M_Memcpy(localtextcmd[i], textcmdbuf[i]->cmd, textcmdbuf[i]->cmd[0]+1);
|
memcpy(localtextcmd[i], textcmdbuf[i]->cmd, textcmdbuf[i]->cmd[0]+1);
|
||||||
textcmdbuf[i] = textcmdbuf[i]->next;
|
textcmdbuf[i] = textcmdbuf[i]->next;
|
||||||
Z_Free(buf);
|
Z_Free(buf);
|
||||||
}
|
}
|
||||||
@@ -6455,7 +6457,7 @@ static void SV_SendTics(void)
|
|||||||
{
|
{
|
||||||
(*ntextcmd)++;
|
(*ntextcmd)++;
|
||||||
WRITEUINT8(bufpos, j);
|
WRITEUINT8(bufpos, j);
|
||||||
M_Memcpy(bufpos, textcmd, size + 1);
|
memcpy(bufpos, textcmd, size + 1);
|
||||||
bufpos += size + 1;
|
bufpos += size + 1;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
+1
-1
@@ -604,7 +604,7 @@ extern consvar_t cv_serverinfoscreen;
|
|||||||
void D_ClientServerInit(void);
|
void D_ClientServerInit(void);
|
||||||
|
|
||||||
// Initialise the other field
|
// Initialise the other field
|
||||||
void RegisterNetXCmd(netxcmd_t id, void (*cmd_f)(UINT8 **p, INT32 playernum));
|
void RegisterNetXCmd(netxcmd_t id, void (*cmd_f)(const UINT8 **p, INT32 playernum));
|
||||||
void SendNetXCmdForPlayer(UINT8 playerid, netxcmd_t id, const void *param, size_t nparam);
|
void SendNetXCmdForPlayer(UINT8 playerid, netxcmd_t id, const void *param, size_t nparam);
|
||||||
#define SendNetXCmd(id, param, nparam) SendNetXCmdForPlayer(0, id, param, nparam) // Shortcut for P1
|
#define SendNetXCmd(id, param, nparam) SendNetXCmdForPlayer(0, id, param, nparam) // Shortcut for P1
|
||||||
void SendKick(UINT8 playernum, UINT8 msg);
|
void SendKick(UINT8 playernum, UINT8 msg);
|
||||||
|
|||||||
+5
-5
@@ -243,7 +243,7 @@ static boolean GetFreeAcknum(UINT8 *freeack)
|
|||||||
ackpak[i].length = doomcom->datalength;
|
ackpak[i].length = doomcom->datalength;
|
||||||
ackpak[i].senttime = I_GetTime();
|
ackpak[i].senttime = I_GetTime();
|
||||||
ackpak[i].resentnum = 0;
|
ackpak[i].resentnum = 0;
|
||||||
M_Memcpy(ackpak[i].pak.raw, netbuffer, ackpak[i].length);
|
memcpy(ackpak[i].pak.raw, netbuffer, ackpak[i].length);
|
||||||
|
|
||||||
*freeack = ackpak[i].acknum;
|
*freeack = ackpak[i].acknum;
|
||||||
|
|
||||||
@@ -412,7 +412,7 @@ void Net_SendAcks(INT32 node)
|
|||||||
{
|
{
|
||||||
doomdata_t *netbuffer = DOOMCOM_DATA(doomcom);
|
doomdata_t *netbuffer = DOOMCOM_DATA(doomcom);
|
||||||
netbuffer->packettype = PT_NOTHING;
|
netbuffer->packettype = PT_NOTHING;
|
||||||
M_Memcpy(netbuffer->u.textcmd, nodes[node].acktosend, MAXACKTOSEND);
|
memcpy(netbuffer->u.textcmd, nodes[node].acktosend, MAXACKTOSEND);
|
||||||
HSendPacket(node, false, 0, MAXACKTOSEND);
|
HSendPacket(node, false, 0, MAXACKTOSEND);
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -494,7 +494,7 @@ void Net_AckTicker(void)
|
|||||||
}
|
}
|
||||||
DEBFILE(va("Resend ack %d, %u<%d at %u\n", ackpak[i].acknum, ackpak[i].senttime,
|
DEBFILE(va("Resend ack %d, %u<%d at %u\n", ackpak[i].acknum, ackpak[i].senttime,
|
||||||
NODETIMEOUT, I_GetTime()));
|
NODETIMEOUT, I_GetTime()));
|
||||||
M_Memcpy(netbuffer, ackpak[i].pak.raw, ackpak[i].length);
|
memcpy(netbuffer, ackpak[i].pak.raw, ackpak[i].length);
|
||||||
ackpak[i].senttime = I_GetTime();
|
ackpak[i].senttime = I_GetTime();
|
||||||
ackpak[i].resentnum++;
|
ackpak[i].resentnum++;
|
||||||
ackpak[i].nextacknum = node->nextacknum;
|
ackpak[i].nextacknum = node->nextacknum;
|
||||||
@@ -1021,7 +1021,7 @@ boolean HSendPacket(INT32 node, boolean reliable, UINT8 acknum, size_t packetlen
|
|||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
netbuffer->ack = netbuffer->ackreturn = 0; // don't hold over values from last packet sent/received
|
netbuffer->ack = netbuffer->ackreturn = 0; // don't hold over values from last packet sent/received
|
||||||
M_Memcpy(&reboundstore[rebound_head], netbuffer,
|
memcpy(&reboundstore[rebound_head], netbuffer,
|
||||||
doomcom->datalength);
|
doomcom->datalength);
|
||||||
reboundsize[rebound_head] = doomcom->datalength;
|
reboundsize[rebound_head] = doomcom->datalength;
|
||||||
rebound_head = (rebound_head+1) % MAXREBOUND;
|
rebound_head = (rebound_head+1) % MAXREBOUND;
|
||||||
@@ -1107,7 +1107,7 @@ boolean HGetPacket(void)
|
|||||||
// Get a packet from self
|
// Get a packet from self
|
||||||
if (rebound_tail != rebound_head)
|
if (rebound_tail != rebound_head)
|
||||||
{
|
{
|
||||||
M_Memcpy(netbuffer, &reboundstore[rebound_tail], reboundsize[rebound_tail]);
|
memcpy(netbuffer, &reboundstore[rebound_tail], reboundsize[rebound_tail]);
|
||||||
doomcom->datalength = reboundsize[rebound_tail];
|
doomcom->datalength = reboundsize[rebound_tail];
|
||||||
if (netbuffer->packettype == PT_NODETIMEOUT)
|
if (netbuffer->packettype == PT_NODETIMEOUT)
|
||||||
doomcom->remotenode = netbuffer->u.textcmd[0];
|
doomcom->remotenode = netbuffer->u.textcmd[0];
|
||||||
|
|||||||
+45
-43
@@ -68,22 +68,22 @@
|
|||||||
// protos
|
// protos
|
||||||
// ------
|
// ------
|
||||||
|
|
||||||
static void Got_NameAndColor(UINT8 **cp, INT32 playernum);
|
static void Got_NameAndColor(const UINT8 **cp, INT32 playernum);
|
||||||
static void Got_WeaponPref(UINT8 **cp, INT32 playernum);
|
static void Got_WeaponPref(const UINT8 **cp, INT32 playernum);
|
||||||
static void Got_Mapcmd(UINT8 **cp, INT32 playernum);
|
static void Got_Mapcmd(const UINT8 **cp, INT32 playernum);
|
||||||
static void Got_ExitLevelcmd(UINT8 **cp, INT32 playernum);
|
static void Got_ExitLevelcmd(const UINT8 **cp, INT32 playernum);
|
||||||
static void Got_SetupVotecmd(UINT8 **cp, INT32 playernum);
|
static void Got_SetupVotecmd(const UINT8 **cp, INT32 playernum);
|
||||||
static void Got_ModifyVotecmd(UINT8 **cp, INT32 playernum);
|
static void Got_ModifyVotecmd(const UINT8 **cp, INT32 playernum);
|
||||||
static void Got_PickVotecmd(UINT8 **cp, INT32 playernum);
|
static void Got_PickVotecmd(const UINT8 **cp, INT32 playernum);
|
||||||
static void Got_RequestAddfilecmd(UINT8 **cp, INT32 playernum);
|
static void Got_RequestAddfilecmd(const UINT8 **cp, INT32 playernum);
|
||||||
static void Got_Addfilecmd(UINT8 **cp, INT32 playernum);
|
static void Got_Addfilecmd(const UINT8 **cp, INT32 playernum);
|
||||||
static void Got_Pause(UINT8 **cp, INT32 playernum);
|
static void Got_Pause(const UINT8 **cp, INT32 playernum);
|
||||||
static void Got_Respawn(UINT8 **cp, INT32 playernum);
|
static void Got_Respawn(const UINT8 **cp, INT32 playernum);
|
||||||
static void Got_RandomSeed(UINT8 **cp, INT32 playernum);
|
static void Got_RandomSeed(const UINT8 **cp, INT32 playernum);
|
||||||
static void Got_RunSOCcmd(UINT8 **cp, INT32 playernum);
|
static void Got_RunSOCcmd(const UINT8 **cp, INT32 playernum);
|
||||||
static void Got_Teamchange(UINT8 **cp, INT32 playernum);
|
static void Got_Teamchange(const UINT8 **cp, INT32 playernum);
|
||||||
static void Got_Clearscores(UINT8 **cp, INT32 playernum);
|
static void Got_Clearscores(const UINT8 **cp, INT32 playernum);
|
||||||
static void Got_DiscordInfo(UINT8 **cp, INT32 playernum);
|
static void Got_DiscordInfo(const UINT8 **cp, INT32 playernum);
|
||||||
|
|
||||||
static void PointLimit_OnChange(void);
|
static void PointLimit_OnChange(void);
|
||||||
static void TimeLimit_OnChange(void);
|
static void TimeLimit_OnChange(void);
|
||||||
@@ -178,13 +178,13 @@ static void Command_Clearscores_f(void);
|
|||||||
// Remote Administration
|
// Remote Administration
|
||||||
static void Command_Changepassword_f(void);
|
static void Command_Changepassword_f(void);
|
||||||
static void Command_Login_f(void);
|
static void Command_Login_f(void);
|
||||||
static void Got_Login(UINT8 **cp, INT32 playernum);
|
static void Got_Login(const UINT8 **cp, INT32 playernum);
|
||||||
static void Got_Verification(UINT8 **cp, INT32 playernum);
|
static void Got_Verification(const UINT8 **cp, INT32 playernum);
|
||||||
static void Got_Removal(UINT8 **cp, INT32 playernum);
|
static void Got_Removal(const UINT8 **cp, INT32 playernum);
|
||||||
static void Command_Verify_f(void);
|
static void Command_Verify_f(void);
|
||||||
static void Command_RemoveAdmin_f(void);
|
static void Command_RemoveAdmin_f(void);
|
||||||
static void Command_MotD_f(void);
|
static void Command_MotD_f(void);
|
||||||
static void Got_MotD_f(UINT8 **cp, INT32 playernum);
|
static void Got_MotD_f(const UINT8 **cp, INT32 playernum);
|
||||||
|
|
||||||
static void Command_ShowScores_f(void);
|
static void Command_ShowScores_f(void);
|
||||||
static void Command_ShowTime_f(void);
|
static void Command_ShowTime_f(void);
|
||||||
@@ -1913,7 +1913,7 @@ static void SendNameAndColor4(void)
|
|||||||
SendNetXCmdForPlayer(3, XD_NAMEANDCOLOR, buf, p - buf);
|
SendNetXCmdForPlayer(3, XD_NAMEANDCOLOR, buf, p - buf);
|
||||||
}
|
}
|
||||||
|
|
||||||
static void Got_NameAndColor(UINT8 **cp, INT32 playernum)
|
static void Got_NameAndColor(const UINT8 **cp, INT32 playernum)
|
||||||
{
|
{
|
||||||
player_t *p = &players[playernum];
|
player_t *p = &players[playernum];
|
||||||
char name[MAXPLAYERNAME+1];
|
char name[MAXPLAYERNAME+1];
|
||||||
@@ -2041,15 +2041,17 @@ void SendWeaponPref4(void)
|
|||||||
SendNetXCmdForPlayer(3, XD_WEAPONPREF, buf, 1);
|
SendNetXCmdForPlayer(3, XD_WEAPONPREF, buf, 1);
|
||||||
}
|
}
|
||||||
|
|
||||||
static void Got_WeaponPref(UINT8 **cp,INT32 playernum)
|
static void Got_WeaponPref(const UINT8 **cp, INT32 playernum)
|
||||||
{
|
{
|
||||||
|
player_t *player = &players[playernum];
|
||||||
|
|
||||||
UINT8 prefs = READUINT8(*cp);
|
UINT8 prefs = READUINT8(*cp);
|
||||||
|
|
||||||
players[playernum].pflags &= ~(PF_FLIPCAM|PF_ANALOGMODE);
|
player->pflags &= ~(PF_FLIPCAM|PF_ANALOGMODE);
|
||||||
if (prefs & 1)
|
if (prefs & 1)
|
||||||
players[playernum].pflags |= PF_FLIPCAM;
|
player->pflags |= PF_FLIPCAM;
|
||||||
if (prefs & 2)
|
if (prefs & 2)
|
||||||
players[playernum].pflags |= PF_ANALOGMODE;
|
player->pflags |= PF_ANALOGMODE;
|
||||||
}
|
}
|
||||||
|
|
||||||
void D_SendPlayerConfig(void)
|
void D_SendPlayerConfig(void)
|
||||||
@@ -2848,7 +2850,7 @@ static void Command_Map_f(void)
|
|||||||
* ::serverplayer or ::adminplayer.
|
* ::serverplayer or ::adminplayer.
|
||||||
* \sa D_MapChange
|
* \sa D_MapChange
|
||||||
*/
|
*/
|
||||||
static void Got_Mapcmd(UINT8 **cp, INT32 playernum)
|
static void Got_Mapcmd(const UINT8 **cp, INT32 playernum)
|
||||||
{
|
{
|
||||||
char mapname[MAX_WADPATH+1];
|
char mapname[MAX_WADPATH+1];
|
||||||
UINT8 flags;
|
UINT8 flags;
|
||||||
@@ -2967,7 +2969,7 @@ static void Command_Pause(void)
|
|||||||
CONS_Printf(M_GetText("Only the server or a remote admin can use this.\n"));
|
CONS_Printf(M_GetText("Only the server or a remote admin can use this.\n"));
|
||||||
}
|
}
|
||||||
|
|
||||||
static void Got_Pause(UINT8 **cp, INT32 playernum)
|
static void Got_Pause(const UINT8 **cp, INT32 playernum)
|
||||||
{
|
{
|
||||||
UINT8 dedicatedpause = false;
|
UINT8 dedicatedpause = false;
|
||||||
const char *playername;
|
const char *playername;
|
||||||
@@ -3079,7 +3081,7 @@ static void Command_Respawn(void)
|
|||||||
SendNetXCmd(XD_RESPAWN, &buf, 4);
|
SendNetXCmd(XD_RESPAWN, &buf, 4);
|
||||||
}
|
}
|
||||||
|
|
||||||
static void Got_Respawn(UINT8 **cp, INT32 playernum)
|
static void Got_Respawn(const UINT8 **cp, INT32 playernum)
|
||||||
{
|
{
|
||||||
INT32 respawnplayer = READINT32(*cp);
|
INT32 respawnplayer = READINT32(*cp);
|
||||||
|
|
||||||
@@ -3114,7 +3116,7 @@ static void Got_Respawn(UINT8 **cp, INT32 playernum)
|
|||||||
* \param playernum Player responsible for the message. Must be ::serverplayer.
|
* \param playernum Player responsible for the message. Must be ::serverplayer.
|
||||||
* \author Graue <graue@oceanbase.org>
|
* \author Graue <graue@oceanbase.org>
|
||||||
*/
|
*/
|
||||||
static void Got_RandomSeed(UINT8 **cp, INT32 playernum)
|
static void Got_RandomSeed(const UINT8 **cp, INT32 playernum)
|
||||||
{
|
{
|
||||||
UINT32 seed;
|
UINT32 seed;
|
||||||
|
|
||||||
@@ -3149,7 +3151,7 @@ static void Command_Clearscores_f(void)
|
|||||||
* \sa XD_CLEARSCORES, Command_Clearscores_f
|
* \sa XD_CLEARSCORES, Command_Clearscores_f
|
||||||
* \author SSNTails <http://www.ssntails.org>
|
* \author SSNTails <http://www.ssntails.org>
|
||||||
*/
|
*/
|
||||||
static void Got_Clearscores(UINT8 **cp, INT32 playernum)
|
static void Got_Clearscores(const UINT8 **cp, INT32 playernum)
|
||||||
{
|
{
|
||||||
INT32 i;
|
INT32 i;
|
||||||
|
|
||||||
@@ -3666,7 +3668,7 @@ static void Command_ServerTeamChange_f(void)
|
|||||||
}
|
}
|
||||||
|
|
||||||
//todo: This and the other teamchange functions are getting too long and messy. Needs cleaning.
|
//todo: This and the other teamchange functions are getting too long and messy. Needs cleaning.
|
||||||
static void Got_Teamchange(UINT8 **cp, INT32 playernum)
|
static void Got_Teamchange(const UINT8 **cp, INT32 playernum)
|
||||||
{
|
{
|
||||||
changeteam_union NetPacket;
|
changeteam_union NetPacket;
|
||||||
boolean error = false, wasspectator = false;
|
boolean error = false, wasspectator = false;
|
||||||
@@ -4023,7 +4025,7 @@ static void Command_Login_f(void)
|
|||||||
#endif
|
#endif
|
||||||
}
|
}
|
||||||
|
|
||||||
static void Got_Login(UINT8 **cp, INT32 playernum)
|
static void Got_Login(const UINT8 **cp, INT32 playernum)
|
||||||
{
|
{
|
||||||
#ifdef NOMD5
|
#ifdef NOMD5
|
||||||
// If we have no MD5 support then completely disable XD_LOGIN responses for security.
|
// If we have no MD5 support then completely disable XD_LOGIN responses for security.
|
||||||
@@ -4133,7 +4135,7 @@ static void Command_Verify_f(void)
|
|||||||
SendNetXCmd(XD_VERIFIED, buf, 1);
|
SendNetXCmd(XD_VERIFIED, buf, 1);
|
||||||
}
|
}
|
||||||
|
|
||||||
static void Got_Verification(UINT8 **cp, INT32 playernum)
|
static void Got_Verification(const UINT8 **cp, INT32 playernum)
|
||||||
{
|
{
|
||||||
INT16 num = READUINT8(*cp);
|
INT16 num = READUINT8(*cp);
|
||||||
|
|
||||||
@@ -4185,7 +4187,7 @@ static void Command_RemoveAdmin_f(void)
|
|||||||
SendNetXCmd(XD_DEMOTED, buf, 1);
|
SendNetXCmd(XD_DEMOTED, buf, 1);
|
||||||
}
|
}
|
||||||
|
|
||||||
static void Got_Removal(UINT8 **cp, INT32 playernum)
|
static void Got_Removal(const UINT8 **cp, INT32 playernum)
|
||||||
{
|
{
|
||||||
INT16 num = READUINT8(*cp);
|
INT16 num = READUINT8(*cp);
|
||||||
|
|
||||||
@@ -4261,7 +4263,7 @@ static void Command_MotD_f(void)
|
|||||||
Z_Free(mymotd);
|
Z_Free(mymotd);
|
||||||
}
|
}
|
||||||
|
|
||||||
static void Got_MotD_f(UINT8 **cp, INT32 playernum)
|
static void Got_MotD_f(const UINT8 **cp, INT32 playernum)
|
||||||
{
|
{
|
||||||
char *mymotd = Z_Malloc(sizeof(motd), PU_STATIC, NULL);
|
char *mymotd = Z_Malloc(sizeof(motd), PU_STATIC, NULL);
|
||||||
INT32 i;
|
INT32 i;
|
||||||
@@ -4328,7 +4330,7 @@ static void Command_RunSOC(void)
|
|||||||
SendNetXCmd(XD_RUNSOC, buf, length);
|
SendNetXCmd(XD_RUNSOC, buf, length);
|
||||||
}
|
}
|
||||||
|
|
||||||
static void Got_RunSOCcmd(UINT8 **cp, INT32 playernum)
|
static void Got_RunSOCcmd(const UINT8 **cp, INT32 playernum)
|
||||||
{
|
{
|
||||||
char filename[256];
|
char filename[256];
|
||||||
filestatus_t ncs = FS_NOTCHECKED;
|
filestatus_t ncs = FS_NOTCHECKED;
|
||||||
@@ -4606,7 +4608,7 @@ static void Command_GLocalSkin (void)
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
static void Got_RequestAddfilecmd(UINT8 **cp, INT32 playernum)
|
static void Got_RequestAddfilecmd(const UINT8 **cp, INT32 playernum)
|
||||||
{
|
{
|
||||||
char filename[241];
|
char filename[241];
|
||||||
filestatus_t ncs = FS_NOTCHECKED;
|
filestatus_t ncs = FS_NOTCHECKED;
|
||||||
@@ -4665,7 +4667,7 @@ static void Got_RequestAddfilecmd(UINT8 **cp, INT32 playernum)
|
|||||||
COM_BufAddText(va("addfile %s\n", filename));
|
COM_BufAddText(va("addfile %s\n", filename));
|
||||||
}
|
}
|
||||||
|
|
||||||
static void Got_Addfilecmd(UINT8 **cp, INT32 playernum)
|
static void Got_Addfilecmd(const UINT8 **cp, INT32 playernum)
|
||||||
{
|
{
|
||||||
char filename[241];
|
char filename[241];
|
||||||
filestatus_t ncs = FS_NOTCHECKED;
|
filestatus_t ncs = FS_NOTCHECKED;
|
||||||
@@ -5465,7 +5467,7 @@ static void Command_ExitLevel_f(void)
|
|||||||
SendNetXCmd(XD_EXITLEVEL, NULL, 0);
|
SendNetXCmd(XD_EXITLEVEL, NULL, 0);
|
||||||
}
|
}
|
||||||
|
|
||||||
static void Got_ExitLevelcmd(UINT8 **cp, INT32 playernum)
|
static void Got_ExitLevelcmd(const UINT8 **cp, INT32 playernum)
|
||||||
{
|
{
|
||||||
(void)cp;
|
(void)cp;
|
||||||
|
|
||||||
@@ -5486,7 +5488,7 @@ static void Got_ExitLevelcmd(UINT8 **cp, INT32 playernum)
|
|||||||
G_ExitLevel();
|
G_ExitLevel();
|
||||||
}
|
}
|
||||||
|
|
||||||
static void Got_SetupVotecmd(UINT8 **cp, INT32 playernum)
|
static void Got_SetupVotecmd(const UINT8 **cp, INT32 playernum)
|
||||||
{
|
{
|
||||||
INT32 i;
|
INT32 i;
|
||||||
UINT8 gt, secondgt;
|
UINT8 gt, secondgt;
|
||||||
@@ -5538,7 +5540,7 @@ static void Got_SetupVotecmd(UINT8 **cp, INT32 playernum)
|
|||||||
Y_StartVote();
|
Y_StartVote();
|
||||||
}
|
}
|
||||||
|
|
||||||
static void Got_ModifyVotecmd(UINT8 **cp, INT32 playernum)
|
static void Got_ModifyVotecmd(const UINT8 **cp, INT32 playernum)
|
||||||
{
|
{
|
||||||
SINT8 voted = READSINT8(*cp);
|
SINT8 voted = READSINT8(*cp);
|
||||||
UINT8 p = READUINT8(*cp);
|
UINT8 p = READUINT8(*cp);
|
||||||
@@ -5547,7 +5549,7 @@ static void Got_ModifyVotecmd(UINT8 **cp, INT32 playernum)
|
|||||||
votes[p] = voted;
|
votes[p] = voted;
|
||||||
}
|
}
|
||||||
|
|
||||||
static void Got_PickVotecmd(UINT8 **cp, INT32 playernum)
|
static void Got_PickVotecmd(const UINT8 **cp, INT32 playernum)
|
||||||
{
|
{
|
||||||
SINT8 pick = READSINT8(*cp);
|
SINT8 pick = READSINT8(*cp);
|
||||||
SINT8 level = READSINT8(*cp);
|
SINT8 level = READSINT8(*cp);
|
||||||
@@ -6187,7 +6189,7 @@ static void KartEliminateLast_OnChange(void)
|
|||||||
P_CheckRacers();
|
P_CheckRacers();
|
||||||
}
|
}
|
||||||
|
|
||||||
void Got_DiscordInfo(UINT8 **p, INT32 playernum)
|
void Got_DiscordInfo(const UINT8 **p, INT32 playernum)
|
||||||
{
|
{
|
||||||
if (playernum != serverplayer /*&& !IsPlayerAdmin(playernum)*/)
|
if (playernum != serverplayer /*&& !IsPlayerAdmin(playernum)*/)
|
||||||
{
|
{
|
||||||
|
|||||||
+2
-2
@@ -902,7 +902,7 @@ void SV_FileSendTicker(void)
|
|||||||
|
|
||||||
if (ram)
|
if (ram)
|
||||||
{
|
{
|
||||||
M_Memcpy(p->data, &f->id.ram[transfer[i].position], size);
|
memcpy(p->data, &f->id.ram[transfer[i].position], size);
|
||||||
}
|
}
|
||||||
else if (fread(p->data, 1, size, transferFiles[f->fileid].file) != size)
|
else if (fread(p->data, 1, size, transferFiles[f->fileid].file) != size)
|
||||||
{
|
{
|
||||||
@@ -1104,7 +1104,7 @@ void nameonly(char *s)
|
|||||||
ns = &(s[j+1]);
|
ns = &(s[j+1]);
|
||||||
len = strlen(ns);
|
len = strlen(ns);
|
||||||
#if 0
|
#if 0
|
||||||
M_Memcpy(s, ns, len+1);
|
memcpy(s, ns, len+1);
|
||||||
#else
|
#else
|
||||||
memmove(s, ns, len+1);
|
memmove(s, ns, len+1);
|
||||||
#endif
|
#endif
|
||||||
|
|||||||
@@ -453,11 +453,6 @@ extern char savegamename[256];
|
|||||||
//TODO: delet this
|
//TODO: delet this
|
||||||
#define M_GetText(x) (x)
|
#define M_GetText(x) (x)
|
||||||
|
|
||||||
FUNCINLINE static ATTRINLINE void *M_Memcpy(void *dest, const void *src, size_t n)
|
|
||||||
{
|
|
||||||
return memcpy(dest, src, n);
|
|
||||||
}
|
|
||||||
|
|
||||||
char *va(const char *format, ...) FUNCPRINTF;
|
char *va(const char *format, ...) FUNCPRINTF;
|
||||||
char *M_GetToken(const char *inputString);
|
char *M_GetToken(const char *inputString);
|
||||||
char *sizeu1(size_t num);
|
char *sizeu1(size_t num);
|
||||||
|
|||||||
+2
-2
@@ -257,7 +257,7 @@ static void F_DoWipe(fademask_t *fademask)
|
|||||||
// shortcut - memcpy source to work
|
// shortcut - memcpy source to work
|
||||||
while (draw_linestogo--)
|
while (draw_linestogo--)
|
||||||
{
|
{
|
||||||
M_Memcpy(w_base+relativepos, s_base+relativepos, draw_rowend-draw_rowstart);
|
memcpy(w_base+relativepos, s_base+relativepos, draw_rowend-draw_rowstart);
|
||||||
relativepos += vid.width;
|
relativepos += vid.width;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -266,7 +266,7 @@ static void F_DoWipe(fademask_t *fademask)
|
|||||||
// shortcut - memcpy target to work
|
// shortcut - memcpy target to work
|
||||||
while (draw_linestogo--)
|
while (draw_linestogo--)
|
||||||
{
|
{
|
||||||
M_Memcpy(w_base+relativepos, e_base+relativepos, draw_rowend-draw_rowstart);
|
memcpy(w_base+relativepos, e_base+relativepos, draw_rowend-draw_rowstart);
|
||||||
relativepos += vid.width;
|
relativepos += vid.width;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
+40
-40
@@ -257,7 +257,7 @@ void G_ReadDemoExtraData(void)
|
|||||||
UINT8 kartspeed, kartweight;
|
UINT8 kartspeed, kartweight;
|
||||||
|
|
||||||
// Skin
|
// Skin
|
||||||
M_Memcpy(name, demobuf.p, 16);
|
memcpy(name, demobuf.p, 16);
|
||||||
demobuf.p += 16;
|
demobuf.p += 16;
|
||||||
SetPlayerSkin(p, name);
|
SetPlayerSkin(p, name);
|
||||||
|
|
||||||
@@ -274,7 +274,7 @@ void G_ReadDemoExtraData(void)
|
|||||||
if (extradata & DXD_COLOR)
|
if (extradata & DXD_COLOR)
|
||||||
{
|
{
|
||||||
// Color
|
// Color
|
||||||
M_Memcpy(name, demobuf.p, 16);
|
memcpy(name, demobuf.p, 16);
|
||||||
demobuf.p += 16;
|
demobuf.p += 16;
|
||||||
for (i = 0; i < MAXSKINCOLORS; i++)
|
for (i = 0; i < MAXSKINCOLORS; i++)
|
||||||
if (fasticmp(KartColor_Names[i], name)) // SRB2kart
|
if (fasticmp(KartColor_Names[i], name)) // SRB2kart
|
||||||
@@ -289,7 +289,7 @@ void G_ReadDemoExtraData(void)
|
|||||||
if (extradata & DXD_NAME)
|
if (extradata & DXD_NAME)
|
||||||
{
|
{
|
||||||
// Name
|
// Name
|
||||||
M_Memcpy(player_names[p],demobuf.p,16);
|
memcpy(player_names[p],demobuf.p,16);
|
||||||
demobuf.p += 16;
|
demobuf.p += 16;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -395,7 +395,7 @@ void G_WriteDemoExtraData(void)
|
|||||||
// Skin
|
// Skin
|
||||||
memset(name, 0, 16);
|
memset(name, 0, 16);
|
||||||
strncpy(name, skins[players[i].skin].name, 16);
|
strncpy(name, skins[players[i].skin].name, 16);
|
||||||
M_Memcpy(demobuf.p,name,16);
|
memcpy(demobuf.p, name, 16);
|
||||||
demobuf.p += 16;
|
demobuf.p += 16;
|
||||||
|
|
||||||
WRITEUINT8(demobuf.p, skins[players[i].skin].kartspeed);
|
WRITEUINT8(demobuf.p, skins[players[i].skin].kartspeed);
|
||||||
@@ -407,7 +407,7 @@ void G_WriteDemoExtraData(void)
|
|||||||
// Color
|
// Color
|
||||||
memset(name, 0, 16);
|
memset(name, 0, 16);
|
||||||
strncpy(name, KartColor_Names[players[i].skincolor], 16);
|
strncpy(name, KartColor_Names[players[i].skincolor], 16);
|
||||||
M_Memcpy(demobuf.p,name,16);
|
memcpy(demobuf.p, name, 16);
|
||||||
demobuf.p += 16;
|
demobuf.p += 16;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -416,7 +416,7 @@ void G_WriteDemoExtraData(void)
|
|||||||
// Name
|
// Name
|
||||||
memset(name, 0, 16);
|
memset(name, 0, 16);
|
||||||
memcpy(name, player_names[i], 15); // Keeping 1 null byte for safety, sorry players with name containing more than 15 characters
|
memcpy(name, player_names[i], 15); // Keeping 1 null byte for safety, sorry players with name containing more than 15 characters
|
||||||
M_Memcpy(demobuf.p,name,16);
|
memcpy(demobuf.p, name, 16);
|
||||||
demobuf.p += 16;
|
demobuf.p += 16;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -1670,7 +1670,7 @@ void G_BeginRecording(void)
|
|||||||
demoflags |= DF_LUAVARS;
|
demoflags |= DF_LUAVARS;
|
||||||
|
|
||||||
// Setup header.
|
// Setup header.
|
||||||
M_Memcpy(demobuf.p, DEMOHEADER, 12); demobuf.p += 12;
|
memcpy(demobuf.p, DEMOHEADER, 12); demobuf.p += 12;
|
||||||
WRITEUINT8(demobuf.p,VERSION);
|
WRITEUINT8(demobuf.p,VERSION);
|
||||||
WRITEUINT8(demobuf.p,SUBVERSION);
|
WRITEUINT8(demobuf.p,SUBVERSION);
|
||||||
WRITEUINT16(demobuf.p,DEMOVERSION);
|
WRITEUINT16(demobuf.p,DEMOVERSION);
|
||||||
@@ -1701,9 +1701,9 @@ void G_BeginRecording(void)
|
|||||||
demobuf.p += 16;
|
demobuf.p += 16;
|
||||||
|
|
||||||
// game data
|
// game data
|
||||||
M_Memcpy(demobuf.p, "PLAY", 4); demobuf.p += 4;
|
memcpy(demobuf.p, "PLAY", 4); demobuf.p += 4;
|
||||||
WRITEINT16(demobuf.p,gamemap);
|
WRITEINT16(demobuf.p,gamemap);
|
||||||
M_Memcpy(demobuf.p, mapmd5, 16); demobuf.p += 16;
|
memcpy(demobuf.p, mapmd5, 16); demobuf.p += 16;
|
||||||
|
|
||||||
WRITEUINT8(demobuf.p, demoflags);
|
WRITEUINT8(demobuf.p, demoflags);
|
||||||
WRITEUINT8(demobuf.p, gametype & 0xFF);
|
WRITEUINT8(demobuf.p, gametype & 0xFF);
|
||||||
@@ -1763,19 +1763,19 @@ void G_BeginRecording(void)
|
|||||||
// Name
|
// Name
|
||||||
memset(name, 0, 16);
|
memset(name, 0, 16);
|
||||||
memcpy(name, player_names[p], 15);
|
memcpy(name, player_names[p], 15);
|
||||||
M_Memcpy(demobuf.p,name,16);
|
memcpy(demobuf.p, name, 16);
|
||||||
demobuf.p += 16;
|
demobuf.p += 16;
|
||||||
|
|
||||||
// Skin
|
// Skin
|
||||||
memset(name, 0, 16);
|
memset(name, 0, 16);
|
||||||
strncpy(name, skins[player->skin].name, 16);
|
strncpy(name, skins[player->skin].name, 16);
|
||||||
M_Memcpy(demobuf.p,name,16);
|
memcpy(demobuf.p, name, 16);
|
||||||
demobuf.p += 16;
|
demobuf.p += 16;
|
||||||
|
|
||||||
// Color
|
// Color
|
||||||
memset(name, 0, 16);
|
memset(name, 0, 16);
|
||||||
strncpy(name, KartColor_Names[player->skincolor], 16);
|
strncpy(name, KartColor_Names[player->skincolor], 16);
|
||||||
M_Memcpy(demobuf.p,name,16);
|
memcpy(demobuf.p, name, 16);
|
||||||
demobuf.p += 16;
|
demobuf.p += 16;
|
||||||
|
|
||||||
// Score, since Kart uses this to determine where you start on the map
|
// Score, since Kart uses this to determine where you start on the map
|
||||||
@@ -1834,19 +1834,19 @@ void G_WriteStanding(UINT8 ranking, char *name, INT32 skinnum, UINT8 color, UINT
|
|||||||
// Name
|
// Name
|
||||||
memset(temp, 0, 16);
|
memset(temp, 0, 16);
|
||||||
strncpy(temp, name, 16);
|
strncpy(temp, name, 16);
|
||||||
M_Memcpy(demobuf.p,temp,16);
|
memcpy(demobuf.p,temp,16);
|
||||||
demobuf.p += 16;
|
demobuf.p += 16;
|
||||||
|
|
||||||
// Skin
|
// Skin
|
||||||
memset(temp, 0, 16);
|
memset(temp, 0, 16);
|
||||||
strncpy(temp, skins[skinnum].name, 16);
|
strncpy(temp, skins[skinnum].name, 16);
|
||||||
M_Memcpy(demobuf.p,temp,16);
|
memcpy(demobuf.p,temp,16);
|
||||||
demobuf.p += 16;
|
demobuf.p += 16;
|
||||||
|
|
||||||
// Color
|
// Color
|
||||||
memset(temp, 0, 16);
|
memset(temp, 0, 16);
|
||||||
strncpy(temp, KartColor_Names[color], 16);
|
strncpy(temp, KartColor_Names[color], 16);
|
||||||
M_Memcpy(demobuf.p,temp,16);
|
memcpy(demobuf.p,temp,16);
|
||||||
demobuf.p += 16;
|
demobuf.p += 16;
|
||||||
|
|
||||||
// Score/time/whatever
|
// Score/time/whatever
|
||||||
@@ -2212,7 +2212,7 @@ void G_LoadDemoInfo(menudemo_t *pdemo)
|
|||||||
{
|
{
|
||||||
case DEMOVERSION: // latest always supported
|
case DEMOVERSION: // latest always supported
|
||||||
// demo title
|
// demo title
|
||||||
M_Memcpy(pdemo->title, info_p, 64);
|
memcpy(pdemo->title, info_p, 64);
|
||||||
info_p += 64;
|
info_p += 64;
|
||||||
break;
|
break;
|
||||||
#ifdef DEMO_COMPAT_100
|
#ifdef DEMO_COMPAT_100
|
||||||
@@ -2311,11 +2311,11 @@ void G_LoadDemoInfo(menudemo_t *pdemo)
|
|||||||
pdemo->standings[count].ranking = READUINT8(extrainfo_p);
|
pdemo->standings[count].ranking = READUINT8(extrainfo_p);
|
||||||
|
|
||||||
// Name
|
// Name
|
||||||
M_Memcpy(pdemo->standings[count].name, extrainfo_p, 16);
|
memcpy(pdemo->standings[count].name, extrainfo_p, 16);
|
||||||
extrainfo_p += 16;
|
extrainfo_p += 16;
|
||||||
|
|
||||||
// Skin
|
// Skin
|
||||||
M_Memcpy(temp,extrainfo_p,16);
|
memcpy(temp,extrainfo_p,16);
|
||||||
extrainfo_p += 16;
|
extrainfo_p += 16;
|
||||||
pdemo->standings[count].skin = UINT8_MAX;
|
pdemo->standings[count].skin = UINT8_MAX;
|
||||||
|
|
||||||
@@ -2329,7 +2329,7 @@ void G_LoadDemoInfo(menudemo_t *pdemo)
|
|||||||
}
|
}
|
||||||
|
|
||||||
// Color
|
// Color
|
||||||
M_Memcpy(temp,extrainfo_p,16);
|
memcpy(temp,extrainfo_p,16);
|
||||||
extrainfo_p += 16;
|
extrainfo_p += 16;
|
||||||
|
|
||||||
for (i = 0; i < MAXSKINCOLORS; i++)
|
for (i = 0; i < MAXSKINCOLORS; i++)
|
||||||
@@ -2494,7 +2494,7 @@ void G_LoadDemoTitle(menudemo_t *pdemo)
|
|||||||
{
|
{
|
||||||
case DEMOVERSION: // latest always supported
|
case DEMOVERSION: // latest always supported
|
||||||
// demo title
|
// demo title
|
||||||
M_Memcpy(pdemo->title, info_p, 64);
|
memcpy(pdemo->title, info_p, 64);
|
||||||
|
|
||||||
// demo date
|
// demo date
|
||||||
char *demodate;
|
char *demodate;
|
||||||
@@ -2627,7 +2627,7 @@ void G_DoPlayDemo(char *defdemoname)
|
|||||||
{
|
{
|
||||||
case DEMOVERSION: // latest always supported
|
case DEMOVERSION: // latest always supported
|
||||||
// demo title
|
// demo title
|
||||||
M_Memcpy(demo.titlename, demobuf.p, 64);
|
memcpy(demo.titlename, demobuf.p, 64);
|
||||||
demobuf.p += 64;
|
demobuf.p += 64;
|
||||||
break;
|
break;
|
||||||
#ifdef DEMO_COMPAT_100
|
#ifdef DEMO_COMPAT_100
|
||||||
@@ -2766,15 +2766,15 @@ void G_DoPlayDemo(char *defdemoname)
|
|||||||
if (demo.version == 0x0001)
|
if (demo.version == 0x0001)
|
||||||
{
|
{
|
||||||
// Player name
|
// Player name
|
||||||
M_Memcpy(player_names[0],demobuf.p,16);
|
memcpy(player_names[0],demobuf.p,16);
|
||||||
demobuf.p += 16;
|
demobuf.p += 16;
|
||||||
|
|
||||||
// Skin
|
// Skin
|
||||||
M_Memcpy(skin,demobuf.p,16);
|
memcpy(skin,demobuf.p,16);
|
||||||
demobuf.p += 16;
|
demobuf.p += 16;
|
||||||
|
|
||||||
// Color
|
// Color
|
||||||
M_Memcpy(color,demobuf.p,16);
|
memcpy(color,demobuf.p,16);
|
||||||
demobuf.p += 16;
|
demobuf.p += 16;
|
||||||
|
|
||||||
demobuf.p += 5; // Backwards compat - some stats
|
demobuf.p += 5; // Backwards compat - some stats
|
||||||
@@ -2815,7 +2815,7 @@ void G_DoPlayDemo(char *defdemoname)
|
|||||||
}
|
}
|
||||||
|
|
||||||
// net var data
|
// net var data
|
||||||
CV_LoadNetVars(&demobuf.p);
|
demobuf.p += CV_LoadNetVars(demobuf.p);
|
||||||
|
|
||||||
// Sigh ... it's an empty demo.
|
// Sigh ... it's an empty demo.
|
||||||
if (*demobuf.p == DEMOMARKER)
|
if (*demobuf.p == DEMOMARKER)
|
||||||
@@ -2853,7 +2853,7 @@ void G_DoPlayDemo(char *defdemoname)
|
|||||||
#endif
|
#endif
|
||||||
|
|
||||||
// net var data
|
// net var data
|
||||||
CV_LoadNetVars(&demobuf.p);
|
demobuf.p += CV_LoadNetVars(demobuf.p);
|
||||||
|
|
||||||
// Sigh ... it's an empty demo.
|
// Sigh ... it's an empty demo.
|
||||||
if (*demobuf.p == DEMOMARKER)
|
if (*demobuf.p == DEMOMARKER)
|
||||||
@@ -2933,16 +2933,16 @@ void G_DoPlayDemo(char *defdemoname)
|
|||||||
players[p].spectator = spectator;
|
players[p].spectator = spectator;
|
||||||
|
|
||||||
// Name
|
// Name
|
||||||
M_Memcpy(player_names[p],demobuf.p,16);
|
memcpy(player_names[p],demobuf.p,16);
|
||||||
demobuf.p += 16;
|
demobuf.p += 16;
|
||||||
|
|
||||||
// Skin
|
// Skin
|
||||||
M_Memcpy(skin,demobuf.p,16);
|
memcpy(skin,demobuf.p,16);
|
||||||
demobuf.p += 16;
|
demobuf.p += 16;
|
||||||
SetPlayerSkin(p, skin);
|
SetPlayerSkin(p, skin);
|
||||||
|
|
||||||
// Color
|
// Color
|
||||||
M_Memcpy(color,demobuf.p,16);
|
memcpy(color,demobuf.p,16);
|
||||||
demobuf.p += 16;
|
demobuf.p += 16;
|
||||||
|
|
||||||
for (i = 0; i < MAXSKINCOLORS; i++)
|
for (i = 0; i < MAXSKINCOLORS; i++)
|
||||||
@@ -3101,7 +3101,7 @@ void G_AddGhost(char *defdemoname)
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
M_Memcpy(md5, p, 16); p += 16; // demo checksum
|
memcpy(md5, p, 16); p += 16; // demo checksum
|
||||||
|
|
||||||
for (gh = ghosts; gh; gh = gh->next)
|
for (gh = ghosts; gh; gh = gh->next)
|
||||||
{
|
{
|
||||||
@@ -3157,15 +3157,15 @@ void G_AddGhost(char *defdemoname)
|
|||||||
if (ghostversion == 0x0001)
|
if (ghostversion == 0x0001)
|
||||||
{
|
{
|
||||||
// Player name (TODO: Display this somehow if it doesn't match cv_playername!)
|
// Player name (TODO: Display this somehow if it doesn't match cv_playername!)
|
||||||
M_Memcpy(name, p,16);
|
memcpy(name, p,16);
|
||||||
p += 16;
|
p += 16;
|
||||||
|
|
||||||
// Skin
|
// Skin
|
||||||
M_Memcpy(skin, p,16);
|
memcpy(skin, p,16);
|
||||||
p += 16;
|
p += 16;
|
||||||
|
|
||||||
// Color
|
// Color
|
||||||
M_Memcpy(color, p,16);
|
memcpy(color, p,16);
|
||||||
p += 16;
|
p += 16;
|
||||||
|
|
||||||
// Ghosts do not have a player structure to put this in.
|
// Ghosts do not have a player structure to put this in.
|
||||||
@@ -3215,15 +3215,15 @@ void G_AddGhost(char *defdemoname)
|
|||||||
}
|
}
|
||||||
|
|
||||||
// Player name (TODO: Display this somehow if it doesn't match cv_playername!)
|
// Player name (TODO: Display this somehow if it doesn't match cv_playername!)
|
||||||
M_Memcpy(name, p, 16);
|
memcpy(name, p, 16);
|
||||||
p += 16;
|
p += 16;
|
||||||
|
|
||||||
// Skin
|
// Skin
|
||||||
M_Memcpy(skin, p, 16);
|
memcpy(skin, p, 16);
|
||||||
p += 16;
|
p += 16;
|
||||||
|
|
||||||
// Color
|
// Color
|
||||||
M_Memcpy(color, p, 16);
|
memcpy(color, p, 16);
|
||||||
p += 16;
|
p += 16;
|
||||||
|
|
||||||
p += 4; // score
|
p += 4; // score
|
||||||
@@ -3260,7 +3260,7 @@ void G_AddGhost(char *defdemoname)
|
|||||||
gh = Z_Calloc(sizeof(demoghost), PU_LEVEL, NULL);
|
gh = Z_Calloc(sizeof(demoghost), PU_LEVEL, NULL);
|
||||||
gh->next = ghosts;
|
gh->next = ghosts;
|
||||||
gh->buffer = buffer;
|
gh->buffer = buffer;
|
||||||
M_Memcpy(gh->checksum, md5, 16);
|
memcpy(gh->checksum, md5, 16);
|
||||||
gh->p = p;
|
gh->p = p;
|
||||||
buffer = NULL; // buffer can't be freed now!
|
buffer = NULL; // buffer can't be freed now!
|
||||||
|
|
||||||
@@ -3409,7 +3409,7 @@ void G_UpdateStaffGhostName(lumpnum_t l)
|
|||||||
if (ghostversion == 0x0001)
|
if (ghostversion == 0x0001)
|
||||||
{
|
{
|
||||||
// Player name
|
// Player name
|
||||||
M_Memcpy(dummystaffname, p,16);
|
memcpy(dummystaffname, p,16);
|
||||||
dummystaffname[16] = '\0';
|
dummystaffname[16] = '\0';
|
||||||
return; // Not really a failure but whatever
|
return; // Not really a failure but whatever
|
||||||
}
|
}
|
||||||
@@ -3431,7 +3431,7 @@ void G_UpdateStaffGhostName(lumpnum_t l)
|
|||||||
if (READUINT8(p) != 0)
|
if (READUINT8(p) != 0)
|
||||||
return;
|
return;
|
||||||
|
|
||||||
M_Memcpy(dummystaffname, p, 16);
|
memcpy(dummystaffname, p, 16);
|
||||||
dummystaffname[16] = '\0';
|
dummystaffname[16] = '\0';
|
||||||
|
|
||||||
// Ok, no longer any reason to care, bye
|
// Ok, no longer any reason to care, bye
|
||||||
@@ -3625,7 +3625,7 @@ void G_SaveDemo(void)
|
|||||||
}
|
}
|
||||||
WRITEUINT8(demobuf.p, DW_END); // Mark end of demo extra data.
|
WRITEUINT8(demobuf.p, DW_END); // Mark end of demo extra data.
|
||||||
|
|
||||||
M_Memcpy(p, demo.titlename, 64); // Write demo title here
|
memcpy(p, demo.titlename, 64); // Write demo title here
|
||||||
p += 64;
|
p += 64;
|
||||||
|
|
||||||
if (multiplayer)
|
if (multiplayer)
|
||||||
|
|||||||
+89
-80
@@ -570,6 +570,7 @@ static void G_SetSaveGameModified(void)
|
|||||||
{
|
{
|
||||||
if (!unlockables[i].conditionset)
|
if (!unlockables[i].conditionset)
|
||||||
continue;
|
continue;
|
||||||
|
|
||||||
if (!unlockables[i].unlocked)
|
if (!unlockables[i].unlocked)
|
||||||
{
|
{
|
||||||
unlockables[i].unlocked = true;
|
unlockables[i].unlocked = true;
|
||||||
@@ -595,7 +596,7 @@ void G_SetGameModified(boolean silent, boolean major)
|
|||||||
G_SetSaveGameModified();
|
G_SetSaveGameModified();
|
||||||
|
|
||||||
if (!silent)
|
if (!silent)
|
||||||
CONS_Alert(CONS_NOTICE, M_GetText("Record Attack data will be saved to a seperate save file.\n"));
|
CONS_Alert(CONS_NOTICE, "Record Attack data will be saved to a seperate save file.\n");
|
||||||
|
|
||||||
// If in record attack recording, cancel it.
|
// If in record attack recording, cancel it.
|
||||||
if (modeattacking)
|
if (modeattacking)
|
||||||
@@ -634,6 +635,7 @@ const char *G_BuildMapName(INT32 map)
|
|||||||
map = gamemap-1;
|
map = gamemap-1;
|
||||||
else
|
else
|
||||||
map = prevmap;
|
map = prevmap;
|
||||||
|
|
||||||
map = G_RandMap(G_TOLFlag(cv_newgametype.value), map, false, 0, false, NULL)+1;
|
map = G_RandMap(G_TOLFlag(cv_newgametype.value), map, false, 0, false, NULL)+1;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -687,11 +689,12 @@ INT32 JoyAxis(axis_input_e axissel, UINT8 player)
|
|||||||
{
|
{
|
||||||
INT32 retaxis;
|
INT32 retaxis;
|
||||||
INT32 axisval;
|
INT32 axisval;
|
||||||
|
INT32 deadzone;
|
||||||
boolean flp = false;
|
boolean flp = false;
|
||||||
|
|
||||||
UINT8 pnum = player-1;
|
UINT8 pnum = player-1;
|
||||||
|
|
||||||
//find what axis to get
|
// find what axis to get
|
||||||
switch (axissel)
|
switch (axissel)
|
||||||
{
|
{
|
||||||
case AXISTURN:
|
case AXISTURN:
|
||||||
@@ -750,45 +753,33 @@ INT32 JoyAxis(axis_input_e axissel, UINT8 player)
|
|||||||
{
|
{
|
||||||
axisval /= 2;
|
axisval /= 2;
|
||||||
retaxis = joyxmove[pnum][axisval];
|
retaxis = joyxmove[pnum][axisval];
|
||||||
|
deadzone = cv_xdeadzone[pnum].value;
|
||||||
if (retaxis < (-JOYAXISRANGE))
|
|
||||||
retaxis = -JOYAXISRANGE;
|
|
||||||
if (retaxis > (+JOYAXISRANGE))
|
|
||||||
retaxis = +JOYAXISRANGE;
|
|
||||||
if (!Joystick[pnum].bGamepadStyle && axissel < AXISDEAD)
|
|
||||||
{
|
|
||||||
const INT32 jdeadzone = ((JOYAXISRANGE-1) * cv_xdeadzone[pnum].value) >> FRACBITS;
|
|
||||||
if (abs(retaxis) <= jdeadzone)
|
|
||||||
return 0;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (flp)
|
|
||||||
retaxis = -retaxis; // flip it around
|
|
||||||
|
|
||||||
return retaxis;
|
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
axisval--;
|
axisval--;
|
||||||
axisval /= 2;
|
axisval /= 2;
|
||||||
retaxis = joyymove[pnum][axisval];
|
retaxis = joyymove[pnum][axisval];
|
||||||
|
deadzone = cv_ydeadzone[pnum].value;
|
||||||
if (retaxis < (-JOYAXISRANGE))
|
|
||||||
retaxis = -JOYAXISRANGE;
|
|
||||||
if (retaxis > (+JOYAXISRANGE))
|
|
||||||
retaxis = +JOYAXISRANGE;
|
|
||||||
if (!Joystick[pnum].bGamepadStyle && axissel < AXISDEAD)
|
|
||||||
{
|
|
||||||
const INT32 jdeadzone = ((JOYAXISRANGE-1) * cv_ydeadzone[pnum].value) >> FRACBITS;
|
|
||||||
if (abs(retaxis) <= jdeadzone)
|
|
||||||
return 0;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (flp)
|
|
||||||
retaxis = -retaxis; // flip it around
|
|
||||||
|
|
||||||
return retaxis;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if (retaxis < (-JOYAXISRANGE))
|
||||||
|
retaxis = -JOYAXISRANGE;
|
||||||
|
if (retaxis > (+JOYAXISRANGE))
|
||||||
|
retaxis = +JOYAXISRANGE;
|
||||||
|
|
||||||
|
if (!Joystick[pnum].bGamepadStyle && axissel < AXISDEAD)
|
||||||
|
{
|
||||||
|
const INT32 jdeadzone = ((JOYAXISRANGE-1) * deadzone) >> FRACBITS;
|
||||||
|
|
||||||
|
if (abs(retaxis) <= jdeadzone)
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (flp)
|
||||||
|
retaxis = -retaxis; // flip it around
|
||||||
|
|
||||||
|
return retaxis;
|
||||||
}
|
}
|
||||||
|
|
||||||
boolean InputDown(INT32 gc, UINT8 p)
|
boolean InputDown(INT32 gc, UINT8 p)
|
||||||
@@ -806,9 +797,9 @@ boolean InputDown(INT32 gc, UINT8 p)
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
INT32 localaiming[MAXSPLITSCREENPLAYERS];
|
INT32 localaiming[MAXSPLITSCREENPLAYERS] = {0};
|
||||||
angle_t localangle[MAXSPLITSCREENPLAYERS];
|
angle_t localangle[MAXSPLITSCREENPLAYERS] = {0};
|
||||||
boolean camspin[MAXSPLITSCREENPLAYERS];
|
boolean camspin[MAXSPLITSCREENPLAYERS] = {0};
|
||||||
|
|
||||||
static fixed_t forwardmove[2] = {25<<FRACBITS>>16, 50<<FRACBITS>>16};
|
static fixed_t forwardmove[2] = {25<<FRACBITS>>16, 50<<FRACBITS>>16};
|
||||||
static fixed_t sidemove[2] = {2<<FRACBITS>>16, 4<<FRACBITS>>16};
|
static fixed_t sidemove[2] = {2<<FRACBITS>>16, 4<<FRACBITS>>16};
|
||||||
@@ -1210,7 +1201,7 @@ void G_BuildTiccmd(ticcmd_t *cmd, INT32 realtics, UINT8 ssplayer)
|
|||||||
if (gamestate == GS_LEVEL)
|
if (gamestate == GS_LEVEL)
|
||||||
LUA_HookTiccmd(player, cmd, HOOK(PlayerCmd));
|
LUA_HookTiccmd(player, cmd, HOOK(PlayerCmd));
|
||||||
|
|
||||||
//Reset away view if a command is given.
|
// Reset away view if a command is given.
|
||||||
if (displayplayers[0] != consoleplayer && ssplayer == 1
|
if (displayplayers[0] != consoleplayer && ssplayer == 1
|
||||||
&& (cmd->forwardmove || cmd->sidemove || cmd->buttons))
|
&& (cmd->forwardmove || cmd->sidemove || cmd->buttons))
|
||||||
{
|
{
|
||||||
@@ -1219,12 +1210,12 @@ void G_BuildTiccmd(ticcmd_t *cmd, INT32 realtics, UINT8 ssplayer)
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
ticcmd_t *G_CopyTiccmd(ticcmd_t* dest, const ticcmd_t* src, const size_t n)
|
ticcmd_t *G_CopyTiccmd(ticcmd_t* restrict dest, const ticcmd_t* restrict src, const size_t n)
|
||||||
{
|
{
|
||||||
return M_Memcpy(dest, src, n*sizeof(*src));
|
return memcpy(dest, src, n*sizeof(*src));
|
||||||
}
|
}
|
||||||
|
|
||||||
ticcmd_t *G_MoveTiccmd(ticcmd_t* dest, const ticcmd_t* src, const size_t n)
|
ticcmd_t *G_MoveTiccmd(ticcmd_t* restrict dest, const ticcmd_t* restrict src, const size_t n)
|
||||||
{
|
{
|
||||||
size_t i;
|
size_t i;
|
||||||
for (i = 0; i < n; i++)
|
for (i = 0; i < n; i++)
|
||||||
@@ -1261,7 +1252,7 @@ static void G_DoLoadLevel(boolean resetplayer)
|
|||||||
|
|
||||||
if (gamestate == GS_INTERMISSION)
|
if (gamestate == GS_INTERMISSION)
|
||||||
Y_EndIntermission();
|
Y_EndIntermission();
|
||||||
if (gamestate == GS_VOTING)
|
else if (gamestate == GS_VOTING)
|
||||||
Y_EndVote();
|
Y_EndVote();
|
||||||
|
|
||||||
G_SetGamestate(GS_LEVEL);
|
G_SetGamestate(GS_LEVEL);
|
||||||
@@ -2329,12 +2320,6 @@ void G_PlayerReborn(INT32 player)
|
|||||||
|
|
||||||
if (gametype == GT_COOP)
|
if (gametype == GT_COOP)
|
||||||
P_FindEmerald(); // scan for emeralds to hunt for
|
P_FindEmerald(); // scan for emeralds to hunt for
|
||||||
|
|
||||||
// Reset Nights score and max link to 0 on death
|
|
||||||
p->maxlink = 0;
|
|
||||||
|
|
||||||
// If NiGHTS, find lowest mare to start with.
|
|
||||||
p->mare = 0;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
//
|
//
|
||||||
@@ -2353,22 +2338,25 @@ static boolean G_CheckSpot(INT32 playernum, mapthing_t *mthing)
|
|||||||
if (!mthing)
|
if (!mthing)
|
||||||
return false;
|
return false;
|
||||||
|
|
||||||
|
x = mthing->x << FRACBITS;
|
||||||
|
y = mthing->y << FRACBITS;
|
||||||
|
|
||||||
if (!players[playernum].mo)
|
if (!players[playernum].mo)
|
||||||
{
|
{
|
||||||
// first spawn of level
|
// first spawn of level
|
||||||
for (i = 0; i < playernum; i++)
|
for (i = 0; i < playernum; i++)
|
||||||
|
{
|
||||||
if (playeringame[i] && players[i].mo
|
if (playeringame[i] && players[i].mo
|
||||||
&& players[i].mo->x == mthing->x << FRACBITS
|
&& players[i].mo->x == x
|
||||||
&& players[i].mo->y == mthing->y << FRACBITS)
|
&& players[i].mo->y == y)
|
||||||
{
|
{
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
x = mthing->x << FRACBITS;
|
|
||||||
y = mthing->y << FRACBITS;
|
|
||||||
|
|
||||||
if (!K_CheckPlayersRespawnColliding(playernum, x, y))
|
if (!K_CheckPlayersRespawnColliding(playernum, x, y))
|
||||||
return false;
|
return false;
|
||||||
|
|
||||||
@@ -2870,17 +2858,23 @@ UINT8 G_GetGametypeColor(INT16 gt)
|
|||||||
*/
|
*/
|
||||||
INT16 G_TOLFlag(INT32 pgametype)
|
INT16 G_TOLFlag(INT32 pgametype)
|
||||||
{
|
{
|
||||||
if (!multiplayer) return TOL_SP;
|
if (!multiplayer) return TOL_SP;
|
||||||
if (pgametype == GT_COOP) return TOL_RACE; // SRB2kart
|
|
||||||
if (pgametype == GT_COMPETITION) return TOL_COMPETITION;
|
switch (pgametype)
|
||||||
if (pgametype == GT_RACE) return TOL_RACE;
|
{
|
||||||
if (pgametype == GT_MATCH) return TOL_MATCH;
|
case GT_COOP: return TOL_RACE; // SRB2kart
|
||||||
if (pgametype == GT_TEAMMATCH) return TOL_MATCH;
|
case GT_COMPETITION: return TOL_COMPETITION;
|
||||||
if (pgametype == GT_TAG) return TOL_TAG;
|
case GT_RACE: return TOL_RACE;
|
||||||
if (pgametype == GT_HIDEANDSEEK) return TOL_TAG;
|
case GT_MATCH: return TOL_MATCH;
|
||||||
if (pgametype == GT_CTF) return TOL_CTF;
|
case GT_TEAMMATCH: return TOL_MATCH;
|
||||||
|
case GT_TAG: return TOL_TAG;
|
||||||
|
case GT_HIDEANDSEEK: return TOL_TAG;
|
||||||
|
case GT_CTF: return TOL_CTF;
|
||||||
|
default:
|
||||||
|
CONS_Alert(CONS_ERROR, "Unknown gametype! %d\n", pgametype);
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
|
||||||
CONS_Alert(CONS_ERROR, M_GetText("Unknown gametype! %d\n"), pgametype);
|
|
||||||
return INT16_MAX;
|
return INT16_MAX;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -3063,6 +3057,7 @@ static void G_DoCompleted(void)
|
|||||||
K_StatRound();
|
K_StatRound();
|
||||||
|
|
||||||
for (i = 0; i < MAXPLAYERS; i++)
|
for (i = 0; i < MAXPLAYERS; i++)
|
||||||
|
{
|
||||||
if (playeringame[i])
|
if (playeringame[i])
|
||||||
{
|
{
|
||||||
// SRB2Kart: exitlevel shouldn't get you the points
|
// SRB2Kart: exitlevel shouldn't get you the points
|
||||||
@@ -3072,8 +3067,10 @@ static void G_DoCompleted(void)
|
|||||||
if (P_IsLocalPlayer(&players[i]))
|
if (P_IsLocalPlayer(&players[i]))
|
||||||
j++;
|
j++;
|
||||||
}
|
}
|
||||||
|
|
||||||
G_PlayerFinishLevel(i); // take away cards and stuff
|
G_PlayerFinishLevel(i); // take away cards and stuff
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
|
||||||
// play some generic music if there's no win/cool/lose music going on (for exitlevel commands)
|
// play some generic music if there's no win/cool/lose music going on (for exitlevel commands)
|
||||||
if (G_RaceGametype() && ((multiplayer && demo.playback) || j == splitscreen+1) && (cv_inttime.value > 0))
|
if (G_RaceGametype() && ((multiplayer && demo.playback) || j == splitscreen+1) && (cv_inttime.value > 0))
|
||||||
@@ -3217,10 +3214,14 @@ void G_AfterIntermission(void)
|
|||||||
|
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
else if (demo.recording && (modeattacking || demo.savemode != DSM_NOTSAVING))
|
|
||||||
G_SaveDemo();
|
if (demo.recording)
|
||||||
else if (demo.recording)
|
{
|
||||||
G_ResetDemoRecording();
|
if (modeattacking || demo.savemode != DSM_NOTSAVING)
|
||||||
|
G_SaveDemo();
|
||||||
|
else
|
||||||
|
G_ResetDemoRecording();
|
||||||
|
}
|
||||||
|
|
||||||
if (modeattacking) // End the run.
|
if (modeattacking) // End the run.
|
||||||
{
|
{
|
||||||
@@ -3229,7 +3230,9 @@ void G_AfterIntermission(void)
|
|||||||
}
|
}
|
||||||
|
|
||||||
if (mapheaderinfo[gamemap-1]->cutscenenum) // Start a custom cutscene.
|
if (mapheaderinfo[gamemap-1]->cutscenenum) // Start a custom cutscene.
|
||||||
|
{
|
||||||
F_StartCustomCutscene(mapheaderinfo[gamemap-1]->cutscenenum-1, false, false);
|
F_StartCustomCutscene(mapheaderinfo[gamemap-1]->cutscenenum-1, false, false);
|
||||||
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
if (nextmap < 1100-1)
|
if (nextmap < 1100-1)
|
||||||
@@ -3366,10 +3369,13 @@ static void G_DoContinued(void)
|
|||||||
// when something new is added.
|
// when something new is added.
|
||||||
void G_EndGame(void)
|
void G_EndGame(void)
|
||||||
{
|
{
|
||||||
if (demo.recording && (modeattacking || demo.savemode != DSM_NOTSAVING))
|
if (demo.recording)
|
||||||
G_SaveDemo();
|
{
|
||||||
else if (demo.recording)
|
if (modeattacking || demo.savemode != DSM_NOTSAVING)
|
||||||
G_ResetDemoRecording();
|
G_SaveDemo();
|
||||||
|
else
|
||||||
|
G_ResetDemoRecording();
|
||||||
|
}
|
||||||
|
|
||||||
// Only do evaluation and credits in coop games.
|
// Only do evaluation and credits in coop games.
|
||||||
if (gametype == GT_COOP)
|
if (gametype == GT_COOP)
|
||||||
@@ -3379,6 +3385,7 @@ void G_EndGame(void)
|
|||||||
F_StartCredits();
|
F_StartCredits();
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (nextmap == 1101-1) // end game with evaluation
|
if (nextmap == 1101-1) // end game with evaluation
|
||||||
{
|
{
|
||||||
F_StartGameEvaluation();
|
F_StartGameEvaluation();
|
||||||
@@ -3478,9 +3485,8 @@ void G_LoadGameData(void)
|
|||||||
modded = READUINT8(save.p);
|
modded = READUINT8(save.p);
|
||||||
|
|
||||||
// Aha! Someone's been screwing with the save file!
|
// Aha! Someone's been screwing with the save file!
|
||||||
if ((modded && !savemoddata))
|
if ((modded && !savemoddata) ||
|
||||||
goto datacorrupt;
|
(modded != true && modded != false))
|
||||||
else if (modded != true && modded != false)
|
|
||||||
goto datacorrupt;
|
goto datacorrupt;
|
||||||
|
|
||||||
// TODO put another cipher on these things? meh, I don't care...
|
// TODO put another cipher on these things? meh, I don't care...
|
||||||
@@ -3545,7 +3551,7 @@ void G_LoadGameData(void)
|
|||||||
return;
|
return;
|
||||||
|
|
||||||
// Landing point for corrupt gamedata
|
// Landing point for corrupt gamedata
|
||||||
datacorrupt:
|
datacorrupt:
|
||||||
{
|
{
|
||||||
const char *gdfolder = "the SRB2Kart folder";
|
const char *gdfolder = "the SRB2Kart folder";
|
||||||
|
|
||||||
@@ -4266,18 +4272,21 @@ INT32 G_FindMapByNameOrCode(const char *mapname, char **realmapnamep)
|
|||||||
{
|
{
|
||||||
if (mapname[0] == '*') // current map
|
if (mapname[0] == '*') // current map
|
||||||
return gamemap;
|
return gamemap;
|
||||||
else if (mapname[0] == '?' && mapheaderinfo[gamemap-1])
|
|
||||||
|
if (mapname[0] == '?' && mapheaderinfo[gamemap-1])
|
||||||
return G_RandMap(G_TOLFlag(gametype), gamemap-1, false, 0, false, NULL)+1;
|
return G_RandMap(G_TOLFlag(gametype), gamemap-1, false, 0, false, NULL)+1;
|
||||||
else if (mapname[0] == '+' && mapheaderinfo[gamemap-1]) // next map
|
|
||||||
|
if (mapname[0] == '+' && mapheaderinfo[gamemap-1]) // next map
|
||||||
{
|
{
|
||||||
newmapnum = mapheaderinfo[gamemap-1]->nextlevel;
|
newmapnum = mapheaderinfo[gamemap-1]->nextlevel;
|
||||||
|
|
||||||
if (newmapnum < 1 || newmapnum > NUMMAPS)
|
if (newmapnum < 1 || newmapnum > NUMMAPS)
|
||||||
{
|
{
|
||||||
CONS_Alert(CONS_ERROR, M_GetText("NextLevel (%d) is not a valid map.\n"), newmapnum);
|
CONS_Alert(CONS_ERROR, "NextLevel (%d) is not a valid map.\n", newmapnum);
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
else
|
|
||||||
return newmapnum;
|
return newmapnum;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
else if (mapnamelen == 2)/* maybe two digit code */
|
else if (mapnamelen == 2)/* maybe two digit code */
|
||||||
|
|||||||
@@ -637,7 +637,7 @@ static void WalkBSPNode(INT32 bspnum, poly_t *poly, UINT16 *leafnode, fixed_t *b
|
|||||||
WalkBSPNode(bsp->children[0], frontpoly, &bsp->children[0],bsp->bbox[0]);
|
WalkBSPNode(bsp->children[0], frontpoly, &bsp->children[0],bsp->bbox[0]);
|
||||||
|
|
||||||
// copy child bbox
|
// copy child bbox
|
||||||
M_Memcpy(bbox, bsp->bbox[0], 4*sizeof (fixed_t));
|
memcpy(bbox, bsp->bbox[0], 4*sizeof (fixed_t));
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
I_Error("WalkBSPNode: no front poly?");
|
I_Error("WalkBSPNode: no front poly?");
|
||||||
|
|||||||
@@ -346,7 +346,7 @@ static void HWR_GenerateTexture(INT32 texnum, GLMapTexture_t *gltex, boolean noe
|
|||||||
|
|
||||||
gltex->mipmap.colormap = Z_Calloc(sizeof(*gltex->mipmap.colormap), PU_HWRPATCHCOLMIPMAP, NULL);
|
gltex->mipmap.colormap = Z_Calloc(sizeof(*gltex->mipmap.colormap), PU_HWRPATCHCOLMIPMAP, NULL);
|
||||||
gltex->mipmap.colormap->source = colormap;
|
gltex->mipmap.colormap->source = colormap;
|
||||||
M_Memcpy(gltex->mipmap.colormap->data, colormap, 256 * sizeof(UINT8));
|
memcpy(gltex->mipmap.colormap->data, colormap, 256 * sizeof(UINT8));
|
||||||
|
|
||||||
blockwidth = texture->width;
|
blockwidth = texture->width;
|
||||||
blockheight = texture->height;
|
blockheight = texture->height;
|
||||||
@@ -970,7 +970,7 @@ void HWR_GetFlat(lumpnum_t flatlumpnum, boolean noencoremap)
|
|||||||
#endif
|
#endif
|
||||||
glMipmap->colormap = Z_Calloc(sizeof(*glMipmap->colormap), PU_HWRPATCHCOLMIPMAP, NULL);
|
glMipmap->colormap = Z_Calloc(sizeof(*glMipmap->colormap), PU_HWRPATCHCOLMIPMAP, NULL);
|
||||||
glMipmap->colormap->source = colormap;
|
glMipmap->colormap->source = colormap;
|
||||||
M_Memcpy(glMipmap->colormap->data, colormap, 256 * sizeof(UINT8));
|
memcpy(glMipmap->colormap->data, colormap, 256 * sizeof(UINT8));
|
||||||
}
|
}
|
||||||
|
|
||||||
if (!glMipmap->downloaded)
|
if (!glMipmap->downloaded)
|
||||||
@@ -1068,7 +1068,7 @@ void HWR_GetMappedPatch(patch_t *patch, const UINT8 *colormap)
|
|||||||
{
|
{
|
||||||
if (memcmp(glMipmap->colormap->data, colormap, 256 * sizeof(UINT8)))
|
if (memcmp(glMipmap->colormap->data, colormap, 256 * sizeof(UINT8)))
|
||||||
{
|
{
|
||||||
M_Memcpy(glMipmap->colormap->data, colormap, 256 * sizeof(UINT8));
|
memcpy(glMipmap->colormap->data, colormap, 256 * sizeof(UINT8));
|
||||||
HWR_UpdatePatchMipmap(patch, glMipmap);
|
HWR_UpdatePatchMipmap(patch, glMipmap);
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
@@ -1091,7 +1091,7 @@ void HWR_GetMappedPatch(patch_t *patch, const UINT8 *colormap)
|
|||||||
|
|
||||||
newMipmap->colormap = Z_Calloc(sizeof(*newMipmap->colormap), PU_HWRPATCHCOLMIPMAP, NULL);
|
newMipmap->colormap = Z_Calloc(sizeof(*newMipmap->colormap), PU_HWRPATCHCOLMIPMAP, NULL);
|
||||||
newMipmap->colormap->source = colormap;
|
newMipmap->colormap->source = colormap;
|
||||||
M_Memcpy(newMipmap->colormap->data, colormap, 256 * sizeof(UINT8));
|
memcpy(newMipmap->colormap->data, colormap, 256 * sizeof(UINT8));
|
||||||
|
|
||||||
HWR_LoadPatchMipmap(patch, newMipmap);
|
HWR_LoadPatchMipmap(patch, newMipmap);
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -458,8 +458,8 @@ void HWR_Lighting(FSurfaceInfo *Surface, INT32 light_level, extracolormap_t *col
|
|||||||
// in palette rendering mode, this is not needed since it properly takes the changes to the palette itself
|
// in palette rendering mode, this is not needed since it properly takes the changes to the palette itself
|
||||||
if (!HWR_ShouldUsePaletteRendering())
|
if (!HWR_ShouldUsePaletteRendering())
|
||||||
{
|
{
|
||||||
V_CubeApply(&tint_color.s.red, &tint_color.s.green, &tint_color.s.blue);
|
V_CubeApply(&tint_color);
|
||||||
V_CubeApply(&fade_color.s.red, &fade_color.s.green, &fade_color.s.blue);
|
V_CubeApply(&fade_color);
|
||||||
}
|
}
|
||||||
|
|
||||||
Surface->PolyColor.rgba = poly_color.rgba;
|
Surface->PolyColor.rgba = poly_color.rgba;
|
||||||
@@ -1237,7 +1237,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;
|
||||||
|
|
||||||
@@ -1259,8 +1259,6 @@ static inline boolean HWR_BlendMidtextureSurface(FSurfaceInfo *pSurf)
|
|||||||
case 256:
|
case 256:
|
||||||
if (gl_linedef->blendmode)
|
if (gl_linedef->blendmode)
|
||||||
blendmode = HWR_SurfaceBlend(gl_linedef->blendmode, R_GetLinedefTransTable(gl_linedef->alpha), pSurf);
|
blendmode = HWR_SurfaceBlend(gl_linedef->blendmode, R_GetLinedefTransTable(gl_linedef->alpha), pSurf);
|
||||||
else
|
|
||||||
blendmode = PF_Translucent;
|
|
||||||
break;
|
break;
|
||||||
default:
|
default:
|
||||||
if (gl_linedef->blendmode)
|
if (gl_linedef->blendmode)
|
||||||
@@ -1272,8 +1270,6 @@ static inline boolean HWR_BlendMidtextureSurface(FSurfaceInfo *pSurf)
|
|||||||
}
|
}
|
||||||
else if (gl_linedef->alpha >= 0 && gl_linedef->alpha < FRACUNIT)
|
else if (gl_linedef->alpha >= 0 && gl_linedef->alpha < FRACUNIT)
|
||||||
blendmode = HWR_TranstableToAlpha(R_GetLinedefTransTable(gl_linedef->alpha), pSurf);
|
blendmode = HWR_TranstableToAlpha(R_GetLinedefTransTable(gl_linedef->alpha), pSurf);
|
||||||
else
|
|
||||||
blendmode = PF_Masked;
|
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -4280,8 +4276,8 @@ static void HWR_AddTransparentWall(FOutVector *wallVerts, FSurfaceInfo *pSurf, I
|
|||||||
{
|
{
|
||||||
wallinfo_t *wallinfo = static_cast<wallinfo_t*>(HWR_CreateDrawNode(DRAWNODE_WALL));
|
wallinfo_t *wallinfo = static_cast<wallinfo_t*>(HWR_CreateDrawNode(DRAWNODE_WALL));
|
||||||
|
|
||||||
M_Memcpy(wallinfo->wallVerts, wallVerts, sizeof (wallinfo->wallVerts));
|
memcpy(wallinfo->wallVerts, wallVerts, sizeof (wallinfo->wallVerts));
|
||||||
M_Memcpy(&wallinfo->Surf, pSurf, sizeof (FSurfaceInfo));
|
memcpy(&wallinfo->Surf, pSurf, sizeof (FSurfaceInfo));
|
||||||
wallinfo->texnum = texnum;
|
wallinfo->texnum = texnum;
|
||||||
wallinfo->noencore = noencore;
|
wallinfo->noencore = noencore;
|
||||||
wallinfo->blend = blend;
|
wallinfo->blend = blend;
|
||||||
@@ -5962,7 +5958,7 @@ static void HWR_DoPostProcessor(player_t *player)
|
|||||||
|
|
||||||
Surf.PolyColor.s.alpha = 0xc0; // match software mode
|
Surf.PolyColor.s.alpha = 0xc0; // match software mode
|
||||||
|
|
||||||
V_CubeApply(&Surf.PolyColor.s.red, &Surf.PolyColor.s.green, &Surf.PolyColor.s.blue);
|
V_CubeApply(&Surf.PolyColor);
|
||||||
|
|
||||||
GL_DrawPolygon(&Surf, v, 4, PF_Modulated|PF_Translucent|PF_NoTexture|PF_NoDepthTest);
|
GL_DrawPolygon(&Surf, v, 4, PF_Modulated|PF_Translucent|PF_NoTexture|PF_NoDepthTest);
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -417,7 +417,7 @@ static void md2_loadTexture(md2_t *model)
|
|||||||
size = w*h;
|
size = w*h;
|
||||||
while (size--)
|
while (size--)
|
||||||
{
|
{
|
||||||
V_CubeApply(&image->s.red, &image->s.green, &image->s.blue);
|
V_CubeApply(image);
|
||||||
image++;
|
image++;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -1058,7 +1058,7 @@ static void HWR_GetBlendedTexture(patch_t *patch, patch_t *blendgpatch, INT32 sk
|
|||||||
{
|
{
|
||||||
if (memcmp(glMipmap->colormap->data, colormap, 256 * sizeof(UINT8)))
|
if (memcmp(glMipmap->colormap->data, colormap, 256 * sizeof(UINT8)))
|
||||||
{
|
{
|
||||||
M_Memcpy(glMipmap->colormap->data, colormap, 256 * sizeof(UINT8));
|
memcpy(glMipmap->colormap->data, colormap, 256 * sizeof(UINT8));
|
||||||
HWR_CreateBlendedTexture(patch, blendgpatch, glMipmap, skinnum, color);
|
HWR_CreateBlendedTexture(patch, blendgpatch, glMipmap, skinnum, color);
|
||||||
GL_UpdateTexture(glMipmap);
|
GL_UpdateTexture(glMipmap);
|
||||||
}
|
}
|
||||||
@@ -1085,7 +1085,7 @@ static void HWR_GetBlendedTexture(patch_t *patch, patch_t *blendgpatch, INT32 sk
|
|||||||
|
|
||||||
newMipmap->colormap = Z_Calloc(sizeof(*newMipmap->colormap), PU_HWRPATCHCOLMIPMAP, NULL);
|
newMipmap->colormap = Z_Calloc(sizeof(*newMipmap->colormap), PU_HWRPATCHCOLMIPMAP, NULL);
|
||||||
newMipmap->colormap->source = colormap;
|
newMipmap->colormap->source = colormap;
|
||||||
M_Memcpy(newMipmap->colormap->data, colormap, 256 * sizeof(UINT8));
|
memcpy(newMipmap->colormap->data, colormap, 256 * sizeof(UINT8));
|
||||||
|
|
||||||
HWR_CreateBlendedTexture(patch, blendgpatch, newMipmap, skinnum, color);
|
HWR_CreateBlendedTexture(patch, blendgpatch, newMipmap, skinnum, color);
|
||||||
|
|
||||||
|
|||||||
@@ -242,7 +242,7 @@ void GenerateVertexNormals(model_t *model)
|
|||||||
float *vertPtr = frame->vertices;
|
float *vertPtr = frame->vertices;
|
||||||
float *oldNormals;
|
float *oldNormals;
|
||||||
|
|
||||||
M_Memcpy(newNormals, frame->normals, sizeof(float)*3*mesh->numTriangles*3);
|
memcpy(newNormals, frame->normals, sizeof(float)*3*mesh->numTriangles*3);
|
||||||
|
|
||||||
for (k = 0; k < mesh->numVertices; k++)
|
for (k = 0; k < mesh->numVertices; k++)
|
||||||
{
|
{
|
||||||
@@ -402,7 +402,7 @@ void Optimize(model_t *model)
|
|||||||
char *destByte;
|
char *destByte;
|
||||||
char *srcByte;
|
char *srcByte;
|
||||||
|
|
||||||
M_Memcpy(&newMesh->uvs[uvCount],
|
memcpy(&newMesh->uvs[uvCount],
|
||||||
curMesh->uvs,
|
curMesh->uvs,
|
||||||
sizeof(float)*2*curMesh->numTriangles*3);
|
sizeof(float)*2*curMesh->numTriangles*3);
|
||||||
|
|
||||||
@@ -410,13 +410,13 @@ void Optimize(model_t *model)
|
|||||||
|
|
||||||
dest = (float*)newMesh->frames[0].vertices;
|
dest = (float*)newMesh->frames[0].vertices;
|
||||||
src = (float*)curMesh->frames[0].vertices;
|
src = (float*)curMesh->frames[0].vertices;
|
||||||
M_Memcpy(&dest[vertCount],
|
memcpy(&dest[vertCount],
|
||||||
src,
|
src,
|
||||||
sizeof(float)*3*curMesh->numTriangles*3);
|
sizeof(float)*3*curMesh->numTriangles*3);
|
||||||
|
|
||||||
dest = (float*)newMesh->frames[0].normals;
|
dest = (float*)newMesh->frames[0].normals;
|
||||||
src = (float*)curMesh->frames[0].normals;
|
src = (float*)curMesh->frames[0].normals;
|
||||||
M_Memcpy(&dest[vertCount],
|
memcpy(&dest[vertCount],
|
||||||
src,
|
src,
|
||||||
sizeof(float)*3*curMesh->numTriangles*3);
|
sizeof(float)*3*curMesh->numTriangles*3);
|
||||||
|
|
||||||
@@ -427,7 +427,7 @@ void Optimize(model_t *model)
|
|||||||
|
|
||||||
if (srcByte)
|
if (srcByte)
|
||||||
{
|
{
|
||||||
M_Memcpy(&destByte[colorCount],
|
memcpy(&destByte[colorCount],
|
||||||
srcByte,
|
srcByte,
|
||||||
sizeof(char)*4*curMesh->numTriangles*3);
|
sizeof(char)*4*curMesh->numTriangles*3);
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -201,7 +201,7 @@ static char *HWR_PreprocessShader(char *original)
|
|||||||
CONS_Alert(CONS_ERROR, "HWR_PreprocessShader: Syntax error in #version. Expected version with 3 digits, but got %d digits.\n", version_number_len);
|
CONS_Alert(CONS_ERROR, "HWR_PreprocessShader: Syntax error in #version. Expected version with 3 digits, but got %d digits.\n", version_number_len);
|
||||||
return NULL;
|
return NULL;
|
||||||
}
|
}
|
||||||
M_Memcpy(shader_glsl_version, read_pos, 3);
|
memcpy(shader_glsl_version, read_pos, 3);
|
||||||
ADVANCE(version_number_len)
|
ADVANCE(version_number_len)
|
||||||
version_len = (read_pos - original) - version_pos;
|
version_len = (read_pos - original) - version_pos;
|
||||||
whitespace_len = strspn(read_pos, WHITESPACE_CHARS);
|
whitespace_len = strspn(read_pos, WHITESPACE_CHARS);
|
||||||
@@ -304,7 +304,7 @@ static char *HWR_PreprocessShader(char *original)
|
|||||||
{
|
{
|
||||||
strcpy(write_pos, VERSION_PART);
|
strcpy(write_pos, VERSION_PART);
|
||||||
write_pos += sizeof(VERSION_PART) - 1;
|
write_pos += sizeof(VERSION_PART) - 1;
|
||||||
M_Memcpy(write_pos, shader_glsl_version, 3);
|
memcpy(write_pos, shader_glsl_version, 3);
|
||||||
write_pos += 3;
|
write_pos += 3;
|
||||||
strcpy(write_pos, line_ending);
|
strcpy(write_pos, line_ending);
|
||||||
write_pos += line_ending_len;
|
write_pos += line_ending_len;
|
||||||
@@ -344,7 +344,7 @@ static char *HWR_PreprocessShader(char *original)
|
|||||||
}
|
}
|
||||||
|
|
||||||
// Copy the original shader.
|
// Copy the original shader.
|
||||||
M_Memcpy(write_pos, read_pos, original_len);
|
memcpy(write_pos, read_pos, original_len);
|
||||||
|
|
||||||
// Erase the original #version directive, if it exists and was copied.
|
// Erase the original #version directive, if it exists and was copied.
|
||||||
if (new_len != original_len && version_pos != -1)
|
if (new_len != original_len && version_pos != -1)
|
||||||
@@ -573,7 +573,7 @@ void HWR_LoadCustomShadersFromFile(UINT16 wadnum, boolean PK3)
|
|||||||
size = W_LumpLengthPwad(wadnum, lump);
|
size = W_LumpLengthPwad(wadnum, lump);
|
||||||
|
|
||||||
line = Z_Malloc(size+1, PU_STATIC, NULL);
|
line = Z_Malloc(size+1, PU_STATIC, NULL);
|
||||||
M_Memcpy(line, shaderdef, size);
|
memcpy(line, shaderdef, size);
|
||||||
line[size] = '\0';
|
line[size] = '\0';
|
||||||
|
|
||||||
stoken = strtok(line, "\r\n ");
|
stoken = strtok(line, "\r\n ");
|
||||||
|
|||||||
@@ -110,6 +110,7 @@ GLint screen_texsizew = 512; // Power-of-two screen texture render resolution
|
|||||||
GLint screen_texsizeh = 512; // Power-of-two screen texture render resolution
|
GLint screen_texsizeh = 512; // Power-of-two screen texture render resolution
|
||||||
GLbyte screen_depth = 0;
|
GLbyte screen_depth = 0;
|
||||||
GLint maximumAnisotropy = 0;
|
GLint maximumAnisotropy = 0;
|
||||||
|
boolean supportNPO2tex = false;
|
||||||
static GLboolean MipMap = GL_FALSE;
|
static GLboolean MipMap = GL_FALSE;
|
||||||
static GLint min_filter = GL_LINEAR;
|
static GLint min_filter = GL_LINEAR;
|
||||||
static GLint mag_filter = GL_LINEAR;
|
static GLint mag_filter = GL_LINEAR;
|
||||||
@@ -1176,12 +1177,20 @@ void GL_SetModelView(GLint w, GLint h)
|
|||||||
|
|
||||||
screen_texsizew = screen_texsizeh = 512;
|
screen_texsizew = screen_texsizeh = 512;
|
||||||
|
|
||||||
// look for power of two that is large enough for the screen
|
if (supportNPO2tex)
|
||||||
while (screen_texsizew < w)
|
{
|
||||||
screen_texsizew <<= 1;
|
screen_texsizew = screen_width;
|
||||||
|
screen_texsizeh = screen_height;
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
// look for power of two that is large enough for the screen
|
||||||
|
while (screen_texsizew < w)
|
||||||
|
screen_texsizew <<= 1;
|
||||||
|
|
||||||
while (screen_texsizeh < h)
|
while (screen_texsizeh < h)
|
||||||
screen_texsizeh <<= 1;
|
screen_texsizeh <<= 1;
|
||||||
|
}
|
||||||
|
|
||||||
pglGetIntegerv(GL_MAX_TEXTURE_SIZE, &maxtexsize); // Get the maximum supported texture size
|
pglGetIntegerv(GL_MAX_TEXTURE_SIZE, &maxtexsize); // Get the maximum supported texture size
|
||||||
if ((screen_texsizew > maxtexsize || screen_texsizeh > maxtexsize) && maxtexsize > 0)
|
if ((screen_texsizew > maxtexsize || screen_texsizeh > maxtexsize) && maxtexsize > 0)
|
||||||
@@ -1814,47 +1823,72 @@ static void GL_AllocTextureBuffer(GLMipmap_t *pTexInfo)
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
#define PADDING_CHECK(offset, alphaCheck) { from = to + (offset); if ((alphaCheck)) from = NULL; else goto foundFrom; }
|
static void PadRGBABitmap(RGBA_t *tex, UINT16 w, UINT16 h, UINT32 flags)
|
||||||
|
|
||||||
static void PadRGBABitmap(RGBA_t *tex, UINT16 w, UINT16 h)
|
|
||||||
{
|
{
|
||||||
INT32 i;
|
INT32 i, c1, c2, idxAdd;
|
||||||
boolean notLeft, notRight, notTop, notBottom;
|
UINT16 c1size, c2size;
|
||||||
RGBA_t *to = tex - 1, *from;
|
RGBA_t *current, *prev, *next, *first;
|
||||||
|
boolean ignorePrev, wrap;
|
||||||
|
|
||||||
for (i = 0; i < w * h; i++)
|
for (i = 0; i < 2; i++)
|
||||||
{
|
{
|
||||||
to++;
|
c1size = i ? h : w;
|
||||||
if (to->rgba != 0)
|
c2size = i ? w : h;
|
||||||
continue;
|
idxAdd = i ? 1 : w;
|
||||||
from = NULL;
|
wrap = i ? flags & TF_WRAPX : flags & TF_WRAPY;
|
||||||
|
|
||||||
notLeft = i % w != 0;
|
for (c1 = 0; c1 < c1size; c1++)
|
||||||
notRight = i % w != w - 1;
|
|
||||||
notTop = i / w != 0;
|
|
||||||
notBottom = i / w != h - 1;
|
|
||||||
|
|
||||||
if (notRight) PADDING_CHECK(1, from->s.alpha == 0) // Check +X
|
|
||||||
if (notBottom) PADDING_CHECK(w, from->s.alpha == 0) // Check +Y
|
|
||||||
if (notLeft) PADDING_CHECK(-1, from->s.alpha == 0) // Check -X
|
|
||||||
if (notTop) PADDING_CHECK(-w, from->s.alpha == 0) // Check -Y
|
|
||||||
if (notRight && notBottom) PADDING_CHECK(1 + w, from->s.alpha == 0) // Check +X+Y
|
|
||||||
if (notLeft && notBottom) PADDING_CHECK(-1 + w, from->s.alpha == 0) // Check -X+Y
|
|
||||||
if (notLeft && notTop) PADDING_CHECK(-1 - w, from->s.alpha == 0) // Check -X-Y
|
|
||||||
if (notRight && notTop) PADDING_CHECK(1 - w, from->s.alpha == 0) // Check +X-Y
|
|
||||||
|
|
||||||
foundFrom:
|
|
||||||
if (from != NULL)
|
|
||||||
{
|
{
|
||||||
*to = *from;
|
if (i)
|
||||||
to->s.alpha = 0;
|
{
|
||||||
|
first = current = tex + (c1 * w);
|
||||||
|
prev = wrap ? tex + (w - 1 + c1 * w) : current;
|
||||||
|
next = tex + (1 + c1 * w);
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
first = current = tex + c1;
|
||||||
|
prev = wrap ? tex + (c1 + (h - 1) * w) : current;
|
||||||
|
next = tex + (c1 + w);
|
||||||
|
}
|
||||||
|
|
||||||
|
ignorePrev = false;
|
||||||
|
|
||||||
|
for (c2 = 0; c2 < c2size; c2++)
|
||||||
|
{
|
||||||
|
if (c2 == c2size - 1)
|
||||||
|
next = wrap ? first : current;
|
||||||
|
|
||||||
|
if (current->rgba)
|
||||||
|
{
|
||||||
|
ignorePrev = false;
|
||||||
|
}
|
||||||
|
else if (prev->rgba && !ignorePrev)
|
||||||
|
{
|
||||||
|
*current = *prev;
|
||||||
|
current->s.alpha = 0;
|
||||||
|
ignorePrev = true;
|
||||||
|
}
|
||||||
|
else if (next->rgba)
|
||||||
|
{
|
||||||
|
*current = *next;
|
||||||
|
current->s.alpha = 0;
|
||||||
|
ignorePrev = false;
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
ignorePrev = false;
|
||||||
|
}
|
||||||
|
|
||||||
|
prev = current;
|
||||||
|
current = next;
|
||||||
|
next += idxAdd;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
#undef PADDING_CHECK
|
static void GenerateMipmaps(INT32 w, INT32 h, RGBA_t *tex, INT32 maxLOD, UINT32 flags)
|
||||||
|
|
||||||
static void GenerateMipmaps(INT32 w, INT32 h, RGBA_t *tex, INT32 maxLOD)
|
|
||||||
{
|
{
|
||||||
if (tex == NULL)
|
if (tex == NULL)
|
||||||
{
|
{
|
||||||
@@ -1916,7 +1950,7 @@ static void GenerateMipmaps(INT32 w, INT32 h, RGBA_t *tex, INT32 maxLOD)
|
|||||||
h /= 2;
|
h /= 2;
|
||||||
|
|
||||||
if (padTexture)
|
if (padTexture)
|
||||||
PadRGBABitmap(tex, w, h);
|
PadRGBABitmap(tex, w, h, flags);
|
||||||
|
|
||||||
pglTexSubImage2D(GL_TEXTURE_2D, m + 1, 0, 0, w, h, GL_RGBA, GL_UNSIGNED_BYTE, tex);
|
pglTexSubImage2D(GL_TEXTURE_2D, m + 1, 0, 0, w, h, GL_RGBA, GL_UNSIGNED_BYTE, tex);
|
||||||
}
|
}
|
||||||
@@ -1991,7 +2025,7 @@ void GL_UpdateTexture(GLMipmap_t *pTexInfo)
|
|||||||
}
|
}
|
||||||
|
|
||||||
if (applyPadding)
|
if (applyPadding)
|
||||||
PadRGBABitmap(tex, w, h);
|
PadRGBABitmap(tex, w, h, pTexInfo->flags);
|
||||||
|
|
||||||
break;
|
break;
|
||||||
case GL_TEXFMT_RGBA:
|
case GL_TEXFMT_RGBA:
|
||||||
@@ -2007,7 +2041,7 @@ void GL_UpdateTexture(GLMipmap_t *pTexInfo)
|
|||||||
ptex = tex;
|
ptex = tex;
|
||||||
|
|
||||||
if (applyPadding)
|
if (applyPadding)
|
||||||
PadRGBABitmap(tex, w, h);
|
PadRGBABitmap(tex, w, h, pTexInfo->flags);
|
||||||
}
|
}
|
||||||
|
|
||||||
break;
|
break;
|
||||||
@@ -2052,21 +2086,10 @@ void GL_UpdateTexture(GLMipmap_t *pTexInfo)
|
|||||||
pglBindTexture(GL_TEXTURE_2D, num);
|
pglBindTexture(GL_TEXTURE_2D, num);
|
||||||
tex_downloaded = num;
|
tex_downloaded = num;
|
||||||
|
|
||||||
const int transparent = (pTexInfo->flags & TF_TRANSPARENT);
|
pglTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, mag_filter);
|
||||||
|
pglTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, min_filter);
|
||||||
|
|
||||||
// disable texture filtering on any texture that has holes so there's no dumb borders or blending issues
|
if (MipMap)
|
||||||
if (transparent)
|
|
||||||
{
|
|
||||||
pglTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
|
|
||||||
pglTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST);
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
pglTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, mag_filter);
|
|
||||||
pglTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, min_filter);
|
|
||||||
}
|
|
||||||
|
|
||||||
if (MipMap && !transparent) // No mipmaps on transparent stuff
|
|
||||||
{
|
{
|
||||||
pglTexParameteri(GL_TEXTURE_2D, GL_GENERATE_MIPMAP, GL_TRUE);
|
pglTexParameteri(GL_TEXTURE_2D, GL_GENERATE_MIPMAP, GL_TRUE);
|
||||||
|
|
||||||
@@ -2077,8 +2100,16 @@ void GL_UpdateTexture(GLMipmap_t *pTexInfo)
|
|||||||
|
|
||||||
// Control the mipmap level of detail
|
// Control the mipmap level of detail
|
||||||
pglTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_LOD, 0);
|
pglTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_LOD, 0);
|
||||||
pglTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAX_LOD, 5);
|
|
||||||
GenerateMipmaps(w, h, tex, 5);
|
if (pTexInfo->flags & TF_TRANSPARENT)
|
||||||
|
{
|
||||||
|
pglTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAX_LOD, 0); // No mipmaps on transparent stuff
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
pglTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAX_LOD, 4);
|
||||||
|
GenerateMipmaps(w, h, tex, 4, pTexInfo->flags);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
@@ -2459,12 +2490,10 @@ void GL_DrawIndexedTriangles(FSurfaceInfo *pSurf, FOutVector *pOutVerts, FUINT i
|
|||||||
// the DrawPolygon variant of this has some code about polyflags and wrapping here but havent noticed any problems from omitting it?
|
// the DrawPolygon variant of this has some code about polyflags and wrapping here but havent noticed any problems from omitting it?
|
||||||
}
|
}
|
||||||
|
|
||||||
static const boolean gl_ext_arb_vertex_buffer_object = true;
|
//#define NULL_VBO_VERTEX ((gl_skyvertex_t*)NULL)
|
||||||
|
#define sky_vbo_x ((void*)offsetof(gl_skyvertex_t, x))
|
||||||
#define NULL_VBO_VERTEX ((gl_skyvertex_t*)NULL)
|
#define sky_vbo_u ((void*)offsetof(gl_skyvertex_t, u))
|
||||||
#define sky_vbo_x (gl_ext_arb_vertex_buffer_object ? &NULL_VBO_VERTEX->x : &sky->data[0].x)
|
#define sky_vbo_r ((void*)offsetof(gl_skyvertex_t, r))
|
||||||
#define sky_vbo_u (gl_ext_arb_vertex_buffer_object ? &NULL_VBO_VERTEX->u : &sky->data[0].u)
|
|
||||||
#define sky_vbo_r (gl_ext_arb_vertex_buffer_object ? &NULL_VBO_VERTEX->r : &sky->data[0].r)
|
|
||||||
|
|
||||||
void GL_RenderSkyDome(gl_sky_t *sky)
|
void GL_RenderSkyDome(gl_sky_t *sky)
|
||||||
{
|
{
|
||||||
@@ -2476,30 +2505,23 @@ void GL_RenderSkyDome(gl_sky_t *sky)
|
|||||||
if (sky->rebuild)
|
if (sky->rebuild)
|
||||||
{
|
{
|
||||||
// delete VBO when already exists
|
// delete VBO when already exists
|
||||||
if (gl_ext_arb_vertex_buffer_object)
|
if (sky->vbo)
|
||||||
{
|
pglDeleteBuffers(1, &sky->vbo);
|
||||||
if (sky->vbo)
|
|
||||||
pglDeleteBuffers(1, &sky->vbo);
|
|
||||||
}
|
|
||||||
|
|
||||||
if (gl_ext_arb_vertex_buffer_object)
|
// generate a new VBO and get the associated ID
|
||||||
{
|
pglGenBuffers(1, &sky->vbo);
|
||||||
// generate a new VBO and get the associated ID
|
|
||||||
pglGenBuffers(1, &sky->vbo);
|
|
||||||
|
|
||||||
// bind VBO in order to use
|
// bind VBO in order to use
|
||||||
pglBindBuffer(GL_ARRAY_BUFFER, sky->vbo);
|
pglBindBuffer(GL_ARRAY_BUFFER, sky->vbo);
|
||||||
|
|
||||||
// upload data to VBO
|
// upload data to VBO
|
||||||
pglBufferData(GL_ARRAY_BUFFER, sky->vertex_count * sizeof(sky->data[0]), sky->data, GL_STATIC_DRAW);
|
pglBufferData(GL_ARRAY_BUFFER, sky->vertex_count * sizeof(sky->data[0]), sky->data, GL_STATIC_DRAW);
|
||||||
}
|
|
||||||
|
|
||||||
sky->rebuild = false;
|
sky->rebuild = false;
|
||||||
}
|
}
|
||||||
|
|
||||||
// bind VBO in order to use
|
// bind VBO in order to use
|
||||||
if (gl_ext_arb_vertex_buffer_object)
|
pglBindBuffer(GL_ARRAY_BUFFER, sky->vbo);
|
||||||
pglBindBuffer(GL_ARRAY_BUFFER, sky->vbo);
|
|
||||||
|
|
||||||
// activate and specify pointers to arrays
|
// activate and specify pointers to arrays
|
||||||
pglVertexPointer(3, GL_FLOAT, sizeof(sky->data[0]), sky_vbo_x);
|
pglVertexPointer(3, GL_FLOAT, sizeof(sky->data[0]), sky_vbo_x);
|
||||||
@@ -2543,8 +2565,7 @@ void GL_RenderSkyDome(gl_sky_t *sky)
|
|||||||
pglColor4ubv(white);
|
pglColor4ubv(white);
|
||||||
|
|
||||||
// bind with 0, so, switch back to normal pointer operation
|
// bind with 0, so, switch back to normal pointer operation
|
||||||
if (gl_ext_arb_vertex_buffer_object)
|
pglBindBuffer(GL_ARRAY_BUFFER, 0);
|
||||||
pglBindBuffer(GL_ARRAY_BUFFER, 0);
|
|
||||||
|
|
||||||
// deactivate color array
|
// deactivate color array
|
||||||
pglDisableClientState(GL_COLOR_ARRAY);
|
pglDisableClientState(GL_COLOR_ARRAY);
|
||||||
@@ -3692,7 +3713,6 @@ void GL_DrawScreenFinalTexture(int tex, INT32 width, INT32 height, boolean usesh
|
|||||||
float xfix, yfix;
|
float xfix, yfix;
|
||||||
float origaspect, newaspect;
|
float origaspect, newaspect;
|
||||||
float xoff = 1, yoff = 1; // xoffset and yoffset for the polygon to have black bars around the screen
|
float xoff = 1, yoff = 1; // xoffset and yoffset for the polygon to have black bars around the screen
|
||||||
FRGBAFloat clearColour;
|
|
||||||
|
|
||||||
static float off[12];
|
static float off[12];
|
||||||
static float fix[8];
|
static float fix[8];
|
||||||
@@ -3743,8 +3763,7 @@ void GL_DrawScreenFinalTexture(int tex, INT32 width, INT32 height, boolean usesh
|
|||||||
|
|
||||||
pglViewport(0, 0, width, height);
|
pglViewport(0, 0, width, height);
|
||||||
|
|
||||||
clearColour.red = clearColour.green = clearColour.blue = 0;
|
FRGBAFloat clearColour = {0, 0, 0, 1};
|
||||||
clearColour.alpha = 1;
|
|
||||||
GL_ClearBuffer(true, false, false, &clearColour);
|
GL_ClearBuffer(true, false, false, &clearColour);
|
||||||
GL_SetBlend(PF_NoDepthTest);
|
GL_SetBlend(PF_NoDepthTest);
|
||||||
|
|
||||||
|
|||||||
@@ -124,6 +124,7 @@ extern GLint screen_width;
|
|||||||
extern GLint screen_height;
|
extern GLint screen_height;
|
||||||
extern GLbyte screen_depth;
|
extern GLbyte screen_depth;
|
||||||
extern GLint maximumAnisotropy;
|
extern GLint maximumAnisotropy;
|
||||||
|
extern boolean supportNPO2tex;
|
||||||
extern boolean supportMipMap;
|
extern boolean supportMipMap;
|
||||||
|
|
||||||
/** \brief OpenGL flags for video driver
|
/** \brief OpenGL flags for video driver
|
||||||
|
|||||||
+5
-4
@@ -280,7 +280,7 @@ static void Command_Say_f(void);
|
|||||||
static void Command_Sayto_f(void);
|
static void Command_Sayto_f(void);
|
||||||
static void Command_Sayteam_f(void);
|
static void Command_Sayteam_f(void);
|
||||||
static void Command_CSay_f(void);
|
static void Command_CSay_f(void);
|
||||||
static void Got_Saycmd(UINT8 **p, INT32 playernum);
|
static void Got_Saycmd(const UINT8 **p, INT32 playernum);
|
||||||
|
|
||||||
void HU_LoadGraphics(void)
|
void HU_LoadGraphics(void)
|
||||||
{
|
{
|
||||||
@@ -879,11 +879,12 @@ const char *HU_SkinColorToConsoleColor(skincolors_t color)
|
|||||||
* \sa DoSayCommand
|
* \sa DoSayCommand
|
||||||
* \author Graue <graue@oceanbase.org>
|
* \author Graue <graue@oceanbase.org>
|
||||||
*/
|
*/
|
||||||
static void Got_Saycmd(UINT8 **p, INT32 playernum)
|
static void Got_Saycmd(const UINT8 **p, INT32 playernum)
|
||||||
{
|
{
|
||||||
SINT8 target;
|
SINT8 target;
|
||||||
UINT8 flags;
|
UINT8 flags;
|
||||||
const char *dispname;
|
const char *dispname;
|
||||||
|
char buf[HU_MAXMSGLEN + 1];
|
||||||
char *msg;
|
char *msg;
|
||||||
boolean action = false;
|
boolean action = false;
|
||||||
char *ptr;
|
char *ptr;
|
||||||
@@ -893,8 +894,8 @@ static void Got_Saycmd(UINT8 **p, INT32 playernum)
|
|||||||
|
|
||||||
target = READSINT8(*p);
|
target = READSINT8(*p);
|
||||||
flags = READUINT8(*p);
|
flags = READUINT8(*p);
|
||||||
msg = (char *)*p;
|
msg = buf;
|
||||||
SKIPSTRINGL(*p, HU_MAXMSGLEN + 1);
|
READSTRINGL(*p, msg, HU_MAXMSGLEN + 1);
|
||||||
|
|
||||||
if ((cv_mute.value || flags & (HU_CSAY|HU_SERVER_SAY)) && playernum != serverplayer && !(IsPlayerAdmin(playernum)))
|
if ((cv_mute.value || flags & (HU_CSAY|HU_SERVER_SAY)) && playernum != serverplayer && !(IsPlayerAdmin(playernum)))
|
||||||
{
|
{
|
||||||
|
|||||||
+2
-2
@@ -670,7 +670,7 @@ static boolean SOCK_Get(void)
|
|||||||
{
|
{
|
||||||
const time_t curTime = time(NULL);
|
const time_t curTime = time(NULL);
|
||||||
|
|
||||||
M_Memcpy(&clientaddress[j], &fromaddress, fromlen);
|
memcpy(&clientaddress[j], &fromaddress, fromlen);
|
||||||
nodesocket[j] = mysockets[n];
|
nodesocket[j] = mysockets[n];
|
||||||
DEBFILE(va("New node detected: node:%d address:%s\n", j,
|
DEBFILE(va("New node detected: node:%d address:%s\n", j,
|
||||||
SOCK_GetNodeAddress(j)));
|
SOCK_GetNodeAddress(j)));
|
||||||
@@ -1485,7 +1485,7 @@ static boolean SOCK_Ban(INT32 node)
|
|||||||
ban = numbans;
|
ban = numbans;
|
||||||
AddBannedIndex();
|
AddBannedIndex();
|
||||||
|
|
||||||
M_Memcpy(&banned[ban].address, &clientaddress[node], sizeof (mysockaddr_t));
|
memcpy(&banned[ban].address, &clientaddress[node], sizeof (mysockaddr_t));
|
||||||
|
|
||||||
if (banned[ban].address.any.sa_family == AF_INET)
|
if (banned[ban].address.any.sa_family == AF_INET)
|
||||||
{
|
{
|
||||||
|
|||||||
+2
-2
@@ -2860,9 +2860,9 @@ void K_SpawnKartExplosion(fixed_t x, fixed_t y, fixed_t z, fixed_t radius, INT32
|
|||||||
v[3] = FRACUNIT;
|
v[3] = FRACUNIT;
|
||||||
|
|
||||||
res = VectorMatrixMultiply(v, *RotateXMatrix(rotangle));
|
res = VectorMatrixMultiply(v, *RotateXMatrix(rotangle));
|
||||||
M_Memcpy(&v, res, sizeof (v));
|
memcpy(&v, res, sizeof (v));
|
||||||
res = VectorMatrixMultiply(v, *RotateZMatrix(closestangle));
|
res = VectorMatrixMultiply(v, *RotateZMatrix(closestangle));
|
||||||
M_Memcpy(&v, res, sizeof (v));
|
memcpy(&v, res, sizeof (v));
|
||||||
|
|
||||||
finalx = x + v[0];
|
finalx = x + v[0];
|
||||||
finaly = y + v[1];
|
finaly = y + v[1];
|
||||||
|
|||||||
+43
-36
@@ -45,27 +45,33 @@ boolean luaL_checkboolean(lua_State *L, int narg) {
|
|||||||
// String concatination
|
// String concatination
|
||||||
static int lib_concat(lua_State *L)
|
static int lib_concat(lua_State *L)
|
||||||
{
|
{
|
||||||
int n = lua_gettop(L); /* number of arguments */
|
int n = lua_gettop(L); /* number of arguments */
|
||||||
int i;
|
int i;
|
||||||
char *r = NULL;
|
char *r = NULL;
|
||||||
size_t rl = 0,sl;
|
size_t rl = 0, sl;
|
||||||
lua_getglobal(L, "tostring");
|
lua_getglobal(L, "tostring");
|
||||||
for (i=1; i<=n; i++) {
|
for (i=1; i<=n; i++) {
|
||||||
const char *s;
|
const char *s;
|
||||||
lua_pushvalue(L, -1); /* function to be called */
|
lua_pushvalue(L, -1); /* function to be called */
|
||||||
lua_pushvalue(L, i); /* value to print */
|
lua_pushvalue(L, i); /* value to print */
|
||||||
lua_call(L, 1, 1);
|
lua_call(L, 1, 1);
|
||||||
s = lua_tolstring(L, -1, &sl); /* get result */
|
s = lua_tolstring(L, -1, &sl); /* get result */
|
||||||
if (s == NULL)
|
|
||||||
return luaL_error(L, LUA_QL("tostring") " must return a string to "
|
if (sl == 0) {
|
||||||
LUA_QL("__add"));
|
lua_pop(L, 1); /* pop result */
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (s == NULL)
|
||||||
|
return luaL_error(L, LUA_QL("tostring") " must return a string to "
|
||||||
|
LUA_QL("__add"));
|
||||||
r = Z_Realloc(r, rl+sl, PU_STATIC, NULL);
|
r = Z_Realloc(r, rl+sl, PU_STATIC, NULL);
|
||||||
M_Memcpy(r+rl, s, sl);
|
memcpy(r+rl, s, sl);
|
||||||
rl += sl;
|
rl += sl;
|
||||||
lua_pop(L, 1); /* pop result */
|
lua_pop(L, 1); /* pop result */
|
||||||
}
|
}
|
||||||
lua_pushlstring(L, r, rl);
|
lua_pushlstring(L, r, rl);
|
||||||
Z_Free(r);
|
Z_Free(r);
|
||||||
return 1;
|
return 1;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -73,23 +79,24 @@ static int lib_concat(lua_State *L)
|
|||||||
// Copied from base Lua code
|
// Copied from base Lua code
|
||||||
static int lib_print(lua_State *L)
|
static int lib_print(lua_State *L)
|
||||||
{
|
{
|
||||||
int n = lua_gettop(L); /* number of arguments */
|
int n = lua_gettop(L); /* number of arguments */
|
||||||
int i;
|
int i;
|
||||||
//HUDSAFE
|
//HUDSAFE
|
||||||
lua_getglobal(L, "tostring");
|
lua_getglobal(L, "tostring");
|
||||||
for (i=1; i<=n; i++) {
|
for (i=1; i<=n; i++) {
|
||||||
const char *s;
|
const char *s;
|
||||||
lua_pushvalue(L, -1); /* function to be called */
|
lua_pushvalue(L, -1); /* function to be called */
|
||||||
lua_pushvalue(L, i); /* value to print */
|
lua_pushvalue(L, i); /* value to print */
|
||||||
lua_call(L, 1, 1);
|
lua_call(L, 1, 1);
|
||||||
s = lua_tostring(L, -1); /* get result */
|
s = lua_tostring(L, -1); /* get result */
|
||||||
if (s == NULL)
|
|
||||||
return luaL_error(L, LUA_QL("tostring") " must return a string to "
|
if (s == NULL)
|
||||||
LUA_QL("print"));
|
return luaL_error(L, LUA_QL("tostring") " must return a string to "
|
||||||
if (i>1) CONS_Printf("\n");
|
LUA_QL("print"));
|
||||||
CONS_Printf("%s", s);
|
if (i>1) CONS_Printf("\n");
|
||||||
lua_pop(L, 1); /* pop result */
|
CONS_Printf("%s", s);
|
||||||
}
|
lua_pop(L, 1); /* pop result */
|
||||||
|
}
|
||||||
CONS_Printf("\n");
|
CONS_Printf("\n");
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|||||||
+61
-56
@@ -28,13 +28,29 @@
|
|||||||
|
|
||||||
#define NOHUD if (hud_running) return luaL_error(L, "HUD rendering code should not call this function!");
|
#define NOHUD if (hud_running) return luaL_error(L, "HUD rendering code should not call this function!");
|
||||||
|
|
||||||
static const char *cvname = NULL;
|
static consvar_t *this_cvar;
|
||||||
|
|
||||||
void Got_Luacmd(UINT8 **cp, INT32 playernum)
|
static void clear_lua_stack(void)
|
||||||
|
{
|
||||||
|
if (gL) // check if Lua is actually turned on first, you dummmy -- Monster Iestyn 04/07/18
|
||||||
|
lua_settop(gL, 0); // clear stack
|
||||||
|
}
|
||||||
|
|
||||||
|
void Got_Luacmd(const UINT8 **cp, INT32 playernum)
|
||||||
{
|
{
|
||||||
UINT8 i, argc, flags;
|
UINT8 i, argc, flags;
|
||||||
|
const char *argv[256];
|
||||||
char buf[256];
|
char buf[256];
|
||||||
|
|
||||||
|
argc = READUINT8(*cp);
|
||||||
|
argv[0] = (const char*)*cp;
|
||||||
|
SKIPSTRINGN(*cp, 255);
|
||||||
|
for (i = 1; i < argc; i++)
|
||||||
|
{
|
||||||
|
argv[i] = (const char*)*cp;
|
||||||
|
SKIPSTRINGN(*cp, 255);
|
||||||
|
}
|
||||||
|
|
||||||
// don't use I_Assert here, goto the deny code below
|
// don't use I_Assert here, goto the deny code below
|
||||||
// to clean up and kick people who try nefarious exploits
|
// to clean up and kick people who try nefarious exploits
|
||||||
// like sending random junk lua commands to crash the server
|
// like sending random junk lua commands to crash the server
|
||||||
@@ -47,8 +63,7 @@ void Got_Luacmd(UINT8 **cp, INT32 playernum)
|
|||||||
lua_getfield(gL, LUA_REGISTRYINDEX, "COM_Command"); // push COM_Command
|
lua_getfield(gL, LUA_REGISTRYINDEX, "COM_Command"); // push COM_Command
|
||||||
if (!lua_istable(gL, -1)) goto deny;
|
if (!lua_istable(gL, -1)) goto deny;
|
||||||
|
|
||||||
argc = READUINT8(*cp);
|
strlcpy(buf, argv[0], 255);
|
||||||
READSTRINGN(*cp, buf, 255);
|
|
||||||
strlwr(buf); // must lowercase buffer
|
strlwr(buf); // must lowercase buffer
|
||||||
lua_getfield(gL, -1, buf); // push command info table
|
lua_getfield(gL, -1, buf); // push command info table
|
||||||
if (!lua_istable(gL, -1)) goto deny;
|
if (!lua_istable(gL, -1)) goto deny;
|
||||||
@@ -74,10 +89,17 @@ void Got_Luacmd(UINT8 **cp, INT32 playernum)
|
|||||||
|
|
||||||
lua_remove(gL, -2); // pop command info table
|
lua_remove(gL, -2); // pop command info table
|
||||||
|
|
||||||
|
if (!lua_checkstack(gL, argc)) // player + command arguments
|
||||||
|
{
|
||||||
|
clear_lua_stack();
|
||||||
|
CONS_Alert(CONS_WARNING, "lua command stack overflow from %s (%d, need %d more)\n", player_names[playernum], lua_gettop(gL), argc);
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
LUA_PushUserdata(gL, &players[playernum], META_PLAYER);
|
LUA_PushUserdata(gL, &players[playernum], META_PLAYER);
|
||||||
for (i = 1; i < argc; i++)
|
for (i = 1; i < argc; i++)
|
||||||
{
|
{
|
||||||
READSTRINGN(*cp, buf, 255);
|
strlcpy(buf, argv[i], 255);
|
||||||
lua_pushstring(gL, buf);
|
lua_pushstring(gL, buf);
|
||||||
}
|
}
|
||||||
LUA_Call(gL, (int)argc, 0, 1); // argc is 1-based, so this will cover the player we passed too.
|
LUA_Call(gL, (int)argc, 0, 1); // argc is 1-based, so this will cover the player we passed too.
|
||||||
@@ -88,8 +110,7 @@ void Got_Luacmd(UINT8 **cp, INT32 playernum)
|
|||||||
|
|
||||||
deny:
|
deny:
|
||||||
//must be hacked/buggy client
|
//must be hacked/buggy client
|
||||||
if (gL) // check if Lua is actually turned on first, you dummmy -- Monster Iestyn 04/07/18
|
clear_lua_stack();
|
||||||
lua_settop(gL, 0); // clear stack
|
|
||||||
|
|
||||||
CONS_Alert(CONS_WARNING, M_GetText("Illegal lua command received from %s\n"), player_names[playernum]);
|
CONS_Alert(CONS_WARNING, M_GetText("Illegal lua command received from %s\n"), player_names[playernum]);
|
||||||
if (server)
|
if (server)
|
||||||
@@ -133,7 +154,7 @@ void COM_Lua_f(void)
|
|||||||
{
|
{
|
||||||
if (!splitscreen)
|
if (!splitscreen)
|
||||||
{
|
{
|
||||||
lua_pop(gL, 1); // pop command info table
|
lua_pop(gL, 2); // pop command info table and LUA_GetErrorMessage
|
||||||
return; // can't execute splitscreen command without player 2!
|
return; // can't execute splitscreen command without player 2!
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -178,6 +199,13 @@ void COM_Lua_f(void)
|
|||||||
I_Assert(lua_isfunction(gL, -1));
|
I_Assert(lua_isfunction(gL, -1));
|
||||||
lua_remove(gL, -2); // pop command info table
|
lua_remove(gL, -2); // pop command info table
|
||||||
|
|
||||||
|
if (!lua_checkstack(gL, COM_Argc() + 1))
|
||||||
|
{
|
||||||
|
CONS_Alert(CONS_WARNING, "lua command stack overflow (%d, need %s more)\n", lua_gettop(gL), sizeu1(COM_Argc() + 1));
|
||||||
|
lua_pop(gL, 2); // pop function and LUA_GetErrorMessage
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
LUA_PushUserdata(gL, &players[playernum], META_PLAYER);
|
LUA_PushUserdata(gL, &players[playernum], META_PLAYER);
|
||||||
for (i = 1; i < COM_Argc(); i++)
|
for (i = 1; i < COM_Argc(); i++)
|
||||||
lua_pushstring(gL, COM_Argv(i));
|
lua_pushstring(gL, COM_Argv(i));
|
||||||
@@ -284,16 +312,13 @@ static int lib_comBufInsertText(lua_State *L)
|
|||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
void LUA_CVarChanged(const char *name)
|
void LUA_CVarChanged(void *cvar)
|
||||||
{
|
{
|
||||||
cvname = name;
|
this_cvar = cvar;
|
||||||
}
|
}
|
||||||
|
|
||||||
static void Lua_OnChange(void)
|
static void Lua_OnChange(void)
|
||||||
{
|
{
|
||||||
I_Assert(gL != NULL);
|
|
||||||
I_Assert(cvname != NULL);
|
|
||||||
|
|
||||||
/// \todo Network this! XD_LUAVAR
|
/// \todo Network this! XD_LUAVAR
|
||||||
|
|
||||||
// Why?..
|
// Why?..
|
||||||
@@ -305,13 +330,10 @@ static void Lua_OnChange(void)
|
|||||||
// From CV_OnChange registry field, get the function for this cvar by name.
|
// From CV_OnChange registry field, get the function for this cvar by name.
|
||||||
lua_getfield(gL, LUA_REGISTRYINDEX, "CV_OnChange");
|
lua_getfield(gL, LUA_REGISTRYINDEX, "CV_OnChange");
|
||||||
I_Assert(lua_istable(gL, -1));
|
I_Assert(lua_istable(gL, -1));
|
||||||
lua_getfield(gL, -1, cvname); // get function
|
lua_pushlightuserdata(gL, this_cvar);
|
||||||
|
lua_rawget(gL, -2); // get function
|
||||||
|
|
||||||
// From the CV_Vars registry field, get the cvar's userdata by name.
|
LUA_RawPushUserdata(gL, this_cvar);
|
||||||
lua_getfield(gL, LUA_REGISTRYINDEX, "CV_Vars");
|
|
||||||
I_Assert(lua_istable(gL, -1));
|
|
||||||
lua_getfield(gL, -1, cvname); // get consvar_t* userdata.
|
|
||||||
lua_remove(gL, -2); // pop the CV_Vars table.
|
|
||||||
|
|
||||||
LUA_Call(gL, 1, 0, error_handler_i); // call function(cvar)
|
LUA_Call(gL, 1, 0, error_handler_i); // call function(cvar)
|
||||||
lua_pop(gL, 2); // pop CV_OnChange table and error handler
|
lua_pop(gL, 2); // pop CV_OnChange table and error handler
|
||||||
@@ -329,9 +351,8 @@ static int lib_cvRegisterVar(lua_State *L)
|
|||||||
luaL_checktype(L, 1, LUA_TTABLE);
|
luaL_checktype(L, 1, LUA_TTABLE);
|
||||||
lua_settop(L, 1); // Clear out all other possible arguments, leaving only the first one.
|
lua_settop(L, 1); // Clear out all other possible arguments, leaving only the first one.
|
||||||
NOHUD
|
NOHUD
|
||||||
cvar = lua_newuserdata(L, sizeof(consvar_t));
|
cvar = ZZ_Calloc(sizeof(consvar_t));
|
||||||
luaL_getmetatable(L, META_CVAR);
|
LUA_PushUserdata(L, cvar, META_CVAR);
|
||||||
lua_setmetatable(L, -2);
|
|
||||||
|
|
||||||
#define FIELDERROR(f, e) luaL_error(L, "bad value for " LUA_QL(f) " in table passed to " LUA_QL("CV_RegisterVar") " (%s)", e);
|
#define FIELDERROR(f, e) luaL_error(L, "bad value for " LUA_QL(f) " in table passed to " LUA_QL("CV_RegisterVar") " (%s)", e);
|
||||||
#define TYPEERROR(f, t) FIELDERROR(f, va("%s expected, got %s", lua_typename(L, t), luaL_typename(L, -1)))
|
#define TYPEERROR(f, t) FIELDERROR(f, va("%s expected, got %s", lua_typename(L, t), luaL_typename(L, -1)))
|
||||||
@@ -384,7 +405,7 @@ static int lib_cvRegisterVar(lua_State *L)
|
|||||||
|
|
||||||
lua_getfield(L, LUA_REGISTRYINDEX, "CV_PossibleValue");
|
lua_getfield(L, LUA_REGISTRYINDEX, "CV_PossibleValue");
|
||||||
I_Assert(lua_istable(L, 5));
|
I_Assert(lua_istable(L, 5));
|
||||||
lua_pushvalue(L, 2); // cvar userdata
|
lua_pushlightuserdata(L, cvar);
|
||||||
cvpv = lua_newuserdata(L, sizeof(CV_PossibleValue_t) * (count+1));
|
cvpv = lua_newuserdata(L, sizeof(CV_PossibleValue_t) * (count+1));
|
||||||
lua_rawset(L, 5);
|
lua_rawset(L, 5);
|
||||||
lua_pop(L, 1); // pop CV_PossibleValue registry table
|
lua_pop(L, 1); // pop CV_PossibleValue registry table
|
||||||
@@ -412,13 +433,14 @@ static int lib_cvRegisterVar(lua_State *L)
|
|||||||
TYPEERROR("func", LUA_TFUNCTION)
|
TYPEERROR("func", LUA_TFUNCTION)
|
||||||
lua_getfield(L, LUA_REGISTRYINDEX, "CV_OnChange");
|
lua_getfield(L, LUA_REGISTRYINDEX, "CV_OnChange");
|
||||||
I_Assert(lua_istable(L, 5));
|
I_Assert(lua_istable(L, 5));
|
||||||
|
lua_pushlightuserdata(L, cvar);
|
||||||
lua_pushvalue(L, 4);
|
lua_pushvalue(L, 4);
|
||||||
lua_setfield(L, 5, cvar->name);
|
lua_rawset(L, 5);
|
||||||
lua_pop(L, 1);
|
lua_pop(L, 1);
|
||||||
cvar->func = Lua_OnChange;
|
cvar->func = Lua_OnChange;
|
||||||
}
|
}
|
||||||
else if (((i == 5 && !(cvar->flags & CV_CALL))
|
else if (((i == 5 && !(cvar->flags & CV_CALL))
|
||||||
|| (cvar->flags & CV_CALL && i == 6))
|
|| (cvar->flags & CV_CALL && i == 6))
|
||||||
|| (k && fasticmp(k, "category")))
|
|| (k && fasticmp(k, "category")))
|
||||||
{
|
{
|
||||||
category = lua_isnoneornil(L, 4) ? NULL : lua_tostring(L, 4);
|
category = lua_isnoneornil(L, 4) ? NULL : lua_tostring(L, 4);
|
||||||
@@ -434,18 +456,12 @@ static int lib_cvRegisterVar(lua_State *L)
|
|||||||
#undef FIELDERROR
|
#undef FIELDERROR
|
||||||
#undef TYPEERROR
|
#undef TYPEERROR
|
||||||
|
|
||||||
// stack: cvar table, cvar userdata
|
if (!cvar->name)
|
||||||
lua_getfield(L, LUA_REGISTRYINDEX, "CV_Vars");
|
return luaL_error(L, M_GetText("Variable has no name!\n"));
|
||||||
I_Assert(lua_istable(L, 3));
|
if ((cvar->flags & CV_NOINIT) && !(cvar->flags & CV_CALL))
|
||||||
|
return luaL_error(L, M_GetText("Variable %s has CV_NOINIT without CV_CALL\n"), cvar->name);
|
||||||
lua_getfield(L, 3, cvar->name);
|
if ((cvar->flags & CV_CALL) && !cvar->func)
|
||||||
if (lua_type(L, -1) != LUA_TNIL)
|
return luaL_error(L, M_GetText("Variable %s has CV_CALL without a function\n"), cvar->name);
|
||||||
return luaL_error(L, M_GetText("Variable %s is already defined\n"), cvar->name);
|
|
||||||
lua_pop(L, 1);
|
|
||||||
|
|
||||||
lua_pushvalue(L, 2);
|
|
||||||
lua_setfield(L, 3, cvar->name);
|
|
||||||
lua_pop(L, 1);
|
|
||||||
|
|
||||||
// actually time to register it to the console now! Finally!
|
// actually time to register it to the console now! Finally!
|
||||||
cvar->flags |= CV_MODIFIED;
|
cvar->flags |= CV_MODIFIED;
|
||||||
@@ -477,22 +493,9 @@ static int lib_cvRegisterVar(lua_State *L)
|
|||||||
|
|
||||||
static int lib_cvFindVar(lua_State *L)
|
static int lib_cvFindVar(lua_State *L)
|
||||||
{
|
{
|
||||||
consvar_t *cv;
|
const char *name = luaL_checkstring(L, 1);
|
||||||
if (( cv = CV_FindVar(luaL_checkstring(L,1)) ))
|
LUA_PushUserdata(L, CV_FindVar(name), META_CVAR);
|
||||||
{
|
return 1;
|
||||||
lua_settop(L,1);/* We only want one argument in the stack. */
|
|
||||||
lua_pushlightuserdata(L, cv);/* Now the second value on stack. */
|
|
||||||
luaL_getmetatable(L, META_CVAR);
|
|
||||||
/*
|
|
||||||
The metatable is the last value on the stack, so this
|
|
||||||
applies it to the second value, which is the cvar.
|
|
||||||
*/
|
|
||||||
lua_setmetatable(L,2);
|
|
||||||
lua_pushvalue(L,2);
|
|
||||||
return 1;
|
|
||||||
}
|
|
||||||
else
|
|
||||||
return 0;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
static int CVarSetFunction
|
static int CVarSetFunction
|
||||||
@@ -501,7 +504,7 @@ static int CVarSetFunction
|
|||||||
void (*Set)(consvar_t *, const char *),
|
void (*Set)(consvar_t *, const char *),
|
||||||
void (*SetValue)(consvar_t *, INT32)
|
void (*SetValue)(consvar_t *, INT32)
|
||||||
){
|
){
|
||||||
consvar_t *cvar = (consvar_t *)luaL_checkudata(L, 1, META_CVAR);
|
consvar_t *cvar = *(consvar_t **)luaL_checkudata(L, 1, META_CVAR);
|
||||||
|
|
||||||
switch (lua_type(L, 2))
|
switch (lua_type(L, 2))
|
||||||
{
|
{
|
||||||
@@ -530,7 +533,8 @@ static int lib_cvStealthSet(lua_State *L)
|
|||||||
|
|
||||||
static int lib_cvAddValue(lua_State *L)
|
static int lib_cvAddValue(lua_State *L)
|
||||||
{
|
{
|
||||||
consvar_t *cvar = (consvar_t *)luaL_checkudata(L, 1, META_CVAR);
|
consvar_t *cvar = *(consvar_t **)luaL_checkudata(L, 1, META_CVAR);
|
||||||
|
|
||||||
CV_AddValue(cvar, (INT32)luaL_checknumber(L, 2));
|
CV_AddValue(cvar, (INT32)luaL_checknumber(L, 2));
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
@@ -545,6 +549,7 @@ static int lib_consPrintf(lua_State *L)
|
|||||||
if (n < 2)
|
if (n < 2)
|
||||||
return luaL_error(L, "CONS_Printf requires at least two arguments: player and text.");
|
return luaL_error(L, "CONS_Printf requires at least two arguments: player and text.");
|
||||||
//HUDSAFE
|
//HUDSAFE
|
||||||
|
|
||||||
plr = *((player_t **)luaL_checkudata(L, 1, META_PLAYER));
|
plr = *((player_t **)luaL_checkudata(L, 1, META_PLAYER));
|
||||||
if (!plr)
|
if (!plr)
|
||||||
return LUA_ErrInvalid(L, "player_t");
|
return LUA_ErrInvalid(L, "player_t");
|
||||||
@@ -605,7 +610,7 @@ static int cvar_fields_ref = LUA_NOREF;
|
|||||||
|
|
||||||
static int cvar_get(lua_State *L)
|
static int cvar_get(lua_State *L)
|
||||||
{
|
{
|
||||||
consvar_t *cvar = (consvar_t *)luaL_checkudata(L, 1, META_CVAR);
|
consvar_t *cvar = *(consvar_t **)luaL_checkudata(L, 1, META_CVAR);
|
||||||
enum cvar_e field = Lua_optoption(L, 2, -1, cvar_fields_ref);
|
enum cvar_e field = Lua_optoption(L, 2, -1, cvar_fields_ref);
|
||||||
|
|
||||||
switch (field)
|
switch (field)
|
||||||
|
|||||||
+22
-3
@@ -492,25 +492,37 @@ void LUA_InvalidateMathlibCache(const char *name)
|
|||||||
// Pushes it to the stack and stores it in the registry.
|
// Pushes it to the stack and stores it in the registry.
|
||||||
void LUA_PushUserdata(lua_State *L, void *data, const char *meta)
|
void LUA_PushUserdata(lua_State *L, void *data, const char *meta)
|
||||||
{
|
{
|
||||||
|
if (LUA_RawPushUserdata(L, data) == LPUSHED_NEW)
|
||||||
|
{
|
||||||
|
luaL_getmetatable(L, meta);
|
||||||
|
lua_setmetatable(L, -2);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// Same as LUA_PushUserdata but don't set a metatable yet.
|
||||||
|
lpushed_t LUA_RawPushUserdata(lua_State *L, void *data)
|
||||||
|
{
|
||||||
|
lpushed_t status = LPUSHED_NIL;
|
||||||
|
|
||||||
void **userdata;
|
void **userdata;
|
||||||
|
|
||||||
if (!data) { // push a NULL
|
if (!data) { // push a NULL
|
||||||
lua_pushnil(L);
|
lua_pushnil(L);
|
||||||
return;
|
return status;
|
||||||
}
|
}
|
||||||
|
|
||||||
lua_getfield(L, LUA_REGISTRYINDEX, LREG_VALID);
|
lua_getfield(L, LUA_REGISTRYINDEX, LREG_VALID);
|
||||||
I_Assert(lua_istable(L, -1));
|
I_Assert(lua_istable(L, -1));
|
||||||
|
|
||||||
lua_pushlightuserdata(L, data);
|
lua_pushlightuserdata(L, data);
|
||||||
lua_rawget(L, -2);
|
lua_rawget(L, -2);
|
||||||
|
|
||||||
if (lua_isnil(L, -1)) { // no userdata? deary me, we'll have to make one.
|
if (lua_isnil(L, -1)) { // no userdata? deary me, we'll have to make one.
|
||||||
lua_pop(L, 1); // pop the nil
|
lua_pop(L, 1); // pop the nil
|
||||||
|
|
||||||
// create the userdata
|
// create the userdata
|
||||||
userdata = lua_newuserdata(L, sizeof(void *));
|
userdata = lua_newuserdata(L, sizeof(void *));
|
||||||
*userdata = data;
|
*userdata = data;
|
||||||
luaL_getmetatable(L, meta);
|
|
||||||
lua_setmetatable(L, -2);
|
|
||||||
|
|
||||||
// Set it in the registry so we can find it again
|
// Set it in the registry so we can find it again
|
||||||
lua_pushlightuserdata(L, data); // k (store the userdata via the data's pointer)
|
lua_pushlightuserdata(L, data); // k (store the userdata via the data's pointer)
|
||||||
@@ -518,8 +530,15 @@ void LUA_PushUserdata(lua_State *L, void *data, const char *meta)
|
|||||||
lua_rawset(L, -4);
|
lua_rawset(L, -4);
|
||||||
|
|
||||||
// stack is left with the userdata on top, as if getting it had originally succeeded.
|
// stack is left with the userdata on top, as if getting it had originally succeeded.
|
||||||
|
|
||||||
|
status = LPUSHED_NEW;
|
||||||
}
|
}
|
||||||
|
else
|
||||||
|
status = LPUSHED_EXISTING;
|
||||||
|
|
||||||
lua_remove(L, -2); // remove LREG_VALID
|
lua_remove(L, -2); // remove LREG_VALID
|
||||||
|
|
||||||
|
return status;
|
||||||
}
|
}
|
||||||
|
|
||||||
// When userdata is freed, use this function to remove it from Lua.
|
// When userdata is freed, use this function to remove it from Lua.
|
||||||
|
|||||||
+10
-2
@@ -59,7 +59,15 @@ fixed_t LUA_GetConstant(const char *word);
|
|||||||
// Need better name for this ;-;
|
// Need better name for this ;-;
|
||||||
void LUA_InvalidateMathlibCache(const char *name);
|
void LUA_InvalidateMathlibCache(const char *name);
|
||||||
|
|
||||||
|
typedef enum {
|
||||||
|
LPUSHED_NIL,
|
||||||
|
LPUSHED_NEW,
|
||||||
|
LPUSHED_EXISTING,
|
||||||
|
} lpushed_t;
|
||||||
|
|
||||||
void LUA_PushUserdata(lua_State *L, void *data, const char *meta);
|
void LUA_PushUserdata(lua_State *L, void *data, const char *meta);
|
||||||
|
lpushed_t LUA_RawPushUserdata(lua_State *L, void *data);
|
||||||
|
|
||||||
void LUA_InvalidateUserdata(void *data);
|
void LUA_InvalidateUserdata(void *data);
|
||||||
void LUA_InvalidateLevel(void);
|
void LUA_InvalidateLevel(void);
|
||||||
void LUA_InvalidateMapthings(void);
|
void LUA_InvalidateMapthings(void);
|
||||||
@@ -68,8 +76,8 @@ void LUA_InvalidatePlayer(player_t *player);
|
|||||||
void LUA_Archive(savebuffer_t *save, boolean network);
|
void LUA_Archive(savebuffer_t *save, boolean network);
|
||||||
void LUA_UnArchive(savebuffer_t *save, boolean network);
|
void LUA_UnArchive(savebuffer_t *save, boolean network);
|
||||||
|
|
||||||
void Got_Luacmd(UINT8 **cp, INT32 playernum); // lua_consolelib.c
|
void Got_Luacmd(const UINT8 **cp, INT32 playernum); // lua_consolelib.c
|
||||||
void LUA_CVarChanged(const char *name); // lua_consolelib.c
|
void LUA_CVarChanged(void *cvar); // lua_consolelib.c
|
||||||
int Lua_optoption(lua_State *L, int narg, int def, int list_ref);
|
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);
|
||||||
|
|||||||
@@ -192,7 +192,7 @@ lzf_decompress (const void *const in_data, size_t in_len,
|
|||||||
#endif
|
#endif
|
||||||
|
|
||||||
#if USE_MEMCPY
|
#if USE_MEMCPY
|
||||||
M_Memcpy (op, ip, ctrl);
|
memcpy(op, ip, ctrl);
|
||||||
op += ctrl;
|
op += ctrl;
|
||||||
ip += ctrl;
|
ip += ctrl;
|
||||||
#else
|
#else
|
||||||
@@ -435,7 +435,7 @@ lzf_compress (const void *const in_data,size_t in_len,
|
|||||||
|
|
||||||
*op++ = MAX_LIT - 1;
|
*op++ = MAX_LIT - 1;
|
||||||
#if USE_MEMCPY
|
#if USE_MEMCPY
|
||||||
M_Memcpy (op, ip - MAX_LIT, MAX_LIT);
|
memcpy(op, ip - MAX_LIT, MAX_LIT);
|
||||||
op += MAX_LIT;
|
op += MAX_LIT;
|
||||||
lit = 0;
|
lit = 0;
|
||||||
#else
|
#else
|
||||||
|
|||||||
+3
-3
@@ -101,7 +101,7 @@ vector2_t *FV2_UnLoad(vector2_t *vec, fixed_t *x, fixed_t *y)
|
|||||||
|
|
||||||
vector2_t *FV2_Copy(vector2_t *a_o, const vector2_t *a_i)
|
vector2_t *FV2_Copy(vector2_t *a_o, const vector2_t *a_i)
|
||||||
{
|
{
|
||||||
return M_Memcpy(a_o, a_i, sizeof(vector2_t));
|
return memcpy(a_o, a_i, sizeof(vector2_t));
|
||||||
}
|
}
|
||||||
|
|
||||||
vector2_t *FV2_AddEx(const vector2_t *a_i, const vector2_t *a_c, vector2_t *a_o)
|
vector2_t *FV2_AddEx(const vector2_t *a_i, const vector2_t *a_c, vector2_t *a_o)
|
||||||
@@ -250,7 +250,7 @@ vector3_t *FV3_UnLoad(vector3_t *vec, fixed_t *x, fixed_t *y, fixed_t *z)
|
|||||||
|
|
||||||
vector3_t *FV3_Copy(vector3_t *a_o, const vector3_t *a_i)
|
vector3_t *FV3_Copy(vector3_t *a_o, const vector3_t *a_i)
|
||||||
{
|
{
|
||||||
return M_Memcpy(a_o, a_i, sizeof(vector3_t));
|
return memcpy(a_o, a_i, sizeof(vector3_t));
|
||||||
}
|
}
|
||||||
|
|
||||||
vector3_t *FV3_AddEx(const vector3_t *a_i, const vector3_t *a_c, vector3_t *a_o)
|
vector3_t *FV3_AddEx(const vector3_t *a_i, const vector3_t *a_c, vector3_t *a_o)
|
||||||
@@ -813,7 +813,7 @@ void FM_MultMatrix(matrix_t *dest, const matrix_t *multme)
|
|||||||
R(i, j) = FixedMul(D(i, 0), M(0, j)) + FixedMul(D(i, 1), M(1, j)) + FixedMul(D(i, 2), M(2, j)) + FixedMul(D(i, 3), M(3, j));
|
R(i, j) = FixedMul(D(i, 0), M(0, j)) + FixedMul(D(i, 1), M(1, j)) + FixedMul(D(i, 2), M(2, j)) + FixedMul(D(i, 3), M(3, j));
|
||||||
}
|
}
|
||||||
|
|
||||||
M_Memcpy(dest, &result, sizeof(matrix_t));
|
memcpy(dest, &result, sizeof(matrix_t));
|
||||||
|
|
||||||
#undef R
|
#undef R
|
||||||
#undef D
|
#undef D
|
||||||
|
|||||||
+44
-30
@@ -818,26 +818,31 @@ static menuitem_t OP_VideoOptionsMenu[] =
|
|||||||
#if defined (__unix__) || defined (UNIXCOMMON) || defined (HAVE_SDL)
|
#if defined (__unix__) || defined (UNIXCOMMON) || defined (HAVE_SDL)
|
||||||
{IT_STRING|IT_CVAR, NULL, "Fullscreen", &cv_fullscreen, 20},
|
{IT_STRING|IT_CVAR, NULL, "Fullscreen", &cv_fullscreen, 20},
|
||||||
#endif
|
#endif
|
||||||
|
#ifdef BACKWARDSCOMPATCORRECTION
|
||||||
{IT_STRING | IT_CVAR | IT_CV_SLIDER,
|
{IT_STRING | IT_CVAR | IT_CV_SLIDER,
|
||||||
NULL, "Brightness", &cv_globalgamma, 30},
|
NULL, "Gamma", &cv_globalgamma, 30},
|
||||||
|
|
||||||
{IT_STRING | IT_CVAR | IT_CV_SLIDER,
|
|
||||||
NULL, "Saturation", &cv_globalsaturation , 40},
|
|
||||||
|
|
||||||
{IT_SUBMENU|IT_STRING, NULL, "Advanced Color Settings...", &OP_ColorOptionsDef, 50},
|
|
||||||
|
|
||||||
{IT_STRING | IT_CVAR, NULL, "Draw Distance", &cv_drawdist, 65},
|
|
||||||
{IT_STRING | IT_CVAR, NULL, "Weather Draw Distance", &cv_drawdist_precip, 75},
|
|
||||||
|
|
||||||
{IT_STRING | IT_CVAR, NULL, "Show FPS", &cv_ticrate, 95},
|
|
||||||
{IT_STRING | IT_CVAR, NULL, "Vertical Sync", &cv_vidwait, 105},
|
|
||||||
{IT_STRING | IT_CVAR, NULL, "FPS Cap", &cv_fpscap, 115},
|
|
||||||
{IT_STRING | IT_CVAR, NULL, "Drift spark pulse size", &cv_driftsparkpulse, 125},
|
|
||||||
{IT_STRING | IT_CVAR, NULL, "VHS effect", &cv_vhseffect, 135},
|
|
||||||
#ifdef HWRENDER
|
|
||||||
{IT_SUBMENU|IT_STRING, NULL, "OpenGL Options...", &OP_OpenGLOptionsDef, 145},
|
|
||||||
#endif
|
#endif
|
||||||
{IT_SUBMENU|IT_STRING, NULL, "Advanced Video Options...", &OP_ExpOptionsDef, 155},
|
|
||||||
|
{IT_STRING | IT_CVAR | IT_CV_SLIDER,
|
||||||
|
NULL, "Brightness", &cv_globalbrightness, 40},
|
||||||
|
|
||||||
|
{IT_STRING | IT_CVAR | IT_CV_SLIDER,
|
||||||
|
NULL, "Saturation", &cv_globalsaturation , 50},
|
||||||
|
|
||||||
|
{IT_SUBMENU|IT_STRING, NULL, "Advanced Color Settings...", &OP_ColorOptionsDef, 60},
|
||||||
|
|
||||||
|
{IT_STRING | IT_CVAR, NULL, "Draw Distance", &cv_drawdist, 75},
|
||||||
|
{IT_STRING | IT_CVAR, NULL, "Weather Draw Distance", &cv_drawdist_precip, 85},
|
||||||
|
|
||||||
|
{IT_STRING | IT_CVAR, NULL, "Show FPS", &cv_ticrate, 105},
|
||||||
|
{IT_STRING | IT_CVAR, NULL, "Vertical Sync", &cv_vidwait, 115},
|
||||||
|
{IT_STRING | IT_CVAR, NULL, "FPS Cap", &cv_fpscap, 125},
|
||||||
|
{IT_STRING | IT_CVAR, NULL, "Drift spark pulse size", &cv_driftsparkpulse, 135},
|
||||||
|
{IT_STRING | IT_CVAR, NULL, "VHS effect", &cv_vhseffect, 145},
|
||||||
|
#ifdef HWRENDER
|
||||||
|
{IT_SUBMENU|IT_STRING, NULL, "OpenGL Options...", &OP_OpenGLOptionsDef, 155},
|
||||||
|
#endif
|
||||||
|
{IT_SUBMENU|IT_STRING, NULL, "Advanced Video Options...", &OP_ExpOptionsDef, 165},
|
||||||
};
|
};
|
||||||
|
|
||||||
static const char* OP_VideoTooltips[] =
|
static const char* OP_VideoTooltips[] =
|
||||||
@@ -846,11 +851,12 @@ static const char* OP_VideoTooltips[] =
|
|||||||
#if defined (__unix__) || defined (UNIXCOMMON) || defined (HAVE_SDL)
|
#if defined (__unix__) || defined (UNIXCOMMON) || defined (HAVE_SDL)
|
||||||
"Enable fullscreen.",
|
"Enable fullscreen.",
|
||||||
#endif
|
#endif
|
||||||
"Gamma (brightness) of the game.",
|
"Increase the gamma of the displayed image.",
|
||||||
"Saturation of the game.",
|
"Increase or decrease the brightness of the displayed image.",
|
||||||
|
"Reduce the saturation of the displayed image.",
|
||||||
"Advanced color settings of the game.",
|
"Advanced color settings of the game.",
|
||||||
"How far away objects are drawn.",
|
"How far objects can be drawn.",
|
||||||
"How far away weather is drawn.",
|
"Affects how far weather visuals can be drawn.",
|
||||||
"Show current game framerate and select the style.",
|
"Show current game framerate and select the style.",
|
||||||
"Sync game framerate to refresh rate of monitor.",
|
"Sync game framerate to refresh rate of monitor.",
|
||||||
"Set manual framerate cap.",
|
"Set manual framerate cap.",
|
||||||
@@ -869,7 +875,10 @@ enum
|
|||||||
#if defined (__unix__) || defined (UNIXCOMMON) || defined (HAVE_SDL)
|
#if defined (__unix__) || defined (UNIXCOMMON) || defined (HAVE_SDL)
|
||||||
op_video_fullscreen,
|
op_video_fullscreen,
|
||||||
#endif
|
#endif
|
||||||
|
#ifdef BACKWARDSCOMPATCORRECTION
|
||||||
op_video_gamma,
|
op_video_gamma,
|
||||||
|
#endif
|
||||||
|
op_video_bright,
|
||||||
op_video_sat,
|
op_video_sat,
|
||||||
op_video_color,
|
op_video_color,
|
||||||
op_video_dd,
|
op_video_dd,
|
||||||
@@ -898,37 +907,37 @@ static menuitem_t OP_ColorOptionsMenu[] =
|
|||||||
{IT_DISABLED, NULL, NULL, NULL, 35},
|
{IT_DISABLED, NULL, NULL, NULL, 35},
|
||||||
{IT_STRING | IT_CVAR | IT_CV_SLIDER, NULL, "Hue", &cv_rhue, 15},
|
{IT_STRING | IT_CVAR | IT_CV_SLIDER, NULL, "Hue", &cv_rhue, 15},
|
||||||
{IT_STRING | IT_CVAR | IT_CV_SLIDER, NULL, "Saturation", &cv_rsaturation, 20},
|
{IT_STRING | IT_CVAR | IT_CV_SLIDER, NULL, "Saturation", &cv_rsaturation, 20},
|
||||||
{IT_STRING | IT_CVAR | IT_CV_SLIDER, NULL, "Brightness", &cv_rgamma, 25},
|
{IT_STRING | IT_CVAR | IT_CV_SLIDER, NULL, "Brightness", &cv_rbrightness, 25},
|
||||||
|
|
||||||
{IT_HEADER, NULL, "Yellow", NULL, 34},
|
{IT_HEADER, NULL, "Yellow", NULL, 34},
|
||||||
{IT_DISABLED, NULL, NULL, NULL, 73},
|
{IT_DISABLED, NULL, NULL, NULL, 73},
|
||||||
{IT_STRING | IT_CVAR | IT_CV_SLIDER, NULL, "Hue", &cv_yhue, 40},
|
{IT_STRING | IT_CVAR | IT_CV_SLIDER, NULL, "Hue", &cv_yhue, 40},
|
||||||
{IT_STRING | IT_CVAR | IT_CV_SLIDER, NULL, "Saturation", &cv_ysaturation, 45},
|
{IT_STRING | IT_CVAR | IT_CV_SLIDER, NULL, "Saturation", &cv_ysaturation, 45},
|
||||||
{IT_STRING | IT_CVAR | IT_CV_SLIDER, NULL, "Brightness", &cv_ygamma, 50},
|
{IT_STRING | IT_CVAR | IT_CV_SLIDER, NULL, "Brightness", &cv_ybrightness, 50},
|
||||||
|
|
||||||
{IT_HEADER, NULL, "Green", NULL, 59},
|
{IT_HEADER, NULL, "Green", NULL, 59},
|
||||||
{IT_DISABLED, NULL, NULL, NULL, 112},
|
{IT_DISABLED, NULL, NULL, NULL, 112},
|
||||||
{IT_STRING | IT_CVAR | IT_CV_SLIDER, NULL, "Hue", &cv_ghue, 65},
|
{IT_STRING | IT_CVAR | IT_CV_SLIDER, NULL, "Hue", &cv_ghue, 65},
|
||||||
{IT_STRING | IT_CVAR | IT_CV_SLIDER, NULL, "Saturation", &cv_gsaturation, 70},
|
{IT_STRING | IT_CVAR | IT_CV_SLIDER, NULL, "Saturation", &cv_gsaturation, 70},
|
||||||
{IT_STRING | IT_CVAR | IT_CV_SLIDER, NULL, "Brightness", &cv_ggamma, 75},
|
{IT_STRING | IT_CVAR | IT_CV_SLIDER, NULL, "Brightness", &cv_gbrightness, 75},
|
||||||
|
|
||||||
{IT_HEADER, NULL, "Cyan", NULL, 84},
|
{IT_HEADER, NULL, "Cyan", NULL, 84},
|
||||||
{IT_DISABLED, NULL, NULL, NULL, 255},
|
{IT_DISABLED, NULL, NULL, NULL, 255},
|
||||||
{IT_STRING | IT_CVAR | IT_CV_SLIDER, NULL, "Hue", &cv_chue, 90},
|
{IT_STRING | IT_CVAR | IT_CV_SLIDER, NULL, "Hue", &cv_chue, 90},
|
||||||
{IT_STRING | IT_CVAR | IT_CV_SLIDER, NULL, "Saturation", &cv_csaturation, 95},
|
{IT_STRING | IT_CVAR | IT_CV_SLIDER, NULL, "Saturation", &cv_csaturation, 95},
|
||||||
{IT_STRING | IT_CVAR | IT_CV_SLIDER, NULL, "Brightness", &cv_cgamma, 100},
|
{IT_STRING | IT_CVAR | IT_CV_SLIDER, NULL, "Brightness", &cv_cbrightness, 100},
|
||||||
|
|
||||||
{IT_HEADER, NULL, "Blue", NULL, 109},
|
{IT_HEADER, NULL, "Blue", NULL, 109},
|
||||||
{IT_DISABLED, NULL, NULL, NULL, 152},
|
{IT_DISABLED, NULL, NULL, NULL, 152},
|
||||||
{IT_STRING | IT_CVAR | IT_CV_SLIDER, NULL, "Hue", &cv_bhue, 115},
|
{IT_STRING | IT_CVAR | IT_CV_SLIDER, NULL, "Hue", &cv_bhue, 115},
|
||||||
{IT_STRING | IT_CVAR | IT_CV_SLIDER, NULL, "Saturation", &cv_bsaturation, 120},
|
{IT_STRING | IT_CVAR | IT_CV_SLIDER, NULL, "Saturation", &cv_bsaturation, 120},
|
||||||
{IT_STRING | IT_CVAR | IT_CV_SLIDER, NULL, "Brightness", &cv_bgamma, 125},
|
{IT_STRING | IT_CVAR | IT_CV_SLIDER, NULL, "Brightness", &cv_bbrightness, 125},
|
||||||
|
|
||||||
{IT_HEADER, NULL, "Magenta", NULL, 134},
|
{IT_HEADER, NULL, "Magenta", NULL, 134},
|
||||||
{IT_DISABLED, NULL, NULL, NULL, 181},
|
{IT_DISABLED, NULL, NULL, NULL, 181},
|
||||||
{IT_STRING | IT_CVAR | IT_CV_SLIDER, NULL, "Hue", &cv_mhue, 140},
|
{IT_STRING | IT_CVAR | IT_CV_SLIDER, NULL, "Hue", &cv_mhue, 140},
|
||||||
{IT_STRING | IT_CVAR | IT_CV_SLIDER, NULL, "Saturation", &cv_msaturation, 145},
|
{IT_STRING | IT_CVAR | IT_CV_SLIDER, NULL, "Saturation", &cv_msaturation, 145},
|
||||||
{IT_STRING | IT_CVAR | IT_CV_SLIDER, NULL, "Brightness", &cv_mgamma, 150},
|
{IT_STRING | IT_CVAR | IT_CV_SLIDER, NULL, "Brightness", &cv_mbrightness, 150},
|
||||||
};
|
};
|
||||||
|
|
||||||
static menuitem_t OP_ExpOptionsMenu[] =
|
static menuitem_t OP_ExpOptionsMenu[] =
|
||||||
@@ -1153,8 +1162,10 @@ static menuitem_t OP_SoundAdvancedMenu[] =
|
|||||||
{IT_STRING | IT_CVAR, NULL, "Keep Map Music", &cv_keepmusic, 80},
|
{IT_STRING | IT_CVAR, NULL, "Keep Map Music", &cv_keepmusic, 80},
|
||||||
{IT_STRING | IT_CVAR, NULL, "Skip Intro Music", &cv_skipintromusic, 85},
|
{IT_STRING | IT_CVAR, NULL, "Skip Intro Music", &cv_skipintromusic, 85},
|
||||||
|
|
||||||
{IT_STRING | IT_CVAR, NULL, "Audio Buffer Size", &cv_audbuffersize, 90},
|
{IT_STRING | IT_CVAR, NULL, "Cache Sound", &cv_cachesound, 90},
|
||||||
{IT_DISABLED, NULL, "", NULL, 100}, // dummy text
|
|
||||||
|
{IT_STRING | IT_CVAR, NULL, "Audio Buffer Size", &cv_audbuffersize, 95},
|
||||||
|
{IT_DISABLED, NULL, "", NULL, 105}, // dummy text
|
||||||
};
|
};
|
||||||
|
|
||||||
static const char* OP_SoundAdvancedTooltips[] =
|
static const char* OP_SoundAdvancedTooltips[] =
|
||||||
@@ -1175,7 +1186,10 @@ static const char* OP_SoundAdvancedTooltips[] =
|
|||||||
"Should the Invulnerability music be on or off?",
|
"Should the Invulnerability music be on or off?",
|
||||||
"Should music be kept when restarting the map?",
|
"Should music be kept when restarting the map?",
|
||||||
"Should the Intro fanfare be skipped\nand map music be played on map start?",
|
"Should the Intro fanfare be skipped\nand map music be played on map start?",
|
||||||
|
"Controls Sound effects caching.\nKeep will retain previously played sound effects in cache." // man idk how to describe this in a non awful way lmao
|
||||||
|
"\nOn will preload all sound effects.\nEliminates sound-related lag and stutters but increases memory usage.",
|
||||||
"Size of the Audio Buffer\nreducing it will result in less sound latency\nbut may cause issues such as crackling or distorted Sound.",
|
"Size of the Audio Buffer\nreducing it will result in less sound latency\nbut may cause issues such as crackling or distorted Sound.",
|
||||||
|
NULL,
|
||||||
};
|
};
|
||||||
|
|
||||||
static menuitem_t OP_FocusOptionsMenu[] =
|
static menuitem_t OP_FocusOptionsMenu[] =
|
||||||
|
|||||||
+1
-1
@@ -1686,7 +1686,7 @@ char *M_GetToken(const char *inputString)
|
|||||||
// Assign the memory. Don't forget an extra byte for the end of the string!
|
// Assign the memory. Don't forget an extra byte for the end of the string!
|
||||||
texturesToken = (char *)Z_Malloc((texturesTokenLength+1)*sizeof(char),PU_STATIC,NULL);
|
texturesToken = (char *)Z_Malloc((texturesTokenLength+1)*sizeof(char),PU_STATIC,NULL);
|
||||||
// Copy the string.
|
// Copy the string.
|
||||||
M_Memcpy(texturesToken, stringToUse+startPos, (size_t)texturesTokenLength);
|
memcpy(texturesToken, stringToUse+startPos, (size_t)texturesTokenLength);
|
||||||
// Make the final character NUL.
|
// Make the final character NUL.
|
||||||
texturesToken[texturesTokenLength] = '\0';
|
texturesToken[texturesTokenLength] = '\0';
|
||||||
return texturesToken;
|
return texturesToken;
|
||||||
|
|||||||
+6
-6
@@ -945,9 +945,9 @@ void A_PointyThink(void *thing)
|
|||||||
v[3] = FRACUNIT;
|
v[3] = FRACUNIT;
|
||||||
|
|
||||||
res = VectorMatrixMultiply(v, *RotateXMatrix(FixedAngle(actor->lastlook+i)));
|
res = VectorMatrixMultiply(v, *RotateXMatrix(FixedAngle(actor->lastlook+i)));
|
||||||
M_Memcpy(&v, res, sizeof (v));
|
memcpy(&v, res, sizeof (v));
|
||||||
res = VectorMatrixMultiply(v, *RotateZMatrix(actor->angle+ANGLE_180));
|
res = VectorMatrixMultiply(v, *RotateZMatrix(actor->angle+ANGLE_180));
|
||||||
M_Memcpy(&v, res, sizeof (v));
|
memcpy(&v, res, sizeof (v));
|
||||||
|
|
||||||
P_UnsetThingPosition(ball);
|
P_UnsetThingPosition(ball);
|
||||||
ball->x = actor->x + v[0];
|
ball->x = actor->x + v[0];
|
||||||
@@ -4929,9 +4929,9 @@ void A_MaceRotate(void *thing)
|
|||||||
|
|
||||||
// Calculate the angle matrixes for the link.
|
// Calculate the angle matrixes for the link.
|
||||||
res = VectorMatrixMultiply(v, *RotateXMatrix(FixedAngle(actor->threshold)));
|
res = VectorMatrixMultiply(v, *RotateXMatrix(FixedAngle(actor->threshold)));
|
||||||
M_Memcpy(&v, res, sizeof(v));
|
memcpy(&v, res, sizeof(v));
|
||||||
res = VectorMatrixMultiply(v, *RotateZMatrix(actor->target->health << ANGLETOFINESHIFT));
|
res = VectorMatrixMultiply(v, *RotateZMatrix(actor->target->health << ANGLETOFINESHIFT));
|
||||||
M_Memcpy(&v, res, sizeof(v));
|
memcpy(&v, res, sizeof(v));
|
||||||
}
|
}
|
||||||
// Rotating Chain.
|
// Rotating Chain.
|
||||||
else
|
else
|
||||||
@@ -4950,9 +4950,9 @@ void A_MaceRotate(void *thing)
|
|||||||
|
|
||||||
// Calculate the angle matrixes for the link.
|
// Calculate the angle matrixes for the link.
|
||||||
res = VectorMatrixMultiply(v, *RotateXMatrix(actor->target->threshold << ANGLETOFINESHIFT));
|
res = VectorMatrixMultiply(v, *RotateXMatrix(actor->target->threshold << ANGLETOFINESHIFT));
|
||||||
M_Memcpy(&v, res, sizeof(v));
|
memcpy(&v, res, sizeof(v));
|
||||||
res = VectorMatrixMultiply(v, *RotateZMatrix(actor->target->health << ANGLETOFINESHIFT));
|
res = VectorMatrixMultiply(v, *RotateZMatrix(actor->target->health << ANGLETOFINESHIFT));
|
||||||
M_Memcpy(&v, res, sizeof(v));
|
memcpy(&v, res, sizeof(v));
|
||||||
}
|
}
|
||||||
|
|
||||||
// Add on the appropriate distances to the actor's co-ordinates.
|
// Add on the appropriate distances to the actor's co-ordinates.
|
||||||
|
|||||||
+8
-8
@@ -5459,9 +5459,9 @@ static void P_MoveHoop(mobj_t *mobj)
|
|||||||
v[3] = FRACUNIT;
|
v[3] = FRACUNIT;
|
||||||
|
|
||||||
res = VectorMatrixMultiply(v, *RotateXMatrix(FixedAngle(mobj->target->movedir*FRACUNIT)));
|
res = VectorMatrixMultiply(v, *RotateXMatrix(FixedAngle(mobj->target->movedir*FRACUNIT)));
|
||||||
M_Memcpy(&v, res, sizeof (v));
|
memcpy(&v, res, sizeof (v));
|
||||||
res = VectorMatrixMultiply(v, *RotateZMatrix(FixedAngle(mobj->target->movecount*FRACUNIT)));
|
res = VectorMatrixMultiply(v, *RotateZMatrix(FixedAngle(mobj->target->movecount*FRACUNIT)));
|
||||||
M_Memcpy(&v, res, sizeof (v));
|
memcpy(&v, res, sizeof (v));
|
||||||
|
|
||||||
finalx = x + v[0];
|
finalx = x + v[0];
|
||||||
finaly = y + v[1];
|
finaly = y + v[1];
|
||||||
@@ -5527,9 +5527,9 @@ void P_SpawnHoopOfSomething(fixed_t x, fixed_t y, fixed_t z, fixed_t radius, INT
|
|||||||
v[3] = FRACUNIT;
|
v[3] = FRACUNIT;
|
||||||
|
|
||||||
res = VectorMatrixMultiply(v, *RotateXMatrix(rotangle));
|
res = VectorMatrixMultiply(v, *RotateXMatrix(rotangle));
|
||||||
M_Memcpy(&v, res, sizeof (v));
|
memcpy(&v, res, sizeof (v));
|
||||||
res = VectorMatrixMultiply(v, *RotateZMatrix(closestangle));
|
res = VectorMatrixMultiply(v, *RotateZMatrix(closestangle));
|
||||||
M_Memcpy(&v, res, sizeof (v));
|
memcpy(&v, res, sizeof (v));
|
||||||
|
|
||||||
finalx = x + v[0];
|
finalx = x + v[0];
|
||||||
finaly = y + v[1];
|
finaly = y + v[1];
|
||||||
@@ -5566,9 +5566,9 @@ void P_SpawnParaloop(fixed_t x, fixed_t y, fixed_t z, fixed_t radius, INT32 numb
|
|||||||
v[3] = FRACUNIT;
|
v[3] = FRACUNIT;
|
||||||
|
|
||||||
res = VectorMatrixMultiply(v, *RotateXMatrix(rotangle));
|
res = VectorMatrixMultiply(v, *RotateXMatrix(rotangle));
|
||||||
M_Memcpy(&v, res, sizeof (v));
|
memcpy(&v, res, sizeof (v));
|
||||||
res = VectorMatrixMultiply(v, *RotateZMatrix(closestangle));
|
res = VectorMatrixMultiply(v, *RotateZMatrix(closestangle));
|
||||||
M_Memcpy(&v, res, sizeof (v));
|
memcpy(&v, res, sizeof (v));
|
||||||
|
|
||||||
finalx = x + v[0];
|
finalx = x + v[0];
|
||||||
finaly = y + v[1];
|
finaly = y + v[1];
|
||||||
@@ -11815,9 +11815,9 @@ static void P_SpawnNiGHTSHoop(fixed_t x, fixed_t y, fixed_t z, fixed_t hoopsize,
|
|||||||
v[3] = FRACUNIT;
|
v[3] = FRACUNIT;
|
||||||
|
|
||||||
res = VectorMatrixMultiply(v, *RotateXMatrix(FixedAngle(spewangle)));
|
res = VectorMatrixMultiply(v, *RotateXMatrix(FixedAngle(spewangle)));
|
||||||
M_Memcpy(&v, res, sizeof (v));
|
memcpy(&v, res, sizeof (v));
|
||||||
res = VectorMatrixMultiply(v, *RotateZMatrix(closestangle));
|
res = VectorMatrixMultiply(v, *RotateZMatrix(closestangle));
|
||||||
M_Memcpy(&v, res, sizeof (v));
|
memcpy(&v, res, sizeof (v));
|
||||||
|
|
||||||
mobj = P_SpawnMobj(x + v[0], y + v[1], z + v[2], type);
|
mobj = P_SpawnMobj(x + v[0], y + v[1], z + v[2], type);
|
||||||
|
|
||||||
|
|||||||
+4
-26
@@ -1203,7 +1203,7 @@ static void SaveMobjThinker(savebuffer_t *save, const thinker_t *th, const UINT8
|
|||||||
if (diff & MD_MORE)
|
if (diff & MD_MORE)
|
||||||
WRITEUINT16(save->p, diff2);
|
WRITEUINT16(save->p, diff2);
|
||||||
|
|
||||||
// save pointer, at load time we will search this pointer to reinitilize pointers
|
// keep here for vanilla compat
|
||||||
WRITEUINT32(save->p, (size_t)mobj);
|
WRITEUINT32(save->p, (size_t)mobj);
|
||||||
|
|
||||||
WRITEFIXED(save->p, mobj->z); // Force this so 3dfloor problems don't arise.
|
WRITEFIXED(save->p, mobj->z); // Force this so 3dfloor problems don't arise.
|
||||||
@@ -1982,7 +1982,6 @@ static void CalculateDoomednumToMobjtype(void)
|
|||||||
|
|
||||||
static void LoadMobjThinker(savebuffer_t *save, actionf_p1 thinker)
|
static void LoadMobjThinker(savebuffer_t *save, actionf_p1 thinker)
|
||||||
{
|
{
|
||||||
thinker_t *next;
|
|
||||||
mobj_t *mobj;
|
mobj_t *mobj;
|
||||||
UINT32 diff;
|
UINT32 diff;
|
||||||
UINT16 diff2;
|
UINT16 diff2;
|
||||||
@@ -1995,7 +1994,8 @@ static void LoadMobjThinker(savebuffer_t *save, actionf_p1 thinker)
|
|||||||
else
|
else
|
||||||
diff2 = 0;
|
diff2 = 0;
|
||||||
|
|
||||||
next = (void *)(size_t)READUINT32(save->p);
|
// here for vanilla compat
|
||||||
|
save->p += sizeof(UINT32);
|
||||||
|
|
||||||
z = READFIXED(save->p); // Force this so 3dfloor problems don't arise.
|
z = READFIXED(save->p); // Force this so 3dfloor problems don't arise.
|
||||||
floorz = READFIXED(save->p);
|
floorz = READFIXED(save->p);
|
||||||
@@ -2234,8 +2234,6 @@ static void LoadMobjThinker(savebuffer_t *save, actionf_p1 thinker)
|
|||||||
if (diff2 & MD2_WAYPOINTCAP)
|
if (diff2 & MD2_WAYPOINTCAP)
|
||||||
P_SetTarget(&waypointcap, mobj);
|
P_SetTarget(&waypointcap, mobj);
|
||||||
|
|
||||||
mobj->info = (mobjinfo_t *)next; // temporarily, set when leave this function
|
|
||||||
|
|
||||||
R_AddMobjInterpolator(mobj);
|
R_AddMobjInterpolator(mobj);
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -3200,25 +3198,6 @@ FUNCINLINE static ATTRINLINE void P_UnArchivePolyObjects(savebuffer_t *save)
|
|||||||
for (i = 0; i < numSavedPolys; ++i)
|
for (i = 0; i < numSavedPolys; ++i)
|
||||||
P_UnArchivePolyObj(save, &PolyObjects[i]);
|
P_UnArchivePolyObj(save, &PolyObjects[i]);
|
||||||
}
|
}
|
||||||
//
|
|
||||||
// P_FinishMobjs
|
|
||||||
//
|
|
||||||
FUNCINLINE static ATTRINLINE void P_FinishMobjs(void)
|
|
||||||
{
|
|
||||||
thinker_t *currentthinker;
|
|
||||||
mobj_t *mobj;
|
|
||||||
|
|
||||||
// put info field there real value
|
|
||||||
for (currentthinker = thinkercap.next; currentthinker != &thinkercap;
|
|
||||||
currentthinker = currentthinker->next)
|
|
||||||
{
|
|
||||||
if (currentthinker->function != (actionf_p1)P_MobjThinker)
|
|
||||||
continue;
|
|
||||||
|
|
||||||
mobj = (mobj_t *)currentthinker;
|
|
||||||
mobj->info = &mobjinfo[mobj->type];
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
FUNCINLINE static ATTRINLINE mobj_t *RelinkMobj(mobj_t **ptr)
|
FUNCINLINE static ATTRINLINE mobj_t *RelinkMobj(mobj_t **ptr)
|
||||||
{
|
{
|
||||||
@@ -3793,7 +3772,7 @@ boolean P_LoadGame(savebuffer_t *save, INT16 mapoverride)
|
|||||||
|
|
||||||
boolean P_LoadNetGame(savebuffer_t *save, boolean reloading)
|
boolean P_LoadNetGame(savebuffer_t *save, boolean reloading)
|
||||||
{
|
{
|
||||||
CV_LoadNetVars(&save->p);
|
save->p += CV_LoadNetVars(save->p);
|
||||||
|
|
||||||
if (!P_NetUnArchiveMisc(save, reloading))
|
if (!P_NetUnArchiveMisc(save, reloading))
|
||||||
return false;
|
return false;
|
||||||
@@ -3807,7 +3786,6 @@ boolean P_LoadNetGame(savebuffer_t *save, boolean reloading)
|
|||||||
P_NetUnArchiveThinkers(save);
|
P_NetUnArchiveThinkers(save);
|
||||||
P_NetUnArchiveSpecials(save);
|
P_NetUnArchiveSpecials(save);
|
||||||
P_RelinkPointers();
|
P_RelinkPointers();
|
||||||
P_FinishMobjs();
|
|
||||||
}
|
}
|
||||||
|
|
||||||
LUA_UnArchive(save, true);
|
LUA_UnArchive(save, true);
|
||||||
|
|||||||
+21
-20
@@ -806,7 +806,7 @@ static void P_LoadSectors(UINT8 *data)
|
|||||||
skyflatnum = P_AddLevelFlat(SKYFLATNAME, foundflats);
|
skyflatnum = P_AddLevelFlat(SKYFLATNAME, foundflats);
|
||||||
|
|
||||||
// copy table for global usage
|
// copy table for global usage
|
||||||
levelflats = M_Memcpy(Z_Calloc(numlevelflats * sizeof (*levelflats), PU_LEVEL, NULL), foundflats, numlevelflats * sizeof (levelflat_t));
|
levelflats = memcpy(Z_Calloc(numlevelflats * sizeof (*levelflats), PU_LEVEL, NULL), foundflats, numlevelflats * sizeof (levelflat_t));
|
||||||
free(foundflats);
|
free(foundflats);
|
||||||
|
|
||||||
// search for animated flats and set up
|
// search for animated flats and set up
|
||||||
@@ -1177,10 +1177,10 @@ static void P_LoadLineDefs2(void)
|
|||||||
len += strlen(sides[ld->sidenum[1]].text);
|
len += strlen(sides[ld->sidenum[1]].text);
|
||||||
|
|
||||||
ld->text = Z_Malloc(len, PU_LEVEL, NULL);
|
ld->text = Z_Malloc(len, PU_LEVEL, NULL);
|
||||||
M_Memcpy(ld->text, sides[ld->sidenum[0]].text, strlen(sides[ld->sidenum[0]].text)+1);
|
memcpy(ld->text, sides[ld->sidenum[0]].text, strlen(sides[ld->sidenum[0]].text)+1);
|
||||||
|
|
||||||
if (ld->sidenum[1] != 0xffff && sides[ld->sidenum[1]].text)
|
if (ld->sidenum[1] != 0xffff && sides[ld->sidenum[1]].text)
|
||||||
M_Memcpy(ld->text+strlen(ld->text)+1, sides[ld->sidenum[1]].text, strlen(sides[ld->sidenum[1]].text)+1);
|
memcpy(ld->text+strlen(ld->text)+1, sides[ld->sidenum[1]].text, strlen(sides[ld->sidenum[1]].text)+1);
|
||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
|
|
||||||
@@ -1309,14 +1309,14 @@ static void P_LoadSideChangeMusic(boolean firstside, mapsidedef_t *msd, side_t *
|
|||||||
|
|
||||||
if (msd->bottomtexture[0] != '-' || msd->bottomtexture[1] != '\0')
|
if (msd->bottomtexture[0] != '-' || msd->bottomtexture[1] != '\0')
|
||||||
{
|
{
|
||||||
M_Memcpy(process,msd->bottomtexture,8);
|
memcpy(process,msd->bottomtexture,8);
|
||||||
process[8] = '\0';
|
process[8] = '\0';
|
||||||
sd->bottomtexture = get_number(process);
|
sd->bottomtexture = get_number(process);
|
||||||
}
|
}
|
||||||
|
|
||||||
if (!(msd->midtexture[0] == '-' && msd->midtexture[1] == '\0') || msd->midtexture[1] != '\0')
|
if (!(msd->midtexture[0] == '-' && msd->midtexture[1] == '\0') || msd->midtexture[1] != '\0')
|
||||||
{
|
{
|
||||||
M_Memcpy(process,msd->midtexture,8);
|
memcpy(process,msd->midtexture,8);
|
||||||
process[8] = '\0';
|
process[8] = '\0';
|
||||||
sd->midtexture = get_number(process);
|
sd->midtexture = get_number(process);
|
||||||
}
|
}
|
||||||
@@ -1326,15 +1326,15 @@ static void P_LoadSideChangeMusic(boolean firstside, mapsidedef_t *msd, side_t *
|
|||||||
|
|
||||||
if (firstside || msd->toptexture[0] != '-' || msd->toptexture[1] != '\0')
|
if (firstside || msd->toptexture[0] != '-' || msd->toptexture[1] != '\0')
|
||||||
{
|
{
|
||||||
M_Memcpy(process,msd->toptexture,8);
|
memcpy(process,msd->toptexture,8);
|
||||||
process[8] = '\0';
|
process[8] = '\0';
|
||||||
|
|
||||||
// If they type in O_ or D_ and their music name, just shrug,
|
// If they type in O_ or D_ and their music name, just shrug,
|
||||||
// then copy the rest instead.
|
// then copy the rest instead.
|
||||||
if ((process[0] == 'O' || process[0] == 'D') && process[7])
|
if ((process[0] == 'O' || process[0] == 'D') && process[7])
|
||||||
M_Memcpy(sd->text, process+2, 6);
|
memcpy(sd->text, process+2, 6);
|
||||||
else // Assume it's a proper music name.
|
else // Assume it's a proper music name.
|
||||||
M_Memcpy(sd->text, process, 6);
|
memcpy(sd->text, process, 6);
|
||||||
sd->text[6] = 0;
|
sd->text[6] = 0;
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
@@ -1382,7 +1382,7 @@ static void P_LoadSidedefs(void *data)
|
|||||||
if (msd->toptexture[0] != '-' || msd->toptexture[1] != '\0')
|
if (msd->toptexture[0] != '-' || msd->toptexture[1] != '\0')
|
||||||
{
|
{
|
||||||
char process[8+1];
|
char process[8+1];
|
||||||
M_Memcpy(process,msd->toptexture,8);
|
memcpy(process,msd->toptexture,8);
|
||||||
process[8] = '\0';
|
process[8] = '\0';
|
||||||
sd->toptexture = get_number(process);
|
sd->toptexture = get_number(process);
|
||||||
}
|
}
|
||||||
@@ -1401,11 +1401,11 @@ static void P_LoadSidedefs(void *data)
|
|||||||
if (msd->toptexture[0] == '-' && msd->toptexture[1] == '\0')
|
if (msd->toptexture[0] == '-' && msd->toptexture[1] == '\0')
|
||||||
break;
|
break;
|
||||||
else
|
else
|
||||||
M_Memcpy(process,msd->toptexture,8);
|
memcpy(process,msd->toptexture,8);
|
||||||
if (msd->midtexture[0] != '-' || msd->midtexture[1] != '\0')
|
if (msd->midtexture[0] != '-' || msd->midtexture[1] != '\0')
|
||||||
M_Memcpy(process+strlen(process), msd->midtexture, 8);
|
memcpy(process+strlen(process), msd->midtexture, 8);
|
||||||
if (msd->bottomtexture[0] != '-' || msd->bottomtexture[1] != '\0')
|
if (msd->bottomtexture[0] != '-' || msd->bottomtexture[1] != '\0')
|
||||||
M_Memcpy(process+strlen(process), msd->bottomtexture, 8);
|
memcpy(process+strlen(process), msd->bottomtexture, 8);
|
||||||
sd->toptexture = get_number(process);
|
sd->toptexture = get_number(process);
|
||||||
|
|
||||||
break;
|
break;
|
||||||
@@ -1418,13 +1418,13 @@ static void P_LoadSidedefs(void *data)
|
|||||||
if (msd->toptexture[0] == '-' && msd->toptexture[1] == '\0')
|
if (msd->toptexture[0] == '-' && msd->toptexture[1] == '\0')
|
||||||
break;
|
break;
|
||||||
else
|
else
|
||||||
M_Memcpy(process,msd->toptexture,8);
|
memcpy(process,msd->toptexture,8);
|
||||||
if (msd->midtexture[0] != '-' || msd->midtexture[1] != '\0')
|
if (msd->midtexture[0] != '-' || msd->midtexture[1] != '\0')
|
||||||
M_Memcpy(process+strlen(process), msd->midtexture, 8);
|
memcpy(process+strlen(process), msd->midtexture, 8);
|
||||||
if (msd->bottomtexture[0] != '-' || msd->bottomtexture[1] != '\0')
|
if (msd->bottomtexture[0] != '-' || msd->bottomtexture[1] != '\0')
|
||||||
M_Memcpy(process+strlen(process), msd->bottomtexture, 8);
|
memcpy(process+strlen(process), msd->bottomtexture, 8);
|
||||||
sd->text = Z_Malloc(strlen(process)+1, PU_LEVEL, NULL);
|
sd->text = Z_Malloc(strlen(process)+1, PU_LEVEL, NULL);
|
||||||
M_Memcpy(sd->text, process, strlen(process)+1);
|
memcpy(sd->text, process, strlen(process)+1);
|
||||||
|
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
@@ -1887,7 +1887,7 @@ static void P_LoadReject(UINT8 *data, size_t count)
|
|||||||
else
|
else
|
||||||
{
|
{
|
||||||
rejectmatrix = Z_Malloc(count, PU_LEVEL, NULL); // allocate memory for the reject matrix
|
rejectmatrix = Z_Malloc(count, PU_LEVEL, NULL); // allocate memory for the reject matrix
|
||||||
M_Memcpy(rejectmatrix, data, count); // copy the data into it
|
memcpy(rejectmatrix, data, count); // copy the data into it
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -2201,7 +2201,7 @@ static void P_MakeMapMD5(virtres_t *virt, void *dest)
|
|||||||
for (i = 0; i < 16; i++)
|
for (i = 0; i < 16; i++)
|
||||||
resmd5[i] = (linemd5[i] + sectormd5[i] + thingmd5[i] + sidedefmd5[i]) & 0xFF;
|
resmd5[i] = (linemd5[i] + sectormd5[i] + thingmd5[i] + sidedefmd5[i]) & 0xFF;
|
||||||
|
|
||||||
M_Memcpy(dest, &resmd5, 16);
|
memcpy(dest, &resmd5, 16);
|
||||||
}
|
}
|
||||||
|
|
||||||
static void P_LoadMapFromFile(void)
|
static void P_LoadMapFromFile(void)
|
||||||
@@ -2766,7 +2766,8 @@ boolean P_SetupLevel(boolean fromnetsave, boolean reloadinggamestate)
|
|||||||
// Make sure all sounds are stopped before Z_FreeTags.
|
// Make sure all sounds are stopped before Z_FreeTags.
|
||||||
S_StopSounds();
|
S_StopSounds();
|
||||||
|
|
||||||
if (!S_PrecacheSound())
|
// if we dont intend to cache our sound effects, wipe them
|
||||||
|
if (S_CacheSound() == SOUNDCACHE_OFF)
|
||||||
S_ClearSfx();
|
S_ClearSfx();
|
||||||
|
|
||||||
// As oddly named as this is, this handles music only.
|
// As oddly named as this is, this handles music only.
|
||||||
@@ -3034,7 +3035,7 @@ static boolean P_CheckSoundReplacements(UINT16 wadnum, char *name, size_t i)
|
|||||||
I_FreeSfx(&S_sfx[j]);
|
I_FreeSfx(&S_sfx[j]);
|
||||||
|
|
||||||
// Re-cache it
|
// Re-cache it
|
||||||
if (S_PrecacheSound())
|
if (S_CacheSound() == SOUNDCACHE_PRECACHE)
|
||||||
S_sfx[j].data = I_GetSfx(&S_sfx[j]);
|
S_sfx[j].data = I_GetSfx(&S_sfx[j]);
|
||||||
|
|
||||||
sreplaces++;
|
sreplaces++;
|
||||||
|
|||||||
+4
-4
@@ -252,10 +252,10 @@ void P_InitPicAnims(void)
|
|||||||
// Populate the new array
|
// Populate the new array
|
||||||
for (currentPos = animatedLump; *currentPos != UINT8_MAX; i++, currentPos+=23)
|
for (currentPos = animatedLump; *currentPos != UINT8_MAX; i++, currentPos+=23)
|
||||||
{
|
{
|
||||||
M_Memcpy(&(animdefs[i].istexture), currentPos, 1); // istexture, 1 byte
|
memcpy(&(animdefs[i].istexture), currentPos, 1); // istexture, 1 byte
|
||||||
M_Memcpy(animdefs[i].endname, (currentPos + 1), 9); // endname, 9 bytes
|
memcpy(animdefs[i].endname, (currentPos + 1), 9); // endname, 9 bytes
|
||||||
M_Memcpy(animdefs[i].startname, (currentPos + 10), 9); // startname, 9 bytes
|
memcpy(animdefs[i].startname, (currentPos + 10), 9); // startname, 9 bytes
|
||||||
M_Memcpy(&(animdefs[i].speed), (currentPos + 19), 4); // speed, 4 bytes
|
memcpy(&(animdefs[i].speed), (currentPos + 19), 4); // speed, 4 bytes
|
||||||
}
|
}
|
||||||
|
|
||||||
Z_Free(animatedLump);
|
Z_Free(animatedLump);
|
||||||
|
|||||||
+7
-7
@@ -269,7 +269,7 @@ static inline void R_DrawColumnInCache(column_t *patch, UINT8 *cache, texpatch_t
|
|||||||
count = cacheheight - position;
|
count = cacheheight - position;
|
||||||
|
|
||||||
if (count > 0)
|
if (count > 0)
|
||||||
M_Memcpy(cache + position, source, count);
|
memcpy(cache + position, source, count);
|
||||||
|
|
||||||
patch = (column_t *)((UINT8 *)patch + patch->length + 4);
|
patch = (column_t *)((UINT8 *)patch + patch->length + 4);
|
||||||
}
|
}
|
||||||
@@ -412,7 +412,7 @@ UINT8 *R_GenerateTexture(size_t texnum)
|
|||||||
texture->holes = true;
|
texture->holes = true;
|
||||||
blocksize = lumplength;
|
blocksize = lumplength;
|
||||||
block = Z_Calloc(blocksize, PU_LEVEL, &texturecache[texnum]); // will change tag at end of this function
|
block = Z_Calloc(blocksize, PU_LEVEL, &texturecache[texnum]); // will change tag at end of this function
|
||||||
M_Memcpy(block, realpatch, blocksize);
|
memcpy(block, realpatch, blocksize);
|
||||||
texturememory += blocksize;
|
texturememory += blocksize;
|
||||||
|
|
||||||
// use the patch's column lookup
|
// use the patch's column lookup
|
||||||
@@ -621,7 +621,7 @@ Rloadtextures (INT32 i, INT32 w)
|
|||||||
texture = textures[i] = Z_Calloc(sizeof(texture_t) + sizeof(texpatch_t), PU_STATIC, NULL);
|
texture = textures[i] = Z_Calloc(sizeof(texture_t) + sizeof(texpatch_t), PU_STATIC, NULL);
|
||||||
|
|
||||||
// Set texture properties.
|
// Set texture properties.
|
||||||
M_Memcpy(texture->name, W_CheckNameForNumPwad(wadnum, lumpnum), sizeof(texture->name));
|
memcpy(texture->name, W_CheckNameForNumPwad(wadnum, lumpnum), sizeof(texture->name));
|
||||||
texture->hash = quickncasehash(texture->name, 8);
|
texture->hash = quickncasehash(texture->name, 8);
|
||||||
|
|
||||||
texture->width = SHORT(patchlump.width);
|
texture->width = SHORT(patchlump.width);
|
||||||
@@ -854,7 +854,7 @@ static texpatch_t *R_ParsePatch(boolean actuallyLoadPatch)
|
|||||||
Z_Free(patchName);
|
Z_Free(patchName);
|
||||||
}
|
}
|
||||||
patchName = (char *)Z_Malloc((texturesTokenLength+1)*sizeof(char),PU_STATIC,NULL);
|
patchName = (char *)Z_Malloc((texturesTokenLength+1)*sizeof(char),PU_STATIC,NULL);
|
||||||
M_Memcpy(patchName,texturesToken,texturesTokenLength*sizeof(char));
|
memcpy(patchName,texturesToken,texturesTokenLength*sizeof(char));
|
||||||
patchName[texturesTokenLength] = '\0';
|
patchName[texturesTokenLength] = '\0';
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -985,7 +985,7 @@ static texture_t *R_ParseTexture(boolean actuallyLoadTexture)
|
|||||||
else
|
else
|
||||||
{
|
{
|
||||||
memset(&newTextureName, 0, 9);
|
memset(&newTextureName, 0, 9);
|
||||||
M_Memcpy(newTextureName, texturesToken, texturesTokenLength);
|
memcpy(newTextureName, texturesToken, texturesTokenLength);
|
||||||
// ^^ we've confirmed that the token is <= 8 characters so it will never overflow a 9 byte char buffer
|
// ^^ we've confirmed that the token is <= 8 characters so it will never overflow a 9 byte char buffer
|
||||||
strupr(newTextureName); // Just do this now so we don't have to worry about it
|
strupr(newTextureName); // Just do this now so we don't have to worry about it
|
||||||
}
|
}
|
||||||
@@ -1077,7 +1077,7 @@ static texture_t *R_ParseTexture(boolean actuallyLoadTexture)
|
|||||||
{
|
{
|
||||||
// Allocate memory for a zero-patch texture. Obviously, we'll be adding patches momentarily.
|
// Allocate memory for a zero-patch texture. Obviously, we'll be adding patches momentarily.
|
||||||
resultTexture = (texture_t *)Z_Calloc(sizeof(texture_t), PU_STATIC, NULL);
|
resultTexture = (texture_t *)Z_Calloc(sizeof(texture_t), PU_STATIC, NULL);
|
||||||
M_Memcpy(resultTexture->name, newTextureName, 8);
|
memcpy(resultTexture->name, newTextureName, 8);
|
||||||
resultTexture->hash = quickncasehash(newTextureName, 8);
|
resultTexture->hash = quickncasehash(newTextureName, 8);
|
||||||
resultTexture->width = newTextureWidth;
|
resultTexture->width = newTextureWidth;
|
||||||
resultTexture->height = newTextureHeight;
|
resultTexture->height = newTextureHeight;
|
||||||
@@ -1104,7 +1104,7 @@ static texture_t *R_ParseTexture(boolean actuallyLoadTexture)
|
|||||||
// Make room for the new patch
|
// Make room for the new patch
|
||||||
resultTexture = Z_Realloc(resultTexture, sizeof(texture_t) + (resultTexture->patchcount+1)*sizeof(texpatch_t), PU_STATIC, NULL);
|
resultTexture = Z_Realloc(resultTexture, sizeof(texture_t) + (resultTexture->patchcount+1)*sizeof(texpatch_t), PU_STATIC, NULL);
|
||||||
// Populate the uninitialized values in the new patch entry of our array
|
// Populate the uninitialized values in the new patch entry of our array
|
||||||
M_Memcpy(&resultTexture->patches[resultTexture->patchcount], newPatch, sizeof(texpatch_t));
|
memcpy(&resultTexture->patches[resultTexture->patchcount], newPatch, sizeof(texpatch_t));
|
||||||
// Account for the new number of patches in the texture
|
// Account for the new number of patches in the texture
|
||||||
resultTexture->patchcount++;
|
resultTexture->patchcount++;
|
||||||
// Then free up the memory assigned to R_ParsePatch, as it's unneeded now
|
// Then free up the memory assigned to R_ParsePatch, as it's unneeded now
|
||||||
|
|||||||
+18
-7
@@ -113,6 +113,7 @@ CV_PossibleValue_t Color_cons_t[MAXSKINCOLORS+1];
|
|||||||
struct GenerateBlendTables_State
|
struct GenerateBlendTables_State
|
||||||
{
|
{
|
||||||
RGBA_t *LocalPalette;
|
RGBA_t *LocalPalette;
|
||||||
|
RGBA_t *gammaCorrectedPalette;
|
||||||
};
|
};
|
||||||
|
|
||||||
static void R_GenerateBlendTables_Core(struct GenerateBlendTables_State *state);
|
static void R_GenerateBlendTables_Core(struct GenerateBlendTables_State *state);
|
||||||
@@ -126,6 +127,7 @@ static void R_GenerateBlendTables_Thread(void *userdata)
|
|||||||
R_GenerateBlendTables_Core(state);
|
R_GenerateBlendTables_Core(state);
|
||||||
|
|
||||||
free(state->LocalPalette);
|
free(state->LocalPalette);
|
||||||
|
free(state->gammaCorrectedPalette);
|
||||||
free(state);
|
free(state);
|
||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
@@ -154,26 +156,33 @@ void R_InitTranslucencyTables(void)
|
|||||||
}
|
}
|
||||||
|
|
||||||
static colorlookup_t transtab_lut;
|
static colorlookup_t transtab_lut;
|
||||||
|
static colorlookup_t transtab_lut_corrected;
|
||||||
|
|
||||||
static void BlendTab_Translucent(UINT8 *table, int style, UINT8 blendamt)
|
static void BlendTab_Translucent(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_Translucent: input table was NULL!");
|
I_Error("BlendTab_Translucent: 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++)
|
||||||
{
|
{
|
||||||
RGBA_t backrgba = V_GetColor(bg);
|
frontrgba = pGammaCorrectedPalette[fg];
|
||||||
RGBA_t frontrgba = V_GetColor(fg);
|
|
||||||
RGBA_t result;
|
|
||||||
|
|
||||||
|
#if 0 // perfect implementation
|
||||||
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, result.s.red, result.s.green, result.s.blue);
|
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(result, frontrgba, AST_TRANSLUCENT, blendamt);
|
||||||
|
table[((bg * 0x100) + fg)] = GetColorLUT(&transtab_lut_corrected, result.s.red, result.s.green, result.s.blue); // pGammaCorrectedPalette
|
||||||
|
#endif
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -224,7 +233,7 @@ static void BlendTab_Modulative(UINT8 *table)
|
|||||||
RGBA_t frontrgba = V_GetColor(fg);
|
RGBA_t frontrgba = V_GetColor(fg);
|
||||||
RGBA_t result;
|
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, 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);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -278,11 +287,12 @@ void R_GenerateBlendTables(void)
|
|||||||
size_t palsize = 256 * sizeof(RGBA_t);
|
size_t palsize = 256 * sizeof(RGBA_t);
|
||||||
|
|
||||||
state->LocalPalette = static_cast<RGBA_t *>(memcpy(malloc(palsize), pLocalPalette, palsize));
|
state->LocalPalette = static_cast<RGBA_t *>(memcpy(malloc(palsize), pLocalPalette, palsize));
|
||||||
|
state->gammaCorrectedPalette = static_cast<RGBA_t *>(memcpy(malloc(palsize), pGammaCorrectedPalette, palsize));
|
||||||
|
|
||||||
I_spawn_thread("blend-tables",
|
I_spawn_thread("blend-tables",
|
||||||
R_GenerateBlendTables_Thread, state);
|
R_GenerateBlendTables_Thread, state);
|
||||||
#else
|
#else
|
||||||
struct GenerateBlendTables_State state = {pLocalPalette};
|
struct GenerateBlendTables_State state = {pLocalPalette, pGammaCorrectedPalette};
|
||||||
R_GenerateBlendTables_Core(&state);
|
R_GenerateBlendTables_Core(&state);
|
||||||
#endif
|
#endif
|
||||||
}
|
}
|
||||||
@@ -290,6 +300,7 @@ void R_GenerateBlendTables(void)
|
|||||||
static void R_GenerateBlendTables_Core(struct GenerateBlendTables_State *state)
|
static void R_GenerateBlendTables_Core(struct GenerateBlendTables_State *state)
|
||||||
{
|
{
|
||||||
InitColorLUT(&transtab_lut, state->LocalPalette, false);
|
InitColorLUT(&transtab_lut, state->LocalPalette, false);
|
||||||
|
InitColorLUT(&transtab_lut_corrected, state->gammaCorrectedPalette, false);
|
||||||
|
|
||||||
// Additive
|
// Additive
|
||||||
BlendTab_GenerateMaps(blendtab_add, AST_ADD, BlendTab_Translucent);
|
BlendTab_GenerateMaps(blendtab_add, AST_ADD, BlendTab_Translucent);
|
||||||
@@ -655,7 +666,7 @@ void R_VideoErase(size_t ofs, INT32 count)
|
|||||||
// is not optimal, e.g. byte by byte on
|
// is not optimal, e.g. byte by byte on
|
||||||
// a 32bit CPU, as GNU GCC/Linux libc did
|
// a 32bit CPU, as GNU GCC/Linux libc did
|
||||||
// at one point.
|
// at one point.
|
||||||
M_Memcpy(vid.screens[0] + ofs, vid.screens[1] + ofs, count);
|
memcpy(vid.screens[0] + ofs, vid.screens[1] + ofs, count);
|
||||||
}
|
}
|
||||||
|
|
||||||
// ==========================================================================
|
// ==========================================================================
|
||||||
|
|||||||
+12
-10
@@ -28,6 +28,8 @@
|
|||||||
#include <vector>
|
#include <vector>
|
||||||
#include <algorithm>
|
#include <algorithm>
|
||||||
|
|
||||||
|
#include "cxxutil.hpp"
|
||||||
|
|
||||||
// ==========================================================================
|
// ==========================================================================
|
||||||
// SPANS
|
// SPANS
|
||||||
// ==========================================================================
|
// ==========================================================================
|
||||||
@@ -315,10 +317,10 @@ static void R_DrawTiltedSpanTemplate(drawspandata_t* ds)
|
|||||||
endz = 1.f/iz;
|
endz = 1.f/iz;
|
||||||
endu = uz*endz;
|
endu = uz*endz;
|
||||||
endv = vz*endz;
|
endv = vz*endz;
|
||||||
stepu = (INT64)((endu - startu) * INVSPAN);
|
stepu = srb2::floattoint<float, INT64>((endu - startu) * INVSPAN);
|
||||||
stepv = (INT64)((endv - startv) * INVSPAN);
|
stepv = srb2::floattoint<float, INT64>((endv - startv) * INVSPAN);
|
||||||
u = (INT64)(startu);
|
u = srb2::floattoint<float, INT64>(startu);
|
||||||
v = (INT64)(startv);
|
v = srb2::floattoint<float, INT64>(startv);
|
||||||
|
|
||||||
const INT32 x1 = ds->x1;
|
const INT32 x1 = ds->x1;
|
||||||
|
|
||||||
@@ -345,8 +347,8 @@ static void R_DrawTiltedSpanTemplate(drawspandata_t* ds)
|
|||||||
{
|
{
|
||||||
if (width == 1)
|
if (width == 1)
|
||||||
{
|
{
|
||||||
u = (INT64)(startu);
|
u = srb2::floattoint<float, INT64>(startu);
|
||||||
v = (INT64)(startv);
|
v = srb2::floattoint<float, INT64>(startv);
|
||||||
bit = ((v >> nflatyshift) & nflatmask) | (u >> nflatxshift);
|
bit = ((v >> nflatyshift) & nflatmask) | (u >> nflatxshift);
|
||||||
colormap = planezlight[tiltlight[ds->x1]] + colormap_diff;
|
colormap = planezlight[tiltlight[ds->x1]] + colormap_diff;
|
||||||
if constexpr (Type & DS_RIPPLE)
|
if constexpr (Type & DS_RIPPLE)
|
||||||
@@ -366,10 +368,10 @@ static void R_DrawTiltedSpanTemplate(drawspandata_t* ds)
|
|||||||
endu = uz*endz;
|
endu = uz*endz;
|
||||||
endv = vz*endz;
|
endv = vz*endz;
|
||||||
left = 1.f/left;
|
left = 1.f/left;
|
||||||
stepu = (INT64)((endu - startu) * left);
|
stepu = srb2::floattoint<float, INT64>((endu - startu) * left);
|
||||||
stepv = (INT64)((endv - startv) * left);
|
stepv = srb2::floattoint<float, INT64>((endv - startv) * left);
|
||||||
u = (INT64)(startu);
|
u = srb2::floattoint<float, INT64>(startu);
|
||||||
v = (INT64)(startv);
|
v = srb2::floattoint<float, INT64>(startv);
|
||||||
|
|
||||||
for (; width != 0; width--)
|
for (; width != 0; width--)
|
||||||
{
|
{
|
||||||
|
|||||||
+5
-5
@@ -147,7 +147,7 @@ static void R_ParseSpriteInfo(boolean spr2)
|
|||||||
else
|
else
|
||||||
{
|
{
|
||||||
memset(&newSpriteName, 0, 5);
|
memset(&newSpriteName, 0, 5);
|
||||||
M_Memcpy(newSpriteName, sprinfoToken, sprinfoTokenLength);
|
memcpy(newSpriteName, sprinfoToken, sprinfoTokenLength);
|
||||||
// ^^ we've confirmed that the token is == 4 characters so it will never overflow a 5 byte char buffer
|
// ^^ we've confirmed that the token is == 4 characters so it will never overflow a 5 byte char buffer
|
||||||
strupr(newSpriteName); // Just do this now so we don't have to worry about it
|
strupr(newSpriteName); // Just do this now so we don't have to worry about it
|
||||||
}
|
}
|
||||||
@@ -211,7 +211,7 @@ static void R_ParseSpriteInfo(boolean spr2)
|
|||||||
// copy skin name yada yada
|
// copy skin name yada yada
|
||||||
sprinfoTokenLength = strlen(sprinfoToken);
|
sprinfoTokenLength = strlen(sprinfoToken);
|
||||||
skinName = (char *)Z_Malloc((sprinfoTokenLength+1)*sizeof(char),PU_STATIC,NULL);
|
skinName = (char *)Z_Malloc((sprinfoTokenLength+1)*sizeof(char),PU_STATIC,NULL);
|
||||||
M_Memcpy(skinName,sprinfoToken,sprinfoTokenLength*sizeof(char));
|
memcpy(skinName,sprinfoToken,sprinfoTokenLength*sizeof(char));
|
||||||
skinName[sprinfoTokenLength] = '\0';
|
skinName[sprinfoTokenLength] = '\0';
|
||||||
strlwr(skinName);
|
strlwr(skinName);
|
||||||
Z_Free(sprinfoToken);
|
Z_Free(sprinfoToken);
|
||||||
@@ -240,11 +240,11 @@ static void R_ParseSpriteInfo(boolean spr2)
|
|||||||
skin = &localskins[allskins[skinnum].localnum];
|
skin = &localskins[allskins[skinnum].localnum];
|
||||||
else
|
else
|
||||||
skin = &skins[allskins[skinnum].localnum];
|
skin = &skins[allskins[skinnum].localnum];
|
||||||
M_Memcpy(&skin->sprinfo, info, sizeof(spriteinfo_t));
|
memcpy(&skin->sprinfo, info, sizeof(spriteinfo_t));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
M_Memcpy(&spriteinfo[sprnum], info, sizeof(spriteinfo_t));
|
memcpy(&spriteinfo[sprnum], info, sizeof(spriteinfo_t));
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
@@ -371,7 +371,7 @@ patch_t *Patch_Create(softwarepatch_t *source, size_t srcsize, void *dest)
|
|||||||
I_Error("Patch_Create: no column data!");
|
I_Error("Patch_Create: no column data!");
|
||||||
|
|
||||||
patch->columns = static_cast<UINT8*>(Z_Calloc(colsize, PU_PATCH_DATA, NULL));
|
patch->columns = static_cast<UINT8*>(Z_Calloc(colsize, PU_PATCH_DATA, NULL));
|
||||||
M_Memcpy(patch->columns, ((UINT8 *)source + LONG(source->columnofs[0])), colsize);
|
memcpy(patch->columns, ((UINT8 *)source + LONG(source->columnofs[0])), colsize);
|
||||||
}
|
}
|
||||||
|
|
||||||
return patch;
|
return patch;
|
||||||
|
|||||||
@@ -241,7 +241,7 @@ void RotatedPatch_DoRotation(rotsprite_t *rotsprite, patch_t *patch, INT32 angle
|
|||||||
|
|
||||||
while (dy--)
|
while (dy--)
|
||||||
{
|
{
|
||||||
M_Memcpy(dest, src, width * sizeof(UINT16));
|
memcpy(dest, src, width * sizeof(UINT16));
|
||||||
dest += width;
|
dest += width;
|
||||||
src += newwidth;
|
src += newwidth;
|
||||||
}
|
}
|
||||||
|
|||||||
+2
-2
@@ -720,7 +720,7 @@ void R_DrawPlanes(void)
|
|||||||
srb2::ThreadPool::Sema tp_sema;
|
srb2::ThreadPool::Sema tp_sema;
|
||||||
srb2::g_main_threadpool->begin_sema();
|
srb2::g_main_threadpool->begin_sema();
|
||||||
#endif
|
#endif
|
||||||
for (i = 0; i < MAXVISPLANES; i++, pl++)
|
for (i = 0; i < MAXVISPLANES; i++)
|
||||||
{
|
{
|
||||||
for (pl = visplanes[i]; pl; pl = pl->next)
|
for (pl = visplanes[i]; pl; pl = pl->next)
|
||||||
{
|
{
|
||||||
@@ -755,7 +755,7 @@ void R_DrawSkyPlanes(void)
|
|||||||
srb2::ThreadPool::Sema tp_sema;
|
srb2::ThreadPool::Sema tp_sema;
|
||||||
srb2::g_main_threadpool->begin_sema();
|
srb2::g_main_threadpool->begin_sema();
|
||||||
#endif
|
#endif
|
||||||
for (i = 0; i < MAXVISPLANES; i++, pl++)
|
for (i = 0; i < MAXVISPLANES; i++)
|
||||||
{
|
{
|
||||||
for (pl = visplanes[i]; pl; pl = pl->next)
|
for (pl = visplanes[i]; pl; pl = pl->next)
|
||||||
{
|
{
|
||||||
|
|||||||
+10
-8
@@ -30,6 +30,8 @@
|
|||||||
|
|
||||||
#include "core/memory.h"
|
#include "core/memory.h"
|
||||||
|
|
||||||
|
#include "cxxutil.hpp"
|
||||||
|
|
||||||
#define HEIGHTBITS 12
|
#define HEIGHTBITS 12
|
||||||
#define HEIGHTUNIT (1<<HEIGHTBITS)
|
#define HEIGHTUNIT (1<<HEIGHTBITS)
|
||||||
|
|
||||||
@@ -1718,7 +1720,7 @@ static void R_AllocClippingTables(size_t range)
|
|||||||
{
|
{
|
||||||
// Check if it's in range of the openings
|
// Check if it's in range of the openings
|
||||||
#define CHECK(which) \
|
#define CHECK(which) \
|
||||||
if (which + drawseg->x1 >= oldopenings && which + drawseg->x1 <= oldlast) \
|
if (which != NULL && which + drawseg->x1 >= oldopenings && which + drawseg->x1 <= oldlast) \
|
||||||
which = (which - oldopenings) + openings
|
which = (which - oldopenings) + openings
|
||||||
CHECK(drawseg->sprtopclip);
|
CHECK(drawseg->sprtopclip);
|
||||||
CHECK(drawseg->sprbottomclip);
|
CHECK(drawseg->sprbottomclip);
|
||||||
@@ -1752,7 +1754,7 @@ static void R_AllocTextureColumnTables(size_t range)
|
|||||||
{
|
{
|
||||||
// Check if it's in range of the tables
|
// Check if it's in range of the tables
|
||||||
#define CHECK(which) \
|
#define CHECK(which) \
|
||||||
if (which + drawseg->x1 >= oldtable && which + drawseg->x1 <= oldlast) \
|
if (which != NULL && which + drawseg->x1 >= oldtable && which + drawseg->x1 <= oldlast) \
|
||||||
which = (which - oldtable) + texturecolumntable
|
which = (which - oldtable) + texturecolumntable
|
||||||
CHECK(drawseg->maskedtexturecol);
|
CHECK(drawseg->maskedtexturecol);
|
||||||
CHECK(drawseg->thicksidecol);
|
CHECK(drawseg->thicksidecol);
|
||||||
@@ -1890,8 +1892,8 @@ void R_StoreWallRange(INT32 start, INT32 stop)
|
|||||||
|
|
||||||
det = a1*b2 - a2*b1;
|
det = a1*b2 - a2*b1;
|
||||||
|
|
||||||
ds_p->leftpos.x = segleft.x = DoubleToFixed((b2*c1 - b1*c2)/det);
|
ds_p->leftpos.x = segleft.x = srb2::floattofixed<double>((b2*c1 - b1*c2)/det);
|
||||||
ds_p->leftpos.y = segleft.y = DoubleToFixed((a1*c2 - a2*c1)/det);
|
ds_p->leftpos.y = segleft.y = srb2::floattofixed<double>((a1*c2 - a2*c1)/det);
|
||||||
|
|
||||||
// right
|
// right
|
||||||
temp = xtoviewangle[stop]+viewangle;
|
temp = xtoviewangle[stop]+viewangle;
|
||||||
@@ -1902,8 +1904,8 @@ void R_StoreWallRange(INT32 start, INT32 stop)
|
|||||||
|
|
||||||
det = a1*b2 - a2*b1;
|
det = a1*b2 - a2*b1;
|
||||||
|
|
||||||
ds_p->rightpos.x = segright.x = DoubleToFixed((b2*c1 - b1*c2)/det);
|
ds_p->rightpos.x = segright.x = srb2::floattofixed<double>((b2*c1 - b1*c2)/det);
|
||||||
ds_p->rightpos.y = segright.y = DoubleToFixed((a1*c2 - a2*c1)/det);
|
ds_p->rightpos.y = segright.y = srb2::floattofixed<double>((a1*c2 - a2*c1)/det);
|
||||||
}
|
}
|
||||||
|
|
||||||
#define SLOPEPARAMS(slope, end1, end2, normalheight) \
|
#define SLOPEPARAMS(slope, end1, end2, normalheight) \
|
||||||
@@ -3001,14 +3003,14 @@ void R_StoreWallRange(INT32 start, INT32 stop)
|
|||||||
|
|
||||||
if (((ds_p->silhouette & SIL_TOP) || maskedtexture) && !ds_p->sprtopclip)
|
if (((ds_p->silhouette & SIL_TOP) || maskedtexture) && !ds_p->sprtopclip)
|
||||||
{
|
{
|
||||||
M_Memcpy(lastopening, ceilingclip + start, 2*(rw_stopx - start));
|
memcpy(lastopening, ceilingclip + start, 2*(rw_stopx - start));
|
||||||
ds_p->sprtopclip = lastopening - start;
|
ds_p->sprtopclip = lastopening - start;
|
||||||
lastopening += rw_stopx - start;
|
lastopening += rw_stopx - start;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (((ds_p->silhouette & SIL_BOTTOM) || maskedtexture) && !ds_p->sprbottomclip)
|
if (((ds_p->silhouette & SIL_BOTTOM) || maskedtexture) && !ds_p->sprbottomclip)
|
||||||
{
|
{
|
||||||
M_Memcpy(lastopening, floorclip + start, 2*(rw_stopx - start));
|
memcpy(lastopening, floorclip + start, 2*(rw_stopx - start));
|
||||||
ds_p->sprbottomclip = lastopening - start;
|
ds_p->sprbottomclip = lastopening - start;
|
||||||
lastopening += rw_stopx - start;
|
lastopening += rw_stopx - start;
|
||||||
}
|
}
|
||||||
|
|||||||
+1
-1
@@ -520,7 +520,7 @@ void R_AddSkins(UINT16 wadnum, boolean local)
|
|||||||
buf2 = malloc(size+1);
|
buf2 = malloc(size+1);
|
||||||
if (!buf2)
|
if (!buf2)
|
||||||
I_Error("R_AddSkins: No more free memory\n");
|
I_Error("R_AddSkins: No more free memory\n");
|
||||||
M_Memcpy(buf2,buf,size);
|
memcpy(buf2,buf,size);
|
||||||
buf2[size] = '\0';
|
buf2[size] = '\0';
|
||||||
|
|
||||||
// set defaults
|
// set defaults
|
||||||
|
|||||||
+3
-3
@@ -267,7 +267,7 @@ boolean R_AddSingleSpriteDef(const char *sprname, spritedef_t *spritedef, UINT16
|
|||||||
if (spritedef->numframes) // (then spriteframes is not null)
|
if (spritedef->numframes) // (then spriteframes is not null)
|
||||||
{
|
{
|
||||||
// copy the already defined sprite frames
|
// copy the already defined sprite frames
|
||||||
M_Memcpy(sprtemp, spritedef->spriteframes,
|
memcpy(sprtemp, spritedef->spriteframes,
|
||||||
spritedef->numframes * sizeof (spriteframe_t));
|
spritedef->numframes * sizeof (spriteframe_t));
|
||||||
maxframe = spritedef->numframes - 1;
|
maxframe = spritedef->numframes - 1;
|
||||||
}
|
}
|
||||||
@@ -403,7 +403,7 @@ boolean R_AddSingleSpriteDef(const char *sprname, spritedef_t *spritedef, UINT16
|
|||||||
spritedef->spriteframes = static_cast<spriteframe_t*>(Z_Malloc(maxframe * sizeof (*spritedef->spriteframes), PU_STATIC, NULL));
|
spritedef->spriteframes = static_cast<spriteframe_t*>(Z_Malloc(maxframe * sizeof (*spritedef->spriteframes), PU_STATIC, NULL));
|
||||||
|
|
||||||
spritedef->numframes = maxframe;
|
spritedef->numframes = maxframe;
|
||||||
M_Memcpy(spritedef->spriteframes, sprtemp, maxframe*sizeof (spriteframe_t));
|
memcpy(spritedef->spriteframes, sprtemp, maxframe*sizeof (spriteframe_t));
|
||||||
|
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
@@ -1019,7 +1019,7 @@ static void R_SplitSprite(vissprite_t *sprite)
|
|||||||
INT16 *cliptop = newsprite->cliptop;
|
INT16 *cliptop = newsprite->cliptop;
|
||||||
INT16 *clipbot = newsprite->clipbot;
|
INT16 *clipbot = newsprite->clipbot;
|
||||||
|
|
||||||
M_Memcpy(newsprite, sprite, sizeof (vissprite_t));
|
memcpy(newsprite, sprite, sizeof (vissprite_t));
|
||||||
|
|
||||||
newsprite->cliptop = cliptop;
|
newsprite->cliptop = cliptop;
|
||||||
newsprite->clipbot = clipbot;
|
newsprite->clipbot = clipbot;
|
||||||
|
|||||||
+36
-22
@@ -45,7 +45,7 @@ static void Command_ShowMusicCredit_f(void);
|
|||||||
static void GameSounds_OnChange(void);
|
static void GameSounds_OnChange(void);
|
||||||
static void GameMusic_OnChange(void);
|
static void GameMusic_OnChange(void);
|
||||||
|
|
||||||
static void SoundPrecache_OnChange(void);
|
static void SoundCache_OnChange(void);
|
||||||
static void BufferSize_OnChange(void);
|
static void BufferSize_OnChange(void);
|
||||||
|
|
||||||
#ifdef HAVE_OPENMPT
|
#ifdef HAVE_OPENMPT
|
||||||
@@ -68,7 +68,8 @@ consvar_t cv_audbuffersize = {"audiobuffersize", "2048", CV_SAVE|CV_CALL, audbuf
|
|||||||
consvar_t stereoreverse = {"stereoreverse", "Off", CV_SAVE, CV_OnOff, NULL, 0, NULL, NULL, 0, 0, NULL};
|
consvar_t stereoreverse = {"stereoreverse", "Off", CV_SAVE, CV_OnOff, NULL, 0, NULL, NULL, 0, 0, NULL};
|
||||||
|
|
||||||
// if true, all sounds are loaded at game startup
|
// if true, all sounds are loaded at game startup
|
||||||
consvar_t precachesound = {"precachesound", "Off", CV_SAVE|CV_CALL|CV_NOINIT, CV_OnOff, SoundPrecache_OnChange, 0, NULL, NULL, 0, 0, NULL};
|
static CV_PossibleValue_t cachesounds_cons_t[] = {{0, "Off"}, {1, "Keep"}, {2, "On"}, {0, NULL}};
|
||||||
|
consvar_t cv_cachesound = {"cachesound", "1", CV_SAVE|CV_CALL|CV_NOINIT, cachesounds_cons_t, SoundCache_OnChange, 0, NULL, NULL, 0, 0, NULL};
|
||||||
|
|
||||||
// actual general (maximum) sound & music volume, saved into the config
|
// actual general (maximum) sound & music volume, saved into the config
|
||||||
static CV_PossibleValue_t soundvolume_cons_t[] = {{0, "MIN"}, {31, "MAX"}, {0, NULL}};
|
static CV_PossibleValue_t soundvolume_cons_t[] = {{0, "MIN"}, {31, "MAX"}, {0, NULL}};
|
||||||
@@ -274,7 +275,7 @@ void S_RegisterSoundStuff(void)
|
|||||||
}
|
}
|
||||||
|
|
||||||
CV_RegisterVar(&stereoreverse);
|
CV_RegisterVar(&stereoreverse);
|
||||||
CV_RegisterVar(&precachesound);
|
CV_RegisterVar(&cv_cachesound);
|
||||||
#if defined(HAVE_SDL) && SOUND==SOUND_SDL
|
#if defined(HAVE_SDL) && SOUND==SOUND_SDL
|
||||||
CV_RegisterVar(&cv_samplerate);
|
CV_RegisterVar(&cv_samplerate);
|
||||||
#endif
|
#endif
|
||||||
@@ -362,9 +363,15 @@ boolean S_SoundDisabled(void)
|
|||||||
return (sound_disabled || (window_notinfocus && !cv_playsoundifunfocused.value));
|
return (sound_disabled || (window_notinfocus && !cv_playsoundifunfocused.value));
|
||||||
}
|
}
|
||||||
|
|
||||||
boolean S_PrecacheSound(void)
|
int S_CacheSound(void)
|
||||||
{
|
{
|
||||||
return (!sound_disabled && (M_CheckParm("-precachesound") || precachesound.value));
|
if (sound_disabled)
|
||||||
|
return SOUNDCACHE_OFF;
|
||||||
|
|
||||||
|
if (M_CheckParm("-precachesound"))
|
||||||
|
return SOUNDCACHE_PRECACHE;
|
||||||
|
|
||||||
|
return cv_cachesound.value;
|
||||||
}
|
}
|
||||||
|
|
||||||
// Stop all sounds, load level info, THEN start sounds.
|
// Stop all sounds, load level info, THEN start sounds.
|
||||||
@@ -1150,28 +1157,35 @@ void S_InitSfxChannels(INT32 sfxVolume)
|
|||||||
|
|
||||||
SetChannelsNum();
|
SetChannelsNum();
|
||||||
|
|
||||||
// Note that sounds have not been cached (yet).
|
|
||||||
for (i = 1; i < NUMSFX; i++)
|
|
||||||
{
|
|
||||||
S_sfx[i].lumpnum = LUMPERROR;
|
|
||||||
}
|
|
||||||
|
|
||||||
// Precache sounds if requested
|
// Precache sounds if requested
|
||||||
if (S_PrecacheSound())
|
if (S_CacheSound() == SOUNDCACHE_PRECACHE)
|
||||||
{
|
{
|
||||||
// Initialize external data (all sounds) at start, keep static.
|
// Initialize external data (all sounds) at start, keep static.
|
||||||
CONS_Printf(M_GetText("Pre-caching sounds..."));
|
CONS_Printf(M_GetText("Pre-caching sounds..."));
|
||||||
|
|
||||||
for (i = 1; i < sfx_freeslot0; i++)
|
// NUMSFX is a big number, so merge the loops
|
||||||
if (S_sfx[i].name && !S_sfx[i].data)
|
for (i = 1; i < NUMSFX; i++)
|
||||||
S_sfx[i].data = I_GetSfx(&S_sfx[i]);
|
{
|
||||||
|
S_sfx[i].lumpnum = LUMPERROR;
|
||||||
|
|
||||||
for (i = sfx_freeslot0; i < NUMSFX; i++)
|
if (S_sfx[i].data)
|
||||||
if (S_sfx[i].priority && !S_sfx[i].data)
|
continue;
|
||||||
S_sfx[i].data = I_GetSfx(&S_sfx[i]);
|
|
||||||
|
if ((i < sfx_freeslot0 && S_sfx[i].name) ||
|
||||||
|
(i >= sfx_freeslot0 && S_sfx[i].priority))
|
||||||
|
S_sfx[i].data = I_GetSfx(&S_sfx[i]);
|
||||||
|
}
|
||||||
|
|
||||||
CONS_Printf(M_GetText("...pre-cached all sound data\n"));
|
CONS_Printf(M_GetText("...pre-cached all sound data\n"));
|
||||||
}
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
// Note that sounds have not been cached (yet).
|
||||||
|
for (i = 1; i < NUMSFX; i++)
|
||||||
|
{
|
||||||
|
S_sfx[i].lumpnum = LUMPERROR;
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
/// ------------------------
|
/// ------------------------
|
||||||
@@ -1409,7 +1423,7 @@ void S_LoadMusicDefs(UINT16 wadnum)
|
|||||||
musdeftext = malloc(size+1);
|
musdeftext = malloc(size+1);
|
||||||
if (!musdeftext)
|
if (!musdeftext)
|
||||||
I_Error("S_LoadMusicDefs: No more free memory for the parser\n");
|
I_Error("S_LoadMusicDefs: No more free memory for the parser\n");
|
||||||
M_Memcpy(musdeftext, lump, size);
|
memcpy(musdeftext, lump, size);
|
||||||
musdeftext[size] = '\0';
|
musdeftext[size] = '\0';
|
||||||
|
|
||||||
// Find music def
|
// Find music def
|
||||||
@@ -2277,13 +2291,13 @@ static void GameSounds_OnChange(void)
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
static void SoundPrecache_OnChange(void)
|
static void SoundCache_OnChange(void)
|
||||||
{
|
{
|
||||||
if (S_PrecacheSound())
|
if (S_CacheSound() != SOUNDCACHE_OFF)
|
||||||
{
|
{
|
||||||
S_InitSfxChannels(cv_soundvolume.value);
|
S_InitSfxChannels(cv_soundvolume.value);
|
||||||
}
|
}
|
||||||
else if (!S_PrecacheSound())
|
else
|
||||||
{
|
{
|
||||||
S_ClearSfx();
|
S_ClearSfx();
|
||||||
|
|
||||||
|
|||||||
+10
-2
@@ -75,9 +75,10 @@ extern consvar_t cv_skipintromusic;
|
|||||||
//extern consvar_t cv_ignoremusicchanges;
|
//extern consvar_t cv_ignoremusicchanges;
|
||||||
extern boolean keepmapmusic;
|
extern boolean keepmapmusic;
|
||||||
extern boolean skipintromus;
|
extern boolean skipintromus;
|
||||||
|
|
||||||
#define MUSICSTARTTIME (starttime + (TICRATE/2))
|
#define MUSICSTARTTIME (starttime + (TICRATE/2))
|
||||||
|
|
||||||
extern consvar_t precachesound;
|
extern consvar_t cv_cachesound;
|
||||||
|
|
||||||
typedef enum
|
typedef enum
|
||||||
{
|
{
|
||||||
@@ -148,11 +149,18 @@ void S_StopSound(void *origin);
|
|||||||
// Music Status
|
// Music Status
|
||||||
//
|
//
|
||||||
|
|
||||||
|
enum
|
||||||
|
{
|
||||||
|
SOUNDCACHE_OFF,
|
||||||
|
SOUNDCACHE_KEEP,
|
||||||
|
SOUNDCACHE_PRECACHE
|
||||||
|
};
|
||||||
|
|
||||||
boolean S_MusicDisabled(void);
|
boolean S_MusicDisabled(void);
|
||||||
boolean S_MusicPlaying(void);
|
boolean S_MusicPlaying(void);
|
||||||
boolean S_MusicPaused(void);
|
boolean S_MusicPaused(void);
|
||||||
boolean S_MusicNotInFocus(void);
|
boolean S_MusicNotInFocus(void);
|
||||||
boolean S_PrecacheSound(void);
|
int S_CacheSound(void);
|
||||||
musictype_t S_MusicType(void);
|
musictype_t S_MusicType(void);
|
||||||
const char *S_MusicName(void);
|
const char *S_MusicName(void);
|
||||||
boolean S_MusicInfo(char *mname, UINT16 *mflags, boolean *looping);
|
boolean S_MusicInfo(char *mname, UINT16 *mflags, boolean *looping);
|
||||||
|
|||||||
+9
-6
@@ -215,7 +215,10 @@ void SCR_Startup(void)
|
|||||||
CV_RegisterVar(&cv_menucaps);
|
CV_RegisterVar(&cv_menucaps);
|
||||||
CV_RegisterVar(&cv_constextsize);
|
CV_RegisterVar(&cv_constextsize);
|
||||||
|
|
||||||
|
#ifdef BACKWARDSCOMPATCORRECTION
|
||||||
CV_RegisterVar(&cv_globalgamma);
|
CV_RegisterVar(&cv_globalgamma);
|
||||||
|
#endif
|
||||||
|
CV_RegisterVar(&cv_globalbrightness);
|
||||||
CV_RegisterVar(&cv_globalsaturation);
|
CV_RegisterVar(&cv_globalsaturation);
|
||||||
|
|
||||||
CV_RegisterVar(&cv_rhue);
|
CV_RegisterVar(&cv_rhue);
|
||||||
@@ -225,12 +228,12 @@ void SCR_Startup(void)
|
|||||||
CV_RegisterVar(&cv_bhue);
|
CV_RegisterVar(&cv_bhue);
|
||||||
CV_RegisterVar(&cv_mhue);
|
CV_RegisterVar(&cv_mhue);
|
||||||
|
|
||||||
CV_RegisterVar(&cv_rgamma);
|
CV_RegisterVar(&cv_rbrightness);
|
||||||
CV_RegisterVar(&cv_ygamma);
|
CV_RegisterVar(&cv_ybrightness);
|
||||||
CV_RegisterVar(&cv_ggamma);
|
CV_RegisterVar(&cv_gbrightness);
|
||||||
CV_RegisterVar(&cv_cgamma);
|
CV_RegisterVar(&cv_cbrightness);
|
||||||
CV_RegisterVar(&cv_bgamma);
|
CV_RegisterVar(&cv_bbrightness);
|
||||||
CV_RegisterVar(&cv_mgamma);
|
CV_RegisterVar(&cv_mbrightness);
|
||||||
|
|
||||||
CV_RegisterVar(&cv_rsaturation);
|
CV_RegisterVar(&cv_rsaturation);
|
||||||
CV_RegisterVar(&cv_ysaturation);
|
CV_RegisterVar(&cv_ysaturation);
|
||||||
|
|||||||
+3
-3
@@ -107,7 +107,7 @@ static void NET_Get(void)
|
|||||||
{
|
{
|
||||||
size_t i;
|
size_t i;
|
||||||
newnode++;
|
newnode++;
|
||||||
M_Memcpy(&clientaddress[newnode], &mypacket.address, sizeof (IPaddress));
|
memcpy(&clientaddress[newnode], &mypacket.address, sizeof (IPaddress));
|
||||||
DEBFILE(va("New node detected: node:%d address:%s\n", newnode,
|
DEBFILE(va("New node detected: node:%d address:%s\n", newnode,
|
||||||
NET_GetNodeAddress(newnode)));
|
NET_GetNodeAddress(newnode)));
|
||||||
doomcom->remotenode = newnode; // good packet from a game player
|
doomcom->remotenode = newnode; // good packet from a game player
|
||||||
@@ -257,7 +257,7 @@ static SINT8 NET_NetMakeNodewPort(const char *hostname, const char *port)
|
|||||||
return newnode;
|
return newnode;
|
||||||
}
|
}
|
||||||
newnode++;
|
newnode++;
|
||||||
M_Memcpy(&clientaddress[newnode],&hostnameIP,sizeof (IPaddress));
|
memcpy(&clientaddress[newnode],&hostnameIP,sizeof (IPaddress));
|
||||||
return (SINT8)newnode;
|
return (SINT8)newnode;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -303,7 +303,7 @@ static boolean NET_Ban(INT32 node)
|
|||||||
if (numbans == MAXBANS)
|
if (numbans == MAXBANS)
|
||||||
return false;
|
return false;
|
||||||
|
|
||||||
M_Memcpy(&banned[numbans], &clientaddress[node], sizeof (IPaddress));
|
memcpy(&banned[numbans], &clientaddress[node], sizeof (IPaddress));
|
||||||
banned[numbans].port = 0;
|
banned[numbans].port = 0;
|
||||||
numbans++;
|
numbans++;
|
||||||
return true;
|
return true;
|
||||||
|
|||||||
@@ -266,13 +266,13 @@ void I_UpdateSound(void)
|
|||||||
|
|
||||||
// this is as fast as I can possibly make it.
|
// this is as fast as I can possibly make it.
|
||||||
// sorry. more asm needed.
|
// sorry. more asm needed.
|
||||||
static Mix_Chunk *ds2chunk(void *stream)
|
static Mix_Chunk *ds2chunk(const void *stream)
|
||||||
{
|
{
|
||||||
UINT16 ver, freq;
|
UINT16 ver, freq;
|
||||||
UINT32 samples, i, newsamples;
|
UINT32 samples, i, newsamples;
|
||||||
UINT8 *sound;
|
UINT8 *sound;
|
||||||
|
|
||||||
SINT8 *s;
|
const SINT8 *s;
|
||||||
INT16 *d;
|
INT16 *d;
|
||||||
INT16 o;
|
INT16 o;
|
||||||
fixed_t step, frac;
|
fixed_t step, frac;
|
||||||
@@ -325,7 +325,7 @@ static Mix_Chunk *ds2chunk(void *stream)
|
|||||||
|
|
||||||
sound = Z_Malloc(newsamples<<2, PU_SOUND, NULL); // samples * frequency shift * bytes per sample * channels
|
sound = Z_Malloc(newsamples<<2, PU_SOUND, NULL); // samples * frequency shift * bytes per sample * channels
|
||||||
|
|
||||||
s = (SINT8 *)stream;
|
s = (const SINT8 *)stream;
|
||||||
d = (INT16 *)sound;
|
d = (INT16 *)sound;
|
||||||
|
|
||||||
i = 0;
|
i = 0;
|
||||||
|
|||||||
@@ -197,6 +197,9 @@ boolean OglSdlSurface(INT32 w, INT32 h)
|
|||||||
else
|
else
|
||||||
maximumAnisotropy = 1;
|
maximumAnisotropy = 1;
|
||||||
|
|
||||||
|
if (GL_isExtAvailable("GL_ARB_texture_non_power_of_two", gl_extensions))
|
||||||
|
supportNPO2tex = true;
|
||||||
|
|
||||||
glanisotropicmode_cons_t[1].value = maximumAnisotropy;
|
glanisotropicmode_cons_t[1].value = maximumAnisotropy;
|
||||||
|
|
||||||
#if defined (__unix__)
|
#if defined (__unix__)
|
||||||
|
|||||||
+5
-5
@@ -244,7 +244,7 @@ static void *getsfx(lumpnum_t sfxlump, size_t *len)
|
|||||||
|
|
||||||
sfxcvt.len = (INT32)size-8; //Alam: Chop off the header
|
sfxcvt.len = (INT32)size-8; //Alam: Chop off the header
|
||||||
sfxcvt.buf = malloc(sfxcvt.len * sfxcvt.len_mult); //Alam: make room
|
sfxcvt.buf = malloc(sfxcvt.len * sfxcvt.len_mult); //Alam: make room
|
||||||
if (sfxcvt.buf) M_Memcpy(sfxcvt.buf, &(sfx->data), sfxcvt.len); //Alam: copy the sfx sample
|
if (sfxcvt.buf) memcpy(sfxcvt.buf, &(sfx->data), sfxcvt.len); //Alam: copy the sfx sample
|
||||||
|
|
||||||
if (sfxcvt.buf && SDL_ConvertAudio(&sfxcvt) == 0) //Alam: let convert it!
|
if (sfxcvt.buf && SDL_ConvertAudio(&sfxcvt) == 0) //Alam: let convert it!
|
||||||
{
|
{
|
||||||
@@ -255,9 +255,9 @@ static void *getsfx(lumpnum_t sfxlump, size_t *len)
|
|||||||
paddedsfx = (dssfx_t *) Z_Malloc(size, PU_SOUND, NULL);
|
paddedsfx = (dssfx_t *) Z_Malloc(size, PU_SOUND, NULL);
|
||||||
|
|
||||||
// Now copy and pad.
|
// Now copy and pad.
|
||||||
M_Memcpy(paddedsfx->data, sfxcvt.buf, sfxcvt.len_cvt);
|
memcpy(paddedsfx->data, sfxcvt.buf, sfxcvt.len_cvt);
|
||||||
free(sfxcvt.buf);
|
free(sfxcvt.buf);
|
||||||
M_Memcpy(paddedsfx,sfx,8);
|
memcpy(paddedsfx,sfx,8);
|
||||||
paddedsfx->samplerate = SHORT(csr); // new freq
|
paddedsfx->samplerate = SHORT(csr); // new freq
|
||||||
}
|
}
|
||||||
else //Alam: the convert failed, not needed or I couldn't malloc the buf
|
else //Alam: the convert failed, not needed or I couldn't malloc the buf
|
||||||
@@ -266,7 +266,7 @@ static void *getsfx(lumpnum_t sfxlump, size_t *len)
|
|||||||
*len = size - 8;
|
*len = size - 8;
|
||||||
|
|
||||||
// Allocate from zone memory then copy and pad
|
// Allocate from zone memory then copy and pad
|
||||||
paddedsfx = (dssfx_t *)M_Memcpy(Z_Malloc(size, PU_SOUND, NULL), sfx, size);
|
paddedsfx = (dssfx_t *)memcpy(Z_Malloc(size, PU_SOUND, NULL), sfx, size);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
@@ -276,7 +276,7 @@ static void *getsfx(lumpnum_t sfxlump, size_t *len)
|
|||||||
*len = size - 8;
|
*len = size - 8;
|
||||||
|
|
||||||
// Allocate from zone memory then copy and pad
|
// Allocate from zone memory then copy and pad
|
||||||
paddedsfx = (dssfx_t *)M_Memcpy(Z_Malloc(size, PU_SOUND, NULL), sfx, size);
|
paddedsfx = (dssfx_t *)memcpy(Z_Malloc(size, PU_SOUND, NULL), sfx, size);
|
||||||
}
|
}
|
||||||
|
|
||||||
// Remove the cached lump.
|
// Remove the cached lump.
|
||||||
|
|||||||
+3
-1
@@ -1018,6 +1018,8 @@ sfxenum_t S_AddSoundFx(const char *name, boolean singular, INT32 flags, boolean
|
|||||||
else
|
else
|
||||||
slot = sfx_freeslot0;
|
slot = sfx_freeslot0;
|
||||||
|
|
||||||
|
const int precache = S_CacheSound();
|
||||||
|
|
||||||
for (i = slot; i < NUMSFX; i++)
|
for (i = slot; i < NUMSFX; i++)
|
||||||
{
|
{
|
||||||
if (!S_sfx[i].priority)
|
if (!S_sfx[i].priority)
|
||||||
@@ -1030,7 +1032,7 @@ sfxenum_t S_AddSoundFx(const char *name, boolean singular, INT32 flags, boolean
|
|||||||
S_sfx[i].length = 0;
|
S_sfx[i].length = 0;
|
||||||
S_sfx[i].skinsound = -1;
|
S_sfx[i].skinsound = -1;
|
||||||
|
|
||||||
if (S_PrecacheSound())
|
if (precache == SOUNDCACHE_PRECACHE)
|
||||||
S_sfx[i].data = I_GetSfx(&S_sfx[i]);
|
S_sfx[i].data = I_GetSfx(&S_sfx[i]);
|
||||||
else
|
else
|
||||||
S_sfx[i].data = NULL;
|
S_sfx[i].data = NULL;
|
||||||
|
|||||||
+165
-158
@@ -42,8 +42,13 @@ static void CV_palette_OnChange(void);
|
|||||||
consvar_t cv_palette = {"palette", "", CV_CALL|CV_NOINIT, NULL, CV_palette_OnChange, 0, NULL, NULL, 0, 0, NULL};
|
consvar_t cv_palette = {"palette", "", CV_CALL|CV_NOINIT, NULL, CV_palette_OnChange, 0, NULL, NULL, 0, 0, NULL};
|
||||||
consvar_t cv_palettenum = {"palettenum", "0", CV_CALL|CV_NOINIT, CV_Unsigned, CV_palette_OnChange, 0, NULL, NULL, 0, 0, NULL};
|
consvar_t cv_palettenum = {"palettenum", "0", CV_CALL|CV_NOINIT, CV_Unsigned, CV_palette_OnChange, 0, NULL, NULL, 0, 0, NULL};
|
||||||
|
|
||||||
static CV_PossibleValue_t gamma_cons_t[] = {{-15, "MIN"}, {4, "MAX"}, {0, NULL}};
|
#ifdef BACKWARDSCOMPATCORRECTION
|
||||||
|
static CV_PossibleValue_t gamma_cons_t[] = {{0, "MIN"}, {4, "MAX"}, {0, NULL}};
|
||||||
consvar_t cv_globalgamma = {"gamma", "0", CV_SAVE|CV_CALL, gamma_cons_t, CV_palette_OnChange, 0, NULL, NULL, 0, 0, NULL};
|
consvar_t cv_globalgamma = {"gamma", "0", CV_SAVE|CV_CALL, gamma_cons_t, CV_palette_OnChange, 0, NULL, NULL, 0, 0, NULL};
|
||||||
|
#endif
|
||||||
|
|
||||||
|
static CV_PossibleValue_t brightness_cons_t[] = {{-15, "MIN"}, {5, "MAX"}, {0, NULL}};
|
||||||
|
consvar_t cv_globalbrightness = {"brightness", "0", CV_SAVE|CV_CALL, brightness_cons_t, CV_palette_OnChange, 0, NULL, NULL, 0, 0, NULL};
|
||||||
|
|
||||||
static CV_PossibleValue_t saturation_cons_t[] = {{0, "MIN"}, {10, "MAX"}, {0, NULL}};
|
static CV_PossibleValue_t saturation_cons_t[] = {{0, "MIN"}, {10, "MAX"}, {0, NULL}};
|
||||||
consvar_t cv_globalsaturation = {"saturation", "10", CV_SAVE|CV_CALL, saturation_cons_t, CV_palette_OnChange, 0, NULL, NULL, 0, 0, NULL};
|
consvar_t cv_globalsaturation = {"saturation", "10", CV_SAVE|CV_CALL, saturation_cons_t, CV_palette_OnChange, 0, NULL, NULL, 0, 0, NULL};
|
||||||
@@ -58,12 +63,12 @@ consvar_t cv_chue = {"chue", "12", CV_SAVE|CV_CALL, hue_cons_t, CV_palette_OnCha
|
|||||||
consvar_t cv_bhue = {"bhue", "16", CV_SAVE|CV_CALL, hue_cons_t, CV_palette_OnChange, 0, NULL, NULL, 0, 0, NULL};
|
consvar_t cv_bhue = {"bhue", "16", CV_SAVE|CV_CALL, hue_cons_t, CV_palette_OnChange, 0, NULL, NULL, 0, 0, NULL};
|
||||||
consvar_t cv_mhue = {"mhue", "20", CV_SAVE|CV_CALL, hue_cons_t, CV_palette_OnChange, 0, NULL, NULL, 0, 0, NULL};
|
consvar_t cv_mhue = {"mhue", "20", CV_SAVE|CV_CALL, hue_cons_t, CV_palette_OnChange, 0, NULL, NULL, 0, 0, NULL};
|
||||||
|
|
||||||
consvar_t cv_rgamma = {"rgamma", "0", CV_SAVE|CV_CALL, gamma_cons_t, CV_palette_OnChange, 0, NULL, NULL, 0, 0, NULL};
|
consvar_t cv_rbrightness = {"rbrightness", "0", CV_SAVE|CV_CALL, brightness_cons_t, CV_palette_OnChange, 0, NULL, NULL, 0, 0, NULL};
|
||||||
consvar_t cv_ygamma = {"ygamma", "0", CV_SAVE|CV_CALL, gamma_cons_t, CV_palette_OnChange, 0, NULL, NULL, 0, 0, NULL};
|
consvar_t cv_ybrightness = {"ybrightness", "0", CV_SAVE|CV_CALL, brightness_cons_t, CV_palette_OnChange, 0, NULL, NULL, 0, 0, NULL};
|
||||||
consvar_t cv_ggamma = {"ggamma", "0", CV_SAVE|CV_CALL, gamma_cons_t, CV_palette_OnChange, 0, NULL, NULL, 0, 0, NULL};
|
consvar_t cv_gbrightness = {"gbrightness", "0", CV_SAVE|CV_CALL, brightness_cons_t, CV_palette_OnChange, 0, NULL, NULL, 0, 0, NULL};
|
||||||
consvar_t cv_cgamma = {"cgamma", "0", CV_SAVE|CV_CALL, gamma_cons_t, CV_palette_OnChange, 0, NULL, NULL, 0, 0, NULL};
|
consvar_t cv_cbrightness = {"cbrightness", "0", CV_SAVE|CV_CALL, brightness_cons_t, CV_palette_OnChange, 0, NULL, NULL, 0, 0, NULL};
|
||||||
consvar_t cv_bgamma = {"bgamma", "0", CV_SAVE|CV_CALL, gamma_cons_t, CV_palette_OnChange, 0, NULL, NULL, 0, 0, NULL};
|
consvar_t cv_bbrightness = {"bbrightness", "0", CV_SAVE|CV_CALL, brightness_cons_t, CV_palette_OnChange, 0, NULL, NULL, 0, 0, NULL};
|
||||||
consvar_t cv_mgamma = {"mgamma", "0", CV_SAVE|CV_CALL, gamma_cons_t, CV_palette_OnChange, 0, NULL, NULL, 0, 0, NULL};
|
consvar_t cv_mbrightness = {"mbrightness", "0", CV_SAVE|CV_CALL, brightness_cons_t, CV_palette_OnChange, 0, NULL, NULL, 0, 0, NULL};
|
||||||
|
|
||||||
consvar_t cv_rsaturation = {"rsaturation", "10", CV_SAVE|CV_CALL, saturation_cons_t, CV_palette_OnChange, 0, NULL, NULL, 0, 0, NULL};
|
consvar_t cv_rsaturation = {"rsaturation", "10", CV_SAVE|CV_CALL, saturation_cons_t, CV_palette_OnChange, 0, NULL, NULL, 0, 0, NULL};
|
||||||
consvar_t cv_ysaturation = {"ysaturation", "10", CV_SAVE|CV_CALL, saturation_cons_t, CV_palette_OnChange, 0, NULL, NULL, 0, 0, NULL};
|
consvar_t cv_ysaturation = {"ysaturation", "10", CV_SAVE|CV_CALL, saturation_cons_t, CV_palette_OnChange, 0, NULL, NULL, 0, 0, NULL};
|
||||||
@@ -84,6 +89,7 @@ consvar_t cv_menucaps = {"menucaps", "On", CV_SAVE, CV_OnOff, NULL, 0, NULL, NUL
|
|||||||
|
|
||||||
// local copy of the palette for V_GetColor()
|
// local copy of the palette for V_GetColor()
|
||||||
RGBA_t *pLocalPalette = NULL;
|
RGBA_t *pLocalPalette = NULL;
|
||||||
|
RGBA_t *pGammaCorrectedPalette = NULL;
|
||||||
|
|
||||||
static size_t currentPaletteSize;
|
static size_t currentPaletteSize;
|
||||||
|
|
||||||
@@ -127,100 +133,97 @@ static boolean InitCube(void)
|
|||||||
};
|
};
|
||||||
|
|
||||||
float desatur[3]; // grey
|
float desatur[3]; // grey
|
||||||
float globalgammamul, globalgammaoffs;
|
float globalbrightnessmul, globalbrightnessoffs;
|
||||||
boolean doinggamma;
|
boolean doingbrightness;
|
||||||
|
|
||||||
if (!loaded_config)
|
if (!loaded_config)
|
||||||
return false;
|
return false;
|
||||||
|
|
||||||
#define diffcons(cv) (!fastcmp(cv.string, cv.defaultvalue))
|
#define diffcons(cv) (!fastcmp(cv.string, cv.defaultvalue))
|
||||||
#define diffconsgamma(cv) (cv.value != 0)
|
#define diffconsbrightness(cv) (cv.value != 0)
|
||||||
|
|
||||||
#define diffconssat(cv) (cv.value != 10)
|
#define diffconssat(cv) (cv.value != 10)
|
||||||
|
|
||||||
#ifdef BACKWARDSCOMPATCORRECTION
|
doingbrightness = diffcons(cv_globalbrightness);
|
||||||
doinggamma = (cv_globalgamma.value < 0); //dont mess up gamma when raising brightness pls
|
|
||||||
#else
|
|
||||||
doinggamma = diffcons(cv_globalgamma);
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#define gammascale 8
|
#define brightnessscale 8
|
||||||
globalgammamul = (cv_globalgamma.value ? ((255.0f - (gammascale*abs(cv_globalgamma.value))) / 255.0f) : 1.0f);
|
globalbrightnessmul = (cv_globalbrightness.value ? ((255.0f - (brightnessscale*abs(cv_globalbrightness.value))) / 255.0f) : 1.0f);
|
||||||
globalgammaoffs = ((cv_globalgamma.value > 0) ? ((gammascale*cv_globalgamma.value) / 255.0f) : 0.0f);
|
globalbrightnessoffs = ((cv_globalbrightness.value > 0) ? ((brightnessscale*cv_globalbrightness.value) / 255.0f) : 0.0f);
|
||||||
desatur[0] = desatur[1] = desatur[2] = globalgammaoffs + (0.33f * globalgammamul);
|
desatur[0] = desatur[1] = desatur[2] = globalbrightnessoffs + (0.33f * globalbrightnessmul);
|
||||||
|
|
||||||
if (doinggamma
|
if (doingbrightness
|
||||||
|| diffcons(cv_rhue)
|
|| diffcons(cv_rhue)
|
||||||
|| diffcons(cv_yhue)
|
|| diffcons(cv_yhue)
|
||||||
|| diffcons(cv_ghue)
|
|| diffcons(cv_ghue)
|
||||||
|| diffcons(cv_chue)
|
|| diffcons(cv_chue)
|
||||||
|| diffcons(cv_bhue)
|
|| diffcons(cv_bhue)
|
||||||
|| diffcons(cv_mhue)
|
|| diffcons(cv_mhue)
|
||||||
|| diffconsgamma(cv_rgamma)
|
|| diffconsbrightness(cv_rbrightness)
|
||||||
|| diffconsgamma(cv_ygamma)
|
|| diffconsbrightness(cv_ybrightness)
|
||||||
|| diffconsgamma(cv_ggamma)
|
|| diffconsbrightness(cv_gbrightness)
|
||||||
|| diffconsgamma(cv_cgamma)
|
|| diffconsbrightness(cv_cbrightness)
|
||||||
|| diffconsgamma(cv_bgamma)
|
|| diffconsbrightness(cv_bbrightness)
|
||||||
|| diffconsgamma(cv_mgamma)) // set the gamma'd/hued positions (saturation is done later)
|
|| diffconsbrightness(cv_mbrightness)) // set the brightness'd/hued positions (saturation is done later)
|
||||||
{
|
{
|
||||||
float mod, tempgammamul, tempgammaoffs;
|
float mod, tempbrightnessmul, tempbrightnessoffs;
|
||||||
|
|
||||||
apply = true;
|
apply = true;
|
||||||
|
|
||||||
working[0][0][0][0] = working[0][0][0][1] = working[0][0][0][2] = globalgammaoffs;
|
working[0][0][0][0] = working[0][0][0][1] = working[0][0][0][2] = globalbrightnessoffs;
|
||||||
working[1][1][1][0] = working[1][1][1][1] = working[1][1][1][2] = globalgammaoffs+globalgammamul;
|
working[1][1][1][0] = working[1][1][1][1] = working[1][1][1][2] = globalbrightnessoffs+globalbrightnessmul;
|
||||||
|
|
||||||
#define dohue(hue, gamma, loc) \
|
#define dohue(hue, brightness, loc) \
|
||||||
tempgammamul = (gamma ? ((255.0f - (gammascale*abs(gamma)))/255.0f)*globalgammamul : globalgammamul);\
|
tempbrightnessmul = (brightness ? ((255.0f - (brightnessscale*abs(brightness)))/255.0f)*globalbrightnessmul : globalbrightnessmul);\
|
||||||
tempgammaoffs = ((gamma > 0) ? ((gammascale*gamma)/255.0f) + globalgammaoffs : globalgammaoffs);\
|
tempbrightnessoffs = ((brightness > 0) ? ((brightnessscale*brightness)/255.0f) + globalbrightnessoffs : globalbrightnessoffs);\
|
||||||
mod = ((hue % huecoloursteps)*(tempgammamul)/huecoloursteps);\
|
mod = ((hue % huecoloursteps)*(tempbrightnessmul)/huecoloursteps);\
|
||||||
switch (hue/huecoloursteps)\
|
switch (hue/huecoloursteps)\
|
||||||
{\
|
{\
|
||||||
case 0:\
|
case 0:\
|
||||||
default:\
|
default:\
|
||||||
loc[0] = tempgammaoffs+tempgammamul;\
|
loc[0] = tempbrightnessoffs+tempbrightnessmul;\
|
||||||
loc[1] = tempgammaoffs+mod;\
|
loc[1] = tempbrightnessoffs+mod;\
|
||||||
loc[2] = tempgammaoffs;\
|
loc[2] = tempbrightnessoffs;\
|
||||||
break;\
|
break;\
|
||||||
case 1:\
|
case 1:\
|
||||||
loc[0] = tempgammaoffs+tempgammamul-mod;\
|
loc[0] = tempbrightnessoffs+tempbrightnessmul-mod;\
|
||||||
loc[1] = tempgammaoffs+tempgammamul;\
|
loc[1] = tempbrightnessoffs+tempbrightnessmul;\
|
||||||
loc[2] = tempgammaoffs;\
|
loc[2] = tempbrightnessoffs;\
|
||||||
break;\
|
break;\
|
||||||
case 2:\
|
case 2:\
|
||||||
loc[0] = tempgammaoffs;\
|
loc[0] = tempbrightnessoffs;\
|
||||||
loc[1] = tempgammaoffs+tempgammamul;\
|
loc[1] = tempbrightnessoffs+tempbrightnessmul;\
|
||||||
loc[2] = tempgammaoffs+mod;\
|
loc[2] = tempbrightnessoffs+mod;\
|
||||||
break;\
|
break;\
|
||||||
case 3:\
|
case 3:\
|
||||||
loc[0] = tempgammaoffs;\
|
loc[0] = tempbrightnessoffs;\
|
||||||
loc[1] = tempgammaoffs+tempgammamul-mod;\
|
loc[1] = tempbrightnessoffs+tempbrightnessmul-mod;\
|
||||||
loc[2] = tempgammaoffs+tempgammamul;\
|
loc[2] = tempbrightnessoffs+tempbrightnessmul;\
|
||||||
break;\
|
break;\
|
||||||
case 4:\
|
case 4:\
|
||||||
loc[0] = tempgammaoffs+mod;\
|
loc[0] = tempbrightnessoffs+mod;\
|
||||||
loc[1] = tempgammaoffs;\
|
loc[1] = tempbrightnessoffs;\
|
||||||
loc[2] = tempgammaoffs+tempgammamul;\
|
loc[2] = tempbrightnessoffs+tempbrightnessmul;\
|
||||||
break;\
|
break;\
|
||||||
case 5:\
|
case 5:\
|
||||||
loc[0] = tempgammaoffs+tempgammamul;\
|
loc[0] = tempbrightnessoffs+tempbrightnessmul;\
|
||||||
loc[1] = tempgammaoffs;\
|
loc[1] = tempbrightnessoffs;\
|
||||||
loc[2] = tempgammaoffs+tempgammamul-mod;\
|
loc[2] = tempbrightnessoffs+tempbrightnessmul-mod;\
|
||||||
break;\
|
break;\
|
||||||
}
|
}
|
||||||
dohue(cv_rhue.value, cv_rgamma.value, working[1][0][0]);
|
dohue(cv_rhue.value, cv_rbrightness.value, working[1][0][0]);
|
||||||
dohue(cv_yhue.value, cv_ygamma.value, working[1][1][0]);
|
dohue(cv_yhue.value, cv_ybrightness.value, working[1][1][0]);
|
||||||
dohue(cv_ghue.value, cv_ggamma.value, working[0][1][0]);
|
dohue(cv_ghue.value, cv_gbrightness.value, working[0][1][0]);
|
||||||
dohue(cv_chue.value, cv_cgamma.value, working[0][1][1]);
|
dohue(cv_chue.value, cv_cbrightness.value, working[0][1][1]);
|
||||||
dohue(cv_bhue.value, cv_bgamma.value, working[0][0][1]);
|
dohue(cv_bhue.value, cv_bbrightness.value, working[0][0][1]);
|
||||||
dohue(cv_mhue.value, cv_mgamma.value, working[1][0][1]);
|
dohue(cv_mhue.value, cv_mbrightness.value, working[1][0][1]);
|
||||||
#undef dohue
|
#undef dohue
|
||||||
}
|
}
|
||||||
|
|
||||||
#define dosaturation(a, e) a = ((1 - work)*e + work*a)
|
#define dosaturation(a, e) a = ((1 - work)*e + work*a)
|
||||||
#define docvsat(cv_sat, hue, gamma, r, g, b) \
|
#define docvsat(cv_sat, hue, brightness, r, g, b) \
|
||||||
if diffconssat(cv_sat)\
|
if diffconssat(cv_sat)\
|
||||||
{\
|
{\
|
||||||
float work, mod, tempgammamul, tempgammaoffs;\
|
float work, mod, tempbrightnessmul, tempbrightnessoffs;\
|
||||||
apply = true;\
|
apply = true;\
|
||||||
work = (cv_sat.value/10.0f);\
|
work = (cv_sat.value/10.0f);\
|
||||||
mod = ((hue % huecoloursteps)*(1.0f)/huecoloursteps);\
|
mod = ((hue % huecoloursteps)*(1.0f)/huecoloursteps);\
|
||||||
@@ -228,20 +231,20 @@ static boolean InitCube(void)
|
|||||||
mod = 2-mod;\
|
mod = 2-mod;\
|
||||||
else\
|
else\
|
||||||
mod += 1;\
|
mod += 1;\
|
||||||
tempgammamul = (gamma ? ((255.0f - (gammascale*abs(gamma)))/255.0f)*globalgammamul : globalgammamul);\
|
tempbrightnessmul = (brightness ? ((255.0f - (brightnessscale*abs(brightness)))/255.0f)*globalbrightnessmul : globalbrightnessmul);\
|
||||||
tempgammaoffs = ((gamma > 0) ? ((gammascale*gamma)/255.0f) + globalgammaoffs : globalgammaoffs);\
|
tempbrightnessoffs = ((brightness > 0) ? ((brightnessscale*brightness)/255.0f) + globalbrightnessoffs : globalbrightnessoffs);\
|
||||||
for (q = 0; q < 3; q++)\
|
for (q = 0; q < 3; q++)\
|
||||||
dosaturation(working[r][g][b][q], (tempgammaoffs+(desatur[q]*mod*tempgammamul)));\
|
dosaturation(working[r][g][b][q], (tempbrightnessoffs+(desatur[q]*mod*tempbrightnessmul)));\
|
||||||
}
|
}
|
||||||
|
|
||||||
docvsat(cv_rsaturation, cv_rhue.value, cv_rgamma.value, 1, 0, 0);
|
docvsat(cv_rsaturation, cv_rhue.value, cv_rbrightness.value, 1, 0, 0);
|
||||||
docvsat(cv_ysaturation, cv_yhue.value, cv_ygamma.value, 1, 1, 0);
|
docvsat(cv_ysaturation, cv_yhue.value, cv_ybrightness.value, 1, 1, 0);
|
||||||
docvsat(cv_gsaturation, cv_ghue.value, cv_ggamma.value, 0, 1, 0);
|
docvsat(cv_gsaturation, cv_ghue.value, cv_gbrightness.value, 0, 1, 0);
|
||||||
docvsat(cv_csaturation, cv_chue.value, cv_cgamma.value, 0, 1, 1);
|
docvsat(cv_csaturation, cv_chue.value, cv_cbrightness.value, 0, 1, 1);
|
||||||
docvsat(cv_bsaturation, cv_bhue.value, cv_bgamma.value, 0, 0, 1);
|
docvsat(cv_bsaturation, cv_bhue.value, cv_bbrightness.value, 0, 0, 1);
|
||||||
docvsat(cv_msaturation, cv_mhue.value, cv_mgamma.value, 1, 0, 1);
|
docvsat(cv_msaturation, cv_mhue.value, cv_mbrightness.value, 1, 0, 1);
|
||||||
|
|
||||||
#undef gammascale
|
#undef brightnessscale
|
||||||
|
|
||||||
if diffconssat(cv_globalsaturation)
|
if diffconssat(cv_globalsaturation)
|
||||||
{
|
{
|
||||||
@@ -264,7 +267,7 @@ static boolean InitCube(void)
|
|||||||
#undef dosaturation
|
#undef dosaturation
|
||||||
|
|
||||||
#undef diffcons
|
#undef diffcons
|
||||||
#undef diffconsgamma
|
#undef diffconsbrightness
|
||||||
#undef diffconssat
|
#undef diffconssat
|
||||||
|
|
||||||
if (!apply)
|
if (!apply)
|
||||||
@@ -301,24 +304,6 @@ same, I'm not gonna be the one to remove this base modification.
|
|||||||
toast 20/04/17
|
toast 20/04/17
|
||||||
... welp yes i am (27/07/19, see the ifdef around it)
|
... welp yes i am (27/07/19, see the ifdef around it)
|
||||||
*/
|
*/
|
||||||
const UINT8 correctiontable[256] =
|
|
||||||
{1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,
|
|
||||||
17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,
|
|
||||||
33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,
|
|
||||||
49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,
|
|
||||||
65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,
|
|
||||||
81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,
|
|
||||||
97,98,99,100,101,102,103,104,105,106,107,108,109,110,111,112,
|
|
||||||
113,114,115,116,117,118,119,120,121,122,123,124,125,126,127,128,
|
|
||||||
128,129,130,131,132,133,134,135,136,137,138,139,140,141,142,143,
|
|
||||||
144,145,146,147,148,149,150,151,152,153,154,155,156,157,158,159,
|
|
||||||
160,161,162,163,164,165,166,167,168,169,170,171,172,173,174,175,
|
|
||||||
176,177,178,179,180,181,182,183,184,185,186,187,188,189,190,191,
|
|
||||||
192,193,194,195,196,197,198,199,200,201,202,203,204,205,206,207,
|
|
||||||
208,209,210,211,212,213,214,215,216,217,218,219,220,221,222,223,
|
|
||||||
224,225,226,227,228,229,230,231,232,233,234,235,236,237,238,239,
|
|
||||||
240,241,242,243,244,245,246,247,248,249,250,251,252,253,254,255};
|
|
||||||
|
|
||||||
const UINT8 gammatable[5][256] =
|
const UINT8 gammatable[5][256] =
|
||||||
{
|
{
|
||||||
{1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,
|
{1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,
|
||||||
@@ -404,6 +389,26 @@ const UINT8 gammatable[5][256] =
|
|||||||
};
|
};
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
UINT32 V_GammaCorrect(UINT32 input, double power)
|
||||||
|
{
|
||||||
|
RGBA_t result;
|
||||||
|
double linear;
|
||||||
|
|
||||||
|
result.rgba = input;
|
||||||
|
|
||||||
|
linear = ((double)result.s.red)/255.0f;
|
||||||
|
linear = pow(linear, power)*255.0f;
|
||||||
|
result.s.red = (UINT8)(linear);
|
||||||
|
linear = ((double)result.s.green)/255.0f;
|
||||||
|
linear = pow(linear, power)*255.0f;
|
||||||
|
result.s.green = (UINT8)(linear);
|
||||||
|
linear = ((double)result.s.blue)/255.0f;
|
||||||
|
linear = pow(linear, power)*255.0f;
|
||||||
|
result.s.blue = (UINT8)(linear);
|
||||||
|
|
||||||
|
return result.rgba;
|
||||||
|
}
|
||||||
|
|
||||||
// keep a copy of the palette so that we can get the RGB value for a color index at any time.
|
// keep a copy of the palette so that we can get the RGB value for a color index at any time.
|
||||||
static void LoadPalette(const char *lumpname)
|
static void LoadPalette(const char *lumpname)
|
||||||
{
|
{
|
||||||
@@ -412,7 +417,7 @@ static void LoadPalette(const char *lumpname)
|
|||||||
lumpnum_t lumpnum;
|
lumpnum_t lumpnum;
|
||||||
|
|
||||||
#ifdef BACKWARDSCOMPATCORRECTION
|
#ifdef BACKWARDSCOMPATCORRECTION
|
||||||
const UINT8 *usegamma = gammatable[min(max(cv_globalgamma.value, 0), 4)];
|
const UINT8 *usegamma = gammatable[cv_globalgamma.value];
|
||||||
#endif
|
#endif
|
||||||
Cubeapply = InitCube();
|
Cubeapply = InitCube();
|
||||||
|
|
||||||
@@ -422,25 +427,18 @@ static void LoadPalette(const char *lumpname)
|
|||||||
palsize = currentPaletteSize / 3;
|
palsize = currentPaletteSize / 3;
|
||||||
|
|
||||||
Z_Free(pLocalPalette);
|
Z_Free(pLocalPalette);
|
||||||
|
Z_Free(pGammaCorrectedPalette);
|
||||||
|
|
||||||
pLocalPalette = Z_Malloc(sizeof (*pLocalPalette)*palsize, PU_STATIC, NULL);
|
pLocalPalette = Z_Malloc(sizeof (*pLocalPalette)*palsize, PU_STATIC, NULL);
|
||||||
|
pGammaCorrectedPalette = Z_Malloc(sizeof (*pGammaCorrectedPalette)*palsize, PU_STATIC, NULL);
|
||||||
|
|
||||||
pal = W_CacheLumpNum(lumpnum, PU_CACHE);
|
pal = W_CacheLumpNum(lumpnum, PU_CACHE);
|
||||||
for (i = 0; i < palsize; i++)
|
for (i = 0; i < palsize; i++)
|
||||||
{
|
{
|
||||||
#ifdef BACKWARDSCOMPATCORRECTION
|
#ifdef BACKWARDSCOMPATCORRECTION
|
||||||
if (cv_globalgamma.value >= 0 && cv_globalgamma.value <= 4)
|
pLocalPalette[i].s.red = usegamma[*pal++];
|
||||||
{
|
pLocalPalette[i].s.green = usegamma[*pal++];
|
||||||
pLocalPalette[i].s.red = usegamma[*pal++];
|
pLocalPalette[i].s.blue = usegamma[*pal++];
|
||||||
pLocalPalette[i].s.green = usegamma[*pal++];
|
|
||||||
pLocalPalette[i].s.blue = usegamma[*pal++];
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
pLocalPalette[i].s.red = correctiontable[*pal++];
|
|
||||||
pLocalPalette[i].s.green = correctiontable[*pal++];
|
|
||||||
pLocalPalette[i].s.blue = correctiontable[*pal++];
|
|
||||||
}
|
|
||||||
#else
|
#else
|
||||||
pLocalPalette[i].s.red = *pal++;
|
pLocalPalette[i].s.red = *pal++;
|
||||||
pLocalPalette[i].s.green = *pal++;
|
pLocalPalette[i].s.green = *pal++;
|
||||||
@@ -448,15 +446,17 @@ static void LoadPalette(const char *lumpname)
|
|||||||
#endif
|
#endif
|
||||||
pLocalPalette[i].s.alpha = 0xFF;
|
pLocalPalette[i].s.alpha = 0xFF;
|
||||||
|
|
||||||
|
pGammaCorrectedPalette[i].rgba = V_GammaDecode(pLocalPalette[i].rgba);
|
||||||
|
|
||||||
if (!Cubeapply)
|
if (!Cubeapply)
|
||||||
continue;
|
continue;
|
||||||
|
|
||||||
// lerp of colour cubing! if you want, make it smoother yourself
|
V_CubeApply(&pGammaCorrectedPalette[i]);
|
||||||
V_CubeApply(&pLocalPalette[i].s.red, &pLocalPalette[i].s.green, &pLocalPalette[i].s.blue);
|
pLocalPalette[i].rgba = V_GammaEncode(pGammaCorrectedPalette[i].rgba);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
void V_CubeApply(UINT8 *red, UINT8 *green, UINT8 *blue)
|
void V_CubeApply(RGBA_t *input)
|
||||||
{
|
{
|
||||||
float working[4][3];
|
float working[4][3];
|
||||||
float linear;
|
float linear;
|
||||||
@@ -465,7 +465,7 @@ void V_CubeApply(UINT8 *red, UINT8 *green, UINT8 *blue)
|
|||||||
if (!Cubeapply)
|
if (!Cubeapply)
|
||||||
return;
|
return;
|
||||||
|
|
||||||
linear = (*red/255.0f);
|
linear = ((*input).s.red/255.0);
|
||||||
#define dolerp(e1, e2) ((1 - linear)*e1 + linear*e2)
|
#define dolerp(e1, e2) ((1 - linear)*e1 + linear*e2)
|
||||||
for (q = 0; q < 3; q++)
|
for (q = 0; q < 3; q++)
|
||||||
{
|
{
|
||||||
@@ -474,13 +474,15 @@ void V_CubeApply(UINT8 *red, UINT8 *green, UINT8 *blue)
|
|||||||
working[2][q] = dolerp(Cubepal[0][0][1][q], Cubepal[1][0][1][q]);
|
working[2][q] = dolerp(Cubepal[0][0][1][q], Cubepal[1][0][1][q]);
|
||||||
working[3][q] = dolerp(Cubepal[0][1][1][q], Cubepal[1][1][1][q]);
|
working[3][q] = dolerp(Cubepal[0][1][1][q], Cubepal[1][1][1][q]);
|
||||||
}
|
}
|
||||||
linear = (*green/255.0f);
|
|
||||||
|
linear = ((*input).s.green/255.0);
|
||||||
for (q = 0; q < 3; q++)
|
for (q = 0; q < 3; q++)
|
||||||
{
|
{
|
||||||
working[0][q] = dolerp(working[0][q], working[1][q]);
|
working[0][q] = dolerp(working[0][q], working[1][q]);
|
||||||
working[1][q] = dolerp(working[2][q], working[3][q]);
|
working[1][q] = dolerp(working[2][q], working[3][q]);
|
||||||
}
|
}
|
||||||
linear = (*blue/255.0f);
|
|
||||||
|
linear = ((*input).s.blue/255.0);
|
||||||
for (q = 0; q < 3; q++)
|
for (q = 0; q < 3; q++)
|
||||||
{
|
{
|
||||||
working[0][q] = 255*dolerp(working[0][q], working[1][q]);
|
working[0][q] = 255*dolerp(working[0][q], working[1][q]);
|
||||||
@@ -491,9 +493,9 @@ void V_CubeApply(UINT8 *red, UINT8 *green, UINT8 *blue)
|
|||||||
}
|
}
|
||||||
#undef dolerp
|
#undef dolerp
|
||||||
|
|
||||||
*red = (UINT8)(working[0][0]);
|
(*input).s.red = (UINT8)(working[0][0]);
|
||||||
*green = (UINT8)(working[0][1]);
|
(*input).s.green = (UINT8)(working[0][1]);
|
||||||
*blue = (UINT8)(working[0][2]);
|
(*input).s.blue = (UINT8)(working[0][2]);
|
||||||
}
|
}
|
||||||
|
|
||||||
const char *R_GetPalname(UINT16 num)
|
const char *R_GetPalname(UINT16 num)
|
||||||
@@ -626,13 +628,13 @@ void VID_BlitLinearScreen(const UINT8 *restrict srcptr, UINT8 *restrict destptr,
|
|||||||
i -= 16;
|
i -= 16;
|
||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
M_Memcpy(destptr, srcptr, i);
|
memcpy(destptr, srcptr, i);
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
while (height--)
|
while (height--)
|
||||||
{
|
{
|
||||||
M_Memcpy(destptr, srcptr, width);
|
memcpy(destptr, srcptr, width);
|
||||||
|
|
||||||
destptr += destrowbytes;
|
destptr += destrowbytes;
|
||||||
srcptr += srcrowbytes;
|
srcptr += srcrowbytes;
|
||||||
@@ -1193,7 +1195,7 @@ void V_DrawBlock(INT32 x, INT32 y, INT32 scrn, INT32 width, INT32 height, const
|
|||||||
|
|
||||||
while (height--)
|
while (height--)
|
||||||
{
|
{
|
||||||
M_Memcpy(dest, src, width);
|
memcpy(dest, src, width);
|
||||||
|
|
||||||
src += width;
|
src += width;
|
||||||
dest += vid.width;
|
dest += vid.width;
|
||||||
@@ -1328,37 +1330,37 @@ void V_DrawFill(INT32 x, INT32 y, INT32 w, INT32 h, INT32 c)
|
|||||||
// This is now a function since it's otherwise repeated 2 times and honestly looks retarded:
|
// This is now a function since it's otherwise repeated 2 times and honestly looks retarded:
|
||||||
static UINT32 V_GetHWConsBackColor(void)
|
static UINT32 V_GetHWConsBackColor(void)
|
||||||
{
|
{
|
||||||
UINT8 r, g, b;
|
RGBA_t output;
|
||||||
|
|
||||||
switch (cons_backcolor.value)
|
switch (cons_backcolor.value)
|
||||||
{
|
{
|
||||||
case 0: r = 0xff; g = 0xff; b = 0xff; break; // White
|
case 0: output.s.red = 0xff; output.s.green = 0xff; output.s.blue = 0xff; break; // White
|
||||||
case 1: r = 0x80; g = 0x80; b = 0x80; break; // Black
|
case 1: output.s.red = 0x80; output.s.green = 0x80; output.s.blue = 0x80; break; // Black
|
||||||
case 2: r = 0xde; g = 0xb8; b = 0x87; break; // Sepia
|
case 2: output.s.red = 0xde; output.s.green = 0xb8; output.s.blue = 0x87; break; // Sepia
|
||||||
case 3: r = 0x40; g = 0x20; b = 0x10; break; // Brown
|
case 3: output.s.red = 0x40; output.s.green = 0x20; output.s.blue = 0x10; break; // Brown
|
||||||
case 4: r = 0xfa; g = 0x80; b = 0x72; break; // Pink
|
case 4: output.s.red = 0xfa; output.s.green = 0x80; output.s.blue = 0x72; break; // Pink
|
||||||
case 5: r = 0xff; g = 0x69; b = 0xb4; break; // Raspberry
|
case 5: output.s.red = 0xff; output.s.green = 0x69; output.s.blue = 0xb4; break; // Raspberry
|
||||||
case 6: r = 0xff; g = 0x00; b = 0x00; break; // Red
|
case 6: output.s.red = 0xff; output.s.green = 0x00; output.s.blue = 0x00; break; // Red
|
||||||
case 7: r = 0xff; g = 0xd6; b = 0x83; break; // Creamsicle
|
case 7: output.s.red = 0xff; output.s.green = 0xd6; output.s.blue = 0x83; break; // Creamsicle
|
||||||
case 8: r = 0xff; g = 0x80; b = 0x00; break; // Orange
|
case 8: output.s.red = 0xff; output.s.green = 0x80; output.s.blue = 0x00; break; // Orange
|
||||||
case 9: r = 0xda; g = 0xa5; b = 0x20; break; // Gold
|
case 9: output.s.red = 0xda; output.s.green = 0xa5; output.s.blue = 0x20; break; // Gold
|
||||||
case 10: r = 0x80; g = 0x80; b = 0x00; break; // Yellow
|
case 10: output.s.red = 0x80; output.s.green = 0x80; output.s.blue = 0x00; break; // Yellow
|
||||||
case 11: r = 0x00; g = 0xff; b = 0x00; break; // Emerald
|
case 11: output.s.red = 0x00; output.s.green = 0xff; output.s.blue = 0x00; break; // Emerald
|
||||||
case 12: r = 0x00; g = 0x80; b = 0x00; break; // Green
|
case 12: output.s.red = 0x00; output.s.green = 0x80; output.s.blue = 0x00; break; // Green
|
||||||
case 13: r = 0x40; g = 0x80; b = 0xff; break; // Cyan
|
case 13: output.s.red = 0x40; output.s.green = 0x80; output.s.blue = 0xff; break; // Cyan
|
||||||
case 14: r = 0x46; g = 0x82; b = 0xb4; break; // Steel
|
case 14: output.s.red = 0x46; output.s.green = 0x82; output.s.blue = 0xb4; break; // Steel
|
||||||
case 15: r = 0x1e; g = 0x90; b = 0xff; break; // Periwinkle
|
case 15: output.s.red = 0x1e; output.s.green = 0x90; output.s.blue = 0xff; break; // Periwinkle
|
||||||
case 16: r = 0x00; g = 0x00; b = 0xff; break; // Blue
|
case 16: output.s.red = 0x00; output.s.green = 0x00; output.s.blue = 0xff; break; // Blue
|
||||||
case 17: r = 0xff; g = 0x00; b = 0xff; break; // Purple
|
case 17: output.s.red = 0xff; output.s.green = 0x00; output.s.blue = 0xff; break; // Purple
|
||||||
case 18: r = 0xee; g = 0x82; b = 0xee; break; // Lavender
|
case 18: output.s.red = 0xee; output.s.green = 0x82; output.s.blue = 0xee; break; // Lavender
|
||||||
// Default green
|
// Default green
|
||||||
default: r = 0x00; g = 0x80; b = 0x00; break;
|
default: output.s.red = 0x00; output.s.green = 0x80; output.s.blue = 0x00; break;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (!HWR_ShouldUsePaletteRendering())
|
if (!HWR_ShouldUsePaletteRendering())
|
||||||
V_CubeApply(&r, &g, &b);
|
V_CubeApply(&output);
|
||||||
|
|
||||||
return (r << 24) | (g << 16) | (b << 8);
|
return (output.s.red << 24) | (output.s.green << 16) | (output.s.blue << 8);
|
||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
@@ -1738,7 +1740,8 @@ void V_DrawHorizontallyScaledFullScreenPatch(patch_t *patch)
|
|||||||
|
|
||||||
void V_DrawVhsEffect(boolean rewind)
|
void V_DrawVhsEffect(boolean rewind)
|
||||||
{
|
{
|
||||||
static fixed_t upbary = 100, downbary = 150;
|
fixed_t uby, dby;
|
||||||
|
static fixed_t upbary = 100*FRACUNIT, downbary = 150*FRACUNIT;
|
||||||
|
|
||||||
UINT8 barsize, updistort, downdistort;
|
UINT8 barsize, updistort, downdistort;
|
||||||
|
|
||||||
@@ -1759,19 +1762,21 @@ void V_DrawVhsEffect(boolean rewind)
|
|||||||
if (rewind)
|
if (rewind)
|
||||||
V_DrawVhsEffect(false); // experimentation
|
V_DrawVhsEffect(false); // experimentation
|
||||||
|
|
||||||
upbary -= FixedMul(vid.dup * (rewind ? 3 : 1.8f), renderdeltatics);
|
upbary -= renderdeltatics * (vid.dup * (rewind ? 3 : 1.8f));
|
||||||
downbary += FixedMul(vid.dup * (rewind ? 2 : 1), renderdeltatics);
|
downbary += renderdeltatics * (vid.dup * (rewind ? 2 : 1));
|
||||||
|
|
||||||
if (upbary < -barsize)
|
if (upbary < -barsize*FRACUNIT)
|
||||||
upbary = vid.height;
|
upbary = vid.height << FRACBITS;
|
||||||
|
if (downbary > vid.height << FRACBITS)
|
||||||
|
downbary = -barsize*FRACUNIT;
|
||||||
|
|
||||||
if (downbary > vid.height)
|
uby = upbary >> FRACBITS;
|
||||||
downbary = -barsize;
|
dby = downbary >> FRACBITS;
|
||||||
|
|
||||||
#ifdef HWRENDER
|
#ifdef HWRENDER
|
||||||
if (rendermode == render_opengl)
|
if (rendermode == render_opengl)
|
||||||
{
|
{
|
||||||
HWR_RenderVhsEffect(upbary, downbary, updistort, downdistort, barsize);
|
HWR_RenderVhsEffect(uby, dby, updistort, downdistort, barsize);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
@@ -1791,16 +1796,16 @@ void V_DrawVhsEffect(boolean rewind)
|
|||||||
thismapstart = normalmapstart;
|
thismapstart = normalmapstart;
|
||||||
offs = 0;
|
offs = 0;
|
||||||
|
|
||||||
if (y >= upbary && y < upbary+barsize)
|
if (y >= uby && y < uby+barsize)
|
||||||
{
|
{
|
||||||
thismapstart -= (2<<FF_TRANSSHIFT) - (5<<8);
|
thismapstart -= (2<<FF_TRANSSHIFT) - (5<<8);
|
||||||
offs += updistort * 2.0f * min(y-upbary, upbary+barsize-y) / barsize;
|
offs += updistort * 2.0f * min(y-uby, uby+barsize-y) / barsize;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (y >= downbary && y < downbary+barsize)
|
if (y >= dby && y < dby+barsize)
|
||||||
{
|
{
|
||||||
thismapstart -= (2<<FF_TRANSSHIFT) - (5<<8);
|
thismapstart -= (2<<FF_TRANSSHIFT) - (5<<8);
|
||||||
offs -= downdistort * 2.0f * min(y-downbary, downbary+barsize-y) / barsize;
|
offs -= downdistort * 2.0f * min(y-dby, dby+barsize-y) / barsize;
|
||||||
}
|
}
|
||||||
|
|
||||||
offs += M_RandomKey(vid.dup<<1);
|
offs += M_RandomKey(vid.dup<<1);
|
||||||
@@ -3644,7 +3649,7 @@ void V_DoPostProcessor(INT32 view, INT32 param)
|
|||||||
|
|
||||||
if (sine < 0)
|
if (sine < 0)
|
||||||
{
|
{
|
||||||
M_Memcpy(&tmpscr[(y*vid.width)+xoffset+newpix], &srcscr[(y*vid.width)+xoffset], viewwidth-newpix);
|
memcpy(&tmpscr[(y*vid.width)+xoffset+newpix], &srcscr[(y*vid.width)+xoffset], viewwidth-newpix);
|
||||||
|
|
||||||
// Cleanup edge
|
// Cleanup edge
|
||||||
while (newpix)
|
while (newpix)
|
||||||
@@ -3655,7 +3660,7 @@ void V_DoPostProcessor(INT32 view, INT32 param)
|
|||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
M_Memcpy(&tmpscr[(y*vid.width)+xoffset+0], &srcscr[(y*vid.width)+xoffset+sine], viewwidth-newpix);
|
memcpy(&tmpscr[(y*vid.width)+xoffset+0], &srcscr[(y*vid.width)+xoffset+sine], viewwidth-newpix);
|
||||||
|
|
||||||
// Cleanup edge
|
// Cleanup edge
|
||||||
while (newpix)
|
while (newpix)
|
||||||
@@ -3715,10 +3720,10 @@ void V_DoPostProcessor(INT32 view, INT32 param)
|
|||||||
{
|
{
|
||||||
// Shift this row of pixels to the right by 2
|
// Shift this row of pixels to the right by 2
|
||||||
tmpscr[(y*vid.width)+xoffset] = srcscr[(y*vid.width)+xoffset];
|
tmpscr[(y*vid.width)+xoffset] = srcscr[(y*vid.width)+xoffset];
|
||||||
M_Memcpy(&tmpscr[(y*vid.width)+xoffset], &srcscr[(y*vid.width)+xoffset+vid.dup], viewwidth-vid.dup);
|
memcpy(&tmpscr[(y*vid.width)+xoffset], &srcscr[(y*vid.width)+xoffset+vid.dup], viewwidth-vid.dup);
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
M_Memcpy(&tmpscr[(y*vid.width)+xoffset], &srcscr[(y*vid.width)+xoffset], viewwidth);
|
memcpy(&tmpscr[(y*vid.width)+xoffset], &srcscr[(y*vid.width)+xoffset], viewwidth);
|
||||||
|
|
||||||
heatindex[view] %= viewheight;
|
heatindex[view] %= viewheight;
|
||||||
}
|
}
|
||||||
@@ -3755,7 +3760,7 @@ void V_DoPostProcessor(INT32 view, INT32 param)
|
|||||||
INT32 y, y2;
|
INT32 y, y2;
|
||||||
|
|
||||||
for (y = yoffset, y2 = yoffset+viewheight - 1; y < yoffset+viewheight; y++, y2--)
|
for (y = yoffset, y2 = yoffset+viewheight - 1; y < yoffset+viewheight; y++, y2--)
|
||||||
M_Memcpy(&tmpscr[(y2*vid.width)+xoffset], &srcscr[(y*vid.width)+xoffset], viewwidth);
|
memcpy(&tmpscr[(y2*vid.width)+xoffset], &srcscr[(y*vid.width)+xoffset], viewwidth);
|
||||||
|
|
||||||
UINT8 *tmp = tmpscr;
|
UINT8 *tmp = tmpscr;
|
||||||
tmpscr = srcscr;
|
tmpscr = srcscr;
|
||||||
@@ -3811,12 +3816,14 @@ void InitColorLUT(colorlookup_t *lut, RGBA_t *palette, boolean makecolors)
|
|||||||
UINT8 r, g, b;
|
UINT8 r, g, b;
|
||||||
|
|
||||||
for (r = 0; r < 0xFF; r++)
|
for (r = 0; r < 0xFF; r++)
|
||||||
for (g = 0; g < 0xFF; g++)
|
|
||||||
for (b = 0; b < 0xFF; b++)
|
|
||||||
{
|
{
|
||||||
i = CLUTINDEX(r, g, b);
|
for (g = 0; g < 0xFF; g++)
|
||||||
if (lut->table[i] == 0xFFFF)
|
{
|
||||||
lut->table[i] = NearestPaletteColor(r, g, b, palette);
|
for (b = 0; b < 0xFF; b++)
|
||||||
|
{
|
||||||
|
lut->table[i] = GetColorLUT(lut, r, g, b);
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
+11
-3
@@ -40,9 +40,12 @@ extern "C" {
|
|||||||
//
|
//
|
||||||
|
|
||||||
extern consvar_t cv_ticrate, cv_accuratefps, cv_allcaps, cv_constextsize, cv_menucaps,
|
extern consvar_t cv_ticrate, cv_accuratefps, cv_allcaps, cv_constextsize, cv_menucaps,
|
||||||
cv_globalgamma, cv_globalsaturation,
|
#ifdef BACKWARDSCOMPATCORRECTION
|
||||||
|
cv_globalgamma,
|
||||||
|
#endif
|
||||||
|
cv_globalbrightness, cv_globalsaturation,
|
||||||
cv_rhue, cv_yhue, cv_ghue, cv_chue, cv_bhue, cv_mhue,
|
cv_rhue, cv_yhue, cv_ghue, cv_chue, cv_bhue, cv_mhue,
|
||||||
cv_rgamma, cv_ygamma, cv_ggamma, cv_cgamma, cv_bgamma, cv_mgamma,
|
cv_rbrightness, cv_ybrightness, cv_gbrightness, cv_cbrightness, cv_bbrightness, cv_mbrightness,
|
||||||
cv_rsaturation, cv_ysaturation, cv_gsaturation, cv_csaturation, cv_bsaturation, cv_msaturation,
|
cv_rsaturation, cv_ysaturation, cv_gsaturation, cv_csaturation, cv_bsaturation, cv_msaturation,
|
||||||
cv_palette, cv_palettenum;
|
cv_palette, cv_palettenum;
|
||||||
|
|
||||||
@@ -78,10 +81,15 @@ const char *R_GetPalname(UINT16 num);
|
|||||||
const char *GetPalette(void);
|
const char *GetPalette(void);
|
||||||
|
|
||||||
extern RGBA_t *pLocalPalette;
|
extern RGBA_t *pLocalPalette;
|
||||||
|
extern RGBA_t *pGammaCorrectedPalette;
|
||||||
|
|
||||||
extern UINT8 hudtrans;
|
extern UINT8 hudtrans;
|
||||||
|
|
||||||
void V_CubeApply(UINT8 *red, UINT8 *green, UINT8 *blue);
|
UINT32 V_GammaCorrect(UINT32 input, double power);
|
||||||
|
#define V_GammaDecode(input) V_GammaCorrect(input, 2.2f)
|
||||||
|
#define V_GammaEncode(input) V_GammaCorrect(input, (1/2.2f))
|
||||||
|
|
||||||
|
void V_CubeApply(RGBA_t *input);
|
||||||
|
|
||||||
// Retrieve the ARGB value from a palette color index
|
// Retrieve the ARGB value from a palette color index
|
||||||
#define V_GetColor(color) (pLocalPalette[color&0xFF])
|
#define V_GetColor(color) (pLocalPalette[color&0xFF])
|
||||||
|
|||||||
+2
-2
@@ -906,7 +906,7 @@ UINT16 W_InitFile(const char *filename, boolean local, boolean startup)
|
|||||||
wadfile->endfolders = M_AATreeAlloc(AATREE_STRING);
|
wadfile->endfolders = M_AATreeAlloc(AATREE_STRING);
|
||||||
|
|
||||||
// already generated, just copy it over
|
// already generated, just copy it over
|
||||||
M_Memcpy(&wadfile->md5sum, &md5sum, 16);
|
memcpy(&wadfile->md5sum, &md5sum, 16);
|
||||||
|
|
||||||
//
|
//
|
||||||
// set up caching
|
// set up caching
|
||||||
@@ -1637,7 +1637,7 @@ size_t W_ReadLumpHeaderPwad(UINT16 wad, UINT16 lump, void *dest, size_t size, si
|
|||||||
|
|
||||||
if (!decData) // Did we get no data at all?
|
if (!decData) // Did we get no data at all?
|
||||||
return 0;
|
return 0;
|
||||||
M_Memcpy(dest, decData + offset, size);
|
memcpy(dest, decData + offset, size);
|
||||||
Z_Free(rawData);
|
Z_Free(rawData);
|
||||||
Z_Free(decData);
|
Z_Free(decData);
|
||||||
#ifdef NO_PNG_LUMPS
|
#ifdef NO_PNG_LUMPS
|
||||||
|
|||||||
+1
-2
@@ -35,7 +35,6 @@
|
|||||||
#include "i_system.h" // I_GetFreeMem
|
#include "i_system.h" // I_GetFreeMem
|
||||||
#include "i_video.h" // rendermode
|
#include "i_video.h" // rendermode
|
||||||
#include "z_zone.h"
|
#include "z_zone.h"
|
||||||
#include "m_misc.h" // M_Memcpy
|
|
||||||
#include "lua_script.h"
|
#include "lua_script.h"
|
||||||
|
|
||||||
#ifdef HWRENDER
|
#ifdef HWRENDER
|
||||||
@@ -383,7 +382,7 @@ void *Z_Realloc(void *ptr, size_t size, INT32 tag, void *user)
|
|||||||
else
|
else
|
||||||
copysize = block->size;
|
copysize = block->size;
|
||||||
|
|
||||||
M_Memcpy(rez, ptr, copysize);
|
memcpy(rez, ptr, copysize);
|
||||||
|
|
||||||
#ifdef ZDEBUG
|
#ifdef ZDEBUG
|
||||||
Z_Free2(ptr, file, line);
|
Z_Free2(ptr, file, line);
|
||||||
|
|||||||
Reference in new issue
Block a user