Compare commits

..
8 Commits
Author SHA1 Message Date
alufolie91 6039dae85b point2uint for blua interning string cache 2026-09-21 17:02:14 +02:00
alufolie91 cc9a24e979 move memerrmsg 2026-09-21 17:02:11 +02:00
Roberto Ierusalimschy 9b9bf70ab8 detail (string cache a bit smaller by default) 2026-05-27 20:16:52 +02:00
Roberto Ierusalimschy be2b7ebfcc code for string cache generalized for "associative sets" (compiler
will optimize away or inline the extra loops)
2026-05-27 20:16:48 +02:00
Roberto Ierusalimschy 091c6e37dd 'clearapihash' -> 'luaS_clearcache' and moved to 'lstring.c' (which
keeps all code related to this cache)
2026-05-27 20:16:45 +02:00
Roberto Ierusalimschy 694e82d4f6 new cache for interning strings 2026-05-27 20:16:42 +02:00
Roberto Ierusalimschy 530116cd76 keep memory-error message in the global state, so that its use
does not depend on Lua internalizing strings to avoid a string
creation on memory errors
2026-05-27 20:16:35 +02:00
alufolie91 84b60dadce blua: readd fast track for gettable operations again
this time properly
the set ones are pretty much incompatible with usedindex, so cant use them
2026-05-15 21:07:10 +02:00
97 changed files with 2587 additions and 4081 deletions

No files matched your search

