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
69 changed files with 1090 additions and 1519 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 -2
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
) )
@@ -518,7 +518,7 @@ if(${SRB2_CONFIG_HWRENDER})
${CMAKE_CURRENT_SOURCE_DIR}/hardware/hw_batching.c ${CMAKE_CURRENT_SOURCE_DIR}/hardware/hw_batching.c
${CMAKE_CURRENT_SOURCE_DIR}/hardware/hw_shaders.c ${CMAKE_CURRENT_SOURCE_DIR}/hardware/hw_shaders.c
${CMAKE_CURRENT_SOURCE_DIR}/hardware/hw_bsp.c ${CMAKE_CURRENT_SOURCE_DIR}/hardware/hw_bsp.c
${CMAKE_CURRENT_SOURCE_DIR}/hardware/hw_cache.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
+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)))
+5 -1
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_iswhite(x) test2bits((x)->tsv.marked, WHITE0BIT, WHITE1BIT)
#define luaS_fix(s) l_setbit((s)->tsv.marked, FIXEDBIT) #define luaS_fix(s) l_setbit((s)->tsv.marked, FIXEDBIT)
LUAI_FUNC void luaS_resize (lua_State *L, int newsize); LUAI_FUNC void luaS_resize (lua_State *L, int newsize);
LUAI_FUNC void luaS_clearcache (global_State *g);
LUAI_FUNC void luaS_init (lua_State *L);
LUAI_FUNC Udata *luaS_newudata (lua_State *L, size_t s, Table *e); LUAI_FUNC Udata *luaS_newudata (lua_State *L, size_t s, Table *e);
LUAI_FUNC TString *luaS_newlstr (lua_State *L, const char *str, size_t l); LUAI_FUNC TString *luaS_newlstr (lua_State *L, const char *str, size_t l);
LUAI_FUNC TString *luaS_new (lua_State *L, const char *str);
#endif #endif
+50 -22
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);
TValue *rc = RKC(i);
setobjs2s(L, ra + 1, rb); setobjs2s(L, ra + 1, rb);
Protect(luaV_gettable(L, rb, RKC(i), ra)); gettableProtected(L, rb, rc, ra);
continue; continue;
} }
case OP_ADD: { case OP_ADD: {
+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);
+7 -23
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,8 +1635,9 @@ 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; i = con_cy - con_scrollup;
// skip the last empty line due to the cursor being at the start of a new line // skip the last empty line due to the cursor being at the start of a new line
@@ -1659,8 +1645,7 @@ static void CON_DrawConsole(void)
i -= (con_curlines - minheight) / charheight; i -= (con_curlines - minheight) / charheight;
if (rendermode == render_none) if (rendermode == render_none) return;
return;
for (y = (con_curlines-minheight) % charheight; y <= con_curlines-minheight; y += charheight, i++) for (y = (con_curlines-minheight) % charheight; y <= con_curlines-minheight; y += charheight, i++)
{ {
@@ -1694,10 +1679,9 @@ static void CON_DrawConsole(void)
V_DrawCharacter(x, y, (INT32)(*p) | charflags | cv_constextsize.value | V_NOSCALESTART, !cv_allcaps.value); 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();
} }
+8 -17
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);
@@ -2858,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();
@@ -3497,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);
@@ -4449,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();
@@ -6986,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;
@@ -7050,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);
+11 -10
View File
@@ -154,7 +154,7 @@ boolean music_disabled = false;
INT32 debugload = 0; INT32 debugload = 0;
#endif #endif
char savegamename[256] = {}; char savegamename[256];
char srb2home[256] = "."; char srb2home[256] = ".";
char srb2path[256] = "."; char srb2path[256] = ".";
@@ -726,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();
@@ -1353,7 +1356,7 @@ static void IdentifyVersion(void)
// //
// search for maps // search for maps
// //
static void D_CheckMapReplacements(boolean checkreplaced) static void D_CheckMaps(boolean checkreplaced)
{ {
INT32 i; INT32 i;
char *name; char *name;
@@ -1829,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);
if (startuppwadcount > 0)
{
CONS_Printf("W_InitMultipleFiles(): Adding extra PWADs.\n");
W_InitMultipleFiles(startuppwads, startuppwadcount, true); W_InitMultipleFiles(startuppwads, startuppwadcount, true);
// Only search for pwad maps if we actually have a pwad added // Only search for pwad maps if we actually have a pwad added
D_CheckMapReplacements(true); if (startuppwadcount > 0)
{
D_CleanFile(startuppwads, startuppwadcount); D_CheckMaps(true);
} }
D_CleanFile(startuppwads, startuppwadcount);
startuppwadcount = 0; startuppwadcount = 0;
cht_Init(); cht_Init();
-19
View File
@@ -150,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);
@@ -646,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);
@@ -4593,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
// ========================================================================= // =========================================================================
+4
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
+6 -20
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;
@@ -262,7 +260,6 @@ 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,9 +280,7 @@ 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);
@@ -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;
} }
@@ -565,20 +557,16 @@ 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"); CONS_Debug(DBG_NETPLAY, "already loaded\n");
fileneeded[i].status = FS_OPEN; fileneeded[i].status = FS_OPEN;
return 4; return 4;
} }
} }
}
fileneeded[i].status = findfile(fileneeded[i].filename, fileneeded[i].md5sum, true); fileneeded[i].status = findfile(fileneeded[i].filename, fileneeded[i].md5sum, true);
CONS_Debug(DBG_NETPLAY, "found %d\n", fileneeded[i].status); CONS_Debug(DBG_NETPLAY, "found %d\n", fileneeded[i].status);
@@ -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))
+9 -48
View File
@@ -339,10 +339,8 @@ static void readfreeslots(MYFILE *f)
{ {
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;
@@ -353,16 +351,13 @@ 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));
@@ -372,7 +367,6 @@ static void readfreeslots(MYFILE *f)
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,9 +374,7 @@ 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));
@@ -392,7 +384,6 @@ static void readfreeslots(MYFILE *f)
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"))
@@ -8243,7 +8207,6 @@ static UINT16 get_mus(const char *word, UINT8 dehacked_mode)
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;
@@ -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);
@@ -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,6 +8678,7 @@ 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) static int lua_enumlib_mus_get(lua_State *L)
{ {
const char *name = strchr(lua_tostring(L, 1), '_') + 1; const char *name = strchr(lua_tostring(L, 1), '_') + 1;
+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.
// //
+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++);
+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 -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;
} }
+313 -137
View File
@@ -1078,16 +1078,16 @@ static void HWR_SplitWall(sector_t *sector, FOutVector *wallVerts, INT32 texnum,
{ {
bheight = FixedToFloat(P_GetFFloorBottomZAt(list[i].caster, v1x, v1y)); bheight = FixedToFloat(P_GetFFloorBottomZAt(list[i].caster, v1x, v1y));
endbheight = FixedToFloat(P_GetFFloorBottomZAt(list[i].caster, v2x, v2y)); endbheight = FixedToFloat(P_GetFFloorBottomZAt(list[i].caster, v2x, v2y));
}
if (endheight >= endtop && height >= top) if (endheight >= endtop && height >= top)
{ {
if (top > bheight) if (solid && top > bheight)
top = bheight; top = bheight;
if (endtop > endbheight) if (solid && endtop > endbheight)
endtop = endbheight; endtop = endbheight;
} }
}
if (i + 1 < sector->numlights) if (i + 1 < sector->numlights)
{ {
@@ -1167,6 +1167,7 @@ static void HWR_SplitWall(sector_t *sector, FOutVector *wallVerts, INT32 texnum,
static FOutVector* skyWallVertexArray = NULL; static FOutVector* skyWallVertexArray = NULL;
static int skyWallVertexArraySize = 0; static int skyWallVertexArraySize = 0;
static int skyWallVertexArrayAllocSize = 65536;// what a mouthful
static boolean gl_collect_skywalls = false; static boolean gl_collect_skywalls = false;
@@ -1177,14 +1178,13 @@ static void HWR_SkyWallList_Clear(void)
static void HWR_SkyWallList_Add(FOutVector *wallVerts) static void HWR_SkyWallList_Add(FOutVector *wallVerts)
{ {
static int skyWallVertexArrayAllocSize = 65536; // what a mouthful
if (!skyWallVertexArray) if (!skyWallVertexArray)
{ {
// array has not been allocated yet. allocate it now // array has not been allocated yet. allocate it now
skyWallVertexArray = static_cast<FOutVector*>(Z_Malloc(sizeof(FOutVector) * 4 * skyWallVertexArrayAllocSize, PU_STATIC, NULL)); skyWallVertexArray = static_cast<FOutVector*>(Z_Malloc(sizeof(FOutVector) * 4 * skyWallVertexArrayAllocSize, PU_STATIC, NULL));
} }
else if (skyWallVertexArraySize >= skyWallVertexArrayAllocSize)
if (skyWallVertexArraySize == skyWallVertexArrayAllocSize)
{ {
// allocated array got full, allocate more space // allocated array got full, allocate more space
skyWallVertexArrayAllocSize *= 2; skyWallVertexArrayAllocSize *= 2;
@@ -1222,7 +1222,7 @@ static void HWR_DrawSkyWall(FOutVector *wallVerts, FSurfaceInfo *Surf)
wallVerts[0].s = wallVerts[3].s = 0; wallVerts[0].s = wallVerts[3].s = 0;
wallVerts[2].s = wallVerts[1].s = 0; wallVerts[2].s = wallVerts[1].s = 0;
if (gl_collect_skywalls) if (UNLIKELY(gl_collect_skywalls))
{ {
HWR_SkyWallList_Add(wallVerts); HWR_SkyWallList_Add(wallVerts);
} }
@@ -1231,7 +1231,6 @@ static void HWR_DrawSkyWall(FOutVector *wallVerts, FSurfaceInfo *Surf)
HWR_SetCurrentTexture(NULL); HWR_SetCurrentTexture(NULL);
HWR_ProjectWall(wallVerts, Surf, PF_Invisible|PF_NoTexture|PF_Skydecal, 255, NULL); HWR_ProjectWall(wallVerts, Surf, PF_Invisible|PF_NoTexture|PF_Skydecal, 255, NULL);
} }
// PF_Invisible so it's not drawn into the colour buffer // PF_Invisible so it's not drawn into the colour buffer
// PF_NoTexture for no texture // PF_NoTexture for no texture
// PF_Occlude is set in HWR_ProjectWall to draw into the depth buffer // PF_Occlude is set in HWR_ProjectWall to draw into the depth buffer
@@ -1403,12 +1402,11 @@ void HWR_ProcessSeg(void) // Sort of like GLWall::Process in GZDoom
// Sky Ceilings // Sky Ceilings
wallVerts[3].y = wallVerts[2].y = FLOATMAX; wallVerts[3].y = wallVerts[2].y = FLOATMAX;
auto draw_sky_walls = [] auto draw_sky_walls = [&](int vert1, int vert2, fixed_t world, fixed_t worldslope)
(int vert1, int vert2, fixed_t world, fixed_t worldslope, auto& wwallVerts, auto& sSurf) FUNCINLINE
{ {
wwallVerts[vert1].y = FixedToFloat(world); wallVerts[vert1].y = FixedToFloat(world);
wwallVerts[vert2].y = FixedToFloat(worldslope); wallVerts[vert2].y = FixedToFloat(worldslope);
HWR_DrawSkyWall(wwallVerts, &sSurf); HWR_DrawSkyWall(wallVerts, &Surf);
}; };
if (gl_frontsector->ceilingpic == skyflatnum) if (gl_frontsector->ceilingpic == skyflatnum)
@@ -1421,7 +1419,7 @@ void HWR_ProcessSeg(void) // Sort of like GLWall::Process in GZDoom
&& (worldhigh != worldtop || worldhighslope != worldtopslope)) && (worldhigh != worldtop || worldhighslope != worldtopslope))
// Removing the second line above will render more rarely visible skywalls. Example: Cave garden ceiling in Dark race // Removing the second line above will render more rarely visible skywalls. Example: Cave garden ceiling in Dark race
{ {
draw_sky_walls(0, 1, worldhigh, worldhighslope, wallVerts, Surf); draw_sky_walls(0, 1, worldhigh, worldhighslope);
} }
// hack to allow height changes in outdoor areas // hack to allow height changes in outdoor areas
@@ -1432,13 +1430,13 @@ void HWR_ProcessSeg(void) // Sort of like GLWall::Process in GZDoom
else else
{ {
// Only the frontsector is sky, just draw a skywall from the front ceiling // Only the frontsector is sky, just draw a skywall from the front ceiling
draw_sky_walls(0, 1, worldtop, worldtopslope, wallVerts, Surf); draw_sky_walls(0, 1, worldtop, worldtopslope);
} }
} }
else if (gl_backsector->ceilingpic == skyflatnum) else if (gl_backsector->ceilingpic == skyflatnum)
{ {
// Only the backsector is sky, just draw a skywall from the front ceiling // Only the backsector is sky, just draw a skywall from the front ceiling
draw_sky_walls(0, 1, worldtop, worldtopslope, wallVerts, Surf); draw_sky_walls(0, 1, worldtop, worldtopslope);
} }
// Sky Floors // Sky Floors
@@ -1456,19 +1454,19 @@ void HWR_ProcessSeg(void) // Sort of like GLWall::Process in GZDoom
// Removing the second line above will render more rarely visible skywalls. Example: Cave garden ceiling in Dark race // Removing the second line above will render more rarely visible skywalls. Example: Cave garden ceiling in Dark race
&& !(gl_sidedef->bottomtexture)) && !(gl_sidedef->bottomtexture))
{ {
draw_sky_walls(3, 2, worldlow, worldlowslope, wallVerts, Surf); draw_sky_walls(3, 2, worldlow, worldlowslope);
} }
} }
else else
{ {
// Only the backsector has sky, just draw a skywall from the back floor // Only the backsector has sky, just draw a skywall from the back floor
draw_sky_walls(3, 2, worldbottom, worldbottomslope, wallVerts, Surf); draw_sky_walls(3, 2, worldbottom, worldbottomslope);
} }
} }
else if ((gl_backsector->floorpic == skyflatnum) && !(gl_sidedef->bottomtexture)) else if ((gl_backsector->floorpic == skyflatnum) && !(gl_sidedef->bottomtexture))
{ {
// Only the backsector has sky, just draw a skywall from the back floor if there's no bottomtexture // Only the backsector has sky, just draw a skywall from the back floor if there's no bottomtexture
draw_sky_walls(3, 2, worldlow, worldlowslope, wallVerts, Surf); draw_sky_walls(3, 2, worldlow, worldlowslope);
} }
} }
@@ -1856,7 +1854,6 @@ void HWR_ProcessSeg(void) // Sort of like GLWall::Process in GZDoom
HWR_DrawSkyWall(wallVerts, &Surf); HWR_DrawSkyWall(wallVerts, &Surf);
} }
if (gl_frontsector->floorpic == skyflatnum) if (gl_frontsector->floorpic == skyflatnum)
{ {
wallVerts[3].y = FixedToFloat(worldbottom); wallVerts[3].y = FixedToFloat(worldbottom);
@@ -1871,38 +1868,28 @@ void HWR_ProcessSeg(void) // Sort of like GLWall::Process in GZDoom
//Hurdler: 3d-floors test //Hurdler: 3d-floors test
if (!gl_drawing_stencil && gl_backsector && gl_frontsector->tag != gl_backsector->tag && (gl_backsector->ffloors || gl_frontsector->ffloors)) if (!gl_drawing_stencil && gl_backsector && gl_frontsector->tag != gl_backsector->tag && (gl_backsector->ffloors || gl_frontsector->ffloors))
{ {
ffloor_t *rover;
fixed_t highcut = 0, lowcut = 0; fixed_t highcut = 0, lowcut = 0;
fixed_t lowcutslope = 0, highcutslope = 0; fixed_t lowcutslope = 0, highcutslope = 0;
// Used for height comparisons and etc across FOFs and slopes
fixed_t high1, highslope1, low1, lowslope1;
fixed_t high2, highslope2, low2, lowslope2;
INT32 texnum;
lowcut = std::max(worldbottom, worldlow); lowcut = std::max(worldbottom, worldlow);
highcut = std::min(worldtop, worldhigh); highcut = std::min(worldtop, worldhigh);
lowcutslope = std::max(worldbottomslope, worldlowslope); lowcutslope = std::max(worldbottomslope, worldlowslope);
highcutslope = std::min(worldtopslope, worldhighslope); highcutslope = std::min(worldtopslope, worldhighslope);
auto process_ffloors = [&](boolean backsec) FUNCINLINE if (gl_backsector->ffloors)
{ {
ffloor_t *rover; for (rover = gl_backsector->ffloors; rover; rover = rover->next)
INT32 texnum;
// Used for height comparisons and etc across FOFs and slopes
fixed_t high1, highslope1, low1, lowslope1;
fixed_t high2, highslope2, low2, lowslope2;
// i suck at naming stuff lul
sector_t* main_sector = backsec ? gl_backsector : gl_frontsector;
sector_t* other_sector = backsec ? gl_frontsector : gl_backsector;
for (rover = main_sector->ffloors; rover; rover = rover->next)
{ {
const ffloortype_e roverflags = rover->flags; const ffloortype_e roverflags = rover->flags;
if (!(roverflags & FF_EXISTS) || !(roverflags & FF_RENDERSIDES)) if (!(roverflags & FF_EXISTS) || !(roverflags & FF_RENDERSIDES) || (roverflags & FF_INVERTSIDES))
continue;
if (backsec && (roverflags & FF_INVERTSIDES))
continue;
if (!backsec && !(roverflags & FF_ALLSIDES))
continue; continue;
SLOPEPARAMS(*rover->t_slope, high1, highslope1, *rover->topheight) SLOPEPARAMS(*rover->t_slope, high1, highslope1, *rover->topheight)
@@ -1912,7 +1899,7 @@ void HWR_ProcessSeg(void) // Sort of like GLWall::Process in GZDoom
continue; continue;
ffloor_t * r2; ffloor_t * r2;
for (r2 = other_sector->ffloors; r2; r2 = r2->next) for (r2 = gl_frontsector->ffloors; r2; r2 = r2->next)
{ {
if (r2->master == rover->master) // Skip if same control line. if (r2->master == rover->master) // Skip if same control line.
break; break;
@@ -1950,14 +1937,14 @@ void HWR_ProcessSeg(void) // Sort of like GLWall::Process in GZDoom
if (r2) if (r2)
continue; continue;
const side_t *side = R_GetFFloorSide(gl_curline->linedef, rover, main_sector); side_t *side = R_GetFFloorSide(gl_curline->linedef, rover, gl_backsector);
boolean do_texture_skew; boolean do_texture_skew;
boolean dont_peg_bottom; boolean dont_peg_bottom;
if (rover->master->flags & ML_TFERLINE) if (rover->master->flags & ML_TFERLINE)
{ {
const line_t *newline = R_GetFFloorLine(gl_curline->linedef, rover, main_sector); line_t *newline = R_GetFFloorLine(gl_curline->linedef, rover, gl_backsector);
do_texture_skew = newline->flags & ML_DONTPEGTOP; do_texture_skew = newline->flags & ML_DONTPEGTOP;
dont_peg_bottom = newline->flags & ML_DONTPEGBOTTOM; dont_peg_bottom = newline->flags & ML_DONTPEGBOTTOM;
} }
@@ -1980,7 +1967,6 @@ void HWR_ProcessSeg(void) // Sort of like GLWall::Process in GZDoom
h = highcut; h = highcut;
hS = highcutslope; hS = highcutslope;
} }
if (l <= lowcut && lS <= lowcutslope) if (l <= lowcut && lS <= lowcutslope)
{ {
l = lowcut; l = lowcut;
@@ -2055,8 +2041,8 @@ void HWR_ProcessSeg(void) // Sort of like GLWall::Process in GZDoom
lightnum = HWR_CalcWallLight(lightnum, gl_curline, colormap); lightnum = HWR_CalcWallLight(lightnum, gl_curline, colormap);
if (other_sector->numlights) if (gl_frontsector->numlights)
HWR_SplitWall(other_sector, wallVerts, 0, false, &Surf, roverflags, rover, blendmode); HWR_SplitWall(gl_frontsector, wallVerts, 0, false, &Surf, roverflags, rover, blendmode);
else else
HWR_AddTransparentWall(wallVerts, &Surf, 0, false, blendmode, true, lightnum, colormap); HWR_AddTransparentWall(wallVerts, &Surf, 0, false, blendmode, true, lightnum, colormap);
} }
@@ -2070,8 +2056,8 @@ void HWR_ProcessSeg(void) // Sort of like GLWall::Process in GZDoom
Surf.PolyColor.s.alpha = CLAMP(rover->alpha, 0, 255); Surf.PolyColor.s.alpha = CLAMP(rover->alpha, 0, 255);
} }
if (other_sector->numlights) if (gl_frontsector->numlights)
HWR_SplitWall(other_sector, wallVerts, texnum, noencore, &Surf, roverflags, rover, blendmode); HWR_SplitWall(gl_frontsector, wallVerts, texnum, noencore, &Surf, roverflags, rover, blendmode);
else else
{ {
if (blendmode != PF_Masked) if (blendmode != PF_Masked)
@@ -2081,16 +2067,191 @@ void HWR_ProcessSeg(void) // Sort of like GLWall::Process in GZDoom
} }
} }
} }
};
if (gl_backsector->ffloors)
{
process_ffloors(true);
} }
if (gl_frontsector->ffloors) // Putting this seperate should allow 2 FOF sectors to be connected without too many errors? I think? if (gl_frontsector->ffloors) // Putting this seperate should allow 2 FOF sectors to be connected without too many errors? I think?
{ {
process_ffloors(false); for (rover = gl_frontsector->ffloors; rover; rover = rover->next)
{
const ffloortype_e roverflags = rover->flags;
if (!(roverflags & FF_EXISTS) || !(roverflags & FF_RENDERSIDES) || !(roverflags & FF_ALLSIDES))
continue;
SLOPEPARAMS(*rover->t_slope, high1, highslope1, *rover->topheight)
SLOPEPARAMS(*rover->b_slope, low1, lowslope1, *rover->bottomheight)
if ((high1 < lowcut || highslope1 < lowcutslope) || (low1 > highcut || lowslope1 > highcutslope))
continue;
ffloor_t * r2;
for (r2 = gl_backsector->ffloors; r2; r2 = r2->next)
{
if (r2->master == rover->master) // Skip if same control line.
break;
const ffloortype_e r2flags = r2->flags;
if (!(r2flags & FF_EXISTS) || !(r2flags & FF_RENDERSIDES))
continue;
if (rover->flags & FF_EXTRA)
{
if (!(r2flags & FF_CUTEXTRA))
continue;
if (r2flags & FF_EXTRA && (r2flags & (FF_TRANSLUCENT|FF_FOG)) != (rover->flags & (FF_TRANSLUCENT|FF_FOG)))
continue;
}
else
{
if (!(r2flags & FF_CUTSOLIDS))
continue;
}
SLOPEPARAMS(*r2->t_slope, high2, highslope2, *r2->topheight)
SLOPEPARAMS(*r2->b_slope, low2, lowslope2, *r2->bottomheight)
if ((high2 < lowcut || highslope2 < lowcutslope) || (low2 > highcut || lowslope2 > highcutslope))
continue;
if ((high1 > high2 || highslope1 > highslope2) || (low1 < low2 || lowslope1 < lowslope2))
continue;
break;
}
if (r2)
continue;
side_t *side = R_GetFFloorSide(gl_curline->linedef, rover, gl_backsector);
boolean do_texture_skew;
boolean dont_peg_bottom;
if (rover->master->flags & ML_TFERLINE)
{
line_t *newline = R_GetFFloorLine(gl_curline->linedef, rover, gl_backsector);
do_texture_skew = newline->flags & ML_DONTPEGTOP;
dont_peg_bottom = newline->flags & ML_DONTPEGBOTTOM;
}
else
{
do_texture_skew = rover->master->flags & ML_DONTPEGTOP;
dont_peg_bottom = gl_curline->linedef->flags & ML_DONTPEGBOTTOM;
}
texnum = R_GetTextureNum(side->midtexture);
h = P_GetFFloorTopZAt (rover, v1x, v1y);
hS = P_GetFFloorTopZAt (rover, v2x, v2y);
l = P_GetFFloorBottomZAt(rover, v1x, v1y);
lS = P_GetFFloorBottomZAt(rover, v2x, v2y);
// Adjust the heights so the FOF does not overlap with top and bottom textures.
if (h >= highcut && hS >= highcutslope)
{
h = highcut;
hS = highcutslope;
}
if (l <= lowcut && lS <= lowcutslope)
{
l = lowcut;
lS = lowcutslope;
}
//Hurdler: HW code starts here
//FIXME: check if peging is correct
// set top/bottom coords
wallVerts[3].y = FixedToFloat(h);
wallVerts[2].y = FixedToFloat(hS);
wallVerts[0].y = FixedToFloat(l);
wallVerts[1].y = FixedToFloat(lS);
if (roverflags & FF_FOG)
{
wallVerts[3].t = wallVerts[2].t = 0;
wallVerts[0].t = wallVerts[1].t = 0;
wallVerts[0].s = wallVerts[3].s = 0;
wallVerts[2].s = wallVerts[1].s = 0;
}
else
{
// Wow, how was this missing from OpenGL for so long?
// ...Oh well, anyway, Lower Unpegged now changes pegging of FOFs like in software
// -- Monster Iestyn 26/06/18
fixed_t texturevpeg = side->rowoffset;
glTex = HWR_GetTexture(texnum, noencore);
if (!do_texture_skew) // no skewing
{
if (dont_peg_bottom)
texturevpeg -= (*rover->topheight - *rover->bottomheight);
wallVerts[3].t = static_cast<float>((*rover->topheight - h) + texturevpeg) * glTex->scaleY;
wallVerts[2].t = static_cast<float>((*rover->topheight - hS) + texturevpeg) * glTex->scaleY;
wallVerts[0].t = static_cast<float>((*rover->topheight - l) + texturevpeg) * glTex->scaleY;
wallVerts[1].t = static_cast<float>((*rover->topheight - lS) + texturevpeg) * glTex->scaleY;
}
else
{
if (!dont_peg_bottom) // skew by top
{
wallVerts[3].t = wallVerts[2].t = (static_cast<float>(texturevpeg) * glTex->scaleY);
wallVerts[0].t = static_cast<float>((h - l) + texturevpeg) * glTex->scaleY;
wallVerts[1].t = static_cast<float>((hS - lS) + texturevpeg) * glTex->scaleY;
}
else // skew by bottom
{
wallVerts[0].t = wallVerts[1].t = (static_cast<float>(texturevpeg) * glTex->scaleY);
wallVerts[3].t = wallVerts[0].t - static_cast<float>(h - l) * glTex->scaleY;
wallVerts[2].t = wallVerts[1].t - static_cast<float>(hS - lS) * glTex->scaleY;
}
}
wallVerts[0].s = wallVerts[3].s = cliplow * glTex->scaleX;
wallVerts[2].s = wallVerts[1].s = cliphigh * glTex->scaleX;
}
FBITFIELD blendmode;
if (roverflags & FF_FOG)
{
blendmode = PF_Fog|PF_NoTexture;
lightnum = rover->master->frontsector->lightlevel;
colormap = rover->master->frontsector->extra_colormap;
Surf.PolyColor.s.alpha = HWR_FogBlockAlpha(lightnum, colormap);
lightnum = HWR_CalcWallLight(lightnum, gl_curline, colormap);
if (gl_backsector->numlights)
HWR_SplitWall(gl_backsector, wallVerts, 0, false, &Surf, roverflags, rover, blendmode);
else
HWR_AddTransparentWall(wallVerts, &Surf, 0, false, blendmode, true, lightnum, colormap);
}
else
{
blendmode = PF_Masked;
if ((roverflags & FF_TRANSLUCENT && rover->alpha < 256) || rover->blend)
{
blendmode = rover->blend ? HWR_GetBlendModeFlag(rover->blend) : static_cast<FBITFIELD>(PF_Translucent);
Surf.PolyColor.s.alpha = CLAMP(rover->alpha, 0, 255);
}
if (gl_backsector->numlights)
HWR_SplitWall(gl_backsector, wallVerts, texnum, noencore, &Surf, roverflags, rover, blendmode);
else
{
if (blendmode != PF_Masked)
HWR_AddTransparentWall(wallVerts, &Surf, texnum, noencore, blendmode, false, lightnum, colormap);
else
HWR_ProjectWall(wallVerts, &Surf, PF_Masked, lightnum, colormap);
}
}
}
} }
} }
#undef SLOPEPARAMS #undef SLOPEPARAMS
@@ -2243,7 +2404,7 @@ static inline void DoAddLine(seg_t* line, angle_t angle1, angle_t angle2)
// SoM: Backsector needs to be run through R_FakeFlat // SoM: Backsector needs to be run through R_FakeFlat
static sector_t tempsec; static sector_t tempsec;
auto do_addline = [&](bool dontdraw) FUNCINLINE auto do_addline = [&](bool dontdraw)
{ {
// Single sided line? // Single sided line?
if (!line->backsector) if (!line->backsector)
@@ -2343,11 +2504,11 @@ static void HWR_AddLine(seg_t *line)
gl_curline = line; gl_curline = line;
v1x = line->v1->x; v1x = gl_curline->v1->x;
v1y = line->v1->y; v1y = gl_curline->v1->y;
v2x = line->v2->x; v2x = gl_curline->v2->x;
v2y = line->v2->y; v2y = gl_curline->v2->y;
// OPTIMIZE: quickly reject orthogonal back sides. // OPTIMIZE: quickly reject orthogonal back sides.
angle1 = R_PointToAngle64(v1x, v1y); angle1 = R_PointToAngle64(v1x, v1y);
@@ -2383,7 +2544,6 @@ static boolean HWR_CheckBBox(const fixed_t *bspcoord)
{ {
fixed_t px1, py1, px2, py2; fixed_t px1, py1, px2, py2;
angle_t angle1, angle2; angle_t angle1, angle2;
const INT32* check;
// 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.
@@ -2395,12 +2555,10 @@ static boolean HWR_CheckBBox(const fixed_t *bspcoord)
if (boxpos == 5) if (boxpos == 5)
return true; return true;
check = checkcoord[boxpos]; px1 = bspcoord[checkcoord[boxpos][0]];
py1 = bspcoord[checkcoord[boxpos][1]];
px1 = bspcoord[check[0]]; px2 = bspcoord[checkcoord[boxpos][2]];
py1 = bspcoord[check[1]]; py2 = bspcoord[checkcoord[boxpos][3]];
px2 = bspcoord[check[2]];
py2 = bspcoord[check[3]];
if (current_bsp_culling_distance) if (current_bsp_culling_distance)
{ {
@@ -2474,6 +2632,7 @@ static boolean HWR_CheckBBox(const fixed_t *bspcoord)
return gld_clipper_SafeCheckRange(angle2, angle1); return gld_clipper_SafeCheckRange(angle2, angle1);
} }
// //
// HWR_AddPolyObjectSegs // HWR_AddPolyObjectSegs
// //
@@ -2659,20 +2818,19 @@ static void HWR_AddPolyObjectPlanes(void)
for (i = 0; i < numpolys; i++) for (i = 0; i < numpolys; i++)
{ {
polyobjsector = po_ptrs[i]->lines[0]->backsector; // the in-level polyobject sector
if (!(po_ptrs[i]->flags & POF_RENDERPLANES)) // Only render planes when you should if (!(po_ptrs[i]->flags & POF_RENDERPLANES)) // Only render planes when you should
continue; continue;
if (po_ptrs[i]->translucency >= NUMTRANSMAPS) if (po_ptrs[i]->translucency >= NUMTRANSMAPS)
continue; continue;
polyobjsector = po_ptrs[i]->lines[0]->backsector; // the in-level polyobject sector
if (polyobjsector->floorheight <= gl_frontsector->ceilingheight if (polyobjsector->floorheight <= gl_frontsector->ceilingheight
&& polyobjsector->floorheight >= gl_frontsector->floorheight && polyobjsector->floorheight >= gl_frontsector->floorheight
&& (viewz < polyobjsector->floorheight)) && (viewz < polyobjsector->floorheight))
{ {
light = R_GetPlaneLight(gl_frontsector, polyobjsector->floorheight, true); light = R_GetPlaneLight(gl_frontsector, polyobjsector->floorheight, true);
if (po_ptrs[i]->translucency > 0) if (po_ptrs[i]->translucency > 0)
{ {
FSurfaceInfo Surf = {}; FSurfaceInfo Surf = {};
@@ -2695,7 +2853,6 @@ static void HWR_AddPolyObjectPlanes(void)
&& (viewz > polyobjsector->ceilingheight)) && (viewz > polyobjsector->ceilingheight))
{ {
light = R_GetPlaneLight(gl_frontsector, polyobjsector->ceilingheight, true); light = R_GetPlaneLight(gl_frontsector, polyobjsector->ceilingheight, true);
if (po_ptrs[i]->translucency > 0) if (po_ptrs[i]->translucency > 0)
{ {
FSurfaceInfo Surf = {}; FSurfaceInfo Surf = {};
@@ -2820,6 +2977,9 @@ static void HWR_Subsector(size_t num)
floorcolormap = ceilingcolormap = gl_frontsector->extra_colormap; floorcolormap = ceilingcolormap = gl_frontsector->extra_colormap;
cullFloorHeight = P_GetSectorFloorZAt (gl_frontsector, viewx, viewy);
cullCeilingHeight = P_GetSectorCeilingZAt(gl_frontsector, viewx, viewy);
if (gl_frontsector->ffloors) if (gl_frontsector->ffloors)
{ {
locFloorHeight = P_GetSectorFloorZAt (gl_frontsector, gl_frontsector->soundorg.x, gl_frontsector->soundorg.y); locFloorHeight = P_GetSectorFloorZAt (gl_frontsector, gl_frontsector->soundorg.x, gl_frontsector->soundorg.y);
@@ -2828,14 +2988,15 @@ static void HWR_Subsector(size_t num)
boolean anyMoved = gl_frontsector->moved; boolean anyMoved = gl_frontsector->moved;
if (anyMoved == false) if (anyMoved == false)
{
if (sub->validcount != validcount)
{ {
for (rover = gl_frontsector->ffloors; rover; rover = rover->next) for (rover = gl_frontsector->ffloors; rover; rover = rover->next)
{ {
if (!(rover->flags & FF_EXISTS) || !(rover->flags & FF_RENDERPLANES)) if (!(rover->flags & FF_EXISTS) || !(rover->flags & FF_RENDERPLANES))
continue; continue;
if (sub->validcount == validcount)
continue;
const sector_t *controlSec = &sectors[rover->secnum]; const sector_t *controlSec = &sectors[rover->secnum];
if (controlSec->moved != true) if (controlSec->moved != true)
@@ -2845,7 +3006,6 @@ static void HWR_Subsector(size_t num)
break; break;
} }
} }
}
if (anyMoved == true) if (anyMoved == true)
{ {
@@ -2869,15 +3029,13 @@ static void HWR_Subsector(size_t num)
sub->sector->extra_colormap = gl_frontsector->extra_colormap; sub->sector->extra_colormap = gl_frontsector->extra_colormap;
if (sub->validcount != validcount)
{
if (gl_frontsector->floorpic != skyflatnum)
{
cullFloorHeight = P_GetSectorFloorZAt(gl_frontsector, viewx, viewy);
// render floor ? // render floor ?
// yeah, easy backface cull! :) // yeah, easy backface cull! :)
if (cullFloorHeight < viewz) if (cullFloorHeight < viewz)
{
if (gl_frontsector->floorpic != skyflatnum)
{
if (sub->validcount != validcount)
{ {
HWR_GetFlat(levelflats[gl_frontsector->floorpic].lumpnum, R_NoEncore(gl_frontsector, false)); HWR_GetFlat(levelflats[gl_frontsector->floorpic].lumpnum, R_NoEncore(gl_frontsector, false));
HWR_RenderPlane(sub, &extrasubsectors[num], false, HWR_RenderPlane(sub, &extrasubsectors[num], false,
@@ -2886,12 +3044,13 @@ static void HWR_Subsector(size_t num)
PF_Occlude, floorlightlevel, levelflats[gl_frontsector->floorpic].lumpnum, NULL, 255, floorcolormap); PF_Occlude, floorlightlevel, levelflats[gl_frontsector->floorpic].lumpnum, NULL, 255, floorcolormap);
} }
} }
}
if (gl_frontsector->ceilingpic != skyflatnum)
{
cullCeilingHeight = P_GetSectorCeilingZAt(gl_frontsector, viewx, viewy);
if (cullCeilingHeight > viewz) if (cullCeilingHeight > viewz)
{
if (gl_frontsector->ceilingpic != skyflatnum)
{
if (sub->validcount != validcount)
{ {
HWR_GetFlat(levelflats[gl_frontsector->ceilingpic].lumpnum, R_NoEncore(gl_frontsector, true)); HWR_GetFlat(levelflats[gl_frontsector->ceilingpic].lumpnum, R_NoEncore(gl_frontsector, true));
HWR_RenderPlane(sub, &extrasubsectors[num], true, HWR_RenderPlane(sub, &extrasubsectors[num], true,
@@ -2900,6 +3059,7 @@ static void HWR_Subsector(size_t num)
PF_Occlude, ceilinglightlevel, levelflats[gl_frontsector->ceilingpic].lumpnum, NULL, 255, ceilingcolormap); PF_Occlude, ceilinglightlevel, levelflats[gl_frontsector->ceilingpic].lumpnum, NULL, 255, ceilingcolormap);
} }
} }
}
if (gl_frontsector->ffloors) if (gl_frontsector->ffloors)
{ {
@@ -2910,6 +3070,13 @@ static void HWR_Subsector(size_t num)
if (!(rover->flags & FF_EXISTS) || !(rover->flags & FF_RENDERPLANES) || !(rover->flags & FF_RENDERALL)) if (!(rover->flags & FF_EXISTS) || !(rover->flags & FF_RENDERPLANES) || !(rover->flags & FF_RENDERALL))
continue; continue;
if (sub->validcount == validcount)
continue;
// rendering heights for bottom and top planes
// yes there were functions for this stuff, no idea why it wasnt used but bleh
bottomCullHeight = P_GetFFloorBottomZAt(rover, viewx, viewy);
topCullHeight = P_GetFFloorTopZAt(rover, viewx, viewy);
if (gl_frontsector->cullheight) if (gl_frontsector->cullheight)
{ {
@@ -2917,86 +3084,94 @@ static void HWR_Subsector(size_t num)
continue; continue;
} }
auto render_fof_plane = [&](boolean bottom, boolean underside) FUNCINLINE // bottom plane
{ centerHeight = P_GetFFloorBottomZAt(rover, gl_frontsector->soundorg.x, gl_frontsector->soundorg.y);
fixed_t roverheight;
lumpnum_t flatlump;
if (bottom) if (centerHeight <= locCeilingHeight && centerHeight >= locFloorHeight &&
((viewz < bottomCullHeight && !(rover->flags & FF_INVERTPLANES)) ||
(viewz > bottomCullHeight && (rover->flags & FF_BOTHPLANES || rover->flags & FF_INVERTPLANES))))
{ {
roverheight = *rover->bottomheight;
flatlump = levelflats[*rover->bottompic].lumpnum;
}
else
{
roverheight = *rover->topheight;
flatlump = levelflats[*rover->toppic].lumpnum;
}
if (rover->flags & FF_FOG) if (rover->flags & FF_FOG)
{ {
UINT8 alpha; UINT8 alpha;
light = R_GetPlaneLight(gl_frontsector, centerHeight, underside); light = R_GetPlaneLight(gl_frontsector, centerHeight, (viewz < bottomCullHeight));
alpha = HWR_FogBlockAlpha(*gl_frontsector->lightlist[light].lightlevel, rover->master->frontsector->extra_colormap); alpha = HWR_FogBlockAlpha(*gl_frontsector->lightlist[light].lightlevel, rover->master->frontsector->extra_colormap);
HWR_AddTransparentFloor(0, HWR_AddTransparentFloor(0,
&extrasubsectors[num], &extrasubsectors[num],
!bottom, false,
roverheight, *rover->bottomheight,
*gl_frontsector->lightlist[light].lightlevel, *gl_frontsector->lightlist[light].lightlevel,
alpha, rover->master->frontsector, PF_Fog|PF_NoTexture, alpha, rover->master->frontsector, PF_Fog|PF_NoTexture,
true, rover->master->frontsector->extra_colormap); true, rover->master->frontsector->extra_colormap);
} }
else if ((rover->flags & FF_TRANSLUCENT && rover->alpha < 256) || rover->blend) // SoM: Flags are more efficient else if ((rover->flags & FF_TRANSLUCENT && rover->alpha < 256) || rover->blend) // SoM: Flags are more efficient
{ {
light = R_GetPlaneLight(gl_frontsector, centerHeight, underside); light = R_GetPlaneLight(gl_frontsector, centerHeight, (viewz < bottomCullHeight));
HWR_AddTransparentFloor(flatlump, HWR_AddTransparentFloor(levelflats[*rover->bottompic].lumpnum,
&extrasubsectors[num], &extrasubsectors[num],
!bottom, false,
roverheight, *rover->bottomheight,
*gl_frontsector->lightlist[light].lightlevel, *gl_frontsector->lightlist[light].lightlevel,
CLAMP(rover->alpha, 0 ,255), rover->master->frontsector, HWR_RippleBlend(gl_frontsector, rover, false) | (rover->blend ? HWR_GetBlendModeFlag(rover->blend) : static_cast<FBITFIELD>(PF_Translucent)), CLAMP(rover->alpha, 0 ,255), rover->master->frontsector, HWR_RippleBlend(gl_frontsector, rover, false) | (rover->blend ? HWR_GetBlendModeFlag(rover->blend) : static_cast<FBITFIELD>(PF_Translucent)),
false, gl_frontsector->lightlist[light].extra_colormap); false, gl_frontsector->lightlist[light].extra_colormap);
} }
else else
{ {
HWR_GetFlat(flatlump, R_NoEncore(gl_frontsector, !bottom)); HWR_GetFlat(levelflats[*rover->bottompic].lumpnum, R_NoEncore(gl_frontsector, false));
light = R_GetPlaneLight(gl_frontsector, centerHeight, underside); light = R_GetPlaneLight(gl_frontsector, centerHeight, (viewz < bottomCullHeight));
HWR_RenderPlane(sub, &extrasubsectors[num], !bottom, roverheight, HWR_RippleBlend(gl_frontsector, rover, false)|PF_Occlude, *gl_frontsector->lightlist[light].lightlevel, flatlump, HWR_RenderPlane(sub, &extrasubsectors[num], false, *rover->bottomheight, HWR_RippleBlend(gl_frontsector, rover, false)|PF_Occlude, *gl_frontsector->lightlist[light].lightlevel, levelflats[*rover->bottompic].lumpnum,
rover->master->frontsector, 255, gl_frontsector->lightlist[light].extra_colormap); rover->master->frontsector, 255, gl_frontsector->lightlist[light].extra_colormap);
} }
};
// bottom plane
centerHeight = P_GetFFloorBottomZAt(rover, gl_frontsector->soundorg.x, gl_frontsector->soundorg.y);
if (centerHeight <= locCeilingHeight && centerHeight >= locFloorHeight)
{
bottomCullHeight = P_GetFFloorBottomZAt(rover, viewx, viewy);
if ((viewz < bottomCullHeight && !(rover->flags & FF_INVERTPLANES)) ||
(viewz > bottomCullHeight && (rover->flags & FF_BOTHPLANES || rover->flags & FF_INVERTPLANES)))
{
render_fof_plane(true, (viewz < bottomCullHeight));
}
} }
// top plane // top plane
centerHeight = P_GetFFloorTopZAt(rover, gl_frontsector->soundorg.x, gl_frontsector->soundorg.y); centerHeight = P_GetFFloorTopZAt(rover, gl_frontsector->soundorg.x, gl_frontsector->soundorg.y);
if (centerHeight >= locFloorHeight && centerHeight <= locCeilingHeight) if (centerHeight >= locFloorHeight &&
centerHeight <= locCeilingHeight &&
((viewz > topCullHeight && !(rover->flags & FF_INVERTPLANES)) ||
(viewz < topCullHeight && (rover->flags & FF_BOTHPLANES || rover->flags & FF_INVERTPLANES))))
{ {
topCullHeight = P_GetFFloorTopZAt(rover, viewx, viewy); if (rover->flags & FF_FOG)
{
UINT8 alpha;
if ((viewz > topCullHeight && !(rover->flags & FF_INVERTPLANES)) || light = R_GetPlaneLight(gl_frontsector, centerHeight, (viewz < topCullHeight));
(viewz < topCullHeight && (rover->flags & FF_BOTHPLANES || rover->flags & FF_INVERTPLANES)))
{ alpha = HWR_FogBlockAlpha(*gl_frontsector->lightlist[light].lightlevel, rover->master->frontsector->extra_colormap);
render_fof_plane(false, (viewz < topCullHeight));
HWR_AddTransparentFloor(0,
&extrasubsectors[num],
true,
*rover->topheight,
*gl_frontsector->lightlist[light].lightlevel,
alpha, rover->master->frontsector, PF_Fog|PF_NoTexture,
true, rover->master->frontsector->extra_colormap);
} }
else if ((rover->flags & FF_TRANSLUCENT && rover->alpha < 256) || rover->blend)
{
light = R_GetPlaneLight(gl_frontsector, centerHeight, (viewz < topCullHeight));
HWR_AddTransparentFloor(levelflats[*rover->toppic].lumpnum,
&extrasubsectors[num],
true,
*rover->topheight,
*gl_frontsector->lightlist[light].lightlevel,
CLAMP(rover->alpha, 0 ,255), rover->master->frontsector, HWR_RippleBlend(gl_frontsector, rover, false) | (rover->blend ? HWR_GetBlendModeFlag(rover->blend) : static_cast<FBITFIELD>(PF_Translucent)),
false, gl_frontsector->lightlist[light].extra_colormap);
}
else
{
HWR_GetFlat(levelflats[*rover->toppic].lumpnum, R_NoEncore(gl_frontsector, true));
light = R_GetPlaneLight(gl_frontsector, centerHeight, (viewz < topCullHeight));
HWR_RenderPlane(sub, &extrasubsectors[num], true, *rover->topheight, HWR_RippleBlend(gl_frontsector, rover, false)|PF_Occlude, *gl_frontsector->lightlist[light].lightlevel, levelflats[*rover->toppic].lumpnum,
rover->master->frontsector, 255, gl_frontsector->lightlist[light].extra_colormap);
} }
} }
} }
@@ -3038,6 +3213,8 @@ doaddline:
// we now draw the sprites first and then the walls // we now draw the sprites first and then the walls
// hurdler: false: we only add the sprites, the walls are drawn first // hurdler: false: we only add the sprites, the walls are drawn first
if (line) if (line)
{
if (sub->sector->validcount != validcount)
{ {
// draw sprites first, coz they are clipped to the solidsegs of // draw sprites first, coz they are clipped to the solidsegs of
// subsectors more 'in front' // subsectors more 'in front'
@@ -3045,6 +3222,7 @@ doaddline:
HWR_AddSprites<AddSpritesType::kLimitDist>(gl_frontsector); HWR_AddSprites<AddSpritesType::kLimitDist>(gl_frontsector);
else else
HWR_AddSprites<AddSpritesType::kNoLimitDist>(gl_frontsector); HWR_AddSprites<AddSpritesType::kNoLimitDist>(gl_frontsector);
}
//Hurdler: at this point validcount must be the same, but is not because //Hurdler: at this point validcount must be the same, but is not because
// gl_frontsector doesn't point anymore to sub->sector due to // gl_frontsector doesn't point anymore to sub->sector due to
@@ -3054,11 +3232,11 @@ doaddline:
// without talking about the overdraw of course. // without talking about the overdraw of course.
sub->sector->validcount = validcount;/// \todo fix that in a better way sub->sector->validcount = validcount;/// \todo fix that in a better way
if (UNLIKELY(sub->polyList)) if (UNLIKELY(numpolys))
{ {
while (count--) while (count--)
{ {
if (!line->polyseg) // ignore segs that belong to polyobjects if (LIKELY(!line->polyseg)) // ignore segs that belong to polyobjects
{ {
HWR_AddLine(line); HWR_AddLine(line);
} }
@@ -5322,7 +5500,6 @@ void HWR_SetTransform(float fpov)
void HWR_ClearClipper(void) void HWR_ClearClipper(void)
{ {
const angle_t a1 = gld_FrustumAngle(gl_aimingangle); const angle_t a1 = gld_FrustumAngle(gl_aimingangle);
gld_clipper_Clear(); gld_clipper_Clear();
gld_clipper_SafeAddClipRange(viewangle + a1, viewangle - a1); gld_clipper_SafeAddClipRange(viewangle + a1, viewangle - a1);
#ifdef HAVE_SPHEREFRUSTRUM #ifdef HAVE_SPHEREFRUSTRUM
@@ -5355,9 +5532,9 @@ static void HWR_RenderViewpoint(gl_portal_t *rootportal, int stencil_level, bool
player_t *viewplayer = &players[displayplayers[viewssnum]]; player_t *viewplayer = &players[displayplayers[viewssnum]];
const float fpov = FixedToFloat(R_GetPlayerFov(viewplayer)); const float fpov = FixedToFloat(R_GetPlayerFov(viewplayer));
auto reset_viewstate = [](const float pfov) FUNCINLINE auto reset_viewstate = [&]()
{ {
HWR_SetTransform(pfov); HWR_SetTransform(fpov);
HWR_ClearSprites(); HWR_ClearSprites();
HWR_ClearClipper(); HWR_ClearClipper();
}; };
@@ -5375,7 +5552,7 @@ static void HWR_RenderViewpoint(gl_portal_t *rootportal, int stencil_level, bool
currentportallist = &portallist; currentportallist = &portallist;
HWR_SetPortalState(GLPORTAL_SEARCH); HWR_SetPortalState(GLPORTAL_SEARCH);
reset_viewstate(fpov); reset_viewstate();
if (rootportal) if (rootportal)
{ {
@@ -5401,7 +5578,7 @@ static void HWR_RenderViewpoint(gl_portal_t *rootportal, int stencil_level, bool
// draw normal things in current frame in current incremented stencil buffer area // draw normal things in current frame in current incremented stencil buffer area
HWR_SetStencilState(HWR_STENCIL_NORMAL, stencil_level); HWR_SetStencilState(HWR_STENCIL_NORMAL, stencil_level);
reset_viewstate(fpov); reset_viewstate();
if constexpr (Type == RenderViewpointType::kPortal) if constexpr (Type == RenderViewpointType::kPortal)
{ {
@@ -5483,7 +5660,6 @@ static void HWR_RenderViewpoint(gl_portal_t *rootportal, int stencil_level, bool
PS_START_TIMING(ps_hw_spritesorttime); PS_START_TIMING(ps_hw_spritesorttime);
HWR_SortVisSprites(); HWR_SortVisSprites();
PS_STOP_TIMING(ps_hw_spritesorttime); PS_STOP_TIMING(ps_hw_spritesorttime);
PS_START_TIMING(ps_hw_spritedrawtime); PS_START_TIMING(ps_hw_spritedrawtime);
if (UNLIKELY(cv_glmdls.value)) if (UNLIKELY(cv_glmdls.value))
HWR_DrawSprites<DrawSpritesType::kModels>(); HWR_DrawSprites<DrawSpritesType::kModels>();
@@ -5505,8 +5681,8 @@ static void HWR_RenderViewpoint(gl_portal_t *rootportal, int stencil_level, bool
}; };
extern "C" { extern "C" {
void HWR_RenderPortalViewpoint(gl_portal_t *rootportal, int stencil_level) { void HWR_RenderPortalViewpoint(gl_portal_t *rootportal, int stencil_level, boolean allow_portals) {
HWR_RenderViewpoint<RenderViewpointType::kPortal>(rootportal, stencil_level, true); HWR_RenderViewpoint<RenderViewpointType::kPortal>(rootportal, stencil_level, allow_portals);
} }
} }
+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);
+1 -1
View File
@@ -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)
-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" \
+2 -3
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))
{ {
+8 -55
View File
@@ -133,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)
@@ -261,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;
@@ -1025,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)
@@ -1094,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);
@@ -1135,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)
{ {
@@ -1282,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;
@@ -2505,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
// //
-1
View File
@@ -104,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
+45 -36
View File
@@ -110,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
@@ -248,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);
@@ -1514,9 +1507,6 @@ static void K_drawKartItem(void)
if (stplyr->kartstuff[k_itemroulette]) if (stplyr->kartstuff[k_itemroulette])
{ {
if (cv_roulettecolor.value == ROULETTECOLOR_PLAYER)
localcolor = stplyr->skincolor;
else if (cv_roulettecolor.value != ROULETTECOLOR_NONE)
localcolor = K_GetHudColor(); localcolor = K_GetHudColor();
switch ((stplyr->kartstuff[k_itemroulette] % (14*3)) / 3) switch ((stplyr->kartstuff[k_itemroulette] % (14*3)) / 3)
@@ -1524,67 +1514,67 @@ static void K_drawKartItem(void)
// 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;
@@ -4264,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;
@@ -4292,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;
axis = JoyAxis(AXISAIM, ssplayer);
if (analogjoystickmove && axis != 0)
{
// JOYAXISRANGE is supposed to be 1023 (divide by 1024)
hudforward -= ((axis * KART_FULLTURN) / (JOYAXISRANGE-1));
}
else
{
if (InputDown(gc_aimforward, ssplayer) || (gamepadjoystickmove && axis < 0))
{
hudforward += KART_FULLTURN;
}
if (InputDown(gc_aimbackward, ssplayer) || (gamepadjoystickmove && axis > 0))
{
hudforward -= KART_FULLTURN;
}
}
hudforward = CLAMP(hudforward, -KART_FULLTURN, KART_FULLTURN); hudforward = CLAMP(hudforward, -KART_FULLTURN, KART_FULLTURN);
}
if (cmd->driftturn || hudforward) if (cmd->driftturn || hudforward)
{ {
@@ -4338,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;
-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];
+143 -246
View File
@@ -1897,7 +1897,6 @@ void K_RespawnChecker(player_t *player)
void K_KartMoveAnimation(player_t *player) void K_KartMoveAnimation(player_t *player)
{ {
ticcmd_t *cmd = &player->cmd; ticcmd_t *cmd = &player->cmd;
// Standing frames - S_KART_STND1 S_KART_STND1_L S_KART_STND1_R // Standing frames - S_KART_STND1 S_KART_STND1_L S_KART_STND1_R
if (player->speed == 0) if (player->speed == 0)
{ {
@@ -2103,22 +2102,16 @@ static void K_HandleDelayedHitByEm(player_t *player)
void K_MomentumToFacing(player_t *player) void K_MomentumToFacing(player_t *player)
{ {
// If you aren't on the ground or are moving in too different of a direction don't do this
if (player->mo->eflags & MFE_JUSTHITFLOOR)
; // Just hit floor ALWAYS redirects
else
{
if (!P_IsObjectOnGround(player->mo))
return;
angle_t dangle = player->mo->angle - R_PointToAngle2(0, 0, player->mo->momx, player->mo->momy); angle_t dangle = player->mo->angle - R_PointToAngle2(0, 0, player->mo->momx, player->mo->momy);
if (dangle > ANGLE_180) if (dangle > ANGLE_180)
dangle = InvAngle(dangle); dangle = InvAngle(dangle);
if (dangle > ANGLE_90) // If you aren't on the ground or are moving in too different of a direction don't do this
if (player->mo->eflags & MFE_JUSTHITFLOOR)
; // Just hit floor ALWAYS redirects
else if (!P_IsObjectOnGround(player->mo) || dangle > ANGLE_90)
return; return;
}
P_Thrust(player->mo, player->mo->angle, player->speed - FixedMul(player->speed, player->mo->friction)); P_Thrust(player->mo, player->mo->angle, player->speed - FixedMul(player->speed, player->mo->friction));
player->mo->momx = FixedMul(player->mo->momx - player->cmomx, player->mo->friction) + player->cmomx; player->mo->momx = FixedMul(player->mo->momx - player->cmomx, player->mo->friction) + player->cmomx;
@@ -2499,7 +2492,6 @@ void K_SpinPlayer(player_t *player, mobj_t *source, INT32 type, mobj_t *inflicto
if (!player->kartstuff[k_bumper]) if (!player->kartstuff[k_bumper])
{ {
player->kartstuff[k_comebacktimer] = comebacktime; player->kartstuff[k_comebacktimer] = comebacktime;
if (player->kartstuff[k_comebackmode] == 2) if (player->kartstuff[k_comebackmode] == 2)
{ {
mobj_t *poof = P_SpawnMobj(player->mo->x, player->mo->y, player->mo->z, MT_EXPLODE); mobj_t *poof = P_SpawnMobj(player->mo->x, player->mo->y, player->mo->z, MT_EXPLODE);
@@ -2515,12 +2507,9 @@ void K_SpinPlayer(player_t *player, mobj_t *source, INT32 type, mobj_t *inflicto
if (player->kartstuff[k_spinouttype] <= 0) // type 0 is spinout, type 1 is wipeout, type 2 is spb if (player->kartstuff[k_spinouttype] <= 0) // type 0 is spinout, type 1 is wipeout, type 2 is spb
{ {
const fixed_t spd = K_GetKartSpeed(player, true)/4;
// At spinout, player speed is increased to 1/4 their regular speed, moving them forward // At spinout, player speed is increased to 1/4 their regular speed, moving them forward
if (player->speed < spd) if (player->speed < K_GetKartSpeed(player, true)/4)
P_InstaThrust(player->mo, player->mo->angle, FixedMul(spd, player->mo->scale)); P_InstaThrust(player->mo, player->mo->angle, FixedMul(K_GetKartSpeed(player, true)/4, player->mo->scale));
S_StartSound(player->mo, sfx_slip); S_StartSound(player->mo, sfx_slip);
} }
@@ -2531,12 +2520,10 @@ void K_SpinPlayer(player_t *player, mobj_t *source, INT32 type, mobj_t *inflicto
P_SetPlayerMobjState(player->mo, S_KART_SPIN); P_SetPlayerMobjState(player->mo, S_KART_SPIN);
player->kartstuff[k_instashield] = 15; player->kartstuff[k_instashield] = 15;
if (cv_kartdebughuddrop.value && !modeattacking) if (cv_kartdebughuddrop.value && !modeattacking)
K_DropItems(player); K_DropItems(player);
else else
K_DropHnextList(player); K_DropHnextList(player);
return; return;
} }
@@ -3059,24 +3046,17 @@ static mobj_t *K_SpawnKartMissile(mobj_t *source, mobjtype_t type, angle_t an, I
fixed_t finalspeed = speed; fixed_t finalspeed = speed;
mobj_t *throwmo; mobj_t *throwmo;
if (source->player) if (source->player && source->player->speed > K_GetKartSpeed(source->player, false))
{
const fixed_t kartspd = K_GetKartSpeed(source->player, false);
if (source->player->speed > kartspd)
{ {
angle_t input = source->angle - an; angle_t input = source->angle - an;
boolean invert = (input > ANGLE_180); boolean invert = (input > ANGLE_180);
if (invert) if (invert)
input = InvAngle(input); input = InvAngle(input);
finalspeed = FixedMul(speed, FixedMul( finalspeed = max(speed, FixedMul(speed, FixedMul(
FixedDiv(source->player->speed, kartspd), // Multiply speed to be proportional to your own, boosted maxspeed. FixedDiv(source->player->speed, K_GetKartSpeed(source->player, false)), // Multiply speed to be proportional to your own, boosted maxspeed.
(((180<<FRACBITS) - AngleFixed(input)) / 180) // multiply speed based on angle diff... i.e: don't do this for firing backward :V (((180<<FRACBITS) - AngleFixed(input)) / 180) // multiply speed based on angle diff... i.e: don't do this for firing backward :V
)); )));
finalspeed = max(speed, finalspeed);
}
} }
x = source->x + source->momx + FixedMul(finalspeed, FINECOSINE(an>>ANGLETOFINESHIFT)); x = source->x + source->momx + FixedMul(finalspeed, FINECOSINE(an>>ANGLETOFINESHIFT));
@@ -3318,8 +3298,6 @@ static void K_SpawnAIZDust(player_t *player)
static void K_StretchPlayerGravity(player_t *player) static void K_StretchPlayerGravity(player_t *player)
{ {
fixed_t stretchScaleFactor;
I_Assert(player != NULL); I_Assert(player != NULL);
I_Assert(!P_MobjWasRemoved(player->mo)); I_Assert(!P_MobjWasRemoved(player->mo));
@@ -3328,8 +3306,7 @@ static void K_StretchPlayerGravity(player_t *player)
fixed_t tempxscale = pmo->realxscale; fixed_t tempxscale = pmo->realxscale;
fixed_t tempyscale = pmo->realyscale; fixed_t tempyscale = pmo->realyscale;
stretchScaleFactor = FixedDiv(FRACUNIT*60, cv_gravstretch.value); const fixed_t stretchScaleFactor = min(FixedDiv(FRACUNIT*60, cv_gravstretch.value), MAXSTRETCHDIV);
stretchScaleFactor = min(stretchScaleFactor, MAXSTRETCHDIV);
if (pmo->slamsoundtimer) if (pmo->slamsoundtimer)
pmo->slamsoundtimer--; pmo->slamsoundtimer--;
@@ -3385,7 +3362,7 @@ static void K_SaltySquish(player_t *player)
if (pmo->stretchslam > 0) if (pmo->stretchslam > 0)
{ {
const fixed_t slamDiv = FixedDiv(pmo->stretchslam, FRACUNIT*60); // stretchScaleFactor = FixedDiv(FRACUNIT*60, FRACUNIT) const fixed_t slamDiv = FixedDiv(pmo->stretchslam, 3932160); // stretchScaleFactor = FixedDiv(FRACUNIT*60, FRACUNIT)
pmo->spritexscale = (tempxscale + (((slamDiv*2)/3)*2)); pmo->spritexscale = (tempxscale + (((slamDiv*2)/3)*2));
pmo->spriteyscale = (tempyscale - slamDiv); pmo->spriteyscale = (tempyscale - slamDiv);
@@ -3915,7 +3892,6 @@ static mobj_t *K_ThrowKartItem(player_t *player, boolean missile, mobjtype_t map
// Shoot forward // Shoot forward
mo = P_SpawnMobj(player->mo->x, player->mo->y, player->mo->z + player->mo->height/2, mapthing); mo = P_SpawnMobj(player->mo->x, player->mo->y, player->mo->z + player->mo->height/2, mapthing);
//K_FlipFromObject(mo, player->mo); //K_FlipFromObject(mo, player->mo);
// These are really weird so let's make it a very specific case to make SURE it works... // These are really weird so let's make it a very specific case to make SURE it works...
if (player->mo->eflags & MFE_VERTICALFLIP) if (player->mo->eflags & MFE_VERTICALFLIP)
{ {
@@ -3956,7 +3932,6 @@ static mobj_t *K_ThrowKartItem(player_t *player, boolean missile, mobjtype_t map
// this is the small graphic effect that plops in you when you throw an item: // this is the small graphic effect that plops in you when you throw an item:
throwmo = P_SpawnMobj(player->mo->x, player->mo->y, player->mo->z + player->mo->height/2, MT_FIREDITEM); throwmo = P_SpawnMobj(player->mo->x, player->mo->y, player->mo->z + player->mo->height/2, MT_FIREDITEM);
P_SetTarget(&throwmo->target, player->mo); P_SetTarget(&throwmo->target, player->mo);
// Ditto: // Ditto:
if (player->mo->eflags & MFE_VERTICALFLIP) if (player->mo->eflags & MFE_VERTICALFLIP)
{ {
@@ -4000,7 +3975,6 @@ static mobj_t *K_ThrowKartItem(player_t *player, boolean missile, mobjtype_t map
// floorz and ceilingz aren't properly set to account for FOFs and Polyobjects on spawn // floorz and ceilingz aren't properly set to account for FOFs and Polyobjects on spawn
// This should set it for FOFs // This should set it for FOFs
P_SetOrigin(mo, mo->x, mo->y, mo->z); // however, THIS can fuck up your day. just absolutely ruin you. P_SetOrigin(mo, mo->x, mo->y, mo->z); // however, THIS can fuck up your day. just absolutely ruin you.
if (P_MobjWasRemoved(mo)) if (P_MobjWasRemoved(mo))
return NULL; return NULL;
@@ -4311,10 +4285,8 @@ static void K_DoShrink(player_t *user)
{ {
players[i].mo->scalespeed = mapobjectscale/TICRATE; players[i].mo->scalespeed = mapobjectscale/TICRATE;
players[i].mo->destscale = (6*mapobjectscale)/8; players[i].mo->destscale = (6*mapobjectscale)/8;
if (cv_kartdebugshrink.value && !modeattacking && !players[i].bot) if (cv_kartdebugshrink.value && !modeattacking && !players[i].bot)
players[i].mo->destscale = (6*players[i].mo->destscale)/8; players[i].mo->destscale = (6*players[i].mo->destscale)/8;
S_StartSound(players[i].mo, sfx_kc59); S_StartSound(players[i].mo, sfx_kc59);
} }
} }
@@ -4559,10 +4531,10 @@ void K_DropHnextList(player_t *player)
P_RemoveMobj(work); P_RemoveMobj(work);
} }
{
// we need this here too because this is done in afterthink - pointers are cleaned up at the START of each tic... // we need this here too because this is done in afterthink - pointers are cleaned up at the START of each tic...
P_SetTarget(&player->mo->hnext, NULL); P_SetTarget(&player->mo->hnext, NULL);
player->kartstuff[k_bananadrag] = 0; player->kartstuff[k_bananadrag] = 0;
if (player->kartstuff[k_eggmanheld]) if (player->kartstuff[k_eggmanheld])
player->kartstuff[k_eggmanheld] = 0; player->kartstuff[k_eggmanheld] = 0;
else if (player->kartstuff[k_itemheld] else if (player->kartstuff[k_itemheld]
@@ -4572,46 +4544,36 @@ void K_DropHnextList(player_t *player)
player->kartstuff[k_itemtype] = KITEM_NONE; player->kartstuff[k_itemtype] = KITEM_NONE;
} }
} }
static void K_DropPaperItem(player_t *player, boolean thunderhack, INT32 itemamount)
{
const mobj_t *pmo = player->mo;
if (P_MobjWasRemoved(pmo))
{
return;
}
mobj_t *drop = P_SpawnMobj(pmo->x, pmo->y, (pmo->z + pmo->height/2), MT_FLOATINGITEM);
P_SetScale(drop, drop->scale>>4);
drop->destscale = (3*drop->destscale)/2;
drop->angle = pmo->angle + ANGLE_90;
P_Thrust(drop, FixedAngle(P_RandomFixed()*180) + pmo->angle + ANGLE_90, 16*mapobjectscale);
drop->momz = P_MobjFlip(pmo)*3*mapobjectscale;
if (drop->eflags & MFE_UNDERWATER)
drop->momz = (117 * drop->momz) / 200;
drop->threshold = (thunderhack ? KITEM_THUNDERSHIELD : player->kartstuff[k_itemtype]);
drop->movecount = itemamount;
drop->flags |= MF_NOCLIPTHING;
} }
// For getting EXTRA hit! // For getting EXTRA hit!
void K_DropItems(player_t *player) void K_DropItems(player_t *player)
{ {
const boolean thunderhack = (player->kartstuff[k_curshield] && player->kartstuff[k_itemtype] == KITEM_THUNDERSHIELD); boolean thunderhack = (player->kartstuff[k_curshield] && player->kartstuff[k_itemtype] == KITEM_THUNDERSHIELD);
if (thunderhack) if (thunderhack)
player->kartstuff[k_itemtype] = KITEM_NONE; player->kartstuff[k_itemtype] = KITEM_NONE;
K_DropHnextList(player); K_DropHnextList(player);
if (player->kartstuff[k_itemamount]) if (!P_MobjWasRemoved(player->mo) && player->kartstuff[k_itemamount])
{ {
K_DropPaperItem(player, thunderhack, player->kartstuff[k_itemamount]); mobj_t *drop = P_SpawnMobj(player->mo->x, player->mo->y, player->mo->z + player->mo->height/2, MT_FLOATINGITEM);
P_SetScale(drop, drop->scale>>4);
drop->destscale = (3*drop->destscale)/2;
drop->angle = player->mo->angle + ANGLE_90;
P_Thrust(drop,
FixedAngle(P_RandomFixed()*180) + player->mo->angle + ANGLE_90,
16*mapobjectscale);
drop->momz = P_MobjFlip(player->mo)*3*mapobjectscale;
if (drop->eflags & MFE_UNDERWATER)
drop->momz = (117 * drop->momz) / 200;
drop->threshold = (thunderhack ? KITEM_THUNDERSHIELD : player->kartstuff[k_itemtype]);
drop->movecount = player->kartstuff[k_itemamount];
drop->flags |= MF_NOCLIPTHING;
} }
K_StripItems(player); K_StripItems(player);
@@ -4656,7 +4618,6 @@ void K_DropRocketSneaker(player_t *player)
leftshoe = false; leftshoe = false;
} }
P_SetTarget(&player->mo->hnext, NULL); P_SetTarget(&player->mo->hnext, NULL);
player->kartstuff[k_rocketsneakertimer] = 0; player->kartstuff[k_rocketsneakertimer] = 0;
} }
@@ -4693,8 +4654,9 @@ void K_RepairOrbitChain(mobj_t *orbit)
} }
// Then recount to make sure item amount is correct // Then recount to make sure item amount is correct
if (orbit->target && orbit->target->player) // !P_MobjWasRemoved(orbit->target) if (orbit->target && orbit->target->player)
{ {
player_t *player = orbit->target->player;
INT32 num = 0; INT32 num = 0;
mobj_t *cur = orbit->target->hnext; mobj_t *cur = orbit->target->hnext;
@@ -4704,14 +4666,13 @@ void K_RepairOrbitChain(mobj_t *orbit)
{ {
prev = cur; prev = cur;
cur = cur->hnext; cur = cur->hnext;
if (++num > orbit->target->player->kartstuff[k_itemamount]) if (++num > player->kartstuff[k_itemamount])
P_RemoveMobj(prev); P_RemoveMobj(prev);
else else
prev->movedir = num; prev->movedir = num;
} }
if (orbit->target) // !P_MobjWasRemoved(orbit->target) player->kartstuff[k_itemamount] = num;
orbit->target->player->kartstuff[k_itemamount] = num;
} }
} }
@@ -4871,7 +4832,6 @@ static void K_MoveHeldObjects(player_t *player)
player->kartstuff[k_itemamount] = player->kartstuff[k_itemheld] = 0; player->kartstuff[k_itemamount] = player->kartstuff[k_itemheld] = 0;
player->kartstuff[k_itemtype] = KITEM_NONE; player->kartstuff[k_itemtype] = KITEM_NONE;
} }
return; return;
} }
@@ -4888,7 +4848,6 @@ static void K_MoveHeldObjects(player_t *player)
player->kartstuff[k_itemamount] = player->kartstuff[k_itemheld] = 0; player->kartstuff[k_itemamount] = player->kartstuff[k_itemheld] = 0;
player->kartstuff[k_itemtype] = KITEM_NONE; player->kartstuff[k_itemtype] = KITEM_NONE;
} }
return; return;
} }
@@ -4904,6 +4863,7 @@ static void K_MoveHeldObjects(player_t *player)
while (!P_MobjWasRemoved(cur)) while (!P_MobjWasRemoved(cur))
{ {
const fixed_t radius = FixedHypot(player->mo->radius, player->mo->radius) + FixedHypot(cur->radius, cur->radius); // mobj's distance from its Target, or Radius.
fixed_t z; fixed_t z;
if (!cur->health) if (!cur->health)
@@ -4912,8 +4872,6 @@ static void K_MoveHeldObjects(player_t *player)
continue; continue;
} }
const fixed_t radius = FixedHypot(player->mo->radius, player->mo->radius) + FixedHypot(cur->radius, cur->radius); // mobj's distance from its Target, or Radius.
cur->color = player->skincolor; cur->color = player->skincolor;
cur->angle -= ANGLE_90; cur->angle -= ANGLE_90;
@@ -4943,10 +4901,8 @@ static void K_MoveHeldObjects(player_t *player)
cur->momx = FixedMul(FINECOSINE(cur->angle>>ANGLETOFINESHIFT), cur->extravalue1); cur->momx = FixedMul(FINECOSINE(cur->angle>>ANGLETOFINESHIFT), cur->extravalue1);
cur->momy = FixedMul(FINESINE(cur->angle>>ANGLETOFINESHIFT), cur->extravalue1); cur->momy = FixedMul(FINESINE(cur->angle>>ANGLETOFINESHIFT), cur->extravalue1);
cur->flags &= ~MF_NOCLIPTHING; cur->flags &= ~MF_NOCLIPTHING;
if (!P_TryMove(cur, player->mo->x + cur->momx, player->mo->y + cur->momy, true)) if (!P_TryMove(cur, player->mo->x + cur->momx, player->mo->y + cur->momy, true))
P_SlideMove(cur, true); P_SlideMove(cur, true);
if (P_IsObjectOnGround(player->mo)) if (P_IsObjectOnGround(player->mo))
{ {
if (P_MobjFlip(cur) > 0) if (P_MobjFlip(cur) > 0)
@@ -4987,6 +4943,7 @@ static void K_MoveHeldObjects(player_t *player)
while (!P_MobjWasRemoved(cur)) while (!P_MobjWasRemoved(cur))
{ {
const fixed_t radius = FixedHypot(targ->radius, targ->radius) + FixedHypot(cur->radius, cur->radius);
angle_t ang; angle_t ang;
fixed_t targx, targy, targz; fixed_t targx, targy, targz;
fixed_t speed, dist; fixed_t speed, dist;
@@ -4999,8 +4956,6 @@ static void K_MoveHeldObjects(player_t *player)
continue; continue;
} }
const fixed_t radius = FixedHypot(targ->radius, targ->radius) + FixedHypot(cur->radius, cur->radius);
if (cur->extravalue1 < radius) if (cur->extravalue1 < radius)
cur->extravalue1 += FixedMul(P_AproxDistance(cur->extravalue1, radius), FRACUNIT/12); cur->extravalue1 += FixedMul(P_AproxDistance(cur->extravalue1, radius), FRACUNIT/12);
if (cur->extravalue1 > radius) if (cur->extravalue1 > radius)
@@ -5079,9 +5034,10 @@ static void K_MoveHeldObjects(player_t *player)
while (!P_MobjWasRemoved(cur)) while (!P_MobjWasRemoved(cur))
{ {
const fixed_t radius = FixedHypot(player->mo->radius, player->mo->radius) + FixedHypot(cur->radius, cur->radius);
boolean vibrate = ((leveltime & 1) && !cur->tracer);
angle_t angoffset; angle_t angoffset;
fixed_t targx, targy, targz; fixed_t targx, targy, targz;
const boolean vibrate = ((leveltime & 1) && !cur->tracer);
cur->flags &= ~MF_NOCLIPTHING; cur->flags &= ~MF_NOCLIPTHING;
@@ -5102,8 +5058,6 @@ static void K_MoveHeldObjects(player_t *player)
continue; continue;
} }
const fixed_t radius = FixedHypot(player->mo->radius, player->mo->radius) + FixedHypot(cur->radius, cur->radius);
if (cur->extravalue1 < radius) if (cur->extravalue1 < radius)
cur->extravalue1 += FixedMul(P_AproxDistance(cur->extravalue1, radius), FRACUNIT/12); cur->extravalue1 += FixedMul(P_AproxDistance(cur->extravalue1, radius), FRACUNIT/12);
if (cur->extravalue1 > radius) if (cur->extravalue1 > radius)
@@ -5140,6 +5094,7 @@ static void K_MoveHeldObjects(player_t *player)
targz = (player->mo->z + (player->mo->height/2)) + sine; targz = (player->mo->z + (player->mo->height/2)) + sine;
if (player->mo->eflags & MFE_VERTICALFLIP) if (player->mo->eflags & MFE_VERTICALFLIP)
targz += (player->mo->height/2 - 32*player->mo->scale)*6; targz += (player->mo->height/2 - 32*player->mo->scale)*6;
} }
if (!P_MobjWasRemoved(cur->tracer)) if (!P_MobjWasRemoved(cur->tracer))
@@ -5216,11 +5171,9 @@ player_t *K_FindJawzTarget(mobj_t *actor, player_t *source)
// Don't go for people who are behind you // Don't go for people who are behind you
if (thisang > ANGLE_67h) if (thisang > ANGLE_67h)
continue; continue;
// Don't pay attention to people who aren't above your position // Don't pay attention to people who aren't above your position
if (player->kartstuff[k_position] >= source->kartstuff[k_position]) if (player->kartstuff[k_position] >= source->kartstuff[k_position])
continue; continue;
if ((best == -1) || (player->kartstuff[k_position] > best)) if ((best == -1) || (player->kartstuff[k_position] > best))
{ {
wtarg = player; wtarg = player;
@@ -5497,7 +5450,7 @@ typedef INT32 (*randomFunc)(INT32 min, INT32 max);
FUNCINLINE static ATTRINLINE void K_SpawnNormalSpeedLines(player_t *player, boolean synched) FUNCINLINE static ATTRINLINE void K_SpawnNormalSpeedLines(player_t *player, boolean synched)
{ {
const randomFunc randomfunc = synched ? P_RandomRange : M_RandomRange; randomFunc randomfunc = synched ? P_RandomRange : M_RandomRange;
fixed_t rand_x; fixed_t rand_x;
fixed_t rand_y; fixed_t rand_y;
@@ -5542,8 +5495,6 @@ FUNCINLINE static ATTRINLINE void K_SpawnNormalSpeedLines(player_t *player, bool
*/ */
void K_KartPlayerThink(player_t *player, ticcmd_t *cmd) void K_KartPlayerThink(player_t *player, ticcmd_t *cmd)
{ {
const boolean onground = P_IsObjectOnGround(player->mo);
K_UpdateOffroad(player); K_UpdateOffroad(player);
K_UpdateEngineSounds(player, cmd); // Thanks, VAda! K_UpdateEngineSounds(player, cmd); // Thanks, VAda!
@@ -5660,7 +5611,7 @@ void K_KartPlayerThink(player_t *player, ticcmd_t *cmd)
if (player->kartstuff[k_spinouttimer]) if (player->kartstuff[k_spinouttimer])
{ {
if ((onground || ((player->kartstuff[k_spinouttype]+1)/2 == 1)) // spinouttype 1 and 2 - explosion and spb if ((P_IsObjectOnGround(player->mo) || ((player->kartstuff[k_spinouttype]+1)/2 == 1)) // spinouttype 1 and 2 - explosion and spb
&& (player->kartstuff[k_sneakertimer] == 0)) && (player->kartstuff[k_sneakertimer] == 0))
{ {
player->kartstuff[k_spinouttimer]--; player->kartstuff[k_spinouttimer]--;
@@ -5759,7 +5710,7 @@ void K_KartPlayerThink(player_t *player, ticcmd_t *cmd)
if (G_BattleGametype() && player->kartstuff[k_bumper] > 0) if (G_BattleGametype() && player->kartstuff[k_bumper] > 0)
player->kartstuff[k_wanted]++; player->kartstuff[k_wanted]++;
if (onground) if (P_IsObjectOnGround(player->mo))
player->kartstuff[k_waterskip] = 0; player->kartstuff[k_waterskip] = 0;
if (player->kartstuff[k_instashield]) if (player->kartstuff[k_instashield])
@@ -5772,19 +5723,17 @@ void K_KartPlayerThink(player_t *player, ticcmd_t *cmd)
else else
{ {
player->kartstuff[k_eggmanexplode]--; player->kartstuff[k_eggmanexplode]--;
if (player->kartstuff[k_eggmanexplode] <= 0) if (player->kartstuff[k_eggmanexplode] <= 0)
{ {
mobj_t *eggsexplode;
//player->powers[pw_flashing] = 0; //player->powers[pw_flashing] = 0;
mobj_t *eggsplode = P_SpawnMobj(player->mo->x, player->mo->y, player->mo->z, MT_SPBEXPLOSION); eggsexplode = P_SpawnMobj(player->mo->x, player->mo->y, player->mo->z, MT_SPBEXPLOSION);
if (player->kartstuff[k_eggmanblame] >= 0
const INT32 blametarg = player->kartstuff[k_eggmanblame]; && player->kartstuff[k_eggmanblame] < MAXPLAYERS
&& playeringame[player->kartstuff[k_eggmanblame]]
if ((blametarg >= 0 && blametarg < MAXPLAYERS) && !players[player->kartstuff[k_eggmanblame]].spectator
&& playeringame[blametarg] && players[player->kartstuff[k_eggmanblame]].mo)
&& !players[blametarg].spectator P_SetTarget(&eggsexplode->target, players[player->kartstuff[k_eggmanblame]].mo);
&& players[blametarg].mo)
P_SetTarget(&eggsplode->target, players[blametarg].mo);
} }
} }
} }
@@ -5803,7 +5752,7 @@ void K_KartPlayerThink(player_t *player, ticcmd_t *cmd)
if (player->kartstuff[k_comebacktimer]) if (player->kartstuff[k_comebacktimer])
player->kartstuff[k_comebackmode] = 0; player->kartstuff[k_comebackmode] = 0;
if (onground && player->kartstuff[k_pogospring]) if (P_IsObjectOnGround(player->mo) && player->kartstuff[k_pogospring])
{ {
if (P_MobjFlip(player->mo)*player->mo->momz <= 0) if (P_MobjFlip(player->mo)*player->mo->momz <= 0)
player->kartstuff[k_pogospring] = 0; player->kartstuff[k_pogospring] = 0;
@@ -5993,8 +5942,6 @@ INT32 K_GetKartDriftSparkValue(player_t *player)
static void K_KartDrift(player_t *player, boolean onground) static void K_KartDrift(player_t *player, boolean onground)
{ {
const ticcmd_t *cmd = &player->cmd;
fixed_t minspeed = (10 * player->mo->scale); fixed_t minspeed = (10 * player->mo->scale);
INT32 dsone = K_GetKartDriftSparkValue(player); INT32 dsone = K_GetKartDriftSparkValue(player);
INT32 dstwo = dsone*2; INT32 dstwo = dsone*2;
@@ -6016,50 +5963,55 @@ static void K_KartDrift(player_t *player, boolean onground)
{ {
player->kartstuff[k_driftcharge] = 0; player->kartstuff[k_driftcharge] = 0;
} }
else if (player->kartstuff[k_driftcharge] >= dsone && else if (player->kartstuff[k_driftcharge] >= dsone && player->kartstuff[k_driftcharge] < dstwo)
player->kartstuff[k_driftcharge] < dstwo)
{ {
if (player->kartstuff[k_driftboost] < 20) if (player->kartstuff[k_driftboost] < 20)
player->kartstuff[k_driftboost] = 20; player->kartstuff[k_driftboost] = 20;
S_StartSound(player->mo, sfx_s23c); S_StartSound(player->mo, sfx_s23c);
player->kartstuff[k_driftcharge] = 0; player->kartstuff[k_driftcharge] = 0;
} }
else if (player->kartstuff[k_driftcharge] < dsthree) else if (player->kartstuff[k_driftcharge] < dsthree)
{ {
if (player->kartstuff[k_driftboost] < 50) if (player->kartstuff[k_driftboost] < 50)
player->kartstuff[k_driftboost] = 50; player->kartstuff[k_driftboost] = 50;
S_StartSound(player->mo, sfx_s23c); S_StartSound(player->mo, sfx_s23c);
player->kartstuff[k_driftcharge] = 0; player->kartstuff[k_driftcharge] = 0;
} }
else if (player->kartstuff[k_driftcharge] >= dsthree) else if (player->kartstuff[k_driftcharge] >= dsthree)
{ {
if (player->kartstuff[k_driftboost] < 125) if (player->kartstuff[k_driftboost] < 125)
player->kartstuff[k_driftboost] = 125; player->kartstuff[k_driftboost] = 125;
S_StartSound(player->mo, sfx_s23c); S_StartSound(player->mo, sfx_s23c);
player->kartstuff[k_driftcharge] = 0; player->kartstuff[k_driftcharge] = 0;
} }
} }
// Drifting: left or right? // Drifting: left or right?
if ((cmd->driftturn != 0) && player->speed > minspeed && player->kartstuff[k_jmp] == 1 if ((player->cmd.driftturn > 0) && player->speed > minspeed && player->kartstuff[k_jmp] == 1
&& (player->kartstuff[k_drift] == 0 || player->kartstuff[k_driftend] == 1)) && (player->kartstuff[k_drift] == 0 || player->kartstuff[k_driftend] == 1)) // && player->kartstuff[k_drift] != 1)
{ {
// Starting left or right drift // Starting left drift
player->kartstuff[k_drift] = intsign(cmd->driftturn); player->kartstuff[k_drift] = 1;
player->kartstuff[k_driftend] = 0; player->kartstuff[k_driftend] = 0;
} }
else if (player->kartstuff[k_jmp] == 0) else if ((player->cmd.driftturn < 0) && player->speed > minspeed && player->kartstuff[k_jmp] == 1
&& (player->kartstuff[k_drift] == 0 || player->kartstuff[k_driftend] == 1)) // && player->kartstuff[k_drift] != -1)
{
// Starting right drift
player->kartstuff[k_drift] = -1;
player->kartstuff[k_driftend] = 0;
}
else if (player->kartstuff[k_jmp] == 0) // || player->kartstuff[k_turndir] == 0)
{ {
// drift is not being performed so if we're just finishing set driftend and decrement counters // drift is not being performed so if we're just finishing set driftend and decrement counters
if (player->kartstuff[k_drift] != 0) if (player->kartstuff[k_drift] > 0)
{ {
player->kartstuff[k_drift] -= intsign(player->kartstuff[k_drift]); player->kartstuff[k_drift]--;
player->kartstuff[k_driftend] = 1;
}
else if (player->kartstuff[k_drift] < 0)
{
player->kartstuff[k_drift]++;
player->kartstuff[k_driftend] = 1; player->kartstuff[k_driftend] = 1;
} }
else else
@@ -6080,10 +6032,10 @@ static void K_KartDrift(player_t *player, boolean onground)
if (player->kartstuff[k_drift] > 5) if (player->kartstuff[k_drift] > 5)
player->kartstuff[k_drift] = 5; player->kartstuff[k_drift] = 5;
if (cmd->driftturn > 0) // Inward if (player->cmd.driftturn > 0) // Inward
driftadditive += abs(cmd->driftturn)/100; driftadditive += abs(player->cmd.driftturn)/100;
else if (cmd->driftturn < 0) // Outward if (player->cmd.driftturn < 0) // Outward
driftadditive -= abs(cmd->driftturn)/75; driftadditive -= abs(player->cmd.driftturn)/75;
} }
else if (player->kartstuff[k_drift] <= -1) // Drifting to the right else if (player->kartstuff[k_drift] <= -1) // Drifting to the right
{ {
@@ -6091,31 +6043,26 @@ static void K_KartDrift(player_t *player, boolean onground)
if (player->kartstuff[k_drift] < -5) if (player->kartstuff[k_drift] < -5)
player->kartstuff[k_drift] = -5; player->kartstuff[k_drift] = -5;
if (cmd->driftturn < 0) // Inward if (player->cmd.driftturn < 0) // Inward
driftadditive += abs(cmd->driftturn)/100; driftadditive += abs(player->cmd.driftturn)/100;
else if (cmd->driftturn > 0) // Outward if (player->cmd.driftturn > 0) // Outward
driftadditive -= abs(cmd->driftturn)/75; driftadditive -= abs(player->cmd.driftturn)/75;
} }
// Disable drift-sparks until you're going fast enough // Disable drift-sparks until you're going fast enough
if (player->kartstuff[k_getsparks] == 0 || if (player->kartstuff[k_getsparks] == 0 || (player->kartstuff[k_offroad] && !player->kartstuff[k_invincibilitytimer] && !player->kartstuff[k_hyudorotimer] && !player->kartstuff[k_sneakertimer]))
(player->kartstuff[k_offroad] && !player->kartstuff[k_invincibilitytimer] && !player->kartstuff[k_hyudorotimer] && !player->kartstuff[k_sneakertimer]))
driftadditive = 0; driftadditive = 0;
if (player->speed > minspeed*2) if (player->speed > minspeed*2)
player->kartstuff[k_getsparks] = 1; player->kartstuff[k_getsparks] = 1;
if (player->kartstuff[k_driftcharge] < dsthree && player->kartstuff[k_driftcharge]+driftadditive >= dsthree) // rainbow drift const boolean driftblue = (player->kartstuff[k_driftcharge] < dsone && player->kartstuff[k_driftcharge]+driftadditive >= dsone);
player->driftlevel = 3; const boolean driftred = (player->kartstuff[k_driftcharge] < dstwo && player->kartstuff[k_driftcharge]+driftadditive >= dstwo);
else if (player->kartstuff[k_driftcharge] < dstwo && player->kartstuff[k_driftcharge]+driftadditive >= dstwo) // red drift const boolean driftrainbow = (player->kartstuff[k_driftcharge] < dsthree && player->kartstuff[k_driftcharge]+driftadditive >= dsthree);
player->driftlevel = 2;
else if (player->kartstuff[k_driftcharge] < dsone && player->kartstuff[k_driftcharge]+driftadditive >= dsone) // blue drift
player->driftlevel = 1;
else
player->driftlevel = 0;
// Sound whenever you get a different tier of sparks // Sound whenever you get a different tier of sparks
if (player->driftlevel) if (driftblue
|| driftred
|| driftrainbow)
{ {
//S_StartSound(player->mo, sfx_s3ka2); //S_StartSound(player->mo, sfx_s3ka2);
if (P_IsLocalPlayer(player)) // UGHGHGH... if (P_IsLocalPlayer(player)) // UGHGHGH...
@@ -6123,6 +6070,13 @@ static void K_KartDrift(player_t *player, boolean onground)
S_StartSoundAtVolume(player->mo, sfx_s3ka2, 192); // Ugh... S_StartSoundAtVolume(player->mo, sfx_s3ka2, 192); // Ugh...
} }
if (driftrainbow)
player->driftlevel = 3;
else if (driftred)
player->driftlevel = 2;
else if (driftblue)
player->driftlevel = 1;
player->driftsparkGrowTimer = DRIFTSPARKGROWTICS; player->driftsparkGrowTimer = DRIFTSPARKGROWTICS;
} }
} }
@@ -6154,11 +6108,14 @@ static void K_KartDrift(player_t *player, boolean onground)
} }
if ((!player->kartstuff[k_sneakertimer]) if ((!player->kartstuff[k_sneakertimer])
|| (!cmd->driftturn) || (!player->cmd.driftturn)
|| (!player->kartstuff[k_aizdriftstrat]) || (!player->kartstuff[k_aizdriftstrat])
|| (cmd->driftturn > 0) != (player->kartstuff[k_aizdriftstrat] > 0)) || (player->cmd.driftturn > 0) != (player->kartstuff[k_aizdriftstrat] > 0))
{ {
player->kartstuff[k_aizdriftstrat] = intsign(player->kartstuff[k_drift]); if (!player->kartstuff[k_drift])
player->kartstuff[k_aizdriftstrat] = 0;
else
player->kartstuff[k_aizdriftstrat] = ((player->kartstuff[k_drift] > 0) ? 1 : -1);
} }
else if (player->kartstuff[k_aizdriftstrat] && !player->kartstuff[k_drift]) else if (player->kartstuff[k_aizdriftstrat] && !player->kartstuff[k_drift])
{ {
@@ -6169,13 +6126,12 @@ static void K_KartDrift(player_t *player, boolean onground)
} }
if (player->kartstuff[k_drift] if (player->kartstuff[k_drift]
&& ((cmd->buttons & BT_BRAKE) && ((player->cmd.buttons & BT_BRAKE)
|| !(cmd->buttons & BT_ACCELERATE)) || !(player->cmd.buttons & BT_ACCELERATE))
&& P_IsObjectOnGround(player->mo)) && P_IsObjectOnGround(player->mo))
{ {
if (!player->kartstuff[k_brakedrift]) if (!player->kartstuff[k_brakedrift])
K_SpawnBrakeDriftSparks(player); K_SpawnBrakeDriftSparks(player);
player->kartstuff[k_brakedrift] = 1; player->kartstuff[k_brakedrift] = 1;
} }
else else
@@ -6327,7 +6283,6 @@ void K_StripItems(player_t *player)
{ {
K_DropRocketSneaker(player); K_DropRocketSneaker(player);
K_DropKitchenSink(player); K_DropKitchenSink(player);
player->kartstuff[k_itemtype] = KITEM_NONE; player->kartstuff[k_itemtype] = KITEM_NONE;
player->kartstuff[k_itemamount] = 0; player->kartstuff[k_itemamount] = 0;
player->kartstuff[k_itemheld] = 0; player->kartstuff[k_itemheld] = 0;
@@ -6337,7 +6292,6 @@ void K_StripItems(player_t *player)
player->kartstuff[k_itemroulette] = 0; player->kartstuff[k_itemroulette] = 0;
player->kartstuff[k_roulettetype] = 0; player->kartstuff[k_roulettetype] = 0;
} }
player->kartstuff[k_eggmanheld] = 0; player->kartstuff[k_eggmanheld] = 0;
player->kartstuff[k_hyudorotimer] = 0; player->kartstuff[k_hyudorotimer] = 0;
@@ -6368,31 +6322,43 @@ void K_StripOther(player_t *player)
} }
} }
static void K_PlayerItemThink(player_t *player, boolean onground, boolean oldattackdown) //
// K_MoveKartPlayer
//
void K_MoveKartPlayer(player_t *player, boolean onground)
{ {
if (!player || !player->mo) ticcmd_t *cmd = &player->cmd;
return; boolean ATTACK_IS_DOWN = ((cmd->buttons & BT_ATTACK) && !(player->pflags & PF_ATTACKDOWN));
boolean HOLDING_ITEM = (player->kartstuff[k_itemheld] || player->kartstuff[k_eggmanheld]);
boolean NO_HYUDORO = (player->kartstuff[k_stolentimer] == 0 && player->kartstuff[k_stealingtimer] == 0);
if (player->mo->health <= 0) K_KartUpdatePosition(player);
return;
if (player->spectator) if (!player->exiting)
return; {
if (player->kartstuff[k_oldposition] < player->kartstuff[k_position]) // But first, if you lost a place,
{
player->kartstuff[k_oldposition] = player->kartstuff[k_position]; // then the other player taunts.
K_RegularVoiceTimers(player); // and you can't for a bit
}
else if (player->kartstuff[k_oldposition] > player->kartstuff[k_position]) // Otherwise,
{
K_PlayOvertakeSound(player->mo); // Say "YOU'RE TOO SLOW!"
player->kartstuff[k_oldposition] = player->kartstuff[k_position]; // Restore the old position,
}
}
if (player->exiting || mapreset) if (player->kartstuff[k_positiondelay])
return; player->kartstuff[k_positiondelay]--;
if (player->kartstuff[k_spinouttimer] != 0 || if ((player->pflags & PF_ATTACKDOWN) && !(cmd->buttons & BT_ATTACK))
player->kartstuff[k_squishedtimer] != 0 || player->pflags &= ~PF_ATTACKDOWN;
player->kartstuff[k_respawn] != 0) else if (cmd->buttons & BT_ATTACK)
return; player->pflags |= PF_ATTACKDOWN;
const ticcmd_t *cmd = &player->cmd;
const boolean ATTACK_IS_DOWN = ((cmd->buttons & BT_ATTACK) && !oldattackdown);
const boolean HOLDING_ITEM = (player->kartstuff[k_itemheld] || player->kartstuff[k_eggmanheld]);
const boolean NO_HYUDORO = (player->kartstuff[k_stolentimer] == 0 && player->kartstuff[k_stealingtimer] == 0);
if (player && player->mo && player->mo->health > 0 && !player->spectator && !(player->exiting || mapreset)
&& player->kartstuff[k_spinouttimer] == 0 && player->kartstuff[k_squishedtimer] == 0 && player->kartstuff[k_respawn] == 0)
{
// First, the really specific, finicky items that function without the item being directly in your item slot. // First, the really specific, finicky items that function without the item being directly in your item slot.
// Karma item dropping // Karma item dropping
if (ATTACK_IS_DOWN && player->kartstuff[k_comebackmode] && !player->kartstuff[k_comebacktimer]) if (ATTACK_IS_DOWN && player->kartstuff[k_comebackmode] && !player->kartstuff[k_comebacktimer])
@@ -6407,15 +6373,12 @@ static void K_PlayerItemThink(player_t *player, boolean onground, boolean oldatt
else else
{ {
newitem = P_SpawnMobj(player->mo->x, player->mo->y, player->mo->z, MT_EGGMANITEM); newitem = P_SpawnMobj(player->mo->x, player->mo->y, player->mo->z, MT_EGGMANITEM);
if (player->kartstuff[k_eggmanblame] >= 0
const INT32 blametarg = player->kartstuff[k_eggmanblame]; && player->kartstuff[k_eggmanblame] < MAXPLAYERS
&& playeringame[player->kartstuff[k_eggmanblame]]
if ((blametarg >= 0 && blametarg < MAXPLAYERS) && !players[player->kartstuff[k_eggmanblame]].spectator
&& playeringame[blametarg] && players[player->kartstuff[k_eggmanblame]].mo)
&& !players[blametarg].spectator P_SetTarget(&newitem->target, players[player->kartstuff[k_eggmanblame]].mo);
&& players[blametarg].mo)
P_SetTarget(&newitem->target, players[blametarg].mo);
player->kartstuff[k_eggmanblame] = -1; player->kartstuff[k_eggmanblame] = -1;
} }
@@ -6446,9 +6409,7 @@ static void K_PlayerItemThink(player_t *player, boolean onground, boolean oldatt
{ {
K_DoSneaker(player, 2); K_DoSneaker(player, 2);
K_PlayBoostTaunt(player->mo); K_PlayBoostTaunt(player->mo);
player->kartstuff[k_rocketsneakertimer] -= 2*TICRATE; player->kartstuff[k_rocketsneakertimer] -= 2*TICRATE;
if (player->kartstuff[k_rocketsneakertimer] < 1) if (player->kartstuff[k_rocketsneakertimer] < 1)
player->kartstuff[k_rocketsneakertimer] = 1; player->kartstuff[k_rocketsneakertimer] = 1;
} }
@@ -6460,7 +6421,6 @@ static void K_PlayerItemThink(player_t *player, boolean onground, boolean oldatt
if (cmd->buttons & BT_ATTACK) if (cmd->buttons & BT_ATTACK)
{ {
player->kartstuff[k_growcancel]++; player->kartstuff[k_growcancel]++;
if (player->kartstuff[k_growcancel] > 26) if (player->kartstuff[k_growcancel] > 26)
K_RemoveGrowShrink(player); K_RemoveGrowShrink(player);
} }
@@ -6535,7 +6495,6 @@ static void K_PlayerItemThink(player_t *player, boolean onground, boolean oldatt
overlay->destscale = player->mo->scale; overlay->destscale = player->mo->scale;
P_SetScale(overlay, player->mo->scale); P_SetScale(overlay, player->mo->scale);
} }
player->kartstuff[k_invincibilitytimer] = itemtime+(2*TICRATE); // 10 seconds player->kartstuff[k_invincibilitytimer] = itemtime+(2*TICRATE); // 10 seconds
if (cv_supermusic.value == 1 && P_IsLocalPlayer(player)) if (cv_supermusic.value == 1 && P_IsLocalPlayer(player))
@@ -6560,13 +6519,11 @@ static void K_PlayerItemThink(player_t *player, boolean onground, boolean oldatt
for (moloop = 0; moloop < player->kartstuff[k_itemamount]; moloop++) for (moloop = 0; moloop < player->kartstuff[k_itemamount]; moloop++)
{ {
mo = P_SpawnMobj(player->mo->x, player->mo->y, player->mo->z, MT_BANANA_SHIELD); mo = P_SpawnMobj(player->mo->x, player->mo->y, player->mo->z, MT_BANANA_SHIELD);
if (!mo) if (!mo)
{ {
player->kartstuff[k_itemamount] = moloop; player->kartstuff[k_itemamount] = moloop;
break; break;
} }
mo->flags |= MF_NOCLIPTHING; mo->flags |= MF_NOCLIPTHING;
mo->threshold = 10; mo->threshold = 10;
mo->movecount = player->kartstuff[k_itemamount]; mo->movecount = player->kartstuff[k_itemamount];
@@ -6593,7 +6550,6 @@ static void K_PlayerItemThink(player_t *player, boolean onground, boolean oldatt
player->kartstuff[k_eggmanheld] = 1; player->kartstuff[k_eggmanheld] = 1;
S_StartSound(player->mo, sfx_s254); S_StartSound(player->mo, sfx_s254);
mo = P_SpawnMobj(player->mo->x, player->mo->y, player->mo->z, MT_EGGMANITEM_SHIELD); mo = P_SpawnMobj(player->mo->x, player->mo->y, player->mo->z, MT_EGGMANITEM_SHIELD);
if (mo) if (mo)
{ {
mo->flags |= MF_NOCLIPTHING; mo->flags |= MF_NOCLIPTHING;
@@ -6621,13 +6577,11 @@ static void K_PlayerItemThink(player_t *player, boolean onground, boolean oldatt
{ {
newangle = (player->mo->angle + ANGLE_157h) + FixedAngle(((360 / player->kartstuff[k_itemamount]) * moloop) << FRACBITS) + ANGLE_90; newangle = (player->mo->angle + ANGLE_157h) + FixedAngle(((360 / player->kartstuff[k_itemamount]) * moloop) << FRACBITS) + ANGLE_90;
mo = P_SpawnMobj(player->mo->x, player->mo->y, player->mo->z, MT_ORBINAUT_SHIELD); mo = P_SpawnMobj(player->mo->x, player->mo->y, player->mo->z, MT_ORBINAUT_SHIELD);
if (!mo) if (!mo)
{ {
player->kartstuff[k_itemamount] = moloop; player->kartstuff[k_itemamount] = moloop;
break; break;
} }
mo->flags |= MF_NOCLIPTHING; mo->flags |= MF_NOCLIPTHING;
mo->angle = newangle; mo->angle = newangle;
mo->threshold = 10; mo->threshold = 10;
@@ -6664,13 +6618,11 @@ static void K_PlayerItemThink(player_t *player, boolean onground, boolean oldatt
{ {
newangle = (player->mo->angle + ANGLE_157h) + FixedAngle(((360 / player->kartstuff[k_itemamount]) * moloop) << FRACBITS) + ANGLE_90; newangle = (player->mo->angle + ANGLE_157h) + FixedAngle(((360 / player->kartstuff[k_itemamount]) * moloop) << FRACBITS) + ANGLE_90;
mo = P_SpawnMobj(player->mo->x, player->mo->y, player->mo->z, MT_JAWZ_SHIELD); mo = P_SpawnMobj(player->mo->x, player->mo->y, player->mo->z, MT_JAWZ_SHIELD);
if (!mo) if (!mo)
{ {
player->kartstuff[k_itemamount] = moloop; player->kartstuff[k_itemamount] = moloop;
break; break;
} }
mo->flags |= MF_NOCLIPTHING; mo->flags |= MF_NOCLIPTHING;
mo->angle = newangle; mo->angle = newangle;
mo->threshold = 10; mo->threshold = 10;
@@ -6688,7 +6640,6 @@ static void K_PlayerItemThink(player_t *player, boolean onground, boolean oldatt
K_ThrowKartItem(player, true, MT_JAWZ, 1, 0); K_ThrowKartItem(player, true, MT_JAWZ, 1, 0);
else if (player->kartstuff[k_throwdir] == -1) // Throwing backward gives you a dud that doesn't home in else if (player->kartstuff[k_throwdir] == -1) // Throwing backward gives you a dud that doesn't home in
K_ThrowKartItem(player, true, MT_JAWZ_DUD, -1, 0); K_ThrowKartItem(player, true, MT_JAWZ_DUD, -1, 0);
K_PlayAttackTaunt(player->mo); K_PlayAttackTaunt(player->mo);
player->kartstuff[k_itemamount]--; player->kartstuff[k_itemamount]--;
K_UpdateHnextList(player, false); K_UpdateHnextList(player, false);
@@ -6698,11 +6649,9 @@ static void K_PlayerItemThink(player_t *player, boolean onground, boolean oldatt
if (ATTACK_IS_DOWN && !HOLDING_ITEM && NO_HYUDORO) if (ATTACK_IS_DOWN && !HOLDING_ITEM && NO_HYUDORO)
{ {
mobj_t *mo; mobj_t *mo;
player->kartstuff[k_itemheld] = 1; player->kartstuff[k_itemheld] = 1;
S_StartSound(player->mo, sfx_s254); S_StartSound(player->mo, sfx_s254);
mo = P_SpawnMobj(player->mo->x, player->mo->y, player->mo->z, MT_SSMINE_SHIELD); mo = P_SpawnMobj(player->mo->x, player->mo->y, player->mo->z, MT_SSMINE_SHIELD);
if (mo) if (mo)
{ {
mo->flags |= MF_NOCLIPTHING; mo->flags |= MF_NOCLIPTHING;
@@ -6749,19 +6698,14 @@ static void K_PlayerItemThink(player_t *player, boolean onground, boolean oldatt
K_PlayPowerGloatSound(player->mo); K_PlayPowerGloatSound(player->mo);
player->mo->scalespeed = mapobjectscale/TICRATE; player->mo->scalespeed = mapobjectscale/TICRATE;
player->mo->destscale = (3*mapobjectscale)/2; player->mo->destscale = (3*mapobjectscale)/2;
if (cv_kartdebugshrink.value && !modeattacking && !player->bot) if (cv_kartdebugshrink.value && !modeattacking && !player->bot)
player->mo->destscale = (6*player->mo->destscale)/8; player->mo->destscale = (6*player->mo->destscale)/8;
player->kartstuff[k_growshrinktimer] = itemtime+(4*TICRATE); // 12 seconds player->kartstuff[k_growshrinktimer] = itemtime+(4*TICRATE); // 12 seconds
if (cv_growmusic.value == 1 && P_IsLocalPlayer(player)) if (cv_growmusic.value == 1 && P_IsLocalPlayer(player))
S_ChangeMusicSpecial("kgrow"); S_ChangeMusicSpecial("kgrow");
P_RestoreMusic(player); P_RestoreMusic(player);
S_StartSound(player->mo, sfx_kc5a); S_StartSound(player->mo, sfx_kc5a);
} }
player->kartstuff[k_itemamount]--; player->kartstuff[k_itemamount]--;
} }
break; break;
@@ -6810,11 +6754,9 @@ static void K_PlayerItemThink(player_t *player, boolean onground, boolean oldatt
if (ATTACK_IS_DOWN && !HOLDING_ITEM && NO_HYUDORO) if (ATTACK_IS_DOWN && !HOLDING_ITEM && NO_HYUDORO)
{ {
mobj_t *mo; mobj_t *mo;
player->kartstuff[k_itemheld] = 1; player->kartstuff[k_itemheld] = 1;
S_StartSound(player->mo, sfx_s254); S_StartSound(player->mo, sfx_s254);
mo = P_SpawnMobj(player->mo->x, player->mo->y, player->mo->z, MT_SINK_SHIELD); mo = P_SpawnMobj(player->mo->x, player->mo->y, player->mo->z, MT_SINK_SHIELD);
if (mo) if (mo)
{ {
mo->flags |= MF_NOCLIPTHING; mo->flags |= MF_NOCLIPTHING;
@@ -6892,8 +6834,8 @@ static void K_PlayerItemThink(player_t *player, boolean onground, boolean oldatt
} }
else else
{ {
if (P_IsDisplayPlayer(player) || if (P_IsDisplayPlayer(player)
(player->kartstuff[k_hyudorotimer] < (1*TICRATE/2) || player->kartstuff[k_hyudorotimer] > hyudorotime-(1*TICRATE/2))) || (!P_IsDisplayPlayer(player) && (player->kartstuff[k_hyudorotimer] < (1*TICRATE/2) || player->kartstuff[k_hyudorotimer] > hyudorotime-(1*TICRATE/2))))
{ {
if (!cv_reducevfx.value && leveltime & 1) if (!cv_reducevfx.value && leveltime & 1)
player->mo->flags2 |= MF2_DONTDRAW; player->mo->flags2 |= MF2_DONTDRAW;
@@ -6925,44 +6867,6 @@ static void K_PlayerItemThink(player_t *player, boolean onground, boolean oldatt
} }
} }
//
// K_MoveKartPlayer
//
void K_MoveKartPlayer(player_t *player, boolean onground)
{
ticcmd_t *cmd = &player->cmd;
const boolean oldattackdown = (player->pflags & PF_ATTACKDOWN); // fun
if ((player->pflags & PF_ATTACKDOWN) && !(cmd->buttons & BT_ATTACK))
player->pflags &= ~PF_ATTACKDOWN;
else if (cmd->buttons & BT_ATTACK)
player->pflags |= PF_ATTACKDOWN;
K_KartUpdatePosition(player);
// Play overtake sounds, but only if
// - your place changed
// - not exiting
if (!player->exiting)
{
if (player->kartstuff[k_oldposition] < player->kartstuff[k_position]) // But first, if you lost a place,
{
player->kartstuff[k_oldposition] = player->kartstuff[k_position]; // then the other player taunts.
K_RegularVoiceTimers(player); // and you can't for a bit
}
else if (player->kartstuff[k_oldposition] > player->kartstuff[k_position]) // Otherwise,
{
K_PlayOvertakeSound(player->mo); // Say "YOU'RE TOO SLOW!"
player->kartstuff[k_oldposition] = player->kartstuff[k_position]; // Restore the old position,
}
}
if (player->kartstuff[k_positiondelay])
player->kartstuff[k_positiondelay]--;
K_PlayerItemThink(player, onground, oldattackdown);
// JugadorXEI: Do *not* calculate friction when a player is pogo'd // JugadorXEI: Do *not* calculate friction when a player is pogo'd
// because they'll be in the air and friction will not reset! // because they'll be in the air and friction will not reset!
if (onground && !player->kartstuff[k_pogospring]) if (onground && !player->kartstuff[k_pogospring])
@@ -7010,14 +6914,12 @@ void K_MoveKartPlayer(player_t *player, boolean onground)
K_KartDrift(player, onground); K_KartDrift(player, onground);
//// funneh Saturn sprite stuff if (player->sliproll && ((!player->kartstuff[k_aizdriftstrat]) || (!P_IsObjectOnGround(player->mo)) || (player->kartstuff[k_drift])))
if ((player->sliproll > 0) &&
(!player->kartstuff[k_aizdriftstrat] || player->kartstuff[k_drift] || !P_IsObjectOnGround(player->mo)))
{ {
player->sliproll -= (4*ANG1); player->sliproll -= (4*ANG1);
} }
// funneh Saturn sprite stuff
if (cv_gravstretch.value) if (cv_gravstretch.value)
K_StretchPlayerGravity(player); K_StretchPlayerGravity(player);
else if (cv_saltyhop.value && cv_saltysquish.value) else if (cv_saltyhop.value && cv_saltysquish.value)
@@ -7025,8 +6927,6 @@ void K_MoveKartPlayer(player_t *player, boolean onground)
K_RollMobjBySlopes(player->mo, player->mo->standingslope); K_RollMobjBySlopes(player->mo, player->mo->standingslope);
////
// Quick Turning // Quick Turning
// You can't turn your kart when you're not moving. // You can't turn your kart when you're not moving.
// So now it's time to burn some rubber! // So now it's time to burn some rubber!
@@ -7078,7 +6978,6 @@ void K_MoveKartPlayer(player_t *player, boolean onground)
{ {
player->mo->scalespeed = mapobjectscale/12; player->mo->scalespeed = mapobjectscale/12;
player->mo->destscale = mapobjectscale + (FixedMul(mapobjectscale, player->kartstuff[k_boostcharge]*131)); player->mo->destscale = mapobjectscale + (FixedMul(mapobjectscale, player->kartstuff[k_boostcharge]*131));
if (cv_kartdebugshrink.value && !modeattacking && !player->bot) if (cv_kartdebugshrink.value && !modeattacking && !player->bot)
player->mo->destscale = (6*player->mo->destscale)/8; player->mo->destscale = (6*player->mo->destscale)/8;
} }
@@ -7109,7 +7008,6 @@ void K_MoveKartPlayer(player_t *player, boolean onground)
else else
{ {
K_SpawnDashDustRelease(player); // already handled for perfect boosts by K_DoSneaker K_SpawnDashDustRelease(player); // already handled for perfect boosts by K_DoSneaker
if ((!player->kartstuff[k_floorboost] || player->kartstuff[k_floorboost] == 3) && P_IsLocalPlayer(player)) if ((!player->kartstuff[k_floorboost] || player->kartstuff[k_floorboost] == 3) && P_IsLocalPlayer(player))
{ {
if (player->kartstuff[k_boostcharge] <= 40) if (player->kartstuff[k_boostcharge] <= 40)
@@ -7400,7 +7298,6 @@ void K_CheckSpectateStatus(void)
{ {
UINT8 oldrespawnlist[MAXPLAYERS]; UINT8 oldrespawnlist[MAXPLAYERS];
memcpy(oldrespawnlist, respawnlist, numjoiners); memcpy(oldrespawnlist, respawnlist, numjoiners);
for (i = 0; i < numjoiners; i++) for (i = 0; i < numjoiners; i++)
{ {
UINT8 pos = 0; UINT8 pos = 0;
+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;
+3 -7
View File
@@ -1025,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
@@ -1046,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
@@ -1065,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
{ {
+24 -27
View File
@@ -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[] =
@@ -1848,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[] =
@@ -1890,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.",
+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);
} }
} }
+7 -12
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;
+52 -68
View File
@@ -1462,11 +1462,48 @@ 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
//if (!P_MobjWasRemoved(target->target) && target->target->player && !P_MobjWasRemoved(target->target->player->mo))
if (target->target && target->target->player && target->target->player->mo) if (target->target && target->target->player && target->target->player->mo)
{ {
if (target->target->player->kartstuff[k_eggmanheld] && target->type == MT_EGGMANITEM_SHIELD) if (target->target->player->kartstuff[k_eggmanheld] && target->type == MT_EGGMANITEM_SHIELD)
@@ -1480,7 +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])
{ {
if (target->target->hnext) // !P_MobjWasRemoved(target->target->hnext)) if (target->target->hnext)
K_KillBananaChain(target->target->hnext, inflictor, source); K_KillBananaChain(target->target->hnext, inflictor, source);
target->target->player->kartstuff[k_itemamount] = 0; target->target->player->kartstuff[k_itemamount] = 0;
@@ -1509,59 +1546,13 @@ 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);
} }
} }
}
/** 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)
{
// 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 // 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
if (target->player)
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;
} }
@@ -1572,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
@@ -1590,9 +1580,7 @@ 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) if (netgame || multiplayer)
ms = cv_respawntime.value * 1000; ms = cv_respawntime.value * 1000;
@@ -1600,8 +1588,8 @@ void P_KillMobj(mobj_t *target, mobj_t *inflictor, mobj_t *source)
ms = 1000; 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);
@@ -1609,24 +1597,20 @@ void P_KillMobj(mobj_t *target, mobj_t *inflictor, mobj_t *source)
S_FadeOutStopMusic(cv_respawnfademusicout.value); S_FadeOutStopMusic(cv_respawnfademusicout.value);
} }
if (target->player == &players[consoleplayer])
{
// don't die in auto map,
// switch view prior to dying
if (automapactive)
AM_Stop();
}
for (UINT8 i = 0; i <= splitscreen; i++) for (UINT8 i = 0; i <= splitscreen; i++)
{ {
if (target->player == P_GetLocalPlayerForNum(i)) if (target->player == P_GetLocalPlayerForNum(i))
{ {
// don't die in auto map,
// switch view prior to dying
if (i == 0 && automapactive)
AM_Stop();
// added : 22-02-98: recenter view for next life... // added : 22-02-98: recenter view for next life...
localaiming[i] = 0; localaiming[i] = 0;
break; break;
} }
} }
}
if (G_BattleGametype()) if (G_BattleGametype())
K_CheckBumpers(); K_CheckBumpers();
@@ -1640,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)
+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;
+9 -10
View File
@@ -1575,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.
{ {
@@ -3544,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);
@@ -3563,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;
} }
-9
View File
@@ -9167,11 +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
//if (P_MobjWasRemoved(mobj))
if (!mobj) // anything that calls checkposition can be lethal
return;
P_ButteredSlope(mobj); P_ButteredSlope(mobj);
} }
@@ -9197,10 +9192,6 @@ void P_MobjThinker(mobj_t *mobj)
} }
} }
//if (P_MobjWasRemoved(mobj))
if (!mobj)
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);
+4 -9
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
@@ -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
{ {
+26 -303
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)
@@ -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]];
/* 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; li->frontsector = sides[ldef->sidenum[rawside]].sector;
}
if (ldef->flags & ML_TWOSIDED) if (ldef->flags & ML_TWOSIDED)
{
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; 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;
@@ -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)
@@ -1897,17 +1669,6 @@ static boolean P_LoadRawBlockMap(UINT8 *data, size_t count)
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++;
} }
} }
@@ -2593,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];
@@ -3212,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
-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
+19 -37
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,14 +108,14 @@ 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);
@@ -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)
{ {
@@ -365,9 +358,7 @@ boolean P_CheckSight2(mobj_t *t1, mobj_t *t2, boolean fast)
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,19 +368,19 @@ 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
// same subsector? obviously visible // same subsector? obviously visible
// 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))
{ {
-2
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
+71 -164
View File
@@ -889,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;
@@ -899,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;
@@ -1234,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;
@@ -1271,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)
@@ -1294,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!
@@ -1308,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)
@@ -1338,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)
{ {
@@ -1349,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;
} }
@@ -1455,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)
{ {
@@ -1465,20 +1459,17 @@ boolean P_RunTriggerLinedef(line_t *triggerline, mobj_t *actor, sector_t *caller
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
{ {
boolean backwards = false; boolean backwards = false;
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)
@@ -1497,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;
@@ -1511,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);
@@ -1526,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;
@@ -1609,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))
@@ -1989,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)
@@ -2435,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;
@@ -2504,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;
@@ -2519,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;
@@ -2583,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;
} }
@@ -2601,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;
} }
@@ -2633,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
@@ -2682,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)
@@ -2710,7 +2684,6 @@ static void P_ProcessLineSpecial(line_t *line, mobj_t *mo, sector_t *callsec)
break; break;
} }
} }
}
} while (tryagain); } while (tryagain);
} }
break; break;
@@ -3286,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)
@@ -3340,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)
@@ -3414,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);
@@ -3439,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);
@@ -3473,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;
@@ -3494,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
@@ -3516,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
@@ -3572,15 +3525,12 @@ DoneSection2:
P_DoPlayerExit(player); P_DoPlayerExit(player);
P_SetupSignExit(player); P_SetupSignExit(player);
if (gametype == GT_COOP)
{
// important: use sector->tag on next line instead of player->mo->subsector->tag // 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 // this part is different from in P_PlayerThink, this is what was causing
// FOF custom exits not to work. // FOF custom exits not to work.
lineindex = P_FindSpecialLineFromTag(2, sector->tag, -1); lineindex = P_FindSpecialLineFromTag(2, sector->tag, -1);
if (lineindex != -1) // Custom exit!) if (gametype == GT_COOP && lineindex != -1) // Custom exit!
{ {
// Special goodies with the block monsters flag depending on emeralds collected // Special goodies with the block monsters flag depending on emeralds collected
if ((lines[lineindex].flags & ML_BLOCKMONSTERS) && ALL7EMERALDS(emeralds)) if ((lines[lineindex].flags & ML_BLOCKMONSTERS) && ALL7EMERALDS(emeralds))
@@ -3592,7 +3542,6 @@ DoneSection2:
skipstats = true; skipstats = true;
} }
} }
}
break; break;
case 3: // Red Team's Base case 3: // Red Team's Base
@@ -3696,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;
@@ -3743,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;
@@ -3771,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;
@@ -3818,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;
@@ -3838,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)")
{ {
@@ -4561,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++)
{ {
@@ -4597,38 +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();
// Dynamic slopeness
// we run this here only when not joined midrace
// for vanilla compat reasons :chaosleep:
if (!midgamejoin)
P_RunDynamicSlopes();
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;
} }
@@ -4679,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
@@ -5232,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)
@@ -5398,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)
@@ -6056,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;
@@ -6503,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;
if (!(thing->flags & MF_NOCLIP)) // Thing must be clipped
{
height = P_GetSpecialBottomZ(thing, sec, psec); height = P_GetSpecialBottomZ(thing, sec, psec);
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 if (!(thing->flags & MF_NOGRAVITY || thing->z+thing->height != height)) // Thing must a) be non-floating and have z+height == height
{ {
// Move objects only if on floor // Move objects only if on floor
// non-floating, and clipped. // non-floating, and clipped.
P_DoScrollMove(thing, dx, dy, s->exclusive); 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
} }
@@ -6529,11 +6448,10 @@ 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, // Move objects only if on floor or underwater,
// non-floating, and clipped. // non-floating, and clipped.
@@ -6541,7 +6459,6 @@ void T_Scroll(scroll_t *s)
} }
} }
} }
}
break; break;
case sc_carry_ceiling: // carry on ceiling (FOF scrolling) case sc_carry_ceiling: // carry on ceiling (FOF scrolling)
@@ -6584,17 +6501,15 @@ 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_NOCLIP)) // Thing must be clipped
if (!(thing->flags & MF_NOGRAVITY || thing->z != height))// Thing must a) be non-floating and have z == height 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, // Move objects only if on floor or underwater,
// non-floating, and clipped. // non-floating, and clipped.
P_DoScrollMove(thing, dx, dy, s->exclusive); 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
} }
@@ -6608,11 +6523,10 @@ 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, // Move objects only if on floor or underwater,
// non-floating, and clipped. // non-floating, and clipped.
@@ -6620,7 +6534,6 @@ void T_Scroll(scroll_t *s)
} }
} }
} }
}
break; // end of sc_carry_ceiling break; // end of sc_carry_ceiling
} // end of switch } // end of switch
} }
@@ -6785,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));
@@ -6996,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;
@@ -7031,7 +6943,6 @@ static void P_SpawnFriction(void)
Add_Friction(friction, movefactor, s, -1); Add_Friction(friction, movefactor, s, -1);
} }
} }
}
/* /*
SoM: 3/8/2000: Push/Pull/Wind/Current functions. SoM: 3/8/2000: Push/Pull/Wind/Current functions.
@@ -7082,7 +6993,6 @@ static void Add_Pusher(pushertype_e type, fixed_t x_mag, fixed_t y_mag, mobj_t *
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
@@ -7140,7 +7050,8 @@ static inline boolean PIT_PushThing(mobj_t *thing)
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);
@@ -7303,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.
@@ -7345,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)
{
if (thing->player->pflags & PF_ROPEHANG)
continue; 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;
@@ -7552,7 +7461,6 @@ 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
@@ -7589,7 +7497,6 @@ static void P_SpawnPushers(void)
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)
{ {
-9
View File
@@ -611,15 +611,6 @@ void P_Ticker(boolean run)
#ifdef DEMO_COMPAT_100 #ifdef DEMO_COMPAT_100
} }
#endif #endif
// Lookback is normally handled inside G_BuildTiccmd, which isn't called in replays so we're doing that manually
// idk if this is best place to handle this tho...
for (i = 0; i <= splitscreen; ++i)
{
const boolean usejoystick = cv_usejoystick[i].value;
INT32 axis = JoyAxis(AXISLOOKBACK, i+1);
camspin[i] = (InputDown(gc_lookback, i+1) || (usejoystick && axis > 0));
}
} }
ps_lua_mobjhooks.value.i = 0; ps_lua_mobjhooks.value.i = 0;
+15 -22
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)
@@ -1573,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;
@@ -1841,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)
@@ -1852,6 +1843,8 @@ void P_Telekinesis(player_t *player, fixed_t thrust, fixed_t range)
if (!P_CheckSight(player->mo, mo2)) if (!P_CheckSight(player->mo, mo2))
continue; // if your psychic powers can't "see" it don't bother continue; // if your psychic powers can't "see" it don't bother
if (mo2->health > 0)
{
an = R_PointToAngle2(player->mo->x, player->mo->y, mo2->x, mo2->y); an = R_PointToAngle2(player->mo->x, player->mo->y, mo2->x, mo2->y);
P_Thrust(mo2, an, thrust); P_Thrust(mo2, an, thrust);
@@ -1859,6 +1852,7 @@ void P_Telekinesis(player_t *player, fixed_t thrust, fixed_t range)
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);
player->pflags |= PF_THOKKED; player->pflags |= PF_THOKKED;
@@ -2361,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)
@@ -2742,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;
@@ -3155,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);
@@ -3739,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
@@ -4586,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
+4 -17
View File
@@ -321,19 +321,12 @@ static void R_AddLine(seg_t *line)
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
+5 -10
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]];
@@ -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,17 +2637,15 @@ 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
set_topstep_normal(); set_topstep_normal();
@@ -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
@@ -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;
+12 -23
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
@@ -264,8 +264,6 @@ boolean R_AddSingleSpriteDef(const char *sprname, spritedef_t *spritedef, UINT16
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)
@@ -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);
} }
@@ -392,13 +381,11 @@ boolean R_AddSingleSpriteDef(const char *sprname, spritedef_t *spritedef, UINT16
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);
} }
+22 -36
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,11 +535,11 @@ 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 // Check to see if it is audible, and if not, modify the params
if (origin && !itsUs) if (origin && !itsUs)
{ {
boolean audible = false; boolean audible = false;
if (splitscreen > 0) if (splitscreen > 0)
{ {
fixed_t recdist = INT32_MAX; fixed_t recdist = INT32_MAX;
@@ -591,12 +586,6 @@ void S_StartSoundAtVolume(const void *origin_p, sfxenum_t sfx_id, INT32 volume)
if (!sfx->data) if (!sfx->data)
{ {
sfx->data = I_GetSfx(sfx); sfx->data = I_GetSfx(sfx);
if (!sfx->data)
{
CONS_Alert(CONS_WARNING, "Tried to load invalid sfx_%s\n", sfx->name);
return; /* don't play it */
}
} }
// Avoid channel reverse if surround // Avoid channel reverse if surround
@@ -619,6 +608,7 @@ void S_StartSoundAtVolume(const void *origin_p, sfxenum_t sfx_id, INT32 volume)
channels[cnum].volume = initial_volume; channels[cnum].volume = initial_volume;
channels[cnum].handle = I_StartSound(sfx_id, volume, sep, cnum); 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,25 +761,18 @@ void S_UpdateSounds(void)
{ {
c = &channels[cnum]; c = &channels[cnum];
if (c->sfxinfo == NULL) if (c->sfxinfo)
continue; {
if (I_SoundIsPlaying(c->handle))
// if channel is allocated but sound has stopped, free it
if (!I_SoundIsPlaying(c->handle))
{ {
S_StopChannel(cnum);
continue;
}
if (c->origin == NULL)
continue;
// initialize parameters // initialize parameters
volume = c->volume; // 8 bits internal volume precision volume = c->volume; // 8 bits internal volume precision
sep = NORM_SEP; sep = NORM_SEP;
// check non-local sounds for distance clipping // check non-local sounds for distance clipping
// or modify their params // or modify their params
if (c->origin)
{
boolean itsUs = false; boolean itsUs = false;
for (i = splitscreen; i >= 0; i--) for (i = splitscreen; i >= 0; i--)
@@ -855,6 +833,14 @@ void S_UpdateSounds(void)
S_StopChannel(cnum); S_StopChannel(cnum);
} }
} }
}
else
{
// if channel is allocated but sound has stopped, free it
S_StopChannel(cnum);
}
}
}
I_UpdateSound(); I_UpdateSound();
} }
@@ -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++)
{ {
+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.
+1 -1
View File
@@ -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
View File
@@ -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;
} }
-10
View File
@@ -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;