Compare commits
19
Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
0016d4836a | ||
|
|
66bc684738 | ||
|
|
44e377c981 | ||
|
|
91de633633 | ||
|
|
f1047f9e76 | ||
|
|
864e28fcf7 | ||
|
|
b2b0ca17d3 | ||
|
|
9b879e31e2 | ||
|
|
8e5633a23f | ||
|
|
8bcada1fda | ||
|
|
771152b919 | ||
|
|
b4277c88c1 | ||
|
|
63026cc11d | ||
|
|
b8385d1579 | ||
|
|
916cc9d8ca | ||
|
|
347000a326 | ||
|
|
4967313720 | ||
|
|
19b64a8b61 | ||
|
|
6a7b2b9721 |
No files matched your search
+1
-1
@@ -54,7 +54,7 @@ set(SRB2_CORE_SOURCES
|
|||||||
string.c
|
string.c
|
||||||
tables.c
|
tables.c
|
||||||
v_video.c
|
v_video.c
|
||||||
w_wad.cpp
|
w_wad.c
|
||||||
y_inter.c
|
y_inter.c
|
||||||
z_zone.cpp
|
z_zone.cpp
|
||||||
)
|
)
|
||||||
|
|||||||
+5
-6
@@ -93,7 +93,7 @@
|
|||||||
# NOLDWARNING=1 - ?
|
# NOLDWARNING=1 - ?
|
||||||
# NOSDLMAIN=1 - ?
|
# NOSDLMAIN=1 - ?
|
||||||
# SDLMAIN=1 - ?
|
# SDLMAIN=1 - ?
|
||||||
# NOLTO=1 - Disable link time optimizations
|
# USELTO=1 - Enable building with LTO.
|
||||||
#
|
#
|
||||||
# Library configuration flags:
|
# Library configuration flags:
|
||||||
# Everything here is an override.
|
# Everything here is an override.
|
||||||
@@ -260,7 +260,7 @@ debug_opts=-D_DEBUG
|
|||||||
else # build a normal optimized version
|
else # build a normal optimized version
|
||||||
debug_opts=-DNDEBUG
|
debug_opts=-DNDEBUG
|
||||||
opts+=-O3
|
opts+=-O3
|
||||||
ifndef NOLTO
|
ifdef USELTO
|
||||||
# compile with LTO
|
# compile with LTO
|
||||||
opts+=-flto=auto
|
opts+=-flto=auto
|
||||||
libs+=-flto=auto
|
libs+=-flto=auto
|
||||||
@@ -269,13 +269,13 @@ endif
|
|||||||
|
|
||||||
ifdef USEASAN
|
ifdef USEASAN
|
||||||
# compile with asan
|
# compile with asan
|
||||||
opts+=-O1 -fsanitize=address -fno-omit-frame-pointer -fno-common
|
opts+=-fsanitize=address
|
||||||
libs+=-fsanitize=address
|
libs+=-fsanitize=address
|
||||||
endif
|
endif
|
||||||
|
|
||||||
ifdef USEUBSAN
|
ifdef USEUBSAN
|
||||||
# compile with ubsan
|
# compile with asan
|
||||||
opts+=-O1 -fsanitize=undefined -fno-omit-frame-pointer
|
opts+=-fsanitize=undefined
|
||||||
libs+=-fsanitize=undefined
|
libs+=-fsanitize=undefined
|
||||||
endif
|
endif
|
||||||
|
|
||||||
@@ -295,7 +295,6 @@ opts+=$(debug_opts)
|
|||||||
|
|
||||||
opts+=$(foreach v,$(passthru_opts),$(if $($(v)),-D$(v)))
|
opts+=$(foreach v,$(passthru_opts),$(if $($(v)),-D$(v)))
|
||||||
|
|
||||||
CWFLAGS+=-std=gnu17
|
|
||||||
CXXFLAGS+=-std=c++17 # force c17 for c++ since most vpss run older ubuntu versions with old compilers
|
CXXFLAGS+=-std=c++17 # force c17 for c++ since most vpss run older ubuntu versions with old compilers
|
||||||
|
|
||||||
opts+=$(WFLAGS) $(CFLAGS)
|
opts+=$(WFLAGS) $(CFLAGS)
|
||||||
|
|||||||
+12
-13
@@ -20,8 +20,7 @@ $(foreach v,$(join $(wordlist 2,$(_n),- $(gcc_versions)),\
|
|||||||
CXXFLAGS+= -Wno-aggregate-return
|
CXXFLAGS+= -Wno-aggregate-return
|
||||||
|
|
||||||
# -W -Wno-unused
|
# -W -Wno-unused
|
||||||
WFLAGS:=-Wall -Wnull-dereference
|
WFLAGS:=-Wall -Wno-trigraphs -Wnull-dereference
|
||||||
#WFLAGS+=-Wno-trigraphs
|
|
||||||
ifdef GCC152
|
ifdef GCC152
|
||||||
WFLAGS+=-Wzero-as-null-pointer-constant
|
WFLAGS+=-Wzero-as-null-pointer-constant
|
||||||
endif
|
endif
|
||||||
@@ -32,7 +31,7 @@ ifndef RELAXWARNINGS
|
|||||||
WFLAGS+=-W
|
WFLAGS+=-W
|
||||||
#WFLAGS+=-Wno-sign-compare
|
#WFLAGS+=-Wno-sign-compare
|
||||||
ifndef GCC295
|
ifndef GCC295
|
||||||
# WFLAGS+=-Wno-div-by-zero
|
WFLAGS+=-Wno-div-by-zero
|
||||||
endif
|
endif
|
||||||
#WFLAGS+=-Wsystem-headers
|
#WFLAGS+=-Wsystem-headers
|
||||||
WFLAGS+=-Wfloat-equal
|
WFLAGS+=-Wfloat-equal
|
||||||
@@ -63,7 +62,7 @@ endif
|
|||||||
endif
|
endif
|
||||||
WFLAGS+=-Wsign-compare
|
WFLAGS+=-Wsign-compare
|
||||||
ifdef GCC91
|
ifdef GCC91
|
||||||
# WFLAGS+=-Wno-error=address-of-packed-member
|
WFLAGS+=-Wno-error=address-of-packed-member
|
||||||
endif
|
endif
|
||||||
ifdef GCC45
|
ifdef GCC45
|
||||||
WFLAGS+=-Wlogical-op
|
WFLAGS+=-Wlogical-op
|
||||||
@@ -106,14 +105,14 @@ endif
|
|||||||
endif
|
endif
|
||||||
WFLAGS+=-Wformat-y2k
|
WFLAGS+=-Wformat-y2k
|
||||||
ifdef GCC71
|
ifdef GCC71
|
||||||
#WFLAGS+=-Wno-error=format-overflow=2
|
WFLAGS+=-Wno-error=format-overflow=2
|
||||||
endif
|
endif
|
||||||
WFLAGS+=-Wformat-security
|
WFLAGS+=-Wformat-security
|
||||||
ifndef GCC29
|
ifndef GCC29
|
||||||
#WFLAGS+=-Winit-self
|
#WFLAGS+=-Winit-self
|
||||||
endif
|
endif
|
||||||
ifdef GCC46
|
ifdef GCC46
|
||||||
#WFLAGS+=-Wno-suggest-attribute=noreturn
|
WFLAGS+=-Wno-suggest-attribute=noreturn
|
||||||
endif
|
endif
|
||||||
|
|
||||||
ifdef NOLDWARNING
|
ifdef NOLDWARNING
|
||||||
@@ -131,21 +130,21 @@ ifdef GCC44
|
|||||||
#WFLAGS+=-Wno-error=array-bounds
|
#WFLAGS+=-Wno-error=array-bounds
|
||||||
endif
|
endif
|
||||||
ifdef GCC46
|
ifdef GCC46
|
||||||
# WFLAGS+=-Wno-error=suggest-attribute=noreturn
|
WFLAGS+=-Wno-error=suggest-attribute=noreturn
|
||||||
endif
|
endif
|
||||||
ifdef GCC54
|
ifdef GCC54
|
||||||
# WFLAGS+=-Wno-logical-op -Wno-error=logical-op
|
WFLAGS+=-Wno-logical-op -Wno-error=logical-op
|
||||||
endif
|
endif
|
||||||
ifdef GCC61
|
ifdef GCC61
|
||||||
# WFLAGS+=-Wno-tautological-compare -Wno-error=tautological-compare
|
WFLAGS+=-Wno-tautological-compare -Wno-error=tautological-compare
|
||||||
endif
|
endif
|
||||||
ifdef GCC71
|
ifdef GCC71
|
||||||
WFLAGS+=-Wimplicit-fallthrough=4
|
WFLAGS+=-Wimplicit-fallthrough=4
|
||||||
endif
|
endif
|
||||||
ifdef GCC81
|
ifdef GCC81
|
||||||
# WFLAGS+=-Wno-error=format-overflow
|
WFLAGS+=-Wno-error=format-overflow
|
||||||
# WFLAGS+=-Wno-format-overflow
|
WFLAGS+=-Wno-format-overflow
|
||||||
# WFLAGS+=-Wno-error=multistatement-macros
|
WFLAGS+=-Wno-error=multistatement-macros
|
||||||
endif
|
endif
|
||||||
|
|
||||||
ifneq (,$(filter $(CC) $(CXX),clang clang++))
|
ifneq (,$(filter $(CC) $(CXX),clang clang++))
|
||||||
@@ -184,6 +183,6 @@ endif
|
|||||||
# Lua
|
# Lua
|
||||||
ifdef GCC43
|
ifdef GCC43
|
||||||
ifndef GCC44
|
ifndef GCC44
|
||||||
#WFLAGS+=-Wno-logical-op
|
WFLAGS+=-Wno-logical-op
|
||||||
endif
|
endif
|
||||||
endif
|
endif
|
||||||
+9
-6
@@ -434,7 +434,7 @@ LUA_API void lua_pushnumber (lua_State *L, lua_Number n) {
|
|||||||
LUA_API void lua_pushlstring (lua_State *L, const char *s, size_t len) {
|
LUA_API void lua_pushlstring (lua_State *L, const char *s, size_t len) {
|
||||||
lua_lock(L);
|
lua_lock(L);
|
||||||
luaC_checkGC(L);
|
luaC_checkGC(L);
|
||||||
setsvalue2s(L, L->top, (len == 0) ? luaS_newlstr(L, "", 0) : luaS_newlstr(L, s, len));
|
setsvalue2s(L, L->top, (len == 0) ? luaS_new(L, "") : luaS_newlstr(L, s, len));
|
||||||
api_incr_top(L);
|
api_incr_top(L);
|
||||||
lua_unlock(L);
|
lua_unlock(L);
|
||||||
}
|
}
|
||||||
@@ -519,8 +519,8 @@ 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) {
|
static void auxgetstr (lua_State *L, const TValue *t, const char *k) {
|
||||||
TValue *slot;
|
const TValue *slot;
|
||||||
TValue key;
|
TValue key;
|
||||||
TString *str = luaS_new(L, k);
|
TString *str = luaS_new(L, k);
|
||||||
api_checkvalidindex(L, t);
|
api_checkvalidindex(L, t);
|
||||||
@@ -640,10 +640,11 @@ LUA_API void lua_getfenv (lua_State *L, int idx) {
|
|||||||
** set functions (stack -> Lua)
|
** set functions (stack -> Lua)
|
||||||
*/
|
*/
|
||||||
|
|
||||||
|
#pragma GCC diagnostic push
|
||||||
static void auxsetstr (lua_State *L, TValue *t, const char *k) {
|
#pragma GCC diagnostic ignored "-Wcast-qual"
|
||||||
|
static void auxsetstr (lua_State *L, const TValue *t, const char *k) {
|
||||||
TValue key;
|
TValue key;
|
||||||
TValue *slot;
|
const TValue *slot;
|
||||||
TString *str = luaS_new(L, k);
|
TString *str = luaS_new(L, k);
|
||||||
api_checknelems(L, 1);
|
api_checknelems(L, 1);
|
||||||
api_checkvalidindex(L, t);
|
api_checkvalidindex(L, t);
|
||||||
@@ -671,6 +672,8 @@ LUA_API void lua_settable (lua_State *L, int idx) {
|
|||||||
lua_unlock(L);
|
lua_unlock(L);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#pragma GCC diagnostic pop
|
||||||
|
|
||||||
|
|
||||||
LUA_API void lua_setfield (lua_State *L, int idx, const char *k) {
|
LUA_API void lua_setfield (lua_State *L, int idx, const char *k) {
|
||||||
lua_lock(L);
|
lua_lock(L);
|
||||||
|
|||||||
@@ -81,7 +81,6 @@ static /*const*/ Node dummynode_ = {
|
|||||||
/*
|
/*
|
||||||
** hash for lua_Numbers
|
** hash for lua_Numbers
|
||||||
*/
|
*/
|
||||||
#if 0
|
|
||||||
static Node *hashnum (const Table *t, lua_Number n) {
|
static Node *hashnum (const Table *t, lua_Number n) {
|
||||||
unsigned int a[numints];
|
unsigned int a[numints];
|
||||||
int i;
|
int i;
|
||||||
@@ -91,12 +90,6 @@ static Node *hashnum (const Table *t, lua_Number n) {
|
|||||||
for (i = 1; i < numints; i++) a[0] += a[i];
|
for (i = 1; i < numints; i++) a[0] += a[i];
|
||||||
return hashmod(t, a[0]);
|
return hashmod(t, a[0]);
|
||||||
}
|
}
|
||||||
#else
|
|
||||||
// our lua_Number is just typedef´d int32 so no need to do any of the above
|
|
||||||
static inline Node *hashnum (const Table *t, lua_Number n) {
|
|
||||||
return hashmod(t, cast(unsigned int, n));
|
|
||||||
}
|
|
||||||
#endif
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
+1
-1
@@ -61,7 +61,7 @@ TValue *luaT_gettm (Table *events, TMS event, TString *ename) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
TValue *luaT_gettmbyobj (lua_State *L, TValue *o, TMS event) {
|
TValue *luaT_gettmbyobj (lua_State *L, const TValue *o, TMS event) {
|
||||||
Table *mt;
|
Table *mt;
|
||||||
switch (ttype(o)) {
|
switch (ttype(o)) {
|
||||||
case LUA_TTABLE:
|
case LUA_TTABLE:
|
||||||
|
|||||||
+1
-1
@@ -55,7 +55,7 @@ LUAI_DATA const char *const luaT_typenames[];
|
|||||||
|
|
||||||
|
|
||||||
LUAI_FUNC TValue *luaT_gettm (Table *events, TMS event, TString *ename);
|
LUAI_FUNC TValue *luaT_gettm (Table *events, TMS event, TString *ename);
|
||||||
LUAI_FUNC TValue *luaT_gettmbyobj (lua_State *L, TValue *o, TMS event);
|
LUAI_FUNC TValue *luaT_gettmbyobj (lua_State *L, const TValue *o, TMS event);
|
||||||
LUAI_FUNC void luaT_init (lua_State *L);
|
LUAI_FUNC void luaT_init (lua_State *L);
|
||||||
|
|
||||||
#endif
|
#endif
|
||||||
+19
-12
@@ -110,10 +110,10 @@ static void callTM (lua_State *L, const TValue *f, const TValue *p1,
|
|||||||
** if 'slot' is NULL, 't' is not a table; otherwise, 'slot' points to
|
** if 'slot' is NULL, 't' is not a table; otherwise, 'slot' points to
|
||||||
** t[k] entry (which must be nil).
|
** t[k] entry (which must be nil).
|
||||||
*/
|
*/
|
||||||
void luaV_finishget (lua_State *L, TValue *t, TValue *key, StkId val,
|
void luaV_finishget (lua_State *L, const TValue *t, TValue *key, StkId val,
|
||||||
TValue *slot) {
|
const TValue *slot) {
|
||||||
int loop; /* counter to avoid infinite loops */
|
int loop; /* counter to avoid infinite loops */
|
||||||
TValue *tm; /* metamethod */
|
const TValue *tm; /* metamethod */
|
||||||
for (loop = 0; loop < MAXTAGLOOP; loop++) {
|
for (loop = 0; loop < MAXTAGLOOP; loop++) {
|
||||||
if (slot == NULL) { /* 't' is not a table? */
|
if (slot == NULL) { /* 't' is not a table? */
|
||||||
lua_assert(!ttistable(t));
|
lua_assert(!ttistable(t));
|
||||||
@@ -145,7 +145,6 @@ void luaV_finishget (lua_State *L, TValue *t, TValue *key, StkId val,
|
|||||||
luaG_runerror(L, "'__index' chain too long; possible loop");
|
luaG_runerror(L, "'__index' chain too long; possible loop");
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
/*
|
/*
|
||||||
** Finish a table assignment 't[key] = val'.
|
** Finish a table assignment 't[key] = val'.
|
||||||
** If 'slot' is NULL, 't' is not a table. Otherwise, 'slot' points
|
** If 'slot' is NULL, 't' is not a table. Otherwise, 'slot' points
|
||||||
@@ -153,11 +152,13 @@ void luaV_finishget (lua_State *L, TValue *t, TValue *key, StkId val,
|
|||||||
** entry. (The value at 'slot' must be nil, otherwise 'luaV_fastset'
|
** entry. (The value at 'slot' must be nil, otherwise 'luaV_fastset'
|
||||||
** would have done the job.)
|
** would have done the job.)
|
||||||
*/
|
*/
|
||||||
void luaV_finishset (lua_State *L, TValue *t, TValue *key,
|
#pragma GCC diagnostic push
|
||||||
StkId val, TValue *slot) {
|
#pragma GCC diagnostic ignored "-Wcast-qual"
|
||||||
|
void luaV_finishset (lua_State *L, const TValue *t, TValue *key,
|
||||||
|
StkId val, const TValue *slot) {
|
||||||
int loop; /* counter to avoid infinite loops */
|
int loop; /* counter to avoid infinite loops */
|
||||||
for (loop = 0; loop < MAXTAGLOOP; loop++) {
|
for (loop = 0; loop < MAXTAGLOOP; loop++) {
|
||||||
TValue *tm;
|
const TValue *tm;
|
||||||
if (slot != NULL) {
|
if (slot != NULL) {
|
||||||
lua_assert(ttistable(t) && ttisnil(slot));
|
lua_assert(ttistable(t) && ttisnil(slot));
|
||||||
Table *h = hvalue(t);
|
Table *h = hvalue(t);
|
||||||
@@ -188,9 +189,10 @@ void luaV_finishset (lua_State *L, TValue *t, TValue *key,
|
|||||||
}
|
}
|
||||||
luaG_runerror(L, "settable chain too long; possible loop");
|
luaG_runerror(L, "settable chain too long; possible loop");
|
||||||
}
|
}
|
||||||
|
#pragma GCC diagnostic pop
|
||||||
|
|
||||||
|
|
||||||
static int call_binTM (lua_State *L, TValue *p1, TValue *p2,
|
static int call_binTM (lua_State *L, const TValue *p1, const TValue *p2,
|
||||||
StkId res, TMS event) {
|
StkId res, TMS event) {
|
||||||
const TValue *tm = luaT_gettmbyobj(L, p1, event); /* try first operand */
|
const TValue *tm = luaT_gettmbyobj(L, p1, event); /* try first operand */
|
||||||
if (ttisnil(tm))
|
if (ttisnil(tm))
|
||||||
@@ -215,7 +217,7 @@ static const TValue *get_compTM (lua_State *L, Table *mt1, Table *mt2,
|
|||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
static int call_orderTM (lua_State *L, TValue *p1, TValue *p2,
|
static int call_orderTM (lua_State *L, const TValue *p1, const TValue *p2,
|
||||||
TMS event) {
|
TMS event) {
|
||||||
const TValue *tm1 = luaT_gettmbyobj(L, p1, event);
|
const TValue *tm1 = luaT_gettmbyobj(L, p1, event);
|
||||||
const TValue *tm2;
|
const TValue *tm2;
|
||||||
@@ -409,17 +411,20 @@ static void Arith (lua_State *L, StkId ra, TValue *rb,
|
|||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
#pragma GCC diagnostic push
|
||||||
|
#pragma GCC diagnostic ignored "-Wcast-qual"
|
||||||
|
|
||||||
/*
|
/*
|
||||||
** copy of 'luaV_gettable', but protecting call to potential metamethod
|
** copy of 'luaV_gettable', but protecting call to potential metamethod
|
||||||
** (which can reallocate the stack)
|
** (which can reallocate the stack)
|
||||||
*/
|
*/
|
||||||
#define gettableProtected(L,t,k,v) { TValue *slot; \
|
#define gettableProtected(L,t,k,v) { const TValue *slot; \
|
||||||
if (luaV_fastget(L,t,k,slot,luaH_get)) { setobj2s(L, v, slot); } \
|
if (luaV_fastget(L,t,k,slot,luaH_get)) { setobj2s(L, v, slot); } \
|
||||||
else Protect(luaV_finishget(L,t,k,v,slot)); }
|
else Protect(luaV_finishget(L,t,k,v,slot)); }
|
||||||
|
|
||||||
|
|
||||||
/* same for 'luaV_settable' */
|
/* same for 'luaV_settable' */
|
||||||
#define settableProtected(L,t,k,v) { TValue *slot; \
|
#define settableProtected(L,t,k,v) { const TValue *slot; \
|
||||||
if (!luaV_fastset(L,t,k,slot,luaH_set,v)) \
|
if (!luaV_fastset(L,t,k,slot,luaH_set,v)) \
|
||||||
Protect(luaV_finishset(L,t,k,v,slot)); }
|
Protect(luaV_finishset(L,t,k,v,slot)); }
|
||||||
|
|
||||||
@@ -529,8 +534,8 @@ void luaV_execute (lua_State *L, int nexeccalls) {
|
|||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
case OP_SELF: {
|
case OP_SELF: {
|
||||||
TValue *slot;
|
|
||||||
StkId ra = RA(i);
|
StkId ra = RA(i);
|
||||||
|
const TValue *slot;
|
||||||
StkId rb = RB(i);
|
StkId rb = RB(i);
|
||||||
TValue *rc = RKC(i);
|
TValue *rc = RKC(i);
|
||||||
TString *key = rawtsvalue(rc); /* key must be a string */
|
TString *key = rawtsvalue(rc); /* key must be a string */
|
||||||
@@ -906,3 +911,5 @@ void luaV_execute (lua_State *L, int nexeccalls) {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#pragma GCC diagnostic pop
|
||||||
+6
-7
@@ -38,7 +38,7 @@
|
|||||||
/*
|
/*
|
||||||
** standard implementation for 'gettable'
|
** standard implementation for 'gettable'
|
||||||
*/
|
*/
|
||||||
#define luaV_gettable(L,t,k,v) { TValue *slot; \
|
#define luaV_gettable(L,t,k,v) { const TValue *slot; \
|
||||||
if (luaV_fastget(L,t,k,slot,luaH_get)) { setobj2s(L, v, slot); } \
|
if (luaV_fastget(L,t,k,slot,luaH_get)) { setobj2s(L, v, slot); } \
|
||||||
else luaV_finishget(L,t,k,v,slot); }
|
else luaV_finishget(L,t,k,v,slot); }
|
||||||
|
|
||||||
@@ -63,8 +63,7 @@
|
|||||||
1; \
|
1; \
|
||||||
}))))
|
}))))
|
||||||
|
|
||||||
|
#define luaV_settable(L,t,k,v) { const TValue *slot; \
|
||||||
#define luaV_settable(L,t,k,v) { TValue *slot; \
|
|
||||||
if (!luaV_fastset(L,t,k,slot,luaH_set,v)) \
|
if (!luaV_fastset(L,t,k,slot,luaH_set,v)) \
|
||||||
luaV_finishset(L,t,k,v,slot); }
|
luaV_finishset(L,t,k,v,slot); }
|
||||||
|
|
||||||
@@ -74,10 +73,10 @@ LUAI_FUNC int luaV_lessthan (lua_State *L, TValue *l, TValue *r);
|
|||||||
LUAI_FUNC int luaV_equalval (lua_State *L, const TValue *t1, const TValue *t2);
|
LUAI_FUNC int luaV_equalval (lua_State *L, const TValue *t1, const TValue *t2);
|
||||||
LUAI_FUNC const TValue *luaV_tonumber (const TValue *obj, TValue *n);
|
LUAI_FUNC const TValue *luaV_tonumber (const TValue *obj, TValue *n);
|
||||||
LUAI_FUNC int luaV_tostring (lua_State *L, StkId obj);
|
LUAI_FUNC int luaV_tostring (lua_State *L, StkId obj);
|
||||||
LUAI_FUNC void luaV_finishget (lua_State *L, TValue *t, TValue *key,
|
LUAI_FUNC void luaV_finishget (lua_State *L, const TValue *t, TValue *key,
|
||||||
StkId val, TValue *tm);
|
StkId val, const TValue *tm);
|
||||||
LUAI_FUNC void luaV_finishset (lua_State *L, TValue *t, TValue *key,
|
LUAI_FUNC void luaV_finishset (lua_State *L, const TValue *t, TValue *key,
|
||||||
StkId val, TValue *oldval);
|
StkId val, const TValue *oldval);
|
||||||
LUAI_FUNC void luaV_execute (lua_State *L, int nexeccalls);
|
LUAI_FUNC void luaV_execute (lua_State *L, int nexeccalls);
|
||||||
LUAI_FUNC void luaV_concat (lua_State *L, int total, int last);
|
LUAI_FUNC void luaV_concat (lua_State *L, int total, int last);
|
||||||
|
|
||||||
|
|||||||
+3
-65
@@ -1165,39 +1165,6 @@ void VS_Print(vsbuf_t *buf, const char *data)
|
|||||||
//
|
//
|
||||||
// =========================================================================
|
// =========================================================================
|
||||||
|
|
||||||
#define NAME cvar_map_t
|
|
||||||
#define KEY_TY const char *
|
|
||||||
#define VAL_TY consvar_t *
|
|
||||||
#define HASH_FN FNV1a_HashLowercaseString
|
|
||||||
#define CMPR_FN vt_cmpr_casestring
|
|
||||||
#include "verstable.h"
|
|
||||||
|
|
||||||
#define NAME netvar_map_t
|
|
||||||
#define KEY_TY UINT16
|
|
||||||
#define VAL_TY consvar_t *
|
|
||||||
#define HASH_FN vt_hash_integer
|
|
||||||
#define CMPR_FN vt_cmpr_integer
|
|
||||||
#include "verstable.h"
|
|
||||||
|
|
||||||
static cvar_map_t cvar_map;
|
|
||||||
static netvar_map_t netvar_map;
|
|
||||||
|
|
||||||
CONSTRUCTOR static void CV_InitMap(void)
|
|
||||||
{
|
|
||||||
// ensure the map is initialized
|
|
||||||
cvar_map_t_init(&cvar_map);
|
|
||||||
cvar_map_t_reserve(&cvar_map, 512);
|
|
||||||
|
|
||||||
netvar_map_t_init(&netvar_map);
|
|
||||||
netvar_map_t_reserve(&netvar_map, 256);
|
|
||||||
}
|
|
||||||
|
|
||||||
DESTRUCTOR static void CV_DestroyMap(void)
|
|
||||||
{
|
|
||||||
cvar_map_t_cleanup(&cvar_map);
|
|
||||||
netvar_map_t_cleanup(&netvar_map);
|
|
||||||
}
|
|
||||||
|
|
||||||
static const char *cv_null_string = "";
|
static const char *cv_null_string = "";
|
||||||
|
|
||||||
/** Searches if a variable has been registered.
|
/** Searches if a variable has been registered.
|
||||||
@@ -1208,17 +1175,11 @@ static const char *cv_null_string = "";
|
|||||||
*/
|
*/
|
||||||
consvar_t *CV_FindVar(const char *name)
|
consvar_t *CV_FindVar(const char *name)
|
||||||
{
|
{
|
||||||
cvar_map_t_itr it = cvar_map_t_get(&cvar_map, name);
|
|
||||||
if (!cvar_map_t_is_end(it))
|
|
||||||
return it.data->val;
|
|
||||||
|
|
||||||
// fallback linear search
|
|
||||||
/*
|
|
||||||
consvar_t *cvar;
|
consvar_t *cvar;
|
||||||
|
|
||||||
for (cvar = consvar_vars; cvar; cvar = cvar->next)
|
for (cvar = consvar_vars; cvar; cvar = cvar->next)
|
||||||
if (fasticmp(name, cvar->name))
|
if (fasticmp(name,cvar->name))
|
||||||
return cvar;
|
return cvar;
|
||||||
*/
|
|
||||||
|
|
||||||
return NULL;
|
return NULL;
|
||||||
}
|
}
|
||||||
@@ -1233,7 +1194,7 @@ consvar_t *CV_FindVar(const char *name)
|
|||||||
static inline UINT16 CV_ComputeNetid(const char *s)
|
static inline UINT16 CV_ComputeNetid(const char *s)
|
||||||
{
|
{
|
||||||
UINT16 ret = 0, i = 0;
|
UINT16 ret = 0, i = 0;
|
||||||
static const UINT16 premiers[16] = {2, 3, 5, 7, 11, 13, 17, 19, 23, 29, 31, 37, 41, 43, 47, 53};
|
static UINT16 premiers[16] = {2, 3, 5, 7, 11, 13, 17, 19, 23, 29, 31, 37, 41, 43, 47, 53};
|
||||||
|
|
||||||
while (*s)
|
while (*s)
|
||||||
{
|
{
|
||||||
@@ -1252,17 +1213,11 @@ static inline UINT16 CV_ComputeNetid(const char *s)
|
|||||||
*/
|
*/
|
||||||
static consvar_t *CV_FindNetVar(UINT16 netid)
|
static consvar_t *CV_FindNetVar(UINT16 netid)
|
||||||
{
|
{
|
||||||
netvar_map_t_itr it = netvar_map_t_get(&netvar_map, netid);
|
|
||||||
if (!netvar_map_t_is_end(it))
|
|
||||||
return it.data->val;
|
|
||||||
|
|
||||||
/*
|
|
||||||
consvar_t *cvar;
|
consvar_t *cvar;
|
||||||
|
|
||||||
for (cvar = consvar_vars; cvar; cvar = cvar->next)
|
for (cvar = consvar_vars; cvar; cvar = cvar->next)
|
||||||
if (cvar->netid == netid)
|
if (cvar->netid == netid)
|
||||||
return cvar;
|
return cvar;
|
||||||
*/
|
|
||||||
|
|
||||||
if (netid == 44542) // ouch this hack
|
if (netid == 44542) // ouch this hack
|
||||||
return &cv_karteliminatelast;
|
return &cv_karteliminatelast;
|
||||||
@@ -1328,11 +1283,6 @@ void CV_RegisterVar(consvar_t *variable)
|
|||||||
|
|
||||||
// the SetValue will set this bit
|
// the SetValue will set this bit
|
||||||
variable->flags &= ~CV_MODIFIED;
|
variable->flags &= ~CV_MODIFIED;
|
||||||
|
|
||||||
cvar_map_t_insert(&cvar_map, variable->name, variable);
|
|
||||||
|
|
||||||
if (variable->flags & CV_NETVAR)
|
|
||||||
netvar_map_t_insert(&netvar_map, variable->netid, variable);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/** Finds the string value of a console variable.
|
/** Finds the string value of a console variable.
|
||||||
@@ -1638,21 +1588,9 @@ size_t CV_LoadNetVars(const UINT8 *bufstart)
|
|||||||
// prevent "invalid command received"
|
// prevent "invalid command received"
|
||||||
serverloading = true;
|
serverloading = true;
|
||||||
|
|
||||||
// we can use our netvar map instead of going through all cvars each time
|
|
||||||
netvar_map_t_itr it;
|
|
||||||
for (it = netvar_map_t_first(&netvar_map);
|
|
||||||
!netvar_map_t_is_end(it);
|
|
||||||
it = netvar_map_t_next(it))
|
|
||||||
{
|
|
||||||
cvar = it.data->val;
|
|
||||||
Setvalue(cvar, cvar->defaultvalue, true);
|
|
||||||
}
|
|
||||||
|
|
||||||
/*
|
|
||||||
for (cvar = consvar_vars; cvar; cvar = cvar->next)
|
for (cvar = consvar_vars; cvar; cvar = cvar->next)
|
||||||
if (cvar->flags & CV_NETVAR)
|
if (cvar->flags & CV_NETVAR)
|
||||||
Setvalue(cvar, cvar->defaultvalue, true);
|
Setvalue(cvar, cvar->defaultvalue, true);
|
||||||
*/
|
|
||||||
|
|
||||||
count = READUINT16(p);
|
count = READUINT16(p);
|
||||||
while (count--)
|
while (count--)
|
||||||
|
|||||||
+71
-33
@@ -46,16 +46,16 @@
|
|||||||
#ifdef HAVE_THREADS
|
#ifdef HAVE_THREADS
|
||||||
I_mutex con_mutex;
|
I_mutex con_mutex;
|
||||||
|
|
||||||
// I_In_Exiting_Signal_Handler is an evil hack
|
// g_in_exiting_signal_handler is an evil hack
|
||||||
// to avoid infinite SIGABRT recursion in the signal handler
|
// to avoid infinite SIGABRT recursion in the signal handler
|
||||||
// due to poisoned locks or mach-o kernel not supporting locks in signals
|
// due to poisoned locks or mach-o kernel not supporting locks in signals
|
||||||
// or something like that. idk
|
// or something like that. idk
|
||||||
# define Lock_state() if (!I_In_Exiting_Signal_Handler()) { I_lock_mutex(&con_mutex); }
|
# define Lock_state() if (!g_in_exiting_signal_handler) { I_lock_mutex(&con_mutex); }
|
||||||
# define Unlock_state() if (!I_In_Exiting_Signal_Handler()) { I_unlock_mutex(con_mutex); }
|
# define Unlock_state() if (!g_in_exiting_signal_handler) { I_unlock_mutex(con_mutex); }
|
||||||
#else /*HAVE_THREADS*/
|
#else/*HAVE_THREADS*/
|
||||||
# define Lock_state()
|
# define Lock_state()
|
||||||
# define Unlock_state()
|
# define Unlock_state()
|
||||||
#endif /*HAVE_THREADS*/
|
#endif/*HAVE_THREADS*/
|
||||||
|
|
||||||
static boolean con_started = false; // console has been initialised
|
static boolean con_started = false; // console has been initialised
|
||||||
boolean con_startup = false; // true at game startup, screen need refreshing
|
boolean con_startup = false; // true at game startup, screen need refreshing
|
||||||
@@ -640,25 +640,65 @@ INT32 CON_ShiftChar(INT32 ch)
|
|||||||
|
|
||||||
if ((ch >= 'a' && ch <= 'z') || (ch >= 'A' && ch <= 'Z'))
|
if ((ch >= 'a' && ch <= 'z') || (ch >= 'A' && ch <= 'Z'))
|
||||||
{
|
{
|
||||||
if (shiftdown ^ capslock)
|
if (cv_keyboardlayout.value == 3)
|
||||||
ch = shiftxform[ch];
|
|
||||||
}
|
|
||||||
else // if we're holding shift we should still shift non letter symbols
|
|
||||||
{
|
|
||||||
if (shiftdown)
|
|
||||||
ch = shiftxform[ch];
|
|
||||||
else if (cv_keyboardlayout.value == 3)
|
|
||||||
{
|
{
|
||||||
if (altdown & 0x2)
|
if (shiftdown ^ capslock)
|
||||||
|
ch = shiftxform[ch];
|
||||||
|
else if (altdown & 0x2)
|
||||||
ch = french_altgrxform[ch];
|
ch = french_altgrxform[ch];
|
||||||
else
|
else
|
||||||
ch = HU_FallBackFrSpecialLetter(ch);
|
ch = HU_FallBackFrSpecialLetter(ch);
|
||||||
}
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
if (shiftdown ^ capslock)
|
||||||
|
ch = shiftxform[ch];
|
||||||
|
}
|
||||||
|
}
|
||||||
|
else // if we're holding shift we should still shift non letter symbols
|
||||||
|
{
|
||||||
|
if (cv_keyboardlayout.value == 3)
|
||||||
|
{
|
||||||
|
if (shiftdown)
|
||||||
|
ch = shiftxform[ch];
|
||||||
|
else if (altdown & 0x2)
|
||||||
|
ch = french_altgrxform[ch];
|
||||||
|
else
|
||||||
|
ch = HU_FallBackFrSpecialLetter(ch);
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
if (shiftdown)
|
||||||
|
ch = shiftxform[ch];
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
return ch;
|
return ch;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
INT32 CON_ShitAndAltGrChar(INT32 ch)
|
||||||
|
{
|
||||||
|
if ((ch >= 'a' && ch <= 'z') || (ch >= 'A' && ch <= 'Z'))
|
||||||
|
{
|
||||||
|
if (shiftdown ^ capslock)
|
||||||
|
ch = shiftxform[ch];
|
||||||
|
}
|
||||||
|
else // if we're holding shift we should still shift non letter symbols
|
||||||
|
{
|
||||||
|
if (shiftdown)
|
||||||
|
ch = shiftxform[ch];
|
||||||
|
else if (altdown & 0x2)
|
||||||
|
{
|
||||||
|
ch = french_altgrxform[ch];
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
ch = HU_FallBackFrSpecialLetter(ch);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
return ch;
|
||||||
|
}
|
||||||
|
|
||||||
// Clear time of console heads up messages
|
// Clear time of console heads up messages
|
||||||
//
|
//
|
||||||
@@ -852,7 +892,7 @@ boolean CON_Responder(event_t *ev)
|
|||||||
return true;
|
return true;
|
||||||
|
|
||||||
// ctrl modifier -- changes behavior, adds shortcuts
|
// ctrl modifier -- changes behavior, adds shortcuts
|
||||||
if (ctrldown && (cv_keyboardlayout.value != 3 || !altdown))
|
if ((cv_keyboardlayout.value != 3 && ctrldown) || (cv_keyboardlayout.value == 3 && ctrldown && !altdown))
|
||||||
{
|
{
|
||||||
// show all cvars/commands that match what we have inputted
|
// show all cvars/commands that match what we have inputted
|
||||||
if (key == KEY_TAB)
|
if (key == KEY_TAB)
|
||||||
@@ -1182,10 +1222,19 @@ void CON_LogMessage(const char *msg)
|
|||||||
// Console print! Wahooo! Lots o fun!
|
// Console print! Wahooo! Lots o fun!
|
||||||
//
|
//
|
||||||
|
|
||||||
static inline void CONS_PrintMsg(char *txt)
|
void CONS_Printf(const char *fmt, ...)
|
||||||
{
|
{
|
||||||
|
va_list argptr;
|
||||||
|
static char *txt = NULL;
|
||||||
boolean startup;
|
boolean startup;
|
||||||
|
|
||||||
|
if (txt == NULL)
|
||||||
|
txt = malloc(8192);
|
||||||
|
|
||||||
|
va_start(argptr, fmt);
|
||||||
|
vsnprintf(txt, 8192, fmt, argptr);
|
||||||
|
va_end(argptr);
|
||||||
|
|
||||||
// echo console prints to log file
|
// echo console prints to log file
|
||||||
DEBFILE(txt);
|
DEBFILE(txt);
|
||||||
|
|
||||||
@@ -1211,21 +1260,6 @@ static inline void CONS_PrintMsg(char *txt)
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
void CONS_Printf(const char *fmt, ...)
|
|
||||||
{
|
|
||||||
va_list argptr;
|
|
||||||
static char *txt = NULL;
|
|
||||||
|
|
||||||
if (txt == NULL)
|
|
||||||
txt = malloc(8192);
|
|
||||||
|
|
||||||
va_start(argptr, fmt);
|
|
||||||
vsnprintf(txt, 8192, fmt, argptr);
|
|
||||||
va_end(argptr);
|
|
||||||
|
|
||||||
CONS_PrintMsg(txt);
|
|
||||||
}
|
|
||||||
|
|
||||||
void CONS_Alert(alerttype_t level, const char *fmt, ...)
|
void CONS_Alert(alerttype_t level, const char *fmt, ...)
|
||||||
{
|
{
|
||||||
va_list argptr;
|
va_list argptr;
|
||||||
@@ -1254,7 +1288,9 @@ void CONS_Alert(alerttype_t level, const char *fmt, ...)
|
|||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
|
||||||
CONS_PrintMsg(txt);
|
// I am lazy and I feel like just letting CONS_Printf take care of things.
|
||||||
|
// Is that okay?
|
||||||
|
CONS_Printf("%s", txt);
|
||||||
}
|
}
|
||||||
|
|
||||||
void CONS_Debug(INT32 debugflags, const char *fmt, ...)
|
void CONS_Debug(INT32 debugflags, const char *fmt, ...)
|
||||||
@@ -1272,9 +1308,11 @@ void CONS_Debug(INT32 debugflags, const char *fmt, ...)
|
|||||||
vsnprintf(txt, 8192, fmt, argptr);
|
vsnprintf(txt, 8192, fmt, argptr);
|
||||||
va_end(argptr);
|
va_end(argptr);
|
||||||
|
|
||||||
CONS_PrintMsg(txt);
|
// Again I am lazy, oh well
|
||||||
|
CONS_Printf("%s", txt);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
// Print an error message, and wait for ENTER key to continue.
|
// Print an error message, and wait for ENTER key to continue.
|
||||||
// To make sure the user has seen the message
|
// To make sure the user has seen the message
|
||||||
//
|
//
|
||||||
|
|||||||
+1
-8
@@ -13,10 +13,6 @@
|
|||||||
#ifndef __CONSOLE__
|
#ifndef __CONSOLE__
|
||||||
#define __CONSOLE__
|
#define __CONSOLE__
|
||||||
|
|
||||||
#ifdef __cplusplus
|
|
||||||
extern "C" {
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#include "d_event.h"
|
#include "d_event.h"
|
||||||
#include "command.h"
|
#include "command.h"
|
||||||
#include "i_threads.h"
|
#include "i_threads.h"
|
||||||
@@ -49,6 +45,7 @@ extern UINT8 *yellowmap, *purplemap, *greenmap, *bluemap, *graymap, *redmap, *or
|
|||||||
extern UINT8 *consolebgmap;
|
extern UINT8 *consolebgmap;
|
||||||
|
|
||||||
INT32 CON_ShiftChar(INT32 ch);
|
INT32 CON_ShiftChar(INT32 ch);
|
||||||
|
INT32 CON_ShitAndAltGrChar(INT32 ch);
|
||||||
|
|
||||||
void CON_SetupBackColormap(void);
|
void CON_SetupBackColormap(void);
|
||||||
void CON_ClearHUD(void); // clear heads up messages
|
void CON_ClearHUD(void); // clear heads up messages
|
||||||
@@ -66,8 +63,4 @@ boolean CON_Ready(void);
|
|||||||
|
|
||||||
void CON_LogMessage(const char *msg);
|
void CON_LogMessage(const char *msg);
|
||||||
|
|
||||||
#ifdef __cplusplus
|
|
||||||
} // extern "C"
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#endif
|
#endif
|
||||||
+347
-478
File diff suppressed because it is too large.
Load diff
+3
-7
@@ -600,8 +600,6 @@ extern consvar_t cv_discordinvites;
|
|||||||
|
|
||||||
extern consvar_t cv_serverinfoscreen;
|
extern consvar_t cv_serverinfoscreen;
|
||||||
|
|
||||||
extern consvar_t cv_serveraddoninfo;
|
|
||||||
|
|
||||||
// Used in d_net, the only dependence
|
// Used in d_net, the only dependence
|
||||||
//tic_t ExpandTics(INT32 low, tic_t basetic);
|
//tic_t ExpandTics(INT32 low, tic_t basetic);
|
||||||
void D_ClientServerInit(void);
|
void D_ClientServerInit(void);
|
||||||
@@ -656,17 +654,15 @@ void D_ResetTiccmds(void);
|
|||||||
|
|
||||||
tic_t GetLag(INT32 node);
|
tic_t GetLag(INT32 node);
|
||||||
|
|
||||||
extern boolean hu_resynching;
|
extern UINT8 hu_resynching;
|
||||||
#ifdef SATURNPAK
|
#ifdef SATURNPAK
|
||||||
extern boolean hu_redownloadinggamestate;
|
extern UINT8 hu_redownloadinggamestate;
|
||||||
#endif
|
#endif
|
||||||
extern boolean hu_stopped; // kart, true when the game is stopped for players due to a disconnecting or connecting player
|
extern boolean hu_stopped; // kart, true when the game is stopped for players due to a disconnecting or connecting player
|
||||||
|
|
||||||
#define SAVEGAMESIZE (768*1024)
|
|
||||||
|
|
||||||
typedef struct rewind_s
|
typedef struct rewind_s
|
||||||
{
|
{
|
||||||
UINT8 savebuffer[SAVEGAMESIZE];
|
UINT8 savebuffer[(768*1024)];
|
||||||
tic_t leveltime;
|
tic_t leveltime;
|
||||||
size_t demopos;
|
size_t demopos;
|
||||||
|
|
||||||
|
|||||||
+37
-93
@@ -130,8 +130,8 @@ static size_t startuppwadcount = 0;
|
|||||||
// autoloading
|
// autoloading
|
||||||
static char *autoloadwadfiles[MAX_WADFILES];
|
static char *autoloadwadfiles[MAX_WADFILES];
|
||||||
static char *autoloadwadfilespost[MAX_WADFILES];
|
static char *autoloadwadfilespost[MAX_WADFILES];
|
||||||
static size_t autoloadwadcount = 0;
|
static size_t autoloadcount = 0;
|
||||||
static size_t postloadwadcount = 0;
|
static size_t postloadcount = 0;
|
||||||
//
|
//
|
||||||
|
|
||||||
boolean devparm = false; // started game with -devparm
|
boolean devparm = false; // started game with -devparm
|
||||||
@@ -362,45 +362,6 @@ static void D_Renderview(void)
|
|||||||
// added comment : there is a wipe eatch change of the gamestate
|
// added comment : there is a wipe eatch change of the gamestate
|
||||||
gamestate_t wipegamestate = GS_LEVEL;
|
gamestate_t wipegamestate = GS_LEVEL;
|
||||||
|
|
||||||
static void D_MakeIntermissionBG(void)
|
|
||||||
{
|
|
||||||
if (!lastdraw)
|
|
||||||
return;
|
|
||||||
|
|
||||||
if (rendermode == render_none)
|
|
||||||
{
|
|
||||||
lastdraw = false;
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
// no more valid map
|
|
||||||
// shouldnt happen at this point, but better safe than sorry!
|
|
||||||
if (!numsectors)
|
|
||||||
{
|
|
||||||
lastdraw = false;
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
// need to render level again for this
|
|
||||||
// should be fine since at this point we did not unload it yet
|
|
||||||
if (cv_renderview.value)
|
|
||||||
{
|
|
||||||
D_Renderview();
|
|
||||||
}
|
|
||||||
#ifdef HWRENDER
|
|
||||||
if (rendermode == render_opengl)
|
|
||||||
{
|
|
||||||
HWR_MakeScreenTexture();
|
|
||||||
}
|
|
||||||
else
|
|
||||||
#endif
|
|
||||||
{
|
|
||||||
VID_BlitLinearScreen(vid.screens[0], vid.screens[1], vid.width, vid.height, vid.width, vid.width);
|
|
||||||
}
|
|
||||||
|
|
||||||
lastdraw = false;
|
|
||||||
}
|
|
||||||
|
|
||||||
static boolean D_Display(void)
|
static boolean D_Display(void)
|
||||||
{
|
{
|
||||||
boolean ranwipe = false;
|
boolean ranwipe = false;
|
||||||
@@ -558,8 +519,6 @@ static boolean D_Display(void)
|
|||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
|
||||||
D_MakeIntermissionBG();
|
|
||||||
|
|
||||||
if (gamestate == GS_LEVEL)
|
if (gamestate == GS_LEVEL)
|
||||||
{
|
{
|
||||||
// draw the view directly
|
// draw the view directly
|
||||||
@@ -570,6 +529,16 @@ static boolean D_Display(void)
|
|||||||
PS_STOP_TIMING(ps_rendercalltime);
|
PS_STOP_TIMING(ps_rendercalltime);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if (lastdraw)
|
||||||
|
{
|
||||||
|
if (rendermode == render_soft)
|
||||||
|
{
|
||||||
|
VID_BlitLinearScreen(vid.screens[0], vid.screens[1], vid.width, vid.height, vid.width, vid.width);
|
||||||
|
}
|
||||||
|
|
||||||
|
lastdraw = false;
|
||||||
|
}
|
||||||
|
|
||||||
PS_START_TIMING(ps_uitime);
|
PS_START_TIMING(ps_uitime);
|
||||||
ST_Drawer();
|
ST_Drawer();
|
||||||
HU_Drawer();
|
HU_Drawer();
|
||||||
@@ -733,11 +702,6 @@ void D_SRB2Loop(void)
|
|||||||
precise_t elapsed;
|
precise_t elapsed;
|
||||||
precise_t enterprecise, finishprecise;
|
precise_t enterprecise, finishprecise;
|
||||||
|
|
||||||
if (I_Interrupted())
|
|
||||||
{
|
|
||||||
I_Quit();
|
|
||||||
}
|
|
||||||
|
|
||||||
enterprecise = I_GetPreciseTime();
|
enterprecise = I_GetPreciseTime();
|
||||||
|
|
||||||
memset(&g_dc, 0, sizeof(g_dc));
|
memset(&g_dc, 0, sizeof(g_dc));
|
||||||
@@ -1068,38 +1032,25 @@ static INT32 D_DetectFileType(const char* filename)
|
|||||||
}
|
}
|
||||||
|
|
||||||
// autoload that shit
|
// autoload that shit
|
||||||
static void D_AutoloadFile(const char *file, char **filearray, size_t *index)
|
static void D_AutoloadFile(const char *file, char **filearray, size_t index)
|
||||||
{
|
{
|
||||||
char *newfile;
|
char *newfile;
|
||||||
INT32 fileType = D_DetectFileType(file);
|
INT32 fileType = D_DetectFileType(file);
|
||||||
|
|
||||||
if (*index >= MAX_WADFILES)
|
|
||||||
{
|
|
||||||
CONS_Printf("D_AutoloadFile: Failed to add file %s! Too many autoloaded files\n", file);
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (!fileType)
|
if (!fileType)
|
||||||
{
|
{
|
||||||
CONS_Printf("D_AutoloadFile: File %s is unknown or invalid\n", file);
|
CONS_Printf("D_AutoloadFile: File %s is unknown or invalid\n", file);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (fileType == 1)
|
|
||||||
{
|
|
||||||
CONS_Printf("D_AutoloadFile: File %s is a directory\n", file);
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (fileType <= 6)
|
if (fileType <= 6)
|
||||||
{
|
{
|
||||||
newfile = malloc(strlen(file) + 1);
|
newfile = malloc(strlen(file) + 1);
|
||||||
if (!newfile)
|
if (!newfile)
|
||||||
I_Error("D_AutoloadFile: No more free memory to autoload file %s", file);
|
I_Error("No more free memory to AutoloadFile %s",file);
|
||||||
|
|
||||||
strcpy(newfile, file);
|
strcpy(newfile, file);
|
||||||
filearray[*index] = newfile;
|
filearray[index] = newfile;
|
||||||
(*index)++;
|
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
@@ -1142,7 +1093,7 @@ static void D_FindAddonsToAutoload(void)
|
|||||||
// If the file is found, run our shit
|
// If the file is found, run our shit
|
||||||
if (!autoloadconfigfile) // nope outta here
|
if (!autoloadconfigfile) // nope outta here
|
||||||
{
|
{
|
||||||
autoloadwadcount = postloadwadcount = 0; // so D_AddAutoloadFiles can skip everything since nothings there to autoload
|
autoloadcount = postloadcount = 0; // so D_AddAutoloadFiles can skip everything since nothings there to autoload
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -1168,34 +1119,27 @@ static void D_FindAddonsToAutoload(void)
|
|||||||
if (newline)
|
if (newline)
|
||||||
*newline = '\0';
|
*newline = '\0';
|
||||||
|
|
||||||
// ok so theres still issues with players adding stuff to autoload by accident
|
|
||||||
// sometimes this stuff contains maps
|
|
||||||
// you can probably imagine how that goes in a netgame....
|
|
||||||
if (W_CheckAutoLoadContainsMap(wadsToAutoload))
|
|
||||||
{
|
|
||||||
CONS_Printf("Autoload: file %s contains map data! skipping...", wadsToAutoload);
|
|
||||||
continue;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (!postload && W_CheckPostLoadList(wadsToAutoload))
|
if (!postload && W_CheckPostLoadList(wadsToAutoload))
|
||||||
{
|
{
|
||||||
CONS_Printf("Autoload: forcing postload for file %s\n", wadsToAutoload);
|
CONS_Printf("forcing postload for file %s\n", wadsToAutoload);
|
||||||
postload = true;
|
postload = true;
|
||||||
}
|
}
|
||||||
|
|
||||||
// LOAD IT
|
// LOAD IT
|
||||||
if (!postload)
|
if (!postload)
|
||||||
{
|
{
|
||||||
D_AutoloadFile(wadsToAutoload, autoloadwadfiles, &autoloadwadcount);
|
D_AutoloadFile(wadsToAutoload, autoloadwadfiles, autoloadcount);
|
||||||
|
autoloadcount++;
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
D_AutoloadFile(wadsToAutoload, autoloadwadfilespost, &postloadwadcount);
|
D_AutoloadFile(wadsToAutoload, autoloadwadfilespost, postloadcount);
|
||||||
|
postloadcount++;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
autoloadwadfiles[autoloadwadcount] = NULL;
|
autoloadwadfiles[autoloadcount] = NULL;
|
||||||
autoloadwadfilespost[postloadwadcount] = NULL;
|
autoloadwadfilespost[postloadcount] = NULL;
|
||||||
|
|
||||||
// we dont want memory leaks around here do we?
|
// we dont want memory leaks around here do we?
|
||||||
fclose(autoloadconfigfile);
|
fclose(autoloadconfigfile);
|
||||||
@@ -1204,7 +1148,7 @@ static void D_FindAddonsToAutoload(void)
|
|||||||
static void D_AddAutoloadFiles(void)
|
static void D_AddAutoloadFiles(void)
|
||||||
{
|
{
|
||||||
// nothing to autoload
|
// nothing to autoload
|
||||||
if (autoloadwadcount == 0)
|
if (autoloadcount == 0)
|
||||||
return;
|
return;
|
||||||
|
|
||||||
CONS_Printf("D_AutoloadFile(): Loading autoloaded addons...\n");
|
CONS_Printf("D_AutoloadFile(): Loading autoloaded addons...\n");
|
||||||
@@ -1212,15 +1156,15 @@ static void D_AddAutoloadFiles(void)
|
|||||||
if (W_AddAutoloadedLocalFiles(autoloadwadfiles) == 0)
|
if (W_AddAutoloadedLocalFiles(autoloadwadfiles) == 0)
|
||||||
CONS_Printf("D_AutoloadFile(): Are you sure you put in valid files or what?\n");
|
CONS_Printf("D_AutoloadFile(): Are you sure you put in valid files or what?\n");
|
||||||
|
|
||||||
D_CleanFile(autoloadwadfiles, autoloadwadcount);
|
D_CleanFile(autoloadwadfiles, autoloadcount);
|
||||||
|
|
||||||
autoloadwadcount = 0;
|
autoloadcount = 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
void D_AddPostloadFiles(void)
|
void D_AddPostloadFiles(void)
|
||||||
{
|
{
|
||||||
// nothing to postload
|
// nothing to postload
|
||||||
if (postloadwadcount == 0 || !netgame)
|
if (postloadcount == 0 || !netgame)
|
||||||
return;
|
return;
|
||||||
|
|
||||||
CONS_Printf("D_AddPostloadFiles(): Loading postloaded addons...\n");
|
CONS_Printf("D_AddPostloadFiles(): Loading postloaded addons...\n");
|
||||||
@@ -1228,9 +1172,9 @@ void D_AddPostloadFiles(void)
|
|||||||
if (W_AddAutoloadedLocalFiles(autoloadwadfilespost) == 0)
|
if (W_AddAutoloadedLocalFiles(autoloadwadfilespost) == 0)
|
||||||
CONS_Printf("D_AddPostloadFiles(): Are you sure you put in valid files or what?\n");
|
CONS_Printf("D_AddPostloadFiles(): Are you sure you put in valid files or what?\n");
|
||||||
|
|
||||||
D_CleanFile(autoloadwadfilespost, postloadwadcount);
|
D_CleanFile(autoloadwadfilespost, postloadcount);
|
||||||
|
|
||||||
postloadwadcount = 0;
|
postloadcount = 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
// ==========================================================================
|
// ==========================================================================
|
||||||
@@ -1239,7 +1183,7 @@ void D_AddPostloadFiles(void)
|
|||||||
|
|
||||||
static boolean AddIWAD(const char * file, const char *dir)
|
static boolean AddIWAD(const char * file, const char *dir)
|
||||||
{
|
{
|
||||||
char *path = va(pandf, dir, file);
|
char * path = va(pandf, dir, file);
|
||||||
|
|
||||||
if (FIL_ReadFileOK(path))
|
if (FIL_ReadFileOK(path))
|
||||||
{
|
{
|
||||||
@@ -1817,6 +1761,10 @@ void D_SRB2Main(void)
|
|||||||
// Setup default unlockable conditions
|
// Setup default unlockable conditions
|
||||||
M_SetupDefaultConditionSets();
|
M_SetupDefaultConditionSets();
|
||||||
|
|
||||||
|
// Setup character tables
|
||||||
|
// Have to be done here before files are loaded
|
||||||
|
M_InitCharacterTables();
|
||||||
|
|
||||||
// load wad, including the main wad file
|
// load wad, including the main wad file
|
||||||
CONS_Printf("W_InitMultipleFiles(): Adding IWAD and main PWADs.\n");
|
CONS_Printf("W_InitMultipleFiles(): Adding IWAD and main PWADs.\n");
|
||||||
|
|
||||||
@@ -2070,13 +2018,9 @@ void D_SRB2Main(void)
|
|||||||
if (M_CheckProtoParam("replay"))
|
if (M_CheckProtoParam("replay"))
|
||||||
{
|
{
|
||||||
const char *replayurl = M_GetProtoParam();
|
const char *replayurl = M_GetProtoParam();
|
||||||
|
char *replayname = strrchr(replayurl, '/');
|
||||||
|
|
||||||
if (!replayurl)
|
if (!replayname || !replayurl)
|
||||||
I_Error("REPLAY: Invalid URL.");
|
|
||||||
|
|
||||||
gconst char *replayname = strrchr(replayurl, '/');
|
|
||||||
|
|
||||||
if (!replayname)
|
|
||||||
I_Error("REPLAY: Invalid URL.");
|
I_Error("REPLAY: Invalid URL.");
|
||||||
|
|
||||||
#define REPLAYDIR "/DownloadedReplays/"
|
#define REPLAYDIR "/DownloadedReplays/"
|
||||||
@@ -2190,8 +2134,8 @@ void D_SRB2Main(void)
|
|||||||
|
|
||||||
if (dedicated && server)
|
if (dedicated && server)
|
||||||
{
|
{
|
||||||
|
levelstarttic = gametic;
|
||||||
G_SetGamestate(GS_LEVEL);
|
G_SetGamestate(GS_LEVEL);
|
||||||
|
|
||||||
if (!P_SetupLevel(false, false))
|
if (!P_SetupLevel(false, false))
|
||||||
I_Quit(); // fail so reset game stuff
|
I_Quit(); // fail so reset game stuff
|
||||||
}
|
}
|
||||||
|
|||||||
+5
-1
@@ -612,8 +612,12 @@ void Net_WaitAllAckReceived(UINT32 timeout)
|
|||||||
|
|
||||||
static void InitNode(node_t *node)
|
static void InitNode(node_t *node)
|
||||||
{
|
{
|
||||||
memset(node, 0, sizeof(node_t));
|
node->acktosend_head = node->acktosend_tail = 0;
|
||||||
|
memset(node->acktosend, 0, sizeof(node->acktosend));
|
||||||
|
node->firstacktosend = 0;
|
||||||
node->nextacknum = 1;
|
node->nextacknum = 1;
|
||||||
|
node->remotefirstack = 0;
|
||||||
|
node->flags = 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
static void InitAck(void)
|
static void InitAck(void)
|
||||||
|
|||||||
@@ -27,6 +27,7 @@ extern "C" {
|
|||||||
// SINT8 is used for nodes sometimes >:(
|
// SINT8 is used for nodes sometimes >:(
|
||||||
#define MAXNETNODES 127
|
#define MAXNETNODES 127
|
||||||
#define BROADCASTADDR MAXNETNODES
|
#define BROADCASTADDR MAXNETNODES
|
||||||
|
#define NETSPLITSCREEN // Kart's splitscreen netgame feature
|
||||||
|
|
||||||
#define STATLENGTH (TICRATE*2)
|
#define STATLENGTH (TICRATE*2)
|
||||||
|
|
||||||
|
|||||||
+483
-146
@@ -900,7 +900,6 @@ void D_RegisterClientCommands(void)
|
|||||||
CV_RegisterVar(&cv_mindelay);
|
CV_RegisterVar(&cv_mindelay);
|
||||||
CV_RegisterVar(&cv_gentlemens);
|
CV_RegisterVar(&cv_gentlemens);
|
||||||
CV_RegisterVar(&cv_serverinfoscreen);
|
CV_RegisterVar(&cv_serverinfoscreen);
|
||||||
CV_RegisterVar(&cv_serveraddoninfo);
|
|
||||||
|
|
||||||
#ifdef NETGAME_DEVMODE
|
#ifdef NETGAME_DEVMODE
|
||||||
CV_RegisterVar(&cv_fishcake);
|
CV_RegisterVar(&cv_fishcake);
|
||||||
@@ -1209,11 +1208,11 @@ static boolean AllowedPlayerNameChar(char ch)
|
|||||||
|
|
||||||
static boolean EnsurePlayerNameIsGood(char *name, INT32 playernum)
|
static boolean EnsurePlayerNameIsGood(char *name, INT32 playernum)
|
||||||
{
|
{
|
||||||
size_t ix, len = strlen(name);
|
INT32 ix;
|
||||||
|
|
||||||
if (len == 0 || len > MAXPLAYERNAME)
|
if (strlen(name) == 0 || strlen(name) > MAXPLAYERNAME)
|
||||||
return false; // Empty or too long.
|
return false; // Empty or too long.
|
||||||
if (name[0] == ' ' || name[len-1] == ' ')
|
if (name[0] == ' ' || name[strlen(name)-1] == ' ')
|
||||||
return false; // Starts or ends with a space.
|
return false; // Starts or ends with a space.
|
||||||
if (isdigit(name[0]))
|
if (isdigit(name[0]))
|
||||||
return false; // Starts with a digit.
|
return false; // Starts with a digit.
|
||||||
@@ -1227,19 +1226,20 @@ static boolean EnsurePlayerNameIsGood(char *name, INT32 playernum)
|
|||||||
|
|
||||||
// Also, anything over 0x80 is disallowed too, since compilers love to
|
// Also, anything over 0x80 is disallowed too, since compilers love to
|
||||||
// differ on whether they're printable characters or not.
|
// differ on whether they're printable characters or not.
|
||||||
for (ix = 0; ix < len; ix++)
|
for (ix = 0; name[ix] != '\0'; ix++)
|
||||||
if (!AllowedPlayerNameChar(name[ix]))
|
if (!AllowedPlayerNameChar(name[ix]))
|
||||||
return false;
|
return false;
|
||||||
|
|
||||||
// Check if a player is currently using the name, case-insensitively.
|
// Check if a player is currently using the name, case-insensitively.
|
||||||
for (ix = 0; ix < MAXPLAYERS; ix++)
|
for (ix = 0; ix < MAXPLAYERS; ix++)
|
||||||
{
|
{
|
||||||
if (ix != (size_t)playernum && playeringame[ix]
|
if (ix != playernum && playeringame[ix]
|
||||||
&& fasticmp(name, player_names[ix]))
|
&& fasticmp(name, player_names[ix]))
|
||||||
{
|
{
|
||||||
// We shouldn't kick people out just because
|
// We shouldn't kick people out just because
|
||||||
// they joined the game with the same name
|
// they joined the game with the same name
|
||||||
// as someone else -- modify the name instead.
|
// as someone else -- modify the name instead.
|
||||||
|
size_t len = strlen(name);
|
||||||
|
|
||||||
// Recursion!
|
// Recursion!
|
||||||
// Slowly strip characters off the end of the
|
// Slowly strip characters off the end of the
|
||||||
@@ -1458,9 +1458,7 @@ UINT8 CanChangeSkin(INT32 playernum)
|
|||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (players[playernum].spectator ||
|
if (players[playernum].spectator || players[playernum].playerstate == PST_DEAD || players[playernum].playerstate == PST_REBORN)
|
||||||
players[playernum].playerstate == PST_DEAD ||
|
|
||||||
players[playernum].playerstate == PST_REBORN)
|
|
||||||
return true;
|
return true;
|
||||||
|
|
||||||
return false;
|
return false;
|
||||||
@@ -1494,145 +1492,446 @@ static void ForceAllSkins(INT32 forcedskin)
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
static INT32 chmappending;
|
static INT32 snacpending = 0, snac2pending = 0, snac3pending = 0, snac4pending = 0, chmappending = 0;
|
||||||
static INT32 snacpending[MAXSPLITSCREENPLAYERS];
|
|
||||||
|
|
||||||
// wonky compat, idk if anything uses this....
|
|
||||||
#define playerisbot (splitplayer == 1 && botingame)
|
|
||||||
|
|
||||||
// name, color, or skin has changed
|
// name, color, or skin has changed
|
||||||
//
|
//
|
||||||
static void SendNameAndColor(UINT8 splitplayer)
|
static void SendNameAndColor(void)
|
||||||
{
|
{
|
||||||
char buf[MAXPLAYERNAME+2];
|
char buf[MAXPLAYERNAME+2];
|
||||||
char *p;
|
char *p;
|
||||||
|
|
||||||
p = buf;
|
p = buf;
|
||||||
|
|
||||||
// splitscreen
|
|
||||||
if (splitscreen < splitplayer && !playerisbot)
|
|
||||||
return;
|
|
||||||
|
|
||||||
const INT32 pnum = P_GetLocalPlayerNumForNum(splitplayer);
|
|
||||||
|
|
||||||
player_t *player = &players[pnum];
|
|
||||||
|
|
||||||
// TODO: make those cvars arrays
|
|
||||||
consvar_t *playercolor, *playername, *playerskin;
|
|
||||||
consvar_t *colorvars[] = {&cv_playercolor, &cv_playercolor2, &cv_playercolor3, &cv_playercolor4};
|
|
||||||
consvar_t *namevars[] = {&cv_playername, &cv_playername2, &cv_playername3, &cv_playername4};
|
|
||||||
consvar_t *skinvars[] = {&cv_skin, &cv_skin2, &cv_skin3, &cv_skin4};
|
|
||||||
|
|
||||||
playercolor = colorvars[splitplayer];
|
|
||||||
playername = namevars[splitplayer];
|
|
||||||
playerskin = skinvars[splitplayer];
|
|
||||||
|
|
||||||
// normal player colors
|
// normal player colors
|
||||||
if (G_GametypeHasTeams())
|
if (G_GametypeHasTeams())
|
||||||
{
|
{
|
||||||
if (player->ctfteam == 1 && playercolor->value != skincolor_redteam)
|
if (players[consoleplayer].ctfteam == 1 && cv_playercolor.value != skincolor_redteam)
|
||||||
CV_StealthSetValue(playercolor, skincolor_redteam);
|
CV_StealthSetValue(&cv_playercolor, skincolor_redteam);
|
||||||
else if (player->ctfteam == 2 && playercolor->value != skincolor_blueteam)
|
else if (players[consoleplayer].ctfteam == 2 && cv_playercolor.value != skincolor_blueteam)
|
||||||
CV_StealthSetValue(playercolor, skincolor_blueteam);
|
CV_StealthSetValue(&cv_playercolor, skincolor_blueteam);
|
||||||
}
|
}
|
||||||
|
|
||||||
// never allow the color "none"
|
// never allow the color "none"
|
||||||
if (!playercolor->value)
|
if (!cv_playercolor.value)
|
||||||
{
|
{
|
||||||
if (player->skincolor)
|
if (players[consoleplayer].skincolor)
|
||||||
CV_StealthSetValue(playercolor, player->skincolor);
|
CV_StealthSetValue(&cv_playercolor, players[consoleplayer].skincolor);
|
||||||
else if (skins[player->skin].prefcolor)
|
else if (skins[players[consoleplayer].skin].prefcolor)
|
||||||
CV_StealthSetValue(playercolor, skins[player->skin].prefcolor);
|
CV_StealthSetValue(&cv_playercolor, skins[players[consoleplayer].skin].prefcolor);
|
||||||
else
|
else
|
||||||
CV_StealthSet(playercolor, playercolor->defaultvalue);
|
CV_StealthSet(&cv_playercolor, cv_playercolor.defaultvalue);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if (fastcmp(cv_playername.string, player_names[consoleplayer])
|
||||||
|
&& cv_playercolor.value == players[consoleplayer].skincolor
|
||||||
|
&& fastcmp(cv_skin.string, skins[players[consoleplayer].skin].name))
|
||||||
|
return;
|
||||||
|
|
||||||
// We'll handle it later if we're not playing.
|
// We'll handle it later if we're not playing.
|
||||||
if (!Playing())
|
if (!Playing())
|
||||||
return;
|
return;
|
||||||
|
|
||||||
if (fastcmp(playername->string, player_names[pnum])
|
|
||||||
&& playercolor->value == player->skincolor
|
|
||||||
&& fastcmp(playerskin->string, skins[player->skin].name))
|
|
||||||
return;
|
|
||||||
|
|
||||||
if (playerisbot)
|
|
||||||
{
|
|
||||||
players[pnum].skincolor = botcolor;
|
|
||||||
if (players[pnum].mo)
|
|
||||||
players[pnum].mo->color = players[pnum].skincolor;
|
|
||||||
SetPlayerSkinByNum(pnum, botskin-1);
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
// If you're not in a netgame, merely update the skin, color, and name.
|
// If you're not in a netgame, merely update the skin, color, and name.
|
||||||
if (!netgame)
|
if (!netgame)
|
||||||
{
|
{
|
||||||
INT32 foundskin;
|
INT32 foundskin;
|
||||||
|
|
||||||
CleanupPlayerName(pnum, playername->zstring);
|
CleanupPlayerName(consoleplayer, cv_playername.zstring);
|
||||||
strcpy(player_names[pnum], playername->zstring);
|
strcpy(player_names[consoleplayer], cv_playername.zstring);
|
||||||
|
|
||||||
player->skincolor = playercolor->value;
|
players[consoleplayer].skincolor = cv_playercolor.value;
|
||||||
|
|
||||||
if (player->mo)
|
if (players[consoleplayer].mo)
|
||||||
player->mo->color = player->skincolor;
|
players[consoleplayer].mo->color = players[consoleplayer].skincolor;
|
||||||
|
|
||||||
if ((foundskin = R_SkinAvailable(playerskin->string)) != -1)
|
if ((foundskin = R_SkinAvailable(cv_skin.string)) != -1)
|
||||||
{
|
{
|
||||||
playerskin->value = foundskin;
|
cv_skin.value = foundskin;
|
||||||
SetPlayerSkin(pnum, playerskin->string);
|
SetPlayerSkin(consoleplayer, cv_skin.string);
|
||||||
CV_StealthSet(playerskin, skins[playerskin->value].name);
|
CV_StealthSet(&cv_skin, skins[cv_skin.value].name);
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
playerskin->value = player->skin;
|
cv_skin.value = players[consoleplayer].skin;
|
||||||
CV_StealthSet(playerskin, skins[player->skin].name);
|
CV_StealthSet(&cv_skin, skins[players[consoleplayer].skin].name);
|
||||||
// will always be same as current
|
// will always be same as current
|
||||||
SetPlayerSkin(pnum, playerskin->string);
|
SetPlayerSkin(consoleplayer, cv_skin.string);
|
||||||
}
|
}
|
||||||
|
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
snacpending[splitplayer]++;
|
snacpending++;
|
||||||
|
|
||||||
// Don't change name if muted
|
// Don't change name if muted
|
||||||
if (player_name_changes[pnum] >= MAXNAMECHANGES)
|
if (player_name_changes[consoleplayer] >= MAXNAMECHANGES)
|
||||||
{
|
{
|
||||||
CV_StealthSet(playername, player_names[pnum]);
|
CV_StealthSet(&cv_playername, player_names[consoleplayer]);
|
||||||
HU_AddChatText("\x85*You must wait to change your name again", false);
|
HU_AddChatText("\x85*You must wait to change your name again", false);
|
||||||
}
|
}
|
||||||
else if (cv_mute.value && !(server || IsPlayerAdmin(pnum)))
|
else if (cv_mute.value && !(server || IsPlayerAdmin(consoleplayer)))
|
||||||
CV_StealthSet(playername, player_names[pnum]);
|
CV_StealthSet(&cv_playername, player_names[consoleplayer]);
|
||||||
else // Cleanup name if changing it
|
else // Cleanup name if changing it
|
||||||
CleanupPlayerName(pnum, playername->zstring);
|
CleanupPlayerName(consoleplayer, cv_playername.zstring);
|
||||||
|
|
||||||
// Don't change skin if the server doesn't want you to.
|
// Don't change skin if the server doesn't want you to.
|
||||||
if (!CanChangeSkin(pnum))
|
if (!CanChangeSkin(consoleplayer))
|
||||||
CV_StealthSet(playerskin, skins[player->skin].name);
|
CV_StealthSet(&cv_skin, skins[players[consoleplayer].skin].name);
|
||||||
|
|
||||||
// check if player has the skin loaded (cv_skin may have
|
// check if player has the skin loaded (cv_skin may have
|
||||||
// the name of a skin that was available in the previous game)
|
// the name of a skin that was available in the previous game)
|
||||||
playerskin->value = R_SkinAvailable(playerskin->string);
|
cv_skin.value = R_SkinAvailable(cv_skin.string);
|
||||||
if (playerskin->value < 0)
|
if (cv_skin.value < 0)
|
||||||
{
|
{
|
||||||
INT32 skinnum = player->skin;
|
INT32 skinnum = players[consoleplayer].skin;
|
||||||
CV_StealthSet(playerskin, skins[skinnum].name);
|
CV_StealthSet(&cv_skin, skins[skinnum].name);
|
||||||
playerskin->value = skinnum;
|
cv_skin.value = skinnum;
|
||||||
}
|
}
|
||||||
|
|
||||||
// Finally write out the complete packet and send it off.
|
// Finally write out the complete packet and send it off.
|
||||||
WRITESTRINGN(p, playername->zstring, MAXPLAYERNAME);
|
WRITESTRINGN(p, cv_playername.zstring, MAXPLAYERNAME);
|
||||||
WRITEUINT8(p, (UINT8)playercolor->value);
|
WRITEUINT8(p, (UINT8)cv_playercolor.value);
|
||||||
WRITEUINT8(p, (UINT8)playerskin->value);
|
WRITEUINT8(p, (UINT8)cv_skin.value);
|
||||||
SendNetXCmdForPlayer(splitplayer, XD_NAMEANDCOLOR, buf, p - buf);
|
SendNetXCmdForPlayer(0, XD_NAMEANDCOLOR, buf, p - buf);
|
||||||
|
}
|
||||||
|
|
||||||
|
// splitscreen
|
||||||
|
static void SendNameAndColor2(void)
|
||||||
|
{
|
||||||
|
INT32 secondplaya = -1;
|
||||||
|
char buf[MAXPLAYERNAME+2];
|
||||||
|
char *p;
|
||||||
|
|
||||||
|
if (splitscreen < 1 && !botingame)
|
||||||
|
return; // can happen if skin2/color2/name2 changed
|
||||||
|
|
||||||
|
if (displayplayers[1] != consoleplayer)
|
||||||
|
secondplaya = displayplayers[1];
|
||||||
|
else if (!netgame) // HACK
|
||||||
|
secondplaya = 1;
|
||||||
|
|
||||||
|
if (secondplaya == -1)
|
||||||
|
return;
|
||||||
|
|
||||||
|
p = buf;
|
||||||
|
|
||||||
|
// normal player colors
|
||||||
|
if (G_GametypeHasTeams())
|
||||||
|
{
|
||||||
|
if (players[secondplaya].ctfteam == 1 && cv_playercolor2.value != skincolor_redteam)
|
||||||
|
CV_StealthSetValue(&cv_playercolor2, skincolor_redteam);
|
||||||
|
else if (players[secondplaya].ctfteam == 2 && cv_playercolor2.value != skincolor_blueteam)
|
||||||
|
CV_StealthSetValue(&cv_playercolor2, skincolor_blueteam);
|
||||||
|
}
|
||||||
|
|
||||||
|
// never allow the color "none"
|
||||||
|
if (!cv_playercolor2.value)
|
||||||
|
{
|
||||||
|
if (players[secondplaya].skincolor)
|
||||||
|
CV_StealthSetValue(&cv_playercolor2, players[secondplaya].skincolor);
|
||||||
|
else if (skins[players[secondplaya].skin].prefcolor)
|
||||||
|
CV_StealthSetValue(&cv_playercolor2, skins[players[secondplaya].skin].prefcolor);
|
||||||
|
else
|
||||||
|
CV_StealthSet(&cv_playercolor2, cv_playercolor2.defaultvalue);
|
||||||
|
}
|
||||||
|
|
||||||
|
// We'll handle it later if we're not playing.
|
||||||
|
if (!Playing())
|
||||||
|
return;
|
||||||
|
|
||||||
|
// If you're not in a netgame, merely update the skin, color, and name.
|
||||||
|
if (botingame)
|
||||||
|
{
|
||||||
|
players[secondplaya].skincolor = botcolor;
|
||||||
|
if (players[secondplaya].mo)
|
||||||
|
players[secondplaya].mo->color = players[secondplaya].skincolor;
|
||||||
|
SetPlayerSkinByNum(secondplaya, botskin-1);
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
else if (!netgame)
|
||||||
|
{
|
||||||
|
INT32 foundskin;
|
||||||
|
|
||||||
|
CleanupPlayerName(secondplaya, cv_playername2.zstring);
|
||||||
|
strcpy(player_names[secondplaya], cv_playername2.zstring);
|
||||||
|
|
||||||
|
// don't use displayplayers[1]: the second player must be 1
|
||||||
|
players[secondplaya].skincolor = cv_playercolor2.value;
|
||||||
|
if (players[secondplaya].mo)
|
||||||
|
players[secondplaya].mo->color = players[secondplaya].skincolor;
|
||||||
|
|
||||||
|
if ((foundskin = R_SkinAvailable(cv_skin2.string)) != -1)
|
||||||
|
{
|
||||||
|
cv_skin2.value = foundskin;
|
||||||
|
SetPlayerSkin(secondplaya, cv_skin2.string);
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
cv_skin2.value = players[secondplaya].skin;
|
||||||
|
CV_StealthSet(&cv_skin2, skins[players[secondplaya].skin].name);
|
||||||
|
// will always be same as current
|
||||||
|
SetPlayerSkin(secondplaya, cv_skin2.string);
|
||||||
|
}
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
snac2pending++;
|
||||||
|
|
||||||
|
// Don't change name if muted
|
||||||
|
if (player_name_changes[displayplayers[1]] >= MAXNAMECHANGES)
|
||||||
|
{
|
||||||
|
CV_StealthSet(&cv_playername2, player_names[displayplayers[1]]);
|
||||||
|
HU_AddChatText("\x85*You must wait to change your name again", false);
|
||||||
|
}
|
||||||
|
else if (cv_mute.value && !(server || IsPlayerAdmin(displayplayers[1])))
|
||||||
|
CV_StealthSet(&cv_playername2, player_names[displayplayers[1]]);
|
||||||
|
else // Cleanup name if changing it
|
||||||
|
CleanupPlayerName(displayplayers[1], cv_playername2.zstring);
|
||||||
|
|
||||||
|
// Don't change skin if the server doesn't want you to.
|
||||||
|
if (!CanChangeSkin(displayplayers[1]))
|
||||||
|
CV_StealthSet(&cv_skin2, skins[players[displayplayers[1]].skin].name);
|
||||||
|
|
||||||
|
// check if player has the skin loaded (cv_skin2 may have
|
||||||
|
// the name of a skin that was available in the previous game)
|
||||||
|
cv_skin2.value = R_SkinAvailable(cv_skin2.string);
|
||||||
|
if (cv_skin2.value < 0)
|
||||||
|
{
|
||||||
|
INT32 skinnum = players[displayplayers[1]].skin;
|
||||||
|
CV_StealthSet(&cv_skin2, skins[skinnum].name);
|
||||||
|
cv_skin2.value = skinnum;
|
||||||
|
}
|
||||||
|
|
||||||
|
// Finally write out the complete packet and send it off.
|
||||||
|
WRITESTRINGN(p, cv_playername2.zstring, MAXPLAYERNAME);
|
||||||
|
WRITEUINT8(p, (UINT8)cv_playercolor2.value);
|
||||||
|
WRITEUINT8(p, (UINT8)cv_skin2.value);
|
||||||
|
SendNetXCmdForPlayer(1, XD_NAMEANDCOLOR, buf, p - buf);
|
||||||
|
}
|
||||||
|
|
||||||
|
static void SendNameAndColor3(void)
|
||||||
|
{
|
||||||
|
INT32 thirdplaya = -1;
|
||||||
|
char buf[MAXPLAYERNAME+2];
|
||||||
|
char *p;
|
||||||
|
|
||||||
|
if (splitscreen < 2)
|
||||||
|
return; // can happen if skin3/color3/name3 changed
|
||||||
|
|
||||||
|
if (displayplayers[2] != consoleplayer)
|
||||||
|
thirdplaya = displayplayers[2];
|
||||||
|
else if (!netgame) // HACK
|
||||||
|
thirdplaya = 2;
|
||||||
|
|
||||||
|
if (thirdplaya == -1)
|
||||||
|
return;
|
||||||
|
|
||||||
|
p = buf;
|
||||||
|
|
||||||
|
// normal player colors
|
||||||
|
if (G_GametypeHasTeams())
|
||||||
|
{
|
||||||
|
if (players[thirdplaya].ctfteam == 1 && cv_playercolor3.value != skincolor_redteam)
|
||||||
|
CV_StealthSetValue(&cv_playercolor3, skincolor_redteam);
|
||||||
|
else if (players[thirdplaya].ctfteam == 2 && cv_playercolor3.value != skincolor_blueteam)
|
||||||
|
CV_StealthSetValue(&cv_playercolor3, skincolor_blueteam);
|
||||||
|
}
|
||||||
|
|
||||||
|
// never allow the color "none"
|
||||||
|
if (!cv_playercolor3.value)
|
||||||
|
{
|
||||||
|
if (players[thirdplaya].skincolor)
|
||||||
|
CV_StealthSetValue(&cv_playercolor3, players[thirdplaya].skincolor);
|
||||||
|
else if (skins[players[thirdplaya].skin].prefcolor)
|
||||||
|
CV_StealthSetValue(&cv_playercolor3, skins[players[thirdplaya].skin].prefcolor);
|
||||||
|
else
|
||||||
|
CV_StealthSet(&cv_playercolor3, cv_playercolor3.defaultvalue);
|
||||||
|
}
|
||||||
|
|
||||||
|
// We'll handle it later if we're not playing.
|
||||||
|
if (!Playing())
|
||||||
|
return;
|
||||||
|
|
||||||
|
// If you're not in a netgame, merely update the skin, color, and name.
|
||||||
|
if (!netgame)
|
||||||
|
{
|
||||||
|
INT32 foundskin;
|
||||||
|
|
||||||
|
CleanupPlayerName(thirdplaya, cv_playername3.zstring);
|
||||||
|
strcpy(player_names[thirdplaya], cv_playername3.zstring);
|
||||||
|
|
||||||
|
// don't use displayplayers[2]: the third player must be 2
|
||||||
|
players[thirdplaya].skincolor = cv_playercolor3.value;
|
||||||
|
if (players[thirdplaya].mo)
|
||||||
|
players[thirdplaya].mo->color = players[thirdplaya].skincolor;
|
||||||
|
|
||||||
|
if ((foundskin = R_SkinAvailable(cv_skin3.string)) != -1)
|
||||||
|
{
|
||||||
|
cv_skin3.value = foundskin;
|
||||||
|
SetPlayerSkin(thirdplaya, cv_skin3.string);
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
cv_skin3.value = players[thirdplaya].skin;
|
||||||
|
CV_StealthSet(&cv_skin3, skins[players[thirdplaya].skin].name);
|
||||||
|
// will always be same as current
|
||||||
|
SetPlayerSkin(thirdplaya, cv_skin3.string);
|
||||||
|
}
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
snac3pending++;
|
||||||
|
|
||||||
|
// Don't change name if muted
|
||||||
|
if (player_name_changes[displayplayers[2]] >= MAXNAMECHANGES)
|
||||||
|
{
|
||||||
|
CV_StealthSet(&cv_playername3, player_names[displayplayers[2]]);
|
||||||
|
HU_AddChatText("\x85*You must wait to change your name again", false);
|
||||||
|
}
|
||||||
|
else if (cv_mute.value && !(server || IsPlayerAdmin(displayplayers[2])))
|
||||||
|
CV_StealthSet(&cv_playername3, player_names[displayplayers[2]]);
|
||||||
|
else // Cleanup name if changing it
|
||||||
|
CleanupPlayerName(displayplayers[2], cv_playername3.zstring);
|
||||||
|
|
||||||
|
// Don't change skin if the server doesn't want you to.
|
||||||
|
if (!CanChangeSkin(displayplayers[2]))
|
||||||
|
CV_StealthSet(&cv_skin3, skins[players[displayplayers[2]].skin].name);
|
||||||
|
|
||||||
|
// check if player has the skin loaded (cv_skin3 may have
|
||||||
|
// the name of a skin that was available in the previous game)
|
||||||
|
cv_skin3.value = R_SkinAvailable(cv_skin3.string);
|
||||||
|
if (cv_skin3.value < 0)
|
||||||
|
{
|
||||||
|
INT32 skinnum = players[displayplayers[2]].skin;
|
||||||
|
CV_StealthSet(&cv_skin3, skins[skinnum].name);
|
||||||
|
cv_skin3.value = skinnum;
|
||||||
|
}
|
||||||
|
|
||||||
|
// Finally write out the complete packet and send it off.
|
||||||
|
WRITESTRINGN(p, cv_playername3.zstring, MAXPLAYERNAME);
|
||||||
|
WRITEUINT8(p, (UINT8)cv_playercolor3.value);
|
||||||
|
WRITEUINT8(p, (UINT8)cv_skin3.value);
|
||||||
|
SendNetXCmdForPlayer(2, XD_NAMEANDCOLOR, buf, p - buf);
|
||||||
|
}
|
||||||
|
|
||||||
|
static void SendNameAndColor4(void)
|
||||||
|
{
|
||||||
|
INT32 fourthplaya = -1;
|
||||||
|
char buf[MAXPLAYERNAME+2];
|
||||||
|
char *p;
|
||||||
|
|
||||||
|
if (splitscreen < 3)
|
||||||
|
return; // can happen if skin4/color4/name4 changed
|
||||||
|
|
||||||
|
if (displayplayers[3] != consoleplayer)
|
||||||
|
fourthplaya = displayplayers[3];
|
||||||
|
else if (!netgame) // HACK
|
||||||
|
fourthplaya = 3;
|
||||||
|
|
||||||
|
if (fourthplaya == -1)
|
||||||
|
return;
|
||||||
|
|
||||||
|
p = buf;
|
||||||
|
|
||||||
|
// normal player colors
|
||||||
|
if (G_GametypeHasTeams())
|
||||||
|
{
|
||||||
|
if (players[fourthplaya].ctfteam == 1 && cv_playercolor4.value != skincolor_redteam)
|
||||||
|
CV_StealthSetValue(&cv_playercolor4, skincolor_redteam);
|
||||||
|
else if (players[fourthplaya].ctfteam == 2 && cv_playercolor4.value != skincolor_blueteam)
|
||||||
|
CV_StealthSetValue(&cv_playercolor4, skincolor_blueteam);
|
||||||
|
}
|
||||||
|
|
||||||
|
// never allow the color "none"
|
||||||
|
if (!cv_playercolor4.value)
|
||||||
|
{
|
||||||
|
if (players[fourthplaya].skincolor)
|
||||||
|
CV_StealthSetValue(&cv_playercolor4, players[fourthplaya].skincolor);
|
||||||
|
else if (skins[players[fourthplaya].skin].prefcolor)
|
||||||
|
CV_StealthSetValue(&cv_playercolor4, skins[players[fourthplaya].skin].prefcolor);
|
||||||
|
else
|
||||||
|
CV_StealthSet(&cv_playercolor4, cv_playercolor4.defaultvalue);
|
||||||
|
}
|
||||||
|
|
||||||
|
// We'll handle it later if we're not playing.
|
||||||
|
if (!Playing())
|
||||||
|
return;
|
||||||
|
|
||||||
|
// If you're not in a netgame, merely update the skin, color, and name.
|
||||||
|
if (botingame)
|
||||||
|
{
|
||||||
|
players[fourthplaya].skincolor = botcolor;
|
||||||
|
if (players[fourthplaya].mo)
|
||||||
|
players[fourthplaya].mo->color = players[fourthplaya].skincolor;
|
||||||
|
SetPlayerSkinByNum(fourthplaya, botskin-1);
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
else if (!netgame)
|
||||||
|
{
|
||||||
|
INT32 foundskin;
|
||||||
|
|
||||||
|
CleanupPlayerName(fourthplaya, cv_playername4.zstring);
|
||||||
|
strcpy(player_names[fourthplaya], cv_playername4.zstring);
|
||||||
|
|
||||||
|
// don't use displayplayers[3]: the second player must be 4
|
||||||
|
players[fourthplaya].skincolor = cv_playercolor4.value;
|
||||||
|
if (players[fourthplaya].mo)
|
||||||
|
players[fourthplaya].mo->color = players[fourthplaya].skincolor;
|
||||||
|
|
||||||
|
if ((foundskin = R_SkinAvailable(cv_skin4.string)) != -1)
|
||||||
|
{
|
||||||
|
cv_skin4.value = foundskin;
|
||||||
|
SetPlayerSkin(fourthplaya, cv_skin4.string);
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
cv_skin4.value = players[fourthplaya].skin;
|
||||||
|
CV_StealthSet(&cv_skin4, skins[players[fourthplaya].skin].name);
|
||||||
|
// will always be same as current
|
||||||
|
SetPlayerSkin(fourthplaya, cv_skin4.string);
|
||||||
|
}
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
snac4pending++;
|
||||||
|
|
||||||
|
// Don't change name if muted
|
||||||
|
if (player_name_changes[displayplayers[3]] >= MAXNAMECHANGES)
|
||||||
|
{
|
||||||
|
CV_StealthSet(&cv_playername4, player_names[displayplayers[3]]);
|
||||||
|
HU_AddChatText("\x85*You must wait to change your name again", false);
|
||||||
|
}
|
||||||
|
else if (cv_mute.value && !(server || IsPlayerAdmin(displayplayers[3])))
|
||||||
|
CV_StealthSet(&cv_playername4, player_names[displayplayers[3]]);
|
||||||
|
else // Cleanup name if changing it
|
||||||
|
CleanupPlayerName(displayplayers[3], cv_playername4.zstring);
|
||||||
|
|
||||||
|
// Don't change skin if the server doesn't want you to.
|
||||||
|
if (!CanChangeSkin(displayplayers[3]))
|
||||||
|
CV_StealthSet(&cv_skin4, skins[players[displayplayers[3]].skin].name);
|
||||||
|
|
||||||
|
// check if player has the skin loaded (cv_skin4 may have
|
||||||
|
// the name of a skin that was available in the previous game)
|
||||||
|
cv_skin4.value = R_SkinAvailable(cv_skin4.string);
|
||||||
|
if (cv_skin4.value < 0)
|
||||||
|
{
|
||||||
|
INT32 skinnum = players[displayplayers[3]].skin;
|
||||||
|
CV_StealthSet(&cv_skin4, skins[skinnum].name);
|
||||||
|
cv_skin4.value = skinnum;
|
||||||
|
}
|
||||||
|
|
||||||
|
// Finally write out the complete packet and send it off.
|
||||||
|
WRITESTRINGN(p, cv_playername4.zstring, MAXPLAYERNAME);
|
||||||
|
WRITEUINT8(p, (UINT8)cv_playercolor4.value);
|
||||||
|
WRITEUINT8(p, (UINT8)cv_skin4.value);
|
||||||
|
SendNetXCmdForPlayer(3, XD_NAMEANDCOLOR, buf, p - buf);
|
||||||
}
|
}
|
||||||
|
|
||||||
static void Got_NameAndColor(const UINT8 **cp, INT32 playernum)
|
static void Got_NameAndColor(const UINT8 **cp, INT32 playernum)
|
||||||
{
|
{
|
||||||
player_t *player = &players[playernum];
|
player_t *p = &players[playernum];
|
||||||
char name[MAXPLAYERNAME+1] = {};
|
char name[MAXPLAYERNAME+1];
|
||||||
UINT8 color, skin;
|
UINT8 color, skin;
|
||||||
|
|
||||||
#ifdef PARANOIA
|
#ifdef PARANOIA
|
||||||
@@ -1640,14 +1939,19 @@ static void Got_NameAndColor(const UINT8 **cp, INT32 playernum)
|
|||||||
I_Error("There is no player %d!", playernum);
|
I_Error("There is no player %d!", playernum);
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
if (P_IsLocalPlayer(player))
|
if (playernum == consoleplayer)
|
||||||
{
|
snacpending--; // TODO: make snacpending an array instead of 4 separate vars?
|
||||||
snacpending[playernum]--;
|
else if (playernum == displayplayers[1])
|
||||||
|
snac2pending--;
|
||||||
|
else if (playernum == displayplayers[2])
|
||||||
|
snac3pending--;
|
||||||
|
else if (playernum == displayplayers[3])
|
||||||
|
snac4pending--;
|
||||||
|
|
||||||
#ifdef PARANOIA
|
#ifdef PARANOIA
|
||||||
if (snacpending[playernum] < 0)
|
if (snacpending < 0 || snac2pending < 0 || snac3pending < 0 || snac4pending < 0)
|
||||||
I_Error("snacpending negative!");
|
I_Error("snacpending negative!");
|
||||||
#endif
|
#endif
|
||||||
}
|
|
||||||
|
|
||||||
READSTRINGN(*cp, name, MAXPLAYERNAME);
|
READSTRINGN(*cp, name, MAXPLAYERNAME);
|
||||||
color = READUINT8(*cp);
|
color = READUINT8(*cp);
|
||||||
@@ -1661,32 +1965,33 @@ static void Got_NameAndColor(const UINT8 **cp, INT32 playernum)
|
|||||||
}
|
}
|
||||||
|
|
||||||
// set color
|
// set color
|
||||||
player->skincolor = color % MAXSKINCOLORS;
|
p->skincolor = color % MAXSKINCOLORS;
|
||||||
if (player->mo)
|
if (p->mo)
|
||||||
player->mo->color = (UINT8)player->skincolor;
|
p->mo->color = (UINT8)p->skincolor;
|
||||||
demo_extradata[playernum] |= DXD_COLOR;
|
demo_extradata[playernum] |= DXD_COLOR;
|
||||||
|
|
||||||
// normal player colors
|
// normal player colors
|
||||||
if (server && !P_IsLocalPlayer(player))
|
if (server && (p != &players[consoleplayer] && p != &players[displayplayers[1]]
|
||||||
|
&& p != &players[displayplayers[2]] && p != &players[displayplayers[3]]))
|
||||||
{
|
{
|
||||||
boolean kick = false;
|
boolean kick = false;
|
||||||
|
|
||||||
// team colors
|
// team colors
|
||||||
if (G_GametypeHasTeams())
|
if (G_GametypeHasTeams())
|
||||||
{
|
{
|
||||||
if (player->ctfteam == 1 && player->skincolor != skincolor_redteam)
|
if (p->ctfteam == 1 && p->skincolor != skincolor_redteam)
|
||||||
kick = true;
|
kick = true;
|
||||||
else if (player->ctfteam == 2 && player->skincolor != skincolor_blueteam)
|
else if (p->ctfteam == 2 && p->skincolor != skincolor_blueteam)
|
||||||
kick = true;
|
kick = true;
|
||||||
}
|
}
|
||||||
|
|
||||||
// don't allow color "none"
|
// don't allow color "none"
|
||||||
if (!player->skincolor)
|
if (!p->skincolor)
|
||||||
kick = true;
|
kick = true;
|
||||||
|
|
||||||
if (kick)
|
if (kick)
|
||||||
{
|
{
|
||||||
CONS_Alert(CONS_WARNING, M_GetText("Illegal color change received from %s (team: %d), color: %d)\n"), player_names[playernum], player->ctfteam, player->skincolor);
|
CONS_Alert(CONS_WARNING, M_GetText("Illegal color change received from %s (team: %d), color: %d)\n"), player_names[playernum], p->ctfteam, p->skincolor);
|
||||||
SendKick(playernum, KICK_MSG_CON_FAIL);
|
SendKick(playernum, KICK_MSG_CON_FAIL);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
@@ -1698,7 +2003,6 @@ static void Got_NameAndColor(const UINT8 **cp, INT32 playernum)
|
|||||||
const INT32 forcedskin = cv_forceskin.value;
|
const INT32 forcedskin = cv_forceskin.value;
|
||||||
SetPlayerSkinByNum(playernum, forcedskin);
|
SetPlayerSkinByNum(playernum, forcedskin);
|
||||||
|
|
||||||
// TODO: make cv_skin an array
|
|
||||||
if (playernum == consoleplayer)
|
if (playernum == consoleplayer)
|
||||||
CV_StealthSet(&cv_skin, skins[forcedskin].name);
|
CV_StealthSet(&cv_skin, skins[forcedskin].name);
|
||||||
else if (playernum == displayplayers[1])
|
else if (playernum == displayplayers[1])
|
||||||
@@ -1712,16 +2016,44 @@ static void Got_NameAndColor(const UINT8 **cp, INT32 playernum)
|
|||||||
SetPlayerSkinByNum(playernum, skin);
|
SetPlayerSkinByNum(playernum, skin);
|
||||||
}
|
}
|
||||||
|
|
||||||
void SendWeaponPref(UINT8 splitplayer)
|
void SendWeaponPref(void)
|
||||||
{
|
{
|
||||||
UINT8 buf[1];
|
UINT8 buf[1];
|
||||||
|
|
||||||
buf[0] = 0;
|
buf[0] = 0;
|
||||||
|
if (cv_flipcam[0].value)
|
||||||
if (cv_flipcam[splitplayer].value)
|
|
||||||
buf[0] |= 1;
|
buf[0] |= 1;
|
||||||
|
SendNetXCmdForPlayer(0, XD_WEAPONPREF, buf, 1);
|
||||||
|
}
|
||||||
|
|
||||||
SendNetXCmdForPlayer(splitplayer, XD_WEAPONPREF, buf, 1);
|
void SendWeaponPref2(void)
|
||||||
|
{
|
||||||
|
UINT8 buf[1];
|
||||||
|
|
||||||
|
buf[0] = 0;
|
||||||
|
if (cv_flipcam[1].value)
|
||||||
|
buf[0] |= 1;
|
||||||
|
SendNetXCmdForPlayer(1, XD_WEAPONPREF, buf, 1);
|
||||||
|
}
|
||||||
|
|
||||||
|
void SendWeaponPref3(void)
|
||||||
|
{
|
||||||
|
UINT8 buf[1];
|
||||||
|
|
||||||
|
buf[0] = 0;
|
||||||
|
if (cv_flipcam[2].value)
|
||||||
|
buf[0] |= 1;
|
||||||
|
SendNetXCmdForPlayer(2, XD_WEAPONPREF, buf, 1);
|
||||||
|
}
|
||||||
|
|
||||||
|
void SendWeaponPref4(void)
|
||||||
|
{
|
||||||
|
UINT8 buf[1];
|
||||||
|
|
||||||
|
buf[0] = 0;
|
||||||
|
if (cv_flipcam[3].value)
|
||||||
|
buf[0] |= 1;
|
||||||
|
SendNetXCmdForPlayer(3, XD_WEAPONPREF, buf, 1);
|
||||||
}
|
}
|
||||||
|
|
||||||
static void Got_WeaponPref(const UINT8 **cp, INT32 playernum)
|
static void Got_WeaponPref(const UINT8 **cp, INT32 playernum)
|
||||||
@@ -1737,10 +2069,23 @@ static void Got_WeaponPref(const UINT8 **cp, INT32 playernum)
|
|||||||
player->pflags |= PF_ANALOGMODE;
|
player->pflags |= PF_ANALOGMODE;
|
||||||
}
|
}
|
||||||
|
|
||||||
void D_SendPlayerConfig(UINT8 splitplayer)
|
void D_SendPlayerConfig(void)
|
||||||
{
|
{
|
||||||
SendNameAndColor(splitplayer);
|
SendNameAndColor();
|
||||||
SendWeaponPref(splitplayer);
|
if (splitscreen || botingame)
|
||||||
|
SendNameAndColor2();
|
||||||
|
if (splitscreen > 1)
|
||||||
|
SendNameAndColor3();
|
||||||
|
if (splitscreen > 2)
|
||||||
|
SendNameAndColor4();
|
||||||
|
|
||||||
|
SendWeaponPref();
|
||||||
|
if (splitscreen)
|
||||||
|
SendWeaponPref2();
|
||||||
|
if (splitscreen > 1)
|
||||||
|
SendWeaponPref3();
|
||||||
|
if (splitscreen > 2)
|
||||||
|
SendWeaponPref4();
|
||||||
}
|
}
|
||||||
|
|
||||||
// Only works for displayplayer, sorry!
|
// Only works for displayplayer, sorry!
|
||||||
@@ -1763,12 +2108,10 @@ INT32 D_LookupPlayer(const char *s)
|
|||||||
return playernum;
|
return playernum;
|
||||||
}
|
}
|
||||||
|
|
||||||
const size_t len = strlen(s);
|
|
||||||
|
|
||||||
for (playernum = 0; playernum < MAXPLAYERS; ++playernum)
|
for (playernum = 0; playernum < MAXPLAYERS; ++playernum)
|
||||||
{
|
{
|
||||||
/* Match name case-insensitively: fully, or partially the start. */
|
/* Match name case-insensitively: fully, or partially the start. */
|
||||||
if (playeringame[playernum] && (strnicmp(player_names[playernum], s, len) == 0))
|
if (playeringame[playernum] && (strnicmp(player_names[playernum], s, strlen(s)) == 0))
|
||||||
{
|
{
|
||||||
return playernum;
|
return playernum;
|
||||||
}
|
}
|
||||||
@@ -1808,15 +2151,13 @@ static void GetViewablePlayerPlaceRange(INT32 *first, INT32 *last)
|
|||||||
(*last) = 0;
|
(*last) = 0;
|
||||||
|
|
||||||
for (i = 0; i < MAXPLAYERS; ++i)
|
for (i = 0; i < MAXPLAYERS; ++i)
|
||||||
{
|
|
||||||
if (G_CouldView(i))
|
if (G_CouldView(i))
|
||||||
{
|
{
|
||||||
place = players[i].kartstuff[k_position];
|
place = players[i].kartstuff[k_position];
|
||||||
if (place < (*first))
|
if (place < (*first))
|
||||||
(*first) = place;
|
(*first) = place;
|
||||||
if (place > (*last))
|
if (place > (*last))
|
||||||
(*last) = place;
|
(*last) = place;
|
||||||
}
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -2150,7 +2491,7 @@ void D_MapChange(INT32 mapnum, INT32 newgametype, boolean pencoremode, boolean r
|
|||||||
displayplayers[1] = 1;
|
displayplayers[1] = 1;
|
||||||
playeringame[1] = true;
|
playeringame[1] = true;
|
||||||
players[1].bot = 1;
|
players[1].bot = 1;
|
||||||
SendNameAndColor(1);
|
SendNameAndColor2();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -5427,54 +5768,50 @@ static void ForceSkin_OnChange(void)
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
// Allows the player's name to be changed if cv_mute is off.
|
//Allows the player's name to be changed if cv_mute is off.
|
||||||
static void Name_OnChange(void)
|
static void Name_OnChange(void)
|
||||||
{
|
{
|
||||||
if (cv_mute.value && !(server || IsPlayerAdmin(consoleplayer)))
|
if (cv_mute.value && !(server || IsPlayerAdmin(consoleplayer)))
|
||||||
{
|
{
|
||||||
CONS_Alert(CONS_NOTICE, M_GetText("You may not change your name when chat is muted.\n"));
|
CONS_Alert(CONS_NOTICE, M_GetText("You may not change your name when chat is muted.\n"));
|
||||||
CV_StealthSet(&cv_playername, player_names[consoleplayer]);
|
CV_StealthSet(&cv_playername, player_names[consoleplayer]);
|
||||||
return;
|
|
||||||
}
|
}
|
||||||
|
else
|
||||||
SendNameAndColor(0);
|
SendNameAndColor();
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
static void Name2_OnChange(void)
|
static void Name2_OnChange(void)
|
||||||
{
|
{
|
||||||
if (cv_mute.value) // Secondary player can't be admin.
|
if (cv_mute.value) //Secondary player can't be admin.
|
||||||
{
|
{
|
||||||
CONS_Alert(CONS_NOTICE, M_GetText("You may not change your name when chat is muted.\n"));
|
CONS_Alert(CONS_NOTICE, M_GetText("You may not change your name when chat is muted.\n"));
|
||||||
CV_StealthSet(&cv_playername2, player_names[displayplayers[1]]);
|
CV_StealthSet(&cv_playername2, player_names[displayplayers[1]]);
|
||||||
return;
|
|
||||||
}
|
}
|
||||||
|
else
|
||||||
SendNameAndColor(1);
|
SendNameAndColor2();
|
||||||
}
|
}
|
||||||
|
|
||||||
static void Name3_OnChange(void)
|
static void Name3_OnChange(void)
|
||||||
{
|
{
|
||||||
if (cv_mute.value) // Third player can't be admin.
|
if (cv_mute.value) //Third player can't be admin.
|
||||||
{
|
{
|
||||||
CONS_Alert(CONS_NOTICE, M_GetText("You may not change your name when chat is muted.\n"));
|
CONS_Alert(CONS_NOTICE, M_GetText("You may not change your name when chat is muted.\n"));
|
||||||
CV_StealthSet(&cv_playername3, player_names[displayplayers[2]]);
|
CV_StealthSet(&cv_playername3, player_names[displayplayers[2]]);
|
||||||
return;
|
|
||||||
}
|
}
|
||||||
|
else
|
||||||
SendNameAndColor(2);
|
SendNameAndColor3();
|
||||||
}
|
}
|
||||||
|
|
||||||
static void Name4_OnChange(void)
|
static void Name4_OnChange(void)
|
||||||
{
|
{
|
||||||
if (cv_mute.value) // Secondary player can't be admin.
|
if (cv_mute.value) //Secondary player can't be admin.
|
||||||
{
|
{
|
||||||
CONS_Alert(CONS_NOTICE, M_GetText("You may not change your name when chat is muted.\n"));
|
CONS_Alert(CONS_NOTICE, M_GetText("You may not change your name when chat is muted.\n"));
|
||||||
CV_StealthSet(&cv_playername4, player_names[displayplayers[3]]);
|
CV_StealthSet(&cv_playername4, player_names[displayplayers[3]]);
|
||||||
return;
|
|
||||||
}
|
}
|
||||||
|
else
|
||||||
SendNameAndColor(3);
|
SendNameAndColor4();
|
||||||
}
|
}
|
||||||
|
|
||||||
/** Sends a skin change for the console player, unless that player is moving.
|
/** Sends a skin change for the console player, unless that player is moving.
|
||||||
@@ -5496,7 +5833,7 @@ static void Skin_OnChange(void)
|
|||||||
}
|
}
|
||||||
|
|
||||||
if (CanChangeSkin(consoleplayer) && !P_PlayerMoving(consoleplayer))
|
if (CanChangeSkin(consoleplayer) && !P_PlayerMoving(consoleplayer))
|
||||||
SendNameAndColor(0);
|
SendNameAndColor();
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
CONS_Alert(CONS_NOTICE, M_GetText("You can't change your skin at the moment.\n"));
|
CONS_Alert(CONS_NOTICE, M_GetText("You can't change your skin at the moment.\n"));
|
||||||
@@ -5517,7 +5854,7 @@ static void Skin2_OnChange(void)
|
|||||||
return; // do whatever you want
|
return; // do whatever you want
|
||||||
|
|
||||||
if (CanChangeSkin(displayplayers[1]) && !P_PlayerMoving(displayplayers[1]))
|
if (CanChangeSkin(displayplayers[1]) && !P_PlayerMoving(displayplayers[1]))
|
||||||
SendNameAndColor(1);
|
SendNameAndColor2();
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
CONS_Alert(CONS_NOTICE, M_GetText("You can't change your skin at the moment.\n"));
|
CONS_Alert(CONS_NOTICE, M_GetText("You can't change your skin at the moment.\n"));
|
||||||
@@ -5533,7 +5870,7 @@ static void Skin3_OnChange(void)
|
|||||||
return; // do whatever you want
|
return; // do whatever you want
|
||||||
|
|
||||||
if (CanChangeSkin(displayplayers[2]) && !P_PlayerMoving(displayplayers[2]))
|
if (CanChangeSkin(displayplayers[2]) && !P_PlayerMoving(displayplayers[2]))
|
||||||
SendNameAndColor(2);
|
SendNameAndColor3();
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
CONS_Alert(CONS_NOTICE, M_GetText("You can't change your skin at the moment.\n"));
|
CONS_Alert(CONS_NOTICE, M_GetText("You can't change your skin at the moment.\n"));
|
||||||
@@ -5549,7 +5886,7 @@ static void Skin4_OnChange(void)
|
|||||||
return; // do whatever you want
|
return; // do whatever you want
|
||||||
|
|
||||||
if (CanChangeSkin(displayplayers[3]) && !P_PlayerMoving(displayplayers[3]))
|
if (CanChangeSkin(displayplayers[3]) && !P_PlayerMoving(displayplayers[3]))
|
||||||
SendNameAndColor(3);
|
SendNameAndColor4();
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
CONS_Alert(CONS_NOTICE, M_GetText("You can't change your skin at the moment.\n"));
|
CONS_Alert(CONS_NOTICE, M_GetText("You can't change your skin at the moment.\n"));
|
||||||
@@ -5662,7 +5999,7 @@ static void Color_OnChange(void)
|
|||||||
if (!P_PlayerMoving(consoleplayer))
|
if (!P_PlayerMoving(consoleplayer))
|
||||||
{
|
{
|
||||||
// Color change menu scrolling fix is no longer necessary
|
// Color change menu scrolling fix is no longer necessary
|
||||||
SendNameAndColor(0);
|
SendNameAndColor();
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
@@ -5684,7 +6021,7 @@ static void Color2_OnChange(void)
|
|||||||
if (!P_PlayerMoving(displayplayers[1]))
|
if (!P_PlayerMoving(displayplayers[1]))
|
||||||
{
|
{
|
||||||
// Color change menu scrolling fix is no longer necessary
|
// Color change menu scrolling fix is no longer necessary
|
||||||
SendNameAndColor(1);
|
SendNameAndColor2();
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
@@ -5701,7 +6038,7 @@ static void Color3_OnChange(void)
|
|||||||
if (!P_PlayerMoving(displayplayers[2]))
|
if (!P_PlayerMoving(displayplayers[2]))
|
||||||
{
|
{
|
||||||
// Color change menu scrolling fix is no longer necessary
|
// Color change menu scrolling fix is no longer necessary
|
||||||
SendNameAndColor(2);
|
SendNameAndColor3();
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
@@ -5718,7 +6055,7 @@ static void Color4_OnChange(void)
|
|||||||
if (!P_PlayerMoving(displayplayers[3]))
|
if (!P_PlayerMoving(displayplayers[3]))
|
||||||
{
|
{
|
||||||
// Color change menu scrolling fix is no longer necessary
|
// Color change menu scrolling fix is no longer necessary
|
||||||
SendNameAndColor(3);
|
SendNameAndColor4();
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
|
|||||||
+10
-3
@@ -21,7 +21,10 @@ extern "C" {
|
|||||||
|
|
||||||
#include "command.h"
|
#include "command.h"
|
||||||
|
|
||||||
void SendWeaponPref(UINT8 splitplayer);
|
void SendWeaponPref(void);
|
||||||
|
void SendWeaponPref2(void);
|
||||||
|
void SendWeaponPref3(void);
|
||||||
|
void SendWeaponPref4(void);
|
||||||
|
|
||||||
// console vars
|
// console vars
|
||||||
extern consvar_t cv_playername;
|
extern consvar_t cv_playername;
|
||||||
@@ -93,6 +96,11 @@ extern consvar_t cv_pause;
|
|||||||
extern consvar_t cv_restrictskinchange, cv_allowteamchange, cv_ingamecap, cv_respawntime;
|
extern consvar_t cv_restrictskinchange, cv_allowteamchange, cv_ingamecap, cv_respawntime;
|
||||||
extern consvar_t cv_spectatorreentry, cv_antigrief;
|
extern consvar_t cv_spectatorreentry, cv_antigrief;
|
||||||
|
|
||||||
|
/*extern consvar_t cv_teleporters, cv_superring, cv_supersneakers, cv_invincibility;
|
||||||
|
extern consvar_t cv_jumpshield, cv_watershield, cv_ringshield, cv_forceshield, cv_bombshield;
|
||||||
|
extern consvar_t cv_1up, cv_eggmanbox;
|
||||||
|
extern consvar_t cv_recycler;*/
|
||||||
|
|
||||||
// SRB2kart items
|
// SRB2kart items
|
||||||
extern consvar_t cv_sneaker, cv_rocketsneaker, cv_invincibility, cv_banana;
|
extern consvar_t cv_sneaker, cv_rocketsneaker, cv_invincibility, cv_banana;
|
||||||
extern consvar_t cv_eggmanmonitor, cv_orbinaut, cv_jawz, cv_mine;
|
extern consvar_t cv_eggmanmonitor, cv_orbinaut, cv_jawz, cv_mine;
|
||||||
@@ -150,7 +158,6 @@ extern consvar_t cv_pingstyle;
|
|||||||
|
|
||||||
//extern consvar_t cv_smallpos;
|
//extern consvar_t cv_smallpos;
|
||||||
extern consvar_t cv_showminimapnames;
|
extern consvar_t cv_showminimapnames;
|
||||||
extern consvar_t cv_showminimapfinished;
|
|
||||||
extern consvar_t cv_minihead;
|
extern consvar_t cv_minihead;
|
||||||
extern consvar_t cv_showminimapangle;
|
extern consvar_t cv_showminimapangle;
|
||||||
|
|
||||||
@@ -288,7 +295,7 @@ typedef union {
|
|||||||
// add game commands, needs cleanup
|
// add game commands, needs cleanup
|
||||||
void D_RegisterServerCommands(void);
|
void D_RegisterServerCommands(void);
|
||||||
void D_RegisterClientCommands(void);
|
void D_RegisterClientCommands(void);
|
||||||
void D_SendPlayerConfig(UINT8 splitplayer);
|
void D_SendPlayerConfig(void);
|
||||||
void Command_ExitGame_f(void);
|
void Command_ExitGame_f(void);
|
||||||
void Command_Retry_f(void);
|
void Command_Retry_f(void);
|
||||||
void D_GameTypeChanged(INT32 lastgametype); // not a real _OnChange function anymore
|
void D_GameTypeChanged(INT32 lastgametype); // not a real _OnChange function anymore
|
||||||
|
|||||||
+17
-66
@@ -116,8 +116,6 @@ static I_mutex downloadmutex;
|
|||||||
#endif
|
#endif
|
||||||
char downloaddir[512] = "DOWNLOAD";
|
char downloaddir[512] = "DOWNLOAD";
|
||||||
|
|
||||||
INT32 addontypes[NUMADDONTYPES] = {0};
|
|
||||||
|
|
||||||
file_download_t filedownload = {};
|
file_download_t filedownload = {};
|
||||||
|
|
||||||
#ifdef HAVE_CURL
|
#ifdef HAVE_CURL
|
||||||
@@ -137,8 +135,6 @@ HTTP_login *curl_logins = NULL;
|
|||||||
static void CURLGetFile(void);
|
static void CURLGetFile(void);
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
static addontype_t GetAddonType(const char *name);
|
|
||||||
|
|
||||||
/** Fills a serverinfo packet with information about wad files loaded.
|
/** Fills a serverinfo packet with information about wad files loaded.
|
||||||
*
|
*
|
||||||
* \todo Give this function a better name since it is in global scope.
|
* \todo Give this function a better name since it is in global scope.
|
||||||
@@ -229,11 +225,8 @@ void D_ParseFileneeded(INT32 fileneedednum_parm, UINT8 *fileneededstr, UINT16 fi
|
|||||||
fileneeded[i].willsend = (UINT8)(filestatus >> 4);
|
fileneeded[i].willsend = (UINT8)(filestatus >> 4);
|
||||||
fileneeded[i].totalsize = READUINT32(p); // The four next bytes are the file size
|
fileneeded[i].totalsize = READUINT32(p); // The four next bytes are the file size
|
||||||
fileneeded[i].file = NULL; // The file isn't open yet
|
fileneeded[i].file = NULL; // The file isn't open yet
|
||||||
READSTRINGL(p, fileneeded[i].filename, MAX_WADPATH); // The next bytes are the file name
|
READSTRINGN(p, fileneeded[i].filename, MAX_WADPATH); // The next bytes are the file name
|
||||||
READMEM(p, fileneeded[i].md5sum, 16); // The last 16 bytes are the file checksum
|
READMEM(p, fileneeded[i].md5sum, 16); // The last 16 bytes are the file checksum
|
||||||
|
|
||||||
// Should be good place to calculate that?
|
|
||||||
fileneeded[i].type = GetAddonType(fileneeded[i].filename);
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -582,48 +575,6 @@ INT32 CL_CheckFiles(void)
|
|||||||
return 1; //everything is FS_OPEN or FS_FOUND, proceed to loading
|
return 1; //everything is FS_OPEN or FS_FOUND, proceed to loading
|
||||||
}
|
}
|
||||||
|
|
||||||
static addontype_t GetAddonType(const char *name)
|
|
||||||
{
|
|
||||||
const char *prefix = strchr(name, '_');
|
|
||||||
|
|
||||||
// Doesn't have prefix (no '_' character or it is too far and is probably not for prefix but for something like version)
|
|
||||||
// KRBCL_ is longest prefix i can think of so this should be enough
|
|
||||||
if (prefix == NULL || prefix - name > 5)
|
|
||||||
return ADDON_MISC;
|
|
||||||
|
|
||||||
// Skip 'K'
|
|
||||||
if (*name == 'K')
|
|
||||||
++name;
|
|
||||||
|
|
||||||
switch (*name)
|
|
||||||
{
|
|
||||||
case 'L':
|
|
||||||
return ADDON_SCRIPT;
|
|
||||||
break;
|
|
||||||
|
|
||||||
case 'R':
|
|
||||||
case 'B':
|
|
||||||
return ADDON_MAP;
|
|
||||||
break;
|
|
||||||
|
|
||||||
case 'C':
|
|
||||||
return ADDON_CHARACTER;
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
|
|
||||||
return ADDON_MISC;
|
|
||||||
}
|
|
||||||
|
|
||||||
void CL_CheckAddonTypes(void)
|
|
||||||
{
|
|
||||||
memset(&addontypes, 0, sizeof(addontypes));
|
|
||||||
|
|
||||||
for (INT32 i = 0; i < fileneedednum; i++)
|
|
||||||
{
|
|
||||||
addontypes[fileneeded[i].type]++;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
// Load it now
|
// Load it now
|
||||||
boolean CL_LoadServerFiles(void)
|
boolean CL_LoadServerFiles(void)
|
||||||
{
|
{
|
||||||
@@ -1009,7 +960,7 @@ void Got_Filetxpak(void)
|
|||||||
|| fastcmp(filename, "music.kart")
|
|| fastcmp(filename, "music.kart")
|
||||||
|| fastcmp(filename, "patch.kart")
|
|| fastcmp(filename, "patch.kart")
|
||||||
))
|
))
|
||||||
I_Error("Tried to download base-game file: \"%s\"", filename);
|
I_Error("Tried to download \"%s\"", filename);
|
||||||
|
|
||||||
if (filenum >= fileneedednum)
|
if (filenum >= fileneedednum)
|
||||||
{
|
{
|
||||||
@@ -1068,21 +1019,21 @@ void Got_Filetxpak(void)
|
|||||||
|
|
||||||
switch(file->status)
|
switch(file->status)
|
||||||
{
|
{
|
||||||
case FS_NOTFOUND:
|
case FS_NOTFOUND:
|
||||||
s = "FS_NOTFOUND";
|
s = "FS_NOTFOUND";
|
||||||
break;
|
break;
|
||||||
case FS_FOUND:
|
case FS_FOUND:
|
||||||
s = "FS_FOUND";
|
s = "FS_FOUND";
|
||||||
break;
|
break;
|
||||||
case FS_OPEN:
|
case FS_OPEN:
|
||||||
s = "FS_OPEN";
|
s = "FS_OPEN";
|
||||||
break;
|
break;
|
||||||
case FS_MD5SUMBAD:
|
case FS_MD5SUMBAD:
|
||||||
s = "FS_MD5SUMBAD";
|
s = "FS_MD5SUMBAD";
|
||||||
break;
|
break;
|
||||||
default:
|
default:
|
||||||
s = "unknown";
|
s = "unknown";
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
|
||||||
I_Error("Received a file not requested (file id: %d, file status: %s)\n", filenum, s);
|
I_Error("Received a file not requested (file id: %d, file status: %s)\n", filenum, s);
|
||||||
|
|||||||
@@ -40,15 +40,6 @@ typedef enum
|
|||||||
FS_FALLBACK, // HTTP failed
|
FS_FALLBACK, // HTTP failed
|
||||||
} filestatus_t;
|
} filestatus_t;
|
||||||
|
|
||||||
typedef enum addontype_e
|
|
||||||
{
|
|
||||||
ADDON_SCRIPT,
|
|
||||||
ADDON_MAP,
|
|
||||||
ADDON_CHARACTER,
|
|
||||||
ADDON_MISC,
|
|
||||||
NUMADDONTYPES,
|
|
||||||
} addontype_t;
|
|
||||||
|
|
||||||
typedef struct
|
typedef struct
|
||||||
{
|
{
|
||||||
UINT8 willsend; // Is the server willing to send it?
|
UINT8 willsend; // Is the server willing to send it?
|
||||||
@@ -60,13 +51,11 @@ typedef struct
|
|||||||
UINT32 totalsize;
|
UINT32 totalsize;
|
||||||
filestatus_t status; // The value returned by recsearch
|
filestatus_t status; // The value returned by recsearch
|
||||||
boolean justdownloaded; // To prevent late fragments from causing an I_Error
|
boolean justdownloaded; // To prevent late fragments from causing an I_Error
|
||||||
addontype_t type;
|
|
||||||
} fileneeded_t;
|
} fileneeded_t;
|
||||||
|
|
||||||
extern INT32 fileneedednum;
|
extern INT32 fileneedednum;
|
||||||
extern fileneeded_t fileneeded[MAX_WADFILES];
|
extern fileneeded_t fileneeded[MAX_WADFILES];
|
||||||
extern char downloaddir[512];
|
extern char downloaddir[512];
|
||||||
extern INT32 addontypes[NUMADDONTYPES];
|
|
||||||
|
|
||||||
typedef struct
|
typedef struct
|
||||||
{
|
{
|
||||||
@@ -102,7 +91,6 @@ void D_ParseFileneeded(INT32 fileneedednum_parm, UINT8 *fileneededstr, UINT16 fi
|
|||||||
void CL_PrepareDownloadSaveGame(const char *tmpsave);
|
void CL_PrepareDownloadSaveGame(const char *tmpsave);
|
||||||
|
|
||||||
INT32 CL_CheckFiles(void);
|
INT32 CL_CheckFiles(void);
|
||||||
void CL_CheckAddonTypes(void);
|
|
||||||
boolean CL_LoadServerFiles(void);
|
boolean CL_LoadServerFiles(void);
|
||||||
void SV_SendRam(INT32 node, void *data, size_t size, freemethod_t freemethod,
|
void SV_SendRam(INT32 node, void *data, size_t size, freemethod_t freemethod,
|
||||||
UINT8 fileid);
|
UINT8 fileid);
|
||||||
|
|||||||
@@ -735,18 +735,6 @@ const char *I_GetJoyName(INT32 joyindex)
|
|||||||
return NULL;
|
return NULL;
|
||||||
}
|
}
|
||||||
|
|
||||||
boolean I_GamepadHasLED(INT32 playernum)
|
|
||||||
{
|
|
||||||
(void)playernum;
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
|
|
||||||
boolean I_GamepadHasRumble(INT32 playernum)
|
|
||||||
{
|
|
||||||
(void)playernum;
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
|
|
||||||
void I_GamepadRumble(INT32 playernum, UINT16 low_strength, UINT16 high_strength, UINT32 duration)
|
void I_GamepadRumble(INT32 playernum, UINT16 low_strength, UINT16 high_strength, UINT32 duration)
|
||||||
{
|
{
|
||||||
(void)playernum;
|
(void)playernum;
|
||||||
@@ -996,7 +984,7 @@ void I_SleepDuration(precise_t duration)
|
|||||||
#endif
|
#endif
|
||||||
}
|
}
|
||||||
|
|
||||||
static volatile sig_atomic_t g_in_exiting_signal_handler = false;
|
boolean g_in_exiting_signal_handler = false;
|
||||||
|
|
||||||
static void I_PrintSignal(INT32 signal_num, boolean core_dumped, char *signal_msg)
|
static void I_PrintSignal(INT32 signal_num, boolean core_dumped, char *signal_msg)
|
||||||
{
|
{
|
||||||
@@ -1060,11 +1048,6 @@ static void I_ReportSignal(int num, int coredumped)
|
|||||||
I_OutputMsg("\nProcess killed by signal: %s\n\n", sigmsg);
|
I_OutputMsg("\nProcess killed by signal: %s\n\n", sigmsg);
|
||||||
}
|
}
|
||||||
|
|
||||||
boolean I_In_Exiting_Signal_Handler(void)
|
|
||||||
{
|
|
||||||
return g_in_exiting_signal_handler;
|
|
||||||
}
|
|
||||||
|
|
||||||
#ifndef NEWSIGNALHANDLER
|
#ifndef NEWSIGNALHANDLER
|
||||||
FUNCNORETURN static ATTRNORETURN void signal_handler(INT32 num)
|
FUNCNORETURN static ATTRNORETURN void signal_handler(INT32 num)
|
||||||
{
|
{
|
||||||
@@ -1084,17 +1067,11 @@ FUNCNORETURN static ATTRNORETURN void signal_handler(INT32 num)
|
|||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
static volatile sig_atomic_t interrupted = 0;
|
FUNCNORETURN static ATTRNORETURN void quit_handler(int num)
|
||||||
|
|
||||||
boolean I_Interrupted(void)
|
|
||||||
{
|
{
|
||||||
return interrupted;
|
signal(num, SIG_DFL); //default signal action
|
||||||
}
|
raise(num);
|
||||||
|
I_Quit();
|
||||||
static void quit_handler(int num)
|
|
||||||
{
|
|
||||||
(void)num;
|
|
||||||
interrupted = 1;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
#ifdef HAVE_LIBBACKTRACE
|
#ifdef HAVE_LIBBACKTRACE
|
||||||
@@ -1424,7 +1401,6 @@ void I_Quit(void)
|
|||||||
/* prevent recursive I_Quit() */
|
/* prevent recursive I_Quit() */
|
||||||
if (quiting)
|
if (quiting)
|
||||||
goto death;
|
goto death;
|
||||||
|
|
||||||
quiting = false;
|
quiting = false;
|
||||||
I_ShutdownConsole();
|
I_ShutdownConsole();
|
||||||
M_SaveConfig(NULL); //save game config, cvars..
|
M_SaveConfig(NULL); //save game config, cvars..
|
||||||
@@ -1442,17 +1418,14 @@ void I_Quit(void)
|
|||||||
// use this for 1.28 19990220 by Kin
|
// use this for 1.28 19990220 by Kin
|
||||||
I_ShutdownGraphics();
|
I_ShutdownGraphics();
|
||||||
I_ShutdownSystem();
|
I_ShutdownSystem();
|
||||||
|
|
||||||
/* if option -noendtxt is set, don't print the text */
|
/* if option -noendtxt is set, don't print the text */
|
||||||
if (!M_CheckParm("-noendtxt") && W_CheckNumForName("ENDOOM") != LUMPERROR)
|
if (!M_CheckParm("-noendtxt") && W_CheckNumForName("ENDOOM") != LUMPERROR)
|
||||||
{
|
{
|
||||||
printf("\r");
|
printf("\r");
|
||||||
ShowEndTxt();
|
ShowEndTxt();
|
||||||
}
|
}
|
||||||
|
|
||||||
if (myargmalloc)
|
if (myargmalloc)
|
||||||
free(myargv); // Deallocate allocated memory
|
free(myargv); // Deallocate allocated memory
|
||||||
|
|
||||||
death:
|
death:
|
||||||
W_Shutdown();
|
W_Shutdown();
|
||||||
exit(0);
|
exit(0);
|
||||||
|
|||||||
+287
-209
File diff suppressed because it is too large.
Load diff
@@ -13,10 +13,6 @@
|
|||||||
#ifndef __DEHACKED_H__
|
#ifndef __DEHACKED_H__
|
||||||
#define __DEHACKED_H__
|
#define __DEHACKED_H__
|
||||||
|
|
||||||
#ifdef __cplusplus
|
|
||||||
extern "C" {
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#include "m_fixed.h" // for get_number
|
#include "m_fixed.h" // for get_number
|
||||||
#include "info.h"
|
#include "info.h"
|
||||||
|
|
||||||
@@ -75,9 +71,4 @@ typedef struct
|
|||||||
} MYFILE;
|
} MYFILE;
|
||||||
#define myfeof(a) (a->data + a->size <= a->curpos)
|
#define myfeof(a) (a->data + a->size <= a->curpos)
|
||||||
char *myfgets(char *buf, size_t bufsize, MYFILE *f);
|
char *myfgets(char *buf, size_t bufsize, MYFILE *f);
|
||||||
|
|
||||||
#ifdef __cplusplus
|
|
||||||
} // extern "C"
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#endif
|
#endif
|
||||||
+1
-1
@@ -61,7 +61,7 @@ enum
|
|||||||
typedef struct
|
typedef struct
|
||||||
{
|
{
|
||||||
INT16 x, y;
|
INT16 x, y;
|
||||||
} ATTRPACK mapvertex_t;
|
}ATTRPACK mapvertex_t;
|
||||||
|
|
||||||
// A SideDef, defining the visual appearance of a wall,
|
// A SideDef, defining the visual appearance of a wall,
|
||||||
// by setting textures and offsets.
|
// by setting textures and offsets.
|
||||||
|
|||||||
+18
-9
@@ -130,8 +130,8 @@ extern char logfilename[1024];
|
|||||||
#else
|
#else
|
||||||
#define VERSION 1 // Game version
|
#define VERSION 1 // Game version
|
||||||
#define SUBVERSION 6 // more precise version number
|
#define SUBVERSION 6 // more precise version number
|
||||||
#define VERSIONSTRING "Saturn v9.3"
|
#define VERSIONSTRING "Saturn v9.2"
|
||||||
#define VERSIONSTRINGW L"Saturn v9.3"
|
#define VERSIONSTRINGW L"Saturn v9.2"
|
||||||
|
|
||||||
#define SATURN_TESTING // comment out for saturn release builds!
|
#define SATURN_TESTING // comment out for saturn release builds!
|
||||||
|
|
||||||
@@ -516,6 +516,22 @@ extern boolean capslock;
|
|||||||
// i_system.c, replace getchar() once the keyboard has been appropriated
|
// i_system.c, replace getchar() once the keyboard has been appropriated
|
||||||
INT32 I_GetKey(void);
|
INT32 I_GetKey(void);
|
||||||
|
|
||||||
|
/* http://www.cse.yorku.ca/~oz/hash.html */
|
||||||
|
static inline
|
||||||
|
UINT32 quickncasehash (const char *p, size_t n)
|
||||||
|
{
|
||||||
|
size_t i = 0;
|
||||||
|
UINT32 x = 5381;
|
||||||
|
|
||||||
|
while (i < n && p[i])
|
||||||
|
{
|
||||||
|
x = (x * 33) ^ tolower(p[i]);
|
||||||
|
i++;
|
||||||
|
}
|
||||||
|
|
||||||
|
return x;
|
||||||
|
}
|
||||||
|
|
||||||
#ifndef __cplusplus
|
#ifndef __cplusplus
|
||||||
#ifndef min // Double-Check with WATTCP-32's cdefs.h
|
#ifndef min // Double-Check with WATTCP-32's cdefs.h
|
||||||
#define min(x, y) (((x) < (y)) ? (x) : (y))
|
#define min(x, y) (((x) < (y)) ? (x) : (y))
|
||||||
@@ -573,13 +589,6 @@ INT32 I_GetKey(void);
|
|||||||
// NOTE: you WILL have nasal troubles if the variable is not initialized
|
// NOTE: you WILL have nasal troubles if the variable is not initialized
|
||||||
#define CLEANUP(f) __attribute__((__cleanup__(f)))
|
#define CLEANUP(f) __attribute__((__cleanup__(f)))
|
||||||
|
|
||||||
// the GNU constructor and destructor attributes
|
|
||||||
// The constructor attribute causes the function to be called automatically before execution enters main ().
|
|
||||||
// Similarly, the destructor attribute causes the function to be called automatically after main () has completed or exit () has been called.
|
|
||||||
// Functions with these attributes are useful for initializing data that will be used implicitly during the execution of the program.
|
|
||||||
#define CONSTRUCTOR __attribute__((constructor, used))
|
|
||||||
#define DESTRUCTOR __attribute__((destructor, used))
|
|
||||||
|
|
||||||
// An assert-type mechanism.
|
// An assert-type mechanism.
|
||||||
#ifdef PARANOIA
|
#ifdef PARANOIA
|
||||||
#define I_Assert(e) ((e) ? (void)0 : I_Error("assert failed: %s, file %s, line %d", #e, __FILE__, __LINE__))
|
#define I_Assert(e) ((e) ? (void)0 : I_Error("assert failed: %s, file %s, line %d", #e, __FILE__, __LINE__))
|
||||||
|
|||||||
+46
-3
@@ -54,6 +54,7 @@ extern INT16 maptol;
|
|||||||
extern UINT8 globalweather;
|
extern UINT8 globalweather;
|
||||||
extern INT32 curWeather;
|
extern INT32 curWeather;
|
||||||
extern INT32 cursaveslot;
|
extern INT32 cursaveslot;
|
||||||
|
extern INT16 lastmapsaved;
|
||||||
extern boolean gamecomplete;
|
extern boolean gamecomplete;
|
||||||
|
|
||||||
#define PRECIP_NONE 0
|
#define PRECIP_NONE 0
|
||||||
@@ -77,6 +78,7 @@ extern boolean imcontinuing; // Temporary flag while continuing
|
|||||||
extern UINT8 modeattacking;
|
extern UINT8 modeattacking;
|
||||||
|
|
||||||
// menu demo things
|
// menu demo things
|
||||||
|
extern UINT8 numDemos;
|
||||||
extern UINT32 demoDelayTime;
|
extern UINT32 demoDelayTime;
|
||||||
extern UINT32 demoIdleTime;
|
extern UINT32 demoIdleTime;
|
||||||
|
|
||||||
@@ -112,6 +114,7 @@ extern UINT8 paused; // Game paused?
|
|||||||
extern UINT8 window_notinfocus; // are we in focus? (backend independant -- handles auto pausing and display of "focus lost" message)
|
extern UINT8 window_notinfocus; // are we in focus? (backend independant -- handles auto pausing and display of "focus lost" message)
|
||||||
|
|
||||||
extern boolean nodrawers;
|
extern boolean nodrawers;
|
||||||
|
extern boolean noblit;
|
||||||
extern boolean lastdraw;
|
extern boolean lastdraw;
|
||||||
|
|
||||||
#ifdef MOTIONBLUR
|
#ifdef MOTIONBLUR
|
||||||
@@ -202,6 +205,12 @@ extern struct quake
|
|||||||
fixed_t radius, intensity;
|
fixed_t radius, intensity;
|
||||||
} quake;
|
} quake;
|
||||||
|
|
||||||
|
// NiGHTS grades
|
||||||
|
typedef struct
|
||||||
|
{
|
||||||
|
UINT32 grade[6]; // D, C, B, A, S, X (F: failed to reach any of these)
|
||||||
|
} nightsgrades_t;
|
||||||
|
|
||||||
// Custom Lua values
|
// Custom Lua values
|
||||||
// (This is not ifdeffed so the map header structure can stay identical, just in case.)
|
// (This is not ifdeffed so the map header structure can stay identical, just in case.)
|
||||||
typedef struct
|
typedef struct
|
||||||
@@ -252,16 +261,28 @@ typedef struct
|
|||||||
UINT8 numlaps; ///< Number of laps in circuit mode, unless overridden.
|
UINT8 numlaps; ///< Number of laps in circuit mode, unless overridden.
|
||||||
SINT8 unlockrequired; ///< Is an unlockable required to play this level? -1 if no.
|
SINT8 unlockrequired; ///< Is an unlockable required to play this level? -1 if no.
|
||||||
UINT8 levelselect; ///< Is this map available in the level select? If so, which map list is it available in?
|
UINT8 levelselect; ///< Is this map available in the level select? If so, which map list is it available in?
|
||||||
|
SINT8 bonustype; ///< What type of bonus does this level have? (-1 for null.)
|
||||||
|
SINT8 saveoverride; ///< Set how the game is allowed to save (1 for always, -1 for never, 0 is 2.1 default)
|
||||||
|
|
||||||
UINT8 levelflags; ///< LF_flags: merged eight booleans into one UINT8 for space, see below
|
UINT8 levelflags; ///< LF_flags: merged eight booleans into one UINT8 for space, see below
|
||||||
UINT8 menuflags; ///< LF2_flags: options that affect record attack / nights mode menus
|
UINT8 menuflags; ///< LF2_flags: options that affect record attack / nights mode menus
|
||||||
|
|
||||||
|
// NiGHTS stuff.
|
||||||
|
UINT8 numGradedMares; ///< Internal. For grade support.
|
||||||
|
nightsgrades_t *grades; ///< NiGHTS grades. Allocated dynamically for space reasons. Be careful.
|
||||||
|
|
||||||
// SRB2kart
|
// SRB2kart
|
||||||
|
//boolean automap; ///< Displays a level's white map outline in modified games
|
||||||
fixed_t mobj_scale; ///< Replacement for TOL_ERZ3
|
fixed_t mobj_scale; ///< Replacement for TOL_ERZ3
|
||||||
|
|
||||||
mapheader_lighting_t lighting; ///< Wall and sprite lighting
|
mapheader_lighting_t lighting; ///< Wall and sprite lighting
|
||||||
mapheader_lighting_t lighting_encore; ///< Alternative lighting for Encore mode
|
mapheader_lighting_t lighting_encore; ///< Alternative lighting for Encore mode
|
||||||
boolean use_encore_lighting; ///< Whether to use separate Encore lighting
|
boolean use_encore_lighting; ///< Whether to use separate Encore lighting
|
||||||
|
|
||||||
|
// Music stuff.
|
||||||
|
UINT32 musinterfadeout; ///< Fade out level music on intermission screen in milliseconds
|
||||||
|
char musintername[7]; ///< Intermission screen music.
|
||||||
|
|
||||||
// Lua stuff.
|
// Lua stuff.
|
||||||
// (This is not ifdeffed so the map header structure can stay identical, just in case.)
|
// (This is not ifdeffed so the map header structure can stay identical, just in case.)
|
||||||
UINT8 numCustomOptions; ///< Internal. For Lua custom value support.
|
UINT8 numCustomOptions; ///< Internal. For Lua custom value support.
|
||||||
@@ -358,6 +379,8 @@ typedef struct
|
|||||||
{
|
{
|
||||||
tic_t time; ///< Time in which the level was finished.
|
tic_t time; ///< Time in which the level was finished.
|
||||||
tic_t lap; ///< Best lap time for this level.
|
tic_t lap; ///< Best lap time for this level.
|
||||||
|
//UINT32 score; ///< Score when the level was finished.
|
||||||
|
//UINT16 rings; ///< Rings when the level was finished.
|
||||||
} recorddata_t;
|
} recorddata_t;
|
||||||
|
|
||||||
/** Setup for one NiGHTS map.
|
/** Setup for one NiGHTS map.
|
||||||
@@ -371,19 +394,34 @@ typedef struct
|
|||||||
#define GRADE_A 5
|
#define GRADE_A 5
|
||||||
#define GRADE_S 6
|
#define GRADE_S 6
|
||||||
|
|
||||||
|
/*typedef struct
|
||||||
|
{
|
||||||
|
// 8 mares, 1 overall (0)
|
||||||
|
UINT8 nummares;
|
||||||
|
UINT32 score[9];
|
||||||
|
UINT8 grade[9];
|
||||||
|
tic_t time[9];
|
||||||
|
} nightsdata_t;*/
|
||||||
|
|
||||||
|
//extern nightsdata_t *nightsrecords[NUMMAPS];
|
||||||
extern recorddata_t *mainrecords[NUMMAPS];
|
extern recorddata_t *mainrecords[NUMMAPS];
|
||||||
|
|
||||||
// mapvisited is now a set of flags that says what we've done in the map.
|
// mapvisited is now a set of flags that says what we've done in the map.
|
||||||
#define MV_VISITED 1
|
#define MV_VISITED 1
|
||||||
#define MV_BEATEN 2
|
#define MV_BEATEN 2
|
||||||
#define MV_ALLEMERALDS 4
|
#define MV_ALLEMERALDS 4
|
||||||
|
//#define MV_ULTIMATE 8
|
||||||
|
//#define MV_PERFECT 16
|
||||||
#define MV_MAX 7 // used in gamedata check
|
#define MV_MAX 7 // used in gamedata check
|
||||||
extern UINT8 mapvisited[NUMMAPS];
|
extern UINT8 mapvisited[NUMMAPS];
|
||||||
|
|
||||||
extern UINT32 token; ///< Number of tokens collected in a level
|
// Temporary holding place for nights data for the current map
|
||||||
|
//nightsdata_t ntemprecords;
|
||||||
|
|
||||||
|
extern UINT32 token; ///< Number of tokens collected in a level
|
||||||
extern UINT32 tokenlist; ///< List of tokens collected
|
extern UINT32 tokenlist; ///< List of tokens collected
|
||||||
extern INT32 tokenbits; ///< Used for setting token bits
|
extern INT32 tokenbits; ///< Used for setting token bits
|
||||||
extern INT32 sstimer; ///< Time allotted in the special stage
|
extern INT32 sstimer; ///< Time allotted in the special stage
|
||||||
extern UINT32 bluescore; ///< Blue Team Scores
|
extern UINT32 bluescore; ///< Blue Team Scores
|
||||||
extern UINT32 redscore; ///< Red Team Scores
|
extern UINT32 redscore; ///< Red Team Scores
|
||||||
|
|
||||||
@@ -399,6 +437,9 @@ extern boolean CheckForReverseGravity;
|
|||||||
extern UINT16 invulntics;
|
extern UINT16 invulntics;
|
||||||
extern UINT16 sneakertics;
|
extern UINT16 sneakertics;
|
||||||
extern UINT16 flashingtics;
|
extern UINT16 flashingtics;
|
||||||
|
extern UINT16 tailsflytics;
|
||||||
|
extern UINT16 underwatertics;
|
||||||
|
extern UINT16 spacetimetics;
|
||||||
extern UINT16 extralifetics;
|
extern UINT16 extralifetics;
|
||||||
|
|
||||||
// SRB2kart
|
// SRB2kart
|
||||||
@@ -420,6 +461,7 @@ extern UINT8 introtoplay;
|
|||||||
extern UINT8 creditscutscene;
|
extern UINT8 creditscutscene;
|
||||||
|
|
||||||
extern UINT8 use1upSound;
|
extern UINT8 use1upSound;
|
||||||
|
extern UINT8 maxXtraLife; // Max extra lives from rings
|
||||||
|
|
||||||
extern mobj_t *hunt1, *hunt2, *hunt3; // Emerald hunt locations
|
extern mobj_t *hunt1, *hunt2, *hunt3; // Emerald hunt locations
|
||||||
|
|
||||||
@@ -484,6 +526,7 @@ extern UINT32 timesBeatenWithEmeralds;
|
|||||||
// WAD, partly set at startup time.
|
// WAD, partly set at startup time.
|
||||||
|
|
||||||
extern tic_t gametic;
|
extern tic_t gametic;
|
||||||
|
#define localgametic leveltime
|
||||||
|
|
||||||
// Player spawn spots.
|
// Player spawn spots.
|
||||||
extern mapthing_t *playerstarts[MAXPLAYERS]; // Cooperative
|
extern mapthing_t *playerstarts[MAXPLAYERS]; // Cooperative
|
||||||
|
|||||||
+5
-16
@@ -68,21 +68,8 @@ extern "C" {
|
|||||||
#define strnicmp(x,y,n) strncasecmp(x,y,n)
|
#define strnicmp(x,y,n) strncasecmp(x,y,n)
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
// glibc 2.43 made alot of standard lib functions propagate the constness of its input pointers
|
|
||||||
// to not cause warnings or compile issues on older glibc versions we do this silly thing
|
|
||||||
// to not have a gazillion glibc version checks
|
|
||||||
#if defined(__GLIBC_PREREQ)
|
|
||||||
#if __GLIBC_PREREQ(2, 43)
|
|
||||||
#define gconst const
|
|
||||||
#else
|
|
||||||
#define gconst
|
|
||||||
#endif
|
|
||||||
#else
|
|
||||||
#define gconst
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#ifndef _GNU_SOURCE
|
|
||||||
char *nongnu_strcasestr(const char *in, const char *what);
|
char *nongnu_strcasestr(const char *in, const char *what);
|
||||||
|
#ifndef _GNU_SOURCE
|
||||||
#define strcasestr nongnu_strcasestr
|
#define strcasestr nongnu_strcasestr
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
@@ -140,9 +127,9 @@ size_t strlcpy(char *dst, const char *src, size_t dsize);
|
|||||||
#define STRBUFCPY(dst,src) strlcpy(dst, src, sizeof dst)
|
#define STRBUFCPY(dst,src) strlcpy(dst, src, sizeof dst)
|
||||||
|
|
||||||
/* Boolean type definition */
|
/* Boolean type definition */
|
||||||
#include <stdbool.h>
|
|
||||||
|
|
||||||
#ifndef _WIN32
|
#ifndef _WIN32
|
||||||
|
#include <stdbool.h>
|
||||||
// dont use stdbools _BOOL type
|
// dont use stdbools _BOOL type
|
||||||
// its smaller (1 byte) than the old interger bool (4 bytes)
|
// its smaller (1 byte) than the old interger bool (4 bytes)
|
||||||
// which results in packed struct sizes being mismatched between vanilla and this
|
// which results in packed struct sizes being mismatched between vanilla and this
|
||||||
@@ -150,7 +137,9 @@ size_t strlcpy(char *dst, const char *src, size_t dsize);
|
|||||||
// which we cant use as enumeration constants
|
// which we cant use as enumeration constants
|
||||||
typedef int32_t boolean;
|
typedef int32_t boolean;
|
||||||
#else
|
#else
|
||||||
#define boolean int32_t
|
#define false FALSE
|
||||||
|
#define true TRUE
|
||||||
|
#define boolean BOOL
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
/* 7.18.2.1 Limits of exact-width integer types */
|
/* 7.18.2.1 Limits of exact-width integer types */
|
||||||
|
|||||||
@@ -1110,6 +1110,14 @@ void F_TitleScreenTicker(boolean run)
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// Replay intro when done cycling through demos
|
||||||
|
/*if (curDemo == numDemos) -- uuuh... we have a LOT of maps AND a big devteam... probably not gonna see a repeat unless you're super unlucky :V
|
||||||
|
{
|
||||||
|
curDemo = 0;
|
||||||
|
F_StartIntro();
|
||||||
|
return;
|
||||||
|
}*/
|
||||||
|
|
||||||
mapname = G_BuildMapName(G_RandMap(TOL_RACE, -2, false, 0, false, NULL)+1);
|
mapname = G_BuildMapName(G_RandMap(TOL_RACE, -2, false, 0, false, NULL)+1);
|
||||||
|
|
||||||
numstaff = 1;
|
numstaff = 1;
|
||||||
|
|||||||
@@ -361,11 +361,6 @@ void F_RunWipe(UINT8 wipetype, boolean drawMenu)
|
|||||||
// on for fade-to-black
|
// on for fade-to-black
|
||||||
for (;;)
|
for (;;)
|
||||||
{
|
{
|
||||||
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++);
|
||||||
|
|
||||||
|
|||||||
+1
-3
@@ -111,12 +111,10 @@ filestatus_t filesearch(char *filename, const char *startpath, const UINT8 *want
|
|||||||
char *searchname;
|
char *searchname;
|
||||||
int depthleft = maxsearchdepth;
|
int depthleft = maxsearchdepth;
|
||||||
char searchpath[MAXFILEPATH];
|
char searchpath[MAXFILEPATH];
|
||||||
size_t *searchpathindex = NULL;
|
size_t *searchpathindex;
|
||||||
|
|
||||||
dirhandle = (DIR**)malloc(maxsearchdepth * sizeof(DIR*));
|
dirhandle = (DIR**)malloc(maxsearchdepth * sizeof(DIR*));
|
||||||
searchpathindex = (size_t *)malloc(maxsearchdepth * sizeof(size_t));
|
searchpathindex = (size_t *)malloc(maxsearchdepth * sizeof(size_t));
|
||||||
if (!searchpathindex)
|
|
||||||
I_Error("out of memory while searching for file %s\n", filename);
|
|
||||||
|
|
||||||
strcpy(searchpath, startpath);
|
strcpy(searchpath, startpath);
|
||||||
searchpathindex[--depthleft] = strlen(searchpath) + 1;
|
searchpathindex[--depthleft] = strlen(searchpath) + 1;
|
||||||
|
|||||||
+42
-36
@@ -66,10 +66,12 @@
|
|||||||
#include <locale.h>
|
#include <locale.h>
|
||||||
|
|
||||||
// menu demo things
|
// menu demo things
|
||||||
|
UINT8 numDemos = 0; //3; -- i'm FED UP of losing my skincolour to a broken demo. change this back when we make new ones
|
||||||
UINT32 demoDelayTime = 15*TICRATE;
|
UINT32 demoDelayTime = 15*TICRATE;
|
||||||
UINT32 demoIdleTime = 3*TICRATE;
|
UINT32 demoIdleTime = 3*TICRATE;
|
||||||
|
|
||||||
boolean nodrawers = false; // for comparative timing purposes
|
boolean nodrawers = false; // for comparative timing purposes
|
||||||
|
boolean noblit = false; // for comparative timing purposes
|
||||||
static tic_t demostarttime; // for comparative timing purposes
|
static tic_t demostarttime; // for comparative timing purposes
|
||||||
|
|
||||||
//@TODO put these all in a struct for namespacing purposes?
|
//@TODO put these all in a struct for namespacing purposes?
|
||||||
@@ -1651,12 +1653,10 @@ void G_RecordDemo(const char *name)
|
|||||||
maxsize = cv_maxdemosize.value*1024*1024;
|
maxsize = cv_maxdemosize.value*1024*1024;
|
||||||
|
|
||||||
demobuf.buffer = Z_Malloc(maxsize + 100*1024, PU_STATIC, NULL);
|
demobuf.buffer = Z_Malloc(maxsize + 100*1024, PU_STATIC, NULL);
|
||||||
|
demoend = demobuf.buffer + maxsize;
|
||||||
|
|
||||||
if (demobuf.buffer)
|
if (demobuf.buffer)
|
||||||
{
|
|
||||||
demoend = demobuf.buffer + maxsize;
|
|
||||||
demo.recording = true;
|
demo.recording = true;
|
||||||
}
|
|
||||||
else
|
else
|
||||||
CONS_Alert(CONS_ERROR, "Failed to allocate demo buffer\n");
|
CONS_Alert(CONS_ERROR, "Failed to allocate demo buffer\n");
|
||||||
}
|
}
|
||||||
@@ -1994,6 +1994,7 @@ static UINT8 G_CheckDemoExtraFiles(UINT8 **pp, boolean quick)
|
|||||||
UINT8 totalfiles, filesloaded, nmusfilecount;
|
UINT8 totalfiles, filesloaded, nmusfilecount;
|
||||||
char filename[MAX_WADPATH];
|
char filename[MAX_WADPATH];
|
||||||
UINT8 md5sum[16];
|
UINT8 md5sum[16];
|
||||||
|
boolean toomany = false;
|
||||||
boolean alreadyloaded;
|
boolean alreadyloaded;
|
||||||
UINT8 i, j;
|
UINT8 i, j;
|
||||||
UINT8 error = 0;
|
UINT8 error = 0;
|
||||||
@@ -2003,44 +2004,53 @@ static UINT8 G_CheckDemoExtraFiles(UINT8 **pp, boolean quick)
|
|||||||
|
|
||||||
for (i = 0; i < totalfiles; ++i)
|
for (i = 0; i < totalfiles; ++i)
|
||||||
{
|
{
|
||||||
strlcpy(filename, (char *)(*pp), sizeof filename);
|
if (toomany)
|
||||||
SKIPSTRING((*pp));
|
SKIPSTRING((*pp));
|
||||||
|
else
|
||||||
|
{
|
||||||
|
strlcpy(filename, (char *)(*pp), sizeof filename);
|
||||||
|
SKIPSTRING((*pp));
|
||||||
|
}
|
||||||
|
|
||||||
READMEM((*pp), md5sum, 16); // hue hue peepee
|
READMEM((*pp), md5sum, 16); // hue hue peepee
|
||||||
|
|
||||||
alreadyloaded = false;
|
if (!toomany)
|
||||||
nmusfilecount = 0;
|
|
||||||
|
|
||||||
for (j = 0; j < numwadfiles; ++j)
|
|
||||||
{
|
{
|
||||||
if (wadfiles[j]->important && j > mainwads)
|
alreadyloaded = false;
|
||||||
nmusfilecount++;
|
nmusfilecount = 0;
|
||||||
else
|
|
||||||
continue;
|
|
||||||
|
|
||||||
if (memcmp(md5sum, wadfiles[j]->md5sum, 16) == 0)
|
for (j = 0; j < numwadfiles; ++j)
|
||||||
{
|
{
|
||||||
alreadyloaded = true;
|
if (wadfiles[j]->important && j > mainwads)
|
||||||
|
nmusfilecount++;
|
||||||
|
else
|
||||||
|
continue;
|
||||||
|
|
||||||
if (i != nmusfilecount-1 && error < DFILE_ERROR_OUTOFORDER)
|
if (memcmp(md5sum, wadfiles[j]->md5sum, 16) == 0)
|
||||||
error |= DFILE_ERROR_OUTOFORDER;
|
{
|
||||||
|
alreadyloaded = true;
|
||||||
|
|
||||||
break;
|
if (i != nmusfilecount-1 && error < DFILE_ERROR_OUTOFORDER)
|
||||||
|
error |= DFILE_ERROR_OUTOFORDER;
|
||||||
|
|
||||||
|
break;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
|
||||||
|
|
||||||
if (alreadyloaded)
|
if (alreadyloaded)
|
||||||
{
|
{
|
||||||
filesloaded++;
|
filesloaded++;
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (numwadfiles >= MAX_WADFILES)
|
if (numwadfiles >= MAX_WADFILES)
|
||||||
|
error = DFILE_ERROR_CANNOTLOAD;
|
||||||
|
else if (!quick && findfile(filename, md5sum, false) != FS_FOUND)
|
||||||
|
error = DFILE_ERROR_CANNOTLOAD;
|
||||||
|
else if (error < DFILE_ERROR_INCOMPLETEOUTOFORDER)
|
||||||
|
error |= DFILE_ERROR_NOTLOADED;
|
||||||
|
} else
|
||||||
error = DFILE_ERROR_CANNOTLOAD;
|
error = DFILE_ERROR_CANNOTLOAD;
|
||||||
else if (!quick && findfile(filename, md5sum, false) != FS_FOUND)
|
|
||||||
error = DFILE_ERROR_CANNOTLOAD;
|
|
||||||
else if (error < DFILE_ERROR_INCOMPLETEOUTOFORDER)
|
|
||||||
error |= DFILE_ERROR_NOTLOADED;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
// Get final file count
|
// Get final file count
|
||||||
@@ -2606,7 +2616,7 @@ void G_DoPlayDemo(char *defdemoname)
|
|||||||
if (defdemoname == NULL)
|
if (defdemoname == NULL)
|
||||||
{
|
{
|
||||||
demobuf.p = demobuf.buffer;
|
demobuf.p = demobuf.buffer;
|
||||||
pdemoname = ZZ_Calloc(1); // Easier than adding checks for this everywhere it's freed
|
pdemoname = ZZ_Alloc(1); // Easier than adding checks for this everywhere it's freed
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
@@ -2618,7 +2628,7 @@ void G_DoPlayDemo(char *defdemoname)
|
|||||||
n++;
|
n++;
|
||||||
|
|
||||||
pdemoname = ZZ_Alloc(strlen(n)+1);
|
pdemoname = ZZ_Alloc(strlen(n)+1);
|
||||||
strcpy(pdemoname, n);
|
strcpy(pdemoname,n);
|
||||||
|
|
||||||
M_SetPlaybackMenuPointer();
|
M_SetPlaybackMenuPointer();
|
||||||
|
|
||||||
@@ -3080,9 +3090,6 @@ post_compat:
|
|||||||
if (cv_director.value)
|
if (cv_director.value)
|
||||||
CV_SetValue(&cv_director, 0);
|
CV_SetValue(&cv_director, 0);
|
||||||
|
|
||||||
if (demo.timing)
|
|
||||||
G_DoneLevelLoad();
|
|
||||||
|
|
||||||
demo.deferstart = true;
|
demo.deferstart = true;
|
||||||
}
|
}
|
||||||
#undef SKIPERRORS
|
#undef SKIPERRORS
|
||||||
@@ -3510,11 +3517,10 @@ static INT32 restorecv_vidwait;
|
|||||||
void G_TimeDemo(const char *name)
|
void G_TimeDemo(const char *name)
|
||||||
{
|
{
|
||||||
nodrawers = M_CheckParm("-nodraw");
|
nodrawers = M_CheckParm("-nodraw");
|
||||||
|
noblit = M_CheckParm("-noblit");
|
||||||
restorecv_vidwait = cv_vidwait.value;
|
restorecv_vidwait = cv_vidwait.value;
|
||||||
if (cv_vidwait.value)
|
if (cv_vidwait.value)
|
||||||
CV_Set(&cv_vidwait, "0");
|
CV_Set(&cv_vidwait, "0");
|
||||||
|
|
||||||
demo.timing = true;
|
demo.timing = true;
|
||||||
singletics = true;
|
singletics = true;
|
||||||
framecount = 0;
|
framecount = 0;
|
||||||
|
|||||||
+30
-5
@@ -61,6 +61,7 @@
|
|||||||
|
|
||||||
gameaction_t gameaction = 0;
|
gameaction_t gameaction = 0;
|
||||||
gamestate_t gamestate = GS_NULL;
|
gamestate_t gamestate = GS_NULL;
|
||||||
|
UINT8 ultimatemode = false;
|
||||||
|
|
||||||
boolean botingame = false;
|
boolean botingame = false;
|
||||||
UINT8 botskin = 0;
|
UINT8 botskin = 0;
|
||||||
@@ -68,6 +69,9 @@ UINT8 botcolor = 0;
|
|||||||
|
|
||||||
JoyType_t Joystick[MAXSPLITSCREENPLAYERS] = {};
|
JoyType_t Joystick[MAXSPLITSCREENPLAYERS] = {};
|
||||||
|
|
||||||
|
// 1024 bytes is plenty for a savegame
|
||||||
|
#define SAVEGAMESIZE (1024)
|
||||||
|
|
||||||
// SRB2kart
|
// SRB2kart
|
||||||
char gamedatafilename[64] = "kartdata.dat";
|
char gamedatafilename[64] = "kartdata.dat";
|
||||||
char timeattackfolder[64] = "kart";
|
char timeattackfolder[64] = "kart";
|
||||||
@@ -86,6 +90,7 @@ INT16 maptol = 0;
|
|||||||
UINT8 globalweather = 0;
|
UINT8 globalweather = 0;
|
||||||
INT32 curWeather = PRECIP_NONE;
|
INT32 curWeather = PRECIP_NONE;
|
||||||
INT32 cursaveslot = -1; // Auto-save 1p savegame slot
|
INT32 cursaveslot = -1; // Auto-save 1p savegame slot
|
||||||
|
INT16 lastmapsaved = 0; // Last map we auto-saved at
|
||||||
boolean gamecomplete = false;
|
boolean gamecomplete = false;
|
||||||
|
|
||||||
UINT16 mainwads = 0;
|
UINT16 mainwads = 0;
|
||||||
@@ -95,6 +100,7 @@ boolean savemoddata = false;
|
|||||||
UINT8 paused = 0;
|
UINT8 paused = 0;
|
||||||
UINT8 modeattacking = ATTACKING_NONE;
|
UINT8 modeattacking = ATTACKING_NONE;
|
||||||
boolean imcontinuing = false;
|
boolean imcontinuing = false;
|
||||||
|
boolean runemeraldmanager = false;
|
||||||
|
|
||||||
boolean netgame = false; // only true if packets are broadcast
|
boolean netgame = false; // only true if packets are broadcast
|
||||||
boolean multiplayer = false;
|
boolean multiplayer = false;
|
||||||
@@ -106,6 +112,7 @@ INT32 consoleplayer = 0; // player taking events and displaying
|
|||||||
INT32 displayplayers[MAXSPLITSCREENPLAYERS] = {}; // view being displayed
|
INT32 displayplayers[MAXSPLITSCREENPLAYERS] = {}; // view being displayed
|
||||||
|
|
||||||
tic_t gametic = 0;
|
tic_t gametic = 0;
|
||||||
|
tic_t levelstarttic = 0; // gametic at level start
|
||||||
UINT32 totalrings = 0; // for intermission
|
UINT32 totalrings = 0; // for intermission
|
||||||
INT16 lastmap = 0; // last level you were at (returning from special stages)
|
INT16 lastmap = 0; // last level you were at (returning from special stages)
|
||||||
tic_t timeinmap = 0; // Ticker for time spent in level (used for levelcard display)
|
tic_t timeinmap = 0; // Ticker for time spent in level (used for levelcard display)
|
||||||
@@ -183,6 +190,9 @@ boolean CheckForReverseGravity = false;
|
|||||||
UINT16 invulntics = 20*TICRATE;
|
UINT16 invulntics = 20*TICRATE;
|
||||||
UINT16 sneakertics = 20*TICRATE;
|
UINT16 sneakertics = 20*TICRATE;
|
||||||
UINT16 flashingtics = 3*TICRATE/2; // SRB2kart
|
UINT16 flashingtics = 3*TICRATE/2; // SRB2kart
|
||||||
|
UINT16 tailsflytics = 8*TICRATE;
|
||||||
|
UINT16 underwatertics = 30*TICRATE;
|
||||||
|
UINT16 spacetimetics = 11*TICRATE + (TICRATE/2);
|
||||||
UINT16 extralifetics = 4*TICRATE;
|
UINT16 extralifetics = 4*TICRATE;
|
||||||
|
|
||||||
// SRB2kart
|
// SRB2kart
|
||||||
@@ -200,7 +210,10 @@ const INT32 wipeoutslowtime = 20;
|
|||||||
const INT32 wantedreduce = 5*TICRATE;
|
const INT32 wantedreduce = 5*TICRATE;
|
||||||
const INT32 wantedfrequency = 10*TICRATE;
|
const INT32 wantedfrequency = 10*TICRATE;
|
||||||
|
|
||||||
|
INT32 gameovertics = 15*TICRATE;
|
||||||
|
|
||||||
UINT8 use1upSound = 0;
|
UINT8 use1upSound = 0;
|
||||||
|
UINT8 maxXtraLife = 2; // Max extra lives from rings
|
||||||
|
|
||||||
UINT8 introtoplay = 0;
|
UINT8 introtoplay = 0;
|
||||||
UINT8 creditscutscene = 0;
|
UINT8 creditscutscene = 0;
|
||||||
@@ -1290,6 +1303,8 @@ static void G_DoLoadLevel(boolean resetplayer)
|
|||||||
// Make sure objectplace is OFF when you first start the level!
|
// Make sure objectplace is OFF when you first start the level!
|
||||||
OP_ResetObjectplace();
|
OP_ResetObjectplace();
|
||||||
|
|
||||||
|
levelstarttic = gametic; // for time calculation
|
||||||
|
|
||||||
if (wipegamestate == GS_LEVEL)
|
if (wipegamestate == GS_LEVEL)
|
||||||
wipegamestate = -1; // force a wipe
|
wipegamestate = -1; // force a wipe
|
||||||
|
|
||||||
@@ -3343,6 +3358,18 @@ static void G_DoStartVote(void)
|
|||||||
gameaction = ga_nothing;
|
gameaction = ga_nothing;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
//
|
||||||
|
// G_UseContinue
|
||||||
|
//
|
||||||
|
void G_UseContinue(void)
|
||||||
|
{
|
||||||
|
if (gamestate == GS_LEVEL && !netgame && !multiplayer)
|
||||||
|
{
|
||||||
|
gameaction = ga_startcont;
|
||||||
|
lastdraw = true;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
static void G_DoStartContinue(void)
|
static void G_DoStartContinue(void)
|
||||||
{
|
{
|
||||||
I_Assert(!netgame && !multiplayer);
|
I_Assert(!netgame && !multiplayer);
|
||||||
@@ -3381,7 +3408,7 @@ static void G_DoContinued(void)
|
|||||||
token = 0;
|
token = 0;
|
||||||
|
|
||||||
// Reset # of lives
|
// Reset # of lives
|
||||||
pl->lives = 3;
|
pl->lives = (ultimatemode) ? 1 : 3;
|
||||||
|
|
||||||
D_MapChange(gamemap, gametype, false, false, 0, false, false);
|
D_MapChange(gamemap, gametype, false, false, 0, false, false);
|
||||||
|
|
||||||
@@ -3875,7 +3902,7 @@ void G_SaveGame(UINT32 savegameslot)
|
|||||||
char name[VERSIONSIZE];
|
char name[VERSIONSIZE];
|
||||||
size_t length;
|
size_t length;
|
||||||
|
|
||||||
save.p = save.buffer = (UINT8 *)Z_Malloc(1024, PU_STATIC, NULL); // 1024 bytes is plenty for a savegame
|
save.p = save.buffer = (UINT8 *)Z_Malloc(SAVEGAMESIZE, PU_STATIC, NULL);
|
||||||
if (!save.p)
|
if (!save.p)
|
||||||
{
|
{
|
||||||
CONS_Alert(CONS_ERROR, M_GetText("No more free memory for saving game data\n"));
|
CONS_Alert(CONS_ERROR, M_GetText("No more free memory for saving game data\n"));
|
||||||
@@ -4025,6 +4052,7 @@ void G_InitNew(UINT8 pencoremode, const char *mapname, boolean resetplayer, bool
|
|||||||
if (W_CheckNumForName(mapname) == LUMPERROR)
|
if (W_CheckNumForName(mapname) == LUMPERROR)
|
||||||
{
|
{
|
||||||
I_Error("Internal game map '%s' not found\n", mapname);
|
I_Error("Internal game map '%s' not found\n", mapname);
|
||||||
|
Command_ExitGame_f();
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -4125,7 +4153,6 @@ static void measurekeywords(mapsearchfreq_t *fr,
|
|||||||
{
|
{
|
||||||
char *qp;
|
char *qp;
|
||||||
char *sp;
|
char *sp;
|
||||||
|
|
||||||
if (wanttable)
|
if (wanttable)
|
||||||
(*dimp) = Z_Realloc((*dimp), 255 * sizeof (struct searchdim),
|
(*dimp) = Z_Realloc((*dimp), 255 * sizeof (struct searchdim),
|
||||||
PU_STATIC, NULL);
|
PU_STATIC, NULL);
|
||||||
@@ -4140,12 +4167,10 @@ static void measurekeywords(mapsearchfreq_t *fr,
|
|||||||
(*dimp)[(*cuntp)].pos = sp - s;
|
(*dimp)[(*cuntp)].pos = sp - s;
|
||||||
(*dimp)[(*cuntp)].siz = strlen(qp);
|
(*dimp)[(*cuntp)].siz = strlen(qp);
|
||||||
}
|
}
|
||||||
|
|
||||||
(*cuntp)++;
|
(*cuntp)++;
|
||||||
fr->total++;
|
fr->total++;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if (wanttable)
|
if (wanttable)
|
||||||
(*dimp) = Z_Realloc((*dimp), (*cuntp) * sizeof (struct searchdim),
|
(*dimp) = Z_Realloc((*dimp), (*cuntp) * sizeof (struct searchdim),
|
||||||
PU_STATIC, NULL);
|
PU_STATIC, NULL);
|
||||||
|
|||||||
@@ -39,8 +39,12 @@ extern INT32 player_name_changes[MAXPLAYERS];
|
|||||||
extern player_t players[MAXPLAYERS];
|
extern player_t players[MAXPLAYERS];
|
||||||
extern boolean playeringame[MAXPLAYERS];
|
extern boolean playeringame[MAXPLAYERS];
|
||||||
|
|
||||||
|
// gametic at level start
|
||||||
|
extern tic_t levelstarttic;
|
||||||
|
|
||||||
// for modding?
|
// for modding?
|
||||||
extern INT16 prevmap, nextmap;
|
extern INT16 prevmap, nextmap;
|
||||||
|
extern INT32 gameovertics;
|
||||||
extern tic_t timeinmap; // Ticker for time spent in level (used for levelcard display)
|
extern tic_t timeinmap; // Ticker for time spent in level (used for levelcard display)
|
||||||
extern INT16 rw_maximums[NUM_WEAPONS];
|
extern INT16 rw_maximums[NUM_WEAPONS];
|
||||||
|
|
||||||
@@ -248,6 +252,7 @@ UINT8 G_GetGametypeColor(INT16 gt);
|
|||||||
void G_ExitLevel(void);
|
void G_ExitLevel(void);
|
||||||
void G_NextLevel(void);
|
void G_NextLevel(void);
|
||||||
void G_Continue(void);
|
void G_Continue(void);
|
||||||
|
void G_UseContinue(void);
|
||||||
void G_AfterIntermission(void);
|
void G_AfterIntermission(void);
|
||||||
void G_EndGame(void); // moved from y_inter.c/h and renamed
|
void G_EndGame(void); // moved from y_inter.c/h and renamed
|
||||||
|
|
||||||
|
|||||||
@@ -939,11 +939,6 @@ void G_SetPlayerGamepadIndicatorColor(INT32 playernum, UINT8 color)
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (!I_GamepadHasLED(playernum))
|
|
||||||
{
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
// so we can override this
|
// so we can override this
|
||||||
skincolor = color ? color : G_GetSkinColorForGamepad(playernum);
|
skincolor = color ? color : G_GetSkinColorForGamepad(playernum);
|
||||||
byte_color = V_GetColor(colortranslations[skincolor][8]).s;
|
byte_color = V_GetColor(colortranslations[skincolor][8]).s;
|
||||||
@@ -979,22 +974,12 @@ void G_DeviceLEDTick(void)
|
|||||||
for (i = 0; i <= splitscreen; i++)
|
for (i = 0; i <= splitscreen; i++)
|
||||||
{
|
{
|
||||||
if (!cv_usejoystick[i].value || !cv_gamepadled[i].value)
|
if (!cv_usejoystick[i].value || !cv_gamepadled[i].value)
|
||||||
{
|
|
||||||
continue;
|
continue;
|
||||||
}
|
|
||||||
|
|
||||||
// does not have a configurable led! :c
|
|
||||||
if (!I_GamepadHasLED(i))
|
|
||||||
{
|
|
||||||
continue;
|
|
||||||
}
|
|
||||||
|
|
||||||
newcolor = G_GetSkinColorForGamepad(i);
|
newcolor = G_GetSkinColorForGamepad(i);
|
||||||
|
|
||||||
if (curcolor[i] == newcolor) // dont update if same colour
|
if (curcolor[i] == newcolor) // dont update if same colour
|
||||||
{
|
|
||||||
continue;
|
continue;
|
||||||
}
|
|
||||||
|
|
||||||
G_SetPlayerGamepadIndicatorColor(i, newcolor);
|
G_SetPlayerGamepadIndicatorColor(i, newcolor);
|
||||||
curcolor[i] = newcolor;
|
curcolor[i] = newcolor;
|
||||||
@@ -1070,12 +1055,6 @@ void G_DeviceRumbleTick(void)
|
|||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
|
|
||||||
// does not support rumble! :c
|
|
||||||
if (!I_GamepadHasRumble(i))
|
|
||||||
{
|
|
||||||
continue;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (camera[i].freecam)
|
if (camera[i].freecam)
|
||||||
{
|
{
|
||||||
continue;
|
continue;
|
||||||
|
|||||||
@@ -52,6 +52,7 @@ typedef enum
|
|||||||
} gameaction_t;
|
} gameaction_t;
|
||||||
|
|
||||||
extern gamestate_t gamestate;
|
extern gamestate_t gamestate;
|
||||||
|
extern UINT8 ultimatemode; // was sk_insane
|
||||||
extern gameaction_t gameaction;
|
extern gameaction_t gameaction;
|
||||||
|
|
||||||
extern boolean botingame;
|
extern boolean botingame;
|
||||||
|
|||||||
@@ -15,6 +15,8 @@
|
|||||||
|
|
||||||
#ifdef HWRENDER
|
#ifdef HWRENDER
|
||||||
|
|
||||||
|
#include <unordered_set>
|
||||||
|
|
||||||
#include "hw_main.h"
|
#include "hw_main.h"
|
||||||
#include "hw_glob.h"
|
#include "hw_glob.h"
|
||||||
#include "hw_gl.h"
|
#include "hw_gl.h"
|
||||||
@@ -98,7 +100,7 @@ static void HWR_DrawColumnInCache(const column_t *patchcol, UINT8 *block, GLMipm
|
|||||||
position = 0;
|
position = 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
position = max(((position * scale_y) + (FRACUNIT/2)) >> FRACBITS, 0);
|
position = std::max(((position * scale_y) + (FRACUNIT/2)) >> FRACBITS, 0);
|
||||||
|
|
||||||
if (position + count >= pblockheight)
|
if (position + count >= pblockheight)
|
||||||
count = pblockheight - position;
|
count = pblockheight - position;
|
||||||
@@ -162,7 +164,7 @@ static void HWR_DrawPatchInCache(GLMipmap_t *mipmap,
|
|||||||
fixed_t xfrac, xfracstep;
|
fixed_t xfrac, xfracstep;
|
||||||
fixed_t yfracstep, scale_y;
|
fixed_t yfracstep, scale_y;
|
||||||
const column_t *patchcol;
|
const column_t *patchcol;
|
||||||
UINT8 *block = (UINT8 *)(mipmap->data);
|
UINT8 *block = static_cast<UINT8 *>(mipmap->data);
|
||||||
INT32 bpp;
|
INT32 bpp;
|
||||||
INT32 blockmodulo;
|
INT32 blockmodulo;
|
||||||
RGBA_t *palette;
|
RGBA_t *palette;
|
||||||
@@ -212,7 +214,7 @@ static void HWR_DrawTexturePatchInCache(GLMipmap_t *mipmap,
|
|||||||
fixed_t xfrac, xfracstep;
|
fixed_t xfrac, xfracstep;
|
||||||
fixed_t yfracstep, scale_y;
|
fixed_t yfracstep, scale_y;
|
||||||
const column_t *patchcol;
|
const column_t *patchcol;
|
||||||
UINT8 *block = (UINT8 *)(mipmap->data);
|
UINT8 *block = static_cast<UINT8 *>(mipmap->data);
|
||||||
INT32 bpp;
|
INT32 bpp;
|
||||||
INT32 blockmodulo;
|
INT32 blockmodulo;
|
||||||
INT32 width, height;
|
INT32 width, height;
|
||||||
@@ -288,7 +290,7 @@ static UINT8 *MakeBlock(GLMipmap_t *glMipmap)
|
|||||||
INT32 blocksize = (glMipmap->width * glMipmap->height);
|
INT32 blocksize = (glMipmap->width * glMipmap->height);
|
||||||
|
|
||||||
bpp = format2bpp(glMipmap->format);
|
bpp = format2bpp(glMipmap->format);
|
||||||
block = (UINT8 *)(Z_Malloc(blocksize*bpp, PU_HWRCACHE, &(glMipmap->data)));
|
block = static_cast<UINT8 *>(Z_Malloc(blocksize*bpp, PU_HWRCACHE, &(glMipmap->data)));
|
||||||
|
|
||||||
switch (bpp)
|
switch (bpp)
|
||||||
{
|
{
|
||||||
@@ -325,7 +327,7 @@ static void HWR_GenerateTexture(INT32 texnum, GLMapTexture_t *gltex, boolean noe
|
|||||||
texture = textures[texnum];
|
texture = textures[texnum];
|
||||||
|
|
||||||
gltex->mipmap.flags = TF_CHROMAKEYED | TF_WRAPXY;
|
gltex->mipmap.flags = TF_CHROMAKEYED | TF_WRAPXY;
|
||||||
gltex->mipmap.format = (GLTextureFormat_t)(textureformat);
|
gltex->mipmap.format = static_cast<GLTextureFormat_t>(textureformat);
|
||||||
|
|
||||||
// hack the Legacy skies..
|
// hack the Legacy skies..
|
||||||
if (UNLIKELY(memcmp(texture->name, "SKY", 3) == 0 &&
|
if (UNLIKELY(memcmp(texture->name, "SKY", 3) == 0 &&
|
||||||
@@ -344,7 +346,7 @@ static void HWR_GenerateTexture(INT32 texnum, GLMapTexture_t *gltex, boolean noe
|
|||||||
colormap += COLORMAP_REMAPOFFSET;
|
colormap += COLORMAP_REMAPOFFSET;
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
gltex->mipmap.colormap = (GLColormap_t *)(Z_Calloc(sizeof(*gltex->mipmap.colormap), PU_HWRPATCHCOLMIPMAP, NULL));
|
gltex->mipmap.colormap = static_cast<GLColormap_t *>(Z_Calloc(sizeof(*gltex->mipmap.colormap), PU_HWRPATCHCOLMIPMAP, NULL));
|
||||||
gltex->mipmap.colormap->source = colormap;
|
gltex->mipmap.colormap->source = colormap;
|
||||||
memcpy(gltex->mipmap.colormap->data, colormap, 256 * sizeof(UINT8));
|
memcpy(gltex->mipmap.colormap->data, colormap, 256 * sizeof(UINT8));
|
||||||
|
|
||||||
@@ -377,7 +379,7 @@ static void HWR_GenerateTexture(INT32 texnum, GLMapTexture_t *gltex, boolean noe
|
|||||||
// Composite the columns together.
|
// Composite the columns together.
|
||||||
for (i = 0, patch = texture->patches; i < texture->patchcount; i++, patch++)
|
for (i = 0, patch = texture->patches; i < texture->patchcount; i++, patch++)
|
||||||
{
|
{
|
||||||
pdata = (UINT8 *)(W_CacheLumpNumPwad(patch->wad, patch->lump, PU_LEVEL));
|
pdata = static_cast<UINT8 *>(W_CacheLumpNumPwad(patch->wad, patch->lump, PU_LEVEL));
|
||||||
realpatch = (softwarepatch_t *)pdata;
|
realpatch = (softwarepatch_t *)pdata;
|
||||||
|
|
||||||
HWR_DrawTexturePatchInCache(&gltex->mipmap, blockwidth, blockheight, texture, patch, realpatch);
|
HWR_DrawTexturePatchInCache(&gltex->mipmap, blockwidth, blockheight, texture, patch, realpatch);
|
||||||
@@ -413,7 +415,7 @@ void HWR_MakePatch(const patch_t *patch, GLPatch_t *glPatch, GLMipmap_t *glMipma
|
|||||||
glMipmap->flags = 0;
|
glMipmap->flags = 0;
|
||||||
|
|
||||||
// setup the texture info
|
// setup the texture info
|
||||||
glMipmap->format = (GLTextureFormat_t)(patchformat);
|
glMipmap->format = static_cast<GLTextureFormat_t>(patchformat);
|
||||||
|
|
||||||
glPatch->max_s = (float)patch->width / (float)glMipmap->width;
|
glPatch->max_s = (float)patch->width / (float)glMipmap->width;
|
||||||
glPatch->max_t = (float)patch->height / (float)glMipmap->height;
|
glPatch->max_t = (float)patch->height / (float)glMipmap->height;
|
||||||
@@ -455,7 +457,7 @@ static void HWR_FreeTextureData(patch_t *patch)
|
|||||||
if (!patch || !patch->hardware)
|
if (!patch || !patch->hardware)
|
||||||
return;
|
return;
|
||||||
|
|
||||||
glPatch = (GLPatch_t *)(patch->hardware);
|
glPatch = static_cast<GLPatch_t *>(patch->hardware);
|
||||||
|
|
||||||
if (vid.glstate == VID_GL_LIBRARY_LOADED)
|
if (vid.glstate == VID_GL_LIBRARY_LOADED)
|
||||||
GL_DeleteTexture(glPatch->mipmap);
|
GL_DeleteTexture(glPatch->mipmap);
|
||||||
@@ -471,7 +473,7 @@ void HWR_FreeTexture(patch_t *patch)
|
|||||||
|
|
||||||
if (patch->hardware)
|
if (patch->hardware)
|
||||||
{
|
{
|
||||||
GLPatch_t *glPatch = (GLPatch_t *)(patch->hardware);
|
GLPatch_t *glPatch = static_cast<GLPatch_t *>(patch->hardware);
|
||||||
|
|
||||||
HWR_FreeTextureColormaps(patch);
|
HWR_FreeTextureColormaps(patch);
|
||||||
|
|
||||||
@@ -497,7 +499,7 @@ static void HWR_FreeTextureColormaps(patch_t *patch)
|
|||||||
if (!patch)
|
if (!patch)
|
||||||
return;
|
return;
|
||||||
|
|
||||||
pat = (GLPatch_t *)(patch->hardware);
|
pat = static_cast<GLPatch_t *>(patch->hardware);
|
||||||
if (!pat)
|
if (!pat)
|
||||||
return;
|
return;
|
||||||
|
|
||||||
@@ -612,20 +614,24 @@ void HWR_FreeMapTextures(void)
|
|||||||
gl_numtextures = 0;
|
gl_numtextures = 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
#define NAME flatcheck
|
|
||||||
#define KEY_TY UINT32
|
|
||||||
#define HASH_FN vt_hash_integer
|
|
||||||
#define CMPR_FN vt_cmpr_integer
|
|
||||||
#include "../verstable.h"
|
|
||||||
|
|
||||||
static void HWR_PrecacheLevelFlats(void)
|
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;
|
// too lazy to make a hashtable or smth so unordered set will do :carbuncle:
|
||||||
flatcheck_init(&flatpresent);
|
std::unordered_set<UINT32> flatpresent;
|
||||||
size_t i, j;
|
size_t i, j;
|
||||||
INT32 k;
|
INT32 k;
|
||||||
|
|
||||||
|
auto load_flat = [&](lumpnum_t lump, boolean noencoremap)
|
||||||
|
{
|
||||||
|
// flat already loaded?
|
||||||
|
if (flatpresent.count(lump) == 0)
|
||||||
|
{
|
||||||
|
HWR_GetFlat(lump, noencoremap);
|
||||||
|
flatpresent.insert(lump);
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
// special case for encore
|
// special case for encore
|
||||||
#ifdef GLENCORE
|
#ifdef GLENCORE
|
||||||
if (encoremap)
|
if (encoremap)
|
||||||
@@ -643,23 +649,14 @@ static void HWR_PrecacheLevelFlats(void)
|
|||||||
|
|
||||||
const levelflat_t *levelflat = &levelflats[pic];
|
const levelflat_t *levelflat = &levelflats[pic];
|
||||||
|
|
||||||
if (flatcheck_is_end(flatcheck_get(&flatpresent, levelflat->lumpnum)))
|
load_flat(levelflat->lumpnum, R_NoEncore(sec, ceiling));
|
||||||
{
|
|
||||||
HWR_GetFlat(levelflat->lumpnum, R_NoEncore(sec, ceiling));
|
|
||||||
flatcheck_insert(&flatpresent, levelflat->lumpnum);
|
|
||||||
}
|
|
||||||
|
|
||||||
if (levelflat->speed) // is it an animated flat ?
|
if (levelflat->speed) // is it an animated flat ?
|
||||||
{
|
{
|
||||||
// start from 0, occasionally basenumlump != flat->lumpnum
|
// start from 0, occasionally basenumlump != flat->lumpnum
|
||||||
for (k = 0; k < levelflat->numpics; k++)
|
for (k = 0; k < levelflat->numpics; k++)
|
||||||
{
|
{
|
||||||
lumpnum_t lump = levelflat->baselumpnum + k;
|
load_flat(levelflat->baselumpnum + k, R_NoEncore(sec, ceiling));
|
||||||
if (flatcheck_is_end(flatcheck_get(&flatpresent, lump)))
|
|
||||||
{
|
|
||||||
HWR_GetFlat(lump, R_NoEncore(sec, ceiling));
|
|
||||||
flatcheck_insert(&flatpresent, lump);
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -674,29 +671,18 @@ static void HWR_PrecacheLevelFlats(void)
|
|||||||
{
|
{
|
||||||
const levelflat_t *levelflat = &levelflats[i];
|
const levelflat_t *levelflat = &levelflats[i];
|
||||||
|
|
||||||
if (flatcheck_is_end(flatcheck_get(&flatpresent, levelflat->lumpnum)))
|
load_flat(levelflat->lumpnum, false);
|
||||||
{
|
|
||||||
HWR_GetFlat(levelflat->lumpnum, false);
|
|
||||||
flatcheck_insert(&flatpresent, levelflat->lumpnum);
|
|
||||||
}
|
|
||||||
|
|
||||||
if (levelflat->speed) // is it an animated flat ?
|
if (levelflat->speed) // is it an animated flat ?
|
||||||
{
|
{
|
||||||
// start from 0, occasionally basenumlump != flat->lumpnum
|
// start from 0, occasionally basenumlump != flat->lumpnum
|
||||||
for (k = 0; k < levelflat->numpics; k++)
|
for (k = 0; k < levelflat->numpics; k++)
|
||||||
{
|
{
|
||||||
lumpnum_t lump = levelflat->baselumpnum + k;
|
load_flat(levelflat->baselumpnum + k, false);
|
||||||
if (flatcheck_is_end(flatcheck_get(&flatpresent, lump)))
|
|
||||||
{
|
|
||||||
HWR_GetFlat(lump, false);
|
|
||||||
flatcheck_insert(&flatpresent, lump);
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
flatcheck_cleanup(&flatpresent);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
static void HWR_PrecacheLevelTextures(void)
|
static void HWR_PrecacheLevelTextures(void)
|
||||||
@@ -706,7 +692,7 @@ static void HWR_PrecacheLevelTextures(void)
|
|||||||
size_t i, j, f;
|
size_t i, j, f;
|
||||||
INT32 h;
|
INT32 h;
|
||||||
|
|
||||||
texturepresent = (char *)(calloc(gl_numtextures, sizeof(*texturepresent)));
|
texturepresent = static_cast<char *>(calloc(gl_numtextures, sizeof(*texturepresent)));
|
||||||
if (texturepresent == NULL)
|
if (texturepresent == NULL)
|
||||||
I_Error("%s: Out of memory looking up textures", "HWR_PrecacheLevel");
|
I_Error("%s: Out of memory looking up textures", "HWR_PrecacheLevel");
|
||||||
|
|
||||||
@@ -881,7 +867,7 @@ void HWR_LoadMapTextures(size_t pnumtextures)
|
|||||||
HWR_FreeMapTextures();
|
HWR_FreeMapTextures();
|
||||||
|
|
||||||
gl_numtextures = pnumtextures;
|
gl_numtextures = pnumtextures;
|
||||||
gl_textures = (GLMapTextureSet_t *)(calloc(gl_numtextures, sizeof(*gl_textures))); // *2 - 1 for encore-remapped texture and another for noencore texture (unused when not in encore), see: GLMapTextureSet_t
|
gl_textures = static_cast<GLMapTextureSet_t *>(calloc(gl_numtextures, sizeof(*gl_textures))); // *2 - 1 for encore-remapped texture and another for noencore texture (unused when not in encore), see: GLMapTextureSet_t
|
||||||
|
|
||||||
if (gl_textures == NULL)
|
if (gl_textures == NULL)
|
||||||
I_Error("HWR_LoadMapTextures: ran out of memory for OpenGL textures. Sad!");
|
I_Error("HWR_LoadMapTextures: ran out of memory for OpenGL textures. Sad!");
|
||||||
@@ -978,7 +964,7 @@ static void HWR_CacheFlat(GLMipmap_t *glMipmap, lumpnum_t flatlumpnum)
|
|||||||
W_ReadLump(flatlumpnum, Z_Malloc(size, PU_HWRCACHE, &glMipmap->data));
|
W_ReadLump(flatlumpnum, Z_Malloc(size, PU_HWRCACHE, &glMipmap->data));
|
||||||
|
|
||||||
#ifdef GLENCORE
|
#ifdef GLENCORE
|
||||||
flat = (UINT8 *)(glMipmap->data);
|
flat = static_cast<UINT8 *>(glMipmap->data);
|
||||||
for (steppy = 0; steppy < size; steppy++)
|
for (steppy = 0; steppy < size; steppy++)
|
||||||
{
|
{
|
||||||
if (flat[steppy] == HWR_PATCHES_CHROMAKEY_COLORINDEX)
|
if (flat[steppy] == HWR_PATCHES_CHROMAKEY_COLORINDEX)
|
||||||
@@ -1022,7 +1008,7 @@ void HWR_GetFlat(lumpnum_t flatlumpnum, boolean noencoremap)
|
|||||||
if (!noencoremap && encoremap)
|
if (!noencoremap && encoremap)
|
||||||
colormap += COLORMAP_REMAPOFFSET;
|
colormap += COLORMAP_REMAPOFFSET;
|
||||||
#endif
|
#endif
|
||||||
glMipmap->colormap = (GLColormap_t *)(Z_Calloc(sizeof(*glMipmap->colormap), PU_HWRPATCHCOLMIPMAP, NULL));
|
glMipmap->colormap = static_cast<GLColormap_t *>(Z_Calloc(sizeof(*glMipmap->colormap), PU_HWRPATCHCOLMIPMAP, NULL));
|
||||||
glMipmap->colormap->source = colormap;
|
glMipmap->colormap->source = colormap;
|
||||||
memcpy(glMipmap->colormap->data, colormap, 256 * sizeof(UINT8));
|
memcpy(glMipmap->colormap->data, colormap, 256 * sizeof(UINT8));
|
||||||
}
|
}
|
||||||
@@ -1046,7 +1032,7 @@ void HWR_GetFlat(lumpnum_t flatlumpnum, boolean noencoremap)
|
|||||||
// --------------------+
|
// --------------------+
|
||||||
static void HWR_LoadPatchMipmap(patch_t *patch, GLMipmap_t *glMipmap)
|
static void HWR_LoadPatchMipmap(patch_t *patch, GLMipmap_t *glMipmap)
|
||||||
{
|
{
|
||||||
GLPatch_t *glPatch = (GLPatch_t *)(patch->hardware);
|
GLPatch_t *glPatch = static_cast<GLPatch_t *>(patch->hardware);
|
||||||
|
|
||||||
if (!glMipmap->downloaded)
|
if (!glMipmap->downloaded)
|
||||||
{
|
{
|
||||||
@@ -1067,7 +1053,7 @@ static void HWR_LoadPatchMipmap(patch_t *patch, GLMipmap_t *glMipmap)
|
|||||||
// ----------------------+
|
// ----------------------+
|
||||||
static void HWR_UpdatePatchMipmap(patch_t *patch, GLMipmap_t *glMipmap)
|
static void HWR_UpdatePatchMipmap(patch_t *patch, GLMipmap_t *glMipmap)
|
||||||
{
|
{
|
||||||
GLPatch_t *glPatch = (GLPatch_t *)(patch->hardware);
|
GLPatch_t *glPatch = static_cast<GLPatch_t *>(patch->hardware);
|
||||||
HWR_MakePatch(patch, glPatch, glMipmap, true);
|
HWR_MakePatch(patch, glPatch, glMipmap, true);
|
||||||
|
|
||||||
// If hardware does not have the texture, then call GL_SetTexture to upload it
|
// If hardware does not have the texture, then call GL_SetTexture to upload it
|
||||||
@@ -1103,7 +1089,7 @@ void HWR_GetMappedPatch(patch_t *patch, const UINT8 *colormap)
|
|||||||
|
|
||||||
if (!patch->hardware)
|
if (!patch->hardware)
|
||||||
Patch_CreateGL(patch);
|
Patch_CreateGL(patch);
|
||||||
glPatch = (GLPatch_t *)(patch->hardware);
|
glPatch = static_cast<GLPatch_t *>(patch->hardware);
|
||||||
|
|
||||||
// Blatant hack for encore colormapping aside...
|
// Blatant hack for encore colormapping aside...
|
||||||
if (colormap == colormaps || colormap == NULL || colormap == (const UINT8*)(COLORMAP_REMAPOFFSET))
|
if (colormap == colormaps || colormap == NULL || colormap == (const UINT8*)(COLORMAP_REMAPOFFSET))
|
||||||
@@ -1139,12 +1125,12 @@ void HWR_GetMappedPatch(patch_t *patch, const UINT8 *colormap)
|
|||||||
// (it have a liste of mipmap)
|
// (it have a liste of mipmap)
|
||||||
// this malloc is cleared in HWR_FreeColormapCache
|
// this malloc is cleared in HWR_FreeColormapCache
|
||||||
// (...) unfortunately z_malloc fragment alot the memory :(so malloc is better
|
// (...) unfortunately z_malloc fragment alot the memory :(so malloc is better
|
||||||
newMipmap = (GLMipmap_t *)(calloc(1, sizeof (*newMipmap)));
|
newMipmap = static_cast<GLMipmap_t *>(calloc(1, sizeof (*newMipmap)));
|
||||||
if (newMipmap == NULL)
|
if (newMipmap == NULL)
|
||||||
I_Error("%s: Out of memory", "HWR_GetMappedPatch");
|
I_Error("%s: Out of memory", "HWR_GetMappedPatch");
|
||||||
glMipmap->nextcolormap = newMipmap;
|
glMipmap->nextcolormap = newMipmap;
|
||||||
|
|
||||||
newMipmap->colormap = (GLColormap_t *)(Z_Calloc(sizeof(*newMipmap->colormap), PU_HWRPATCHCOLMIPMAP, NULL));
|
newMipmap->colormap = static_cast<GLColormap_t *>(Z_Calloc(sizeof(*newMipmap->colormap), PU_HWRPATCHCOLMIPMAP, NULL));
|
||||||
newMipmap->colormap->source = colormap;
|
newMipmap->colormap->source = colormap;
|
||||||
memcpy(newMipmap->colormap->data, colormap, 256 * sizeof(UINT8));
|
memcpy(newMipmap->colormap->data, colormap, 256 * sizeof(UINT8));
|
||||||
|
|
||||||
@@ -1167,7 +1153,7 @@ patch_t *HWR_GetCachedGLPatchPwad(UINT16 wadnum, UINT16 lumpnum)
|
|||||||
{
|
{
|
||||||
void *ptr = Z_Calloc(sizeof(patch_t), PU_PATCH, &lumpcache[lumpnum]);
|
void *ptr = Z_Calloc(sizeof(patch_t), PU_PATCH, &lumpcache[lumpnum]);
|
||||||
Patch_Create(NULL, 0, ptr);
|
Patch_Create(NULL, 0, ptr);
|
||||||
Patch_AllocateHardwarePatch((patch_t *)(ptr));
|
Patch_AllocateHardwarePatch(static_cast<patch_t *>(ptr));
|
||||||
}
|
}
|
||||||
|
|
||||||
return (patch_t *)(lumpcache[lumpnum]);
|
return (patch_t *)(lumpcache[lumpnum]);
|
||||||
@@ -1184,7 +1170,7 @@ static void HWR_DrawFadeMaskInCache(GLMipmap_t *mipmap, INT32 pblockwidth, INT32
|
|||||||
{
|
{
|
||||||
INT32 i,j;
|
INT32 i,j;
|
||||||
fixed_t posx, posy, stepx, stepy;
|
fixed_t posx, posy, stepx, stepy;
|
||||||
UINT8 *block = (UINT8 *)(mipmap->data); // places the data directly into here
|
UINT8 *block = static_cast<UINT8 *>(mipmap->data); // places the data directly into here
|
||||||
UINT8 *flat;
|
UINT8 *flat;
|
||||||
UINT8 *dest, *src, texel;
|
UINT8 *dest, *src, texel;
|
||||||
RGBA_t col;
|
RGBA_t col;
|
||||||
@@ -1340,7 +1326,7 @@ void HWR_SetPalette(RGBA_t *palette)
|
|||||||
static void HWR_SetPaletteLookup(RGBA_t *palette)
|
static void HWR_SetPaletteLookup(RGBA_t *palette)
|
||||||
{
|
{
|
||||||
int r, g, b;
|
int r, g, b;
|
||||||
UINT8 *lut = (UINT8 *)(Z_Malloc(
|
UINT8 *lut = static_cast<UINT8 *>(Z_Malloc(
|
||||||
HWR_PALETTE_LUT_SIZE*HWR_PALETTE_LUT_SIZE*HWR_PALETTE_LUT_SIZE*sizeof(UINT8),
|
HWR_PALETTE_LUT_SIZE*HWR_PALETTE_LUT_SIZE*HWR_PALETTE_LUT_SIZE*sizeof(UINT8),
|
||||||
PU_STATIC, NULL));
|
PU_STATIC, NULL));
|
||||||
#define STEP_SIZE (256/HWR_PALETTE_LUT_SIZE)
|
#define STEP_SIZE (256/HWR_PALETTE_LUT_SIZE)
|
||||||
@@ -1385,7 +1371,7 @@ void HWR_SetMapPalette(void)
|
|||||||
if (palsize < 768) // 256 * 3
|
if (palsize < 768) // 256 * 3
|
||||||
I_Error("HWR_SetMapPalette: A programmer assumed palette lumps are at least 768 bytes long, but apparently this was a wrong assumption!\n");
|
I_Error("HWR_SetMapPalette: A programmer assumed palette lumps are at least 768 bytes long, but apparently this was a wrong assumption!\n");
|
||||||
|
|
||||||
RGB_data = (UINT8 *)(W_CacheLumpNum(lumpnum, PU_CACHE));
|
RGB_data = static_cast<UINT8 *>(W_CacheLumpNum(lumpnum, PU_CACHE));
|
||||||
// we got the RGB palette now, but we need it in RGBA format.
|
// we got the RGB palette now, but we need it in RGBA format.
|
||||||
for (i = 0; i < 256; i++)
|
for (i = 0; i < 256; i++)
|
||||||
{
|
{
|
||||||
@@ -1420,7 +1406,7 @@ static UINT32 HWR_CreateLightTable(UINT8 *lighttable)
|
|||||||
{
|
{
|
||||||
UINT32 i, id;
|
UINT32 i, id;
|
||||||
RGBA_t *palette = HWR_GetTexturePalette();
|
RGBA_t *palette = HWR_GetTexturePalette();
|
||||||
RGBA_t *hw_lighttable = (RGBA_t *)(Z_Malloc(256 * 32 * sizeof(RGBA_t), PU_STATIC, NULL));
|
RGBA_t *hw_lighttable = static_cast<RGBA_t *>(Z_Malloc(256 * 32 * sizeof(RGBA_t), PU_STATIC, NULL));
|
||||||
|
|
||||||
// To make the palette index -> RGBA mapping easier for the shader,
|
// To make the palette index -> RGBA mapping easier for the shader,
|
||||||
// the hardware lighttable is composed of RGBA colors instead of palette indices.
|
// the hardware lighttable is composed of RGBA colors instead of palette indices.
|
||||||
@@ -54,7 +54,7 @@ struct GLMipmap_s
|
|||||||
UINT16 width, height;
|
UINT16 width, height;
|
||||||
UINT32 downloaded; // The GPU has this texture.
|
UINT32 downloaded; // The GPU has this texture.
|
||||||
|
|
||||||
struct GLMipmap_s *nextcolormap;
|
struct GLMipmap_s *nextcolormap;
|
||||||
struct GLColormap_s *colormap;
|
struct GLColormap_s *colormap;
|
||||||
};
|
};
|
||||||
typedef struct GLMipmap_s GLMipmap_t;
|
typedef struct GLMipmap_s GLMipmap_t;
|
||||||
|
|||||||
@@ -150,7 +150,7 @@ void HWR_DrawStretchyFixedPatch(patch_t *gpatch, fixed_t x, fixed_t y, fixed_t p
|
|||||||
if (!column->topdelta)
|
if (!column->topdelta)
|
||||||
{
|
{
|
||||||
const UINT8 *source = (const UINT8 *)(column) + 3;
|
const UINT8 *source = (const UINT8 *)(column) + 3;
|
||||||
HWR_DrawFill(0, 0, BASEVIDWIDTH, BASEVIDHEIGHT, source[0]);
|
HWR_DrawFill(0, 0, BASEVIDWIDTH, BASEVIDHEIGHT, (column->topdelta == 0xff ? 31 : source[0]));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -222,7 +222,7 @@ void HWR_DrawStretchyFixedPatch(patch_t *gpatch, fixed_t x, fixed_t y, fixed_t p
|
|||||||
|
|
||||||
if (alphalevel)
|
if (alphalevel)
|
||||||
{
|
{
|
||||||
FSurfaceInfo Surf = {};
|
FSurfaceInfo Surf;
|
||||||
Surf.PolyColor.s.red = Surf.PolyColor.s.green = Surf.PolyColor.s.blue = 0xff;
|
Surf.PolyColor.s.red = Surf.PolyColor.s.green = Surf.PolyColor.s.blue = 0xff;
|
||||||
|
|
||||||
switch (alphalevel)
|
switch (alphalevel)
|
||||||
@@ -302,7 +302,7 @@ void HWR_DrawCroppedPatch(patch_t *gpatch, fixed_t x, fixed_t y, fixed_t pscale,
|
|||||||
if (!column->topdelta)
|
if (!column->topdelta)
|
||||||
{
|
{
|
||||||
const UINT8 *source = (const UINT8 *)(column) + 3;
|
const UINT8 *source = (const UINT8 *)(column) + 3;
|
||||||
HWR_DrawFill(0, 0, BASEVIDWIDTH, BASEVIDHEIGHT, source[0]);
|
HWR_DrawFill(0, 0, BASEVIDWIDTH, BASEVIDHEIGHT, (column->topdelta == 0xff ? 31 : source[0]));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -385,7 +385,7 @@ void HWR_DrawCroppedPatch(patch_t *gpatch, fixed_t x, fixed_t y, fixed_t pscale,
|
|||||||
// clip it since it is used for bunny scroll in doom I
|
// clip it since it is used for bunny scroll in doom I
|
||||||
if (alphalevel)
|
if (alphalevel)
|
||||||
{
|
{
|
||||||
FSurfaceInfo Surf = {};
|
FSurfaceInfo Surf;
|
||||||
Surf.PolyColor.s.red = Surf.PolyColor.s.green = Surf.PolyColor.s.blue = 0xff;
|
Surf.PolyColor.s.red = Surf.PolyColor.s.green = Surf.PolyColor.s.blue = 0xff;
|
||||||
|
|
||||||
switch (alphalevel)
|
switch (alphalevel)
|
||||||
@@ -490,7 +490,7 @@ void HWR_DrawFlatFill(INT32 x, INT32 y, INT32 w, INT32 h, lumpnum_t flatlumpnum)
|
|||||||
void HWR_FadeScreenMenuBack(UINT16 color, UINT8 strength)
|
void HWR_FadeScreenMenuBack(UINT16 color, UINT8 strength)
|
||||||
{
|
{
|
||||||
FOutVector v[4];
|
FOutVector v[4];
|
||||||
FSurfaceInfo Surf = {};
|
FSurfaceInfo Surf;
|
||||||
FBITFIELD poly_flags = PF_NoTexture|PF_Modulated|PF_NoDepthTest;
|
FBITFIELD poly_flags = PF_NoTexture|PF_Modulated|PF_NoDepthTest;
|
||||||
|
|
||||||
v[0].x = v[3].x = -1.0f;
|
v[0].x = v[3].x = -1.0f;
|
||||||
@@ -543,7 +543,7 @@ void HWR_FadeScreenMenuBack(UINT16 color, UINT8 strength)
|
|||||||
void HWR_DrawConsoleBack(UINT32 color, INT32 height)
|
void HWR_DrawConsoleBack(UINT32 color, INT32 height)
|
||||||
{
|
{
|
||||||
FOutVector v[4];
|
FOutVector v[4];
|
||||||
FSurfaceInfo Surf = {};
|
FSurfaceInfo Surf;
|
||||||
|
|
||||||
// setup some neat-o translucency effect
|
// setup some neat-o translucency effect
|
||||||
if (!height) //cool hack 0 height is full height
|
if (!height) //cool hack 0 height is full height
|
||||||
@@ -598,7 +598,7 @@ void HWR_drawAMline(const fline_t *fl, INT32 color)
|
|||||||
void HWR_DrawDiag(INT32 x, INT32 y, INT32 wh, INT32 color)
|
void HWR_DrawDiag(INT32 x, INT32 y, INT32 wh, INT32 color)
|
||||||
{
|
{
|
||||||
FOutVector v[4];
|
FOutVector v[4];
|
||||||
FSurfaceInfo Surf = {};
|
FSurfaceInfo Surf;
|
||||||
float fx, fy, fw, fh, fwait = 0;
|
float fx, fy, fw, fh, fwait = 0;
|
||||||
RGBA_t *palette;
|
RGBA_t *palette;
|
||||||
|
|
||||||
@@ -702,7 +702,7 @@ void HWR_DrawDiag(INT32 x, INT32 y, INT32 wh, INT32 color)
|
|||||||
void HWR_DrawConsoleFill(INT32 x, INT32 y, INT32 w, INT32 h, UINT32 color, INT32 options)
|
void HWR_DrawConsoleFill(INT32 x, INT32 y, INT32 w, INT32 h, UINT32 color, INT32 options)
|
||||||
{
|
{
|
||||||
FOutVector v[4];
|
FOutVector v[4];
|
||||||
FSurfaceInfo Surf = {};
|
FSurfaceInfo Surf;
|
||||||
float fx, fy, fw, fh;
|
float fx, fy, fw, fh;
|
||||||
|
|
||||||
if (w < 0 || h < 0)
|
if (w < 0 || h < 0)
|
||||||
@@ -820,7 +820,7 @@ void HWR_DrawConsoleFill(INT32 x, INT32 y, INT32 w, INT32 h, UINT32 color, INT32
|
|||||||
void HWR_DrawFill(INT32 x, INT32 y, INT32 w, INT32 h, INT32 color)
|
void HWR_DrawFill(INT32 x, INT32 y, INT32 w, INT32 h, INT32 color)
|
||||||
{
|
{
|
||||||
FOutVector v[4];
|
FOutVector v[4];
|
||||||
FSurfaceInfo Surf = {};
|
FSurfaceInfo Surf;
|
||||||
float fx, fy, fw, fh;
|
float fx, fy, fw, fh;
|
||||||
|
|
||||||
if (w < 0 || h < 0)
|
if (w < 0 || h < 0)
|
||||||
|
|||||||
+92
-83
@@ -242,6 +242,7 @@ consvar_t cv_glportals = {"gr_portals", "On", CV_SAVE, CV_OnOff, NULL, 0, NULL,
|
|||||||
|
|
||||||
consvar_t cv_glpaletterendering = {"gr_paletteshader", "Off", CV_CALL|CV_SAVE, CV_OnOff, CV_glpaletterendering_OnChange, 0, NULL, NULL, 0, 0, NULL};
|
consvar_t cv_glpaletterendering = {"gr_paletteshader", "Off", CV_CALL|CV_SAVE, CV_OnOff, CV_glpaletterendering_OnChange, 0, NULL, NULL, 0, 0, NULL};
|
||||||
consvar_t cv_glpalettedepth = {"gr_palettedepth", "16 bits", CV_SAVE|CV_CALL, glpalettedepth_cons_t, CV_glpalettedepth_OnChange, 0, NULL, NULL, 0, 0, NULL};
|
consvar_t cv_glpalettedepth = {"gr_palettedepth", "16 bits", CV_SAVE|CV_CALL, glpalettedepth_cons_t, CV_glpalettedepth_OnChange, 0, NULL, NULL, 0, 0, NULL};
|
||||||
|
consvar_t cv_glflashpal = {"gr_flashpal", "On", CV_CALL|CV_SAVE, CV_OnOff, CV_glpaletterendering_OnChange, 0, NULL, NULL, 0, 0, NULL};
|
||||||
|
|
||||||
consvar_t cv_gltexturedepth = {"gr_texturedepth", "32 bits", CV_CALL|CV_SAVE, gltexdepth_cons_t, CV_gltextureformat_OnChange, 0, NULL, NULL, 0, 0, NULL};
|
consvar_t cv_gltexturedepth = {"gr_texturedepth", "32 bits", CV_CALL|CV_SAVE, gltexdepth_cons_t, CV_gltextureformat_OnChange, 0, NULL, NULL, 0, 0, NULL};
|
||||||
|
|
||||||
@@ -254,13 +255,11 @@ static void CV_screentextures_OnChange(void)
|
|||||||
{
|
{
|
||||||
if (cv_glpaletterendering.value != 0)
|
if (cv_glpaletterendering.value != 0)
|
||||||
CV_SetValue(&cv_glpaletterendering, 0);
|
CV_SetValue(&cv_glpaletterendering, 0);
|
||||||
|
|
||||||
#ifdef USE_FBO_OGL
|
#ifdef USE_FBO_OGL
|
||||||
if (cv_glframebuffer.value != 0)
|
if (cv_glframebuffer.value != 0)
|
||||||
CV_SetValue(&cv_glframebuffer, 0);
|
CV_SetValue(&cv_glframebuffer, 0);
|
||||||
#endif
|
#endif
|
||||||
// HACK: set lastdraw so intermission bg can refresh after toggling screentextures
|
|
||||||
if (gamestate == GS_INTERMISSION)
|
|
||||||
lastdraw = true;
|
|
||||||
}
|
}
|
||||||
GL_SetSpecialState(HWD_SET_SCREEN_TEXTURES, cv_glscreentextures.value);
|
GL_SetSpecialState(HWD_SET_SCREEN_TEXTURES, cv_glscreentextures.value);
|
||||||
M_UpdateOGLMenu();
|
M_UpdateOGLMenu();
|
||||||
@@ -390,11 +389,11 @@ void HWR_ObjectLightLevelPost(gl_vissprite_t *spr, const sector_t *sector, INT32
|
|||||||
extralight = FixedMul(extralight, std::min(std::max(0, *lightlevel), 255) * FRACUNIT / 255);
|
extralight = FixedMul(extralight, std::min(std::max(0, *lightlevel), 255) * FRACUNIT / 255);
|
||||||
|
|
||||||
// simple OGL approximation
|
// simple OGL approximation
|
||||||
const fixed_t tr = R_QuickCamDist(spr->mobj->x, spr->mobj->y);
|
fixed_t tr = R_QuickCamDist(spr->mobj->x, spr->mobj->y);
|
||||||
const fixed_t xscale = FixedDiv((vid.width / 2) << FRACBITS, tr);
|
fixed_t xscale = FixedDiv((vid.width / 2) << FRACBITS, tr);
|
||||||
|
|
||||||
// Less change in contrast at further distances, to counteract DOOM diminished light
|
// Less change in contrast at further distances, to counteract DOOM diminished light
|
||||||
const fixed_t n = FixedDiv(FixedMul(xscale, LIGHTRESOLUTIONFIX), ((MAXLIGHTSCALE-1) << LIGHTSCALESHIFT));
|
fixed_t n = FixedDiv(FixedMul(xscale, LIGHTRESOLUTIONFIX), ((MAXLIGHTSCALE-1) << LIGHTSCALESHIFT));
|
||||||
extralight = FixedMul(extralight, std::min(n, FRACUNIT));
|
extralight = FixedMul(extralight, std::min(n, FRACUNIT));
|
||||||
|
|
||||||
// Contrast is stronger for normal sprites, stronger than wall lighting is at the same distance
|
// Contrast is stronger for normal sprites, stronger than wall lighting is at the same distance
|
||||||
@@ -517,7 +516,7 @@ static FUINT HWR_CalcWallLight(FUINT lightnum, seg_t *seg, extracolormap_t *colo
|
|||||||
|
|
||||||
if (seg != NULL && P_ApplyLightOffsetFine(lightnum, seg->frontsector))
|
if (seg != NULL && P_ApplyLightOffsetFine(lightnum, seg->frontsector))
|
||||||
{
|
{
|
||||||
const INT16 offset = (cv_glfakecontrast.value == 2) ? seg->hwLightOffset : ((INT16)seg->lightOffset * 8);
|
INT16 offset = (cv_glfakecontrast.value == 2) ? seg->hwLightOffset : ((INT16)seg->lightOffset * 8);
|
||||||
|
|
||||||
finallight += offset;
|
finallight += offset;
|
||||||
finallight = CLAMP(finallight, 0 , 255);
|
finallight = CLAMP(finallight, 0 , 255);
|
||||||
@@ -535,7 +534,7 @@ static FUINT HWR_CalcSlopeLight(FUINT lightnum, pslope_t *slope, const sector_t
|
|||||||
|
|
||||||
if (slope != NULL && sector != NULL && P_ApplyLightOffsetFine(lightnum, sector))
|
if (slope != NULL && sector != NULL && P_ApplyLightOffsetFine(lightnum, sector))
|
||||||
{
|
{
|
||||||
const INT16 offset = (cv_glfakecontrast.value == 2) ? slope->hwLightOffset : ((INT16)slope->lightOffset * 8);
|
INT16 offset = (cv_glfakecontrast.value == 2) ? slope->hwLightOffset : ((INT16)slope->lightOffset * 8);
|
||||||
|
|
||||||
finallight += (fof ? -offset : offset);
|
finallight += (fof ? -offset : offset);
|
||||||
finallight = CLAMP(finallight, 0 , 255);
|
finallight = CLAMP(finallight, 0 , 255);
|
||||||
@@ -552,7 +551,7 @@ static FUINT HWR_CalcSlopeLight(FUINT lightnum, pslope_t *slope, const sector_t
|
|||||||
// Render a floor or ceiling convex polygon
|
// Render a floor or ceiling convex polygon
|
||||||
static void HWR_RenderPlane(subsector_t *subsector, extrasubsector_t *xsub, boolean isceiling, fixed_t fixedheight, FBITFIELD PolyFlags, INT32 lightlevel, lumpnum_t lumpnum, sector_t *FOFsector, UINT8 alpha, extracolormap_t *planecolormap)
|
static void HWR_RenderPlane(subsector_t *subsector, extrasubsector_t *xsub, boolean isceiling, fixed_t fixedheight, FBITFIELD PolyFlags, INT32 lightlevel, lumpnum_t lumpnum, sector_t *FOFsector, UINT8 alpha, extracolormap_t *planecolormap)
|
||||||
{
|
{
|
||||||
FSurfaceInfo Surf = {};
|
FSurfaceInfo Surf;
|
||||||
FOutVector *v3d;
|
FOutVector *v3d;
|
||||||
polyvertex_t *pv;
|
polyvertex_t *pv;
|
||||||
pslope_t *slope = NULL;
|
pslope_t *slope = NULL;
|
||||||
@@ -1377,7 +1376,7 @@ void HWR_ProcessSeg(void) // Sort of like GLWall::Process in GZDoom
|
|||||||
extracolormap_t *colormap = gl_frontsector->extra_colormap;
|
extracolormap_t *colormap = gl_frontsector->extra_colormap;
|
||||||
lightnum = HWR_CalcWallLight(lightnum, gl_curline, colormap);
|
lightnum = HWR_CalcWallLight(lightnum, gl_curline, colormap);
|
||||||
|
|
||||||
FSurfaceInfo Surf = {};
|
FSurfaceInfo Surf;
|
||||||
|
|
||||||
Surf.PolyColor.s.alpha = 255;
|
Surf.PolyColor.s.alpha = 255;
|
||||||
|
|
||||||
@@ -1422,11 +1421,6 @@ void HWR_ProcessSeg(void) // Sort of like GLWall::Process in GZDoom
|
|||||||
{
|
{
|
||||||
draw_sky_walls(0, 1, worldhigh, worldhighslope);
|
draw_sky_walls(0, 1, worldhigh, worldhighslope);
|
||||||
}
|
}
|
||||||
|
|
||||||
// hack to allow height changes in outdoor areas
|
|
||||||
// This is what gets rid of the upper textures if there should be sky
|
|
||||||
worldtop = worldhigh;
|
|
||||||
worldtopslope = worldhighslope;
|
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
@@ -1471,6 +1465,15 @@ void HWR_ProcessSeg(void) // Sort of like GLWall::Process in GZDoom
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// hack to allow height changes in outdoor areas
|
||||||
|
// This is what gets rid of the upper textures if there should be sky
|
||||||
|
if (gl_frontsector->ceilingpic == skyflatnum
|
||||||
|
&& gl_backsector->ceilingpic == skyflatnum)
|
||||||
|
{
|
||||||
|
worldtop = worldhigh;
|
||||||
|
worldtopslope = worldhighslope;
|
||||||
|
}
|
||||||
|
|
||||||
gl_toptexture = R_GetTextureNum(gl_sidedef->toptexture);
|
gl_toptexture = R_GetTextureNum(gl_sidedef->toptexture);
|
||||||
|
|
||||||
// check TOP TEXTURE
|
// check TOP TEXTURE
|
||||||
@@ -2261,7 +2264,7 @@ void HWR_ProcessSeg(void) // Sort of like GLWall::Process in GZDoom
|
|||||||
|
|
||||||
static inline boolean HWR_UsePortals(void)
|
static inline boolean HWR_UsePortals(void)
|
||||||
{
|
{
|
||||||
return supportstencil && gl_maphasportals && cv_glportals.value;
|
return supportstencil && cv_glportals.value && gl_maphasportals;
|
||||||
}
|
}
|
||||||
|
|
||||||
// From PrBoom:
|
// From PrBoom:
|
||||||
@@ -2405,8 +2408,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)
|
auto do_addline = [&](bool dontdraw) {
|
||||||
{
|
|
||||||
// Single sided line?
|
// Single sided line?
|
||||||
if (!line->backsector)
|
if (!line->backsector)
|
||||||
{
|
{
|
||||||
@@ -2673,7 +2675,7 @@ static void HWR_RenderPolyObjectPlane(polyobj_t *polysector, boolean isceiling,
|
|||||||
float scrollx = 0.0f, scrolly = 0.0f;
|
float scrollx = 0.0f, scrolly = 0.0f;
|
||||||
float anglef = 0.0f, cosangf = 0.0f, sinangf = 0.0f;
|
float anglef = 0.0f, cosangf = 0.0f, sinangf = 0.0f;
|
||||||
angle_t angle = 0;
|
angle_t angle = 0;
|
||||||
FSurfaceInfo Surf = {};
|
FSurfaceInfo Surf;
|
||||||
fixed_t tempxsow, tempytow;
|
fixed_t tempxsow, tempytow;
|
||||||
size_t nrPlaneVerts;
|
size_t nrPlaneVerts;
|
||||||
|
|
||||||
@@ -2687,6 +2689,14 @@ static void HWR_RenderPolyObjectPlane(polyobj_t *polysector, boolean isceiling,
|
|||||||
if (nrPlaneVerts < 3) // not even a triangle ?
|
if (nrPlaneVerts < 3) // not even a triangle ?
|
||||||
return;
|
return;
|
||||||
|
|
||||||
|
if (nrPlaneVerts > INT16_MAX) // FIXME: exceeds plVerts size
|
||||||
|
{
|
||||||
|
CONS_Debug(DBG_RENDER, "polygon size of %s exceeds max value of %d vertices\n", sizeu1(nrPlaneVerts), UINT16_MAX);
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
const sector_t *sec = FOFsector ? FOFsector : gl_frontsector;
|
||||||
|
|
||||||
// Allocate plane-vertex buffer if we need to
|
// Allocate plane-vertex buffer if we need to
|
||||||
if (!planeVerts || nrPlaneVerts > numAllocedPlaneVerts)
|
if (!planeVerts || nrPlaneVerts > numAllocedPlaneVerts)
|
||||||
{
|
{
|
||||||
@@ -2695,8 +2705,6 @@ static void HWR_RenderPolyObjectPlane(polyobj_t *polysector, boolean isceiling,
|
|||||||
Z_Malloc(numAllocedPlaneVerts * sizeof(FOutVector), PU_LEVEL, &planeVerts);
|
Z_Malloc(numAllocedPlaneVerts * sizeof(FOutVector), PU_LEVEL, &planeVerts);
|
||||||
}
|
}
|
||||||
|
|
||||||
const sector_t *sec = FOFsector ? FOFsector : gl_frontsector;
|
|
||||||
|
|
||||||
height = FixedToFloat(fixedheight);
|
height = FixedToFloat(fixedheight);
|
||||||
|
|
||||||
len = W_LumpLength(lumpnum);
|
len = W_LumpLength(lumpnum);
|
||||||
@@ -2834,8 +2842,9 @@ static void HWR_AddPolyObjectPlanes(void)
|
|||||||
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;
|
||||||
FBITFIELD blendmode;
|
FBITFIELD blendmode;
|
||||||
|
memset(&Surf, 0x00, sizeof(Surf));
|
||||||
blendmode = HWR_TranstableToAlpha(po_ptrs[i]->translucency, &Surf);
|
blendmode = HWR_TranstableToAlpha(po_ptrs[i]->translucency, &Surf);
|
||||||
HWR_AddTransparentPolyobjectFloor(levelflats[polyobjsector->floorpic].lumpnum, po_ptrs[i], false, polyobjsector->floorheight,
|
HWR_AddTransparentPolyobjectFloor(levelflats[polyobjsector->floorpic].lumpnum, po_ptrs[i], false, polyobjsector->floorheight,
|
||||||
(light == -1 ? gl_frontsector->lightlevel : *gl_frontsector->lightlist[light].lightlevel), Surf.PolyColor.s.alpha, polyobjsector, blendmode, (light == -1 ? gl_frontsector->extra_colormap : gl_frontsector->lightlist[light].extra_colormap));
|
(light == -1 ? gl_frontsector->lightlevel : *gl_frontsector->lightlist[light].lightlevel), Surf.PolyColor.s.alpha, polyobjsector, blendmode, (light == -1 ? gl_frontsector->extra_colormap : gl_frontsector->lightlist[light].extra_colormap));
|
||||||
@@ -2856,8 +2865,9 @@ static void HWR_AddPolyObjectPlanes(void)
|
|||||||
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;
|
||||||
FBITFIELD blendmode;
|
FBITFIELD blendmode;
|
||||||
|
memset(&Surf, 0x00, sizeof(Surf));
|
||||||
blendmode = HWR_TranstableToAlpha(po_ptrs[i]->translucency, &Surf);
|
blendmode = HWR_TranstableToAlpha(po_ptrs[i]->translucency, &Surf);
|
||||||
HWR_AddTransparentPolyobjectFloor(levelflats[polyobjsector->ceilingpic].lumpnum, po_ptrs[i], true, polyobjsector->ceilingheight,
|
HWR_AddTransparentPolyobjectFloor(levelflats[polyobjsector->ceilingpic].lumpnum, po_ptrs[i], true, polyobjsector->ceilingheight,
|
||||||
(light == -1 ? gl_frontsector->lightlevel : *gl_frontsector->lightlist[light].lightlevel), Surf.PolyColor.s.alpha, polyobjsector, blendmode, (light == -1 ? gl_frontsector->extra_colormap : gl_frontsector->lightlist[light].extra_colormap));
|
(light == -1 ? gl_frontsector->lightlevel : *gl_frontsector->lightlist[light].lightlevel), Surf.PolyColor.s.alpha, polyobjsector, blendmode, (light == -1 ? gl_frontsector->extra_colormap : gl_frontsector->lightlist[light].extra_colormap));
|
||||||
@@ -3409,7 +3419,7 @@ static void HWR_DrawSpriteShadow(gl_vissprite_t *spr, patch_t *gpatch, GLPatch_t
|
|||||||
{
|
{
|
||||||
float this_scale = 1.0f;
|
float this_scale = 1.0f;
|
||||||
FOutVector swallVerts[4];
|
FOutVector swallVerts[4];
|
||||||
FSurfaceInfo sSurf = {};
|
FSurfaceInfo sSurf;
|
||||||
FBITFIELD blendmode = 0;
|
FBITFIELD blendmode = 0;
|
||||||
fixed_t floorheight, mobjfloor;
|
fixed_t floorheight, mobjfloor;
|
||||||
pslope_t *floorslope;
|
pslope_t *floorslope;
|
||||||
@@ -3645,7 +3655,7 @@ static void HWR_SplitSprite(gl_vissprite_t *spr, const boolean papersprite)
|
|||||||
FOutVector baseWallVerts[4]; // This is what the verts should end up as
|
FOutVector baseWallVerts[4]; // This is what the verts should end up as
|
||||||
patch_t *gpatch;
|
patch_t *gpatch;
|
||||||
GLPatch_t *hwrpatch;
|
GLPatch_t *hwrpatch;
|
||||||
FSurfaceInfo Surf = {};
|
FSurfaceInfo Surf;
|
||||||
extracolormap_t *colormap;
|
extracolormap_t *colormap;
|
||||||
INT32 lightlevel;
|
INT32 lightlevel;
|
||||||
boolean lightset = true;
|
boolean lightset = true;
|
||||||
@@ -3674,7 +3684,7 @@ static void HWR_SplitSprite(gl_vissprite_t *spr, const boolean papersprite)
|
|||||||
//Hurdler: 25/04/2000: now support colormap in hardware mode
|
//Hurdler: 25/04/2000: now support colormap in hardware mode
|
||||||
HWR_GetMappedPatch(gpatch, spr->colormap);
|
HWR_GetMappedPatch(gpatch, spr->colormap);
|
||||||
|
|
||||||
hwrpatch = static_cast<GLPatch_t *>(gpatch->hardware);
|
hwrpatch = ((GLPatch_t *)gpatch->hardware);
|
||||||
|
|
||||||
// Draw shadow BEFORE sprite
|
// Draw shadow BEFORE sprite
|
||||||
if (UNLIKELY(cv_shadow.value // Shadows enabled
|
if (UNLIKELY(cv_shadow.value // Shadows enabled
|
||||||
@@ -3776,10 +3786,10 @@ static void HWR_SplitSprite(gl_vissprite_t *spr, const boolean papersprite)
|
|||||||
{
|
{
|
||||||
// make hyu´d players translucent with reducevfx, could be done better, but im lazy as crap
|
// make hyu´d players translucent with reducevfx, could be done better, but im lazy as crap
|
||||||
if (cv_reducevfx.value && sprmo->player->kartstuff[k_hyudorotimer] > 0)
|
if (cv_reducevfx.value && sprmo->player->kartstuff[k_hyudorotimer] > 0)
|
||||||
Surf.PolyColor.s.alpha = static_cast<UINT8>(FixedMul(FRACUNIT/2, static_cast<fixed_t>(Surf.PolyColor.s.alpha)));
|
Surf.PolyColor.s.alpha = FixedMul(FRACUNIT/2, Surf.PolyColor.s.alpha);
|
||||||
|
|
||||||
if (cv_playerfade.value)
|
if (cv_playerfade.value)
|
||||||
Surf.PolyColor.s.alpha = static_cast<UINT8>(FixedMul(R_DoPlayerFade(sprmo), static_cast<fixed_t>(Surf.PolyColor.s.alpha)));
|
Surf.PolyColor.s.alpha = FixedMul(R_DoPlayerFade(sprmo), Surf.PolyColor.s.alpha);
|
||||||
}
|
}
|
||||||
|
|
||||||
if (HWR_UseShader())
|
if (HWR_UseShader())
|
||||||
@@ -3864,7 +3874,7 @@ static void HWR_SplitSprite(gl_vissprite_t *spr, const boolean papersprite)
|
|||||||
wallVerts[1].y = endbot;
|
wallVerts[1].y = endbot;
|
||||||
|
|
||||||
// The x and y only need to be adjusted in the case that it's not a papersprite
|
// The x and y only need to be adjusted in the case that it's not a papersprite
|
||||||
if (cv_glspritebillboarding.value && !papersprite)
|
if (cv_glspritebillboarding.value && sprmo && !papersprite)
|
||||||
{
|
{
|
||||||
// Get the x and z of the vertices so billboarding draws correctly
|
// Get the x and z of the vertices so billboarding draws correctly
|
||||||
realheight = realbot - realtop;
|
realheight = realbot - realtop;
|
||||||
@@ -3930,7 +3940,7 @@ static void HWR_DrawSprite(gl_vissprite_t *spr)
|
|||||||
FOutVector wallVerts[4];
|
FOutVector wallVerts[4];
|
||||||
patch_t *gpatch; // sprite patch converted to hardware
|
patch_t *gpatch; // sprite patch converted to hardware
|
||||||
GLPatch_t *hwrpatch;
|
GLPatch_t *hwrpatch;
|
||||||
FSurfaceInfo Surf = {};
|
FSurfaceInfo Surf;
|
||||||
FBITFIELD blend = 0;
|
FBITFIELD blend = 0;
|
||||||
|
|
||||||
INT32 shader = SHADER_NONE;
|
INT32 shader = SHADER_NONE;
|
||||||
@@ -3962,7 +3972,7 @@ static void HWR_DrawSprite(gl_vissprite_t *spr)
|
|||||||
//Hurdler: 25/04/2000: now support colormap in hardware mode
|
//Hurdler: 25/04/2000: now support colormap in hardware mode
|
||||||
HWR_GetMappedPatch(gpatch, spr->colormap);
|
HWR_GetMappedPatch(gpatch, spr->colormap);
|
||||||
|
|
||||||
hwrpatch = static_cast<GLPatch_t *>(gpatch->hardware);
|
hwrpatch = ((GLPatch_t *)gpatch->hardware);
|
||||||
|
|
||||||
// create the sprite billboard
|
// create the sprite billboard
|
||||||
//
|
//
|
||||||
@@ -4073,10 +4083,10 @@ static void HWR_DrawSprite(gl_vissprite_t *spr)
|
|||||||
{
|
{
|
||||||
// make hyu´d players translucent with reducevfx, could be done better, but im lazy as crap
|
// make hyu´d players translucent with reducevfx, could be done better, but im lazy as crap
|
||||||
if (cv_reducevfx.value && sprmo->player->kartstuff[k_hyudorotimer] > 0)
|
if (cv_reducevfx.value && sprmo->player->kartstuff[k_hyudorotimer] > 0)
|
||||||
Surf.PolyColor.s.alpha = static_cast<UINT8>(FixedMul(FRACUNIT/2, static_cast<fixed_t>(Surf.PolyColor.s.alpha)));
|
Surf.PolyColor.s.alpha = FixedMul(FRACUNIT/2, Surf.PolyColor.s.alpha);
|
||||||
|
|
||||||
if (cv_playerfade.value)
|
if (cv_playerfade.value)
|
||||||
Surf.PolyColor.s.alpha = static_cast<UINT8>(FixedMul(R_DoPlayerFade(sprmo), static_cast<fixed_t>(Surf.PolyColor.s.alpha)));
|
Surf.PolyColor.s.alpha = FixedMul(R_DoPlayerFade(sprmo), Surf.PolyColor.s.alpha);
|
||||||
}
|
}
|
||||||
|
|
||||||
if (HWR_UseShader())
|
if (HWR_UseShader())
|
||||||
@@ -4095,7 +4105,7 @@ static void HWR_DrawPrecipitationSprite(gl_vissprite_t *spr)
|
|||||||
FOutVector wallVerts[4];
|
FOutVector wallVerts[4];
|
||||||
patch_t *gpatch; // sprite patch converted to hardware
|
patch_t *gpatch; // sprite patch converted to hardware
|
||||||
GLPatch_t *hwrpatch;
|
GLPatch_t *hwrpatch;
|
||||||
FSurfaceInfo Surf = {};
|
FSurfaceInfo Surf;
|
||||||
|
|
||||||
INT32 shader = SHADER_NONE;
|
INT32 shader = SHADER_NONE;
|
||||||
|
|
||||||
@@ -4112,7 +4122,7 @@ static void HWR_DrawPrecipitationSprite(gl_vissprite_t *spr)
|
|||||||
//Hurdler: 25/04/2000: now support colormap in hardware mode
|
//Hurdler: 25/04/2000: now support colormap in hardware mode
|
||||||
HWR_GetMappedPatch(gpatch, spr->colormap);
|
HWR_GetMappedPatch(gpatch, spr->colormap);
|
||||||
|
|
||||||
hwrpatch = static_cast<GLPatch_t *>(gpatch->hardware);
|
hwrpatch = ((GLPatch_t *)gpatch->hardware);
|
||||||
|
|
||||||
// create the sprite billboard
|
// create the sprite billboard
|
||||||
//
|
//
|
||||||
@@ -4503,6 +4513,7 @@ static void HWR_RenderDrawNodes(void)
|
|||||||
drawnodes.clear(); // clear so our size is 0 again!
|
drawnodes.clear(); // clear so our size is 0 again!
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
// --------------------------------------------------------------------------
|
// --------------------------------------------------------------------------
|
||||||
// Draw all vissprites
|
// Draw all vissprites
|
||||||
// --------------------------------------------------------------------------
|
// --------------------------------------------------------------------------
|
||||||
@@ -4839,7 +4850,7 @@ static void HWR_ProjectSprite(mobj_t *thing)
|
|||||||
flip = sprframe->flip; // Will only be 0x00 or 0xFF
|
flip = sprframe->flip; // Will only be 0x00 or 0xFF
|
||||||
|
|
||||||
if (papersprite && ang < ANGLE_180)
|
if (papersprite && ang < ANGLE_180)
|
||||||
flip ^= 0xFF;
|
flip ^= 0xFFFF;
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
@@ -5902,6 +5913,7 @@ void HWR_AddCommands(void)
|
|||||||
|
|
||||||
CV_RegisterVar(&cv_glpaletterendering);
|
CV_RegisterVar(&cv_glpaletterendering);
|
||||||
CV_RegisterVar(&cv_glpalettedepth);
|
CV_RegisterVar(&cv_glpalettedepth);
|
||||||
|
CV_RegisterVar(&cv_glflashpal);
|
||||||
}
|
}
|
||||||
|
|
||||||
// --------------------------------------------------------------------------
|
// --------------------------------------------------------------------------
|
||||||
@@ -5981,7 +5993,7 @@ static void COM_HWR_glinfo(void)
|
|||||||
// if the GPU is super new and supports a bajillion extensions - xyzzy
|
// if the GPU is super new and supports a bajillion extensions - xyzzy
|
||||||
|
|
||||||
char *copy = strdup((const char*)gl_extensions);
|
char *copy = strdup((const char*)gl_extensions);
|
||||||
char *ext;
|
char *ext = strtok(copy, " ");
|
||||||
|
|
||||||
if (copy == NULL)
|
if (copy == NULL)
|
||||||
{
|
{
|
||||||
@@ -5989,8 +6001,6 @@ static void COM_HWR_glinfo(void)
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
ext = strtok(copy, " ");
|
|
||||||
|
|
||||||
do
|
do
|
||||||
{
|
{
|
||||||
CONS_Printf(" - %s\n", ext);
|
CONS_Printf(" - %s\n", ext);
|
||||||
@@ -6060,7 +6070,7 @@ static void HWR_DoPostProcessor(void)
|
|||||||
{
|
{
|
||||||
// Armageddon Blast Flash!
|
// Armageddon Blast Flash!
|
||||||
// Could this even be considered postprocessor?
|
// Could this even be considered postprocessor?
|
||||||
if (!HWR_ShouldUsePaletteRendering())
|
if (!HWR_PalRenderFlashpal())
|
||||||
{
|
{
|
||||||
const player_t *player = &players[displayplayers[viewssnum]];
|
const player_t *player = &players[displayplayers[viewssnum]];
|
||||||
|
|
||||||
@@ -6073,7 +6083,7 @@ static void HWR_DoPostProcessor(void)
|
|||||||
{-4.0f, -4.0f, 4.0f, 0.0f, 0.0f}
|
{-4.0f, -4.0f, 4.0f, 0.0f, 0.0f}
|
||||||
};
|
};
|
||||||
|
|
||||||
FSurfaceInfo Surf = {};
|
FSurfaceInfo Surf;
|
||||||
|
|
||||||
// This won't change if the flash palettes are changed unfortunately, but it works for its purpose
|
// This won't change if the flash palettes are changed unfortunately, but it works for its purpose
|
||||||
if (player->flashpal == PAL_NUKE)
|
if (player->flashpal == PAL_NUKE)
|
||||||
@@ -6095,62 +6105,61 @@ static void HWR_DoPostProcessor(void)
|
|||||||
if (cv_glscreentextures.value != 2) // screen textures are needed for the rest of the effects
|
if (cv_glscreentextures.value != 2) // screen textures are needed for the rest of the effects
|
||||||
return;
|
return;
|
||||||
|
|
||||||
// Not supported in splitscreen - someone want to add support?
|
//UINT8 viewnum = R_GetViewNumber(); // see below
|
||||||
if (splitscreen || cv_reducevfx.value)
|
|
||||||
return;
|
|
||||||
|
|
||||||
//UINT8 viewnum = R_GetViewNumber();
|
|
||||||
//camera_t *thiscam = &camera[viewnum];
|
//camera_t *thiscam = &camera[viewnum];
|
||||||
const camera_t *thiscam = &camera[0];
|
const camera_t *thiscam = &camera[0];
|
||||||
|
|
||||||
if (!(thiscam->postimg & POSTIMG_WATER || thiscam->postimg & POSTIMG_HEAT))
|
// Not supported in splitscreen - someone want to add support?
|
||||||
return;
|
const boolean screenwave = (!splitscreen && !cv_reducevfx.value && (thiscam->postimg & POSTIMG_WATER || thiscam->postimg & POSTIMG_HEAT));
|
||||||
|
|
||||||
// Capture the screen for intermission and screen waving
|
// Capture the screen for intermission and screen waving
|
||||||
if (gamestate != GS_INTERMISSION)
|
if ((lastdraw || screenwave) && gamestate != GS_INTERMISSION)
|
||||||
GL_MakeScreenTexture(HWD_SCREENTEXTURE_GENERIC1);
|
GL_MakeScreenTexture(HWD_SCREENTEXTURE_GENERIC1);
|
||||||
|
|
||||||
// Drunken vision! WooOOooo~
|
// Drunken vision! WooOOooo~
|
||||||
// 10 by 10 grid. 2 coordinates (xy)
|
if (screenwave)
|
||||||
float v[SCREENVERTS][SCREENVERTS][2];
|
|
||||||
float disStart = (leveltime-1) + FixedToFloat(R_GetTimeFrac(RTF_LEVEL));
|
|
||||||
|
|
||||||
UINT8 x, y;
|
|
||||||
float WAVELENGTH;
|
|
||||||
float AMPLITUDE;
|
|
||||||
float FREQUENCY;
|
|
||||||
|
|
||||||
// Modifies the wave.
|
|
||||||
if (thiscam->postimg & POSTIMG_WATER)
|
|
||||||
{
|
{
|
||||||
WAVELENGTH = 5.0f;
|
// 10 by 10 grid. 2 coordinates (xy)
|
||||||
AMPLITUDE = 40.0f;
|
float v[SCREENVERTS][SCREENVERTS][2];
|
||||||
FREQUENCY = 8.0f;
|
float disStart = (leveltime-1) + FixedToFloat(R_GetTimeFrac(RTF_LEVEL));
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
WAVELENGTH = 10.0f;
|
|
||||||
AMPLITUDE = 60.0f;
|
|
||||||
FREQUENCY = 4.0f;
|
|
||||||
}
|
|
||||||
|
|
||||||
//static constexpr float scale = ((float)SCREENVERTS - 1.0f) / 9.0f; // well this evals to just 1.0f and what is x / 1? kek
|
UINT8 x, y;
|
||||||
|
float WAVELENGTH;
|
||||||
|
float AMPLITUDE;
|
||||||
|
float FREQUENCY;
|
||||||
|
|
||||||
for (x = 0; x < SCREENVERTS; x++)
|
// Modifies the wave.
|
||||||
{
|
if (thiscam->postimg & POSTIMG_WATER)
|
||||||
for (y = 0; y < SCREENVERTS; y++)
|
|
||||||
{
|
{
|
||||||
// Change X position based on its Y position.
|
WAVELENGTH = 5.0f;
|
||||||
v[x][y][0] = x-4.5f + sinf(((disStart+(static_cast<float>(y) * WAVELENGTH)) / FREQUENCY)) / AMPLITUDE; // (x / scale)
|
AMPLITUDE = 40.0f;
|
||||||
v[x][y][1] = y-4.5f; // (y / scale)
|
FREQUENCY = 8.0f;
|
||||||
}
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
WAVELENGTH = 10.0f;
|
||||||
|
AMPLITUDE = 60.0f;
|
||||||
|
FREQUENCY = 4.0f;
|
||||||
|
}
|
||||||
|
|
||||||
|
//static constexpr float scale = ((float)SCREENVERTS - 1.0f) / 9.0f; // well this evals to just 1.0f and what is x / 1? kek
|
||||||
|
|
||||||
|
for (x = 0; x < SCREENVERTS; x++)
|
||||||
|
{
|
||||||
|
for (y = 0; y < SCREENVERTS; y++)
|
||||||
|
{
|
||||||
|
// Change X position based on its Y position.
|
||||||
|
v[x][y][0] = x-4.5f + sinf(((disStart+(static_cast<float>(y) * WAVELENGTH)) / FREQUENCY)) / AMPLITUDE; // (x / scale)
|
||||||
|
v[x][y][1] = y-4.5f; // (y / scale)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
GL_PostImgRedraw(v);
|
||||||
|
|
||||||
|
// Capture the screen again for screen waving on the intermission
|
||||||
|
if (gamestate != GS_INTERMISSION)
|
||||||
|
GL_MakeScreenTexture(HWD_SCREENTEXTURE_GENERIC1);
|
||||||
}
|
}
|
||||||
|
|
||||||
GL_PostImgRedraw(v);
|
|
||||||
|
|
||||||
// Capture the screen again for screen waving on the intermission
|
|
||||||
if (gamestate != GS_INTERMISSION)
|
|
||||||
GL_MakeScreenTexture(HWD_SCREENTEXTURE_GENERIC1);
|
|
||||||
// Flipping of the screen isn't done here anymore
|
// Flipping of the screen isn't done here anymore
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -151,11 +151,6 @@ FUNCINLINE static ATTRINLINE void HWR_RenderVhsEffect(fixed_t upbary, fixed_t do
|
|||||||
GL_RenderVhsEffect(upbary, downbary, updistort, downdistort, barsize);
|
GL_RenderVhsEffect(upbary, downbary, updistort, downdistort, barsize);
|
||||||
}
|
}
|
||||||
|
|
||||||
FUNCINLINE static ATTRINLINE void HWR_MakeScreenTexture(void)
|
|
||||||
{
|
|
||||||
GL_MakeScreenTexture(HWD_SCREENTEXTURE_GENERIC1);
|
|
||||||
}
|
|
||||||
|
|
||||||
FUNCINLINE static ATTRINLINE void HWR_MakeScreenFinalTexture(void)
|
FUNCINLINE static ATTRINLINE void HWR_MakeScreenFinalTexture(void)
|
||||||
{
|
{
|
||||||
GL_MakeScreenTexture(HWD_SCREENTEXTURE_GENERIC2);
|
GL_MakeScreenTexture(HWD_SCREENTEXTURE_GENERIC2);
|
||||||
@@ -213,6 +208,7 @@ extern consvar_t cv_glportals;
|
|||||||
|
|
||||||
extern consvar_t cv_glpaletterendering;
|
extern consvar_t cv_glpaletterendering;
|
||||||
extern consvar_t cv_glpalettedepth;
|
extern consvar_t cv_glpalettedepth;
|
||||||
|
extern consvar_t cv_glflashpal;
|
||||||
|
|
||||||
FUNCINLINE static ATTRINLINE boolean HWR_UseShader(void)
|
FUNCINLINE static ATTRINLINE boolean HWR_UseShader(void)
|
||||||
{
|
{
|
||||||
@@ -224,6 +220,11 @@ FUNCINLINE static ATTRINLINE boolean HWR_ShouldUsePaletteRendering(void)
|
|||||||
return (cv_glpaletterendering.value && (pLocalPalette != NULL) && HWR_UseShader());
|
return (cv_glpaletterendering.value && (pLocalPalette != NULL) && HWR_UseShader());
|
||||||
}
|
}
|
||||||
|
|
||||||
|
FUNCINLINE static ATTRINLINE boolean HWR_PalRenderFlashpal(void)
|
||||||
|
{
|
||||||
|
return (cv_glflashpal.value && HWR_ShouldUsePaletteRendering());
|
||||||
|
}
|
||||||
|
|
||||||
// Returns a pointer to the palette which should be used for caching textures.
|
// Returns a pointer to the palette which should be used for caching textures.
|
||||||
FUNCINLINE static ATTRINLINE RGBA_t *HWR_GetTexturePalette(void)
|
FUNCINLINE static ATTRINLINE RGBA_t *HWR_GetTexturePalette(void)
|
||||||
{
|
{
|
||||||
|
|||||||
@@ -1099,7 +1099,7 @@ void HWR_DrawMD2(gl_vissprite_t *spr)
|
|||||||
INT32 frame = 0;
|
INT32 frame = 0;
|
||||||
INT32 nextFrame = -1;
|
INT32 nextFrame = -1;
|
||||||
FTransform p;
|
FTransform p;
|
||||||
FSurfaceInfo Surf = {};
|
FSurfaceInfo Surf;
|
||||||
|
|
||||||
if (!cv_glmdls.value || spr->precip)
|
if (!cv_glmdls.value || spr->precip)
|
||||||
return;
|
return;
|
||||||
@@ -1336,8 +1336,8 @@ void HWR_DrawMD2(gl_vissprite_t *spr)
|
|||||||
if (spr->mobj->frame & FF_ANIMATE)
|
if (spr->mobj->frame & FF_ANIMATE)
|
||||||
{
|
{
|
||||||
// set duration and tics to be the correct values for FF_ANIMATE states
|
// set duration and tics to be the correct values for FF_ANIMATE states
|
||||||
durs = spr->mobj->state->var2;
|
durs = (float)spr->mobj->state->var2;
|
||||||
tics = (INT32)spr->mobj->anim_duration;
|
tics = (float)spr->mobj->anim_duration;
|
||||||
}
|
}
|
||||||
|
|
||||||
//FIXME: this is not yet correct
|
//FIXME: this is not yet correct
|
||||||
@@ -1475,7 +1475,7 @@ void HWR_Draw2DModel(md2_t *md2, INT32 x, INT32 y, INT32 skinnum, skincolors_t c
|
|||||||
patch_t *gpatch, *blendgpatch;
|
patch_t *gpatch, *blendgpatch;
|
||||||
GLPatch_t *hwrPatch = NULL, *hwrBlendPatch = NULL;
|
GLPatch_t *hwrPatch = NULL, *hwrBlendPatch = NULL;
|
||||||
FTransform p;
|
FTransform p;
|
||||||
FSurfaceInfo Surf = {};
|
FSurfaceInfo Surf;
|
||||||
|
|
||||||
if (!md2->model)
|
if (!md2->model)
|
||||||
{
|
{
|
||||||
@@ -1526,6 +1526,7 @@ void HWR_Draw2DModel(md2_t *md2, INT32 x, INT32 y, INT32 skinnum, skincolors_t c
|
|||||||
if (blendgpatch)
|
if (blendgpatch)
|
||||||
hwrBlendPatch = ((GLPatch_t *)blendgpatch->hardware);
|
hwrBlendPatch = ((GLPatch_t *)blendgpatch->hardware);
|
||||||
|
|
||||||
|
memset(&Surf, 0x00, sizeof(FSurfaceInfo));
|
||||||
Surf.PolyColor.rgba = 0xFFFFFFFF;
|
Surf.PolyColor.rgba = 0xFFFFFFFF;
|
||||||
Surf.PolyFlags = PF_Occlude | PF_Modulated;
|
Surf.PolyFlags = PF_Occlude | PF_Modulated;
|
||||||
|
|
||||||
|
|||||||
@@ -109,7 +109,7 @@ boolean HWR_InitShaders(void)
|
|||||||
// returns INT32_MAX if not found
|
// returns INT32_MAX if not found
|
||||||
static INT32 strstr_int(const char *str1, const char *str2)
|
static INT32 strstr_int(const char *str1, const char *str2)
|
||||||
{
|
{
|
||||||
gconst char *location = strstr(str1, str2);
|
char *location = strstr(str1, str2);
|
||||||
if (location)
|
if (location)
|
||||||
return location - str1;
|
return location - str1;
|
||||||
else
|
else
|
||||||
@@ -365,17 +365,13 @@ static void HWR_CompileShader(int index)
|
|||||||
if (vertex_source)
|
if (vertex_source)
|
||||||
{
|
{
|
||||||
char *preprocessed = HWR_PreprocessShader(vertex_source);
|
char *preprocessed = HWR_PreprocessShader(vertex_source);
|
||||||
if (!preprocessed)
|
if (!preprocessed) return;
|
||||||
return;
|
|
||||||
|
|
||||||
GL_LoadShader(index, preprocessed, HWD_SHADERSTAGE_VERTEX);
|
GL_LoadShader(index, preprocessed, HWD_SHADERSTAGE_VERTEX);
|
||||||
}
|
}
|
||||||
if (fragment_source)
|
if (fragment_source)
|
||||||
{
|
{
|
||||||
char *preprocessed = HWR_PreprocessShader(fragment_source);
|
char *preprocessed = HWR_PreprocessShader(fragment_source);
|
||||||
if (!preprocessed)
|
if (!preprocessed) return;
|
||||||
return;
|
|
||||||
|
|
||||||
GL_LoadShader(index, preprocessed, HWD_SHADERSTAGE_FRAGMENT);
|
GL_LoadShader(index, preprocessed, HWD_SHADERSTAGE_FRAGMENT);
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -391,10 +387,8 @@ void HWR_CompileShaders(void)
|
|||||||
{
|
{
|
||||||
int custom_index = gl_shadertargets[i].custom_shader;
|
int custom_index = gl_shadertargets[i].custom_shader;
|
||||||
HWR_CompileShader(i);
|
HWR_CompileShader(i);
|
||||||
|
|
||||||
if (!gl_shaders[i].compiled)
|
if (!gl_shaders[i].compiled)
|
||||||
CONS_Alert(CONS_ERROR, "HWR_CompileShaders: Compilation failed for base %s shader!\n", shaderxlat[i].type);
|
CONS_Alert(CONS_ERROR, "HWR_CompileShaders: Compilation failed for base %s shader!\n", shaderxlat[i].type);
|
||||||
|
|
||||||
if (custom_index != -1)
|
if (custom_index != -1)
|
||||||
{
|
{
|
||||||
HWR_CompileShader(custom_index);
|
HWR_CompileShader(custom_index);
|
||||||
|
|||||||
@@ -78,23 +78,33 @@
|
|||||||
// 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.
|
||||||
#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 endResolutionx = scr_resolution.x;\n" \
|
||||||
"patscale = max(floor(patscale + 0.5), 1.0);\n" \
|
"float endResolutiony = scr_resolution.y;\n" \
|
||||||
"patscale = 1.0 / patscale;\n" \
|
"if (scr_resolution.x > 1280.0) {\n" \
|
||||||
"ivec2 p = ivec2(mod(floor(position * patscale), 4.0));\n" \
|
"endResolutionx = scr_resolution.x * 0.5;\n" \
|
||||||
"float depthfactor = clamp((z - 192.0) / (6144.0 - 192.0), 0.0, 1.0);\n" \
|
"}\n" \
|
||||||
|
"if (scr_resolution.y > 720.0) {\n" \
|
||||||
|
"endResolutiony = scr_resolution.y * 0.5;\n" \
|
||||||
|
"}\n" \
|
||||||
|
"float zFactor = clamp((z - 192.0) / (6144.0 - 192.0), 0.0, 1.0);\n" \
|
||||||
|
"int scaleFactor = int(mix(1.0, 8.0, zFactor));\n" \
|
||||||
|
"endResolutionx = endResolutionx * scaleFactor;\n" \
|
||||||
|
"endResolutiony = endResolutiony * scaleFactor;\n" \
|
||||||
|
"vec2 normalizedPosition = position * vec2(endResolutionx / scr_resolution.x, endResolutiony / scr_resolution.y);\n" \
|
||||||
|
"int x = int(mod(normalizedPosition.x, 4.0));\n" \
|
||||||
|
"int y = int(mod(normalizedPosition.y, 4.0));\n" \
|
||||||
"float bayerMatrix[4*4] = float[4*4](\n" \
|
"float bayerMatrix[4*4] = float[4*4](\n" \
|
||||||
"0.0, 8.0, 2.0, 10.0,\n" \
|
"0.0, 8.0, 2.0, 10.0,\n" \
|
||||||
"12.0, 4.0, 14.0, 6.0,\n" \
|
"12.0, 4.0, 14.0, 6.0,\n" \
|
||||||
"3.0, 11.0, 1.0, 9.0,\n" \
|
"3.0, 11.0, 1.0, 9.0,\n" \
|
||||||
"15.0, 7.0, 13.0, 5.0\n" \
|
"15.0, 7.0, 13.0, 5.0\n" \
|
||||||
");\n" \
|
");\n" \
|
||||||
"float threshold = 16.0;\n" \
|
|
||||||
"#ifdef SRB2_PALETTE_RENDERING\n" \
|
"#ifdef SRB2_PALETTE_RENDERING\n" \
|
||||||
"threshold = 11.0;\n" \
|
"float threshold = (1.0 - pow(zFactor, 2.0)) * (bayerMatrix[y*4 + x] / 11.0);\n" \
|
||||||
|
"#else\n" \
|
||||||
|
"float threshold = (1.0 - pow(zFactor, 2.0)) * (bayerMatrix[y*4 + x] / 16.0);\n" \
|
||||||
"#endif\n" \
|
"#endif\n" \
|
||||||
"threshold = (1.0 - pow(depthfactor, 2.0)) * (bayerMatrix[p.y*4 + p.x] / threshold);\n" \
|
"return mix(baseValue + threshold - 0.5 / 16.0, baseValue, zFactor);\n"
|
||||||
"return mix(baseValue + threshold - 0.5 / 16.0, baseValue, depthfactor);\n"
|
|
||||||
|
|
||||||
#define GLSL_DOOM_COLORMAP_NODITHER \
|
#define GLSL_DOOM_COLORMAP_NODITHER \
|
||||||
"return max(startmap * STARTMAP_FUDGE - scale * 0.5 * SCALE_FUDGE, cap);\n" \
|
"return max(startmap * STARTMAP_FUDGE - scale * 0.5 * SCALE_FUDGE, cap);\n" \
|
||||||
|
|||||||
@@ -1383,19 +1383,19 @@ void GL_Flush(void)
|
|||||||
// -----------------+
|
// -----------------+
|
||||||
INT32 GL_isExtAvailable(const char *extension, const GLubyte *start)
|
INT32 GL_isExtAvailable(const char *extension, const GLubyte *start)
|
||||||
{
|
{
|
||||||
gconst GLubyte *where, *terminator;
|
GLubyte *where, *terminator;
|
||||||
|
|
||||||
if (!extension || !start)
|
if (!extension || !start)
|
||||||
return 0;
|
return 0;
|
||||||
|
|
||||||
where = (gconst GLubyte *)strchr(extension, ' ');
|
where = (GLubyte *) strchr(extension, ' ');
|
||||||
|
|
||||||
if (where || *extension == '\0')
|
if (where || *extension == '\0')
|
||||||
return 0;
|
return 0;
|
||||||
|
|
||||||
for (;;)
|
for (;;)
|
||||||
{
|
{
|
||||||
where = (gconst GLubyte *)strstr((const char *)start, extension);
|
where = (GLubyte *) strstr((const char *) start, extension);
|
||||||
|
|
||||||
if (!where)
|
if (!where)
|
||||||
break;
|
break;
|
||||||
|
|||||||
@@ -318,7 +318,6 @@ static void
|
|||||||
HMS_end (struct HMS_buffer *buffer)
|
HMS_end (struct HMS_buffer *buffer)
|
||||||
{
|
{
|
||||||
curl_easy_cleanup(buffer->curl);
|
curl_easy_cleanup(buffer->curl);
|
||||||
free(buffer->errbuf);
|
|
||||||
free(buffer->buffer);
|
free(buffer->buffer);
|
||||||
free(buffer);
|
free(buffer);
|
||||||
}
|
}
|
||||||
|
|||||||
+74
-77
@@ -97,6 +97,7 @@ static textinput_t w_chat;
|
|||||||
static boolean headsupactive = false;
|
static boolean headsupactive = false;
|
||||||
boolean hu_showscores = false; // draw rankings
|
boolean hu_showscores = false; // draw rankings
|
||||||
static char hu_tick;
|
static char hu_tick;
|
||||||
|
static tic_t hu_emoteanim = 0;
|
||||||
emote_autocomplete_t emote_autocomplete = {0};
|
emote_autocomplete_t emote_autocomplete = {0};
|
||||||
|
|
||||||
static huddrawlist_h luahuddrawlist_scores = NULL;
|
static huddrawlist_h luahuddrawlist_scores = NULL;
|
||||||
@@ -543,8 +544,6 @@ void HU_AddChatText(const char *text, boolean playsound)
|
|||||||
HU_removeChatText_Log();
|
HU_removeChatText_Log();
|
||||||
|
|
||||||
chat_log[chat_nummsg_log] = malloc(HU_MSGBUFSIZE);
|
chat_log[chat_nummsg_log] = malloc(HU_MSGBUFSIZE);
|
||||||
if (!chat_log[chat_nummsg_log])
|
|
||||||
I_Error("HU_AddChatText: out of memory for chat log\n");
|
|
||||||
strcpy(chat_log[chat_nummsg_log], text);
|
strcpy(chat_log[chat_nummsg_log], text);
|
||||||
++chat_nummsg_log;
|
++chat_nummsg_log;
|
||||||
|
|
||||||
@@ -627,10 +626,7 @@ static void DoSayCommand(SINT8 target, size_t usedargs, UINT8 flags)
|
|||||||
// with that logic, characters 4 and 5 are our numbers:
|
// with that logic, characters 4 and 5 are our numbers:
|
||||||
const char *newmsg;
|
const char *newmsg;
|
||||||
INT32 spc = 1; // used if nodenum[1] is a space.
|
INT32 spc = 1; // used if nodenum[1] is a space.
|
||||||
CLEANUP(pfree) char *nodenum = (char*)malloc(3);
|
CLEANUP(pfree) char *nodenum = (char*) malloc(3);
|
||||||
if (!nodenum)
|
|
||||||
I_Error("DoSayCommand: out of memory for sending pm\n");
|
|
||||||
|
|
||||||
memcpy(nodenum, msg+3, 2);
|
memcpy(nodenum, msg+3, 2);
|
||||||
nodenum[2] = '\0';
|
nodenum[2] = '\0';
|
||||||
|
|
||||||
@@ -911,7 +907,7 @@ static void Got_Saycmd(const UINT8 **p, INT32 playernum)
|
|||||||
target = READSINT8(*p);
|
target = READSINT8(*p);
|
||||||
flags = READUINT8(*p);
|
flags = READUINT8(*p);
|
||||||
msg = buf;
|
msg = buf;
|
||||||
READSTRINGN(*p, msg, HU_MAXMSGLEN + 1);
|
READSTRINGL(*p, msg, HU_MAXMSGLEN + 1);
|
||||||
|
|
||||||
if ((cv_mute.value || flags & (HU_CSAY|HU_SERVER_SAY)) && playernum != serverplayer && !(IsPlayerAdmin(playernum)))
|
if ((cv_mute.value || flags & (HU_CSAY|HU_SERVER_SAY)) && playernum != serverplayer && !(IsPlayerAdmin(playernum)))
|
||||||
{
|
{
|
||||||
@@ -1099,6 +1095,7 @@ void HU_Ticker(void)
|
|||||||
return;
|
return;
|
||||||
|
|
||||||
hu_tick++;
|
hu_tick++;
|
||||||
|
hu_emoteanim++;
|
||||||
hu_tick &= 7; // currently only to blink chat input cursor
|
hu_tick &= 7; // currently only to blink chat input cursor
|
||||||
|
|
||||||
if (PLAYER1INPUTDOWN(gc_scores))
|
if (PLAYER1INPUTDOWN(gc_scores))
|
||||||
@@ -1235,9 +1232,7 @@ static void HU_SendChatMessage(void)
|
|||||||
{
|
{
|
||||||
INT32 spc = 1; // used if nodenum[1] is a space.
|
INT32 spc = 1; // used if nodenum[1] is a space.
|
||||||
const char *newmsg;
|
const char *newmsg;
|
||||||
CLEANUP(pfree) char *nodenum = (char*)malloc(3);
|
CLEANUP(pfree) char *nodenum = (char*) malloc(3);
|
||||||
if (!nodenum)
|
|
||||||
I_Error("HU_SendChatMessage: out of memory for sending pm\n");
|
|
||||||
|
|
||||||
// what we're gonna do now is check if the node exists
|
// what we're gonna do now is check if the node exists
|
||||||
// with that logic, characters 4 and 5 are our numbers:
|
// with that logic, characters 4 and 5 are our numbers:
|
||||||
@@ -1581,6 +1576,7 @@ static void HU_drawMiniChat(void)
|
|||||||
|
|
||||||
y = chaty - charheight*(msglines+1);
|
y = chaty - charheight*(msglines+1);
|
||||||
|
|
||||||
|
#ifdef NETSPLITSCREEN
|
||||||
if (splitscreen)
|
if (splitscreen)
|
||||||
{
|
{
|
||||||
y -= BASEVIDHEIGHT/2;
|
y -= BASEVIDHEIGHT/2;
|
||||||
@@ -1588,6 +1584,7 @@ static void HU_drawMiniChat(void)
|
|||||||
y += 16;
|
y += 16;
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
|
#endif
|
||||||
y -= (cv_kartspeedometer.value ? 16 : 0);
|
y -= (cv_kartspeedometer.value ? 16 : 0);
|
||||||
|
|
||||||
dx = 0;
|
dx = 0;
|
||||||
@@ -1685,15 +1682,18 @@ static void HU_drawChatLog(INT32 offset)
|
|||||||
if (chat_scroll > chat_maxscroll)
|
if (chat_scroll > chat_maxscroll)
|
||||||
chat_scroll = chat_maxscroll;
|
chat_scroll = chat_maxscroll;
|
||||||
|
|
||||||
|
#ifdef NETSPLITSCREEN
|
||||||
if (splitscreen)
|
if (splitscreen)
|
||||||
{
|
{
|
||||||
boxh = max(6, boxh/2);
|
boxh = max(6, boxh/2);
|
||||||
if (splitscreen > 1)
|
if (splitscreen > 1)
|
||||||
boxw = max(64, boxw/2);
|
boxw = max(64, boxw/2);
|
||||||
}
|
}
|
||||||
|
#endif
|
||||||
|
|
||||||
y = chaty - offset*charheight - (chat_scroll*charheight) - boxh*charheight - 12;
|
y = chaty - offset*charheight - (chat_scroll*charheight) - boxh*charheight - 12;
|
||||||
|
|
||||||
|
#ifdef NETSPLITSCREEN
|
||||||
if (splitscreen)
|
if (splitscreen)
|
||||||
{
|
{
|
||||||
y -= BASEVIDHEIGHT/2;
|
y -= BASEVIDHEIGHT/2;
|
||||||
@@ -1701,6 +1701,7 @@ static void HU_drawChatLog(INT32 offset)
|
|||||||
y += 16;
|
y += 16;
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
|
#endif
|
||||||
y -= (cv_kartspeedometer.value ? 16 : 0);
|
y -= (cv_kartspeedometer.value ? 16 : 0);
|
||||||
|
|
||||||
|
|
||||||
@@ -1809,12 +1810,12 @@ static void HU_DrawChat(void)
|
|||||||
INT32 t = 0, c = 0, y = chaty - (typelines*charheight);
|
INT32 t = 0, c = 0, y = chaty - (typelines*charheight);
|
||||||
UINT32 i = 0, saylen = strlen(w_chat_buf); // You learn new things everyday!
|
UINT32 i = 0, saylen = strlen(w_chat_buf); // You learn new things everyday!
|
||||||
INT32 cflag = 0;
|
INT32 cflag = 0;
|
||||||
INT32 pm_offset = 0; // for cases when you type emote while also doing /pm
|
|
||||||
size_t select_start = 0, select_end = 0;
|
size_t select_start = 0, select_end = 0;
|
||||||
const char *ntalk = "Say: ", *ttalk = "Team: ";
|
const char *ntalk = "Say: ", *ttalk = "Team: ";
|
||||||
const char *talk = ntalk;
|
const char *talk = ntalk;
|
||||||
const char *mute = "Chat has been muted.";
|
const char *mute = "Chat has been muted.";
|
||||||
|
|
||||||
|
#ifdef NETSPLITSCREEN
|
||||||
if (splitscreen)
|
if (splitscreen)
|
||||||
{
|
{
|
||||||
y -= BASEVIDHEIGHT/2;
|
y -= BASEVIDHEIGHT/2;
|
||||||
@@ -1825,6 +1826,7 @@ static void HU_DrawChat(void)
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
|
#endif
|
||||||
y -= (cv_kartspeedometer.value ? 16 : 0);
|
y -= (cv_kartspeedometer.value ? 16 : 0);
|
||||||
|
|
||||||
if (teamtalk)
|
if (teamtalk)
|
||||||
@@ -1919,13 +1921,71 @@ static void HU_DrawChat(void)
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if (emote_autocomplete.emotestart != -1 && (emote_autocomplete.complete[0] || (w_chat.cursor - emote_autocomplete.emotestart) > 1))
|
||||||
|
{
|
||||||
|
emote_t *suggest;
|
||||||
|
int skip = 0;
|
||||||
|
|
||||||
|
const char *complete;
|
||||||
|
int complete_len;
|
||||||
|
|
||||||
|
if (emote_autocomplete.complete[0])
|
||||||
|
{
|
||||||
|
complete = emote_autocomplete.complete;
|
||||||
|
complete_len = strlen(complete);
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
complete = &w_chat_buf[emote_autocomplete.emotestart];
|
||||||
|
complete_len = w_chat.cursor - emote_autocomplete.emotestart;
|
||||||
|
}
|
||||||
|
|
||||||
|
// A bit of copy-paste from /pm code :p
|
||||||
|
INT32 suggesty = chaty - charheight - 1;
|
||||||
|
size_t longest_suggestion_length = 0;
|
||||||
|
|
||||||
|
while ((suggest = M_FindEmote(complete, complete_len, skip)) != NULL)
|
||||||
|
{
|
||||||
|
longest_suggestion_length = max(longest_suggestion_length, strlen(suggest->name));
|
||||||
|
++skip;
|
||||||
|
}
|
||||||
|
|
||||||
|
skip = 0;
|
||||||
|
|
||||||
|
#ifdef NETSPLITSCREEN
|
||||||
|
if (splitscreen)
|
||||||
|
{
|
||||||
|
suggesty -= BASEVIDHEIGHT/2;
|
||||||
|
if (splitscreen > 1)
|
||||||
|
suggesty += 16;
|
||||||
|
}
|
||||||
|
else
|
||||||
|
#endif
|
||||||
|
suggesty -= (cv_kartspeedometer.value ? 16 : 0);
|
||||||
|
|
||||||
|
while ((suggest = M_FindEmote(complete, complete_len, skip)) != NULL)
|
||||||
|
{
|
||||||
|
V_DrawFillConsoleMap(chatx + boxw + 2, suggesty - (7*skip), (longest_suggestion_length+2)*4 + EMOTEWIDTH, 6, V_SNAPTOBOTTOM|V_SNAPTOLEFT);
|
||||||
|
|
||||||
|
// Highlight currently suggested emote
|
||||||
|
int hlflag = 0;
|
||||||
|
if (skip == emote_autocomplete.skip && emote_autocomplete.complete[0])
|
||||||
|
hlflag = V_YELLOWMAP;
|
||||||
|
|
||||||
|
V_DrawSmallString(chatx + boxw + 4 + EMOTEWIDTH, suggesty - (7*skip), hlflag|V_SNAPTOBOTTOM|V_SNAPTOLEFT|V_ALLOWLOWERCASE, va(":%s:", suggest->name));
|
||||||
|
M_DrawEmote(chatx + boxw + 2, suggesty - skip*7, suggest, V_SNAPTOBOTTOM|V_SNAPTOLEFT);
|
||||||
|
|
||||||
|
++skip;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
// handle /pm list. It's messy, horrible and I don't care.
|
// handle /pm list. It's messy, horrible and I don't care.
|
||||||
if (strnicmp(w_chat_buf, "/pm", 3) == 0 && vid.width >= 400 && !teamtalk) // 320x200 unsupported kthxbai
|
if (strnicmp(w_chat_buf, "/pm", 3) == 0 && vid.width >= 400 && !teamtalk) // 320x200 unsupported kthxbai
|
||||||
{
|
{
|
||||||
INT32 count = 0;
|
INT32 count = 0;
|
||||||
INT32 p_dispy = chaty - charheight - 1;
|
INT32 p_dispy = chaty - charheight - 1;
|
||||||
size_t longest_name_length = 0;
|
size_t longest_name_length = 0;
|
||||||
|
#ifdef NETSPLITSCREEN
|
||||||
if (splitscreen)
|
if (splitscreen)
|
||||||
{
|
{
|
||||||
p_dispy -= BASEVIDHEIGHT/2;
|
p_dispy -= BASEVIDHEIGHT/2;
|
||||||
@@ -1933,13 +1993,13 @@ static void HU_DrawChat(void)
|
|||||||
p_dispy += 16;
|
p_dispy += 16;
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
|
#endif
|
||||||
p_dispy -= (cv_kartspeedometer.value ? 16 : 0);
|
p_dispy -= (cv_kartspeedometer.value ? 16 : 0);
|
||||||
|
|
||||||
// Find longest player name, for drawing background for /pm list later
|
// Find longest player name, for drawing background for /pm list later
|
||||||
for (i = 0; i < MAXPLAYERS; i++)
|
for (i = 0; i < MAXPLAYERS; i++)
|
||||||
{
|
{
|
||||||
if (!playeringame[i])
|
if (!playeringame[i]) continue;
|
||||||
continue;
|
|
||||||
|
|
||||||
longest_name_length = max(longest_name_length, strlen(player_names[i]));
|
longest_name_length = max(longest_name_length, strlen(player_names[i]));
|
||||||
}
|
}
|
||||||
@@ -1999,72 +2059,9 @@ static void HU_DrawChat(void)
|
|||||||
|
|
||||||
if (count == 0) // no results.
|
if (count == 0) // no results.
|
||||||
{
|
{
|
||||||
pm_offset = 48 + 2;
|
|
||||||
V_DrawFillConsoleMap(chatx + boxw + 2, p_dispy - (6*count), 48, 6, 239 | V_SNAPTOBOTTOM | V_SNAPTOLEFT); // fill it like the chat so the text doesn't become hard to read because of the hud.
|
V_DrawFillConsoleMap(chatx + boxw + 2, p_dispy - (6*count), 48, 6, 239 | V_SNAPTOBOTTOM | V_SNAPTOLEFT); // fill it like the chat so the text doesn't become hard to read because of the hud.
|
||||||
V_DrawSmallString(chatx + boxw + 4, p_dispy - (6*count), V_SNAPTOBOTTOM|V_SNAPTOLEFT|V_ALLOWLOWERCASE, "NO RESULT.");
|
V_DrawSmallString(chatx + boxw + 4, p_dispy - (6*count), V_SNAPTOBOTTOM|V_SNAPTOLEFT|V_ALLOWLOWERCASE, "NO RESULT.");
|
||||||
}
|
}
|
||||||
else
|
|
||||||
{
|
|
||||||
pm_offset = (longest_name_length+4)*4 + 2;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
if (emote_autocomplete.emotestart != -1 && (emote_autocomplete.complete[0] || (w_chat.cursor - emote_autocomplete.emotestart) > 1))
|
|
||||||
{
|
|
||||||
emote_t *suggest;
|
|
||||||
int skip = 0;
|
|
||||||
|
|
||||||
const char *complete;
|
|
||||||
int complete_len;
|
|
||||||
|
|
||||||
if (emote_autocomplete.complete[0])
|
|
||||||
{
|
|
||||||
complete = emote_autocomplete.complete;
|
|
||||||
complete_len = strlen(complete);
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
complete = &w_chat_buf[emote_autocomplete.emotestart];
|
|
||||||
complete_len = w_chat.cursor - emote_autocomplete.emotestart;
|
|
||||||
}
|
|
||||||
|
|
||||||
// A bit of copy-paste from /pm code :p
|
|
||||||
INT32 suggesty = chaty - charheight - 1;
|
|
||||||
size_t longest_suggestion_length = 0;
|
|
||||||
|
|
||||||
while ((suggest = M_FindEmote(complete, complete_len, skip)) != NULL)
|
|
||||||
{
|
|
||||||
longest_suggestion_length = max(longest_suggestion_length, strlen(suggest->name));
|
|
||||||
++skip;
|
|
||||||
}
|
|
||||||
|
|
||||||
INT32 emote_suggest_boxw = (longest_suggestion_length+2)*4 + EMOTEWIDTH;
|
|
||||||
|
|
||||||
skip = 0;
|
|
||||||
|
|
||||||
if (splitscreen)
|
|
||||||
{
|
|
||||||
suggesty -= BASEVIDHEIGHT/2;
|
|
||||||
if (splitscreen > 1)
|
|
||||||
suggesty += 16;
|
|
||||||
}
|
|
||||||
else
|
|
||||||
suggesty -= (cv_kartspeedometer.value ? 16 : 0);
|
|
||||||
|
|
||||||
while ((suggest = M_FindEmote(complete, complete_len, skip)) != NULL)
|
|
||||||
{
|
|
||||||
V_DrawFillConsoleMap(chatx + boxw + pm_offset + 2, suggesty - (7*skip), emote_suggest_boxw, 6, V_SNAPTOBOTTOM|V_SNAPTOLEFT);
|
|
||||||
|
|
||||||
// Highlight currently suggested emote
|
|
||||||
int hlflag = 0;
|
|
||||||
if (skip == emote_autocomplete.skip && emote_autocomplete.complete[0])
|
|
||||||
hlflag = V_YELLOWMAP;
|
|
||||||
|
|
||||||
V_DrawSmallString(chatx + boxw + pm_offset + 4 + EMOTEWIDTH, suggesty - (7*skip), hlflag|V_SNAPTOBOTTOM|V_SNAPTOLEFT|V_ALLOWLOWERCASE, va(":%s:", suggest->name));
|
|
||||||
M_DrawEmote(chatx + boxw + pm_offset + 2, suggesty - skip*7, suggest, V_SNAPTOBOTTOM|V_SNAPTOLEFT);
|
|
||||||
|
|
||||||
++skip;
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
HU_drawChatLog(typelines - 1); // typelines is the # of lines we're typing. If there's more than 1 then the log should scroll up to give us more space.
|
HU_drawChatLog(typelines - 1); // typelines is the # of lines we're typing. If there's more than 1 then the log should scroll up to give us more space.
|
||||||
|
|||||||
@@ -68,7 +68,12 @@ typedef struct
|
|||||||
#define HU_MAXMSGLEN 223
|
#define HU_MAXMSGLEN 223
|
||||||
#define HU_MSGBUFSIZE 255
|
#define HU_MSGBUFSIZE 255
|
||||||
#define MAX_CHAT_BUFSIZE 256 // that's enough messages, right? We'll delete the older ones when that gets out of hand.
|
#define MAX_CHAT_BUFSIZE 256 // that's enough messages, right? We'll delete the older ones when that gets out of hand.
|
||||||
|
#define NETSPLITSCREEN // why the hell WOULDN'T we want this?
|
||||||
|
#ifdef NETSPLITSCREEN
|
||||||
#define OLDCHAT (cv_consolechat.value == 1 || dedicated || vid.width < 640)
|
#define OLDCHAT (cv_consolechat.value == 1 || dedicated || vid.width < 640)
|
||||||
|
#else
|
||||||
|
#define OLDCHAT (cv_consolechat.value == 1 || dedicated || vid.width < 640)
|
||||||
|
#endif
|
||||||
#define CHAT_MUTE (cv_mute.value && !(server || IsPlayerAdmin(consoleplayer))) // this still allows to open the chat but not to type. That's used for scrolling and whatnot.
|
#define CHAT_MUTE (cv_mute.value && !(server || IsPlayerAdmin(consoleplayer))) // this still allows to open the chat but not to type. That's used for scrolling and whatnot.
|
||||||
#define OLD_MUTE (OLDCHAT && cv_mute.value && !(server || IsPlayerAdmin(consoleplayer))) // this is used to prevent oldchat from opening when muted.
|
#define OLD_MUTE (OLDCHAT && cv_mute.value && !(server || IsPlayerAdmin(consoleplayer))) // this is used to prevent oldchat from opening when muted.
|
||||||
|
|
||||||
|
|||||||
@@ -44,6 +44,9 @@ extern "C" {
|
|||||||
|
|
||||||
struct JoyType_s
|
struct JoyType_s
|
||||||
{
|
{
|
||||||
|
/*! if true, we MUST Poll() to get new joystick data,
|
||||||
|
that is: we NEED the DIRECTINPUTDEVICE2 ! (watchout NT compatibility) */
|
||||||
|
INT32 bJoyNeedPoll;
|
||||||
/*! this joystick is a gamepad, read: digital axes
|
/*! this joystick is a gamepad, read: digital axes
|
||||||
if FALSE, interpret the joystick event data as JOYAXISRANGE (see above) */
|
if FALSE, interpret the joystick event data as JOYAXISRANGE (see above) */
|
||||||
INT32 bGamepadStyle;
|
INT32 bGamepadStyle;
|
||||||
|
|||||||
+1
-8
@@ -43,7 +43,7 @@ extern UINT8 graphics_started;
|
|||||||
extern UINT8 keyboard_started;
|
extern UINT8 keyboard_started;
|
||||||
|
|
||||||
/** \brief Set to true when inside a signal handler that will exit the program. */
|
/** \brief Set to true when inside a signal handler that will exit the program. */
|
||||||
boolean I_In_Exiting_Signal_Handler(void);
|
extern boolean g_in_exiting_signal_handler;
|
||||||
|
|
||||||
/** \brief The I_GetFreeMem function
|
/** \brief The I_GetFreeMem function
|
||||||
|
|
||||||
@@ -148,9 +148,6 @@ extern INT32 numcontrollers;
|
|||||||
*/
|
*/
|
||||||
const char *I_GetJoyName(INT32 joyindex);
|
const char *I_GetJoyName(INT32 joyindex);
|
||||||
|
|
||||||
boolean I_GamepadHasLED(INT32 playernum);
|
|
||||||
boolean I_GamepadHasRumble(INT32 playernum);
|
|
||||||
|
|
||||||
void I_GamepadRumble(INT32 playernum, UINT16 low_strength, UINT16 high_strength, UINT32 duration);
|
void I_GamepadRumble(INT32 playernum, UINT16 low_strength, UINT16 high_strength, UINT32 duration);
|
||||||
void I_SetGamepadIndicatorColor(INT32 playernum, UINT8 red, UINT8 green, UINT8 blue);
|
void I_SetGamepadIndicatorColor(INT32 playernum, UINT8 red, UINT8 green, UINT8 blue);
|
||||||
|
|
||||||
@@ -198,10 +195,6 @@ INT32 I_StartupSystem(void);
|
|||||||
*/
|
*/
|
||||||
void I_ShutdownSystem(void);
|
void I_ShutdownSystem(void);
|
||||||
|
|
||||||
/** \brief To check if a Interrupt or Terminate Signal was fired
|
|
||||||
*/
|
|
||||||
boolean I_Interrupted(void);
|
|
||||||
|
|
||||||
/** \brief The I_GetDiskFreeSpace function
|
/** \brief The I_GetDiskFreeSpace function
|
||||||
|
|
||||||
\param freespace a INT64 pointer to hold the free space amount
|
\param freespace a INT64 pointer to hold the free space amount
|
||||||
|
|||||||
+7
-9
@@ -496,10 +496,8 @@ static void cleanupnodes(void)
|
|||||||
|
|
||||||
// Why can't I start at zero?
|
// Why can't I start at zero?
|
||||||
for (j = 1; j < MAXNETNODES; j++)
|
for (j = 1; j < MAXNETNODES; j++)
|
||||||
{
|
|
||||||
if (!(nodeingame[j] || SV_SendingFile(j)))
|
if (!(nodeingame[j] || SV_SendingFile(j)))
|
||||||
nodeconnected[j] = false;
|
nodeconnected[j] = false;
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
static SINT8 getfreenode(void)
|
static SINT8 getfreenode(void)
|
||||||
@@ -509,13 +507,11 @@ static SINT8 getfreenode(void)
|
|||||||
cleanupnodes();
|
cleanupnodes();
|
||||||
|
|
||||||
for (j = 0; j < MAXNETNODES; j++)
|
for (j = 0; j < MAXNETNODES; j++)
|
||||||
{
|
|
||||||
if (!nodeconnected[j])
|
if (!nodeconnected[j])
|
||||||
{
|
{
|
||||||
nodeconnected[j] = true;
|
nodeconnected[j] = true;
|
||||||
return j;
|
return j;
|
||||||
}
|
}
|
||||||
}
|
|
||||||
|
|
||||||
/** \warning No free node? Just in case a node might not have been freed properly,
|
/** \warning No free node? Just in case a node might not have been freed properly,
|
||||||
* look if there are connected nodes that aren't in game, and forget them.
|
* look if there are connected nodes that aren't in game, and forget them.
|
||||||
@@ -816,7 +812,7 @@ static void SOCK_Send(void)
|
|||||||
static void SOCK_FreeNodenum(INT32 numnode)
|
static void SOCK_FreeNodenum(INT32 numnode)
|
||||||
{
|
{
|
||||||
// can't disconnect from self :)
|
// can't disconnect from self :)
|
||||||
if (numnode <= 0 || numnode > MAXNETNODES)
|
if (!numnode || numnode > MAXNETNODES)
|
||||||
return;
|
return;
|
||||||
|
|
||||||
DEBFILE(va("Free node %d (%s)\n", numnode, SOCK_GetNodeAddress(numnode)));
|
DEBFILE(va("Free node %d (%s)\n", numnode, SOCK_GetNodeAddress(numnode)));
|
||||||
@@ -1436,12 +1432,14 @@ static void SOCK_RegisterHolePunch(void)
|
|||||||
|
|
||||||
static boolean SOCK_OpenSocket(void)
|
static boolean SOCK_OpenSocket(void)
|
||||||
{
|
{
|
||||||
memset(clientaddress, 0, sizeof(clientaddress));
|
size_t i;
|
||||||
|
|
||||||
|
memset(clientaddress, 0, sizeof (clientaddress));
|
||||||
|
|
||||||
memset(nodeconnected, false, sizeof(nodeconnected));
|
|
||||||
nodeconnected[0] = true; // always connected to self
|
nodeconnected[0] = true; // always connected to self
|
||||||
|
for (i = 1; i < MAXNETNODES; i++)
|
||||||
|
nodeconnected[i] = false;
|
||||||
nodeconnected[BROADCASTADDR] = true;
|
nodeconnected[BROADCASTADDR] = true;
|
||||||
|
|
||||||
I_NetSend = SOCK_Send;
|
I_NetSend = SOCK_Send;
|
||||||
I_NetGet = SOCK_Get;
|
I_NetGet = SOCK_Get;
|
||||||
I_NetCloseSocket = SOCK_CloseSocket;
|
I_NetCloseSocket = SOCK_CloseSocket;
|
||||||
@@ -1481,7 +1479,7 @@ static boolean SOCK_Ban(INT32 node)
|
|||||||
{
|
{
|
||||||
INT32 ban;
|
INT32 ban;
|
||||||
|
|
||||||
if (node < 0 || node > MAXNETNODES)
|
if (node > MAXNETNODES)
|
||||||
return false;
|
return false;
|
||||||
|
|
||||||
ban = numbans;
|
ban = numbans;
|
||||||
|
|||||||
@@ -446,12 +446,6 @@ void K_UpdateDirector(void)
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
// not sure if we should just stop here?
|
|
||||||
if (targetposition == MAXPLAYERS)
|
|
||||||
{
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
|
|
||||||
target = directorinfo.sortedplayers[targetposition];
|
target = directorinfo.sortedplayers[targetposition];
|
||||||
|
|
||||||
// stop here since we're already viewing this player
|
// stop here since we're already viewing this player
|
||||||
|
|||||||
+28
-62
@@ -83,7 +83,6 @@ IMPL_HUD_OFFSET(stat); // Stats
|
|||||||
|
|
||||||
// extra hud things
|
// extra hud things
|
||||||
consvar_t cv_showstats = {"showstats", "Off", CV_SAVE, CV_OnOff, NULL, 0, NULL, NULL, 0, 0, NULL};
|
consvar_t cv_showstats = {"showstats", "Off", CV_SAVE, CV_OnOff, NULL, 0, NULL, NULL, 0, 0, NULL};
|
||||||
consvar_t cv_showstats_skinname = {"showstats_skinname", "On", CV_SAVE, CV_OnOff, NULL, 0, NULL, NULL, 0, 0, NULL};
|
|
||||||
|
|
||||||
consvar_t cv_highresportrait = {"highresportrait", "Off", CV_SAVE, CV_OnOff, NULL, 0, NULL, NULL, 0, 0, NULL}; // make char potraits use their high-res version instead
|
consvar_t cv_highresportrait = {"highresportrait", "Off", CV_SAVE, CV_OnOff, NULL, 0, NULL, NULL, 0, 0, NULL}; // make char potraits use their high-res version instead
|
||||||
|
|
||||||
@@ -93,7 +92,6 @@ consvar_t cv_showinput = {"showinput", "Off", CV_SAVE, inputdisplay_cons_t, NULL
|
|||||||
static CV_PossibleValue_t minihead_cons_t[] = {{0, "Off"}, {1, "On"}, {2, "Others"}, {0, NULL}};
|
static CV_PossibleValue_t minihead_cons_t[] = {{0, "Off"}, {1, "On"}, {2, "Others"}, {0, NULL}};
|
||||||
consvar_t cv_minihead = {"smallminimapplayers", "Off", CV_SAVE, minihead_cons_t, NULL, 0, NULL, NULL, 0, 0, NULL};
|
consvar_t cv_minihead = {"smallminimapplayers", "Off", CV_SAVE, minihead_cons_t, NULL, 0, NULL, NULL, 0, 0, NULL};
|
||||||
consvar_t cv_showminimapnames = {"showminimapnames", "Off", CV_SAVE, CV_OnOff, NULL, 0, NULL, NULL, 0, 0, NULL};
|
consvar_t cv_showminimapnames = {"showminimapnames", "Off", CV_SAVE, CV_OnOff, NULL, 0, NULL, NULL, 0, 0, NULL};
|
||||||
consvar_t cv_showminimapfinished = {"showminimapfinished", "On", CV_SAVE, CV_OnOff, NULL, 0, NULL, NULL, 0, 0, NULL};
|
|
||||||
|
|
||||||
CV_PossibleValue_t minimapdot_cons_t[NUMMINIMAPDOTSTUFF];
|
CV_PossibleValue_t minimapdot_cons_t[NUMMINIMAPDOTSTUFF];
|
||||||
consvar_t cv_showminimapangle = {"showminimapangle", "Off", CV_SAVE, minimapdot_cons_t, NULL, 0, NULL, NULL, 0, 0, NULL};
|
consvar_t cv_showminimapangle = {"showminimapangle", "Off", CV_SAVE, minimapdot_cons_t, NULL, 0, NULL, NULL, 0, 0, NULL};
|
||||||
@@ -209,7 +207,6 @@ void K_RegisterKartHudStuff(void)
|
|||||||
CV_RegisterVar(&cv_kartspeedometer);
|
CV_RegisterVar(&cv_kartspeedometer);
|
||||||
|
|
||||||
CV_RegisterVar(&cv_showstats);
|
CV_RegisterVar(&cv_showstats);
|
||||||
CV_RegisterVar(&cv_showstats_skinname);
|
|
||||||
CV_RegisterVar(&cv_showinput);
|
CV_RegisterVar(&cv_showinput);
|
||||||
|
|
||||||
CV_RegisterVar(&cv_posanim);
|
CV_RegisterVar(&cv_posanim);
|
||||||
@@ -224,7 +221,6 @@ void K_RegisterKartHudStuff(void)
|
|||||||
|
|
||||||
CV_RegisterVar(&cv_minihead);
|
CV_RegisterVar(&cv_minihead);
|
||||||
CV_RegisterVar(&cv_showminimapnames);
|
CV_RegisterVar(&cv_showminimapnames);
|
||||||
CV_RegisterVar(&cv_showminimapfinished);
|
|
||||||
CV_RegisterVar(&cv_showminimapangle);
|
CV_RegisterVar(&cv_showminimapangle);
|
||||||
|
|
||||||
CV_RegisterVar(&cv_showlapemblem);
|
CV_RegisterVar(&cv_showlapemblem);
|
||||||
@@ -935,21 +931,21 @@ const char *K_GetItemPatch(UINT8 item, boolean tiny)
|
|||||||
|
|
||||||
//}
|
//}
|
||||||
|
|
||||||
static INT32 ITEM_X, ITEM_Y; // Item Window
|
INT32 ITEM_X, ITEM_Y; // Item Window
|
||||||
static INT32 TIME_X, TIME_Y; // Time Sticker
|
INT32 TIME_X, TIME_Y; // Time Sticker
|
||||||
static INT32 LAPS_X, LAPS_Y; // Lap Sticker
|
INT32 LAPS_X, LAPS_Y; // Lap Sticker
|
||||||
static INT32 SPDM_X, SPDM_Y; // Speedometer
|
INT32 SPDM_X, SPDM_Y; // Speedometer
|
||||||
static INT32 POSI_X, POSI_Y; // Position Number
|
INT32 POSI_X, POSI_Y; // Position Number
|
||||||
static INT32 FACE_X, FACE_Y; // Top-four Faces
|
INT32 FACE_X, FACE_Y; // Top-four Faces
|
||||||
static INT32 STCD_X, STCD_Y; // Starting countdown
|
INT32 STCD_X, STCD_Y; // Starting countdown
|
||||||
static INT32 CHEK_Y; // CHECK graphic
|
INT32 CHEK_Y; // CHECK graphic
|
||||||
static INT32 MINI_X, MINI_Y; // Minimap
|
INT32 MINI_X, MINI_Y; // Minimap
|
||||||
static INT32 WANT_X, WANT_Y; // Battle WANTED poster
|
INT32 WANT_X, WANT_Y; // Battle WANTED poster
|
||||||
|
|
||||||
// This is for the P2 and P4 side of splitscreen. Then we'll flip P1's and P2's to the bottom with V_SPLITSCREEN.
|
// This is for the P2 and P4 side of splitscreen. Then we'll flip P1's and P2's to the bottom with V_SPLITSCREEN.
|
||||||
static INT32 ITEM2_X, ITEM2_Y;
|
INT32 ITEM2_X, ITEM2_Y;
|
||||||
static INT32 LAPS2_X, LAPS2_Y;
|
INT32 LAPS2_X, LAPS2_Y;
|
||||||
static INT32 POSI2_X, POSI2_Y;
|
INT32 POSI2_X, POSI2_Y;
|
||||||
|
|
||||||
static void K_initKartHUD(void)
|
static void K_initKartHUD(void)
|
||||||
{
|
{
|
||||||
@@ -1438,16 +1434,13 @@ static void K_drawKartStats(void)
|
|||||||
fakeskin = K_GetPlayerSkin(stplyr);
|
fakeskin = K_GetPlayerSkin(stplyr);
|
||||||
|
|
||||||
// Skin name
|
// Skin name
|
||||||
if (cv_showstats_skinname.value)
|
if (K_IsHighResolution()) // V_DrawSmallString becomes a mess at low resolutions lel
|
||||||
{
|
{
|
||||||
if (K_IsHighResolution()) // V_DrawSmallString becomes a mess at low resolutions lel
|
V_DrawSmallString(x+20, y+12, flags2, fakeskin->realname);
|
||||||
{
|
}
|
||||||
V_DrawSmallString(x+20, y+12, flags2, fakeskin->realname);
|
else
|
||||||
}
|
{
|
||||||
else
|
V_DrawThinString(x+20, y+7, flags2, fakeskin->realname);
|
||||||
{
|
|
||||||
V_DrawThinString(x+20, y+7, flags2, fakeskin->realname);
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
// Icon and stats
|
// Icon and stats
|
||||||
@@ -2101,7 +2094,7 @@ static void K_DrawKartPositionNum(INT32 num)
|
|||||||
fy = POSI_Y;
|
fy = POSI_Y;
|
||||||
fflags = V_SNAPTOLEFT|((stplyrnum == 2) ? V_SPLITSCREEN|V_SNAPTOBOTTOM : 0); // flip P3 to the bottom.
|
fflags = V_SNAPTOLEFT|((stplyrnum == 2) ? V_SPLITSCREEN|V_SNAPTOBOTTOM : 0); // flip P3 to the bottom.
|
||||||
flipdraw = true;
|
flipdraw = true;
|
||||||
if (num >= 10)
|
if (num && num >= 10)
|
||||||
fx += W; // this seems dumb, but we need to do this in order for positions above 10 going off screen.
|
fx += W; // this seems dumb, but we need to do this in order for positions above 10 going off screen.
|
||||||
}
|
}
|
||||||
else // else, that means we're P2 or P4.
|
else // else, that means we're P2 or P4.
|
||||||
@@ -3779,9 +3772,6 @@ static void K_drawKartMinimap(void)
|
|||||||
if (!players[i].mo || players[i].spectator)
|
if (!players[i].mo || players[i].spectator)
|
||||||
continue;
|
continue;
|
||||||
|
|
||||||
if (!cv_showminimapfinished.value && players[i].exiting)
|
|
||||||
continue;
|
|
||||||
|
|
||||||
if (P_IsDisplayPlayer(&players[i]))
|
if (P_IsDisplayPlayer(&players[i]))
|
||||||
{
|
{
|
||||||
// Draw display players on top of everything else
|
// Draw display players on top of everything else
|
||||||
@@ -3826,7 +3816,7 @@ static void K_drawKartMinimap(void)
|
|||||||
|
|
||||||
if (cv_showminimapangle.value && (minidoticon || minilighticon) && !playertimedout)
|
if (cv_showminimapangle.value && (minidoticon || minilighticon) && !playertimedout)
|
||||||
{
|
{
|
||||||
UINT8 *colormap = NULL;
|
UINT8 *colormap;
|
||||||
drawinfo_t dims;
|
drawinfo_t dims;
|
||||||
fixed_t interpx, interpy;
|
fixed_t interpx, interpy;
|
||||||
fixed_t xoff = 0, yoff = 0;
|
fixed_t xoff = 0, yoff = 0;
|
||||||
@@ -3837,27 +3827,10 @@ static void K_drawKartMinimap(void)
|
|||||||
if (encoremode)
|
if (encoremode)
|
||||||
ang = ANGLE_180 - ang;
|
ang = ANGLE_180 - ang;
|
||||||
|
|
||||||
if (mobj->color)
|
if (mobj->colorized)
|
||||||
{
|
colormap = R_GetTranslationColormap(TC_RAINBOW, mobj->color, GTC_CACHE);
|
||||||
if (mobj->colorized)
|
else
|
||||||
{
|
colormap = R_GetLocalTranslationColormap(mobj->skin, mobj->localskin, mobj->color, GTC_CACHE, mobj->skinlocal);
|
||||||
colormap = R_GetTranslationColormap(TC_RAINBOW, mobj->color, GTC_CACHE);
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
const INT32 skinnum = K_GetMobjLocalSkinNum(mobj->skin, mobj->localskin, mobj->skinlocal);
|
|
||||||
|
|
||||||
// special case if startcolor is not the default (160 / Green)
|
|
||||||
if (skinnum && skins[skinnum].starttranscolor != skins[0].starttranscolor)
|
|
||||||
{
|
|
||||||
colormap = R_GetTranslationColormap(TC_DEFAULT, mobj->color, GTC_CACHE);
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
colormap = R_GetLocalTranslationColormap(mobj->skin, mobj->localskin, mobj->color, GTC_CACHE, mobj->skinlocal);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
interpx = lerp(mobj->old_x, mobj->x);
|
interpx = lerp(mobj->old_x, mobj->x);
|
||||||
interpy = lerp(mobj->old_y, mobj->y);
|
interpy = lerp(mobj->old_y, mobj->y);
|
||||||
@@ -4022,7 +3995,6 @@ static void K_drawBattleFullscreen(void)
|
|||||||
{
|
{
|
||||||
if (stplyrnum == 0)
|
if (stplyrnum == 0)
|
||||||
V_DrawFadeScreen(0xFF00, 16);
|
V_DrawFadeScreen(0xFF00, 16);
|
||||||
|
|
||||||
if (stplyr->exiting < 6*TICRATE && !stplyr->spectator)
|
if (stplyr->exiting < 6*TICRATE && !stplyr->spectator)
|
||||||
{
|
{
|
||||||
if (stplyr->kartstuff[k_position] == 1)
|
if (stplyr->kartstuff[k_position] == 1)
|
||||||
@@ -4087,7 +4059,7 @@ static void K_drawBattleFullscreen(void)
|
|||||||
{
|
{
|
||||||
if (i == displayplayers[0])
|
if (i == displayplayers[0])
|
||||||
continue;
|
continue;
|
||||||
if (playeringame[i])
|
if (playeringame[i] && !stplyr->spectator)
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -4338,7 +4310,7 @@ static void K_drawInput(void)
|
|||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
const boolean analogjoystickmove = cv_usejoystick[stplyrnum].value && !Joystick[stplyrnum].bGamepadStyle;
|
const boolean analogjoystickmove = cv_usejoystick[stplyrnum].value && !Joystick[stplyrnum].bGamepadStyle;
|
||||||
const boolean gamepadjoystickmove = cv_usejoystick[stplyrnum].value && Joystick[stplyrnum].bGamepadStyle;
|
const boolean gamepadjoystickmove = cv_usejoystick[stplyrnum].value && Joystick[stplyrnum].bGamepadStyle;
|
||||||
const UINT8 ssplayer = stplyrnum+1;
|
const UINT8 ssplayer = stplyrnum+1;
|
||||||
|
|
||||||
@@ -4355,10 +4327,9 @@ static void K_drawInput(void)
|
|||||||
{
|
{
|
||||||
hudforward += KART_FULLTURN;
|
hudforward += KART_FULLTURN;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (InputDown(gc_aimbackward, ssplayer) || (gamepadjoystickmove && axis > 0))
|
if (InputDown(gc_aimbackward, ssplayer) || (gamepadjoystickmove && axis > 0))
|
||||||
{
|
{
|
||||||
hudforward -= KART_FULLTURN;
|
hudforward-= KART_FULLTURN;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -4444,7 +4415,6 @@ static void K_drawChallengerScreen(void)
|
|||||||
19,20,19,20,19,20,19,20,19,20, // frame 20-21, 1 tic, 5 alternating: all text vibrates from impact
|
19,20,19,20,19,20,19,20,19,20, // frame 20-21, 1 tic, 5 alternating: all text vibrates from impact
|
||||||
21,22,23,24 // frame 22-25, 1 tic: CHALLENGER turns gold
|
21,22,23,24 // frame 22-25, 1 tic: CHALLENGER turns gold
|
||||||
};
|
};
|
||||||
|
|
||||||
const UINT8 offset = min(52-1, (3*TICRATE)-mapreset);
|
const UINT8 offset = min(52-1, (3*TICRATE)-mapreset);
|
||||||
|
|
||||||
V_DrawFadeScreen(0xFF00, 16); // Fade out
|
V_DrawFadeScreen(0xFF00, 16); // Fade out
|
||||||
@@ -4546,7 +4516,6 @@ static void K_drawDistributionDebugger(void)
|
|||||||
kp_orbinaut[4],
|
kp_orbinaut[4],
|
||||||
kp_jawz[1]
|
kp_jawz[1]
|
||||||
};
|
};
|
||||||
|
|
||||||
INT32 useodds = 0;
|
INT32 useodds = 0;
|
||||||
INT32 pingame = 0, bestbumper = 0;
|
INT32 pingame = 0, bestbumper = 0;
|
||||||
INT32 i;
|
INT32 i;
|
||||||
@@ -4563,10 +4532,8 @@ static void K_drawDistributionDebugger(void)
|
|||||||
if (!playeringame[i] || players[i].spectator)
|
if (!playeringame[i] || players[i].spectator)
|
||||||
continue;
|
continue;
|
||||||
pingame++;
|
pingame++;
|
||||||
|
|
||||||
if (players[i].exiting)
|
if (players[i].exiting)
|
||||||
dontforcespb = true;
|
dontforcespb = true;
|
||||||
|
|
||||||
if (players[i].kartstuff[k_bumper] > bestbumper)
|
if (players[i].kartstuff[k_bumper] > bestbumper)
|
||||||
bestbumper = players[i].kartstuff[k_bumper];
|
bestbumper = players[i].kartstuff[k_bumper];
|
||||||
}
|
}
|
||||||
@@ -4720,7 +4687,6 @@ void K_drawKartHUD(void)
|
|||||||
{
|
{
|
||||||
if (LUA_HudEnabled(hud_battlefullscreen))
|
if (LUA_HudEnabled(hud_battlefullscreen))
|
||||||
K_drawBattleFullscreen();
|
K_drawBattleFullscreen();
|
||||||
|
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -35,7 +35,6 @@ extern consvar_t cv_darkitembox;
|
|||||||
extern consvar_t cv_biglaps;
|
extern consvar_t cv_biglaps;
|
||||||
extern consvar_t cv_highresportrait;
|
extern consvar_t cv_highresportrait;
|
||||||
extern consvar_t cv_showstats;
|
extern consvar_t cv_showstats;
|
||||||
extern consvar_t cv_showstats_skinname;
|
|
||||||
extern consvar_t cv_fancyroulette;
|
extern consvar_t cv_fancyroulette;
|
||||||
extern consvar_t cv_showlaptimes;
|
extern consvar_t cv_showlaptimes;
|
||||||
extern consvar_t cv_battlespeedo;
|
extern consvar_t cv_battlespeedo;
|
||||||
|
|||||||
+10
-30
@@ -660,22 +660,13 @@ INT32 K_GetSkinNum(player_t *player)
|
|||||||
|
|
||||||
//
|
//
|
||||||
// returns the mobj skinnumber
|
// returns the mobj skinnumber
|
||||||
// accounts for localskins ?
|
// accounts for localskins
|
||||||
//
|
//
|
||||||
INT32 K_GetMobjSkinNum(const skin_t *skin, boolean local)
|
INT32 K_GetMobjSkinNum(const skin_t *skin, boolean local)
|
||||||
{
|
{
|
||||||
return skin - K_GetSkinArray(local);
|
return skin - K_GetSkinArray(local);
|
||||||
}
|
}
|
||||||
|
|
||||||
//
|
|
||||||
// returns the mobj skinnumber
|
|
||||||
// accounts for localskins
|
|
||||||
//
|
|
||||||
INT32 K_GetMobjLocalSkinNum(const skin_t *skin, const skin_t *localskin, boolean local)
|
|
||||||
{
|
|
||||||
return localskin ? (localskin - K_GetSkinArray(local)) : (skin - skins);
|
|
||||||
}
|
|
||||||
|
|
||||||
//
|
//
|
||||||
// returns the players skinnumber
|
// returns the players skinnumber
|
||||||
// accounts for localskins
|
// accounts for localskins
|
||||||
@@ -1955,9 +1946,11 @@ static void K_PlayGenericCombatSound(mobj_t *source, mobj_t *other, sfxenum_t sf
|
|||||||
if (!skin)
|
if (!skin)
|
||||||
return;
|
return;
|
||||||
|
|
||||||
|
boolean alwaysHear = false;
|
||||||
|
|
||||||
if (cv_kartvoices.value && !P_MobjWasRemoved(other) && other->player != NULL)
|
if (cv_kartvoices.value && !P_MobjWasRemoved(other) && other->player != NULL)
|
||||||
{
|
{
|
||||||
boolean alwaysHear = P_IsDisplayPlayer(other->player);
|
alwaysHear = P_IsDisplayPlayer(other->player);
|
||||||
S_StartSound(alwaysHear ? NULL : source, skin->soundsid[S_sfx[sfx_id].skinsound]);
|
S_StartSound(alwaysHear ? NULL : source, skin->soundsid[S_sfx[sfx_id].skinsound]);
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -2157,13 +2150,7 @@ static void K_GetKartBoostPower(player_t *player)
|
|||||||
&& player->speed > 0
|
&& player->speed > 0
|
||||||
&& !player->spectator)
|
&& !player->spectator)
|
||||||
{
|
{
|
||||||
mobj_t *dust = K_SpawnWipeoutTrail(player->mo, true);
|
K_SpawnWipeoutTrail(player->mo, true);
|
||||||
|
|
||||||
// Technically, all mobjs that think can cause desynchs if they are spawned conditionally, so best we can do
|
|
||||||
// is to hide them if you are in saltyhop jump
|
|
||||||
if (dust && player->mo->salty.jump)
|
|
||||||
dust->flags2 |= MF2_DONTDRAW;
|
|
||||||
|
|
||||||
if (leveltime % 6 == 0)
|
if (leveltime % 6 == 0)
|
||||||
S_StartSound(player->mo, sfx_cdfm70);
|
S_StartSound(player->mo, sfx_cdfm70);
|
||||||
}
|
}
|
||||||
@@ -2370,7 +2357,6 @@ void K_SpawnBattlePoints(player_t *source, player_t *victim, UINT8 amount)
|
|||||||
break;
|
break;
|
||||||
case 3:
|
case 3:
|
||||||
st = S_BATTLEPOINT3A;
|
st = S_BATTLEPOINT3A;
|
||||||
break;
|
|
||||||
default:
|
default:
|
||||||
return; // NO STATE!
|
return; // NO STATE!
|
||||||
}
|
}
|
||||||
@@ -3639,7 +3625,7 @@ void K_SpawnSparkleTrail(mobj_t *mo)
|
|||||||
P_SetMobjState(sparkle, S_KARTINVULN_LARGE1);
|
P_SetMobjState(sparkle, S_KARTINVULN_LARGE1);
|
||||||
}
|
}
|
||||||
|
|
||||||
mobj_t *K_SpawnWipeoutTrail(mobj_t *mo, boolean translucent)
|
void K_SpawnWipeoutTrail(mobj_t *mo, boolean translucent)
|
||||||
{
|
{
|
||||||
mobj_t *dust;
|
mobj_t *dust;
|
||||||
angle_t aoff;
|
angle_t aoff;
|
||||||
@@ -3676,10 +3662,10 @@ mobj_t *K_SpawnWipeoutTrail(mobj_t *mo, boolean translucent)
|
|||||||
dust->momx = mo->momx/2;
|
dust->momx = mo->momx/2;
|
||||||
dust->momy = mo->momy/2;
|
dust->momy = mo->momy/2;
|
||||||
dust->momz = mo->momz/2;
|
dust->momz = mo->momz/2;
|
||||||
dust->flags2 |= MF2_SHADOW;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
return dust;
|
if (translucent)
|
||||||
|
dust->flags2 |= MF2_SHADOW;
|
||||||
}
|
}
|
||||||
|
|
||||||
// K_DriftDustHandling
|
// K_DriftDustHandling
|
||||||
@@ -4654,7 +4640,8 @@ void K_RepairOrbitChain(mobj_t *orbit)
|
|||||||
prev->movedir = num;
|
prev->movedir = num;
|
||||||
}
|
}
|
||||||
|
|
||||||
player->kartstuff[k_itemamount] = num;
|
if (player->kartstuff[k_itemamount] != num)
|
||||||
|
player->kartstuff[k_itemamount] = num;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -6179,13 +6166,6 @@ void K_KartUpdatePosition(player_t *player)
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
// the player should NOT be checked against themselves! lol
|
|
||||||
// otherwise prevcheck will effectively be halved
|
|
||||||
// sadly this stuff is exposed to lua and atleast one script uses those so we cant fix it
|
|
||||||
// oh well
|
|
||||||
//if (player == &players[i])
|
|
||||||
//continue;
|
|
||||||
|
|
||||||
const boolean isprevcheckpointi = mo->health == players[i].starpostnum;
|
const boolean isprevcheckpointi = mo->health == players[i].starpostnum;
|
||||||
const boolean isnextcheckpointi = mo->health == (players[i].starpostnum + 1);
|
const boolean isnextcheckpointi = mo->health == (players[i].starpostnum + 1);
|
||||||
|
|
||||||
|
|||||||
+1
-1
@@ -57,7 +57,7 @@ boolean K_ShouldSlopeRoll(mobj_t *mobj);
|
|||||||
void K_RollMobjBySlopes(mobj_t *mo, pslope_t *slope);
|
void K_RollMobjBySlopes(mobj_t *mo, pslope_t *slope);
|
||||||
void K_SpawnBoostTrail(player_t *player);
|
void K_SpawnBoostTrail(player_t *player);
|
||||||
void K_SpawnSparkleTrail(mobj_t *mo);
|
void K_SpawnSparkleTrail(mobj_t *mo);
|
||||||
mobj_t *K_SpawnWipeoutTrail(mobj_t *mo, boolean translucent);
|
void K_SpawnWipeoutTrail(mobj_t *mo, boolean translucent);
|
||||||
void K_DriftDustHandling(mobj_t *spawner);
|
void K_DriftDustHandling(mobj_t *spawner);
|
||||||
void K_PuntMine(mobj_t *mine, mobj_t *punter);
|
void K_PuntMine(mobj_t *mine, mobj_t *punter);
|
||||||
void K_DoSneaker(player_t *player, INT32 type);
|
void K_DoSneaker(player_t *player, INT32 type);
|
||||||
|
|||||||
+13
-42
@@ -358,8 +358,7 @@ static int lib_cvRegisterVar(lua_State *L)
|
|||||||
#define TYPEERROR(f, t) FIELDERROR(f, va("%s expected, got %s", lua_typename(L, t), luaL_typename(L, -1)))
|
#define TYPEERROR(f, t) FIELDERROR(f, va("%s expected, got %s", lua_typename(L, t), luaL_typename(L, -1)))
|
||||||
|
|
||||||
lua_pushnil(L);
|
lua_pushnil(L);
|
||||||
while (lua_next(L, 1))
|
while (lua_next(L, 1)) {
|
||||||
{
|
|
||||||
// stack: cvar table, cvar userdata, key/index, value
|
// stack: cvar table, cvar userdata, key/index, value
|
||||||
// 1 2 3 4
|
// 1 2 3 4
|
||||||
i = 0;
|
i = 0;
|
||||||
@@ -369,40 +368,26 @@ static int lib_cvRegisterVar(lua_State *L)
|
|||||||
else if (lua_isstring(L, 3))
|
else if (lua_isstring(L, 3))
|
||||||
k = lua_tostring(L, 3);
|
k = lua_tostring(L, 3);
|
||||||
|
|
||||||
if (i == 1 || (k && fasticmp(k, "name")))
|
if (i == 1 || (k && fasticmp(k, "name"))) {
|
||||||
{
|
|
||||||
if (!lua_isstring(L, 4))
|
if (!lua_isstring(L, 4))
|
||||||
TYPEERROR("name", LUA_TSTRING)
|
TYPEERROR("name", LUA_TSTRING)
|
||||||
|
|
||||||
cvar->name = Z_StrDup(lua_tostring(L, 4));
|
cvar->name = Z_StrDup(lua_tostring(L, 4));
|
||||||
}
|
} else if (i == 2 || (k && fasticmp(k, "defaultvalue"))) {
|
||||||
else if (i == 2 || (k && fasticmp(k, "defaultvalue")))
|
|
||||||
{
|
|
||||||
if (!lua_isstring(L, 4))
|
if (!lua_isstring(L, 4))
|
||||||
TYPEERROR("defaultvalue", LUA_TSTRING)
|
TYPEERROR("defaultvalue", LUA_TSTRING)
|
||||||
|
|
||||||
cvar->defaultvalue = Z_StrDup(lua_tostring(L, 4));
|
cvar->defaultvalue = Z_StrDup(lua_tostring(L, 4));
|
||||||
}
|
} else if (i == 3 || (k && fasticmp(k, "flags"))) {
|
||||||
else if (i == 3 || (k && fasticmp(k, "flags")))
|
|
||||||
{
|
|
||||||
if (!lua_isnumber(L, 4))
|
if (!lua_isnumber(L, 4))
|
||||||
TYPEERROR("flags", LUA_TNUMBER)
|
TYPEERROR("flags", LUA_TNUMBER)
|
||||||
|
|
||||||
cvar->flags = (INT32)lua_tointeger(L, 4);
|
cvar->flags = (INT32)lua_tointeger(L, 4);
|
||||||
}
|
} else if (i == 4 || (k && fasticmp(k, "PossibleValue"))) {
|
||||||
else if (i == 4 || (k && fasticmp(k, "PossibleValue")))
|
if (lua_islightuserdata(L, 4)) {
|
||||||
{
|
|
||||||
if (lua_islightuserdata(L, 4))
|
|
||||||
{
|
|
||||||
CV_PossibleValue_t *pv = lua_touserdata(L, 4);
|
CV_PossibleValue_t *pv = lua_touserdata(L, 4);
|
||||||
|
|
||||||
if (pv == CV_OnOff || pv == CV_YesNo || pv == CV_Unsigned || pv == CV_Natural)
|
if (pv == CV_OnOff || pv == CV_YesNo || pv == CV_Unsigned || pv == CV_Natural)
|
||||||
cvar->PossibleValue = pv;
|
cvar->PossibleValue = pv;
|
||||||
else
|
else
|
||||||
FIELDERROR("PossibleValue", "CV_PossibleValue_t expected, got unrecognised pointer")
|
FIELDERROR("PossibleValue", "CV_PossibleValue_t expected, got unrecognised pointer")
|
||||||
}
|
} else if (lua_istable(L, 4)) {
|
||||||
else if (lua_istable(L, 4))
|
|
||||||
{
|
|
||||||
// Accepts tables in the form of {MIN=0, MAX=9999} or {Red=0, Green=1, Blue=2}
|
// Accepts tables in the form of {MIN=0, MAX=9999} or {Red=0, Green=1, Blue=2}
|
||||||
// and converts them to CV_PossibleValue_t {{0,"MIN"},{9999,"MAX"}} or {{0,"Red"},{1,"Green"},{2,"Blue"}}
|
// and converts them to CV_PossibleValue_t {{0,"MIN"},{9999,"MAX"}} or {{0,"Red"},{1,"Green"},{2,"Blue"}}
|
||||||
//
|
//
|
||||||
@@ -413,9 +398,7 @@ static int lib_cvRegisterVar(lua_State *L)
|
|||||||
CV_PossibleValue_t *cvpv;
|
CV_PossibleValue_t *cvpv;
|
||||||
|
|
||||||
lua_pushnil(L);
|
lua_pushnil(L);
|
||||||
|
while (lua_next(L, 4)) {
|
||||||
while (lua_next(L, 4))
|
|
||||||
{
|
|
||||||
count++;
|
count++;
|
||||||
lua_pop(L, 1);
|
lua_pop(L, 1);
|
||||||
}
|
}
|
||||||
@@ -429,9 +412,7 @@ static int lib_cvRegisterVar(lua_State *L)
|
|||||||
|
|
||||||
i = 0;
|
i = 0;
|
||||||
lua_pushnil(L);
|
lua_pushnil(L);
|
||||||
|
while (lua_next(L, 4)) {
|
||||||
while (lua_next(L, 4))
|
|
||||||
{
|
|
||||||
// stack: [...] PossibleValue table, index, value
|
// stack: [...] PossibleValue table, index, value
|
||||||
// 4 5 6
|
// 4 5 6
|
||||||
if (lua_type(L, 5) != LUA_TSTRING
|
if (lua_type(L, 5) != LUA_TSTRING
|
||||||
@@ -442,19 +423,14 @@ static int lib_cvRegisterVar(lua_State *L)
|
|||||||
i++;
|
i++;
|
||||||
lua_pop(L, 1);
|
lua_pop(L, 1);
|
||||||
}
|
}
|
||||||
|
|
||||||
cvpv[i].value = 0;
|
cvpv[i].value = 0;
|
||||||
cvpv[i].strvalue = NULL;
|
cvpv[i].strvalue = NULL;
|
||||||
cvar->PossibleValue = cvpv;
|
cvar->PossibleValue = cvpv;
|
||||||
}
|
} else
|
||||||
else
|
|
||||||
FIELDERROR("PossibleValue", va("%s or CV_PossibleValue_t expected, got %s", lua_typename(L, LUA_TTABLE), luaL_typename(L, -1)))
|
FIELDERROR("PossibleValue", va("%s or CV_PossibleValue_t expected, got %s", lua_typename(L, LUA_TTABLE), luaL_typename(L, -1)))
|
||||||
}
|
} else if (i == 5 || (k && fasticmp(k, "func"))) {
|
||||||
else if (i == 5 || (k && fasticmp(k, "func")))
|
|
||||||
{
|
|
||||||
if (!lua_isfunction(L, 4))
|
if (!lua_isfunction(L, 4))
|
||||||
TYPEERROR("func", LUA_TFUNCTION)
|
TYPEERROR("func", LUA_TFUNCTION)
|
||||||
|
|
||||||
lua_getfield(L, LUA_REGISTRYINDEX, "CV_OnChange");
|
lua_getfield(L, LUA_REGISTRYINDEX, "CV_OnChange");
|
||||||
I_Assert(lua_istable(L, 5));
|
I_Assert(lua_istable(L, 5));
|
||||||
lua_pushlightuserdata(L, cvar);
|
lua_pushlightuserdata(L, cvar);
|
||||||
@@ -462,13 +438,9 @@ static int lib_cvRegisterVar(lua_State *L)
|
|||||||
lua_rawset(L, 5);
|
lua_rawset(L, 5);
|
||||||
lua_pop(L, 1);
|
lua_pop(L, 1);
|
||||||
cvar->func = Lua_OnChange;
|
cvar->func = Lua_OnChange;
|
||||||
|
|
||||||
if (i == 5 && !(cvar->flags & CV_CALL))
|
|
||||||
{
|
|
||||||
category = lua_isnoneornil(L, 4) ? NULL : lua_tostring(L, 4);
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
else if ((cvar->flags & CV_CALL && i == 6)
|
else if (((i == 5 && !(cvar->flags & CV_CALL))
|
||||||
|
|| (cvar->flags & CV_CALL && i == 6))
|
||||||
|| (k && fasticmp(k, "category")))
|
|| (k && fasticmp(k, "category")))
|
||||||
{
|
{
|
||||||
category = lua_isnoneornil(L, 4) ? NULL : lua_tostring(L, 4);
|
category = lua_isnoneornil(L, 4) ? NULL : lua_tostring(L, 4);
|
||||||
@@ -479,7 +451,6 @@ static int lib_cvRegisterVar(lua_State *L)
|
|||||||
{
|
{
|
||||||
menu_name = lua_isnoneornil(L, 4) ? NULL : lua_tostring(L, 4);
|
menu_name = lua_isnoneornil(L, 4) ? NULL : lua_tostring(L, 4);
|
||||||
}
|
}
|
||||||
|
|
||||||
lua_pop(L, 1);
|
lua_pop(L, 1);
|
||||||
}
|
}
|
||||||
#undef FIELDERROR
|
#undef FIELDERROR
|
||||||
|
|||||||
+17
-7
@@ -199,7 +199,7 @@ FUNCINLINE static ATTRINLINE void add_hook(hook_t *map)
|
|||||||
|
|
||||||
FUNCINLINE static ATTRINLINE void add_mobj_hook(lua_State *L, int hook_type)
|
FUNCINLINE static ATTRINLINE void add_mobj_hook(lua_State *L, int hook_type)
|
||||||
{
|
{
|
||||||
mobjtype_t mobj_type = luaL_optnumber(L, 3, MT_NULL);
|
mobjtype_t mobj_type = luaL_optnumber(L, 3, MT_NULL);
|
||||||
|
|
||||||
luaL_argcheck(L, mobj_type < NUMMOBJTYPES, 3, "invalid mobjtype_t");
|
luaL_argcheck(L, mobj_type < NUMMOBJTYPES, 3, "invalid mobjtype_t");
|
||||||
|
|
||||||
@@ -296,7 +296,8 @@ struct Hook_State {
|
|||||||
INT32 status;/* return status to calling function */
|
INT32 status;/* return status to calling function */
|
||||||
void * userdata;
|
void * userdata;
|
||||||
int hook_type;
|
int hook_type;
|
||||||
mobjtype_t mobj_type;/* <NUMMOBJTYPES if mobj hook */
|
mobjtype_t mobj_type;/* >0 if mobj hook */
|
||||||
|
boolean force_mobj;// allows mobj_type equal 0
|
||||||
const char * string;/* used to fetch table, ran first if set */
|
const char * string;/* used to fetch table, ran first if set */
|
||||||
int top;/* index of last argument passed to hook */
|
int top;/* index of last argument passed to hook */
|
||||||
int id;/* id to fetch ref */
|
int id;/* id to fetch ref */
|
||||||
@@ -363,8 +364,10 @@ FUNCINLINE static ATTRINLINE boolean prepare_hook
|
|||||||
int default_status,
|
int default_status,
|
||||||
int hook_type
|
int hook_type
|
||||||
){
|
){
|
||||||
|
hook->force_mobj = false;
|
||||||
|
|
||||||
return init_hook_type(hook, default_status,
|
return init_hook_type(hook, default_status,
|
||||||
hook_type, NUMMOBJTYPES, NULL,
|
hook_type, 0, NULL,
|
||||||
hookIds[hook_type].numHooks);
|
hookIds[hook_type].numHooks);
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -378,6 +381,8 @@ FUNCINLINE static ATTRINLINE boolean prepare_mobj_hook
|
|||||||
const mobjtype_t mobj_type =
|
const mobjtype_t mobj_type =
|
||||||
primary_mobj ? primary_mobj->type : NUMMOBJTYPES;
|
primary_mobj ? primary_mobj->type : NUMMOBJTYPES;
|
||||||
|
|
||||||
|
hook->force_mobj = true;
|
||||||
|
|
||||||
return init_hook_type(hook, default_status,
|
return init_hook_type(hook, default_status,
|
||||||
hook_type, mobj_type, NULL,
|
hook_type, mobj_type, NULL,
|
||||||
mobj_hook_available(hook_type, mobj_type));
|
mobj_hook_available(hook_type, mobj_type));
|
||||||
@@ -390,8 +395,10 @@ FUNCINLINE static ATTRINLINE boolean prepare_string_hook
|
|||||||
int hook_type,
|
int hook_type,
|
||||||
const char * string
|
const char * string
|
||||||
){
|
){
|
||||||
|
hook->force_mobj = false;
|
||||||
|
|
||||||
if (init_hook_type(hook, default_status,
|
if (init_hook_type(hook, default_status,
|
||||||
hook_type, NUMMOBJTYPES, string,
|
hook_type, 0, string,
|
||||||
stringHooks[hook_type].ref))
|
stringHooks[hook_type].ref))
|
||||||
{
|
{
|
||||||
lua_pushstring(gL, string);
|
lua_pushstring(gL, string);
|
||||||
@@ -407,7 +414,7 @@ FUNCINLINE static ATTRINLINE boolean prepare_hud_hook
|
|||||||
int hook_type
|
int hook_type
|
||||||
){
|
){
|
||||||
return init_hook_type(hook, 0,
|
return init_hook_type(hook, 0,
|
||||||
hook_type, NUMMOBJTYPES, NULL,
|
hook_type, 0, NULL,
|
||||||
hudHookIds[hook_type].numHooks);
|
hudHookIds[hook_type].numHooks);
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -547,11 +554,14 @@ static int call_hooks
|
|||||||
{
|
{
|
||||||
calls += call_string_hooks(hook);
|
calls += call_string_hooks(hook);
|
||||||
}
|
}
|
||||||
else if (hook->mobj_type < NUMMOBJTYPES)
|
else if (hook->force_mobj)
|
||||||
{
|
{
|
||||||
/* call generic mobj hooks first */
|
/* call generic mobj hooks first */
|
||||||
calls += call_mobj_type_hooks(hook, MT_NULL);
|
calls += call_mobj_type_hooks(hook, MT_NULL);
|
||||||
calls += call_mobj_type_hooks(hook, hook->mobj_type);
|
|
||||||
|
if (hook->mobj_type < NUMMOBJTYPES)
|
||||||
|
calls += call_mobj_type_hooks(hook, hook->mobj_type);
|
||||||
|
|
||||||
ps_lua_mobjhooks.value.i += calls;
|
ps_lua_mobjhooks.value.i += calls;
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
|
|||||||
+1
-1
@@ -1297,7 +1297,7 @@ static int lib_hudsetvotebackground(lua_State *L)
|
|||||||
|
|
||||||
if (strlen(prefix) != 4)
|
if (strlen(prefix) != 4)
|
||||||
{
|
{
|
||||||
return luaL_argerror(L, 1, "prefix should be 4 characters wide");
|
return luaL_argerror(L, 1, "prefix should 4 characters wide");
|
||||||
}
|
}
|
||||||
|
|
||||||
strncpy(VoteScreen.luaPrefix, prefix, 4);
|
strncpy(VoteScreen.luaPrefix, prefix, 4);
|
||||||
|
|||||||
+29
-28
@@ -650,34 +650,34 @@ void LUA_HUD_DrawList(huddrawlist_h list)
|
|||||||
case DI_DrawString:
|
case DI_DrawString:
|
||||||
switch(item->align)
|
switch(item->align)
|
||||||
{
|
{
|
||||||
// hu_font
|
// hu_font
|
||||||
case align_left:
|
case align_left:
|
||||||
V_DrawString(LERPS(x), LERPS(y), item->flags, itemstr);
|
V_DrawString(LERPS(x), LERPS(y), item->flags, itemstr);
|
||||||
break;
|
break;
|
||||||
case align_center:
|
case align_center:
|
||||||
V_DrawCenteredString(LERPS(x), LERPS(y), item->flags, itemstr);
|
V_DrawCenteredString(LERPS(x), LERPS(y), item->flags, itemstr);
|
||||||
break;
|
break;
|
||||||
case align_right:
|
case align_right:
|
||||||
V_DrawRightAlignedString(LERPS(x), LERPS(y), item->flags, itemstr);
|
V_DrawRightAlignedString(LERPS(x), LERPS(y), item->flags, itemstr);
|
||||||
break;
|
break;
|
||||||
case align_fixed:
|
case align_fixed:
|
||||||
V_DrawStringAtFixed(LERPS(x), LERPS(y), item->flags, itemstr);
|
V_DrawStringAtFixed(LERPS(x), LERPS(y), item->flags, itemstr);
|
||||||
break;
|
break;
|
||||||
// hu_font, 0.5x scale
|
// hu_font, 0.5x scale
|
||||||
case align_small:
|
case align_small:
|
||||||
V_DrawSmallString(LERPS(x), LERPS(y), item->flags, itemstr);
|
V_DrawSmallString(LERPS(x), LERPS(y), item->flags, itemstr);
|
||||||
break;
|
break;
|
||||||
case align_smallright:
|
case align_smallright:
|
||||||
V_DrawRightAlignedSmallString(LERPS(x), LERPS(y), item->flags, itemstr);
|
V_DrawRightAlignedSmallString(LERPS(x), LERPS(y), item->flags, itemstr);
|
||||||
break;
|
break;
|
||||||
// tny_font
|
// tny_font
|
||||||
case align_thin:
|
case align_thin:
|
||||||
V_DrawThinString(LERPS(x), LERPS(y), item->flags, itemstr);
|
V_DrawThinString(LERPS(x), LERPS(y), item->flags, itemstr);
|
||||||
break;
|
break;
|
||||||
case align_thinright:
|
case align_thinright:
|
||||||
V_DrawRightAlignedThinString(LERPS(x), LERPS(y), item->flags, itemstr);
|
V_DrawRightAlignedThinString(LERPS(x), LERPS(y), item->flags, itemstr);
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
case DI_DrawKartString:
|
case DI_DrawKartString:
|
||||||
V_DrawKartString(LERPS(x), LERPS(y), item->flags, itemstr);
|
V_DrawKartString(LERPS(x), LERPS(y), item->flags, itemstr);
|
||||||
@@ -690,6 +690,7 @@ void LUA_HUD_DrawList(huddrawlist_h list)
|
|||||||
break;
|
break;
|
||||||
default:
|
default:
|
||||||
I_Error("can't draw draw list item: invalid draw list item type");
|
I_Error("can't draw draw list item: invalid draw list item type");
|
||||||
|
continue;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
+10
-5
@@ -1506,6 +1506,7 @@ enum mapheaderinfo_e
|
|||||||
mapheaderinfo_saveoverride,
|
mapheaderinfo_saveoverride,
|
||||||
mapheaderinfo_levelflags,
|
mapheaderinfo_levelflags,
|
||||||
mapheaderinfo_menuflags,
|
mapheaderinfo_menuflags,
|
||||||
|
//mapheaderinfo_automap,
|
||||||
mapheaderinfo_mobj_scale,
|
mapheaderinfo_mobj_scale,
|
||||||
};
|
};
|
||||||
|
|
||||||
@@ -1541,6 +1542,7 @@ static const char *const mapheaderinfo_opt[] = {
|
|||||||
"saveoverride",
|
"saveoverride",
|
||||||
"levelflags",
|
"levelflags",
|
||||||
"menuflags",
|
"menuflags",
|
||||||
|
//"automap",
|
||||||
"mobj_scale",
|
"mobj_scale",
|
||||||
NULL,
|
NULL,
|
||||||
};
|
};
|
||||||
@@ -1582,11 +1584,10 @@ static int mapheaderinfo_get(lua_State *L)
|
|||||||
lua_pushinteger(L, header->muspos);
|
lua_pushinteger(L, header->muspos);
|
||||||
break;
|
break;
|
||||||
case mapheaderinfo_musinterfadeout:
|
case mapheaderinfo_musinterfadeout:
|
||||||
lua_pushinteger(L, 0); // unused
|
lua_pushinteger(L, header->musinterfadeout);
|
||||||
break;
|
break;
|
||||||
case mapheaderinfo_musintername:
|
case mapheaderinfo_musintername:
|
||||||
// uhh psure its fine to just push nil instead of empty string?
|
lua_pushstring(L, header->musintername);
|
||||||
lua_pushstring(L, NULL);
|
|
||||||
break;
|
break;
|
||||||
case mapheaderinfo_forcecharacter:
|
case mapheaderinfo_forcecharacter:
|
||||||
lua_pushstring(L, header->forcecharacter);
|
lua_pushstring(L, header->forcecharacter);
|
||||||
@@ -1640,10 +1641,10 @@ static int mapheaderinfo_get(lua_State *L)
|
|||||||
lua_pushinteger(L, header->levelselect);
|
lua_pushinteger(L, header->levelselect);
|
||||||
break;
|
break;
|
||||||
case mapheaderinfo_bonustype:
|
case mapheaderinfo_bonustype:
|
||||||
lua_pushinteger(L, 0); // unused
|
lua_pushinteger(L, header->bonustype);
|
||||||
break;
|
break;
|
||||||
case mapheaderinfo_saveoverride:
|
case mapheaderinfo_saveoverride:
|
||||||
lua_pushinteger(L, SAVE_DEFAULT); // unused
|
lua_pushinteger(L, header->saveoverride);
|
||||||
break;
|
break;
|
||||||
case mapheaderinfo_levelflags:
|
case mapheaderinfo_levelflags:
|
||||||
lua_pushinteger(L, header->levelflags);
|
lua_pushinteger(L, header->levelflags);
|
||||||
@@ -1651,9 +1652,13 @@ static int mapheaderinfo_get(lua_State *L)
|
|||||||
case mapheaderinfo_menuflags:
|
case mapheaderinfo_menuflags:
|
||||||
lua_pushinteger(L, header->menuflags);
|
lua_pushinteger(L, header->menuflags);
|
||||||
break;
|
break;
|
||||||
|
/*case mapheaderinfo_automap:
|
||||||
|
lua_pushstring(L, header->selectheading);
|
||||||
|
break;*/
|
||||||
case mapheaderinfo_mobj_scale:
|
case mapheaderinfo_mobj_scale:
|
||||||
lua_pushfixed(L, header->mobj_scale);
|
lua_pushfixed(L, header->mobj_scale);
|
||||||
break;
|
break;
|
||||||
|
// TODO add support for reading numGradedMares and grades
|
||||||
default:
|
default:
|
||||||
{
|
{
|
||||||
// Read custom vars now
|
// Read custom vars now
|
||||||
|
|||||||
@@ -13,10 +13,6 @@
|
|||||||
#define LZF_H
|
#define LZF_H
|
||||||
#include <stdio.h>
|
#include <stdio.h>
|
||||||
|
|
||||||
#ifdef __cplusplus
|
|
||||||
extern "C" {
|
|
||||||
#endif
|
|
||||||
|
|
||||||
/***********************************************************************
|
/***********************************************************************
|
||||||
**
|
**
|
||||||
** lzf -- an extremely fast/free compression/decompression-method
|
** lzf -- an extremely fast/free compression/decompression-method
|
||||||
@@ -75,9 +71,5 @@ size_t
|
|||||||
lzf_decompress (const void *const in_data, size_t in_len,
|
lzf_decompress (const void *const in_data, size_t in_len,
|
||||||
void *out_data, size_t out_len);
|
void *out_data, size_t out_len);
|
||||||
|
|
||||||
#ifdef __cplusplus
|
|
||||||
} // extern "C"
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
@@ -249,6 +249,9 @@ boolean cht_Responder(event_t *ev)
|
|||||||
#define REQUIRE_SINGLEPLAYER if (netgame || multiplayer)\
|
#define REQUIRE_SINGLEPLAYER if (netgame || multiplayer)\
|
||||||
{ CONS_Printf(M_GetText("This only works in single player.\n")); return; }
|
{ CONS_Printf(M_GetText("This only works in single player.\n")); return; }
|
||||||
|
|
||||||
|
#define REQUIRE_NOULTIMATE if (ultimatemode)\
|
||||||
|
{ CONS_Printf(M_GetText("You're too good to be cheating!\n")); return; }
|
||||||
|
|
||||||
// command that can be typed at the console!
|
// command that can be typed at the console!
|
||||||
void Command_CheatNoClip_f(void)
|
void Command_CheatNoClip_f(void)
|
||||||
{
|
{
|
||||||
@@ -256,6 +259,7 @@ void Command_CheatNoClip_f(void)
|
|||||||
|
|
||||||
REQUIRE_INLEVEL;
|
REQUIRE_INLEVEL;
|
||||||
REQUIRE_SINGLEPLAYER;
|
REQUIRE_SINGLEPLAYER;
|
||||||
|
REQUIRE_NOULTIMATE;
|
||||||
|
|
||||||
plyr = &players[consoleplayer];
|
plyr = &players[consoleplayer];
|
||||||
plyr->pflags ^= PF_NOCLIP;
|
plyr->pflags ^= PF_NOCLIP;
|
||||||
@@ -270,6 +274,7 @@ void Command_CheatGod_f(void)
|
|||||||
|
|
||||||
REQUIRE_INLEVEL;
|
REQUIRE_INLEVEL;
|
||||||
REQUIRE_SINGLEPLAYER;
|
REQUIRE_SINGLEPLAYER;
|
||||||
|
REQUIRE_NOULTIMATE;
|
||||||
|
|
||||||
plyr = &players[consoleplayer];
|
plyr = &players[consoleplayer];
|
||||||
plyr->pflags ^= PF_GODMODE;
|
plyr->pflags ^= PF_GODMODE;
|
||||||
@@ -284,6 +289,7 @@ void Command_CheatNoTarget_f(void)
|
|||||||
|
|
||||||
REQUIRE_INLEVEL;
|
REQUIRE_INLEVEL;
|
||||||
REQUIRE_SINGLEPLAYER;
|
REQUIRE_SINGLEPLAYER;
|
||||||
|
REQUIRE_NOULTIMATE;
|
||||||
|
|
||||||
plyr = &players[consoleplayer];
|
plyr = &players[consoleplayer];
|
||||||
plyr->pflags ^= PF_INVIS;
|
plyr->pflags ^= PF_INVIS;
|
||||||
@@ -587,6 +593,7 @@ void Command_Devmode_f(void)
|
|||||||
#ifndef _DEBUG
|
#ifndef _DEBUG
|
||||||
REQUIRE_SINGLEPLAYER;
|
REQUIRE_SINGLEPLAYER;
|
||||||
#endif
|
#endif
|
||||||
|
REQUIRE_NOULTIMATE;
|
||||||
|
|
||||||
if (COM_Argc() > 1)
|
if (COM_Argc() > 1)
|
||||||
{
|
{
|
||||||
@@ -1041,6 +1048,7 @@ void Command_ObjectPlace_f(void)
|
|||||||
{
|
{
|
||||||
REQUIRE_INLEVEL;
|
REQUIRE_INLEVEL;
|
||||||
REQUIRE_SINGLEPLAYER;
|
REQUIRE_SINGLEPLAYER;
|
||||||
|
REQUIRE_NOULTIMATE;
|
||||||
|
|
||||||
G_SetGameModified(multiplayer, true);
|
G_SetGameModified(multiplayer, true);
|
||||||
|
|
||||||
|
|||||||
@@ -29,6 +29,7 @@ void Command_ObjectPlace_f(void);
|
|||||||
void Command_Writethings_f(void);
|
void Command_Writethings_f(void);
|
||||||
|
|
||||||
extern consvar_t cv_opflags, cv_mapthingnum, cv_speed;
|
extern consvar_t cv_opflags, cv_mapthingnum, cv_speed;
|
||||||
|
//extern consvar_t cv_snapto, cv_grid;
|
||||||
|
|
||||||
extern boolean objectplacing;
|
extern boolean objectplacing;
|
||||||
extern mobjtype_t op_currentthing;
|
extern mobjtype_t op_currentthing;
|
||||||
@@ -47,10 +48,18 @@ void Command_CheatNoClip_f(void);
|
|||||||
void Command_CheatGod_f(void);
|
void Command_CheatGod_f(void);
|
||||||
void Command_CheatNoTarget_f(void);
|
void Command_CheatNoTarget_f(void);
|
||||||
void Command_Savecheckpoint_f(void);
|
void Command_Savecheckpoint_f(void);
|
||||||
|
/*void Command_Getallemeralds_f(void);
|
||||||
|
void Command_Resetemeralds_f(void);
|
||||||
|
void Command_Setrings_f(void);
|
||||||
|
void Command_Setlives_f(void);
|
||||||
|
void Command_Setcontinues_f(void);*/
|
||||||
void Command_Devmode_f(void);
|
void Command_Devmode_f(void);
|
||||||
void Command_Scale_f(void);
|
void Command_Scale_f(void);
|
||||||
void Command_Gravflip_f(void);
|
void Command_Gravflip_f(void);
|
||||||
void Command_Hurtme_f(void);
|
void Command_Hurtme_f(void);
|
||||||
|
/*void Command_JumpToAxis_f(void);
|
||||||
|
void Command_Charability_f(void);
|
||||||
|
void Command_Charspeed_f(void);*/
|
||||||
void Command_Teleport_f(void);
|
void Command_Teleport_f(void);
|
||||||
void Command_RTeleport_f(void);
|
void Command_RTeleport_f(void);
|
||||||
void Command_Skynum_f(void);
|
void Command_Skynum_f(void);
|
||||||
|
|||||||
+22
-3
@@ -479,13 +479,32 @@ UINT8 M_CheckLevelEmblems(void)
|
|||||||
// Update Score, Time, Rings emblems
|
// Update Score, Time, Rings emblems
|
||||||
for (i = 0; i < numemblems; ++i)
|
for (i = 0; i < numemblems; ++i)
|
||||||
{
|
{
|
||||||
// Requires time on map <= x
|
if (emblemlocations[i].type <= ET_SKIN || emblemlocations[i].collected)
|
||||||
if (emblemlocations[i].type != ET_TIME || emblemlocations[i].collected)
|
|
||||||
continue;
|
continue;
|
||||||
|
|
||||||
levelnum = emblemlocations[i].level;
|
levelnum = emblemlocations[i].level;
|
||||||
valToReach = emblemlocations[i].var;
|
valToReach = emblemlocations[i].var;
|
||||||
res = (G_GetBestTime(levelnum) <= (unsigned)valToReach);
|
|
||||||
|
switch (emblemlocations[i].type)
|
||||||
|
{
|
||||||
|
/*case ET_SCORE: // Requires score on map >= x
|
||||||
|
res = (G_GetBestScore(levelnum) >= (unsigned)valToReach);
|
||||||
|
break;*/
|
||||||
|
case ET_TIME: // Requires time on map <= x
|
||||||
|
res = (G_GetBestTime(levelnum) <= (unsigned)valToReach);
|
||||||
|
break;
|
||||||
|
/*case ET_RINGS: // Requires rings on map >= x
|
||||||
|
res = (G_GetBestRings(levelnum) >= valToReach);
|
||||||
|
break;
|
||||||
|
case ET_NGRADE: // Requires NiGHTS grade on map >= x
|
||||||
|
res = (G_GetBestNightsGrade(levelnum, 0) >= valToReach);
|
||||||
|
break;
|
||||||
|
case ET_NTIME: // Requires NiGHTS time on map <= x
|
||||||
|
res = (G_GetBestNightsTime(levelnum, 0) <= (unsigned)valToReach);
|
||||||
|
break;*/
|
||||||
|
default: // unreachable but shuts the compiler up.
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
|
||||||
emblemlocations[i].collected = res;
|
emblemlocations[i].collected = res;
|
||||||
if (res)
|
if (res)
|
||||||
|
|||||||
@@ -27,11 +27,21 @@ typedef enum
|
|||||||
UC_MATCHESPLAYED, // SRB2Kart: MATCHESPLAYED [x played]
|
UC_MATCHESPLAYED, // SRB2Kart: MATCHESPLAYED [x played]
|
||||||
UC_GAMECLEAR, // GAMECLEAR <x times>
|
UC_GAMECLEAR, // GAMECLEAR <x times>
|
||||||
UC_ALLEMERALDS, // ALLEMERALDS <x times>
|
UC_ALLEMERALDS, // ALLEMERALDS <x times>
|
||||||
|
//UC_ULTIMATECLEAR, // ULTIMATECLEAR <x times>
|
||||||
|
//UC_OVERALLSCORE, // OVERALLSCORE [score to beat]
|
||||||
UC_OVERALLTIME, // OVERALLTIME [time to beat, tics]
|
UC_OVERALLTIME, // OVERALLTIME [time to beat, tics]
|
||||||
|
//UC_OVERALLRINGS, // OVERALLRINGS [rings to beat]
|
||||||
UC_MAPVISITED, // MAPVISITED [map number]
|
UC_MAPVISITED, // MAPVISITED [map number]
|
||||||
UC_MAPBEATEN, // MAPBEATEN [map number]
|
UC_MAPBEATEN, // MAPBEATEN [map number]
|
||||||
UC_MAPALLEMERALDS, // MAPALLEMERALDS [map number]
|
UC_MAPALLEMERALDS, // MAPALLEMERALDS [map number]
|
||||||
|
//UC_MAPULTIMATE, // MAPULTIMATE [map number]
|
||||||
|
//UC_MAPPERFECT, // MAPPERFECT [map number]
|
||||||
|
//UC_MAPSCORE, // MAPSCORE [map number] [score to beat]
|
||||||
UC_MAPTIME, // MAPTIME [map number] [time to beat, tics]
|
UC_MAPTIME, // MAPTIME [map number] [time to beat, tics]
|
||||||
|
//UC_MAPRINGS, // MAPRINGS [map number] [rings to beat]
|
||||||
|
//UC_NIGHTSSCORE, // NIGHTSSCORE [map number] <mare, omit or "0" for overall> [score to beat]
|
||||||
|
//UC_NIGHTSTIME, // NIGHTSTIME [map number] <mare, omit "0" overall> [time to beat, tics]
|
||||||
|
//UC_NIGHTSGRADE, // NIGHTSGRADE [map number] <mare, omit "0" overall> [grade]
|
||||||
UC_TRIGGER, // TRIGGER [trigger number]
|
UC_TRIGGER, // TRIGGER [trigger number]
|
||||||
UC_TOTALEMBLEMS, // TOTALEMBLEMS [number of emblems]
|
UC_TOTALEMBLEMS, // TOTALEMBLEMS [number of emblems]
|
||||||
UC_EMBLEM, // EMBLEM [emblem number]
|
UC_EMBLEM, // EMBLEM [emblem number]
|
||||||
|
|||||||
+1
-1
@@ -278,7 +278,7 @@ void M_DrawScaledEmote(fixed_t x, fixed_t y, fixed_t scale, emote_t *emote, INT3
|
|||||||
static void Command_ListEmotes_f(void)
|
static void Command_ListEmotes_f(void)
|
||||||
{
|
{
|
||||||
const int EMOTES_PER_PAGE = 24;
|
const int EMOTES_PER_PAGE = 24;
|
||||||
const int NUMPAGES = emotes.size()/EMOTES_PER_PAGE + (emotes.size() % EMOTES_PER_PAGE != 0 ? 1 : 0);
|
const int NUMPAGES = std::max<int>(emotes.size()/EMOTES_PER_PAGE, 1);
|
||||||
int page = 1;
|
int page = 1;
|
||||||
|
|
||||||
if (COM_Argc() > 1)
|
if (COM_Argc() > 1)
|
||||||
|
|||||||
+145
-72
@@ -149,6 +149,9 @@ M_waiting_mode_t m_waiting_mode = M_NOT_WAITING;
|
|||||||
|
|
||||||
const char *quitmsg[NUM_QUITMESSAGES] = {};
|
const char *quitmsg[NUM_QUITMESSAGES] = {};
|
||||||
|
|
||||||
|
// Stuff for customizing the player select screen Tails 09-22-2003
|
||||||
|
description_t description[MAXSKINS] = {};
|
||||||
|
|
||||||
INT32 mapwads[NUMMAPS] = {};
|
INT32 mapwads[NUMMAPS] = {};
|
||||||
|
|
||||||
boolean browselocalskins = false;
|
boolean browselocalskins = false;
|
||||||
@@ -183,8 +186,8 @@ static INT16 itemOn = 1; // menu item skull is on, Hack by Tails 09-18-2002
|
|||||||
static INT16 skullAnimCounter = 10; // skull animation counter
|
static INT16 skullAnimCounter = 10; // skull animation counter
|
||||||
static boolean interpTimerHackAllow = 0;
|
static boolean interpTimerHackAllow = 0;
|
||||||
|
|
||||||
static UINT8 setupcontrolplayer;
|
static UINT8 setupcontrolplayer;
|
||||||
static INT32 (*setupcontrols)[2]; // pointer to the gamecontrols of the player being edited
|
static INT32 (*setupcontrols)[2]; // pointer to the gamecontrols of the player being edited
|
||||||
|
|
||||||
// shhh... what am I doing... nooooo!
|
// shhh... what am I doing... nooooo!
|
||||||
static INT32 vidm_testingmode = 0;
|
static INT32 vidm_testingmode = 0;
|
||||||
@@ -198,8 +201,8 @@ static char setupm_ip[64];
|
|||||||
static textinput_t setupm_input_ip;
|
static textinput_t setupm_input_ip;
|
||||||
|
|
||||||
|
|
||||||
static fixed_t multi_tics;
|
static fixed_t multi_tics;
|
||||||
static state_t *multi_state;
|
static state_t *multi_state;
|
||||||
|
|
||||||
// this is set before entering the MultiPlayer setup menu,
|
// this is set before entering the MultiPlayer setup menu,
|
||||||
// for either player 1 or 2
|
// for either player 1 or 2
|
||||||
@@ -1021,9 +1024,9 @@ boolean M_Responder(event_t *ev)
|
|||||||
//case KEY_JOY1 + 2:
|
//case KEY_JOY1 + 2:
|
||||||
ch = KEY_ENTER;
|
ch = KEY_ENTER;
|
||||||
break;
|
break;
|
||||||
/*case KEY_JOY1 + 3: // Brake can function as 'n' for message boxes now.
|
/*case KEY_JOY1 + 3: // Brake can function as 'n' for message boxes now.
|
||||||
ch = 'n';
|
ch = 'n';
|
||||||
break;*/
|
break;*/
|
||||||
case KEY_MOUSE1 + 1:
|
case KEY_MOUSE1 + 1:
|
||||||
//case KEY_JOY1 + 1:
|
//case KEY_JOY1 + 1:
|
||||||
ch = KEY_BACKSPACE;
|
ch = KEY_BACKSPACE;
|
||||||
@@ -1302,21 +1305,12 @@ boolean M_Responder(event_t *ev)
|
|||||||
{
|
{
|
||||||
playback_last_menu_interaction_leveltime = leveltime;
|
playback_last_menu_interaction_leveltime = leveltime;
|
||||||
// Flip left/right with up/down for the playback menu, since it's a horizontal icon row.
|
// Flip left/right with up/down for the playback menu, since it's a horizontal icon row.
|
||||||
|
|
||||||
switch (ch)
|
switch (ch)
|
||||||
{
|
{
|
||||||
case KEY_LEFTARROW:
|
case KEY_LEFTARROW: ch = KEY_UPARROW; break;
|
||||||
ch = KEY_UPARROW;
|
case KEY_UPARROW: ch = KEY_RIGHTARROW; break;
|
||||||
break;
|
case KEY_RIGHTARROW: ch = KEY_DOWNARROW; break;
|
||||||
case KEY_UPARROW:
|
case KEY_DOWNARROW: ch = KEY_LEFTARROW; break;
|
||||||
ch = KEY_RIGHTARROW;
|
|
||||||
break;
|
|
||||||
case KEY_RIGHTARROW:
|
|
||||||
ch = KEY_DOWNARROW;
|
|
||||||
break;
|
|
||||||
case KEY_DOWNARROW:
|
|
||||||
ch = KEY_LEFTARROW;
|
|
||||||
break;
|
|
||||||
|
|
||||||
// arbitrary keyboard shortcuts because fuck you
|
// arbitrary keyboard shortcuts because fuck you
|
||||||
|
|
||||||
@@ -1367,8 +1361,7 @@ boolean M_Responder(event_t *ev)
|
|||||||
G_AdjustView(4, 1, true);
|
G_AdjustView(4, 1, true);
|
||||||
break;
|
break;
|
||||||
|
|
||||||
default:
|
default: break;
|
||||||
break;
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -1493,7 +1486,6 @@ boolean M_Responder(event_t *ev)
|
|||||||
}
|
}
|
||||||
|
|
||||||
return false;
|
return false;
|
||||||
break;
|
|
||||||
|
|
||||||
default:
|
default:
|
||||||
CON_Responder(ev);
|
CON_Responder(ev);
|
||||||
@@ -1993,6 +1985,8 @@ void M_Ticker(void)
|
|||||||
//
|
//
|
||||||
void M_Init(void)
|
void M_Init(void)
|
||||||
{
|
{
|
||||||
|
UINT8 i;
|
||||||
|
|
||||||
COM_AddCommand("manual", Command_Manual_f);
|
COM_AddCommand("manual", Command_Manual_f);
|
||||||
|
|
||||||
CV_RegisterVar(&cv_nextmap);
|
CV_RegisterVar(&cv_nextmap);
|
||||||
@@ -2038,6 +2032,15 @@ void M_Init(void)
|
|||||||
quitmsg[QUIT3MSG5] = M_GetText("You'll be back to play soon, though...\n...right?\n\n(Press 'Y' to quit)");
|
quitmsg[QUIT3MSG5] = M_GetText("You'll be back to play soon, though...\n...right?\n\n(Press 'Y' to quit)");
|
||||||
quitmsg[QUIT3MSG6] = M_GetText("Aww, is Eggman's Nightclub too\ndifficult for you?\n\n(Press 'Y' to quit)");
|
quitmsg[QUIT3MSG6] = M_GetText("Aww, is Eggman's Nightclub too\ndifficult for you?\n\n(Press 'Y' to quit)");
|
||||||
|
|
||||||
|
// Setup PlayerMenu table
|
||||||
|
for (i = 0; i < MAXSKINS; i++)
|
||||||
|
{
|
||||||
|
PlayerMenu[i].status = (i == 0 ? IT_CALL : IT_DISABLED);
|
||||||
|
PlayerMenu[i].patch = PlayerMenu[i].text = NULL;
|
||||||
|
PlayerMenu[i].itemaction = M_ChoosePlayer;
|
||||||
|
PlayerMenu[i].alphaKey = 0;
|
||||||
|
}
|
||||||
|
|
||||||
#ifdef HWRENDER
|
#ifdef HWRENDER
|
||||||
// Permanently hide some options based on render mode
|
// Permanently hide some options based on render mode
|
||||||
if (rendermode == render_soft)
|
if (rendermode == render_soft)
|
||||||
@@ -2061,6 +2064,7 @@ void M_Init(void)
|
|||||||
OP_OpenGLOptionsMenu[op_gl_shader].status = IT_GRAYEDOUT;
|
OP_OpenGLOptionsMenu[op_gl_shader].status = IT_GRAYEDOUT;
|
||||||
OP_OpenGLOptionsMenu[op_gl_lightdither].status = IT_GRAYEDOUT;
|
OP_OpenGLOptionsMenu[op_gl_lightdither].status = IT_GRAYEDOUT;
|
||||||
OP_OpenGLOptionsMenu[op_gl_palrender].status = IT_GRAYEDOUT;
|
OP_OpenGLOptionsMenu[op_gl_palrender].status = IT_GRAYEDOUT;
|
||||||
|
OP_OpenGLOptionsMenu[op_gl_flashpal].status = IT_GRAYEDOUT;
|
||||||
|
|
||||||
OP_ExpOptionsMenu[op_exp_paldepth].status = IT_GRAYEDOUT;
|
OP_ExpOptionsMenu[op_exp_paldepth].status = IT_GRAYEDOUT;
|
||||||
}
|
}
|
||||||
@@ -2092,6 +2096,55 @@ void M_Init(void)
|
|||||||
M_TextInputInit(&menuinput, menu_text_input_buf, sizeof menu_text_input_buf);
|
M_TextInputInit(&menuinput, menu_text_input_buf, sizeof menu_text_input_buf);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
void M_InitCharacterTables(void)
|
||||||
|
{
|
||||||
|
UINT8 i;
|
||||||
|
|
||||||
|
// Setup PlayerMenu table
|
||||||
|
for (i = 0; i < MAXSKINS; i++)
|
||||||
|
{
|
||||||
|
PlayerMenu[i].status = (i < 4 ? IT_CALL : IT_DISABLED);
|
||||||
|
PlayerMenu[i].patch = PlayerMenu[i].text = NULL;
|
||||||
|
PlayerMenu[i].itemaction = M_ChoosePlayer;
|
||||||
|
PlayerMenu[i].alphaKey = 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
// Setup description table
|
||||||
|
for (i = 0; i < MAXSKINS; i++)
|
||||||
|
{
|
||||||
|
if (i == 0)
|
||||||
|
{
|
||||||
|
strcpy(description[i].notes, "\x82Sonic\x80 is the fastest of the three, but also the hardest to control. Beginners beware, but experts will find Sonic very powerful.\n\n\x82""Ability:\x80 Speed Thok\nDouble jump to zoom forward with a huge burst of speed.\n\n\x82Tip:\x80 Simply letting go of forward does not slow down in SRB2. To slow down, hold the opposite direction.");
|
||||||
|
strcpy(description[i].picname, "");
|
||||||
|
strcpy(description[i].skinname, "sonic");
|
||||||
|
}
|
||||||
|
else if (i == 1)
|
||||||
|
{
|
||||||
|
strcpy(description[i].notes, "\x82Tails\x80 is the most mobile of the three, but has the slowest speed. Because of his mobility, he's well-\nsuited to beginners.\n\n\x82""Ability:\x80 Fly\nDouble jump to start flying for a limited time. Repetitively hit the jump button to ascend.\n\n\x82Tip:\x80 To quickly descend while flying, hit the spin button.");
|
||||||
|
strcpy(description[i].picname, "");
|
||||||
|
strcpy(description[i].skinname, "tails");
|
||||||
|
}
|
||||||
|
else if (i == 2)
|
||||||
|
{
|
||||||
|
strcpy(description[i].notes, "\x82Knuckles\x80 is well-\nrounded and can destroy breakable walls simply by touching them, but he can't jump as high as the other two.\n\n\x82""Ability:\x80 Glide & Climb\nDouble jump to glide in the air as long as jump is held. Glide into a wall to climb it.\n\n\x82Tip:\x80 Press spin while climbing to jump off the wall; press jump instead to jump off\nand face away from\nthe wall.");
|
||||||
|
strcpy(description[i].picname, "");
|
||||||
|
strcpy(description[i].skinname, "knuckles");
|
||||||
|
}
|
||||||
|
else if (i == 3)
|
||||||
|
{
|
||||||
|
strcpy(description[i].notes, "\x82Sonic & Tails\x80 team up to take on Dr. Eggman!\nControl Sonic while Tails desperately struggles to keep up.\n\nPlayer 2 can control Tails directly by setting the controls in the options menu.\nTails's directional controls are relative to Player 1's camera.\n\nTails can pick up Sonic while flying and carry him around.");
|
||||||
|
strcpy(description[i].picname, "CHRS&T");
|
||||||
|
strcpy(description[i].skinname, "sonic&tails");
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
strcpy(description[i].notes, "???");
|
||||||
|
strcpy(description[i].picname, "");
|
||||||
|
strcpy(description[i].skinname, "");
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
// ==========================================================================
|
// ==========================================================================
|
||||||
// SPECIAL MENU OPTION DRAW ROUTINES GO HERE
|
// SPECIAL MENU OPTION DRAW ROUTINES GO HERE
|
||||||
// ==========================================================================
|
// ==========================================================================
|
||||||
@@ -3963,16 +4016,16 @@ boolean replaynamesloaded = false;
|
|||||||
#ifdef HAVE_THREADS
|
#ifdef HAVE_THREADS
|
||||||
I_mutex replayquerymutex;
|
I_mutex replayquerymutex;
|
||||||
|
|
||||||
// I_In_Exiting_Signal_Handler is an evil hack
|
// g_in_exiting_signal_handler is an evil hack
|
||||||
// to avoid infinite SIGABRT recursion in the signal handler
|
// to avoid infinite SIGABRT recursion in the signal handler
|
||||||
// due to poisoned locks or mach-o kernel not supporting locks in signals
|
// due to poisoned locks or mach-o kernel not supporting locks in signals
|
||||||
// or something like that. idk
|
// or something like that. idk
|
||||||
# define Lock_search_state() if (!I_In_Exiting_Signal_Handler()) { I_lock_mutex(&replayquerymutex); }
|
# define Lock_search_state() if (!g_in_exiting_signal_handler) { I_lock_mutex(&replayquerymutex); }
|
||||||
# define Unlock_search_state() if (!I_In_Exiting_Signal_Handler()) { I_unlock_mutex(replayquerymutex); }
|
# define Unlock_search_state() if (!g_in_exiting_signal_handler) { I_unlock_mutex(replayquerymutex); }
|
||||||
#else /*HAVE_THREADS*/
|
#else/*HAVE_THREADS*/
|
||||||
# define Lock_search_state()
|
# define Lock_search_state()
|
||||||
# define Unlock_search_state()
|
# define Unlock_search_state()
|
||||||
#endif /*HAVE_THREADS*/
|
#endif/*HAVE_THREADS*/
|
||||||
|
|
||||||
|
|
||||||
#define MAXREPLAYQUERY 37
|
#define MAXREPLAYQUERY 37
|
||||||
@@ -4060,9 +4113,6 @@ static void AddCheckedReplay(void)
|
|||||||
// Check up to maxnum replays if they match with query
|
// Check up to maxnum replays if they match with query
|
||||||
static void M_HutCheckReplays(size_t maxnum)
|
static void M_HutCheckReplays(size_t maxnum)
|
||||||
{
|
{
|
||||||
// Stripped of color codes
|
|
||||||
char demo_title[sizeof(demolist_all[0].title)];
|
|
||||||
|
|
||||||
if (!replaynamesloaded)
|
if (!replaynamesloaded)
|
||||||
return;
|
return;
|
||||||
|
|
||||||
@@ -4095,9 +4145,7 @@ static void M_HutCheckReplays(size_t maxnum)
|
|||||||
case MD_NOTLOADED:
|
case MD_NOTLOADED:
|
||||||
case MD_OUTDATED:
|
case MD_OUTDATED:
|
||||||
case MD_LOADED:
|
case MD_LOADED:
|
||||||
StripColors(demo_title, demolist_all[replayquerycheck].title, sizeof(demo_title));
|
if (demolist_all[replayquerycheck].title[0] && strcasestr(demolist_all[replayquerycheck].title, replayqueryinput.buffer) != NULL)
|
||||||
|
|
||||||
if (demolist_all[replayquerycheck].title[0] && strcasestr(demo_title, replayqueryinput.buffer) != NULL)
|
|
||||||
AddCheckedReplay(); // It matches, add it!
|
AddCheckedReplay(); // It matches, add it!
|
||||||
else
|
else
|
||||||
replayquerycheck++; // Doesn't match, moving on...
|
replayquerycheck++; // Doesn't match, moving on...
|
||||||
@@ -4857,7 +4905,6 @@ static void M_HutStartReplay(INT32 choice)
|
|||||||
demo.loadfiles = (itemOn == 0);
|
demo.loadfiles = (itemOn == 0);
|
||||||
demo.ignorefiles = (itemOn != 0);
|
demo.ignorefiles = (itemOn != 0);
|
||||||
|
|
||||||
CONS_Printf(M_GetText("Playing back demo '%s'.\n"), demolist[dir_on[menudepthleft]].filepath);
|
|
||||||
G_DoPlayDemo(demolist[dir_on[menudepthleft]].filepath);
|
G_DoPlayDemo(demolist[dir_on[menudepthleft]].filepath);
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -5355,7 +5402,7 @@ void M_SlotCvarIntoModMenu(consvar_t* cvar, const char* category, const char* na
|
|||||||
}
|
}
|
||||||
|
|
||||||
if (cvar->flags & CV_NETVAR)
|
if (cvar->flags & CV_NETVAR)
|
||||||
OP_CustomCvarMenu[ccvarposition] = (menuitem_t){ IT_STRING | IT_CVAR, NULL, Z_StrDup(va("\x85 %s", name)), cvar, ccvaralphakey };
|
OP_CustomCvarMenu[ccvarposition] = (menuitem_t){ IT_STRING | IT_CVAR , NULL, Z_StrDup(va("\x85 %s", name)), cvar, ccvaralphakey };
|
||||||
else
|
else
|
||||||
OP_CustomCvarMenu[ccvarposition] = (menuitem_t){ IT_STRING | IT_CVAR, NULL, Z_StrDup(name), cvar, ccvaralphakey };
|
OP_CustomCvarMenu[ccvarposition] = (menuitem_t){ IT_STRING | IT_CVAR, NULL, Z_StrDup(name), cvar, ccvaralphakey };
|
||||||
|
|
||||||
@@ -6419,7 +6466,7 @@ static void M_ChooseTimeAttack(INT32 choice)
|
|||||||
static void M_HandleStaffReplay(INT32 choice)
|
static void M_HandleStaffReplay(INT32 choice)
|
||||||
{
|
{
|
||||||
boolean exitmenu = false; // exit to previous menu
|
boolean exitmenu = false; // exit to previous menu
|
||||||
lumpnum_t l = W_CheckNumForName(va("%sS%02u", G_BuildMapName(cv_nextmap.value), cv_dummystaff.value));
|
lumpnum_t l = W_CheckNumForName(va("%sS%02u",G_BuildMapName(cv_nextmap.value),cv_dummystaff.value));
|
||||||
|
|
||||||
switch (choice)
|
switch (choice)
|
||||||
{
|
{
|
||||||
@@ -6449,7 +6496,7 @@ static void M_HandleStaffReplay(INT32 choice)
|
|||||||
M_ClearMenus(true);
|
M_ClearMenus(true);
|
||||||
modeattacking = ATTACKING_RECORD;
|
modeattacking = ATTACKING_RECORD;
|
||||||
demo.loadfiles = false; demo.ignorefiles = true; // Just assume that record attack replays have the files needed
|
demo.loadfiles = false; demo.ignorefiles = true; // Just assume that record attack replays have the files needed
|
||||||
G_DoPlayDemo(va("%sS%02u", G_BuildMapName(cv_nextmap.value), cv_dummystaff.value));
|
G_DoPlayDemo(va("%sS%02u",G_BuildMapName(cv_nextmap.value),cv_dummystaff.value));
|
||||||
break;
|
break;
|
||||||
default:
|
default:
|
||||||
break;
|
break;
|
||||||
@@ -7890,24 +7937,25 @@ static void M_DrawSetupMultiPlayerMenu(void)
|
|||||||
INT32 tw = 0;
|
INT32 tw = 0;
|
||||||
spritedef_t *sprdef;
|
spritedef_t *sprdef;
|
||||||
spriteframe_t *sprframe;
|
spriteframe_t *sprframe;
|
||||||
|
patch_t *statbg = (patch_t *)W_CachePatchName("K_STATBG", PU_PATCH);
|
||||||
|
patch_t *statlr = (patch_t *)W_CachePatchName("K_STATLR", PU_PATCH);
|
||||||
|
patch_t *statud = (patch_t *)W_CachePatchName("K_STATUD", PU_PATCH);
|
||||||
|
patch_t *statdot = (patch_t *)W_CachePatchName("K_SDOT0", PU_PATCH);
|
||||||
patch_t *patch;
|
patch_t *patch;
|
||||||
UINT8 frame;
|
UINT8 frame;
|
||||||
UINT8 speed;
|
UINT8 speed;
|
||||||
UINT8 weight;
|
UINT8 weight;
|
||||||
UINT8 i;
|
UINT8 i;
|
||||||
UINT8 s, w;
|
UINT8 s, w;
|
||||||
|
const UINT8 *flashcol = V_GetStringColormap(highlightflags);
|
||||||
INT32 skinnum = 0;
|
INT32 skinnum = 0;
|
||||||
INT32 statx, staty;
|
INT32 statx, staty;
|
||||||
UINT32 speenframe;
|
UINT32 speenframe;
|
||||||
INT32 sltw, actw, hetw;
|
INT32 sltw, actw, hetw;
|
||||||
UINT8 skintodisplay;
|
UINT8 skintodisplay;
|
||||||
INT32 nameboxaddy = 0;
|
INT32 nameboxaddy = 0;
|
||||||
|
int statoffset = 0;
|
||||||
const UINT8 *flashcol = V_GetStringColormap(highlightflags);
|
int gridyoffset = 0;
|
||||||
patch_t *statbg = (patch_t *)W_CachePatchName("K_STATBG", PU_PATCH);
|
|
||||||
patch_t *statlr = (patch_t *)W_CachePatchName("K_STATLR", PU_PATCH);
|
|
||||||
patch_t *statud = (patch_t *)W_CachePatchName("K_STATUD", PU_PATCH);
|
|
||||||
patch_t *statdot = (patch_t *)W_CachePatchName("K_SDOT0" , PU_PATCH);
|
|
||||||
|
|
||||||
mx = MP_PlayerSetupDef.x;
|
mx = MP_PlayerSetupDef.x;
|
||||||
my = MP_PlayerSetupDef.y;
|
my = MP_PlayerSetupDef.y;
|
||||||
@@ -7922,6 +7970,8 @@ static void M_DrawSetupMultiPlayerMenu(void)
|
|||||||
switch (cv_skinselectmenu.value)
|
switch (cv_skinselectmenu.value)
|
||||||
{
|
{
|
||||||
case SKINMENUTYPE_EXTENDED:
|
case SKINMENUTYPE_EXTENDED:
|
||||||
|
nameboxaddy = 6;
|
||||||
|
break;
|
||||||
case SKINMENUTYPE_GRID:
|
case SKINMENUTYPE_GRID:
|
||||||
nameboxaddy = 6;
|
nameboxaddy = 6;
|
||||||
break;
|
break;
|
||||||
@@ -7937,23 +7987,39 @@ static void M_DrawSetupMultiPlayerMenu(void)
|
|||||||
else
|
else
|
||||||
M_DrawTextInput(mx + 40, my + nameboxaddy, &setupm_input, 0);
|
M_DrawTextInput(mx + 40, my + nameboxaddy, &setupm_input, 0);
|
||||||
|
|
||||||
#define GETSELECTEDSKINNAME (itemOn == 1 && setupm_skinselect < numskins ? skins[skinsorted[setupm_skinselect]].realname : skins[setupm_fakeskin].realname)
|
|
||||||
#define GETSELECTEDSPEED (itemOn == 1 && setupm_skinselect < numskins ? skins[skinsorted[setupm_skinselect]].kartspeed : skins[setupm_fakeskin].kartspeed)
|
|
||||||
#define GETSELECTEDWEIGHT (itemOn == 1 && setupm_skinselect < numskins ? skins[skinsorted[setupm_skinselect]].kartweight : skins[setupm_fakeskin].kartweight)
|
|
||||||
|
|
||||||
// draw skin string
|
// draw skin string
|
||||||
st = V_StringWidth(skins[setupm_fakeskin].realname, 0);
|
st = V_StringWidth(skins[setupm_fakeskin].realname, 0);
|
||||||
switch (cv_skinselectmenu.value)
|
switch (cv_skinselectmenu.value)
|
||||||
{
|
{
|
||||||
case SKINMENUTYPE_EXTENDED:
|
case SKINMENUTYPE_EXTENDED:
|
||||||
V_DrawString(statx - (statdp ? 50 : 113), staty - 10, V_6WIDTHSPACE, va("\x84%dS \x87%dW", GETSELECTEDSPEED, GETSELECTEDWEIGHT));
|
#define GETSELECTEDSKINNAME (itemOn == 1 && setupm_skinselect < numskins ? skins[skinsorted[setupm_skinselect]].realname : skins[setupm_fakeskin].realname)
|
||||||
/* FALLTHRU */
|
#define GETSELECTEDSPEED (itemOn == 1 && setupm_skinselect < numskins ? skins[skinsorted[setupm_skinselect]].kartspeed : skins[setupm_fakeskin].kartspeed)
|
||||||
|
#define GETSELECTEDWEIGHT (itemOn == 1 && setupm_skinselect < numskins ? skins[skinsorted[setupm_skinselect]].kartweight : skins[setupm_fakeskin].kartweight)
|
||||||
|
|
||||||
|
tw = V_StringWidth("Character", 0);//V_StringWidth(GETSELECTEDSKINNAME, 0);
|
||||||
|
st = V_StringWidth(GETSELECTEDSKINNAME, 0);
|
||||||
|
|
||||||
|
V_DrawString((mx+(tw/2)) - (st/2), my + 37,
|
||||||
|
((MP_PlayerSetupMenu[2].status & IT_TYPE) == IT_SPACE ? V_TRANSLUCENT : 0) | highlightflags | V_ALLOWLOWERCASE,
|
||||||
|
GETSELECTEDSKINNAME);
|
||||||
|
if (statdp == true)
|
||||||
|
statoffset = 50;
|
||||||
|
else
|
||||||
|
statoffset = 113;
|
||||||
|
|
||||||
|
V_DrawString(statx - statoffset, staty - 10, V_6WIDTHSPACE, va("\x84%dS \x87%dW", GETSELECTEDSPEED, GETSELECTEDWEIGHT));
|
||||||
|
#undef GETSELECTEDSKINNAME
|
||||||
|
#undef GETSELECTEDSPEED
|
||||||
|
#undef GETSELECTEDWEIGHT
|
||||||
|
break;
|
||||||
case SKINMENUTYPE_GRID:
|
case SKINMENUTYPE_GRID:
|
||||||
tw = V_StringWidth("Character", 0);
|
#define GETSELECTEDSKINNAME (itemOn == 1 && setupm_skinselect < numskins ? skins[skinsorted[setupm_skinselect]].realname : skins[setupm_fakeskin].realname)
|
||||||
|
tw = V_StringWidth("Character", 0);//V_StringWidth(GETSELECTEDSKINNAME, 0);
|
||||||
st = V_StringWidth(GETSELECTEDSKINNAME, 0);
|
st = V_StringWidth(GETSELECTEDSKINNAME, 0);
|
||||||
V_DrawString((mx+(tw/2)) - (st/2), my + 37,
|
V_DrawString((mx+(tw/2)) - (st/2), my + 37,
|
||||||
((MP_PlayerSetupMenu[2].status & IT_TYPE) == IT_SPACE ? V_TRANSLUCENT : 0) | highlightflags | V_ALLOWLOWERCASE,
|
((MP_PlayerSetupMenu[2].status & IT_TYPE) == IT_SPACE ? V_TRANSLUCENT : 0) | highlightflags | V_ALLOWLOWERCASE,
|
||||||
GETSELECTEDSKINNAME);
|
GETSELECTEDSKINNAME);
|
||||||
|
#undef GETSELECTEDSKINNAME
|
||||||
break;
|
break;
|
||||||
case SKINMENUTYPE_2D:
|
case SKINMENUTYPE_2D:
|
||||||
|
|
||||||
@@ -8031,6 +8097,8 @@ static void M_DrawSetupMultiPlayerMenu(void)
|
|||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#define GRIDSTATOFFSET 0
|
||||||
|
|
||||||
switch (cv_skinselectmenu.value)
|
switch (cv_skinselectmenu.value)
|
||||||
{
|
{
|
||||||
case SKINMENUTYPE_EXTENDED:
|
case SKINMENUTYPE_EXTENDED:
|
||||||
@@ -8042,6 +8110,9 @@ static void M_DrawSetupMultiPlayerMenu(void)
|
|||||||
if (itemOn == 1)
|
if (itemOn == 1)
|
||||||
V_DrawSmallString(statx+101, staty-37, V_6WIDTHSPACE|highlightflags, "BS: change");
|
V_DrawSmallString(statx+101, staty-37, V_6WIDTHSPACE|highlightflags, "BS: change");
|
||||||
|
|
||||||
|
#define GETSELECTEDSPEED (itemOn == 1 && setupm_skinselect < numskins ? skins[skinsorted[setupm_skinselect]].kartspeed : skins[setupm_fakeskin].kartspeed)
|
||||||
|
#define GETSELECTEDWEIGHT (itemOn == 1 && setupm_skinselect < numskins ? skins[skinsorted[setupm_skinselect]].kartweight : skins[setupm_fakeskin].kartweight)
|
||||||
|
|
||||||
if (statdp == true)
|
if (statdp == true)
|
||||||
{
|
{
|
||||||
//Background
|
//Background
|
||||||
@@ -8071,19 +8142,22 @@ static void M_DrawSetupMultiPlayerMenu(void)
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#undef GETSELECTEDSPEED
|
||||||
|
#undef GETSELECTEDWEIGHT
|
||||||
|
|
||||||
break;
|
break;
|
||||||
case SKINMENUTYPE_GRID:
|
case SKINMENUTYPE_GRID:
|
||||||
// SRB2Kart: draw the stat backer
|
// SRB2Kart: draw the stat backer
|
||||||
// labels
|
// labels
|
||||||
V_DrawSmallString(statx+12, staty+67, V_6WIDTHSPACE|highlightflags, "Acceleration");
|
V_DrawSmallString(statx+12+GRIDSTATOFFSET, staty+67, V_6WIDTHSPACE|highlightflags, "Acceleration");
|
||||||
V_DrawSmallString(statx+76, staty+67, V_6WIDTHSPACE|highlightflags, "Max Speed");
|
V_DrawSmallString(statx+76+GRIDSTATOFFSET, staty+67, V_6WIDTHSPACE|highlightflags, "Max Speed");
|
||||||
V_DrawSmallString(statx+14, staty+75, V_6WIDTHSPACE|highlightflags, "Handling");
|
V_DrawSmallString(statx+14+GRIDSTATOFFSET, staty+75, V_6WIDTHSPACE|highlightflags, "Handling");
|
||||||
V_DrawSmallString(statx+21, staty+108, V_6WIDTHSPACE|highlightflags, "Weight");
|
V_DrawSmallString(statx+21+GRIDSTATOFFSET, staty+108, V_6WIDTHSPACE|highlightflags, "Weight");
|
||||||
// label arrows
|
// label arrows
|
||||||
V_DrawFixedPatch(((statx+61)<<FRACBITS) + (FRACUNIT>>1), (staty+67)<<FRACBITS, FRACUNIT>>1, 0, statlr, flashcol);
|
V_DrawFixedPatch(((statx+61+GRIDSTATOFFSET)<<FRACBITS) + (FRACUNIT>>1), (staty+67)<<FRACBITS, FRACUNIT>>1, 0, statlr, flashcol);
|
||||||
V_DrawFixedPatch((statx+40)<<FRACBITS, (staty+80)<<FRACBITS, FRACUNIT>>1, 0, statud, flashcol);
|
V_DrawFixedPatch((statx+40+GRIDSTATOFFSET)<<FRACBITS, (staty+80)<<FRACBITS, FRACUNIT>>1, 0, statud, flashcol);
|
||||||
// bg
|
// bg
|
||||||
V_DrawFixedPatch(((statx+48)<<FRACBITS)+(FRACUNIT>>1), (staty+73)<<FRACBITS, FRACUNIT>>1, 0, statbg, NULL);
|
V_DrawFixedPatch(((statx+48+GRIDSTATOFFSET)<<FRACBITS)+(FRACUNIT>>1), (staty+73)<<FRACBITS, FRACUNIT>>1, 0, statbg, NULL);
|
||||||
|
|
||||||
for (i = 0; i < numskins; i++) // draw the stat dots
|
for (i = 0; i < numskins; i++) // draw the stat dots
|
||||||
{
|
{
|
||||||
@@ -8091,7 +8165,7 @@ static void M_DrawSetupMultiPlayerMenu(void)
|
|||||||
{
|
{
|
||||||
speed = skins[i].kartspeed;
|
speed = skins[i].kartspeed;
|
||||||
weight = skins[i].kartweight;
|
weight = skins[i].kartweight;
|
||||||
V_DrawFixedPatch((((statx+46) + (speed*4))<<FRACBITS) + (FRACUNIT>>1), (((staty+71) + (weight*4))<<FRACBITS), FRACUNIT>>1, 0, statdot, NULL);
|
V_DrawFixedPatch((((statx+46+GRIDSTATOFFSET) + (speed*4))<<FRACBITS) + (FRACUNIT>>1), (((staty+71) + (weight*4))<<FRACBITS), FRACUNIT>>1, 0, statdot, NULL);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -8117,9 +8191,9 @@ static void M_DrawSetupMultiPlayerMenu(void)
|
|||||||
#define TEXTVERTSHIFT 10
|
#define TEXTVERTSHIFT 10
|
||||||
|
|
||||||
DRAWSLOW(statx - sltw - 2, staty);
|
DRAWSLOW(statx - sltw - 2, staty);
|
||||||
DRAWSLOW(statx - sltw - 2, staty - TEXTVERTSHIFT + (9 * 18) - 11);
|
DRAWSLOW(statx - sltw - 2, staty - TEXTVERTSHIFT+ (9 * 18) - 11);
|
||||||
DRAWFAST(statx + (9 * 18), staty);
|
DRAWFAST(statx + (9 * 18), staty);
|
||||||
DRAWFAST(statx + (9 * 18), staty - TEXTVERTSHIFT + (9 * 18) - 11);
|
DRAWFAST(statx + (9 * 18), staty - TEXTVERTSHIFT+ (9 * 18) - 11);
|
||||||
DRAWACCEL(statx - actw - 2, staty + TEXTVERTSHIFT);
|
DRAWACCEL(statx - actw - 2, staty + TEXTVERTSHIFT);
|
||||||
DRAWACCEL(statx + (9 * 18), staty + TEXTVERTSHIFT);
|
DRAWACCEL(statx + (9 * 18), staty + TEXTVERTSHIFT);
|
||||||
DRAWHEAVY(statx - hetw - 2, staty + (9 * 18) - 11);
|
DRAWHEAVY(statx - hetw - 2, staty + (9 * 18) - 11);
|
||||||
@@ -8156,18 +8230,15 @@ static void M_DrawSetupMultiPlayerMenu(void)
|
|||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
|
||||||
#undef GETSELECTEDSKINNAME
|
|
||||||
#undef GETSELECTEDSPEED
|
|
||||||
#undef GETSELECTEDWEIGHT
|
|
||||||
|
|
||||||
switch (cv_skinselectmenu.value)
|
switch (cv_skinselectmenu.value)
|
||||||
{
|
{
|
||||||
//Skin grid stuff
|
//Skin grid stuff
|
||||||
case SKINMENUTYPE_EXTENDED:
|
case SKINMENUTYPE_EXTENDED:
|
||||||
|
gridyoffset = 10;
|
||||||
for (s = 0; s < SKINGRIDNEWWIDTH*SKINGRIDNEWHEIGHT; s++)
|
for (s = 0; s < SKINGRIDNEWWIDTH*SKINGRIDNEWHEIGHT; s++)
|
||||||
{
|
{
|
||||||
INT32 x = ((s % SKINGRIDNEWWIDTH) * 18) + ((BASEVIDWIDTH / 2) - (18 * SKINGRIDNEWWIDTH) - 8) + 100 + SKINXSHIFT; //BASEVIDWIDTH / 2 - ((icons + 1) * 24) - 4;
|
INT32 x = ((s % SKINGRIDNEWWIDTH) * 18) + ((BASEVIDWIDTH / 2) - (18 * SKINGRIDNEWWIDTH) - 8) + 100 + SKINXSHIFT; //BASEVIDWIDTH / 2 - ((icons + 1) * 24) - 4;
|
||||||
INT32 y = ((s / SKINGRIDNEWWIDTH) * 18) + ((BASEVIDHEIGHT / 2) - (18 * (SKINGRIDNEWWIDTH/2)) + 10); //BASEVIDWIDTH / 2 - ((icons + 1) * 24) - 4;
|
INT32 y = ((s / SKINGRIDNEWWIDTH) * 18) + ((BASEVIDHEIGHT / 2) - (18 * (SKINGRIDNEWWIDTH/2)) + gridyoffset); //BASEVIDWIDTH / 2 - ((icons + 1) * 24) - 4;
|
||||||
INT32 calcs = s + (setupm_skinypos * SKINGRIDNEWWIDTH);
|
INT32 calcs = s + (setupm_skinypos * SKINGRIDNEWWIDTH);
|
||||||
INT32 skinn;
|
INT32 skinn;
|
||||||
patch_t *face;
|
patch_t *face;
|
||||||
@@ -8193,7 +8264,7 @@ static void M_DrawSetupMultiPlayerMenu(void)
|
|||||||
{
|
{
|
||||||
patch_t *cursor;
|
patch_t *cursor;
|
||||||
INT32 curx = (((setupm_skinselect % SKINGRIDNEWWIDTH) * 18) + ((BASEVIDWIDTH / 2) - (18 * SKINGRIDNEWWIDTH/2)) + SKINXSHIFT) + 20;
|
INT32 curx = (((setupm_skinselect % SKINGRIDNEWWIDTH) * 18) + ((BASEVIDWIDTH / 2) - (18 * SKINGRIDNEWWIDTH/2)) + SKINXSHIFT) + 20;
|
||||||
INT32 cury = (((setupm_skinselect / SKINGRIDNEWWIDTH) - setupm_skinypos) * 18) + ((BASEVIDHEIGHT / 2) - (18 * (SKINGRIDNEWWIDTH/2))+ 10);
|
INT32 cury = (((setupm_skinselect / SKINGRIDNEWWIDTH) - setupm_skinypos) * 18) + ((BASEVIDHEIGHT / 2) - (18 * (SKINGRIDNEWWIDTH/2))+ gridyoffset);
|
||||||
|
|
||||||
UINT8 cursorframe = (I_GetTime() / 4) % 7;
|
UINT8 cursorframe = (I_GetTime() / 4) % 7;
|
||||||
cursor = (patch_t *)W_CachePatchName(va("K_CHILI%d", cursorframe + 1), PU_PATCH);
|
cursor = (patch_t *)W_CachePatchName(va("K_CHILI%d", cursorframe + 1), PU_PATCH);
|
||||||
@@ -8253,13 +8324,13 @@ static void M_DrawSetupMultiPlayerMenu(void)
|
|||||||
weight = skins[selectedskin].kartweight;
|
weight = skins[selectedskin].kartweight;
|
||||||
statdot = (patch_t *)W_CachePatchName("K_SDOT1", PU_PATCH);
|
statdot = (patch_t *)W_CachePatchName("K_SDOT1", PU_PATCH);
|
||||||
if (skullAnimCounter < 4) // SRB2Kart: we draw this dot later so that it's not covered if there's multiple skins with the same stats
|
if (skullAnimCounter < 4) // SRB2Kart: we draw this dot later so that it's not covered if there's multiple skins with the same stats
|
||||||
V_DrawFixedPatch((((statx+46) + (speed*4))<<FRACBITS) + (FRACUNIT>>1), (((staty+71) + (weight*4))<<FRACBITS), FRACUNIT>>1, 0, statdot, flashcol);
|
V_DrawFixedPatch((((statx+46+GRIDSTATOFFSET) + (speed*4))<<FRACBITS) + (FRACUNIT>>1), (((staty+71) + (weight*4))<<FRACBITS), FRACUNIT>>1, 0, statdot, flashcol);
|
||||||
else
|
else
|
||||||
V_DrawFixedPatch((((statx+46) + (speed*4))<<FRACBITS) + (FRACUNIT>>1), (((staty+71) + (weight*4))<<FRACBITS), FRACUNIT>>1, 0, statdot, NULL);
|
V_DrawFixedPatch((((statx+46+GRIDSTATOFFSET) + (speed*4))<<FRACBITS) + (FRACUNIT>>1), (((staty+71) + (weight*4))<<FRACBITS), FRACUNIT>>1, 0, statdot, NULL);
|
||||||
|
|
||||||
statdot = (patch_t *)W_CachePatchName("K_SDOT2", PU_PATCH); // coloured center
|
statdot = (patch_t *)W_CachePatchName("K_SDOT2", PU_PATCH); // coloured center
|
||||||
if (setupm_fakecolor)
|
if (setupm_fakecolor)
|
||||||
V_DrawFixedPatch((((statx+46) + (speed*4))<<FRACBITS) + (FRACUNIT>>1), (((staty+71) + (weight*4))<<FRACBITS), FRACUNIT>>1, 0, statdot, R_GetTranslationColormap(0, setupm_fakecolor, GTC_MENUCACHE));
|
V_DrawFixedPatch((((statx+46+GRIDSTATOFFSET) + (speed*4))<<FRACBITS) + (FRACUNIT>>1), (((staty+71) + (weight*4))<<FRACBITS), FRACUNIT>>1, 0, statdot, R_GetTranslationColormap(0, setupm_fakecolor, GTC_MENUCACHE));
|
||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
case SKINMENUTYPE_2D:
|
case SKINMENUTYPE_2D:
|
||||||
@@ -8310,6 +8381,7 @@ static void M_DrawSetupMultiPlayerMenu(void)
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
|
#undef GRIDSTATOFFSET
|
||||||
#undef SKINXSHIFT
|
#undef SKINXSHIFT
|
||||||
default:
|
default:
|
||||||
speed = skins[setupm_fakeskin].kartspeed;
|
speed = skins[setupm_fakeskin].kartspeed;
|
||||||
@@ -9969,6 +10041,7 @@ static void M_DrawVideoMode(void)
|
|||||||
va("Wait %d second%s", testtime, (testtime > 1) ? "s" : ""));
|
va("Wait %d second%s", testtime, (testtime > 1) ? "s" : ""));
|
||||||
M_CentreText(OP_VideoModeDef.y + 158,
|
M_CentreText(OP_VideoModeDef.y + 158,
|
||||||
"or press ESC to return");
|
"or press ESC to return");
|
||||||
|
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
|
|||||||
@@ -50,6 +50,9 @@ void M_Drawer(void);
|
|||||||
// Called by D_SRB2Main, loads the config file.
|
// Called by D_SRB2Main, loads the config file.
|
||||||
void M_Init(void);
|
void M_Init(void);
|
||||||
|
|
||||||
|
// Called by D_SRB2Main also, sets up the playermenu and description tables.
|
||||||
|
void M_InitCharacterTables(void);
|
||||||
|
|
||||||
// Called by intro code to force menu up upon a keypress,
|
// Called by intro code to force menu up upon a keypress,
|
||||||
// does nothing if menu is already up.
|
// does nothing if menu is already up.
|
||||||
void M_StartControlPanel(void);
|
void M_StartControlPanel(void);
|
||||||
@@ -81,6 +84,11 @@ typedef enum
|
|||||||
} menumessagetype_t;
|
} menumessagetype_t;
|
||||||
void M_StartMessage(const char *string, void *routine, menumessagetype_t itemtype);
|
void M_StartMessage(const char *string, void *routine, menumessagetype_t itemtype);
|
||||||
|
|
||||||
|
extern boolean DPADUPSCROLL;
|
||||||
|
extern boolean DPADDOWNSCROLL;
|
||||||
|
extern boolean DPADLEFTSCROLL;
|
||||||
|
extern boolean DPADRIGHTSCROLL;
|
||||||
|
|
||||||
typedef enum
|
typedef enum
|
||||||
{
|
{
|
||||||
M_NOT_WAITING,
|
M_NOT_WAITING,
|
||||||
@@ -160,6 +168,8 @@ boolean M_CanShowLevelInList(INT32 mapnum, INT32 gt);
|
|||||||
|
|
||||||
#define MAXMENUCCVARS 999
|
#define MAXMENUCCVARS 999
|
||||||
|
|
||||||
|
#define MAXTOOLTIPS 255
|
||||||
|
|
||||||
typedef union
|
typedef union
|
||||||
{
|
{
|
||||||
struct menu_s *submenu; // IT_SUBMENU
|
struct menu_s *submenu; // IT_SUBMENU
|
||||||
@@ -185,6 +195,8 @@ typedef struct menuitem_s
|
|||||||
UINT16 alphaKey;
|
UINT16 alphaKey;
|
||||||
} menuitem_t;
|
} menuitem_t;
|
||||||
|
|
||||||
|
extern menuitem_t PlayerMenu[MAXSKINS];
|
||||||
|
|
||||||
typedef struct menu_s
|
typedef struct menu_s
|
||||||
{
|
{
|
||||||
const char *menutitlepic;
|
const char *menutitlepic;
|
||||||
@@ -215,6 +227,14 @@ extern menu_t SP_LoadDef;
|
|||||||
void M_SetupJoystickMenu(INT32 choice);
|
void M_SetupJoystickMenu(INT32 choice);
|
||||||
extern menu_t OP_JoystickSetDef;
|
extern menu_t OP_JoystickSetDef;
|
||||||
|
|
||||||
|
// Stuff for customizing the player select screen
|
||||||
|
typedef struct
|
||||||
|
{
|
||||||
|
char notes[441];
|
||||||
|
char picname[8];
|
||||||
|
char skinname[SKINNAMESIZE*2+2]; // skin&skin\0
|
||||||
|
} description_t;
|
||||||
|
|
||||||
// mode descriptions for video mode menu
|
// mode descriptions for video mode menu
|
||||||
typedef struct
|
typedef struct
|
||||||
{
|
{
|
||||||
@@ -242,6 +262,8 @@ typedef struct
|
|||||||
|
|
||||||
extern INT32 mapwads[NUMMAPS];
|
extern INT32 mapwads[NUMMAPS];
|
||||||
|
|
||||||
|
extern description_t description[MAXSKINS];
|
||||||
|
|
||||||
extern consvar_t cv_replaysearchrate;
|
extern consvar_t cv_replaysearchrate;
|
||||||
extern consvar_t cv_showfocuslost;
|
extern consvar_t cv_showfocuslost;
|
||||||
extern consvar_t cv_newgametype, cv_nextmap, cv_chooseskin, cv_serversort;
|
extern consvar_t cv_newgametype, cv_nextmap, cv_chooseskin, cv_serversort;
|
||||||
|
|||||||
+51
-46
@@ -495,6 +495,12 @@ static menuitem_t SP_LevelStatsMenu[] =
|
|||||||
{IT_KEYHANDLER | IT_NOTHING, NULL, "", M_HandleLevelStats, '\0'}, // dummy menuitem for the control func
|
{IT_KEYHANDLER | IT_NOTHING, NULL, "", M_HandleLevelStats, '\0'}, // dummy menuitem for the control func
|
||||||
};
|
};
|
||||||
|
|
||||||
|
// A rare case.
|
||||||
|
// External files modify this menu, so we can't call it static.
|
||||||
|
// And I'm too lazy to go through and rename it everywhere. ARRGH!
|
||||||
|
#define M_ChoosePlayer NULL
|
||||||
|
menuitem_t PlayerMenu[MAXSKINS];
|
||||||
|
|
||||||
// -----------------------------------
|
// -----------------------------------
|
||||||
// Multiplayer and all of its submenus
|
// Multiplayer and all of its submenus
|
||||||
// -----------------------------------
|
// -----------------------------------
|
||||||
@@ -1017,6 +1023,8 @@ static menuitem_t OP_OpenGLOptionsMenu[] =
|
|||||||
{IT_STRING | IT_CVAR, NULL, "Fallback Player 3D Model", &cv_glfallbackplayermodel, 20},
|
{IT_STRING | IT_CVAR, NULL, "Fallback Player 3D Model", &cv_glfallbackplayermodel, 20},
|
||||||
{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, "Palette Rendering Flashpals",&cv_glflashpal, 35},
|
||||||
|
//{IT_STRING | IT_CVAR, NULL, "Min Shader Brightness", &cv_glsecbright, 40},
|
||||||
|
|
||||||
{IT_STRING | IT_CVAR, NULL, "Texture Quality", &cv_gltexturedepth, 45},
|
{IT_STRING | IT_CVAR, NULL, "Texture Quality", &cv_gltexturedepth, 45},
|
||||||
{IT_STRING | IT_CVAR, NULL, "Texture Filter", &cv_glfiltermode, 50},
|
{IT_STRING | IT_CVAR, NULL, "Texture Filter", &cv_glfiltermode, 50},
|
||||||
@@ -1037,6 +1045,7 @@ static const char* OP_OpenGLTooltips[] =
|
|||||||
"Fallback 3D model for characters that don't have any.",
|
"Fallback 3D model for characters that don't have any.",
|
||||||
"Graphical Shaders.",
|
"Graphical Shaders.",
|
||||||
"Recreates the look of software mode.",
|
"Recreates the look of software mode.",
|
||||||
|
"Flash palettes for palette rendering.",
|
||||||
"Bit-depth of textures.",
|
"Bit-depth of textures.",
|
||||||
"Filter to use on textures.",
|
"Filter to use on textures.",
|
||||||
"Anisotropic filtering.",
|
"Anisotropic filtering.",
|
||||||
@@ -1055,6 +1064,7 @@ enum
|
|||||||
op_gl_falbckmdls,
|
op_gl_falbckmdls,
|
||||||
op_gl_shader,
|
op_gl_shader,
|
||||||
op_gl_palrender,
|
op_gl_palrender,
|
||||||
|
op_gl_flashpal,
|
||||||
op_gl_scrdepth,
|
op_gl_scrdepth,
|
||||||
op_gl_filter,
|
op_gl_filter,
|
||||||
op_gl_anis,
|
op_gl_anis,
|
||||||
@@ -1688,30 +1698,29 @@ static menuitem_t OP_SaturnMenu[] =
|
|||||||
{IT_STRING | IT_CVAR, NULL, "Minimum Input Delay", &cv_mindelay, 20},
|
{IT_STRING | IT_CVAR, NULL, "Minimum Input Delay", &cv_mindelay, 20},
|
||||||
{IT_STRING | IT_CVAR, NULL, "Gentlemens Ping", &cv_gentlemens, 25},
|
{IT_STRING | IT_CVAR, NULL, "Gentlemens Ping", &cv_gentlemens, 25},
|
||||||
{IT_STRING | IT_CVAR, NULL, "Server Info Screen", &cv_serverinfoscreen, 30},
|
{IT_STRING | IT_CVAR, NULL, "Server Info Screen", &cv_serverinfoscreen, 30},
|
||||||
{IT_STRING | IT_CVAR, NULL, "Server Addons Info", &cv_serveraddoninfo, 35},
|
|
||||||
|
|
||||||
{IT_STRING | IT_CVAR, NULL, "Skin Select Spinning Speed", &cv_skinselectspin, 45},
|
{IT_STRING | IT_CVAR, NULL, "Skin Select Spinning Speed", &cv_skinselectspin, 40},
|
||||||
|
|
||||||
{IT_STRING | IT_CVAR, NULL, "Colorized Speedlines", &cv_coloredspeedlines, 55},
|
{IT_STRING | IT_CVAR, NULL, "Colorized Speedlines", &cv_coloredspeedlines, 50},
|
||||||
{IT_STRING | IT_CVAR, NULL, "Colorized Sneakertrails", &cv_coloredsneakertrail, 60},
|
{IT_STRING | IT_CVAR, NULL, "Colorized Sneakertrails", &cv_coloredsneakertrail, 55},
|
||||||
|
|
||||||
{IT_STRING | IT_CVAR, NULL, "Player Blendeffects", &cv_playerblendeffects, 70},
|
{IT_STRING | IT_CVAR, NULL, "Player Blendeffects", &cv_playerblendeffects, 65},
|
||||||
|
|
||||||
{IT_STRING | IT_CVAR, NULL, "Bananadrag Jitter", &cv_bananajitter, 80},
|
{IT_STRING | IT_CVAR, NULL, "Bananadrag Jitter", &cv_bananajitter, 75},
|
||||||
|
|
||||||
{IT_STRING | IT_CVAR, NULL, "Midair Driftsparks", &cv_airsparks, 90},
|
{IT_STRING | IT_CVAR, NULL, "Midair Driftsparks", &cv_airsparks, 85},
|
||||||
|
|
||||||
{IT_STRING | IT_CVAR, NULL, "Show Localskin Menus", &cv_showlocalskinmenus, 100},
|
{IT_STRING | IT_CVAR, NULL, "Show Localskin Menus", &cv_showlocalskinmenus, 95},
|
||||||
|
|
||||||
{IT_STRING | IT_CVAR, NULL, "Uppercase Menu", &cv_menucaps, 110},
|
{IT_STRING | IT_CVAR, NULL, "Uppercase Menu", &cv_menucaps, 105},
|
||||||
|
|
||||||
{IT_STRING | IT_CVAR, NULL, "Keyboard Layout", &cv_keyboardlayout, 120},
|
{IT_STRING | IT_CVAR, NULL, "Keyboard Layout", &cv_keyboardlayout, 115},
|
||||||
|
|
||||||
{IT_STRING | IT_CVAR, NULL, "Less Midnight Channel Flicker", &cv_lessflicker, 130},
|
{IT_STRING | IT_CVAR, NULL, "Less Midnight Channel Flicker", &cv_lessflicker, 125},
|
||||||
|
|
||||||
{IT_SUBMENU|IT_STRING, NULL, "Saturn Hud...", &OP_SaturnHudDef, 140},
|
{IT_SUBMENU|IT_STRING, NULL, "Saturn Hud...", &OP_SaturnHudDef, 135},
|
||||||
{IT_SUBMENU|IT_STRING, NULL, "Sprite Distortion...", &OP_PlayerDistortDef, 145},
|
{IT_SUBMENU|IT_STRING, NULL, "Sprite Distortion...", &OP_PlayerDistortDef, 140},
|
||||||
{IT_SUBMENU|IT_STRING, NULL, "Saturn Credits", &OP_SaturnCreditsDef, 150}, // uwu
|
{IT_SUBMENU|IT_STRING, NULL, "Saturn Credits", &OP_SaturnCreditsDef, 145}, // uwu
|
||||||
};
|
};
|
||||||
|
|
||||||
static const char* OP_SaturnTooltips[] =
|
static const char* OP_SaturnTooltips[] =
|
||||||
@@ -1721,7 +1730,6 @@ static const char* OP_SaturnTooltips[] =
|
|||||||
"Practice for online play! 0 = instant response.",
|
"Practice for online play! 0 = instant response.",
|
||||||
"Simulate online input delay when hosting a server.\nValue choosen by Player with the lowest ping",
|
"Simulate online input delay when hosting a server.\nValue choosen by Player with the lowest ping",
|
||||||
"Show a screen before joining a server displaying important information about it",
|
"Show a screen before joining a server displaying important information about it",
|
||||||
"Show amount and types of addons that are loaded by server when joining",
|
|
||||||
"How much speen do you want?",
|
"How much speen do you want?",
|
||||||
"Colourize the speedlines in your skincolor if you go fast enough!",
|
"Colourize the speedlines in your skincolor if you go fast enough!",
|
||||||
"Colourize the sneaker flame trails in your skincolor!",
|
"Colourize the sneaker flame trails in your skincolor!",
|
||||||
@@ -1824,49 +1832,47 @@ static menuitem_t OP_SaturnHudMenu[] =
|
|||||||
{
|
{
|
||||||
{IT_HEADER, NULL, "Saturn Hud Options", NULL, 0},
|
{IT_HEADER, NULL, "Saturn Hud Options", NULL, 0},
|
||||||
|
|
||||||
{IT_STRING|IT_CVAR, NULL, "Speedometer Style", &cv_newspeedometer, 10},
|
{IT_STRING|IT_CVAR, NULL, "Speedometer Style", &cv_newspeedometer, 10},
|
||||||
{IT_STRING|IT_CVAR, NULL, "Battle Speedometer", &cv_battlespeedo, 15},
|
{IT_STRING|IT_CVAR, NULL, "Battle Speedometer", &cv_battlespeedo, 15},
|
||||||
|
|
||||||
{IT_STRING|IT_CVAR, NULL, "Colourized HUD", &cv_colorizedhud, 25},
|
{IT_STRING|IT_CVAR, NULL, "Colourized HUD", &cv_colorizedhud, 25},
|
||||||
{IT_STRING|IT_CVAR, NULL, "Colourized Itembox", &cv_colorizeditembox, 30},
|
{IT_STRING|IT_CVAR, NULL, "Colourized Itembox", &cv_colorizeditembox, 30},
|
||||||
{IT_STRING|IT_CVAR, NULL, "Colourized HUD Color", &cv_colorizedhudcolor, 35},
|
{IT_STRING|IT_CVAR, NULL, "Colourized HUD Color", &cv_colorizedhudcolor, 35},
|
||||||
|
|
||||||
{IT_STRING|IT_CVAR, NULL, "Input Display", &cv_showinput, 45},
|
{IT_STRING|IT_CVAR, NULL, "Input Display", &cv_showinput, 45},
|
||||||
|
|
||||||
{IT_STRING|IT_CVAR, NULL, "Stat Display", &cv_showstats, 55},
|
{IT_STRING|IT_CVAR, NULL, "Stat Display", &cv_showstats, 55},
|
||||||
{IT_STRING|IT_CVAR, NULL, "Skin Name in Stat Display", &cv_showstats_skinname, 60},
|
|
||||||
|
|
||||||
{IT_STRING|IT_CVAR, NULL, "Higher Resolution Portraits", &cv_highresportrait, 70},
|
{IT_STRING|IT_CVAR, NULL, "Higher Resolution Portraits", &cv_highresportrait, 65},
|
||||||
|
|
||||||
{IT_STRING|IT_CVAR, NULL, "Small Positionnumber", &cv_smallposnum, 80},
|
{IT_STRING|IT_CVAR, NULL, "Small Positionnumber", &cv_smallposnum, 75},
|
||||||
{IT_STRING|IT_CVAR, NULL, "Positionnumber Animation", &cv_posanim, 85},
|
{IT_STRING|IT_CVAR, NULL, "Positionnumber Animation", &cv_posanim, 80},
|
||||||
|
|
||||||
{IT_STRING|IT_CVAR, NULL, "Flash Lap Times", &cv_showlaptimes, 95},
|
{IT_STRING|IT_CVAR, NULL, "Flash Lap Times", &cv_showlaptimes, 90},
|
||||||
|
|
||||||
{IT_STRING|IT_CVAR, NULL, "Multi-Item icons", &cv_multiitemicon, 105},
|
{IT_STRING|IT_CVAR, NULL, "Multi-Item icons", &cv_multiitemicon, 100},
|
||||||
{IT_STRING|IT_CVAR, NULL, "Item Amount Number", &cv_huditemamount, 110},
|
{IT_STRING|IT_CVAR, NULL, "Item Amount Number", &cv_huditemamount, 105},
|
||||||
{IT_STRING|IT_CVAR, NULL, "Animated Roulette", &cv_fancyroulette, 115},
|
{IT_STRING|IT_CVAR, NULL, "Animated Roulette", &cv_fancyroulette, 110},
|
||||||
|
|
||||||
{IT_STRING|IT_CVAR, NULL, "Show Lap Emblem", &cv_showlapemblem, 125},
|
{IT_STRING|IT_CVAR, NULL, "Show Lap Emblem", &cv_showlapemblem, 120},
|
||||||
{IT_STRING|IT_CVAR, NULL, "Show Cecho Messages", &cv_cechotoggle, 130},
|
{IT_STRING|IT_CVAR, NULL, "Show Cecho Messages", &cv_cechotoggle, 125},
|
||||||
|
|
||||||
{IT_STRING|IT_CVAR, NULL, "Show Names on Minimap", &cv_showminimapnames, 140},
|
{IT_STRING|IT_CVAR, NULL, "Show Names on Minimap", &cv_showminimapnames, 135},
|
||||||
{IT_STRING|IT_CVAR, NULL, "Show Finished on Minimap", &cv_showminimapfinished, 145},
|
{IT_STRING|IT_CVAR, NULL, "Small Minimap Players", &cv_minihead, 140},
|
||||||
{IT_STRING|IT_CVAR, NULL, "Small Minimap Players", &cv_minihead, 150},
|
{IT_STRING|IT_CVAR, NULL, "Spin Minimap Icons", &cv_spinoutroll, 145},
|
||||||
{IT_STRING|IT_CVAR, NULL, "Spin Minimap Icons", &cv_spinoutroll, 155},
|
{IT_STRING|IT_CVAR, NULL, "Player Angle Visual", &cv_showminimapangle, 150},
|
||||||
{IT_STRING|IT_CVAR, NULL, "Player Angle Visual", &cv_showminimapangle, 160},
|
|
||||||
|
|
||||||
{IT_STRING|IT_CVAR, NULL, "Music Credits", &cv_songcredits, 170},
|
{IT_STRING|IT_CVAR, NULL, "Music Credits", &cv_songcredits, 160},
|
||||||
{IT_STRING|IT_CVAR, NULL, "Music Credits on Pause", &cv_pausesongcredits, 175},
|
{IT_STRING|IT_CVAR, NULL, "Music Credits on Pause", &cv_pausesongcredits, 165},
|
||||||
|
|
||||||
{IT_STRING|IT_CVAR, NULL, "Beta Intermissionscreen", &cv_betainterscreen, 185},
|
{IT_STRING|IT_CVAR, NULL, "Beta Intermissionscreen", &cv_betainterscreen, 175},
|
||||||
|
|
||||||
{IT_STRING|IT_CVAR, NULL, "Show Director Prompt", &cv_showdirectorhud, 195},
|
{IT_STRING|IT_CVAR, NULL, "Show Director Prompt", &cv_showdirectorhud, 185},
|
||||||
|
|
||||||
{IT_STRING|IT_SUBMENU, NULL, "Nametags...", &OP_NametagDef, 205},
|
{IT_STRING|IT_SUBMENU, NULL, "Nametags...", &OP_NametagDef, 195},
|
||||||
{IT_STRING|IT_SUBMENU, NULL, "Driftgauge...", &OP_DriftGaugeDef, 210},
|
{IT_STRING|IT_SUBMENU, NULL, "Driftgauge...", &OP_DriftGaugeDef, 200},
|
||||||
|
|
||||||
{IT_SUBMENU|IT_STRING, NULL, "Hud Offsets...", &OP_HudOffsetDef, 220},
|
{IT_SUBMENU|IT_STRING, NULL, "Hud Offsets...", &OP_HudOffsetDef, 210},
|
||||||
};
|
};
|
||||||
|
|
||||||
static const char* OP_SaturnHudTooltips[] =
|
static const char* OP_SaturnHudTooltips[] =
|
||||||
@@ -1879,7 +1885,6 @@ static const char* OP_SaturnHudTooltips[] =
|
|||||||
"The color to use instead of the player color when\ncolourized hud is enabled.",
|
"The color to use instead of the player color when\ncolourized hud is enabled.",
|
||||||
"Displays the input display and lets you choose its style.",
|
"Displays the input display and lets you choose its style.",
|
||||||
"Enable the stat display.",
|
"Enable the stat display.",
|
||||||
"Show skin name in the stat display.",
|
|
||||||
"Enable the use of the higher resolution want icons instead of rank\nfor some places.",
|
"Enable the use of the higher resolution want icons instead of rank\nfor some places.",
|
||||||
"Make the Postionnumber half the size.",
|
"Make the Postionnumber half the size.",
|
||||||
"Disable the animation of the Positionnumber\nwhen overtaking someone.",
|
"Disable the animation of the Positionnumber\nwhen overtaking someone.",
|
||||||
@@ -1890,7 +1895,6 @@ static const char* OP_SaturnHudTooltips[] =
|
|||||||
"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.",
|
||||||
"Show players that have finished already on the minimap.",
|
|
||||||
"Minimize the player icons on the minimap.",
|
"Minimize the player icons on the minimap.",
|
||||||
"Erratically rotate player icons during spinouts.",
|
"Erratically rotate player icons during spinouts.",
|
||||||
"Visualize the player facing angle.",
|
"Visualize the player facing angle.",
|
||||||
@@ -2770,5 +2774,6 @@ void M_UpdateOGLMenu(void)
|
|||||||
OP_OpenGLOptionsMenu[op_gl_lightdither].status = (!HWR_UseShader()) ? IT_GRAYEDOUT : IT_STRING | IT_CVAR;
|
OP_OpenGLOptionsMenu[op_gl_lightdither].status = (!HWR_UseShader()) ? IT_GRAYEDOUT : IT_STRING | IT_CVAR;
|
||||||
|
|
||||||
OP_OpenGLOptionsMenu[op_gl_palrender].status = (cv_glscreentextures.value != 2 || !HWR_UseShader()) ? IT_GRAYEDOUT : IT_STRING | IT_CVAR;
|
OP_OpenGLOptionsMenu[op_gl_palrender].status = (cv_glscreentextures.value != 2 || !HWR_UseShader()) ? IT_GRAYEDOUT : IT_STRING | IT_CVAR;
|
||||||
|
OP_OpenGLOptionsMenu[op_gl_flashpal].status = (!HWR_ShouldUsePaletteRendering()) ? IT_GRAYEDOUT : IT_STRING | IT_CVAR;
|
||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
+10
-39
@@ -788,10 +788,10 @@ static void M_PNGText(png_structp png_ptr, png_infop png_info_ptr, PNG_CONST png
|
|||||||
else
|
else
|
||||||
snprintf(locationtxt, 40, "Unknown");
|
snprintf(locationtxt, 40, "Unknown");
|
||||||
|
|
||||||
memset(png_infotext, 0x00, sizeof(png_infotext));
|
memset(png_infotext,0x00,sizeof (png_infotext));
|
||||||
|
|
||||||
for (i = 0; i < SRB2PNGTXT; i++)
|
for (i = 0; i < SRB2PNGTXT; i++)
|
||||||
png_infotext[i].key = keytxt[i];
|
png_infotext[i].key = keytxt[i];
|
||||||
|
|
||||||
png_infotext[0].text = titletxt;
|
png_infotext[0].text = titletxt;
|
||||||
if (movie)
|
if (movie)
|
||||||
@@ -804,15 +804,9 @@ static void M_PNGText(png_structp png_ptr, png_infop png_info_ptr, PNG_CONST png
|
|||||||
png_infotext[5].text = locationtxt;
|
png_infotext[5].text = locationtxt;
|
||||||
png_infotext[6].text = interfacetxt;
|
png_infotext[6].text = interfacetxt;
|
||||||
png_infotext[7].text = rendermodetxt;
|
png_infotext[7].text = rendermodetxt;
|
||||||
strncpy(ctrevision, comprevision, sizeof(ctrevision)-1);
|
png_infotext[8].text = strncpy(ctrevision, comprevision, sizeof(ctrevision)-1);
|
||||||
ctrevision[sizeof(ctrevision)-1] = '\0';
|
png_infotext[9].text = strncpy(ctdate, compdate, sizeof(ctdate)-1);
|
||||||
png_infotext[8].text = ctrevision;
|
png_infotext[10].text = strncpy(cttime, comptime, sizeof(cttime)-1);
|
||||||
strncpy(ctdate, compdate, sizeof(ctdate)-1);
|
|
||||||
ctdate[sizeof(ctdate)-1] = '\0';
|
|
||||||
png_infotext[9].text = ctdate;
|
|
||||||
strncpy(cttime, comptime, sizeof(cttime)-1);
|
|
||||||
cttime[sizeof(cttime)-1] = '\0';
|
|
||||||
png_infotext[10].text = cttime;
|
|
||||||
|
|
||||||
png_set_text(png_ptr, png_info_ptr, png_infotext, SRB2PNGTXT);
|
png_set_text(png_ptr, png_info_ptr, png_infotext, SRB2PNGTXT);
|
||||||
#undef SRB2PNGTXT
|
#undef SRB2PNGTXT
|
||||||
@@ -1460,9 +1454,9 @@ INT32 axtoi(const char *hexStg)
|
|||||||
|
|
||||||
void CopyCaretColors(char *p, const char *s, int n)
|
void CopyCaretColors(char *p, const char *s, int n)
|
||||||
{
|
{
|
||||||
gconst char *t;
|
char *t;
|
||||||
int m;
|
int m;
|
||||||
int c;
|
int c;
|
||||||
|
|
||||||
if (!n)
|
if (!n)
|
||||||
return;
|
return;
|
||||||
@@ -1570,7 +1564,6 @@ char *M_GetToken(const char *inputString)
|
|||||||
{
|
{
|
||||||
startPos = endPos;
|
startPos = endPos;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (stringToUse == NULL)
|
if (stringToUse == NULL)
|
||||||
return NULL;
|
return NULL;
|
||||||
|
|
||||||
@@ -1641,8 +1634,7 @@ char *M_GetToken(const char *inputString)
|
|||||||
}
|
}
|
||||||
|
|
||||||
// If the end of the string is reached, no token is to be read
|
// If the end of the string is reached, no token is to be read
|
||||||
if (startPos == stringLength)
|
if (startPos == stringLength) {
|
||||||
{
|
|
||||||
endPos = stringLength;
|
endPos = stringLength;
|
||||||
return NULL;
|
return NULL;
|
||||||
}
|
}
|
||||||
@@ -1652,7 +1644,7 @@ char *M_GetToken(const char *inputString)
|
|||||||
|| stringToUse[startPos] == '}')
|
|| stringToUse[startPos] == '}')
|
||||||
{
|
{
|
||||||
endPos = startPos + 1;
|
endPos = startPos + 1;
|
||||||
texturesToken = (char *)Z_Malloc(2*sizeof(char), PU_STATIC, NULL);
|
texturesToken = (char *)Z_Malloc(2*sizeof(char),PU_STATIC,NULL);
|
||||||
texturesToken[0] = stringToUse[startPos];
|
texturesToken[0] = stringToUse[startPos];
|
||||||
texturesToken[1] = '\0';
|
texturesToken[1] = '\0';
|
||||||
return texturesToken;
|
return texturesToken;
|
||||||
@@ -1863,10 +1855,8 @@ int M_PathParts(const char *path)
|
|||||||
int n;
|
int n;
|
||||||
const char *p;
|
const char *p;
|
||||||
const char *t;
|
const char *t;
|
||||||
|
|
||||||
if (path == NULL)
|
if (path == NULL)
|
||||||
return 0;
|
return 0;
|
||||||
|
|
||||||
for (n = 0, p = path ;; ++n)
|
for (n = 0, p = path ;; ++n)
|
||||||
{
|
{
|
||||||
t = p;
|
t = p;
|
||||||
@@ -1879,7 +1869,6 @@ int M_PathParts(const char *path)
|
|||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
return n;
|
return n;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -1922,9 +1911,7 @@ void M_MkdirEachUntil(const char *cpath, int start, int end, int mode)
|
|||||||
if (!( p = strchr(p, PATHSEP[0]) ))
|
if (!( p = strchr(p, PATHSEP[0]) ))
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
p += strspn(p, PATHSEP);
|
p += strspn(p, PATHSEP);
|
||||||
|
|
||||||
for (;;)
|
for (;;)
|
||||||
{
|
{
|
||||||
if (end > 0 && !--end)
|
if (end > 0 && !--end)
|
||||||
@@ -1969,22 +1956,6 @@ UINT32 FNV1a_Hash(const char *message, size_t size)
|
|||||||
return hash;
|
return hash;
|
||||||
}
|
}
|
||||||
|
|
||||||
// Behaves like the old quickncasehash
|
|
||||||
// Stops either if it encounters null terminator
|
|
||||||
// or reaches size
|
|
||||||
UINT32 FNV1a_QuickCaseHash(const char *message, size_t size)
|
|
||||||
{
|
|
||||||
UINT32 hash = FNV1A_OFFSET_BASIS;
|
|
||||||
|
|
||||||
for (size_t i = 0; i < size && message[i]; i++)
|
|
||||||
{
|
|
||||||
hash ^= tolower(message[i]);
|
|
||||||
hash *= FNV1A_PRIME;
|
|
||||||
}
|
|
||||||
|
|
||||||
return hash;
|
|
||||||
}
|
|
||||||
|
|
||||||
UINT32 FNV1a_HashString(const char *message)
|
UINT32 FNV1a_HashString(const char *message)
|
||||||
{
|
{
|
||||||
UINT32 hash = FNV1A_OFFSET_BASIS;
|
UINT32 hash = FNV1A_OFFSET_BASIS;
|
||||||
|
|||||||
@@ -123,7 +123,6 @@ FUNCMATH UINT8 M_CountBits(UINT32 num, UINT8 size);
|
|||||||
|
|
||||||
// Hashes some message using FNV-1a
|
// Hashes some message using FNV-1a
|
||||||
UINT32 FNV1a_Hash(const char *message, size_t size);
|
UINT32 FNV1a_Hash(const char *message, size_t size);
|
||||||
UINT32 FNV1a_QuickCaseHash(const char *message, size_t size);
|
|
||||||
UINT32 FNV1a_HashString(const char *message);
|
UINT32 FNV1a_HashString(const char *message);
|
||||||
UINT32 FNV1a_HashLowercaseString(const char *message);
|
UINT32 FNV1a_HashLowercaseString(const char *message);
|
||||||
|
|
||||||
|
|||||||
+6
-6
@@ -256,7 +256,7 @@ static boolean M_TextInputHandleBase(textinput_t *input, INT32 key, boolean emot
|
|||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (ctrldown && (cv_keyboardlayout.value!=3 || !altdown))
|
if ((cv_keyboardlayout.value != 3 && ctrldown) || (cv_keyboardlayout.value == 3 && ctrldown && !altdown))
|
||||||
{
|
{
|
||||||
if (key == 'x' || key == 'X')
|
if (key == 'x' || key == 'X')
|
||||||
{
|
{
|
||||||
@@ -381,10 +381,10 @@ static boolean M_TextInputHandleBase(textinput_t *input, INT32 key, boolean emot
|
|||||||
// allow people to use keypad in console (good for typing IP addresses) - Calum
|
// allow people to use keypad in console (good for typing IP addresses) - Calum
|
||||||
if (key >= KEY_KEYPAD7 && key <= KEY_KPADDEL)
|
if (key >= KEY_KEYPAD7 && key <= KEY_KPADDEL)
|
||||||
{
|
{
|
||||||
const char keypad_translation[] = {'7','8','9','-',
|
char keypad_translation[] = {'7','8','9','-',
|
||||||
'4','5','6','+',
|
'4','5','6','+',
|
||||||
'1','2','3',
|
'1','2','3',
|
||||||
'0', '.'};
|
'0','.'};
|
||||||
|
|
||||||
key = keypad_translation[key - KEY_KEYPAD7];
|
key = keypad_translation[key - KEY_KEYPAD7];
|
||||||
}
|
}
|
||||||
@@ -392,7 +392,7 @@ static boolean M_TextInputHandleBase(textinput_t *input, INT32 key, boolean emot
|
|||||||
key = '/';
|
key = '/';
|
||||||
|
|
||||||
// same capslock code as hu_stuff.c's HU_responder. Check there for details.
|
// same capslock code as hu_stuff.c's HU_responder. Check there for details.
|
||||||
key = CON_ShiftChar(key);
|
key = cv_keyboardlayout.value == 3 ? CON_ShitAndAltGrChar(key) : CON_ShiftChar(key);
|
||||||
|
|
||||||
// enter a char into the command prompt
|
// enter a char into the command prompt
|
||||||
if (key < 32 || key > 127)
|
if (key < 32 || key > 127)
|
||||||
|
|||||||
@@ -16,10 +16,6 @@
|
|||||||
#ifndef _MD5_H
|
#ifndef _MD5_H
|
||||||
#define _MD5_H 1
|
#define _MD5_H 1
|
||||||
|
|
||||||
#ifdef __cplusplus
|
|
||||||
extern "C" {
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#include <stdio.h>
|
#include <stdio.h>
|
||||||
|
|
||||||
#if defined (HAVE_LIMITS_H) || (defined (_LIBC) && _LIBC) || defined (_WIN32)
|
#if defined (HAVE_LIMITS_H) || (defined (_LIBC) && _LIBC) || defined (_WIN32)
|
||||||
@@ -56,8 +52,4 @@ int md5_stream(FILE *stream, void *resblock) THROWFUNC;
|
|||||||
digest. */
|
digest. */
|
||||||
extern void *md5_buffer(const char *buffer, size_t len, void *resblock) THROWFUNC;
|
extern void *md5_buffer(const char *buffer, size_t len, void *resblock) THROWFUNC;
|
||||||
|
|
||||||
#ifdef __cplusplus
|
|
||||||
} // extern "C"
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#endif /* md5.h */
|
#endif /* md5.h */
|
||||||
@@ -262,7 +262,6 @@ Finish_registration (void)
|
|||||||
{
|
{
|
||||||
CONS_Printf("\n");
|
CONS_Printf("\n");
|
||||||
CONS_Alert(CONS_NOTICE, "%s\n", rules);
|
CONS_Alert(CONS_NOTICE, "%s\n", rules);
|
||||||
free(rules);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
if (registered)
|
if (registered)
|
||||||
@@ -599,14 +598,9 @@ Update_parameters (void)
|
|||||||
delayed = MSInProgress;
|
delayed = MSInProgress;
|
||||||
|
|
||||||
if (delayed)/* do another update after the current one */
|
if (delayed)/* do another update after the current one */
|
||||||
{
|
|
||||||
registered = 0;
|
|
||||||
MSUpdateAgain = true;
|
MSUpdateAgain = true;
|
||||||
}
|
|
||||||
else
|
else
|
||||||
{
|
|
||||||
registered = MSRegistered;
|
registered = MSRegistered;
|
||||||
}
|
|
||||||
}
|
}
|
||||||
Unlock_state();
|
Unlock_state();
|
||||||
|
|
||||||
|
|||||||
+56
-20
@@ -1531,7 +1531,10 @@ void A_LobShot(void *thing)
|
|||||||
|
|
||||||
if (!(actor->flags & MF_BOSS))
|
if (!(actor->flags & MF_BOSS))
|
||||||
{
|
{
|
||||||
actor->reactiontime = actor->info->reactiontime*TICRATE*2;
|
if (ultimatemode)
|
||||||
|
actor->reactiontime = actor->info->reactiontime*TICRATE;
|
||||||
|
else
|
||||||
|
actor->reactiontime = actor->info->reactiontime*TICRATE*2;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -1567,7 +1570,10 @@ void A_FireShot(void *thing)
|
|||||||
|
|
||||||
if (!(actor->flags & MF_BOSS))
|
if (!(actor->flags & MF_BOSS))
|
||||||
{
|
{
|
||||||
actor->reactiontime = actor->info->reactiontime*TICRATE*2;
|
if (ultimatemode)
|
||||||
|
actor->reactiontime = actor->info->reactiontime*TICRATE;
|
||||||
|
else
|
||||||
|
actor->reactiontime = actor->info->reactiontime*TICRATE*2;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -1607,7 +1613,10 @@ void A_SuperFireShot(void *thing)
|
|||||||
|
|
||||||
if (!(actor->flags & MF_BOSS))
|
if (!(actor->flags & MF_BOSS))
|
||||||
{
|
{
|
||||||
actor->reactiontime = actor->info->reactiontime*TICRATE*2;
|
if (ultimatemode)
|
||||||
|
actor->reactiontime = actor->info->reactiontime*TICRATE;
|
||||||
|
else
|
||||||
|
actor->reactiontime = actor->info->reactiontime*TICRATE*2;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -2861,6 +2870,12 @@ void A_ExtraLife(void *thing)
|
|||||||
if (actor->type == MT_1UPICO && !actor->tracer)
|
if (actor->type == MT_1UPICO && !actor->tracer)
|
||||||
actor->frame -= 2; // No lives icon for this player, use the default.
|
actor->frame -= 2; // No lives icon for this player, use the default.
|
||||||
|
|
||||||
|
if (ultimatemode) //I don't THINK so!
|
||||||
|
{
|
||||||
|
S_StartSound(player->mo, sfx_lose);
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
// In shooter gametypes, give the player 100 rings instead of an extra life.
|
// In shooter gametypes, give the player 100 rings instead of an extra life.
|
||||||
if (gametype != GT_COOP && gametype != GT_COMPETITION)
|
if (gametype != GT_COOP && gametype != GT_COMPETITION)
|
||||||
P_GivePlayerRings(player, 100);
|
P_GivePlayerRings(player, 100);
|
||||||
@@ -3635,7 +3650,7 @@ static inline boolean PIT_GrenadeRing(mobj_t *thing)
|
|||||||
return true;
|
return true;
|
||||||
|
|
||||||
if (thing->player && (thing->player->kartstuff[k_hyudorotimer]
|
if (thing->player && (thing->player->kartstuff[k_hyudorotimer]
|
||||||
|| (G_BattleGametype() && thing->player->kartstuff[k_bumper] <= 0 && thing->player->kartstuff[k_comebacktimer])))
|
|| (G_BattleGametype() && thing->player && thing->player->kartstuff[k_bumper] <= 0 && thing->player->kartstuff[k_comebacktimer])))
|
||||||
return true;
|
return true;
|
||||||
|
|
||||||
if ((gametype == GT_CTF || gametype == GT_TEAMMATCH)
|
if ((gametype == GT_CTF || gametype == GT_TEAMMATCH)
|
||||||
@@ -4000,13 +4015,26 @@ void A_JetChase(void *thing)
|
|||||||
}
|
}
|
||||||
|
|
||||||
// chase towards player
|
// chase towards player
|
||||||
P_Thrust(actor, actor->angle, FixedMul(actor->info->speed/4, actor->scale));
|
if (ultimatemode)
|
||||||
|
P_Thrust(actor, actor->angle, FixedMul(actor->info->speed/2, actor->scale));
|
||||||
|
else
|
||||||
|
P_Thrust(actor, actor->angle, FixedMul(actor->info->speed/4, actor->scale));
|
||||||
|
|
||||||
// must adjust height
|
// must adjust height
|
||||||
if (actor->z < (actor->target->z + actor->target->height + FixedMul((32<<FRACBITS), actor->scale)))
|
if (ultimatemode)
|
||||||
actor->momz += FixedMul(FRACUNIT/2, actor->scale);
|
{
|
||||||
|
if (actor->z < (actor->target->z + actor->target->height + FixedMul((64<<FRACBITS), actor->scale)))
|
||||||
|
actor->momz += FixedMul(FRACUNIT/2, actor->scale);
|
||||||
|
else
|
||||||
|
actor->momz -= FixedMul(FRACUNIT/2, actor->scale);
|
||||||
|
}
|
||||||
else
|
else
|
||||||
actor->momz -= FixedMul(FRACUNIT/2, actor->scale);
|
{
|
||||||
|
if (actor->z < (actor->target->z + actor->target->height + FixedMul((32<<FRACBITS), actor->scale)))
|
||||||
|
actor->momz += FixedMul(FRACUNIT/2, actor->scale);
|
||||||
|
else
|
||||||
|
actor->momz -= FixedMul(FRACUNIT/2, actor->scale);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
// Function: A_JetbThink
|
// Function: A_JetbThink
|
||||||
@@ -4109,7 +4137,10 @@ void A_JetgShoot(void *thing)
|
|||||||
A_FaceTarget(actor);
|
A_FaceTarget(actor);
|
||||||
P_SpawnMissile(actor, actor->target, (mobjtype_t)actor->info->raisestate);
|
P_SpawnMissile(actor, actor->target, (mobjtype_t)actor->info->raisestate);
|
||||||
|
|
||||||
actor->reactiontime = actor->info->reactiontime*TICRATE*2;
|
if (ultimatemode)
|
||||||
|
actor->reactiontime = actor->info->reactiontime*TICRATE;
|
||||||
|
else
|
||||||
|
actor->reactiontime = actor->info->reactiontime*TICRATE*2;
|
||||||
|
|
||||||
if (actor->info->attacksound)
|
if (actor->info->attacksound)
|
||||||
S_StartSound(actor, actor->info->attacksound);
|
S_StartSound(actor, actor->info->attacksound);
|
||||||
@@ -5270,7 +5301,7 @@ void A_MixUp(void *thing)
|
|||||||
if (playeringame[i] && players[i].mo && players[i].mo->health > 0 && players[i].playerstate == PST_LIVE
|
if (playeringame[i] && players[i].mo && players[i].mo->health > 0 && players[i].playerstate == PST_LIVE
|
||||||
&& !players[i].exiting && !players[i].powers[pw_super])
|
&& !players[i].exiting && !players[i].powers[pw_super])
|
||||||
{
|
{
|
||||||
if (netgame && players[i].spectator) // Ignore spectators
|
if ((netgame || multiplayer) && players[i].spectator) // Ignore spectators
|
||||||
continue;
|
continue;
|
||||||
|
|
||||||
numplayers++;
|
numplayers++;
|
||||||
@@ -5313,11 +5344,6 @@ void A_MixUp(void *thing)
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
// idk if we ever really end up here
|
|
||||||
// but bad things would happen if we do without this
|
|
||||||
if (one == -1)
|
|
||||||
return;
|
|
||||||
|
|
||||||
//get this done first!
|
//get this done first!
|
||||||
tempthing = players[one].mo->tracer;
|
tempthing = players[one].mo->tracer;
|
||||||
P_SetTarget(&players[one].mo->tracer, players[two].mo->tracer);
|
P_SetTarget(&players[one].mo->tracer, players[two].mo->tracer);
|
||||||
@@ -6432,8 +6458,12 @@ void A_BuzzFly(void *thing)
|
|||||||
// chase towards player
|
// chase towards player
|
||||||
{
|
{
|
||||||
INT32 dist, realspeed;
|
INT32 dist, realspeed;
|
||||||
|
const fixed_t mf = 5*(FRACUNIT/4);
|
||||||
|
|
||||||
realspeed = FixedMul(actor->info->speed, actor->scale);
|
if (ultimatemode)
|
||||||
|
realspeed = FixedMul(FixedMul(actor->info->speed,mf), actor->scale);
|
||||||
|
else
|
||||||
|
realspeed = FixedMul(actor->info->speed, actor->scale);
|
||||||
|
|
||||||
dist = P_AproxDistance(P_AproxDistance(actor->target->x - actor->x,
|
dist = P_AproxDistance(P_AproxDistance(actor->target->x - actor->x,
|
||||||
actor->target->y - actor->y), actor->target->z - actor->z);
|
actor->target->y - actor->y), actor->target->z - actor->z);
|
||||||
@@ -7888,7 +7918,7 @@ void A_ItemPop(void *thing)
|
|||||||
|
|
||||||
if (!(actor->target && actor->target->player))
|
if (!(actor->target && actor->target->player))
|
||||||
{
|
{
|
||||||
if (cv_debug)
|
if (cv_debug && !(actor->target && actor->target->player))
|
||||||
CONS_Printf("ERROR: Powerup has no target!\n");
|
CONS_Printf("ERROR: Powerup has no target!\n");
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
@@ -8750,7 +8780,7 @@ void A_ReaperThinker(void *thing)
|
|||||||
actor->angle = R_PointToAngle2(actor->x, actor->y, actor->target->x, actor->target->y);
|
actor->angle = R_PointToAngle2(actor->x, actor->y, actor->target->x, actor->target->y);
|
||||||
|
|
||||||
// The player we should target if it's near us:
|
// The player we should target if it's near us:
|
||||||
for (i = 0; i < MAXPLAYERS; i++)
|
for (i = 0; i<MAXPLAYERS; i++)
|
||||||
{
|
{
|
||||||
|
|
||||||
if (!playeringame[i])
|
if (!playeringame[i])
|
||||||
@@ -9221,7 +9251,10 @@ void A_MultiShot(void *thing)
|
|||||||
|
|
||||||
if (!(actor->flags & MF_BOSS))
|
if (!(actor->flags & MF_BOSS))
|
||||||
{
|
{
|
||||||
actor->reactiontime = actor->info->reactiontime*TICRATE*2;
|
if (ultimatemode)
|
||||||
|
actor->reactiontime = actor->info->reactiontime*TICRATE;
|
||||||
|
else
|
||||||
|
actor->reactiontime = actor->info->reactiontime*TICRATE*2;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -10830,7 +10863,10 @@ void A_BrakFireShot(void *thing)
|
|||||||
|
|
||||||
if (!(actor->flags & MF_BOSS))
|
if (!(actor->flags & MF_BOSS))
|
||||||
{
|
{
|
||||||
actor->reactiontime = actor->info->reactiontime*TICRATE*2;
|
if (ultimatemode)
|
||||||
|
actor->reactiontime = actor->info->reactiontime*TICRATE;
|
||||||
|
else
|
||||||
|
actor->reactiontime = actor->info->reactiontime*TICRATE*2;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
+23
-3
@@ -831,7 +831,7 @@ void P_TouchSpecialThing(mobj_t *special, mobj_t *toucher, boolean heightcheck)
|
|||||||
{
|
{
|
||||||
S_StartSound(toucher, special->info->seesound);
|
S_StartSound(toucher, special->info->seesound);
|
||||||
|
|
||||||
if (UNLIKELY(player->pflags & PF_NIGHTSMODE))
|
if (player->pflags & PF_NIGHTSMODE)
|
||||||
{
|
{
|
||||||
player->bumpertime = TICRATE/2;
|
player->bumpertime = TICRATE/2;
|
||||||
if (special->threshold > 0)
|
if (special->threshold > 0)
|
||||||
@@ -1131,7 +1131,7 @@ void P_TouchSpecialThing(mobj_t *special, mobj_t *toucher, boolean heightcheck)
|
|||||||
S_StartSound(toucher, special->info->painsound);
|
S_StartSound(toucher, special->info->painsound);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
else if (UNLIKELY((player->pflags & PF_NIGHTSMODE) && (player->pflags & PF_DRILLING)) || (player->pflags & (PF_JUMPED|PF_SPINNING|PF_GLIDING))
|
else if (((player->pflags & PF_NIGHTSMODE) && (player->pflags & PF_DRILLING)) || (player->pflags & (PF_JUMPED|PF_SPINNING|PF_GLIDING))
|
||||||
|| player->powers[pw_invulnerability] || player->powers[pw_super]) // Do you possess the ability to subdue the object?
|
|| player->powers[pw_invulnerability] || player->powers[pw_super]) // Do you possess the ability to subdue the object?
|
||||||
{
|
{
|
||||||
// Shatter the shield!
|
// Shatter the shield!
|
||||||
@@ -1219,6 +1219,24 @@ void P_TouchSpecialThing(mobj_t *special, mobj_t *toucher, boolean heightcheck)
|
|||||||
|
|
||||||
case MT_EXTRALARGEBUBBLE:
|
case MT_EXTRALARGEBUBBLE:
|
||||||
return; // SRB2kart - don't need bubbles mucking with the player
|
return; // SRB2kart - don't need bubbles mucking with the player
|
||||||
|
if ((player->powers[pw_shield] & SH_NOSTACK) == SH_ELEMENTAL)
|
||||||
|
return;
|
||||||
|
if (UNLIKELY(maptol & TOL_NIGHTS))
|
||||||
|
return;
|
||||||
|
if (UNLIKELY(mariomode))
|
||||||
|
return;
|
||||||
|
else if (toucher->eflags & MFE_VERTICALFLIP)
|
||||||
|
{
|
||||||
|
if (special->z+special->height < toucher->z + toucher->height / 3
|
||||||
|
|| special->z+special->height > toucher->z + (toucher->height*2/3))
|
||||||
|
return; // Only go in the mouth
|
||||||
|
}
|
||||||
|
else if (special->z < toucher->z + toucher->height / 3
|
||||||
|
|| special->z > toucher->z + (toucher->height*2/3))
|
||||||
|
return; // Only go in the mouth
|
||||||
|
|
||||||
|
toucher->momx = toucher->momy = toucher->momz = 0;
|
||||||
|
break;
|
||||||
|
|
||||||
case MT_WATERDROP:
|
case MT_WATERDROP:
|
||||||
if (special->state == &states[special->info->spawnstate])
|
if (special->state == &states[special->info->spawnstate])
|
||||||
@@ -1860,8 +1878,10 @@ void P_KillMobj(mobj_t *target, mobj_t *inflictor, mobj_t *source)
|
|||||||
P_InstaThrust(target,target->angle,FixedMul(2*FRACUNIT, target->scale));
|
P_InstaThrust(target,target->angle,FixedMul(2*FRACUNIT, target->scale));
|
||||||
target->momz = FixedMul(7*FRACUNIT, target->scale);
|
target->momz = FixedMul(7*FRACUNIT, target->scale);
|
||||||
if (flip)
|
if (flip)
|
||||||
{
|
|
||||||
target->momz = -target->momz;
|
target->momz = -target->momz;
|
||||||
|
|
||||||
|
if (flip)
|
||||||
|
{
|
||||||
target = P_SpawnMobj(x,y,z-FixedMul(12*FRACUNIT, target->scale),MT_SPIKE);
|
target = P_SpawnMobj(x,y,z-FixedMul(12*FRACUNIT, target->scale),MT_SPIKE);
|
||||||
target->eflags |= MFE_VERTICALFLIP;
|
target->eflags |= MFE_VERTICALFLIP;
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -30,6 +30,8 @@ extern "C" {
|
|||||||
|
|
||||||
#define FLOATSPEED (FRACUNIT*4)
|
#define FLOATSPEED (FRACUNIT*4)
|
||||||
|
|
||||||
|
//#define VIEWHEIGHTS "41"
|
||||||
|
|
||||||
// Maximum player score.
|
// Maximum player score.
|
||||||
#define MAXSCORE 999999990
|
#define MAXSCORE 999999990
|
||||||
|
|
||||||
@@ -99,6 +101,9 @@ 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;
|
||||||
|
|
||||||
|
// Things used by FS cameras.
|
||||||
|
fixed_t viewheight;
|
||||||
|
angle_t startangle;
|
||||||
|
|
||||||
// Camera demobjerization
|
// Camera demobjerization
|
||||||
// Info for drawing: position.
|
// Info for drawing: position.
|
||||||
@@ -118,6 +123,8 @@ typedef struct camera_s
|
|||||||
fixed_t radius;
|
fixed_t radius;
|
||||||
fixed_t height;
|
fixed_t height;
|
||||||
|
|
||||||
|
fixed_t relativex;
|
||||||
|
|
||||||
// Momentums, used to update position.
|
// Momentums, used to update position.
|
||||||
fixed_t momx, momy, momz;
|
fixed_t momx, momy, momz;
|
||||||
|
|
||||||
@@ -207,6 +214,7 @@ mobj_t *P_SpawnGhostMobj(mobj_t *mobj);
|
|||||||
void P_GivePlayerRings(player_t *player, INT32 num_rings);
|
void P_GivePlayerRings(player_t *player, INT32 num_rings);
|
||||||
void P_GivePlayerLives(player_t *player, INT32 numlives);
|
void P_GivePlayerLives(player_t *player, INT32 numlives);
|
||||||
UINT8 P_GetNextEmerald(void);
|
UINT8 P_GetNextEmerald(void);
|
||||||
|
void P_GiveEmerald(boolean spawnObj);
|
||||||
void P_ResetScore(player_t *player);
|
void P_ResetScore(player_t *player);
|
||||||
boolean P_AutoPause(void);
|
boolean P_AutoPause(void);
|
||||||
|
|
||||||
@@ -214,6 +222,7 @@ void P_DoJumpShield(player_t *player);
|
|||||||
void P_BlackOw(player_t *player);
|
void P_BlackOw(player_t *player);
|
||||||
void P_ElementalFireTrail(player_t *player);
|
void P_ElementalFireTrail(player_t *player);
|
||||||
|
|
||||||
|
//void P_DoPityCheck(player_t *player);
|
||||||
void P_PlayerThink(player_t *player);
|
void P_PlayerThink(player_t *player);
|
||||||
void P_PlayerAfterThink(player_t *player);
|
void P_PlayerAfterThink(player_t *player);
|
||||||
void P_DoPlayerExit(player_t *player);
|
void P_DoPlayerExit(player_t *player);
|
||||||
@@ -230,10 +239,14 @@ void P_InstaThrustEvenIn2D(mobj_t *mo, angle_t angle, fixed_t move);
|
|||||||
boolean P_LookForEnemies(player_t *player);
|
boolean P_LookForEnemies(player_t *player);
|
||||||
void P_NukeEnemies(mobj_t *inflictor, mobj_t *source, fixed_t radius);
|
void P_NukeEnemies(mobj_t *inflictor, mobj_t *source, fixed_t radius);
|
||||||
void P_HomingAttack(mobj_t *source, mobj_t *enemy); /// \todo doesn't belong in p_user
|
void P_HomingAttack(mobj_t *source, mobj_t *enemy); /// \todo doesn't belong in p_user
|
||||||
|
//boolean P_SuperReady(player_t *player);
|
||||||
boolean P_AnalogMove(player_t *player);
|
boolean P_AnalogMove(player_t *player);
|
||||||
|
/*boolean P_TransferToNextMare(player_t *player);
|
||||||
|
UINT8 P_FindLowestMare(void);*/
|
||||||
UINT8 P_FindLowestLap(void);
|
UINT8 P_FindLowestLap(void);
|
||||||
UINT8 P_FindHighestLap(void);
|
UINT8 P_FindHighestLap(void);
|
||||||
void P_FindEmerald(void);
|
void P_FindEmerald(void);
|
||||||
|
//void P_TransferToAxis(player_t *player, INT32 axisnum);
|
||||||
boolean P_PlayerMoving(INT32 pnum);
|
boolean P_PlayerMoving(INT32 pnum);
|
||||||
void P_Telekinesis(player_t *player, fixed_t thrust, fixed_t range);
|
void P_Telekinesis(player_t *player, fixed_t thrust, fixed_t range);
|
||||||
|
|
||||||
@@ -274,6 +287,7 @@ void P_RemoveMobj(mobj_t *th);
|
|||||||
void P_RemoveSavegameMobj(mobj_t *th);
|
void P_RemoveSavegameMobj(mobj_t *th);
|
||||||
boolean P_SetPlayerMobjState(mobj_t *mobj, statenum_t state);
|
boolean P_SetPlayerMobjState(mobj_t *mobj, statenum_t state);
|
||||||
boolean P_SetMobjState(mobj_t *mobj, statenum_t state);
|
boolean P_SetMobjState(mobj_t *mobj, statenum_t state);
|
||||||
|
//void P_RunShields(void);
|
||||||
void P_RunOverlays(void);
|
void P_RunOverlays(void);
|
||||||
void P_RunShadows(void);
|
void P_RunShadows(void);
|
||||||
void P_MobjThinker(mobj_t *mobj);
|
void P_MobjThinker(mobj_t *mobj);
|
||||||
|
|||||||
+81
-24
@@ -122,6 +122,27 @@ static void P_CycleMobjState(mobj_t *mobj)
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
//
|
||||||
|
// P_CycleMobjState for players.
|
||||||
|
//
|
||||||
|
static void P_CyclePlayerMobjState(mobj_t *mobj)
|
||||||
|
{
|
||||||
|
// state animations
|
||||||
|
P_CycleStateAnimation(mobj);
|
||||||
|
|
||||||
|
// cycle through states,
|
||||||
|
// calling action functions at transitions
|
||||||
|
if (mobj->tics != -1)
|
||||||
|
{
|
||||||
|
mobj->tics--;
|
||||||
|
|
||||||
|
// you can cycle through multiple states in a tic
|
||||||
|
if (!mobj->tics && mobj->state)
|
||||||
|
if (!P_SetPlayerMobjState(mobj, mobj->state->nextstate))
|
||||||
|
return; // freed itself
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
#define MAX_RECURSION 20
|
#define MAX_RECURSION 20
|
||||||
|
|
||||||
//
|
//
|
||||||
@@ -898,7 +919,12 @@ static void P_PlayerFlip(mobj_t *mo)
|
|||||||
G_GhostAddFlip((INT32) (mo->player - players));
|
G_GhostAddFlip((INT32) (mo->player - players));
|
||||||
// Flip aiming to match!
|
// Flip aiming to match!
|
||||||
|
|
||||||
if (mo->player->pflags & PF_FLIPCAM)
|
if (UNLIKELY(mo->player->pflags & PF_NIGHTSMODE)) // NiGHTS doesn't use flipcam
|
||||||
|
{
|
||||||
|
if (mo->tracer)
|
||||||
|
mo->tracer->eflags ^= MFE_VERTICALFLIP;
|
||||||
|
}
|
||||||
|
else if (mo->player->pflags & PF_FLIPCAM)
|
||||||
{
|
{
|
||||||
UINT8 i;
|
UINT8 i;
|
||||||
|
|
||||||
@@ -920,11 +946,6 @@ static void P_PlayerFlip(mobj_t *mo)
|
|||||||
camera[i].z += FixedMul(20*FRACUNIT, mo->scale);
|
camera[i].z += FixedMul(20*FRACUNIT, mo->scale);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
else if (UNLIKELY(mo->player->pflags & PF_NIGHTSMODE)) // NiGHTS doesn't use flipcam
|
|
||||||
{
|
|
||||||
if (mo->tracer)
|
|
||||||
mo->tracer->eflags ^= MFE_VERTICALFLIP;
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
//
|
//
|
||||||
@@ -1649,14 +1670,6 @@ void P_XYMovement(mobj_t *mo)
|
|||||||
if (mo->flags & MF_NOCLIPHEIGHT)
|
if (mo->flags & MF_NOCLIPHEIGHT)
|
||||||
return; // no frictions for objects that can pass through floors
|
return; // no frictions for objects that can pass through floors
|
||||||
|
|
||||||
//{ SRB2kart stuff
|
|
||||||
if (mo->type == MT_ORBINAUT || mo->type == MT_JAWZ_DUD || mo->type == MT_JAWZ || mo->type == MT_BALLHOG) //(mo->type == MT_JAWZ && !mo->tracer))
|
|
||||||
return;
|
|
||||||
|
|
||||||
if (mo->player && (mo->player->kartstuff[k_spinouttimer] && !mo->player->kartstuff[k_wipeoutslow]) && mo->player->speed <= K_GetKartSpeed(mo->player, false)/2)
|
|
||||||
return;
|
|
||||||
//}
|
|
||||||
|
|
||||||
if (mo->flags & MF_MISSILE || mo->flags2 & MF2_SKULLFLY || mo->type == MT_SHELL || mo->type == MT_VULTURE)
|
if (mo->flags & MF_MISSILE || mo->flags2 & MF2_SKULLFLY || mo->type == MT_SHELL || mo->type == MT_VULTURE)
|
||||||
return; // no friction for missiles ever
|
return; // no friction for missiles ever
|
||||||
|
|
||||||
@@ -1670,6 +1683,14 @@ void P_XYMovement(mobj_t *mo)
|
|||||||
&& (mo->standingslope && abs(mo->standingslope->zdelta) > FRACUNIT>>8)) // Special exception for tumbleweeds on slopes
|
&& (mo->standingslope && abs(mo->standingslope->zdelta) > FRACUNIT>>8)) // Special exception for tumbleweeds on slopes
|
||||||
return;
|
return;
|
||||||
|
|
||||||
|
//{ SRB2kart stuff
|
||||||
|
if (mo->type == MT_ORBINAUT || mo->type == MT_JAWZ_DUD || mo->type == MT_JAWZ || mo->type == MT_BALLHOG) //(mo->type == MT_JAWZ && !mo->tracer))
|
||||||
|
return;
|
||||||
|
|
||||||
|
if (mo->player && (mo->player->kartstuff[k_spinouttimer] && !mo->player->kartstuff[k_wipeoutslow]) && mo->player->speed <= K_GetKartSpeed(mo->player, false)/2)
|
||||||
|
return;
|
||||||
|
//}
|
||||||
|
|
||||||
if (((!(mo->eflags & MFE_VERTICALFLIP) && mo->z > mo->floorz) || (mo->eflags & MFE_VERTICALFLIP && mo->z+mo->height < mo->ceilingz))
|
if (((!(mo->eflags & MFE_VERTICALFLIP) && mo->z > mo->floorz) || (mo->eflags & MFE_VERTICALFLIP && mo->z+mo->height < mo->ceilingz))
|
||||||
&& !(player && player->pflags & PF_SLIDING))
|
&& !(player && player->pflags & PF_SLIDING))
|
||||||
return; // no friction when airborne
|
return; // no friction when airborne
|
||||||
@@ -3189,6 +3210,30 @@ static boolean P_CameraCheckWater(camera_t *thiscam)
|
|||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
void P_DestroyRobots(void)
|
||||||
|
{
|
||||||
|
// Search through all the thinkers for enemies.
|
||||||
|
mobj_t *mo;
|
||||||
|
thinker_t *think;
|
||||||
|
|
||||||
|
for (think = thinkercap.next; think != &thinkercap; think = think->next)
|
||||||
|
{
|
||||||
|
if (think->function != (actionf_p1)P_MobjThinker)
|
||||||
|
continue; // not a mobj thinker
|
||||||
|
|
||||||
|
mo = (mobj_t *)think;
|
||||||
|
|
||||||
|
if (mo->health <= 0 || !(mo->flags & MF_ENEMY || mo->flags & MF_BOSS))
|
||||||
|
continue; // not a valid enemy
|
||||||
|
|
||||||
|
if (mo->type == MT_PLAYER) // Don't chase after other players!
|
||||||
|
continue;
|
||||||
|
|
||||||
|
// Found a target enemy
|
||||||
|
P_KillMobj(mo, players[consoleplayer].mo, players[consoleplayer].mo);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
// the below is chasecam only, if you're curious. check out P_CalcPostImg in p_user.c for first person
|
// the below is chasecam only, if you're curious. check out P_CalcPostImg in p_user.c for first person
|
||||||
void P_CalcChasePostImg(player_t *player, camera_t *thiscam)
|
void P_CalcChasePostImg(player_t *player, camera_t *thiscam)
|
||||||
{
|
{
|
||||||
@@ -3207,7 +3252,7 @@ void P_CalcChasePostImg(player_t *player, camera_t *thiscam)
|
|||||||
player_flipcam = cv_flipcam[pnum].value;
|
player_flipcam = cv_flipcam[pnum].value;
|
||||||
}
|
}
|
||||||
|
|
||||||
const boolean flipcam = (player_flipcam && player->mo->eflags & MFE_VERTICALFLIP && LIKELY(!(player->pflags & PF_NIGHTSMODE)));
|
const boolean flipcam = (player_flipcam && !(player->pflags & PF_NIGHTSMODE) && player->mo->eflags & MFE_VERTICALFLIP);
|
||||||
UINT8 postimgtype = 0;
|
UINT8 postimgtype = 0;
|
||||||
|
|
||||||
if (encoremode)
|
if (encoremode)
|
||||||
@@ -5620,15 +5665,13 @@ void P_SetScale(mobj_t *mobj, fixed_t newscale)
|
|||||||
void P_Attract(mobj_t *source, mobj_t *dest, boolean nightsgrab) // Home in on your target
|
void P_Attract(mobj_t *source, mobj_t *dest, boolean nightsgrab) // Home in on your target
|
||||||
{
|
{
|
||||||
fixed_t dist, ndist, speedmul;
|
fixed_t dist, ndist, speedmul;
|
||||||
fixed_t tx, ty, tz;
|
fixed_t tx = dest->x;
|
||||||
|
fixed_t ty = dest->y;
|
||||||
|
fixed_t tz = dest->z + (dest->height/2); // Aim for center
|
||||||
|
|
||||||
if (!dest || dest->health <= 0 || !dest->player || !source->tracer)
|
if (!dest || dest->health <= 0 || !dest->player || !source->tracer)
|
||||||
return;
|
return;
|
||||||
|
|
||||||
tx = dest->x;
|
|
||||||
ty = dest->y;
|
|
||||||
tz = dest->z + (dest->height/2); // Aim for center
|
|
||||||
|
|
||||||
// change slope
|
// change slope
|
||||||
dist = P_AproxDistance(P_AproxDistance(tx - source->x, ty - source->y), tz - source->z);
|
dist = P_AproxDistance(P_AproxDistance(tx - source->x, ty - source->y), tz - source->z);
|
||||||
|
|
||||||
@@ -8510,7 +8553,7 @@ static boolean P_MobjRegularThink(mobj_t *mobj)
|
|||||||
|
|
||||||
if (mobj->tracer && mobj->tracer->player)
|
if (mobj->tracer && mobj->tracer->player)
|
||||||
{
|
{
|
||||||
if (LIKELY(!(mobj->tracer->player->pflags & PF_NIGHTSMODE)))
|
if (!(mobj->tracer->player->pflags & PF_NIGHTSMODE))
|
||||||
{
|
{
|
||||||
mobj->flags &= ~MF_NOGRAVITY;
|
mobj->flags &= ~MF_NOGRAVITY;
|
||||||
mobj->flags2 &= ~MF2_DONTDRAW;
|
mobj->flags2 &= ~MF2_DONTDRAW;
|
||||||
@@ -8534,7 +8577,7 @@ static boolean P_MobjRegularThink(mobj_t *mobj)
|
|||||||
P_SetTarget(&mobj->target, NULL);
|
P_SetTarget(&mobj->target, NULL);
|
||||||
}
|
}
|
||||||
|
|
||||||
if (UNLIKELY(mobj->tracer->player->pflags & PF_NIGHTSMODE))
|
if (mobj->tracer->player->pflags & PF_NIGHTSMODE)
|
||||||
{
|
{
|
||||||
if (mobj->tracer->player->bonustime)
|
if (mobj->tracer->player->bonustime)
|
||||||
{
|
{
|
||||||
@@ -9178,7 +9221,10 @@ void P_MobjThinker(mobj_t *mobj)
|
|||||||
}
|
}
|
||||||
|
|
||||||
// Can end up here if a player dies.
|
// Can end up here if a player dies.
|
||||||
P_CycleMobjState(mobj);
|
if (mobj->player)
|
||||||
|
P_CyclePlayerMobjState(mobj);
|
||||||
|
else
|
||||||
|
P_CycleMobjState(mobj);
|
||||||
|
|
||||||
if (P_MobjWasRemoved(mobj))
|
if (P_MobjWasRemoved(mobj))
|
||||||
return;
|
return;
|
||||||
@@ -11072,6 +11118,8 @@ void P_SpawnMapThing(mapthing_t *mthing)
|
|||||||
{
|
{
|
||||||
if (!cv_powerstones.value || !G_BattleGametype())
|
if (!cv_powerstones.value || !G_BattleGametype())
|
||||||
return;
|
return;
|
||||||
|
|
||||||
|
runemeraldmanager = true;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (!G_RaceGametype()) // No enemies in match or CTF modes
|
if (!G_RaceGametype()) // No enemies in match or CTF modes
|
||||||
@@ -11163,7 +11211,16 @@ void P_SpawnMapThing(mapthing_t *mthing)
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if (i == MT_EMMY && (gametype != GT_COOP || tokenbits == 30 || tokenlist & (1 << tokenbits++)))
|
if (ultimatemode)
|
||||||
|
{
|
||||||
|
if (i == MT_PITYTV || i == MT_GREENTV || i == MT_YELLOWTV || i == MT_BLUETV || i == MT_BLACKTV || i == MT_WHITETV)
|
||||||
|
return; // No shields in Ultimate mode
|
||||||
|
|
||||||
|
if (i == MT_SUPERRINGBOX)
|
||||||
|
return; // No rings in Ultimate mode (except special stages)
|
||||||
|
}
|
||||||
|
|
||||||
|
if (i == MT_EMMY && (gametype != GT_COOP || ultimatemode || tokenbits == 30 || tokenlist & (1 << tokenbits++)))
|
||||||
return; // you already got this token, or there are too many, or the gametype's not right
|
return; // you already got this token, or there are too many, or the gametype's not right
|
||||||
|
|
||||||
// Objectplace landing point
|
// Objectplace landing point
|
||||||
|
|||||||
@@ -499,6 +499,7 @@ void P_SpawnPrecipitation(void);
|
|||||||
void P_SpawnParaloop(fixed_t x, fixed_t y, fixed_t z, fixed_t radius, INT32 number, mobjtype_t type, statenum_t nstate, angle_t rotangle, boolean spawncenter);
|
void P_SpawnParaloop(fixed_t x, fixed_t y, fixed_t z, fixed_t radius, INT32 number, mobjtype_t type, statenum_t nstate, angle_t rotangle, boolean spawncenter);
|
||||||
boolean P_BossTargetPlayer(mobj_t *actor, boolean closest);
|
boolean P_BossTargetPlayer(mobj_t *actor, boolean closest);
|
||||||
boolean P_SupermanLook4Players(mobj_t *actor);
|
boolean P_SupermanLook4Players(mobj_t *actor);
|
||||||
|
void P_DestroyRobots(void);
|
||||||
boolean P_PrecipThinker(precipmobj_t *mobj);
|
boolean P_PrecipThinker(precipmobj_t *mobj);
|
||||||
void P_NullPrecipThinker(precipmobj_t *mobj);
|
void P_NullPrecipThinker(precipmobj_t *mobj);
|
||||||
void P_FreePrecipMobj(precipmobj_t *mobj);
|
void P_FreePrecipMobj(precipmobj_t *mobj);
|
||||||
@@ -509,6 +510,7 @@ void P_EmeraldManager(void);
|
|||||||
#define MAXHUNTEMERALDS 64
|
#define MAXHUNTEMERALDS 64
|
||||||
extern mapthing_t *huntemeralds[MAXHUNTEMERALDS];
|
extern mapthing_t *huntemeralds[MAXHUNTEMERALDS];
|
||||||
extern INT32 numhuntemeralds;
|
extern INT32 numhuntemeralds;
|
||||||
|
extern boolean runemeraldmanager;
|
||||||
extern INT32 numstarposts;
|
extern INT32 numstarposts;
|
||||||
|
|
||||||
#ifdef __cplusplus
|
#ifdef __cplusplus
|
||||||
|
|||||||
@@ -3308,6 +3308,8 @@ FUNCINLINE static ATTRINLINE void P_ArchiveMisc(savebuffer_t *save)
|
|||||||
else
|
else
|
||||||
WRITEINT16(save->p, gamemap);
|
WRITEINT16(save->p, gamemap);
|
||||||
|
|
||||||
|
lastmapsaved = gamemap;
|
||||||
|
|
||||||
WRITEUINT16(save->p, (botskin ? (emeralds|(1<<10)) : emeralds)+357);
|
WRITEUINT16(save->p, (botskin ? (emeralds|(1<<10)) : emeralds)+357);
|
||||||
WRITESTRINGN(save->p, timeattackfolder, sizeof(timeattackfolder));
|
WRITESTRINGN(save->p, timeattackfolder, sizeof(timeattackfolder));
|
||||||
}
|
}
|
||||||
@@ -3331,6 +3333,8 @@ FUNCINLINE static ATTRINLINE void P_UnArchiveSPGame(savebuffer_t *save, INT16 ma
|
|||||||
if (!mapheaderinfo[gamemap-1])
|
if (!mapheaderinfo[gamemap-1])
|
||||||
P_AllocMapHeader(gamemap-1);
|
P_AllocMapHeader(gamemap-1);
|
||||||
|
|
||||||
|
lastmapsaved = gamemap;
|
||||||
|
|
||||||
tokenlist = 0;
|
tokenlist = 0;
|
||||||
token = 0;
|
token = 0;
|
||||||
|
|
||||||
|
|||||||
+116
-12
@@ -218,6 +218,8 @@ static void P_ClearSingleMapHeaderInfo(INT16 i)
|
|||||||
mapheaderinfo[num]->musname[6] = 0;
|
mapheaderinfo[num]->musname[6] = 0;
|
||||||
mapheaderinfo[num]->mustrack = 0;
|
mapheaderinfo[num]->mustrack = 0;
|
||||||
mapheaderinfo[num]->muspos = 0;
|
mapheaderinfo[num]->muspos = 0;
|
||||||
|
mapheaderinfo[num]->musinterfadeout = 0;
|
||||||
|
mapheaderinfo[num]->musintername[0] = '\0';
|
||||||
mapheaderinfo[num]->forcecharacter[0] = '\0';
|
mapheaderinfo[num]->forcecharacter[0] = '\0';
|
||||||
mapheaderinfo[num]->weather = 0;
|
mapheaderinfo[num]->weather = 0;
|
||||||
mapheaderinfo[num]->skynum = 1;
|
mapheaderinfo[num]->skynum = 1;
|
||||||
@@ -235,10 +237,16 @@ static void P_ClearSingleMapHeaderInfo(INT16 i)
|
|||||||
mapheaderinfo[num]->numlaps = NUMLAPS_DEFAULT;
|
mapheaderinfo[num]->numlaps = NUMLAPS_DEFAULT;
|
||||||
mapheaderinfo[num]->unlockrequired = -1;
|
mapheaderinfo[num]->unlockrequired = -1;
|
||||||
mapheaderinfo[num]->levelselect = 0;
|
mapheaderinfo[num]->levelselect = 0;
|
||||||
|
mapheaderinfo[num]->bonustype = 0;
|
||||||
|
mapheaderinfo[num]->saveoverride = SAVE_DEFAULT;
|
||||||
mapheaderinfo[num]->levelflags = 0;
|
mapheaderinfo[num]->levelflags = 0;
|
||||||
mapheaderinfo[num]->menuflags = (mainwads ? 0 : LF2_EXISTSHACK); // see p_setup.c - prevents replacing maps in addons with easier versions
|
mapheaderinfo[num]->menuflags = (mainwads ? 0 : LF2_EXISTSHACK); // see p_setup.c - prevents replacing maps in addons with easier versions
|
||||||
|
|
||||||
|
// TODO grades support for delfile (pfft yeah right)
|
||||||
|
P_DeleteGrades(num);
|
||||||
|
|
||||||
// SRB2Kart
|
// SRB2Kart
|
||||||
|
//mapheaderinfo[num]->automap = false;
|
||||||
mapheaderinfo[num]->mobj_scale = FRACUNIT;
|
mapheaderinfo[num]->mobj_scale = FRACUNIT;
|
||||||
|
|
||||||
mapheaderinfo[num]->customopts = NULL;
|
mapheaderinfo[num]->customopts = NULL;
|
||||||
@@ -258,11 +266,107 @@ void P_AllocMapHeader(INT16 i)
|
|||||||
if (!mapheaderinfo[i])
|
if (!mapheaderinfo[i])
|
||||||
{
|
{
|
||||||
mapheaderinfo[i] = Z_Malloc(sizeof(mapheader_t), PU_STATIC, NULL);
|
mapheaderinfo[i] = Z_Malloc(sizeof(mapheader_t), PU_STATIC, NULL);
|
||||||
|
mapheaderinfo[i]->grades = NULL;
|
||||||
}
|
}
|
||||||
|
|
||||||
P_ClearSingleMapHeaderInfo(i + 1);
|
P_ClearSingleMapHeaderInfo(i + 1);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/** NiGHTS Grades are a special structure,
|
||||||
|
* we initialize them here.
|
||||||
|
*
|
||||||
|
* \param i Index of header to allocate grades for
|
||||||
|
* \param mare The mare we're adding grades for
|
||||||
|
* \param grades the string from DeHackEd, we work with it ourselves
|
||||||
|
*/
|
||||||
|
void P_AddGradesForMare(INT16 i, UINT8 mare, char *gtext)
|
||||||
|
{
|
||||||
|
INT32 g;
|
||||||
|
char *spos = gtext;
|
||||||
|
|
||||||
|
CONS_Debug(DBG_SETUP, "Map %d Mare %d: ", i+1, (UINT16)mare+1);
|
||||||
|
|
||||||
|
if (mapheaderinfo[i]->numGradedMares < mare+1)
|
||||||
|
{
|
||||||
|
mapheaderinfo[i]->numGradedMares = mare+1;
|
||||||
|
mapheaderinfo[i]->grades = Z_Realloc(mapheaderinfo[i]->grades, sizeof(nightsgrades_t) * mapheaderinfo[i]->numGradedMares, PU_STATIC, NULL);
|
||||||
|
}
|
||||||
|
|
||||||
|
for (g = 0; g < 6; ++g)
|
||||||
|
{
|
||||||
|
// Allow "partial" grading systems
|
||||||
|
if (spos != NULL)
|
||||||
|
{
|
||||||
|
mapheaderinfo[i]->grades[mare].grade[g] = atoi(spos);
|
||||||
|
CONS_Debug(DBG_SETUP, "%u ", atoi(spos));
|
||||||
|
// Grab next comma
|
||||||
|
spos = strchr(spos, ',');
|
||||||
|
if (spos)
|
||||||
|
++spos;
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
// Grade not reachable
|
||||||
|
mapheaderinfo[i]->grades[mare].grade[g] = UINT32_MAX;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
CONS_Debug(DBG_SETUP, "\n");
|
||||||
|
}
|
||||||
|
|
||||||
|
/** And this removes the grades safely.
|
||||||
|
*
|
||||||
|
* \param i The header to remove grades from
|
||||||
|
*/
|
||||||
|
void P_DeleteGrades(INT16 i)
|
||||||
|
{
|
||||||
|
Z_Free(mapheaderinfo[i]->grades);
|
||||||
|
mapheaderinfo[i]->grades = NULL;
|
||||||
|
mapheaderinfo[i]->numGradedMares = 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
/** And this fetches the grades
|
||||||
|
*
|
||||||
|
* \param pscore The player's score.
|
||||||
|
* \param map The game map.
|
||||||
|
* \param mare The mare to test.
|
||||||
|
*/
|
||||||
|
UINT8 P_GetGrade(UINT32 pscore, INT16 map, UINT8 mare)
|
||||||
|
{
|
||||||
|
INT32 i;
|
||||||
|
|
||||||
|
// Determining the grade
|
||||||
|
if (mapheaderinfo[map-1] && mapheaderinfo[map-1]->grades && mapheaderinfo[map-1]->numGradedMares >= mare + 1)
|
||||||
|
{
|
||||||
|
INT32 pgrade = 0;
|
||||||
|
for (i = 0; i < 6; ++i)
|
||||||
|
{
|
||||||
|
if (pscore >= mapheaderinfo[map-1]->grades[mare].grade[i])
|
||||||
|
++pgrade;
|
||||||
|
}
|
||||||
|
|
||||||
|
return (UINT8)pgrade;
|
||||||
|
}
|
||||||
|
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
UINT8 P_HasGrades(INT16 map, UINT8 mare)
|
||||||
|
{
|
||||||
|
// Determining the grade
|
||||||
|
// Mare 0 is treated as overall and is true if ANY grades exist
|
||||||
|
return (mapheaderinfo[map-1] && mapheaderinfo[map-1]->grades
|
||||||
|
&& (mare == 0 || mapheaderinfo[map-1]->numGradedMares >= mare));
|
||||||
|
}
|
||||||
|
|
||||||
|
UINT32 P_GetScoreForGrade(INT16 map, UINT8 mare, UINT8 grade)
|
||||||
|
{
|
||||||
|
// Get the score for the grade... if it exists
|
||||||
|
if (grade == GRADE_F || grade > GRADE_S || !P_HasGrades(map, mare)) return 0;
|
||||||
|
|
||||||
|
return mapheaderinfo[map-1]->grades[mare].grade[grade-1];
|
||||||
|
}
|
||||||
|
|
||||||
// Loads the vertexes for a level.
|
// Loads the vertexes for a level.
|
||||||
FUNCINLINE static ATTRINLINE void P_LoadVertices(UINT8 *data)
|
FUNCINLINE static ATTRINLINE void P_LoadVertices(UINT8 *data)
|
||||||
{
|
{
|
||||||
@@ -310,7 +414,7 @@ void P_UpdateSegLightOffset(seg_t *li)
|
|||||||
angle_t liAngle = R_PointToAngle2(0, 0, (li->v1->x - li->v2->x), (li->v1->y - li->v2->y)) - ANGLE_90;
|
angle_t liAngle = R_PointToAngle2(0, 0, (li->v1->x - li->v2->x), (li->v1->y - li->v2->y)) - ANGLE_90;
|
||||||
|
|
||||||
light = FixedMul(FINECOSINE(liAngle >> ANGLETOFINESHIFT), FINECOSINE(maplighting.angle >> ANGLETOFINESHIFT))
|
light = FixedMul(FINECOSINE(liAngle >> ANGLETOFINESHIFT), FINECOSINE(maplighting.angle >> ANGLETOFINESHIFT))
|
||||||
+ FixedMul(FINESINE(liAngle >> ANGLETOFINESHIFT), FINESINE(maplighting.angle >> ANGLETOFINESHIFT));
|
+ FixedMul(FINESINE(liAngle >> ANGLETOFINESHIFT), FINESINE(maplighting.angle >> ANGLETOFINESHIFT));
|
||||||
light = (light + FRACUNIT) / 2;
|
light = (light + FRACUNIT) / 2;
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
@@ -1810,7 +1914,7 @@ static void P_LoadMapBSP(const virtres_t* virt)
|
|||||||
if (numsubsectors <= 0)
|
if (numsubsectors <= 0)
|
||||||
I_Error("Level has no subsectors (did you forget to run it through a nodesbuilder?)");
|
I_Error("Level has no subsectors (did you forget to run it through a nodesbuilder?)");
|
||||||
if (numnodes <= 0)
|
if (numnodes <= 0)
|
||||||
I_Error("Level has no nodes (does your map have at least 2 sectors?)");
|
I_Error("Level has no nodes");
|
||||||
if (numsegs <= 0)
|
if (numsegs <= 0)
|
||||||
I_Error("Level has no segs");
|
I_Error("Level has no segs");
|
||||||
|
|
||||||
@@ -1943,6 +2047,7 @@ static void P_LevelInitStuff(boolean reloadinggamestate)
|
|||||||
|
|
||||||
// special stage tokens, emeralds, and ring total
|
// special stage tokens, emeralds, and ring total
|
||||||
tokenbits = 0;
|
tokenbits = 0;
|
||||||
|
runemeraldmanager = false;
|
||||||
nummaprings = nummapboxes = numgotboxes = 0;
|
nummaprings = nummapboxes = numgotboxes = 0;
|
||||||
|
|
||||||
// emerald hunt
|
// emerald hunt
|
||||||
@@ -1972,10 +2077,10 @@ static void P_LevelInitStuff(boolean reloadinggamestate)
|
|||||||
stagefailed = false;
|
stagefailed = false;
|
||||||
|
|
||||||
// earthquake camera
|
// earthquake camera
|
||||||
memset(&quake, 0, sizeof(struct quake));
|
memset(&quake,0,sizeof(struct quake));
|
||||||
|
|
||||||
// song credit init
|
// song credit init
|
||||||
memset(&cursongcredit, 0, sizeof(struct cursongcredit));
|
memset(&cursongcredit,0,sizeof(struct cursongcredit));
|
||||||
cursongcredit.trans = NUMTRANSMAPS;
|
cursongcredit.trans = NUMTRANSMAPS;
|
||||||
|
|
||||||
for (i = 0; i < MAXPLAYERS; i++)
|
for (i = 0; i < MAXPLAYERS; i++)
|
||||||
@@ -2069,14 +2174,14 @@ static INT32 P_MakeBufferMD5(const char *buffer, size_t len, void *resblock)
|
|||||||
memset(resblock, 0x00, 16);
|
memset(resblock, 0x00, 16);
|
||||||
return 1;
|
return 1;
|
||||||
#else
|
#else
|
||||||
precise_t t = I_GetPreciseTime();
|
tic_t t = I_GetTime();
|
||||||
|
|
||||||
CONS_Debug(DBG_SETUP, "Making MD5\n");
|
CONS_Debug(DBG_SETUP, "Making MD5\n");
|
||||||
|
|
||||||
if (md5_buffer(buffer, len, resblock) == NULL)
|
if (md5_buffer(buffer, len, resblock) == NULL)
|
||||||
return 1;
|
return 1;
|
||||||
|
|
||||||
CONS_Debug(DBG_SETUP, "MD5 calc took %f seconds\n", (float)(I_GetPreciseTime() - t)/I_GetPrecisePrecision());
|
CONS_Debug(DBG_SETUP, "MD5 calc took %f seconds\n", (float)(I_GetTime() - t)/NEWTICRATE);
|
||||||
|
|
||||||
return 0;
|
return 0;
|
||||||
#endif
|
#endif
|
||||||
@@ -2098,10 +2203,10 @@ static void P_MakeMapMD5(virtres_t *virt, void *dest)
|
|||||||
virtlump_t* virtmthings = vres_Find(virt, "THINGS");
|
virtlump_t* virtmthings = vres_Find(virt, "THINGS");
|
||||||
virtlump_t* virtsides = vres_Find(virt, "SIDEDEFS");
|
virtlump_t* virtsides = vres_Find(virt, "SIDEDEFS");
|
||||||
|
|
||||||
P_MakeBufferMD5((char*)virtlines->data, virtlines->size, linemd5);
|
P_MakeBufferMD5((char*)virtlines->data, virtlines->size, linemd5);
|
||||||
P_MakeBufferMD5((char*)virtsectors->data, virtsectors->size, sectormd5);
|
P_MakeBufferMD5((char*)virtsectors->data, virtsectors->size, sectormd5);
|
||||||
P_MakeBufferMD5((char*)virtmthings->data, virtmthings->size, thingmd5);
|
P_MakeBufferMD5((char*)virtmthings->data, virtmthings->size, thingmd5);
|
||||||
P_MakeBufferMD5((char*)virtsides->data, virtsides->size, sidedefmd5);
|
P_MakeBufferMD5((char*)virtsides->data, virtsides->size, sidedefmd5);
|
||||||
|
|
||||||
for (i = 0; i < 16; i++)
|
for (i = 0; i < 16; i++)
|
||||||
resmd5[i] = (linemd5[i] + sectormd5[i] + thingmd5[i] + sidedefmd5[i]) & 0xFF;
|
resmd5[i] = (linemd5[i] + sectormd5[i] + thingmd5[i] + sidedefmd5[i]) & 0xFF;
|
||||||
@@ -2586,8 +2691,7 @@ void P_FreeLevelState(void)
|
|||||||
}
|
}
|
||||||
|
|
||||||
// Clear pointers that would be left dangling by the purge
|
// Clear pointers that would be left dangling by the purge
|
||||||
// Pointers are now PU_STATIC so they won't be freed :)
|
R_FlushTranslationColormapCache();
|
||||||
//R_FlushTranslationColormapCache();
|
|
||||||
|
|
||||||
#ifdef HWRENDER
|
#ifdef HWRENDER
|
||||||
// Free GPU textures before freeing patches.
|
// Free GPU textures before freeing patches.
|
||||||
|
|||||||
@@ -114,6 +114,13 @@ size_t P_PrecacheLevelFlats(void);
|
|||||||
|
|
||||||
void P_AllocMapHeader(INT16 i);
|
void P_AllocMapHeader(INT16 i);
|
||||||
|
|
||||||
|
// Needed for NiGHTS
|
||||||
|
void P_DeleteGrades(INT16 i);
|
||||||
|
void P_AddGradesForMare(INT16 i, UINT8 mare, char *gtext);
|
||||||
|
UINT8 P_GetGrade(UINT32 pscore, INT16 map, UINT8 mare);
|
||||||
|
UINT8 P_HasGrades(INT16 map, UINT8 mare);
|
||||||
|
UINT32 P_GetScoreForGrade(INT16 map, UINT8 mare, UINT8 grade);
|
||||||
|
|
||||||
#ifdef __cplusplus
|
#ifdef __cplusplus
|
||||||
} // extern "C"
|
} // extern "C"
|
||||||
#endif
|
#endif
|
||||||
|
|||||||
+2
-2
@@ -76,8 +76,8 @@ static void P_UpdateSlopeLightOffset(pslope_t *slope)
|
|||||||
*/
|
*/
|
||||||
|
|
||||||
light = FixedMul(nX, FINECOSINE(maplighting.angle >> ANGLETOFINESHIFT))
|
light = FixedMul(nX, FINECOSINE(maplighting.angle >> ANGLETOFINESHIFT))
|
||||||
+ FixedMul(nY, FINESINE(maplighting.angle >> ANGLETOFINESHIFT));
|
+ FixedMul(nY, FINESINE(maplighting.angle >> ANGLETOFINESHIFT));
|
||||||
light = (light + FRACUNIT) / 2;
|
light = (light + FRACUNIT) / 2;
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
|
|||||||
+3
-3
@@ -4399,7 +4399,7 @@ static void P_RunSpecialSectorCheck(player_t *player, sector_t *sector)
|
|||||||
|
|
||||||
// The list of specials that activate without floor touch
|
// The list of specials that activate without floor touch
|
||||||
// Check Section 1
|
// Check Section 1
|
||||||
switch (GETSECSPECIAL(sector->special, 1))
|
switch(GETSECSPECIAL(sector->special, 1))
|
||||||
{
|
{
|
||||||
//case 2: // Damage (water)
|
//case 2: // Damage (water)
|
||||||
case 8: // Instant kill
|
case 8: // Instant kill
|
||||||
@@ -4410,7 +4410,7 @@ static void P_RunSpecialSectorCheck(player_t *player, sector_t *sector)
|
|||||||
}
|
}
|
||||||
|
|
||||||
// Check Section 2
|
// Check Section 2
|
||||||
switch (GETSECSPECIAL(sector->special, 2))
|
switch(GETSECSPECIAL(sector->special, 2))
|
||||||
{
|
{
|
||||||
case 2: // Linedef executor (All players needed)
|
case 2: // Linedef executor (All players needed)
|
||||||
case 4: // Linedef executor
|
case 4: // Linedef executor
|
||||||
@@ -4421,7 +4421,7 @@ static void P_RunSpecialSectorCheck(player_t *player, sector_t *sector)
|
|||||||
}
|
}
|
||||||
|
|
||||||
// Check Section 4
|
// Check Section 4
|
||||||
switch (GETSECSPECIAL(sector->special, 4))
|
switch(GETSECSPECIAL(sector->special, 4))
|
||||||
{
|
{
|
||||||
case 2: // Level Exit / GOAL Sector / Flag Return
|
case 2: // Level Exit / GOAL Sector / Flag Return
|
||||||
case 1: // Starpost activator
|
case 1: // Starpost activator
|
||||||
|
|||||||
+2
-2
@@ -706,7 +706,6 @@ void P_Ticker(boolean run)
|
|||||||
|
|
||||||
if (indirectitemcooldown > 0)
|
if (indirectitemcooldown > 0)
|
||||||
indirectitemcooldown--;
|
indirectitemcooldown--;
|
||||||
|
|
||||||
if (hyubgone > 0)
|
if (hyubgone > 0)
|
||||||
hyubgone--;
|
hyubgone--;
|
||||||
|
|
||||||
@@ -714,7 +713,8 @@ void P_Ticker(boolean run)
|
|||||||
{
|
{
|
||||||
K_UpdateSpectateGrief();
|
K_UpdateSpectateGrief();
|
||||||
}
|
}
|
||||||
else if (G_BattleGametype())
|
|
||||||
|
if (G_BattleGametype())
|
||||||
{
|
{
|
||||||
if (wantedcalcdelay && --wantedcalcdelay <= 0)
|
if (wantedcalcdelay && --wantedcalcdelay <= 0)
|
||||||
K_CalculateBattleWanted();
|
K_CalculateBattleWanted();
|
||||||
|
|||||||
+50
-24
@@ -220,6 +220,32 @@ UINT8 P_GetNextEmerald(void)
|
|||||||
return (UINT8)(gamemap - sstage_start);
|
return (UINT8)(gamemap - sstage_start);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
//
|
||||||
|
// P_GiveEmerald
|
||||||
|
//
|
||||||
|
// Award an emerald upon completion
|
||||||
|
// of a special stage.
|
||||||
|
//
|
||||||
|
void P_GiveEmerald(boolean spawnObj)
|
||||||
|
{
|
||||||
|
INT32 i;
|
||||||
|
UINT8 em;
|
||||||
|
|
||||||
|
S_StartSound(NULL, sfx_cgot); // Got the emerald!
|
||||||
|
em = P_GetNextEmerald();
|
||||||
|
emeralds |= (1 << em);
|
||||||
|
|
||||||
|
if (spawnObj)
|
||||||
|
{
|
||||||
|
for (i = 0; i < MAXPLAYERS; i++)
|
||||||
|
{
|
||||||
|
if (playeringame[i])
|
||||||
|
P_SetMobjState(P_SpawnMobj(players[i].mo->x, players[i].mo->y, players[i].mo->z + players[i].mo->info->height, MT_GOTEMERALD),
|
||||||
|
mobjinfo[MT_GOTEMERALD].spawnstate + em);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
//
|
//
|
||||||
// P_ResetScore
|
// P_ResetScore
|
||||||
//
|
//
|
||||||
@@ -1200,6 +1226,7 @@ mobj_t *P_SpawnGhostMobj(mobj_t *mobj)
|
|||||||
|
|
||||||
ghost->pitch = mobj->pitch;
|
ghost->pitch = mobj->pitch;
|
||||||
ghost->roll = mobj->roll;
|
ghost->roll = mobj->roll;
|
||||||
|
ghost->sloperoll = mobj->sloperoll;
|
||||||
ghost->rollangle = mobj->rollangle;
|
ghost->rollangle = mobj->rollangle;
|
||||||
ghost->sloperoll = mobj->sloperoll;
|
ghost->sloperoll = mobj->sloperoll;
|
||||||
ghost->slopepitch = mobj->slopepitch;
|
ghost->slopepitch = mobj->slopepitch;
|
||||||
@@ -1965,23 +1992,20 @@ static void P_3dMovement(player_t *player)
|
|||||||
K_MomentumToFacing(player);
|
K_MomentumToFacing(player);
|
||||||
}
|
}
|
||||||
|
|
||||||
const fixed_t kartspd = K_GetKartSpeed(player, true);
|
|
||||||
|
|
||||||
// Sideways movement
|
// Sideways movement
|
||||||
if (cmd->sidemove != 0 && !((player->exiting || mapreset) || player->kartstuff[k_spinouttimer]))
|
if (cmd->sidemove != 0 && !((player->exiting || mapreset) || player->kartstuff[k_spinouttimer]))
|
||||||
{
|
{
|
||||||
if (cmd->sidemove > 0)
|
if (cmd->sidemove > 0)
|
||||||
movepushside = (cmd->sidemove * FRACUNIT/128) + FixedDiv(player->speed, kartspd);
|
movepushside = (cmd->sidemove * FRACUNIT/128) + FixedDiv(player->speed, K_GetKartSpeed(player, true));
|
||||||
else
|
else
|
||||||
movepushside = (cmd->sidemove * FRACUNIT/128) - FixedDiv(player->speed, kartspd);
|
movepushside = (cmd->sidemove * FRACUNIT/128) - FixedDiv(player->speed, K_GetKartSpeed(player, true));
|
||||||
|
|
||||||
totalthrust.x += P_ReturnThrustX(player->mo, movepushsideangle, movepushside);
|
totalthrust.x += P_ReturnThrustX(player->mo, movepushsideangle, movepushside);
|
||||||
totalthrust.y += P_ReturnThrustY(player->mo, movepushsideangle, movepushside);
|
totalthrust.y += P_ReturnThrustY(player->mo, movepushsideangle, movepushside);
|
||||||
}
|
}
|
||||||
|
|
||||||
if ((totalthrust.x || totalthrust.y)
|
if ((totalthrust.x || totalthrust.y)
|
||||||
&& player->mo->standingslope && (!(player->mo->standingslope->flags & SL_NOPHYSICS)) && abs(player->mo->standingslope->zdelta) > FRACUNIT/2)
|
&& player->mo->standingslope && (!(player->mo->standingslope->flags & SL_NOPHYSICS)) && abs(player->mo->standingslope->zdelta) > FRACUNIT/2) {
|
||||||
{
|
|
||||||
// Factor thrust to slope, but only for the part pushing up it!
|
// Factor thrust to slope, but only for the part pushing up it!
|
||||||
// The rest is unaffected.
|
// The rest is unaffected.
|
||||||
angle_t thrustangle = R_PointToAngle2(0, 0, totalthrust.x, totalthrust.y)-player->mo->standingslope->xydirection;
|
angle_t thrustangle = R_PointToAngle2(0, 0, totalthrust.x, totalthrust.y)-player->mo->standingslope->xydirection;
|
||||||
@@ -2017,11 +2041,11 @@ static void P_3dMovement(player_t *player)
|
|||||||
// -Shadow Hog
|
// -Shadow Hog
|
||||||
newMagnitude = R_PointToDist2(player->mo->momx - player->cmomx, player->mo->momy - player->cmomy, 0, 0);
|
newMagnitude = R_PointToDist2(player->mo->momx - player->cmomx, player->mo->momy - player->cmomy, 0, 0);
|
||||||
|
|
||||||
if (newMagnitude > kartspd) //topspeed)
|
if (newMagnitude > K_GetKartSpeed(player, true)) //topspeed)
|
||||||
{
|
{
|
||||||
fixed_t tempmomx, tempmomy;
|
fixed_t tempmomx, tempmomy;
|
||||||
|
|
||||||
if (oldMagnitude > kartspd && onground) // SRB2Kart: onground check for air speed cap
|
if (oldMagnitude > K_GetKartSpeed(player, true) && onground) // SRB2Kart: onground check for air speed cap
|
||||||
{
|
{
|
||||||
if (newMagnitude > oldMagnitude)
|
if (newMagnitude > oldMagnitude)
|
||||||
{
|
{
|
||||||
@@ -2034,8 +2058,8 @@ static void P_3dMovement(player_t *player)
|
|||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
tempmomx = FixedMul(FixedDiv(player->mo->momx - player->cmomx, newMagnitude), kartspd); //topspeed)
|
tempmomx = FixedMul(FixedDiv(player->mo->momx - player->cmomx, newMagnitude), K_GetKartSpeed(player, true)); //topspeed)
|
||||||
tempmomy = FixedMul(FixedDiv(player->mo->momy - player->cmomy, newMagnitude), kartspd); //topspeed)
|
tempmomy = FixedMul(FixedDiv(player->mo->momy - player->cmomy, newMagnitude), K_GetKartSpeed(player, true)); //topspeed)
|
||||||
player->mo->momx = tempmomx + player->cmomx;
|
player->mo->momx = tempmomx + player->cmomx;
|
||||||
player->mo->momy = tempmomy + player->cmomy;
|
player->mo->momy = tempmomy + player->cmomy;
|
||||||
}
|
}
|
||||||
@@ -2450,10 +2474,9 @@ static void P_MovePlayer(player_t *player)
|
|||||||
const fixed_t runnyspeed = 20*FRACUNIT;
|
const fixed_t runnyspeed = 20*FRACUNIT;
|
||||||
|
|
||||||
speed = R_PointToDist2(player->rmomx, player->rmomy, 0, 0);
|
speed = R_PointToDist2(player->rmomx, player->rmomy, 0, 0);
|
||||||
const fixed_t kartspd = K_GetKartSpeed(player, false);
|
|
||||||
|
|
||||||
if (speed > kartspd-(5<<FRACBITS))
|
if (speed > K_GetKartSpeed(player, false)-(5<<FRACBITS))
|
||||||
speed = kartspd-(5<<FRACBITS);
|
speed = K_GetKartSpeed(player, false)-(5<<FRACBITS);
|
||||||
|
|
||||||
if (speed >= runnyspeed)
|
if (speed >= runnyspeed)
|
||||||
player->fovadd = speed-runnyspeed;
|
player->fovadd = speed-runnyspeed;
|
||||||
@@ -3103,16 +3126,19 @@ void P_ToggleDemoCamera(UINT8 viewnum)
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (!cam->freecam) // toggle on
|
if (!cam->freecam) // toggle on
|
||||||
{
|
{
|
||||||
cam->freecam = true;
|
cam->freecam = true;
|
||||||
cam->button_a_held = 2;
|
cam->button_a_held = 2;
|
||||||
cam->reset_aiming = true;
|
cam->reset_aiming = true;
|
||||||
|
|
||||||
// get rid of some hud elements
|
// get rid of some hud elements
|
||||||
displayplayers[0] = consoleplayer;
|
if (displayplayers[0] != consoleplayer)
|
||||||
|
{
|
||||||
|
displayplayers[0] = consoleplayer;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
else // toggle off
|
else // toggle off
|
||||||
{
|
{
|
||||||
cam->freecam = false;
|
cam->freecam = false;
|
||||||
G_FixCamera(viewnum+1);
|
G_FixCamera(viewnum+1);
|
||||||
@@ -3478,6 +3504,8 @@ void P_ResetCamera(player_t *player, camera_t *thiscam)
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
thiscam->relativex = 0;
|
||||||
|
|
||||||
thiscam->subsector = R_PointInSubsectorFast(thiscam->x, thiscam->y);
|
thiscam->subsector = R_PointInSubsectorFast(thiscam->x, thiscam->y);
|
||||||
|
|
||||||
thiscam->radius = 20*FRACUNIT;
|
thiscam->radius = 20*FRACUNIT;
|
||||||
@@ -4024,7 +4052,7 @@ boolean P_MoveChaseCamera(player_t *player, camera_t *thiscam, boolean resetcall
|
|||||||
|
|
||||||
if (timeover)
|
if (timeover)
|
||||||
thiscam->angle = angle;
|
thiscam->angle = angle;
|
||||||
else if (!camstill && !resetcalled && !paused)
|
else if (!camstill && !resetcalled && !paused && timeover != 1)
|
||||||
thiscam->angle = R_PointToAngle2(thiscam->x, thiscam->y, viewpointx, viewpointy);
|
thiscam->angle = R_PointToAngle2(thiscam->x, thiscam->y, viewpointx, viewpointy);
|
||||||
|
|
||||||
if (timeover == 1)
|
if (timeover == 1)
|
||||||
@@ -4081,7 +4109,7 @@ boolean P_MoveChaseCamera(player_t *player, camera_t *thiscam, boolean resetcall
|
|||||||
angle -= (angle - thiscam->pitch)/2;
|
angle -= (angle - thiscam->pitch)/2;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (player->playerstate != PST_DEAD && LIKELY(!((player->pflags & PF_NIGHTSMODE) && player->exiting)))
|
if (player->playerstate != PST_DEAD && !((player->pflags & PF_NIGHTSMODE) && player->exiting))
|
||||||
angle += (focusaiming < ANGLE_180 ? focusaiming/2 : InvAngle(InvAngle(focusaiming)/2)); // overcomplicated version of '((signed)focusaiming)/2;'
|
angle += (focusaiming < ANGLE_180 ? focusaiming/2 : InvAngle(InvAngle(focusaiming)/2)); // overcomplicated version of '((signed)focusaiming)/2;'
|
||||||
|
|
||||||
if (!camstill && !timeover) // Keep the view still...
|
if (!camstill && !timeover) // Keep the view still...
|
||||||
@@ -4147,12 +4175,10 @@ void P_ResetLocalCamAiming(player_t *player)
|
|||||||
|
|
||||||
boolean P_SpectatorJoinGame(player_t *player)
|
boolean P_SpectatorJoinGame(player_t *player)
|
||||||
{
|
{
|
||||||
const boolean islocalplayer = P_IsLocalPlayer(player);
|
|
||||||
|
|
||||||
// Team changing isn't allowed.
|
// Team changing isn't allowed.
|
||||||
if (!cv_allowteamchange.value)
|
if (!cv_allowteamchange.value)
|
||||||
{
|
{
|
||||||
if (islocalplayer)
|
if (P_IsLocalPlayer(player))
|
||||||
CONS_Printf(M_GetText("Server does not allow team change.\n"));
|
CONS_Printf(M_GetText("Server does not allow team change.\n"));
|
||||||
}
|
}
|
||||||
// Team changing in Team Match and CTF
|
// Team changing in Team Match and CTF
|
||||||
@@ -4200,7 +4226,7 @@ boolean P_SpectatorJoinGame(player_t *player)
|
|||||||
P_ResetLocalCamAiming(player);
|
P_ResetLocalCamAiming(player);
|
||||||
|
|
||||||
//Reset away view
|
//Reset away view
|
||||||
if (islocalplayer && displayplayers[0] != consoleplayer)
|
if (P_IsLocalPlayer(player) && displayplayers[0] != consoleplayer)
|
||||||
displayplayers[0] = consoleplayer;
|
displayplayers[0] = consoleplayer;
|
||||||
|
|
||||||
if (changeto == 1)
|
if (changeto == 1)
|
||||||
@@ -4227,7 +4253,7 @@ boolean P_SpectatorJoinGame(player_t *player)
|
|||||||
P_ResetLocalCamAiming(player);
|
P_ResetLocalCamAiming(player);
|
||||||
|
|
||||||
//Reset away view
|
//Reset away view
|
||||||
if (islocalplayer && displayplayers[0] != consoleplayer)
|
if (P_IsLocalPlayer(player) && displayplayers[0] != consoleplayer)
|
||||||
displayplayers[0] = consoleplayer;
|
displayplayers[0] = consoleplayer;
|
||||||
|
|
||||||
HU_AddChatText(va(M_GetText("\x82*%s entered the game."), player_names[player-players]), false);
|
HU_AddChatText(va(M_GetText("\x82*%s entered the game."), player_names[player-players]), false);
|
||||||
@@ -4558,7 +4584,7 @@ void P_PlayerThink(player_t *player)
|
|||||||
}
|
}
|
||||||
|
|
||||||
#ifdef SEENAMES
|
#ifdef SEENAMES
|
||||||
if (netgame && !splitscreen && player == &players[displayplayers[0]] && !(leveltime % (TICRATE/5)))
|
if (netgame && player == &players[displayplayers[0]] && !(leveltime % (TICRATE/5)) && !splitscreen)
|
||||||
{
|
{
|
||||||
seenplayer = NULL;
|
seenplayer = NULL;
|
||||||
|
|
||||||
|
|||||||
@@ -991,6 +991,7 @@ static void R_Subsector(size_t num)
|
|||||||
visffloor[numffloors].height = polysec->floorheight;
|
visffloor[numffloors].height = polysec->floorheight;
|
||||||
visffloor[numffloors].polyobj = po;
|
visffloor[numffloors].polyobj = po;
|
||||||
visffloor[numffloors].slope = NULL;
|
visffloor[numffloors].slope = NULL;
|
||||||
|
// visffloor[numffloors].ffloor = rover;
|
||||||
po->visplane = visffloor[numffloors].plane;
|
po->visplane = visffloor[numffloors].plane;
|
||||||
numffloors++;
|
numffloors++;
|
||||||
}
|
}
|
||||||
|
|||||||
+49
-7
@@ -37,6 +37,44 @@
|
|||||||
// Not sure if this is necessary, but it was in w_wad.c, so I'm putting it here too -Shadow Hog
|
// Not sure if this is necessary, but it was in w_wad.c, so I'm putting it here too -Shadow Hog
|
||||||
#include <errno.h>
|
#include <errno.h>
|
||||||
|
|
||||||
|
//
|
||||||
|
// Texture definition.
|
||||||
|
// Each texture is composed of one or more patches,
|
||||||
|
// with patches being lumps stored in the WAD.
|
||||||
|
// The lumps are referenced by number, and patched
|
||||||
|
// into the rectangular texture space using origin
|
||||||
|
// and possibly other attributes.
|
||||||
|
//
|
||||||
|
typedef struct
|
||||||
|
{
|
||||||
|
INT16 originx, originy;
|
||||||
|
INT16 patch, stepdir, colormap;
|
||||||
|
} ATTRPACK mappatch_t;
|
||||||
|
|
||||||
|
//
|
||||||
|
// Texture definition.
|
||||||
|
// An SRB2 wall texture is a list of patches
|
||||||
|
// which are to be combined in a predefined order.
|
||||||
|
//
|
||||||
|
typedef struct
|
||||||
|
{
|
||||||
|
char name[8];
|
||||||
|
INT32 masked;
|
||||||
|
INT16 width;
|
||||||
|
INT16 height;
|
||||||
|
INT32 columndirectory; // FIXTHIS: OBSOLETE
|
||||||
|
INT16 patchcount;
|
||||||
|
mappatch_t patches[1];
|
||||||
|
} ATTRPACK maptexture_t;
|
||||||
|
|
||||||
|
// Store lists of lumps for F_START/F_END etc.
|
||||||
|
typedef struct
|
||||||
|
{
|
||||||
|
UINT16 wadfile;
|
||||||
|
UINT16 firstlump;
|
||||||
|
size_t numlumps;
|
||||||
|
} lumplist_t;
|
||||||
|
|
||||||
//
|
//
|
||||||
// Graphics.
|
// Graphics.
|
||||||
// SRB2 graphics for walls and sprites
|
// SRB2 graphics for walls and sprites
|
||||||
@@ -584,7 +622,7 @@ Rloadtextures (INT32 i, INT32 w)
|
|||||||
|
|
||||||
// Set texture properties.
|
// Set texture properties.
|
||||||
memcpy(texture->name, W_CheckNameForNumPwad(wadnum, lumpnum), sizeof(texture->name));
|
memcpy(texture->name, W_CheckNameForNumPwad(wadnum, lumpnum), sizeof(texture->name));
|
||||||
texture->hash = FNV1a_QuickCaseHash(texture->name, 8);
|
texture->hash = quickncasehash(texture->name, 8);
|
||||||
|
|
||||||
texture->width = SHORT(patchlump.width);
|
texture->width = SHORT(patchlump.width);
|
||||||
texture->height = SHORT(patchlump.height);
|
texture->height = SHORT(patchlump.height);
|
||||||
@@ -798,7 +836,11 @@ static texpatch_t *R_ParsePatch(boolean actuallyLoadPatch)
|
|||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
Z_Free(patchName);
|
if (patchName != NULL)
|
||||||
|
{
|
||||||
|
Z_Free(patchName);
|
||||||
|
}
|
||||||
|
|
||||||
patchName = (char *)Z_Malloc((texturesTokenLength+1)*sizeof(char),PU_STATIC,NULL);
|
patchName = (char *)Z_Malloc((texturesTokenLength+1)*sizeof(char),PU_STATIC,NULL);
|
||||||
memcpy(patchName,texturesToken,texturesTokenLength*sizeof(char));
|
memcpy(patchName,texturesToken,texturesTokenLength*sizeof(char));
|
||||||
patchName[texturesTokenLength] = '\0';
|
patchName[texturesTokenLength] = '\0';
|
||||||
@@ -1024,7 +1066,7 @@ static texture_t *R_ParseTexture(boolean actuallyLoadTexture)
|
|||||||
// Allocate memory for a zero-patch texture. Obviously, we'll be adding patches momentarily.
|
// Allocate memory for a zero-patch texture. Obviously, we'll be adding patches momentarily.
|
||||||
resultTexture = (texture_t *)Z_Calloc(sizeof(texture_t), PU_STATIC, NULL);
|
resultTexture = (texture_t *)Z_Calloc(sizeof(texture_t), PU_STATIC, NULL);
|
||||||
memcpy(resultTexture->name, newTextureName, 8);
|
memcpy(resultTexture->name, newTextureName, 8);
|
||||||
resultTexture->hash = FNV1a_QuickCaseHash(newTextureName, 8);
|
resultTexture->hash = quickncasehash(newTextureName, 8);
|
||||||
resultTexture->width = newTextureWidth;
|
resultTexture->width = newTextureWidth;
|
||||||
resultTexture->height = newTextureHeight;
|
resultTexture->height = newTextureHeight;
|
||||||
resultTexture->type = TEXTURETYPE_COMPOSITE;
|
resultTexture->type = TEXTURETYPE_COMPOSITE;
|
||||||
@@ -1324,7 +1366,7 @@ void R_ReInitColormaps(UINT16 num, lumpnum_t newencoremap)
|
|||||||
colormap_p = colormap_p2 = colormaps;
|
colormap_p = colormap_p2 = colormaps;
|
||||||
colormap_p += COLORMAP_REMAPOFFSET;
|
colormap_p += COLORMAP_REMAPOFFSET;
|
||||||
|
|
||||||
for (p = 0; p < LIGHTLEVELS; p++)
|
for (p = 0; p < 32; p++)
|
||||||
{
|
{
|
||||||
for (i = 0; i < 256; i++)
|
for (i = 0; i < 256; i++)
|
||||||
{
|
{
|
||||||
@@ -1546,7 +1588,7 @@ INT32 R_CreateColormap(char *p1, char *p2, char *p3)
|
|||||||
|
|
||||||
// Calculate the palette index for each palette index, for each light level
|
// Calculate the palette index for each palette index, for each light level
|
||||||
// (as well as the two unused colormap lines we inherited from Doom)
|
// (as well as the two unused colormap lines we inherited from Doom)
|
||||||
for (p = 0; p < LIGHTLEVELS; p++)
|
for (p = 0; p < 32; p++)
|
||||||
{
|
{
|
||||||
for (i = 0; i < 256; i++)
|
for (i = 0; i < 256; i++)
|
||||||
{
|
{
|
||||||
@@ -1580,7 +1622,7 @@ INT32 R_CreateColormap(char *p1, char *p2, char *p3)
|
|||||||
{
|
{
|
||||||
lighttable_t *colormap_p2 = extra_colormaps[mapnum].colormap;
|
lighttable_t *colormap_p2 = extra_colormaps[mapnum].colormap;
|
||||||
|
|
||||||
for (p = 0; p < LIGHTLEVELS; p++)
|
for (p = 0; p < 32; p++)
|
||||||
{
|
{
|
||||||
for (i = 0; i < 256; i++)
|
for (i = 0; i < 256; i++)
|
||||||
{
|
{
|
||||||
@@ -1713,7 +1755,7 @@ INT32 R_CheckTextureNumForName(const char *name)
|
|||||||
if (name[0] == '-')
|
if (name[0] == '-')
|
||||||
return 0;
|
return 0;
|
||||||
|
|
||||||
hash = FNV1a_QuickCaseHash(name, 8);
|
hash = quickncasehash(name, 8);
|
||||||
|
|
||||||
for (i = 0; i < tidcachelen; i++)
|
for (i = 0; i < tidcachelen; i++)
|
||||||
if (tidcache[i].hash == hash && !strncasecmp(tidcache[i].name, name, 8))
|
if (tidcache[i].hash == hash && !strncasecmp(tidcache[i].name, name, 8))
|
||||||
|
|||||||
@@ -45,6 +45,9 @@ enum
|
|||||||
TEXTURETYPE_COMPOSITE,
|
TEXTURETYPE_COMPOSITE,
|
||||||
};
|
};
|
||||||
|
|
||||||
|
// A maptexturedef_t describes a rectangular texture,
|
||||||
|
// which is composed of one or more mappatch_t structures
|
||||||
|
// that arrange graphic patches.
|
||||||
typedef struct
|
typedef struct
|
||||||
{
|
{
|
||||||
// Keep name for switch changing, etc.
|
// Keep name for switch changing, etc.
|
||||||
|
|||||||
+6
-8
@@ -400,7 +400,7 @@ static UINT8* RGetTranslationColormap(INT32 skinnum, skincolors_t color, UINT8 f
|
|||||||
case TC_ALLWHITE: skintableindex = ALLWHITE_TT_CACHE_INDEX; break;
|
case TC_ALLWHITE: skintableindex = ALLWHITE_TT_CACHE_INDEX; break;
|
||||||
case TC_RAINBOW: skintableindex = RAINBOW_TT_CACHE_INDEX; break;
|
case TC_RAINBOW: skintableindex = RAINBOW_TT_CACHE_INDEX; break;
|
||||||
case TC_BLINK: skintableindex = BLINK_TT_CACHE_INDEX; break;
|
case TC_BLINK: skintableindex = BLINK_TT_CACHE_INDEX; break;
|
||||||
default: skintableindex = skinnum; break;
|
default: skintableindex = skinnum; break;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -419,7 +419,7 @@ static UINT8* RGetTranslationColormap(INT32 skinnum, skincolors_t color, UINT8 f
|
|||||||
// Generate the colormap if necessary
|
// Generate the colormap if necessary
|
||||||
if (!ret)
|
if (!ret)
|
||||||
{
|
{
|
||||||
ret = static_cast<UINT8*>(Z_Malloc(NUM_PALETTE_ENTRIES, PU_STATIC, NULL));
|
ret = static_cast<UINT8*>(Z_Malloc(NUM_PALETTE_ENTRIES, (flags & GTC_CACHE) ? PU_LEVEL : PU_STATIC, NULL));
|
||||||
K_GenerateKartColormap(ret, skinnum, color, local); //R_GenerateTranslationColormap(ret, skinnum, color); // SRB2kart
|
K_GenerateKartColormap(ret, skinnum, color, local); //R_GenerateTranslationColormap(ret, skinnum, color); // SRB2kart
|
||||||
|
|
||||||
// Cache the colormap if desired
|
// Cache the colormap if desired
|
||||||
@@ -437,7 +437,8 @@ UINT8* R_GetTranslationColormap(INT32 skinnum, skincolors_t color, UINT8 flags)
|
|||||||
|
|
||||||
UINT8* R_GetLocalTranslationColormap(skin_t *skin, skin_t *localskin, skincolors_t color, UINT8 flags, boolean local)
|
UINT8* R_GetLocalTranslationColormap(skin_t *skin, skin_t *localskin, skincolors_t color, UINT8 flags, boolean local)
|
||||||
{
|
{
|
||||||
return RGetTranslationColormap(K_GetMobjLocalSkinNum(skin, localskin, local), color, flags, (localskin && local));
|
const INT32 skinnum = localskin ? (localskin - K_GetSkinArray(local)) : (skin - skins);
|
||||||
|
return RGetTranslationColormap(skinnum, color, flags, (localskin && local));
|
||||||
}
|
}
|
||||||
|
|
||||||
patch_t* R_GetSkinFaceRank(player_t* ply)
|
patch_t* R_GetSkinFaceRank(player_t* ply)
|
||||||
@@ -487,10 +488,6 @@ patch_t* R_GetSkinFaceMini(player_t* ply)
|
|||||||
|
|
||||||
\return void
|
\return void
|
||||||
*/
|
*/
|
||||||
|
|
||||||
/* There seems to be no reason to free cached colormaps tho? Not like they can change :ChonkBunckle: */
|
|
||||||
|
|
||||||
/*
|
|
||||||
void R_FlushTranslationColormapCache(void)
|
void R_FlushTranslationColormapCache(void)
|
||||||
{
|
{
|
||||||
INT32 i;
|
INT32 i;
|
||||||
@@ -503,7 +500,6 @@ void R_FlushTranslationColormapCache(void)
|
|||||||
if (localtranslationtablecache[i])
|
if (localtranslationtablecache[i])
|
||||||
memset(localtranslationtablecache[i], 0, MAXTRANSLATIONS * sizeof(UINT8**));
|
memset(localtranslationtablecache[i], 0, MAXTRANSLATIONS * sizeof(UINT8**));
|
||||||
}
|
}
|
||||||
*/
|
|
||||||
|
|
||||||
// ==========================================================================
|
// ==========================================================================
|
||||||
// COMMON DRAWER FOR 8 AND 16 BIT COLOR MODES
|
// COMMON DRAWER FOR 8 AND 16 BIT COLOR MODES
|
||||||
@@ -515,6 +511,8 @@ void R_FlushTranslationColormapCache(void)
|
|||||||
// in reality, the few routines that can work for either mode, are
|
// in reality, the few routines that can work for either mode, are
|
||||||
// put here
|
// put here
|
||||||
|
|
||||||
|
enum columncontext_e columncontext = COLUMNCONTEXT_DIRECT;
|
||||||
|
|
||||||
enum ColumnFlushType
|
enum ColumnFlushType
|
||||||
{
|
{
|
||||||
FLUSH_NONE = 0x0000,
|
FLUSH_NONE = 0x0000,
|
||||||
|
|||||||
+1
-2
@@ -105,6 +105,7 @@ enum columncontext_e
|
|||||||
COLUMNCONTEXT_FLUSH,
|
COLUMNCONTEXT_FLUSH,
|
||||||
};
|
};
|
||||||
|
|
||||||
|
extern enum columncontext_e columncontext;
|
||||||
void R_SetColumnContext(enum columncontext_e _columncontext);
|
void R_SetColumnContext(enum columncontext_e _columncontext);
|
||||||
|
|
||||||
void R_ResetColumnBuffer(void);
|
void R_ResetColumnBuffer(void);
|
||||||
@@ -123,8 +124,6 @@ enum
|
|||||||
COLDRAWFUNC_TRANSTRANS,
|
COLDRAWFUNC_TRANSTRANS,
|
||||||
COLDRAWFUNC_TWOSMULTIPATCH,
|
COLDRAWFUNC_TWOSMULTIPATCH,
|
||||||
COLDRAWFUNC_TWOSMULTIPATCHTRANS,
|
COLDRAWFUNC_TWOSMULTIPATCHTRANS,
|
||||||
COLDRAWFUNC_TWOSMULTIPATCH_DIRECT,
|
|
||||||
COLDRAWFUNC_TWOSMULTIPATCHTRANS_DIRECT,
|
|
||||||
COLDRAWFUNC_FOG,
|
COLDRAWFUNC_FOG,
|
||||||
|
|
||||||
COLDRAWFUNC_MAX
|
COLDRAWFUNC_MAX
|
||||||
|
|||||||
+33
-33
@@ -204,7 +204,7 @@ static void R_DrawColumnTemplate(drawcolumndata_t *dc)
|
|||||||
intptr_t frac;
|
intptr_t frac;
|
||||||
// Looks familiar.
|
// Looks familiar.
|
||||||
const intptr_t fracstep = dc->iscale;
|
const intptr_t fracstep = dc->iscale;
|
||||||
intptr_t heightmask = dc->sourcelength-1; // CPhipps - specify type
|
const intptr_t heightmask = dc->sourcelength-1; // CPhipps - specify type
|
||||||
constexpr INT32 npow2min = -1;
|
constexpr INT32 npow2min = -1;
|
||||||
const INT32 npow2max = dc->sourcelength;
|
const INT32 npow2max = dc->sourcelength;
|
||||||
|
|
||||||
@@ -237,10 +237,10 @@ static void R_DrawColumnTemplate(drawcolumndata_t *dc)
|
|||||||
// Determine scaling, which is the only mapping to be done.
|
// Determine scaling, which is the only mapping to be done.
|
||||||
frac = (dc->texturemid + FixedMul((dc->yl << FRACBITS) - centeryfrac, fracstep));
|
frac = (dc->texturemid + FixedMul((dc->yl << FRACBITS) - centeryfrac, fracstep));
|
||||||
|
|
||||||
switch (dc->sourcelength)
|
switch (heightmask)
|
||||||
{
|
{
|
||||||
case 256:
|
case 255:
|
||||||
case 128:
|
case 127:
|
||||||
{
|
{
|
||||||
while (count--)
|
while (count--)
|
||||||
{
|
{
|
||||||
@@ -251,7 +251,7 @@ static void R_DrawColumnTemplate(drawcolumndata_t *dc)
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
case 0:
|
case npow2min:
|
||||||
{
|
{
|
||||||
if (frac < 0)
|
if (frac < 0)
|
||||||
// adjust in case we underread
|
// adjust in case we underread
|
||||||
@@ -269,22 +269,42 @@ static void R_DrawColumnTemplate(drawcolumndata_t *dc)
|
|||||||
break;
|
break;
|
||||||
default:
|
default:
|
||||||
{
|
{
|
||||||
if (dc->sourcelength & heightmask) // not a power of 2 -- killough
|
if (!(dc->sourcelength & heightmask)) // power of 2 -- killough
|
||||||
{
|
{
|
||||||
heightmask = dc->texheight << FRACBITS;
|
while ((count -= 2) >= 0) // texture height is a power of 2 -- killough
|
||||||
|
{
|
||||||
|
*dest = R_DrawColumnPixel<Type>(dc, dest, (frac>>FRACBITS) & heightmask, source, colormap);
|
||||||
|
|
||||||
|
dest += stride;
|
||||||
|
frac += fracstep;
|
||||||
|
|
||||||
|
*dest = R_DrawColumnPixel<Type>(dc, dest, (frac>>FRACBITS) & heightmask, source, colormap);
|
||||||
|
|
||||||
|
dest += stride;
|
||||||
|
frac += fracstep;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (count & 1)
|
||||||
|
{
|
||||||
|
*dest = R_DrawColumnPixel<Type>(dc, dest, (frac>>FRACBITS) & heightmask, source, colormap);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
const intptr_t fixed_heightmask = dc->texheight << FRACBITS;
|
||||||
|
|
||||||
if (frac < 0)
|
if (frac < 0)
|
||||||
{
|
{
|
||||||
while ((frac += heightmask) < 0)
|
while ((frac += fixed_heightmask) < 0)
|
||||||
{
|
{
|
||||||
;
|
;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
while (frac >= heightmask)
|
while (frac >= fixed_heightmask)
|
||||||
{
|
{
|
||||||
frac -= heightmask;
|
frac -= fixed_heightmask;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -304,7 +324,7 @@ static void R_DrawColumnTemplate(drawcolumndata_t *dc)
|
|||||||
// Avoid overflow.
|
// Avoid overflow.
|
||||||
if (fracstep > 0x7FFFFFFF - frac)
|
if (fracstep > 0x7FFFFFFF - frac)
|
||||||
{
|
{
|
||||||
frac += fracstep - heightmask;
|
frac += fracstep - fixed_heightmask;
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
#endif
|
#endif
|
||||||
@@ -312,33 +332,13 @@ static void R_DrawColumnTemplate(drawcolumndata_t *dc)
|
|||||||
frac += fracstep;
|
frac += fracstep;
|
||||||
}
|
}
|
||||||
|
|
||||||
while (frac >= heightmask)
|
while (frac >= fixed_heightmask)
|
||||||
{
|
{
|
||||||
frac -= heightmask;
|
frac -= fixed_heightmask;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
while (--count);
|
while (--count);
|
||||||
}
|
}
|
||||||
else
|
|
||||||
{
|
|
||||||
while ((count -= 2) >= 0) // texture height is a power of 2 -- killough
|
|
||||||
{
|
|
||||||
*dest = R_DrawColumnPixel<Type>(dc, dest, ((frac>>FRACBITS) & heightmask), source, colormap);
|
|
||||||
|
|
||||||
dest += stride;
|
|
||||||
frac += fracstep;
|
|
||||||
|
|
||||||
*dest = R_DrawColumnPixel<Type>(dc, dest, ((frac>>FRACBITS) & heightmask), source, colormap);
|
|
||||||
|
|
||||||
dest += stride;
|
|
||||||
frac += fracstep;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (count & 1)
|
|
||||||
{
|
|
||||||
*dest = R_DrawColumnPixel<Type>(dc, dest, ((frac>>FRACBITS) & heightmask), source, colormap);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
|||||||
+10
-10
@@ -280,22 +280,22 @@ static void Fov_OnChange(void)
|
|||||||
|
|
||||||
static void FlipCam_OnChange(void)
|
static void FlipCam_OnChange(void)
|
||||||
{
|
{
|
||||||
SendWeaponPref(0);
|
SendWeaponPref();
|
||||||
}
|
}
|
||||||
|
|
||||||
static void FlipCam2_OnChange(void)
|
static void FlipCam2_OnChange(void)
|
||||||
{
|
{
|
||||||
SendWeaponPref(1);
|
SendWeaponPref2();
|
||||||
}
|
}
|
||||||
|
|
||||||
static void FlipCam3_OnChange(void)
|
static void FlipCam3_OnChange(void)
|
||||||
{
|
{
|
||||||
SendWeaponPref(2);
|
SendWeaponPref3();
|
||||||
}
|
}
|
||||||
|
|
||||||
static void FlipCam4_OnChange(void)
|
static void FlipCam4_OnChange(void)
|
||||||
{
|
{
|
||||||
SendWeaponPref(3);
|
SendWeaponPref4();
|
||||||
}
|
}
|
||||||
|
|
||||||
static void Precipstuff_OnChange(void)
|
static void Precipstuff_OnChange(void)
|
||||||
@@ -342,14 +342,14 @@ angle_t R_PointToAngle64(INT64 x, INT64 y)
|
|||||||
return (y -= viewy, (x -= viewx) || y) ?
|
return (y -= viewy, (x -= viewx) || y) ?
|
||||||
x >= 0 ?
|
x >= 0 ?
|
||||||
y >= 0 ?
|
y >= 0 ?
|
||||||
(x > y) ? tantoangle[SlopeDivEx(y,x)] : // octant 0
|
(x > y) ? tantoangle[SlopeDivEx(y,x)] : // octant 0
|
||||||
ANGLE_90-tantoangle[SlopeDivEx(x,y)] : // octant 1
|
ANGLE_90-tantoangle[SlopeDivEx(x,y)] : // octant 1
|
||||||
x > (y = -y) ? 0-tantoangle[SlopeDivEx(y,x)] : // octant 8
|
x > (y = -y) ? 0-tantoangle[SlopeDivEx(y,x)] : // octant 8
|
||||||
ANGLE_270+tantoangle[SlopeDivEx(x,y)] : // octant 7
|
ANGLE_270+tantoangle[SlopeDivEx(x,y)] : // octant 7
|
||||||
y >= 0 ? (x = -x) > y ? ANGLE_180-tantoangle[SlopeDivEx(y,x)] : // octant 3
|
y >= 0 ? (x = -x) > y ? ANGLE_180-tantoangle[SlopeDivEx(y,x)] : // octant 3
|
||||||
ANGLE_90 + tantoangle[SlopeDivEx(x,y)] : // octant 2
|
ANGLE_90 + tantoangle[SlopeDivEx(x,y)] : // octant 2
|
||||||
(x = -x) > (y = -y) ? ANGLE_180+tantoangle[SlopeDivEx(y,x)] : // octant 4
|
(x = -x) > (y = -y) ? ANGLE_180+tantoangle[SlopeDivEx(y,x)] : // octant 4
|
||||||
ANGLE_270-tantoangle[SlopeDivEx(x,y)] : // octant 5
|
ANGLE_270-tantoangle[SlopeDivEx(x,y)] : // octant 5
|
||||||
0;
|
0;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
+4
-1
@@ -1282,7 +1282,10 @@ void R_DrawSinglePlane(drawspandata_t* ds, visplane_t *pl, boolean allow_paralle
|
|||||||
else
|
else
|
||||||
{
|
{
|
||||||
// Don't mess with angle on slopes! We'll handle this ourselves later
|
// Don't mess with angle on slopes! We'll handle this ourselves later
|
||||||
viewangle = pl->viewangle + pl->plangle;
|
if (viewangle != pl->viewangle + pl->plangle)
|
||||||
|
{
|
||||||
|
viewangle = pl->viewangle + pl->plangle;
|
||||||
|
}
|
||||||
|
|
||||||
ds->planeheight = abs(pl->height - pl->viewz);
|
ds->planeheight = abs(pl->height - pl->viewz);
|
||||||
ds->planezlight = zlight[light];
|
ds->planezlight = zlight[light];
|
||||||
|
|||||||
+2
-65
@@ -16,7 +16,6 @@
|
|||||||
#include "r_sky.h"
|
#include "r_sky.h"
|
||||||
|
|
||||||
#include <algorithm>
|
#include <algorithm>
|
||||||
#include <vector>
|
|
||||||
|
|
||||||
#include "r_portal.h"
|
#include "r_portal.h"
|
||||||
#include "r_splats.h"
|
#include "r_splats.h"
|
||||||
@@ -1167,37 +1166,6 @@ static inline void R_ExpandPlaneY(visplane_t *pl, INT32 x, INT16 top, INT16 bott
|
|||||||
// CALLED: CORE LOOPING ROUTINE.
|
// CALLED: CORE LOOPING ROUTINE.
|
||||||
//
|
//
|
||||||
|
|
||||||
static std::vector<UINT8> holecol(256);
|
|
||||||
|
|
||||||
// used for R_DrawWallColumn
|
|
||||||
// convert "holey" columns into contigous columns
|
|
||||||
// filled with cyan in place of holes
|
|
||||||
static UINT8 *R_GetHoleColumn(drawcolumndata_t* dc)
|
|
||||||
{
|
|
||||||
column_t *col = (column_t *)(dc->source - 3);
|
|
||||||
|
|
||||||
const INT32 texheight = dc->texheight;
|
|
||||||
holecol.resize(texheight);
|
|
||||||
|
|
||||||
// fill in everything with cyan so we can skip it
|
|
||||||
memset(holecol.data(), TRANSPARENTPIXEL, texheight);
|
|
||||||
|
|
||||||
// shamelessly copy pasted from R_GenerateTexture
|
|
||||||
INT32 topdelta, prevdelta = -1;
|
|
||||||
while (col->topdelta != 0xff)
|
|
||||||
{
|
|
||||||
topdelta = col->topdelta;
|
|
||||||
if (topdelta <= prevdelta)
|
|
||||||
topdelta += prevdelta;
|
|
||||||
prevdelta = topdelta;
|
|
||||||
|
|
||||||
memcpy(holecol.data() + topdelta, (UINT8*)col + 4, col->length);
|
|
||||||
col = (column_t *)((UINT8*)col + col->length + 4);
|
|
||||||
}
|
|
||||||
|
|
||||||
return holecol.data();
|
|
||||||
}
|
|
||||||
|
|
||||||
static void R_DrawWallColumn(drawcolumndata_t* dc, INT32 yl, INT32 yh, fixed_t mid, fixed_t texturecolumn, INT32 texture, boolean remap)
|
static void R_DrawWallColumn(drawcolumndata_t* dc, INT32 yl, INT32 yh, fixed_t mid, fixed_t texturecolumn, INT32 texture, boolean remap)
|
||||||
{
|
{
|
||||||
const INT32 itexturecolumn = texturecolumn >> FRACBITS;
|
const INT32 itexturecolumn = texturecolumn >> FRACBITS;
|
||||||
@@ -1207,35 +1175,13 @@ static void R_DrawWallColumn(drawcolumndata_t* dc, INT32 yl, INT32 yh, fixed_t m
|
|||||||
dc->source = R_GetColumn(texture, itexturecolumn);
|
dc->source = R_GetColumn(texture, itexturecolumn);
|
||||||
dc->texheight = textureheight[texture] >> FRACBITS;
|
dc->texheight = textureheight[texture] >> FRACBITS;
|
||||||
dc->sourcelength = dc->texheight;
|
dc->sourcelength = dc->texheight;
|
||||||
|
|
||||||
R_SetColumnFunc(colfunctype);
|
R_SetColumnFunc(colfunctype);
|
||||||
coldrawfunc_t* colfunccopy = colfunc;
|
coldrawfunc_t* colfunccopy = colfunc;
|
||||||
|
|
||||||
if (textures[texture]->holes)
|
|
||||||
{
|
|
||||||
dc->source = R_GetHoleColumn(dc);
|
|
||||||
|
|
||||||
if (cv_softcyancut.value)
|
|
||||||
{
|
|
||||||
// need to use multipatch drawers to cut cyan pixels
|
|
||||||
if (R_CheckColumnFunc(COLDRAWFUNC_FUZZY) == true)
|
|
||||||
{
|
|
||||||
colfunccopy = colfuncs[COLDRAWFUNC_TWOSMULTIPATCHTRANS_DIRECT];
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
colfunccopy = colfuncs[COLDRAWFUNC_TWOSMULTIPATCH_DIRECT];
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
drawcolumndata_t dc_copy = *dc;
|
drawcolumndata_t dc_copy = *dc;
|
||||||
|
|
||||||
if (remap)
|
if (remap)
|
||||||
{
|
{
|
||||||
dc_copy.colormap += COLORMAP_REMAPOFFSET;
|
dc_copy.colormap += COLORMAP_REMAPOFFSET;
|
||||||
}
|
}
|
||||||
|
|
||||||
colfunccopy(const_cast<drawcolumndata_t*>(&dc_copy));
|
colfunccopy(const_cast<drawcolumndata_t*>(&dc_copy));
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -1276,15 +1222,6 @@ static void R_RenderSegLoop(drawcolumndata_t* dc)
|
|||||||
if (yl < top)
|
if (yl < top)
|
||||||
yl = top;
|
yl = top;
|
||||||
|
|
||||||
// insanely shitty hack to fix flickering on some maps
|
|
||||||
// for god knows why, on secret slide the renderer assumes some double sided linedefs have insanely tall walls
|
|
||||||
// since such tall walls are effectively nonsense in any case
|
|
||||||
// just skip them
|
|
||||||
if (yl > FRACUNIT*3)
|
|
||||||
{
|
|
||||||
continue;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (markceiling)
|
if (markceiling)
|
||||||
{
|
{
|
||||||
bottom = yl > floorclip[rw_x] ? floorclip[rw_x] : yl;
|
bottom = yl > floorclip[rw_x] ? floorclip[rw_x] : yl;
|
||||||
@@ -1444,7 +1381,7 @@ static void R_RenderSegLoop(drawcolumndata_t* dc)
|
|||||||
// calculate lighting
|
// calculate lighting
|
||||||
pindex = FixedMul(rw_scale, LIGHTRESOLUTIONFIX)>>LIGHTSCALESHIFT;
|
pindex = FixedMul(rw_scale, LIGHTRESOLUTIONFIX)>>LIGHTSCALESHIFT;
|
||||||
|
|
||||||
if (pindex >= MAXLIGHTSCALE)
|
if (pindex >= MAXLIGHTSCALE)
|
||||||
pindex = MAXLIGHTSCALE-1;
|
pindex = MAXLIGHTSCALE-1;
|
||||||
|
|
||||||
dc->colormap = walllights[pindex];
|
dc->colormap = walllights[pindex];
|
||||||
@@ -1479,7 +1416,7 @@ static void R_RenderSegLoop(drawcolumndata_t* dc)
|
|||||||
|
|
||||||
pindex = FixedMul(rw_scale, LIGHTRESOLUTIONFIX)>>LIGHTSCALESHIFT;
|
pindex = FixedMul(rw_scale, LIGHTRESOLUTIONFIX)>>LIGHTSCALESHIFT;
|
||||||
|
|
||||||
if (pindex >= MAXLIGHTSCALE)
|
if (pindex >= MAXLIGHTSCALE)
|
||||||
pindex = MAXLIGHTSCALE-1;
|
pindex = MAXLIGHTSCALE-1;
|
||||||
|
|
||||||
if (dc->lightlist[i].extra_colormap)
|
if (dc->lightlist[i].extra_colormap)
|
||||||
|
|||||||
+1
-1
@@ -774,7 +774,7 @@ void R_AddSkins(UINT16 wadnum, boolean local)
|
|||||||
// So just let the function in the while loop take care of it for us.
|
// So just let the function in the while loop take care of it for us.
|
||||||
}
|
}
|
||||||
|
|
||||||
//R_FlushTranslationColormapCache();
|
R_FlushTranslationColormapCache();
|
||||||
|
|
||||||
CONS_Printf(M_GetText("Added skin '%s'\n"), skin->name);
|
CONS_Printf(M_GetText("Added skin '%s'\n"), skin->name);
|
||||||
#ifdef SKINVALUES
|
#ifdef SKINVALUES
|
||||||
|
|||||||
@@ -92,7 +92,6 @@ INT32 R_LocalSkinAvailable(const char *name, boolean local);
|
|||||||
// had to move those here Zzz...
|
// had to move those here Zzz...
|
||||||
INT32 K_GetSkinNum(player_t *player);
|
INT32 K_GetSkinNum(player_t *player);
|
||||||
INT32 K_GetMobjSkinNum(const skin_t *skin, boolean local);
|
INT32 K_GetMobjSkinNum(const skin_t *skin, boolean local);
|
||||||
INT32 K_GetMobjLocalSkinNum(const skin_t *skin, const skin_t *localskin, boolean local);
|
|
||||||
skin_t *K_GetPlayerSkin(player_t *player);
|
skin_t *K_GetPlayerSkin(player_t *player);
|
||||||
skin_t *K_GetMobjSkin(const mobj_t *mobj);
|
skin_t *K_GetMobjSkin(const mobj_t *mobj);
|
||||||
patch_t *K_GetFacePrefix(player_t *player, INT32 skinnum);
|
patch_t *K_GetFacePrefix(player_t *player, INT32 skinnum);
|
||||||
|
|||||||
+8
-11
@@ -1662,7 +1662,7 @@ static void R_ProjectSprite(mobj_t *thing)
|
|||||||
|
|
||||||
if (thing->frame & FF_ABSOLUTELIGHTLEVEL)
|
if (thing->frame & FF_ABSOLUTELIGHTLEVEL)
|
||||||
{
|
{
|
||||||
const UINT8 n = static_cast<UINT8>(R_ThingLightLevel(thing));
|
const UINT8 n = R_ThingLightLevel(thing);
|
||||||
// n = uint8 aka 0 - 255, so the shift will always be 0 - LIGHTLEVELS - 1
|
// n = uint8 aka 0 - 255, so the shift will always be 0 - LIGHTLEVELS - 1
|
||||||
lights_array = scalelight[n >> LIGHTSEGSHIFT];
|
lights_array = scalelight[n >> LIGHTSEGSHIFT];
|
||||||
}
|
}
|
||||||
@@ -2960,24 +2960,21 @@ fixed_t R_DoPlayerFade(mobj_t *thing)
|
|||||||
fixed_t fadealpha = FRACUNIT;
|
fixed_t fadealpha = FRACUNIT;
|
||||||
static constexpr tic_t countdownstarttime = (15 * TICRATE) / 4; // starttime - (3*TICRATE)
|
static constexpr tic_t countdownstarttime = (15 * TICRATE) / 4; // starttime - (3*TICRATE)
|
||||||
|
|
||||||
if (thing->player == viewplayer || viewplayer->exiting || viewplayer->spectator || camera[R_GetViewNumber()].freecam || leveltime < countdownstarttime)
|
if (thing->player == viewplayer || viewplayer->exiting || camera[R_GetViewNumber()].freecam || leveltime < countdownstarttime)
|
||||||
return fadealpha;
|
return fadealpha;
|
||||||
|
|
||||||
const INT32 otherplayerdist = (FixedMul((thing->x - viewx), viewcos) + FixedMul((thing->y - viewy), viewsin)) >> FRACBITS;
|
const INT32 playerdist = (FixedMul((thing->x - viewx), viewcos) + FixedMul((thing->y - viewy), viewsin)) >> FRACBITS;
|
||||||
const INT32 viewplayerdist = (FixedMul((viewplayer->mo->x - viewx), viewcos) + FixedMul((viewplayer->mo->y - viewy), viewsin)) >> FRACBITS;
|
const INT32 viewplayerdist = (FixedMul((viewplayer->mo->x - viewx), viewcos) + FixedMul((viewplayer->mo->y - viewy), viewsin)) >> FRACBITS;
|
||||||
|
|
||||||
if (viewplayerdist < 2)
|
if (playerdist < viewplayerdist)
|
||||||
return fadealpha; // avoid zero division
|
|
||||||
|
|
||||||
if (otherplayerdist < viewplayerdist)
|
|
||||||
{
|
{
|
||||||
if (otherplayerdist < viewplayerdist / 2) // stronger fade when very close
|
if (playerdist < viewplayerdist / 2) // stronger fade when very close
|
||||||
{
|
{
|
||||||
fadealpha = (otherplayerdist * FRACUNIT) / (viewplayerdist / 2) / 3;
|
fadealpha = (playerdist * FRACUNIT) / (viewplayerdist / 2) / 3;
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
fadealpha = (otherplayerdist * FRACUNIT) / viewplayerdist;
|
fadealpha = (playerdist * FRACUNIT) / viewplayerdist;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
+1
-1
@@ -50,7 +50,7 @@ extern fixed_t windowtop;
|
|||||||
extern fixed_t windowbottom;
|
extern fixed_t windowbottom;
|
||||||
extern INT32 lengthcol;
|
extern INT32 lengthcol;
|
||||||
|
|
||||||
FUNCINLINE static ATTRINLINE INT32 R_ThingLightLevel(const mobj_t* thing)
|
FUNCINLINE static ATTRINLINE INT32 R_ThingLightLevel(mobj_t* thing)
|
||||||
{
|
{
|
||||||
return (INT32)thing->lightlevel;
|
return (INT32)thing->lightlevel;
|
||||||
}
|
}
|
||||||
|
|||||||
Loaded 100 of 117 files, more files were not shown because too many files have changed in this diff.
Show more
Reference in new issue
Block a user