Compare commits
190
Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
794fda5ac5 | ||
|
|
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 | ||
|
|
551d7d4d89 | ||
|
|
a2184d2bef | ||
|
|
d638baeda6 | ||
|
|
4a06e8a6d1 | ||
|
|
e2a3992787 | ||
|
|
ec06150432 | ||
|
|
2413a3503c | ||
|
|
d9e339cb56 | ||
|
|
408db7a2eb | ||
|
|
e12ecabcf0 | ||
|
|
65c2d2733d | ||
|
|
00aa023e9e | ||
|
|
f43a4a2eb6 | ||
|
|
4eb108e0a6 | ||
|
|
ea76af5a81 | ||
|
|
4b8f998c85 | ||
|
|
d687be4997 | ||
|
|
1bcadf3c46 | ||
|
|
80e4d02c51 | ||
|
|
352d1faacf | ||
|
|
7f9d70285d | ||
|
|
496477fa9a | ||
|
|
530bb50709 | ||
|
|
8bb04a68a8 | ||
|
|
820ab4b2bc | ||
|
|
af6abb5458 | ||
|
|
5c373b6251 | ||
|
|
24bac9c133 | ||
|
|
73c7a5a0c4 | ||
|
|
49d6374505 | ||
|
|
2ba4757c6a | ||
|
|
3606b0ae66 | ||
|
|
ba75523d48 | ||
|
|
71640202ed | ||
|
|
5fb5af05be | ||
|
|
4f036c9312 | ||
|
|
d99c272a79 | ||
|
|
c4ed75fbc6 | ||
|
|
91927e324b | ||
|
|
13dc0db9a9 | ||
|
|
8aafde4c9d | ||
|
|
266a4effb7 | ||
|
|
948c9399de | ||
|
|
db4aedf498 | ||
|
|
f12d5a246d | ||
|
|
6efe56808a | ||
|
|
ec047151e3 | ||
|
|
b1100d6215 | ||
|
|
cb8df4c3d0 | ||
|
|
fbae43f61a | ||
|
|
7ea95b4495 | ||
|
|
07c780dc9c | ||
|
|
f6d3ab1f3a | ||
|
|
2c8099e228 | ||
|
|
7c84dd5661 | ||
|
|
cabd8baae5 | ||
|
|
593540a3f9 | ||
|
|
407af1d25c | ||
|
|
029c21eae8 | ||
|
|
568f29ed1c | ||
|
|
2dacc333b5 | ||
|
|
363612c488 | ||
|
|
d8ffffd86e | ||
|
|
4b2a13defb | ||
|
|
9cc74d8b17 | ||
|
|
066adb972e | ||
|
|
0f1ad8a086 | ||
|
|
40537eca81 | ||
|
|
0cff3c23f3 | ||
|
|
9bdda66a0c | ||
|
|
3b6a09da9b | ||
|
|
c275555678 | ||
|
|
fc588f8046 | ||
|
|
17093e8022 | ||
|
|
b575c288fa | ||
|
|
f9a6702219 | ||
|
|
cfda853e6f | ||
|
|
14ac3ca9b0 | ||
|
|
e94fecf56d | ||
|
|
51d9aa6197 | ||
|
|
96a29abc62 | ||
|
|
fa1b797a44 | ||
|
|
e1061ab4b4 | ||
|
|
ab0d071d35 | ||
|
|
8129b89034 | ||
|
|
14aaba7a87 | ||
|
|
2c1bb6c268 | ||
|
|
cc6437285f | ||
|
|
b24f6683b7 | ||
|
|
5f559af29c | ||
|
|
eef1c55549 | ||
|
|
3c227ec532 | ||
|
|
50f839e1ad | ||
|
|
8db399be9b | ||
|
|
8cb321993e | ||
|
|
b4cad08ad3 | ||
|
|
fa899d3970 | ||
|
|
b955fdb47d | ||
|
|
4686e8e112 | ||
|
|
667c67a61a | ||
|
|
df9a23a6c7 | ||
|
|
a3f557f4df | ||
|
|
1ac029edc6 | ||
|
|
761766d353 | ||
|
|
72d3360711 | ||
|
|
ac52ec2c48 | ||
|
|
956bc3f7df | ||
|
|
746a8cec8b | ||
|
|
f7a32b5f85 | ||
|
|
bd30ab8fb7 | ||
|
|
4140f93e41 | ||
|
|
8ae6f71578 | ||
|
|
d5083ac66c | ||
|
|
62be792a0d | ||
|
|
c34346cb9a | ||
|
|
d7803ecdcf | ||
|
|
1a2a487a93 | ||
|
|
bed6306cdf | ||
|
|
7521b3abd2 | ||
|
|
58d5bab181 | ||
|
|
2bffe443ed | ||
|
|
261c02f4b6 | ||
|
|
d59ac7d01b | ||
|
|
ac86f36186 | ||
|
|
b5c7fd5a2b | ||
|
|
da103f54d6 |
No files matched your search
+4
-1
@@ -1,5 +1,8 @@
|
|||||||
cmake_minimum_required(VERSION 3.5)
|
cmake_minimum_required(VERSION 3.5)
|
||||||
|
|
||||||
|
# needed for lto to work for some reason
|
||||||
|
cmake_policy(SET CMP0069 NEW)
|
||||||
|
|
||||||
if(${PROJECT_SOURCE_DIR} MATCHES ${PROJECT_BINARY_DIR})
|
if(${PROJECT_SOURCE_DIR} MATCHES ${PROJECT_BINARY_DIR})
|
||||||
message(FATAL_ERROR "In-source builds will bring you a world of pain. Please make a separate directory to invoke CMake from.")
|
message(FATAL_ERROR "In-source builds will bring you a world of pain. Please make a separate directory to invoke CMake from.")
|
||||||
endif()
|
endif()
|
||||||
@@ -31,7 +34,7 @@ if("${SRB2_CPACK_GENERATOR}" STREQUAL "")
|
|||||||
endif()
|
endif()
|
||||||
|
|
||||||
set(CPACK_GENERATOR ${SRB2_CPACK_GENERATOR})
|
set(CPACK_GENERATOR ${SRB2_CPACK_GENERATOR})
|
||||||
set(CPACK_PACKAGE_DESCRIPTION_SUMMARY "Sonic Robo Blast 2 Kart" CACHE STRING "Program name for display purposes")
|
set(CPACK_PACKAGE_DESCRIPTION_SUMMARY "Sonic Robo Blast 2 Kart Saturn" CACHE STRING "Program name for display purposes")
|
||||||
set(CPACK_PACKAGE_VENDOR "Kart Krew" CACHE STRING "Vendor name for display purposes")
|
set(CPACK_PACKAGE_VENDOR "Kart Krew" CACHE STRING "Vendor name for display purposes")
|
||||||
#set(CPACK_PACKAGE_DESCRIPTION_FILE )
|
#set(CPACK_PACKAGE_DESCRIPTION_FILE )
|
||||||
set(CPACK_RESOURCE_FILE_LICENSE "${CMAKE_CURRENT_SOURCE_DIR}/LICENSE")
|
set(CPACK_RESOURCE_FILE_LICENSE "${CMAKE_CURRENT_SOURCE_DIR}/LICENSE")
|
||||||
|
|||||||
+2
-2
@@ -54,7 +54,7 @@ set(SRB2_CORE_SOURCES
|
|||||||
string.c
|
string.c
|
||||||
tables.c
|
tables.c
|
||||||
v_video.c
|
v_video.c
|
||||||
w_wad.cpp
|
w_wad.c
|
||||||
y_inter.c
|
y_inter.c
|
||||||
z_zone.cpp
|
z_zone.cpp
|
||||||
)
|
)
|
||||||
@@ -518,7 +518,7 @@ if(${SRB2_CONFIG_HWRENDER})
|
|||||||
${CMAKE_CURRENT_SOURCE_DIR}/hardware/hw_batching.c
|
${CMAKE_CURRENT_SOURCE_DIR}/hardware/hw_batching.c
|
||||||
${CMAKE_CURRENT_SOURCE_DIR}/hardware/hw_shaders.c
|
${CMAKE_CURRENT_SOURCE_DIR}/hardware/hw_shaders.c
|
||||||
${CMAKE_CURRENT_SOURCE_DIR}/hardware/hw_bsp.c
|
${CMAKE_CURRENT_SOURCE_DIR}/hardware/hw_bsp.c
|
||||||
${CMAKE_CURRENT_SOURCE_DIR}/hardware/hw_cache.cpp
|
${CMAKE_CURRENT_SOURCE_DIR}/hardware/hw_cache.c
|
||||||
${CMAKE_CURRENT_SOURCE_DIR}/hardware/hw_clip.c
|
${CMAKE_CURRENT_SOURCE_DIR}/hardware/hw_clip.c
|
||||||
${CMAKE_CURRENT_SOURCE_DIR}/hardware/hw_draw.c
|
${CMAKE_CURRENT_SOURCE_DIR}/hardware/hw_draw.c
|
||||||
${CMAKE_CURRENT_SOURCE_DIR}/hardware/hw_main.cpp
|
${CMAKE_CURRENT_SOURCE_DIR}/hardware/hw_main.cpp
|
||||||
|
|||||||
@@ -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;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
+8
-17
@@ -519,22 +519,6 @@ LUA_API int lua_pushthread (lua_State *L) {
|
|||||||
** get functions (Lua -> stack)
|
** get functions (Lua -> stack)
|
||||||
*/
|
*/
|
||||||
|
|
||||||
static void auxgetstr (lua_State *L, TValue *t, const char *k) {
|
|
||||||
TValue *slot;
|
|
||||||
TValue key;
|
|
||||||
TString *str = luaS_new(L, k);
|
|
||||||
api_checkvalidindex(L, t);
|
|
||||||
if (luaV_fastget(L, t, str, slot, luaH_getstr)) {
|
|
||||||
setobj2s(L, L->top, slot);
|
|
||||||
}
|
|
||||||
else {
|
|
||||||
setsvalue(L, &key, str);
|
|
||||||
luaV_finishget(L, t, &key, L->top, slot);
|
|
||||||
}
|
|
||||||
api_incr_top(L);
|
|
||||||
lua_unlock(L);
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
LUA_API void lua_gettable (lua_State *L, int idx) {
|
LUA_API void lua_gettable (lua_State *L, int idx) {
|
||||||
StkId t;
|
StkId t;
|
||||||
@@ -547,8 +531,15 @@ LUA_API void lua_gettable (lua_State *L, int idx) {
|
|||||||
|
|
||||||
|
|
||||||
LUA_API void lua_getfield (lua_State *L, int idx, const char *k) {
|
LUA_API void lua_getfield (lua_State *L, int idx, const char *k) {
|
||||||
|
StkId t;
|
||||||
|
TValue key;
|
||||||
lua_lock(L);
|
lua_lock(L);
|
||||||
auxgetstr(L, index2adr(L, idx), k);
|
t = index2adr(L, idx);
|
||||||
|
api_checkvalidindex(L, t);
|
||||||
|
setsvalue(L, &key, luaS_new(L, k));
|
||||||
|
luaV_gettable(L, t, &key, L->top);
|
||||||
|
api_incr_top(L);
|
||||||
|
lua_unlock(L);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
+2
-2
@@ -55,8 +55,8 @@ struct lua_longjmp {
|
|||||||
|
|
||||||
void luaD_seterrorobj (lua_State *L, int lerrcode, StkId oldtop) {
|
void luaD_seterrorobj (lua_State *L, int lerrcode, StkId oldtop) {
|
||||||
switch (lerrcode) {
|
switch (lerrcode) {
|
||||||
case LUA_ERRMEM: { /* memory error? */
|
case LUA_ERRMEM: {
|
||||||
setsvalue2s(L, oldtop, G(L)->memerrmsg); /* reuse preregistered msg. */
|
setsvalue2s(L, oldtop, luaS_newliteral(L, MEMERRMSG));
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
case LUA_ERRERR: {
|
case LUA_ERRERR: {
|
||||||
|
|||||||
@@ -544,7 +544,6 @@ static void atomic (lua_State *L) {
|
|||||||
marktmu(g); /* mark `preserved' userdata */
|
marktmu(g); /* mark `preserved' userdata */
|
||||||
udsize += propagateall(g); /* remark, to propagate `preserveness' */
|
udsize += propagateall(g); /* remark, to propagate `preserveness' */
|
||||||
cleartable(g->weak); /* remove collected objects from weak tables */
|
cleartable(g->weak); /* remove collected objects from weak tables */
|
||||||
luaS_clearcache(g);
|
|
||||||
/* flip current white */
|
/* flip current white */
|
||||||
g->currentwhite = cast_byte(otherwhite(g));
|
g->currentwhite = cast_byte(otherwhite(g));
|
||||||
g->sweepstrgc = 0;
|
g->sweepstrgc = 0;
|
||||||
|
|||||||
@@ -41,25 +41,6 @@ typedef unsigned char lu_byte;
|
|||||||
*/
|
*/
|
||||||
#define IntPoint(p) ((unsigned int)(lu_mem)(p))
|
#define IntPoint(p) ((unsigned int)(lu_mem)(p))
|
||||||
|
|
||||||
/*
|
|
||||||
** conversion of pointer to unsigned integer: this is for hashing only;
|
|
||||||
** there is no problem if the integer cannot hold the whole pointer
|
|
||||||
** value. (In strict ISO C this may cause undefined behavior, but no
|
|
||||||
** actual machine seems to bother.)
|
|
||||||
*/
|
|
||||||
#if !defined(LUA_USE_C89) && defined(__STDC_VERSION__) && \
|
|
||||||
__STDC_VERSION__ >= 199901L
|
|
||||||
#include <stdint.h>
|
|
||||||
#if defined(UINTPTR_MAX) /* even in C99 this type is optional */
|
|
||||||
#define L_P2I uintptr_t
|
|
||||||
#else /* no 'intptr'? */
|
|
||||||
#define L_P2I uintmax_t /* use the largest available integer */
|
|
||||||
#endif
|
|
||||||
#else /* C89 option */
|
|
||||||
#define L_P2I size_t
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#define point2uint(p) ((unsigned int)((L_P2I)(p) & UINT_MAX))
|
|
||||||
|
|
||||||
|
|
||||||
/* type to ensure maximum alignment */
|
/* type to ensure maximum alignment */
|
||||||
@@ -119,17 +100,6 @@ typedef lu_int32 Instruction;
|
|||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
|
||||||
/*
|
|
||||||
** Size of cache for strings in the API. 'N' is the number of
|
|
||||||
** sets (better be a prime) and "M" is the size of each set (M == 1
|
|
||||||
** makes a direct cache.)
|
|
||||||
*/
|
|
||||||
#ifndef STRCACHE_N
|
|
||||||
#define STRCACHE_N 53
|
|
||||||
#define STRCACHE_M 2
|
|
||||||
#endif
|
|
||||||
|
|
||||||
|
|
||||||
/* minimum size for string buffer */
|
/* minimum size for string buffer */
|
||||||
#ifndef LUA_MINBUFFER
|
#ifndef LUA_MINBUFFER
|
||||||
#define LUA_MINBUFFER 32
|
#define LUA_MINBUFFER 32
|
||||||
|
|||||||
@@ -13,6 +13,8 @@
|
|||||||
#include "llimits.h"
|
#include "llimits.h"
|
||||||
#include "lua.h"
|
#include "lua.h"
|
||||||
|
|
||||||
|
#define MEMERRMSG "not enough memory"
|
||||||
|
|
||||||
|
|
||||||
#define luaM_reallocv(L,b,on,n,e) \
|
#define luaM_reallocv(L,b,on,n,e) \
|
||||||
((cast(size_t, (n)+1) <= MAX_SIZET/(e)) ? /* +1 to avoid warnings */ \
|
((cast(size_t, (n)+1) <= MAX_SIZET/(e)) ? /* +1 to avoid warnings */ \
|
||||||
|
|||||||
+2
-1
@@ -73,9 +73,10 @@ static void f_luaopen (lua_State *L, void *ud) {
|
|||||||
stack_init(L, L); /* init stack */
|
stack_init(L, L); /* init stack */
|
||||||
sethvalue(L, gt(L), luaH_new(L, 0, 2)); /* table of globals */
|
sethvalue(L, gt(L), luaH_new(L, 0, 2)); /* table of globals */
|
||||||
sethvalue(L, registry(L), luaH_new(L, 0, 2)); /* registry */
|
sethvalue(L, registry(L), luaH_new(L, 0, 2)); /* registry */
|
||||||
luaS_init(L);
|
luaS_resize(L, MINSTRTABSIZE); /* initial size of string table */
|
||||||
luaT_init(L);
|
luaT_init(L);
|
||||||
luaX_init(L);
|
luaX_init(L);
|
||||||
|
luaS_fix(luaS_newliteral(L, MEMERRMSG));
|
||||||
g->GCthreshold = 4*g->totalbytes;
|
g->GCthreshold = 4*g->totalbytes;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -88,11 +88,9 @@ typedef struct global_State {
|
|||||||
lua_CFunction panic; /* to be called in unprotected errors */
|
lua_CFunction panic; /* to be called in unprotected errors */
|
||||||
TValue l_registry;
|
TValue l_registry;
|
||||||
struct lua_State *mainthread;
|
struct lua_State *mainthread;
|
||||||
TString *memerrmsg; /* memory-error message */
|
|
||||||
UpVal uvhead; /* head of double-linked list of all open upvalues */
|
UpVal uvhead; /* head of double-linked list of all open upvalues */
|
||||||
struct Table *mt[NUM_TAGS]; /* metatables for basic types */
|
struct Table *mt[NUM_TAGS]; /* metatables for basic types */
|
||||||
TString *tmname[TM_N]; /* array with tag-method names */
|
TString *tmname[TM_N]; /* array with tag-method names */
|
||||||
TString *strcache[STRCACHE_N][STRCACHE_M]; /* cache for strings in API */
|
|
||||||
} global_State;
|
} global_State;
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
@@ -18,9 +18,6 @@
|
|||||||
#include "lstring.h"
|
#include "lstring.h"
|
||||||
|
|
||||||
|
|
||||||
#define MEMERRMSG "not enough memory"
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
void luaS_resize (lua_State *L, int newsize) {
|
void luaS_resize (lua_State *L, int newsize) {
|
||||||
GCObject **newhash;
|
GCObject **newhash;
|
||||||
@@ -75,36 +72,6 @@ static TString *newlstr (lua_State *L, const char *str, size_t l,
|
|||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
/*
|
|
||||||
** Clear API string cache. (Entries cannot be empty, so fill them with
|
|
||||||
** a non-collectable string.)
|
|
||||||
*/
|
|
||||||
void luaS_clearcache (global_State *g) {
|
|
||||||
int i, j;
|
|
||||||
for (i = 0; i < STRCACHE_N; i++)
|
|
||||||
for (j = 0; j < STRCACHE_M; j++) {
|
|
||||||
if (luaS_iswhite(g->strcache[i][j])) /* will entry be collected? */
|
|
||||||
g->strcache[i][j] = g->memerrmsg; /* replace it with something fixed */
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
/*
|
|
||||||
** Initialize the string table and the string cache
|
|
||||||
*/
|
|
||||||
void luaS_init (lua_State *L) {
|
|
||||||
global_State *g = G(L);
|
|
||||||
int i, j;
|
|
||||||
luaS_resize(L, MINSTRTABSIZE); /* initial size of string table */
|
|
||||||
/* pre-create memory-error message */
|
|
||||||
g->memerrmsg = luaS_newliteral(L, MEMERRMSG);
|
|
||||||
luaS_fix(g->memerrmsg); /* it should never be collected */
|
|
||||||
for (i = 0; i < STRCACHE_N; i++) /* fill cache with valid strings */
|
|
||||||
for (j = 0; j < STRCACHE_M; j++)
|
|
||||||
g->strcache[i][j] = g->memerrmsg;
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
// string hash taken from luaJIT
|
// string hash taken from luaJIT
|
||||||
|
|
||||||
/* Unaligned load of uint32_t. */
|
/* Unaligned load of uint32_t. */
|
||||||
@@ -161,10 +128,6 @@ static inline __attribute__((always_inline)) unsigned luaS_hash (const char *str
|
|||||||
#endif
|
#endif
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
/*
|
|
||||||
** new string (with explicit length)
|
|
||||||
*/
|
|
||||||
TString *luaS_newlstr (lua_State *L, const char *str, size_t l) {
|
TString *luaS_newlstr (lua_State *L, const char *str, size_t l) {
|
||||||
GCObject *o;
|
GCObject *o;
|
||||||
unsigned int h = luaS_hash(str, l);
|
unsigned int h = luaS_hash(str, l);
|
||||||
@@ -184,29 +147,6 @@ TString *luaS_newlstr (lua_State *L, const char *str, size_t l) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
/*
|
|
||||||
** Create or reuse a zero-terminated string, first checking in the
|
|
||||||
** cache (using the string address as a key). The cache can contain
|
|
||||||
** only zero-terminated strings, so it is safe to use 'strcmp' to
|
|
||||||
** check hits.
|
|
||||||
*/
|
|
||||||
TString *luaS_new (lua_State *L, const char *str) {
|
|
||||||
unsigned int i = point2uint(str) % STRCACHE_N; /* hash */
|
|
||||||
int j;
|
|
||||||
TString **p = G(L)->strcache[i];
|
|
||||||
for (j = 0; j < STRCACHE_M; j++) {
|
|
||||||
if (strcmp(str, getstr(p[j])) == 0) /* hit? */
|
|
||||||
return p[j]; /* that is it */
|
|
||||||
}
|
|
||||||
/* normal route */
|
|
||||||
for (j = STRCACHE_M - 1; j > 0; j--)
|
|
||||||
p[j] = p[j - 1]; /* move out last element */
|
|
||||||
/* new element is first in the list */
|
|
||||||
p[0] = luaS_newlstr(L, str, strlen(str));
|
|
||||||
return p[0];
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
Udata *luaS_newudata (lua_State *L, size_t s, Table *e) {
|
Udata *luaS_newudata (lua_State *L, size_t s, Table *e) {
|
||||||
Udata *u;
|
Udata *u;
|
||||||
if (l_unlikely(s > MAX_SIZET - sizeof(Udata)))
|
if (l_unlikely(s > MAX_SIZET - sizeof(Udata)))
|
||||||
|
|||||||
+2
-6
@@ -17,19 +17,15 @@
|
|||||||
|
|
||||||
#define sizeudata(u) (sizeof(union Udata)+(u)->len)
|
#define sizeudata(u) (sizeof(union Udata)+(u)->len)
|
||||||
|
|
||||||
//#define luaS_new(L, s) (luaS_newlstr(L, s, strlen(s)))
|
#define luaS_new(L, s) (luaS_newlstr(L, s, strlen(s)))
|
||||||
#define luaS_newliteral(L, s) (luaS_newlstr(L, "" s, \
|
#define luaS_newliteral(L, s) (luaS_newlstr(L, "" s, \
|
||||||
(sizeof(s)/sizeof(char))-1))
|
(sizeof(s)/sizeof(char))-1))
|
||||||
|
|
||||||
#define luaS_iswhite(x) test2bits((x)->tsv.marked, WHITE0BIT, WHITE1BIT)
|
#define luaS_fix(s) l_setbit((s)->tsv.marked, FIXEDBIT)
|
||||||
#define luaS_fix(s) l_setbit((s)->tsv.marked, FIXEDBIT)
|
|
||||||
|
|
||||||
LUAI_FUNC void luaS_resize (lua_State *L, int newsize);
|
LUAI_FUNC void luaS_resize (lua_State *L, int newsize);
|
||||||
LUAI_FUNC void luaS_clearcache (global_State *g);
|
|
||||||
LUAI_FUNC void luaS_init (lua_State *L);
|
|
||||||
LUAI_FUNC Udata *luaS_newudata (lua_State *L, size_t s, Table *e);
|
LUAI_FUNC Udata *luaS_newudata (lua_State *L, size_t s, Table *e);
|
||||||
LUAI_FUNC TString *luaS_newlstr (lua_State *L, const char *str, size_t l);
|
LUAI_FUNC TString *luaS_newlstr (lua_State *L, const char *str, size_t l);
|
||||||
LUAI_FUNC TString *luaS_new (lua_State *L, const char *str);
|
|
||||||
|
|
||||||
|
|
||||||
#endif
|
#endif
|
||||||
+23
-51
@@ -105,42 +105,27 @@ static void callTM (lua_State *L, const TValue *f, const TValue *p1,
|
|||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
/*
|
void luaV_gettable (lua_State *L, TValue *t, TValue *key, StkId val) {
|
||||||
** Finish the table access 'val = t[key]'.
|
int loop;
|
||||||
** if 'slot' is NULL, 't' is not a table; otherwise, 'slot' points to
|
|
||||||
** t[k] entry (which must be nil).
|
|
||||||
*/
|
|
||||||
void luaV_finishget (lua_State *L, TValue *t, TValue *key, StkId val,
|
|
||||||
TValue *slot) {
|
|
||||||
int loop; /* counter to avoid infinite loops */
|
|
||||||
TValue *tm; /* metamethod */
|
|
||||||
for (loop = 0; loop < MAXTAGLOOP; loop++) {
|
for (loop = 0; loop < MAXTAGLOOP; loop++) {
|
||||||
if (slot == NULL) { /* 't' is not a table? */
|
TValue *tm;
|
||||||
lua_assert(!ttistable(t));
|
if (ttistable(t)) { /* `t' is a table? */
|
||||||
tm = luaT_gettmbyobj(L, t, TM_INDEX);
|
Table *h = hvalue(t);
|
||||||
if (l_unlikely(ttisnil(tm)))
|
const TValue *res = luaH_get(h, key); /* do a primitive get */
|
||||||
luaG_typeerror(L, t, "index"); /* no metamethod */
|
if (!ttisnil(res) || /* result is no nil? */
|
||||||
/* else will try the metamethod */
|
(tm = fasttm(L, h->metatable, TM_INDEX)) == NULL) { /* or no TM? */
|
||||||
}
|
setobj2s(L, val, res);
|
||||||
else { /* 't' is a table */
|
|
||||||
lua_assert(ttisnil(slot));
|
|
||||||
tm = fasttm(L, hvalue(t)->metatable, TM_INDEX); /* table's metamethod */
|
|
||||||
if (tm == NULL) { /* no metamethod? */
|
|
||||||
setnilvalue(val); /* result is nil */
|
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
/* else will try the metamethod */
|
/* else will try the tag method */
|
||||||
}
|
}
|
||||||
if (ttisfunction(tm)) { /* is metamethod a function? */
|
else if (l_unlikely(ttisnil(tm = luaT_gettmbyobj(L, t, TM_INDEX))))
|
||||||
callTMres(L, val, tm, t, key); /* call it */
|
luaG_typeerror(L, t, "index");
|
||||||
|
if (ttisfunction(tm)) {
|
||||||
|
callTMres(L, val, tm, t, key);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
t = tm; /* else try to access 'tm[key]' */
|
t = tm; /* else repeat with `tm' */
|
||||||
if (luaV_fastget(L, t, key, slot, luaH_get)) { /* fast track? */
|
|
||||||
setobj2s(L, val, slot); /* done */
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
/* else repeat (tail call 'luaV_finishget') */
|
|
||||||
}
|
}
|
||||||
luaG_runerror(L, "loop in gettable");
|
luaG_runerror(L, "loop in gettable");
|
||||||
}
|
}
|
||||||
@@ -154,12 +139,8 @@ void luaV_settable (lua_State *L, TValue *t, TValue *key, StkId val) {
|
|||||||
Table *h = hvalue(t);
|
Table *h = hvalue(t);
|
||||||
TValue *oldval = luaH_set(L, h, key); /* do a primitive set */
|
TValue *oldval = luaH_set(L, h, key); /* do a primitive set */
|
||||||
/* oldval is nil=> look for newindex, oldval is not nil => look for usedindex */
|
/* oldval is nil=> look for newindex, oldval is not nil => look for usedindex */
|
||||||
if (ttisnil(oldval)) {
|
if (!((ttisnil(oldval) && ((tm = fasttm(L, h->metatable, TM_NEWINDEX)) != NULL)) ||
|
||||||
tm = fasttm(L, h->metatable, TM_NEWINDEX); /* get metamethod */
|
((!ttisnil(oldval)) && ((tm = fasttm(L, h->metatable, TM_USEDINDEX)) != NULL)))) {
|
||||||
} else {
|
|
||||||
tm = fasttm(L, h->metatable, TM_USEDINDEX);
|
|
||||||
}
|
|
||||||
if (tm == NULL) { /* no metamethod? */
|
|
||||||
setobj2t(L, oldval, val);
|
setobj2t(L, oldval, val);
|
||||||
luaC_barriert(L, h, val);
|
luaC_barriert(L, h, val);
|
||||||
return;
|
return;
|
||||||
@@ -397,14 +378,6 @@ static void Arith (lua_State *L, StkId ra, TValue *rb,
|
|||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
/*
|
|
||||||
** copy of 'luaV_gettable', but protecting call to potential metamethod
|
|
||||||
** (which can reallocate the stack)
|
|
||||||
*/
|
|
||||||
#define gettableProtected(L,t,k,v) { TValue *slot; \
|
|
||||||
if (luaV_fastget(L,t,k,slot,luaH_get)) { setobj2s(L, v, slot); } \
|
|
||||||
else Protect(luaV_finishget(L,t,k,v,slot)); }
|
|
||||||
|
|
||||||
|
|
||||||
void luaV_execute (lua_State *L, int nexeccalls) {
|
void luaV_execute (lua_State *L, int nexeccalls) {
|
||||||
LClosure *cl;
|
LClosure *cl;
|
||||||
@@ -414,9 +387,9 @@ void luaV_execute (lua_State *L, int nexeccalls) {
|
|||||||
reentry: /* entry point */
|
reentry: /* entry point */
|
||||||
lua_assert(isLua(L->ci));
|
lua_assert(isLua(L->ci));
|
||||||
pc = L->savedpc;
|
pc = L->savedpc;
|
||||||
cl = &clvalue(L->ci->func)->l; /* local reference to function's closure */
|
cl = &clvalue(L->ci->func)->l;
|
||||||
k = cl->p->k; /* local reference to function's constant table */
|
base = L->base;
|
||||||
base = L->base; /* local copy of function's base */
|
k = cl->p->k;
|
||||||
/* main loop of interpreter */
|
/* main loop of interpreter */
|
||||||
for (;;) {
|
for (;;) {
|
||||||
const Instruction i = *pc++;
|
const Instruction i = *pc++;
|
||||||
@@ -476,7 +449,7 @@ void luaV_execute (lua_State *L, int nexeccalls) {
|
|||||||
StkId ra = RA(i);
|
StkId ra = RA(i);
|
||||||
StkId rb = RB(i);
|
StkId rb = RB(i);
|
||||||
TValue *rc = RKC(i);
|
TValue *rc = RKC(i);
|
||||||
gettableProtected(L, rb, rc, ra);
|
Protect(luaV_gettable(L, rb, rc, ra));
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
case OP_SETGLOBAL: {
|
case OP_SETGLOBAL: {
|
||||||
@@ -512,9 +485,8 @@ void luaV_execute (lua_State *L, int nexeccalls) {
|
|||||||
case OP_SELF: {
|
case OP_SELF: {
|
||||||
StkId ra = RA(i);
|
StkId ra = RA(i);
|
||||||
StkId rb = RB(i);
|
StkId rb = RB(i);
|
||||||
TValue *rc = RKC(i);
|
setobjs2s(L, ra+1, rb);
|
||||||
setobjs2s(L, ra + 1, rb);
|
Protect(luaV_gettable(L, rb, RKC(i), ra));
|
||||||
gettableProtected(L, rb, rc, ra);
|
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
case OP_ADD: {
|
case OP_ADD: {
|
||||||
|
|||||||
+2
-24
@@ -22,34 +22,12 @@
|
|||||||
(ttype(o1) == ttype(o2) && luaV_equalval(L, o1, o2))
|
(ttype(o1) == ttype(o2) && luaV_equalval(L, o1, o2))
|
||||||
|
|
||||||
|
|
||||||
/*
|
|
||||||
** fast track for 'gettable': if 't' is a table and 't[k]' is not nil,
|
|
||||||
** return 1 with 'slot' pointing to 't[k]' (final result). Otherwise,
|
|
||||||
** return 0 (meaning it will have to check metamethod) with 'slot'
|
|
||||||
** pointing to a nil 't[k]' (if 't' is a table) or NULL (otherwise).
|
|
||||||
** 'f' is the raw get function to use.
|
|
||||||
*/
|
|
||||||
#define luaV_fastget(L,t,k,slot,f) \
|
|
||||||
(!ttistable(t) \
|
|
||||||
? (slot = NULL, 0) /* not a table; 'slot' is NULL and result is 0 */ \
|
|
||||||
: (slot = f(hvalue(t), k), /* else, do raw access */ \
|
|
||||||
!ttisnil(slot))) /* result not nil? */
|
|
||||||
|
|
||||||
/*
|
|
||||||
** standard implementation for 'gettable'
|
|
||||||
*/
|
|
||||||
#define luaV_gettable(L,t,k,v) { TValue *slot; \
|
|
||||||
if (luaV_fastget(L,t,k,slot,luaH_get)) { setobj2s(L, v, slot); } \
|
|
||||||
else luaV_finishget(L,t,k,v,slot); }
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
LUAI_FUNC int luaV_lessthan (lua_State *L, TValue *l, TValue *r);
|
LUAI_FUNC int luaV_lessthan (lua_State *L, TValue *l, TValue *r);
|
||||||
LUAI_FUNC int luaV_equalval (lua_State *L, const TValue *t1, const TValue *t2);
|
LUAI_FUNC int luaV_equalval (lua_State *L, const TValue *t1, const TValue *t2);
|
||||||
LUAI_FUNC const TValue *luaV_tonumber (const TValue *obj, TValue *n);
|
LUAI_FUNC const TValue *luaV_tonumber (const TValue *obj, TValue *n);
|
||||||
LUAI_FUNC int luaV_tostring (lua_State *L, StkId obj);
|
LUAI_FUNC int luaV_tostring (lua_State *L, StkId obj);
|
||||||
LUAI_FUNC void luaV_finishget (lua_State *L, TValue *t, TValue *key,
|
LUAI_FUNC void luaV_gettable (lua_State *L, TValue *t, TValue *key,
|
||||||
StkId val, TValue *tm);
|
StkId val);
|
||||||
LUAI_FUNC void luaV_settable (lua_State *L, TValue *t, TValue *key,
|
LUAI_FUNC void luaV_settable (lua_State *L, TValue *t, TValue *key,
|
||||||
StkId val);
|
StkId val);
|
||||||
LUAI_FUNC void luaV_execute (lua_State *L, int nexeccalls);
|
LUAI_FUNC void luaV_execute (lua_State *L, int nexeccalls);
|
||||||
|
|||||||
+55
-39
@@ -62,7 +62,7 @@ static boolean con_started = false; // console has been initialised
|
|||||||
static boolean con_forcepic = true; // at startup toggle console translucency when first off
|
static boolean con_forcepic = true; // at startup toggle console translucency when first off
|
||||||
boolean con_recalc = false; // set true when screen size has changed
|
boolean con_recalc = false; // set true when screen size has changed
|
||||||
|
|
||||||
static tic_t con_tick; // console ticker for anim or blinking prompt cursor
|
static tic_t con_tick; // console ticker for blinking prompt cursor
|
||||||
// con_scrollup should use time (currenttime - lasttime)..
|
// con_scrollup should use time (currenttime - lasttime)..
|
||||||
|
|
||||||
static boolean consoletoggle; // true when console key pushed, ticker will handle
|
static boolean consoletoggle; // true when console key pushed, ticker will handle
|
||||||
@@ -103,6 +103,7 @@ static void CON_InputInit(void);
|
|||||||
static void CON_RecalcSize(void);
|
static void CON_RecalcSize(void);
|
||||||
static void CON_ChangeHeight(void);
|
static void CON_ChangeHeight(void);
|
||||||
|
|
||||||
|
static void CONS_height_Change(void);
|
||||||
static void CONS_hudlines_Change(void);
|
static void CONS_hudlines_Change(void);
|
||||||
static void CONS_backcolor_Change(void);
|
static void CONS_backcolor_Change(void);
|
||||||
|
|
||||||
@@ -131,7 +132,7 @@ static CV_PossibleValue_t speed_cons_t[] = {{0, "MIN"}, {64, "MAX"}, {0, NULL}};
|
|||||||
static consvar_t cons_speed = {"con_speed", "8", CV_SAVE, speed_cons_t, NULL, 0, NULL, NULL, 0, 0, NULL};
|
static consvar_t cons_speed = {"con_speed", "8", CV_SAVE, speed_cons_t, NULL, 0, NULL, NULL, 0, 0, NULL};
|
||||||
|
|
||||||
// percentage of screen height to use for console
|
// percentage of screen height to use for console
|
||||||
static consvar_t cons_height = {"con_height", "50", CV_SAVE, CV_Unsigned, NULL, 0, NULL, NULL, 0, 0, NULL};
|
static consvar_t cons_height = {"con_height", "50", CV_CALL|CV_SAVE, CV_Unsigned, CONS_height_Change, 0, NULL, NULL, 0, 0, NULL};
|
||||||
|
|
||||||
static CV_PossibleValue_t backpic_cons_t[] = {{0, "translucent"}, {1, "picture"}, {0, NULL}};
|
static CV_PossibleValue_t backpic_cons_t[] = {{0, "translucent"}, {1, "picture"}, {0, NULL}};
|
||||||
// whether to use console background picture, or translucent mode
|
// whether to use console background picture, or translucent mode
|
||||||
@@ -173,6 +174,18 @@ consvar_t cons_consoleprintinmenu = {"consoleprintinmenu", "Off", CV_SAVE, CV_On
|
|||||||
|
|
||||||
static void CON_Print(char *msg);
|
static void CON_Print(char *msg);
|
||||||
|
|
||||||
|
// Change the console height on demand
|
||||||
|
//
|
||||||
|
static void CONS_height_Change(void)
|
||||||
|
{
|
||||||
|
Lock_state();
|
||||||
|
|
||||||
|
if (con_destlines > 0 && !con_startup) // If the console is open (as in, not using "bind")...
|
||||||
|
CON_ChangeHeight(); // ...update its height now, not only when it's closed and re-opened
|
||||||
|
|
||||||
|
Unlock_state();
|
||||||
|
}
|
||||||
|
|
||||||
//
|
//
|
||||||
//
|
//
|
||||||
static void CONS_hudlines_Change(void)
|
static void CONS_hudlines_Change(void)
|
||||||
@@ -1437,6 +1450,8 @@ void CONS_Error(const char *msg)
|
|||||||
// dirty quick hack, but for the good cause
|
// dirty quick hack, but for the good cause
|
||||||
while (I_GetKey() != KEY_ENTER)
|
while (I_GetKey() != KEY_ENTER)
|
||||||
{
|
{
|
||||||
|
I_HandleInterrupt();
|
||||||
|
|
||||||
// Sleep so we don't take too much of cpu usage
|
// Sleep so we don't take too much of cpu usage
|
||||||
I_Sleep(1.f/TICRATE*1000);
|
I_Sleep(1.f/TICRATE*1000);
|
||||||
|
|
||||||
@@ -1635,53 +1650,54 @@ static void CON_DrawConsole(void)
|
|||||||
}
|
}
|
||||||
|
|
||||||
// draw console text lines from top to bottom
|
// draw console text lines from top to bottom
|
||||||
if (con_curlines < minheight)
|
if (con_curlines >= minheight)
|
||||||
return;
|
|
||||||
|
|
||||||
i = con_cy - con_scrollup;
|
|
||||||
|
|
||||||
// skip the last empty line due to the cursor being at the start of a new line
|
|
||||||
i--;
|
|
||||||
|
|
||||||
i -= (con_curlines - minheight) / charheight;
|
|
||||||
|
|
||||||
if (rendermode == render_none) return;
|
|
||||||
|
|
||||||
for (y = (con_curlines-minheight) % charheight; y <= con_curlines-minheight; y += charheight, i++)
|
|
||||||
{
|
{
|
||||||
INT32 x;
|
i = con_cy - con_scrollup;
|
||||||
size_t c;
|
|
||||||
|
|
||||||
p = (UINT8 *)&con_buffer[((i > 0 ? i : 0)%con_totallines)*con_width];
|
// skip the last empty line due to the cursor being at the start of a new line
|
||||||
|
i--;
|
||||||
|
|
||||||
for (c = 0, x = charwidth; c < con_width; c++, x += charwidth, p++)
|
i -= (con_curlines - minheight) / charheight;
|
||||||
|
|
||||||
|
if (rendermode == render_none)
|
||||||
|
return;
|
||||||
|
|
||||||
|
for (y = (con_curlines-minheight) % charheight; y <= con_curlines-minheight; y += charheight, i++)
|
||||||
{
|
{
|
||||||
while (*p & 0x80)
|
INT32 x;
|
||||||
|
size_t c;
|
||||||
|
|
||||||
|
p = (UINT8 *)&con_buffer[((i > 0 ? i : 0)%con_totallines)*con_width];
|
||||||
|
|
||||||
|
for (c = 0, x = charwidth; c < con_width; c++, x += charwidth, p++)
|
||||||
{
|
{
|
||||||
charflags = (*p & 0x7f) << V_CHARCOLORSHIFT;
|
while (*p & 0x80)
|
||||||
p++;
|
{
|
||||||
c++;
|
charflags = (*p & 0x7f) << V_CHARCOLORSHIFT;
|
||||||
|
p++;
|
||||||
|
c++;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (c >= con_width)
|
||||||
|
break;
|
||||||
|
|
||||||
|
int emotelen;
|
||||||
|
emote_t *emote;
|
||||||
|
|
||||||
|
if ((emote = M_VerifyEmote((const char *)p, &emotelen)))
|
||||||
|
{
|
||||||
|
M_DrawScaledEmote(x<<FRACBITS, (y+2*con_scalefactor)<<FRACBITS, charwidth*FRACUNIT/EMOTEWIDTH, emote, V_NOSCALESTART|V_NOSCALEPATCH);
|
||||||
|
p += emotelen-1;
|
||||||
|
c += emotelen-1;
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
V_DrawCharacter(x, y, (INT32)(*p) | charflags | cv_constextsize.value | V_NOSCALESTART, !cv_allcaps.value);
|
||||||
}
|
}
|
||||||
|
|
||||||
if (c >= con_width)
|
|
||||||
break;
|
|
||||||
|
|
||||||
int emotelen;
|
|
||||||
emote_t *emote;
|
|
||||||
|
|
||||||
if ((emote = M_VerifyEmote((const char *)p, &emotelen)))
|
|
||||||
{
|
|
||||||
M_DrawScaledEmote(x<<FRACBITS, (y+2*con_scalefactor)<<FRACBITS, charwidth*FRACUNIT/EMOTEWIDTH, emote, V_NOSCALESTART|V_NOSCALEPATCH);
|
|
||||||
p += emotelen-1;
|
|
||||||
c += emotelen-1;
|
|
||||||
continue;
|
|
||||||
}
|
|
||||||
V_DrawCharacter(x, y, (INT32)(*p) | charflags | cv_constextsize.value | V_NOSCALESTART, !cv_allcaps.value);
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
// draw prompt if enough place (not while game startup)
|
// draw prompt if enough place (not while game startup)
|
||||||
if ((con_curlines == con_destlines) && (con_curlines >= minheight) && !con_startup)
|
if ((con_curlines >= (minheight-charheight)) && !con_startup)
|
||||||
CON_DrawInput();
|
CON_DrawInput();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -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};
|
||||||
|
|||||||
@@ -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();
|
||||||
};
|
};
|
||||||
|
|||||||
+56
-13
@@ -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
|
||||||
@@ -125,6 +125,7 @@ static tic_t freezetimeout[MAXNETNODES]; // Until when can this node freeze the
|
|||||||
UINT16 pingmeasurecount = 1;
|
UINT16 pingmeasurecount = 1;
|
||||||
UINT32 realpingtable[MAXPLAYERS] = {}; //the base table of ping where an average will be sent to everyone.
|
UINT32 realpingtable[MAXPLAYERS] = {}; //the base table of ping where an average will be sent to everyone.
|
||||||
UINT32 playerpingtable[MAXPLAYERS] = {}; //table of player latency values.
|
UINT32 playerpingtable[MAXPLAYERS] = {}; //table of player latency values.
|
||||||
|
UINT32 localplayerping = 0;
|
||||||
|
|
||||||
#define GENTLEMANSMOOTHING (TICRATE)
|
#define GENTLEMANSMOOTHING (TICRATE)
|
||||||
static tic_t reference_lag = 0;
|
static tic_t reference_lag = 0;
|
||||||
@@ -356,12 +357,13 @@ void SendNetXCmdForPlayer(UINT8 playerid, netxcmd_t id, const void *param, size_
|
|||||||
|
|
||||||
if (2+nparam > MAXTEXTCMD)
|
if (2+nparam > MAXTEXTCMD)
|
||||||
{
|
{
|
||||||
CONS_Alert(CONS_ERROR, M_GetText("packet too large to fit NetXCmd, cannot add netcmd %d! (size: %s, max: %d)\n"), id, sizeu1(2+nparam), MAXTEXTCMD);
|
CONS_Alert(CONS_ERROR, M_GetText("packet too large to fit NetXCmd, cannot add netcmd %s with id %d! (size: %s, max: %d)\n"), netxcmdnames[id-1], id, sizeu1(2+nparam), MAXTEXTCMD);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
// for future reference: if (cv_debug) != debug disabled.
|
// for future reference: if (cv_debug) != debug disabled.
|
||||||
CONS_Alert(CONS_NOTICE, M_GetText("NetXCmd buffer full, delaying netcmd %d... (size: %d, needed: %s)\n"), id, localtextcmd[playerid][0], sizeu1(nparam));
|
CONS_Alert(CONS_NOTICE, M_GetText("NetXCmd buffer full, delaying netcmd %s with id %d... (size: %d, needed: %s)\n"), netxcmdnames[id-1], id, localtextcmd[playerid][0], sizeu1(nparam));
|
||||||
|
|
||||||
if (buf == NULL)
|
if (buf == NULL)
|
||||||
{
|
{
|
||||||
textcmdbuf[playerid] = (textcmdbuf_t*)Z_Malloc(sizeof(textcmdbuf_t), PU_STATIC, NULL);
|
textcmdbuf[playerid] = (textcmdbuf_t*)Z_Malloc(sizeof(textcmdbuf_t), PU_STATIC, NULL);
|
||||||
@@ -839,11 +841,13 @@ static void resynch_write_ctf(resynchend_pak *rst)
|
|||||||
rst->flagplayer[i] = (SINT8)j;
|
rst->flagplayer[i] = (SINT8)j;
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (j == MAXPLAYERS) // fine, no I_Error
|
if (j == MAXPLAYERS) // fine, no I_Error
|
||||||
{
|
{
|
||||||
CONS_Alert(CONS_ERROR, "One of the flags has gone completely missing...\n");
|
CONS_Alert(CONS_ERROR, "One of the flags has gone completely missing...\n");
|
||||||
rst->flagplayer[i] = -2;
|
rst->flagplayer[i] = -2;
|
||||||
}
|
}
|
||||||
|
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -1133,6 +1137,7 @@ static void CV_SavePlayerNames(UINT8 **p)
|
|||||||
WRITEUINT8(*p, 0);
|
WRITEUINT8(*p, 0);
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
|
|
||||||
WRITESTRING(*p, player_names[i]);
|
WRITESTRING(*p, player_names[i]);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -1146,10 +1151,13 @@ static void CV_LoadPlayerNames(UINT8 **p)
|
|||||||
for (; i < MAXPLAYERS; ++i)
|
for (; i < MAXPLAYERS; ++i)
|
||||||
{
|
{
|
||||||
READSTRING(*p, tmp_name);
|
READSTRING(*p, tmp_name);
|
||||||
|
|
||||||
if (tmp_name[0] == 0)
|
if (tmp_name[0] == 0)
|
||||||
continue;
|
continue;
|
||||||
|
|
||||||
if (tmp_name[MAXPLAYERNAME]) // overflow detected
|
if (tmp_name[MAXPLAYERNAME]) // overflow detected
|
||||||
I_Error("Received bad server config packet when trying to join");
|
I_Error("Received bad server config packet when trying to join");
|
||||||
|
|
||||||
memcpy(player_names[i], tmp_name, MAXPLAYERNAME+1);
|
memcpy(player_names[i], tmp_name, MAXPLAYERNAME+1);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -1447,6 +1455,7 @@ static void CL_DrawConnectionStatus(void)
|
|||||||
if (playerinfo[i].node < 255)
|
if (playerinfo[i].node < 255)
|
||||||
{
|
{
|
||||||
strncpy(player_name, playerinfo[i].name, MAXPLAYERNAME);
|
strncpy(player_name, playerinfo[i].name, MAXPLAYERNAME);
|
||||||
|
player_name[MAXPLAYERNAME] = '\0';
|
||||||
|
|
||||||
// if we get a skin color
|
// if we get a skin color
|
||||||
// try to colourize the player name
|
// try to colourize the player name
|
||||||
@@ -2026,6 +2035,7 @@ static void SV_SendSaveGame(INT32 node, boolean resending)
|
|||||||
P_SaveNetGame(&save, resending);
|
P_SaveNetGame(&save, resending);
|
||||||
|
|
||||||
length = save.p - save.buffer;
|
length = save.p - save.buffer;
|
||||||
|
|
||||||
if (length > SAVEGAMESIZE)
|
if (length > SAVEGAMESIZE)
|
||||||
{
|
{
|
||||||
Z_Free(save.buffer);
|
Z_Free(save.buffer);
|
||||||
@@ -2178,7 +2188,8 @@ static void CL_LoadReceivedSavegame(boolean reloading)
|
|||||||
if (unlink(tmpsave) == -1)
|
if (unlink(tmpsave) == -1)
|
||||||
CONS_Alert(CONS_ERROR, M_GetText("Can't delete %s\n"), tmpsave);
|
CONS_Alert(CONS_ERROR, M_GetText("Can't delete %s\n"), tmpsave);
|
||||||
consistancy[gametic%BACKUPTICS] = Consistancy();
|
consistancy[gametic%BACKUPTICS] = Consistancy();
|
||||||
CON_ToggleOff();
|
if (!reloading)
|
||||||
|
CON_ToggleOff();
|
||||||
|
|
||||||
#ifdef SATURNPAK
|
#ifdef SATURNPAK
|
||||||
// Tell the server we have received and reloaded the gamestate
|
// Tell the server we have received and reloaded the gamestate
|
||||||
@@ -2856,10 +2867,7 @@ static boolean CL_ServerConnectionTicker(const char *tmpsave, tic_t *oldtic, tic
|
|||||||
{
|
{
|
||||||
INT32 key;
|
INT32 key;
|
||||||
|
|
||||||
if (I_Interrupted())
|
I_HandleInterrupt();
|
||||||
{
|
|
||||||
I_Quit();
|
|
||||||
}
|
|
||||||
|
|
||||||
I_OsPolling();
|
I_OsPolling();
|
||||||
|
|
||||||
@@ -3441,7 +3449,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);
|
||||||
}
|
}
|
||||||
@@ -3498,6 +3506,9 @@ void CL_RemovePlayer(INT32 playernum, INT32 reason)
|
|||||||
while ((doomcom->numslots > 1) && !playeringame[doomcom->numslots-1])
|
while ((doomcom->numslots > 1) && !playeringame[doomcom->numslots-1])
|
||||||
doomcom->numslots--;
|
doomcom->numslots--;
|
||||||
|
|
||||||
|
// Unmute slot if player was muted
|
||||||
|
player_muted[playernum] = false;
|
||||||
|
|
||||||
// Reset the name
|
// Reset the name
|
||||||
sprintf(player_names[playernum], "Player %d", playernum+1);
|
sprintf(player_names[playernum], "Player %d", playernum+1);
|
||||||
|
|
||||||
@@ -3756,6 +3767,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)
|
||||||
@@ -3873,6 +3888,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
|
||||||
@@ -3922,6 +3941,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"));
|
||||||
@@ -3976,6 +4002,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,6 +4483,7 @@ void SV_ResetServer(void)
|
|||||||
pingmeasurecount = 1;
|
pingmeasurecount = 1;
|
||||||
memset(realpingtable, 0, sizeof(realpingtable));
|
memset(realpingtable, 0, sizeof(realpingtable));
|
||||||
memset(playerpingtable, 0, sizeof(playerpingtable));
|
memset(playerpingtable, 0, sizeof(playerpingtable));
|
||||||
|
localplayerping = 0;
|
||||||
|
|
||||||
ClearAdminPlayers();
|
ClearAdminPlayers();
|
||||||
|
|
||||||
@@ -4795,7 +4832,7 @@ void CL_RemoveSplitscreenPlayer(UINT8 p)
|
|||||||
// is there a game running
|
// is there a game running
|
||||||
boolean Playing(void)
|
boolean Playing(void)
|
||||||
{
|
{
|
||||||
return (server && serverrunning) || (client && cl_mode == CL_CONNECTED);
|
return ((server && serverrunning) || (client && cl_mode == CL_CONNECTED));
|
||||||
}
|
}
|
||||||
|
|
||||||
boolean SV_SpawnServer(void)
|
boolean SV_SpawnServer(void)
|
||||||
@@ -5396,7 +5433,7 @@ static void PT_ServerCFG(SINT8 node)
|
|||||||
{
|
{
|
||||||
maketic = gametic = neededtic = (tic_t)LONG(netbuffer->u.servercfg.gametic);
|
maketic = gametic = neededtic = (tic_t)LONG(netbuffer->u.servercfg.gametic);
|
||||||
if ((gametype = netbuffer->u.servercfg.gametype) >= NUMGAMETYPES)
|
if ((gametype = netbuffer->u.servercfg.gametype) >= NUMGAMETYPES)
|
||||||
I_Error("Bad gametype in cliserv!");
|
I_Error("Bad gametype %d in cliserv!", gametype);
|
||||||
modifiedgame = netbuffer->u.servercfg.modifiedgame;
|
modifiedgame = netbuffer->u.servercfg.modifiedgame;
|
||||||
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];
|
||||||
@@ -6983,10 +7020,12 @@ static void UpdatePingTable(void)
|
|||||||
|
|
||||||
INT32 i;
|
INT32 i;
|
||||||
|
|
||||||
|
const boolean playing = Playing();
|
||||||
|
|
||||||
if (server)
|
if (server)
|
||||||
{
|
{
|
||||||
//if (Playing() && !(gametime % 8)) // Value chosen based on _my vibes man_ << dont do this for v8 atleast, this is placeboeing ppl to hell and back
|
//if (playing && !(gametime % 8)) // Value chosen based on _my vibes man_ << dont do this for v8 atleast, this is placeboeing ppl to hell and back
|
||||||
if (Playing() && !(gametime % 35)) // update once per second.
|
if (playing && !(gametime % 35)) // update once per second.
|
||||||
PingUpdate();
|
PingUpdate();
|
||||||
|
|
||||||
fastest = 0;
|
fastest = 0;
|
||||||
@@ -7045,6 +7084,10 @@ static void UpdatePingTable(void)
|
|||||||
else
|
else
|
||||||
lowest_lag = simulated_lag = 0;
|
lowest_lag = simulated_lag = 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// this is really dumb but oh well
|
||||||
|
if (playing && !(gametime % 35))
|
||||||
|
localplayerping = playerpingtable[consoleplayer];
|
||||||
}
|
}
|
||||||
|
|
||||||
#ifdef HOLEPUNCH
|
#ifdef HOLEPUNCH
|
||||||
|
|||||||
@@ -650,6 +650,8 @@ extern UINT8 playernode[MAXPLAYERS];
|
|||||||
|
|
||||||
extern boolean player_muted[MAXPLAYERS];
|
extern boolean player_muted[MAXPLAYERS];
|
||||||
|
|
||||||
|
extern UINT32 localplayerping;
|
||||||
|
|
||||||
INT32 D_NumPlayers(void);
|
INT32 D_NumPlayers(void);
|
||||||
|
|
||||||
void D_ResetTiccmds(void);
|
void D_ResetTiccmds(void);
|
||||||
|
|||||||
+19
-30
@@ -154,7 +154,7 @@ boolean music_disabled = false;
|
|||||||
INT32 debugload = 0;
|
INT32 debugload = 0;
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
char savegamename[256];
|
char savegamename[256] = {};
|
||||||
|
|
||||||
char srb2home[256] = ".";
|
char srb2home[256] = ".";
|
||||||
char srb2path[256] = ".";
|
char srb2path[256] = ".";
|
||||||
@@ -275,20 +275,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)
|
||||||
@@ -726,10 +712,7 @@ void D_SRB2Loop(void)
|
|||||||
|
|
||||||
enterprecise = I_GetPreciseTime();
|
enterprecise = I_GetPreciseTime();
|
||||||
|
|
||||||
if (I_Interrupted())
|
I_HandleInterrupt();
|
||||||
{
|
|
||||||
I_Quit();
|
|
||||||
}
|
|
||||||
|
|
||||||
memset(&g_dc, 0, sizeof(g_dc));
|
memset(&g_dc, 0, sizeof(g_dc));
|
||||||
Z_Frame_Reset();
|
Z_Frame_Reset();
|
||||||
@@ -1162,7 +1145,7 @@ static void D_FindAddonsToAutoload(void)
|
|||||||
// you can probably imagine how that goes in a netgame....
|
// you can probably imagine how that goes in a netgame....
|
||||||
if (W_CheckAutoLoadContainsMap(wadsToAutoload))
|
if (W_CheckAutoLoadContainsMap(wadsToAutoload))
|
||||||
{
|
{
|
||||||
CONS_Printf("Autoload: file %s contains map data! skipping...", wadsToAutoload);
|
CONS_Alert(CONS_WARNING, "Autoload: file %s contains map data, this WILL cause crashes and desynchs! skipping...\n", wadsToAutoload);
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -1356,20 +1339,24 @@ static void IdentifyVersion(void)
|
|||||||
//
|
//
|
||||||
// search for maps
|
// search for maps
|
||||||
//
|
//
|
||||||
static void D_CheckMaps(boolean checkreplaced)
|
static void D_CheckMapReplacements(boolean pwad)
|
||||||
{
|
{
|
||||||
INT32 i;
|
INT32 i;
|
||||||
char *name;
|
char *name;
|
||||||
UINT16 wadnum;
|
UINT16 wadnum;
|
||||||
lumpinfo_t *lumpinfo;
|
lumpinfo_t *lumpinfo;
|
||||||
|
size_t numfiles;
|
||||||
|
|
||||||
for (wadnum = 0; wadnum < mainwads; wadnum++)
|
wadnum = pwad ? (mainwads+1) : 0;
|
||||||
|
numfiles = pwad ? numwadfiles : mainwads;
|
||||||
|
|
||||||
|
for (; wadnum < numfiles; wadnum++)
|
||||||
{
|
{
|
||||||
lumpinfo = wadfiles[wadnum]->lumpinfo;
|
lumpinfo = wadfiles[wadnum]->lumpinfo;
|
||||||
for (i = 0; i < wadfiles[wadnum]->numlumps; i++, lumpinfo++)
|
for (i = 0; i < wadfiles[wadnum]->numlumps; i++, lumpinfo++)
|
||||||
{
|
{
|
||||||
name = lumpinfo->name;
|
name = lumpinfo->name;
|
||||||
P_CheckMapReplacements(name, checkreplaced);
|
P_CheckMapReplacements(name, pwad);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -1832,17 +1819,19 @@ void D_SRB2Main(void)
|
|||||||
// conversion sometimes needs the palette
|
// conversion sometimes needs the palette
|
||||||
V_ReloadPalette();
|
V_ReloadPalette();
|
||||||
|
|
||||||
D_CheckMaps(false);
|
D_CheckMapReplacements(false);
|
||||||
|
|
||||||
W_InitMultipleFiles(startuppwads, startuppwadcount, true);
|
|
||||||
|
|
||||||
// Only search for pwad maps if we actually have a pwad added
|
|
||||||
if (startuppwadcount > 0)
|
if (startuppwadcount > 0)
|
||||||
{
|
{
|
||||||
D_CheckMaps(true);
|
CONS_Printf("W_InitMultipleFiles(): Adding extra PWADs.\n");
|
||||||
|
W_InitMultipleFiles(startuppwads, startuppwadcount, true);
|
||||||
|
|
||||||
|
// Only search for pwad maps if we actually have a pwad added
|
||||||
|
D_CheckMapReplacements(true);
|
||||||
|
|
||||||
|
D_CleanFile(startuppwads, startuppwadcount);
|
||||||
}
|
}
|
||||||
|
|
||||||
D_CleanFile(startuppwads, startuppwadcount);
|
|
||||||
startuppwadcount = 0;
|
startuppwadcount = 0;
|
||||||
|
|
||||||
cht_Init();
|
cht_Init();
|
||||||
@@ -1929,7 +1918,7 @@ void D_SRB2Main(void)
|
|||||||
CONS_Printf("R_Init(): Init SRB2 refresh daemon.\n");
|
CONS_Printf("R_Init(): Init SRB2 refresh daemon.\n");
|
||||||
R_Init();
|
R_Init();
|
||||||
|
|
||||||
#if SOUND==SOUND_DUMMY
|
#if SOUND == SOUND_DUMMY
|
||||||
sound_disabled = true;
|
sound_disabled = true;
|
||||||
music_disabled = true;
|
music_disabled = true;
|
||||||
#else
|
#else
|
||||||
|
|||||||
+46
-14
@@ -150,6 +150,7 @@ static void Command_ListWADS_f(void);
|
|||||||
static void Command_LocateLump_f(void);
|
static void Command_LocateLump_f(void);
|
||||||
static void Command_ListDoomednums_f(void);
|
static void Command_ListDoomednums_f(void);
|
||||||
static void Command_ListUnusedSprites_f(void);
|
static void Command_ListUnusedSprites_f(void);
|
||||||
|
static void Command_ListUnusedMapSlots_f(void);
|
||||||
static void Command_RunSOC(void);
|
static void Command_RunSOC(void);
|
||||||
static void Command_Pause(void);
|
static void Command_Pause(void);
|
||||||
static void Command_Respawn(void);
|
static void Command_Respawn(void);
|
||||||
@@ -565,6 +566,7 @@ const char *netxcmdnames[MAXNETXCMD - 1] =
|
|||||||
"MODIFYVOTE",
|
"MODIFYVOTE",
|
||||||
"PICKVOTE",
|
"PICKVOTE",
|
||||||
"REMOVEPLAYER",
|
"REMOVEPLAYER",
|
||||||
|
"DISCORD",
|
||||||
"LUACMD",
|
"LUACMD",
|
||||||
"LUAVAR"
|
"LUAVAR"
|
||||||
};
|
};
|
||||||
@@ -645,6 +647,7 @@ void D_RegisterServerCommands(void)
|
|||||||
COM_AddCommand("locatelump", Command_LocateLump_f);
|
COM_AddCommand("locatelump", Command_LocateLump_f);
|
||||||
COM_AddCommand("listmapthings", Command_ListDoomednums_f);
|
COM_AddCommand("listmapthings", Command_ListDoomednums_f);
|
||||||
COM_AddCommand("listunusedsprites", Command_ListUnusedSprites_f);
|
COM_AddCommand("listunusedsprites", Command_ListUnusedSprites_f);
|
||||||
|
COM_AddCommand("listunusedmapslots", Command_ListUnusedMapSlots_f);
|
||||||
|
|
||||||
COM_AddCommand("runsoc", Command_RunSOC);
|
COM_AddCommand("runsoc", Command_RunSOC);
|
||||||
COM_AddCommand("pause", Command_Pause);
|
COM_AddCommand("pause", Command_Pause);
|
||||||
@@ -928,8 +931,6 @@ void D_RegisterClientCommands(void)
|
|||||||
|
|
||||||
COM_AddCommand("displayplayer", Command_Displayplayer_f);
|
COM_AddCommand("displayplayer", Command_Displayplayer_f);
|
||||||
|
|
||||||
CV_RegisterVar(&cv_audbuffersize);
|
|
||||||
|
|
||||||
CV_RegisterVar(&cv_palette);
|
CV_RegisterVar(&cv_palette);
|
||||||
CV_RegisterVar(&cv_palettenum);
|
CV_RegisterVar(&cv_palettenum);
|
||||||
|
|
||||||
@@ -940,6 +941,9 @@ void D_RegisterClientCommands(void)
|
|||||||
CV_RegisterVar(&cv_chatspamprotection);
|
CV_RegisterVar(&cv_chatspamprotection);
|
||||||
CV_RegisterVar(&cv_consolechat);
|
CV_RegisterVar(&cv_consolechat);
|
||||||
CV_RegisterVar(&cv_chatnotifications);
|
CV_RegisterVar(&cv_chatnotifications);
|
||||||
|
CV_RegisterVar(&cv_chat_xoffset);
|
||||||
|
CV_RegisterVar(&cv_chat_yoffset);
|
||||||
|
CV_RegisterVar(&cv_chat_showlimit);
|
||||||
CV_RegisterVar(&cv_chatbacktint);
|
CV_RegisterVar(&cv_chatbacktint);
|
||||||
CV_RegisterVar(&cv_chatcentertext);
|
CV_RegisterVar(&cv_chatcentertext);
|
||||||
CV_RegisterVar(&cv_songcredits);
|
CV_RegisterVar(&cv_songcredits);
|
||||||
@@ -1005,9 +1009,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);
|
||||||
@@ -1027,6 +1039,7 @@ void D_RegisterClientCommands(void)
|
|||||||
CV_RegisterVar(&cv_midimusicvolume);
|
CV_RegisterVar(&cv_midimusicvolume);
|
||||||
#endif
|
#endif
|
||||||
CV_RegisterVar(&cv_numChannels);
|
CV_RegisterVar(&cv_numChannels);
|
||||||
|
CV_RegisterVar(&cv_audbuffersize);
|
||||||
|
|
||||||
#ifdef HAVE_OPENMPT
|
#ifdef HAVE_OPENMPT
|
||||||
CV_RegisterVar(&cv_modfilter);
|
CV_RegisterVar(&cv_modfilter);
|
||||||
@@ -1548,8 +1561,8 @@ static void SendNameAndColor(UINT8 splitplayer)
|
|||||||
// TODO: make those cvars arrays
|
// TODO: make those cvars arrays
|
||||||
consvar_t *playercolor, *playername, *playerskin;
|
consvar_t *playercolor, *playername, *playerskin;
|
||||||
consvar_t *colorvars[] = {&cv_playercolor, &cv_playercolor2, &cv_playercolor3, &cv_playercolor4};
|
consvar_t *colorvars[] = {&cv_playercolor, &cv_playercolor2, &cv_playercolor3, &cv_playercolor4};
|
||||||
consvar_t *namevars[] = {&cv_playername, &cv_playername2, &cv_playername3, &cv_playername4};
|
consvar_t *namevars[] = {&cv_playername, &cv_playername2, &cv_playername3, &cv_playername4};
|
||||||
consvar_t *skinvars[] = {&cv_skin, &cv_skin2, &cv_skin3, &cv_skin4};
|
consvar_t *skinvars[] = {&cv_skin, &cv_skin2, &cv_skin3, &cv_skin4};
|
||||||
|
|
||||||
playercolor = colorvars[splitplayer];
|
playercolor = colorvars[splitplayer];
|
||||||
playername = namevars[splitplayer];
|
playername = namevars[splitplayer];
|
||||||
@@ -1793,7 +1806,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;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -4591,6 +4604,23 @@ void Command_ListUnusedSprites_f(void)
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
void Command_ListUnusedMapSlots_f(void)
|
||||||
|
{
|
||||||
|
INT32 i;
|
||||||
|
|
||||||
|
CONS_Printf("\x82Printing map slot non-usage...\n");
|
||||||
|
|
||||||
|
for (i = 0; i < NUMMAPS; i++)
|
||||||
|
{
|
||||||
|
// is checking this enough?
|
||||||
|
if (mapheaderinfo[i])
|
||||||
|
continue;
|
||||||
|
|
||||||
|
CONS_Printf("%s\n", G_BuildMapName(i+1));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
// =========================================================================
|
// =========================================================================
|
||||||
// MISC. COMMANDS
|
// MISC. COMMANDS
|
||||||
// =========================================================================
|
// =========================================================================
|
||||||
@@ -5471,7 +5501,6 @@ static void Name_OnChange(void)
|
|||||||
}
|
}
|
||||||
|
|
||||||
SendNameAndColor(0);
|
SendNameAndColor(0);
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
static void Name2_OnChange(void)
|
static void Name2_OnChange(void)
|
||||||
@@ -5662,19 +5691,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.
|
||||||
|
|||||||
+1
-4
@@ -51,10 +51,6 @@ extern consvar_t cv_mousevisible;
|
|||||||
//WTF
|
//WTF
|
||||||
extern consvar_t cv_mouseturn;
|
extern consvar_t cv_mouseturn;
|
||||||
extern consvar_t cv_usejoystick[4]; //MAXSPLITSCREENPLAYERS
|
extern consvar_t cv_usejoystick[4]; //MAXSPLITSCREENPLAYERS
|
||||||
#ifdef LJOYSTICK
|
|
||||||
extern consvar_t cv_joyport;
|
|
||||||
extern consvar_t cv_joyport2;
|
|
||||||
#endif
|
|
||||||
extern consvar_t cv_joyscale[4]; //MAXSPLITSCREENPLAYERS
|
extern consvar_t cv_joyscale[4]; //MAXSPLITSCREENPLAYERS
|
||||||
|
|
||||||
// normally in p_mobj but the .h is not read
|
// normally in p_mobj but the .h is not read
|
||||||
@@ -153,6 +149,7 @@ extern consvar_t cv_showminimapnames;
|
|||||||
extern consvar_t cv_showminimapfinished;
|
extern consvar_t cv_showminimapfinished;
|
||||||
extern consvar_t cv_minihead;
|
extern consvar_t cv_minihead;
|
||||||
extern consvar_t cv_showminimapangle;
|
extern consvar_t cv_showminimapangle;
|
||||||
|
extern consvar_t cv_spinoutroll;
|
||||||
|
|
||||||
extern consvar_t cv_showlapemblem;
|
extern consvar_t cv_showlapemblem;
|
||||||
|
|
||||||
|
|||||||
+33
-19
@@ -167,7 +167,9 @@ UINT8 *PutFileNeeded(UINT16 firstfile)
|
|||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
|
|
||||||
nameonly(strcpy(wadfilename, wadfiles[i]->filename));
|
strncpy(wadfilename, wadfiles[i]->filename, MAX_WADPATH);
|
||||||
|
wadfilename[MAX_WADPATH-1] = '\0';
|
||||||
|
nameonly(wadfilename);
|
||||||
|
|
||||||
// Look below at the WRITE macros to understand what these numbers mean.
|
// Look below at the WRITE macros to understand what these numbers mean.
|
||||||
const size_t len = strlen(wadfilename) + 1;
|
const size_t len = strlen(wadfilename) + 1;
|
||||||
@@ -257,9 +259,10 @@ void CL_PrepareDownloadSaveGame(const char *tmpsave)
|
|||||||
*/
|
*/
|
||||||
boolean CL_CheckDownloadable(void)
|
boolean CL_CheckDownloadable(void)
|
||||||
{
|
{
|
||||||
UINT8 i,dlstatus = 0;
|
UINT8 i, dlstatus = 0;
|
||||||
|
|
||||||
for (i = 0; i < fileneedednum; i++)
|
for (i = 0; i < fileneedednum; i++)
|
||||||
|
{
|
||||||
if (fileneeded[i].status != FS_FOUND && fileneeded[i].status != FS_OPEN)
|
if (fileneeded[i].status != FS_FOUND && fileneeded[i].status != FS_OPEN)
|
||||||
{
|
{
|
||||||
if (fileneeded[i].willsend == 1)
|
if (fileneeded[i].willsend == 1)
|
||||||
@@ -270,6 +273,7 @@ boolean CL_CheckDownloadable(void)
|
|||||||
else //if (fileneeded[i].willsend == 2)
|
else //if (fileneeded[i].willsend == 2)
|
||||||
dlstatus = 2;
|
dlstatus = 2;
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
|
||||||
// Downloading locally disabled
|
// Downloading locally disabled
|
||||||
if (!dlstatus && M_CheckParm("-nodownload"))
|
if (!dlstatus && M_CheckParm("-nodownload"))
|
||||||
@@ -280,15 +284,17 @@ boolean CL_CheckDownloadable(void)
|
|||||||
|
|
||||||
// not downloadable, put reason in console
|
// not downloadable, put reason in console
|
||||||
CONS_Alert(CONS_NOTICE, M_GetText("You need additional files to connect to this server:\n"));
|
CONS_Alert(CONS_NOTICE, M_GetText("You need additional files to connect to this server:\n"));
|
||||||
|
|
||||||
for (i = 0; i < fileneedednum; i++)
|
for (i = 0; i < fileneedednum; i++)
|
||||||
|
{
|
||||||
if (fileneeded[i].status != FS_FOUND && fileneeded[i].status != FS_OPEN)
|
if (fileneeded[i].status != FS_FOUND && fileneeded[i].status != FS_OPEN)
|
||||||
{
|
{
|
||||||
CONS_Printf(" * \"%s\" (%dK)", fileneeded[i].filename, fileneeded[i].totalsize >> 10);
|
CONS_Printf(" * \"%s\" (%dK)", fileneeded[i].filename, fileneeded[i].totalsize >> 10);
|
||||||
|
|
||||||
if (fileneeded[i].status == FS_MD5SUMBAD)
|
if (fileneeded[i].status == FS_MD5SUMBAD)
|
||||||
CONS_Printf(M_GetText(" wrong version, md5: "));
|
CONS_Printf(M_GetText(" wrong version, md5: "));
|
||||||
else
|
else
|
||||||
CONS_Printf(M_GetText(" not found, md5: "));
|
CONS_Printf(M_GetText(" not found, md5: "));
|
||||||
|
|
||||||
{
|
{
|
||||||
INT32 j;
|
INT32 j;
|
||||||
@@ -299,6 +305,7 @@ boolean CL_CheckDownloadable(void)
|
|||||||
}
|
}
|
||||||
CONS_Printf("\n");
|
CONS_Printf("\n");
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
|
||||||
switch (dlstatus)
|
switch (dlstatus)
|
||||||
{
|
{
|
||||||
@@ -312,6 +319,7 @@ boolean CL_CheckDownloadable(void)
|
|||||||
CONS_Printf(M_GetText("All files downloadable, but you have chosen to disable downloading locally.\n"));
|
CONS_Printf(M_GetText("All files downloadable, but you have chosen to disable downloading locally.\n"));
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -549,7 +557,7 @@ INT32 CL_CheckFiles(void)
|
|||||||
if (fileneeded[i].status != FS_OPEN)
|
if (fileneeded[i].status != FS_OPEN)
|
||||||
filestoload++;
|
filestoload++;
|
||||||
|
|
||||||
if (fileneeded[i].status != FS_NOTCHECKED) //since we're running this over multiple tics now, its possible for us to come across files checked in previous tics
|
if (fileneeded[i].status != FS_NOTCHECKED) // since we're running this over multiple tics now, its possible for us to come across files checked in previous tics
|
||||||
continue;
|
continue;
|
||||||
|
|
||||||
CONS_Debug(DBG_NETPLAY, "searching for '%s' ", fileneeded[i].filename);
|
CONS_Debug(DBG_NETPLAY, "searching for '%s' ", fileneeded[i].filename);
|
||||||
@@ -557,14 +565,18 @@ INT32 CL_CheckFiles(void)
|
|||||||
// Check in already loaded files
|
// Check in already loaded files
|
||||||
for (j = mainwads+1; j < numwadfiles; j++)
|
for (j = mainwads+1; j < numwadfiles; j++)
|
||||||
{
|
{
|
||||||
nameonly(strcpy(wadfilename, wadfiles[j]->filename));
|
if (!memcmp(wadfiles[j]->md5sum, fileneeded[i].md5sum, 16))
|
||||||
|
|
||||||
if (fasticmp(wadfilename, fileneeded[i].filename) &&
|
|
||||||
!memcmp(wadfiles[j]->md5sum, fileneeded[i].md5sum, 16))
|
|
||||||
{
|
{
|
||||||
CONS_Debug(DBG_NETPLAY, "already loaded\n");
|
strncpy(wadfilename, wadfiles[j]->filename, MAX_WADPATH);
|
||||||
fileneeded[i].status = FS_OPEN;
|
wadfilename[MAX_WADPATH-1] = '\0';
|
||||||
return 4;
|
nameonly(wadfilename);
|
||||||
|
|
||||||
|
if (fasticmp(wadfilename, fileneeded[i].filename))
|
||||||
|
{
|
||||||
|
CONS_Debug(DBG_NETPLAY, "already loaded\n");
|
||||||
|
fileneeded[i].status = FS_OPEN;
|
||||||
|
return 4;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -645,7 +657,7 @@ boolean CL_LoadServerFiles(void)
|
|||||||
else
|
else
|
||||||
{
|
{
|
||||||
const char *s;
|
const char *s;
|
||||||
switch(fileneeded[i].status)
|
switch (fileneeded[i].status)
|
||||||
{
|
{
|
||||||
case FS_NOTFOUND:
|
case FS_NOTFOUND:
|
||||||
s = "FS_NOTFOUND";
|
s = "FS_NOTFOUND";
|
||||||
@@ -688,7 +700,7 @@ static boolean SV_SendFile(INT32 node, const char *filename, UINT8 fileid)
|
|||||||
|
|
||||||
char wadfilename[MAX_WADPATH];
|
char wadfilename[MAX_WADPATH];
|
||||||
|
|
||||||
if (cv_noticedownload.value)
|
if (cv_noticedownload.value && I_GetNodeAddress)
|
||||||
CONS_Printf("Sending file \"%s\" (id %d) to node %d (%s)\n", filename, fileid, node, I_GetNodeAddress(node));
|
CONS_Printf("Sending file \"%s\" (id %d) to node %d (%s)\n", filename, fileid, node, I_GetNodeAddress(node));
|
||||||
|
|
||||||
// Find the last file in the list and set a pointer to its "next" field
|
// Find the last file in the list and set a pointer to its "next" field
|
||||||
@@ -713,7 +725,9 @@ static boolean SV_SendFile(INT32 node, const char *filename, UINT8 fileid)
|
|||||||
// Look for the requested file through all loaded files
|
// Look for the requested file through all loaded files
|
||||||
for (wadnum = 0; wadfiles[wadnum]; wadnum++)
|
for (wadnum = 0; wadfiles[wadnum]; wadnum++)
|
||||||
{
|
{
|
||||||
strlcpy(wadfilename, wadfiles[wadnum]->filename, MAX_WADPATH);
|
// im a certified strlcpy hater
|
||||||
|
strncpy(wadfilename, wadfiles[wadnum]->filename, MAX_WADPATH);
|
||||||
|
wadfilename[MAX_WADPATH-1] = '\0';
|
||||||
nameonly(wadfilename);
|
nameonly(wadfilename);
|
||||||
|
|
||||||
if (fasticmp(wadfilename, p->id.filename))
|
if (fasticmp(wadfilename, p->id.filename))
|
||||||
@@ -1066,7 +1080,7 @@ void Got_Filetxpak(void)
|
|||||||
{
|
{
|
||||||
const char *s;
|
const char *s;
|
||||||
|
|
||||||
switch(file->status)
|
switch (file->status)
|
||||||
{
|
{
|
||||||
case FS_NOTFOUND:
|
case FS_NOTFOUND:
|
||||||
s = "FS_NOTFOUND";
|
s = "FS_NOTFOUND";
|
||||||
@@ -1194,7 +1208,7 @@ filestatus_t checkfilemd5(char *filename, const UINT8 *wantedmd5sum)
|
|||||||
fhandle = fopen(filename, "rb");
|
fhandle = fopen(filename, "rb");
|
||||||
if (fhandle)
|
if (fhandle)
|
||||||
{
|
{
|
||||||
md5_stream(fhandle,md5sum);
|
md5_stream(fhandle, md5sum);
|
||||||
fclose(fhandle);
|
fclose(fhandle);
|
||||||
if (!memcmp(wantedmd5sum, md5sum, 16))
|
if (!memcmp(wantedmd5sum, md5sum, 16))
|
||||||
return FS_FOUND;
|
return FS_FOUND;
|
||||||
|
|||||||
@@ -566,6 +566,8 @@ typedef struct player_s
|
|||||||
fixed_t fovadd; // adjust FOV for hw rendering
|
fixed_t fovadd; // adjust FOV for hw rendering
|
||||||
|
|
||||||
SINT8 driftlevel; // just for controller rumble for now
|
SINT8 driftlevel; // just for controller rumble for now
|
||||||
|
|
||||||
|
UINT8 stairjank;
|
||||||
} player_t;
|
} player_t;
|
||||||
|
|
||||||
#endif
|
#endif
|
||||||
+82
-32
@@ -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,16 +525,23 @@ 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);
|
|
||||||
|
if (!txt)
|
||||||
|
I_Error("I_OutputMsg: Out of memory!\n");
|
||||||
|
|
||||||
|
va_start(argptr, fmt);
|
||||||
vsprintf(txt, fmt, argptr);
|
vsprintf(txt, fmt, argptr);
|
||||||
va_end(argptr);
|
va_end(argptr);
|
||||||
|
|
||||||
@@ -1413,6 +1425,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();
|
||||||
@@ -1802,20 +1820,12 @@ const char *I_ClipboardPaste(void)
|
|||||||
*/
|
*/
|
||||||
static boolean isWadPathOk(const char *path)
|
static boolean isWadPathOk(const char *path)
|
||||||
{
|
{
|
||||||
char *wad3path = malloc(256);
|
char *wad3path = (char*)(malloc(256));
|
||||||
|
|
||||||
if (!wad3path)
|
if (!wad3path)
|
||||||
return false;
|
return false;
|
||||||
|
|
||||||
sprintf(wad3path, pandf, path, WADKEYWORD1);
|
sprintf(wad3path, pandf, path, WADKEYWORD);
|
||||||
|
|
||||||
if (FIL_ReadFileOK(wad3path))
|
|
||||||
{
|
|
||||||
free(wad3path);
|
|
||||||
return true;
|
|
||||||
}
|
|
||||||
|
|
||||||
sprintf(wad3path, pandf, path, WADKEYWORD2);
|
|
||||||
|
|
||||||
if (FIL_ReadFileOK(wad3path))
|
if (FIL_ReadFileOK(wad3path))
|
||||||
{
|
{
|
||||||
@@ -1832,12 +1842,17 @@ static void pathonly(char *s)
|
|||||||
size_t j;
|
size_t j;
|
||||||
|
|
||||||
for (j = strlen(s); j != (size_t)-1; j--)
|
for (j = strlen(s); 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,7 +1868,7 @@ static const char *searchWad(const char *searchDir)
|
|||||||
static char tempsw[256] = "";
|
static char tempsw[256] = "";
|
||||||
filestatus_t fstemp;
|
filestatus_t fstemp;
|
||||||
|
|
||||||
strcpy(tempsw, WADKEYWORD1);
|
strcpy(tempsw, WADKEYWORD);
|
||||||
fstemp = filesearch(tempsw, searchDir, NULL, true, 20);
|
fstemp = filesearch(tempsw, searchDir, NULL, true, 20);
|
||||||
if (fstemp == FS_FOUND)
|
if (fstemp == FS_FOUND)
|
||||||
{
|
{
|
||||||
@@ -1974,17 +1989,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 +2029,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 +2068,7 @@ size_t I_GetFreeMem(size_t *total)
|
|||||||
{
|
{
|
||||||
// Error
|
// Error
|
||||||
if (total)
|
if (total)
|
||||||
*total = 0L;
|
*total = 0;
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -2057,12 +2077,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 +2096,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 +2104,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
|
||||||
}
|
}
|
||||||
|
|||||||
+88
-49
@@ -337,12 +337,14 @@ static void readfreeslots(MYFILE *f)
|
|||||||
{
|
{
|
||||||
if (used_spr[(i-SPR_FIRSTFREESLOT)/8] & (1<<(i%8)))
|
if (used_spr[(i-SPR_FIRSTFREESLOT)/8] & (1<<(i%8)))
|
||||||
{
|
{
|
||||||
if (!sprnames[i][4] && memcmp(sprnames[i],word,4)==0)
|
if (!sprnames[i][4] && memcmp(sprnames[i], word, 4) == 0)
|
||||||
sprnames[i][4] = (char)f->wad;
|
sprnames[i][4] = (char)f->wad;
|
||||||
|
|
||||||
continue; // Already allocated, next.
|
continue; // Already allocated, next.
|
||||||
}
|
}
|
||||||
|
|
||||||
// Found a free slot!
|
// Found a free slot!
|
||||||
strncpy(sprnames[i],word,4);
|
strncpy(sprnames[i], word, 4);
|
||||||
//sprnames[i][4] = 0;
|
//sprnames[i][4] = 0;
|
||||||
CONS_Printf("Sprite SPR_%s allocated.\n",word);
|
CONS_Printf("Sprite SPR_%s allocated.\n",word);
|
||||||
|
|
||||||
@@ -351,22 +353,26 @@ static void readfreeslots(MYFILE *f)
|
|||||||
used_spr[(i-SPR_FIRSTFREESLOT)/8] |= 1<<(i%8); // Okay, this sprite slot has been named now.
|
used_spr[(i-SPR_FIRSTFREESLOT)/8] |= 1<<(i%8); // Okay, this sprite slot has been named now.
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (i > SPR_LASTFREESLOT)
|
if (i > SPR_LASTFREESLOT)
|
||||||
I_Error("Out of Sprite Freeslots while allocating \"%s\"\nLoad less addons to fix this.", word);
|
I_Error("Out of Sprite Freeslots while allocating \"%s\"\nLoad less addons to fix this.", word);
|
||||||
}
|
}
|
||||||
else if (fastcmp(type, "S"))
|
else if (fastcmp(type, "S"))
|
||||||
{
|
{
|
||||||
for (i = 0; i < NUMSTATEFREESLOTS; i++)
|
for (i = 0; i < NUMSTATEFREESLOTS; i++)
|
||||||
if (!FREE_STATES[i]) {
|
{
|
||||||
CONS_Printf("State S_%s allocated.\n",word);
|
if (!FREE_STATES[i])
|
||||||
|
{
|
||||||
|
CONS_Printf("State S_%s allocated.\n", word);
|
||||||
|
|
||||||
LUA_InvalidateMathlibCache(va("S_%s", word));
|
LUA_InvalidateMathlibCache(va("S_%s", word));
|
||||||
|
|
||||||
FREE_STATES[i] = Z_Malloc(strlen(word)+1, PU_STATIC, NULL);
|
FREE_STATES[i] = Z_Malloc(strlen(word)+1, PU_STATIC, NULL);
|
||||||
strcpy(FREE_STATES[i],word);
|
strcpy(FREE_STATES[i], word);
|
||||||
freeslotusage[0][0]++;
|
freeslotusage[0][0]++;
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
|
||||||
if (i == NUMSTATEFREESLOTS)
|
if (i == NUMSTATEFREESLOTS)
|
||||||
I_Error("Out of State Freeslots while allocating \"%s\"\nLoad less addons to fix this.", word);
|
I_Error("Out of State Freeslots while allocating \"%s\"\nLoad less addons to fix this.", word);
|
||||||
@@ -374,16 +380,19 @@ static void readfreeslots(MYFILE *f)
|
|||||||
else if (fastcmp(type, "MT"))
|
else if (fastcmp(type, "MT"))
|
||||||
{
|
{
|
||||||
for (i = 0; i < NUMMOBJFREESLOTS; i++)
|
for (i = 0; i < NUMMOBJFREESLOTS; i++)
|
||||||
if (!FREE_MOBJS[i]) {
|
{
|
||||||
CONS_Printf("MobjType MT_%s allocated.\n",word);
|
if (!FREE_MOBJS[i])
|
||||||
|
{
|
||||||
|
CONS_Printf("MobjType MT_%s allocated.\n", word);
|
||||||
|
|
||||||
LUA_InvalidateMathlibCache(va("MT_%s", word));
|
LUA_InvalidateMathlibCache(va("MT_%s", word));
|
||||||
|
|
||||||
FREE_MOBJS[i] = Z_Malloc(strlen(word)+1, PU_STATIC, NULL);
|
FREE_MOBJS[i] = Z_Malloc(strlen(word)+1, PU_STATIC, NULL);
|
||||||
strcpy(FREE_MOBJS[i],word);
|
strcpy(FREE_MOBJS[i], word);
|
||||||
freeslotusage[1][0]++;
|
freeslotusage[1][0]++;
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
|
||||||
if (i == NUMMOBJFREESLOTS)
|
if (i == NUMMOBJFREESLOTS)
|
||||||
I_Error("Out of Mobj Freeslots while allocating \"%s\"\nLoad less addons to fix this.", word);
|
I_Error("Out of Mobj Freeslots while allocating \"%s\"\nLoad less addons to fix this.", word);
|
||||||
@@ -426,8 +435,11 @@ static void readthing(MYFILE *f, INT32 num)
|
|||||||
strupr(word2);
|
strupr(word2);
|
||||||
else
|
else
|
||||||
break;
|
break;
|
||||||
if (word2[strlen(word2)-1] == '\n')
|
|
||||||
word2[strlen(word2)-1] = '\0';
|
const size_t word2len = strlen(word2);
|
||||||
|
|
||||||
|
if (word2[word2len-1] == '\n')
|
||||||
|
word2[word2len-1] = '\0';
|
||||||
|
|
||||||
if (fastcmp(word, "MAPTHINGNUM") || fastcmp(word, "DOOMEDNUM"))
|
if (fastcmp(word, "MAPTHINGNUM") || fastcmp(word, "DOOMEDNUM"))
|
||||||
{
|
{
|
||||||
@@ -734,14 +746,20 @@ static void readlevelheader(MYFILE *f, INT32 num, INT32 wadnum)
|
|||||||
{
|
{
|
||||||
UINT16 tol = 0;
|
UINT16 tol = 0;
|
||||||
tmp = strtok(word2,",");
|
tmp = strtok(word2,",");
|
||||||
|
|
||||||
do {
|
do {
|
||||||
for (i = 0; TYPEOFLEVEL[i].name; i++)
|
for (i = 0; TYPEOFLEVEL[i].name; i++)
|
||||||
|
{
|
||||||
if (fastcmp(tmp, TYPEOFLEVEL[i].name))
|
if (fastcmp(tmp, TYPEOFLEVEL[i].name))
|
||||||
break;
|
break;
|
||||||
|
}
|
||||||
|
|
||||||
if (!TYPEOFLEVEL[i].name)
|
if (!TYPEOFLEVEL[i].name)
|
||||||
deh_warning("Level header %d: unknown typeoflevel flag %s\n", num, tmp);
|
deh_warning("Level header %d: unknown typeoflevel flag %s\n", num, tmp);
|
||||||
|
|
||||||
tol |= TYPEOFLEVEL[i].flag;
|
tol |= TYPEOFLEVEL[i].flag;
|
||||||
} while((tmp = strtok(NULL,",")) != NULL);
|
} while((tmp = strtok(NULL,",")) != NULL);
|
||||||
|
|
||||||
mapheaderinfo[num-1]->typeoflevel = tol;
|
mapheaderinfo[num-1]->typeoflevel = tol;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -1037,8 +1055,11 @@ static void readcutscenescene(MYFILE *f, INT32 num, INT32 scenenum)
|
|||||||
else
|
else
|
||||||
break;
|
break;
|
||||||
|
|
||||||
if (word2[strlen(word2)-1] == '\n')
|
const size_t word2len = strlen(word2);
|
||||||
word2[strlen(word2)-1] = '\0';
|
|
||||||
|
if (word2[word2len-1] == '\n')
|
||||||
|
word2[word2len-1] = '\0';
|
||||||
|
|
||||||
i = atoi(word2);
|
i = atoi(word2);
|
||||||
usi = (UINT16)i;
|
usi = (UINT16)i;
|
||||||
|
|
||||||
@@ -1088,12 +1109,14 @@ static void readcutscenescene(MYFILE *f, INT32 num, INT32 scenenum)
|
|||||||
else if (fastcmp(word, "MUSICSLOT"))
|
else if (fastcmp(word, "MUSICSLOT"))
|
||||||
{
|
{
|
||||||
i = get_mus(word2, true);
|
i = get_mus(word2, true);
|
||||||
|
|
||||||
if (i && i <= 1035)
|
if (i && i <= 1035)
|
||||||
snprintf(cutscenes[num]->scene[scenenum].musswitch, 7, "%sM", G_BuildMapName(i));
|
snprintf(cutscenes[num]->scene[scenenum].musswitch, 7, "%sM", G_BuildMapName(i));
|
||||||
else if (i && i <= 1050)
|
else if (i && i <= 1050)
|
||||||
strncpy(cutscenes[num]->scene[scenenum].musswitch, compat_special_music_slots[i - 1036], 7);
|
strncpy(cutscenes[num]->scene[scenenum].musswitch, compat_special_music_slots[i - 1036], 7);
|
||||||
else
|
else
|
||||||
cutscenes[num]->scene[scenenum].musswitch[0] = 0; // becomes empty string
|
cutscenes[num]->scene[scenenum].musswitch[0] = 0; // becomes empty string
|
||||||
|
|
||||||
cutscenes[num]->scene[scenenum].musswitch[6] = 0;
|
cutscenes[num]->scene[scenenum].musswitch[6] = 0;
|
||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
@@ -1498,8 +1521,11 @@ static void readframe(MYFILE *f, INT32 num)
|
|||||||
strupr(word2);
|
strupr(word2);
|
||||||
else
|
else
|
||||||
break;
|
break;
|
||||||
if (word2[strlen(word2)-1] == '\n')
|
|
||||||
word2[strlen(word2)-1] = '\0';
|
const size_t word2len = strlen(word2);
|
||||||
|
|
||||||
|
if (word2[word2len-1] == '\n')
|
||||||
|
word2[word2len-1] = '\0';
|
||||||
|
|
||||||
if (fastcmp(word1, "SPRITENUMBER") || fastcmp(word1, "SPRITENAME"))
|
if (fastcmp(word1, "SPRITENUMBER") || fastcmp(word1, "SPRITENAME"))
|
||||||
{
|
{
|
||||||
@@ -1828,13 +1854,19 @@ static void readextraemblemdata(MYFILE *f, INT32 num)
|
|||||||
value = atoi(word2); // used for numerical settings
|
value = atoi(word2); // used for numerical settings
|
||||||
|
|
||||||
if (fastcmp(word, "NAME"))
|
if (fastcmp(word, "NAME"))
|
||||||
|
{
|
||||||
deh_strlcpy(extraemblems[num-1].name, word2,
|
deh_strlcpy(extraemblems[num-1].name, word2,
|
||||||
sizeof (extraemblems[num-1].name), va("Extra emblem %d: name", num));
|
sizeof (extraemblems[num-1].name), va("Extra emblem %d: name", num));
|
||||||
|
}
|
||||||
else if (fastcmp(word, "OBJECTIVE"))
|
else if (fastcmp(word, "OBJECTIVE"))
|
||||||
|
{
|
||||||
deh_strlcpy(extraemblems[num-1].description, word2,
|
deh_strlcpy(extraemblems[num-1].description, word2,
|
||||||
sizeof (extraemblems[num-1].description), va("Extra emblem %d: objective", num));
|
sizeof (extraemblems[num-1].description), va("Extra emblem %d: objective", num));
|
||||||
|
}
|
||||||
else if (fastcmp(word, "CONDITIONSET"))
|
else if (fastcmp(word, "CONDITIONSET"))
|
||||||
|
{
|
||||||
extraemblems[num-1].conditionset = (UINT8)value;
|
extraemblems[num-1].conditionset = (UINT8)value;
|
||||||
|
}
|
||||||
else if (fastcmp(word, "SPRITE"))
|
else if (fastcmp(word, "SPRITE"))
|
||||||
{
|
{
|
||||||
if (word2[0] >= 'A' && word2[0] <= 'Z')
|
if (word2[0] >= 'A' && word2[0] <= 'Z')
|
||||||
@@ -1906,11 +1938,15 @@ static void readunlockable(MYFILE *f, INT32 num)
|
|||||||
i = atoi(word2); // used for numerical settings
|
i = atoi(word2); // used for numerical settings
|
||||||
|
|
||||||
if (fastcmp(word, "NAME"))
|
if (fastcmp(word, "NAME"))
|
||||||
|
{
|
||||||
deh_strlcpy(unlockables[num].name, word2,
|
deh_strlcpy(unlockables[num].name, word2,
|
||||||
sizeof (unlockables[num].name), va("Unlockable %d: name", num));
|
sizeof (unlockables[num].name), va("Unlockable %d: name", num));
|
||||||
|
}
|
||||||
else if (fastcmp(word, "OBJECTIVE"))
|
else if (fastcmp(word, "OBJECTIVE"))
|
||||||
|
{
|
||||||
deh_strlcpy(unlockables[num].objective, word2,
|
deh_strlcpy(unlockables[num].objective, word2,
|
||||||
sizeof (unlockables[num].objective), va("Unlockable %d: objective", num));
|
sizeof (unlockables[num].objective), va("Unlockable %d: objective", num));
|
||||||
|
}
|
||||||
else if (fastcmp(word, "SHOWCONDITIONSET"))
|
else if (fastcmp(word, "SHOWCONDITIONSET"))
|
||||||
unlockables[num].showconditionset = (UINT8)i;
|
unlockables[num].showconditionset = (UINT8)i;
|
||||||
else if (fastcmp(word, "CONDITIONSET"))
|
else if (fastcmp(word, "CONDITIONSET"))
|
||||||
@@ -8102,7 +8138,7 @@ static mobjtype_t get_mobjtype(const char *word)
|
|||||||
if (*word >= '0' && *word <= '9')
|
if (*word >= '0' && *word <= '9')
|
||||||
return atoi(word);
|
return atoi(word);
|
||||||
|
|
||||||
if (fastncmp("MT_",word,3))
|
if (fastncmp("MT_", word, 3))
|
||||||
word += 3; // take off the MT_
|
word += 3; // take off the MT_
|
||||||
|
|
||||||
for (i = 0; i < NUMMOBJFREESLOTS; i++)
|
for (i = 0; i < NUMMOBJFREESLOTS; i++)
|
||||||
@@ -8128,7 +8164,7 @@ static statenum_t get_state(const char *word)
|
|||||||
if (*word >= '0' && *word <= '9')
|
if (*word >= '0' && *word <= '9')
|
||||||
return atoi(word);
|
return atoi(word);
|
||||||
|
|
||||||
if (fastncmp("S_",word,2))
|
if (fastncmp("S_", word, 2))
|
||||||
word += 2; // take off the S_
|
word += 2; // take off the S_
|
||||||
|
|
||||||
for (i = 0; i < NUMSTATEFREESLOTS; i++)
|
for (i = 0; i < NUMSTATEFREESLOTS; i++)
|
||||||
@@ -8155,11 +8191,11 @@ static spritenum_t get_sprite(const char *word)
|
|||||||
if (*word >= '0' && *word <= '9')
|
if (*word >= '0' && *word <= '9')
|
||||||
return atoi(word);
|
return atoi(word);
|
||||||
|
|
||||||
if (fastncmp("SPR_",word,4))
|
if (fastncmp("SPR_", word, 4))
|
||||||
word += 4; // take off the SPR_
|
word += 4; // take off the SPR_
|
||||||
|
|
||||||
for (i = 0; i < NUMSPRITES; i++)
|
for (i = 0; i < NUMSPRITES; i++)
|
||||||
if (!sprnames[i][4] && memcmp(word,sprnames[i],4) == 0)
|
if (!sprnames[i][4] && memcmp(word, sprnames[i], 4) == 0)
|
||||||
return i;
|
return i;
|
||||||
|
|
||||||
deh_warning("Couldn't find sprite named 'SPR_%s'",word);
|
deh_warning("Couldn't find sprite named 'SPR_%s'",word);
|
||||||
@@ -8200,14 +8236,15 @@ static UINT16 get_mus(const char *word, UINT8 dehacked_mode)
|
|||||||
if (!word[2] && toupper(word[0]) >= 'A' && toupper(word[0]) <= 'Z')
|
if (!word[2] && toupper(word[0]) >= 'A' && toupper(word[0]) <= 'Z')
|
||||||
return (UINT16)M_MapNumber(word[0], word[1]);
|
return (UINT16)M_MapNumber(word[0], word[1]);
|
||||||
|
|
||||||
if (fastncmp("MUS_",word,4))
|
if (fastncmp("MUS_", word, 4))
|
||||||
word += 4; // take off the MUS_
|
word += 4; // take off the MUS_
|
||||||
else if (fastncmp("O_",word,2) || fastncmp("D_",word,2))
|
else if (fastncmp("O_", word, 2) || fastncmp("D_", word, 2))
|
||||||
word += 2; // take off the O_ or D_
|
word += 2; // take off the O_ or D_
|
||||||
|
|
||||||
strncpy(lumptmp, word, 4);
|
strncpy(lumptmp, word, 4);
|
||||||
lumptmp[3] = 0;
|
lumptmp[3] = 0;
|
||||||
if (fasticmp("MAP",lumptmp))
|
|
||||||
|
if (fasticmp("MAP", lumptmp))
|
||||||
{
|
{
|
||||||
word += 3;
|
word += 3;
|
||||||
if (toupper(word[0]) >= 'A' && toupper(word[0]) <= 'Z')
|
if (toupper(word[0]) >= 'A' && toupper(word[0]) <= 'Z')
|
||||||
@@ -8320,7 +8357,7 @@ static inline int lib_freeslot(lua_State *L)
|
|||||||
{
|
{
|
||||||
sfxenum_t sfx;
|
sfxenum_t sfx;
|
||||||
strlwr(word);
|
strlwr(word);
|
||||||
CONS_Printf("Sound sfx_%s allocated.\n",word);
|
CONS_Printf("Sound sfx_%s allocated.\n", word);
|
||||||
sfx = S_AddSoundFx(word, false, 0, false);
|
sfx = S_AddSoundFx(word, false, 0, false);
|
||||||
|
|
||||||
if (sfx != sfx_None)
|
if (sfx != sfx_None)
|
||||||
@@ -8344,8 +8381,10 @@ static inline int lib_freeslot(lua_State *L)
|
|||||||
{
|
{
|
||||||
if (!sprnames[j][4] && memcmp(sprnames[j], word, 4) == 0)
|
if (!sprnames[j][4] && memcmp(sprnames[j], word, 4) == 0)
|
||||||
sprnames[j][4] = wad;
|
sprnames[j][4] = wad;
|
||||||
|
|
||||||
continue; // Already allocated, next.
|
continue; // Already allocated, next.
|
||||||
}
|
}
|
||||||
|
|
||||||
// Found a free slot!
|
// Found a free slot!
|
||||||
CONS_Printf("Sprite SPR_%s allocated.\n",word);
|
CONS_Printf("Sprite SPR_%s allocated.\n",word);
|
||||||
|
|
||||||
@@ -8353,7 +8392,7 @@ static inline int lib_freeslot(lua_State *L)
|
|||||||
lua_pushfstring(L, "SPR_%s", word);
|
lua_pushfstring(L, "SPR_%s", word);
|
||||||
lua_call(L, 1, 0);
|
lua_call(L, 1, 0);
|
||||||
|
|
||||||
strncpy(sprnames[j],word,4);
|
strncpy(sprnames[j], word, 4);
|
||||||
//sprnames[j][4] = 0;
|
//sprnames[j][4] = 0;
|
||||||
used_spr[(j-SPR_FIRSTFREESLOT)/8] |= 1<<(j%8); // Okay, this sprite slot has been named now.
|
used_spr[(j-SPR_FIRSTFREESLOT)/8] |= 1<<(j%8); // Okay, this sprite slot has been named now.
|
||||||
lua_pushinteger(L, j);
|
lua_pushinteger(L, j);
|
||||||
@@ -8371,7 +8410,7 @@ static inline int lib_freeslot(lua_State *L)
|
|||||||
{
|
{
|
||||||
if (!FREE_STATES[i])
|
if (!FREE_STATES[i])
|
||||||
{
|
{
|
||||||
CONS_Printf("State S_%s allocated.\n",word);
|
CONS_Printf("State S_%s allocated.\n", word);
|
||||||
|
|
||||||
lua_pushcfunction(L, lua_glib_invalidate_cache);
|
lua_pushcfunction(L, lua_glib_invalidate_cache);
|
||||||
lua_pushfstring(L, "S_%s", word);
|
lua_pushfstring(L, "S_%s", word);
|
||||||
@@ -8396,14 +8435,14 @@ static inline int lib_freeslot(lua_State *L)
|
|||||||
{
|
{
|
||||||
if (!FREE_MOBJS[i])
|
if (!FREE_MOBJS[i])
|
||||||
{
|
{
|
||||||
CONS_Printf("MobjType MT_%s allocated.\n",word);
|
CONS_Printf("MobjType MT_%s allocated.\n", word);
|
||||||
|
|
||||||
lua_pushcfunction(L, lua_glib_invalidate_cache);
|
lua_pushcfunction(L, lua_glib_invalidate_cache);
|
||||||
lua_pushfstring(L, "MT_%s", word);
|
lua_pushfstring(L, "MT_%s", word);
|
||||||
lua_call(L, 1, 0);
|
lua_call(L, 1, 0);
|
||||||
|
|
||||||
FREE_MOBJS[i] = Z_Malloc(strlen(word)+1, PU_STATIC, NULL);
|
FREE_MOBJS[i] = Z_Malloc(strlen(word)+1, PU_STATIC, NULL);
|
||||||
strcpy(FREE_MOBJS[i],word);
|
strcpy(FREE_MOBJS[i], word);
|
||||||
freeslotusage[1][0]++;
|
freeslotusage[1][0]++;
|
||||||
lua_pushinteger(L, i);
|
lua_pushinteger(L, i);
|
||||||
r++;
|
r++;
|
||||||
@@ -8590,6 +8629,7 @@ static int lua_enumlib_mobjtype_get(lua_State *L)
|
|||||||
{
|
{
|
||||||
if (!FREE_MOBJS[i])
|
if (!FREE_MOBJS[i])
|
||||||
break;
|
break;
|
||||||
|
|
||||||
if (fastcmp(s+3, FREE_MOBJS[i]))
|
if (fastcmp(s+3, FREE_MOBJS[i]))
|
||||||
{
|
{
|
||||||
lua_pushinteger(L, MT_FIRSTFREESLOT+i);
|
lua_pushinteger(L, MT_FIRSTFREESLOT+i);
|
||||||
@@ -8678,30 +8718,29 @@ static int lua_enumlib_sfx_get_ds(lua_State *L)
|
|||||||
}
|
}
|
||||||
|
|
||||||
#ifdef MUSICSLOT_COMPATIBILITY
|
#ifdef MUSICSLOT_COMPATIBILITY
|
||||||
|
static int lua_enumlib_mus_get(lua_State *L)
|
||||||
|
{
|
||||||
|
const char *name = strchr(lua_tostring(L, 1), '_') + 1;
|
||||||
|
int mus = get_mus(name, false);
|
||||||
|
|
||||||
static int lua_enumlib_mus_get(lua_State *L)
|
if (mus == 0)
|
||||||
{
|
return 0;
|
||||||
const char *name = strchr(lua_tostring(L, 1), '_') + 1;
|
|
||||||
int mus = get_mus(name, false);
|
|
||||||
|
|
||||||
if (mus == 0)
|
lua_pushinteger(L, mus);
|
||||||
return 0;
|
return 1;
|
||||||
|
}
|
||||||
|
|
||||||
lua_pushinteger(L, mus);
|
static int lua_enumlib_mus_get_mathlib(lua_State *L)
|
||||||
return 1;
|
{
|
||||||
}
|
const char *name = strchr(lua_tostring(L, 1), '_') + 1;
|
||||||
|
int mus = get_mus(name, false);
|
||||||
|
|
||||||
static int lua_enumlib_mus_get_mathlib(lua_State *L)
|
if (mus == 0)
|
||||||
{
|
return luaL_error(L, "music '%s' could not be found.\n", lua_tostring(L, 1));
|
||||||
const char *name = strchr(lua_tostring(L, 1), '_') + 1;
|
|
||||||
int mus = get_mus(name, false);
|
|
||||||
|
|
||||||
if (mus == 0)
|
lua_pushinteger(L, mus);
|
||||||
return luaL_error(L, "music '%s' could not be found.\n", lua_tostring(L, 1));
|
return 1;
|
||||||
|
}
|
||||||
lua_pushinteger(L, mus);
|
|
||||||
return 1;
|
|
||||||
}
|
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
static int lua_enumlib_power_get(lua_State *L)
|
static int lua_enumlib_power_get(lua_State *L)
|
||||||
|
|||||||
+3
-1
@@ -81,10 +81,12 @@ typedef struct
|
|||||||
INT16 flags;
|
INT16 flags;
|
||||||
INT16 special;
|
INT16 special;
|
||||||
INT16 tag;
|
INT16 tag;
|
||||||
// sidenum[1] will be 0xffff if one sided
|
// sidenum[1] will be NO_INDEX if one sided
|
||||||
UINT16 sidenum[2];
|
UINT16 sidenum[2];
|
||||||
} ATTRPACK maplinedef_t;
|
} ATTRPACK maplinedef_t;
|
||||||
|
|
||||||
|
#define NO_INDEX 0xffff
|
||||||
|
|
||||||
//
|
//
|
||||||
// LineDef attributes.
|
// LineDef attributes.
|
||||||
//
|
//
|
||||||
|
|||||||
@@ -602,6 +602,13 @@ extern const char *compdate, *comptime, *comprevision, *compbranch;
|
|||||||
// None of these that are disabled in the normal build are guaranteed to work perfectly
|
// 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
|
||||||
|
#define COMPAT_VANILLA
|
||||||
|
// if we build with 32 player (or more!) support we dont need to care vanilla compat
|
||||||
|
#if MAXPLAYERS > 16
|
||||||
|
#undef COMPAT_VANILLA
|
||||||
|
#endif
|
||||||
|
|
||||||
//-- SATURN __
|
//-- SATURN __
|
||||||
/// Detect if a client is on Saturn in the clientconfig.
|
/// Detect if a client is on Saturn in the clientconfig.
|
||||||
/// To seperately allow them to join or block joining from vanilla clients.
|
/// To seperately allow them to join or block joining from vanilla clients.
|
||||||
@@ -666,6 +673,13 @@ extern const char *compdate, *comptime, *comprevision, *compbranch;
|
|||||||
#undef UPDATE_ALERT
|
#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
|
||||||
|
|||||||
+1
-4
@@ -361,10 +361,7 @@ void F_RunWipe(UINT8 wipetype, boolean drawMenu)
|
|||||||
// on for fade-to-black
|
// on for fade-to-black
|
||||||
for (;;)
|
for (;;)
|
||||||
{
|
{
|
||||||
if (I_Interrupted())
|
I_HandleInterrupt();
|
||||||
{
|
|
||||||
I_Quit();
|
|
||||||
}
|
|
||||||
|
|
||||||
// get fademask first so we can tell if it exists or not
|
// get fademask first so we can tell if it exists or not
|
||||||
fmask = F_GetFadeMask(wipetype, wipeframe++);
|
fmask = F_GetFadeMask(wipetype, wipeframe++);
|
||||||
|
|||||||
+71
-66
@@ -447,7 +447,8 @@ void G_WriteDemoExtraData(void)
|
|||||||
{
|
{
|
||||||
static UINT8 timeout = 0;
|
static UINT8 timeout = 0;
|
||||||
|
|
||||||
if (timeout) timeout--;
|
if (timeout)
|
||||||
|
timeout--;
|
||||||
|
|
||||||
if (demo_writerng == 1 || (demo_writerng == 2 && timeout == 0))
|
if (demo_writerng == 1 || (demo_writerng == 2 && timeout == 0))
|
||||||
{
|
{
|
||||||
@@ -467,6 +468,7 @@ void G_ReadDemoTiccmd(ticcmd_t *cmd, INT32 playernum)
|
|||||||
|
|
||||||
if (!demobuf.p || !demo.deferstart)
|
if (!demobuf.p || !demo.deferstart)
|
||||||
return;
|
return;
|
||||||
|
|
||||||
ziptic = READUINT8(demobuf.p);
|
ziptic = READUINT8(demobuf.p);
|
||||||
|
|
||||||
if (ziptic & ZT_FWD)
|
if (ziptic & ZT_FWD)
|
||||||
@@ -488,11 +490,12 @@ void G_ReadDemoTiccmd(ticcmd_t *cmd, INT32 playernum)
|
|||||||
|
|
||||||
// what in the actual fuck is this???
|
// what in the actual fuck is this???
|
||||||
// SRB2kart: Copy-pasted from ticcmd building, removes that crappy demo cam
|
// SRB2kart: Copy-pasted from ticcmd building, removes that crappy demo cam
|
||||||
if (((players[displayplayers[0]].mo && players[displayplayers[0]].speed > 0) // Moving
|
const player_t *player = &players[displayplayers[0]];
|
||||||
|
if (((player->mo && player->speed > 0) // Moving
|
||||||
|| (leveltime > starttime && (cmd->buttons & BT_ACCELERATE && cmd->buttons & BT_BRAKE)) // Rubber-burn turn
|
|| (leveltime > starttime && (cmd->buttons & BT_ACCELERATE && cmd->buttons & BT_BRAKE)) // Rubber-burn turn
|
||||||
|| (players[displayplayers[0]].kartstuff[k_respawn]) // Respawning
|
|| (player->kartstuff[k_respawn]) // Respawning
|
||||||
|| (players[displayplayers[0]].spectator || objectplacing)) // Not a physical player
|
|| (player->spectator || objectplacing)) // Not a physical player
|
||||||
&& !(players[displayplayers[0]].kartstuff[k_spinouttimer] && players[displayplayers[0]].kartstuff[k_sneakertimer])) // Spinning and boosting cancels out spinout
|
&& !(player->kartstuff[k_spinouttimer] && player->kartstuff[k_sneakertimer])) // Spinning and boosting cancels out spinout
|
||||||
localangle[0] += (cmd->angleturn<<16);
|
localangle[0] += (cmd->angleturn<<16);
|
||||||
|
|
||||||
if (!(demoflags & DF_GHOST) && *demobuf.p == DEMOMARKER)
|
if (!(demoflags & DF_GHOST) && *demobuf.p == DEMOMARKER)
|
||||||
@@ -515,49 +518,49 @@ void G_WriteDemoTiccmd(ticcmd_t *cmd, INT32 playernum)
|
|||||||
|
|
||||||
if (cmd->forwardmove != oldcmd[playernum].forwardmove)
|
if (cmd->forwardmove != oldcmd[playernum].forwardmove)
|
||||||
{
|
{
|
||||||
WRITEUINT8(demobuf.p,cmd->forwardmove);
|
WRITEUINT8(demobuf.p, cmd->forwardmove);
|
||||||
oldcmd[playernum].forwardmove = cmd->forwardmove;
|
oldcmd[playernum].forwardmove = cmd->forwardmove;
|
||||||
ziptic |= ZT_FWD;
|
ziptic |= ZT_FWD;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (cmd->sidemove != oldcmd[playernum].sidemove)
|
if (cmd->sidemove != oldcmd[playernum].sidemove)
|
||||||
{
|
{
|
||||||
WRITEUINT8(demobuf.p,cmd->sidemove);
|
WRITEUINT8(demobuf.p, cmd->sidemove);
|
||||||
oldcmd[playernum].sidemove = cmd->sidemove;
|
oldcmd[playernum].sidemove = cmd->sidemove;
|
||||||
ziptic |= ZT_SIDE;
|
ziptic |= ZT_SIDE;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (cmd->angleturn != oldcmd[playernum].angleturn)
|
if (cmd->angleturn != oldcmd[playernum].angleturn)
|
||||||
{
|
{
|
||||||
WRITEINT16(demobuf.p,cmd->angleturn);
|
WRITEINT16(demobuf.p, cmd->angleturn);
|
||||||
oldcmd[playernum].angleturn = cmd->angleturn;
|
oldcmd[playernum].angleturn = cmd->angleturn;
|
||||||
ziptic |= ZT_ANGLE;
|
ziptic |= ZT_ANGLE;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (cmd->buttons != oldcmd[playernum].buttons)
|
if (cmd->buttons != oldcmd[playernum].buttons)
|
||||||
{
|
{
|
||||||
WRITEUINT16(demobuf.p,cmd->buttons);
|
WRITEUINT16(demobuf.p, cmd->buttons);
|
||||||
oldcmd[playernum].buttons = cmd->buttons;
|
oldcmd[playernum].buttons = cmd->buttons;
|
||||||
ziptic |= ZT_BUTTONS;
|
ziptic |= ZT_BUTTONS;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (cmd->aiming != oldcmd[playernum].aiming)
|
if (cmd->aiming != oldcmd[playernum].aiming)
|
||||||
{
|
{
|
||||||
WRITEINT16(demobuf.p,cmd->aiming);
|
WRITEINT16(demobuf.p, cmd->aiming);
|
||||||
oldcmd[playernum].aiming = cmd->aiming;
|
oldcmd[playernum].aiming = cmd->aiming;
|
||||||
ziptic |= ZT_AIMING;
|
ziptic |= ZT_AIMING;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (cmd->driftturn != oldcmd[playernum].driftturn)
|
if (cmd->driftturn != oldcmd[playernum].driftturn)
|
||||||
{
|
{
|
||||||
WRITEINT16(demobuf.p,cmd->driftturn);
|
WRITEINT16(demobuf.p, cmd->driftturn);
|
||||||
oldcmd[playernum].driftturn = cmd->driftturn;
|
oldcmd[playernum].driftturn = cmd->driftturn;
|
||||||
ziptic |= ZT_DRIFT;
|
ziptic |= ZT_DRIFT;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (cmd->latency != oldcmd[playernum].latency)
|
if (cmd->latency != oldcmd[playernum].latency)
|
||||||
{
|
{
|
||||||
WRITEUINT8(demobuf.p,cmd->latency);
|
WRITEUINT8(demobuf.p, cmd->latency);
|
||||||
oldcmd[playernum].latency = cmd->latency;
|
oldcmd[playernum].latency = cmd->latency;
|
||||||
ziptic |= ZT_LATENCY;
|
ziptic |= ZT_LATENCY;
|
||||||
}
|
}
|
||||||
@@ -713,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;
|
||||||
@@ -726,8 +729,8 @@ void G_WriteGhostTic(mobj_t *ghost, INT32 playernum)
|
|||||||
|
|
||||||
// GZT_XYZ is only useful if you've moved 256 FRACUNITS or more in a single tic.
|
// GZT_XYZ is only useful if you've moved 256 FRACUNITS or more in a single tic.
|
||||||
if (abs(ghost->x-oldghost[playernum].x) > MAXMOM
|
if (abs(ghost->x-oldghost[playernum].x) > MAXMOM
|
||||||
|| abs(ghost->y-oldghost[playernum].y) > MAXMOM
|
|| abs(ghost->y-oldghost[playernum].y) > MAXMOM
|
||||||
|| abs(ghost->z-oldghost[playernum].z) > MAXMOM
|
|| abs(ghost->z-oldghost[playernum].z) > MAXMOM
|
||||||
|| ((UINT8)(leveltime & 255) > 0 && (UINT8)(leveltime & 255) <= (UINT8)cv_netdemosyncquality.value)) // Hack to enable slightly nicer resyncing
|
|| ((UINT8)(leveltime & 255) > 0 && (UINT8)(leveltime & 255) <= (UINT8)cv_netdemosyncquality.value)) // Hack to enable slightly nicer resyncing
|
||||||
{
|
{
|
||||||
oldghost[playernum].x = ghost->x;
|
oldghost[playernum].x = ghost->x;
|
||||||
@@ -931,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;
|
||||||
@@ -976,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;
|
||||||
@@ -1344,7 +1347,7 @@ fadeghost:
|
|||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
mobj = P_SpawnMobj(g->mo->x, g->mo->y, g->mo->z - FixedDiv(FixedMul(g->mo->info->height, g->mo->scale) - g->mo->height,3*FRACUNIT), MT_THOK);
|
mobj = P_SpawnMobj(g->mo->x, g->mo->y, g->mo->z - FixedDiv(FixedMul(g->mo->info->height, g->mo->scale) - g->mo->height, 3*FRACUNIT), MT_THOK);
|
||||||
mobj->sprite = states[mobjinfo[type].spawnstate].sprite;
|
mobj->sprite = states[mobjinfo[type].spawnstate].sprite;
|
||||||
mobj->frame = (states[mobjinfo[type].spawnstate].frame & FF_FRAMEMASK) | tr_trans60<<FF_TRANSSHIFT;
|
mobj->frame = (states[mobjinfo[type].spawnstate].frame & FF_FRAMEMASK) | tr_trans60<<FF_TRANSSHIFT;
|
||||||
mobj->tics = -1; // nope.
|
mobj->tics = -1; // nope.
|
||||||
@@ -1375,7 +1378,7 @@ fadeghost:
|
|||||||
UINT16 i, health;
|
UINT16 i, health;
|
||||||
UINT16 count = READUINT16(g->p);
|
UINT16 count = READUINT16(g->p);
|
||||||
//UINT32 type;
|
//UINT32 type;
|
||||||
fixed_t x,y,z;
|
fixed_t x, y, z;
|
||||||
angle_t angle;
|
angle_t angle;
|
||||||
mobj_t *poof;
|
mobj_t *poof;
|
||||||
|
|
||||||
@@ -1518,7 +1521,9 @@ void G_PreviewRewind(tic_t previewtime)
|
|||||||
|
|
||||||
for (i = 0; i < MAXPLAYERS; i++)
|
for (i = 0; i < MAXPLAYERS; i++)
|
||||||
{
|
{
|
||||||
if (!playeringame[i] || players[i].spectator)
|
player_t *player = &players[i];
|
||||||
|
|
||||||
|
if (!playeringame[i] || player->spectator)
|
||||||
{
|
{
|
||||||
if (info->playerinfo[i].player.mo)
|
if (info->playerinfo[i].player.mo)
|
||||||
{
|
{
|
||||||
@@ -1530,35 +1535,35 @@ void G_PreviewRewind(tic_t previewtime)
|
|||||||
|
|
||||||
if (!info->playerinfo[i].ingame || !info->playerinfo[i].player.mo)
|
if (!info->playerinfo[i].ingame || !info->playerinfo[i].player.mo)
|
||||||
{
|
{
|
||||||
if (players[i].mo)
|
if (player->mo)
|
||||||
players[i].mo->flags2 |= MF2_DONTDRAW;
|
player->mo->flags2 |= MF2_DONTDRAW;
|
||||||
|
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (!players[i].mo)
|
if (!player->mo)
|
||||||
continue; //@TODO spawn temp object to act as a player display
|
continue; //@TODO spawn temp object to act as a player display
|
||||||
|
|
||||||
players[i].mo->flags2 &= ~MF2_DONTDRAW;
|
player->mo->flags2 &= ~MF2_DONTDRAW;
|
||||||
|
|
||||||
P_UnsetThingPosition(players[i].mo);
|
P_UnsetThingPosition(player->mo);
|
||||||
#define TWEEN(pr) info->playerinfo[i].mobj.pr + FixedMul((INT32) (next_info->playerinfo[i].mobj.pr - info->playerinfo[i].mobj.pr), tweenvalue)
|
#define TWEEN(pr) info->playerinfo[i].mobj.pr + FixedMul((INT32) (next_info->playerinfo[i].mobj.pr - info->playerinfo[i].mobj.pr), tweenvalue)
|
||||||
players[i].mo->x = TWEEN(x);
|
player->mo->x = TWEEN(x);
|
||||||
players[i].mo->y = TWEEN(y);
|
player->mo->y = TWEEN(y);
|
||||||
players[i].mo->z = TWEEN(z);
|
player->mo->z = TWEEN(z);
|
||||||
players[i].mo->angle = TWEEN(angle);
|
player->mo->angle = TWEEN(angle);
|
||||||
#undef TWEEN
|
#undef TWEEN
|
||||||
P_SetThingPosition(players[i].mo);
|
P_SetThingPosition(player->mo);
|
||||||
|
|
||||||
players[i].frameangle = info->playerinfo[i].player.frameangle + FixedMul((INT32) (next_info->playerinfo[i].player.frameangle - info->playerinfo[i].player.frameangle), tweenvalue);
|
player->frameangle = info->playerinfo[i].player.frameangle + FixedMul((INT32) (next_info->playerinfo[i].player.frameangle - info->playerinfo[i].player.frameangle), tweenvalue);
|
||||||
|
|
||||||
players[i].mo->sprite = info->playerinfo[i].mobj.sprite;
|
player->mo->sprite = info->playerinfo[i].mobj.sprite;
|
||||||
players[i].mo->frame = info->playerinfo[i].mobj.frame;
|
player->mo->frame = info->playerinfo[i].mobj.frame;
|
||||||
|
|
||||||
players[i].realtime = info->playerinfo[i].player.realtime;
|
player->realtime = info->playerinfo[i].player.realtime;
|
||||||
|
|
||||||
for (j = 0; j < NUMKARTSTUFF; j++)
|
for (j = 0; j < NUMKARTSTUFF; j++)
|
||||||
players[i].kartstuff[j] = info->playerinfo[i].player.kartstuff[j];
|
player->kartstuff[j] = info->playerinfo[i].player.kartstuff[j];
|
||||||
}
|
}
|
||||||
|
|
||||||
for (i = splitscreen; i >= 0; i--)
|
for (i = splitscreen; i >= 0; i--)
|
||||||
@@ -1691,7 +1696,7 @@ void G_BeginRecording(void)
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
memset(name,0,sizeof(name));
|
memset(name, 0, sizeof(name));
|
||||||
|
|
||||||
demobuf.p = demobuf.buffer;
|
demobuf.p = demobuf.buffer;
|
||||||
demoflags = DF_GHOST|(multiplayer ? DF_MULTIPLAYER : (modeattacking<<DF_ATTACKSHIFT));
|
demoflags = DF_GHOST|(multiplayer ? DF_MULTIPLAYER : (modeattacking<<DF_ATTACKSHIFT));
|
||||||
@@ -1705,9 +1710,9 @@ void G_BeginRecording(void)
|
|||||||
|
|
||||||
// Setup header.
|
// Setup header.
|
||||||
memcpy(demobuf.p, DEMOHEADER, 12); demobuf.p += 12;
|
memcpy(demobuf.p, DEMOHEADER, 12); demobuf.p += 12;
|
||||||
WRITEUINT8(demobuf.p,VERSION);
|
WRITEUINT8(demobuf.p, VERSION);
|
||||||
WRITEUINT8(demobuf.p,SUBVERSION);
|
WRITEUINT8(demobuf.p, SUBVERSION);
|
||||||
WRITEUINT16(demobuf.p,DEMOVERSION);
|
WRITEUINT16(demobuf.p, DEMOVERSION);
|
||||||
|
|
||||||
// Full replay title
|
// Full replay title
|
||||||
demobuf.p += 64;
|
demobuf.p += 64;
|
||||||
@@ -1736,7 +1741,7 @@ void G_BeginRecording(void)
|
|||||||
|
|
||||||
// game data
|
// game data
|
||||||
memcpy(demobuf.p, "PLAY", 4); demobuf.p += 4;
|
memcpy(demobuf.p, "PLAY", 4); demobuf.p += 4;
|
||||||
WRITEINT16(demobuf.p,gamemap);
|
WRITEINT16(demobuf.p, gamemap);
|
||||||
memcpy(demobuf.p, mapmd5, 16); demobuf.p += 16;
|
memcpy(demobuf.p, mapmd5, 16); demobuf.p += 16;
|
||||||
|
|
||||||
WRITEUINT8(demobuf.p, demoflags);
|
WRITEUINT8(demobuf.p, demoflags);
|
||||||
@@ -1768,8 +1773,8 @@ void G_BeginRecording(void)
|
|||||||
break;
|
break;
|
||||||
case ATTACKING_RECORD: // 1
|
case ATTACKING_RECORD: // 1
|
||||||
demotime_p = demobuf.p;
|
demotime_p = demobuf.p;
|
||||||
WRITEUINT32(demobuf.p,UINT32_MAX); // time
|
WRITEUINT32(demobuf.p, UINT32_MAX); // time
|
||||||
WRITEUINT32(demobuf.p,UINT32_MAX); // lap
|
WRITEUINT32(demobuf.p, UINT32_MAX); // lap
|
||||||
break;
|
break;
|
||||||
default: // 3
|
default: // 3
|
||||||
break;
|
break;
|
||||||
@@ -1826,9 +1831,9 @@ void G_BeginRecording(void)
|
|||||||
if (demoflags & DF_LUAVARS)
|
if (demoflags & DF_LUAVARS)
|
||||||
LUA_Archive(&demobuf, false);
|
LUA_Archive(&demobuf, false);
|
||||||
|
|
||||||
memset(&oldcmd,0,sizeof(oldcmd));
|
memset(&oldcmd, 0, sizeof(oldcmd));
|
||||||
memset(&oldghost,0,sizeof(oldghost));
|
memset(&oldghost, 0, sizeof(oldghost));
|
||||||
memset(&ghostext,0,sizeof(ghostext));
|
memset(&ghostext, 0, sizeof(ghostext));
|
||||||
|
|
||||||
for (i = 0; i < MAXPLAYERS; i++)
|
for (i = 0; i < MAXPLAYERS; i++)
|
||||||
{
|
{
|
||||||
@@ -1868,19 +1873,19 @@ void G_WriteStanding(UINT8 ranking, char *name, INT32 skinnum, UINT8 color, UINT
|
|||||||
// Name
|
// Name
|
||||||
memset(temp, 0, 16);
|
memset(temp, 0, 16);
|
||||||
strncpy(temp, name, 16);
|
strncpy(temp, name, 16);
|
||||||
memcpy(demobuf.p,temp,16);
|
memcpy(demobuf.p, temp, 16);
|
||||||
demobuf.p += 16;
|
demobuf.p += 16;
|
||||||
|
|
||||||
// Skin
|
// Skin
|
||||||
memset(temp, 0, 16);
|
memset(temp, 0, 16);
|
||||||
strncpy(temp, skins[skinnum].name, 16);
|
strncpy(temp, skins[skinnum].name, 16);
|
||||||
memcpy(demobuf.p,temp,16);
|
memcpy(demobuf.p, temp, 16);
|
||||||
demobuf.p += 16;
|
demobuf.p += 16;
|
||||||
|
|
||||||
// Color
|
// Color
|
||||||
memset(temp, 0, 16);
|
memset(temp, 0, 16);
|
||||||
strncpy(temp, KartColor_Names[color], 16);
|
strncpy(temp, KartColor_Names[color], 16);
|
||||||
memcpy(demobuf.p,temp,16);
|
memcpy(demobuf.p, temp, 16);
|
||||||
demobuf.p += 16;
|
demobuf.p += 16;
|
||||||
|
|
||||||
// Score/time/whatever
|
// Score/time/whatever
|
||||||
@@ -2339,7 +2344,7 @@ void G_LoadDemoInfo(menudemo_t *pdemo)
|
|||||||
extrainfo_p += 16;
|
extrainfo_p += 16;
|
||||||
|
|
||||||
// Skin
|
// Skin
|
||||||
memcpy(temp,extrainfo_p,16);
|
memcpy(temp, extrainfo_p, 16);
|
||||||
extrainfo_p += 16;
|
extrainfo_p += 16;
|
||||||
pdemo->standings[count].skin = UINT8_MAX;
|
pdemo->standings[count].skin = UINT8_MAX;
|
||||||
|
|
||||||
@@ -2353,12 +2358,12 @@ void G_LoadDemoInfo(menudemo_t *pdemo)
|
|||||||
}
|
}
|
||||||
|
|
||||||
// Color
|
// Color
|
||||||
memcpy(temp,extrainfo_p,16);
|
memcpy(temp, extrainfo_p, 16);
|
||||||
extrainfo_p += 16;
|
extrainfo_p += 16;
|
||||||
|
|
||||||
for (i = 0; i < MAXSKINCOLORS; i++)
|
for (i = 0; i < MAXSKINCOLORS; i++)
|
||||||
{
|
{
|
||||||
if (fasticmp(KartColor_Names[i],temp)) // SRB2kart
|
if (fasticmp(KartColor_Names[i], temp)) // SRB2kart
|
||||||
{
|
{
|
||||||
pdemo->standings[count].color = i;
|
pdemo->standings[count].color = i;
|
||||||
break;
|
break;
|
||||||
@@ -2827,15 +2832,15 @@ void G_DoPlayDemo(char *defdemoname)
|
|||||||
if (demo.version == 0x0001)
|
if (demo.version == 0x0001)
|
||||||
{
|
{
|
||||||
// Player name
|
// Player name
|
||||||
memcpy(player_names[0],demobuf.p,16);
|
memcpy(player_names[0], demobuf.p, 16);
|
||||||
demobuf.p += 16;
|
demobuf.p += 16;
|
||||||
|
|
||||||
// Skin
|
// Skin
|
||||||
memcpy(skin,demobuf.p,16);
|
memcpy(skin, demobuf.p, 16);
|
||||||
demobuf.p += 16;
|
demobuf.p += 16;
|
||||||
|
|
||||||
// Color
|
// Color
|
||||||
memcpy(color,demobuf.p,16);
|
memcpy(color, demobuf.p, 16);
|
||||||
demobuf.p += 16;
|
demobuf.p += 16;
|
||||||
|
|
||||||
demobuf.p += 5; // Backwards compat - some stats
|
demobuf.p += 5; // Backwards compat - some stats
|
||||||
@@ -2868,7 +2873,7 @@ void G_DoPlayDemo(char *defdemoname)
|
|||||||
// Set color
|
// Set color
|
||||||
for (i = 0; i < MAXSKINCOLORS; i++)
|
for (i = 0; i < MAXSKINCOLORS; i++)
|
||||||
{
|
{
|
||||||
if (fasticmp(KartColor_Names[i],color)) // SRB2kart
|
if (fasticmp(KartColor_Names[i], color)) // SRB2kart
|
||||||
{
|
{
|
||||||
players[0].skincolor = i;
|
players[0].skincolor = i;
|
||||||
break;
|
break;
|
||||||
@@ -2888,9 +2893,9 @@ void G_DoPlayDemo(char *defdemoname)
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
memset(&oldcmd,0,sizeof(oldcmd));
|
memset(&oldcmd, 0, sizeof(oldcmd));
|
||||||
memset(&oldghost,0,sizeof(oldghost));
|
memset(&oldghost, 0, sizeof(oldghost));
|
||||||
memset(&ghostext,0,sizeof(ghostext));
|
memset(&ghostext, 0, sizeof(ghostext));
|
||||||
|
|
||||||
CONS_Alert(CONS_WARNING, M_GetText("Demo version does not match game version. Desyncs may occur.\n"));
|
CONS_Alert(CONS_WARNING, M_GetText("Demo version does not match game version. Desyncs may occur.\n"));
|
||||||
|
|
||||||
@@ -2994,16 +2999,16 @@ void G_DoPlayDemo(char *defdemoname)
|
|||||||
players[p].spectator = spectator;
|
players[p].spectator = spectator;
|
||||||
|
|
||||||
// Name
|
// Name
|
||||||
memcpy(player_names[p],demobuf.p,16);
|
memcpy(player_names[p], demobuf.p, 16);
|
||||||
demobuf.p += 16;
|
demobuf.p += 16;
|
||||||
|
|
||||||
// Skin
|
// Skin
|
||||||
memcpy(skin,demobuf.p,16);
|
memcpy(skin, demobuf.p, 16);
|
||||||
demobuf.p += 16;
|
demobuf.p += 16;
|
||||||
SetPlayerSkin(p, skin);
|
SetPlayerSkin(p, skin);
|
||||||
|
|
||||||
// Color
|
// Color
|
||||||
memcpy(color,demobuf.p,16);
|
memcpy(color, demobuf.p, 16);
|
||||||
demobuf.p += 16;
|
demobuf.p += 16;
|
||||||
|
|
||||||
for (i = 0; i < MAXSKINCOLORS; i++)
|
for (i = 0; i < MAXSKINCOLORS; i++)
|
||||||
@@ -3221,15 +3226,15 @@ void G_AddGhost(char *defdemoname)
|
|||||||
if (ghostversion == 0x0001)
|
if (ghostversion == 0x0001)
|
||||||
{
|
{
|
||||||
// Player name (TODO: Display this somehow if it doesn't match cv_playername!)
|
// Player name (TODO: Display this somehow if it doesn't match cv_playername!)
|
||||||
memcpy(name, p,16);
|
memcpy(name, p, 16);
|
||||||
p += 16;
|
p += 16;
|
||||||
|
|
||||||
// Skin
|
// Skin
|
||||||
memcpy(skin, p,16);
|
memcpy(skin, p, 16);
|
||||||
p += 16;
|
p += 16;
|
||||||
|
|
||||||
// Color
|
// Color
|
||||||
memcpy(color, p,16);
|
memcpy(color, p, 16);
|
||||||
p += 16;
|
p += 16;
|
||||||
|
|
||||||
// Ghosts do not have a player structure to put this in.
|
// Ghosts do not have a player structure to put this in.
|
||||||
@@ -3381,7 +3386,7 @@ void G_AddGhost(char *defdemoname)
|
|||||||
|
|
||||||
for (i = 0; i < MAXSKINCOLORS; i++)
|
for (i = 0; i < MAXSKINCOLORS; i++)
|
||||||
{
|
{
|
||||||
if (fasticmp(KartColor_Names[i],color)) // SRB2kart
|
if (fasticmp(KartColor_Names[i], color)) // SRB2kart
|
||||||
{
|
{
|
||||||
gh->mo->color = (UINT8)i;
|
gh->mo->color = (UINT8)i;
|
||||||
break;
|
break;
|
||||||
@@ -3473,7 +3478,7 @@ void G_UpdateStaffGhostName(lumpnum_t l)
|
|||||||
if (ghostversion == 0x0001)
|
if (ghostversion == 0x0001)
|
||||||
{
|
{
|
||||||
// Player name
|
// Player name
|
||||||
memcpy(dummystaffname, p,16);
|
memcpy(dummystaffname, p, 16);
|
||||||
dummystaffname[16] = '\0';
|
dummystaffname[16] = '\0';
|
||||||
return; // Not really a failure but whatever
|
return; // Not really a failure but whatever
|
||||||
}
|
}
|
||||||
|
|||||||
+19
-13
@@ -66,8 +66,6 @@ boolean botingame = false;
|
|||||||
UINT8 botskin = 0;
|
UINT8 botskin = 0;
|
||||||
UINT8 botcolor = 0;
|
UINT8 botcolor = 0;
|
||||||
|
|
||||||
JoyType_t Joystick[MAXSPLITSCREENPLAYERS] = {};
|
|
||||||
|
|
||||||
// SRB2kart
|
// SRB2kart
|
||||||
char gamedatafilename[64] = "kartdata.dat";
|
char gamedatafilename[64] = "kartdata.dat";
|
||||||
char timeattackfolder[64] = "kart";
|
char timeattackfolder[64] = "kart";
|
||||||
@@ -755,7 +753,7 @@ INT32 JoyAxis(axis_input_e axissel, UINT8 player)
|
|||||||
if (retaxis > (+JOYAXISRANGE))
|
if (retaxis > (+JOYAXISRANGE))
|
||||||
retaxis = +JOYAXISRANGE;
|
retaxis = +JOYAXISRANGE;
|
||||||
|
|
||||||
if (!Joystick[pnum].bGamepadStyle && axissel < AXISDEAD)
|
if (!DigitalGamepadStyle(pnum) && axissel < AXISDEAD)
|
||||||
{
|
{
|
||||||
const INT32 jdeadzone = ((JOYAXISRANGE-1) * deadzone) >> FRACBITS;
|
const INT32 jdeadzone = ((JOYAXISRANGE-1) * deadzone) >> FRACBITS;
|
||||||
|
|
||||||
@@ -803,8 +801,8 @@ static void G_HandleLocalDriftturn(ticcmd_t *cmd, UINT8 ssplayer)
|
|||||||
|
|
||||||
const UINT8 forplayer = (ssplayer-1);
|
const UINT8 forplayer = (ssplayer-1);
|
||||||
|
|
||||||
const boolean analogjoystickmove = cv_usejoystick[forplayer].value && !Joystick[forplayer].bGamepadStyle;
|
const boolean analogjoystickmove = cv_usejoystick[forplayer].value && !DigitalGamepadStyle(forplayer);
|
||||||
const boolean gamepadjoystickmove = cv_usejoystick[forplayer].value && Joystick[forplayer].bGamepadStyle;
|
const boolean gamepadjoystickmove = cv_usejoystick[forplayer].value && DigitalGamepadStyle(forplayer);
|
||||||
|
|
||||||
turnright = InputDown(gc_turnright, ssplayer);
|
turnright = InputDown(gc_turnright, ssplayer);
|
||||||
turnleft = InputDown(gc_turnleft, ssplayer);
|
turnleft = InputDown(gc_turnleft, ssplayer);
|
||||||
@@ -859,7 +857,8 @@ static void G_HandleLocalDriftturn(ticcmd_t *cmd, UINT8 ssplayer)
|
|||||||
static void G_BuildLocalTiccmd(ticcmd_t *cmd, UINT8 ssplayer, boolean freecam)
|
static void G_BuildLocalTiccmd(ticcmd_t *cmd, UINT8 ssplayer, boolean freecam)
|
||||||
{
|
{
|
||||||
INT32 axis = 0;
|
INT32 axis = 0;
|
||||||
const boolean usejoystick = cv_usejoystick[(ssplayer-1)].value;
|
const UINT8 forplayer = (ssplayer-1);
|
||||||
|
const boolean usejoystick = cv_usejoystick[forplayer].value;
|
||||||
|
|
||||||
// check for inputs and return button commands
|
// check for inputs and return button commands
|
||||||
// for stuff like joining with item button, saltyhop, honking, etc.
|
// for stuff like joining with item button, saltyhop, honking, etc.
|
||||||
@@ -895,7 +894,7 @@ static void G_BuildLocalTiccmd(ticcmd_t *cmd, UINT8 ssplayer, boolean freecam)
|
|||||||
#undef CHECKINPUT
|
#undef CHECKINPUT
|
||||||
|
|
||||||
axis = JoyAxis(AXISLOOKBACK, ssplayer);
|
axis = JoyAxis(AXISLOOKBACK, ssplayer);
|
||||||
camspin[ssplayer-1] = (InputDown(gc_lookback, ssplayer) || (usejoystick && axis > 0));
|
camspin[forplayer] = (InputDown(gc_lookback, ssplayer) || (usejoystick && axis > 0));
|
||||||
|
|
||||||
// Reset to our spec player if we watch someone else.
|
// Reset to our spec player if we watch someone else.
|
||||||
if ((cmd->driftturn || cmd->buttons)
|
if ((cmd->driftturn || cmd->buttons)
|
||||||
@@ -992,10 +991,7 @@ void G_BuildTiccmd(ticcmd_t *cmd, INT32 realtics, UINT8 ssplayer)
|
|||||||
player_t *player = P_GetLocalPlayerForNum(forplayer);
|
player_t *player = P_GetLocalPlayerForNum(forplayer);
|
||||||
|
|
||||||
camera_t *thiscam = &camera[forplayer];
|
camera_t *thiscam = &camera[forplayer];
|
||||||
const boolean freecam = camera[forplayer].freecam;
|
const boolean freecam = thiscam->freecam;
|
||||||
|
|
||||||
const boolean analogjoystickmove = cv_usejoystick[forplayer].value && !Joystick[forplayer].bGamepadStyle;
|
|
||||||
const boolean gamepadjoystickmove = cv_usejoystick[forplayer].value && Joystick[forplayer].bGamepadStyle;
|
|
||||||
|
|
||||||
lang = localangle[forplayer];
|
lang = localangle[forplayer];
|
||||||
laim = localaiming[forplayer];
|
laim = localaiming[forplayer];
|
||||||
@@ -1027,6 +1023,9 @@ void G_BuildTiccmd(ticcmd_t *cmd, INT32 realtics, UINT8 ssplayer)
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
const boolean analogjoystickmove = cv_usejoystick[forplayer].value && !DigitalGamepadStyle(forplayer);
|
||||||
|
const boolean gamepadjoystickmove = cv_usejoystick[forplayer].value && DigitalGamepadStyle(forplayer);
|
||||||
|
|
||||||
usejoystick = (analogjoystickmove || gamepadjoystickmove);
|
usejoystick = (analogjoystickmove || gamepadjoystickmove);
|
||||||
turnright = InputDown(gc_turnright, ssplayer);
|
turnright = InputDown(gc_turnright, ssplayer);
|
||||||
turnleft = InputDown(gc_turnleft, ssplayer);
|
turnleft = InputDown(gc_turnleft, ssplayer);
|
||||||
@@ -1311,6 +1310,7 @@ static void G_DoLoadLevel(boolean resetplayer)
|
|||||||
{
|
{
|
||||||
// fail so reset game stuff
|
// fail so reset game stuff
|
||||||
Command_ExitGame_f();
|
Command_ExitGame_f();
|
||||||
|
P_FreeCorruptMapWarnings();
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -1344,6 +1344,8 @@ static void G_DoLoadLevel(boolean resetplayer)
|
|||||||
|
|
||||||
// clear hud messages remains (usually from game startup)
|
// clear hud messages remains (usually from game startup)
|
||||||
CON_ClearHUD();
|
CON_ClearHUD();
|
||||||
|
// print any map errors now due to clearhud above :chaosleep:
|
||||||
|
P_PrintCorruptMapWarnings();
|
||||||
|
|
||||||
server_lagless = !cv_gentlemens.value;
|
server_lagless = !cv_gentlemens.value;
|
||||||
|
|
||||||
@@ -4089,6 +4091,7 @@ char *G_BuildMapTitle(INT32 mapnum)
|
|||||||
const char *actnum = NULL;
|
const char *actnum = NULL;
|
||||||
|
|
||||||
len += strlen(mapheaderinfo[mapnum-1]->lvlttl);
|
len += strlen(mapheaderinfo[mapnum-1]->lvlttl);
|
||||||
|
|
||||||
if (strlen(mapheaderinfo[mapnum-1]->zonttl) > 0)
|
if (strlen(mapheaderinfo[mapnum-1]->zonttl) > 0)
|
||||||
{
|
{
|
||||||
zonetext = M_GetText(mapheaderinfo[mapnum-1]->zonttl);
|
zonetext = M_GetText(mapheaderinfo[mapnum-1]->zonttl);
|
||||||
@@ -4099,6 +4102,7 @@ char *G_BuildMapTitle(INT32 mapnum)
|
|||||||
zonetext = M_GetText("Zone");
|
zonetext = M_GetText("Zone");
|
||||||
len += strlen(zonetext) + 1; // ' ' + zonetext
|
len += strlen(zonetext) + 1; // ' ' + zonetext
|
||||||
}
|
}
|
||||||
|
|
||||||
if (strlen(mapheaderinfo[mapnum-1]->actnum) > 0)
|
if (strlen(mapheaderinfo[mapnum-1]->actnum) > 0)
|
||||||
{
|
{
|
||||||
actnum = M_GetText(mapheaderinfo[mapnum-1]->actnum);
|
actnum = M_GetText(mapheaderinfo[mapnum-1]->actnum);
|
||||||
@@ -4112,8 +4116,10 @@ char *G_BuildMapTitle(INT32 mapnum)
|
|||||||
|
|
||||||
sprintf(title, "%s", mapheaderinfo[mapnum-1]->lvlttl);
|
sprintf(title, "%s", mapheaderinfo[mapnum-1]->lvlttl);
|
||||||
|
|
||||||
if (zonetext) sprintf(title + strlen(title), " %s", zonetext);
|
if (zonetext)
|
||||||
if (actnum) sprintf(title + strlen(title), " %s", actnum);
|
sprintf(title + strlen(title), " %s", zonetext);
|
||||||
|
if (actnum)
|
||||||
|
sprintf(title + strlen(title), " %s", actnum);
|
||||||
}
|
}
|
||||||
|
|
||||||
return title;
|
return title;
|
||||||
|
|||||||
+6
-4
@@ -118,10 +118,11 @@ extern consvar_t cv_driftsparkpulse;
|
|||||||
extern consvar_t cv_gravstretch;
|
extern consvar_t cv_gravstretch;
|
||||||
extern consvar_t cv_sloperoll;
|
extern consvar_t cv_sloperoll;
|
||||||
extern consvar_t cv_sliptideroll;
|
extern consvar_t cv_sliptideroll;
|
||||||
|
extern consvar_t cv_stairjank;
|
||||||
|
extern consvar_t cv_stairjanksfx;
|
||||||
extern consvar_t cv_slamsound;
|
extern consvar_t cv_slamsound;
|
||||||
extern consvar_t cv_sloperolldist;
|
extern consvar_t cv_sloperolldist;
|
||||||
extern consvar_t cv_sparkroll;
|
extern consvar_t cv_sparkroll;
|
||||||
extern consvar_t cv_spinoutroll;
|
|
||||||
|
|
||||||
extern consvar_t cv_squishdance, cv_squishdancespeed;
|
extern consvar_t cv_squishdance, cv_squishdancespeed;
|
||||||
|
|
||||||
@@ -227,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
-12
@@ -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,26 +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 (cv_rumble_stairjank[i].value
|
||||||
|
&& (player->stairjank > 8)
|
||||||
|
&& (player->speed != 0)
|
||||||
|
&& P_IsObjectOnGround(player->mo))
|
||||||
|
{
|
||||||
|
low = high = RUMBLE_VERYWEAK;
|
||||||
|
}
|
||||||
|
|
||||||
if (player->kartstuff[k_brakedrift])
|
if (cv_rumble_brakedrift[i].value
|
||||||
|
&& player->kartstuff[k_brakedrift])
|
||||||
{
|
{
|
||||||
high = CLAMP((high + RUMBLE_VERYWEAK), 0, UINT16_MAX);
|
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)
|
||||||
|
|||||||
+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;
|
||||||
|
|||||||
@@ -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;
|
||||||
|
|
||||||
|
|||||||
+293
-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,68 +325,81 @@ 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(seg_t *lseg, const line_t *line)
|
||||||
|
{
|
||||||
|
// portal check
|
||||||
|
if (!gl_maphasportals && lseg->side == 0 && line->special == PORTALSPECIAL)
|
||||||
|
{
|
||||||
|
// Find the other side!
|
||||||
|
INT32 line2 = P_FindSpecialLineFromTag(PORTALSPECIAL, line->tag, -1);
|
||||||
|
|
||||||
// use each seg of the poly as a partition line, keep only the
|
if (line == &lines[line2])
|
||||||
|
line2 = P_FindSpecialLineFromTag(PORTALSPECIAL, line->tag, line2);
|
||||||
|
|
||||||
|
if (line2 >= 0) // found it!
|
||||||
|
gl_maphasportals = 1;
|
||||||
|
}
|
||||||
|
|
||||||
|
// horizonline check
|
||||||
|
if (!gl_maphashorizonlines && line->special == HORIZONSPECIAL)
|
||||||
|
gl_maphashorizonlines = true;
|
||||||
|
}
|
||||||
|
|
||||||
|
// Use each seg of the poly as a partition line, keep only the
|
||||||
// part of the convex poly to the front of the seg (that is,
|
// 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, line);
|
||||||
line2 = P_FindSpecialLineFromTag(PORTALSPECIAL, line->tag, line2);
|
|
||||||
|
|
||||||
if (line2 >= 0) // found it!
|
if (line->sidenum[1] != NO_INDEX)
|
||||||
gl_maphasportals = 1;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (!gl_maphashorizonlines && line->special == HORIZONSPECIAL)
|
|
||||||
gl_maphashorizonlines = true;
|
|
||||||
|
|
||||||
if (line->sidenum[1] != 0xffff)
|
|
||||||
{
|
{
|
||||||
if (sides[line->sidenum[0]].sector == sides[line->sidenum[1]].sector)
|
if (sides[line->sidenum[0]].sector == sides[line->sidenum[1]].sector)
|
||||||
{
|
{
|
||||||
@@ -385,10 +411,21 @@ static poly_t *CutOutSubsecPoly(seg_t *lseg, INT32 count, poly_t *poly)
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
p1.x = FIXED_TO_FLOAT(lseg->side ? line->v2->x : line->v1->x);
|
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,25 @@ 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);
|
sprintf(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 +623,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 +640,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 +660,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 +703,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 +783,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 +796,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 +819,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 +845,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 +864,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 +918,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 +935,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..
|
||||||
|
|||||||
+10
-5
@@ -446,7 +446,7 @@ typedef struct
|
|||||||
} GLMapTextureSet_t; // idk i suck at naming things
|
} GLMapTextureSet_t; // idk i suck at naming things
|
||||||
|
|
||||||
static size_t gl_numtextures = 0; // Texture count
|
static size_t gl_numtextures = 0; // Texture count
|
||||||
static GLMapTextureSet_t *gl_textures; // For all textures
|
static GLMapTextureSet_t *gl_textures = NULL; // For all textures
|
||||||
|
|
||||||
static void HWR_FreeTextureData(patch_t *patch)
|
static void HWR_FreeTextureData(patch_t *patch)
|
||||||
{
|
{
|
||||||
@@ -570,7 +570,8 @@ void HWR_ClearAllTextures(void)
|
|||||||
/*static void HWR_FreeColormapCache(void)
|
/*static void HWR_FreeColormapCache(void)
|
||||||
{
|
{
|
||||||
HWR_FreePatchCache(false);
|
HWR_FreePatchCache(false);
|
||||||
}*/
|
}
|
||||||
|
*/
|
||||||
|
|
||||||
void HWR_InitMapTextures(void)
|
void HWR_InitMapTextures(void)
|
||||||
{
|
{
|
||||||
@@ -622,10 +623,12 @@ static void HWR_PrecacheLevelFlats(void)
|
|||||||
{
|
{
|
||||||
// lookup for flats that may´ve been already loaded
|
// lookup for flats that may´ve been already loaded
|
||||||
flatcheck flatpresent;
|
flatcheck flatpresent;
|
||||||
flatcheck_init(&flatpresent);
|
|
||||||
size_t i, j;
|
size_t i, j;
|
||||||
INT32 k;
|
INT32 k;
|
||||||
|
|
||||||
|
flatcheck_init(&flatpresent);
|
||||||
|
flatcheck_reserve(&flatpresent, numlevelflats);
|
||||||
|
|
||||||
// special case for encore
|
// special case for encore
|
||||||
#ifdef GLENCORE
|
#ifdef GLENCORE
|
||||||
if (encoremap)
|
if (encoremap)
|
||||||
@@ -726,7 +729,7 @@ static void HWR_PrecacheLevelTextures(void)
|
|||||||
for (j = 0; j < 2; j++)
|
for (j = 0; j < 2; j++)
|
||||||
{
|
{
|
||||||
// check if single-sided linedef
|
// check if single-sided linedef
|
||||||
if (line->sidenum[j] == 0xffff)
|
if (line->sidenum[j] == NO_INDEX)
|
||||||
continue;
|
continue;
|
||||||
|
|
||||||
const side_t *side = &sides[line->sidenum[j]];
|
const side_t *side = &sides[line->sidenum[j]];
|
||||||
@@ -989,7 +992,6 @@ static void HWR_CacheFlat(GLMipmap_t *glMipmap, lumpnum_t flatlumpnum)
|
|||||||
|
|
||||||
flat[steppy] = glMipmap->colormap->source[flat[steppy]];
|
flat[steppy] = glMipmap->colormap->source[flat[steppy]];
|
||||||
}
|
}
|
||||||
#endif
|
|
||||||
|
|
||||||
if (haschromakey)
|
if (haschromakey)
|
||||||
{
|
{
|
||||||
@@ -1001,6 +1003,7 @@ static void HWR_CacheFlat(GLMipmap_t *glMipmap, lumpnum_t flatlumpnum)
|
|||||||
glMipmap->flags &= ~TF_CHROMAKEYED;
|
glMipmap->flags &= ~TF_CHROMAKEYED;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
#endif
|
||||||
}
|
}
|
||||||
|
|
||||||
// Download a Doom 'flat' to the hardware cache and make it ready for use
|
// Download a Doom 'flat' to the hardware cache and make it ready for use
|
||||||
@@ -1127,7 +1130,9 @@ void HWR_GetMappedPatch(patch_t *patch, const UINT8 *colormap)
|
|||||||
HWR_UpdatePatchMipmap(patch, glMipmap);
|
HWR_UpdatePatchMipmap(patch, glMipmap);
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
|
{
|
||||||
HWR_LoadPatchMipmap(patch, glMipmap);
|
HWR_LoadPatchMipmap(patch, glMipmap);
|
||||||
|
}
|
||||||
|
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -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);
|
||||||
|
|||||||
+398
-450
File diff suppressed because it is too large.
Load diff
@@ -102,7 +102,7 @@ void HWR_SetViewSize(void);
|
|||||||
void HWR_AddCommands(void);
|
void HWR_AddCommands(void);
|
||||||
|
|
||||||
void HWR_RenderPlayerView(void);
|
void HWR_RenderPlayerView(void);
|
||||||
void HWR_RenderPortalViewpoint(gl_portal_t *rootportal, int stencil_level, boolean allow_portals);
|
void HWR_RenderPortalViewpoint(gl_portal_t *rootportal, int stencil_level);
|
||||||
|
|
||||||
void HWR_ClearSkyDome(void);
|
void HWR_ClearSkyDome(void);
|
||||||
void HWR_BuildSkyDome(void);
|
void HWR_BuildSkyDome(void);
|
||||||
|
|||||||
@@ -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;
|
||||||
@@ -1400,12 +1403,11 @@ void HWR_DrawMD2(gl_vissprite_t *spr)
|
|||||||
|
|
||||||
const angle_t sliptideroll = ((cv_sliptideroll.value && spr->mobj->player) ? spr->mobj->player->sliproll : 0);
|
const angle_t sliptideroll = ((cv_sliptideroll.value && spr->mobj->player) ? spr->mobj->player->sliproll : 0);
|
||||||
const SINT8 flipfactor = flip ? -1 : 1;
|
const SINT8 flipfactor = flip ? -1 : 1;
|
||||||
|
const angle_t thingrollangle = (spr->mobj->rollangle - spr->mobj->temprollangle);
|
||||||
|
|
||||||
if (spr->mobj->rollangle || sliptideroll)
|
if (thingrollangle || sliptideroll)
|
||||||
{
|
{
|
||||||
angle_t rollang = sliptideroll
|
angle_t rollang = sliptideroll ? (thingrollangle + (sliptideroll * spr->mobj->player->kartstuff[k_aizdriftstrat])) : thingrollangle;
|
||||||
? (spr->mobj->rollangle) + (sliptideroll * spr->mobj->player->kartstuff[k_aizdriftstrat])
|
|
||||||
: (spr->mobj->rollangle);
|
|
||||||
|
|
||||||
rollang *= flipfactor;
|
rollang *= flipfactor;
|
||||||
|
|
||||||
|
|||||||
@@ -80,8 +80,8 @@ void HWR_Portal_Add2Lines(const INT32 line1, const INT32 line2, seg_t *seg)
|
|||||||
gl_portal_t *portal = HWR_Portal_Add(seg);
|
gl_portal_t *portal = HWR_Portal_Add(seg);
|
||||||
|
|
||||||
// Offset the portal view by the linedef centers
|
// Offset the portal view by the linedef centers
|
||||||
line_t* start = &lines[line1];
|
line_t* start = &lines[line1];
|
||||||
line_t* dest = &lines[line2];
|
line_t* dest = &lines[line2];
|
||||||
|
|
||||||
angle_t dangle = R_PointToAngle2(0, 0, dest->dx, dest->dy) - R_PointToAngle2(start->dx, start->dy, 0, 0);
|
angle_t dangle = R_PointToAngle2(0, 0, dest->dx, dest->dy) - R_PointToAngle2(start->dx, start->dy, 0, 0);
|
||||||
|
|
||||||
@@ -99,7 +99,7 @@ void HWR_Portal_Add2Lines(const INT32 line1, const INT32 line2, seg_t *seg)
|
|||||||
dest_c.y = dest->v1->y/2 + dest->v2->y/2;
|
dest_c.y = dest->v1->y/2 + dest->v2->y/2;
|
||||||
|
|
||||||
disttopoint = R_PointToDist2(start_c.x, start_c.y, viewx, viewy);
|
disttopoint = R_PointToDist2(start_c.x, start_c.y, viewx, viewy);
|
||||||
angtopoint = R_PointToAngle2(start_c.x, start_c.y, viewx, viewy);
|
angtopoint = R_PointToAngle2(start_c.x, start_c.y, viewx, viewy);
|
||||||
angtopoint += dangle;
|
angtopoint += dangle;
|
||||||
|
|
||||||
portal->viewx = dest_c.x + FixedMul(FINECOSINE(angtopoint>>ANGLETOFINESHIFT), disttopoint);
|
portal->viewx = dest_c.x + FixedMul(FINECOSINE(angtopoint>>ANGLETOFINESHIFT), disttopoint);
|
||||||
@@ -170,7 +170,7 @@ void HWR_RenderPortal(gl_portal_t* portal, gl_portal_t* rootportal, const float
|
|||||||
HWR_PortalFrame(portal);
|
HWR_PortalFrame(portal);
|
||||||
|
|
||||||
// call HWR_RenderViewpoint
|
// call HWR_RenderViewpoint
|
||||||
HWR_RenderPortalViewpoint(portal, stencil_level + 1, true);
|
HWR_RenderPortalViewpoint(portal, stencil_level + 1);
|
||||||
|
|
||||||
// return to current frame
|
// return to current frame
|
||||||
if (rootportal)
|
if (rootportal)
|
||||||
@@ -220,9 +220,9 @@ boolean HWR_PortalCheckBBox(const fixed_t *bspcoord)
|
|||||||
if (!portalclipline)
|
if (!portalclipline)
|
||||||
return true;
|
return true;
|
||||||
|
|
||||||
if (HWR_PortalCheckPointSide(bspcoord[BOXLEFT], bspcoord[BOXTOP]) ||
|
if (HWR_PortalCheckPointSide(bspcoord[BOXLEFT], bspcoord[BOXTOP]) ||
|
||||||
HWR_PortalCheckPointSide(bspcoord[BOXLEFT], bspcoord[BOXBOTTOM]) ||
|
HWR_PortalCheckPointSide(bspcoord[BOXLEFT], bspcoord[BOXBOTTOM]) ||
|
||||||
HWR_PortalCheckPointSide(bspcoord[BOXRIGHT], bspcoord[BOXTOP]) ||
|
HWR_PortalCheckPointSide(bspcoord[BOXRIGHT], bspcoord[BOXTOP]) ||
|
||||||
HWR_PortalCheckPointSide(bspcoord[BOXRIGHT], bspcoord[BOXBOTTOM]))
|
HWR_PortalCheckPointSide(bspcoord[BOXRIGHT], bspcoord[BOXBOTTOM]))
|
||||||
{
|
{
|
||||||
return true;
|
return true;
|
||||||
|
|||||||
@@ -76,6 +76,11 @@
|
|||||||
//
|
//
|
||||||
|
|
||||||
// Include GLSL_FLOOR_FUDGES or GLSL_WALL_FUDGES or define the fudges in shaders that use this macro.
|
// Include GLSL_FLOOR_FUDGES or GLSL_WALL_FUDGES or define the fudges in shaders that use this macro.
|
||||||
|
|
||||||
|
// dither shader based on
|
||||||
|
// https://github.com/hughsk/glsl-dither/blob/master/8x8.glsl
|
||||||
|
// https://github.com/libretro/glsl-shaders/blob/master/dithering/shaders/bayer_4x4.glsl
|
||||||
|
// adapted and messed about to work with srb2 and scale per resolution
|
||||||
#define GLSL_DOOM_COLORMAP_DITHER \
|
#define GLSL_DOOM_COLORMAP_DITHER \
|
||||||
"float baseValue = max(startmap * STARTMAP_FUDGE - scale * 0.5 * SCALE_FUDGE, cap);\n" \
|
"float baseValue = max(startmap * STARTMAP_FUDGE - scale * 0.5 * SCALE_FUDGE, cap);\n" \
|
||||||
"float patscale = min(scr_resolution.x / 1280.0, scr_resolution.y / 720.0);\n" \
|
"float patscale = min(scr_resolution.x / 1280.0, scr_resolution.y / 720.0);\n" \
|
||||||
|
|||||||
@@ -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; \
|
||||||
} \
|
} \
|
||||||
|
|
||||||
@@ -1122,7 +1122,7 @@ static void GL_Perspective(GLfloat fovy, GLfloat aspect)
|
|||||||
|
|
||||||
const GLfloat deltaZ = FAR_CLIPPING_PLANE - NEAR_CLIPPING_PLANE;
|
const GLfloat deltaZ = FAR_CLIPPING_PLANE - NEAR_CLIPPING_PLANE;
|
||||||
|
|
||||||
if ((fabsf((float)deltaZ) < 1.0E-36f) || fpclassify(aspect) == FP_ZERO)
|
if ((fabsf(deltaZ) < 1.0E-36f) || fpclassify(aspect) == FP_ZERO)
|
||||||
{
|
{
|
||||||
return;
|
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);
|
||||||
@@ -1583,6 +1596,7 @@ void GL_Draw2DLine(F2DCoord * v1, F2DCoord * v2, RGBA_t Color)
|
|||||||
angle = atanf((v2->y-v1->y)/(v2->x-v1->x));
|
angle = atanf((v2->y-v1->y)/(v2->x-v1->x));
|
||||||
else
|
else
|
||||||
angle = (float)N_PI_DEMI;
|
angle = (float)N_PI_DEMI;
|
||||||
|
|
||||||
dx = sinf(angle) / (float)screen_width;
|
dx = sinf(angle) / (float)screen_width;
|
||||||
dy = cosf(angle) / (float)screen_height;
|
dy = cosf(angle) / (float)screen_height;
|
||||||
|
|
||||||
@@ -1697,7 +1711,7 @@ static void GL_SetBlendMode(FBITFIELD flags)
|
|||||||
|
|
||||||
void GL_SetBlend(FBITFIELD PolyFlags)
|
void GL_SetBlend(FBITFIELD PolyFlags)
|
||||||
{
|
{
|
||||||
const FBITFIELD Xor = CurrentPolyFlags^PolyFlags;;
|
const FBITFIELD Xor = CurrentPolyFlags^PolyFlags;
|
||||||
|
|
||||||
if (Xor & (PF_Blending|PF_RemoveYWrap|PF_ForceWrapX|PF_ForceWrapY|PF_Occlude|PF_NoTexture|PF_Modulated|PF_NoDepthTest|PF_Decal|PF_Skydecal|PF_Invisible))
|
if (Xor & (PF_Blending|PF_RemoveYWrap|PF_ForceWrapX|PF_ForceWrapY|PF_Occlude|PF_NoTexture|PF_Modulated|PF_NoDepthTest|PF_Decal|PF_Skydecal|PF_Invisible))
|
||||||
{
|
{
|
||||||
@@ -2489,7 +2503,7 @@ void GL_RenderSkyDome(gl_sky_t *sky)
|
|||||||
GL_Shader_SetUniforms(NULL, NULL, NULL, NULL);
|
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)
|
||||||
@@ -2914,7 +2928,7 @@ void GL_CreateModelVBOs(model_t *model)
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
#define BUFFER_OFFSET(i) ((char*)(i))
|
#define BUFFER_OFFSET(i) ((void*)(i))
|
||||||
|
|
||||||
void GL_DrawModelEx(model_t *model, INT32 frameIndex, float duration, float tics, INT32 nextFrameIndex, FTransform *pos, float hscale, float vscale, UINT8 flipped, UINT8 hflipped, FSurfaceInfo *Surface)
|
void GL_DrawModelEx(model_t *model, INT32 frameIndex, float duration, float tics, INT32 nextFrameIndex, FTransform *pos, float hscale, float vscale, UINT8 flipped, UINT8 hflipped, FSurfaceInfo *Surface)
|
||||||
{
|
{
|
||||||
@@ -3207,8 +3221,8 @@ void GL_SetTransform(FTransform *stransform)
|
|||||||
{
|
{
|
||||||
float dy = stransform->viewaiming * 2;
|
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);
|
||||||
@@ -3233,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
|
||||||
@@ -3253,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
|
||||||
@@ -3273,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
|
||||||
@@ -3318,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;
|
||||||
}
|
}
|
||||||
@@ -3331,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);
|
||||||
@@ -3340,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);
|
||||||
@@ -3355,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
|
|
||||||
+160
-48
@@ -117,6 +117,11 @@ static void HU_DrawRankings(void);
|
|||||||
|
|
||||||
consvar_t cv_showspecstuff = {"showspecstuff", "No", CV_SAVE, CV_YesNo, NULL, 0, NULL, NULL, 0, 0, NULL};
|
consvar_t cv_showspecstuff = {"showspecstuff", "No", CV_SAVE, CV_YesNo, NULL, 0, NULL, NULL, 0, 0, NULL};
|
||||||
|
|
||||||
|
// stuff from SRB2-Banpyura thx alot! :3
|
||||||
|
consvar_t cv_chat_xoffset = {"chat_xoffset", "0", CV_SAVE, NULL, NULL, 0, NULL, NULL, 0, 0, NULL};
|
||||||
|
consvar_t cv_chat_yoffset = {"chat_yoffset", "0", CV_SAVE, NULL, NULL, 0, NULL, NULL, 0, 0, NULL};
|
||||||
|
consvar_t cv_chat_showlimit = {"chat_showlimit", "No", CV_SAVE, CV_YesNo, NULL, 0, NULL, NULL, 0, 0, NULL};
|
||||||
|
|
||||||
static char cechotext[1024];
|
static char cechotext[1024];
|
||||||
static tic_t cechotimer = 0;
|
static tic_t cechotimer = 0;
|
||||||
static tic_t cechoduration = 5*TICRATE;
|
static tic_t cechoduration = 5*TICRATE;
|
||||||
@@ -133,6 +138,7 @@ static void Command_Say_f(void);
|
|||||||
static void Command_Sayto_f(void);
|
static void Command_Sayto_f(void);
|
||||||
static void Command_Sayteam_f(void);
|
static void Command_Sayteam_f(void);
|
||||||
static void Command_CSay_f(void);
|
static void Command_CSay_f(void);
|
||||||
|
static void Command_Mute_f(void);
|
||||||
static void Got_Saycmd(const UINT8 **p, INT32 playernum);
|
static void Got_Saycmd(const UINT8 **p, INT32 playernum);
|
||||||
|
|
||||||
void HU_LoadGraphics(void)
|
void HU_LoadGraphics(void)
|
||||||
@@ -260,6 +266,8 @@ void HU_Init(void)
|
|||||||
COM_AddCommand("csay", Command_CSay_f);
|
COM_AddCommand("csay", Command_CSay_f);
|
||||||
RegisterNetXCmd(XD_SAY, Got_Saycmd);
|
RegisterNetXCmd(XD_SAY, Got_Saycmd);
|
||||||
|
|
||||||
|
COM_AddCommand("muteplayer", Command_Mute_f);
|
||||||
|
|
||||||
if (dedicated || rendermode == render_none)
|
if (dedicated || rendermode == render_none)
|
||||||
return;
|
return;
|
||||||
|
|
||||||
@@ -963,7 +971,7 @@ void HU_Ticker(void)
|
|||||||
size_t i = 0;
|
size_t i = 0;
|
||||||
|
|
||||||
// handle spam while we're at it:
|
// handle spam while we're at it:
|
||||||
for(; (i < MAXPLAYERS); i++)
|
for (; (i < MAXPLAYERS); i++)
|
||||||
{
|
{
|
||||||
if (stop_spamming[i] > 0)
|
if (stop_spamming[i] > 0)
|
||||||
stop_spamming[i]--;
|
stop_spamming[i]--;
|
||||||
@@ -1022,21 +1030,42 @@ static boolean HU_clearChatSpaces(void)
|
|||||||
return nothingbutspaces;
|
return nothingbutspaces;
|
||||||
}
|
}
|
||||||
|
|
||||||
static void DoMute(const char *name)
|
static void DoMute(const char *name, boolean chat)
|
||||||
{
|
{
|
||||||
INT32 pnum = D_LookupPlayer(name);
|
INT32 pnum = D_LookupPlayer(name);
|
||||||
|
|
||||||
if (pnum < 0)
|
// Shortcut to reuse this function for console and chat command
|
||||||
|
#define PRINT(msg, sound) do { \
|
||||||
|
if (chat) \
|
||||||
|
HU_AddChatText((msg), (sound)); \
|
||||||
|
else \
|
||||||
|
CONS_Printf("%s\n", msg); \
|
||||||
|
} while (0)
|
||||||
|
|
||||||
|
if (pnum < 0 || !playeringame[pnum])
|
||||||
{
|
{
|
||||||
HU_AddChatText("\x85""ERROR: \x80Player not found.", false);
|
PRINT("\x85""ERROR: \x80Player not found.", false);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
player_muted[pnum] = !player_muted[pnum];
|
player_muted[pnum] = !player_muted[pnum];
|
||||||
|
|
||||||
HU_AddChatText(va("Player '%s' has been %smuted.", player_names[pnum], player_muted[pnum] ? "" : "un"), false);
|
PRINT(va("Player '%s' has been %smuted.", player_names[pnum], player_muted[pnum] ? "" : "un"), false);
|
||||||
if (player_muted[pnum])
|
if (player_muted[pnum])
|
||||||
HU_AddChatText("Use same command to unmute them.", false);
|
PRINT("Use same command to unmute them.", false);
|
||||||
|
|
||||||
|
#undef PRINT
|
||||||
|
}
|
||||||
|
|
||||||
|
static void Command_Mute_f(void)
|
||||||
|
{
|
||||||
|
if (COM_Argc() < 2)
|
||||||
|
{
|
||||||
|
CONS_Printf(M_GetText("mute <playername|playernum>: mute/unmute a player\n"));
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
DoMute(COM_Argv(1), false);
|
||||||
}
|
}
|
||||||
|
|
||||||
static void HU_SendChatMessage(void)
|
static void HU_SendChatMessage(void)
|
||||||
@@ -1070,7 +1099,7 @@ static void HU_SendChatMessage(void)
|
|||||||
if (msglength >= 5 && strnicmp(msg, "/mute", 5) == 0) // Used /mute
|
if (msglength >= 5 && strnicmp(msg, "/mute", 5) == 0) // Used /mute
|
||||||
{
|
{
|
||||||
if (msglength > 6)
|
if (msglength > 6)
|
||||||
DoMute(msg+6);
|
DoMute(msg+6, true);
|
||||||
else
|
else
|
||||||
HU_AddChatText("\x82NOTICE: \x80Usage: /mute <name|node>", false);
|
HU_AddChatText("\x82NOTICE: \x80Usage: /mute <name|node>", false);
|
||||||
|
|
||||||
@@ -1111,6 +1140,7 @@ static void HU_SendChatMessage(void)
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
// I'm very bad at C, I swear I am, additional checks eww!
|
// I'm very bad at C, I swear I am, additional checks eww!
|
||||||
if (spc != 0)
|
if (spc != 0)
|
||||||
{
|
{
|
||||||
@@ -1257,13 +1287,15 @@ boolean HU_Responder(event_t *ev)
|
|||||||
chat_on = false;
|
chat_on = false;
|
||||||
I_SetTextInput(false);
|
I_SetTextInput(false);
|
||||||
}
|
}
|
||||||
else if ((c == KEY_UPARROW || c == KEY_MOUSEWHEELUP) && chat_scroll > 0 && !OLDCHAT) // CHAT SCROLLING YAYS!
|
else if ((c == KEY_UPARROW || c == KEY_PGUP || c == KEY_MOUSEWHEELUP) &&
|
||||||
|
((chat_scroll > 0) && !OLDCHAT)) // CHAT SCROLLING YAYS!
|
||||||
{
|
{
|
||||||
chat_scroll--;
|
chat_scroll--;
|
||||||
justscrolledup = true;
|
justscrolledup = true;
|
||||||
chat_scrolltime = 4;
|
chat_scrolltime = 4;
|
||||||
}
|
}
|
||||||
else if ((c == KEY_DOWNARROW || c == KEY_MOUSEWHEELDOWN) && chat_scroll < chat_maxscroll && chat_maxscroll > 0 && !OLDCHAT)
|
else if ((c == KEY_DOWNARROW || c == KEY_PGDN || c == KEY_MOUSEWHEELDOWN) &&
|
||||||
|
((chat_scroll < chat_maxscroll) && (chat_maxscroll > 0) && !OLDCHAT))
|
||||||
{
|
{
|
||||||
chat_scroll++;
|
chat_scroll++;
|
||||||
justscrolleddown = true;
|
justscrolleddown = true;
|
||||||
@@ -1343,7 +1375,12 @@ static char *CHAT_WordWrap(INT32 x, INT32 w, INT32 option, const char *string)
|
|||||||
|
|
||||||
// 30/7/18: chaty is now the distance at which the lowest point of the chat will be drawn if that makes any sense.
|
// 30/7/18: chaty is now the distance at which the lowest point of the chat will be drawn if that makes any sense.
|
||||||
|
|
||||||
INT16 chatx = 13, chaty = 169; // let's use this as our coordinates, shh
|
// let's use this as our coordinates, shh
|
||||||
|
// :chao: guess this just works lol
|
||||||
|
#define chatx ((INT16)(13 + (cv_chat_xoffset.value)))
|
||||||
|
#define chaty ((INT16)(169 + (cv_chat_yoffset.value)))
|
||||||
|
|
||||||
|
#define CHATSNAP (V_SNAPTOBOTTOM|V_SNAPTOLEFT)
|
||||||
|
|
||||||
// chat stuff by VincyTM LOL XD!
|
// chat stuff by VincyTM LOL XD!
|
||||||
|
|
||||||
@@ -1370,7 +1407,7 @@ static void HU_drawMiniChat(void)
|
|||||||
|
|
||||||
for (; i > 0; i--)
|
for (; i > 0; i--)
|
||||||
{
|
{
|
||||||
char *msg = CHAT_WordWrap(x+2, boxw-(charwidth*2), V_SNAPTOBOTTOM|V_SNAPTOLEFT|V_ALLOWLOWERCASE, chat_mini[i-1]);
|
char *msg = CHAT_WordWrap(x+2, boxw-(charwidth*2), CHATSNAP|V_ALLOWLOWERCASE, chat_mini[i-1]);
|
||||||
size_t j = 0;
|
size_t j = 0;
|
||||||
INT32 linescount = 0;
|
INT32 linescount = 0;
|
||||||
emote_t *emote = NULL;
|
emote_t *emote = NULL;
|
||||||
@@ -1430,6 +1467,7 @@ static void HU_drawMiniChat(void)
|
|||||||
if (splitscreen)
|
if (splitscreen)
|
||||||
{
|
{
|
||||||
y -= BASEVIDHEIGHT/2;
|
y -= BASEVIDHEIGHT/2;
|
||||||
|
|
||||||
if (splitscreen > 1)
|
if (splitscreen > 1)
|
||||||
y += 16;
|
y += 16;
|
||||||
}
|
}
|
||||||
@@ -1447,7 +1485,7 @@ static void HU_drawMiniChat(void)
|
|||||||
INT32 timer = ((cv_chattime.value*TICRATE)-chat_timers[i]) - cv_chattime.value*TICRATE+9; // see below...
|
INT32 timer = ((cv_chattime.value*TICRATE)-chat_timers[i]) - cv_chattime.value*TICRATE+9; // see below...
|
||||||
INT32 transflag = (timer >= 0 && timer <= 9) ? (timer*V_10TRANS) : 0; // you can make bad jokes out of this one.
|
INT32 transflag = (timer >= 0 && timer <= 9) ? (timer*V_10TRANS) : 0; // you can make bad jokes out of this one.
|
||||||
size_t j = 0;
|
size_t j = 0;
|
||||||
char *msg = CHAT_WordWrap(x+2, boxw-(charwidth*2), V_SNAPTOBOTTOM|V_SNAPTOLEFT|V_ALLOWLOWERCASE, chat_mini[i]); // get the current message, and word wrap it.
|
char *msg = CHAT_WordWrap(x+2, boxw-(charwidth*2), CHATSNAP|V_ALLOWLOWERCASE, chat_mini[i]); // get the current message, and word wrap it.
|
||||||
UINT8 *colormap = NULL;
|
UINT8 *colormap = NULL;
|
||||||
emote_t *emote = NULL;
|
emote_t *emote = NULL;
|
||||||
int emotelen = 0;
|
int emotelen = 0;
|
||||||
@@ -1480,9 +1518,9 @@ static void HU_drawMiniChat(void)
|
|||||||
else if ((emote = M_VerifyEmote(msg+j, &emotelen)))
|
else if ((emote = M_VerifyEmote(msg+j, &emotelen)))
|
||||||
{
|
{
|
||||||
if (cv_chatbacktint.value) // on request of wolfy
|
if (cv_chatbacktint.value) // on request of wolfy
|
||||||
V_DrawFillConsoleMap(x + dx + 2, y+dy, EMOTEWIDTH, charheight, 239|V_SNAPTOBOTTOM|V_SNAPTOLEFT);
|
V_DrawFillConsoleMap(x + dx + 2, y+dy, EMOTEWIDTH, charheight, 239|CHATSNAP);
|
||||||
|
|
||||||
M_DrawEmote(x+dx+2, y+dy, emote, V_SNAPTOBOTTOM|V_SNAPTOLEFT|transflag);
|
M_DrawEmote(x+dx+2, y+dy, emote, CHATSNAP|transflag);
|
||||||
dx += EMOTEWIDTH - charwidth;
|
dx += EMOTEWIDTH - charwidth;
|
||||||
|
|
||||||
j += emotelen;
|
j += emotelen;
|
||||||
@@ -1490,9 +1528,9 @@ static void HU_drawMiniChat(void)
|
|||||||
else
|
else
|
||||||
{
|
{
|
||||||
if (cv_chatbacktint.value) // on request of wolfy
|
if (cv_chatbacktint.value) // on request of wolfy
|
||||||
V_DrawFillConsoleMap(x + dx + 2, y+dy, charwidth, charheight, 239|V_SNAPTOBOTTOM|V_SNAPTOLEFT);
|
V_DrawFillConsoleMap(x + dx + 2, y+dy, charwidth, charheight, 239|CHATSNAP);
|
||||||
|
|
||||||
V_DrawChatCharacter(x + dx + 2, y+dy+cv_chatcentertext.value, msg[j++] |V_SNAPTOBOTTOM|V_SNAPTOLEFT|transflag, !cv_allcaps.value, colormap);
|
V_DrawChatCharacter(x + dx + 2, y+dy+cv_chatcentertext.value, msg[j++] |CHATSNAP|transflag, !cv_allcaps.value, colormap);
|
||||||
}
|
}
|
||||||
|
|
||||||
dx += charwidth;
|
dx += charwidth;
|
||||||
@@ -1553,13 +1591,13 @@ static void HU_drawChatLog(INT32 offset)
|
|||||||
chat_topy = y + chat_scroll*charheight;
|
chat_topy = y + chat_scroll*charheight;
|
||||||
chat_bottomy = chat_topy + boxh*charheight;
|
chat_bottomy = chat_topy + boxh*charheight;
|
||||||
|
|
||||||
V_DrawFillConsoleMap(chatx, chat_topy, boxw, boxh*charheight +2, 239|V_SNAPTOBOTTOM|V_SNAPTOLEFT); // log box
|
V_DrawFillConsoleMap(chatx, chat_topy, boxw, boxh*charheight +2, 239|CHATSNAP); // log box
|
||||||
|
|
||||||
for (i = 0; i < chat_nummsg_log; i++) // iterate through our chatlog
|
for (i = 0; i < chat_nummsg_log; i++) // iterate through our chatlog
|
||||||
{
|
{
|
||||||
INT32 clrflag = 0;
|
INT32 clrflag = 0;
|
||||||
INT32 j = 0;
|
INT32 j = 0;
|
||||||
char *msg = CHAT_WordWrap(x+2, boxw-(charwidth*2), V_SNAPTOBOTTOM|V_SNAPTOLEFT|V_ALLOWLOWERCASE, chat_log[i]); // get the current message, and word wrap it.
|
char *msg = CHAT_WordWrap(x+2, boxw-(charwidth*2), CHATSNAP|V_ALLOWLOWERCASE, chat_log[i]); // get the current message, and word wrap it.
|
||||||
UINT8 *colormap = NULL;
|
UINT8 *colormap = NULL;
|
||||||
emote_t *emote = NULL;
|
emote_t *emote = NULL;
|
||||||
int emotelen = 0;
|
int emotelen = 0;
|
||||||
@@ -1589,7 +1627,7 @@ static void HU_drawChatLog(INT32 offset)
|
|||||||
{
|
{
|
||||||
if ((y+dy+2 >= chat_topy) && (y+dy < (chat_bottomy)))
|
if ((y+dy+2 >= chat_topy) && (y+dy < (chat_bottomy)))
|
||||||
{
|
{
|
||||||
M_DrawEmote(x+dx+2, y+dy+1, emote, V_SNAPTOBOTTOM|V_SNAPTOLEFT);
|
M_DrawEmote(x+dx+2, y+dy+1, emote, CHATSNAP);
|
||||||
dx += EMOTEWIDTH - charwidth;
|
dx += EMOTEWIDTH - charwidth;
|
||||||
}
|
}
|
||||||
j += emotelen;
|
j += emotelen;
|
||||||
@@ -1597,7 +1635,7 @@ static void HU_drawChatLog(INT32 offset)
|
|||||||
else
|
else
|
||||||
{
|
{
|
||||||
if ((y+dy+2 >= chat_topy) && (y+dy < (chat_bottomy)))
|
if ((y+dy+2 >= chat_topy) && (y+dy < (chat_bottomy)))
|
||||||
V_DrawChatCharacter(x + dx + 2, y+dy+2, msg[j++] |V_SNAPTOBOTTOM|V_SNAPTOLEFT, !cv_allcaps.value, colormap);
|
V_DrawChatCharacter(x + dx + 2, y+dy+2, msg[j++] |CHATSNAP, !cv_allcaps.value, colormap);
|
||||||
else
|
else
|
||||||
j++; // don't forget to increment this or we'll get stuck in the limbo.
|
j++; // don't forget to increment this or we'll get stuck in the limbo.
|
||||||
}
|
}
|
||||||
@@ -1634,9 +1672,9 @@ static void HU_drawChatLog(INT32 offset)
|
|||||||
|
|
||||||
// draw arrows to indicate that we can (or not) scroll.
|
// draw arrows to indicate that we can (or not) scroll.
|
||||||
if (chat_scroll > 0)
|
if (chat_scroll > 0)
|
||||||
V_DrawCharacter(chatx-9, ((justscrolledup) ? (chat_topy-1) : (chat_topy)), V_SNAPTOBOTTOM | V_SNAPTOLEFT | highlight | '\x1A', false); // up arrow
|
V_DrawCharacter(chatx-9, ((justscrolledup) ? (chat_topy-1) : (chat_topy)), CHATSNAP | highlight | '\x1A', false); // up arrow
|
||||||
if (chat_scroll < chat_maxscroll)
|
if (chat_scroll < chat_maxscroll)
|
||||||
V_DrawCharacter(chatx-9, chat_bottomy-((justscrolleddown) ? 5 : 6), V_SNAPTOBOTTOM | V_SNAPTOLEFT | highlight | '\x1B', false); // down arrow
|
V_DrawCharacter(chatx-9, chat_bottomy-((justscrolleddown) ? 5 : 6), CHATSNAP | highlight | '\x1B', false); // down arrow
|
||||||
|
|
||||||
justscrolleddown = false;
|
justscrolleddown = false;
|
||||||
justscrolledup = false;
|
justscrolledup = false;
|
||||||
@@ -1654,6 +1692,7 @@ static void HU_DrawChat(void)
|
|||||||
INT32 boxw = cv_chatwidth.value;
|
INT32 boxw = cv_chatwidth.value;
|
||||||
INT32 t = 0, c = 0, y = chaty - (typelines*charheight);
|
INT32 t = 0, c = 0, y = chaty - (typelines*charheight);
|
||||||
UINT32 i = 0, saylen = strlen(w_chat_buf); // You learn new things everyday!
|
UINT32 i = 0, saylen = strlen(w_chat_buf); // You learn new things everyday!
|
||||||
|
UINT32 charcount = 0;
|
||||||
INT32 cflag = 0;
|
INT32 cflag = 0;
|
||||||
INT32 pm_offset = 0; // for cases when you type emote while also doing /pm
|
INT32 pm_offset = 0; // for cases when you type emote while also doing /pm
|
||||||
size_t select_start = 0, select_end = 0;
|
size_t select_start = 0, select_end = 0;
|
||||||
@@ -1685,7 +1724,7 @@ static void HU_DrawChat(void)
|
|||||||
cflag = V_GRAYMAP; // set text in gray if chat is muted.
|
cflag = V_GRAYMAP; // set text in gray if chat is muted.
|
||||||
}
|
}
|
||||||
|
|
||||||
V_DrawFillConsoleMap(chatx, y-1, boxw, (typelines*charheight), 239 | V_SNAPTOBOTTOM | V_SNAPTOLEFT);
|
V_DrawFillConsoleMap(chatx, y-1, boxw, (typelines*charheight), 239 | CHATSNAP);
|
||||||
|
|
||||||
while (talk[i])
|
while (talk[i])
|
||||||
{
|
{
|
||||||
@@ -1693,7 +1732,7 @@ static void HU_DrawChat(void)
|
|||||||
++i;
|
++i;
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
V_DrawChatCharacter(chatx + c + 2, y, talk[i] |V_SNAPTOBOTTOM|V_SNAPTOLEFT|cflag, !cv_allcaps.value, V_GetStringColormap(talk[i]|cflag));
|
V_DrawChatCharacter(chatx + c + 2, y, talk[i] |CHATSNAP|cflag, !cv_allcaps.value, V_GetStringColormap(talk[i]|cflag));
|
||||||
i++;
|
i++;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -1711,7 +1750,7 @@ static void HU_DrawChat(void)
|
|||||||
typelines = 1;
|
typelines = 1;
|
||||||
|
|
||||||
if ((w_chat.cursor == 0 || w_chat.length == 0) && hu_tick < 4)
|
if ((w_chat.cursor == 0 || w_chat.length == 0) && hu_tick < 4)
|
||||||
V_DrawChatCharacter(chatx+2+c, y+1, '_'|V_SNAPTOBOTTOM|V_SNAPTOLEFT|t, !cv_allcaps.value, NULL);
|
V_DrawChatCharacter(chatx+2+c, y+1, '_'|CHATSNAP|t, !cv_allcaps.value, NULL);
|
||||||
|
|
||||||
if (w_chat.select != w_chat.cursor)
|
if (w_chat.select != w_chat.cursor)
|
||||||
{
|
{
|
||||||
@@ -1728,17 +1767,23 @@ static void HU_DrawChat(void)
|
|||||||
|
|
||||||
if ((emote = M_VerifyEmote(w_chat_buf+i, &emotelen)))
|
if ((emote = M_VerifyEmote(w_chat_buf+i, &emotelen)))
|
||||||
{
|
{
|
||||||
M_DrawEmote(chatx + c + 2, y-1, emote, V_SNAPTOBOTTOM|V_SNAPTOLEFT|t);
|
M_DrawEmote(chatx + c + 2, y-1, emote, CHATSNAP|t);
|
||||||
c += EMOTEWIDTH - charwidth;
|
c += EMOTEWIDTH - charwidth;
|
||||||
i += emotelen-1;
|
i += emotelen-1;
|
||||||
drawwidth = EMOTEWIDTH;
|
drawwidth = EMOTEWIDTH;
|
||||||
|
if (cv_chat_showlimit.value)
|
||||||
|
charcount += emotelen;
|
||||||
}
|
}
|
||||||
else if (w_chat_buf[i] >= HU_FONTSTART) //Hurdler: isn't it better like that?
|
else if (w_chat_buf[i] >= HU_FONTSTART) //Hurdler: isn't it better like that?
|
||||||
V_DrawChatCharacter(chatx + c + 2, y, w_chat_buf[i] | V_SNAPTOBOTTOM|V_SNAPTOLEFT | t, !cv_allcaps.value, NULL);
|
{
|
||||||
|
V_DrawChatCharacter(chatx + c + 2, y, w_chat_buf[i] | CHATSNAP | t, !cv_allcaps.value, NULL);
|
||||||
|
if (cv_chat_showlimit.value)
|
||||||
|
charcount++;
|
||||||
|
}
|
||||||
|
|
||||||
// Draw selection
|
// Draw selection
|
||||||
if (i >= select_start && i < select_end)
|
if (i >= select_start && i < select_end)
|
||||||
V_DrawFill(chatx + c + 2 - (drawwidth-charwidth), y-1, drawwidth, charheight, 103|V_TRANSLUCENT|V_SNAPTOBOTTOM|V_SNAPTOLEFT|t);
|
V_DrawFill(chatx + c + 2 - (drawwidth-charwidth), y-1, drawwidth, charheight, 103|V_TRANSLUCENT|CHATSNAP|t);
|
||||||
|
|
||||||
++i;
|
++i;
|
||||||
|
|
||||||
@@ -1747,7 +1792,7 @@ static void HU_DrawChat(void)
|
|||||||
INT32 cursorx = (c+charwidth < boxw-charwidth) ? (chatx + 2 + c+charwidth) : (chatx+1); // we may have to go down.
|
INT32 cursorx = (c+charwidth < boxw-charwidth) ? (chatx + 2 + c+charwidth) : (chatx+1); // we may have to go down.
|
||||||
INT32 cursory = (cursorx != chatx+1) ? (y) : (y+charheight);
|
INT32 cursory = (cursorx != chatx+1) ? (y) : (y+charheight);
|
||||||
if (hu_tick < 4)
|
if (hu_tick < 4)
|
||||||
V_DrawChatCharacter(cursorx, cursory+1, '_' |V_SNAPTOBOTTOM|V_SNAPTOLEFT|t, !cv_allcaps.value, NULL);
|
V_DrawChatCharacter(cursorx, cursory+1, '_' |CHATSNAP|t, !cv_allcaps.value, NULL);
|
||||||
|
|
||||||
if (cursorx == chatx+1 && saylen == i-1) // a weirdo hack
|
if (cursorx == chatx+1 && saylen == i-1) // a weirdo hack
|
||||||
{
|
{
|
||||||
@@ -1765,6 +1810,13 @@ static void HU_DrawChat(void)
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if (cv_chat_showlimit.value)
|
||||||
|
{
|
||||||
|
// Limit
|
||||||
|
const INT32 clr = ((HU_MAXMSGLEN - charcount) > 64 ? V_TRANSLUCENT : (charcount == HU_MAXMSGLEN ? V_REDMAP : V_YELLOWMAP));
|
||||||
|
V_DrawSmallString(chatx, y+7, CHATSNAP|clr, va("%d/%d", charcount, HU_MAXMSGLEN));
|
||||||
|
}
|
||||||
|
|
||||||
// handle /pm list. It's messy, horrible and I don't care.
|
// handle /pm list. It's messy, horrible and I don't care.
|
||||||
if (strnicmp(w_chat_buf, "/pm", 3) == 0 && vid.width >= 400 && !teamtalk) // 320x200 unsupported kthxbai
|
if (strnicmp(w_chat_buf, "/pm", 3) == 0 && vid.width >= 400 && !teamtalk) // 320x200 unsupported kthxbai
|
||||||
{
|
{
|
||||||
@@ -1800,6 +1852,7 @@ static void HU_DrawChat(void)
|
|||||||
{
|
{
|
||||||
char nodenum[3];
|
char nodenum[3];
|
||||||
UINT32 n;
|
UINT32 n;
|
||||||
|
|
||||||
// right, that's half important: (w_chat_buf[4] may be a space since /pm0 msg is perfectly acceptable!)
|
// right, that's half important: (w_chat_buf[4] may be a space since /pm0 msg is perfectly acceptable!)
|
||||||
if (!isdigit(w_chat_buf[3]) || !(isdigit(w_chat_buf[4]) || (w_chat_buf[4] == ' ') || (w_chat_buf[4] == 0)))
|
if (!isdigit(w_chat_buf[3]) || !(isdigit(w_chat_buf[4]) || (w_chat_buf[4] == ' ') || (w_chat_buf[4] == 0)))
|
||||||
break;
|
break;
|
||||||
@@ -1837,17 +1890,17 @@ static void HU_DrawChat(void)
|
|||||||
}
|
}
|
||||||
|
|
||||||
// fill it like the chat so the text doesn't become hard to read because of the hud.
|
// fill it like the chat so the text doesn't become hard to read because of the hud.
|
||||||
V_DrawFillConsoleMap(chatx + boxw + 2, p_dispy - (6*count), (longest_name_length+4)*4, 6, 239 | V_SNAPTOBOTTOM | V_SNAPTOLEFT);
|
V_DrawFillConsoleMap(chatx + boxw + 2, p_dispy - (6*count), (longest_name_length+4)*4, 6, 239 | CHATSNAP);
|
||||||
|
|
||||||
V_DrawSmallString(chatx + boxw + 4, p_dispy - (6*count), V_SNAPTOBOTTOM|V_SNAPTOLEFT|V_ALLOWLOWERCASE, va("\x82%d\x80 - %s", i, player_names[i]));
|
V_DrawSmallString(chatx + boxw + 4, p_dispy - (6*count), CHATSNAP|V_ALLOWLOWERCASE, va("\x82%d\x80 - %s", i, player_names[i]));
|
||||||
count++;
|
count++;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (count == 0) // no results.
|
if (count == 0) // no results.
|
||||||
{
|
{
|
||||||
pm_offset = 48 + 2;
|
pm_offset = 48 + 2;
|
||||||
V_DrawFillConsoleMap(chatx + boxw + 2, p_dispy - (6*count), 48, 6, 239 | V_SNAPTOBOTTOM | V_SNAPTOLEFT); // fill it like the chat so the text doesn't become hard to read because of the hud.
|
V_DrawFillConsoleMap(chatx + boxw + 2, p_dispy - (6*count), 48, 6, 239 | CHATSNAP); // fill it like the chat so the text doesn't become hard to read because of the hud.
|
||||||
V_DrawSmallString(chatx + boxw + 4, p_dispy - (6*count), V_SNAPTOBOTTOM|V_SNAPTOLEFT|V_ALLOWLOWERCASE, "NO RESULT.");
|
V_DrawSmallString(chatx + boxw + 4, p_dispy - (6*count), CHATSNAP|V_ALLOWLOWERCASE, "NO RESULT.");
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
@@ -1899,15 +1952,15 @@ static void HU_DrawChat(void)
|
|||||||
|
|
||||||
while ((suggest = M_FindEmote(complete, complete_len, skip)) != NULL)
|
while ((suggest = M_FindEmote(complete, complete_len, skip)) != NULL)
|
||||||
{
|
{
|
||||||
V_DrawFillConsoleMap(chatx + boxw + pm_offset + 2, suggesty - (7*skip), emote_suggest_boxw, 6, V_SNAPTOBOTTOM|V_SNAPTOLEFT);
|
V_DrawFillConsoleMap(chatx + boxw + pm_offset + 2, suggesty - (7*skip), emote_suggest_boxw, 6, CHATSNAP);
|
||||||
|
|
||||||
// Highlight currently suggested emote
|
// Highlight currently suggested emote
|
||||||
int hlflag = 0;
|
int hlflag = 0;
|
||||||
if (skip == emote_autocomplete.skip && emote_autocomplete.complete[0])
|
if (skip == emote_autocomplete.skip && emote_autocomplete.complete[0])
|
||||||
hlflag = V_YELLOWMAP;
|
hlflag = V_YELLOWMAP;
|
||||||
|
|
||||||
V_DrawSmallString(chatx + boxw + pm_offset + 4 + EMOTEWIDTH, suggesty - (7*skip), hlflag|V_SNAPTOBOTTOM|V_SNAPTOLEFT|V_ALLOWLOWERCASE, va(":%s:", suggest->name));
|
V_DrawSmallString(chatx + boxw + pm_offset + 4 + EMOTEWIDTH, suggesty - (7*skip), hlflag|CHATSNAP|V_ALLOWLOWERCASE, va(":%s:", suggest->name));
|
||||||
M_DrawEmote(chatx + boxw + pm_offset + 2, suggesty - skip*7, suggest, V_SNAPTOBOTTOM|V_SNAPTOLEFT);
|
M_DrawEmote(chatx + boxw + pm_offset + 2, suggesty - skip*7, suggest, CHATSNAP);
|
||||||
|
|
||||||
++skip;
|
++skip;
|
||||||
}
|
}
|
||||||
@@ -1921,6 +1974,7 @@ static void HU_DrawChat(void)
|
|||||||
static void HU_DrawChat_Old(void)
|
static void HU_DrawChat_Old(void)
|
||||||
{
|
{
|
||||||
INT32 t = 0, c = 0, y = HU_INPUTY;
|
INT32 t = 0, c = 0, y = HU_INPUTY;
|
||||||
|
UINT32 charcount = 0;
|
||||||
size_t i = 0;
|
size_t i = 0;
|
||||||
const char *ntalk = "Say: ", *ttalk = "Say-Team: ";
|
const char *ntalk = "Say: ", *ttalk = "Say-Team: ";
|
||||||
const char *talk = ntalk;
|
const char *talk = ntalk;
|
||||||
@@ -1966,11 +2020,17 @@ static void HU_DrawChat_Old(void)
|
|||||||
{
|
{
|
||||||
M_DrawScaledEmote((HU_INPUTX + c)<<FRACBITS, (y+con_scalefactor*2)<<FRACBITS, charwidth*FRACUNIT/EMOTEWIDTH, emote, V_NOSCALESTART | V_NOSCALEPATCH | t);
|
M_DrawScaledEmote((HU_INPUTX + c)<<FRACBITS, (y+con_scalefactor*2)<<FRACBITS, charwidth*FRACUNIT/EMOTEWIDTH, emote, V_NOSCALESTART | V_NOSCALEPATCH | t);
|
||||||
i += emotelen-1;
|
i += emotelen-1;
|
||||||
|
|
||||||
|
if (cv_chat_showlimit.value)
|
||||||
|
charcount += emotelen;
|
||||||
}
|
}
|
||||||
else if (w_chat_buf[i] >= HU_FONTSTART) //Hurdler: isn't it better like that?
|
else if (w_chat_buf[i] >= HU_FONTSTART) //Hurdler: isn't it better like that?
|
||||||
{
|
{
|
||||||
//charwidth = hu_font[w_chat[i]-HU_FONTSTART]->width * con_scalefactor;
|
//charwidth = hu_font[w_chat[i]-HU_FONTSTART]->width * con_scalefactor;
|
||||||
V_DrawCharacter(HU_INPUTX + c, y, w_chat_buf[i] | cv_constextsize.value | V_NOSCALESTART | t, !cv_allcaps.value);
|
V_DrawCharacter(HU_INPUTX + c, y, w_chat_buf[i] | cv_constextsize.value | V_NOSCALESTART | t, !cv_allcaps.value);
|
||||||
|
|
||||||
|
if (cv_chat_showlimit.value)
|
||||||
|
charcount++;
|
||||||
}
|
}
|
||||||
|
|
||||||
// Draw selection
|
// Draw selection
|
||||||
@@ -1983,7 +2043,7 @@ static void HU_DrawChat_Old(void)
|
|||||||
{
|
{
|
||||||
INT32 cursorx = (HU_INPUTX+c+charwidth < vid.width) ? (HU_INPUTX + c + charwidth) : (HU_INPUTX); // we may have to go down.
|
INT32 cursorx = (HU_INPUTX+c+charwidth < vid.width) ? (HU_INPUTX + c + charwidth) : (HU_INPUTX); // we may have to go down.
|
||||||
INT32 cursory = (cursorx != HU_INPUTX) ? (y) : (y+charheight);
|
INT32 cursory = (cursorx != HU_INPUTX) ? (y) : (y+charheight);
|
||||||
V_DrawCharacter(cursorx, cursory+2*con_scalefactor, '_' |cv_constextsize.value | V_NOSCALESTART|t, !cv_allcaps.value);
|
V_DrawCharacter(cursorx, cursory+2*con_scalefactor, '_' | cv_constextsize.value | V_NOSCALESTART |t, !cv_allcaps.value);
|
||||||
}
|
}
|
||||||
|
|
||||||
c += charwidth;
|
c += charwidth;
|
||||||
@@ -1993,6 +2053,24 @@ static void HU_DrawChat_Old(void)
|
|||||||
y += charheight;
|
y += charheight;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// console chat users are FINALLY being fed!
|
||||||
|
if (cv_chat_showlimit.value)
|
||||||
|
{
|
||||||
|
const char *lim = va(" (%i/%i)", charcount, HU_MAXMSGLEN);
|
||||||
|
for (i = 0; lim[i]; i++)
|
||||||
|
{
|
||||||
|
V_DrawCharacter(HU_INPUTX + c, y, lim[i] | cv_constextsize.value | V_NOSCALESTART | t, !cv_allcaps.value);
|
||||||
|
|
||||||
|
c += charwidth;
|
||||||
|
if (c >= vid.width) // text wrapping
|
||||||
|
{
|
||||||
|
c = 0;
|
||||||
|
y += charheight;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
static void HU_DrawCEcho(void)
|
static void HU_DrawCEcho(void)
|
||||||
@@ -2181,12 +2259,13 @@ static void HU_DrawSongCreditsBox(void)
|
|||||||
y = -BOXCREDITHEIGHT*dup + (FixedMul(BOXCREDITHEIGHT*FRACUNIT, FixedDiv(t*FRACUNIT, TICRATE*FRACUNIT/2))*dup - interpoffset)/FRACUNIT;
|
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)
|
||||||
@@ -2213,7 +2292,22 @@ void HU_DrawSongCredits(void)
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
static void HU_ForceShowChat(void)
|
||||||
|
{
|
||||||
|
// only matters for non console chat
|
||||||
|
// see m_menu for how forceshowchat is set
|
||||||
|
if (!chat_on && forceshowchat)
|
||||||
|
{
|
||||||
|
// only print this if theres nothing in chat already
|
||||||
|
if (chat_nummsg_log == 0)
|
||||||
|
{
|
||||||
|
HU_AddChatText("Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.", false);
|
||||||
|
}
|
||||||
|
|
||||||
|
HU_DrawChat();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
// Heads up displays drawer, call each frame
|
// Heads up displays drawer, call each frame
|
||||||
//
|
//
|
||||||
void HU_Drawer(void)
|
void HU_Drawer(void)
|
||||||
@@ -2221,6 +2315,8 @@ void HU_Drawer(void)
|
|||||||
if (cv_vhseffect.value && ((paused && !camera[R_GetViewNumber()].freecam) || (demo.playback && cv_playbackspeed.value > 1)))
|
if (cv_vhseffect.value && ((paused && !camera[R_GetViewNumber()].freecam) || (demo.playback && cv_playbackspeed.value > 1)))
|
||||||
V_DrawVhsEffect(demo.rewinding);
|
V_DrawVhsEffect(demo.rewinding);
|
||||||
|
|
||||||
|
HU_ForceShowChat();
|
||||||
|
|
||||||
// draw chat string plus cursor
|
// draw chat string plus cursor
|
||||||
if (chat_on)
|
if (chat_on)
|
||||||
{
|
{
|
||||||
@@ -2300,8 +2396,7 @@ void HU_Drawer(void)
|
|||||||
// IN-LEVEL MULTIPLAYER RANKINGS
|
// IN-LEVEL MULTIPLAYER RANKINGS
|
||||||
//======================================================================
|
//======================================================================
|
||||||
|
|
||||||
static int
|
static int Ping_gfx_num(int lag)
|
||||||
Ping_gfx_num (int lag)
|
|
||||||
{
|
{
|
||||||
if (lag < 2)
|
if (lag < 2)
|
||||||
return 0;
|
return 0;
|
||||||
@@ -2315,8 +2410,7 @@ Ping_gfx_num (int lag)
|
|||||||
return 4;
|
return 4;
|
||||||
}
|
}
|
||||||
|
|
||||||
static int
|
static int Ping_gfx_color(UINT32 lag)
|
||||||
Ping_gfx_color (UINT32 lag)
|
|
||||||
{
|
{
|
||||||
if (lag < 2)
|
if (lag < 2)
|
||||||
return SKINCOLOR_JAWZ;
|
return SKINCOLOR_JAWZ;
|
||||||
@@ -2339,8 +2433,7 @@ Ping_gfx_color (UINT32 lag)
|
|||||||
return SKINCOLOR_WHITE; // to make the flashing work
|
return SKINCOLOR_WHITE; // to make the flashing work
|
||||||
}
|
}
|
||||||
|
|
||||||
static const UINT8 *
|
static const UINT8 *Ping_gfx_colormap(UINT32 lag, boolean gentleman)
|
||||||
Ping_gfx_colormap (UINT32 lag, boolean gentleman)
|
|
||||||
{
|
{
|
||||||
const UINT8 *colormap = NULL;
|
const UINT8 *colormap = NULL;
|
||||||
|
|
||||||
@@ -2360,8 +2453,7 @@ Ping_gfx_colormap (UINT32 lag, boolean gentleman)
|
|||||||
return colormap;
|
return colormap;
|
||||||
}
|
}
|
||||||
|
|
||||||
static UINT32
|
static UINT32 Ping_conversion(UINT32 lag)
|
||||||
Ping_conversion (UINT32 lag)
|
|
||||||
{
|
{
|
||||||
if (cv_pingmeasurement.value)
|
if (cv_pingmeasurement.value)
|
||||||
{
|
{
|
||||||
@@ -2478,6 +2570,26 @@ void HU_drawPlayerPing(INT32 x, INT32 y, INT32 pnum, INT32 flags)
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
void HU_drawLocalPlayerPing(INT32 x, INT32 y, INT32 flags)
|
||||||
|
{
|
||||||
|
UINT32 lag = localplayerping;
|
||||||
|
const boolean gentleman = (cv_mindelay.value && (lag < (tic_t)simulated_lag));
|
||||||
|
|
||||||
|
if (gentleman)
|
||||||
|
{
|
||||||
|
lag = simulated_lag;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (cv_pingstyle.value == 0) // kart
|
||||||
|
{
|
||||||
|
HU_drawKartPing(x, y, lag, flags, gentleman);
|
||||||
|
}
|
||||||
|
else if (cv_pingstyle.value == 1) // old style ping
|
||||||
|
{
|
||||||
|
HU_drawOldPing(x, y, lag, flags, gentleman);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
//
|
//
|
||||||
// HU_DrawSpectatorTicker
|
// HU_DrawSpectatorTicker
|
||||||
//
|
//
|
||||||
|
|||||||
@@ -88,6 +88,10 @@ extern patch_t *tallminus;
|
|||||||
// set true whenever the tab rankings are being shown for any reason
|
// set true whenever the tab rankings are being shown for any reason
|
||||||
extern boolean hu_showscores;
|
extern boolean hu_showscores;
|
||||||
|
|
||||||
|
extern consvar_t cv_chat_xoffset;
|
||||||
|
extern consvar_t cv_chat_yoffset;
|
||||||
|
extern consvar_t cv_chat_showlimit;
|
||||||
|
|
||||||
// init heads up data at game startup.
|
// init heads up data at game startup.
|
||||||
void HU_Init(void);
|
void HU_Init(void);
|
||||||
|
|
||||||
@@ -104,6 +108,7 @@ void HU_Drawer(void);
|
|||||||
char HU_dequeueChatChar(void);
|
char HU_dequeueChatChar(void);
|
||||||
void HU_clearChatChars(void);
|
void HU_clearChatChars(void);
|
||||||
void HU_drawPlayerPing(INT32 x, INT32 y, INT32 pnum, INT32 flags); // Lat': Ping drawer for scoreboard.
|
void HU_drawPlayerPing(INT32 x, INT32 y, INT32 pnum, INT32 flags); // Lat': Ping drawer for scoreboard.
|
||||||
|
void HU_drawLocalPlayerPing(INT32 x, INT32 y, INT32 flags);
|
||||||
void HU_DrawTabRankings(INT32 x, INT32 y, playersort_t *tab, INT32 scorelines, INT32 hilicol);
|
void HU_DrawTabRankings(INT32 x, INT32 y, playersort_t *tab, INT32 scorelines, INT32 hilicol);
|
||||||
void HU_DrawEmeralds(INT32 x, INT32 y, INT32 pemeralds);
|
void HU_DrawEmeralds(INT32 x, INT32 y, INT32 pemeralds);
|
||||||
const char *HU_SkinColorToConsoleColor(skincolors_t color);
|
const char *HU_SkinColorToConsoleColor(skincolors_t color);
|
||||||
|
|||||||
+1
-19
@@ -36,25 +36,7 @@ extern "C" {
|
|||||||
"JOYBUTTONS is greater than INT64 bits can hold"
|
"JOYBUTTONS is greater than INT64 bits can hold"
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
/** \brief The struct JoyType_s
|
#define DigitalGamepadStyle(i) (cv_joyscale[i].value == 0)
|
||||||
|
|
||||||
share some joystick information (maybe 2 for splitscreen), to the game input code,
|
|
||||||
actually, we need to know if it is a gamepad or analog controls
|
|
||||||
*/
|
|
||||||
|
|
||||||
struct JoyType_s
|
|
||||||
{
|
|
||||||
/*! this joystick is a gamepad, read: digital axes
|
|
||||||
if FALSE, interpret the joystick event data as JOYAXISRANGE (see above) */
|
|
||||||
INT32 bGamepadStyle;
|
|
||||||
|
|
||||||
};
|
|
||||||
typedef struct JoyType_s JoyType_t;
|
|
||||||
/** \brief Joystick info
|
|
||||||
for palyer[sic] 1-4's joystick/gamepad
|
|
||||||
*/
|
|
||||||
|
|
||||||
extern JoyType_t Joystick[MAXSPLITSCREENPLAYERS];
|
|
||||||
|
|
||||||
#ifdef __cplusplus
|
#ifdef __cplusplus
|
||||||
} // extern "C"
|
} // extern "C"
|
||||||
|
|||||||
@@ -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
|
||||||
@@ -203,6 +206,15 @@ void I_ShutdownSystem(void);
|
|||||||
/** \brief To check if a Interrupt or Terminate Signal was fired
|
/** \brief To check if a Interrupt or Terminate Signal was fired
|
||||||
*/
|
*/
|
||||||
boolean I_Interrupted(void);
|
boolean I_Interrupted(void);
|
||||||
|
static inline void I_HandleInterrupt(void)
|
||||||
|
{
|
||||||
|
if (I_Interrupted())
|
||||||
|
I_Quit();
|
||||||
|
}
|
||||||
|
|
||||||
|
/** \brief Open A URL
|
||||||
|
*/
|
||||||
|
int I_OpenURL(const char *url);
|
||||||
|
|
||||||
/** \brief The I_GetDiskFreeSpace function
|
/** \brief The I_GetDiskFreeSpace function
|
||||||
|
|
||||||
|
|||||||
@@ -1694,6 +1694,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));
|
||||||
|
|||||||
@@ -452,7 +452,11 @@ 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
|
||||||
#define NUMMOBJFREESLOTS 1024
|
#define NUMMOBJFREESLOTS 1024
|
||||||
|
#else
|
||||||
|
#define NUMMOBJFREESLOTS 4096 // should be sufficient
|
||||||
|
#endif
|
||||||
#define NUMSPRITEFREESLOTS NUMMOBJFREESLOTS
|
#define NUMSPRITEFREESLOTS NUMMOBJFREESLOTS
|
||||||
#define NUMSTATEFREESLOTS (NUMMOBJFREESLOTS*8)
|
#define NUMSTATEFREESLOTS (NUMMOBJFREESLOTS*8)
|
||||||
|
|
||||||
|
|||||||
+71
-56
@@ -98,6 +98,8 @@ consvar_t cv_showminimapfinished = {"showminimapfinished", "On", CV_SAVE, CV_OnO
|
|||||||
CV_PossibleValue_t minimapdot_cons_t[NUMMINIMAPDOTSTUFF];
|
CV_PossibleValue_t minimapdot_cons_t[NUMMINIMAPDOTSTUFF];
|
||||||
consvar_t cv_showminimapangle = {"showminimapangle", "Off", CV_SAVE, minimapdot_cons_t, NULL, 0, NULL, NULL, 0, 0, NULL};
|
consvar_t cv_showminimapangle = {"showminimapangle", "Off", CV_SAVE, minimapdot_cons_t, NULL, 0, NULL, NULL, 0, 0, NULL};
|
||||||
|
|
||||||
|
consvar_t cv_spinoutroll = {"spinoutroll", "Off", CV_SAVE, CV_OnOff, NULL, 0, NULL, NULL, 0, 0, NULL};
|
||||||
|
|
||||||
static CV_PossibleValue_t posanim_cons_t[] = {{0, "Off"}, {1, "On"}, {2, "Smooth"}, {0, NULL}};
|
static CV_PossibleValue_t posanim_cons_t[] = {{0, "Off"}, {1, "On"}, {2, "Smooth"}, {0, NULL}};
|
||||||
consvar_t cv_posanim = {"postitionanimation", "On", CV_SAVE, posanim_cons_t, NULL, 0, NULL, NULL, 0, 0, NULL};
|
consvar_t cv_posanim = {"postitionanimation", "On", CV_SAVE, posanim_cons_t, NULL, 0, NULL, NULL, 0, 0, NULL};
|
||||||
consvar_t cv_smallposnum = {"smallpositionnumber", "Off", CV_SAVE, CV_OnOff, NULL, 0, NULL, NULL, 0, 0, NULL};
|
consvar_t cv_smallposnum = {"smallpositionnumber", "Off", CV_SAVE, CV_OnOff, NULL, 0, NULL, NULL, 0, 0, NULL};
|
||||||
@@ -110,6 +112,11 @@ consvar_t cv_fancyroulette = {"animatedroulette", "Off", CV_SAVE, CV_OnOff, NULL
|
|||||||
consvar_t cv_darkitembox = {"darkitembox", "On", CV_SAVE, CV_OnOff, NULL, 0, NULL, NULL, 0, 0, NULL}; // itembox gets a dark border with specific items
|
consvar_t cv_darkitembox = {"darkitembox", "On", CV_SAVE, CV_OnOff, NULL, 0, NULL, NULL, 0, 0, NULL}; // itembox gets a dark border with specific items
|
||||||
consvar_t cv_multiitemicon = {"multiitemicon", "Off", CV_SAVE, CV_OnOff, NULL, 0, NULL, NULL, 0, 0, NULL};
|
consvar_t cv_multiitemicon = {"multiitemicon", "Off", CV_SAVE, CV_OnOff, NULL, 0, NULL, NULL, 0, 0, NULL};
|
||||||
|
|
||||||
|
enum { ROULETTECOLOR_NONE = -1, ROULETTECOLOR_HUD, ROULETTECOLOR_PLAYER, ROULETTECOLOR_ITEM };
|
||||||
|
static CV_PossibleValue_t roulettecolor_cons_t[] = {
|
||||||
|
{ROULETTECOLOR_NONE, "None"}, {ROULETTECOLOR_HUD, "Hud"}, {ROULETTECOLOR_PLAYER, "Player"}, {ROULETTECOLOR_ITEM, "Item"}, {0, NULL}};
|
||||||
|
consvar_t cv_roulettecolor = {"roulettecolor", "Hud", CV_SAVE, roulettecolor_cons_t, NULL, 0, NULL, NULL, 0, 0, NULL};
|
||||||
|
|
||||||
consvar_t cv_showlaptimes = {"showlaptimes", "Off", CV_SAVE, CV_OnOff, NULL, 0, NULL, NULL, 0, 0, NULL};
|
consvar_t cv_showlaptimes = {"showlaptimes", "Off", CV_SAVE, CV_OnOff, NULL, 0, NULL, NULL, 0, 0, NULL};
|
||||||
|
|
||||||
consvar_t cv_biglaps = {"biglaphud", "On", CV_SAVE, CV_OnOff, NULL, 0, NULL, NULL, 0, 0, NULL}; // here for ppl who dont want to make 2 more patches for their custom hud
|
consvar_t cv_biglaps = {"biglaphud", "On", CV_SAVE, CV_OnOff, NULL, 0, NULL, NULL, 0, 0, NULL}; // here for ppl who dont want to make 2 more patches for their custom hud
|
||||||
@@ -226,6 +233,7 @@ void K_RegisterKartHudStuff(void)
|
|||||||
CV_RegisterVar(&cv_showminimapnames);
|
CV_RegisterVar(&cv_showminimapnames);
|
||||||
CV_RegisterVar(&cv_showminimapfinished);
|
CV_RegisterVar(&cv_showminimapfinished);
|
||||||
CV_RegisterVar(&cv_showminimapangle);
|
CV_RegisterVar(&cv_showminimapangle);
|
||||||
|
CV_RegisterVar(&cv_spinoutroll);
|
||||||
|
|
||||||
CV_RegisterVar(&cv_showlapemblem);
|
CV_RegisterVar(&cv_showlapemblem);
|
||||||
|
|
||||||
@@ -243,6 +251,8 @@ void K_RegisterKartHudStuff(void)
|
|||||||
CV_RegisterVar(&cv_multiitemicon);
|
CV_RegisterVar(&cv_multiitemicon);
|
||||||
CV_RegisterVar(&cv_huditemamount);
|
CV_RegisterVar(&cv_huditemamount);
|
||||||
|
|
||||||
|
CV_RegisterVar(&cv_roulettecolor);
|
||||||
|
|
||||||
CV_RegisterVar(&cv_highresportrait);
|
CV_RegisterVar(&cv_highresportrait);
|
||||||
|
|
||||||
CV_RegisterVar(&cv_nametag);
|
CV_RegisterVar(&cv_nametag);
|
||||||
@@ -1136,7 +1146,7 @@ enum
|
|||||||
SPEEDO_PMETERSMOL,
|
SPEEDO_PMETERSMOL,
|
||||||
};
|
};
|
||||||
|
|
||||||
static SINT8 K_GetSpeedometerStyle(void)
|
static UINT8 K_GetSpeedometerStyle(void)
|
||||||
{
|
{
|
||||||
if (cv_newspeedometer.value == 2 && xtra_speedo)
|
if (cv_newspeedometer.value == 2 && xtra_speedo)
|
||||||
return SPEEDO_EXTRA;
|
return SPEEDO_EXTRA;
|
||||||
@@ -1507,74 +1517,77 @@ static void K_drawKartItem(void)
|
|||||||
|
|
||||||
if (stplyr->kartstuff[k_itemroulette])
|
if (stplyr->kartstuff[k_itemroulette])
|
||||||
{
|
{
|
||||||
localcolor = K_GetHudColor();
|
if (cv_roulettecolor.value == ROULETTECOLOR_PLAYER)
|
||||||
|
localcolor = stplyr->skincolor;
|
||||||
|
else if (cv_roulettecolor.value != ROULETTECOLOR_NONE)
|
||||||
|
localcolor = K_GetHudColor();
|
||||||
|
|
||||||
switch ((stplyr->kartstuff[k_itemroulette] % (14*3)) / 3)
|
switch ((stplyr->kartstuff[k_itemroulette] % (14*3)) / 3)
|
||||||
{
|
{
|
||||||
// Each case is handled in threes, to give three frames of in-game time to see the item on the roulette
|
// Each case is handled in threes, to give three frames of in-game time to see the item on the roulette
|
||||||
case 0: // Sneaker
|
case 0: // Sneaker
|
||||||
localpatch = kp_sneaker[offset];
|
localpatch = kp_sneaker[offset];
|
||||||
//localcolor = SKINCOLOR_RASPBERRY;
|
if (cv_roulettecolor.value == ROULETTECOLOR_ITEM) localcolor = SKINCOLOR_RASPBERRY;
|
||||||
break;
|
break;
|
||||||
case 1: // Banana
|
case 1: // Banana
|
||||||
localpatch = kp_banana[offset];
|
localpatch = kp_banana[offset];
|
||||||
//localcolor = SKINCOLOR_YELLOW;
|
if (cv_roulettecolor.value == ROULETTECOLOR_ITEM) localcolor = SKINCOLOR_YELLOW;
|
||||||
break;
|
break;
|
||||||
case 2: // Orbinaut
|
case 2: // Orbinaut
|
||||||
localpatch = kp_orbinaut[3+offset];
|
localpatch = kp_orbinaut[3+offset];
|
||||||
//localcolor = SKINCOLOR_STEEL;
|
if (cv_roulettecolor.value == ROULETTECOLOR_ITEM) localcolor = SKINCOLOR_STEEL;
|
||||||
break;
|
break;
|
||||||
case 3: // Mine
|
case 3: // Mine
|
||||||
localpatch = kp_mine[offset];
|
localpatch = kp_mine[offset];
|
||||||
//localcolor = SKINCOLOR_JET;
|
if (cv_roulettecolor.value == ROULETTECOLOR_ITEM) localcolor = SKINCOLOR_JET;
|
||||||
break;
|
break;
|
||||||
case 4: // Grow
|
case 4: // Grow
|
||||||
localpatch = kp_grow[offset];
|
localpatch = kp_grow[offset];
|
||||||
//localcolor = SKINCOLOR_TEAL;
|
if (cv_roulettecolor.value == ROULETTECOLOR_ITEM) localcolor = SKINCOLOR_TEAL;
|
||||||
break;
|
break;
|
||||||
case 5: // Hyudoro
|
case 5: // Hyudoro
|
||||||
localpatch = kp_hyudoro[offset];
|
localpatch = kp_hyudoro[offset];
|
||||||
//localcolor = SKINCOLOR_STEEL;
|
if (cv_roulettecolor.value == ROULETTECOLOR_ITEM) localcolor = SKINCOLOR_STEEL;
|
||||||
break;
|
break;
|
||||||
case 6: // Rocket Sneaker
|
case 6: // Rocket Sneaker
|
||||||
localpatch = kp_rocketsneaker[offset];
|
localpatch = kp_rocketsneaker[offset];
|
||||||
//localcolor = SKINCOLOR_TANGERINE;
|
if (cv_roulettecolor.value == ROULETTECOLOR_ITEM) localcolor = SKINCOLOR_TANGERINE;
|
||||||
break;
|
break;
|
||||||
case 7: // Jawz
|
case 7: // Jawz
|
||||||
localpatch = kp_jawz[offset];
|
localpatch = kp_jawz[offset];
|
||||||
//localcolor = SKINCOLOR_JAWZ;
|
if (cv_roulettecolor.value == ROULETTECOLOR_ITEM) localcolor = SKINCOLOR_JAWZ;
|
||||||
break;
|
break;
|
||||||
case 8: // Self-Propelled Bomb
|
case 8: // Self-Propelled Bomb
|
||||||
localpatch = kp_selfpropelledbomb[offset];
|
localpatch = kp_selfpropelledbomb[offset];
|
||||||
//localcolor = SKINCOLOR_JET;
|
if (cv_roulettecolor.value == ROULETTECOLOR_ITEM) localcolor = SKINCOLOR_JET;
|
||||||
break;
|
break;
|
||||||
case 9: // Shrink
|
case 9: // Shrink
|
||||||
localpatch = kp_shrink[offset];
|
localpatch = kp_shrink[offset];
|
||||||
//localcolor = SKINCOLOR_ORANGE;
|
if (cv_roulettecolor.value == ROULETTECOLOR_ITEM) localcolor = SKINCOLOR_ORANGE;
|
||||||
break;
|
break;
|
||||||
case 10: // Invincibility
|
case 10: // Invincibility
|
||||||
localpatch = localinv;
|
localpatch = localinv;
|
||||||
//localcolor = SKINCOLOR_GREY;
|
if (cv_roulettecolor.value == ROULETTECOLOR_ITEM) localcolor = SKINCOLOR_GREY;
|
||||||
break;
|
break;
|
||||||
case 11: // Eggman Monitor
|
case 11: // Eggman Monitor
|
||||||
localpatch = kp_eggman[offset];
|
localpatch = kp_eggman[offset];
|
||||||
//localcolor = SKINCOLOR_ROSE;
|
if (cv_roulettecolor.value == ROULETTECOLOR_ITEM) localcolor = SKINCOLOR_ROSE;
|
||||||
break;
|
break;
|
||||||
case 12: // Ballhog
|
case 12: // Ballhog
|
||||||
localpatch = kp_ballhog[offset];
|
localpatch = kp_ballhog[offset];
|
||||||
//localcolor = SKINCOLOR_LILAC;
|
if (cv_roulettecolor.value == ROULETTECOLOR_ITEM) localcolor = SKINCOLOR_LILAC;
|
||||||
break;
|
break;
|
||||||
case 13: // Thunder Shield
|
case 13: // Thunder Shield
|
||||||
localpatch = kp_thundershield[offset];
|
localpatch = kp_thundershield[offset];
|
||||||
//localcolor = SKINCOLOR_CYAN;
|
if (cv_roulettecolor.value == ROULETTECOLOR_ITEM) localcolor = SKINCOLOR_CYAN;
|
||||||
break;
|
break;
|
||||||
/*case 14: // Pogo Spring
|
/*case 14: // Pogo Spring
|
||||||
localpatch = kp_pogospring[offset];
|
localpatch = kp_pogospring[offset];
|
||||||
localcolor = SKINCOLOR_TANGERINE;
|
if (cv_roulettecolor.value == ROULETTECOLOR_ITEM) localcolor = SKINCOLOR_TANGERINE;
|
||||||
break;
|
break;
|
||||||
case 15: // Kitchen Sink
|
case 15: // Kitchen Sink
|
||||||
localpatch = kp_kitchensink[offset];
|
localpatch = kp_kitchensink[offset];
|
||||||
localcolor = SKINCOLOR_STEEL;
|
if (cv_roulettecolor.value == ROULETTECOLOR_ITEM) localcolor = SKINCOLOR_STEEL;
|
||||||
break;*/
|
break;*/
|
||||||
default:
|
default:
|
||||||
break;
|
break;
|
||||||
@@ -3928,10 +3941,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;
|
||||||
|
|
||||||
@@ -4019,12 +4045,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));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -4254,6 +4280,7 @@ static void K_drawInput(void)
|
|||||||
|
|
||||||
y -= FRACUNIT;
|
y -= FRACUNIT;
|
||||||
|
|
||||||
|
// stick displays
|
||||||
if (cv_showinput.value == 2 || cv_showinput.value == 3)
|
if (cv_showinput.value == 2 || cv_showinput.value == 3)
|
||||||
{
|
{
|
||||||
INT32 axis;
|
INT32 axis;
|
||||||
@@ -4263,7 +4290,7 @@ static void K_drawInput(void)
|
|||||||
const INT32 joyy = y>>FRACBITS;
|
const INT32 joyy = y>>FRACBITS;
|
||||||
static const INT32 joyxoffs = -8;
|
static const INT32 joyxoffs = -8;
|
||||||
static const INT32 joyyoffs = -24;
|
static const INT32 joyyoffs = -24;
|
||||||
const boolean usejoysprite = (cv_showinput.value == 3 && joystickicon);
|
const boolean usejoysprite = (cv_showinput.value == 3 && joystickicon);
|
||||||
|
|
||||||
// O backing
|
// O backing
|
||||||
if (usejoysprite)
|
if (usejoysprite)
|
||||||
@@ -4281,40 +4308,20 @@ static void K_drawInput(void)
|
|||||||
// kart does not have anything we can get analogue joystick y axis values from
|
// kart does not have anything we can get analogue joystick y axis values from
|
||||||
// during normal gameplay, so replicate shit here
|
// during normal gameplay, so replicate shit here
|
||||||
|
|
||||||
// this is horrid but we cant get actual input in replays so uhh
|
const boolean analogjoystickmove = (!demo.playback && P_IsLocalPlayer(stplyr) && cv_usejoystick[stplyrnum].value && !DigitalGamepadStyle(stplyrnum));
|
||||||
if (demo.playback || !P_IsLocalPlayer(stplyr)) // yeah...........
|
axis = analogjoystickmove ? JoyAxis(AXISAIM, stplyrnum+1) : 0;
|
||||||
|
|
||||||
|
if (axis != 0)
|
||||||
{
|
{
|
||||||
hudforward = stplyr->kartstuff[k_throwdir] * KART_FULLTURN;
|
hudforward -= ((axis * KART_FULLTURN) / JOYAXISRANGE);
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
const boolean analogjoystickmove = cv_usejoystick[stplyrnum].value && !Joystick[stplyrnum].bGamepadStyle;
|
hudforward = stplyr->kartstuff[k_throwdir] * KART_FULLTURN;
|
||||||
const boolean gamepadjoystickmove = cv_usejoystick[stplyrnum].value && Joystick[stplyrnum].bGamepadStyle;
|
|
||||||
const UINT8 ssplayer = stplyrnum+1;
|
|
||||||
|
|
||||||
axis = JoyAxis(AXISAIM, ssplayer);
|
|
||||||
|
|
||||||
if (analogjoystickmove && axis != 0)
|
|
||||||
{
|
|
||||||
// JOYAXISRANGE is supposed to be 1023 (divide by 1024)
|
|
||||||
hudforward -= ((axis * KART_FULLTURN) / (JOYAXISRANGE-1));
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
if (InputDown(gc_aimforward, ssplayer) || (gamepadjoystickmove && axis < 0))
|
|
||||||
{
|
|
||||||
hudforward += KART_FULLTURN;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (InputDown(gc_aimbackward, ssplayer) || (gamepadjoystickmove && axis > 0))
|
|
||||||
{
|
|
||||||
hudforward -= KART_FULLTURN;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
hudforward = CLAMP(hudforward, -KART_FULLTURN, KART_FULLTURN);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
hudforward = CLAMP(hudforward, -KART_FULLTURN, KART_FULLTURN);
|
||||||
|
|
||||||
if (cmd->driftturn || hudforward)
|
if (cmd->driftturn || hudforward)
|
||||||
{
|
{
|
||||||
INT16 turning = encoremode ? -cmd->driftturn : cmd->driftturn;
|
INT16 turning = encoremode ? -cmd->driftturn : cmd->driftturn;
|
||||||
@@ -4347,7 +4354,7 @@ static void K_drawInput(void)
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
else
|
else // wheel
|
||||||
{
|
{
|
||||||
if (!cmd->driftturn) // no turn
|
if (!cmd->driftturn) // no turn
|
||||||
target = 0;
|
target = 0;
|
||||||
@@ -4403,6 +4410,9 @@ static void K_drawChallengerScreen(void)
|
|||||||
|
|
||||||
static void K_drawLapStartAnim(void)
|
static void K_drawLapStartAnim(void)
|
||||||
{
|
{
|
||||||
|
if (!cv_showlapemblem.value)
|
||||||
|
return;
|
||||||
|
|
||||||
// This is an EVEN MORE insanely complicated animation.
|
// This is an EVEN MORE insanely complicated animation.
|
||||||
const UINT8 progress = 80-stplyr->kartstuff[k_lapanimation];
|
const UINT8 progress = 80-stplyr->kartstuff[k_lapanimation];
|
||||||
UINT8 *colormap = R_GetTranslationColormap(TC_DEFAULT, K_GetHudColor(), GTC_CACHE);
|
UINT8 *colormap = R_GetTranslationColormap(TC_DEFAULT, K_GetHudColor(), GTC_CACHE);
|
||||||
@@ -4446,9 +4456,10 @@ static void K_drawLapStartAnim(void)
|
|||||||
V_DrawFixedPatch(leftx, y, FRACUNIT, vflags, kp_lapanim_lap[min(progress/2, 6)], NULL);
|
V_DrawFixedPatch(leftx, y, FRACUNIT, vflags, kp_lapanim_lap[min(progress/2, 6)], NULL);
|
||||||
|
|
||||||
char *lapnum = va("%02d", stplyr->laps + 1);
|
char *lapnum = va("%02d", stplyr->laps + 1);
|
||||||
const size_t laplength = strlen(lapnum);
|
|
||||||
|
|
||||||
for (size_t i = 0; i < laplength; i++)
|
const int laplength = (int)strlen(lapnum);
|
||||||
|
|
||||||
|
for (int i = 0; i < laplength; i++)
|
||||||
{
|
{
|
||||||
int digit = lapnum[i] - '0';
|
int digit = lapnum[i] - '0';
|
||||||
int frame = min(2, progress/2 - 8 - (i*2));
|
int frame = min(2, progress/2 - 8 - (i*2));
|
||||||
@@ -4578,7 +4589,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
|
||||||
@@ -4830,7 +4845,7 @@ void K_drawKartHUD(void)
|
|||||||
{
|
{
|
||||||
if (stplyr->exiting)
|
if (stplyr->exiting)
|
||||||
K_drawKartFinish();
|
K_drawKartFinish();
|
||||||
else if (stplyr->kartstuff[k_lapanimation] && !splitscreen && cv_showlapemblem.value)
|
else if (stplyr->kartstuff[k_lapanimation] && !splitscreen)
|
||||||
K_drawLapStartAnim();
|
K_drawLapStartAnim();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -41,6 +41,7 @@ extern consvar_t cv_showlaptimes;
|
|||||||
extern consvar_t cv_battlespeedo;
|
extern consvar_t cv_battlespeedo;
|
||||||
extern consvar_t cv_multiitemicon;
|
extern consvar_t cv_multiitemicon;
|
||||||
extern consvar_t cv_huditemamount;
|
extern consvar_t cv_huditemamount;
|
||||||
|
extern consvar_t cv_roulettecolor;
|
||||||
|
|
||||||
// for use in timeattack menu
|
// for use in timeattack menu
|
||||||
extern patch_t *kp_facenum[MAXPLAYERS+1];
|
extern patch_t *kp_facenum[MAXPLAYERS+1];
|
||||||
|
|||||||
+874
-716
File diff suppressed because it is too large.
Load diff
@@ -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);
|
||||||
|
|||||||
+12
-26
@@ -3055,58 +3055,44 @@ 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)
|
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;
|
||||||
|
|
||||||
G_PlayerDeviceRumble(player, low_strength, high_strength, duration);
|
G_PlayerDeviceRumble(pnum, low_strength, high_strength, duration);
|
||||||
|
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|||||||
+48
-6
@@ -65,6 +65,8 @@ static stringhook_t stringHooks[STRING_HOOK(MAX)];
|
|||||||
|
|
||||||
bool hook_important = true;
|
bool hook_important = true;
|
||||||
|
|
||||||
|
#define NONMOHOOK ((mobjtype_t)-1)
|
||||||
|
|
||||||
// This will be indexed by hook id, the value of which fetches the registry.
|
// This will be indexed by hook id, the value of which fetches the registry.
|
||||||
static int * hookRefs;
|
static int * hookRefs;
|
||||||
static int nextid;
|
static int nextid;
|
||||||
@@ -296,7 +298,7 @@ struct Hook_State {
|
|||||||
INT32 status; /* return status to calling function */
|
INT32 status; /* return status to calling function */
|
||||||
void * userdata;
|
void * userdata;
|
||||||
int hook_type;
|
int hook_type;
|
||||||
mobjtype_t mobj_type; /* < NUMMOBJTYPES if mobj hook */
|
mobjtype_t mobj_type; /* != NONMOHOOK if mobj hook */
|
||||||
const char * string; /* used to fetch table, ran first if set */
|
const char * string; /* used to fetch table, ran first if set */
|
||||||
int top; /* index of last argument passed to hook */
|
int top; /* index of last argument passed to hook */
|
||||||
int id; /* id to fetch ref */
|
int id; /* id to fetch ref */
|
||||||
@@ -364,7 +366,7 @@ FUNCINLINE static ATTRINLINE boolean prepare_hook
|
|||||||
int hook_type
|
int hook_type
|
||||||
){
|
){
|
||||||
return init_hook_type(hook, default_status,
|
return init_hook_type(hook, default_status,
|
||||||
hook_type, NUMMOBJTYPES, NULL,
|
hook_type, NONMOHOOK, NULL,
|
||||||
hookIds[hook_type].numHooks);
|
hookIds[hook_type].numHooks);
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -391,7 +393,7 @@ FUNCINLINE static ATTRINLINE boolean prepare_string_hook
|
|||||||
const char * string
|
const char * string
|
||||||
){
|
){
|
||||||
if (init_hook_type(hook, default_status,
|
if (init_hook_type(hook, default_status,
|
||||||
hook_type, NUMMOBJTYPES, string,
|
hook_type, NONMOHOOK, string,
|
||||||
stringHooks[hook_type].ref))
|
stringHooks[hook_type].ref))
|
||||||
{
|
{
|
||||||
lua_pushstring(gL, string);
|
lua_pushstring(gL, string);
|
||||||
@@ -407,7 +409,7 @@ FUNCINLINE static ATTRINLINE boolean prepare_hud_hook
|
|||||||
int hook_type
|
int hook_type
|
||||||
){
|
){
|
||||||
return init_hook_type(hook, 0,
|
return init_hook_type(hook, 0,
|
||||||
hook_type, NUMMOBJTYPES, NULL,
|
hook_type, NONMOHOOK, NULL,
|
||||||
hudHookIds[hook_type].numHooks);
|
hudHookIds[hook_type].numHooks);
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -528,10 +530,48 @@ static int call_string_hooks(Hook_State *hook)
|
|||||||
return calls;
|
return calls;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
FUNCINLINE static ATTRINLINE int call_mobj_type_hooks(Hook_State *hook, mobjtype_t mobj_type)
|
||||||
|
{
|
||||||
|
static UINT8 seen = 0; // so we dont have to check all this shit constantly
|
||||||
|
int numCalls = call_mapped(hook, &mobjHookIds[mobj_type][hook->hook_type]);
|
||||||
|
|
||||||
|
if (!seen && numCalls > 0 && mobj_type == MT_NULL && (
|
||||||
|
hook->hook_type == MOBJ_HOOK(MobjThinker )
|
||||||
|
|| hook->hook_type == MOBJ_HOOK(MobjCollide )
|
||||||
|
|| hook->hook_type == MOBJ_HOOK(MobjMoveCollide)
|
||||||
|
|| hook->hook_type == MOBJ_HOOK(MobjFuse )
|
||||||
|
|| hook->hook_type == MOBJ_HOOK(MobjThinker )
|
||||||
|
|| 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)
|
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]);
|
return call_mapped(hook, &mobjHookIds[mobj_type][hook->hook_type]);
|
||||||
}
|
}
|
||||||
|
*/
|
||||||
|
|
||||||
static int call_hooks
|
static int call_hooks
|
||||||
(
|
(
|
||||||
@@ -547,11 +587,13 @@ static int call_hooks
|
|||||||
{
|
{
|
||||||
calls += call_string_hooks(hook);
|
calls += call_string_hooks(hook);
|
||||||
}
|
}
|
||||||
else if (hook->mobj_type < NUMMOBJTYPES)
|
//else if (hook->mobj_type > 0)
|
||||||
|
else if (hook->mobj_type != NONMOHOOK)
|
||||||
{
|
{
|
||||||
/* call generic mobj hooks first */
|
/* call generic mobj hooks first */
|
||||||
calls += call_mobj_type_hooks(hook, MT_NULL);
|
calls += call_mobj_type_hooks(hook, MT_NULL);
|
||||||
calls += call_mobj_type_hooks(hook, hook->mobj_type);
|
if (hook->mobj_type < NUMMOBJTYPES)
|
||||||
|
calls += call_mobj_type_hooks(hook, hook->mobj_type);
|
||||||
ps_lua_mobjhooks.value.i += calls;
|
ps_lua_mobjhooks.value.i += calls;
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
|
|||||||
+13
-8
@@ -644,20 +644,22 @@ static int libd_drawScaled(lua_State *L)
|
|||||||
// KART: draw patch on minimap from x, y coordinates on the map
|
// KART: draw patch on minimap from x, y coordinates on the map
|
||||||
static int libd_drawOnMinimap(lua_State *L)
|
static int libd_drawOnMinimap(lua_State *L)
|
||||||
{
|
{
|
||||||
fixed_t x, y, scale; // coordinates of the object
|
fixed_t x, y, scale; // coordinates of the object
|
||||||
patch_t *patch; // patch we want to draw
|
patch_t *patch; // patch we want to draw
|
||||||
UINT8 *colormap = NULL; // do we want to colormap this patch?
|
UINT8 *colormap = NULL; // do we want to colormap this patch?
|
||||||
boolean centered; // the patch is centered and doesn't need readjusting on x/y coordinates.
|
boolean centered; // the patch is centered and doesn't need readjusting on x/y coordinates.
|
||||||
huddrawlist_h list;
|
huddrawlist_h list;
|
||||||
patch_t *AutomapPic = NULL;
|
|
||||||
drawinfo_t info;
|
drawinfo_t info;
|
||||||
|
|
||||||
|
// variables used to replicate k_kart's mmap drawer:
|
||||||
|
patch_t *AutomapPic;
|
||||||
|
|
||||||
// variables used for actually drawing the icon:
|
// variables used for actually drawing the icon:
|
||||||
INT32 splitflags, minimaptrans;
|
INT32 splitflags, minimaptrans;
|
||||||
fixed_t amnumxpos, amnumypos;
|
fixed_t amnumxpos, amnumypos;
|
||||||
fixed_t amxpos, amypos;
|
fixed_t amxpos, amypos;
|
||||||
INT32 mm_x, mm_y;
|
INT32 mm_x, mm_y;
|
||||||
fixed_t patchw = 0, patchh = 0;
|
fixed_t patchw, patchh;
|
||||||
|
|
||||||
HUDONLY // only run this function in hud hooks
|
HUDONLY // only run this function in hud hooks
|
||||||
|
|
||||||
@@ -722,8 +724,11 @@ static int libd_drawOnMinimap(lua_State *L)
|
|||||||
|
|
||||||
mm_y -= AutomapPic->topoffset;
|
mm_y -= AutomapPic->topoffset;
|
||||||
|
|
||||||
// patch is supposedly already centered, don't butt in.
|
if (centered)
|
||||||
if (!centered)
|
{
|
||||||
|
patchw = patchh = 0; // patch is supposedly already centered, don't butt in.
|
||||||
|
}
|
||||||
|
else
|
||||||
{
|
{
|
||||||
// scale patch coords
|
// scale patch coords
|
||||||
patchw = (patch->width * scale / 2);
|
patchw = (patch->width * scale / 2);
|
||||||
|
|||||||
+1
-1
@@ -652,7 +652,7 @@ static int line_get(lua_State *L)
|
|||||||
LUA_PushUserdata(L, &sides[line->sidenum[0]], META_SIDE);
|
LUA_PushUserdata(L, &sides[line->sidenum[0]], META_SIDE);
|
||||||
return 1;
|
return 1;
|
||||||
case line_backside: // backside
|
case line_backside: // backside
|
||||||
if (line->sidenum[1] == 0xffff)
|
if (line->sidenum[1] == NO_INDEX)
|
||||||
return 0;
|
return 0;
|
||||||
LUA_PushUserdata(L, &sides[line->sidenum[1]], META_SIDE);
|
LUA_PushUserdata(L, &sides[line->sidenum[1]], META_SIDE);
|
||||||
return 1;
|
return 1;
|
||||||
|
|||||||
+8
-1
@@ -713,9 +713,12 @@ static UINT8 GetUserdataArchType(int index)
|
|||||||
|
|
||||||
static UINT8 ArchiveValue(UINT8 **p, int TABLESINDEX, int myindex)
|
static UINT8 ArchiveValue(UINT8 **p, int TABLESINDEX, int myindex)
|
||||||
{
|
{
|
||||||
|
int type = lua_type(gL, myindex);
|
||||||
|
|
||||||
if (myindex < 0)
|
if (myindex < 0)
|
||||||
myindex = lua_gettop(gL)+1+myindex;
|
myindex = lua_gettop(gL)+1+myindex;
|
||||||
switch (lua_type(gL, myindex))
|
|
||||||
|
switch (type)
|
||||||
{
|
{
|
||||||
case LUA_TNONE:
|
case LUA_TNONE:
|
||||||
case LUA_TNIL:
|
case LUA_TNIL:
|
||||||
@@ -725,8 +728,12 @@ static UINT8 ArchiveValue(UINT8 **p, int TABLESINDEX, int myindex)
|
|||||||
case LUA_TLIGHTUSERDATA:
|
case LUA_TLIGHTUSERDATA:
|
||||||
case LUA_TTHREAD:
|
case LUA_TTHREAD:
|
||||||
case LUA_TFUNCTION:
|
case LUA_TFUNCTION:
|
||||||
|
{
|
||||||
|
const char *typestr = (type == LUA_TLIGHTUSERDATA ? "light userdata" : (type == LUA_TTHREAD ? "thread" : (type == LUA_TFUNCTION ? "function" : "??")));
|
||||||
|
CONS_Alert(CONS_ERROR, M_GetText("Archived an invalid value! (%s)\n"), typestr);
|
||||||
WRITEUINT8(*p, ARCH_NULL);
|
WRITEUINT8(*p, ARCH_NULL);
|
||||||
return 2;
|
return 2;
|
||||||
|
}
|
||||||
case LUA_TBOOLEAN:
|
case LUA_TBOOLEAN:
|
||||||
WRITEUINT8(*p, ARCH_BOOLEAN);
|
WRITEUINT8(*p, ARCH_BOOLEAN);
|
||||||
WRITEUINT8(*p, lua_toboolean(gL, myindex));
|
WRITEUINT8(*p, lua_toboolean(gL, myindex));
|
||||||
|
|||||||
+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.
|
||||||
|
|||||||
+133
-58
@@ -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"
|
||||||
@@ -151,8 +152,6 @@ const char *quitmsg[NUM_QUITMESSAGES] = {};
|
|||||||
|
|
||||||
INT32 mapwads[NUMMAPS] = {};
|
INT32 mapwads[NUMMAPS] = {};
|
||||||
|
|
||||||
boolean browselocalskins = false;
|
|
||||||
|
|
||||||
boolean menuactive = false;
|
boolean menuactive = false;
|
||||||
boolean fromlevelselect = false;
|
boolean fromlevelselect = false;
|
||||||
|
|
||||||
@@ -214,12 +213,19 @@ static INT32 setupm_fakeskin;
|
|||||||
static INT32 setupm_fakecolor;
|
static INT32 setupm_fakecolor;
|
||||||
static UINT8 setupm_pselect = 1;
|
static UINT8 setupm_pselect = 1;
|
||||||
|
|
||||||
//variables used for other skin select menus
|
// variables used for other skin select menus
|
||||||
static UINT8 setupm_skinypos;
|
static UINT8 setupm_skinypos;
|
||||||
static INT32 setupm_skinselect;
|
static INT32 setupm_skinselect;
|
||||||
static boolean setupm_skinlockedselect;
|
static boolean setupm_skinlockedselect;
|
||||||
|
|
||||||
static UINT8 setupm_playernum; //brap
|
static UINT8 setupm_playernum; // brap
|
||||||
|
|
||||||
|
// Addons Menu: Local mode
|
||||||
|
static void M_LocalAddons(INT32 choice);
|
||||||
|
static boolean addons_localmode = false;
|
||||||
|
|
||||||
|
#define LOCALMODE_KEY (KEY_RALT)
|
||||||
|
#define AUTOLOAD_KEY (KEY_END)
|
||||||
|
|
||||||
//
|
//
|
||||||
// PROTOTYPES
|
// PROTOTYPES
|
||||||
@@ -271,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);
|
||||||
@@ -325,7 +333,6 @@ static void M_EraseData(INT32 choice);
|
|||||||
|
|
||||||
static void M_AddonsInternal();
|
static void M_AddonsInternal();
|
||||||
static void M_Addons(INT32 choice);
|
static void M_Addons(INT32 choice);
|
||||||
static void M_LocalSkins(INT32 choice);
|
|
||||||
static void M_AddonsOptions(INT32 choice);
|
static void M_AddonsOptions(INT32 choice);
|
||||||
#define addonmenusize 9 // number of items actually displayed in the addons menu view, formerly (2*numaddonsshown + 1)
|
#define addonmenusize 9 // number of items actually displayed in the addons menu view, formerly (2*numaddonsshown + 1)
|
||||||
#define numaddonsshown 4 // number of items to each side of the currently selected item, unless at top/bottom ends of directory
|
#define numaddonsshown 4 // number of items to each side of the currently selected item, unless at top/bottom ends of directory
|
||||||
@@ -409,6 +416,7 @@ static INT32 M_GetFirstLevelInList(void);
|
|||||||
|
|
||||||
// crap to force hud to show when in saturns hud options
|
// crap to force hud to show when in saturns hud options
|
||||||
boolean forceshowhud = false;
|
boolean forceshowhud = false;
|
||||||
|
boolean forceshowchat = false;
|
||||||
|
|
||||||
// smol text indicating if game is modified
|
// smol text indicating if game is modified
|
||||||
// so ppl dont wonder where their ra times went and stuff
|
// so ppl dont wonder where their ra times went and stuff
|
||||||
@@ -447,13 +455,13 @@ consvar_t cv_showallmaps = {"showallmaps", "No", CV_SAVE, CV_YesNo, NULL, 0, NUL
|
|||||||
consvar_t cv_showmusicfilename = {"showmusicfilename", "No", CV_SAVE, CV_YesNo, NULL, 0, NULL, NULL, 0, 0, NULL};
|
consvar_t cv_showmusicfilename = {"showmusicfilename", "No", CV_SAVE, CV_YesNo, NULL, 0, NULL, NULL, 0, 0, NULL};
|
||||||
|
|
||||||
static CV_PossibleValue_t serversort_cons_t[] = {
|
static CV_PossibleValue_t serversort_cons_t[] = {
|
||||||
{0,"Ping"},
|
{0, "Ping"},
|
||||||
{1,"Modified State"},
|
{1, "Modified State"},
|
||||||
{2,"Most Players"},
|
{2, "Most Players"},
|
||||||
{3,"Least Players"},
|
{3, "Least Players"},
|
||||||
{4,"Max Player Slots"},
|
{4, "Max Player Slots"},
|
||||||
{5,"Gametype"},
|
{5, "Gametype"},
|
||||||
{0,NULL}
|
{0, NULL}
|
||||||
};
|
};
|
||||||
consvar_t cv_serversort = {"serversort", "Ping", CV_CALL, serversort_cons_t, M_SortServerList, 0, NULL, NULL, 0, 0, NULL};
|
consvar_t cv_serversort = {"serversort", "Ping", CV_CALL, serversort_cons_t, M_SortServerList, 0, NULL, NULL, 0, 0, NULL};
|
||||||
|
|
||||||
@@ -702,7 +710,7 @@ static void Dummystaff_OnChange(void)
|
|||||||
|
|
||||||
dummystaffname[0] = '\0';
|
dummystaffname[0] = '\0';
|
||||||
|
|
||||||
if ((l = W_CheckNumForName(va("%sS01",G_BuildMapName(cv_nextmap.value)))) == LUMPERROR)
|
if ((l = W_CheckNumForName(va("%sS01", G_BuildMapName(cv_nextmap.value)))) == LUMPERROR)
|
||||||
{
|
{
|
||||||
CV_StealthSetValue(&cv_dummystaff, 0);
|
CV_StealthSetValue(&cv_dummystaff, 0);
|
||||||
return;
|
return;
|
||||||
@@ -711,7 +719,7 @@ static void Dummystaff_OnChange(void)
|
|||||||
{
|
{
|
||||||
char *temp = dummystaffname;
|
char *temp = dummystaffname;
|
||||||
UINT8 numstaff = 1;
|
UINT8 numstaff = 1;
|
||||||
while (numstaff < 99 && (l = W_CheckNumForName(va("%sS%02u",G_BuildMapName(cv_nextmap.value),numstaff+1))) != LUMPERROR)
|
while (numstaff < 99 && (l = W_CheckNumForName(va("%sS%02u", G_BuildMapName(cv_nextmap.value), numstaff+1))) != LUMPERROR)
|
||||||
numstaff++;
|
numstaff++;
|
||||||
|
|
||||||
if (cv_dummystaff.value < 1)
|
if (cv_dummystaff.value < 1)
|
||||||
@@ -719,7 +727,7 @@ static void Dummystaff_OnChange(void)
|
|||||||
else if (cv_dummystaff.value > numstaff)
|
else if (cv_dummystaff.value > numstaff)
|
||||||
CV_StealthSetValue(&cv_dummystaff, 1);
|
CV_StealthSetValue(&cv_dummystaff, 1);
|
||||||
|
|
||||||
if ((l = W_CheckNumForName(va("%sS%02u",G_BuildMapName(cv_nextmap.value), cv_dummystaff.value))) == LUMPERROR)
|
if ((l = W_CheckNumForName(va("%sS%02u", G_BuildMapName(cv_nextmap.value), cv_dummystaff.value))) == LUMPERROR)
|
||||||
return; // shouldn't happen but might as well check...
|
return; // shouldn't happen but might as well check...
|
||||||
|
|
||||||
G_UpdateStaffGhostName(l);
|
G_UpdateStaffGhostName(l);
|
||||||
@@ -804,7 +812,8 @@ static void M_ChangeCvar(INT32 choice)
|
|||||||
CV_SetValue(cv,skins[skinno].prefcolor);
|
CV_SetValue(cv,skins[skinno].prefcolor);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
CV_Set(cv,cv->defaultvalue);
|
|
||||||
|
CV_Set(cv, cv->defaultvalue);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -953,6 +962,7 @@ static void Command_Manual_f(void)
|
|||||||
{
|
{
|
||||||
if (modeattacking)
|
if (modeattacking)
|
||||||
return;
|
return;
|
||||||
|
|
||||||
M_StartControlPanel();
|
M_StartControlPanel();
|
||||||
M_Manual(INT32_MAX);
|
M_Manual(INT32_MAX);
|
||||||
itemOn = 0;
|
itemOn = 0;
|
||||||
@@ -1014,6 +1024,24 @@ boolean M_Responder(event_t *ev)
|
|||||||
case KEY_HAT1 + 3:
|
case KEY_HAT1 + 3:
|
||||||
ch = KEY_RIGHTARROW;
|
ch = KEY_RIGHTARROW;
|
||||||
break;
|
break;
|
||||||
|
//Local Addon Mode
|
||||||
|
case LOCALMODE_KEY:
|
||||||
|
{
|
||||||
|
if (!(server || IsPlayerAdmin(consoleplayer)))
|
||||||
|
break;
|
||||||
|
|
||||||
|
if (!addons_localmode)
|
||||||
|
{
|
||||||
|
S_StartSound(NULL, sfx_ding);
|
||||||
|
addons_localmode = true;
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
S_StartSound(NULL, sfx_jshard);
|
||||||
|
addons_localmode = false;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
break;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
else if (menuactive)
|
else if (menuactive)
|
||||||
@@ -1025,11 +1053,12 @@ boolean M_Responder(event_t *ev)
|
|||||||
const INT32 jxdeadzone = ((JOYAXISRANGE-1) * max(cv_xdeadzone[0].value, FRACUNIT/2)) >> FRACBITS;
|
const INT32 jxdeadzone = ((JOYAXISRANGE-1) * max(cv_xdeadzone[0].value, FRACUNIT/2)) >> FRACBITS;
|
||||||
const INT32 jydeadzone = ((JOYAXISRANGE-1) * max(cv_ydeadzone[0].value, FRACUNIT/2)) >> FRACBITS;
|
const INT32 jydeadzone = ((JOYAXISRANGE-1) * max(cv_ydeadzone[0].value, FRACUNIT/2)) >> FRACBITS;
|
||||||
INT32 accelaxis = abs(cv_moveaxis[0].value);
|
INT32 accelaxis = abs(cv_moveaxis[0].value);
|
||||||
|
|
||||||
if (ev->data1 == 0)
|
if (ev->data1 == 0)
|
||||||
{
|
{
|
||||||
if (ev->data3 != INT32_MAX)
|
if (ev->data3 != INT32_MAX)
|
||||||
{
|
{
|
||||||
if (Joystick[0].bGamepadStyle || abs(ev->data3) > jydeadzone)
|
if (DigitalGamepadStyle(0) || abs(ev->data3) > jydeadzone)
|
||||||
{
|
{
|
||||||
if (joywaity < thistime
|
if (joywaity < thistime
|
||||||
&& (pjoyy == 0 || (ev->data3 < 0) != (pjoyy < 0))) // no previous direction OR change direction
|
&& (pjoyy == 0 || (ev->data3 < 0) != (pjoyy < 0))) // no previous direction OR change direction
|
||||||
@@ -1045,7 +1074,7 @@ boolean M_Responder(event_t *ev)
|
|||||||
|
|
||||||
if (ev->data2 != INT32_MAX && joywaitx < thistime)
|
if (ev->data2 != INT32_MAX && joywaitx < thistime)
|
||||||
{
|
{
|
||||||
if (Joystick[0].bGamepadStyle || abs(ev->data2) > jxdeadzone)
|
if (DigitalGamepadStyle(0) || abs(ev->data2) > jxdeadzone)
|
||||||
{
|
{
|
||||||
if (joywaitx < thistime
|
if (joywaitx < thistime
|
||||||
&& (pjoyx == 0 || (ev->data2 < 0) != (pjoyx < 0))) // no previous direction OR change direction
|
&& (pjoyx == 0 || (ev->data2 < 0) != (pjoyx < 0))) // no previous direction OR change direction
|
||||||
@@ -1064,19 +1093,22 @@ boolean M_Responder(event_t *ev)
|
|||||||
// The following borrows heavily from Joy1Axis.
|
// The following borrows heavily from Joy1Axis.
|
||||||
const boolean xmode = (accelaxis%2);
|
const boolean xmode = (accelaxis%2);
|
||||||
INT32 retaxis = 0;
|
INT32 retaxis = 0;
|
||||||
|
|
||||||
if (!xmode)
|
if (!xmode)
|
||||||
accelaxis--;
|
accelaxis--;
|
||||||
accelaxis /= 2;
|
accelaxis /= 2;
|
||||||
|
|
||||||
if (ev->data1 == accelaxis)
|
if (ev->data1 == accelaxis)
|
||||||
{
|
{
|
||||||
const INT32 jacceldeadzone = xmode ? jxdeadzone : jydeadzone;
|
const INT32 jacceldeadzone = xmode ? jxdeadzone : jydeadzone;
|
||||||
retaxis = xmode ? ev->data2 : ev->data3;
|
retaxis = xmode ? ev->data2 : ev->data3;
|
||||||
|
|
||||||
if (retaxis != INT32_MAX)
|
if (retaxis != INT32_MAX)
|
||||||
{
|
{
|
||||||
if (cv_moveaxis[0].value < 0)
|
if (cv_moveaxis[0].value < 0)
|
||||||
retaxis = -retaxis;
|
retaxis = -retaxis;
|
||||||
|
|
||||||
if (Joystick[0].bGamepadStyle || retaxis > jacceldeadzone)
|
if (DigitalGamepadStyle(0) || retaxis > jacceldeadzone)
|
||||||
{
|
{
|
||||||
if (joywaitaccel < thistime && retaxis > pjoyaccel) // only on upwards event
|
if (joywaitaccel < thistime && retaxis > pjoyaccel) // only on upwards event
|
||||||
{
|
{
|
||||||
@@ -1575,11 +1607,16 @@ static boolean ShouldDrawMenuBG(void)
|
|||||||
if (forceshowhud)
|
if (forceshowhud)
|
||||||
return false;
|
return false;
|
||||||
|
|
||||||
|
if (forceshowchat)
|
||||||
|
return false;
|
||||||
|
|
||||||
// camera options stuff, only do when in level
|
// camera options stuff, only do when in level
|
||||||
if (gamestate == GS_LEVEL &&
|
if (gamestate == GS_LEVEL &&
|
||||||
(currentMenu == &OP_CamOptionsDef || currentMenu == &OP_Player1CamOptionsDef
|
(currentMenu == &OP_CamOptionsDef ||
|
||||||
|| currentMenu == &OP_Player2CamOptionsDef || currentMenu == &OP_Player3CamOptionsDef
|
currentMenu == &OP_Player1CamOptionsDef ||
|
||||||
|| currentMenu == &OP_Player4CamOptionsDef))
|
currentMenu == &OP_Player2CamOptionsDef ||
|
||||||
|
currentMenu == &OP_Player3CamOptionsDef ||
|
||||||
|
currentMenu == &OP_Player4CamOptionsDef))
|
||||||
return false;
|
return false;
|
||||||
|
|
||||||
return true;
|
return true;
|
||||||
@@ -1595,7 +1632,9 @@ void M_Drawer(void)
|
|||||||
if (currentMenu == &MessageDef)
|
if (currentMenu == &MessageDef)
|
||||||
menuactive = true;
|
menuactive = true;
|
||||||
|
|
||||||
|
// pain and suffering
|
||||||
forceshowhud = (gamestate == GS_LEVEL && menuactive && (currentMenu == &OP_SaturnHudDef || currentMenu == &OP_HudOffsetDef || currentMenu == &OP_NametagDef || currentMenu == &OP_DriftGaugeDef)); // holy fuick
|
forceshowhud = (gamestate == GS_LEVEL && menuactive && (currentMenu == &OP_SaturnHudDef || currentMenu == &OP_HudOffsetDef || currentMenu == &OP_NametagDef || currentMenu == &OP_DriftGaugeDef)); // holy fuick
|
||||||
|
forceshowchat = (gamestate == GS_LEVEL && menuactive && currentMenu == &OP_ChatOptionsDef && (!OLDCHAT) && (itemOn == op_chat_boxwidth || itemOn == op_chat_boxheight || itemOn == op_chat_xoffs || itemOn == op_chat_yoffs || itemOn == op_chat_charlmt)); // man i dont gaf anymore lmao
|
||||||
|
|
||||||
if (menuactive)
|
if (menuactive)
|
||||||
{
|
{
|
||||||
@@ -1714,19 +1753,16 @@ void M_StartControlPanel(void)
|
|||||||
MPauseMenu[mpause_switchteam].status = IT_DISABLED;
|
MPauseMenu[mpause_switchteam].status = IT_DISABLED;
|
||||||
MPauseMenu[mpause_switchspectate].status = IT_DISABLED;
|
MPauseMenu[mpause_switchspectate].status = IT_DISABLED;
|
||||||
MPauseMenu[mpause_psetup].status = IT_DISABLED;
|
MPauseMenu[mpause_psetup].status = IT_DISABLED;
|
||||||
|
MPauseMenu[mpause_localaddons].status = IT_STRING | IT_CALL;
|
||||||
|
|
||||||
MISC_ChangeTeamMenu[0].status = IT_DISABLED;
|
MISC_ChangeTeamMenu[0].status = IT_DISABLED;
|
||||||
MISC_ChangeSpectateMenu[0].status = IT_DISABLED;
|
MISC_ChangeSpectateMenu[0].status = IT_DISABLED;
|
||||||
|
|
||||||
MPauseMenu[mpause_addlocalskins].status = IT_STRING | IT_CALL;
|
|
||||||
MPauseMenu[mpause_localskin].status = IT_STRING | IT_CALL;
|
MPauseMenu[mpause_localskin].status = IT_STRING | IT_CALL;
|
||||||
|
|
||||||
// Reset these in case splitscreen messes things up
|
// Reset these in case splitscreen messes things up
|
||||||
MPauseMenu[mpause_addons].alphaKey = 8;
|
MPauseMenu[mpause_addons].alphaKey = 8;
|
||||||
|
MPauseMenu[mpause_localaddons].alphaKey = 24;
|
||||||
if (IsPlayerAdmin(consoleplayer))
|
|
||||||
MPauseMenu[mpause_addlocalskins].alphaKey = 16;
|
|
||||||
else
|
|
||||||
MPauseMenu[mpause_addlocalskins].alphaKey = 24;
|
|
||||||
|
|
||||||
MPauseMenu[mpause_scramble].alphaKey = 8;
|
MPauseMenu[mpause_scramble].alphaKey = 8;
|
||||||
MPauseMenu[mpause_switchmap].alphaKey = 24;
|
MPauseMenu[mpause_switchmap].alphaKey = 24;
|
||||||
@@ -1744,14 +1780,13 @@ void M_StartControlPanel(void)
|
|||||||
{
|
{
|
||||||
MPauseMenu[mpause_switchmap].status = IT_STRING | IT_CALL;
|
MPauseMenu[mpause_switchmap].status = IT_STRING | IT_CALL;
|
||||||
MPauseMenu[mpause_addons].status = IT_STRING | IT_CALL;
|
MPauseMenu[mpause_addons].status = IT_STRING | IT_CALL;
|
||||||
|
MPauseMenu[mpause_localaddons].status = IT_DISABLED;
|
||||||
if (G_GametypeHasTeams())
|
if (G_GametypeHasTeams())
|
||||||
MPauseMenu[mpause_scramble].status = IT_STRING | IT_SUBMENU;
|
MPauseMenu[mpause_scramble].status = IT_STRING | IT_SUBMENU;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (server || (!cv_showlocalskinmenus.value))
|
if (server || (!cv_showlocalskinmenus.value))
|
||||||
{
|
{
|
||||||
MPauseMenu[mpause_addlocalskins].status = IT_DISABLED;
|
|
||||||
MPauseMenu[mpause_localskin].status = IT_DISABLED;
|
MPauseMenu[mpause_localskin].status = IT_DISABLED;
|
||||||
|
|
||||||
MPauseMenu[mpause_options].alphaKey = 64;
|
MPauseMenu[mpause_options].alphaKey = 64;
|
||||||
@@ -1759,7 +1794,6 @@ void M_StartControlPanel(void)
|
|||||||
MPauseMenu[mpause_quit].alphaKey = 88;
|
MPauseMenu[mpause_quit].alphaKey = 88;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
if (splitscreen)
|
if (splitscreen)
|
||||||
{
|
{
|
||||||
MPauseMenu[mpause_psetupsplit].status = MPauseMenu[mpause_psetupsplit2].status = IT_STRING | IT_CALL;
|
MPauseMenu[mpause_psetupsplit].status = MPauseMenu[mpause_psetupsplit2].status = IT_STRING | IT_CALL;
|
||||||
@@ -3304,14 +3338,14 @@ static void M_AddonsInternal(void)
|
|||||||
static void M_Addons(INT32 choice)
|
static void M_Addons(INT32 choice)
|
||||||
{
|
{
|
||||||
(void)choice;
|
(void)choice;
|
||||||
browselocalskins = false;
|
addons_localmode = false;
|
||||||
M_AddonsInternal();
|
M_AddonsInternal();
|
||||||
}
|
}
|
||||||
|
|
||||||
static void M_LocalSkins(INT32 choice)
|
static void M_LocalAddons(INT32 choice)
|
||||||
{
|
{
|
||||||
(void)choice;
|
(void)choice;
|
||||||
browselocalskins = true;
|
addons_localmode = true;
|
||||||
M_AddonsInternal();
|
M_AddonsInternal();
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -3480,8 +3514,8 @@ static void M_DrawAddons(void)
|
|||||||
|
|
||||||
if (Playing())
|
if (Playing())
|
||||||
{
|
{
|
||||||
if (browselocalskins)
|
if (addons_localmode) // Draw notice that you're adding locally
|
||||||
V_DrawCenteredString(BASEVIDWIDTH/2, 5, V_ALLOWLOWERCASE, "Load \x83local skins\x80 from addons!");
|
V_DrawCenteredString(BASEVIDWIDTH/2, 5, V_ALLOWLOWERCASE, "Load addons or \x83local skins\x80 locally!");
|
||||||
else
|
else
|
||||||
V_DrawCenteredString(BASEVIDWIDTH/2, 5, warningflags, "Adding files mid-game may cause problems.");
|
V_DrawCenteredString(BASEVIDWIDTH/2, 5, warningflags, "Adding files mid-game may cause problems.");
|
||||||
}
|
}
|
||||||
@@ -3644,7 +3678,10 @@ static void M_DrawAddons(void)
|
|||||||
//m = numwadfiles-(mainwads+2+1);
|
//m = numwadfiles-(mainwads+2+1);
|
||||||
//V_DrawCenteredString(BASEVIDWIDTH/2, y+24, (majormods ? highlightflags : V_TRANSLUCENT), va("%d ADD-ON%s LOADED", (int)m, (m == 1) ? "" : "S")); //+2 for music, sounds, +1 for main.kart
|
//V_DrawCenteredString(BASEVIDWIDTH/2, y+24, (majormods ? highlightflags : V_TRANSLUCENT), va("%d ADD-ON%s LOADED", (int)m, (m == 1) ? "" : "S")); //+2 for music, sounds, +1 for main.kart
|
||||||
|
|
||||||
V_DrawThinString(0, BASEVIDHEIGHT-10, V_SNAPTOBOTTOM|V_SNAPTOLEFT|V_TRANSLUCENT|V_ALLOWLOWERCASE, ("END Key - Add addon to autoload"));
|
V_DrawThinString(0, BASEVIDHEIGHT-10, V_SNAPTOBOTTOM|V_SNAPTOLEFT|V_TRANSLUCENT|V_ALLOWLOWERCASE, va("%s Key - Add addon to autoload", G_KeynumToString(AUTOLOAD_KEY)));
|
||||||
|
|
||||||
|
if (Playing() && (server || IsPlayerAdmin(consoleplayer)))
|
||||||
|
V_DrawThinString(0, BASEVIDHEIGHT-20, V_SNAPTOBOTTOM|V_SNAPTOLEFT|V_TRANSLUCENT|V_ALLOWLOWERCASE, va("%s Key - Switch to local addon mode", G_KeynumToString(LOCALMODE_KEY)));
|
||||||
}
|
}
|
||||||
|
|
||||||
static void M_AddonExec(INT32 ch)
|
static void M_AddonExec(INT32 ch)
|
||||||
@@ -3666,7 +3703,7 @@ static void M_AddonAutoLoad(INT32 ch)
|
|||||||
FILE *autoloadconfigfile;
|
FILE *autoloadconfigfile;
|
||||||
|
|
||||||
// check our controls //
|
// check our controls //
|
||||||
if (ch != 'y' && ch != KEY_ENTER && ch != KEY_END)
|
if (ch != 'y' && ch != KEY_ENTER && ch != AUTOLOAD_KEY)
|
||||||
{
|
{
|
||||||
S_StartSound(NULL, sfx_s26d);
|
S_StartSound(NULL, sfx_s26d);
|
||||||
return;
|
return;
|
||||||
@@ -3680,7 +3717,7 @@ static void M_AddonAutoLoad(INT32 ch)
|
|||||||
switch (dirmenu[dir_on[menudepthleft]][DIR_TYPE])
|
switch (dirmenu[dir_on[menudepthleft]][DIR_TYPE])
|
||||||
{
|
{
|
||||||
case EXT_FOLDER:
|
case EXT_FOLDER:
|
||||||
M_StartMessage(va("%c%s\x80\nAutoloading folders is not supported as of yet. \n\n(Press a key)\n", ('\x80' + (highlightflags>>V_CHARCOLORSHIFT)), dirmenu[dir_on[menudepthleft]]+DIR_STRING),NULL,MM_NOTHING);
|
M_StartMessage(va("%c%s\x80\nAutoloading folders is not supported as of yet. \n\n(Press a key)\n", ('\x80' + (highlightflags>>V_CHARCOLORSHIFT)), dirmenu[dir_on[menudepthleft]]+DIR_STRING), NULL, MM_NOTHING);
|
||||||
break;
|
break;
|
||||||
case EXT_TXT:
|
case EXT_TXT:
|
||||||
case EXT_CFG:
|
case EXT_CFG:
|
||||||
@@ -3821,7 +3858,7 @@ static void M_HandleAddons(INT32 choice)
|
|||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
case EXT_TXT:
|
case EXT_TXT:
|
||||||
M_StartMessage(va("%c%s\x80\nThis file may not be a console script.\nAttempt to run anyways? \n\n(Press 'Y' to confirm)\n", ('\x80' + (highlightflags>>V_CHARCOLORSHIFT)), dirmenu[dir_on[menudepthleft]]+DIR_STRING),M_AddonExec,MM_YESNO);
|
M_StartMessage(va("%c%s\x80\nThis file may not be a console script.\nAttempt to run anyways? \n\n(Press 'Y' to confirm)\n", ('\x80' + (highlightflags>>V_CHARCOLORSHIFT)), dirmenu[dir_on[menudepthleft]]+DIR_STRING), M_AddonExec, MM_YESNO);
|
||||||
break;
|
break;
|
||||||
case EXT_CFG:
|
case EXT_CFG:
|
||||||
M_AddonExec(KEY_ENTER);
|
M_AddonExec(KEY_ENTER);
|
||||||
@@ -3834,30 +3871,40 @@ static void M_HandleAddons(INT32 choice)
|
|||||||
case EXT_KART:
|
case EXT_KART:
|
||||||
#endif
|
#endif
|
||||||
case EXT_PK3:
|
case EXT_PK3:
|
||||||
if (browselocalskins)
|
|
||||||
{
|
{
|
||||||
if (DumbStartsWith("KC_", dirmenu[dir_on[menudepthleft]]+DIR_STRING) || DumbStartsWith("kc_", dirmenu[dir_on[menudepthleft]]+DIR_STRING)) {
|
const char *addonname = dirmenu[dir_on[menudepthleft]]+DIR_STRING;
|
||||||
M_StartMessage(va("%c%s\x80\nYou are loading a local skin.\nLocal skins will not be usable\nafter going back from\nthe title screen.\n\n(Press a key)\n", ('\x80' + (highlightflags>>V_CHARCOLORSHIFT)), dirmenu[dir_on[menudepthleft]]+DIR_STRING),NULL,MM_NOTHING);
|
|
||||||
COM_BufAddText(va("addfilelocal \"%s%s\"", menupath, dirmenu[dir_on[menudepthleft]]+DIR_STRING));
|
if (addons_localmode)
|
||||||
|
{
|
||||||
|
if (DumbStartsWith("KC_", addonname) || DumbStartsWith("kc_", addonname))
|
||||||
|
{
|
||||||
|
M_StartMessage(va("%c%s\x80\nYou are loading a local skin.\nLocal skins will not be usable\nafter going back from\nthe title screen.\n\n(Press a key)\n", ('\x80' + (highlightflags>>V_CHARCOLORSHIFT)), addonname), NULL, MM_NOTHING);
|
||||||
|
}
|
||||||
|
else if (DumbStartsWith("KCL_", addonname) || DumbStartsWith("kcl_", addonname)) // skins with lua
|
||||||
|
{
|
||||||
|
M_StartMessage(va("%c%s\x80\nYou are loading a local skin with lua.\nBeware that this may cause issues like crashes or desyncs in some cases!\nLocal skins will not be usable\nafter going back from\nthe title screen.\n\n(Press a key)\n", ('\x80' + (highlightflags>>V_CHARCOLORSHIFT)), addonname), NULL, MM_NOTHING);
|
||||||
|
}
|
||||||
|
// no need to account for KRC cases
|
||||||
|
|
||||||
|
COM_BufAddText(va("addfilelocal \"%s%s\"", menupath, addonname));
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
S_StartSound(NULL, sfx_s26d);
|
{
|
||||||
}
|
COM_BufAddText(va("addfile \"%s%s\"", menupath, addonname));
|
||||||
else
|
}
|
||||||
{
|
|
||||||
COM_BufAddText(va("addfile \"%s%s\"", menupath, dirmenu[dir_on[menudepthleft]]+DIR_STRING));
|
|
||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
default:
|
default:
|
||||||
S_StartSound(NULL, sfx_s26d);
|
S_StartSound(NULL, sfx_s26d);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if (refresh)
|
if (refresh)
|
||||||
refreshdirmenu |= REFRESHDIR_NORMAL;
|
refreshdirmenu |= REFRESHDIR_NORMAL;
|
||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
|
|
||||||
case KEY_END:
|
case AUTOLOAD_KEY:
|
||||||
{
|
{
|
||||||
boolean refresh = true;
|
boolean refresh = true;
|
||||||
if (!dirmenu[dir_on[menudepthleft]])
|
if (!dirmenu[dir_on[menudepthleft]])
|
||||||
@@ -3924,6 +3971,8 @@ static void M_HandleAddons(INT32 choice)
|
|||||||
M_SetupNextMenu(currentMenu->prevMenu);
|
M_SetupNextMenu(currentMenu->prevMenu);
|
||||||
else
|
else
|
||||||
M_ClearMenus(true);
|
M_ClearMenus(true);
|
||||||
|
|
||||||
|
addons_localmode = false; //Exiting this menu, disable addons_localmode already.
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -4201,6 +4250,14 @@ static boolean M_HandleReplayHutQuery(INT32 choice)
|
|||||||
char tmp[MAXREPLAYQUERY+1];
|
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);
|
||||||
@@ -7604,7 +7661,11 @@ Update the maxplayers label...
|
|||||||
|
|
||||||
// draw name string
|
// draw name string
|
||||||
if (itemOn != 9)
|
if (itemOn != 9)
|
||||||
V_DrawString(x+8,y+12, V_ALLOWLOWERCASE, setupm_ip);
|
{
|
||||||
|
char buf[28];
|
||||||
|
strlcpy(buf, setupm_ip, sizeof(buf));
|
||||||
|
V_DrawString(x+8,y+12, V_ALLOWLOWERCASE, buf);
|
||||||
|
}
|
||||||
else
|
else
|
||||||
M_DrawTextInputScroll(x+8, y+12, &setupm_input_ip, 0, SETUPM_IP_MAXSIZE);
|
M_DrawTextInputScroll(x+8, y+12, &setupm_input_ip, 0, SETUPM_IP_MAXSIZE);
|
||||||
|
|
||||||
@@ -7736,7 +7797,7 @@ static void M_SetupMultiHandler(INT32 choice)
|
|||||||
if (exitmenu)
|
if (exitmenu)
|
||||||
{
|
{
|
||||||
if (currentMenu->prevMenu)
|
if (currentMenu->prevMenu)
|
||||||
M_SetupNextMenu (currentMenu->prevMenu);
|
M_SetupNextMenu(currentMenu->prevMenu);
|
||||||
else
|
else
|
||||||
M_ClearMenus(true);
|
M_ClearMenus(true);
|
||||||
}
|
}
|
||||||
@@ -8987,15 +9048,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;
|
||||||
}
|
}
|
||||||
@@ -10531,6 +10592,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
|
||||||
|
|
||||||
// =====================================================================
|
// =====================================================================
|
||||||
|
|||||||
+1
-1
@@ -26,7 +26,7 @@ extern "C" {
|
|||||||
#include "mserv.h"
|
#include "mserv.h"
|
||||||
#include "r_things.h" // for SKINNAMESIZE
|
#include "r_things.h" // for SKINNAMESIZE
|
||||||
|
|
||||||
extern boolean forceshowhud;
|
extern boolean forceshowhud, forceshowchat;
|
||||||
|
|
||||||
//
|
//
|
||||||
// MENUS
|
// MENUS
|
||||||
|
|||||||
+214
-116
@@ -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;
|
||||||
@@ -208,7 +209,7 @@ typedef enum
|
|||||||
static menuitem_t MPauseMenu[] =
|
static menuitem_t MPauseMenu[] =
|
||||||
{
|
{
|
||||||
{IT_STRING | IT_CALL, NULL, "Addons...", M_Addons, 8},
|
{IT_STRING | IT_CALL, NULL, "Addons...", M_Addons, 8},
|
||||||
{IT_STRING | IT_CALL, NULL, "Add local skins...", M_LocalSkins, 16},
|
{IT_STRING | IT_CALL, NULL, "Local Add-ons...", M_LocalAddons, 8},
|
||||||
{IT_STRING | IT_SUBMENU, NULL, "Scramble Teams...", &MISC_ScrambleTeamDef, 24},
|
{IT_STRING | IT_SUBMENU, NULL, "Scramble Teams...", &MISC_ScrambleTeamDef, 24},
|
||||||
{IT_STRING | IT_CALL, NULL, "Switch Map..." , M_MapChange, 32},
|
{IT_STRING | IT_CALL, NULL, "Switch Map..." , M_MapChange, 32},
|
||||||
|
|
||||||
@@ -238,7 +239,7 @@ static menuitem_t MPauseMenu[] =
|
|||||||
typedef enum
|
typedef enum
|
||||||
{
|
{
|
||||||
mpause_addons = 0,
|
mpause_addons = 0,
|
||||||
mpause_addlocalskins,
|
mpause_localaddons,
|
||||||
mpause_scramble,
|
mpause_scramble,
|
||||||
mpause_switchmap,
|
mpause_switchmap,
|
||||||
#ifdef HAVE_DISCORDRPC
|
#ifdef HAVE_DISCORDRPC
|
||||||
@@ -446,25 +447,25 @@ enum
|
|||||||
|
|
||||||
static menuitem_t SP_ReplayMenu[] =
|
static menuitem_t SP_ReplayMenu[] =
|
||||||
{
|
{
|
||||||
{IT_WHITESTRING|IT_CALL, NULL, "Replay Best Time", M_ReplayTimeAttack, 90},
|
{IT_WHITESTRING|IT_CALL, NULL, "Replay Best Time", M_ReplayTimeAttack, 90},
|
||||||
{IT_WHITESTRING|IT_CALL, NULL, "Replay Best Lap", M_ReplayTimeAttack, 98},
|
{IT_WHITESTRING|IT_CALL, NULL, "Replay Best Lap", M_ReplayTimeAttack, 98},
|
||||||
|
|
||||||
{IT_WHITESTRING|IT_CALL, NULL, "Replay Last", M_ReplayTimeAttack, 106},
|
{IT_WHITESTRING|IT_CALL, NULL, "Replay Last", M_ReplayTimeAttack, 106},
|
||||||
{IT_WHITESTRING|IT_CALL, NULL, "Replay Guest", M_ReplayTimeAttack, 114},
|
{IT_WHITESTRING|IT_CALL, NULL, "Replay Guest", M_ReplayTimeAttack, 114},
|
||||||
{IT_WHITESTRING|IT_KEYHANDLER, NULL, "Replay Staff",M_HandleStaffReplay,122},
|
{IT_WHITESTRING|IT_KEYHANDLER, NULL, "Replay Staff",M_HandleStaffReplay, 122},
|
||||||
|
|
||||||
{IT_WHITESTRING|IT_SUBMENU, NULL, "Back", &SP_TimeAttackDef, 130}
|
{IT_WHITESTRING|IT_SUBMENU, NULL, "Back", &SP_TimeAttackDef, 130}
|
||||||
};
|
};
|
||||||
|
|
||||||
static menuitem_t SP_GuestReplayMenu[] =
|
static menuitem_t SP_GuestReplayMenu[] =
|
||||||
{
|
{
|
||||||
{IT_WHITESTRING|IT_CALL, NULL, "Save Best Time as Guest", M_SetGuestReplay, 94},
|
{IT_WHITESTRING|IT_CALL, NULL, "Save Best Time as Guest", M_SetGuestReplay, 94},
|
||||||
{IT_WHITESTRING|IT_CALL, NULL, "Save Best Lap as Guest", M_SetGuestReplay,102},
|
{IT_WHITESTRING|IT_CALL, NULL, "Save Best Lap as Guest", M_SetGuestReplay, 102},
|
||||||
{IT_WHITESTRING|IT_CALL, NULL, "Save Last as Guest", M_SetGuestReplay,110},
|
{IT_WHITESTRING|IT_CALL, NULL, "Save Last as Guest", M_SetGuestReplay, 110},
|
||||||
|
|
||||||
{IT_WHITESTRING|IT_CALL, NULL, "Delete Guest Replay", M_SetGuestReplay,120},
|
{IT_WHITESTRING|IT_CALL, NULL, "Delete Guest Replay", M_SetGuestReplay, 120},
|
||||||
|
|
||||||
{IT_WHITESTRING|IT_SUBMENU, NULL, "Back", &SP_TimeAttackDef, 130}
|
{IT_WHITESTRING|IT_SUBMENU, NULL, "Back", &SP_TimeAttackDef, 130}
|
||||||
};
|
};
|
||||||
|
|
||||||
static menuitem_t SP_GhostMenu[] =
|
static menuitem_t SP_GhostMenu[] =
|
||||||
@@ -555,10 +556,10 @@ static menuitem_t MP_PlayerSetupMenu[] =
|
|||||||
|
|
||||||
static menuitem_t MP_ConnectMenu[] =
|
static menuitem_t MP_ConnectMenu[] =
|
||||||
{
|
{
|
||||||
{IT_STRING | IT_CVAR, NULL, "Sort By", &cv_serversort, 0},
|
{IT_STRING | IT_CVAR, NULL, "Sort By", &cv_serversort, 0},
|
||||||
{IT_STRING | IT_KEYHANDLER, NULL, "Page", M_HandleServerPage, 8},
|
{IT_STRING | IT_KEYHANDLER, NULL, "Page", M_HandleServerPage, 8},
|
||||||
{IT_STRING | IT_CALL, NULL, "Refresh", M_Refresh, 16},
|
{IT_STRING | IT_CALL, NULL, "Refresh", M_Refresh, 16},
|
||||||
{IT_STRING | IT_KEYHANDLER, NULL, "", M_HandleServerSearch,25},
|
{IT_STRING | IT_KEYHANDLER, NULL, "", M_HandleServerSearch, 25},
|
||||||
|
|
||||||
{IT_STRING | IT_SPACE, NULL, "", M_Connect, 48},
|
{IT_STRING | IT_SPACE, NULL, "", M_Connect, 48},
|
||||||
{IT_STRING | IT_SPACE, NULL, "", M_Connect, 60},
|
{IT_STRING | IT_SPACE, NULL, "", M_Connect, 60},
|
||||||
@@ -725,29 +726,36 @@ static const char* OP_AllControlsTooltips[sizeof(OP_AllControlsMenu)/sizeof(OP_A
|
|||||||
// The rest is null, for now
|
// The rest is null, for now
|
||||||
};
|
};
|
||||||
|
|
||||||
#define OP_JOYMENU(pnum) \
|
// i really do not feel like messing with setup routines
|
||||||
{IT_HEADER, NULL, "Gameplay Controls", NULL, 7}, \
|
// and macro preprocessor cannot eval maths for string shit like this :chaosleep:
|
||||||
{IT_STRING | IT_CVAR, NULL, "Aim Forward/Back" , &cv_aimaxis[pnum] , 15}, \
|
#define RUMBDEF_0 OP_Joystick1RumbleDef
|
||||||
{IT_STRING | IT_CVAR, NULL, "Turn Left/Right" , &cv_turnaxis[pnum] , 20}, \
|
#define RUMBDEF_1 OP_Joystick2RumbleDef
|
||||||
{IT_STRING | IT_CVAR, NULL, "Accelerate" , &cv_moveaxis[pnum] , 25}, \
|
#define RUMBDEF_2 OP_Joystick3RumbleDef
|
||||||
{IT_STRING | IT_CVAR, NULL, "Brake" , &cv_brakeaxis[pnum] , 30}, \
|
#define RUMBDEF_3 OP_Joystick4RumbleDef
|
||||||
{IT_STRING | IT_CVAR, NULL, "Drift" , &cv_driftaxis[pnum] , 35}, \
|
#define RUMBDEF(x) RUMBDEF_##x
|
||||||
{IT_STRING | IT_CVAR, NULL, "Use Item" , &cv_fireaxis[pnum] , 40}, \
|
|
||||||
{IT_STRING | IT_CVAR, NULL, "Look Backward" , &cv_lookbackaxis[pnum] , 45}, \
|
#define OP_JOYMENU(pnum) \
|
||||||
{IT_STRING | IT_CVAR, NULL, "Custom Button 1" , &cv_custom1axis[pnum] , 50}, \
|
{IT_HEADER, NULL, "Gameplay Controls", NULL, 7}, \
|
||||||
{IT_STRING | IT_CVAR, NULL, "Custom Button 2" , &cv_custom2axis[pnum] , 55}, \
|
{IT_STRING | IT_CVAR, NULL, "Aim Forward/Back" , &cv_aimaxis[pnum] , 15}, \
|
||||||
{IT_STRING | IT_CVAR, NULL, "Custom Button 3" , &cv_custom3axis[pnum] , 60}, \
|
{IT_STRING | IT_CVAR, NULL, "Turn Left/Right" , &cv_turnaxis[pnum] , 20}, \
|
||||||
{IT_HEADER, NULL, "Camera Controls", NULL, 67}, \
|
{IT_STRING | IT_CVAR, NULL, "Accelerate" , &cv_moveaxis[pnum] , 25}, \
|
||||||
{IT_STRING | IT_CVAR, NULL, "Look Up/Down" , &cv_lookaxis[pnum] , 75}, \
|
{IT_STRING | IT_CVAR, NULL, "Brake" , &cv_brakeaxis[pnum] , 30}, \
|
||||||
{IT_STRING | IT_CVAR, NULL, "Turn Left/Right" , &cv_camturnaxis[pnum] , 80}, \
|
{IT_STRING | IT_CVAR, NULL, "Drift" , &cv_driftaxis[pnum] , 35}, \
|
||||||
{IT_STRING | IT_CVAR, NULL, "Strafe Left/Right" , &cv_camstrafeaxis[pnum] , 85}, \
|
{IT_STRING | IT_CVAR, NULL, "Use Item" , &cv_fireaxis[pnum] , 40}, \
|
||||||
{IT_HEADER, NULL, "Deadzones", NULL, 92}, \
|
{IT_STRING | IT_CVAR, NULL, "Look Backward" , &cv_lookbackaxis[pnum] , 45}, \
|
||||||
{IT_STRING | IT_CVAR, NULL, "X deadzone" , &cv_xdeadzone[pnum] , 100}, \
|
{IT_STRING | IT_CVAR, NULL, "Custom Button 1" , &cv_custom1axis[pnum] , 50}, \
|
||||||
{IT_STRING | IT_CVAR, NULL, "Y deadzone" , &cv_ydeadzone[pnum] , 105}, \
|
{IT_STRING | IT_CVAR, NULL, "Custom Button 2" , &cv_custom2axis[pnum] , 55}, \
|
||||||
{IT_HEADER, NULL, "Miscellaneous", NULL, 112}, \
|
{IT_STRING | IT_CVAR, NULL, "Custom Button 3" , &cv_custom3axis[pnum] , 60}, \
|
||||||
{IT_STRING | IT_CVAR, NULL, "Controller Rumble" , &cv_rumble[pnum] , 120}, \
|
{IT_HEADER, NULL, "Camera Controls", NULL, 67}, \
|
||||||
{IT_STRING | IT_CVAR, NULL, "Controller Rumble Strength" , &cv_rumblestrength[pnum] , 125}, \
|
{IT_STRING | IT_CVAR, NULL, "Look Up/Down" , &cv_lookaxis[pnum] , 75}, \
|
||||||
{IT_STRING | IT_CVAR, NULL, "Set LED to Player color" , &cv_gamepadled[pnum] , 130},
|
{IT_STRING | IT_CVAR, NULL, "Turn Left/Right" , &cv_camturnaxis[pnum] , 80}, \
|
||||||
|
{IT_STRING | IT_CVAR, NULL, "Strafe Left/Right" , &cv_camstrafeaxis[pnum] , 85}, \
|
||||||
|
{IT_HEADER, NULL, "Deadzones", NULL, 92}, \
|
||||||
|
{IT_STRING | IT_CVAR, NULL, "X deadzone" , &cv_xdeadzone[pnum] , 100}, \
|
||||||
|
{IT_STRING | IT_CVAR, NULL, "Y deadzone" , &cv_ydeadzone[pnum] , 105}, \
|
||||||
|
{IT_HEADER, NULL, "Miscellaneous", NULL, 112}, \
|
||||||
|
{IT_SUBMENU|IT_STRING, NULL, "Rumble Options..." , &RUMBDEF(pnum) , 120}, \
|
||||||
|
{IT_STRING | IT_CVAR, NULL, "Set LED to Player color" , &cv_gamepadled[pnum] , 125},
|
||||||
|
|
||||||
static menuitem_t OP_Joystick1Menu[] =
|
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},
|
||||||
@@ -789,10 +837,9 @@ static menuitem_t OP_JoystickSetMenu[] =
|
|||||||
static menuitem_t OP_MouseOptionsMenu[] =
|
static menuitem_t OP_MouseOptionsMenu[] =
|
||||||
{
|
{
|
||||||
{IT_STRING | IT_CVAR, NULL, "Use Mouse", &cv_usemouse, 10},
|
{IT_STRING | IT_CVAR, NULL, "Use Mouse", &cv_usemouse, 10},
|
||||||
|
|
||||||
{IT_STRING | IT_CVAR, NULL, "Mouse Turning", &cv_mouseturn, 20},
|
{IT_STRING | IT_CVAR, NULL, "Mouse Turning", &cv_mouseturn, 20},
|
||||||
{IT_STRING | IT_CVAR, NULL, "Invert Mouse", &cv_invertmouse, 30},
|
{IT_STRING | IT_CVAR, NULL, "Invert Mouse", &cv_invertmouse, 30},
|
||||||
{IT_STRING | IT_CVAR | IT_CV_SLIDER, NULL, "Mouse X Speed", &cv_mousexsens, 40},
|
{IT_STRING | IT_CVAR | IT_CV_SLIDER, NULL, "Mouse X Speed", &cv_mousexsens, 40},
|
||||||
{IT_STRING | IT_CVAR | IT_CV_SLIDER, NULL, "Mouse Y Speed", &cv_mouseysens, 50},
|
{IT_STRING | IT_CVAR | IT_CV_SLIDER, NULL, "Mouse Y Speed", &cv_mouseysens, 50},
|
||||||
};
|
};
|
||||||
|
|
||||||
@@ -861,7 +908,6 @@ static const char* OP_VideoTooltips[] =
|
|||||||
"Advanced graphical options.",
|
"Advanced graphical options.",
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
||||||
enum
|
enum
|
||||||
{
|
{
|
||||||
op_video_res = 0,
|
op_video_res = 0,
|
||||||
@@ -945,24 +991,25 @@ static menuitem_t OP_ExpOptionsMenu[] =
|
|||||||
//{IT_STRING | IT_CVAR, NULL, "Randomized Directional Light", &cv_randomdirlight, 45}, // should this ever come back
|
//{IT_STRING | IT_CVAR, NULL, "Randomized Directional Light", &cv_randomdirlight, 45}, // should this ever come back
|
||||||
|
|
||||||
{IT_STRING | IT_CVAR, NULL, "Skyboxes", &cv_skybox, 40},
|
{IT_STRING | IT_CVAR, NULL, "Skyboxes", &cv_skybox, 40},
|
||||||
|
{IT_STRING | IT_CVAR, NULL, "Skydome", &cv_skydome, 45},
|
||||||
|
|
||||||
{IT_STRING | IT_CVAR, NULL, "Precache Level Textures", &cv_precachetextures, 50},
|
{IT_STRING | IT_CVAR, NULL, "Precache Level Textures", &cv_precachetextures, 55},
|
||||||
|
|
||||||
{IT_STRING | IT_CVAR, NULL, "FPS counter sampling", &cv_accuratefps, 60},
|
{IT_STRING | IT_CVAR, NULL, "FPS counter sampling", &cv_accuratefps, 65},
|
||||||
|
|
||||||
{IT_STRING | IT_CVAR, NULL, "Frameskip", &cv_frameskip, 70},
|
{IT_STRING | IT_CVAR, NULL, "Frameskip", &cv_frameskip, 75},
|
||||||
|
|
||||||
{IT_STRING | IT_CVAR, NULL, "Votescreen Scaling", &cv_votebgscaling, 80},
|
{IT_STRING | IT_CVAR, NULL, "Votescreen Scaling", &cv_votebgscaling, 85},
|
||||||
|
|
||||||
#ifdef HWRENDER
|
#ifdef HWRENDER
|
||||||
{IT_STRING | IT_CVAR, NULL, "Screen Textures", &cv_glscreentextures, 90},
|
{IT_STRING | IT_CVAR, NULL, "Screen Textures", &cv_glscreentextures, 95},
|
||||||
#ifdef USE_FBO_OGL
|
#ifdef USE_FBO_OGL
|
||||||
{IT_STRING | IT_CVAR, NULL, "FBO Downsampling support", &cv_glframebuffer, 95},
|
{IT_STRING | IT_CVAR, NULL, "FBO Downsampling support", &cv_glframebuffer, 100},
|
||||||
{IT_STRING | IT_CVAR, NULL, "Palette Depth", &cv_glpalettedepth, 105},
|
{IT_STRING | IT_CVAR, NULL, "Palette Depth", &cv_glpalettedepth, 110},
|
||||||
{IT_DISABLED, NULL, "", NULL, 115}, // dummy text
|
{IT_DISABLED, NULL, "", NULL, 120}, // dummy text
|
||||||
#else
|
#else
|
||||||
{IT_STRING | IT_CVAR, NULL, "Palette Depth", &cv_glpalettedepth, 100},
|
{IT_STRING | IT_CVAR, NULL, "Palette Depth", &cv_glpalettedepth, 110},
|
||||||
{IT_DISABLED, NULL, "", NULL, 110}, // dummy text
|
{IT_DISABLED, NULL, "", NULL, 120}, // dummy text
|
||||||
#endif
|
#endif
|
||||||
#endif
|
#endif
|
||||||
};
|
};
|
||||||
@@ -975,12 +1022,13 @@ static const char* OP_ExpTooltips[] =
|
|||||||
"Sets minimum sector brightness, useful for dark areas.",
|
"Sets minimum sector brightness, useful for dark areas.",
|
||||||
//"Should the directional lightning be randomized each map?\nTakes effect on next map load.",
|
//"Should the directional lightning be randomized each map?\nTakes effect on next map load.",
|
||||||
"Toggle being able to see the sky.",
|
"Toggle being able to see the sky.",
|
||||||
|
"Toggle skydome.", // idk man someone give a better description of this
|
||||||
"Preload all level textures on level load.\nMassively reduces texture related stuttering during gameplay\nat the cost of longer level loading times.\nDisable this if you experience timeouts during level switches.",
|
"Preload all level textures on level load.\nMassively reduces texture related stuttering during gameplay\nat the cost of longer level loading times.\nDisable this if you experience timeouts during level switches.",
|
||||||
"Change the FPS counter sampling method\nInaccurate updates slower\nand might miss sudden framerate changes and drops,\nproviding a more averaged result.\nAccurate updates faster, but might be less readable.", // how to ingles??
|
"Change the FPS counter sampling method\nInaccurate updates slower\nand might miss sudden framerate changes and drops,\nproviding a more averaged result.\nAccurate updates faster, but might be less readable.", // how to ingles??
|
||||||
"Skips rendering frames if game logic takes too long\npreventing gameplay issues during performance drops.", // idk im shit as describing things
|
"Skips rendering frames if game logic takes too long\npreventing gameplay issues during performance drops.", // idk im shit as describing things
|
||||||
"Different methods of scaling the votescreen backgrounds.",
|
"Different methods of scaling the votescreen backgrounds.",
|
||||||
#ifdef HWRENDER
|
#ifdef HWRENDER
|
||||||
"Disabling Screen Textures may result in a performance boost\nbut will break certain effects.\nScreen textures are required at resolutions lower than your desktop resolution!"
|
"Disabling Screen Textures may result in a performance boost\nbut will break certain effects.\nScreen textures are required at resolutions lower than your desktop resolution!",
|
||||||
#ifdef USE_FBO_OGL
|
#ifdef USE_FBO_OGL
|
||||||
"Allows the game to downsample from a higher resolution\nthan your display in OpenGL renderer mode.\nRequires a GPU with atleast OpenGL 2.1 support.",
|
"Allows the game to downsample from a higher resolution\nthan your display in OpenGL renderer mode.\nRequires a GPU with atleast OpenGL 2.1 support.",
|
||||||
#endif
|
#endif
|
||||||
@@ -996,6 +1044,7 @@ enum
|
|||||||
op_exp_secbright,
|
op_exp_secbright,
|
||||||
//op_exp_dirlight,
|
//op_exp_dirlight,
|
||||||
op_exp_skybox,
|
op_exp_skybox,
|
||||||
|
op_exp_skydome,
|
||||||
op_exp_texcache,
|
op_exp_texcache,
|
||||||
op_exp_accuratefps,
|
op_exp_accuratefps,
|
||||||
op_exp_frameskip,
|
op_exp_frameskip,
|
||||||
@@ -1009,7 +1058,6 @@ enum
|
|||||||
#endif
|
#endif
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
||||||
#ifdef HWRENDER
|
#ifdef HWRENDER
|
||||||
static menuitem_t OP_OpenGLOptionsMenu[] =
|
static menuitem_t OP_OpenGLOptionsMenu[] =
|
||||||
{
|
{
|
||||||
@@ -1018,17 +1066,17 @@ static menuitem_t OP_OpenGLOptionsMenu[] =
|
|||||||
{IT_STRING | IT_CVAR, NULL, "Shaders", &cv_glshaders, 25},
|
{IT_STRING | IT_CVAR, NULL, "Shaders", &cv_glshaders, 25},
|
||||||
{IT_STRING | IT_CVAR, NULL, "Palette Rendering", &cv_glpaletterendering, 30},
|
{IT_STRING | IT_CVAR, NULL, "Palette Rendering", &cv_glpaletterendering, 30},
|
||||||
|
|
||||||
{IT_STRING | IT_CVAR, NULL, "Texture Quality", &cv_gltexturedepth, 45},
|
{IT_STRING | IT_CVAR, NULL, "Texture Quality", &cv_gltexturedepth, 40},
|
||||||
{IT_STRING | IT_CVAR, NULL, "Texture Filter", &cv_glfiltermode, 50},
|
{IT_STRING | IT_CVAR, NULL, "Texture Filter", &cv_glfiltermode, 45},
|
||||||
{IT_STRING | IT_CVAR, NULL, "Anisotropic", &cv_glanisotropicmode, 55},
|
{IT_STRING | IT_CVAR, NULL, "Anisotropic", &cv_glanisotropicmode, 50},
|
||||||
{IT_STRING | IT_CVAR, NULL, "Visual Portals", &cv_glportals, 60},
|
{IT_STRING | IT_CVAR, NULL, "Visual Portals", &cv_glportals, 55},
|
||||||
|
|
||||||
{IT_STRING | IT_CVAR, NULL, "Wall Contrast Style", &cv_glfakecontrast, 70},
|
{IT_STRING | IT_CVAR, NULL, "Wall Contrast Style", &cv_glfakecontrast, 65},
|
||||||
{IT_STRING | IT_CVAR, NULL, "Slope Contrast", &cv_glslopecontrast, 75},
|
{IT_STRING | IT_CVAR, NULL, "Slope Contrast", &cv_glslopecontrast, 70},
|
||||||
{IT_STRING | IT_CVAR, NULL, "Dithered Lightning", &cv_gllightdither, 80},
|
{IT_STRING | IT_CVAR, NULL, "Dithered Lightning", &cv_gllightdither, 75},
|
||||||
{IT_STRING | IT_CVAR, NULL, "Sprite Billboarding", &cv_glspritebillboarding, 85},
|
{IT_STRING | IT_CVAR, NULL, "Sprite Billboarding", &cv_glspritebillboarding, 80},
|
||||||
{IT_STRING | IT_CVAR, NULL, "Software Perspective", &cv_glshearing, 90},
|
{IT_STRING | IT_CVAR, NULL, "Software Perspective", &cv_glshearing, 85},
|
||||||
{IT_STRING | IT_CVAR, NULL, "Rendering Distance", &cv_glrenderdistance, 95},
|
{IT_STRING | IT_CVAR, NULL, "Rendering Distance", &cv_glrenderdistance, 90},
|
||||||
};
|
};
|
||||||
|
|
||||||
static const char* OP_OpenGLTooltips[] =
|
static const char* OP_OpenGLTooltips[] =
|
||||||
@@ -1066,7 +1114,6 @@ enum
|
|||||||
op_gl_shearing,
|
op_gl_shearing,
|
||||||
op_gl_renderdist,
|
op_gl_renderdist,
|
||||||
};
|
};
|
||||||
|
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
static menuitem_t OP_SoundOptionsMenu[] =
|
static menuitem_t OP_SoundOptionsMenu[] =
|
||||||
@@ -1077,8 +1124,7 @@ static menuitem_t OP_SoundOptionsMenu[] =
|
|||||||
{IT_STRING|IT_CVAR|IT_CV_NOPRINT, NULL, "Music", &cv_gamedigimusic, 30},
|
{IT_STRING|IT_CVAR|IT_CV_NOPRINT, NULL, "Music", &cv_gamedigimusic, 30},
|
||||||
{IT_STRING|IT_CVAR|IT_CV_SLIDER, NULL, "Music Volume", &cv_digmusicvolume, 38},
|
{IT_STRING|IT_CVAR|IT_CV_SLIDER, NULL, "Music Volume", &cv_digmusicvolume, 38},
|
||||||
|
|
||||||
//#ifndef NO_MIDI
|
#if 0 //#ifndef NO_MIDI
|
||||||
#if 0
|
|
||||||
{IT_STRING|IT_CVAR|IT_CV_SLIDER, NULL, "MIDI Volume", &cv_midimusicvolume, 46},
|
{IT_STRING|IT_CVAR|IT_CV_SLIDER, NULL, "MIDI Volume", &cv_midimusicvolume, 46},
|
||||||
|
|
||||||
{IT_STRING|IT_CVAR, NULL, "Reverse L/R Channels", &stereoreverse, 60},
|
{IT_STRING|IT_CVAR, NULL, "Reverse L/R Channels", &stereoreverse, 60},
|
||||||
@@ -1113,8 +1159,7 @@ static const char* OP_SoundTooltips[] =
|
|||||||
"Volume of Sound effects.",
|
"Volume of Sound effects.",
|
||||||
"Turn Music on or off.",
|
"Turn Music on or off.",
|
||||||
"Volume of Music.",
|
"Volume of Music.",
|
||||||
//#ifndef NO_MIDI
|
#if 0 //#ifndef NO_MIDI
|
||||||
#if 0
|
|
||||||
"Volume of Midi Music.",
|
"Volume of Midi Music.",
|
||||||
#endif
|
#endif
|
||||||
"Reverse left and right channels of audio.",
|
"Reverse left and right channels of audio.",
|
||||||
@@ -1174,7 +1219,7 @@ static const char* OP_SoundAdvancedTooltips[] =
|
|||||||
"Should the Grow music be on or off?",
|
"Should the Grow music be on or off?",
|
||||||
"Should the Invulnerability music be on or off?",
|
"Should the Invulnerability music be on or off?",
|
||||||
"Should music be kept when restarting the map?",
|
"Should music be kept when restarting the map?",
|
||||||
"Should the Intro fanfare be skipped\nand map music be played on map start?",
|
"Should the Intro fanfare be skipped\nand map music be played on map start?\nNote that this WILL skip sounds played by the map before round start as well!",
|
||||||
"Controls Sound effects caching.\nKeep will retain previously played sound effects in cache." // man idk how to describe this in a non awful way lmao
|
"Controls Sound effects caching.\nKeep will retain previously played sound effects in cache." // man idk how to describe this in a non awful way lmao
|
||||||
"\nOn will preload all sound effects.\nEliminates sound-related lag and stutters but increases memory usage.",
|
"\nOn will preload all sound effects.\nEliminates sound-related lag and stutters but increases memory usage.",
|
||||||
"Size of the Audio Buffer\nreducing it will result in less sound latency\nbut may cause issues such as crackling or distorted Sound.",
|
"Size of the Audio Buffer\nreducing it will result in less sound latency\nbut may cause issues such as crackling or distorted Sound.",
|
||||||
@@ -1408,44 +1453,70 @@ static const char* OP_PlayerCamOptionsTooltips[] =
|
|||||||
static menuitem_t OP_ChatOptionsMenu[] =
|
static menuitem_t OP_ChatOptionsMenu[] =
|
||||||
{
|
{
|
||||||
// will ANYONE who doesn't know how to use the console want to touch this one?
|
// will ANYONE who doesn't know how to use the console want to touch this one?
|
||||||
{IT_STRING | IT_CVAR, NULL, "Chat Mode", &cv_consolechat, 5}, // nonetheless...
|
{IT_STRING | IT_CVAR, NULL, "Chat Mode", &cv_consolechat, 5}, // nonetheless...
|
||||||
|
|
||||||
{IT_STRING | IT_CVAR | IT_CV_SLIDER,
|
{IT_STRING | IT_CVAR | IT_CV_SLIDER,
|
||||||
NULL, "Chat Box Width", &cv_chatwidth, 20},
|
NULL, "Chat Box Width", &cv_chatwidth, 10},
|
||||||
{IT_STRING | IT_CVAR | IT_CV_SLIDER,
|
{IT_STRING | IT_CVAR | IT_CV_SLIDER,
|
||||||
NULL, "Chat Box Height", &cv_chatheight, 30},
|
NULL, "Chat Box Height", &cv_chatheight, 15},
|
||||||
{IT_STRING | IT_CVAR, NULL, "Center Text in Chat", &cv_chatcentertext, 40},
|
{IT_STRING | IT_CVAR, NULL, "Chat Horizontal Offset", &cv_chat_xoffset, 20},
|
||||||
|
{IT_STRING | IT_CVAR, NULL, "Chat Vertical Offset", &cv_chat_yoffset, 25},
|
||||||
|
|
||||||
{IT_STRING | IT_CVAR, NULL, "Chat Background Tint", &cv_chatbacktint, 55},
|
{IT_STRING | IT_CVAR, NULL, "Center Text in Chat", &cv_chatcentertext, 35},
|
||||||
{IT_STRING | IT_CVAR, NULL, "Message Fadeout Time", &cv_chattime, 65},
|
{IT_STRING | IT_CVAR, NULL, "Chat Background Tint", &cv_chatbacktint, 40},
|
||||||
{IT_STRING | IT_CVAR, NULL, "Spam Protection", &cv_chatspamprotection, 75},
|
{IT_STRING | IT_CVAR, NULL, "Message Fadeout Time", &cv_chattime, 45},
|
||||||
{IT_STRING | IT_CVAR, NULL, "Max Chat Messages", &cv_chatlogsize, 85},
|
{IT_STRING | IT_CVAR, NULL, "Spam Protection", &cv_chatspamprotection, 50},
|
||||||
|
{IT_STRING | IT_CVAR, NULL, "Max Chat Messages", &cv_chatlogsize, 55},
|
||||||
|
{IT_STRING | IT_CVAR, NULL, "Display Character Limit", &cv_chat_showlimit, 60},
|
||||||
|
|
||||||
{IT_STRING | IT_CVAR, NULL, "Local ping display", &cv_showping, 105}, // shows ping above the framerate if we want to.
|
{IT_STRING | IT_CVAR, NULL, "Local ping display", &cv_showping, 70}, // shows ping above the framerate if we want to.
|
||||||
{IT_STRING | IT_CVAR, NULL, "Ping display style", &cv_pingstyle, 115},
|
{IT_STRING | IT_CVAR, NULL, "Ping display style", &cv_pingstyle, 75},
|
||||||
{IT_STRING | IT_CVAR, NULL, "Ping measurement", &cv_pingmeasurement, 125},
|
{IT_STRING | IT_CVAR, NULL, "Ping measurement", &cv_pingmeasurement, 80},
|
||||||
{IT_STRING | IT_CVAR, NULL, "Ping icon", &cv_pingicon, 135},
|
{IT_STRING | IT_CVAR, NULL, "Ping icon", &cv_pingicon, 85},
|
||||||
|
|
||||||
{IT_STRING | IT_CVAR, NULL, "Show IP address in playerlist", &cv_shownodeip, 145},
|
{IT_STRING | IT_CVAR, NULL, "Show IP address in playerlist", &cv_shownodeip, 90},
|
||||||
};
|
};
|
||||||
|
|
||||||
static const char* OP_ChatOptionsTooltips[] =
|
static const char* OP_ChatOptionsTooltips[] =
|
||||||
{
|
{
|
||||||
"Chat mode used for in-game chat.",
|
"Chat mode used for in-game chat.",
|
||||||
"Width of chat box.",
|
"Width of the chat box.",
|
||||||
"Height of chat box.",
|
"Height of the chat box.",
|
||||||
|
"Horizontal Offset of the chat box.",
|
||||||
|
"Vertical Offset of the chat box.",
|
||||||
"Center text in the chat message pop ups.",
|
"Center text in the chat message pop ups.",
|
||||||
"Chatbox background.",
|
"Background for the chat message pop ups.",
|
||||||
"Fadeout time for new chat message.",
|
"Fadeout time for new chat message.",
|
||||||
"Spam protection for in-game chat.",
|
"Spam protection for in-game chat.",
|
||||||
"Maxiumum amount of chat messages to look back at.",
|
"Maxiumum amount of chat messages to look back at.",
|
||||||
|
"Show how many characters you have left to type in the chat.",
|
||||||
"Show player ping.",
|
"Show player ping.",
|
||||||
"Choose the looks of the ping display.", // this is ass idk english lmao
|
"Choose the style of the ping display.",
|
||||||
"Measurement used for ping.",
|
"Measurement used for ping.",
|
||||||
"Visibility of ping icon.",
|
"Visibility of ping icon.",
|
||||||
"Should Player IP addresses be printed when using\nthe nodes or listplayers command?",
|
"Should Player IP addresses be printed when using\nthe nodes or listplayers command?",
|
||||||
};
|
};
|
||||||
|
|
||||||
|
enum
|
||||||
|
{
|
||||||
|
op_chat_mode,
|
||||||
|
op_chat_boxwidth,
|
||||||
|
op_chat_boxheight,
|
||||||
|
op_chat_yoffs,
|
||||||
|
op_chat_xoffs,
|
||||||
|
op_chat_centertxt,
|
||||||
|
op_chat_bgtint,
|
||||||
|
op_chat_fadetime,
|
||||||
|
op_chat_spamprotect,
|
||||||
|
op_chat_maxmsg,
|
||||||
|
op_chat_charlmt,
|
||||||
|
op_chat_showping,
|
||||||
|
op_chat_pingstyle,
|
||||||
|
op_chat_pingmeasr,
|
||||||
|
op_chat_pingico,
|
||||||
|
op_chat_nodeip,
|
||||||
|
};
|
||||||
|
|
||||||
static menuitem_t OP_GameOptionsMenu[] =
|
static menuitem_t OP_GameOptionsMenu[] =
|
||||||
{
|
{
|
||||||
{IT_STRING | IT_SUBMENU, NULL, "Random Item Toggles...", &OP_MonitorToggleDef, 10},
|
{IT_STRING | IT_SUBMENU, NULL, "Random Item Toggles...", &OP_MonitorToggleDef, 10},
|
||||||
@@ -1631,7 +1702,7 @@ static menuitem_t OP_AccessibilityMenu[] =
|
|||||||
{IT_SUBMENU|IT_STRING, NULL, "Video Color Settings...", &OP_ColorOptionsDef, 30},
|
{IT_SUBMENU|IT_STRING, NULL, "Video Color Settings...", &OP_ColorOptionsDef, 30},
|
||||||
|
|
||||||
{IT_STRING|IT_CVAR, NULL, "Reduce Effects", &cv_reducevfx, 35},
|
{IT_STRING|IT_CVAR, NULL, "Reduce Effects", &cv_reducevfx, 35},
|
||||||
{IT_STRING|IT_CVAR, NULL, "Midnight Channel Flicker", &cv_lessflicker, 40}, // obsolete now? or still better be a seperate toggle?
|
{IT_STRING|IT_CVAR, NULL, "Less Midnight Channel Flicker", &cv_lessflicker, 40}, // obsolete now? or still better be a seperate toggle?
|
||||||
|
|
||||||
{IT_STRING|IT_CVAR, NULL, "Minimum Sector Brightness", &cv_secbright, 45},
|
{IT_STRING|IT_CVAR, NULL, "Minimum Sector Brightness", &cv_secbright, 45},
|
||||||
|
|
||||||
@@ -1713,6 +1784,7 @@ static menuitem_t OP_SaturnMenu[] =
|
|||||||
{IT_SUBMENU|IT_STRING, NULL, "Saturn Hud...", &OP_SaturnHudDef, 140},
|
{IT_SUBMENU|IT_STRING, NULL, "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[] =
|
||||||
@@ -1736,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
|
||||||
@@ -1757,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[] =
|
||||||
@@ -1767,20 +1841,23 @@ static menuitem_t OP_PlayerDistortMenu[] =
|
|||||||
{IT_STRING | IT_CVAR, NULL, "Slope Rotation Distance", &cv_sloperolldist, 15},
|
{IT_STRING | IT_CVAR, NULL, "Slope Rotation Distance", &cv_sloperolldist, 15},
|
||||||
|
|
||||||
{IT_STRING | IT_CVAR, NULL, "Rotate Players when Sliptiding", &cv_sliptideroll, 25},
|
{IT_STRING | IT_CVAR, NULL, "Rotate Players when Sliptiding", &cv_sliptideroll, 25},
|
||||||
{IT_STRING | IT_CVAR, NULL, "Rotate Sparks and Boost Trails", &cv_sparkroll, 30},
|
{IT_STRING | IT_CVAR, NULL, "Stair Janking Effect", &cv_stairjank, 30},
|
||||||
{IT_STRING | IT_CVAR, NULL, "Rotate Bananas on Throw", &cv_bananthrowroll, 35},
|
{IT_STRING | IT_CVAR, NULL, "Stair Janking Sound Effect", &cv_stairjanksfx, 35}, // idk if that should be here but i dont care atm
|
||||||
|
|
||||||
{IT_STRING | IT_CVAR | IT_CV_SLIDER, NULL, "Player Stretch Factor", &cv_gravstretch, 45},
|
{IT_STRING | IT_CVAR, NULL, "Rotate Sparks and Boost Trails", &cv_sparkroll, 40},
|
||||||
{IT_STRING | IT_CVAR, NULL, "Squish Sound Effect", &cv_slamsound, 50},
|
{IT_STRING | IT_CVAR, NULL, "Rotate Bananas on Throw", &cv_bananthrowroll, 45},
|
||||||
|
|
||||||
{IT_STRING | IT_CVAR, NULL, "Saltyhop", &cv_saltyhop, 60},
|
{IT_STRING | IT_CVAR | IT_CV_SLIDER, NULL, "Player Stretch Factor", &cv_gravstretch, 55},
|
||||||
{IT_STRING | IT_CVAR | IT_CV_SLIDER, NULL, "Saltyhop Height", &cv_saltyheight, 65},
|
{IT_STRING | IT_CVAR, NULL, "Squish Sound Effect", &cv_slamsound, 60},
|
||||||
{IT_STRING | IT_CVAR, NULL, "Saltyhop Sound Effect", &cv_saltyhopsfx, 70},
|
|
||||||
{IT_STRING | IT_CVAR, NULL, "Saltyhop Squish", &cv_saltysquish, 75},
|
|
||||||
{IT_STRING | IT_CVAR, NULL, "Saltyhop Roll", &cv_saltyroll, 80},
|
|
||||||
|
|
||||||
{IT_STRING | IT_CVAR, NULL, "Squishdance", &cv_squishdance, 90},
|
{IT_STRING | IT_CVAR, NULL, "Saltyhop", &cv_saltyhop, 70},
|
||||||
{IT_STRING | IT_CVAR, NULL, "Squishdance Speed", &cv_squishdancespeed, 96},
|
{IT_STRING | IT_CVAR | IT_CV_SLIDER, NULL, "Saltyhop Height", &cv_saltyheight, 75},
|
||||||
|
{IT_STRING | IT_CVAR, NULL, "Saltyhop Sound Effect", &cv_saltyhopsfx, 80},
|
||||||
|
{IT_STRING | IT_CVAR, NULL, "Saltyhop Squish", &cv_saltysquish, 85},
|
||||||
|
{IT_STRING | IT_CVAR, NULL, "Saltyhop Roll", &cv_saltyroll, 90},
|
||||||
|
|
||||||
|
{IT_STRING | IT_CVAR, NULL, "Squishdance", &cv_squishdance, 100},
|
||||||
|
{IT_STRING | IT_CVAR, NULL, "Squishdance Speed", &cv_squishdancespeed, 106}, // why is this offset by 6? idk cant remember lulul
|
||||||
};
|
};
|
||||||
|
|
||||||
static const char* OP_PlayerDistortTooltips[] =
|
static const char* OP_PlayerDistortTooltips[] =
|
||||||
@@ -1789,6 +1866,8 @@ static const char* OP_PlayerDistortTooltips[] =
|
|||||||
"Sprite rotation on slopes. Can either be just players or all objects.",
|
"Sprite rotation on slopes. Can either be just players or all objects.",
|
||||||
"Distance object rotation should be visable.",
|
"Distance object rotation should be visable.",
|
||||||
"Player rotation when sliptiding.",
|
"Player rotation when sliptiding.",
|
||||||
|
"Slightly tilt the player when driving over stairs or small bumps.",
|
||||||
|
"Sound effect when driving over stairs or small bumps.",
|
||||||
"Rotation of a player's boost trails and drift sparks.",
|
"Rotation of a player's boost trails and drift sparks.",
|
||||||
"Should banans rotate when thrown?\nAnd should they stay rotated when on the ground?",
|
"Should banans rotate when thrown?\nAnd should they stay rotated when on the ground?",
|
||||||
"Player squash and stretch.",
|
"Player squash and stretch.",
|
||||||
@@ -1799,7 +1878,7 @@ static const char* OP_PlayerDistortTooltips[] =
|
|||||||
"Player hop squash and stretch.",
|
"Player hop squash and stretch.",
|
||||||
"Should the player rotation be kept during player hop.",
|
"Should the player rotation be kept during player hop.",
|
||||||
"Do a funny squishy dance when holding CUSTOM 3.",
|
"Do a funny squishy dance when holding CUSTOM 3.",
|
||||||
"Speed of the Squishy dance in BPM.",
|
"Speed of the Squishy dance in SPM (Squishes Per Minute).",
|
||||||
};
|
};
|
||||||
|
|
||||||
enum
|
enum
|
||||||
@@ -1808,6 +1887,8 @@ enum
|
|||||||
sloperotate,
|
sloperotate,
|
||||||
slrotatedist,
|
slrotatedist,
|
||||||
sliptide,
|
sliptide,
|
||||||
|
stairjank,
|
||||||
|
stairjanksfx,
|
||||||
sparkrotate,
|
sparkrotate,
|
||||||
bananrotat,
|
bananrotat,
|
||||||
stretchyplayer,
|
stretchyplayer,
|
||||||
@@ -1848,26 +1929,28 @@ static menuitem_t OP_SaturnHudMenu[] =
|
|||||||
{IT_STRING|IT_CVAR, NULL, "Item Amount Number", &cv_huditemamount, 110},
|
{IT_STRING|IT_CVAR, NULL, "Item Amount Number", &cv_huditemamount, 110},
|
||||||
{IT_STRING|IT_CVAR, NULL, "Animated Roulette", &cv_fancyroulette, 115},
|
{IT_STRING|IT_CVAR, NULL, "Animated Roulette", &cv_fancyroulette, 115},
|
||||||
|
|
||||||
{IT_STRING|IT_CVAR, NULL, "Show Lap Emblem", &cv_showlapemblem, 125},
|
{IT_STRING|IT_CVAR, NULL, "Item Roulette Color", &cv_roulettecolor, 120},
|
||||||
{IT_STRING|IT_CVAR, NULL, "Show Cecho Messages", &cv_cechotoggle, 130},
|
|
||||||
|
|
||||||
{IT_STRING|IT_CVAR, NULL, "Show Names on Minimap", &cv_showminimapnames, 140},
|
{IT_STRING|IT_CVAR, NULL, "Show Lap Emblem", &cv_showlapemblem, 130},
|
||||||
{IT_STRING|IT_CVAR, NULL, "Show Finished on Minimap", &cv_showminimapfinished, 145},
|
{IT_STRING|IT_CVAR, NULL, "Show Cecho Messages", &cv_cechotoggle, 135},
|
||||||
{IT_STRING|IT_CVAR, NULL, "Small Minimap Players", &cv_minihead, 150},
|
|
||||||
{IT_STRING|IT_CVAR, NULL, "Spin Minimap Icons", &cv_spinoutroll, 155},
|
|
||||||
{IT_STRING|IT_CVAR, NULL, "Player Angle Visual", &cv_showminimapangle, 160},
|
|
||||||
|
|
||||||
{IT_STRING|IT_CVAR, NULL, "Music Credits", &cv_songcredits, 170},
|
{IT_STRING|IT_CVAR, NULL, "Show Names on Minimap", &cv_showminimapnames, 145},
|
||||||
{IT_STRING|IT_CVAR, NULL, "Music Credits on Pause", &cv_pausesongcredits, 175},
|
{IT_STRING|IT_CVAR, NULL, "Show Finished on Minimap", &cv_showminimapfinished, 150},
|
||||||
|
{IT_STRING|IT_CVAR, NULL, "Small Minimap Players", &cv_minihead, 155},
|
||||||
|
{IT_STRING|IT_CVAR, NULL, "Spin Minimap Icons", &cv_spinoutroll, 160},
|
||||||
|
{IT_STRING|IT_CVAR, NULL, "Player Angle Visual", &cv_showminimapangle, 165},
|
||||||
|
|
||||||
{IT_STRING|IT_CVAR, NULL, "Beta Intermissionscreen", &cv_betainterscreen, 185},
|
{IT_STRING|IT_CVAR, NULL, "Music Credits", &cv_songcredits, 175},
|
||||||
|
{IT_STRING|IT_CVAR, NULL, "Music Credits on Pause", &cv_pausesongcredits, 180},
|
||||||
|
|
||||||
{IT_STRING|IT_CVAR, NULL, "Show Director Prompt", &cv_showdirectorhud, 195},
|
{IT_STRING|IT_CVAR, NULL, "Beta Intermissionscreen", &cv_betainterscreen, 190},
|
||||||
|
|
||||||
{IT_STRING|IT_SUBMENU, NULL, "Nametags...", &OP_NametagDef, 205},
|
{IT_STRING|IT_CVAR, NULL, "Show Director Prompt", &cv_showdirectorhud, 200},
|
||||||
{IT_STRING|IT_SUBMENU, NULL, "Driftgauge...", &OP_DriftGaugeDef, 210},
|
|
||||||
|
|
||||||
{IT_SUBMENU|IT_STRING, NULL, "Hud Offsets...", &OP_HudOffsetDef, 220},
|
{IT_STRING|IT_SUBMENU, NULL, "Nametags...", &OP_NametagDef, 210},
|
||||||
|
{IT_STRING|IT_SUBMENU, NULL, "Driftgauge...", &OP_DriftGaugeDef, 215},
|
||||||
|
|
||||||
|
{IT_SUBMENU|IT_STRING, NULL, "Hud Offsets...", &OP_HudOffsetDef, 225},
|
||||||
};
|
};
|
||||||
|
|
||||||
static const char* OP_SaturnHudTooltips[] =
|
static const char* OP_SaturnHudTooltips[] =
|
||||||
@@ -1888,6 +1971,7 @@ static const char* OP_SaturnHudTooltips[] =
|
|||||||
"Use extra graphics for multiple sneakers, bananas and jawz.",
|
"Use extra graphics for multiple sneakers, bananas and jawz.",
|
||||||
"Change when the item amount is to be displayed.\nMultiple will always display the number.\nWhen you have multiple of the same Item.\nAlways will always display the number regardless of Item amount.",
|
"Change when the item amount is to be displayed.\nMultiple will always display the number.\nWhen you have multiple of the same Item.\nAlways will always display the number regardless of Item amount.",
|
||||||
"Enables an animation while the roulette is active.",
|
"Enables an animation while the roulette is active.",
|
||||||
|
"Changes the way items are colorized in roulette.",
|
||||||
"Show the big 'LAP' text on a lap change.",
|
"Show the big 'LAP' text on a lap change.",
|
||||||
"Show the big Cecho Messages.",
|
"Show the big Cecho Messages.",
|
||||||
"Show player names on the minimap.",
|
"Show player names on the minimap.",
|
||||||
@@ -2497,6 +2581,11 @@ menu_t OP_Joystick2Def = DEFAULTSCROLLSTYLE("M_CONTRO", OP_Joystick2Menu, &OP
|
|||||||
menu_t OP_Joystick3Def = DEFAULTSCROLLSTYLE("M_CONTRO", OP_Joystick3Menu, &OP_AllControlsDef, 30, 36, NULL);
|
menu_t OP_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",
|
||||||
@@ -2588,7 +2677,7 @@ menu_t OP_Player2CamOptionsDef = DEFAULTMENUSTYLE(NULL, OP_Player2CamOptionsMenu
|
|||||||
menu_t OP_Player3CamOptionsDef = DEFAULTMENUSTYLE(NULL, OP_Player3CamOptionsMenu, &OP_CamOptionsDef, 30, 30, OP_PlayerCamOptionsTooltips);
|
menu_t OP_Player3CamOptionsDef = DEFAULTMENUSTYLE(NULL, OP_Player3CamOptionsMenu, &OP_CamOptionsDef, 30, 30, OP_PlayerCamOptionsTooltips);
|
||||||
menu_t OP_Player4CamOptionsDef = DEFAULTMENUSTYLE(NULL, OP_Player4CamOptionsMenu, &OP_CamOptionsDef, 30, 30, OP_PlayerCamOptionsTooltips);
|
menu_t OP_Player4CamOptionsDef = DEFAULTMENUSTYLE(NULL, OP_Player4CamOptionsMenu, &OP_CamOptionsDef, 30, 30, OP_PlayerCamOptionsTooltips);
|
||||||
|
|
||||||
menu_t OP_ChatOptionsDef = DEFAULTMENUSTYLE("M_HUD", OP_ChatOptionsMenu, &OP_HUDOptionsDef, 30, 30, OP_ChatOptionsTooltips);
|
menu_t OP_ChatOptionsDef = DEFAULTSCROLLSTYLE("M_HUD", OP_ChatOptionsMenu, &OP_HUDOptionsDef, 30, 25, OP_ChatOptionsTooltips);
|
||||||
|
|
||||||
menu_t OP_SoundAdvancedDef = DEFAULTSCROLLSTYLE("M_SOUND", OP_SoundAdvancedMenu, &OP_SoundOptionsDef, 30, 30, OP_SoundAdvancedTooltips);
|
menu_t OP_SoundAdvancedDef = DEFAULTSCROLLSTYLE("M_SOUND", OP_SoundAdvancedMenu, &OP_SoundOptionsDef, 30, 30, OP_SoundAdvancedTooltips);
|
||||||
|
|
||||||
@@ -2713,6 +2802,15 @@ void PDistort_menu_Onchange(void)
|
|||||||
OP_PlayerDistortMenu[slrotatedist].status = IT_GRAYEDOUT;
|
OP_PlayerDistortMenu[slrotatedist].status = IT_GRAYEDOUT;
|
||||||
OP_PlayerDistortMenu[saltroll].status = IT_GRAYEDOUT;
|
OP_PlayerDistortMenu[saltroll].status = IT_GRAYEDOUT;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if (cv_stairjank.value)
|
||||||
|
{
|
||||||
|
OP_PlayerDistortMenu[stairjanksfx].status = IT_STRING | IT_CVAR;
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
OP_PlayerDistortMenu[stairjanksfx].status = IT_GRAYEDOUT;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
void Bird_menu_Onchange(void)
|
void Bird_menu_Onchange(void)
|
||||||
|
|||||||
+1
-1
@@ -44,7 +44,7 @@ boolean M_TextInputHandle(textinput_t *input, INT32 key);
|
|||||||
// If currently typing something that looks like an existing emote, return suggestions for it
|
// If currently typing something that looks like an existing emote, return suggestions for it
|
||||||
boolean M_TextInputHandleEmotes(textinput_t *input, INT32 key, emote_autocomplete_t *autocomplete);
|
boolean M_TextInputHandleEmotes(textinput_t *input, INT32 key, emote_autocomplete_t *autocomplete);
|
||||||
|
|
||||||
#define M_DrawTextInput(x, y, input, flags) M_DrawTextInputScroll((x), (y), (input), (flags), ((input)->buffer_size-1)*8)
|
#define M_DrawTextInput(x, y, input, flags) M_DrawTextInputScroll((x), (y), (input), (flags), ((input)->buffer_size-2)*8)
|
||||||
void M_DrawTextInputScroll(INT32 x, INT32 y, textinput_t *input, INT32 flags, INT32 MAXINPUTWIDTH);
|
void M_DrawTextInputScroll(INT32 x, INT32 y, textinput_t *input, INT32 flags, INT32 MAXINPUTWIDTH);
|
||||||
|
|
||||||
#endif
|
#endif
|
||||||
+12
-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 (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;
|
||||||
@@ -872,7 +873,7 @@ void A_PointyThink(void *thing)
|
|||||||
TVector v;
|
TVector v;
|
||||||
TVector *res;
|
TVector *res;
|
||||||
angle_t fa;
|
angle_t fa;
|
||||||
fixed_t radius = FixedMul(actor->info->radius*actor->info->reactiontime, actor->scale);
|
fixed_t radius;
|
||||||
boolean firsttime = true;
|
boolean firsttime = true;
|
||||||
INT32 sign;
|
INT32 sign;
|
||||||
|
|
||||||
@@ -930,6 +931,8 @@ void A_PointyThink(void *thing)
|
|||||||
if (!actor->tracer) // For some reason we do not have spike balls...
|
if (!actor->tracer) // For some reason we do not have spike balls...
|
||||||
return;
|
return;
|
||||||
|
|
||||||
|
radius = FixedMul(actor->info->radius*actor->info->reactiontime, actor->scale);
|
||||||
|
|
||||||
// Position spike balls relative to the value of 'lastlook'.
|
// Position spike balls relative to the value of 'lastlook'.
|
||||||
ball = actor->tracer;
|
ball = actor->tracer;
|
||||||
|
|
||||||
@@ -2759,9 +2762,11 @@ void A_Invincibility(void *thing)
|
|||||||
if (P_IsLocalPlayer(player) && !player->powers[pw_super])
|
if (P_IsLocalPlayer(player) && !player->powers[pw_super])
|
||||||
{
|
{
|
||||||
S_StopMusic();
|
S_StopMusic();
|
||||||
|
|
||||||
if (mariomode)
|
if (mariomode)
|
||||||
G_GhostAddColor((INT32) (player - players), GHC_INVINCIBLE);
|
G_GhostAddColor((INT32) (player - players), GHC_INVINCIBLE);
|
||||||
S_ChangeMusicInternal((mariomode) ? "minvnc" : "invinc", false);
|
|
||||||
|
S_ChangeMusicInternal(mariomode ? "minvnc" : "invinc", false);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -4355,7 +4360,7 @@ void A_MouseThink(void *thing)
|
|||||||
|| (actor->eflags & MFE_VERTICALFLIP && actor->z + actor->height == actor->ceilingz))
|
|| (actor->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;
|
||||||
@@ -10874,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);
|
||||||
@@ -10992,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;
|
||||||
|
|||||||
+14
-9
@@ -845,7 +845,7 @@ void T_BounceCheese(levelspecthink_t *bouncer)
|
|||||||
T_MovePlane(bouncer->sector, 0, bouncer->sector->ceilingheight, 0, 1, -1); // update things on ceiling
|
T_MovePlane(bouncer->sector, 0, bouncer->sector->ceilingheight, 0, 1, -1); // update things on ceiling
|
||||||
T_MovePlane(bouncer->sector, 0, bouncer->sector->floorheight, 0, 0, -1); // update things on floor
|
T_MovePlane(bouncer->sector, 0, bouncer->sector->floorheight, 0, 0, -1); // update things on floor
|
||||||
bouncer->sector->ceilingdata = NULL;
|
bouncer->sector->ceilingdata = NULL;
|
||||||
bouncer->sector->floordata = NULL;;
|
bouncer->sector->floordata = NULL;
|
||||||
bouncer->sector->moved = true;
|
bouncer->sector->moved = true;
|
||||||
P_RemoveThinker(&bouncer->thinker); // remove bouncer from actives
|
P_RemoveThinker(&bouncer->thinker); // remove bouncer from actives
|
||||||
}
|
}
|
||||||
@@ -1107,14 +1107,13 @@ void T_SpikeSector(levelspecthink_t *spikes)
|
|||||||
|
|
||||||
if (affectsec == spikes->sector) // Applied to an actual sector
|
if (affectsec == spikes->sector) // Applied to an actual sector
|
||||||
{
|
{
|
||||||
fixed_t affectfloor = P_GetSpecialBottomZ(thing, affectsec, affectsec);
|
|
||||||
fixed_t affectceil = P_GetSpecialTopZ(thing, affectsec, affectsec);
|
|
||||||
|
|
||||||
if (affectsec->flags & SF_FLIPSPECIAL_FLOOR)
|
if (affectsec->flags & SF_FLIPSPECIAL_FLOOR)
|
||||||
{
|
{
|
||||||
if (!(thing->eflags & MFE_VERTICALFLIP) && thing->momz > 0)
|
if (!(thing->eflags & MFE_VERTICALFLIP) && thing->momz > 0)
|
||||||
continue;
|
continue;
|
||||||
|
|
||||||
|
fixed_t affectfloor = P_GetSpecialBottomZ(thing, affectsec, affectsec);
|
||||||
|
|
||||||
if (thing->z == affectfloor)
|
if (thing->z == affectfloor)
|
||||||
dothepain = true;
|
dothepain = true;
|
||||||
}
|
}
|
||||||
@@ -1124,19 +1123,21 @@ void T_SpikeSector(levelspecthink_t *spikes)
|
|||||||
if ((thing->eflags & MFE_VERTICALFLIP) && thing->momz < 0)
|
if ((thing->eflags & MFE_VERTICALFLIP) && thing->momz < 0)
|
||||||
continue;
|
continue;
|
||||||
|
|
||||||
|
fixed_t affectceil = P_GetSpecialTopZ(thing, affectsec, affectsec);
|
||||||
|
|
||||||
if (thing->z + thing->height == affectceil)
|
if (thing->z + thing->height == affectceil)
|
||||||
dothepain = true;
|
dothepain = true;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
fixed_t affectfloor = P_GetSpecialBottomZ(thing, affectsec, spikes->sector);
|
|
||||||
fixed_t affectceil = P_GetSpecialTopZ(thing, affectsec, spikes->sector);
|
|
||||||
if (affectsec->flags & SF_FLIPSPECIAL_FLOOR)
|
if (affectsec->flags & SF_FLIPSPECIAL_FLOOR)
|
||||||
{
|
{
|
||||||
if (!(thing->eflags & MFE_VERTICALFLIP) && thing->momz > 0)
|
if (!(thing->eflags & MFE_VERTICALFLIP) && thing->momz > 0)
|
||||||
continue;
|
continue;
|
||||||
|
|
||||||
|
fixed_t affectceil = P_GetSpecialTopZ(thing, affectsec, spikes->sector);
|
||||||
|
|
||||||
if (thing->z == affectceil)
|
if (thing->z == affectceil)
|
||||||
dothepain = true;
|
dothepain = true;
|
||||||
}
|
}
|
||||||
@@ -1146,6 +1147,8 @@ void T_SpikeSector(levelspecthink_t *spikes)
|
|||||||
if ((thing->eflags & MFE_VERTICALFLIP) && thing->momz < 0)
|
if ((thing->eflags & MFE_VERTICALFLIP) && thing->momz < 0)
|
||||||
continue;
|
continue;
|
||||||
|
|
||||||
|
fixed_t affectfloor = P_GetSpecialBottomZ(thing, affectsec, spikes->sector);
|
||||||
|
|
||||||
if (thing->z + thing->height == affectfloor)
|
if (thing->z + thing->height == affectfloor)
|
||||||
dothepain = true;
|
dothepain = true;
|
||||||
}
|
}
|
||||||
@@ -1652,6 +1655,7 @@ wegotit:
|
|||||||
static mobj_t *SearchMarioNode(msecnode_t *node)
|
static mobj_t *SearchMarioNode(msecnode_t *node)
|
||||||
{
|
{
|
||||||
mobj_t *thing = NULL;
|
mobj_t *thing = NULL;
|
||||||
|
|
||||||
for (; node; node = node->m_thinglist_next)
|
for (; node; node = node->m_thinglist_next)
|
||||||
{
|
{
|
||||||
// Things which should NEVER be ejected from a MarioBlock, by type.
|
// Things which should NEVER be ejected from a MarioBlock, by type.
|
||||||
@@ -2079,11 +2083,12 @@ void T_EachTimeThinker(levelspecthink_t *eachtime)
|
|||||||
continue;
|
continue;
|
||||||
|
|
||||||
topheight = P_GetSpecialTopZ(players[j].mo, sec, targetsec);
|
topheight = P_GetSpecialTopZ(players[j].mo, sec, targetsec);
|
||||||
bottomheight = P_GetSpecialBottomZ(players[j].mo, sec, targetsec);
|
|
||||||
|
|
||||||
if (players[j].mo->z > topheight)
|
if (players[j].mo->z > topheight)
|
||||||
continue;
|
continue;
|
||||||
|
|
||||||
|
bottomheight = P_GetSpecialBottomZ(players[j].mo, sec, targetsec);
|
||||||
|
|
||||||
if (players[j].mo->z + players[j].mo->height < bottomheight)
|
if (players[j].mo->z + players[j].mo->height < bottomheight)
|
||||||
continue;
|
continue;
|
||||||
|
|
||||||
@@ -2333,7 +2338,7 @@ void T_RaiseSector(levelspecthink_t *raise)
|
|||||||
fixed_t origspeed = raise->vars[3];
|
fixed_t origspeed = raise->vars[3];
|
||||||
|
|
||||||
// Slow down as you get closer to the bottom
|
// Slow down as you get closer to the bottom
|
||||||
raise->vars[3] = FixedMul(raise->vars[3],FixedDiv(raise->sector->ceilingheight - raise->vars[7], (raise->vars[5] - raise->vars[7])>>5));
|
raise->vars[3] = FixedMul(raise->vars[3], FixedDiv(raise->sector->ceilingheight - raise->vars[7], (raise->vars[5] - raise->vars[7])>>5));
|
||||||
|
|
||||||
if (raise->vars[3] <= origspeed/16)
|
if (raise->vars[3] <= origspeed/16)
|
||||||
raise->vars[3] = origspeed/16;
|
raise->vars[3] = origspeed/16;
|
||||||
@@ -2344,7 +2349,7 @@ void T_RaiseSector(levelspecthink_t *raise)
|
|||||||
{
|
{
|
||||||
fixed_t origspeed = raise->vars[3];
|
fixed_t origspeed = raise->vars[3];
|
||||||
// Slow down as you get closer to the top
|
// Slow down as you get closer to the top
|
||||||
raise->vars[3] = FixedMul(raise->vars[3],FixedDiv(raise->vars[5] - raise->sector->ceilingheight, (raise->vars[5] - raise->vars[7])>>5));
|
raise->vars[3] = FixedMul(raise->vars[3], FixedDiv(raise->vars[5] - raise->sector->ceilingheight, (raise->vars[5] - raise->vars[7])>>5));
|
||||||
|
|
||||||
if (raise->vars[3] <= origspeed/16)
|
if (raise->vars[3] <= origspeed/16)
|
||||||
raise->vars[3] = origspeed/16;
|
raise->vars[3] = origspeed/16;
|
||||||
|
|||||||
+120
-96
@@ -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!
|
||||||
@@ -1462,49 +1464,11 @@ boolean P_CheckRacers(void)
|
|||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
/** Kills an object.
|
static void P_UpdateRemovedOrbital(mobj_t *target, mobj_t *inflictor, mobj_t *source)
|
||||||
*
|
|
||||||
* \param target The victim.
|
|
||||||
* \param inflictor The attack weapon. May be NULL (environmental damage).
|
|
||||||
* \param source The attacker. May be NULL.
|
|
||||||
* \todo Cleanup, refactor, split up.
|
|
||||||
* \sa P_DamageMobj
|
|
||||||
*/
|
|
||||||
void P_KillMobj(mobj_t *target, mobj_t *inflictor, mobj_t *source)
|
|
||||||
{
|
{
|
||||||
mobjtype_t item;
|
|
||||||
mobj_t *mo;
|
|
||||||
int ms;
|
|
||||||
|
|
||||||
if (target->flags & (MF_ENEMY|MF_BOSS))
|
|
||||||
target->momx = target->momy = target->momz = 0;
|
|
||||||
|
|
||||||
// SRB2kart
|
|
||||||
if (target->type != MT_PLAYER && !(target->flags & MF_MONITOR)
|
|
||||||
&& !(target->type == MT_ORBINAUT || target->type == MT_ORBINAUT_SHIELD
|
|
||||||
|| target->type == MT_JAWZ || target->type == MT_JAWZ_DUD || target->type == MT_JAWZ_SHIELD
|
|
||||||
|| target->type == MT_BANANA || target->type == MT_BANANA_SHIELD
|
|
||||||
|| target->type == MT_EGGMANITEM || target->type == MT_EGGMANITEM_SHIELD
|
|
||||||
|| target->type == MT_BALLHOG || target->type == MT_SPB)) // kart dead items
|
|
||||||
target->flags |= MF_NOGRAVITY; // Don't drop Tails 03-08-2000
|
|
||||||
else
|
|
||||||
target->flags &= ~MF_NOGRAVITY; // lose it if you for whatever reason have it, I'm looking at you shields
|
|
||||||
//
|
|
||||||
|
|
||||||
if (target->flags2 & MF2_NIGHTSPULL)
|
|
||||||
P_SetTarget(&target->tracer, NULL);
|
|
||||||
|
|
||||||
// dead target is no more shootable
|
|
||||||
target->flags &= ~(MF_SHOOTABLE|MF_FLOAT|MF_SPECIAL);
|
|
||||||
target->flags2 &= ~(MF2_SKULLFLY|MF2_NIGHTSPULL);
|
|
||||||
target->health = 0; // This makes it easy to check if something's dead elsewhere.
|
|
||||||
|
|
||||||
if (LUA_HookMobjDeath(target, inflictor, source) || P_MobjWasRemoved(target))
|
|
||||||
return;
|
|
||||||
|
|
||||||
// SRB2kart
|
// SRB2kart
|
||||||
// I wish I knew a better way to do this
|
// I wish I knew a better way to do this
|
||||||
if (target->target && target->target->player && target->target->player->mo)
|
if (!P_MobjWasRemovedCompat(target->target) && target->target->player && !P_MobjWasRemovedCompat(target->target->player->mo))
|
||||||
{
|
{
|
||||||
if (target->target->player->kartstuff[k_eggmanheld] && target->type == MT_EGGMANITEM_SHIELD)
|
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;
|
||||||
@@ -1517,7 +1481,7 @@ void P_KillMobj(mobj_t *target, mobj_t *inflictor, mobj_t *source)
|
|||||||
{
|
{
|
||||||
if (target->movedir != 0 && target->movedir < (UINT16)target->target->player->kartstuff[k_itemamount])
|
if (target->movedir != 0 && target->movedir < (UINT16)target->target->player->kartstuff[k_itemamount])
|
||||||
{
|
{
|
||||||
if (target->target->hnext)
|
if (!P_MobjWasRemovedCompat(target->target->hnext))
|
||||||
K_KillBananaChain(target->target->hnext, inflictor, source);
|
K_KillBananaChain(target->target->hnext, inflictor, source);
|
||||||
|
|
||||||
target->target->player->kartstuff[k_itemamount] = 0;
|
target->target->player->kartstuff[k_itemamount] = 0;
|
||||||
@@ -1546,14 +1510,60 @@ void P_KillMobj(mobj_t *target, mobj_t *inflictor, mobj_t *source)
|
|||||||
P_SetTarget(&target->target->hnext, NULL);
|
P_SetTarget(&target->target->hnext, NULL);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
// Above block does not clean up rocket sneakers when a player dies, so we need to do it here target->target is null when using rocket sneakers
|
}
|
||||||
|
|
||||||
|
|
||||||
|
/** Kills an object.
|
||||||
|
*
|
||||||
|
* \param target The victim.
|
||||||
|
* \param inflictor The attack weapon. May be NULL (environmental damage).
|
||||||
|
* \param source The attacker. May be NULL.
|
||||||
|
* \todo Cleanup, refactor, split up.
|
||||||
|
* \sa P_DamageMobj
|
||||||
|
*/
|
||||||
|
void P_KillMobj(mobj_t *target, mobj_t *inflictor, mobj_t *source)
|
||||||
|
{
|
||||||
|
mobjtype_t item;
|
||||||
|
mobj_t *mo;
|
||||||
|
int ms;
|
||||||
|
|
||||||
|
if (target->flags & (MF_ENEMY|MF_BOSS))
|
||||||
|
target->momx = target->momy = target->momz = 0;
|
||||||
|
|
||||||
|
// SRB2kart
|
||||||
|
if (target->type != MT_PLAYER
|
||||||
|
&& !(target->flags & MF_MONITOR)
|
||||||
|
&& !(target->type == MT_ORBINAUT || target->type == MT_ORBINAUT_SHIELD
|
||||||
|
|| target->type == MT_JAWZ || target->type == MT_JAWZ_DUD || target->type == MT_JAWZ_SHIELD
|
||||||
|
|| target->type == MT_BANANA || target->type == MT_BANANA_SHIELD
|
||||||
|
|| target->type == MT_EGGMANITEM || target->type == MT_EGGMANITEM_SHIELD
|
||||||
|
|| target->type == MT_BALLHOG || target->type == MT_SPB)) // kart dead items
|
||||||
|
target->flags |= MF_NOGRAVITY; // Don't drop Tails 03-08-2000
|
||||||
|
else
|
||||||
|
target->flags &= ~MF_NOGRAVITY; // lose it if you for whatever reason have it, I'm looking at you shields
|
||||||
|
//
|
||||||
|
|
||||||
|
if (target->flags2 & MF2_NIGHTSPULL)
|
||||||
|
P_SetTarget(&target->tracer, NULL);
|
||||||
|
|
||||||
|
// dead target is no more shootable
|
||||||
|
target->flags &= ~(MF_SHOOTABLE|MF_FLOAT|MF_SPECIAL);
|
||||||
|
target->flags2 &= ~(MF2_SKULLFLY|MF2_NIGHTSPULL);
|
||||||
|
target->health = 0; // This makes it easy to check if something's dead elsewhere.
|
||||||
|
|
||||||
|
if (LUA_HookMobjDeath(target, inflictor, source) || P_MobjWasRemoved(target))
|
||||||
|
return;
|
||||||
|
|
||||||
|
P_UpdateRemovedOrbital(target, inflictor, source);
|
||||||
|
|
||||||
if (target->player)
|
if (target->player)
|
||||||
|
{
|
||||||
|
// Above block does not clean up rocket sneakers when a player dies, so we need to do it here target->target is null when using rocket sneakers
|
||||||
K_DropRocketSneaker(target->player);
|
K_DropRocketSneaker(target->player);
|
||||||
|
|
||||||
// Let EVERYONE know what happened to a player! 01-29-2002 Tails
|
// Let EVERYONE know what happened to a player! 01-29-2002 Tails
|
||||||
if (target->player && !target->player->spectator)
|
if (!target->player->spectator)
|
||||||
{
|
target->flags2 &= ~MF2_DONTDRAW;
|
||||||
target->flags2 &= ~MF2_DONTDRAW;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
// if killed by a player
|
// if killed by a player
|
||||||
@@ -1563,6 +1573,7 @@ void P_KillMobj(mobj_t *target, mobj_t *inflictor, mobj_t *source)
|
|||||||
{
|
{
|
||||||
P_SetTarget(&target->target, source);
|
P_SetTarget(&target->target, source);
|
||||||
source->player->numboxes++;
|
source->player->numboxes++;
|
||||||
|
|
||||||
if (cv_itemrespawn.value && (netgame || multiplayer))
|
if (cv_itemrespawn.value && (netgame || multiplayer))
|
||||||
{
|
{
|
||||||
target->fuse = cv_itemrespawntime.value*TICRATE + 2; // Random box generation
|
target->fuse = cv_itemrespawntime.value*TICRATE + 2; // Random box generation
|
||||||
@@ -1580,35 +1591,41 @@ void P_KillMobj(mobj_t *target, mobj_t *inflictor, mobj_t *source)
|
|||||||
|
|
||||||
target->player->playerstate = PST_DEAD;
|
target->player->playerstate = PST_DEAD;
|
||||||
|
|
||||||
if (cv_fading.value && P_IsLocalPlayer(target->player))
|
if (P_IsLocalPlayer(target->player))
|
||||||
{
|
{
|
||||||
if (netgame || multiplayer)
|
if (cv_fading.value)
|
||||||
ms = cv_respawntime.value * 1000;
|
{
|
||||||
else
|
if (netgame || multiplayer)
|
||||||
ms = 1000;
|
ms = cv_respawntime.value * 1000;
|
||||||
|
else
|
||||||
|
ms = 1000;
|
||||||
|
|
||||||
/*
|
/*
|
||||||
If the time spent with the music paused is less than half
|
* If the time spent with the music paused is less than half
|
||||||
a second, continue playing the song (just mute it).
|
* a second, continue playing the song (just mute it).
|
||||||
*/
|
*/
|
||||||
if ((ms - cv_respawnfademusicout.value) < 500)
|
if ((ms - cv_respawnfademusicout.value) < 500)
|
||||||
S_FadeMusic(0, cv_respawnfademusicout.value);
|
S_FadeMusic(0, cv_respawnfademusicout.value);
|
||||||
else
|
else
|
||||||
S_FadeOutStopMusic(cv_respawnfademusicout.value);
|
S_FadeOutStopMusic(cv_respawnfademusicout.value);
|
||||||
}
|
}
|
||||||
|
|
||||||
for (UINT8 i = 0; i <= splitscreen; i++)
|
if (target->player == &players[consoleplayer])
|
||||||
{
|
|
||||||
if (target->player == P_GetLocalPlayerForNum(i))
|
|
||||||
{
|
{
|
||||||
// don't die in auto map,
|
// don't die in auto map,
|
||||||
// switch view prior to dying
|
// switch view prior to dying
|
||||||
if (i == 0 && automapactive)
|
if (automapactive)
|
||||||
AM_Stop();
|
AM_Stop();
|
||||||
|
}
|
||||||
|
|
||||||
// added : 22-02-98: recenter view for next life...
|
for (UINT8 i = 0; i <= splitscreen; i++)
|
||||||
localaiming[i] = 0;
|
{
|
||||||
break;
|
if (target->player == P_GetLocalPlayerForNum(i))
|
||||||
|
{
|
||||||
|
// added : 22-02-98: recenter view for next life...
|
||||||
|
localaiming[i] = 0;
|
||||||
|
break;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -1624,7 +1641,7 @@ void P_KillMobj(mobj_t *target, mobj_t *inflictor, mobj_t *source)
|
|||||||
// Drop stuff.
|
// Drop stuff.
|
||||||
// This determines the kind of object spawned
|
// This determines the kind of object spawned
|
||||||
// during the death frame of a thing.
|
// during the death frame of a thing.
|
||||||
if (!mariomode // Don't show birds, etc. in Mario Mode Tails 12-23-2001
|
if (LIKELY(!mariomode) // Don't show birds, etc. in Mario Mode Tails 12-23-2001
|
||||||
&& target->flags & MF_ENEMY)
|
&& target->flags & MF_ENEMY)
|
||||||
{
|
{
|
||||||
if (cv_soniccd.value)
|
if (cv_soniccd.value)
|
||||||
@@ -1678,7 +1695,7 @@ void P_KillMobj(mobj_t *target, mobj_t *inflictor, mobj_t *source)
|
|||||||
else
|
else
|
||||||
prandom = P_RandomKey(5); // No placable object, just use a random number.
|
prandom = P_RandomKey(5); // No placable object, just use a random number.
|
||||||
|
|
||||||
switch(prandom)
|
switch (prandom)
|
||||||
{
|
{
|
||||||
default: item = MT_BUNNY; break;
|
default: item = MT_BUNNY; break;
|
||||||
case 1: item = MT_BIRD; break;
|
case 1: item = MT_BIRD; break;
|
||||||
@@ -2222,18 +2239,24 @@ boolean P_DamageMobj(mobj_t *target, mobj_t *inflictor, mobj_t *source, INT32 da
|
|||||||
return false;
|
return false;
|
||||||
|
|
||||||
// well no clue but this may happen ig
|
// well no clue but this may happen ig
|
||||||
if (!target || (target->health <= 0))
|
if (P_MobjWasRemovedCompat(target))
|
||||||
|
return false;
|
||||||
|
|
||||||
|
if (target->health <= 0)
|
||||||
return false;
|
return false;
|
||||||
|
|
||||||
// Spectator handling
|
// Spectator handling
|
||||||
if (netgame)
|
if (netgame)
|
||||||
{
|
{
|
||||||
if (damage == DMG_SPECTATOR && target->player && target->player->spectator)
|
if (target->player && target->player->spectator)
|
||||||
damage = DMG_INSTAKILL;
|
{
|
||||||
else if (target->player && target->player->spectator)
|
if (damage == DMG_SPECTATOR)
|
||||||
return false;
|
damage = DMG_INSTAKILL;
|
||||||
|
else
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
if (source && source->player && source->player->spectator)
|
if (!P_MobjWasRemovedCompat(source) && source->player && source->player->spectator)
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -2327,16 +2350,17 @@ 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)
|
||||||
{
|
{
|
||||||
if (source == target)
|
if (source == target)
|
||||||
return false; // Don't hit yourself with your own paraloop, baka
|
return false; // Don't hit yourself with your own paraloop, baka
|
||||||
|
|
||||||
if (source && source->player && !cv_friendlyfire.value
|
if (source && source->player && !cv_friendlyfire.value
|
||||||
&& (gametype == GT_COOP
|
&& (gametype == GT_COOP
|
||||||
|| (G_GametypeHasTeams() && target->player->ctfteam == source->player->ctfteam)))
|
|| (G_GametypeHasTeams() && target->player->ctfteam == source->player->ctfteam)))
|
||||||
@@ -2386,7 +2410,7 @@ boolean P_DamageMobj(mobj_t *target, mobj_t *inflictor, mobj_t *source, INT32 da
|
|||||||
|
|
||||||
else if (player->kartstuff[k_invincibilitytimer] > 0 || player->kartstuff[k_growshrinktimer] > 0 || player->powers[pw_flashing])
|
else if (player->kartstuff[k_invincibilitytimer] > 0 || player->kartstuff[k_growshrinktimer] > 0 || player->powers[pw_flashing])
|
||||||
{
|
{
|
||||||
if (!force) // shoulddamage bypasses all of that.
|
if (!force) // shoulddamage bypasses all of that.
|
||||||
{
|
{
|
||||||
K_DoInstashield(player);
|
K_DoInstashield(player);
|
||||||
return false;
|
return false;
|
||||||
@@ -2575,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);
|
||||||
@@ -2599,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;
|
||||||
@@ -2706,7 +2730,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);
|
||||||
@@ -2790,7 +2814,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);
|
||||||
@@ -2906,7 +2930,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;
|
||||||
@@ -2963,7 +2987,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
-3
@@ -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
|
||||||
@@ -99,7 +103,6 @@ typedef struct camera_s
|
|||||||
// Hold up/down to pan the camera vertically
|
// Hold up/down to pan the camera vertically
|
||||||
SINT8 dpad_y_held;
|
SINT8 dpad_y_held;
|
||||||
|
|
||||||
|
|
||||||
// Camera demobjerization
|
// Camera demobjerization
|
||||||
// Info for drawing: position.
|
// Info for drawing: position.
|
||||||
fixed_t x, y, z;
|
fixed_t x, y, z;
|
||||||
@@ -288,6 +291,17 @@ FUNCINLINE static ATTRINLINE boolean P_MobjWasRemoved(const mobj_t *mobj)
|
|||||||
return (!mobj || mobj->thinker.function != (actionf_p1)P_MobjThinker);
|
return (!mobj || mobj->thinker.function != (actionf_p1)P_MobjThinker);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// stupid, but kart allows mobjs that are marked to be removed to be accessed and modified in many cases
|
||||||
|
// so can only check if its not NULL in vanilla compat mode
|
||||||
|
FUNCINLINE static ATTRINLINE boolean P_MobjWasRemovedCompat(const mobj_t *mobj)
|
||||||
|
{
|
||||||
|
#ifdef COMPAT_VANILLA
|
||||||
|
return (!mobj);
|
||||||
|
#else
|
||||||
|
return P_MobjWasRemoved(mobj);
|
||||||
|
#endif
|
||||||
|
}
|
||||||
|
|
||||||
fixed_t P_MobjFloorZ(mobj_t *mobj, sector_t *sector, sector_t *boundsec, fixed_t x, fixed_t y, line_t *line, boolean lowest, boolean perfect);
|
fixed_t P_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)
|
||||||
|
|||||||
+143
-43
@@ -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)
|
||||||
{
|
{
|
||||||
@@ -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;
|
||||||
@@ -719,11 +730,11 @@ static boolean PIT_CheckThing(mobj_t *thing)
|
|||||||
if (thing->type != MT_PLAYER)
|
if (thing->type != MT_PLAYER)
|
||||||
return true;
|
return true;
|
||||||
|
|
||||||
if (thing->player && thing->player->powers[pw_flashing])
|
if (thing->player)
|
||||||
return true;
|
|
||||||
|
|
||||||
if (thing->type == MT_PLAYER && thing->player)
|
|
||||||
{
|
{
|
||||||
|
if (thing->player->powers[pw_flashing])
|
||||||
|
return true;
|
||||||
|
|
||||||
if (tmthing->state == &states[S_MINEEXPLOSION1])
|
if (tmthing->state == &states[S_MINEEXPLOSION1])
|
||||||
K_ExplodePlayer(thing->player, tmthing->target, tmthing);
|
K_ExplodePlayer(thing->player, tmthing->target, tmthing);
|
||||||
else
|
else
|
||||||
@@ -1077,6 +1088,7 @@ static boolean PIT_CheckThing(mobj_t *thing)
|
|||||||
thing->momy -= FixedMul(PUSHACCEL, thing->scale);
|
thing->momy -= FixedMul(PUSHACCEL, thing->scale);
|
||||||
tmthing->momy += FixedMul(PUSHACCEL, thing->scale);
|
tmthing->momy += FixedMul(PUSHACCEL, thing->scale);
|
||||||
}
|
}
|
||||||
|
|
||||||
if (tmthing->momx > 0 && tmthing->momx > FixedMul(4*FRACUNIT, thing->scale)
|
if (tmthing->momx > 0 && tmthing->momx > FixedMul(4*FRACUNIT, thing->scale)
|
||||||
&& tmthing->momx > thing->momx)
|
&& tmthing->momx > thing->momx)
|
||||||
{
|
{
|
||||||
@@ -1094,6 +1106,7 @@ static boolean PIT_CheckThing(mobj_t *thing)
|
|||||||
thing->momx = FixedMul(thing->info->speed, thing->scale);
|
thing->momx = FixedMul(thing->info->speed, thing->scale);
|
||||||
else if (thing->momx < -FixedMul(thing->info->speed, thing->scale))
|
else if (thing->momx < -FixedMul(thing->info->speed, thing->scale))
|
||||||
thing->momx = -FixedMul(thing->info->speed, thing->scale);
|
thing->momx = -FixedMul(thing->info->speed, thing->scale);
|
||||||
|
|
||||||
if (thing->momy > FixedMul(thing->info->speed, thing->scale))
|
if (thing->momy > FixedMul(thing->info->speed, thing->scale))
|
||||||
thing->momy = FixedMul(thing->info->speed, thing->scale);
|
thing->momy = FixedMul(thing->info->speed, thing->scale);
|
||||||
else if (thing->momy < -FixedMul(thing->info->speed, thing->scale))
|
else if (thing->momy < -FixedMul(thing->info->speed, thing->scale))
|
||||||
@@ -1105,6 +1118,7 @@ static boolean PIT_CheckThing(mobj_t *thing)
|
|||||||
tmthing->momx = FixedMul(4*FRACUNIT, thing->scale);
|
tmthing->momx = FixedMul(4*FRACUNIT, thing->scale);
|
||||||
else if (tmthing->momx < FixedMul(-4*FRACUNIT, thing->scale))
|
else if (tmthing->momx < FixedMul(-4*FRACUNIT, thing->scale))
|
||||||
tmthing->momx = FixedMul(-4*FRACUNIT, thing->scale);
|
tmthing->momx = FixedMul(-4*FRACUNIT, thing->scale);
|
||||||
|
|
||||||
if (tmthing->momy > FixedMul(4*FRACUNIT, thing->scale))
|
if (tmthing->momy > FixedMul(4*FRACUNIT, thing->scale))
|
||||||
tmthing->momy = FixedMul(4*FRACUNIT, thing->scale);
|
tmthing->momy = FixedMul(4*FRACUNIT, thing->scale);
|
||||||
else if (tmthing->momy < FixedMul(-4*FRACUNIT, thing->scale))
|
else if (tmthing->momy < FixedMul(-4*FRACUNIT, thing->scale))
|
||||||
@@ -1126,6 +1140,7 @@ static boolean PIT_CheckThing(mobj_t *thing)
|
|||||||
P_TouchSpecialThing(thing, tmthing, true); // can remove thing
|
P_TouchSpecialThing(thing, tmthing, true); // can remove thing
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
// check again for special pickup
|
// check again for special pickup
|
||||||
if (tmthing->flags & MF_SPECIAL && thing->player)
|
if (tmthing->flags & MF_SPECIAL && thing->player)
|
||||||
{
|
{
|
||||||
@@ -1575,13 +1590,13 @@ static boolean PIT_CheckLine(line_t *ld)
|
|||||||
tmbbox[BOXLEFT] >= ld->bbox[BOXRIGHT] ||
|
tmbbox[BOXLEFT] >= ld->bbox[BOXRIGHT] ||
|
||||||
tmbbox[BOXTOP] <= ld->bbox[BOXBOTTOM] ||
|
tmbbox[BOXTOP] <= ld->bbox[BOXBOTTOM] ||
|
||||||
tmbbox[BOXBOTTOM] >= ld->bbox[BOXTOP])
|
tmbbox[BOXBOTTOM] >= ld->bbox[BOXTOP])
|
||||||
return true;
|
return true; // didn't hit it
|
||||||
|
|
||||||
if (ld->polyobj && !(ld->polyobj->flags & POF_SOLID))
|
if (ld->polyobj && !(ld->polyobj->flags & POF_SOLID))
|
||||||
return true;
|
return true;
|
||||||
|
|
||||||
if (P_BoxOnLineSide(tmbbox, ld) != -1)
|
if (P_BoxOnLineSide(tmbbox, ld) != -1)
|
||||||
return true;
|
return true; // didn't hit it
|
||||||
|
|
||||||
if (tmthing->flags & MF_PAPERCOLLISION) // Caution! Turning whilst up against a wall will get you stuck. You probably shouldn't give the player this flag.
|
if (tmthing->flags & MF_PAPERCOLLISION) // Caution! Turning whilst up against a wall will get you stuck. You probably shouldn't give the player this flag.
|
||||||
{
|
{
|
||||||
@@ -1813,14 +1828,14 @@ boolean P_CheckPosition(mobj_t *thing, fixed_t x, fixed_t y)
|
|||||||
delta1 = abs(thing->z - midheight);
|
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)))
|
||||||
{
|
{
|
||||||
@@ -1875,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;
|
||||||
@@ -2121,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;
|
||||||
@@ -2371,8 +2385,10 @@ boolean P_TryMove(mobj_t *thing, fixed_t x, fixed_t y, boolean allowdropoff)
|
|||||||
fixed_t tryx = thing->x;
|
fixed_t tryx = thing->x;
|
||||||
fixed_t tryy = thing->y;
|
fixed_t tryy = thing->y;
|
||||||
fixed_t radius = thing->radius;
|
fixed_t radius = thing->radius;
|
||||||
fixed_t thingtop ;//= thing->z + thing->height;
|
fixed_t thingtop;//= thing->z + thing->height;
|
||||||
fixed_t startingonground = P_IsObjectOnGround(thing);
|
fixed_t startingonground = P_IsObjectOnGround(thing);
|
||||||
|
fixed_t stairjank = 0;
|
||||||
|
pslope_t *oldslope = thing->standingslope;
|
||||||
INT32 special = -1;
|
INT32 special = -1;
|
||||||
floatok = false;
|
floatok = false;
|
||||||
|
|
||||||
@@ -2422,7 +2438,7 @@ boolean P_TryMove(mobj_t *thing, fixed_t x, fixed_t y, boolean allowdropoff)
|
|||||||
|
|
||||||
if (thing->player)
|
if (thing->player)
|
||||||
{
|
{
|
||||||
if (special == -1)
|
if (special == -1) // this should use the target coords not the ones were started with, but cant fix that for compat reasons!
|
||||||
special = GETSECSPECIAL(R_PointInSubsector(x, y)->sector->special, 1);
|
special = GETSECSPECIAL(R_PointInSubsector(x, y)->sector->special, 1);
|
||||||
|
|
||||||
// If using type Section1:13, double the maxstep.
|
// If using type Section1:13, double the maxstep.
|
||||||
@@ -2446,11 +2462,19 @@ boolean P_TryMove(mobj_t *thing, fixed_t x, fixed_t y, boolean allowdropoff)
|
|||||||
|
|
||||||
thingtop = thing->z + thing->height;
|
thingtop = thing->z + thing->height;
|
||||||
|
|
||||||
|
const boolean flipped =
|
||||||
|
(thing->eflags & MFE_VERTICALFLIP) != 0;
|
||||||
|
|
||||||
// Step up
|
// Step up
|
||||||
if (thing->z < tmfloorz)
|
if (thing->z < tmfloorz)
|
||||||
{
|
{
|
||||||
if (tmfloorz - thing->z <= maxstep)
|
if (tmfloorz - thing->z <= maxstep)
|
||||||
{
|
{
|
||||||
|
if (maxstep > 0 && !flipped)
|
||||||
|
{
|
||||||
|
stairjank = (tmfloorz - thing->z);
|
||||||
|
}
|
||||||
|
|
||||||
thing->z = thing->floorz = tmfloorz;
|
thing->z = thing->floorz = tmfloorz;
|
||||||
thing->eflags |= MFE_JUSTSTEPPEDDOWN;
|
thing->eflags |= MFE_JUSTSTEPPEDDOWN;
|
||||||
}
|
}
|
||||||
@@ -2463,6 +2487,11 @@ boolean P_TryMove(mobj_t *thing, fixed_t x, fixed_t y, boolean allowdropoff)
|
|||||||
{
|
{
|
||||||
if (thingtop - tmceilingz <= maxstep)
|
if (thingtop - tmceilingz <= maxstep)
|
||||||
{
|
{
|
||||||
|
if (maxstep > 0 && flipped)
|
||||||
|
{
|
||||||
|
stairjank = (thingtop - tmceilingz);
|
||||||
|
}
|
||||||
|
|
||||||
thing->z = ( thing->ceilingz = tmceilingz ) - thing->height;
|
thing->z = ( thing->ceilingz = tmceilingz ) - thing->height;
|
||||||
thing->eflags |= MFE_JUSTSTEPPEDDOWN;
|
thing->eflags |= MFE_JUSTSTEPPEDDOWN;
|
||||||
}
|
}
|
||||||
@@ -2479,11 +2508,21 @@ boolean P_TryMove(mobj_t *thing, fixed_t x, fixed_t y, boolean allowdropoff)
|
|||||||
|
|
||||||
if (thingtop == thing->ceilingz && tmceilingz > thingtop && tmceilingz - thingtop <= maxstep)
|
if (thingtop == thing->ceilingz && tmceilingz > thingtop && tmceilingz - thingtop <= maxstep)
|
||||||
{
|
{
|
||||||
|
if (flipped)
|
||||||
|
{
|
||||||
|
stairjank = (tmceilingz - thingtop);
|
||||||
|
}
|
||||||
|
|
||||||
thing->z = (thing->ceilingz = tmceilingz) - thing->height;
|
thing->z = (thing->ceilingz = tmceilingz) - thing->height;
|
||||||
thing->eflags |= MFE_JUSTSTEPPEDDOWN;
|
thing->eflags |= MFE_JUSTSTEPPEDDOWN;
|
||||||
}
|
}
|
||||||
else if (thing->z == thing->floorz && tmfloorz < thing->z && thing->z - tmfloorz <= maxstep)
|
else if (thing->z == thing->floorz && tmfloorz < thing->z && thing->z - tmfloorz <= maxstep)
|
||||||
{
|
{
|
||||||
|
if (!flipped)
|
||||||
|
{
|
||||||
|
stairjank = (thing->z - tmfloorz);
|
||||||
|
}
|
||||||
|
|
||||||
thing->z = thing->floorz = tmfloorz;
|
thing->z = thing->floorz = tmfloorz;
|
||||||
thing->eflags |= MFE_JUSTSTEPPEDDOWN;
|
thing->eflags |= MFE_JUSTSTEPPEDDOWN;
|
||||||
}
|
}
|
||||||
@@ -2559,6 +2598,26 @@ boolean P_TryMove(mobj_t *thing, fixed_t x, fixed_t y, boolean allowdropoff)
|
|||||||
else // don't set standingslope if you're not going to clip against it
|
else // don't set standingslope if you're not going to clip against it
|
||||||
thing->standingslope = NULL;
|
thing->standingslope = NULL;
|
||||||
|
|
||||||
|
/* FIXME: slope step down (even up) has some false
|
||||||
|
positives, so just ignore them entirely. */
|
||||||
|
if (stairjank && !oldslope && !thing->standingslope && thing->player && !thing->player->spectator)
|
||||||
|
{
|
||||||
|
/* use a shorter sound if not two tics have passed
|
||||||
|
* since the last step */
|
||||||
|
//S_ReducedVFXSound(thing, (thing->player->stairjank >= 16 ? sfx_s23b : sfx_s268), NULL);
|
||||||
|
//S_StartSound(thing, (thing->player->stairjank >= 16 ? sfx_s23b : sfx_s268));
|
||||||
|
// sound does not work out all that well for kart maps
|
||||||
|
|
||||||
|
// best i can do...
|
||||||
|
if (cv_stairjank.value && cv_stairjanksfx.value)
|
||||||
|
S_StartSoundAtVolume(thing, (thing->player->stairjank >= 8 ? sfx_s23b : sfx_s268), 192); // dont blast this at full volume lul
|
||||||
|
|
||||||
|
// Can't spawn things during P_TryMove, because global variables :)
|
||||||
|
|
||||||
|
thing->player->stairjank = 9;
|
||||||
|
//thing->player->stairjank = 17;
|
||||||
|
}
|
||||||
|
|
||||||
thing->x = x;
|
thing->x = x;
|
||||||
thing->y = y;
|
thing->y = y;
|
||||||
|
|
||||||
@@ -2609,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
|
||||||
@@ -3104,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.
|
||||||
@@ -3140,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
|
||||||
|
|
||||||
@@ -3188,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;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -3200,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.
|
||||||
@@ -3219,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;
|
||||||
@@ -3271,8 +3347,11 @@ stairstep:
|
|||||||
goto retry;
|
goto retry;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if (P_MobjWasRemovedCompat(mo))
|
||||||
|
return;
|
||||||
|
|
||||||
success = true;
|
success = true;
|
||||||
} while(tmxmove || tmymove);
|
} while (tmxmove || tmymove);
|
||||||
}
|
}
|
||||||
|
|
||||||
//
|
//
|
||||||
@@ -3285,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);
|
||||||
@@ -3379,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);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -3396,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);
|
||||||
@@ -3412,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
|
||||||
|
|
||||||
@@ -3470,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.
|
||||||
@@ -3544,6 +3643,12 @@ static boolean PIT_RadiusAttack(mobj_t *thing)
|
|||||||
if (thing->flags & MF_MONITOR)
|
if (thing->flags & MF_MONITOR)
|
||||||
return true;
|
return true;
|
||||||
|
|
||||||
|
if (thing->floorz > bombspot->z && bombspot->ceilingz < thing->z)
|
||||||
|
return true;
|
||||||
|
|
||||||
|
if (thing->ceilingz < bombspot->z && bombspot->floorz > thing->z)
|
||||||
|
return true;
|
||||||
|
|
||||||
dx = abs(thing->x - bombspot->x);
|
dx = abs(thing->x - bombspot->x);
|
||||||
dy = abs(thing->y - bombspot->y);
|
dy = abs(thing->y - bombspot->y);
|
||||||
dz = abs(thing->z + (thing->height>>1) - bombspot->z);
|
dz = abs(thing->z + (thing->height>>1) - bombspot->z);
|
||||||
@@ -3557,14 +3662,9 @@ static boolean PIT_RadiusAttack(mobj_t *thing)
|
|||||||
if (dist >= bombdamage)
|
if (dist >= bombdamage)
|
||||||
return true; // out of range
|
return true; // out of range
|
||||||
|
|
||||||
if (thing->floorz > bombspot->z && bombspot->ceilingz < thing->z)
|
// must be in direct path
|
||||||
return true;
|
|
||||||
|
|
||||||
if (thing->ceilingz < bombspot->z && bombspot->floorz > thing->z)
|
|
||||||
return true;
|
|
||||||
|
|
||||||
if (P_CheckSight(thing, bombspot))
|
if (P_CheckSight(thing, bombspot))
|
||||||
{ // must be in direct path
|
{
|
||||||
P_DamageMobj(thing, bombspot, bombsource, 1); // Tails 01-11-2001
|
P_DamageMobj(thing, bombspot, bombsource, 1); // Tails 01-11-2001
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -3666,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)
|
||||||
{
|
{
|
||||||
@@ -4124,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!");
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -4176,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;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
+38
-17
@@ -242,7 +242,7 @@ void P_CameraLineOpening(line_t *linedef)
|
|||||||
sector_t *back;
|
sector_t *back;
|
||||||
fixed_t frontfloor, frontceiling, backfloor, backceiling;
|
fixed_t frontfloor, frontceiling, backfloor, backceiling;
|
||||||
|
|
||||||
if (linedef->sidenum[1] == 0xffff)
|
if (linedef->sidenum[1] == NO_INDEX)
|
||||||
{
|
{
|
||||||
// single sided line
|
// single sided line
|
||||||
openrange = 0;
|
openrange = 0;
|
||||||
@@ -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;
|
||||||
@@ -398,7 +402,7 @@ void P_LineOpening(line_t *linedef, mobj_t *mobj)
|
|||||||
{
|
{
|
||||||
sector_t *front, *back;
|
sector_t *front, *back;
|
||||||
|
|
||||||
if (linedef->sidenum[1] == 0xffff)
|
if (linedef->sidenum[1] == NO_INDEX)
|
||||||
{
|
{
|
||||||
// single sided line
|
// single sided line
|
||||||
openrange = 0;
|
openrange = 0;
|
||||||
@@ -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
|
||||||
}
|
}
|
||||||
@@ -972,6 +986,10 @@ boolean P_BlockLinesIterator(INT32 x, INT32 y, boolean (*func)(line_t *))
|
|||||||
// First index is really empty, so +1 it.
|
// First index is really empty, so +1 it.
|
||||||
for (list = blockmaplump + offset + 1; *list != -1; list++)
|
for (list = blockmaplump + offset + 1; *list != -1; list++)
|
||||||
{
|
{
|
||||||
|
#ifdef RANGECHECK
|
||||||
|
if (*list < 0 || (UINT32)*list >= numlines)
|
||||||
|
I_Error("P_BlockLinesIterator: index >= numlines");
|
||||||
|
#endif
|
||||||
ld = &lines[*list];
|
ld = &lines[*list];
|
||||||
|
|
||||||
if (ld->validcount == validcount)
|
if (ld->validcount == validcount)
|
||||||
@@ -1000,11 +1018,13 @@ boolean P_BlockThingsIterator(INT32 x, INT32 y, boolean (*func)(mobj_t *))
|
|||||||
for (mobj = blocklinks[y*bmapwidth + x]; mobj; mobj = bnext)
|
for (mobj = blocklinks[y*bmapwidth + x]; mobj; mobj = bnext)
|
||||||
{
|
{
|
||||||
P_SetTarget(&bnext, mobj->bnext); // We want to note our reference to bnext here incase it is MF_NOTHINK and gets removed!
|
P_SetTarget(&bnext, mobj->bnext); // We want to note our reference to bnext here incase it is MF_NOTHINK and gets removed!
|
||||||
|
|
||||||
if (!func(mobj))
|
if (!func(mobj))
|
||||||
{
|
{
|
||||||
P_SetTarget(&bnext, NULL);
|
P_SetTarget(&bnext, NULL);
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (P_MobjWasRemoved(tmthing) // func just popped our tmthing, cannot continue.
|
if (P_MobjWasRemoved(tmthing) // func just popped our tmthing, cannot continue.
|
||||||
|| (bnext && P_MobjWasRemoved(bnext))) // func just broke blockmap chain, cannot continue.
|
|| (bnext && P_MobjWasRemoved(bnext))) // func just broke blockmap chain, cannot continue.
|
||||||
{
|
{
|
||||||
@@ -1012,6 +1032,7 @@ boolean P_BlockThingsIterator(INT32 x, INT32 y, boolean (*func)(mobj_t *))
|
|||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
P_SetTarget(&bnext, NULL);
|
P_SetTarget(&bnext, NULL);
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|||||||
+600
-491
File diff suppressed because it is too large.
Load diff
@@ -298,6 +298,7 @@ typedef struct mobj_s
|
|||||||
angle_t angle, pitch, roll; // orientation
|
angle_t angle, pitch, roll; // orientation
|
||||||
angle_t old_angle, old_pitch, old_roll; // orientation interpolation
|
angle_t old_angle, old_pitch, old_roll; // orientation interpolation
|
||||||
angle_t rollangle;
|
angle_t rollangle;
|
||||||
|
angle_t temprollangle; // same as rollangle but resets each tic, idk either man. // cba exposing this to lua either
|
||||||
spritenum_t sprite; // used to find patch_t and flip value
|
spritenum_t sprite; // used to find patch_t and flip value
|
||||||
UINT32 frame; // frame number, plus bits see p_pspr.h
|
UINT32 frame; // frame number, plus bits see p_pspr.h
|
||||||
UINT16 anim_duration; // for FF_ANIMATE states
|
UINT16 anim_duration; // for FF_ANIMATE states
|
||||||
|
|||||||
+11
-6
@@ -691,7 +691,7 @@ static void ArchiveLines(savebuffer_t *save)
|
|||||||
if (spawnli->special == 321 || spawnli->special == 322) // only reason li->callcount would be non-zero is if either of these are involved
|
if (spawnli->special == 321 || spawnli->special == 322) // only reason li->callcount would be non-zero is if either of these are involved
|
||||||
diff |= LD_CLLCOUNT;
|
diff |= LD_CLLCOUNT;
|
||||||
|
|
||||||
if (li->sidenum[0] != 0xffff)
|
if (li->sidenum[0] != NO_INDEX)
|
||||||
{
|
{
|
||||||
si = &sides[li->sidenum[0]];
|
si = &sides[li->sidenum[0]];
|
||||||
spawnsi = &spawnsides[li->sidenum[0]];
|
spawnsi = &spawnsides[li->sidenum[0]];
|
||||||
@@ -706,7 +706,8 @@ static void ArchiveLines(savebuffer_t *save)
|
|||||||
if (si->midtexture != spawnsi->midtexture)
|
if (si->midtexture != spawnsi->midtexture)
|
||||||
diff |= LD_S1MIDTEX;
|
diff |= LD_S1MIDTEX;
|
||||||
}
|
}
|
||||||
if (li->sidenum[1] != 0xffff)
|
|
||||||
|
if (li->sidenum[1] != NO_INDEX)
|
||||||
{
|
{
|
||||||
si = &sides[li->sidenum[1]];
|
si = &sides[li->sidenum[1]];
|
||||||
spawnsi = &spawnsides[li->sidenum[1]];
|
spawnsi = &spawnsides[li->sidenum[1]];
|
||||||
@@ -786,6 +787,7 @@ static void UnArchiveFFloors(savebuffer_t *save, const sector_t *ss)
|
|||||||
I_Error("Sector does not have any ffloors!");
|
I_Error("Sector does not have any ffloors!");
|
||||||
|
|
||||||
fflr_i = READUINT16(save->p); // get first modified ffloor's number ready
|
fflr_i = READUINT16(save->p); // get first modified ffloor's number ready
|
||||||
|
|
||||||
for (;;) // for some reason the usual for (rover = x; ...) thing doesn't work here?
|
for (;;) // for some reason the usual for (rover = x; ...) thing doesn't work here?
|
||||||
{
|
{
|
||||||
if (fflr_i == 0xffff) // end of modified ffloors list, let's stop already
|
if (fflr_i == 0xffff) // end of modified ffloors list, let's stop already
|
||||||
@@ -3057,7 +3059,7 @@ static void P_NetUnArchiveThinkers(savebuffer_t *save)
|
|||||||
break;
|
break;
|
||||||
|
|
||||||
default:
|
default:
|
||||||
I_Error("P_UnarchiveSpecials: Unknown tclass %d in savegame", tclass);
|
I_Error("P_NetUnArchiveThinkers: Unknown tclass %d in savegame", tclass);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -3168,7 +3170,7 @@ FUNCINLINE static ATTRINLINE void P_UnArchivePolyObjects(savebuffer_t *save)
|
|||||||
numSavedPolys = READINT32(save->p);
|
numSavedPolys = READINT32(save->p);
|
||||||
|
|
||||||
if (numSavedPolys != numPolyObjects)
|
if (numSavedPolys != numPolyObjects)
|
||||||
I_Error("P_UnArchivePolyObjects: polyobj count inconsistency\n");
|
I_Error("P_UnArchivePolyObjects: polyobj count inconsistency (expected %d, got %d)\n", numPolyObjects, numSavedPolys);
|
||||||
|
|
||||||
for (i = 0; i < numSavedPolys; ++i)
|
for (i = 0; i < numSavedPolys; ++i)
|
||||||
P_UnArchivePolyObj(save, &PolyObjects[i]);
|
P_UnArchivePolyObj(save, &PolyObjects[i]);
|
||||||
@@ -3510,7 +3512,7 @@ static void P_ReloadSaveLevelData(void)
|
|||||||
li->firsttag = spawnli->firsttag;
|
li->firsttag = spawnli->firsttag;
|
||||||
li->nexttag = spawnli->nexttag;
|
li->nexttag = spawnli->nexttag;
|
||||||
|
|
||||||
if (li->sidenum[0] != 0xffff)
|
if (li->sidenum[0] != NO_INDEX)
|
||||||
{
|
{
|
||||||
si = &sides[li->sidenum[0]];
|
si = &sides[li->sidenum[0]];
|
||||||
spawnsi = &spawnsides[li->sidenum[0]];
|
spawnsi = &spawnsides[li->sidenum[0]];
|
||||||
@@ -3521,7 +3523,7 @@ static void P_ReloadSaveLevelData(void)
|
|||||||
si->midtexture = spawnsi->midtexture;
|
si->midtexture = spawnsi->midtexture;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (li->sidenum[1] != 0xffff)
|
if (li->sidenum[1] != NO_INDEX)
|
||||||
{
|
{
|
||||||
si = &sides[li->sidenum[1]];
|
si = &sides[li->sidenum[1]];
|
||||||
spawnsi = &spawnsides[li->sidenum[1]];
|
spawnsi = &spawnsides[li->sidenum[1]];
|
||||||
@@ -3588,8 +3590,11 @@ FUNCINLINE static ATTRINLINE boolean P_NetUnArchiveMisc(savebuffer_t *save, bool
|
|||||||
if (!P_SetupLevel(true, reloading))
|
if (!P_SetupLevel(true, reloading))
|
||||||
{
|
{
|
||||||
CONS_Alert(CONS_ERROR, M_GetText("Can't load the level!\n"));
|
CONS_Alert(CONS_ERROR, M_GetText("Can't load the level!\n"));
|
||||||
|
P_FreeCorruptMapWarnings();
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
P_PrintCorruptMapWarnings();
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
|
|||||||
+570
-214
File diff suppressed because it is too large.
Load diff
@@ -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;
|
||||||
@@ -114,6 +115,9 @@ size_t P_PrecacheLevelFlats(void);
|
|||||||
|
|
||||||
void P_AllocMapHeader(INT16 i);
|
void P_AllocMapHeader(INT16 i);
|
||||||
|
|
||||||
|
void P_PrintCorruptMapWarnings(void);
|
||||||
|
void P_FreeCorruptMapWarnings(void);
|
||||||
|
|
||||||
#ifdef __cplusplus
|
#ifdef __cplusplus
|
||||||
} // extern "C"
|
} // extern "C"
|
||||||
#endif
|
#endif
|
||||||
|
|||||||
+40
-22
@@ -31,8 +31,6 @@ typedef struct {
|
|||||||
fixed_t bbox[4];
|
fixed_t bbox[4];
|
||||||
} los_t;
|
} los_t;
|
||||||
|
|
||||||
static INT32 sightcounts[2];
|
|
||||||
|
|
||||||
typedef INT32 (*divlinefunc)(fixed_t x, fixed_t y, const divline_t *node);
|
typedef INT32 (*divlinefunc)(fixed_t x, fixed_t y, const divline_t *node);
|
||||||
typedef INT32 (*divlinecrossfunc)(fixed_t x1, fixed_t y1, fixed_t x2, fixed_t y2, const divline_t *node);
|
typedef INT32 (*divlinecrossfunc)(fixed_t x1, fixed_t y1, fixed_t x2, fixed_t y2, const divline_t *node);
|
||||||
|
|
||||||
@@ -73,7 +71,7 @@ static inline INT32 P_DivlineCrossedFast(fixed_t x1, fixed_t y1, fixed_t x2, fix
|
|||||||
return (P_DivlineSideFast(x1, y1, node) == P_DivlineSideFast(x2, y2, node));
|
return (P_DivlineSideFast(x1, y1, node) == P_DivlineSideFast(x2, y2, node));
|
||||||
}
|
}
|
||||||
|
|
||||||
static boolean P_CrossSubsecPolyObj(polyobj_t *po, register los_t *los)
|
static boolean P_CrossSubsecPolyObj(polyobj_t *po, register los_t *los, boolean fast)
|
||||||
{
|
{
|
||||||
size_t i;
|
size_t i;
|
||||||
sector_t *polysec;
|
sector_t *polysec;
|
||||||
@@ -81,6 +79,8 @@ static boolean P_CrossSubsecPolyObj(polyobj_t *po, register los_t *los)
|
|||||||
if (!(po->flags & POF_RENDERALL))
|
if (!(po->flags & POF_RENDERALL))
|
||||||
return true; // the polyobject isn't visible, so we can ignore it
|
return true; // the polyobject isn't visible, so we can ignore it
|
||||||
|
|
||||||
|
const divlinecrossfunc divlinecrossFunc = fast ? P_DivlineCrossedFast : P_DivlineCrossed;
|
||||||
|
|
||||||
polysec = po->lines[0]->backsector;
|
polysec = po->lines[0]->backsector;
|
||||||
|
|
||||||
for (i = 0; i < po->numLines; ++i)
|
for (i = 0; i < po->numLines; ++i)
|
||||||
@@ -108,21 +108,21 @@ static boolean P_CrossSubsecPolyObj(polyobj_t *po, register los_t *los)
|
|||||||
v2 = line->v2;
|
v2 = line->v2;
|
||||||
|
|
||||||
// line isn't crossed?
|
// line isn't crossed?
|
||||||
if (P_DivlineCrossed(v1->x, v1->y, v2->x, v2->y, &los->strace))
|
if (divlinecrossFunc(v1->x, v1->y, v2->x, v2->y, &los->strace))
|
||||||
continue;
|
continue;
|
||||||
|
|
||||||
divl.dx = v2->x - (divl.x = v1->x);
|
divl.dx = v2->x - (divl.x = v1->x);
|
||||||
divl.dy = v2->y - (divl.y = v1->y);
|
divl.dy = v2->y - (divl.y = v1->y);
|
||||||
|
|
||||||
// line isn't crossed?
|
// line isn't crossed?
|
||||||
if (P_DivlineCrossed(los->strace.x, los->strace.y, los->t2x, los->t2y, &divl))
|
if (divlinecrossFunc(los->strace.x, los->strace.y, los->t2x, los->t2y, &divl))
|
||||||
continue;
|
continue;
|
||||||
|
|
||||||
frac = P_InterceptVector(&los->strace, &divl);
|
frac = P_InterceptVector(&los->strace, &divl);
|
||||||
|
|
||||||
// get slopes of top and bottom of this polyobject line
|
// get slopes of top and bottom of this polyobject line
|
||||||
topslope = FixedDiv(polysec->ceilingheight - los->sightzstart , frac);
|
topslope = FixedDiv(polysec->ceilingheight - los->sightzstart, frac);
|
||||||
bottomslope = FixedDiv(polysec->floorheight - los->sightzstart , frac);
|
bottomslope = FixedDiv(polysec->floorheight - los->sightzstart, frac);
|
||||||
|
|
||||||
if (topslope >= los->topslope && bottomslope <= los->bottomslope)
|
if (topslope >= los->topslope && bottomslope <= los->bottomslope)
|
||||||
return false; // view completely blocked
|
return false; // view completely blocked
|
||||||
@@ -147,6 +147,8 @@ static boolean P_CrossSubsector(size_t num, register los_t *los, boolean fast)
|
|||||||
I_Error("P_CrossSubsector: ss %s with numss = %s\n", sizeu1(num), sizeu2(numsubsectors));
|
I_Error("P_CrossSubsector: ss %s with numss = %s\n", sizeu1(num), sizeu2(numsubsectors));
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
const divlinecrossfunc divlinecrossFunc = fast ? P_DivlineCrossedFast : P_DivlineCrossed;
|
||||||
|
|
||||||
// haleyjd 02/23/06: this assignment should be after the above check
|
// haleyjd 02/23/06: this assignment should be after the above check
|
||||||
seg = segs + subsectors[num].firstline;
|
seg = segs + subsectors[num].firstline;
|
||||||
|
|
||||||
@@ -158,15 +160,13 @@ static boolean P_CrossSubsector(size_t num, register los_t *los, boolean fast)
|
|||||||
if (po->validcount != validcount)
|
if (po->validcount != validcount)
|
||||||
{
|
{
|
||||||
po->validcount = validcount;
|
po->validcount = validcount;
|
||||||
if (!P_CrossSubsecPolyObj(po, los))
|
if (!P_CrossSubsecPolyObj(po, los, fast))
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
po = (polyobj_t *)(po->link.next);
|
po = (polyobj_t *)(po->link.next);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
const divlinecrossfunc divlinecrossFunc = fast ? P_DivlineCrossedFast : P_DivlineCrossed;
|
|
||||||
|
|
||||||
for (count = subsectors[num].numlines; --count >= 0; seg++) // check lines
|
for (count = subsectors[num].numlines; --count >= 0; seg++) // check lines
|
||||||
{
|
{
|
||||||
line_t *line = seg->linedef;
|
line_t *line = seg->linedef;
|
||||||
@@ -214,14 +214,17 @@ static boolean P_CrossSubsector(size_t num, register los_t *los, boolean fast)
|
|||||||
|
|
||||||
front = seg->frontsector;
|
front = seg->frontsector;
|
||||||
back = seg->backsector;
|
back = seg->backsector;
|
||||||
|
|
||||||
// calculate position at intercept
|
// calculate position at intercept
|
||||||
fracx = los->strace.x + FixedMul(los->strace.dx, frac);
|
fracx = los->strace.x + FixedMul(los->strace.dx, frac);
|
||||||
fracy = los->strace.y + FixedMul(los->strace.dy, frac);
|
fracy = los->strace.y + FixedMul(los->strace.dy, frac);
|
||||||
|
|
||||||
// calculate sector heights
|
// calculate sector heights
|
||||||
frontf = P_GetSectorFloorZAt (front, fracx, fracy);
|
frontf = P_GetSectorFloorZAt (front, fracx, fracy);
|
||||||
frontc = P_GetSectorCeilingZAt(front, fracx, fracy);
|
frontc = P_GetSectorCeilingZAt(front, fracx, fracy);
|
||||||
backf = P_GetSectorFloorZAt (back , fracx, fracy);
|
backf = P_GetSectorFloorZAt (back , fracx, fracy);
|
||||||
backc = P_GetSectorCeilingZAt(back , fracx, fracy);
|
backc = P_GetSectorCeilingZAt(back , fracx, fracy);
|
||||||
|
|
||||||
// crosses a two sided line
|
// crosses a two sided line
|
||||||
// no wall to block sight with?
|
// no wall to block sight with?
|
||||||
if (frontf == backf && frontc == backc
|
if (frontf == backf && frontc == backc
|
||||||
@@ -262,6 +265,7 @@ static boolean P_CrossSubsector(size_t num, register los_t *los, boolean fast)
|
|||||||
ffloor_t *rover;
|
ffloor_t *rover;
|
||||||
fixed_t topslope, bottomslope;
|
fixed_t topslope, bottomslope;
|
||||||
fixed_t topz, bottomz;
|
fixed_t topz, bottomz;
|
||||||
|
|
||||||
// check front sector's FOFs first
|
// check front sector's FOFs first
|
||||||
for (rover = front->ffloors; rover; rover = rover->next)
|
for (rover = front->ffloors; rover; rover = rover->next)
|
||||||
{
|
{
|
||||||
@@ -275,9 +279,11 @@ static boolean P_CrossSubsector(size_t num, register los_t *los, boolean fast)
|
|||||||
bottomz = P_GetFFloorBottomZAt(rover, fracx, fracy);
|
bottomz = P_GetFFloorBottomZAt(rover, fracx, fracy);
|
||||||
topslope = FixedDiv( topz - los->sightzstart, frac);
|
topslope = FixedDiv( topz - los->sightzstart, frac);
|
||||||
bottomslope = FixedDiv(bottomz - los->sightzstart, frac);
|
bottomslope = FixedDiv(bottomz - los->sightzstart, frac);
|
||||||
|
|
||||||
if (topslope >= los->topslope && bottomslope <= los->bottomslope)
|
if (topslope >= los->topslope && bottomslope <= los->bottomslope)
|
||||||
return false; // view completely blocked
|
return false; // view completely blocked
|
||||||
}
|
}
|
||||||
|
|
||||||
// check back sector's FOFs as well
|
// check back sector's FOFs as well
|
||||||
for (rover = back->ffloors; rover; rover = rover->next)
|
for (rover = back->ffloors; rover; rover = rover->next)
|
||||||
{
|
{
|
||||||
@@ -291,6 +297,7 @@ static boolean P_CrossSubsector(size_t num, register los_t *los, boolean fast)
|
|||||||
bottomz = P_GetFFloorBottomZAt(rover, fracx, fracy);
|
bottomz = P_GetFFloorBottomZAt(rover, fracx, fracy);
|
||||||
topslope = FixedDiv( topz - los->sightzstart, frac);
|
topslope = FixedDiv( topz - los->sightzstart, frac);
|
||||||
bottomslope = FixedDiv(bottomz - los->sightzstart, frac);
|
bottomslope = FixedDiv(bottomz - los->sightzstart, frac);
|
||||||
|
|
||||||
if (topslope >= los->topslope && bottomslope <= los->bottomslope)
|
if (topslope >= los->topslope && bottomslope <= los->bottomslope)
|
||||||
return false; // view completely blocked
|
return false; // view completely blocked
|
||||||
}
|
}
|
||||||
@@ -315,10 +322,10 @@ static boolean P_CrossBSPNode(INT32 bspnum, register los_t *los, boolean fast)
|
|||||||
|
|
||||||
while (!(bspnum & NF_SUBSECTOR))
|
while (!(bspnum & NF_SUBSECTOR))
|
||||||
{
|
{
|
||||||
register node_t *bsp = nodes + bspnum;
|
register const node_t *bsp = nodes + bspnum;
|
||||||
|
|
||||||
INT32 side = divlineFunc(los->strace.x, los->strace.y, (divline_t *)bsp) & 1;
|
INT32 side = divlineFunc(los->strace.x, los->strace.y, (const divline_t *)bsp) & 1;
|
||||||
INT32 side2 = divlineFunc(los->t2x, los->t2y, (divline_t *) bsp);
|
INT32 side2 = divlineFunc(los->t2x, los->t2y, (const divline_t *)bsp);
|
||||||
|
|
||||||
if (side == side2)
|
if (side == side2)
|
||||||
{
|
{
|
||||||
@@ -357,8 +364,10 @@ boolean P_CheckSight2(mobj_t *t1, mobj_t *t2, boolean fast)
|
|||||||
I_Assert(!P_MobjWasRemoved(t2));
|
I_Assert(!P_MobjWasRemoved(t2));
|
||||||
|
|
||||||
if (!t1->subsector || !t2->subsector
|
if (!t1->subsector || !t2->subsector
|
||||||
|| !t1->subsector->sector || !t2->subsector->sector)
|
|| !t1->subsector->sector || !t2->subsector->sector)
|
||||||
|
{
|
||||||
return false;
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
s1 = t1->subsector->sector;
|
s1 = t1->subsector->sector;
|
||||||
s2 = t2->subsector->sector;
|
s2 = t2->subsector->sector;
|
||||||
@@ -368,7 +377,9 @@ boolean P_CheckSight2(mobj_t *t1, mobj_t *t2, boolean fast)
|
|||||||
{
|
{
|
||||||
// Check in REJECT table.
|
// Check in REJECT table.
|
||||||
if (rejectmatrix[pnum>>3] & (1 << (pnum&7))) // can't possibly be connected
|
if (rejectmatrix[pnum>>3] & (1 << (pnum&7))) // can't possibly be connected
|
||||||
|
{
|
||||||
return false;
|
return false;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
// killough 11/98: shortcut for melee situations
|
// killough 11/98: shortcut for melee situations
|
||||||
@@ -376,11 +387,9 @@ boolean P_CheckSight2(mobj_t *t1, mobj_t *t2, boolean fast)
|
|||||||
// haleyjd 02/23/06: can't do this if there are polyobjects in the subsec
|
// haleyjd 02/23/06: can't do this if there are polyobjects in the subsec
|
||||||
if (!t1->subsector->polyList &&
|
if (!t1->subsector->polyList &&
|
||||||
t1->subsector == t2->subsector)
|
t1->subsector == t2->subsector)
|
||||||
|
{
|
||||||
return true;
|
return true;
|
||||||
|
}
|
||||||
// An unobstructed LOS is possible.
|
|
||||||
// Now look from eyes of t1 to any part of t2.
|
|
||||||
sightcounts[1]++;
|
|
||||||
|
|
||||||
validcount++;
|
validcount++;
|
||||||
|
|
||||||
@@ -423,21 +432,30 @@ boolean P_CheckSight2(mobj_t *t1, mobj_t *t2, boolean fast)
|
|||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
|
|
||||||
topz1 = P_GetFFloorTopZAt (rover, t1->x, t1->y);
|
// Check for blocking floors here.
|
||||||
|
|
||||||
topz2 = P_GetFFloorTopZAt (rover, t2->x, t2->y);
|
topz2 = P_GetFFloorTopZAt (rover, t2->x, t2->y);
|
||||||
bottomz1 = P_GetFFloorBottomZAt(rover, t1->x, t1->y);
|
bottomz1 = P_GetFFloorBottomZAt(rover, t1->x, t1->y);
|
||||||
|
|
||||||
|
if (los.sightzstart < bottomz1 && t2->z >= topz2)
|
||||||
|
{
|
||||||
|
// no way to see through that
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
|
topz1 = P_GetFFloorTopZAt (rover, t1->x, t1->y);
|
||||||
bottomz2 = P_GetFFloorBottomZAt(rover, t2->x, t2->y);
|
bottomz2 = P_GetFFloorBottomZAt(rover, t2->x, t2->y);
|
||||||
|
|
||||||
// Check for blocking floors here.
|
if (los.sightzstart >= topz1 && t2->z + t2->height < bottomz2)
|
||||||
if ((los.sightzstart < bottomz1 && t2->z >= topz2)
|
|
||||||
|| (los.sightzstart >= topz1 && t2->z + t2->height < bottomz2))
|
|
||||||
{
|
{
|
||||||
// no way to see through that
|
// no way to see through that
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (rover->flags & FF_SOLID)
|
if (rover->flags & FF_SOLID)
|
||||||
|
{
|
||||||
continue; // shortcut since neither mobj can be inside the 3dfloor
|
continue; // shortcut since neither mobj can be inside the 3dfloor
|
||||||
|
}
|
||||||
|
|
||||||
if (rover->flags & FF_BOTHPLANES || !(rover->flags & FF_INVERTPLANES))
|
if (rover->flags & FF_BOTHPLANES || !(rover->flags & FF_INVERTPLANES))
|
||||||
{
|
{
|
||||||
|
|||||||
@@ -664,8 +664,10 @@ static pslope_t *P_NewVertexSlope(INT16 tag1, INT16 tag2, INT16 tag3, UINT8 flag
|
|||||||
for (i = 0; i < 3; i++)
|
for (i = 0; i < 3; i++)
|
||||||
{
|
{
|
||||||
mt = ret->vertices[i];
|
mt = ret->vertices[i];
|
||||||
|
|
||||||
if (!mt) // If a vertex wasn't found, it's game over. There's nothing you can do to recover (except maybe try and kill the slope instead - TODO?)
|
if (!mt) // If a vertex wasn't found, it's game over. There's nothing you can do to recover (except maybe try and kill the slope instead - TODO?)
|
||||||
I_Error("P_NewVertexSlope: Slope vertex %s (for linedef tag %d) not found!", sizeu1(i), tag1);
|
I_Error("P_NewVertexSlope: Slope vertex %s (for linedef tag %d) not found!", sizeu1(i), tag1);
|
||||||
|
|
||||||
if (mt->extrainfo)
|
if (mt->extrainfo)
|
||||||
mt->z = mt->options;
|
mt->z = mt->options;
|
||||||
else
|
else
|
||||||
@@ -899,6 +901,11 @@ void P_SlopeLaunch(mobj_t *mo)
|
|||||||
|
|
||||||
//CONS_Printf("Launched off of slope.\n");
|
//CONS_Printf("Launched off of slope.\n");
|
||||||
mo->standingslope = NULL;
|
mo->standingslope = NULL;
|
||||||
|
|
||||||
|
if (mo->player)
|
||||||
|
{
|
||||||
|
mo->player->stairjank = 0; // fuck you
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
// Function to help handle landing on slopes
|
// Function to help handle landing on slopes
|
||||||
|
|||||||
+242
-132
@@ -538,6 +538,7 @@ static sector_t *getNextSector(line_t *line, sector_t *sec)
|
|||||||
else
|
else
|
||||||
return NULL;
|
return NULL;
|
||||||
}
|
}
|
||||||
|
|
||||||
return line->frontsector;
|
return line->frontsector;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -568,6 +569,7 @@ fixed_t P_FindLowestFloorSurrounding(sector_t *sec)
|
|||||||
if (other->floorheight < floorh)
|
if (other->floorheight < floorh)
|
||||||
floorh = other->floorheight;
|
floorh = other->floorheight;
|
||||||
}
|
}
|
||||||
|
|
||||||
return floorh;
|
return floorh;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -881,7 +883,7 @@ static boolean PolyDoor(line_t *line)
|
|||||||
|
|
||||||
pdd.polyObjNum = line->tag; // polyobject id
|
pdd.polyObjNum = line->tag; // polyobject id
|
||||||
|
|
||||||
switch(line->special)
|
switch (line->special)
|
||||||
{
|
{
|
||||||
case 480: // Polyobj_DoorSlide
|
case 480: // Polyobj_DoorSlide
|
||||||
pdd.doorType = POLY_DOOR_SLIDE;
|
pdd.doorType = POLY_DOOR_SLIDE;
|
||||||
@@ -889,7 +891,7 @@ static boolean PolyDoor(line_t *line)
|
|||||||
pdd.angle = line->angle; // angle of motion
|
pdd.angle = line->angle; // angle of motion
|
||||||
pdd.distance = sides[line->sidenum[0]].rowoffset;
|
pdd.distance = sides[line->sidenum[0]].rowoffset;
|
||||||
|
|
||||||
if (line->sidenum[1] != 0xffff)
|
if (line->sidenum[1] != NO_INDEX)
|
||||||
pdd.delay = sides[line->sidenum[1]].textureoffset >> FRACBITS; // delay in tics
|
pdd.delay = sides[line->sidenum[1]].textureoffset >> FRACBITS; // delay in tics
|
||||||
else
|
else
|
||||||
pdd.delay = 0;
|
pdd.delay = 0;
|
||||||
@@ -899,7 +901,7 @@ static boolean PolyDoor(line_t *line)
|
|||||||
pdd.speed = sides[line->sidenum[0]].textureoffset >> FRACBITS; // angular speed
|
pdd.speed = sides[line->sidenum[0]].textureoffset >> FRACBITS; // angular speed
|
||||||
pdd.distance = sides[line->sidenum[0]].rowoffset >> FRACBITS; // angular distance
|
pdd.distance = sides[line->sidenum[0]].rowoffset >> FRACBITS; // angular distance
|
||||||
|
|
||||||
if (line->sidenum[1] != 0xffff)
|
if (line->sidenum[1] != NO_INDEX)
|
||||||
pdd.delay = sides[line->sidenum[1]].textureoffset >> FRACBITS; // delay in tics
|
pdd.delay = sides[line->sidenum[1]].textureoffset >> FRACBITS; // delay in tics
|
||||||
else
|
else
|
||||||
pdd.delay = 0;
|
pdd.delay = 0;
|
||||||
@@ -1180,7 +1182,7 @@ INT32 P_FindMinSurroundingLight(sector_t *sector, INT32 max)
|
|||||||
for (i = 0; i < sector->linecount; i++)
|
for (i = 0; i < sector->linecount; i++)
|
||||||
{
|
{
|
||||||
line = sector->lines[i];
|
line = sector->lines[i];
|
||||||
check = getNextSector(line,sector);
|
check = getNextSector(line, sector);
|
||||||
|
|
||||||
if (!check)
|
if (!check)
|
||||||
continue;
|
continue;
|
||||||
@@ -1234,7 +1236,6 @@ static void P_AddExecutorDelay(line_t *line, mobj_t *mobj, sector_t *sector)
|
|||||||
boolean P_RunTriggerLinedef(line_t *triggerline, mobj_t *actor, sector_t *caller)
|
boolean P_RunTriggerLinedef(line_t *triggerline, mobj_t *actor, sector_t *caller)
|
||||||
{
|
{
|
||||||
sector_t *ctlsector;
|
sector_t *ctlsector;
|
||||||
fixed_t dist = P_AproxDistance(triggerline->dx, triggerline->dy)>>FRACBITS;
|
|
||||||
size_t i, linecnt, sectori;
|
size_t i, linecnt, sectori;
|
||||||
INT16 specialtype = triggerline->special;
|
INT16 specialtype = triggerline->special;
|
||||||
//fromlapexec = false;
|
//fromlapexec = false;
|
||||||
@@ -1272,6 +1273,8 @@ boolean P_RunTriggerLinedef(line_t *triggerline, mobj_t *actor, sector_t *caller
|
|||||||
rings = actor->health-1;
|
rings = actor->health-1;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
const fixed_t dist = P_AproxDistance(triggerline->dx, triggerline->dy)>>FRACBITS;
|
||||||
|
|
||||||
if (triggerline->flags & ML_NOCLIMB)
|
if (triggerline->flags & ML_NOCLIMB)
|
||||||
{
|
{
|
||||||
if (rings > dist)
|
if (rings > dist)
|
||||||
@@ -1293,7 +1296,6 @@ boolean P_RunTriggerLinedef(line_t *triggerline, mobj_t *actor, sector_t *caller
|
|||||||
msecnode_t *node;
|
msecnode_t *node;
|
||||||
mobj_t *mo;
|
mobj_t *mo;
|
||||||
INT32 numpush = 0;
|
INT32 numpush = 0;
|
||||||
INT32 numneeded = dist;
|
|
||||||
|
|
||||||
if (!caller)
|
if (!caller)
|
||||||
return false; // we need a calling sector to find pushables in, silly!
|
return false; // we need a calling sector to find pushables in, silly!
|
||||||
@@ -1308,6 +1310,8 @@ boolean P_RunTriggerLinedef(line_t *triggerline, mobj_t *actor, sector_t *caller
|
|||||||
node = node->m_thinglist_next;
|
node = node->m_thinglist_next;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
const fixed_t numneeded = P_AproxDistance(triggerline->dx, triggerline->dy)>>FRACBITS;
|
||||||
|
|
||||||
if (triggerline->flags & ML_NOCLIMB) // Need at least or more
|
if (triggerline->flags & ML_NOCLIMB) // Need at least or more
|
||||||
{
|
{
|
||||||
if (numpush < numneeded)
|
if (numpush < numneeded)
|
||||||
@@ -1336,6 +1340,7 @@ boolean P_RunTriggerLinedef(line_t *triggerline, mobj_t *actor, sector_t *caller
|
|||||||
else if (secspecial == 7) // SRB2Kart: reusing for Race Lap executor
|
else if (secspecial == 7) // SRB2Kart: reusing for Race Lap executor
|
||||||
{
|
{
|
||||||
UINT8 lap;
|
UINT8 lap;
|
||||||
|
INT32 targlap;
|
||||||
|
|
||||||
if (actor && actor->player && triggerline->flags & ML_EFFECT4)
|
if (actor && actor->player && triggerline->flags & ML_EFFECT4)
|
||||||
{
|
{
|
||||||
@@ -1346,19 +1351,21 @@ boolean P_RunTriggerLinedef(line_t *triggerline, mobj_t *actor, sector_t *caller
|
|||||||
lap = P_FindLowestLap();
|
lap = P_FindLowestLap();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
targlap = (INT32)(sides[triggerline->sidenum[0]].textureoffset >> FRACBITS);
|
||||||
|
|
||||||
if (triggerline->flags & ML_NOCLIMB) // Need higher than or equal to
|
if (triggerline->flags & ML_NOCLIMB) // Need higher than or equal to
|
||||||
{
|
{
|
||||||
if (lap < (sides[triggerline->sidenum[0]].textureoffset >> FRACBITS))
|
if (lap < targlap)
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
else if (triggerline->flags & ML_BLOCKMONSTERS) // Need lower than or equal to
|
else if (triggerline->flags & ML_BLOCKMONSTERS) // Need lower than or equal to
|
||||||
{
|
{
|
||||||
if (lap > (sides[triggerline->sidenum[0]].textureoffset >> FRACBITS))
|
if (lap > targlap)
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
else // Need equal to
|
else // Need equal to
|
||||||
{
|
{
|
||||||
if (lap != (sides[triggerline->sidenum[0]].textureoffset >> FRACBITS))
|
if (lap != targlap)
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -1450,6 +1457,7 @@ boolean P_RunTriggerLinedef(line_t *triggerline, mobj_t *actor, sector_t *caller
|
|||||||
if (triggerline->flags & ML_EFFECT5) // disregard order for efficiency
|
if (triggerline->flags & ML_EFFECT5) // disregard order for efficiency
|
||||||
{
|
{
|
||||||
for (i = 0; i < linecnt; i++)
|
for (i = 0; i < linecnt; i++)
|
||||||
|
{
|
||||||
if (ctlsector->lines[i]->special >= 400
|
if (ctlsector->lines[i]->special >= 400
|
||||||
&& ctlsector->lines[i]->special < 500)
|
&& ctlsector->lines[i]->special < 500)
|
||||||
{
|
{
|
||||||
@@ -1458,6 +1466,7 @@ boolean P_RunTriggerLinedef(line_t *triggerline, mobj_t *actor, sector_t *caller
|
|||||||
else
|
else
|
||||||
P_ProcessLineSpecial(ctlsector->lines[i], actor, caller);
|
P_ProcessLineSpecial(ctlsector->lines[i], actor, caller);
|
||||||
}
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
else // walk around the sector in a defined order
|
else // walk around the sector in a defined order
|
||||||
{
|
{
|
||||||
@@ -1465,11 +1474,13 @@ boolean P_RunTriggerLinedef(line_t *triggerline, mobj_t *actor, sector_t *caller
|
|||||||
size_t j, masterlineindex = (size_t)-1;
|
size_t j, masterlineindex = (size_t)-1;
|
||||||
|
|
||||||
for (i = 0; i < linecnt; i++)
|
for (i = 0; i < linecnt; i++)
|
||||||
|
{
|
||||||
if (ctlsector->lines[i] == triggerline)
|
if (ctlsector->lines[i] == triggerline)
|
||||||
{
|
{
|
||||||
masterlineindex = i;
|
masterlineindex = i;
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
|
||||||
#ifdef PARANOIA
|
#ifdef PARANOIA
|
||||||
if (masterlineindex == (size_t)-1)
|
if (masterlineindex == (size_t)-1)
|
||||||
@@ -1488,11 +1499,13 @@ boolean P_RunTriggerLinedef(line_t *triggerline, mobj_t *actor, sector_t *caller
|
|||||||
{
|
{
|
||||||
if (i == j)
|
if (i == j)
|
||||||
continue;
|
continue;
|
||||||
|
|
||||||
if (ctlsector->lines[i]->v1 == ctlsector->lines[j]->v2)
|
if (ctlsector->lines[i]->v1 == ctlsector->lines[j]->v2)
|
||||||
{
|
{
|
||||||
i = j;
|
i = j;
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (ctlsector->lines[i]->v1 == ctlsector->lines[j]->v1)
|
if (ctlsector->lines[i]->v1 == ctlsector->lines[j]->v1)
|
||||||
{
|
{
|
||||||
i = j;
|
i = j;
|
||||||
@@ -1500,6 +1513,7 @@ boolean P_RunTriggerLinedef(line_t *triggerline, mobj_t *actor, sector_t *caller
|
|||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if (j == linecnt)
|
if (j == linecnt)
|
||||||
{
|
{
|
||||||
const size_t vertexei = (size_t)(ctlsector->lines[i]->v1 - vertexes);
|
const size_t vertexei = (size_t)(ctlsector->lines[i]->v1 - vertexes);
|
||||||
@@ -1514,11 +1528,13 @@ boolean P_RunTriggerLinedef(line_t *triggerline, mobj_t *actor, sector_t *caller
|
|||||||
{
|
{
|
||||||
if (i == j)
|
if (i == j)
|
||||||
continue;
|
continue;
|
||||||
|
|
||||||
if (ctlsector->lines[i]->v2 == ctlsector->lines[j]->v1)
|
if (ctlsector->lines[i]->v2 == ctlsector->lines[j]->v1)
|
||||||
{
|
{
|
||||||
i = j;
|
i = j;
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (ctlsector->lines[i]->v2 == ctlsector->lines[j]->v2)
|
if (ctlsector->lines[i]->v2 == ctlsector->lines[j]->v2)
|
||||||
{
|
{
|
||||||
i = j;
|
i = j;
|
||||||
@@ -1595,19 +1611,21 @@ void P_LinedefExecute(INT16 tag, mobj_t *actor, sector_t *caller)
|
|||||||
if (lines[masterline].tag != tag)
|
if (lines[masterline].tag != tag)
|
||||||
continue;
|
continue;
|
||||||
|
|
||||||
|
const INT16 specialtype = lines[masterline].special;
|
||||||
|
|
||||||
// "No More Enemies" and "Level Load" take care of themselves.
|
// "No More Enemies" and "Level Load" take care of themselves.
|
||||||
if (lines[masterline].special == 313
|
if (specialtype == 313
|
||||||
|| lines[masterline].special == 399
|
|| specialtype == 399
|
||||||
|| lines[masterline].special == 328
|
|| specialtype == 328
|
||||||
|| lines[masterline].special == 323
|
|| specialtype == 323
|
||||||
// Each-time executors handle themselves, too
|
// Each-time executors handle themselves, too
|
||||||
|| lines[masterline].special == 301 // Each time
|
|| specialtype == 301 // Each time
|
||||||
|| lines[masterline].special == 306 // Character ability - Each time
|
|| specialtype == 306 // Character ability - Each time
|
||||||
|| lines[masterline].special == 310 // CTF Red team - Each time
|
|| specialtype == 310 // CTF Red team - Each time
|
||||||
|| lines[masterline].special == 312 // CTF Blue team - Each time
|
|| specialtype == 312 // CTF Blue team - Each time
|
||||||
|| lines[masterline].special == 322 // Trigger on X calls - Each Time
|
|| specialtype == 322 // Trigger on X calls - Each Time
|
||||||
|| lines[masterline].special < 300
|
|| specialtype < 300
|
||||||
|| lines[masterline].special > 399)
|
|| specialtype > 399)
|
||||||
continue;
|
continue;
|
||||||
|
|
||||||
if (!P_RunTriggerLinedef(&lines[masterline], actor, caller))
|
if (!P_RunTriggerLinedef(&lines[masterline], actor, caller))
|
||||||
@@ -1973,8 +1991,8 @@ static void P_ProcessLineSpecial(line_t *line, mobj_t *mo, sector_t *callsec)
|
|||||||
INT32 position = (INT32)max(sides[line->sidenum[0]].midtexture, 0);
|
INT32 position = (INT32)max(sides[line->sidenum[0]].midtexture, 0);
|
||||||
UINT32 prefadems = (UINT32)max(sides[line->sidenum[0]].textureoffset >> FRACBITS, 0);
|
UINT32 prefadems = (UINT32)max(sides[line->sidenum[0]].textureoffset >> FRACBITS, 0);
|
||||||
UINT32 postfadems = (UINT32)max(sides[line->sidenum[0]].rowoffset >> FRACBITS, 0);
|
UINT32 postfadems = (UINT32)max(sides[line->sidenum[0]].rowoffset >> FRACBITS, 0);
|
||||||
UINT8 fadetarget = (UINT8)max((line->sidenum[1] != 0xffff) ? sides[line->sidenum[1]].textureoffset >> FRACBITS : 0, 0);
|
UINT8 fadetarget = (UINT8)max((line->sidenum[1] != NO_INDEX) ? sides[line->sidenum[1]].textureoffset >> FRACBITS : 0, 0);
|
||||||
INT16 fadesource = (INT16)max((line->sidenum[1] != 0xffff) ? sides[line->sidenum[1]].rowoffset >> FRACBITS : -1, -1);
|
INT16 fadesource = (INT16)max((line->sidenum[1] != NO_INDEX) ? sides[line->sidenum[1]].rowoffset >> FRACBITS : -1, -1);
|
||||||
|
|
||||||
// Seek offset from current song position
|
// Seek offset from current song position
|
||||||
if (line->flags & ML_EFFECT1)
|
if (line->flags & ML_EFFECT1)
|
||||||
@@ -2082,7 +2100,7 @@ static void P_ProcessLineSpecial(line_t *line, mobj_t *mo, sector_t *callsec)
|
|||||||
ffloor_t *rover;
|
ffloor_t *rover;
|
||||||
boolean foundit = false;
|
boolean foundit = false;
|
||||||
|
|
||||||
for(rover = mo->subsector->sector->ffloors; rover; rover = rover->next)
|
for (rover = mo->subsector->sector->ffloors; rover; rover = rover->next)
|
||||||
{
|
{
|
||||||
if (rover->master->frontsector->tag != line->tag)
|
if (rover->master->frontsector->tag != line->tag)
|
||||||
continue;
|
continue;
|
||||||
@@ -2419,7 +2437,8 @@ static void P_ProcessLineSpecial(line_t *line, mobj_t *mo, sector_t *callsec)
|
|||||||
P_SetPlayerMobjState(mo, S_KART_STND1); // SRB2kart - was S_PLAY_STND
|
P_SetPlayerMobjState(mo, S_KART_STND1); // SRB2kart - was S_PLAY_STND
|
||||||
|
|
||||||
// Reset bot too.
|
// Reset bot too.
|
||||||
if (bot) {
|
if (bot)
|
||||||
|
{
|
||||||
if (line->flags & ML_NOCLIMB)
|
if (line->flags & ML_NOCLIMB)
|
||||||
P_SetOrigin(bot, mo->x, mo->y, mo->z);
|
P_SetOrigin(bot, mo->x, mo->y, mo->z);
|
||||||
bot->momx = bot->momy = bot->momz = 1;
|
bot->momx = bot->momy = bot->momz = 1;
|
||||||
@@ -2487,7 +2506,7 @@ static void P_ProcessLineSpecial(line_t *line, mobj_t *mo, sector_t *callsec)
|
|||||||
|
|
||||||
var1 = sides[line->sidenum[0]].toptexture; //(line->dx>>FRACBITS)-1;
|
var1 = sides[line->sidenum[0]].toptexture; //(line->dx>>FRACBITS)-1;
|
||||||
|
|
||||||
if (line->sidenum[1] != 0xffff && line->flags & ML_BLOCKMONSTERS) // read power from back sidedef
|
if (line->sidenum[1] != NO_INDEX && line->flags & ML_BLOCKMONSTERS) // read power from back sidedef
|
||||||
var2 = sides[line->sidenum[1]].toptexture;
|
var2 = sides[line->sidenum[1]].toptexture;
|
||||||
else if (line->flags & ML_NOCLIMB) // 'Infinite'
|
else if (line->flags & ML_NOCLIMB) // 'Infinite'
|
||||||
var2 = UINT16_MAX;
|
var2 = UINT16_MAX;
|
||||||
@@ -2502,6 +2521,7 @@ static void P_ProcessLineSpecial(line_t *line, mobj_t *mo, sector_t *callsec)
|
|||||||
P_SetTarget(&dummy->target, bot);
|
P_SetTarget(&dummy->target, bot);
|
||||||
A_CustomPower(dummy);
|
A_CustomPower(dummy);
|
||||||
}
|
}
|
||||||
|
|
||||||
P_RemoveMobj(dummy);
|
P_RemoveMobj(dummy);
|
||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
@@ -2565,11 +2585,15 @@ static void P_ProcessLineSpecial(line_t *line, mobj_t *mo, sector_t *callsec)
|
|||||||
if (mo && mo->player)
|
if (mo && mo->player)
|
||||||
{
|
{
|
||||||
UINT16 fractime = (UINT16)(sides[line->sidenum[0]].textureoffset>>FRACBITS);
|
UINT16 fractime = (UINT16)(sides[line->sidenum[0]].textureoffset>>FRACBITS);
|
||||||
|
|
||||||
if (fractime < 1)
|
if (fractime < 1)
|
||||||
fractime = 1; //instantly wears off upon leaving
|
fractime = 1; //instantly wears off upon leaving
|
||||||
|
|
||||||
if (line->flags & ML_NOCLIMB)
|
if (line->flags & ML_NOCLIMB)
|
||||||
fractime |= 1<<15; //more crazy &ing, as if music stuff wasn't enough
|
fractime |= 1<<15; //more crazy &ing, as if music stuff wasn't enough
|
||||||
|
|
||||||
mo->player->powers[pw_nocontrol] = fractime;
|
mo->player->powers[pw_nocontrol] = fractime;
|
||||||
|
|
||||||
if (bot)
|
if (bot)
|
||||||
bot->player->powers[pw_nocontrol] = fractime;
|
bot->player->powers[pw_nocontrol] = fractime;
|
||||||
}
|
}
|
||||||
@@ -2579,8 +2603,10 @@ static void P_ProcessLineSpecial(line_t *line, mobj_t *mo, sector_t *callsec)
|
|||||||
if (mo)
|
if (mo)
|
||||||
{
|
{
|
||||||
mo->destscale = FixedDiv(P_AproxDistance(line->dx, line->dy), 100<<FRACBITS);
|
mo->destscale = FixedDiv(P_AproxDistance(line->dx, line->dy), 100<<FRACBITS);
|
||||||
|
|
||||||
if (mo->destscale < FRACUNIT/100)
|
if (mo->destscale < FRACUNIT/100)
|
||||||
mo->destscale = FRACUNIT/100;
|
mo->destscale = FRACUNIT/100;
|
||||||
|
|
||||||
if (mo->player && bot)
|
if (mo->player && bot)
|
||||||
bot->destscale = mo->destscale;
|
bot->destscale = mo->destscale;
|
||||||
}
|
}
|
||||||
@@ -2609,7 +2635,7 @@ static void P_ProcessLineSpecial(line_t *line, mobj_t *mo, sector_t *callsec)
|
|||||||
if (always || this->bottomtexture)
|
if (always || this->bottomtexture)
|
||||||
this->bottomtexture = set->bottomtexture;
|
this->bottomtexture = set->bottomtexture;
|
||||||
|
|
||||||
if (lines[linenum].sidenum[1] == 0xffff)
|
if (lines[linenum].sidenum[1] == NO_INDEX)
|
||||||
continue; // One-sided stops here.
|
continue; // One-sided stops here.
|
||||||
|
|
||||||
// Back side
|
// Back side
|
||||||
@@ -2658,16 +2684,18 @@ static void P_ProcessLineSpecial(line_t *line, mobj_t *mo, sector_t *callsec)
|
|||||||
sector_t *sec;
|
sector_t *sec;
|
||||||
mobj_t *thing;
|
mobj_t *thing;
|
||||||
|
|
||||||
if (line->sidenum[1] != 0xffff)
|
if (line->sidenum[1] != NO_INDEX)
|
||||||
state = (statenum_t)sides[line->sidenum[1]].toptexture;
|
state = (statenum_t)sides[line->sidenum[1]].toptexture;
|
||||||
|
|
||||||
while ((secnum = P_FindSectorFromLineTag(line, secnum)) >= 0)
|
while ((secnum = P_FindSectorFromLineTag(line, secnum)) >= 0)
|
||||||
{
|
{
|
||||||
boolean tryagain;
|
boolean tryagain;
|
||||||
sec = sectors + secnum;
|
sec = sectors + secnum;
|
||||||
|
|
||||||
do {
|
do {
|
||||||
tryagain = false;
|
tryagain = false;
|
||||||
for (thing = sec->thinglist; thing; thing = thing->snext)
|
for (thing = sec->thinglist; thing; thing = thing->snext)
|
||||||
|
{
|
||||||
if (thing->type == type)
|
if (thing->type == type)
|
||||||
{
|
{
|
||||||
if (state != NUMSTATES)
|
if (state != NUMSTATES)
|
||||||
@@ -2684,6 +2712,7 @@ static void P_ProcessLineSpecial(line_t *line, mobj_t *mo, sector_t *callsec)
|
|||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
}
|
||||||
} while (tryagain);
|
} while (tryagain);
|
||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
@@ -2961,10 +2990,10 @@ sector_t *P_PlayerTouchingSectorSpecial(player_t *player, INT32 section, INT32 n
|
|||||||
{
|
{
|
||||||
fixed_t topheight, bottomheight;
|
fixed_t topheight, bottomheight;
|
||||||
|
|
||||||
if (GETSECSPECIAL(rover->master->frontsector->special, section) != number)
|
if (!(rover->flags & FF_EXISTS))
|
||||||
continue;
|
continue;
|
||||||
|
|
||||||
if (!(rover->flags & FF_EXISTS))
|
if (GETSECSPECIAL(rover->master->frontsector->special, section) != number)
|
||||||
continue;
|
continue;
|
||||||
|
|
||||||
topheight = P_GetSpecialTopZ(player->mo, sectors + rover->secnum, player->mo->subsector->sector);
|
topheight = P_GetSpecialTopZ(player->mo, sectors + rover->secnum, player->mo->subsector->sector);
|
||||||
@@ -3259,6 +3288,7 @@ void P_ProcessSpecialSector(player_t *player, sector_t *sector, sector_t *rovers
|
|||||||
case 3: // Linedef executor requires all players present // Trigger Linedef Exec (Floor Touch, All Players)
|
case 3: // Linedef executor requires all players present // Trigger Linedef Exec (Floor Touch, All Players)
|
||||||
/// \todo check continues for proper splitscreen support?
|
/// \todo check continues for proper splitscreen support?
|
||||||
for (i = 0; i < MAXPLAYERS; i++)
|
for (i = 0; i < MAXPLAYERS; i++)
|
||||||
|
{
|
||||||
if (playeringame[i] && !players[i].bot && players[i].mo && (gametype != GT_COOP || players[i].lives > 0))
|
if (playeringame[i] && !players[i].bot && players[i].mo && (gametype != GT_COOP || players[i].lives > 0))
|
||||||
{
|
{
|
||||||
if (roversector)
|
if (roversector)
|
||||||
@@ -3312,6 +3342,7 @@ void P_ProcessSpecialSector(player_t *player, sector_t *sector, sector_t *rovers
|
|||||||
goto DoneSection2;
|
goto DoneSection2;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
}
|
||||||
/* FALLTHRU */
|
/* FALLTHRU */
|
||||||
case 4: // Linedef executor that doesn't require touching floor // Trigger Linedef Exec (Anywhere in Sector)
|
case 4: // Linedef executor that doesn't require touching floor // Trigger Linedef Exec (Anywhere in Sector)
|
||||||
case 5: // Linedef executor // Trigger Linedef Exec (Floor Touch)
|
case 5: // Linedef executor // Trigger Linedef Exec (Floor Touch)
|
||||||
@@ -3385,14 +3416,16 @@ DoneSection2:
|
|||||||
{
|
{
|
||||||
const fixed_t hscale = mapobjectscale + (mapobjectscale - player->mo->scale);
|
const fixed_t hscale = mapobjectscale + (mapobjectscale - player->mo->scale);
|
||||||
const fixed_t minspeed = 24*hscale;
|
const fixed_t minspeed = 24*hscale;
|
||||||
angle_t pushangle = FixedHypot(player->mo->momx, player->mo->momy) ? R_PointToAngle2(0, 0, player->mo->momx, player->mo->momy) : player->mo->angle;
|
|
||||||
// if we have no speed for SOME REASON, use the player's angle, otherwise we'd be forcefully thrusted to what I can only assume is angle 0
|
|
||||||
|
|
||||||
if (player->mo->eflags & MFE_SPRUNG)
|
if (player->mo->eflags & MFE_SPRUNG)
|
||||||
break;
|
break;
|
||||||
|
|
||||||
if (player->speed < minspeed) // Push forward to prevent getting stuck
|
if (player->speed < minspeed) // Push forward to prevent getting stuck
|
||||||
|
{
|
||||||
|
// if we have no speed for SOME REASON, use the player's angle, otherwise we'd be forcefully thrusted to what I can only assume is angle 0
|
||||||
|
const angle_t pushangle = FixedHypot(player->mo->momx, player->mo->momy) ? R_PointToAngle2(0, 0, player->mo->momx, player->mo->momy) : player->mo->angle;
|
||||||
P_InstaThrust(player->mo, pushangle, minspeed);
|
P_InstaThrust(player->mo, pushangle, minspeed);
|
||||||
|
}
|
||||||
|
|
||||||
player->kartstuff[k_pogospring] = 1;
|
player->kartstuff[k_pogospring] = 1;
|
||||||
K_DoPogoSpring(player->mo, 0, 1);
|
K_DoPogoSpring(player->mo, 0, 1);
|
||||||
@@ -3408,16 +3441,22 @@ DoneSection2:
|
|||||||
const fixed_t hscale = mapobjectscale + (mapobjectscale - player->mo->scale);
|
const fixed_t hscale = mapobjectscale + (mapobjectscale - player->mo->scale);
|
||||||
const fixed_t minspeed = 24*hscale;
|
const fixed_t minspeed = 24*hscale;
|
||||||
const fixed_t maxspeed = 28*hscale;
|
const fixed_t maxspeed = 28*hscale;
|
||||||
angle_t pushangle = FixedHypot(player->mo->momx, player->mo->momy) ? R_PointToAngle2(0, 0, player->mo->momx, player->mo->momy) : player->mo->angle;
|
|
||||||
// if we have no speed for SOME REASON, use the player's angle, otherwise we'd be forcefully thrusted to what I can only assume is angle 0
|
|
||||||
|
|
||||||
if (player->mo->eflags & MFE_SPRUNG)
|
if (player->mo->eflags & MFE_SPRUNG)
|
||||||
break;
|
break;
|
||||||
|
|
||||||
if (player->speed > maxspeed) // Prevent overshooting jumps
|
if (player->speed > maxspeed) // Prevent overshooting jumps
|
||||||
|
{
|
||||||
|
// if we have no speed for SOME REASON, use the player's angle, otherwise we'd be forcefully thrusted to what I can only assume is angle 0
|
||||||
|
const angle_t pushangle = FixedHypot(player->mo->momx, player->mo->momy) ? R_PointToAngle2(0, 0, player->mo->momx, player->mo->momy) : player->mo->angle;
|
||||||
P_InstaThrust(player->mo, pushangle, maxspeed);
|
P_InstaThrust(player->mo, pushangle, maxspeed);
|
||||||
|
}
|
||||||
else if (player->speed < minspeed) // Push forward to prevent getting stuck
|
else if (player->speed < minspeed) // Push forward to prevent getting stuck
|
||||||
|
{
|
||||||
|
// if we have no speed for SOME REASON, use the player's angle, otherwise we'd be forcefully thrusted to what I can only assume is angle 0
|
||||||
|
const angle_t pushangle = FixedHypot(player->mo->momx, player->mo->momy) ? R_PointToAngle2(0, 0, player->mo->momx, player->mo->momy) : player->mo->angle;
|
||||||
P_InstaThrust(player->mo, pushangle, minspeed);
|
P_InstaThrust(player->mo, pushangle, minspeed);
|
||||||
|
}
|
||||||
|
|
||||||
player->kartstuff[k_pogospring] = 2;
|
player->kartstuff[k_pogospring] = 2;
|
||||||
K_DoPogoSpring(player->mo, 0, 1);
|
K_DoPogoSpring(player->mo, 0, 1);
|
||||||
@@ -3436,11 +3475,14 @@ DoneSection2:
|
|||||||
|
|
||||||
if (i != -1)
|
if (i != -1)
|
||||||
{
|
{
|
||||||
|
INT32 sfxnum;
|
||||||
angle_t lineangle;
|
angle_t lineangle;
|
||||||
fixed_t linespeed;
|
fixed_t linespeed;
|
||||||
|
|
||||||
lineangle = lines[i].angle;
|
const line_t *line = &lines[i];
|
||||||
linespeed = P_AproxDistance(lines[i].v2->x-lines[i].v1->x, lines[i].v2->y-lines[i].v1->y);
|
|
||||||
|
lineangle = line->angle;
|
||||||
|
linespeed = P_AproxDistance(line->v2->x-line->v1->x, line->v2->y-line->v1->y);
|
||||||
|
|
||||||
player->mo->angle = lineangle;
|
player->mo->angle = lineangle;
|
||||||
|
|
||||||
@@ -3454,7 +3496,7 @@ DoneSection2:
|
|||||||
P_ForceLocalAngle(player, player->mo->angle);
|
P_ForceLocalAngle(player, player->mo->angle);
|
||||||
}
|
}
|
||||||
|
|
||||||
if (!(lines[i].flags & ML_EFFECT4))
|
if (!(line->flags & ML_EFFECT4))
|
||||||
{
|
{
|
||||||
P_UnsetThingPosition(player->mo);
|
P_UnsetThingPosition(player->mo);
|
||||||
if (roversector) // make FOF speed pads work
|
if (roversector) // make FOF speed pads work
|
||||||
@@ -3476,7 +3518,14 @@ DoneSection2:
|
|||||||
player->kartstuff[k_drift] = 0;
|
player->kartstuff[k_drift] = 0;
|
||||||
player->kartstuff[k_driftcharge] = 0;
|
player->kartstuff[k_driftcharge] = 0;
|
||||||
player->kartstuff[k_pogospring] = 0;
|
player->kartstuff[k_pogospring] = 0;
|
||||||
S_StartSound(player->mo, sfx_spdpad);
|
|
||||||
|
sfxnum = sides[line->sidenum[0]].toptexture;
|
||||||
|
|
||||||
|
// none or invalid sound?
|
||||||
|
if (sfxnum <= sfx_None || sfxnum >= NUMSFX)
|
||||||
|
sfxnum = sfx_spdpad; // use the zippy sound then!
|
||||||
|
|
||||||
|
S_StartSound(player->mo, sfxnum);
|
||||||
|
|
||||||
{
|
{
|
||||||
sfxenum_t pick = P_RandomKey(2); // Gotta roll the RNG every time this is called for sync reasons
|
sfxenum_t pick = P_RandomKey(2); // Gotta roll the RNG every time this is called for sync reasons
|
||||||
@@ -3525,21 +3574,25 @@ DoneSection2:
|
|||||||
P_DoPlayerExit(player);
|
P_DoPlayerExit(player);
|
||||||
|
|
||||||
P_SetupSignExit(player);
|
P_SetupSignExit(player);
|
||||||
// important: use sector->tag on next line instead of player->mo->subsector->tag
|
|
||||||
// this part is different from in P_PlayerThink, this is what was causing
|
|
||||||
// FOF custom exits not to work.
|
|
||||||
lineindex = P_FindSpecialLineFromTag(2, sector->tag, -1);
|
|
||||||
|
|
||||||
if (gametype == GT_COOP && lineindex != -1) // Custom exit!
|
if (gametype == GT_COOP)
|
||||||
{
|
{
|
||||||
// Special goodies with the block monsters flag depending on emeralds collected
|
// important: use sector->tag on next line instead of player->mo->subsector->tag
|
||||||
if ((lines[lineindex].flags & ML_BLOCKMONSTERS) && ALL7EMERALDS(emeralds))
|
// this part is different from in P_PlayerThink, this is what was causing
|
||||||
nextmapoverride = (INT16)(lines[lineindex].frontsector->ceilingheight>>FRACBITS);
|
// FOF custom exits not to work.
|
||||||
else
|
lineindex = P_FindSpecialLineFromTag(2, sector->tag, -1);
|
||||||
nextmapoverride = (INT16)(lines[lineindex].frontsector->floorheight>>FRACBITS);
|
|
||||||
|
|
||||||
if (lines[lineindex].flags & ML_NOCLIMB)
|
if (lineindex != -1) // Custom exit!)
|
||||||
skipstats = true;
|
{
|
||||||
|
// Special goodies with the block monsters flag depending on emeralds collected
|
||||||
|
if ((lines[lineindex].flags & ML_BLOCKMONSTERS) && ALL7EMERALDS(emeralds))
|
||||||
|
nextmapoverride = (INT16)(lines[lineindex].frontsector->ceilingheight>>FRACBITS);
|
||||||
|
else
|
||||||
|
nextmapoverride = (INT16)(lines[lineindex].frontsector->floorheight>>FRACBITS);
|
||||||
|
|
||||||
|
if (lines[lineindex].flags & ML_NOCLIMB)
|
||||||
|
skipstats = true;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
@@ -3645,7 +3698,6 @@ DoneSection2:
|
|||||||
thinker_t *th;
|
thinker_t *th;
|
||||||
mobj_t *waypoint = NULL;
|
mobj_t *waypoint = NULL;
|
||||||
mobj_t *mo2;
|
mobj_t *mo2;
|
||||||
angle_t an;
|
|
||||||
|
|
||||||
if (player->mo->tracer && player->mo->tracer->type == MT_TUBEWAYPOINT)
|
if (player->mo->tracer && player->mo->tracer->type == MT_TUBEWAYPOINT)
|
||||||
break;
|
break;
|
||||||
@@ -3693,10 +3745,13 @@ DoneSection2:
|
|||||||
CONS_Debug(DBG_GAMELOGIC, "Waypoint %d found in sequence %d - speed = %d\n", waypoint->health, sequence, speed);
|
CONS_Debug(DBG_GAMELOGIC, "Waypoint %d found in sequence %d - speed = %d\n", waypoint->health, sequence, speed);
|
||||||
}
|
}
|
||||||
|
|
||||||
an = R_PointToAngle2(player->mo->x, player->mo->y, waypoint->x, waypoint->y) - player->mo->angle;
|
if (!(lines[lineindex].flags & ML_EFFECT4))
|
||||||
|
{
|
||||||
|
const angle_t an = R_PointToAngle2(player->mo->x, player->mo->y, waypoint->x, waypoint->y) - player->mo->angle;
|
||||||
|
|
||||||
if (an > ANGLE_90 && an < ANGLE_270 && !(lines[lineindex].flags & ML_EFFECT4))
|
if (an > ANGLE_90 && an < ANGLE_270)
|
||||||
break; // behind back
|
break; // behind back
|
||||||
|
}
|
||||||
|
|
||||||
P_SetTarget(&player->mo->tracer, waypoint);
|
P_SetTarget(&player->mo->tracer, waypoint);
|
||||||
player->speed = speed;
|
player->speed = speed;
|
||||||
@@ -3718,7 +3773,6 @@ DoneSection2:
|
|||||||
thinker_t *th;
|
thinker_t *th;
|
||||||
mobj_t *waypoint = NULL;
|
mobj_t *waypoint = NULL;
|
||||||
mobj_t *mo2;
|
mobj_t *mo2;
|
||||||
angle_t an;
|
|
||||||
|
|
||||||
if (player->mo->tracer && player->mo->tracer->type == MT_TUBEWAYPOINT)
|
if (player->mo->tracer && player->mo->tracer->type == MT_TUBEWAYPOINT)
|
||||||
break;
|
break;
|
||||||
@@ -3766,10 +3820,13 @@ DoneSection2:
|
|||||||
CONS_Debug(DBG_GAMELOGIC, "Waypoint %d found in sequence %d - speed = %d\n", waypoint->health, sequence, speed);
|
CONS_Debug(DBG_GAMELOGIC, "Waypoint %d found in sequence %d - speed = %d\n", waypoint->health, sequence, speed);
|
||||||
}
|
}
|
||||||
|
|
||||||
an = R_PointToAngle2(player->mo->x, player->mo->y, waypoint->x, waypoint->y) - player->mo->angle;
|
if (!(lines[lineindex].flags & ML_EFFECT4))
|
||||||
|
{
|
||||||
|
const angle_t an = R_PointToAngle2(player->mo->x, player->mo->y, waypoint->x, waypoint->y) - player->mo->angle;
|
||||||
|
|
||||||
if (an > ANGLE_90 && an < ANGLE_270 && !(lines[lineindex].flags & ML_EFFECT4))
|
if (an > ANGLE_90 && an < ANGLE_270)
|
||||||
break; // behind back
|
break; // behind back
|
||||||
|
}
|
||||||
|
|
||||||
P_SetTarget(&player->mo->tracer, waypoint);
|
P_SetTarget(&player->mo->tracer, waypoint);
|
||||||
player->speed = speed;
|
player->speed = speed;
|
||||||
@@ -3783,10 +3840,13 @@ DoneSection2:
|
|||||||
|
|
||||||
case 10: // Finish Line
|
case 10: // Finish Line
|
||||||
// SRB2kart - 150117
|
// SRB2kart - 150117
|
||||||
if (G_RaceGametype() && (player->starpostnum >= (numstarposts - (numstarposts/2)) || player->exiting))
|
if (!G_RaceGametype())
|
||||||
|
break;
|
||||||
|
|
||||||
|
if (player->starpostnum >= (numstarposts - (numstarposts/2)) || player->exiting)
|
||||||
player->kartstuff[k_starpostwp] = player->kartstuff[k_waypoint] = 0;
|
player->kartstuff[k_starpostwp] = player->kartstuff[k_waypoint] = 0;
|
||||||
//
|
//
|
||||||
if (G_RaceGametype() && !player->exiting)
|
if (!player->exiting)
|
||||||
{
|
{
|
||||||
if (player->starpostnum >= (numstarposts - (numstarposts/2))) // srb2kart: must have touched *enough* starposts (was originally "(player->starpostnum == numstarposts)")
|
if (player->starpostnum >= (numstarposts - (numstarposts/2))) // srb2kart: must have touched *enough* starposts (was originally "(player->starpostnum == numstarposts)")
|
||||||
{
|
{
|
||||||
@@ -3820,7 +3880,7 @@ DoneSection2:
|
|||||||
|
|
||||||
player->kartstuff[k_lapanimation] = 80;
|
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)
|
||||||
@@ -4503,27 +4563,13 @@ void P_PlayerInSpecialSector(player_t *player)
|
|||||||
|
|
||||||
#undef TELEPORTED
|
#undef TELEPORTED
|
||||||
|
|
||||||
/** Animate planes, scroll walls, etc. and keeps track of level timelimit and exits if time is up.
|
static void P_UpdateAnimFlats(void)
|
||||||
*
|
|
||||||
* \sa P_CheckTimeLimit, P_CheckPointLimit
|
|
||||||
*/
|
|
||||||
void P_UpdateSpecials(void)
|
|
||||||
{
|
{
|
||||||
anim_t *anim;
|
anim_t *anim;
|
||||||
INT32 i;
|
INT32 i;
|
||||||
size_t j;
|
size_t j;
|
||||||
levelflat_t *foundflats; // for flat animation
|
levelflat_t *foundflats; // for flat animation
|
||||||
|
|
||||||
// LEVEL TIMER
|
|
||||||
P_CheckTimeLimit();
|
|
||||||
|
|
||||||
// POINT LIMIT
|
|
||||||
P_CheckPointLimit();
|
|
||||||
|
|
||||||
// Dynamic slopeness
|
|
||||||
if (!midgamejoin) // run here when not joined midgame to prevent any potential issues that may arise
|
|
||||||
P_RunDynamicSlopes();
|
|
||||||
|
|
||||||
// ANIMATE TEXTURES
|
// ANIMATE TEXTURES
|
||||||
for (anim = anims; anim < lastanim; anim++)
|
for (anim = anims; anim < lastanim; anim++)
|
||||||
{
|
{
|
||||||
@@ -4553,15 +4599,40 @@ void P_UpdateSpecials(void)
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/** Animate planes, scroll walls, etc. and keeps track of level timelimit and exits if time is up.
|
||||||
|
*
|
||||||
|
* \sa P_CheckTimeLimit, P_CheckPointLimit
|
||||||
|
*/
|
||||||
|
void P_UpdateSpecials(void)
|
||||||
|
{
|
||||||
|
// LEVEL TIMER
|
||||||
|
P_CheckTimeLimit();
|
||||||
|
|
||||||
|
// POINT LIMIT
|
||||||
|
P_CheckPointLimit();
|
||||||
|
|
||||||
|
#ifdef COMPAT_VANILLA
|
||||||
|
// Dynamic slopeness
|
||||||
|
// we run this here only when not joined midrace
|
||||||
|
// for vanilla compat reasons :chaosleep:
|
||||||
|
if (!midgamejoin)
|
||||||
|
P_RunDynamicSlopes();
|
||||||
|
#endif
|
||||||
|
|
||||||
|
P_UpdateAnimFlats();
|
||||||
|
}
|
||||||
|
|
||||||
static inline ffloor_t *P_GetFFloorBySec(sector_t *sec, sector_t *sec2)
|
static inline ffloor_t *P_GetFFloorBySec(sector_t *sec, sector_t *sec2)
|
||||||
{
|
{
|
||||||
ffloor_t *rover;
|
ffloor_t *rover;
|
||||||
|
|
||||||
if (!sec->ffloors)
|
if (!sec->ffloors)
|
||||||
return NULL;
|
return NULL;
|
||||||
|
|
||||||
for (rover = sec->ffloors; rover; rover = rover->next)
|
for (rover = sec->ffloors; rover; rover = rover->next)
|
||||||
if (rover->secnum == (size_t)(sec2 - sectors))
|
if (rover->secnum == (size_t)(sec2 - sectors))
|
||||||
return rover;
|
return rover;
|
||||||
|
|
||||||
return NULL;
|
return NULL;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -4612,6 +4683,7 @@ static ffloor_t *P_AddFakeFloor(sector_t *sec, sector_t *sec2, line_t *master, f
|
|||||||
|
|
||||||
if (sec == sec2)
|
if (sec == sec2)
|
||||||
return NULL; //Don't need a fake floor on a control sector.
|
return NULL; //Don't need a fake floor on a control sector.
|
||||||
|
|
||||||
if ((ffloor = (P_GetFFloorBySec(sec, sec2))))
|
if ((ffloor = (P_GetFFloorBySec(sec, sec2))))
|
||||||
return ffloor; // If this ffloor already exists, return it
|
return ffloor; // If this ffloor already exists, return it
|
||||||
|
|
||||||
@@ -4718,7 +4790,7 @@ static ffloor_t *P_AddFakeFloor(sector_t *sec, sector_t *sec2, line_t *master, f
|
|||||||
P_AddSpikeThinker(sec, (INT32)sec2num);
|
P_AddSpikeThinker(sec, (INT32)sec2num);
|
||||||
}
|
}
|
||||||
// Should this FOF have friction?
|
// Should this FOF have friction?
|
||||||
else if(th->function == (actionf_p1)T_Friction)
|
else if (th->function == (actionf_p1)T_Friction)
|
||||||
{
|
{
|
||||||
f = (friction_t *)th;
|
f = (friction_t *)th;
|
||||||
|
|
||||||
@@ -4726,7 +4798,7 @@ static ffloor_t *P_AddFakeFloor(sector_t *sec, sector_t *sec2, line_t *master, f
|
|||||||
Add_Friction(f->friction, f->movefactor, (INT32)(sec-sectors), f->affectee);
|
Add_Friction(f->friction, f->movefactor, (INT32)(sec-sectors), f->affectee);
|
||||||
}
|
}
|
||||||
// Should this FOF have wind/current/pusher?
|
// Should this FOF have wind/current/pusher?
|
||||||
else if(th->function == (actionf_p1)T_Pusher)
|
else if (th->function == (actionf_p1)T_Pusher)
|
||||||
{
|
{
|
||||||
p = (pusher_t *)th;
|
p = (pusher_t *)th;
|
||||||
|
|
||||||
@@ -5164,11 +5236,18 @@ void T_LaserFlash(laserthink_t *flash)
|
|||||||
if (thing->health <= 0)
|
if (thing->health <= 0)
|
||||||
continue;
|
continue;
|
||||||
|
|
||||||
|
// thing is neither shootable nor an egg guard shield
|
||||||
|
if (!(thing->flags & MF_SHOOTABLE) && (thing->type != MT_EGGSHIELD))
|
||||||
|
continue;
|
||||||
|
|
||||||
top = P_GetSpecialTopZ(thing, sourcesec, sector);
|
top = P_GetSpecialTopZ(thing, sourcesec, sector);
|
||||||
|
|
||||||
|
if (thing->z >= top)
|
||||||
|
continue;
|
||||||
|
|
||||||
bottom = P_GetSpecialBottomZ(thing, sourcesec, sector);
|
bottom = P_GetSpecialBottomZ(thing, sourcesec, sector);
|
||||||
|
|
||||||
if (thing->z >= top
|
if (thing->z + thing->height <= bottom)
|
||||||
|| thing->z + thing->height <= bottom)
|
|
||||||
continue;
|
continue;
|
||||||
|
|
||||||
if (thing->flags & MF_SHOOTABLE)
|
if (thing->flags & MF_SHOOTABLE)
|
||||||
@@ -5223,6 +5302,18 @@ static void P_RunLevelLoadExecutors(void)
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
static fixed_t P_GetSectorGravityFactor(sector_t *sec)
|
||||||
|
{
|
||||||
|
return FixedDiv(*sec->gravity >> FRACBITS, 1000);
|
||||||
|
}
|
||||||
|
|
||||||
|
fixed_t P_GetSectorGravity(sector_t *sec)
|
||||||
|
{
|
||||||
|
if (sec && sec->gravity)
|
||||||
|
return FixedMul(gravity, P_GetSectorGravityFactor(sec));
|
||||||
|
return gravity;
|
||||||
|
}
|
||||||
|
|
||||||
/** After the map has loaded, scans for specials that spawn 3Dfloors and
|
/** After the map has loaded, scans for specials that spawn 3Dfloors and
|
||||||
* thinkers.
|
* thinkers.
|
||||||
*
|
*
|
||||||
@@ -5262,7 +5353,7 @@ void P_SpawnSpecials(INT32 fromnetsave, boolean reloadinggamestate)
|
|||||||
continue;
|
continue;
|
||||||
|
|
||||||
// Process Section 1
|
// Process Section 1
|
||||||
switch(GETSECSPECIAL(sector->special, 1))
|
switch (GETSECSPECIAL(sector->special, 1))
|
||||||
{
|
{
|
||||||
case 5: // Spikes
|
case 5: // Spikes
|
||||||
P_AddSpikeThinker(sector, (INT32)(sector-sectors));
|
P_AddSpikeThinker(sector, (INT32)(sector-sectors));
|
||||||
@@ -5274,7 +5365,7 @@ void P_SpawnSpecials(INT32 fromnetsave, boolean reloadinggamestate)
|
|||||||
}
|
}
|
||||||
|
|
||||||
// Process Section 2
|
// Process Section 2
|
||||||
switch(GETSECSPECIAL(sector->special, 2))
|
switch (GETSECSPECIAL(sector->special, 2))
|
||||||
{
|
{
|
||||||
case 10: // Time for special stage
|
case 10: // Time for special stage
|
||||||
sstimer = (sector->floorheight>>FRACBITS) * TICRATE + 6; // Time to finish
|
sstimer = (sector->floorheight>>FRACBITS) * TICRATE + 6; // Time to finish
|
||||||
@@ -5287,7 +5378,7 @@ void P_SpawnSpecials(INT32 fromnetsave, boolean reloadinggamestate)
|
|||||||
}
|
}
|
||||||
|
|
||||||
// Process Section 4
|
// Process Section 4
|
||||||
switch(GETSECSPECIAL(sector->special, 4))
|
switch (GETSECSPECIAL(sector->special, 4))
|
||||||
{
|
{
|
||||||
case 10: // Circuit finish line
|
case 10: // Circuit finish line
|
||||||
if (G_RaceGametype())
|
if (G_RaceGametype())
|
||||||
@@ -5323,11 +5414,13 @@ void P_SpawnSpecials(INT32 fromnetsave, boolean reloadinggamestate)
|
|||||||
// Allocate each list, and then zero the count so we can use it to track
|
// Allocate each list, and then zero the count so we can use it to track
|
||||||
// the end of the list as we add the thinkers
|
// the end of the list as we add the thinkers
|
||||||
for (i = 0; i < numsectors; i++)
|
for (i = 0; i < numsectors; i++)
|
||||||
if(secthinkers[i].count > 0)
|
{
|
||||||
|
if (secthinkers[i].count > 0)
|
||||||
{
|
{
|
||||||
secthinkers[i].thinkers = Z_Malloc(secthinkers[i].count * sizeof(thinker_t *), PU_STATIC, NULL);
|
secthinkers[i].thinkers = Z_Malloc(secthinkers[i].count * sizeof(thinker_t *), PU_STATIC, NULL);
|
||||||
secthinkers[i].count = 0;
|
secthinkers[i].count = 0;
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
|
||||||
// Finally, populate the lists.
|
// Finally, populate the lists.
|
||||||
for (th = thinkercap.next; th != &thinkercap; th = th->next)
|
for (th = thinkercap.next; th != &thinkercap; th = th->next)
|
||||||
@@ -5407,6 +5500,7 @@ void P_SpawnSpecials(INT32 fromnetsave, boolean reloadinggamestate)
|
|||||||
if ((lines[i].flags & (ML_NOSONIC|ML_NOTAILS)) != (ML_NOSONIC|ML_NOTAILS)) // If you can do something...
|
if ((lines[i].flags & (ML_NOSONIC|ML_NOTAILS)) != (ML_NOSONIC|ML_NOTAILS)) // If you can do something...
|
||||||
{
|
{
|
||||||
angle_t flatangle = InvAngle(lines[i].angle);
|
angle_t flatangle = InvAngle(lines[i].angle);
|
||||||
|
|
||||||
fixed_t xoffs;
|
fixed_t xoffs;
|
||||||
fixed_t yoffs;
|
fixed_t yoffs;
|
||||||
|
|
||||||
@@ -5979,7 +6073,7 @@ void P_SpawnSpecials(INT32 fromnetsave, boolean reloadinggamestate)
|
|||||||
break;
|
break;
|
||||||
|
|
||||||
case 259: // Make-Your-Own FOF!
|
case 259: // Make-Your-Own FOF!
|
||||||
if (lines[i].sidenum[1] != 0xffff)
|
if (lines[i].sidenum[1] != NO_INDEX)
|
||||||
{
|
{
|
||||||
UINT8 *data;
|
UINT8 *data;
|
||||||
UINT16 b;
|
UINT16 b;
|
||||||
@@ -6426,15 +6520,19 @@ void T_Scroll(scroll_t *s)
|
|||||||
if (thing->flags2 & MF2_PUSHED) // Already pushed this tic by an exclusive pusher.
|
if (thing->flags2 & MF2_PUSHED) // Already pushed this tic by an exclusive pusher.
|
||||||
continue;
|
continue;
|
||||||
|
|
||||||
height = P_GetSpecialBottomZ(thing, sec, psec);
|
|
||||||
|
|
||||||
if (!(thing->flags & MF_NOCLIP)) // Thing must be clipped
|
if (!(thing->flags & MF_NOCLIP)) // Thing must be clipped
|
||||||
if (!(thing->flags & MF_NOGRAVITY || thing->z+thing->height != height)) // Thing must a) be non-floating and have z+height == height
|
|
||||||
{
|
{
|
||||||
// Move objects only if on floor
|
height = P_GetSpecialBottomZ(thing, sec, psec);
|
||||||
// non-floating, and clipped.
|
|
||||||
P_DoScrollMove(thing, dx, dy, s->exclusive);
|
if (!(thing->flags & MF_NOGRAVITY || thing->z+thing->height != height)) // Thing must a) be non-floating and have z+height == height
|
||||||
|
{
|
||||||
|
// Move objects only if on floor
|
||||||
|
// non-floating, and clipped.
|
||||||
|
P_DoScrollMove(thing, dx, dy, s->exclusive);
|
||||||
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
} // end of for loop through touching_thinglist
|
} // end of for loop through touching_thinglist
|
||||||
} // end of loop through sectors
|
} // end of loop through sectors
|
||||||
}
|
}
|
||||||
@@ -6448,14 +6546,16 @@ void T_Scroll(scroll_t *s)
|
|||||||
if (thing->flags2 & MF2_PUSHED)
|
if (thing->flags2 & MF2_PUSHED)
|
||||||
continue;
|
continue;
|
||||||
|
|
||||||
height = P_GetSpecialBottomZ(thing, sec, sec);
|
if (!(thing->flags & MF_NOCLIP)) // Thing must be clipped
|
||||||
|
|
||||||
if (!(thing->flags & MF_NOCLIP) &&
|
|
||||||
(!(thing->flags & MF_NOGRAVITY || thing->z > height)))
|
|
||||||
{
|
{
|
||||||
// Move objects only if on floor or underwater,
|
height = P_GetSpecialBottomZ(thing, sec, sec);
|
||||||
// non-floating, and clipped.
|
|
||||||
P_DoScrollMove(thing, dx, dy, s->exclusive);
|
if (!(thing->flags & MF_NOGRAVITY || thing->z > height))
|
||||||
|
{
|
||||||
|
// Move objects only if on floor or underwater,
|
||||||
|
// non-floating, and clipped.
|
||||||
|
P_DoScrollMove(thing, dx, dy, s->exclusive);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -6501,14 +6601,16 @@ void T_Scroll(scroll_t *s)
|
|||||||
if (thing->flags2 & MF2_PUSHED)
|
if (thing->flags2 & MF2_PUSHED)
|
||||||
continue;
|
continue;
|
||||||
|
|
||||||
height = P_GetSpecialTopZ(thing, sec, psec);
|
|
||||||
|
|
||||||
if (!(thing->flags & MF_NOCLIP)) // Thing must be clipped
|
if (!(thing->flags & MF_NOCLIP)) // Thing must be clipped
|
||||||
if (!(thing->flags & MF_NOGRAVITY || thing->z != height))// Thing must a) be non-floating and have z == height
|
|
||||||
{
|
{
|
||||||
// Move objects only if on floor or underwater,
|
height = P_GetSpecialTopZ(thing, sec, psec);
|
||||||
// non-floating, and clipped.
|
|
||||||
P_DoScrollMove(thing, dx, dy, s->exclusive);
|
if (!(thing->flags & MF_NOGRAVITY || thing->z != height))// Thing must a) be non-floating and have z == height
|
||||||
|
{
|
||||||
|
// Move objects only if on floor or underwater,
|
||||||
|
// non-floating, and clipped.
|
||||||
|
P_DoScrollMove(thing, dx, dy, s->exclusive);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
} // end of for loop through touching_thinglist
|
} // end of for loop through touching_thinglist
|
||||||
} // end of loop through sectors
|
} // end of loop through sectors
|
||||||
@@ -6523,14 +6625,16 @@ void T_Scroll(scroll_t *s)
|
|||||||
if (thing->flags2 & MF2_PUSHED)
|
if (thing->flags2 & MF2_PUSHED)
|
||||||
continue;
|
continue;
|
||||||
|
|
||||||
height = P_GetSpecialTopZ(thing, sec, sec);
|
if (!(thing->flags & MF_NOCLIP)) // Thing must be clipped
|
||||||
|
|
||||||
if (!(thing->flags & MF_NOCLIP) &&
|
|
||||||
(!(thing->flags & MF_NOGRAVITY || thing->z+thing->height < height)))
|
|
||||||
{
|
{
|
||||||
// Move objects only if on floor or underwater,
|
height = P_GetSpecialTopZ(thing, sec, sec);
|
||||||
// non-floating, and clipped.
|
|
||||||
P_DoScrollMove(thing, dx, dy, s->exclusive);
|
if (!(thing->flags & MF_NOGRAVITY || thing->z+thing->height < height))
|
||||||
|
{
|
||||||
|
// Move objects only if on floor or underwater,
|
||||||
|
// non-floating, and clipped.
|
||||||
|
P_DoScrollMove(thing, dx, dy, s->exclusive);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -6698,7 +6802,7 @@ static void P_SpawnScrollers(void)
|
|||||||
case 506:
|
case 506:
|
||||||
s = lines[i].sidenum[1];
|
s = lines[i].sidenum[1];
|
||||||
|
|
||||||
if (s != 0xffff)
|
if (s != NO_INDEX)
|
||||||
Add_Scroller(sc_side, -sides[s].textureoffset, sides[s].rowoffset, -1, lines[i].sidenum[0], accel, 0);
|
Add_Scroller(sc_side, -sides[s].textureoffset, sides[s].rowoffset, -1, lines[i].sidenum[0], accel, 0);
|
||||||
else
|
else
|
||||||
CONS_Debug(DBG_GAMELOGIC, "Line special 506 (line #%s) missing 2nd side!\n", sizeu1(i));
|
CONS_Debug(DBG_GAMELOGIC, "Line special 506 (line #%s) missing 2nd side!\n", sizeu1(i));
|
||||||
@@ -6909,6 +7013,7 @@ static void P_SpawnFriction(void)
|
|||||||
INT32 movefactor; // applied to each player move to simulate inertia
|
INT32 movefactor; // applied to each player move to simulate inertia
|
||||||
|
|
||||||
for (i = 0; i < numlines; i++, l++)
|
for (i = 0; i < numlines; i++, l++)
|
||||||
|
{
|
||||||
if (l->special == 540)
|
if (l->special == 540)
|
||||||
{
|
{
|
||||||
//length = P_AproxDistance(l->dx, l->dy)>>FRACBITS;
|
//length = P_AproxDistance(l->dx, l->dy)>>FRACBITS;
|
||||||
@@ -6942,6 +7047,7 @@ static void P_SpawnFriction(void)
|
|||||||
for (s = -1; (s = P_FindSectorFromLineTag(l, s)) >= 0 ;)
|
for (s = -1; (s = P_FindSectorFromLineTag(l, s)) >= 0 ;)
|
||||||
Add_Friction(friction, movefactor, s, -1);
|
Add_Friction(friction, movefactor, s, -1);
|
||||||
}
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
/*
|
/*
|
||||||
@@ -6990,9 +7096,10 @@ static void Add_Pusher(pushertype_e type, fixed_t x_mag, fixed_t y_mag, mobj_t *
|
|||||||
// "The right triangle of the square of the length of the hypotenuse is equal to the sum of the squares of the lengths of the other two sides."
|
// "The right triangle of the square of the length of the hypotenuse is equal to the sum of the squares of the lengths of the other two sides."
|
||||||
// "Bah! Stupid brains! Don't you know anything besides the Pythagorean Theorem?" - Earthworm Jim
|
// "Bah! Stupid brains! Don't you know anything besides the Pythagorean Theorem?" - Earthworm Jim
|
||||||
if (type == p_downcurrent || type == p_upcurrent || type == p_upwind || type == p_downwind)
|
if (type == p_downcurrent || type == p_upcurrent || type == p_upwind || type == p_downwind)
|
||||||
p->magnitude = P_AproxDistance(p->x_mag,p->y_mag)<<(FRACBITS-PUSH_FACTOR);
|
p->magnitude = P_AproxDistance(p->x_mag, p->y_mag)<<(FRACBITS-PUSH_FACTOR);
|
||||||
else
|
else
|
||||||
p->magnitude = P_AproxDistance(p->x_mag,p->y_mag);
|
p->magnitude = P_AproxDistance(p->x_mag, p->y_mag);
|
||||||
|
|
||||||
if (source) // point source exist?
|
if (source) // point source exist?
|
||||||
{
|
{
|
||||||
// where force goes to zero
|
// where force goes to zero
|
||||||
@@ -7031,7 +7138,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;
|
||||||
@@ -7043,15 +7150,14 @@ static inline boolean PIT_PushThing(mobj_t *thing)
|
|||||||
|
|
||||||
// don't fade wrt Z if health & 2 (mapthing has multi flag)
|
// don't fade wrt Z if health & 2 (mapthing has multi flag)
|
||||||
if (tmpusher->source->health & 2)
|
if (tmpusher->source->health & 2)
|
||||||
dist = P_AproxDistance(thing->x - sx,thing->y - sy);
|
dist = P_AproxDistance(thing->x - sx, thing->y - sy);
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
// Make sure the Z is in range
|
// Make sure the Z is in range
|
||||||
if (thing->z < sz - tmpusher->radius || thing->z > sz + tmpusher->radius)
|
if (thing->z < sz - tmpusher->radius || thing->z > sz + tmpusher->radius)
|
||||||
return false;
|
return false;
|
||||||
|
|
||||||
dist = P_AproxDistance(P_AproxDistance(thing->x - sx, thing->y - sy),
|
dist = P_AproxDistance(P_AproxDistance(thing->x - sx, thing->y - sy), thing->z - sz);
|
||||||
thing->z - sz);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
speed = (tmpusher->magnitude - ((dist>>FRACBITS)>>1))<<(FRACBITS - PUSH_FACTOR - 1);
|
speed = (tmpusher->magnitude - ((dist>>FRACBITS)>>1))<<(FRACBITS - PUSH_FACTOR - 1);
|
||||||
@@ -7062,7 +7168,7 @@ static inline boolean PIT_PushThing(mobj_t *thing)
|
|||||||
// Written with bits and pieces of P_HomingAttack
|
// 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)
|
||||||
@@ -7214,7 +7320,6 @@ void T_Pusher(pusher_t *p)
|
|||||||
|
|
||||||
if (p->type == p_push)
|
if (p->type == p_push)
|
||||||
{
|
{
|
||||||
|
|
||||||
// Seek out all pushable things within the force radius of this
|
// Seek out all pushable things within the force radius of this
|
||||||
// point pusher. Crosses sectors, so use blockmap.
|
// point pusher. Crosses sectors, so use blockmap.
|
||||||
|
|
||||||
@@ -7257,13 +7362,16 @@ void T_Pusher(pusher_t *p)
|
|||||||
if (thing->flags2 & MF2_PUSHED)
|
if (thing->flags2 & MF2_PUSHED)
|
||||||
continue;
|
continue;
|
||||||
|
|
||||||
if (thing->player && thing->player->pflags & PF_ROPEHANG)
|
if (thing->player)
|
||||||
continue;
|
{
|
||||||
|
if (thing->player->pflags & PF_ROPEHANG)
|
||||||
|
continue;
|
||||||
|
|
||||||
if (thing->player && (thing->state == &states[thing->info->painstate])
|
if ((thing->state == &states[thing->info->painstate])
|
||||||
&& (thing->player->powers[pw_flashing] > (K_GetKartFlashing(thing->player)/4)*3
|
&& (thing->player->powers[pw_flashing] > (K_GetKartFlashing(thing->player)/4)*3
|
||||||
&& thing->player->powers[pw_flashing] <= K_GetKartFlashing(thing->player)))
|
&& thing->player->powers[pw_flashing] <= K_GetKartFlashing(thing->player)))
|
||||||
continue;
|
continue;
|
||||||
|
}
|
||||||
|
|
||||||
inFOF = touching = moved = false;
|
inFOF = touching = moved = false;
|
||||||
|
|
||||||
@@ -7393,7 +7501,7 @@ void T_Pusher(pusher_t *p)
|
|||||||
if (p->slider && thing->player)
|
if (p->slider && thing->player)
|
||||||
{
|
{
|
||||||
boolean jumped = (thing->player->pflags & PF_JUMPED);
|
boolean jumped = (thing->player->pflags & PF_JUMPED);
|
||||||
P_ResetPlayer (thing->player);
|
P_ResetPlayer(thing->player);
|
||||||
|
|
||||||
if (jumped)
|
if (jumped)
|
||||||
thing->player->pflags |= PF_JUMPED;
|
thing->player->pflags |= PF_JUMPED;
|
||||||
@@ -7461,16 +7569,17 @@ static void P_SpawnPushers(void)
|
|||||||
mobj_t *thing;
|
mobj_t *thing;
|
||||||
|
|
||||||
for (i = 0; i < numlines; i++, l++)
|
for (i = 0; i < numlines; i++, l++)
|
||||||
|
{
|
||||||
switch (l->special)
|
switch (l->special)
|
||||||
{
|
{
|
||||||
case 541: // wind
|
case 541: // wind
|
||||||
for (s = -1; (s = P_FindSectorFromLineTag(l, s)) >= 0 ;)
|
for (s = -1; (s = P_FindSectorFromLineTag(l, s)) >= 0 ;)
|
||||||
Add_Pusher(p_wind, l->dx, l->dy, NULL, s, -1, l->flags & ML_NOCLIMB, l->flags & ML_EFFECT4);
|
Add_Pusher(p_wind, l->dx, l->dy, NULL, s, -1, l->flags & ML_NOCLIMB, l->flags & ML_EFFECT4);
|
||||||
break;
|
break;
|
||||||
case 544: // current
|
case 544: // current
|
||||||
for (s = -1; (s = P_FindSectorFromLineTag(l, s)) >= 0 ;)
|
for (s = -1; (s = P_FindSectorFromLineTag(l, s)) >= 0 ;)
|
||||||
Add_Pusher(p_current, l->dx, l->dy, NULL, s, -1, l->flags & ML_NOCLIMB, l->flags & ML_EFFECT4);
|
Add_Pusher(p_current, l->dx, l->dy, NULL, s, -1, l->flags & ML_NOCLIMB, l->flags & ML_EFFECT4);
|
||||||
break;
|
break;
|
||||||
case 547: // push/pull
|
case 547: // push/pull
|
||||||
for (s = -1; (s = P_FindSectorFromLineTag(l, s)) >= 0 ;)
|
for (s = -1; (s = P_FindSectorFromLineTag(l, s)) >= 0 ;)
|
||||||
{
|
{
|
||||||
@@ -7482,20 +7591,21 @@ static void P_SpawnPushers(void)
|
|||||||
case 545: // current up
|
case 545: // current up
|
||||||
for (s = -1; (s = P_FindSectorFromLineTag(l, s)) >= 0 ;)
|
for (s = -1; (s = P_FindSectorFromLineTag(l, s)) >= 0 ;)
|
||||||
Add_Pusher(p_upcurrent, l->dx, l->dy, NULL, s, -1, l->flags & ML_NOCLIMB, l->flags & ML_EFFECT4);
|
Add_Pusher(p_upcurrent, l->dx, l->dy, NULL, s, -1, l->flags & ML_NOCLIMB, l->flags & ML_EFFECT4);
|
||||||
break;
|
break;
|
||||||
case 546: // current down
|
case 546: // current down
|
||||||
for (s = -1; (s = P_FindSectorFromLineTag(l, s)) >= 0 ;)
|
for (s = -1; (s = P_FindSectorFromLineTag(l, s)) >= 0 ;)
|
||||||
Add_Pusher(p_downcurrent, l->dx, l->dy, NULL, s, -1, l->flags & ML_NOCLIMB, l->flags & ML_EFFECT4);
|
Add_Pusher(p_downcurrent, l->dx, l->dy, NULL, s, -1, l->flags & ML_NOCLIMB, l->flags & ML_EFFECT4);
|
||||||
break;
|
break;
|
||||||
case 542: // wind up
|
case 542: // wind up
|
||||||
for (s = -1; (s = P_FindSectorFromLineTag(l, s)) >= 0 ;)
|
for (s = -1; (s = P_FindSectorFromLineTag(l, s)) >= 0 ;)
|
||||||
Add_Pusher(p_upwind, l->dx, l->dy, NULL, s, -1, l->flags & ML_NOCLIMB, l->flags & ML_EFFECT4);
|
Add_Pusher(p_upwind, l->dx, l->dy, NULL, s, -1, l->flags & ML_NOCLIMB, l->flags & ML_EFFECT4);
|
||||||
break;
|
break;
|
||||||
case 543: // wind down
|
case 543: // wind down
|
||||||
for (s = -1; (s = P_FindSectorFromLineTag(l, s)) >= 0 ;)
|
for (s = -1; (s = P_FindSectorFromLineTag(l, s)) >= 0 ;)
|
||||||
Add_Pusher(p_downwind, l->dx, l->dy, NULL, s, -1, l->flags & ML_NOCLIMB, l->flags & ML_EFFECT4);
|
Add_Pusher(p_downwind, l->dx, l->dy, NULL, s, -1, l->flags & ML_NOCLIMB, l->flags & ML_EFFECT4);
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
void P_StartQuake(tic_t time, fixed_t intensity, fixed_t radius)
|
void P_StartQuake(tic_t time, fixed_t intensity, fixed_t radius)
|
||||||
|
|||||||
@@ -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);
|
||||||
|
|
||||||
|
|||||||
@@ -611,6 +611,15 @@ void P_Ticker(boolean run)
|
|||||||
#ifdef DEMO_COMPAT_100
|
#ifdef DEMO_COMPAT_100
|
||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
// Lookback is normally handled inside G_BuildTiccmd, which isn't called in replays so we're doing that manually
|
||||||
|
// idk if this is best place to handle this tho...
|
||||||
|
for (i = 0; i <= splitscreen; ++i)
|
||||||
|
{
|
||||||
|
const boolean usejoystick = cv_usejoystick[i].value;
|
||||||
|
INT32 axis = JoyAxis(AXISLOOKBACK, i+1);
|
||||||
|
camspin[i] = (InputDown(gc_lookback, i+1) || (usejoystick && axis > 0));
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
ps_lua_mobjhooks.value.i = 0;
|
ps_lua_mobjhooks.value.i = 0;
|
||||||
@@ -637,7 +646,9 @@ void P_Ticker(boolean run)
|
|||||||
if (run)
|
if (run)
|
||||||
{
|
{
|
||||||
// Dynamic slopeness
|
// Dynamic slopeness
|
||||||
|
#ifdef COMPAT_VANILLA
|
||||||
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
|
||||||
P_RunDynamicSlopes();
|
P_RunDynamicSlopes();
|
||||||
|
|
||||||
PS_START_TIMING(ps_thinkertime);
|
PS_START_TIMING(ps_thinkertime);
|
||||||
|
|||||||
+46
-33
@@ -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);
|
||||||
@@ -1122,22 +1122,26 @@ void P_SpawnShieldOrb(player_t *player)
|
|||||||
P_SetTarget(&ov->target, shieldobj);
|
P_SetTarget(&ov->target, shieldobj);
|
||||||
P_SetMobjState(ov, shieldobj->info->seestate);
|
P_SetMobjState(ov, shieldobj->info->seestate);
|
||||||
}
|
}
|
||||||
|
|
||||||
if (shieldobj->info->meleestate)
|
if (shieldobj->info->meleestate)
|
||||||
{
|
{
|
||||||
ov = P_SpawnMobj(shieldobj->x, shieldobj->y, shieldobj->z, MT_OVERLAY);
|
ov = P_SpawnMobj(shieldobj->x, shieldobj->y, shieldobj->z, MT_OVERLAY);
|
||||||
P_SetTarget(&ov->target, shieldobj);
|
P_SetTarget(&ov->target, shieldobj);
|
||||||
P_SetMobjState(ov, shieldobj->info->meleestate);
|
P_SetMobjState(ov, shieldobj->info->meleestate);
|
||||||
}
|
}
|
||||||
|
|
||||||
if (shieldobj->info->missilestate)
|
if (shieldobj->info->missilestate)
|
||||||
{
|
{
|
||||||
ov = P_SpawnMobj(shieldobj->x, shieldobj->y, shieldobj->z, MT_OVERLAY);
|
ov = P_SpawnMobj(shieldobj->x, shieldobj->y, shieldobj->z, MT_OVERLAY);
|
||||||
P_SetTarget(&ov->target, shieldobj);
|
P_SetTarget(&ov->target, shieldobj);
|
||||||
P_SetMobjState(ov, shieldobj->info->missilestate);
|
P_SetMobjState(ov, shieldobj->info->missilestate);
|
||||||
}
|
}
|
||||||
|
|
||||||
if (player->powers[pw_shield] & SH_FORCE)
|
if (player->powers[pw_shield] & SH_FORCE)
|
||||||
{
|
{
|
||||||
//Copy and pasted from P_ShieldLook in p_mobj.c
|
//Copy and pasted from P_ShieldLook in p_mobj.c
|
||||||
shieldobj->movecount = (player->powers[pw_shield] & 0xFF);
|
shieldobj->movecount = (player->powers[pw_shield] & 0xFF);
|
||||||
|
|
||||||
if (shieldobj->movecount < 1)
|
if (shieldobj->movecount < 1)
|
||||||
{
|
{
|
||||||
if (shieldobj->info->painstate)
|
if (shieldobj->info->painstate)
|
||||||
@@ -1202,6 +1206,7 @@ mobj_t *P_SpawnGhostMobj(mobj_t *mobj)
|
|||||||
ghost->pitch = mobj->pitch;
|
ghost->pitch = mobj->pitch;
|
||||||
ghost->roll = mobj->roll;
|
ghost->roll = mobj->roll;
|
||||||
ghost->rollangle = mobj->rollangle;
|
ghost->rollangle = mobj->rollangle;
|
||||||
|
ghost->temprollangle = mobj->temprollangle;
|
||||||
ghost->sloperoll = mobj->sloperoll;
|
ghost->sloperoll = mobj->sloperoll;
|
||||||
ghost->slopepitch = mobj->slopepitch;
|
ghost->slopepitch = mobj->slopepitch;
|
||||||
|
|
||||||
@@ -1569,10 +1574,12 @@ static void P_CheckBouncySectors(player_t *player)
|
|||||||
newmom = -8*FRACUNIT;
|
newmom = -8*FRACUNIT;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (newmom > P_GetPlayerHeight(player)/2)
|
const fixed_t halfpheight = P_GetPlayerHeight(player)/2;
|
||||||
newmom = P_GetPlayerHeight(player)/2;
|
|
||||||
else if (newmom < -P_GetPlayerHeight(player)/2)
|
if (newmom > halfpheight)
|
||||||
newmom = -P_GetPlayerHeight(player)/2;
|
newmom = halfpheight;
|
||||||
|
else if (newmom < -halfpheight)
|
||||||
|
newmom = -halfpheight;
|
||||||
|
|
||||||
momentum.z = newmom*2;
|
momentum.z = newmom*2;
|
||||||
|
|
||||||
@@ -1718,7 +1725,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))
|
||||||
@@ -1835,6 +1842,9 @@ void P_Telekinesis(player_t *player, fixed_t thrust, fixed_t range)
|
|||||||
if (!((mo2->flags & MF_SHOOTABLE && mo2->flags & MF_ENEMY) || mo2->type == MT_EGGGUARD || mo2->player))
|
if (!((mo2->flags & MF_SHOOTABLE && mo2->flags & MF_ENEMY) || mo2->type == MT_EGGGUARD || mo2->player))
|
||||||
continue;
|
continue;
|
||||||
|
|
||||||
|
if (mo2->health <= 0)
|
||||||
|
continue;
|
||||||
|
|
||||||
dist = P_AproxDistance(P_AproxDistance(player->mo->x-mo2->x, player->mo->y-mo2->y), player->mo->z-mo2->z);
|
dist = P_AproxDistance(P_AproxDistance(player->mo->x-mo2->x, player->mo->y-mo2->y), player->mo->z-mo2->z);
|
||||||
|
|
||||||
if (range < dist)
|
if (range < dist)
|
||||||
@@ -1843,15 +1853,12 @@ void P_Telekinesis(player_t *player, fixed_t thrust, fixed_t range)
|
|||||||
if (!P_CheckSight(player->mo, mo2))
|
if (!P_CheckSight(player->mo, mo2))
|
||||||
continue; // if your psychic powers can't "see" it don't bother
|
continue; // if your psychic powers can't "see" it don't bother
|
||||||
|
|
||||||
if (mo2->health > 0)
|
an = R_PointToAngle2(player->mo->x, player->mo->y, mo2->x, mo2->y);
|
||||||
{
|
|
||||||
an = R_PointToAngle2(player->mo->x, player->mo->y, mo2->x, mo2->y);
|
|
||||||
|
|
||||||
P_Thrust(mo2, an, thrust);
|
P_Thrust(mo2, an, thrust);
|
||||||
|
|
||||||
if (mo2->type == MT_GOLDBUZZ || mo2->type == MT_REDBUZZ)
|
if (mo2->type == MT_GOLDBUZZ || mo2->type == MT_REDBUZZ)
|
||||||
mo2->tics += 8;
|
mo2->tics += 8;
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
//P_SpawnThokMobj(player);
|
//P_SpawnThokMobj(player);
|
||||||
@@ -2291,7 +2298,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);
|
||||||
|
|
||||||
/////////////////////////
|
/////////////////////////
|
||||||
@@ -2355,7 +2362,7 @@ static void P_MovePlayer(player_t *player)
|
|||||||
if (onground && leveltime % 50 == 0 && player->kartstuff[k_drift] != 0)
|
if (onground && leveltime % 50 == 0 && player->kartstuff[k_drift] != 0)
|
||||||
S_StartSound(player->mo, sfx_drift);
|
S_StartSound(player->mo, sfx_drift);
|
||||||
// Leveltime being 50 might take a while at times. We'll start it up once, isntantly.
|
// Leveltime being 50 might take a while at times. We'll start it up once, isntantly.
|
||||||
else if (onground && !S_SoundPlaying(player->mo, sfx_drift) && player->kartstuff[k_drift] != 0)
|
else if (onground && player->kartstuff[k_drift] != 0 && !S_SoundPlaying(player->mo, sfx_drift))
|
||||||
S_StartSound(player->mo, sfx_drift);
|
S_StartSound(player->mo, sfx_drift);
|
||||||
// Ok, we'll stop now.
|
// Ok, we'll stop now.
|
||||||
else if (player->kartstuff[k_drift] == 0 || !onground)
|
else if (player->kartstuff[k_drift] == 0 || !onground)
|
||||||
@@ -2736,16 +2743,16 @@ boolean P_LookForEnemies(player_t *player)
|
|||||||
|| ((mo->z+mo->height < player->mo->z+player->mo->height-FixedMul(MAXSTEPMOVE, mapobjectscale)) && (player->mo->eflags & MFE_VERTICALFLIP))) // Reverse gravity check - Flame.
|
|| ((mo->z+mo->height < player->mo->z+player->mo->height-FixedMul(MAXSTEPMOVE, mapobjectscale)) && (player->mo->eflags & MFE_VERTICALFLIP))) // Reverse gravity check - Flame.
|
||||||
continue; // Don't home upwards!
|
continue; // Don't home upwards!
|
||||||
|
|
||||||
if (P_AproxDistance(P_AproxDistance(player->mo->x-mo->x, player->mo->y-mo->y),
|
const fixed_t modist = P_AproxDistance(P_AproxDistance(player->mo->x-mo->x, player->mo->y-mo->y), player->mo->z-mo->z);
|
||||||
player->mo->z-mo->z) > 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 && P_AproxDistance(P_AproxDistance(player->mo->x-mo->x, player->mo->y-mo->y),
|
if (closestmo && modist > P_AproxDistance(P_AproxDistance(player->mo->x-closestmo->x,
|
||||||
player->mo->z-mo->z) > P_AproxDistance(P_AproxDistance(player->mo->x-closestmo->x,
|
|
||||||
player->mo->y-closestmo->y), player->mo->z-closestmo->z))
|
player->mo->y-closestmo->y), player->mo->z-closestmo->z))
|
||||||
continue;
|
continue;
|
||||||
|
|
||||||
@@ -3149,8 +3156,8 @@ static ticcmd_t *P_CameraCmd(camera_t *cam, UINT8 num)
|
|||||||
cmd->angleturn = (INT16)(lang >> TICCMD_REDUCE);
|
cmd->angleturn = (INT16)(lang >> TICCMD_REDUCE);
|
||||||
cmd->aiming = G_ClipAimingPitch(&laim);
|
cmd->aiming = G_ClipAimingPitch(&laim);
|
||||||
|
|
||||||
const boolean analogjoystickmove = cv_usejoystick[num].value && !Joystick[num].bGamepadStyle;
|
const boolean analogjoystickmove = cv_usejoystick[num].value && !DigitalGamepadStyle(num);
|
||||||
const boolean gamepadjoystickmove = cv_usejoystick[num].value && Joystick[num].bGamepadStyle;
|
const boolean gamepadjoystickmove = cv_usejoystick[num].value && DigitalGamepadStyle(num);
|
||||||
|
|
||||||
usejoystick = (analogjoystickmove || gamepadjoystickmove);
|
usejoystick = (analogjoystickmove || gamepadjoystickmove);
|
||||||
|
|
||||||
@@ -3501,7 +3508,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
|
||||||
|
|
||||||
@@ -3733,7 +3740,7 @@ boolean P_MoveChaseCamera(player_t *player, camera_t *thiscam, boolean resetcall
|
|||||||
fixed_t f1, f2;
|
fixed_t f1, f2;
|
||||||
|
|
||||||
// We probably shouldn't move the camera if there is no player or player mobj somehow
|
// We probably shouldn't move the camera if there is no player or player mobj somehow
|
||||||
if (!player || !player->mo)
|
if (!player || P_MobjWasRemoved(player->mo))
|
||||||
return true;
|
return true;
|
||||||
|
|
||||||
// This can happen when joining
|
// This can happen when joining
|
||||||
@@ -4090,7 +4097,7 @@ boolean P_MoveChaseCamera(player_t *player, camera_t *thiscam, boolean resetcall
|
|||||||
angle -= (angle - thiscam->pitch)/2;
|
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...
|
||||||
@@ -4167,7 +4174,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;
|
||||||
@@ -4580,6 +4587,7 @@ void P_PlayerThink(player_t *player)
|
|||||||
{
|
{
|
||||||
short int i;
|
short int i;
|
||||||
mo->flags |= MF_NOCLIPHEIGHT;
|
mo->flags |= MF_NOCLIPHEIGHT;
|
||||||
|
|
||||||
for (i = 0; i < 32; i++)
|
for (i = 0; i < 32; i++)
|
||||||
{
|
{
|
||||||
// Debug drawing
|
// Debug drawing
|
||||||
@@ -4863,7 +4871,7 @@ void P_PlayerThink(player_t *player)
|
|||||||
|
|
||||||
// Even if not NiGHTS, pull in nearby objects when walking around as John Q. Elliot.
|
// 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;
|
||||||
@@ -4965,7 +4973,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;
|
||||||
@@ -5082,6 +5090,11 @@ void P_PlayerThink(player_t *player)
|
|||||||
player->squishdance.time = 0;
|
player->squishdance.time = 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if (player->stairjank > 0)
|
||||||
|
{
|
||||||
|
player->stairjank--;
|
||||||
|
}
|
||||||
|
|
||||||
// Flash player after being hit.
|
// Flash player after being hit.
|
||||||
if (!(player->kartstuff[k_hyudorotimer] // SRB2kart - fixes Hyudoro not flashing when it should.
|
if (!(player->kartstuff[k_hyudorotimer] // SRB2kart - fixes Hyudoro not flashing when it should.
|
||||||
|| player->kartstuff[k_growshrinktimer] > 0 // Grow doesn't flash either.
|
|| player->kartstuff[k_growshrinktimer] > 0 // Grow doesn't flash either.
|
||||||
@@ -5151,7 +5164,7 @@ void P_PlayerAfterThink(player_t *player)
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if (UNLIKELY(player->pflags & PF_NIGHTSMODE))
|
if (nightsplayer(player))
|
||||||
{
|
{
|
||||||
player->powers[pw_gravityboots] = 0;
|
player->powers[pw_gravityboots] = 0;
|
||||||
}
|
}
|
||||||
|
|||||||
+18
-5
@@ -320,13 +320,20 @@ static void R_AddLine(seg_t *line)
|
|||||||
INT32 x1, x2;
|
INT32 x1, x2;
|
||||||
angle_t angle1, angle2, span, tspan;
|
angle_t angle1, angle2, span, tspan;
|
||||||
static sector_t tempsec;
|
static sector_t tempsec;
|
||||||
boolean bothfloorssky = false;
|
boolean bothfloorssky = false;
|
||||||
|
fixed_t v1x, v1y, v2x, v2y; // the seg's vertexes as fixed_t
|
||||||
|
|
||||||
g_portal = NULL;
|
g_portal = NULL;
|
||||||
|
|
||||||
|
v1x = line->v1->x;
|
||||||
|
v1y = line->v1->y;
|
||||||
|
|
||||||
|
v2x = line->v2->x;
|
||||||
|
v2y = line->v2->y;
|
||||||
|
|
||||||
// big room fix
|
// big room fix
|
||||||
angle1 = R_PointToAngle64(line->v1->x, line->v1->y);
|
angle1 = R_PointToAngle64(v1x, v1y);
|
||||||
angle2 = R_PointToAngle64(line->v2->x, line->v2->y);
|
angle2 = R_PointToAngle64(v2x, v2y);
|
||||||
|
|
||||||
curline = line;
|
curline = line;
|
||||||
|
|
||||||
@@ -519,6 +526,7 @@ static boolean R_CheckBBox(const fixed_t *bspcoord)
|
|||||||
angle_t angle1, angle2;
|
angle_t angle1, angle2;
|
||||||
INT32 sx1, sx2;
|
INT32 sx1, sx2;
|
||||||
const INT32* check;
|
const INT32* check;
|
||||||
|
fixed_t x1, y1, x2, y2;
|
||||||
|
|
||||||
// Find the corners of the box
|
// Find the corners of the box
|
||||||
// that define the edges from current viewpoint.
|
// that define the edges from current viewpoint.
|
||||||
@@ -532,9 +540,14 @@ static boolean R_CheckBBox(const fixed_t *bspcoord)
|
|||||||
|
|
||||||
check = checkcoord[boxpos];
|
check = checkcoord[boxpos];
|
||||||
|
|
||||||
|
x1 = bspcoord[check[0]];
|
||||||
|
y1 = bspcoord[check[1]];
|
||||||
|
x2 = bspcoord[check[2]];
|
||||||
|
y2 = bspcoord[check[3]];
|
||||||
|
|
||||||
// big room fix
|
// big room fix
|
||||||
angle1 = R_PointToAngle64(bspcoord[check[0]], bspcoord[check[1]]) - viewangle;
|
angle1 = R_PointToAngle64(x1, y1) - viewangle;
|
||||||
angle2 = R_PointToAngle64(bspcoord[check[2]], bspcoord[check[3]]) - viewangle;
|
angle2 = R_PointToAngle64(x2, y2) - viewangle;
|
||||||
|
|
||||||
// cph - replaced old code, which was unclear and badly commented
|
// cph - replaced old code, which was unclear and badly commented
|
||||||
// Much more efficient code now
|
// Much more efficient code now
|
||||||
|
|||||||
+1
-1
@@ -430,7 +430,7 @@ typedef struct line_s
|
|||||||
INT16 tag;
|
INT16 tag;
|
||||||
|
|
||||||
// Visual appearance: sidedefs.
|
// Visual appearance: sidedefs.
|
||||||
UINT16 sidenum[2]; // sidenum[1] will be 0xffff if one-sided
|
UINT16 sidenum[2]; // sidenum[1] will be NO_INDEX if one-sided
|
||||||
fixed_t alpha; // translucency
|
fixed_t alpha; // translucency
|
||||||
UINT8 blendmode; // blendmode
|
UINT8 blendmode; // blendmode
|
||||||
|
|
||||||
|
|||||||
+52
-18
@@ -340,14 +340,18 @@ void R_InterpolateMobjState(mobj_t *mobj, fixed_t frac, interpmobjstate_t *out)
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
out->x = R_LerpFixed(mobj->old_x, mobj->x, frac);
|
const boolean doreset = mobj->resetinterp && (mobj->type != MT_GHOST) && (mobj->type != MT_PLAYERRETICULE) && (mobj->type != MT_SHADOW);
|
||||||
out->y = R_LerpFixed(mobj->old_y, mobj->y, frac);
|
|
||||||
out->z = R_LerpFixed(mobj->old_z, mobj->z, frac);
|
out->x = doreset ? mobj->x : R_LerpFixed(mobj->old_x, mobj->x, frac);
|
||||||
|
out->y = doreset ? mobj->y : R_LerpFixed(mobj->old_y, mobj->y, frac);
|
||||||
|
out->z = doreset ? mobj->z : R_LerpFixed(mobj->old_z, mobj->z, frac);
|
||||||
|
|
||||||
|
out->scale = mobj->resetinterp ? mobj->scale : R_LerpFixed(mobj->old_scale, mobj->scale, frac);
|
||||||
out->spritexscale = mobj->resetinterp ? mobj->spritexscale : R_LerpFixed(mobj->old_spritexscale, mobj->spritexscale, frac);
|
out->spritexscale = mobj->resetinterp ? mobj->spritexscale : R_LerpFixed(mobj->old_spritexscale, mobj->spritexscale, frac);
|
||||||
out->spriteyscale = mobj->resetinterp ? mobj->spriteyscale : R_LerpFixed(mobj->old_spriteyscale, mobj->spriteyscale, frac);
|
out->spriteyscale = mobj->resetinterp ? mobj->spriteyscale : R_LerpFixed(mobj->old_spriteyscale, mobj->spriteyscale, frac);
|
||||||
out->spritexoffset = mobj->resetinterp ? mobj->spritexoffset : R_LerpFixed(mobj->old_spritexoffset, mobj->spritexoffset, frac);
|
out->spritexoffset = mobj->resetinterp ? mobj->spritexoffset : R_LerpFixed(mobj->old_spritexoffset, mobj->spritexoffset, frac);
|
||||||
out->spriteyoffset = mobj->resetinterp ? mobj->spriteyoffset : R_LerpFixed(mobj->old_spriteyoffset, mobj->spriteyoffset, frac);
|
out->spriteyoffset = mobj->resetinterp ? mobj->spriteyoffset : R_LerpFixed(mobj->old_spriteyoffset, mobj->spriteyoffset, frac);
|
||||||
out->scale = mobj->resetinterp ? mobj->scale : R_LerpFixed(mobj->old_scale, mobj->scale, frac);
|
|
||||||
//out->subsector = R_PointInSubsector(out->x, out->y); // this is unused
|
//out->subsector = R_PointInSubsector(out->x, out->y); // this is unused
|
||||||
|
|
||||||
if (mobj->player)
|
if (mobj->player)
|
||||||
@@ -387,10 +391,10 @@ void R_InterpolatePrecipMobjState(precipmobj_t *mobj, fixed_t frac, interpmobjst
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
out->x = R_LerpFixed(mobj->old_x, mobj->x, frac);
|
out->x = R_LerpFixed(mobj->old_x, mobj->x, frac);
|
||||||
out->y = R_LerpFixed(mobj->old_y, mobj->y, frac);
|
out->y = R_LerpFixed(mobj->old_y, mobj->y, frac);
|
||||||
out->z = R_LerpFixed(mobj->old_z, mobj->z, frac);
|
out->z = R_LerpFixed(mobj->old_z, mobj->z, frac);
|
||||||
out->scale = mapobjectscale;
|
out->scale = mapobjectscale;
|
||||||
}
|
}
|
||||||
|
|
||||||
static levelinterpolator_t *CreateInterpolator(levelinterpolator_type_e type, thinker_t *thinker)
|
static levelinterpolator_t *CreateInterpolator(levelinterpolator_type_e type, thinker_t *thinker)
|
||||||
@@ -757,6 +761,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,18 +838,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->resetinterp = false;
|
mobj->resetinterp = false;
|
||||||
}
|
}
|
||||||
|
|||||||
+25
-5
@@ -188,6 +188,7 @@ consvar_t cv_flipcammode = {"flipcammode", "Displayplayer", CV_SAVE, flipcammod
|
|||||||
consvar_t cv_shadow = {"shadow", "Off", CV_SAVE, CV_OnOff, NULL, 0, NULL, NULL, 0, 0, NULL};
|
consvar_t cv_shadow = {"shadow", "Off", CV_SAVE, CV_OnOff, NULL, 0, NULL, NULL, 0, 0, NULL};
|
||||||
consvar_t cv_shadowoffs = {"offsetshadows", "Off", CV_SAVE, CV_OnOff, NULL, 0, NULL, NULL, 0, 0, NULL};
|
consvar_t cv_shadowoffs = {"offsetshadows", "Off", CV_SAVE, CV_OnOff, NULL, 0, NULL, NULL, 0, 0, NULL};
|
||||||
consvar_t cv_skybox = {"skybox", "On", CV_SAVE, CV_OnOff, NULL, 0, NULL, NULL, 0, 0, NULL};
|
consvar_t cv_skybox = {"skybox", "On", CV_SAVE, CV_OnOff, NULL, 0, NULL, NULL, 0, 0, NULL};
|
||||||
|
consvar_t cv_skydome = {"skydome", "On", CV_SAVE, CV_OnOff, NULL, 0, NULL, NULL, 0, 0, NULL};
|
||||||
consvar_t cv_ffloorclip = {"r_ffloorclip", "On", CV_SAVE, CV_OnOff, NULL, 0, NULL, NULL, 0, 0, NULL};
|
consvar_t cv_ffloorclip = {"r_ffloorclip", "On", CV_SAVE, CV_OnOff, NULL, 0, NULL, NULL, 0, 0, NULL};
|
||||||
consvar_t cv_spriteclip = {"r_spriteclip", "On", CV_SAVE, CV_OnOff, NULL, 0, NULL, NULL, 0, 0, NULL};
|
consvar_t cv_spriteclip = {"r_spriteclip", "On", CV_SAVE, CV_OnOff, NULL, 0, NULL, NULL, 0, 0, NULL};
|
||||||
consvar_t cv_softcyancut = {"softwarecyancut", "On", CV_SAVE, CV_OnOff, NULL, 0, NULL, NULL, 0, 0, NULL};
|
consvar_t cv_softcyancut = {"softwarecyancut", "On", CV_SAVE, CV_OnOff, NULL, 0, NULL, NULL, 0, 0, NULL};
|
||||||
@@ -410,7 +411,7 @@ angle_t R_PlayerSliptideAngle(player_t *player)
|
|||||||
if (!sprframe)
|
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]);
|
||||||
@@ -1388,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];
|
||||||
|
|
||||||
@@ -1454,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);
|
||||||
@@ -1465,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;
|
||||||
@@ -1507,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
|
||||||
@@ -1516,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.
|
||||||
@@ -1564,6 +1582,7 @@ void R_RegisterEngineStuff(void)
|
|||||||
CV_RegisterVar(&cv_shadow);
|
CV_RegisterVar(&cv_shadow);
|
||||||
CV_RegisterVar(&cv_shadowoffs);
|
CV_RegisterVar(&cv_shadowoffs);
|
||||||
CV_RegisterVar(&cv_skybox);
|
CV_RegisterVar(&cv_skybox);
|
||||||
|
CV_RegisterVar(&cv_skydome);
|
||||||
CV_RegisterVar(&cv_ffloorclip);
|
CV_RegisterVar(&cv_ffloorclip);
|
||||||
CV_RegisterVar(&cv_spriteclip);
|
CV_RegisterVar(&cv_spriteclip);
|
||||||
CV_RegisterVar(&cv_secbright);
|
CV_RegisterVar(&cv_secbright);
|
||||||
@@ -1598,7 +1617,8 @@ void R_RegisterEngineStuff(void)
|
|||||||
CV_RegisterVar(&cv_sliptideroll);
|
CV_RegisterVar(&cv_sliptideroll);
|
||||||
CV_RegisterVar(&cv_sloperolldist);
|
CV_RegisterVar(&cv_sloperolldist);
|
||||||
CV_RegisterVar(&cv_sparkroll);
|
CV_RegisterVar(&cv_sparkroll);
|
||||||
CV_RegisterVar(&cv_spinoutroll);
|
CV_RegisterVar(&cv_stairjank);
|
||||||
|
CV_RegisterVar(&cv_stairjanksfx);
|
||||||
|
|
||||||
CV_RegisterVar(&cv_showhud);
|
CV_RegisterVar(&cv_showhud);
|
||||||
CV_RegisterVar(&cv_translucenthud);
|
CV_RegisterVar(&cv_translucenthud);
|
||||||
|
|||||||
@@ -213,6 +213,7 @@ extern consvar_t cv_translucency;
|
|||||||
extern consvar_t cv_drawdist, cv_drawdist_precip, cv_lessprecip;
|
extern consvar_t cv_drawdist, cv_drawdist_precip, cv_lessprecip;
|
||||||
extern consvar_t cv_fov, cv_fovchange;
|
extern consvar_t cv_fov, cv_fovchange;
|
||||||
extern consvar_t cv_skybox;
|
extern consvar_t cv_skybox;
|
||||||
|
extern consvar_t cv_skydome;
|
||||||
extern consvar_t cv_tailspickup;
|
extern consvar_t cv_tailspickup;
|
||||||
extern consvar_t cv_maxinterpdist;
|
extern consvar_t cv_maxinterpdist;
|
||||||
extern consvar_t cv_playerfade;
|
extern consvar_t cv_playerfade;
|
||||||
|
|||||||
+1
-1
@@ -289,7 +289,7 @@ void R_ParseSPRTINFOLump(UINT16 wadNum, UINT16 lumpNum)
|
|||||||
sprinfoLumpLength = W_LumpLengthPwad(wadNum, lumpNum);
|
sprinfoLumpLength = W_LumpLengthPwad(wadNum, lumpNum);
|
||||||
sprinfoText = (char *)Z_Malloc((sprinfoLumpLength+1)*sizeof(char),PU_STATIC,NULL);
|
sprinfoText = (char *)Z_Malloc((sprinfoLumpLength+1)*sizeof(char),PU_STATIC,NULL);
|
||||||
// Now move the contents of the lump into this new location.
|
// Now move the contents of the lump into this new location.
|
||||||
memmove(sprinfoText,sprinfoLump,sprinfoLumpLength);
|
memmove(sprinfoText, sprinfoLump, sprinfoLumpLength);
|
||||||
// Make damn well sure the last character in our new memory location is \0.
|
// Make damn well sure the last character in our new memory location is \0.
|
||||||
sprinfoText[sprinfoLumpLength] = '\0';
|
sprinfoText[sprinfoLumpLength] = '\0';
|
||||||
// Finally, free up the memory from the first data load, because we really
|
// Finally, free up the memory from the first data load, because we really
|
||||||
|
|||||||
+6
-3
@@ -785,6 +785,8 @@ static void R_DrawSkyPlane(visplane_t *pl, void(*skycolfunc)(drawcolumndata_t*),
|
|||||||
drawcolumndata_t dc = {};
|
drawcolumndata_t dc = {};
|
||||||
const INT32 texture = texturetranslation[skytexture];
|
const INT32 texture = texturetranslation[skytexture];
|
||||||
|
|
||||||
|
const boolean skydome = cv_skydome.value != 0;
|
||||||
|
|
||||||
// Reset column drawer function (note: couldn't we just call colfuncs[BASEDRAWFUNC] directly?)
|
// Reset column drawer function (note: couldn't we just call colfuncs[BASEDRAWFUNC] directly?)
|
||||||
// (that is, unless we'll need to switch drawers in future for some reason)
|
// (that is, unless we'll need to switch drawers in future for some reason)
|
||||||
R_SetColumnFunc(BASEDRAWFUNC);
|
R_SetColumnFunc(BASEDRAWFUNC);
|
||||||
@@ -830,8 +832,8 @@ static void R_DrawSkyPlane(visplane_t *pl, void(*skycolfunc)(drawcolumndata_t*),
|
|||||||
|
|
||||||
INT32 angle = (pl->viewangle + xtoviewangle[x + i])>>ANGLETOSKYSHIFT;
|
INT32 angle = (pl->viewangle + xtoviewangle[x + i])>>ANGLETOSKYSHIFT;
|
||||||
angle -= (skytextureoffset >> FRACBITS);
|
angle -= (skytextureoffset >> FRACBITS);
|
||||||
|
if (skydome)
|
||||||
dc.iscale = FixedMul(skyscale, FINECOSINE(xtoviewangle[x + i]>>ANGLETOFINESHIFT));
|
dc.iscale = FixedMul(skyscale, FINECOSINE(xtoviewangle[x + i]>>ANGLETOFINESHIFT));
|
||||||
dc.x = x + i;
|
dc.x = x + i;
|
||||||
dc.source = R_GetColumn(texture, -angle); // get negative of angle for each column to display sky correct way round! --Monster Iestyn 27/01/18
|
dc.source = R_GetColumn(texture, -angle); // get negative of angle for each column to display sky correct way round! --Monster Iestyn 27/01/18
|
||||||
|
|
||||||
@@ -866,7 +868,8 @@ static void R_DrawSkyPlane(visplane_t *pl, void(*skycolfunc)(drawcolumndata_t*),
|
|||||||
INT32 angle = (pl->viewangle + xtoviewangle[x])>>ANGLETOSKYSHIFT;
|
INT32 angle = (pl->viewangle + xtoviewangle[x])>>ANGLETOSKYSHIFT;
|
||||||
angle -= (skytextureoffset >> FRACBITS);
|
angle -= (skytextureoffset >> FRACBITS);
|
||||||
|
|
||||||
dc.iscale = FixedMul(skyscale, FINECOSINE(xtoviewangle[x]>>ANGLETOFINESHIFT));
|
if (skydome)
|
||||||
|
dc.iscale = FixedMul(skyscale, FINECOSINE(xtoviewangle[x]>>ANGLETOFINESHIFT));
|
||||||
dc.x = x;
|
dc.x = x;
|
||||||
dc.source =
|
dc.source =
|
||||||
R_GetColumn(texturetranslation[skytexture], -angle); // get negative of angle for each column to display sky correct way round! --Monster Iestyn 27/01/18
|
R_GetColumn(texturetranslation[skytexture], -angle); // get negative of angle for each column to display sky correct way round! --Monster Iestyn 27/01/18
|
||||||
|
|||||||
+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
|
||||||
|
|||||||
+78
-59
@@ -311,6 +311,7 @@ static void R_RenderMaskedSegLoop(drawcolumndata_t* dc, drawseg_t *drawseg, INT3
|
|||||||
{
|
{
|
||||||
rw_scalestep = drawseg->scalestep;
|
rw_scalestep = drawseg->scalestep;
|
||||||
spryscale = drawseg->scale1 + (x1 - drawseg->x1)*rw_scalestep;
|
spryscale = drawseg->scale1 + (x1 - drawseg->x1)*rw_scalestep;
|
||||||
|
|
||||||
if (dc->numlights)
|
if (dc->numlights)
|
||||||
{ // reset all lights to their starting heights
|
{ // reset all lights to their starting heights
|
||||||
for (i = 0; i < dc->numlights; i++)
|
for (i = 0; i < dc->numlights; i++)
|
||||||
@@ -435,6 +436,7 @@ static void R_RenderMaskedSegLoop(drawcolumndata_t* dc, drawseg_t *drawseg, INT3
|
|||||||
windowtop = windowbottom + 1;
|
windowtop = windowbottom + 1;
|
||||||
set_colormap_below_light();
|
set_colormap_below_light();
|
||||||
}
|
}
|
||||||
|
|
||||||
windowbottom = realbot;
|
windowbottom = realbot;
|
||||||
if (windowtop < windowbottom)
|
if (windowtop < windowbottom)
|
||||||
colfunc_2s(dc, col);
|
colfunc_2s(dc, col);
|
||||||
@@ -711,16 +713,11 @@ void R_RenderThickSideRange(drawseg_t *drawseg, INT32 x1, INT32 x2, ffloor_t *pf
|
|||||||
rw_scalestep = drawseg->scalestep;
|
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)
|
||||||
@@ -2204,7 +2201,7 @@ void R_StoreWallRange(INT32 start, INT32 stop)
|
|||||||
topremap = (encoremap && !(curline->linedef->flags & ML_TFERLINE));
|
topremap = (encoremap && !(curline->linedef->flags & ML_TFERLINE));
|
||||||
|
|
||||||
if ((linedef->flags & (ML_DONTPEGTOP) && (linedef->flags & ML_DONTPEGBOTTOM))
|
if ((linedef->flags & (ML_DONTPEGTOP) && (linedef->flags & ML_DONTPEGBOTTOM))
|
||||||
&& linedef->sidenum[1] != 0xffff)
|
&& linedef->sidenum[1] != NO_INDEX)
|
||||||
{
|
{
|
||||||
// Special case... use offsets from 2nd side but only if it has a texture.
|
// Special case... use offsets from 2nd side but only if it has a texture.
|
||||||
side_t *def = &sides[linedef->sidenum[1]];
|
side_t *def = &sides[linedef->sidenum[1]];
|
||||||
@@ -2602,69 +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 improvemnts 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)
|
|
||||||
{
|
{
|
||||||
topstep = -FixedMul (rw_scalestep, worldbottom);
|
// this is an attempt to fix issues with textureless single sided lines drawing nothing where they should just draw sky instead
|
||||||
topfrac = (centeryfrac>>4) - FixedMul (worldbottom, rw_scale);
|
|
||||||
|
|
||||||
// account for slopes to try and get rid of sharp edges from the black void
|
// there is a sky flat on the ceiling
|
||||||
if (frontsector->f_slope || (backsector && backsector->f_slope))
|
// 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 if (nofrontsky && !inskybox)
|
||||||
|
{
|
||||||
|
// completely empty wall without sky flats, just assume skybox is visible then
|
||||||
|
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
|
||||||
else
|
// so we need to check a few things here
|
||||||
set_topstep_normal();
|
// to be rather conservative
|
||||||
|
// as skyrendering is pretty costly!
|
||||||
|
|
||||||
bottomstep = -FixedMul (rw_scalestep, worldbottom);
|
// ideally we´d just dont care and always draw the skytexture
|
||||||
bottomfrac = (centeryfrac>>4) - FixedMul (worldbottom, rw_scale);
|
// or skybox at any time, like gl does
|
||||||
|
// wonder if there would be a fast way to draw atleast just the texture?
|
||||||
|
|
||||||
|
// gotta shift those here for proper comparisons
|
||||||
|
const INT32 whigh = worldhigh >> 4;
|
||||||
|
const INT32 whslope = worldhighslope >> 4;
|
||||||
|
|
||||||
|
// check if there is a window to force skybox to draw
|
||||||
|
if ((whigh <= worldtop && whslope <= worldtopslope) && (backsector->ceilingpic == skyflatnum)) // backsector has a skyflat?
|
||||||
|
skyVisible = true;
|
||||||
|
// otherwise check for thokwalls
|
||||||
|
else if ((whigh != worldtop || whslope != worldtopslope) && // FIXME: i forgor what this was for lol
|
||||||
|
(backsector->floorheight >= frontsector->ceilingheight || // thok walls usually are set up like that...
|
||||||
|
frontsector->floorheight >= backsector->ceilingheight)) // floor higher than the other sides ceiling
|
||||||
|
skyVisible = true;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
bottomstep = -FixedMul(rw_scalestep, worldbottom);
|
||||||
|
bottomfrac = (centeryfrac >> 4) - FixedMul(worldbottom, rw_scale);
|
||||||
|
|
||||||
if (frontsector->c_slope)
|
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);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -2702,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);
|
||||||
|
|
||||||
@@ -2726,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;
|
||||||
@@ -2750,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);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -2770,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
|
||||||
@@ -2782,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
|
||||||
@@ -3045,6 +3063,7 @@ void R_StoreWallRange(INT32 start, INT32 stop)
|
|||||||
ds_p->silhouette |= SIL_BOTTOM;
|
ds_p->silhouette |= SIL_BOTTOM;
|
||||||
ds_p->bsilheight = backsector->f_slope ? INT32_MAX : backsector->floorheight;
|
ds_p->bsilheight = backsector->f_slope ? INT32_MAX : backsector->floorheight;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (!(ds_p->silhouette & SIL_TOP))
|
if (!(ds_p->silhouette & SIL_TOP))
|
||||||
{
|
{
|
||||||
ds_p->silhouette |= SIL_TOP;
|
ds_p->silhouette |= SIL_TOP;
|
||||||
|
|||||||
+1
-2
@@ -712,7 +712,7 @@ void R_AddSkins(UINT16 wadnum, boolean local)
|
|||||||
// skip to end of this skin's frames
|
// skip to end of this skin's frames
|
||||||
lastlump = lump;
|
lastlump = lump;
|
||||||
|
|
||||||
while (W_CheckNameForNumPwad(wadnum, lastlump) && memcmp(W_CheckNameForNumPwad(wadnum, lastlump), csprname,4)==0)
|
while (W_CheckNameForNumPwad(wadnum, lastlump) && memcmp(W_CheckNameForNumPwad(wadnum, lastlump), csprname, 4) == 0)
|
||||||
lastlump++;
|
lastlump++;
|
||||||
|
|
||||||
// allocate (or replace) sprite frames, and set spritedef
|
// allocate (or replace) sprite frames, and set spritedef
|
||||||
@@ -817,7 +817,6 @@ void R_AddSkins(UINT16 wadnum, boolean local)
|
|||||||
}
|
}
|
||||||
|
|
||||||
#undef lnumskins
|
#undef lnumskins
|
||||||
//sortSkinGrid();
|
|
||||||
|
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
+1
-1
@@ -131,7 +131,7 @@ void R_AddWallSplat(line_t *wallline, INT16 sectorside, const char *patchname, f
|
|||||||
// set the splat
|
// set the splat
|
||||||
splat->patch = W_GetNumForName(patchname);
|
splat->patch = W_GetNumForName(patchname);
|
||||||
sectorside ^= 1;
|
sectorside ^= 1;
|
||||||
if (wallline->sidenum[sectorside] != 0xffff)
|
if (wallline->sidenum[sectorside] != NO_INDEX)
|
||||||
{
|
{
|
||||||
backsector = sides[wallline->sidenum[sectorside]].sector;
|
backsector = sides[wallline->sidenum[sectorside]].sector;
|
||||||
|
|
||||||
|
|||||||
+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;
|
||||||
|
|||||||
Loaded 100 of 126 files, more files were not shown because too many files have changed in this diff.
Show more
Reference in new issue
Block a user