Compare commits

...
Author SHA1 Message Date
alufolie91 6039dae85b point2uint for blua interning string cache 2026-09-21 17:02:14 +02:00
alufolie91 cc9a24e979 move memerrmsg 2026-09-21 17:02:11 +02:00
Roberto Ierusalimschy 9b9bf70ab8 detail (string cache a bit smaller by default) 2026-05-27 20:16:52 +02:00
Roberto Ierusalimschy be2b7ebfcc code for string cache generalized for "associative sets" (compiler
will optimize away or inline the extra loops)
2026-05-27 20:16:48 +02:00
Roberto Ierusalimschy 091c6e37dd 'clearapihash' -> 'luaS_clearcache' and moved to 'lstring.c' (which
keeps all code related to this cache)
2026-05-27 20:16:45 +02:00
Roberto Ierusalimschy 694e82d4f6 new cache for interning strings 2026-05-27 20:16:42 +02:00
Roberto Ierusalimschy 530116cd76 keep memory-error message in the global state, so that its use
does not depend on Lua internalizing strings to avoid a string
creation on memory errors
2026-05-27 20:16:35 +02:00
alufolie91 84b60dadce blua: readd fast track for gettable operations again
this time properly
the set ones are pretty much incompatible with usedindex, so cant use them
2026-05-15 21:07:10 +02:00
alufolie91 f82d138482 cleanup some things 2026-05-15 13:00:30 +02:00
alufolie91 e7332a3efe Revert "Blua: implementation of fast track for gettable operations"
This reverts commit e4e51f0f80.
2026-05-15 11:54:10 +02:00
alufolie91 bd27a62769 Revert "Blua: fast track for 'settable'"
This reverts commit bdae0ef4ae.
2026-05-15 11:53:59 +02:00
alufolie91 2b650e4b61 Revert "Blua: 'Protect' in table operations is not needed in the fast track"
This reverts commit 537a50b9b3.
2026-05-15 11:53:53 +02:00
alufolie91 8e82256827 Revert "Blua: 'luaV_fastget' only treats the real fast case (table with a non-nil value at given key, so that it does not need to check metamethods)"
This reverts commit 019812db08.
2026-05-15 11:53:46 +02:00
alufolie91 4fa937728b Revert "Blua: OP_SELF can use 'luaV_fastget' specialized for strings, as it is applied only to string keys"
This reverts commit 0fb752b745.
2026-05-15 11:53:42 +02:00
alufolie91 9f9e6450f2 Revert "Blua: opcode OP_SELF operate only with string keys, so they can use fast-track table access"
This reverts commit 7684e6aa07.
2026-05-15 11:53:33 +02:00
alufolie91 1c75dd0401 Revert "blua: fix copy paste error for "slow path" in auxgetstr/lua_getfield"
This reverts commit b652d802f5.
2026-05-15 11:53:26 +02:00
alufolie91 e854096ca0 revert back to number based player names fallbacks
well need our player 1-16 not player a-z :chonkbuncle:
2026-05-15 03:11:52 +02:00
toaster 83a60ea857 Some fixes for bad player info on joining servers.
* Don't overwrite the first player's name when joining with multiple local splitscreen players. (resolves #151)
* The defaults for unprovided names are now consistently "Player A/B/C/D" as opposed to some being letter-based and some being number-based.
* Send local player info once per local splitscreen player, rather than n^2 times (where n is the number of local splitscreen players).
* Since the packet *requires* four names to be sent every time you join a server, send dummy names for local splitscreen players who aren't connecting, instead of your actual cvars (no data leakage you didn't ask for!)
2026-05-15 03:11:03 +02:00
toaster 3d9d14b353 EnsurePlayerNameIsGood: Remove trailing whitespace, instead of just failing on it
Interesting error with its recursive duplication resolving exposed by the previous commit!
2026-05-15 03:11:00 +02:00
alufolie91 24c9f88262 make snacpending error print player number
bit more informative :chaosleep:
2026-05-15 01:28:02 +02:00
alufolie91 b652d802f5 blua: fix copy paste error for "slow path" in auxgetstr/lua_getfield
lets hope this fixes the random crashes from gc sometime
stimky from https://github.com/Indev450/SRB2Kart-Saturn/pull/223/changes/e4e51f0f80fb7deb9213c72bb374d0a7e4c3f03b
2026-05-15 01:09:19 +02:00
alufolie91 459beeb000 fix oopsie from https://github.com/Indev450/SRB2Kart-Saturn/commit/093ed023ef36bb2e8608116ef39d7710366ccf84 2026-05-15 00:36:36 +02:00
indev a28d798189 Remove some redundant mo != NULL asserts if they are followed by !P_MobjWasRemoved(mo) asserts 2026-05-15 01:24:14 +03:00
indev e75a696ee5 Remove outdated PARANOIA assert in P_SetMobjState, it uses P_SetPlayerMobjState automatically for players now 2026-05-15 01:06:04 +03:00
alufolie91 e113027ce6 d_netcmd: fix snacpending stuff
also move all of it behind PARANOIA define, since nothing else was using it eitherway
2026-05-14 21:25:53 +02:00
alufolie91 2ce4e866e3 reorder seg_t struct a bit
fixes a 4byte hole so we can fit everything important into cacheline 1
even when compiled without HWRENDER this should be a better layout
checked per pahole
2026-05-14 18:56:43 +02:00
alufolie91 55a57a1036 fix checking for fbo completeness too early
this should come after everything apparently
all this shit really needs to be cleaned up again
2026-05-12 21:02:15 +02:00
alufolie91 6aabdc86c0 P_TryMove: reduce the amount of R_PointInSubsector per call
and also P_PlayerTouchingSectorSpecial
since either are in a loop that often runs multiple times per call
improves perf a bit per usual testing
2026-05-12 15:38:43 +02:00
indev 9aaa7cc5bf Don't break non-string keys in ArchiveTables when printing error message 2026-05-12 03:52:56 +03:00
alufolie91 d6946d4d44 fix HWR_RenderPolyObjectPlane
smol oopsie that was supposed to be float
fixes the rotating skybox thing in Zero Space
2026-05-11 15:08:14 +02:00
alufolie91 a868844bdf remove outdated comment about precipmobj 2026-05-10 20:15:28 +02:00
alufolie91 39fd31c4b9 p_mobj: potentially save a few more floor/ceiling z checks in some cases
+ some other crap
2026-05-10 20:15:24 +02:00
alufolie91 54f3d7b5e0 move lua_tostring out of the loop in mapheaderinfo_get
does not need to be reevaluated constantly
2026-05-10 16:57:45 +02:00
alufolie91 88116368bb fix potential null pointer deref in P_LineOpening
again ive never seen this hit, but the mobj gets checked right below its radius get dereferenced within the floorz/ceilingz functions which kinda annoyed me lol
as a fallback i just the floor/ceiling sectorheights, which were used before the addition of slopes
2026-05-09 20:00:19 +02:00
alufolie91 9328825a7c fix potential null pointer deref in P_MobjFloorZ/CeilingZ
dont think this ever really hit, but boundsec indeed can be null
it also gets checked if its null above anyways, so why not here?
2026-05-09 20:00:07 +02:00
alufolie91 f825ca32cc add "HAVE_IPV6" to passtrough compiler flags
to allow compiling with ipv6 support
to note this is unsupported from our side, as purely ipv6 servers are unreachable from vanilla clients
2026-05-09 15:33:48 +02:00
alufolie91 ce982d170f change "important" hook_state field to be bool type
matches the others
prob no diff in practice at all
2026-05-08 14:38:57 +02:00
alufolie91 1b3050028e save a few mobjfloorz/ceilingz calls in some cases
gave a small speedup on my test setup (+~3fps)
on slopes those are rather expensive
2026-05-08 14:38:47 +02:00
alufolie91 2344552ba8 Opengl: enable stencil testing only when portals are used
maybe a bit of perf on non portal maps, prob neglible but why not
2026-05-07 16:26:42 +02:00
alufolie91 50c1263e7d OpenGL: only enable stencil testing during level render
not 100% sure if this is the most correct thing, but this causes issues with Nvidia Gpu´s under x11
should fix https://github.com/Indev450/SRB2Kart-Saturn/issues/226
2026-05-06 12:28:08 +02:00
alufolie91 f1ded99262 some code style cleanups 2026-05-06 12:28:05 +02:00
alufolie91 b1620a3fce delet I_ShutdownConsole spam
without process forking I_ShutdownSystem will handle it, otherwise the parent process calls it before exiting
2026-05-04 23:02:04 +02:00
alufolie91 d0ea4d20d0 fix parent process being killed before child per interrupt/terminate signals
by ignoring those signals
otherwise the terminal will be left in a weird state, aswell as the parent exit stuff wont be properly run
this was "fine" before https://github.com/Indev450/SRB2Kart-Saturn/commit/f4dc161831a988e725e8639b9674984ebdf5f6bb but now needs to be handled like this
2026-05-04 23:02:01 +02:00
alufolie91 7f4804f98c fix super rare underflow within FixedHypot if input is -2147483648
this has an insanely rare chance of happening in certain cases (train rush map has a few spots where this is somewhat likely)
abs does not really handle -2147483648 and its result is pretty much implementation defined/ub, since we compile with fwrapv flag it would just return -2147483648 which will cause this to try and access tantoangle at a negative index
we can just return INT32_MAX here since treating either as 2147483647 would return 2147483647 eitherways
2026-05-04 14:10:49 +02:00
alufolie91 4fe3495652 fallback to srb2back instead of hoping the map is still loaded for intermission bg
timescale and replay fastforward caused stuff to crash and well this is better than a whitescreen ig
2026-05-04 10:28:32 +02:00
alufolie91 3c409b4a46 detect kill signal when printing signal from signalhandler
bit more informative than "signal number 9"
2026-05-04 10:01:26 +02:00
alufolie91 45067e00a5 fix compiler warnings + "support" gcc16 2026-05-04 08:04:08 +02:00
alufolie91 370ed1583b comment out unused spritescale/offset fields from gl_vissprite_t
yes those are in fact unused
not deleting since they might be useful for something sometime....
2026-05-02 21:02:50 +02:00
alufolie91 535c2073f1 move palshader code out of HWR_DrawScreenFinalTexture
and make the whole handling safer so we have less chance of ending up with blackscreens should the palette render shader fail
2026-05-01 03:51:28 +02:00
alufolie91 6460ae94f1 remove magic number for P_CalculatePrecipFloor stuff 2026-04-29 17:55:16 +02:00
alufolie91 093ed023ef cleanup CL_DrawConnectionStatus a little 2026-04-29 17:55:13 +02:00
minenice55 1bada2810a cap download size to total size in the connection UI 2026-04-29 17:55:10 +02:00
alufolie91 9df7f3cd3f dont let saltyhop overwrite the players spriteyoffset
let it add to it instead
otherwise if we ever use it for smth else in hardcode saltyhop will work with it
2026-04-29 17:55:04 +02:00
alufolie91 010b6c0361 use destructor attribute for W_Shutdown
makes sure this is always called in any case
also just simpler
2026-04-29 17:55:01 +02:00
alufolie91 dbf67a9670 remove some branch hints in some places
should really only use those for things that are basically dead but gotta be kept for compat reasons and such
2026-04-29 17:54:58 +02:00
alufolie91 8868445c3c S_UpdateSounds: init listenmobj
not sure why but ubsan did complain about it sometimes
S_StartSoundAtVolume also just memsets it so why not do the same here anyways
2026-04-29 17:54:55 +02:00
alufolie91 568cb8b8c7 check I_GetNodeAddress is set before use
this might´ve not been init yet at that point
2026-04-27 22:02:43 +02:00
alufolie91 3b00a69615 prevent buffer underflow within holepunching 2026-04-27 22:02:39 +02:00
alufolie91 6949ce82ab k_hud: fix achii speedometer not being properly coloured with colourhud
oopsie smol oversight from me
2026-04-23 10:07:40 +02:00
alufolie91 c343c52477 remove "extra3" hud stuff
decided to finally make smol stickers for the beta hud
this was never a really great solution since it made things look pretty bad at certain resolutions/scales
still keep the loading code for convenience but honestly not needed aswell at this point
2026-04-23 10:07:35 +02:00
alufolie91 7931a82b23 attempt to fix a plethora of buffer overflows when trying to connect to a server that does not exist
ex: if you typo´d the serveraddress
this really aint pretty but idk how to make things not turn into limbo hell otherwise
2026-04-21 20:52:15 +02:00
alufolie91 31ccf9c34a optimize K_CheckOffroadCollide further
also makes this alot more readable
like this most of the time we dont have to ever check the players floorz nor ceilingz at all since we check if the sector the players mobj is in is even offroad at all
nothing super big but i did see an improvement of around 1fps in my usual benchmark
2026-04-18 18:46:58 +02:00
alufolie91 ff3b73c49e fix offroad oopsie causing desynch
ye def not confusing at all to suddenly switch the meaning of floor and ceiling
2026-04-17 20:53:24 +02:00
alufolie91 64bed71509 add toggle to allow controllers to control the game while window is unfocused
can be toggled with "gamepadunfocused" or in the focus options
2026-04-17 18:54:18 +02:00
alufolie91 eed5943b0b optimize K_CheckOffroadCollide a little bit
no need to always check both the mobjs floor and ceiling z coordinates, those are surprisingly complicated checks on slopes
2026-04-17 17:46:17 +02:00
alufolie91 4f9ddffe2a d_cliserv: check for splitscreen nodes first in clientcmd handler
so we dont always have to check a bunch of things that most of the time wont apply anyways
2026-04-17 17:46:17 +02:00
alufolie91 a73f3a073c hw_main: dont need to do sprite billboarding stuff with shearing enabled within HWR_SplitSprite 2026-04-17 17:46:17 +02:00
alufolie91 a59928221b few more cleanups and super tiny optimizations k_hud 2026-04-16 17:39:13 +02:00
Eidolon b46e5cb577 gl: Fix sky dome VBO leak 2026-04-15 23:51:15 +02:00
alufolie91 bb62fbfc12 add "USEJEMALLOC" make flag to link against "jemalloc" allocator
on my linux system and usual benchmark setup this improves performance quite significantly (+~12fps)
this relies on jemalloc to be installed as a separate library for now and is more a convenience thing
2026-04-15 23:51:15 +02:00
GenericHeroGuy 81f46224e1 Fix asan error when pressing shift and arrow key
Also fix addons menu ignoring shift when capslock is on!
Also also fix capslock+rshift still typing uppercase letters!
2026-04-15 18:08:03 +02:00
NepDisk 6c58c0de41 Add support for using custom SDL2 mappings 2026-04-14 20:25:31 +02:00
67 changed files with 959 additions and 811 deletions

No files matched your search

