Compare commits
1
Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
15bb99d27d |
No files matched your search
+2
-2
@@ -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
|
||||||
|
|||||||
+17
-38
@@ -519,23 +519,6 @@ LUA_API int lua_pushthread (lua_State *L) {
|
|||||||
** get functions (Lua -> stack)
|
** get functions (Lua -> stack)
|
||||||
*/
|
*/
|
||||||
|
|
||||||
static void auxgetstr (lua_State *L, TValue *t, const char *k) {
|
|
||||||
TValue *slot;
|
|
||||||
TValue key;
|
|
||||||
TString *str = luaS_new(L, k);
|
|
||||||
api_checkvalidindex(L, t);
|
|
||||||
if (luaV_fastget(L, t, str, slot, luaH_getstr)) {
|
|
||||||
setobj2s(L, L->top, slot);
|
|
||||||
api_incr_top(L);
|
|
||||||
}
|
|
||||||
else {
|
|
||||||
setsvalue(L, &key, str);
|
|
||||||
luaV_finishget(L, t, L->top, L->top, slot);
|
|
||||||
api_incr_top(L);
|
|
||||||
}
|
|
||||||
lua_unlock(L);
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
LUA_API void lua_gettable (lua_State *L, int idx) {
|
LUA_API void lua_gettable (lua_State *L, int idx) {
|
||||||
StkId t;
|
StkId t;
|
||||||
@@ -548,8 +531,15 @@ LUA_API void lua_gettable (lua_State *L, int idx) {
|
|||||||
|
|
||||||
|
|
||||||
LUA_API void lua_getfield (lua_State *L, int idx, const char *k) {
|
LUA_API void lua_getfield (lua_State *L, int idx, const char *k) {
|
||||||
|
StkId t;
|
||||||
|
TValue key;
|
||||||
lua_lock(L);
|
lua_lock(L);
|
||||||
auxgetstr(L, index2adr(L, idx), k);
|
t = index2adr(L, idx);
|
||||||
|
api_checkvalidindex(L, t);
|
||||||
|
setsvalue(L, &key, luaS_new(L, k));
|
||||||
|
luaV_gettable(L, t, &key, L->top);
|
||||||
|
api_incr_top(L);
|
||||||
|
lua_unlock(L);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
@@ -641,25 +631,6 @@ LUA_API void lua_getfenv (lua_State *L, int idx) {
|
|||||||
*/
|
*/
|
||||||
|
|
||||||
|
|
||||||
static void auxsetstr (lua_State *L, TValue *t, const char *k) {
|
|
||||||
TValue key;
|
|
||||||
TValue *slot;
|
|
||||||
TString *str = luaS_new(L, k);
|
|
||||||
api_checknelems(L, 1);
|
|
||||||
api_checkvalidindex(L, t);
|
|
||||||
if (luaV_fastset(L, t, str, slot, luaH_setstr, L->top)) {
|
|
||||||
setobj2t(L, cast(TValue *, slot), L->top - 1);
|
|
||||||
L->top--; /* pop value */
|
|
||||||
}
|
|
||||||
else {
|
|
||||||
setsvalue2s(L, &key, str);
|
|
||||||
luaV_finishset(L, t, &key, L->top - 1, slot);
|
|
||||||
L->top--; /* pop value */
|
|
||||||
}
|
|
||||||
lua_unlock(L);
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
LUA_API void lua_settable (lua_State *L, int idx) {
|
LUA_API void lua_settable (lua_State *L, int idx) {
|
||||||
StkId t;
|
StkId t;
|
||||||
lua_lock(L);
|
lua_lock(L);
|
||||||
@@ -673,8 +644,16 @@ LUA_API void lua_settable (lua_State *L, int idx) {
|
|||||||
|
|
||||||
|
|
||||||
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) {
|
||||||
|
StkId t;
|
||||||
|
TValue key;
|
||||||
lua_lock(L);
|
lua_lock(L);
|
||||||
auxsetstr(L, index2adr(L, idx), k);
|
api_checknelems(L, 1);
|
||||||
|
t = index2adr(L, idx);
|
||||||
|
api_checkvalidindex(L, t);
|
||||||
|
setsvalue(L, &key, luaS_new(L, k));
|
||||||
|
luaV_settable(L, t, &key, L->top - 1);
|
||||||
|
L->top--; /* pop value */
|
||||||
|
lua_unlock(L);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
+3
-15
@@ -20,7 +20,6 @@
|
|||||||
#define lauxlib_c
|
#define lauxlib_c
|
||||||
#define LUA_LIB
|
#define LUA_LIB
|
||||||
|
|
||||||
#include "ldebug.h"
|
|
||||||
#include "lua.h"
|
#include "lua.h"
|
||||||
|
|
||||||
#include "lauxlib.h"
|
#include "lauxlib.h"
|
||||||
@@ -469,19 +468,8 @@ LUALIB_API char *luaL_prepbuffer (luaL_Buffer *B) {
|
|||||||
|
|
||||||
|
|
||||||
LUALIB_API void luaL_addlstring (luaL_Buffer *B, const char *s, size_t l) {
|
LUALIB_API void luaL_addlstring (luaL_Buffer *B, const char *s, size_t l) {
|
||||||
while (l) {
|
while (l--)
|
||||||
size_t space = bufffree(B);
|
luaL_addchar(B, *s++);
|
||||||
if (space == 0) {
|
|
||||||
luaL_prepbuffer(B);
|
|
||||||
lua_assert(bufffree(B) == LUAL_BUFFERSIZE);
|
|
||||||
space = LUAL_BUFFERSIZE;
|
|
||||||
}
|
|
||||||
if (space > l) space = l;
|
|
||||||
memcpy(B->p, s, space);
|
|
||||||
B->p += space;
|
|
||||||
s += space;
|
|
||||||
l -= space;
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
@@ -698,6 +686,6 @@ static int panic (lua_State *L) {
|
|||||||
|
|
||||||
LUALIB_API lua_State *luaL_newstate (void) {
|
LUALIB_API lua_State *luaL_newstate (void) {
|
||||||
lua_State *L = lua_newstate(l_alloc, NULL);
|
lua_State *L = lua_newstate(l_alloc, NULL);
|
||||||
if (l_likely(L)) lua_atpanic(L, &panic);
|
if (L) lua_atpanic(L, &panic);
|
||||||
return L;
|
return L;
|
||||||
}
|
}
|
||||||
+12
-25
@@ -626,20 +626,8 @@ static void codenot (FuncState *fs, expdesc *e) {
|
|||||||
removevalues(fs, e->t);
|
removevalues(fs, e->t);
|
||||||
}
|
}
|
||||||
|
|
||||||
/*
|
|
||||||
** Check whether expression 'e' is a literal string
|
|
||||||
*/
|
|
||||||
static int isKstr (FuncState *fs, expdesc *e) {
|
|
||||||
return (e->k == VK && ttisstring(&fs->f->k[e->u.s.info]));
|
|
||||||
}
|
|
||||||
|
|
||||||
/*
|
|
||||||
** Create expression 't[k]'. 't' must have its final result already in a
|
|
||||||
** register or upvalue. Upvalues can only be indexed by literal strings.
|
|
||||||
*/
|
|
||||||
void luaK_indexed (FuncState *fs, expdesc *t, expdesc *k) {
|
void luaK_indexed (FuncState *fs, expdesc *t, expdesc *k) {
|
||||||
if (t->k == VUPVAL && !isKstr(fs, k)) /* upvalue indexed by non string? */
|
|
||||||
luaK_exp2anyreg(fs, t); /* put it in a register */
|
|
||||||
t->u.s.aux = luaK_exp2RK(fs, k);
|
t->u.s.aux = luaK_exp2RK(fs, k);
|
||||||
t->k = VINDEXED;
|
t->k = VINDEXED;
|
||||||
}
|
}
|
||||||
@@ -802,19 +790,18 @@ void luaK_posfix (FuncState *fs, BinOpr op, expdesc *e1, expdesc *e2) {
|
|||||||
case OPR_BXOR: codearith(fs, OP_BXOR, e1, e2); break;
|
case OPR_BXOR: codearith(fs, OP_BXOR, e1, e2); break;
|
||||||
case OPR_BSHL: codearith(fs, OP_BSHL, e1, e2); break;
|
case OPR_BSHL: codearith(fs, OP_BSHL, e1, e2); break;
|
||||||
case OPR_BSHR: codearith(fs, OP_BSHR, e1, e2); break;
|
case OPR_BSHR: codearith(fs, OP_BSHR, e1, e2); break;
|
||||||
case OPR_ADD: case OPR_SUB: case OPR_MUL: case OPR_DIV:
|
case OPR_ADD: codearith(fs, OP_ADD, e1, e2); break;
|
||||||
case OPR_MOD: case OPR_POW: {
|
case OPR_SUB: codearith(fs, OP_SUB, e1, e2); break;
|
||||||
codearith(fs, op - OPR_ADD + OP_ADD, e1, e2);
|
case OPR_MUL: codearith(fs, OP_MUL, e1, e2); break;
|
||||||
break;
|
case OPR_DIV: codearith(fs, OP_DIV, e1, e2); break;
|
||||||
}
|
case OPR_MOD: codearith(fs, OP_MOD, e1, e2); break;
|
||||||
case OPR_EQ: case OPR_LT: case OPR_LE: {
|
case OPR_POW: codearith(fs, OP_POW, e1, e2); break;
|
||||||
codecomp(fs, op - OPR_EQ + OP_EQ, 1, e1, e2);
|
case OPR_EQ: codecomp(fs, OP_EQ, 1, e1, e2); break;
|
||||||
break;
|
case OPR_NE: codecomp(fs, OP_EQ, 0, e1, e2); break;
|
||||||
}
|
case OPR_LT: codecomp(fs, OP_LT, 1, e1, e2); break;
|
||||||
case OPR_NE: case OPR_GT: case OPR_GE: {
|
case OPR_LE: codecomp(fs, OP_LE, 1, e1, e2); break;
|
||||||
codecomp(fs, op - OPR_NE + OP_EQ, 0, e1, e2);
|
case OPR_GT: codecomp(fs, OP_LT, 0, e1, e2); break;
|
||||||
break;
|
case OPR_GE: codecomp(fs, OP_LE, 0, e1, e2); break;
|
||||||
}
|
|
||||||
default: lua_assert(0);
|
default: lua_assert(0);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
+3
-3
@@ -21,13 +21,13 @@
|
|||||||
|
|
||||||
|
|
||||||
/*
|
/*
|
||||||
** grep "ORDER OPR" if you change these enums (ORDER OP)
|
** grep "ORDER OPR" if you change these enums
|
||||||
*/
|
*/
|
||||||
typedef enum BinOpr {
|
typedef enum BinOpr {
|
||||||
OPR_ADD, OPR_SUB, OPR_MUL, OPR_DIV, OPR_MOD, OPR_POW,
|
OPR_ADD, OPR_SUB, OPR_MUL, OPR_DIV, OPR_MOD, OPR_POW,
|
||||||
OPR_CONCAT,
|
OPR_CONCAT,
|
||||||
OPR_EQ, OPR_LT, OPR_LE,
|
OPR_NE, OPR_EQ,
|
||||||
OPR_NE, OPR_GT, OPR_GE,
|
OPR_LT, OPR_LE, OPR_GT, OPR_GE,
|
||||||
OPR_AND, OPR_OR,
|
OPR_AND, OPR_OR,
|
||||||
OPR_BAND, OPR_BOR, OPR_BXOR,
|
OPR_BAND, OPR_BOR, OPR_BXOR,
|
||||||
OPR_BSHL, OPR_BSHR,
|
OPR_BSHL, OPR_BSHR,
|
||||||
|
|||||||
+5
-28
@@ -542,39 +542,16 @@ static const char *getobjname (lua_State *L, CallInfo *ci, int stackpos,
|
|||||||
|
|
||||||
|
|
||||||
static const char *getfuncname (lua_State *L, CallInfo *ci, const char **name) {
|
static const char *getfuncname (lua_State *L, CallInfo *ci, const char **name) {
|
||||||
TMS tm = 0;
|
|
||||||
Instruction i;
|
Instruction i;
|
||||||
if ((isLua(ci) && ci->tailcalls > 0) || !isLua(ci - 1))
|
if ((isLua(ci) && ci->tailcalls > 0) || !isLua(ci - 1))
|
||||||
return NULL; /* calling function is not Lua (or is unknown) */
|
return NULL; /* calling function is not Lua (or is unknown) */
|
||||||
ci--; /* calling function */
|
ci--; /* calling function */
|
||||||
i = ci_func(ci)->l.p->code[currentpc(L, ci)];
|
i = ci_func(ci)->l.p->code[currentpc(L, ci)];
|
||||||
switch (GET_OPCODE(i)) {
|
if (GET_OPCODE(i) == OP_CALL || GET_OPCODE(i) == OP_TAILCALL ||
|
||||||
case OP_CALL:
|
GET_OPCODE(i) == OP_TFORLOOP)
|
||||||
case OP_TAILCALL:
|
return getobjname(L, ci, GETARG_A(i), name);
|
||||||
case OP_TFORLOOP:
|
else
|
||||||
return getobjname(L, ci, GETARG_A(i), name);
|
return NULL; /* no useful name can be found */
|
||||||
case OP_GETGLOBAL:
|
|
||||||
case OP_SELF:
|
|
||||||
case OP_GETTABLE: tm = TM_INDEX; break;
|
|
||||||
case OP_SETGLOBAL:
|
|
||||||
case OP_SETTABLE: tm = TM_NEWINDEX; break;
|
|
||||||
case OP_EQ: tm = TM_EQ; break;
|
|
||||||
case OP_ADD: tm = TM_ADD; break;
|
|
||||||
case OP_SUB: tm = TM_SUB; break;
|
|
||||||
case OP_MUL: tm = TM_MUL; break;
|
|
||||||
case OP_DIV: tm = TM_DIV; break;
|
|
||||||
case OP_MOD: tm = TM_MOD; break;
|
|
||||||
case OP_POW: tm = TM_POW; break;
|
|
||||||
case OP_UNM: tm = TM_UNM; break;
|
|
||||||
case OP_LEN: tm = TM_LEN; break;
|
|
||||||
case OP_LT: tm = TM_LT; break;
|
|
||||||
case OP_LE: tm = TM_LE; break;
|
|
||||||
case OP_CONCAT: tm = TM_CONCAT; break;
|
|
||||||
default:
|
|
||||||
return NULL; /* else no useful name can be found */
|
|
||||||
}
|
|
||||||
*name = getstr(G(L)->tmname[tm]);
|
|
||||||
return "metamethod";
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
+2
-2
@@ -164,7 +164,7 @@ void luaD_reallocCI (lua_State *L, int newsize) {
|
|||||||
|
|
||||||
|
|
||||||
void luaD_growstack (lua_State *L, int n) {
|
void luaD_growstack (lua_State *L, int n) {
|
||||||
if (n <= L->stacksize) /* double size is enough? */
|
if (l_likely(n <= L->stacksize)) /* double size is enough? */
|
||||||
luaD_reallocstack(L, 2*L->stacksize);
|
luaD_reallocstack(L, 2*L->stacksize);
|
||||||
else
|
else
|
||||||
luaD_reallocstack(L, L->stacksize + n);
|
luaD_reallocstack(L, L->stacksize + n);
|
||||||
@@ -318,7 +318,7 @@ int luaD_precall (lua_State *L, StkId func, int nresults) {
|
|||||||
ci->top = L->top + LUA_MINSTACK;
|
ci->top = L->top + LUA_MINSTACK;
|
||||||
lua_assert(ci->top <= L->stack_last);
|
lua_assert(ci->top <= L->stack_last);
|
||||||
ci->nresults = nresults;
|
ci->nresults = nresults;
|
||||||
if (l_unlikely(L->hookmask & LUA_MASKCALL))
|
if (L->hookmask & LUA_MASKCALL)
|
||||||
luaD_callhook(L, LUA_HOOKCALL, -1);
|
luaD_callhook(L, LUA_HOOKCALL, -1);
|
||||||
lua_unlock(L);
|
lua_unlock(L);
|
||||||
n = (*curr_func(L)->c.f)(L); /* do the actual call */
|
n = (*curr_func(L)->c.f)(L); /* do the actual call */
|
||||||
|
|||||||
+9
-10
@@ -356,21 +356,20 @@ static int read_line (lua_State *L, FILE *f) {
|
|||||||
|
|
||||||
|
|
||||||
static int read_chars (lua_State *L, FILE *f, size_t n) {
|
static int read_chars (lua_State *L, FILE *f, size_t n) {
|
||||||
size_t tbr = n; /* number of chars to be read */
|
size_t rlen; /* how much to read */
|
||||||
size_t rlen; /* how much to read in each cycle */
|
size_t nr; /* number of chars actually read */
|
||||||
size_t nr; /* number of chars actually read in each cycle */
|
|
||||||
luaL_Buffer b;
|
luaL_Buffer b;
|
||||||
luaL_buffinit(L, &b);
|
luaL_buffinit(L, &b);
|
||||||
rlen = LUAL_BUFFERSIZE; /* try to read that much each time */
|
rlen = LUAL_BUFFERSIZE; /* try to read that much each time */
|
||||||
do {
|
do {
|
||||||
char *p = luaL_prepbuffer(&b);
|
char *p = luaL_prepbuffer(&b);
|
||||||
if (rlen > tbr) rlen = tbr; /* cannot read more than asked */
|
if (rlen > n) rlen = n; /* cannot read more than asked */
|
||||||
nr = fread(p, sizeof(char), rlen, f);
|
nr = fread(p, sizeof(char), rlen, f);
|
||||||
luaL_addsize(&b, nr);
|
luaL_addsize(&b, nr);
|
||||||
tbr -= nr; /* still have to read 'tbr' chars */
|
n -= nr; /* still have to read `n' chars */
|
||||||
} while (tbr > 0 && nr == rlen); /* until end of count or eof */
|
} while (n > 0 && nr == rlen); /* until end of count or eof */
|
||||||
luaL_pushresult(&b); /* close buffer */
|
luaL_pushresult(&b); /* close buffer */
|
||||||
return (tbr == 0 || tbr < n); /* true iff read something */
|
return (n == 0 || lua_objlen(L, -1) > 0);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
@@ -433,13 +432,13 @@ static int f_read (lua_State *L) {
|
|||||||
|
|
||||||
static int io_readline (lua_State *L) {
|
static int io_readline (lua_State *L) {
|
||||||
FILE *f = *(FILE **)lua_touserdata(L, lua_upvalueindex(1));
|
FILE *f = *(FILE **)lua_touserdata(L, lua_upvalueindex(1));
|
||||||
int success;
|
int sucess;
|
||||||
if (f == NULL) /* file is already closed? */
|
if (f == NULL) /* file is already closed? */
|
||||||
luaL_error(L, "file is already closed");
|
luaL_error(L, "file is already closed");
|
||||||
success = read_line(L, f);
|
sucess = read_line(L, f);
|
||||||
if (ferror(f))
|
if (ferror(f))
|
||||||
return luaL_error(L, "%s", strerror(errno));
|
return luaL_error(L, "%s", strerror(errno));
|
||||||
if (success) return 1;
|
if (sucess) return 1;
|
||||||
else { /* EOF */
|
else { /* EOF */
|
||||||
if (lua_toboolean(L, lua_upvalueindex(2))) { /* generator created file? */
|
if (lua_toboolean(L, lua_upvalueindex(2))) { /* generator created file? */
|
||||||
lua_settop(L, 0);
|
lua_settop(L, 0);
|
||||||
|
|||||||
@@ -232,8 +232,6 @@ OP_VARARG/* A B R(A), R(A+1), ..., R(A+B-1) = vararg */
|
|||||||
(*) In OP_SETLIST, if (B == 0) then B = `top';
|
(*) In OP_SETLIST, if (B == 0) then B = `top';
|
||||||
if (C == 0) then next `instruction' is real C
|
if (C == 0) then next `instruction' is real C
|
||||||
|
|
||||||
(*) In OP_SELF, the index must be a string.
|
|
||||||
|
|
||||||
(*) For comparisons, A specifies what condition the test should accept
|
(*) For comparisons, A specifies what condition the test should accept
|
||||||
(true or false).
|
(true or false).
|
||||||
|
|
||||||
|
|||||||
+4
-4
@@ -881,10 +881,10 @@ static const struct {
|
|||||||
lu_byte right; /* right priority */
|
lu_byte right; /* right priority */
|
||||||
} priority[] = { /* ORDER OPR */
|
} priority[] = { /* ORDER OPR */
|
||||||
{6, 6}, {6, 6}, {7, 7}, {7, 7}, {7, 7}, /* `+' `-' `/' `%' */
|
{6, 6}, {6, 6}, {7, 7}, {7, 7}, {7, 7}, /* `+' `-' `/' `%' */
|
||||||
{10, 9}, {5, 4}, /* ^, .. (right associative) */
|
{10, 9}, {5, 4}, /* power and concat (right associative) */
|
||||||
{3, 3}, {3, 3}, {3, 3}, /* ==, <, <= */
|
{3, 3}, {3, 3}, /* equality and inequality */
|
||||||
{3, 3}, {3, 3}, {3, 3}, /* ~=, >, >= */
|
{3, 3}, {3, 3}, {3, 3}, {3, 3}, /* order */
|
||||||
{2, 2}, {1, 1} /* and, or */
|
{2, 2}, {1, 1} /* logical (and/or) */
|
||||||
,{6, 6}, {6, 6}, {6, 6}, /* bit-wise (band/bor/bxor) */
|
,{6, 6}, {6, 6}, {6, 6}, /* bit-wise (band/bor/bxor) */
|
||||||
{7, 7}, {7, 7} /* shl/shr */
|
{7, 7}, {7, 7} /* shl/shr */
|
||||||
};
|
};
|
||||||
|
|||||||
+4
-58
@@ -51,7 +51,7 @@ static TString *newlstr (lua_State *L, const char *str, size_t l,
|
|||||||
unsigned int h) {
|
unsigned int h) {
|
||||||
TString *ts;
|
TString *ts;
|
||||||
stringtable *tb;
|
stringtable *tb;
|
||||||
if (l_unlikely(l+1 > (MAX_SIZET - sizeof(TString))/sizeof(char)))
|
if (l+1 > (MAX_SIZET - sizeof(TString))/sizeof(char))
|
||||||
luaM_toobig(L);
|
luaM_toobig(L);
|
||||||
ts = cast(TString *, luaM_malloc(L, (l+1)*sizeof(char)+sizeof(TString)));
|
ts = cast(TString *, luaM_malloc(L, (l+1)*sizeof(char)+sizeof(TString)));
|
||||||
ts->tsv.len = l;
|
ts->tsv.len = l;
|
||||||
@@ -72,72 +72,18 @@ static TString *newlstr (lua_State *L, const char *str, size_t l,
|
|||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
// string hash taken from luaJIT
|
TString *luaS_newlstr (lua_State *L, const char *str, size_t l) {
|
||||||
|
GCObject *o;
|
||||||
/* Unaligned load of uint32_t. */
|
|
||||||
static inline __attribute__((always_inline)) uint32_t getu32(const void* ptr)
|
|
||||||
{
|
|
||||||
uint32_t result;
|
|
||||||
memcpy(&result, ptr, 4);
|
|
||||||
return result;
|
|
||||||
}
|
|
||||||
|
|
||||||
// smol macro to look a little less messy lul
|
|
||||||
#define getu8(p) *cast(const uint8_t *, p)
|
|
||||||
|
|
||||||
/* Keyed sparse ARX string hash. Constant time. */
|
|
||||||
static unsigned hash_sparse(const char *str, size_t len)
|
|
||||||
{
|
|
||||||
/* Constants taken from lookup3 hash by Bob Jenkins. */
|
|
||||||
unsigned int a, b, h = cast(unsigned int, len);
|
|
||||||
#define rol(x, n) (((x)<<(n)) | ((x)>>(-cast(int, n)&(8*sizeof(x)-1))))
|
|
||||||
if (len >= 4) { /* Caveat: unaligned access! */
|
|
||||||
a = getu32(str);
|
|
||||||
h ^= getu32(str+len-4);
|
|
||||||
b = getu32(str+(len>>1)-2);
|
|
||||||
h ^= b; h -= rol(b, 14);
|
|
||||||
b += getu32(str+(len>>2)-1);
|
|
||||||
} else if (len > 0) {
|
|
||||||
a = getu8(str);
|
|
||||||
h ^= getu8(str+len-1);
|
|
||||||
b = getu8(str+(len>>1));
|
|
||||||
h ^= b; h -= rol(b, 14);
|
|
||||||
} else {
|
|
||||||
return 0;
|
|
||||||
}
|
|
||||||
a ^= h; a -= rol(h, 11);
|
|
||||||
b ^= a; b -= rol(a, 25);
|
|
||||||
h ^= b; h -= rol(b, 16);
|
|
||||||
#undef rol
|
|
||||||
return h;
|
|
||||||
}
|
|
||||||
|
|
||||||
#undef getu8
|
|
||||||
|
|
||||||
|
|
||||||
static inline __attribute__((always_inline)) unsigned luaS_hash (const char *str, size_t l) {
|
|
||||||
#if 0
|
|
||||||
unsigned int h = cast(unsigned int, l); /* seed */
|
unsigned int h = cast(unsigned int, l); /* seed */
|
||||||
size_t step = (l>>5)+1; /* if string is too long, don't hash all its chars */
|
size_t step = (l>>5)+1; /* if string is too long, don't hash all its chars */
|
||||||
size_t l1;
|
size_t l1;
|
||||||
for (l1=l; l1>=step; l1-=step) /* compute hash */
|
for (l1=l; l1>=step; l1-=step) /* compute hash */
|
||||||
h = h ^ ((h<<5)+(h>>2)+cast(unsigned char, str[l1-1]));
|
h = h ^ ((h<<5)+(h>>2)+cast(unsigned char, str[l1-1]));
|
||||||
return h;
|
|
||||||
#else
|
|
||||||
return hash_sparse(str, l);
|
|
||||||
#endif
|
|
||||||
}
|
|
||||||
|
|
||||||
TString *luaS_newlstr (lua_State *L, const char *str, size_t l) {
|
|
||||||
GCObject *o;
|
|
||||||
unsigned int h = luaS_hash(str, l);
|
|
||||||
for (o = G(L)->strt.hash[lmod(h, G(L)->strt.size)];
|
for (o = G(L)->strt.hash[lmod(h, G(L)->strt.size)];
|
||||||
o != NULL;
|
o != NULL;
|
||||||
o = o->gch.next) {
|
o = o->gch.next) {
|
||||||
TString *ts = rawgco2ts(o);
|
TString *ts = rawgco2ts(o);
|
||||||
if (ts->tsv.hash == h &&
|
if (l_unlikely(ts->tsv.len == l && (memcmp(str, getstr(ts), l) == 0))) {
|
||||||
ts->tsv.len == l &&
|
|
||||||
(memcmp(str, getstr(ts), l) == 0)) {
|
|
||||||
/* string may be dead */
|
/* string may be dead */
|
||||||
if (isdead(G(L), o)) changewhite(o);
|
if (isdead(G(L), o)) changewhite(o);
|
||||||
return ts;
|
return ts;
|
||||||
|
|||||||
@@ -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
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
+51
-135
@@ -28,7 +28,7 @@
|
|||||||
|
|
||||||
|
|
||||||
|
|
||||||
/* limit for table tag-method chains (to avoid infinite loops) */
|
/* limit for table tag-method chains (to avoid loops) */
|
||||||
#define MAXTAGLOOP 100
|
#define MAXTAGLOOP 100
|
||||||
|
|
||||||
|
|
||||||
@@ -105,88 +105,57 @@ static void callTM (lua_State *L, const TValue *f, const TValue *p1,
|
|||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
/*
|
void luaV_gettable (lua_State *L, TValue *t, TValue *key, StkId val) {
|
||||||
** Finish the table access 'val = t[key]'.
|
int loop;
|
||||||
** if 'slot' is NULL, 't' is not a table; otherwise, 'slot' points to
|
|
||||||
** t[k] entry (which must be nil).
|
|
||||||
*/
|
|
||||||
void luaV_finishget (lua_State *L, TValue *t, TValue *key, StkId val,
|
|
||||||
TValue *slot) {
|
|
||||||
int loop; /* counter to avoid infinite loops */
|
|
||||||
TValue *tm; /* metamethod */
|
|
||||||
for (loop = 0; loop < MAXTAGLOOP; loop++) {
|
for (loop = 0; loop < MAXTAGLOOP; loop++) {
|
||||||
if (slot == NULL) { /* 't' is not a table? */
|
TValue *tm;
|
||||||
lua_assert(!ttistable(t));
|
if (ttistable(t)) { /* `t' is a table? */
|
||||||
tm = luaT_gettmbyobj(L, t, TM_INDEX);
|
Table *h = hvalue(t);
|
||||||
if (l_unlikely(ttisnil(tm)))
|
const TValue *res = luaH_get(h, key); /* do a primitive get */
|
||||||
luaG_typeerror(L, t, "index"); /* no metamethod */
|
if (!ttisnil(res) || /* result is no nil? */
|
||||||
/* else will try the metamethod */
|
(tm = fasttm(L, h->metatable, TM_INDEX)) == NULL) { /* or no TM? */
|
||||||
}
|
setobj2s(L, val, res);
|
||||||
else { /* 't' is a table */
|
|
||||||
lua_assert(ttisnil(slot));
|
|
||||||
tm = fasttm(L, hvalue(t)->metatable, TM_INDEX); /* table's metamethod */
|
|
||||||
if (tm == NULL) { /* no metamethod? */
|
|
||||||
setnilvalue(val); /* result is nil */
|
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
/* else will try the metamethod */
|
/* else will try the tag method */
|
||||||
}
|
}
|
||||||
if (ttisfunction(tm)) { /* is metamethod a function? */
|
else if (l_unlikely(ttisnil(tm = luaT_gettmbyobj(L, t, TM_INDEX))))
|
||||||
callTMres(L, val, tm, t, key); /* call it */
|
luaG_typeerror(L, t, "index");
|
||||||
|
if (ttisfunction(tm)) {
|
||||||
|
callTMres(L, val, tm, t, key);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
t = tm; /* else try to access 'tm[key]' */
|
t = tm; /* else repeat with `tm' */
|
||||||
if (luaV_fastget(L,t,key,slot,luaH_get)) { /* fast track? */
|
|
||||||
setobj2s(L, val, slot); /* done */
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
/* else repeat (tail call 'luaV_finishget') */
|
|
||||||
}
|
}
|
||||||
luaG_runerror(L, "'__index' chain too long; possible loop");
|
luaG_runerror(L, "loop in gettable");
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
/*
|
void luaV_settable (lua_State *L, TValue *t, TValue *key, StkId val) {
|
||||||
** Finish a table assignment 't[key] = val'.
|
int loop;
|
||||||
** If 'slot' is NULL, 't' is not a table. Otherwise, 'slot' points
|
|
||||||
** to the entry 't[key]', or to 'luaO_nilobject' if there is no such
|
|
||||||
** entry. (The value at 'slot' must be nil, otherwise 'luaV_fastset'
|
|
||||||
** would have done the job.)
|
|
||||||
*/
|
|
||||||
void luaV_finishset (lua_State *L, TValue *t, TValue *key,
|
|
||||||
StkId val, TValue *slot) {
|
|
||||||
int loop; /* counter to avoid infinite loops */
|
|
||||||
for (loop = 0; loop < MAXTAGLOOP; loop++) {
|
for (loop = 0; loop < MAXTAGLOOP; loop++) {
|
||||||
TValue *tm;
|
TValue *tm = NULL;
|
||||||
if (slot != NULL) {
|
if (ttistable(t)) { /* `t' is a table? */
|
||||||
lua_assert(ttistable(t) && ttisnil(slot));
|
|
||||||
Table *h = hvalue(t);
|
Table *h = hvalue(t);
|
||||||
/* must check the metamethod */
|
TValue *oldval = luaH_set(L, h, key); /* do a primitive set */
|
||||||
/* slot is nil=> look for newindex, slot is not nil => look for usedindex */
|
/* oldval is nil=> look for newindex, oldval is not nil => look for usedindex */
|
||||||
if (!((ttisnil(slot) && ((tm = fasttm(L, h->metatable, TM_NEWINDEX)) != NULL)) ||
|
if (!((ttisnil(oldval) && ((tm = fasttm(L, h->metatable, TM_NEWINDEX)) != NULL)) ||
|
||||||
((!ttisnil(slot)) && ((tm = fasttm(L, h->metatable, TM_USEDINDEX)) != NULL)))) {
|
((!ttisnil(oldval)) && ((tm = fasttm(L, h->metatable, TM_USEDINDEX)) != NULL)))) {
|
||||||
/* no metamethod and (now) there is an entry with given key */
|
setobj2t(L, oldval, val);
|
||||||
setobj2t(L, cast(TValue *, slot), val);
|
|
||||||
luaC_barriert(L, h, val);
|
luaC_barriert(L, h, val);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
/* else will try the metamethod */
|
/* else will try the tag method */
|
||||||
}
|
}
|
||||||
else { /* not a table; check metamethod */
|
else if (l_unlikely(ttisnil(tm = luaT_gettmbyobj(L, t, TM_NEWINDEX))))
|
||||||
if (l_unlikely(ttisnil(tm = luaT_gettmbyobj(L, t, TM_NEWINDEX))))
|
luaG_typeerror(L, t, "index");
|
||||||
luaG_typeerror(L, t, "index");
|
|
||||||
}
|
|
||||||
/* try the metamethod */
|
|
||||||
if (ttisfunction(tm)) {
|
if (ttisfunction(tm)) {
|
||||||
callTM(L, tm, t, key, val);
|
callTM(L, tm, t, key, val);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
t = tm; /* else repeat assignment over 'tm' */
|
t = tm; /* else repeat with `tm' */
|
||||||
if (luaV_fastset(L, t, key, slot, luaH_set, val))
|
|
||||||
return; /* done */
|
|
||||||
/* else loop */
|
|
||||||
}
|
}
|
||||||
luaG_runerror(L, "settable chain too long; possible loop");
|
luaG_runerror(L, "loop in settable");
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
@@ -397,7 +366,6 @@ static void Arith (lua_State *L, StkId ra, TValue *rb,
|
|||||||
|
|
||||||
|
|
||||||
#define arith_op(op,tm) { \
|
#define arith_op(op,tm) { \
|
||||||
StkId ra = RA(i); \
|
|
||||||
TValue *rb = RKB(i); \
|
TValue *rb = RKB(i); \
|
||||||
TValue *rc = RKC(i); \
|
TValue *rc = RKC(i); \
|
||||||
if (ttisnumber(rb) && ttisnumber(rc)) { \
|
if (ttisnumber(rb) && ttisnumber(rc)) { \
|
||||||
@@ -409,21 +377,6 @@ static void Arith (lua_State *L, StkId ra, TValue *rb,
|
|||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
/*
|
|
||||||
** copy of 'luaV_gettable', but protecting call to potential metamethod
|
|
||||||
** (which can reallocate the stack)
|
|
||||||
*/
|
|
||||||
#define gettableProtected(L,t,k,v) { TValue *slot; \
|
|
||||||
if (luaV_fastget(L,t,k,slot,luaH_get)) { setobj2s(L, v, slot); } \
|
|
||||||
else Protect(luaV_finishget(L,t,k,v,slot)); }
|
|
||||||
|
|
||||||
|
|
||||||
/* same for 'luaV_settable' */
|
|
||||||
#define settableProtected(L,t,k,v) { TValue *slot; \
|
|
||||||
if (!luaV_fastset(L,t,k,slot,luaH_set,v)) \
|
|
||||||
Protect(luaV_finishset(L,t,k,v,slot)); }
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
void luaV_execute (lua_State *L, int nexeccalls) {
|
void luaV_execute (lua_State *L, int nexeccalls) {
|
||||||
LClosure *cl;
|
LClosure *cl;
|
||||||
@@ -433,12 +386,13 @@ void luaV_execute (lua_State *L, int nexeccalls) {
|
|||||||
reentry: /* entry point */
|
reentry: /* entry point */
|
||||||
lua_assert(isLua(L->ci));
|
lua_assert(isLua(L->ci));
|
||||||
pc = L->savedpc;
|
pc = L->savedpc;
|
||||||
cl = &clvalue(L->ci->func)->l; /* local reference to function's closure */
|
cl = &clvalue(L->ci->func)->l;
|
||||||
k = cl->p->k; /* local reference to function's constant table */
|
base = L->base;
|
||||||
base = L->base; /* local copy of function's base */
|
k = cl->p->k;
|
||||||
/* main loop of interpreter */
|
/* main loop of interpreter */
|
||||||
for (;;) {
|
for (;;) {
|
||||||
const Instruction i = *pc++;
|
const Instruction i = *pc++;
|
||||||
|
StkId ra;
|
||||||
if ((L->hookmask & (LUA_MASKLINE | LUA_MASKCOUNT)) &&
|
if ((L->hookmask & (LUA_MASKLINE | LUA_MASKCOUNT)) &&
|
||||||
(--L->hookcount == 0 || L->hookmask & LUA_MASKLINE)) {
|
(--L->hookcount == 0 || L->hookmask & LUA_MASKLINE)) {
|
||||||
traceexec(L, pc);
|
traceexec(L, pc);
|
||||||
@@ -448,28 +402,26 @@ void luaV_execute (lua_State *L, int nexeccalls) {
|
|||||||
}
|
}
|
||||||
base = L->base;
|
base = L->base;
|
||||||
}
|
}
|
||||||
|
/* warning!! several calls may realloc the stack and invalidate `ra' */
|
||||||
|
ra = RA(i);
|
||||||
lua_assert(base == L->base && L->base == L->ci->base);
|
lua_assert(base == L->base && L->base == L->ci->base);
|
||||||
lua_assert(base <= L->top && L->top <= L->stack + L->stacksize);
|
lua_assert(base <= L->top && L->top <= L->stack + L->stacksize);
|
||||||
lua_assert(L->top == L->ci->top || luaG_checkopenop(i));
|
lua_assert(L->top == L->ci->top || luaG_checkopenop(i));
|
||||||
switch (GET_OPCODE(i)) {
|
switch (GET_OPCODE(i)) {
|
||||||
case OP_MOVE: {
|
case OP_MOVE: {
|
||||||
StkId ra = RA(i);
|
|
||||||
setobjs2s(L, ra, RB(i));
|
setobjs2s(L, ra, RB(i));
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
case OP_LOADK: {
|
case OP_LOADK: {
|
||||||
StkId ra = RA(i);
|
|
||||||
setobj2s(L, ra, KBx(i));
|
setobj2s(L, ra, KBx(i));
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
case OP_LOADBOOL: {
|
case OP_LOADBOOL: {
|
||||||
StkId ra = RA(i);
|
|
||||||
setbvalue(ra, GETARG_B(i));
|
setbvalue(ra, GETARG_B(i));
|
||||||
if (GETARG_C(i)) pc++; /* skip next instruction (if C) */
|
if (GETARG_C(i)) pc++; /* skip next instruction (if C) */
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
case OP_LOADNIL: {
|
case OP_LOADNIL: {
|
||||||
StkId ra = RA(i);
|
|
||||||
TValue *rb = RB(i);
|
TValue *rb = RB(i);
|
||||||
do {
|
do {
|
||||||
setnilvalue(rb--);
|
setnilvalue(rb--);
|
||||||
@@ -477,13 +429,11 @@ void luaV_execute (lua_State *L, int nexeccalls) {
|
|||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
case OP_GETUPVAL: {
|
case OP_GETUPVAL: {
|
||||||
StkId ra = RA(i);
|
|
||||||
int b = GETARG_B(i);
|
int b = GETARG_B(i);
|
||||||
setobj2s(L, ra, cl->upvals[b]->v);
|
setobj2s(L, ra, cl->upvals[b]->v);
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
case OP_GETGLOBAL: {
|
case OP_GETGLOBAL: {
|
||||||
StkId ra = RA(i);
|
|
||||||
TValue g;
|
TValue g;
|
||||||
TValue *rb = KBx(i);
|
TValue *rb = KBx(i);
|
||||||
sethvalue(L, &g, cl->env);
|
sethvalue(L, &g, cl->env);
|
||||||
@@ -492,14 +442,10 @@ void luaV_execute (lua_State *L, int nexeccalls) {
|
|||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
case OP_GETTABLE: {
|
case OP_GETTABLE: {
|
||||||
StkId ra = RA(i);
|
Protect(luaV_gettable(L, RB(i), RKC(i), ra));
|
||||||
StkId rb = RB(i);
|
|
||||||
TValue *rc = RKC(i);
|
|
||||||
gettableProtected(L, rb, rc, ra);
|
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
case OP_SETGLOBAL: {
|
case OP_SETGLOBAL: {
|
||||||
StkId ra = RA(i);
|
|
||||||
TValue g;
|
TValue g;
|
||||||
sethvalue(L, &g, cl->env);
|
sethvalue(L, &g, cl->env);
|
||||||
lua_assert(ttisstring(KBx(i)));
|
lua_assert(ttisstring(KBx(i)));
|
||||||
@@ -507,21 +453,16 @@ void luaV_execute (lua_State *L, int nexeccalls) {
|
|||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
case OP_SETUPVAL: {
|
case OP_SETUPVAL: {
|
||||||
StkId ra = RA(i);
|
|
||||||
UpVal *uv = cl->upvals[GETARG_B(i)];
|
UpVal *uv = cl->upvals[GETARG_B(i)];
|
||||||
setobj(L, uv->v, ra);
|
setobj(L, uv->v, ra);
|
||||||
luaC_barrier(L, uv, ra);
|
luaC_barrier(L, uv, ra);
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
case OP_SETTABLE: {
|
case OP_SETTABLE: {
|
||||||
StkId ra = RA(i);
|
Protect(luaV_settable(L, ra, RKB(i), RKC(i)));
|
||||||
TValue *rb = RKB(i);
|
|
||||||
TValue *rc = RKC(i);
|
|
||||||
settableProtected(L, ra, rb, rc);
|
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
case OP_NEWTABLE: {
|
case OP_NEWTABLE: {
|
||||||
StkId ra = RA(i);
|
|
||||||
int b = GETARG_B(i);
|
int b = GETARG_B(i);
|
||||||
int c = GETARG_C(i);
|
int c = GETARG_C(i);
|
||||||
sethvalue(L, ra, luaH_new(L, luaO_fb2int(b), luaO_fb2int(c)));
|
sethvalue(L, ra, luaH_new(L, luaO_fb2int(b), luaO_fb2int(c)));
|
||||||
@@ -529,16 +470,9 @@ void luaV_execute (lua_State *L, int nexeccalls) {
|
|||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
case OP_SELF: {
|
case OP_SELF: {
|
||||||
TValue *slot;
|
|
||||||
StkId ra = RA(i);
|
|
||||||
StkId rb = RB(i);
|
StkId rb = RB(i);
|
||||||
TValue *rc = RKC(i);
|
setobjs2s(L, ra+1, rb);
|
||||||
TString *key = rawtsvalue(rc); /* key must be a string */
|
Protect(luaV_gettable(L, rb, RKC(i), ra));
|
||||||
setobjs2s(L, ra + 1, rb);
|
|
||||||
if (luaV_fastget(L, rb, key, slot, luaH_getstr)) {
|
|
||||||
setobj2s(L, ra, slot);
|
|
||||||
}
|
|
||||||
else Protect(luaV_finishget(L, rb, rc, ra, slot));
|
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
case OP_ADD: {
|
case OP_ADD: {
|
||||||
@@ -554,7 +488,6 @@ void luaV_execute (lua_State *L, int nexeccalls) {
|
|||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
case OP_DIV: {
|
case OP_DIV: {
|
||||||
StkId ra = RA(i);
|
|
||||||
TValue *rb = RKB(i);
|
TValue *rb = RKB(i);
|
||||||
TValue *rc = RKC(i);
|
TValue *rc = RKC(i);
|
||||||
if (ttisnumber(rb) && ttisnumber(rc)) {
|
if (ttisnumber(rb) && ttisnumber(rc)) {
|
||||||
@@ -570,7 +503,6 @@ void luaV_execute (lua_State *L, int nexeccalls) {
|
|||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
case OP_MOD: {
|
case OP_MOD: {
|
||||||
StkId ra = RA(i);
|
|
||||||
TValue *rb = RKB(i);
|
TValue *rb = RKB(i);
|
||||||
TValue *rc = RKC(i);
|
TValue *rc = RKC(i);
|
||||||
if (ttisnumber(rb) && ttisnumber(rc)) {
|
if (ttisnumber(rb) && ttisnumber(rc)) {
|
||||||
@@ -590,27 +522,26 @@ void luaV_execute (lua_State *L, int nexeccalls) {
|
|||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
case OP_BAND: {
|
case OP_BAND: {
|
||||||
arith_op(luai_numand, TM_AND);
|
arith_op(luai_numand, TM_AND);
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
case OP_BOR: {
|
case OP_BOR: {
|
||||||
arith_op(luai_numor, TM_OR);
|
arith_op(luai_numor, TM_OR);
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
case OP_BXOR: {
|
case OP_BXOR: {
|
||||||
arith_op(luai_numxor, TM_XOR);
|
arith_op(luai_numxor, TM_XOR);
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
case OP_BSHL: {
|
case OP_BSHL: {
|
||||||
arith_op(luai_numshl, TM_SHL);
|
arith_op(luai_numshl, TM_SHL);
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
case OP_BSHR: {
|
case OP_BSHR: {
|
||||||
arith_op(luai_numshr, TM_SHR);
|
arith_op(luai_numshr, TM_SHR);
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
case OP_BNOT: {
|
case OP_BNOT: {
|
||||||
StkId ra = RA(i);
|
|
||||||
TValue *rb = RB(i);
|
TValue *rb = RB(i);
|
||||||
if (ttisnumber(rb)) {
|
if (ttisnumber(rb)) {
|
||||||
lua_Number nb = nvalue(rb);
|
lua_Number nb = nvalue(rb);
|
||||||
@@ -622,7 +553,6 @@ void luaV_execute (lua_State *L, int nexeccalls) {
|
|||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
case OP_UNM: {
|
case OP_UNM: {
|
||||||
StkId ra = RA(i);
|
|
||||||
TValue *rb = RB(i);
|
TValue *rb = RB(i);
|
||||||
if (ttisnumber(rb)) {
|
if (ttisnumber(rb)) {
|
||||||
lua_Number nb = nvalue(rb);
|
lua_Number nb = nvalue(rb);
|
||||||
@@ -634,13 +564,11 @@ void luaV_execute (lua_State *L, int nexeccalls) {
|
|||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
case OP_NOT: {
|
case OP_NOT: {
|
||||||
StkId ra = RA(i);
|
|
||||||
int res = l_isfalse(RB(i)); /* next assignment may change this value */
|
int res = l_isfalse(RB(i)); /* next assignment may change this value */
|
||||||
setbvalue(ra, res);
|
setbvalue(ra, res);
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
case OP_LEN: {
|
case OP_LEN: {
|
||||||
StkId ra = RA(i);
|
|
||||||
TValue *rb = RB(i);
|
TValue *rb = RB(i);
|
||||||
switch (ttype(rb)) {
|
switch (ttype(rb)) {
|
||||||
case LUA_TTABLE: {
|
case LUA_TTABLE: {
|
||||||
@@ -698,14 +626,12 @@ void luaV_execute (lua_State *L, int nexeccalls) {
|
|||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
case OP_TEST: {
|
case OP_TEST: {
|
||||||
StkId ra = RA(i);
|
|
||||||
if (l_isfalse(ra) != GETARG_C(i))
|
if (l_isfalse(ra) != GETARG_C(i))
|
||||||
dojump(L, pc, GETARG_sBx(*pc));
|
dojump(L, pc, GETARG_sBx(*pc));
|
||||||
pc++;
|
pc++;
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
case OP_TESTSET: {
|
case OP_TESTSET: {
|
||||||
StkId ra = RA(i);
|
|
||||||
TValue *rb = RB(i);
|
TValue *rb = RB(i);
|
||||||
if (l_isfalse(rb) != GETARG_C(i)) {
|
if (l_isfalse(rb) != GETARG_C(i)) {
|
||||||
setobjs2s(L, ra, rb);
|
setobjs2s(L, ra, rb);
|
||||||
@@ -715,7 +641,6 @@ void luaV_execute (lua_State *L, int nexeccalls) {
|
|||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
case OP_CALL: {
|
case OP_CALL: {
|
||||||
StkId ra = RA(i);
|
|
||||||
int b = GETARG_B(i);
|
int b = GETARG_B(i);
|
||||||
int nresults = GETARG_C(i) - 1;
|
int nresults = GETARG_C(i) - 1;
|
||||||
if (b != 0) L->top = ra+b; /* else previous instruction set top */
|
if (b != 0) L->top = ra+b; /* else previous instruction set top */
|
||||||
@@ -737,7 +662,6 @@ void luaV_execute (lua_State *L, int nexeccalls) {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
case OP_TAILCALL: {
|
case OP_TAILCALL: {
|
||||||
StkId ra = RA(i);
|
|
||||||
int b = GETARG_B(i);
|
int b = GETARG_B(i);
|
||||||
if (b != 0) L->top = ra+b; /* else previous instruction set top */
|
if (b != 0) L->top = ra+b; /* else previous instruction set top */
|
||||||
L->savedpc = pc;
|
L->savedpc = pc;
|
||||||
@@ -770,7 +694,6 @@ void luaV_execute (lua_State *L, int nexeccalls) {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
case OP_RETURN: {
|
case OP_RETURN: {
|
||||||
StkId ra = RA(i);
|
|
||||||
int b = GETARG_B(i);
|
int b = GETARG_B(i);
|
||||||
if (b != 0) L->top = ra+b-1;
|
if (b != 0) L->top = ra+b-1;
|
||||||
if (L->openupval) luaF_close(L, base);
|
if (L->openupval) luaF_close(L, base);
|
||||||
@@ -786,7 +709,6 @@ void luaV_execute (lua_State *L, int nexeccalls) {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
case OP_FORLOOP: {
|
case OP_FORLOOP: {
|
||||||
StkId ra = RA(i);
|
|
||||||
lua_Number step = nvalue(ra+2);
|
lua_Number step = nvalue(ra+2);
|
||||||
lua_Number idx = luai_numadd(nvalue(ra), step); /* increment index */
|
lua_Number idx = luai_numadd(nvalue(ra), step); /* increment index */
|
||||||
lua_Number limit = nvalue(ra+1);
|
lua_Number limit = nvalue(ra+1);
|
||||||
@@ -799,7 +721,6 @@ void luaV_execute (lua_State *L, int nexeccalls) {
|
|||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
case OP_FORPREP: {
|
case OP_FORPREP: {
|
||||||
StkId ra = RA(i);
|
|
||||||
const TValue *init = ra;
|
const TValue *init = ra;
|
||||||
const TValue *plimit = ra+1;
|
const TValue *plimit = ra+1;
|
||||||
const TValue *pstep = ra+2;
|
const TValue *pstep = ra+2;
|
||||||
@@ -816,7 +737,6 @@ void luaV_execute (lua_State *L, int nexeccalls) {
|
|||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
case OP_TFORLOOP: {
|
case OP_TFORLOOP: {
|
||||||
StkId ra = RA(i);
|
|
||||||
StkId cb = ra + 3; /* call base */
|
StkId cb = ra + 3; /* call base */
|
||||||
setobjs2s(L, cb+2, ra+2);
|
setobjs2s(L, cb+2, ra+2);
|
||||||
setobjs2s(L, cb+1, ra+1);
|
setobjs2s(L, cb+1, ra+1);
|
||||||
@@ -833,7 +753,6 @@ void luaV_execute (lua_State *L, int nexeccalls) {
|
|||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
case OP_SETLIST: {
|
case OP_SETLIST: {
|
||||||
StkId ra = RA(i);
|
|
||||||
int n = GETARG_B(i);
|
int n = GETARG_B(i);
|
||||||
int c = GETARG_C(i);
|
int c = GETARG_C(i);
|
||||||
int last;
|
int last;
|
||||||
@@ -856,12 +775,10 @@ void luaV_execute (lua_State *L, int nexeccalls) {
|
|||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
case OP_CLOSE: {
|
case OP_CLOSE: {
|
||||||
StkId ra = RA(i);
|
|
||||||
luaF_close(L, ra);
|
luaF_close(L, ra);
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
case OP_CLOSURE: {
|
case OP_CLOSURE: {
|
||||||
StkId ra = RA(i);
|
|
||||||
Proto *p;
|
Proto *p;
|
||||||
Closure *ncl;
|
Closure *ncl;
|
||||||
int nup, j;
|
int nup, j;
|
||||||
@@ -882,7 +799,6 @@ void luaV_execute (lua_State *L, int nexeccalls) {
|
|||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
case OP_VARARG: {
|
case OP_VARARG: {
|
||||||
StkId ra = RA(i);
|
|
||||||
int b = GETARG_B(i) - 1;
|
int b = GETARG_B(i) - 1;
|
||||||
int j;
|
int j;
|
||||||
CallInfo *ci = L->ci;
|
CallInfo *ci = L->ci;
|
||||||
|
|||||||
+4
-52
@@ -22,62 +22,14 @@
|
|||||||
(ttype(o1) == ttype(o2) && luaV_equalval(L, o1, o2))
|
(ttype(o1) == ttype(o2) && luaV_equalval(L, o1, o2))
|
||||||
|
|
||||||
|
|
||||||
/*
|
|
||||||
** fast track for 'gettable': if 't' is a table and 't[k]' is not nil,
|
|
||||||
** return 1 with 'slot' pointing to 't[k]' (final result). Otherwise,
|
|
||||||
** return 0 (meaning it will have to check metamethod) with 'slot'
|
|
||||||
** pointing to a nil 't[k]' (if 't' is a table) or NULL (otherwise).
|
|
||||||
** 'f' is the raw get function to use.
|
|
||||||
*/
|
|
||||||
#define luaV_fastget(L,t,k,slot,f) \
|
|
||||||
(!ttistable(t) \
|
|
||||||
? (slot = NULL, 0) /* not a table; 'slot' is NULL and result is 0 */ \
|
|
||||||
: (slot = f(hvalue(t), k), /* else, do raw access */ \
|
|
||||||
!ttisnil(slot))) /* result not nil? */
|
|
||||||
|
|
||||||
/*
|
|
||||||
** standard implementation for 'gettable'
|
|
||||||
*/
|
|
||||||
#define luaV_gettable(L,t,k,v) { TValue *slot; \
|
|
||||||
if (luaV_fastget(L,t,k,slot,luaH_get)) { setobj2s(L, v, slot); } \
|
|
||||||
else luaV_finishget(L,t,k,v,slot); }
|
|
||||||
|
|
||||||
|
|
||||||
/*
|
|
||||||
** Fast track for set table. If 't' is a table and 't[k]' is not nil,
|
|
||||||
** call GC barrier, do a raw 't[k]=v', and return true; otherwise,
|
|
||||||
** return false with 'slot' equal to NULL (if 't' is not a table) or
|
|
||||||
** 'nil'. (This is needed by 'luaV_finishget'.) Note that, if the macro
|
|
||||||
** returns true, there is no need to 'invalidateTMcache', because the
|
|
||||||
** call is not creating a new entry.
|
|
||||||
*/
|
|
||||||
#define luaV_fastset(L,t,k,slot,f,v) \
|
|
||||||
(!ttistable(t) \
|
|
||||||
? (slot = NULL, 0) \
|
|
||||||
: (slot = f(L, hvalue(t), k), \
|
|
||||||
ttisnil(slot) ? 0 \
|
|
||||||
: (__extension__ ({ \
|
|
||||||
if (valiswhite(v) && isblack(obj2gco(hvalue(t)))) \
|
|
||||||
luaC_barrierback(L, hvalue(t)); \
|
|
||||||
setobj2t(L, cast(TValue *,slot), v); \
|
|
||||||
1; \
|
|
||||||
}))))
|
|
||||||
|
|
||||||
|
|
||||||
#define luaV_settable(L,t,k,v) { TValue *slot; \
|
|
||||||
if (!luaV_fastset(L,t,k,slot,luaH_set,v)) \
|
|
||||||
luaV_finishset(L,t,k,v,slot); }
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
LUAI_FUNC int luaV_lessthan (lua_State *L, TValue *l, TValue *r);
|
LUAI_FUNC int luaV_lessthan (lua_State *L, TValue *l, TValue *r);
|
||||||
LUAI_FUNC int luaV_equalval (lua_State *L, const TValue *t1, const TValue *t2);
|
LUAI_FUNC int luaV_equalval (lua_State *L, const TValue *t1, const TValue *t2);
|
||||||
LUAI_FUNC const TValue *luaV_tonumber (const TValue *obj, TValue *n);
|
LUAI_FUNC const TValue *luaV_tonumber (const TValue *obj, TValue *n);
|
||||||
LUAI_FUNC int luaV_tostring (lua_State *L, StkId obj);
|
LUAI_FUNC int luaV_tostring (lua_State *L, StkId obj);
|
||||||
LUAI_FUNC void luaV_finishget (lua_State *L, TValue *t, TValue *key,
|
LUAI_FUNC void luaV_gettable (lua_State *L, TValue *t, TValue *key,
|
||||||
StkId val, TValue *tm);
|
StkId val);
|
||||||
LUAI_FUNC void luaV_finishset (lua_State *L, TValue *t, TValue *key,
|
LUAI_FUNC void luaV_settable (lua_State *L, TValue *t, TValue *key,
|
||||||
StkId val, TValue *oldval);
|
StkId val);
|
||||||
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);
|
||||||
|
|
||||||
|
|||||||
+1
-1
@@ -1233,7 +1233,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)
|
||||||
{
|
{
|
||||||
|
|||||||
+1
-1
@@ -852,7 +852,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 (ctrldown && (cv_keyboardlayout.value != 3 || (cv_keyboardlayout.value == 3 && !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)
|
||||||
|
|||||||
+13
-84
@@ -1154,67 +1154,6 @@ static void CV_LoadPlayerNames(UINT8 **p)
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
static void CL_DrawAddonTypes(void)
|
|
||||||
{
|
|
||||||
if (!cv_serveraddoninfo.value)
|
|
||||||
return;
|
|
||||||
|
|
||||||
INT32 y = 0;
|
|
||||||
|
|
||||||
INT32 addontypes_downloaded[NUMADDONTYPES] = {0};
|
|
||||||
|
|
||||||
for (INT32 i = 0; i < fileneedednum; ++i)
|
|
||||||
{
|
|
||||||
switch (fileneeded[i].status)
|
|
||||||
{
|
|
||||||
case FS_FOUND:
|
|
||||||
case FS_OPEN:
|
|
||||||
addontypes_downloaded[fileneeded[i].type]++;
|
|
||||||
break;
|
|
||||||
|
|
||||||
default:
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
for (addontype_t type = 0; type < NUMADDONTYPES; ++type)
|
|
||||||
{
|
|
||||||
if (addontypes[type] == 0)
|
|
||||||
continue;
|
|
||||||
|
|
||||||
INT32 flags = V_SNAPTOTOP|V_SNAPTOLEFT|V_ALLOWLOWERCASE;
|
|
||||||
|
|
||||||
if (addontypes[type] == addontypes_downloaded[type])
|
|
||||||
flags |= V_GREENMAP;
|
|
||||||
else
|
|
||||||
flags |= V_YELLOWMAP;
|
|
||||||
|
|
||||||
const char *typestr = "Misc";
|
|
||||||
|
|
||||||
switch (type)
|
|
||||||
{
|
|
||||||
case ADDON_SCRIPT:
|
|
||||||
typestr = "Script";
|
|
||||||
break;
|
|
||||||
|
|
||||||
case ADDON_MAP:
|
|
||||||
typestr = "Map";
|
|
||||||
break;
|
|
||||||
|
|
||||||
case ADDON_CHARACTER:
|
|
||||||
typestr = "Character";
|
|
||||||
break;
|
|
||||||
|
|
||||||
default:
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
|
|
||||||
V_DrawSmallString(4, 4 + y, flags, va("%s addons", typestr));
|
|
||||||
V_DrawRightAlignedSmallString(100, 4 + y, flags, va("%d/%d", addontypes_downloaded[type], addontypes[type]));
|
|
||||||
y += 6;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
//
|
//
|
||||||
// CL_DrawConnectionStatus
|
// CL_DrawConnectionStatus
|
||||||
//
|
//
|
||||||
@@ -1330,8 +1269,6 @@ static void CL_DrawConnectionStatus(void)
|
|||||||
V_DrawFill(BASEVIDWIDTH/2-128, BASEVIDHEIGHT-24, totalfileslength, 8, 160);
|
V_DrawFill(BASEVIDWIDTH/2-128, BASEVIDHEIGHT-24, totalfileslength, 8, 160);
|
||||||
V_DrawCenteredString(BASEVIDWIDTH/2, BASEVIDHEIGHT-24, V_20TRANS|V_MONOSPACE|MENUCAPS,
|
V_DrawCenteredString(BASEVIDWIDTH/2, BASEVIDHEIGHT-24, V_20TRANS|V_MONOSPACE|MENUCAPS,
|
||||||
va(" %2u/%2u Files", checkednum, fileneedednum));
|
va(" %2u/%2u Files", checkednum, fileneedednum));
|
||||||
|
|
||||||
CL_DrawAddonTypes();
|
|
||||||
}
|
}
|
||||||
else if (cl_mode == CL_LOADFILES)
|
else if (cl_mode == CL_LOADFILES)
|
||||||
{
|
{
|
||||||
@@ -1355,8 +1292,6 @@ static void CL_DrawConnectionStatus(void)
|
|||||||
V_DrawFill(BASEVIDWIDTH/2-128, BASEVIDHEIGHT-24, totalfileslength, 8, 160);
|
V_DrawFill(BASEVIDWIDTH/2-128, BASEVIDHEIGHT-24, totalfileslength, 8, 160);
|
||||||
V_DrawCenteredString(BASEVIDWIDTH/2, BASEVIDHEIGHT-24, V_20TRANS|V_MONOSPACE|MENUCAPS,
|
V_DrawCenteredString(BASEVIDWIDTH/2, BASEVIDHEIGHT-24, V_20TRANS|V_MONOSPACE|MENUCAPS,
|
||||||
va(" %2u/%2u Files", loadcompletednum, fileneedednum));
|
va(" %2u/%2u Files", loadcompletednum, fileneedednum));
|
||||||
|
|
||||||
CL_DrawAddonTypes();
|
|
||||||
}
|
}
|
||||||
else if (cl_mode == CL_VIEWSERVER)
|
else if (cl_mode == CL_VIEWSERVER)
|
||||||
{
|
{
|
||||||
@@ -1560,8 +1495,6 @@ static void CL_DrawConnectionStatus(void)
|
|||||||
|
|
||||||
V_DrawRightAlignedString(BASEVIDWIDTH/2+128, BASEVIDHEIGHT-24, V_20TRANS|V_MONOSPACE|MENUCAPS,
|
V_DrawRightAlignedString(BASEVIDWIDTH/2+128, BASEVIDHEIGHT-24, V_20TRANS|V_MONOSPACE|MENUCAPS,
|
||||||
va("%2u/%2u Files ", filedownload.completednum, filedownload.totalnum));
|
va("%2u/%2u Files ", filedownload.completednum, filedownload.totalnum));
|
||||||
|
|
||||||
CL_DrawAddonTypes();
|
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
@@ -1578,8 +1511,6 @@ static void CL_DrawConnectionStatus(void)
|
|||||||
|
|
||||||
V_DrawCenteredString(BASEVIDWIDTH/2, BASEVIDHEIGHT-24-32, V_YELLOWMAP|MENUCAPS,
|
V_DrawCenteredString(BASEVIDWIDTH/2, BASEVIDHEIGHT-24-32, V_YELLOWMAP|MENUCAPS,
|
||||||
M_GetText("Waiting to download files..."));
|
M_GetText("Waiting to download files..."));
|
||||||
|
|
||||||
CL_DrawAddonTypes();
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -2578,7 +2509,7 @@ static boolean CL_FinishedFileList(void)
|
|||||||
* \sa CL_ConnectToServer
|
* \sa CL_ConnectToServer
|
||||||
*
|
*
|
||||||
*/
|
*/
|
||||||
static void CL_ServerConnectionSearchTicker(tic_t *asksent)
|
static boolean CL_ServerConnectionSearchTicker(tic_t *asksent)
|
||||||
{
|
{
|
||||||
INT32 i;
|
INT32 i;
|
||||||
|
|
||||||
@@ -2596,7 +2527,7 @@ static void CL_ServerConnectionSearchTicker(tic_t *asksent)
|
|||||||
{
|
{
|
||||||
i = SL_SearchServer(servernode);
|
i = SL_SearchServer(servernode);
|
||||||
if (i < 0)
|
if (i < 0)
|
||||||
return;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
joinnode = i;
|
joinnode = i;
|
||||||
@@ -2624,11 +2555,10 @@ static void CL_ServerConnectionSearchTicker(tic_t *asksent)
|
|||||||
{
|
{
|
||||||
cl_mode = CL_ASKFULLFILELIST;
|
cl_mode = CL_ASKFULLFILELIST;
|
||||||
cl_lastcheckedfilecount = 0;
|
cl_lastcheckedfilecount = 0;
|
||||||
return;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
cl_mode = cv_serverinfoscreen.value ? CL_VIEWSERVER : CL_CHECKFILES;
|
cl_mode = cv_serverinfoscreen.value ? CL_VIEWSERVER : CL_CHECKFILES;
|
||||||
CL_CheckAddonTypes();
|
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
@@ -2636,7 +2566,7 @@ static void CL_ServerConnectionSearchTicker(tic_t *asksent)
|
|||||||
*asksent = 0;
|
*asksent = 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
return;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
// Ask the info to the server (askinfo packet)
|
// Ask the info to the server (askinfo packet)
|
||||||
@@ -2646,6 +2576,7 @@ static void CL_ServerConnectionSearchTicker(tic_t *asksent)
|
|||||||
*asksent = I_GetTime() + NEWTICRATE;
|
*asksent = I_GetTime() + NEWTICRATE;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
static void FreeMapIcon(void)
|
static void FreeMapIcon(void)
|
||||||
@@ -2677,15 +2608,13 @@ static boolean CL_ServerConnectionTicker(const char *tmpsave, tic_t *oldtic, tic
|
|||||||
switch (cl_mode)
|
switch (cl_mode)
|
||||||
{
|
{
|
||||||
case CL_SEARCHING:
|
case CL_SEARCHING:
|
||||||
CL_ServerConnectionSearchTicker(asksent);
|
if (!CL_ServerConnectionSearchTicker(asksent))
|
||||||
|
return false;
|
||||||
break;
|
break;
|
||||||
|
|
||||||
case CL_ASKFULLFILELIST:
|
case CL_ASKFULLFILELIST:
|
||||||
if (cl_lastcheckedfilecount == UINT16_MAX) // All files retrieved
|
if (cl_lastcheckedfilecount == UINT16_MAX) // All files retrieved
|
||||||
{
|
|
||||||
cl_mode = cv_serverinfoscreen.value ? CL_VIEWSERVER : CL_CHECKFILES;
|
cl_mode = cv_serverinfoscreen.value ? CL_VIEWSERVER : CL_CHECKFILES;
|
||||||
CL_CheckAddonTypes();
|
|
||||||
}
|
|
||||||
else if (fileneedednum != cl_lastcheckedfilecount || I_GetTime() >= *asksent)
|
else if (fileneedednum != cl_lastcheckedfilecount || I_GetTime() >= *asksent)
|
||||||
{
|
{
|
||||||
if (CL_AskFileList(fileneedednum))
|
if (CL_AskFileList(fileneedednum))
|
||||||
@@ -4287,8 +4216,6 @@ consvar_t cv_connectawaittime = {"connectawaittime", "5", CV_SAVE, connectawaitt
|
|||||||
|
|
||||||
consvar_t cv_serverinfoscreen = {"serverinfoscreen", "On", CV_SAVE, CV_OnOff, NULL, 0, NULL, NULL, 0, 0, NULL};
|
consvar_t cv_serverinfoscreen = {"serverinfoscreen", "On", CV_SAVE, CV_OnOff, NULL, 0, NULL, NULL, 0, 0, NULL};
|
||||||
|
|
||||||
consvar_t cv_serveraddoninfo = {"serveraddoninfo", "On", CV_SAVE, CV_OnOff, NULL, 0, NULL, NULL, 0, 0, NULL};
|
|
||||||
|
|
||||||
static void Got_AddPlayer(const UINT8 **p, INT32 playernum);
|
static void Got_AddPlayer(const UINT8 **p, INT32 playernum);
|
||||||
static void Got_RemovePlayer(const UINT8 **p, INT32 playernum);
|
static void Got_RemovePlayer(const UINT8 **p, INT32 playernum);
|
||||||
|
|
||||||
@@ -4361,7 +4288,7 @@ void D_ClientServerInit(void)
|
|||||||
playerinfo[i].node = 255;
|
playerinfo[i].node = 255;
|
||||||
|
|
||||||
gametic = 0;
|
gametic = 0;
|
||||||
leveltime = 0;
|
localgametic = 0;
|
||||||
|
|
||||||
// do not send anything before the real begin
|
// do not send anything before the real begin
|
||||||
SV_StopServer();
|
SV_StopServer();
|
||||||
@@ -5978,11 +5905,13 @@ static void PT_ServerTics(SINT8 node)
|
|||||||
realend = gametic + CLIENTBACKUPTICS;
|
realend = gametic + CLIENTBACKUPTICS;
|
||||||
cl_packetmissed = realstart > neededtic;
|
cl_packetmissed = realstart > neededtic;
|
||||||
|
|
||||||
|
UINT8 *pak = (UINT8 *)&packet->cmds;
|
||||||
|
UINT8 *txtpak = (UINT8 *)&packet->cmds[packet->numslots * packet->numtics];
|
||||||
|
|
||||||
if (realstart <= neededtic && realend > neededtic)
|
if (realstart <= neededtic && realend > neededtic)
|
||||||
{
|
{
|
||||||
tic_t i, j;
|
tic_t i, j;
|
||||||
UINT8 *pak = (UINT8 *)&packet->cmds;
|
pak = (UINT8 *)&packet->cmds;
|
||||||
UINT8 *txtpak = (UINT8 *)&packet->cmds[packet->numslots * packet->numtics];
|
|
||||||
|
|
||||||
for (i = realstart; i < realend; i++)
|
for (i = realstart; i < realend; i++)
|
||||||
{
|
{
|
||||||
@@ -6819,7 +6748,7 @@ boolean TryRunTics(tic_t realtics)
|
|||||||
{
|
{
|
||||||
boolean update_stats = !(paused || P_AutoPause());
|
boolean update_stats = !(paused || P_AutoPause());
|
||||||
|
|
||||||
DEBFILE(va("============ Running tic %d (local %d)\n", gametic, leveltime));
|
DEBFILE(va("============ Running tic %d (local %d)\n", gametic, localgametic));
|
||||||
|
|
||||||
if (update_stats)
|
if (update_stats)
|
||||||
PS_START_TIMING(ps_tictime);
|
PS_START_TIMING(ps_tictime);
|
||||||
|
|||||||
@@ -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);
|
||||||
|
|||||||
+21
-52
@@ -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();
|
||||||
@@ -728,16 +697,16 @@ void D_SRB2Loop(void)
|
|||||||
|
|
||||||
for (;;)
|
for (;;)
|
||||||
{
|
{
|
||||||
// capbudget is the minimum precise_t duration of a single loop iteration
|
|
||||||
precise_t capbudget;
|
|
||||||
precise_t elapsed;
|
|
||||||
precise_t enterprecise, finishprecise;
|
|
||||||
|
|
||||||
if (I_Interrupted())
|
if (I_Interrupted())
|
||||||
{
|
{
|
||||||
I_Quit();
|
I_Quit();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// capbudget is the minimum precise_t duration of a single loop iteration
|
||||||
|
precise_t capbudget;
|
||||||
|
precise_t elapsed;
|
||||||
|
precise_t enterprecise, finishprecise;
|
||||||
|
|
||||||
enterprecise = I_GetPreciseTime();
|
enterprecise = I_GetPreciseTime();
|
||||||
|
|
||||||
memset(&g_dc, 0, sizeof(g_dc));
|
memset(&g_dc, 0, sizeof(g_dc));
|
||||||
@@ -1817,6 +1786,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 +2043,9 @@ void D_SRB2Main(void)
|
|||||||
if (M_CheckProtoParam("replay"))
|
if (M_CheckProtoParam("replay"))
|
||||||
{
|
{
|
||||||
const char *replayurl = M_GetProtoParam();
|
const char *replayurl = M_GetProtoParam();
|
||||||
|
|
||||||
if (!replayurl)
|
|
||||||
I_Error("REPLAY: Invalid URL.");
|
|
||||||
|
|
||||||
gconst char *replayname = strrchr(replayurl, '/');
|
gconst char *replayname = strrchr(replayurl, '/');
|
||||||
|
|
||||||
if (!replayname)
|
if (!replayname || !replayurl)
|
||||||
I_Error("REPLAY: Invalid URL.");
|
I_Error("REPLAY: Invalid URL.");
|
||||||
|
|
||||||
#define REPLAYDIR "/DownloadedReplays/"
|
#define REPLAYDIR "/DownloadedReplays/"
|
||||||
@@ -2190,8 +2159,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
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -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)
|
||||||
|
|
||||||
|
|||||||
+1
-2
@@ -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);
|
||||||
@@ -1632,7 +1631,7 @@ static void SendNameAndColor(UINT8 splitplayer)
|
|||||||
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 *player = &players[playernum];
|
||||||
char name[MAXPLAYERNAME+1] = {};
|
char name[MAXPLAYERNAME+1];
|
||||||
UINT8 color, skin;
|
UINT8 color, skin;
|
||||||
|
|
||||||
#ifdef PARANOIA
|
#ifdef PARANOIA
|
||||||
|
|||||||
+5
-1
@@ -93,6 +93,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 +155,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;
|
||||||
|
|
||||||
|
|||||||
+1
-50
@@ -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)
|
||||||
{
|
{
|
||||||
|
|||||||
@@ -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;
|
||||||
@@ -1424,7 +1412,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 +1429,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);
|
||||||
|
|||||||
+217
-172
@@ -43,9 +43,6 @@
|
|||||||
|
|
||||||
#include "m_cond.h"
|
#include "m_cond.h"
|
||||||
|
|
||||||
// idk how PUSHGETTER works, but this is unused
|
|
||||||
static UINT8 ultimatemode = false;
|
|
||||||
|
|
||||||
#define REQUIRE_MATHLIB_GUID "{748fcbc8-6480-4013-ac4e-7afce6cab766}"
|
#define REQUIRE_MATHLIB_GUID "{748fcbc8-6480-4013-ac4e-7afce6cab766}"
|
||||||
|
|
||||||
// Free slot names
|
// Free slot names
|
||||||
@@ -283,6 +280,149 @@ static void clear_levels(void)
|
|||||||
P_AllocMapHeader(gamemap-1);
|
P_AllocMapHeader(gamemap-1);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
static boolean findFreeSlot(INT32 *num)
|
||||||
|
{
|
||||||
|
// Send the character select entry to a free slot.
|
||||||
|
while (*num < MAXSKINS && PlayerMenu[*num].status != IT_DISABLED)
|
||||||
|
*num = *num+1;
|
||||||
|
|
||||||
|
// No more free slots. :(
|
||||||
|
if (*num >= MAXSKINS)
|
||||||
|
return false;
|
||||||
|
|
||||||
|
// Found one! ^_^
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
|
||||||
|
// Reads a player.
|
||||||
|
// For modifying the character select screen
|
||||||
|
static void readPlayer(MYFILE *f, INT32 num)
|
||||||
|
{
|
||||||
|
char *s = Z_Malloc(MAXLINELEN, PU_STATIC, NULL);
|
||||||
|
char *word;
|
||||||
|
char *word2;
|
||||||
|
INT32 i;
|
||||||
|
boolean slotfound = false;
|
||||||
|
|
||||||
|
do
|
||||||
|
{
|
||||||
|
if (myfgets(s, MAXLINELEN, f))
|
||||||
|
{
|
||||||
|
if (s[0] == '\n')
|
||||||
|
break;
|
||||||
|
|
||||||
|
word = strtok(s, " ");
|
||||||
|
if (word)
|
||||||
|
strupr(word);
|
||||||
|
else
|
||||||
|
break;
|
||||||
|
|
||||||
|
if (fastcmp(word, "PLAYERTEXT"))
|
||||||
|
{
|
||||||
|
char *playertext = NULL;
|
||||||
|
|
||||||
|
if (!slotfound && (slotfound = findFreeSlot(&num)) == false)
|
||||||
|
goto done;
|
||||||
|
PlayerMenu[num].status = IT_CALL;
|
||||||
|
|
||||||
|
// A friendly neighborhood alias for brevity's sake
|
||||||
|
const size_t note_size = sizeof(description[num].notes);
|
||||||
|
|
||||||
|
for (i = 0; i < (INT32)(MAXLINELEN-note_size-3); i++)
|
||||||
|
{
|
||||||
|
if (s[i] == '=')
|
||||||
|
{
|
||||||
|
playertext = &s[i+2];
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
if (playertext)
|
||||||
|
{
|
||||||
|
strlcpy(description[num].notes, playertext, note_size);
|
||||||
|
strlcat(description[num].notes,
|
||||||
|
myhashfgets(playertext, note_size, f), note_size);
|
||||||
|
}
|
||||||
|
else
|
||||||
|
strcpy(description[num].notes, "");
|
||||||
|
|
||||||
|
// For some reason, cutting the string did not work above. Most likely due to strcpy or strcat...
|
||||||
|
// It works down here, though.
|
||||||
|
{
|
||||||
|
INT32 numline = 0;
|
||||||
|
for (i = 0; (size_t)i < note_size-1; i++)
|
||||||
|
{
|
||||||
|
if (numline < 20 && description[num].notes[i] == '\n')
|
||||||
|
numline++;
|
||||||
|
|
||||||
|
if (numline >= 20 || description[num].notes[i] == '\0' || description[num].notes[i] == '#')
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
description[num].notes[strlen(description[num].notes)-1] = '\0';
|
||||||
|
description[num].notes[i] = '\0';
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
|
||||||
|
word2 = strtok(NULL, " = ");
|
||||||
|
if (word2)
|
||||||
|
strupr(word2);
|
||||||
|
else
|
||||||
|
break;
|
||||||
|
|
||||||
|
if (word2[strlen(word2)-1] == '\n')
|
||||||
|
word2[strlen(word2)-1] = '\0';
|
||||||
|
i = atoi(word2);
|
||||||
|
|
||||||
|
if (fastcmp(word, "PICNAME"))
|
||||||
|
{
|
||||||
|
if (!slotfound && (slotfound = findFreeSlot(&num)) == false)
|
||||||
|
goto done;
|
||||||
|
PlayerMenu[num].status = IT_CALL;
|
||||||
|
strncpy(description[num].picname, word2, 8);
|
||||||
|
}
|
||||||
|
else if (fastcmp(word, "STATUS"))
|
||||||
|
{
|
||||||
|
// Limit the status to only IT_DISABLED and IT_CALL
|
||||||
|
if (i)
|
||||||
|
i = IT_CALL;
|
||||||
|
else
|
||||||
|
i = IT_DISABLED;
|
||||||
|
|
||||||
|
/*
|
||||||
|
You MAY disable previous entries if you so desire...
|
||||||
|
But try to enable something that's already enabled and you will be sent to a free slot.
|
||||||
|
|
||||||
|
Because of this, you are allowed to edit any previous entrys you like, but only if you
|
||||||
|
signal that you are purposely doing so by disabling and then reenabling the slot.
|
||||||
|
|
||||||
|
... Or use MENUPOSITION first, that works too. Hell, you could edit multiple character
|
||||||
|
slots in a single section that way, due to how SOC editing works.
|
||||||
|
*/
|
||||||
|
if (i != IT_DISABLED && !slotfound && (slotfound = findFreeSlot(&num)) == false)
|
||||||
|
goto done;
|
||||||
|
PlayerMenu[num].status = (INT16)i;
|
||||||
|
}
|
||||||
|
else if (fastcmp(word, "SKINNAME"))
|
||||||
|
{
|
||||||
|
// Send to free slot.
|
||||||
|
if (!slotfound && (slotfound = findFreeSlot(&num)) == false)
|
||||||
|
goto done;
|
||||||
|
PlayerMenu[num].status = IT_CALL;
|
||||||
|
|
||||||
|
strlcpy(description[num].skinname, word2, sizeof description[num].skinname);
|
||||||
|
strlwr(description[num].skinname);
|
||||||
|
}
|
||||||
|
else
|
||||||
|
deh_warning("readPlayer %d: unknown word '%s'", num, word);
|
||||||
|
}
|
||||||
|
} while (!myfeof(f)); // finish when the line is empty
|
||||||
|
|
||||||
|
done:
|
||||||
|
Z_Free(s);
|
||||||
|
}
|
||||||
|
|
||||||
static int freeslotusage[2][2] = {{0, 0}, {0, 0}}; // [S_, MT_][max, previous .wad's max]
|
static int freeslotusage[2][2] = {{0, 0}, {0, 0}}; // [S_, MT_][max, previous .wad's max]
|
||||||
|
|
||||||
void DEH_UpdateMaxFreeslots(void)
|
void DEH_UpdateMaxFreeslots(void)
|
||||||
@@ -2363,12 +2503,26 @@ static void readmaincfg(MYFILE *f)
|
|||||||
{
|
{
|
||||||
flashingtics = (UINT16)get_number(word2);
|
flashingtics = (UINT16)get_number(word2);
|
||||||
}
|
}
|
||||||
|
else if (fastcmp(word, "TAILSFLYTICS"))
|
||||||
|
{
|
||||||
|
tailsflytics = (UINT16)get_number(word2);
|
||||||
|
}
|
||||||
|
else if (fastcmp(word, "UNDERWATERTICS"))
|
||||||
|
{
|
||||||
|
underwatertics = (UINT16)get_number(word2);
|
||||||
|
}
|
||||||
|
else if (fastcmp(word, "SPACETIMETICS"))
|
||||||
|
{
|
||||||
|
spacetimetics = (UINT16)get_number(word2);
|
||||||
|
}
|
||||||
else if (fastcmp(word, "EXTRALIFETICS"))
|
else if (fastcmp(word, "EXTRALIFETICS"))
|
||||||
{
|
{
|
||||||
// this modifies player->powers[pw_extralife]
|
|
||||||
// which still has some game behaviour attached to it...
|
|
||||||
extralifetics = (UINT16)get_number(word2);
|
extralifetics = (UINT16)get_number(word2);
|
||||||
}
|
}
|
||||||
|
else if (fastcmp(word, "GAMEOVERTICS"))
|
||||||
|
{
|
||||||
|
gameovertics = get_number(word2);
|
||||||
|
}
|
||||||
|
|
||||||
else if (fastcmp(word, "INTROTOPLAY"))
|
else if (fastcmp(word, "INTROTOPLAY"))
|
||||||
{
|
{
|
||||||
@@ -2392,7 +2546,10 @@ static void readmaincfg(MYFILE *f)
|
|||||||
if (creditscutscene > 128)
|
if (creditscutscene > 128)
|
||||||
creditscutscene = 128;
|
creditscutscene = 128;
|
||||||
}
|
}
|
||||||
|
else if (fastcmp(word, "NUMDEMOS"))
|
||||||
|
{
|
||||||
|
numDemos = (UINT8)get_number(word2);
|
||||||
|
}
|
||||||
else if (fastcmp(word, "DEMODELAYTIME"))
|
else if (fastcmp(word, "DEMODELAYTIME"))
|
||||||
{
|
{
|
||||||
demoDelayTime = get_number(word2);
|
demoDelayTime = get_number(word2);
|
||||||
@@ -2405,6 +2562,10 @@ static void readmaincfg(MYFILE *f)
|
|||||||
{
|
{
|
||||||
use1upSound = (UINT8)(value || word2[0] == 'T' || word2[0] == 'Y');
|
use1upSound = (UINT8)(value || word2[0] == 'T' || word2[0] == 'Y');
|
||||||
}
|
}
|
||||||
|
else if (fastcmp(word, "MAXXTRALIFE"))
|
||||||
|
{
|
||||||
|
continue; // unused
|
||||||
|
}
|
||||||
else if (fastcmp(word, "GAMEDATA"))
|
else if (fastcmp(word, "GAMEDATA"))
|
||||||
{
|
{
|
||||||
// just ignore it but dont throw a warning
|
// just ignore it but dont throw a warning
|
||||||
@@ -2443,30 +2604,6 @@ static void readmaincfg(MYFILE *f)
|
|||||||
{
|
{
|
||||||
strlcpy(customversionstring, word2, sizeof (customversionstring));
|
strlcpy(customversionstring, word2, sizeof (customversionstring));
|
||||||
}
|
}
|
||||||
else if (fastcmp(word, "NUMDEMOS"))
|
|
||||||
{
|
|
||||||
continue; // unused
|
|
||||||
}
|
|
||||||
else if (fastcmp(word, "TAILSFLYTICS"))
|
|
||||||
{
|
|
||||||
continue; // unused
|
|
||||||
}
|
|
||||||
else if (fastcmp(word, "UNDERWATERTICS"))
|
|
||||||
{
|
|
||||||
continue; // unused
|
|
||||||
}
|
|
||||||
else if (fastcmp(word, "SPACETIMETICS"))
|
|
||||||
{
|
|
||||||
continue; // unused
|
|
||||||
}
|
|
||||||
else if (fastcmp(word, "GAMEOVERTICS"))
|
|
||||||
{
|
|
||||||
continue; // unused
|
|
||||||
}
|
|
||||||
else if (fastcmp(word, "MAXXTRALIFE"))
|
|
||||||
{
|
|
||||||
continue; // unused
|
|
||||||
}
|
|
||||||
else
|
else
|
||||||
deh_warning("Maincfg: unknown word '%s'", word);
|
deh_warning("Maincfg: unknown word '%s'", word);
|
||||||
}
|
}
|
||||||
@@ -2675,12 +2812,17 @@ static void DEH_LoadDehackedFile(MYFILE *f, UINT16 wad)
|
|||||||
|
|
||||||
deh_num_warning = 0;
|
deh_num_warning = 0;
|
||||||
// save values for cross reference
|
// save values for cross reference
|
||||||
|
/*
|
||||||
|
for (i = 0; i < NUMSTATES; i++)
|
||||||
|
saveactions[i] = states[i].action;
|
||||||
|
for (i = 0; i < NUMSPRITES; i++)
|
||||||
|
savesprnames[i] = sprnames[i];
|
||||||
|
*/
|
||||||
for (i = 0; i < NUMSFX; i++)
|
for (i = 0; i < NUMSFX; i++)
|
||||||
savesfxnames[i] = S_sfx[i].name;
|
savesfxnames[i] = S_sfx[i].name;
|
||||||
|
|
||||||
// it doesn't test the version of SRB2 and version of dehacked file
|
// it doesn't test the version of SRB2 and version of dehacked file
|
||||||
dbg_line = -1; // start at -1 so the first line is 0.
|
dbg_line = -1; // start at -1 so the first line is 0.
|
||||||
|
|
||||||
while (!myfeof(f))
|
while (!myfeof(f))
|
||||||
{
|
{
|
||||||
char origpos[256];
|
char origpos[256];
|
||||||
@@ -2708,15 +2850,11 @@ static void DEH_LoadDehackedFile(MYFILE *f, UINT16 wad)
|
|||||||
strncpy(origpos, s, size);
|
strncpy(origpos, s, size);
|
||||||
origpos[size] = '\0';
|
origpos[size] = '\0';
|
||||||
|
|
||||||
if (NULL != (word = strtok(s, " ")))
|
if (NULL != (word = strtok(s, " "))) {
|
||||||
{
|
|
||||||
strupr(word);
|
strupr(word);
|
||||||
const size_t wordlen = strlen(word);
|
if (word[strlen(word)-1] == '\n')
|
||||||
|
word[strlen(word)-1] = '\0';
|
||||||
if (word[wordlen-1] == '\n')
|
|
||||||
word[wordlen-1] = '\0';
|
|
||||||
}
|
}
|
||||||
|
|
||||||
if (word)
|
if (word)
|
||||||
{
|
{
|
||||||
if (fastcmp(word, "FREESLOT"))
|
if (fastcmp(word, "FREESLOT"))
|
||||||
@@ -2737,46 +2875,32 @@ static void DEH_LoadDehackedFile(MYFILE *f, UINT16 wad)
|
|||||||
// This is not a major mod.
|
// This is not a major mod.
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
|
|
||||||
word2 = strtok(NULL, " ");
|
word2 = strtok(NULL, " ");
|
||||||
|
|
||||||
if (fastcmp(word, "CHARACTER"))
|
if (fastcmp(word, "CHARACTER"))
|
||||||
{
|
{
|
||||||
if (word2)
|
if (word2) {
|
||||||
{
|
|
||||||
strupr(word2);
|
strupr(word2);
|
||||||
const size_t wordlen = strlen(word2);
|
if (word2[strlen(word2)-1] == '\n')
|
||||||
|
word2[strlen(word2)-1] = '\0';
|
||||||
if (word2[wordlen-1] == '\n')
|
|
||||||
word2[wordlen-1] = '\0';
|
|
||||||
|
|
||||||
i = atoi(word2);
|
i = atoi(word2);
|
||||||
}
|
} else
|
||||||
else
|
|
||||||
i = 0;
|
i = 0;
|
||||||
|
|
||||||
if (i >= 0 && i < 32)
|
if (i >= 0 && i < 32)
|
||||||
ignorelines(f); // unused
|
readPlayer(f, i);
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
deh_warning("Character %d out of range (0 - 31)", i);
|
deh_warning("Character %d out of range (0 - 31)", i);
|
||||||
ignorelines(f);
|
ignorelines(f);
|
||||||
}
|
}
|
||||||
|
|
||||||
// This is not a major mod.
|
// This is not a major mod.
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (word2)
|
if (word2)
|
||||||
{
|
{
|
||||||
strupr(word2);
|
strupr(word2);
|
||||||
const size_t wordlen = strlen(word2);
|
if (word2[strlen(word2)-1] == '\n')
|
||||||
|
word2[strlen(word2)-1] = '\0';
|
||||||
if (word2[wordlen-1] == '\n')
|
|
||||||
word2[wordlen-1] = '\0';
|
|
||||||
|
|
||||||
i = atoi(word2);
|
i = atoi(word2);
|
||||||
|
|
||||||
if (fastcmp(word, "PATCH"))
|
if (fastcmp(word, "PATCH"))
|
||||||
{
|
{
|
||||||
// Read patch from spec file.
|
// Read patch from spec file.
|
||||||
@@ -2787,7 +2911,6 @@ static void DEH_LoadDehackedFile(MYFILE *f, UINT16 wad)
|
|||||||
{
|
{
|
||||||
if (i == 0 && word2[0] != '0') // If word2 isn't a number
|
if (i == 0 && word2[0] != '0') // If word2 isn't a number
|
||||||
i = get_mobjtype(word2); // find a thing by name
|
i = get_mobjtype(word2); // find a thing by name
|
||||||
|
|
||||||
if (i < NUMMOBJTYPES && i >= 0)
|
if (i < NUMMOBJTYPES && i >= 0)
|
||||||
{
|
{
|
||||||
if (i < (MT_FIRSTFREESLOT+freeslotusage[1][1]))
|
if (i < (MT_FIRSTFREESLOT+freeslotusage[1][1]))
|
||||||
@@ -2835,7 +2958,6 @@ static void DEH_LoadDehackedFile(MYFILE *f, UINT16 wad)
|
|||||||
{
|
{
|
||||||
if (i == 0 && word2[0] != '0') // If word2 isn't a number
|
if (i == 0 && word2[0] != '0') // If word2 isn't a number
|
||||||
i = get_state(word2); // find a state by name
|
i = get_state(word2); // find a state by name
|
||||||
|
|
||||||
if (i < NUMSTATES && i >= 0)
|
if (i < NUMSTATES && i >= 0)
|
||||||
{
|
{
|
||||||
if (i < (S_FIRSTFREESLOT+freeslotusage[0][1]))
|
if (i < (S_FIRSTFREESLOT+freeslotusage[0][1]))
|
||||||
@@ -2852,7 +2974,6 @@ static void DEH_LoadDehackedFile(MYFILE *f, UINT16 wad)
|
|||||||
{
|
{
|
||||||
if (i == 0 && word2[0] != '0') // If word2 isn't a number
|
if (i == 0 && word2[0] != '0') // If word2 isn't a number
|
||||||
i = get_sfx(word2); // find a sound by name
|
i = get_sfx(word2); // find a sound by name
|
||||||
|
|
||||||
if (i < NUMSFX && i >= 0)
|
if (i < NUMSFX && i >= 0)
|
||||||
readsound(f, i, savesfxnames);
|
readsound(f, i, savesfxnames);
|
||||||
else
|
else
|
||||||
@@ -2866,7 +2987,6 @@ static void DEH_LoadDehackedFile(MYFILE *f, UINT16 wad)
|
|||||||
{
|
{
|
||||||
if (i == 0 && word2[0] != '0') // If word2 isn't a number
|
if (i == 0 && word2[0] != '0') // If word2 isn't a number
|
||||||
i = get_huditem(word2); // find a huditem by name
|
i = get_huditem(word2); // find a huditem by name
|
||||||
|
|
||||||
if (i >= 0 && i < NUMHUDITEMS)
|
if (i >= 0 && i < NUMHUDITEMS)
|
||||||
readhuditem(f, i);
|
readhuditem(f, i);
|
||||||
else
|
else
|
||||||
@@ -3004,8 +3124,11 @@ static void DEH_LoadDehackedFile(MYFILE *f, UINT16 wad)
|
|||||||
if (deh_num_warning)
|
if (deh_num_warning)
|
||||||
{
|
{
|
||||||
CONS_Printf(M_GetText("%d warning%s in the SOC lump\n"), deh_num_warning, deh_num_warning == 1 ? "" : "s");
|
CONS_Printf(M_GetText("%d warning%s in the SOC lump\n"), deh_num_warning, deh_num_warning == 1 ? "" : "s");
|
||||||
if (devparm)
|
if (devparm) {
|
||||||
I_Error("%s%s",va(M_GetText("%d warning%s in the SOC lump\n"), deh_num_warning, deh_num_warning == 1 ? "" : "s"), M_GetText("See log.txt for details.\n"));
|
I_Error("%s%s",va(M_GetText("%d warning%s in the SOC lump\n"), deh_num_warning, deh_num_warning == 1 ? "" : "s"), M_GetText("See log.txt for details.\n"));
|
||||||
|
//while (!I_GetKey())
|
||||||
|
//I_OsPolling();
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
deh_loaded = true;
|
deh_loaded = true;
|
||||||
@@ -8094,109 +8217,84 @@ struct {
|
|||||||
{NULL,0}
|
{NULL,0}
|
||||||
};
|
};
|
||||||
|
|
||||||
// Returns the vlaue of MT_ enumerations
|
|
||||||
static mobjtype_t get_mobjtype(const char *word)
|
static mobjtype_t get_mobjtype(const char *word)
|
||||||
{
|
{ // Returns the vlaue of MT_ enumerations
|
||||||
mobjtype_t i;
|
mobjtype_t i;
|
||||||
|
|
||||||
if (*word >= '0' && *word <= '9')
|
if (*word >= '0' && *word <= '9')
|
||||||
return atoi(word);
|
return atoi(word);
|
||||||
|
|
||||||
if (fastncmp("MT_",word,3))
|
if (fastncmp("MT_",word,3))
|
||||||
word += 3; // take off the MT_
|
word += 3; // take off the MT_
|
||||||
|
for (i = 0; i < NUMMOBJFREESLOTS; i++) {
|
||||||
for (i = 0; i < NUMMOBJFREESLOTS; i++)
|
|
||||||
{
|
|
||||||
if (!FREE_MOBJS[i])
|
if (!FREE_MOBJS[i])
|
||||||
break;
|
break;
|
||||||
if (fastcmp(word, FREE_MOBJS[i]))
|
if (fastcmp(word, FREE_MOBJS[i]))
|
||||||
return MT_FIRSTFREESLOT+i;
|
return MT_FIRSTFREESLOT+i;
|
||||||
}
|
}
|
||||||
|
|
||||||
for (i = 0; i < MT_FIRSTFREESLOT; i++)
|
for (i = 0; i < MT_FIRSTFREESLOT; i++)
|
||||||
if (fastcmp(word, MOBJTYPE_LIST[i]+3))
|
if (fastcmp(word, MOBJTYPE_LIST[i]+3))
|
||||||
return i;
|
return i;
|
||||||
|
|
||||||
deh_warning("Couldn't find mobjtype named 'MT_%s'",word);
|
deh_warning("Couldn't find mobjtype named 'MT_%s'",word);
|
||||||
return MT_BLUECRAWLA;
|
return MT_BLUECRAWLA;
|
||||||
}
|
}
|
||||||
|
|
||||||
// Returns the value of S_ enumerations
|
|
||||||
static statenum_t get_state(const char *word)
|
static statenum_t get_state(const char *word)
|
||||||
{
|
{ // Returns the value of S_ enumerations
|
||||||
statenum_t i;
|
statenum_t i;
|
||||||
if (*word >= '0' && *word <= '9')
|
if (*word >= '0' && *word <= '9')
|
||||||
return atoi(word);
|
return atoi(word);
|
||||||
|
|
||||||
if (fastncmp("S_",word,2))
|
if (fastncmp("S_",word,2))
|
||||||
word += 2; // take off the S_
|
word += 2; // take off the S_
|
||||||
|
for (i = 0; i < NUMSTATEFREESLOTS; i++) {
|
||||||
for (i = 0; i < NUMSTATEFREESLOTS; i++)
|
|
||||||
{
|
|
||||||
if (!FREE_STATES[i])
|
if (!FREE_STATES[i])
|
||||||
break;
|
break;
|
||||||
|
|
||||||
if (fastcmp(word, FREE_STATES[i]))
|
if (fastcmp(word, FREE_STATES[i]))
|
||||||
return S_FIRSTFREESLOT+i;
|
return S_FIRSTFREESLOT+i;
|
||||||
}
|
}
|
||||||
|
|
||||||
for (i = 0; i < S_FIRSTFREESLOT; i++)
|
for (i = 0; i < S_FIRSTFREESLOT; i++)
|
||||||
if (fastcmp(word, STATE_LIST[i]+2))
|
if (fastcmp(word, STATE_LIST[i]+2))
|
||||||
return i;
|
return i;
|
||||||
|
|
||||||
deh_warning("Couldn't find state named 'S_%s'",word);
|
deh_warning("Couldn't find state named 'S_%s'",word);
|
||||||
return S_NULL;
|
return S_NULL;
|
||||||
}
|
}
|
||||||
|
|
||||||
// Returns the value of SPR_ enumerations
|
|
||||||
static spritenum_t get_sprite(const char *word)
|
static spritenum_t get_sprite(const char *word)
|
||||||
{
|
{ // Returns the value of SPR_ enumerations
|
||||||
spritenum_t i;
|
spritenum_t i;
|
||||||
if (*word >= '0' && *word <= '9')
|
if (*word >= '0' && *word <= '9')
|
||||||
return atoi(word);
|
return atoi(word);
|
||||||
|
|
||||||
if (fastncmp("SPR_",word,4))
|
if (fastncmp("SPR_",word,4))
|
||||||
word += 4; // take off the SPR_
|
word += 4; // take off the SPR_
|
||||||
|
|
||||||
for (i = 0; i < NUMSPRITES; i++)
|
for (i = 0; i < NUMSPRITES; i++)
|
||||||
if (!sprnames[i][4] && memcmp(word,sprnames[i],4) == 0)
|
if (!sprnames[i][4] && memcmp(word,sprnames[i],4)==0)
|
||||||
return i;
|
return i;
|
||||||
|
|
||||||
deh_warning("Couldn't find sprite named 'SPR_%s'",word);
|
deh_warning("Couldn't find sprite named 'SPR_%s'",word);
|
||||||
return SPR_NULL;
|
return SPR_NULL;
|
||||||
}
|
}
|
||||||
|
|
||||||
// Returns the value of SFX_ enumerations
|
|
||||||
static sfxenum_t get_sfx(const char *word)
|
static sfxenum_t get_sfx(const char *word)
|
||||||
{
|
{ // Returns the value of SFX_ enumerations
|
||||||
sfxenum_t i;
|
sfxenum_t i;
|
||||||
|
|
||||||
if (*word >= '0' && *word <= '9')
|
if (*word >= '0' && *word <= '9')
|
||||||
return atoi(word);
|
return atoi(word);
|
||||||
|
|
||||||
if (fastncmp("SFX_",word,4))
|
if (fastncmp("SFX_",word,4))
|
||||||
word += 4; // take off the SFX_
|
word += 4; // take off the SFX_
|
||||||
else if (fastncmp("DS",word,2))
|
else if (fastncmp("DS",word,2))
|
||||||
word += 2; // take off the DS
|
word += 2; // take off the DS
|
||||||
|
|
||||||
for (i = 0; i < NUMSFX; i++)
|
for (i = 0; i < NUMSFX; i++)
|
||||||
if (S_sfx[i].name && fasticmp(word, S_sfx[i].name))
|
if (S_sfx[i].name && fasticmp(word, S_sfx[i].name))
|
||||||
return i;
|
return i;
|
||||||
|
|
||||||
deh_warning("Couldn't find sfx named 'SFX_%s'",word);
|
deh_warning("Couldn't find sfx named 'SFX_%s'",word);
|
||||||
return sfx_None;
|
return sfx_None;
|
||||||
}
|
}
|
||||||
|
|
||||||
#ifdef MUSICSLOT_COMPATIBILITY
|
#ifdef MUSICSLOT_COMPATIBILITY
|
||||||
// Returns the value of MUS_ enumerations
|
|
||||||
static UINT16 get_mus(const char *word, UINT8 dehacked_mode)
|
static UINT16 get_mus(const char *word, UINT8 dehacked_mode)
|
||||||
{
|
{ // Returns the value of MUS_ enumerations
|
||||||
UINT16 i;
|
UINT16 i;
|
||||||
char lumptmp[4];
|
char lumptmp[4];
|
||||||
|
|
||||||
if (*word >= '0' && *word <= '9')
|
if (*word >= '0' && *word <= '9')
|
||||||
return atoi(word);
|
return atoi(word);
|
||||||
|
|
||||||
if (!word[2] && toupper(word[0]) >= 'A' && toupper(word[0]) <= 'Z')
|
if (!word[2] && toupper(word[0]) >= 'A' && toupper(word[0]) <= 'Z')
|
||||||
return (UINT16)M_MapNumber(word[0], word[1]);
|
return (UINT16)M_MapNumber(word[0], word[1]);
|
||||||
|
|
||||||
@@ -8220,33 +8318,25 @@ static UINT16 get_mus(const char *word, UINT8 dehacked_mode)
|
|||||||
deh_warning("Couldn't find music named 'MUS_%s'",word);
|
deh_warning("Couldn't find music named 'MUS_%s'",word);
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
for (i = 0; compat_special_music_slots[i][0]; ++i)
|
for (i = 0; compat_special_music_slots[i][0]; ++i)
|
||||||
if (fasticmp(word, compat_special_music_slots[i]))
|
if (fasticmp(word, compat_special_music_slots[i]))
|
||||||
return i + 1036;
|
return i + 1036;
|
||||||
|
|
||||||
if (dehacked_mode)
|
if (dehacked_mode)
|
||||||
deh_warning("Couldn't find music named 'MUS_%s'",word);
|
deh_warning("Couldn't find music named 'MUS_%s'",word);
|
||||||
|
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
// Returns the value of HUD_ enumerations
|
|
||||||
static hudnum_t get_huditem(const char *word)
|
static hudnum_t get_huditem(const char *word)
|
||||||
{
|
{ // Returns the value of HUD_ enumerations
|
||||||
hudnum_t i;
|
hudnum_t i;
|
||||||
|
|
||||||
if (*word >= '0' && *word <= '9')
|
if (*word >= '0' && *word <= '9')
|
||||||
return atoi(word);
|
return atoi(word);
|
||||||
|
|
||||||
if (fastncmp("HUD_",word,4))
|
if (fastncmp("HUD_",word,4))
|
||||||
word += 4; // take off the HUD_
|
word += 4; // take off the HUD_
|
||||||
|
|
||||||
for (i = 0; i < NUMHUDITEMS; i++)
|
for (i = 0; i < NUMHUDITEMS; i++)
|
||||||
if (fastcmp(word, HUDITEMS_LIST[i]))
|
if (fastcmp(word, HUDITEMS_LIST[i]))
|
||||||
return i;
|
return i;
|
||||||
|
|
||||||
deh_warning("Couldn't find huditem named 'HUD_%s'",word);
|
deh_warning("Couldn't find huditem named 'HUD_%s'",word);
|
||||||
return HUD_LIVESNAME;
|
return HUD_LIVESNAME;
|
||||||
}
|
}
|
||||||
@@ -8293,16 +8383,15 @@ static inline int lib_freeslot(lua_State *L)
|
|||||||
{
|
{
|
||||||
int n = lua_gettop(L);
|
int n = lua_gettop(L);
|
||||||
int r = 0; // args returned
|
int r = 0; // args returned
|
||||||
char *s, *type, *word;
|
char *s, *type,*word;
|
||||||
|
|
||||||
while (n-- > 0)
|
while (n-- > 0)
|
||||||
{
|
{
|
||||||
s = Z_StrDup(luaL_checkstring(L,1));
|
s = Z_StrDup(luaL_checkstring(L,1));
|
||||||
type = strtok(s, "_");
|
type = strtok(s, "_");
|
||||||
if (type)
|
if (type)
|
||||||
strupr(type);
|
strupr(type);
|
||||||
else
|
else {
|
||||||
{
|
|
||||||
Z_Free(s);
|
Z_Free(s);
|
||||||
return luaL_error(L, "Unknown enum type in '%s'\n", luaL_checkstring(L, 1));
|
return luaL_error(L, "Unknown enum type in '%s'\n", luaL_checkstring(L, 1));
|
||||||
}
|
}
|
||||||
@@ -8310,25 +8399,19 @@ static inline int lib_freeslot(lua_State *L)
|
|||||||
word = strtok(NULL, "\n");
|
word = strtok(NULL, "\n");
|
||||||
if (word)
|
if (word)
|
||||||
strupr(word);
|
strupr(word);
|
||||||
else
|
else {
|
||||||
{
|
|
||||||
Z_Free(s);
|
Z_Free(s);
|
||||||
return luaL_error(L, "Missing enum name in '%s'\n", luaL_checkstring(L, 1));
|
return luaL_error(L, "Missing enum name in '%s'\n", luaL_checkstring(L, 1));
|
||||||
}
|
}
|
||||||
|
if (fastcmp(type, "SFX")) {
|
||||||
if (fastcmp(type, "SFX"))
|
|
||||||
{
|
|
||||||
sfxenum_t sfx;
|
sfxenum_t sfx;
|
||||||
strlwr(word);
|
strlwr(word);
|
||||||
CONS_Printf("Sound sfx_%s allocated.\n",word);
|
CONS_Printf("Sound sfx_%s allocated.\n",word);
|
||||||
sfx = S_AddSoundFx(word, false, 0, false);
|
sfx = S_AddSoundFx(word, false, 0, false);
|
||||||
|
if (sfx != sfx_None) {
|
||||||
if (sfx != sfx_None)
|
|
||||||
{
|
|
||||||
lua_pushinteger(L, sfx);
|
lua_pushinteger(L, sfx);
|
||||||
r++;
|
r++;
|
||||||
}
|
} else
|
||||||
else
|
|
||||||
I_Error("Out of Sfx Freeslots while allocating \"%s\"\nLoad less addons to fix this.", word); //Should never get here since S_AddSoundFx was changed to throw I_Error when it can't allocate
|
I_Error("Out of Sfx Freeslots while allocating \"%s\"\nLoad less addons to fix this.", word); //Should never get here since S_AddSoundFx was changed to throw I_Error when it can't allocate
|
||||||
}
|
}
|
||||||
else if (fastcmp(type, "SPR"))
|
else if (fastcmp(type, "SPR"))
|
||||||
@@ -8342,7 +8425,7 @@ static inline int lib_freeslot(lua_State *L)
|
|||||||
{
|
{
|
||||||
if (used_spr[(j-SPR_FIRSTFREESLOT)/8] & (1<<(j%8)))
|
if (used_spr[(j-SPR_FIRSTFREESLOT)/8] & (1<<(j%8)))
|
||||||
{
|
{
|
||||||
if (!sprnames[j][4] && memcmp(sprnames[j], word, 4) == 0)
|
if (!sprnames[j][4] && memcmp(sprnames[j],word,4)==0)
|
||||||
sprnames[j][4] = wad;
|
sprnames[j][4] = wad;
|
||||||
continue; // Already allocated, next.
|
continue; // Already allocated, next.
|
||||||
}
|
}
|
||||||
@@ -8360,7 +8443,6 @@ static inline int lib_freeslot(lua_State *L)
|
|||||||
r++;
|
r++;
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (j > SPR_LASTFREESLOT)
|
if (j > SPR_LASTFREESLOT)
|
||||||
I_Error("Out of Sprite Freeslots while allocating \"%s\"\nLoad less addons to fix this.", word);
|
I_Error("Out of Sprite Freeslots while allocating \"%s\"\nLoad less addons to fix this.", word);
|
||||||
}
|
}
|
||||||
@@ -8368,9 +8450,7 @@ static inline int lib_freeslot(lua_State *L)
|
|||||||
{
|
{
|
||||||
statenum_t i;
|
statenum_t i;
|
||||||
for (i = 0; i < NUMSTATEFREESLOTS; i++)
|
for (i = 0; i < NUMSTATEFREESLOTS; i++)
|
||||||
{
|
if (!FREE_STATES[i]) {
|
||||||
if (!FREE_STATES[i])
|
|
||||||
{
|
|
||||||
CONS_Printf("State S_%s allocated.\n",word);
|
CONS_Printf("State S_%s allocated.\n",word);
|
||||||
|
|
||||||
lua_pushcfunction(L, lua_glib_invalidate_cache);
|
lua_pushcfunction(L, lua_glib_invalidate_cache);
|
||||||
@@ -8384,8 +8464,6 @@ static inline int lib_freeslot(lua_State *L)
|
|||||||
r++;
|
r++;
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
}
|
|
||||||
|
|
||||||
if (i == NUMSTATEFREESLOTS)
|
if (i == NUMSTATEFREESLOTS)
|
||||||
I_Error("Out of State Freeslots while allocating \"%s\"\nLoad less addons to fix this.", word);
|
I_Error("Out of State Freeslots while allocating \"%s\"\nLoad less addons to fix this.", word);
|
||||||
}
|
}
|
||||||
@@ -8393,9 +8471,7 @@ static inline int lib_freeslot(lua_State *L)
|
|||||||
{
|
{
|
||||||
mobjtype_t i;
|
mobjtype_t i;
|
||||||
for (i = 0; i < NUMMOBJFREESLOTS; i++)
|
for (i = 0; i < NUMMOBJFREESLOTS; i++)
|
||||||
{
|
if (!FREE_MOBJS[i]) {
|
||||||
if (!FREE_MOBJS[i])
|
|
||||||
{
|
|
||||||
CONS_Printf("MobjType MT_%s allocated.\n",word);
|
CONS_Printf("MobjType MT_%s allocated.\n",word);
|
||||||
|
|
||||||
lua_pushcfunction(L, lua_glib_invalidate_cache);
|
lua_pushcfunction(L, lua_glib_invalidate_cache);
|
||||||
@@ -8409,17 +8485,13 @@ static inline int lib_freeslot(lua_State *L)
|
|||||||
r++;
|
r++;
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
}
|
|
||||||
|
|
||||||
if (i == NUMMOBJFREESLOTS)
|
if (i == NUMMOBJFREESLOTS)
|
||||||
I_Error("Out of Mobj Freeslots while allocating \"%s\"\nLoad less addons to fix this.", word);
|
I_Error("Out of Mobj Freeslots while allocating \"%s\"\nLoad less addons to fix this.", word);
|
||||||
}
|
}
|
||||||
|
|
||||||
Z_Free(s);
|
Z_Free(s);
|
||||||
lua_remove(L, 1);
|
lua_remove(L, 1);
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
|
|
||||||
return r;
|
return r;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -8432,10 +8504,8 @@ static inline int lib_action(lua_State *L)
|
|||||||
mobj_t *actor = *((mobj_t **)luaL_checkudata(L,1,META_MOBJ));
|
mobj_t *actor = *((mobj_t **)luaL_checkudata(L,1,META_MOBJ));
|
||||||
var1 = (INT32)luaL_optinteger(L,2,0);
|
var1 = (INT32)luaL_optinteger(L,2,0);
|
||||||
var2 = (INT32)luaL_optinteger(L,3,0);
|
var2 = (INT32)luaL_optinteger(L,3,0);
|
||||||
|
|
||||||
if (!actor)
|
if (!actor)
|
||||||
return LUA_ErrInvalid(L, "mobj_t");
|
return LUA_ErrInvalid(L, "mobj_t");
|
||||||
|
|
||||||
(*action)(actor);
|
(*action)(actor);
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
@@ -8457,29 +8527,23 @@ FUNCINLINE static ATTRINLINE int lib_getenum(lua_State *L)
|
|||||||
|
|
||||||
const char *word;
|
const char *word;
|
||||||
boolean mathlib = lua_toboolean(L, UV_MATHLIB);
|
boolean mathlib = lua_toboolean(L, UV_MATHLIB);
|
||||||
|
if (lua_type(L,2) != LUA_TSTRING)
|
||||||
if (lua_type(L, 2) != LUA_TSTRING)
|
|
||||||
return 0;
|
return 0;
|
||||||
|
word = lua_tostring(L,2);
|
||||||
word = lua_tostring(L, 2);
|
|
||||||
|
|
||||||
/* First check actions, as they can be overridden. */
|
/* First check actions, as they can be overridden. */
|
||||||
if (!mathlib && fastncmp("A_", word, 2))
|
if (!mathlib && fastncmp("A_",word,2)) {
|
||||||
{
|
|
||||||
char *caps;
|
char *caps;
|
||||||
// Try to get a Lua action first.
|
// Try to get a Lua action first.
|
||||||
/// \todo Push a closure that sets superactions[] and superstack.
|
/// \todo Push a closure that sets superactions[] and superstack.
|
||||||
lua_getfield(L, LUA_REGISTRYINDEX, LREG_ACTIONS);
|
lua_getfield(L, LUA_REGISTRYINDEX, LREG_ACTIONS);
|
||||||
|
|
||||||
// actions are stored in all uppercase.
|
// actions are stored in all uppercase.
|
||||||
caps = Z_StrDup(word);
|
caps = Z_StrDup(word);
|
||||||
strupr(caps);
|
strupr(caps);
|
||||||
lua_getfield(L, -1, caps);
|
lua_getfield(L, -1, caps);
|
||||||
Z_Free(caps);
|
Z_Free(caps);
|
||||||
|
|
||||||
if (!lua_isnil(L, -1))
|
if (!lua_isnil(L, -1))
|
||||||
return 1; // Success! :D That was easy.
|
return 1; // Success! :D That was easy.
|
||||||
|
|
||||||
// Welp, that failed.
|
// Welp, that failed.
|
||||||
lua_pop(L, 2); // pop nil and LREG_ACTIONS
|
lua_pop(L, 2); // pop nil and LREG_ACTIONS
|
||||||
// Hardcoded actions are handled by the proxy.
|
// Hardcoded actions are handled by the proxy.
|
||||||
@@ -8488,14 +8552,12 @@ FUNCINLINE static ATTRINLINE int lib_getenum(lua_State *L)
|
|||||||
/* Then check the globals proxy table. */
|
/* Then check the globals proxy table. */
|
||||||
lua_pushvalue(L, 2);
|
lua_pushvalue(L, 2);
|
||||||
lua_gettable(L, GLIB_PROXY);
|
lua_gettable(L, GLIB_PROXY);
|
||||||
|
|
||||||
if (!lua_isnil(L, -1))
|
if (!lua_isnil(L, -1))
|
||||||
{
|
{
|
||||||
return 1;
|
return 1;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (mathlib)
|
if (mathlib) return luaL_error(L, "constant '%s' could not be parsed.\n", word);
|
||||||
return luaL_error(L, "constant '%s' could not be parsed.\n", word);
|
|
||||||
|
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
@@ -8553,7 +8615,6 @@ static int lua_enumlib_server_get(lua_State *L)
|
|||||||
{
|
{
|
||||||
if ((!multiplayer || !(netgame || demo.playback)) && !playeringame[serverplayer])
|
if ((!multiplayer || !(netgame || demo.playback)) && !playeringame[serverplayer])
|
||||||
return 0;
|
return 0;
|
||||||
|
|
||||||
LUA_PushUserdata(L, &players[serverplayer], META_PLAYER);
|
LUA_PushUserdata(L, &players[serverplayer], META_PLAYER);
|
||||||
return 1;
|
return 1;
|
||||||
}
|
}
|
||||||
@@ -8562,7 +8623,6 @@ static int lua_enumlib_consoleplayer_get(lua_State *L)
|
|||||||
{
|
{
|
||||||
if (consoleplayer < 0 || !playeringame[consoleplayer])
|
if (consoleplayer < 0 || !playeringame[consoleplayer])
|
||||||
return 0;
|
return 0;
|
||||||
|
|
||||||
LUA_PushUserdata(L, &players[consoleplayer], META_PLAYER);
|
LUA_PushUserdata(L, &players[consoleplayer], META_PLAYER);
|
||||||
return 1;
|
return 1;
|
||||||
}
|
}
|
||||||
@@ -8755,15 +8815,12 @@ static int lua_enumlib_action_get(lua_State *L)
|
|||||||
const char *action = lua_tostring(L, 1);
|
const char *action = lua_tostring(L, 1);
|
||||||
|
|
||||||
for (int i = 0; actionpointers[i].name; i++)
|
for (int i = 0; actionpointers[i].name; i++)
|
||||||
{
|
if (fasticmp(action, actionpointers[i].name)) {
|
||||||
if (fasticmp(action, actionpointers[i].name))
|
|
||||||
{
|
|
||||||
// push lib_action as a C closure with the actionf_t* as an upvalue.
|
// push lib_action as a C closure with the actionf_t* as an upvalue.
|
||||||
lua_pushlightuserdata(L, &actionpointers[i].action);
|
lua_pushlightuserdata(L, &actionpointers[i].action);
|
||||||
lua_pushcclosure(L, lib_action, 1);
|
lua_pushcclosure(L, lib_action, 1);
|
||||||
return 1;
|
return 1;
|
||||||
}
|
}
|
||||||
}
|
|
||||||
|
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
@@ -8781,13 +8838,8 @@ static char *lua_enumlib_sprintf_upper(char **buf, int* size, const char *format
|
|||||||
va_list va;
|
va_list va;
|
||||||
va_start(va, format);
|
va_start(va, format);
|
||||||
|
|
||||||
va_list vacpy;
|
int length = vsnprintf(*buf, *size, format, va);
|
||||||
va_copy(vacpy, va);
|
if (length > *size)
|
||||||
|
|
||||||
int length = vsnprintf(*buf, *size, format, vacpy);
|
|
||||||
va_end(vacpy);
|
|
||||||
|
|
||||||
if (length >= *size)
|
|
||||||
{
|
{
|
||||||
void *ptr = realloc(*buf, length+1);
|
void *ptr = realloc(*buf, length+1);
|
||||||
if (!ptr)
|
if (!ptr)
|
||||||
@@ -8795,13 +8847,12 @@ static char *lua_enumlib_sprintf_upper(char **buf, int* size, const char *format
|
|||||||
va_end(va);
|
va_end(va);
|
||||||
return NULL;
|
return NULL;
|
||||||
}
|
}
|
||||||
|
|
||||||
*buf = ptr;
|
*buf = ptr;
|
||||||
*size = length+1;
|
*size = length+1;
|
||||||
|
|
||||||
length = vsnprintf(*buf, *size, format, va);
|
va_start(va, format);
|
||||||
|
vsnprintf(*buf, *size, format, va);
|
||||||
}
|
}
|
||||||
|
|
||||||
va_end(va);
|
va_end(va);
|
||||||
|
|
||||||
for (int i = 0; i < length; i++)
|
for (int i = 0; i < length; i++)
|
||||||
@@ -8826,14 +8877,11 @@ static int lua_enumlib_super_get(lua_State *L)
|
|||||||
}
|
}
|
||||||
|
|
||||||
for (int i = 0; actionpointers[i].name; i++)
|
for (int i = 0; actionpointers[i].name; i++)
|
||||||
{
|
if (fasticmp(superactions[superstack-1], actionpointers[i].name)) {
|
||||||
if (fasticmp(superactions[superstack-1], actionpointers[i].name))
|
|
||||||
{
|
|
||||||
lua_pushlightuserdata(L, &actionpointers[i].action);
|
lua_pushlightuserdata(L, &actionpointers[i].action);
|
||||||
lua_pushcclosure(L, lib_action, 1);
|
lua_pushcclosure(L, lib_action, 1);
|
||||||
return 1;
|
return 1;
|
||||||
}
|
}
|
||||||
}
|
|
||||||
|
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
@@ -9302,10 +9350,7 @@ enum actionnum LUA_GetActionNumByName(const char *actiontocompare)
|
|||||||
{
|
{
|
||||||
size_t z;
|
size_t z;
|
||||||
for (z = 0; actionpointers[z].name; z++)
|
for (z = 0; actionpointers[z].name; z++)
|
||||||
{
|
|
||||||
if (fasticmp(actiontocompare, actionpointers[z].name))
|
if (fasticmp(actiontocompare, actionpointers[z].name))
|
||||||
return z;
|
return z;
|
||||||
}
|
|
||||||
|
|
||||||
return z;
|
return z;
|
||||||
}
|
}
|
||||||
+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.
|
||||||
|
|||||||
+2
-2
@@ -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!
|
||||||
|
|
||||||
|
|||||||
@@ -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
|
||||||
@@ -399,6 +402,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
|
||||||
@@ -484,6 +490,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
|
||||||
|
|||||||
@@ -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;
|
||||||
|
|||||||
+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;
|
||||||
|
|||||||
+40
-31
@@ -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
|
||||||
@@ -3510,11 +3520,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;
|
||||||
|
|||||||
+24
-1
@@ -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;
|
||||||
@@ -86,6 +87,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;
|
||||||
@@ -106,6 +108,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 +186,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,6 +206,8 @@ 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 introtoplay = 0;
|
UINT8 introtoplay = 0;
|
||||||
@@ -1290,6 +1298,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 +3353,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 +3403,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);
|
||||||
|
|
||||||
@@ -4025,6 +4047,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;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -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;
|
||||||
|
|||||||
@@ -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]));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -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]));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
+68
-64
@@ -254,13 +254,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 +388,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 +515,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 +533,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);
|
||||||
@@ -1422,11 +1420,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 +1464,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 +2263,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 +2407,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)
|
||||||
{
|
{
|
||||||
@@ -2687,6 +2688,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 +2704,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);
|
||||||
@@ -3864,7 +3871,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;
|
||||||
@@ -5981,7 +5988,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 +5996,6 @@ static void COM_HWR_glinfo(void)
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
ext = strtok(copy, " ");
|
|
||||||
|
|
||||||
do
|
do
|
||||||
{
|
{
|
||||||
CONS_Printf(" - %s\n", ext);
|
CONS_Printf(" - %s\n", ext);
|
||||||
@@ -6095,62 +6100,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);
|
||||||
|
|||||||
@@ -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" \
|
||||||
|
|||||||
+15
-12
@@ -543,8 +543,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 +625,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';
|
||||||
|
|
||||||
@@ -1235,9 +1230,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 +1574,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 +1582,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 +1680,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 +1699,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);
|
||||||
|
|
||||||
|
|
||||||
@@ -1815,6 +1814,7 @@ static void HU_DrawChat(void)
|
|||||||
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 +1825,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)
|
||||||
@@ -1925,7 +1926,7 @@ static void HU_DrawChat(void)
|
|||||||
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 +1934,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]));
|
||||||
}
|
}
|
||||||
@@ -2042,6 +2043,7 @@ static void HU_DrawChat(void)
|
|||||||
|
|
||||||
skip = 0;
|
skip = 0;
|
||||||
|
|
||||||
|
#ifdef NETSPLITSCREEN
|
||||||
if (splitscreen)
|
if (splitscreen)
|
||||||
{
|
{
|
||||||
suggesty -= BASEVIDHEIGHT/2;
|
suggesty -= BASEVIDHEIGHT/2;
|
||||||
@@ -2049,6 +2051,7 @@ static void HU_DrawChat(void)
|
|||||||
suggesty += 16;
|
suggesty += 16;
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
|
#endif
|
||||||
suggesty -= (cv_kartspeedometer.value ? 16 : 0);
|
suggesty -= (cv_kartspeedometer.value ? 16 : 0);
|
||||||
|
|
||||||
while ((suggest = M_FindEmote(complete, complete_len, skip)) != NULL)
|
while ((suggest = M_FindEmote(complete, complete_len, skip)) != NULL)
|
||||||
|
|||||||
@@ -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;
|
||||||
|
|||||||
@@ -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);
|
||||||
|
|
||||||
|
|||||||
@@ -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
|
||||||
|
|||||||
+10
-27
@@ -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);
|
||||||
@@ -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
|
||||||
@@ -4022,7 +4012,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 +4076,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 +4327,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 +4344,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 +4432,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 +4533,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 +4549,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 +4704,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;
|
||||||
|
|||||||
+8
-4
@@ -1955,9 +1955,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]);
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -2370,7 +2372,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!
|
||||||
}
|
}
|
||||||
@@ -3676,9 +3677,11 @@ 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;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if (translucent)
|
||||||
|
dust->flags2 |= MF2_SHADOW;
|
||||||
|
|
||||||
return dust;
|
return dust;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -4654,7 +4657,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;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
+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
|
||||||
|
|||||||
+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;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -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);
|
||||||
|
|||||||
+123
-35
@@ -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;
|
||||||
@@ -1993,6 +1996,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 +2043,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)
|
||||||
@@ -2092,6 +2106,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
|
||||||
// ==========================================================================
|
// ==========================================================================
|
||||||
@@ -5355,7 +5418,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 };
|
||||||
|
|
||||||
@@ -7890,24 +7953,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 +7986,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 +8003,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 +8113,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 +8126,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 +8158,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 +8181,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 +8207,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 +8246,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 +8280,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 +8340,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 +8397,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;
|
||||||
|
|||||||
@@ -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;
|
||||||
|
|||||||
+46
-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
|
||||||
// -----------------------------------
|
// -----------------------------------
|
||||||
@@ -1688,30 +1694,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 +1726,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 +1828,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 +1881,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 +1891,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.",
|
||||||
|
|||||||
+5
-5
@@ -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 (ctrldown && (cv_keyboardlayout.value != 3 || (cv_keyboardlayout.value == 3 && !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];
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -599,14 +599,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;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
+21
-1
@@ -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;
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -99,6 +99,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 +121,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 +212,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 +220,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);
|
||||||
@@ -274,6 +281,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);
|
||||||
|
|||||||
+13
-6
@@ -5620,15 +5620,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);
|
||||||
|
|
||||||
@@ -11163,7 +11161,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
|
||||||
|
|||||||
@@ -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;
|
||||||
|
|
||||||
|
|||||||
+1
-2
@@ -2586,8 +2586,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.
|
||||||
|
|||||||
+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();
|
||||||
|
|||||||
+39
-9
@@ -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;
|
||||||
@@ -3103,16 +3130,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 +3508,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 +4056,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)
|
||||||
@@ -4147,12 +4179,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 +4230,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 +4257,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);
|
||||||
|
|||||||
@@ -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++;
|
||||||
}
|
}
|
||||||
|
|||||||
+46
-4
@@ -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
|
||||||
@@ -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';
|
||||||
@@ -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++)
|
||||||
{
|
{
|
||||||
|
|||||||
@@ -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.
|
||||||
|
|||||||
+3
-6
@@ -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
|
||||||
@@ -487,10 +487,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 +499,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 +510,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;
|
||||||
}
|
}
|
||||||
|
|||||||
+6
-6
@@ -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
-56
@@ -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));
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -1444,7 +1390,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 +1425,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
|
||||||
|
|||||||
+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;
|
||||||
}
|
}
|
||||||
|
|||||||
+14
-9
@@ -1286,8 +1286,7 @@ static boolean ReadMusicDefFields(UINT16 wadnum, int line, char *stoken, musicde
|
|||||||
CONS_Alert(CONS_WARNING,
|
CONS_Alert(CONS_WARNING,
|
||||||
"MUSICDEF: Field '%s' is missing name. (file %s, line %d)\n",
|
"MUSICDEF: Field '%s' is missing name. (file %s, line %d)\n",
|
||||||
stoken, wadfiles[wadnum]->filename, line);
|
stoken, wadfiles[wadnum]->filename, line);
|
||||||
(void)strtok(NULL, " ");
|
goto skip_lump;
|
||||||
return true;
|
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
@@ -1305,6 +1304,10 @@ static boolean ReadMusicDefFields(UINT16 wadnum, int line, char *stoken, musicde
|
|||||||
|
|
||||||
(*defp) = def;
|
(*defp) = def;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
skip_lump:
|
||||||
|
stoken = strtok(NULL, " ");
|
||||||
|
line++;
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
@@ -1321,8 +1324,7 @@ static boolean ReadMusicDefFields(UINT16 wadnum, int line, char *stoken, musicde
|
|||||||
CONS_Alert(CONS_WARNING,
|
CONS_Alert(CONS_WARNING,
|
||||||
"MUSICDEF: Field '%s' is missing value. (file %s, line %d)\n",
|
"MUSICDEF: Field '%s' is missing value. (file %s, line %d)\n",
|
||||||
stoken, wadfiles[wadnum]->filename, line);
|
stoken, wadfiles[wadnum]->filename, line);
|
||||||
(void)strtok(NULL, " ");
|
goto skip_field;
|
||||||
return true;
|
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
@@ -1374,6 +1376,10 @@ static boolean ReadMusicDefFields(UINT16 wadnum, int line, char *stoken, musicde
|
|||||||
else
|
else
|
||||||
CONS_Alert(CONS_WARNING, "MUSICDEF: Invalid field '%s'. (file %s, line %d)\n", stoken, wadfiles[wadnum]->filename, line);
|
CONS_Alert(CONS_WARNING, "MUSICDEF: Invalid field '%s'. (file %s, line %d)\n", stoken, wadfiles[wadnum]->filename, line);
|
||||||
#undef ADDDEF
|
#undef ADDDEF
|
||||||
|
|
||||||
|
skip_field:
|
||||||
|
stoken = strtok(NULL, "= ");
|
||||||
|
line++;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -1398,8 +1404,7 @@ void S_LoadMusicDefs(UINT16 wadnum)
|
|||||||
|
|
||||||
for (int k = 0; k < 2; k++)
|
for (int k = 0; k < 2; k++)
|
||||||
{
|
{
|
||||||
const char *lumpname = (k == 1 ? "MUSCINFO" : "MUSICDEF"); //check for MUSCINFO lump on 2nd iteration
|
lumpnum = W_CheckNumForNamePwad((k == 1 ? "MUSCINFO" : "MUSICDEF") , wadnum, 0); //check for MUSCINFO lump on 2nd iteration
|
||||||
lumpnum = W_CheckNumForNamePwad(lumpname, wadnum, 0);
|
|
||||||
|
|
||||||
if (lumpnum == INT16_MAX)
|
if (lumpnum == INT16_MAX)
|
||||||
continue;
|
continue;
|
||||||
@@ -1425,7 +1430,7 @@ void S_LoadMusicDefs(UINT16 wadnum)
|
|||||||
nlf = 1;
|
nlf = 1;
|
||||||
else
|
else
|
||||||
nlf = 0;
|
nlf = 0;
|
||||||
*lf++ = '\0'; /* now we can delimit to here */
|
*lf++ = '\0';/* now we can delimit to here */
|
||||||
}
|
}
|
||||||
|
|
||||||
stoken = strtok(stoken, " ");
|
stoken = strtok(stoken, " ");
|
||||||
@@ -1447,10 +1452,10 @@ void S_LoadMusicDefs(UINT16 wadnum)
|
|||||||
}
|
}
|
||||||
while (nlf || ncr) ;
|
while (nlf || ncr) ;
|
||||||
|
|
||||||
stoken = lf; /* now the next nonempty line */
|
stoken = lf;/* now the next nonempty line */
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
break; /* EOF */
|
break;/* EOF */
|
||||||
}
|
}
|
||||||
|
|
||||||
free(musdeftext);
|
free(musdeftext);
|
||||||
|
|||||||
+1
-8
@@ -120,10 +120,6 @@ static void SCR_SetDrawFuncs(enum columncontext_e _columncontext)
|
|||||||
colfuncs[COLDRAWFUNC_TWOSMULTIPATCHTRANS] = R_Draw2sMultiPatchTranslucentColumn;
|
colfuncs[COLDRAWFUNC_TWOSMULTIPATCHTRANS] = R_Draw2sMultiPatchTranslucentColumn;
|
||||||
}
|
}
|
||||||
|
|
||||||
// gotta keep a copy of those for R_DrawWallColumn.....
|
|
||||||
colfuncs[COLDRAWFUNC_TWOSMULTIPATCH_DIRECT] = R_Draw2sMultiPatchColumn;
|
|
||||||
colfuncs[COLDRAWFUNC_TWOSMULTIPATCHTRANS_DIRECT] = R_Draw2sMultiPatchTranslucentColumn;
|
|
||||||
|
|
||||||
colfuncs[COLDRAWFUNC_FOG] = R_DrawFogColumn;
|
colfuncs[COLDRAWFUNC_FOG] = R_DrawFogColumn;
|
||||||
|
|
||||||
R_SetColumnFunc(BASEDRAWFUNC);
|
R_SetColumnFunc(BASEDRAWFUNC);
|
||||||
@@ -158,6 +154,7 @@ void SCR_SetMode(void)
|
|||||||
// effectively adding massive overhead due to excessive flushing, so we draw our masked thing directly to screen instead
|
// effectively adding massive overhead due to excessive flushing, so we draw our masked thing directly to screen instead
|
||||||
void R_SetColumnContext(enum columncontext_e _columncontext)
|
void R_SetColumnContext(enum columncontext_e _columncontext)
|
||||||
{
|
{
|
||||||
|
columncontext = _columncontext;
|
||||||
SCR_SetDrawFuncs(_columncontext); // set our column drawers
|
SCR_SetDrawFuncs(_columncontext); // set our column drawers
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -277,10 +274,6 @@ void SCR_Recalc(void)
|
|||||||
// vid.recalc lasts only for the next refresh...
|
// vid.recalc lasts only for the next refresh...
|
||||||
con_recalc = true;
|
con_recalc = true;
|
||||||
am_recalc = true;
|
am_recalc = true;
|
||||||
|
|
||||||
// HACK: set lastdraw so intermission bg can refresh after resolution change
|
|
||||||
if (gamestate == GS_INTERMISSION)
|
|
||||||
lastdraw = true;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
// Check for screen cmd-line parms: to force a resolution.
|
// Check for screen cmd-line parms: to force a resolution.
|
||||||
|
|||||||
+1
-44
@@ -304,7 +304,7 @@ static void I_StartupConsole(void)
|
|||||||
if (!consolevent)
|
if (!consolevent)
|
||||||
return;
|
return;
|
||||||
|
|
||||||
if (isatty(STDIN_FILENO) != 1)
|
if (isatty(STDIN_FILENO)!=1)
|
||||||
{
|
{
|
||||||
I_OutputMsg("stdin is not a tty, tty console mode failed\n");
|
I_OutputMsg("stdin is not a tty, tty console mode failed\n");
|
||||||
consolevent = false;
|
consolevent = false;
|
||||||
@@ -729,8 +729,6 @@ static void JoyReset(SDLJoyInfo_t *JoySet)
|
|||||||
#if (SDL_VERSION_ATLEAST(2,32,4))
|
#if (SDL_VERSION_ATLEAST(2,32,4))
|
||||||
JoySet->id = -1;
|
JoySet->id = -1;
|
||||||
#endif
|
#endif
|
||||||
JoySet->hasled = false;
|
|
||||||
JoySet->hasrumble = false;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/** \brief SDL info about joystick
|
/** \brief SDL info about joystick
|
||||||
@@ -951,13 +949,6 @@ static int joy_open(int playerIndex, int joyIndex)
|
|||||||
JoyInfo[playerIndex].id = I_GetJoystickDeviceIndex(JoyInfo[playerIndex].dev);
|
JoyInfo[playerIndex].id = I_GetJoystickDeviceIndex(JoyInfo[playerIndex].dev);
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#if (SDL_VERSION_ATLEAST(2,0,14))
|
|
||||||
JoyInfo[playerIndex].hasled = SDL_GameControllerHasLED(JoyInfo[playerIndex].dev);
|
|
||||||
#endif
|
|
||||||
#if (SDL_VERSION_ATLEAST(2,0,18))
|
|
||||||
JoyInfo[playerIndex].hasrumble = SDL_GameControllerHasRumble(JoyInfo[playerIndex].dev);
|
|
||||||
#endif
|
|
||||||
|
|
||||||
return SDL_CONTROLLER_AXIS_MAX;
|
return SDL_CONTROLLER_AXIS_MAX;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -1005,8 +996,6 @@ void I_InitJoystick(UINT8 index)
|
|||||||
#if (SDL_VERSION_ATLEAST(2,32,4))
|
#if (SDL_VERSION_ATLEAST(2,32,4))
|
||||||
JoyInfo[index].id = -1;
|
JoyInfo[index].id = -1;
|
||||||
#endif
|
#endif
|
||||||
JoyInfo[index].hasled = false;
|
|
||||||
JoyInfo[index].hasrumble = false;
|
|
||||||
|
|
||||||
if (cv_usejoystick[index].value)
|
if (cv_usejoystick[index].value)
|
||||||
newcontroller = SDL_GameControllerOpen(cv_usejoystick[index].value-1);
|
newcontroller = SDL_GameControllerOpen(cv_usejoystick[index].value-1);
|
||||||
@@ -1141,26 +1130,6 @@ const char *I_GetJoyName(INT32 joyindex)
|
|||||||
return joyname;
|
return joyname;
|
||||||
}
|
}
|
||||||
|
|
||||||
boolean I_GamepadHasLED(INT32 playernum)
|
|
||||||
{
|
|
||||||
#if !(SDL_VERSION_ATLEAST(2,0,14))
|
|
||||||
(void)playernum;
|
|
||||||
return false;
|
|
||||||
#else
|
|
||||||
return (JoyInfo[playernum].dev != NULL && JoyInfo[playernum].hasled);
|
|
||||||
#endif
|
|
||||||
}
|
|
||||||
|
|
||||||
boolean I_GamepadHasRumble(INT32 playernum)
|
|
||||||
{
|
|
||||||
#if !(SDL_VERSION_ATLEAST(2,0,18))
|
|
||||||
(void)playernum;
|
|
||||||
return false;
|
|
||||||
#else
|
|
||||||
return (JoyInfo[playernum].dev != NULL && JoyInfo[playernum].hasrumble);
|
|
||||||
#endif
|
|
||||||
}
|
|
||||||
|
|
||||||
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)
|
||||||
{
|
{
|
||||||
#if !(SDL_VERSION_ATLEAST(2,0,14))
|
#if !(SDL_VERSION_ATLEAST(2,0,14))
|
||||||
@@ -1176,11 +1145,6 @@ void I_GamepadRumble(INT32 playernum, UINT16 low_strength, UINT16 high_strength,
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (!I_GamepadHasRumble(playernum))
|
|
||||||
{
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
SDL_GameControllerRumble(controller, low_strength, high_strength, duration);
|
SDL_GameControllerRumble(controller, low_strength, high_strength, duration);
|
||||||
#endif
|
#endif
|
||||||
}
|
}
|
||||||
@@ -1200,11 +1164,6 @@ void I_SetGamepadIndicatorColor(INT32 playernum, UINT8 red, UINT8 green, UINT8 b
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (!I_GamepadHasLED(playernum))
|
|
||||||
{
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
SDL_GameControllerSetLED(controller, red, green, blue);
|
SDL_GameControllerSetLED(controller, red, green, blue);
|
||||||
#endif
|
#endif
|
||||||
}
|
}
|
||||||
@@ -1991,14 +1950,12 @@ FUNCNORETURN void ATTRNORETURN I_Quit(void)
|
|||||||
I_ShutdownInput();
|
I_ShutdownInput();
|
||||||
I_ShutdownSystem();
|
I_ShutdownSystem();
|
||||||
SDL_Quit();
|
SDL_Quit();
|
||||||
|
|
||||||
/* 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
|
||||||
|
|
||||||
|
|||||||
+3
-7
@@ -137,13 +137,13 @@ boolean OglSdlSurface(INT32 w, INT32 h)
|
|||||||
|
|
||||||
GL_DBG_Printf("OpenGL %s\n", gl_version);
|
GL_DBG_Printf("OpenGL %s\n", gl_version);
|
||||||
GL_DBG_Printf("GPU: %s\n", gl_renderer);
|
GL_DBG_Printf("GPU: %s\n", gl_renderer);
|
||||||
GL_DBG_Printf("Extensions: \n");
|
GL_DBG_Printf("Extensions:");
|
||||||
|
|
||||||
{
|
{
|
||||||
// Need to do it with strtok for same reason its done like that in gr_glinfo command
|
// Need to do it with strtok for same reason its done like that in gr_glinfo command
|
||||||
|
|
||||||
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)
|
||||||
{
|
{
|
||||||
@@ -151,11 +151,9 @@ boolean OglSdlSurface(INT32 w, INT32 h)
|
|||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
ext = strtok(copy, " ");
|
|
||||||
|
|
||||||
do
|
do
|
||||||
{
|
{
|
||||||
GL_DBG_Printf(" - %s\n", ext);
|
GL_DBG_Printf(" %s", ext);
|
||||||
} while ((ext = strtok(NULL, " ")) != NULL);
|
} while ((ext = strtok(NULL, " ")) != NULL);
|
||||||
|
|
||||||
free(copy);
|
free(copy);
|
||||||
@@ -256,12 +254,10 @@ void OglSdlFinishUpdate(SDL_Window *window)
|
|||||||
// Sryder: We need to draw the final screen texture again into the other buffer in the original position so that
|
// Sryder: We need to draw the final screen texture again into the other buffer in the original position so that
|
||||||
// effects that want to take the old screen can do so after this
|
// effects that want to take the old screen can do so after this
|
||||||
// well we dont need it on native res it seems
|
// well we dont need it on native res it seems
|
||||||
#if 0
|
|
||||||
#ifdef USE_FBO_OGL
|
#ifdef USE_FBO_OGL
|
||||||
if ((!I_CheckNativeRes() && !usefbo) || WipeInAction)
|
if ((!I_CheckNativeRes() && !usefbo) || WipeInAction)
|
||||||
#else
|
#else
|
||||||
if (!I_CheckNativeRes() || WipeInAction)
|
if (!I_CheckNativeRes() || WipeInAction)
|
||||||
#endif
|
|
||||||
#endif
|
#endif
|
||||||
HWR_DrawScreenFinalTexture(realwidth, realheight, false);
|
HWR_DrawScreenFinalTexture(realwidth, realheight, false);
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -57,10 +57,6 @@ typedef struct SDLJoyInfo_s
|
|||||||
//int hats;
|
//int hats;
|
||||||
/// number of balls
|
/// number of balls
|
||||||
//int balls;
|
//int balls;
|
||||||
///
|
|
||||||
boolean hasled;
|
|
||||||
///
|
|
||||||
boolean hasrumble;
|
|
||||||
} SDLJoyInfo_t;
|
} SDLJoyInfo_t;
|
||||||
|
|
||||||
/** \brief SDL info about controller 1
|
/** \brief SDL info about controller 1
|
||||||
|
|||||||
+1
-1
@@ -185,7 +185,7 @@ static void ST_doPaletteStuff(void)
|
|||||||
#endif
|
#endif
|
||||||
|
|
||||||
if (stplyr && stplyr->flashcount)
|
if (stplyr && stplyr->flashcount)
|
||||||
palette = min(stplyr->flashpal, 13);
|
palette = CLAMP(stplyr->flashpal, 0, 13);
|
||||||
|
|
||||||
if (palette != st_palette)
|
if (palette != st_palette)
|
||||||
{
|
{
|
||||||
|
|||||||
+7
-10
@@ -432,17 +432,14 @@ static void ApplyPaletteDelta(const RGBA_t *pal_in, RGBA_t *pal_out, const INT16
|
|||||||
|
|
||||||
static void GenerateFlashPalettes(void)
|
static void GenerateFlashPalettes(void)
|
||||||
{
|
{
|
||||||
size_t i;
|
size_t i, palsize;
|
||||||
static const size_t palsize = (2*256); // two flashpals
|
|
||||||
RGBA_t *pFlashPalGammaCorrectedPalette = NULL;
|
RGBA_t *pFlashPalGammaCorrectedPalette = NULL;
|
||||||
|
|
||||||
// generate flashpalettes if the current palette does not provide any subpalettes
|
// generate flashpalettes if the current palette does not provide any subpalettes
|
||||||
if (currentPaletteSize >= (14 * (256 * 3))) // 14 palettes are in playpal
|
if (currentPaletteSize >= (14 * (256 * 3))) // 14 palettes are in playpal
|
||||||
{
|
|
||||||
return;
|
return;
|
||||||
}
|
|
||||||
|
|
||||||
CONS_Debug(DBG_RENDER, "Current palette does not provide enough subpalettes for flashpalettes to work!\nCreating fallback palettes...\n");
|
palsize = (2*256);
|
||||||
|
|
||||||
pFallbackFlashPal = Z_Malloc(sizeof(*pFallbackFlashPal)*palsize, PU_STATIC, NULL);
|
pFallbackFlashPal = Z_Malloc(sizeof(*pFallbackFlashPal)*palsize, PU_STATIC, NULL);
|
||||||
pFlashPalGammaCorrectedPalette = Z_Malloc(sizeof (*pFlashPalGammaCorrectedPalette)*palsize, PU_STATIC, NULL);
|
pFlashPalGammaCorrectedPalette = Z_Malloc(sizeof (*pFlashPalGammaCorrectedPalette)*palsize, PU_STATIC, NULL);
|
||||||
@@ -3235,7 +3232,7 @@ INT32 V_SubStringWidth(const char *string, INT32 length, INT32 option)
|
|||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
|
||||||
for (i = 0; i < length && string[i]; i++)
|
for (i = 0; string[i] && i < length; i++)
|
||||||
{
|
{
|
||||||
c = string[i];
|
c = string[i];
|
||||||
if ((UINT8)c >= 0x80 && (UINT8)c <= 0x8F) //color parsing! -Inuyasha 2.16.09
|
if ((UINT8)c >= 0x80 && (UINT8)c <= 0x8F) //color parsing! -Inuyasha 2.16.09
|
||||||
@@ -3280,7 +3277,7 @@ INT32 V_SmallSubStringWidth(const char *string, INT32 length, INT32 option)
|
|||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
|
||||||
for (i = 0; i < length && string[i]; i++)
|
for (i = 0; string[i] && i < length; i++)
|
||||||
{
|
{
|
||||||
c = string[i];
|
c = string[i];
|
||||||
if ((UINT8)c >= 0x80 && (UINT8)c <= 0x8F) //color parsing! -Inuyasha 2.16.09
|
if ((UINT8)c >= 0x80 && (UINT8)c <= 0x8F) //color parsing! -Inuyasha 2.16.09
|
||||||
@@ -3329,7 +3326,7 @@ INT32 V_ThinSubStringWidth(const char *string, INT32 length, INT32 option)
|
|||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
|
||||||
for (i = 0; i < length && string[i]; i++)
|
for (i = 0; string[i] && i < length; i++)
|
||||||
{
|
{
|
||||||
c = string[i];
|
c = string[i];
|
||||||
if ((UINT8)c >= 0x80 && (UINT8)c <= 0x8F) //color parsing! -Inuyasha 2.16.09
|
if ((UINT8)c >= 0x80 && (UINT8)c <= 0x8F) //color parsing! -Inuyasha 2.16.09
|
||||||
@@ -3845,12 +3842,12 @@ void V_Recalc(void)
|
|||||||
// Set dup based on width or height, whichever is less
|
// Set dup based on width or height, whichever is less
|
||||||
if (((vid.width*FRACUNIT) / BASEVIDWIDTH) < ((vid.height*FRACUNIT) / BASEVIDHEIGHT))
|
if (((vid.width*FRACUNIT) / BASEVIDWIDTH) < ((vid.height*FRACUNIT) / BASEVIDHEIGHT))
|
||||||
{
|
{
|
||||||
vid.dup = max(vid.width / BASEVIDWIDTH, 1);
|
vid.dup = vid.width / BASEVIDWIDTH;
|
||||||
vid.fdup = (vid.width*FRACUNIT) / BASEVIDWIDTH;
|
vid.fdup = (vid.width*FRACUNIT) / BASEVIDWIDTH;
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
vid.dup = max(vid.height / BASEVIDHEIGHT, 1);
|
vid.dup = vid.height / BASEVIDHEIGHT;
|
||||||
vid.fdup = (vid.height*FRACUNIT) / BASEVIDHEIGHT;
|
vid.fdup = (vid.height*FRACUNIT) / BASEVIDHEIGHT;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
+1
-1
@@ -1268,7 +1268,7 @@ FUNCINLINE static ATTRINLINE lumpnum_t CheckLumpInCache(const char *name)
|
|||||||
|
|
||||||
FUNCINLINE static ATTRINLINE void AddLumpToCache(lumpnum_t lumpnum, const char *name)
|
FUNCINLINE static ATTRINLINE void AddLumpToCache(lumpnum_t lumpnum, const char *name)
|
||||||
{
|
{
|
||||||
I_Assert(strnlen(name, 9) <= 8); // we dont have longnames, so assume this is a non terminated string
|
I_Assert(strlen(name) <= 8); // we dont have longnames, so assume this is a non terminated string
|
||||||
lumpnum_map_insert(&lumpnumcache, strdup(name), lumpnum);
|
lumpnum_map_insert(&lumpnumcache, strdup(name), lumpnum);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -51,6 +51,13 @@
|
|||||||
#include "hardware/hw_main.h"
|
#include "hardware/hw_main.h"
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
typedef struct
|
||||||
|
{
|
||||||
|
char patch[9];
|
||||||
|
INT32 points;
|
||||||
|
UINT8 display;
|
||||||
|
} y_bonus_t;
|
||||||
|
|
||||||
static y_data_t data;
|
static y_data_t data;
|
||||||
|
|
||||||
// graphics
|
// graphics
|
||||||
@@ -1602,6 +1609,9 @@ void Y_SetupVoteFinish(SINT8 pick, SINT8 level)
|
|||||||
if (votes[i] == -1 || endtype > 1) // Don't need to go on
|
if (votes[i] == -1 || endtype > 1) // Don't need to go on
|
||||||
continue;
|
continue;
|
||||||
|
|
||||||
|
if (endtype == 2)
|
||||||
|
continue;
|
||||||
|
|
||||||
if (votecompare == -1)
|
if (votecompare == -1)
|
||||||
{
|
{
|
||||||
votecompare = votes[i];
|
votecompare = votes[i];
|
||||||
|
|||||||
Reference in new issue
Block a user