Compare commits
122
Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
72288e2bae | ||
|
|
0e7460009e | ||
|
|
521544f6ba | ||
|
|
efc0681e01 | ||
|
|
4c3fa7d826 | ||
|
|
ac87678708 | ||
|
|
a6e5edabd2 | ||
|
|
24e5b1d84b | ||
|
|
ade7db9004 | ||
|
|
819b171d90 | ||
|
|
882716e911 | ||
|
|
5644036d25 | ||
|
|
de74c9251f | ||
|
|
1552b1808f | ||
|
|
fd349e2b37 | ||
|
|
0cf1cabcc2 | ||
|
|
bcbe765b9d | ||
|
|
eca3effb3b | ||
|
|
f1380a276e | ||
|
|
8ffeab1646 | ||
|
|
2eb175c356 | ||
|
|
4e606fc7de | ||
|
|
c5116dea1a | ||
|
|
924f9c2151 | ||
|
|
e0fa53e4df | ||
|
|
eeb7d48a6f | ||
|
|
df291710d8 | ||
|
|
16577877d3 | ||
|
|
309d459a70 | ||
|
|
e1430f7bc7 | ||
|
|
bf70beb88a | ||
|
|
a951622f6a | ||
|
|
d7db0d68dc | ||
|
|
2b9224cc3f | ||
|
|
0a750cd3bc | ||
|
|
0e8a32612f | ||
|
|
3c6882203b | ||
|
|
0464a8b0c7 | ||
|
|
599eda96aa | ||
|
|
421d735052 | ||
|
|
73bc64f9da | ||
|
|
5d807d65e5 | ||
|
|
88d86a6e60 | ||
|
|
b2cdbaae60 | ||
|
|
9160431556 | ||
|
|
2f9a400cf3 | ||
|
|
c39073dd9e | ||
|
|
f03692b840 | ||
|
|
617e8fdd55 | ||
|
|
d5252bd3b3 | ||
|
|
94f46c3ce6 | ||
|
|
c3e709231d | ||
|
|
7878e01e3f | ||
|
|
4631844c9f | ||
|
|
e0e8be8d46 | ||
|
|
7e47b9b6ba | ||
|
|
6e91e00289 | ||
|
|
a539f38e72 | ||
|
|
4f21d8f983 | ||
|
|
31517ebebe | ||
|
|
3a2e009d01 | ||
|
|
38e50a3cfb | ||
|
|
97555bc263 | ||
|
|
848115d105 | ||
|
|
3668c2c4f3 | ||
|
|
d5f68bf2aa | ||
|
|
3ae968f060 | ||
|
|
d73f79509e | ||
|
|
19e9eedce3 | ||
|
|
8880057ff2 | ||
|
|
9692484d2e | ||
|
|
df3a64339c | ||
|
|
5a966aa317 | ||
|
|
a132db9e6e | ||
|
|
0acfc96812 | ||
|
|
f09c61cee9 | ||
|
|
735c4b67dc | ||
|
|
267a758447 | ||
|
|
6892c212d1 | ||
|
|
a1127068df | ||
|
|
7ee93d889e | ||
|
|
ee9c9e2839 | ||
|
|
28c4061a26 | ||
|
|
d0f02f1530 | ||
|
|
53fbbecbcd | ||
|
|
587f24ae85 | ||
|
|
ba0b414062 | ||
|
|
b27b4bfd7a | ||
|
|
7971f76885 | ||
|
|
7048eeacc3 | ||
|
|
8a62f4e978 | ||
|
|
f5fdf917bd | ||
|
|
b9ac91c74f | ||
|
|
b408a098bd | ||
|
|
90ab1f4994 | ||
|
|
96484c94db | ||
|
|
c805fa9f33 | ||
|
|
29159ca5cd | ||
|
|
b6b70ae8f0 | ||
|
|
2b0e4b7468 | ||
|
|
c374bd75fc | ||
|
|
ec70e8aa29 | ||
|
|
3ad6159e85 | ||
|
|
2ae1e0f56e | ||
|
|
2302d4efbd | ||
|
|
be08c9cd1f | ||
|
|
7b91666db9 | ||
|
|
ba5c85ba8a | ||
|
|
05e8771fbc | ||
|
|
59b7b0529f | ||
|
|
3fa8ab442a | ||
|
|
fdd8381258 | ||
|
|
41cbce3ed3 | ||
|
|
63e4c5a63d | ||
|
|
bba86fe4af | ||
|
|
1dee3060dd | ||
|
|
56c2178bde | ||
|
|
e445669521 | ||
|
|
7a309bc0b8 | ||
|
|
8b6ebfbad4 | ||
|
|
5775c12b16 | ||
|
|
78ebc14d88 |
No files matched your search
@@ -247,6 +247,9 @@ set(SRB2_CONFIG_ASAN OFF CACHE BOOL
|
|||||||
set(SRB2_CONFIG_UBSAN OFF CACHE BOOL
|
set(SRB2_CONFIG_UBSAN OFF CACHE BOOL
|
||||||
"Compile with UndefinedBehaviorSanitizer (libubsan).")
|
"Compile with UndefinedBehaviorSanitizer (libubsan).")
|
||||||
|
|
||||||
|
set(SRB2_CONFIG_MUMBLE ON CACHE BOOL
|
||||||
|
"Enable Mumble support")
|
||||||
|
|
||||||
set(SRB2_CONFIG_SATURNPAK ON CACHE BOOL
|
set(SRB2_CONFIG_SATURNPAK ON CACHE BOOL
|
||||||
"Enable Saturn specific special packet. Required for using the newer resynch system")
|
"Enable Saturn specific special packet. Required for using the newer resynch system")
|
||||||
set(SRB2_CONFIG_SATURNJOIN ON CACHE BOOL
|
set(SRB2_CONFIG_SATURNJOIN ON CACHE BOOL
|
||||||
@@ -254,6 +257,9 @@ set(SRB2_CONFIG_SATURNJOIN ON CACHE BOOL
|
|||||||
set(SRB2_CONFIG_SCREENFBO ON CACHE BOOL
|
set(SRB2_CONFIG_SCREENFBO ON CACHE BOOL
|
||||||
"Enable hardware renderer (OpenGL) FBO downsampling support")
|
"Enable hardware renderer (OpenGL) FBO downsampling support")
|
||||||
|
|
||||||
|
set(SRB2_CONFIG_PHOBOS ON CACHE BOOL
|
||||||
|
" Compile the Phobos client. Which contains things not compatible with vanilla, such as raised skinlimits, 32 player support, bugfixes, etc.")
|
||||||
|
|
||||||
if(${SRB2_CONFIG_DEDICATED})
|
if(${SRB2_CONFIG_DEDICATED})
|
||||||
set(SRB2_CONFIG_HAVE_GME NO)
|
set(SRB2_CONFIG_HAVE_GME NO)
|
||||||
set(SRB2_CONFIG_HAVE_OPENMPT NO)
|
set(SRB2_CONFIG_HAVE_OPENMPT NO)
|
||||||
@@ -580,6 +586,10 @@ if(${SRB2_CONFIG_SATURNJOIN})
|
|||||||
add_definitions(-DDOSATURNJOIN)
|
add_definitions(-DDOSATURNJOIN)
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
|
if(${SRB2_CONFIG_HWRENDER} AND ${SRB2_CONFIG_SCREENFBO})
|
||||||
|
add_definitions(-DPHOBOS_BUILD)
|
||||||
|
endif()
|
||||||
|
|
||||||
# Targets
|
# Targets
|
||||||
|
|
||||||
# Compatibility flag with later versions of GCC
|
# Compatibility flag with later versions of GCC
|
||||||
|
|||||||
+4
-4
@@ -65,6 +65,10 @@
|
|||||||
# DEBUGMODE=1 - Enable various debugging capabilities.
|
# DEBUGMODE=1 - Enable various debugging capabilities.
|
||||||
# Also disables optimizations.
|
# Also disables optimizations.
|
||||||
#
|
#
|
||||||
|
# PHOBOS_BUILD=1 - Compile the Phobos client.
|
||||||
|
# Contains things not compatible with vanilla.
|
||||||
|
# such as raised skinlimits, 32 player support, bugfixes, etc.
|
||||||
|
#
|
||||||
# Development flags:
|
# Development flags:
|
||||||
#
|
#
|
||||||
# VALGRIND=1 - Enable Valgrind memory debugging support.
|
# VALGRIND=1 - Enable Valgrind memory debugging support.
|
||||||
@@ -246,10 +250,6 @@ ifdef STATIC
|
|||||||
libs+=-static
|
libs+=-static
|
||||||
endif
|
endif
|
||||||
|
|
||||||
ifneq (,$(filter $(CC) $(CXX),gcc g++))
|
|
||||||
opts+=-mno-ms-bitfields
|
|
||||||
endif
|
|
||||||
|
|
||||||
# build with profiling information
|
# build with profiling information
|
||||||
ifdef PROFILEMODE
|
ifdef PROFILEMODE
|
||||||
opts+=-pg
|
opts+=-pg
|
||||||
|
|||||||
@@ -9,6 +9,7 @@ passthru_opts+=\
|
|||||||
HAVE_DISCORDRPC DEVELOP\
|
HAVE_DISCORDRPC DEVELOP\
|
||||||
NOHOLEPUNCH\
|
NOHOLEPUNCH\
|
||||||
HAVE_IPV6\
|
HAVE_IPV6\
|
||||||
|
PHOBOS_BUILD\
|
||||||
|
|
||||||
# build with debugging information
|
# build with debugging information
|
||||||
ifdef DEBUGMODE
|
ifdef DEBUGMODE
|
||||||
@@ -86,7 +87,7 @@ ifdef VALGRIND
|
|||||||
VALGRIND_PKGCONFIG?=valgrind
|
VALGRIND_PKGCONFIG?=valgrind
|
||||||
VALGRIND_LDFLAGS=
|
VALGRIND_LDFLAGS=
|
||||||
$(eval $(call Use_pkg_config,VALGRIND))
|
$(eval $(call Use_pkg_config,VALGRIND))
|
||||||
ZDEBUG=1
|
#ZDEBUG=1 we enable this by default
|
||||||
opts+=-DHAVE_VALGRIND
|
opts+=-DHAVE_VALGRIND
|
||||||
endif
|
endif
|
||||||
|
|
||||||
|
|||||||
@@ -42,8 +42,6 @@ include Makefile.d/haiku.mk
|
|||||||
else ifdef SOLARIS # FIXME: UNTESTED
|
else ifdef SOLARIS # FIXME: UNTESTED
|
||||||
UNIX=1
|
UNIX=1
|
||||||
platform=solaris
|
platform=solaris
|
||||||
else ifdef CYGWIN32 # FIXME: UNTESTED
|
|
||||||
platform=cygwin
|
|
||||||
else ifdef MINGW
|
else ifdef MINGW
|
||||||
ifdef MINGW64
|
ifdef MINGW64
|
||||||
NONX86=1
|
NONX86=1
|
||||||
|
|||||||
@@ -15,16 +15,6 @@ sources+=$(call List,sdl/Sourcefile)
|
|||||||
|
|
||||||
NOUPNP=1
|
NOUPNP=1
|
||||||
|
|
||||||
# FIXME: UNTESTED
|
|
||||||
#ifdef PANDORA
|
|
||||||
#include sdl/SRB2Pandora/Makefile.cfg
|
|
||||||
#endif #ifdef PANDORA
|
|
||||||
|
|
||||||
# FIXME: UNTESTED
|
|
||||||
#ifdef CYGWIN32
|
|
||||||
#include sdl/MakeCYG.cfg
|
|
||||||
#endif #ifdef CYGWIN32
|
|
||||||
|
|
||||||
ifndef NOHW
|
ifndef NOHW
|
||||||
sources+=sdl/ogl_sdl.c
|
sources+=sdl/ogl_sdl.c
|
||||||
endif
|
endif
|
||||||
|
|||||||
@@ -34,8 +34,8 @@ size_t I_GetFreeMem(size_t *total)
|
|||||||
/* return si.freeram; */
|
/* return si.freeram; */
|
||||||
char buf[1024];
|
char buf[1024];
|
||||||
char *memTag;
|
char *memTag;
|
||||||
UINT32 freeKBytes;
|
size_t freeKBytes;
|
||||||
UINT32 totalKBytes;
|
size_t totalKBytes;
|
||||||
INT32 n;
|
INT32 n;
|
||||||
INT32 meminfo_fd = -1;
|
INT32 meminfo_fd = -1;
|
||||||
|
|
||||||
@@ -46,7 +46,7 @@ size_t I_GetFreeMem(size_t *total)
|
|||||||
if (n < 0)
|
if (n < 0)
|
||||||
{
|
{
|
||||||
// Error
|
// Error
|
||||||
*total = 0L;
|
*total = 0;
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -54,7 +54,7 @@ size_t I_GetFreeMem(size_t *total)
|
|||||||
if (NULL == (memTag = strstr(buf, MEMTOTAL)))
|
if (NULL == (memTag = strstr(buf, MEMTOTAL)))
|
||||||
{
|
{
|
||||||
// Error
|
// Error
|
||||||
*total = 0L;
|
*total = 0;
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -64,7 +64,7 @@ size_t I_GetFreeMem(size_t *total)
|
|||||||
if (NULL == (memTag = strstr(buf, MEMFREE)))
|
if (NULL == (memTag = strstr(buf, MEMFREE)))
|
||||||
{
|
{
|
||||||
// Error
|
// Error
|
||||||
*total = 0L;
|
*total = 0;
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
+1
-1
@@ -143,7 +143,7 @@ const char *luaO_pushvfstring (lua_State *L, const char *fmt, va_list argp) {
|
|||||||
}
|
}
|
||||||
case 'p': {
|
case 'p': {
|
||||||
char buff[4*sizeof(void *) + 8]; /* should be enough space for a `%p' */
|
char buff[4*sizeof(void *) + 8]; /* should be enough space for a `%p' */
|
||||||
sprintf(buff, "%p", va_arg(argp, void *));
|
snprintf(buff, sizeof(buff), "%p", va_arg(argp, void *));
|
||||||
pushstr(L, buff);
|
pushstr(L, buff);
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
|||||||
+6
-6
@@ -776,23 +776,23 @@ static int str_format (lua_State *L) {
|
|||||||
strfrmt = scanformat(L, strfrmt, form);
|
strfrmt = scanformat(L, strfrmt, form);
|
||||||
switch (*strfrmt++) {
|
switch (*strfrmt++) {
|
||||||
case 'c': {
|
case 'c': {
|
||||||
sprintf(buff, form, (int)luaL_checknumber(L, arg));
|
snprintf(buff, sizeof(buff), form, (int)luaL_checknumber(L, arg));
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
case 'd': case 'i': {
|
case 'd': case 'i': {
|
||||||
addintlen(form);
|
addintlen(form);
|
||||||
sprintf(buff, form, (LUA_INTFRM_T)luaL_checknumber(L, arg));
|
snprintf(buff, sizeof(buff), form, (LUA_INTFRM_T)luaL_checknumber(L, arg));
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
case 'o': case 'u': case 'x': case 'X': {
|
case 'o': case 'u': case 'x': case 'X': {
|
||||||
addintlen(form);
|
addintlen(form);
|
||||||
sprintf(buff, form, (unsigned LUA_INTFRM_T)luaL_checknumber(L, arg));
|
snprintf(buff, sizeof(buff), form, (unsigned LUA_INTFRM_T)luaL_checknumber(L, arg));
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
case 'e': case 'E': case 'f':
|
case 'e': case 'E': case 'f':
|
||||||
case 'g': case 'G': {
|
case 'g': case 'G': {
|
||||||
lua_Number n = luaL_checknumber(L, arg);
|
lua_Number n = luaL_checknumber(L, arg);
|
||||||
sprintf(buff, form, (double)n);
|
snprintf(buff, sizeof(buff), form, (double)n);
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
case 'q': {
|
case 'q': {
|
||||||
@@ -810,7 +810,7 @@ static int str_format (lua_State *L) {
|
|||||||
continue; /* skip the `addsize' at the end */
|
continue; /* skip the `addsize' at the end */
|
||||||
}
|
}
|
||||||
else {
|
else {
|
||||||
sprintf(buff, form, s);
|
snprintf(buff, sizeof(buff), form, s);
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
+1
-1
@@ -536,7 +536,7 @@
|
|||||||
#define LUA_NUMBER_SCAN "%d"
|
#define LUA_NUMBER_SCAN "%d"
|
||||||
#define LUA_NUMBER_FMT "%d"
|
#define LUA_NUMBER_FMT "%d"
|
||||||
#endif
|
#endif
|
||||||
#define lua_number2str(s,n) sprintf((s), LUA_NUMBER_FMT, (n))
|
#define lua_number2str(s,n) snprintf((s), LUAI_MAXNUMBER2STR, LUA_NUMBER_FMT, (n))
|
||||||
#define LUAI_MAXNUMBER2STR 12 /* 10 digits, sign, and \0 */
|
#define LUAI_MAXNUMBER2STR 12 /* 10 digits, sign, and \0 */
|
||||||
#define lua_str2number(s,p) ({ \
|
#define lua_str2number(s,p) ({ \
|
||||||
long nmr = strtol((s), (p), 10); \
|
long nmr = strtol((s), (p), 10); \
|
||||||
|
|||||||
@@ -206,6 +206,15 @@ FUNCINLINE static ATTRINLINE UINT32 readulong(void *ptr)
|
|||||||
p += n; \
|
p += n; \
|
||||||
} while (0)
|
} while (0)
|
||||||
|
|
||||||
|
|
||||||
|
#ifdef PHOBOS_BUILD
|
||||||
|
#define WRITESKIN(p,b) WRITEUINT16(p,b)
|
||||||
|
#define READSKIN(p) READUINT16(p)
|
||||||
|
#else
|
||||||
|
#define WRITESKIN(p,b) WRITEUINT8(p,b)
|
||||||
|
#define READSKIN(p) READUINT8(p)
|
||||||
|
#endif
|
||||||
|
|
||||||
#ifdef __cplusplus
|
#ifdef __cplusplus
|
||||||
} // extern "C"
|
} // extern "C"
|
||||||
#endif
|
#endif
|
||||||
|
|||||||
+42
-15
@@ -113,18 +113,29 @@ static vsbuf_t com_text; // variable sized buffer
|
|||||||
* \param ptext The text to add.
|
* \param ptext The text to add.
|
||||||
* \sa COM_BufInsertText
|
* \sa COM_BufInsertText
|
||||||
*/
|
*/
|
||||||
void COM_BufAddText(const char *ptext)
|
void COM_BufAddTextEx(const char *ptext, size_t plen)
|
||||||
{
|
{
|
||||||
size_t l;
|
size_t l;
|
||||||
|
char *text;
|
||||||
|
|
||||||
l = strlen(ptext);
|
if (plen == 0)
|
||||||
|
plen = strlen(ptext);
|
||||||
|
|
||||||
|
text = Z_Malloc(sizeof(char) * (plen+1), PU_STATIC, NULL);
|
||||||
|
memcpy(text, ptext, plen);
|
||||||
|
text[plen] = '\0';
|
||||||
|
|
||||||
|
l = strlen(text);
|
||||||
|
|
||||||
if (com_text.cursize + l >= com_text.maxsize)
|
if (com_text.cursize + l >= com_text.maxsize)
|
||||||
{
|
{
|
||||||
CONS_Alert(CONS_WARNING, M_GetText("Command buffer full!\n"));
|
CONS_Alert(CONS_WARNING, M_GetText("Command buffer full!\n"));
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
VS_Write(&com_text, ptext, l);
|
|
||||||
|
VS_Write(&com_text, text, l);
|
||||||
|
|
||||||
|
Z_Free(text);
|
||||||
}
|
}
|
||||||
|
|
||||||
/** Adds command text and executes it immediately.
|
/** Adds command text and executes it immediately.
|
||||||
@@ -132,8 +143,10 @@ void COM_BufAddText(const char *ptext)
|
|||||||
* \param ptext The text to execute. A newline is automatically added.
|
* \param ptext The text to execute. A newline is automatically added.
|
||||||
* \sa COM_BufAddText
|
* \sa COM_BufAddText
|
||||||
*/
|
*/
|
||||||
void COM_BufInsertText(const char *ptext)
|
void COM_BufInsertTextEx(const char *ptext, size_t plen)
|
||||||
{
|
{
|
||||||
|
const INT32 old_wait = com_wait;
|
||||||
|
|
||||||
char *temp = NULL;
|
char *temp = NULL;
|
||||||
size_t templen;
|
size_t templen;
|
||||||
|
|
||||||
@@ -145,10 +158,14 @@ void COM_BufInsertText(const char *ptext)
|
|||||||
VS_Clear(&com_text);
|
VS_Clear(&com_text);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
com_wait = 0;
|
||||||
|
|
||||||
// add the entire text of the file (or alias)
|
// add the entire text of the file (or alias)
|
||||||
COM_BufAddText(ptext);
|
COM_BufAddTextEx(ptext, plen);
|
||||||
COM_BufExecute(); // do it right away
|
COM_BufExecute(); // do it right away
|
||||||
|
|
||||||
|
com_wait += old_wait;
|
||||||
|
|
||||||
// add the copied off data
|
// add the copied off data
|
||||||
if (templen)
|
if (templen)
|
||||||
{
|
{
|
||||||
@@ -159,8 +176,7 @@ void COM_BufInsertText(const char *ptext)
|
|||||||
|
|
||||||
/** Progress the wait timer and flush waiting console commands when ready.
|
/** Progress the wait timer and flush waiting console commands when ready.
|
||||||
*/
|
*/
|
||||||
void
|
void COM_BufTicker(void)
|
||||||
COM_BufTicker(void)
|
|
||||||
{
|
{
|
||||||
if (com_wait)
|
if (com_wait)
|
||||||
{
|
{
|
||||||
@@ -1596,7 +1612,9 @@ void CV_SaveNetVars(UINT8 **p, boolean isdemorecording)
|
|||||||
// send only changed cvars ...
|
// send only changed cvars ...
|
||||||
// the client will reset all netvars to default before loading
|
// the client will reset all netvars to default before loading
|
||||||
WRITEUINT16(*p, 0x0000);
|
WRITEUINT16(*p, 0x0000);
|
||||||
|
|
||||||
for (cvar = consvar_vars; cvar; cvar = cvar->next)
|
for (cvar = consvar_vars; cvar; cvar = cvar->next)
|
||||||
|
{
|
||||||
if (((cvar->flags & CV_NETVAR) && !CV_IsSetToDefault(cvar)) || (isdemorecording && cvar->netid == cv_numlaps.netid))
|
if (((cvar->flags & CV_NETVAR) && !CV_IsSetToDefault(cvar)) || (isdemorecording && cvar->netid == cv_numlaps.netid))
|
||||||
{
|
{
|
||||||
WRITEUINT16(*p, cvar->netid);
|
WRITEUINT16(*p, cvar->netid);
|
||||||
@@ -1614,7 +1632,7 @@ void CV_SaveNetVars(UINT8 **p, boolean isdemorecording)
|
|||||||
else
|
else
|
||||||
{
|
{
|
||||||
char buf[9];
|
char buf[9];
|
||||||
sprintf(buf, "%d", mapheaderinfo[gamemap - 1]->numlaps);
|
snprintf(buf, sizeof(buf), "%d", mapheaderinfo[gamemap - 1]->numlaps);
|
||||||
WRITESTRING(*p, buf);
|
WRITESTRING(*p, buf);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -1626,6 +1644,8 @@ void CV_SaveNetVars(UINT8 **p, boolean isdemorecording)
|
|||||||
WRITEUINT8(*p, false);
|
WRITEUINT8(*p, false);
|
||||||
++count;
|
++count;
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
|
||||||
WRITEUINT16(count_p, count);
|
WRITEUINT16(count_p, count);
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -1782,8 +1802,7 @@ void CV_StealthSet(consvar_t *var, const char *value)
|
|||||||
void CV_StealthSetValue(consvar_t *var, INT32 value)
|
void CV_StealthSetValue(consvar_t *var, INT32 value)
|
||||||
{
|
{
|
||||||
char val[32];
|
char val[32];
|
||||||
|
snprintf(val, sizeof(val), "%d", value);
|
||||||
sprintf(val, "%d", value);
|
|
||||||
CV_SetCVar(var, val, true);
|
CV_SetCVar(var, val, true);
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -1803,8 +1822,7 @@ void CV_Set(consvar_t *var, const char *value)
|
|||||||
void CV_SetValue(consvar_t *var, INT32 value)
|
void CV_SetValue(consvar_t *var, INT32 value)
|
||||||
{
|
{
|
||||||
char val[32];
|
char val[32];
|
||||||
|
snprintf(val, sizeof(val), "%d", value);
|
||||||
sprintf(val, "%d", value);
|
|
||||||
CV_SetCVar(var, val, false);
|
CV_SetCVar(var, val, false);
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -2202,6 +2220,7 @@ void CV_SaveVariables(FILE *f)
|
|||||||
consvar_t *cvar;
|
consvar_t *cvar;
|
||||||
|
|
||||||
for (cvar = consvar_vars; cvar; cvar = cvar->next)
|
for (cvar = consvar_vars; cvar; cvar = cvar->next)
|
||||||
|
{
|
||||||
if (cvar->flags & CV_SAVE)
|
if (cvar->flags & CV_SAVE)
|
||||||
{
|
{
|
||||||
char stringtowrite[MAXTEXTCMD+1];
|
char stringtowrite[MAXTEXTCMD+1];
|
||||||
@@ -2210,15 +2229,23 @@ void CV_SaveVariables(FILE *f)
|
|||||||
if (fastcmp(cvar->string, "MAX") || fastcmp(cvar->string, "MIN"))
|
if (fastcmp(cvar->string, "MAX") || fastcmp(cvar->string, "MIN"))
|
||||||
{
|
{
|
||||||
if (cvar->flags & CV_FLOAT)
|
if (cvar->flags & CV_FLOAT)
|
||||||
sprintf(stringtowrite, "%f", FixedToFloat(cvar->value));
|
{
|
||||||
|
snprintf(stringtowrite, sizeof(stringtowrite), "%f", FixedToFloat(cvar->value));
|
||||||
|
}
|
||||||
else
|
else
|
||||||
sprintf(stringtowrite, "%d", cvar->value);
|
{
|
||||||
|
snprintf(stringtowrite, sizeof(stringtowrite), "%d", cvar->value);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
strcpy(stringtowrite, cvar->string);
|
{
|
||||||
|
strncpy(stringtowrite, cvar->string, sizeof(stringtowrite)-1);
|
||||||
|
stringtowrite[sizeof(stringtowrite)-1] = '\0';
|
||||||
|
}
|
||||||
|
|
||||||
fprintf(f, "%s \"%s\"\n", cvar->name, stringtowrite);
|
fprintf(f, "%s \"%s\"\n", cvar->name, stringtowrite);
|
||||||
}
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
//============================================================================
|
//============================================================================
|
||||||
|
|||||||
+4
-2
@@ -52,10 +52,12 @@ size_t COM_FirstOption(void);
|
|||||||
const char *COM_CompleteCommand(const char *partial, INT32 skips);
|
const char *COM_CompleteCommand(const char *partial, INT32 skips);
|
||||||
|
|
||||||
// insert at queu (at end of other command)
|
// insert at queu (at end of other command)
|
||||||
void COM_BufAddText(const char *btext);
|
#define COM_BufAddText(s) COM_BufAddTextEx(s, 0)
|
||||||
|
void COM_BufAddTextEx(const char *ptext, size_t plen);
|
||||||
|
|
||||||
// insert in head (before other command)
|
// insert in head (before other command)
|
||||||
void COM_BufInsertText(const char *btext);
|
#define COM_BufInsertText(s) COM_BufInsertTextEx(s, 0)
|
||||||
|
void COM_BufInsertTextEx(const char *ptext, size_t plen);
|
||||||
|
|
||||||
// don't bother inserting, just do immediately
|
// don't bother inserting, just do immediately
|
||||||
void COM_ImmedExecute(const char *ptext);
|
void COM_ImmedExecute(const char *ptext);
|
||||||
|
|||||||
+6
-3
@@ -1,7 +1,7 @@
|
|||||||
// BLANKART
|
// DR. ROBOTNIK'S RING RACERS
|
||||||
//-----------------------------------------------------------------------------
|
//-----------------------------------------------------------------------------
|
||||||
// Copyright (C) 2024 by Ronald "Eidolon" Kinard
|
// Copyright (C) 2025 by Ronald "Eidolon" Kinard
|
||||||
// Copyright (C) 2024 by Kart Krew
|
// Copyright (C) 2025 by Kart Krew
|
||||||
//
|
//
|
||||||
// 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.
|
||||||
@@ -114,6 +114,7 @@ void* PoolAllocator::allocate()
|
|||||||
|
|
||||||
FreeBlock* ret = head_;
|
FreeBlock* ret = head_;
|
||||||
head_ = head_->next;
|
head_ = head_->next;
|
||||||
|
allocated_blocks_++;
|
||||||
return ret;
|
return ret;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -125,6 +126,7 @@ void PoolAllocator::deallocate(void* p)
|
|||||||
FreeBlock* block = reinterpret_cast<FreeBlock*>(p);
|
FreeBlock* block = reinterpret_cast<FreeBlock*>(p);
|
||||||
block->next = head_;
|
block->next = head_;
|
||||||
head_ = block;
|
head_ = block;
|
||||||
|
allocated_blocks_--;
|
||||||
}
|
}
|
||||||
|
|
||||||
void PoolAllocator::release()
|
void PoolAllocator::release()
|
||||||
@@ -144,6 +146,7 @@ void PoolAllocator::release()
|
|||||||
|
|
||||||
first_chunk_ = nullptr;
|
first_chunk_ = nullptr;
|
||||||
head_ = nullptr;
|
head_ = nullptr;
|
||||||
|
allocated_blocks_ = 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
static LinearMemory g_frame_memory {4 * 1024 * 1024};
|
static LinearMemory g_frame_memory {4 * 1024 * 1024};
|
||||||
|
|||||||
+7
-3
@@ -1,7 +1,7 @@
|
|||||||
// SONIC ROBO BLAST 2 KART
|
// DR. ROBOTNIK'S RING RACERS
|
||||||
//-----------------------------------------------------------------------------
|
//-----------------------------------------------------------------------------
|
||||||
// Copyright (C) 2024 by Ronald "Eidolon" Kinard
|
// Copyright (C) 2025 by Ronald "Eidolon" Kinard
|
||||||
// Copyright (C) 2024 by Kart Krew
|
// Copyright (C) 2025 by Kart Krew
|
||||||
//
|
//
|
||||||
// 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.
|
||||||
@@ -37,6 +37,7 @@ class PoolAllocator final
|
|||||||
FreeBlock* head_;
|
FreeBlock* head_;
|
||||||
size_t block_size_;
|
size_t block_size_;
|
||||||
size_t blocks_;
|
size_t blocks_;
|
||||||
|
size_t allocated_blocks_;
|
||||||
int32_t tag_;
|
int32_t tag_;
|
||||||
|
|
||||||
ChunkFooter* allocate_chunk();
|
ChunkFooter* allocate_chunk();
|
||||||
@@ -47,6 +48,7 @@ public:
|
|||||||
, head_(nullptr)
|
, head_(nullptr)
|
||||||
, block_size_(block_size)
|
, block_size_(block_size)
|
||||||
, blocks_(blocks)
|
, blocks_(blocks)
|
||||||
|
, allocated_blocks_(0)
|
||||||
, tag_(tag)
|
, tag_(tag)
|
||||||
{}
|
{}
|
||||||
PoolAllocator(const PoolAllocator&) = delete;
|
PoolAllocator(const PoolAllocator&) = delete;
|
||||||
@@ -59,6 +61,8 @@ public:
|
|||||||
void* allocate();
|
void* allocate();
|
||||||
void deallocate(void* p);
|
void deallocate(void* p);
|
||||||
constexpr size_t block_size() const noexcept { return block_size_; };
|
constexpr size_t block_size() const noexcept { return block_size_; };
|
||||||
|
constexpr size_t allocated_blocks() const noexcept { return allocated_blocks_; };
|
||||||
|
constexpr size_t allocated_bytes() const noexcept { return allocated_blocks_ * block_size_; };
|
||||||
|
|
||||||
void release();
|
void release();
|
||||||
};
|
};
|
||||||
|
|||||||
@@ -1,7 +1,7 @@
|
|||||||
// SONIC ROBO BLAST 2 KART
|
// DR. ROBOTNIK'S RING RACERS
|
||||||
//-----------------------------------------------------------------------------
|
//-----------------------------------------------------------------------------
|
||||||
// Copyright (C) 2024 by Ronald "Eidolon" Kinard
|
// Copyright (C) 2025 by Ronald "Eidolon" Kinard
|
||||||
// Copyright (C) 2024 by Kart Krew
|
// Copyright (C) 2025 by Kart Krew
|
||||||
//
|
//
|
||||||
// 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.
|
||||||
|
|||||||
@@ -1,7 +1,7 @@
|
|||||||
// BLANKART
|
// DR. ROBOTNIK'S RING RACERS
|
||||||
//-----------------------------------------------------------------------------
|
//-----------------------------------------------------------------------------
|
||||||
// Copyright (C) 2024 by Ronald "Eidolon" Kinard
|
// Copyright (C) 2025 by Ronald "Eidolon" Kinard
|
||||||
// Copyright (C) 2024 by Kart Krew
|
// Copyright (C) 2025 by Kart Krew
|
||||||
//
|
//
|
||||||
// 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.
|
||||||
|
|||||||
@@ -1,7 +1,7 @@
|
|||||||
// SONIC ROBO BLAST 2 KART
|
// DR. ROBOTNIK'S RING RACERS
|
||||||
//-----------------------------------------------------------------------------
|
//-----------------------------------------------------------------------------
|
||||||
// Copyright (C) 2024 by Ronald "Eidolon" Kinard
|
// Copyright (C) 2025 by Ronald "Eidolon" Kinard
|
||||||
// Copyright (C) 2024 by Kart Krew
|
// Copyright (C) 2025 by Kart Krew
|
||||||
//
|
//
|
||||||
// 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.
|
||||||
|
|||||||
+93
-50
@@ -110,7 +110,7 @@ SINT8 joinnode = 0; // used for CL_VIEWSERVER
|
|||||||
boolean player_muted[MAXPLAYERS] = {};
|
boolean player_muted[MAXPLAYERS] = {};
|
||||||
|
|
||||||
// Server specific vars
|
// Server specific vars
|
||||||
UINT8 playernode[MAXPLAYERS] = {};
|
UINT8 playernode[MAXPLAYERS] = {UINT8_MAX};
|
||||||
|
|
||||||
// Minimum timeout for sending the savegame
|
// Minimum timeout for sending the savegame
|
||||||
// The actual timeout will be longer depending on the savegame length
|
// The actual timeout will be longer depending on the savegame length
|
||||||
@@ -1125,7 +1125,7 @@ static cl_mode_t cl_mode = CL_SEARCHING;
|
|||||||
static UINT16 cl_lastcheckedfilecount = 0; // used for full file list
|
static UINT16 cl_lastcheckedfilecount = 0; // used for full file list
|
||||||
|
|
||||||
// Player name send/load
|
// Player name send/load
|
||||||
|
#ifndef PHOBOS_BUILD
|
||||||
static void CV_SavePlayerNames(UINT8 **p)
|
static void CV_SavePlayerNames(UINT8 **p)
|
||||||
{
|
{
|
||||||
INT32 i = 0;
|
INT32 i = 0;
|
||||||
@@ -1161,6 +1161,7 @@ static void CV_LoadPlayerNames(UINT8 **p)
|
|||||||
memcpy(player_names[i], tmp_name, MAXPLAYERNAME+1);
|
memcpy(player_names[i], tmp_name, MAXPLAYERNAME+1);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
#endif
|
||||||
|
|
||||||
static void CL_DrawAddonTypes(void)
|
static void CL_DrawAddonTypes(void)
|
||||||
{
|
{
|
||||||
@@ -1629,8 +1630,8 @@ static boolean CL_SendJoin(void)
|
|||||||
netbuffer->u.clientcfg.packetversion = PACKETVERSION;
|
netbuffer->u.clientcfg.packetversion = PACKETVERSION;
|
||||||
netbuffer->u.clientcfg.version = VERSION;
|
netbuffer->u.clientcfg.version = VERSION;
|
||||||
netbuffer->u.clientcfg.subversion = SUBVERSION;
|
netbuffer->u.clientcfg.subversion = SUBVERSION;
|
||||||
strncpy(netbuffer->u.clientcfg.application, SRB2APPLICATION,
|
strncpy(netbuffer->u.clientcfg.application, SRB2APPLICATION, sizeof(netbuffer->u.clientcfg.application)-1);
|
||||||
sizeof(netbuffer->u.clientcfg.application));
|
netbuffer->u.clientcfg.application[sizeof(netbuffer->u.clientcfg.application)-1] = '\0';
|
||||||
#ifdef SATURNJOIN
|
#ifdef SATURNJOIN
|
||||||
netbuffer->u.clientcfg.issaturn = ISSATURN;
|
netbuffer->u.clientcfg.issaturn = ISSATURN;
|
||||||
#endif
|
#endif
|
||||||
@@ -1655,88 +1656,91 @@ static void SV_SendServerInfo(INT32 node, tic_t servertime)
|
|||||||
|
|
||||||
doomdata_t *netbuffer = DOOMCOM_DATA(doomcom);
|
doomdata_t *netbuffer = DOOMCOM_DATA(doomcom);
|
||||||
|
|
||||||
|
serverinfo_pak *serverinfo = &netbuffer->u.serverinfo;
|
||||||
|
|
||||||
netbuffer->packettype = PT_SERVERINFO;
|
netbuffer->packettype = PT_SERVERINFO;
|
||||||
netbuffer->u.serverinfo._255 = 255;
|
serverinfo->_255 = 255;
|
||||||
netbuffer->u.serverinfo.packetversion = PACKETVERSION;
|
serverinfo->packetversion = PACKETVERSION;
|
||||||
netbuffer->u.serverinfo.version = VERSION;
|
serverinfo->version = VERSION;
|
||||||
netbuffer->u.serverinfo.subversion = SUBVERSION;
|
serverinfo->subversion = SUBVERSION;
|
||||||
strncpy(netbuffer->u.serverinfo.application, SRB2APPLICATION,
|
strncpy(serverinfo->application, SRB2APPLICATION, sizeof(serverinfo->application)-1);
|
||||||
sizeof netbuffer->u.serverinfo.application);
|
serverinfo->application[sizeof(serverinfo->application)-1] = '\0';
|
||||||
// return back the time value so client can compute their ping
|
// return back the time value so client can compute their ping
|
||||||
netbuffer->u.serverinfo.time = (tic_t)LONG(servertime);
|
serverinfo->time = (tic_t)LONG(servertime);
|
||||||
netbuffer->u.serverinfo.leveltime = (tic_t)LONG(leveltime);
|
serverinfo->leveltime = (tic_t)LONG(leveltime);
|
||||||
|
|
||||||
// force 1 player
|
// force 1 player
|
||||||
if (UseFakeSeed())
|
if (UseFakeSeed())
|
||||||
netbuffer->u.serverinfo.numberofplayer = (UINT8)1;
|
serverinfo->numberofplayer = (UINT8)1;
|
||||||
else
|
else
|
||||||
netbuffer->u.serverinfo.numberofplayer = (UINT8)D_NumPlayers();
|
serverinfo->numberofplayer = (UINT8)D_NumPlayers();
|
||||||
|
|
||||||
netbuffer->u.serverinfo.maxplayer = (UINT8)(min((dedicated ? MAXPLAYERS-1 : MAXPLAYERS), cv_maxplayers.value));
|
serverinfo->maxplayer = (UINT8)(min((dedicated ? MAXPLAYERS-1 : MAXPLAYERS), cv_maxplayers.value));
|
||||||
|
|
||||||
// SRB2Kart: Vanilla's gametype constants for MS support
|
// SRB2Kart: Vanilla's gametype constants for MS support
|
||||||
netbuffer->u.serverinfo.gametype = (UINT8)((gt == GT_MATCH) ? VANILLA_GT_MATCH : VANILLA_GT_RACE);
|
serverinfo->gametype = (UINT8)((gt == GT_MATCH) ? VANILLA_GT_MATCH : VANILLA_GT_RACE);
|
||||||
|
|
||||||
netbuffer->u.serverinfo.modifiedgame = (UINT8)modifiedgame;
|
serverinfo->modifiedgame = (UINT8)modifiedgame;
|
||||||
netbuffer->u.serverinfo.cheatsenabled = CV_CheatsEnabled();
|
serverinfo->cheatsenabled = CV_CheatsEnabled();
|
||||||
|
|
||||||
netbuffer->u.serverinfo.kartvars = (UINT8) (
|
serverinfo->kartvars = (UINT8) (
|
||||||
(cv_kartspeed.value & SV_SPEEDMASK) |
|
(cv_kartspeed.value & SV_SPEEDMASK) |
|
||||||
(dedicated ? SV_DEDICATED : 0)
|
(dedicated ? SV_DEDICATED : 0)
|
||||||
);
|
);
|
||||||
|
|
||||||
CopyCaretColors(netbuffer->u.serverinfo.servername, cv_servername.string,
|
CopyCaretColors(serverinfo->servername, cv_servername.string, MAXSERVERNAME);
|
||||||
MAXSERVERNAME);
|
|
||||||
strncpy(netbuffer->u.serverinfo.mapname, G_BuildMapName(gamemap), sizeof(netbuffer->u.serverinfo.mapname)-1);
|
|
||||||
|
|
||||||
memcpy(netbuffer->u.serverinfo.mapmd5, mapmd5, sizeof(netbuffer->u.serverinfo.mapmd5));
|
strncpy(serverinfo->mapname, G_BuildMapName(gamemap), sizeof(serverinfo->mapname)-1);
|
||||||
|
serverinfo->mapname[sizeof(serverinfo->mapname)-1] = '\0';
|
||||||
|
|
||||||
netbuffer->u.serverinfo.iszone = 0;
|
memcpy(serverinfo->mapmd5, mapmd5, sizeof(serverinfo->mapmd5));
|
||||||
|
|
||||||
memset(netbuffer->u.serverinfo.maptitle, 0, sizeof(netbuffer->u.serverinfo.maptitle));
|
serverinfo->iszone = 0;
|
||||||
memset(netbuffer->u.serverinfo.httpsource, 0, MAX_MIRROR_LENGTH);
|
|
||||||
|
memset(serverinfo->maptitle, 0, sizeof(serverinfo->maptitle));
|
||||||
|
memset(serverinfo->httpsource, 0, MAX_MIRROR_LENGTH);
|
||||||
|
|
||||||
if (!(mapheaderinfo[gamemap-1]->menuflags & LF2_HIDEINMENU) && mapheaderinfo[gamemap-1]->lvlttl[0])
|
if (!(mapheaderinfo[gamemap-1]->menuflags & LF2_HIDEINMENU) && mapheaderinfo[gamemap-1]->lvlttl[0])
|
||||||
{
|
{
|
||||||
strncpy(netbuffer->u.serverinfo.maptitle, mapheaderinfo[gamemap-1]->lvlttl, sizeof(netbuffer->u.serverinfo.maptitle)-1);
|
strncpy(serverinfo->maptitle, mapheaderinfo[gamemap-1]->lvlttl, sizeof(serverinfo->maptitle)-1);
|
||||||
|
|
||||||
if (!(mapheaderinfo[gamemap-1]->levelflags & LF_NOZONE))
|
if (!(mapheaderinfo[gamemap-1]->levelflags & LF_NOZONE))
|
||||||
{
|
{
|
||||||
if (mapheaderinfo[gamemap-1]->zonttl[0])
|
if (mapheaderinfo[gamemap-1]->zonttl[0])
|
||||||
{
|
{
|
||||||
strncat(netbuffer->u.serverinfo.maptitle, " ", sizeof(netbuffer->u.serverinfo.maptitle)-1);
|
strncat(serverinfo->maptitle, " ", sizeof(serverinfo->maptitle)-1);
|
||||||
strncat(netbuffer->u.serverinfo.maptitle, mapheaderinfo[gamemap-1]->zonttl,
|
strncat(serverinfo->maptitle, mapheaderinfo[gamemap-1]->zonttl, sizeof(serverinfo->maptitle)-1);
|
||||||
sizeof(netbuffer->u.serverinfo.maptitle)-1);
|
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
netbuffer->u.serverinfo.iszone = 1; // ms and clients will append this themselves
|
serverinfo->iszone = 1; // ms and clients will append this themselves
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if (mapheaderinfo[gamemap-1]->actnum[0])
|
if (mapheaderinfo[gamemap-1]->actnum[0])
|
||||||
{
|
{
|
||||||
strncat(netbuffer->u.serverinfo.maptitle, " ", sizeof(netbuffer->u.serverinfo.maptitle)-1);
|
strncat(serverinfo->maptitle, " ", sizeof(serverinfo->maptitle)-1);
|
||||||
strncat(netbuffer->u.serverinfo.maptitle, mapheaderinfo[gamemap-1]->actnum,
|
strncat(serverinfo->maptitle, mapheaderinfo[gamemap-1]->actnum, sizeof(serverinfo->maptitle)-1);
|
||||||
sizeof(netbuffer->u.serverinfo.maptitle)-1);
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
strncpy(netbuffer->u.serverinfo.maptitle, "Unknown", 33);
|
{
|
||||||
|
strncpy(serverinfo->maptitle, "Unknown", sizeof(serverinfo->maptitle)-1);
|
||||||
|
}
|
||||||
|
|
||||||
netbuffer->u.serverinfo.maptitle[32] = '\0';
|
serverinfo->maptitle[sizeof(serverinfo->maptitle)-1] = '\0';
|
||||||
|
|
||||||
netbuffer->u.serverinfo.actnum = 0; //mapheaderinfo[gamemap-1]->actnum
|
serverinfo->actnum = 0; //mapheaderinfo[gamemap-1]->actnum
|
||||||
|
|
||||||
mirror_length = strlen(httpurl);
|
mirror_length = strlen(httpurl);
|
||||||
if (mirror_length > MAX_MIRROR_LENGTH)
|
if (mirror_length > MAX_MIRROR_LENGTH)
|
||||||
mirror_length = MAX_MIRROR_LENGTH;
|
mirror_length = MAX_MIRROR_LENGTH;
|
||||||
|
|
||||||
if (snprintf(netbuffer->u.serverinfo.httpsource, mirror_length+1, "%s", httpurl) < 0)
|
if (snprintf(serverinfo->httpsource, mirror_length+1, "%s", httpurl) < 0)
|
||||||
// If there's an encoding error, send nothing, we accept that the above may be truncated
|
// If there's an encoding error, send nothing, we accept that the above may be truncated
|
||||||
strncpy(netbuffer->u.serverinfo.httpsource, "", mirror_length);
|
strncpy(serverinfo->httpsource, "", mirror_length);
|
||||||
|
|
||||||
netbuffer->u.serverinfo.httpsource[MAX_MIRROR_LENGTH-1] = '\0';
|
serverinfo->httpsource[MAX_MIRROR_LENGTH-1] = '\0';
|
||||||
|
|
||||||
p = PutFileNeeded(0);
|
p = PutFileNeeded(0);
|
||||||
|
|
||||||
@@ -1769,7 +1773,7 @@ static void SV_SendPlayerInfo(INT32 node)
|
|||||||
// doesent really matter what we put here lel
|
// doesent really matter what we put here lel
|
||||||
netbuffer->u.playerinfo[0].score = LONG(42069);
|
netbuffer->u.playerinfo[0].score = LONG(42069);
|
||||||
netbuffer->u.playerinfo[0].timeinserver = SHORT(42069);
|
netbuffer->u.playerinfo[0].timeinserver = SHORT(42069);
|
||||||
netbuffer->u.playerinfo[0].skin = (UINT8)1; // no clue wtf skin 1 is, tails maybe?
|
netbuffer->u.playerinfo[0].skin = (skinnum_t)1; // no clue wtf skin 1 is, tails maybe?
|
||||||
|
|
||||||
netbuffer->u.playerinfo[0].data = 0;
|
netbuffer->u.playerinfo[0].data = 0;
|
||||||
|
|
||||||
@@ -1814,7 +1818,7 @@ static void SV_SendPlayerInfo(INT32 node)
|
|||||||
|
|
||||||
netbuffer->u.playerinfo[i].score = LONG(players[i].score);
|
netbuffer->u.playerinfo[i].score = LONG(players[i].score);
|
||||||
netbuffer->u.playerinfo[i].timeinserver = SHORT((UINT16)(players[i].jointime / TICRATE));
|
netbuffer->u.playerinfo[i].timeinserver = SHORT((UINT16)(players[i].jointime / TICRATE));
|
||||||
netbuffer->u.playerinfo[i].skin = (UINT8)players[i].skin;
|
netbuffer->u.playerinfo[i].skin = (skinnum_t)players[i].skin;
|
||||||
|
|
||||||
// Extra data
|
// Extra data
|
||||||
// Kart has extra skincolors, so we can't use this
|
// Kart has extra skincolors, so we can't use this
|
||||||
@@ -1924,8 +1928,10 @@ static void SV_SendMapIcon(INT32 node)
|
|||||||
*/
|
*/
|
||||||
static boolean SV_SendServerConfig(INT32 node)
|
static boolean SV_SendServerConfig(INT32 node)
|
||||||
{
|
{
|
||||||
|
#ifndef PHOBOS_BUILD
|
||||||
INT32 i;
|
INT32 i;
|
||||||
UINT8 *p, *op;
|
UINT8 *p, *op;
|
||||||
|
#endif
|
||||||
boolean waspacketsent;
|
boolean waspacketsent;
|
||||||
|
|
||||||
doomdata_t *netbuffer = DOOMCOM_DATA(doomcom);
|
doomdata_t *netbuffer = DOOMCOM_DATA(doomcom);
|
||||||
@@ -1943,6 +1949,7 @@ static boolean SV_SendServerConfig(INT32 node)
|
|||||||
netbuffer->u.servercfg.gametype = (UINT8)gametype;
|
netbuffer->u.servercfg.gametype = (UINT8)gametype;
|
||||||
netbuffer->u.servercfg.modifiedgame = (UINT8)modifiedgame;
|
netbuffer->u.servercfg.modifiedgame = (UINT8)modifiedgame;
|
||||||
|
|
||||||
|
#ifndef PHOBOS_BUILD
|
||||||
// we fill these structs with FFs so that any players not in game get sent as 0xFFFF
|
// we fill these structs with FFs so that any players not in game get sent as 0xFFFF
|
||||||
// which is nice and easy for us to detect
|
// which is nice and easy for us to detect
|
||||||
memset(netbuffer->u.servercfg.playerskins, 0xFF, sizeof(netbuffer->u.servercfg.playerskins));
|
memset(netbuffer->u.servercfg.playerskins, 0xFF, sizeof(netbuffer->u.servercfg.playerskins));
|
||||||
@@ -1958,6 +1965,7 @@ static boolean SV_SendServerConfig(INT32 node)
|
|||||||
netbuffer->u.servercfg.playerskins[i] = (UINT8)players[i].skin;
|
netbuffer->u.servercfg.playerskins[i] = (UINT8)players[i].skin;
|
||||||
netbuffer->u.servercfg.playercolor[i] = (UINT8)players[i].skincolor;
|
netbuffer->u.servercfg.playercolor[i] = (UINT8)players[i].skincolor;
|
||||||
}
|
}
|
||||||
|
#endif
|
||||||
|
|
||||||
netbuffer->u.servercfg.maxplayer = (UINT8)(min((dedicated ? MAXPLAYERS-1 : MAXPLAYERS), cv_maxplayers.value));
|
netbuffer->u.servercfg.maxplayer = (UINT8)(min((dedicated ? MAXPLAYERS-1 : MAXPLAYERS), cv_maxplayers.value));
|
||||||
netbuffer->u.servercfg.allownewplayer = cv_allownewplayer.value;
|
netbuffer->u.servercfg.allownewplayer = cv_allownewplayer.value;
|
||||||
@@ -1965,12 +1973,16 @@ static boolean SV_SendServerConfig(INT32 node)
|
|||||||
|
|
||||||
memcpy(netbuffer->u.servercfg.server_context, server_context, 8);
|
memcpy(netbuffer->u.servercfg.server_context, server_context, 8);
|
||||||
|
|
||||||
|
#ifdef PHOBOS_BUILD
|
||||||
|
const size_t len = sizeof(serverconfig_pak);
|
||||||
|
#else
|
||||||
op = p = netbuffer->u.servercfg.varlengthinputs;
|
op = p = netbuffer->u.servercfg.varlengthinputs;
|
||||||
|
|
||||||
CV_SavePlayerNames(&p);
|
CV_SavePlayerNames(&p);
|
||||||
CV_SaveNetVars(&p, false);
|
CV_SaveNetVars(&p, false);
|
||||||
|
|
||||||
const size_t len = sizeof (serverconfig_pak) + (size_t)(p - op);
|
const size_t len = sizeof (serverconfig_pak) + (size_t)(p - op);
|
||||||
|
#endif
|
||||||
|
|
||||||
#ifdef DEBUGFILE
|
#ifdef DEBUGFILE
|
||||||
if (debugfile)
|
if (debugfile)
|
||||||
@@ -2094,7 +2106,7 @@ static void SV_SavedGame(void)
|
|||||||
if (!cv_dumpconsistency.value)
|
if (!cv_dumpconsistency.value)
|
||||||
return;
|
return;
|
||||||
|
|
||||||
sprintf(tmpsave, "%s" PATHSEP TMPSAVENAME, srb2home);
|
snprintf(tmpsave, sizeof(tmpsave), "%s" PATHSEP TMPSAVENAME, srb2home);
|
||||||
|
|
||||||
// first save it in a malloced buffer
|
// first save it in a malloced buffer
|
||||||
save.p = save.buffer = (UINT8 *)Z_Malloc(SAVEGAMESIZE, PU_STATIC, NULL);
|
save.p = save.buffer = (UINT8 *)Z_Malloc(SAVEGAMESIZE, PU_STATIC, NULL);
|
||||||
@@ -2132,7 +2144,7 @@ static void CL_LoadReceivedSavegame(boolean reloading)
|
|||||||
size_t length, decompressedlen;
|
size_t length, decompressedlen;
|
||||||
char tmpsave[264];
|
char tmpsave[264];
|
||||||
|
|
||||||
sprintf(tmpsave, "%s" PATHSEP TMPSAVENAME, srb2home);
|
snprintf(tmpsave, sizeof(tmpsave), "%s" PATHSEP TMPSAVENAME, srb2home);
|
||||||
|
|
||||||
length = FIL_ReadFile(tmpsave, &save.buffer);
|
length = FIL_ReadFile(tmpsave, &save.buffer);
|
||||||
|
|
||||||
@@ -2211,7 +2223,7 @@ static void CL_ReloadReceivedSavegame(void)
|
|||||||
for (i = 0; i < MAXPLAYERS; i++)
|
for (i = 0; i < MAXPLAYERS; i++)
|
||||||
{
|
{
|
||||||
LUA_InvalidatePlayer(&players[i]);
|
LUA_InvalidatePlayer(&players[i]);
|
||||||
sprintf(player_names[i], "Player %d", i + 1);
|
snprintf(player_names[i], MAXPLAYERNAME+1, "Player %d", i + 1);
|
||||||
}
|
}
|
||||||
|
|
||||||
CL_LoadReceivedSavegame(true);
|
CL_LoadReceivedSavegame(true);
|
||||||
@@ -2947,7 +2959,7 @@ static void CL_ConnectToServer(void)
|
|||||||
tic_t asksent;
|
tic_t asksent;
|
||||||
char tmpsave[264];
|
char tmpsave[264];
|
||||||
|
|
||||||
sprintf(tmpsave, "%s" PATHSEP TMPSAVENAME, srb2home);
|
snprintf(tmpsave, sizeof(tmpsave), "%s" PATHSEP TMPSAVENAME, srb2home);
|
||||||
|
|
||||||
filedownload.current = -1;
|
filedownload.current = -1;
|
||||||
cl_mode = CL_SEARCHING;
|
cl_mode = CL_SEARCHING;
|
||||||
@@ -3449,7 +3461,7 @@ void CL_ClearPlayer(INT32 playernum)
|
|||||||
if (players[playernum].mo)
|
if (players[playernum].mo)
|
||||||
{
|
{
|
||||||
// Don't leave a NiGHTS ghost!
|
// Don't leave a NiGHTS ghost!
|
||||||
if (UNLIKELY((players[playernum].pflags & PF_NIGHTSMODE) && players[playernum].mo->tracer))
|
if (nightsplayer(&players[playernum]) && players[playernum].mo->tracer)
|
||||||
P_RemoveMobj(players[playernum].mo->tracer);
|
P_RemoveMobj(players[playernum].mo->tracer);
|
||||||
P_RemoveMobj(players[playernum].mo);
|
P_RemoveMobj(players[playernum].mo);
|
||||||
}
|
}
|
||||||
@@ -3510,7 +3522,7 @@ void CL_RemovePlayer(INT32 playernum, INT32 reason)
|
|||||||
player_muted[playernum] = false;
|
player_muted[playernum] = false;
|
||||||
|
|
||||||
// Reset the name
|
// Reset the name
|
||||||
sprintf(player_names[playernum], "Player %d", playernum+1);
|
snprintf(player_names[playernum], MAXPLAYERNAME+1, "Player %d", playernum+1);
|
||||||
|
|
||||||
player_name_changes[playernum] = 0;
|
player_name_changes[playernum] = 0;
|
||||||
|
|
||||||
@@ -3767,6 +3779,10 @@ static void Command_Ban(void)
|
|||||||
if (pn == -1 || pn == 0)
|
if (pn == -1 || pn == 0)
|
||||||
return;
|
return;
|
||||||
|
|
||||||
|
// player does not exist
|
||||||
|
if (!playeringame[pn])
|
||||||
|
return;
|
||||||
|
|
||||||
WRITEUINT8(p, pn);
|
WRITEUINT8(p, pn);
|
||||||
|
|
||||||
if (COM_Argc() == 2)
|
if (COM_Argc() == 2)
|
||||||
@@ -3884,6 +3900,10 @@ static void Command_Kick(void)
|
|||||||
if (pn == -1 || pn == 0)
|
if (pn == -1 || pn == 0)
|
||||||
return;
|
return;
|
||||||
|
|
||||||
|
// player does not exist
|
||||||
|
if (!playeringame[pn])
|
||||||
|
return;
|
||||||
|
|
||||||
// Special case if we are trying to kick a player who is downloading the game state:
|
// Special case if we are trying to kick a player who is downloading the game state:
|
||||||
// trigger a timeout instead of kicking them, because a kick would only
|
// trigger a timeout instead of kicking them, because a kick would only
|
||||||
// take effect after they have finished downloading
|
// take effect after they have finished downloading
|
||||||
@@ -3933,6 +3953,13 @@ static void Got_KickCmd(const UINT8 **p, INT32 playernum)
|
|||||||
pnum = READUINT8(*p);
|
pnum = READUINT8(*p);
|
||||||
msg = READUINT8(*p);
|
msg = READUINT8(*p);
|
||||||
|
|
||||||
|
if (pnum >= MAXPLAYERS)
|
||||||
|
{
|
||||||
|
CONS_Alert(CONS_WARNING, M_GetText("Illegal kick command received from %s for player %d\n"), player_names[playernum], pnum);
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
// FIXME: this does not work at all on dedi, servernode == 0 which is prevented from kick/ban command
|
||||||
if (pnum == serverplayer && IsPlayerAdmin(playernum))
|
if (pnum == serverplayer && IsPlayerAdmin(playernum))
|
||||||
{
|
{
|
||||||
CONS_Printf(M_GetText("Server is being shut down remotely. Goodbye!\n"));
|
CONS_Printf(M_GetText("Server is being shut down remotely. Goodbye!\n"));
|
||||||
@@ -3987,6 +4014,16 @@ static void Got_KickCmd(const UINT8 **p, INT32 playernum)
|
|||||||
msg = KICK_MSG_CON_FAIL;
|
msg = KICK_MSG_CON_FAIL;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// without this the server will remove itself and thus self destruct on dedicated
|
||||||
|
if (server && (playernode[pnum] == UINT8_MAX || !playeringame[pnum]))
|
||||||
|
{
|
||||||
|
CONS_Alert(CONS_WARNING, M_GetText("Attempting to kick player %d which is not in game received from %s\n"), pnum, player_names[playernum]);
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
// make sure we dont read garbage anywhere
|
||||||
|
memset(reason, 0, sizeof(buf));
|
||||||
|
|
||||||
if (msg == KICK_MSG_CUSTOM_BAN || msg == KICK_MSG_CUSTOM_KICK)
|
if (msg == KICK_MSG_CUSTOM_BAN || msg == KICK_MSG_CUSTOM_KICK)
|
||||||
{
|
{
|
||||||
READSTRINGN(*p, reason, MAX_REASONLENGTH+1);
|
READSTRINGN(*p, reason, MAX_REASONLENGTH+1);
|
||||||
@@ -4447,7 +4484,7 @@ void SV_ResetServer(void)
|
|||||||
for (i = 0; i < MAXPLAYERS; i++)
|
for (i = 0; i < MAXPLAYERS; i++)
|
||||||
{
|
{
|
||||||
LUA_InvalidatePlayer(&players[i]);
|
LUA_InvalidatePlayer(&players[i]);
|
||||||
sprintf(player_names[i], "Player %d", i + 1);
|
snprintf(player_names[i], MAXPLAYERNAME+1, "Player %d", i + 1);
|
||||||
}
|
}
|
||||||
|
|
||||||
memset(player_name_changes, 0, sizeof(player_name_changes));
|
memset(player_name_changes, 0, sizeof(player_name_changes));
|
||||||
@@ -5386,8 +5423,10 @@ static void PT_ServerRefuse(SINT8 node)
|
|||||||
// Positive response of client join request
|
// Positive response of client join request
|
||||||
static void PT_ServerCFG(SINT8 node)
|
static void PT_ServerCFG(SINT8 node)
|
||||||
{
|
{
|
||||||
|
#ifndef PHOBOS_BUILD
|
||||||
INT32 j;
|
INT32 j;
|
||||||
UINT8 *scp;
|
UINT8 *scp;
|
||||||
|
#endif
|
||||||
|
|
||||||
if (server && serverrunning && node != servernode)
|
if (server && serverrunning && node != servernode)
|
||||||
{ // but wait I thought I'm the server?
|
{ // but wait I thought I'm the server?
|
||||||
@@ -5410,8 +5449,10 @@ static void PT_ServerCFG(SINT8 node)
|
|||||||
if ((gametype = netbuffer->u.servercfg.gametype) >= NUMGAMETYPES)
|
if ((gametype = netbuffer->u.servercfg.gametype) >= NUMGAMETYPES)
|
||||||
I_Error("Bad gametype %d in cliserv!", gametype);
|
I_Error("Bad gametype %d in cliserv!", gametype);
|
||||||
modifiedgame = netbuffer->u.servercfg.modifiedgame;
|
modifiedgame = netbuffer->u.servercfg.modifiedgame;
|
||||||
|
#ifndef PHOBOS_BUILD
|
||||||
for (j = 0; j < MAXPLAYERS; j++)
|
for (j = 0; j < MAXPLAYERS; j++)
|
||||||
adminplayers[j] = netbuffer->u.servercfg.adminplayers[j];
|
adminplayers[j] = netbuffer->u.servercfg.adminplayers[j];
|
||||||
|
#endif
|
||||||
memcpy(server_context, netbuffer->u.servercfg.server_context, 8);
|
memcpy(server_context, netbuffer->u.servercfg.server_context, 8);
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -5437,6 +5478,7 @@ static void PT_ServerCFG(SINT8 node)
|
|||||||
SendSaturnInfo(node);
|
SendSaturnInfo(node);
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
#ifndef PHOBOS_BUILD
|
||||||
memset(playeringame, 0, sizeof(playeringame));
|
memset(playeringame, 0, sizeof(playeringame));
|
||||||
|
|
||||||
for (j = 0; j < MAXPLAYERS; j++)
|
for (j = 0; j < MAXPLAYERS; j++)
|
||||||
@@ -5453,6 +5495,7 @@ static void PT_ServerCFG(SINT8 node)
|
|||||||
scp = netbuffer->u.servercfg.varlengthinputs;
|
scp = netbuffer->u.servercfg.varlengthinputs;
|
||||||
CV_LoadPlayerNames(&scp);
|
CV_LoadPlayerNames(&scp);
|
||||||
scp += CV_LoadNetVars(scp);
|
scp += CV_LoadNetVars(scp);
|
||||||
|
#endif
|
||||||
|
|
||||||
/// \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?
|
||||||
@@ -5506,7 +5549,7 @@ static void PT_WillResendGamestate(void)
|
|||||||
|
|
||||||
CONS_Printf(M_GetText("Reloading game state...\n"));
|
CONS_Printf(M_GetText("Reloading game state...\n"));
|
||||||
|
|
||||||
sprintf(tmpsave, "%s" PATHSEP TMPSAVENAME, srb2home);
|
snprintf(tmpsave, sizeof(tmpsave), "%s" PATHSEP TMPSAVENAME, srb2home);
|
||||||
|
|
||||||
// Don't get a corrupt savegame error because tmpsave already exists
|
// Don't get a corrupt savegame error because tmpsave already exists
|
||||||
if (FIL_FileExists(tmpsave) && unlink(tmpsave) == -1)
|
if (FIL_FileExists(tmpsave) && unlink(tmpsave) == -1)
|
||||||
|
|||||||
+8
-2
@@ -339,13 +339,17 @@ typedef struct
|
|||||||
UINT8 clientnode;
|
UINT8 clientnode;
|
||||||
UINT8 gamestate;
|
UINT8 gamestate;
|
||||||
|
|
||||||
|
#ifndef PHOBOS_BUILD
|
||||||
// 0xFF == not in game; else player skin num
|
// 0xFF == not in game; else player skin num
|
||||||
UINT8 playerskins[MAXPLAYERS];
|
UINT8 playerskins[MAXPLAYERS];
|
||||||
UINT8 playercolor[MAXPLAYERS];
|
UINT8 playercolor[MAXPLAYERS];
|
||||||
|
#endif
|
||||||
|
|
||||||
UINT8 gametype;
|
UINT8 gametype;
|
||||||
UINT8 modifiedgame;
|
UINT8 modifiedgame;
|
||||||
|
#ifndef PHOBOS_BUILD
|
||||||
SINT8 adminplayers[MAXPLAYERS]; // Needs to be signed
|
SINT8 adminplayers[MAXPLAYERS]; // Needs to be signed
|
||||||
|
#endif
|
||||||
|
|
||||||
char server_context[8]; // Unique context id, generated at server startup.
|
char server_context[8]; // Unique context id, generated at server startup.
|
||||||
|
|
||||||
@@ -354,7 +358,9 @@ typedef struct
|
|||||||
boolean allownewplayer;
|
boolean allownewplayer;
|
||||||
boolean discordinvites;
|
boolean discordinvites;
|
||||||
|
|
||||||
|
#ifndef PHOBOS_BUILD
|
||||||
UINT8 varlengthinputs[0]; // Playernames and netvars
|
UINT8 varlengthinputs[0]; // Playernames and netvars
|
||||||
|
#endif
|
||||||
} ATTRPACK serverconfig_pak;
|
} ATTRPACK serverconfig_pak;
|
||||||
|
|
||||||
typedef struct {
|
typedef struct {
|
||||||
@@ -444,7 +450,7 @@ typedef struct
|
|||||||
char name[MAXPLAYERNAME+1];
|
char name[MAXPLAYERNAME+1];
|
||||||
UINT8 address[4]; // sending another string would run us up against MAXPACKETLENGTH
|
UINT8 address[4]; // sending another string would run us up against MAXPACKETLENGTH
|
||||||
UINT8 team;
|
UINT8 team;
|
||||||
UINT8 skin;
|
skinnum_t skin;
|
||||||
UINT8 data; // Color is first four bits, hasflag, isit and issuper have one bit each, the last is unused.
|
UINT8 data; // Color is first four bits, hasflag, isit and issuper have one bit each, the last is unused.
|
||||||
UINT32 score;
|
UINT32 score;
|
||||||
UINT16 timeinserver; // In seconds.
|
UINT16 timeinserver; // In seconds.
|
||||||
@@ -454,7 +460,7 @@ typedef struct
|
|||||||
typedef struct
|
typedef struct
|
||||||
{
|
{
|
||||||
char name[MAXPLAYERNAME+1];
|
char name[MAXPLAYERNAME+1];
|
||||||
UINT8 skin;
|
skinnum_t skin;
|
||||||
UINT8 color;
|
UINT8 color;
|
||||||
UINT32 pflags;
|
UINT32 pflags;
|
||||||
UINT32 score;
|
UINT32 score;
|
||||||
|
|||||||
+1
-15
@@ -276,20 +276,6 @@ static void D_Renderview(void)
|
|||||||
|
|
||||||
R_ApplyLevelInterpolators(R_GetTimeFrac(RTF_LEVEL));
|
R_ApplyLevelInterpolators(R_GetTimeFrac(RTF_LEVEL));
|
||||||
|
|
||||||
if (rendermode == render_soft && cv_homremoval.value)
|
|
||||||
{
|
|
||||||
if (cv_homremoval.value == 1)
|
|
||||||
{
|
|
||||||
// Clear the software screen buffer to remove HOM
|
|
||||||
memset(vid.screens[0], 31, vid.width * vid.height);
|
|
||||||
}
|
|
||||||
else if (cv_homremoval.value == 2)
|
|
||||||
{
|
|
||||||
//'development' HOM removal -- makes it blindingly obvious if HOM is spotted.
|
|
||||||
memset(vid.screens[0], 32+(timeinmap&15), vid.width * vid.height);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
for (i = 0; i <= splitscreen; i++)
|
for (i = 0; i <= splitscreen; i++)
|
||||||
{
|
{
|
||||||
if (!P_MobjWasRemoved(players[displayplayers[i]].mo) || players[displayplayers[i]].playerstate == PST_DEAD)
|
if (!P_MobjWasRemoved(players[displayplayers[i]].mo) || players[displayplayers[i]].playerstate == PST_DEAD)
|
||||||
@@ -1259,7 +1245,7 @@ static void IdentifyVersion(void)
|
|||||||
#endif
|
#endif
|
||||||
|
|
||||||
char tempsrb2path[256] = ".";
|
char tempsrb2path[256] = ".";
|
||||||
if (getcwd(tempsrb2path, 256) == NULL)
|
if (I_GetCwd(tempsrb2path, 256) == NULL)
|
||||||
strcpy(tempsrb2path, ".");
|
strcpy(tempsrb2path, ".");
|
||||||
|
|
||||||
// get the current directory (possible problem on NT with "." as current dir)
|
// get the current directory (possible problem on NT with "." as current dir)
|
||||||
|
|||||||
+3
-1
@@ -1315,7 +1315,9 @@ boolean D_CheckNetGame(void)
|
|||||||
while (!debugfile && k < MAXPLAYERS)
|
while (!debugfile && k < MAXPLAYERS)
|
||||||
{
|
{
|
||||||
k++;
|
k++;
|
||||||
sprintf(filename, "debug%d.txt", k);
|
|
||||||
|
snprintf(filename, sizeof(filename), "debug%d.txt", k);
|
||||||
|
|
||||||
debugfile = fopen(va("%s" PATHSEP "%s", srb2home, filename), "w");
|
debugfile = fopen(va("%s" PATHSEP "%s", srb2home, filename), "w");
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
+54
-22
@@ -435,10 +435,18 @@ consvar_t cv_pointlimit = {"pointlimit", "0", CV_NETVAR|CV_CALL|CV_NOINIT, point
|
|||||||
static CV_PossibleValue_t timelimit_cons_t[] = {{0, "MIN"}, {30, "MAX"}, {0, NULL}};
|
static CV_PossibleValue_t timelimit_cons_t[] = {{0, "MIN"}, {30, "MAX"}, {0, NULL}};
|
||||||
consvar_t cv_timelimit = {"timelimit", "0", CV_NETVAR|CV_CALL|CV_NOINIT, timelimit_cons_t,
|
consvar_t cv_timelimit = {"timelimit", "0", CV_NETVAR|CV_CALL|CV_NOINIT, timelimit_cons_t,
|
||||||
TimeLimit_OnChange, 0, NULL, NULL, 0, 0, NULL};
|
TimeLimit_OnChange, 0, NULL, NULL, 0, 0, NULL};
|
||||||
|
#ifdef PHOBOS_BUILD
|
||||||
|
static CV_PossibleValue_t numlaps_cons_t[] = {{1, "MIN"}, {255, "MAX"}, {0, NULL}};
|
||||||
|
#else
|
||||||
static CV_PossibleValue_t numlaps_cons_t[] = {{1, "MIN"}, {50, "MAX"}, {0, NULL}};
|
static CV_PossibleValue_t numlaps_cons_t[] = {{1, "MIN"}, {50, "MAX"}, {0, NULL}};
|
||||||
|
#endif
|
||||||
consvar_t cv_numlaps = {"numlaps", "3", CV_NETVAR|CV_CALL|CV_NOINIT, numlaps_cons_t,
|
consvar_t cv_numlaps = {"numlaps", "3", CV_NETVAR|CV_CALL|CV_NOINIT, numlaps_cons_t,
|
||||||
NumLaps_OnChange, 0, NULL, NULL, 0, 0, NULL};
|
NumLaps_OnChange, 0, NULL, NULL, 0, 0, NULL};
|
||||||
|
#ifdef PHOBOS_BUILD
|
||||||
|
static CV_PossibleValue_t basenumlaps_cons_t[] = {{1, "MIN"}, {255, "MAX"}, {0, "Map default"}, {0, NULL}};
|
||||||
|
#else
|
||||||
static CV_PossibleValue_t basenumlaps_cons_t[] = {{1, "MIN"}, {50, "MAX"}, {0, "Map default"}, {0, NULL}};
|
static CV_PossibleValue_t basenumlaps_cons_t[] = {{1, "MIN"}, {50, "MAX"}, {0, "Map default"}, {0, NULL}};
|
||||||
|
#endif
|
||||||
consvar_t cv_basenumlaps = {"basenumlaps", "Map default", CV_NETVAR|CV_CALL|CV_CHEAT, basenumlaps_cons_t, BaseNumLaps_OnChange, 0, NULL, NULL, 0, 0, NULL};
|
consvar_t cv_basenumlaps = {"basenumlaps", "Map default", CV_NETVAR|CV_CALL|CV_CHEAT, basenumlaps_cons_t, BaseNumLaps_OnChange, 0, NULL, NULL, 0, 0, NULL};
|
||||||
|
|
||||||
consvar_t cv_forceskin = {"forceskin", "Off", CV_NETVAR|CV_CALL|CV_CHEAT, Forceskin_cons_t, ForceSkin_OnChange, 0, NULL, NULL, 0, 0, NULL};
|
consvar_t cv_forceskin = {"forceskin", "Off", CV_NETVAR|CV_CALL|CV_CHEAT, Forceskin_cons_t, ForceSkin_OnChange, 0, NULL, NULL, 0, 0, NULL};
|
||||||
@@ -570,6 +578,7 @@ const char *netxcmdnames[MAXNETXCMD - 1] =
|
|||||||
"MODIFYVOTE",
|
"MODIFYVOTE",
|
||||||
"PICKVOTE",
|
"PICKVOTE",
|
||||||
"REMOVEPLAYER",
|
"REMOVEPLAYER",
|
||||||
|
"DISCORD",
|
||||||
"LUACMD",
|
"LUACMD",
|
||||||
"LUAVAR"
|
"LUAVAR"
|
||||||
};
|
};
|
||||||
@@ -603,6 +612,12 @@ void D_RegisterServerCommands(void)
|
|||||||
Forceskin_cons_t[i].value = 0;
|
Forceskin_cons_t[i].value = 0;
|
||||||
Forceskin_cons_t[i].strvalue = NULL;
|
Forceskin_cons_t[i].strvalue = NULL;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// Set default player names
|
||||||
|
// Monster Iestyn (12/08/19): not sure where else I could have actually put this, but oh well
|
||||||
|
for (i = 0; i < MAXPLAYERS; i++)
|
||||||
|
snprintf(player_names[i], sizeof(player_names[i]), "Player %d", 1 + i);
|
||||||
|
|
||||||
RegisterNetXCmd(XD_NAMEANDCOLOR, Got_NameAndColor);
|
RegisterNetXCmd(XD_NAMEANDCOLOR, Got_NameAndColor);
|
||||||
RegisterNetXCmd(XD_WEAPONPREF, Got_WeaponPref);
|
RegisterNetXCmd(XD_WEAPONPREF, Got_WeaponPref);
|
||||||
RegisterNetXCmd(XD_MAP, Got_Mapcmd);
|
RegisterNetXCmd(XD_MAP, Got_Mapcmd);
|
||||||
@@ -1014,9 +1029,17 @@ void D_RegisterClientCommands(void)
|
|||||||
|
|
||||||
CV_RegisterVar(&cv_usejoystick[i]);
|
CV_RegisterVar(&cv_usejoystick[i]);
|
||||||
CV_RegisterVar(&cv_joyscale[i]);
|
CV_RegisterVar(&cv_joyscale[i]);
|
||||||
CV_RegisterVar(&cv_rumble[i]);
|
|
||||||
CV_RegisterVar(&cv_rumblestrength[i]);
|
|
||||||
CV_RegisterVar(&cv_gamepadled[i]);
|
CV_RegisterVar(&cv_gamepadled[i]);
|
||||||
|
|
||||||
|
CV_RegisterVar(&cv_rumble[i]);
|
||||||
|
CV_RegisterVar(&cv_rumble_strength[i]);
|
||||||
|
CV_RegisterVar(&cv_rumble_spinout[i]);
|
||||||
|
CV_RegisterVar(&cv_rumble_sneakerboost[i]);
|
||||||
|
CV_RegisterVar(&cv_rumble_offroad[i]);
|
||||||
|
CV_RegisterVar(&cv_rumble_bananadrag[i]);
|
||||||
|
CV_RegisterVar(&cv_rumble_stairjank[i]);
|
||||||
|
CV_RegisterVar(&cv_rumble_brakedrift[i]);
|
||||||
|
CV_RegisterVar(&cv_rumble_driftcharge[i]);
|
||||||
}
|
}
|
||||||
|
|
||||||
CV_RegisterVar(&cv_gamepadifunfocused);
|
CV_RegisterVar(&cv_gamepadifunfocused);
|
||||||
@@ -1273,7 +1296,8 @@ static boolean EnsurePlayerNameIsGood(char *name, INT32 playernum)
|
|||||||
else if (len == 1) // Agh!
|
else if (len == 1) // Agh!
|
||||||
{
|
{
|
||||||
// Last ditch effort...
|
// Last ditch effort...
|
||||||
sprintf(name, "%d", M_RandomKey(10));
|
snprintf(name, MAXPLAYERNAME+1, "%d", M_RandomKey(10));
|
||||||
|
|
||||||
if (!EnsurePlayerNameIsGood(name, playernum))
|
if (!EnsurePlayerNameIsGood(name, playernum))
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
@@ -1665,7 +1689,8 @@ static void SendNameAndColor(UINT8 splitplayer)
|
|||||||
// Finally write out the complete packet and send it off.
|
// Finally write out the complete packet and send it off.
|
||||||
WRITESTRINGN(p, playername->zstring, MAXPLAYERNAME);
|
WRITESTRINGN(p, playername->zstring, MAXPLAYERNAME);
|
||||||
WRITEUINT8(p, (UINT8)playercolor->value);
|
WRITEUINT8(p, (UINT8)playercolor->value);
|
||||||
WRITEUINT8(p, (UINT8)playerskin->value);
|
WRITESKIN(p, (skinnum_t)playerskin->value);
|
||||||
|
|
||||||
SendNetXCmdForPlayer(splitplayer, XD_NAMEANDCOLOR, buf, p - buf);
|
SendNetXCmdForPlayer(splitplayer, XD_NAMEANDCOLOR, buf, p - buf);
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -1673,7 +1698,8 @@ static void Got_NameAndColor(const UINT8 **cp, INT32 playernum)
|
|||||||
{
|
{
|
||||||
player_t *player;
|
player_t *player;
|
||||||
char name[MAXPLAYERNAME+1] = {};
|
char name[MAXPLAYERNAME+1] = {};
|
||||||
UINT8 color, skin;
|
UINT8 color;
|
||||||
|
skinnum_t skin;
|
||||||
|
|
||||||
#ifdef PARANOIA
|
#ifdef PARANOIA
|
||||||
if (playernum < 0 || playernum > MAXPLAYERS)
|
if (playernum < 0 || playernum > MAXPLAYERS)
|
||||||
@@ -1695,7 +1721,7 @@ static void Got_NameAndColor(const UINT8 **cp, INT32 playernum)
|
|||||||
|
|
||||||
READSTRINGN(*cp, name, MAXPLAYERNAME);
|
READSTRINGN(*cp, name, MAXPLAYERNAME);
|
||||||
color = READUINT8(*cp);
|
color = READUINT8(*cp);
|
||||||
skin = READUINT8(*cp);
|
skin = READSKIN(*cp);
|
||||||
|
|
||||||
// set name
|
// set name
|
||||||
if (player_name_changes[playernum] < MAXNAMECHANGES)
|
if (player_name_changes[playernum] < MAXNAMECHANGES)
|
||||||
@@ -1803,7 +1829,7 @@ INT32 D_LookupPlayer(const char *s)
|
|||||||
|
|
||||||
if ((playernum = atoi(s)))
|
if ((playernum = atoi(s)))
|
||||||
{
|
{
|
||||||
playernum = max(min(playernum, MAXPLAYERS-1), 0);/* not out of range */
|
playernum = max(min(playernum, MAXPLAYERS-1), 0); /* not out of range */
|
||||||
return playernum;
|
return playernum;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -2327,11 +2353,12 @@ static char *ConcatCommandArgv(int start, int end)
|
|||||||
if (!p)
|
if (!p)
|
||||||
I_Error("ConcatCommandArgv: Out of memory!\n");
|
I_Error("ConcatCommandArgv: Out of memory!\n");
|
||||||
|
|
||||||
--end;/* handle the final argument separately */
|
--end; /* handle the final argument separately */
|
||||||
|
|
||||||
for (i = start; i < end; ++i)
|
for (i = start; i < end; ++i)
|
||||||
{
|
{
|
||||||
p += sprintf(p, "%s ", COM_Argv(i));
|
if (size - (p - final) > 0)
|
||||||
|
p += snprintf(p, size - (p - final), "%s ", COM_Argv(i));
|
||||||
}
|
}
|
||||||
|
|
||||||
/* at this point "end" is actually the last argument's position */
|
/* at this point "end" is actually the last argument's position */
|
||||||
@@ -2745,11 +2772,11 @@ static void Command_ReplayMarker(void)
|
|||||||
|
|
||||||
if (title)
|
if (title)
|
||||||
{
|
{
|
||||||
snprintf(demo.titlename, 64, "%s [%i:%02d/%.5s]", title, G_TicsToMinutes(adjustedleveltime, false), G_TicsToSeconds(adjustedleveltime), modeattacking ? "Record Attack" : connectedservername);
|
snprintf(demo.titlename, sizeof(demo.titlename)-1, "%s [%i:%02d/%.5s]", title, G_TicsToMinutes(adjustedleveltime, false), G_TicsToSeconds(adjustedleveltime), modeattacking ? "Record Attack" : connectedservername);
|
||||||
Z_Free(title);
|
Z_Free(title);
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
snprintf(demo.titlename, 64, "[%i:%02d/%.5s]", G_TicsToMinutes(adjustedleveltime, false), G_TicsToSeconds(adjustedleveltime), modeattacking ? "Record Attack" : connectedservername);
|
snprintf(demo.titlename, sizeof(demo.titlename)-1, "[%i:%02d/%.5s]", G_TicsToMinutes(adjustedleveltime, false), G_TicsToSeconds(adjustedleveltime), modeattacking ? "Record Attack" : connectedservername);
|
||||||
|
|
||||||
CONS_Printf("Replay will be saved!\n");
|
CONS_Printf("Replay will be saved!\n");
|
||||||
}
|
}
|
||||||
@@ -4346,13 +4373,13 @@ static void Got_RequestAddfilecmd(const UINT8 **cp, INT32 playernum)
|
|||||||
char message[275];
|
char message[275];
|
||||||
|
|
||||||
if (toomany)
|
if (toomany)
|
||||||
sprintf(message, M_GetText("Too many files loaded to add %s\n"), filename);
|
snprintf(message, sizeof(message), M_GetText("Too many files loaded to add %s\n"), filename);
|
||||||
else if (ncs == FS_NOTFOUND)
|
else if (ncs == FS_NOTFOUND)
|
||||||
sprintf(message, M_GetText("The server doesn't have %s\n"), filename);
|
snprintf(message, sizeof(message), M_GetText("The server doesn't have %s\n"), filename);
|
||||||
else if (ncs == FS_MD5SUMBAD)
|
else if (ncs == FS_MD5SUMBAD)
|
||||||
sprintf(message, M_GetText("Checksum mismatch on %s\n"), filename);
|
snprintf(message, sizeof(message), M_GetText("Checksum mismatch on %s\n"), filename);
|
||||||
else
|
else
|
||||||
sprintf(message, M_GetText("Unknown error finding wad file (%s)\n"), filename);
|
snprintf(message, sizeof(message), M_GetText("Unknown error finding wad file (%s)\n"), filename);
|
||||||
|
|
||||||
CONS_Printf("%s",message);
|
CONS_Printf("%s",message);
|
||||||
|
|
||||||
@@ -5186,8 +5213,10 @@ static void Command_Mapmd5_f(void)
|
|||||||
{
|
{
|
||||||
INT32 i;
|
INT32 i;
|
||||||
char md5tmp[33];
|
char md5tmp[33];
|
||||||
|
|
||||||
for (i = 0; i < 16; ++i)
|
for (i = 0; i < 16; ++i)
|
||||||
sprintf(&md5tmp[i*2], "%02x", mapmd5[i]);
|
snprintf(&md5tmp[i*2], 3, "%02x", mapmd5[i]);
|
||||||
|
|
||||||
CONS_Printf("%s: %s\n", G_BuildMapName(gamemap), md5tmp);
|
CONS_Printf("%s: %s\n", G_BuildMapName(gamemap), md5tmp);
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
@@ -5688,19 +5717,22 @@ static void Command_SkinSearch(void)
|
|||||||
size_t i;
|
size_t i;
|
||||||
UINT16 s;
|
UINT16 s;
|
||||||
UINT16 ic = 0;
|
UINT16 ic = 0;
|
||||||
//skin_t *skininput = &skins[s];
|
|
||||||
for (i = 1; i < COM_Argc(); i++){
|
for (i = 1; i < COM_Argc(); i++)
|
||||||
for( s = 0 ; s < numallskins ; s++ )
|
{
|
||||||
|
for (s = 0; s < numskins; s++)
|
||||||
{
|
{
|
||||||
skin_t *skininput = &skins[s];
|
skin_t *skininput = &skins[s];
|
||||||
if (strcasestr(skininput->realname,COM_Argv(i)))
|
|
||||||
|
if (strcasestr(skininput->realname, COM_Argv(i)))
|
||||||
{
|
{
|
||||||
ic++;
|
ic++;
|
||||||
CONS_Printf("%d. %s%s:\x80 %s\n", ic,HU_SkinColorToConsoleColor(skininput->prefcolor),skininput->realname,skininput->name);
|
CONS_Printf("%d. %s%s:\x80 %s\n", ic, HU_SkinColorToConsoleColor(skininput->prefcolor), skininput->realname, skininput->name);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
CONS_Printf("Total %d skins.\n", ic);
|
|
||||||
|
CONS_Printf("Total %d skins.\n", ic);
|
||||||
}
|
}
|
||||||
|
|
||||||
/** Sends a color change for the console player, unless that player is moving.
|
/** Sends a color change for the console player, unless that player is moving.
|
||||||
|
|||||||
+6
-4
@@ -299,10 +299,13 @@ boolean CL_CheckDownloadable(void)
|
|||||||
{
|
{
|
||||||
INT32 j;
|
INT32 j;
|
||||||
char md5tmp[33];
|
char md5tmp[33];
|
||||||
|
|
||||||
for (j = 0; j < 16; j++)
|
for (j = 0; j < 16; j++)
|
||||||
sprintf(&md5tmp[j*2], "%02x", fileneeded[i].md5sum[j]);
|
snprintf(&md5tmp[j*2], 3, "%02x", fileneeded[i].md5sum[j]);
|
||||||
|
|
||||||
CONS_Printf("%s", md5tmp);
|
CONS_Printf("%s", md5tmp);
|
||||||
}
|
}
|
||||||
|
|
||||||
CONS_Printf("\n");
|
CONS_Printf("\n");
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -1616,8 +1619,7 @@ static void CURLGetFile(void)
|
|||||||
#endif
|
#endif
|
||||||
}
|
}
|
||||||
|
|
||||||
HTTP_login *
|
HTTP_login *CURLGetLogin(const char *url, HTTP_login ***return_prev_next)
|
||||||
CURLGetLogin (const char *url, HTTP_login ***return_prev_next)
|
|
||||||
{
|
{
|
||||||
HTTP_login * login;
|
HTTP_login * login;
|
||||||
HTTP_login ** prev_next;
|
HTTP_login ** prev_next;
|
||||||
@@ -1627,7 +1629,7 @@ CURLGetLogin (const char *url, HTTP_login ***return_prev_next)
|
|||||||
( login = (*prev_next));
|
( login = (*prev_next));
|
||||||
prev_next = &login->next
|
prev_next = &login->next
|
||||||
){
|
){
|
||||||
if (fastcmp(login->url, url) != 0)
|
if (fastcmp(login->url, url))
|
||||||
{
|
{
|
||||||
if (return_prev_next)
|
if (return_prev_next)
|
||||||
(*return_prev_next) = prev_next;
|
(*return_prev_next) = prev_next;
|
||||||
|
|||||||
+2
-2
@@ -211,12 +211,12 @@ void D_SetupProtocol(void)
|
|||||||
|
|
||||||
if (result)
|
if (result)
|
||||||
{
|
{
|
||||||
if (!fastcmp(buffer, "no"))
|
if (fastcmp(buffer, "no"))
|
||||||
{
|
{
|
||||||
fclose(fp);
|
fclose(fp);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
else if (fastcmp(buffer, exe_path))
|
else if (!fastcmp(buffer, exe_path))
|
||||||
{
|
{
|
||||||
// overwrite
|
// overwrite
|
||||||
fclose(fp);
|
fclose(fp);
|
||||||
|
|||||||
+128
-56
@@ -68,6 +68,12 @@ typedef LPVOID (WINAPI *p_MapViewOfFile) (HANDLE, DWORD, DWORD, DWORD, SIZE_T);
|
|||||||
#include <time.h>
|
#include <time.h>
|
||||||
#if defined (__linux__)
|
#if defined (__linux__)
|
||||||
#include <sys/vfs.h>
|
#include <sys/vfs.h>
|
||||||
|
#elif defined(__APPLE__)
|
||||||
|
#include <sys/param.h>
|
||||||
|
#include <sys/mount.h>
|
||||||
|
#include <sys/types.h>
|
||||||
|
#include <sys/sysctl.h>
|
||||||
|
#include <mach/mach.h>
|
||||||
#else
|
#else
|
||||||
#include <sys/param.h>
|
#include <sys/param.h>
|
||||||
#include <sys/mount.h>
|
#include <sys/mount.h>
|
||||||
@@ -156,8 +162,7 @@ const char *wadSearchPaths[] = {
|
|||||||
|
|
||||||
/** \brief WAD file to look for
|
/** \brief WAD file to look for
|
||||||
*/
|
*/
|
||||||
#define WADKEYWORD1 "srb2.srb"
|
#define WADKEYWORD "srb2.srb"
|
||||||
#define WADKEYWORD2 "srb2.wad"
|
|
||||||
/** \brief holds wad path
|
/** \brief holds wad path
|
||||||
*/
|
*/
|
||||||
static char returnWadPath[256];
|
static char returnWadPath[256];
|
||||||
@@ -520,17 +525,24 @@ void I_OutputMsg(const char *fmt, ...)
|
|||||||
{
|
{
|
||||||
size_t len;
|
size_t len;
|
||||||
char *txt;
|
char *txt;
|
||||||
va_list argptr;
|
va_list argptr;
|
||||||
|
|
||||||
va_start(argptr,fmt);
|
if (!fmt)
|
||||||
|
return;
|
||||||
|
|
||||||
|
va_start(argptr, fmt);
|
||||||
len = vsnprintf(NULL, 0, fmt, argptr);
|
len = vsnprintf(NULL, 0, fmt, argptr);
|
||||||
va_end(argptr);
|
va_end(argptr);
|
||||||
if (len == 0)
|
if (len == 0)
|
||||||
return;
|
return;
|
||||||
|
|
||||||
txt = malloc(len+1);
|
txt = (char*)(malloc(len+1));
|
||||||
va_start(argptr,fmt);
|
|
||||||
vsprintf(txt, fmt, argptr);
|
if (!txt)
|
||||||
|
I_Error("I_OutputMsg: Out of memory!\n");
|
||||||
|
|
||||||
|
va_start(argptr, fmt);
|
||||||
|
vsnprintf(txt, len+1, fmt, argptr);
|
||||||
va_end(argptr);
|
va_end(argptr);
|
||||||
|
|
||||||
#ifdef HAVE_TTF
|
#ifdef HAVE_TTF
|
||||||
@@ -538,7 +550,7 @@ void I_OutputMsg(const char *fmt, ...)
|
|||||||
DEFAULTFONTBGR, DEFAULTFONTBGG, DEFAULTFONTBGB, DEFAULTFONTBGA, txt);
|
DEFAULTFONTBGR, DEFAULTFONTBGG, DEFAULTFONTBGB, DEFAULTFONTBGA, txt);
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
len = strlen(txt);
|
len = strnlen(txt, len+1);
|
||||||
|
|
||||||
#ifdef LOGMESSAGES
|
#ifdef LOGMESSAGES
|
||||||
if (logstream)
|
if (logstream)
|
||||||
@@ -956,14 +968,18 @@ void I_Sleep(UINT32 ms)
|
|||||||
|
|
||||||
void I_SleepDuration(precise_t duration)
|
void I_SleepDuration(precise_t duration)
|
||||||
{
|
{
|
||||||
#if defined(__linux__) || defined(__FreeBSD__) || defined(__HAIKU__)
|
#if defined(__linux__) || defined(__FreeBSD__) || defined(__HAIKU__) || defined(__OpenBSD__)
|
||||||
UINT64 precision = I_GetPrecisePrecision();
|
UINT64 precision = I_GetPrecisePrecision();
|
||||||
struct timespec ts = {
|
struct timespec ts = {
|
||||||
.tv_sec = duration / precision,
|
.tv_sec = duration / precision,
|
||||||
.tv_nsec = duration * 1000000000 / precision % 1000000000,
|
.tv_nsec = duration * 1000000000 / precision % 1000000000,
|
||||||
};
|
};
|
||||||
int status;
|
int status;
|
||||||
|
#ifdef __OpenBSD__
|
||||||
|
do status = nanosleep(&ts, &ts);
|
||||||
|
#else
|
||||||
do status = clock_nanosleep(CLOCK_MONOTONIC, 0, &ts, &ts);
|
do status = clock_nanosleep(CLOCK_MONOTONIC, 0, &ts, &ts);
|
||||||
|
#endif
|
||||||
while (status == EINTR);
|
while (status == EINTR);
|
||||||
#elif defined (MIN_SLEEP_DURATION_MS)
|
#elif defined (MIN_SLEEP_DURATION_MS)
|
||||||
UINT64 precision = I_GetPrecisePrecision();
|
UINT64 precision = I_GetPrecisePrecision();
|
||||||
@@ -1041,7 +1057,7 @@ static void I_PrintSignal(INT32 signal_num, boolean core_dumped, char *signal_ms
|
|||||||
sigmsg = ("SIGABRT - SRB2Kart-Saturn was terminated by an abort signal.");
|
sigmsg = ("SIGABRT - SRB2Kart-Saturn was terminated by an abort signal.");
|
||||||
break;
|
break;
|
||||||
default:
|
default:
|
||||||
sprintf(signal_msg, "Signal number %d", signal_num);
|
snprintf(signal_msg, 512, "Signal number %d", signal_num);
|
||||||
sigmsg = (core_dumped ? "Unknown signal" : signal_msg);
|
sigmsg = (core_dumped ? "Unknown signal" : signal_msg);
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
@@ -1049,13 +1065,17 @@ static void I_PrintSignal(INT32 signal_num, boolean core_dumped, char *signal_ms
|
|||||||
if (core_dumped)
|
if (core_dumped)
|
||||||
{
|
{
|
||||||
if (sigmsg)
|
if (sigmsg)
|
||||||
sprintf(signal_msg, "%s (core dumped)", sigmsg);
|
{
|
||||||
|
snprintf(signal_msg, 512, "%s (core dumped)", sigmsg);
|
||||||
|
}
|
||||||
else
|
else
|
||||||
|
{
|
||||||
strcat(signal_msg, " (core dumped)");
|
strcat(signal_msg, " (core dumped)");
|
||||||
|
}
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
sprintf(signal_msg, "%s", sigmsg);
|
snprintf(signal_msg, 512, "%s", sigmsg);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -1332,7 +1352,7 @@ FUNCNORETURN static ATTRNORETURN void newsignalhandler_Warn(const char *pr)
|
|||||||
{
|
{
|
||||||
char text[128];
|
char text[128];
|
||||||
|
|
||||||
snprintf(text, sizeof text,
|
snprintf(text, sizeof(text),
|
||||||
"Error while setting up signal reporting: %s: %s",
|
"Error while setting up signal reporting: %s: %s",
|
||||||
pr,
|
pr,
|
||||||
strerror(errno)
|
strerror(errno)
|
||||||
@@ -1413,6 +1433,12 @@ static void I_Fork(void)
|
|||||||
}
|
}
|
||||||
#endif/*NEWSIGNALHANDLER*/
|
#endif/*NEWSIGNALHANDLER*/
|
||||||
|
|
||||||
|
int I_OpenURL(const char *url)
|
||||||
|
{
|
||||||
|
(void)url;
|
||||||
|
return -1;
|
||||||
|
}
|
||||||
|
|
||||||
INT32 I_StartupSystem(void)
|
INT32 I_StartupSystem(void)
|
||||||
{
|
{
|
||||||
I_StartupConsole();
|
I_StartupConsole();
|
||||||
@@ -1512,7 +1538,7 @@ FUNCIERROR void ATTRNORETURN I_Error(const char *error, ...)
|
|||||||
if (errorcount > 20)
|
if (errorcount > 20)
|
||||||
{
|
{
|
||||||
va_start(argptr, error);
|
va_start(argptr, error);
|
||||||
vsnprintf(buffer, 8192, error, argptr);
|
vsnprintf(buffer, sizeof(buffer), error, argptr);
|
||||||
va_end(argptr);
|
va_end(argptr);
|
||||||
|
|
||||||
I_OutputMsg("SRB2Kart %s Recursive Error", buffer);
|
I_OutputMsg("SRB2Kart %s Recursive Error", buffer);
|
||||||
@@ -1525,7 +1551,7 @@ FUNCIERROR void ATTRNORETURN I_Error(const char *error, ...)
|
|||||||
|
|
||||||
// Display error message in the console before we start shutting it down
|
// Display error message in the console before we start shutting it down
|
||||||
va_start(argptr, error);
|
va_start(argptr, error);
|
||||||
vsnprintf(buffer, 8192, error, argptr);
|
vsnprintf(buffer, sizeof(buffer), error, argptr);
|
||||||
va_end(argptr);
|
va_end(argptr);
|
||||||
I_OutputMsg("\nI_Error(): %s\n", buffer);
|
I_OutputMsg("\nI_Error(): %s\n", buffer);
|
||||||
|
|
||||||
@@ -1746,7 +1772,8 @@ char *I_GetUserName(void)
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
strncpy(username, p, MAXPLAYERNAME);
|
|
||||||
|
snprintf(username, sizeof(username), "%s", p);
|
||||||
}
|
}
|
||||||
|
|
||||||
if (!fastcmp(username, ""))
|
if (!fastcmp(username, ""))
|
||||||
@@ -1770,6 +1797,24 @@ INT32 I_mkdir(const char *dirname, INT32 unixright)
|
|||||||
#endif
|
#endif
|
||||||
}
|
}
|
||||||
|
|
||||||
|
INT32 I_ChDir(const char *path)
|
||||||
|
{
|
||||||
|
#ifdef _WIN32
|
||||||
|
return (SetCurrentDirectoryA(path) ? 0 : -1);
|
||||||
|
#else
|
||||||
|
return chdir(path);
|
||||||
|
#endif
|
||||||
|
}
|
||||||
|
|
||||||
|
char *I_GetCwd(char *buf, size_t size)
|
||||||
|
{
|
||||||
|
#ifdef _WIN32
|
||||||
|
return (GetCurrentDirectoryA((DWORD)size, buf) ? buf : NULL);
|
||||||
|
#else
|
||||||
|
return getcwd(buf, size);
|
||||||
|
#endif
|
||||||
|
}
|
||||||
|
|
||||||
char *I_GetEnv(const char *name)
|
char *I_GetEnv(const char *name)
|
||||||
{
|
{
|
||||||
return getenv(name);
|
return getenv(name);
|
||||||
@@ -1802,42 +1847,34 @@ const char *I_ClipboardPaste(void)
|
|||||||
*/
|
*/
|
||||||
static boolean isWadPathOk(const char *path)
|
static boolean isWadPathOk(const char *path)
|
||||||
{
|
{
|
||||||
char *wad3path = malloc(256);
|
char wad3path[256];
|
||||||
|
|
||||||
if (!wad3path)
|
snprintf(wad3path, sizeof(wad3path), pandf, path, WADKEYWORD);
|
||||||
return false;
|
|
||||||
|
|
||||||
sprintf(wad3path, pandf, path, WADKEYWORD1);
|
|
||||||
|
|
||||||
if (FIL_ReadFileOK(wad3path))
|
if (FIL_ReadFileOK(wad3path))
|
||||||
{
|
{
|
||||||
free(wad3path);
|
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
sprintf(wad3path, pandf, path, WADKEYWORD2);
|
|
||||||
|
|
||||||
if (FIL_ReadFileOK(wad3path))
|
|
||||||
{
|
|
||||||
free(wad3path);
|
|
||||||
return true;
|
|
||||||
}
|
|
||||||
|
|
||||||
free(wad3path);
|
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
static void pathonly(char *s)
|
static void pathonly(char *s, size_t size)
|
||||||
{
|
{
|
||||||
size_t j;
|
size_t j;
|
||||||
|
|
||||||
for (j = strlen(s); j != (size_t)-1; j--)
|
for (j = strnlen(s, size); j != (size_t)-1; j--)
|
||||||
|
{
|
||||||
if ((s[j] == '\\') || (s[j] == ':') || (s[j] == '/'))
|
if ((s[j] == '\\') || (s[j] == ':') || (s[j] == '/'))
|
||||||
{
|
{
|
||||||
if (s[j] == ':') s[j+1] = 0;
|
if (s[j] == ':')
|
||||||
else s[j] = 0;
|
s[j+1] = 0;
|
||||||
|
else
|
||||||
|
s[j] = 0;
|
||||||
|
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
/** \brief search for srb2.srb in the given path
|
/** \brief search for srb2.srb in the given path
|
||||||
@@ -1853,11 +1890,12 @@ static const char *searchWad(const char *searchDir)
|
|||||||
static char tempsw[256] = "";
|
static char tempsw[256] = "";
|
||||||
filestatus_t fstemp;
|
filestatus_t fstemp;
|
||||||
|
|
||||||
strcpy(tempsw, WADKEYWORD1);
|
snprintf(tempsw, sizeof(tempsw), "%s", WADKEYWORD);
|
||||||
fstemp = filesearch(tempsw, searchDir, NULL, true, 20);
|
fstemp = filesearch(tempsw, searchDir, NULL, true, 20);
|
||||||
|
|
||||||
if (fstemp == FS_FOUND)
|
if (fstemp == FS_FOUND)
|
||||||
{
|
{
|
||||||
pathonly(tempsw);
|
pathonly(tempsw, sizeof(tempsw));
|
||||||
return tempsw;
|
return tempsw;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -1895,7 +1933,7 @@ static const char *locateWad(void)
|
|||||||
|
|
||||||
#ifndef NOCWD
|
#ifndef NOCWD
|
||||||
// examine current dir
|
// examine current dir
|
||||||
strcpy(returnWadPath, ".");
|
snprintf(returnWadPath, sizeof(returnWadPath), "%s", ".");
|
||||||
I_OutputMsg(",%s", returnWadPath);
|
I_OutputMsg(",%s", returnWadPath);
|
||||||
if (isWadPathOk(returnWadPath))
|
if (isWadPathOk(returnWadPath))
|
||||||
return NULL;
|
return NULL;
|
||||||
@@ -1907,7 +1945,7 @@ static const char *locateWad(void)
|
|||||||
// examine user jart directory
|
// examine user jart directory
|
||||||
if ((envstr = I_GetEnv("HOME")) != NULL)
|
if ((envstr = I_GetEnv("HOME")) != NULL)
|
||||||
{
|
{
|
||||||
sprintf(returnWadPath, "%s" PATHSEP DEFAULTDIR, envstr);
|
snprintf(returnWadPath, sizeof(returnWadPath), "%s" PATHSEP DEFAULTDIR, envstr);
|
||||||
CHECKWADPATH(returnWadPath);
|
CHECKWADPATH(returnWadPath);
|
||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
@@ -1921,7 +1959,7 @@ static const char *locateWad(void)
|
|||||||
// examine default dirs
|
// examine default dirs
|
||||||
for (i = 0; wadDefaultPaths[i]; i++)
|
for (i = 0; wadDefaultPaths[i]; i++)
|
||||||
{
|
{
|
||||||
strcpy(returnWadPath, wadDefaultPaths[i]);
|
snprintf(returnWadPath, sizeof(returnWadPath), "%s", wadDefaultPaths[i]);
|
||||||
CHECKWADPATH(returnWadPath);
|
CHECKWADPATH(returnWadPath);
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -1949,12 +1987,11 @@ const char *I_LocateWad(void)
|
|||||||
// change to the directory where we found srb2.srb
|
// change to the directory where we found srb2.srb
|
||||||
#if defined (_WIN32)
|
#if defined (_WIN32)
|
||||||
waddir = _fullpath(NULL, waddir, MAX_PATH);
|
waddir = _fullpath(NULL, waddir, MAX_PATH);
|
||||||
SetCurrentDirectoryA(waddir);
|
|
||||||
#else
|
#else
|
||||||
waddir = realpath(waddir, NULL);
|
waddir = realpath(waddir, NULL);
|
||||||
if (waddir == NULL || chdir(waddir) == -1)
|
|
||||||
I_OutputMsg("Couldn't change working directory\n");
|
|
||||||
#endif
|
#endif
|
||||||
|
if (waddir == NULL || I_ChDir(waddir) == -1)
|
||||||
|
I_OutputMsg("Couldn't change working directory\n");
|
||||||
}
|
}
|
||||||
|
|
||||||
return waddir;
|
return waddir;
|
||||||
@@ -1974,17 +2011,22 @@ const char *I_LocateWad(void)
|
|||||||
static long get_entry(const char* name, const char* buf)
|
static long get_entry(const char* name, const char* buf)
|
||||||
{
|
{
|
||||||
long val;
|
long val;
|
||||||
char* hit = strstr(buf, name);
|
const char* hit = strstr(buf, name);
|
||||||
if (hit == NULL) {
|
|
||||||
|
if (hit == NULL)
|
||||||
|
{
|
||||||
return -1;
|
return -1;
|
||||||
}
|
}
|
||||||
|
|
||||||
errno = 0;
|
errno = 0;
|
||||||
val = strtol(hit + strlen(name), NULL, 10);
|
val = strtol(hit + strlen(name), NULL, 10);
|
||||||
if (errno != 0) {
|
|
||||||
|
if (errno != 0)
|
||||||
|
{
|
||||||
CONS_Alert(CONS_ERROR, M_GetText("get_entry: strtol() failed: %s\n"), strerror(errno));
|
CONS_Alert(CONS_ERROR, M_GetText("get_entry: strtol() failed: %s\n"), strerror(errno));
|
||||||
return -1;
|
return -1;
|
||||||
}
|
}
|
||||||
|
|
||||||
return val;
|
return val;
|
||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
@@ -2009,13 +2051,13 @@ size_t I_GetFreeMem(size_t *total)
|
|||||||
*total = 32 << 20;
|
*total = 32 << 20;
|
||||||
return 32 << 20;
|
return 32 << 20;
|
||||||
#elif defined (_WIN32)
|
#elif defined (_WIN32)
|
||||||
MEMORYSTATUS info;
|
MEMORYSTATUSEX info;
|
||||||
|
|
||||||
info.dwLength = sizeof (MEMORYSTATUS);
|
info.dwLength = sizeof (MEMORYSTATUSEX);
|
||||||
GlobalMemoryStatus( &info );
|
GlobalMemoryStatusEx( &info );
|
||||||
if (total)
|
if (total)
|
||||||
*total = (size_t)info.dwTotalPhys;
|
*total = (size_t)info.ullTotalPhys;
|
||||||
return (size_t)info.dwAvailPhys;
|
return (size_t)info.ullAvailPhys;
|
||||||
#elif defined (__OS2__)
|
#elif defined (__OS2__)
|
||||||
UINT32 pr_arena;
|
UINT32 pr_arena;
|
||||||
|
|
||||||
@@ -2048,7 +2090,7 @@ size_t I_GetFreeMem(size_t *total)
|
|||||||
{
|
{
|
||||||
// Error
|
// Error
|
||||||
if (total)
|
if (total)
|
||||||
*total = 0L;
|
*total = 0;
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -2057,12 +2099,12 @@ size_t I_GetFreeMem(size_t *total)
|
|||||||
{
|
{
|
||||||
// Error
|
// Error
|
||||||
if (total)
|
if (total)
|
||||||
*total = 0L;
|
*total = 0;
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
memTag += sizeof (MEMTOTAL);
|
memTag += sizeof (MEMTOTAL);
|
||||||
totalKBytes = (size_t)atoi(memTag);
|
totalKBytes = strtoul(memTag, NULL, 10);
|
||||||
|
|
||||||
if ((memTag = strstr(buf, MEMAVAILABLE)) == NULL)
|
if ((memTag = strstr(buf, MEMAVAILABLE)) == NULL)
|
||||||
{
|
{
|
||||||
@@ -2076,7 +2118,7 @@ size_t I_GetFreeMem(size_t *total)
|
|||||||
{
|
{
|
||||||
// Error
|
// Error
|
||||||
if (total)
|
if (total)
|
||||||
*total = 0L;
|
*total = 0;
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
freeKBytes = MemAvailable;
|
freeKBytes = MemAvailable;
|
||||||
@@ -2084,16 +2126,46 @@ size_t I_GetFreeMem(size_t *total)
|
|||||||
else
|
else
|
||||||
{
|
{
|
||||||
memTag += sizeof (MEMAVAILABLE);
|
memTag += sizeof (MEMAVAILABLE);
|
||||||
freeKBytes = atoi(memTag);
|
freeKBytes = strtoul(memTag, NULL, 10);
|
||||||
}
|
}
|
||||||
|
|
||||||
if (total)
|
if (total)
|
||||||
*total = totalKBytes << 10;
|
*total = totalKBytes << 10;
|
||||||
return freeKBytes << 10;
|
return freeKBytes << 10;
|
||||||
|
#elif defined(__APPLE__)
|
||||||
|
/* macOS */
|
||||||
|
mach_port_t host = mach_host_self();
|
||||||
|
kern_return_t kr;
|
||||||
|
mach_msg_type_number_t count;
|
||||||
|
vm_size_t v_page_size;
|
||||||
|
struct vm_statistics64 vm_stats;
|
||||||
|
uint64_t total_mem, free_mem;
|
||||||
|
size_t size;
|
||||||
|
|
||||||
|
size = sizeof(total_mem);
|
||||||
|
if (sysctlbyname("hw.memsize", &total_mem, &size, NULL, 0) < 0)
|
||||||
|
total_mem = 0;
|
||||||
|
|
||||||
|
kr = host_page_size(host, &v_page_size);
|
||||||
|
if (kr != KERN_SUCCESS)
|
||||||
|
v_page_size = 4096;
|
||||||
|
|
||||||
|
count = HOST_VM_INFO64_COUNT;
|
||||||
|
kr = host_statistics64(host, HOST_VM_INFO64, (host_info64_t)&vm_stats, &count);
|
||||||
|
if (kr == KERN_SUCCESS)
|
||||||
|
free_mem = (uint64_t)(vm_stats.free_count + vm_stats.inactive_count) * v_page_size;
|
||||||
|
else
|
||||||
|
free_mem = 0;
|
||||||
|
|
||||||
|
if (total)
|
||||||
|
*total = (size_t)total_mem;
|
||||||
|
return (size_t)free_mem;
|
||||||
#else
|
#else
|
||||||
// Guess 48 MB.
|
// Guess 48 MB.
|
||||||
if (total)
|
if (total)
|
||||||
|
{
|
||||||
*total = 48<<20;
|
*total = 48<<20;
|
||||||
|
}
|
||||||
return 48<<20;
|
return 48<<20;
|
||||||
#endif
|
#endif
|
||||||
}
|
}
|
||||||
|
|||||||
+1
-1
@@ -402,7 +402,7 @@ static void Discordrp_OnChange(void)
|
|||||||
static void DRPC_GotServerIP(UINT32 address)
|
static void DRPC_GotServerIP(UINT32 address)
|
||||||
{
|
{
|
||||||
const unsigned char * p = (const unsigned char *)&address;
|
const unsigned char * p = (const unsigned char *)&address;
|
||||||
sprintf(self_ip, "%u.%u.%u.%u:%u", p[0], p[1], p[2], p[3], current_port);
|
snprintf(self_ip, IP_SIZE+1, "%u.%u.%u.%u:%u", p[0], p[1], p[2], p[3], current_port);
|
||||||
}
|
}
|
||||||
|
|
||||||
/*--------------------------------------------------
|
/*--------------------------------------------------
|
||||||
|
|||||||
+24
-14
@@ -130,8 +130,17 @@ extern char logfilename[1024];
|
|||||||
#else
|
#else
|
||||||
#define VERSION 1 // Game version
|
#define VERSION 1 // Game version
|
||||||
#define SUBVERSION 6 // more precise version number
|
#define SUBVERSION 6 // more precise version number
|
||||||
#define VERSIONSTRING "Saturn v9.3"
|
|
||||||
#define VERSIONSTRINGW L"Saturn v9.3"
|
#ifdef PHOBOS_BUILD
|
||||||
|
#define CLIENTNAME "Phobos"
|
||||||
|
#define CLIENTNAMEW L"Phobos"
|
||||||
|
#else
|
||||||
|
#define CLIENTNAME "Saturn"
|
||||||
|
#define CLIENTNAMEW L"Saturn"
|
||||||
|
#endif
|
||||||
|
|
||||||
|
#define VERSIONSTRING CLIENTNAME " v10"
|
||||||
|
#define VERSIONSTRINGW CLIENTNAMEW L" v10"
|
||||||
|
|
||||||
#define SATURN_TESTING // comment out for saturn release builds!
|
#define SATURN_TESTING // comment out for saturn release builds!
|
||||||
|
|
||||||
@@ -602,11 +611,19 @@ extern const char *compdate, *comptime, *comprevision, *compbranch;
|
|||||||
// None of these that are disabled in the normal build are guaranteed to work perfectly
|
// None of these that are disabled in the normal build are guaranteed to work perfectly
|
||||||
// Compile them at your own risk!
|
// Compile them at your own risk!
|
||||||
|
|
||||||
// undefine to enable fixes and features that are not vanilla compatible
|
#ifdef PHOBOS_BUILD
|
||||||
#define COMPAT_VANILLA
|
// we want 32 players yesss
|
||||||
// if we build with 32 player (or more!) support we dont need to care vanilla compat
|
#undef MAXPLAYERS
|
||||||
#if MAXPLAYERS > 16
|
#define MAXPLAYERS 32
|
||||||
#undef COMPAT_VANILLA
|
|
||||||
|
// raise skinlimit to 1024
|
||||||
|
#undef MAXSKINS
|
||||||
|
#define MAXSKINS 1024
|
||||||
|
|
||||||
|
// overwrite some of those
|
||||||
|
// when not compiling in vanilla compat mode
|
||||||
|
#define SATURNJOIN
|
||||||
|
#define SATURNPAK
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
//-- SATURN __
|
//-- SATURN __
|
||||||
@@ -673,13 +690,6 @@ extern const char *compdate, *comptime, *comprevision, *compbranch;
|
|||||||
#undef UPDATE_ALERT
|
#undef UPDATE_ALERT
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
// overwrite some of those
|
|
||||||
// when not compiling in vanilla compat mode
|
|
||||||
#ifndef COMPAT_VANILLA
|
|
||||||
#define SATURNJOIN
|
|
||||||
#define SATURNPAK
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#ifdef __cplusplus
|
#ifdef __cplusplus
|
||||||
} // extern "C"
|
} // extern "C"
|
||||||
#endif
|
#endif
|
||||||
|
|||||||
@@ -42,6 +42,12 @@ extern "C" {
|
|||||||
#define INT64 int64_t
|
#define INT64 int64_t
|
||||||
#define UINT64 uint64_t
|
#define UINT64 uint64_t
|
||||||
|
|
||||||
|
#ifdef PHOBOS_BUILD
|
||||||
|
typedef uint16_t skinnum_t;
|
||||||
|
#else
|
||||||
|
typedef uint8_t skinnum_t;
|
||||||
|
#endif
|
||||||
|
|
||||||
#ifdef __APPLE_CC__
|
#ifdef __APPLE_CC__
|
||||||
#define DEBUG_LOG
|
#define DEBUG_LOG
|
||||||
#define NOIPX
|
#define NOIPX
|
||||||
|
|||||||
+2
-1
@@ -111,7 +111,8 @@ static fademask_t *F_GetFadeMask(UINT8 masknum, UINT8 scrnnum)
|
|||||||
goto freemask;
|
goto freemask;
|
||||||
|
|
||||||
// SRB2Kart: This suddenly triggers ERRORMODE now
|
// SRB2Kart: This suddenly triggers ERRORMODE now
|
||||||
//sprintf(&lumpname[4], "%.2hu%.2hu", (UINT16)masknum, (UINT16)scrnnum);
|
//snprintf(&lumpname[4], 3, "%.2hu%.2hu", (UINT16)masknum, (UINT16)scrnnum);
|
||||||
|
//lumpname[8] = 0;
|
||||||
|
|
||||||
lumpname[4] = '0'+(masknum/10);
|
lumpname[4] = '0'+(masknum/10);
|
||||||
lumpname[5] = '0'+(masknum%10);
|
lumpname[5] = '0'+(masknum%10);
|
||||||
|
|||||||
+36
-34
@@ -716,7 +716,7 @@ void G_WriteGhostTic(mobj_t *ghost, INT32 playernum)
|
|||||||
if (!(demoflags & DF_GHOST))
|
if (!(demoflags & DF_GHOST))
|
||||||
return; // No ghost data to write.
|
return; // No ghost data to write.
|
||||||
|
|
||||||
if (ghost->player && ghost->player->pflags & PF_NIGHTSMODE && ghost->tracer)
|
if (ghost->player && nightsplayer(ghost->player) && ghost->tracer)
|
||||||
{
|
{
|
||||||
// We're talking about the NiGHTS thing, not the normal platforming thing!
|
// We're talking about the NiGHTS thing, not the normal platforming thing!
|
||||||
ziptic |= GZT_NIGHTS;
|
ziptic |= GZT_NIGHTS;
|
||||||
@@ -934,7 +934,7 @@ void G_ConsAllGhostTics(void)
|
|||||||
void G_ConsGhostTic(INT32 playernum)
|
void G_ConsGhostTic(INT32 playernum)
|
||||||
{
|
{
|
||||||
UINT8 ziptic;
|
UINT8 ziptic;
|
||||||
fixed_t px,py,pz,gx,gy,gz;
|
fixed_t px, py, pz, gx, gy, gz;
|
||||||
mobj_t *testmo;
|
mobj_t *testmo;
|
||||||
fixed_t syncleeway;
|
fixed_t syncleeway;
|
||||||
boolean nightsfail = false;
|
boolean nightsfail = false;
|
||||||
@@ -979,7 +979,7 @@ void G_ConsGhostTic(INT32 playernum)
|
|||||||
|
|
||||||
if (ziptic & GZT_NIGHTS)
|
if (ziptic & GZT_NIGHTS)
|
||||||
{
|
{
|
||||||
if (!testmo || !testmo->player || !(testmo->player->pflags & PF_NIGHTSMODE) || !testmo->tracer)
|
if (!testmo || !testmo->player || !nightsplayer(testmo->player) || !testmo->tracer)
|
||||||
nightsfail = true;
|
nightsfail = true;
|
||||||
else
|
else
|
||||||
testmo = testmo->tracer;
|
testmo = testmo->tracer;
|
||||||
@@ -1723,11 +1723,11 @@ void G_BeginRecording(void)
|
|||||||
// Print to a separate temp buffer instead of demo.titlename, so we can use it in M_TextInputSetString
|
// Print to a separate temp buffer instead of demo.titlename, so we can use it in M_TextInputSetString
|
||||||
if (title)
|
if (title)
|
||||||
{
|
{
|
||||||
snprintf(demotitlename, 64, "%s - %s", title, modeattacking ? "Time Attack" : connectedservername);
|
snprintf(demotitlename, sizeof(demotitlename)-1, "%s - %s", title, modeattacking ? "Time Attack" : connectedservername);
|
||||||
Z_Free(title);
|
Z_Free(title);
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
snprintf(demotitlename, 64, "%s", modeattacking ? "Time Attack" : connectedservername);
|
snprintf(demotitlename, sizeof(demotitlename)-1, "%s", modeattacking ? "Time Attack" : connectedservername);
|
||||||
|
|
||||||
// Init just in case it isn't initialized already
|
// Init just in case it isn't initialized already
|
||||||
M_TextInputInit(&demo.titlenameinput, demo.titlename, sizeof(demo.titlename));
|
M_TextInputInit(&demo.titlenameinput, demo.titlename, sizeof(demo.titlename));
|
||||||
@@ -2212,7 +2212,7 @@ void G_LoadDemoInfo(menudemo_t *pdemo)
|
|||||||
{
|
{
|
||||||
CONS_Alert(CONS_ERROR, M_GetText("Failed to read file '%s'.\n"), pdemo->filepath);
|
CONS_Alert(CONS_ERROR, M_GetText("Failed to read file '%s'.\n"), pdemo->filepath);
|
||||||
pdemo->type = MD_INVALID;
|
pdemo->type = MD_INVALID;
|
||||||
sprintf(pdemo->title, "INVALID REPLAY");
|
snprintf(pdemo->title, sizeof(pdemo->title), "INVALID REPLAY");
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -2222,7 +2222,7 @@ void G_LoadDemoInfo(menudemo_t *pdemo)
|
|||||||
{
|
{
|
||||||
CONS_Alert(CONS_ERROR, M_GetText("%s is not a SRB2Kart replay file.\n"), pdemo->filepath);
|
CONS_Alert(CONS_ERROR, M_GetText("%s is not a SRB2Kart replay file.\n"), pdemo->filepath);
|
||||||
pdemo->type = MD_INVALID;
|
pdemo->type = MD_INVALID;
|
||||||
sprintf(pdemo->title, "INVALID REPLAY");
|
snprintf(pdemo->title, sizeof(pdemo->title), "INVALID REPLAY");
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -2247,14 +2247,14 @@ void G_LoadDemoInfo(menudemo_t *pdemo)
|
|||||||
#ifdef DEMO_COMPAT_100
|
#ifdef DEMO_COMPAT_100
|
||||||
case 0x0001:
|
case 0x0001:
|
||||||
pdemo->type = MD_OUTDATED;
|
pdemo->type = MD_OUTDATED;
|
||||||
sprintf(pdemo->title, "Legacy Replay");
|
snprintf(pdemo->title, sizeof(pdemo->title), "Legacy Replay");
|
||||||
break;
|
break;
|
||||||
#endif
|
#endif
|
||||||
// too old, cannot support.
|
// too old, cannot support.
|
||||||
default:
|
default:
|
||||||
CONS_Alert(CONS_ERROR, M_GetText("%s is an incompatible replay format and cannot be played.\n"), pdemo->filepath);
|
CONS_Alert(CONS_ERROR, M_GetText("%s is an incompatible replay format and cannot be played.\n"), pdemo->filepath);
|
||||||
pdemo->type = MD_INVALID;
|
pdemo->type = MD_INVALID;
|
||||||
sprintf(pdemo->title, "INVALID REPLAY");
|
snprintf(pdemo->title, sizeof(pdemo->title), "INVALID REPLAY");
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -2267,7 +2267,7 @@ void G_LoadDemoInfo(menudemo_t *pdemo)
|
|||||||
{
|
{
|
||||||
CONS_Alert(CONS_ERROR, M_GetText("%s is the wrong type of recording and cannot be played.\n"), pdemo->filepath);
|
CONS_Alert(CONS_ERROR, M_GetText("%s is the wrong type of recording and cannot be played.\n"), pdemo->filepath);
|
||||||
pdemo->type = MD_INVALID;
|
pdemo->type = MD_INVALID;
|
||||||
sprintf(pdemo->title, "INVALID REPLAY");
|
snprintf(pdemo->title, sizeof(pdemo->title), "INVALID REPLAY");
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -2288,7 +2288,7 @@ void G_LoadDemoInfo(menudemo_t *pdemo)
|
|||||||
{
|
{
|
||||||
CONS_Alert(CONS_ERROR, M_GetText("%s is a legacy multiplayer replay and cannot be played.\n"), pdemo->filepath);
|
CONS_Alert(CONS_ERROR, M_GetText("%s is a legacy multiplayer replay and cannot be played.\n"), pdemo->filepath);
|
||||||
pdemo->type = MD_INVALID;
|
pdemo->type = MD_INVALID;
|
||||||
sprintf(pdemo->title, "INVALID REPLAY");
|
snprintf(pdemo->title, sizeof(pdemo->title), "INVALID REPLAY");
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
@@ -2335,7 +2335,7 @@ void G_LoadDemoInfo(menudemo_t *pdemo)
|
|||||||
while (READUINT8(extrainfo_p) == DW_STANDING) // Assume standings are always first in the extrainfo
|
while (READUINT8(extrainfo_p) == DW_STANDING) // Assume standings are always first in the extrainfo
|
||||||
{
|
{
|
||||||
INT32 i;
|
INT32 i;
|
||||||
char temp[16];
|
char temp[17];
|
||||||
|
|
||||||
pdemo->standings[count].ranking = READUINT8(extrainfo_p);
|
pdemo->standings[count].ranking = READUINT8(extrainfo_p);
|
||||||
|
|
||||||
@@ -2345,6 +2345,7 @@ void G_LoadDemoInfo(menudemo_t *pdemo)
|
|||||||
|
|
||||||
// Skin
|
// Skin
|
||||||
memcpy(temp, extrainfo_p, 16);
|
memcpy(temp, extrainfo_p, 16);
|
||||||
|
temp[16] = '\0';
|
||||||
extrainfo_p += 16;
|
extrainfo_p += 16;
|
||||||
pdemo->standings[count].skin = UINT8_MAX;
|
pdemo->standings[count].skin = UINT8_MAX;
|
||||||
|
|
||||||
@@ -2359,6 +2360,7 @@ void G_LoadDemoInfo(menudemo_t *pdemo)
|
|||||||
|
|
||||||
// Color
|
// Color
|
||||||
memcpy(temp, extrainfo_p, 16);
|
memcpy(temp, extrainfo_p, 16);
|
||||||
|
temp[16] = '\0';
|
||||||
extrainfo_p += 16;
|
extrainfo_p += 16;
|
||||||
|
|
||||||
for (i = 0; i < MAXSKINCOLORS; i++)
|
for (i = 0; i < MAXSKINCOLORS; i++)
|
||||||
@@ -2522,7 +2524,7 @@ void G_LoadDemoTitle(menudemo_t *pdemo)
|
|||||||
if (!handle)
|
if (!handle)
|
||||||
{
|
{
|
||||||
CONS_Alert(CONS_ERROR, M_GetText("Failed to read file '%s'.\n"), pdemo->filepath);
|
CONS_Alert(CONS_ERROR, M_GetText("Failed to read file '%s'.\n"), pdemo->filepath);
|
||||||
sprintf(pdemo->title, "INVALID REPLAY");
|
snprintf(pdemo->title, sizeof(pdemo->title), "INVALID REPLAY");
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -2534,7 +2536,7 @@ void G_LoadDemoTitle(menudemo_t *pdemo)
|
|||||||
if (count < 96 || memcmp(info_p, DEMOHEADER, 12))
|
if (count < 96 || memcmp(info_p, DEMOHEADER, 12))
|
||||||
{
|
{
|
||||||
CONS_Alert(CONS_ERROR, M_GetText("%s is not a SRB2Kart replay file.\n"), pdemo->filepath);
|
CONS_Alert(CONS_ERROR, M_GetText("%s is not a SRB2Kart replay file.\n"), pdemo->filepath);
|
||||||
sprintf(pdemo->title, "INVALID REPLAY");
|
snprintf(pdemo->title, sizeof(pdemo->title), "INVALID REPLAY");
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -2563,13 +2565,13 @@ void G_LoadDemoTitle(menudemo_t *pdemo)
|
|||||||
break;
|
break;
|
||||||
#ifdef DEMO_COMPAT_100
|
#ifdef DEMO_COMPAT_100
|
||||||
case 0x0001:
|
case 0x0001:
|
||||||
sprintf(pdemo->title, "Legacy Replay");
|
snprintf(pdemo->title, sizeof(pdemo->title), "Legacy Replay");
|
||||||
break;
|
break;
|
||||||
#endif
|
#endif
|
||||||
// too old, cannot support.
|
// too old, cannot support.
|
||||||
default:
|
default:
|
||||||
CONS_Alert(CONS_ERROR, M_GetText("%s is an incompatible replay format and cannot be played.\n"), pdemo->filepath);
|
CONS_Alert(CONS_ERROR, M_GetText("%s is an incompatible replay format and cannot be played.\n"), pdemo->filepath);
|
||||||
sprintf(pdemo->title, "INVALID REPLAY");
|
snprintf(pdemo->title, sizeof(pdemo->title), "INVALID REPLAY");
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -2633,7 +2635,7 @@ void G_DoPlayDemo(char *defdemoname)
|
|||||||
//FIL_DefaultExtension(defdemoname, ".lmp");
|
//FIL_DefaultExtension(defdemoname, ".lmp");
|
||||||
if (!FIL_ReadFile(defdemoname, &demobuf.buffer))
|
if (!FIL_ReadFile(defdemoname, &demobuf.buffer))
|
||||||
{
|
{
|
||||||
snprintf(msg, 1024, M_GetText("Failed to read file '%s'.\n"), defdemoname);
|
snprintf(msg, sizeof(msg), M_GetText("Failed to read file '%s'.\n"), defdemoname);
|
||||||
CONS_Alert(CONS_ERROR, "%s", msg);
|
CONS_Alert(CONS_ERROR, "%s", msg);
|
||||||
gameaction = ga_nothing;
|
gameaction = ga_nothing;
|
||||||
M_StartMessage(msg, M_ReturnToTitleFromError, MM_EVENTHANDLER);
|
M_StartMessage(msg, M_ReturnToTitleFromError, MM_EVENTHANDLER);
|
||||||
@@ -2645,7 +2647,7 @@ void G_DoPlayDemo(char *defdemoname)
|
|||||||
// load demo resource from WAD
|
// load demo resource from WAD
|
||||||
else if ((l = W_CheckNumForName(defdemoname)) == LUMPERROR)
|
else if ((l = W_CheckNumForName(defdemoname)) == LUMPERROR)
|
||||||
{
|
{
|
||||||
snprintf(msg, 1024, M_GetText("Failed to read lump '%s'.\n"), defdemoname);
|
snprintf(msg, sizeof(msg), M_GetText("Failed to read lump '%s'.\n"), defdemoname);
|
||||||
CONS_Alert(CONS_ERROR, "%s", msg);
|
CONS_Alert(CONS_ERROR, "%s", msg);
|
||||||
gameaction = ga_nothing;
|
gameaction = ga_nothing;
|
||||||
M_StartMessage(msg, M_ReturnToTitleFromError, MM_EVENTHANDLER);
|
M_StartMessage(msg, M_ReturnToTitleFromError, MM_EVENTHANDLER);
|
||||||
@@ -2666,7 +2668,7 @@ void G_DoPlayDemo(char *defdemoname)
|
|||||||
|
|
||||||
if (memcmp(demobuf.p, DEMOHEADER, 12))
|
if (memcmp(demobuf.p, DEMOHEADER, 12))
|
||||||
{
|
{
|
||||||
snprintf(msg, 1024, M_GetText("%s is not a SRB2Kart replay file.\n"), pdemoname);
|
snprintf(msg, sizeof(msg), M_GetText("%s is not a SRB2Kart replay file.\n"), pdemoname);
|
||||||
CONS_Alert(CONS_ERROR, "%s", msg);
|
CONS_Alert(CONS_ERROR, "%s", msg);
|
||||||
M_StartMessage(msg, M_ReturnToTitleFromError, MM_EVENTHANDLER);
|
M_StartMessage(msg, M_ReturnToTitleFromError, MM_EVENTHANDLER);
|
||||||
G_ResetDemoPlayback();
|
G_ResetDemoPlayback();
|
||||||
@@ -2692,7 +2694,7 @@ void G_DoPlayDemo(char *defdemoname)
|
|||||||
#endif
|
#endif
|
||||||
// too old, cannot support.
|
// too old, cannot support.
|
||||||
default:
|
default:
|
||||||
snprintf(msg, 1024, M_GetText("%s is an incompatible replay format and cannot be played.\n"), pdemoname);
|
snprintf(msg, sizeof(msg), M_GetText("%s is an incompatible replay format and cannot be played.\n"), pdemoname);
|
||||||
CONS_Alert(CONS_ERROR, "%s", msg);
|
CONS_Alert(CONS_ERROR, "%s", msg);
|
||||||
M_StartMessage(msg, M_ReturnToTitleFromError, MM_EVENTHANDLER);
|
M_StartMessage(msg, M_ReturnToTitleFromError, MM_EVENTHANDLER);
|
||||||
G_ResetDemoPlayback();
|
G_ResetDemoPlayback();
|
||||||
@@ -2703,7 +2705,7 @@ void G_DoPlayDemo(char *defdemoname)
|
|||||||
|
|
||||||
if (memcmp(demobuf.p, "PLAY", 4))
|
if (memcmp(demobuf.p, "PLAY", 4))
|
||||||
{
|
{
|
||||||
snprintf(msg, 1024, M_GetText("%s is the wrong type of recording and cannot be played.\n"), pdemoname);
|
snprintf(msg, sizeof(msg), M_GetText("%s is the wrong type of recording and cannot be played.\n"), pdemoname);
|
||||||
CONS_Alert(CONS_ERROR, "%s", msg);
|
CONS_Alert(CONS_ERROR, "%s", msg);
|
||||||
M_StartMessage(msg, M_ReturnToTitleFromError, MM_EVENTHANDLER);
|
M_StartMessage(msg, M_ReturnToTitleFromError, MM_EVENTHANDLER);
|
||||||
G_ResetDemoPlayback();
|
G_ResetDemoPlayback();
|
||||||
@@ -2720,7 +2722,7 @@ void G_DoPlayDemo(char *defdemoname)
|
|||||||
{
|
{
|
||||||
if (demoflags & DF_MULTIPLAYER)
|
if (demoflags & DF_MULTIPLAYER)
|
||||||
{
|
{
|
||||||
snprintf(msg, 1024, M_GetText("%s is an alpha multiplayer replay and cannot be played.\n"), pdemoname);
|
snprintf(msg, sizeof(msg), M_GetText("%s is an alpha multiplayer replay and cannot be played.\n"), pdemoname);
|
||||||
CONS_Alert(CONS_ERROR, "%s", msg);
|
CONS_Alert(CONS_ERROR, "%s", msg);
|
||||||
M_StartMessage(msg, M_ReturnToTitleFromError, MM_EVENTHANDLER);
|
M_StartMessage(msg, M_ReturnToTitleFromError, MM_EVENTHANDLER);
|
||||||
G_ResetDemoPlayback();
|
G_ResetDemoPlayback();
|
||||||
@@ -2747,31 +2749,31 @@ void G_DoPlayDemo(char *defdemoname)
|
|||||||
switch (error)
|
switch (error)
|
||||||
{
|
{
|
||||||
case DFILE_ERROR_NOTLOADED:
|
case DFILE_ERROR_NOTLOADED:
|
||||||
snprintf(msg, 1024,
|
snprintf(msg, sizeof(msg),
|
||||||
"Required files for this demo are not loaded.\n\nUse\n\"playdemo %s -addfiles\"\nto load them and play the demo.\n",
|
"Required files for this demo are not loaded.\n\nUse\n\"playdemo %s -addfiles\"\nto load them and play the demo.\n",
|
||||||
pdemoname);
|
pdemoname);
|
||||||
break;
|
break;
|
||||||
|
|
||||||
case DFILE_ERROR_OUTOFORDER:
|
case DFILE_ERROR_OUTOFORDER:
|
||||||
snprintf(msg, 1024,
|
snprintf(msg, sizeof(msg),
|
||||||
"Required files for this demo are loaded out of order.\n\nUse\n\"playdemo %s -force\"\nto play the demo anyway.\n",
|
"Required files for this demo are loaded out of order.\n\nUse\n\"playdemo %s -force\"\nto play the demo anyway.\n",
|
||||||
pdemoname);
|
pdemoname);
|
||||||
break;
|
break;
|
||||||
|
|
||||||
case DFILE_ERROR_INCOMPLETEOUTOFORDER:
|
case DFILE_ERROR_INCOMPLETEOUTOFORDER:
|
||||||
snprintf(msg, 1024,
|
snprintf(msg, sizeof(msg),
|
||||||
"Required files for this demo are not loaded, and some are out of order.\n\nUse\n\"playdemo %s -addfiles\"\nto load needed files and play the demo.\n",
|
"Required files for this demo are not loaded, and some are out of order.\n\nUse\n\"playdemo %s -addfiles\"\nto load needed files and play the demo.\n",
|
||||||
pdemoname);
|
pdemoname);
|
||||||
break;
|
break;
|
||||||
|
|
||||||
case DFILE_ERROR_CANNOTLOAD:
|
case DFILE_ERROR_CANNOTLOAD:
|
||||||
snprintf(msg, 1024,
|
snprintf(msg, sizeof(msg),
|
||||||
"Required files for this demo cannot be loaded.\n\nUse\n\"playdemo %s -force\"\nto play the demo anyway.\n",
|
"Required files for this demo cannot be loaded.\n\nUse\n\"playdemo %s -force\"\nto play the demo anyway.\n",
|
||||||
pdemoname);
|
pdemoname);
|
||||||
break;
|
break;
|
||||||
|
|
||||||
case DFILE_ERROR_EXTRAFILES:
|
case DFILE_ERROR_EXTRAFILES:
|
||||||
snprintf(msg, 1024,
|
snprintf(msg, sizeof(msg),
|
||||||
"You have additional files loaded beyond the demo's file list.\n\nUse\n\"playdemo %s -force\"\nto play the demo anyway.\n",
|
"You have additional files loaded beyond the demo's file list.\n\nUse\n\"playdemo %s -force\"\nto play the demo anyway.\n",
|
||||||
pdemoname);
|
pdemoname);
|
||||||
break;
|
break;
|
||||||
@@ -2821,7 +2823,7 @@ void G_DoPlayDemo(char *defdemoname)
|
|||||||
// ...*map* not loaded?
|
// ...*map* not loaded?
|
||||||
if (!gamemap || (gamemap > NUMMAPS) || (W_CheckNumForName(G_BuildMapName(gamemap)) == LUMPERROR))
|
if (!gamemap || (gamemap > NUMMAPS) || (W_CheckNumForName(G_BuildMapName(gamemap)) == LUMPERROR))
|
||||||
{
|
{
|
||||||
snprintf(msg, 1024, M_GetText("%s features a course that is not currently loaded.\n"), pdemoname);
|
snprintf(msg, sizeof(msg), M_GetText("%s features a course that is not currently loaded.\n"), pdemoname);
|
||||||
CONS_Alert(CONS_ERROR, "%s", msg);
|
CONS_Alert(CONS_ERROR, "%s", msg);
|
||||||
M_StartMessage(msg, M_ReturnToTitleFromError, MM_EVENTHANDLER);
|
M_StartMessage(msg, M_ReturnToTitleFromError, MM_EVENTHANDLER);
|
||||||
G_ResetDemoPlayback();
|
G_ResetDemoPlayback();
|
||||||
@@ -2853,7 +2855,7 @@ void G_DoPlayDemo(char *defdemoname)
|
|||||||
// Skin not loaded?
|
// Skin not loaded?
|
||||||
if (!SetPlayerSkin(0, skin))
|
if (!SetPlayerSkin(0, skin))
|
||||||
{
|
{
|
||||||
snprintf(msg, 1024, M_GetText("%s features a character that is not currently loaded.\n"), pdemoname);
|
snprintf(msg, sizeof(msg), M_GetText("%s features a character that is not currently loaded.\n"), pdemoname);
|
||||||
CONS_Alert(CONS_ERROR, "%s", msg);
|
CONS_Alert(CONS_ERROR, "%s", msg);
|
||||||
M_StartMessage(msg, M_ReturnToTitleFromError, MM_EVENTHANDLER);
|
M_StartMessage(msg, M_ReturnToTitleFromError, MM_EVENTHANDLER);
|
||||||
G_ResetDemoPlayback();
|
G_ResetDemoPlayback();
|
||||||
@@ -2863,7 +2865,7 @@ void G_DoPlayDemo(char *defdemoname)
|
|||||||
// ...*map* not loaded?
|
// ...*map* not loaded?
|
||||||
if (!gamemap || (gamemap > NUMMAPS) || !mapheaderinfo[gamemap-1] || !(mapheaderinfo[gamemap-1]->menuflags & LF2_EXISTSHACK))
|
if (!gamemap || (gamemap > NUMMAPS) || !mapheaderinfo[gamemap-1] || !(mapheaderinfo[gamemap-1]->menuflags & LF2_EXISTSHACK))
|
||||||
{
|
{
|
||||||
snprintf(msg, 1024, M_GetText("%s features a course that is not currently loaded.\n"), pdemoname);
|
snprintf(msg, sizeof(msg), M_GetText("%s features a course that is not currently loaded.\n"), pdemoname);
|
||||||
CONS_Alert(CONS_ERROR, "%s", msg);
|
CONS_Alert(CONS_ERROR, "%s", msg);
|
||||||
M_StartMessage(msg, M_ReturnToTitleFromError, MM_EVENTHANDLER);
|
M_StartMessage(msg, M_ReturnToTitleFromError, MM_EVENTHANDLER);
|
||||||
G_ResetDemoPlayback();
|
G_ResetDemoPlayback();
|
||||||
@@ -2886,7 +2888,7 @@ void G_DoPlayDemo(char *defdemoname)
|
|||||||
// Sigh ... it's an empty demo.
|
// Sigh ... it's an empty demo.
|
||||||
if (*demobuf.p == DEMOMARKER)
|
if (*demobuf.p == DEMOMARKER)
|
||||||
{
|
{
|
||||||
snprintf(msg, 1024, M_GetText("%s contains no data to be played.\n"), pdemoname);
|
snprintf(msg, sizeof(msg), M_GetText("%s contains no data to be played.\n"), pdemoname);
|
||||||
CONS_Alert(CONS_ERROR, "%s", msg);
|
CONS_Alert(CONS_ERROR, "%s", msg);
|
||||||
M_StartMessage(msg, M_ReturnToTitleFromError, MM_EVENTHANDLER);
|
M_StartMessage(msg, M_ReturnToTitleFromError, MM_EVENTHANDLER);
|
||||||
G_ResetDemoPlayback();
|
G_ResetDemoPlayback();
|
||||||
@@ -2924,7 +2926,7 @@ void G_DoPlayDemo(char *defdemoname)
|
|||||||
// Sigh ... it's an empty demo.
|
// Sigh ... it's an empty demo.
|
||||||
if (*demobuf.p == DEMOMARKER)
|
if (*demobuf.p == DEMOMARKER)
|
||||||
{
|
{
|
||||||
snprintf(msg, 1024, M_GetText("%s contains no data to be played.\n"), pdemoname);
|
snprintf(msg, sizeof(msg), M_GetText("%s contains no data to be played.\n"), pdemoname);
|
||||||
CONS_Alert(CONS_ERROR, "%s", msg);
|
CONS_Alert(CONS_ERROR, "%s", msg);
|
||||||
M_StartMessage(msg, M_ReturnToTitleFromError, MM_EVENTHANDLER);
|
M_StartMessage(msg, M_ReturnToTitleFromError, MM_EVENTHANDLER);
|
||||||
G_ResetDemoPlayback();
|
G_ResetDemoPlayback();
|
||||||
@@ -2973,7 +2975,7 @@ void G_DoPlayDemo(char *defdemoname)
|
|||||||
|
|
||||||
if (modeattacking)
|
if (modeattacking)
|
||||||
{
|
{
|
||||||
snprintf(msg, 1024, M_GetText("%s is a Record Attack replay with spectators, and is thus invalid.\n"), pdemoname);
|
snprintf(msg, sizeof(msg), M_GetText("%s is a Record Attack replay with spectators, and is thus invalid.\n"), pdemoname);
|
||||||
CONS_Alert(CONS_ERROR, "%s", msg);
|
CONS_Alert(CONS_ERROR, "%s", msg);
|
||||||
M_StartMessage(msg, M_ReturnToTitleFromError, MM_EVENTHANDLER);
|
M_StartMessage(msg, M_ReturnToTitleFromError, MM_EVENTHANDLER);
|
||||||
G_ResetDemoPlayback();
|
G_ResetDemoPlayback();
|
||||||
@@ -2985,7 +2987,7 @@ void G_DoPlayDemo(char *defdemoname)
|
|||||||
|
|
||||||
if (modeattacking && numslots > 1)
|
if (modeattacking && numslots > 1)
|
||||||
{
|
{
|
||||||
snprintf(msg, 1024, M_GetText("%s is a Record Attack replay with multiple players, and is thus invalid.\n"), pdemoname);
|
snprintf(msg, sizeof(msg), M_GetText("%s is a Record Attack replay with multiple players, and is thus invalid.\n"), pdemoname);
|
||||||
CONS_Alert(CONS_ERROR, "%s", msg);
|
CONS_Alert(CONS_ERROR, "%s", msg);
|
||||||
M_StartMessage(msg, M_ReturnToTitleFromError, MM_EVENTHANDLER);
|
M_StartMessage(msg, M_ReturnToTitleFromError, MM_EVENTHANDLER);
|
||||||
G_ResetDemoPlayback();
|
G_ResetDemoPlayback();
|
||||||
|
|||||||
+2
-1
@@ -82,7 +82,8 @@ typedef struct menudemo_s {
|
|||||||
struct {
|
struct {
|
||||||
UINT8 ranking;
|
UINT8 ranking;
|
||||||
char name[17];
|
char name[17];
|
||||||
UINT8 skin, color;
|
skinnum_t skin;
|
||||||
|
UINT8 color;
|
||||||
UINT32 timeorscore;
|
UINT32 timeorscore;
|
||||||
} standings[MAXPLAYERS];
|
} standings[MAXPLAYERS];
|
||||||
} menudemo_t;
|
} menudemo_t;
|
||||||
|
|||||||
+24
-35
@@ -63,7 +63,7 @@ gameaction_t gameaction = 0;
|
|||||||
gamestate_t gamestate = GS_NULL;
|
gamestate_t gamestate = GS_NULL;
|
||||||
|
|
||||||
boolean botingame = false;
|
boolean botingame = false;
|
||||||
UINT8 botskin = 0;
|
skinnum_t botskin = 0;
|
||||||
UINT8 botcolor = 0;
|
UINT8 botcolor = 0;
|
||||||
|
|
||||||
// SRB2kart
|
// SRB2kart
|
||||||
@@ -453,34 +453,13 @@ consvar_t cv_driftsparkpulse = {"driftsparkpulse", "1.4", CV_FLOAT | CV_SAVE, dr
|
|||||||
static CV_PossibleValue_t cechotoggle_t[] = {{0, "Off"}, {1, "On"}, {2, "Console"}, {0, NULL}};
|
static CV_PossibleValue_t cechotoggle_t[] = {{0, "Off"}, {1, "On"}, {2, "Console"}, {0, NULL}};
|
||||||
consvar_t cv_cechotoggle = {"show_cecho", "On", CV_SAVE, cechotoggle_t, NULL, 0, NULL, NULL, 0, 0, NULL};
|
consvar_t cv_cechotoggle = {"show_cecho", "On", CV_SAVE, cechotoggle_t, NULL, 0, NULL, NULL, 0, 0, NULL};
|
||||||
|
|
||||||
#if MAXPLAYERS > 16
|
|
||||||
#error "please update player_name table using the new value for MAXPLAYERS"
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#ifdef SEENAMES
|
#ifdef SEENAMES
|
||||||
player_t *seenplayer = NULL; // player we're aiming at right now
|
player_t *seenplayer = NULL; // player we're aiming at right now
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
char player_names[MAXPLAYERS][MAXPLAYERNAME+1] =
|
// now automatically allocated in D_RegisterServerCommands
|
||||||
{
|
// so that it doesn't have to be updated depending on the value of MAXPLAYERS
|
||||||
"Player 1",
|
char player_names[MAXPLAYERS][MAXPLAYERNAME+1];
|
||||||
"Player 2",
|
|
||||||
"Player 3",
|
|
||||||
"Player 4",
|
|
||||||
"Player 5",
|
|
||||||
"Player 6",
|
|
||||||
"Player 7",
|
|
||||||
"Player 8",
|
|
||||||
"Player 9",
|
|
||||||
"Player 10",
|
|
||||||
"Player 11",
|
|
||||||
"Player 12",
|
|
||||||
"Player 13",
|
|
||||||
"Player 14",
|
|
||||||
"Player 15",
|
|
||||||
"Player 16"
|
|
||||||
}; // SRB2kart - removed Players 17 through 32
|
|
||||||
|
|
||||||
INT32 player_name_changes[MAXPLAYERS] = {};
|
INT32 player_name_changes[MAXPLAYERS] = {};
|
||||||
|
|
||||||
INT16 rw_maximums[NUM_WEAPONS] =
|
INT16 rw_maximums[NUM_WEAPONS] =
|
||||||
@@ -625,14 +604,18 @@ const char *G_BuildMapName(INT32 map)
|
|||||||
}
|
}
|
||||||
|
|
||||||
if (map < 100 && map >= 0) // ...but why use signed integer in first place? idk but this prevents warning (and potential buffer overflow lol)
|
if (map < 100 && map >= 0) // ...but why use signed integer in first place? idk but this prevents warning (and potential buffer overflow lol)
|
||||||
sprintf(&mapname[3], "%.2d", map);
|
{
|
||||||
|
snprintf(&mapname[3], sizeof(mapname)-3, "%.2d", map);
|
||||||
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
mapname[3] = (char)('A' + (char)((map - 100) / 36));
|
mapname[3] = (char)('A' + (char)((map - 100) / 36));
|
||||||
|
|
||||||
if ((map - 100) % 36 < 10)
|
if ((map - 100) % 36 < 10)
|
||||||
mapname[4] = (char)('0' + (char)((map - 100) % 36));
|
mapname[4] = (char)('0' + (char)((map - 100) % 36));
|
||||||
else
|
else
|
||||||
mapname[4] = (char)('A' + (char)((map - 100) % 36) - 10);
|
mapname[4] = (char)('A' + (char)((map - 100) % 36) - 10);
|
||||||
|
|
||||||
mapname[5] = '\0';
|
mapname[5] = '\0';
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -2647,12 +2630,18 @@ mapthing_t *G_FindRaceStart(INT32 playernum)
|
|||||||
// Just spawn there.
|
// Just spawn there.
|
||||||
//return playerstarts[0];
|
//return playerstarts[0];
|
||||||
|
|
||||||
|
#if MAXPLAYERS > 16
|
||||||
|
//this section courtesy of fickle - v1.1 battle royale
|
||||||
|
// screw collision chex
|
||||||
|
return playerstarts[pos % numcoopstarts];
|
||||||
|
#else
|
||||||
if (P_IsLocalPlayerNum(playernum))
|
if (P_IsLocalPlayerNum(playernum))
|
||||||
{
|
{
|
||||||
CONS_Alert(CONS_WARNING, "Could not spawn at any Race starts!\n");
|
CONS_Alert(CONS_WARNING, "Could not spawn at any Race starts!\n");
|
||||||
}
|
}
|
||||||
|
|
||||||
return NULL;
|
return NULL;
|
||||||
|
#endif
|
||||||
}
|
}
|
||||||
|
|
||||||
if (P_IsLocalPlayerNum(playernum))
|
if (P_IsLocalPlayerNum(playernum))
|
||||||
@@ -3787,7 +3776,7 @@ void G_LoadGame(UINT32 slot, INT16 mapoverride)
|
|||||||
startonmapnum = mapoverride;
|
startonmapnum = mapoverride;
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
sprintf(savename, savegamename, slot);
|
snprintf(savename, sizeof(savename), savegamename, slot);
|
||||||
|
|
||||||
length = FIL_ReadFile(savename, &save.buffer);
|
length = FIL_ReadFile(savename, &save.buffer);
|
||||||
if (!length)
|
if (!length)
|
||||||
@@ -3799,7 +3788,7 @@ void G_LoadGame(UINT32 slot, INT16 mapoverride)
|
|||||||
save.p = save.buffer;
|
save.p = save.buffer;
|
||||||
|
|
||||||
memset(vcheck, 0, sizeof (vcheck));
|
memset(vcheck, 0, sizeof (vcheck));
|
||||||
sprintf(vcheck, "version %d", VERSION);
|
snprintf(vcheck, sizeof(vcheck), "version %d", VERSION);
|
||||||
|
|
||||||
if (!fastcmp((const char *)save.p, (const char *)vcheck))
|
if (!fastcmp((const char *)save.p, (const char *)vcheck))
|
||||||
{
|
{
|
||||||
@@ -3865,8 +3854,8 @@ void G_SaveGame(UINT32 savegameslot)
|
|||||||
const char *backup;
|
const char *backup;
|
||||||
savebuffer_t save = {};
|
savebuffer_t save = {};
|
||||||
|
|
||||||
sprintf(savename, savegamename, savegameslot);
|
snprintf(savename, sizeof(savename), savegamename, savegameslot);
|
||||||
backup = va("%s",savename);
|
backup = va("%s", savename);
|
||||||
|
|
||||||
// save during evaluation or credits? game's over, folks!
|
// save during evaluation or credits? game's over, folks!
|
||||||
if (gamestate == GS_CREDITS || gamestate == GS_EVALUATION)
|
if (gamestate == GS_CREDITS || gamestate == GS_EVALUATION)
|
||||||
@@ -3884,8 +3873,8 @@ void G_SaveGame(UINT32 savegameslot)
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
memset(name, 0, sizeof (name));
|
memset(name, 0, sizeof(name));
|
||||||
sprintf(name, "version %d", VERSION);
|
snprintf(name, sizeof(name), "version %d", VERSION);
|
||||||
WRITEMEM(save.p, name, VERSIONSIZE);
|
WRITEMEM(save.p, name, VERSIONSIZE);
|
||||||
|
|
||||||
P_SaveGame(&save);
|
P_SaveGame(&save);
|
||||||
@@ -4114,12 +4103,12 @@ char *G_BuildMapTitle(INT32 mapnum)
|
|||||||
if (!title)
|
if (!title)
|
||||||
return NULL;
|
return NULL;
|
||||||
|
|
||||||
sprintf(title, "%s", mapheaderinfo[mapnum-1]->lvlttl);
|
snprintf(title, len, "%s", mapheaderinfo[mapnum-1]->lvlttl);
|
||||||
|
|
||||||
if (zonetext)
|
if (zonetext)
|
||||||
sprintf(title + strlen(title), " %s", zonetext);
|
snprintf(title + strlen(title), len - strlen(title), " %s", zonetext);
|
||||||
if (actnum)
|
if (actnum)
|
||||||
sprintf(title + strlen(title), " %s", actnum);
|
snprintf(title + strlen(title), len - strlen(title), " %s", actnum);
|
||||||
}
|
}
|
||||||
|
|
||||||
return title;
|
return title;
|
||||||
|
|||||||
+4
-3
@@ -228,10 +228,11 @@ void G_SaveGameData(boolean force);
|
|||||||
|
|
||||||
void G_SaveGame(UINT32 slot);
|
void G_SaveGame(UINT32 slot);
|
||||||
|
|
||||||
#define G_GametypeHasTeams() (G_IsGameType(GT_TEAMMATCH) || G_IsGameType(GT_CTF))
|
#define G_RaceGametype() (G_IsGameType(GT_RACE))
|
||||||
#define G_BattleGametype() (G_IsGameType(GT_MATCH))
|
#define G_BattleGametype() (G_IsGameType(GT_MATCH))
|
||||||
#define G_RaceGametype() (G_IsGameType(GT_RACE))
|
|
||||||
#define G_TagGametype() (G_IsGameType(GT_TAG) || G_IsGameType(GT_HIDEANDSEEK))
|
#define G_GametypeHasTeams() (UNLIKELY(G_IsGameType(GT_TEAMMATCH) || G_IsGameType(GT_CTF)))
|
||||||
|
#define G_TagGametype() (UNLIKELY(G_IsGameType(GT_TAG) || G_IsGameType(GT_HIDEANDSEEK)))
|
||||||
|
|
||||||
FUNCINLINE static ATTRINLINE boolean G_IsGameType(int type)
|
FUNCINLINE static ATTRINLINE boolean G_IsGameType(int type)
|
||||||
{
|
{
|
||||||
|
|||||||
+48
-17
@@ -66,13 +66,30 @@ consvar_t cv_rumble[MAXSPLITSCREENPLAYERS] = {
|
|||||||
|
|
||||||
static CV_PossibleValue_t rumblestrength_cons_t[] = {{FRACUNIT/4, "MIN"}, {FRACUNIT*4, "MAX"}, {0, NULL}};
|
static CV_PossibleValue_t rumblestrength_cons_t[] = {{FRACUNIT/4, "MIN"}, {FRACUNIT*4, "MAX"}, {0, NULL}};
|
||||||
|
|
||||||
consvar_t cv_rumblestrength[MAXSPLITSCREENPLAYERS] = {
|
consvar_t cv_rumble_strength[MAXSPLITSCREENPLAYERS] = {
|
||||||
{"rumblestrength", "1.0", CV_SAVE|CV_FLOAT, rumblestrength_cons_t, NULL, 0, NULL, NULL, 0, 0, NULL},
|
{"rumblestrength", "1.0", CV_SAVE|CV_FLOAT, rumblestrength_cons_t, NULL, 0, NULL, NULL, 0, 0, NULL},
|
||||||
{"rumblestrength2", "1.0", CV_SAVE|CV_FLOAT, rumblestrength_cons_t, NULL, 0, NULL, NULL, 0, 0, NULL},
|
{"rumblestrength2", "1.0", CV_SAVE|CV_FLOAT, rumblestrength_cons_t, NULL, 0, NULL, NULL, 0, 0, NULL},
|
||||||
{"rumblestrength3", "1.0", CV_SAVE|CV_FLOAT, rumblestrength_cons_t, NULL, 0, NULL, NULL, 0, 0, NULL},
|
{"rumblestrength3", "1.0", CV_SAVE|CV_FLOAT, rumblestrength_cons_t, NULL, 0, NULL, NULL, 0, 0, NULL},
|
||||||
{"rumblestrength4", "1.0", CV_SAVE|CV_FLOAT, rumblestrength_cons_t, NULL, 0, NULL, NULL, 0, 0, NULL}
|
{"rumblestrength4", "1.0", CV_SAVE|CV_FLOAT, rumblestrength_cons_t, NULL, 0, NULL, NULL, 0, 0, NULL}
|
||||||
};
|
};
|
||||||
|
|
||||||
|
#define IMPL_RUMBLE_TYPE(type)\
|
||||||
|
consvar_t cv_rumble_##type [MAXSPLITSCREENPLAYERS] = {\
|
||||||
|
{"rumble_" #type, "On", CV_SAVE, CV_OnOff, NULL, 0, NULL, NULL, 0, 0, NULL},\
|
||||||
|
{"rumble2_" #type, "On", CV_SAVE, CV_OnOff, NULL, 0, NULL, NULL, 0, 0, NULL},\
|
||||||
|
{"rumble3_" #type, "On", CV_SAVE, CV_OnOff, NULL, 0, NULL, NULL, 0, 0, NULL},\
|
||||||
|
{"rumble4_" #type, "On", CV_SAVE, CV_OnOff, NULL, 0, NULL, NULL, 0, 0, NULL}\
|
||||||
|
};
|
||||||
|
|
||||||
|
IMPL_RUMBLE_TYPE(spinout);
|
||||||
|
IMPL_RUMBLE_TYPE(sneakerboost);
|
||||||
|
IMPL_RUMBLE_TYPE(offroad);
|
||||||
|
IMPL_RUMBLE_TYPE(bananadrag);
|
||||||
|
IMPL_RUMBLE_TYPE(stairjank);
|
||||||
|
IMPL_RUMBLE_TYPE(brakedrift);
|
||||||
|
IMPL_RUMBLE_TYPE(driftcharge);
|
||||||
|
|
||||||
|
|
||||||
static CV_PossibleValue_t gamepadled_cons_t[] = {{0, "Off"}, {1, "Skincolor"}, {2, "Mobjcolor"}, {0, NULL}};
|
static CV_PossibleValue_t gamepadled_cons_t[] = {{0, "Off"}, {1, "Skincolor"}, {2, "Mobjcolor"}, {0, NULL}};
|
||||||
consvar_t cv_gamepadled[MAXSPLITSCREENPLAYERS] = {
|
consvar_t cv_gamepadled[MAXSPLITSCREENPLAYERS] = {
|
||||||
{"gamepadled", "Skincolor", CV_SAVE|CV_CALL|CV_NOINIT, gamepadled_cons_t, led_off_handle, 0, NULL, NULL, 0, 0, NULL},
|
{"gamepadled", "Skincolor", CV_SAVE|CV_CALL|CV_NOINIT, gamepadled_cons_t, led_off_handle, 0, NULL, NULL, 0, 0, NULL},
|
||||||
@@ -1036,8 +1053,8 @@ void G_PlayerDeviceRumble(INT32 playernum, UINT16 low_strength, UINT16 high_stre
|
|||||||
// doesent need to be super precise
|
// doesent need to be super precise
|
||||||
// but ensure this is within range (0-65535)
|
// but ensure this is within range (0-65535)
|
||||||
// placed here so it applies to lua aswell
|
// placed here so it applies to lua aswell
|
||||||
low_strength = (UINT16)min(FixedMul(low_strength, cv_rumblestrength[playernum].value), UINT16_MAX);
|
low_strength = (UINT16)min(FixedMul(low_strength, cv_rumble_strength[playernum].value), UINT16_MAX);
|
||||||
high_strength = (UINT16)min(FixedMul(high_strength, cv_rumblestrength[playernum].value), UINT16_MAX);
|
high_strength = (UINT16)min(FixedMul(high_strength, cv_rumble_strength[playernum].value), UINT16_MAX);
|
||||||
|
|
||||||
I_GamepadRumble(playernum, low_strength, high_strength, duration);
|
I_GamepadRumble(playernum, low_strength, high_strength, duration);
|
||||||
}
|
}
|
||||||
@@ -1059,7 +1076,7 @@ void G_DeviceRumbleTick(void)
|
|||||||
{
|
{
|
||||||
UINT8 i;
|
UINT8 i;
|
||||||
|
|
||||||
if (dedicated || numcontrollers == 0 || gamestate != GS_LEVEL)
|
if (dedicated || numcontrollers == 0 || gamestate != GS_LEVEL || demo.playback)
|
||||||
{
|
{
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
@@ -1090,6 +1107,11 @@ void G_DeviceRumbleTick(void)
|
|||||||
|
|
||||||
const player_t *player = P_GetLocalPlayerForNum(i);
|
const player_t *player = P_GetLocalPlayerForNum(i);
|
||||||
|
|
||||||
|
if (!player)
|
||||||
|
{
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
|
||||||
// allow lua to do some crap for spectators
|
// allow lua to do some crap for spectators
|
||||||
if (player->spectator || !player->mo)
|
if (player->spectator || !player->mo)
|
||||||
{
|
{
|
||||||
@@ -1105,17 +1127,20 @@ void G_DeviceRumbleTick(void)
|
|||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (player->kartstuff[k_spinouttimer])
|
if (cv_rumble_spinout[i].value
|
||||||
|
&& player->kartstuff[k_spinouttimer])
|
||||||
{
|
{
|
||||||
//low = high = FRACUNIT / 6;
|
//low = high = FRACUNIT / 6;
|
||||||
low = high = FixedMul((RUMBLE_VERYSTRONG), (FixedDiv(player->kartstuff[k_spinouttimer], (3*TICRATE / 2)))); // try do some some kinda fadeout, 3*TICRATE / 2 is the "default" spinout time
|
low = high = FixedMul((RUMBLE_VERYSTRONG), (FixedDiv(player->kartstuff[k_spinouttimer], (3*TICRATE / 2)))); // try do some some kinda fadeout, 3*TICRATE / 2 is the "default" spinout time
|
||||||
}
|
}
|
||||||
else if (player->kartstuff[k_sneakertimer] > (sneakertime-(TICRATE/2)))
|
else if (cv_rumble_sneakerboost[i].value
|
||||||
|
&& (player->kartstuff[k_sneakertimer] > (sneakertime-(TICRATE/2))))
|
||||||
{
|
{
|
||||||
low = high = RUMBLE_STRONG;
|
low = high = RUMBLE_STRONG;
|
||||||
}
|
}
|
||||||
else if ((player->kartstuff[k_offroad])
|
else if (cv_rumble_offroad[i].value
|
||||||
&& player->speed != 0
|
&& (player->kartstuff[k_offroad])
|
||||||
|
&& (player->speed != 0)
|
||||||
&& P_IsObjectOnGround(player->mo))
|
&& P_IsObjectOnGround(player->mo))
|
||||||
{
|
{
|
||||||
// weaken this depending on if you got hyu or invinc
|
// weaken this depending on if you got hyu or invinc
|
||||||
@@ -1132,32 +1157,37 @@ void G_DeviceRumbleTick(void)
|
|||||||
low = high = RUMBLE_MODERATE;
|
low = high = RUMBLE_MODERATE;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
else if ((player->kartstuff[k_bananadrag] > TICRATE)
|
else if (cv_rumble_bananadrag[i].value
|
||||||
&& player->speed != 0
|
&& (player->kartstuff[k_bananadrag] > TICRATE)
|
||||||
|
&& (player->speed != 0)
|
||||||
&& P_IsObjectOnGround(player->mo))
|
&& P_IsObjectOnGround(player->mo))
|
||||||
{
|
{
|
||||||
if (leveltime & 1) // this is actually funny lel
|
if (leveltime & 1) // this is actually funny lel
|
||||||
high = RUMBLE_MODERATE;
|
high = RUMBLE_MODERATE;
|
||||||
}
|
}
|
||||||
/*else if ((player->stairjank > 8) // this is kinda cool but prob gets annoying after a while
|
else if (cv_rumble_stairjank[i].value
|
||||||
&& player->speed != 0
|
&& (player->stairjank > 8)
|
||||||
|
&& (player->speed != 0)
|
||||||
&& P_IsObjectOnGround(player->mo))
|
&& P_IsObjectOnGround(player->mo))
|
||||||
{
|
{
|
||||||
low = high = RUMBLE_WEAK;
|
low = high = RUMBLE_VERYWEAK;
|
||||||
}*/
|
}
|
||||||
|
|
||||||
if (player->kartstuff[k_brakedrift])
|
if (cv_rumble_brakedrift[i].value
|
||||||
|
&& player->kartstuff[k_brakedrift])
|
||||||
{
|
{
|
||||||
high = CLAMP((high + RUMBLE_VERYWEAK), 0, UINT16_MAX);
|
high = CLAMP((high + RUMBLE_VERYWEAK), 0, UINT16_MAX);
|
||||||
}
|
}
|
||||||
|
|
||||||
// pulse when gettin new driftlevel
|
// pulse when gettin new driftlevel
|
||||||
// let this come last
|
// let this come last
|
||||||
if (player->kartstuff[k_driftcharge]
|
if (cv_rumble_driftcharge[i].value
|
||||||
|
&& player->kartstuff[k_driftcharge]
|
||||||
&& player->driftlevel)
|
&& player->driftlevel)
|
||||||
{
|
{
|
||||||
high = CLAMP((high + RUMBLE_VERYWEAK), 0, UINT16_MAX);
|
high = CLAMP((high + RUMBLE_VERYWEAK), 0, UINT16_MAX);
|
||||||
|
|
||||||
|
// make it rumble slightly longer the higher your driftlevel!
|
||||||
if (player->driftlevel == 2)
|
if (player->driftlevel == 2)
|
||||||
lenght = 114;
|
lenght = 114;
|
||||||
else if (player->driftlevel == 3)
|
else if (player->driftlevel == 3)
|
||||||
@@ -1220,7 +1250,8 @@ const char *G_KeynumToString(INT32 keynum)
|
|||||||
return keynames[j].name;
|
return keynames[j].name;
|
||||||
|
|
||||||
// create a name for unknown keys
|
// create a name for unknown keys
|
||||||
sprintf(keynamestr, "KEY%d", keynum);
|
snprintf(keynamestr, sizeof(keynamestr), "KEY%d", keynum);
|
||||||
|
|
||||||
return keynamestr;
|
return keynamestr;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
+15
-5
@@ -100,9 +100,10 @@ typedef enum
|
|||||||
gc_custom2, // Lua scriptable
|
gc_custom2, // Lua scriptable
|
||||||
gc_custom3, // Lua scriptable
|
gc_custom3, // Lua scriptable
|
||||||
gc_director,
|
gc_director,
|
||||||
gc_freecam, // Toggle for freecam while ingame
|
// freecam specific controls
|
||||||
gc_camfloat, // alternative button for raising cam
|
gc_freecam, // Toggle for freecam while ingame
|
||||||
gc_camsink, // alternative button for sinking
|
gc_camfloat, // alternative button for raising camera
|
||||||
|
gc_camsink, // alternative button for sinking camera
|
||||||
gc_strafeleft,
|
gc_strafeleft,
|
||||||
gc_straferight,
|
gc_straferight,
|
||||||
num_gamecontrols
|
num_gamecontrols
|
||||||
@@ -112,10 +113,19 @@ typedef enum
|
|||||||
extern consvar_t cv_mousexsens, cv_mouseysens;
|
extern consvar_t cv_mousexsens, cv_mouseysens;
|
||||||
extern consvar_t cv_controlperkey;
|
extern consvar_t cv_controlperkey;
|
||||||
extern consvar_t cv_turnsmooth[MAXSPLITSCREENPLAYERS];
|
extern consvar_t cv_turnsmooth[MAXSPLITSCREENPLAYERS];
|
||||||
extern consvar_t cv_rumble[MAXSPLITSCREENPLAYERS];
|
|
||||||
extern consvar_t cv_rumblestrength[MAXSPLITSCREENPLAYERS];
|
|
||||||
extern consvar_t cv_gamepadled[MAXSPLITSCREENPLAYERS];
|
extern consvar_t cv_gamepadled[MAXSPLITSCREENPLAYERS];
|
||||||
|
|
||||||
|
extern consvar_t cv_rumble[MAXSPLITSCREENPLAYERS];
|
||||||
|
extern consvar_t cv_rumble_strength[MAXSPLITSCREENPLAYERS];
|
||||||
|
extern consvar_t cv_rumble_spinout[MAXSPLITSCREENPLAYERS];
|
||||||
|
extern consvar_t cv_rumble_sneakerboost[MAXSPLITSCREENPLAYERS];
|
||||||
|
extern consvar_t cv_rumble_offroad[MAXSPLITSCREENPLAYERS];
|
||||||
|
extern consvar_t cv_rumble_bananadrag[MAXSPLITSCREENPLAYERS];
|
||||||
|
extern consvar_t cv_rumble_stairjank[MAXSPLITSCREENPLAYERS];
|
||||||
|
extern consvar_t cv_rumble_brakedrift[MAXSPLITSCREENPLAYERS];
|
||||||
|
extern consvar_t cv_rumble_driftcharge[MAXSPLITSCREENPLAYERS];
|
||||||
|
|
||||||
extern consvar_t cv_gamepadifunfocused;
|
extern consvar_t cv_gamepadifunfocused;
|
||||||
extern consvar_t cv_gamepadledifunfocused;
|
extern consvar_t cv_gamepadledifunfocused;
|
||||||
extern consvar_t cv_rumbleifunfocused;
|
extern consvar_t cv_rumbleifunfocused;
|
||||||
|
|||||||
+2
-1
@@ -55,6 +55,7 @@ extern gamestate_t gamestate;
|
|||||||
extern gameaction_t gameaction;
|
extern gameaction_t gameaction;
|
||||||
|
|
||||||
extern boolean botingame;
|
extern boolean botingame;
|
||||||
extern UINT8 botskin, botcolor;
|
extern skinnum_t botskin;
|
||||||
|
extern UINT8 botcolor;
|
||||||
|
|
||||||
#endif //__G_STATE__
|
#endif //__G_STATE__
|
||||||
@@ -183,6 +183,7 @@ static int comparePolygons(const void *p1, const void *p2)
|
|||||||
|
|
||||||
UINT32 downloaded1 = poly1->texture ? poly1->texture->downloaded : 0; // there should be a opengl texture name here, usable for comparisons
|
UINT32 downloaded1 = poly1->texture ? poly1->texture->downloaded : 0; // there should be a opengl texture name here, usable for comparisons
|
||||||
UINT32 downloaded2 = poly2->texture ? poly2->texture->downloaded : 0;
|
UINT32 downloaded2 = poly2->texture ? poly2->texture->downloaded : 0;
|
||||||
|
|
||||||
diff64 = downloaded1 - downloaded2;
|
diff64 = downloaded1 - downloaded2;
|
||||||
if (diff64 != 0) return diff64;
|
if (diff64 != 0) return diff64;
|
||||||
|
|
||||||
|
|||||||
+294
-244
@@ -12,20 +12,21 @@
|
|||||||
/// \brief convert SRB2 map
|
/// \brief convert SRB2 map
|
||||||
|
|
||||||
#include "../doomdef.h"
|
#include "../doomdef.h"
|
||||||
#include "../doomstat.h"
|
|
||||||
#ifdef HWRENDER
|
#ifdef HWRENDER
|
||||||
|
|
||||||
#include "hw_main.h"
|
#include "hw_main.h"
|
||||||
#include "hw_glob.h"
|
#include "hw_glob.h"
|
||||||
#include "../r_local.h"
|
|
||||||
#include "../z_zone.h"
|
#include "../z_zone.h"
|
||||||
|
|
||||||
|
#ifdef HWR_LOADING_SCREEN
|
||||||
#include "../console.h"
|
#include "../console.h"
|
||||||
#include "../v_video.h"
|
|
||||||
#include "../m_menu.h"
|
#include "../m_menu.h"
|
||||||
#include "../i_system.h"
|
|
||||||
#include "../m_argv.h"
|
|
||||||
#include "../i_video.h"
|
|
||||||
#include "../w_wad.h"
|
|
||||||
#include "../p_setup.h" // levelfadecol
|
#include "../p_setup.h" // levelfadecol
|
||||||
|
#include "../i_video.h"
|
||||||
|
#endif
|
||||||
|
|
||||||
|
//#define DEBUG_HWBSP
|
||||||
|
|
||||||
// --------------------------------------------------------------------------
|
// --------------------------------------------------------------------------
|
||||||
// This is global data for planes rendering
|
// This is global data for planes rendering
|
||||||
@@ -33,19 +34,20 @@
|
|||||||
|
|
||||||
extrasubsector_t *extrasubsectors = NULL;
|
extrasubsector_t *extrasubsectors = NULL;
|
||||||
|
|
||||||
// newsubsectors are subsectors without segs, added for the plane polygons
|
// extra subsectors are subsectors without segs, added for the plane polygons
|
||||||
#define NEWSUBSECTORS 50
|
#define NUM_EXTRA_SUBSECTORS 50
|
||||||
static size_t totsubsectors;
|
static size_t num_alloc_extra_subsector;
|
||||||
#ifdef PARANOIA
|
#ifdef PARANOIA
|
||||||
size_t addsubsector;
|
size_t num_extra_subsector;
|
||||||
#else
|
#else
|
||||||
static size_t addsubsector;
|
static size_t num_extra_subsector;
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
typedef struct
|
typedef struct {
|
||||||
{
|
|
||||||
float x, y;
|
float x, y;
|
||||||
float dx, dy;
|
float dx, dy;
|
||||||
|
polyvertex_t divpt;
|
||||||
|
float divfrac;
|
||||||
} fdivline_t;
|
} fdivline_t;
|
||||||
|
|
||||||
// when loading the map, this is set to true if portals are found.
|
// when loading the map, this is set to true if portals are found.
|
||||||
@@ -53,7 +55,7 @@ typedef struct
|
|||||||
boolean gl_maphasportals = false;
|
boolean gl_maphasportals = false;
|
||||||
|
|
||||||
// Determine on mapload if current map has any Horizonlines present
|
// Determine on mapload if current map has any Horizonlines present
|
||||||
// so we can avoid rather hot checks in HWR_Subsector
|
// avoids doing a bunch of work during rendering
|
||||||
boolean gl_maphashorizonlines = false;
|
boolean gl_maphashorizonlines = false;
|
||||||
|
|
||||||
// ==========================================================================
|
// ==========================================================================
|
||||||
@@ -80,26 +82,25 @@ static poly_t *HWR_AllocPoly(INT32 numpts)
|
|||||||
return p;
|
return p;
|
||||||
}
|
}
|
||||||
|
|
||||||
/// \todo polygons should be freed in reverse order for efficiency,
|
/// TODO: polygons should be freed in reverse order for efficiency,
|
||||||
/// for now don't free because it doesn't free in reverse order
|
/// for now don't free because it doesn't free in reverse order
|
||||||
static void HWR_FreePoly(poly_t *poly)
|
static void HWR_FreePoly(poly_t *poly)
|
||||||
{
|
{
|
||||||
Z_Free(poly);
|
Z_Free(poly);
|
||||||
}
|
}
|
||||||
|
|
||||||
// Return interception along bsp line,
|
// Return interception along bsp line (partline),
|
||||||
// with the polygon segment
|
// with the polygon segment
|
||||||
//
|
|
||||||
static float bspfrac;
|
// Return the division in partline div fields.
|
||||||
static polyvertex_t *fracdivline(fdivline_t *bsp, polyvertex_t *v1,
|
// divfrac = how far along partline vector is crossing pt
|
||||||
polyvertex_t *v2)
|
static boolean fracdivline(fdivline_t *partline, polyvertex_t *v1, polyvertex_t *v2)
|
||||||
{
|
{
|
||||||
static polyvertex_t pt;
|
double frac1, frac2;
|
||||||
double frac;
|
double num; // numerator
|
||||||
double num;
|
double den; // denominator
|
||||||
double den;
|
double v1x, v1y, v1dx, v1dy; // polygon side vector, v1->v2
|
||||||
double v1x, v1y, v1dx, v1dy;
|
double v3x, v3y, v3dx, v3dy; // partline vector
|
||||||
double v2x, v2y, v2dx, v2dy;
|
|
||||||
|
|
||||||
// a segment of a polygon
|
// a segment of a polygon
|
||||||
v1x = v1->x;
|
v1x = v1->x;
|
||||||
@@ -108,111 +109,118 @@ static polyvertex_t *fracdivline(fdivline_t *bsp, polyvertex_t *v1,
|
|||||||
v1dy = v2->y - v1->y;
|
v1dy = v2->y - v1->y;
|
||||||
|
|
||||||
// the bsp partition line
|
// the bsp partition line
|
||||||
v2x = bsp->x;
|
v3x = partline->x;
|
||||||
v2y = bsp->y;
|
v3y = partline->y;
|
||||||
v2dx = bsp->dx;
|
v3dx = partline->dx;
|
||||||
v2dy = bsp->dy;
|
v3dy = partline->dy;
|
||||||
|
|
||||||
den = v2dy*v1dx - v2dx*v1dy;
|
den = v3dy*v1dx - v3dx*v1dy;
|
||||||
|
|
||||||
if (fabsf((float)den) < 1.0E-36f) // avoid checking exactly for 0.0
|
if (fabs(den) < 1.0E-36) // avoid check of float for exact 0
|
||||||
return NULL; // parallel
|
return false; // partline and polygon side are effectively parallel
|
||||||
|
|
||||||
// first check the frac along the polygon segment,
|
// first check the frac along the polygon segment,
|
||||||
// (do not accept hit with the extensions)
|
// (do not accept hit with the extensions)
|
||||||
num = (v2x - v1x)*v2dy + (v1y - v2y)*v2dx;
|
num = (v3x - v1x)*v3dy + (v1y - v3y)*v3dx;
|
||||||
frac = num / den;
|
frac1 = num / den;
|
||||||
|
|
||||||
if (frac < 0.0l || frac > 1.0l)
|
// 0= cross at v1, 1.0= cross at v2
|
||||||
return NULL;
|
if (frac1 < 0.0 || frac1 > 1.0) // double
|
||||||
|
return false; // not within the polygon side
|
||||||
|
|
||||||
// now get the frac along the BSP line
|
// now get the frac along the BSP line
|
||||||
// which is useful to determine what is left, what is right
|
// which is useful to determine what is left, what is right
|
||||||
num = (v2x - v1x)*v1dy + (v1y - v2y)*v1dx;
|
num = (v3x - v1x)*v1dy + (v1y - v3y)*v1dx;
|
||||||
frac = num / den;
|
frac2 = num / den;
|
||||||
bspfrac = (float)frac;
|
|
||||||
|
|
||||||
// find the interception point along the partition line
|
partline->divfrac = frac2; // how far along partline vector
|
||||||
pt.x = (float)(v2x + v2dx*frac);
|
|
||||||
pt.y = (float)(v2y + v2dy*frac);
|
|
||||||
|
|
||||||
return &pt;
|
// [WDJ] find the interception point along the segment.
|
||||||
|
// It should be slightly more accurate because it is always closer to the
|
||||||
|
// crossing point than arbitrary positions on the partition line.
|
||||||
|
partline->divpt.x = v1x + v1dx*frac1;
|
||||||
|
partline->divpt.y = v1y + v1dy*frac1;
|
||||||
|
|
||||||
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// BOOMEDIT.WAD has a vertex error of .21
|
||||||
#define DIVLINE_VERTEX_DIFF 0.45f
|
#define DIVLINE_VERTEX_DIFF 0.45f
|
||||||
|
|
||||||
// if two vertice coords have a x and/or y difference
|
// if two vertice coords have a x and/or y difference
|
||||||
// of less or equal than 1 FRACUNIT, they are considered the same
|
// of less or equal than 1 FRACUNIT, they are considered the same
|
||||||
// point. Note: hardcoded value, 1.0f could be anything else.
|
// point. Note: hardcoded value, 1.0f could be anything else.
|
||||||
static boolean SameVertice (polyvertex_t *p1, polyvertex_t *p2)
|
static boolean SameVertex(polyvertex_t *p1, polyvertex_t *p2)
|
||||||
{
|
{
|
||||||
if (fabsf( p2->x - p1->x ) > DIVLINE_VERTEX_DIFF)
|
if (fabsf(p2->x - p1->x) > DIVLINE_VERTEX_DIFF)
|
||||||
return false;
|
return false;
|
||||||
if (fabsf( p2->y - p1->y ) > DIVLINE_VERTEX_DIFF)
|
if (fabsf(p2->y - p1->y) > DIVLINE_VERTEX_DIFF)
|
||||||
return false;
|
return false;
|
||||||
|
|
||||||
// p1 and p2 are considered the same vertex
|
// p1 and p2 are considered the same vertex
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
// split a _CONVEX_ polygon in two convex polygons
|
// split a _CONVEX_ polygon in two convex polygons
|
||||||
// outputs:
|
// outputs:
|
||||||
// frontpoly : polygon on right side of bsp line
|
// frontpoly : polygon on right side of bsp line
|
||||||
// backpoly : polygon on left side
|
// backpoly : polygon on left side
|
||||||
//
|
//
|
||||||
static void SplitPoly (fdivline_t *bsp, //splitting parametric line
|
// Called from: WalkBSPNode
|
||||||
poly_t *poly, //the convex poly we split
|
static void SplitPoly (fdivline_t *dlnp, // splitting parametric line
|
||||||
poly_t **frontpoly, //return one poly here
|
poly_t *poly, // the convex poly we split
|
||||||
poly_t **backpoly) //return the other here
|
poly_t **frontpoly, // return one poly here
|
||||||
|
poly_t **backpoly) // return the other here
|
||||||
{
|
{
|
||||||
INT32 i, j;
|
INT32 i, j;
|
||||||
polyvertex_t *pv;
|
polyvertex_t *pv;
|
||||||
|
|
||||||
INT32 ps = -1, pe = -1;
|
INT32 ps, pe; // poly start, end
|
||||||
INT32 nptfront, nptback;
|
INT32 ps_online, pe_online;
|
||||||
|
INT32 nptfront, nptback;
|
||||||
polyvertex_t vs = {};
|
polyvertex_t vs = {};
|
||||||
polyvertex_t ve = {};
|
polyvertex_t ve = {};
|
||||||
polyvertex_t lastpv = {};
|
polyvertex_t lastpv = {};
|
||||||
float fracs = 0.0f, frace = 0.0f; //used to tell which poly is on
|
float ps_frac = 0.0f, pe_frac = 0.0f; // used to tell which poly is on
|
||||||
// the front side of the bsp partition line
|
// the front side of the bsp partition line
|
||||||
INT32 psonline = 0, peonline = 0;
|
ps = pe = -1;
|
||||||
|
ps_online = pe_online = 0;
|
||||||
|
|
||||||
for (i = 0; i < poly->numpts; i++)
|
for (i = 0; i < poly->numpts; i++)
|
||||||
{
|
{
|
||||||
j = i + 1;
|
// i, j are one side of the poly
|
||||||
|
j = i+1;
|
||||||
if (j == poly->numpts)
|
if (j == poly->numpts)
|
||||||
j = 0;
|
j = 0; // wrap poly
|
||||||
|
|
||||||
// start & end points
|
// start & end points
|
||||||
pv = fracdivline(bsp, &poly->pts[i], &poly->pts[j]);
|
if (!fracdivline(dlnp, &poly->pts[i], &poly->pts[j]))
|
||||||
|
|
||||||
if (pv == NULL)
|
|
||||||
continue;
|
continue;
|
||||||
|
|
||||||
|
// have dividing pt
|
||||||
if (ps < 0)
|
if (ps < 0)
|
||||||
{
|
{
|
||||||
// first point
|
// first point
|
||||||
ps = i;
|
ps = i;
|
||||||
vs = *pv;
|
vs = dlnp->divpt;
|
||||||
fracs = bspfrac;
|
ps_frac = dlnp->divfrac;
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
//the partition line traverse a junction between two segments
|
// the partition line can traverse a junction between two segments
|
||||||
// or the two points are so close, they can be considered as one
|
// or the two points are so close, they can be considered as one
|
||||||
// thus, don't accept, since split 2 must be another vertex
|
// thus, don't accept, since split 2 must be another vertex
|
||||||
if (SameVertice(pv, &lastpv))
|
if (SameVertex(&dlnp->divpt, &lastpv))
|
||||||
{
|
{
|
||||||
if (pe < 0)
|
if (pe < 0)
|
||||||
{
|
{
|
||||||
ps = i;
|
ps = i;
|
||||||
psonline = 1;
|
ps_online = 1;
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
pe = i;
|
pe = i;
|
||||||
peonline = 1;
|
pe_online = 1;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
@@ -220,24 +228,25 @@ static void SplitPoly (fdivline_t *bsp, //splitting parametric line
|
|||||||
if (pe < 0)
|
if (pe < 0)
|
||||||
{
|
{
|
||||||
pe = i;
|
pe = i;
|
||||||
ve = *pv;
|
ve = dlnp->divpt;
|
||||||
frace = bspfrac;
|
pe_frac = dlnp->divfrac;
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
// a frac, not same vertice as last one
|
// a frac, not same vertice as last one
|
||||||
// we already got pt2 so pt 2 is not on the line,
|
// we already got pt2 so pt 2 is not on the line,
|
||||||
// so we probably got back to the start point
|
// so we probably got back to the start point
|
||||||
// which is on the line
|
// which is on the line
|
||||||
if (SameVertice(pv, &vs))
|
if (SameVertex(&dlnp->divpt, &vs))
|
||||||
psonline = 1;
|
ps_online = 1;
|
||||||
|
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
// remember last point intercept to detect identical points
|
// remember last point intercept to detect identical points
|
||||||
lastpv = *pv;
|
lastpv = dlnp->divpt;
|
||||||
}
|
}
|
||||||
|
|
||||||
// no split: the partition line is either parallel and
|
// no split: the partition line is either parallel and
|
||||||
@@ -254,28 +263,34 @@ static void SplitPoly (fdivline_t *bsp, //splitting parametric line
|
|||||||
// linedefs where each side point the same sector, that is:
|
// linedefs where each side point the same sector, that is:
|
||||||
// the deep water effect with the original Doom
|
// the deep water effect with the original Doom
|
||||||
|
|
||||||
/// \todo make sure front poly is to front of partition line?
|
//TODO: make sure front poly is to front of partition line?
|
||||||
|
|
||||||
*frontpoly = poly;
|
*frontpoly = poly;
|
||||||
*backpoly = NULL;
|
*backpoly = NULL;
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
//if (ps >= 0 && pe < 0)
|
||||||
if (pe < 0)
|
if (pe < 0)
|
||||||
{
|
{
|
||||||
//I_Error("SplitPoly: only one point for split line (%d %d)", ps, pe);
|
//I_Error("SplitPoly: only one point for split line (%d %d)", ps, pe);
|
||||||
*frontpoly = poly;
|
*frontpoly = poly;
|
||||||
*backpoly = NULL;
|
*backpoly = NULL;
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (UNLIKELY(pe <= ps))
|
if (pe <= ps)
|
||||||
I_Error("SplitPoly: invalid splitting line (%d %d)", ps, pe);
|
{
|
||||||
|
//I_Error("SplitPoly: invalid splitting line (%d %d)", ps, pe);
|
||||||
|
*frontpoly = poly;
|
||||||
|
*backpoly = NULL;
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
// number of points on each side, _not_ counting those
|
// Number of points on each side, _not_ counting those
|
||||||
// that may lie just one the line
|
// that may lie just on the line.
|
||||||
nptback = pe - ps - peonline;
|
nptback = pe - ps - pe_online;
|
||||||
nptfront = poly->numpts - peonline - psonline - nptback;
|
nptfront = poly->numpts - pe_online - ps_online - nptback;
|
||||||
|
|
||||||
if (nptback > 0)
|
if (nptback > 0)
|
||||||
*backpoly = HWR_AllocPoly(2 + nptback);
|
*backpoly = HWR_AllocPoly(2 + nptback);
|
||||||
@@ -295,11 +310,9 @@ static void SplitPoly (fdivline_t *bsp, //splitting parametric line
|
|||||||
*pv++ = ve;
|
*pv++ = ve;
|
||||||
i = pe;
|
i = pe;
|
||||||
|
|
||||||
do
|
do {
|
||||||
{
|
|
||||||
if (++i == poly->numpts)
|
if (++i == poly->numpts)
|
||||||
i = 0;
|
i = 0;
|
||||||
|
|
||||||
*pv++ = poly->pts[i];
|
*pv++ = poly->pts[i];
|
||||||
} while (i != ps && --nptfront);
|
} while (i != ps && --nptfront);
|
||||||
}
|
}
|
||||||
@@ -312,66 +325,79 @@ static void SplitPoly (fdivline_t *bsp, //splitting parametric line
|
|||||||
*pv++ = vs;
|
*pv++ = vs;
|
||||||
i = ps;
|
i = ps;
|
||||||
|
|
||||||
do
|
do {
|
||||||
{
|
|
||||||
if (++i == poly->numpts)
|
if (++i == poly->numpts)
|
||||||
i = 0;
|
i = 0;
|
||||||
|
|
||||||
*pv++ = poly->pts[i];
|
*pv++ = poly->pts[i];
|
||||||
} while (i != pe && --nptback);
|
} while (i != pe && --nptback);
|
||||||
}
|
}
|
||||||
|
|
||||||
// make sure frontpoly is the one on the 'right' side
|
// make sure frontpoly is the one on the 'right' side
|
||||||
// of the partition line
|
// of the partition line
|
||||||
if (fracs > frace)
|
if (ps_frac > pe_frac)
|
||||||
{
|
{
|
||||||
poly_t *swappoly;
|
poly_t* swappoly;
|
||||||
swappoly = *backpoly;
|
swappoly = *backpoly;
|
||||||
*backpoly = *frontpoly;
|
*backpoly = *frontpoly;
|
||||||
*frontpoly = swappoly;
|
*frontpoly = swappoly;
|
||||||
}
|
}
|
||||||
|
|
||||||
HWR_FreePoly (poly);
|
HWR_FreePoly(poly);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// checks if any line is a portal or horizonline, for optimization
|
||||||
|
static inline void CheckForPortalsAndHorizonLines(boolean firstside, const line_t *line)
|
||||||
|
{
|
||||||
|
// portal check
|
||||||
|
if (!gl_maphasportals && firstside && line->special == PORTALSPECIAL)
|
||||||
|
{
|
||||||
|
// Find the other side!
|
||||||
|
INT32 line2 = P_FindSpecialLineFromTag(PORTALSPECIAL, line->tag, -1);
|
||||||
|
|
||||||
// use each seg of the poly as a partition line, keep only the
|
if (line2 >= 0 && line == &lines[line2])
|
||||||
|
line2 = P_FindSpecialLineFromTag(PORTALSPECIAL, line->tag, line2);
|
||||||
|
|
||||||
|
if (line2 >= 0) // found it!
|
||||||
|
gl_maphasportals = 1;
|
||||||
|
}
|
||||||
|
|
||||||
|
// horizonline check
|
||||||
|
if (!gl_maphashorizonlines && line->special == HORIZONSPECIAL)
|
||||||
|
gl_maphashorizonlines = true;
|
||||||
|
}
|
||||||
|
|
||||||
|
// Use each seg of the poly as a partition line, keep only the
|
||||||
// part of the convex poly to the front of the seg (that is,
|
// part of the convex poly to the front of the seg (that is,
|
||||||
// the part inside the sector), the part behind the seg, is
|
// the part inside the sector). The part behind the seg, is
|
||||||
// the void space and is cut out
|
// the void space and is cut out.
|
||||||
//
|
//
|
||||||
static poly_t *CutOutSubsecPoly(seg_t *lseg, INT32 count, poly_t *poly)
|
// poly : surrounding convex polygon, non-destructive
|
||||||
|
// lseg : array of seg
|
||||||
|
// segcount : number of seg in the array
|
||||||
|
// Return frontpoly, which may be new or ptr to poly.
|
||||||
|
// Called from: HWR_SubsecPoly
|
||||||
|
static poly_t *CutOutSubsecPoly(seg_t *lseg, INT32 segcount, poly_t *poly)
|
||||||
{
|
{
|
||||||
INT32 i, j;
|
INT32 i, j;
|
||||||
|
poly_t* frontpoly = poly; // default, return same poly
|
||||||
polyvertex_t *pv;
|
polyvertex_t *pv;
|
||||||
INT32 nump = 0, ps, pe;
|
INT32 poly_num_pts = 0, ps, pe;
|
||||||
polyvertex_t vs = {}, ve = {},
|
polyvertex_t vs = {}, ve = {},
|
||||||
p1 = {}, p2 = {};
|
p1 = {}, p2 = {};
|
||||||
float fracs = 0.0f;
|
float ps_frac = 0.0f;
|
||||||
|
vertex_t *v1, *v2;
|
||||||
fdivline_t cutseg; // x, y, dx, dy as start of node_t struct
|
fdivline_t cutseg; // x, y, dx, dy as start of node_t struct
|
||||||
poly_t *temppoly;
|
|
||||||
|
|
||||||
// for each seg of the subsector
|
// for each seg of the subsector
|
||||||
for (; count--; lseg++)
|
for (; segcount--; lseg++)
|
||||||
{
|
{
|
||||||
// x, y, dx, dy (like a divline)
|
// x, y, dx, dy (like a divline)
|
||||||
const line_t *line = lseg->linedef;
|
const line_t *line = lseg->linedef;
|
||||||
|
|
||||||
// portal check
|
if (!line)
|
||||||
if (UNLIKELY(!gl_maphasportals && line->special == PORTALSPECIAL && lseg->side == 0))
|
continue;
|
||||||
{
|
|
||||||
// Find the other side!
|
|
||||||
INT32 line2 = P_FindSpecialLineFromTag(PORTALSPECIAL, line->tag, -1);
|
|
||||||
|
|
||||||
if (line == &lines[line2])
|
CheckForPortalsAndHorizonLines(lseg->side == 0, line);
|
||||||
line2 = P_FindSpecialLineFromTag(PORTALSPECIAL, line->tag, line2);
|
|
||||||
|
|
||||||
if (line2 >= 0) // found it!
|
|
||||||
gl_maphasportals = 1;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (!gl_maphashorizonlines && line->special == HORIZONSPECIAL)
|
|
||||||
gl_maphashorizonlines = true;
|
|
||||||
|
|
||||||
if (line->sidenum[1] != NO_INDEX)
|
if (line->sidenum[1] != NO_INDEX)
|
||||||
{
|
{
|
||||||
@@ -385,10 +411,21 @@ static poly_t *CutOutSubsecPoly(seg_t *lseg, INT32 count, poly_t *poly)
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
p1.x = FIXED_TO_FLOAT(lseg->side ? line->v2->x : line->v1->x);
|
if (lseg->side) // side 1
|
||||||
p1.y = FIXED_TO_FLOAT(lseg->side ? line->v2->y : line->v1->y);
|
{
|
||||||
p2.x = FIXED_TO_FLOAT(lseg->side ? line->v1->x : line->v2->x);
|
v1 = line->v2;
|
||||||
p2.y = FIXED_TO_FLOAT(lseg->side ? line->v1->y : line->v2->y);
|
v2 = line->v1;
|
||||||
|
}
|
||||||
|
else // side 0
|
||||||
|
{
|
||||||
|
v1 = line->v1;
|
||||||
|
v2 = line->v2;
|
||||||
|
}
|
||||||
|
|
||||||
|
p1.x = FixedToFloat(v1->x);
|
||||||
|
p1.y = FixedToFloat(v1->y);
|
||||||
|
p2.x = FixedToFloat(v2->x);
|
||||||
|
p2.y = FixedToFloat(v2->y);
|
||||||
|
|
||||||
cutseg.x = p1.x;
|
cutseg.x = p1.x;
|
||||||
cutseg.y = p1.y;
|
cutseg.y = p1.y;
|
||||||
@@ -401,125 +438,130 @@ static poly_t *CutOutSubsecPoly(seg_t *lseg, INT32 count, poly_t *poly)
|
|||||||
|
|
||||||
for (i = 0; i < poly->numpts; i++)
|
for (i = 0; i < poly->numpts; i++)
|
||||||
{
|
{
|
||||||
j = i + 1;
|
// i, j are one side of the poly
|
||||||
|
j = i+1;
|
||||||
if (j == poly->numpts)
|
if (j == poly->numpts)
|
||||||
j = 0;
|
j = 0;
|
||||||
|
|
||||||
pv = fracdivline(&cutseg, &poly->pts[i], &poly->pts[j]);
|
if (!fracdivline(&cutseg, &poly->pts[i], &poly->pts[j]))
|
||||||
|
|
||||||
if (pv == NULL)
|
|
||||||
continue;
|
continue;
|
||||||
|
|
||||||
|
// have dividing pt
|
||||||
if (ps < 0)
|
if (ps < 0)
|
||||||
{
|
{
|
||||||
ps = i;
|
ps = i;
|
||||||
vs = *pv;
|
vs = cutseg.divpt;
|
||||||
fracs = bspfrac;
|
ps_frac = cutseg.divfrac;
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
|
||||||
|
// frac 1 on previous segment,
|
||||||
|
// 0 on the next,
|
||||||
|
// the split line goes through one of the convex poly
|
||||||
|
// vertices, happens quite often since the convex
|
||||||
|
// poly is already adjacent to the subsector segs
|
||||||
|
// on most borders
|
||||||
|
if (SameVertex(&cutseg.divpt, &vs))
|
||||||
|
continue;
|
||||||
|
|
||||||
|
if (ps_frac <= cutseg.divfrac)
|
||||||
|
{
|
||||||
|
poly_num_pts = 2 + poly->numpts - (i-ps);
|
||||||
|
pe = ps;
|
||||||
|
ps = i;
|
||||||
|
ve = cutseg.divpt;
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
//frac 1 on previous segment,
|
poly_num_pts = 2 + (i-ps);
|
||||||
// 0 on the next,
|
pe = i;
|
||||||
//the split line goes through one of the convex poly
|
ve = vs;
|
||||||
// vertices, happens quite often since the convex
|
vs = cutseg.divpt;
|
||||||
// poly is already adjacent to the subsector segs
|
|
||||||
// on most borders
|
|
||||||
if (SameVertice(pv, &vs))
|
|
||||||
continue;
|
|
||||||
|
|
||||||
if (fracs <= bspfrac)
|
|
||||||
{
|
|
||||||
nump = 2 + poly->numpts - (i-ps);
|
|
||||||
pe = ps;
|
|
||||||
ps = i;
|
|
||||||
ve = *pv;
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
nump = 2 + (i-ps);
|
|
||||||
pe = i;
|
|
||||||
ve = vs;
|
|
||||||
vs = *pv;
|
|
||||||
}
|
|
||||||
|
|
||||||
//found 2nd point
|
|
||||||
break;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// found 2nd point
|
||||||
|
break;
|
||||||
}
|
}
|
||||||
|
|
||||||
// there was a split
|
// there was a split
|
||||||
if (ps >= 0)
|
if (ps >= 0)
|
||||||
{
|
{
|
||||||
//need 2 points
|
// need 2 points
|
||||||
if (pe >= 0)
|
if (pe >= 0)
|
||||||
{
|
{
|
||||||
// generate FRONT poly
|
// generate FRONT poly
|
||||||
temppoly = HWR_AllocPoly(nump);
|
frontpoly = HWR_AllocPoly(poly_num_pts);
|
||||||
|
|
||||||
pv = temppoly->pts;
|
pv = frontpoly->pts;
|
||||||
*pv++ = vs;
|
*pv++ = vs;
|
||||||
*pv++ = ve;
|
*pv++ = ve;
|
||||||
|
|
||||||
do
|
do {
|
||||||
{
|
if (++ps == poly->numpts) // poly wrap
|
||||||
if (++ps == poly->numpts)
|
|
||||||
ps = 0;
|
ps = 0;
|
||||||
*pv++ = poly->pts[ps];
|
*pv++ = poly->pts[ps];
|
||||||
} while (ps != pe);
|
} while (ps != pe);
|
||||||
|
|
||||||
HWR_FreePoly(poly);
|
HWR_FreePoly(poly);
|
||||||
poly = temppoly;
|
poly = frontpoly;
|
||||||
}
|
}
|
||||||
#ifdef DEBUG_HWBSP
|
#ifdef DEBUG_HWBSP
|
||||||
// hmmm... maybe we should NOT accept this, but this happens
|
|
||||||
// only when the cut is not needed it seems (when the cut
|
|
||||||
// line is aligned to one of the borders of the poly, and
|
|
||||||
// only some times..)
|
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
|
// hmmm... maybe we should NOT accept this, but this happens
|
||||||
|
// only when the cut is not needed it seems (when the cut
|
||||||
|
// line is aligned to one of the borders of the poly, and
|
||||||
|
// only some times..)
|
||||||
|
// [WDJ] This happens often (27 times in Doom2 map01).
|
||||||
skipcut++;
|
skipcut++;
|
||||||
I_Error("CutOutPoly: only one point for split line (%d %d) %d", ps, pe, debugpos);
|
//I_Error("CutOutPoly: only one point for split line (%d %d) %d", ps, pe, debugpos);
|
||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
return poly;
|
|
||||||
|
return frontpoly;
|
||||||
}
|
}
|
||||||
|
|
||||||
// At this point, the poly should be convex and the exact
|
// At this point, the poly should be convex and the exact
|
||||||
// layout of the subsector, it is not always the case,
|
// layout of the subsector. It is not always the case,
|
||||||
// so continue to cut off the poly into smaller parts with
|
// so continue to cut off the poly into smaller parts with
|
||||||
// each seg of the subsector.
|
// each seg of the subsector.
|
||||||
//
|
//
|
||||||
static inline void HWR_SubsecPoly(INT32 num, poly_t *poly)
|
// ssindex : subsec index, 0..(numsubsectors-1)
|
||||||
|
// poly : surrounding convex polygon, non-destructive
|
||||||
|
// Called from WalkBSPNode
|
||||||
|
static inline void HWR_SubsecPoly(INT32 ssindex, poly_t *poly)
|
||||||
{
|
{
|
||||||
INT16 count;
|
INT16 segcount;
|
||||||
subsector_t *sub;
|
subsector_t *sub;
|
||||||
seg_t *lseg;
|
seg_t *lseg;
|
||||||
|
|
||||||
sub = &subsectors[num];
|
sub = &subsectors[ssindex];
|
||||||
count = sub->numlines;
|
segcount = sub->numlines;
|
||||||
lseg = &segs[sub->firstline];
|
lseg = &segs[sub->firstline];
|
||||||
|
|
||||||
if (poly)
|
if (poly)
|
||||||
{
|
{
|
||||||
poly = CutOutSubsecPoly(lseg,count,poly);
|
poly = CutOutSubsecPoly(lseg, segcount, poly);
|
||||||
#ifdef DEBUG_HWBSP
|
#ifdef DEBUG_HWBSP
|
||||||
totalsubsecpolys++;
|
totalsubsecpolys++;
|
||||||
#endif
|
#endif
|
||||||
//extra data for this subsector
|
//extra data for this subsector
|
||||||
extrasubsectors[num].planepoly = poly;
|
extrasubsectors[ssindex].planepoly = poly;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
// the bsp divline have not enouth presition
|
// The bsp divline does not have enough precision.
|
||||||
// search for the segs source of this divline
|
// Search for the segs source of this divline.
|
||||||
static inline void SearchDivline(node_t *bsp, fdivline_t *divline)
|
static inline void SetDivline(node_t *bsp, fdivline_t *divline)
|
||||||
{
|
{
|
||||||
divline->x = FIXED_TO_FLOAT(bsp->x);
|
// MAR - If you don't use the same partition line that the BSP uses,
|
||||||
divline->y = FIXED_TO_FLOAT(bsp->y);
|
// the front/back polys won't match the subsectors in the BSP!
|
||||||
divline->dx = FIXED_TO_FLOAT(bsp->dx);
|
divline->x = FixedToFloat(bsp->x);
|
||||||
divline->dy = FIXED_TO_FLOAT(bsp->dy);
|
divline->y = FixedToFloat(bsp->y);
|
||||||
|
divline->dx = FixedToFloat(bsp->dx);
|
||||||
|
divline->dy = FixedToFloat(bsp->dy);
|
||||||
}
|
}
|
||||||
|
|
||||||
//Hurdler: implement a loading status
|
//Hurdler: implement a loading status
|
||||||
@@ -532,20 +574,26 @@ static void loading_status(void)
|
|||||||
char s[16];
|
char s[16];
|
||||||
int x, y;
|
int x, y;
|
||||||
|
|
||||||
|
/*if (g_reloadinggamestate)
|
||||||
|
{
|
||||||
|
return;
|
||||||
|
}*/
|
||||||
|
|
||||||
I_OsPolling();
|
I_OsPolling();
|
||||||
CON_Drawer();
|
CON_Drawer();
|
||||||
sprintf(s, "%d%%", (++ls_percent)<<1);
|
snprintf(s, sizeof(s), "%d%%", (++ls_percent)<<1);
|
||||||
|
|
||||||
x = BASEVIDWIDTH/2;
|
x = BASEVIDWIDTH/2;
|
||||||
y = BASEVIDHEIGHT/2;
|
y = BASEVIDHEIGHT/2;
|
||||||
V_DrawFill(0, 0, BASEVIDWIDTH, BASEVIDHEIGHT, 31); // Black background to match fade in effect
|
V_DrawFill(0, 0, BASEVIDWIDTH, BASEVIDHEIGHT, levelfadecol); // Black background to match fade in effect
|
||||||
//V_DrawPatchFill(srb2back); // SRB2 background, ehhh too bright.
|
//V_DrawPatchFill(srb2back); // SRB2 background, ehhh too bright.
|
||||||
M_DrawTextBox(x-58, y-8, 13, 1);
|
M_DrawTextBox(x-58, y-8, 13, 1);
|
||||||
V_DrawString(x-50, y, V_YELLOWMAP, "Loading...");
|
V_DrawString(x-50, y, V_YELLOWMAP, "Loading...");
|
||||||
V_DrawRightAlignedString(x+50, y, V_YELLOWMAP, s);
|
V_DrawRightAlignedString(x+50, y, V_YELLOWMAP, s);
|
||||||
|
|
||||||
// Is this really necessary at this point..?
|
// Is this really necessary at this point..?
|
||||||
V_DrawCenteredString(BASEVIDWIDTH/2, 40, V_YELLOWMAP, "OPENGL MODE IS INCOMPLETE AND MAY");
|
V_DrawCenteredString(BASEVIDWIDTH/2, 40, V_YELLOWMAP, "OPENGL MODE IS INCOMPLETE AND SOME");
|
||||||
V_DrawCenteredString(BASEVIDWIDTH/2, 50, V_YELLOWMAP, "NOT DISPLAY SOME SURFACES.");
|
V_DrawCenteredString(BASEVIDWIDTH/2, 50, V_YELLOWMAP, "VISUAL FEATURES ARE MISSING/BROKEN.");
|
||||||
V_DrawCenteredString(BASEVIDWIDTH/2, 70, V_YELLOWMAP, "USE AT SONIC'S RISK.");
|
V_DrawCenteredString(BASEVIDWIDTH/2, 70, V_YELLOWMAP, "USE AT SONIC'S RISK.");
|
||||||
|
|
||||||
I_UpdateNoVsync();
|
I_UpdateNoVsync();
|
||||||
@@ -576,14 +624,14 @@ static void WalkBSPNode(INT32 bspnum, poly_t *poly, UINT16 *leafnode, fixed_t *b
|
|||||||
{
|
{
|
||||||
CONS_Debug(DBG_RENDER, "Adding a new subsector\n");
|
CONS_Debug(DBG_RENDER, "Adding a new subsector\n");
|
||||||
|
|
||||||
if (UNLIKELY(addsubsector == numsubsectors + NEWSUBSECTORS))
|
if (num_extra_subsector == numsubsectors + NUM_EXTRA_SUBSECTORS)
|
||||||
I_Error("WalkBSPNode: not enough addsubsectors\n");
|
I_Error("WalkBSPNode: not enough num_extra_subsectors\n");
|
||||||
else if (UNLIKELY(addsubsector > 0x7fff))
|
else if (num_extra_subsector > 0x7fff)
|
||||||
I_Error("WalkBSPNode: addsubsector > 0x7fff\n");
|
I_Error("WalkBSPNode: num_extra_subsector > 0x7fff\n");
|
||||||
|
|
||||||
*leafnode = (UINT16)((UINT16)addsubsector | NF_SUBSECTOR);
|
*leafnode = (UINT16)((UINT16)num_extra_subsector | NF_SUBSECTOR);
|
||||||
extrasubsectors[addsubsector].planepoly = poly;
|
extrasubsectors[num_extra_subsector].planepoly = poly;
|
||||||
addsubsector++;
|
num_extra_subsector++;
|
||||||
}
|
}
|
||||||
|
|
||||||
//add subsectors without segs here?
|
//add subsectors without segs here?
|
||||||
@@ -593,8 +641,8 @@ static void WalkBSPNode(INT32 bspnum, poly_t *poly, UINT16 *leafnode, fixed_t *b
|
|||||||
{
|
{
|
||||||
HWR_SubsecPoly(bspnum & ~NF_SUBSECTOR, poly);
|
HWR_SubsecPoly(bspnum & ~NF_SUBSECTOR, poly);
|
||||||
|
|
||||||
//Hurdler: implement a loading status
|
|
||||||
#ifdef HWR_LOADING_SCREEN
|
#ifdef HWR_LOADING_SCREEN
|
||||||
|
//Hurdler: implement a loading status
|
||||||
if (ls_count-- <= 0)
|
if (ls_count-- <= 0)
|
||||||
{
|
{
|
||||||
ls_count = numsubsectors/50;
|
ls_count = numsubsectors/50;
|
||||||
@@ -613,7 +661,7 @@ static void WalkBSPNode(INT32 bspnum, poly_t *poly, UINT16 *leafnode, fixed_t *b
|
|||||||
}
|
}
|
||||||
|
|
||||||
bsp = &nodes[bspnum];
|
bsp = &nodes[bspnum];
|
||||||
SearchDivline(bsp, &fdivline);
|
SetDivline(bsp, &fdivline);
|
||||||
SplitPoly(&fdivline, poly, &frontpoly, &backpoly);
|
SplitPoly(&fdivline, poly, &frontpoly, &backpoly);
|
||||||
poly = NULL;
|
poly = NULL;
|
||||||
|
|
||||||
@@ -656,12 +704,12 @@ void HWR_FreeExtraSubsectors(void)
|
|||||||
extrasubsectors = NULL;
|
extrasubsectors = NULL;
|
||||||
}
|
}
|
||||||
|
|
||||||
#define MAXDIST 1.5f
|
#define MAXDIST (1.5f)
|
||||||
// BP: can't move vertex: DON'T change polygon geometry! (convex)
|
// BP: can't move vertex: DON'T change polygon geometry! (convex)
|
||||||
//#define MOVEVERTEX
|
//#define MOVEVERTEX
|
||||||
|
|
||||||
// Is vertex va within the seg v1, v2
|
// Is vertex va within the seg v1, v2
|
||||||
static boolean PointInSeg(polyvertex_t *va,polyvertex_t *v1,polyvertex_t *v2)
|
static boolean PointInSeg(polyvertex_t *va, polyvertex_t *v1, polyvertex_t *v2)
|
||||||
{
|
{
|
||||||
register float ax, ay, bx, by, cx, cy, d, norm;
|
register float ax, ay, bx, by, cx, cy, d, norm;
|
||||||
|
|
||||||
@@ -736,8 +784,8 @@ static boolean PointInSeg(polyvertex_t *va,polyvertex_t *v1,polyvertex_t *v2)
|
|||||||
if (cx*cx+cy*cy <= MAXDIST*MAXDIST)
|
if (cx*cx+cy*cy <= MAXDIST*MAXDIST)
|
||||||
{
|
{
|
||||||
// ajust a little the point position
|
// ajust a little the point position
|
||||||
a->x = ax*d+v1->x;
|
va->x = ax*d+v1->x;
|
||||||
a->y = ay*d+v1->y;
|
va->y = ay*d+v1->y;
|
||||||
// anyway the correction is not enouth
|
// anyway the correction is not enouth
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
@@ -749,10 +797,10 @@ static boolean PointInSeg(polyvertex_t *va,polyvertex_t *v1,polyvertex_t *v2)
|
|||||||
|
|
||||||
static INT32 numsplitpoly;
|
static INT32 numsplitpoly;
|
||||||
|
|
||||||
static void SearchSegInBSP(INT32 bspnum,polyvertex_t *p,poly_t *poly)
|
static void SearchSegInBSP(INT32 bspnum, polyvertex_t *p, poly_t *poly)
|
||||||
{
|
{
|
||||||
poly_t *q;
|
poly_t *q;
|
||||||
INT32 j,k;
|
INT32 j, k;
|
||||||
|
|
||||||
if (bspnum & NF_SUBSECTOR)
|
if (bspnum & NF_SUBSECTOR)
|
||||||
{
|
{
|
||||||
@@ -772,12 +820,12 @@ static void SearchSegInBSP(INT32 bspnum,polyvertex_t *p,poly_t *poly)
|
|||||||
if (k == numpts)
|
if (k == numpts)
|
||||||
k = 0;
|
k = 0;
|
||||||
|
|
||||||
if (!SameVertice(p, &q->pts[j])
|
if (!SameVertex(p, &q->pts[j]) &&
|
||||||
&& !SameVertice(p, &q->pts[k])
|
!SameVertex(p, &q->pts[k]) &&
|
||||||
&& PointInSeg(p, &q->pts[j], &q->pts[k]))
|
PointInSeg(p, &q->pts[j], &q->pts[k]))
|
||||||
{
|
{
|
||||||
poly_t *newpoly = HWR_AllocPoly(numpts+1);
|
|
||||||
INT32 n;
|
INT32 n;
|
||||||
|
poly_t *newpoly = HWR_AllocPoly(numpts+1);
|
||||||
|
|
||||||
for (n = 0; n <= j; n++)
|
for (n = 0; n <= j; n++)
|
||||||
newpoly->pts[n] = q->pts[n];
|
newpoly->pts[n] = q->pts[n];
|
||||||
@@ -798,16 +846,17 @@ static void SearchSegInBSP(INT32 bspnum,polyvertex_t *p,poly_t *poly)
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
if ((FIXED_TO_FLOAT(nodes[bspnum].bbox[0][BOXBOTTOM])-MAXDIST <= p->y) &&
|
// Not a subsector, visit left and right children.
|
||||||
(FIXED_TO_FLOAT(nodes[bspnum].bbox[0][BOXTOP ])+MAXDIST >= p->y) &&
|
if ((FixedToFloat(nodes[bspnum].bbox[0][BOXBOTTOM])-MAXDIST <= p->y) &&
|
||||||
(FIXED_TO_FLOAT(nodes[bspnum].bbox[0][BOXLEFT ])-MAXDIST <= p->x) &&
|
(FixedToFloat(nodes[bspnum].bbox[0][BOXTOP ])+MAXDIST >= p->y) &&
|
||||||
(FIXED_TO_FLOAT(nodes[bspnum].bbox[0][BOXRIGHT ])+MAXDIST >= p->x))
|
(FixedToFloat(nodes[bspnum].bbox[0][BOXLEFT ])-MAXDIST <= p->x) &&
|
||||||
|
(FixedToFloat(nodes[bspnum].bbox[0][BOXRIGHT ])+MAXDIST >= p->x))
|
||||||
SearchSegInBSP(nodes[bspnum].children[0], p, poly);
|
SearchSegInBSP(nodes[bspnum].children[0], p, poly);
|
||||||
|
|
||||||
if ((FIXED_TO_FLOAT(nodes[bspnum].bbox[1][BOXBOTTOM])-MAXDIST <= p->y) &&
|
if ((FixedToFloat(nodes[bspnum].bbox[1][BOXBOTTOM])-MAXDIST <= p->y) &&
|
||||||
(FIXED_TO_FLOAT(nodes[bspnum].bbox[1][BOXTOP ])+MAXDIST >= p->y) &&
|
(FixedToFloat(nodes[bspnum].bbox[1][BOXTOP ])+MAXDIST >= p->y) &&
|
||||||
(FIXED_TO_FLOAT(nodes[bspnum].bbox[1][BOXLEFT ])-MAXDIST <= p->x) &&
|
(FixedToFloat(nodes[bspnum].bbox[1][BOXLEFT ])-MAXDIST <= p->x) &&
|
||||||
(FIXED_TO_FLOAT(nodes[bspnum].bbox[1][BOXRIGHT ])+MAXDIST >= p->x))
|
(FixedToFloat(nodes[bspnum].bbox[1][BOXRIGHT ])+MAXDIST >= p->x))
|
||||||
SearchSegInBSP(nodes[bspnum].children[1], p, poly);
|
SearchSegInBSP(nodes[bspnum].children[1], p, poly);
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -816,38 +865,43 @@ static void SearchSegInBSP(INT32 bspnum,polyvertex_t *p,poly_t *poly)
|
|||||||
// but we must use a different structure : polygone pointing on segs
|
// but we must use a different structure : polygone pointing on segs
|
||||||
// segs pointing on polygone and on vertex (too mush complicated, well not
|
// segs pointing on polygone and on vertex (too mush complicated, well not
|
||||||
// realy but i am soo lasy), the methode discibed is also better for segs presition
|
// realy but i am soo lasy), the methode discibed is also better for segs presition
|
||||||
static INT32 SolveTProblem(void)
|
static void SolveTProblem(void)
|
||||||
{
|
{
|
||||||
poly_t *p;
|
poly_t *p;
|
||||||
INT32 i;
|
INT32 i, numpts;
|
||||||
size_t l;
|
size_t ssnum;
|
||||||
|
|
||||||
if (cv_glsolvetjoin.value == 0)
|
if (!cv_glsolvetjoin.value)
|
||||||
return 0;
|
return;
|
||||||
|
|
||||||
CONS_Debug(DBG_RENDER, "Solving T-joins. This may take a while. Please wait...\n");
|
CONS_Debug(DBG_RENDER, "Solving T-joins. This may take a while. Please wait...\n");
|
||||||
|
|
||||||
|
#ifdef HWR_LOADING_SCREEN
|
||||||
|
CON_Drawer(); //let the user know what we are doing
|
||||||
|
I_FinishUpdate(); // page flip or blit buffer
|
||||||
|
#endif
|
||||||
|
|
||||||
numsplitpoly = 0;
|
numsplitpoly = 0;
|
||||||
|
|
||||||
for (l = 0; l < addsubsector; l++)
|
for (ssnum = 0; ssnum < num_extra_subsector; ssnum++)
|
||||||
{
|
{
|
||||||
p = extrasubsectors[l].planepoly;
|
p = extrasubsectors[ssnum].planepoly;
|
||||||
|
|
||||||
if (!p)
|
if (!p || p->numpts == 0)
|
||||||
continue;
|
continue;
|
||||||
|
|
||||||
for (i = 0; i < p->numpts; i++)
|
numpts = p->numpts;
|
||||||
|
|
||||||
|
for (i = 0; i < numpts; i++)
|
||||||
SearchSegInBSP((INT32)numnodes-1, &p->pts[i], p);
|
SearchSegInBSP((INT32)numnodes-1, &p->pts[i], p);
|
||||||
}
|
}
|
||||||
|
|
||||||
#ifdef DEBUG_HWBSP
|
#ifdef DEBUG_HWBSP
|
||||||
CONS_Debug(DBG_RENDER, "numsplitpoly %d\n", numsplitpoly);
|
CONS_Debug(DBG_RENDER, "numsplitpoly %d\n", numsplitpoly);
|
||||||
|
CONS_Debug(DBG_RENDER, "%d point divides a polygon line\n", numsplitpoly);
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
return numsplitpoly;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
// call this routine after the BSP of a Doom wad file is loaded,
|
// call this routine after the BSP of a Doom wad file is loaded,
|
||||||
// and it will generate all the convex polys for the hardware renderer
|
// and it will generate all the convex polys for the hardware renderer
|
||||||
void HWR_CreatePlanePolygons(INT32 bspnum)
|
void HWR_CreatePlanePolygons(INT32 bspnum)
|
||||||
@@ -865,7 +919,7 @@ void HWR_CreatePlanePolygons(INT32 bspnum)
|
|||||||
#endif
|
#endif
|
||||||
|
|
||||||
// reset the portal and horizonline flag
|
// reset the portal and horizonline flag
|
||||||
gl_maphasportals = gl_maphashorizonlines = 0;
|
gl_maphasportals = gl_maphashorizonlines = false;
|
||||||
|
|
||||||
// find min/max boundaries of map
|
// find min/max boundaries of map
|
||||||
#ifdef DEBUG_HWBSP
|
#ifdef DEBUG_HWBSP
|
||||||
@@ -882,39 +936,35 @@ void HWR_CreatePlanePolygons(INT32 bspnum)
|
|||||||
HWR_FreeExtraSubsectors();
|
HWR_FreeExtraSubsectors();
|
||||||
|
|
||||||
// allocate extra data for each subsector present in map
|
// allocate extra data for each subsector present in map
|
||||||
totsubsectors = numsubsectors + NEWSUBSECTORS;
|
num_alloc_extra_subsector = numsubsectors + NUM_EXTRA_SUBSECTORS;
|
||||||
extrasubsectors = calloc(totsubsectors, sizeof(*extrasubsectors));
|
extrasubsectors = (extrasubsector_t*)calloc(num_alloc_extra_subsector, sizeof(*extrasubsectors));
|
||||||
if (UNLIKELY(!extrasubsectors))
|
if (UNLIKELY(!extrasubsectors))
|
||||||
I_Error("couldn't malloc extrasubsectors totsubsectors %s\n", sizeu1(totsubsectors));
|
I_Error("couldn't malloc extrasubsectors num_alloc_extra_subsector %s\n", sizeu1(num_alloc_extra_subsector));
|
||||||
|
|
||||||
// number of the first new subsector that might be added
|
// number of the first new subsector that might be added
|
||||||
addsubsector = numsubsectors;
|
num_extra_subsector = numsubsectors;
|
||||||
|
|
||||||
// construct the initial convex poly that encloses the full map
|
// construct the initial convex poly that encloses the full map
|
||||||
rootp = HWR_AllocPoly(4);
|
rootp = HWR_AllocPoly(4);
|
||||||
rootpv = rootp->pts;
|
rootpv = rootp->pts;
|
||||||
|
|
||||||
rootpv->x = FIXED_TO_FLOAT(rootbbox[BOXLEFT ]);
|
// clockwise polygon
|
||||||
rootpv->y = FIXED_TO_FLOAT(rootbbox[BOXBOTTOM]); //lr
|
rootpv->x = FixedToFloat(rootbbox[BOXLEFT ]);
|
||||||
|
rootpv->y = FixedToFloat(rootbbox[BOXBOTTOM]); //lr
|
||||||
rootpv++;
|
rootpv++;
|
||||||
rootpv->x = FIXED_TO_FLOAT(rootbbox[BOXLEFT ]);
|
rootpv->x = FixedToFloat(rootbbox[BOXLEFT ]);
|
||||||
rootpv->y = FIXED_TO_FLOAT(rootbbox[BOXTOP ]); //ur
|
rootpv->y = FixedToFloat(rootbbox[BOXTOP ]); //ur
|
||||||
rootpv++;
|
rootpv++;
|
||||||
rootpv->x = FIXED_TO_FLOAT(rootbbox[BOXRIGHT ]);
|
rootpv->x = FixedToFloat(rootbbox[BOXRIGHT ]);
|
||||||
rootpv->y = FIXED_TO_FLOAT(rootbbox[BOXTOP ]); //ul
|
rootpv->y = FixedToFloat(rootbbox[BOXTOP ]); //ul
|
||||||
rootpv++;
|
rootpv++;
|
||||||
rootpv->x = FIXED_TO_FLOAT(rootbbox[BOXRIGHT ]);
|
rootpv->x = FixedToFloat(rootbbox[BOXRIGHT ]);
|
||||||
rootpv->y = FIXED_TO_FLOAT(rootbbox[BOXBOTTOM]); //ll
|
rootpv->y = FixedToFloat(rootbbox[BOXBOTTOM]); //ll
|
||||||
rootpv++;
|
rootpv++;
|
||||||
|
|
||||||
WalkBSPNode(bspnum, rootp, NULL, rootbbox);
|
WalkBSPNode(bspnum, rootp, NULL, rootbbox);
|
||||||
|
|
||||||
#ifdef DEBUG_HWBSP
|
|
||||||
i = SolveTProblem();
|
|
||||||
CONS_Debug(DBG_RENDER, "%d point divides a polygon line\n",i);
|
|
||||||
#else
|
|
||||||
SolveTProblem();
|
SolveTProblem();
|
||||||
#endif
|
|
||||||
|
|
||||||
#ifdef DEBUG_HWBSP
|
#ifdef DEBUG_HWBSP
|
||||||
//debug debug..
|
//debug debug..
|
||||||
|
|||||||
@@ -555,7 +555,8 @@ static void HWR_FreePatchCache(boolean freeall)
|
|||||||
callback = FreeColormapsCallback;
|
callback = FreeColormapsCallback;
|
||||||
|
|
||||||
//Z_IterateTags(PU_PATCH, PU_PATCH_ROTATED, callback);
|
//Z_IterateTags(PU_PATCH, PU_PATCH_ROTATED, callback);
|
||||||
Z_IterateTags(PU_PATCH, PU_PATCH, callback);
|
//Z_IterateTags(PU_PATCH, PU_PATCH_LOWPRIORITY, callback); // we dont really need to free low priority patches here as P_FreeLevelState takes care of them
|
||||||
|
Z_IterateTag(PU_PATCH, callback);
|
||||||
Z_IterateTags(PU_SPRITE, PU_HUDGFX, callback);
|
Z_IterateTags(PU_SPRITE, PU_HUDGFX, callback);
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -998,7 +999,7 @@ static void HWR_CacheFlat(GLMipmap_t *glMipmap, lumpnum_t flatlumpnum)
|
|||||||
const char *flatname = W_CheckNameForNum(flatlumpnum);
|
const char *flatname = W_CheckNameForNum(flatlumpnum);
|
||||||
|
|
||||||
// hack for gba rainbow roads cyan floors
|
// hack for gba rainbow roads cyan floors
|
||||||
if (UNLIKELY(memcmp(flatname, "GBA_RRF5", 8) == 0 && flatname[8] == 0))
|
if (UNLIKELY(flatname && memcmp(flatname, "GBA_RRF5", 8) == 0 && flatname[8] == 0))
|
||||||
{
|
{
|
||||||
glMipmap->flags &= ~TF_CHROMAKEYED;
|
glMipmap->flags &= ~TF_CHROMAKEYED;
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -96,7 +96,6 @@ typedef struct
|
|||||||
typedef struct
|
typedef struct
|
||||||
{
|
{
|
||||||
float x, y, z;
|
float x, y, z;
|
||||||
fixed_t x2, y2, z2;
|
|
||||||
} polyvertex_t;
|
} polyvertex_t;
|
||||||
|
|
||||||
// a convex 'plane' polygon, clockwise order
|
// a convex 'plane' polygon, clockwise order
|
||||||
|
|||||||
@@ -54,7 +54,7 @@ void HWR_ObjectLightLevelPost(gl_vissprite_t *spr, const sector_t *sector, INT32
|
|||||||
// --------
|
// --------
|
||||||
extern extrasubsector_t *extrasubsectors;
|
extern extrasubsector_t *extrasubsectors;
|
||||||
#ifdef PARANOIA
|
#ifdef PARANOIA
|
||||||
extern size_t addsubsector;
|
extern size_t num_extra_subsector;
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
void HWR_FreeExtraSubsectors(void);
|
void HWR_FreeExtraSubsectors(void);
|
||||||
|
|||||||
+102
-81
@@ -84,11 +84,6 @@ float gl_viewsin = 0.0f, gl_viewcos = 0.0f;
|
|||||||
static float gl_viewludsin, gl_viewludcos;
|
static float gl_viewludsin, gl_viewludcos;
|
||||||
static angle_t gl_aimingangle;
|
static angle_t gl_aimingangle;
|
||||||
|
|
||||||
static float yaw = 0.0f;
|
|
||||||
static float inv_yaw = 0.0f;
|
|
||||||
static float cos_inv_yaw = 0.0f;
|
|
||||||
static float sin_inv_yaw = 0.0f;
|
|
||||||
|
|
||||||
static constexpr float deg2radians = (M_PIf / 180.0f);
|
static constexpr float deg2radians = (M_PIf / 180.0f);
|
||||||
|
|
||||||
seg_t *gl_curline = NULL;
|
seg_t *gl_curline = NULL;
|
||||||
@@ -519,7 +514,7 @@ static FUINT HWR_CalcWallLight(FUINT lightnum, seg_t *seg, extracolormap_t *colo
|
|||||||
const INT16 offset = (cv_glfakecontrast.value == 2) ? seg->hwLightOffset : ((INT16)seg->lightOffset * 8);
|
const INT16 offset = (cv_glfakecontrast.value == 2) ? seg->hwLightOffset : ((INT16)seg->lightOffset * 8);
|
||||||
|
|
||||||
finallight += offset;
|
finallight += offset;
|
||||||
finallight = CLAMP(finallight, 0 , 255);
|
finallight = CLAMP(finallight, 0, 255);
|
||||||
}
|
}
|
||||||
|
|
||||||
return (FUINT)finallight;
|
return (FUINT)finallight;
|
||||||
@@ -537,7 +532,7 @@ static FUINT HWR_CalcSlopeLight(FUINT lightnum, pslope_t *slope, const sector_t
|
|||||||
const INT16 offset = (cv_glfakecontrast.value == 2) ? slope->hwLightOffset : ((INT16)slope->lightOffset * 8);
|
const INT16 offset = (cv_glfakecontrast.value == 2) ? slope->hwLightOffset : ((INT16)slope->lightOffset * 8);
|
||||||
|
|
||||||
finallight += (fof ? -offset : offset);
|
finallight += (fof ? -offset : offset);
|
||||||
finallight = CLAMP(finallight, 0 , 255);
|
finallight = CLAMP(finallight, 0, 255);
|
||||||
}
|
}
|
||||||
|
|
||||||
return (FUINT)finallight;
|
return (FUINT)finallight;
|
||||||
@@ -1106,8 +1101,8 @@ static void HWR_SplitWall(sector_t *sector, FOutVector *wallVerts, INT32 texnum,
|
|||||||
|
|
||||||
// Found a break
|
// Found a break
|
||||||
// The heights are clamped to ensure the polygon doesn't cross itself.
|
// The heights are clamped to ensure the polygon doesn't cross itself.
|
||||||
bot = std::clamp(bheight, realbot, top);
|
bot = std::min(std::max(bheight, realbot), top);
|
||||||
endbot = std::clamp(endbheight, endrealbot, endtop);
|
endbot = std::min(std::max(endbheight, endrealbot), endtop);
|
||||||
|
|
||||||
Surf->PolyColor.s.alpha = alpha;
|
Surf->PolyColor.s.alpha = alpha;
|
||||||
|
|
||||||
@@ -2311,7 +2306,7 @@ static inline void DoAddLine(seg_t* line, angle_t angle1, angle_t angle2)
|
|||||||
// Find the other side!
|
// Find the other side!
|
||||||
INT32 line2 = P_FindSpecialLineFromTag(PORTALSPECIAL, line->linedef->tag, -1);
|
INT32 line2 = P_FindSpecialLineFromTag(PORTALSPECIAL, line->linedef->tag, -1);
|
||||||
|
|
||||||
if (line->linedef == &lines[line2])
|
if (line2 >= 0 && line->linedef == &lines[line2])
|
||||||
line2 = P_FindSpecialLineFromTag(PORTALSPECIAL, line->linedef->tag, line2);
|
line2 = P_FindSpecialLineFromTag(PORTALSPECIAL, line->linedef->tag, line2);
|
||||||
|
|
||||||
if (line2 >= 0) // found it!
|
if (line2 >= 0) // found it!
|
||||||
@@ -2667,11 +2662,13 @@ static void HWR_AddPolyObjectPlanes(void)
|
|||||||
|
|
||||||
polyobjsector = po_ptrs[i]->lines[0]->backsector; // the in-level polyobject sector
|
polyobjsector = po_ptrs[i]->lines[0]->backsector; // the in-level polyobject sector
|
||||||
|
|
||||||
if (polyobjsector->floorheight <= gl_frontsector->ceilingheight
|
if (polyobjsector->floorheight <= gl_frontsector->ceilingheight &&
|
||||||
&& polyobjsector->floorheight >= gl_frontsector->floorheight
|
polyobjsector->floorheight >= gl_frontsector->floorheight &&
|
||||||
&& (viewz < polyobjsector->floorheight))
|
(viewz < polyobjsector->floorheight))
|
||||||
{
|
{
|
||||||
light = R_GetPlaneLight(gl_frontsector, polyobjsector->floorheight, true);
|
light = R_GetPlaneLight(gl_frontsector, polyobjsector->floorheight, true);
|
||||||
|
const INT16 llevel = (light == -1 ? gl_frontsector->lightlevel : *gl_frontsector->lightlist[light].lightlevel);
|
||||||
|
extracolormap_t *colmap = (light == -1 ? gl_frontsector->extra_colormap : gl_frontsector->lightlist[light].extra_colormap);
|
||||||
|
|
||||||
if (po_ptrs[i]->translucency > 0)
|
if (po_ptrs[i]->translucency > 0)
|
||||||
{
|
{
|
||||||
@@ -2679,22 +2676,24 @@ static void HWR_AddPolyObjectPlanes(void)
|
|||||||
FBITFIELD blendmode;
|
FBITFIELD blendmode;
|
||||||
blendmode = HWR_TranstableToAlpha(po_ptrs[i]->translucency, &Surf);
|
blendmode = HWR_TranstableToAlpha(po_ptrs[i]->translucency, &Surf);
|
||||||
HWR_AddTransparentPolyobjectFloor(levelflats[polyobjsector->floorpic].lumpnum, po_ptrs[i], false, polyobjsector->floorheight,
|
HWR_AddTransparentPolyobjectFloor(levelflats[polyobjsector->floorpic].lumpnum, po_ptrs[i], false, polyobjsector->floorheight,
|
||||||
(light == -1 ? gl_frontsector->lightlevel : *gl_frontsector->lightlist[light].lightlevel), Surf.PolyColor.s.alpha, polyobjsector, blendmode, (light == -1 ? gl_frontsector->extra_colormap : gl_frontsector->lightlist[light].extra_colormap));
|
llevel, Surf.PolyColor.s.alpha, polyobjsector, blendmode, colmap);
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
HWR_GetFlat(levelflats[polyobjsector->floorpic].lumpnum, R_NoEncore(polyobjsector, false));
|
HWR_GetFlat(levelflats[polyobjsector->floorpic].lumpnum, R_NoEncore(polyobjsector, false));
|
||||||
HWR_RenderPolyObjectPlane(po_ptrs[i], false, polyobjsector->floorheight, PF_Occlude,
|
HWR_RenderPolyObjectPlane(po_ptrs[i], false, polyobjsector->floorheight, PF_Occlude,
|
||||||
(light == -1 ? gl_frontsector->lightlevel : *gl_frontsector->lightlist[light].lightlevel), levelflats[polyobjsector->floorpic].lumpnum,
|
llevel, levelflats[polyobjsector->floorpic].lumpnum,
|
||||||
polyobjsector, 255, (light == -1 ? gl_frontsector->extra_colormap : gl_frontsector->lightlist[light].extra_colormap));
|
polyobjsector, 255, colmap);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if (polyobjsector->ceilingheight >= gl_frontsector->floorheight
|
if (polyobjsector->ceilingheight >= gl_frontsector->floorheight &&
|
||||||
&& polyobjsector->ceilingheight <= gl_frontsector->ceilingheight
|
polyobjsector->ceilingheight <= gl_frontsector->ceilingheight &&
|
||||||
&& (viewz > polyobjsector->ceilingheight))
|
(viewz > polyobjsector->ceilingheight))
|
||||||
{
|
{
|
||||||
light = R_GetPlaneLight(gl_frontsector, polyobjsector->ceilingheight, true);
|
light = R_GetPlaneLight(gl_frontsector, polyobjsector->ceilingheight, true);
|
||||||
|
const INT16 llevel = (light == -1 ? gl_frontsector->lightlevel : *gl_frontsector->lightlist[light].lightlevel);
|
||||||
|
extracolormap_t *colmap = (light == -1 ? gl_frontsector->extra_colormap : gl_frontsector->lightlist[light].extra_colormap);
|
||||||
|
|
||||||
if (po_ptrs[i]->translucency > 0)
|
if (po_ptrs[i]->translucency > 0)
|
||||||
{
|
{
|
||||||
@@ -2702,14 +2701,14 @@ static void HWR_AddPolyObjectPlanes(void)
|
|||||||
FBITFIELD blendmode;
|
FBITFIELD blendmode;
|
||||||
blendmode = HWR_TranstableToAlpha(po_ptrs[i]->translucency, &Surf);
|
blendmode = HWR_TranstableToAlpha(po_ptrs[i]->translucency, &Surf);
|
||||||
HWR_AddTransparentPolyobjectFloor(levelflats[polyobjsector->ceilingpic].lumpnum, po_ptrs[i], true, polyobjsector->ceilingheight,
|
HWR_AddTransparentPolyobjectFloor(levelflats[polyobjsector->ceilingpic].lumpnum, po_ptrs[i], true, polyobjsector->ceilingheight,
|
||||||
(light == -1 ? gl_frontsector->lightlevel : *gl_frontsector->lightlist[light].lightlevel), Surf.PolyColor.s.alpha, polyobjsector, blendmode, (light == -1 ? gl_frontsector->extra_colormap : gl_frontsector->lightlist[light].extra_colormap));
|
llevel, Surf.PolyColor.s.alpha, polyobjsector, blendmode, colmap);
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
HWR_GetFlat(levelflats[polyobjsector->ceilingpic].lumpnum, R_NoEncore(polyobjsector, true));
|
HWR_GetFlat(levelflats[polyobjsector->ceilingpic].lumpnum, R_NoEncore(polyobjsector, true));
|
||||||
HWR_RenderPolyObjectPlane(po_ptrs[i], true, polyobjsector->ceilingheight, PF_Occlude,
|
HWR_RenderPolyObjectPlane(po_ptrs[i], true, polyobjsector->ceilingheight, PF_Occlude,
|
||||||
(light == -1 ? gl_frontsector->lightlevel : *gl_frontsector->lightlist[light].lightlevel), levelflats[polyobjsector->ceilingpic].lumpnum,
|
llevel, levelflats[polyobjsector->ceilingpic].lumpnum,
|
||||||
polyobjsector, 255, (light == -1 ? gl_frontsector->extra_colormap : gl_frontsector->lightlist[light].extra_colormap));
|
polyobjsector, 255, colmap);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -2784,9 +2783,9 @@ static void HWR_Subsector(size_t num)
|
|||||||
ffloor_t *rover;
|
ffloor_t *rover;
|
||||||
|
|
||||||
#ifdef PARANOIA // no risk while developing, enough debugging nights!
|
#ifdef PARANOIA // no risk while developing, enough debugging nights!
|
||||||
if (num >= addsubsector)
|
if (num >= num_extra_subsector)
|
||||||
I_Error("HWR_Subsector: ss %s with numss = %s, addss = %s\n",
|
I_Error("HWR_Subsector: ss %s with numss = %s, addss = %s\n",
|
||||||
sizeu1(num), sizeu2(numsubsectors), sizeu3(addsubsector));
|
sizeu1(num), sizeu2(numsubsectors), sizeu3(num_extra_subsector));
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
if (num < numsubsectors)
|
if (num < numsubsectors)
|
||||||
@@ -3240,6 +3239,18 @@ static void HWR_DrawSpriteShadow(gl_vissprite_t *spr, patch_t *gpatch, GLPatch_t
|
|||||||
if (!spr->mobj)
|
if (!spr->mobj)
|
||||||
return;
|
return;
|
||||||
|
|
||||||
|
// Ceiling scenery have no shadow.
|
||||||
|
if ((spr->mobj->flags & (MF_SCENERY|MF_SPAWNCEILING|MF_NOGRAVITY)) == (MF_SCENERY|MF_SPAWNCEILING|MF_NOGRAVITY))
|
||||||
|
return;
|
||||||
|
|
||||||
|
// Debris have no corona or shadow.
|
||||||
|
if (spr->mobj->flags2 & MF2_DEBRIS)
|
||||||
|
return;
|
||||||
|
|
||||||
|
// Without this, your shadow shows on the floor, even after you die and fall through the ground.
|
||||||
|
if (spr->mobj->z < spr->mobj->floorz)
|
||||||
|
return;
|
||||||
|
|
||||||
R_GetShadowZ(spr->mobj, &floorslope);
|
R_GetShadowZ(spr->mobj, &floorslope);
|
||||||
|
|
||||||
mobjfloor = HWR_OpaqueFloorAtPos(
|
mobjfloor = HWR_OpaqueFloorAtPos(
|
||||||
@@ -3488,6 +3499,8 @@ static void HWR_SplitSprite(gl_vissprite_t *spr, const boolean papersprite)
|
|||||||
fixed_t v1x, v1y, v2x, v2y;
|
fixed_t v1x, v1y, v2x, v2y;
|
||||||
INT32 shader = SHADER_NONE;
|
INT32 shader = SHADER_NONE;
|
||||||
|
|
||||||
|
const boolean billboarding = (cv_glspritebillboarding.value && !cv_glshearing.value && !papersprite);
|
||||||
|
|
||||||
gpatch = spr->gpatch;
|
gpatch = spr->gpatch;
|
||||||
|
|
||||||
// cache the patch in the graphics card memory
|
// cache the patch in the graphics card memory
|
||||||
@@ -3498,10 +3511,7 @@ static void HWR_SplitSprite(gl_vissprite_t *spr, const boolean papersprite)
|
|||||||
hwrpatch = static_cast<GLPatch_t *>(gpatch->hardware);
|
hwrpatch = static_cast<GLPatch_t *>(gpatch->hardware);
|
||||||
|
|
||||||
// Draw shadow BEFORE sprite
|
// Draw shadow BEFORE sprite
|
||||||
if (UNLIKELY(cv_shadow.value // Shadows enabled
|
if (UNLIKELY(cv_shadow.value))
|
||||||
&& (sprmo->flags & (MF_SCENERY|MF_SPAWNCEILING|MF_NOGRAVITY)) != (MF_SCENERY|MF_SPAWNCEILING|MF_NOGRAVITY) // Ceiling scenery have no shadow.
|
|
||||||
&& !(sprmo->flags2 & MF2_DEBRIS) // Debris have no corona or shadow.
|
|
||||||
&& (sprmo->z >= sprmo->floorz))) // Without this, your shadow shows on the floor, even after you die and fall through the ground.
|
|
||||||
{
|
{
|
||||||
////////////////////
|
////////////////////
|
||||||
// SHADOW SPRITE! //
|
// SHADOW SPRITE! //
|
||||||
@@ -3685,7 +3695,7 @@ static void HWR_SplitSprite(gl_vissprite_t *spr, const boolean papersprite)
|
|||||||
wallVerts[1].y = endbot;
|
wallVerts[1].y = endbot;
|
||||||
|
|
||||||
// The x and y only need to be adjusted in the case that it's not a papersprite
|
// The x and y only need to be adjusted in the case that it's not a papersprite
|
||||||
if (cv_glspritebillboarding.value && !cv_glshearing.value && !papersprite)
|
if (billboarding)
|
||||||
{
|
{
|
||||||
// Get the x and z of the vertices so billboarding draws correctly
|
// Get the x and z of the vertices so billboarding draws correctly
|
||||||
realheight = realbot - realtop;
|
realheight = realbot - realtop;
|
||||||
@@ -3707,11 +3717,11 @@ static void HWR_SplitSprite(gl_vissprite_t *spr, const boolean papersprite)
|
|||||||
wallVerts[1].z = baseWallVerts[2].z + (baseWallVerts[2].z - baseWallVerts[1].z) * heightmult;
|
wallVerts[1].z = baseWallVerts[2].z + (baseWallVerts[2].z - baseWallVerts[1].z) * heightmult;
|
||||||
}
|
}
|
||||||
|
|
||||||
HWR_Lighting(&Surf, lightlevel, colormap, P_SectorUsesDirectionalLighting(sector) && !(sprmo->frame & FF_FULLBRIGHT));
|
HWR_Lighting(&Surf, lightlevel, colormap, P_SectorUsesDirectionalLighting(sector) && !R_ThingIsFullBright(sprmo));
|
||||||
|
|
||||||
Surf.PolyColor.s.alpha = alpha;
|
Surf.PolyColor.s.alpha = alpha;
|
||||||
|
|
||||||
HWR_ProcessPolygon(&Surf, wallVerts, 4, blend|PF_Modulated, shader, false); // sprite shader
|
HWR_ProcessPolygon(&Surf, wallVerts, 4, blend|PF_Modulated, shader, false);
|
||||||
|
|
||||||
top = bot;
|
top = bot;
|
||||||
endtop = endbot;
|
endtop = endbot;
|
||||||
@@ -3738,7 +3748,7 @@ static void HWR_SplitSprite(gl_vissprite_t *spr, const boolean papersprite)
|
|||||||
|
|
||||||
Surf.PolyColor.s.alpha = alpha;
|
Surf.PolyColor.s.alpha = alpha;
|
||||||
|
|
||||||
HWR_ProcessPolygon(&Surf, wallVerts, 4, blend|PF_Modulated, shader, false); // sprite shader
|
HWR_ProcessPolygon(&Surf, wallVerts, 4, blend|PF_Modulated, shader, false);
|
||||||
}
|
}
|
||||||
|
|
||||||
// -----------------+
|
// -----------------+
|
||||||
@@ -3761,7 +3771,7 @@ static void HWR_DrawSprite(gl_vissprite_t *spr)
|
|||||||
if (!sprmo->subsector)
|
if (!sprmo->subsector)
|
||||||
return;
|
return;
|
||||||
|
|
||||||
const boolean papersprite = (sprmo->frame & FF_PAPERSPRITE);
|
const boolean papersprite = R_ThingIsPaperSprite(sprmo);
|
||||||
const sector_t *sector = sprmo->subsector->sector;
|
const sector_t *sector = sprmo->subsector->sector;
|
||||||
|
|
||||||
if (sector->numlights)
|
if (sector->numlights)
|
||||||
@@ -3827,10 +3837,7 @@ static void HWR_DrawSprite(gl_vissprite_t *spr)
|
|||||||
}
|
}
|
||||||
|
|
||||||
// Draw shadow BEFORE sprite
|
// Draw shadow BEFORE sprite
|
||||||
if (UNLIKELY(cv_shadow.value // Shadows enabled
|
if (UNLIKELY(cv_shadow.value))
|
||||||
&& (sprmo->flags & (MF_SCENERY|MF_SPAWNCEILING|MF_NOGRAVITY)) != (MF_SCENERY|MF_SPAWNCEILING|MF_NOGRAVITY) // Ceiling scenery have no shadow.
|
|
||||||
&& !(sprmo->flags2 & MF2_DEBRIS) // Debris have no corona or shadow.
|
|
||||||
&& (sprmo->z >= sprmo->floorz))) // Without this, your shadow shows on the floor, even after you die and fall through the ground.
|
|
||||||
{
|
{
|
||||||
////////////////////
|
////////////////////
|
||||||
// SHADOW SPRITE! //
|
// SHADOW SPRITE! //
|
||||||
@@ -3920,7 +3927,7 @@ static void HWR_DrawPrecipitationSprite(gl_vissprite_t *spr)
|
|||||||
|
|
||||||
INT32 shader = SHADER_NONE;
|
INT32 shader = SHADER_NONE;
|
||||||
|
|
||||||
const precipmobj_t *sprmo = spr->precip;
|
precipmobj_t *sprmo = spr->precip;
|
||||||
|
|
||||||
if (!sprmo->subsector)
|
if (!sprmo->subsector)
|
||||||
return;
|
return;
|
||||||
@@ -3966,11 +3973,10 @@ static void HWR_DrawPrecipitationSprite(gl_vissprite_t *spr)
|
|||||||
|
|
||||||
if (sector->numlights)
|
if (sector->numlights)
|
||||||
{
|
{
|
||||||
INT32 light;
|
// Always use the light at the top instead of whatever I was doing before
|
||||||
|
INT32 light = R_GetPlaneLight(sector, sprmo->z, false); // sprmo->z + sprmo->height
|
||||||
|
|
||||||
light = R_GetPlaneLight(sector, sprmo->z, false); // Always use the light at the top instead of whatever I was doing before
|
if (!R_PrecipThingIsFullBright(sprmo))
|
||||||
|
|
||||||
if (!(sprmo->frame & FF_FULLBRIGHT))
|
|
||||||
lightlevel = static_cast<INT32>(*sector->lightlist[light].lightlevel);
|
lightlevel = static_cast<INT32>(*sector->lightlist[light].lightlevel);
|
||||||
|
|
||||||
if (sector->lightlist[light].extra_colormap)
|
if (sector->lightlist[light].extra_colormap)
|
||||||
@@ -3978,7 +3984,7 @@ static void HWR_DrawPrecipitationSprite(gl_vissprite_t *spr)
|
|||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
if (!(sprmo->frame & FF_FULLBRIGHT))
|
if (!R_PrecipThingIsFullBright(sprmo))
|
||||||
lightlevel = static_cast<INT32>(sector->lightlevel);
|
lightlevel = static_cast<INT32>(sector->lightlevel);
|
||||||
|
|
||||||
if (sector->extra_colormap)
|
if (sector->extra_colormap)
|
||||||
@@ -4562,7 +4568,7 @@ static void HWR_ProjectSprite(mobj_t *thing)
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
const boolean papersprite = (thing->frame & FF_PAPERSPRITE);
|
const boolean papersprite = R_ThingIsPaperSprite(thing);
|
||||||
|
|
||||||
// transform the origin point
|
// transform the origin point
|
||||||
tr_x = FixedToFloat(interp.x);
|
tr_x = FixedToFloat(interp.x);
|
||||||
@@ -4576,8 +4582,8 @@ static void HWR_ProjectSprite(mobj_t *thing)
|
|||||||
return;
|
return;
|
||||||
|
|
||||||
const boolean mirrored = thing->mirrored;
|
const boolean mirrored = thing->mirrored;
|
||||||
const boolean vflip = (thing->eflags & MFE_VERTICALFLIP);
|
const boolean vflip = R_ThingVerticallyFlipped(thing);
|
||||||
const boolean hflip = (!(thing->frame & FF_HORIZONTALFLIP) != !mirrored);
|
const boolean hflip = (!R_ThingHorizontallyFlipped(thing) != !mirrored);
|
||||||
|
|
||||||
// decide which patch to use for sprite relative to player
|
// decide which patch to use for sprite relative to player
|
||||||
#ifdef RANGECHECK
|
#ifdef RANGECHECK
|
||||||
@@ -4764,9 +4770,9 @@ static void HWR_ProjectSprite(mobj_t *thing)
|
|||||||
|
|
||||||
// if the sprite is out of our view, dont need to draw it X)
|
// if the sprite is out of our view, dont need to draw it X)
|
||||||
if (!gld_SphereInFrustum(
|
if (!gld_SphereInFrustum(
|
||||||
(FixedToFloat(interp.x)) + cos_inv_yaw * (x1 + x2) / 2.0f,
|
(FixedToFloat(interp.x)) + gl_viewsin * (x1 + x2) / 2.0f,
|
||||||
FixedToFloat(interp.z) + (y1 + y2) / 2.0f,
|
FixedToFloat(interp.z) + (y1 + y2) / 2.0f,
|
||||||
FixedToFloat(interp.y) - sin_inv_yaw * (x1 + x2) / 2.0f,
|
FixedToFloat(interp.y) - (-gl_viewcos) * (x1 + x2) / 2.0f,
|
||||||
//1.5 == sqrt(2) + small delta for MF_FOREGROUND
|
//1.5 == sqrt(2) + small delta for MF_FOREGROUND
|
||||||
std::max<float>(FixedToFloat(spr_width) * spritexscale,
|
std::max<float>(FixedToFloat(spr_width) * spritexscale,
|
||||||
FixedToFloat(spr_height) * spriteyscale) / 2.0f * 1.5f))
|
FixedToFloat(spr_height) * spriteyscale) / 2.0f * 1.5f))
|
||||||
@@ -4984,9 +4990,9 @@ static void HWR_ProjectPrecipitationSprite(precipmobj_t *thing)
|
|||||||
y2 *= thing_scale;
|
y2 *= thing_scale;
|
||||||
|
|
||||||
if (!gld_SphereInFrustum(
|
if (!gld_SphereInFrustum(
|
||||||
(FixedToFloat(interp.x)) + cos_inv_yaw * (x1 + x2) / 2.0f,
|
(FixedToFloat(interp.x)) + gl_viewsin * (x1 + x2) / 2.0f,
|
||||||
FixedToFloat(interp.z) + (y1 + y2) / 2.0f,
|
FixedToFloat(interp.z) + (y1 + y2) / 2.0f,
|
||||||
FixedToFloat(interp.y) - sin_inv_yaw * (x1 + x2) / 2.0f,
|
FixedToFloat(interp.y) - (-gl_viewcos) * (x1 + x2) / 2.0f,
|
||||||
//1.5 == sqrt(2) + small delta for MF_FOREGROUND
|
//1.5 == sqrt(2) + small delta for MF_FOREGROUND
|
||||||
std::max<float>(FixedToFloat(spr_width) * thing_scale,
|
std::max<float>(FixedToFloat(spr_width) * thing_scale,
|
||||||
FixedToFloat(spr_height) * thing_scale) / 2.0f * 1.5f))
|
FixedToFloat(spr_height) * thing_scale) / 2.0f * 1.5f))
|
||||||
@@ -5116,24 +5122,22 @@ void HWR_BuildSkyDome(void)
|
|||||||
int c, r;
|
int c, r;
|
||||||
signed char yflip;
|
signed char yflip;
|
||||||
static constexpr int row_count = 4;
|
static constexpr int row_count = 4;
|
||||||
int col_count = 4;
|
static constexpr int col_count = (4 * 16);
|
||||||
float delta;
|
float delta;
|
||||||
|
|
||||||
gl_sky_t *sky = &gl_sky;
|
gl_sky_t *sky = &gl_sky;
|
||||||
gl_skyvertex_t *vertex_p;
|
gl_skyvertex_t *vertex_p;
|
||||||
const texture_t *texture = textures[texturetranslation[skytexture]];
|
const texture_t *texture = textures[texturetranslation[skytexture]];
|
||||||
|
|
||||||
col_count *= 16;
|
|
||||||
|
|
||||||
if ((sky->columns != col_count) || (sky->rows != row_count))
|
if ((sky->columns != col_count) || (sky->rows != row_count))
|
||||||
HWR_ClearSkyDome();
|
HWR_ClearSkyDome();
|
||||||
|
|
||||||
sky->columns = col_count;
|
sky->columns = col_count;
|
||||||
sky->rows = row_count;
|
sky->rows = row_count;
|
||||||
sky->vertex_count = 2 * sky->rows * (sky->columns * 2 + 2) + sky->columns * 2;
|
sky->vertex_count = 2 * row_count * (col_count * 2 + 2) + col_count * 2;
|
||||||
|
|
||||||
if (!sky->loops)
|
if (!sky->loops)
|
||||||
sky->loops = static_cast<gl_skyloopdef_t*>(malloc((sky->rows * 2 + 2) * sizeof(sky->loops[0])));
|
sky->loops = static_cast<gl_skyloopdef_t*>(malloc((row_count * 2 + 2) * sizeof(sky->loops[0])));
|
||||||
|
|
||||||
// create vertex array
|
// create vertex array
|
||||||
if (!sky->data)
|
if (!sky->data)
|
||||||
@@ -5397,12 +5401,6 @@ void HWR_SetTransform(float fpov)
|
|||||||
HWR_SetTransformAiming(&atransform);
|
HWR_SetTransformAiming(&atransform);
|
||||||
atransform.angley = static_cast<float>(viewangle >> ANGLETOFINESHIFT)*(FINEDEGREE);
|
atransform.angley = static_cast<float>(viewangle >> ANGLETOFINESHIFT)*(FINEDEGREE);
|
||||||
|
|
||||||
yaw = 270.0f - atransform.angley;
|
|
||||||
inv_yaw = 180.0f - yaw;
|
|
||||||
const float inv_yaw_radians = inv_yaw * deg2radians;
|
|
||||||
cos_inv_yaw = cosf(inv_yaw_radians);
|
|
||||||
sin_inv_yaw = sinf(inv_yaw_radians);
|
|
||||||
|
|
||||||
// only needed for sprite billboarding
|
// only needed for sprite billboarding
|
||||||
if (cv_glspritebillboarding.value && !cv_glshearing.value)
|
if (cv_glspritebillboarding.value && !cv_glshearing.value)
|
||||||
{
|
{
|
||||||
@@ -5465,6 +5463,8 @@ static void HWR_RenderViewpoint(gl_portal_t *rootportal, int stencil_level, bool
|
|||||||
{
|
{
|
||||||
gl_portallist_t portallist;
|
gl_portallist_t portallist;
|
||||||
|
|
||||||
|
const boolean wireframe = HWR_IsWireframeMode();
|
||||||
|
|
||||||
player_t *viewplayer = &players[displayplayers[viewssnum]];
|
player_t *viewplayer = &players[displayplayers[viewssnum]];
|
||||||
const float fpov = FixedToFloat(R_GetPlayerFov(viewplayer));
|
const float fpov = FixedToFloat(R_GetPlayerFov(viewplayer));
|
||||||
|
|
||||||
@@ -5525,7 +5525,7 @@ static void HWR_RenderViewpoint(gl_portal_t *rootportal, int stencil_level, bool
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if (HWR_IsWireframeMode())
|
if (wireframe)
|
||||||
GL_SetSpecialState(HWD_SET_WIREFRAME, 1);
|
GL_SetSpecialState(HWD_SET_WIREFRAME, 1);
|
||||||
|
|
||||||
// FIXME: perfstats does not account for portal rendering!
|
// FIXME: perfstats does not account for portal rendering!
|
||||||
@@ -5540,7 +5540,8 @@ static void HWR_RenderViewpoint(gl_portal_t *rootportal, int stencil_level, bool
|
|||||||
|
|
||||||
if constexpr (Type == RenderViewpointType::kPortal)
|
if constexpr (Type == RenderViewpointType::kPortal)
|
||||||
{
|
{
|
||||||
gl_collect_skywalls = (allow_portals && !rootportal && portallist.base && (!skyboxmo[0] || !cv_skybox.value)); // if portals have been drawn in the main view, then render skywalls differently
|
// if portals have been drawn in the main view, then render skywalls differently
|
||||||
|
gl_collect_skywalls = (allow_portals && !rootportal && portallist.base && (!skyboxmo[0] || !cv_skybox.value));
|
||||||
|
|
||||||
// HAYA: Save the old portal state, and turn portals off while normally rendering the BSP tree.
|
// HAYA: Save the old portal state, and turn portals off while normally rendering the BSP tree.
|
||||||
// This fixes specific effects not working, such as horizon lines.
|
// This fixes specific effects not working, such as horizon lines.
|
||||||
@@ -5610,7 +5611,7 @@ static void HWR_RenderViewpoint(gl_portal_t *rootportal, int stencil_level, bool
|
|||||||
|
|
||||||
HWR_RenderDrawNodes();
|
HWR_RenderDrawNodes();
|
||||||
|
|
||||||
if (HWR_IsWireframeMode())
|
if (wireframe)
|
||||||
GL_SetSpecialState(HWD_SET_WIREFRAME, 0);
|
GL_SetSpecialState(HWD_SET_WIREFRAME, 0);
|
||||||
|
|
||||||
HWR_FreePortalList(portallist); // always call this just in case
|
HWR_FreePortalList(portallist); // always call this just in case
|
||||||
@@ -5999,6 +6000,10 @@ static void HWR_RenderWall(FOutVector *wallVerts, FSurfaceInfo *pSurf, FBITFIELD
|
|||||||
|
|
||||||
static void HWR_DoPostProcessor(void)
|
static void HWR_DoPostProcessor(void)
|
||||||
{
|
{
|
||||||
|
// no flashes or screen waving if we want less vfx!
|
||||||
|
if (cv_reducevfx.value)
|
||||||
|
return;
|
||||||
|
|
||||||
// Armageddon Blast Flash!
|
// Armageddon Blast Flash!
|
||||||
// Could this even be considered postprocessor?
|
// Could this even be considered postprocessor?
|
||||||
if (!HWR_ShouldUsePaletteRendering())
|
if (!HWR_ShouldUsePaletteRendering())
|
||||||
@@ -6038,7 +6043,7 @@ static void HWR_DoPostProcessor(void)
|
|||||||
return;
|
return;
|
||||||
|
|
||||||
// Not supported in splitscreen - someone want to add support?
|
// Not supported in splitscreen - someone want to add support?
|
||||||
if (splitscreen || cv_reducevfx.value)
|
if (splitscreen)
|
||||||
return;
|
return;
|
||||||
|
|
||||||
//UINT8 viewnum = R_GetViewNumber();
|
//UINT8 viewnum = R_GetViewNumber();
|
||||||
@@ -6096,44 +6101,60 @@ static void HWR_DoPostProcessor(void)
|
|||||||
// Flipping of the screen isn't done here anymore
|
// Flipping of the screen isn't done here anymore
|
||||||
}
|
}
|
||||||
|
|
||||||
void HWR_DoWipe(UINT8 wipenum, UINT8 scrnnum)
|
//
|
||||||
|
// wipes
|
||||||
|
//
|
||||||
|
static lumpnum_t wipelumpnum;
|
||||||
|
|
||||||
|
// puts wipe lumpname in wipename[9]
|
||||||
|
static boolean HWR_WipeCheck(UINT8 wipenum, UINT8 scrnnum)
|
||||||
{
|
{
|
||||||
static char lumpname[9] = "FADEmmss";
|
static char lumpname[9] = "FADEmmss";
|
||||||
lumpnum_t lumpnum;
|
|
||||||
size_t lsize;
|
size_t lsize;
|
||||||
|
|
||||||
|
// screen textures disabled completely
|
||||||
if (cv_glscreentextures.value == 0)
|
if (cv_glscreentextures.value == 0)
|
||||||
{
|
{
|
||||||
V_DrawFill(0, 0, BASEVIDWIDTH, BASEVIDHEIGHT, 31); // just draw a black screen instead of flashing and crap
|
return false;
|
||||||
return;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
if (wipenum > 99 || scrnnum > 99) // not a valid wipe number
|
// not a valid wipe number
|
||||||
|
if (wipenum > 99 || scrnnum > 99)
|
||||||
{
|
{
|
||||||
V_DrawFill(0, 0, BASEVIDWIDTH, BASEVIDHEIGHT, 31); // just draw a black screen instead of flashing and crap
|
return false; // shouldn't end up here really, the loop should've stopped running beforehand
|
||||||
return; // shouldn't end up here really, the loop should've stopped running beforehand
|
|
||||||
}
|
}
|
||||||
|
|
||||||
// puts the numbers into the lumpname
|
// puts the numbers into the lumpname
|
||||||
sprintf(&lumpname[4], "%.2hu%.2hu", (UINT16)wipenum, (UINT16)scrnnum);
|
snprintf(&lumpname[4], sizeof(lumpname) - 4, "%.2hu%.2hu", (UINT16)wipenum, (UINT16)scrnnum);
|
||||||
lumpnum = W_CheckNumForName(lumpname);
|
wipelumpnum = W_CheckNumForName(lumpname);
|
||||||
|
|
||||||
if (lumpnum == LUMPERROR) // again, shouldn't be here really
|
// again, shouldn't be here really
|
||||||
|
if (wipelumpnum == LUMPERROR)
|
||||||
{
|
{
|
||||||
V_DrawFill(0, 0, BASEVIDWIDTH, BASEVIDHEIGHT, 31); // just draw a black screen instead of flashing and crap
|
return false;
|
||||||
return;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
lsize = W_LumpLength(lumpnum);
|
lsize = W_LumpLength(wipelumpnum);
|
||||||
|
|
||||||
if (!(lsize == 256000 || lsize == 64000 || lsize == 16000 || lsize == 4000))
|
if (!(lsize == 256000 || lsize == 64000 || lsize == 16000 || lsize == 4000))
|
||||||
{
|
{
|
||||||
CONS_Alert(CONS_WARNING, "Fade mask lump %s of incorrect size, ignored\n", lumpname);
|
CONS_Alert(CONS_WARNING, "Fade mask lump %s of incorrect size, ignored\n", lumpname);
|
||||||
V_DrawFill(0, 0, BASEVIDWIDTH, BASEVIDHEIGHT, 31); // just draw a black screen instead of flashing and crap
|
return false; // again, shouldn't get here if it is a bad size
|
||||||
return; // again, shouldn't get here if it is a bad size
|
|
||||||
}
|
}
|
||||||
|
|
||||||
HWR_GetFadeMask(lumpnum);
|
return true;
|
||||||
|
}
|
||||||
|
|
||||||
|
void HWR_DoWipe(UINT8 wipenum, UINT8 scrnnum)
|
||||||
|
{
|
||||||
|
if (!HWR_WipeCheck(wipenum, scrnnum))
|
||||||
|
{
|
||||||
|
// just draw a black screen instead of rapidly flashing a white screen
|
||||||
|
V_DrawFill(0, 0, BASEVIDWIDTH, BASEVIDHEIGHT, 31);
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
HWR_GetFadeMask(wipelumpnum);
|
||||||
GL_DoScreenWipe(HWD_SCREENTEXTURE_WIPE_START, HWD_SCREENTEXTURE_WIPE_END);
|
GL_DoScreenWipe(HWD_SCREENTEXTURE_WIPE_START, HWD_SCREENTEXTURE_WIPE_END);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -1153,8 +1153,11 @@ void HWR_DrawMD2(gl_vissprite_t *spr)
|
|||||||
INT32 durs = spr->mobj->state->tics;
|
INT32 durs = spr->mobj->state->tics;
|
||||||
INT32 tics = spr->mobj->tics;
|
INT32 tics = spr->mobj->tics;
|
||||||
//mdlframe_t *next = NULL;
|
//mdlframe_t *next = NULL;
|
||||||
|
|
||||||
|
//const UINT8 flip = (UINT8)(!(spr->mobj->eflags & MFE_VERTICALFLIP) != !R_ThingVerticallyFlipped(spr->mobj)); // :chaosleep:
|
||||||
const UINT8 flip = (UINT8)((spr->mobj->eflags & MFE_VERTICALFLIP) == MFE_VERTICALFLIP);
|
const UINT8 flip = (UINT8)((spr->mobj->eflags & MFE_VERTICALFLIP) == MFE_VERTICALFLIP);
|
||||||
const UINT8 hflip = (UINT8)(!(spr->mobj->mirrored) != !(spr->mobj->frame & FF_HORIZONTALFLIP));
|
const UINT8 hflip = (UINT8)(!(spr->mobj->mirrored) != !R_ThingHorizontallyFlipped(spr->mobj));
|
||||||
|
|
||||||
spritedef_t *sprdef;
|
spritedef_t *sprdef;
|
||||||
spriteframe_t *sprframe;
|
spriteframe_t *sprframe;
|
||||||
spriteinfo_t *sprinfo;
|
spriteinfo_t *sprinfo;
|
||||||
@@ -1244,7 +1247,7 @@ void HWR_DrawMD2(gl_vissprite_t *spr)
|
|||||||
if (!md2->model)
|
if (!md2->model)
|
||||||
{
|
{
|
||||||
CONS_Debug(DBG_RENDER, "Loading model... (%s, %s)", sprnames[spr->mobj->sprite], md2->filename);
|
CONS_Debug(DBG_RENDER, "Loading model... (%s, %s)", sprnames[spr->mobj->sprite], md2->filename);
|
||||||
sprintf(filename, "mdls/%s", md2->filename);
|
snprintf(filename, sizeof(filename), "mdls/%s", md2->filename);
|
||||||
md2->model = md2_readModel(filename);
|
md2->model = md2_readModel(filename);
|
||||||
|
|
||||||
if (md2->model)
|
if (md2->model)
|
||||||
@@ -1480,7 +1483,7 @@ void HWR_Draw2DModel(md2_t *md2, INT32 x, INT32 y, INT32 skinnum, skincolors_t c
|
|||||||
{
|
{
|
||||||
char filename[64];
|
char filename[64];
|
||||||
CONS_Debug(DBG_RENDER, "Loading model... (%s)\n", md2->filename);
|
CONS_Debug(DBG_RENDER, "Loading model... (%s)\n", md2->filename);
|
||||||
sprintf(filename, "mdls/%s", md2->filename);
|
snprintf(filename, sizeof(filename), "mdls/%s", md2->filename);
|
||||||
md2->model = md2_readModel(filename);
|
md2->model = md2_readModel(filename);
|
||||||
|
|
||||||
if (md2->model)
|
if (md2->model)
|
||||||
|
|||||||
@@ -275,13 +275,6 @@ model_t *MD2_LoadModel(const char *fileName, int ztag, boolean useFloat)
|
|||||||
return NULL;
|
return NULL;
|
||||||
|
|
||||||
retModel = (model_t*)Z_Calloc(sizeof(model_t), ztag, NULL);
|
retModel = (model_t*)Z_Calloc(sizeof(model_t), ztag, NULL);
|
||||||
|
|
||||||
//size_t fileLen;
|
|
||||||
|
|
||||||
//int i, j;
|
|
||||||
|
|
||||||
//size_t namelen;
|
|
||||||
//char *texturefilename;
|
|
||||||
texPos = strchr(fileName, '/');
|
texPos = strchr(fileName, '/');
|
||||||
|
|
||||||
if (texPos)
|
if (texPos)
|
||||||
@@ -318,8 +311,6 @@ model_t *MD2_LoadModel(const char *fileName, int ztag, boolean useFloat)
|
|||||||
retModel->numMeshes = 1; // MD2 only has one mesh
|
retModel->numMeshes = 1; // MD2 only has one mesh
|
||||||
retModel->meshes = (mesh_t*)Z_Calloc(sizeof(mesh_t) * retModel->numMeshes, ztag, NULL);
|
retModel->meshes = (mesh_t*)Z_Calloc(sizeof(mesh_t) * retModel->numMeshes, ztag, NULL);
|
||||||
retModel->meshes[0].numFrames = header->numFrames;
|
retModel->meshes[0].numFrames = header->numFrames;
|
||||||
// const float WUNITS = 1.0f;
|
|
||||||
// float dataScale = WUNITS;
|
|
||||||
|
|
||||||
// Tris and ST are simple structures that can be straight-copied
|
// Tris and ST are simple structures that can be straight-copied
|
||||||
tris = (md2triangle_t*)&buffer[header->offsetTris];
|
tris = (md2triangle_t*)&buffer[header->offsetTris];
|
||||||
@@ -355,47 +346,6 @@ model_t *MD2_LoadModel(const char *fileName, int ztag, boolean useFloat)
|
|||||||
retModel->materials[t].specular[3] = 1.0f;
|
retModel->materials[t].specular[3] = 1.0f;
|
||||||
retModel->materials[t].shininess = 0.0f;
|
retModel->materials[t].shininess = 0.0f;
|
||||||
retModel->materials[t].spheremap = false;
|
retModel->materials[t].spheremap = false;
|
||||||
|
|
||||||
/* retModel->materials[t].texture = Texture::ReadTexture((char*)texturefilename, ZT_TEXTURE);
|
|
||||||
|
|
||||||
if (!systemSucks)
|
|
||||||
{
|
|
||||||
// Check for a normal map...??
|
|
||||||
char openfilename[1024];
|
|
||||||
char normalMapName[1024];
|
|
||||||
strcpy(normalMapName, texturefilename);
|
|
||||||
size_t len = strlen(normalMapName);
|
|
||||||
char *ptr = &normalMapName[len];
|
|
||||||
ptr--; // z
|
|
||||||
ptr--; // u
|
|
||||||
ptr--; // b
|
|
||||||
ptr--; // .
|
|
||||||
*ptr++ = '_';
|
|
||||||
*ptr++ = 'n';
|
|
||||||
*ptr++ = '.';
|
|
||||||
*ptr++ = 'b';
|
|
||||||
*ptr++ = 'u';
|
|
||||||
*ptr++ = 'z';
|
|
||||||
*ptr++ = '\0';
|
|
||||||
|
|
||||||
sprintf(openfilename, "%s/%s", "textures", normalMapName);
|
|
||||||
// Convert backslashes to forward slashes
|
|
||||||
for (int k = 0; k < 1024; k++)
|
|
||||||
{
|
|
||||||
if (openfilename[k] == '\0')
|
|
||||||
break;
|
|
||||||
|
|
||||||
if (openfilename[k] == '\\')
|
|
||||||
openfilename[k] = '/';
|
|
||||||
}
|
|
||||||
|
|
||||||
Resource::resource_t *res = Resource::Open(openfilename);
|
|
||||||
if (res)
|
|
||||||
{
|
|
||||||
Resource::Close(res);
|
|
||||||
retModel->materials[t].lightmap = Texture::ReadTexture(normalMapName, ZT_TEXTURE);
|
|
||||||
}
|
|
||||||
}*/
|
|
||||||
}
|
}
|
||||||
|
|
||||||
retModel->meshes[0].numTriangles = header->numTris;
|
retModel->meshes[0].numTriangles = header->numTris;
|
||||||
@@ -425,15 +375,11 @@ model_t *MD2_LoadModel(const char *fileName, int ztag, boolean useFloat)
|
|||||||
md2frame_t *framePtr = (md2frame_t*)ptr;
|
md2frame_t *framePtr = (md2frame_t*)ptr;
|
||||||
retModel->meshes[0].tinyframes[i].vertices = (short*)Z_Malloc(sizeof(short) * 3 * header->numXYZ, ztag, NULL);
|
retModel->meshes[0].tinyframes[i].vertices = (short*)Z_Malloc(sizeof(short) * 3 * header->numXYZ, ztag, NULL);
|
||||||
retModel->meshes[0].tinyframes[i].normals = (char*)Z_Malloc(sizeof(char) * 3 * header->numXYZ, ztag, NULL);
|
retModel->meshes[0].tinyframes[i].normals = (char*)Z_Malloc(sizeof(char) * 3 * header->numXYZ, ztag, NULL);
|
||||||
|
|
||||||
// if (retModel->materials[0].lightmap)
|
|
||||||
// retModel->meshes[0].tinyframes[i].tangents = (char*)malloc(sizeof(char));//(char*)Z_Malloc(sizeof(char)*3*header->numVerts, ztag);
|
|
||||||
retModel->meshes[0].indices = (unsigned short*)Z_Malloc(sizeof(unsigned short) * 3 * header->numTris, ztag, NULL);
|
retModel->meshes[0].indices = (unsigned short*)Z_Malloc(sizeof(unsigned short) * 3 * header->numTris, ztag, NULL);
|
||||||
|
|
||||||
vertptr = retModel->meshes[0].tinyframes[i].vertices;
|
vertptr = retModel->meshes[0].tinyframes[i].vertices;
|
||||||
normptr = retModel->meshes[0].tinyframes[i].normals;
|
normptr = retModel->meshes[0].tinyframes[i].normals;
|
||||||
|
|
||||||
// tanptr = retModel->meshes[0].tinyframes[i].tangents;
|
|
||||||
retModel->meshes[0].tinyframes[i].material = &retModel->materials[0];
|
retModel->meshes[0].tinyframes[i].material = &retModel->materials[0];
|
||||||
|
|
||||||
framePtr++; // Advance to vertex list
|
framePtr++; // Advance to vertex list
|
||||||
@@ -509,9 +455,7 @@ model_t *MD2_LoadModel(const char *fileName, int ztag, boolean useFloat)
|
|||||||
md2frame_t *framePtr = (md2frame_t*)ptr;
|
md2frame_t *framePtr = (md2frame_t*)ptr;
|
||||||
retModel->meshes[0].frames[i].normals = (float*)Z_Malloc(sizeof(float) * 3 * header->numTris * 3, ztag, NULL);
|
retModel->meshes[0].frames[i].normals = (float*)Z_Malloc(sizeof(float) * 3 * header->numTris * 3, ztag, NULL);
|
||||||
retModel->meshes[0].frames[i].vertices = (float*)Z_Malloc(sizeof(float) * 3 * header->numTris * 3, ztag, NULL);
|
retModel->meshes[0].frames[i].vertices = (float*)Z_Malloc(sizeof(float) * 3 * header->numTris * 3, ztag, NULL);
|
||||||
// if (retModel->materials[0].lightmap)
|
|
||||||
// retModel->meshes[0].frames[i].tangents = (float*)malloc(sizeof(float));//(float*)Z_Malloc(sizeof(float)*3*header->numTris*3, ztag);
|
|
||||||
//float *vertptr, *normptr;
|
|
||||||
normptr = (float*)retModel->meshes[0].frames[i].normals;
|
normptr = (float*)retModel->meshes[0].frames[i].normals;
|
||||||
vertptr = (float*)retModel->meshes[0].frames[i].vertices;
|
vertptr = (float*)retModel->meshes[0].frames[i].vertices;
|
||||||
trisPtr = tris;
|
trisPtr = tris;
|
||||||
|
|||||||
@@ -243,48 +243,6 @@ model_t *MD3_LoadModel(const char *fileName, int ztag, boolean useFloat)
|
|||||||
mdShader[j].name[len-1] = 'z';
|
mdShader[j].name[len-1] = 'z';
|
||||||
mdShader[j].name[len-2] = 'u';
|
mdShader[j].name[len-2] = 'u';
|
||||||
mdShader[j].name[len-3] = 'b';
|
mdShader[j].name[len-3] = 'b';
|
||||||
|
|
||||||
// Load material
|
|
||||||
/* retModel->materials[matCount].texture = Texture::ReadTexture(mdShader[j].name, ZT_TEXTURE);
|
|
||||||
|
|
||||||
if (!systemSucks)
|
|
||||||
{
|
|
||||||
// Check for a normal map...??
|
|
||||||
char openfilename[1024];
|
|
||||||
char normalMapName[1024];
|
|
||||||
strcpy(normalMapName, mdShader[j].name);
|
|
||||||
len = strlen(normalMapName);
|
|
||||||
char *ptr = &normalMapName[len];
|
|
||||||
ptr--; // z
|
|
||||||
ptr--; // u
|
|
||||||
ptr--; // b
|
|
||||||
ptr--; // .
|
|
||||||
*ptr++ = '_';
|
|
||||||
*ptr++ = 'n';
|
|
||||||
*ptr++ = '.';
|
|
||||||
*ptr++ = 'b';
|
|
||||||
*ptr++ = 'u';
|
|
||||||
*ptr++ = 'z';
|
|
||||||
*ptr++ = '\0';
|
|
||||||
|
|
||||||
sprintf(openfilename, "%s/%s", "textures", normalMapName);
|
|
||||||
// Convert backslashes to forward slashes
|
|
||||||
for (int k = 0; k < 1024; k++)
|
|
||||||
{
|
|
||||||
if (openfilename[k] == '\0')
|
|
||||||
break;
|
|
||||||
|
|
||||||
if (openfilename[k] == '\\')
|
|
||||||
openfilename[k] = '/';
|
|
||||||
}
|
|
||||||
|
|
||||||
Resource::resource_t *res = Resource::Open(openfilename);
|
|
||||||
if (res)
|
|
||||||
{
|
|
||||||
Resource::Close(res);
|
|
||||||
retModel->materials[matCount].lightmap = Texture::ReadTexture(normalMapName, ZT_TEXTURE);
|
|
||||||
}
|
|
||||||
}*/
|
|
||||||
}
|
}
|
||||||
|
|
||||||
retModel->meshes[i].numFrames = mdS->numFrames;
|
retModel->meshes[i].numFrames = mdS->numFrames;
|
||||||
@@ -305,19 +263,15 @@ model_t *MD3_LoadModel(const char *fileName, int ztag, boolean useFloat)
|
|||||||
{
|
{
|
||||||
short *vertptr;
|
short *vertptr;
|
||||||
char *normptr;
|
char *normptr;
|
||||||
// char *tanptr;
|
|
||||||
int k;
|
int k;
|
||||||
md3Vertex *mdV = (md3Vertex*)((char*)mdS + mdS->offsetXYZNormal + (mdS->numVerts*j*sizeof(md3Vertex)));
|
md3Vertex *mdV = (md3Vertex*)((char*)mdS + mdS->offsetXYZNormal + (mdS->numVerts*j*sizeof(md3Vertex)));
|
||||||
retModel->meshes[i].tinyframes[j].vertices = (short*)Z_Malloc(sizeof(short)*3*mdS->numVerts, ztag, NULL);
|
retModel->meshes[i].tinyframes[j].vertices = (short*)Z_Malloc(sizeof(short)*3*mdS->numVerts, ztag, NULL);
|
||||||
retModel->meshes[i].tinyframes[j].normals = (char*)Z_Malloc(sizeof(char)*3*mdS->numVerts, ztag, NULL);
|
retModel->meshes[i].tinyframes[j].normals = (char*)Z_Malloc(sizeof(char)*3*mdS->numVerts, ztag, NULL);
|
||||||
|
|
||||||
// if (retModel->materials[0].lightmap)
|
|
||||||
// retModel->meshes[i].tinyframes[j].tangents = (char*)malloc(sizeof(char));//(char*)Z_Malloc(sizeof(char)*3*mdS->numVerts, ztag);
|
|
||||||
retModel->meshes[i].indices = (unsigned short*)Z_Malloc(sizeof(unsigned short) * 3 * mdS->numTriangles, ztag, NULL);
|
retModel->meshes[i].indices = (unsigned short*)Z_Malloc(sizeof(unsigned short) * 3 * mdS->numTriangles, ztag, NULL);
|
||||||
vertptr = retModel->meshes[i].tinyframes[j].vertices;
|
vertptr = retModel->meshes[i].tinyframes[j].vertices;
|
||||||
normptr = retModel->meshes[i].tinyframes[j].normals;
|
normptr = retModel->meshes[i].tinyframes[j].normals;
|
||||||
|
|
||||||
// tanptr = retModel->meshes[i].tinyframes[j].tangents;
|
|
||||||
retModel->meshes[i].tinyframes[j].material = &retModel->materials[i];
|
retModel->meshes[i].tinyframes[j].material = &retModel->materials[i];
|
||||||
|
|
||||||
for (k = 0; k < mdS->numVerts; k++)
|
for (k = 0; k < mdS->numVerts; k++)
|
||||||
@@ -384,8 +338,7 @@ model_t *MD3_LoadModel(const char *fileName, int ztag, boolean useFloat)
|
|||||||
md3Vertex *mdV = (md3Vertex*)((char*)mdS + mdS->offsetXYZNormal + (mdS->numVerts*j*sizeof(md3Vertex)));
|
md3Vertex *mdV = (md3Vertex*)((char*)mdS + mdS->offsetXYZNormal + (mdS->numVerts*j*sizeof(md3Vertex)));
|
||||||
retModel->meshes[i].frames[j].vertices = (float*)Z_Malloc(sizeof(float)*3*mdS->numTriangles*3, ztag, NULL);
|
retModel->meshes[i].frames[j].vertices = (float*)Z_Malloc(sizeof(float)*3*mdS->numTriangles*3, ztag, NULL);
|
||||||
retModel->meshes[i].frames[j].normals = (float*)Z_Malloc(sizeof(float)*3*mdS->numTriangles*3, ztag, NULL);
|
retModel->meshes[i].frames[j].normals = (float*)Z_Malloc(sizeof(float)*3*mdS->numTriangles*3, ztag, NULL);
|
||||||
// if (retModel->materials[i].lightmap)
|
|
||||||
// retModel->meshes[i].frames[j].tangents = (float*)malloc(sizeof(float));//(float*)Z_Malloc(sizeof(float)*3*mdS->numTriangles*3, ztag);
|
|
||||||
vertptr = retModel->meshes[i].frames[j].vertices;
|
vertptr = retModel->meshes[i].frames[j].vertices;
|
||||||
normptr = retModel->meshes[i].frames[j].normals;
|
normptr = retModel->meshes[i].frames[j].normals;
|
||||||
retModel->meshes[i].frames[j].material = &retModel->materials[i];
|
retModel->meshes[i].frames[j].material = &retModel->materials[i];
|
||||||
@@ -471,37 +424,6 @@ model_t *MD3_LoadModel(const char *fileName, int ztag, boolean useFloat)
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
/*
|
|
||||||
// Tags?
|
|
||||||
retModel->numTags = mdh->numTags;
|
|
||||||
retModel->maxNumFrames = mdh->numFrames;
|
|
||||||
retModel->tags = (tag_t*)Z_Calloc(sizeof(tag_t) * retModel->numTags * mdh->numFrames, ztag);
|
|
||||||
md3Tag *mdTag = (md3Tag*)&buffer[mdh->offsetTags];
|
|
||||||
tag_t *curTag = retModel->tags;
|
|
||||||
for (i = 0; i < mdh->numFrames; i++)
|
|
||||||
{
|
|
||||||
int j;
|
|
||||||
for (j = 0; j < retModel->numTags; j++, mdTag++)
|
|
||||||
{
|
|
||||||
strcpys(curTag->name, mdTag->name, sizeof(curTag->name) / sizeof(char));
|
|
||||||
curTag->transform.m[0][0] = mdTag->axis[0];
|
|
||||||
curTag->transform.m[0][1] = mdTag->axis[1];
|
|
||||||
curTag->transform.m[0][2] = mdTag->axis[2];
|
|
||||||
curTag->transform.m[1][0] = mdTag->axis[3];
|
|
||||||
curTag->transform.m[1][1] = mdTag->axis[4];
|
|
||||||
curTag->transform.m[1][2] = mdTag->axis[5];
|
|
||||||
curTag->transform.m[2][0] = mdTag->axis[6];
|
|
||||||
curTag->transform.m[2][1] = mdTag->axis[7];
|
|
||||||
curTag->transform.m[2][2] = mdTag->axis[8];
|
|
||||||
curTag->transform.m[3][0] = mdTag->origin[0] * WUNITS;
|
|
||||||
curTag->transform.m[3][1] = mdTag->origin[1] * WUNITS;
|
|
||||||
curTag->transform.m[3][2] = mdTag->origin[2] * WUNITS;
|
|
||||||
curTag->transform.m[3][3] = 1.0f;
|
|
||||||
|
|
||||||
Matrix::Rotate(&curTag->transform, 90.0f, &Vector::Xaxis);
|
|
||||||
curTag++;
|
|
||||||
}
|
|
||||||
}*/
|
|
||||||
|
|
||||||
free(buffer);
|
free(buffer);
|
||||||
|
|
||||||
|
|||||||
@@ -1,549 +0,0 @@
|
|||||||
// Emacs style mode select -*- C++ -*-
|
|
||||||
//-----------------------------------------------------------------------------
|
|
||||||
//
|
|
||||||
// Copyright (C) 1998-2000 by DooM Legacy Team.
|
|
||||||
//
|
|
||||||
// This program is free software; you can redistribute it and/or
|
|
||||||
// modify it under the terms of the GNU General Public License
|
|
||||||
// as published by the Free Software Foundation; either version 2
|
|
||||||
// of the License, or (at your option) any later version.
|
|
||||||
//
|
|
||||||
// This program is distributed in the hope that it will be useful,
|
|
||||||
// but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
||||||
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
||||||
// GNU General Public License for more details.
|
|
||||||
//
|
|
||||||
//-----------------------------------------------------------------------------
|
|
||||||
/// \file
|
|
||||||
/// \brief Windows specific part of the OpenGL API for Doom Legacy
|
|
||||||
///
|
|
||||||
/// TODO:
|
|
||||||
/// - check if windowed mode works
|
|
||||||
/// - support different pixel formats
|
|
||||||
|
|
||||||
|
|
||||||
#if defined (_WIN32)
|
|
||||||
|
|
||||||
//#define WIN32_LEAN_AND_MEAN
|
|
||||||
#define RPC_NO_WINDOWS_H
|
|
||||||
#include <windows.h>
|
|
||||||
#include <time.h>
|
|
||||||
#include "r_opengl.h"
|
|
||||||
|
|
||||||
|
|
||||||
// **************************************************************************
|
|
||||||
// GLOBALS
|
|
||||||
// **************************************************************************
|
|
||||||
|
|
||||||
#ifdef DEBUG_TO_FILE
|
|
||||||
static unsigned long nb_frames = 0;
|
|
||||||
static clock_t my_clock;
|
|
||||||
FILE *gllogstream;
|
|
||||||
#endif
|
|
||||||
|
|
||||||
static HDC hDC = NULL; // the window's device context
|
|
||||||
static HGLRC hGLRC = NULL; // the OpenGL rendering context
|
|
||||||
static HWND hWnd = NULL;
|
|
||||||
static BOOL WasFullScreen = FALSE;
|
|
||||||
static void UnSetRes(void);
|
|
||||||
|
|
||||||
#ifdef USE_WGL_SWAP
|
|
||||||
PFNWGLEXTSWAPCONTROLPROC wglSwapIntervalEXT = NULL;
|
|
||||||
#endif
|
|
||||||
|
|
||||||
PFNglClear pglClear;
|
|
||||||
PFNglGetIntegerv pglGetIntegerv;
|
|
||||||
PFNglGetString pglGetString;
|
|
||||||
|
|
||||||
#define MAX_VIDEO_MODES 32
|
|
||||||
static vmode_t video_modes[MAX_VIDEO_MODES];
|
|
||||||
INT32 oglflags = 0;
|
|
||||||
|
|
||||||
// **************************************************************************
|
|
||||||
// FUNCTIONS
|
|
||||||
// **************************************************************************
|
|
||||||
|
|
||||||
// -----------------+
|
|
||||||
// APIENTRY DllMain : DLL Entry Point,
|
|
||||||
// : open/close debug log
|
|
||||||
// Returns :
|
|
||||||
// -----------------+
|
|
||||||
BOOL WINAPI DllMain(HINSTANCE hinstDLL, // handle to DLL module
|
|
||||||
DWORD fdwReason, // reason for calling function
|
|
||||||
LPVOID lpvReserved) // reserved
|
|
||||||
{
|
|
||||||
// Perform actions based on the reason for calling.
|
|
||||||
UNREFERENCED_PARAMETER(lpvReserved);
|
|
||||||
switch (fdwReason)
|
|
||||||
{
|
|
||||||
case DLL_PROCESS_ATTACH:
|
|
||||||
// Initialize once for each new process.
|
|
||||||
// Return FALSE to fail DLL load.
|
|
||||||
#ifdef DEBUG_TO_FILE
|
|
||||||
gllogstream = fopen("ogllog.txt", "wt");
|
|
||||||
if (gllogstream == NULL)
|
|
||||||
return FALSE;
|
|
||||||
#endif
|
|
||||||
DisableThreadLibraryCalls(hinstDLL);
|
|
||||||
break;
|
|
||||||
|
|
||||||
case DLL_THREAD_ATTACH:
|
|
||||||
// Do thread-specific initialization.
|
|
||||||
break;
|
|
||||||
|
|
||||||
case DLL_THREAD_DETACH:
|
|
||||||
// Do thread-specific cleanup.
|
|
||||||
break;
|
|
||||||
|
|
||||||
case DLL_PROCESS_DETACH:
|
|
||||||
// Perform any necessary cleanup.
|
|
||||||
#ifdef DEBUG_TO_FILE
|
|
||||||
if (gllogstream)
|
|
||||||
{
|
|
||||||
fclose(gllogstream);
|
|
||||||
gllogstream = NULL;
|
|
||||||
}
|
|
||||||
#endif
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
|
|
||||||
return TRUE; // Successful DLL_PROCESS_ATTACH.
|
|
||||||
}
|
|
||||||
|
|
||||||
#ifdef STATIC_OPENGL
|
|
||||||
#define pwglGetProcAddress wglGetProcAddress;
|
|
||||||
#define pwglCreateContext wglCreateContext;
|
|
||||||
#define pwglDeleteContext wglDeleteContext;
|
|
||||||
#define pwglMakeCurrent wglMakeCurrent;
|
|
||||||
#else
|
|
||||||
static HMODULE OGL32;
|
|
||||||
typedef void *(WINAPI *PFNwglGetProcAddress) (const char *);
|
|
||||||
static PFNwglGetProcAddress pwglGetProcAddress;
|
|
||||||
typedef HGLRC (WINAPI *PFNwglCreateContext) (HDC hdc);
|
|
||||||
static PFNwglCreateContext pwglCreateContext;
|
|
||||||
typedef BOOL (WINAPI *PFNwglDeleteContext) (HGLRC hglrc);
|
|
||||||
static PFNwglDeleteContext pwglDeleteContext;
|
|
||||||
typedef BOOL (WINAPI *PFNwglMakeCurrent) (HDC hdc, HGLRC hglrc);
|
|
||||||
static PFNwglMakeCurrent pwglMakeCurrent;
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#ifndef STATIC_OPENGL
|
|
||||||
void *GetGLFunc(const char *proc)
|
|
||||||
{
|
|
||||||
void *func = NULL;
|
|
||||||
if (pwglGetProcAddress)
|
|
||||||
func = pwglGetProcAddress(proc);
|
|
||||||
if (!func)
|
|
||||||
func = GetProcAddress(OGL32, proc);
|
|
||||||
return func;
|
|
||||||
}
|
|
||||||
#endif
|
|
||||||
|
|
||||||
boolean LoadGL(void)
|
|
||||||
{
|
|
||||||
#ifndef STATIC_OPENGL
|
|
||||||
OGL32 = LoadLibrary("OPENGL32.DLL");
|
|
||||||
|
|
||||||
if (!OGL32)
|
|
||||||
return 0;
|
|
||||||
|
|
||||||
pwglGetProcAddress = GetGLFunc("wglGetProcAddress");
|
|
||||||
pwglCreateContext = GetGLFunc("wglCreateContext");
|
|
||||||
pwglDeleteContext = GetGLFunc("wglDeleteContext");
|
|
||||||
pwglMakeCurrent = GetGLFunc("wglMakeCurrent");
|
|
||||||
#endif
|
|
||||||
return SetupGLfunc();
|
|
||||||
}
|
|
||||||
|
|
||||||
// -----------------+
|
|
||||||
// SetupPixelFormat : Set the device context's pixel format
|
|
||||||
// Note : Because we currently use only the desktop's BPP format, all the
|
|
||||||
// : video modes in Doom Legacy OpenGL are of the same BPP, thus the
|
|
||||||
// : PixelFormat is set only once.
|
|
||||||
// : Setting the pixel format more than once on the same window
|
|
||||||
// : doesn't work. (ultimately for different pixel formats, we
|
|
||||||
// : should close the window, and re-create it)
|
|
||||||
// -----------------+
|
|
||||||
int SetupPixelFormat(INT32 WantColorBits, INT32 WantStencilBits, INT32 WantDepthBits)
|
|
||||||
{
|
|
||||||
static DWORD iLastPFD = 0;
|
|
||||||
INT32 nPixelFormat;
|
|
||||||
PIXELFORMATDESCRIPTOR pfd =
|
|
||||||
{
|
|
||||||
sizeof (PIXELFORMATDESCRIPTOR), // size
|
|
||||||
1, // version
|
|
||||||
PFD_DRAW_TO_WINDOW | PFD_SUPPORT_OPENGL | PFD_DOUBLEBUFFER,
|
|
||||||
PFD_TYPE_RGBA, // color type
|
|
||||||
32 /*WantColorBits*/, // cColorBits : prefered color depth
|
|
||||||
0, 0, // cRedBits, cRedShift
|
|
||||||
0, 0, // cGreenBits, cGreenShift
|
|
||||||
0, 0, // cBlueBits, cBlueShift
|
|
||||||
0, 0, // cAlphaBits, cAlphaShift
|
|
||||||
0, // cAccumBits
|
|
||||||
0, 0, 0, 0, // cAccum Red/Green/Blue/Alpha Bits
|
|
||||||
0, // cDepthBits (0,16,24,32)
|
|
||||||
0, // cStencilBits
|
|
||||||
0, // cAuxBuffers
|
|
||||||
PFD_MAIN_PLANE, // iLayerType
|
|
||||||
0, // reserved, must be zero
|
|
||||||
0, 0, 0, // dwLayerMask, dwVisibleMask, dwDamageMask
|
|
||||||
};
|
|
||||||
|
|
||||||
DWORD iPFD = (WantColorBits<<16) | (WantStencilBits<<8) | WantDepthBits;
|
|
||||||
|
|
||||||
pfd.cDepthBits = (BYTE)WantDepthBits;
|
|
||||||
pfd.cStencilBits = (BYTE)WantStencilBits;
|
|
||||||
|
|
||||||
if (iLastPFD)
|
|
||||||
{
|
|
||||||
DBG_Printf("WARNING : SetPixelFormat() called twise not supported by all drivers !\n");
|
|
||||||
}
|
|
||||||
|
|
||||||
// set the pixel format only if different than the current
|
|
||||||
if (iPFD == iLastPFD)
|
|
||||||
return 2;
|
|
||||||
else
|
|
||||||
iLastPFD = iPFD;
|
|
||||||
|
|
||||||
DBG_Printf("SetupPixelFormat() - %d ColorBits - %d StencilBits - %d DepthBits\n",
|
|
||||||
WantColorBits, WantStencilBits, WantDepthBits);
|
|
||||||
|
|
||||||
nPixelFormat = ChoosePixelFormat(hDC, &pfd);
|
|
||||||
|
|
||||||
if (nPixelFormat == 0)
|
|
||||||
DBG_Printf("ChoosePixelFormat() FAILED\n");
|
|
||||||
|
|
||||||
if (SetPixelFormat(hDC, nPixelFormat, &pfd) == 0)
|
|
||||||
{
|
|
||||||
DBG_Printf("SetPixelFormat() FAILED\n");
|
|
||||||
return 0;
|
|
||||||
}
|
|
||||||
|
|
||||||
return 1;
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
// -----------------+
|
|
||||||
// SetRes : Set a display mode
|
|
||||||
// Notes : pcurrentmode is actually not used
|
|
||||||
// -----------------+
|
|
||||||
static INT32 WINAPI SetRes(viddef_t *lvid, vmode_t *pcurrentmode)
|
|
||||||
{
|
|
||||||
LPCSTR renderer;
|
|
||||||
BOOL WantFullScreen = !(lvid->u.windowed); //(lvid->u.windowed ? 0 : CDS_FULLSCREEN);
|
|
||||||
|
|
||||||
UNREFERENCED_PARAMETER(pcurrentmode);
|
|
||||||
DBG_Printf ("SetMode(): %dx%d %d bits (%s)\n",
|
|
||||||
lvid->width, lvid->height, lvid->bpp*8,
|
|
||||||
WantFullScreen ? "fullscreen" : "windowed");
|
|
||||||
|
|
||||||
hWnd = lvid->WndParent;
|
|
||||||
|
|
||||||
// BP : why flush texture ?
|
|
||||||
// if important flush also the first one (white texture) and restore it !
|
|
||||||
Flush(); // Flush textures.
|
|
||||||
|
|
||||||
// TODO: if not fullscreen, skip display stuff and just resize viewport stuff ...
|
|
||||||
|
|
||||||
// Exit previous mode
|
|
||||||
//if (hGLRC) //Hurdler: TODO: check if this is valid
|
|
||||||
// UnSetRes();
|
|
||||||
if (WasFullScreen)
|
|
||||||
ChangeDisplaySettings(NULL, CDS_FULLSCREEN); //switch in and out of fullscreen
|
|
||||||
|
|
||||||
// Change display settings.
|
|
||||||
if (WantFullScreen)
|
|
||||||
{
|
|
||||||
DEVMODE dm;
|
|
||||||
ZeroMemory(&dm, sizeof (dm));
|
|
||||||
dm.dmSize = sizeof (dm);
|
|
||||||
dm.dmPelsWidth = lvid->width;
|
|
||||||
dm.dmPelsHeight = lvid->height;
|
|
||||||
dm.dmBitsPerPel = lvid->bpp*8;
|
|
||||||
dm.dmFields = DM_PELSWIDTH | DM_PELSHEIGHT | DM_BITSPERPEL;
|
|
||||||
if (ChangeDisplaySettings(&dm, CDS_TEST) != DISP_CHANGE_SUCCESSFUL)
|
|
||||||
return -2;
|
|
||||||
if (ChangeDisplaySettings(&dm, CDS_FULLSCREEN) !=DISP_CHANGE_SUCCESSFUL)
|
|
||||||
return -3;
|
|
||||||
|
|
||||||
SetWindowLong(hWnd, GWL_STYLE, WS_POPUP|WS_VISIBLE);
|
|
||||||
// faB : book says to put these, surely for windowed mode
|
|
||||||
//WS_CLIPCHILDREN|WS_CLIPSIBLINGS);
|
|
||||||
SetWindowPos(hWnd, HWND_TOPMOST, 0, 0, lvid->width, lvid->height, SWP_NOACTIVATE|SWP_NOZORDER);
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
RECT bounds;
|
|
||||||
INT32 x, y;
|
|
||||||
INT32 w = lvid->width, h = lvid->height;
|
|
||||||
GetWindowRect(hWnd, &bounds);
|
|
||||||
bounds.right = bounds.left+w;
|
|
||||||
bounds.bottom = bounds.top+h;
|
|
||||||
AdjustWindowRectEx(&bounds, GetWindowLong(hWnd, GWL_STYLE), (GetMenu(hWnd) != NULL), 0);
|
|
||||||
w = bounds.right-bounds.left;
|
|
||||||
h = bounds.bottom-bounds.top;
|
|
||||||
x = (GetSystemMetrics(SM_CXSCREEN)-w)/2;
|
|
||||||
y = (GetSystemMetrics(SM_CYSCREEN)-h)/2;
|
|
||||||
SetWindowPos(hWnd, NULL, x, y, w, h, SWP_NOACTIVATE|SWP_NOZORDER);
|
|
||||||
}
|
|
||||||
|
|
||||||
if (!hDC)
|
|
||||||
hDC = GetDC(hWnd);
|
|
||||||
if (!hDC)
|
|
||||||
{
|
|
||||||
DBG_Printf("GetDC() FAILED\n");
|
|
||||||
return 0;
|
|
||||||
}
|
|
||||||
|
|
||||||
{
|
|
||||||
INT32 res;
|
|
||||||
|
|
||||||
// Set res.
|
|
||||||
res = SetupPixelFormat(lvid->bpp*8, 0, 16);
|
|
||||||
|
|
||||||
if (res == 0)
|
|
||||||
return 0;
|
|
||||||
else if (res == 1)
|
|
||||||
{
|
|
||||||
// Exit previous mode
|
|
||||||
if (hGLRC)
|
|
||||||
UnSetRes();
|
|
||||||
hGLRC = pwglCreateContext(hDC);
|
|
||||||
if (!hGLRC)
|
|
||||||
{
|
|
||||||
DBG_Printf("pwglCreateContext() FAILED\n");
|
|
||||||
return 0;
|
|
||||||
}
|
|
||||||
if (!pwglMakeCurrent(hDC, hGLRC))
|
|
||||||
{
|
|
||||||
DBG_Printf("wglMakeCurrent() FAILED\n");
|
|
||||||
return 0;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
gl_extensions = pglGetString(GL_EXTENSIONS);
|
|
||||||
// Get info and extensions.
|
|
||||||
//BP: why don't we make it earlier ?
|
|
||||||
//Hurdler: we cannot do that before intialising gl context
|
|
||||||
renderer = (LPCSTR)pglGetString(GL_RENDERER);
|
|
||||||
DBG_Printf("Vendor : %s\n", pglGetString(GL_VENDOR));
|
|
||||||
DBG_Printf("Renderer : %s\n", renderer);
|
|
||||||
DBG_Printf("Version : %s\n", pglGetString(GL_VERSION));
|
|
||||||
DBG_Printf("Extensions : %s\n", gl_extensions);
|
|
||||||
|
|
||||||
// BP: disable advenced feature that don't work on somes hardware
|
|
||||||
// Hurdler: Now works on G400 with bios 1.6 and certified drivers 6.04
|
|
||||||
if (strstr(renderer, "810")) oglflags |= GLF_NOZBUFREAD;
|
|
||||||
DBG_Printf("oglflags : 0x%X\n", oglflags);
|
|
||||||
|
|
||||||
#ifdef USE_WGL_SWAP
|
|
||||||
if (isExtAvailable("WGL_EXT_swap_control",gl_extensions))
|
|
||||||
wglSwapIntervalEXT = GetGLFunc("wglSwapIntervalEXT");
|
|
||||||
else
|
|
||||||
wglSwapIntervalEXT = NULL;
|
|
||||||
#endif
|
|
||||||
|
|
||||||
if (isExtAvailable("GL_EXT_texture_filter_anisotropic",gl_extensions))
|
|
||||||
pglGetIntegerv(GL_MAX_TEXTURE_MAX_ANISOTROPY_EXT, &maximumAnisotropy);
|
|
||||||
else
|
|
||||||
maximumAnisotropy = 0;
|
|
||||||
|
|
||||||
SetupGLFunc13();
|
|
||||||
|
|
||||||
screen_depth = (GLbyte)(lvid->bpp*8);
|
|
||||||
if (screen_depth > 16)
|
|
||||||
textureformatGL = GL_RGBA;
|
|
||||||
else
|
|
||||||
textureformatGL = GL_RGB5_A1;
|
|
||||||
|
|
||||||
GL_SetModelView(lvid->width, lvid->height);
|
|
||||||
GL_SetStates();
|
|
||||||
// we need to clear the depth buffer. Very important!!!
|
|
||||||
pglClear(GL_COLOR_BUFFER_BIT|GL_DEPTH_BUFFER_BIT);
|
|
||||||
|
|
||||||
lvid->buffer = NULL; // unless we use the software view
|
|
||||||
lvid->direct = NULL; // direct access to video memory, old DOS crap
|
|
||||||
|
|
||||||
WasFullScreen = WantFullScreen;
|
|
||||||
|
|
||||||
return 1; // on renvoie une valeur pour dire que cela s'est bien pass�
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
// -----------------+
|
|
||||||
// UnSetRes : Restore the original display mode
|
|
||||||
// -----------------+
|
|
||||||
static void UnSetRes(void)
|
|
||||||
{
|
|
||||||
DBG_Printf("UnSetRes()\n");
|
|
||||||
|
|
||||||
pwglMakeCurrent(hDC, NULL);
|
|
||||||
pwglDeleteContext(hGLRC);
|
|
||||||
hGLRC = NULL;
|
|
||||||
if (WasFullScreen)
|
|
||||||
ChangeDisplaySettings(NULL, CDS_FULLSCREEN);
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
// -----------------+
|
|
||||||
// GetModeList : Return the list of available display modes.
|
|
||||||
// Returns : pvidmodes - points to list of detected OpenGL video modes
|
|
||||||
// : numvidmodes - number of detected OpenGL video modes
|
|
||||||
// -----------------+
|
|
||||||
EXPORT void HWRAPI(GetModeList) (vmode_t** pvidmodes, INT32 *numvidmodes)
|
|
||||||
{
|
|
||||||
INT32 i;
|
|
||||||
|
|
||||||
#if 1
|
|
||||||
INT32 iMode;
|
|
||||||
/*
|
|
||||||
faB test code
|
|
||||||
|
|
||||||
Commented out because there might be a problem with combo (Voodoo2 + other card),
|
|
||||||
we need to get the 3D card's display modes only.
|
|
||||||
*/
|
|
||||||
(*pvidmodes) = &video_modes[0];
|
|
||||||
|
|
||||||
// Get list of device modes
|
|
||||||
for (i = 0,iMode = 0; iMode < MAX_VIDEO_MODES; i++)
|
|
||||||
{
|
|
||||||
DEVMODE Tmp;
|
|
||||||
ZeroMemory(&Tmp, sizeof (Tmp));
|
|
||||||
Tmp.dmSize = sizeof (Tmp);
|
|
||||||
if (!EnumDisplaySettings(NULL, i, &Tmp))
|
|
||||||
break;
|
|
||||||
|
|
||||||
// add video mode
|
|
||||||
if (Tmp.dmBitsPerPel == 16 &&
|
|
||||||
(iMode == 0 || !
|
|
||||||
(Tmp.dmPelsWidth == video_modes[iMode-1].width &&
|
|
||||||
Tmp.dmPelsHeight == video_modes[iMode-1].height)
|
|
||||||
)
|
|
||||||
)
|
|
||||||
{
|
|
||||||
video_modes[iMode].pnext = &video_modes[iMode+1];
|
|
||||||
video_modes[iMode].windowed = 0; // fullscreen is the default
|
|
||||||
video_modes[iMode].misc = 0;
|
|
||||||
video_modes[iMode].name = malloc(12 * sizeof (CHAR));
|
|
||||||
sprintf(video_modes[iMode].name, "%dx%d", (INT32)Tmp.dmPelsWidth, (INT32)Tmp.dmPelsHeight);
|
|
||||||
DBG_Printf ("Mode: %s\n", video_modes[iMode].name);
|
|
||||||
video_modes[iMode].width = Tmp.dmPelsWidth;
|
|
||||||
video_modes[iMode].height = Tmp.dmPelsHeight;
|
|
||||||
video_modes[iMode].bytesperpixel = Tmp.dmBitsPerPel/8;
|
|
||||||
video_modes[iMode].rowbytes = Tmp.dmPelsWidth * video_modes[iMode].bytesperpixel;
|
|
||||||
video_modes[iMode].pextradata = NULL;
|
|
||||||
video_modes[iMode].setmode = SetRes;
|
|
||||||
iMode++;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
(*numvidmodes) = iMode;
|
|
||||||
#else
|
|
||||||
|
|
||||||
// classic video modes (fullscreen/windowed)
|
|
||||||
// Added some. Tails
|
|
||||||
INT32 res[][2] = {
|
|
||||||
{ 320, 200},
|
|
||||||
{ 320, 240},
|
|
||||||
{ 400, 300},
|
|
||||||
{ 512, 384},
|
|
||||||
{ 640, 400},
|
|
||||||
{ 640, 480},
|
|
||||||
{ 800, 600},
|
|
||||||
{ 960, 600},
|
|
||||||
{1024, 768},
|
|
||||||
{1152, 864},
|
|
||||||
{1280, 800},
|
|
||||||
{1280, 960},
|
|
||||||
{1280,1024},
|
|
||||||
{1600,1000},
|
|
||||||
{1680,1050},
|
|
||||||
{1920,1200},
|
|
||||||
};
|
|
||||||
|
|
||||||
HDC bpphdc;
|
|
||||||
INT32 iBitsPerPel;
|
|
||||||
|
|
||||||
DBG_Printf ("HWRAPI GetModeList()\n");
|
|
||||||
|
|
||||||
bpphdc = GetDC(NULL); // on obtient le bpp actuel
|
|
||||||
iBitsPerPel = GetDeviceCaps(bpphdc, BITSPIXEL);
|
|
||||||
|
|
||||||
ReleaseDC(NULL, bpphdc);
|
|
||||||
|
|
||||||
(*pvidmodes) = &video_modes[0];
|
|
||||||
(*numvidmodes) = sizeof (res) / sizeof (res[0]);
|
|
||||||
for (i = 0; i < (*numvidmodes); i++)
|
|
||||||
{
|
|
||||||
video_modes[i].pnext = &video_modes[i+1];
|
|
||||||
video_modes[i].windowed = 0; // fullscreen is the default
|
|
||||||
video_modes[i].misc = 0;
|
|
||||||
video_modes[i].name = malloc(12 * sizeof (CHAR));
|
|
||||||
sprintf(video_modes[i].name, "%dx%d", res[i][0], res[i][1]);
|
|
||||||
DBG_Printf ("Mode: %s\n", video_modes[i].name);
|
|
||||||
video_modes[i].width = res[i][0];
|
|
||||||
video_modes[i].height = res[i][1];
|
|
||||||
video_modes[i].bytesperpixel = iBitsPerPel/8;
|
|
||||||
video_modes[i].rowbytes = res[i][0] * video_modes[i].bytesperpixel;
|
|
||||||
video_modes[i].pextradata = NULL;
|
|
||||||
video_modes[i].setmode = SetRes;
|
|
||||||
}
|
|
||||||
#endif
|
|
||||||
video_modes[(*numvidmodes)-1].pnext = NULL;
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
// -----------------+
|
|
||||||
// Shutdown : Shutdown OpenGL, restore the display mode
|
|
||||||
// -----------------+
|
|
||||||
EXPORT void HWRAPI(Shutdown) (void)
|
|
||||||
{
|
|
||||||
#ifdef DEBUG_TO_FILE
|
|
||||||
long nb_centiemes;
|
|
||||||
|
|
||||||
DBG_Printf ("HWRAPI Shutdown()\n");
|
|
||||||
nb_centiemes = ((clock()-my_clock)*100)/CLOCKS_PER_SEC;
|
|
||||||
DBG_Printf("Nb frames: %li; Nb sec: %2.2f -> %2.1f fps\n",
|
|
||||||
nb_frames, nb_centiemes/100.0f, (100*nb_frames)/(double)nb_centiemes);
|
|
||||||
#endif
|
|
||||||
|
|
||||||
Flush();
|
|
||||||
|
|
||||||
// Exit previous mode
|
|
||||||
if (hGLRC)
|
|
||||||
UnSetRes();
|
|
||||||
|
|
||||||
if (hDC)
|
|
||||||
{
|
|
||||||
ReleaseDC(hWnd, hDC);
|
|
||||||
hDC = NULL;
|
|
||||||
}
|
|
||||||
FreeLibrary(OGL32);
|
|
||||||
DBG_Printf ("HWRAPI Shutdown(DONE)\n");
|
|
||||||
}
|
|
||||||
|
|
||||||
// -----------------+
|
|
||||||
// FinishUpdate : Swap front and back buffers
|
|
||||||
// -----------------+
|
|
||||||
void GL_FinishUpdate (INT32 waitvbl)
|
|
||||||
{
|
|
||||||
#ifdef USE_WGL_SWAP
|
|
||||||
static INT32 oldwaitvbl = 0;
|
|
||||||
#else
|
|
||||||
UNREFERENCED_PARAMETER(waitvbl);
|
|
||||||
#endif
|
|
||||||
// DBG_Printf ("FinishUpdate()\n");
|
|
||||||
#ifdef DEBUG_TO_FILE
|
|
||||||
if ((++nb_frames)==2) // on ne commence pas � la premi�re frame
|
|
||||||
my_clock = clock();
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#ifdef USE_WGL_SWAP
|
|
||||||
if (oldwaitvbl != waitvbl && wglSwapIntervalEXT)
|
|
||||||
wglSwapIntervalEXT(waitvbl);
|
|
||||||
oldwaitvbl = waitvbl;
|
|
||||||
#endif
|
|
||||||
|
|
||||||
SwapBuffers(hDC);
|
|
||||||
}
|
|
||||||
#endif
|
|
||||||
@@ -776,15 +776,15 @@ static int GLFramebuffer_CheckExt(void)
|
|||||||
// gl versions from 2.1 may still support framebuffer objects
|
// gl versions from 2.1 may still support framebuffer objects
|
||||||
|
|
||||||
// maybe, just maybe, we support the standart extensions
|
// maybe, just maybe, we support the standart extensions
|
||||||
if (GL_isExtAvailable("GL_ARB_framebuffer_no_attachments", gl_extensions)
|
if (GL_isExtAvailable("GL_ARB_framebuffer_no_attachments", gl_extensions) &&
|
||||||
&& GL_isExtAvailable("GL_ARB_framebuffer_object", gl_extensions)
|
GL_isExtAvailable("GL_ARB_framebuffer_object", gl_extensions) &&
|
||||||
&& GL_isExtAvailable("GL_ARB_framebuffer_sRGB", gl_extensions))
|
GL_isExtAvailable("GL_ARB_framebuffer_sRGB", gl_extensions))
|
||||||
return FBO_ARB;
|
return FBO_ARB;
|
||||||
|
|
||||||
// nope, try the older 2.1 extensions
|
// nope, try the older 2.1 extensions
|
||||||
if (GL_isExtAvailable("GL_EXT_framebuffer_no_attachments", gl_extensions)
|
if (GL_isExtAvailable("GL_EXT_framebuffer_no_attachments", gl_extensions) &&
|
||||||
&& GL_isExtAvailable("GL_EXT_framebuffer_object", gl_extensions)
|
GL_isExtAvailable("GL_EXT_framebuffer_object", gl_extensions) &&
|
||||||
&& GL_isExtAvailable("GL_EXT_framebuffer_sRGB", gl_extensions))
|
GL_isExtAvailable("GL_EXT_framebuffer_sRGB", gl_extensions))
|
||||||
{
|
{
|
||||||
// perhaps we may even support a stencil attachment
|
// perhaps we may even support a stencil attachment
|
||||||
if (GL_isExtAvailable("GL_EXT_packed_depth_stencil", gl_extensions))
|
if (GL_isExtAvailable("GL_EXT_packed_depth_stencil", gl_extensions))
|
||||||
@@ -885,7 +885,7 @@ void SetupGLFunc4(void)
|
|||||||
{ \
|
{ \
|
||||||
GL_MSG_Warning("failed to get OpenGL FBO function: %s\n", #func); \
|
GL_MSG_Warning("failed to get OpenGL FBO function: %s\n", #func); \
|
||||||
GL_DBG_Printf("\nFBO: No framebuffer object support\n"); \
|
GL_DBG_Printf("\nFBO: No framebuffer object support\n"); \
|
||||||
supportFBO = false; \
|
supportFBO = FBO_NONE; \
|
||||||
return; \
|
return; \
|
||||||
} \
|
} \
|
||||||
|
|
||||||
@@ -1465,6 +1465,19 @@ void GL_ReadScreenTexture(int tex, UINT8 *restrict dest, INT32 scale)
|
|||||||
if (tex != HWD_SCREENTEXTURE_GENERIC2)
|
if (tex != HWD_SCREENTEXTURE_GENERIC2)
|
||||||
GL_DrawScreenTexture(tex, NULL, 0);
|
GL_DrawScreenTexture(tex, NULL, 0);
|
||||||
|
|
||||||
|
#ifdef USE_FBO_OGL
|
||||||
|
// FIXME: this is incredibly stupid
|
||||||
|
// but the final screen texture will NOT be drawn in the downsample fbo
|
||||||
|
if (tex == HWD_SCREENTEXTURE_GENERIC2 &&
|
||||||
|
UseScreenFBO() && HWR_ShouldUsePaletteRendering())
|
||||||
|
{
|
||||||
|
GL_SetShader(HWR_GetShaderFromTarget(SHADER_PALETTE_POSTPROCESS));
|
||||||
|
GL_EnableShader();
|
||||||
|
GL_DrawScreenTexture(HWD_SCREENTEXTURE_GENERIC2, NULL, 0);
|
||||||
|
GL_UnSetShader();
|
||||||
|
}
|
||||||
|
#endif
|
||||||
|
|
||||||
image = malloc(screen_width*screen_height*3);
|
image = malloc(screen_width*screen_height*3);
|
||||||
pglPixelStorei(GL_PACK_ALIGNMENT, 1);
|
pglPixelStorei(GL_PACK_ALIGNMENT, 1);
|
||||||
pglReadPixels(0, 0, screen_width, screen_height, GL_RGB, GL_UNSIGNED_BYTE, image);
|
pglReadPixels(0, 0, screen_width, screen_height, GL_RGB, GL_UNSIGNED_BYTE, image);
|
||||||
@@ -2490,7 +2503,7 @@ void GL_RenderSkyDome(gl_sky_t *sky)
|
|||||||
GL_Shader_SetUniforms(NULL, NULL, NULL, NULL);
|
GL_Shader_SetUniforms(NULL, NULL, NULL, NULL);
|
||||||
|
|
||||||
// Build the sky dome! Yes!
|
// Build the sky dome! Yes!
|
||||||
if (sky->rebuild)
|
if (sky->rebuild || !sky->vbo)
|
||||||
{
|
{
|
||||||
// delete VBO when already exists
|
// delete VBO when already exists
|
||||||
if (sky->vbo)
|
if (sky->vbo)
|
||||||
@@ -3208,8 +3221,8 @@ void GL_SetTransform(FTransform *stransform)
|
|||||||
{
|
{
|
||||||
float dy = stransform->viewaiming * 2;
|
float dy = stransform->viewaiming * 2;
|
||||||
|
|
||||||
if (stransform->fliptype == TRANSFORM_FLIP
|
if (stransform->fliptype == TRANSFORM_FLIP ||
|
||||||
|| stransform->fliptype == TRANSFORM_MIRRORFLIP)
|
stransform->fliptype == TRANSFORM_MIRRORFLIP)
|
||||||
dy *= -1.0f;
|
dy *= -1.0f;
|
||||||
|
|
||||||
pglTranslatef(0.0f, -dy/BASEVIDHEIGHT, 0.0f);
|
pglTranslatef(0.0f, -dy/BASEVIDHEIGHT, 0.0f);
|
||||||
@@ -3234,7 +3247,7 @@ void GL_SetTransform(FTransform *stransform)
|
|||||||
#ifdef USE_FBO_OGL
|
#ifdef USE_FBO_OGL
|
||||||
static void GL_Framebuffer_DeleteAttachments(void)
|
static void GL_Framebuffer_DeleteAttachments(void)
|
||||||
{
|
{
|
||||||
if (!supportFBO || !framebufferobject.init)
|
if (supportFBO == FBO_NONE || !framebufferobject.init)
|
||||||
return;
|
return;
|
||||||
|
|
||||||
// Unbind the framebuffer
|
// Unbind the framebuffer
|
||||||
@@ -3254,7 +3267,7 @@ static void GL_Framebuffer_DeleteAttachments(void)
|
|||||||
|
|
||||||
static void GL_Framebuffer_Generate(void)
|
static void GL_Framebuffer_Generate(void)
|
||||||
{
|
{
|
||||||
if (!supportFBO || framebufferobject.init || !UseScreenFBO())
|
if (supportFBO == FBO_NONE || framebufferobject.init || !UseScreenFBO())
|
||||||
return;
|
return;
|
||||||
|
|
||||||
// Generate the framebuffer
|
// Generate the framebuffer
|
||||||
@@ -3274,10 +3287,10 @@ static void GL_Framebuffer_Generate(void)
|
|||||||
pglTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
|
pglTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
|
||||||
Clamp2D(GL_TEXTURE_WRAP_S);
|
Clamp2D(GL_TEXTURE_WRAP_S);
|
||||||
Clamp2D(GL_TEXTURE_WRAP_T);
|
Clamp2D(GL_TEXTURE_WRAP_T);
|
||||||
pglBindTexture(GL_TEXTURE_2D, 0);
|
|
||||||
|
|
||||||
// Attach the framebuffer texture to the framebuffer
|
// Attach the framebuffer texture to the framebuffer
|
||||||
pglFramebufferTexture2D(GL_FRAMEBUFFER_EXT, GL_COLOR_ATTACHMENT0_EXT, GL_TEXTURE_2D, framebufferobject.tex, 0);
|
pglFramebufferTexture2D(GL_FRAMEBUFFER_EXT, GL_COLOR_ATTACHMENT0_EXT, GL_TEXTURE_2D, framebufferobject.tex, 0);
|
||||||
|
pglBindTexture(GL_TEXTURE_2D, 0);
|
||||||
}
|
}
|
||||||
|
|
||||||
// Generate the renderbuffer
|
// Generate the renderbuffer
|
||||||
@@ -3319,7 +3332,7 @@ static void GL_Framebuffer_Generate(void)
|
|||||||
|
|
||||||
// if this fails, dont retry it a gazillion times
|
// if this fails, dont retry it a gazillion times
|
||||||
// this wouldnt recover
|
// this wouldnt recover
|
||||||
supportFBO = false;
|
supportFBO = FBO_NONE;
|
||||||
pglBindFramebuffer(GL_FRAMEBUFFER_EXT, 0);
|
pglBindFramebuffer(GL_FRAMEBUFFER_EXT, 0);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
@@ -3332,7 +3345,7 @@ static void GL_Framebuffer_Generate(void)
|
|||||||
|
|
||||||
void GL_Framebuffer_Unbind(void)
|
void GL_Framebuffer_Unbind(void)
|
||||||
{
|
{
|
||||||
if (!supportFBO || !framebufferobject.init)
|
if (supportFBO == FBO_NONE || !framebufferobject.init)
|
||||||
return;
|
return;
|
||||||
|
|
||||||
pglBindFramebuffer(GL_FRAMEBUFFER_EXT, 0);
|
pglBindFramebuffer(GL_FRAMEBUFFER_EXT, 0);
|
||||||
@@ -3341,13 +3354,13 @@ void GL_Framebuffer_Unbind(void)
|
|||||||
|
|
||||||
void GL_Framebuffer_Enable(void)
|
void GL_Framebuffer_Enable(void)
|
||||||
{
|
{
|
||||||
if (!supportFBO || !UseScreenFBO())
|
if (supportFBO == FBO_NONE || !UseScreenFBO())
|
||||||
return;
|
return;
|
||||||
|
|
||||||
GL_Framebuffer_Generate();
|
GL_Framebuffer_Generate();
|
||||||
|
|
||||||
// failed
|
// failed
|
||||||
if (!supportFBO || !framebufferobject.init)
|
if (supportFBO == FBO_NONE || !framebufferobject.init)
|
||||||
return;
|
return;
|
||||||
|
|
||||||
pglBindFramebuffer(GL_FRAMEBUFFER_EXT, framebufferobject.fboobj);
|
pglBindFramebuffer(GL_FRAMEBUFFER_EXT, framebufferobject.fboobj);
|
||||||
@@ -3356,7 +3369,7 @@ void GL_Framebuffer_Enable(void)
|
|||||||
|
|
||||||
void GL_Framebuffer_Disable(void)
|
void GL_Framebuffer_Disable(void)
|
||||||
{
|
{
|
||||||
if (!supportFBO || !framebufferobject.init)
|
if (supportFBO == FBO_NONE || !framebufferobject.init)
|
||||||
return;
|
return;
|
||||||
|
|
||||||
pglBindFramebuffer(GL_FRAMEBUFFER_EXT, 0);
|
pglBindFramebuffer(GL_FRAMEBUFFER_EXT, 0);
|
||||||
|
|||||||
@@ -1,79 +0,0 @@
|
|||||||
[Project]
|
|
||||||
FileName=r_opengl.dev
|
|
||||||
Name=r_opengl
|
|
||||||
Ver=1
|
|
||||||
IsCpp=1
|
|
||||||
Type=3
|
|
||||||
Compiler=-D_M_IX86=500_@@_-Wall_@@_-D_WINDOWS_@@_-DUSE_WGL_SWAP_@@_-Os_@@_-fomit-frame-pointer_@@_
|
|
||||||
CppCompiler=
|
|
||||||
Includes=
|
|
||||||
Linker=--def ../r_mingw.def_@@_-lgdi32_@@_
|
|
||||||
Libs=
|
|
||||||
UnitCount=3
|
|
||||||
Folders=
|
|
||||||
ObjFiles=
|
|
||||||
PrivateResource=
|
|
||||||
ResourceIncludes=
|
|
||||||
MakeIncludes=
|
|
||||||
Icon=
|
|
||||||
ExeOutput=C:\srb2demo2
|
|
||||||
ObjectOutput=..\..\..\objs\Mingw\r_opengl
|
|
||||||
OverrideOutput=1
|
|
||||||
OverrideOutputName=r_opengl.dll
|
|
||||||
HostApplication=
|
|
||||||
CommandLine=
|
|
||||||
IncludeVersionInfo=0
|
|
||||||
SupportXPThemes=0
|
|
||||||
CompilerSet=0
|
|
||||||
CompilerSettings=00000000000000000111d0
|
|
||||||
UseCustomMakefile=0
|
|
||||||
CustomMakefile=
|
|
||||||
|
|
||||||
[Unit1]
|
|
||||||
FileName=ogl_win.c
|
|
||||||
Folder=
|
|
||||||
Compile=1
|
|
||||||
CompileCpp=0
|
|
||||||
Link=1
|
|
||||||
Priority=1000
|
|
||||||
OverrideBuildCmd=0
|
|
||||||
BuildCmd=
|
|
||||||
|
|
||||||
[Unit2]
|
|
||||||
FileName=r_opengl.c
|
|
||||||
Folder=
|
|
||||||
Compile=1
|
|
||||||
CompileCpp=0
|
|
||||||
Link=1
|
|
||||||
Priority=1000
|
|
||||||
OverrideBuildCmd=0
|
|
||||||
BuildCmd=
|
|
||||||
|
|
||||||
[Unit3]
|
|
||||||
FileName=r_opengl.h
|
|
||||||
Folder=
|
|
||||||
Compile=1
|
|
||||||
CompileCpp=1
|
|
||||||
Link=1
|
|
||||||
Priority=1000
|
|
||||||
OverrideBuildCmd=0
|
|
||||||
BuildCmd=
|
|
||||||
|
|
||||||
[VersionInfo]
|
|
||||||
Major=0
|
|
||||||
Minor=1
|
|
||||||
Release=1
|
|
||||||
Build=1
|
|
||||||
LanguageID=1033
|
|
||||||
CharsetID=1252
|
|
||||||
CompanyName=
|
|
||||||
FileVersion=0.1
|
|
||||||
FileDescription=Developed using the Dev-C++ IDE
|
|
||||||
InternalName=
|
|
||||||
LegalCopyright=
|
|
||||||
LegalTrademarks=
|
|
||||||
OriginalFilename=r_opengl.exe
|
|
||||||
ProductName=r_opengl
|
|
||||||
ProductVersion=0.1
|
|
||||||
AutoIncBuildNr=0
|
|
||||||
|
|
||||||
@@ -1,105 +0,0 @@
|
|||||||
# Microsoft Developer Studio Project File - Name="r_opengl" - Package Owner=<4>
|
|
||||||
# Microsoft Developer Studio Generated Build File, Format Version 6.00
|
|
||||||
# ** DO NOT EDIT **
|
|
||||||
|
|
||||||
# TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102
|
|
||||||
|
|
||||||
CFG=r_opengl - Win32 Debug
|
|
||||||
!MESSAGE This is not a valid makefile. To build this project using NMAKE,
|
|
||||||
!MESSAGE use the Export Makefile command and run
|
|
||||||
!MESSAGE
|
|
||||||
!MESSAGE NMAKE /f "r_opengl.mak".
|
|
||||||
!MESSAGE
|
|
||||||
!MESSAGE You can specify a configuration when running NMAKE
|
|
||||||
!MESSAGE by defining the macro CFG on the command line. For example:
|
|
||||||
!MESSAGE
|
|
||||||
!MESSAGE NMAKE /f "r_opengl.mak" CFG="r_opengl - Win32 Debug"
|
|
||||||
!MESSAGE
|
|
||||||
!MESSAGE Possible choices for configuration are:
|
|
||||||
!MESSAGE
|
|
||||||
!MESSAGE "r_opengl - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library")
|
|
||||||
!MESSAGE "r_opengl - Win32 Debug" (based on "Win32 (x86) Dynamic-Link Library")
|
|
||||||
!MESSAGE
|
|
||||||
|
|
||||||
# Begin Project
|
|
||||||
# PROP AllowPerConfigDependencies 0
|
|
||||||
# PROP Scc_ProjName ""
|
|
||||||
# PROP Scc_LocalPath ""
|
|
||||||
CPP=cl.exe
|
|
||||||
MTL=midl.exe
|
|
||||||
RSC=rc.exe
|
|
||||||
|
|
||||||
!IF "$(CFG)" == "r_opengl - Win32 Release"
|
|
||||||
|
|
||||||
# PROP BASE Use_MFC 0
|
|
||||||
# PROP BASE Use_Debug_Libraries 0
|
|
||||||
# PROP BASE Output_Dir "r_opengl___Win32_Release"
|
|
||||||
# PROP BASE Intermediate_Dir "r_opengl___Win32_Release"
|
|
||||||
# PROP BASE Target_Dir ""
|
|
||||||
# PROP Use_MFC 0
|
|
||||||
# PROP Use_Debug_Libraries 0
|
|
||||||
# PROP Output_Dir "..\..\..\bin\VC\Release\r_opengl"
|
|
||||||
# PROP Intermediate_Dir "..\..\..\objs\VC\Release\r_opengl"
|
|
||||||
# PROP Ignore_Export_Lib 1
|
|
||||||
# PROP Target_Dir ""
|
|
||||||
# ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "R_OPENGL_EXPORTS" /YX /FD /c
|
|
||||||
# ADD CPP /nologo /G5 /W3 /GX /Zi /O2 /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "__WIN32__" /D "__MSC__" /D "USE_WGL_SWAP" /FR /FD /c
|
|
||||||
# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32
|
|
||||||
# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32
|
|
||||||
# ADD BASE RSC /l 0x80c /d "NDEBUG"
|
|
||||||
# ADD RSC /l 0x409 /d "NDEBUG"
|
|
||||||
BSC32=bscmake.exe
|
|
||||||
# ADD BASE BSC32 /nologo
|
|
||||||
# ADD BSC32 /nologo
|
|
||||||
LINK32=link.exe
|
|
||||||
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /machine:I386
|
|
||||||
# ADD LINK32 user32.lib gdi32.lib /nologo /dll /pdb:"..\..\..\bin\VC\Release\r_opengl.pdb" /machine:I386 /out:"C:\srb2demo2\r_opengl.dll"
|
|
||||||
# SUBTRACT LINK32 /pdb:none /debug
|
|
||||||
|
|
||||||
!ELSEIF "$(CFG)" == "r_opengl - Win32 Debug"
|
|
||||||
|
|
||||||
# PROP BASE Use_MFC 0
|
|
||||||
# PROP BASE Use_Debug_Libraries 1
|
|
||||||
# PROP BASE Output_Dir "..\..\..\objs\Debug"
|
|
||||||
# PROP BASE Intermediate_Dir "..\..\..\objs\Debug"
|
|
||||||
# PROP BASE Target_Dir ""
|
|
||||||
# PROP Use_MFC 0
|
|
||||||
# PROP Use_Debug_Libraries 1
|
|
||||||
# PROP Output_Dir "..\..\..\bin\VC\Debug\r_opengl"
|
|
||||||
# PROP Intermediate_Dir "..\..\..\objs\VC\Debug\r_opengl"
|
|
||||||
# PROP Ignore_Export_Lib 1
|
|
||||||
# PROP Target_Dir ""
|
|
||||||
# ADD BASE CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "R_OPENGL_EXPORTS" /YX /FD /GZ /c
|
|
||||||
# ADD CPP /nologo /G6 /W4 /Gm /GX /ZI /Od /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "__WIN32__" /D "__MSC__" /D "USE_WGL_SWAP" /FR /FD /GZ /c
|
|
||||||
# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32
|
|
||||||
# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32
|
|
||||||
# ADD BASE RSC /l 0x80c /d "_DEBUG"
|
|
||||||
# ADD RSC /l 0x409 /d "_DEBUG"
|
|
||||||
BSC32=bscmake.exe
|
|
||||||
# ADD BASE BSC32 /nologo
|
|
||||||
# ADD BSC32 /nologo
|
|
||||||
LINK32=link.exe
|
|
||||||
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /debug /machine:I386 /pdbtype:sept
|
|
||||||
# ADD LINK32 user32.lib gdi32.lib /nologo /dll /pdb:"..\..\..\bin\VC\Debug\r_opengl.pdb" /debug /machine:I386 /out:"C:\srb2demo2\r_opengld.dll" /pdbtype:sept
|
|
||||||
# SUBTRACT LINK32 /pdb:none
|
|
||||||
|
|
||||||
!ENDIF
|
|
||||||
|
|
||||||
# Begin Target
|
|
||||||
|
|
||||||
# Name "r_opengl - Win32 Release"
|
|
||||||
# Name "r_opengl - Win32 Debug"
|
|
||||||
# Begin Source File
|
|
||||||
|
|
||||||
SOURCE=.\ogl_win.c
|
|
||||||
# End Source File
|
|
||||||
# Begin Source File
|
|
||||||
|
|
||||||
SOURCE=.\r_opengl.c
|
|
||||||
# End Source File
|
|
||||||
# Begin Source File
|
|
||||||
|
|
||||||
SOURCE=.\r_opengl.h
|
|
||||||
# End Source File
|
|
||||||
# End Target
|
|
||||||
# End Project
|
|
||||||
+10
-8
@@ -135,8 +135,7 @@ HMS_on_read (char *s, size_t _1, size_t n, void *userdata)
|
|||||||
return n;
|
return n;
|
||||||
}
|
}
|
||||||
|
|
||||||
static struct HMS_buffer *
|
static struct HMS_buffer *HMS_connect(const char *format, ...)
|
||||||
HMS_connect (const char *format, ...)
|
|
||||||
{
|
{
|
||||||
va_list ap;
|
va_list ap;
|
||||||
CURL *curl;
|
CURL *curl;
|
||||||
@@ -174,7 +173,7 @@ HMS_connect (const char *format, ...)
|
|||||||
if (cv_masterserver_token.string && cv_masterserver_token.string[0])
|
if (cv_masterserver_token.string && cv_masterserver_token.string[0])
|
||||||
{
|
{
|
||||||
quack_token = curl_easy_escape(curl, cv_masterserver_token.string, 0);
|
quack_token = curl_easy_escape(curl, cv_masterserver_token.string, 0);
|
||||||
token_length = ( sizeof "&token="-1 )+ strlen(quack_token);
|
token_length = ( sizeof "&token="-1 ) + strlen(quack_token);
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
@@ -186,27 +185,30 @@ HMS_connect (const char *format, ...)
|
|||||||
I_lock_mutex(&hms_api_mutex);
|
I_lock_mutex(&hms_api_mutex);
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
seek = strlen(hms_api) + 1;/* + '/' */
|
seek = strlen(hms_api) + 1; /* + '/' */
|
||||||
|
|
||||||
va_start (ap, format);
|
va_start (ap, format);
|
||||||
url = malloc(seek + vsnprintf(NULL, 0, format, ap) + sizeof HMS_QUERY_VERSION - 1 + token_length + 1);
|
size_t url_size = (seek + vsnprintf(NULL, 0, format, ap) +
|
||||||
|
sizeof HMS_QUERY_VERSION - 1 +
|
||||||
|
token_length + 1);
|
||||||
|
url = malloc(url_size);
|
||||||
va_end (ap);
|
va_end (ap);
|
||||||
|
|
||||||
sprintf(url, "%s/", hms_api);
|
snprintf(url, seek + 1, "%s/", hms_api);
|
||||||
|
|
||||||
#ifdef HAVE_THREADS
|
#ifdef HAVE_THREADS
|
||||||
I_unlock_mutex(hms_api_mutex);
|
I_unlock_mutex(hms_api_mutex);
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
va_start (ap, format);
|
va_start (ap, format);
|
||||||
seek += vsprintf(&url[seek], format, ap);
|
seek += vsnprintf(&url[seek], url_size - seek, format, ap);
|
||||||
va_end (ap);
|
va_end (ap);
|
||||||
|
|
||||||
strcpy(&url[seek], HMS_QUERY_VERSION);
|
strcpy(&url[seek], HMS_QUERY_VERSION);
|
||||||
seek += sizeof HMS_QUERY_VERSION - 1;
|
seek += sizeof HMS_QUERY_VERSION - 1;
|
||||||
|
|
||||||
if (quack_token)
|
if (quack_token)
|
||||||
sprintf(&url[seek], "&token=%s", quack_token);
|
snprintf(&url[seek], url_size - seek, "&token=%s", quack_token);
|
||||||
|
|
||||||
Printf_url(url);
|
Printf_url(url);
|
||||||
|
|
||||||
|
|||||||
+16
-14
@@ -154,14 +154,14 @@ void HU_LoadGraphics(void)
|
|||||||
for (i = 0; i < HU_FONTSIZE; i++, j++)
|
for (i = 0; i < HU_FONTSIZE; i++, j++)
|
||||||
{
|
{
|
||||||
// cache the heads-up font for entire game execution
|
// cache the heads-up font for entire game execution
|
||||||
sprintf(buffer, "STCFN%.3d", j);
|
snprintf(buffer, sizeof(buffer), "STCFN%.3d", j);
|
||||||
if (W_CheckNumForName(buffer) == LUMPERROR)
|
if (W_CheckNumForName(buffer) == LUMPERROR)
|
||||||
hu_font[i] = NULL;
|
hu_font[i] = NULL;
|
||||||
else
|
else
|
||||||
hu_font[i] = (patch_t *)W_CachePatchName(buffer, PU_HUDGFX);
|
hu_font[i] = (patch_t *)W_CachePatchName(buffer, PU_HUDGFX);
|
||||||
|
|
||||||
// tiny version of the heads-up font
|
// tiny version of the heads-up font
|
||||||
sprintf(buffer, "TNYFN%.3d", j);
|
snprintf(buffer, sizeof(buffer), "TNYFN%.3d", j);
|
||||||
if (W_CheckNumForName(buffer) == LUMPERROR)
|
if (W_CheckNumForName(buffer) == LUMPERROR)
|
||||||
tny_font[i] = NULL;
|
tny_font[i] = NULL;
|
||||||
else
|
else
|
||||||
@@ -188,7 +188,7 @@ void HU_LoadGraphics(void)
|
|||||||
for (i = 0; i < KART_FONTSIZE; i++, j++)
|
for (i = 0; i < KART_FONTSIZE; i++, j++)
|
||||||
{
|
{
|
||||||
// cache the heads-up font for entire game execution
|
// cache the heads-up font for entire game execution
|
||||||
sprintf(buffer, "MKFNT%.3d", j);
|
snprintf(buffer, sizeof(buffer), "MKFNT%.3d", j);
|
||||||
if (W_CheckNumForName(buffer) == LUMPERROR)
|
if (W_CheckNumForName(buffer) == LUMPERROR)
|
||||||
kart_font[i] = NULL;
|
kart_font[i] = NULL;
|
||||||
else
|
else
|
||||||
@@ -199,7 +199,7 @@ void HU_LoadGraphics(void)
|
|||||||
j = LT_FONTSTART;
|
j = LT_FONTSTART;
|
||||||
for (i = 0; i < LT_FONTSIZE; i++)
|
for (i = 0; i < LT_FONTSIZE; i++)
|
||||||
{
|
{
|
||||||
sprintf(buffer, "LTFNT%.3d", j);
|
snprintf(buffer, sizeof(buffer), "LTFNT%.3d", j);
|
||||||
j++;
|
j++;
|
||||||
|
|
||||||
if (W_CheckNumForName(buffer) == LUMPERROR)
|
if (W_CheckNumForName(buffer) == LUMPERROR)
|
||||||
@@ -212,7 +212,7 @@ void HU_LoadGraphics(void)
|
|||||||
j = CRED_FONTSTART;
|
j = CRED_FONTSTART;
|
||||||
for (i = 0; i < CRED_FONTSIZE; i++)
|
for (i = 0; i < CRED_FONTSIZE; i++)
|
||||||
{
|
{
|
||||||
sprintf(buffer, "CRFNT%.3d", j);
|
snprintf(buffer, sizeof(buffer), "CRFNT%.3d", j);
|
||||||
j++;
|
j++;
|
||||||
|
|
||||||
if (W_CheckNumForName(buffer) == LUMPERROR)
|
if (W_CheckNumForName(buffer) == LUMPERROR)
|
||||||
@@ -224,11 +224,11 @@ void HU_LoadGraphics(void)
|
|||||||
// cache numbers too!
|
// cache numbers too!
|
||||||
for (i = 0; i < 10; i++)
|
for (i = 0; i < 10; i++)
|
||||||
{
|
{
|
||||||
sprintf(buffer, "STTNUM%d", i);
|
snprintf(buffer, sizeof(buffer), "STTNUM%d", i);
|
||||||
tallnum[i] = (patch_t *)W_CachePatchName(buffer, PU_HUDGFX);
|
tallnum[i] = (patch_t *)W_CachePatchName(buffer, PU_HUDGFX);
|
||||||
sprintf(buffer, "PINGN%d", i);
|
snprintf(buffer, sizeof(buffer), "PINGN%d", i);
|
||||||
pingnum[i] = (patch_t *)W_CachePatchName(buffer, PU_HUDGFX);
|
pingnum[i] = (patch_t *)W_CachePatchName(buffer, PU_HUDGFX);
|
||||||
sprintf(buffer, "OPPRNK0%d", i);
|
snprintf(buffer, sizeof(buffer), "OPPRNK0%d", i);
|
||||||
ranknum[i] = (patch_t *)W_CachePatchName(buffer, PU_HUDGFX);
|
ranknum[i] = (patch_t *)W_CachePatchName(buffer, PU_HUDGFX);
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -240,7 +240,7 @@ void HU_LoadGraphics(void)
|
|||||||
// cache ping gfx:
|
// cache ping gfx:
|
||||||
for (i = 0; i < 5; i++)
|
for (i = 0; i < 5; i++)
|
||||||
{
|
{
|
||||||
sprintf(buffer, "PINGGFX%d", i+1);
|
snprintf(buffer, sizeof(buffer), "PINGGFX%d", i+1);
|
||||||
pinggfx[i] = (patch_t *)W_CachePatchName(buffer, PU_HUDGFX);
|
pinggfx[i] = (patch_t *)W_CachePatchName(buffer, PU_HUDGFX);
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -2259,12 +2259,13 @@ static void HU_DrawSongCreditsBox(void)
|
|||||||
y = -BOXCREDITHEIGHT*dup + (FixedMul(BOXCREDITHEIGHT*FRACUNIT, FixedDiv(t*FRACUNIT, TICRATE*FRACUNIT/2))*dup - interpoffset)/FRACUNIT;
|
y = -BOXCREDITHEIGHT*dup + (FixedMul(BOXCREDITHEIGHT*FRACUNIT, FixedDiv(t*FRACUNIT, TICRATE*FRACUNIT/2))*dup - interpoffset)/FRACUNIT;
|
||||||
}
|
}
|
||||||
|
|
||||||
bgt = (NUMTRANSMAPS/2) + (cursongcredit.trans/2);
|
bgt = (NUMTRANSMAPS/2) + (cursongcredit.trans/2) - 2; // arbitrary value, looks a bit better
|
||||||
|
|
||||||
if (bgt < NUMTRANSMAPS)
|
if (bgt < NUMTRANSMAPS)
|
||||||
{
|
{
|
||||||
V_DrawFill(x, y, strwidth*dup, BOXCREDITHEIGHT*dup, 28|flags|(bgt<<V_ALPHASHIFT));
|
const UINT8 accent = colortranslations[K_GetHudColor()][7];
|
||||||
V_DrawFill(x+dup, y+dup, (strwidth-2)*dup, (BOXCREDITHEIGHT-2)*dup, 30|flags|(bgt<<V_ALPHASHIFT));
|
V_DrawFill(x, y, strwidth*dup, BOXCREDITHEIGHT*dup, accent|flags|(bgt<<V_ALPHASHIFT));
|
||||||
|
V_DrawFill(x+dup, y+dup, (strwidth-2)*dup, (BOXCREDITHEIGHT-2)*dup, accent|flags|(bgt<<V_ALPHASHIFT));
|
||||||
}
|
}
|
||||||
|
|
||||||
if (cursongcredit.trans < NUMTRANSMAPS)
|
if (cursongcredit.trans < NUMTRANSMAPS)
|
||||||
@@ -2829,8 +2830,9 @@ static void HU_DrawRankings(void)
|
|||||||
scorelines++;
|
scorelines++;
|
||||||
|
|
||||||
#if MAXPLAYERS > 16
|
#if MAXPLAYERS > 16
|
||||||
if (scorelines > 16)
|
// 32 Player TODO: port over and cleanup scoreboard from sat-32p/blankart
|
||||||
break; //dont draw past bottom of screen, show the best only
|
if (scorelines >= 16)
|
||||||
|
break; // dont draw past bottom of screen, show the best only
|
||||||
#endif
|
#endif
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -14,6 +14,9 @@
|
|||||||
#ifndef __I_SYSTEM__
|
#ifndef __I_SYSTEM__
|
||||||
#define __I_SYSTEM__
|
#define __I_SYSTEM__
|
||||||
|
|
||||||
|
// page for Saturn issue reports
|
||||||
|
#define SATURNISSUEPAGE "https://github.com/Indev450/SRB2Kart-Saturn/issues"
|
||||||
|
|
||||||
#ifdef __cplusplus
|
#ifdef __cplusplus
|
||||||
extern "C" {
|
extern "C" {
|
||||||
#endif
|
#endif
|
||||||
@@ -209,6 +212,10 @@ static inline void I_HandleInterrupt(void)
|
|||||||
I_Quit();
|
I_Quit();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/** \brief Open A URL
|
||||||
|
*/
|
||||||
|
int I_OpenURL(const char *url);
|
||||||
|
|
||||||
/** \brief The I_GetDiskFreeSpace function
|
/** \brief The I_GetDiskFreeSpace function
|
||||||
|
|
||||||
\param freespace a INT64 pointer to hold the free space amount
|
\param freespace a INT64 pointer to hold the free space amount
|
||||||
@@ -230,6 +237,21 @@ char *I_GetUserName(void);
|
|||||||
*/
|
*/
|
||||||
INT32 I_mkdir(const char *dirname, INT32 unixright);
|
INT32 I_mkdir(const char *dirname, INT32 unixright);
|
||||||
|
|
||||||
|
/** \brief Change current working directory
|
||||||
|
|
||||||
|
\param path directory path
|
||||||
|
\return 0 on success, -1 on error
|
||||||
|
*/
|
||||||
|
INT32 I_ChDir(const char *path);
|
||||||
|
|
||||||
|
/** \brief Get current working directory
|
||||||
|
|
||||||
|
\param buf buffer to store path
|
||||||
|
\param size size of buffer
|
||||||
|
\return buf on success, NULL on error
|
||||||
|
*/
|
||||||
|
char *I_GetCwd(char *buf, size_t size);
|
||||||
|
|
||||||
/** \brief Find main WAD
|
/** \brief Find main WAD
|
||||||
\return path to main WAD
|
\return path to main WAD
|
||||||
*/
|
*/
|
||||||
|
|||||||
+5
-5
@@ -213,7 +213,7 @@ static char *get_WSAErrorStr(int e)
|
|||||||
NULL);
|
NULL);
|
||||||
|
|
||||||
if (!buf[0]) // provide a fallback error message if no message is available for some reason
|
if (!buf[0]) // provide a fallback error message if no message is available for some reason
|
||||||
sprintf(buf, "Unknown error");
|
snprintf(buf, sizeof(buf), "Unknown error");
|
||||||
|
|
||||||
return buf;
|
return buf;
|
||||||
}
|
}
|
||||||
@@ -364,12 +364,12 @@ static const char *SOCK_AddrToStr(mysockaddr_t *sk)
|
|||||||
|
|
||||||
if (addr == NULL)
|
if (addr == NULL)
|
||||||
{
|
{
|
||||||
sprintf(s, "No address");
|
snprintf(s, sizeof(s), "No address");
|
||||||
}
|
}
|
||||||
else if (inet_ntop(sk->any.sa_family, addr, &s[v6], sizeof (s) - v6) == NULL)
|
else if (inet_ntop(sk->any.sa_family, addr, &s[v6], sizeof (s) - v6) == NULL)
|
||||||
{
|
{
|
||||||
e = errno;
|
e = errno;
|
||||||
sprintf(s, "Unknown family type, error #%u: %s", e, strerror(e));
|
snprintf(s, sizeof(s), "Unknown family type, error #%u: %s", e, strerror(e));
|
||||||
}
|
}
|
||||||
#ifdef HAVE_IPV6
|
#ifdef HAVE_IPV6
|
||||||
else if(sk->any.sa_family == AF_INET6)
|
else if(sk->any.sa_family == AF_INET6)
|
||||||
@@ -416,7 +416,7 @@ static const char *SOCK_GetBanMask(size_t ban)
|
|||||||
if (ban >= numbans)
|
if (ban >= numbans)
|
||||||
return NULL;
|
return NULL;
|
||||||
|
|
||||||
if (sprintf(s,"%d",banned[ban].mask) > 0)
|
if (snprintf(s, sizeof(s), "%d",banned[ban].mask) > 0)
|
||||||
return s;
|
return s;
|
||||||
|
|
||||||
return NULL;
|
return NULL;
|
||||||
@@ -622,7 +622,6 @@ static boolean hole_punch(ssize_t c)
|
|||||||
{
|
{
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
#endif //ifdef HOLEPUNCH
|
#endif //ifdef HOLEPUNCH
|
||||||
|
|
||||||
@@ -1694,6 +1693,7 @@ boolean I_InitTcpNetwork(void)
|
|||||||
hardware_MAXPACKETLENGTH = MAXPACKETLENGTH;
|
hardware_MAXPACKETLENGTH = MAXPACKETLENGTH;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if (M_CheckProtoParam("ip"))
|
if (M_CheckProtoParam("ip"))
|
||||||
{
|
{
|
||||||
COM_ImmedExecute(va("exec \"%s"PATHSEP"kartexec.cfg\" -noerror\n", srb2home));
|
COM_ImmedExecute(va("exec \"%s"PATHSEP"kartexec.cfg\" -noerror\n", srb2home));
|
||||||
|
|||||||
+3
-3
@@ -452,10 +452,10 @@ void A_SpawnFreshCopy(void *actor);
|
|||||||
extern boolean actionsoverridden[NUMACTIONS];
|
extern boolean actionsoverridden[NUMACTIONS];
|
||||||
|
|
||||||
// ratio of states to sprites to mobj types is roughly 6 : 1 : 1
|
// ratio of states to sprites to mobj types is roughly 6 : 1 : 1
|
||||||
#ifdef COMPAT_VANILLA
|
#ifdef PHOBOS_BUILD
|
||||||
#define NUMMOBJFREESLOTS 1024
|
|
||||||
#else
|
|
||||||
#define NUMMOBJFREESLOTS 4096 // should be sufficient
|
#define NUMMOBJFREESLOTS 4096 // should be sufficient
|
||||||
|
#else
|
||||||
|
#define NUMMOBJFREESLOTS 1024
|
||||||
#endif
|
#endif
|
||||||
#define NUMSPRITEFREESLOTS NUMMOBJFREESLOTS
|
#define NUMSPRITEFREESLOTS NUMMOBJFREESLOTS
|
||||||
#define NUMSTATEFREESLOTS (NUMMOBJFREESLOTS*8)
|
#define NUMSTATEFREESLOTS (NUMMOBJFREESLOTS*8)
|
||||||
|
|||||||
+62
-24
@@ -388,7 +388,7 @@ static void K_LoadSaturnHUDGraphics(void)
|
|||||||
skp_speedpatchesdial[3] = (patch_t *)W_CachePatchName("SP_DFRAC", PU_HUDGFX);
|
skp_speedpatchesdial[3] = (patch_t *)W_CachePatchName("SP_DFRAC", PU_HUDGFX);
|
||||||
skp_speedpatchesdial[4] = (patch_t *)W_CachePatchName("SP_DPERC", PU_HUDGFX);
|
skp_speedpatchesdial[4] = (patch_t *)W_CachePatchName("SP_DPERC", PU_HUDGFX);
|
||||||
|
|
||||||
sprintf(buffer, "K_DSPNMx");
|
snprintf(buffer, sizeof(buffer), "K_DSPNMx");
|
||||||
for (i = 0; i < 10; i++)
|
for (i = 0; i < 10; i++)
|
||||||
{
|
{
|
||||||
buffer[7] = '0'+(i%10);
|
buffer[7] = '0'+(i%10);
|
||||||
@@ -507,7 +507,7 @@ static void K_LoadSaturnHUDGraphics(void)
|
|||||||
skp_speedpatchesdialclr[3] = (patch_t *)W_CachePatchName("SC_DFRAC", PU_HUDGFX);
|
skp_speedpatchesdialclr[3] = (patch_t *)W_CachePatchName("SC_DFRAC", PU_HUDGFX);
|
||||||
skp_speedpatchesdialclr[4] = (patch_t *)W_CachePatchName("SC_DPERC", PU_HUDGFX);
|
skp_speedpatchesdialclr[4] = (patch_t *)W_CachePatchName("SC_DPERC", PU_HUDGFX);
|
||||||
|
|
||||||
sprintf(buffer, "K_DSPNCx");
|
snprintf(buffer, sizeof(buffer), "K_DSPNCx");
|
||||||
for (i = 0; i < 10; i++)
|
for (i = 0; i < 10; i++)
|
||||||
{
|
{
|
||||||
buffer[7] = '0'+(i%10);
|
buffer[7] = '0'+(i%10);
|
||||||
@@ -677,7 +677,7 @@ void K_LoadKartHUDGraphics(void)
|
|||||||
kp_racefinish[5] = (patch_t *)W_CachePatchName("K_2PFINB", PU_HUDGFX);
|
kp_racefinish[5] = (patch_t *)W_CachePatchName("K_2PFINB", PU_HUDGFX);
|
||||||
|
|
||||||
// Position numbers
|
// Position numbers
|
||||||
sprintf(buffer, "K_POSNxx");
|
snprintf(buffer, sizeof(buffer), "K_POSNxx");
|
||||||
for (i = 0; i < NUMPOSNUMS; i++)
|
for (i = 0; i < NUMPOSNUMS; i++)
|
||||||
{
|
{
|
||||||
buffer[6] = '0'+i;
|
buffer[6] = '0'+i;
|
||||||
@@ -688,14 +688,17 @@ void K_LoadKartHUDGraphics(void)
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
sprintf(buffer, "K_POSNWx");
|
snprintf(buffer, sizeof(buffer), "K_POSNWx");
|
||||||
for (i = 0; i < NUMWINFRAMES; i++)
|
for (i = 0; i < NUMWINFRAMES; i++)
|
||||||
{
|
{
|
||||||
buffer[7] = '0'+i;
|
buffer[7] = '0'+i;
|
||||||
kp_winnernum[i] = (patch_t *)W_CachePatchName(buffer, PU_HUDGFX);
|
kp_winnernum[i] = (patch_t *)W_CachePatchName(buffer, PU_HUDGFX);
|
||||||
}
|
}
|
||||||
|
|
||||||
sprintf(buffer, "OPPRNKxx");
|
// 32 player note: there are only 16 of those!
|
||||||
|
// so slots after this will just be missing patches!
|
||||||
|
// but keeping like this incase of missed adjustments which might cause crashes otherwise
|
||||||
|
snprintf(buffer, sizeof(buffer), "OPPRNKxx");
|
||||||
for (i = 0; i <= MAXPLAYERS; i++)
|
for (i = 0; i <= MAXPLAYERS; i++)
|
||||||
{
|
{
|
||||||
buffer[6] = '0'+(i/10);
|
buffer[6] = '0'+(i/10);
|
||||||
@@ -703,7 +706,7 @@ void K_LoadKartHUDGraphics(void)
|
|||||||
kp_facenum[i] = (patch_t *)W_CachePatchName(buffer, PU_HUDGFX);
|
kp_facenum[i] = (patch_t *)W_CachePatchName(buffer, PU_HUDGFX);
|
||||||
}
|
}
|
||||||
|
|
||||||
sprintf(buffer, "K_CHILIx");
|
snprintf(buffer, sizeof(buffer), "K_CHILIx");
|
||||||
for (i = 0; i < 8; i++)
|
for (i = 0; i < 8; i++)
|
||||||
{
|
{
|
||||||
buffer[7] = '0'+(i+1);
|
buffer[7] = '0'+(i+1);
|
||||||
@@ -772,21 +775,21 @@ void K_LoadKartHUDGraphics(void)
|
|||||||
kp_kitchensink[1] = (patch_t *)W_CachePatchName("K_ISSINK", PU_HUDGFX);
|
kp_kitchensink[1] = (patch_t *)W_CachePatchName("K_ISSINK", PU_HUDGFX);
|
||||||
kp_sadface[1] = (patch_t *)W_CachePatchName("K_ISSAD", PU_HUDGFX);
|
kp_sadface[1] = (patch_t *)W_CachePatchName("K_ISSAD", PU_HUDGFX);
|
||||||
|
|
||||||
sprintf(buffer, "K_ITINVx");
|
snprintf(buffer, sizeof(buffer), "K_ITINVx");
|
||||||
for (i = 0; i < 7; i++)
|
for (i = 0; i < 7; i++)
|
||||||
{
|
{
|
||||||
buffer[7] = '1'+i;
|
buffer[7] = '1'+i;
|
||||||
kp_invincibility[i] = (patch_t *)W_CachePatchName(buffer, PU_HUDGFX);
|
kp_invincibility[i] = (patch_t *)W_CachePatchName(buffer, PU_HUDGFX);
|
||||||
}
|
}
|
||||||
|
|
||||||
sprintf(buffer, "K_ITORBx");
|
snprintf(buffer, sizeof(buffer), "K_ITORBx");
|
||||||
for (i = 0; i < 4; i++)
|
for (i = 0; i < 4; i++)
|
||||||
{
|
{
|
||||||
buffer[7] = '1'+i;
|
buffer[7] = '1'+i;
|
||||||
kp_orbinaut[i] = (patch_t *)W_CachePatchName(buffer, PU_HUDGFX);
|
kp_orbinaut[i] = (patch_t *)W_CachePatchName(buffer, PU_HUDGFX);
|
||||||
}
|
}
|
||||||
|
|
||||||
sprintf(buffer, "K_ISINVx");
|
snprintf(buffer, sizeof(buffer), "K_ISINVx");
|
||||||
for (i = 0; i < 6; i++)
|
for (i = 0; i < 6; i++)
|
||||||
{
|
{
|
||||||
buffer[7] = '1'+i;
|
buffer[7] = '1'+i;
|
||||||
@@ -794,7 +797,7 @@ void K_LoadKartHUDGraphics(void)
|
|||||||
}
|
}
|
||||||
|
|
||||||
// CHECK indicators
|
// CHECK indicators
|
||||||
sprintf(buffer, "K_CHECKx");
|
snprintf(buffer, sizeof(buffer), "K_CHECKx");
|
||||||
for (i = 0; i < 6; i++)
|
for (i = 0; i < 6; i++)
|
||||||
{
|
{
|
||||||
buffer[7] = '1'+i;
|
buffer[7] = '1'+i;
|
||||||
@@ -802,7 +805,7 @@ void K_LoadKartHUDGraphics(void)
|
|||||||
}
|
}
|
||||||
|
|
||||||
// Eggman warning numbers
|
// Eggman warning numbers
|
||||||
sprintf(buffer, "K_EGGNx");
|
snprintf(buffer, sizeof(buffer), "K_EGGNx");
|
||||||
for (i = 0; i < 4; i++)
|
for (i = 0; i < 4; i++)
|
||||||
{
|
{
|
||||||
buffer[6] = '0'+i;
|
buffer[6] = '0'+i;
|
||||||
@@ -815,7 +818,7 @@ void K_LoadKartHUDGraphics(void)
|
|||||||
kp_fpview[2] = (patch_t *)W_CachePatchName("VIEWC0E0", PU_HUDGFX);
|
kp_fpview[2] = (patch_t *)W_CachePatchName("VIEWC0E0", PU_HUDGFX);
|
||||||
|
|
||||||
// Input UI Wheel
|
// Input UI Wheel
|
||||||
sprintf(buffer, "K_WHEELx");
|
snprintf(buffer, sizeof(buffer), "K_WHEELx");
|
||||||
for (i = 0; i < 5; i++)
|
for (i = 0; i < 5; i++)
|
||||||
{
|
{
|
||||||
buffer[7] = '0'+i;
|
buffer[7] = '0'+i;
|
||||||
@@ -823,7 +826,7 @@ void K_LoadKartHUDGraphics(void)
|
|||||||
}
|
}
|
||||||
|
|
||||||
// HERE COMES A NEW CHALLENGER
|
// HERE COMES A NEW CHALLENGER
|
||||||
sprintf(buffer, "K_CHALxx");
|
snprintf(buffer, sizeof(buffer), "K_CHALxx");
|
||||||
for (i = 0; i < 25; i++)
|
for (i = 0; i < 25; i++)
|
||||||
{
|
{
|
||||||
buffer[6] = '0'+((i+1)/10);
|
buffer[6] = '0'+((i+1)/10);
|
||||||
@@ -832,14 +835,14 @@ void K_LoadKartHUDGraphics(void)
|
|||||||
}
|
}
|
||||||
|
|
||||||
// Lap start animation
|
// Lap start animation
|
||||||
sprintf(buffer, "K_LAP0x");
|
snprintf(buffer, sizeof(buffer), "K_LAP0x");
|
||||||
for (i = 0; i < 7; i++)
|
for (i = 0; i < 7; i++)
|
||||||
{
|
{
|
||||||
buffer[6] = '0'+(i+1);
|
buffer[6] = '0'+(i+1);
|
||||||
kp_lapanim_lap[i] = (patch_t *)W_CachePatchName(buffer, PU_HUDGFX);
|
kp_lapanim_lap[i] = (patch_t *)W_CachePatchName(buffer, PU_HUDGFX);
|
||||||
}
|
}
|
||||||
|
|
||||||
sprintf(buffer, "K_LAPFxx");
|
snprintf(buffer, sizeof(buffer), "K_LAPFxx");
|
||||||
for (i = 0; i < 11; i++)
|
for (i = 0; i < 11; i++)
|
||||||
{
|
{
|
||||||
buffer[6] = '0'+((i+1)/10);
|
buffer[6] = '0'+((i+1)/10);
|
||||||
@@ -847,7 +850,7 @@ void K_LoadKartHUDGraphics(void)
|
|||||||
kp_lapanim_final[i] = (patch_t *)W_CachePatchName(buffer, PU_HUDGFX);
|
kp_lapanim_final[i] = (patch_t *)W_CachePatchName(buffer, PU_HUDGFX);
|
||||||
}
|
}
|
||||||
|
|
||||||
sprintf(buffer, "K_LAPNxx");
|
snprintf(buffer, sizeof(buffer), "K_LAPNxx");
|
||||||
for (i = 0; i < 10; i++)
|
for (i = 0; i < 10; i++)
|
||||||
{
|
{
|
||||||
buffer[6] = '0'+i;
|
buffer[6] = '0'+i;
|
||||||
@@ -858,14 +861,14 @@ void K_LoadKartHUDGraphics(void)
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
sprintf(buffer, "K_LAPE0x");
|
snprintf(buffer, sizeof(buffer), "K_LAPE0x");
|
||||||
for (i = 0; i < 2; i++)
|
for (i = 0; i < 2; i++)
|
||||||
{
|
{
|
||||||
buffer[7] = '0'+(i+1);
|
buffer[7] = '0'+(i+1);
|
||||||
kp_lapanim_emblem[i] = (patch_t *)W_CachePatchName(buffer, PU_HUDGFX);
|
kp_lapanim_emblem[i] = (patch_t *)W_CachePatchName(buffer, PU_HUDGFX);
|
||||||
}
|
}
|
||||||
|
|
||||||
sprintf(buffer, "K_LAPH0x");
|
snprintf(buffer, sizeof(buffer), "K_LAPH0x");
|
||||||
for (i = 0; i < 3; i++)
|
for (i = 0; i < 3; i++)
|
||||||
{
|
{
|
||||||
buffer[7] = '0'+(i+1);
|
buffer[7] = '0'+(i+1);
|
||||||
@@ -1974,7 +1977,7 @@ void K_drawKartTimestamp(tic_t drawtime, INT32 TX, INT32 TY, INT16 emblemmap, UI
|
|||||||
goto bademblem;
|
goto bademblem;
|
||||||
}
|
}
|
||||||
|
|
||||||
snprintf(targettext, 9, "%i'%02i\"%02i",
|
snprintf(targettext, sizeof(targettext), "%i'%02i\"%02i",
|
||||||
G_TicsToMinutes(timetoreach, false),
|
G_TicsToMinutes(timetoreach, false),
|
||||||
G_TicsToSeconds(timetoreach),
|
G_TicsToSeconds(timetoreach),
|
||||||
G_TicsToCentiseconds(timetoreach));
|
G_TicsToCentiseconds(timetoreach));
|
||||||
@@ -2294,6 +2297,11 @@ static boolean K_drawKartPositionFaces(void)
|
|||||||
if (pos < 0 || pos > MAXPLAYERS)
|
if (pos < 0 || pos > MAXPLAYERS)
|
||||||
pos = 0;
|
pos = 0;
|
||||||
|
|
||||||
|
#if MAXPLAYERS > 16
|
||||||
|
if (pos > 16)
|
||||||
|
V_DrawPingNum(FACE_X+2, Y+10, V_HUDTRANS|V_SNAPTOLEFT, pos, NULL);
|
||||||
|
else
|
||||||
|
#endif
|
||||||
// Draws the little number over the face
|
// Draws the little number over the face
|
||||||
V_DrawScaledPatch(FACE_X-5, Y+10, V_HUDTRANS|V_SNAPTOLEFT, kp_facenum[pos]);
|
V_DrawScaledPatch(FACE_X-5, Y+10, V_HUDTRANS|V_SNAPTOLEFT, kp_facenum[pos]);
|
||||||
}
|
}
|
||||||
@@ -2385,6 +2393,12 @@ void HU_DrawTabRankings(INT32 x, INT32 y, playersort_t *tab, INT32 scorelines, I
|
|||||||
INT32 pos = player->kartstuff[k_position];
|
INT32 pos = player->kartstuff[k_position];
|
||||||
if (pos < 0 || pos > MAXPLAYERS)
|
if (pos < 0 || pos > MAXPLAYERS)
|
||||||
pos = 0;
|
pos = 0;
|
||||||
|
|
||||||
|
#if MAXPLAYERS > 16
|
||||||
|
if (pos > 16)
|
||||||
|
V_DrawPingNum(x+2, y+10, 0, pos, NULL);
|
||||||
|
else
|
||||||
|
#endif
|
||||||
// Draws the little number over the face
|
// Draws the little number over the face
|
||||||
V_DrawScaledPatch(x-5, y+6, 0, kp_facenum[pos]);
|
V_DrawScaledPatch(x-5, y+6, 0, kp_facenum[pos]);
|
||||||
}
|
}
|
||||||
@@ -3581,6 +3595,10 @@ static void K_drawKartMinimapHead(mobj_t *mo, INT32 x, INT32 y, INT32 flags)
|
|||||||
#endif
|
#endif
|
||||||
|
|
||||||
skin = K_GetMobjSkin(mo);
|
skin = K_GetMobjSkin(mo);
|
||||||
|
|
||||||
|
if (!skin)
|
||||||
|
return;
|
||||||
|
|
||||||
minimaphead = (skinlocal ? localfacemmapprefix : facemmapprefix)[K_GetMobjSkinNum(skin, skinlocal)];
|
minimaphead = (skinlocal ? localfacemmapprefix : facemmapprefix)[K_GetMobjSkinNum(skin, skinlocal)];
|
||||||
|
|
||||||
if (minimaphead == NULL)
|
if (minimaphead == NULL)
|
||||||
@@ -3784,6 +3802,9 @@ static void K_drawKartMinimap(void)
|
|||||||
|
|
||||||
mobj_t *mobj = players[localplayers[i]].mo;
|
mobj_t *mobj = players[localplayers[i]].mo;
|
||||||
|
|
||||||
|
if (!mobj)
|
||||||
|
continue;
|
||||||
|
|
||||||
// dont draw for no contestants
|
// dont draw for no contestants
|
||||||
boolean playertimedout = (mobj->health <= 0 && players[localplayers[i]].pflags & PF_TIMEOVER);
|
boolean playertimedout = (mobj->health <= 0 && players[localplayers[i]].pflags & PF_TIMEOVER);
|
||||||
|
|
||||||
@@ -3941,10 +3962,23 @@ static void K_drawBattleFullscreen(void)
|
|||||||
|
|
||||||
INT32 x = BASEVIDWIDTH/2;
|
INT32 x = BASEVIDWIDTH/2;
|
||||||
INT32 y = (-64*FRACUNIT) + cardanim; // card animation goes from 0 to 164, 164 is the middle of the screen
|
INT32 y = (-64*FRACUNIT) + cardanim; // card animation goes from 0 to 164, 164 is the middle of the screen
|
||||||
INT32 splitflags = V_SNAPTOTOP; // I don't feel like properly supporting non-green resolutions, so you can have a misuse of SNAPTO instead
|
INT32 splitflags = splitscreen ? V_SNAPTOTOP : 0; // I don't feel like properly supporting non-green resolutions, so you can have a misuse of SNAPTO instead
|
||||||
fixed_t scale = FRACUNIT;
|
fixed_t scale = FRACUNIT;
|
||||||
boolean drawcomebacktimer = true; // lazy hack because it's cleaner in the long run.
|
boolean drawcomebacktimer = true; // lazy hack because it's cleaner in the long run.
|
||||||
|
|
||||||
|
// Small hack, if we're not in splitscreen we will not use V_SNAPTOTOP, instead we will just slightly offset
|
||||||
|
// y position so "attack or protect" doesn't slightly show before popping in
|
||||||
|
// We will also reduce this when is closer to finishing so when its at the bottom, the "hack offset" is 0
|
||||||
|
if (!splitscreen)
|
||||||
|
{
|
||||||
|
fixed_t offset = ((vid.height - vid.dup*BASEVIDHEIGHT)/vid.dup) * FRACUNIT/2;
|
||||||
|
|
||||||
|
// cardanim goes from 0 to 164, so when it is 164 offset will be multiplied by (1 - 164/164) = 0 :3
|
||||||
|
offset = FixedMul(offset, FRACUNIT - FixedDiv(cardanim, 164*FRACUNIT));
|
||||||
|
|
||||||
|
y -= offset;
|
||||||
|
}
|
||||||
|
|
||||||
if (!LUA_HudEnabled(hud_battlecomebacktimer))
|
if (!LUA_HudEnabled(hud_battlecomebacktimer))
|
||||||
drawcomebacktimer = false;
|
drawcomebacktimer = false;
|
||||||
|
|
||||||
@@ -4032,12 +4066,12 @@ static void K_drawBattleFullscreen(void)
|
|||||||
if (K_UseColorHud()) // Colourized hud
|
if (K_UseColorHud()) // Colourized hud
|
||||||
{
|
{
|
||||||
UINT8 *colormap = R_GetTranslationColormap(TC_DEFAULT, K_GetHudColor(), GTC_CACHE);
|
UINT8 *colormap = R_GetTranslationColormap(TC_DEFAULT, K_GetHudColor(), GTC_CACHE);
|
||||||
V_DrawFixedPatch(x<<FRACBITS, ty<<FRACBITS, scale, 0, kp_timeoutstickerclr, colormap);
|
V_DrawFixedPatch(x<<FRACBITS, ty<<FRACBITS, scale, splitflags, kp_timeoutstickerclr, colormap);
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
V_DrawFixedPatch(x<<FRACBITS, ty<<FRACBITS, scale, 0, kp_timeoutsticker, NULL);
|
V_DrawFixedPatch(x<<FRACBITS, ty<<FRACBITS, scale, splitflags, kp_timeoutsticker, NULL);
|
||||||
|
|
||||||
V_DrawKartString(x-txoff, ty, 0, va("%d", stplyr->kartstuff[k_comebacktimer]/TICRATE));
|
V_DrawKartString(x-txoff, ty, splitflags, va("%d", stplyr->kartstuff[k_comebacktimer]/TICRATE));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -4576,7 +4610,11 @@ static void K_drawCheckpointDebugger(void)
|
|||||||
else
|
else
|
||||||
V_DrawString(8, 184, 0, va("Checkpoint: %d / %d (Skip: %d)", stplyr->starpostnum, numstarposts, ((numstarposts/2) + stplyr->starpostnum)));
|
V_DrawString(8, 184, 0, va("Checkpoint: %d / %d (Skip: %d)", stplyr->starpostnum, numstarposts, ((numstarposts/2) + stplyr->starpostnum)));
|
||||||
|
|
||||||
V_DrawString(8, 192, 0, va("Waypoint dist: Prev %d, Next %d", stplyr->kartstuff[k_prevcheck], stplyr->kartstuff[k_nextcheck]));
|
// really gnarly hack
|
||||||
|
const INT32 prevcheck = (stprevnextchecks[0] != INT32_MAX) ? stprevnextchecks[0]: stplyr->kartstuff[k_prevcheck];
|
||||||
|
const INT32 nextcheck = (stprevnextchecks[1] != INT32_MAX) ? stprevnextchecks[1]: stplyr->kartstuff[k_nextcheck];
|
||||||
|
|
||||||
|
V_DrawString(8, 192, 0, va("Waypoint dist: Prev %d, Next %d", prevcheck, nextcheck));
|
||||||
}
|
}
|
||||||
|
|
||||||
// determines if gametype info (laps/bumpers) should be hidden
|
// determines if gametype info (laps/bumpers) should be hidden
|
||||||
|
|||||||
+115
-98
@@ -34,7 +34,7 @@
|
|||||||
|
|
||||||
|
|
||||||
// extra colourisation stuff
|
// extra colourisation stuff
|
||||||
static CV_PossibleValue_t colorspeedlines_cons_t[] = {{0, "Off"}, {1, "Normal"}, {2, "+Driftcharge"}, {3, "Drift only"}, {0, NULL}};
|
static CV_PossibleValue_t colorspeedlines_cons_t[] = {{0, "Off"}, {1, "On"}, {0, NULL}};
|
||||||
consvar_t cv_coloredspeedlines = {"colorizedspeedlines", "Off", CV_SAVE, colorspeedlines_cons_t, NULL, 0, NULL, NULL, 0, 0, NULL};
|
consvar_t cv_coloredspeedlines = {"colorizedspeedlines", "Off", CV_SAVE, colorspeedlines_cons_t, NULL, 0, NULL, NULL, 0, 0, NULL};
|
||||||
|
|
||||||
consvar_t cv_coloredsneakertrail = {"sneakertrailcolor", "Off", CV_SAVE, CV_OnOff, NULL, 0, NULL, NULL, 0, 0, NULL};
|
consvar_t cv_coloredsneakertrail = {"sneakertrailcolor", "Off", CV_SAVE, CV_OnOff, NULL, 0, NULL, NULL, 0, 0, NULL};
|
||||||
@@ -1033,6 +1033,12 @@ INT32 K_KartGetItemOdds(UINT8 pos, SINT8 item, fixed_t mashed, boolean spbrush)
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#if MAXPLAYERS > 16
|
||||||
|
// courtesy of fickle from 1.1 battleroyale
|
||||||
|
// battleroyale: limit how much items will scale to try to prevent shit-tier items in shit-huge netames
|
||||||
|
pingame = min(pingame, 12);
|
||||||
|
#endif
|
||||||
|
|
||||||
if (first != -1 && second != -1) // calculate 2nd's distance from 1st, for SPB
|
if (first != -1 && second != -1) // calculate 2nd's distance from 1st, for SPB
|
||||||
{
|
{
|
||||||
secondist = P_AproxDistance(P_AproxDistance(players[first].mo->x - players[second].mo->x,
|
secondist = P_AproxDistance(P_AproxDistance(players[first].mo->x - players[second].mo->x,
|
||||||
@@ -3522,26 +3528,6 @@ static INT32 K_StairJankFlip(INT32 value)
|
|||||||
return K_AltFlip(value, 2);
|
return K_AltFlip(value, 2);
|
||||||
}
|
}
|
||||||
|
|
||||||
// reset banan and eggbox rollangle when they´re on the ground
|
|
||||||
// if not cv_bananthrowroll option "+Onground"
|
|
||||||
static void K_ResetBananaRollangle(mobj_t* mo)
|
|
||||||
{
|
|
||||||
if (cv_bananthrowroll.value != 1)
|
|
||||||
return;
|
|
||||||
|
|
||||||
if (!mo->rollangle)
|
|
||||||
return;
|
|
||||||
|
|
||||||
if (mo->type != MT_BANANA && mo->type != MT_EGGMANITEM)
|
|
||||||
return;
|
|
||||||
|
|
||||||
// only reset if on ground
|
|
||||||
if (!P_IsObjectOnGround(mo))
|
|
||||||
return;
|
|
||||||
|
|
||||||
mo->rollangle = 0;
|
|
||||||
}
|
|
||||||
|
|
||||||
#define SLOPEROLL_DIV 3
|
#define SLOPEROLL_DIV 3
|
||||||
void K_RollMobjBySlopes(mobj_t* mo, pslope_t *slope)
|
void K_RollMobjBySlopes(mobj_t* mo, pslope_t *slope)
|
||||||
{
|
{
|
||||||
@@ -3555,9 +3541,6 @@ void K_RollMobjBySlopes(mobj_t* mo, pslope_t *slope)
|
|||||||
I_Assert(mo->subsector != NULL);
|
I_Assert(mo->subsector != NULL);
|
||||||
I_Assert(mo->subsector->sector != NULL);
|
I_Assert(mo->subsector->sector != NULL);
|
||||||
|
|
||||||
// kinda stupid but idk where else to put this
|
|
||||||
K_ResetBananaRollangle(mo);
|
|
||||||
|
|
||||||
if (!K_ShouldSlopeRoll(mo))
|
if (!K_ShouldSlopeRoll(mo))
|
||||||
{
|
{
|
||||||
mo->pitch_sprite = mo->roll_sprite = 0;
|
mo->pitch_sprite = mo->roll_sprite = 0;
|
||||||
@@ -4725,11 +4708,7 @@ void K_RepairOrbitChain(mobj_t *orbit)
|
|||||||
}
|
}
|
||||||
|
|
||||||
// Then recount to make sure item amount is correct
|
// Then recount to make sure item amount is correct
|
||||||
#ifndef COMPAT_VANILLA
|
if (!P_MobjWasRemovedCompat(orbit->target) && orbit->target->player)
|
||||||
if (!P_MobjWasRemoved(orbit->target) && orbit->target->player)
|
|
||||||
#else
|
|
||||||
if (orbit->target && orbit->target->player)
|
|
||||||
#endif
|
|
||||||
{
|
{
|
||||||
INT32 num = 0;
|
INT32 num = 0;
|
||||||
|
|
||||||
@@ -4746,11 +4725,7 @@ void K_RepairOrbitChain(mobj_t *orbit)
|
|||||||
prev->movedir = num;
|
prev->movedir = num;
|
||||||
}
|
}
|
||||||
|
|
||||||
#ifndef COMPAT_VANILLA
|
if (!P_MobjWasRemovedCompat(orbit->target))
|
||||||
if (!P_MobjWasRemoved(orbit->target))
|
|
||||||
#else
|
|
||||||
if (orbit->target)
|
|
||||||
#endif
|
|
||||||
orbit->target->player->kartstuff[k_itemamount] = num;
|
orbit->target->player->kartstuff[k_itemamount] = num;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -4897,7 +4872,7 @@ static void K_CalculateBananaSlope(mobj_t *mobj, fixed_t x, fixed_t y, fixed_t z
|
|||||||
// Move the hnext chain!
|
// Move the hnext chain!
|
||||||
static void K_MoveHeldObjects(player_t *player)
|
static void K_MoveHeldObjects(player_t *player)
|
||||||
{
|
{
|
||||||
if (!player->mo)
|
if (P_MobjWasRemovedCompat(player->mo))
|
||||||
return;
|
return;
|
||||||
|
|
||||||
if (!player->mo->hnext)
|
if (!player->mo->hnext)
|
||||||
@@ -5493,59 +5468,15 @@ boolean K_PlayerEffectsShouldBlend(player_t *player)
|
|||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
static UINT8 K_GetSpeedLineColor(player_t *player, boolean colorSpeed)
|
FUNCINLINE static ATTRINLINE void K_SpawnNormalSpeedLines(player_t *player)
|
||||||
{
|
{
|
||||||
UINT8 speedcolor = SKINCOLOR_NONE;
|
|
||||||
const UINT8 playercolor = player->mo->color;
|
|
||||||
|
|
||||||
if (colorSpeed)
|
|
||||||
{
|
|
||||||
if (cv_coloredspeedlines.value != 3)
|
|
||||||
speedcolor = playercolor;
|
|
||||||
|
|
||||||
if (cv_coloredspeedlines.value >= 2 && player->kartstuff[k_driftboost])
|
|
||||||
{
|
|
||||||
if (player->kartstuff[k_driftboost] <= 20)
|
|
||||||
speedcolor = SKINCOLOR_SAPPHIRE;
|
|
||||||
else if (player->kartstuff[k_driftboost] <= 50)
|
|
||||||
speedcolor = SKINCOLOR_RASPBERRY;
|
|
||||||
else if (player->kartstuff[k_driftboost] <= 125)
|
|
||||||
speedcolor = K_RainbowColor();
|
|
||||||
|
|
||||||
if (cv_coloredspeedlines.value == 2)
|
|
||||||
speedcolor = (leveltime & 1) ? playercolor : speedcolor;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
if (cv_coloredspeedlines.value != 3)
|
|
||||||
{
|
|
||||||
if (player->kartstuff[k_eggmanexplode])
|
|
||||||
{
|
|
||||||
// Make it red when you have the eggman speed boost
|
|
||||||
speedcolor = SKINCOLOR_RED;
|
|
||||||
}
|
|
||||||
else if (player->kartstuff[k_invincibilitytimer])
|
|
||||||
{
|
|
||||||
speedcolor = playercolor;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
return speedcolor;
|
|
||||||
}
|
|
||||||
|
|
||||||
typedef INT32 (*randomFunc)(INT32 min, INT32 max);
|
|
||||||
|
|
||||||
FUNCINLINE static ATTRINLINE void K_SpawnNormalSpeedLines(player_t *player, boolean synched)
|
|
||||||
{
|
|
||||||
const randomFunc randomfunc = synched ? P_RandomRange : M_RandomRange;
|
|
||||||
|
|
||||||
fixed_t rand_x;
|
fixed_t rand_x;
|
||||||
fixed_t rand_y;
|
fixed_t rand_y;
|
||||||
fixed_t rand_z;
|
fixed_t rand_z;
|
||||||
|
|
||||||
rand_z = player->mo->z + (player->mo->height/2) + (randomfunc(-20,20) * player->mo->scale);
|
rand_z = player->mo->z + (player->mo->height/2) + (P_RandomRange(-20, 20) * player->mo->scale);
|
||||||
rand_y = player->mo->y + (randomfunc(-36,36) * player->mo->scale);
|
rand_y = player->mo->y + (P_RandomRange(-36, 36) * player->mo->scale);
|
||||||
rand_x = player->mo->x + (randomfunc(-36,36) * player->mo->scale);
|
rand_x = player->mo->x + (P_RandomRange(-36, 36) * player->mo->scale);
|
||||||
|
|
||||||
mobj_t *fast = P_SpawnMobj(rand_x, rand_y, rand_z, MT_FASTLINE);
|
mobj_t *fast = P_SpawnMobj(rand_x, rand_y, rand_z, MT_FASTLINE);
|
||||||
|
|
||||||
@@ -5553,7 +5484,7 @@ FUNCINLINE static ATTRINLINE void K_SpawnNormalSpeedLines(player_t *player, bool
|
|||||||
fast->momx = 3*player->mo->momx/4;
|
fast->momx = 3*player->mo->momx/4;
|
||||||
fast->momy = 3*player->mo->momy/4;
|
fast->momy = 3*player->mo->momy/4;
|
||||||
fast->momz = 3*player->mo->momz/4;
|
fast->momz = 3*player->mo->momz/4;
|
||||||
fast->islocal = !synched;
|
//fast->islocal = false;
|
||||||
P_SetTarget(&fast->target, player->mo); // easier lua access
|
P_SetTarget(&fast->target, player->mo); // easier lua access
|
||||||
|
|
||||||
K_MatchGenericExtraFlags(fast, player->mo);
|
K_MatchGenericExtraFlags(fast, player->mo);
|
||||||
@@ -5564,8 +5495,11 @@ FUNCINLINE static ATTRINLINE void K_SpawnNormalSpeedLines(player_t *player, bool
|
|||||||
|
|
||||||
if (cv_coloredspeedlines.value)
|
if (cv_coloredspeedlines.value)
|
||||||
{
|
{
|
||||||
fast->color = K_GetSpeedLineColor(player, colorSpeed);
|
if (colorSpeed || player->kartstuff[k_invincibilitytimer]) // let invul color them even when players go rather slow
|
||||||
fast->colorized = true;
|
{
|
||||||
|
fast->color = player->mo->color;
|
||||||
|
fast->colorized = true;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if (colorSpeed && K_PlayerEffectsShouldBlend(player))
|
if (colorSpeed && K_PlayerEffectsShouldBlend(player))
|
||||||
@@ -5594,11 +5528,7 @@ void K_KartPlayerThink(player_t *player, ticcmd_t *cmd)
|
|||||||
// Speed lines
|
// Speed lines
|
||||||
if ((player->kartstuff[k_sneakertimer] || player->kartstuff[k_driftboost] || player->kartstuff[k_startboost]) && player->speed > 0)
|
if ((player->kartstuff[k_sneakertimer] || player->kartstuff[k_driftboost] || player->kartstuff[k_startboost]) && player->speed > 0)
|
||||||
{
|
{
|
||||||
K_SpawnNormalSpeedLines(player, true);
|
K_SpawnNormalSpeedLines(player);
|
||||||
}
|
|
||||||
else if ((cv_coloredspeedlines.value == 1 || cv_coloredspeedlines.value == 2) && player->kartstuff[k_eggmanexplode]) // gotta love the speedlines calling synched rng :chaosleep:
|
|
||||||
{
|
|
||||||
K_SpawnNormalSpeedLines(player, false);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
if (player->playerstate == PST_DEAD || player->kartstuff[k_respawn] > 1) // Ensure these are set correctly here
|
if (player->playerstate == PST_DEAD || player->kartstuff[k_respawn] > 1) // Ensure these are set correctly here
|
||||||
@@ -6220,6 +6150,64 @@ static void K_KartDrift(player_t *player, boolean onground)
|
|||||||
player->kartstuff[k_brakedrift] = 0;
|
player->kartstuff[k_brakedrift] = 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
INT32 stprevnextchecks[2] = {INT32_MAX, INT32_MAX}; // there wont be any map this big, wont there?.....
|
||||||
|
|
||||||
|
// K_KartUpdatePosition has a bug where whatever player comes last in the players array
|
||||||
|
// gets its distance calculations applied twice
|
||||||
|
// since we cannot fix this due to compat concerns (kartstuff is exposed after all)
|
||||||
|
// we gotta do this shit hack to atleast fix the debugcheckpoint display
|
||||||
|
static void K_KartUpdatePositionDebugHack(player_t *player, player_t *otherplayer)
|
||||||
|
{
|
||||||
|
mobj_t *mo;
|
||||||
|
fixed_t pmo;
|
||||||
|
fixed_t ppcd, pncd;
|
||||||
|
|
||||||
|
// dont need this crap
|
||||||
|
if (!cv_kartdebugcheckpoint.value)
|
||||||
|
return;
|
||||||
|
|
||||||
|
// not checking against ourselves
|
||||||
|
if (player != otherplayer)
|
||||||
|
return;
|
||||||
|
|
||||||
|
// dont care if its not first displayplayer
|
||||||
|
// since this is only used for the debug display
|
||||||
|
if (player != &players[displayplayers[0]])
|
||||||
|
return;
|
||||||
|
|
||||||
|
ppcd = pncd = 0;
|
||||||
|
stprevnextchecks[0] = stprevnextchecks[1] = 0;
|
||||||
|
|
||||||
|
// This checks every thing on the map, and looks for MT_BOSS3WAYPOINT (the thing we're using for checkpoint wp's, for now)
|
||||||
|
for (mo = waypointcap; mo != NULL; mo = mo->tracer)
|
||||||
|
{
|
||||||
|
const boolean isprevcheckpointp = mo->health == player->starpostnum;
|
||||||
|
const boolean isnextcheckpointp = mo->health == (player->starpostnum + 1);
|
||||||
|
|
||||||
|
if ((isprevcheckpointp || isnextcheckpointp) && (!mo->movecount || mo->movecount == player->laps+1))
|
||||||
|
{
|
||||||
|
pmo = P_AproxDistance(P_AproxDistance( mo->x - player->mo->x,
|
||||||
|
mo->y - player->mo->y),
|
||||||
|
mo->z - player->mo->z) / FRACUNIT;
|
||||||
|
|
||||||
|
if (isprevcheckpointp)
|
||||||
|
{
|
||||||
|
stprevnextchecks[0] += pmo;
|
||||||
|
ppcd++;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (isnextcheckpointp)
|
||||||
|
{
|
||||||
|
stprevnextchecks[1] += pmo;
|
||||||
|
pncd++;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
if (ppcd > 1) stprevnextchecks[0] /= ppcd;
|
||||||
|
if (pncd > 1) stprevnextchecks[1] /= pncd;
|
||||||
|
}
|
||||||
|
|
||||||
//
|
//
|
||||||
// K_KartUpdatePosition
|
// K_KartUpdatePosition
|
||||||
//
|
//
|
||||||
@@ -6231,6 +6219,9 @@ void K_KartUpdatePosition(player_t *player)
|
|||||||
fixed_t pmo, imo;
|
fixed_t pmo, imo;
|
||||||
mobj_t *mo;
|
mobj_t *mo;
|
||||||
|
|
||||||
|
// always reset this
|
||||||
|
stprevnextchecks[0] = stprevnextchecks[1] = INT32_MAX;
|
||||||
|
|
||||||
if (player->spectator || !player->mo)
|
if (player->spectator || !player->mo)
|
||||||
return;
|
return;
|
||||||
|
|
||||||
@@ -6243,11 +6234,12 @@ void K_KartUpdatePosition(player_t *player)
|
|||||||
|
|
||||||
if (G_RaceGametype())
|
if (G_RaceGametype())
|
||||||
{
|
{
|
||||||
if ((((players[i].starpostnum) + (numstarposts + 1) * players[i].laps) >
|
const INT32 iplayerlaps = (players[i].starpostnum + (numstarposts + 1) * players[i].laps);
|
||||||
((player->starpostnum) + (numstarposts + 1) * player->laps)))
|
const INT32 pplayerlaps = (player->starpostnum + (numstarposts + 1) * player->laps);
|
||||||
|
|
||||||
|
if (iplayerlaps > pplayerlaps)
|
||||||
position++;
|
position++;
|
||||||
else if (((players[i].starpostnum) + (numstarposts+1)*players[i].laps) ==
|
else if (iplayerlaps == pplayerlaps)
|
||||||
((player->starpostnum) + (numstarposts+1)*player->laps))
|
|
||||||
{
|
{
|
||||||
ppcd = pncd = ipcd = incd = 0;
|
ppcd = pncd = ipcd = incd = 0;
|
||||||
|
|
||||||
@@ -6330,6 +6322,9 @@ void K_KartUpdatePosition(player_t *player)
|
|||||||
if (players[i].starposttime < player->starposttime)
|
if (players[i].starposttime < player->starposttime)
|
||||||
position++;
|
position++;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// stupid hack
|
||||||
|
K_KartUpdatePositionDebugHack(player, &players[i]);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
else if (G_BattleGametype())
|
else if (G_BattleGametype())
|
||||||
@@ -6599,7 +6594,7 @@ static void K_PlayerItemThink(player_t *player, boolean onground, boolean oldatt
|
|||||||
{
|
{
|
||||||
mo = P_SpawnMobj(player->mo->x, player->mo->y, player->mo->z, MT_BANANA_SHIELD);
|
mo = P_SpawnMobj(player->mo->x, player->mo->y, player->mo->z, MT_BANANA_SHIELD);
|
||||||
|
|
||||||
if (!mo)
|
if (P_MobjWasRemovedCompat(mo))
|
||||||
{
|
{
|
||||||
player->kartstuff[k_itemamount] = moloop;
|
player->kartstuff[k_itemamount] = moloop;
|
||||||
break;
|
break;
|
||||||
@@ -6660,7 +6655,7 @@ static void K_PlayerItemThink(player_t *player, boolean onground, boolean oldatt
|
|||||||
newangle = (player->mo->angle + ANGLE_157h) + FixedAngle(((360 / player->kartstuff[k_itemamount]) * moloop) << FRACBITS) + ANGLE_90;
|
newangle = (player->mo->angle + ANGLE_157h) + FixedAngle(((360 / player->kartstuff[k_itemamount]) * moloop) << FRACBITS) + ANGLE_90;
|
||||||
mo = P_SpawnMobj(player->mo->x, player->mo->y, player->mo->z, MT_ORBINAUT_SHIELD);
|
mo = P_SpawnMobj(player->mo->x, player->mo->y, player->mo->z, MT_ORBINAUT_SHIELD);
|
||||||
|
|
||||||
if (!mo)
|
if (P_MobjWasRemovedCompat(mo))
|
||||||
{
|
{
|
||||||
player->kartstuff[k_itemamount] = moloop;
|
player->kartstuff[k_itemamount] = moloop;
|
||||||
break;
|
break;
|
||||||
@@ -6703,7 +6698,7 @@ static void K_PlayerItemThink(player_t *player, boolean onground, boolean oldatt
|
|||||||
newangle = (player->mo->angle + ANGLE_157h) + FixedAngle(((360 / player->kartstuff[k_itemamount]) * moloop) << FRACBITS) + ANGLE_90;
|
newangle = (player->mo->angle + ANGLE_157h) + FixedAngle(((360 / player->kartstuff[k_itemamount]) * moloop) << FRACBITS) + ANGLE_90;
|
||||||
mo = P_SpawnMobj(player->mo->x, player->mo->y, player->mo->z, MT_JAWZ_SHIELD);
|
mo = P_SpawnMobj(player->mo->x, player->mo->y, player->mo->z, MT_JAWZ_SHIELD);
|
||||||
|
|
||||||
if (!mo)
|
if (P_MobjWasRemovedCompat(mo))
|
||||||
{
|
{
|
||||||
player->kartstuff[k_itemamount] = moloop;
|
player->kartstuff[k_itemamount] = moloop;
|
||||||
break;
|
break;
|
||||||
@@ -7066,6 +7061,28 @@ void K_MoveKartPlayer(player_t *player, boolean onground)
|
|||||||
// "Stair jank" visuals akin to RR
|
// "Stair jank" visuals akin to RR
|
||||||
if (cv_stairjank.value && player->stairjank > 0)
|
if (cv_stairjank.value && player->stairjank > 0)
|
||||||
{
|
{
|
||||||
|
// only spawn em once
|
||||||
|
if (player->stairjank > 8)
|
||||||
|
{
|
||||||
|
// 90 degrees to direction you're facing
|
||||||
|
fixed_t dirx = -FINESINE(player->mo->angle>>ANGLETOFINESHIFT);
|
||||||
|
fixed_t diry = FINECOSINE(player->mo->angle>>ANGLETOFINESHIFT);
|
||||||
|
fixed_t offset = player->mo->radius;
|
||||||
|
|
||||||
|
dirx = K_AltFlip(-dirx, 4);
|
||||||
|
diry = K_AltFlip(-diry, 4);
|
||||||
|
|
||||||
|
mobj_t * spark = P_SpawnMobj(player->mo->x + FixedMul(dirx, offset), player->mo->y + FixedMul(diry, offset), player->mo->z, MT_DRIFTDUST);
|
||||||
|
spark->momx = FixedMul(dirx, FRACUNIT) + (6 + ((int)leveltime % 5))*(player->mo->momx)/10;
|
||||||
|
spark->momy = FixedMul(diry, FRACUNIT) + (6 + ((int)leveltime % 5))*(player->mo->momy)/10;
|
||||||
|
spark->momz = 5*FRACUNIT;
|
||||||
|
spark->scale = mapobjectscale/5;
|
||||||
|
spark->destscale = mapobjectscale/2;
|
||||||
|
spark->islocal = true;
|
||||||
|
spark->color = SKINCOLOR_WHITE;
|
||||||
|
P_SetTarget(&spark->target, player->mo);
|
||||||
|
}
|
||||||
|
|
||||||
player->mo->temprollangle += K_StairJankFlip(ANGLE_11hh / 2 / (17 / player->stairjank)); // TODO: make strength adjustable?
|
player->mo->temprollangle += K_StairJankFlip(ANGLE_11hh / 2 / (17 / player->stairjank)); // TODO: make strength adjustable?
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -32,6 +32,8 @@ extern consvar_t cv_bananajitter;
|
|||||||
extern consvar_t cv_bananthrowroll;
|
extern consvar_t cv_bananthrowroll;
|
||||||
extern consvar_t cv_airsparks;
|
extern consvar_t cv_airsparks;
|
||||||
|
|
||||||
|
extern INT32 stprevnextchecks[2];
|
||||||
|
|
||||||
boolean K_IsPlayerLosing(player_t *player);
|
boolean K_IsPlayerLosing(player_t *player);
|
||||||
boolean K_IsPlayerWanted(player_t *player);
|
boolean K_IsPlayerWanted(player_t *player);
|
||||||
INT32 K_KartGetItemOdds(UINT8 pos, SINT8 item, fixed_t mashed, boolean spbrush);
|
INT32 K_KartGetItemOdds(UINT8 pos, SINT8 item, fixed_t mashed, boolean spbrush);
|
||||||
|
|||||||
+14
-26
@@ -3055,58 +3055,46 @@ static int lib_kSetHyuCountdown(lua_State *L)
|
|||||||
|
|
||||||
static int lib_gSetPlayerGamepadIndicatorColor(lua_State *L)
|
static int lib_gSetPlayerGamepadIndicatorColor(lua_State *L)
|
||||||
{
|
{
|
||||||
INT32 player = -1;
|
INT32 pnum = -1;
|
||||||
player_t *plr = *((player_t **)luaL_checkudata(L, 1, META_PLAYER)); // retrieve player
|
player_t *player = *((player_t **)luaL_checkudata(L, 1, META_PLAYER)); // retrieve player
|
||||||
UINT8 color = (UINT8)luaL_checkinteger(L, 2); // skincolor
|
UINT8 color = (UINT8)luaL_checkinteger(L, 2); // skincolor
|
||||||
|
|
||||||
if (!plr)
|
if (!player)
|
||||||
return LUA_ErrInvalid(L, "player_t");
|
return LUA_ErrInvalid(L, "player_t");
|
||||||
|
|
||||||
if (color >= MAXTRANSLATIONS)
|
if (color >= MAXTRANSLATIONS)
|
||||||
return luaL_error(L, "color %d out of range (0 - %d).", color, MAXTRANSLATIONS-1);
|
return luaL_error(L, "color %d out of range (0 - %d).", color, MAXTRANSLATIONS-1);
|
||||||
|
|
||||||
for (int i = 0; i < MAXSPLITSCREENPLAYERS; ++i)
|
pnum = P_GetLocalPlayerNumForPlayer(player);
|
||||||
{
|
|
||||||
if (plr - players == displayplayers[i])
|
|
||||||
{
|
|
||||||
player = i;
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
// Not a local player
|
// Not a local player
|
||||||
if (player == -1) return 0;
|
if (pnum == -1) return 0;
|
||||||
|
|
||||||
// pls update with color 0 when youre done with changing led stuff so it can get player color again
|
// pls update with color 0 when youre done with changing led stuff so it can get player color again
|
||||||
G_SetPlayerGamepadIndicatorColor(player, color);
|
G_SetPlayerGamepadIndicatorColor(pnum, color);
|
||||||
|
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
static int lib_gPlayerDeviceRumble(lua_State *L)
|
static int lib_gPlayerDeviceRumble(lua_State *L)
|
||||||
{
|
{
|
||||||
INT32 player = -1;
|
INT32 pnum = -1;
|
||||||
player_t *plr = *((player_t **)luaL_checkudata(L, 1, META_PLAYER)); // retrieve player
|
player_t *player = *((player_t **)luaL_checkudata(L, 1, META_PLAYER)); // retrieve player
|
||||||
UINT16 low_strength = (UINT16)luaL_checkinteger(L, 2); // low frequency rumble motor strenght
|
UINT16 low_strength = (UINT16)luaL_checkinteger(L, 2); // low frequency rumble motor strenght
|
||||||
UINT16 high_strength = (UINT16)luaL_checkinteger(L, 3); // high frequency rumble motor strenght
|
UINT16 high_strength = (UINT16)luaL_checkinteger(L, 3); // high frequency rumble motor strenght
|
||||||
UINT32 duration = (UINT32)luaL_optinteger(L, 4, 84); // duration of rumble in ms
|
UINT32 duration = (UINT32)luaL_optinteger(L, 4, 84); // duration of rumble in ms
|
||||||
|
|
||||||
if (!plr)
|
if (!player)
|
||||||
return LUA_ErrInvalid(L, "player_t");
|
return LUA_ErrInvalid(L, "player_t");
|
||||||
|
|
||||||
for (int i = 0; i < MAXSPLITSCREENPLAYERS; ++i)
|
if (demo.playback) return 0;
|
||||||
{
|
|
||||||
if (plr - players == displayplayers[i])
|
pnum = P_GetLocalPlayerNumForPlayer(player);
|
||||||
{
|
|
||||||
player = i;
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
// Not a local player
|
// Not a local player
|
||||||
if (player == -1) return 0;
|
if (pnum == -1) return 0;
|
||||||
|
|
||||||
G_PlayerDeviceRumble(player, low_strength, high_strength, duration);
|
G_PlayerDeviceRumble(pnum, low_strength, high_strength, duration);
|
||||||
|
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|||||||
+43
-4
@@ -576,9 +576,45 @@ static int call_string_hooks(Hook_State *hook)
|
|||||||
|
|
||||||
FUNCINLINE static ATTRINLINE int call_mobj_type_hooks(Hook_State *hook, mobjtype_t mobj_type)
|
FUNCINLINE static ATTRINLINE int call_mobj_type_hooks(Hook_State *hook, mobjtype_t mobj_type)
|
||||||
{
|
{
|
||||||
return call_mapped(hook, &mobjHookIds[mobj_type][hook->hook_type]);
|
static UINT8 seen = 0; // so we dont have to check all this shit constantly
|
||||||
|
int numCalls = call_mapped(hook, &mobjHookIds[mobj_type][hook->hook_type]);
|
||||||
|
|
||||||
|
if (!seen && numCalls > 0 && mobj_type == MT_NULL &&
|
||||||
|
( hook->hook_type == MOBJ_HOOK(MobjThinker )
|
||||||
|
|| hook->hook_type == MOBJ_HOOK(MobjCollide )
|
||||||
|
|| hook->hook_type == MOBJ_HOOK(MobjMoveCollide)
|
||||||
|
|| hook->hook_type == MOBJ_HOOK(MobjFuse )
|
||||||
|
|| hook->hook_type == MOBJ_HOOK(BossThinker )
|
||||||
|
))
|
||||||
|
{
|
||||||
|
seen = 1;
|
||||||
|
|
||||||
|
CONS_Alert(
|
||||||
|
CONS_WARNING, "%s\n", va(
|
||||||
|
"%s hooks not attached to a specific mobj type may cause performance issues!",
|
||||||
|
mobjHookNames[hook->hook_type])
|
||||||
|
);
|
||||||
|
|
||||||
|
// print which script triggered it, ty indev <3
|
||||||
|
for (int k = 0; k < mobjHookIds[mobj_type][hook->hook_type].numHooks; ++k)
|
||||||
|
{
|
||||||
|
lua_getref(gL, hookRefs[mobjHookIds[mobj_type][hook->hook_type].ids[k].id]);
|
||||||
|
|
||||||
|
lua_Debug ar;
|
||||||
|
lua_getinfo(gL, ">S", &ar);
|
||||||
|
|
||||||
|
CONS_Printf("%s:%d\n", ar.short_src, ar.linedefined);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
return numCalls;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/*FUNCINLINE static ATTRINLINE int call_mobj_type_hooks(Hook_State *hook, mobjtype_t mobj_type)
|
||||||
|
{
|
||||||
|
return call_mapped(hook, &mobjHookIds[mobj_type][hook->hook_type]);
|
||||||
|
}*/
|
||||||
|
|
||||||
static int call_hooks
|
static int call_hooks
|
||||||
(
|
(
|
||||||
Hook_State * hook,
|
Hook_State * hook,
|
||||||
@@ -766,7 +802,7 @@ static void hook_think_frame(int type)
|
|||||||
const hook_t * map = &hookIds[type];
|
const hook_t * map = &hookIds[type];
|
||||||
int k;
|
int k;
|
||||||
|
|
||||||
const boolean perfstats = (cv_perfstats.value >= 3);
|
const boolean perfstats = (cv_perfstats.value >= PS_THINKFRAME);
|
||||||
|
|
||||||
if (prepare_hook(&hook, 0, type))
|
if (prepare_hook(&hook, 0, type))
|
||||||
{
|
{
|
||||||
@@ -862,7 +898,7 @@ int LUA_HookShouldDamage(mobj_t *target, mobj_t *inflictor, mobj_t *source, INT3
|
|||||||
int LUA_HookMobjDamage(mobj_t *target, mobj_t *inflictor, mobj_t *source, INT32 damage)
|
int LUA_HookMobjDamage(mobj_t *target, mobj_t *inflictor, mobj_t *source, INT32 damage)
|
||||||
{
|
{
|
||||||
return damage_hook(target, inflictor, source, damage,
|
return damage_hook(target, inflictor, source, damage,
|
||||||
MOBJ_HOOK(MobjDamage), res_true);
|
MOBJ_HOOK(MobjDamage), res_true);
|
||||||
}
|
}
|
||||||
|
|
||||||
int LUA_HookMobjDeath(mobj_t *target, mobj_t *inflictor, mobj_t *source)
|
int LUA_HookMobjDeath(mobj_t *target, mobj_t *inflictor, mobj_t *source)
|
||||||
@@ -951,7 +987,7 @@ void LUA_HookLinedefExecute(line_t *line, mobj_t *mo, sector_t *sector)
|
|||||||
{
|
{
|
||||||
Hook_State hook = {};
|
Hook_State hook = {};
|
||||||
if (prepare_string_hook
|
if (prepare_string_hook
|
||||||
(&hook, 0, STRING_HOOK(LinedefExecute), line->text))
|
(&hook, 0, STRING_HOOK(LinedefExecute), line->text))
|
||||||
{
|
{
|
||||||
LUA_PushUserdata(gL, line, META_LINE);
|
LUA_PushUserdata(gL, line, META_LINE);
|
||||||
LUA_PushUserdata(gL, mo, META_MOBJ);
|
LUA_PushUserdata(gL, mo, META_MOBJ);
|
||||||
@@ -1024,6 +1060,9 @@ void LUA_HookNetArchive(lua_CFunction archFunc, savebuffer_t *save)
|
|||||||
lua_pushcclosure(gL, archFunc, 2);
|
lua_pushcclosure(gL, archFunc, 2);
|
||||||
// stack: tables, savebuffer_t, archFunc
|
// stack: tables, savebuffer_t, archFunc
|
||||||
|
|
||||||
|
// Manually set the hook's variables here since we don't call prepare_hook
|
||||||
|
hook.hook_type = HOOK(NetVars);
|
||||||
|
hook.mobj_type = NONMOHOOK; // Force mobj_type to be NONMOHOOK so the mobj_type check get skipped
|
||||||
init_hook_call(&hook, 0, res_none);
|
init_hook_call(&hook, 0, res_none);
|
||||||
call_mapped(&hook, map);
|
call_mapped(&hook, map);
|
||||||
|
|
||||||
|
|||||||
+25
-15
@@ -62,14 +62,6 @@ static lua_CFunction liblist[] = {
|
|||||||
NULL
|
NULL
|
||||||
};
|
};
|
||||||
|
|
||||||
// Lua asks for memory using this.
|
|
||||||
static void *LUA_Alloc(void *ud, void *ptr, size_t osize, size_t nsize)
|
|
||||||
{
|
|
||||||
(void)ud;
|
|
||||||
(void)osize;
|
|
||||||
return Z_Realloc(ptr, nsize, PU_LUA, NULL);
|
|
||||||
}
|
|
||||||
|
|
||||||
// Panic function Lua calls when there's an unprotected error.
|
// Panic function Lua calls when there's an unprotected error.
|
||||||
// This function cannot return. Lua would kill the application anyway if it did.
|
// This function cannot return. Lua would kill the application anyway if it did.
|
||||||
FUNCNORETURN static int LUA_Panic(lua_State *L)
|
FUNCNORETURN static int LUA_Panic(lua_State *L)
|
||||||
@@ -197,7 +189,7 @@ void LUA_ClearState(void)
|
|||||||
CONS_Printf(M_GetText("Pardon me while I initialize the Lua scripting interface...\n"));
|
CONS_Printf(M_GetText("Pardon me while I initialize the Lua scripting interface...\n"));
|
||||||
|
|
||||||
// allocate state
|
// allocate state
|
||||||
L = lua_newstate(LUA_Alloc, NULL);
|
L = luaL_newstate();
|
||||||
lua_atpanic(L, LUA_Panic);
|
lua_atpanic(L, LUA_Panic);
|
||||||
|
|
||||||
// open base libraries
|
// open base libraries
|
||||||
@@ -277,20 +269,19 @@ void LUA_LoadLump(UINT16 wad, UINT16 lump)
|
|||||||
|
|
||||||
if (wadfiles[wad]->type == RET_LUA)
|
if (wadfiles[wad]->type == RET_LUA)
|
||||||
{
|
{
|
||||||
name = malloc(len+1);
|
name = malloc(len + 1);
|
||||||
strcpy(name, wadfiles[wad]->filename);
|
snprintf(name, len + 1, "%s", wadfiles[wad]->filename);
|
||||||
}
|
}
|
||||||
else // If it's not a .lua file, copy the lump name in too.
|
else // If it's not a .lua file, copy the lump name in too.
|
||||||
{
|
{
|
||||||
lumpinfo_t *lump_p = &wadfiles[wad]->lumpinfo[lump];
|
lumpinfo_t *lump_p = &wadfiles[wad]->lumpinfo[lump];
|
||||||
len += 1 + strlen(lump_p->fullname); // length of file name, '|', and lump name
|
len += 1 + strlen(lump_p->fullname); // length of file name, '|', and lump name
|
||||||
name = malloc(len+1);
|
name = malloc(len + 1);
|
||||||
|
|
||||||
if (!name)
|
if (!name)
|
||||||
I_Error("LUA_LoadLump: Out of memory!\n");
|
I_Error("LUA_LoadLump: Out of memory!\n");
|
||||||
|
|
||||||
sprintf(name, "%s|%s", wadfiles[wad]->filename, lump_p->fullname);
|
snprintf(name, len + 1, "%s|%s", wadfiles[wad]->filename, lump_p->fullname);
|
||||||
name[len] = '\0';
|
|
||||||
}
|
}
|
||||||
|
|
||||||
LUA_LoadFile(&f, name); // actually load file!
|
LUA_LoadFile(&f, name); // actually load file!
|
||||||
@@ -374,7 +365,7 @@ void LUA_DumpFile(const char *filename)
|
|||||||
|
|
||||||
static void createMathLibState(void)
|
static void createMathLibState(void)
|
||||||
{
|
{
|
||||||
mL = lua_newstate(LUA_Alloc, NULL);
|
mL = luaL_newstate();
|
||||||
lua_atpanic(mL, LUA_Panic);
|
lua_atpanic(mL, LUA_Panic);
|
||||||
|
|
||||||
// open only enum lib
|
// open only enum lib
|
||||||
@@ -592,6 +583,7 @@ void LUA_InvalidateLevel(void)
|
|||||||
|
|
||||||
for (i = 0; i < numsubsectors; i++)
|
for (i = 0; i < numsubsectors; i++)
|
||||||
LUA_InvalidateUserdata(&subsectors[i]);
|
LUA_InvalidateUserdata(&subsectors[i]);
|
||||||
|
|
||||||
for (i = 0; i < numsectors; i++)
|
for (i = 0; i < numsectors; i++)
|
||||||
{
|
{
|
||||||
LUA_InvalidateUserdata(§ors[i]);
|
LUA_InvalidateUserdata(§ors[i]);
|
||||||
@@ -612,6 +604,7 @@ void LUA_InvalidateLevel(void)
|
|||||||
|
|
||||||
for (i = 0; i < numsides; i++)
|
for (i = 0; i < numsides; i++)
|
||||||
LUA_InvalidateUserdata(&sides[i]);
|
LUA_InvalidateUserdata(&sides[i]);
|
||||||
|
|
||||||
for (i = 0; i < numvertexes; i++)
|
for (i = 0; i < numvertexes; i++)
|
||||||
LUA_InvalidateUserdata(&vertexes[i]);
|
LUA_InvalidateUserdata(&vertexes[i]);
|
||||||
|
|
||||||
@@ -622,6 +615,10 @@ void LUA_InvalidateLevel(void)
|
|||||||
LUA_InvalidateUserdata(&slope->o);
|
LUA_InvalidateUserdata(&slope->o);
|
||||||
LUA_InvalidateUserdata(&slope->d);
|
LUA_InvalidateUserdata(&slope->d);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// We invalidated a lot of userdata objects, a lot of them probably ended up unreachable so they can be
|
||||||
|
// GC'd right away
|
||||||
|
lua_gc(gL, LUA_GCCOLLECT, 0);
|
||||||
}
|
}
|
||||||
|
|
||||||
void LUA_InvalidateMapthings(void)
|
void LUA_InvalidateMapthings(void)
|
||||||
@@ -1460,3 +1457,16 @@ int Lua_CreateFieldTable(lua_State *L, const char *const lst[])
|
|||||||
|
|
||||||
return luaL_ref(L, LUA_REGISTRYINDEX);
|
return luaL_ref(L, LUA_REGISTRYINDEX);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
size_t LUA_MemoryUsage(void)
|
||||||
|
{
|
||||||
|
size_t usage = 0;
|
||||||
|
|
||||||
|
if (gL)
|
||||||
|
usage += lua_gc(gL, LUA_GCCOUNT, 0);
|
||||||
|
|
||||||
|
if (mL)
|
||||||
|
usage += lua_gc(mL, LUA_GCCOUNT, 0);
|
||||||
|
|
||||||
|
return usage;
|
||||||
|
}
|
||||||
@@ -82,6 +82,9 @@ int Lua_optoption(lua_State *L, int narg, int def, int list_ref);
|
|||||||
int Lua_CreateFieldTable(lua_State *L, const char *const lst[]);
|
int Lua_CreateFieldTable(lua_State *L, const char *const lst[]);
|
||||||
void LUA_HookNetArchive(lua_CFunction archFunc, savebuffer_t *save);
|
void LUA_HookNetArchive(lua_CFunction archFunc, savebuffer_t *save);
|
||||||
|
|
||||||
|
// Returns lua memory usage in kbytes
|
||||||
|
size_t LUA_MemoryUsage(void);
|
||||||
|
|
||||||
// Console wrapper
|
// Console wrapper
|
||||||
void COM_Lua_f(void);
|
void COM_Lua_f(void);
|
||||||
|
|
||||||
|
|||||||
+3
-3
@@ -766,7 +766,7 @@ boolean OP_FreezeObjectplace(void)
|
|||||||
if (!objectplacing)
|
if (!objectplacing)
|
||||||
return false;
|
return false;
|
||||||
|
|
||||||
if ((maptol & TOL_NIGHTS) && (players[consoleplayer].pflags & PF_NIGHTSMODE))
|
if (nightsmode && nightsplayer(&players[consoleplayer]))
|
||||||
return false;
|
return false;
|
||||||
|
|
||||||
return true;
|
return true;
|
||||||
@@ -1049,7 +1049,7 @@ void Command_ObjectPlace_f(void)
|
|||||||
{
|
{
|
||||||
objectplacing = true;
|
objectplacing = true;
|
||||||
|
|
||||||
if ((players[0].pflags & PF_NIGHTSMODE))
|
if (nightsplayer(&players[0]))
|
||||||
return;
|
return;
|
||||||
|
|
||||||
if (!COM_CheckParm("-silent"))
|
if (!COM_CheckParm("-silent"))
|
||||||
@@ -1120,7 +1120,7 @@ void Command_ObjectPlace_f(void)
|
|||||||
|
|
||||||
// Don't touch the NiGHTS Objectplace stuff.
|
// Don't touch the NiGHTS Objectplace stuff.
|
||||||
// ... or if the mo mysteriously vanished.
|
// ... or if the mo mysteriously vanished.
|
||||||
if (!players[0].mo || (players[0].pflags & PF_NIGHTSMODE))
|
if (!players[0].mo || nightsplayer(&players[0]))
|
||||||
return;
|
return;
|
||||||
|
|
||||||
// If still in dummy state, get out of it.
|
// If still in dummy state, get out of it.
|
||||||
|
|||||||
+1
-1
@@ -11,7 +11,7 @@
|
|||||||
|
|
||||||
#include "m_curl.h"
|
#include "m_curl.h"
|
||||||
#include "doomtype.h"
|
#include "doomtype.h"
|
||||||
#include "i_system.h" // I_OutputMsg
|
#include "doomdef.h" // I_OutputMsg
|
||||||
#include "m_argv.h" // M_CheckParm, M_GetNextParm
|
#include "m_argv.h" // M_CheckParm, M_GetNextParm
|
||||||
|
|
||||||
static boolean curl_args_init = false;
|
static boolean curl_args_init = false;
|
||||||
|
|||||||
+70
-41
@@ -25,6 +25,7 @@
|
|||||||
#include "d_netcmd.h"
|
#include "d_netcmd.h"
|
||||||
#include "d_clisrv.h"
|
#include "d_clisrv.h"
|
||||||
#include "i_net.h"
|
#include "i_net.h"
|
||||||
|
#include "i_system.h"
|
||||||
#include "console.h"
|
#include "console.h"
|
||||||
#include "r_fps.h"
|
#include "r_fps.h"
|
||||||
#include "r_local.h"
|
#include "r_local.h"
|
||||||
@@ -276,6 +277,8 @@ static void M_ConfirmTeamChange(INT32 choice);
|
|||||||
static void M_ConfirmSpectateChange(INT32 choice);
|
static void M_ConfirmSpectateChange(INT32 choice);
|
||||||
static void M_QuitSRB2(INT32 choice);
|
static void M_QuitSRB2(INT32 choice);
|
||||||
|
|
||||||
|
static void M_SaturnReportIssue(INT32 choice);
|
||||||
|
|
||||||
// Single Player
|
// Single Player
|
||||||
static void M_TimeAttack(INT32 choice);
|
static void M_TimeAttack(INT32 choice);
|
||||||
static boolean M_QuitTimeAttackMenu(void);
|
static boolean M_QuitTimeAttackMenu(void);
|
||||||
@@ -613,7 +616,7 @@ void Nextmap_OnChange(void)
|
|||||||
if (!gpath)
|
if (!gpath)
|
||||||
return;
|
return;
|
||||||
|
|
||||||
sprintf(gpath,"%s"PATHSEP"replay"PATHSEP"%s"PATHSEP"%s", srb2home, timeattackfolder, G_BuildMapName(cv_nextmap.value));
|
snprintf(gpath, glen, "%s"PATHSEP"replay"PATHSEP"%s"PATHSEP"%s", srb2home, timeattackfolder, G_BuildMapName(cv_nextmap.value));
|
||||||
|
|
||||||
CV_StealthSetValue(&cv_dummystaff, 0);
|
CV_StealthSetValue(&cv_dummystaff, 0);
|
||||||
|
|
||||||
@@ -732,7 +735,7 @@ static void Dummystaff_OnChange(void)
|
|||||||
while (*temp)
|
while (*temp)
|
||||||
temp++;
|
temp++;
|
||||||
|
|
||||||
sprintf(temp, " - %d", cv_dummystaff.value);
|
snprintf(temp, sizeof(dummystaffname) - (size_t)(temp - dummystaffname), " - %d", cv_dummystaff.value);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -822,7 +825,8 @@ static void M_ChangeCvar(INT32 choice)
|
|||||||
float increment;
|
float increment;
|
||||||
|
|
||||||
increment = FIXED_TO_FLOAT(cv->value)+(choice)*((currentMenu->menuitems[itemOn].status & IT_CV_BIGFLOAT) ? 0.5f : (1.0f/16.0f));
|
increment = FIXED_TO_FLOAT(cv->value)+(choice)*((currentMenu->menuitems[itemOn].status & IT_CV_BIGFLOAT) ? 0.5f : (1.0f/16.0f));
|
||||||
sprintf(s,"%ld%s",(long)increment,M_Ftrim(increment));
|
snprintf(s, sizeof(s), "%ld%s", (long)increment, M_Ftrim(increment));
|
||||||
|
|
||||||
CV_Set(cv, s);
|
CV_Set(cv, s);
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
@@ -4182,12 +4186,12 @@ static void PrepReplayList(boolean reset)
|
|||||||
if (dirmenu[i][DIR_TYPE] == EXT_UP)
|
if (dirmenu[i][DIR_TYPE] == EXT_UP)
|
||||||
{
|
{
|
||||||
demolist_all[i].type = MD_SUBDIR;
|
demolist_all[i].type = MD_SUBDIR;
|
||||||
sprintf(demolist_all[i].title, "UP");
|
snprintf(demolist_all[i].title, sizeof(demolist_all[i].title), "UP");
|
||||||
}
|
}
|
||||||
else if (dirmenu[i][DIR_TYPE] == EXT_FOLDER)
|
else if (dirmenu[i][DIR_TYPE] == EXT_FOLDER)
|
||||||
{
|
{
|
||||||
demolist_all[i].type = MD_SUBDIR;
|
demolist_all[i].type = MD_SUBDIR;
|
||||||
strncpy(demolist_all[i].title, dirmenu[i] + DIR_STRING, 64);
|
snprintf(demolist_all[i].title, sizeof(demolist_all[i].title), "%s", dirmenu[i] + DIR_STRING);
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
@@ -4195,7 +4199,7 @@ static void PrepReplayList(boolean reset)
|
|||||||
snprintf(demolist_all[i].filepath, sizeof(demolist_all[i].filepath),
|
snprintf(demolist_all[i].filepath, sizeof(demolist_all[i].filepath),
|
||||||
// 255 = UINT8 limit. dirmenu entries are restricted to this length (see DIR_LEN).
|
// 255 = UINT8 limit. dirmenu entries are restricted to this length (see DIR_LEN).
|
||||||
"%s%.255s", menupath, dirmenu[i] + DIR_STRING);
|
"%s%.255s", menupath, dirmenu[i] + DIR_STRING);
|
||||||
sprintf(demolist_all[i].title, ".....");
|
snprintf(demolist_all[i].title, sizeof(demolist_all[i].title), ".....");
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -4247,6 +4251,14 @@ static boolean M_HandleReplayHutQuery(INT32 choice)
|
|||||||
char tmp[MAXREPLAYQUERY+1];
|
char tmp[MAXREPLAYQUERY+1];
|
||||||
memcpy(tmp, replayqueryinput_buffer, MAXREPLAYQUERY+1);
|
memcpy(tmp, replayqueryinput_buffer, MAXREPLAYQUERY+1);
|
||||||
|
|
||||||
|
Lock_search_state();
|
||||||
|
if (!replaynamesloaded)
|
||||||
|
{
|
||||||
|
Unlock_search_state();
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
Unlock_search_state();
|
||||||
|
|
||||||
if (M_TextInputHandle(&replayqueryinput, choice))
|
if (M_TextInputHandle(&replayqueryinput, choice))
|
||||||
{
|
{
|
||||||
S_StartSound(NULL, sfx_menu1);
|
S_StartSound(NULL, sfx_menu1);
|
||||||
@@ -5755,7 +5767,8 @@ static void M_DrawMusicTest(void)
|
|||||||
x = 24;
|
x = 24;
|
||||||
y = 64;
|
y = 64;
|
||||||
|
|
||||||
if (renderisnewtic) st_musictime++;
|
if (renderisnewtic)
|
||||||
|
st_musictime++;
|
||||||
|
|
||||||
while (t <= b)
|
while (t <= b)
|
||||||
{
|
{
|
||||||
@@ -5764,11 +5777,11 @@ static void M_DrawMusicTest(void)
|
|||||||
|
|
||||||
{
|
{
|
||||||
const musicdef_t *def = S_GetMusicCredit(t);
|
const musicdef_t *def = S_GetMusicCredit(t);
|
||||||
const size_t MAXLENGTH = 34;
|
|
||||||
const char *songname = def->title[0] ? def->title : def->source;
|
const char *songname = def->title[0] ? def->title : def->source;
|
||||||
|
|
||||||
size_t namelength = strlen(songname);
|
size_t namelength = strlen(songname);
|
||||||
|
|
||||||
|
#define MAXLENGTH 34
|
||||||
char buf[MAXLENGTH+1];
|
char buf[MAXLENGTH+1];
|
||||||
|
|
||||||
if (t == st_sel && namelength > MAXLENGTH)
|
if (t == st_sel && namelength > MAXLENGTH)
|
||||||
@@ -5777,11 +5790,14 @@ static void M_DrawMusicTest(void)
|
|||||||
strlcpy(buf, songname, MAXLENGTH);
|
strlcpy(buf, songname, MAXLENGTH);
|
||||||
|
|
||||||
V_DrawString(x, y, (t == st_sel ? V_YELLOWMAP : 0)|V_ALLOWLOWERCASE|V_MONOSPACE, buf);
|
V_DrawString(x, y, (t == st_sel ? V_YELLOWMAP : 0)|V_ALLOWLOWERCASE|V_MONOSPACE, buf);
|
||||||
|
|
||||||
if (curplaying == def)
|
if (curplaying == def)
|
||||||
{
|
{
|
||||||
V_DrawFill(20+280-9, y-4, 8, 16, 230);
|
V_DrawFill(20+280-9, y-4, 8, 16, 230);
|
||||||
}
|
}
|
||||||
|
#undef MAXLENGTH
|
||||||
}
|
}
|
||||||
|
|
||||||
t++;
|
t++;
|
||||||
y += 16;
|
y += 16;
|
||||||
}
|
}
|
||||||
@@ -5968,7 +5984,8 @@ static void M_DrawStatsMaps(void)
|
|||||||
|
|
||||||
V_DrawString(20, 42, highlightflags|MENUCAPS, "Combined time records:");
|
V_DrawString(20, 42, highlightflags|MENUCAPS, "Combined time records:");
|
||||||
|
|
||||||
sprintf(beststr, "%i:%02i:%02i.%02i", G_TicsToHours(besttime), G_TicsToMinutes(besttime, false), G_TicsToSeconds(besttime), G_TicsToCentiseconds(besttime));
|
snprintf(beststr, sizeof(beststr), "%i:%02i:%02i.%02i", G_TicsToHours(besttime), G_TicsToMinutes(besttime, false), G_TicsToSeconds(besttime), G_TicsToCentiseconds(besttime));
|
||||||
|
|
||||||
V_DrawRightAlignedString(BASEVIDWIDTH-16, 42, (mapsunfinished ? warningflags : 0), beststr);
|
V_DrawRightAlignedString(BASEVIDWIDTH-16, 42, (mapsunfinished ? warningflags : 0), beststr);
|
||||||
|
|
||||||
if (mapsunfinished)
|
if (mapsunfinished)
|
||||||
@@ -6434,7 +6451,7 @@ static void M_ChooseTimeAttack(INT32 choice)
|
|||||||
else
|
else
|
||||||
G_RecordDemo(nameofdemo);
|
G_RecordDemo(nameofdemo);
|
||||||
|
|
||||||
G_DeferedInitNew(false, mapname, (UINT8)(cv_chooseskin.value-1), 0, false);
|
G_DeferedInitNew(false, mapname, (skinnum_t)(cv_chooseskin.value-1), 0, false);
|
||||||
}
|
}
|
||||||
|
|
||||||
static void M_HandleStaffReplay(INT32 choice)
|
static void M_HandleStaffReplay(INT32 choice)
|
||||||
@@ -7135,7 +7152,7 @@ static void M_CheckMODVersion(int id)
|
|||||||
|
|
||||||
if (updatecheck)
|
if (updatecheck)
|
||||||
{
|
{
|
||||||
sprintf(updatestring, UPDATE_ALERT_STRING, VERSIONSTRING, updatecheck);
|
snprintf(updatestring, sizeof(updatestring), UPDATE_ALERT_STRING, VERSIONSTRING, updatecheck);
|
||||||
#ifdef HAVE_THREADS
|
#ifdef HAVE_THREADS
|
||||||
I_lock_mutex(&m_menu_mutex);
|
I_lock_mutex(&m_menu_mutex);
|
||||||
#endif
|
#endif
|
||||||
@@ -7633,11 +7650,8 @@ static void M_DrawMPMainMenu(void)
|
|||||||
// use generic drawer for cursor, items and title
|
// use generic drawer for cursor, items and title
|
||||||
M_DrawGenericMenu();
|
M_DrawGenericMenu();
|
||||||
|
|
||||||
#if MAXPLAYERS != 16
|
|
||||||
Update the maxplayers label...
|
|
||||||
#endif
|
|
||||||
V_DrawRightAlignedString(BASEVIDWIDTH-x, y+MP_MainMenu[4].alphaKey,
|
V_DrawRightAlignedString(BASEVIDWIDTH-x, y+MP_MainMenu[4].alphaKey,
|
||||||
((itemOn == 4) ? highlightflags : 0)|MENUCAPS, "(2-16 Players)");
|
((itemOn == 4) ? highlightflags : 0)|MENUCAPS, va("(2-%d Players)", MAXPLAYERS));
|
||||||
|
|
||||||
V_DrawRightAlignedString(BASEVIDWIDTH-x, y+MP_MainMenu[5].alphaKey,
|
V_DrawRightAlignedString(BASEVIDWIDTH-x, y+MP_MainMenu[5].alphaKey,
|
||||||
((itemOn == 5) ? highlightflags : 0)|MENUCAPS,
|
((itemOn == 5) ? highlightflags : 0)|MENUCAPS,
|
||||||
@@ -7663,7 +7677,7 @@ Update the maxplayers label...
|
|||||||
#define iconwidth 32
|
#define iconwidth 32
|
||||||
#define spacingwidth 32
|
#define spacingwidth 32
|
||||||
#define incrwidth (iconwidth + spacingwidth)
|
#define incrwidth (iconwidth + spacingwidth)
|
||||||
UINT8 i = 0, pskin, pcol;
|
UINT16 i = 0, pskin, pcol;
|
||||||
// player arrangement width, but there's also a chance i'm a furry, shhhhhh
|
// player arrangement width, but there's also a chance i'm a furry, shhhhhh
|
||||||
const INT32 paw = iconwidth + 3*incrwidth;
|
const INT32 paw = iconwidth + 3*incrwidth;
|
||||||
INT32 trans = 0;
|
INT32 trans = 0;
|
||||||
@@ -7916,16 +7930,16 @@ static void M_DrawSetupMultiPlayerMenu(void)
|
|||||||
spritedef_t *sprdef;
|
spritedef_t *sprdef;
|
||||||
spriteframe_t *sprframe;
|
spriteframe_t *sprframe;
|
||||||
patch_t *patch;
|
patch_t *patch;
|
||||||
UINT8 frame;
|
UINT16 frame;
|
||||||
UINT8 speed;
|
UINT16 speed;
|
||||||
UINT8 weight;
|
UINT16 weight;
|
||||||
UINT8 i;
|
UINT16 i;
|
||||||
UINT8 s, w;
|
UINT16 s, w;
|
||||||
INT32 skinnum = 0;
|
INT32 skinnum = 0;
|
||||||
INT32 statx, staty;
|
INT32 statx, staty;
|
||||||
UINT32 speenframe;
|
UINT32 speenframe;
|
||||||
INT32 sltw, actw, hetw;
|
INT32 sltw, actw, hetw;
|
||||||
UINT8 skintodisplay;
|
skinnum_t skintodisplay;
|
||||||
INT32 nameboxaddy = 0;
|
INT32 nameboxaddy = 0;
|
||||||
|
|
||||||
const UINT8 *flashcol = V_GetStringColormap(highlightflags);
|
const UINT8 *flashcol = V_GetStringColormap(highlightflags);
|
||||||
@@ -7982,7 +7996,7 @@ static void M_DrawSetupMultiPlayerMenu(void)
|
|||||||
break;
|
break;
|
||||||
case SKINMENUTYPE_2D:
|
case SKINMENUTYPE_2D:
|
||||||
|
|
||||||
skintodisplay = setupm_fakeskin;
|
skintodisplay = (skinnum_t)setupm_fakeskin;
|
||||||
if (setupm_skinlockedselect) //show the skin we are trying to select
|
if (setupm_skinlockedselect) //show the skin we are trying to select
|
||||||
skintodisplay = skinstats[setupm_skinxpos][setupm_skinypos][setupm_skinselect];
|
skintodisplay = skinstats[setupm_skinxpos][setupm_skinypos][setupm_skinselect];
|
||||||
else if (skinstatscount[setupm_skinxpos][setupm_skinypos] && itemOn == 1)
|
else if (skinstatscount[setupm_skinxpos][setupm_skinypos] && itemOn == 1)
|
||||||
@@ -8362,7 +8376,7 @@ static void M_DrawSetupMultiPlayerMenu(void)
|
|||||||
colwidth = colwidth - 10;
|
colwidth = colwidth - 10;
|
||||||
|
|
||||||
INT32 j = -colwidth;
|
INT32 j = -colwidth;
|
||||||
INT16 col = setupm_fakecolor - colwidth;
|
INT32 col = setupm_fakecolor - colwidth;
|
||||||
INT32 x = mx;
|
INT32 x = mx;
|
||||||
INT32 cw = indexwidth;
|
INT32 cw = indexwidth;
|
||||||
UINT8 ch;
|
UINT8 ch;
|
||||||
@@ -8390,7 +8404,7 @@ static void M_DrawSetupMultiPlayerMenu(void)
|
|||||||
{
|
{
|
||||||
const INT32 icons = 4;
|
const INT32 icons = 4;
|
||||||
INT32 k = -icons;
|
INT32 k = -icons;
|
||||||
INT16 col = setupm_fakeskin - icons;
|
INT32 col = setupm_fakeskin - icons;
|
||||||
INT32 x = BASEVIDWIDTH/2 - ((icons+1)*24) - 4;
|
INT32 x = BASEVIDWIDTH/2 - ((icons+1)*24) - 4;
|
||||||
fixed_t scale = FRACUNIT/2;
|
fixed_t scale = FRACUNIT/2;
|
||||||
INT32 offx = 8, offy = 8;
|
INT32 offx = 8, offy = 8;
|
||||||
@@ -8453,7 +8467,7 @@ static void M_DrawSetupMultiPlayerMenu(void)
|
|||||||
switch (cv_skinselectmenu.value)
|
switch (cv_skinselectmenu.value)
|
||||||
{
|
{
|
||||||
case SKINMENUTYPE_2D:
|
case SKINMENUTYPE_2D:
|
||||||
skintodisplay = (UINT8)setupm_fakeskin;
|
skintodisplay = (skinnum_t)setupm_fakeskin;
|
||||||
if (setupm_skinlockedselect) // show the skin we are trying to select
|
if (setupm_skinlockedselect) // show the skin we are trying to select
|
||||||
skintodisplay = skinstats[setupm_skinxpos][setupm_skinypos][setupm_skinselect];
|
skintodisplay = skinstats[setupm_skinxpos][setupm_skinypos][setupm_skinselect];
|
||||||
else if (skinstatscount[setupm_skinxpos][setupm_skinypos] && itemOn == 1)
|
else if (skinstatscount[setupm_skinxpos][setupm_skinypos] && itemOn == 1)
|
||||||
@@ -8461,10 +8475,10 @@ static void M_DrawSetupMultiPlayerMenu(void)
|
|||||||
break;
|
break;
|
||||||
case SKINMENUTYPE_EXTENDED:
|
case SKINMENUTYPE_EXTENDED:
|
||||||
case SKINMENUTYPE_GRID:
|
case SKINMENUTYPE_GRID:
|
||||||
skintodisplay = ((itemOn == 1 && (setupm_skinselect < numskins)) ? skinsorted[setupm_skinselect] : (UINT8)setupm_fakeskin);
|
skintodisplay = ((itemOn == 1 && (setupm_skinselect < numskins)) ? skinsorted[setupm_skinselect] : (skinnum_t)setupm_fakeskin);
|
||||||
break;
|
break;
|
||||||
default:
|
default:
|
||||||
skintodisplay = (UINT8)setupm_fakeskin;
|
skintodisplay = (skinnum_t)setupm_fakeskin;
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -9037,15 +9051,15 @@ static boolean M_QuitMultiPlayerMenu(void)
|
|||||||
if (!fastcmp(setupm_name, setupm_cvname->string))
|
if (!fastcmp(setupm_name, setupm_cvname->string))
|
||||||
{
|
{
|
||||||
// remove trailing whitespaces
|
// remove trailing whitespaces
|
||||||
for (l = strlen(setupm_name)-1;
|
l = strlen(setupm_name)-1;
|
||||||
(signed)l >= 0 && setupm_name[l] ==' '; l--)
|
for (;(signed)l >= 0 && setupm_name[l] ==' '; l--)
|
||||||
setupm_name[l] =0;
|
setupm_name[l] = 0;
|
||||||
COM_BufAddText(va("%s \"%s\"\n",setupm_cvname->name,setupm_name));
|
COM_BufAddText(va("%s \"%s\"\n", setupm_cvname->name, setupm_name));
|
||||||
}
|
}
|
||||||
|
|
||||||
// you know what? always putting these in the buffer won't hurt anything.
|
// you know what? always putting these in the buffer won't hurt anything.
|
||||||
COM_BufAddText(va("%s \"%s\"\n",setupm_cvskin->name,skins[setupm_fakeskin].name));
|
COM_BufAddText(va("%s \"%s\"\n", setupm_cvskin->name, skins[setupm_fakeskin].name));
|
||||||
COM_BufAddText(va("%s %d\n",setupm_cvcolor->name,setupm_fakecolor));
|
COM_BufAddText(va("%s %d\n", setupm_cvcolor->name, setupm_fakecolor));
|
||||||
|
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
@@ -9587,11 +9601,13 @@ static void M_ChangecontrolResponse(event_t *ev)
|
|||||||
menu_t *prev = currentMenu->prevMenu;
|
menu_t *prev = currentMenu->prevMenu;
|
||||||
|
|
||||||
if (controltochange == gc_pause)
|
if (controltochange == gc_pause)
|
||||||
sprintf(tmp, M_GetText("The \x82Pause Key \x80is enabled, but \nyou may select another key. \n\nHit another key for\n%s\nESC for Cancel"),
|
{
|
||||||
controltochangetext);
|
snprintf(tmp, sizeof(tmp), M_GetText("The \x82Pause Key \x80is enabled, but \nyou may select another key. \n\nHit another key for\n%s\nESC for Cancel"), controltochangetext);
|
||||||
|
}
|
||||||
else
|
else
|
||||||
sprintf(tmp, M_GetText("The \x82Pause Key \x80is enabled, but \nit is not configurable. \n\nHit another key for\n%s\nESC for Cancel"),
|
{
|
||||||
controltochangetext);
|
snprintf(tmp, sizeof(tmp), M_GetText("The \x82Pause Key \x80is enabled, but \nit is not configurable. \n\nHit another key for\n%s\nESC for Cancel"), controltochangetext);
|
||||||
|
}
|
||||||
|
|
||||||
M_StartMessage(tmp, M_ChangecontrolResponse, MM_EVENTHANDLER);
|
M_StartMessage(tmp, M_ChangecontrolResponse, MM_EVENTHANDLER);
|
||||||
currentMenu->prevMenu = prev;
|
currentMenu->prevMenu = prev;
|
||||||
@@ -9612,8 +9628,7 @@ static void M_ChangeControl(INT32 choice)
|
|||||||
static char tmp[68];
|
static char tmp[68];
|
||||||
|
|
||||||
controltochange = currentMenu->menuitems[choice].alphaKey;
|
controltochange = currentMenu->menuitems[choice].alphaKey;
|
||||||
sprintf(tmp, M_GetText("Hit the new key for\n%s\nESC for Cancel"),
|
snprintf(tmp, sizeof(tmp), M_GetText("Hit the new key for\n%s\nESC for Cancel"), currentMenu->menuitems[choice].text);
|
||||||
currentMenu->menuitems[choice].text);
|
|
||||||
strlcpy(controltochangetext, currentMenu->menuitems[choice].text, 33);
|
strlcpy(controltochangetext, currentMenu->menuitems[choice].text, 33);
|
||||||
|
|
||||||
M_StartMessage(tmp, M_ChangecontrolResponse, MM_EVENTHANDLER);
|
M_StartMessage(tmp, M_ChangecontrolResponse, MM_EVENTHANDLER);
|
||||||
@@ -10045,7 +10060,7 @@ static void M_DrawColorMenu(void)
|
|||||||
|
|
||||||
for (max = currentMenu->numitems; max > 0; max--)
|
for (max = currentMenu->numitems; max > 0; max--)
|
||||||
{
|
{
|
||||||
if (currentMenu->menuitems[max].status != IT_DISABLED && currentMenu->menuitems[max-1].alphaKey*2 + tempcentery <= (currentMenu->y + 2*scrollareaheight))
|
if (currentMenu->menuitems[max-1].status != IT_DISABLED && currentMenu->menuitems[max-1].alphaKey*2 + tempcentery <= (currentMenu->y + 2*scrollareaheight))
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -10581,6 +10596,20 @@ static void M_QuitSRB2(INT32 choice)
|
|||||||
M_StartMessage(quitmsg[M_RandomKey(NUM_QUITMESSAGES)], M_QuitResponse, MM_YESNO);
|
M_StartMessage(quitmsg[M_RandomKey(NUM_QUITMESSAGES)], M_QuitResponse, MM_YESNO);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// ===========
|
||||||
|
// SATURN MENU
|
||||||
|
// ===========
|
||||||
|
|
||||||
|
static void M_SaturnReportIssue(INT32 choice)
|
||||||
|
{
|
||||||
|
(void)choice;
|
||||||
|
int url = I_OpenURL(SATURNISSUEPAGE);
|
||||||
|
|
||||||
|
// SDL_OpenURL unsupported or failed
|
||||||
|
if (url == -1)
|
||||||
|
M_StartMessage(M_GetText("Failed to Open Web Page.\nPlease open the following page in your web browser:\n\n" SATURNISSUEPAGE "\n\n(Press a key)\n"), NULL, MM_NOTHING);
|
||||||
|
}
|
||||||
|
|
||||||
#ifdef HAVE_DISCORDRPC
|
#ifdef HAVE_DISCORDRPC
|
||||||
|
|
||||||
// =====================================================================
|
// =====================================================================
|
||||||
|
|||||||
+2
-2
@@ -230,8 +230,8 @@ typedef struct
|
|||||||
char levelname[32];
|
char levelname[32];
|
||||||
UINT8 actnum;
|
UINT8 actnum;
|
||||||
UINT8 skincolor;
|
UINT8 skincolor;
|
||||||
UINT8 skinnum;
|
skinnum_t skinnum;
|
||||||
UINT8 botskin;
|
skinnum_t botskin;
|
||||||
UINT8 botcolor;
|
UINT8 botcolor;
|
||||||
UINT8 numemeralds;
|
UINT8 numemeralds;
|
||||||
INT32 lives;
|
INT32 lives;
|
||||||
|
|||||||
+59
-3
@@ -36,6 +36,7 @@ static menu_t SP_TimeAttackDef, SP_ReplayDef, SP_GuestReplayDef, SP_GhostDef;
|
|||||||
menu_t OP_ControlsDef, OP_AllControlsDef;
|
menu_t OP_ControlsDef, OP_AllControlsDef;
|
||||||
menu_t OP_MouseOptionsDef;
|
menu_t OP_MouseOptionsDef;
|
||||||
menu_t OP_Joystick1Def, OP_Joystick2Def, OP_Joystick3Def, OP_Joystick4Def;
|
menu_t OP_Joystick1Def, OP_Joystick2Def, OP_Joystick3Def, OP_Joystick4Def;
|
||||||
|
menu_t OP_Joystick1RumbleDef, OP_Joystick2RumbleDef, OP_Joystick3RumbleDef, OP_Joystick4RumbleDef;
|
||||||
|
|
||||||
// Custom cvar menu
|
// Custom cvar menu
|
||||||
menu_t OP_CustomCvarMenuDef;
|
menu_t OP_CustomCvarMenuDef;
|
||||||
@@ -725,6 +726,14 @@ static const char* OP_AllControlsTooltips[sizeof(OP_AllControlsMenu)/sizeof(OP_A
|
|||||||
// The rest is null, for now
|
// The rest is null, for now
|
||||||
};
|
};
|
||||||
|
|
||||||
|
// i really do not feel like messing with setup routines
|
||||||
|
// and macro preprocessor cannot eval maths for string shit like this :chaosleep:
|
||||||
|
#define RUMBDEF_0 OP_Joystick1RumbleDef
|
||||||
|
#define RUMBDEF_1 OP_Joystick2RumbleDef
|
||||||
|
#define RUMBDEF_2 OP_Joystick3RumbleDef
|
||||||
|
#define RUMBDEF_3 OP_Joystick4RumbleDef
|
||||||
|
#define RUMBDEF(x) RUMBDEF_##x
|
||||||
|
|
||||||
#define OP_JOYMENU(pnum) \
|
#define OP_JOYMENU(pnum) \
|
||||||
{IT_HEADER, NULL, "Gameplay Controls", NULL, 7}, \
|
{IT_HEADER, NULL, "Gameplay Controls", NULL, 7}, \
|
||||||
{IT_STRING | IT_CVAR, NULL, "Aim Forward/Back" , &cv_aimaxis[pnum] , 15}, \
|
{IT_STRING | IT_CVAR, NULL, "Aim Forward/Back" , &cv_aimaxis[pnum] , 15}, \
|
||||||
@@ -745,9 +754,8 @@ static const char* OP_AllControlsTooltips[sizeof(OP_AllControlsMenu)/sizeof(OP_A
|
|||||||
{IT_STRING | IT_CVAR, NULL, "X deadzone" , &cv_xdeadzone[pnum] , 100}, \
|
{IT_STRING | IT_CVAR, NULL, "X deadzone" , &cv_xdeadzone[pnum] , 100}, \
|
||||||
{IT_STRING | IT_CVAR, NULL, "Y deadzone" , &cv_ydeadzone[pnum] , 105}, \
|
{IT_STRING | IT_CVAR, NULL, "Y deadzone" , &cv_ydeadzone[pnum] , 105}, \
|
||||||
{IT_HEADER, NULL, "Miscellaneous", NULL, 112}, \
|
{IT_HEADER, NULL, "Miscellaneous", NULL, 112}, \
|
||||||
{IT_STRING | IT_CVAR, NULL, "Controller Rumble" , &cv_rumble[pnum] , 120}, \
|
{IT_SUBMENU|IT_STRING, NULL, "Rumble Options..." , &RUMBDEF(pnum) , 120}, \
|
||||||
{IT_STRING | IT_CVAR, NULL, "Controller Rumble Strength" , &cv_rumblestrength[pnum] , 125}, \
|
{IT_STRING | IT_CVAR, NULL, "Set LED to Player color" , &cv_gamepadled[pnum] , 125},
|
||||||
{IT_STRING | IT_CVAR, NULL, "Set LED to Player color" , &cv_gamepadled[pnum] , 130},
|
|
||||||
|
|
||||||
static menuitem_t OP_Joystick1Menu[] =
|
static menuitem_t OP_Joystick1Menu[] =
|
||||||
{
|
{
|
||||||
@@ -773,6 +781,46 @@ static menuitem_t OP_Joystick4Menu[] =
|
|||||||
OP_JOYMENU(3)
|
OP_JOYMENU(3)
|
||||||
};
|
};
|
||||||
|
|
||||||
|
#undef RUMBDEF
|
||||||
|
#undef RUMBDEF_0
|
||||||
|
#undef RUMBDEF_1
|
||||||
|
#undef RUMBDEF_2
|
||||||
|
#undef RUMBDEF_3
|
||||||
|
|
||||||
|
// FIXME: stair jank rumble should be greyed out if its disabled, but menus suck butt!
|
||||||
|
#define OP_JOYRUMBLEMENU(pnum) \
|
||||||
|
{IT_HEADER, NULL, "Global", NULL, 7}, \
|
||||||
|
{IT_STRING | IT_CVAR, NULL, "Controller Rumble" , &cv_rumble[pnum] , 15}, \
|
||||||
|
{IT_STRING | IT_CVAR, NULL, "Controller Rumble Strength" , &cv_rumble_strength[pnum] , 20}, \
|
||||||
|
{IT_HEADER, NULL, "Rumble Types", NULL, 27}, \
|
||||||
|
{IT_STRING | IT_CVAR, NULL, "Spinout" , &cv_rumble_spinout[pnum] , 35}, \
|
||||||
|
{IT_STRING | IT_CVAR, NULL, "Sneaker Boost" , &cv_rumble_sneakerboost[pnum] , 40}, \
|
||||||
|
{IT_STRING | IT_CVAR, NULL, "Offroad" , &cv_rumble_offroad[pnum] , 45}, \
|
||||||
|
{IT_STRING | IT_CVAR, NULL, "Banana Dragging" , &cv_rumble_bananadrag[pnum] , 50}, \
|
||||||
|
{IT_STRING | IT_CVAR, NULL, "Stair Jank" , &cv_rumble_stairjank[pnum] , 55}, \
|
||||||
|
{IT_STRING | IT_CVAR, NULL, "Brake Drift" , &cv_rumble_brakedrift[pnum] , 60}, \
|
||||||
|
{IT_STRING | IT_CVAR, NULL, "Drift Charge" , &cv_rumble_driftcharge[pnum] , 65}, \
|
||||||
|
|
||||||
|
static menuitem_t OP_Joystick1RumbleMenu[] =
|
||||||
|
{
|
||||||
|
OP_JOYRUMBLEMENU(0)
|
||||||
|
};
|
||||||
|
|
||||||
|
static menuitem_t OP_Joystick2RumbleMenu[] =
|
||||||
|
{
|
||||||
|
OP_JOYRUMBLEMENU(1)
|
||||||
|
};
|
||||||
|
|
||||||
|
static menuitem_t OP_Joystick3RumbleMenu[] =
|
||||||
|
{
|
||||||
|
OP_JOYRUMBLEMENU(2)
|
||||||
|
};
|
||||||
|
|
||||||
|
static menuitem_t OP_Joystick4RumbleMenu[] =
|
||||||
|
{
|
||||||
|
OP_JOYRUMBLEMENU(3)
|
||||||
|
};
|
||||||
|
|
||||||
static menuitem_t OP_JoystickSetMenu[] =
|
static menuitem_t OP_JoystickSetMenu[] =
|
||||||
{
|
{
|
||||||
{IT_CALL | IT_NOTHING, "None", NULL, M_AssignJoystick, LINEHEIGHT+5},
|
{IT_CALL | IT_NOTHING, "None", NULL, M_AssignJoystick, LINEHEIGHT+5},
|
||||||
@@ -1736,6 +1784,7 @@ static menuitem_t OP_SaturnMenu[] =
|
|||||||
{IT_SUBMENU|IT_STRING, NULL, "Saturn Hud...", &OP_SaturnHudDef, 140},
|
{IT_SUBMENU|IT_STRING, NULL, "Saturn Hud...", &OP_SaturnHudDef, 140},
|
||||||
{IT_SUBMENU|IT_STRING, NULL, "Sprite Distortion...", &OP_PlayerDistortDef, 145},
|
{IT_SUBMENU|IT_STRING, NULL, "Sprite Distortion...", &OP_PlayerDistortDef, 145},
|
||||||
{IT_SUBMENU|IT_STRING, NULL, "Saturn Credits", &OP_SaturnCreditsDef, 150}, // uwu
|
{IT_SUBMENU|IT_STRING, NULL, "Saturn Credits", &OP_SaturnCreditsDef, 150}, // uwu
|
||||||
|
{IT_STRING|IT_CALL, NULL, "Report an Issue", M_SaturnReportIssue, 155}
|
||||||
};
|
};
|
||||||
|
|
||||||
static const char* OP_SaturnTooltips[] =
|
static const char* OP_SaturnTooltips[] =
|
||||||
@@ -1759,6 +1808,7 @@ static const char* OP_SaturnTooltips[] =
|
|||||||
"Options for Saturn specific HUD things.",
|
"Options for Saturn specific HUD things.",
|
||||||
"Options for sprite distortion effects.",
|
"Options for sprite distortion effects.",
|
||||||
"See the people who helped make this project possible!",
|
"See the people who helped make this project possible!",
|
||||||
|
"Noticed a bug, have a Suggestion or other Feedback?\nFeel free to tell us!",
|
||||||
};
|
};
|
||||||
|
|
||||||
enum
|
enum
|
||||||
@@ -1780,6 +1830,7 @@ enum
|
|||||||
sm_hud,
|
sm_hud,
|
||||||
sm_distortionmenu,
|
sm_distortionmenu,
|
||||||
sm_credits,
|
sm_credits,
|
||||||
|
sm_issue,
|
||||||
};
|
};
|
||||||
|
|
||||||
static menuitem_t OP_PlayerDistortMenu[] =
|
static menuitem_t OP_PlayerDistortMenu[] =
|
||||||
@@ -2530,6 +2581,11 @@ menu_t OP_Joystick2Def = DEFAULTSCROLLSTYLE("M_CONTRO", OP_Joystick2Menu, &OP
|
|||||||
menu_t OP_Joystick3Def = DEFAULTSCROLLSTYLE("M_CONTRO", OP_Joystick3Menu, &OP_AllControlsDef, 30, 36, NULL);
|
menu_t OP_Joystick3Def = DEFAULTSCROLLSTYLE("M_CONTRO", OP_Joystick3Menu, &OP_AllControlsDef, 30, 36, NULL);
|
||||||
menu_t OP_Joystick4Def = DEFAULTSCROLLSTYLE("M_CONTRO", OP_Joystick4Menu, &OP_AllControlsDef, 30, 36, NULL);
|
menu_t OP_Joystick4Def = DEFAULTSCROLLSTYLE("M_CONTRO", OP_Joystick4Menu, &OP_AllControlsDef, 30, 36, NULL);
|
||||||
|
|
||||||
|
menu_t OP_Joystick1RumbleDef = DEFAULTSCROLLSTYLE("M_CONTRO", OP_Joystick1RumbleMenu, &OP_Joystick1Def, 30, 36, NULL);
|
||||||
|
menu_t OP_Joystick2RumbleDef = DEFAULTSCROLLSTYLE("M_CONTRO", OP_Joystick2RumbleMenu, &OP_Joystick2Def, 30, 36, NULL);
|
||||||
|
menu_t OP_Joystick3RumbleDef = DEFAULTSCROLLSTYLE("M_CONTRO", OP_Joystick3RumbleMenu, &OP_Joystick3Def, 30, 36, NULL);
|
||||||
|
menu_t OP_Joystick4RumbleDef = DEFAULTSCROLLSTYLE("M_CONTRO", OP_Joystick4RumbleMenu, &OP_Joystick4Def, 30, 36, NULL);
|
||||||
|
|
||||||
menu_t OP_JoystickSetDef =
|
menu_t OP_JoystickSetDef =
|
||||||
{
|
{
|
||||||
"M_CONTRO",
|
"M_CONTRO",
|
||||||
|
|||||||
+19
-18
@@ -515,8 +515,8 @@ static boolean M_BackupConfig(const char *filename)
|
|||||||
{
|
{
|
||||||
char backupfile[MAX_WADPATH+4];
|
char backupfile[MAX_WADPATH+4];
|
||||||
|
|
||||||
snprintf(backupfile, sizeof backupfile, "%s.bak", filename);
|
snprintf(backupfile, sizeof(backupfile), "%s.bak", filename);
|
||||||
backupfile[sizeof backupfile - 1] = '\0';
|
backupfile[sizeof(backupfile) - 1] = '\0';
|
||||||
|
|
||||||
FILE *config = fopen(filename, "r");
|
FILE *config = fopen(filename, "r");
|
||||||
|
|
||||||
@@ -766,27 +766,27 @@ static void M_PNGText(png_structp png_ptr, png_infop png_info_ptr, PNG_CONST png
|
|||||||
}
|
}
|
||||||
|
|
||||||
if (gamestate == GS_LEVEL)
|
if (gamestate == GS_LEVEL)
|
||||||
snprintf(maptext, 8, "%s", G_BuildMapName(gamemap));
|
snprintf(maptext, sizeof(maptext), "%s", G_BuildMapName(gamemap));
|
||||||
else
|
else
|
||||||
snprintf(maptext, 8, "Unknown");
|
snprintf(maptext, sizeof(maptext), "Unknown");
|
||||||
|
|
||||||
if (gamestate == GS_LEVEL && mapheaderinfo[gamemap-1]->lvlttl[0] != '\0')
|
if (gamestate == GS_LEVEL && mapheaderinfo[gamemap-1]->lvlttl[0] != '\0')
|
||||||
snprintf(lvlttltext, 48, "%s%s%s",
|
snprintf(lvlttltext, sizeof(lvlttltext), "%s%s%s",
|
||||||
mapheaderinfo[gamemap-1]->lvlttl,
|
mapheaderinfo[gamemap-1]->lvlttl,
|
||||||
(strlen(mapheaderinfo[gamemap-1]->zonttl) > 0) ? va(" %s",mapheaderinfo[gamemap-1]->zonttl) : // SRB2kart
|
(strlen(mapheaderinfo[gamemap-1]->zonttl) > 0) ? va(" %s",mapheaderinfo[gamemap-1]->zonttl) : // SRB2kart
|
||||||
((mapheaderinfo[gamemap-1]->levelflags & LF_NOZONE) ? "" : " ZONE"),
|
((mapheaderinfo[gamemap-1]->levelflags & LF_NOZONE) ? "" : " ZONE"),
|
||||||
(strlen(mapheaderinfo[gamemap-1]->actnum) > 0) ? va(" %s",mapheaderinfo[gamemap-1]->actnum) : "");
|
(strlen(mapheaderinfo[gamemap-1]->actnum) > 0) ? va(" %s",mapheaderinfo[gamemap-1]->actnum) : "");
|
||||||
else
|
else
|
||||||
snprintf(lvlttltext, 48, "Unknown");
|
snprintf(lvlttltext, sizeof(lvlttltext), "Unknown");
|
||||||
|
|
||||||
if (gamestate == GS_LEVEL && players[displayplayers[0]].mo)
|
if (gamestate == GS_LEVEL && players[displayplayers[0]].mo)
|
||||||
snprintf(locationtxt, 40, "X:%d Y:%d Z:%d A:%d",
|
snprintf(locationtxt, sizeof(locationtxt), "X:%d Y:%d Z:%d A:%d",
|
||||||
players[displayplayers[0]].mo->x>>FRACBITS,
|
players[displayplayers[0]].mo->x>>FRACBITS,
|
||||||
players[displayplayers[0]].mo->y>>FRACBITS,
|
players[displayplayers[0]].mo->y>>FRACBITS,
|
||||||
players[displayplayers[0]].mo->z>>FRACBITS,
|
players[displayplayers[0]].mo->z>>FRACBITS,
|
||||||
FixedInt(AngleFixed(players[displayplayers[0]].mo->angle)));
|
FixedInt(AngleFixed(players[displayplayers[0]].mo->angle)));
|
||||||
else
|
else
|
||||||
snprintf(locationtxt, 40, "Unknown");
|
snprintf(locationtxt, sizeof(locationtxt), "Unknown");
|
||||||
|
|
||||||
memset(png_infotext, 0x00, sizeof(png_infotext));
|
memset(png_infotext, 0x00, sizeof(png_infotext));
|
||||||
|
|
||||||
@@ -1253,7 +1253,6 @@ boolean M_ScreenshotResponder(event_t *ev)
|
|||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
void M_ScrollString(const char name[], size_t len, char result[], size_t maxlen, tic_t timer)
|
void M_ScrollString(const char name[], size_t len, char result[], size_t maxlen, tic_t timer)
|
||||||
{
|
{
|
||||||
// How much should we scroll. Not sure why +1 is needed, but without it this function skips 2
|
// How much should we scroll. Not sure why +1 is needed, but without it this function skips 2
|
||||||
@@ -1261,7 +1260,7 @@ void M_ScrollString(const char name[], size_t len, char result[], size_t maxlen,
|
|||||||
const size_t amount = len - maxlen + 1;
|
const size_t amount = len - maxlen + 1;
|
||||||
|
|
||||||
// Note: anything above 17 will cause zero division
|
// Note: anything above 17 will cause zero division
|
||||||
const size_t MAXSPEED = 6;
|
static const size_t MAXSPEED = 6;
|
||||||
const tic_t t = timer / (35/min(amount, MAXSPEED));
|
const tic_t t = timer / (35/min(amount, MAXSPEED));
|
||||||
|
|
||||||
const size_t state = (t / amount) % 4;
|
const size_t state = (t / amount) % 4;
|
||||||
@@ -1296,7 +1295,7 @@ void M_ScrollString(const char name[], size_t len, char result[], size_t maxlen,
|
|||||||
}
|
}
|
||||||
|
|
||||||
// Technically not necessary, since it gets set again after function call, but just in case
|
// Technically not necessary, since it gets set again after function call, but just in case
|
||||||
result[maxlen] = 0;
|
result[maxlen-1] = '\0';
|
||||||
}
|
}
|
||||||
|
|
||||||
void M_MinimapGenerate(void)
|
void M_MinimapGenerate(void)
|
||||||
@@ -1394,7 +1393,7 @@ char *va(const char *format, ...)
|
|||||||
static char string[1024];
|
static char string[1024];
|
||||||
|
|
||||||
va_start(argptr, format);
|
va_start(argptr, format);
|
||||||
vsnprintf(string, 1024, format, argptr);
|
vsnprintf(string, sizeof(string), format, argptr);
|
||||||
va_end(argptr);
|
va_end(argptr);
|
||||||
|
|
||||||
return string;
|
return string;
|
||||||
@@ -1708,7 +1707,7 @@ const char * M_Ftrim(double f)
|
|||||||
int i;
|
int i;
|
||||||
|
|
||||||
/* I know I said it's the default, but just in case... */
|
/* I know I said it's the default, but just in case... */
|
||||||
sprintf(dig, "%.6f", fabs(modf(f, &f)));
|
snprintf(dig, sizeof(dig), "%.6f", fabs(modf(f, &f)));
|
||||||
|
|
||||||
/* trim trailing zeroes */
|
/* trim trailing zeroes */
|
||||||
for (i = strlen(dig)-1; dig[i] == '0'; --i)
|
for (i = strlen(dig)-1; dig[i] == '0'; --i)
|
||||||
@@ -1736,6 +1735,7 @@ UINT8 M_CountBits(UINT32 num, UINT8 size)
|
|||||||
const char *GetRevisionString(void)
|
const char *GetRevisionString(void)
|
||||||
{
|
{
|
||||||
static char rev[9] = {0};
|
static char rev[9] = {0};
|
||||||
|
|
||||||
if (rev[0])
|
if (rev[0])
|
||||||
return rev;
|
return rev;
|
||||||
|
|
||||||
@@ -1743,6 +1743,7 @@ const char *GetRevisionString(void)
|
|||||||
strncpy(rev, comprevision, 7);
|
strncpy(rev, comprevision, 7);
|
||||||
else
|
else
|
||||||
snprintf(rev, 7, "r%s", comprevision);
|
snprintf(rev, 7, "r%s", comprevision);
|
||||||
|
|
||||||
rev[7] = '\0';
|
rev[7] = '\0';
|
||||||
|
|
||||||
return rev;
|
return rev;
|
||||||
@@ -1814,35 +1815,35 @@ TMatrix *RotateZMatrix(angle_t rad)
|
|||||||
char *sizeu1(size_t num)
|
char *sizeu1(size_t num)
|
||||||
{
|
{
|
||||||
static char sizeu1_buf[28];
|
static char sizeu1_buf[28];
|
||||||
sprintf(sizeu1_buf, "%"PRIdS, num);
|
snprintf(sizeu1_buf, sizeof(sizeu1_buf), "%" PRIdS, num);
|
||||||
return sizeu1_buf;
|
return sizeu1_buf;
|
||||||
}
|
}
|
||||||
|
|
||||||
char *sizeu2(size_t num)
|
char *sizeu2(size_t num)
|
||||||
{
|
{
|
||||||
static char sizeu2_buf[28];
|
static char sizeu2_buf[28];
|
||||||
sprintf(sizeu2_buf, "%"PRIdS, num);
|
snprintf(sizeu2_buf, sizeof(sizeu2_buf), "%" PRIdS, num);
|
||||||
return sizeu2_buf;
|
return sizeu2_buf;
|
||||||
}
|
}
|
||||||
|
|
||||||
char *sizeu3(size_t num)
|
char *sizeu3(size_t num)
|
||||||
{
|
{
|
||||||
static char sizeu3_buf[28];
|
static char sizeu3_buf[28];
|
||||||
sprintf(sizeu3_buf, "%"PRIdS, num);
|
snprintf(sizeu3_buf, sizeof(sizeu3_buf), "%" PRIdS, num);
|
||||||
return sizeu3_buf;
|
return sizeu3_buf;
|
||||||
}
|
}
|
||||||
|
|
||||||
char *sizeu4(size_t num)
|
char *sizeu4(size_t num)
|
||||||
{
|
{
|
||||||
static char sizeu4_buf[28];
|
static char sizeu4_buf[28];
|
||||||
sprintf(sizeu4_buf, "%"PRIdS, num);
|
snprintf(sizeu4_buf, sizeof(sizeu4_buf), "%" PRIdS, num);
|
||||||
return sizeu4_buf;
|
return sizeu4_buf;
|
||||||
}
|
}
|
||||||
|
|
||||||
char *sizeu5(size_t num)
|
char *sizeu5(size_t num)
|
||||||
{
|
{
|
||||||
static char sizeu5_buf[28];
|
static char sizeu5_buf[28];
|
||||||
sprintf(sizeu5_buf, "%"PRIdS, num);
|
snprintf(sizeu5_buf, sizeof(sizeu5_buf), "%" PRIdS, num);
|
||||||
return sizeu5_buf;
|
return sizeu5_buf;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
+41
-56
@@ -169,14 +169,14 @@ perfstatrow_t gamelogic_rows[] = {
|
|||||||
};
|
};
|
||||||
|
|
||||||
perfstatrow_t thinkercount_rows[] = {
|
perfstatrow_t thinkercount_rows[] = {
|
||||||
{"thnkers", "Thinkers: ", &ps_thinkercount, PS_LEVEL},
|
{"thnkers" , "Thinkers: ", &ps_thinkercount, PS_LEVEL},
|
||||||
{" mobjs ", " Mobjs: ", &ps_mobjcount, PS_LEVEL},
|
{" mobjs " , " Mobjs: ", &ps_mobjcount, PS_LEVEL},
|
||||||
{" regular", " Regular: ", &ps_regularcount, PS_LEVEL},
|
{" regular", " Regular: ", &ps_regularcount, PS_LEVEL},
|
||||||
{" scenery", " Scenery: ", &ps_scenerycount, PS_LEVEL},
|
{" scenery", " Scenery: ", &ps_scenerycount, PS_LEVEL},
|
||||||
{" nothink", " Nothink: ", &ps_nothinkcount, PS_HIDE_ZERO|PS_LEVEL},
|
{" nothink", " Nothink: ", &ps_nothinkcount, PS_HIDE_ZERO|PS_LEVEL},
|
||||||
{" precip ", " Precipitation: ", &ps_precipcount, PS_LEVEL},
|
{" precip " , " Precipitation: ", &ps_precipcount, PS_LEVEL},
|
||||||
{" other ", " Other: ", &ps_otherthcount, PS_LEVEL},
|
{" other " , " Other: ", &ps_otherthcount, PS_LEVEL},
|
||||||
{" remove ", " Pending removal:", &ps_removecount, PS_LEVEL},
|
{" remove " , " Pending removal:", &ps_removecount, PS_LEVEL},
|
||||||
{}
|
{}
|
||||||
};
|
};
|
||||||
|
|
||||||
@@ -606,7 +606,9 @@ static void PS_CountThinkers(void)
|
|||||||
else if (thinker->function == (actionf_p1)P_MobjThinker)
|
else if (thinker->function == (actionf_p1)P_MobjThinker)
|
||||||
{
|
{
|
||||||
mobj_t *mobj = (mobj_t*)thinker;
|
mobj_t *mobj = (mobj_t*)thinker;
|
||||||
|
|
||||||
ps_mobjcount.value.i++;
|
ps_mobjcount.value.i++;
|
||||||
|
|
||||||
if (mobj->flags & MF_NOTHINK)
|
if (mobj->flags & MF_NOTHINK)
|
||||||
ps_nothinkcount.value.i++;
|
ps_nothinkcount.value.i++;
|
||||||
else if (mobj->flags & MF_SCENERY)
|
else if (mobj->flags & MF_SCENERY)
|
||||||
@@ -625,49 +627,17 @@ static void PS_CountThinkers(void)
|
|||||||
|
|
||||||
ps_precipcount.value.i++;
|
ps_precipcount.value.i++;
|
||||||
}
|
}
|
||||||
|
|
||||||
/*for (i = 0; i < NUM_THINKERLISTS; i++)
|
|
||||||
{
|
|
||||||
for (thinker = thlist[i].next; thinker != &thlist[i]; thinker = thinker->next)
|
|
||||||
{
|
|
||||||
ps_thinkercount.value.i++;
|
|
||||||
if (thinker->function == (actionf_p1)P_RemoveThinkerDelayed)
|
|
||||||
ps_removecount.value.i++;
|
|
||||||
else if (i == THINK_POLYOBJ)
|
|
||||||
ps_polythcount.value.i++;
|
|
||||||
else if (i == THINK_MAIN)
|
|
||||||
ps_mainthcount.value.i++;
|
|
||||||
else if (i == THINK_MOBJ)
|
|
||||||
{
|
|
||||||
if (thinker->function == (actionf_p1)P_MobjThinker)
|
|
||||||
{
|
|
||||||
mobj_t *mobj = (mobj_t*)thinker;
|
|
||||||
ps_mobjcount.value.i++;
|
|
||||||
if (mobj->flags & MF_NOTHINK)
|
|
||||||
ps_nothinkcount.value.i++;
|
|
||||||
else if (mobj->flags & MF_SCENERY)
|
|
||||||
ps_scenerycount.value.i++;
|
|
||||||
else
|
|
||||||
ps_regularcount.value.i++;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
else if (i == THINK_DYNSLOPE)
|
|
||||||
ps_dynslopethcount.value.i++;
|
|
||||||
else if (i == THINK_PRECIP)
|
|
||||||
ps_precipcount.value.i++;
|
|
||||||
}
|
|
||||||
}*/
|
|
||||||
}
|
}
|
||||||
|
|
||||||
// Update all metrics that are calculated on every tick.
|
// Update all metrics that are calculated on every tick.
|
||||||
void PS_UpdateTickStats(void)
|
void PS_UpdateTickStats(void)
|
||||||
{
|
{
|
||||||
if (cv_perfstats.value == 1 && cv_ps_samplesize.value > 1)
|
if (cv_perfstats.value == PS_RENDER && cv_ps_samplesize.value > 1)
|
||||||
{
|
{
|
||||||
PS_UpdateRowHistories(gamelogicbrief_row, false);
|
PS_UpdateRowHistories(gamelogicbrief_row, false);
|
||||||
}
|
}
|
||||||
|
|
||||||
if (cv_perfstats.value == 2)
|
if (cv_perfstats.value == PS_LOGIC)
|
||||||
{
|
{
|
||||||
if (PS_IsLevelActive())
|
if (PS_IsLevelActive())
|
||||||
{
|
{
|
||||||
@@ -692,25 +662,25 @@ void PS_UpdateTickStats(void)
|
|||||||
|
|
||||||
if (cv_ps_samplesize.value > 1)
|
if (cv_ps_samplesize.value > 1)
|
||||||
{
|
{
|
||||||
if (cv_perfstats.value >= 3 && PS_IsLevelActive())
|
if (cv_perfstats.value >= PS_THINKFRAME && PS_IsLevelActive())
|
||||||
{
|
{
|
||||||
int i;
|
int i;
|
||||||
|
|
||||||
switch (cv_perfstats.value)
|
switch (cv_perfstats.value)
|
||||||
{
|
{
|
||||||
case 3:
|
case PS_THINKFRAME:
|
||||||
for (i = 0; i < thinkframe_hooks_length; i++)
|
for (i = 0; i < thinkframe_hooks_length; i++)
|
||||||
{
|
{
|
||||||
PS_UpdateMetricHistory(&thinkframe_hooks[i].time_taken, true, false);
|
PS_UpdateMetricHistory(&thinkframe_hooks[i].time_taken, true, false);
|
||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
case 4:
|
case PS_PRETHINKFRAME:
|
||||||
for (i = 0; i < prethinkframe_hooks_length; i++)
|
for (i = 0; i < prethinkframe_hooks_length; i++)
|
||||||
{
|
{
|
||||||
PS_UpdateMetricHistory(&prethinkframe_hooks[i].time_taken, true, false);
|
PS_UpdateMetricHistory(&prethinkframe_hooks[i].time_taken, true, false);
|
||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
case 5:
|
case PS_POSTTHINKFRAME:
|
||||||
for (i = 0; i < postthinkframe_hooks_length; i++)
|
for (i = 0; i < postthinkframe_hooks_length; i++)
|
||||||
{
|
{
|
||||||
PS_UpdateMetricHistory(&postthinkframe_hooks[i].time_taken, true, false);
|
PS_UpdateMetricHistory(&postthinkframe_hooks[i].time_taken, true, false);
|
||||||
@@ -720,6 +690,7 @@ void PS_UpdateTickStats(void)
|
|||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if (cv_perfstats.value)
|
if (cv_perfstats.value)
|
||||||
{
|
{
|
||||||
ps_tick_index++;
|
ps_tick_index++;
|
||||||
@@ -750,7 +721,7 @@ static void PS_DrawDescriptorHeader(void)
|
|||||||
int samples_left = max(ps_frame_samples_left, ps_tick_samples_left);
|
int samples_left = max(ps_frame_samples_left, ps_tick_samples_left);
|
||||||
int x, y;
|
int x, y;
|
||||||
|
|
||||||
if (cv_perfstats.value >= 3)
|
if (cv_perfstats.value >= PS_THINKFRAME)
|
||||||
{
|
{
|
||||||
x = 2;
|
x = 2;
|
||||||
y = 0;
|
y = 0;
|
||||||
@@ -866,20 +837,19 @@ static void draw_think_frame_stats(int hook_length, ps_hookinfo_t *hook)
|
|||||||
last_mod_name[0] = '\0';
|
last_mod_name[0] = '\0';
|
||||||
INT32 total = 0;
|
INT32 total = 0;
|
||||||
|
|
||||||
//Decide page length based and drawn text on choosen thinker type
|
// Decide page length based and drawn text on choosen thinker type
|
||||||
switch (cv_perfstats.value)
|
switch (cv_perfstats.value)
|
||||||
{
|
{
|
||||||
case 3:
|
case PS_THINKFRAME:
|
||||||
{
|
{
|
||||||
maxpage = thinkframe_hooks_length/PAGE_ENTRIES + 1;
|
maxpage = thinkframe_hooks_length/PAGE_ENTRIES + 1;
|
||||||
page = max(1, min(cv_ps_thinkframe_page.value, maxpage));
|
page = max(1, min(cv_ps_thinkframe_page.value, maxpage));
|
||||||
pagestart = min((page - 1)*PAGE_ENTRIES, thinkframe_hooks_length);
|
pagestart = min((page - 1)*PAGE_ENTRIES, thinkframe_hooks_length);
|
||||||
pageend = min(pagestart + PAGE_ENTRIES, thinkframe_hooks_length);
|
pageend = min(pagestart + PAGE_ENTRIES, thinkframe_hooks_length);
|
||||||
|
|
||||||
V_DrawSmallString(MAX_X-50, MAX_Y+2*HEIGHT, V_MONOSPACE | V_GREENMAP, "ThinkFrame");
|
V_DrawSmallString(MAX_X-50, MAX_Y+2*HEIGHT, V_MONOSPACE | V_GREENMAP, "ThinkFrame");
|
||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
case 4:
|
case PS_PRETHINKFRAME:
|
||||||
{
|
{
|
||||||
maxpage = prethinkframe_hooks_length/PAGE_ENTRIES + 1;
|
maxpage = prethinkframe_hooks_length/PAGE_ENTRIES + 1;
|
||||||
page = max(1, min(cv_ps_thinkframe_page.value, maxpage));
|
page = max(1, min(cv_ps_thinkframe_page.value, maxpage));
|
||||||
@@ -888,7 +858,7 @@ static void draw_think_frame_stats(int hook_length, ps_hookinfo_t *hook)
|
|||||||
V_DrawSmallString(MAX_X-60, MAX_Y+2*HEIGHT, V_MONOSPACE | V_GREENMAP, "PreThinkFrame");
|
V_DrawSmallString(MAX_X-60, MAX_Y+2*HEIGHT, V_MONOSPACE | V_GREENMAP, "PreThinkFrame");
|
||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
case 5:
|
case PS_POSTTHINKFRAME:
|
||||||
{
|
{
|
||||||
maxpage = postthinkframe_hooks_length/PAGE_ENTRIES + 1;
|
maxpage = postthinkframe_hooks_length/PAGE_ENTRIES + 1;
|
||||||
page = max(1, min(cv_ps_thinkframe_page.value, maxpage));
|
page = max(1, min(cv_ps_thinkframe_page.value, maxpage));
|
||||||
@@ -976,7 +946,22 @@ static void draw_think_frame_stats(int hook_length, ps_hookinfo_t *hook)
|
|||||||
|
|
||||||
void PS_ThinkFrame_Page_OnChange(void)
|
void PS_ThinkFrame_Page_OnChange(void)
|
||||||
{
|
{
|
||||||
int maxpage = thinkframe_hooks_length/PAGE_ENTRIES + 1;
|
int maxpage = 0;
|
||||||
|
|
||||||
|
switch (cv_perfstats.value)
|
||||||
|
{
|
||||||
|
case PS_THINKFRAME:
|
||||||
|
maxpage = thinkframe_hooks_length/PAGE_ENTRIES + 1;
|
||||||
|
break;
|
||||||
|
case PS_PRETHINKFRAME:
|
||||||
|
maxpage = prethinkframe_hooks_length/PAGE_ENTRIES + 1;
|
||||||
|
break;
|
||||||
|
case PS_POSTTHINKFRAME:
|
||||||
|
maxpage = postthinkframe_hooks_length/PAGE_ENTRIES + 1;
|
||||||
|
break;
|
||||||
|
default:
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
|
||||||
if (cv_ps_thinkframe_page.value > maxpage)
|
if (cv_ps_thinkframe_page.value > maxpage)
|
||||||
CV_StealthSetValue(&cv_ps_thinkframe_page, maxpage);
|
CV_StealthSetValue(&cv_ps_thinkframe_page, maxpage);
|
||||||
@@ -1009,18 +994,18 @@ static void PS_DrawPostThinkFrameStats(void)
|
|||||||
|
|
||||||
void M_DrawPerfStats(void)
|
void M_DrawPerfStats(void)
|
||||||
{
|
{
|
||||||
if (cv_perfstats.value == 1) // rendering
|
if (cv_perfstats.value == PS_RENDER) // rendering
|
||||||
{
|
{
|
||||||
PS_UpdateFrameStats();
|
PS_UpdateFrameStats();
|
||||||
PS_DrawRenderStats();
|
PS_DrawRenderStats();
|
||||||
}
|
}
|
||||||
else if (cv_perfstats.value == 2) // logic
|
else if (cv_perfstats.value == PS_LOGIC) // logic
|
||||||
{
|
{
|
||||||
// PS_UpdateTickStats is called in TryRunTics, since otherwise it would miss
|
// PS_UpdateTickStats is called in TryRunTics, since otherwise it would miss
|
||||||
// tics when frame skips happen
|
// tics when frame skips happen
|
||||||
PS_DrawGameLogicStats();
|
PS_DrawGameLogicStats();
|
||||||
}
|
}
|
||||||
else if (cv_perfstats.value >= 3) // lua thinkframe
|
else if (cv_perfstats.value >= PS_THINKFRAME) // lua thinkframe
|
||||||
{
|
{
|
||||||
if (!PS_IsLevelActive())
|
if (!PS_IsLevelActive())
|
||||||
return;
|
return;
|
||||||
@@ -1037,13 +1022,13 @@ void M_DrawPerfStats(void)
|
|||||||
|
|
||||||
switch (cv_perfstats.value)
|
switch (cv_perfstats.value)
|
||||||
{
|
{
|
||||||
case 3:
|
case PS_THINKFRAME:
|
||||||
PS_DrawThinkFrameStats();
|
PS_DrawThinkFrameStats();
|
||||||
break;
|
break;
|
||||||
case 4:
|
case PS_PRETHINKFRAME:
|
||||||
PS_DrawPreThinkFrameStats();
|
PS_DrawPreThinkFrameStats();
|
||||||
break;
|
break;
|
||||||
case 5:
|
case PS_POSTTHINKFRAME:
|
||||||
PS_DrawPostThinkFrameStats();
|
PS_DrawPostThinkFrameStats();
|
||||||
break;
|
break;
|
||||||
default:
|
default:
|
||||||
|
|||||||
@@ -26,6 +26,16 @@ typedef struct
|
|||||||
void *history;
|
void *history;
|
||||||
} ps_metric_t;
|
} ps_metric_t;
|
||||||
|
|
||||||
|
typedef enum
|
||||||
|
{
|
||||||
|
PS_OFF = 0,
|
||||||
|
PS_RENDER,
|
||||||
|
PS_LOGIC,
|
||||||
|
PS_THINKFRAME,
|
||||||
|
PS_PRETHINKFRAME,
|
||||||
|
PS_POSTTHINKFRAME
|
||||||
|
} ps_types_t;
|
||||||
|
|
||||||
typedef struct
|
typedef struct
|
||||||
{
|
{
|
||||||
ps_metric_t time_taken;
|
ps_metric_t time_taken;
|
||||||
|
|||||||
+2
-2
@@ -238,8 +238,8 @@ void M_TextInputClear(textinput_t *input)
|
|||||||
|
|
||||||
void M_TextInputSetString(textinput_t *input, const char *c)
|
void M_TextInputSetString(textinput_t *input, const char *c)
|
||||||
{
|
{
|
||||||
memset(input->buffer, 0, input->buffer_size);
|
strncpy(input->buffer, c, input->buffer_size-1);
|
||||||
strncpy(input->buffer, c, input->buffer_size);
|
input->buffer[input->buffer_size-1] = '\0';
|
||||||
input->cursor = input->select = input->length = strlen(input->buffer);
|
input->cursor = input->select = input->length = strlen(input->buffer);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
+8
-13
@@ -250,7 +250,8 @@ boolean P_Move(mobj_t *actor, fixed_t speed)
|
|||||||
I_Assert(movedir < NUMDIRS);
|
I_Assert(movedir < NUMDIRS);
|
||||||
|
|
||||||
tryx = actor->x + FixedMul(speed*xspeed[movedir], actor->scale);
|
tryx = actor->x + FixedMul(speed*xspeed[movedir], actor->scale);
|
||||||
if (UNLIKELY(twodlevel || actor->flags2 & MF2_TWOD))
|
|
||||||
|
if (twodmo(actor))
|
||||||
tryy = actor->y;
|
tryy = actor->y;
|
||||||
else
|
else
|
||||||
tryy = actor->y + FixedMul(speed*yspeed[movedir], actor->scale);
|
tryy = actor->y + FixedMul(speed*yspeed[movedir], actor->scale);
|
||||||
@@ -328,7 +329,7 @@ void P_NewChaseDir(mobj_t *actor)
|
|||||||
else
|
else
|
||||||
d[1] = DI_NODIR;
|
d[1] = DI_NODIR;
|
||||||
|
|
||||||
if (UNLIKELY(twodlevel || actor->flags2 & MF2_TWOD))
|
if (twodmo(actor))
|
||||||
d[2] = DI_NODIR;
|
d[2] = DI_NODIR;
|
||||||
if (deltay < -FixedMul(10*FRACUNIT, actor->scale))
|
if (deltay < -FixedMul(10*FRACUNIT, actor->scale))
|
||||||
d[2] = DI_SOUTH;
|
d[2] = DI_SOUTH;
|
||||||
@@ -2762,10 +2763,10 @@ void A_Invincibility(void *thing)
|
|||||||
{
|
{
|
||||||
S_StopMusic();
|
S_StopMusic();
|
||||||
|
|
||||||
if (UNLIKELY(mariomode))
|
if (mariomode)
|
||||||
G_GhostAddColor((INT32) (player - players), GHC_INVINCIBLE);
|
G_GhostAddColor((INT32) (player - players), GHC_INVINCIBLE);
|
||||||
|
|
||||||
S_ChangeMusicInternal((UNLIKELY(mariomode)) ? "minvnc" : "invinc", false);
|
S_ChangeMusicInternal(mariomode ? "minvnc" : "invinc", false);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -4359,7 +4360,7 @@ void A_MouseThink(void *thing)
|
|||||||
|| (actor->eflags & MFE_VERTICALFLIP && actor->z + actor->height == actor->ceilingz))
|
|| (actor->eflags & MFE_VERTICALFLIP && actor->z + actor->height == actor->ceilingz))
|
||||||
&& !actor->reactiontime)
|
&& !actor->reactiontime)
|
||||||
{
|
{
|
||||||
if (UNLIKELY(twodlevel || actor->flags2 & MF2_TWOD))
|
if (twodmo(actor))
|
||||||
{
|
{
|
||||||
if (P_RandomChance(FRACUNIT/2))
|
if (P_RandomChance(FRACUNIT/2))
|
||||||
actor->angle += ANGLE_180;
|
actor->angle += ANGLE_180;
|
||||||
@@ -10878,10 +10879,7 @@ void A_BrakLobShot(void *thing)
|
|||||||
return; // Don't even bother if we've got nothing to aim at.
|
return; // Don't even bother if we've got nothing to aim at.
|
||||||
|
|
||||||
// Look up actor's current gravity situation
|
// Look up actor's current gravity situation
|
||||||
if (actor->subsector->sector->gravity)
|
g = P_GetSectorGravity(actor->subsector->sector);
|
||||||
g = FixedMul(gravity,(FixedDiv(*actor->subsector->sector->gravity>>FRACBITS, 1000)));
|
|
||||||
else
|
|
||||||
g = gravity;
|
|
||||||
|
|
||||||
// Look up distance between actor and its target
|
// Look up distance between actor and its target
|
||||||
x = P_AproxDistance(actor->target->x - actor->x, actor->target->y - actor->y);
|
x = P_AproxDistance(actor->target->x - actor->x, actor->target->y - actor->y);
|
||||||
@@ -10996,10 +10994,7 @@ void A_NapalmScatter(void *thing)
|
|||||||
airtime = 16<<FRACBITS;
|
airtime = 16<<FRACBITS;
|
||||||
|
|
||||||
// Look up actor's current gravity situation
|
// Look up actor's current gravity situation
|
||||||
if (actor->subsector->sector->gravity)
|
g = P_GetSectorGravity(actor->subsector->sector);
|
||||||
g = FixedMul(gravity,(FixedDiv(*actor->subsector->sector->gravity>>FRACBITS, 1000)));
|
|
||||||
else
|
|
||||||
g = gravity;
|
|
||||||
|
|
||||||
// vy = (g*(airtime-1))/2
|
// vy = (g*(airtime-1))/2
|
||||||
vy = FixedMul(g,(airtime-(1<<FRACBITS)))>>1;
|
vy = FixedMul(g,(airtime-(1<<FRACBITS)))>>1;
|
||||||
|
|||||||
+27
-36
@@ -589,7 +589,7 @@ void P_TouchSpecialThing(mobj_t *special, mobj_t *toucher, boolean heightcheck)
|
|||||||
special->momx = special->momy = special->momz = 0;
|
special->momx = special->momy = special->momz = 0;
|
||||||
P_GivePlayerRings(player, 1);
|
P_GivePlayerRings(player, 1);
|
||||||
|
|
||||||
if (UNLIKELY((maptol & TOL_NIGHTS) && special->type != MT_FLINGRING))
|
if (nightsmode && special->type != MT_FLINGRING)
|
||||||
P_DoNightsScore(player);
|
P_DoNightsScore(player);
|
||||||
break;
|
break;
|
||||||
|
|
||||||
@@ -601,7 +601,7 @@ void P_TouchSpecialThing(mobj_t *special, mobj_t *toucher, boolean heightcheck)
|
|||||||
special->momx = special->momy = 0;
|
special->momx = special->momy = 0;
|
||||||
P_GivePlayerRings(player, 1);
|
P_GivePlayerRings(player, 1);
|
||||||
|
|
||||||
if (UNLIKELY((maptol & TOL_NIGHTS) && special->type != MT_FLINGCOIN))
|
if (nightsmode && special->type != MT_FLINGCOIN)
|
||||||
P_DoNightsScore(player);
|
P_DoNightsScore(player);
|
||||||
break;
|
break;
|
||||||
case MT_BLUEBALL:
|
case MT_BLUEBALL:
|
||||||
@@ -617,7 +617,7 @@ void P_TouchSpecialThing(mobj_t *special, mobj_t *toucher, boolean heightcheck)
|
|||||||
else
|
else
|
||||||
special->scalespeed = 4*FRACUNIT/5;
|
special->scalespeed = 4*FRACUNIT/5;
|
||||||
|
|
||||||
if (UNLIKELY(maptol & TOL_NIGHTS))
|
if (nightsmode)
|
||||||
P_DoNightsScore(player);
|
P_DoNightsScore(player);
|
||||||
break;
|
break;
|
||||||
case MT_AUTOPICKUP:
|
case MT_AUTOPICKUP:
|
||||||
@@ -831,7 +831,7 @@ void P_TouchSpecialThing(mobj_t *special, mobj_t *toucher, boolean heightcheck)
|
|||||||
{
|
{
|
||||||
S_StartSound(toucher, special->info->seesound);
|
S_StartSound(toucher, special->info->seesound);
|
||||||
|
|
||||||
if (UNLIKELY(player->pflags & PF_NIGHTSMODE))
|
if (nightsplayer(player))
|
||||||
{
|
{
|
||||||
player->bumpertime = TICRATE/2;
|
player->bumpertime = TICRATE/2;
|
||||||
if (special->threshold > 0)
|
if (special->threshold > 0)
|
||||||
@@ -883,18 +883,20 @@ void P_TouchSpecialThing(mobj_t *special, mobj_t *toucher, boolean heightcheck)
|
|||||||
break;
|
break;
|
||||||
case MT_HOOPCOLLIDE:
|
case MT_HOOPCOLLIDE:
|
||||||
// This produces a kind of 'domino effect' with the hoop's pieces.
|
// This produces a kind of 'domino effect' with the hoop's pieces.
|
||||||
for (; special->hprev != NULL; special = special->hprev); // Move to the first sprite in the hoop
|
for (; special != NULL && special->hprev != NULL; special = special->hprev); // Move to the first sprite in the hoop
|
||||||
|
|
||||||
i = 0;
|
i = 0;
|
||||||
for (; special->hnext != NULL && special->type == MT_HOOP; special = special->hnext)
|
for (; special != NULL && special->type == MT_HOOP; special = special->hnext)
|
||||||
{
|
{
|
||||||
if (!P_MobjWasRemoved(special->target))
|
if (!P_MobjWasRemoved(special))
|
||||||
{
|
{
|
||||||
special->fuse = 11;
|
special->fuse = 11;
|
||||||
special->movedir = i;
|
special->movedir = i;
|
||||||
special->extravalue1 = special->target->extravalue1;
|
if (!P_MobjWasRemoved(special->target))
|
||||||
special->extravalue2 = special->target->extravalue2;
|
{
|
||||||
special->target->threshold = 4242;
|
special->extravalue1 = special->target->extravalue1;
|
||||||
|
special->extravalue2 = special->target->extravalue2;
|
||||||
|
special->target->threshold = 4242;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
i++;
|
i++;
|
||||||
}
|
}
|
||||||
@@ -1131,7 +1133,7 @@ void P_TouchSpecialThing(mobj_t *special, mobj_t *toucher, boolean heightcheck)
|
|||||||
S_StartSound(toucher, special->info->painsound);
|
S_StartSound(toucher, special->info->painsound);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
else if (UNLIKELY((player->pflags & PF_NIGHTSMODE) && (player->pflags & PF_DRILLING)) || (player->pflags & (PF_JUMPED|PF_SPINNING|PF_GLIDING))
|
else if ((nightsplayer(player) && (player->pflags & PF_DRILLING)) || (player->pflags & (PF_JUMPED|PF_SPINNING|PF_GLIDING))
|
||||||
|| player->powers[pw_invulnerability] || player->powers[pw_super]) // Do you possess the ability to subdue the object?
|
|| player->powers[pw_invulnerability] || player->powers[pw_super]) // Do you possess the ability to subdue the object?
|
||||||
{
|
{
|
||||||
// Shatter the shield!
|
// Shatter the shield!
|
||||||
@@ -1466,11 +1468,7 @@ static void P_UpdateRemovedOrbital(mobj_t *target, mobj_t *inflictor, mobj_t *so
|
|||||||
{
|
{
|
||||||
// SRB2kart
|
// SRB2kart
|
||||||
// I wish I knew a better way to do this
|
// I wish I knew a better way to do this
|
||||||
#ifndef COMPAT_VANILLA
|
if (!P_MobjWasRemovedCompat(target->target) && target->target->player && !P_MobjWasRemovedCompat(target->target->player->mo))
|
||||||
if (!P_MobjWasRemoved(target->target) && target->target->player && !P_MobjWasRemoved(target->target->player->mo))
|
|
||||||
#else
|
|
||||||
if (target->target && target->target->player && target->target->player->mo)
|
|
||||||
#endif
|
|
||||||
{
|
{
|
||||||
if (target->target->player->kartstuff[k_eggmanheld] && target->type == MT_EGGMANITEM_SHIELD)
|
if (target->target->player->kartstuff[k_eggmanheld] && target->type == MT_EGGMANITEM_SHIELD)
|
||||||
target->target->player->kartstuff[k_eggmanheld] = 0;
|
target->target->player->kartstuff[k_eggmanheld] = 0;
|
||||||
@@ -1483,11 +1481,7 @@ static void P_UpdateRemovedOrbital(mobj_t *target, mobj_t *inflictor, mobj_t *so
|
|||||||
{
|
{
|
||||||
if (target->movedir != 0 && target->movedir < (UINT16)target->target->player->kartstuff[k_itemamount])
|
if (target->movedir != 0 && target->movedir < (UINT16)target->target->player->kartstuff[k_itemamount])
|
||||||
{
|
{
|
||||||
#ifndef COMPAT_VANILLA
|
if (!P_MobjWasRemovedCompat(target->target->hnext))
|
||||||
if (!P_MobjWasRemoved(target->target->hnext))
|
|
||||||
#else
|
|
||||||
if (target->target->hnext)
|
|
||||||
#endif
|
|
||||||
K_KillBananaChain(target->target->hnext, inflictor, source);
|
K_KillBananaChain(target->target->hnext, inflictor, source);
|
||||||
|
|
||||||
target->target->player->kartstuff[k_itemamount] = 0;
|
target->target->player->kartstuff[k_itemamount] = 0;
|
||||||
@@ -2245,11 +2239,7 @@ boolean P_DamageMobj(mobj_t *target, mobj_t *inflictor, mobj_t *source, INT32 da
|
|||||||
return false;
|
return false;
|
||||||
|
|
||||||
// well no clue but this may happen ig
|
// well no clue but this may happen ig
|
||||||
#ifndef COMPAT_VANILLA
|
if (P_MobjWasRemovedCompat(target))
|
||||||
if (P_MobjWasRemoved(target))
|
|
||||||
#else
|
|
||||||
if (!target)
|
|
||||||
#endif
|
|
||||||
return false;
|
return false;
|
||||||
|
|
||||||
if (target->health <= 0)
|
if (target->health <= 0)
|
||||||
@@ -2266,7 +2256,7 @@ boolean P_DamageMobj(mobj_t *target, mobj_t *inflictor, mobj_t *source, INT32 da
|
|||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (source && source->player && source->player->spectator)
|
if (!P_MobjWasRemovedCompat(source) && source->player && source->player->spectator)
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -2360,11 +2350,11 @@ boolean P_DamageMobj(mobj_t *target, mobj_t *inflictor, mobj_t *source, INT32 da
|
|||||||
if (player->exiting)
|
if (player->exiting)
|
||||||
return false;
|
return false;
|
||||||
|
|
||||||
if (UNLIKELY(!(target->player->pflags & (PF_NIGHTSMODE|PF_NIGHTSFALL)) && (maptol & TOL_NIGHTS)))
|
if (UNLIKELY(!(target->player->pflags & (PF_NIGHTSMODE|PF_NIGHTSFALL)) && nightsmode))
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (UNLIKELY(player->pflags & PF_NIGHTSMODE)) // NiGHTS damage handling
|
if (nightsplayer(player)) // NiGHTS damage handling
|
||||||
{
|
{
|
||||||
if (!force)
|
if (!force)
|
||||||
{
|
{
|
||||||
@@ -2609,7 +2599,7 @@ void P_PlayerRingBurst(player_t *player, INT32 num_rings)
|
|||||||
ns = FixedMul(((i*FRACUNIT)/16)+2*FRACUNIT, mo->scale);
|
ns = FixedMul(((i*FRACUNIT)/16)+2*FRACUNIT, mo->scale);
|
||||||
mo->momx = FixedMul(FINECOSINE(fa),ns);
|
mo->momx = FixedMul(FINECOSINE(fa),ns);
|
||||||
|
|
||||||
if (LIKELY(!(twodlevel || (player->mo->flags2 & MF2_TWOD))))
|
if (!twodmo(player->mo))
|
||||||
mo->momy = FixedMul(FINESINE(fa),ns);
|
mo->momy = FixedMul(FINESINE(fa),ns);
|
||||||
|
|
||||||
P_SetObjectMomZ(mo, 8*FRACUNIT, false);
|
P_SetObjectMomZ(mo, 8*FRACUNIT, false);
|
||||||
@@ -2633,7 +2623,7 @@ void P_PlayerRingBurst(player_t *player, INT32 num_rings)
|
|||||||
ns = FixedMul(momxy, mo->scale);
|
ns = FixedMul(momxy, mo->scale);
|
||||||
mo->momx = FixedMul(FINECOSINE(fa),ns);
|
mo->momx = FixedMul(FINECOSINE(fa),ns);
|
||||||
|
|
||||||
if (LIKELY(!(twodlevel || (player->mo->flags2 & MF2_TWOD))))
|
if (!twodmo(player->mo))
|
||||||
mo->momy = FixedMul(FINESINE(fa),ns);
|
mo->momy = FixedMul(FINESINE(fa),ns);
|
||||||
|
|
||||||
ns = momz;
|
ns = momz;
|
||||||
@@ -2642,6 +2632,7 @@ void P_PlayerRingBurst(player_t *player, INT32 num_rings)
|
|||||||
if (i & 1)
|
if (i & 1)
|
||||||
P_SetObjectMomZ(mo, ns, true);
|
P_SetObjectMomZ(mo, ns, true);
|
||||||
}
|
}
|
||||||
|
|
||||||
if (player->mo->eflags & MFE_VERTICALFLIP)
|
if (player->mo->eflags & MFE_VERTICALFLIP)
|
||||||
mo->momz *= -1;
|
mo->momz *= -1;
|
||||||
}
|
}
|
||||||
@@ -2740,7 +2731,7 @@ void P_PlayerWeaponPanelBurst(player_t *player)
|
|||||||
ns = FixedMul(3*FRACUNIT, mo->scale);
|
ns = FixedMul(3*FRACUNIT, mo->scale);
|
||||||
mo->momx = FixedMul(FINECOSINE(fa),ns);
|
mo->momx = FixedMul(FINECOSINE(fa),ns);
|
||||||
|
|
||||||
if (LIKELY(!(twodlevel || (player->mo->flags2 & MF2_TWOD))))
|
if (!twodmo(player->mo))
|
||||||
mo->momy = FixedMul(FINESINE(fa),ns);
|
mo->momy = FixedMul(FINESINE(fa),ns);
|
||||||
|
|
||||||
P_SetObjectMomZ(mo, 4*FRACUNIT, false);
|
P_SetObjectMomZ(mo, 4*FRACUNIT, false);
|
||||||
@@ -2824,7 +2815,7 @@ void P_PlayerWeaponAmmoBurst(player_t *player)
|
|||||||
ns = FixedMul(2*FRACUNIT, mo->scale);
|
ns = FixedMul(2*FRACUNIT, mo->scale);
|
||||||
mo->momx = FixedMul(FINECOSINE(fa), ns);
|
mo->momx = FixedMul(FINECOSINE(fa), ns);
|
||||||
|
|
||||||
if (LIKELY(!(twodlevel || (player->mo->flags2 & MF2_TWOD))))
|
if (!twodmo(player->mo))
|
||||||
mo->momy = FixedMul(FINESINE(fa),ns);
|
mo->momy = FixedMul(FINESINE(fa),ns);
|
||||||
|
|
||||||
P_SetObjectMomZ(mo, 3*FRACUNIT, false);
|
P_SetObjectMomZ(mo, 3*FRACUNIT, false);
|
||||||
@@ -2940,7 +2931,7 @@ void P_PlayerEmeraldBurst(player_t *player, boolean toss)
|
|||||||
|
|
||||||
momx = FixedMul(FINECOSINE(fa), ns);
|
momx = FixedMul(FINECOSINE(fa), ns);
|
||||||
|
|
||||||
if (LIKELY(!(twodlevel || (player->mo->flags2 & MF2_TWOD))))
|
if (!twodmo(player->mo))
|
||||||
momy = FixedMul(FINESINE(fa),ns);
|
momy = FixedMul(FINESINE(fa),ns);
|
||||||
else
|
else
|
||||||
momy = 0;
|
momy = 0;
|
||||||
@@ -2997,7 +2988,7 @@ void P_PlayerFlagBurst(player_t *player, boolean toss)
|
|||||||
{
|
{
|
||||||
angle_t fa = P_RandomByte()*FINEANGLES/256;
|
angle_t fa = P_RandomByte()*FINEANGLES/256;
|
||||||
flag->momx = FixedMul(FINECOSINE(fa), FixedMul(6*FRACUNIT, player->mo->scale));
|
flag->momx = FixedMul(FINECOSINE(fa), FixedMul(6*FRACUNIT, player->mo->scale));
|
||||||
if (LIKELY(!(twodlevel || (player->mo->flags2 & MF2_TWOD))))
|
if (!twodmo(player->mo))
|
||||||
flag->momy = FixedMul(FINESINE(fa), FixedMul(6*FRACUNIT, player->mo->scale));
|
flag->momy = FixedMul(FINESINE(fa), FixedMul(6*FRACUNIT, player->mo->scale));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
+17
-2
@@ -59,8 +59,12 @@ extern "C" {
|
|||||||
|
|
||||||
#define AIMINGTOSLOPE(aiming) FINESINE((aiming>>ANGLETOFINESHIFT) & FINEMASK)
|
#define AIMINGTOSLOPE(aiming) FINESINE((aiming>>ANGLETOFINESHIFT) & FINEMASK)
|
||||||
|
|
||||||
#define mariomode (maptol & TOL_MARIO)
|
// unused modes, kept for compat
|
||||||
#define twodlevel (maptol & TOL_2D)
|
#define nightsmode (UNLIKELY(maptol & TOL_NIGHTS))
|
||||||
|
#define nightsplayer(player) (UNLIKELY((player)->pflags & PF_NIGHTSMODE))
|
||||||
|
#define mariomode (UNLIKELY(maptol & TOL_MARIO))
|
||||||
|
#define twodlevel (UNLIKELY(maptol & TOL_2D))
|
||||||
|
#define twodmo(mobj) (UNLIKELY(twodlevel || ((mobj)->flags2 & MF2_TWOD)))
|
||||||
|
|
||||||
//
|
//
|
||||||
// P_TICK
|
// P_TICK
|
||||||
@@ -287,6 +291,17 @@ FUNCINLINE static ATTRINLINE boolean P_MobjWasRemoved(const mobj_t *mobj)
|
|||||||
return (!mobj || mobj->thinker.function != (actionf_p1)P_MobjThinker);
|
return (!mobj || mobj->thinker.function != (actionf_p1)P_MobjThinker);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// stupid, but kart allows mobjs that are marked to be removed to be accessed and modified in many cases
|
||||||
|
// so can only check if its not NULL in vanilla compat mode
|
||||||
|
FUNCINLINE static ATTRINLINE boolean P_MobjWasRemovedCompat(const mobj_t *mobj)
|
||||||
|
{
|
||||||
|
#ifdef PHOBOS_BUILD
|
||||||
|
return P_MobjWasRemoved(mobj);
|
||||||
|
#else
|
||||||
|
return !mobj;
|
||||||
|
#endif
|
||||||
|
}
|
||||||
|
|
||||||
fixed_t P_MobjFloorZ(mobj_t *mobj, sector_t *sector, sector_t *boundsec, fixed_t x, fixed_t y, line_t *line, boolean lowest, boolean perfect);
|
fixed_t P_MobjFloorZ(mobj_t *mobj, sector_t *sector, sector_t *boundsec, fixed_t x, fixed_t y, line_t *line, boolean lowest, boolean perfect);
|
||||||
fixed_t P_MobjCeilingZ(mobj_t *mobj, sector_t *sector, sector_t *boundsec, fixed_t x, fixed_t y, line_t *line, boolean lowest, boolean perfect);
|
fixed_t P_MobjCeilingZ(mobj_t *mobj, sector_t *sector, sector_t *boundsec, fixed_t x, fixed_t y, line_t *line, boolean lowest, boolean perfect);
|
||||||
#define P_GetFloorZ(mobj, sector, x, y, line) P_MobjFloorZ(mobj, sector, NULL, x, y, line, false, false)
|
#define P_GetFloorZ(mobj, sector, x, y, line) P_MobjFloorZ(mobj, sector, NULL, x, y, line, false, false)
|
||||||
|
|||||||
+83
-59
@@ -136,14 +136,17 @@ boolean P_DoSpring(mobj_t *spring, mobj_t *object)
|
|||||||
if (object->eflags & MFE_SPRUNG) // Object was already sprung this tic
|
if (object->eflags & MFE_SPRUNG) // Object was already sprung this tic
|
||||||
return false;
|
return false;
|
||||||
|
|
||||||
// Spectators don't trigger springs.
|
if (object->player)
|
||||||
if (object->player && object->player->spectator)
|
|
||||||
return false;
|
|
||||||
|
|
||||||
if (UNLIKELY(object->player && (object->player->pflags & PF_NIGHTSMODE)))
|
|
||||||
{
|
{
|
||||||
/*Someone want to make these work like bumpers?*/
|
// Spectators don't trigger springs.
|
||||||
return false;
|
if (object->player->spectator)
|
||||||
|
return false;
|
||||||
|
|
||||||
|
if (nightsplayer(object->player))
|
||||||
|
{
|
||||||
|
/*Someone want to make these work like bumpers?*/
|
||||||
|
return false;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
object->standingslope = NULL; // Okay, now we can't return - no launching off at silly angles for you.
|
object->standingslope = NULL; // Okay, now we can't return - no launching off at silly angles for you.
|
||||||
@@ -160,10 +163,15 @@ boolean P_DoSpring(mobj_t *spring, mobj_t *object)
|
|||||||
if (spring->eflags & MFE_VERTICALFLIP)
|
if (spring->eflags & MFE_VERTICALFLIP)
|
||||||
vertispeed *= -1;
|
vertispeed *= -1;
|
||||||
|
|
||||||
|
// Vertical springs teleport you on TOP of them.
|
||||||
if (vertispeed > 0)
|
if (vertispeed > 0)
|
||||||
|
{
|
||||||
object->z = spring->z + spring->height + 1;
|
object->z = spring->z + spring->height + 1;
|
||||||
|
}
|
||||||
else if (vertispeed < 0)
|
else if (vertispeed < 0)
|
||||||
|
{
|
||||||
object->z = spring->z - object->height - 1;
|
object->z = spring->z - object->height - 1;
|
||||||
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
// Horizontal springs teleport you in FRONT of them.
|
// Horizontal springs teleport you in FRONT of them.
|
||||||
@@ -215,7 +223,9 @@ boolean P_DoSpring(mobj_t *spring, mobj_t *object)
|
|||||||
if (object->player)
|
if (object->player)
|
||||||
{
|
{
|
||||||
if (spring->flags & MF_ENEMY) // Spring shells
|
if (spring->flags & MF_ENEMY) // Spring shells
|
||||||
|
{
|
||||||
P_SetTarget(&spring->target, object);
|
P_SetTarget(&spring->target, object);
|
||||||
|
}
|
||||||
|
|
||||||
if (horizspeed && object->player->cmd.forwardmove == 0 && object->player->cmd.sidemove == 0)
|
if (horizspeed && object->player->cmd.forwardmove == 0 && object->player->cmd.sidemove == 0)
|
||||||
{
|
{
|
||||||
@@ -235,12 +245,12 @@ boolean P_DoSpring(mobj_t *spring, mobj_t *object)
|
|||||||
|
|
||||||
static void P_DoFanAndGasJet(mobj_t *spring, mobj_t *object)
|
static void P_DoFanAndGasJet(mobj_t *spring, mobj_t *object)
|
||||||
{
|
{
|
||||||
player_t *p = object->player; // will be NULL if not a player
|
player_t *player = object->player; // will be NULL if not a player
|
||||||
fixed_t zdist; // distance between bottoms
|
fixed_t zdist; // distance between bottoms
|
||||||
fixed_t speed = spring->info->mass; // conveniently, both fans and gas jets use this for the vertical thrust
|
fixed_t speed = spring->info->mass; // conveniently, both fans and gas jets use this for the vertical thrust
|
||||||
SINT8 flipval = P_MobjFlip(spring); // virtually everything here centers around the thruster's gravity, not the object's!
|
SINT8 flipval = P_MobjFlip(spring); // virtually everything here centers around the thruster's gravity, not the object's!
|
||||||
|
|
||||||
if (p && object->state == &states[object->info->painstate]) // can't use fans and gas jets when player is in pain!
|
if (player && object->state == &states[object->info->painstate]) // can't use fans and gas jets when player is in pain!
|
||||||
return;
|
return;
|
||||||
|
|
||||||
// is object's top below thruster's position? if not, calculate distance between their bottoms
|
// is object's top below thruster's position? if not, calculate distance between their bottoms
|
||||||
@@ -266,7 +276,7 @@ static void P_DoFanAndGasJet(mobj_t *spring, mobj_t *object)
|
|||||||
break;
|
break;
|
||||||
if (flipval*object->momz >= FixedMul(speed, spring->scale)) // if object's already moving faster than your best, don't bother
|
if (flipval*object->momz >= FixedMul(speed, spring->scale)) // if object's already moving faster than your best, don't bother
|
||||||
break;
|
break;
|
||||||
if (p && (p->climbing || p->pflags & PF_GLIDING)) // doesn't affect Knux when he's using his abilities!
|
if (player && (player->climbing || player->pflags & PF_GLIDING)) // doesn't affect Knux when he's using his abilities!
|
||||||
break;
|
break;
|
||||||
|
|
||||||
object->momz += flipval*FixedMul(speed/4, spring->scale);
|
object->momz += flipval*FixedMul(speed/4, spring->scale);
|
||||||
@@ -312,13 +322,13 @@ static boolean PIT_CheckThing(mobj_t *thing)
|
|||||||
if (thing == tmthing)
|
if (thing == tmthing)
|
||||||
return true;
|
return true;
|
||||||
|
|
||||||
// Ignore... things.
|
|
||||||
if (!tmthing || P_MobjWasRemoved(thing))
|
|
||||||
return true;
|
|
||||||
|
|
||||||
I_Assert(!P_MobjWasRemoved(tmthing));
|
I_Assert(!P_MobjWasRemoved(tmthing));
|
||||||
I_Assert(!P_MobjWasRemoved(thing));
|
I_Assert(!P_MobjWasRemoved(thing));
|
||||||
|
|
||||||
|
// Ignore... things.
|
||||||
|
if (P_MobjWasRemovedCompat(tmthing) || P_MobjWasRemoved(thing))
|
||||||
|
return true;
|
||||||
|
|
||||||
// Ignore spectators
|
// Ignore spectators
|
||||||
if ((tmthing->player && tmthing->player->spectator)
|
if ((tmthing->player && tmthing->player->spectator)
|
||||||
|| (thing->player && thing->player->spectator))
|
|| (thing->player && thing->player->spectator))
|
||||||
@@ -350,12 +360,13 @@ static boolean PIT_CheckThing(mobj_t *thing)
|
|||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
if (!(thing->flags & (MF_SOLID|MF_SPECIAL|MF_PAIN|MF_SHOOTABLE)) || (thing->flags & MF_NOCLIPTHING))
|
if ((thing->flags & MF_NOCLIPTHING) || !(thing->flags & (MF_SOLID|MF_SPECIAL|MF_PAIN|MF_SHOOTABLE)))
|
||||||
return true;
|
return true;
|
||||||
|
|
||||||
// Don't collide with your buddies while NiGHTS-flying.
|
// Don't collide with your buddies while NiGHTS-flying.
|
||||||
if (UNLIKELY(tmthing->player && thing->player && (maptol & TOL_NIGHTS)
|
if (nightsmode &&
|
||||||
&& ((tmthing->player->pflags & PF_NIGHTSMODE) || (thing->player->pflags & PF_NIGHTSMODE))))
|
tmthing->player && thing->player &&
|
||||||
|
(nightsplayer(tmthing->player) || nightsplayer(thing->player)))
|
||||||
return true;
|
return true;
|
||||||
|
|
||||||
blockdist = thing->radius + tmthing->radius;
|
blockdist = thing->radius + tmthing->radius;
|
||||||
@@ -1817,14 +1828,14 @@ boolean P_CheckPosition(mobj_t *thing, fixed_t x, fixed_t y)
|
|||||||
delta1 = abs(thing->z - midheight);
|
delta1 = abs(thing->z - midheight);
|
||||||
delta2 = abs(thingtop - midheight);
|
delta2 = abs(thingtop - midheight);
|
||||||
|
|
||||||
if (topheight > tmfloorz && delta1 < delta2
|
if ((topheight > tmfloorz) && (delta1 < delta2)
|
||||||
&& !(rover->flags & FF_REVERSEPLATFORM))
|
&& !(rover->flags & FF_REVERSEPLATFORM))
|
||||||
{
|
{
|
||||||
tmfloorz = tmdropoffz = topheight;
|
tmfloorz = tmdropoffz = topheight;
|
||||||
tmfloorslope = *rover->t_slope;
|
tmfloorslope = *rover->t_slope;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (bottomheight < tmceilingz && delta1 >= delta2
|
if ((bottomheight < tmceilingz) && (delta1 >= delta2)
|
||||||
&& !(rover->flags & FF_PLATFORM)
|
&& !(rover->flags & FF_PLATFORM)
|
||||||
&& !(thing->type == MT_SKIM && (rover->flags & FF_SWIMMABLE)))
|
&& !(thing->type == MT_SKIM && (rover->flags & FF_SWIMMABLE)))
|
||||||
{
|
{
|
||||||
@@ -1879,8 +1890,7 @@ boolean P_CheckPosition(mobj_t *thing, fixed_t x, fixed_t y)
|
|||||||
|
|
||||||
po->validcount = validcount;
|
po->validcount = validcount;
|
||||||
|
|
||||||
if (!P_BBoxInsidePolyobj(po, tmbbox)
|
if (!(po->flags & POF_SOLID) || !P_BBoxInsidePolyobj(po, tmbbox))
|
||||||
|| !(po->flags & POF_SOLID))
|
|
||||||
{
|
{
|
||||||
plink = (polymaplink_t *)(plink->link.next);
|
plink = (polymaplink_t *)(plink->link.next);
|
||||||
continue;
|
continue;
|
||||||
@@ -2125,7 +2135,7 @@ static boolean P_CheckCameraPosition(fixed_t x, fixed_t y, camera_t *thiscam)
|
|||||||
|
|
||||||
po->validcount = validcount;
|
po->validcount = validcount;
|
||||||
|
|
||||||
if (!P_PointInsidePolyobj(po, x, y) || !(po->flags & POF_SOLID))
|
if (!(po->flags & POF_SOLID) || !P_PointInsidePolyobj(po, x, y))
|
||||||
{
|
{
|
||||||
plink = (polymaplink_t *)(plink->link.next);
|
plink = (polymaplink_t *)(plink->link.next);
|
||||||
continue;
|
continue;
|
||||||
@@ -2599,36 +2609,10 @@ boolean P_TryMove(mobj_t *thing, fixed_t x, fixed_t y, boolean allowdropoff)
|
|||||||
// sound does not work out all that well for kart maps
|
// sound does not work out all that well for kart maps
|
||||||
|
|
||||||
// best i can do...
|
// best i can do...
|
||||||
if (cv_stairjanksfx.value)
|
if (cv_stairjank.value && cv_stairjanksfx.value)
|
||||||
S_StartSoundAtVolume(thing, (thing->player->stairjank >= 8 ? sfx_s23b : sfx_s268), 192); // dont blast this at full volume lul
|
S_StartSoundAtVolume(thing, (thing->player->stairjank >= 8 ? sfx_s23b : sfx_s268), 192); // dont blast this at full volume lul
|
||||||
|
|
||||||
//if (!thing->player->stairjank)
|
// Can't spawn things during P_TryMove, because global variables :)
|
||||||
{
|
|
||||||
// 90 degrees to direction you're facing
|
|
||||||
fixed_t dirx = -FINESINE(thing->angle>>ANGLETOFINESHIFT);
|
|
||||||
fixed_t diry = FINECOSINE(thing->angle>>ANGLETOFINESHIFT);
|
|
||||||
fixed_t offset = thing->radius;
|
|
||||||
|
|
||||||
if (leveltime % 8 < 4)
|
|
||||||
{
|
|
||||||
dirx = -dirx;
|
|
||||||
diry = -diry;
|
|
||||||
}
|
|
||||||
|
|
||||||
mobj_t * spark = P_SpawnMobj(thing->x + FixedMul(dirx, offset), thing->y + FixedMul(diry, offset), thing->z, MT_DRIFTDUST);
|
|
||||||
spark->momx = FixedMul(dirx, FRACUNIT) + (6 + ((int)leveltime % 5))*(thing->momx)/10;
|
|
||||||
spark->momy = FixedMul(diry, FRACUNIT) + (6 + ((int)leveltime % 5))*(thing->momy)/10;
|
|
||||||
spark->momz = 5*FRACUNIT;
|
|
||||||
spark->scale = mapobjectscale/5;
|
|
||||||
spark->destscale = mapobjectscale/2;
|
|
||||||
spark->islocal = true;
|
|
||||||
//spark->fuse = 9;
|
|
||||||
spark->color = SKINCOLOR_WHITE;
|
|
||||||
//spark->cusval = K_StairJankFlip(ANGLE_90);
|
|
||||||
P_SetTarget(&spark->target, thing);
|
|
||||||
//P_SetTarget(&spark->owner, thing);
|
|
||||||
//spark->renderflags |= RF_REDUCEVFX;
|
|
||||||
}
|
|
||||||
|
|
||||||
thing->player->stairjank = 9;
|
thing->player->stairjank = 9;
|
||||||
//thing->player->stairjank = 17;
|
//thing->player->stairjank = 17;
|
||||||
@@ -2684,7 +2668,7 @@ boolean P_SceneryTryMove(mobj_t *thing, fixed_t x, fixed_t y)
|
|||||||
if (tmfloorz - thing->z > maxstep)
|
if (tmfloorz - thing->z > maxstep)
|
||||||
return false; // too big a step up
|
return false; // too big a step up
|
||||||
}
|
}
|
||||||
} while(tryx != x || tryy != y);
|
} while (tryx != x || tryy != y);
|
||||||
|
|
||||||
// the move is ok,
|
// the move is ok,
|
||||||
// so link the thing into its new position
|
// so link the thing into its new position
|
||||||
@@ -3179,6 +3163,9 @@ void P_SlideMove(mobj_t *mo, boolean forceslide)
|
|||||||
INT16 hitcount = 0;
|
INT16 hitcount = 0;
|
||||||
boolean success = false;
|
boolean success = false;
|
||||||
|
|
||||||
|
if (P_MobjWasRemovedCompat(mo))
|
||||||
|
return;
|
||||||
|
|
||||||
if (tmhitthing && mo->z + mo->height > tmhitthing->z && mo->z < tmhitthing->z + tmhitthing->height)
|
if (tmhitthing && mo->z + mo->height > tmhitthing->z && mo->z < tmhitthing->z + tmhitthing->height)
|
||||||
{
|
{
|
||||||
// Don't mess with your momentum if it's a pushable object. Pushables do their own crazy things already.
|
// Don't mess with your momentum if it's a pushable object. Pushables do their own crazy things already.
|
||||||
@@ -3215,6 +3202,9 @@ void P_SlideMove(mobj_t *mo, boolean forceslide)
|
|||||||
bestslideline = NULL;
|
bestslideline = NULL;
|
||||||
|
|
||||||
retry:
|
retry:
|
||||||
|
if (P_MobjWasRemovedCompat(mo))
|
||||||
|
return;
|
||||||
|
|
||||||
if (++hitcount == 3)
|
if (++hitcount == 3)
|
||||||
goto stairstep; // don't loop forever
|
goto stairstep; // don't loop forever
|
||||||
|
|
||||||
@@ -3263,7 +3253,13 @@ retry:
|
|||||||
// the move must have hit the middle, so stairstep
|
// the move must have hit the middle, so stairstep
|
||||||
stairstep:
|
stairstep:
|
||||||
if (!P_TryMove(mo, mo->x, mo->y + mo->momy, true)) //Allow things to drop off.
|
if (!P_TryMove(mo, mo->x, mo->y + mo->momy, true)) //Allow things to drop off.
|
||||||
|
{
|
||||||
|
if (P_MobjWasRemovedCompat(mo))
|
||||||
|
return;
|
||||||
|
|
||||||
P_TryMove(mo, mo->x + mo->momx, mo->y, true);
|
P_TryMove(mo, mo->x + mo->momx, mo->y, true);
|
||||||
|
}
|
||||||
|
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -3275,7 +3271,12 @@ stairstep:
|
|||||||
newy = FixedMul(mo->momy, bestslidefrac);
|
newy = FixedMul(mo->momy, bestslidefrac);
|
||||||
|
|
||||||
if (!P_TryMove(mo, mo->x + newx, mo->y + newy, true))
|
if (!P_TryMove(mo, mo->x + newx, mo->y + newy, true))
|
||||||
|
{
|
||||||
goto stairstep;
|
goto stairstep;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (P_MobjWasRemovedCompat(mo))
|
||||||
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
// Now continue along the wall.
|
// Now continue along the wall.
|
||||||
@@ -3294,7 +3295,7 @@ stairstep:
|
|||||||
if (bestslideline != NULL)
|
if (bestslideline != NULL)
|
||||||
P_HitSlideLine(bestslideline); // clip the moves
|
P_HitSlideLine(bestslideline); // clip the moves
|
||||||
|
|
||||||
if (UNLIKELY((twodlevel || (mo->flags2 & MF2_TWOD)) && mo->player))
|
if (twodmo(mo) && mo->player)
|
||||||
{
|
{
|
||||||
mo->momx = tmxmove;
|
mo->momx = tmxmove;
|
||||||
tmymove = 0;
|
tmymove = 0;
|
||||||
@@ -3346,8 +3347,11 @@ stairstep:
|
|||||||
goto retry;
|
goto retry;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if (P_MobjWasRemovedCompat(mo))
|
||||||
|
return;
|
||||||
|
|
||||||
success = true;
|
success = true;
|
||||||
} while(tmxmove || tmymove);
|
} while (tmxmove || tmymove);
|
||||||
}
|
}
|
||||||
|
|
||||||
//
|
//
|
||||||
@@ -3360,12 +3364,18 @@ void P_BouncePlayerMove(mobj_t *mo)
|
|||||||
{
|
{
|
||||||
fixed_t leadx, leady;
|
fixed_t leadx, leady;
|
||||||
fixed_t trailx, traily;
|
fixed_t trailx, traily;
|
||||||
fixed_t mmomx = 0, mmomy = 0;
|
fixed_t mmomx, mmomy;
|
||||||
fixed_t oldmomx = mo->momx, oldmomy = mo->momy;
|
fixed_t oldmomx, oldmomy;
|
||||||
|
|
||||||
if (!mo->player)
|
if (P_MobjWasRemovedCompat(mo))
|
||||||
return;
|
return;
|
||||||
|
|
||||||
|
if (mo->player == NULL)
|
||||||
|
return;
|
||||||
|
|
||||||
|
oldmomx = mo->momx;
|
||||||
|
oldmomy = mo->momy;
|
||||||
|
|
||||||
if (mo->player->spectator)
|
if (mo->player->spectator)
|
||||||
{
|
{
|
||||||
P_SlideMove(mo, true);
|
P_SlideMove(mo, true);
|
||||||
@@ -3454,6 +3464,9 @@ void P_BouncePlayerMove(mobj_t *mo)
|
|||||||
|
|
||||||
if (!P_TryMove(mo, mo->x + tmxmove, mo->y + tmymove, true))
|
if (!P_TryMove(mo, mo->x + tmxmove, mo->y + tmymove, true))
|
||||||
{
|
{
|
||||||
|
if (P_MobjWasRemovedCompat(mo))
|
||||||
|
return;
|
||||||
|
|
||||||
P_TryMove(mo, mo->x - oldmomx, mo->y - oldmomy, true);
|
P_TryMove(mo, mo->x - oldmomx, mo->y - oldmomy, true);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -3471,6 +3484,9 @@ void P_BounceMove(mobj_t *mo)
|
|||||||
INT32 hitcount;
|
INT32 hitcount;
|
||||||
fixed_t mmomx = 0, mmomy = 0;
|
fixed_t mmomx = 0, mmomy = 0;
|
||||||
|
|
||||||
|
if (P_MobjWasRemovedCompat(mo))
|
||||||
|
return;
|
||||||
|
|
||||||
if (mo->player)
|
if (mo->player)
|
||||||
{
|
{
|
||||||
P_BouncePlayerMove(mo);
|
P_BouncePlayerMove(mo);
|
||||||
@@ -3487,6 +3503,9 @@ void P_BounceMove(mobj_t *mo)
|
|||||||
hitcount = 0;
|
hitcount = 0;
|
||||||
|
|
||||||
retry:
|
retry:
|
||||||
|
if (P_MobjWasRemovedCompat(mo))
|
||||||
|
return;
|
||||||
|
|
||||||
if (++hitcount == 3)
|
if (++hitcount == 3)
|
||||||
goto bounceback; // don't loop forever
|
goto bounceback; // don't loop forever
|
||||||
|
|
||||||
@@ -3545,7 +3564,12 @@ bounceback:
|
|||||||
newy = FixedMul(mmomy, bestslidefrac);
|
newy = FixedMul(mmomy, bestslidefrac);
|
||||||
|
|
||||||
if (!P_TryMove(mo, mo->x + newx, mo->y + newy, true))
|
if (!P_TryMove(mo, mo->x + newx, mo->y + newy, true))
|
||||||
|
{
|
||||||
|
if (P_MobjWasRemovedCompat(mo))
|
||||||
|
return;
|
||||||
|
|
||||||
goto bounceback;
|
goto bounceback;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
// Now continue along the wall.
|
// Now continue along the wall.
|
||||||
@@ -3742,7 +3766,7 @@ static boolean PIT_ChangeSector(mobj_t *thing, boolean realcrush)
|
|||||||
delta1 = abs(thing->z - midheight);
|
delta1 = abs(thing->z - midheight);
|
||||||
delta2 = abs(thingtop - midheight);
|
delta2 = abs(thingtop - midheight);
|
||||||
|
|
||||||
if (bottomheight <= thing->ceilingz && delta1 >= delta2)
|
if ((bottomheight <= thing->ceilingz) && (delta1 >= delta2))
|
||||||
{
|
{
|
||||||
if (thing->flags & MF_PUSHABLE)
|
if (thing->flags & MF_PUSHABLE)
|
||||||
{
|
{
|
||||||
@@ -4200,7 +4224,7 @@ void P_CreateSecNodeList(mobj_t *thing, fixed_t x, fixed_t y)
|
|||||||
* Must clear tmthing at tic end, as it might contain a pointer to a removed thinker, or the level might have ended/been ended and we clear the objects it was pointing too. Hopefully we don't need to carry this between tics for sync. */
|
* Must clear tmthing at tic end, as it might contain a pointer to a removed thinker, or the level might have ended/been ended and we clear the objects it was pointing too. Hopefully we don't need to carry this between tics for sync. */
|
||||||
void P_MapStart(void)
|
void P_MapStart(void)
|
||||||
{
|
{
|
||||||
if (UNLIKELY(tmthing))
|
if (tmthing)
|
||||||
I_Error("P_MapStart: tmthing set!");
|
I_Error("P_MapStart: tmthing set!");
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -4252,7 +4276,7 @@ fixed_t P_FloorzAtPos(fixed_t x, fixed_t y, fixed_t z, fixed_t height)
|
|||||||
delta1 = abs(z - midheight);
|
delta1 = abs(z - midheight);
|
||||||
delta2 = abs(thingtop - midheight);
|
delta2 = abs(thingtop - midheight);
|
||||||
|
|
||||||
if (topheight > floorz && delta1 < delta2)
|
if ((topheight > floorz) && (delta1 < delta2))
|
||||||
floorz = topheight;
|
floorz = topheight;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
+30
-16
@@ -326,7 +326,7 @@ void P_CameraLineOpening(line_t *linedef)
|
|||||||
{
|
{
|
||||||
for (rover = front->ffloors; rover; rover = rover->next)
|
for (rover = front->ffloors; rover; rover = rover->next)
|
||||||
{
|
{
|
||||||
fixed_t topheight, bottomheight;
|
fixed_t topheight, bottomheight, midheight;
|
||||||
|
|
||||||
if (!(rover->flags & FF_BLOCKOTHERS) || !(rover->flags & FF_RENDERALL) || !(rover->flags & FF_EXISTS) || UNLIKELY(GETSECSPECIAL(rover->master->frontsector->special, 4) == 12))
|
if (!(rover->flags & FF_BLOCKOTHERS) || !(rover->flags & FF_RENDERALL) || !(rover->flags & FF_EXISTS) || UNLIKELY(GETSECSPECIAL(rover->master->frontsector->special, 4) == 12))
|
||||||
continue;
|
continue;
|
||||||
@@ -334,8 +334,10 @@ void P_CameraLineOpening(line_t *linedef)
|
|||||||
topheight = P_CameraGetFOFTopZ(mapcampointer, front, rover, tmx, tmy, linedef);
|
topheight = P_CameraGetFOFTopZ(mapcampointer, front, rover, tmx, tmy, linedef);
|
||||||
bottomheight = P_CameraGetFOFBottomZ(mapcampointer, front, rover, tmx, tmy, linedef);
|
bottomheight = P_CameraGetFOFBottomZ(mapcampointer, front, rover, tmx, tmy, linedef);
|
||||||
|
|
||||||
delta1 = abs(mapcampointer->z - (bottomheight + ((topheight - bottomheight)/2)));
|
midheight = (bottomheight + ((topheight - bottomheight) / 2));
|
||||||
delta2 = abs(thingtop - (bottomheight + ((topheight - bottomheight)/2)));
|
|
||||||
|
delta1 = abs(mapcampointer->z - midheight);
|
||||||
|
delta2 = abs(thingtop - midheight);
|
||||||
|
|
||||||
if (bottomheight < lowestceiling && delta1 >= delta2)
|
if (bottomheight < lowestceiling && delta1 >= delta2)
|
||||||
lowestceiling = bottomheight;
|
lowestceiling = bottomheight;
|
||||||
@@ -354,7 +356,7 @@ void P_CameraLineOpening(line_t *linedef)
|
|||||||
{
|
{
|
||||||
for (rover = back->ffloors; rover; rover = rover->next)
|
for (rover = back->ffloors; rover; rover = rover->next)
|
||||||
{
|
{
|
||||||
fixed_t topheight, bottomheight;
|
fixed_t topheight, bottomheight, midheight;
|
||||||
|
|
||||||
if (!(rover->flags & FF_BLOCKOTHERS) || !(rover->flags & FF_RENDERALL) || !(rover->flags & FF_EXISTS) || UNLIKELY(GETSECSPECIAL(rover->master->frontsector->special, 4) == 12))
|
if (!(rover->flags & FF_BLOCKOTHERS) || !(rover->flags & FF_RENDERALL) || !(rover->flags & FF_EXISTS) || UNLIKELY(GETSECSPECIAL(rover->master->frontsector->special, 4) == 12))
|
||||||
continue;
|
continue;
|
||||||
@@ -362,8 +364,10 @@ void P_CameraLineOpening(line_t *linedef)
|
|||||||
topheight = P_CameraGetFOFTopZ(mapcampointer, back, rover, tmx, tmy, linedef);
|
topheight = P_CameraGetFOFTopZ(mapcampointer, back, rover, tmx, tmy, linedef);
|
||||||
bottomheight = P_CameraGetFOFBottomZ(mapcampointer, back, rover, tmx, tmy, linedef);
|
bottomheight = P_CameraGetFOFBottomZ(mapcampointer, back, rover, tmx, tmy, linedef);
|
||||||
|
|
||||||
delta1 = abs(mapcampointer->z - (bottomheight + ((topheight - bottomheight)/2)));
|
midheight = (bottomheight + ((topheight - bottomheight) / 2));
|
||||||
delta2 = abs(thingtop - (bottomheight + ((topheight - bottomheight)/2)));
|
|
||||||
|
delta1 = abs(mapcampointer->z - midheight);
|
||||||
|
delta2 = abs(thingtop - midheight);
|
||||||
|
|
||||||
if (bottomheight < lowestceiling && delta1 >= delta2)
|
if (bottomheight < lowestceiling && delta1 >= delta2)
|
||||||
lowestceiling = bottomheight;
|
lowestceiling = bottomheight;
|
||||||
@@ -462,7 +466,7 @@ void P_LineOpening(line_t *linedef, mobj_t *mobj)
|
|||||||
// Check for collision with front side's midtexture if Effect 4 is set
|
// Check for collision with front side's midtexture if Effect 4 is set
|
||||||
if (linedef->flags & ML_EFFECT4
|
if (linedef->flags & ML_EFFECT4
|
||||||
&& !linedef->polyobj) // don't do anything for polyobjects! ...for now
|
&& !linedef->polyobj) // don't do anything for polyobjects! ...for now
|
||||||
{
|
{
|
||||||
side_t *side = &sides[linedef->sidenum[0]];
|
side_t *side = &sides[linedef->sidenum[0]];
|
||||||
fixed_t textop, texbottom, texheight;
|
fixed_t textop, texbottom, texheight;
|
||||||
fixed_t texmid, delta1, delta2;
|
fixed_t texmid, delta1, delta2;
|
||||||
@@ -524,7 +528,7 @@ void P_LineOpening(line_t *linedef, mobj_t *mobj)
|
|||||||
// Check for frontsector's fake floors
|
// Check for frontsector's fake floors
|
||||||
for (rover = front->ffloors; rover; rover = rover->next)
|
for (rover = front->ffloors; rover; rover = rover->next)
|
||||||
{
|
{
|
||||||
fixed_t topheight, bottomheight;
|
fixed_t topheight, bottomheight, midheight;
|
||||||
|
|
||||||
if (!(rover->flags & FF_EXISTS))
|
if (!(rover->flags & FF_EXISTS))
|
||||||
continue;
|
continue;
|
||||||
@@ -538,8 +542,10 @@ void P_LineOpening(line_t *linedef, mobj_t *mobj)
|
|||||||
topheight = P_GetFOFTopZ(mobj, front, rover, tmx, tmy, linedef);
|
topheight = P_GetFOFTopZ(mobj, front, rover, tmx, tmy, linedef);
|
||||||
bottomheight = P_GetFOFBottomZ(mobj, front, rover, tmx, tmy, linedef);
|
bottomheight = P_GetFOFBottomZ(mobj, front, rover, tmx, tmy, linedef);
|
||||||
|
|
||||||
delta1 = abs(mobj->z - (bottomheight + ((topheight - bottomheight)/2)));
|
midheight = (bottomheight + ((topheight - bottomheight) / 2));
|
||||||
delta2 = abs(thingtop - (bottomheight + ((topheight - bottomheight)/2)));
|
|
||||||
|
delta1 = abs(mobj->z - midheight);
|
||||||
|
delta2 = abs(thingtop - midheight);
|
||||||
|
|
||||||
if (delta1 >= delta2 && !(rover->flags & FF_PLATFORM)) // thing is below FOF
|
if (delta1 >= delta2 && !(rover->flags & FF_PLATFORM)) // thing is below FOF
|
||||||
{
|
{
|
||||||
@@ -567,7 +573,7 @@ void P_LineOpening(line_t *linedef, mobj_t *mobj)
|
|||||||
// Check for backsectors fake floors
|
// Check for backsectors fake floors
|
||||||
for (rover = back->ffloors; rover; rover = rover->next)
|
for (rover = back->ffloors; rover; rover = rover->next)
|
||||||
{
|
{
|
||||||
fixed_t topheight, bottomheight;
|
fixed_t topheight, bottomheight, midheight;
|
||||||
if (!(rover->flags & FF_EXISTS))
|
if (!(rover->flags & FF_EXISTS))
|
||||||
continue;
|
continue;
|
||||||
|
|
||||||
@@ -580,8 +586,10 @@ void P_LineOpening(line_t *linedef, mobj_t *mobj)
|
|||||||
topheight = P_GetFOFTopZ(mobj, back, rover, tmx, tmy, linedef);
|
topheight = P_GetFOFTopZ(mobj, back, rover, tmx, tmy, linedef);
|
||||||
bottomheight = P_GetFOFBottomZ(mobj, back, rover, tmx, tmy, linedef);
|
bottomheight = P_GetFOFBottomZ(mobj, back, rover, tmx, tmy, linedef);
|
||||||
|
|
||||||
delta1 = abs(mobj->z - (bottomheight + ((topheight - bottomheight)/2)));
|
midheight = (bottomheight + ((topheight - bottomheight) / 2));
|
||||||
delta2 = abs(thingtop - (bottomheight + ((topheight - bottomheight)/2)));
|
|
||||||
|
delta1 = abs(mobj->z - midheight);
|
||||||
|
delta2 = abs(thingtop - midheight);
|
||||||
|
|
||||||
if (delta1 >= delta2 && !(rover->flags & FF_PLATFORM)) // thing is below FOF
|
if (delta1 >= delta2 && !(rover->flags & FF_PLATFORM)) // thing is below FOF
|
||||||
{
|
{
|
||||||
@@ -611,8 +619,10 @@ void P_LineOpening(line_t *linedef, mobj_t *mobj)
|
|||||||
{
|
{
|
||||||
const sector_t *polysec = linedef->backsector;
|
const sector_t *polysec = linedef->backsector;
|
||||||
|
|
||||||
delta1 = abs(mobj->z - (polysec->floorheight + ((polysec->ceilingheight - polysec->floorheight)/2)));
|
const fixed_t polymid = (polysec->floorheight + ((polysec->ceilingheight - polysec->floorheight) / 2));
|
||||||
delta2 = abs(thingtop - (polysec->floorheight + ((polysec->ceilingheight - polysec->floorheight)/2)));
|
|
||||||
|
delta1 = abs(mobj->z - polymid);
|
||||||
|
delta2 = abs(thingtop - polymid);
|
||||||
|
|
||||||
if (polysec->floorheight < lowestceiling && delta1 >= delta2)
|
if (polysec->floorheight < lowestceiling && delta1 >= delta2)
|
||||||
{
|
{
|
||||||
@@ -620,7 +630,9 @@ void P_LineOpening(line_t *linedef, mobj_t *mobj)
|
|||||||
ceilingslope = NULL;
|
ceilingslope = NULL;
|
||||||
}
|
}
|
||||||
else if (polysec->floorheight < highestceiling && delta1 >= delta2)
|
else if (polysec->floorheight < highestceiling && delta1 >= delta2)
|
||||||
|
{
|
||||||
highestceiling = polysec->floorheight;
|
highestceiling = polysec->floorheight;
|
||||||
|
}
|
||||||
|
|
||||||
if (polysec->ceilingheight > highestfloor && delta1 < delta2)
|
if (polysec->ceilingheight > highestfloor && delta1 < delta2)
|
||||||
{
|
{
|
||||||
@@ -628,7 +640,9 @@ void P_LineOpening(line_t *linedef, mobj_t *mobj)
|
|||||||
floorslope = NULL;
|
floorslope = NULL;
|
||||||
}
|
}
|
||||||
else if (polysec->ceilingheight > lowestfloor && delta1 < delta2)
|
else if (polysec->ceilingheight > lowestfloor && delta1 < delta2)
|
||||||
|
{
|
||||||
lowestfloor = polysec->ceilingheight;
|
lowestfloor = polysec->ceilingheight;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if (highestceiling < highceiling)
|
if (highestceiling < highceiling)
|
||||||
@@ -842,7 +856,7 @@ void P_SetThingPosition(mobj_t *thing)
|
|||||||
// at sector_t->touching_thinglist) are broken. When a node is
|
// at sector_t->touching_thinglist) are broken. When a node is
|
||||||
// added, new sector links are created.
|
// added, new sector links are created.
|
||||||
|
|
||||||
P_CreateSecNodeList(thing,thing->x,thing->y);
|
P_CreateSecNodeList(thing, thing->x, thing->y);
|
||||||
thing->touching_sectorlist = sector_list; // Attach to Thing's mobj_t
|
thing->touching_sectorlist = sector_list; // Attach to Thing's mobj_t
|
||||||
sector_list = NULL; // clear for next time
|
sector_list = NULL; // clear for next time
|
||||||
}
|
}
|
||||||
|
|||||||
+480
-409
File diff suppressed because it is too large.
Load diff
+1
-1
@@ -113,7 +113,7 @@ typedef enum
|
|||||||
// Don't use the blocklinks (inert but displayable)
|
// Don't use the blocklinks (inert but displayable)
|
||||||
MF_NOBLOCKMAP = 1<<4,
|
MF_NOBLOCKMAP = 1<<4,
|
||||||
// Thin, paper-like collision bound (for visual equivalent, see FF_PAPERSPRITE)
|
// Thin, paper-like collision bound (for visual equivalent, see FF_PAPERSPRITE)
|
||||||
MF_PAPERCOLLISION = 1<<5,
|
MF_PAPERCOLLISION = 1<<5,
|
||||||
// You can push this object. It can activate switches and things by pushing it on top.
|
// You can push this object. It can activate switches and things by pushing it on top.
|
||||||
MF_PUSHABLE = 1<<6,
|
MF_PUSHABLE = 1<<6,
|
||||||
// Object is a boss.
|
// Object is a boss.
|
||||||
|
|||||||
+36
-6
@@ -69,7 +69,7 @@ FUNCINLINE static ATTRINLINE void P_ArchivePlayer(savebuffer_t *save)
|
|||||||
pllives = 3; // has less than that.
|
pllives = 3; // has less than that.
|
||||||
|
|
||||||
WRITEUINT8(save->p, player->skincolor);
|
WRITEUINT8(save->p, player->skincolor);
|
||||||
WRITEUINT8(save->p, player->skin);
|
WRITESKIN(save->p, player->skin);
|
||||||
|
|
||||||
WRITEUINT32(save->p, player->score);
|
WRITEUINT32(save->p, player->score);
|
||||||
WRITEINT32(save->p, pllives);
|
WRITEINT32(save->p, pllives);
|
||||||
@@ -77,7 +77,7 @@ FUNCINLINE static ATTRINLINE void P_ArchivePlayer(savebuffer_t *save)
|
|||||||
|
|
||||||
if (botskin)
|
if (botskin)
|
||||||
{
|
{
|
||||||
WRITEUINT8(save->p, botskin);
|
WRITESKIN(save->p, botskin);
|
||||||
WRITEUINT8(save->p, botcolor);
|
WRITEUINT8(save->p, botcolor);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -88,7 +88,7 @@ FUNCINLINE static ATTRINLINE void P_ArchivePlayer(savebuffer_t *save)
|
|||||||
FUNCINLINE static ATTRINLINE void P_UnArchivePlayer(savebuffer_t *save)
|
FUNCINLINE static ATTRINLINE void P_UnArchivePlayer(savebuffer_t *save)
|
||||||
{
|
{
|
||||||
savedata.skincolor = READUINT8(save->p);
|
savedata.skincolor = READUINT8(save->p);
|
||||||
savedata.skin = READUINT8(save->p);
|
savedata.skin = READSKIN(save->p);
|
||||||
|
|
||||||
savedata.score = READINT32(save->p);
|
savedata.score = READINT32(save->p);
|
||||||
savedata.lives = READINT32(save->p);
|
savedata.lives = READINT32(save->p);
|
||||||
@@ -96,9 +96,11 @@ FUNCINLINE static ATTRINLINE void P_UnArchivePlayer(savebuffer_t *save)
|
|||||||
|
|
||||||
if (savedata.botcolor)
|
if (savedata.botcolor)
|
||||||
{
|
{
|
||||||
savedata.botskin = READUINT8(save->p);
|
savedata.botskin = READSKIN(save->p);
|
||||||
|
|
||||||
if (savedata.botskin-1 >= numskins)
|
if (savedata.botskin-1 >= numskins)
|
||||||
savedata.botskin = 0;
|
savedata.botskin = 0;
|
||||||
|
|
||||||
savedata.botcolor = READUINT8(save->p);
|
savedata.botcolor = READUINT8(save->p);
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
@@ -117,7 +119,9 @@ static void P_NetArchivePlayers(savebuffer_t *save, boolean resending)
|
|||||||
|
|
||||||
for (i = 0; i < MAXPLAYERS; i++)
|
for (i = 0; i < MAXPLAYERS; i++)
|
||||||
{
|
{
|
||||||
|
#ifndef PHOBOS_BUILD
|
||||||
if (resending)
|
if (resending)
|
||||||
|
#endif
|
||||||
WRITESINT8(save->p, (SINT8)adminplayers[i]);
|
WRITESINT8(save->p, (SINT8)adminplayers[i]);
|
||||||
|
|
||||||
if (!playeringame[i])
|
if (!playeringame[i])
|
||||||
@@ -127,7 +131,9 @@ static void P_NetArchivePlayers(savebuffer_t *save, boolean resending)
|
|||||||
|
|
||||||
// no longer send ticcmds
|
// no longer send ticcmds
|
||||||
|
|
||||||
|
#ifndef PHOBOS_BUILD
|
||||||
if (resending)
|
if (resending)
|
||||||
|
#endif
|
||||||
WRITESTRINGN(save->p, player_names[i], MAXPLAYERNAME);
|
WRITESTRINGN(save->p, player_names[i], MAXPLAYERNAME);
|
||||||
|
|
||||||
const player_t *player = &players[i];
|
const player_t *player = &players[i];
|
||||||
@@ -156,11 +162,16 @@ static void P_NetArchivePlayers(savebuffer_t *save, boolean resending)
|
|||||||
WRITEUINT16(save->p, player->flashpal);
|
WRITEUINT16(save->p, player->flashpal);
|
||||||
WRITEUINT16(save->p, player->flashcount);
|
WRITEUINT16(save->p, player->flashcount);
|
||||||
|
|
||||||
|
#ifdef PHOBOS_BUILD
|
||||||
|
WRITEUINT8(save->p, player->skincolor);
|
||||||
|
WRITEINT32(save->p, player->skin);
|
||||||
|
#else
|
||||||
if (resending)
|
if (resending)
|
||||||
{
|
{
|
||||||
WRITEUINT8(save->p, player->skincolor);
|
WRITEUINT8(save->p, player->skincolor);
|
||||||
WRITEINT32(save->p, player->skin);
|
WRITEINT32(save->p, player->skin);
|
||||||
}
|
}
|
||||||
|
#endif
|
||||||
|
|
||||||
WRITEUINT32(save->p, player->score);
|
WRITEUINT32(save->p, player->score);
|
||||||
WRITEFIXED(save->p, player->dashspeed);
|
WRITEFIXED(save->p, player->dashspeed);
|
||||||
@@ -309,7 +320,9 @@ static void P_NetUnArchivePlayers(savebuffer_t *save, boolean reloading)
|
|||||||
|
|
||||||
for (i = 0; i < MAXPLAYERS; i++)
|
for (i = 0; i < MAXPLAYERS; i++)
|
||||||
{
|
{
|
||||||
|
#ifndef PHOBOS_BUILD
|
||||||
if (reloading)
|
if (reloading)
|
||||||
|
#endif
|
||||||
adminplayers[i] = (INT32)READSINT8(save->p);
|
adminplayers[i] = (INT32)READSINT8(save->p);
|
||||||
|
|
||||||
// Do NOT memset player struct to 0
|
// Do NOT memset player struct to 0
|
||||||
@@ -320,7 +333,9 @@ static void P_NetUnArchivePlayers(savebuffer_t *save, boolean reloading)
|
|||||||
|
|
||||||
// NOTE: sending tics should (hopefully) no longer be necessary
|
// NOTE: sending tics should (hopefully) no longer be necessary
|
||||||
|
|
||||||
|
#ifndef PHOBOS_BUILD
|
||||||
if (reloading)
|
if (reloading)
|
||||||
|
#endif
|
||||||
READSTRINGN(save->p, player_names[i], MAXPLAYERNAME);
|
READSTRINGN(save->p, player_names[i], MAXPLAYERNAME);
|
||||||
|
|
||||||
player_t *player = &players[i];
|
player_t *player = &players[i];
|
||||||
@@ -349,11 +364,16 @@ static void P_NetUnArchivePlayers(savebuffer_t *save, boolean reloading)
|
|||||||
player->flashpal = READUINT16(save->p);
|
player->flashpal = READUINT16(save->p);
|
||||||
player->flashcount = READUINT16(save->p);
|
player->flashcount = READUINT16(save->p);
|
||||||
|
|
||||||
|
#ifdef PHOBOS_BUILD
|
||||||
|
player->skincolor = READUINT8(save->p);
|
||||||
|
player->skin = READINT32(save->p);
|
||||||
|
#else
|
||||||
if (reloading)
|
if (reloading)
|
||||||
{
|
{
|
||||||
player->skincolor = READUINT8(save->p);
|
player->skincolor = READUINT8(save->p);
|
||||||
player->skin = READINT32(save->p);
|
player->skin = READINT32(save->p);
|
||||||
}
|
}
|
||||||
|
#endif
|
||||||
|
|
||||||
player->score = READUINT32(save->p);
|
player->score = READUINT32(save->p);
|
||||||
player->dashspeed = READFIXED(save->p); // dashing speed
|
player->dashspeed = READFIXED(save->p); // dashing speed
|
||||||
@@ -1108,7 +1128,11 @@ static void SaveMobjThinker(savebuffer_t *save, const thinker_t *th, const UINT8
|
|||||||
diff2 = 0;
|
diff2 = 0;
|
||||||
|
|
||||||
// not the default but the most probable
|
// not the default but the most probable
|
||||||
|
#ifdef PHOBOS_BUILD
|
||||||
|
if (mobj->momx != 0 || mobj->momy != 0 || mobj->momz != 0 || mobj->pmomz !=0)
|
||||||
|
#else
|
||||||
if (mobj->momx != 0 || mobj->momy != 0 || mobj->momz != 0)
|
if (mobj->momx != 0 || mobj->momy != 0 || mobj->momz != 0)
|
||||||
|
#endif
|
||||||
diff |= MD_MOM;
|
diff |= MD_MOM;
|
||||||
if (mobj->radius != mobj->info->radius)
|
if (mobj->radius != mobj->info->radius)
|
||||||
diff |= MD_RADIUS;
|
diff |= MD_RADIUS;
|
||||||
@@ -1236,6 +1260,9 @@ static void SaveMobjThinker(savebuffer_t *save, const thinker_t *th, const UINT8
|
|||||||
WRITEFIXED(save->p, mobj->momx);
|
WRITEFIXED(save->p, mobj->momx);
|
||||||
WRITEFIXED(save->p, mobj->momy);
|
WRITEFIXED(save->p, mobj->momy);
|
||||||
WRITEFIXED(save->p, mobj->momz);
|
WRITEFIXED(save->p, mobj->momz);
|
||||||
|
#ifdef PHOBOS_BUILD
|
||||||
|
WRITEFIXED(save->p, mobj->pmomz);
|
||||||
|
#endif
|
||||||
}
|
}
|
||||||
if (diff & MD_RADIUS)
|
if (diff & MD_RADIUS)
|
||||||
WRITEFIXED(save->p, mobj->radius);
|
WRITEFIXED(save->p, mobj->radius);
|
||||||
@@ -1297,7 +1324,7 @@ static void SaveMobjThinker(savebuffer_t *save, const thinker_t *th, const UINT8
|
|||||||
if (diff2 & MD2_CVMEM)
|
if (diff2 & MD2_CVMEM)
|
||||||
WRITEINT32(save->p, mobj->cvmem);
|
WRITEINT32(save->p, mobj->cvmem);
|
||||||
if (diff2 & MD2_SKIN)
|
if (diff2 & MD2_SKIN)
|
||||||
WRITEUINT8(save->p, (UINT8)((skin_t *)mobj->skin - skins));
|
WRITESKIN(save->p, (skinnum_t)((skin_t *)mobj->skin - skins));
|
||||||
if (diff2 & MD2_COLOR)
|
if (diff2 & MD2_COLOR)
|
||||||
WRITEUINT8(save->p, mobj->color);
|
WRITEUINT8(save->p, mobj->color);
|
||||||
if (diff2 & MD2_EXTVAL1)
|
if (diff2 & MD2_EXTVAL1)
|
||||||
@@ -2055,6 +2082,9 @@ static void LoadMobjThinker(savebuffer_t *save, actionf_p1 thinker)
|
|||||||
mobj->momx = READFIXED(save->p);
|
mobj->momx = READFIXED(save->p);
|
||||||
mobj->momy = READFIXED(save->p);
|
mobj->momy = READFIXED(save->p);
|
||||||
mobj->momz = READFIXED(save->p);
|
mobj->momz = READFIXED(save->p);
|
||||||
|
#ifdef PHOBOS_BUILD
|
||||||
|
mobj->pmomz = READFIXED(save->p);
|
||||||
|
#endif
|
||||||
} // otherwise they're zero, and the memset took care of it
|
} // otherwise they're zero, and the memset took care of it
|
||||||
|
|
||||||
if (diff & MD_RADIUS)
|
if (diff & MD_RADIUS)
|
||||||
@@ -2155,7 +2185,7 @@ static void LoadMobjThinker(savebuffer_t *save, actionf_p1 thinker)
|
|||||||
if (diff2 & MD2_CVMEM)
|
if (diff2 & MD2_CVMEM)
|
||||||
mobj->cvmem = READINT32(save->p);
|
mobj->cvmem = READINT32(save->p);
|
||||||
if (diff2 & MD2_SKIN)
|
if (diff2 & MD2_SKIN)
|
||||||
mobj->skin = &skins[READUINT8(save->p)];
|
mobj->skin = &skins[READSKIN(save->p)];
|
||||||
if (diff2 & MD2_COLOR)
|
if (diff2 & MD2_COLOR)
|
||||||
mobj->color = READUINT8(save->p);
|
mobj->color = READUINT8(save->p);
|
||||||
if (diff2 & MD2_EXTVAL1)
|
if (diff2 & MD2_EXTVAL1)
|
||||||
|
|||||||
+2
-2
@@ -24,8 +24,8 @@
|
|||||||
typedef struct
|
typedef struct
|
||||||
{
|
{
|
||||||
UINT8 skincolor;
|
UINT8 skincolor;
|
||||||
UINT8 skin;
|
skinnum_t skin;
|
||||||
UINT8 botskin;
|
skinnum_t botskin;
|
||||||
UINT8 botcolor;
|
UINT8 botcolor;
|
||||||
INT32 score;
|
INT32 score;
|
||||||
INT32 lives;
|
INT32 lives;
|
||||||
|
|||||||
+194
-165
@@ -117,6 +117,7 @@ line_t *spawnlines = NULL;
|
|||||||
side_t *spawnsides = NULL;
|
side_t *spawnsides = NULL;
|
||||||
INT32 numstarposts = 0;
|
INT32 numstarposts = 0;
|
||||||
boolean levelloading = false;
|
boolean levelloading = false;
|
||||||
|
UINT8 levelfadecol = 120;
|
||||||
|
|
||||||
virtres_t *curmapvirt = NULL;
|
virtres_t *curmapvirt = NULL;
|
||||||
|
|
||||||
@@ -179,7 +180,7 @@ FUNCNORETURN static ATTRNORETURN void CorruptMapError(const char *msg)
|
|||||||
// don't use va() because the calling function probably uses it
|
// don't use va() because the calling function probably uses it
|
||||||
char mapnum[10];
|
char mapnum[10];
|
||||||
|
|
||||||
sprintf(mapnum, "%hd", gamemap);
|
snprintf(mapnum, sizeof(mapnum), "%hd", gamemap);
|
||||||
CON_LogMessage("Map ");
|
CON_LogMessage("Map ");
|
||||||
CON_LogMessage(mapnum);
|
CON_LogMessage(mapnum);
|
||||||
CON_LogMessage(" is corrupt: ");
|
CON_LogMessage(" is corrupt: ");
|
||||||
@@ -265,8 +266,8 @@ static void P_ClearSingleMapHeaderInfo(INT16 i)
|
|||||||
mapheaderinfo[num]->actnum[0] = '\0';
|
mapheaderinfo[num]->actnum[0] = '\0';
|
||||||
mapheaderinfo[num]->typeoflevel = 0;
|
mapheaderinfo[num]->typeoflevel = 0;
|
||||||
mapheaderinfo[num]->nextlevel = (INT16)(i + 1);
|
mapheaderinfo[num]->nextlevel = (INT16)(i + 1);
|
||||||
snprintf(mapheaderinfo[num]->musname, 7, "%sM", G_BuildMapName(i));
|
snprintf(mapheaderinfo[num]->musname, sizeof(mapheaderinfo[num]->musname), "%sM", G_BuildMapName(i));
|
||||||
mapheaderinfo[num]->musname[6] = 0;
|
mapheaderinfo[num]->musname[sizeof(mapheaderinfo[num]->musname)-1] = 0;
|
||||||
mapheaderinfo[num]->mustrack = 0;
|
mapheaderinfo[num]->mustrack = 0;
|
||||||
mapheaderinfo[num]->muspos = 0;
|
mapheaderinfo[num]->muspos = 0;
|
||||||
mapheaderinfo[num]->forcecharacter[0] = '\0';
|
mapheaderinfo[num]->forcecharacter[0] = '\0';
|
||||||
@@ -317,15 +318,15 @@ void P_AllocMapHeader(INT16 i)
|
|||||||
// Loads the vertexes for a level.
|
// Loads the vertexes for a level.
|
||||||
FUNCINLINE static ATTRINLINE void P_LoadVertices(UINT8 *data)
|
FUNCINLINE static ATTRINLINE void P_LoadVertices(UINT8 *data)
|
||||||
{
|
{
|
||||||
mapvertex_t *ml = (mapvertex_t *)data;
|
mapvertex_t *mv = (mapvertex_t *)data;
|
||||||
vertex_t *li = vertexes;
|
vertex_t *v = vertexes;
|
||||||
size_t i;
|
size_t i;
|
||||||
|
|
||||||
// Copy and convert vertex coordinates, internal representation as fixed.
|
// Copy and convert vertex coordinates, internal representation as fixed.
|
||||||
for (i = 0; i < numvertexes; i++, li++, ml++)
|
for (i = 0; i < numvertexes; i++, v++, mv++)
|
||||||
{
|
{
|
||||||
li->x = SHORT(ml->x)<<FRACBITS;
|
v->x = SHORT(mv->x)<<FRACBITS;
|
||||||
li->y = SHORT(ml->y)<<FRACBITS;
|
v->y = SHORT(mv->y)<<FRACBITS;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -478,65 +479,30 @@ static void P_SetupDirectionalLight(void)
|
|||||||
static void P_LoadSegs(UINT8 *data)
|
static void P_LoadSegs(UINT8 *data)
|
||||||
{
|
{
|
||||||
INT32 rawlinedef, rawside;
|
INT32 rawlinedef, rawside;
|
||||||
mapseg_t *ml = (mapseg_t*)data;
|
mapseg_t *ms = (mapseg_t*)data;
|
||||||
seg_t *li = segs;
|
seg_t *seg = segs;
|
||||||
line_t *ldef;
|
line_t *ldef;
|
||||||
size_t i;
|
size_t i;
|
||||||
|
|
||||||
// Set map lighting settings.
|
// Set map lighting settings.
|
||||||
P_SetupDirectionalLight();
|
P_SetupDirectionalLight();
|
||||||
|
|
||||||
for (i = 0; i < numsegs; i++, li++, ml++)
|
for (i = 0; i < numsegs; i++, seg++, ms++)
|
||||||
{
|
{
|
||||||
INT16 v1, v2;
|
INT16 v1, v2;
|
||||||
|
|
||||||
v1 = SHORT(ml->v1);
|
v1 = SHORT(ms->v1);
|
||||||
v2 = SHORT(ml->v2);
|
v2 = SHORT(ms->v2);
|
||||||
|
|
||||||
// e6y
|
// e6y
|
||||||
// check and fix wrong references to non-existent vertexes
|
// moved down for additional checks to avoid overflow
|
||||||
// see e1m9 @ NIVELES.WAD
|
// if wrong vertexe's indexes are in SEGS lump
|
||||||
// http://www.doomworld.com/idgames/index.php?id=12647
|
// see below for more detailed information
|
||||||
if ((unsigned)v1 >= numvertexes || (unsigned)v2 >= numvertexes)
|
|
||||||
{
|
|
||||||
if ((unsigned)v1 >= numvertexes)
|
|
||||||
CorruptMapWarning(va("P_LoadSegs: seg %s references a non-existent vertex %d\n", sizeu1(i), v1));
|
|
||||||
if ((unsigned)v2 >= numvertexes)
|
|
||||||
CorruptMapWarning(va("P_LoadSegs: seg %s references a non-existent vertex %d\n", sizeu1(i), v2));
|
|
||||||
|
|
||||||
if (li->sidedef == &sides[li->linedef->sidenum[0]])
|
seg->angle = (SHORT(ms->angle)) << FRACBITS;
|
||||||
{
|
seg->offset = (SHORT(ms->offset)) << FRACBITS;
|
||||||
li->v1 = lines[ml->linedef].v1;
|
|
||||||
li->v2 = lines[ml->linedef].v2;
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
li->v1 = lines[ml->linedef].v2;
|
|
||||||
li->v2 = lines[ml->linedef].v1;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
li->v1 = &vertexes[v1];
|
|
||||||
li->v2 = &vertexes[v2];
|
|
||||||
}
|
|
||||||
|
|
||||||
#ifdef HWRENDER
|
rawlinedef = SHORT(ms->linedef);
|
||||||
if (rendermode == render_opengl)
|
|
||||||
{
|
|
||||||
li->fv1.x = FixedToFloat(li->v1->x);
|
|
||||||
li->fv1.y = FixedToFloat(li->v1->y);
|
|
||||||
//li->fv1.z = FixedToFloat(li->v1->z); // z is unused in gl
|
|
||||||
|
|
||||||
li->fv2.x = FixedToFloat(li->v2->x);
|
|
||||||
li->fv2.y = FixedToFloat(li->v2->y);
|
|
||||||
//li->fv2.z = FixedToFloat(li->v2->z);
|
|
||||||
}
|
|
||||||
#endif
|
|
||||||
li->length = P_SegLength(li);
|
|
||||||
li->angle = (SHORT(ml->angle))<<FRACBITS;
|
|
||||||
li->offset = (SHORT(ml->offset))<<FRACBITS;
|
|
||||||
rawlinedef = SHORT(ml->linedef);
|
|
||||||
|
|
||||||
//e6y: check for wrong indexes
|
//e6y: check for wrong indexes
|
||||||
if ((unsigned)rawlinedef >= numlines)
|
if ((unsigned)rawlinedef >= numlines)
|
||||||
@@ -545,8 +511,8 @@ static void P_LoadSegs(UINT8 *data)
|
|||||||
}
|
}
|
||||||
|
|
||||||
ldef = &lines[rawlinedef];
|
ldef = &lines[rawlinedef];
|
||||||
li->linedef = ldef;
|
seg->linedef = ldef;
|
||||||
rawside = SHORT(ml->side);
|
rawside = SHORT(ms->side);
|
||||||
|
|
||||||
//e6y: fix wrong side index
|
//e6y: fix wrong side index
|
||||||
if (rawside != 0 && rawside != 1)
|
if (rawside != 0 && rawside != 1)
|
||||||
@@ -561,9 +527,9 @@ static void P_LoadSegs(UINT8 *data)
|
|||||||
I_Error("P_LoadSegs: linedef %d for seg %s references a non-existent sidedef %d", rawlinedef, sizeu1(i), ldef->sidenum[rawside]);
|
I_Error("P_LoadSegs: linedef %d for seg %s references a non-existent sidedef %d", rawlinedef, sizeu1(i), ldef->sidenum[rawside]);
|
||||||
}
|
}
|
||||||
|
|
||||||
li->side = rawside;
|
seg->side = rawside;
|
||||||
|
|
||||||
li->sidedef = &sides[ldef->sidenum[rawside]];
|
seg->sidedef = &sides[ldef->sidenum[rawside]];
|
||||||
|
|
||||||
/* cph 2006/09/30 - our frontsector can be the second side of the
|
/* cph 2006/09/30 - our frontsector can be the second side of the
|
||||||
* linedef, so must check for NO_INDEX in case we are incorrectly
|
* linedef, so must check for NO_INDEX in case we are incorrectly
|
||||||
@@ -571,11 +537,11 @@ static void P_LoadSegs(UINT8 *data)
|
|||||||
if (ldef->sidenum[rawside] == NO_INDEX)
|
if (ldef->sidenum[rawside] == NO_INDEX)
|
||||||
{
|
{
|
||||||
CorruptMapWarning(va("P_LoadSegs: front of seg %s has no sidedef\n", sizeu1(i)));
|
CorruptMapWarning(va("P_LoadSegs: front of seg %s has no sidedef\n", sizeu1(i)));
|
||||||
li->frontsector = NULL;
|
seg->frontsector = NULL;
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
li->frontsector = sides[ldef->sidenum[rawside]].sector;
|
seg->frontsector = sides[ldef->sidenum[rawside]].sector;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (ldef->flags & ML_TWOSIDED)
|
if (ldef->flags & ML_TWOSIDED)
|
||||||
@@ -583,15 +549,58 @@ static void P_LoadSegs(UINT8 *data)
|
|||||||
if (ldef->sidenum[rawside^1] == NO_INDEX)
|
if (ldef->sidenum[rawside^1] == NO_INDEX)
|
||||||
{
|
{
|
||||||
CorruptMapWarning(va("P_LoadSegs: back of seg %s has no sidedef while being marked as double sided\n", sizeu1(i)));
|
CorruptMapWarning(va("P_LoadSegs: back of seg %s has no sidedef while being marked as double sided\n", sizeu1(i)));
|
||||||
li->backsector = NULL;
|
seg->backsector = NULL;
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
li->backsector = sides[ldef->sidenum[rawside^1]].sector;
|
seg->backsector = sides[ldef->sidenum[rawside^1]].sector;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
P_UpdateSegLightOffset(li);
|
// e6y
|
||||||
|
// check and fix wrong references to non-existent vertexes
|
||||||
|
// see e1m9 @ NIVELES.WAD
|
||||||
|
// http://www.doomworld.com/idgames/index.php?id=12647
|
||||||
|
if ((unsigned)v1 >= numvertexes || (unsigned)v2 >= numvertexes)
|
||||||
|
{
|
||||||
|
if ((unsigned)v1 >= numvertexes)
|
||||||
|
CorruptMapWarning(va("P_LoadSegs: seg %s references a non-existent vertex %d\n", sizeu1(i), v1));
|
||||||
|
if ((unsigned)v2 >= numvertexes)
|
||||||
|
CorruptMapWarning(va("P_LoadSegs: seg %s references a non-existent vertex %d\n", sizeu1(i), v2));
|
||||||
|
|
||||||
|
if (seg->sidedef == &sides[seg->linedef->sidenum[0]])
|
||||||
|
{
|
||||||
|
seg->v1 = lines[ms->linedef].v1;
|
||||||
|
seg->v2 = lines[ms->linedef].v2;
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
seg->v1 = lines[ms->linedef].v2;
|
||||||
|
seg->v2 = lines[ms->linedef].v1;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
seg->v1 = &vertexes[v1];
|
||||||
|
seg->v2 = &vertexes[v2];
|
||||||
|
}
|
||||||
|
|
||||||
|
#ifdef HWRENDER
|
||||||
|
if (rendermode == render_opengl)
|
||||||
|
{
|
||||||
|
seg->fv1.x = FixedToFloat(seg->v1->x);
|
||||||
|
seg->fv1.y = FixedToFloat(seg->v1->y);
|
||||||
|
//seg->fv1.z = FixedToFloat(seg->v1->z); // z is unused in gl
|
||||||
|
|
||||||
|
seg->fv2.x = FixedToFloat(seg->v2->x);
|
||||||
|
seg->fv2.y = FixedToFloat(seg->v2->y);
|
||||||
|
//seg->fv2.z = FixedToFloat(seg->v2->z);
|
||||||
|
}
|
||||||
|
#endif
|
||||||
|
|
||||||
|
seg->length = P_SegLength(seg);
|
||||||
|
|
||||||
|
P_UpdateSegLightOffset(seg);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -609,10 +618,6 @@ FUNCINLINE static ATTRINLINE void P_LoadSubsectors(void *data)
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
//
|
|
||||||
// P_LoadSectors
|
|
||||||
//
|
|
||||||
|
|
||||||
//
|
//
|
||||||
// levelflats
|
// levelflats
|
||||||
//
|
//
|
||||||
@@ -664,13 +669,17 @@ static void P_CheckCyanFlat(levelflat_t *levelflat)
|
|||||||
const char *flatname = W_CheckNameForNum(levelflat->lumpnum);
|
const char *flatname = W_CheckNameForNum(levelflat->lumpnum);
|
||||||
|
|
||||||
// hack for gba rainbow roads cyan floors
|
// hack for gba rainbow roads cyan floors
|
||||||
if (UNLIKELY(memcmp(flatname, "GBA_RRF5", 8) == 0 && flatname[8] == 0))
|
if (UNLIKELY(flatname && memcmp(flatname, "GBA_RRF5", 8) == 0 && flatname[8] == 0))
|
||||||
{
|
{
|
||||||
levelflat->cyan = false;
|
levelflat->cyan = false;
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
const UINT8 *flat = R_GetFlat(levelflat->lumpnum);
|
const UINT8 *flat = R_GetFlat(levelflat->lumpnum);
|
||||||
|
|
||||||
|
if (!flat)
|
||||||
|
return;
|
||||||
|
|
||||||
const size_t size = W_LumpLength(levelflat->lumpnum);
|
const size_t size = W_LumpLength(levelflat->lumpnum);
|
||||||
|
|
||||||
for (size_t steppy = 0; steppy < size; steppy++)
|
for (size_t steppy = 0; steppy < size; steppy++)
|
||||||
@@ -790,6 +799,10 @@ INT32 P_CheckLevelFlat(const char *flatname)
|
|||||||
return (INT32)i;
|
return (INT32)i;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
//
|
||||||
|
// P_LoadSectors
|
||||||
|
//
|
||||||
|
|
||||||
static const sector_t sector_default = {
|
static const sector_t sector_default = {
|
||||||
.nexttag = -1,
|
.nexttag = -1,
|
||||||
.firsttag = -1,
|
.firsttag = -1,
|
||||||
@@ -920,7 +933,48 @@ static void P_LoadThings(UINT8 *data)
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
static void P_SpawnMapThings(void)
|
static void P_SpawnEmeraldHunt(void)
|
||||||
|
{
|
||||||
|
INT32 i;
|
||||||
|
INT32 emer[3] = {0, 0, 0};
|
||||||
|
INT32 timeout = 0; // keeps from getting stuck
|
||||||
|
fixed_t x, y, z;
|
||||||
|
|
||||||
|
// increment spawn numbers because zero is valid.
|
||||||
|
emer[0] = (P_RandomKey(numhuntemeralds)) + 1;
|
||||||
|
while (timeout++ < 100)
|
||||||
|
{
|
||||||
|
emer[1] = (P_RandomKey(numhuntemeralds)) + 1;
|
||||||
|
|
||||||
|
if (emer[1] != emer[0])
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
|
||||||
|
timeout = 0;
|
||||||
|
while (timeout++ < 100)
|
||||||
|
{
|
||||||
|
emer[2] = (P_RandomKey(numhuntemeralds)) + 1;
|
||||||
|
|
||||||
|
if (emer[2] != emer[1] && emer[2] != emer[0])
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
|
||||||
|
for (i = 0; i < 3; i++)
|
||||||
|
{
|
||||||
|
if (!emer[i])
|
||||||
|
continue;
|
||||||
|
|
||||||
|
// decrement spawn values to the actual number because zero is valid.
|
||||||
|
x = huntemeralds[emer[i] - 1]->x<<FRACBITS;
|
||||||
|
y = huntemeralds[emer[i] - 1]->y<<FRACBITS;
|
||||||
|
z = huntemeralds[emer[i] - 1]->z<<FRACBITS;
|
||||||
|
|
||||||
|
// spawn emerald
|
||||||
|
P_SpawnMobj(x, y, z, MT_EMERHUNT);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
static void P_SpawnMapThings(boolean spawnhoops)
|
||||||
{
|
{
|
||||||
size_t i;
|
size_t i;
|
||||||
mapthing_t *mt;
|
mapthing_t *mt;
|
||||||
@@ -930,97 +984,68 @@ static void P_SpawnMapThings(void)
|
|||||||
// Spawn axis points first so they are at the front of the list for fast searching.
|
// Spawn axis points first so they are at the front of the list for fast searching.
|
||||||
for (i = 0, mt = mapthings; i < nummapthings; i++, mt++)
|
for (i = 0, mt = mapthings; i < nummapthings; i++, mt++)
|
||||||
{
|
{
|
||||||
switch (mt->type)
|
if (mt->type == 1700 || // MT_AXIS
|
||||||
|
mt->type == 1701 || // MT_AXISTRANSFER
|
||||||
|
mt->type == 1702) // MT_AXISTRANSFERLINE
|
||||||
{
|
{
|
||||||
case 1700: // MT_AXIS
|
mt->mobj = NULL;
|
||||||
case 1701: // MT_AXISTRANSFER
|
P_SpawnMapThing(mt);
|
||||||
case 1702: // MT_AXISTRANSFERLINE
|
|
||||||
mt->mobj = NULL;
|
|
||||||
P_SpawnMapThing(mt);
|
|
||||||
break;
|
|
||||||
default:
|
|
||||||
break;
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
for (i = 0, mt = mapthings; i < nummapthings; i++, mt++)
|
for (i = 0, mt = mapthings; i < nummapthings; i++, mt++)
|
||||||
{
|
{
|
||||||
sector_t *mtsector = R_PointInSubsector((mt->x << FRACBITS), (mt->y << FRACBITS))->sector;
|
sector_t *mtsector;
|
||||||
|
|
||||||
|
// srb2kart - ignore rings, coins and item patterns!
|
||||||
|
if (mt->type == 300 || mt->type == 308 || mt->type == 309 ||
|
||||||
|
(mt->type >= 600 && mt->type <= 609) ||
|
||||||
|
mt->type == 1706 || mt->type == 1800)
|
||||||
|
{
|
||||||
|
mt->mobj = NULL;
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
|
||||||
|
mtsector = R_PointInSubsector((mt->x << FRACBITS), (mt->y << FRACBITS))->sector;
|
||||||
|
|
||||||
// Z for objects
|
// Z for objects
|
||||||
mt->z = (INT16)(P_GetSectorFloorZAt(mtsector, (mt->x << FRACBITS), (mt->y << FRACBITS))) >> FRACBITS;
|
mt->z = (INT16)(P_GetSectorFloorZAt(mtsector, (mt->x << FRACBITS), (mt->y << FRACBITS))) >> FRACBITS;
|
||||||
|
|
||||||
if (mt->type == 1700 // MT_AXIS
|
if (mt->type == 1700 || // MT_AXIS
|
||||||
|| mt->type == 1701 // MT_AXISTRANSFER
|
mt->type == 1701 || // MT_AXISTRANSFER
|
||||||
|| mt->type == 1702) // MT_AXISTRANSFERLINE
|
mt->type == 1702) // MT_AXISTRANSFERLINE
|
||||||
|
{
|
||||||
continue; // These were already spawned
|
continue; // These were already spawned
|
||||||
|
}
|
||||||
|
|
||||||
|
mt->mobj = NULL;
|
||||||
|
|
||||||
|
// spawn hoops
|
||||||
|
if (mt->type == 1705 || mt->type == 1713)
|
||||||
|
{
|
||||||
|
// Check for spawnhoops here so the hoops don't spawn ghost variants for players joining a netgame mid-level
|
||||||
|
// ...It's a long story.
|
||||||
|
if (spawnhoops)
|
||||||
|
{
|
||||||
|
// Z for objects Tails 05-26-2002
|
||||||
|
mt->z = (INT16)(mtsector->floorheight >> FRACBITS);
|
||||||
|
|
||||||
|
P_SpawnHoops(mt);
|
||||||
|
}
|
||||||
|
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
|
||||||
if (mt->type == mobjinfo[MT_RANDOMITEM].doomednum)
|
if (mt->type == mobjinfo[MT_RANDOMITEM].doomednum)
|
||||||
nummapboxes++;
|
nummapboxes++;
|
||||||
|
|
||||||
mt->mobj = NULL;
|
// Everything else
|
||||||
P_SpawnMapThing(mt);
|
P_SpawnMapThing(mt);
|
||||||
}
|
}
|
||||||
|
|
||||||
// random emeralds for hunt
|
// random emeralds for hunt
|
||||||
if (numhuntemeralds)
|
if (numhuntemeralds)
|
||||||
{
|
P_SpawnEmeraldHunt();
|
||||||
INT32 emer1, emer2, emer3;
|
|
||||||
INT32 timeout = 0; // keeps from getting stuck
|
|
||||||
|
|
||||||
emer1 = emer2 = emer3 = 0;
|
|
||||||
|
|
||||||
//increment spawn numbers because zero is valid.
|
|
||||||
emer1 = (P_RandomKey(numhuntemeralds)) + 1;
|
|
||||||
while (timeout++ < 100)
|
|
||||||
{
|
|
||||||
emer2 = (P_RandomKey(numhuntemeralds)) + 1;
|
|
||||||
|
|
||||||
if (emer2 != emer1)
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
|
|
||||||
timeout = 0;
|
|
||||||
while (timeout++ < 100)
|
|
||||||
{
|
|
||||||
emer3 = (P_RandomKey(numhuntemeralds)) + 1;
|
|
||||||
|
|
||||||
if (emer3 != emer2 && emer3 != emer1)
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
|
|
||||||
//decrement spawn values to the actual number because zero is valid.
|
|
||||||
if (emer1)
|
|
||||||
P_SpawnMobj(huntemeralds[emer1 - 1]->x<<FRACBITS,
|
|
||||||
huntemeralds[emer1 - 1]->y<<FRACBITS,
|
|
||||||
huntemeralds[emer1 - 1]->z<<FRACBITS, MT_EMERHUNT);
|
|
||||||
|
|
||||||
if (emer2)
|
|
||||||
P_SpawnMobj(huntemeralds[emer2 - 1]->x<<FRACBITS,
|
|
||||||
huntemeralds[emer2 - 1]->y<<FRACBITS,
|
|
||||||
huntemeralds[emer2 - 1]->z<<FRACBITS, MT_EMERHUNT);
|
|
||||||
|
|
||||||
if (emer3)
|
|
||||||
P_SpawnMobj(huntemeralds[emer3 - 1]->x<<FRACBITS,
|
|
||||||
huntemeralds[emer3 - 1]->y<<FRACBITS,
|
|
||||||
huntemeralds[emer3 - 1]->z<<FRACBITS, MT_EMERHUNT);
|
|
||||||
}
|
|
||||||
|
|
||||||
// Run through the list of mapthings again to spawn hoops and rings
|
|
||||||
for (i = 0, mt = mapthings; i < nummapthings; i++, mt++)
|
|
||||||
{
|
|
||||||
if (mt->type == 300 || mt->type == 308 || mt->type == 309
|
|
||||||
|| mt->type == 1706 || (mt->type >= 600 && mt->type <= 609)
|
|
||||||
|| mt->type == 1705 || mt->type == 1713 || mt->type == 1800)
|
|
||||||
{
|
|
||||||
mt->mobj = NULL;
|
|
||||||
|
|
||||||
// Z for objects Tails 05-26-2002
|
|
||||||
mt->z = (INT16)(R_PointInSubsector(mt->x << FRACBITS, mt->y << FRACBITS)->sector->floorheight>>FRACBITS);
|
|
||||||
|
|
||||||
P_SpawnHoops(mt);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
static void P_SpawnEmblems(boolean loademblems)
|
static void P_SpawnEmblems(boolean loademblems)
|
||||||
@@ -1034,22 +1059,22 @@ static void P_SpawnEmblems(boolean loademblems)
|
|||||||
|
|
||||||
for (i = 0; i < numemblems; i++)
|
for (i = 0; i < numemblems; i++)
|
||||||
{
|
{
|
||||||
if (emblemlocations[i].level != gamemap || emblemlocations[i].type > ET_SKIN)
|
const emblem_t *emblemlocation = &emblemlocations[i];
|
||||||
|
|
||||||
|
if (emblemlocation->level != gamemap || emblemlocation->type > ET_SKIN)
|
||||||
continue;
|
continue;
|
||||||
|
|
||||||
emblemmobj = P_SpawnMobj(emblemlocations[i].x<<FRACBITS, emblemlocations[i].y<<FRACBITS,
|
emblemmobj = P_SpawnMobj(emblemlocation->x<<FRACBITS, emblemlocation->y<<FRACBITS, emblemlocation->z<<FRACBITS, MT_EMBLEM);
|
||||||
emblemlocations[i].z<<FRACBITS, MT_EMBLEM);
|
|
||||||
|
|
||||||
I_Assert(emblemlocations[i].sprite >= 'A' && emblemlocations[i].sprite <= 'Z');
|
I_Assert(emblemlocation->sprite >= 'A' && emblemlocation->sprite <= 'Z');
|
||||||
P_SetMobjStateNF(emblemmobj, emblemmobj->info->spawnstate + (emblemlocations[i].sprite - 'A'));
|
P_SetMobjStateNF(emblemmobj, emblemmobj->info->spawnstate + (emblemlocation->sprite - 'A'));
|
||||||
|
|
||||||
emblemmobj->health = i+1;
|
emblemmobj->health = i+1;
|
||||||
color = M_GetEmblemColor(&emblemlocations[i]);
|
color = M_GetEmblemColor(&emblemlocations[i]);
|
||||||
|
|
||||||
emblemmobj->color = (UINT8)color;
|
emblemmobj->color = (UINT8)color;
|
||||||
|
|
||||||
if (emblemlocations[i].collected
|
if (emblemlocation->collected || (emblemlocation->type == ET_SKIN && emblemlocation->var != players[0].skin))
|
||||||
|| (emblemlocations[i].type == ET_SKIN && emblemlocations[i].var != players[0].skin))
|
|
||||||
{
|
{
|
||||||
P_UnsetThingPosition(emblemmobj);
|
P_UnsetThingPosition(emblemmobj);
|
||||||
emblemmobj->flags |= MF_NOCLIP;
|
emblemmobj->flags |= MF_NOCLIP;
|
||||||
@@ -1881,7 +1906,7 @@ static void P_ReadBlockMapLump(INT16 *wadblockmaplump, size_t count)
|
|||||||
// because making both the WAD and PK3 loading code use
|
// because making both the WAD and PK3 loading code use
|
||||||
// the same functions is trickier than it looks for blockmap
|
// the same functions is trickier than it looks for blockmap
|
||||||
// -- Monster Iestyn 09/01/18
|
// -- Monster Iestyn 09/01/18
|
||||||
static boolean P_LoadRawBlockMap(UINT8 *data, size_t count)
|
static boolean P_LoadBlockMap(UINT8 *data, size_t count)
|
||||||
{
|
{
|
||||||
if (!count || count >= 0x20000)
|
if (!count || count >= 0x20000)
|
||||||
return false;
|
return false;
|
||||||
@@ -2049,14 +2074,14 @@ static void P_LoadReject(UINT8 *data, size_t rejectsize)
|
|||||||
if (rejectsize < neededsize)
|
if (rejectsize < neededsize)
|
||||||
{
|
{
|
||||||
CorruptMapWarning(va("P_LoadReject: REJECT is %s byte%s too small. REJECT might be invalid!\n", sizeu1(neededsize - rejectsize), (neededsize - rejectsize) == 1 ? "" : "s"));
|
CorruptMapWarning(va("P_LoadReject: REJECT is %s byte%s too small. REJECT might be invalid!\n", sizeu1(neededsize - rejectsize), (neededsize - rejectsize) == 1 ? "" : "s"));
|
||||||
#ifdef COMPAT_VANILLA
|
#ifdef PHOBOS_BUILD
|
||||||
|
rejectmatrix = NULL;
|
||||||
|
return;
|
||||||
|
#else
|
||||||
// we can pad this and somewhat prevent desyncs
|
// we can pad this and somewhat prevent desyncs
|
||||||
// probs not cool if the reject is from a completely different map
|
// probs not cool if the reject is from a completely different map
|
||||||
// but whatever
|
// but whatever
|
||||||
allocsize = neededsize;
|
allocsize = neededsize;
|
||||||
#else
|
|
||||||
rejectmatrix = NULL;
|
|
||||||
return;
|
|
||||||
#endif
|
#endif
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -2107,7 +2132,7 @@ static void P_LoadMapLUT(const virtres_t* virt)
|
|||||||
rejectmatrix = NULL;
|
rejectmatrix = NULL;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (!(virtblockmap && P_LoadRawBlockMap(virtblockmap->data, virtblockmap->size)))
|
if (!(virtblockmap && P_LoadBlockMap(virtblockmap->data, virtblockmap->size)))
|
||||||
P_CreateBlockMap();
|
P_CreateBlockMap();
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -2180,7 +2205,7 @@ void P_SetupLevelSky(INT32 skynum, boolean global)
|
|||||||
{
|
{
|
||||||
char skytexname[12];
|
char skytexname[12];
|
||||||
|
|
||||||
sprintf(skytexname, "SKY%d", skynum);
|
snprintf(skytexname, sizeof(skytexname), "SKY%d", skynum);
|
||||||
skytexture = R_TextureNumForName(skytexname);
|
skytexture = R_TextureNumForName(skytexname);
|
||||||
levelskynum = skynum;
|
levelskynum = skynum;
|
||||||
|
|
||||||
@@ -2400,7 +2425,8 @@ static void P_RunLevelScript(const char *scriptname)
|
|||||||
lumpnum_t lumpnum;
|
lumpnum_t lumpnum;
|
||||||
char newname[9];
|
char newname[9];
|
||||||
|
|
||||||
strlcpy(newname, scriptname, sizeof(newname));
|
strncpy(newname, scriptname, sizeof(newname)-1);
|
||||||
|
newname[sizeof(newname)-1] = '\0';
|
||||||
|
|
||||||
lumpnum = W_CheckNumForName(newname);
|
lumpnum = W_CheckNumForName(newname);
|
||||||
|
|
||||||
@@ -2410,7 +2436,7 @@ static void P_RunLevelScript(const char *scriptname)
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
COM_BufInsertText(W_CacheLumpNum(lumpnum, PU_CACHE));
|
COM_BufInsertTextEx(W_CacheLumpNum(lumpnum, PU_CACHE), W_LumpLength(lumpnum));
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
@@ -2425,23 +2451,26 @@ static void P_ForceCharacter(const char *forcecharskin)
|
|||||||
if (netgame)
|
if (netgame)
|
||||||
{
|
{
|
||||||
char skincmd[33];
|
char skincmd[33];
|
||||||
|
|
||||||
if (splitscreen)
|
if (splitscreen)
|
||||||
{
|
{
|
||||||
sprintf(skincmd, "skin2 %s\n", forcecharskin);
|
snprintf(skincmd, sizeof(skincmd), "skin2 %s\n", forcecharskin);
|
||||||
CV_Set(&cv_skin2, forcecharskin);
|
CV_Set(&cv_skin2, forcecharskin);
|
||||||
|
|
||||||
if (splitscreen > 1)
|
if (splitscreen > 1)
|
||||||
{
|
{
|
||||||
sprintf(skincmd, "skin3 %s\n", forcecharskin);
|
snprintf(skincmd, sizeof(skincmd), "skin3 %s\n", forcecharskin);
|
||||||
CV_Set(&cv_skin3, forcecharskin);
|
CV_Set(&cv_skin3, forcecharskin);
|
||||||
|
|
||||||
if (splitscreen > 2)
|
if (splitscreen > 2)
|
||||||
{
|
{
|
||||||
sprintf(skincmd, "skin4 %s\n", forcecharskin);
|
snprintf(skincmd, sizeof(skincmd), "skin4 %s\n", forcecharskin);
|
||||||
CV_Set(&cv_skin4, forcecharskin);
|
CV_Set(&cv_skin4, forcecharskin);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
sprintf(skincmd, "skin %s\n", forcecharskin);
|
snprintf(skincmd, sizeof(skincmd), "skin %s\n", forcecharskin);
|
||||||
COM_BufAddText(skincmd);
|
COM_BufAddText(skincmd);
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
@@ -2498,7 +2527,7 @@ static void P_LoadRecordGhosts(void)
|
|||||||
|
|
||||||
const char *mapname = G_BuildMapName(gamemap);
|
const char *mapname = G_BuildMapName(gamemap);
|
||||||
|
|
||||||
sprintf(gpath,"%s"PATHSEP"replay"PATHSEP"%s"PATHSEP"%s", srb2home, timeattackfolder, mapname);
|
snprintf(gpath, glen, "%s"PATHSEP"replay"PATHSEP"%s"PATHSEP"%s", srb2home, timeattackfolder, mapname);
|
||||||
|
|
||||||
// Best Time ghost
|
// Best Time ghost
|
||||||
if (cv_ghost_besttime.value)
|
if (cv_ghost_besttime.value)
|
||||||
@@ -2854,7 +2883,8 @@ static void P_SetupPlayer(void)
|
|||||||
if (!demo.playback && multiplayer && D_NumPlayers())
|
if (!demo.playback && multiplayer && D_NumPlayers())
|
||||||
{
|
{
|
||||||
static char buf[256];
|
static char buf[256];
|
||||||
sprintf(buf, "replay"PATHSEP"online"PATHSEP"%d-%s", (int)(time(NULL)), G_BuildMapName(gamemap));
|
|
||||||
|
snprintf(buf, sizeof(buf), "replay"PATHSEP"online"PATHSEP"%d-%s", (int)(time(NULL)), G_BuildMapName(gamemap));
|
||||||
|
|
||||||
I_mkdir(va("%s"PATHSEP"replay", srb2home), 0755);
|
I_mkdir(va("%s"PATHSEP"replay", srb2home), 0755);
|
||||||
I_mkdir(va("%s"PATHSEP"replay"PATHSEP"online", srb2home), 0755);
|
I_mkdir(va("%s"PATHSEP"replay"PATHSEP"online", srb2home), 0755);
|
||||||
@@ -2956,7 +2986,6 @@ boolean P_SetupLevel(boolean fromnetsave, boolean reloadinggamestate)
|
|||||||
// 99% of the things already did, so.
|
// 99% of the things already did, so.
|
||||||
// Map header should always be in place at this point
|
// Map header should always be in place at this point
|
||||||
INT32 i;
|
INT32 i;
|
||||||
UINT8 levelfadecol;
|
|
||||||
boolean ranspecialwipe = false;
|
boolean ranspecialwipe = false;
|
||||||
lumpnum_t encoreLump = LUMPERROR;
|
lumpnum_t encoreLump = LUMPERROR;
|
||||||
const mapheader_t *mapheader = mapheaderinfo[gamemap - 1];
|
const mapheader_t *mapheader = mapheaderinfo[gamemap - 1];
|
||||||
@@ -3037,7 +3066,7 @@ boolean P_SetupLevel(boolean fromnetsave, boolean reloadinggamestate)
|
|||||||
// Don't include these in the fade!
|
// Don't include these in the fade!
|
||||||
char tx[64];
|
char tx[64];
|
||||||
V_DrawSmallString(1, 191, V_ALLOWLOWERCASE, M_GetText("Speeding off to..."));
|
V_DrawSmallString(1, 191, V_ALLOWLOWERCASE, M_GetText("Speeding off to..."));
|
||||||
snprintf(tx, 63, "%s%s%s",
|
snprintf(tx, sizeof(tx)-1, "%s%s%s",
|
||||||
mapheader->lvlttl,
|
mapheader->lvlttl,
|
||||||
(strlen(mapheader->zonttl) > 0) ? va(" %s",mapheader->zonttl) : // SRB2kart
|
(strlen(mapheader->zonttl) > 0) ? va(" %s",mapheader->zonttl) : // SRB2kart
|
||||||
((mapheader->levelflags & LF_NOZONE) ? "" : " Zone"),
|
((mapheader->levelflags & LF_NOZONE) ? "" : " Zone"),
|
||||||
@@ -3079,7 +3108,7 @@ boolean P_SetupLevel(boolean fromnetsave, boolean reloadinggamestate)
|
|||||||
// a shit ton of time loading mobj thinkers.
|
// a shit ton of time loading mobj thinkers.
|
||||||
CalculateDoomednumToMobjtype();
|
CalculateDoomednumToMobjtype();
|
||||||
|
|
||||||
P_SpawnMapThings();
|
P_SpawnMapThings(!fromnetsave);
|
||||||
|
|
||||||
P_SpawnEmblems(!fromnetsave);
|
P_SpawnEmblems(!fromnetsave);
|
||||||
|
|
||||||
|
|||||||
@@ -35,6 +35,7 @@ extern mapthing_t *deathmatchstarts[MAX_DM_STARTS];
|
|||||||
extern INT32 numdmstarts, numcoopstarts, numredctfstarts, numbluectfstarts;
|
extern INT32 numdmstarts, numcoopstarts, numredctfstarts, numbluectfstarts;
|
||||||
|
|
||||||
extern boolean levelloading;
|
extern boolean levelloading;
|
||||||
|
extern UINT8 levelfadecol;
|
||||||
|
|
||||||
extern lumpnum_t lastloadedmaplumpnum; // for comparative savegame
|
extern lumpnum_t lastloadedmaplumpnum; // for comparative savegame
|
||||||
extern virtres_t *curmapvirt;
|
extern virtres_t *curmapvirt;
|
||||||
|
|||||||
+21
-16
@@ -2161,7 +2161,7 @@ static void P_ProcessLineSpecial(line_t *line, mobj_t *mo, sector_t *callsec)
|
|||||||
newname[1] = 'C';
|
newname[1] = 'C';
|
||||||
newname[2] = 'R';
|
newname[2] = 'R';
|
||||||
|
|
||||||
scrnum = sides[line->sidenum[0]].textureoffset>>FRACBITS;
|
scrnum = sides[line->sidenum[0]].textureoffset >> FRACBITS;
|
||||||
if (scrnum < 0 || scrnum > 999)
|
if (scrnum < 0 || scrnum > 999)
|
||||||
{
|
{
|
||||||
scrnum = 0;
|
scrnum = 0;
|
||||||
@@ -2169,9 +2169,9 @@ static void P_ProcessLineSpecial(line_t *line, mobj_t *mo, sector_t *callsec)
|
|||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
newname[5] = (char)('0' + (char)((scrnum/100)));
|
newname[5] = (char)('0' + (char)((scrnum / 100)));
|
||||||
newname[6] = (char)('0' + (char)((scrnum%100)/10));
|
newname[6] = (char)('0' + (char)((scrnum % 100) / 10));
|
||||||
newname[7] = (char)('0' + (char)(scrnum%10));
|
newname[7] = (char)('0' + (char)(scrnum % 10));
|
||||||
}
|
}
|
||||||
newname[8] = '\0';
|
newname[8] = '\0';
|
||||||
|
|
||||||
@@ -2184,14 +2184,7 @@ static void P_ProcessLineSpecial(line_t *line, mobj_t *mo, sector_t *callsec)
|
|||||||
else
|
else
|
||||||
{
|
{
|
||||||
// W_CacheLumpNum may not have null terminator, so we need to do this :blobcatgooglyholditsheadinitshands:
|
// W_CacheLumpNum may not have null terminator, so we need to do this :blobcatgooglyholditsheadinitshands:
|
||||||
size_t len = W_LumpLength(lumpnum);
|
COM_BufInsertTextEx(W_CacheLumpNum(lumpnum, PU_CACHE), W_LumpLength(lumpnum));
|
||||||
char *script = Z_Malloc(len+1, PU_STATIC, NULL);
|
|
||||||
memcpy(script, W_CacheLumpNum(lumpnum, PU_CACHE), len);
|
|
||||||
script[len] = 0;
|
|
||||||
|
|
||||||
COM_BufInsertText(script);
|
|
||||||
|
|
||||||
Z_Free(script);
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
@@ -3880,7 +3873,7 @@ DoneSection2:
|
|||||||
|
|
||||||
player->kartstuff[k_lapanimation] = 80;
|
player->kartstuff[k_lapanimation] = 80;
|
||||||
|
|
||||||
if (UNLIKELY(player->pflags & PF_NIGHTSMODE))
|
if (nightsplayer(player))
|
||||||
player->drillmeter += 48*20;
|
player->drillmeter += 48*20;
|
||||||
|
|
||||||
if (netgame && player->laps >= (UINT8)cv_numlaps.value)
|
if (netgame && player->laps >= (UINT8)cv_numlaps.value)
|
||||||
@@ -4611,7 +4604,7 @@ void P_UpdateSpecials(void)
|
|||||||
// POINT LIMIT
|
// POINT LIMIT
|
||||||
P_CheckPointLimit();
|
P_CheckPointLimit();
|
||||||
|
|
||||||
#ifdef COMPAT_VANILLA
|
#ifndef PHOBOS_BUILD
|
||||||
// Dynamic slopeness
|
// Dynamic slopeness
|
||||||
// we run this here only when not joined midrace
|
// we run this here only when not joined midrace
|
||||||
// for vanilla compat reasons :chaosleep:
|
// for vanilla compat reasons :chaosleep:
|
||||||
@@ -5302,6 +5295,18 @@ static void P_RunLevelLoadExecutors(void)
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
static fixed_t P_GetSectorGravityFactor(sector_t *sec)
|
||||||
|
{
|
||||||
|
return FixedDiv(*sec->gravity >> FRACBITS, 1000);
|
||||||
|
}
|
||||||
|
|
||||||
|
fixed_t P_GetSectorGravity(sector_t *sec)
|
||||||
|
{
|
||||||
|
if (sec && sec->gravity)
|
||||||
|
return FixedMul(gravity, P_GetSectorGravityFactor(sec));
|
||||||
|
return gravity;
|
||||||
|
}
|
||||||
|
|
||||||
/** After the map has loaded, scans for specials that spawn 3Dfloors and
|
/** After the map has loaded, scans for specials that spawn 3Dfloors and
|
||||||
* thinkers.
|
* thinkers.
|
||||||
*
|
*
|
||||||
@@ -7126,7 +7131,7 @@ static inline boolean PIT_PushThing(mobj_t *thing)
|
|||||||
return false;
|
return false;
|
||||||
|
|
||||||
// Allow this to affect pushable objects at some point?
|
// Allow this to affect pushable objects at some point?
|
||||||
if (thing->player && (!(thing->flags & (MF_NOGRAVITY | MF_NOCLIP)) || UNLIKELY(thing->player->pflags & PF_NIGHTSMODE)))
|
if (thing->player && (!(thing->flags & (MF_NOGRAVITY | MF_NOCLIP)) || nightsplayer(thing->player)))
|
||||||
{
|
{
|
||||||
INT32 dist;
|
INT32 dist;
|
||||||
INT32 speed;
|
INT32 speed;
|
||||||
@@ -7156,7 +7161,7 @@ static inline boolean PIT_PushThing(mobj_t *thing)
|
|||||||
// Written with bits and pieces of P_HomingAttack
|
// Written with bits and pieces of P_HomingAttack
|
||||||
if ((speed > 0) && (P_CheckSight(thing, tmpusher->source)))
|
if ((speed > 0) && (P_CheckSight(thing, tmpusher->source)))
|
||||||
{
|
{
|
||||||
if (LIKELY(!(thing->player->pflags & PF_NIGHTSMODE)))
|
if (!nightsplayer(thing->player))
|
||||||
{
|
{
|
||||||
// only push wrt Z if health & 1 (mapthing has ambush flag)
|
// only push wrt Z if health & 1 (mapthing has ambush flag)
|
||||||
if (tmpusher->source->health & 1)
|
if (tmpusher->source->health & 1)
|
||||||
|
|||||||
@@ -56,6 +56,8 @@ sector_t *P_PlayerTouchingSectorSpecial(player_t *player, INT32 section, INT32 n
|
|||||||
void P_PlayerInSpecialSector(player_t *player);
|
void P_PlayerInSpecialSector(player_t *player);
|
||||||
void P_ProcessSpecialSector(player_t *player, sector_t *sector, sector_t *roversector);
|
void P_ProcessSpecialSector(player_t *player, sector_t *sector, sector_t *roversector);
|
||||||
|
|
||||||
|
fixed_t P_GetSectorGravity(sector_t *sec);
|
||||||
|
|
||||||
fixed_t P_FindLowestFloorSurrounding(sector_t *sec);
|
fixed_t P_FindLowestFloorSurrounding(sector_t *sec);
|
||||||
fixed_t P_FindHighestFloorSurrounding(sector_t *sec);
|
fixed_t P_FindHighestFloorSurrounding(sector_t *sec);
|
||||||
|
|
||||||
|
|||||||
+1
-1
@@ -651,7 +651,7 @@ void P_Ticker(boolean run)
|
|||||||
if (run)
|
if (run)
|
||||||
{
|
{
|
||||||
// Dynamic slopeness
|
// Dynamic slopeness
|
||||||
#ifdef COMPAT_VANILLA
|
#ifndef PHOBOS_BUILD
|
||||||
if (midgamejoin) // only run here if we joined midgame to fix some desynchs
|
if (midgamejoin) // only run here if we joined midgame to fix some desynchs
|
||||||
#endif
|
#endif
|
||||||
P_RunDynamicSlopes();
|
P_RunDynamicSlopes();
|
||||||
|
|||||||
+26
-18
@@ -74,7 +74,7 @@ void P_Thrust(mobj_t *mo, angle_t angle, fixed_t move)
|
|||||||
|
|
||||||
mo->momx += FixedMul(move, FINECOSINE(angle));
|
mo->momx += FixedMul(move, FINECOSINE(angle));
|
||||||
|
|
||||||
if (LIKELY(!(twodlevel || (mo->flags2 & MF2_TWOD))))
|
if (!twodmo(mo))
|
||||||
mo->momy += FixedMul(move, FINESINE(angle));
|
mo->momy += FixedMul(move, FINESINE(angle));
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -90,7 +90,7 @@ void P_InstaThrust(mobj_t *mo, angle_t angle, fixed_t move)
|
|||||||
|
|
||||||
mo->momx = FixedMul(move, FINECOSINE(angle));
|
mo->momx = FixedMul(move, FINECOSINE(angle));
|
||||||
|
|
||||||
if (LIKELY(!(twodlevel || (mo->flags2 & MF2_TWOD))))
|
if (!twodmo(mo))
|
||||||
mo->momy = FixedMul(move,FINESINE(angle));
|
mo->momy = FixedMul(move,FINESINE(angle));
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -475,7 +475,7 @@ void P_PlayLivesJingle(player_t *player)
|
|||||||
|
|
||||||
if (UNLIKELY(use1upSound))
|
if (UNLIKELY(use1upSound))
|
||||||
S_StartSound(NULL, sfx_oneup);
|
S_StartSound(NULL, sfx_oneup);
|
||||||
else if (UNLIKELY(mariomode))
|
else if (mariomode)
|
||||||
S_StartSound(NULL, sfx_marioa);
|
S_StartSound(NULL, sfx_marioa);
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
@@ -503,7 +503,7 @@ void P_PlayRinglossSound(mobj_t *source, mobj_t *damager)
|
|||||||
S_StartSound(NULL, sfx);
|
S_StartSound(NULL, sfx);
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
S_StartSound(source, UNLIKELY(mariomode) ? sfx_mario8 : sfx_khurt1 + key);
|
S_StartSound(source, mariomode ? sfx_mario8 : sfx_khurt1 + key);
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
S_StartSound(source, sfx_slip);
|
S_StartSound(source, sfx_slip);
|
||||||
@@ -625,15 +625,23 @@ boolean P_EndingMusic(player_t *player)
|
|||||||
}
|
}
|
||||||
|
|
||||||
if (G_RaceGametype() && bestlocalpos == MAXPLAYERS+1)
|
if (G_RaceGametype() && bestlocalpos == MAXPLAYERS+1)
|
||||||
sprintf(buffer, "k*fail"); // F-Zero death results theme
|
{
|
||||||
|
snprintf(buffer, sizeof(buffer), "k*fail"); // F-Zero death results theme
|
||||||
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
if (bestlocalpos == 1)
|
if (bestlocalpos == 1)
|
||||||
sprintf(buffer, "k*win");
|
{
|
||||||
|
snprintf(buffer, sizeof(buffer), "k*win");
|
||||||
|
}
|
||||||
else if (isPlayerLosing(bestlocalplayer))
|
else if (isPlayerLosing(bestlocalplayer))
|
||||||
sprintf(buffer, "k*lose");
|
{
|
||||||
|
snprintf(buffer, sizeof(buffer), "k*lose");
|
||||||
|
}
|
||||||
else
|
else
|
||||||
sprintf(buffer, "k*ok");
|
{
|
||||||
|
snprintf(buffer, sizeof(buffer), "k*ok");
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
S_SpeedMusic(1.0f);
|
S_SpeedMusic(1.0f);
|
||||||
@@ -1725,7 +1733,7 @@ static void P_DoBubbleBreath(player_t *player)
|
|||||||
else
|
else
|
||||||
zh = player->mo->z + FixedDiv(player->mo->height,5*(FRACUNIT/4));
|
zh = player->mo->z + FixedDiv(player->mo->height,5*(FRACUNIT/4));
|
||||||
|
|
||||||
if (!(player->mo->eflags & MFE_UNDERWATER) || player->spectator || ((player->powers[pw_shield] & SH_NOSTACK) == SH_ELEMENTAL && !(player->pflags & PF_NIGHTSMODE)))
|
if (!(player->mo->eflags & MFE_UNDERWATER) || player->spectator || ((player->powers[pw_shield] & SH_NOSTACK) == SH_ELEMENTAL && !nightsplayer(player)))
|
||||||
return;
|
return;
|
||||||
|
|
||||||
if (P_RandomChance(FRACUNIT/16))
|
if (P_RandomChance(FRACUNIT/16))
|
||||||
@@ -2298,7 +2306,7 @@ static void P_MovePlayer(player_t *player)
|
|||||||
P_3dMovement(player);
|
P_3dMovement(player);
|
||||||
}
|
}
|
||||||
|
|
||||||
if (UNLIKELY(maptol & TOL_2D)) // psure this doesent even work at all
|
if (twodlevel) // psure this doesent even work at all
|
||||||
runspd = FixedMul(runspd, 2*FRACUNIT/3);
|
runspd = FixedMul(runspd, 2*FRACUNIT/3);
|
||||||
|
|
||||||
/////////////////////////
|
/////////////////////////
|
||||||
@@ -2748,8 +2756,8 @@ boolean P_LookForEnemies(player_t *player)
|
|||||||
if (modist > FixedMul(RING_DIST, player->mo->scale))
|
if (modist > FixedMul(RING_DIST, player->mo->scale))
|
||||||
continue; // out of range
|
continue; // out of range
|
||||||
|
|
||||||
if (UNLIKELY((twodlevel || player->mo->flags2 & MF2_TWOD)
|
|
||||||
&& abs(player->mo->y-mo->y) > player->mo->radius))
|
if (twodmo(player->mo) && abs(player->mo->y-mo->y) > player->mo->radius)
|
||||||
continue; // not in your 2d plane
|
continue; // not in your 2d plane
|
||||||
|
|
||||||
if (closestmo && modist > P_AproxDistance(P_AproxDistance(player->mo->x-closestmo->x,
|
if (closestmo && modist > P_AproxDistance(P_AproxDistance(player->mo->x-closestmo->x,
|
||||||
@@ -3508,7 +3516,7 @@ static boolean P_CheckNoclipCameraPosition(player_t *player, camera_t *thiscam,
|
|||||||
boolean cameranoclip;
|
boolean cameranoclip;
|
||||||
mobj_t *mo = player->mo;
|
mobj_t *mo = player->mo;
|
||||||
|
|
||||||
cameranoclip = ((player->pflags & (PF_NOCLIP|PF_NIGHTSMODE))
|
cameranoclip = (nightsplayer(player)
|
||||||
|| (mo->flags & (MF_NOCLIP|MF_NOCLIPHEIGHT)) // Noclipping player camera noclips too!!
|
|| (mo->flags & (MF_NOCLIP|MF_NOCLIPHEIGHT)) // Noclipping player camera noclips too!!
|
||||||
|| (leveltime < introtime)); // Kart intro cam
|
|| (leveltime < introtime)); // Kart intro cam
|
||||||
|
|
||||||
@@ -4097,7 +4105,7 @@ boolean P_MoveChaseCamera(player_t *player, camera_t *thiscam, boolean resetcall
|
|||||||
angle -= (angle - thiscam->pitch)/2;
|
angle -= (angle - thiscam->pitch)/2;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (player->playerstate != PST_DEAD && LIKELY(!((player->pflags & PF_NIGHTSMODE) && player->exiting)))
|
if (player->playerstate != PST_DEAD && !(nightsplayer(player) && player->exiting))
|
||||||
angle += (focusaiming < ANGLE_180 ? focusaiming/2 : InvAngle(InvAngle(focusaiming)/2)); // overcomplicated version of '((signed)focusaiming)/2;'
|
angle += (focusaiming < ANGLE_180 ? focusaiming/2 : InvAngle(InvAngle(focusaiming)/2)); // overcomplicated version of '((signed)focusaiming)/2;'
|
||||||
|
|
||||||
if (!camstill && !timeover) // Keep the view still...
|
if (!camstill && !timeover) // Keep the view still...
|
||||||
@@ -4174,7 +4182,7 @@ boolean P_SpectatorJoinGame(player_t *player)
|
|||||||
// Team changing in Team Match and CTF
|
// Team changing in Team Match and CTF
|
||||||
// Pressing fire assigns you to a team that needs players if allowed.
|
// Pressing fire assigns you to a team that needs players if allowed.
|
||||||
// Partial code reproduction from p_tick.c autobalance code.
|
// Partial code reproduction from p_tick.c autobalance code.
|
||||||
else if (UNLIKELY(G_GametypeHasTeams()))
|
else if (G_GametypeHasTeams())
|
||||||
{
|
{
|
||||||
INT32 changeto = 0;
|
INT32 changeto = 0;
|
||||||
INT32 z, numplayersred = 0, numplayersblue = 0;
|
INT32 z, numplayersred = 0, numplayersblue = 0;
|
||||||
@@ -4871,7 +4879,7 @@ void P_PlayerThink(player_t *player)
|
|||||||
|
|
||||||
// Even if not NiGHTS, pull in nearby objects when walking around as John Q. Elliot.
|
// Even if not NiGHTS, pull in nearby objects when walking around as John Q. Elliot.
|
||||||
if (UNLIKELY(!objectplacing && !((netgame || multiplayer) && player->spectator)
|
if (UNLIKELY(!objectplacing && !((netgame || multiplayer) && player->spectator)
|
||||||
&& maptol & TOL_NIGHTS && (!(player->pflags & PF_NIGHTSMODE) || player->powers[pw_nights_helper])))
|
&& nightsmode && (!nightsplayer(player) || player->powers[pw_nights_helper])))
|
||||||
{
|
{
|
||||||
thinker_t *th;
|
thinker_t *th;
|
||||||
mobj_t *mo2;
|
mobj_t *mo2;
|
||||||
@@ -4973,7 +4981,7 @@ void P_PlayerThink(player_t *player)
|
|||||||
#endif
|
#endif
|
||||||
|
|
||||||
// check for use
|
// check for use
|
||||||
if (LIKELY(!(player->pflags & PF_NIGHTSMODE)))
|
if (!nightsplayer(player))
|
||||||
{
|
{
|
||||||
if (cmd->buttons & BT_BRAKE)
|
if (cmd->buttons & BT_BRAKE)
|
||||||
player->pflags |= PF_USEDOWN;
|
player->pflags |= PF_USEDOWN;
|
||||||
@@ -5164,7 +5172,7 @@ void P_PlayerAfterThink(player_t *player)
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if (UNLIKELY(player->pflags & PF_NIGHTSMODE))
|
if (nightsplayer(player))
|
||||||
{
|
{
|
||||||
player->powers[pw_gravityboots] = 0;
|
player->powers[pw_gravityboots] = 0;
|
||||||
}
|
}
|
||||||
|
|||||||
+1
-1
@@ -395,7 +395,7 @@ static void R_AddLine(seg_t *line)
|
|||||||
// Find the other side!
|
// Find the other side!
|
||||||
INT32 line2 = P_FindSpecialLineFromTag(PORTALSPECIAL, line->linedef->tag, -1);
|
INT32 line2 = P_FindSpecialLineFromTag(PORTALSPECIAL, line->linedef->tag, -1);
|
||||||
|
|
||||||
if (line->linedef == &lines[line2])
|
if (line2 >= 0 && line->linedef == &lines[line2])
|
||||||
line2 = P_FindSpecialLineFromTag(PORTALSPECIAL, line->linedef->tag, line2);
|
line2 = P_FindSpecialLineFromTag(PORTALSPECIAL, line->linedef->tag, line2);
|
||||||
|
|
||||||
if (line2 >= 0) // found it!
|
if (line2 >= 0) // found it!
|
||||||
|
|||||||
+40
-11
@@ -757,6 +757,45 @@ void R_UpdateMobjInterpolators(void)
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// reset banan and eggbox rollangle when they´re on the ground
|
||||||
|
// if not cv_bananthrowroll option "+Onground"
|
||||||
|
static void R_ResetBananaRollangle(mobj_t* mobj)
|
||||||
|
{
|
||||||
|
if (!mobj->rollangle)
|
||||||
|
return;
|
||||||
|
|
||||||
|
if (mobj->type != MT_BANANA && mobj->type != MT_EGGMANITEM) // always reset eggboxes
|
||||||
|
return;
|
||||||
|
|
||||||
|
// keep banans "rotated" if we want them to
|
||||||
|
if (mobj->type == MT_BANANA && cv_bananthrowroll.value == 2)
|
||||||
|
return;
|
||||||
|
|
||||||
|
// only reset if on ground
|
||||||
|
if (!P_IsObjectOnGround(mobj))
|
||||||
|
return;
|
||||||
|
|
||||||
|
mobj->rollangle = 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
// Reset our Sprite scales and offsets
|
||||||
|
// at the start of the tic
|
||||||
|
// this is just to make things simpler
|
||||||
|
// as we dont have to reset it ourselves after use
|
||||||
|
// done at the start so lua can still overwrite everything
|
||||||
|
static void R_ResetMobjSpriteStuff(mobj_t *mobj)
|
||||||
|
{
|
||||||
|
mobj->spritexscale = mobj->realxscale;
|
||||||
|
mobj->spriteyscale = mobj->realyscale;
|
||||||
|
mobj->spritexoffset = mobj->realxoffset;
|
||||||
|
mobj->spriteyoffset = mobj->realyoffset;
|
||||||
|
|
||||||
|
mobj->temprollangle = 0;
|
||||||
|
|
||||||
|
// kinda stupid but idk where else to put this
|
||||||
|
R_ResetBananaRollangle(mobj);
|
||||||
|
}
|
||||||
|
|
||||||
//
|
//
|
||||||
// P_ResetMobjInterpolationState
|
// P_ResetMobjInterpolationState
|
||||||
//
|
//
|
||||||
@@ -795,19 +834,9 @@ void R_ResetMobjInterpolationState(mobj_t *mobj)
|
|||||||
mobj->player->old_frameangle = mobj->player->frameangle;
|
mobj->player->old_frameangle = mobj->player->frameangle;
|
||||||
}
|
}
|
||||||
|
|
||||||
// Reset our Sprite scales and offsets
|
|
||||||
// at the start of the tic
|
|
||||||
// this is just to make things simpler
|
|
||||||
// as we dont have to reset it ourselves after use
|
|
||||||
// done at the start so lua can still overwrite everything
|
|
||||||
|
|
||||||
// technically not interpolation related
|
// technically not interpolation related
|
||||||
// but this saves us another thinkerloop and multiple checks lel
|
// but this saves us another thinkerloop and multiple checks lel
|
||||||
mobj->spritexscale = mobj->realxscale;
|
R_ResetMobjSpriteStuff(mobj);
|
||||||
mobj->spriteyscale = mobj->realyscale;
|
|
||||||
mobj->spritexoffset = mobj->realxoffset;
|
|
||||||
mobj->spriteyoffset = mobj->realyoffset;
|
|
||||||
mobj->temprollangle = 0;
|
|
||||||
|
|
||||||
mobj->resetinterp = false;
|
mobj->resetinterp = false;
|
||||||
}
|
}
|
||||||
|
|||||||
+21
-4
@@ -411,7 +411,7 @@ angle_t R_PlayerSliptideAngle(player_t *player)
|
|||||||
if (!sprframe)
|
if (!sprframe)
|
||||||
return 0;
|
return 0;
|
||||||
|
|
||||||
if (sprframe->rotate != SRF_SINGLE || (mo->frame & FF_PAPERSPRITE))
|
if (sprframe->rotate != SRF_SINGLE || R_ThingIsPaperSprite(mo))
|
||||||
ang = R_PointToAngle(mo->x, mo->y) - mo->angle;
|
ang = R_PointToAngle(mo->x, mo->y) - mo->angle;
|
||||||
|
|
||||||
return FixedMul(FINECOSINE((ang) >> ANGLETOFINESHIFT), mo->player->sliproll * mo->player->kartstuff[k_aizdriftstrat]);
|
return FixedMul(FINECOSINE((ang) >> ANGLETOFINESHIFT), mo->player->sliproll * mo->player->kartstuff[k_aizdriftstrat]);
|
||||||
@@ -1389,6 +1389,21 @@ void R_RenderPlayerView(player_t *player)
|
|||||||
maskcount_t* masks = static_cast<maskcount_t*>(malloc(sizeof(maskcount_t)));
|
maskcount_t* masks = static_cast<maskcount_t*>(malloc(sizeof(maskcount_t)));
|
||||||
const boolean skybox = (skyboxmo[0] && cv_skybox.value);
|
const boolean skybox = (skyboxmo[0] && cv_skybox.value);
|
||||||
|
|
||||||
|
// Only do it if it's the first screen being rendered
|
||||||
|
if (cv_homremoval.value && viewssnum == 0)
|
||||||
|
{
|
||||||
|
if (cv_homremoval.value == 1)
|
||||||
|
{
|
||||||
|
// Clear the software screen buffer to remove HOM
|
||||||
|
memset(vid.screens[0], 31, vid.width * vid.height);
|
||||||
|
}
|
||||||
|
else if (cv_homremoval.value == 2)
|
||||||
|
{
|
||||||
|
//'development' HOM removal -- makes it blindingly obvious if HOM is spotted.
|
||||||
|
memset(vid.screens[0], 32+(timeinmap&15), vid.width * vid.height);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
// load previous saved value of skyVisible for the player
|
// load previous saved value of skyVisible for the player
|
||||||
skyVisible = skyVisiblePerPlayer[viewssnum];
|
skyVisible = skyVisiblePerPlayer[viewssnum];
|
||||||
|
|
||||||
@@ -1455,10 +1470,12 @@ void R_RenderPlayerView(player_t *player)
|
|||||||
NetUpdate();
|
NetUpdate();
|
||||||
|
|
||||||
R_SetColumnContext(COLUMNCONTEXT_FLUSH);
|
R_SetColumnContext(COLUMNCONTEXT_FLUSH);
|
||||||
|
|
||||||
ps_numbspcalls.value.i = ps_numpolyobjects.value.i = ps_numdrawnodes.value.i = 0;
|
ps_numbspcalls.value.i = ps_numpolyobjects.value.i = ps_numdrawnodes.value.i = 0;
|
||||||
PS_START_TIMING(ps_bsptime);
|
PS_START_TIMING(ps_bsptime);
|
||||||
R_RenderViewpoint(&masks[nummasks - 1], true);
|
R_RenderViewpoint(&masks[nummasks - 1], true);
|
||||||
PS_STOP_TIMING(ps_bsptime);
|
PS_STOP_TIMING(ps_bsptime);
|
||||||
|
|
||||||
PS_START_TIMING(ps_sw_spritecliptime);
|
PS_START_TIMING(ps_sw_spritecliptime);
|
||||||
R_ClipSprites(drawsegs, NULL);
|
R_ClipSprites(drawsegs, NULL);
|
||||||
PS_STOP_TIMING(ps_sw_spritecliptime);
|
PS_STOP_TIMING(ps_sw_spritecliptime);
|
||||||
@@ -1466,8 +1483,8 @@ void R_RenderPlayerView(player_t *player)
|
|||||||
|
|
||||||
ps_numsprites.value.i = numvisiblesprites;
|
ps_numsprites.value.i = numvisiblesprites;
|
||||||
|
|
||||||
PS_START_TIMING(ps_sw_portaltime);
|
|
||||||
// Portal rendering. Hijacks the BSP traversal.
|
// Portal rendering. Hijacks the BSP traversal.
|
||||||
|
PS_START_TIMING(ps_sw_portaltime);
|
||||||
if (portal_base)
|
if (portal_base)
|
||||||
{
|
{
|
||||||
portal_t *portal;
|
portal_t *portal;
|
||||||
@@ -1508,8 +1525,7 @@ void R_RenderPlayerView(player_t *player)
|
|||||||
|
|
||||||
R_SetColumnContext(COLUMNCONTEXT_DIRECT);
|
R_SetColumnContext(COLUMNCONTEXT_DIRECT);
|
||||||
PS_START_TIMING(ps_sw_planetime);
|
PS_START_TIMING(ps_sw_planetime);
|
||||||
if (!skybox)
|
R_DrawSkyPlanes();
|
||||||
R_DrawSkyPlanes();
|
|
||||||
R_DrawPlanes();
|
R_DrawPlanes();
|
||||||
PS_STOP_TIMING(ps_sw_planetime);
|
PS_STOP_TIMING(ps_sw_planetime);
|
||||||
// draw mid texture and sprite
|
// draw mid texture and sprite
|
||||||
@@ -1517,6 +1533,7 @@ void R_RenderPlayerView(player_t *player)
|
|||||||
PS_START_TIMING(ps_sw_maskedtime);
|
PS_START_TIMING(ps_sw_maskedtime);
|
||||||
R_DrawMasked(masks, nummasks);
|
R_DrawMasked(masks, nummasks);
|
||||||
PS_STOP_TIMING(ps_sw_maskedtime);
|
PS_STOP_TIMING(ps_sw_maskedtime);
|
||||||
|
|
||||||
free(masks);
|
free(masks);
|
||||||
|
|
||||||
// Check for new console commands.
|
// Check for new console commands.
|
||||||
|
|||||||
+5
-2
@@ -272,7 +272,7 @@ static boolean TrimVisplaneBounds(const visplane_t* plane, INT16* start, INT16*
|
|||||||
* Applies the necessary offsets and rotation to give
|
* Applies the necessary offsets and rotation to give
|
||||||
* a depth illusion to the skybox.
|
* a depth illusion to the skybox.
|
||||||
*/
|
*/
|
||||||
void Portal_AddSkybox(const visplane_t* plane)
|
static void Portal_AddSkybox(const visplane_t* plane)
|
||||||
{
|
{
|
||||||
INT16 start, end;
|
INT16 start, end;
|
||||||
mapheader_t *mh;
|
mapheader_t *mh;
|
||||||
@@ -333,10 +333,13 @@ void Portal_AddSkyboxPortals(void)
|
|||||||
INT32 i;
|
INT32 i;
|
||||||
UINT16 count = 0;
|
UINT16 count = 0;
|
||||||
|
|
||||||
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)
|
||||||
{
|
{
|
||||||
|
if (pl->minx >= pl->maxx)
|
||||||
|
continue;
|
||||||
|
|
||||||
if (pl->picnum == skyflatnum)
|
if (pl->picnum == skyflatnum)
|
||||||
{
|
{
|
||||||
Portal_AddSkybox(pl);
|
Portal_AddSkybox(pl);
|
||||||
|
|||||||
@@ -58,7 +58,6 @@ void Portal_Add2Lines (const INT32 line1, const INT32 line2, const INT32 x1, con
|
|||||||
|
|
||||||
void Portal_ClipApply (const portal_t* portal);
|
void Portal_ClipApply (const portal_t* portal);
|
||||||
|
|
||||||
void Portal_AddSkybox(const visplane_t* plane);
|
|
||||||
void Portal_AddSkyboxPortals(void);
|
void Portal_AddSkyboxPortals(void);
|
||||||
|
|
||||||
#ifdef __cplusplus
|
#ifdef __cplusplus
|
||||||
|
|||||||
+72
-58
@@ -713,16 +713,11 @@ void R_RenderThickSideRange(drawseg_t *drawseg, INT32 x1, INT32 x2, ffloor_t *pf
|
|||||||
rw_scalestep = drawseg->scalestep;
|
rw_scalestep = drawseg->scalestep;
|
||||||
spryscale = drawseg->scale1 + (x1 - drawseg->x1)*rw_scalestep;
|
spryscale = drawseg->scale1 + (x1 - drawseg->x1)*rw_scalestep;
|
||||||
|
|
||||||
#define CLAMPMAX INT32_MAX
|
|
||||||
#define CLAMPMIN (-INT32_MAX) // This is not INT32_MIN on purpose! INT32_MIN makes the drawers freak out.
|
|
||||||
auto overflow_clamp = [&](INT64 overflow_test)
|
auto overflow_clamp = [&](INT64 overflow_test)
|
||||||
{
|
{
|
||||||
return (overflow_test > (INT64)CLAMPMAX) ? CLAMPMAX :
|
// This is not INT32_MIN on purpose! INT32_MIN makes the drawers freak out.
|
||||||
(overflow_test > (INT64)CLAMPMIN) ? (fixed_t)overflow_test :
|
return (fixed_t)std::clamp<INT64>(overflow_test, (-INT32_MAX), INT32_MAX);
|
||||||
CLAMPMIN;
|
|
||||||
};
|
};
|
||||||
#undef CLAMPMAX
|
|
||||||
#undef CLAMPMIN
|
|
||||||
|
|
||||||
dc->numlights = 0;
|
dc->numlights = 0;
|
||||||
if (frontsector->numlights)
|
if (frontsector->numlights)
|
||||||
@@ -1887,7 +1882,7 @@ void R_StoreWallRange(INT32 start, INT32 stop)
|
|||||||
|
|
||||||
// big room fix
|
// big room fix
|
||||||
if (longboi)
|
if (longboi)
|
||||||
rw_distance = (fixed_t)R_CalcSegDist(curline,viewx,viewy);
|
rw_distance = (fixed_t)R_CalcSegDist(curline, viewx, viewy);
|
||||||
|
|
||||||
ds_p->x1 = rw_x = start;
|
ds_p->x1 = rw_x = start;
|
||||||
ds_p->x2 = stop;
|
ds_p->x2 = stop;
|
||||||
@@ -2604,71 +2599,91 @@ void R_StoreWallRange(INT32 start, INT32 stop)
|
|||||||
if (linedef->special == HORIZONSPECIAL) // HORIZON LINES
|
if (linedef->special == HORIZONSPECIAL) // HORIZON LINES
|
||||||
{
|
{
|
||||||
topstep = bottomstep = 0;
|
topstep = bottomstep = 0;
|
||||||
topfrac = bottomfrac = (centeryfrac>>4);
|
topfrac = bottomfrac = (centeryfrac >> 4);
|
||||||
topfrac++; // Prevent 1px HOM
|
topfrac++; // Prevent 1px HOM
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
|
topstep = -FixedMul(rw_scalestep, worldtop);
|
||||||
|
topfrac = (centeryfrac >> 4) - FixedMul(worldtop, rw_scale);
|
||||||
|
|
||||||
// for anyone that sees this
|
// for anyone that sees this
|
||||||
// dont.
|
// dont.
|
||||||
// this is absolute shit-tier hacks
|
// this is absolute shit-tier hacks
|
||||||
// but i just cant determine this in any sane way
|
// but i just cant determine this in any sane way
|
||||||
// but this checks a shitton of things to make software handle skies better
|
// but this checks a shitton of things to make software handle skies better
|
||||||
|
|
||||||
auto set_topstep_normal = [&]
|
|
||||||
{
|
|
||||||
topstep = -FixedMul(rw_scalestep, worldtop);
|
|
||||||
topfrac = (centeryfrac>>4) - FixedMul(worldtop, rw_scale);
|
|
||||||
};
|
|
||||||
|
|
||||||
// untextured seg
|
// untextured seg
|
||||||
if (!segtextured && !curline->polyseg)
|
if (!segtextured && !curline->polyseg) // not for polyobjects.....
|
||||||
{
|
{
|
||||||
const bool tophigh = (worldhigh <= worldtop && worldhighslope <= worldtopslope);
|
const boolean nofrontsky = (frontsector->floorpic != skyflatnum && frontsector->ceilingpic != skyflatnum);
|
||||||
|
const boolean inskybox = (skyboxmo[0] && cv_skybox.value && newview->sky); // dont mess with skyVisible within skybox rendering!
|
||||||
|
|
||||||
// if we cant see the goddamn skyplane, well there wont be any skybox
|
// single sided line
|
||||||
// we could kill skyVisible instead, but i want to keep the performance improvements it yields
|
if (!backsector)
|
||||||
// so we do this absolute trash
|
|
||||||
if ((tophigh
|
|
||||||
&& (frontsector->floorpic != skyflatnum && frontsector->ceilingpic != skyflatnum)) // try to guess if its a "window"
|
|
||||||
&& ((!backsector) // single sided
|
|
||||||
|| ((backsector && (worldhigh != worldtop || worldhighslope != worldtopslope))
|
|
||||||
&& (backsector->floorheight >= frontsector->ceilingheight || backsector->ceilingheight <= frontsector->floorheight)))) // check if there is a "thok" sector behind it
|
|
||||||
skyVisible = true;
|
|
||||||
|
|
||||||
// this is an attempt to fix issues with textureless single sided lines drawing nothing where they should just draw sky instead
|
|
||||||
if (tophigh && !backsector && frontsector->ceilingpic == skyflatnum)
|
|
||||||
{
|
{
|
||||||
// account for slopes to try and get rid of sharp edges from the black void
|
// this is an attempt to fix issues with textureless single sided lines drawing nothing where they should just draw sky instead
|
||||||
if (frontsector->f_slope || (backsector && backsector->f_slope))
|
|
||||||
|
// there is a sky flat on the ceiling
|
||||||
|
// so we can assume this is supposed to draw the sky
|
||||||
|
if (frontsector->ceilingpic == skyflatnum)
|
||||||
{
|
{
|
||||||
topstep = -FixedMul(rw_scalestep, worldbottomslope);
|
// just draw sky from top to bottom!
|
||||||
topfrac = (centeryfrac>>4) - FixedMul(worldbottomslope, rw_scale);
|
if (frontsector->f_slope)
|
||||||
|
{
|
||||||
|
topstep = -FixedMul(rw_scalestep, worldbottomslope);
|
||||||
|
topfrac = (centeryfrac >> 4) - FixedMul(worldbottomslope, rw_scale);
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
topstep = -FixedMul(rw_scalestep, worldbottom);
|
||||||
|
topfrac = (centeryfrac >> 4) - FixedMul(worldbottom, rw_scale);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
else
|
else if (nofrontsky && !inskybox)
|
||||||
{
|
{
|
||||||
topstep = -FixedMul(rw_scalestep, worldbottom);
|
// completely empty wall without sky flats, just assume skybox is visible then
|
||||||
topfrac = (centeryfrac>>4) - FixedMul(worldbottom, rw_scale);
|
skyVisible = true;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
else
|
else if (nofrontsky && !inskybox) // if there was a skyflat, drawplane would already set skyvisible
|
||||||
set_topstep_normal();
|
{
|
||||||
|
// "thok walls" are double sided
|
||||||
|
// so we need to check a few things here
|
||||||
|
// to be rather conservative
|
||||||
|
// as skyrendering is pretty costly!
|
||||||
|
|
||||||
|
// ideally we´d just dont care and always draw the skytexture
|
||||||
|
// or skybox at any time, like gl does
|
||||||
|
// wonder if there would be a fast way to draw atleast just the texture?
|
||||||
|
|
||||||
|
// gotta shift those here for proper comparisons
|
||||||
|
const INT32 whigh = worldhigh >> 4;
|
||||||
|
const INT32 whslope = worldhighslope >> 4;
|
||||||
|
|
||||||
|
// check if there is a window to force skybox to draw
|
||||||
|
if ((whigh <= worldtop && whslope <= worldtopslope) && (backsector->ceilingpic == skyflatnum)) // backsector has a skyflat?
|
||||||
|
skyVisible = true;
|
||||||
|
// otherwise check for thokwalls
|
||||||
|
else if ((whigh != worldtop || whslope != worldtopslope) && // FIXME: i forgor what this was for lol
|
||||||
|
(backsector->floorheight >= frontsector->ceilingheight || // thok walls usually are set up like that...
|
||||||
|
frontsector->floorheight >= backsector->ceilingheight)) // floor higher than the other sides ceiling
|
||||||
|
skyVisible = true;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
else
|
|
||||||
set_topstep_normal();
|
|
||||||
|
|
||||||
bottomstep = -FixedMul(rw_scalestep, worldbottom);
|
bottomstep = -FixedMul(rw_scalestep, worldbottom);
|
||||||
bottomfrac = (centeryfrac>>4) - FixedMul(worldbottom, rw_scale);
|
bottomfrac = (centeryfrac >> 4) - FixedMul(worldbottom, rw_scale);
|
||||||
|
|
||||||
if (frontsector->c_slope)
|
if (frontsector->c_slope)
|
||||||
{
|
{
|
||||||
fixed_t topfracend = (centeryfrac>>4) - FixedMul(worldtopslope, ds_p->scale2);
|
fixed_t topfracend = (centeryfrac >> 4) - FixedMul(worldtopslope, ds_p->scale2);
|
||||||
topstep = (topfracend-topfrac)/(range);
|
topstep = (topfracend-topfrac)/(range);
|
||||||
}
|
}
|
||||||
|
|
||||||
if (frontsector->f_slope)
|
if (frontsector->f_slope)
|
||||||
{
|
{
|
||||||
fixed_t bottomfracend = (centeryfrac>>4) - FixedMul(worldbottomslope, ds_p->scale2);
|
fixed_t bottomfracend = (centeryfrac >> 4) - FixedMul(worldbottomslope, ds_p->scale2);
|
||||||
bottomstep = (bottomfracend-bottomfrac)/(range);
|
bottomstep = (bottomfracend-bottomfrac)/(range);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -2706,12 +2721,13 @@ void R_StoreWallRange(INT32 start, INT32 stop)
|
|||||||
if (leftheight < worldbottom && rightheight < worldbottomslope)
|
if (leftheight < worldbottom && rightheight < worldbottomslope)
|
||||||
continue;
|
continue;
|
||||||
|
|
||||||
if (leftheight > worldtop && rightheight > worldtopslope && i+1 < dc.numlights && frontsector->lightlist[i+1].height > frontsector->ceilingheight)
|
if ((leftheight > worldtop) && (rightheight > worldtopslope) &&
|
||||||
|
(i+1 < dc.numlights) && (frontsector->lightlist[i+1].height > frontsector->ceilingheight))
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
|
|
||||||
rlight->height = (centeryfrac>>4) - FixedMul(leftheight, rw_scale);
|
rlight->height = (centeryfrac >> 4) - FixedMul(leftheight, rw_scale);
|
||||||
rlight->heightstep = (centeryfrac>>4) - FixedMul(rightheight, ds_p->scale2);
|
rlight->heightstep = (centeryfrac >> 4) - FixedMul(rightheight, ds_p->scale2);
|
||||||
rlight->heightstep = (rlight->heightstep-rlight->height)/(range);
|
rlight->heightstep = (rlight->heightstep-rlight->height)/(range);
|
||||||
rlight->flags = static_cast<ffloortype_e>(light->flags);
|
rlight->flags = static_cast<ffloortype_e>(light->flags);
|
||||||
|
|
||||||
@@ -2730,10 +2746,9 @@ void R_StoreWallRange(INT32 start, INT32 stop)
|
|||||||
leftheight >>= 4;
|
leftheight >>= 4;
|
||||||
rightheight >>= 4;
|
rightheight >>= 4;
|
||||||
|
|
||||||
rlight->botheight = (centeryfrac>>4) - FixedMul(leftheight, rw_scale);
|
rlight->botheight = (centeryfrac >> 4) - FixedMul(leftheight, rw_scale);
|
||||||
rlight->botheightstep = (centeryfrac>>4) - FixedMul(rightheight, ds_p->scale2);
|
rlight->botheightstep = (centeryfrac >> 4) - FixedMul(rightheight, ds_p->scale2);
|
||||||
rlight->botheightstep = (rlight->botheightstep-rlight->botheight)/(range);
|
rlight->botheightstep = (rlight->botheightstep-rlight->botheight)/(range);
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
rlight->lightlevel = *light->lightlevel;
|
rlight->lightlevel = *light->lightlevel;
|
||||||
@@ -2754,13 +2769,14 @@ void R_StoreWallRange(INT32 start, INT32 stop)
|
|||||||
if (linedef->special == HORIZONSPECIAL) // Horizon lines extend FOFs in contact with them too.
|
if (linedef->special == HORIZONSPECIAL) // Horizon lines extend FOFs in contact with them too.
|
||||||
{
|
{
|
||||||
visffloor[i].f_step = 0;
|
visffloor[i].f_step = 0;
|
||||||
visffloor[i].f_frac = (centeryfrac>>4);
|
visffloor[i].f_frac = (centeryfrac >> 4);
|
||||||
topfrac++; // Prevent 1px HOM
|
topfrac++; // Prevent 1px HOM
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
visffloor[i].f_frac = (centeryfrac>>4) - FixedMul(visffloor[i].f_pos, rw_scale);
|
visffloor[i].f_frac = (centeryfrac >> 4) - FixedMul(visffloor[i].f_pos, rw_scale);
|
||||||
visffloor[i].f_step = ((centeryfrac>>4) - FixedMul(visffloor[i].f_pos_slope, ds_p->scale2) - visffloor[i].f_frac)/(range);
|
visffloor[i].f_step = (centeryfrac >> 4) - FixedMul(visffloor[i].f_pos_slope, ds_p->scale2);
|
||||||
|
visffloor[i].f_step = (visffloor[i].f_step - visffloor[i].f_frac)/(range);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -2774,9 +2790,8 @@ void R_StoreWallRange(INT32 start, INT32 stop)
|
|||||||
|
|
||||||
if (toptexture)
|
if (toptexture)
|
||||||
{
|
{
|
||||||
fixed_t topfracend = (centeryfrac>>4) - FixedMul(worldhighslope, ds_p->scale2);
|
fixed_t topfracend = (centeryfrac >> 4) - FixedMul(worldhighslope, ds_p->scale2);
|
||||||
|
pixhigh = (centeryfrac >> 4) - FixedMul(worldhigh, rw_scale);
|
||||||
pixhigh = (centeryfrac>>4) - FixedMul (worldhigh, rw_scale);
|
|
||||||
pixhighstep = (topfracend-pixhigh)/(range);
|
pixhighstep = (topfracend-pixhigh)/(range);
|
||||||
|
|
||||||
// If the lowest part of a ceiling stretching down covers the entire screen
|
// If the lowest part of a ceiling stretching down covers the entire screen
|
||||||
@@ -2786,9 +2801,8 @@ void R_StoreWallRange(INT32 start, INT32 stop)
|
|||||||
|
|
||||||
if (bottomtexture)
|
if (bottomtexture)
|
||||||
{
|
{
|
||||||
fixed_t bottomfracend = (centeryfrac>>4) - FixedMul(worldlowslope, ds_p->scale2);
|
fixed_t bottomfracend = (centeryfrac >> 4) - FixedMul(worldlowslope, ds_p->scale2);
|
||||||
|
pixlow = (centeryfrac >> 4) - FixedMul(worldlow, rw_scale);
|
||||||
pixlow = (centeryfrac>>4) - FixedMul (worldlow, rw_scale);
|
|
||||||
pixlowstep = (bottomfracend-pixlow)/(range);
|
pixlowstep = (bottomfracend-pixlow)/(range);
|
||||||
|
|
||||||
// If the highest part of a floor stretching up covers the entire screen
|
// If the highest part of a floor stretching up covers the entire screen
|
||||||
|
|||||||
+6
-7
@@ -42,8 +42,8 @@ INT32 numallskins = 0;
|
|||||||
INT32 numlocalskins = 0;
|
INT32 numlocalskins = 0;
|
||||||
skin_t skins[MAXSKINS];
|
skin_t skins[MAXSKINS];
|
||||||
|
|
||||||
UINT8 skinstats[9][9][MAXSKINS];
|
skinnum_t skinstats[9][9][MAXSKINS];
|
||||||
UINT8 skinstatscount[9][9] = {
|
skinnum_t skinstatscount[9][9] = {
|
||||||
{0, 0, 0, 0, 0, 0, 0, 0, 0},
|
{0, 0, 0, 0, 0, 0, 0, 0, 0},
|
||||||
{0, 0, 0, 0, 0, 0, 0, 0, 0},
|
{0, 0, 0, 0, 0, 0, 0, 0, 0},
|
||||||
{0, 0, 0, 0, 0, 0, 0, 0, 0},
|
{0, 0, 0, 0, 0, 0, 0, 0, 0},
|
||||||
@@ -55,7 +55,7 @@ UINT8 skinstatscount[9][9] = {
|
|||||||
{0, 0, 0, 0, 0, 0, 0, 0, 0}
|
{0, 0, 0, 0, 0, 0, 0, 0, 0}
|
||||||
};
|
};
|
||||||
|
|
||||||
UINT8 skinsorted[MAXSKINS] = {};
|
skinnum_t skinsorted[MAXSKINS] = {};
|
||||||
skin_t localskins[MAXLOCALSKINS] = {};
|
skin_t localskins[MAXLOCALSKINS] = {};
|
||||||
skin_t allskins[MAXSKINS+MAXLOCALSKINS] = {};
|
skin_t allskins[MAXSKINS+MAXLOCALSKINS] = {};
|
||||||
|
|
||||||
@@ -398,8 +398,8 @@ static UINT16 W_CheckForSkinMarkerInPwad(UINT16 wadid, UINT16 startlump)
|
|||||||
static int skinSortFunc(const void *a, const void *b) // tbh i have no clue what the naming conventions for local functions are
|
static int skinSortFunc(const void *a, const void *b) // tbh i have no clue what the naming conventions for local functions are
|
||||||
{
|
{
|
||||||
int diff = 0;
|
int diff = 0;
|
||||||
const UINT8 val_a = *(const UINT8 *)a;
|
const skinnum_t val_a = *(const skinnum_t *)a;
|
||||||
const UINT8 val_b = *(const UINT8 *)b;
|
const skinnum_t val_b = *(const skinnum_t *)b;
|
||||||
const skin_t *in1 = &skins[val_a];
|
const skin_t *in1 = &skins[val_a];
|
||||||
const skin_t *in2 = &skins[val_b];
|
const skin_t *in2 = &skins[val_b];
|
||||||
|
|
||||||
@@ -474,7 +474,7 @@ static int skinSortFunc(const void *a, const void *b) // tbh i have no clue what
|
|||||||
void sortSkinGrid(void)
|
void sortSkinGrid(void)
|
||||||
{
|
{
|
||||||
//CONS_Printf("Sorting skin list (%d)...\n", cv_skinselectgridsort.value);
|
//CONS_Printf("Sorting skin list (%d)...\n", cv_skinselectgridsort.value);
|
||||||
qs22j(skinsorted, numskins, sizeof(UINT8), skinSortFunc);
|
qs22j(skinsorted, numskins, sizeof(skinnum_t), skinSortFunc);
|
||||||
}
|
}
|
||||||
|
|
||||||
//
|
//
|
||||||
@@ -817,7 +817,6 @@ void R_AddSkins(UINT16 wadnum, boolean local)
|
|||||||
}
|
}
|
||||||
|
|
||||||
#undef lnumskins
|
#undef lnumskins
|
||||||
//sortSkinGrid();
|
|
||||||
|
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
+3
-3
@@ -71,9 +71,9 @@ extern INT32 numskins;
|
|||||||
extern INT32 numlocalskins;
|
extern INT32 numlocalskins;
|
||||||
extern INT32 numallskins;
|
extern INT32 numallskins;
|
||||||
extern skin_t skins[MAXSKINS];
|
extern skin_t skins[MAXSKINS];
|
||||||
extern UINT8 skinstats[9][9][MAXSKINS];
|
extern skinnum_t skinstats[9][9][MAXSKINS];
|
||||||
extern UINT8 skinstatscount[9][9];
|
extern skinnum_t skinstatscount[9][9];
|
||||||
extern UINT8 skinsorted[MAXSKINS];
|
extern skinnum_t skinsorted[MAXSKINS];
|
||||||
|
|
||||||
extern skin_t localskins[MAXLOCALSKINS];
|
extern skin_t localskins[MAXLOCALSKINS];
|
||||||
extern skin_t allskins[MAXSKINS+MAXLOCALSKINS];
|
extern skin_t allskins[MAXSKINS+MAXLOCALSKINS];
|
||||||
|
|||||||
+1
-1
@@ -90,7 +90,7 @@ extern side_t *sides;
|
|||||||
extern fixed_t viewx, viewy, viewz;
|
extern fixed_t viewx, viewy, viewz;
|
||||||
extern angle_t viewangle, aimingangle, viewroll;
|
extern angle_t viewangle, aimingangle, viewroll;
|
||||||
extern UINT8 viewssnum; // splitscreen view number
|
extern UINT8 viewssnum; // splitscreen view number
|
||||||
extern boolean viewsky, skyVisible;
|
extern boolean skyVisible;
|
||||||
extern boolean skyVisiblePerPlayer[MAXSPLITSCREENPLAYERS]; // saved values of skyVisible of each splitscreen player
|
extern boolean skyVisiblePerPlayer[MAXSPLITSCREENPLAYERS]; // saved values of skyVisible of each splitscreen player
|
||||||
extern sector_t *viewsector;
|
extern sector_t *viewsector;
|
||||||
extern player_t *viewplayer;
|
extern player_t *viewplayer;
|
||||||
|
|||||||
+86
-57
@@ -87,6 +87,8 @@ static drawseg_xrange_item_t *drawsegs_xrange;
|
|||||||
static size_t drawsegs_xrange_size = 0;
|
static size_t drawsegs_xrange_size = 0;
|
||||||
static INT32 drawsegs_xrange_count = 0;
|
static INT32 drawsegs_xrange_count = 0;
|
||||||
|
|
||||||
|
#define CLIP_UNDEF -2
|
||||||
|
|
||||||
//
|
//
|
||||||
// Sprite rotation 0 is facing the viewer,
|
// Sprite rotation 0 is facing the viewer,
|
||||||
// rotation 1 is one angle turn CLOCKWISE around the axis.
|
// rotation 1 is one angle turn CLOCKWISE around the axis.
|
||||||
@@ -1241,9 +1243,9 @@ static void R_ProjectSprite(mobj_t *thing)
|
|||||||
return;
|
return;
|
||||||
|
|
||||||
const boolean mirrored = thing->mirrored;
|
const boolean mirrored = thing->mirrored;
|
||||||
const boolean vflip = (thing->eflags & MFE_VERTICALFLIP);
|
const boolean vflip = R_ThingVerticallyFlipped(thing);
|
||||||
const boolean hflip = (!(thing->frame & FF_HORIZONTALFLIP) != !mirrored);
|
const boolean hflip = (!R_ThingHorizontallyFlipped(thing) != !mirrored);
|
||||||
const boolean papersprite = (thing->frame & FF_PAPERSPRITE);
|
const boolean papersprite = R_ThingIsPaperSprite(thing);
|
||||||
|
|
||||||
// transform the origin point
|
// transform the origin point
|
||||||
tr_x = interp.x - viewx;
|
tr_x = interp.x - viewx;
|
||||||
@@ -2221,6 +2223,7 @@ static void R_SortVisSprites(vissprite_t* vsprsortedhead, UINT32 start, UINT32 e
|
|||||||
best = ds;
|
best = ds;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if (best)
|
if (best)
|
||||||
{
|
{
|
||||||
best->next->prev = best->prev;
|
best->next->prev = best->prev;
|
||||||
@@ -2629,7 +2632,7 @@ static void R_ClipVisSprite(vissprite_t *spr, INT32 x1, INT32 x2, portal_t* port
|
|||||||
|
|
||||||
for (x = x1; x <= x2; x++)
|
for (x = x1; x <= x2; x++)
|
||||||
{
|
{
|
||||||
spr->clipbot[x] = spr->cliptop[x] = -2;
|
spr->clipbot[x] = spr->cliptop[x] = CLIP_UNDEF;
|
||||||
}
|
}
|
||||||
|
|
||||||
// Scan drawsegs from end to start for obscuring segs.
|
// Scan drawsegs from end to start for obscuring segs.
|
||||||
@@ -2658,29 +2661,26 @@ static void R_ClipVisSprite(vissprite_t *spr, INT32 x1, INT32 x2, portal_t* port
|
|||||||
|
|
||||||
ds = curr->user;
|
ds = curr->user;
|
||||||
|
|
||||||
if (ds->portalpass != 66) // unused?
|
if (ds->portalpass > 0 && ds->portalpass <= portalrender)
|
||||||
|
continue; // is a portal
|
||||||
|
|
||||||
|
if (ds->scale1 > ds->scale2)
|
||||||
{
|
{
|
||||||
if (ds->portalpass > 0 && ds->portalpass <= portalrender)
|
lowscale = ds->scale2;
|
||||||
continue; // is a portal
|
scale = ds->scale1;
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
lowscale = ds->scale1;
|
||||||
|
scale = ds->scale2;
|
||||||
|
}
|
||||||
|
|
||||||
if (ds->scale1 > ds->scale2)
|
if (scale < spr->sortscale ||
|
||||||
{
|
(lowscale < spr->sortscale &&
|
||||||
lowscale = ds->scale2;
|
!R_PointOnSegSide(spr->gx, spr->gy, ds->curline)))
|
||||||
scale = ds->scale1;
|
{
|
||||||
}
|
// seg is behind sprite
|
||||||
else
|
continue;
|
||||||
{
|
|
||||||
lowscale = ds->scale1;
|
|
||||||
scale = ds->scale2;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (scale < spr->sortscale ||
|
|
||||||
(lowscale < spr->sortscale &&
|
|
||||||
!R_PointOnSegSide(spr->gx, spr->gy, ds->curline)))
|
|
||||||
{
|
|
||||||
// seg is behind sprite
|
|
||||||
continue;
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
r1 = ds->x1 < x1 ? x1 : ds->x1;
|
r1 = ds->x1 < x1 ? x1 : ds->x1;
|
||||||
@@ -2699,14 +2699,14 @@ static void R_ClipVisSprite(vissprite_t *spr, INT32 x1, INT32 x2, portal_t* port
|
|||||||
{
|
{
|
||||||
// bottom sil
|
// bottom sil
|
||||||
for (x = r1; x <= r2; x++)
|
for (x = r1; x <= r2; x++)
|
||||||
if (spr->clipbot[x] == -2)
|
if (spr->clipbot[x] == CLIP_UNDEF)
|
||||||
spr->clipbot[x] = ds->sprbottomclip[x];
|
spr->clipbot[x] = ds->sprbottomclip[x];
|
||||||
}
|
}
|
||||||
else if (silhouette == SIL_TOP)
|
else if (silhouette == SIL_TOP)
|
||||||
{
|
{
|
||||||
// top sil
|
// top sil
|
||||||
for (x = r1; x <= r2; x++)
|
for (x = r1; x <= r2; x++)
|
||||||
if (spr->cliptop[x] == -2)
|
if (spr->cliptop[x] == CLIP_UNDEF)
|
||||||
spr->cliptop[x] = ds->sprtopclip[x];
|
spr->cliptop[x] = ds->sprtopclip[x];
|
||||||
}
|
}
|
||||||
else if (silhouette == (SIL_TOP|SIL_BOTTOM))
|
else if (silhouette == (SIL_TOP|SIL_BOTTOM))
|
||||||
@@ -2714,9 +2714,9 @@ static void R_ClipVisSprite(vissprite_t *spr, INT32 x1, INT32 x2, portal_t* port
|
|||||||
// both
|
// both
|
||||||
for (x = r1; x <= r2; x++)
|
for (x = r1; x <= r2; x++)
|
||||||
{
|
{
|
||||||
if (spr->clipbot[x] == -2)
|
if (spr->clipbot[x] == CLIP_UNDEF)
|
||||||
spr->clipbot[x] = ds->sprbottomclip[x];
|
spr->clipbot[x] = ds->sprbottomclip[x];
|
||||||
if (spr->cliptop[x] == -2)
|
if (spr->cliptop[x] == CLIP_UNDEF)
|
||||||
spr->cliptop[x] = ds->sprtopclip[x];
|
spr->cliptop[x] = ds->sprtopclip[x];
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -2735,13 +2735,13 @@ static void R_ClipVisSprite(vissprite_t *spr, INT32 x1, INT32 x2, portal_t* port
|
|||||||
if (mh <= 0 || (phs != -1 && viewz > sectors[phs].floorheight))
|
if (mh <= 0 || (phs != -1 && viewz > sectors[phs].floorheight))
|
||||||
{ // clip bottom
|
{ // clip bottom
|
||||||
for (x = x1; x <= x2; x++)
|
for (x = x1; x <= x2; x++)
|
||||||
if (spr->clipbot[x] == -2 || h < spr->clipbot[x])
|
if (spr->clipbot[x] == CLIP_UNDEF || h < spr->clipbot[x])
|
||||||
spr->clipbot[x] = (INT16)h;
|
spr->clipbot[x] = (INT16)h;
|
||||||
}
|
}
|
||||||
else // clip top
|
else // clip top
|
||||||
{
|
{
|
||||||
for (x = x1; x <= x2; x++)
|
for (x = x1; x <= x2; x++)
|
||||||
if (spr->cliptop[x] == -2 || h > spr->cliptop[x])
|
if (spr->cliptop[x] == CLIP_UNDEF || h > spr->cliptop[x])
|
||||||
spr->cliptop[x] = (INT16)h;
|
spr->cliptop[x] = (INT16)h;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -2753,13 +2753,13 @@ static void R_ClipVisSprite(vissprite_t *spr, INT32 x1, INT32 x2, portal_t* port
|
|||||||
if (phs != -1 && viewz >= sectors[phs].ceilingheight)
|
if (phs != -1 && viewz >= sectors[phs].ceilingheight)
|
||||||
{ // clip bottom
|
{ // clip bottom
|
||||||
for (x = x1; x <= x2; x++)
|
for (x = x1; x <= x2; x++)
|
||||||
if (spr->clipbot[x] == -2 || h < spr->clipbot[x])
|
if (spr->clipbot[x] == CLIP_UNDEF || h < spr->clipbot[x])
|
||||||
spr->clipbot[x] = (INT16)h;
|
spr->clipbot[x] = (INT16)h;
|
||||||
}
|
}
|
||||||
else // clip top
|
else // clip top
|
||||||
{
|
{
|
||||||
for (x = x1; x <= x2; x++)
|
for (x = x1; x <= x2; x++)
|
||||||
if (spr->cliptop[x] == -2 || h > spr->cliptop[x])
|
if (spr->cliptop[x] == CLIP_UNDEF || h > spr->cliptop[x])
|
||||||
spr->cliptop[x] = (INT16)h;
|
spr->cliptop[x] = (INT16)h;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -2769,10 +2769,10 @@ static void R_ClipVisSprite(vissprite_t *spr, INT32 x1, INT32 x2, portal_t* port
|
|||||||
{
|
{
|
||||||
for (x = x1; x <= x2; x++)
|
for (x = x1; x <= x2; x++)
|
||||||
{
|
{
|
||||||
if (spr->cliptop[x] == -2 || spr->szt > spr->cliptop[x])
|
if (spr->cliptop[x] == CLIP_UNDEF || spr->szt > spr->cliptop[x])
|
||||||
spr->cliptop[x] = spr->szt;
|
spr->cliptop[x] = spr->szt;
|
||||||
|
|
||||||
if (spr->clipbot[x] == -2 || spr->sz < spr->clipbot[x])
|
if (spr->clipbot[x] == CLIP_UNDEF || spr->sz < spr->clipbot[x])
|
||||||
spr->clipbot[x] = spr->sz;
|
spr->clipbot[x] = spr->sz;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -2780,7 +2780,7 @@ static void R_ClipVisSprite(vissprite_t *spr, INT32 x1, INT32 x2, portal_t* port
|
|||||||
{
|
{
|
||||||
for (x = x1; x <= x2; x++)
|
for (x = x1; x <= x2; x++)
|
||||||
{
|
{
|
||||||
if (spr->cliptop[x] == -2 || spr->szt > spr->cliptop[x])
|
if (spr->cliptop[x] == CLIP_UNDEF || spr->szt > spr->cliptop[x])
|
||||||
spr->cliptop[x] = spr->szt;
|
spr->cliptop[x] = spr->szt;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -2788,7 +2788,7 @@ static void R_ClipVisSprite(vissprite_t *spr, INT32 x1, INT32 x2, portal_t* port
|
|||||||
{
|
{
|
||||||
for (x = x1; x <= x2; x++)
|
for (x = x1; x <= x2; x++)
|
||||||
{
|
{
|
||||||
if (spr->clipbot[x] == -2 || spr->sz < spr->clipbot[x])
|
if (spr->clipbot[x] == CLIP_UNDEF || spr->sz < spr->clipbot[x])
|
||||||
spr->clipbot[x] = spr->sz;
|
spr->clipbot[x] = spr->sz;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -2798,21 +2798,13 @@ static void R_ClipVisSprite(vissprite_t *spr, INT32 x1, INT32 x2, portal_t* port
|
|||||||
// check for unclipped columns
|
// check for unclipped columns
|
||||||
for (x = x1; x <= x2; x++)
|
for (x = x1; x <= x2; x++)
|
||||||
{
|
{
|
||||||
if (spr->clipbot[x] == -2)
|
if (spr->clipbot[x] == CLIP_UNDEF)
|
||||||
spr->clipbot[x] = (INT16)viewheight;
|
spr->clipbot[x] = (INT16)viewheight;
|
||||||
|
|
||||||
if (spr->cliptop[x] == -2)
|
if (spr->cliptop[x] == CLIP_UNDEF)
|
||||||
spr->cliptop[x] = -1;
|
spr->cliptop[x] = -1;
|
||||||
}
|
}
|
||||||
|
|
||||||
// Check if it'll be visible
|
|
||||||
// Not done for floorsprites.
|
|
||||||
if (cv_spriteclip.value)
|
|
||||||
{
|
|
||||||
if (!R_CheckSpriteVisible(spr, x1, x2))
|
|
||||||
spr->cut = static_cast<spritecut_e>(spr->cut | SC_NOTVISIBLE);
|
|
||||||
}
|
|
||||||
|
|
||||||
if (portal)
|
if (portal)
|
||||||
{
|
{
|
||||||
INT32 start_index = std::max(portal->start, x1);
|
INT32 start_index = std::max(portal->start, x1);
|
||||||
@@ -2823,6 +2815,7 @@ static void R_ClipVisSprite(vissprite_t *spr, INT32 x1, INT32 x2, portal_t* port
|
|||||||
spr->clipbot[x] = -1;
|
spr->clipbot[x] = -1;
|
||||||
spr->cliptop[x] = -1;
|
spr->cliptop[x] = -1;
|
||||||
}
|
}
|
||||||
|
|
||||||
for (x = start_index; x <= end_index; x++)
|
for (x = start_index; x <= end_index; x++)
|
||||||
{
|
{
|
||||||
if (spr->clipbot[x] > portal->floorclip[x - portal->start])
|
if (spr->clipbot[x] > portal->floorclip[x - portal->start])
|
||||||
@@ -2830,12 +2823,21 @@ static void R_ClipVisSprite(vissprite_t *spr, INT32 x1, INT32 x2, portal_t* port
|
|||||||
if (spr->cliptop[x] < portal->ceilingclip[x - portal->start])
|
if (spr->cliptop[x] < portal->ceilingclip[x - portal->start])
|
||||||
spr->cliptop[x] = portal->ceilingclip[x - portal->start];
|
spr->cliptop[x] = portal->ceilingclip[x - portal->start];
|
||||||
}
|
}
|
||||||
|
|
||||||
for (x = end_index + 1; x <= x2; x++)
|
for (x = end_index + 1; x <= x2; x++)
|
||||||
{
|
{
|
||||||
spr->clipbot[x] = -1;
|
spr->clipbot[x] = -1;
|
||||||
spr->cliptop[x] = -1;
|
spr->cliptop[x] = -1;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// Check if it'll be visible
|
||||||
|
// Not done for floorsprites.
|
||||||
|
if (cv_spriteclip.value)
|
||||||
|
{
|
||||||
|
if (!R_CheckSpriteVisible(spr, x1, x2))
|
||||||
|
spr->cut = static_cast<spritecut_e>(spr->cut | SC_NOTVISIBLE);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
void R_ClipSprites(drawseg_t* dsstart, portal_t* portal)
|
void R_ClipSprites(drawseg_t* dsstart, portal_t* portal)
|
||||||
@@ -2908,8 +2910,9 @@ void R_ClipSprites(drawseg_t* dsstart, portal_t* portal)
|
|||||||
{
|
{
|
||||||
vissprite_t *spr = R_GetVisSprite(clippedvissprites);
|
vissprite_t *spr = R_GetVisSprite(clippedvissprites);
|
||||||
|
|
||||||
if (cv_spriteclip.value
|
if (cv_spriteclip.value &&
|
||||||
&& (spr->szt > vid.height || spr->sz < 0))
|
(spr->szt > vid.height || spr->sz < 0) &&
|
||||||
|
!spr->scalestep)
|
||||||
{
|
{
|
||||||
spr->cut = static_cast<spritecut_e>(spr->cut | SC_NOTVISIBLE);
|
spr->cut = static_cast<spritecut_e>(spr->cut | SC_NOTVISIBLE);
|
||||||
continue;
|
continue;
|
||||||
@@ -2941,16 +2944,16 @@ void R_ClipSprites(drawseg_t* dsstart, portal_t* portal)
|
|||||||
/* Check if thing may be drawn from our current view. */
|
/* Check if thing may be drawn from our current view. */
|
||||||
boolean R_ThingVisible(mobj_t *thing)
|
boolean R_ThingVisible(mobj_t *thing)
|
||||||
{
|
{
|
||||||
if (UNLIKELY((thing->sprite == SPR_NULL) || (thing->flags2 & MF2_DONTDRAW)))
|
if ((thing->sprite == SPR_NULL) || (thing->flags2 & MF2_DONTDRAW))
|
||||||
return false;
|
return false;
|
||||||
|
|
||||||
if (UNLIKELY(splitscreen))
|
if (splitscreen)
|
||||||
{
|
{
|
||||||
if ((viewssnum == 0 && (thing->eflags & MFE_DRAWONLYFORP1))
|
if (((thing->eflags & MFE_DRAWONLYFORP1) && viewssnum != 0)
|
||||||
|| (viewssnum == 1 && (thing->eflags & MFE_DRAWONLYFORP2))
|
|| ((thing->eflags & MFE_DRAWONLYFORP2) && viewssnum != 1)
|
||||||
|| (viewssnum == 2 && (thing->eflags & MFE_DRAWONLYFORP2))
|
|| ((thing->eflags & MFE_DRAWONLYFORP3) && viewssnum != 2)
|
||||||
|| (viewssnum == 3 && (thing->eflags & MFE_DRAWONLYFORP4)))
|
|| ((thing->eflags & MFE_DRAWONLYFORP4) && viewssnum != 3))
|
||||||
return true;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
return true;
|
return true;
|
||||||
@@ -3022,11 +3025,37 @@ boolean R_CheckMobjInterpDist(mobj_t *thing)
|
|||||||
return R_CheckInterpDist(thing);
|
return R_CheckInterpDist(thing);
|
||||||
}
|
}
|
||||||
|
|
||||||
boolean R_ThingIsFullBright(mobj_t *thing)
|
boolean R_ThingHorizontallyFlipped(mobj_t *thing)
|
||||||
|
{
|
||||||
|
return (thing->frame & FF_HORIZONTALFLIP);
|
||||||
|
}
|
||||||
|
|
||||||
|
boolean R_ThingVerticallyFlipped(mobj_t *thing)
|
||||||
|
{
|
||||||
|
return (thing->eflags & MFE_VERTICALFLIP); //(thing->frame & FF_VERTICALFLIP);
|
||||||
|
}
|
||||||
|
|
||||||
|
boolean R_ThingIsPaperSprite(mobj_t *thing)
|
||||||
|
{
|
||||||
|
return (thing->frame & FF_PAPERSPRITE);
|
||||||
|
}
|
||||||
|
|
||||||
|
template<typename T>
|
||||||
|
static boolean R_ThingIsFullBrightT(T *thing)
|
||||||
{
|
{
|
||||||
return ((thing->frame & FF_BRIGHTMASK) == FF_FULLBRIGHT);
|
return ((thing->frame & FF_BRIGHTMASK) == FF_FULLBRIGHT);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
boolean R_PrecipThingIsFullBright(precipmobj_t *thing)
|
||||||
|
{
|
||||||
|
return R_ThingIsFullBrightT(thing);
|
||||||
|
}
|
||||||
|
|
||||||
|
boolean R_ThingIsFullBright(mobj_t *thing)
|
||||||
|
{
|
||||||
|
return R_ThingIsFullBrightT(thing);
|
||||||
|
}
|
||||||
|
|
||||||
boolean R_ThingIsSemiBright(mobj_t *thing)
|
boolean R_ThingIsSemiBright(mobj_t *thing)
|
||||||
{
|
{
|
||||||
return ((thing->frame & FF_BRIGHTMASK) == FF_SEMIBRIGHT);
|
return ((thing->frame & FF_BRIGHTMASK) == FF_SEMIBRIGHT);
|
||||||
|
|||||||
@@ -88,6 +88,11 @@ boolean R_CheckPrecipMobjInterpDist(precipmobj_t *thing);
|
|||||||
boolean R_CheckMobjInterpDist(mobj_t *thing);
|
boolean R_CheckMobjInterpDist(mobj_t *thing);
|
||||||
fixed_t R_DoPlayerFade(mobj_t *thing);
|
fixed_t R_DoPlayerFade(mobj_t *thing);
|
||||||
|
|
||||||
|
boolean R_ThingHorizontallyFlipped(mobj_t *thing);
|
||||||
|
boolean R_ThingVerticallyFlipped(mobj_t *thing);
|
||||||
|
boolean R_ThingIsPaperSprite(mobj_t *thing);
|
||||||
|
|
||||||
|
boolean R_PrecipThingIsFullBright(precipmobj_t *thing);
|
||||||
boolean R_ThingIsFullBright(mobj_t *thing);
|
boolean R_ThingIsFullBright(mobj_t *thing);
|
||||||
boolean R_ThingIsSemiBright(mobj_t *thing);
|
boolean R_ThingIsSemiBright(mobj_t *thing);
|
||||||
boolean R_ThingIsFullDark(mobj_t *thing);
|
boolean R_ThingIsFullDark(mobj_t *thing);
|
||||||
|
|||||||
+27
-26
@@ -334,7 +334,7 @@ lumpnum_t S_GetSfxLumpNum(sfxinfo_t *sfx)
|
|||||||
char namebuf[9];
|
char namebuf[9];
|
||||||
lumpnum_t sfxlump;
|
lumpnum_t sfxlump;
|
||||||
|
|
||||||
sprintf(namebuf, "ds%s", sfx->name);
|
snprintf(namebuf, sizeof(namebuf), "ds%s", sfx->name);
|
||||||
|
|
||||||
sfxlump = W_CheckNumForName(namebuf);
|
sfxlump = W_CheckNumForName(namebuf);
|
||||||
if (sfxlump != LUMPERROR)
|
if (sfxlump != LUMPERROR)
|
||||||
@@ -433,7 +433,7 @@ static boolean S_CheckSameSoundLimit(sfxenum_t sfx_id)
|
|||||||
return true;
|
return true;
|
||||||
|
|
||||||
for (cnum = 0; cnum < numofchannels; cnum++)
|
for (cnum = 0; cnum < numofchannels; cnum++)
|
||||||
if ((size_t)(channels[cnum].sfxinfo - S_sfx) == (size_t)sfx_id)
|
if (channels[cnum].sfxinfo == &S_sfx[sfx_id])
|
||||||
scount++;
|
scount++;
|
||||||
|
|
||||||
//CONS_Printf("same sound count: %d for sfx: %d\n", scount, sfx_id);
|
//CONS_Printf("same sound count: %d for sfx: %d\n", scount, sfx_id);
|
||||||
@@ -864,18 +864,18 @@ void S_SetSfxVolume(INT32 volume)
|
|||||||
if (volume < 0 || volume > 31)
|
if (volume < 0 || volume > 31)
|
||||||
CONS_Alert(CONS_WARNING, "sfxvolume should be between 0-31\n");
|
CONS_Alert(CONS_WARNING, "sfxvolume should be between 0-31\n");
|
||||||
|
|
||||||
CV_SetValue(&cv_soundvolume, volume&0x1F);
|
CV_SetValue(&cv_soundvolume, volume & 0x1F);
|
||||||
actualsfxvolume = cv_soundvolume.value; // check for change of var
|
actualsfxvolume = cv_soundvolume.value; // check for change of var
|
||||||
|
|
||||||
// now hardware volume
|
// now hardware volume
|
||||||
I_SetSfxVolume(volume&0x1F);
|
I_SetSfxVolume(volume & 0x1F);
|
||||||
}
|
}
|
||||||
|
|
||||||
void S_ClearSfx(void)
|
void S_ClearSfx(void)
|
||||||
{
|
{
|
||||||
size_t i;
|
size_t i;
|
||||||
for (i = 1; i < NUMSFX; i++)
|
for (i = 1; i < NUMSFX; i++)
|
||||||
I_FreeSfx(S_sfx + i);
|
I_FreeSfx(&S_sfx[i]);
|
||||||
}
|
}
|
||||||
|
|
||||||
static void S_StopChannel(INT32 cnum)
|
static void S_StopChannel(INT32 cnum)
|
||||||
@@ -1067,12 +1067,12 @@ INT32 S_OriginPlaying(void *origin)
|
|||||||
|
|
||||||
// Searches through the channels and checks if a given id
|
// Searches through the channels and checks if a given id
|
||||||
// is playing anywhere.
|
// is playing anywhere.
|
||||||
INT32 S_IdPlaying(sfxenum_t id)
|
INT32 S_IdPlaying(sfxenum_t sfx_id)
|
||||||
{
|
{
|
||||||
INT32 cnum;
|
INT32 cnum;
|
||||||
|
|
||||||
for (cnum = 0; cnum < numofchannels; cnum++)
|
for (cnum = 0; cnum < numofchannels; cnum++)
|
||||||
if ((size_t)(channels[cnum].sfxinfo - S_sfx) == (size_t)id)
|
if (channels[cnum].sfxinfo == &S_sfx[sfx_id])
|
||||||
return 1;
|
return 1;
|
||||||
|
|
||||||
return 0;
|
return 0;
|
||||||
@@ -1080,7 +1080,7 @@ INT32 S_IdPlaying(sfxenum_t id)
|
|||||||
|
|
||||||
// Searches through the channels and checks for
|
// Searches through the channels and checks for
|
||||||
// origin x playing sound id y.
|
// origin x playing sound id y.
|
||||||
INT32 S_SoundPlaying(void *origin, sfxenum_t id)
|
INT32 S_SoundPlaying(void *origin, sfxenum_t sfx_id)
|
||||||
{
|
{
|
||||||
INT32 cnum;
|
INT32 cnum;
|
||||||
|
|
||||||
@@ -1089,8 +1089,8 @@ INT32 S_SoundPlaying(void *origin, sfxenum_t id)
|
|||||||
|
|
||||||
for (cnum = 0; cnum < numofchannels; cnum++)
|
for (cnum = 0; cnum < numofchannels; cnum++)
|
||||||
{
|
{
|
||||||
if (channels[cnum].origin == origin
|
if (channels[cnum].origin == origin &&
|
||||||
&& (size_t)(channels[cnum].sfxinfo - S_sfx) == (size_t)id)
|
channels[cnum].sfxinfo == &S_sfx[sfx_id])
|
||||||
return 1;
|
return 1;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -1297,9 +1297,7 @@ static boolean ReadMusicDefFields(UINT16 wadnum, int line, char *stoken, musicde
|
|||||||
|
|
||||||
if (!value)
|
if (!value)
|
||||||
{
|
{
|
||||||
CONS_Alert(CONS_WARNING,
|
CONS_Alert(CONS_WARNING, "MUSICDEF: Field '%s' is missing name. (file %s, line %d)\n", stoken, wadfiles[wadnum]->filename, line);
|
||||||
"MUSICDEF: Field '%s' is missing name. (file %s, line %d)\n",
|
|
||||||
stoken, wadfiles[wadnum]->filename, line);
|
|
||||||
(void)strtok(NULL, " ");
|
(void)strtok(NULL, " ");
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
@@ -1332,9 +1330,7 @@ static boolean ReadMusicDefFields(UINT16 wadnum, int line, char *stoken, musicde
|
|||||||
|
|
||||||
if (!value)
|
if (!value)
|
||||||
{
|
{
|
||||||
CONS_Alert(CONS_WARNING,
|
CONS_Alert(CONS_WARNING, "MUSICDEF: Field '%s' is missing value. (file %s, line %d)\n", stoken, wadfiles[wadnum]->filename, line);
|
||||||
"MUSICDEF: Field '%s' is missing value. (file %s, line %d)\n",
|
|
||||||
stoken, wadfiles[wadnum]->filename, line);
|
|
||||||
(void)strtok(NULL, " ");
|
(void)strtok(NULL, " ");
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
@@ -1344,9 +1340,7 @@ static boolean ReadMusicDefFields(UINT16 wadnum, int line, char *stoken, musicde
|
|||||||
|
|
||||||
if (!def)
|
if (!def)
|
||||||
{
|
{
|
||||||
CONS_Alert(CONS_ERROR,
|
CONS_Alert(CONS_ERROR, "MUSICDEF: No music definition before field '%s'. (file %s, line %d)\n", stoken, wadfiles[wadnum]->filename, line);
|
||||||
"MUSICDEF: No music definition before field '%s'. (file %s, line %d)\n",
|
|
||||||
stoken, wadfiles[wadnum]->filename, line);
|
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -1358,11 +1352,19 @@ static boolean ReadMusicDefFields(UINT16 wadnum, int line, char *stoken, musicde
|
|||||||
|
|
||||||
textline = value;
|
textline = value;
|
||||||
|
|
||||||
// turn _ into spaces.
|
// turn _ into spaces while also removing trailing whitespaces.
|
||||||
#define ADDDEF(field)\
|
#define ADDDEF(field) \
|
||||||
STRBUFCPY(def->field, textline);\
|
int err = 0; \
|
||||||
for (textline = def->field; *textline; textline++)\
|
STRBUFCPY(def->field, textline); \
|
||||||
if (*textline == '_') *textline = ' ';
|
size_t len = strlen(def->field); \
|
||||||
|
while (len > 0 && (def->field[len-1] == ' ')) { \
|
||||||
|
def->field[len-1] = 0; \
|
||||||
|
len--; \
|
||||||
|
} \
|
||||||
|
for (textline = def->field; *textline; textline++) { \
|
||||||
|
if (err == 0 && *textline == ' ') {err = 1; CONS_Alert(CONS_WARNING, "MUSICDEF: Erroneous whitespace detected in field '%s': '%s'.\n(file %s, line %d) Musicdef might not work correctly!\n", stoken, value, wadfiles[wadnum]->filename, line);} \
|
||||||
|
if (*textline == '_') *textline = ' '; \
|
||||||
|
}
|
||||||
|
|
||||||
if (fasticmp(stoken, "usage"))
|
if (fasticmp(stoken, "usage"))
|
||||||
{
|
{
|
||||||
@@ -1374,7 +1376,6 @@ static boolean ReadMusicDefFields(UINT16 wadnum, int line, char *stoken, musicde
|
|||||||
}
|
}
|
||||||
else if (fasticmp(stoken, "title"))
|
else if (fasticmp(stoken, "title"))
|
||||||
{
|
{
|
||||||
def->use_info = true;
|
|
||||||
ADDDEF(title);
|
ADDDEF(title);
|
||||||
}
|
}
|
||||||
else if (fasticmp(stoken, "alttitle"))
|
else if (fasticmp(stoken, "alttitle"))
|
||||||
@@ -2192,7 +2193,7 @@ static void Command_Tunes_f(void)
|
|||||||
track = (UINT16)atoi(COM_Argv(2))-1;
|
track = (UINT16)atoi(COM_Argv(2))-1;
|
||||||
|
|
||||||
if (tunenum)
|
if (tunenum)
|
||||||
snprintf(mapmusic.name, 7, "%sM", G_BuildMapName(tunenum));
|
snprintf(mapmusic.name, sizeof(mapmusic.name), "%sM", G_BuildMapName(tunenum));
|
||||||
else
|
else
|
||||||
strlcpy(mapmusic.name, tunearg, sizeof(mapmusic.name));
|
strlcpy(mapmusic.name, tunearg, sizeof(mapmusic.name));
|
||||||
|
|
||||||
|
|||||||
+2
-3
@@ -186,7 +186,6 @@ typedef struct musicdef_s
|
|||||||
char title[256];
|
char title[256];
|
||||||
char alttitle[256];
|
char alttitle[256];
|
||||||
char authors[256];
|
char authors[256];
|
||||||
boolean use_info;
|
|
||||||
size_t num;
|
size_t num;
|
||||||
} musicdef_t;
|
} musicdef_t;
|
||||||
|
|
||||||
@@ -287,8 +286,8 @@ void S_SetSfxVolume(INT32 volume);
|
|||||||
void S_SetMusicVolume(INT32 volume);
|
void S_SetMusicVolume(INT32 volume);
|
||||||
|
|
||||||
INT32 S_OriginPlaying(void *origin);
|
INT32 S_OriginPlaying(void *origin);
|
||||||
INT32 S_IdPlaying(sfxenum_t id);
|
INT32 S_IdPlaying(sfxenum_t sfx_id);
|
||||||
INT32 S_SoundPlaying(void *origin, sfxenum_t id);
|
INT32 S_SoundPlaying(void *origin, sfxenum_t sfx_id);
|
||||||
|
|
||||||
void S_StartSoundName(void *mo, const char *soundname);
|
void S_StartSoundName(void *mo, const char *soundname);
|
||||||
|
|
||||||
|
|||||||
@@ -177,6 +177,10 @@ if(${SDL2_FOUND})
|
|||||||
)
|
)
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
|
if("${CMAKE_SYSTEM_NAME}" MATCHES "OpenBSD")
|
||||||
|
target_link_libraries(SRB2SDL2 PRIVATE pthread execinfo)
|
||||||
|
endif()
|
||||||
|
|
||||||
if(${CMAKE_SYSTEM} MATCHES Windows AND ${CMAKE_C_COMPILER_ID} MATCHES "GNU" AND ${SRB2_SYSTEM_BITS} EQUAL 32)
|
if(${CMAKE_SYSTEM} MATCHES Windows AND ${CMAKE_C_COMPILER_ID} MATCHES "GNU" AND ${SRB2_SYSTEM_BITS} EQUAL 32)
|
||||||
target_link_libraries(SRB2SDL2 PRIVATE
|
target_link_libraries(SRB2SDL2 PRIVATE
|
||||||
"${CMAKE_CURRENT_SOURCE_DIR}/../../libs/drmingw/lib/win32/libexchndl.a"
|
"${CMAKE_CURRENT_SOURCE_DIR}/../../libs/drmingw/lib/win32/libexchndl.a"
|
||||||
@@ -243,6 +247,10 @@ if(${SDL2_FOUND})
|
|||||||
target_link_options(SRB2SDL2 PRIVATE -fsanitize=undefined)
|
target_link_options(SRB2SDL2 PRIVATE -fsanitize=undefined)
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
|
if(NOT SRB2_CONFIG_MUMBLE)
|
||||||
|
target_compile_options(SRB2SDL2 PRIVATE -DNOMUMBLE)
|
||||||
|
endif()
|
||||||
|
|
||||||
## strip debug symbols into separate file when using gcc
|
## strip debug symbols into separate file when using gcc
|
||||||
# if(CMAKE_COMPILER_IS_GNUCC)
|
# if(CMAKE_COMPILER_IS_GNUCC)
|
||||||
# if(${CMAKE_BUILD_TYPE} MATCHES Debug)
|
# if(${CMAKE_BUILD_TYPE} MATCHES Debug)
|
||||||
|
|||||||
@@ -1,7 +0,0 @@
|
|||||||
/* Include the SDL main definition header */
|
|
||||||
#include "SDL_main.h"
|
|
||||||
|
|
||||||
void XBoxStartup()
|
|
||||||
{
|
|
||||||
SDL_main(0, NULL); /// \todo ?
|
|
||||||
}
|
|
||||||
Loaded 100 of 120 files, more files were not shown because too many files have changed in this diff.
Show more
Reference in new issue
Block a user