+5
View File
@@ -94,6 +94,7 @@
# NOSDLMAIN=1 - ? # NOSDLMAIN=1 - ?
# SDLMAIN=1 - ? # SDLMAIN=1 - ?
# NOLTO=1 - Disable link time optimizations # NOLTO=1 - Disable link time optimizations
# USEJEMALLOC=1 Enable building with jemalloc Allocator to replace GLibc malloc, might improve performance
# #
# Library configuration flags: # Library configuration flags:
# Everything here is an override. # Everything here is an override.
@@ -279,6 +280,10 @@ opts+=-O1 -fsanitize=undefined -fno-omit-frame-pointer
libs+=-fsanitize=undefined libs+=-fsanitize=undefined
endif endif
ifdef USEJEMALLOC
libs+=-ljemalloc
endif
ifneq (,$(filter $(CC) $(CXX),clang clang++)) ifneq (,$(filter $(CC) $(CXX),clang clang++))
libs+=-fuse-ld=lld libs+=-fuse-ld=lld
endif endif
+2 -1
View File
@@ -64,6 +64,7 @@ endif
# This must have high to low order. # This must have high to low order.
gcc_versions:=\ gcc_versions:=\
161 160 16\
152 151 150 15\ 152 151 150 15\
142 141 140 14\ 142 141 140 14\
133 132 131 130 13\ 133 132 131 130 13\
@@ -77,7 +78,7 @@ gcc_versions:=\
55 54 53 52 51 50\ 55 54 53 52 51 50\
49 48 47 46 45 44 43 42 41 40 49 48 47 46 45 44 43 42 41 40
latest_gcc_version:=15.2 latest_gcc_version:=16.1
# Automatically set version flag, but not if one was # Automatically set version flag, but not if one was
# manually set. And don't bother if this is a clean only # manually set. And don't bother if this is a clean only
+1
View File
@@ -8,6 +8,7 @@ passthru_opts+=\
HAVE_MINIUPNPC\ HAVE_MINIUPNPC\
HAVE_DISCORDRPC DEVELOP\ HAVE_DISCORDRPC DEVELOP\
NOHOLEPUNCH\ NOHOLEPUNCH\
HAVE_IPV6\
# build with debugging information # build with debugging information
ifdef DEBUGMODE ifdef DEBUGMODE
+11 -23
View File
@@ -526,13 +526,12 @@ static void auxgetstr (lua_State *L, TValue *t, const char *k) {
api_checkvalidindex(L, t); api_checkvalidindex(L, t);
if (luaV_fastget(L, t, str, slot, luaH_getstr)) { if (luaV_fastget(L, t, str, slot, luaH_getstr)) {
setobj2s(L, L->top, slot); setobj2s(L, L->top, slot);
api_incr_top(L);
} }
else { else {
setsvalue(L, &key, str); setsvalue(L, &key, str);
luaV_finishget(L, t, L->top, L->top, slot); luaV_finishget(L, t, &key, L->top, slot);
api_incr_top(L);
} }
api_incr_top(L);
lua_unlock(L); lua_unlock(L);
} }
@@ -641,25 +640,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 +653,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);
} }
-12
View File
@@ -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;
} }
+2 -2
View File
@@ -55,8 +55,8 @@ struct lua_longjmp {
void luaD_seterrorobj (lua_State *L, int lerrcode, StkId oldtop) { void luaD_seterrorobj (lua_State *L, int lerrcode, StkId oldtop) {
switch (lerrcode) { switch (lerrcode) {
case LUA_ERRMEM: { case LUA_ERRMEM: { /* memory error? */
setsvalue2s(L, oldtop, luaS_newliteral(L, MEMERRMSG)); setsvalue2s(L, oldtop, G(L)->memerrmsg); /* reuse preregistered msg. */
break; break;
} }
case LUA_ERRERR: { case LUA_ERRERR: {
+1
View File
@@ -544,6 +544,7 @@ static void atomic (lua_State *L) {
marktmu(g); /* mark `preserved' userdata */ marktmu(g); /* mark `preserved' userdata */
udsize += propagateall(g); /* remark, to propagate `preserveness' */ udsize += propagateall(g); /* remark, to propagate `preserveness' */
cleartable(g->weak); /* remove collected objects from weak tables */ cleartable(g->weak); /* remove collected objects from weak tables */
luaS_clearcache(g);
/* flip current white */ /* flip current white */
g->currentwhite = cast_byte(otherwhite(g)); g->currentwhite = cast_byte(otherwhite(g));
g->sweepstrgc = 0; g->sweepstrgc = 0;
+30
View File
@@ -41,6 +41,25 @@ typedef unsigned char lu_byte;
*/ */
#define IntPoint(p) ((unsigned int)(lu_mem)(p)) #define IntPoint(p) ((unsigned int)(lu_mem)(p))
/*
** conversion of pointer to unsigned integer: this is for hashing only;
** there is no problem if the integer cannot hold the whole pointer
** value. (In strict ISO C this may cause undefined behavior, but no
** actual machine seems to bother.)
*/
#if !defined(LUA_USE_C89) && defined(__STDC_VERSION__) && \
__STDC_VERSION__ >= 199901L
#include <stdint.h>
#if defined(UINTPTR_MAX) /* even in C99 this type is optional */
#define L_P2I uintptr_t
#else /* no 'intptr'? */
#define L_P2I uintmax_t /* use the largest available integer */
#endif
#else /* C89 option */
#define L_P2I size_t
#endif
#define point2uint(p) ((unsigned int)((L_P2I)(p) & UINT_MAX))
/* type to ensure maximum alignment */ /* type to ensure maximum alignment */
@@ -100,6 +119,17 @@ typedef lu_int32 Instruction;
#endif #endif
/*
** Size of cache for strings in the API. 'N' is the number of
** sets (better be a prime) and "M" is the size of each set (M == 1
** makes a direct cache.)
*/
#ifndef STRCACHE_N
#define STRCACHE_N 53
#define STRCACHE_M 2
#endif
/* minimum size for string buffer */ /* minimum size for string buffer */
#ifndef LUA_MINBUFFER #ifndef LUA_MINBUFFER
#define LUA_MINBUFFER 32 #define LUA_MINBUFFER 32
-2
View File
@@ -13,8 +13,6 @@
#include "llimits.h" #include "llimits.h"
#include "lua.h" #include "lua.h"
#define MEMERRMSG "not enough memory"
#define luaM_reallocv(L,b,on,n,e) \ #define luaM_reallocv(L,b,on,n,e) \
((cast(size_t, (n)+1) <= MAX_SIZET/(e)) ? /* +1 to avoid warnings */ \ ((cast(size_t, (n)+1) <= MAX_SIZET/(e)) ? /* +1 to avoid warnings */ \
-2
View File
@@ -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).
+1 -2
View File
@@ -73,10 +73,9 @@ static void f_luaopen (lua_State *L, void *ud) {
stack_init(L, L); /* init stack */ stack_init(L, L); /* init stack */
sethvalue(L, gt(L), luaH_new(L, 0, 2)); /* table of globals */ sethvalue(L, gt(L), luaH_new(L, 0, 2)); /* table of globals */
sethvalue(L, registry(L), luaH_new(L, 0, 2)); /* registry */ sethvalue(L, registry(L), luaH_new(L, 0, 2)); /* registry */
luaS_resize(L, MINSTRTABSIZE); /* initial size of string table */ luaS_init(L);
luaT_init(L); luaT_init(L);
luaX_init(L); luaX_init(L);
luaS_fix(luaS_newliteral(L, MEMERRMSG));
g->GCthreshold = 4*g->totalbytes; g->GCthreshold = 4*g->totalbytes;
} }
+2
View File
@@ -88,9 +88,11 @@ typedef struct global_State {
lua_CFunction panic; /* to be called in unprotected errors */ lua_CFunction panic; /* to be called in unprotected errors */
TValue l_registry; TValue l_registry;
struct lua_State *mainthread; struct lua_State *mainthread;
TString *memerrmsg; /* memory-error message */
UpVal uvhead; /* head of double-linked list of all open upvalues */ UpVal uvhead; /* head of double-linked list of all open upvalues */
struct Table *mt[NUM_TAGS]; /* metatables for basic types */ struct Table *mt[NUM_TAGS]; /* metatables for basic types */
TString *tmname[TM_N]; /* array with tag-method names */ TString *tmname[TM_N]; /* array with tag-method names */
TString *strcache[STRCACHE_N][STRCACHE_M]; /* cache for strings in API */
} global_State; } global_State;
+60
View File
@@ -18,6 +18,9 @@
#include "lstring.h" #include "lstring.h"
#define MEMERRMSG "not enough memory"
void luaS_resize (lua_State *L, int newsize) { void luaS_resize (lua_State *L, int newsize) {
GCObject **newhash; GCObject **newhash;
@@ -72,6 +75,36 @@ static TString *newlstr (lua_State *L, const char *str, size_t l,
} }
/*
** Clear API string cache. (Entries cannot be empty, so fill them with
** a non-collectable string.)
*/
void luaS_clearcache (global_State *g) {
int i, j;
for (i = 0; i < STRCACHE_N; i++)
for (j = 0; j < STRCACHE_M; j++) {
if (luaS_iswhite(g->strcache[i][j])) /* will entry be collected? */
g->strcache[i][j] = g->memerrmsg; /* replace it with something fixed */
}
}
/*
** Initialize the string table and the string cache
*/
void luaS_init (lua_State *L) {
global_State *g = G(L);
int i, j;
luaS_resize(L, MINSTRTABSIZE); /* initial size of string table */
/* pre-create memory-error message */
g->memerrmsg = luaS_newliteral(L, MEMERRMSG);
luaS_fix(g->memerrmsg); /* it should never be collected */
for (i = 0; i < STRCACHE_N; i++) /* fill cache with valid strings */
for (j = 0; j < STRCACHE_M; j++)
g->strcache[i][j] = g->memerrmsg;
}
// string hash taken from luaJIT // string hash taken from luaJIT
/* Unaligned load of uint32_t. */ /* Unaligned load of uint32_t. */
@@ -128,6 +161,10 @@ static inline __attribute__((always_inline)) unsigned luaS_hash (const char *str
#endif #endif
} }
/*
** new string (with explicit length)
*/
TString *luaS_newlstr (lua_State *L, const char *str, size_t l) { TString *luaS_newlstr (lua_State *L, const char *str, size_t l) {
GCObject *o; GCObject *o;
unsigned int h = luaS_hash(str, l); unsigned int h = luaS_hash(str, l);
@@ -147,6 +184,29 @@ TString *luaS_newlstr (lua_State *L, const char *str, size_t l) {
} }
/*
** Create or reuse a zero-terminated string, first checking in the
** cache (using the string address as a key). The cache can contain
** only zero-terminated strings, so it is safe to use 'strcmp' to
** check hits.
*/
TString *luaS_new (lua_State *L, const char *str) {
unsigned int i = point2uint(str) % STRCACHE_N; /* hash */
int j;
TString **p = G(L)->strcache[i];
for (j = 0; j < STRCACHE_M; j++) {
if (strcmp(str, getstr(p[j])) == 0) /* hit? */
return p[j]; /* that is it */
}
/* normal route */
for (j = STRCACHE_M - 1; j > 0; j--)
p[j] = p[j - 1]; /* move out last element */
/* new element is first in the list */
p[0] = luaS_newlstr(L, str, strlen(str));
return p[0];
}
Udata *luaS_newudata (lua_State *L, size_t s, Table *e) { Udata *luaS_newudata (lua_State *L, size_t s, Table *e) {
Udata *u; Udata *u;
if (l_unlikely(s > MAX_SIZET - sizeof(Udata))) if (l_unlikely(s > MAX_SIZET - sizeof(Udata)))
+5 -1
View File
@@ -17,15 +17,19 @@
#define sizeudata(u) (sizeof(union Udata)+(u)->len) #define sizeudata(u) (sizeof(union Udata)+(u)->len)
#define luaS_new(L, s) (luaS_newlstr(L, s, strlen(s))) //#define luaS_new(L, s) (luaS_newlstr(L, s, strlen(s)))
#define luaS_newliteral(L, s) (luaS_newlstr(L, "" s, \ #define luaS_newliteral(L, s) (luaS_newlstr(L, "" s, \
(sizeof(s)/sizeof(char))-1)) (sizeof(s)/sizeof(char))-1))
#define luaS_iswhite(x) test2bits((x)->tsv.marked, WHITE0BIT, WHITE1BIT)
#define luaS_fix(s) l_setbit((s)->tsv.marked, FIXEDBIT) #define luaS_fix(s) l_setbit((s)->tsv.marked, FIXEDBIT)
LUAI_FUNC void luaS_resize (lua_State *L, int newsize); LUAI_FUNC void luaS_resize (lua_State *L, int newsize);
LUAI_FUNC void luaS_clearcache (global_State *g);
LUAI_FUNC void luaS_init (lua_State *L);
LUAI_FUNC Udata *luaS_newudata (lua_State *L, size_t s, Table *e); LUAI_FUNC Udata *luaS_newudata (lua_State *L, size_t s, Table *e);
LUAI_FUNC TString *luaS_newlstr (lua_State *L, const char *str, size_t l); LUAI_FUNC TString *luaS_newlstr (lua_State *L, const char *str, size_t l);
LUAI_FUNC TString *luaS_new (lua_State *L, const char *str);
#endif #endif
+20 -44
View File
@@ -142,51 +142,39 @@ void luaV_finishget (lua_State *L, TValue *t, TValue *key, StkId val,
} }
/* else repeat (tail call 'luaV_finishget') */ /* 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)) {
((!ttisnil(slot)) && ((tm = fasttm(L, h->metatable, TM_USEDINDEX)) != NULL)))) { tm = fasttm(L, h->metatable, TM_NEWINDEX); /* get metamethod */
/* no metamethod and (now) there is an entry with given key */ } else {
setobj2t(L, cast(TValue *, slot), val); tm = fasttm(L, h->metatable, TM_USEDINDEX);
}
if (tm == NULL) { /* no metamethod? */
setobj2t(L, oldval, 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");
} }
@@ -418,13 +406,6 @@ static void Arith (lua_State *L, StkId ra, TValue *rb,
else Protect(luaV_finishget(L,t,k,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;
StkId base; StkId base;
@@ -517,7 +498,7 @@ void luaV_execute (lua_State *L, int nexeccalls) {
StkId ra = RA(i); StkId ra = RA(i);
TValue *rb = RKB(i); TValue *rb = RKB(i);
TValue *rc = RKC(i); TValue *rc = RKC(i);
settableProtected(L, ra, rb, rc); Protect(luaV_settable(L, ra, rb, rc));
continue; continue;
} }
case OP_NEWTABLE: { case OP_NEWTABLE: {
@@ -529,16 +510,11 @@ void luaV_execute (lua_State *L, int nexeccalls) {
continue; continue;
} }
case OP_SELF: { case OP_SELF: {
TValue *slot;
StkId ra = RA(i); StkId ra = RA(i);
StkId rb = RB(i); StkId rb = RB(i);
TValue *rc = RKC(i); TValue *rc = RKC(i);
TString *key = rawtsvalue(rc); /* key must be a string */
setobjs2s(L, ra + 1, rb); setobjs2s(L, ra + 1, rb);
if (luaV_fastget(L, rb, key, slot, luaH_getstr)) { gettableProtected(L, rb, rc, ra);
setobj2s(L, ra, slot);
}
else Protect(luaV_finishget(L, rb, rc, ra, slot));
continue; continue;
} }
case OP_ADD: { case OP_ADD: {
+2 -28
View File
@@ -43,32 +43,6 @@
else luaV_finishget(L,t,k,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);
@@ -76,8 +50,8 @@ LUAI_FUNC const TValue *luaV_tonumber (const TValue *obj, TValue *n);
LUAI_FUNC int luaV_tostring (lua_State *L, StkId obj); LUAI_FUNC int luaV_tostring (lua_State *L, StkId obj);
LUAI_FUNC void luaV_finishget (lua_State *L, TValue *t, TValue *key, LUAI_FUNC void luaV_finishget (lua_State *L, TValue *t, TValue *key,
StkId val, TValue *tm); StkId val, TValue *tm);
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);
+170 -19
View File
@@ -208,14 +208,6 @@ static void CONS_Clear_f(void)
Unlock_state(); Unlock_state();
} }
// Choose english keymap
//
/*static void CONS_English_f(void)
{
shiftxform = english_shiftxform;
CONS_Printf(M_GetText("%s keymap.\n"), M_GetText("English"));
}*/
static char *bindtable[NUMINPUTS]; static char *bindtable[NUMINPUTS];
static void CONS_Bind_f(void) static void CONS_Bind_f(void)
@@ -633,27 +625,186 @@ void CON_MoveConsole(void)
Unlock_state(); Unlock_state();
} }
//======================================================================
// KEYBOARD LAYOUTS FOR ENTERING TEXT
//======================================================================
static char english_shiftxform[] =
{
0,
1, 2, 3, 4, 5, 6, 7, 8, 9, 10,
11, 12, 13, 14, 15, 16, 17, 18, 19, 20,
21, 22, 23, 24, 25, 26, 27, 28, 29, 30,
31,
' ', '!', '"', '#', '$', '%', '&',
'"', // shift-'
'(', ')', '*', '+',
'<', // shift-,
'_', // shift--
'>', // shift-.
'?', // shift-/
')', // shift-0
'!', // shift-1
'@', // shift-2
'#', // shift-3
'$', // shift-4
'%', // shift-5
'^', // shift-6
'&', // shift-7
'*', // shift-8
'(', // shift-9
':',
':', // shift-;
'<',
'+', // shift-=
'>', '?', '@',
'A', 'B', 'C', 'D', 'E', 'F', 'G', 'H', 'I', 'J', 'K', 'L', 'M', 'N',
'O', 'P', 'Q', 'R', 'S', 'T', 'U', 'V', 'W', 'X', 'Y', 'Z',
'{', // shift-[
'|', // shift-backslash - OH MY GOD DOES WATCOM SUCK
'}', // shift-]
'"', '_',
'~', // shift-`
'A', 'B', 'C', 'D', 'E', 'F', 'G', 'H', 'I', 'J', 'K', 'L', 'M', 'N',
'O', 'P', 'Q', 'R', 'S', 'T', 'U', 'V', 'W', 'X', 'Y', 'Z',
'{', '|', '}', '~', 127
};
static char french_shiftxform[] =
{
0,
1, 2, 3, 4, 5, 6, 7, 8, 9, 10,
11, 12, 13, 14, 15, 16, 17, 18, 19, 20,
21, 22, 23, 24, 25, 26, 27, 28, 29, 30,
31,
' ','$', //shift-!
'3', //shift-"
'#', '$', '%',
'1', //shift-&
'4', // shift-'
'5', // shift-(
')', // shift-)
'*', '+',
'?', // shift-,
'6', // shift--
'.', '/',
'0', '1', '2', '3', '4', '5',
'6', '7', '8', '9',
'/', // shitf-:
'.', // shift-;
'>', // shift-<
'+', // shift-=
'>', '?', '@',
'A', 'B', 'C', 'D', 'E', 'F', 'G', 'H', 'I', 'J', 'K', 'L', 'M', 'N',
'O', 'P', 'Q', 'R', 'S', 'T', 'U', 'V', 'W', 'X', 'Y', 'Z',
'[', '\\', ']', '^',
'8', //shift-_
'`',
'A', 'B', 'C', 'D', 'E', 'F', 'G', 'H', 'I', 'J', 'K', 'L', 'M', 'N',
'O', 'P', 'Q', 'R', 'S', 'T', 'U', 'V', 'W', 'X', 'Y', 'Z',
'{', '|', '}', '~', 127,
128, 129,
'2',
131, 132,
'0',
134,
'9',
136, 137,
'7',
139, 140,
'%'
};
static char french_altgrxform[] =
{
0,
1, 2, 3, 4, 5, 6, 7, 8, 9, 10,
11, 12, 13, 14, 15, 16, 17, 18, 19, 20,
21, 22, 23, 24, 25, 26, 27, 28, 29, 30,
31,
' ', '!',
'#', //altgr-"
'#', '$', '%', '&',
'{', //altgr-'
'[', //altgr-(
']', //altgr-)
'*', '+', ',',
'|', //altg--
'.', '/',
'0', '1', '2', '3', '4', '5',
'6', '7', '8', '9',
':', ';', '<',
'}', //altgr-=
'>', '?', '@',
'A', 'B', 'C', 'D', 'E', 'F', 'G', 'H', 'I', 'J', 'K', 'L', 'M', 'N',
'O', 'P', 'Q', 'R', 'S', 'T', 'U', 'V', 'W', 'X', 'Y', 'Z',
'[', '\\', ']', '^',
'\\', //altgr-backslash
'`',
'a', 'b', 'c', 'd', 'E', 'f', 'g', 'h', 'i', 'j', 'k', 'l', 'm', 'n',
'o', 'p', 'q', 'r', 's', 't', 'u', 'v', 'w', 'x', 'y', 'z',
'{', '|', '}', '~', 127,
128, 129,
'~',
131, 132,
'@',
134,
'^',
136, 137,
'`',
139, 140,
KEY_FR_U_GRAVE
};
// fallback for special letter non displayable in the game (i.e.: 'é','à',etc.)
static INT32 CON_FallBackFrSpecialLetter(INT32 key)
{
switch (key)
{
case KEY_FR_E_AIGUE: return 'e';
case KEY_FR_E_GRAVE: return 'e';
case KEY_FR_C_CEDILLE: return 'c';
case KEY_FR_A_GRAVE: return 'a';
case KEY_FR_U_GRAVE: return 'u';
default: return key;
}
}
// goddang AZERTY
static size_t CON_GetShiftSize(void)
{
return ((cv_keyboardlayout.value == 3) ? sizeof(french_shiftxform) : sizeof(english_shiftxform));
}
static char *CON_Shiftform(void)
{
return (cv_keyboardlayout.value == 3) ? french_shiftxform : english_shiftxform;
}
INT32 CON_ShiftChar(INT32 ch) INT32 CON_ShiftChar(INT32 ch)
{ {
if (I_UseNativeKeyboard()) if (I_UseNativeKeyboard() || ch >= (INT32)CON_GetShiftSize())
return ch; return ch;
// warning: shiftdown is NOT a boolean, it's 1 or 2 for lshift/rshift
if ((ch >= 'a' && ch <= 'z') || (ch >= 'A' && ch <= 'Z')) if ((ch >= 'a' && ch <= 'z') || (ch >= 'A' && ch <= 'Z'))
{ {
if (shiftdown ^ capslock) return !!shiftdown != capslock ? CON_Shiftform()[ch] : ch;
ch = shiftxform[ch];
} }
else // if we're holding shift we should still shift non letter symbols
{ // if we're holding shift we should still shift non letter symbols
if (shiftdown) if (shiftdown)
ch = shiftxform[ch]; {
else if (cv_keyboardlayout.value == 3) return CON_Shiftform()[ch];
}
// AZERTY
if (cv_keyboardlayout.value == 3)
{ {
if (altdown & 0x2) if (altdown & 0x2)
ch = french_altgrxform[ch]; return french_altgrxform[ch];
else
ch = HU_FallBackFrSpecialLetter(ch); return CON_FallBackFrSpecialLetter(ch);
}
} }
return ch; return ch;
+42 -28
View File
@@ -1255,20 +1255,18 @@ static void CL_DrawConnectionStatus(void)
case CL_DOWNLOADSAVEGAME: case CL_DOWNLOADSAVEGAME:
if (filedownload.current != -1) if (filedownload.current != -1)
{ {
INT32 dldlength = 0; UINT32 dldlength = 0;
fileneeded_t *file = &fileneeded[filedownload.current]; fileneeded_t *file = &fileneeded[filedownload.current];
UINT32 currentsize = file->currentsize;
UINT32 totalsize = file->totalsize; UINT32 totalsize = file->totalsize;
UINT32 currentsize = min(file->currentsize, totalsize);
cltext = M_GetText("Downloading game state..."); cltext = M_GetText("Downloading game state...");
Net_GetNetStat(); Net_GetNetStat();
if (totalsize != 0) if (totalsize != 0)
dldlength = (INT32)((currentsize/(double)totalsize) * 256); dldlength = (UINT32)((currentsize/(double)totalsize) * 256);
if (dldlength > 256)
dldlength = 256;
V_DrawFill(BASEVIDWIDTH/2-128, BASEVIDHEIGHT-24, 256, 8, 111); V_DrawFill(BASEVIDWIDTH/2-128, BASEVIDHEIGHT-24, 256, 8, 111);
V_DrawFill(BASEVIDWIDTH/2-128, BASEVIDHEIGHT-24, dldlength, 8, 96); V_DrawFill(BASEVIDWIDTH/2-128, BASEVIDHEIGHT-24, (INT32)dldlength, 8, 96);
V_DrawString(BASEVIDWIDTH/2-128, BASEVIDHEIGHT-24, V_20TRANS|V_MONOSPACE, V_DrawString(BASEVIDWIDTH/2-128, BASEVIDHEIGHT-24, V_20TRANS|V_MONOSPACE,
va(" %4uK/%4uK", currentsize>>10, totalsize>>10)); va(" %4uK/%4uK", currentsize>>10, totalsize>>10));
@@ -1485,14 +1483,15 @@ static void CL_DrawConnectionStatus(void)
} }
else if (filedownload.current != -1) else if (filedownload.current != -1)
{ {
INT32 dldlength = 0; UINT32 dldlength = 0;
INT32 totalfileslength = 0;
UINT32 totaldldsize = 0; UINT32 totaldldsize = 0;
UINT32 totalfileslength = 0;
static char tempname[28]; static char tempname[28];
fileneeded_t *file = &fileneeded[filedownload.current]; fileneeded_t *file = &fileneeded[filedownload.current];
char *filename = file->filename; char *filename = file->filename;
UINT32 currentsize = file->currentsize;
UINT32 totalsize = file->totalsize; UINT32 totalsize = file->totalsize;
UINT32 currentsize = min(file->currentsize, totalsize);
UINT32 fdtotalsize = filedownload.totalsize;
// Draw the bottom box. // Draw the bottom box.
M_DrawTextBox(BASEVIDWIDTH/2-128-8, BASEVIDHEIGHT-58-8, 32, 1); M_DrawTextBox(BASEVIDWIDTH/2-128-8, BASEVIDHEIGHT-58-8, 32, 1);
@@ -1500,11 +1499,9 @@ static void CL_DrawConnectionStatus(void)
Net_GetNetStat(); Net_GetNetStat();
if (totalsize != 0) if (totalsize != 0)
dldlength = (INT32)((currentsize/(double)totalsize) * 256); dldlength = (UINT32)((currentsize/(double)totalsize) * 256);
if (dldlength > 256)
dldlength = 256;
V_DrawFill(BASEVIDWIDTH/2-128, BASEVIDHEIGHT-58, 256, 8, 175); V_DrawFill(BASEVIDWIDTH/2-128, BASEVIDHEIGHT-58, 256, 8, 175);
V_DrawFill(BASEVIDWIDTH/2-128, BASEVIDHEIGHT-58, dldlength, 8, 160); V_DrawFill(BASEVIDWIDTH/2-128, BASEVIDHEIGHT-58, (INT32)dldlength, 8, 160);
memset(tempname, 0, sizeof(tempname)); memset(tempname, 0, sizeof(tempname));
@@ -1545,18 +1542,18 @@ static void CL_DrawConnectionStatus(void)
totaldldsize = filedownload.completedsize; totaldldsize = filedownload.completedsize;
V_DrawCenteredString(BASEVIDWIDTH/2, BASEVIDHEIGHT-24-14, V_YELLOWMAP|MENUCAPS, "Overall Download Progress"); V_DrawCenteredString(BASEVIDWIDTH/2, BASEVIDHEIGHT-24-14, V_YELLOWMAP|MENUCAPS, "Overall Download Progress");
if (filedownload.totalsize != 0) if (fdtotalsize != 0)
totalfileslength = (INT32)((totaldldsize/(double)filedownload.totalsize) * 256); totalfileslength = (UINT32)((totaldldsize/(double)fdtotalsize) * 256);
M_DrawTextBox(BASEVIDWIDTH/2-128-8, BASEVIDHEIGHT-24-8, 32, 1); M_DrawTextBox(BASEVIDWIDTH/2-128-8, BASEVIDHEIGHT-24-8, 32, 1);
V_DrawFill(BASEVIDWIDTH/2-128, BASEVIDHEIGHT-24, 256, 8, 175); V_DrawFill(BASEVIDWIDTH/2-128, BASEVIDHEIGHT-24, 256, 8, 175);
V_DrawFill(BASEVIDWIDTH/2-128, BASEVIDHEIGHT-24, totalfileslength, 8, 160); V_DrawFill(BASEVIDWIDTH/2-128, BASEVIDHEIGHT-24, (INT32)totalfileslength, 8, 160);
if (filedownload.totalsize>>20 >= 10) // display in MB if over 10MB if ((fdtotalsize>>20) >= 10) // display in MB if over 10MB
V_DrawString(BASEVIDWIDTH/2-128, BASEVIDHEIGHT-24, V_20TRANS|V_MONOSPACE|MENUCAPS, V_DrawString(BASEVIDWIDTH/2-128, BASEVIDHEIGHT-24, V_20TRANS|V_MONOSPACE|MENUCAPS,
va(" %4uM/%4uM", totaldldsize>>20, filedownload.totalsize>>20)); va(" %4uM/%4uM", (INT32)(totaldldsize>>20), (INT32)(fdtotalsize>>20)));
else else
V_DrawString(BASEVIDWIDTH/2-128, BASEVIDHEIGHT-24, V_20TRANS|V_MONOSPACE|MENUCAPS, V_DrawString(BASEVIDWIDTH/2-128, BASEVIDHEIGHT-24, V_20TRANS|V_MONOSPACE|MENUCAPS,
va(" %4uK/%4uK", totaldldsize>>10, filedownload.totalsize>>10)); va(" %4uK/%4uK", (INT32)(totaldldsize>>10), (INT32)(fdtotalsize>>10)));
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));
@@ -2231,7 +2228,12 @@ static void CL_ReloadReceivedSavegame(void)
static void SendAskInfo(INT32 node) static void SendAskInfo(INT32 node)
{ {
tic_t asktime; tic_t asktime;
doomdata_t *netbuffer = DOOMCOM_DATA(doomcom); doomdata_t *netbuffer;
if (node == -1)
return;
netbuffer = DOOMCOM_DATA(doomcom);
#ifdef HOLEPUNCH #ifdef HOLEPUNCH
if (node != 0 && node != BROADCASTADDR && if (node != 0 && node != BROADCASTADDR &&
@@ -3390,8 +3392,20 @@ static void Command_connect(void)
} }
else else
CONS_Alert(CONS_ERROR, M_GetText("There is no network driver\n")); CONS_Alert(CONS_ERROR, M_GetText("There is no network driver\n"));
// invalid address
if (servernode == -1)
{
D_QuitNetGame(); // this will also call D_CloseConnection for us
CL_Reset();
servernode = 0; // not sure if this is cool, but if this is -1 then bad things happen in alot of networking code
D_StartTitle();
M_StartMessage(M_GetText("Failed to connect to server\nMake sure you put in a valid Address!\n"), NULL, MM_NOTHING);
return;
}
} }
if (I_GetNodeAddress)
CV_Set(&cv_lastserver, I_GetNodeAddress(servernode)); CV_Set(&cv_lastserver, I_GetNodeAddress(servernode));
if (splitscreen != cv_splitplayers.value-1) if (splitscreen != cv_splitplayers.value-1)
@@ -5660,10 +5674,10 @@ static void PT_ClientCmd(INT32 netconsole, SINT8 node)
return; return;
// Splitscreen cmd // Splitscreen cmd
if (((netbuffer->packettype == PT_CLIENT2CMD || netbuffer->packettype == PT_CLIENT2MIS) if ((nodetoplayer2[node] >= 0) &&
((netbuffer->packettype == PT_CLIENT2CMD || netbuffer->packettype == PT_CLIENT2MIS)
|| (netbuffer->packettype == PT_CLIENT3CMD || netbuffer->packettype == PT_CLIENT3MIS) || (netbuffer->packettype == PT_CLIENT3CMD || netbuffer->packettype == PT_CLIENT3MIS)
|| (netbuffer->packettype == PT_CLIENT4CMD || netbuffer->packettype == PT_CLIENT4MIS)) || (netbuffer->packettype == PT_CLIENT4CMD || netbuffer->packettype == PT_CLIENT4MIS)))
&& (nodetoplayer2[node] >= 0))
{ {
G_MoveTiccmd(&playercmds[(UINT8)nodetoplayer2[node]], &netbuffer->u.client2pak.cmd2, 1); G_MoveTiccmd(&playercmds[(UINT8)nodetoplayer2[node]], &netbuffer->u.client2pak.cmd2, 1);
@@ -5671,9 +5685,9 @@ static void PT_ClientCmd(INT32 netconsole, SINT8 node)
return; return;
} }
if (((netbuffer->packettype == PT_CLIENT3CMD || netbuffer->packettype == PT_CLIENT3MIS) if ((nodetoplayer3[node] >= 0) &&
|| (netbuffer->packettype == PT_CLIENT4CMD || netbuffer->packettype == PT_CLIENT4MIS)) ((netbuffer->packettype == PT_CLIENT3CMD || netbuffer->packettype == PT_CLIENT3MIS)
&& (nodetoplayer3[node] >= 0)) || (netbuffer->packettype == PT_CLIENT4CMD || netbuffer->packettype == PT_CLIENT4MIS)))
{ {
G_MoveTiccmd(&playercmds[(UINT8)nodetoplayer3[node]], &netbuffer->u.client3pak.cmd3, 1); G_MoveTiccmd(&playercmds[(UINT8)nodetoplayer3[node]], &netbuffer->u.client3pak.cmd3, 1);
@@ -5681,8 +5695,8 @@ static void PT_ClientCmd(INT32 netconsole, SINT8 node)
return; return;
} }
if ((netbuffer->packettype == PT_CLIENT4CMD || netbuffer->packettype == PT_CLIENT4MIS) if ((nodetoplayer4[node] >= 0) &&
&& (nodetoplayer4[node] >= 0)) (netbuffer->packettype == PT_CLIENT4CMD || netbuffer->packettype == PT_CLIENT4MIS))
{ {
G_MoveTiccmd(&playercmds[(UINT8)nodetoplayer4[node]], &netbuffer->u.client4pak.cmd4, 1); G_MoveTiccmd(&playercmds[(UINT8)nodetoplayer4[node]], &netbuffer->u.client4pak.cmd4, 1);
+9 -37
View File
@@ -138,6 +138,7 @@ boolean devparm = false; // started game with -devparm
boolean singletics = false; // timedemo boolean singletics = false; // timedemo
boolean lastdraw = false; boolean lastdraw = false;
boolean intermissionbginit = false;
#ifdef MOTIONBLUR #ifdef MOTIONBLUR
INT32 postimgparam[MAXSPLITSCREENPLAYERS]; INT32 postimgparam[MAXSPLITSCREENPLAYERS];
@@ -370,23 +371,10 @@ static void D_MakeIntermissionBG(void)
if (rendermode == render_none) if (rendermode == render_none)
{ {
lastdraw = false; lastdraw = false;
intermissionbginit = false;
return; 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 #ifdef HWRENDER
if (rendermode == render_opengl) if (rendermode == render_opengl)
{ {
@@ -399,6 +387,7 @@ static void D_MakeIntermissionBG(void)
} }
lastdraw = false; lastdraw = false;
intermissionbginit = true;
} }
static boolean D_Display(void) static boolean D_Display(void)
@@ -558,8 +547,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
@@ -568,6 +555,8 @@ static boolean D_Display(void)
PS_START_TIMING(ps_rendercalltime); PS_START_TIMING(ps_rendercalltime);
D_Renderview(); D_Renderview();
PS_STOP_TIMING(ps_rendercalltime); PS_STOP_TIMING(ps_rendercalltime);
D_MakeIntermissionBG();
} }
PS_START_TIMING(ps_uitime); PS_START_TIMING(ps_uitime);
@@ -733,13 +722,15 @@ void D_SRB2Loop(void)
precise_t elapsed; precise_t elapsed;
precise_t enterprecise, finishprecise; precise_t enterprecise, finishprecise;
boolean ranwipe = false;
enterprecise = I_GetPreciseTime();
if (I_Interrupted()) if (I_Interrupted())
{ {
I_Quit(); I_Quit();
} }
enterprecise = I_GetPreciseTime();
memset(&g_dc, 0, sizeof(g_dc)); memset(&g_dc, 0, sizeof(g_dc));
Z_Frame_Reset(); Z_Frame_Reset();
@@ -747,8 +738,6 @@ void D_SRB2Loop(void)
const UINT32 framecap = R_GetFramerateCap(); const UINT32 framecap = R_GetFramerateCap();
capbudget = (framecap == 0) ? 0 : (precise_t)((double)precision / (double)framecap + 0.5); // + 0.5 instead of round capbudget = (framecap == 0) ? 0 : (precise_t)((double)precision / (double)framecap + 0.5); // + 0.5 instead of round
boolean ranwipe = false;
I_UpdateTime(cv_timescale.value); I_UpdateTime(cv_timescale.value);
if (lastwipetic) if (lastwipetic)
@@ -1416,8 +1405,6 @@ static inline void D_MakeTitleString(char *s)
// extra graphic patches for saturn specific thingies // extra graphic patches for saturn specific thingies
boolean xtra_speedo = false; // extra speedometer check boolean xtra_speedo = false; // extra speedometer check
boolean xtra_speedo_clr = false; // extra speedometer colour check boolean xtra_speedo_clr = false; // extra speedometer colour check
boolean xtra_speedo3 = false; // 80x 11 extra speedometer check
boolean xtra_speedo_clr3 = false; // 80x 11 extra speedometer colour check
boolean achi_speedo = false; // achiiro speedometer check boolean achi_speedo = false; // achiiro speedometer check
boolean achi_speedo_clr = false; // extra speedometer colour check boolean achi_speedo_clr = false; // extra speedometer colour check
boolean dial_speedo = false; // dial speedometer check boolean dial_speedo = false; // dial speedometer check
@@ -1447,7 +1434,6 @@ static void D_CheckSaturnExtraFiles(void)
CV_PossibleValue_t minimapdot_cons_temp[NUMMINIMAPDOTSTUFF] = {{0, "Off"}, {0, NULL}, {0, NULL}, {0, NULL}, {0, NULL}}; CV_PossibleValue_t minimapdot_cons_temp[NUMMINIMAPDOTSTUFF] = {{0, "Off"}, {0, NULL}, {0, NULL}, {0, NULL}, {0, NULL}};
unsigned last_speedo_i = 0; unsigned last_speedo_i = 0;
unsigned last_driftgauge_i = 3;
unsigned last_inputdisplay_i = 2; unsigned last_inputdisplay_i = 2;
unsigned last_minimapdot_i = 0; unsigned last_minimapdot_i = 0;
#define PUSHCONS(cons, i, id, name) { ++i; cons[i].value = id; cons[i].strvalue = name; } #define PUSHCONS(cons, i, id, name) { ++i; cons[i].value = id; cons[i].strvalue = name; }
@@ -1606,20 +1592,6 @@ static void D_CheckSaturnExtraFiles(void)
if (found_extra3_kart) if (found_extra3_kart)
{ {
mainwads++; mainwads++;
// 80x11 speedometer crap
if (W_LumpExists("SP_SM3TC"))
{
xtra_speedo3 = true;
PUSHCONS(speedo_cons_temp, last_speedo_i, 7, "Extra");
PUSHCONS(driftgaugestyle_cons_temp, last_driftgauge_i, 5, "Extra");
}
// 80x11 speedometer crap but colour
if (W_LumpExists("SC_SM3TC"))
{
xtra_speedo_clr3 = true;
}
} }
#undef PUSHCONS #undef PUSHCONS
-2
View File
@@ -38,8 +38,6 @@ extern boolean found_extra3_kart; // for use in k_kart.c
extern boolean xtra_speedo; // extra speedometer check extern boolean xtra_speedo; // extra speedometer check
extern boolean xtra_speedo_clr; // extra speedometer colour check extern boolean xtra_speedo_clr; // extra speedometer colour check
extern boolean xtra_speedo3; // 80x11 extra speedometer check
extern boolean xtra_speedo_clr3; // 80x11 extra speedometer colour check
extern boolean achi_speedo; // achiiro speedometer check extern boolean achi_speedo; // achiiro speedometer check
extern boolean achi_speedo_clr; // extra speedometer colour check extern boolean achi_speedo_clr; // extra speedometer colour check
extern boolean dial_speedo; // dial speedometer check extern boolean dial_speedo; // dial speedometer check
+43 -11
View File
@@ -1010,6 +1010,7 @@ void D_RegisterClientCommands(void)
CV_RegisterVar(&cv_gamepadled[i]); CV_RegisterVar(&cv_gamepadled[i]);
} }
CV_RegisterVar(&cv_gamepadifunfocused);
CV_RegisterVar(&cv_gamepadledifunfocused); CV_RegisterVar(&cv_gamepadledifunfocused);
CV_RegisterVar(&cv_rumbleifunfocused); CV_RegisterVar(&cv_rumbleifunfocused);
@@ -1213,13 +1214,22 @@ static boolean EnsurePlayerNameIsGood(char *name, INT32 playernum)
if (len == 0 || len > MAXPLAYERNAME) if (len == 0 || len > MAXPLAYERNAME)
return false; // Empty or too long. return false; // Empty or too long.
if (name[0] == ' ' || name[len-1] == ' ') if (name[0] == ' ')
return false; // Starts or ends with a space. return false; // Starts with a space.
if (isdigit(name[0])) if (isdigit(name[0]))
return false; // Starts with a digit. return false; // Starts with a digit.
if (name[0] == '@' || name[0] == '~') if (name[0] == '@' || name[0] == '~')
return false; // Starts with an admin symbol. return false; // Starts with an admin symbol.
// Clean up trailing whitespace.
while (len && name[len-1] == ' ')
{
name[len-1] = '\0';
len--;
}
if (len == 0)
return false;
// Check if it contains a non-printing character. // Check if it contains a non-printing character.
// Note: ANSI C isprint() considers space a printing character. // Note: ANSI C isprint() considers space a printing character.
// Also don't allow semicolons, since they are used as // Also don't allow semicolons, since they are used as
@@ -1272,7 +1282,8 @@ static boolean EnsurePlayerNameIsGood(char *name, INT32 playernum)
* is restored to what it was before. * is restored to what it was before.
* *
* We assume that if playernum is ::consoleplayer or ::secondarydisplayplayer * We assume that if playernum is ::consoleplayer or ::secondarydisplayplayer
* the console variable ::cv_playername or ::cv_playername2 respectively is * (unless clientjoin is true, a necessary evil)
* the console variable ::cv_playername to ::cv_playername4 respectively is
* already set to newname. However, the player name table is assumed to * already set to newname. However, the player name table is assumed to
* contain the old name. * contain the old name.
* *
@@ -1292,6 +1303,10 @@ static void CleanupPlayerName(INT32 playernum, const char *newname)
char *tmpname = NULL; char *tmpname = NULL;
INT32 i; INT32 i;
boolean namefailed = true; boolean namefailed = true;
boolean clientjoin = !!(playernum >= MAXPLAYERS);
if (clientjoin)
playernum -= MAXPLAYERS;
buf = Z_StrDup(newname); buf = Z_StrDup(newname);
@@ -1348,6 +1363,8 @@ static void CleanupPlayerName(INT32 playernum, const char *newname)
} }
// no stealing another player's name // no stealing another player's name
if (!clientjoin)
{
for (i = 0; i < MAXPLAYERS; i++) for (i = 0; i < MAXPLAYERS; i++)
{ {
if (i != playernum && playeringame[i] if (i != playernum && playeringame[i]
@@ -1359,6 +1376,7 @@ static void CleanupPlayerName(INT32 playernum, const char *newname)
if (i < MAXPLAYERS) if (i < MAXPLAYERS)
break; break;
}
// name is okay then // name is okay then
namefailed = false; namefailed = false;
@@ -1369,6 +1387,13 @@ static void CleanupPlayerName(INT32 playernum, const char *newname)
// set consvars whether namefailed or not, because even if it succeeded, // set consvars whether namefailed or not, because even if it succeeded,
// spaces may have been removed // spaces may have been removed
if (clientjoin)
{
consvar_t *namevars[] = {&cv_playername, &cv_playername2, &cv_playername3, &cv_playername4};
CV_StealthSet(namevars[playernum], tmpname);
}
else
{
if (playernum == consoleplayer) if (playernum == consoleplayer)
CV_StealthSet(&cv_playername, tmpname); CV_StealthSet(&cv_playername, tmpname);
else if (playernum == displayplayers[1] || (!netgame && playernum == 1)) else if (playernum == displayplayers[1] || (!netgame && playernum == 1))
@@ -1378,6 +1403,7 @@ static void CleanupPlayerName(INT32 playernum, const char *newname)
else if (playernum == displayplayers[3] || (!netgame && playernum == 3)) else if (playernum == displayplayers[3] || (!netgame && playernum == 3))
CV_StealthSet(&cv_playername4, tmpname); CV_StealthSet(&cv_playername4, tmpname);
else I_Assert(((void)"CleanupPlayerName used on non-local player", 0)); else I_Assert(((void)"CleanupPlayerName used on non-local player", 0));
}
Z_Free(buf); Z_Free(buf);
} }
@@ -1495,7 +1521,9 @@ static void ForceAllSkins(INT32 forcedskin)
} }
static INT32 chmappending; static INT32 chmappending;
#ifdef PARANOIA
static INT32 snacpending[MAXSPLITSCREENPLAYERS]; static INT32 snacpending[MAXSPLITSCREENPLAYERS];
#endif
// wonky compat, idk if anything uses this.... // wonky compat, idk if anything uses this....
#define playerisbot (splitplayer == 1 && botingame) #define playerisbot (splitplayer == 1 && botingame)
@@ -1595,7 +1623,9 @@ static void SendNameAndColor(UINT8 splitplayer)
return; return;
} }
#ifdef PARANOIA
snacpending[splitplayer]++; snacpending[splitplayer]++;
#endif
// Don't change name if muted // Don't change name if muted
if (player_name_changes[pnum] >= MAXNAMECHANGES) if (player_name_changes[pnum] >= MAXNAMECHANGES)
@@ -1631,7 +1661,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;
char name[MAXPLAYERNAME+1] = {}; char name[MAXPLAYERNAME+1] = {};
UINT8 color, skin; UINT8 color, skin;
@@ -1640,14 +1670,18 @@ static void Got_NameAndColor(const UINT8 **cp, INT32 playernum)
I_Error("There is no player %d!", playernum); I_Error("There is no player %d!", playernum);
#endif #endif
player = &players[playernum];
#ifdef PARANOIA
if (P_IsLocalPlayer(player)) if (P_IsLocalPlayer(player))
{ {
snacpending[playernum]--; const INT32 localpnum = P_GetLocalPlayerNumForPlayer(player);
#ifdef PARANOIA snacpending[localpnum]--;
if (snacpending[playernum] < 0)
I_Error("snacpending negative!"); if (snacpending[localpnum] < 0)
#endif I_Error("snacpending negative for player %d!", localpnum);
} }
#endif
READSTRINGN(*cp, name, MAXPLAYERNAME); READSTRINGN(*cp, name, MAXPLAYERNAME);
color = READUINT8(*cp); color = READUINT8(*cp);
@@ -2188,7 +2222,6 @@ void D_SetupVote(void)
WRITEUINT8(p, secondgt); WRITEUINT8(p, secondgt);
secondgt &= ~0x80; secondgt &= ~0x80;
for (i = 0; i < 4; i++) for (i = 0; i < 4; i++)
{ {
UINT16 m; UINT16 m;
@@ -5815,7 +5848,6 @@ static void BaseNumLaps_OnChange(void)
} }
} }
static void KartFrantic_OnChange(void) static void KartFrantic_OnChange(void)
{ {
if ((boolean)cv_kartfrantic.value != franticitems && gamestate == GS_LEVEL && leveltime > starttime) if ((boolean)cv_kartfrantic.value != franticitems && gamestate == GS_LEVEL && leveltime > starttime)
+26 -13
View File
@@ -735,6 +735,10 @@ const char *I_GetJoyName(INT32 joyindex)
return NULL; return NULL;
} }
void I_SetJoystickFocus(void)
{
}
boolean I_GamepadHasLED(INT32 playernum) boolean I_GamepadHasLED(INT32 playernum)
{ {
(void)playernum; (void)playernum;
@@ -1019,8 +1023,13 @@ static void I_PrintSignal(INT32 signal_num, boolean core_dumped, char *signal_ms
sigmsg = ("SIGSEGV - SRB2Kart-Saturn has attempted to access a memory location that it shouldn't and needs to close."); sigmsg = ("SIGSEGV - SRB2Kart-Saturn has attempted to access a memory location that it shouldn't and needs to close.");
break; break;
#ifdef SIGTERM #ifdef SIGTERM
case SIGTERM: // Software termination signal from kill case SIGTERM: // Software termination signal from terminate
sigmsg = ("SIGTERM - SRB2Kart-Saturn was terminated by a kill signal."); sigmsg = ("SIGTERM - SRB2Kart-Saturn was terminated by a terminate signal.");
break;
#endif
#ifdef SIGKILL
case SIGKILL: // Software termination signal from kill
sigmsg = ("SIGKILL - SRB2Kart-Saturn was terminated by a kill signal.");
break; break;
#endif #endif
#ifdef SIGBREAK #ifdef SIGBREAK
@@ -1353,18 +1362,28 @@ static void I_Fork(void)
I_RegisterChildSignals(); I_RegisterChildSignals();
break; break;
default: default:
// ignore those, those are handled by child process
// otherwise parent might exit before it
// and the below stuff wont run and your terminal will be left in an awkward state
#ifdef SIGINT
signal(SIGINT, SIG_IGN);
#endif
#ifdef SIGBREAK
signal(SIGBREAK, SIG_IGN);
#endif
#ifdef SIGTERM
signal(SIGTERM, SIG_IGN);
#endif
if (logstream) if (logstream)
fclose(logstream);/* the child has this */ fclose(logstream);/* the child has this */
c = wait(&status); c = wait(&status);
#ifdef LOGMESSAGES #ifdef LOGMESSAGES
/* By the way, exit closes files. */ /* By the way, exit closes files. */
logstream = fopen(logfilename, "at"); logstream = fopen(logfilename, "at");
#else #else
logstream = 0; logstream = 0;
#endif #endif
if (c == -1) if (c == -1)
{ {
kill(child, SIGKILL); kill(child, SIGKILL);
@@ -1426,7 +1445,6 @@ void I_Quit(void)
goto death; goto death;
quiting = false; quiting = false;
I_ShutdownConsole();
M_SaveConfig(NULL); //save game config, cvars.. M_SaveConfig(NULL); //save game config, cvars..
D_SaveBan(); // save the ban list D_SaveBan(); // save the ban list
G_SaveGameData(false); // Tails 12-08-2002 G_SaveGameData(false); // Tails 12-08-2002
@@ -1454,7 +1472,6 @@ void I_Quit(void)
free(myargv); // Deallocate allocated memory free(myargv); // Deallocate allocated memory
death: death:
W_Shutdown();
exit(0); exit(0);
} }
@@ -1500,7 +1517,6 @@ FUNCIERROR void ATTRNORETURN I_Error(const char *error, ...)
I_OutputMsg("SRB2Kart %s Recursive Error", buffer); I_OutputMsg("SRB2Kart %s Recursive Error", buffer);
W_Shutdown();
exit(-1); // recursive errors detected exit(-1); // recursive errors detected
} }
} }
@@ -1518,8 +1534,6 @@ FUNCIERROR void ATTRNORETURN I_Error(const char *error, ...)
#endif #endif
// --- // ---
I_ShutdownConsole();
M_SaveConfig(NULL); // save game config, cvars.. M_SaveConfig(NULL); // save game config, cvars..
D_SaveBan(); // save the ban list D_SaveBan(); // save the ban list
G_SaveGameData(false); // Tails 12-08-2002 G_SaveGameData(false); // Tails 12-08-2002
@@ -1535,8 +1549,6 @@ FUNCIERROR void ATTRNORETURN I_Error(const char *error, ...)
I_ShutdownGraphics(); I_ShutdownGraphics();
I_ShutdownSystem(); I_ShutdownSystem();
W_Shutdown();
#if defined (PARANOIA) && defined (__CYGWIN__) #if defined (PARANOIA) && defined (__CYGWIN__)
*(INT32 *)2 = 4; //Alam: Debug! *(INT32 *)2 = 4; //Alam: Debug!
#endif #endif
@@ -1642,9 +1654,10 @@ void I_ShutdownSystem(void)
{ {
INT32 c; INT32 c;
#ifndef NEWSIGNALHANDLER #ifdef NEWSIGNALHANDLER
I_ShutdownConsole(); if (M_CheckParm("-nofork"))
#endif #endif
I_ShutdownConsole();
for (c = MAX_QUIT_FUNCS-1; c >= 0; c--) for (c = MAX_QUIT_FUNCS-1; c >= 0; c--)
if (quit_funcs[c]) if (quit_funcs[c])
+1
View File
@@ -113,6 +113,7 @@ extern UINT8 window_notinfocus; // are we in focus? (backend independant -- hand
extern boolean nodrawers; extern boolean nodrawers;
extern boolean lastdraw; extern boolean lastdraw;
extern boolean intermissionbginit;
#ifdef MOTIONBLUR #ifdef MOTIONBLUR
extern INT32 postimgparam[MAXSPLITSCREENPLAYERS]; extern INT32 postimgparam[MAXSPLITSCREENPLAYERS];
+1
View File
@@ -81,6 +81,7 @@ consvar_t cv_gamepadled[MAXSPLITSCREENPLAYERS] = {
{"gamepadled4", "Skincolor", CV_SAVE|CV_CALL|CV_NOINIT, gamepadled_cons_t, led_off_handle4, 0, NULL, NULL, 0, 0, NULL} {"gamepadled4", "Skincolor", CV_SAVE|CV_CALL|CV_NOINIT, gamepadled_cons_t, led_off_handle4, 0, NULL, NULL, 0, 0, NULL}
}; };
consvar_t cv_gamepadifunfocused = {"gamepadunfocused", "Off", CV_SAVE|CV_CALL, CV_OnOff, I_SetJoystickFocus, 0, NULL, NULL, 0, 0, NULL};
consvar_t cv_gamepadledifunfocused = {"gamepadledunfocused", "Off", CV_SAVE, CV_OnOff, NULL, 0, NULL, NULL, 0, 0, NULL}; consvar_t cv_gamepadledifunfocused = {"gamepadledunfocused", "Off", CV_SAVE, CV_OnOff, NULL, 0, NULL, NULL, 0, 0, NULL};
consvar_t cv_rumbleifunfocused = {"rumbleifunfocused", "Off", CV_SAVE, CV_OnOff, NULL, 0, NULL, NULL, 0, 0, NULL}; consvar_t cv_rumbleifunfocused = {"rumbleifunfocused", "Off", CV_SAVE, CV_OnOff, NULL, 0, NULL, NULL, 0, 0, NULL};
+1
View File
@@ -116,6 +116,7 @@ extern consvar_t cv_rumble[MAXSPLITSCREENPLAYERS];
extern consvar_t cv_rumblestrength[MAXSPLITSCREENPLAYERS]; extern consvar_t cv_rumblestrength[MAXSPLITSCREENPLAYERS];
extern consvar_t cv_gamepadled[MAXSPLITSCREENPLAYERS]; extern consvar_t cv_gamepadled[MAXSPLITSCREENPLAYERS];
extern consvar_t cv_gamepadifunfocused;
extern consvar_t cv_gamepadledifunfocused; extern consvar_t cv_gamepadledifunfocused;
extern consvar_t cv_rumbleifunfocused; extern consvar_t cv_rumbleifunfocused;
+6 -5
View File
@@ -319,16 +319,17 @@ angle_t gld_FrustumAngle(angle_t tiltangle)
double clipfov; double clipfov;
double floatangle; double floatangle;
angle_t a1; angle_t a1;
float tilt;
float tilt = fabsf(((float)(int)tiltangle) / (float)ANG1);
if (tilt > 90.0f)
tilt = 90.0f;
// If the pitch is larger than this you can look all around at a FOV of 90 // If the pitch is larger than this you can look all around at a FOV of 90
if (abs((signed)tiltangle) > 46 * ANG1) if (abs((signed)tiltangle) > 46 * ANG1)
return 0xffffffff; return 0xffffffff;
tilt = fabsf(((float)(int)tiltangle) / (float)ANG1);
if (tilt > 90.0f)
tilt = 90.0f;
// ok, this is a gross hack that barely works... // ok, this is a gross hack that barely works...
// but at least it doesn't overestimate too much... // but at least it doesn't overestimate too much...
clipfov = atan(1 / (GLdouble)projMatrix[0]) * 360.0 / M_PI; clipfov = atan(1 / (GLdouble)projMatrix[0]) * 360.0 / M_PI;
+22 -18
View File
@@ -32,20 +32,6 @@
#include <fcntl.h> #include <fcntl.h>
typedef struct
{
UINT8 id_field_length ; // 1
UINT8 color_map_type ; // 2
UINT8 image_type ; // 3
UINT8 dummy[5] ; // 4, 8
INT16 x_origin ; // 9, 10
INT16 y_origin ; //11, 12
INT16 width ; //13, 14
INT16 height ; //15, 16
UINT8 image_pix_size ; //17
UINT8 image_descriptor; //18
} ATTRPACK TGAHeader; // sizeof is 18
static const UINT8 softwaretranstogl[11] = { 0, 25, 51, 76,102,127,153,178,204,229,255}; static const UINT8 softwaretranstogl[11] = { 0, 25, 51, 76,102,127,153,178,204,229,255};
static const UINT8 softwaretranstogl_hi[11] = { 0, 51,102,153,204,255,255,255,255,255,255}; static const UINT8 softwaretranstogl_hi[11] = { 0, 51,102,153,204,255,255,255,255,255,255};
static const UINT8 softwaretranstogl_lo[11] = { 0, 12, 24, 36, 48, 60, 71, 83, 95,111,127}; static const UINT8 softwaretranstogl_lo[11] = { 0, 12, 24, 36, 48, 60, 71, 83, 95,111,127};
@@ -57,8 +43,7 @@ void HWR_DrawStretchyFixedPatch(patch_t *gpatch, fixed_t x, fixed_t y, fixed_t p
{ {
FOutVector v[4]; FOutVector v[4];
FBITFIELD flags; FBITFIELD flags;
float cx = FIXED_TO_FLOAT(x); float cx, cy;
float cy = FIXED_TO_FLOAT(y);
UINT8 alphalevel = ((option & V_ALPHAMASK) >> V_ALPHASHIFT); UINT8 alphalevel = ((option & V_ALPHAMASK) >> V_ALPHASHIFT);
UINT8 blendmode = ((bflags & V_BLENDMASK) >> V_BLENDSHIFT); UINT8 blendmode = ((bflags & V_BLENDMASK) >> V_BLENDSHIFT);
GLPatch_t *hwrPatch; GLPatch_t *hwrPatch;
@@ -72,6 +57,9 @@ void HWR_DrawStretchyFixedPatch(patch_t *gpatch, fixed_t x, fixed_t y, fixed_t p
if (alphalevel >= 10 && alphalevel < 13) if (alphalevel >= 10 && alphalevel < 13)
return; return;
cx = FIXED_TO_FLOAT(x);
cy = FIXED_TO_FLOAT(y);
const float fvw = (float)vid.width; const float fvw = (float)vid.width;
const float fvh = (float)vid.height; const float fvh = (float)vid.height;
@@ -244,8 +232,7 @@ void HWR_DrawCroppedPatch(patch_t *gpatch, fixed_t x, fixed_t y, fixed_t pscale,
{ {
FOutVector v[4]; FOutVector v[4];
FBITFIELD flags; FBITFIELD flags;
float cx = FIXED_TO_FLOAT(x); float cx, cy;
float cy = FIXED_TO_FLOAT(y);
UINT8 alphalevel = ((option & V_ALPHAMASK) >> V_ALPHASHIFT); UINT8 alphalevel = ((option & V_ALPHAMASK) >> V_ALPHASHIFT);
GLPatch_t *hwrPatch; GLPatch_t *hwrPatch;
@@ -258,6 +245,9 @@ void HWR_DrawCroppedPatch(patch_t *gpatch, fixed_t x, fixed_t y, fixed_t pscale,
if (alphalevel >= 10 && alphalevel < 13) if (alphalevel >= 10 && alphalevel < 13)
return; return;
cx = FIXED_TO_FLOAT(x);
cy = FIXED_TO_FLOAT(y);
const float fvw = (float)vid.width; const float fvw = (float)vid.width;
const float fvh = (float)vid.height; const float fvh = (float)vid.height;
@@ -964,6 +954,20 @@ void HWR_DrawFill(INT32 x, INT32 y, INT32 w, INT32 h, INT32 color)
#endif #endif
#ifndef USE_PNG #ifndef USE_PNG
typedef struct
{
UINT8 id_field_length ; // 1
UINT8 color_map_type ; // 2
UINT8 image_type ; // 3
UINT8 dummy[5] ; // 4, 8
INT16 x_origin ; // 9, 10
INT16 y_origin ; //11, 12
INT16 width ; //13, 14
INT16 height ; //15, 16
UINT8 image_pix_size ; //17
UINT8 image_descriptor; //18
} ATTRPACK TGAHeader; // sizeof is 18
// -------------------------------------------------------------------------- // --------------------------------------------------------------------------
// save screenshots with TGA format // save screenshots with TGA format
// -------------------------------------------------------------------------- // --------------------------------------------------------------------------
+6 -1
View File
@@ -32,8 +32,12 @@ void GL_SetSpecialState(hwdspecialstate_t IdState, INT32 Value);
void GL_SetTransform(FTransform *stransform); void GL_SetTransform(FTransform *stransform);
void GL_SetBlend(FBITFIELD PolyFlags); void GL_SetBlend(FBITFIELD PolyFlags);
void GL_SetPalette(RGBA_t *palette); void GL_SetPalette(RGBA_t *palette);
void GL_ClearBuffer(FBOOLEAN ColorMask, FBOOLEAN DepthMask, FBOOLEAN StencilMask, FRGBAFloat * ClearColor); void GL_ClearBuffer(FBOOLEAN ColorMask, FBOOLEAN DepthMask, FBOOLEAN StencilMask, FRGBAFloat * ClearColor);
void GL_EnableStencilTest(void);
void GL_DisableStencilTest(void);
void GL_DrawPolygon(FSurfaceInfo *pSurf, FOutVector *pOutVerts, FUINT iNumPts, FBITFIELD PolyFlags); void GL_DrawPolygon(FSurfaceInfo *pSurf, FOutVector *pOutVerts, FUINT iNumPts, FBITFIELD PolyFlags);
void GL_DrawIndexedTriangles(FSurfaceInfo *pSurf, FOutVector *pOutVerts, FUINT iNumPts, FBITFIELD PolyFlags, unsigned int *IndexArray); void GL_DrawIndexedTriangles(FSurfaceInfo *pSurf, FOutVector *pOutVerts, FUINT iNumPts, FBITFIELD PolyFlags, unsigned int *IndexArray);
void GL_Draw2DLine(F2DCoord *v1, F2DCoord *v2, RGBA_t Color); void GL_Draw2DLine(F2DCoord *v1, F2DCoord *v2, RGBA_t Color);
@@ -63,7 +67,7 @@ void GL_FlushScreenTextures(void);
void GL_DrawScreenTexture(int tex, FSurfaceInfo *surf, FBITFIELD polyflags); void GL_DrawScreenTexture(int tex, FSurfaceInfo *surf, FBITFIELD polyflags);
void GL_DoScreenWipe(int wipeStart, int wipeEnd); void GL_DoScreenWipe(int wipeStart, int wipeEnd);
void GL_RenderVhsEffect(fixed_t upbary, fixed_t downbary, UINT8 updistort, UINT8 downdistort, UINT8 barsize); void GL_RenderVhsEffect(fixed_t upbary, fixed_t downbary, UINT8 updistort, UINT8 downdistort, UINT8 barsize);
void GL_DrawScreenFinalTexture(int tex, INT32 width, INT32 height, boolean useshader); void GL_DrawScreenFinalTexture(int tex, INT32 width, INT32 height);
void GL_PostImgRedraw(float points[SCREENVERTS][SCREENVERTS][2]); void GL_PostImgRedraw(float points[SCREENVERTS][SCREENVERTS][2]);
@@ -72,6 +76,7 @@ void GL_LoadShader(int slot, char *code, hwdshaderstage_t stage);
boolean GL_CompileShader(int slot); boolean GL_CompileShader(int slot);
void GL_SetShader(int slot); void GL_SetShader(int slot);
void GL_UnSetShader(void); void GL_UnSetShader(void);
void GL_EnableShader(void);
void GL_SetShaderInfo(hwdshaderinfo_t info, INT32 value); void GL_SetShaderInfo(hwdshaderinfo_t info, INT32 value);
+2 -2
View File
@@ -34,8 +34,8 @@ typedef struct gl_vissprite_s
float gz, gzt; float gz, gzt;
float tz; float tz;
float scale; float scale;
float spritexscale, spriteyscale; //float spritexscale, spriteyscale;
float spritexoffset, spriteyoffset; //float spritexoffset, spriteyoffset;
patch_t *gpatch; patch_t *gpatch;
boolean flip; boolean flip;
UINT8 translucency; //alpha level 0-255 UINT8 translucency; //alpha level 0-255
+30 -25
View File
@@ -258,9 +258,7 @@ static void CV_screentextures_OnChange(void)
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 intermissionbginit = false;
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();
@@ -277,6 +275,7 @@ static void CV_glframebuffer_OnChange(void)
I_DownSample(); I_DownSample();
RefreshOGLSDLSurface(); RefreshOGLSDLSurface();
M_UpdateOGLMenu(); M_UpdateOGLMenu();
intermissionbginit = false;
} }
#endif #endif
@@ -512,7 +511,7 @@ static FUINT HWR_CalcWallLight(FUINT lightnum, seg_t *seg, extracolormap_t *colo
{ {
INT16 finallight = lightnum; INT16 finallight = lightnum;
if (cv_glfakecontrast.value == 0 || (HWR_ShouldUsePaletteRendering() && colormap)) if (cv_glfakecontrast.value == 0 || (colormap && HWR_ShouldUsePaletteRendering()))
return (FUINT)finallight; return (FUINT)finallight;
if (seg != NULL && P_ApplyLightOffsetFine(lightnum, seg->frontsector)) if (seg != NULL && P_ApplyLightOffsetFine(lightnum, seg->frontsector))
@@ -2674,7 +2673,7 @@ static void HWR_RenderPolyObjectPlane(polyobj_t *polysector, boolean isceiling,
float anglef = 0.0f, cosangf = 0.0f, sinangf = 0.0f; float anglef = 0.0f, cosangf = 0.0f, sinangf = 0.0f;
angle_t angle = 0; angle_t angle = 0;
FSurfaceInfo Surf = {}; FSurfaceInfo Surf = {};
fixed_t tempxsow, tempytow; float tempxsow, tempytow;
size_t nrPlaneVerts; size_t nrPlaneVerts;
static FOutVector *planeVerts = NULL; static FOutVector *planeVerts = NULL;
@@ -3802,7 +3801,7 @@ static void HWR_SplitSprite(gl_vissprite_t *spr, const boolean papersprite)
{ {
const fixed_t h = P_GetLightZAt(&sector->lightlist[i], sprmo->x, sprmo->y); const fixed_t h = P_GetLightZAt(&sector->lightlist[i], sprmo->x, sprmo->y);
if (!(h <= temp)) if (h > temp)
continue; continue;
if (!lightset) if (!lightset)
@@ -3864,7 +3863,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 && !cv_glshearing.value && !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;
@@ -3937,7 +3936,7 @@ static void HWR_DrawSprite(gl_vissprite_t *spr)
mobj_t *sprmo = spr->mobj; mobj_t *sprmo = spr->mobj;
if (UNLIKELY(!sprmo->subsector)) if (!sprmo->subsector)
return; return;
const boolean papersprite = (sprmo->frame & FF_PAPERSPRITE); const boolean papersprite = (sprmo->frame & FF_PAPERSPRITE);
@@ -4101,7 +4100,7 @@ static void HWR_DrawPrecipitationSprite(gl_vissprite_t *spr)
const precipmobj_t *sprmo = spr->precip; const precipmobj_t *sprmo = spr->precip;
if (UNLIKELY(!sprmo->subsector)) if (!sprmo->subsector)
return; return;
// cache sprite graphics // cache sprite graphics
@@ -4301,22 +4300,23 @@ static std::vector<gl_drawnode_t> drawnodes;
static void *HWR_CreateDrawNode(gl_drawnode_type_t type) static void *HWR_CreateDrawNode(gl_drawnode_type_t type)
{ {
// if we didnt alloc anything yet, reserve atleast 64 nodes gl_drawnode_t *drawnode;
// dont declare with it as we want our size to be 0!
drawnodes.reserve(DRAWNODES_INIT_SIZE); drawnodes.reserve(DRAWNODES_INIT_SIZE);
drawnodes.emplace_back(); drawnodes.emplace_back();
drawnodes.back().type = type;
drawnode = &drawnodes.back();
drawnode->type = type;
// not sure if returning different pointers to a union is necessary // not sure if returning different pointers to a union is necessary
switch (type) switch (type)
{ {
case DRAWNODE_PLANE: case DRAWNODE_PLANE:
return &drawnodes.back().u.plane; return &drawnode->u.plane;
case DRAWNODE_POLYOBJECT_PLANE: case DRAWNODE_POLYOBJECT_PLANE:
return &drawnodes.back().u.polyplane; return &drawnode->u.polyplane;
case DRAWNODE_WALL: case DRAWNODE_WALL:
return &drawnodes.back().u.wall; return &drawnode->u.wall;
} }
return NULL; return NULL;
@@ -4383,9 +4383,7 @@ static int CompareDrawNodePlanes(const void *p1, const void *p2)
static void HWR_RenderDrawNodes(void) static void HWR_RenderDrawNodes(void)
{ {
size_t i = 0, run_start = 0; size_t i = 0, run_start = 0;
static std::vector<INT32> sortindex; static std::vector<INT32> sortindex(DRAWNODES_INIT_SIZE);
sortindex.reserve(DRAWNODES_INIT_SIZE);
// Array for storing the rendering order. // Array for storing the rendering order.
// A list of indices into the drawnodes array. // A list of indices into the drawnodes array.
@@ -4820,11 +4818,9 @@ static void HWR_ProjectSprite(mobj_t *thing)
) )
{ {
ang = R_PointToAngle(interp.x, interp.y); ang = R_PointToAngle(interp.x, interp.y);
#ifdef ROTSPRITE #ifdef ROTSPRITE
camang = ang; camang = ang;
#endif #endif
ang -= interp.angle; ang -= interp.angle;
if (mirrored) if (mirrored)
@@ -5010,10 +5006,10 @@ static void HWR_ProjectSprite(mobj_t *thing)
vis->flip = flip; vis->flip = flip;
vis->scale = thing_scale; vis->scale = thing_scale;
vis->spritexscale = spritexscale; /*vis->spritexscale = spritexscale;
vis->spriteyscale = spriteyscale; vis->spriteyscale = spriteyscale;
vis->spritexoffset = FixedToFloat(spr_offset); vis->spritexoffset = FixedToFloat(spr_offset);
vis->spriteyoffset = FixedToFloat(spr_topoffset); vis->spriteyoffset = FixedToFloat(spr_topoffset);*/
#ifdef ROTSPRITE #ifdef ROTSPRITE
if (rotsprite != NULL) if (rotsprite != NULL)
@@ -5284,7 +5280,6 @@ void HWR_ClearSkyDome(void)
sky->loops = NULL; sky->loops = NULL;
sky->data = NULL; sky->data = NULL;
sky->vbo = 0;
sky->rows = sky->columns = 0; sky->rows = sky->columns = 0;
sky->loopcount = 0; sky->loopcount = 0;
@@ -5696,6 +5691,12 @@ extern "C" {
// ========================================================================== // ==========================================================================
static void HWR_RenderFrame(boolean skybox, boolean drawsky) static void HWR_RenderFrame(boolean skybox, boolean drawsky)
{ {
// NetUpdate below may cause this to be false midrender if toggled
const boolean useportals = HWR_UsePortals();
if (useportals)
GL_EnableStencilTest();
// Clear view, set viewport (glViewport), set perspective... // Clear view, set viewport (glViewport), set perspective...
HWR_ClearView(); HWR_ClearView();
@@ -5721,11 +5722,14 @@ static void HWR_RenderFrame(boolean skybox, boolean drawsky)
NetUpdate(); NetUpdate();
portalclipline = NULL; portalclipline = NULL;
if (UNLIKELY(HWR_UsePortals())) if (useportals)
HWR_RenderViewpoint<RenderViewpointType::kPortal>(NULL, 0, !skybox); HWR_RenderViewpoint<RenderViewpointType::kPortal>(NULL, 0, !skybox);
else else
HWR_RenderViewpoint<RenderViewpointType::kNormal>(NULL, 0, !skybox); HWR_RenderViewpoint<RenderViewpointType::kNormal>(NULL, 0, !skybox);
if (useportals)
GL_DisableStencilTest();
// Check for new console commands. // Check for new console commands.
NetUpdate(); NetUpdate();
} }
@@ -6092,7 +6096,8 @@ static void HWR_DoPostProcessor(void)
} }
} }
if (cv_glscreentextures.value != 2) // screen textures are needed for the rest of the effects // screen textures are needed for the rest of the effects
if (cv_glscreentextures.value != 2)
return; return;
// Not supported in splitscreen - someone want to add support? // Not supported in splitscreen - someone want to add support?
+2 -2
View File
@@ -161,9 +161,9 @@ FUNCINLINE static ATTRINLINE void HWR_MakeScreenFinalTexture(void)
GL_MakeScreenTexture(HWD_SCREENTEXTURE_GENERIC2); GL_MakeScreenTexture(HWD_SCREENTEXTURE_GENERIC2);
} }
FUNCINLINE static ATTRINLINE void HWR_DrawScreenFinalTexture(INT32 width, INT32 height, boolean useshader) FUNCINLINE static ATTRINLINE void HWR_DrawScreenFinalTexture(INT32 width, INT32 height)
{ {
GL_DrawScreenFinalTexture(HWD_SCREENTEXTURE_GENERIC2, width, height, useshader); GL_DrawScreenFinalTexture(HWD_SCREENTEXTURE_GENERIC2, width, height);
} }
// hw_main.c: Segs // hw_main.c: Segs
+3 -4
View File
@@ -154,7 +154,7 @@ model_t *MD3_LoadModel(const char *fileName, int ztag, boolean useFloat)
char *buffer; char *buffer;
int surfEnd; int surfEnd;
int i, t; int i, t;
int matCount; //int matCount;
FILE *f; FILE *f;
if (!latlnginit) if (!latlnginit)
@@ -227,7 +227,7 @@ model_t *MD3_LoadModel(const char *fileName, int ztag, boolean useFloat)
retModel->meshes = (mesh_t*)Z_Calloc(sizeof(mesh_t)*retModel->numMeshes, ztag, NULL); retModel->meshes = (mesh_t*)Z_Calloc(sizeof(mesh_t)*retModel->numMeshes, ztag, NULL);
matCount = 0; //matCount = 0;
for (i = 0, surfEnd = 0; i < mdh->numSurfaces; i++) for (i = 0, surfEnd = 0; i < mdh->numSurfaces; i++)
{ {
int j; int j;
@@ -237,7 +237,7 @@ model_t *MD3_LoadModel(const char *fileName, int ztag, boolean useFloat)
mdShader = (md3Shader*)((char*)mdS + mdS->offsetShaders); mdShader = (md3Shader*)((char*)mdS + mdS->offsetShaders);
for (j = 0; j < mdS->numShaders; j++, matCount++) for (j = 0; j < mdS->numShaders; j++ /*, matCount++*/)
{ {
size_t len = strlen(mdShader[j].name); size_t len = strlen(mdShader[j].name);
mdShader[j].name[len-1] = 'z'; mdShader[j].name[len-1] = 'z';
@@ -503,7 +503,6 @@ model_t *MD3_LoadModel(const char *fileName, int ztag, boolean useFloat)
} }
}*/ }*/
free(buffer); free(buffer);
return retModel; return retModel;
+35 -16
View File
@@ -1068,6 +1068,13 @@ void GL_SetShader(int slot)
gl_shadersenabled = false; gl_shadersenabled = false;
} }
void GL_EnableShader(void)
{
// we can just use GL_Shader_SetUniforms as itll enable the shader for us
// and handle any failures
GL_Shader_SetUniforms(NULL, NULL, NULL, NULL);
}
void GL_UnSetShader(void) void GL_UnSetShader(void)
{ {
if (gl_shadersenabled) // don't repeatedly call glUseProgram if not needed if (gl_shadersenabled) // don't repeatedly call glUseProgram if not needed
@@ -1277,7 +1284,7 @@ void GL_SetStates(void)
pglColorMask(GL_TRUE, GL_TRUE, GL_TRUE, GL_TRUE); pglColorMask(GL_TRUE, GL_TRUE, GL_TRUE, GL_TRUE);
pglEnable(GL_STENCIL_TEST); pglDisable(GL_STENCIL_TEST);
pglEnable(GL_DEPTH_TEST); // check the depth buffer pglEnable(GL_DEPTH_TEST); // check the depth buffer
pglDepthMask(GL_TRUE); // enable writing to depth buffer pglDepthMask(GL_TRUE); // enable writing to depth buffer
pglClearDepth(1.0f); pglClearDepth(1.0f);
@@ -1307,6 +1314,16 @@ void GL_SetStates(void)
#endif #endif
} }
void GL_EnableStencilTest(void)
{
pglEnable(GL_STENCIL_TEST);
}
void GL_DisableStencilTest(void)
{
pglDisable(GL_STENCIL_TEST);
}
// -----------------+ // -----------------+
// DeleteTexture : Deletes a texture from the GPU and frees its data // DeleteTexture : Deletes a texture from the GPU and frees its data
// -----------------+ // -----------------+
@@ -3243,14 +3260,6 @@ static void GL_Framebuffer_Generate(void)
if (!framebufferobject.fboobj) if (!framebufferobject.fboobj)
pglGenFramebuffers(1, &framebufferobject.fboobj); pglGenFramebuffers(1, &framebufferobject.fboobj);
if (pglCheckFramebufferStatus(GL_FRAMEBUFFER_EXT) != GL_FRAMEBUFFER_COMPLETE_EXT)
{
// if this fails, dont retry it a gazillion times
// this wouldnt recover
supportFBO = false;
return;
}
// Bind the framebuffer // Bind the framebuffer
pglBindFramebuffer(GL_FRAMEBUFFER_EXT, framebufferobject.fboobj); pglBindFramebuffer(GL_FRAMEBUFFER_EXT, framebufferobject.fboobj);
@@ -3302,6 +3311,18 @@ static void GL_Framebuffer_Generate(void)
pglBindRenderbuffer(GL_RENDERBUFFER_EXT, 0); pglBindRenderbuffer(GL_RENDERBUFFER_EXT, 0);
} }
if (pglCheckFramebufferStatus(GL_FRAMEBUFFER_EXT) != GL_FRAMEBUFFER_COMPLETE_EXT)
{
//pglGetError(); TODO:implement this or smth
GL_MSG_Error("GL_Framebuffer_Generate: Failed to create Framebuffer Object");
// if this fails, dont retry it a gazillion times
// this wouldnt recover
supportFBO = false;
pglBindFramebuffer(GL_FRAMEBUFFER_EXT, 0);
return;
}
// Unbind the framebuffer // Unbind the framebuffer
pglBindFramebuffer(GL_FRAMEBUFFER_EXT, 0); pglBindFramebuffer(GL_FRAMEBUFFER_EXT, 0);
@@ -3324,6 +3345,10 @@ void GL_Framebuffer_Enable(void)
GL_Framebuffer_Generate(); GL_Framebuffer_Generate();
// failed
if (!supportFBO || !framebufferobject.init)
return;
pglBindFramebuffer(GL_FRAMEBUFFER_EXT, framebufferobject.fboobj); pglBindFramebuffer(GL_FRAMEBUFFER_EXT, framebufferobject.fboobj);
pglBindRenderbuffer(GL_RENDERBUFFER_EXT, framebufferobject.rboobj); pglBindRenderbuffer(GL_RENDERBUFFER_EXT, framebufferobject.rboobj);
} }
@@ -3718,7 +3743,7 @@ void GL_MakeScreenTexture(int tex)
tex_downloaded = screenTextures[tex]; tex_downloaded = screenTextures[tex];
} }
void GL_DrawScreenFinalTexture(int tex, INT32 width, INT32 height, boolean useshader) void GL_DrawScreenFinalTexture(int tex, INT32 width, INT32 height)
{ {
float xfix, yfix; float xfix, yfix;
float origaspect, newaspect; float origaspect, newaspect;
@@ -3771,9 +3796,6 @@ void GL_DrawScreenFinalTexture(int tex, INT32 width, INT32 height, boolean usesh
pglBindTexture(GL_TEXTURE_2D, screenTextures[tex]); pglBindTexture(GL_TEXTURE_2D, screenTextures[tex]);
if (useshader)
pglUseProgram(gl_shaders[SHADER_PALETTE_POSTPROCESS].program); // Final postprocess step of palette rendering, after everything else has been drawn.
pglColor4ubv(white); pglColor4ubv(white);
pglTexCoordPointer(2, GL_FLOAT, 0, fix); pglTexCoordPointer(2, GL_FLOAT, 0, fix);
@@ -3781,9 +3803,6 @@ void GL_DrawScreenFinalTexture(int tex, INT32 width, INT32 height, boolean usesh
pglDrawArrays(GL_TRIANGLE_FAN, 0, 4); pglDrawArrays(GL_TRIANGLE_FAN, 0, 4);
if (useshader)
pglUseProgram(0);
tex_downloaded = screenTextures[tex]; tex_downloaded = screenTextures[tex];
} }
+2 -156
View File
@@ -115,155 +115,8 @@ static patch_t *songcreditbg = NULL;
// ------- // -------
static void HU_DrawRankings(void); static void HU_DrawRankings(void);
consvar_t cv_showspecstuff = {"showspecstuff", "No", CV_SAVE, CV_YesNo, NULL, 0, NULL, NULL, 0, 0, NULL}; consvar_t cv_showspecstuff = {"showspecstuff", "No", CV_SAVE, CV_YesNo, NULL, 0, NULL, NULL, 0, 0, NULL};
//======================================================================
// KEYBOARD LAYOUTS FOR ENTERING TEXT
//======================================================================
char *shiftxform = NULL;
char english_shiftxform[] =
{
0,
1, 2, 3, 4, 5, 6, 7, 8, 9, 10,
11, 12, 13, 14, 15, 16, 17, 18, 19, 20,
21, 22, 23, 24, 25, 26, 27, 28, 29, 30,
31,
' ', '!', '"', '#', '$', '%', '&',
'"', // shift-'
'(', ')', '*', '+',
'<', // shift-,
'_', // shift--
'>', // shift-.
'?', // shift-/
')', // shift-0
'!', // shift-1
'@', // shift-2
'#', // shift-3
'$', // shift-4
'%', // shift-5
'^', // shift-6
'&', // shift-7
'*', // shift-8
'(', // shift-9
':',
':', // shift-;
'<',
'+', // shift-=
'>', '?', '@',
'A', 'B', 'C', 'D', 'E', 'F', 'G', 'H', 'I', 'J', 'K', 'L', 'M', 'N',
'O', 'P', 'Q', 'R', 'S', 'T', 'U', 'V', 'W', 'X', 'Y', 'Z',
'{', // shift-[
'|', // shift-backslash - OH MY GOD DOES WATCOM SUCK
'}', // shift-]
'"', '_',
'~', // shift-`
'A', 'B', 'C', 'D', 'E', 'F', 'G', 'H', 'I', 'J', 'K', 'L', 'M', 'N',
'O', 'P', 'Q', 'R', 'S', 'T', 'U', 'V', 'W', 'X', 'Y', 'Z',
'{', '|', '}', '~', 127
};
char french_shiftxform[] =
{
0,
1, 2, 3, 4, 5, 6, 7, 8, 9, 10,
11, 12, 13, 14, 15, 16, 17, 18, 19, 20,
21, 22, 23, 24, 25, 26, 27, 28, 29, 30,
31,
' ','$', //shift-!
'3', //shift-"
'#', '$', '%',
'1', //shift-&
'4', // shift-'
'5', // shift-(
')', // shift-)
'*', '+',
'?', // shift-,
'6', // shift--
'.', '/',
'0', '1', '2', '3', '4', '5',
'6', '7', '8', '9',
'/', // shitf-:
'.', // shift-;
'>', // shift-<
'+', // shift-=
'>', '?', '@',
'A', 'B', 'C', 'D', 'E', 'F', 'G', 'H', 'I', 'J', 'K', 'L', 'M', 'N',
'O', 'P', 'Q', 'R', 'S', 'T', 'U', 'V', 'W', 'X', 'Y', 'Z',
'[', '\\', ']', '^',
'8', //shift-_
'`',
'A', 'B', 'C', 'D', 'E', 'F', 'G', 'H', 'I', 'J', 'K', 'L', 'M', 'N',
'O', 'P', 'Q', 'R', 'S', 'T', 'U', 'V', 'W', 'X', 'Y', 'Z',
'{', '|', '}', '~', 127,
128, 129,
'2',
131, 132,
'0',
134,
'9',
136, 137,
'7',
139, 140,
'%'
};
char french_altgrxform[] =
{
0,
1, 2, 3, 4, 5, 6, 7, 8, 9, 10,
11, 12, 13, 14, 15, 16, 17, 18, 19, 20,
21, 22, 23, 24, 25, 26, 27, 28, 29, 30,
31,
' ', '!',
'#', //altgr-"
'#', '$', '%', '&',
'{', //altgr-'
'[', //altgr-(
']', //altgr-)
'*', '+', ',',
'|', //altg--
'.', '/',
'0', '1', '2', '3', '4', '5',
'6', '7', '8', '9',
':', ';', '<',
'}', //altgr-=
'>', '?', '@',
'A', 'B', 'C', 'D', 'E', 'F', 'G', 'H', 'I', 'J', 'K', 'L', 'M', 'N',
'O', 'P', 'Q', 'R', 'S', 'T', 'U', 'V', 'W', 'X', 'Y', 'Z',
'[', '\\', ']', '^',
'\\', //altgr-backslash
'`',
'a', 'b', 'c', 'd', 'E', 'f', 'g', 'h', 'i', 'j', 'k', 'l', 'm', 'n',
'o', 'p', 'q', 'r', 's', 't', 'u', 'v', 'w', 'x', 'y', 'z',
'{', '|', '}', '~', 127,
128, 129,
'~',
131, 132,
'@',
134,
'^',
136, 137,
'`',
139, 140,
KEY_FR_U_GRAVE
};
//fallback for special letter non displayable in the game (i.e.: 'é','à',etc.)
INT32 HU_FallBackFrSpecialLetter(INT32 key)
{
switch(key){
case KEY_FR_E_AIGUE: return 'e';
case KEY_FR_E_GRAVE: return 'e';
case KEY_FR_C_CEDILLE: return 'c';
case KEY_FR_A_GRAVE: return 'a';
case KEY_FR_U_GRAVE: return 'u';
default: return key;
}
}
static char cechotext[1024]; static char cechotext[1024];
static tic_t cechotimer = 0; static tic_t cechotimer = 0;
static tic_t cechoduration = 5*TICRATE; static tic_t cechoduration = 5*TICRATE;
@@ -407,9 +260,6 @@ void HU_Init(void)
COM_AddCommand("csay", Command_CSay_f); COM_AddCommand("csay", Command_CSay_f);
RegisterNetXCmd(XD_SAY, Got_Saycmd); RegisterNetXCmd(XD_SAY, Got_Saycmd);
// set shift translation table
shiftxform = english_shiftxform;
if (dedicated || rendermode == render_none) if (dedicated || rendermode == render_none)
return; return;
@@ -435,11 +285,6 @@ void HU_Start(void)
headsupactive = true; headsupactive = true;
} }
void HU_Shiftform(void)
{
shiftxform = (cv_keyboardlayout.value == 3) ? french_shiftxform : english_shiftxform;
}
//====================================================================== //======================================================================
// EXECUTION // EXECUTION
//====================================================================== //======================================================================
@@ -1134,7 +979,8 @@ void HU_Ticker(void)
} }
} }
if (cechotimer > 0) --cechotimer; if (cechotimer > 0)
--cechotimer;
// Animate the desynch dots // Animate the desynch dots
if (hu_resynching if (hu_resynching
-13
View File
@@ -42,15 +42,6 @@
#define CRED_FONTEND 'Z' // the last font character #define CRED_FONTEND 'Z' // the last font character
#define CRED_FONTSIZE (CRED_FONTEND - CRED_FONTSTART + 1) #define CRED_FONTSIZE (CRED_FONTEND - CRED_FONTSTART + 1)
extern char *shiftxform; // english translation shift table
extern char english_shiftxform[];
extern char french_shiftxform[];
extern char french_altgrxform[];
//fallback for special letter non displayable in the game (i.e.: 'é','à',etc.)
INT32 HU_FallBackFrSpecialLetter(INT32 key);
//------------------------------------ //------------------------------------
// sorted player lines // sorted player lines
//------------------------------------ //------------------------------------
@@ -105,8 +96,6 @@ void HU_LoadGraphics(void);
// reset heads up when consoleplayer respawns. // reset heads up when consoleplayer respawns.
void HU_Start(void); void HU_Start(void);
void HU_Shiftform(void);
boolean HU_Responder(event_t *ev); boolean HU_Responder(event_t *ev);
void HU_Ticker(void); void HU_Ticker(void);
void HU_TickSongCredits(void); void HU_TickSongCredits(void);
@@ -115,8 +104,6 @@ void HU_Drawer(void);
char HU_dequeueChatChar(void); char HU_dequeueChatChar(void);
void HU_clearChatChars(void); void HU_clearChatChars(void);
void HU_drawPlayerPing(INT32 x, INT32 y, INT32 pnum, INT32 flags); // Lat': Ping drawer for scoreboard. void HU_drawPlayerPing(INT32 x, INT32 y, INT32 pnum, INT32 flags); // Lat': Ping drawer for scoreboard.
//void HU_DrawTeamTabRankings(playersort_t *tab, INT32 whiteplayer);
//void HU_DrawDualTabRankings(INT32 x, INT32 y, playersort_t *tab, INT32 scorelines, INT32 whiteplayer);
void HU_DrawTabRankings(INT32 x, INT32 y, playersort_t *tab, INT32 scorelines, INT32 hilicol); void HU_DrawTabRankings(INT32 x, INT32 y, playersort_t *tab, INT32 scorelines, INT32 hilicol);
void HU_DrawEmeralds(INT32 x, INT32 y, INT32 pemeralds); void HU_DrawEmeralds(INT32 x, INT32 y, INT32 pemeralds);
const char *HU_SkinColorToConsoleColor(skincolors_t color); const char *HU_SkinColorToConsoleColor(skincolors_t color);
+2
View File
@@ -148,6 +148,8 @@ extern INT32 numcontrollers;
*/ */
const char *I_GetJoyName(INT32 joyindex); const char *I_GetJoyName(INT32 joyindex);
void I_SetJoystickFocus(void);
boolean I_GamepadHasLED(INT32 playernum); boolean I_GamepadHasLED(INT32 playernum);
boolean I_GamepadHasRumble(INT32 playernum); boolean I_GamepadHasRumble(INT32 playernum);
+3
View File
@@ -392,6 +392,9 @@ static const char *SOCK_GetNodeAddress(INT32 node)
if (node == 0) if (node == 0)
return "self"; return "self";
if (node < 0 || node > MAXNETNODES)
return NULL;
if (!nodeconnected[node]) if (!nodeconnected[node])
return NULL; return NULL;
+54 -104
View File
@@ -274,7 +274,6 @@ void K_RegisterKartHudStuff(void)
// Smol speedo // Smol speedo
static patch_t *skp_smallsticker = NULL; static patch_t *skp_smallsticker = NULL;
static patch_t *skp_smallsticker3 = NULL;
static patch_t *skp_speedpatches[5] = {NULL}; static patch_t *skp_speedpatches[5] = {NULL};
@@ -312,7 +311,6 @@ static patch_t *kp_bumperstickerwideclr = NULL;
static patch_t *kp_karmastickerclr = NULL; static patch_t *kp_karmastickerclr = NULL;
static patch_t *kp_timeoutstickerclr = NULL; static patch_t *kp_timeoutstickerclr = NULL;
static patch_t *skp_smallstickerclr = NULL; static patch_t *skp_smallstickerclr = NULL;
static patch_t *skp_smallstickerclr3 = NULL;
static patch_t *kp_itemmulstickerclr[2] = {NULL}; static patch_t *kp_itemmulstickerclr[2] = {NULL};
static patch_t *kp_itembgclr[4] = {NULL}; static patch_t *kp_itembgclr[4] = {NULL};
@@ -478,11 +476,6 @@ static void K_LoadSaturnHUDGraphics(void)
skp_smallstickerclr = (patch_t *)W_CachePatchName("SC_SMSTC", PU_HUDGFX); skp_smallstickerclr = (patch_t *)W_CachePatchName("SC_SMSTC", PU_HUDGFX);
} }
if (xtra_speedo_clr3)
{
skp_smallstickerclr3 = (patch_t *)W_CachePatchName("SC_SM3TC", PU_HUDGFX);
}
if (achi_speedo_clr) if (achi_speedo_clr)
{ {
skp_smallstickerachiclr = (patch_t *)W_CachePatchName("SC_AMSTC", PU_HUDGFX); skp_smallstickerachiclr = (patch_t *)W_CachePatchName("SC_AMSTC", PU_HUDGFX);
@@ -537,14 +530,6 @@ static void K_LoadSaturnHUDGraphics(void)
kp_itemmulstickerclr[0] = (patch_t *)W_CachePatchName("K_ITMULC", PU_HUDGFX); kp_itemmulstickerclr[0] = (patch_t *)W_CachePatchName("K_ITMULC", PU_HUDGFX);
} }
} }
if (found_extra3_kart)
{
if (xtra_speedo3) // 80x11 patch scaled to size
{
skp_smallsticker3 = (patch_t *)W_CachePatchName("SP_SM3TC", PU_HUDGFX);
}
}
} }
// -- Kart patches -- // -- Kart patches --
@@ -879,7 +864,7 @@ void K_LoadKartHUDGraphics(void)
kp_yougotem = (patch_t *)W_CachePatchName("YOUGOTEM", PU_HUDGFX); kp_yougotem = (patch_t *)W_CachePatchName("YOUGOTEM", PU_HUDGFX);
if (found_extra_kart || found_extra2_kart || found_extra3_kart) if (found_extra_kart || found_extra2_kart)
K_LoadSaturnHUDGraphics(); K_LoadSaturnHUDGraphics();
} }
@@ -1149,7 +1134,6 @@ enum
SPEEDO_DIAL, SPEEDO_DIAL,
SPEEDO_PMETER, SPEEDO_PMETER,
SPEEDO_PMETERSMOL, SPEEDO_PMETERSMOL,
SPEEDO_EXTRA3,
}; };
static SINT8 K_GetSpeedometerStyle(void) static SINT8 K_GetSpeedometerStyle(void)
@@ -1164,8 +1148,6 @@ static SINT8 K_GetSpeedometerStyle(void)
return SPEEDO_PMETER; return SPEEDO_PMETER;
else if (cv_newspeedometer.value == 6 && kartz_speedo_smol) else if (cv_newspeedometer.value == 6 && kartz_speedo_smol)
return SPEEDO_PMETERSMOL; return SPEEDO_PMETERSMOL;
else if (cv_newspeedometer.value == 7 && xtra_speedo3)
return SPEEDO_EXTRA3;
else else
return SPEEDO_VANILLA; return SPEEDO_VANILLA;
} }
@@ -1183,8 +1165,6 @@ static boolean K_UseColorSpeedo(int speedostyle)
return achi_speedo_clr; return achi_speedo_clr;
case SPEEDO_DIAL: case SPEEDO_DIAL:
return dial_speedo_clr; return dial_speedo_clr;
case SPEEDO_EXTRA3:
return xtra_speedo_clr3;
default: default:
return false; return false;
} }
@@ -1196,7 +1176,6 @@ enum
GAUGE_SMALL, GAUGE_SMALL,
GAUGE_BIGNUM, GAUGE_BIGNUM,
GAUGE_NUMONLY, GAUGE_NUMONLY,
GAUGE_EXTRA,
}; };
static SINT8 K_GetDriftgaugeStyle(void) static SINT8 K_GetDriftgaugeStyle(void)
@@ -1209,8 +1188,6 @@ static SINT8 K_GetDriftgaugeStyle(void)
return GAUGE_SMALL; return GAUGE_SMALL;
else if (cv_driftgaugestyle.value == 3) else if (cv_driftgaugestyle.value == 3)
return GAUGE_BIGNUM; return GAUGE_BIGNUM;
else if (cv_driftgaugestyle.value == 5 && xtra_speedo3)
return GAUGE_EXTRA;
} }
// Fallback // Fallback
@@ -1362,10 +1339,12 @@ INT32 K_getMinimapTrans(void)
return -1; return -1;
if (timeinmap <= 113) if (timeinmap <= 113)
{
minimaptrans = ((((INT32)timeinmap) - 105)*minimaptrans)/(113-105); minimaptrans = ((((INT32)timeinmap) - 105)*minimaptrans)/(113-105);
if (!minimaptrans) if (!minimaptrans)
return -1; return -1;
}
return (10-minimaptrans)<<FF_TRANSSHIFT; return (10-minimaptrans)<<FF_TRANSSHIFT;
} }
@@ -1407,7 +1386,6 @@ static void K_drawKartStats(void)
{ {
case SPEEDO_EXTRA: case SPEEDO_EXTRA:
case SPEEDO_ACHII: case SPEEDO_ACHII:
case SPEEDO_EXTRA3:
spdoffset = -10; spdoffset = -10;
break; break;
case SPEEDO_DIAL: case SPEEDO_DIAL:
@@ -2183,8 +2161,9 @@ static boolean K_drawKartPositionFaces(void)
UINT8 *colormap; UINT8 *colormap;
ranklines = 0; ranklines = 0;
memset(completed, 0, sizeof (completed));
memset(rankplayer, 0, sizeof (rankplayer)); if (!LUA_HudEnabled(hud_minirankings))
return false; // Don't proceed but still return true for free play above if HUD is disabled.
for (i = 0; i < MAXPLAYERS; i++) for (i = 0; i < MAXPLAYERS; i++)
{ {
@@ -2199,8 +2178,7 @@ static boolean K_drawKartPositionFaces(void)
if (numplayersingame <= 1) if (numplayersingame <= 1)
return true; return true;
if (!LUA_HudEnabled(hud_minirankings)) memset(completed, 0, sizeof (completed));
return false; // Don't proceed but still return true for free play above if HUD is disabled.
for (j = 0; j < numplayersingame; j++) for (j = 0; j < numplayersingame; j++)
{ {
@@ -2257,6 +2235,7 @@ static boolean K_drawKartPositionFaces(void)
if (!playeringame[rankplayer[i]]) if (!playeringame[rankplayer[i]])
continue; continue;
if (player->spectator || !player->mo) if (player->spectator || !player->mo)
continue; continue;
@@ -2434,7 +2413,7 @@ void HU_DrawTabRankings(INT32 x, INT32 y, playersort_t *tab, INT32 scorelines, I
static boolean K_BigLap(void) static boolean K_BigLap(void)
{ {
return (cv_biglaps.value && (cv_numlaps.value > 9) && (K_UseColorHud() ? big_lap_color : big_lap) && (!stplyr->exiting)); return (cv_biglaps.value && (cv_numlaps.value > 9) && !stplyr->exiting && (K_UseColorHud() ? big_lap_color : big_lap));
} }
static void K_drawKartLaps(void) static void K_drawKartLaps(void)
@@ -2712,34 +2691,28 @@ static void K_drawKartSpeedometer(void)
V_DrawKartString(SPDM_X, SPDM_Y, V_HUDTRANS|splitflags, metric); V_DrawKartString(SPDM_X, SPDM_Y, V_HUDTRANS|splitflags, metric);
} }
else if (speedostyle == SPEEDO_EXTRA) // why bother if we dont? else if (speedostyle == SPEEDO_EXTRA || speedostyle == SPEEDO_ACHII) // why bother if we dont?
{ {
if (K_UseColorSpeedo(SPEEDO_EXTRA)) //Colourized hud patch_t *speedopat;
UINT8 *colormap = NULL;
if (K_UseColorSpeedo(speedostyle)) //Colourized hud
{ {
UINT8 *colormap = R_GetTranslationColormap(TC_DEFAULT, K_GetHudColor(), GTC_CACHE); colormap = R_GetTranslationColormap(TC_DEFAULT, K_GetHudColor(), GTC_CACHE);
V_DrawMappedPatch(SPDM_X + 1, SPDM_Y + 4, V_HUDTRANS|splitflags, skp_smallstickerclr, colormap);
speedopat = ((speedostyle == SPEEDO_EXTRA) ? skp_smallstickerclr : skp_smallstickerachiclr);
V_DrawMappedPatch(SPDM_X + 1, SPDM_Y + 4, V_HUDTRANS|splitflags, speedopat, colormap);
speedopat = ((speedostyle == SPEEDO_EXTRA) ? skp_speedpatches[cv_kartspeedometer.value] : skp_speedpatchesachiclr[cv_kartspeedometer.value]);
} }
else else
V_DrawScaledPatch(SPDM_X + 1, SPDM_Y + 4, V_HUDTRANS|splitflags, skp_smallsticker); {
speedopat = ((speedostyle == SPEEDO_EXTRA) ? skp_smallsticker : skp_smallstickerachi);
V_DrawScaledPatch(SPDM_X + 1, SPDM_Y + 4, V_HUDTRANS|splitflags, speedopat);
speedopat = ((speedostyle == SPEEDO_EXTRA) ? skp_speedpatches[cv_kartspeedometer.value] : skp_speedpatchesachi[cv_kartspeedometer.value]);
}
V_DrawRankNum(SPDM_X + 26, SPDM_Y + 4, V_HUDTRANS|splitflags, convSpeed[1], 3, NULL); V_DrawRankNum(SPDM_X + 26, SPDM_Y + 4, V_HUDTRANS|splitflags, convSpeed[1], 3, NULL);
V_DrawScaledPatch(SPDM_X + 31, SPDM_Y + 4, V_HUDTRANS|splitflags, skp_speedpatches[cv_kartspeedometer.value]); V_DrawMappedPatch(SPDM_X + 31, SPDM_Y + 4, V_HUDTRANS|splitflags, speedopat, colormap);
}
else if (speedostyle == SPEEDO_ACHII) // why bother if we dont?
{
if (K_UseColorSpeedo(SPEEDO_ACHII)) //Colourized hud
{
UINT8 *colormap = R_GetTranslationColormap(TC_DEFAULT, K_GetHudColor(), GTC_CACHE);
V_DrawMappedPatch(SPDM_X + 1, SPDM_Y + 4, V_HUDTRANS|splitflags, skp_smallstickerachiclr, colormap);
V_DrawRankNum(SPDM_X + 26, SPDM_Y + 4, V_HUDTRANS|splitflags, convSpeed[1], 3, NULL);
V_DrawMappedPatch(SPDM_X + 31, SPDM_Y + 4, V_HUDTRANS|splitflags, skp_speedpatchesachiclr[cv_kartspeedometer.value], colormap);
}
else
{
V_DrawScaledPatch(SPDM_X + 1, SPDM_Y + 4, V_HUDTRANS|splitflags, skp_smallstickerachi);
V_DrawRankNum(SPDM_X + 26, SPDM_Y + 4, V_HUDTRANS|splitflags, convSpeed[1], 3, NULL);
V_DrawScaledPatch(SPDM_X + 31, SPDM_Y + 4, V_HUDTRANS|splitflags, skp_speedpatchesachi[cv_kartspeedometer.value]);
}
} }
#ifdef ROTSPRITE #ifdef ROTSPRITE
else if (speedostyle == SPEEDO_DIAL) // why bother if we dont? else if (speedostyle == SPEEDO_DIAL) // why bother if we dont?
@@ -2752,45 +2725,35 @@ static void K_drawKartSpeedometer(void)
(K_UseColorSpeedo(SPEEDO_DIAL))); (K_UseColorSpeedo(SPEEDO_DIAL)));
} }
#endif #endif
else if (speedostyle == SPEEDO_EXTRA3) // why bother if we dont?
{
if (K_UseColorSpeedo(SPEEDO_EXTRA3)) //Colourized hud
{
UINT8 *colormap = R_GetTranslationColormap(TC_DEFAULT, K_GetHudColor(), GTC_CACHE);
V_DrawStretchyFixedPatch((SPDM_X-1)<<FRACBITS, (SPDM_Y + 5)<<FRACBITS, XTRA3PSCALE, XTRA3VSCALE, V_HUDTRANS|splitflags, skp_smallstickerclr3, colormap, 0);
}
else
V_DrawStretchyFixedPatch((SPDM_X-1)<<FRACBITS, (SPDM_Y + 5)<<FRACBITS, XTRA3PSCALE, XTRA3VSCALE, V_HUDTRANS|splitflags, skp_smallsticker3, NULL, 0);
V_DrawRankNum(SPDM_X + 26, SPDM_Y + 4, V_HUDTRANS|splitflags, convSpeed[1], 3, NULL);
V_DrawScaledPatch(SPDM_X + 31, SPDM_Y + 4, V_HUDTRANS|splitflags, skp_speedpatches[cv_kartspeedometer.value]);
}
// Kart Z speedo bullshit... // Kart Z speedo bullshit...
// Draw the Speed counter. // Draw the Speed counter.
else if ((speedostyle == SPEEDO_PMETER) || (speedostyle == SPEEDO_PMETERSMOL)) else if ((speedostyle == SPEEDO_PMETER) || (speedostyle == SPEEDO_PMETERSMOL))
{ {
fixed_t fuspeed = 0;
INT32 spdpatch = 0; INT32 spdpatch = 0;
static const INT32 speedIntervals[22] = {2, 5, 7, 10, 12, 15, 17, static const INT32 spdinterval[22] = { 2, 5, 7, 10,
20, 22, 25, 27, 30, 32, 12, 15, 17, 20,
35, 37, 40, 42, 45, 47, 22, 25, 27, 30,
50, 52, 55}; 32, 35, 37, 40,
42, 45, 47, 50,
52, 55};
fuspeed = FixedDiv(stplyr->speed, mapobjectscale)/FRACUNIT; const fixed_t spd = FixedDiv(stplyr->speed, mapobjectscale) / FRACUNIT;
if (spd > 54)
{
spdpatch = (leveltime & 4) ? 24 : 23;
}
else
{
for (INT32 i = 0; i < 22; ++i) for (INT32 i = 0; i < 22; ++i)
{ {
if (fuspeed < speedIntervals[i]) if (spd < spdinterval[i])
{ {
spdpatch = i; spdpatch = i;
break; break;
} }
} }
}
if (((fuspeed < 57 && fuspeed > 54) || (fuspeed < 60 && fuspeed > 56) || (fuspeed > 59)) && (leveltime & 4))
spdpatch = 24;
else if (((fuspeed < 57 && fuspeed > 54) || (fuspeed < 60 && fuspeed > 56) || (fuspeed > 59)) && !(leveltime & 4))
spdpatch = 23;
V_DrawScaledPatch(SPDM_X, SPDM_Y, V_HUDTRANS|splitflags, (speedostyle == SPEEDO_PMETER) ? kp_kartzspeedo[spdpatch] : kp_kartzspeedo_smol[spdpatch]); V_DrawScaledPatch(SPDM_X, SPDM_Y, V_HUDTRANS|splitflags, (speedostyle == SPEEDO_PMETER) ? kp_kartzspeedo[spdpatch] : kp_kartzspeedo_smol[spdpatch]);
} }
@@ -2819,7 +2782,7 @@ static void K_drawKartBumpersOrKarma(void)
{ {
const UINT8 speedostyle = K_GetSpeedometerStyle(); const UINT8 speedostyle = K_GetSpeedometerStyle();
if ((speedostyle == SPEEDO_EXTRA) || (speedostyle == SPEEDO_ACHII) || (speedostyle == SPEEDO_EXTRA3)) if ((speedostyle == SPEEDO_EXTRA) || (speedostyle == SPEEDO_ACHII))
fy += 5; fy += 5;
else else
fy += 7; fy += 7;
@@ -2911,10 +2874,12 @@ static boolean K_GetScreenCoords(vector2_t *vec, player_t *player, mobj_t *targe
x = (fixed_t)(viewangle - R_PointToAngle(targx, targy)); x = (fixed_t)(viewangle - R_PointToAngle(targx, targy));
distfact = FINECOSINE((x>>ANGLETOFINESHIFT) & FINEMASK); distfact = FINECOSINE((x>>ANGLETOFINESHIFT) & FINEMASK);
if (!distfact) distfact = 1; if (!distfact)
distfact = 1;
if (encoremode) if (encoremode)
x = -x; x = -x;
if (x < (fixed_t)ANGLE_270 || x > (fixed_t)ANGLE_90) if (x < (fixed_t)ANGLE_270 || x > (fixed_t)ANGLE_90)
return false; return false;
@@ -2996,7 +2961,7 @@ static boolean K_GetScreenCoords(vector2_t *vec, player_t *player, mobj_t *targe
if (stplyrnum > 0) if (stplyrnum > 0)
y = y + yres; y = y + yres;
} }
if (splitscreen >= 2) // 3P or 4P else if (splitscreen >= 2) // 3P or 4P
{ {
x = x>>1; x = x>>1;
y = y>>1; y = y>>1;
@@ -3056,9 +3021,11 @@ static void K_drawNameTags(void)
if (players[i].kartstuff[k_hyudorotimer]) // player is invisible if (players[i].kartstuff[k_hyudorotimer]) // player is invisible
continue; continue;
if (maxdistance) if (maxdistance)
{
distance = R_PointToDist(players[i].mo->x, players[i].mo->y); distance = R_PointToDist(players[i].mo->x, players[i].mo->y);
if (distance > maxdistance) if (distance > maxdistance)
continue; continue;
}
if (!P_CheckSightFast(stplyr->mo, players[i].mo)) if (!P_CheckSightFast(stplyr->mo, players[i].mo))
continue; continue;
@@ -3267,13 +3234,12 @@ static void K_drawDriftGauge(void)
if (!splitscreen && !camera->chase) if (!splitscreen && !camera->chase)
return; return;
if (forceshowhud) // i will skip the drift early return and you cant stop me!
goto skipcrap; // i will skip the drift early return and you cant stop me! if (!forceshowhud)
{
if (!stplyr->kartstuff[k_drift]) if (!stplyr->kartstuff[k_drift])
return; return;
}
skipcrap:
if (P_MobjWasRemoved(stplyr->mo)) if (P_MobjWasRemoved(stplyr->mo))
return; return;
@@ -3298,12 +3264,11 @@ skipcrap:
{ {
case GAUGE_DEFAULT: case GAUGE_DEFAULT:
case GAUGE_SMALL: case GAUGE_SMALL:
case GAUGE_EXTRA:
case GAUGE_BIGNUM: case GAUGE_BIGNUM:
{ {
patch_t *driftpatch = NULL; patch_t *driftpatch = NULL;
if (gaugestyle == GAUGE_DEFAULT || gaugestyle == GAUGE_BIGNUM || gaugestyle == GAUGE_EXTRA) if (gaugestyle == GAUGE_DEFAULT || gaugestyle == GAUGE_BIGNUM)
{ {
barx = basex - vid.dup*23; barx = basex - vid.dup*23;
BAR_WIDTH = vid.dup*47; BAR_WIDTH = vid.dup*47;
@@ -3316,20 +3281,6 @@ skipcrap:
bary = basey - vid.dup*2; bary = basey - vid.dup*2;
if (gaugestyle == GAUGE_EXTRA) // i hate hud code i hate hud code i hate hud code i hate hud code i hate hud code.....
{
if (K_UseColorSpeedo(SPEEDO_EXTRA3)) // We reuse the extra speedometer patch hence this check
{
colormap = R_GetTranslationColormap(TC_DEFAULT, K_GetHudColor(), GTC_CACHE);
driftpatch = skp_smallstickerclr3;
}
else
driftpatch = skp_smallsticker3;
V_DrawStretchyFixedPatch((basex - vid.dup*30)<<FRACBITS, ((basey<<FRACBITS) - FixedMul(vid.dup<<FRACBITS, 21*FRACUNIT/10)), XTRA3PSCALE, XTRA3VSCALE, V_NOSCALESTART|V_OFFSET|drifttrans, driftpatch, colormap, 0);
}
else
{
if (K_UseColorHud()) // Colourized hud if (K_UseColorHud()) // Colourized hud
{ {
colormap = R_GetTranslationColormap(TC_DEFAULT, K_GetHudColor(), GTC_CACHE); colormap = R_GetTranslationColormap(TC_DEFAULT, K_GetHudColor(), GTC_CACHE);
@@ -3339,7 +3290,6 @@ skipcrap:
driftpatch = (gaugestyle == GAUGE_SMALL ? driftgaugesmall : driftgauge); driftpatch = (gaugestyle == GAUGE_SMALL ? driftgaugesmall : driftgauge);
V_DrawMappedPatch(gaugestyle == GAUGE_SMALL ? basex + vid.dup*11 : basex, basey, V_NOSCALESTART|V_OFFSET|drifttrans, driftpatch, colormap); V_DrawMappedPatch(gaugestyle == GAUGE_SMALL ? basex + vid.dup*11 : basex, basey, V_NOSCALESTART|V_OFFSET|drifttrans, driftpatch, colormap);
}
if (driftcharge >= driftval*4) // rainbow sparks if (driftcharge >= driftval*4) // rainbow sparks
{ {
@@ -3637,7 +3587,7 @@ static void K_drawKartMinimapHead(mobj_t *mo, INT32 x, INT32 y, INT32 flags)
V_DrawCenteredSmallStringAtFixed(amxpos + (4*FRACUNIT), amypos - (3*FRACUNIT), V_ALLOWLOWERCASE|flags|V_SkinColorToHighlightcolor(mo->color), player_names[player - players]); V_DrawCenteredSmallStringAtFixed(amxpos + (4*FRACUNIT), amypos - (3*FRACUNIT), V_ALLOWLOWERCASE|flags|V_SkinColorToHighlightcolor(mo->color), player_names[player - players]);
} }
const boolean minihead = K_useSmallMinimapHead(mo->player); const boolean minihead = K_useSmallMinimapHead(player);
// thx wanted reticle for having weird offsets very cool // thx wanted reticle for having weird offsets very cool
wntdamxpos = minihead ? amxpos + (1<<FRACBITS) : amxpos - (4<<FRACBITS); wntdamxpos = minihead ? amxpos + (1<<FRACBITS) : amxpos - (4<<FRACBITS);
@@ -4498,7 +4448,7 @@ static void K_drawLapStartAnim(void)
char *lapnum = va("%02d", stplyr->laps + 1); char *lapnum = va("%02d", stplyr->laps + 1);
const size_t laplength = strlen(lapnum); const size_t laplength = strlen(lapnum);
for (int i = 0; i < (int)laplength; i++) for (size_t i = 0; i < laplength; i++)
{ {
int digit = lapnum[i] - '0'; int digit = lapnum[i] - '0';
int frame = min(2, progress/2 - 8 - (i*2)); int frame = min(2, progress/2 - 8 - (i*2));
+49 -30
View File
@@ -1600,10 +1600,9 @@ static UINT8 K_CheckOffroadCollide(mobj_t *mo)
sector_t *s2; // FOF sector shortcut sector_t *s2; // FOF sector shortcut
ffloor_t *rover; // FOF ffloor_t *rover; // FOF
fixed_t flr; fixed_t flr, cel; // floor & ceiling for height checks to make sure we're touching the offroad sector.
fixed_t cel; // floor & ceiling for height checks to make sure we're touching the offroad sector. INT32 special;
I_Assert(mo != NULL);
I_Assert(!P_MobjWasRemoved(mo)); I_Assert(!P_MobjWasRemoved(mo));
for (node = mo->touching_sectorlist; node; node = node->m_sectorlist_next) for (node = mo->touching_sectorlist; node; node = node->m_sectorlist_next)
@@ -1612,20 +1611,31 @@ static UINT8 K_CheckOffroadCollide(mobj_t *mo)
break; // shouldn't happen. break; // shouldn't happen.
s = node->m_sector; s = node->m_sector;
// 1: Check for the main sector, make sure we're on the floor of that sector and see if we can apply offroad. // 1: Check for the main sector, make sure we're on the floor of that sector and see if we can apply offroad.
// Make arbitrary Z checks because we want to check for 1 sector in particular, we don't want to affect the player if the offroad sector is way below them and they're lineriding a normal sector above. // Make arbitrary Z checks because we want to check for 1 sector in particular, we don't want to affect the player if the offroad sector is way below them and they're lineriding a normal sector above.
flr = P_MobjFloorZ(mo, s, s, mo->x, mo->y, NULL, false, true); special = GETSECSPECIAL(s->special, 1);
cel = P_MobjCeilingZ(mo, s, s, mo->x, mo->y, NULL, true, true); // get Z coords of both floors and ceilings for this sector (this accounts for slopes properly.)
// NOTE: we don't use P_GetZAt with our x/y directly because the mobj won't have the same height because of its hitbox on the slope. Complex garbage but tldr it doesn't work.
if ( ((s->flags & SF_FLIPSPECIAL_FLOOR) && mo->z == flr) // floor check
|| ((mo->eflags & MFE_VERTICALFLIP && (s->flags & SF_FLIPSPECIAL_CEILING) && (mo->z + mo->height) == cel)) ) // ceiling check.
for (i = 2; i < 5; i++) // check for sector special for (i = 2; i < 5; i++) // check for sector special
{
if (special != i)
continue;
if (GETSECSPECIAL(s->special, 1) == i) if (s->flags & SF_FLIPSPECIAL_FLOOR)
{
flr = P_MobjFloorZ(mo, s, s, mo->x, mo->y, NULL, false, true);
if (mo->z == flr) // floor check
return i-1; // return offroad type return i-1; // return offroad type
}
if (mo->eflags & MFE_VERTICALFLIP && (s->flags & SF_FLIPSPECIAL_CEILING))
{
cel = P_MobjCeilingZ(mo, s, s, mo->x, mo->y, NULL, true, true);
// NOTE: we don't use P_GetZAt with our x/y directly because the mobj won't have the same height because of its hitbox on the slope. Complex garbage but tldr it doesn't work.
if ((mo->z + mo->height) == cel) // ceiling check
return i-1; // return offroad type
}
}
// 2: If we're here, we haven't found anything. So let's try looking for FOFs in the sectors using the same logic. // 2: If we're here, we haven't found anything. So let's try looking for FOFs in the sectors using the same logic.
for (rover = s->ffloors; rover; rover = rover->next) for (rover = s->ffloors; rover; rover = rover->next)
@@ -1635,21 +1645,32 @@ static UINT8 K_CheckOffroadCollide(mobj_t *mo)
s2 = &sectors[rover->secnum]; // makes things easier for us s2 = &sectors[rover->secnum]; // makes things easier for us
flr = P_GetFOFBottomZ(mo, s, rover, mo->x, mo->y, NULL); special = GETSECSPECIAL(s2->special, 1);
cel = P_GetFOFTopZ(mo, s, rover, mo->x, mo->y, NULL); // Z coords for fof top/bottom. for (i = 2; i < 5; i++) // check for sector special
{
if (special != i)
continue;
// we will do essentially the same checks as above instead of bothering with top/bottom height of the FOF. // we will do essentially the same checks as above instead of bothering with top/bottom height of the FOF.
// Reminder that an FOF's floor is its bottom, silly! // Reminder that an FOF's floor is its bottom, silly!
if ( ((s2->flags & SF_FLIPSPECIAL_FLOOR) && mo->z == cel) // "floor" check
|| ((s2->flags & SF_FLIPSPECIAL_CEILING) && (mo->z + mo->height) == flr) ) // "ceiling" check.
for (i = 2; i < 5; i++) // check for sector special if (s2->flags & SF_FLIPSPECIAL_FLOOR)
{
if (GETSECSPECIAL(s2->special, 1) == i) cel = P_GetFOFTopZ(mo, s, rover, mo->x, mo->y, NULL); // Z coords for fof top/bottom.
if (mo->z == cel) // "floor" check
return i-1; // return offroad type return i-1; // return offroad type
}
if (s2->flags & SF_FLIPSPECIAL_CEILING)
{
flr = P_GetFOFBottomZ(mo, s, rover, mo->x, mo->y, NULL);
if ((mo->z + mo->height) == flr) // "ceiling" check
return i-1; // return offroad type
} }
} }
}
}
return 0; // couldn't find any offroad return 0; // couldn't find any offroad
} }
@@ -1721,7 +1742,6 @@ static void K_SpawnDashDustRelease(player_t *player)
INT32 i; INT32 i;
I_Assert(player != NULL); I_Assert(player != NULL);
I_Assert(player->mo != NULL);
I_Assert(!P_MobjWasRemoved(player->mo)); I_Assert(!P_MobjWasRemoved(player->mo));
if (!player->speed && !player->kartstuff[k_startboost]) if (!player->speed && !player->kartstuff[k_startboost])
@@ -1759,7 +1779,6 @@ static void K_SpawnBrakeDriftSparks(player_t *player) // Be sure to update the m
mobj_t *sparks; mobj_t *sparks;
I_Assert(player != NULL); I_Assert(player != NULL);
I_Assert(player->mo != NULL);
I_Assert(!P_MobjWasRemoved(player->mo)); I_Assert(!P_MobjWasRemoved(player->mo));
// Position & etc are handled in its thinker, and its spawned invisible. // Position & etc are handled in its thinker, and its spawned invisible.
@@ -2317,10 +2336,13 @@ fixed_t K_3dKartMovement(player_t *player, boolean onground, fixed_t forwardmove
finalspeed *= forwardmove/25; finalspeed *= forwardmove/25;
finalspeed /= 2; finalspeed /= 2;
if (forwardmove < 0 && finalspeed > mapobjectscale*2) if (forwardmove < 0)
{
if (finalspeed > mapobjectscale*2)
return finalspeed/2; return finalspeed/2;
else if (forwardmove < 0)
return -mapobjectscale/2; return -mapobjectscale/2;
}
if (finalspeed < 0) if (finalspeed < 0)
finalspeed = 0; finalspeed = 0;
@@ -3156,7 +3178,6 @@ static void K_SpawnDriftSparks(player_t *player)
INT32 i; INT32 i;
I_Assert(player != NULL); I_Assert(player != NULL);
I_Assert(player->mo != NULL);
I_Assert(!P_MobjWasRemoved(player->mo)); I_Assert(!P_MobjWasRemoved(player->mo));
if (leveltime % 2 == 1) if (leveltime % 2 == 1)
@@ -3420,7 +3441,7 @@ static void K_QuiteSaltyHop(player_t *player)
pmo->spritexscale -= (FRACUNIT/8); pmo->spritexscale -= (FRACUNIT/8);
} }
pmo->spriteyoffset = FixedMul(psalt->zoffset, cv_saltyheight.value); pmo->spriteyoffset += FixedMul(psalt->zoffset, cv_saltyheight.value);
if (cv_saltyhopsfx.value) if (cv_saltyhopsfx.value)
{ {
@@ -3528,7 +3549,6 @@ void K_SpawnBoostTrail(player_t *player)
INT32 i; INT32 i;
I_Assert(player != NULL); I_Assert(player != NULL);
I_Assert(player->mo != NULL);
I_Assert(!P_MobjWasRemoved(player->mo)); I_Assert(!P_MobjWasRemoved(player->mo));
if (!P_IsObjectOnGround(player->mo) if (!P_IsObjectOnGround(player->mo)
@@ -3610,7 +3630,6 @@ void K_SpawnSparkleTrail(mobj_t *mo)
mobj_t *sparkle; mobj_t *sparkle;
INT32 i; INT32 i;
I_Assert(mo != NULL);
I_Assert(!P_MobjWasRemoved(mo)); I_Assert(!P_MobjWasRemoved(mo));
const boolean shouldblend = (mo->player && K_PlayerEffectsShouldBlend(mo->player)); const boolean shouldblend = (mo->player && K_PlayerEffectsShouldBlend(mo->player));
@@ -3644,7 +3663,6 @@ mobj_t *K_SpawnWipeoutTrail(mobj_t *mo, boolean translucent)
mobj_t *dust; mobj_t *dust;
angle_t aoff; angle_t aoff;
I_Assert(mo != NULL);
I_Assert(!P_MobjWasRemoved(mo)); I_Assert(!P_MobjWasRemoved(mo));
if (mo->player) if (mo->player)
@@ -3693,7 +3711,7 @@ void K_DriftDustHandling(mobj_t *spawner)
{ {
angle_t anglediff; angle_t anglediff;
if (!P_IsObjectOnGround(spawner) || leveltime % 2 != 0) if (leveltime % 2 != 0 || !P_IsObjectOnGround(spawner))
return; return;
if (spawner->player) if (spawner->player)
@@ -4179,12 +4197,12 @@ static void K_DoHyudoroSteal(player_t *player)
void K_DoSneaker(player_t *player, INT32 type) void K_DoSneaker(player_t *player, INT32 type)
{ {
const fixed_t intendedboost = K_GetSneakerBoostSpeed();
if (!player->kartstuff[k_floorboost] || player->kartstuff[k_floorboost] == 3) if (!player->kartstuff[k_floorboost] || player->kartstuff[k_floorboost] == 3)
{ {
S_StartSound(player->mo, sfx_cdfm01); S_StartSound(player->mo, sfx_cdfm01);
K_SpawnDashDustRelease(player); K_SpawnDashDustRelease(player);
const fixed_t intendedboost = K_GetSneakerBoostSpeed();
if (intendedboost > player->kartstuff[k_speedboost]) if (intendedboost > player->kartstuff[k_speedboost])
player->kartstuff[k_destboostcam] = FixedMul(FRACUNIT, FixedDiv((intendedboost - player->kartstuff[k_speedboost]), intendedboost)); player->kartstuff[k_destboostcam] = FixedMul(FRACUNIT, FixedDiv((intendedboost - player->kartstuff[k_speedboost]), intendedboost));
} }
@@ -6200,6 +6218,7 @@ void K_KartUpdatePosition(player_t *player)
players[i].kartstuff[k_prevcheck] += imo; players[i].kartstuff[k_prevcheck] += imo;
ipcd++; ipcd++;
} }
if (isnextcheckpointi) if (isnextcheckpointi)
{ {
players[i].kartstuff[k_nextcheck] += imo; players[i].kartstuff[k_nextcheck] += imo;
+1 -1
View File
@@ -300,7 +300,7 @@ struct Hook_State {
const char * string; /* used to fetch table, ran first if set */ const char * string; /* used to fetch table, ran first if set */
int top; /* index of last argument passed to hook */ int top; /* index of last argument passed to hook */
int id; /* id to fetch ref */ int id; /* id to fetch ref */
boolean important;/* is this hook from local addon */ bool important; /* is this hook from local addon */
int values; /* num arguments passed to hook */ int values; /* num arguments passed to hook */
int results; /* num values returned by hook */ int results; /* num values returned by hook */
Hook_Callback results_handler; /* callback when hook successfully returns */ Hook_Callback results_handler; /* callback when hook successfully returns */
+7 -2
View File
@@ -1658,8 +1658,14 @@ static int mapheaderinfo_get(lua_State *L)
{ {
// Read custom vars now // Read custom vars now
// (note: don't include the "LUA." in your lua scripts!) // (note: don't include the "LUA." in your lua scripts!)
if (!header->numCustomOptions) {
lua_pushnil(L);
break;
}
UINT8 j = 0; UINT8 j = 0;
for (;j < header->numCustomOptions && !fastcmp(lua_tostring(L, 2), header->customopts[j].option); ++j); const char *cusoptstr = lua_tostring(L, 2);
for (;j < header->numCustomOptions && !fastcmp(cusoptstr, header->customopts[j].option); ++j);
if (j < header->numCustomOptions) if (j < header->numCustomOptions)
lua_pushstring(L, header->customopts[j].value); lua_pushstring(L, header->customopts[j].value);
@@ -1668,7 +1674,6 @@ static int mapheaderinfo_get(lua_State *L)
} }
} }
return 1; return 1;
} }
int LUA_MapLib(lua_State *L) int LUA_MapLib(lua_State *L)
+9 -4
View File
@@ -1065,8 +1065,9 @@ static void ArchiveTables(UINT8 **p)
n++; // the table contained a new table we'll have to archive. :( n++; // the table contained a new table we'll have to archive. :(
else if (e == 2) // invalid key type (function, thread, lightuserdata, or anything we don't recognise) else if (e == 2) // invalid key type (function, thread, lightuserdata, or anything we don't recognise)
{ {
CONS_Alert(CONS_ERROR, "Index '%s' (%s) of table %d could not be archived!\n", lua_tostring(gL, -2), luaL_typename(gL, -2), i); lua_pushvalue(gL, -2); // copy key for error message (lua_tostring may mutate it which confuses lua_next)
lua_pop(gL, 1); CONS_Alert(CONS_ERROR, "Index '%s' (%s) of table %d could not be archived!\n", lua_tostring(gL, -1), luaL_typename(gL, -1), i);
lua_pop(gL, 2); // pop key copy and value
continue; continue;
} }
else if (e == 3) // nil key due to invalid userdata. NOT an error. else if (e == 3) // nil key due to invalid userdata. NOT an error.
@@ -1080,11 +1081,15 @@ static void ArchiveTables(UINT8 **p)
if (e == 1) if (e == 1)
n++; // the table contained a new table we'll have to archive. :( n++; // the table contained a new table we'll have to archive. :(
else if (e == 2) // invalid value type else if (e == 2) // invalid value type
CONS_Alert(CONS_ERROR, "Type of value for table %d entry '%s' (%s) could not be archived!\n", i, lua_tostring(gL, -2), luaL_typename(gL, -1)); {
lua_pushvalue(gL, -2); // copy key for error message (same as above)
CONS_Alert(CONS_ERROR, "Type of value for table %d entry '%s' (%s) could not be archived!\n", i, lua_tostring(gL, -1), luaL_typename(gL, -2));
lua_pop(gL, 1); // pop key copy
}
lua_pop(gL, 1); lua_pop(gL, 1);
} }
lua_pop(gL, 1); lua_pop(gL, 1);
WRITEUINT8(*p, ARCH_TEND); WRITEUINT8(*p, ARCH_TEND);
} }
+7
View File
@@ -62,6 +62,9 @@ FUNCMATH fixed_t FixedHypot(fixed_t x, fixed_t y)
angle_t angle; angle_t angle;
fixed_t dist; fixed_t dist;
I_Assert(x != INT32_MIN);
I_Assert(y != INT32_MIN);
x = abs(x); x = abs(x);
y = abs(y); y = abs(y);
@@ -77,6 +80,10 @@ FUNCMATH fixed_t FixedHypot(fixed_t x, fixed_t y)
if (!y) if (!y)
return x; return x;
// prevent underflow
if (y == INT32_MIN)
return INT32_MAX;
angle = (tantoangle[FixedDiv(y, x)>>DBITS] + ANGLE_90) >> ANGLETOFINESHIFT; angle = (tantoangle[FixedDiv(y, x)>>DBITS] + ANGLE_90) >> ANGLETOFINESHIFT;
// use as cosine // use as cosine
+2 -27
View File
@@ -496,32 +496,6 @@ static consvar_t cv_dummystaff = {"dummystaff", "0", CV_HIDEN|CV_CALL, dummystaf
// all the menu definitions and onchanges reside in here now // all the menu definitions and onchanges reside in here now
#include "m_menudefs.c" #include "m_menudefs.c"
static INT32 M_ShiftChar(INT32 ch)
{
if (I_UseNativeKeyboard())
return ch;
if (cv_keyboardlayout.value == 3)
{
if (ch >= 32 && ch <= 141)
{
if (shiftdown)
ch = shiftxform[ch];
else if (altdown & 0x2)
ch = french_altgrxform[ch];
else
ch = HU_FallBackFrSpecialLetter(ch);
}
}
else
{
if (shiftdown && ch >= 32 && ch <= 127)
ch = shiftxform[ch];
}
return ch;
}
// //
// M_GetGametypeColor // M_GetGametypeColor
// //
@@ -1250,7 +1224,7 @@ boolean M_Responder(event_t *ev)
// Handle menuitems which need a specific key handling // Handle menuitems which need a specific key handling
if (routine && (currentMenu->menuitems[itemOn].status & IT_TYPE) == IT_KEYHANDLER) if (routine && (currentMenu->menuitems[itemOn].status & IT_TYPE) == IT_KEYHANDLER)
{ {
ch = M_ShiftChar(ch); ch = CON_ShiftChar(ch);
routine(ch); routine(ch);
return true; return true;
} }
@@ -1280,6 +1254,7 @@ boolean M_Responder(event_t *ev)
void (*otherroutine)(event_t *sev) = currentMenu->menuitems[itemOn].itemaction; void (*otherroutine)(event_t *sev) = currentMenu->menuitems[itemOn].itemaction;
otherroutine(ev); //Alam: what a hack otherroutine(ev); //Alam: what a hack
} }
return true; return true;
} }
} }
+10 -9
View File
@@ -1185,20 +1185,20 @@ static menuitem_t OP_FocusOptionsMenu[] =
{ {
{IT_HEADER, NULL, "Game Focus Options", NULL, 0}, {IT_HEADER, NULL, "Game Focus Options", NULL, 0},
{IT_STRING|IT_CVAR, NULL, "Play Music While Unfocused", &cv_playmusicifunfocused, 30}, {IT_STRING|IT_CVAR, NULL, "Play Music While Unfocused", &cv_playmusicifunfocused, 10},
{IT_STRING|IT_CVAR, NULL, "Play SFX While Unfocused", &cv_playsoundifunfocused, 40}, {IT_STRING|IT_CVAR, NULL, "Play SFX While Unfocused", &cv_playsoundifunfocused, 20},
{IT_STRING|IT_CVAR, NULL, "Pause Game While Unfocused", &cv_pauseifunfocused, 60}, {IT_STRING|IT_CVAR, NULL, "Pause Game While Unfocused", &cv_pauseifunfocused, 40},
{IT_STRING|IT_CVAR, NULL, "Background FPS Cap", &cv_fpscapbg, 80}, {IT_STRING|IT_CVAR, NULL, "Background FPS Cap", &cv_fpscapbg, 60},
{IT_STRING|IT_CVAR, NULL, "Show \"FOCUS LOST\"", &cv_showfocuslost, 100}, {IT_STRING|IT_CVAR, NULL, "Show \"FOCUS LOST\"", &cv_showfocuslost, 80},
{IT_STRING|IT_CVAR, NULL, "Visible Mouse", &cv_mousevisible, 120}, {IT_STRING|IT_CVAR, NULL, "Visible Mouse", &cv_mousevisible, 100},
{IT_STRING|IT_CVAR, NULL, "Gamepad LED Color While Unfocused ", &cv_gamepadledifunfocused, 140},
{IT_STRING|IT_CVAR, NULL, "Gamepad Rumble While Unfocused", &cv_rumbleifunfocused, 150},
{IT_STRING|IT_CVAR, NULL, "Gamepad Inputs While Unfocused", &cv_gamepadifunfocused, 120},
{IT_STRING|IT_CVAR, NULL, "Gamepad LED Color While Unfocused ", &cv_gamepadledifunfocused, 130},
{IT_STRING|IT_CVAR, NULL, "Gamepad Rumble While Unfocused", &cv_rumbleifunfocused, 140},
}; };
static const char* OP_FocusOptionsTooltips[] = static const char* OP_FocusOptionsTooltips[] =
@@ -1210,6 +1210,7 @@ static const char* OP_FocusOptionsTooltips[] =
"Set manual framerate cap while the game is unfocused.", "Set manual framerate cap while the game is unfocused.",
"Should the FOCUS LOST window appear\n while the game is unfocused?", "Should the FOCUS LOST window appear\n while the game is unfocused?",
"Displays the mouse cursor while the game is in focus.", "Displays the mouse cursor while the game is in focus.",
"Should gamepad still control the game when unfocused?",
"Should gamepad LED indicator change color when unfocused?", "Should gamepad LED indicator change color when unfocused?",
"Should gamepad rumble apply when unfocused?", "Should gamepad rumble apply when unfocused?",
}; };
-2
View File
@@ -306,7 +306,6 @@ void P_NewChaseDir(mobj_t *actor)
dirtype_t d[3]; dirtype_t d[3];
dirtype_t tdir = DI_NODIR, olddir, turnaround; dirtype_t tdir = DI_NODIR, olddir, turnaround;
I_Assert(actor->target != NULL);
I_Assert(!P_MobjWasRemoved(actor->target)); I_Assert(!P_MobjWasRemoved(actor->target));
olddir = actor->movedir; olddir = actor->movedir;
@@ -619,7 +618,6 @@ void A_Chase(void *thing)
if (LUA_CallAction(A_CHASE, actor)) if (LUA_CallAction(A_CHASE, actor))
return; return;
I_Assert(actor != NULL);
I_Assert(!P_MobjWasRemoved(actor)); I_Assert(!P_MobjWasRemoved(actor));
if (actor->reactiontime) if (actor->reactiontime)
-1
View File
@@ -1894,7 +1894,6 @@ void T_NoEnemiesSector(levelspecthink_t *nobaddies)
{ {
if (nobaddies->sector->lines[i]->special == 223) if (nobaddies->sector->lines[i]->special == 223)
{ {
upperbound = nobaddies->sector->ceilingheight; upperbound = nobaddies->sector->ceilingheight;
lowerbound = nobaddies->sector->floorheight; lowerbound = nobaddies->sector->floorheight;
+30 -23
View File
@@ -1509,14 +1509,14 @@ static boolean PIT_CheckThing(mobj_t *thing)
// Adjusts tmfloorz and tmceilingz as lines are contacted - FOR CAMERA ONLY // Adjusts tmfloorz and tmceilingz as lines are contacted - FOR CAMERA ONLY
static boolean PIT_CheckCameraLine(line_t *ld) static boolean PIT_CheckCameraLine(line_t *ld)
{ {
if (ld->polyobj && !(ld->polyobj->flags & POF_SOLID)) if (tmbbox[BOXRIGHT] <= ld->bbox[BOXLEFT] ||
tmbbox[BOXLEFT] >= ld->bbox[BOXRIGHT] ||
tmbbox[BOXTOP] <= ld->bbox[BOXBOTTOM] ||
tmbbox[BOXBOTTOM] >= ld->bbox[BOXTOP])
return true; return true;
if (tmbbox[BOXRIGHT] <= ld->bbox[BOXLEFT] || tmbbox[BOXLEFT] >= ld->bbox[BOXRIGHT] if (ld->polyobj && !(ld->polyobj->flags & POF_SOLID))
|| tmbbox[BOXTOP] <= ld->bbox[BOXBOTTOM] || tmbbox[BOXBOTTOM] >= ld->bbox[BOXTOP])
{
return true; return true;
}
if (P_BoxOnLineSide(tmbbox, ld) != -1) if (P_BoxOnLineSide(tmbbox, ld) != -1)
return true; return true;
@@ -1571,11 +1571,13 @@ static boolean PIT_CheckCameraLine(line_t *ld)
// //
static boolean PIT_CheckLine(line_t *ld) static boolean PIT_CheckLine(line_t *ld)
{ {
if (ld->polyobj && !(ld->polyobj->flags & POF_SOLID)) if (tmbbox[BOXRIGHT] <= ld->bbox[BOXLEFT] ||
tmbbox[BOXLEFT] >= ld->bbox[BOXRIGHT] ||
tmbbox[BOXTOP] <= ld->bbox[BOXBOTTOM] ||
tmbbox[BOXBOTTOM] >= ld->bbox[BOXTOP])
return true; return true;
if (tmbbox[BOXRIGHT] <= ld->bbox[BOXLEFT] || tmbbox[BOXLEFT] >= ld->bbox[BOXRIGHT] if (ld->polyobj && !(ld->polyobj->flags & POF_SOLID))
|| tmbbox[BOXTOP] <= ld->bbox[BOXBOTTOM] || tmbbox[BOXBOTTOM] >= ld->bbox[BOXTOP])
return true; return true;
if (P_BoxOnLineSide(tmbbox, ld) != -1) if (P_BoxOnLineSide(tmbbox, ld) != -1)
@@ -1584,8 +1586,10 @@ static boolean PIT_CheckLine(line_t *ld)
if (tmthing->flags & MF_PAPERCOLLISION) // Caution! Turning whilst up against a wall will get you stuck. You probably shouldn't give the player this flag. if (tmthing->flags & MF_PAPERCOLLISION) // Caution! Turning whilst up against a wall will get you stuck. You probably shouldn't give the player this flag.
{ {
fixed_t cosradius, sinradius; fixed_t cosradius, sinradius;
cosradius = FixedMul(tmthing->radius, FINECOSINE(tmthing->angle>>ANGLETOFINESHIFT)); cosradius = FixedMul(tmthing->radius, FINECOSINE(tmthing->angle>>ANGLETOFINESHIFT));
sinradius = FixedMul(tmthing->radius, FINESINE(tmthing->angle>>ANGLETOFINESHIFT)); sinradius = FixedMul(tmthing->radius, FINESINE(tmthing->angle>>ANGLETOFINESHIFT));
if (P_PointOnLineSide(tmx - cosradius, tmy - sinradius, ld) if (P_PointOnLineSide(tmx - cosradius, tmy - sinradius, ld)
== P_PointOnLineSide(tmx + cosradius, tmy + sinradius, ld)) == P_PointOnLineSide(tmx + cosradius, tmy + sinradius, ld))
return true; // the line doesn't cross between collider's start or end return true; // the line doesn't cross between collider's start or end
@@ -2369,6 +2373,7 @@ boolean P_TryMove(mobj_t *thing, fixed_t x, fixed_t y, boolean allowdropoff)
fixed_t radius = thing->radius; fixed_t radius = thing->radius;
fixed_t thingtop ;//= thing->z + thing->height; fixed_t thingtop ;//= thing->z + thing->height;
fixed_t startingonground = P_IsObjectOnGround(thing); fixed_t startingonground = P_IsObjectOnGround(thing);
INT32 special = -1;
floatok = false; floatok = false;
if (radius < MAXRADIUS/2) if (radius < MAXRADIUS/2)
@@ -2403,20 +2408,30 @@ boolean P_TryMove(mobj_t *thing, fixed_t x, fixed_t y, boolean allowdropoff)
if (!(thing->flags & MF_NOCLIP)) if (!(thing->flags & MF_NOCLIP))
{ {
// All things are affected by their scale. // All things are affected by their scale.
fixed_t maxstep = FixedMul(MAXSTEPMOVE, mapobjectscale); fixed_t maxstep;
INT32 special = 0;
if (tmceilingz - tmfloorz < thing->height)
{
if (tmfloorthing)
tmhitthing = tmfloorthing;
return false; // doesn't fit
}
maxstep = FixedMul(MAXSTEPMOVE, mapobjectscale);
if (thing->player) if (thing->player)
{ {
if (special == -1)
special = GETSECSPECIAL(R_PointInSubsector(x, y)->sector->special, 1); special = GETSECSPECIAL(R_PointInSubsector(x, y)->sector->special, 1);
// If using type Section1:13, double the maxstep. // If using type Section1:13, double the maxstep.
if (P_PlayerTouchingSectorSpecial(thing->player, 1, 13) || special == 13) if (special == 13 || P_PlayerTouchingSectorSpecial(thing->player, 1, 13))
{ {
maxstep <<= 1; maxstep <<= 1;
} }
// If using type Section1:12, no maxstep. For ledges you don't want the player to climb! (see: Egg Zeppelin & SMK port walls) // If using type Section1:12, no maxstep. For ledges you don't want the player to climb! (see: Egg Zeppelin & SMK port walls)
else if (P_PlayerTouchingSectorSpecial(thing->player, 1, 12) || special == 12) else if (special == 12 || P_PlayerTouchingSectorSpecial(thing->player, 1, 12))
{ {
maxstep = 0; maxstep = 0;
} }
@@ -2427,14 +2442,6 @@ boolean P_TryMove(mobj_t *thing, fixed_t x, fixed_t y, boolean allowdropoff)
maxstep = 0; maxstep = 0;
} }
if (tmceilingz - tmfloorz < thing->height)
{
if (tmfloorthing)
tmhitthing = tmfloorthing;
return false; // doesn't fit
}
floatok = true; floatok = true;
thingtop = thing->z + thing->height; thingtop = thing->z + thing->height;
@@ -2465,7 +2472,7 @@ boolean P_TryMove(mobj_t *thing, fixed_t x, fixed_t y, boolean allowdropoff)
} }
} }
else if (maxstep > 0 && !(thing->player && else if (maxstep > 0 && !(thing->player &&
(P_PlayerTouchingSectorSpecial(thing->player, 1, 14) || special == 14))) // Step down (special == 14 || P_PlayerTouchingSectorSpecial(thing->player, 1, 14)))) // Step down
{ {
// If the floor difference is MAXSTEPMOVE or less, and the sector isn't Section1:14, ALWAYS // If the floor difference is MAXSTEPMOVE or less, and the sector isn't Section1:14, ALWAYS
// step down! Formerly required a Section1:13 sector for the full MAXSTEPMOVE, but no more. // step down! Formerly required a Section1:13 sector for the full MAXSTEPMOVE, but no more.
@@ -4001,10 +4008,10 @@ static inline boolean PIT_GetSectors(line_t *ld)
tmbbox[BOXBOTTOM] >= ld->bbox[BOXTOP]) tmbbox[BOXBOTTOM] >= ld->bbox[BOXTOP])
return true; return true;
if (P_BoxOnLineSide(tmbbox, ld) != -1) if (ld->polyobj) // line belongs to a polyobject, don't add it
return true; return true;
if (ld->polyobj) // line belongs to a polyobject, don't add it if (P_BoxOnLineSide(tmbbox, ld) != -1)
return true; return true;
// This line crosses through the object. // This line crosses through the object.
+47 -8
View File
@@ -423,6 +423,8 @@ void P_LineOpening(line_t *linedef, mobj_t *mobj)
// Set open and high/low values here // Set open and high/low values here
fixed_t frontheight, backheight; fixed_t frontheight, backheight;
if (mobj)
{
frontheight = P_GetCeilingZ(mobj, front, tmx, tmy, linedef); frontheight = P_GetCeilingZ(mobj, front, tmx, tmy, linedef);
backheight = P_GetCeilingZ(mobj, back, tmx, tmy, linedef); backheight = P_GetCeilingZ(mobj, back, tmx, tmy, linedef);
@@ -455,8 +457,6 @@ void P_LineOpening(line_t *linedef, mobj_t *mobj)
openbottomslope = back->f_slope; openbottomslope = back->f_slope;
} }
if (mobj)
{
fixed_t thingtop = mobj->z + mobj->height; fixed_t thingtop = mobj->z + mobj->height;
// Check for collision with front side's midtexture if Effect 4 is set // Check for collision with front side's midtexture if Effect 4 is set
@@ -650,6 +650,43 @@ void P_LineOpening(line_t *linedef, mobj_t *mobj)
lowfloor = lowestfloor; lowfloor = lowestfloor;
} }
} }
else
{
// this is what P_LineOpening did before the addition of slopes
// so i´ll just use it as the fallback case
// not that we will ever likely hit this
frontheight = front->ceilingheight;
backheight = back->ceilingheight;
if (frontheight < backheight)
{
opentop = frontheight;
highceiling = backheight;
opentopslope = front->c_slope;
}
else
{
opentop = backheight;
highceiling = frontheight;
opentopslope = back->c_slope;
}
frontheight = front->floorheight;
backheight = back->floorheight;
if (frontheight > backheight)
{
openbottom = frontheight;
lowfloor = backheight;
openbottomslope = front->f_slope;
}
else
{
openbottom = backheight;
lowfloor = frontheight;
openbottomslope = back->f_slope;
}
}
openrange = opentop - openbottom; openrange = opentop - openbottom;
} }
@@ -668,7 +705,6 @@ void P_LineOpening(line_t *linedef, mobj_t *mobj)
// //
void P_UnsetThingPosition(mobj_t *thing) void P_UnsetThingPosition(mobj_t *thing)
{ {
I_Assert(thing != NULL);
I_Assert(!P_MobjWasRemoved(thing)); I_Assert(!P_MobjWasRemoved(thing));
if (!(thing->flags & MF_NOSECTOR)) if (!(thing->flags & MF_NOSECTOR))
@@ -772,7 +808,6 @@ void P_SetThingPosition(mobj_t *thing)
sector_t *oldsec = NULL; sector_t *oldsec = NULL;
fixed_t tfloorz, tceilz; fixed_t tfloorz, tceilz;
I_Assert(thing != NULL);
I_Assert(!P_MobjWasRemoved(thing)); I_Assert(!P_MobjWasRemoved(thing));
if (thing->player && thing->z <= thing->floorz && thing->subsector) if (thing->player && thing->z <= thing->floorz && thing->subsector)
@@ -823,18 +858,22 @@ void P_SetThingPosition(mobj_t *thing)
// sector's floor is the same height. // sector's floor is the same height.
if (thing->player && oldsec != NULL && thing->subsector && oldsec != thing->subsector->sector) if (thing->player && oldsec != NULL && thing->subsector && oldsec != thing->subsector->sector)
{ {
tfloorz = P_GetFloorZ(thing, ss->sector, thing->x, thing->y, NULL);
tceilz = P_GetCeilingZ(thing, ss->sector, thing->x, thing->y, NULL);
if (thing->eflags & MFE_VERTICALFLIP) if (thing->eflags & MFE_VERTICALFLIP)
{ {
tceilz = P_GetCeilingZ(thing, ss->sector, thing->x, thing->y, NULL);
if (thing->z + thing->height >= tceilz) if (thing->z + thing->height >= tceilz)
thing->eflags |= MFE_JUSTSTEPPEDDOWN; thing->eflags |= MFE_JUSTSTEPPEDDOWN;
} }
else if (thing->z <= tfloorz) else
{
tfloorz = P_GetFloorZ(thing, ss->sector, thing->x, thing->y, NULL);
if (thing->z <= tfloorz)
thing->eflags |= MFE_JUSTSTEPPEDDOWN; thing->eflags |= MFE_JUSTSTEPPEDDOWN;
} }
} }
}
// //
// P_SetUnderlayPosition // P_SetUnderlayPosition
+94 -80
View File
@@ -222,11 +222,6 @@ boolean P_SetMobjState(mobj_t *mobj, statenum_t state)
INT32 recursion = 0; INT32 recursion = 0;
#ifdef PARANOIA
if (mobj->player != NULL)
I_Error("P_SetMobjState used for player mobj. Use P_SetPlayerMobjState instead!\n(State called: %d)", state);
#endif
if (mobj->player != NULL) if (mobj->player != NULL)
return P_SetPlayerMobjState(mobj, state); return P_SetPlayerMobjState(mobj, state);
@@ -339,7 +334,6 @@ void P_ExplodeMissile(mobj_t *mo)
{ {
mobj_t *explodemo; mobj_t *explodemo;
I_Assert(mo != NULL);
I_Assert(!P_MobjWasRemoved(mo)); I_Assert(!P_MobjWasRemoved(mo));
mo->momx = mo->momy = mo->momz = 0; mo->momx = mo->momy = mo->momz = 0;
@@ -420,14 +414,18 @@ boolean P_InsideANonSolidFFloor(mobj_t *mobj, ffloor_t *rover)
if (!(rover->flags & FF_EXISTS)) if (!(rover->flags & FF_EXISTS))
return false; return false;
if ((((rover->flags & FF_BLOCKPLAYER) && mobj->player) if ((((rover->flags & FF_BLOCKPLAYER) && mobj->player) ||
|| ((rover->flags & FF_BLOCKOTHERS) && !mobj->player))) ((rover->flags & FF_BLOCKOTHERS) && !mobj->player)))
return false; return false;
topheight = P_GetFFloorTopZAt(rover, mobj->x, mobj->y); topheight = P_GetFFloorTopZAt(rover, mobj->x, mobj->y);
if (mobj->z > topheight)
return false;
bottomheight = P_GetFFloorBottomZAt(rover, mobj->x, mobj->y); bottomheight = P_GetFFloorBottomZAt(rover, mobj->x, mobj->y);
if (mobj->z > topheight || (mobj->z + mobj->height < bottomheight)) if (mobj->z + mobj->height < bottomheight)
return false; return false;
return true; return true;
@@ -577,7 +575,7 @@ fixed_t P_MobjFloorZ(mobj_t *mobj, sector_t *sector, sector_t *boundsec, fixed_t
return P_GetSlopeZAt(slope, testx, testy); return P_GetSlopeZAt(slope, testx, testy);
// If boundsec is set, we're looking for specials. In that case, iterate over every line in this sector to find the TRUE highest/lowest point // If boundsec is set, we're looking for specials. In that case, iterate over every line in this sector to find the TRUE highest/lowest point
if (perfect) if (perfect && boundsec)
{ {
size_t i; size_t i;
line_t *ld; line_t *ld;
@@ -596,8 +594,10 @@ fixed_t P_MobjFloorZ(mobj_t *mobj, sector_t *sector, sector_t *boundsec, fixed_t
fixed_t highline; fixed_t highline;
ld = boundsec->lines[i]; ld = boundsec->lines[i];
if (bbox[BOXRIGHT] <= ld->bbox[BOXLEFT] || bbox[BOXLEFT] >= ld->bbox[BOXRIGHT] if (bbox[BOXRIGHT] <= ld->bbox[BOXLEFT] ||
|| bbox[BOXTOP] <= ld->bbox[BOXBOTTOM] || bbox[BOXBOTTOM] >= ld->bbox[BOXTOP]) bbox[BOXLEFT] >= ld->bbox[BOXRIGHT] ||
bbox[BOXTOP] <= ld->bbox[BOXBOTTOM] ||
bbox[BOXBOTTOM] >= ld->bbox[BOXTOP])
continue; continue;
if (P_BoxOnLineSide(bbox, ld) != -1) if (P_BoxOnLineSide(bbox, ld) != -1)
@@ -664,7 +664,7 @@ fixed_t P_MobjCeilingZ(mobj_t *mobj, sector_t *sector, sector_t *boundsec, fixed
return P_GetSlopeZAt(slope, testx, testy); return P_GetSlopeZAt(slope, testx, testy);
// If boundsec is set, we're looking for specials. In that case, iterate over every line in this sector to find the TRUE highest/lowest point // If boundsec is set, we're looking for specials. In that case, iterate over every line in this sector to find the TRUE highest/lowest point
if (perfect) if (perfect && boundsec)
{ {
size_t i; size_t i;
line_t *ld; line_t *ld;
@@ -683,8 +683,10 @@ fixed_t P_MobjCeilingZ(mobj_t *mobj, sector_t *sector, sector_t *boundsec, fixed
fixed_t highline; fixed_t highline;
ld = boundsec->lines[i]; ld = boundsec->lines[i];
if (bbox[BOXRIGHT] <= ld->bbox[BOXLEFT] || bbox[BOXLEFT] >= ld->bbox[BOXRIGHT] if (bbox[BOXRIGHT] <= ld->bbox[BOXLEFT] ||
|| bbox[BOXTOP] <= ld->bbox[BOXBOTTOM] || bbox[BOXBOTTOM] >= ld->bbox[BOXTOP]) bbox[BOXLEFT] >= ld->bbox[BOXRIGHT] ||
bbox[BOXTOP] <= ld->bbox[BOXBOTTOM] ||
bbox[BOXBOTTOM] >= ld->bbox[BOXTOP])
continue; continue;
if (P_BoxOnLineSide(bbox, ld) != -1) if (P_BoxOnLineSide(bbox, ld) != -1)
@@ -752,7 +754,7 @@ fixed_t P_CameraFloorZ(camera_t *mobj, sector_t *sector, sector_t *boundsec, fix
return P_GetSlopeZAt(slope, testx, testy); return P_GetSlopeZAt(slope, testx, testy);
// If boundsec is set, we're looking for specials. In that case, iterate over every line in this sector to find the TRUE highest/lowest point // If boundsec is set, we're looking for specials. In that case, iterate over every line in this sector to find the TRUE highest/lowest point
if (perfect) if (perfect && boundsec)
{ {
size_t i; size_t i;
line_t *ld; line_t *ld;
@@ -771,8 +773,10 @@ fixed_t P_CameraFloorZ(camera_t *mobj, sector_t *sector, sector_t *boundsec, fix
fixed_t highline; fixed_t highline;
ld = boundsec->lines[i]; ld = boundsec->lines[i];
if (bbox[BOXRIGHT] <= ld->bbox[BOXLEFT] || bbox[BOXLEFT] >= ld->bbox[BOXRIGHT] if (bbox[BOXRIGHT] <= ld->bbox[BOXLEFT] ||
|| bbox[BOXTOP] <= ld->bbox[BOXBOTTOM] || bbox[BOXBOTTOM] >= ld->bbox[BOXTOP]) bbox[BOXLEFT] >= ld->bbox[BOXRIGHT] ||
bbox[BOXTOP] <= ld->bbox[BOXBOTTOM] ||
bbox[BOXBOTTOM] >= ld->bbox[BOXTOP])
continue; continue;
if (P_BoxOnLineSide(bbox, ld) != -1) if (P_BoxOnLineSide(bbox, ld) != -1)
@@ -839,7 +843,7 @@ fixed_t P_CameraCeilingZ(camera_t *mobj, sector_t *sector, sector_t *boundsec, f
return P_GetSlopeZAt(slope, testx, testy); return P_GetSlopeZAt(slope, testx, testy);
// If boundsec is set, we're looking for specials. In that case, iterate over every line in this sector to find the TRUE highest/lowest point // If boundsec is set, we're looking for specials. In that case, iterate over every line in this sector to find the TRUE highest/lowest point
if (perfect) if (perfect && boundsec)
{ {
size_t i; size_t i;
line_t *ld; line_t *ld;
@@ -858,8 +862,10 @@ fixed_t P_CameraCeilingZ(camera_t *mobj, sector_t *sector, sector_t *boundsec, f
fixed_t highline; fixed_t highline;
ld = boundsec->lines[i]; ld = boundsec->lines[i];
if (bbox[BOXRIGHT] <= ld->bbox[BOXLEFT] || bbox[BOXLEFT] >= ld->bbox[BOXRIGHT] if (bbox[BOXRIGHT] <= ld->bbox[BOXLEFT] ||
|| bbox[BOXTOP] <= ld->bbox[BOXBOTTOM] || bbox[BOXBOTTOM] >= ld->bbox[BOXTOP]) bbox[BOXLEFT] >= ld->bbox[BOXRIGHT] ||
bbox[BOXTOP] <= ld->bbox[BOXBOTTOM] ||
bbox[BOXBOTTOM] >= ld->bbox[BOXTOP])
continue; continue;
if (P_BoxOnLineSide(bbox, ld) != -1) if (P_BoxOnLineSide(bbox, ld) != -1)
@@ -890,6 +896,7 @@ fixed_t P_CameraCeilingZ(camera_t *mobj, sector_t *sector, sector_t *boundsec, f
else // Well, that makes it easy. Just get the ceiling height else // Well, that makes it easy. Just get the ceiling height
return sector->ceilingheight; return sector->ceilingheight;
} }
static void P_PlayerFlip(mobj_t *mo) static void P_PlayerFlip(mobj_t *mo)
{ {
if (!mo->player) if (!mo->player)
@@ -898,7 +905,12 @@ static void P_PlayerFlip(mobj_t *mo)
G_GhostAddFlip((INT32) (mo->player - players)); G_GhostAddFlip((INT32) (mo->player - players));
// Flip aiming to match! // Flip aiming to match!
if (mo->player->pflags & PF_FLIPCAM) if (UNLIKELY(mo->player->pflags & PF_NIGHTSMODE)) // NiGHTS doesn't use flipcam
{
if (mo->tracer)
mo->tracer->eflags ^= MFE_VERTICALFLIP;
}
else if (mo->player->pflags & PF_FLIPCAM)
{ {
UINT8 i; UINT8 i;
@@ -920,11 +932,6 @@ static void P_PlayerFlip(mobj_t *mo)
camera[i].z += FixedMul(20*FRACUNIT, mo->scale); camera[i].z += FixedMul(20*FRACUNIT, mo->scale);
} }
} }
else if (UNLIKELY(mo->player->pflags & PF_NIGHTSMODE)) // NiGHTS doesn't use flipcam
{
if (mo->tracer)
mo->tracer->eflags ^= MFE_VERTICALFLIP;
}
} }
// //
@@ -940,7 +947,6 @@ fixed_t P_GetMobjGravity(mobj_t *mo)
boolean goopgravity = false; boolean goopgravity = false;
boolean wasflip; boolean wasflip;
I_Assert(mo != NULL);
I_Assert(!P_MobjWasRemoved(mo)); I_Assert(!P_MobjWasRemoved(mo));
wasflip = (mo->eflags & MFE_VERTICALFLIP) != 0; wasflip = (mo->eflags & MFE_VERTICALFLIP) != 0;
@@ -1113,7 +1119,6 @@ void P_CheckGravity(mobj_t *mo, boolean affect)
// //
static void P_SceneryXYFriction(mobj_t *mo, fixed_t oldx, fixed_t oldy) static void P_SceneryXYFriction(mobj_t *mo, fixed_t oldx, fixed_t oldy)
{ {
I_Assert(mo != NULL);
I_Assert(!P_MobjWasRemoved(mo)); I_Assert(!P_MobjWasRemoved(mo));
const fixed_t fric_scale = FixedMul(FRACUNIT/32, mo->scale); const fixed_t fric_scale = FixedMul(FRACUNIT/32, mo->scale);
@@ -1157,7 +1162,6 @@ static void P_XYFriction(mobj_t *mo, fixed_t oldx, fixed_t oldy)
{ {
player_t *player; player_t *player;
I_Assert(mo != NULL);
I_Assert(!P_MobjWasRemoved(mo)); I_Assert(!P_MobjWasRemoved(mo));
player = mo->player; player = mo->player;
@@ -1209,7 +1213,6 @@ static void P_PushableCheckBustables(mobj_t *mo)
fixed_t oldx; fixed_t oldx;
fixed_t oldy; fixed_t oldy;
I_Assert(mo != NULL);
I_Assert(!P_MobjWasRemoved(mo)); I_Assert(!P_MobjWasRemoved(mo));
if (netgame && mo->player && mo->player->spectator) if (netgame && mo->player && mo->player->spectator)
@@ -1328,7 +1331,6 @@ void P_XYMovement(mobj_t *mo)
vector3_t slopemom = {0, 0, 0}; vector3_t slopemom = {0, 0, 0};
fixed_t predictedz = 0; fixed_t predictedz = 0;
I_Assert(mo != NULL);
I_Assert(!P_MobjWasRemoved(mo)); I_Assert(!P_MobjWasRemoved(mo));
// if it's stopped // if it's stopped
@@ -1411,7 +1413,7 @@ void P_XYMovement(mobj_t *mo)
// blocked move // blocked move
moved = false; moved = false;
if (player && player->bot) if (UNLIKELY(player && player->bot))
{ {
B_MoveBlocked(player); B_MoveBlocked(player);
} }
@@ -1446,7 +1448,6 @@ void P_XYMovement(mobj_t *mo)
else else
fx->eflags &= ~MFE_VERTICALFLIP; fx->eflags &= ~MFE_VERTICALFLIP;
fx->scale = mo->scale; fx->scale = mo->scale;
}
if (mo->type == MT_ORBINAUT) // Orbinaut speed decreasing if (mo->type == MT_ORBINAUT) // Orbinaut speed decreasing
{ {
@@ -1466,6 +1467,7 @@ void P_XYMovement(mobj_t *mo)
P_InstaThrust(mo, R_PointToAngle2(mo->x, mo->y, mo->x, mo->y)+ANGLE_90, 16*FRACUNIT); P_InstaThrust(mo, R_PointToAngle2(mo->x, mo->y, mo->x, mo->y)+ANGLE_90, 16*FRACUNIT);
} }
} }
}
//} //}
// Bounce ring algorithm // Bounce ring algorithm
@@ -1567,7 +1569,9 @@ void P_XYMovement(mobj_t *mo)
if (P_MobjWasRemoved(mo)) // MF_SPECIAL touched a player! O_o;; if (P_MobjWasRemoved(mo)) // MF_SPECIAL touched a player! O_o;;
return; return;
if (moved && oldslope) // Check to see if we ran off if (moved)
{
if (oldslope) // Check to see if we ran off
{ {
if (oldslope != mo->standingslope) // First, compare different slopes if (oldslope != mo->standingslope) // First, compare different slopes
{ {
@@ -1594,7 +1598,7 @@ void P_XYMovement(mobj_t *mo)
P_SlopeLaunch(mo); P_SlopeLaunch(mo);
} }
} }
else if (moved && mo->standingslope && predictedz) else if (mo->standingslope && predictedz)
{ {
angle_t moveangle = R_PointToAngle2(0, 0, mo->momx, mo->momy); angle_t moveangle = R_PointToAngle2(0, 0, mo->momx, mo->momy);
angle_t newangle = FixedMul((signed)mo->standingslope->zangle, FINECOSINE((moveangle - mo->standingslope->xydirection) >> ANGLETOFINESHIFT)); angle_t newangle = FixedMul((signed)mo->standingslope->zangle, FINECOSINE((moveangle - mo->standingslope->xydirection) >> ANGLETOFINESHIFT));
@@ -1606,6 +1610,7 @@ void P_XYMovement(mobj_t *mo)
mo->standingslope = NULL; mo->standingslope = NULL;
} }
} }
}
// Check the gravity status. // Check the gravity status.
P_CheckGravity(mo, false); P_CheckGravity(mo, false);
@@ -1679,7 +1684,6 @@ void P_XYMovement(mobj_t *mo)
static void P_RingXYMovement(mobj_t *mo) static void P_RingXYMovement(mobj_t *mo)
{ {
I_Assert(mo != NULL);
I_Assert(!P_MobjWasRemoved(mo)); I_Assert(!P_MobjWasRemoved(mo));
if (!P_SceneryTryMove(mo, mo->x + mo->momx, mo->y + mo->momy)) if (!P_SceneryTryMove(mo, mo->x + mo->momx, mo->y + mo->momy))
@@ -1690,7 +1694,6 @@ static void P_SceneryXYMovement(mobj_t *mo)
{ {
fixed_t oldx, oldy; // reducing bobbing/momentum on ice when up against walls fixed_t oldx, oldy; // reducing bobbing/momentum on ice when up against walls
I_Assert(mo != NULL);
I_Assert(!P_MobjWasRemoved(mo)); I_Assert(!P_MobjWasRemoved(mo));
oldx = mo->x; oldx = mo->x;
@@ -1728,7 +1731,6 @@ static void P_AdjustMobjFloorZ_FFloors(mobj_t *mo, sector_t *sector, UINT8 motyp
fixed_t delta1, delta2, thingtop; fixed_t delta1, delta2, thingtop;
fixed_t topheight, bottomheight; fixed_t topheight, bottomheight;
I_Assert(mo != NULL);
I_Assert(!P_MobjWasRemoved(mo)); I_Assert(!P_MobjWasRemoved(mo));
thingtop = mo->z + mo->height; thingtop = mo->z + mo->height;
@@ -1805,7 +1807,6 @@ static void P_AdjustMobjFloorZ_PolyObjs(mobj_t *mo, subsector_t *subsec)
fixed_t delta1, delta2, thingtop; fixed_t delta1, delta2, thingtop;
fixed_t polytop, polybottom; fixed_t polytop, polybottom;
I_Assert(mo != NULL);
I_Assert(!P_MobjWasRemoved(mo)); I_Assert(!P_MobjWasRemoved(mo));
thingtop = mo->z + mo->height; thingtop = mo->z + mo->height;
@@ -1849,7 +1850,6 @@ static void P_AdjustMobjFloorZ_PolyObjs(mobj_t *mo, subsector_t *subsec)
static void P_RingZMovement(mobj_t *mo) static void P_RingZMovement(mobj_t *mo)
{ {
I_Assert(mo != NULL);
I_Assert(!P_MobjWasRemoved(mo)); I_Assert(!P_MobjWasRemoved(mo));
// Intercept the stupid 'fall through 3dfloors' bug // Intercept the stupid 'fall through 3dfloors' bug
@@ -1884,7 +1884,6 @@ static void P_RingZMovement(mobj_t *mo)
boolean P_CheckDeathPitCollide(mobj_t *mo) boolean P_CheckDeathPitCollide(mobj_t *mo)
{ {
I_Assert(mo != NULL);
I_Assert(!P_MobjWasRemoved(mo)); I_Assert(!P_MobjWasRemoved(mo));
const INT32 secspecial = GETSECSPECIAL(mo->subsector->sector->special, 1); const INT32 secspecial = GETSECSPECIAL(mo->subsector->sector->special, 1);
@@ -1901,7 +1900,6 @@ boolean P_CheckDeathPitCollide(mobj_t *mo)
boolean P_CheckSolidLava(mobj_t *mo, ffloor_t *rover) boolean P_CheckSolidLava(mobj_t *mo, ffloor_t *rover)
{ {
I_Assert(mo != NULL);
I_Assert(!P_MobjWasRemoved(mo)); I_Assert(!P_MobjWasRemoved(mo));
if (rover->flags & FF_SWIMMABLE && GETSECSPECIAL(rover->master->frontsector->special, 1) == 3 if (rover->flags & FF_SWIMMABLE && GETSECSPECIAL(rover->master->frontsector->special, 1) == 3
@@ -1920,7 +1918,6 @@ static boolean P_ZMovement(mobj_t *mo)
{ {
fixed_t dist, delta; fixed_t dist, delta;
I_Assert(mo != NULL);
I_Assert(!P_MobjWasRemoved(mo)); I_Assert(!P_MobjWasRemoved(mo));
// Intercept the stupid 'fall through 3dfloors' bug // Intercept the stupid 'fall through 3dfloors' bug
@@ -2377,7 +2374,6 @@ static boolean P_ZMovement(mobj_t *mo)
static void P_PlayerZMovement(mobj_t *mo) static void P_PlayerZMovement(mobj_t *mo)
{ {
I_Assert(mo != NULL);
I_Assert(!P_MobjWasRemoved(mo)); I_Assert(!P_MobjWasRemoved(mo));
if (!mo->player) if (!mo->player)
@@ -2443,6 +2439,7 @@ static void P_PlayerZMovement(mobj_t *mo)
} }
goto nightsdone; goto nightsdone;
} }
// Get up if you fell. // Get up if you fell.
if ((mo->state == &states[mo->info->painstate] || mo->state == &states[S_KART_SPIN]) if ((mo->state == &states[mo->info->painstate] || mo->state == &states[S_KART_SPIN])
&& mo->player->kartstuff[k_spinouttimer] == 0 && mo->player->kartstuff[k_squishedtimer] == 0) // SRB2kart && mo->player->kartstuff[k_spinouttimer] == 0 && mo->player->kartstuff[k_squishedtimer] == 0) // SRB2kart
@@ -2723,6 +2720,7 @@ static boolean P_SceneryZMovement(mobj_t *mo)
P_RemoveMobj(mo); P_RemoveMobj(mo);
return false; return false;
} }
if ((!(mo->eflags & MFE_VERTICALFLIP) && mo->z <= mo->floorz) if ((!(mo->eflags & MFE_VERTICALFLIP) && mo->z <= mo->floorz)
|| (mo->eflags & MFE_VERTICALFLIP && mo->z+mo->height >= mo->ceilingz)) // Hit the floor, so split! || (mo->eflags & MFE_VERTICALFLIP && mo->z+mo->height >= mo->ceilingz)) // Hit the floor, so split!
{ {
@@ -2760,6 +2758,7 @@ static boolean P_SceneryZMovement(mobj_t *mo)
P_RemoveMobj(mo); P_RemoveMobj(mo);
return false; return false;
} }
// Soniccd seed turns into a flower! // Soniccd seed turns into a flower!
if ((!(mo->eflags & MFE_VERTICALFLIP) && mo->z <= mo->floorz) if ((!(mo->eflags & MFE_VERTICALFLIP) && mo->z <= mo->floorz)
|| (mo->eflags & MFE_VERTICALFLIP && mo->z+mo->height >= mo->ceilingz)) || (mo->eflags & MFE_VERTICALFLIP && mo->z+mo->height >= mo->ceilingz))
@@ -2870,22 +2869,29 @@ void P_MobjCheckWater(mobj_t *mobj)
|| ((rover->flags & FF_BLOCKOTHERS) && !mobj->player))) || ((rover->flags & FF_BLOCKOTHERS) && !mobj->player)))
continue; continue;
topheight = P_GetFFloorTopZAt(rover, mobj->x, mobj->y); fixed_t topcheck, bottomcheck;
bottomheight = P_GetFFloorBottomZAt(rover, mobj->x, mobj->y);
if (mobj->eflags & MFE_VERTICALFLIP) if (mobj->eflags & MFE_VERTICALFLIP)
{ {
if (topheight < (thingtop - FixedMul(mobj->info->height/2, mobj->scale)) topcheck = (thingtop - FixedMul(mobj->info->height/2, mobj->scale));
|| bottomheight > thingtop) bottomcheck = thingtop;
continue;
} }
else else
{ {
if (topheight < mobj->z topcheck = mobj->z;
|| bottomheight > (mobj->z + FixedMul(mobj->info->height/2, mobj->scale))) bottomcheck = (mobj->z + FixedMul(mobj->info->height/2, mobj->scale));
continue;
} }
topheight = P_GetFFloorTopZAt(rover, mobj->x, mobj->y);
if (topheight < topcheck)
continue;
bottomheight = P_GetFFloorBottomZAt(rover, mobj->x, mobj->y);
if (bottomheight > bottomcheck)
continue;
// Set the watertop and waterbottom // Set the watertop and waterbottom
mobj->watertop = topheight; mobj->watertop = topheight;
mobj->waterbottom = bottomheight; mobj->waterbottom = bottomheight;
@@ -3092,10 +3098,13 @@ static void P_SceneryCheckWater(mobj_t *mobj)
continue; continue;
topheight = P_GetFFloorTopZAt(rover, mobj->x, mobj->y); topheight = P_GetFFloorTopZAt(rover, mobj->x, mobj->y);
if (topheight <= mobj->z)
continue;
bottomheight = P_GetFFloorBottomZAt(rover, mobj->x, mobj->y); bottomheight = P_GetFFloorBottomZAt(rover, mobj->x, mobj->y);
if (topheight <= mobj->z if (bottomheight > (mobj->z + FixedMul(mobj->info->height >> 1, mobj->scale)))
|| bottomheight > (mobj->z + FixedMul(mobj->info->height >> 1, mobj->scale)))
continue; continue;
if (mobj->z + FixedMul(mobj->info->height, mobj->scale) > topheight) if (mobj->z + FixedMul(mobj->info->height, mobj->scale) > topheight)
@@ -3360,7 +3369,6 @@ static void P_PlayerMobjThinker(mobj_t *mobj)
{ {
msecnode_t *node; msecnode_t *node;
I_Assert(mobj != NULL);
I_Assert(mobj->player != NULL); I_Assert(mobj->player != NULL);
I_Assert(!P_MobjWasRemoved(mobj)); I_Assert(!P_MobjWasRemoved(mobj));
@@ -3375,7 +3383,9 @@ static void P_PlayerMobjThinker(mobj_t *mobj)
mobj->eflags &= ~MFE_JUSTSTEPPEDDOWN; mobj->eflags &= ~MFE_JUSTSTEPPEDDOWN;
// Zoom tube // Zoom tube
if (UNLIKELY(mobj->tracer && mobj->tracer->type == MT_TUBEWAYPOINT)) if (mobj->tracer)
{
if (mobj->tracer->type == MT_TUBEWAYPOINT)
{ {
P_UnsetThingPosition(mobj); P_UnsetThingPosition(mobj);
mobj->x += mobj->momx; mobj->x += mobj->momx;
@@ -3385,11 +3395,12 @@ static void P_PlayerMobjThinker(mobj_t *mobj)
P_CheckPosition(mobj, mobj->x, mobj->y); P_CheckPosition(mobj, mobj->x, mobj->y);
goto animonly; goto animonly;
} }
else if (UNLIKELY(mobj->player->pflags & PF_MACESPIN && mobj->tracer)) else if (UNLIKELY(mobj->player->pflags & PF_MACESPIN))
{ {
P_CheckPosition(mobj, mobj->x, mobj->y); P_CheckPosition(mobj, mobj->x, mobj->y);
goto animonly; goto animonly;
} }
}
// Needed for gravity boots // Needed for gravity boots
P_CheckGravity(mobj, false); P_CheckGravity(mobj, false);
@@ -3404,24 +3415,30 @@ static void P_PlayerMobjThinker(mobj_t *mobj)
else else
P_TryMove(mobj, mobj->x, mobj->y, true); P_TryMove(mobj, mobj->x, mobj->y, true);
if (LIKELY(!(netgame && mobj->player->spectator))) if (!(netgame && mobj->player->spectator))
{ {
// Crumbling platforms // Crumbling platforms
for (node = mobj->touching_sectorlist; node; node = node->m_sectorlist_next) for (node = mobj->touching_sectorlist; node; node = node->m_sectorlist_next)
{ {
fixed_t topheight, bottomheight;
ffloor_t *rover; ffloor_t *rover;
for (rover = node->m_sector->ffloors; rover; rover = rover->next) for (rover = node->m_sector->ffloors; rover; rover = rover->next)
{ {
boolean oncrumble;
if (!(rover->flags & FF_EXISTS) || !(rover->flags & FF_CRUMBLE)) if (!(rover->flags & FF_EXISTS) || !(rover->flags & FF_CRUMBLE))
continue; continue;
topheight = P_GetSpecialTopZ(mobj, sectors + rover->secnum, node->m_sector); if (mobj->eflags & MFE_VERTICALFLIP)
bottomheight = P_GetSpecialBottomZ(mobj, sectors + rover->secnum, node->m_sector); {
oncrumble = P_GetSpecialBottomZ(mobj, sectors + rover->secnum, node->m_sector) == mobj->z + mobj->height; // You nut.
}
else
{
oncrumble = P_GetSpecialTopZ(mobj, sectors + rover->secnum, node->m_sector) == mobj->z;
}
if ((topheight == mobj->z && !(mobj->eflags & MFE_VERTICALFLIP)) if (oncrumble)
|| (bottomheight == mobj->z + mobj->height && mobj->eflags & MFE_VERTICALFLIP)) // You nut.
EV_StartCrumble(rover->master->frontsector, rover, (rover->flags & FF_FLOATBOB), mobj->player, rover->alpha, !(rover->flags & FF_NORETURN)); EV_StartCrumble(rover->master->frontsector, rover, (rover->flags & FF_FLOATBOB), mobj->player, rover->alpha, !(rover->flags & FF_NORETURN));
} }
} }
@@ -3524,11 +3541,9 @@ animonly:
static void P_CalculatePrecipFloor(precipmobj_t *mobj) static void P_CalculatePrecipFloor(precipmobj_t *mobj)
{ {
// recalculate floorz each time // recalculate floorz each time
const sector_t *sec; const sector_t *sec = (mobj && mobj->subsector) ? mobj->subsector->sector : NULL;
if (mobj && mobj->subsector && mobj->subsector->sector) if (!sec)
sec = mobj->subsector->sector;
else
return; return;
mobj->floorz = P_GetSectorFloorZAt(sec, mobj->x, mobj->y); mobj->floorz = P_GetSectorFloorZAt(sec, mobj->x, mobj->y);
@@ -3622,8 +3637,10 @@ boolean P_PrecipThinker(precipmobj_t *mobj)
return true; return true;
// only recalc this twice a second (doubt anyone will notice this lulul) // only recalc this twice a second (doubt anyone will notice this lulul)
if ((leveltime % 17) == 0) if ((leveltime % (TICRATE/2)) == 0)
{
P_CalculatePrecipFloor(mobj); P_CalculatePrecipFloor(mobj);
}
// adjust height // adjust height
if ((mobj->z += mobj->momz) <= mobj->floorz) if ((mobj->z += mobj->momz) <= mobj->floorz)
@@ -9007,10 +9024,9 @@ static void P_FiringThink(mobj_t *mobj)
// //
void P_MobjThinker(mobj_t *mobj) void P_MobjThinker(mobj_t *mobj)
{ {
I_Assert(mobj != NULL);
I_Assert(!P_MobjWasRemoved(mobj)); I_Assert(!P_MobjWasRemoved(mobj));
if (UNLIKELY(mobj->flags & MF_NOTHINK)) if (mobj->flags & MF_NOTHINK)
return; return;
// Remove dead target/tracer. // Remove dead target/tracer.
@@ -9111,7 +9127,6 @@ void P_MobjThinker(mobj_t *mobj)
if (mobj->fuse && !P_FuseThink(mobj)) if (mobj->fuse && !P_FuseThink(mobj))
return; return;
I_Assert(mobj != NULL);
I_Assert(!P_MobjWasRemoved(mobj)); I_Assert(!P_MobjWasRemoved(mobj));
if (mobj->momx || mobj->momy || (mobj->flags2 & MF2_SKULLFLY)) if (mobj->momx || mobj->momy || (mobj->flags2 & MF2_SKULLFLY))
@@ -9207,7 +9222,6 @@ boolean P_RailThinker(mobj_t *mobj)
{ {
fixed_t x, y, z; fixed_t x, y, z;
I_Assert(mobj != NULL);
I_Assert(!P_MobjWasRemoved(mobj)); I_Assert(!P_MobjWasRemoved(mobj));
x = mobj->x, y = mobj->y, z = mobj->z; x = mobj->x, y = mobj->y, z = mobj->z;
@@ -9233,7 +9247,6 @@ void P_PushableThinker(mobj_t *mobj)
{ {
sector_t *sec; sector_t *sec;
I_Assert(mobj != NULL);
I_Assert(!P_MobjWasRemoved(mobj)); I_Assert(!P_MobjWasRemoved(mobj));
if (!mobj) if (!mobj)
@@ -9271,12 +9284,13 @@ void P_PushableThinker(mobj_t *mobj)
x = mobj->spawnpoint->x << FRACBITS; x = mobj->spawnpoint->x << FRACBITS;
y = mobj->spawnpoint->y << FRACBITS; y = mobj->spawnpoint->y << FRACBITS;
ss = R_PointInSubsector(x, y);
if (mobj->spawnpoint->z != 0) if (mobj->spawnpoint->z != 0)
z = mobj->spawnpoint->z << FRACBITS; z = mobj->spawnpoint->z << FRACBITS;
else else
{
ss = R_PointInSubsector(x, y);
z = ss->sector->floorheight; z = ss->sector->floorheight;
}
spawnmo = P_SpawnMobj(x, y, z, mobj->type); spawnmo = P_SpawnMobj(x, y, z, mobj->type);
if (spawnmo) if (spawnmo)
@@ -10324,8 +10338,6 @@ void P_PrecipitationEffects(void)
return; return;
} }
boolean sounds_rain = ((cv_drawdist_precip.value != 0) && rainsfx && (!leveltime || leveltime % 80 == 1));
// Currently thunderstorming with lightning, and we're sounding the thunder... // Currently thunderstorming with lightning, and we're sounding the thunder...
// and where there's thunder, there's gotta be lightning! // and where there's thunder, there's gotta be lightning!
if (effects_lightning && lightningStrike) if (effects_lightning && lightningStrike)
@@ -10347,6 +10359,8 @@ void P_PrecipitationEffects(void)
if (sound_disabled) if (sound_disabled)
return; // Sound off? D'aw, no fun. return; // Sound off? D'aw, no fun.
const boolean sounds_rain = ((cv_drawdist_precip.value != 0) && rainsfx && (!leveltime || leveltime % 80 == 1));
if (!sounds_rain && !sounds_thunder) if (!sounds_rain && !sounds_thunder)
return; // no need to calculate volume at ALL return; // no need to calculate volume at ALL
@@ -11835,8 +11849,6 @@ void P_SpawnHoops(mapthing_t *mthing)
x = mthing->x << FRACBITS; x = mthing->x << FRACBITS;
y = mthing->y << FRACBITS; y = mthing->y << FRACBITS;
sec = R_PointInSubsector(x, y)->sector;
// Save our flags! // Save our flags!
if (mthing->type == 1713) if (mthing->type == 1713)
z = (mthing->options >> ZSHIFT) << FRACBITS; z = (mthing->options >> ZSHIFT) << FRACBITS;
@@ -11848,6 +11860,8 @@ void P_SpawnHoops(mapthing_t *mthing)
if (P_MobjWasRemoved(hoopcenter)) if (P_MobjWasRemoved(hoopcenter))
return; return;
sec = R_PointInSubsector(x, y)->sector;
hoopcenter->spawnpoint = mthing; hoopcenter->spawnpoint = mthing;
z += P_GetSectorFloorZAt(sec, x, y); z += P_GetSectorFloorZAt(sec, x, y);
-4
View File
@@ -421,10 +421,6 @@ typedef struct mobj_s
// //
// For precipitation // For precipitation
// //
// Sometimes this is casted to a mobj_t,
// so please keep the start of the
// structure the same.
//
typedef struct precipmobj_s typedef struct precipmobj_s
{ {
// List: thinker links. // List: thinker links.
+2 -1
View File
@@ -166,7 +166,8 @@ static void P_ReconfigureVertexSlope(pslope_t *slope)
slope->real_xydirection = R_PointToAngle2(0, 0, slope->d.x, slope->d.y)+ANGLE_180; slope->real_xydirection = R_PointToAngle2(0, 0, slope->d.x, slope->d.y)+ANGLE_180;
slope->real_zangle = InvAngle(R_PointToAngle2(0, 0, FRACUNIT, slope->zdelta)); slope->real_zangle = InvAngle(R_PointToAngle2(0, 0, FRACUNIT, slope->zdelta));
if (slope->normal.x == 0 && slope->normal.y == 0) // Set some defaults for a non-sloped "slope" // Set some defaults for a non-sloped "slope"
if (slope->normal.x == 0 && slope->normal.y == 0)
{ {
slope->zangle = slope->xydirection = 0; slope->zangle = slope->xydirection = 0;
slope->zdelta = slope->d.x = slope->d.y = 0; slope->zdelta = slope->d.x = slope->d.y = 0;
+2 -1
View File
@@ -4441,12 +4441,13 @@ static void P_RunSpecialSectorCheck(player_t *player, sector_t *sector)
} }
f_affectpoint = P_GetSpecialBottomZ(player->mo, sector, sector); f_affectpoint = P_GetSpecialBottomZ(player->mo, sector, sector);
c_affectpoint = P_GetSpecialTopZ(player->mo, sector, sector);
// Only go further if on the ground // Only go further if on the ground
if ((sector->flags & SF_FLIPSPECIAL_FLOOR) && !(sector->flags & SF_FLIPSPECIAL_CEILING) && player->mo->z != f_affectpoint) if ((sector->flags & SF_FLIPSPECIAL_FLOOR) && !(sector->flags & SF_FLIPSPECIAL_CEILING) && player->mo->z != f_affectpoint)
return; return;
c_affectpoint = P_GetSpecialTopZ(player->mo, sector, sector);
if ((sector->flags & SF_FLIPSPECIAL_CEILING) && !(sector->flags & SF_FLIPSPECIAL_FLOOR) && player->mo->z + player->mo->height != c_affectpoint) if ((sector->flags & SF_FLIPSPECIAL_CEILING) && !(sector->flags & SF_FLIPSPECIAL_FLOOR) && player->mo->z + player->mo->height != c_affectpoint)
return; return;
+15 -5
View File
@@ -157,6 +157,7 @@ void P_CalcHeight(player_t *player)
if (player->viewz > mo->ceilingz - FixedMul(FRACUNIT, mo->scale)) if (player->viewz > mo->ceilingz - FixedMul(FRACUNIT, mo->scale))
player->viewz = mo->ceilingz - FixedMul(FRACUNIT, mo->scale); player->viewz = mo->ceilingz - FixedMul(FRACUNIT, mo->scale);
} }
return; return;
} }
@@ -774,7 +775,7 @@ boolean P_IsObjectInGoop(mobj_t *mo)
// //
boolean P_IsObjectOnGround(mobj_t *mo) boolean P_IsObjectOnGround(mobj_t *mo)
{ {
if (UNLIKELY(P_IsObjectInGoop(mo))) if (P_IsObjectInGoop(mo))
{ {
// but I don't want you to ever 'stand' while submerged in goo. // but I don't want you to ever 'stand' while submerged in goo.
// You're in constant vertical momentum, even if you get stuck on something. // You're in constant vertical momentum, even if you get stuck on something.
@@ -1392,7 +1393,8 @@ static void P_CheckBustableBlocks(player_t *player)
for (rover = node->m_sector->ffloors; rover; rover = rover->next) for (rover = node->m_sector->ffloors; rover; rover = rover->next)
{ {
if (!(rover->flags & FF_EXISTS)) continue; if (!(rover->flags & FF_EXISTS))
continue;
if ((rover->flags & FF_BUSTUP)/* && !rover->master->frontsector->crumblestate*/) if ((rover->flags & FF_BUSTUP)/* && !rover->master->frontsector->crumblestate*/)
{ {
@@ -1512,11 +1514,12 @@ static void P_CheckBouncySectors(player_t *player)
continue; // this sector type is required for FOFs to be bouncy continue; // this sector type is required for FOFs to be bouncy
topheight = P_GetFOFTopZ(player->mo, node->m_sector, rover, player->mo->x, player->mo->y, NULL); topheight = P_GetFOFTopZ(player->mo, node->m_sector, rover, player->mo->x, player->mo->y, NULL);
bottomheight = P_GetFOFBottomZ(player->mo, node->m_sector, rover, player->mo->x, player->mo->y, NULL);
if (player->mo->z > topheight) if (player->mo->z > topheight)
continue; continue;
bottomheight = P_GetFOFBottomZ(player->mo, node->m_sector, rover, player->mo->x, player->mo->y, NULL);
if (player->mo->z + player->mo->height < bottomheight) if (player->mo->z + player->mo->height < bottomheight)
continue; continue;
@@ -2109,7 +2112,6 @@ void P_ElementalFireTrail(player_t *player)
INT32 i; INT32 i;
I_Assert(player != NULL); I_Assert(player != NULL);
I_Assert(player->mo != NULL);
I_Assert(!P_MobjWasRemoved(player->mo)); I_Assert(!P_MobjWasRemoved(player->mo));
if (player->mo->eflags & MFE_VERTICALFLIP) if (player->mo->eflags & MFE_VERTICALFLIP)
@@ -2271,7 +2273,8 @@ static void P_MovePlayer(player_t *player)
} }
//CONS_Printf("applied turn: %d\n", angle_diff); //CONS_Printf("applied turn: %d\n", angle_diff);
if (add_delta) { if (add_delta)
{
player->mo->angle += angle_diff << TICCMD_REDUCE; player->mo->angle += angle_diff << TICCMD_REDUCE;
player->mo->angle &= ~0xFFFF; // Try to keep the turning somewhat similar to how it was before? player->mo->angle &= ~0xFFFF; // Try to keep the turning somewhat similar to how it was before?
//CONS_Printf("leftover turn (%s): %5d or %4d%%\n", //CONS_Printf("leftover turn (%s): %5d or %4d%%\n",
@@ -2393,15 +2396,18 @@ static void P_MovePlayer(player_t *player)
{ {
mobj_t *water = P_SpawnMobj(player->mo->x, player->mo->y, mobj_t *water = P_SpawnMobj(player->mo->x, player->mo->y,
((player->mo->eflags & MFE_VERTICALFLIP) ? player->mo->waterbottom - FixedMul(mobjinfo[MT_SPLISH].height, player->mo->scale) : player->mo->watertop), MT_SPLISH); ((player->mo->eflags & MFE_VERTICALFLIP) ? player->mo->waterbottom - FixedMul(mobjinfo[MT_SPLISH].height, player->mo->scale) : player->mo->watertop), MT_SPLISH);
if (player->mo->eflags & MFE_GOOWATER) if (player->mo->eflags & MFE_GOOWATER)
S_StartSound(water, sfx_ghit); S_StartSound(water, sfx_ghit);
else else
S_StartSound(water, sfx_wslap); S_StartSound(water, sfx_wslap);
if (player->mo->eflags & MFE_VERTICALFLIP) if (player->mo->eflags & MFE_VERTICALFLIP)
{ {
water->flags2 |= MF2_OBJECTFLIP; water->flags2 |= MF2_OBJECTFLIP;
water->eflags |= MFE_VERTICALFLIP; water->eflags |= MFE_VERTICALFLIP;
} }
water->destscale = player->mo->scale; water->destscale = player->mo->scale;
P_SetScale(water, player->mo->scale); P_SetScale(water, player->mo->scale);
} }
@@ -3970,9 +3976,12 @@ boolean P_MoveChaseCamera(player_t *player, camera_t *thiscam, boolean resetcall
{ {
fixed_t panmax = (dist/5); fixed_t panmax = (dist/5);
const INT32 sparkval = K_GetKartDriftSparkValue(player); const INT32 sparkval = K_GetKartDriftSparkValue(player);
pan = FixedDiv(FixedMul(min((fixed_t)player->kartstuff[k_driftcharge], sparkval), panmax), sparkval); pan = FixedDiv(FixedMul(min((fixed_t)player->kartstuff[k_driftcharge], sparkval), panmax), sparkval);
if (pan > panmax) if (pan > panmax)
pan = panmax; pan = panmax;
if (player->kartstuff[k_drift] < 0) if (player->kartstuff[k_drift] < 0)
pan *= -1; pan *= -1;
} }
@@ -4749,6 +4758,7 @@ void P_PlayerThink(player_t *player)
player->mo->flags2 |= MF2_SHADOW; player->mo->flags2 |= MF2_SHADOW;
else else
player->mo->flags2 &= ~MF2_SHADOW; player->mo->flags2 &= ~MF2_SHADOW;
P_DeathThink(player); P_DeathThink(player);
LUA_HookPlayer(player, HOOK(PlayerThink)); LUA_HookPlayer(player, HOOK(PlayerThink));
return; return;
+6 -4
View File
@@ -222,7 +222,8 @@ sector_t *R_FakeFlat(sector_t *sec, sector_t *tempsec, INT32 *floorlightlevel,
tempsec->ceilingheight = s->ceilingheight; tempsec->ceilingheight = s->ceilingheight;
if ((underwater && (tempsec->floorheight = sec->floorheight, if ((underwater && (tempsec->floorheight = sec->floorheight,
tempsec->ceilingheight = s->floorheight - 1, !back)) || viewz <= s->floorheight) tempsec->ceilingheight = s->floorheight - 1, !back)) ||
viewz <= s->floorheight)
{ // head-below-floor hack { // head-below-floor hack
tempsec->floorpic = s->floorpic; tempsec->floorpic = s->floorpic;
tempsec->floor_xoffs = s->floor_xoffs; tempsec->floor_xoffs = s->floor_xoffs;
@@ -258,8 +259,8 @@ sector_t *R_FakeFlat(sector_t *sec, sector_t *tempsec, INT32 *floorlightlevel,
*ceilinglightlevel = s->ceilinglightsec == -1 ? s->lightlevel *ceilinglightlevel = s->ceilinglightsec == -1 ? s->lightlevel
: sectors[s->ceilinglightsec].lightlevel; : sectors[s->ceilinglightsec].lightlevel;
} }
else if (heightsec != -1 && viewz >= sectors[heightsec].ceilingheight else if (heightsec != -1 && viewz >= sectors[heightsec].ceilingheight &&
&& sec->ceilingheight > s->ceilingheight) sec->ceilingheight > s->ceilingheight)
{ // Above-ceiling hack { // Above-ceiling hack
tempsec->ceilingheight = s->ceilingheight; tempsec->ceilingheight = s->ceilingheight;
tempsec->floorheight = s->ceilingheight + 1; tempsec->floorheight = s->ceilingheight + 1;
@@ -296,7 +297,8 @@ sector_t *R_FakeFlat(sector_t *sec, sector_t *tempsec, INT32 *floorlightlevel,
*ceilinglightlevel = s->ceilinglightsec == -1 ? s->lightlevel : *ceilinglightlevel = s->ceilinglightsec == -1 ? s->lightlevel :
sectors[s->ceilinglightsec].lightlevel; sectors[s->ceilinglightsec].lightlevel;
} }
sec = tempsec;
sec = tempsec; // Use other sector
} }
return sec; return sec;
+10 -9
View File
@@ -531,11 +531,10 @@ typedef struct seg_s
vertex_t *v1; vertex_t *v1;
vertex_t *v2; vertex_t *v2;
INT32 side; #ifdef HWRENDER
floatvertex_t fv1; // v1 in floats - precalculated
fixed_t offset; floatvertex_t fv2; // v2 in floats - precalculated
#endif
angle_t angle;
side_t *sidedef; side_t *sidedef;
line_t *linedef; line_t *linedef;
@@ -545,11 +544,13 @@ typedef struct seg_s
sector_t *frontsector; sector_t *frontsector;
sector_t *backsector; sector_t *backsector;
INT32 side;
fixed_t length; // precalculated seg length fixed_t length; // precalculated seg length
#ifdef HWRENDER fixed_t offset;
floatvertex_t fv1; // v1 in floats - precalculated
floatvertex_t fv2; // v2 in floats - precalculated angle_t angle;
#endif
polyobj_t *polyseg; polyobj_t *polyseg;
// Fake contrast calculated on level load // Fake contrast calculated on level load
+3
View File
@@ -533,8 +533,11 @@ typedef struct drawcolumndata_temp_s
UINT8 *buf; UINT8 *buf;
INT32 startx; INT32 startx;
ColumnFlushType type; ColumnFlushType type;
INT32 commontop, commonbot; INT32 commontop, commonbot;
UINT8 *transmap; UINT8 *transmap;
// SoM 7-28-04: Fix the fuzz problem. // SoM 7-28-04: Fix the fuzz problem.
UINT8 *translation; UINT8 *translation;
+1
View File
@@ -443,6 +443,7 @@ void *Patch_AllocateHardwarePatch(patch_t *patch)
GLPatch_t *glPatch = static_cast<GLPatch_t*>(Z_Calloc(sizeof(GLPatch_t), PU_HWRPATCHINFO, &patch->hardware)); GLPatch_t *glPatch = static_cast<GLPatch_t*>(Z_Calloc(sizeof(GLPatch_t), PU_HWRPATCHINFO, &patch->hardware));
glPatch->mipmap = static_cast<GLMipmap_t*>(Z_Calloc(sizeof(GLMipmap_t), PU_HWRPATCHINFO, &glPatch->mipmap)); glPatch->mipmap = static_cast<GLMipmap_t*>(Z_Calloc(sizeof(GLMipmap_t), PU_HWRPATCHINFO, &glPatch->mipmap));
} }
return (void *)(patch->hardware); return (void *)(patch->hardware);
} }
+3 -2
View File
@@ -166,11 +166,13 @@ static void R_InstallSpriteLump(UINT16 wad, // graphics patch
CONS_Debug(DBG_SETUP, "R_InitSprites: Sprite %s frame %c has rotations and a rot = 0 lump\n", spritename, cn); CONS_Debug(DBG_SETUP, "R_InitSprites: Sprite %s frame %c has rotations and a rot = 0 lump\n", spritename, cn);
sprtemp[frame].rotate = SRF_SINGLE; sprtemp[frame].rotate = SRF_SINGLE;
for (r = 0; r < 8; r++) for (r = 0; r < 8; r++)
{ {
sprtemp[frame].lumppat[r] = lumppat; sprtemp[frame].lumppat[r] = lumppat;
sprtemp[frame].lumpid[r] = lumpid; sprtemp[frame].lumpid[r] = lumpid;
} }
sprtemp[frame].flip = flipped ? UINT8_MAX : 0; // 11111111 in binary sprtemp[frame].flip = flipped ? UINT8_MAX : 0; // 11111111 in binary
return; return;
} }
@@ -267,8 +269,7 @@ boolean R_AddSingleSpriteDef(const char *sprname, spritedef_t *spritedef, UINT16
if (spritedef->numframes) // (then spriteframes is not null) if (spritedef->numframes) // (then spriteframes is not null)
{ {
// copy the already defined sprite frames // copy the already defined sprite frames
memcpy(sprtemp, spritedef->spriteframes, memcpy(sprtemp, spritedef->spriteframes, spritedef->numframes * sizeof (spriteframe_t));
spritedef->numframes * sizeof (spriteframe_t));
maxframe = spritedef->numframes - 1; maxframe = spritedef->numframes - 1;
} }
+2 -2
View File
@@ -722,12 +722,12 @@ void S_UpdateSounds(void)
if (dedicated || sound_disabled) if (dedicated || sound_disabled)
return; return;
memset(listenmobj, 0, sizeof(listenmobj));
for (i = 0; i <= splitscreen; i++) for (i = 0; i <= splitscreen; i++)
{ {
player_t *player = &players[displayplayers[i]]; player_t *player = &players[displayplayers[i]];
listenmobj[i] = NULL;
if (player->awayviewtics) if (player->awayviewtics)
{ {
listenmobj[i] = player->awayviewmobj; listenmobj[i] = player->awayviewmobj;
+1 -4
View File
@@ -277,10 +277,7 @@ 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;
intermissionbginit = false;
// 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.
+39 -12
View File
@@ -961,6 +961,11 @@ static int joy_open(int playerIndex, int joyIndex)
return SDL_CONTROLLER_AXIS_MAX; return SDL_CONTROLLER_AXIS_MAX;
} }
void I_SetJoystickFocus(void)
{
SDL_SetHint(SDL_HINT_JOYSTICK_ALLOW_BACKGROUND_EVENTS, cv_gamepadifunfocused.value ? "1" : "0");
}
// //
// I_InitJoystick // I_InitJoystick
// //
@@ -975,6 +980,18 @@ void I_InitJoystick(UINT8 index)
if (M_CheckParm("-nojoy")) if (M_CheckParm("-nojoy"))
return; return;
{
char dbpath[1024];
sprintf(dbpath, "%s" PATHSEP "gamecontrollerdb.txt", srb2path);
SDL_GameControllerAddMappingsFromFile(dbpath);
}
{
char dbpath[1024];
sprintf(dbpath, "%s" PATHSEP "gamecontrollerdb_user.txt", srb2home);
SDL_GameControllerAddMappingsFromFile(dbpath);
}
if (M_CheckParm("-noxinput")) if (M_CheckParm("-noxinput"))
SDL_SetHintWithPriority("SDL_XINPUT_ENABLED", "0", SDL_HINT_OVERRIDE); SDL_SetHintWithPriority("SDL_XINPUT_ENABLED", "0", SDL_HINT_OVERRIDE);
@@ -1645,11 +1662,17 @@ static void I_PrintSignal(INT32 signal_num, boolean core_dumped, char *signal_ms
signame = "SIGSEGV"; signame = "SIGSEGV";
break; break;
#ifdef SIGTERM #ifdef SIGTERM
case SIGTERM: // Software termination signal from kill case SIGTERM: // Software termination signal from terminate
sigmsg = ("SRB2Kart-Saturn was terminated by a kill signal."); sigmsg = ("SRB2Kart-Saturn was terminated by a terminate signal.");
signame = "SIGTERM"; signame = "SIGTERM";
break; break;
#endif #endif
#ifdef SIGKILL
case SIGKILL: // Software termination signal from kill
sigmsg = ("SRB2Kart-Saturn was terminated by a kill signal.");
signame = "SIGKILL";
break;
#endif
#ifdef SIGBREAK #ifdef SIGBREAK
case SIGBREAK: // Ctrl-Break sequence case SIGBREAK: // Ctrl-Break sequence
sigmsg =("SIGBREAK - SRB2Kart-Saturn was terminated by a Ctrl-Break sequence."); sigmsg =("SIGBREAK - SRB2Kart-Saturn was terminated by a Ctrl-Break sequence.");
@@ -1845,9 +1868,7 @@ static void I_RegisterChildSignals(void)
signal(SIGABRT, signal_handler_child); signal(SIGABRT, signal_handler_child);
signal(SIGFPE, signal_handler_child); signal(SIGFPE, signal_handler_child);
} }
#endif
#ifdef NEWSIGNALHANDLER
FUNCNORETURN static ATTRNORETURN void newsignalhandler_Warn(const char *pr) FUNCNORETURN static ATTRNORETURN void newsignalhandler_Warn(const char *pr)
{ {
char text[128]; char text[128];
@@ -1883,6 +1904,18 @@ static void I_Fork(void)
I_RegisterChildSignals(); I_RegisterChildSignals();
break; break;
default: default:
// ignore those, those are handled by child process
// otherwise parent might exit before it
// and the below stuff wont run and your terminal will be left in an awkward state
#ifdef SIGINT
signal(SIGINT, SIG_IGN);
#endif
#ifdef SIGBREAK
signal(SIGBREAK, SIG_IGN);
#endif
#ifdef SIGTERM
signal(SIGTERM, SIG_IGN);
#endif
#ifdef LOGMESSAGES #ifdef LOGMESSAGES
if (logstream) if (logstream)
fclose(logstream);/* the child has this */ fclose(logstream);/* the child has this */
@@ -1891,6 +1924,8 @@ static void I_Fork(void)
#ifdef LOGMESSAGES #ifdef LOGMESSAGES
/* By the way, exit closes files. */ /* By the way, exit closes files. */
logstream = fopen(logfilename, "at"); logstream = fopen(logfilename, "at");
#else
logstream = 0;
#endif #endif
if (c == -1) if (c == -1)
{ {
@@ -1973,7 +2008,6 @@ FUNCNORETURN void ATTRNORETURN I_Quit(void)
is_quitting = true; is_quitting = true;
SDL_ShowCursor(SDL_TRUE); SDL_ShowCursor(SDL_TRUE);
I_ShutdownConsole();
M_SaveConfig(NULL); //save game config, cvars.. M_SaveConfig(NULL); //save game config, cvars..
D_SaveBan(); // save the ban list D_SaveBan(); // save the ban list
G_SaveGameData(false); // Tails 12-08-2002 G_SaveGameData(false); // Tails 12-08-2002
@@ -2002,7 +2036,6 @@ FUNCNORETURN void ATTRNORETURN I_Quit(void)
if (myargmalloc) if (myargmalloc)
free(myargv); // Deallocate allocated memory free(myargv); // Deallocate allocated memory
W_Shutdown();
exit(0); exit(0);
} }
@@ -2062,7 +2095,6 @@ FUNCIERROR void ATTRNORETURN I_Error(const char *error, ...)
sigttl = "SRB2Kart " VERSIONSTRING " Recursive Error"; sigttl = "SRB2Kart " VERSIONSTRING " Recursive Error";
I_ShowSimpleErrorBox(sigttl, buffer); I_ShowSimpleErrorBox(sigttl, buffer);
W_Shutdown();
exit(-1); // recursive errors detected exit(-1); // recursive errors detected
} }
} }
@@ -2081,8 +2113,6 @@ FUNCIERROR void ATTRNORETURN I_Error(const char *error, ...)
// --- // ---
I_ShutdownConsole();
M_SaveConfig(NULL); // save game config, cvars.. M_SaveConfig(NULL); // save game config, cvars..
D_SaveBan(); // save the ban list D_SaveBan(); // save the ban list
G_SaveGameData(false); // Tails 12-08-2002 G_SaveGameData(false); // Tails 12-08-2002
@@ -2104,8 +2134,6 @@ FUNCIERROR void ATTRNORETURN I_Error(const char *error, ...)
//I_ShowSimpleErrorBox(sigttl, buffer); //I_ShowSimpleErrorBox(sigttl, buffer);
I_ShowErrorBox(sigttl, buffer); I_ShowErrorBox(sigttl, buffer);
W_Shutdown();
#if defined (PARANOIA) && defined (__CYGWIN__) #if defined (PARANOIA) && defined (__CYGWIN__)
*(INT32 *)2 = 4; //Alam: Debug! *(INT32 *)2 = 4; //Alam: Debug!
#endif #endif
@@ -2306,7 +2334,6 @@ char *I_GetUserName(void)
strncpy(username, p, MAXPLAYERNAME); strncpy(username, p, MAXPLAYERNAME);
} }
if (!fastcmp(username, "")) if (!fastcmp(username, ""))
return username; return username;
-1
View File
@@ -108,7 +108,6 @@ static void KeyboardLayout_OnChange(void)
{ {
if (cv_keyboardlayout.value != 2) if (cv_keyboardlayout.value != 2)
SDL_StopTextInput(); SDL_StopTextInput();
HU_Shiftform();
} }
static CV_PossibleValue_t keyboardlayout_cons_t[] = {{1,"Default US"}, {2, "Native"}, {3, "AZERTY"}, {0, NULL}}; static CV_PossibleValue_t keyboardlayout_cons_t[] = {{1,"Default US"}, {2, "Native"}, {3, "AZERTY"}, {0, NULL}};
+13 -2
View File
@@ -240,7 +240,18 @@ void OglSdlFinishUpdate(SDL_Window *window)
} }
#endif #endif
HWR_DrawScreenFinalTexture(sdlw, sdlh, HWR_ShouldUsePaletteRendering()); if (HWR_ShouldUsePaletteRendering())
{
// Final postprocess step of palette rendering, after everything else has been drawn.
GL_SetShader(HWR_GetShaderFromTarget(SHADER_PALETTE_POSTPROCESS));
GL_EnableShader();
HWR_DrawScreenFinalTexture(sdlw, sdlh);
GL_UnSetShader();
}
else
{
HWR_DrawScreenFinalTexture(sdlw, sdlh);
}
#ifdef USE_FBO_OGL #ifdef USE_FBO_OGL
if (usefbo) if (usefbo)
@@ -261,7 +272,7 @@ void OglSdlFinishUpdate(SDL_Window *window)
#else #else
if (!I_CheckNativeRes() || WipeInAction) if (!I_CheckNativeRes() || WipeInAction)
#endif #endif
HWR_DrawScreenFinalTexture(realwidth, realheight, false); HWR_DrawScreenFinalTexture(realwidth, realheight);
} }
#endif //HWRENDER #endif //HWRENDER
+1 -1
View File
@@ -128,7 +128,7 @@ wadfile_t *wadfiles[MAX_WADFILES] = {}; // 0 to numwadfiles-1 are valid
// If not done on a Mac then open wad files // If not done on a Mac then open wad files
// can prevent removable media they are on from // can prevent removable media they are on from
// being ejected // being ejected
void W_Shutdown(void) DESTRUCTOR static void W_Shutdown(void)
{ {
lumpnum_map_cleanup(&lumpnumcache); lumpnum_map_cleanup(&lumpnumcache);
-2
View File
@@ -154,8 +154,6 @@ extern wadfile_t *wadfiles[MAX_WADFILES];
// ========================================================================= // =========================================================================
void W_Shutdown(void);
// Opens a WAD file. Returns the FILE * handle for the file, or NULL if not found or could not be opened // Opens a WAD file. Returns the FILE * handle for the file, or NULL if not found or could not be opened
FILE *W_OpenWadFile(const char **filename, boolean useerrors); FILE *W_OpenWadFile(const char **filename, boolean useerrors);
// Load and add a wadfile to the active wad files, returns numbers of lumps, INT16_MAX on error // Load and add a wadfile to the active wad files, returns numbers of lumps, INT16_MAX on error
+3 -1
View File
@@ -330,7 +330,7 @@ static void Y_PlayerStandingsDrawer(y_data_t *standings, INT32 x, INT32 hilicol)
V_DrawCenteredString(x+6, y, 0, va("%d", standings->pos[i])); V_DrawCenteredString(x+6, y, 0, va("%d", standings->pos[i]));
// localskins are amazing // localskins are amazing
if (standings->color[i] != SKINCOLOR_NONE) if (*standings->color[i] != SKINCOLOR_NONE)
{ {
UINT8 *colormap = R_GetTranslationColormap(*standings->character[i], *standings->color[i], GTC_CACHE); UINT8 *colormap = R_GetTranslationColormap(*standings->character[i], *standings->color[i], GTC_CACHE);
INT32 skinnum = (player->localskin ? (player->localskin - 1) : *standings->character[i]); INT32 skinnum = (player->localskin ? (player->localskin - 1) : *standings->character[i]);
@@ -433,6 +433,7 @@ void Y_IntermissionDrawer(void)
return; return;
if (cv_betainterscreen.value == 1 if (cv_betainterscreen.value == 1
|| !intermissionbginit
#ifdef HWRENDER #ifdef HWRENDER
|| (rendermode == render_opengl && cv_glscreentextures.value != 2) // use the neato kart bg for intermission on disabled screen textures || (rendermode == render_opengl && cv_glscreentextures.value != 2) // use the neato kart bg for intermission on disabled screen textures
#endif #endif
@@ -794,6 +795,7 @@ void Y_EndIntermission(void)
endtic = -1; endtic = -1;
sorttic = -1; sorttic = -1;
intertype = int_none; intertype = int_none;
intermissionbginit = false; // not sure if this is the right place to reset, but i guess it works for now....
} }
// //