+1 -4
View File
@@ -1,8 +1,5 @@
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()
@@ -34,7 +31,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 Saturn" CACHE STRING "Program name for display purposes") set(CPACK_PACKAGE_DESCRIPTION_SUMMARY "Sonic Robo Blast 2 Kart" 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 -4
View File
@@ -54,7 +54,7 @@ set(SRB2_CORE_SOURCES
string.c string.c
tables.c tables.c
v_video.c v_video.c
w_wad.c w_wad.cpp
y_inter.c y_inter.c
z_zone.cpp z_zone.cpp
) )
@@ -275,7 +275,6 @@ if(${SRB2_CONFIG_HAVE_BLUA})
lua_hooklib.c lua_hooklib.c
lua_hudlib.c lua_hudlib.c
lua_hudlib_drawlist.c lua_hudlib_drawlist.c
lua_profile.cpp
lua_infolib.c lua_infolib.c
lua_maplib.c lua_maplib.c
lua_mathlib.c lua_mathlib.c
@@ -291,7 +290,6 @@ if(${SRB2_CONFIG_HAVE_BLUA})
lua_hook.h lua_hook.h
lua_hud.h lua_hud.h
lua_hudlib_drawlist.h lua_hudlib_drawlist.h
lua_profile.h
lua_libs.h lua_libs.h
lua_script.h lua_script.h
lua_udatalib.h lua_udatalib.h
@@ -520,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.c ${CMAKE_CURRENT_SOURCE_DIR}/hardware/hw_cache.cpp
${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
-1
View File
@@ -99,4 +99,3 @@ lua_skinlib.c
lua_thinkerlib.c lua_thinkerlib.c
lua_udatalib.c lua_udatalib.c
lua_glib.c lua_glib.c
lua_profile.cpp
+17 -8
View File
@@ -519,6 +519,22 @@ 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;
@@ -531,15 +547,8 @@ 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);
t = index2adr(L, idx); auxgetstr(L, index2adr(L, idx), k);
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
View File
@@ -55,8 +55,8 @@ struct lua_longjmp {
void luaD_seterrorobj (lua_State *L, int lerrcode, StkId oldtop) { void luaD_seterrorobj (lua_State *L, int lerrcode, StkId oldtop) {
switch (lerrcode) { switch (lerrcode) {
case LUA_ERRMEM: { case LUA_ERRMEM: { /* memory error? */
setsvalue2s(L, oldtop, luaS_newliteral(L, MEMERRMSG)); setsvalue2s(L, oldtop, G(L)->memerrmsg); /* reuse preregistered msg. */
break; break;
} }
case LUA_ERRERR: { case LUA_ERRERR: {
+1
View File
@@ -544,6 +544,7 @@ 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;
+30
View File
@@ -41,6 +41,25 @@ 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 */
@@ -100,6 +119,17 @@ 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
-2
View File
@@ -13,8 +13,6 @@
#include "llimits.h" #include "llimits.h"
#include "lua.h" #include "lua.h"
#define MEMERRMSG "not enough memory"
#define luaM_reallocv(L,b,on,n,e) \ #define luaM_reallocv(L,b,on,n,e) \
((cast(size_t, (n)+1) <= MAX_SIZET/(e)) ? /* +1 to avoid warnings */ \ ((cast(size_t, (n)+1) <= MAX_SIZET/(e)) ? /* +1 to avoid warnings */ \
+1 -2
View File
@@ -73,10 +73,9 @@ 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_resize(L, MINSTRTABSIZE); /* initial size of string table */ luaS_init(L);
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;
} }
+2
View File
@@ -88,9 +88,11 @@ 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;
+60
View File
@@ -18,6 +18,9 @@
#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;
@@ -72,6 +75,36 @@ 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. */
@@ -128,6 +161,10 @@ 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);
@@ -147,6 +184,29 @@ 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)))
+6 -2
View File
@@ -17,15 +17,19 @@
#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_fix(s) l_setbit((s)->tsv.marked, FIXEDBIT) #define luaS_iswhite(x) test2bits((x)->tsv.marked, WHITE0BIT, WHITE1BIT)
#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
+51 -23
View File
@@ -105,27 +105,42 @@ static void callTM (lua_State *L, const TValue *f, const TValue *p1,
} }
void luaV_gettable (lua_State *L, TValue *t, TValue *key, StkId val) { /*
int loop; ** Finish the table access 'val = t[key]'.
** 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++) {
TValue *tm; if (slot == NULL) { /* 't' is not a table? */
if (ttistable(t)) { /* `t' is a table? */ lua_assert(!ttistable(t));
Table *h = hvalue(t); tm = luaT_gettmbyobj(L, t, TM_INDEX);
const TValue *res = luaH_get(h, key); /* do a primitive get */ if (l_unlikely(ttisnil(tm)))
if (!ttisnil(res) || /* result is no nil? */ luaG_typeerror(L, t, "index"); /* no metamethod */
(tm = fasttm(L, h->metatable, TM_INDEX)) == NULL) { /* or no TM? */ /* else will try the metamethod */
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 tag method */ /* else will try the metamethod */
} }
else if (l_unlikely(ttisnil(tm = luaT_gettmbyobj(L, t, TM_INDEX)))) if (ttisfunction(tm)) { /* is metamethod a function? */
luaG_typeerror(L, t, "index"); callTMres(L, val, tm, t, key); /* call it */
if (ttisfunction(tm)) {
callTMres(L, val, tm, t, key);
return; return;
} }
t = tm; /* else repeat with `tm' */ t = tm; /* else try to access 'tm[key]' */
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");
} }
@@ -139,8 +154,12 @@ 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) && ((tm = fasttm(L, h->metatable, TM_NEWINDEX)) != NULL)) || if (ttisnil(oldval)) {
((!ttisnil(oldval)) && ((tm = fasttm(L, h->metatable, TM_USEDINDEX)) != NULL)))) { tm = fasttm(L, h->metatable, TM_NEWINDEX); /* get metamethod */
} 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;
@@ -378,6 +397,14 @@ 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;
@@ -387,9 +414,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; cl = &clvalue(L->ci->func)->l; /* local reference to function's closure */
base = L->base; k = cl->p->k; /* local reference to function's constant table */
k = cl->p->k; base = L->base; /* local copy of function's base */
/* main loop of interpreter */ /* main loop of interpreter */
for (;;) { for (;;) {
const Instruction i = *pc++; const Instruction i = *pc++;
@@ -449,7 +476,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);
Protect(luaV_gettable(L, rb, rc, ra)); gettableProtected(L, rb, rc, ra);
continue; continue;
} }
case OP_SETGLOBAL: { case OP_SETGLOBAL: {
@@ -485,8 +512,9 @@ 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);
setobjs2s(L, ra+1, rb); TValue *rc = RKC(i);
Protect(luaV_gettable(L, rb, RKC(i), ra)); setobjs2s(L, ra + 1, rb);
gettableProtected(L, rb, rc, ra);
continue; continue;
} }
case OP_ADD: { case OP_ADD: {
+24 -2
View File
@@ -22,12 +22,34 @@
(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_gettable (lua_State *L, TValue *t, TValue *key, LUAI_FUNC void luaV_finishget (lua_State *L, TValue *t, TValue *key,
StkId val); StkId val, TValue *tm);
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);
+39 -55
View File
@@ -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 blinking prompt cursor static tic_t con_tick; // console ticker for anim or 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,7 +103,6 @@ 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);
@@ -132,7 +131,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_CALL|CV_SAVE, CV_Unsigned, CONS_height_Change, 0, NULL, NULL, 0, 0, NULL}; static consvar_t cons_height = {"con_height", "50", CV_SAVE, CV_Unsigned, NULL, 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
@@ -174,18 +173,6 @@ 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)
@@ -1450,8 +1437,6 @@ 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);
@@ -1650,54 +1635,53 @@ 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++)
{ {
i = con_cy - con_scrollup; INT32 x;
size_t c;
// skip the last empty line due to the cursor being at the start of a new line p = (UINT8 *)&con_buffer[((i > 0 ? i : 0)%con_totallines)*con_width];
i--;
i -= (con_curlines - minheight) / charheight; for (c = 0, x = charwidth; c < con_width; c++, x += charwidth, p++)
if (rendermode == render_none)
return;
for (y = (con_curlines-minheight) % charheight; y <= con_curlines-minheight; y += charheight, i++)
{ {
INT32 x; while (*p & 0x80)
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++)
{ {
while (*p & 0x80) charflags = (*p & 0x7f) << V_CHARCOLORSHIFT;
{ p++;
charflags = (*p & 0x7f) << V_CHARCOLORSHIFT; c++;
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 >= (minheight-charheight)) && !con_startup) if ((con_curlines == con_destlines) && (con_curlines >= minheight) && !con_startup)
CON_DrawInput(); CON_DrawInput();
} }
+11 -32
View File
@@ -125,7 +125,6 @@ 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;
@@ -357,13 +356,12 @@ 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 %s with id %d! (size: %s, max: %d)\n"), netxcmdnames[id-1], id, sizeu1(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);
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 %s with id %d... (size: %d, needed: %s)\n"), netxcmdnames[id-1], id, localtextcmd[playerid][0], sizeu1(nparam)); CONS_Alert(CONS_NOTICE, M_GetText("NetXCmd buffer full, delaying netcmd %d... (size: %d, needed: %s)\n"), 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);
@@ -841,13 +839,11 @@ 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;
} }
@@ -1137,7 +1133,6 @@ static void CV_SavePlayerNames(UINT8 **p)
WRITEUINT8(*p, 0); WRITEUINT8(*p, 0);
continue; continue;
} }
WRITESTRING(*p, player_names[i]); WRITESTRING(*p, player_names[i]);
} }
} }
@@ -1151,13 +1146,10 @@ 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);
} }
} }
@@ -1455,7 +1447,6 @@ 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
@@ -2035,7 +2026,6 @@ 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);
@@ -2188,8 +2178,7 @@ 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();
if (!reloading) CON_ToggleOff();
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
@@ -2867,7 +2856,10 @@ static boolean CL_ServerConnectionTicker(const char *tmpsave, tic_t *oldtic, tic
{ {
INT32 key; INT32 key;
I_HandleInterrupt(); if (I_Interrupted())
{
I_Quit();
}
I_OsPolling(); I_OsPolling();
@@ -3506,9 +3498,6 @@ 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);
@@ -4458,7 +4447,6 @@ 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();
@@ -4807,7 +4795,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)
@@ -5408,7 +5396,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 %d in cliserv!", gametype); I_Error("Bad gametype in cliserv!");
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];
@@ -6848,10 +6836,7 @@ boolean TryRunTics(tic_t realtics)
DEBFILE(va("============ Running tic %d (local %d)\n", gametic, leveltime)); DEBFILE(va("============ Running tic %d (local %d)\n", gametic, leveltime));
if (update_stats) if (update_stats)
{
ps_prevtictime = ps_tictime;
PS_START_TIMING(ps_tictime); PS_START_TIMING(ps_tictime);
}
G_Ticker((gametic % NEWTICRATERATIO) == 0); G_Ticker((gametic % NEWTICRATERATIO) == 0);
ExtraDataTicker(); ExtraDataTicker();
@@ -6998,12 +6983,10 @@ 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;
@@ -7062,10 +7045,6 @@ 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
-2
View File
@@ -650,8 +650,6 @@ 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);
+16 -25
View File
@@ -79,7 +79,6 @@
#include "core/memory.h" #include "core/memory.h"
#include "lua_script.h" #include "lua_script.h"
#include "lua_profile.h"
/* Manually defined asset hashes for non-CMake builds /* Manually defined asset hashes for non-CMake builds
* Last updated 2015 / 05 / 03 - SRB2 v2.1.15 - srb2.srb * Last updated 2015 / 05 / 03 - SRB2 v2.1.15 - srb2.srb
@@ -155,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] = ".";
@@ -659,11 +658,6 @@ static boolean D_Display(void)
CON_Drawer(); // Ha, i LIED! CON_Drawer(); // Ha, i LIED!
if (cv_lua_profile.value > 0)
{
LUA_RenderTimers();
}
PS_START_TIMING(ps_swaptime); PS_START_TIMING(ps_swaptime);
I_FinishUpdate(); // page flip or blit buffer I_FinishUpdate(); // page flip or blit buffer
PS_STOP_TIMING(ps_swaptime); PS_STOP_TIMING(ps_swaptime);
@@ -732,7 +726,10 @@ void D_SRB2Loop(void)
enterprecise = I_GetPreciseTime(); enterprecise = I_GetPreciseTime();
I_HandleInterrupt(); if (I_Interrupted())
{
I_Quit();
}
memset(&g_dc, 0, sizeof(g_dc)); memset(&g_dc, 0, sizeof(g_dc));
Z_Frame_Reset(); Z_Frame_Reset();
@@ -1165,7 +1162,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_Alert(CONS_WARNING, "Autoload: file %s contains map data, this WILL cause crashes and desynchs! skipping...\n", wadsToAutoload); CONS_Printf("Autoload: file %s contains map data! skipping...", wadsToAutoload);
continue; continue;
} }
@@ -1359,24 +1356,20 @@ static void IdentifyVersion(void)
// //
// search for maps // search for maps
// //
static void D_CheckMapReplacements(boolean pwad) static void D_CheckMaps(boolean checkreplaced)
{ {
INT32 i; INT32 i;
char *name; char *name;
UINT16 wadnum; UINT16 wadnum;
lumpinfo_t *lumpinfo; lumpinfo_t *lumpinfo;
size_t numfiles;
wadnum = pwad ? (mainwads+1) : 0; for (wadnum = 0; wadnum < mainwads; wadnum++)
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, pwad); P_CheckMapReplacements(name, checkreplaced);
} }
} }
} }
@@ -1839,19 +1832,17 @@ void D_SRB2Main(void)
// conversion sometimes needs the palette // conversion sometimes needs the palette
V_ReloadPalette(); V_ReloadPalette();
D_CheckMapReplacements(false); D_CheckMaps(false);
W_InitMultipleFiles(startuppwads, startuppwadcount, true);
// Only search for pwad maps if we actually have a pwad added
if (startuppwadcount > 0) if (startuppwadcount > 0)
{ {
CONS_Printf("W_InitMultipleFiles(): Adding extra PWADs.\n"); D_CheckMaps(true);
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();
@@ -1938,7 +1929,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
+5 -31
View File
@@ -47,7 +47,6 @@
#include "z_zone.h" #include "z_zone.h"
#include "lua_script.h" #include "lua_script.h"
#include "lua_hook.h" #include "lua_hook.h"
#include "lua_profile.h"
#include "m_cond.h" #include "m_cond.h"
#include "m_anigif.h" #include "m_anigif.h"
#include "k_kart.h" // SRB2kart #include "k_kart.h" // SRB2kart
@@ -151,7 +150,6 @@ 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);
@@ -507,9 +505,6 @@ static CV_PossibleValue_t ps_descriptor_cons_t[] = {
{1, "Average"}, {2, "SD"}, {3, "Minimum"}, {4, "Maximum"}, {0, NULL}}; {1, "Average"}, {2, "SD"}, {3, "Minimum"}, {4, "Maximum"}, {0, NULL}};
consvar_t cv_ps_descriptor = {"ps_descriptor", "Average", 0, ps_descriptor_cons_t, NULL, 0, NULL, NULL, 0, 0, NULL}; consvar_t cv_ps_descriptor = {"ps_descriptor", "Average", 0, ps_descriptor_cons_t, NULL, 0, NULL, NULL, 0, 0, NULL};
//consvar_t cv_lua_profile = {"lua_profile", "0").values(CV_Unsigned).onchange(lua_profile_OnChange).description("Show hook timings over an average of N tics");
consvar_t cv_lua_profile = {"lua_profile", "0", CV_CALL, CV_Unsigned, lua_profile_OnChange, 0, NULL, NULL, 0, 0, NULL};
// only there to better keep track of it globally // only there to better keep track of it globally
consvar_t cv_director = {"director", "Off", CV_HIDEN, CV_OnOff, NULL, 0, NULL, NULL, 0, 0, NULL}; consvar_t cv_director = {"director", "Off", CV_HIDEN, CV_OnOff, NULL, 0, NULL, NULL, 0, 0, NULL};
@@ -650,7 +645,6 @@ 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);
@@ -934,11 +928,11 @@ 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);
CV_RegisterVar(&cv_lua_profile);
// m_menu.c // m_menu.c
CV_RegisterVar(&cv_chatheight); CV_RegisterVar(&cv_chatheight);
CV_RegisterVar(&cv_chatwidth); CV_RegisterVar(&cv_chatwidth);
@@ -946,9 +940,6 @@ 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);
@@ -1036,7 +1027,6 @@ 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);
@@ -1558,8 +1548,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];
@@ -4601,23 +4591,6 @@ 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
// ========================================================================= // =========================================================================
@@ -5498,6 +5471,7 @@ static void Name_OnChange(void)
} }
SendNameAndColor(0); SendNameAndColor(0);
} }
static void Name2_OnChange(void) static void Name2_OnChange(void)
+4 -3
View File
@@ -51,6 +51,10 @@ 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
@@ -149,7 +153,6 @@ 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;
@@ -189,8 +192,6 @@ extern consvar_t cv_ps_thinkframe_page;
extern consvar_t cv_ps_samplesize; extern consvar_t cv_ps_samplesize;
extern consvar_t cv_ps_descriptor; extern consvar_t cv_ps_descriptor;
extern consvar_t cv_lua_profile;
extern consvar_t cv_director, cv_kartdebugdirector, cv_showdirectorhud; extern consvar_t cv_director, cv_kartdebugdirector, cv_showdirectorhud;
extern consvar_t cv_showtrackaddon; extern consvar_t cv_showtrackaddon;
+19 -33
View File
@@ -167,9 +167,7 @@ UINT8 *PutFileNeeded(UINT16 firstfile)
continue; continue;
} }
strncpy(wadfilename, wadfiles[i]->filename, MAX_WADPATH); nameonly(strcpy(wadfilename, wadfiles[i]->filename));
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;
@@ -259,10 +257,9 @@ 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)
@@ -273,7 +270,6 @@ 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"))
@@ -284,17 +280,15 @@ 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;
@@ -305,7 +299,6 @@ boolean CL_CheckDownloadable(void)
} }
CONS_Printf("\n"); CONS_Printf("\n");
} }
}
switch (dlstatus) switch (dlstatus)
{ {
@@ -319,7 +312,6 @@ 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;
} }
@@ -557,7 +549,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);
@@ -565,18 +557,14 @@ 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++)
{ {
if (!memcmp(wadfiles[j]->md5sum, fileneeded[i].md5sum, 16)) nameonly(strcpy(wadfilename, wadfiles[j]->filename));
{
strncpy(wadfilename, wadfiles[j]->filename, MAX_WADPATH);
wadfilename[MAX_WADPATH-1] = '\0';
nameonly(wadfilename);
if (fasticmp(wadfilename, fileneeded[i].filename)) if (fasticmp(wadfilename, fileneeded[i].filename) &&
{ !memcmp(wadfiles[j]->md5sum, fileneeded[i].md5sum, 16))
CONS_Debug(DBG_NETPLAY, "already loaded\n"); {
fileneeded[i].status = FS_OPEN; CONS_Debug(DBG_NETPLAY, "already loaded\n");
return 4; fileneeded[i].status = FS_OPEN;
} return 4;
} }
} }
@@ -657,7 +645,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";
@@ -700,7 +688,7 @@ static boolean SV_SendFile(INT32 node, const char *filename, UINT8 fileid)
char wadfilename[MAX_WADPATH]; char wadfilename[MAX_WADPATH];
if (cv_noticedownload.value && I_GetNodeAddress) if (cv_noticedownload.value)
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
@@ -725,9 +713,7 @@ 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++)
{ {
// im a certified strlcpy hater strlcpy(wadfilename, wadfiles[wadnum]->filename, MAX_WADPATH);
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))
@@ -1080,7 +1066,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";
@@ -1208,7 +1194,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;
-2
View File
@@ -566,8 +566,6 @@ 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
+49 -88
View File
@@ -337,14 +337,12 @@ 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);
@@ -353,26 +351,22 @@ 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]) {
if (!FREE_STATES[i]) CONS_Printf("State S_%s allocated.\n",word);
{
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);
@@ -380,19 +374,16 @@ 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]) {
if (!FREE_MOBJS[i]) CONS_Printf("MobjType MT_%s allocated.\n",word);
{
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);
@@ -435,11 +426,8 @@ static void readthing(MYFILE *f, INT32 num)
strupr(word2); strupr(word2);
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';
if (fastcmp(word, "MAPTHINGNUM") || fastcmp(word, "DOOMEDNUM")) if (fastcmp(word, "MAPTHINGNUM") || fastcmp(word, "DOOMEDNUM"))
{ {
@@ -746,20 +734,14 @@ 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;
} }
} }
@@ -1055,11 +1037,8 @@ static void readcutscenescene(MYFILE *f, INT32 num, INT32 scenenum)
else else
break; break;
const size_t word2len = strlen(word2); if (word2[strlen(word2)-1] == '\n')
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;
@@ -1109,14 +1088,12 @@ 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
@@ -1521,11 +1498,8 @@ static void readframe(MYFILE *f, INT32 num)
strupr(word2); strupr(word2);
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';
if (fastcmp(word1, "SPRITENUMBER") || fastcmp(word1, "SPRITENAME")) if (fastcmp(word1, "SPRITENUMBER") || fastcmp(word1, "SPRITENAME"))
{ {
@@ -1854,19 +1828,13 @@ 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')
@@ -1938,15 +1906,11 @@ 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"))
@@ -8138,7 +8102,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++)
@@ -8164,7 +8128,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++)
@@ -8191,11 +8155,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);
@@ -8236,15 +8200,14 @@ 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')
@@ -8357,7 +8320,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)
@@ -8381,10 +8344,8 @@ 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);
@@ -8392,7 +8353,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);
@@ -8410,7 +8371,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);
@@ -8435,14 +8396,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++;
@@ -8629,7 +8590,6 @@ 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);
@@ -8718,29 +8678,30 @@ 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);
if (mus == 0) static int lua_enumlib_mus_get(lua_State *L)
return 0; {
const char *name = strchr(lua_tostring(L, 1), '_') + 1;
int mus = get_mus(name, false);
lua_pushinteger(L, mus); if (mus == 0)
return 1; return 0;
}
static int lua_enumlib_mus_get_mathlib(lua_State *L) lua_pushinteger(L, mus);
{ return 1;
const char *name = strchr(lua_tostring(L, 1), '_') + 1; }
int mus = get_mus(name, false);
if (mus == 0) static int lua_enumlib_mus_get_mathlib(lua_State *L)
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);
lua_pushinteger(L, mus); if (mus == 0)
return 1; return luaL_error(L, "music '%s' could not be found.\n", lua_tostring(L, 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)
+1 -3
View File
@@ -81,12 +81,10 @@ typedef struct
INT16 flags; INT16 flags;
INT16 special; INT16 special;
INT16 tag; INT16 tag;
// sidenum[1] will be NO_INDEX if one sided // sidenum[1] will be 0xffff if one sided
UINT16 sidenum[2]; UINT16 sidenum[2];
} ATTRPACK maplinedef_t; } ATTRPACK maplinedef_t;
#define NO_INDEX 0xffff
// //
// LineDef attributes. // LineDef attributes.
// //
-14
View File
@@ -602,13 +602,6 @@ 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.
@@ -673,13 +666,6 @@ extern const char *compdate, *comptime, *comprevision, *compbranch;
#undef UPDATE_ALERT #undef UPDATE_ALERT
#endif #endif
// overwrite some of those
// when not compiling in vanilla compat mode
#ifndef COMPAT_VANILLA
#define SATURNJOIN
#define SATURNPAK
#endif
#ifdef __cplusplus #ifdef __cplusplus
} // extern "C" } // extern "C"
#endif #endif
+4 -1
View File
@@ -361,7 +361,10 @@ void F_RunWipe(UINT8 wipetype, boolean drawMenu)
// on for fade-to-black // on for fade-to-black
for (;;) for (;;)
{ {
I_HandleInterrupt(); if (I_Interrupted())
{
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++);
+63 -68
View File
@@ -447,8 +447,7 @@ void G_WriteDemoExtraData(void)
{ {
static UINT8 timeout = 0; static UINT8 timeout = 0;
if (timeout) if (timeout) timeout--;
timeout--;
if (demo_writerng == 1 || (demo_writerng == 2 && timeout == 0)) if (demo_writerng == 1 || (demo_writerng == 2 && timeout == 0))
{ {
@@ -468,7 +467,6 @@ 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)
@@ -490,12 +488,11 @@ 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
const player_t *player = &players[displayplayers[0]]; if (((players[displayplayers[0]].mo && players[displayplayers[0]].speed > 0) // Moving
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
|| (player->kartstuff[k_respawn]) // Respawning || (players[displayplayers[0]].kartstuff[k_respawn]) // Respawning
|| (player->spectator || objectplacing)) // Not a physical player || (players[displayplayers[0]].spectator || objectplacing)) // Not a physical player
&& !(player->kartstuff[k_spinouttimer] && player->kartstuff[k_sneakertimer])) // Spinning and boosting cancels out spinout && !(players[displayplayers[0]].kartstuff[k_spinouttimer] && players[displayplayers[0]].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)
@@ -518,49 +515,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;
} }
@@ -729,8 +726,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;
@@ -1347,7 +1344,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.
@@ -1378,7 +1375,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;
@@ -1521,9 +1518,7 @@ void G_PreviewRewind(tic_t previewtime)
for (i = 0; i < MAXPLAYERS; i++) for (i = 0; i < MAXPLAYERS; i++)
{ {
player_t *player = &players[i]; if (!playeringame[i] || players[i].spectator)
if (!playeringame[i] || player->spectator)
{ {
if (info->playerinfo[i].player.mo) if (info->playerinfo[i].player.mo)
{ {
@@ -1535,35 +1530,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 (player->mo) if (players[i].mo)
player->mo->flags2 |= MF2_DONTDRAW; players[i].mo->flags2 |= MF2_DONTDRAW;
continue; continue;
} }
if (!player->mo) if (!players[i].mo)
continue; //@TODO spawn temp object to act as a player display continue; //@TODO spawn temp object to act as a player display
player->mo->flags2 &= ~MF2_DONTDRAW; players[i].mo->flags2 &= ~MF2_DONTDRAW;
P_UnsetThingPosition(player->mo); P_UnsetThingPosition(players[i].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)
player->mo->x = TWEEN(x); players[i].mo->x = TWEEN(x);
player->mo->y = TWEEN(y); players[i].mo->y = TWEEN(y);
player->mo->z = TWEEN(z); players[i].mo->z = TWEEN(z);
player->mo->angle = TWEEN(angle); players[i].mo->angle = TWEEN(angle);
#undef TWEEN #undef TWEEN
P_SetThingPosition(player->mo); P_SetThingPosition(players[i].mo);
player->frameangle = info->playerinfo[i].player.frameangle + FixedMul((INT32) (next_info->playerinfo[i].player.frameangle - info->playerinfo[i].player.frameangle), tweenvalue); players[i].frameangle = info->playerinfo[i].player.frameangle + FixedMul((INT32) (next_info->playerinfo[i].player.frameangle - info->playerinfo[i].player.frameangle), tweenvalue);
player->mo->sprite = info->playerinfo[i].mobj.sprite; players[i].mo->sprite = info->playerinfo[i].mobj.sprite;
player->mo->frame = info->playerinfo[i].mobj.frame; players[i].mo->frame = info->playerinfo[i].mobj.frame;
player->realtime = info->playerinfo[i].player.realtime; players[i].realtime = info->playerinfo[i].player.realtime;
for (j = 0; j < NUMKARTSTUFF; j++) for (j = 0; j < NUMKARTSTUFF; j++)
player->kartstuff[j] = info->playerinfo[i].player.kartstuff[j]; players[i].kartstuff[j] = info->playerinfo[i].player.kartstuff[j];
} }
for (i = splitscreen; i >= 0; i--) for (i = splitscreen; i >= 0; i--)
@@ -1696,7 +1691,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));
@@ -1710,9 +1705,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;
@@ -1741,7 +1736,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);
@@ -1773,8 +1768,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;
@@ -1831,9 +1826,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++)
{ {
@@ -1873,19 +1868,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
@@ -2344,7 +2339,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;
@@ -2358,12 +2353,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;
@@ -2832,15 +2827,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
@@ -2873,7 +2868,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;
@@ -2893,9 +2888,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"));
@@ -2999,16 +2994,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++)
@@ -3226,15 +3221,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.
@@ -3386,7 +3381,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;
@@ -3478,7 +3473,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
} }
+13 -19
View File
@@ -66,6 +66,8 @@ 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";
@@ -753,7 +755,7 @@ INT32 JoyAxis(axis_input_e axissel, UINT8 player)
if (retaxis > (+JOYAXISRANGE)) if (retaxis > (+JOYAXISRANGE))
retaxis = +JOYAXISRANGE; retaxis = +JOYAXISRANGE;
if (!DigitalGamepadStyle(pnum) && axissel < AXISDEAD) if (!Joystick[pnum].bGamepadStyle && axissel < AXISDEAD)
{ {
const INT32 jdeadzone = ((JOYAXISRANGE-1) * deadzone) >> FRACBITS; const INT32 jdeadzone = ((JOYAXISRANGE-1) * deadzone) >> FRACBITS;
@@ -801,8 +803,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 && !DigitalGamepadStyle(forplayer); const boolean analogjoystickmove = cv_usejoystick[forplayer].value && !Joystick[forplayer].bGamepadStyle;
const boolean gamepadjoystickmove = cv_usejoystick[forplayer].value && DigitalGamepadStyle(forplayer); const boolean gamepadjoystickmove = cv_usejoystick[forplayer].value && Joystick[forplayer].bGamepadStyle;
turnright = InputDown(gc_turnright, ssplayer); turnright = InputDown(gc_turnright, ssplayer);
turnleft = InputDown(gc_turnleft, ssplayer); turnleft = InputDown(gc_turnleft, ssplayer);
@@ -857,8 +859,7 @@ 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 UINT8 forplayer = (ssplayer-1); const boolean usejoystick = cv_usejoystick[(ssplayer-1)].value;
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.
@@ -894,7 +895,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[forplayer] = (InputDown(gc_lookback, ssplayer) || (usejoystick && axis > 0)); camspin[ssplayer-1] = (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)
@@ -991,7 +992,10 @@ 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 = thiscam->freecam; const boolean freecam = camera[forplayer].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];
@@ -1023,9 +1027,6 @@ 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);
@@ -1310,7 +1311,6 @@ 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,8 +1344,6 @@ 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;
@@ -4091,7 +4089,6 @@ 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);
@@ -4102,7 +4099,6 @@ 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);
@@ -4116,10 +4112,8 @@ char *G_BuildMapTitle(INT32 mapnum)
sprintf(title, "%s", mapheaderinfo[mapnum-1]->lvlttl); sprintf(title, "%s", mapheaderinfo[mapnum-1]->lvlttl);
if (zonetext) if (zonetext) sprintf(title + strlen(title), " %s", zonetext);
sprintf(title + strlen(title), " %s", zonetext); if (actnum) sprintf(title + strlen(title), " %s", actnum);
if (actnum)
sprintf(title + strlen(title), " %s", actnum);
} }
return title; return title;
+1 -2
View File
@@ -118,11 +118,10 @@ 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;
-6
View File
@@ -1139,12 +1139,6 @@ void G_DeviceRumbleTick(void)
if (leveltime & 1) // this is actually funny lel if (leveltime & 1) // this is actually funny lel
high = RUMBLE_MODERATE; high = RUMBLE_MODERATE;
} }
/*else if ((player->stairjank > 8) // this is kinda cool but prob gets annoying after a while
&& player->speed != 0
&& P_IsObjectOnGround(player->mo))
{
low = high = RUMBLE_WEAK;
}*/
if (player->kartstuff[k_brakedrift]) if (player->kartstuff[k_brakedrift])
{ {
+1 -1
View File
@@ -373,7 +373,7 @@ static poly_t *CutOutSubsecPoly(seg_t *lseg, INT32 count, poly_t *poly)
if (!gl_maphashorizonlines && line->special == HORIZONSPECIAL) if (!gl_maphashorizonlines && line->special == HORIZONSPECIAL)
gl_maphashorizonlines = true; gl_maphashorizonlines = true;
if (line->sidenum[1] != NO_INDEX) 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)
{ {
+5 -10
View File
@@ -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 = NULL; // For all textures static GLMapTextureSet_t *gl_textures; // For all textures
static void HWR_FreeTextureData(patch_t *patch) static void HWR_FreeTextureData(patch_t *patch)
{ {
@@ -570,8 +570,7 @@ 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)
{ {
@@ -623,12 +622,10 @@ 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)
@@ -729,7 +726,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] == NO_INDEX) if (line->sidenum[j] == 0xffff)
continue; continue;
const side_t *side = &sides[line->sidenum[j]]; const side_t *side = &sides[line->sidenum[j]];
@@ -992,6 +989,7 @@ 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)
{ {
@@ -1003,7 +1001,6 @@ 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
@@ -1130,9 +1127,7 @@ 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;
} }
+396 -333
View File
File diff suppressed because it is too large. Load diff
+1 -1
View File
@@ -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); void HWR_RenderPortalViewpoint(gl_portal_t *rootportal, int stencil_level, boolean allow_portals);
void HWR_ClearSkyDome(void); void HWR_ClearSkyDome(void);
void HWR_BuildSkyDome(void); void HWR_BuildSkyDome(void);
+4 -3
View File
@@ -1400,11 +1400,12 @@ 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 (thingrollangle || sliptideroll) if (spr->mobj->rollangle || sliptideroll)
{ {
angle_t rollang = sliptideroll ? (thingrollangle + (sliptideroll * spr->mobj->player->kartstuff[k_aizdriftstrat])) : thingrollangle; angle_t rollang = sliptideroll
? (spr->mobj->rollangle) + (sliptideroll * spr->mobj->player->kartstuff[k_aizdriftstrat])
: (spr->mobj->rollangle);
rollang *= flipfactor; rollang *= flipfactor;
+7 -7
View File
@@ -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); HWR_RenderPortalViewpoint(portal, stencil_level + 1, true);
// 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;
-5
View File
@@ -76,11 +76,6 @@
// //
// 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" \
+3 -4
View File
@@ -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(deltaZ) < 1.0E-36f) || fpclassify(aspect) == FP_ZERO) if ((fabsf((float)deltaZ) < 1.0E-36f) || fpclassify(aspect) == FP_ZERO)
{ {
return; return;
} }
@@ -1583,7 +1583,6 @@ 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;
@@ -1698,7 +1697,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))
{ {
@@ -2915,7 +2914,7 @@ void GL_CreateModelVBOs(model_t *model)
} }
} }
#define BUFFER_OFFSET(i) ((void*)(i)) #define BUFFER_OFFSET(i) ((char*)(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)
{ {
+45 -156
View File
@@ -117,11 +117,6 @@ 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;
@@ -138,7 +133,6 @@ 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)
@@ -266,8 +260,6 @@ 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;
@@ -971,7 +963,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]--;
@@ -1030,42 +1022,21 @@ static boolean HU_clearChatSpaces(void)
return nothingbutspaces; return nothingbutspaces;
} }
static void DoMute(const char *name, boolean chat) static void DoMute(const char *name)
{ {
INT32 pnum = D_LookupPlayer(name); INT32 pnum = D_LookupPlayer(name);
// Shortcut to reuse this function for console and chat command if (pnum < 0)
#define PRINT(msg, sound) do { \
if (chat) \
HU_AddChatText((msg), (sound)); \
else \
CONS_Printf("%s\n", msg); \
} while (0)
if (pnum < 0 || !playeringame[pnum])
{ {
PRINT("\x85""ERROR: \x80Player not found.", false); HU_AddChatText("\x85""ERROR: \x80Player not found.", false);
return; return;
} }
player_muted[pnum] = !player_muted[pnum]; player_muted[pnum] = !player_muted[pnum];
PRINT(va("Player '%s' has been %smuted.", player_names[pnum], player_muted[pnum] ? "" : "un"), false); HU_AddChatText(va("Player '%s' has been %smuted.", player_names[pnum], player_muted[pnum] ? "" : "un"), false);
if (player_muted[pnum]) if (player_muted[pnum])
PRINT("Use same command to unmute them.", false); HU_AddChatText("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)
@@ -1099,7 +1070,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, true); DoMute(msg+6);
else else
HU_AddChatText("\x82NOTICE: \x80Usage: /mute <name|node>", false); HU_AddChatText("\x82NOTICE: \x80Usage: /mute <name|node>", false);
@@ -1140,7 +1111,6 @@ 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)
{ {
@@ -1287,15 +1257,13 @@ 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_PGUP || c == KEY_MOUSEWHEELUP) && else if ((c == KEY_UPARROW || c == KEY_MOUSEWHEELUP) && chat_scroll > 0 && !OLDCHAT) // CHAT SCROLLING YAYS!
((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_PGDN || c == KEY_MOUSEWHEELDOWN) && else if ((c == KEY_DOWNARROW || c == KEY_MOUSEWHEELDOWN) && chat_scroll < chat_maxscroll && chat_maxscroll > 0 && !OLDCHAT)
((chat_scroll < chat_maxscroll) && (chat_maxscroll > 0) && !OLDCHAT))
{ {
chat_scroll++; chat_scroll++;
justscrolleddown = true; justscrolleddown = true;
@@ -1375,12 +1343,7 @@ 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.
// let's use this as our coordinates, shh INT16 chatx = 13, chaty = 169; // 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!
@@ -1407,7 +1370,7 @@ static void HU_drawMiniChat(void)
for (; i > 0; i--) for (; i > 0; i--)
{ {
char *msg = CHAT_WordWrap(x+2, boxw-(charwidth*2), CHATSNAP|V_ALLOWLOWERCASE, chat_mini[i-1]); char *msg = CHAT_WordWrap(x+2, boxw-(charwidth*2), V_SNAPTOBOTTOM|V_SNAPTOLEFT|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;
@@ -1467,7 +1430,6 @@ 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;
} }
@@ -1485,7 +1447,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), CHATSNAP|V_ALLOWLOWERCASE, chat_mini[i]); // get the current message, and word wrap it. 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.
UINT8 *colormap = NULL; UINT8 *colormap = NULL;
emote_t *emote = NULL; emote_t *emote = NULL;
int emotelen = 0; int emotelen = 0;
@@ -1518,9 +1480,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|CHATSNAP); V_DrawFillConsoleMap(x + dx + 2, y+dy, EMOTEWIDTH, charheight, 239|V_SNAPTOBOTTOM|V_SNAPTOLEFT);
M_DrawEmote(x+dx+2, y+dy, emote, CHATSNAP|transflag); M_DrawEmote(x+dx+2, y+dy, emote, V_SNAPTOBOTTOM|V_SNAPTOLEFT|transflag);
dx += EMOTEWIDTH - charwidth; dx += EMOTEWIDTH - charwidth;
j += emotelen; j += emotelen;
@@ -1528,9 +1490,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|CHATSNAP); V_DrawFillConsoleMap(x + dx + 2, y+dy, charwidth, charheight, 239|V_SNAPTOBOTTOM|V_SNAPTOLEFT);
V_DrawChatCharacter(x + dx + 2, y+dy+cv_chatcentertext.value, msg[j++] |CHATSNAP|transflag, !cv_allcaps.value, colormap); V_DrawChatCharacter(x + dx + 2, y+dy+cv_chatcentertext.value, msg[j++] |V_SNAPTOBOTTOM|V_SNAPTOLEFT|transflag, !cv_allcaps.value, colormap);
} }
dx += charwidth; dx += charwidth;
@@ -1591,13 +1553,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|CHATSNAP); // log box V_DrawFillConsoleMap(chatx, chat_topy, boxw, boxh*charheight +2, 239|V_SNAPTOBOTTOM|V_SNAPTOLEFT); // 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), CHATSNAP|V_ALLOWLOWERCASE, chat_log[i]); // get the current message, and word wrap it. 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.
UINT8 *colormap = NULL; UINT8 *colormap = NULL;
emote_t *emote = NULL; emote_t *emote = NULL;
int emotelen = 0; int emotelen = 0;
@@ -1627,7 +1589,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, CHATSNAP); M_DrawEmote(x+dx+2, y+dy+1, emote, V_SNAPTOBOTTOM|V_SNAPTOLEFT);
dx += EMOTEWIDTH - charwidth; dx += EMOTEWIDTH - charwidth;
} }
j += emotelen; j += emotelen;
@@ -1635,7 +1597,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++] |CHATSNAP, !cv_allcaps.value, colormap); V_DrawChatCharacter(x + dx + 2, y+dy+2, msg[j++] |V_SNAPTOBOTTOM|V_SNAPTOLEFT, !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.
} }
@@ -1672,9 +1634,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)), CHATSNAP | highlight | '\x1A', false); // up arrow V_DrawCharacter(chatx-9, ((justscrolledup) ? (chat_topy-1) : (chat_topy)), V_SNAPTOBOTTOM | V_SNAPTOLEFT | highlight | '\x1A', false); // up arrow
if (chat_scroll < chat_maxscroll) if (chat_scroll < chat_maxscroll)
V_DrawCharacter(chatx-9, chat_bottomy-((justscrolleddown) ? 5 : 6), CHATSNAP | highlight | '\x1B', false); // down arrow V_DrawCharacter(chatx-9, chat_bottomy-((justscrolleddown) ? 5 : 6), V_SNAPTOBOTTOM | V_SNAPTOLEFT | highlight | '\x1B', false); // down arrow
justscrolleddown = false; justscrolleddown = false;
justscrolledup = false; justscrolledup = false;
@@ -1692,7 +1654,6 @@ 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;
@@ -1724,7 +1685,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 | CHATSNAP); V_DrawFillConsoleMap(chatx, y-1, boxw, (typelines*charheight), 239 | V_SNAPTOBOTTOM | V_SNAPTOLEFT);
while (talk[i]) while (talk[i])
{ {
@@ -1732,7 +1693,7 @@ static void HU_DrawChat(void)
++i; ++i;
else else
{ {
V_DrawChatCharacter(chatx + c + 2, y, talk[i] |CHATSNAP|cflag, !cv_allcaps.value, V_GetStringColormap(talk[i]|cflag)); V_DrawChatCharacter(chatx + c + 2, y, talk[i] |V_SNAPTOBOTTOM|V_SNAPTOLEFT|cflag, !cv_allcaps.value, V_GetStringColormap(talk[i]|cflag));
i++; i++;
} }
@@ -1750,7 +1711,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, '_'|CHATSNAP|t, !cv_allcaps.value, NULL); V_DrawChatCharacter(chatx+2+c, y+1, '_'|V_SNAPTOBOTTOM|V_SNAPTOLEFT|t, !cv_allcaps.value, NULL);
if (w_chat.select != w_chat.cursor) if (w_chat.select != w_chat.cursor)
{ {
@@ -1767,23 +1728,17 @@ 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, CHATSNAP|t); M_DrawEmote(chatx + c + 2, y-1, emote, V_SNAPTOBOTTOM|V_SNAPTOLEFT|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|CHATSNAP|t); V_DrawFill(chatx + c + 2 - (drawwidth-charwidth), y-1, drawwidth, charheight, 103|V_TRANSLUCENT|V_SNAPTOBOTTOM|V_SNAPTOLEFT|t);
++i; ++i;
@@ -1792,7 +1747,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, '_' |CHATSNAP|t, !cv_allcaps.value, NULL); V_DrawChatCharacter(cursorx, cursory+1, '_' |V_SNAPTOBOTTOM|V_SNAPTOLEFT|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
{ {
@@ -1810,13 +1765,6 @@ 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
{ {
@@ -1852,7 +1800,6 @@ 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;
@@ -1890,17 +1837,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 | CHATSNAP); V_DrawFillConsoleMap(chatx + boxw + 2, p_dispy - (6*count), (longest_name_length+4)*4, 6, 239 | V_SNAPTOBOTTOM | V_SNAPTOLEFT);
V_DrawSmallString(chatx + boxw + 4, p_dispy - (6*count), CHATSNAP|V_ALLOWLOWERCASE, va("\x82%d\x80 - %s", i, player_names[i])); V_DrawSmallString(chatx + boxw + 4, p_dispy - (6*count), V_SNAPTOBOTTOM|V_SNAPTOLEFT|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 | CHATSNAP); // 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 | V_SNAPTOBOTTOM | V_SNAPTOLEFT); // 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), CHATSNAP|V_ALLOWLOWERCASE, "NO RESULT."); V_DrawSmallString(chatx + boxw + 4, p_dispy - (6*count), V_SNAPTOBOTTOM|V_SNAPTOLEFT|V_ALLOWLOWERCASE, "NO RESULT.");
} }
else else
{ {
@@ -1952,15 +1899,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, CHATSNAP); V_DrawFillConsoleMap(chatx + boxw + pm_offset + 2, suggesty - (7*skip), emote_suggest_boxw, 6, V_SNAPTOBOTTOM|V_SNAPTOLEFT);
// 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|CHATSNAP|V_ALLOWLOWERCASE, va(":%s:", suggest->name)); V_DrawSmallString(chatx + boxw + pm_offset + 4 + EMOTEWIDTH, suggesty - (7*skip), hlflag|V_SNAPTOBOTTOM|V_SNAPTOLEFT|V_ALLOWLOWERCASE, va(":%s:", suggest->name));
M_DrawEmote(chatx + boxw + pm_offset + 2, suggesty - skip*7, suggest, CHATSNAP); M_DrawEmote(chatx + boxw + pm_offset + 2, suggesty - skip*7, suggest, V_SNAPTOBOTTOM|V_SNAPTOLEFT);
++skip; ++skip;
} }
@@ -1974,7 +1921,6 @@ 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;
@@ -2020,17 +1966,11 @@ 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
@@ -2043,7 +1983,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;
@@ -2053,24 +1993,6 @@ 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)
@@ -2291,22 +2213,7 @@ 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)
@@ -2314,8 +2221,6 @@ 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)
{ {
@@ -2395,7 +2300,8 @@ void HU_Drawer(void)
// IN-LEVEL MULTIPLAYER RANKINGS // IN-LEVEL MULTIPLAYER RANKINGS
//====================================================================== //======================================================================
static int Ping_gfx_num(int lag) static int
Ping_gfx_num (int lag)
{ {
if (lag < 2) if (lag < 2)
return 0; return 0;
@@ -2409,7 +2315,8 @@ static int Ping_gfx_num(int lag)
return 4; return 4;
} }
static int Ping_gfx_color(UINT32 lag) static int
Ping_gfx_color (UINT32 lag)
{ {
if (lag < 2) if (lag < 2)
return SKINCOLOR_JAWZ; return SKINCOLOR_JAWZ;
@@ -2432,7 +2339,8 @@ static int Ping_gfx_color(UINT32 lag)
return SKINCOLOR_WHITE; // to make the flashing work return SKINCOLOR_WHITE; // to make the flashing work
} }
static const UINT8 *Ping_gfx_colormap(UINT32 lag, boolean gentleman) static const UINT8 *
Ping_gfx_colormap (UINT32 lag, boolean gentleman)
{ {
const UINT8 *colormap = NULL; const UINT8 *colormap = NULL;
@@ -2452,7 +2360,8 @@ static const UINT8 *Ping_gfx_colormap(UINT32 lag, boolean gentleman)
return colormap; return colormap;
} }
static UINT32 Ping_conversion(UINT32 lag) static UINT32
Ping_conversion (UINT32 lag)
{ {
if (cv_pingmeasurement.value) if (cv_pingmeasurement.value)
{ {
@@ -2569,26 +2478,6 @@ 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
// //
-5
View File
@@ -88,10 +88,6 @@ 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);
@@ -108,7 +104,6 @@ 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);
+19 -1
View File
@@ -36,7 +36,25 @@ extern "C" {
"JOYBUTTONS is greater than INT64 bits can hold" "JOYBUTTONS is greater than INT64 bits can hold"
#endif #endif
#define DigitalGamepadStyle(i) (cv_joyscale[i].value == 0) /** \brief The struct JoyType_s
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"
-5
View File
@@ -203,11 +203,6 @@ 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 The I_GetDiskFreeSpace function /** \brief The I_GetDiskFreeSpace function
-4
View File
@@ -452,11 +452,7 @@ 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)
+52 -50
View File
@@ -98,8 +98,6 @@ 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};
@@ -112,11 +110,6 @@ 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
@@ -233,7 +226,6 @@ 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);
@@ -251,8 +243,6 @@ 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);
@@ -1146,7 +1136,7 @@ enum
SPEEDO_PMETERSMOL, SPEEDO_PMETERSMOL,
}; };
static UINT8 K_GetSpeedometerStyle(void) static SINT8 K_GetSpeedometerStyle(void)
{ {
if (cv_newspeedometer.value == 2 && xtra_speedo) if (cv_newspeedometer.value == 2 && xtra_speedo)
return SPEEDO_EXTRA; return SPEEDO_EXTRA;
@@ -1517,77 +1507,74 @@ static void K_drawKartItem(void)
if (stplyr->kartstuff[k_itemroulette]) if (stplyr->kartstuff[k_itemroulette])
{ {
if (cv_roulettecolor.value == ROULETTECOLOR_PLAYER) localcolor = K_GetHudColor();
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];
if (cv_roulettecolor.value == ROULETTECOLOR_ITEM) localcolor = SKINCOLOR_RASPBERRY; //localcolor = SKINCOLOR_RASPBERRY;
break; break;
case 1: // Banana case 1: // Banana
localpatch = kp_banana[offset]; localpatch = kp_banana[offset];
if (cv_roulettecolor.value == ROULETTECOLOR_ITEM) localcolor = SKINCOLOR_YELLOW; //localcolor = SKINCOLOR_YELLOW;
break; break;
case 2: // Orbinaut case 2: // Orbinaut
localpatch = kp_orbinaut[3+offset]; localpatch = kp_orbinaut[3+offset];
if (cv_roulettecolor.value == ROULETTECOLOR_ITEM) localcolor = SKINCOLOR_STEEL; //localcolor = SKINCOLOR_STEEL;
break; break;
case 3: // Mine case 3: // Mine
localpatch = kp_mine[offset]; localpatch = kp_mine[offset];
if (cv_roulettecolor.value == ROULETTECOLOR_ITEM) localcolor = SKINCOLOR_JET; //localcolor = SKINCOLOR_JET;
break; break;
case 4: // Grow case 4: // Grow
localpatch = kp_grow[offset]; localpatch = kp_grow[offset];
if (cv_roulettecolor.value == ROULETTECOLOR_ITEM) localcolor = SKINCOLOR_TEAL; //localcolor = SKINCOLOR_TEAL;
break; break;
case 5: // Hyudoro case 5: // Hyudoro
localpatch = kp_hyudoro[offset]; localpatch = kp_hyudoro[offset];
if (cv_roulettecolor.value == ROULETTECOLOR_ITEM) localcolor = SKINCOLOR_STEEL; //localcolor = SKINCOLOR_STEEL;
break; break;
case 6: // Rocket Sneaker case 6: // Rocket Sneaker
localpatch = kp_rocketsneaker[offset]; localpatch = kp_rocketsneaker[offset];
if (cv_roulettecolor.value == ROULETTECOLOR_ITEM) localcolor = SKINCOLOR_TANGERINE; //localcolor = SKINCOLOR_TANGERINE;
break; break;
case 7: // Jawz case 7: // Jawz
localpatch = kp_jawz[offset]; localpatch = kp_jawz[offset];
if (cv_roulettecolor.value == ROULETTECOLOR_ITEM) localcolor = SKINCOLOR_JAWZ; //localcolor = SKINCOLOR_JAWZ;
break; break;
case 8: // Self-Propelled Bomb case 8: // Self-Propelled Bomb
localpatch = kp_selfpropelledbomb[offset]; localpatch = kp_selfpropelledbomb[offset];
if (cv_roulettecolor.value == ROULETTECOLOR_ITEM) localcolor = SKINCOLOR_JET; //localcolor = SKINCOLOR_JET;
break; break;
case 9: // Shrink case 9: // Shrink
localpatch = kp_shrink[offset]; localpatch = kp_shrink[offset];
if (cv_roulettecolor.value == ROULETTECOLOR_ITEM) localcolor = SKINCOLOR_ORANGE; //localcolor = SKINCOLOR_ORANGE;
break; break;
case 10: // Invincibility case 10: // Invincibility
localpatch = localinv; localpatch = localinv;
if (cv_roulettecolor.value == ROULETTECOLOR_ITEM) localcolor = SKINCOLOR_GREY; //localcolor = SKINCOLOR_GREY;
break; break;
case 11: // Eggman Monitor case 11: // Eggman Monitor
localpatch = kp_eggman[offset]; localpatch = kp_eggman[offset];
if (cv_roulettecolor.value == ROULETTECOLOR_ITEM) localcolor = SKINCOLOR_ROSE; //localcolor = SKINCOLOR_ROSE;
break; break;
case 12: // Ballhog case 12: // Ballhog
localpatch = kp_ballhog[offset]; localpatch = kp_ballhog[offset];
if (cv_roulettecolor.value == ROULETTECOLOR_ITEM) localcolor = SKINCOLOR_LILAC; //localcolor = SKINCOLOR_LILAC;
break; break;
case 13: // Thunder Shield case 13: // Thunder Shield
localpatch = kp_thundershield[offset]; localpatch = kp_thundershield[offset];
if (cv_roulettecolor.value == ROULETTECOLOR_ITEM) localcolor = SKINCOLOR_CYAN; //localcolor = SKINCOLOR_CYAN;
break; break;
/*case 14: // Pogo Spring /*case 14: // Pogo Spring
localpatch = kp_pogospring[offset]; localpatch = kp_pogospring[offset];
if (cv_roulettecolor.value == ROULETTECOLOR_ITEM) localcolor = SKINCOLOR_TANGERINE; localcolor = SKINCOLOR_TANGERINE;
break; break;
case 15: // Kitchen Sink case 15: // Kitchen Sink
localpatch = kp_kitchensink[offset]; localpatch = kp_kitchensink[offset];
if (cv_roulettecolor.value == ROULETTECOLOR_ITEM) localcolor = SKINCOLOR_STEEL; localcolor = SKINCOLOR_STEEL;
break;*/ break;*/
default: default:
break; break;
@@ -4267,7 +4254,6 @@ 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;
@@ -4277,7 +4263,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)
@@ -4295,19 +4281,39 @@ 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
const boolean analogjoystickmove = (!demo.playback && P_IsLocalPlayer(stplyr) && cv_usejoystick[stplyrnum].value && !DigitalGamepadStyle(stplyrnum)); // this is horrid but we cant get actual input in replays so uhh
axis = analogjoystickmove ? JoyAxis(AXISAIM, stplyrnum+1) : 0; if (demo.playback || !P_IsLocalPlayer(stplyr)) // yeah...........
if (axis != 0)
{
hudforward -= ((axis * KART_FULLTURN) / JOYAXISRANGE);
}
else
{ {
hudforward = stplyr->kartstuff[k_throwdir] * KART_FULLTURN; hudforward = stplyr->kartstuff[k_throwdir] * KART_FULLTURN;
} }
else
{
const boolean analogjoystickmove = cv_usejoystick[stplyrnum].value && !Joystick[stplyrnum].bGamepadStyle;
const boolean gamepadjoystickmove = cv_usejoystick[stplyrnum].value && Joystick[stplyrnum].bGamepadStyle;
const UINT8 ssplayer = stplyrnum+1;
hudforward = CLAMP(hudforward, -KART_FULLTURN, KART_FULLTURN); 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);
}
if (cmd->driftturn || hudforward) if (cmd->driftturn || hudforward)
{ {
@@ -4341,7 +4347,7 @@ static void K_drawInput(void)
} }
} }
} }
else // wheel else
{ {
if (!cmd->driftturn) // no turn if (!cmd->driftturn) // no turn
target = 0; target = 0;
@@ -4397,9 +4403,6 @@ 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);
@@ -4443,10 +4446,9 @@ 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);
const int laplength = (int)strlen(lapnum); for (size_t i = 0; i < laplength; i++)
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));
@@ -4828,7 +4830,7 @@ void K_drawKartHUD(void)
{ {
if (stplyr->exiting) if (stplyr->exiting)
K_drawKartFinish(); K_drawKartFinish();
else if (stplyr->kartstuff[k_lapanimation] && !splitscreen) else if (stplyr->kartstuff[k_lapanimation] && !splitscreen && cv_showlapemblem.value)
K_drawLapStartAnim(); K_drawLapStartAnim();
} }
-1
View File
@@ -41,7 +41,6 @@ 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];
+654 -801
View File
File diff suppressed because it is too large. Load diff
+7 -55
View File
@@ -25,7 +25,6 @@
#include "lua_libs.h" #include "lua_libs.h"
#include "lua_hook.h" #include "lua_hook.h"
#include "lua_hud.h" // hud_running errors #include "lua_hud.h" // hud_running errors
#include "lua_profile.h"
/* ========================================================================= /* =========================================================================
ABSTRACTION ABSTRACTION
@@ -66,8 +65,6 @@ 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;
@@ -299,7 +296,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; /* != NONMOHOOK if mobj hook */ mobjtype_t mobj_type; /* < NUMMOBJTYPES 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 */
@@ -367,7 +364,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, NONMOHOOK, NULL, hook_type, NUMMOBJTYPES, NULL,
hookIds[hook_type].numHooks); hookIds[hook_type].numHooks);
} }
@@ -394,7 +391,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, NONMOHOOK, string, hook_type, NUMMOBJTYPES, string,
stringHooks[hook_type].ref)) stringHooks[hook_type].ref))
{ {
lua_pushstring(gL, string); lua_pushstring(gL, string);
@@ -410,7 +407,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, NONMOHOOK, NULL, hook_type, NUMMOBJTYPES, NULL,
hudHookIds[hook_type].numHooks); hudHookIds[hook_type].numHooks);
} }
@@ -446,54 +443,11 @@ FUNCINLINE static ATTRINLINE void get_hook_from_table(Hook_State *hook, int n)
lua_getref(gL, hookRefs[hook->id]); lua_getref(gL, hookRefs[hook->id]);
} }
static int pcall(Hook_State *hook)
{
return lua_pcall(gL, hook->values, hook->results, EINDEX);
}
static const char *hook_name(Hook_State *hook)
{
if (hud_running)
{
return hudHookNames[hook->hook_type];
}
else if (hook->string)
{
return stringHookNames[hook->hook_type];
}
//else if (hook->mobj_type > 0)
else if (hook->mobj_type != NONMOHOOK)
{
return mobjHookNames[hook->hook_type];
}
else
{
return hookNames[hook->hook_type];
}
}
static int pcall_timed_or_untimed(Hook_State *hook)
{
if (!hud_running && cv_lua_profile.value > 0)
{
lua_timer_t *timer = LUA_BeginFunctionTimer(gL, -1 - hook->values, hook_name(hook));
int k = pcall(hook);
LUA_EndFunctionTimer(timer);
return k;
}
else
{
return pcall(hook);
}
}
static int call_single_hook_no_copy(Hook_State *hook) static int call_single_hook_no_copy(Hook_State *hook)
{ {
hook_important = hook->important; hook_important = hook->important;
//if (lua_pcall(gL, hook->values, hook->results, EINDEX) == 0) if (lua_pcall(gL, hook->values, hook->results, EINDEX) == 0)
if (pcall_timed_or_untimed(hook) == 0)
{ {
if (hook->results > 0) if (hook->results > 0)
{ {
@@ -593,13 +547,11 @@ static int call_hooks
{ {
calls += call_string_hooks(hook); calls += call_string_hooks(hook);
} }
//else if (hook->mobj_type > 0) else if (hook->mobj_type < NUMMOBJTYPES)
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);
if (hook->mobj_type < NUMMOBJTYPES) calls += call_mobj_type_hooks(hook, hook->mobj_type);
calls += call_mobj_type_hooks(hook, hook->mobj_type);
ps_lua_mobjhooks.value.i += calls; ps_lua_mobjhooks.value.i += calls;
} }
else else
+8 -13
View File
@@ -644,22 +644,20 @@ 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, patchh; fixed_t patchw = 0, patchh = 0;
HUDONLY // only run this function in hud hooks HUDONLY // only run this function in hud hooks
@@ -724,11 +722,8 @@ static int libd_drawOnMinimap(lua_State *L)
mm_y -= AutomapPic->topoffset; mm_y -= AutomapPic->topoffset;
if (centered) // patch is supposedly already centered, don't butt in.
{ 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 -5
View File
@@ -22,8 +22,7 @@
#include "lua_script.h" #include "lua_script.h"
#include "lua_libs.h" #include "lua_libs.h"
#include "lua_hud.h" // hud_running errors #include "lua_hud.h" // hud_running errors
#include "lua_hook.h" // hook_cmd_running errors #include "lua_hook.h" // cmd errors
#include "lua_profile.h"
boolean LUA_CallAction(enum actionnum actionnum, mobj_t *actor); boolean LUA_CallAction(enum actionnum actionnum, mobj_t *actor);
state_t *astate = NULL; state_t *astate = NULL;
@@ -111,10 +110,7 @@ static void A_Lua(mobj_t *actor)
LUA_PushUserdata(gL, actor, META_MOBJ); LUA_PushUserdata(gL, actor, META_MOBJ);
lua_pushinteger(gL, var1); lua_pushinteger(gL, var1);
lua_pushinteger(gL, var2); lua_pushinteger(gL, var2);
lua_timer_t *timer = LUA_BeginFunctionTimer(gL, -4, "A_Lua");
LUA_Call(gL, 3, 0, 1); LUA_Call(gL, 3, 0, 1);
LUA_EndFunctionTimer(timer);
lua_pop(gL, 1); // pop error handler lua_pop(gL, 1); // pop error handler
+1 -1
View File
@@ -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] == NO_INDEX) if (line->sidenum[1] == 0xffff)
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;
-264
View File
@@ -1,264 +0,0 @@
// DR. ROBOTNIK'S RING RACERS
//-----------------------------------------------------------------------------
// Copyright (C) 2025 by James Robert Roman
// Copyright (C) 2025 by Kart Krew
//
// This program is free software distributed under the
// terms of the GNU General Public License, version 2.
// See the 'LICENSE' file for more details.
//-----------------------------------------------------------------------------
#include "screen.h"
#include <algorithm>
#include <cstddef>
#include <unordered_map>
#include <string>
#include <string_view>
#include <vector>
extern "C" {
#include "blua/lua.h"
};
#include "v_video.h"
#include "command.h"
#include "doomtype.h"
#include "i_system.h"
#include "lua_profile.h"
#include "m_perfstats.h"
extern "C" consvar_t cv_lua_profile;
namespace
{
precise_t g_time_reference;
int g_tics_counted;
double g_running_tic_time;
double g_avg_tic_time;
bool g_invalid;
}; // namespace
struct lua_timer_t
{
struct Stat
{
double calls = 0;
double time = 0.0;
};
Stat running, avg;
};
namespace
{
std::unordered_map<std::string, lua_timer_t> g_tic_timers;
}; // namespace
lua_timer_t* LUA_BeginFunctionTimer(lua_State* L, int fn_idx, const char* name)
{
lua_Debug ar;
lua_pushvalue(L, fn_idx);
lua_getinfo(L, ">S", &ar);
auto label = [&]
{
using sv = std::string_view;
sv view{ar.source};
switch (view.front())
{
case '@': // file
if (std::size_t p = view.rfind('/'); p != sv::npos) // lump or base
{
return view.substr(p + 1);
}
break;
case '=': // ??
view.remove_prefix(1);
break;
}
return view;
};
// i sure hope this std::string mess is fine...
auto [it, ins] = g_tic_timers.try_emplace(std::string(va("%s:%d (%s)", std::string(label()).c_str(), ar.linedefined, name)));
auto& [key, timer] = *it;
g_time_reference = I_GetPreciseTime();
return &timer;
}
void LUA_EndFunctionTimer(lua_timer_t* timer)
{
precise_t t = I_GetPreciseTime() - g_time_reference;
double precision = I_GetPrecisePrecision();
timer->running.time += t / precision;
timer->running.calls += 1.0;
}
void LUA_ResetTicTimers(void)
{
if (cv_lua_profile.value <= 0)
{
return;
}
if (g_tics_counted < cv_lua_profile.value)
{
g_tics_counted++;
double precision = I_GetPrecisePrecision();
g_running_tic_time += ps_prevtictime.value.p / precision;
}
else
{
double counted = g_tics_counted;
for (auto& [key, timer] : g_tic_timers)
{
timer.avg = {timer.running.calls / counted, timer.running.time / counted};
timer.running = {};
}
g_avg_tic_time = g_running_tic_time / counted;
g_running_tic_time = 0.0;
g_tics_counted = 1;
g_invalid = false;
}
}
void LUA_RenderTimers(void)
{
constexpr int kRowHeight = 4;
float row_y = kRowHeight;
// pretty much what the whole srb2::Draw does lol
auto draw_row = [](float x, float y, INT32 flags, const char *str)
{
V_DrawSmallStringAtFixed(
FloatToFixed(x),
FloatToFixed(y),
V_MONOSPACE|V_ALLOWLOWERCASE|flags,
str
);
};
draw_row(0.f, 0.f, 0, va("-- AVERAGES PER TIC (over %d tics) --", cv_lua_profile.value));
if (g_invalid)
{
draw_row(0.f, row_y, V_GRAYMAP, " <Data pending>");
return;
}
std::vector<decltype(g_tic_timers)::iterator> view;
view.reserve(g_tic_timers.size());
auto color_flag = [](double t)
{
if (t < 10.0)
{
return V_GRAYMAP;
}
else if (t >= 100.0)
{
return V_YELLOWMAP;
}
else
{
return 0;
}
};
{
double cum = 0.0;
for (auto it = g_tic_timers.begin(); it != g_tic_timers.end(); ++it)
{
auto& [key, timer] = *it;
cum += timer.avg.time;
if (timer.avg.time > 0.0)
{
view.push_back(it);
}
}
{
const INT32 tally_flags = color_flag(cum * 1'000'000.0);
draw_row(0.f, row_y, tally_flags, va("%8.2f us - TOTAL", cum * 1'000'000.0));
draw_row(0.f, row_y + kRowHeight, tally_flags, va("%8.2f ms", cum * 1000.0));
// dont need to show this if we didnt capture over time
// this would just show nan or inf anyways
if (std::fpclassify(g_avg_tic_time) != FP_ZERO)
{
draw_row(0.f, row_y + kRowHeight * 2, tally_flags, va(
"%8.2f%% overhead (%.2f / %.2f) <-- not counting rendering time",
(cum / g_avg_tic_time) * 100.0,
(cum * (double)TICRATE),
(g_avg_tic_time * (double)TICRATE)
));
}
}
row_y += kRowHeight * 4;
}
std::sort(
view.rbegin(),
view.rend(),
[](auto a, auto b)
{
auto& [k1, t1] = *a;
auto& [k2, t2] = *b;
return t1.avg.time < t2.avg.time;
}
);
for (auto it : view)
{
auto& [key, timer] = *it;
double t = timer.avg.time * 1'000'000.0;
draw_row(0.f, row_y, color_flag(t), va(
"%8.2f us %8.2f calls - %s",
t,
timer.avg.calls,
key.c_str()
));
row_y += kRowHeight;
// FIXME this is all ugly and sucks
if (row_y >= BASEVIDHEIGHT)
break;
}
}
extern "C" void lua_profile_OnChange(void)
{
g_invalid = true;
if (cv_lua_profile.value == 0)
{
g_tic_timers = {};
}
}
-38
View File
@@ -1,38 +0,0 @@
// DR. ROBOTNIK'S RING RACERS
//-----------------------------------------------------------------------------
// Copyright (C) 2025 by James Robert Roman
// Copyright (C) 2025 by Kart Krew
//
// This program is free software distributed under the
// terms of the GNU General Public License, version 2.
// See the 'LICENSE' file for more details.
//-----------------------------------------------------------------------------
#ifndef lua_profile_h
#define lua_profile_h
#include "blua/lua.h"
#include "doomtype.h"
//#include "typedef.h"
#ifdef __cplusplus
extern "C" {
#endif
struct lua_timer_t;
typedef struct lua_timer_t lua_timer_t;
void LUA_ResetTicTimers(void);
lua_timer_t *LUA_BeginFunctionTimer(lua_State *L, int fn_idx, const char *name);
void LUA_EndFunctionTimer(lua_timer_t *timer);
void LUA_RenderTimers(void);
void lua_profile_OnChange(void);
#ifdef __cplusplus
} // extern "C"
#endif
#endif/*lua_profile_h*/
+1 -8
View File
@@ -713,12 +713,9 @@ 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:
@@ -728,12 +725,8 @@ 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));
+52 -102
View File
@@ -151,6 +151,8 @@ 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;
@@ -212,19 +214,12 @@ 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
@@ -330,6 +325,7 @@ 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
@@ -413,7 +409,6 @@ 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
@@ -452,13 +447,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};
@@ -707,7 +702,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;
@@ -716,7 +711,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)
@@ -724,7 +719,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);
@@ -809,8 +804,7 @@ 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;
} }
@@ -959,7 +953,6 @@ 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;
@@ -1021,24 +1014,6 @@ 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)
@@ -1050,12 +1025,11 @@ 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 (DigitalGamepadStyle(0) || abs(ev->data3) > jydeadzone) if (Joystick[0].bGamepadStyle || 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
@@ -1071,7 +1045,7 @@ boolean M_Responder(event_t *ev)
if (ev->data2 != INT32_MAX && joywaitx < thistime) if (ev->data2 != INT32_MAX && joywaitx < thistime)
{ {
if (DigitalGamepadStyle(0) || abs(ev->data2) > jxdeadzone) if (Joystick[0].bGamepadStyle || 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
@@ -1090,22 +1064,19 @@ 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 (DigitalGamepadStyle(0) || retaxis > jacceldeadzone) if (Joystick[0].bGamepadStyle || retaxis > jacceldeadzone)
{ {
if (joywaitaccel < thistime && retaxis > pjoyaccel) // only on upwards event if (joywaitaccel < thistime && retaxis > pjoyaccel) // only on upwards event
{ {
@@ -1604,16 +1575,11 @@ 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_CamOptionsDef || currentMenu == &OP_Player1CamOptionsDef
currentMenu == &OP_Player1CamOptionsDef || || currentMenu == &OP_Player2CamOptionsDef || currentMenu == &OP_Player3CamOptionsDef
currentMenu == &OP_Player2CamOptionsDef || || currentMenu == &OP_Player4CamOptionsDef))
currentMenu == &OP_Player3CamOptionsDef ||
currentMenu == &OP_Player4CamOptionsDef))
return false; return false;
return true; return true;
@@ -1629,9 +1595,7 @@ 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)
{ {
@@ -1750,16 +1714,19 @@ 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;
@@ -1777,13 +1744,14 @@ 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;
@@ -1791,6 +1759,7 @@ 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;
@@ -3335,14 +3304,14 @@ static void M_AddonsInternal(void)
static void M_Addons(INT32 choice) static void M_Addons(INT32 choice)
{ {
(void)choice; (void)choice;
addons_localmode = false; browselocalskins = false;
M_AddonsInternal(); M_AddonsInternal();
} }
static void M_LocalAddons(INT32 choice) static void M_LocalSkins(INT32 choice)
{ {
(void)choice; (void)choice;
addons_localmode = true; browselocalskins = true;
M_AddonsInternal(); M_AddonsInternal();
} }
@@ -3511,8 +3480,8 @@ static void M_DrawAddons(void)
if (Playing()) if (Playing())
{ {
if (addons_localmode) // Draw notice that you're adding locally if (browselocalskins)
V_DrawCenteredString(BASEVIDWIDTH/2, 5, V_ALLOWLOWERCASE, "Load addons or \x83local skins\x80 locally!"); V_DrawCenteredString(BASEVIDWIDTH/2, 5, V_ALLOWLOWERCASE, "Load \x83local skins\x80 from addons!");
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.");
} }
@@ -3675,10 +3644,7 @@ 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, va("%s Key - Add addon to autoload", G_KeynumToString(AUTOLOAD_KEY))); V_DrawThinString(0, BASEVIDHEIGHT-10, V_SNAPTOBOTTOM|V_SNAPTOLEFT|V_TRANSLUCENT|V_ALLOWLOWERCASE, ("END Key - Add addon to autoload"));
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)
@@ -3700,7 +3666,7 @@ static void M_AddonAutoLoad(INT32 ch)
FILE *autoloadconfigfile; FILE *autoloadconfigfile;
// check our controls // // check our controls //
if (ch != 'y' && ch != KEY_ENTER && ch != AUTOLOAD_KEY) if (ch != 'y' && ch != KEY_ENTER && ch != KEY_END)
{ {
S_StartSound(NULL, sfx_s26d); S_StartSound(NULL, sfx_s26d);
return; return;
@@ -3714,7 +3680,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:
@@ -3855,7 +3821,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);
@@ -3868,40 +3834,30 @@ static void M_HandleAddons(INT32 choice)
case EXT_KART: case EXT_KART:
#endif #endif
case EXT_PK3: case EXT_PK3:
if (browselocalskins)
{ {
const char *addonname = dirmenu[dir_on[menudepthleft]]+DIR_STRING; if (DumbStartsWith("KC_", dirmenu[dir_on[menudepthleft]]+DIR_STRING) || DumbStartsWith("kc_", 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);
if (addons_localmode) COM_BufAddText(va("addfilelocal \"%s%s\"", menupath, dirmenu[dir_on[menudepthleft]]+DIR_STRING));
{
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 AUTOLOAD_KEY: case KEY_END:
{ {
boolean refresh = true; boolean refresh = true;
if (!dirmenu[dir_on[menudepthleft]]) if (!dirmenu[dir_on[menudepthleft]])
@@ -3968,8 +3924,6 @@ 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.
} }
} }
@@ -7650,11 +7604,7 @@ 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);
@@ -7786,7 +7736,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);
} }
+1 -1
View File
@@ -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, forceshowchat; extern boolean forceshowhud;
// //
// MENUS // MENUS
+116 -158
View File
@@ -208,7 +208,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, "Local Add-ons...", M_LocalAddons, 8}, {IT_STRING | IT_CALL, NULL, "Add local skins...", M_LocalSkins, 16},
{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 +238,7 @@ static menuitem_t MPauseMenu[] =
typedef enum typedef enum
{ {
mpause_addons = 0, mpause_addons = 0,
mpause_localaddons, mpause_addlocalskins,
mpause_scramble, mpause_scramble,
mpause_switchmap, mpause_switchmap,
#ifdef HAVE_DISCORDRPC #ifdef HAVE_DISCORDRPC
@@ -446,25 +446,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 +555,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 +725,29 @@ 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) \ #define OP_JOYMENU(pnum) \
{IT_HEADER, NULL, "Gameplay Controls", NULL, 7}, \ {IT_HEADER, NULL, "Gameplay Controls", NULL, 7}, \
{IT_STRING | IT_CVAR, NULL, "Aim Forward/Back" , &cv_aimaxis[pnum] , 15}, \ {IT_STRING | IT_CVAR, NULL, "Aim Forward/Back" , &cv_aimaxis[pnum] , 15}, \
{IT_STRING | IT_CVAR, NULL, "Turn Left/Right" , &cv_turnaxis[pnum] , 20}, \ {IT_STRING | IT_CVAR, NULL, "Turn Left/Right" , &cv_turnaxis[pnum] , 20}, \
{IT_STRING | IT_CVAR, NULL, "Accelerate" , &cv_moveaxis[pnum] , 25}, \ {IT_STRING | IT_CVAR, NULL, "Accelerate" , &cv_moveaxis[pnum] , 25}, \
{IT_STRING | IT_CVAR, NULL, "Brake" , &cv_brakeaxis[pnum] , 30}, \ {IT_STRING | IT_CVAR, NULL, "Brake" , &cv_brakeaxis[pnum] , 30}, \
{IT_STRING | IT_CVAR, NULL, "Drift" , &cv_driftaxis[pnum] , 35}, \ {IT_STRING | IT_CVAR, NULL, "Drift" , &cv_driftaxis[pnum] , 35}, \
{IT_STRING | IT_CVAR, NULL, "Use Item" , &cv_fireaxis[pnum] , 40}, \ {IT_STRING | IT_CVAR, NULL, "Use Item" , &cv_fireaxis[pnum] , 40}, \
{IT_STRING | IT_CVAR, NULL, "Look Backward" , &cv_lookbackaxis[pnum] , 45}, \ {IT_STRING | IT_CVAR, NULL, "Look Backward" , &cv_lookbackaxis[pnum] , 45}, \
{IT_STRING | IT_CVAR, NULL, "Custom Button 1" , &cv_custom1axis[pnum] , 50}, \ {IT_STRING | IT_CVAR, NULL, "Custom Button 1" , &cv_custom1axis[pnum] , 50}, \
{IT_STRING | IT_CVAR, NULL, "Custom Button 2" , &cv_custom2axis[pnum] , 55}, \ {IT_STRING | IT_CVAR, NULL, "Custom Button 2" , &cv_custom2axis[pnum] , 55}, \
{IT_STRING | IT_CVAR, NULL, "Custom Button 3" , &cv_custom3axis[pnum] , 60}, \ {IT_STRING | IT_CVAR, NULL, "Custom Button 3" , &cv_custom3axis[pnum] , 60}, \
{IT_HEADER, NULL, "Camera Controls", NULL, 67}, \ {IT_HEADER, NULL, "Camera Controls", NULL, 67}, \
{IT_STRING | IT_CVAR, NULL, "Look Up/Down" , &cv_lookaxis[pnum] , 75}, \ {IT_STRING | IT_CVAR, NULL, "Look Up/Down" , &cv_lookaxis[pnum] , 75}, \
{IT_STRING | IT_CVAR, NULL, "Turn Left/Right" , &cv_camturnaxis[pnum] , 80}, \ {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_STRING | IT_CVAR, NULL, "Strafe Left/Right" , &cv_camstrafeaxis[pnum] , 85}, \
{IT_HEADER, NULL, "Deadzones", NULL, 92}, \ {IT_HEADER, NULL, "Deadzones", NULL, 92}, \
{IT_STRING | IT_CVAR, NULL, "X deadzone" , &cv_xdeadzone[pnum] , 100}, \ {IT_STRING | IT_CVAR, NULL, "X deadzone" , &cv_xdeadzone[pnum] , 100}, \
{IT_STRING | IT_CVAR, NULL, "Y deadzone" , &cv_ydeadzone[pnum] , 105}, \ {IT_STRING | IT_CVAR, NULL, "Y deadzone" , &cv_ydeadzone[pnum] , 105}, \
{IT_HEADER, NULL, "Miscellaneous", NULL, 112}, \ {IT_HEADER, NULL, "Miscellaneous", NULL, 112}, \
{IT_STRING | IT_CVAR, NULL, "Controller Rumble" , &cv_rumble[pnum] , 120}, \ {IT_STRING | IT_CVAR, NULL, "Controller Rumble" , &cv_rumble[pnum] , 120}, \
{IT_STRING | IT_CVAR, NULL, "Controller Rumble Strength" , &cv_rumblestrength[pnum] , 125}, \ {IT_STRING | IT_CVAR, NULL, "Controller Rumble Strength" , &cv_rumblestrength[pnum] , 125}, \
{IT_STRING | IT_CVAR, NULL, "Set LED to Player color" , &cv_gamepadled[pnum] , 130}, {IT_STRING | IT_CVAR, NULL, "Set LED to Player color" , &cv_gamepadled[pnum] , 130},
static menuitem_t OP_Joystick1Menu[] = static menuitem_t OP_Joystick1Menu[] =
{ {
@@ -789,9 +789,10 @@ 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},
}; };
@@ -860,6 +861,7 @@ static const char* OP_VideoTooltips[] =
"Advanced graphical options.", "Advanced graphical options.",
}; };
enum enum
{ {
op_video_res = 0, op_video_res = 0,
@@ -943,25 +945,24 @@ 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, 55}, {IT_STRING | IT_CVAR, NULL, "Precache Level Textures", &cv_precachetextures, 50},
{IT_STRING | IT_CVAR, NULL, "FPS counter sampling", &cv_accuratefps, 65}, {IT_STRING | IT_CVAR, NULL, "FPS counter sampling", &cv_accuratefps, 60},
{IT_STRING | IT_CVAR, NULL, "Frameskip", &cv_frameskip, 75}, {IT_STRING | IT_CVAR, NULL, "Frameskip", &cv_frameskip, 70},
{IT_STRING | IT_CVAR, NULL, "Votescreen Scaling", &cv_votebgscaling, 85}, {IT_STRING | IT_CVAR, NULL, "Votescreen Scaling", &cv_votebgscaling, 80},
#ifdef HWRENDER #ifdef HWRENDER
{IT_STRING | IT_CVAR, NULL, "Screen Textures", &cv_glscreentextures, 95}, {IT_STRING | IT_CVAR, NULL, "Screen Textures", &cv_glscreentextures, 90},
#ifdef USE_FBO_OGL #ifdef USE_FBO_OGL
{IT_STRING | IT_CVAR, NULL, "FBO Downsampling support", &cv_glframebuffer, 100}, {IT_STRING | IT_CVAR, NULL, "FBO Downsampling support", &cv_glframebuffer, 95},
{IT_STRING | IT_CVAR, NULL, "Palette Depth", &cv_glpalettedepth, 110}, {IT_STRING | IT_CVAR, NULL, "Palette Depth", &cv_glpalettedepth, 105},
{IT_DISABLED, NULL, "", NULL, 120}, // dummy text {IT_DISABLED, NULL, "", NULL, 115}, // dummy text
#else #else
{IT_STRING | IT_CVAR, NULL, "Palette Depth", &cv_glpalettedepth, 110}, {IT_STRING | IT_CVAR, NULL, "Palette Depth", &cv_glpalettedepth, 100},
{IT_DISABLED, NULL, "", NULL, 120}, // dummy text {IT_DISABLED, NULL, "", NULL, 110}, // dummy text
#endif #endif
#endif #endif
}; };
@@ -974,13 +975,12 @@ 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,7 +996,6 @@ 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,
@@ -1010,6 +1009,7 @@ enum
#endif #endif
}; };
#ifdef HWRENDER #ifdef HWRENDER
static menuitem_t OP_OpenGLOptionsMenu[] = static menuitem_t OP_OpenGLOptionsMenu[] =
{ {
@@ -1018,17 +1018,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, 40}, {IT_STRING | IT_CVAR, NULL, "Texture Quality", &cv_gltexturedepth, 45},
{IT_STRING | IT_CVAR, NULL, "Texture Filter", &cv_glfiltermode, 45}, {IT_STRING | IT_CVAR, NULL, "Texture Filter", &cv_glfiltermode, 50},
{IT_STRING | IT_CVAR, NULL, "Anisotropic", &cv_glanisotropicmode, 50}, {IT_STRING | IT_CVAR, NULL, "Anisotropic", &cv_glanisotropicmode, 55},
{IT_STRING | IT_CVAR, NULL, "Visual Portals", &cv_glportals, 55}, {IT_STRING | IT_CVAR, NULL, "Visual Portals", &cv_glportals, 60},
{IT_STRING | IT_CVAR, NULL, "Wall Contrast Style", &cv_glfakecontrast, 65}, {IT_STRING | IT_CVAR, NULL, "Wall Contrast Style", &cv_glfakecontrast, 70},
{IT_STRING | IT_CVAR, NULL, "Slope Contrast", &cv_glslopecontrast, 70}, {IT_STRING | IT_CVAR, NULL, "Slope Contrast", &cv_glslopecontrast, 75},
{IT_STRING | IT_CVAR, NULL, "Dithered Lightning", &cv_gllightdither, 75}, {IT_STRING | IT_CVAR, NULL, "Dithered Lightning", &cv_gllightdither, 80},
{IT_STRING | IT_CVAR, NULL, "Sprite Billboarding", &cv_glspritebillboarding, 80}, {IT_STRING | IT_CVAR, NULL, "Sprite Billboarding", &cv_glspritebillboarding, 85},
{IT_STRING | IT_CVAR, NULL, "Software Perspective", &cv_glshearing, 85}, {IT_STRING | IT_CVAR, NULL, "Software Perspective", &cv_glshearing, 90},
{IT_STRING | IT_CVAR, NULL, "Rendering Distance", &cv_glrenderdistance, 90}, {IT_STRING | IT_CVAR, NULL, "Rendering Distance", &cv_glrenderdistance, 95},
}; };
static const char* OP_OpenGLTooltips[] = static const char* OP_OpenGLTooltips[] =
@@ -1066,6 +1066,7 @@ 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[] =
@@ -1076,7 +1077,8 @@ 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},
#if 0 //#ifndef NO_MIDI //#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},
@@ -1111,7 +1113,8 @@ 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.",
#if 0 //#ifndef NO_MIDI //#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.",
@@ -1171,7 +1174,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?\nNote that this WILL skip sounds played by the map before round start as well!", "Should the Intro fanfare be skipped\nand map music be played on map start?",
"Controls Sound effects caching.\nKeep will retain previously played sound effects in cache." // man idk how to describe this in a non awful way lmao "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.",
@@ -1405,70 +1408,44 @@ 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, 10}, NULL, "Chat Box Width", &cv_chatwidth, 20},
{IT_STRING | IT_CVAR | IT_CV_SLIDER, {IT_STRING | IT_CVAR | IT_CV_SLIDER,
NULL, "Chat Box Height", &cv_chatheight, 15}, NULL, "Chat Box Height", &cv_chatheight, 30},
{IT_STRING | IT_CVAR, NULL, "Chat Horizontal Offset", &cv_chat_xoffset, 20}, {IT_STRING | IT_CVAR, NULL, "Center Text in Chat", &cv_chatcentertext, 40},
{IT_STRING | IT_CVAR, NULL, "Chat Vertical Offset", &cv_chat_yoffset, 25},
{IT_STRING | IT_CVAR, NULL, "Center Text in Chat", &cv_chatcentertext, 35}, {IT_STRING | IT_CVAR, NULL, "Chat Background Tint", &cv_chatbacktint, 55},
{IT_STRING | IT_CVAR, NULL, "Chat Background Tint", &cv_chatbacktint, 40}, {IT_STRING | IT_CVAR, NULL, "Message Fadeout Time", &cv_chattime, 65},
{IT_STRING | IT_CVAR, NULL, "Message Fadeout Time", &cv_chattime, 45}, {IT_STRING | IT_CVAR, NULL, "Spam Protection", &cv_chatspamprotection, 75},
{IT_STRING | IT_CVAR, NULL, "Spam Protection", &cv_chatspamprotection, 50}, {IT_STRING | IT_CVAR, NULL, "Max Chat Messages", &cv_chatlogsize, 85},
{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, 70}, // shows ping above the framerate if we want to. {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, "Ping display style", &cv_pingstyle, 75}, {IT_STRING | IT_CVAR, NULL, "Ping display style", &cv_pingstyle, 115},
{IT_STRING | IT_CVAR, NULL, "Ping measurement", &cv_pingmeasurement, 80}, {IT_STRING | IT_CVAR, NULL, "Ping measurement", &cv_pingmeasurement, 125},
{IT_STRING | IT_CVAR, NULL, "Ping icon", &cv_pingicon, 85}, {IT_STRING | IT_CVAR, NULL, "Ping icon", &cv_pingicon, 135},
{IT_STRING | IT_CVAR, NULL, "Show IP address in playerlist", &cv_shownodeip, 90}, {IT_STRING | IT_CVAR, NULL, "Show IP address in playerlist", &cv_shownodeip, 145},
}; };
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 the chat box.", "Width of chat box.",
"Height of the chat box.", "Height of 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.",
"Background for the chat message pop ups.", "Chatbox background.",
"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 style of the ping display.", "Choose the looks of the ping display.", // this is ass idk english lmao
"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},
@@ -1654,7 +1631,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, "Less Midnight Channel Flicker", &cv_lessflicker, 40}, // obsolete now? or still better be a seperate toggle? {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, "Minimum Sector Brightness", &cv_secbright, 45}, {IT_STRING|IT_CVAR, NULL, "Minimum Sector Brightness", &cv_secbright, 45},
@@ -1790,23 +1767,20 @@ 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, "Stair Janking Effect", &cv_stairjank, 30}, {IT_STRING | IT_CVAR, NULL, "Rotate Sparks and Boost Trails", &cv_sparkroll, 30},
{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, NULL, "Rotate Bananas on Throw", &cv_bananthrowroll, 35},
{IT_STRING | IT_CVAR, NULL, "Rotate Sparks and Boost Trails", &cv_sparkroll, 40}, {IT_STRING | IT_CVAR | IT_CV_SLIDER, NULL, "Player Stretch Factor", &cv_gravstretch, 45},
{IT_STRING | IT_CVAR, NULL, "Rotate Bananas on Throw", &cv_bananthrowroll, 45}, {IT_STRING | IT_CVAR, NULL, "Squish Sound Effect", &cv_slamsound, 50},
{IT_STRING | IT_CVAR | IT_CV_SLIDER, NULL, "Player Stretch Factor", &cv_gravstretch, 55}, {IT_STRING | IT_CVAR, NULL, "Saltyhop", &cv_saltyhop, 60},
{IT_STRING | IT_CVAR, NULL, "Squish Sound Effect", &cv_slamsound, 60}, {IT_STRING | IT_CVAR | IT_CV_SLIDER, NULL, "Saltyhop Height", &cv_saltyheight, 65},
{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, "Saltyhop", &cv_saltyhop, 70}, {IT_STRING | IT_CVAR, NULL, "Squishdance", &cv_squishdance, 90},
{IT_STRING | IT_CVAR | IT_CV_SLIDER, NULL, "Saltyhop Height", &cv_saltyheight, 75}, {IT_STRING | IT_CVAR, NULL, "Squishdance Speed", &cv_squishdancespeed, 96},
{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[] =
@@ -1815,8 +1789,6 @@ 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.",
@@ -1827,7 +1799,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 SPM (Squishes Per Minute).", "Speed of the Squishy dance in BPM.",
}; };
enum enum
@@ -1836,8 +1808,6 @@ enum
sloperotate, sloperotate,
slrotatedist, slrotatedist,
sliptide, sliptide,
stairjank,
stairjanksfx,
sparkrotate, sparkrotate,
bananrotat, bananrotat,
stretchyplayer, stretchyplayer,
@@ -1878,28 +1848,26 @@ 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, "Item Roulette Color", &cv_roulettecolor, 120}, {IT_STRING|IT_CVAR, NULL, "Show Lap Emblem", &cv_showlapemblem, 125},
{IT_STRING|IT_CVAR, NULL, "Show Cecho Messages", &cv_cechotoggle, 130},
{IT_STRING|IT_CVAR, NULL, "Show Lap Emblem", &cv_showlapemblem, 130}, {IT_STRING|IT_CVAR, NULL, "Show Names on Minimap", &cv_showminimapnames, 140},
{IT_STRING|IT_CVAR, NULL, "Show Cecho Messages", &cv_cechotoggle, 135}, {IT_STRING|IT_CVAR, NULL, "Show Finished on Minimap", &cv_showminimapfinished, 145},
{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, "Show Names on Minimap", &cv_showminimapnames, 145}, {IT_STRING|IT_CVAR, NULL, "Music Credits", &cv_songcredits, 170},
{IT_STRING|IT_CVAR, NULL, "Show Finished on Minimap", &cv_showminimapfinished, 150}, {IT_STRING|IT_CVAR, NULL, "Music Credits on Pause", &cv_pausesongcredits, 175},
{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, "Music Credits", &cv_songcredits, 175}, {IT_STRING|IT_CVAR, NULL, "Beta Intermissionscreen", &cv_betainterscreen, 185},
{IT_STRING|IT_CVAR, NULL, "Music Credits on Pause", &cv_pausesongcredits, 180},
{IT_STRING|IT_CVAR, NULL, "Beta Intermissionscreen", &cv_betainterscreen, 190}, {IT_STRING|IT_CVAR, NULL, "Show Director Prompt", &cv_showdirectorhud, 195},
{IT_STRING|IT_CVAR, NULL, "Show Director Prompt", &cv_showdirectorhud, 200}, {IT_STRING|IT_SUBMENU, NULL, "Nametags...", &OP_NametagDef, 205},
{IT_STRING|IT_SUBMENU, NULL, "Driftgauge...", &OP_DriftGaugeDef, 210},
{IT_STRING|IT_SUBMENU, NULL, "Nametags...", &OP_NametagDef, 210}, {IT_SUBMENU|IT_STRING, NULL, "Hud Offsets...", &OP_HudOffsetDef, 220},
{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[] =
@@ -1920,7 +1888,6 @@ 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.",
@@ -2621,7 +2588,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 = DEFAULTSCROLLSTYLE("M_HUD", OP_ChatOptionsMenu, &OP_HUDOptionsDef, 30, 25, OP_ChatOptionsTooltips); menu_t OP_ChatOptionsDef = DEFAULTMENUSTYLE("M_HUD", OP_ChatOptionsMenu, &OP_HUDOptionsDef, 30, 30, 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);
@@ -2746,15 +2713,6 @@ 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
View File
@@ -47,7 +47,6 @@ struct perfstatrow {
static ps_metric_t ps_frametime = {0}; static ps_metric_t ps_frametime = {0};
ps_metric_t ps_tictime = {0}; ps_metric_t ps_tictime = {0};
ps_metric_t ps_prevtictime = {0};
ps_metric_t ps_playerthink_time = {0}; ps_metric_t ps_playerthink_time = {0};
ps_metric_t ps_thinkertime = {0}; ps_metric_t ps_thinkertime = {0};
-1
View File
@@ -36,7 +36,6 @@ typedef struct
#define PS_STOP_TIMING(metric) metric.value.p = I_GetPreciseTime() - metric.value.p #define PS_STOP_TIMING(metric) metric.value.p = I_GetPreciseTime() - metric.value.p
extern ps_metric_t ps_tictime; extern ps_metric_t ps_tictime;
extern ps_metric_t ps_prevtictime;
extern ps_metric_t ps_playerthink_time; extern ps_metric_t ps_playerthink_time;
extern ps_metric_t ps_thinkertime; extern ps_metric_t ps_thinkertime;
+1 -1
View File
@@ -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-2)*8) #define M_DrawTextInput(x, y, input, flags) M_DrawTextInputScroll((x), (y), (input), (flags), ((input)->buffer_size-1)*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
+4 -8
View File
@@ -328,7 +328,7 @@ void P_NewChaseDir(mobj_t *actor)
else else
d[1] = DI_NODIR; d[1] = DI_NODIR;
if (UNLIKELY(twodlevel || actor->flags2 & MF2_TWOD)) if (twodlevel || actor->flags2 & MF2_TWOD)
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 +872,7 @@ void A_PointyThink(void *thing)
TVector v; TVector v;
TVector *res; TVector *res;
angle_t fa; angle_t fa;
fixed_t radius; fixed_t radius = FixedMul(actor->info->radius*actor->info->reactiontime, actor->scale);
boolean firsttime = true; boolean firsttime = true;
INT32 sign; INT32 sign;
@@ -930,8 +930,6 @@ 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;
@@ -2761,11 +2759,9 @@ 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 (UNLIKELY(mariomode))
G_GhostAddColor((INT32) (player - players), GHC_INVINCIBLE); G_GhostAddColor((INT32) (player - players), GHC_INVINCIBLE);
S_ChangeMusicInternal((mariomode) ? "minvnc" : "invinc", false);
S_ChangeMusicInternal((UNLIKELY(mariomode)) ? "minvnc" : "invinc", false);
} }
} }
+9 -14
View File
@@ -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,13 +1107,14 @@ 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;
} }
@@ -1123,21 +1124,19 @@ 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;
} }
@@ -1147,8 +1146,6 @@ 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;
} }
@@ -1655,7 +1652,6 @@ 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.
@@ -2083,12 +2079,11 @@ 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;
@@ -2338,7 +2333,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;
@@ -2349,7 +2344,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;
+73 -107
View File
@@ -1462,15 +1462,49 @@ boolean P_CheckRacers(void)
return false; return false;
} }
static void P_UpdateRemovedOrbital(mobj_t *target, mobj_t *inflictor, mobj_t *source) /** 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;
// SRB2kart // SRB2kart
// I wish I knew a better way to do this // I wish I knew a better way to do this
#ifndef COMPAT_VANILLA
if (!P_MobjWasRemoved(target->target) && target->target->player && !P_MobjWasRemoved(target->target->player->mo))
#else
if (target->target && target->target->player && target->target->player->mo) if (target->target && target->target->player && target->target->player->mo)
#endif
{ {
if (target->target->player->kartstuff[k_eggmanheld] && target->type == MT_EGGMANITEM_SHIELD) if (target->target->player->kartstuff[k_eggmanheld] && target->type == MT_EGGMANITEM_SHIELD)
target->target->player->kartstuff[k_eggmanheld] = 0; target->target->player->kartstuff[k_eggmanheld] = 0;
@@ -1483,11 +1517,7 @@ static void P_UpdateRemovedOrbital(mobj_t *target, mobj_t *inflictor, mobj_t *so
{ {
if (target->movedir != 0 && target->movedir < (UINT16)target->target->player->kartstuff[k_itemamount]) if (target->movedir != 0 && target->movedir < (UINT16)target->target->player->kartstuff[k_itemamount])
{ {
#ifndef COMPAT_VANILLA
if (!P_MobjWasRemoved(target->target->hnext))
#else
if (target->target->hnext) if (target->target->hnext)
#endif
K_KillBananaChain(target->target->hnext, inflictor, source); K_KillBananaChain(target->target->hnext, inflictor, source);
target->target->player->kartstuff[k_itemamount] = 0; target->target->player->kartstuff[k_itemamount] = 0;
@@ -1516,60 +1546,14 @@ static void P_UpdateRemovedOrbital(mobj_t *target, mobj_t *inflictor, mobj_t *so
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->spectator) if (target->player && !target->player->spectator)
target->flags2 &= ~MF2_DONTDRAW; {
target->flags2 &= ~MF2_DONTDRAW;
} }
// if killed by a player // if killed by a player
@@ -1579,7 +1563,6 @@ 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
@@ -1597,41 +1580,35 @@ void P_KillMobj(mobj_t *target, mobj_t *inflictor, mobj_t *source)
target->player->playerstate = PST_DEAD; target->player->playerstate = PST_DEAD;
if (P_IsLocalPlayer(target->player)) if (cv_fading.value && P_IsLocalPlayer(target->player))
{ {
if (cv_fading.value) if (netgame || multiplayer)
{ ms = cv_respawntime.value * 1000;
if (netgame || multiplayer) else
ms = cv_respawntime.value * 1000; ms = 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);
} }
if (target->player == &players[consoleplayer]) for (UINT8 i = 0; i <= splitscreen; i++)
{
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 (automapactive) if (i == 0 && automapactive)
AM_Stop(); AM_Stop();
}
for (UINT8 i = 0; i <= splitscreen; i++) // added : 22-02-98: recenter view for next life...
{ localaiming[i] = 0;
if (target->player == P_GetLocalPlayerForNum(i)) break;
{
// added : 22-02-98: recenter view for next life...
localaiming[i] = 0;
break;
}
} }
} }
@@ -1647,7 +1624,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 (LIKELY(!mariomode) // Don't show birds, etc. in Mario Mode Tails 12-23-2001 if (!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)
@@ -1701,7 +1678,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;
@@ -2245,26 +2222,16 @@ boolean P_DamageMobj(mobj_t *target, mobj_t *inflictor, mobj_t *source, INT32 da
return false; return false;
// well no clue but this may happen ig // well no clue but this may happen ig
#ifndef COMPAT_VANILLA if (!target || (target->health <= 0))
if (P_MobjWasRemoved(target))
#else
if (!target)
#endif
return false;
if (target->health <= 0)
return false; return false;
// Spectator handling // Spectator handling
if (netgame) if (netgame)
{ {
if (target->player && target->player->spectator) if (damage == DMG_SPECTATOR && target->player && target->player->spectator)
{ damage = DMG_INSTAKILL;
if (damage == DMG_SPECTATOR) else if (target->player && target->player->spectator)
damage = DMG_INSTAKILL; return false;
else
return false;
}
if (source && source->player && source->player->spectator) if (source && source->player && source->player->spectator)
return false; return false;
@@ -2370,7 +2337,6 @@ boolean P_DamageMobj(mobj_t *target, mobj_t *inflictor, mobj_t *source, INT32 da
{ {
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)))
@@ -2420,7 +2386,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;
+1
View File
@@ -99,6 +99,7 @@ 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;
+15 -91
View File
@@ -719,11 +719,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) if (thing->player && thing->player->powers[pw_flashing])
{ return true;
if (thing->player->powers[pw_flashing])
return true;
if (thing->type == MT_PLAYER && thing->player)
{
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,7 +1077,6 @@ 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)
{ {
@@ -1095,7 +1094,6 @@ 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))
@@ -1107,7 +1105,6 @@ 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))
@@ -1129,7 +1126,6 @@ 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)
{ {
@@ -1579,13 +1575,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; // didn't hit it return true;
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; // didn't hit it return true;
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.
{ {
@@ -2375,10 +2371,8 @@ 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;
@@ -2428,7 +2422,7 @@ boolean P_TryMove(mobj_t *thing, fixed_t x, fixed_t y, boolean allowdropoff)
if (thing->player) if (thing->player)
{ {
if (special == -1) // this should use the target coords not the ones were started with, but cant fix that for compat reasons! if (special == -1)
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.
@@ -2452,19 +2446,11 @@ 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;
} }
@@ -2477,11 +2463,6 @@ 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;
} }
@@ -2498,21 +2479,11 @@ 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;
} }
@@ -2588,52 +2559,6 @@ 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_stairjanksfx.value)
S_StartSoundAtVolume(thing, (thing->player->stairjank >= 8 ? sfx_s23b : sfx_s268), 192); // dont blast this at full volume lul
//if (!thing->player->stairjank)
{
// 90 degrees to direction you're facing
fixed_t dirx = -FINESINE(thing->angle>>ANGLETOFINESHIFT);
fixed_t diry = FINECOSINE(thing->angle>>ANGLETOFINESHIFT);
fixed_t offset = thing->radius;
if (leveltime % 8 < 4)
{
dirx = -dirx;
diry = -diry;
}
mobj_t * spark = P_SpawnMobj(thing->x + FixedMul(dirx, offset), thing->y + FixedMul(diry, offset), thing->z, MT_DRIFTDUST);
spark->momx = FixedMul(dirx, FRACUNIT) + (6 + ((int)leveltime % 5))*(thing->momx)/10;
spark->momy = FixedMul(diry, FRACUNIT) + (6 + ((int)leveltime % 5))*(thing->momy)/10;
spark->momz = 5*FRACUNIT;
spark->scale = mapobjectscale/5;
spark->destscale = mapobjectscale/2;
spark->islocal = true;
//spark->fuse = 9;
spark->color = SKINCOLOR_WHITE;
//spark->cusval = K_StairJankFlip(ANGLE_90);
P_SetTarget(&spark->target, thing);
//P_SetTarget(&spark->owner, thing);
//spark->renderflags |= RF_REDUCEVFX;
}
thing->player->stairjank = 9;
//thing->player->stairjank = 17;
}
thing->x = x; thing->x = x;
thing->y = y; thing->y = y;
@@ -3619,12 +3544,6 @@ 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);
@@ -3638,9 +3557,14 @@ static boolean PIT_RadiusAttack(mobj_t *thing)
if (dist >= bombdamage) if (dist >= bombdamage)
return true; // out of range return true; // out of range
// must be in direct path if (thing->floorz > bombspot->z && bombspot->ceilingz < thing->z)
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
} }
+2 -9
View File
@@ -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] == NO_INDEX) if (linedef->sidenum[1] == 0xffff)
{ {
// single sided line // single sided line
openrange = 0; openrange = 0;
@@ -398,7 +398,7 @@ void P_LineOpening(line_t *linedef, mobj_t *mobj)
{ {
sector_t *front, *back; sector_t *front, *back;
if (linedef->sidenum[1] == NO_INDEX) if (linedef->sidenum[1] == 0xffff)
{ {
// single sided line // single sided line
openrange = 0; openrange = 0;
@@ -972,10 +972,6 @@ 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)
@@ -1004,13 +1000,11 @@ 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.
{ {
@@ -1018,7 +1012,6 @@ 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;
} }
+137 -186
View File
@@ -1249,6 +1249,7 @@ static void P_PushableCheckBustables(mobj_t *mo)
if (rover->master->frontsector->crumblestate) if (rover->master->frontsector->crumblestate)
continue; continue;
topheight = P_GetFOFTopZ(mo, node->m_sector, rover, mo->x, mo->y, NULL);
bottomheight = P_GetFOFBottomZ(mo, node->m_sector, rover, mo->x, mo->y, NULL); bottomheight = P_GetFOFBottomZ(mo, node->m_sector, rover, mo->x, mo->y, NULL);
// Height checks // Height checks
@@ -1260,34 +1261,29 @@ static void P_PushableCheckBustables(mobj_t *mo)
if (mo->z+mo->height > bottomheight) if (mo->z+mo->height > bottomheight)
continue; continue;
} }
else if (rover->flags & FF_SPINBUST)
{
if (mo->z+mo->momz > topheight)
continue;
if (mo->z+mo->height < bottomheight)
continue;
}
else if (rover->flags & FF_SHATTER)
{
if (mo->z+mo->momz > topheight)
continue;
if (mo->z+mo->momz + mo->height < bottomheight)
continue;
}
else else
{ {
topheight = P_GetFOFTopZ(mo, node->m_sector, rover, mo->x, mo->y, NULL); if (mo->z >= topheight)
continue;
if (rover->flags & FF_SPINBUST) if (mo->z+mo->height < bottomheight)
{ continue;
if (mo->z+mo->momz > topheight)
continue;
if (mo->z+mo->height < bottomheight)
continue;
}
else if (rover->flags & FF_SHATTER)
{
if (mo->z+mo->momz > topheight)
continue;
if (mo->z+mo->momz + mo->height < bottomheight)
continue;
}
else
{
if (mo->z >= topheight)
continue;
if (mo->z+mo->height < bottomheight)
continue;
}
} }
EV_CrumbleChain(node->m_sector, rover); EV_CrumbleChain(node->m_sector, rover);
@@ -2954,8 +2950,7 @@ void P_MobjCheckWater(mobj_t *mobj)
if ((mobj->eflags & MFE_VERTICALFLIP) && mobj->ceilingz-mobj->waterbottom <= FixedMul(mobj->info->height, mobj->scale)>>1) if ((mobj->eflags & MFE_VERTICALFLIP) && mobj->ceilingz-mobj->waterbottom <= FixedMul(mobj->info->height, mobj->scale)>>1)
return; return;
if ((mobj->eflags & MFE_GOOWATER || wasingoo)) // Decide what happens to your momentum when you enter/leave goopy water. if ((mobj->eflags & MFE_GOOWATER || wasingoo)) { // Decide what happens to your momentum when you enter/leave goopy water.
{
if (P_MobjFlip(mobj)*mobj->momz < 0) // You are entering the goo? if (P_MobjFlip(mobj)*mobj->momz < 0) // You are entering the goo?
mobj->momz = FixedMul(mobj->momz, FixedDiv(2*FRACUNIT, 5*FRACUNIT)); // kill momentum significantly, to make the goo feel thick. mobj->momz = FixedMul(mobj->momz, FixedDiv(2*FRACUNIT, 5*FRACUNIT)); // kill momentum significantly, to make the goo feel thick.
} }
@@ -2969,7 +2964,6 @@ void P_MobjCheckWater(mobj_t *mobj)
{ {
// Spawn a splash // Spawn a splash
mobj_t *splish; mobj_t *splish;
if (mobj->eflags & MFE_VERTICALFLIP) if (mobj->eflags & MFE_VERTICALFLIP)
{ {
splish = P_SpawnMobj(mobj->x, mobj->y, mobj->waterbottom-FixedMul(mobjinfo[MT_SPLISH].height, mobj->scale), MT_SPLISH); splish = P_SpawnMobj(mobj->x, mobj->y, mobj->waterbottom-FixedMul(mobjinfo[MT_SPLISH].height, mobj->scale), MT_SPLISH);
@@ -2978,7 +2972,6 @@ void P_MobjCheckWater(mobj_t *mobj)
} }
else else
splish = P_SpawnMobj(mobj->x, mobj->y, mobj->watertop, MT_SPLISH); splish = P_SpawnMobj(mobj->x, mobj->y, mobj->watertop, MT_SPLISH);
splish->destscale = mobj->scale; splish->destscale = mobj->scale;
P_SetScale(splish, mobj->scale); P_SetScale(splish, mobj->scale);
} }
@@ -3379,11 +3372,7 @@ static void P_PlayerMobjThinker(mobj_t *mobj)
I_Assert(mobj->player != NULL); I_Assert(mobj->player != NULL);
I_Assert(!P_MobjWasRemoved(mobj)); I_Assert(!P_MobjWasRemoved(mobj));
#ifndef COMPAT_VANILLA
if (P_MobjWasRemoved(mobj))
#else
if (!mobj) if (!mobj)
#endif
return; return;
P_MobjCheckWater(mobj); P_MobjCheckWater(mobj);
@@ -5172,9 +5161,9 @@ static void P_Boss9Thinker(mobj_t *mobj)
{ {
// Stunned after vector form // Stunned after vector form
if (mobj->movedir > ANGLE_180) if (mobj->movedir > ANGLE_180)
mobj->angle -= FixedAngle(FixedMul(AngleFixed(InvAngle(mobj->movedir)), FixedDiv(mobj->reactiontime<<FRACBITS,24<<FRACBITS))); mobj->angle -= FixedAngle(FixedMul(AngleFixed(InvAngle(mobj->movedir)),FixedDiv(mobj->reactiontime<<FRACBITS,24<<FRACBITS)));
else else
mobj->angle += FixedAngle(FixedMul(AngleFixed(mobj->movedir), FixedDiv(mobj->reactiontime<<FRACBITS,24<<FRACBITS))); mobj->angle += FixedAngle(FixedMul(AngleFixed(mobj->movedir),FixedDiv(mobj->reactiontime<<FRACBITS,24<<FRACBITS)));
mobj->reactiontime--; mobj->reactiontime--;
@@ -5216,99 +5205,99 @@ static void P_Boss9Thinker(mobj_t *mobj)
// It's time to attack! What are we gonna do?! // It's time to attack! What are we gonna do?!
switch(mobj->movecount) switch(mobj->movecount)
{ {
case 0: case 0:
default: default:
// Fly up and prepare for an attack! // Fly up and prepare for an attack!
// We have to charge up first, so let's go up into the air // We have to charge up first, so let's go up into the air
P_SetMobjState(mobj, mobj->info->raisestate); P_SetMobjState(mobj, mobj->info->raisestate);
if (mobj->floorz >= mobj->target->floorz) if (mobj->floorz >= mobj->target->floorz)
mobj->watertop = mobj->floorz + 256*FRACUNIT; mobj->watertop = mobj->floorz + 256*FRACUNIT;
else else
mobj->watertop = mobj->target->floorz + 256*FRACUNIT; mobj->watertop = mobj->target->floorz + 256*FRACUNIT;
break; break;
case 1: case 1:
{ {
// Okay, we're up? Good, time to gather energy... // Okay, we're up? Good, time to gather energy...
if (mobj->health > mobj->info->damage) if (mobj->health > mobj->info->damage)
{ // No more bubble if we're broken (pinch phase) { // No more bubble if we're broken (pinch phase)
mobj_t *shield = P_SpawnMobj(mobj->x, mobj->y, mobj->z, MT_MSSHIELD_FRONT); mobj_t *shield = P_SpawnMobj(mobj->x, mobj->y, mobj->z, MT_MSSHIELD_FRONT);
P_SetTarget(&mobj->tracer, shield); P_SetTarget(&mobj->tracer, shield);
P_SetTarget(&shield->target, mobj); P_SetTarget(&shield->target, mobj);
}
else
P_LinedefExecute(LE_PINCHPHASE, mobj, NULL);
mobj->fuse = 4*TICRATE;
mobj->flags |= MF_PAIN;
if (mobj->info->attacksound)
S_StartSound(mobj, mobj->info->attacksound);
A_FaceTarget(mobj);
break;
} }
else
P_LinedefExecute(LE_PINCHPHASE, mobj, NULL);
mobj->fuse = 4*TICRATE;
mobj->flags |= MF_PAIN;
if (mobj->info->attacksound)
S_StartSound(mobj, mobj->info->attacksound);
A_FaceTarget(mobj);
break;
}
case 2: case 2:
// We're all charged and ready now! Unleash the fury!! // We're all charged and ready now! Unleash the fury!!
if (mobj->health > mobj->info->damage) if (mobj->health > mobj->info->damage)
{ {
mobj_t *removemobj = mobj->tracer; mobj_t *removemobj = mobj->tracer;
P_SetTarget(&mobj->tracer, mobj->hnext); P_SetTarget(&mobj->tracer, mobj->hnext);
P_RemoveMobj(removemobj); P_RemoveMobj(removemobj);
} }
if (mobj->health <= mobj->info->damage) if (mobj->health <= mobj->info->damage)
{ {
// Attack 1: Pinball dash! // Attack 1: Pinball dash!
if (mobj->health == 1) if (mobj->health == 1)
mobj->movedir = 0; mobj->movedir = 0;
else
mobj->movedir = 2;
if (mobj->info->seesound)
S_StartSound(mobj, mobj->info->seesound);
P_SetMobjState(mobj, mobj->info->seestate);
if (mobj->movedir == 2)
mobj->threshold = 16; // bounce 16 times
else
mobj->threshold = 32; // bounce 32 times
mobj->watertop = mobj->target->floorz + 16*FRACUNIT;
P_LinedefExecute(LE_PINCHPHASE, mobj, NULL);
}
else else
mobj->movedir = 2;
if (mobj->info->seesound)
S_StartSound(mobj, mobj->info->seesound);
P_SetMobjState(mobj, mobj->info->seestate);
if (mobj->movedir == 2)
mobj->threshold = 16; // bounce 16 times
else
mobj->threshold = 32; // bounce 32 times
mobj->watertop = mobj->target->floorz + 16*FRACUNIT;
P_LinedefExecute(LE_PINCHPHASE, mobj, NULL);
}
else
{
// Attack 2: Energy shot!
mobj->movedir = 1;
if (mobj->health >= 8)
mobj->extravalue1 = 0;
else if (mobj->health >= 5)
mobj->extravalue1 = 2;
else if (mobj->health >= 4)
mobj->extravalue1 = 1;
else
mobj->extravalue1 = 3;
switch(mobj->extravalue1)
{ {
// Attack 2: Energy shot! case 0: // shoot once
mobj->movedir = 1; case 2: // spread-shot
default:
if (mobj->health >= 8) mobj->threshold = 2;
mobj->extravalue1 = 0; break;
else if (mobj->health >= 5) case 1: // shoot 3 times
mobj->extravalue1 = 2; mobj->threshold = 3*2;
else if (mobj->health >= 4) break;
mobj->extravalue1 = 1; case 3: // shoot like a goddamn machinegun
else mobj->threshold = 8*2;
mobj->extravalue1 = 3; break;
switch (mobj->extravalue1)
{
case 0: // shoot once
case 2: // spread-shot
default:
mobj->threshold = 2;
break;
case 1: // shoot 3 times
mobj->threshold = 3*2;
break;
case 3: // shoot like a goddamn machinegun
mobj->threshold = 8*2;
break;
}
} }
break; }
break;
case 3: case 3:
// Return to idle. // Return to idle.
mobj->watertop = mobj->target->floorz + 32*FRACUNIT; mobj->watertop = mobj->target->floorz + 32*FRACUNIT;
P_SetMobjState(mobj, mobj->info->spawnstate); P_SetMobjState(mobj, mobj->info->spawnstate);
mobj->flags &= ~MF_PAIN; mobj->flags &= ~MF_PAIN;
mobj->fuse = 10*TICRATE; mobj->fuse = 10*TICRATE;
break; break;
} }
mobj->movecount++; mobj->movecount++;
mobj->movecount %= 4; mobj->movecount %= 4;
@@ -5326,7 +5315,6 @@ static void P_Boss9Thinker(mobj_t *mobj)
// Face your target // Face your target
angle = R_PointToAngle2(mobj->x, mobj->y, mobj->target->x, mobj->target->y); // absolute angle angle = R_PointToAngle2(mobj->x, mobj->y, mobj->target->x, mobj->target->y); // absolute angle
angle = (angle-mobj->angle); // relative angle angle = (angle-mobj->angle); // relative angle
if (angle < ANGLE_180) if (angle < ANGLE_180)
mobj->angle += angle/8; mobj->angle += angle/8;
else else
@@ -5338,19 +5326,18 @@ static void P_Boss9Thinker(mobj_t *mobj)
|| mobj->target->player->powers[pw_invulnerability] || mobj->target->player->powers[pw_invulnerability]
|| mobj->target->player->powers[pw_super])) || mobj->target->player->powers[pw_super]))
danger = false; danger = false;
else if (mobj->target->x+mobj->target->radius+abs(mobj->target->momx*2) < mobj->x-mobj->radius) if (mobj->target->x+mobj->target->radius+abs(mobj->target->momx*2) < mobj->x-mobj->radius)
danger = false; danger = false;
else if (mobj->target->x-mobj->target->radius-abs(mobj->target->momx*2) > mobj->x+mobj->radius) if (mobj->target->x-mobj->target->radius-abs(mobj->target->momx*2) > mobj->x+mobj->radius)
danger = false; danger = false;
else if (mobj->target->y+mobj->target->radius+abs(mobj->target->momy*2) < mobj->y-mobj->radius) if (mobj->target->y+mobj->target->radius+abs(mobj->target->momy*2) < mobj->y-mobj->radius)
danger = false; danger = false;
else if (mobj->target->y-mobj->target->radius-abs(mobj->target->momy*2) > mobj->y+mobj->radius) if (mobj->target->y-mobj->target->radius-abs(mobj->target->momy*2) > mobj->y+mobj->radius)
danger = false; danger = false;
else if (mobj->target->z+mobj->target->height+mobj->target->momz*2 < mobj->z) if (mobj->target->z+mobj->target->height+mobj->target->momz*2 < mobj->z)
danger = false; danger = false;
else if (mobj->target->z+mobj->target->momz*2 > mobj->z+mobj->height) if (mobj->target->z+mobj->target->momz*2 > mobj->z+mobj->height)
danger = false; danger = false;
if (danger) if (danger)
{ {
// An incoming attack is detected! What should we do?! // An incoming attack is detected! What should we do?!
@@ -5358,27 +5345,21 @@ static void P_Boss9Thinker(mobj_t *mobj)
mobj->movedir = ANGLE_11hh - FixedAngle(FixedMul(AngleFixed(ANGLE_11hh), FixedDiv((mobj->info->spawnhealth - mobj->health)<<FRACBITS, (mobj->info->spawnhealth-1)<<FRACBITS))); mobj->movedir = ANGLE_11hh - FixedAngle(FixedMul(AngleFixed(ANGLE_11hh), FixedDiv((mobj->info->spawnhealth - mobj->health)<<FRACBITS, (mobj->info->spawnhealth-1)<<FRACBITS)));
if (P_RandomChance(FRACUNIT/2)) if (P_RandomChance(FRACUNIT/2))
mobj->movedir = InvAngle(mobj->movedir); mobj->movedir = InvAngle(mobj->movedir);
mobj->threshold = 6 + (FixedMul(24<<FRACBITS, FixedDiv((mobj->info->spawnhealth - mobj->health)<<FRACBITS, (mobj->info->spawnhealth-1)<<FRACBITS))>>FRACBITS); mobj->threshold = 6 + (FixedMul(24<<FRACBITS, FixedDiv((mobj->info->spawnhealth - mobj->health)<<FRACBITS, (mobj->info->spawnhealth-1)<<FRACBITS))>>FRACBITS);
if (mobj->info->activesound) if (mobj->info->activesound)
S_StartSound(mobj, mobj->info->activesound); S_StartSound(mobj, mobj->info->activesound);
if (mobj->info->painchance) if (mobj->info->painchance)
P_SetMobjState(mobj, mobj->info->painchance); P_SetMobjState(mobj, mobj->info->painchance);
return; return;
} }
// Move normally: Approach the player using normal thrust and simulated friction. // Move normally: Approach the player using normal thrust and simulated friction.
dist = P_AproxDistance(mobj->x-mobj->target->x, mobj->y-mobj->target->y); dist = P_AproxDistance(mobj->x-mobj->target->x, mobj->y-mobj->target->y);
P_Thrust(mobj, R_PointToAngle2(0, 0, mobj->momx, mobj->momy), -3*FRACUNIT/8); P_Thrust(mobj, R_PointToAngle2(0, 0, mobj->momx, mobj->momy), -3*FRACUNIT/8);
if (dist < 64*FRACUNIT) if (dist < 64*FRACUNIT)
P_Thrust(mobj, mobj->angle, -4*FRACUNIT); P_Thrust(mobj, mobj->angle, -4*FRACUNIT);
else if (dist > 180*FRACUNIT) else if (dist > 180*FRACUNIT)
P_Thrust(mobj, mobj->angle, FRACUNIT); P_Thrust(mobj, mobj->angle, FRACUNIT);
mobj->momz += P_AproxDistance(mobj->momx, mobj->momy)/12; // Move up higher the faster you're going. mobj->momz += P_AproxDistance(mobj->momx, mobj->momy)/12; // Move up higher the faster you're going.
} }
} }
@@ -5633,11 +5614,7 @@ void P_SetScale(mobj_t *mobj, fixed_t newscale)
player_t *player; player_t *player;
fixed_t oldscale; fixed_t oldscale;
#ifndef COMPAT_VANILLA
if (P_MobjWasRemoved(mobj))
#else
if (!mobj) if (!mobj)
#endif
return; return;
oldscale = mobj->scale; //keep for adjusting stuff below oldscale = mobj->scale; //keep for adjusting stuff below
@@ -6876,9 +6853,11 @@ static boolean P_MobjDeadThink(mobj_t *mobj)
case MT_BANANA: case MT_BANANA:
if (cv_bananthrowroll.value) if (cv_bananthrowroll.value)
{ {
const angle_t speen = (angle_t)FixedMul(FixedDiv(abs(mobj->momz), 8 * mobj->scale), ANGLE_67h); //mobj->angle -= spin;
//mobj->angle -= speen; if (cv_bananthrowroll.value == 1 && K_CheckSlopeRollDist(mobj))
mobj->rollangle += speen; mobj->sloperoll += (angle_t)FixedMul(FixedDiv(abs(mobj->momz), 8 * mobj->scale), ANGLE_67h); // im lazy but this makes sure the banan goes back to upright when it lands lmao
else if (cv_bananthrowroll.value == 2)
mobj->rollangle += (angle_t)FixedMul(FixedDiv(abs(mobj->momz), 8 * mobj->scale), ANGLE_67h);
} }
/* FALLTHRU */ /* FALLTHRU */
case MT_ORBINAUT: case MT_ORBINAUT:
@@ -7068,7 +7047,7 @@ static boolean P_MobjRegularThink(mobj_t *mobj)
} }
P_InstaThrust(mobj, mobj->angle, finalspeed); P_InstaThrust(mobj, mobj->angle, finalspeed);
if (grounded) if (grounded)
{ {
sector_t *sec2 = P_ThingOnSpecial3DFloor(mobj); sector_t *sec2 = P_ThingOnSpecial3DFloor(mobj);
@@ -7188,23 +7167,21 @@ static boolean P_MobjRegularThink(mobj_t *mobj)
} }
case MT_BANANA: case MT_BANANA:
case MT_EGGMANITEM: case MT_EGGMANITEM:
{ if (cv_bananthrowroll.value && !P_IsObjectOnGround(mobj))
boolean grounded = P_IsObjectOnGround(mobj);
if (cv_bananthrowroll.value && !grounded)
{ {
// tilt n tumble // tilt n tumble
const angle_t speen = (angle_t)FixedMul(FixedDiv(abs(mobj->momz), 8 * mobj->scale), ANGLE_67h); //mobj->angle += spin;
//mobj->angle += speen;
mobj->rollangle -= speen; if (cv_bananthrowroll.value == 1 && K_CheckSlopeRollDist(mobj))
mobj->sloperoll -= (angle_t)FixedMul(FixedDiv(mobj->momz, 8 * mobj->scale), ANGLE_67h); // im lazy but this makes sure the banan goes back to upright when it lands lmao
else if (cv_bananthrowroll.value == 2)
mobj->rollangle -= (angle_t)FixedMul(FixedDiv(mobj->momz, 8 * mobj->scale), ANGLE_67h);
} }
mobj->friction = ORIG_FRICTION/4; mobj->friction = ORIG_FRICTION/4;
if (mobj->momx || mobj->momy) if (mobj->momx || mobj->momy)
P_SpawnGhostMobj(mobj); P_SpawnGhostMobj(mobj);
if (P_IsObjectOnGround(mobj) && mobj->health > 1)
if (grounded && mobj->health > 1)
{ {
S_StartSound(mobj, mobj->info->activesound); S_StartSound(mobj, mobj->info->activesound);
mobj->momx = mobj->momy = 0; mobj->momx = mobj->momy = 0;
@@ -7215,9 +7192,7 @@ static boolean P_MobjRegularThink(mobj_t *mobj)
if (mobj->threshold > 0) if (mobj->threshold > 0)
mobj->threshold--; mobj->threshold--;
break; break;
}
case MT_SPB: case MT_SPB:
indirectitemcooldown = 20*TICRATE; indirectitemcooldown = 20*TICRATE;
/* FALLTHRU */ /* FALLTHRU */
@@ -8688,15 +8663,14 @@ static boolean P_MobjRegularThink(mobj_t *mobj)
{ {
const angle_t fa = (i*FINEANGLES/16) & FINEMASK; const angle_t fa = (i*FINEANGLES/16) & FINEMASK;
ns = FixedMul(64 * FRACUNIT, mobj->scale); ns = FixedMul(64 * FRACUNIT, mobj->scale);
x = mobj->x + FixedMul(FINESINE(fa), ns); x = mobj->x + FixedMul(FINESINE(fa),ns);
y = mobj->y + FixedMul(FINECOSINE(fa), ns); y = mobj->y + FixedMul(FINECOSINE(fa),ns);
mo2 = P_SpawnMobj(x, y, z, MT_EXPLODE); mo2 = P_SpawnMobj(x, y, z, MT_EXPLODE);
ns = FixedMul(16 * FRACUNIT, mobj->scale); ns = FixedMul(16 * FRACUNIT, mobj->scale);
mo2->momx = FixedMul(FINESINE(fa), ns); mo2->momx = FixedMul(FINESINE(fa),ns);
mo2->momy = FixedMul(FINECOSINE(fa), ns); mo2->momy = FixedMul(FINECOSINE(fa),ns);
} }
z -= FixedMul(32*FRACUNIT, mobj->scale); z -= FixedMul(32*FRACUNIT, mobj->scale);
} }
P_SetMobjState(mobj, mobj->info->deathstate); P_SetMobjState(mobj, mobj->info->deathstate);
@@ -8890,9 +8864,9 @@ static void P_IceBlockFuseThink(mobj_t *mobj)
for (i = 0; i < 5; i++) for (i = 0; i < 5; i++)
{ {
mobj_t *debris = P_SpawnMobj(mobj->x, mobj->y, mobj->z, MT_SMK_ICEBLOCK_DEBRIS); mobj_t *debris = P_SpawnMobj(mobj->x, mobj->y, mobj->z, MT_SMK_ICEBLOCK_DEBRIS);
debris->angle = FixedAngle(P_RandomRange(0, 360)<<FRACBITS); debris->angle = FixedAngle(P_RandomRange(0,360)<<FRACBITS);
P_InstaThrust(debris, debris->angle, P_RandomRange(3, 18)*(FRACUNIT/4)); P_InstaThrust(debris, debris->angle, P_RandomRange(3,18)*(FRACUNIT/4));
debris->momz = P_RandomRange(4, 8)<<FRACBITS; debris->momz = P_RandomRange(4,8)<<FRACBITS;
if (!i) // kinda hacky :V if (!i) // kinda hacky :V
S_StartSound(debris, sfx_s3k82); S_StartSound(debris, sfx_s3k82);
} }
@@ -8988,11 +8962,7 @@ static boolean P_FuseThink(mobj_t *mobj)
static boolean P_MobjPushableThink(mobj_t *mobj) static boolean P_MobjPushableThink(mobj_t *mobj)
{ {
// would be cool if we could use P_MobjWasRemoved Zzz... // would be cool if we could use P_MobjWasRemoved Zzz...
#ifndef COMPAT_VANILLA
if (P_MobjWasRemoved(mobj))
#else
if (!mobj) if (!mobj)
#endif
return false; return false;
P_MobjCheckWater(mobj); P_MobjCheckWater(mobj);
@@ -9197,14 +9167,6 @@ void P_MobjThinker(mobj_t *mobj)
|| P_WeaponOrPanel(mobj->type)) || P_WeaponOrPanel(mobj->type))
{ {
P_TryMove(mobj, mobj->x, mobj->y, true); // Sets mo->standingslope correctly P_TryMove(mobj, mobj->x, mobj->y, true); // Sets mo->standingslope correctly
#ifndef COMPAT_VANILLA
if (P_MobjWasRemoved(mobj)) // anything that calls checkposition can be lethal
#else
if (!mobj) // anything that calls checkposition can be lethal
#endif
return;
P_ButteredSlope(mobj); P_ButteredSlope(mobj);
} }
@@ -9230,13 +9192,6 @@ void P_MobjThinker(mobj_t *mobj)
} }
} }
#ifndef COMPAT_VANILLA
if (P_MobjWasRemoved(mobj))
#else
if (!mobj)
#endif
return; // obligatory paranoia check
// Can end up here if a player dies. // Can end up here if a player dies.
P_CycleMobjState(mobj); P_CycleMobjState(mobj);
@@ -9294,11 +9249,7 @@ void P_PushableThinker(mobj_t *mobj)
I_Assert(!P_MobjWasRemoved(mobj)); I_Assert(!P_MobjWasRemoved(mobj));
#ifndef COMPAT_VANILLA
if (P_MobjWasRemoved(mobj))
#else
if (!mobj) if (!mobj)
#endif
return; return;
sec = mobj->subsector->sector; sec = mobj->subsector->sector;
-1
View File
@@ -298,7 +298,6 @@ 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
+6 -11
View File
@@ -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] != NO_INDEX) if (li->sidenum[0] != 0xffff)
{ {
si = &sides[li->sidenum[0]]; si = &sides[li->sidenum[0]];
spawnsi = &spawnsides[li->sidenum[0]]; spawnsi = &spawnsides[li->sidenum[0]];
@@ -706,8 +706,7 @@ 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]];
@@ -787,7 +786,6 @@ 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
@@ -3059,7 +3057,7 @@ static void P_NetUnArchiveThinkers(savebuffer_t *save)
break; break;
default: default:
I_Error("P_NetUnArchiveThinkers: Unknown tclass %d in savegame", tclass); I_Error("P_UnarchiveSpecials: Unknown tclass %d in savegame", tclass);
} }
} }
@@ -3170,7 +3168,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 (expected %d, got %d)\n", numPolyObjects, numSavedPolys); I_Error("P_UnArchivePolyObjects: polyobj count inconsistency\n");
for (i = 0; i < numSavedPolys; ++i) for (i = 0; i < numSavedPolys; ++i)
P_UnArchivePolyObj(save, &PolyObjects[i]); P_UnArchivePolyObj(save, &PolyObjects[i]);
@@ -3512,7 +3510,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] != NO_INDEX) if (li->sidenum[0] != 0xffff)
{ {
si = &sides[li->sidenum[0]]; si = &sides[li->sidenum[0]];
spawnsi = &spawnsides[li->sidenum[0]]; spawnsi = &spawnsides[li->sidenum[0]];
@@ -3523,7 +3521,7 @@ static void P_ReloadSaveLevelData(void)
si->midtexture = spawnsi->midtexture; si->midtexture = spawnsi->midtexture;
} }
if (li->sidenum[1] != NO_INDEX) if (li->sidenum[1] != 0xffff)
{ {
si = &sides[li->sidenum[1]]; si = &sides[li->sidenum[1]];
spawnsi = &spawnsides[li->sidenum[1]]; spawnsi = &spawnsides[li->sidenum[1]];
@@ -3590,11 +3588,8 @@ 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
{ {
+134 -478
View File
@@ -188,57 +188,6 @@ FUNCNORETURN static ATTRNORETURN void CorruptMapError(const char *msg)
I_Error("Invalid or corrupt map.\nLook in log file or text console for technical details."); I_Error("Invalid or corrupt map.\nLook in log file or text console for technical details.");
} }
static char **mapwarnings = NULL;
static size_t nummapwarnings = 0;
// collect map errors we can fix clientside
// we then can print em when the map finishes loading
// so they actually appear and raise awareness shits fucked
// see G_DoLoadLevel as to why :chaosleep:
static void CorruptMapWarning(const char *msg)
{
#ifdef PARANOIA
// just error out
I_Error("%sThis WILL crash Vanilla clients!\n", msg);
#endif
nummapwarnings++;
mapwarnings = Z_Realloc(mapwarnings, nummapwarnings * sizeof(*mapwarnings), PU_STATIC, NULL);
mapwarnings[nummapwarnings-1] = Z_StrDup(msg);
}
void P_PrintCorruptMapWarnings(void)
{
size_t i;
if (!nummapwarnings)
return;
for (i = 0; i < nummapwarnings; i++)
{
CONS_Alert(CONS_ERROR, "%sAttempting to fix... This WILL crash Vanilla clients!\n", mapwarnings[i]);
}
P_FreeCorruptMapWarnings();
}
void P_FreeCorruptMapWarnings(void)
{
size_t i;
if (!nummapwarnings)
return;
for (i = 0; i < nummapwarnings; i++)
{
Z_Free(mapwarnings[i]);
mapwarnings[i] = NULL;
}
Z_Free(mapwarnings);
mapwarnings = NULL;
nummapwarnings = 0;
}
#define NUMLAPS_DEFAULT 3 #define NUMLAPS_DEFAULT 3
static void P_ClearMapHeaderLighting(mapheader_lighting_t *lighting) static void P_ClearMapHeaderLighting(mapheader_lighting_t *lighting)
@@ -456,10 +405,10 @@ static void P_SetupDirectionalLight(void)
if (gamemap != oldmap || encoremode != oldencore || reinitmaplight) if (gamemap != oldmap || encoremode != oldencore || reinitmaplight)
{ {
lighting->light_contrast = (UINT8)M_RandomRange(0, 58); lighting->light_contrast = M_RandomRange(0, 58);
lighting->sprite_backlight = 0; lighting->sprite_backlight = 0;
lighting->use_light_angle = (boolean)M_RandomRange(0, 1); // either on or off lighting->use_light_angle = M_RandomRange(0, 1); // either on or off
lighting->light_angle = (angle_t)M_RandomRange(-382, 382); lighting->light_angle = M_RandomRange(-382, 382);
reinitmaplight = false; reinitmaplight = false;
} }
@@ -488,39 +437,8 @@ static void P_LoadSegs(UINT8 *data)
for (i = 0; i < numsegs; i++, li++, ml++) for (i = 0; i < numsegs; i++, li++, ml++)
{ {
INT16 v1, v2; li->v1 = &vertexes[SHORT(ml->v1)];
li->v2 = &vertexes[SHORT(ml->v2)];
v1 = SHORT(ml->v1);
v2 = SHORT(ml->v2);
// e6y
// check and fix wrong references to non-existent vertexes
// see e1m9 @ NIVELES.WAD
// http://www.doomworld.com/idgames/index.php?id=12647
if ((unsigned)v1 >= numvertexes || (unsigned)v2 >= numvertexes)
{
if ((unsigned)v1 >= numvertexes)
CorruptMapWarning(va("P_LoadSegs: seg %s references a non-existent vertex %d\n", sizeu1(i), v1));
if ((unsigned)v2 >= numvertexes)
CorruptMapWarning(va("P_LoadSegs: seg %s references a non-existent vertex %d\n", sizeu1(i), v2));
if (li->sidedef == &sides[li->linedef->sidenum[0]])
{
li->v1 = lines[ml->linedef].v1;
li->v2 = lines[ml->linedef].v2;
}
else
{
li->v1 = lines[ml->linedef].v2;
li->v2 = lines[ml->linedef].v1;
}
}
else
{
li->v1 = &vertexes[v1];
li->v2 = &vertexes[v2];
}
#ifdef HWRENDER #ifdef HWRENDER
if (rendermode == render_opengl) if (rendermode == render_opengl)
{ {
@@ -537,59 +455,14 @@ static void P_LoadSegs(UINT8 *data)
li->angle = (SHORT(ml->angle))<<FRACBITS; li->angle = (SHORT(ml->angle))<<FRACBITS;
li->offset = (SHORT(ml->offset))<<FRACBITS; li->offset = (SHORT(ml->offset))<<FRACBITS;
rawlinedef = SHORT(ml->linedef); rawlinedef = SHORT(ml->linedef);
//e6y: check for wrong indexes
if ((unsigned)rawlinedef >= numlines)
{
I_Error("P_LoadSegs: seg %s references a non-existent linedef %d", sizeu1(i), (unsigned)rawlinedef);
}
ldef = &lines[rawlinedef]; ldef = &lines[rawlinedef];
li->linedef = ldef; li->linedef = ldef;
rawside = SHORT(ml->side); li->side = rawside = SHORT(ml->side);
//e6y: fix wrong side index
if (rawside != 0 && rawside != 1)
{
CorruptMapWarning(va("P_LoadSegs: seg %s contains wrong side index %d.\n", sizeu1(i), rawside));
rawside = 1;
}
//e6y: check for wrong indexes
if (ldef->sidenum[rawside] >= numsides)
{
I_Error("P_LoadSegs: linedef %d for seg %s references a non-existent sidedef %d", rawlinedef, sizeu1(i), ldef->sidenum[rawside]);
}
li->side = rawside;
li->sidedef = &sides[ldef->sidenum[rawside]]; li->sidedef = &sides[ldef->sidenum[rawside]];
li->frontsector = sides[ldef->sidenum[rawside]].sector;
/* cph 2006/09/30 - our frontsector can be the second side of the
* linedef, so must check for NO_INDEX in case we are incorrectly
* referencing the back of a 1S line */
if (ldef->sidenum[rawside] == NO_INDEX)
{
CorruptMapWarning(va("P_LoadSegs: front of seg %s has no sidedef\n", sizeu1(i)));
li->frontsector = NULL;
}
else
{
li->frontsector = sides[ldef->sidenum[rawside]].sector;
}
if (ldef->flags & ML_TWOSIDED) if (ldef->flags & ML_TWOSIDED)
{ li->backsector = sides[ldef->sidenum[rawside^1]].sector;
if (ldef->sidenum[rawside^1] == NO_INDEX)
{
CorruptMapWarning(va("P_LoadSegs: back of seg %s has no sidedef while being marked as double sided\n", sizeu1(i)));
li->backsector = NULL;
}
else
{
li->backsector = sides[ldef->sidenum[rawside^1]].sector;
}
}
P_UpdateSegLightOffset(li); P_UpdateSegLightOffset(li);
} }
@@ -865,33 +738,7 @@ static void P_LoadNodes(UINT8 *data)
for (j = 0; j < 2; j++) for (j = 0; j < 2; j++)
{ {
UINT16 child; no->children[j] = SHORT(mn->children[j]);
child = SHORT(mn->children[j]);
if (child & NF_SUBSECTOR)
{
// Convert to extended type
child &= ~NF_SUBSECTOR;
// haleyjd 11/06/10: check for invalid subsector reference
if (child >= numsubsectors)
{
CorruptMapWarning(va("P_LoadNodes: BSP tree %s references invalid subsector %d\n", sizeu1(i), child));
child = 0;
}
child |= NF_SUBSECTOR;
}
else if (child >= numnodes)
{
CorruptMapWarning(va("P_LoadNodes: BSP node %s references invalid node.\n", sizeu1(i)));
//I_Error("P_LoadNodes: BSP node %d references invalid node %d.\n", sizeu1(i), Index(((node_t *)no->children[j])));
child = 0;
}
no->children[j] = child;
for (k = 0; k < 4; k++) for (k = 0; k < 4; k++)
no->bbox[j][k] = SHORT(mn->bbox[j][k])<<FRACBITS; no->bbox[j][k] = SHORT(mn->bbox[j][k])<<FRACBITS;
} }
@@ -1154,9 +1001,9 @@ static void P_InitializeLinedef(line_t *ld)
// cph 2002/07/20 - these errors are fatal if not fixed, so apply them // cph 2002/07/20 - these errors are fatal if not fixed, so apply them
for (j = 0; j < 2; j++) for (j = 0; j < 2; j++)
{ {
if (ld->sidenum[j] != NO_INDEX && ld->sidenum[j] >= (UINT16)numsides) if (ld->sidenum[j] != 0xffff && ld->sidenum[j] >= (UINT16)numsides)
{ {
ld->sidenum[j] = NO_INDEX; ld->sidenum[j] = 0xffff;
CONS_Debug(DBG_SETUP, "P_InitializeLinedef: Linedef %s has out-of-range sidedef number\n", sizeu1((size_t)(ld - lines))); CONS_Debug(DBG_SETUP, "P_InitializeLinedef: Linedef %s has out-of-range sidedef number\n", sizeu1((size_t)(ld - lines)));
} }
} }
@@ -1164,24 +1011,23 @@ static void P_InitializeLinedef(line_t *ld)
ld->firsttag = ld->nexttag = -1; ld->firsttag = ld->nexttag = -1;
// killough 11/98: fix common wad errors (missing sidedefs): // killough 11/98: fix common wad errors (missing sidedefs):
if (ld->sidenum[0] == NO_INDEX) if (ld->sidenum[0] == 0xffff)
{ {
ld->sidenum[0] = 0; // Substitute dummy sidedef for missing right side ld->sidenum[0] = 0; // Substitute dummy sidedef for missing right side
// cph - print a warning about the bug // cph - print a warning about the bug
CONS_Debug(DBG_SETUP, "P_InitializeLinedef: Linedef %s missing first sidedef\n", sizeu1((size_t)(ld - lines))); CONS_Debug(DBG_SETUP, "P_InitializeLinedef: Linedef %s missing first sidedef\n", sizeu1((size_t)(ld - lines)));
} }
if ((ld->sidenum[1] == NO_INDEX) && (ld->flags & ML_TWOSIDED)) if ((ld->sidenum[1] == 0xffff) && (ld->flags & ML_TWOSIDED))
{ {
ld->flags &= ~ML_TWOSIDED; // Clear 2s flag for missing left side ld->flags &= ~ML_TWOSIDED; // Clear 2s flag for missing left side
// cph - print a warning about the bug // cph - print a warning about the bug
CONS_Debug(DBG_SETUP, "P_InitializeLinedef: Linedef %s has two-sided flag set, but no second sidedef\n", sizeu1((size_t)(ld - lines))); CONS_Debug(DBG_SETUP, "P_InitializeLinedef: Linedef %s has two-sided flag set, but no second sidedef\n", sizeu1((size_t)(ld - lines)));
} }
// killough 4/4/98: support special sidedef interpretation below if (ld->sidenum[0] != 0xffff && ld->special)
if (ld->sidenum[0] != NO_INDEX && ld->special)
sides[ld->sidenum[0]].special = ld->special; sides[ld->sidenum[0]].special = ld->special;
if (ld->sidenum[1] != NO_INDEX && ld->special) if (ld->sidenum[1] != 0xffff && ld->special)
sides[ld->sidenum[1]].special = ld->special; sides[ld->sidenum[1]].special = ld->special;
} }
@@ -1214,10 +1060,10 @@ static void P_LoadLineDefs2(void)
for (; i--; ld++) for (; i--; ld++)
{ {
ld->frontsector = sides[ld->sidenum[0]].sector; //e6y: Can't be -1 here ld->frontsector = sides[ld->sidenum[0]].sector; //e6y: Can't be -1 here
ld->backsector = ld->sidenum[1] != NO_INDEX ? sides[ld->sidenum[1]].sector : NULL; ld->backsector = ld->sidenum[1] != 0xffff ? sides[ld->sidenum[1]].sector : NULL;
// Repeat count for midtexture // Repeat count for midtexture
if ((ld->flags & ML_EFFECT5) && (ld->sidenum[1] != NO_INDEX)) if ((ld->flags & ML_EFFECT5) && (ld->sidenum[1] != 0xffff))
{ {
sides[ld->sidenum[0]].repeatcnt = (INT16)(((unsigned)sides[ld->sidenum[0]].textureoffset >> FRACBITS) >> 12); sides[ld->sidenum[0]].repeatcnt = (INT16)(((unsigned)sides[ld->sidenum[0]].textureoffset >> FRACBITS) >> 12);
sides[ld->sidenum[0]].textureoffset = (((unsigned)sides[ld->sidenum[0]].textureoffset >> FRACBITS) & 2047) << FRACBITS; sides[ld->sidenum[0]].textureoffset = (((unsigned)sides[ld->sidenum[0]].textureoffset >> FRACBITS) & 2047) << FRACBITS;
@@ -1233,13 +1079,13 @@ static void P_LoadLineDefs2(void)
{ {
size_t len = strlen(sides[ld->sidenum[0]].text)+1; size_t len = strlen(sides[ld->sidenum[0]].text)+1;
if (ld->sidenum[1] != NO_INDEX && sides[ld->sidenum[1]].text) if (ld->sidenum[1] != 0xffff && sides[ld->sidenum[1]].text)
len += strlen(sides[ld->sidenum[1]].text); len += strlen(sides[ld->sidenum[1]].text);
ld->text = Z_Malloc(len, PU_LEVEL, NULL); ld->text = Z_Malloc(len, PU_LEVEL, NULL);
memcpy(ld->text, sides[ld->sidenum[0]].text, strlen(sides[ld->sidenum[0]].text)+1); memcpy(ld->text, sides[ld->sidenum[0]].text, strlen(sides[ld->sidenum[0]].text)+1);
if (ld->sidenum[1] != NO_INDEX && sides[ld->sidenum[1]].text) if (ld->sidenum[1] != 0xffff && sides[ld->sidenum[1]].text)
memcpy(ld->text+strlen(ld->text)+1, sides[ld->sidenum[1]].text, strlen(sides[ld->sidenum[1]].text)+1); memcpy(ld->text+strlen(ld->text)+1, sides[ld->sidenum[1]].text, strlen(sides[ld->sidenum[1]].text)+1);
} }
break; break;
@@ -1369,14 +1215,14 @@ static void P_LoadSideChangeMusic(boolean firstside, mapsidedef_t *msd, side_t *
if (msd->bottomtexture[0] != '-' || msd->bottomtexture[1] != '\0') if (msd->bottomtexture[0] != '-' || msd->bottomtexture[1] != '\0')
{ {
memcpy(process, msd->bottomtexture, 8); memcpy(process,msd->bottomtexture,8);
process[8] = '\0'; process[8] = '\0';
sd->bottomtexture = get_number(process); sd->bottomtexture = get_number(process);
} }
if (!(msd->midtexture[0] == '-' && msd->midtexture[1] == '\0') || msd->midtexture[1] != '\0') if (!(msd->midtexture[0] == '-' && msd->midtexture[1] == '\0') || msd->midtexture[1] != '\0')
{ {
memcpy(process, msd->midtexture, 8); memcpy(process,msd->midtexture,8);
process[8] = '\0'; process[8] = '\0';
sd->midtexture = get_number(process); sd->midtexture = get_number(process);
} }
@@ -1386,7 +1232,7 @@ static void P_LoadSideChangeMusic(boolean firstside, mapsidedef_t *msd, side_t *
if (firstside || msd->toptexture[0] != '-' || msd->toptexture[1] != '\0') if (firstside || msd->toptexture[0] != '-' || msd->toptexture[1] != '\0')
{ {
memcpy(process, msd->toptexture, 8); memcpy(process,msd->toptexture,8);
process[8] = '\0'; process[8] = '\0';
// If they type in O_ or D_ and their music name, just shrug, // If they type in O_ or D_ and their music name, just shrug,
@@ -1426,7 +1272,7 @@ static void P_LoadSidedefs(void *data)
// Colormaps! // Colormaps!
switch (sd->special) switch (sd->special)
{ {
case 63: // variable colormap via 242 linedef case 63: // variable colormap via 242 linedef
case 606: //SoM: 4/4/2000: Just colormap transfer case 606: //SoM: 4/4/2000: Just colormap transfer
// SoM: R_CreateColormap will only create a colormap in software mode... // SoM: R_CreateColormap will only create a colormap in software mode...
// Perhaps we should just call it instead of doing the calculations here. // Perhaps we should just call it instead of doing the calculations here.
@@ -1442,26 +1288,26 @@ static void P_LoadSidedefs(void *data)
if (msd->toptexture[0] != '-' || msd->toptexture[1] != '\0') if (msd->toptexture[0] != '-' || msd->toptexture[1] != '\0')
{ {
char process[8+1]; char process[8+1];
memcpy(process, msd->toptexture, 8); memcpy(process,msd->toptexture,8);
process[8] = '\0'; process[8] = '\0';
sd->toptexture = get_number(process); sd->toptexture = get_number(process);
} }
break; break;
} }
case 9: // Mace parameters case 9: // Mace parameters
case 14: // Bustable block parameters case 14: // Bustable block parameters
case 15: // Fan particle spawner parameters case 15: // Fan particle spawner parameters
case 425: // Calls P_SetMobjState on calling mobj case 425: // Calls P_SetMobjState on calling mobj
case 434: // Custom Power case 434: // Custom Power
case 442: // Calls P_SetMobjState on mobjs of a given type in the tagged sectors case 442: // Calls P_SetMobjState on mobjs of a given type in the tagged sectors
{ {
char process[8*3+1]; char process[8*3+1];
memset(process, 0, 8*3+1); memset(process,0,8*3+1);
sd->toptexture = sd->midtexture = sd->bottomtexture = 0; sd->toptexture = sd->midtexture = sd->bottomtexture = 0;
if (msd->toptexture[0] == '-' && msd->toptexture[1] == '\0') if (msd->toptexture[0] == '-' && msd->toptexture[1] == '\0')
break; break;
else else
memcpy(process, msd->toptexture, 8); memcpy(process,msd->toptexture,8);
if (msd->midtexture[0] != '-' || msd->midtexture[1] != '\0') if (msd->midtexture[0] != '-' || msd->midtexture[1] != '\0')
memcpy(process+strlen(process), msd->midtexture, 8); memcpy(process+strlen(process), msd->midtexture, 8);
if (msd->bottomtexture[0] != '-' || msd->bottomtexture[1] != '\0') if (msd->bottomtexture[0] != '-' || msd->bottomtexture[1] != '\0')
@@ -1473,12 +1319,12 @@ static void P_LoadSidedefs(void *data)
case 443: // Calls a named Lua function case 443: // Calls a named Lua function
{ {
char process[8*3+1]; char process[8*3+1];
memset(process, 0, 8*3+1); memset(process,0,8*3+1);
sd->toptexture = sd->midtexture = sd->bottomtexture = 0; sd->toptexture = sd->midtexture = sd->bottomtexture = 0;
if (msd->toptexture[0] == '-' && msd->toptexture[1] == '\0') if (msd->toptexture[0] == '-' && msd->toptexture[1] == '\0')
break; break;
else else
memcpy(process,msd->toptexture, 8); memcpy(process,msd->toptexture,8);
if (msd->midtexture[0] != '-' || msd->midtexture[1] != '\0') if (msd->midtexture[0] != '-' || msd->midtexture[1] != '\0')
memcpy(process+strlen(process), msd->midtexture, 8); memcpy(process+strlen(process), msd->midtexture, 8);
if (msd->bottomtexture[0] != '-' || msd->bottomtexture[1] != '\0') if (msd->bottomtexture[0] != '-' || msd->bottomtexture[1] != '\0')
@@ -1779,80 +1625,6 @@ static void P_CreateBlockMap(void)
} }
} }
//
// P_VerifyBlockMap
//
// haleyjd 03/04/10: do verification on validity of blockmap.
//
static boolean P_VerifyBlockMap(INT32 count)
{
// FIXME: should any of this shit be unsinged?
INT32 x, y;
INT32 *maxoffs = blockmaplump + count;
//skipblstart = true;
for (y = 0; y < bmapheight; y++)
{
for (x = 0; x < bmapwidth; x++)
{
INT32 offset;
INT32 *list, *tmplist;
INT32 *blockoffset;
offset = y * bmapwidth + x;
blockoffset = blockmaplump + offset + 4;
// check that block offset is in bounds
if (blockoffset >= maxoffs)
{
CONS_Alert(CONS_ERROR, "P_VerifyBlockMap: block offset overflow\n");
return false;
}
offset = *blockoffset;
// check that list offset is in bounds
if (offset < 4 || offset >= count)
{
CONS_Alert(CONS_ERROR, "P_VerifyBlockMap: list offset overflow\n");
return false;
}
list = blockmaplump + offset;
//if (*list != 0)
//skipblstart = false;
// scan forward for a -1 terminator before maxoffs
for (tmplist = list; ; tmplist++)
{
// we have overflowed the lump?
if (tmplist >= maxoffs)
{
CONS_Alert(CONS_ERROR, "P_VerifyBlockMap: open blocklist\n");
return false;
}
if (*tmplist == -1) // found -1
break;
}
// scan the list for out-of-range linedef indicies in list
for (tmplist = list; *tmplist != -1; tmplist++)
{
if (*tmplist < 0 || *tmplist >= (INT32)numlines)
{
CONS_Alert(CONS_ERROR, "P_VerifyBlockMap: index >= numlines\n");
return false;
}
}
}
}
return true;
}
// Split from P_LoadBlockMap for convenience // Split from P_LoadBlockMap for convenience
// -- Monster Iestyn 08/01/18 // -- Monster Iestyn 08/01/18
static void P_ReadBlockMapLump(INT16 *wadblockmaplump, size_t count) static void P_ReadBlockMapLump(INT16 *wadblockmaplump, size_t count)
@@ -1894,20 +1666,9 @@ static boolean P_LoadRawBlockMap(UINT8 *data, size_t count)
bmaporgx = blockmaplump[0]<<FRACBITS; bmaporgx = blockmaplump[0]<<FRACBITS;
bmaporgy = blockmaplump[1]<<FRACBITS; bmaporgy = blockmaplump[1]<<FRACBITS;
bmapwidth = blockmaplump[2]; bmapwidth = blockmaplump[2];
bmapheight = blockmaplump[3]; bmapheight = blockmaplump[3];
// haleyjd 03/04/10: check for blockmap problems
// http://www.doomworld.com/idgames/index.php?id=12935
if (!P_VerifyBlockMap(count))
{
CorruptMapWarning(va("P_LoadBlockMap: corrupted or invalid BLOCKMAP lump! Check the log for more information.\n"));
// vanilla WILL crash here anyways so just rebuild it ourselves
Z_Free(blockmaplump);
blockmaplump = NULL;
return false;
}
// clear out mobj chains // clear out mobj chains
count = sizeof (*blocklinks)* bmapwidth*bmapheight; count = sizeof (*blocklinks)* bmapwidth*bmapheight;
blocklinks = Z_Calloc(count, PU_LEVEL, NULL); blocklinks = Z_Calloc(count, PU_LEVEL, NULL);
@@ -1942,35 +1703,22 @@ static void P_GroupLines(void)
for (i = 0; i < numsubsectors; i++, ss++) for (i = 0; i < numsubsectors; i++, ss++)
{ {
if (ss->firstline >= numsegs) if (ss->firstline >= numsegs)
{
CorruptMapError(va("P_GroupLines: ss->firstline invalid " CorruptMapError(va("P_GroupLines: ss->firstline invalid "
"(subsector %s, firstline refers to %d of %s)", sizeu1(i), ss->firstline, "(subsector %s, firstline refers to %d of %s)", sizeu1(i), ss->firstline,
sizeu2(numsegs))); sizeu2(numsegs)));
}
seg = &segs[ss->firstline]; seg = &segs[ss->firstline];
sidei = (size_t)(seg->sidedef - sides); sidei = (size_t)(seg->sidedef - sides);
if (!seg->sidedef) if (!seg->sidedef)
{
CorruptMapError(va("P_GroupLines: seg->sidedef is NULL " CorruptMapError(va("P_GroupLines: seg->sidedef is NULL "
"(subsector %s, firstline is %d)", sizeu1(i), ss->firstline)); "(subsector %s, firstline is %d)", sizeu1(i), ss->firstline));
}
if (seg->sidedef - sides < 0 || seg->sidedef - sides > (UINT16)numsides) if (seg->sidedef - sides < 0 || seg->sidedef - sides > (UINT16)numsides)
{
CorruptMapError(va("P_GroupLines: seg->sidedef refers to sidedef %s of %s " CorruptMapError(va("P_GroupLines: seg->sidedef refers to sidedef %s of %s "
"(subsector %s, firstline is %d)", sizeu1(sidei), sizeu2(numsides), "(subsector %s, firstline is %d)", sizeu1(sidei), sizeu2(numsides),
sizeu3(i), ss->firstline)); sizeu3(i), ss->firstline));
}
if (!seg->sidedef->sector) if (!seg->sidedef->sector)
{
CorruptMapError(va("P_GroupLines: seg->sidedef->sector is NULL " CorruptMapError(va("P_GroupLines: seg->sidedef->sector is NULL "
"(subsector %s, firstline is %d, sidedef is %s)", sizeu1(i), ss->firstline, "(subsector %s, firstline is %d, sidedef is %s)", sizeu1(i), ss->firstline,
sizeu1(sidei))); sizeu1(sidei)));
}
ss->sector = seg->sidedef->sector; ss->sector = seg->sidedef->sector;
} }
@@ -2032,36 +1780,20 @@ static void P_GroupLines(void)
} }
} }
// PK3 version // PK3 version
// -- Monster Iestyn 09/01/18 // -- Monster Iestyn 09/01/18
static void P_LoadReject(UINT8 *data, size_t rejectsize) static void P_LoadReject(UINT8 *data, size_t count)
{ {
const size_t neededsize = (numsectors * numsectors + 7) >> 3; if (!count) // zero length, someone probably used ZDBSP
size_t allocsize = rejectsize;
if (!rejectsize) // zero length, someone probably used ZDBSP
{ {
rejectmatrix = NULL; rejectmatrix = NULL;
CONS_Debug(DBG_SETUP, "P_LoadReject: REJECT lump has size 0, will not be loaded\n"); CONS_Debug(DBG_SETUP, "P_LoadReject: REJECT lump has size 0, will not be loaded\n");
} }
else else
{ {
if (rejectsize < neededsize) rejectmatrix = Z_Malloc(count, PU_LEVEL, NULL); // allocate memory for the reject matrix
{ memcpy(rejectmatrix, data, count); // copy the data into it
CorruptMapWarning(va("P_LoadReject: REJECT is %s byte%s too small. REJECT might be invalid!\n", sizeu1(neededsize - rejectsize), (neededsize - rejectsize) == 1 ? "" : "s"));
#ifdef COMPAT_VANILLA
// we can pad this and somewhat prevent desyncs
// probs not cool if the reject is from a completely different map
// but whatever
allocsize = neededsize;
#else
rejectmatrix = NULL;
return;
#endif
}
rejectmatrix = Z_Calloc(allocsize, PU_LEVEL, NULL); // allocate memory for the reject matrix
memcpy(rejectmatrix, data, rejectsize); // copy the data into it
} }
} }
@@ -2099,13 +1831,9 @@ static void P_LoadMapLUT(const virtres_t* virt)
// Lookup tables // Lookup tables
if (virtreject) if (virtreject)
{
P_LoadReject(virtreject->data, virtreject->size); P_LoadReject(virtreject->data, virtreject->size);
}
else else
{
rejectmatrix = NULL; rejectmatrix = NULL;
}
if (!(virtblockmap && P_LoadRawBlockMap(virtblockmap->data, virtblockmap->size))) if (!(virtblockmap && P_LoadRawBlockMap(virtblockmap->data, virtblockmap->size)))
P_CreateBlockMap(); P_CreateBlockMap();
@@ -2496,9 +2224,7 @@ static void P_LoadRecordGhosts(void)
if (!gpath) if (!gpath)
return; return;
const char *mapname = G_BuildMapName(gamemap); sprintf(gpath,"%s"PATHSEP"replay"PATHSEP"%s"PATHSEP"%s", srb2home, timeattackfolder, G_BuildMapName(gamemap));
sprintf(gpath,"%s"PATHSEP"replay"PATHSEP"%s"PATHSEP"%s", srb2home, timeattackfolder, mapname);
// Best Time ghost // Best Time ghost
if (cv_ghost_besttime.value) if (cv_ghost_besttime.value)
@@ -2548,10 +2274,9 @@ static void P_LoadRecordGhosts(void)
{ {
lumpnum_t l; lumpnum_t l;
UINT8 j = 1; UINT8 j = 1;
while (j <= 99 && (l = W_CheckNumForName(va("%sS%02u",G_BuildMapName(gamemap),j))) != LUMPERROR)
while (j <= 99 && (l = W_CheckNumForName(va("%sS%02u", mapname, j))) != LUMPERROR)
{ {
G_AddGhost(va("%sS%02u", mapname, j)); G_AddGhost(va("%sS%02u",G_BuildMapName(gamemap),j));
j++; j++;
} }
} }
@@ -2559,31 +2284,6 @@ static void P_LoadRecordGhosts(void)
free(gpath); free(gpath);
} }
static void P_ResetSpawnpoints(void)
{
UINT8 i;
numdmstarts = numredctfstarts = numbluectfstarts = 0;
// reset the player starts
for (i = 0; i < MAXPLAYERS; i++)
{
playerstarts[i] = NULL;
redctfstarts[i] = NULL;
bluectfstarts[i] = NULL;
}
for (i = 0; i < MAX_DM_STARTS; i++)
{
deathmatchstarts[i] = NULL;
}
for (i = 0; i < 2; i++)
{
skyboxmo[i] = NULL;
}
}
static void P_InitCamera(void) static void P_InitCamera(void)
{ {
INT32 i; INT32 i;
@@ -2593,7 +2293,6 @@ static void P_InitCamera(void)
for (i = 0; i <= splitscreen; i++) for (i = 0; i <= splitscreen; i++)
{ {
camera[i].postimg = 0;
P_SetupCamera(&camera[i]); P_SetupCamera(&camera[i]);
} }
@@ -2619,12 +2318,10 @@ static void P_InitMinimapInfo(void)
Patch_Free(minimapinfo.minimap_pic); Patch_Free(minimapinfo.minimap_pic);
minimapinfo.minimap_pic = NULL; minimapinfo.minimap_pic = NULL;
const char *mapname = G_BuildMapName(gamemap); lumpnum = W_CheckNumForName(va("%sR", G_BuildMapName(gamemap)));
lumpnum = W_CheckNumForName(va("%sR", mapname));
if (lumpnum != LUMPERROR) if (lumpnum != LUMPERROR)
minimapinfo.minimap_pic = W_CachePatchName(va("%sR", mapname), PU_PATCH); minimapinfo.minimap_pic = W_CachePatchName(va("%sR", G_BuildMapName(gamemap)), PU_PATCH);
minimapinfo.min_x = bsp->bbox[0][BOXLEFT]; minimapinfo.min_x = bsp->bbox[0][BOXLEFT];
minimapinfo.max_x = bsp->bbox[0][BOXRIGHT]; minimapinfo.max_x = bsp->bbox[0][BOXRIGHT];
@@ -2693,14 +2390,10 @@ static boolean P_RunSpecialWipe(boolean reloadinggamestate)
{ {
// Cancel all d_main.c fadeouts (keep fade in though). // Cancel all d_main.c fadeouts (keep fade in though).
if (reloadinggamestate) if (reloadinggamestate)
{
wipegamestate = gamestate; // Don't fade if reloading the gamestate wipegamestate = gamestate; // Don't fade if reloading the gamestate
return false;
}
// Encore mode fade to pink to white // Encore mode fade to pink to white
// This is handled BEFORE sounds are stopped. // This is handled BEFORE sounds are stopped.
if (encoremode && !prevencoremode && !demo.rewinding) else if (encoremode && !prevencoremode && !demo.rewinding)
{ {
tic_t locstarttime, endtime, nowtime; tic_t locstarttime, endtime, nowtime;
@@ -2734,8 +2427,6 @@ static boolean P_RunSpecialWipe(boolean reloadinggamestate)
// Hold on white for extra effect. // Hold on white for extra effect.
while (nowtime < endtime) while (nowtime < endtime)
{ {
I_HandleInterrupt();
// wait loop // wait loop
while (!((nowtime = I_GetTime()) - lastwipetic)) while (!((nowtime = I_GetTime()) - lastwipetic))
{ {
@@ -2758,69 +2449,6 @@ static boolean P_RunSpecialWipe(boolean reloadinggamestate)
return false; return false;
} }
static void P_InitTagGametype(void)
{
UINT8 i;
INT32 realnumplayers = 0;
INT32 playersactive[MAXPLAYERS];
//I just realized how problematic this code can be.
//D_NumPlayers() will not always cover the scope of the netgame.
//What if one player is node 0 and the other node 31?
//The solution? Make a temp array of all players that are currently playing and pick from them.
//Future todo? When a player leaves, shift all nodes down so D_NumPlayers() can be used as intended?
//Also, you'd never have to loop through all 32 players slots to find anything ever again.
for (i = 0; i < MAXPLAYERS; i++)
{
if (playeringame[i] && !players[i].spectator)
{
playersactive[realnumplayers] = i; //stores the player's node in the array.
realnumplayers++;
}
}
if (!realnumplayers) // this should also fix the dedicated crash bug. You only pick a player if one exists to be picked.
{
CONS_Printf(M_GetText("No player currently available to become IT. Awaiting available players.\n"));
return;
}
i = P_RandomKey(realnumplayers);
players[playersactive[i]].pflags |= PF_TAGIT; //choose our initial tagger before map starts.
// Taken and modified from G_DoReborn()
// Remove the player so he can respawn elsewhere.
// first dissasociate the corpse
if (players[playersactive[i]].mo)
P_RemoveMobj(players[playersactive[i]].mo);
G_SpawnPlayer(playersactive[i], false); //respawn the lucky player in his dedicated spawn location.
}
static void P_InitGametype(void)
{
if (modeattacking == ATTACKING_RECORD && !demo.playback)
P_LoadRecordGhosts();
if (G_RaceGametype() && server)
{
INT32 numLaps;
const mapheader_t *mapheader = mapheaderinfo[gamemap - 1];
if ((netgame || multiplayer) && cv_basenumlaps.value &&
(!(mapheader->levelflags & LF_SECTIONRACE) || (mapheader->numlaps > cv_basenumlaps.value)))
numLaps = cv_basenumlaps.value;
else
numLaps = mapheader->numlaps;
CV_StealthSetValue(&cv_numlaps, numLaps);
}
else if (G_TagGametype())
{
P_InitTagGametype();
}
}
static void P_SetupPlayer(void) static void P_SetupPlayer(void)
{ {
INT32 i; INT32 i;
@@ -2834,27 +2462,76 @@ static void P_SetupPlayer(void)
// Start players with pity shields if possible // Start players with pity shields if possible
players[i].pity = -1; players[i].pity = -1;
players[i].mo = NULL;
if (!G_RaceGametype()) if (!G_RaceGametype())
{ {
players[i].mo = NULL;
G_DoReborn(i); G_DoReborn(i);
} }
else // gametype is GT_COOP or GT_RACE else // gametype is GT_COOP or GT_RACE
{ {
players[i].mo = NULL;
G_SpawnPlayer(i, (players[i].starposttime)); G_SpawnPlayer(i, (players[i].starposttime));
} }
} }
} }
P_InitGametype(); if (modeattacking == ATTACKING_RECORD && !demo.playback)
P_LoadRecordGhosts();
if (G_TagGametype())
{
INT32 realnumplayers = 0;
INT32 playersactive[MAXPLAYERS];
//I just realized how problematic this code can be.
//D_NumPlayers() will not always cover the scope of the netgame.
//What if one player is node 0 and the other node 31?
//The solution? Make a temp array of all players that are currently playing and pick from them.
//Future todo? When a player leaves, shift all nodes down so D_NumPlayers() can be used as intended?
//Also, you'd never have to loop through all 32 players slots to find anything ever again.
for (i = 0; i < MAXPLAYERS; i++)
{
if (playeringame[i] && !players[i].spectator)
{
playersactive[realnumplayers] = i; //stores the player's node in the array.
realnumplayers++;
}
}
if (realnumplayers) // this should also fix the dedicated crash bug. You only pick a player if one exists to be picked.
{
i = P_RandomKey(realnumplayers);
players[playersactive[i]].pflags |= PF_TAGIT; //choose our initial tagger before map starts.
// Taken and modified from G_DoReborn()
// Remove the player so he can respawn elsewhere.
// first dissasociate the corpse
if (players[playersactive[i]].mo)
P_RemoveMobj(players[playersactive[i]].mo);
G_SpawnPlayer(playersactive[i], false); //respawn the lucky player in his dedicated spawn location.
}
else
CONS_Printf(M_GetText("No player currently available to become IT. Awaiting available players.\n"));
}
else if (G_RaceGametype() && server)
{
INT32 numLaps = ((netgame || multiplayer) && cv_basenumlaps.value
&& (!(mapheaderinfo[gamemap - 1]->levelflags & LF_SECTIONRACE)
|| (mapheaderinfo[gamemap - 1]->numlaps > cv_basenumlaps.value)))
? cv_basenumlaps.value
: mapheaderinfo[gamemap - 1]->numlaps;
CV_StealthSetValue(&cv_numlaps, numLaps);
}
// Start recording replay in multiplayer with a temp filename // Start recording replay in multiplayer with a temp filename
// Ensure dedis only record a replay if there is a player at the start of the map, otherwise we get invalid replays! // Ensure dedis only record a replay if there is a player at the start of the map, otherwise we get invalid replays!
if (!demo.playback && multiplayer && D_NumPlayers()) if (!demo.playback && multiplayer && D_NumPlayers())
{ {
static char buf[256]; static char buf[256];
sprintf(buf, "replay"PATHSEP"online"PATHSEP"%d-%s", (int)(time(NULL)), G_BuildMapName(gamemap)); sprintf(buf, "replay"PATHSEP"online"PATHSEP"%d-%s", (int) (time(NULL)), G_BuildMapName(gamemap));
I_mkdir(va("%s"PATHSEP"replay", srb2home), 0755); I_mkdir(va("%s"PATHSEP"replay", srb2home), 0755);
I_mkdir(va("%s"PATHSEP"replay"PATHSEP"online", srb2home), 0755); I_mkdir(va("%s"PATHSEP"replay"PATHSEP"online", srb2home), 0755);
@@ -2956,10 +2633,9 @@ boolean P_SetupLevel(boolean fromnetsave, boolean reloadinggamestate)
// 99% of the things already did, so. // 99% of the things already did, so.
// Map header should always be in place at this point // Map header should always be in place at this point
INT32 i; INT32 i;
UINT8 levelfadecol;
boolean ranspecialwipe = false; boolean ranspecialwipe = false;
lumpnum_t encoreLump = LUMPERROR; lumpnum_t encoreLump = LUMPERROR;
const mapheader_t *mapheader = mapheaderinfo[gamemap - 1]; UINT8 levelfadecol;
midgamejoin = fromnetsave; // makes dynslopes run in P_Ticker to avoid synch issues and other stuff midgamejoin = fromnetsave; // makes dynslopes run in P_Ticker to avoid synch issues and other stuff
@@ -2967,7 +2643,7 @@ boolean P_SetupLevel(boolean fromnetsave, boolean reloadinggamestate)
levelloading = true; levelloading = true;
// This is needed. Don't touch. // This is needed. Don't touch.
maptol = mapheader->typeoflevel; maptol = mapheaderinfo[gamemap-1]->typeoflevel;
CON_Drawer(); // let the user know what we are going to do CON_Drawer(); // let the user know what we are going to do
I_FinishUpdate(); // page flip or blit buffer I_FinishUpdate(); // page flip or blit buffer
@@ -2978,17 +2654,17 @@ boolean P_SetupLevel(boolean fromnetsave, boolean reloadinggamestate)
// Clear CECHO messages // Clear CECHO messages
HU_ClearCEcho(); HU_ClearCEcho();
if (mapheader->runsoc[0] != '#') if (mapheaderinfo[gamemap-1]->runsoc[0] != '#')
P_RunSOC(mapheader->runsoc); P_RunSOC(mapheaderinfo[gamemap-1]->runsoc);
if (cv_runscripts.value && mapheader->scriptname[0] != '#') if (cv_runscripts.value && mapheaderinfo[gamemap-1]->scriptname[0] != '#')
P_RunLevelScript(mapheader->scriptname); P_RunLevelScript(mapheaderinfo[gamemap-1]->scriptname);
P_LevelInitStuff(reloadinggamestate); P_LevelInitStuff(reloadinggamestate);
if (mapheader->forcecharacter[0] != '\0' if (mapheaderinfo[gamemap-1]->forcecharacter[0] != '\0'
&& atoi(mapheader->forcecharacter) != 255) && atoi(mapheaderinfo[gamemap-1]->forcecharacter) != 255)
P_ForceCharacter(mapheader->forcecharacter); P_ForceCharacter(mapheaderinfo[gamemap-1]->forcecharacter);
// Initial height of PointOfView // Initial height of PointOfView
// will be set by player think. // will be set by player think.
@@ -3038,10 +2714,10 @@ boolean P_SetupLevel(boolean fromnetsave, boolean reloadinggamestate)
char tx[64]; char tx[64];
V_DrawSmallString(1, 191, V_ALLOWLOWERCASE, M_GetText("Speeding off to...")); V_DrawSmallString(1, 191, V_ALLOWLOWERCASE, M_GetText("Speeding off to..."));
snprintf(tx, 63, "%s%s%s", snprintf(tx, 63, "%s%s%s",
mapheader->lvlttl, mapheaderinfo[gamemap-1]->lvlttl,
(strlen(mapheader->zonttl) > 0) ? va(" %s",mapheader->zonttl) : // SRB2kart (strlen(mapheaderinfo[gamemap-1]->zonttl) > 0) ? va(" %s",mapheaderinfo[gamemap-1]->zonttl) : // SRB2kart
((mapheader->levelflags & LF_NOZONE) ? "" : " Zone"), ((mapheaderinfo[gamemap-1]->levelflags & LF_NOZONE) ? "" : " Zone"),
(strlen(mapheader->actnum) > 0) ? va(", Act %s",mapheader->actnum) : ""); (strlen(mapheaderinfo[gamemap-1]->actnum) > 0) ? va(", Act %s",mapheaderinfo[gamemap-1]->actnum) : "");
V_DrawSmallString(1, 195, V_ALLOWLOWERCASE, tx); V_DrawSmallString(1, 195, V_ALLOWLOWERCASE, tx);
I_UpdateNoVsync(); I_UpdateNoVsync();
}*/ }*/
@@ -3060,16 +2736,20 @@ boolean P_SetupLevel(boolean fromnetsave, boolean reloadinggamestate)
curmapvirt = vres_GetMap(lastloadedmaplumpnum); curmapvirt = vres_GetMap(lastloadedmaplumpnum);
encoreLump = W_CheckNumForName(va("%s%c", maplumpname, (encoremode ? 'E' : 'T'))); encoreLump = W_CheckNumForName(va("%s%c", maplumpname, (encoremode ? 'E' : 'T')));
R_ReInitColormaps(mapheader->palette, encoreLump); R_ReInitColormaps(mapheaderinfo[gamemap-1]->palette, encoreLump);
CON_SetupBackColormap(); CON_SetupBackColormap();
// SRB2 determines the sky texture to be used depending on the map header. // SRB2 determines the sky texture to be used depending on the map header.
P_SetupLevelSky(mapheader->skynum, true); P_SetupLevelSky(mapheaderinfo[gamemap-1]->skynum, true);
P_ResetSpawnpoints(); numdmstarts = numredctfstarts = numbluectfstarts = 0;
P_MapStart(); // tmthing can be used starting from this point // reset the player starts
memset(playerstarts, 0, sizeof(playerstarts));
memset(skyboxmo, 0, sizeof(skyboxmo));
P_MapStart();
P_LoadMapFromFile(); P_LoadMapFromFile();
@@ -3089,7 +2769,7 @@ boolean P_SetupLevel(boolean fromnetsave, boolean reloadinggamestate)
if (!playerstarts[numcoopstarts]) if (!playerstarts[numcoopstarts])
break; break;
globalweather = mapheader->weather; globalweather = mapheaderinfo[gamemap-1]->weather;
// set up world state // set up world state
P_SpawnSpecials(fromnetsave, reloadinggamestate); P_SpawnSpecials(fromnetsave, reloadinggamestate);
@@ -3136,7 +2816,7 @@ boolean P_SetupLevel(boolean fromnetsave, boolean reloadinggamestate)
// clear special respawning que // clear special respawning que
iquehead = iquetail = 0; iquehead = iquetail = 0;
P_MapEnd(); // tmthing is no longer needed from this point onwards P_MapEnd();
// Remove the loading shit from the screen // Remove the loading shit from the screen
if (rendermode != render_none && !reloadinggamestate) if (rendermode != render_none && !reloadinggamestate)
@@ -3167,15 +2847,9 @@ boolean P_SetupLevel(boolean fromnetsave, boolean reloadinggamestate)
savedata.lives = 0; savedata.lives = 0;
} }
if (!reloadinggamestate) // assume the skybox is visible on level load.
{ skyVisible = true;
// assume the skybox is visible on level load. memset(skyVisiblePerPlayer, true, sizeof(skyVisiblePerPlayer));
skyVisible = true;
for (i = 0; i < MAXSPLITSCREENPLAYERS; i++)
{
skyVisiblePerPlayer[i] = true;
}
}
if (!fromnetsave) // uglier hack if (!fromnetsave) // uglier hack
{ // to make a newly loaded level start on the second frame. { // to make a newly loaded level start on the second frame.
@@ -3195,18 +2869,14 @@ boolean P_SetupLevel(boolean fromnetsave, boolean reloadinggamestate)
LUA_HookInt(gamemap, HOOK(MapLoad)); LUA_HookInt(gamemap, HOOK(MapLoad));
} }
// reloading gamestate, stop here. if (rendermode != render_none && !reloadinggamestate)
if (reloadinggamestate)
return true;
G_AddMapToBuffer(gamemap-1);
if (rendermode != render_none)
{ {
R_ResetViewInterpolation(0); R_ResetViewInterpolation(0);
R_UpdateMobjInterpolators(); R_UpdateMobjInterpolators();
} }
G_AddMapToBuffer(gamemap-1);
G_ResetDeviceLED(); G_ResetDeviceLED();
return true; return true;
@@ -3257,7 +2927,7 @@ static size_t sreplaces = 0, mreplaces = 0, digmreplaces = 0;
static boolean P_CheckSoundReplacements(UINT16 wadnum, char *name, size_t i) static boolean P_CheckSoundReplacements(UINT16 wadnum, char *name, size_t i)
{ {
size_t j; size_t j;
lumpnum_t lumpnum = (i | (wadnum<<16)); lumpnum_t lumpnum = (i|(wadnum<<16));
if (name[0] == 'D') if (name[0] == 'D')
{ {
@@ -3265,8 +2935,8 @@ static boolean P_CheckSoundReplacements(UINT16 wadnum, char *name, size_t i)
{ {
for (j = 1; j < NUMSFX; j++) for (j = 1; j < NUMSFX; j++)
{ {
if ((S_sfx[j].lumpnum != lumpnum) && (S_sfx[j].lumpnum != LUMPERROR) && if (S_sfx[j].name && !strnicmp(S_sfx[j].name, name + 2, 6)
S_sfx[j].name && !strnicmp(S_sfx[j].name, name + 2, 6)) && (S_sfx[j].lumpnum != lumpnum) && (S_sfx[j].lumpnum != LUMPERROR))
{ {
// the sound will be reloaded when needed, // the sound will be reloaded when needed,
// since sfx->data will be NULL // since sfx->data will be NULL
@@ -3387,17 +3057,6 @@ UINT16 P_PartialAddWadFile(const char *wadfilename, boolean local)
sreplaces = mreplaces = digmreplaces = 0; sreplaces = mreplaces = digmreplaces = 0;
if (local)
{
// check if someone tries to load maps locally lol
// do this here so we can skip loading the file anyways
if (W_CheckAutoLoadContainsMap(wadfilename))
{
CONS_Alert(CONS_WARNING, "addilelocal: locally added file %s contains map data, this WILL cause crashes and desynchs! not added.\n", wadfilename);
return UINT16_MAX;
}
}
if ((numlumps = W_InitFile(wadfilename, local, false)) == INT16_MAX) if ((numlumps = W_InitFile(wadfilename, local, false)) == INT16_MAX)
{ {
refreshdirmenu |= REFRESHDIR_NOTLOADED; refreshdirmenu |= REFRESHDIR_NOTLOADED;
@@ -3428,15 +3087,12 @@ UINT16 P_PartialAddWadFile(const char *wadfilename, boolean local)
allvotereplaced = true; allvotereplaced = true;
} }
if (!devparm) if (!devparm && sreplaces)
{ CONS_Printf(M_GetText("%s sounds replaced\n"), sizeu1(sreplaces));
if (sreplaces) if (!devparm && mreplaces)
CONS_Printf(M_GetText("%s sounds replaced\n"), sizeu1(sreplaces)); CONS_Printf(M_GetText("%s midi musics ignored\n"), sizeu1(mreplaces));
if (mreplaces) if (!devparm && digmreplaces)
CONS_Printf(M_GetText("%s midi musics ignored\n"), sizeu1(mreplaces)); CONS_Printf(M_GetText("%s digital musics replaced\n"), sizeu1(digmreplaces));
if (digmreplaces)
CONS_Printf(M_GetText("%s digital musics replaced\n"), sizeu1(digmreplaces));
}
if (!mapsadded) if (!mapsadded)
CONS_Printf(M_GetText("No maps added\n")); CONS_Printf(M_GetText("No maps added\n"));
-3
View File
@@ -114,9 +114,6 @@ 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
+22 -40
View File
@@ -31,6 +31,8 @@ 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);
@@ -71,7 +73,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, boolean fast) static boolean P_CrossSubsecPolyObj(polyobj_t *po, register los_t *los)
{ {
size_t i; size_t i;
sector_t *polysec; sector_t *polysec;
@@ -79,8 +81,6 @@ static boolean P_CrossSubsecPolyObj(polyobj_t *po, register los_t *los, boolean
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, boolean
v2 = line->v2; v2 = line->v2;
// line isn't crossed? // line isn't crossed?
if (divlinecrossFunc(v1->x, v1->y, v2->x, v2->y, &los->strace)) if (P_DivlineCrossed(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 (divlinecrossFunc(los->strace.x, los->strace.y, los->t2x, los->t2y, &divl)) if (P_DivlineCrossed(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,8 +147,6 @@ 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;
@@ -160,13 +158,15 @@ 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, fast)) if (!P_CrossSubsecPolyObj(po, los))
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,17 +214,14 @@ 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
@@ -265,7 +262,6 @@ 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)
{ {
@@ -279,11 +275,9 @@ 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)
{ {
@@ -297,7 +291,6 @@ 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
} }
@@ -322,10 +315,10 @@ static boolean P_CrossBSPNode(INT32 bspnum, register los_t *los, boolean fast)
while (!(bspnum & NF_SUBSECTOR)) while (!(bspnum & NF_SUBSECTOR))
{ {
register const node_t *bsp = nodes + bspnum; register node_t *bsp = nodes + bspnum;
INT32 side = divlineFunc(los->strace.x, los->strace.y, (const divline_t *)bsp) & 1; INT32 side = divlineFunc(los->strace.x, los->strace.y, (divline_t *)bsp) & 1;
INT32 side2 = divlineFunc(los->t2x, los->t2y, (const divline_t *)bsp); INT32 side2 = divlineFunc(los->t2x, los->t2y, (divline_t *) bsp);
if (side == side2) if (side == side2)
{ {
@@ -364,10 +357,8 @@ 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;
@@ -377,9 +368,7 @@ 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
@@ -387,9 +376,11 @@ 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++;
@@ -432,30 +423,21 @@ boolean P_CheckSight2(mobj_t *t1, mobj_t *t2, boolean fast)
continue; continue;
} }
// Check for blocking floors here. topz1 = P_GetFFloorTopZAt (rover, t1->x, t1->y);
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);
if (los.sightzstart >= topz1 && t2->z + t2->height < bottomz2) // Check for blocking floors here.
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))
{ {
-7
View File
@@ -664,10 +664,8 @@ 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
@@ -901,11 +899,6 @@ 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
+130 -228
View File
@@ -538,7 +538,6 @@ static sector_t *getNextSector(line_t *line, sector_t *sec)
else else
return NULL; return NULL;
} }
return line->frontsector; return line->frontsector;
} }
@@ -569,7 +568,6 @@ 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;
} }
@@ -883,7 +881,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;
@@ -891,7 +889,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] != NO_INDEX) if (line->sidenum[1] != 0xffff)
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;
@@ -901,7 +899,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] != NO_INDEX) if (line->sidenum[1] != 0xffff)
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;
@@ -1182,7 +1180,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;
@@ -1236,6 +1234,7 @@ 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;
@@ -1273,8 +1272,6 @@ 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)
@@ -1296,6 +1293,7 @@ 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!
@@ -1310,8 +1308,6 @@ 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)
@@ -1340,7 +1336,6 @@ 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)
{ {
@@ -1351,21 +1346,19 @@ 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 < targlap) if (lap < (sides[triggerline->sidenum[0]].textureoffset >> FRACBITS))
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 > targlap) if (lap > (sides[triggerline->sidenum[0]].textureoffset >> FRACBITS))
return false; return false;
} }
else // Need equal to else // Need equal to
{ {
if (lap != targlap) if (lap != (sides[triggerline->sidenum[0]].textureoffset >> FRACBITS))
return false; return false;
} }
@@ -1457,7 +1450,6 @@ 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)
{ {
@@ -1466,7 +1458,6 @@ 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
{ {
@@ -1474,13 +1465,11 @@ 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)
@@ -1499,13 +1488,11 @@ 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;
@@ -1513,7 +1500,6 @@ 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);
@@ -1528,13 +1514,11 @@ 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;
@@ -1611,21 +1595,19 @@ 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 (specialtype == 313 if (lines[masterline].special == 313
|| specialtype == 399 || lines[masterline].special == 399
|| specialtype == 328 || lines[masterline].special == 328
|| specialtype == 323 || lines[masterline].special == 323
// Each-time executors handle themselves, too // Each-time executors handle themselves, too
|| specialtype == 301 // Each time || lines[masterline].special == 301 // Each time
|| specialtype == 306 // Character ability - Each time || lines[masterline].special == 306 // Character ability - Each time
|| specialtype == 310 // CTF Red team - Each time || lines[masterline].special == 310 // CTF Red team - Each time
|| specialtype == 312 // CTF Blue team - Each time || lines[masterline].special == 312 // CTF Blue team - Each time
|| specialtype == 322 // Trigger on X calls - Each Time || lines[masterline].special == 322 // Trigger on X calls - Each Time
|| specialtype < 300 || lines[masterline].special < 300
|| specialtype > 399) || lines[masterline].special > 399)
continue; continue;
if (!P_RunTriggerLinedef(&lines[masterline], actor, caller)) if (!P_RunTriggerLinedef(&lines[masterline], actor, caller))
@@ -1991,8 +1973,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] != NO_INDEX) ? sides[line->sidenum[1]].textureoffset >> FRACBITS : 0, 0); UINT8 fadetarget = (UINT8)max((line->sidenum[1] != 0xffff) ? sides[line->sidenum[1]].textureoffset >> FRACBITS : 0, 0);
INT16 fadesource = (INT16)max((line->sidenum[1] != NO_INDEX) ? sides[line->sidenum[1]].rowoffset >> FRACBITS : -1, -1); INT16 fadesource = (INT16)max((line->sidenum[1] != 0xffff) ? 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)
@@ -2100,7 +2082,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;
@@ -2437,8 +2419,7 @@ 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;
@@ -2506,7 +2487,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] != NO_INDEX && line->flags & ML_BLOCKMONSTERS) // read power from back sidedef if (line->sidenum[1] != 0xffff && 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;
@@ -2521,7 +2502,6 @@ 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;
@@ -2585,15 +2565,11 @@ 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;
} }
@@ -2603,10 +2579,8 @@ 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;
} }
@@ -2635,7 +2609,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] == NO_INDEX) if (lines[linenum].sidenum[1] == 0xffff)
continue; // One-sided stops here. continue; // One-sided stops here.
// Back side // Back side
@@ -2684,18 +2658,16 @@ 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] != NO_INDEX) if (line->sidenum[1] != 0xffff)
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)
@@ -2712,7 +2684,6 @@ static void P_ProcessLineSpecial(line_t *line, mobj_t *mo, sector_t *callsec)
break; break;
} }
} }
}
} while (tryagain); } while (tryagain);
} }
break; break;
@@ -2990,10 +2961,10 @@ sector_t *P_PlayerTouchingSectorSpecial(player_t *player, INT32 section, INT32 n
{ {
fixed_t topheight, bottomheight; fixed_t topheight, bottomheight;
if (!(rover->flags & FF_EXISTS)) if (GETSECSPECIAL(rover->master->frontsector->special, section) != number)
continue; continue;
if (GETSECSPECIAL(rover->master->frontsector->special, section) != number) if (!(rover->flags & FF_EXISTS))
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);
@@ -3288,7 +3259,6 @@ 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)
@@ -3342,7 +3312,6 @@ 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)
@@ -3416,16 +3385,14 @@ 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);
@@ -3441,22 +3408,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;
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);
@@ -3475,14 +3436,11 @@ DoneSection2:
if (i != -1) if (i != -1)
{ {
INT32 sfxnum;
angle_t lineangle; angle_t lineangle;
fixed_t linespeed; fixed_t linespeed;
const line_t *line = &lines[i]; lineangle = lines[i].angle;
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;
@@ -3496,7 +3454,7 @@ DoneSection2:
P_ForceLocalAngle(player, player->mo->angle); P_ForceLocalAngle(player, player->mo->angle);
} }
if (!(line->flags & ML_EFFECT4)) if (!(lines[i].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
@@ -3518,14 +3476,7 @@ 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
@@ -3574,25 +3525,21 @@ 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) if (gametype == GT_COOP && lineindex != -1) // Custom exit!
{ {
// important: use sector->tag on next line instead of player->mo->subsector->tag // Special goodies with the block monsters flag depending on emeralds collected
// this part is different from in P_PlayerThink, this is what was causing if ((lines[lineindex].flags & ML_BLOCKMONSTERS) && ALL7EMERALDS(emeralds))
// FOF custom exits not to work. nextmapoverride = (INT16)(lines[lineindex].frontsector->ceilingheight>>FRACBITS);
lineindex = P_FindSpecialLineFromTag(2, sector->tag, -1); else
nextmapoverride = (INT16)(lines[lineindex].frontsector->floorheight>>FRACBITS);
if (lineindex != -1) // Custom exit!) if (lines[lineindex].flags & ML_NOCLIMB)
{ 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;
@@ -3698,6 +3645,7 @@ 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;
@@ -3745,13 +3693,10 @@ 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);
} }
if (!(lines[lineindex].flags & ML_EFFECT4)) an = R_PointToAngle2(player->mo->x, player->mo->y, waypoint->x, waypoint->y) - player->mo->angle;
{
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) if (an > ANGLE_90 && an < ANGLE_270 && !(lines[lineindex].flags & ML_EFFECT4))
break; // behind back break; // behind back
}
P_SetTarget(&player->mo->tracer, waypoint); P_SetTarget(&player->mo->tracer, waypoint);
player->speed = speed; player->speed = speed;
@@ -3773,6 +3718,7 @@ 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;
@@ -3820,13 +3766,10 @@ 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);
} }
if (!(lines[lineindex].flags & ML_EFFECT4)) an = R_PointToAngle2(player->mo->x, player->mo->y, waypoint->x, waypoint->y) - player->mo->angle;
{
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) if (an > ANGLE_90 && an < ANGLE_270 && !(lines[lineindex].flags & ML_EFFECT4))
break; // behind back break; // behind back
}
P_SetTarget(&player->mo->tracer, waypoint); P_SetTarget(&player->mo->tracer, waypoint);
player->speed = speed; player->speed = speed;
@@ -3840,13 +3783,10 @@ DoneSection2:
case 10: // Finish Line case 10: // Finish Line
// SRB2kart - 150117 // SRB2kart - 150117
if (!G_RaceGametype()) if (G_RaceGametype() && (player->starpostnum >= (numstarposts - (numstarposts/2)) || player->exiting))
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 (!player->exiting) if (G_RaceGametype() && !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)")
{ {
@@ -4563,13 +4503,27 @@ void P_PlayerInSpecialSector(player_t *player)
#undef TELEPORTED #undef TELEPORTED
static void P_UpdateAnimFlats(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)
{ {
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++)
{ {
@@ -4599,40 +4553,15 @@ static void P_UpdateAnimFlats(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;
} }
@@ -4683,7 +4612,6 @@ 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
@@ -4790,7 +4718,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;
@@ -4798,7 +4726,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;
@@ -5236,18 +5164,11 @@ 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 + thing->height <= bottom) if (thing->z >= top
|| thing->z + thing->height <= bottom)
continue; continue;
if (thing->flags & MF_SHOOTABLE) if (thing->flags & MF_SHOOTABLE)
@@ -5341,7 +5262,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));
@@ -5353,7 +5274,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
@@ -5366,7 +5287,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())
@@ -5402,13 +5323,11 @@ 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)
@@ -5488,7 +5407,6 @@ 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;
@@ -6061,7 +5979,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] != NO_INDEX) if (lines[i].sidenum[1] != 0xffff)
{ {
UINT8 *data; UINT8 *data;
UINT16 b; UINT16 b;
@@ -6508,19 +6426,15 @@ 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
{ {
height = P_GetSpecialBottomZ(thing, sec, psec); // Move objects only if on floor
// non-floating, and clipped.
if (!(thing->flags & MF_NOGRAVITY || thing->z+thing->height != height)) // Thing must a) be non-floating and have z+height == height P_DoScrollMove(thing, dx, dy, s->exclusive);
{
// 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
} }
@@ -6534,16 +6448,14 @@ void T_Scroll(scroll_t *s)
if (thing->flags2 & MF2_PUSHED) if (thing->flags2 & MF2_PUSHED)
continue; continue;
if (!(thing->flags & MF_NOCLIP)) // Thing must be clipped height = P_GetSpecialBottomZ(thing, sec, sec);
{
height = P_GetSpecialBottomZ(thing, sec, sec);
if (!(thing->flags & MF_NOGRAVITY || thing->z > height)) if (!(thing->flags & MF_NOCLIP) &&
{ (!(thing->flags & MF_NOGRAVITY || thing->z > height)))
// Move objects only if on floor or underwater, {
// non-floating, and clipped. // Move objects only if on floor or underwater,
P_DoScrollMove(thing, dx, dy, s->exclusive); // non-floating, and clipped.
} P_DoScrollMove(thing, dx, dy, s->exclusive);
} }
} }
} }
@@ -6589,16 +6501,14 @@ void T_Scroll(scroll_t *s)
if (thing->flags2 & MF2_PUSHED) if (thing->flags2 & MF2_PUSHED)
continue; continue;
if (!(thing->flags & MF_NOCLIP)) // Thing must be clipped height = P_GetSpecialTopZ(thing, sec, psec);
{
height = P_GetSpecialTopZ(thing, sec, psec);
if (!(thing->flags & MF_NOGRAVITY || thing->z != height))// Thing must a) be non-floating and have z == height 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, {
// non-floating, and clipped. // Move objects only if on floor or underwater,
P_DoScrollMove(thing, dx, dy, s->exclusive); // 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
@@ -6613,16 +6523,14 @@ void T_Scroll(scroll_t *s)
if (thing->flags2 & MF2_PUSHED) if (thing->flags2 & MF2_PUSHED)
continue; continue;
if (!(thing->flags & MF_NOCLIP)) // Thing must be clipped height = P_GetSpecialTopZ(thing, sec, sec);
{
height = P_GetSpecialTopZ(thing, sec, sec);
if (!(thing->flags & MF_NOGRAVITY || thing->z+thing->height < height)) if (!(thing->flags & MF_NOCLIP) &&
{ (!(thing->flags & MF_NOGRAVITY || thing->z+thing->height < height)))
// Move objects only if on floor or underwater, {
// non-floating, and clipped. // Move objects only if on floor or underwater,
P_DoScrollMove(thing, dx, dy, s->exclusive); // non-floating, and clipped.
} P_DoScrollMove(thing, dx, dy, s->exclusive);
} }
} }
} }
@@ -6790,7 +6698,7 @@ static void P_SpawnScrollers(void)
case 506: case 506:
s = lines[i].sidenum[1]; s = lines[i].sidenum[1];
if (s != NO_INDEX) if (s != 0xffff)
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));
@@ -7001,7 +6909,6 @@ 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;
@@ -7035,7 +6942,6 @@ 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);
} }
}
} }
/* /*
@@ -7084,10 +6990,9 @@ 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
@@ -7138,14 +7043,15 @@ 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), thing->z - sz); dist = P_AproxDistance(P_AproxDistance(thing->x - sx, thing->y - sy),
thing->z - sz);
} }
speed = (tmpusher->magnitude - ((dist>>FRACBITS)>>1))<<(FRACBITS - PUSH_FACTOR - 1); speed = (tmpusher->magnitude - ((dist>>FRACBITS)>>1))<<(FRACBITS - PUSH_FACTOR - 1);
@@ -7308,6 +7214,7 @@ 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.
@@ -7350,16 +7257,13 @@ void T_Pusher(pusher_t *p)
if (thing->flags2 & MF2_PUSHED) if (thing->flags2 & MF2_PUSHED)
continue; continue;
if (thing->player) if (thing->player && thing->player->pflags & PF_ROPEHANG)
{ continue;
if (thing->player->pflags & PF_ROPEHANG)
continue;
if ((thing->state == &states[thing->info->painstate]) if (thing->player && (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;
@@ -7489,7 +7393,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;
@@ -7557,17 +7461,16 @@ 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 ;)
{ {
@@ -7579,21 +7482,20 @@ 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)
+1 -18
View File
@@ -38,8 +38,6 @@
#include "i_video.h" // rendermode #include "i_video.h" // rendermode
#include "m_perfstats.h" #include "m_perfstats.h"
#include "lua_profile.h"
// Object place // Object place
#include "m_cheat.h" #include "m_cheat.h"
@@ -613,19 +611,8 @@ 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));
}
} }
LUA_ResetTicTimers();
ps_lua_mobjhooks.value.i = 0; ps_lua_mobjhooks.value.i = 0;
ps_checkposition_calls.value.i = 0; ps_checkposition_calls.value.i = 0;
@@ -633,7 +620,6 @@ void P_Ticker(boolean run)
LUA_HookPreThinkFrame(); LUA_HookPreThinkFrame();
PS_STOP_TIMING(ps_lua_prethinkframe_time); PS_STOP_TIMING(ps_lua_prethinkframe_time);
// OK! Now that we got all of that sorted, players can think!
PS_START_TIMING(ps_playerthink_time); PS_START_TIMING(ps_playerthink_time);
for (i = 0; i < MAXPLAYERS; i++) for (i = 0; i < MAXPLAYERS; i++)
{ {
@@ -651,9 +637,7 @@ 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);
@@ -680,7 +664,6 @@ void P_Ticker(boolean run)
PS_STOP_TIMING(ps_lua_thinkframe_time); PS_STOP_TIMING(ps_lua_thinkframe_time);
} }
// Run shield positioning
P_RunOverlays(); P_RunOverlays();
P_RunShadows(); P_RunShadows();
@@ -802,7 +785,7 @@ void P_Ticker(boolean run)
if (!player->mo) if (!player->mo)
continue; continue;
const boolean skybox = (skyboxmo[0] && cv_skybox.value); // True if there's a skybox object and skyboxes are on const boolean skybox = (skyboxmo[0] && cv_skybox.value);
if (skyVisiblePerPlayer[i] && skybox) if (skyVisiblePerPlayer[i] && skybox)
{ {
+19 -32
View File
@@ -1122,26 +1122,22 @@ 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)
@@ -1206,7 +1202,6 @@ 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;
@@ -1574,12 +1569,10 @@ static void P_CheckBouncySectors(player_t *player)
newmom = -8*FRACUNIT; newmom = -8*FRACUNIT;
} }
const fixed_t halfpheight = P_GetPlayerHeight(player)/2; if (newmom > P_GetPlayerHeight(player)/2)
newmom = P_GetPlayerHeight(player)/2;
if (newmom > halfpheight) else if (newmom < -P_GetPlayerHeight(player)/2)
newmom = halfpheight; newmom = -P_GetPlayerHeight(player)/2;
else if (newmom < -halfpheight)
newmom = -halfpheight;
momentum.z = newmom*2; momentum.z = newmom*2;
@@ -1842,9 +1835,6 @@ 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)
@@ -1853,12 +1843,15 @@ 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
an = R_PointToAngle2(player->mo->x, player->mo->y, mo2->x, mo2->y); if (mo2->health > 0)
{
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);
@@ -2362,7 +2355,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 && player->kartstuff[k_drift] != 0 && !S_SoundPlaying(player->mo, sfx_drift)) else if (onground && !S_SoundPlaying(player->mo, sfx_drift) && player->kartstuff[k_drift] != 0)
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)
@@ -2743,16 +2736,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!
const fixed_t modist = P_AproxDistance(P_AproxDistance(player->mo->x-mo->x, player->mo->y-mo->y), player->mo->z-mo->z); if (P_AproxDistance(P_AproxDistance(player->mo->x-mo->x, player->mo->y-mo->y),
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) if (UNLIKELY((twodlevel || player->mo->flags2 & MF2_TWOD)
&& abs(player->mo->y-mo->y) > player->mo->radius)) && abs(player->mo->y-mo->y) > player->mo->radius))
continue; // not in your 2d plane continue; // not in your 2d plane
if (closestmo && modist > P_AproxDistance(P_AproxDistance(player->mo->x-closestmo->x, if (closestmo && P_AproxDistance(P_AproxDistance(player->mo->x-mo->x, player->mo->y-mo->y),
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;
@@ -3156,8 +3149,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 && !DigitalGamepadStyle(num); const boolean analogjoystickmove = cv_usejoystick[num].value && !Joystick[num].bGamepadStyle;
const boolean gamepadjoystickmove = cv_usejoystick[num].value && DigitalGamepadStyle(num); const boolean gamepadjoystickmove = cv_usejoystick[num].value && Joystick[num].bGamepadStyle;
usejoystick = (analogjoystickmove || gamepadjoystickmove); usejoystick = (analogjoystickmove || gamepadjoystickmove);
@@ -3740,7 +3733,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 || P_MobjWasRemoved(player->mo)) if (!player || !player->mo)
return true; return true;
// This can happen when joining // This can happen when joining
@@ -4587,7 +4580,6 @@ 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
@@ -5090,11 +5082,6 @@ 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.
+5 -18
View File
@@ -320,20 +320,13 @@ 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(v1x, v1y); angle1 = R_PointToAngle64(line->v1->x, line->v1->y);
angle2 = R_PointToAngle64(v2x, v2y); angle2 = R_PointToAngle64(line->v2->x, line->v2->y);
curline = line; curline = line;
@@ -526,7 +519,6 @@ 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.
@@ -540,14 +532,9 @@ 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(x1, y1) - viewangle; angle1 = R_PointToAngle64(bspcoord[check[0]], bspcoord[check[1]]) - viewangle;
angle2 = R_PointToAngle64(x2, y2) - viewangle; angle2 = R_PointToAngle64(bspcoord[check[2]], bspcoord[check[3]]) - 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
View File
@@ -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 NO_INDEX if one-sided UINT16 sidenum[2]; // sidenum[1] will be 0xffff if one-sided
fixed_t alpha; // translucency fixed_t alpha; // translucency
UINT8 blendmode; // blendmode UINT8 blendmode; // blendmode
+4 -5
View File
@@ -387,10 +387,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)
@@ -807,7 +807,6 @@ void R_ResetMobjInterpolationState(mobj_t *mobj)
mobj->spriteyscale = mobj->realyscale; mobj->spriteyscale = mobj->realyscale;
mobj->spritexoffset = mobj->realxoffset; mobj->spritexoffset = mobj->realxoffset;
mobj->spriteyoffset = mobj->realyoffset; mobj->spriteyoffset = mobj->realyoffset;
mobj->temprollangle = 0;
mobj->resetinterp = false; mobj->resetinterp = false;
} }
+1 -4
View File
@@ -188,7 +188,6 @@ 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};
@@ -1565,7 +1564,6 @@ 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);
@@ -1600,8 +1598,7 @@ 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_stairjank); CV_RegisterVar(&cv_spinoutroll);
CV_RegisterVar(&cv_stairjanksfx);
CV_RegisterVar(&cv_showhud); CV_RegisterVar(&cv_showhud);
CV_RegisterVar(&cv_translucenthud); CV_RegisterVar(&cv_translucenthud);
-1
View File
@@ -213,7 +213,6 @@ 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
View File
@@ -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
+3 -6
View File
@@ -785,8 +785,6 @@ 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);
@@ -832,8 +830,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
@@ -868,8 +866,7 @@ 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);
if (skydome) dc.iscale = FixedMul(skyscale, FINECOSINE(xtoviewangle[x]>>ANGLETOFINESHIFT));
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
+14 -19
View File
@@ -311,7 +311,6 @@ 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++)
@@ -436,7 +435,6 @@ 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);
@@ -2206,7 +2204,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] != NO_INDEX) && linedef->sidenum[1] != 0xffff)
{ {
// 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]];
@@ -2617,8 +2615,8 @@ void R_StoreWallRange(INT32 start, INT32 stop)
auto set_topstep_normal = [&] auto set_topstep_normal = [&]
{ {
topstep = -FixedMul(rw_scalestep, worldtop); topstep = -FixedMul (rw_scalestep, worldtop);
topfrac = (centeryfrac>>4) - FixedMul(worldtop, rw_scale); topfrac = (centeryfrac>>4) - FixedMul (worldtop, rw_scale);
}; };
// untextured seg // untextured seg
@@ -2627,7 +2625,7 @@ void R_StoreWallRange(INT32 start, INT32 stop)
const bool tophigh = (worldhigh <= worldtop && worldhighslope <= worldtopslope); const bool tophigh = (worldhigh <= worldtop && worldhighslope <= worldtopslope);
// if we cant see the goddamn skyplane, well there wont be any skybox // if we cant see the goddamn skyplane, well there wont be any skybox
// we could kill skyVisible instead, but i want to keep the performance improvements it yields // we could kill skyVisible instead, but i want to keep the performance improvemnts it yields
// so we do this absolute trash // so we do this absolute trash
if ((tophigh if ((tophigh
&& (frontsector->floorpic != skyflatnum && frontsector->ceilingpic != skyflatnum)) // try to guess if its a "window" && (frontsector->floorpic != skyflatnum && frontsector->ceilingpic != skyflatnum)) // try to guess if its a "window"
@@ -2639,16 +2637,14 @@ void R_StoreWallRange(INT32 start, INT32 stop)
// this is an attempt to fix issues with textureless single sided lines drawing nothing where they should just draw sky instead // 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) if (tophigh && !backsector && frontsector->ceilingpic == skyflatnum)
{ {
topstep = -FixedMul (rw_scalestep, worldbottom);
topfrac = (centeryfrac>>4) - FixedMul (worldbottom, rw_scale);
// account for slopes to try and get rid of sharp edges from the black void // account for slopes to try and get rid of sharp edges from the black void
if (frontsector->f_slope || (backsector && backsector->f_slope)) if (frontsector->f_slope || (backsector && backsector->f_slope))
{ {
topstep = -FixedMul(rw_scalestep, worldbottomslope); topstep = -FixedMul (rw_scalestep, worldbottomslope);
topfrac = (centeryfrac>>4) - FixedMul(worldbottomslope, rw_scale); topfrac = (centeryfrac>>4) - FixedMul (worldbottomslope, rw_scale);
}
else
{
topstep = -FixedMul(rw_scalestep, worldbottom);
topfrac = (centeryfrac>>4) - FixedMul(worldbottom, rw_scale);
} }
} }
else else
@@ -2657,18 +2653,18 @@ void R_StoreWallRange(INT32 start, INT32 stop)
else else
set_topstep_normal(); set_topstep_normal();
bottomstep = -FixedMul(rw_scalestep, worldbottom); bottomstep = -FixedMul (rw_scalestep, worldbottom);
bottomfrac = (centeryfrac>>4) - FixedMul(worldbottom, rw_scale); bottomfrac = (centeryfrac>>4) - FixedMul (worldbottom, rw_scale);
if (frontsector->c_slope) if (frontsector->c_slope)
{ {
fixed_t topfracend = (centeryfrac>>4) - FixedMul(worldtopslope, ds_p->scale2); fixed_t topfracend = (centeryfrac>>4) - FixedMul (worldtopslope, ds_p->scale2);
topstep = (topfracend-topfrac)/(range); topstep = (topfracend-topfrac)/(range);
} }
if (frontsector->f_slope) if (frontsector->f_slope)
{ {
fixed_t bottomfracend = (centeryfrac>>4) - FixedMul(worldbottomslope, ds_p->scale2); fixed_t bottomfracend = (centeryfrac>>4) - FixedMul (worldbottomslope, ds_p->scale2);
bottomstep = (bottomfracend-bottomfrac)/(range); bottomstep = (bottomfracend-bottomfrac)/(range);
} }
} }
@@ -2786,7 +2782,7 @@ 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);
@@ -3049,7 +3045,6 @@ 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 -1
View File
@@ -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
+1 -1
View File
@@ -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] != NO_INDEX) if (wallline->sidenum[sectorside] != 0xffff)
{ {
backsector = sides[wallline->sidenum[sectorside]].sector; backsector = sides[wallline->sidenum[sectorside]].sector;
+32 -45
View File
@@ -182,14 +182,15 @@ static void R_InstallSpriteLump(UINT16 wad, // graphics patch
UINT8 rightfactor = ((rotation == ROT_R) ? 4 : 0); UINT8 rightfactor = ((rotation == ROT_R) ? 4 : 0);
// the lump should be used for half of all rotations // the lump should be used for half of all rotations
if (sprtemp[frame].rotate == SRF_NONE) if (sprtemp[frame].rotate == SRF_SINGLE)
sprtemp[frame].rotate = SRF_SINGLE;
else if (sprtemp[frame].rotate == SRF_SINGLE)
CONS_Debug(DBG_SETUP, "R_InitSprites: Sprite %s frame %c has L/R rotations and a rot = 0 lump\n", spritename, cn); CONS_Debug(DBG_SETUP, "R_InitSprites: Sprite %s frame %c has L/R rotations and a rot = 0 lump\n", spritename, cn);
else if (sprtemp[frame].rotate == SRF_3D) else if (sprtemp[frame].rotate == SRF_3D)
CONS_Debug(DBG_SETUP, "R_InitSprites: Sprite %s frame %c has both L/R and 1-8 rotations\n", spritename, cn); CONS_Debug(DBG_SETUP, "R_InitSprites: Sprite %s frame %c has both L/R and 1-8 rotations\n", spritename, cn);
// Let's not complain about multiple L/R rotations. It's not worth the effort. // Let's not complain about multiple L/R rotations. It's not worth the effort.
if (sprtemp[frame].rotate == SRF_NONE)
sprtemp[frame].rotate = SRF_SINGLE;
sprtemp[frame].rotate |= ((rotation == ROT_R) ? SRF_RIGHT : SRF_LEFT); sprtemp[frame].rotate |= ((rotation == ROT_R) ? SRF_RIGHT : SRF_LEFT);
if (sprtemp[frame].rotate == (SRF_3D|SRF_2D)) if (sprtemp[frame].rotate == (SRF_3D|SRF_2D))
@@ -232,7 +233,6 @@ static void R_InstallSpriteLump(UINT16 wad, // graphics patch
// when using sprites in pwad : the lumppat points the new graphics // when using sprites in pwad : the lumppat points the new graphics
sprtemp[frame].lumppat[rotation] = lumppat; sprtemp[frame].lumppat[rotation] = lumppat;
sprtemp[frame].lumpid[rotation] = lumpid; sprtemp[frame].lumpid[rotation] = lumpid;
if (flipped) if (flipped)
sprtemp[frame].flip |= (1<<rotation); sprtemp[frame].flip |= (1<<rotation);
else else
@@ -261,11 +261,9 @@ boolean R_AddSingleSpriteDef(const char *sprname, spritedef_t *spritedef, UINT16
softwarepatch_t patch; softwarepatch_t patch;
UINT8 numadded = 0; UINT8 numadded = 0;
memset(sprtemp, 0xFF, sizeof(sprtemp)); memset(sprtemp,0xFF, sizeof (sprtemp));
maxframe = (size_t)-1; maxframe = (size_t)-1;
spritename = sprname;
// are we 'patching' a sprite already loaded ? // are we 'patching' a sprite already loaded ?
// if so, it might patch only certain frames, not all // if so, it might patch only certain frames, not all
if (spritedef->numframes) // (then spriteframes is not null) if (spritedef->numframes) // (then spriteframes is not null)
@@ -291,7 +289,7 @@ boolean R_AddSingleSpriteDef(const char *sprname, spritedef_t *spritedef, UINT16
if (frame >= 64 || !(R_ValidSpriteAngle(rotation))) // Give an actual NAME error -_-... if (frame >= 64 || !(R_ValidSpriteAngle(rotation))) // Give an actual NAME error -_-...
{ {
CONS_Alert(CONS_WARNING, M_GetText("Bad sprite name: %s\n"), W_CheckNameForNumPwad(wadnum, l)); CONS_Alert(CONS_WARNING, M_GetText("Bad sprite name: %s\n"), W_CheckNameForNumPwad(wadnum,l));
continue; continue;
} }
@@ -317,15 +315,6 @@ boolean R_AddSingleSpriteDef(const char *sprname, spritedef_t *spritedef, UINT16
{ {
frame = R_Char2Frame(lumpinfo[l].name[6]); frame = R_Char2Frame(lumpinfo[l].name[6]);
rotation = (UINT8)(lumpinfo[l].name[7] - '0'); rotation = (UINT8)(lumpinfo[l].name[7] - '0');
/*
if (frame >= 64 || !(R_ValidSpriteAngle(rotation))) // Give an actual NAME error -_-...
{
CONS_Alert(CONS_WARNING, M_GetText("Bad sprite name: %s\n"), W_CheckNameForNumPwad(wadnum, l));
continue;
}
*/
R_InstallSpriteLump(wadnum, l, numspritelumps, frame, rotation, 1); R_InstallSpriteLump(wadnum, l, numspritelumps, frame, rotation, 1);
} }
@@ -374,32 +363,30 @@ boolean R_AddSingleSpriteDef(const char *sprname, spritedef_t *spritedef, UINT16
switch (sprtemp[frame].rotate) switch (sprtemp[frame].rotate)
{ {
case SRF_NONE: case SRF_NONE:
// no rotations were found for that frame at all // no rotations were found for that frame at all
I_Error("R_AddSingleSpriteDef: No patches found for %.4s frame %c", sprname, R_Frame2Char(frame)); I_Error("R_AddSingleSpriteDef: No patches found for %.4s frame %c", sprname, R_Frame2Char(frame));
break; break;
case SRF_SINGLE: case SRF_SINGLE:
// only the first rotation is needed // only the first rotation is needed
break; break;
case SRF_2D: // both Left and Right rotations case SRF_2D: // both Left and Right rotations
// we test to see whether the left and right slots are present // we test to see whether the left and right slots are present
if ((sprtemp[frame].lumppat[2] == LUMPERROR) || (sprtemp[frame].lumppat[6] == LUMPERROR)) if ((sprtemp[frame].lumppat[2] == LUMPERROR) || (sprtemp[frame].lumppat[6] == LUMPERROR))
I_Error("R_AddSingleSpriteDef: Sprite %s frame %c is missing rotations", I_Error("R_AddSingleSpriteDef: Sprite %s frame %c is missing rotations",
sprname, R_Frame2Char(frame)); sprname, R_Frame2Char(frame));
break; break;
default: default:
// must have all 8 frames // must have all 8 frames
for (rotation = 0; rotation < 8; rotation++) for (rotation = 0; rotation < 8; rotation++)
{ // we test the patch lump, or the id lump whatever
// we test the patch lump, or the id lump whatever // if it was not loaded the two are LUMPERROR
// if it was not loaded the two are LUMPERROR if (sprtemp[frame].lumppat[rotation] == LUMPERROR)
if (sprtemp[frame].lumppat[rotation] == LUMPERROR) I_Error("R_AddSingleSpriteDef: Sprite %.4s frame %c is missing rotations",
I_Error("R_AddSingleSpriteDef: Sprite %.4s frame %c is missing rotations", sprname, R_Frame2Char(frame));
sprname, R_Frame2Char(frame)); break;
}
break;
} }
} }
@@ -407,6 +394,7 @@ boolean R_AddSingleSpriteDef(const char *sprname, spritedef_t *spritedef, UINT16
if (spritedef->numframes && // has been allocated if (spritedef->numframes && // has been allocated
spritedef->numframes < maxframe) // more frames are defined ? spritedef->numframes < maxframe) // more frames are defined ?
{ {
Z_Free(spritedef->spriteframes); Z_Free(spritedef->spriteframes);
spritedef->spriteframes = NULL; spritedef->spriteframes = NULL;
} }
@@ -463,10 +451,12 @@ void R_AddSpriteDefs(UINT16 wadnum)
// //
for (i = 0; i < numsprites; i++) for (i = 0; i < numsprites; i++)
{ {
if (sprnames[i][4] && wadnum >= (UINT16)sprnames[i][4]) spritename = sprnames[i];
if (spritename[4] && wadnum >= (UINT16)spritename[4])
continue; continue;
if (R_AddSingleSpriteDef(sprnames[i], &sprites[i], wadnum, start, end)) if (R_AddSingleSpriteDef(spritename, &sprites[i], wadnum, start, end))
{ {
#ifdef HWRENDER #ifdef HWRENDER
if (rendermode == render_opengl) if (rendermode == render_opengl)
@@ -474,7 +464,9 @@ void R_AddSpriteDefs(UINT16 wadnum)
#endif #endif
// if a new sprite was added (not just replaced) // if a new sprite was added (not just replaced)
addsprites++; addsprites++;
CONS_Debug(DBG_SETUP, "sprite %s set in pwad %d\n", sprnames[i], wadnum); #ifndef ZDEBUG
CONS_Debug(DBG_SETUP, "sprite %s set in pwad %d\n", spritename, wadnum);
#endif
} }
} }
@@ -781,7 +773,6 @@ static void R_DrawVisSprite(vissprite_t *vis)
R_SetColumnFunc(BASEDRAWFUNC); // hack: this isn't resetting properly somewhere. R_SetColumnFunc(BASEDRAWFUNC); // hack: this isn't resetting properly somewhere.
dc.colormap = vis->colormap; dc.colormap = vis->colormap;
if ((vis->mobj->flags & MF_BOSS) && (vis->mobj->flags2 & MF2_FRET) && (leveltime & 1)) // Bosses "flash" if ((vis->mobj->flags & MF_BOSS) && (vis->mobj->flags2 & MF2_FRET) && (leveltime & 1)) // Bosses "flash"
{ {
R_SetColumnFunc(COLDRAWFUNC_TRANS); // translate certain pixels to white R_SetColumnFunc(COLDRAWFUNC_TRANS); // translate certain pixels to white
@@ -834,7 +825,6 @@ static void R_DrawVisSprite(vissprite_t *vis)
else else
dc.colormap = &vis->extra_colormap->colormap[dc.colormap - colormaps]; dc.colormap = &vis->extra_colormap->colormap[dc.colormap - colormaps];
} }
if (!dc.colormap) if (!dc.colormap)
dc.colormap = colormaps; dc.colormap = colormaps;
@@ -859,7 +849,6 @@ static void R_DrawVisSprite(vissprite_t *vis)
vis->xiscale = FixedDiv(vis->xiscale, this_scale); vis->xiscale = FixedDiv(vis->xiscale, this_scale);
vis->isScaled = true; vis->isScaled = true;
} }
dc.texturemid = FixedDiv(dc.texturemid, this_scale); dc.texturemid = FixedDiv(dc.texturemid, this_scale);
} }
@@ -1276,7 +1265,7 @@ static void R_ProjectSprite(mobj_t *thing)
#ifdef ROTSPRITE #ifdef ROTSPRITE
// determine here if sprite should rotate for optimization // determine here if sprite should rotate for optimization
const boolean sliprollrotate = (cv_sliptideroll.value && (thing->player && thing->player->sliproll)); const boolean sliprollrotate = (cv_sliptideroll.value && (thing->player && thing->player->sliproll));
const boolean shouldrotate = (interp.sloperoll || interp.slopepitch || interp.roll || interp.pitch || thing->rollangle || thing->temprollangle || sliprollrotate); const boolean shouldrotate = (interp.sloperoll || interp.slopepitch || interp.roll || interp.pitch || thing->rollangle || sliprollrotate);
#endif #endif
sprskin = K_GetMobjSkin(thing); sprskin = K_GetMobjSkin(thing);
@@ -1376,18 +1365,16 @@ static void R_ProjectSprite(mobj_t *thing)
#ifdef ROTSPRITE #ifdef ROTSPRITE
if (shouldrotate) if (shouldrotate)
{ {
const fixed_t thingrollangle = (thing->rollangle - thing->temprollangle);
if (papersprite) if (papersprite)
{ {
if (ang >= ANGLE_180) if (ang >= ANGLE_180)
{ {
// Makes Software act much more sane like OpenGL // Makes Software act much more sane like OpenGL
rollangle = InvAngle(thingrollangle); rollangle = InvAngle(thing->rollangle);
} }
else else
{ {
rollangle = thingrollangle; rollangle = thing->rollangle;
} }
} }
else else
@@ -1395,7 +1382,7 @@ static void R_ProjectSprite(mobj_t *thing)
// this is very messy, but it on-the-fly calculates rotations for all the // this is very messy, but it on-the-fly calculates rotations for all the
// pitch and roll variables // pitch and roll variables
pitchnroll = R_RotationAngle(ang, camang, &interp); pitchnroll = R_RotationAngle(ang, camang, &interp);
rollangle = thingrollangle; rollangle = thing->rollangle;
} }
if (rollangle || pitchnroll || sliprollrotate) if (rollangle || pitchnroll || sliprollrotate)
+128 -151
View File
@@ -477,11 +477,6 @@ void S_StartSoundAtVolume(const void *origin_p, sfxenum_t sfx_id, INT32 volume)
{ {
player_t *player = &players[displayplayers[i]]; player_t *player = &players[displayplayers[i]];
if (!player)
{
continue;
}
if (player->awayviewtics) if (player->awayviewtics)
{ {
listenmobj[i] = player->awayviewmobj; listenmobj[i] = player->awayviewmobj;
@@ -540,84 +535,79 @@ void S_StartSoundAtVolume(const void *origin_p, sfxenum_t sfx_id, INT32 volume)
i = 0; // sensible default i = 0; // sensible default
// Check to see if it is audible, and if not, modify the params
if (origin && !itsUs)
{ {
boolean audible = false; // Check to see if it is audible, and if not, modify the params
if (origin && !itsUs)
if (splitscreen > 0)
{ {
fixed_t recdist = INT32_MAX; boolean audible = false;
UINT8 j = 0; if (splitscreen > 0)
for (; j <= splitscreen; j++)
{ {
fixed_t thisdist = INT32_MAX; fixed_t recdist = INT32_MAX;
UINT8 j = 0;
if (!listenmobj[j]) for (; j <= splitscreen; j++)
{ {
continue; fixed_t thisdist = INT32_MAX;
if (!listenmobj[j])
{
continue;
}
thisdist = P_AproxDistance(listener[j].x - origin->x, listener[j].y - origin->y);
if (thisdist >= recdist)
{
continue;
}
recdist = thisdist;
i = j;
} }
}
thisdist = P_AproxDistance(listener[j].x - origin->x, listener[j].y - origin->y); if (listenmobj[i])
{
audible = S_AdjustSoundParams(listenmobj[i], origin, &volume, &sep, sfx);
}
if (thisdist >= recdist) if (!audible)
{ {
continue; return;
}
recdist = thisdist;
i = j;
} }
} }
if (listenmobj[i]) // This is supposed to handle the loading/caching.
{ // For some odd reason, the caching is done nearly
audible = S_AdjustSoundParams(listenmobj[i], origin, &volume, &sep, sfx); // each time the sound is needed?
}
if (!audible)
{
return;
}
}
// This is supposed to handle the loading/caching.
// For some odd reason, the caching is done nearly
// each time the sound is needed?
// cache data if necessary
// NOTE: set sfx->data NULL sfx->lump -1 to force a reload
if (!sfx->data)
{
sfx->data = I_GetSfx(sfx);
// cache data if necessary
// NOTE: set sfx->data NULL sfx->lump -1 to force a reload
if (!sfx->data) if (!sfx->data)
{ {
CONS_Alert(CONS_WARNING, "Tried to load invalid sfx_%s\n", sfx->name); sfx->data = I_GetSfx(sfx);
return; /* don't play it */
} }
// Avoid channel reverse if surround
if (reverse)
{
sep = (~sep) & 255;
}
// At this point it is determined that a sound can and should be played, so find a free channel to play it on
cnum = S_getChannel(origin, sfx);
if (cnum < 0)
{
return; // If there's no free channels, there won't be any for anymore players either
}
// Now that we know we are going to play a sound, fill out this info
channels[cnum].sfxinfo = sfx;
channels[cnum].origin = origin;
channels[cnum].volume = initial_volume;
channels[cnum].handle = I_StartSound(sfx_id, volume, sep, cnum);
} }
// Avoid channel reverse if surround
if (reverse)
{
sep = (~sep) & 255;
}
// At this point it is determined that a sound can and should be played, so find a free channel to play it on
cnum = S_getChannel(origin, sfx);
if (cnum < 0)
{
return; // If there's no free channels, there won't be any for anymore players either
}
// Now that we know we are going to play a sound, fill out this info
channels[cnum].sfxinfo = sfx;
channels[cnum].origin = origin;
channels[cnum].volume = initial_volume;
channels[cnum].handle = I_StartSound(sfx_id, volume, sep, cnum);
} }
void S_StartSound(const void *origin, sfxenum_t sfx_id) void S_StartSound(const void *origin, sfxenum_t sfx_id)
@@ -738,11 +728,6 @@ void S_UpdateSounds(void)
{ {
player_t *player = &players[displayplayers[i]]; player_t *player = &players[displayplayers[i]];
if (!player)
{
continue;
}
if (player->awayviewtics) if (player->awayviewtics)
{ {
listenmobj[i] = player->awayviewmobj; listenmobj[i] = player->awayviewmobj;
@@ -776,83 +761,84 @@ void S_UpdateSounds(void)
{ {
c = &channels[cnum]; c = &channels[cnum];
if (c->sfxinfo == NULL) if (c->sfxinfo)
continue;
// if channel is allocated but sound has stopped, free it
if (!I_SoundIsPlaying(c->handle))
{ {
S_StopChannel(cnum); if (I_SoundIsPlaying(c->handle))
continue;
}
if (c->origin == NULL)
continue;
// initialize parameters
volume = c->volume; // 8 bits internal volume precision
sep = NORM_SEP;
// check non-local sounds for distance clipping
// or modify their params
boolean itsUs = false;
for (i = splitscreen; i >= 0; i--)
{
if (camera[i].freecam)
continue;
if (c->origin != listenmobj[i])
continue;
itsUs = true;
}
if (itsUs == false)
{
const mobj_t *origin = c->origin;
i = 0;
if (splitscreen > 0)
{ {
fixed_t recdist = INT32_MAX; // initialize parameters
UINT8 j = 0; volume = c->volume; // 8 bits internal volume precision
sep = NORM_SEP;
for (; j <= splitscreen; j++) // check non-local sounds for distance clipping
// or modify their params
if (c->origin)
{ {
fixed_t thisdist = INT32_MAX; boolean itsUs = false;
if (!listenmobj[j]) for (i = splitscreen; i >= 0; i--)
{ {
continue; if (camera[i].freecam)
continue;
if (c->origin != listenmobj[i])
continue;
itsUs = true;
} }
thisdist = P_AproxDistance(listener[j].x - origin->x, listener[j].y - origin->y); if (itsUs == false)
if (thisdist >= recdist)
{ {
continue; const mobj_t *origin = c->origin;
}
recdist = thisdist; i = 0;
i = j;
if (splitscreen > 0)
{
fixed_t recdist = INT32_MAX;
UINT8 j = 0;
for (; j <= splitscreen; j++)
{
fixed_t thisdist = INT32_MAX;
if (!listenmobj[j])
{
continue;
}
thisdist = P_AproxDistance(listener[j].x - origin->x, listener[j].y - origin->y);
if (thisdist >= recdist)
{
continue;
}
recdist = thisdist;
i = j;
}
}
if (listenmobj[i])
{
audible = S_AdjustSoundParams(
listenmobj[i], c->origin,
&volume, &sep,
c->sfxinfo
);
}
if (audible)
I_UpdateSoundParams(c->handle, volume, sep);
else
S_StopChannel(cnum);
}
} }
} }
if (listenmobj[i])
{
audible = S_AdjustSoundParams(
listenmobj[i], c->origin,
&volume, &sep,
c->sfxinfo
);
}
if (audible)
I_UpdateSoundParams(c->handle, volume, sep);
else else
{
// if channel is allocated but sound has stopped, free it
S_StopChannel(cnum); S_StopChannel(cnum);
}
} }
} }
@@ -880,6 +866,7 @@ void S_ClearSfx(void)
static void S_StopChannel(INT32 cnum) static void S_StopChannel(INT32 cnum)
{ {
INT32 i;
channel_t *c = &channels[cnum]; channel_t *c = &channels[cnum];
if (c->sfxinfo) if (c->sfxinfo)
@@ -888,6 +875,12 @@ static void S_StopChannel(INT32 cnum)
if (I_SoundIsPlaying(c->handle)) if (I_SoundIsPlaying(c->handle))
I_StopSound(c->handle); I_StopSound(c->handle);
// check to see
// if other channels are playing the sound
for (i = 0; i < numofchannels; i++)
if (cnum != i && c->sfxinfo == channels[i].sfxinfo)
break;
c->sfxinfo = NULL; c->sfxinfo = NULL;
} }
@@ -937,7 +930,6 @@ static boolean S_AdjustSoundParams(const mobj_t *listener, const mobj_t *source,
listener_t listensource; listener_t listensource;
INT32 i; INT32 i;
// e6y
if (!listener) if (!listener)
return false; return false;
@@ -1054,14 +1046,12 @@ static boolean S_AdjustSoundParams(const mobj_t *listener, const mobj_t *source,
INT32 S_OriginPlaying(void *origin) INT32 S_OriginPlaying(void *origin)
{ {
INT32 cnum; INT32 cnum;
if (!origin) if (!origin)
return false; return false;
for (cnum = 0; cnum < numofchannels; cnum++) for (cnum = 0; cnum < numofchannels; cnum++)
if (channels[cnum].origin == origin) if (channels[cnum].origin == origin)
return 1; return 1;
return 0; return 0;
} }
@@ -1074,7 +1064,6 @@ INT32 S_IdPlaying(sfxenum_t id)
for (cnum = 0; cnum < numofchannels; cnum++) for (cnum = 0; cnum < numofchannels; cnum++)
if ((size_t)(channels[cnum].sfxinfo - S_sfx) == (size_t)id) if ((size_t)(channels[cnum].sfxinfo - S_sfx) == (size_t)id)
return 1; return 1;
return 0; return 0;
} }
@@ -1083,7 +1072,6 @@ INT32 S_IdPlaying(sfxenum_t id)
INT32 S_SoundPlaying(void *origin, sfxenum_t id) INT32 S_SoundPlaying(void *origin, sfxenum_t id)
{ {
INT32 cnum; INT32 cnum;
if (!origin) if (!origin)
return 0; return 0;
@@ -1093,7 +1081,6 @@ INT32 S_SoundPlaying(void *origin, sfxenum_t id)
&& (size_t)(channels[cnum].sfxinfo - S_sfx) == (size_t)id) && (size_t)(channels[cnum].sfxinfo - S_sfx) == (size_t)id)
return 1; return 1;
} }
return 0; return 0;
} }
@@ -1106,7 +1093,6 @@ static sfxenum_t newsounds[MAXNEWSOUNDS] = {0, 0, 0, 0, 0, 0, 0, 0, 0, 0};
void S_StartSoundName(void *mo, const char *soundname) void S_StartSoundName(void *mo, const char *soundname)
{ {
INT32 i, soundnum = 0; INT32 i, soundnum = 0;
// Search existing sounds... // Search existing sounds...
for (i = sfx_None + 1; i < NUMSFX; i++) for (i = sfx_None + 1; i < NUMSFX; i++)
{ {
@@ -2039,10 +2025,6 @@ static boolean S_SkipIntroMusic(void)
if (!cv_skipintromusic.value) if (!cv_skipintromusic.value)
return false; return false;
// dont skip if we disabled music, weird? but this would skip sounds that play on map start as well otherwise
if (music_disabled)
return false;
// check if menu music is playing, otherwise it may continue playing // check if menu music is playing, otherwise it may continue playing
if (fasticmp(music.name, "titles")) if (fasticmp(music.name, "titles"))
return false; return false;
@@ -2054,11 +2036,6 @@ static boolean S_SkipIntroMusic(void)
return false; return false;
} }
// without sound there wont be any intro playing
if (sound_disabled)
return true;
// yes i sometimes play with only music but no sound
return true; return true;
} }
+1 -1
View File
@@ -530,6 +530,6 @@ void SCR_DisplayLocalPing(void)
if (cv_showping.value == 1 || (cv_showping.value == 2 && ping > servermaxping)) // only show 2 (warning) if our ping is at a bad level if (cv_showping.value == 1 || (cv_showping.value == 2 && ping > servermaxping)) // only show 2 (warning) if our ping is at a bad level
{ {
INT32 dispy = (cv_ticrate.value == 1) ? 165 : ((cv_ticrate.value == 2 || cv_ticrate.value == 4) ? 172 : ((cv_ticrate.value == 3) ? 163 : 181)); // absolute buttpain INT32 dispy = (cv_ticrate.value == 1) ? 165 : ((cv_ticrate.value == 2 || cv_ticrate.value == 4) ? 172 : ((cv_ticrate.value == 3) ? 163 : 181)); // absolute buttpain
HU_drawLocalPlayerPing(308, dispy, pingflags); // consoleplayer's ping is everyone's ping in a splitnetgame :P HU_drawPlayerPing(308, dispy, consoleplayer, pingflags); // consoleplayer's ping is everyone's ping in a splitnetgame :P
} }
} }
+8 -4
View File
@@ -743,22 +743,26 @@ INT32 numcontrollers = 0;
// //
void I_JoyScale(void) void I_JoyScale(void)
{ {
JoyInfo[0].scale = DigitalGamepadStyle(0) ? 1 : cv_joyscale[0].value; Joystick[0].bGamepadStyle = cv_joyscale[0].value == 0;
JoyInfo[0].scale = Joystick[0].bGamepadStyle ? 1 : cv_joyscale[0].value;
} }
void I_JoyScale2(void) void I_JoyScale2(void)
{ {
JoyInfo[1].scale = DigitalGamepadStyle(1) ? 1 : cv_joyscale[1].value; Joystick[1].bGamepadStyle = cv_joyscale[1].value == 0;
JoyInfo[1].scale = Joystick[1].bGamepadStyle ? 1 : cv_joyscale[1].value;
} }
void I_JoyScale3(void) void I_JoyScale3(void)
{ {
JoyInfo[2].scale = DigitalGamepadStyle(2) ? 1 : cv_joyscale[2].value; Joystick[2].bGamepadStyle = cv_joyscale[2].value == 0;
JoyInfo[2].scale = Joystick[2].bGamepadStyle ? 1 : cv_joyscale[2].value;
} }
void I_JoyScale4(void) void I_JoyScale4(void)
{ {
JoyInfo[3].scale = DigitalGamepadStyle(3) ? 1 : cv_joyscale[3].value; Joystick[3].bGamepadStyle = cv_joyscale[3].value == 0;
JoyInfo[3].scale = Joystick[3].bGamepadStyle ? 1 : cv_joyscale[3].value;
} }
// Cheat to get the device index for a joystick handle // Cheat to get the device index for a joystick handle
+1 -4
View File
@@ -454,7 +454,7 @@ static INT32 SDLJoyAxis(const Sint16 axis, evtype_t which)
return 0; return 0;
} }
if (DigitalGamepadStyle(pid)) if (Joystick[pid].bGamepadStyle)
{ {
// gamepad control type, on or off, live or die // gamepad control type, on or off, live or die
if (raxis < -(JOYAXISRANGE/2)) if (raxis < -(JOYAXISRANGE/2))
@@ -1855,9 +1855,6 @@ void I_StartupGraphics(void)
{ {
word = strtok(line, " \n"); word = strtok(line, " \n");
if (!word)
continue;
if (rendermode == render_none) if (rendermode == render_none)
{ {
if (fasticmp(word, "software")) if (fasticmp(word, "software"))
Binary file not shown.
+2 -2
View File
@@ -945,7 +945,7 @@ UINT32 I_GetSongLength(void)
boolean I_SetSongLoopPoint(UINT32 looppoint) boolean I_SetSongLoopPoint(UINT32 looppoint)
{ {
if (!music || !is_looping) if (!music|| !is_looping)
return false; return false;
const musictype_t mustype = I_SongType(); const musictype_t mustype = I_SongType();
@@ -958,7 +958,7 @@ boolean I_SetSongLoopPoint(UINT32 looppoint)
if (length > 0) if (length > 0)
looppoint %= length; looppoint %= length;
loop_point = max((float)(looppoint / 1000.0L), 0.0f); loop_point = max((float)(looppoint / 1000.0L), 0);
return true; return true;
} }
+1 -2
View File
@@ -975,7 +975,7 @@ sfxinfo_t S_sfx[NUMSFX] =
char freeslotnames[sfx_freeslot0 + NUMSFXFREESLOTS + NUMSKINSFXSLOTS][7] = {}; char freeslotnames[sfx_freeslot0 + NUMSFXFREESLOTS + NUMSKINSFXSLOTS][7] = {};
// Prepare free sfx slots to add sfx at run time // Prepare free sfx slots to add sfx at run time
void S_InitRuntimeSounds(void) void S_InitRuntimeSounds (void)
{ {
sfxenum_t i; sfxenum_t i;
INT32 value; INT32 value;
@@ -1040,7 +1040,6 @@ sfxenum_t S_AddSoundFx(const char *name, boolean singular, INT32 flags, boolean
return i; return i;
} }
} }
I_Error("Out of Sound Freeslots while allocating \"%s\"\nLoad less addons to fix this.", name); I_Error("Out of Sound Freeslots while allocating \"%s\"\nLoad less addons to fix this.", name);
return 0; return 0;
} }
+4 -26
View File
@@ -423,9 +423,9 @@ static void ApplyPaletteDelta(const RGBA_t *pal_in, RGBA_t *pal_out, const INT16
INT16 r = (INT16)pal_in[i].s.red + pal_delta[i][0]; INT16 r = (INT16)pal_in[i].s.red + pal_delta[i][0];
INT16 g = (INT16)pal_in[i].s.green + pal_delta[i][1]; INT16 g = (INT16)pal_in[i].s.green + pal_delta[i][1];
INT16 b = (INT16)pal_in[i].s.blue + pal_delta[i][2]; INT16 b = (INT16)pal_in[i].s.blue + pal_delta[i][2];
pal_out[i].s.red = (UINT8)CLAMP(r, 0, 255); pal_out[i].s.red = (UINT8)CLAMP(r, 0 , 255);
pal_out[i].s.green = (UINT8)CLAMP(g, 0, 255); pal_out[i].s.green = (UINT8)CLAMP(g, 0 , 255);
pal_out[i].s.blue = (UINT8)CLAMP(b, 0, 255); pal_out[i].s.blue = (UINT8)CLAMP(b, 0 , 255);
pal_out[i].s.alpha = 0xFF; // pal_in[i].s.alpha pal_out[i].s.alpha = 0xFF; // pal_in[i].s.alpha
} }
} }
@@ -2203,7 +2203,6 @@ void V_DrawString(INT32 x, INT32 y, INT32 option, const char *string)
{ {
if (!*ch) if (!*ch)
break; break;
if (*ch & 0x80) //color parsing -x 2.16.09 if (*ch & 0x80) //color parsing -x 2.16.09
{ {
// manually set flags override color codes // manually set flags override color codes
@@ -2214,7 +2213,6 @@ void V_DrawString(INT32 x, INT32 y, INT32 option, const char *string)
} }
continue; continue;
} }
if (*ch == '\n') if (*ch == '\n')
{ {
cx = x; cx = x;
@@ -2249,7 +2247,6 @@ void V_DrawString(INT32 x, INT32 y, INT32 option, const char *string)
if (cx > scrwidth) if (cx > scrwidth)
break; break;
if (cx+left + w < 0) //left boundary check if (cx+left + w < 0) //left boundary check
{ {
cx += w; cx += w;
@@ -2307,7 +2304,6 @@ void V_DrawKartString(INT32 x, INT32 y, INT32 option, const char *string)
{ {
if (!*ch) if (!*ch)
break; break;
if (*ch & 0x80) //color parsing -x 2.16.09 if (*ch & 0x80) //color parsing -x 2.16.09
{ {
// manually set flags override color codes // manually set flags override color codes
@@ -2318,7 +2314,6 @@ void V_DrawKartString(INT32 x, INT32 y, INT32 option, const char *string)
} }
continue; continue;
} }
if (*ch == '\n') if (*ch == '\n')
{ {
cx = x; cx = x;
@@ -2353,7 +2348,6 @@ void V_DrawKartString(INT32 x, INT32 y, INT32 option, const char *string)
if (cx > scrwidth) if (cx > scrwidth)
break; break;
if (cx+left + w < 0) //left boundary check if (cx+left + w < 0) //left boundary check
{ {
cx += w; cx += w;
@@ -2428,7 +2422,6 @@ void V_DrawSmallString(INT32 x, INT32 y, INT32 option, const char *string)
{ {
if (!*ch) if (!*ch)
break; break;
if (*ch & 0x80) //color parsing -x 2.16.09 if (*ch & 0x80) //color parsing -x 2.16.09
{ {
// manually set flags override color codes // manually set flags override color codes
@@ -2439,7 +2432,6 @@ void V_DrawSmallString(INT32 x, INT32 y, INT32 option, const char *string)
} }
continue; continue;
} }
if (*ch == '\n') if (*ch == '\n')
{ {
cx = x; cx = x;
@@ -2548,7 +2540,6 @@ void V_DrawThinString(INT32 x, INT32 y, INT32 option, const char *string)
{ {
if (!*ch) if (!*ch)
break; break;
if (*ch & 0x80) //color parsing -x 2.16.09 if (*ch & 0x80) //color parsing -x 2.16.09
{ {
// manually set flags override color codes // manually set flags override color codes
@@ -2559,7 +2550,6 @@ void V_DrawThinString(INT32 x, INT32 y, INT32 option, const char *string)
} }
continue; continue;
} }
if (*ch == '\n') if (*ch == '\n')
{ {
cx = x; cx = x;
@@ -2718,7 +2708,6 @@ void V_DrawSmallStringAtFixed(fixed_t x, fixed_t y, INT32 option, const char *st
INT32 charflags = 0; INT32 charflags = 0;
const UINT8 *colormap = NULL; const UINT8 *colormap = NULL;
INT32 spacewidth = 2, charwidth = 0; INT32 spacewidth = 2, charwidth = 0;
INT32 lowercase = (option & V_ALLOWLOWERCASE); INT32 lowercase = (option & V_ALLOWLOWERCASE);
option &= ~V_FLIP; // which is also shared with V_ALLOWLOWERCASE... option &= ~V_FLIP; // which is also shared with V_ALLOWLOWERCASE...
@@ -2739,7 +2728,6 @@ void V_DrawSmallStringAtFixed(fixed_t x, fixed_t y, INT32 option, const char *st
scrwidth *= vid.dup; scrwidth *= vid.dup;
charflags = (option & V_CHARCOLORMASK); charflags = (option & V_CHARCOLORMASK);
colormap = V_GetStringColormap(charflags);
switch (option & V_SPACINGMASK) switch (option & V_SPACINGMASK)
{ {
@@ -2764,11 +2752,7 @@ void V_DrawSmallStringAtFixed(fixed_t x, fixed_t y, INT32 option, const char *st
{ {
// manually set flags override color codes // manually set flags override color codes
if (!(option & V_CHARCOLORMASK)) if (!(option & V_CHARCOLORMASK))
{
charflags = ((*ch & 0x7f) << V_CHARCOLORSHIFT) & V_CHARCOLORMASK; charflags = ((*ch & 0x7f) << V_CHARCOLORSHIFT) & V_CHARCOLORMASK;
colormap = V_GetStringColormap(charflags);
}
continue; continue;
} }
@@ -2812,6 +2796,7 @@ void V_DrawSmallStringAtFixed(fixed_t x, fixed_t y, INT32 option, const char *st
continue; continue;
} }
colormap = V_GetStringColormap(charflags);
V_DrawFixedPatch(cx + (center<<FRACBITS), cy, FRACUNIT/2, option, hu_font[c], colormap); V_DrawFixedPatch(cx + (center<<FRACBITS), cy, FRACUNIT/2, option, hu_font[c], colormap);
cx += w<<FRACBITS; cx += w<<FRACBITS;
} }
@@ -2823,13 +2808,6 @@ void V_DrawCenteredSmallStringAtFixed(fixed_t x, fixed_t y, INT32 option, const
V_DrawSmallStringAtFixed(x, y, option, string); V_DrawSmallStringAtFixed(x, y, option, string);
} }
void V_DrawRightAlignedSmallStringAtFixed(fixed_t x, fixed_t y, INT32 option, const char *string)
{
x -= V_SmallStringWidth(string, option)<<FRACBITS;
V_DrawSmallStringAtFixed(x, y, option, string);
}
// Draws a thin string at a fixed_t location.
void V_DrawThinStringAtFixed(fixed_t x, fixed_t y, INT32 option, const char *string) void V_DrawThinStringAtFixed(fixed_t x, fixed_t y, INT32 option, const char *string)
{ {
fixed_t cx = x, cy = y; fixed_t cx = x, cy = y;
-1
View File
@@ -252,7 +252,6 @@ void V_DrawStringAtFixed(fixed_t x, fixed_t y, INT32 option, const char *string)
void V_DrawSmallStringAtFixed(fixed_t x, fixed_t y, INT32 option, const char *string); void V_DrawSmallStringAtFixed(fixed_t x, fixed_t y, INT32 option, const char *string);
void V_DrawCenteredSmallStringAtFixed(fixed_t x, fixed_t y, INT32 option, const char *string); void V_DrawCenteredSmallStringAtFixed(fixed_t x, fixed_t y, INT32 option, const char *string);
void V_DrawRightAlignedSmallStringAtFixed(fixed_t x, fixed_t y, INT32 option, const char *string);
void V_DrawThinStringAtFixed(fixed_t x, fixed_t y, INT32 option, const char *string); void V_DrawThinStringAtFixed(fixed_t x, fixed_t y, INT32 option, const char *string);
+28 -85
View File
@@ -123,9 +123,6 @@ static const char pat_end[] = {0x50, 0x4b, 0x05, 0x06, 0x00};
UINT16 numwadfiles = 0; // number of active wadfiles UINT16 numwadfiles = 0; // number of active wadfiles
wadfile_t *wadfiles[MAX_WADFILES] = {}; // 0 to numwadfiles-1 are valid wadfile_t *wadfiles[MAX_WADFILES] = {}; // 0 to numwadfiles-1 are valid
// use strnlen as some lump names may not be null terminated
#define CHECKMAPMARKER(name) (memcmp(name, "MAP", 3) == 0 && strnlen(name, 8) == 5)
// W_Shutdown // W_Shutdown
// Closes all of the WAD files before quitting // Closes all of the WAD files before quitting
// If not done on a Mac then open wad files // If not done on a Mac then open wad files
@@ -2395,7 +2392,7 @@ static int W_NameStartsWith(const char *name, lumpchecklist_t *checklist)
} }
// Checks if file contains at least one lump which name starts with one of strings in checklist // Checks if file contains at least one lump which name starts with one of strings in checklist
static int W_CheckWADContainsEx(FILE *fp, lumpchecklist_t *checklist, boolean checkmap) static int W_CheckWADContains(FILE *fp, lumpchecklist_t *checklist)
{ {
size_t i, j; size_t i, j;
// if we're here it's a WAD file // if we're here it's a WAD file
@@ -2436,29 +2433,13 @@ static int W_CheckWADContainsEx(FILE *fp, lumpchecklist_t *checklist, boolean ch
if (!strncmp(lumpinfo.name, sprnames[j], 4)) // Sprites if (!strncmp(lumpinfo.name, sprnames[j], 4)) // Sprites
continue; continue;
if (checkmap) if (W_NameStartsWith(lumpinfo.name, checklist))
{
if (CHECKMAPMARKER(lumpinfo.name))
return true;
}
else if (W_NameStartsWith(lumpinfo.name, checklist))
return true; return true;
} }
return false; return false;
} }
static int W_CheckWADContains(FILE *fp, lumpchecklist_t *checklist) static int W_CheckPK3Contains(FILE *fp, lumpchecklist_t *checklist)
{
return W_CheckWADContainsEx(fp, checklist, false);
}
static int W_CheckWADContainsMap(FILE *fp)
{
return W_CheckWADContainsEx(fp, NULL, true);
}
static int W_CheckPK3ContainsEx(FILE *fp, lumpchecklist_t *checklist, boolean checkmap)
{ {
zend_t zend; zend_t zend;
zlentry_t zlentry; zlentry_t zlentry;
@@ -2532,23 +2513,13 @@ static int W_CheckPK3ContainsEx(FILE *fp, lumpchecklist_t *checklist, boolean ch
memset(lumpname, '\0', 9); // Making sure they're initialized to 0. Is it necessary? memset(lumpname, '\0', 9); // Making sure they're initialized to 0. Is it necessary?
strncpy(lumpname, trimname, min(8, dotpos - trimname)); strncpy(lumpname, trimname, min(8, dotpos - trimname));
if (checkmap) if (W_NameStartsWith(lumpname, checklist))
{
if (CHECKMAPMARKER(lumpname))
return true;
}
else if (W_NameStartsWith(lumpname, checklist))
{ {
return true; return true;
} }
} }
if (checkmap) if (W_NameStartsWith(fullname, checklist))
{
if (CHECKMAPMARKER(fullname))
return true;
}
else if (W_NameStartsWith(fullname, checklist))
{ {
return true; return true;
} }
@@ -2590,24 +2561,12 @@ static int W_CheckPK3ContainsEx(FILE *fp, lumpchecklist_t *checklist, boolean ch
} }
} }
static int W_CheckPK3Contains(FILE *fp, lumpchecklist_t *checklist) static int W_CheckFileContains(const char *filename, lumpchecklist_t *checklist)
{
return W_CheckPK3ContainsEx(fp, checklist, false);
}
static int W_CheckPK3ContainsMap(FILE *fp)
{
return W_CheckPK3ContainsEx(fp, NULL, true);
}
static int W_CheckFileContainsEx(const char *filename, lumpchecklist_t *checklist, boolean checkmap)
{ {
FILE *handle; FILE *handle;
int contains = false; int contains = false;
// if we just check for maps this will be NULL if (!checklist)
// hacky but i dont care
if (!checklist && !checkmap)
I_Error("No checklist for %s\n", filename); I_Error("No checklist for %s\n", filename);
// open wad file // open wad file
@@ -2618,41 +2577,27 @@ static int W_CheckFileContainsEx(const char *filename, lumpchecklist_t *checklis
if (type == RET_PK3) if (type == RET_PK3)
{ {
if (checkmap) contains = W_CheckPK3Contains(handle, checklist);
contains = W_CheckPK3ContainsMap(handle);
else
contains = W_CheckPK3Contains(handle, checklist);
} }
else if (type == RET_WAD) else if (type == RET_WAD)
{ {
if (checkmap) contains = W_CheckWADContains(handle, checklist);
contains = W_CheckWADContainsMap(handle);
else
contains = W_CheckWADContains(handle, checklist);
} }
fclose(handle); fclose(handle);
return contains; return contains;
} }
static int W_CheckFileContains(const char *filename, lumpchecklist_t *checklist)
{
return W_CheckFileContainsEx(filename, checklist, false);
}
static int W_CheckFileContainsMap(const char *filename)
{
return W_CheckFileContainsEx(filename, NULL, true);
}
// kinda stupid but we cant just check for any lump containing "MAP"
// we have to explicitly check if its MAP and 5 characters long
// the more correct way would be checking inside wad files nested within pk3´s
// and check the presence of actual map data like SSECTORS or something
// but man i cannot be assed to rework shit for that
int W_CheckAutoLoadContainsMap(const char *filename) int W_CheckAutoLoadContainsMap(const char *filename)
{ {
return W_CheckFileContainsMap(filename); // for now this checks for map marker
static lumpchecklist_t autoloadblacklist[] =
{
{"MAP", 3},
{NULL, 0},
};
return W_CheckFileContains(filename, autoloadblacklist);
} }
int W_CheckPostLoadList(const char *filename) int W_CheckPostLoadList(const char *filename)
@@ -2731,9 +2676,8 @@ virtres_t* vres_GetMap(lumpnum_t lumpnum)
vlumps[i].size = vsizecache[realentry]; vlumps[i].size = vsizecache[realentry];
const char *name = (fileinfo + realentry)->name; const char *name = (fileinfo + realentry)->name;
I_Assert(name != NULL);
if (CHECKMAPMARKER(name)) if (strnlen(name, 8) == 5 && memcmp(name, "MAP", 3) == 0)
{ {
numlumps--; // We skip map marker, so 1 of entries becomes empty numlumps--; // We skip map marker, so 1 of entries becomes empty
continue; // This will skip i++ so we will write to same entry continue; // This will skip i++ so we will write to same entry
@@ -2742,7 +2686,9 @@ virtres_t* vres_GetMap(lumpnum_t lumpnum)
// Play it safe with the name in this case. // Play it safe with the name in this case.
memcpy(vlumps[i].name, name, 8); memcpy(vlumps[i].name, name, 8);
vlumps[i].name[8] = '\0'; vlumps[i].name[8] = '\0';
vlumps[i].data = (UINT8 *)(Z_Malloc(vlumps[i].size, PU_LEVEL, NULL)); // This is memory inefficient, sorry about that. vlumps[i].data = (UINT8 *)(
Z_Malloc(vlumps[i].size, PU_LEVEL, NULL) // This is memory inefficient, sorry about that.
);
memcpy(vlumps[i].data, wadData + LONG((fileinfo + realentry)->filepos), vlumps[i].size); memcpy(vlumps[i].data, wadData + LONG((fileinfo + realentry)->filepos), vlumps[i].size);
i++; i++;
} }
@@ -2752,19 +2698,15 @@ virtres_t* vres_GetMap(lumpnum_t lumpnum)
} }
else else
{ {
// Count number of lumps until the end of resource OR up until next 0-length lump OR up until next "MAPXX" lump. // Count number of lumps until the end of resource OR up until next "MAPXX" lump.
lumpnum_t lumppos = lumpnum + 1; lumpnum_t lumppos = lumpnum + 1;
for (i = LUMPNUM(lumppos); i < wadfiles[WADFILENUM(lumpnum)]->numlumps; i++, lumppos++, numlumps++) for (i = LUMPNUM(lumppos); i < wadfiles[WADFILENUM(lumpnum)]->numlumps; i++, lumppos++, numlumps++)
{ {
if (W_LumpLength(lumppos) == 0)
{
break;
}
const char *name = W_CheckNameForNum(lumppos); const char *name = W_CheckNameForNum(lumppos);
I_Assert(name != NULL); if (name == NULL)
continue;
if (CHECKMAPMARKER(name)) if (memcmp(name, "MAP", 3) == 0 || W_LumpLength(lumppos) == 0)
{ {
break; break;
} }
@@ -2779,9 +2721,10 @@ virtres_t* vres_GetMap(lumpnum_t lumpnum)
{ {
// Check if it is map marker. It is not always first lump sadly, so we need to expect it anywhere // Check if it is map marker. It is not always first lump sadly, so we need to expect it anywhere
const char *name = W_CheckNameForNum(lumpnum); const char *name = W_CheckNameForNum(lumpnum);
I_Assert(name != NULL); if (name == NULL)
continue;
if (CHECKMAPMARKER(name)) if (strlen(name) == 5 && memcmp(name, "MAP", 3) == 0)
{ {
--i; // Decrement so on next iteration we write on same i, so we don't leave corrupted vlumps entry --i; // Decrement so on next iteration we write on same i, so we don't leave corrupted vlumps entry
numlumps--; // Just so we don't try to access the leftover vlumps entry numlumps--; // Just so we don't try to access the leftover vlumps entry
+1 -1
View File
@@ -586,7 +586,7 @@ void Y_Ticker(void)
if (data.rankingsmode && intertic > sorttic+16+(2*TICRATE)) if (data.rankingsmode && intertic > sorttic+16+(2*TICRATE))
{ {
INT32 q = 0, r = 0; INT32 q=0,r=0;
boolean kaching = true; boolean kaching = true;
for (q = 0; q < data.numplayers; q++) for (q = 0; q < data.numplayers; q++)