Compare commits
244
Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
89cecb88f5 | ||
|
|
baf5c8d66b | ||
|
|
72000c4546 | ||
|
|
82b774b2c3 | ||
|
|
3818b9ad1a | ||
|
|
ca8e811bd9 | ||
|
|
97ca034037 | ||
|
|
ac46f7ed00 | ||
|
|
0afed59329 | ||
|
|
ec3a1fee70 | ||
|
|
5e8c0c3806 | ||
|
|
05ea898345 | ||
|
|
0c1fdc0be8 | ||
|
|
0e4c72e6f6 | ||
|
|
29b83903ef | ||
|
|
1cae09fa11 | ||
|
|
4a56819bc3 | ||
|
|
567a48aac3 | ||
|
|
d100401c5f | ||
|
|
6dee9fa561 | ||
|
|
5bd7a09d9f | ||
|
|
47477c2d03 | ||
|
|
cd128a1084 | ||
|
|
34f2afa3d9 | ||
|
|
22f285edec | ||
|
|
592abdef96 | ||
|
|
a27eee8e2f | ||
|
|
904019d24b | ||
|
|
c6ca5a6f0f | ||
|
|
2392f0484c | ||
|
|
986a131a36 | ||
|
|
e9685ef3e8 | ||
|
|
59f194cb9d | ||
|
|
99d5590435 | ||
|
|
22a6be76b5 | ||
|
|
d3d25df3c5 | ||
|
|
2a3f9e9ee6 | ||
|
|
31f01fd5da | ||
|
|
bb9a4a0da0 | ||
|
|
3bac722562 | ||
|
|
3769ab74ac | ||
|
|
c3d6cdd272 | ||
|
|
093602fd6b | ||
|
|
9b2cfe51d6 | ||
|
|
a80d119c58 | ||
|
|
66619f42f9 | ||
|
|
1cdc92a62b | ||
|
|
6b8de308b7 | ||
|
|
310e64d8be | ||
|
|
890677e2b5 | ||
|
|
d2d3afc7f4 | ||
|
|
c26d2faee9 | ||
|
|
1c82c338a5 | ||
|
|
c81cd48552 | ||
|
|
306f7d455e | ||
|
|
dc40befa88 | ||
|
|
2222272d6f | ||
|
|
1849d5aade | ||
|
|
3878c2f72a | ||
|
|
7cf3bceaff | ||
|
|
1e394b0530 | ||
|
|
b09660204a | ||
|
|
7b4592377e | ||
|
|
45ba69a45a | ||
|
|
4d9c345202 | ||
|
|
1105526eb1 | ||
|
|
d963df36f1 | ||
|
|
0437952027 | ||
|
|
d188839d0b | ||
|
|
86ac11f877 | ||
|
|
0f59e0e270 | ||
|
|
cd32270ec0 | ||
|
|
f2a7f9ccaa | ||
|
|
846967cb91 | ||
|
|
6c8862ee4b | ||
|
|
2c2ffe36d7 | ||
|
|
951b880acb | ||
|
|
ecfa973e6b | ||
|
|
749b87b4ca | ||
|
|
7f671e4e30 | ||
|
|
ee0e4836f5 | ||
|
|
a01cd628ab | ||
|
|
4a4e668d21 | ||
|
|
03c579769c | ||
|
|
2e88b6a1dd | ||
|
|
a49ea4defd | ||
|
|
5265b147f5 | ||
|
|
b4a37a2fa4 | ||
|
|
93eb2b336d | ||
|
|
30acdca9d3 | ||
|
|
677b34c174 | ||
|
|
3c776b321d | ||
|
|
1ed9bfc9b4 | ||
|
|
a05413d925 | ||
|
|
fa9637fba4 | ||
|
|
b3be7bcedc | ||
|
|
19c10be76b | ||
|
|
60222f2f00 | ||
|
|
34edd0a2e3 | ||
|
|
46b485df14 | ||
|
|
8d3632caca | ||
|
|
b5ae9ba733 | ||
|
|
7f50a09bcd | ||
|
|
2a823ecd60 | ||
|
|
940327210f | ||
|
|
e25191d7df | ||
|
|
20a08df1e1 | ||
|
|
4cf27d40e9 | ||
|
|
d18c9a257a | ||
|
|
f4d8a903e8 | ||
|
|
8a8cbffd12 | ||
|
|
0adf356325 | ||
|
|
0fef290858 | ||
|
|
65dc5bb1fd | ||
|
|
e18be33c91 | ||
|
|
9ad6751719 | ||
|
|
86ab994408 | ||
|
|
21f0d603c3 | ||
|
|
971513e7d3 | ||
|
|
03929e551f | ||
|
|
db5ae247b6 | ||
|
|
d46beab34e | ||
|
|
2516873ba1 | ||
|
|
c650394c31 | ||
|
|
9a794232d7 | ||
|
|
db635e5c5b | ||
|
|
8a105a9679 | ||
|
|
46b968a351 | ||
|
|
a9836307b2 | ||
|
|
b6515bb0ae | ||
|
|
b8257e9037 | ||
|
|
1fb6c63097 | ||
|
|
e95382075c | ||
|
|
416a2565f9 | ||
|
|
fa75ad4cdd | ||
|
|
cedddaadfc | ||
|
|
43ec517cdd | ||
|
|
495ad5ce06 | ||
|
|
31ce643311 | ||
|
|
2d9776d792 | ||
|
|
7fa3d119e8 | ||
|
|
b5c1f21ac1 | ||
|
|
86c1b2cbef | ||
|
|
ad828b8f4b | ||
|
|
5dda681c8a | ||
|
|
92df8ffe01 | ||
|
|
2ee8dc09d1 | ||
|
|
b8f9392efd | ||
|
|
e65741acaa | ||
|
|
b36ab31a56 | ||
|
|
99f1166eb1 | ||
|
|
a335da3473 | ||
|
|
7ab8bf1bbf | ||
|
|
c312380944 | ||
|
|
b5bb2b42bf | ||
|
|
d074f375ca | ||
|
|
6fd14f0a80 | ||
|
|
d6bbb2c1b3 | ||
|
|
fa66b87965 | ||
|
|
c59d5db03e | ||
|
|
a994d7c050 | ||
|
|
d2f3d5aa4d | ||
|
|
913b8878d8 | ||
|
|
f02b9f953e | ||
|
|
e46d548080 | ||
|
|
3a7108ecfa | ||
|
|
bcf876a4c4 | ||
|
|
8ab15b73a9 | ||
|
|
301d73a30e | ||
|
|
2ef4e7fcba | ||
|
|
7eb118920f | ||
|
|
2f0588355e | ||
|
|
3e6830fc70 | ||
|
|
2faf859e32 | ||
|
|
8c31fd8a34 | ||
|
|
4dd6d52550 | ||
|
|
8524465767 | ||
|
|
91530c61ad | ||
|
|
89f450db27 | ||
|
|
3e212ebaad | ||
|
|
14af9eb82a | ||
|
|
ed5dbf74f4 | ||
|
|
2bf0a24ab6 | ||
|
|
88a9d6c29e | ||
|
|
335b7ba737 | ||
|
|
37cd720dd6 | ||
|
|
a085abe538 | ||
|
|
57dc099641 | ||
|
|
84a3503262 | ||
|
|
5117bf1f85 | ||
|
|
d4a29f2a44 | ||
|
|
6129e7c864 | ||
|
|
51371dce80 | ||
|
|
4814088265 | ||
|
|
2344c391d2 | ||
|
|
105267612b | ||
|
|
69ef78b2e8 | ||
|
|
f4349988c4 | ||
|
|
1b42131c6f | ||
|
|
c8db86379d | ||
|
|
40d2bf816c | ||
|
|
ca3f40ddf1 | ||
|
|
38bfb58f78 | ||
|
|
1fa50e12a8 | ||
|
|
f73e616b97 | ||
|
|
fe0ade1d9c | ||
|
|
1fb60e8230 | ||
|
|
efe7009650 | ||
|
|
19a4e379d7 | ||
|
|
4e8865d495 | ||
|
|
dfca24b370 | ||
|
|
a4c2fd2414 | ||
|
|
aa985823ba | ||
|
|
b779c9e63d | ||
|
|
c58e54544d | ||
|
|
c080fc8732 | ||
|
|
76747b4677 | ||
|
|
5268fc2d19 | ||
|
|
b6edc90553 | ||
|
|
23735121ff | ||
|
|
20950b698f | ||
|
|
44df85d6a4 | ||
|
|
42d53f1f6f | ||
|
|
48f2d0ff83 | ||
|
|
517723f9c1 | ||
|
|
6915077e0f | ||
|
|
406dbf333d | ||
|
|
a730dfd212 | ||
|
|
3058d365f3 | ||
|
|
ccc453e0b0 | ||
|
|
c3d02090e4 | ||
|
|
20cd7621c3 | ||
|
|
7325c8dbfd | ||
|
|
e5c18ae1f1 | ||
|
|
4bb5b8fa04 | ||
|
|
eb04271c83 | ||
|
|
54e7ad571e | ||
|
|
92ec4e65c1 | ||
|
|
a3e97b90f6 | ||
|
|
6f17ed0883 | ||
|
|
02d6fccfa9 | ||
|
|
0ceaca4b2f | ||
|
|
af9fa77501 | ||
|
|
2049353647 |
No files matched your search
@@ -23,6 +23,7 @@ We also have a Flatpak available on [Flathub](https://flathub.org/en/apps/org.sr
|
|||||||
See [SRB2 Wiki/Source code compiling](http://wiki.srb2.org/wiki/Source_code_compiling). The compiling process for SRB2Kart is largely identical to SRB2.
|
See [SRB2 Wiki/Source code compiling](http://wiki.srb2.org/wiki/Source_code_compiling). The compiling process for SRB2Kart is largely identical to SRB2.
|
||||||
|
|
||||||
Currently only the Makefile build system with GCC or Clang compiler is supported.
|
Currently only the Makefile build system with GCC or Clang compiler is supported.
|
||||||
|
CMake is NOT supported at the moment, but will be availible again soon.
|
||||||
|
|
||||||
Visual C++ (MSVC) is unsupported.
|
Visual C++ (MSVC) is unsupported.
|
||||||
|
|
||||||
|
|||||||
@@ -972,6 +972,14 @@ Public License instead of this License. But first, please read
|
|||||||
Copyright (C) 1995-2018 Free Software Foundation, Inc.
|
Copyright (C) 1995-2018 Free Software Foundation, Inc.
|
||||||
https://www.gnu.org/software/gettext/
|
https://www.gnu.org/software/gettext/
|
||||||
|
|
||||||
|
- FluidSynth
|
||||||
|
Copyright (C) 2000-2025 Peter Hanappe and others.
|
||||||
|
https://www.fluidsynth.org/
|
||||||
|
|
||||||
|
- libsndfile
|
||||||
|
Copyright (C) 1999-2016 Erik de Castro Lopo
|
||||||
|
https://libsndfile.github.io/libsndfile/
|
||||||
|
|
||||||
- mpg123
|
- mpg123
|
||||||
Copyright (c) 1995-2013 by Michael Hipp and others,
|
Copyright (c) 1995-2013 by Michael Hipp and others,
|
||||||
free software under the terms of the LGPL v2.1
|
free software under the terms of the LGPL v2.1
|
||||||
@@ -1699,12 +1707,8 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
|||||||
zlib License
|
zlib License
|
||||||
applies to:
|
applies to:
|
||||||
- Simple DirectMedia Layer
|
- Simple DirectMedia Layer
|
||||||
Copyright (C) 1997-2018 Sam Lantinga <slouken@libsdl.org>
|
Copyright (C) 1997-2025 Sam Lantinga <slouken@libsdl.org>
|
||||||
https://www.libsdl.org/hg.php
|
https://libsdl.org/
|
||||||
|
|
||||||
- SDL_mixer: An audio mixer library based on the SDL library
|
|
||||||
Copyright (C) 1997-2018 Sam Lantinga <slouken@libsdl.org>
|
|
||||||
https://www.libsdl.org/projects/SDL_mixer/
|
|
||||||
|
|
||||||
- zlib
|
- zlib
|
||||||
Copyright (C) 1995-2017 Jean-loup Gailly and Mark Adler
|
Copyright (C) 1995-2017 Jean-loup Gailly and Mark Adler
|
||||||
|
|||||||
@@ -0,0 +1,41 @@
|
|||||||
|
# Find FluidSynth
|
||||||
|
# Once done, this will define
|
||||||
|
#
|
||||||
|
# FLUIDSYNTH_FOUND - system has FluidSynth
|
||||||
|
# FLUIDSYNTH_INCLUDE_DIRS - FluidSynth include directories
|
||||||
|
# FLUIDSYNTH_LIBRARIES - link libraries
|
||||||
|
|
||||||
|
include(LibFindMacros)
|
||||||
|
|
||||||
|
libfind_pkg_check_modules(FLUIDSYNTH_PKGCONF FLUIDSYNTH)
|
||||||
|
|
||||||
|
# includes
|
||||||
|
find_path(FLUIDSYNTH_INCLUDE_DIR
|
||||||
|
NAMES fluidsynth.h
|
||||||
|
PATHS
|
||||||
|
${FLUIDSYNTH_PKGCONF_INCLUDE_DIRS}
|
||||||
|
)
|
||||||
|
|
||||||
|
# library
|
||||||
|
find_library(FLUIDSYNTH_LIBRARY
|
||||||
|
NAMES fluidsynth
|
||||||
|
PATHS
|
||||||
|
${FLUIDSYNTH_PKGCONF_LIBRARY_DIRS}
|
||||||
|
"/usr/lib"
|
||||||
|
"/usr/local/lib"
|
||||||
|
)
|
||||||
|
|
||||||
|
# set include dir variables
|
||||||
|
set(FLUIDSYNTH_PROCESS_INCLUDES FLUIDSYNTH_INCLUDE_DIR)
|
||||||
|
set(FLUIDSYNTH_PROCESS_LIBS FLUIDSYNTH_LIBRARY)
|
||||||
|
libfind_process(FLUIDSYNTH)
|
||||||
|
|
||||||
|
if(FLUIDSYNTH_FOUND AND NOT TARGET FluidSynth::libfluidsynth)
|
||||||
|
add_library(FluidSynth::libfluidsynth UNKNOWN IMPORTED)
|
||||||
|
set_target_properties(
|
||||||
|
FluidSynth::libfluidsynth
|
||||||
|
PROPERTIES
|
||||||
|
IMPORTED_LOCATION "${FLUIDSYNTH_LIBRARY}"
|
||||||
|
INTERFACE_INCLUDE_DIRECTORIES "${FLUIDSYNTH_INCLUDE_DIR}"
|
||||||
|
)
|
||||||
|
endif()
|
||||||
@@ -8,6 +8,7 @@ passthru_opts+=\
|
|||||||
HAVE_MINIUPNPC\
|
HAVE_MINIUPNPC\
|
||||||
HAVE_DISCORDRPC DEVELOP\
|
HAVE_DISCORDRPC DEVELOP\
|
||||||
NOHOLEPUNCH\
|
NOHOLEPUNCH\
|
||||||
|
NOOPENMPT\
|
||||||
|
|
||||||
# build with debugging information
|
# build with debugging information
|
||||||
ifdef DEBUGMODE
|
ifdef DEBUGMODE
|
||||||
@@ -91,7 +92,6 @@ endif
|
|||||||
|
|
||||||
default_packages:=\
|
default_packages:=\
|
||||||
LIBGME/libgme/LIBGME\
|
LIBGME/libgme/LIBGME\
|
||||||
OPENMPT/libopenmpt/LIBOPENMPT\
|
|
||||||
ZLIB/zlib\
|
ZLIB/zlib\
|
||||||
|
|
||||||
$(foreach p,$(default_packages),\
|
$(foreach p,$(default_packages),\
|
||||||
|
|||||||
+12
-8
@@ -29,8 +29,19 @@ ifndef NOHW
|
|||||||
sources+=sdl/ogl_sdl.c
|
sources+=sdl/ogl_sdl.c
|
||||||
endif
|
endif
|
||||||
|
|
||||||
|
ifndef NOOPENMPT
|
||||||
|
LIBOPENMPT_PKGCONFIG?=libopenmpt
|
||||||
|
$(eval $(call Use_pkg_config,LIBOPENMPT))
|
||||||
|
opts+=-DHAVE_OPENMPT
|
||||||
|
endif
|
||||||
|
|
||||||
|
NOMIXER=1
|
||||||
|
|
||||||
ifdef NOMIXER
|
ifdef NOMIXER
|
||||||
|
#sources+=sdl/dummy_sound.c
|
||||||
sources+=sdl/sdl_sound.c
|
sources+=sdl/sdl_sound.c
|
||||||
|
SNDFILE_PKGCONFIG?=sndfile
|
||||||
|
$(eval $(call Use_pkg_config,SNDFILE))
|
||||||
else
|
else
|
||||||
opts+=-DHAVE_MIXER
|
opts+=-DHAVE_MIXER
|
||||||
sources+=sdl/mixer_sound.c
|
sources+=sdl/mixer_sound.c
|
||||||
@@ -45,15 +56,8 @@ opts+=-DHAVE_THREADS
|
|||||||
sources+=sdl/i_threads.c
|
sources+=sdl/i_threads.c
|
||||||
endif
|
endif
|
||||||
|
|
||||||
ifdef SDL_PKGCONFIG
|
SDL_PKGCONFIG?=sdl3
|
||||||
$(eval $(call Use_pkg_config,SDL))
|
$(eval $(call Use_pkg_config,SDL))
|
||||||
else
|
|
||||||
SDL_CONFIG?=$(call Prefix,sdl2-config)
|
|
||||||
SDL_CFLAGS?=$(shell $(SDL_CONFIG) --cflags)
|
|
||||||
SDL_LDFLAGS?=$(shell $(SDL_CONFIG) \
|
|
||||||
$(if $(STATIC),--static-libs,--libs))
|
|
||||||
$(eval $(call Propogate_flags,SDL))
|
|
||||||
endif
|
|
||||||
|
|
||||||
ifdef MINGW
|
ifdef MINGW
|
||||||
ifndef NOSDLMAIN
|
ifndef NOSDLMAIN
|
||||||
|
|||||||
@@ -79,14 +79,14 @@ $(eval $(call _set,LIBOPENMPT))
|
|||||||
lib:=../libs/SDL2_mixer/$(mingw)
|
lib:=../libs/SDL2_mixer/$(mingw)
|
||||||
|
|
||||||
ifdef SDL
|
ifdef SDL
|
||||||
mixer_opts:=-I$(lib)/include/SDL2
|
mixer_opts:=-I$(lib)/include/SDL3
|
||||||
mixer_libs:=-L$(lib)/lib
|
mixer_libs:=-L$(lib)/lib
|
||||||
|
|
||||||
lib:=../libs/SDL2/$(mingw)
|
lib:=../libs/SDL2/$(mingw)
|
||||||
SDL_opts:=-I$(lib)/include/SDL2\
|
SDL_opts:=-I$(lib)/include/SDL3\
|
||||||
$(mixer_opts) -Dmain=SDL_main
|
$(mixer_opts) -Dmain=SDL_main
|
||||||
SDL_libs:=-L$(lib)/lib $(mixer_libs)\
|
SDL_libs:=-L$(lib)/lib $(mixer_libs)\
|
||||||
-lmingw32 -lSDL2main -lSDL2 -mwindows
|
-lmingw32 -lSDL3main -lSDL3 -mwindows
|
||||||
$(eval $(call _set,SDL))
|
$(eval $(call _set,SDL))
|
||||||
endif
|
endif
|
||||||
|
|
||||||
|
|||||||
+3
-3
@@ -48,13 +48,13 @@ v_video.c
|
|||||||
w_wad.c
|
w_wad.c
|
||||||
y_inter.c
|
y_inter.c
|
||||||
z_zone.cpp
|
z_zone.cpp
|
||||||
r_bsp.c
|
r_bsp.cpp
|
||||||
r_data.c
|
r_data.c
|
||||||
r_draw.c
|
r_draw.cpp
|
||||||
r_fps.cpp
|
r_fps.cpp
|
||||||
r_main.cpp
|
r_main.cpp
|
||||||
r_patch.cpp
|
r_patch.cpp
|
||||||
r_patchrotation.c
|
r_patchrotation.cpp
|
||||||
r_plane.cpp
|
r_plane.cpp
|
||||||
r_segs.cpp
|
r_segs.cpp
|
||||||
r_skins.c
|
r_skins.c
|
||||||
|
|||||||
+2
-12
@@ -50,25 +50,15 @@ const char *VID_GetModeName(INT32 modenum)
|
|||||||
return "A320x240";
|
return "A320x240";
|
||||||
}
|
}
|
||||||
|
|
||||||
void I_UpdateNoBlit(void){}
|
void I_FinishUpdate(void)
|
||||||
|
{
|
||||||
void I_FinishUpdate(void) {
|
|
||||||
LOGD("FRAME!");
|
LOGD("FRAME!");
|
||||||
(*jni_env)->CallVoidMethod(jni_env, androidVideo, videoFrameCB);
|
(*jni_env)->CallVoidMethod(jni_env, androidVideo, videoFrameCB);
|
||||||
}
|
}
|
||||||
|
|
||||||
void I_UpdateNoVsync(void) {}
|
void I_UpdateNoVsync(void) {}
|
||||||
|
|
||||||
void I_WaitVBL(INT32 count)
|
|
||||||
{
|
|
||||||
(void)count;
|
|
||||||
}
|
|
||||||
|
|
||||||
void I_ReadScreen(UINT8 * restrict scr, INT32 scale)
|
void I_ReadScreen(UINT8 * restrict scr, INT32 scale)
|
||||||
{
|
{
|
||||||
(void)scr;
|
(void)scr;
|
||||||
}
|
}
|
||||||
|
|
||||||
void I_BeginRead(void){}
|
|
||||||
|
|
||||||
void I_EndRead(void){}
|
|
||||||
+6
-4
@@ -57,7 +57,6 @@ static void CV_EnforceExecVersion(void);
|
|||||||
static boolean CV_FilterVarByVersion(consvar_t *v, const char *valstr);
|
static boolean CV_FilterVarByVersion(consvar_t *v, const char *valstr);
|
||||||
|
|
||||||
static boolean CV_Command(void);
|
static boolean CV_Command(void);
|
||||||
consvar_t *CV_FindVar(const char *name);
|
|
||||||
static const char *CV_StringValue(const char *var_name);
|
static const char *CV_StringValue(const char *var_name);
|
||||||
static consvar_t *consvar_vars; // list of registered console variables
|
static consvar_t *consvar_vars; // list of registered console variables
|
||||||
|
|
||||||
@@ -238,10 +237,13 @@ void COM_ImmedExecute(const char *ptext)
|
|||||||
char line[1024] = "";
|
char line[1024] = "";
|
||||||
INT32 quotes;
|
INT32 quotes;
|
||||||
|
|
||||||
while (i < strlen(ptext))
|
const size_t txtlength = strlen(ptext);
|
||||||
|
|
||||||
|
while (i < txtlength)
|
||||||
{
|
{
|
||||||
quotes = 0;
|
quotes = 0;
|
||||||
for (j = 0; i < strlen(ptext); i++,j++)
|
|
||||||
|
for (j = 0; i < txtlength; i++,j++)
|
||||||
{
|
{
|
||||||
if (ptext[i] == '\"' && !quotes && i > 0 && ptext[i-1] != ' ') // Malformed command
|
if (ptext[i] == '\"' && !quotes && i > 0 && ptext[i-1] != ' ') // Malformed command
|
||||||
return;
|
return;
|
||||||
@@ -277,7 +279,7 @@ static xcommand_t *com_commands = NULL; // current commands
|
|||||||
|
|
||||||
#define MAX_ARGS 80
|
#define MAX_ARGS 80
|
||||||
static size_t com_argc;
|
static size_t com_argc;
|
||||||
char *com_argv[MAX_ARGS];
|
char *com_argv[MAX_ARGS] = {};
|
||||||
static const char *com_null_string = "";
|
static const char *com_null_string = "";
|
||||||
static char *com_args = NULL; // current command args or NULL
|
static char *com_args = NULL; // current command args or NULL
|
||||||
|
|
||||||
|
|||||||
+31
-6
@@ -33,6 +33,8 @@
|
|||||||
#include "d_main.h"
|
#include "d_main.h"
|
||||||
#include "m_menu.h"
|
#include "m_menu.h"
|
||||||
#include "m_textinput.h"
|
#include "m_textinput.h"
|
||||||
|
#include "m_emotes.h"
|
||||||
|
#include "i_time.h"
|
||||||
#include "filesrch.h"
|
#include "filesrch.h"
|
||||||
|
|
||||||
#ifdef HWRENDER
|
#ifdef HWRENDER
|
||||||
@@ -58,7 +60,7 @@ I_mutex con_mutex;
|
|||||||
static boolean con_started = false; // console has been initialised
|
static boolean con_started = false; // console has been initialised
|
||||||
boolean con_startup = false; // true at game startup, screen need refreshing
|
boolean con_startup = false; // true at game startup, screen need refreshing
|
||||||
static boolean con_forcepic = true; // at startup toggle console translucency when first off
|
static boolean con_forcepic = true; // at startup toggle console translucency when first off
|
||||||
boolean con_recalc; // set true when screen size has changed
|
boolean con_recalc = false; // set true when screen size has changed
|
||||||
|
|
||||||
static tic_t con_tick; // console ticker for anim or blinking prompt cursor
|
static tic_t con_tick; // console ticker for anim or blinking prompt cursor
|
||||||
// con_scrollup should use time (currenttime - lasttime)..
|
// con_scrollup should use time (currenttime - lasttime)..
|
||||||
@@ -66,8 +68,8 @@ static tic_t con_tick; // console ticker for anim or blinking prompt cursor
|
|||||||
static boolean consoletoggle; // true when console key pushed, ticker will handle
|
static boolean consoletoggle; // true when console key pushed, ticker will handle
|
||||||
static boolean consoleready; // console prompt is ready
|
static boolean consoleready; // console prompt is ready
|
||||||
|
|
||||||
INT32 con_destlines; // vid lines used by console at final position
|
INT32 con_destlines = 0; // vid lines used by console at final position
|
||||||
static INT32 con_curlines; // vid lines currently used by console
|
static INT32 con_curlines; // vid lines currently used by console
|
||||||
|
|
||||||
static UINT8 con_hudlines; // number of console heads up message lines
|
static UINT8 con_hudlines; // number of console heads up message lines
|
||||||
static UINT32 con_hudtime[MAXHUDLINES]; // remaining time of display for hud msg lines
|
static UINT32 con_hudtime[MAXHUDLINES]; // remaining time of display for hud msg lines
|
||||||
@@ -83,7 +85,7 @@ static size_t con_totallines; // lines of console text into the console buf
|
|||||||
static size_t con_width; // columns of chars, depend on vid mode width
|
static size_t con_width; // columns of chars, depend on vid mode width
|
||||||
|
|
||||||
static size_t con_scrollup; // how many rows of text to scroll up (pgup/pgdn)
|
static size_t con_scrollup; // how many rows of text to scroll up (pgup/pgdn)
|
||||||
UINT32 con_scalefactor; // text size scale factor
|
UINT32 con_scalefactor = 0; // text size scale factor
|
||||||
|
|
||||||
// hold 32 last lines of input for history
|
// hold 32 last lines of input for history
|
||||||
#define CON_MAXPROMPTCHARS 256
|
#define CON_MAXPROMPTCHARS 256
|
||||||
@@ -1453,7 +1455,18 @@ static void CON_DrawHudlines(void)
|
|||||||
}
|
}
|
||||||
if (c >= con_width)
|
if (c >= con_width)
|
||||||
break;
|
break;
|
||||||
if (*p < HU_FONTSTART)
|
|
||||||
|
int emotelen;
|
||||||
|
emote_t *emote;
|
||||||
|
|
||||||
|
if ((emote = M_VerifyEmote((const char *)p, &emotelen)))
|
||||||
|
{
|
||||||
|
M_DrawScaledEmote(x<<FRACBITS, (y+2*con_scalefactor)<<FRACBITS, charwidth*FRACUNIT/EMOTEWIDTH, emote, V_NOSCALESTART|V_NOSCALEPATCH);
|
||||||
|
p += emotelen-1;
|
||||||
|
c += emotelen-1;
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
else if (*p < HU_FONTSTART)
|
||||||
;//charwidth = 4 * con_scalefactor;
|
;//charwidth = 4 * con_scalefactor;
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
@@ -1485,7 +1498,7 @@ static void CON_DrawConsole(void)
|
|||||||
// draw console background
|
// draw console background
|
||||||
if (cons_backpic.value || con_forcepic)
|
if (cons_backpic.value || con_forcepic)
|
||||||
{
|
{
|
||||||
patch_t *con_backpic = W_CachePatchName("KARTKREW", PU_PATCH_LOWPRIORITY);
|
patch_t *con_backpic = W_CachePatchName("KARTKREW", PU_PATCH);
|
||||||
|
|
||||||
// Jimita: CON_DrawBackpic just called V_DrawScaledPatch
|
// Jimita: CON_DrawBackpic just called V_DrawScaledPatch
|
||||||
V_DrawFixedPatch(0, 0, FRACUNIT/2, 0, con_backpic, NULL);
|
V_DrawFixedPatch(0, 0, FRACUNIT/2, 0, con_backpic, NULL);
|
||||||
@@ -1527,8 +1540,20 @@ static void CON_DrawConsole(void)
|
|||||||
p++;
|
p++;
|
||||||
c++;
|
c++;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (c >= con_width)
|
if (c >= con_width)
|
||||||
break;
|
break;
|
||||||
|
|
||||||
|
int emotelen;
|
||||||
|
emote_t *emote;
|
||||||
|
|
||||||
|
if ((emote = M_VerifyEmote((const char *)p, &emotelen)))
|
||||||
|
{
|
||||||
|
M_DrawScaledEmote(x<<FRACBITS, (y+2*con_scalefactor)<<FRACBITS, charwidth*FRACUNIT/EMOTEWIDTH, emote, V_NOSCALESTART|V_NOSCALEPATCH);
|
||||||
|
p += emotelen-1;
|
||||||
|
c += emotelen-1;
|
||||||
|
continue;
|
||||||
|
}
|
||||||
V_DrawCharacter(x, y, (INT32)(*p) | charflags | cv_constextsize.value | V_NOSCALESTART, !cv_allcaps.value);
|
V_DrawCharacter(x, y, (INT32)(*p) | charflags | cv_constextsize.value | V_NOSCALESTART, !cv_allcaps.value);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
+106
-23
@@ -53,6 +53,8 @@
|
|||||||
#include "m_perfstats.h"
|
#include "m_perfstats.h"
|
||||||
#include "d_main.h"
|
#include "d_main.h"
|
||||||
#include "r_fps.h"
|
#include "r_fps.h"
|
||||||
|
#include "filesrch.h" // refreshdirmenu
|
||||||
|
|
||||||
|
|
||||||
// cl loading screen
|
// cl loading screen
|
||||||
#include "v_video.h"
|
#include "v_video.h"
|
||||||
@@ -121,7 +123,7 @@ UINT32 realpingtable[MAXPLAYERS] = {}; //the base table of ping where an average
|
|||||||
UINT32 playerpingtable[MAXPLAYERS] = {}; //table of player latency values.
|
UINT32 playerpingtable[MAXPLAYERS] = {}; //table of player latency values.
|
||||||
|
|
||||||
#define GENTLEMANSMOOTHING (TICRATE)
|
#define GENTLEMANSMOOTHING (TICRATE)
|
||||||
static tic_t reference_lag;
|
static tic_t reference_lag = 0;
|
||||||
static UINT8 spike_time;
|
static UINT8 spike_time;
|
||||||
tic_t lowest_lag = 0;
|
tic_t lowest_lag = 0;
|
||||||
tic_t simulated_lag = 0;
|
tic_t simulated_lag = 0;
|
||||||
@@ -143,6 +145,11 @@ static CV_PossibleValue_t mindelay_cons_t[] = {{0, "MIN"}, {30, "MAX"}, {0, NULL
|
|||||||
consvar_t cv_mindelay = {"mindelay", "0", CV_SAVE, mindelay_cons_t, NULL, 0, NULL, NULL, 0, 0, NULL};
|
consvar_t cv_mindelay = {"mindelay", "0", CV_SAVE, mindelay_cons_t, NULL, 0, NULL, NULL, 0, 0, NULL};
|
||||||
consvar_t cv_gentlemens = {"gentlemensdelay", "Off", CV_SAVE|CV_CALL|CV_NOINIT, CV_OnOff, Lagless_OnChange, 0, NULL, NULL, 0, 0, NULL}; // this should be a netvar Zzz...
|
consvar_t cv_gentlemens = {"gentlemensdelay", "Off", CV_SAVE|CV_CALL|CV_NOINIT, CV_OnOff, Lagless_OnChange, 0, NULL, NULL, 0, 0, NULL}; // this should be a netvar Zzz...
|
||||||
|
|
||||||
|
// allows a fake player to appear on the ms and serverlist when your dedi server is empty
|
||||||
|
static void FakeSeed_OnChange(void);
|
||||||
|
consvar_t cv_usefakeseed = {"fakeseed", "Off", CV_SAVE|CV_CALL|CV_NOINIT, CV_OnOff, FakeSeed_OnChange, 0, NULL, NULL, 0, 0, NULL};
|
||||||
|
consvar_t cv_fakeseedname = {"fakeseedname", "Player 1", CV_SAVE|CV_CALL|CV_NOINIT, NULL, FakeSeed_OnChange, 0, NULL, NULL, 0, 0, NULL};
|
||||||
|
|
||||||
SINT8 nodetoplayer[MAXNETNODES] = {};
|
SINT8 nodetoplayer[MAXNETNODES] = {};
|
||||||
SINT8 nodetoplayer2[MAXNETNODES] = {}; // say the numplayer for this node if any (splitscreen)
|
SINT8 nodetoplayer2[MAXNETNODES] = {}; // say the numplayer for this node if any (splitscreen)
|
||||||
SINT8 nodetoplayer3[MAXNETNODES] = {}; // say the numplayer for this node if any (splitscreen == 2)
|
SINT8 nodetoplayer3[MAXNETNODES] = {}; // say the numplayer for this node if any (splitscreen == 2)
|
||||||
@@ -240,6 +247,13 @@ consvar_t cv_httpsource = {"http_source", "", CV_SAVE, NULL, NULL, 0, NULL, NULL
|
|||||||
|
|
||||||
consvar_t cv_kicktime = {"kicktime", "10", CV_SAVE, CV_Unsigned, NULL, 0, NULL, NULL, 0, 0, NULL};
|
consvar_t cv_kicktime = {"kicktime", "10", CV_SAVE, CV_Unsigned, NULL, 0, NULL, NULL, 0, 0, NULL};
|
||||||
|
|
||||||
|
static void FakeSeed_OnChange(void)
|
||||||
|
{
|
||||||
|
#ifdef MASTERSERVER
|
||||||
|
Update_MS();
|
||||||
|
#endif
|
||||||
|
}
|
||||||
|
|
||||||
static boolean UseLocalDelay(void)
|
static boolean UseLocalDelay(void)
|
||||||
{
|
{
|
||||||
if (dedicated || (server && server_lagless && !cv_mindelay.value) || modeattacking == ATTACKING_RECORD)
|
if (dedicated || (server && server_lagless && !cv_mindelay.value) || modeattacking == ATTACKING_RECORD)
|
||||||
@@ -493,10 +507,12 @@ static void ExtraDataTicker(void)
|
|||||||
}
|
}
|
||||||
|
|
||||||
// If you are a client, you can safely forget the net commands for this tic
|
// If you are a client, you can safely forget the net commands for this tic
|
||||||
// If you are the server, you need to remember them until every client has been aknowledged,
|
// If you are the server, you need to remember them until every client has been acknowledged,
|
||||||
// because if you need to resend a PT_SERVERTICS packet, you need to put the commands in it
|
// because if you need to resend a PT_SERVERTICS packet, you will need to put the commands in it
|
||||||
if (client)
|
if (client)
|
||||||
|
{
|
||||||
D_FreeTextcmd(gametic);
|
D_FreeTextcmd(gametic);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
static void D_Clearticcmd(tic_t tic)
|
static void D_Clearticcmd(tic_t tic)
|
||||||
@@ -1355,10 +1371,19 @@ static inline void CL_DrawConnectionStatus(void)
|
|||||||
V_DrawThinString(12 + 80, 58, V_ALLOWLOWERCASE|V_YELLOWMAP, "Vanilla");
|
V_DrawThinString(12 + 80, 58, V_ALLOWLOWERCASE|V_YELLOWMAP, "Vanilla");
|
||||||
}
|
}
|
||||||
|
|
||||||
if (serverlist[joinnode].info.cheatsenabled)
|
const UINT8 serverkartspeed = (serverlist[joinnode].info.kartvars & SV_SPEEDMASK);
|
||||||
|
|
||||||
|
if (serverkartspeed == 2)
|
||||||
|
V_DrawRightAlignedThinString(BASEVIDWIDTH - 12, 58, V_ALLOWLOWERCASE|V_REDMAP, "Hard Speed");
|
||||||
|
else if (serverkartspeed == 1)
|
||||||
|
V_DrawRightAlignedThinString(BASEVIDWIDTH - 12, 58, V_ALLOWLOWERCASE|V_BLUEMAP, "Normal Speed");
|
||||||
|
else
|
||||||
|
V_DrawRightAlignedThinString(BASEVIDWIDTH - 12, 58, V_ALLOWLOWERCASE|V_GREENMAP, "Easy Speed");
|
||||||
|
|
||||||
|
/*if (serverlist[joinnode].info.cheatsenabled)
|
||||||
{
|
{
|
||||||
V_DrawRightAlignedThinString(BASEVIDWIDTH - 12, 58, V_ALLOWLOWERCASE|V_GREENMAP, "Cheats");
|
V_DrawRightAlignedThinString(BASEVIDWIDTH - 12, 58, V_ALLOWLOWERCASE|V_GREENMAP, "Cheats");
|
||||||
}
|
}*/
|
||||||
|
|
||||||
V_DrawFill(8, 72, BASEVIDWIDTH - 16, 112, 239);
|
V_DrawFill(8, 72, BASEVIDWIDTH - 16, 112, 239);
|
||||||
|
|
||||||
@@ -1378,10 +1403,16 @@ static inline void CL_DrawConnectionStatus(void)
|
|||||||
if (playerinfo[i].node < 255)
|
if (playerinfo[i].node < 255)
|
||||||
{
|
{
|
||||||
strncpy(player_name, playerinfo[i].name, MAXPLAYERNAME);
|
strncpy(player_name, playerinfo[i].name, MAXPLAYERNAME);
|
||||||
V_DrawThinString(x + 10, y, V_ALLOWLOWERCASE|V_6WIDTHSPACE, player_name);
|
|
||||||
|
// if we get a skin color
|
||||||
|
// try to colourize the player name
|
||||||
|
if (playerinfo[i].data > 0 && playerinfo[i].data < MAXSKINCOLORS)
|
||||||
|
V_DrawThinString(x + 10, y, V_ALLOWLOWERCASE|V_6WIDTHSPACE, va("%s%s ", HU_SkinColorToConsoleColor(playerinfo[i].data), player_name));
|
||||||
|
else
|
||||||
|
V_DrawThinString(x + 10, y, V_ALLOWLOWERCASE|V_6WIDTHSPACE, player_name);
|
||||||
|
|
||||||
if (playerinfo[i].team == 0) { statuscolor = 184; } // playing
|
if (playerinfo[i].team == 0) { statuscolor = 184; } // playing
|
||||||
if (playerinfo[i].data & 0x20) { statuscolor = 86; } // tag IT
|
//if (playerinfo[i].data & 0x20) { statuscolor = 86; } // tag IT
|
||||||
if (playerinfo[i].team == 1) { statuscolor = 128; } // ctf red team
|
if (playerinfo[i].team == 1) { statuscolor = 128; } // ctf red team
|
||||||
if (playerinfo[i].team == 2) { statuscolor = 232; } // ctf blue team
|
if (playerinfo[i].team == 2) { statuscolor = 232; } // ctf blue team
|
||||||
if (playerinfo[i].team == 255) { statuscolor = 16; } // spectator or non-team
|
if (playerinfo[i].team == 255) { statuscolor = 16; } // spectator or non-team
|
||||||
@@ -1426,12 +1457,14 @@ static inline void CL_DrawConnectionStatus(void)
|
|||||||
V_DrawFill(BASEVIDWIDTH/2-128, BASEVIDHEIGHT-58, dldlength, 8, 160);
|
V_DrawFill(BASEVIDWIDTH/2-128, BASEVIDHEIGHT-58, dldlength, 8, 160);
|
||||||
|
|
||||||
memset(tempname, 0, sizeof(tempname));
|
memset(tempname, 0, sizeof(tempname));
|
||||||
|
|
||||||
// offset filename to just the name only part
|
// offset filename to just the name only part
|
||||||
filename += strlen(filename) - nameonlylength(filename);
|
filename += strlen(filename) - nameonlylength(filename);
|
||||||
|
const size_t filenamelength = strlen(filename);
|
||||||
|
|
||||||
if (strlen(filename) > sizeof(tempname)-1) // too long to display fully
|
if (filenamelength > sizeof(tempname)-1) // too long to display fully
|
||||||
{
|
{
|
||||||
size_t endhalfpos = strlen(filename)-10;
|
size_t endhalfpos = filenamelength-10;
|
||||||
// display as first 14 chars + ... + last 10 chars
|
// display as first 14 chars + ... + last 10 chars
|
||||||
// which should add up to 27 if our math(s) is correct
|
// which should add up to 27 if our math(s) is correct
|
||||||
snprintf(tempname, sizeof(tempname), "%.14s...%.10s", filename, filename+endhalfpos);
|
snprintf(tempname, sizeof(tempname), "%.14s...%.10s", filename, filename+endhalfpos);
|
||||||
@@ -1544,6 +1577,12 @@ static boolean CL_SendJoin(void)
|
|||||||
return HSendPacket(servernode, false, 0, sizeof(clientconfig_pak));
|
return HSendPacket(servernode, false, 0, sizeof(clientconfig_pak));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
static boolean UseFakeSeed(void)
|
||||||
|
{
|
||||||
|
// due to complexity this will disable the moment a real player joins
|
||||||
|
return (dedicated && cv_usefakeseed.value && D_NumPlayers() == 0);
|
||||||
|
}
|
||||||
|
|
||||||
static void SV_SendServerInfo(INT32 node, tic_t servertime)
|
static void SV_SendServerInfo(INT32 node, tic_t servertime)
|
||||||
{
|
{
|
||||||
UINT8 *p;
|
UINT8 *p;
|
||||||
@@ -1566,7 +1605,12 @@ static void SV_SendServerInfo(INT32 node, tic_t servertime)
|
|||||||
netbuffer->u.serverinfo.time = (tic_t)LONG(servertime);
|
netbuffer->u.serverinfo.time = (tic_t)LONG(servertime);
|
||||||
netbuffer->u.serverinfo.leveltime = (tic_t)LONG(leveltime);
|
netbuffer->u.serverinfo.leveltime = (tic_t)LONG(leveltime);
|
||||||
|
|
||||||
netbuffer->u.serverinfo.numberofplayer = (UINT8)D_NumPlayers();
|
// force 1 player
|
||||||
|
if (UseFakeSeed())
|
||||||
|
netbuffer->u.serverinfo.numberofplayer = (UINT8)1;
|
||||||
|
else
|
||||||
|
netbuffer->u.serverinfo.numberofplayer = (UINT8)D_NumPlayers();
|
||||||
|
|
||||||
netbuffer->u.serverinfo.maxplayer = (UINT8)(min((dedicated ? MAXPLAYERS-1 : MAXPLAYERS), cv_maxplayers.value));
|
netbuffer->u.serverinfo.maxplayer = (UINT8)(min((dedicated ? MAXPLAYERS-1 : MAXPLAYERS), cv_maxplayers.value));
|
||||||
|
|
||||||
// SRB2Kart: Vanilla's gametype constants for MS support
|
// SRB2Kart: Vanilla's gametype constants for MS support
|
||||||
@@ -1645,6 +1689,37 @@ static void SV_SendPlayerInfo(INT32 node)
|
|||||||
|
|
||||||
netbuffer->packettype = PT_PLAYERINFO;
|
netbuffer->packettype = PT_PLAYERINFO;
|
||||||
|
|
||||||
|
// send a fake player to trick ms and serverbrowser
|
||||||
|
if (UseFakeSeed())
|
||||||
|
{
|
||||||
|
//printf("sending fake player lmao\n");
|
||||||
|
netbuffer->u.playerinfo[0].node = 0;
|
||||||
|
|
||||||
|
// fallback to smth, make sure this is always set
|
||||||
|
if (!cv_fakeseedname.string[0])
|
||||||
|
CV_Set(&cv_fakeseedname, "Player 1");
|
||||||
|
strlcpy(netbuffer->u.playerinfo[0].name, cv_fakeseedname.string, MAXPLAYERNAME+1);
|
||||||
|
|
||||||
|
memset(netbuffer->u.playerinfo[0].address, 0, 4);
|
||||||
|
|
||||||
|
// make it appear as spectator
|
||||||
|
netbuffer->u.playerinfo[0].team = 255;
|
||||||
|
|
||||||
|
// doesent really matter what we put here lel
|
||||||
|
netbuffer->u.playerinfo[0].score = LONG(42069);
|
||||||
|
netbuffer->u.playerinfo[0].timeinserver = SHORT(42069);
|
||||||
|
netbuffer->u.playerinfo[0].skin = (UINT8)1; // no clue wtf skin 1 is, tails maybe?
|
||||||
|
|
||||||
|
netbuffer->u.playerinfo[0].data = 0;
|
||||||
|
|
||||||
|
// mark every other slot as empty
|
||||||
|
for (i = 1; i < MSCOMPAT_MAXPLAYERS; i++)
|
||||||
|
netbuffer->u.playerinfo[i].node = 255;
|
||||||
|
|
||||||
|
HSendPacket(node, false, 0, sizeof(plrinfo) * MSCOMPAT_MAXPLAYERS);
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
for (i = 0; i < MSCOMPAT_MAXPLAYERS; i++)
|
for (i = 0; i < MSCOMPAT_MAXPLAYERS; i++)
|
||||||
{
|
{
|
||||||
if ((i >= MAXPLAYERS) || !playeringame[i])
|
if ((i >= MAXPLAYERS) || !playeringame[i])
|
||||||
@@ -1682,16 +1757,19 @@ static void SV_SendPlayerInfo(INT32 node)
|
|||||||
|
|
||||||
// Extra data
|
// Extra data
|
||||||
// Kart has extra skincolors, so we can't use this
|
// Kart has extra skincolors, so we can't use this
|
||||||
netbuffer->u.playerinfo[i].data = 0; //netbuffer->u.playerinfo[i].data = players[i].skincolor;
|
//netbuffer->u.playerinfo[i].data = 0; //netbuffer->u.playerinfo[i].data = players[i].skincolor;
|
||||||
|
|
||||||
if (players[i].pflags & PF_TAGIT)
|
// well why not, we only got like 100 of these?
|
||||||
netbuffer->u.playerinfo[i].data |= 0x20;
|
netbuffer->u.playerinfo[i].data = players[i].skincolor;
|
||||||
|
|
||||||
if (players[i].gotflag)
|
//if (players[i].pflags & PF_TAGIT)
|
||||||
netbuffer->u.playerinfo[i].data |= 0x40;
|
//netbuffer->u.playerinfo[i].data |= 0x20;
|
||||||
|
|
||||||
if (players[i].powers[pw_super])
|
//if (players[i].gotflag)
|
||||||
netbuffer->u.playerinfo[i].data |= 0x80;
|
//netbuffer->u.playerinfo[i].data |= 0x40;
|
||||||
|
|
||||||
|
//if (players[i].powers[pw_super])
|
||||||
|
//netbuffer->u.playerinfo[i].data |= 0x80;
|
||||||
}
|
}
|
||||||
|
|
||||||
HSendPacket(node, false, 0, sizeof(plrinfo) * MSCOMPAT_MAXPLAYERS);
|
HSendPacket(node, false, 0, sizeof(plrinfo) * MSCOMPAT_MAXPLAYERS);
|
||||||
@@ -1874,7 +1952,7 @@ static boolean SV_ResendingSavegameToAnyone(void)
|
|||||||
static void SV_SendSaveGame(INT32 node, boolean resending)
|
static void SV_SendSaveGame(INT32 node, boolean resending)
|
||||||
{
|
{
|
||||||
size_t length, compressedlen;
|
size_t length, compressedlen;
|
||||||
savebuffer_t save;
|
savebuffer_t save = {0};
|
||||||
UINT8 *compressedsave;
|
UINT8 *compressedsave;
|
||||||
UINT8 *buffertosend;
|
UINT8 *buffertosend;
|
||||||
|
|
||||||
@@ -1944,7 +2022,7 @@ static consvar_t cv_dumpconsistency = {"dumpconsistency", "Off", CV_NETVAR, CV_O
|
|||||||
static void SV_SavedGame(void)
|
static void SV_SavedGame(void)
|
||||||
{
|
{
|
||||||
size_t length;
|
size_t length;
|
||||||
savebuffer_t save;
|
savebuffer_t save = {0};
|
||||||
char tmpsave[264];
|
char tmpsave[264];
|
||||||
|
|
||||||
if (!cv_dumpconsistency.value)
|
if (!cv_dumpconsistency.value)
|
||||||
@@ -1984,7 +2062,7 @@ static void SV_SavedGame(void)
|
|||||||
|
|
||||||
static void CL_LoadReceivedSavegame(boolean reloading)
|
static void CL_LoadReceivedSavegame(boolean reloading)
|
||||||
{
|
{
|
||||||
savebuffer_t save;
|
savebuffer_t save = {0};
|
||||||
size_t length, decompressedlen;
|
size_t length, decompressedlen;
|
||||||
char tmpsave[264];
|
char tmpsave[264];
|
||||||
|
|
||||||
@@ -2076,7 +2154,7 @@ static void CL_ReloadReceivedSavegame(void)
|
|||||||
// we dont have P_ForceLocalAngle so were setting it manually here
|
// we dont have P_ForceLocalAngle so were setting it manually here
|
||||||
for (i = 0; i <= splitscreen; i++)
|
for (i = 0; i <= splitscreen; i++)
|
||||||
{
|
{
|
||||||
localangle[i] = (angle_t)(players[displayplayers[i]].cmd.angleturn << 16);
|
P_ForceLocalAngle(&players[displayplayers[i]], (angle_t)(players[displayplayers[i]].cmd.angleturn << 16));
|
||||||
}
|
}
|
||||||
|
|
||||||
for (i = 0; i < MAXSPLITSCREENPLAYERS; i++)
|
for (i = 0; i < MAXSPLITSCREENPLAYERS; i++)
|
||||||
@@ -4449,6 +4527,8 @@ static void Got_AddPlayer(const UINT8 **p, INT32 playernum)
|
|||||||
DEBFILE("spawning me\n");
|
DEBFILE("spawning me\n");
|
||||||
}
|
}
|
||||||
|
|
||||||
|
P_ForceLocalAngle(&players[newplayernum], (angle_t)(players[newplayernum].cmd.angleturn << 16));
|
||||||
|
|
||||||
D_SendPlayerConfig();
|
D_SendPlayerConfig();
|
||||||
addedtogame = true;
|
addedtogame = true;
|
||||||
}
|
}
|
||||||
@@ -5854,12 +5934,14 @@ static void PT_FileFragmentFromPlayer(SINT8 node)
|
|||||||
Got_Filetxpak();
|
Got_Filetxpak();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#ifdef SATURNPAK
|
||||||
static void PT_ReceivedGamestate(SINT8 node)
|
static void PT_ReceivedGamestate(SINT8 node)
|
||||||
{
|
{
|
||||||
sendingsavegame[node] = false;
|
sendingsavegame[node] = false;
|
||||||
resendingsavegame[node] = 0;
|
resendingsavegame[node] = 0;
|
||||||
savegameresendcooldown[node] = I_GetTime() + cv_resynchcooldown.value * TICRATE; // I_GetTime() + 5 * TICRATE;
|
savegameresendcooldown[node] = I_GetTime() + cv_resynchcooldown.value * TICRATE; // I_GetTime() + 5 * TICRATE;
|
||||||
}
|
}
|
||||||
|
#endif
|
||||||
|
|
||||||
/** Handles a packet received from a node that is in game
|
/** Handles a packet received from a node that is in game
|
||||||
*
|
*
|
||||||
@@ -7119,6 +7201,7 @@ void NetUpdate(void)
|
|||||||
I_lock_mutex(&m_menu_mutex);
|
I_lock_mutex(&m_menu_mutex);
|
||||||
#endif
|
#endif
|
||||||
M_Ticker();
|
M_Ticker();
|
||||||
|
refreshdirmenu = 0;
|
||||||
#ifdef HAVE_THREADS
|
#ifdef HAVE_THREADS
|
||||||
I_unlock_mutex(m_menu_mutex);
|
I_unlock_mutex(m_menu_mutex);
|
||||||
#endif
|
#endif
|
||||||
@@ -7165,7 +7248,7 @@ void CL_ClearRewinds(void)
|
|||||||
|
|
||||||
rewind_t *CL_SaveRewindPoint(size_t demopos)
|
rewind_t *CL_SaveRewindPoint(size_t demopos)
|
||||||
{
|
{
|
||||||
savebuffer_t save;
|
savebuffer_t save = {0};
|
||||||
rewind_t *rewind;
|
rewind_t *rewind;
|
||||||
|
|
||||||
if (rewindhead && rewindhead->leveltime + REWIND_POINT_INTERVAL > leveltime)
|
if (rewindhead && rewindhead->leveltime + REWIND_POINT_INTERVAL > leveltime)
|
||||||
@@ -7188,7 +7271,7 @@ rewind_t *CL_SaveRewindPoint(size_t demopos)
|
|||||||
|
|
||||||
rewind_t *CL_RewindToTime(tic_t time)
|
rewind_t *CL_RewindToTime(tic_t time)
|
||||||
{
|
{
|
||||||
savebuffer_t save;
|
savebuffer_t save = {0};
|
||||||
rewind_t *rewind;
|
rewind_t *rewind;
|
||||||
|
|
||||||
while (rewindhead && rewindhead->leveltime > time)
|
while (rewindhead && rewindhead->leveltime > time)
|
||||||
|
|||||||
@@ -582,6 +582,8 @@ extern tic_t simulated_lag;
|
|||||||
extern tic_t lowest_lag;
|
extern tic_t lowest_lag;
|
||||||
extern consvar_t cv_mindelay, cv_gentlemens;
|
extern consvar_t cv_mindelay, cv_gentlemens;
|
||||||
|
|
||||||
|
extern consvar_t cv_usefakeseed, cv_fakeseedname;
|
||||||
|
|
||||||
extern consvar_t
|
extern consvar_t
|
||||||
cv_netticbuffer, cv_allownewplayer,
|
cv_netticbuffer, cv_allownewplayer,
|
||||||
#ifdef SATURNJOIN
|
#ifdef SATURNJOIN
|
||||||
|
|||||||
+34
-59
@@ -46,6 +46,7 @@
|
|||||||
#include "i_time.h"
|
#include "i_time.h"
|
||||||
#include "i_threads.h"
|
#include "i_threads.h"
|
||||||
#include "i_video.h"
|
#include "i_video.h"
|
||||||
|
#include "hu_stuff.h"
|
||||||
#include "m_argv.h"
|
#include "m_argv.h"
|
||||||
#include "m_menu.h"
|
#include "m_menu.h"
|
||||||
#include "m_misc.h"
|
#include "m_misc.h"
|
||||||
@@ -69,7 +70,7 @@
|
|||||||
#include "fastcmp.h"
|
#include "fastcmp.h"
|
||||||
#include "r_fps.h" // Frame interpolation/uncapped
|
#include "r_fps.h" // Frame interpolation/uncapped
|
||||||
#include "keys.h"
|
#include "keys.h"
|
||||||
#include "filesrch.h" // refreshdirmenu, pathisdirectory
|
#include "filesrch.h" // pathisdirectory
|
||||||
#include "d_protocol.h"
|
#include "d_protocol.h"
|
||||||
#include "m_perfstats.h"
|
#include "m_perfstats.h"
|
||||||
#include "k_kart.h"
|
#include "k_kart.h"
|
||||||
@@ -166,38 +167,6 @@ UINT8 ctrldown = 0; // 0x1 left, 0x2 right
|
|||||||
UINT8 altdown = 0; // 0x1 left, 0x2 right
|
UINT8 altdown = 0; // 0x1 left, 0x2 right
|
||||||
boolean capslock = 0; // gee i wonder what this does.
|
boolean capslock = 0; // gee i wonder what this does.
|
||||||
|
|
||||||
static UINT16 curcolor[MAXSPLITSCREENPLAYERS] = {};
|
|
||||||
|
|
||||||
static void D_DeviceLEDTick(void)
|
|
||||||
{
|
|
||||||
UINT8 i;
|
|
||||||
static UINT16 color[MAXSPLITSCREENPLAYERS] = {};
|
|
||||||
|
|
||||||
if (numcontrollers == 0)
|
|
||||||
{
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
for (i = 0; i <= splitscreen; i++)
|
|
||||||
{
|
|
||||||
if (!cv_usejoystick[i].value || !cv_gamepadled[i].value)
|
|
||||||
continue;
|
|
||||||
|
|
||||||
color[i] = G_GetSkinColor(i);
|
|
||||||
|
|
||||||
if (curcolor[i] == color[i]) // dont update if same colour
|
|
||||||
continue;
|
|
||||||
|
|
||||||
G_SetPlayerGamepadIndicatorColor(i, color[i]);
|
|
||||||
curcolor[i] = color[i];
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
void D_ResetDeviceLED(void)
|
|
||||||
{
|
|
||||||
memset(curcolor, 0, sizeof(curcolor));
|
|
||||||
}
|
|
||||||
|
|
||||||
//
|
//
|
||||||
// D_ProcessEvents
|
// D_ProcessEvents
|
||||||
// Send all the events of the given timestamp down the responder chain
|
// Send all the events of the given timestamp down the responder chain
|
||||||
@@ -359,13 +328,12 @@ static void D_Renderview(void)
|
|||||||
if (splitscreen == 2)
|
if (splitscreen == 2)
|
||||||
{
|
{
|
||||||
// V_DrawPatchFill, but for the fourth screen only
|
// V_DrawPatchFill, but for the fourth screen only
|
||||||
patch_t *pat = W_CachePatchName("SRB2BACK", PU_PATCH);
|
INT32 x, y, pw = SHORT(srb2back->width) * vid.dup, ph = SHORT(srb2back->height) * vid.dup;
|
||||||
INT32 x, y, pw = SHORT(pat->width) * vid.dup, ph = SHORT(pat->height) * vid.dup;
|
|
||||||
|
|
||||||
for (x = vid.width>>1; x < vid.width; x += pw)
|
for (x = vid.width>>1; x < vid.width; x += pw)
|
||||||
{
|
{
|
||||||
for (y = vid.height>>1; y < vid.height; y += ph)
|
for (y = vid.height>>1; y < vid.height; y += ph)
|
||||||
V_DrawScaledPatch(x, y, V_NOSCALESTART, pat);
|
V_DrawScaledPatch(x, y, V_NOSCALESTART, srb2back);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -407,10 +375,6 @@ static boolean D_Display(void)
|
|||||||
R_ExecuteSetViewSize();
|
R_ExecuteSetViewSize();
|
||||||
forcerefresh = true; // force background redraw
|
forcerefresh = true; // force background redraw
|
||||||
}
|
}
|
||||||
|
|
||||||
// draw buffered stuff to screen
|
|
||||||
// Used only by linux GGI version
|
|
||||||
I_UpdateNoBlit();
|
|
||||||
}
|
}
|
||||||
|
|
||||||
// save the current screen if about to wipe
|
// save the current screen if about to wipe
|
||||||
@@ -675,6 +639,7 @@ void D_SRB2Loop(void)
|
|||||||
tic_t entertic = 0, oldentertics = 0, realtics = 0, rendertimeout = INFTICS;
|
tic_t entertic = 0, oldentertics = 0, realtics = 0, rendertimeout = INFTICS;
|
||||||
double deltatics = 0.0;
|
double deltatics = 0.0;
|
||||||
double deltasecs = 0.0;
|
double deltasecs = 0.0;
|
||||||
|
UINT64 precision;
|
||||||
|
|
||||||
boolean interp = false;
|
boolean interp = false;
|
||||||
boolean doDisplay = false;
|
boolean doDisplay = false;
|
||||||
@@ -707,21 +672,26 @@ void D_SRB2Loop(void)
|
|||||||
COM_ImmedExecute("cls;version");
|
COM_ImmedExecute("cls;version");
|
||||||
|
|
||||||
if (rendermode == render_soft)
|
if (rendermode == render_soft)
|
||||||
V_DrawFixedPatch(0, 0, FRACUNIT/2, 0, W_CachePatchNum(W_GetNumForName("KARTKREW"), PU_PATCH_LOWPRIORITY), NULL);
|
V_DrawFixedPatch(0, 0, FRACUNIT/2, 0, W_CachePatchNum(W_GetNumForName("KARTKREW"), PU_PATCH), NULL);
|
||||||
I_FinishUpdate(); // page flip or blit buffer
|
I_FinishUpdate(); // page flip or blit buffer
|
||||||
|
|
||||||
|
precision = I_GetPrecisePrecision();
|
||||||
|
|
||||||
for (;;)
|
for (;;)
|
||||||
{
|
{
|
||||||
// capbudget is the minimum precise_t duration of a single loop iteration
|
// capbudget is the minimum precise_t duration of a single loop iteration
|
||||||
precise_t capbudget;
|
precise_t capbudget;
|
||||||
precise_t enterprecise = I_GetPreciseTime();
|
precise_t elapsed;
|
||||||
|
precise_t enterprecise, finishprecise;
|
||||||
|
|
||||||
|
enterprecise = I_GetPreciseTime();
|
||||||
|
|
||||||
memset(&g_dc, 0, sizeof(g_dc));
|
memset(&g_dc, 0, sizeof(g_dc));
|
||||||
Z_Frame_Reset();
|
Z_Frame_Reset();
|
||||||
|
|
||||||
// Casting the return value of a function is bad practice (apparently)
|
// Casting the return value of a function is bad practice (apparently)
|
||||||
double budget = ((R_GetFramerateCap() == 0) ? 0.0 : round((1.0 / R_GetFramerateCap()) * I_GetPrecisePrecision()));
|
const UINT32 framecap = R_GetFramerateCap();
|
||||||
capbudget = (precise_t)budget;
|
capbudget = (framecap == 0) ? 0 : (precise_t)((double)precision / (double)framecap + 0.5); // + 0.5 instead of round
|
||||||
|
|
||||||
boolean ranwipe = false;
|
boolean ranwipe = false;
|
||||||
|
|
||||||
@@ -755,8 +725,6 @@ void D_SRB2Loop(void)
|
|||||||
|
|
||||||
renderisnewtic = (realtics > 0 || singletics);
|
renderisnewtic = (realtics > 0 || singletics);
|
||||||
|
|
||||||
refreshdirmenu = 0; // not sure where to put this, here as good as any?
|
|
||||||
|
|
||||||
if (renderisnewtic)
|
if (renderisnewtic)
|
||||||
{
|
{
|
||||||
// don't skip more than 10 frames at a time
|
// don't skip more than 10 frames at a time
|
||||||
@@ -793,13 +761,13 @@ void D_SRB2Loop(void)
|
|||||||
|
|
||||||
if (!dedicated)
|
if (!dedicated)
|
||||||
{
|
{
|
||||||
D_DeviceLEDTick();
|
G_DeviceLEDTick();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if (interp)
|
if (interp)
|
||||||
{
|
{
|
||||||
renderdeltatics = FloatToFixed(deltatics);
|
renderdeltatics = DoubleToFixed(deltatics);
|
||||||
|
|
||||||
// I looked at the possibility of putting in a float drawer for
|
// I looked at the possibility of putting in a float drawer for
|
||||||
// perfstats and it's very complicated, so we'll just do this instead...
|
// perfstats and it's very complicated, so we'll just do this instead...
|
||||||
@@ -848,12 +816,13 @@ void D_SRB2Loop(void)
|
|||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
// Fully completed frame made.
|
// Fully completed frame made.
|
||||||
precise_t finishprecise = I_GetPreciseTime();
|
finishprecise = I_GetPreciseTime();
|
||||||
|
|
||||||
// Use the time before sleep for frameskip calculations:
|
// Use the time before sleep for frameskip calculations:
|
||||||
// post-sleep time is literally being intentionally wasted
|
// post-sleep time is literally being intentionally wasted
|
||||||
deltasecs = (double)((INT64)(finishprecise - enterprecise)) / I_GetPrecisePrecision();
|
elapsed = finishprecise - enterprecise;
|
||||||
deltatics = deltasecs * NEWTICRATE;
|
deltasecs = (double)elapsed / (double)precision;
|
||||||
|
deltatics = deltasecs * (double)NEWTICRATE;
|
||||||
|
|
||||||
// If time spent this game loop exceeds a single tic,
|
// If time spent this game loop exceeds a single tic,
|
||||||
// it's probably because of rendering.
|
// it's probably because of rendering.
|
||||||
@@ -881,12 +850,10 @@ void D_SRB2Loop(void)
|
|||||||
|
|
||||||
if (!singletics)
|
if (!singletics)
|
||||||
{
|
{
|
||||||
INT64 elapsed = (INT64)(finishprecise - enterprecise);
|
|
||||||
|
|
||||||
// in the case of "match refresh rate" + vsync, don't sleep at all
|
// in the case of "match refresh rate" + vsync, don't sleep at all
|
||||||
const boolean vsync_with_match_refresh = cv_vidwait.value && cv_fpscap.value == 0;
|
const boolean vsync_with_match_refresh = cv_vidwait.value && cv_fpscap.value == 0;
|
||||||
|
|
||||||
if ((elapsed > 0) && ((INT64)capbudget > elapsed) && !vsync_with_match_refresh)
|
if ((elapsed > 0) && (capbudget > elapsed) && !vsync_with_match_refresh)
|
||||||
{
|
{
|
||||||
I_SleepDuration(capbudget - elapsed);
|
I_SleepDuration(capbudget - elapsed);
|
||||||
}
|
}
|
||||||
@@ -894,8 +861,9 @@ void D_SRB2Loop(void)
|
|||||||
|
|
||||||
// Capture the time once more to get the real delta time.
|
// Capture the time once more to get the real delta time.
|
||||||
finishprecise = I_GetPreciseTime();
|
finishprecise = I_GetPreciseTime();
|
||||||
deltasecs = (double)((INT64)(finishprecise - enterprecise)) / I_GetPrecisePrecision();
|
elapsed = finishprecise - enterprecise;
|
||||||
deltatics = deltasecs * NEWTICRATE;
|
deltasecs = (double)elapsed / (double)precision;
|
||||||
|
deltatics = deltasecs * (double)NEWTICRATE;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -971,7 +939,7 @@ void D_ClearState(void)
|
|||||||
M_ClearMenus(true);
|
M_ClearMenus(true);
|
||||||
|
|
||||||
// map palettes affect this
|
// map palettes affect this
|
||||||
D_ResetDeviceLED();
|
G_ResetDeviceLED();
|
||||||
}
|
}
|
||||||
|
|
||||||
//
|
//
|
||||||
@@ -1212,8 +1180,10 @@ static void IdentifyVersion(void)
|
|||||||
const char *srb2waddir = NULL;
|
const char *srb2waddir = NULL;
|
||||||
|
|
||||||
#if defined (__unix__) || defined (UNIXCOMMON) || defined (HAVE_SDL)
|
#if defined (__unix__) || defined (UNIXCOMMON) || defined (HAVE_SDL)
|
||||||
|
CLEANUP(pfree) const char *allocwaddir = NULL; // here so we dont potentially free stack memory
|
||||||
// change to the directory where 'srb2.srb' is found
|
// change to the directory where 'srb2.srb' is found
|
||||||
srb2waddir = I_LocateWad();
|
allocwaddir = I_LocateWad();
|
||||||
|
srb2waddir = allocwaddir;
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
char tempsrb2path[256] = ".";
|
char tempsrb2path[256] = ".";
|
||||||
@@ -1294,7 +1264,7 @@ static void IdentifyVersion(void)
|
|||||||
if (AddIWAD("extra3.kart", srb2waddir))
|
if (AddIWAD("extra3.kart", srb2waddir))
|
||||||
found_extra3_kart = true;
|
found_extra3_kart = true;
|
||||||
|
|
||||||
#if !defined (HAVE_SDL) || defined (HAVE_MIXER)
|
#if defined (HAVE_SDL)
|
||||||
#define MUSICTEST(str) \
|
#define MUSICTEST(str) \
|
||||||
musicpath = va(pandf, srb2waddir, str);\
|
musicpath = va(pandf, srb2waddir, str);\
|
||||||
handle = W_OpenWadFile(&musicpath, false); \
|
handle = W_OpenWadFile(&musicpath, false); \
|
||||||
@@ -1920,6 +1890,10 @@ void D_SRB2Main(void)
|
|||||||
CONS_Printf("R_Init(): Init SRB2 refresh daemon.\n");
|
CONS_Printf("R_Init(): Init SRB2 refresh daemon.\n");
|
||||||
R_Init();
|
R_Init();
|
||||||
|
|
||||||
|
#if SOUND==SOUND_DUMMY
|
||||||
|
sound_disabled = true;
|
||||||
|
music_disabled = true;
|
||||||
|
#else
|
||||||
// setting up sound
|
// setting up sound
|
||||||
if (dedicated || M_CheckParm("-noaudio")) // combines -nosound and -nomusic
|
if (dedicated || M_CheckParm("-noaudio")) // combines -nosound and -nomusic
|
||||||
{
|
{
|
||||||
@@ -1941,6 +1915,7 @@ void D_SRB2Main(void)
|
|||||||
I_InitMusic();
|
I_InitMusic();
|
||||||
S_InitSfxChannels(cv_soundvolume.value);
|
S_InitSfxChannels(cv_soundvolume.value);
|
||||||
}
|
}
|
||||||
|
#endif
|
||||||
|
|
||||||
S_InitMusicDefs();
|
S_InitMusicDefs();
|
||||||
|
|
||||||
|
|||||||
@@ -80,8 +80,6 @@ void D_ProcessEvents(void);
|
|||||||
|
|
||||||
const char *D_Home(void);
|
const char *D_Home(void);
|
||||||
|
|
||||||
void D_ResetDeviceLED(void);
|
|
||||||
|
|
||||||
//
|
//
|
||||||
// BASE LEVEL
|
// BASE LEVEL
|
||||||
//
|
//
|
||||||
|
|||||||
+4
-4
@@ -805,16 +805,16 @@ const char *packettypename[NUMPACKETTYPE] =
|
|||||||
"TELLFILESNEEDED",
|
"TELLFILESNEEDED",
|
||||||
"MOREFILESNEEDED",
|
"MOREFILESNEEDED",
|
||||||
|
|
||||||
"PING"
|
"PING",
|
||||||
#ifdef SATURNPAK
|
#ifdef SATURNPAK
|
||||||
,
|
|
||||||
|
|
||||||
"WILLRESENDGAMESTATE",
|
"WILLRESENDGAMESTATE",
|
||||||
"CANRECEIVEGAMESTATE",
|
"CANRECEIVEGAMESTATE",
|
||||||
"RECEIVEDGAMESTATE",
|
"RECEIVEDGAMESTATE",
|
||||||
|
|
||||||
"ISSATURN" // special packet to identify saturn clients
|
"ISSATURN", // special packet to identify saturn clients
|
||||||
#endif
|
#endif
|
||||||
|
"MAPICON", // Send map image icon (gamespy).
|
||||||
|
"NEEDMAPICON" // Request missed map icon (gamespy).
|
||||||
};
|
};
|
||||||
|
|
||||||
const char *Net_GetPacketName(UINT8 packettype)
|
const char *Net_GetPacketName(UINT8 packettype)
|
||||||
|
|||||||
+13
-27
@@ -274,7 +274,7 @@ consvar_t cv_showlocalskinmenus = {"showlocalskinmenus", "Yes", CV_SAVE, CV_YesN
|
|||||||
|
|
||||||
consvar_t cv_skipmapcheck = {"skipmapcheck", "Off", CV_SAVE, CV_OnOff, NULL, 0, NULL, NULL, 0, 0, NULL};
|
consvar_t cv_skipmapcheck = {"skipmapcheck", "Off", CV_SAVE, CV_OnOff, NULL, 0, NULL, NULL, 0, 0, NULL};
|
||||||
|
|
||||||
INT32 cv_debug;
|
INT32 cv_debug = 0;
|
||||||
|
|
||||||
static void UseMouse_OnChange(void);
|
static void UseMouse_OnChange(void);
|
||||||
consvar_t cv_usemouse = {"use_mouse", "Off", CV_SAVE|CV_CALL, usemouse_cons_t, UseMouse_OnChange, 0, NULL, NULL, 0, 0, NULL};
|
consvar_t cv_usemouse = {"use_mouse", "Off", CV_SAVE|CV_CALL, usemouse_cons_t, UseMouse_OnChange, 0, NULL, NULL, 0, 0, NULL};
|
||||||
@@ -531,7 +531,7 @@ boolean forceresetplayers = false;
|
|||||||
boolean deferencoremode = false;
|
boolean deferencoremode = false;
|
||||||
UINT8 splitscreen = 0;
|
UINT8 splitscreen = 0;
|
||||||
boolean circuitmap = true; // SRB2kart
|
boolean circuitmap = true; // SRB2kart
|
||||||
INT32 adminplayers[MAXPLAYERS];
|
INT32 adminplayers[MAXPLAYERS] = {};
|
||||||
|
|
||||||
/// \warning Keep this up-to-date if you add/remove/rename net text commands
|
/// \warning Keep this up-to-date if you add/remove/rename net text commands
|
||||||
const char *netxcmdnames[MAXNETXCMD - 1] =
|
const char *netxcmdnames[MAXNETXCMD - 1] =
|
||||||
@@ -760,6 +760,9 @@ void D_RegisterServerCommands(void)
|
|||||||
CV_RegisterVar(&cv_showping);
|
CV_RegisterVar(&cv_showping);
|
||||||
CV_RegisterVar(&cv_pingmeasurement);
|
CV_RegisterVar(&cv_pingmeasurement);
|
||||||
|
|
||||||
|
CV_RegisterVar(&cv_usefakeseed);
|
||||||
|
CV_RegisterVar(&cv_fakeseedname);
|
||||||
|
|
||||||
#ifdef SEENAMES
|
#ifdef SEENAMES
|
||||||
CV_RegisterVar(&cv_allowseenames);
|
CV_RegisterVar(&cv_allowseenames);
|
||||||
#endif
|
#endif
|
||||||
@@ -994,6 +997,7 @@ void D_RegisterClientCommands(void)
|
|||||||
CV_RegisterVar(&cv_usejoystick[i]);
|
CV_RegisterVar(&cv_usejoystick[i]);
|
||||||
CV_RegisterVar(&cv_joyscale[i]);
|
CV_RegisterVar(&cv_joyscale[i]);
|
||||||
CV_RegisterVar(&cv_rumble[i]);
|
CV_RegisterVar(&cv_rumble[i]);
|
||||||
|
CV_RegisterVar(&cv_rumblestrength[i]);
|
||||||
CV_RegisterVar(&cv_gamepadled[i]);
|
CV_RegisterVar(&cv_gamepadled[i]);
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -2585,8 +2589,7 @@ void D_PickVote(void)
|
|||||||
SendNetXCmd(XD_PICKVOTE, &buf, 2);
|
SendNetXCmd(XD_PICKVOTE, &buf, 2);
|
||||||
}
|
}
|
||||||
|
|
||||||
static char *
|
static char *ConcatCommandArgv(int start, int end)
|
||||||
ConcatCommandArgv (int start, int end)
|
|
||||||
{
|
{
|
||||||
char *final;
|
char *final;
|
||||||
|
|
||||||
@@ -2659,8 +2662,8 @@ static void Command_Map_f(void)
|
|||||||
|
|
||||||
INT32 newmapnum;
|
INT32 newmapnum;
|
||||||
|
|
||||||
char * mapname;
|
CLEANUP(Z_Pfree) char * mapname = NULL;
|
||||||
char *realmapname = NULL;
|
CLEANUP(Z_Pfree) char *realmapname = NULL;
|
||||||
|
|
||||||
INT32 newgametype = gametype;
|
INT32 newgametype = gametype;
|
||||||
boolean newencoremode = cv_kartencore.value;
|
boolean newencoremode = cv_kartencore.value;
|
||||||
@@ -2729,7 +2732,6 @@ static void Command_Map_f(void)
|
|||||||
if (newmapnum == 0)
|
if (newmapnum == 0)
|
||||||
{
|
{
|
||||||
CONS_Alert(CONS_ERROR, M_GetText("Could not find any map described as '%s'.\n"), mapname);
|
CONS_Alert(CONS_ERROR, M_GetText("Could not find any map described as '%s'.\n"), mapname);
|
||||||
Z_Free(mapname);
|
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -2761,8 +2763,6 @@ static void Command_Map_f(void)
|
|||||||
" 0 and %d inclusive. ...Or just use the name. :v\n",
|
" 0 and %d inclusive. ...Or just use the name. :v\n",
|
||||||
d,
|
d,
|
||||||
NUMGAMETYPES-1);
|
NUMGAMETYPES-1);
|
||||||
Z_Free(realmapname);
|
|
||||||
Z_Free(mapname);
|
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -2771,8 +2771,6 @@ static void Command_Map_f(void)
|
|||||||
CONS_Alert(CONS_ERROR,
|
CONS_Alert(CONS_ERROR,
|
||||||
"'%s' is not a gametype.\n",
|
"'%s' is not a gametype.\n",
|
||||||
gametypename);
|
gametypename);
|
||||||
Z_Free(realmapname);
|
|
||||||
Z_Free(mapname);
|
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -2790,8 +2788,6 @@ static void Command_Map_f(void)
|
|||||||
if (!mapheaderinfo[newmapnum-1])
|
if (!mapheaderinfo[newmapnum-1])
|
||||||
{
|
{
|
||||||
CONS_Alert(CONS_WARNING, M_GetText("Invalid mapheaderinfo for Course %s (%s)\n"), realmapname, G_BuildMapName(newmapnum));
|
CONS_Alert(CONS_WARNING, M_GetText("Invalid mapheaderinfo for Course %s (%s)\n"), realmapname, G_BuildMapName(newmapnum));
|
||||||
Z_Free(realmapname);
|
|
||||||
Z_Free(mapname);
|
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -2799,8 +2795,6 @@ static void Command_Map_f(void)
|
|||||||
{
|
{
|
||||||
CONS_Alert(CONS_WARNING, M_GetText("Course %s (%s) doesn't support %s mode!\n(Use -force to override)\n"), realmapname, G_BuildMapName(newmapnum),
|
CONS_Alert(CONS_WARNING, M_GetText("Course %s (%s) doesn't support %s mode!\n(Use -force to override)\n"), realmapname, G_BuildMapName(newmapnum),
|
||||||
(multiplayer ? gametype_cons_t[newgametype].strvalue : "Single Player"));
|
(multiplayer ? gametype_cons_t[newgametype].strvalue : "Single Player"));
|
||||||
Z_Free(realmapname);
|
|
||||||
Z_Free(mapname);
|
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -2812,8 +2806,6 @@ static void Command_Map_f(void)
|
|||||||
if (!dedicated && M_MapLocked(newmapnum))
|
if (!dedicated && M_MapLocked(newmapnum))
|
||||||
{
|
{
|
||||||
CONS_Alert(CONS_NOTICE, M_GetText("You need to unlock this level before you can warp to it!\n"));
|
CONS_Alert(CONS_NOTICE, M_GetText("You need to unlock this level before you can warp to it!\n"));
|
||||||
Z_Free(realmapname);
|
|
||||||
Z_Free(mapname);
|
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -2839,8 +2831,6 @@ static void Command_Map_f(void)
|
|||||||
fromlevelselect = false;
|
fromlevelselect = false;
|
||||||
|
|
||||||
D_MapChange(newmapnum, newgametype, newencoremode, newresetplayers, 0, false, false);
|
D_MapChange(newmapnum, newgametype, newencoremode, newresetplayers, 0, false, false);
|
||||||
|
|
||||||
Z_Free(realmapname);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/** Receives a map command and changes the map.
|
/** Receives a map command and changes the map.
|
||||||
@@ -3908,6 +3898,7 @@ static void Got_Teamchange(const UINT8 **cp, INT32 playernum)
|
|||||||
if (G_BattleGametype()) // SRB2kart
|
if (G_BattleGametype()) // SRB2kart
|
||||||
{
|
{
|
||||||
players[playernum].marescore = 0;
|
players[playernum].marescore = 0;
|
||||||
|
|
||||||
if (K_IsPlayerWanted(&players[playernum]))
|
if (K_IsPlayerWanted(&players[playernum]))
|
||||||
K_CalculateBattleWanted();
|
K_CalculateBattleWanted();
|
||||||
}
|
}
|
||||||
@@ -4505,7 +4496,7 @@ static void Command_Addskins(void)
|
|||||||
CONS_Printf("addskins has been deprecated\nuse addfilelocal instead!\n");
|
CONS_Printf("addskins has been deprecated\nuse addfilelocal instead!\n");
|
||||||
}
|
}
|
||||||
|
|
||||||
static void Command_GLocalSkin (void)
|
static void Command_GLocalSkin(void)
|
||||||
{
|
{
|
||||||
size_t first_option;
|
size_t first_option;
|
||||||
size_t option_display;
|
size_t option_display;
|
||||||
@@ -4516,7 +4507,7 @@ static void Command_GLocalSkin (void)
|
|||||||
option_display = COM_CheckPartialParm("-d");
|
option_display = COM_CheckPartialParm("-d");
|
||||||
option_all = COM_CheckPartialParm("-a");
|
option_all = COM_CheckPartialParm("-a");
|
||||||
|
|
||||||
char* fuck; // local skin name
|
CLEANUP(Z_Pfree) char* fuck = NULL; // local skin name
|
||||||
|
|
||||||
if (!(first_option = COM_FirstOption()))
|
if (!(first_option = COM_FirstOption()))
|
||||||
first_option = COM_Argc();
|
first_option = COM_Argc();
|
||||||
@@ -4557,7 +4548,6 @@ static void Command_GLocalSkin (void)
|
|||||||
|
|
||||||
CONS_Printf("Successfully applied localskin to displayed player.\n");
|
CONS_Printf("Successfully applied localskin to displayed player.\n");
|
||||||
|
|
||||||
Z_Free(fuck);
|
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
else if (option_all) // -all
|
else if (option_all) // -all
|
||||||
@@ -4572,7 +4562,6 @@ static void Command_GLocalSkin (void)
|
|||||||
}
|
}
|
||||||
CONS_Printf("Successfully applied localskin to all players.\n");
|
CONS_Printf("Successfully applied localskin to all players.\n");
|
||||||
|
|
||||||
Z_Free(fuck);
|
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
else // -player or no other arguments
|
else // -player or no other arguments
|
||||||
@@ -4589,7 +4578,6 @@ static void Command_GLocalSkin (void)
|
|||||||
}
|
}
|
||||||
CONS_Printf("Successfully applied localskin to specified player.\n");
|
CONS_Printf("Successfully applied localskin to specified player.\n");
|
||||||
|
|
||||||
Z_Free(fuck);
|
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
@@ -4597,13 +4585,11 @@ static void Command_GLocalSkin (void)
|
|||||||
SetLocalPlayerSkin(consoleplayer, fuck, &cv_localskin);
|
SetLocalPlayerSkin(consoleplayer, fuck, &cv_localskin);
|
||||||
CONS_Printf("Successfully applied localskin.\n");
|
CONS_Printf("Successfully applied localskin.\n");
|
||||||
|
|
||||||
Z_Free(fuck);
|
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
CONS_Printf("Could not apply localskin.\n");
|
CONS_Printf("Could not apply localskin.\n");
|
||||||
|
|
||||||
Z_Free(fuck);
|
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -5686,7 +5672,7 @@ static void Command_Togglemodified_f(void)
|
|||||||
|
|
||||||
static void Command_Archivetest_f(void)
|
static void Command_Archivetest_f(void)
|
||||||
{
|
{
|
||||||
savebuffer_t save;
|
savebuffer_t save = {0};
|
||||||
UINT32 i, wrote;
|
UINT32 i, wrote;
|
||||||
thinker_t *th;
|
thinker_t *th;
|
||||||
if (gamestate != GS_LEVEL)
|
if (gamestate != GS_LEVEL)
|
||||||
|
|||||||
+6
-6
@@ -64,7 +64,6 @@
|
|||||||
static boolean SV_SendFile(INT32 node, const char *filename, UINT8 fileid);
|
static boolean SV_SendFile(INT32 node, const char *filename, UINT8 fileid);
|
||||||
|
|
||||||
#ifdef HAVE_CURL
|
#ifdef HAVE_CURL
|
||||||
size_t curlwrite_data(void *ptr, size_t size, size_t nmemb, FILE *stream);
|
|
||||||
#if (LIBCURL_VERSION_MAJOR <= 7) && (LIBCURL_VERSION_MINOR < 35)
|
#if (LIBCURL_VERSION_MAJOR <= 7) && (LIBCURL_VERSION_MINOR < 35)
|
||||||
static int curlprogress_callback(void *clientp, double dltotal, double dlnow, double ultotal, double ulnow);
|
static int curlprogress_callback(void *clientp, double dltotal, double dlnow, double ultotal, double ulnow);
|
||||||
#else
|
#else
|
||||||
@@ -1080,12 +1079,14 @@ void CloseNetFile(void)
|
|||||||
|
|
||||||
// Receiving a file?
|
// Receiving a file?
|
||||||
for (i = 0; i < MAX_WADFILES; i++)
|
for (i = 0; i < MAX_WADFILES; i++)
|
||||||
|
{
|
||||||
if (fileneeded[i].status == FS_DOWNLOADING && fileneeded[i].file)
|
if (fileneeded[i].status == FS_DOWNLOADING && fileneeded[i].file)
|
||||||
{
|
{
|
||||||
fclose(fileneeded[i].file);
|
fclose(fileneeded[i].file);
|
||||||
// File is not complete delete it
|
// File is not complete delete it
|
||||||
remove(fileneeded[i].filename);
|
remove(fileneeded[i].filename);
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
|
||||||
// Remove PT_FILEFRAGMENT from acknowledge list
|
// Remove PT_FILEFRAGMENT from acknowledge list
|
||||||
Net_AbortPacketType(PT_FILEFRAGMENT);
|
Net_AbortPacketType(PT_FILEFRAGMENT);
|
||||||
@@ -1099,17 +1100,16 @@ void nameonly(char *s)
|
|||||||
void *ns;
|
void *ns;
|
||||||
|
|
||||||
for (j = strlen(s); j != (size_t)-1; j--)
|
for (j = strlen(s); j != (size_t)-1; j--)
|
||||||
|
{
|
||||||
if ((s[j] == '\\') || (s[j] == ':') || (s[j] == '/'))
|
if ((s[j] == '\\') || (s[j] == ':') || (s[j] == '/'))
|
||||||
{
|
{
|
||||||
ns = &(s[j+1]);
|
ns = &(s[j+1]);
|
||||||
len = strlen(ns);
|
len = strlen(ns);
|
||||||
#if 0
|
memmove(s, ns, len+1);
|
||||||
memcpy(s, ns, len+1);
|
|
||||||
#else
|
|
||||||
memmove(s, ns, len+1);
|
|
||||||
#endif
|
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
// Returns the length in characters of the last element of a path.
|
// Returns the length in characters of the last element of a path.
|
||||||
|
|||||||
+82
-144
@@ -127,16 +127,32 @@ typedef LPVOID (WINAPI *p_MapViewOfFile) (HANDLE, DWORD, DWORD, DWORD, SIZE_T);
|
|||||||
|
|
||||||
#include <time.h>
|
#include <time.h>
|
||||||
|
|
||||||
// Locations for searching the srb2.srb
|
/// Locations to directly check for srb2.srb in
|
||||||
|
const char *wadDefaultPaths[] = {
|
||||||
#if defined (__unix__) || defined(__APPLE__) || defined (UNIXCOMMON)
|
#if defined (__unix__) || defined(__APPLE__) || defined (UNIXCOMMON)
|
||||||
#define DEFAULTWADLOCATION1 "/usr/local/share/games/SRB2Kart"
|
"/usr/local/share/games/SRB2Kart",
|
||||||
#define DEFAULTWADLOCATION2 "/usr/local/games/SRB2Kart"
|
"/usr/local/games/SRB2Kart",
|
||||||
#define DEFAULTWADLOCATION3 "/usr/share/games/SRB2Kart"
|
"/usr/share/games/SRB2Kart",
|
||||||
#define DEFAULTWADLOCATION4 "/usr/games/SRB2Kart"
|
"/usr/games/SRB2Kart",
|
||||||
#define DEFAULTSEARCHPATH1 "/usr/local/games"
|
#elif defined (_WIN32)
|
||||||
#define DEFAULTSEARCHPATH2 "/usr/games"
|
"c:\\games\\srb2kart",
|
||||||
#define DEFAULTSEARCHPATH3 "/usr/local"
|
"\\games\\srb2kart",
|
||||||
#endif
|
#endif
|
||||||
|
NULL
|
||||||
|
};
|
||||||
|
|
||||||
|
// Folders to recurse through looking for srb2.srb
|
||||||
|
const char *wadSearchPaths[] = {
|
||||||
|
#if defined (__unix__) || defined(__APPLE__) || defined (UNIXCOMMON)
|
||||||
|
"/usr/local/games",
|
||||||
|
"/usr/games",
|
||||||
|
"/usr/local",
|
||||||
|
#elif defined (_WIN32)
|
||||||
|
"c:\\games",
|
||||||
|
"\\games",
|
||||||
|
#endif
|
||||||
|
NULL
|
||||||
|
};
|
||||||
|
|
||||||
/** \brief WAD file to look for
|
/** \brief WAD file to look for
|
||||||
*/
|
*/
|
||||||
@@ -808,20 +824,23 @@ static void I_SetupMumble(void)
|
|||||||
void I_UpdateMumble(const mobj_t *mobj, const listener_t listener)
|
void I_UpdateMumble(const mobj_t *mobj, const listener_t listener)
|
||||||
{
|
{
|
||||||
#ifdef HAVE_MUMBLE
|
#ifdef HAVE_MUMBLE
|
||||||
double angle;
|
float angle;
|
||||||
fixed_t anglef;
|
fixed_t anglef;
|
||||||
|
|
||||||
if (!mumble)
|
if (!mumble)
|
||||||
return;
|
return;
|
||||||
|
|
||||||
if (mumble->uiVersion != 2) {
|
if (mumble->uiVersion != 2)
|
||||||
wcsncpy(mumble->name, L"SRB2Kart "VERSIONSTRINGW, 256);
|
{
|
||||||
|
wcsncpy(mumble->name, L"SRB2Kart " VERSIONSTRINGW, 256);
|
||||||
wcsncpy(mumble->description, L"Sonic Robo Blast 2 Kart with integrated Mumble Link support.", 2048);
|
wcsncpy(mumble->description, L"Sonic Robo Blast 2 Kart with integrated Mumble Link support.", 2048);
|
||||||
mumble->uiVersion = 2;
|
mumble->uiVersion = 2;
|
||||||
}
|
}
|
||||||
mumble->uiTick++;
|
mumble->uiTick++;
|
||||||
|
|
||||||
if (!netgame || gamestate != GS_LEVEL) { // Zero out, but never delink.
|
// Zero out, but never delink.
|
||||||
|
if (!netgame || gamestate != GS_LEVEL)
|
||||||
|
{
|
||||||
mumble->fAvatarPosition[0] = mumble->fAvatarPosition[1] = mumble->fAvatarPosition[2] = 0.0f;
|
mumble->fAvatarPosition[0] = mumble->fAvatarPosition[1] = mumble->fAvatarPosition[2] = 0.0f;
|
||||||
mumble->fAvatarFront[0] = 1.0f;
|
mumble->fAvatarFront[0] = 1.0f;
|
||||||
mumble->fAvatarFront[1] = mumble->fAvatarFront[2] = 0.0f;
|
mumble->fAvatarFront[1] = mumble->fAvatarFront[2] = 0.0f;
|
||||||
@@ -838,31 +857,34 @@ void I_UpdateMumble(const mobj_t *mobj, const listener_t listener)
|
|||||||
mumble->context_len = (UINT32)(p - mumble->context);
|
mumble->context_len = (UINT32)(p - mumble->context);
|
||||||
}
|
}
|
||||||
|
|
||||||
if (mobj) {
|
if (mobj)
|
||||||
mumble->fAvatarPosition[0] = FIXED_TO_FLOAT(mobj->x) / MUMBLEUNIT;
|
{
|
||||||
mumble->fAvatarPosition[1] = FIXED_TO_FLOAT(mobj->z) / MUMBLEUNIT;
|
mumble->fAvatarPosition[0] = FixedToFloat(mobj->x) / MUMBLEUNIT;
|
||||||
mumble->fAvatarPosition[2] = FIXED_TO_FLOAT(mobj->y) / MUMBLEUNIT;
|
mumble->fAvatarPosition[1] = FixedToFloat(mobj->z) / MUMBLEUNIT;
|
||||||
|
mumble->fAvatarPosition[2] = FixedToFloat(mobj->y) / MUMBLEUNIT;
|
||||||
|
|
||||||
anglef = AngleFixed(mobj->angle);
|
anglef = AngleFixed(mobj->angle);
|
||||||
angle = FIXED_TO_FLOAT(anglef)*DEG2RAD;
|
angle = (float)(FixedToFloat(anglef) * DEG2RAD);
|
||||||
mumble->fAvatarFront[0] = (float)cos(angle);
|
mumble->fAvatarFront[0] = cosf(angle);
|
||||||
mumble->fAvatarFront[1] = 0.0f;
|
mumble->fAvatarFront[1] = 0.0f;
|
||||||
mumble->fAvatarFront[2] = (float)sin(angle);
|
mumble->fAvatarFront[2] = sinf(angle);
|
||||||
} else {
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
mumble->fAvatarPosition[0] = mumble->fAvatarPosition[1] = mumble->fAvatarPosition[2] = 0.0f;
|
mumble->fAvatarPosition[0] = mumble->fAvatarPosition[1] = mumble->fAvatarPosition[2] = 0.0f;
|
||||||
mumble->fAvatarFront[0] = 1.0f;
|
mumble->fAvatarFront[0] = 1.0f;
|
||||||
mumble->fAvatarFront[1] = mumble->fAvatarFront[2] = 0.0f;
|
mumble->fAvatarFront[1] = mumble->fAvatarFront[2] = 0.0f;
|
||||||
}
|
}
|
||||||
|
|
||||||
mumble->fCameraPosition[0] = FIXED_TO_FLOAT(listener.x) / MUMBLEUNIT;
|
mumble->fCameraPosition[0] = FixedToFloat(listener.x) / MUMBLEUNIT;
|
||||||
mumble->fCameraPosition[1] = FIXED_TO_FLOAT(listener.z) / MUMBLEUNIT;
|
mumble->fCameraPosition[1] = FixedToFloat(listener.z) / MUMBLEUNIT;
|
||||||
mumble->fCameraPosition[2] = FIXED_TO_FLOAT(listener.y) / MUMBLEUNIT;
|
mumble->fCameraPosition[2] = FixedToFloat(listener.y) / MUMBLEUNIT;
|
||||||
|
|
||||||
anglef = AngleFixed(listener.angle);
|
anglef = AngleFixed(listener.angle);
|
||||||
angle = FIXED_TO_FLOAT(anglef)*DEG2RAD;
|
angle = (float)(FixedToFloat(anglef) * DEG2RAD);
|
||||||
mumble->fCameraFront[0] = (float)cos(angle);
|
mumble->fCameraFront[0] = cosf(angle);
|
||||||
mumble->fCameraFront[1] = 0.0f;
|
mumble->fCameraFront[1] = 0.0f;
|
||||||
mumble->fCameraFront[2] = (float)sin(angle);
|
mumble->fCameraFront[2] = sinf(angle);
|
||||||
#else
|
#else
|
||||||
(void)mobj;
|
(void)mobj;
|
||||||
(void)listener;
|
(void)listener;
|
||||||
@@ -1417,20 +1439,6 @@ death:
|
|||||||
exit(0);
|
exit(0);
|
||||||
}
|
}
|
||||||
|
|
||||||
void I_WaitVBL(INT32 count)
|
|
||||||
{
|
|
||||||
count = 1;
|
|
||||||
I_Sleep(count);
|
|
||||||
}
|
|
||||||
|
|
||||||
void I_BeginRead(void)
|
|
||||||
{
|
|
||||||
}
|
|
||||||
|
|
||||||
void I_EndRead(void)
|
|
||||||
{
|
|
||||||
}
|
|
||||||
|
|
||||||
//
|
//
|
||||||
// I_Error
|
// I_Error
|
||||||
//
|
//
|
||||||
@@ -1821,16 +1829,23 @@ static const char *searchWad(const char *searchDir)
|
|||||||
return tempsw;
|
return tempsw;
|
||||||
}
|
}
|
||||||
|
|
||||||
strcpy(tempsw, WADKEYWORD2);
|
|
||||||
fstemp = filesearch(tempsw, searchDir, NULL, true, 20);
|
|
||||||
if (fstemp == FS_FOUND)
|
|
||||||
{
|
|
||||||
pathonly(tempsw);
|
|
||||||
return tempsw;
|
|
||||||
}
|
|
||||||
return NULL;
|
return NULL;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#define CHECKWADPATH(ret) \
|
||||||
|
do { \
|
||||||
|
I_OutputMsg(",%s", ret); \
|
||||||
|
if (isWadPathOk(ret)) \
|
||||||
|
return ret; \
|
||||||
|
} while (0)
|
||||||
|
|
||||||
|
#define SEARCHWAD(str) \
|
||||||
|
do { \
|
||||||
|
WadPath = searchWad(str); \
|
||||||
|
if (WadPath) \
|
||||||
|
return WadPath; \
|
||||||
|
} while (0)
|
||||||
|
|
||||||
/** \brief go through all possible paths and look for srb2.srb
|
/** \brief go through all possible paths and look for srb2.srb
|
||||||
|
|
||||||
\return path to srb2.srb if any
|
\return path to srb2.srb if any
|
||||||
@@ -1839,6 +1854,7 @@ static const char *locateWad(void)
|
|||||||
{
|
{
|
||||||
const char *envstr;
|
const char *envstr;
|
||||||
const char *WadPath;
|
const char *WadPath;
|
||||||
|
int i;
|
||||||
|
|
||||||
I_OutputMsg("SRB2WADDIR");
|
I_OutputMsg("SRB2WADDIR");
|
||||||
// does SRB2WADDIR exist?
|
// does SRB2WADDIR exist?
|
||||||
@@ -1846,132 +1862,51 @@ static const char *locateWad(void)
|
|||||||
return envstr;
|
return envstr;
|
||||||
|
|
||||||
#ifndef NOCWD
|
#ifndef NOCWD
|
||||||
I_OutputMsg(",.");
|
|
||||||
// examine current dir
|
// examine current dir
|
||||||
strcpy(returnWadPath, ".");
|
strcpy(returnWadPath, ".");
|
||||||
|
I_OutputMsg(",%s", returnWadPath);
|
||||||
if (isWadPathOk(returnWadPath))
|
if (isWadPathOk(returnWadPath))
|
||||||
return NULL;
|
return NULL;
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
#ifndef NOHOME
|
||||||
#ifdef DEFAULTDIR
|
#ifdef DEFAULTDIR
|
||||||
I_OutputMsg(",HOME/" DEFAULTDIR);
|
I_OutputMsg(",HOME/" DEFAULTDIR);
|
||||||
// examine user jart directory
|
// examine user jart directory
|
||||||
if ((envstr = I_GetEnv("HOME")) != NULL)
|
if ((envstr = I_GetEnv("HOME")) != NULL)
|
||||||
{
|
{
|
||||||
sprintf(returnWadPath, "%s" PATHSEP DEFAULTDIR, envstr);
|
sprintf(returnWadPath, "%s" PATHSEP DEFAULTDIR, envstr);
|
||||||
if (isWadPathOk(returnWadPath))
|
CHECKWADPATH(returnWadPath);
|
||||||
return returnWadPath;
|
|
||||||
}
|
|
||||||
#endif
|
|
||||||
|
|
||||||
|
|
||||||
#ifdef CMAKECONFIG
|
|
||||||
#ifndef NDEBUG
|
|
||||||
I_OutputMsg(","CMAKE_ASSETS_DIR);
|
|
||||||
strcpy(returnWadPath, CMAKE_ASSETS_DIR);
|
|
||||||
if (isWadPathOk(returnWadPath))
|
|
||||||
{
|
|
||||||
return returnWadPath;
|
|
||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#ifdef __APPLE__
|
#ifdef __APPLE__
|
||||||
OSX_GetResourcesPath(returnWadPath);
|
OSX_GetResourcesPath(returnWadPath);
|
||||||
I_OutputMsg(",%s", returnWadPath);
|
CHECKWADPATH(returnWadPath);
|
||||||
if (isWadPathOk(returnWadPath))
|
|
||||||
{
|
|
||||||
return returnWadPath;
|
|
||||||
}
|
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
// examine default dirs
|
// examine default dirs
|
||||||
#ifdef DEFAULTWADLOCATION1
|
for (i = 0; wadDefaultPaths[i]; i++)
|
||||||
I_OutputMsg(","DEFAULTWADLOCATION1);
|
|
||||||
strcpy(returnWadPath, DEFAULTWADLOCATION1);
|
|
||||||
if (isWadPathOk(returnWadPath))
|
|
||||||
return returnWadPath;
|
|
||||||
#endif
|
|
||||||
#ifdef DEFAULTWADLOCATION2
|
|
||||||
I_OutputMsg(","DEFAULTWADLOCATION2);
|
|
||||||
strcpy(returnWadPath, DEFAULTWADLOCATION2);
|
|
||||||
if (isWadPathOk(returnWadPath))
|
|
||||||
return returnWadPath;
|
|
||||||
#endif
|
|
||||||
#ifdef DEFAULTWADLOCATION3
|
|
||||||
I_OutputMsg(","DEFAULTWADLOCATION3);
|
|
||||||
strcpy(returnWadPath, DEFAULTWADLOCATION3);
|
|
||||||
if (isWadPathOk(returnWadPath))
|
|
||||||
return returnWadPath;
|
|
||||||
#endif
|
|
||||||
#ifdef DEFAULTWADLOCATION4
|
|
||||||
I_OutputMsg(","DEFAULTWADLOCATION4);
|
|
||||||
strcpy(returnWadPath, DEFAULTWADLOCATION4);
|
|
||||||
if (isWadPathOk(returnWadPath))
|
|
||||||
return returnWadPath;
|
|
||||||
#endif
|
|
||||||
#ifdef DEFAULTWADLOCATION5
|
|
||||||
I_OutputMsg(","DEFAULTWADLOCATION5);
|
|
||||||
strcpy(returnWadPath, DEFAULTWADLOCATION5);
|
|
||||||
if (isWadPathOk(returnWadPath))
|
|
||||||
return returnWadPath;
|
|
||||||
#endif
|
|
||||||
#ifdef DEFAULTWADLOCATION6
|
|
||||||
I_OutputMsg(","DEFAULTWADLOCATION6);
|
|
||||||
strcpy(returnWadPath, DEFAULTWADLOCATION6);
|
|
||||||
if (isWadPathOk(returnWadPath))
|
|
||||||
return returnWadPath;
|
|
||||||
#endif
|
|
||||||
#ifdef DEFAULTWADLOCATION7
|
|
||||||
I_OutputMsg(","DEFAULTWADLOCATION7);
|
|
||||||
strcpy(returnWadPath, DEFAULTWADLOCATION7);
|
|
||||||
if (isWadPathOk(returnWadPath))
|
|
||||||
return returnWadPath;
|
|
||||||
#endif
|
|
||||||
#ifndef NOHOME
|
|
||||||
// find in $HOME
|
|
||||||
I_OutputMsg(",HOME/" DEFAULTDIR);
|
|
||||||
if ((envstr = I_GetEnv("HOME")) != NULL)
|
|
||||||
{
|
{
|
||||||
char *tmp = malloc(strlen(envstr) + sizeof(PATHSEP) + sizeof(DEFAULTDIR));
|
strcpy(returnWadPath, wadDefaultPaths[i]);
|
||||||
strcpy(tmp, envstr);
|
CHECKWADPATH(returnWadPath);
|
||||||
strcat(tmp, PATHSEP);
|
|
||||||
strcat(tmp, DEFAULTDIR);
|
|
||||||
WadPath = searchWad(tmp);
|
|
||||||
free(tmp);
|
|
||||||
if (WadPath)
|
|
||||||
return WadPath;
|
|
||||||
}
|
}
|
||||||
#endif
|
|
||||||
#ifdef DEFAULTSEARCHPATH1
|
// search paths
|
||||||
// find in /usr/local
|
for (i = 0; wadSearchPaths[i]; i++)
|
||||||
I_OutputMsg(", in:"DEFAULTSEARCHPATH1);
|
{
|
||||||
WadPath = searchWad(DEFAULTSEARCHPATH1);
|
I_OutputMsg(", in:%s", wadSearchPaths[i]);
|
||||||
if (WadPath)
|
SEARCHWAD(wadSearchPaths[i]);
|
||||||
return WadPath;
|
}
|
||||||
#endif
|
|
||||||
#ifdef DEFAULTSEARCHPATH2
|
|
||||||
// find in /usr/games
|
|
||||||
I_OutputMsg(", in:"DEFAULTSEARCHPATH2);
|
|
||||||
WadPath = searchWad(DEFAULTSEARCHPATH2);
|
|
||||||
if (WadPath)
|
|
||||||
return WadPath;
|
|
||||||
#endif
|
|
||||||
#ifdef DEFAULTSEARCHPATH3
|
|
||||||
// find in ???
|
|
||||||
I_OutputMsg(", in:"DEFAULTSEARCHPATH3);
|
|
||||||
WadPath = searchWad(DEFAULTSEARCHPATH3);
|
|
||||||
if (WadPath)
|
|
||||||
return WadPath;
|
|
||||||
#endif
|
|
||||||
// if nothing was found
|
// if nothing was found
|
||||||
return NULL;
|
return NULL;
|
||||||
}
|
}
|
||||||
|
|
||||||
const char *I_LocateWad(void)
|
const char *I_LocateWad(void)
|
||||||
{
|
{
|
||||||
const char *waddir;
|
const char *waddir = NULL;
|
||||||
|
|
||||||
I_OutputMsg("Looking for WADs in: ");
|
I_OutputMsg("Looking for WADs in: ");
|
||||||
waddir = locateWad();
|
waddir = locateWad();
|
||||||
@@ -1981,12 +1916,15 @@ const char *I_LocateWad(void)
|
|||||||
{
|
{
|
||||||
// change to the directory where we found srb2.srb
|
// change to the directory where we found srb2.srb
|
||||||
#if defined (_WIN32)
|
#if defined (_WIN32)
|
||||||
|
waddir = _fullpath(NULL, waddir, MAX_PATH);
|
||||||
SetCurrentDirectoryA(waddir);
|
SetCurrentDirectoryA(waddir);
|
||||||
#else
|
#else
|
||||||
|
waddir = realpath(waddir, NULL);
|
||||||
if (waddir == NULL || chdir(waddir) == -1)
|
if (waddir == NULL || chdir(waddir) == -1)
|
||||||
I_OutputMsg("Couldn't change working directory\n");
|
I_OutputMsg("Couldn't change working directory\n");
|
||||||
#endif
|
#endif
|
||||||
}
|
}
|
||||||
|
|
||||||
return waddir;
|
return waddir;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -65,13 +65,6 @@ void I_OsPolling(void)
|
|||||||
I_GetConsoleEvents();
|
I_GetConsoleEvents();
|
||||||
}
|
}
|
||||||
|
|
||||||
//
|
|
||||||
// I_UpdateNoBlit
|
|
||||||
//
|
|
||||||
void I_UpdateNoBlit(void)
|
|
||||||
{
|
|
||||||
}
|
|
||||||
|
|
||||||
//
|
//
|
||||||
// I_FinishUpdate
|
// I_FinishUpdate
|
||||||
//
|
//
|
||||||
@@ -122,6 +115,10 @@ INT32 VID_GetModeForSize(INT32 w, INT32 h)
|
|||||||
return -1;
|
return -1;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
void VID_RefreshModeList(void)
|
||||||
|
{
|
||||||
|
}
|
||||||
|
|
||||||
void VID_PrepareModeList(void)
|
void VID_PrepareModeList(void)
|
||||||
{
|
{
|
||||||
}
|
}
|
||||||
@@ -155,7 +152,10 @@ boolean I_UseNativeKeyboard(void)
|
|||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
void I_HandleControllerHatRepeat(void)
|
||||||
|
{
|
||||||
|
}
|
||||||
|
|
||||||
void I_SetBorderlessWindow(void)
|
void I_SetBorderlessWindow(void)
|
||||||
{
|
{
|
||||||
|
|
||||||
}
|
}
|
||||||
+3
-3
@@ -47,9 +47,9 @@
|
|||||||
|
|
||||||
// Free slot names
|
// Free slot names
|
||||||
// The crazy word-reading stuff uses these.
|
// The crazy word-reading stuff uses these.
|
||||||
char *FREE_STATES[NUMSTATEFREESLOTS];
|
char *FREE_STATES[NUMSTATEFREESLOTS] = {};
|
||||||
char *FREE_MOBJS[NUMMOBJFREESLOTS];
|
char *FREE_MOBJS[NUMMOBJFREESLOTS] = {};
|
||||||
UINT8 used_spr[(NUMSPRITEFREESLOTS / 8) + 1]; // Bitwise flag for sprite freeslot in use! I would use ceil() here if I could, but it only saves 1 byte of memory anyway.
|
UINT8 used_spr[(NUMSPRITEFREESLOTS / 8) + 1] = {}; // Bitwise flag for sprite freeslot in use! I would use ceil() here if I could, but it only saves 1 byte of memory anyway.
|
||||||
|
|
||||||
#define initfreeslots() {\
|
#define initfreeslots() {\
|
||||||
memset(FREE_STATES,0,sizeof(char *) * NUMSTATEFREESLOTS);\
|
memset(FREE_STATES,0,sizeof(char *) * NUMSTATEFREESLOTS);\
|
||||||
|
|||||||
+13
-15
@@ -19,25 +19,19 @@
|
|||||||
// This should actually be in the makefile,
|
// This should actually be in the makefile,
|
||||||
// but I can't stand that gibberish. D:
|
// but I can't stand that gibberish. D:
|
||||||
#define SOUND_DUMMY 0
|
#define SOUND_DUMMY 0
|
||||||
#define SOUND_SDL 1
|
#define SOUND_MIXER 1
|
||||||
#define SOUND_MIXER 2
|
#define SOUND_SDL 2
|
||||||
|
|
||||||
#ifndef SOUND
|
#ifndef SOUND
|
||||||
#ifdef HAVE_SDL
|
#ifdef HAVE_SDL
|
||||||
|
|
||||||
// Use Mixer interface?
|
// Use Mixer interface?
|
||||||
#ifdef HAVE_MIXER
|
#ifdef HAVE_MIXER
|
||||||
#define SOUND SOUND_MIXER
|
#define SOUND SOUND_MIXER
|
||||||
|
#else
|
||||||
|
#define SOUND SOUND_SDL
|
||||||
#endif
|
#endif
|
||||||
|
#else
|
||||||
// Use generic SDL interface.
|
#define SOUND SOUND_DUMMY
|
||||||
#ifndef SOUND
|
|
||||||
#define SOUND SOUND_SDL
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#else // No SDL.
|
|
||||||
// No more interfaces. :(
|
|
||||||
#define SOUND SOUND_DUMMY
|
|
||||||
#endif
|
#endif
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
@@ -114,8 +108,8 @@ extern char logfilename[1024];
|
|||||||
#else
|
#else
|
||||||
#define VERSION 1 // Game version
|
#define VERSION 1 // Game version
|
||||||
#define SUBVERSION 6 // more precise version number
|
#define SUBVERSION 6 // more precise version number
|
||||||
#define VERSIONSTRING "Saturn v9"
|
#define VERSIONSTRING "Saturn v9.x - Testing"
|
||||||
#define VERSIONSTRINGW L"Saturn v9"
|
#define VERSIONSTRINGW L"Saturn v9.x - Testing "
|
||||||
|
|
||||||
#define SATURN_TESTING // comment out for saturn release builds!
|
#define SATURN_TESTING // comment out for saturn release builds!
|
||||||
|
|
||||||
@@ -484,7 +478,7 @@ extern INT32 cv_debug;
|
|||||||
// Misc stuff for later...
|
// Misc stuff for later...
|
||||||
// =======================
|
// =======================
|
||||||
|
|
||||||
#define ANG2RAD(angle) ((float)((angle)*M_PI)/ANGLE_180)
|
#define ANG2RAD(angle) ((float)((angle)*M_PIf) / (float)ANGLE_180)
|
||||||
|
|
||||||
// Modifier key variables, accessible anywhere
|
// Modifier key variables, accessible anywhere
|
||||||
extern UINT8 shiftdown, ctrldown, altdown;
|
extern UINT8 shiftdown, ctrldown, altdown;
|
||||||
@@ -533,6 +527,10 @@ UINT32 quickncasehash (const char *p, size_t n)
|
|||||||
#define M_PIl 3.1415926535897932384626433832795029L
|
#define M_PIl 3.1415926535897932384626433832795029L
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
#ifndef M_PIf
|
||||||
|
#define M_PIf 3.14159265f
|
||||||
|
#endif
|
||||||
|
|
||||||
// Floating point comparison epsilons from float.h
|
// Floating point comparison epsilons from float.h
|
||||||
#ifndef FLT_EPSILON
|
#ifndef FLT_EPSILON
|
||||||
#define FLT_EPSILON 1.1920928955078125e-7f
|
#define FLT_EPSILON 1.1920928955078125e-7f
|
||||||
|
|||||||
+6
-4
@@ -68,11 +68,13 @@ extern "C" {
|
|||||||
#define strnicmp(x,y,n) strncasecmp(x,y,n)
|
#define strnicmp(x,y,n) strncasecmp(x,y,n)
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#ifndef __cplusplus
|
char *nongnu_strcasestr(const char *in, const char *what);
|
||||||
char *strcasestr(const char *in, const char *what);
|
#ifndef _GNU_SOURCE
|
||||||
#define stristr strcasestr
|
#define strcasestr nongnu_strcasestr
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
#define stristr strcasestr
|
||||||
|
|
||||||
#if defined (macintosh) //|| defined (__APPLE__) //skip all boolean/Boolean crap
|
#if defined (macintosh) //|| defined (__APPLE__) //skip all boolean/Boolean crap
|
||||||
#define true 1
|
#define true 1
|
||||||
#define false 0
|
#define false 0
|
||||||
@@ -293,7 +295,7 @@ typedef struct
|
|||||||
UINT8 green;
|
UINT8 green;
|
||||||
UINT8 blue;
|
UINT8 blue;
|
||||||
UINT8 alpha;
|
UINT8 alpha;
|
||||||
} byteColor_t;
|
} ATTRPACK byteColor_t;
|
||||||
|
|
||||||
union FColorRGBA
|
union FColorRGBA
|
||||||
{
|
{
|
||||||
|
|||||||
+32
-38
@@ -166,8 +166,8 @@ static void F_SkyScroll(INT32 scrollspeed)
|
|||||||
patch_t *pat, *pat2;
|
patch_t *pat, *pat2;
|
||||||
INT32 anim2 = 0;
|
INT32 anim2 = 0;
|
||||||
|
|
||||||
pat = W_CachePatchName("TITLEBG1", PU_PATCH_LOWPRIORITY);
|
pat = W_CachePatchName("TITLEBG1", PU_PATCH);
|
||||||
pat2 = W_CachePatchName("TITLEBG2", PU_PATCH_LOWPRIORITY);
|
pat2 = W_CachePatchName("TITLEBG2", PU_PATCH);
|
||||||
|
|
||||||
w = (vid.scaledwidth << FRACBITS);
|
w = (vid.scaledwidth << FRACBITS);
|
||||||
|
|
||||||
@@ -208,16 +208,13 @@ static void F_SkyScroll(INT32 scrollspeed)
|
|||||||
INT32 intro_scenenum = 0;
|
INT32 intro_scenenum = 0;
|
||||||
INT32 intro_curtime = 0;
|
INT32 intro_curtime = 0;
|
||||||
|
|
||||||
const char *introtext[NUMINTROSCENES];
|
const char *introtext[NUMINTROSCENES] = {};
|
||||||
|
|
||||||
static tic_t introscenetime[NUMINTROSCENES] =
|
static tic_t introscenetime[NUMINTROSCENES] =
|
||||||
{
|
{
|
||||||
4*TICRATE, // KART KR(eW
|
4*TICRATE, // KART KR(eW
|
||||||
};
|
};
|
||||||
|
|
||||||
// custom intros
|
|
||||||
void F_StartCustomCutscene(INT32 cutscenenum, boolean precutscene, boolean resetplayer);
|
|
||||||
|
|
||||||
void F_StartIntro(void)
|
void F_StartIntro(void)
|
||||||
{
|
{
|
||||||
if (gamestate)
|
if (gamestate)
|
||||||
@@ -257,26 +254,21 @@ void F_StartIntro(void)
|
|||||||
//
|
//
|
||||||
void F_IntroDrawer(void)
|
void F_IntroDrawer(void)
|
||||||
{
|
{
|
||||||
boolean highres = false;
|
|
||||||
INT32 cx = 8, cy = 128;
|
INT32 cx = 8, cy = 128;
|
||||||
patch_t *background = NULL;
|
patch_t *background = NULL;
|
||||||
INT32 bgxoffs = 0;
|
INT32 bgxoffs = 0;
|
||||||
|
|
||||||
|
V_DrawFill(0, 0, BASEVIDWIDTH, BASEVIDHEIGHT, 120);
|
||||||
|
|
||||||
// DRAW A FULL PIC INSTEAD OF FLAT!
|
// DRAW A FULL PIC INSTEAD OF FLAT!
|
||||||
if (intro_scenenum == 0)
|
if (intro_scenenum == 0)
|
||||||
{
|
{
|
||||||
background = W_CachePatchName("KARTKREW", PU_PATCH_LOWPRIORITY);
|
background = W_CachePatchName("KARTKREW", PU_PATCH);
|
||||||
highres = true;
|
|
||||||
}
|
|
||||||
|
|
||||||
V_DrawFill(0, 0, BASEVIDWIDTH, BASEVIDHEIGHT, 120);
|
if (background)
|
||||||
|
{
|
||||||
if (background)
|
|
||||||
{
|
|
||||||
if (highres)
|
|
||||||
V_DrawSmallScaledPatch(bgxoffs, 0, 0, background);
|
V_DrawSmallScaledPatch(bgxoffs, 0, 0, background);
|
||||||
else
|
}
|
||||||
V_DrawScaledPatch(bgxoffs, 0, 0, background);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
W_UnlockCachedPatch(background);
|
W_UnlockCachedPatch(background);
|
||||||
@@ -324,6 +316,7 @@ void F_IntroTicker(void)
|
|||||||
D_StartTitle();
|
D_StartTitle();
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (finalecount == 8)
|
if (finalecount == 8)
|
||||||
S_StartSound(NULL, sfx_vroom);
|
S_StartSound(NULL, sfx_vroom);
|
||||||
else if (finalecount == 47)
|
else if (finalecount == 47)
|
||||||
@@ -626,7 +619,6 @@ void F_StartCredits(void)
|
|||||||
timetonext = 2*TICRATE;
|
timetonext = 2*TICRATE;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
void F_CreditDrawer(void)
|
void F_CreditDrawer(void)
|
||||||
{
|
{
|
||||||
UINT16 i;
|
UINT16 i;
|
||||||
@@ -652,7 +644,7 @@ void F_CreditDrawer(void)
|
|||||||
sc = FRACUNIT; // quick hack so I don't have to add another field to credits_pics
|
sc = FRACUNIT; // quick hack so I don't have to add another field to credits_pics
|
||||||
}
|
}
|
||||||
|
|
||||||
V_DrawFixedPatch(credits_pics[i].x<<FRACBITS, (credits_pics[i].y<<FRACBITS) - 4*(animtimer<<FRACBITS)/5, sc, 0, W_CachePatchName(credits_pics[i].patch, PU_PATCH), colormap);
|
V_DrawFixedPatch(credits_pics[i].x<<FRACBITS, (credits_pics[i].y<<FRACBITS) - 4*(animtimer<<FRACBITS)/5, sc, 0, W_CachePatchName(credits_pics[i].patch, PU_PATCH_LOWPRIORITY), colormap);
|
||||||
}
|
}
|
||||||
|
|
||||||
// Dim the background
|
// Dim the background
|
||||||
@@ -661,22 +653,23 @@ void F_CreditDrawer(void)
|
|||||||
// Draw credits text on top
|
// Draw credits text on top
|
||||||
for (i = 0; credits[i]; i++)
|
for (i = 0; credits[i]; i++)
|
||||||
{
|
{
|
||||||
switch(credits[i][0])
|
switch (credits[i][0])
|
||||||
{
|
{
|
||||||
case 0:
|
case 0:
|
||||||
y += 80<<FRACBITS;
|
y += 80<<FRACBITS;
|
||||||
break;
|
break;
|
||||||
case 1:
|
case 1:
|
||||||
if (y>>FRACBITS > -20)
|
if (y>>FRACBITS > -20)
|
||||||
V_DrawCreditString((160 - (V_CreditStringWidth(&credits[i][1])>>1))<<FRACBITS, y, 0, &credits[i][1]);
|
V_DrawCreditString((160 - (V_CreditStringWidth(&credits[i][1])>>1))<<FRACBITS, y, 0, &credits[i][1]);
|
||||||
y += 30<<FRACBITS;
|
y += 30<<FRACBITS;
|
||||||
break;
|
break;
|
||||||
default:
|
default:
|
||||||
if (y>>FRACBITS > -10)
|
if (y>>FRACBITS > -10)
|
||||||
V_DrawStringAtFixed(32<<FRACBITS, y, V_ALLOWLOWERCASE, credits[i]);
|
V_DrawStringAtFixed(32<<FRACBITS, y, V_ALLOWLOWERCASE, credits[i]);
|
||||||
y += 12<<FRACBITS;
|
y += 12<<FRACBITS;
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (((y>>FRACBITS) * vid.dup) > vid.height)
|
if (((y>>FRACBITS) * vid.dup) > vid.height)
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
@@ -701,7 +694,7 @@ void F_CreditTicker(void)
|
|||||||
// Draw credits text on top
|
// Draw credits text on top
|
||||||
for (i = 0; credits[i]; i++)
|
for (i = 0; credits[i]; i++)
|
||||||
{
|
{
|
||||||
switch(credits[i][0])
|
switch (credits[i][0])
|
||||||
{
|
{
|
||||||
case 0: y += 80<<FRACBITS; break;
|
case 0: y += 80<<FRACBITS; break;
|
||||||
case 1: y += 30<<FRACBITS; break;
|
case 1: y += 30<<FRACBITS; break;
|
||||||
@@ -979,10 +972,10 @@ void F_StartTitleScreen(void)
|
|||||||
demoDelayLeft = demoDelayTime;
|
demoDelayLeft = demoDelayTime;
|
||||||
demoIdleLeft = demoIdleTime;
|
demoIdleLeft = demoIdleTime;
|
||||||
|
|
||||||
ttbanner = W_CachePatchName("TTKBANNR", PU_PATCH_LOWPRIORITY);
|
ttbanner = W_CachePatchName("TTKBANNR", PU_PATCH);
|
||||||
ttkart = W_CachePatchName("TTKART", PU_PATCH_LOWPRIORITY);
|
ttkart = W_CachePatchName("TTKART", PU_PATCH);
|
||||||
ttcheckers = W_CachePatchName("TTCHECK", PU_PATCH_LOWPRIORITY);
|
ttcheckers = W_CachePatchName("TTCHECK", PU_PATCH);
|
||||||
ttkflash = W_CachePatchName("TTKFLASH", PU_PATCH_LOWPRIORITY);
|
ttkflash = W_CachePatchName("TTKFLASH", PU_PATCH);
|
||||||
}
|
}
|
||||||
|
|
||||||
// (no longer) De-Demo'd Title Screen
|
// (no longer) De-Demo'd Title Screen
|
||||||
@@ -1419,6 +1412,7 @@ void F_EndCutScene(void)
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// custom intros
|
||||||
void F_StartCustomCutscene(INT32 cutscenenum, boolean precutscene, boolean resetplayer)
|
void F_StartCustomCutscene(INT32 cutscenenum, boolean precutscene, boolean resetplayer)
|
||||||
{
|
{
|
||||||
if (!cutscenes[cutscenenum])
|
if (!cutscenes[cutscenenum])
|
||||||
|
|||||||
+6
-3
@@ -98,7 +98,8 @@ static fixed_t paldiv;
|
|||||||
* \param lump Lump name to get data from
|
* \param lump Lump name to get data from
|
||||||
* \return fademask_t for lump
|
* \return fademask_t for lump
|
||||||
*/
|
*/
|
||||||
static fademask_t *F_GetFadeMask(UINT8 masknum, UINT8 scrnnum) {
|
static fademask_t *F_GetFadeMask(UINT8 masknum, UINT8 scrnnum)
|
||||||
|
{
|
||||||
static char lumpname[9] = "FADEmmss";
|
static char lumpname[9] = "FADEmmss";
|
||||||
static fademask_t fm = {NULL,0,0,0,0,0};
|
static fademask_t fm = {NULL,0,0,0,0,0};
|
||||||
lumpnum_t lumpnum;
|
lumpnum_t lumpnum;
|
||||||
@@ -148,6 +149,7 @@ static fademask_t *F_GetFadeMask(UINT8 masknum, UINT8 scrnnum) {
|
|||||||
case 0: // end marker (not bad!, but still need clearing)
|
case 0: // end marker (not bad!, but still need clearing)
|
||||||
goto freemask;
|
goto freemask;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (lsize != fm.size)
|
if (lsize != fm.size)
|
||||||
fm.mask = Z_Realloc(fm.mask, lsize, PU_STATIC, NULL);
|
fm.mask = Z_Realloc(fm.mask, lsize, PU_STATIC, NULL);
|
||||||
fm.size = lsize;
|
fm.size = lsize;
|
||||||
@@ -361,6 +363,7 @@ void F_RunWipe(UINT8 wipetype, boolean drawMenu)
|
|||||||
{
|
{
|
||||||
// get fademask first so we can tell if it exists or not
|
// get fademask first so we can tell if it exists or not
|
||||||
fmask = F_GetFadeMask(wipetype, wipeframe++);
|
fmask = F_GetFadeMask(wipetype, wipeframe++);
|
||||||
|
|
||||||
if (!fmask)
|
if (!fmask)
|
||||||
break;
|
break;
|
||||||
|
|
||||||
@@ -377,11 +380,10 @@ void F_RunWipe(UINT8 wipetype, boolean drawMenu)
|
|||||||
HWR_DoWipe(wipetype, wipeframe-1); // send in the wipe type and wipeframe because we need to cache the graphic
|
HWR_DoWipe(wipetype, wipeframe-1); // send in the wipe type and wipeframe because we need to cache the graphic
|
||||||
else
|
else
|
||||||
#endif
|
#endif
|
||||||
if (rendermode != render_none) //this allows F_RunWipe to be called in dedicated servers
|
if (rendermode != render_none) // this allows F_RunWipe to be called in dedicated servers
|
||||||
F_DoWipe(fmask);
|
F_DoWipe(fmask);
|
||||||
|
|
||||||
I_OsPolling();
|
I_OsPolling();
|
||||||
I_UpdateNoBlit();
|
|
||||||
|
|
||||||
if (rendermode != render_none && drawMenu)
|
if (rendermode != render_none && drawMenu)
|
||||||
{
|
{
|
||||||
@@ -401,6 +403,7 @@ void F_RunWipe(UINT8 wipetype, boolean drawMenu)
|
|||||||
|
|
||||||
NetKeepAlive(); // Update the network so we don't cause timeouts
|
NetKeepAlive(); // Update the network so we don't cause timeouts
|
||||||
}
|
}
|
||||||
|
|
||||||
WipeInAction = false;
|
WipeInAction = false;
|
||||||
#endif
|
#endif
|
||||||
}
|
}
|
||||||
+5
-6
@@ -44,16 +44,16 @@ consvar_t cv_addons_search_case = {"addons_search_case", "No", CV_SAVE, CV_YesNo
|
|||||||
static CV_PossibleValue_t addons_search_type_cons_t[] = {{0, "Start"}, {1, "Anywhere"}, {0, NULL}};
|
static CV_PossibleValue_t addons_search_type_cons_t[] = {{0, "Start"}, {1, "Anywhere"}, {0, NULL}};
|
||||||
consvar_t cv_addons_search_type = {"addons_search_type", "Anywhere", CV_SAVE, addons_search_type_cons_t, NULL, 0, NULL, NULL, 0, 0, NULL};
|
consvar_t cv_addons_search_type = {"addons_search_type", "Anywhere", CV_SAVE, addons_search_type_cons_t, NULL, 0, NULL, NULL, 0, 0, NULL};
|
||||||
|
|
||||||
char menupath[MAXFILEPATH];
|
char menupath[MAXFILEPATH] = {};
|
||||||
size_t menupathindex[menudepth];
|
size_t menupathindex[menudepth] = {};
|
||||||
size_t menudepthleft = menudepth;
|
size_t menudepthleft = menudepth;
|
||||||
|
|
||||||
char menusearchbuf[MAXSTRINGLENGTH+1];
|
char menusearchbuf[MAXSTRINGLENGTH+1];
|
||||||
textinput_t menusearch;
|
textinput_t menusearch;
|
||||||
|
|
||||||
char **dirmenu, **coredirmenu; // core only local for this file
|
char **dirmenu = NULL, **coredirmenu = NULL; // core only local for this file
|
||||||
size_t sizedirmenu, sizecoredirmenu; // ditto
|
size_t sizedirmenu = 0, sizecoredirmenu = 0; // ditto
|
||||||
size_t dir_on[menudepth];
|
size_t dir_on[menudepth] = {};
|
||||||
UINT8 refreshdirmenu = 0;
|
UINT8 refreshdirmenu = 0;
|
||||||
char *refreshdirname = NULL;
|
char *refreshdirname = NULL;
|
||||||
|
|
||||||
@@ -92,7 +92,6 @@ INT32 pathisdirectory(const char *path)
|
|||||||
// skip those folders, they will not have any addons
|
// skip those folders, they will not have any addons
|
||||||
static const char *exclude_paths[] = {
|
static const char *exclude_paths[] = {
|
||||||
"logs",
|
"logs",
|
||||||
"luafiles",
|
|
||||||
"replay",
|
"replay",
|
||||||
"mdls",
|
"mdls",
|
||||||
"gifs",
|
"gifs",
|
||||||
|
|||||||
+2
-1
@@ -484,6 +484,7 @@ void G_ReadDemoTiccmd(ticcmd_t *cmd, INT32 playernum)
|
|||||||
|
|
||||||
G_CopyTiccmd(cmd, &oldcmd[playernum], 1);
|
G_CopyTiccmd(cmd, &oldcmd[playernum], 1);
|
||||||
|
|
||||||
|
// what in the actual fuck is this???
|
||||||
// SRB2kart: Copy-pasted from ticcmd building, removes that crappy demo cam
|
// SRB2kart: Copy-pasted from ticcmd building, removes that crappy demo cam
|
||||||
if (((players[displayplayers[0]].mo && players[displayplayers[0]].speed > 0) // Moving
|
if (((players[displayplayers[0]].mo && players[displayplayers[0]].speed > 0) // Moving
|
||||||
|| (leveltime > starttime && (cmd->buttons & BT_ACCELERATE && cmd->buttons & BT_BRAKE)) // Rubber-burn turn
|
|| (leveltime > starttime && (cmd->buttons & BT_ACCELERATE && cmd->buttons & BT_BRAKE)) // Rubber-burn turn
|
||||||
@@ -2536,7 +2537,7 @@ void G_DoPlayDemo(char *defdemoname)
|
|||||||
UINT8 i, p;
|
UINT8 i, p;
|
||||||
lumpnum_t l;
|
lumpnum_t l;
|
||||||
char skin[17], color[17], *n;
|
char skin[17], color[17], *n;
|
||||||
CLEANUP(Z_Pfree) char *pdemoname;
|
CLEANUP(Z_Pfree) char *pdemoname = NULL;
|
||||||
UINT8 version, subversion;
|
UINT8 version, subversion;
|
||||||
UINT32 randseed;
|
UINT32 randseed;
|
||||||
char msg[1024];
|
char msg[1024];
|
||||||
|
|||||||
+13
-12
@@ -276,12 +276,6 @@ UINT32 timesBeatenWithEmeralds = 0;
|
|||||||
|
|
||||||
INT16 prevmap = 0, nextmap = 0;
|
INT16 prevmap = 0, nextmap = 0;
|
||||||
|
|
||||||
// Analog Control
|
|
||||||
void SendWeaponPref(void);
|
|
||||||
void SendWeaponPref2(void);
|
|
||||||
void SendWeaponPref3(void);
|
|
||||||
void SendWeaponPref4(void);
|
|
||||||
|
|
||||||
// don't mind me putting these here, I was lazy to figure out where else I could put those without blowing up the compiler.
|
// don't mind me putting these here, I was lazy to figure out where else I could put those without blowing up the compiler.
|
||||||
|
|
||||||
// chat timer thingy
|
// chat timer thingy
|
||||||
@@ -2288,7 +2282,7 @@ void G_PlayerReborn(INT32 player)
|
|||||||
}
|
}
|
||||||
|
|
||||||
/* I'm putting this here because lol */
|
/* I'm putting this here because lol */
|
||||||
fade = (cv_birdmusic.value && cv_fading.value && P_IsLocalPlayer(p));
|
fade = (cv_fading.value && P_IsLocalPlayer(p));
|
||||||
|
|
||||||
if (fade)
|
if (fade)
|
||||||
{
|
{
|
||||||
@@ -3025,7 +3019,8 @@ tryagain:
|
|||||||
|
|
||||||
void G_AddMapToBuffer(INT16 map)
|
void G_AddMapToBuffer(INT16 map)
|
||||||
{
|
{
|
||||||
INT16 bufx, refreshnum = max(0, TOLMaps(G_TOLFlag(gametype))-3);
|
const INT32 tolmaps = TOLMaps(G_TOLFlag(gametype));
|
||||||
|
INT16 bufx, refreshnum = max(0, tolmaps-3);
|
||||||
|
|
||||||
// Add the map to the buffer.
|
// Add the map to the buffer.
|
||||||
for (bufx = NUMMAPS-1; bufx > 0; bufx--)
|
for (bufx = NUMMAPS-1; bufx > 0; bufx--)
|
||||||
@@ -3438,7 +3433,7 @@ void G_LoadGameData(void)
|
|||||||
INT32 i, j;
|
INT32 i, j;
|
||||||
UINT8 modded = false;
|
UINT8 modded = false;
|
||||||
UINT8 rtemp;
|
UINT8 rtemp;
|
||||||
savebuffer_t save;
|
savebuffer_t save = {0};
|
||||||
|
|
||||||
//For records
|
//For records
|
||||||
tic_t rectime;
|
tic_t rectime;
|
||||||
@@ -3571,7 +3566,7 @@ void G_SaveGameData(boolean force)
|
|||||||
size_t length;
|
size_t length;
|
||||||
INT32 i, j;
|
INT32 i, j;
|
||||||
UINT8 btemp;
|
UINT8 btemp;
|
||||||
savebuffer_t save;
|
savebuffer_t save = {0};
|
||||||
(void)force;
|
(void)force;
|
||||||
char backupfile[MAX_WADPATH+4];
|
char backupfile[MAX_WADPATH+4];
|
||||||
|
|
||||||
@@ -3742,7 +3737,7 @@ void G_LoadGame(UINT32 slot, INT16 mapoverride)
|
|||||||
size_t length;
|
size_t length;
|
||||||
char vcheck[VERSIONSIZE];
|
char vcheck[VERSIONSIZE];
|
||||||
char savename[255];
|
char savename[255];
|
||||||
savebuffer_t save;
|
savebuffer_t save = {0};
|
||||||
|
|
||||||
// memset savedata to all 0, fixes calling perfectly valid saves corrupt because of bots
|
// memset savedata to all 0, fixes calling perfectly valid saves corrupt because of bots
|
||||||
memset(&savedata, 0, sizeof(savedata));
|
memset(&savedata, 0, sizeof(savedata));
|
||||||
@@ -3828,7 +3823,7 @@ void G_SaveGame(UINT32 savegameslot)
|
|||||||
boolean saved;
|
boolean saved;
|
||||||
char savename[256] = "";
|
char savename[256] = "";
|
||||||
const char *backup;
|
const char *backup;
|
||||||
savebuffer_t save;
|
savebuffer_t save = {0};
|
||||||
|
|
||||||
sprintf(savename, savegamename, savegameslot);
|
sprintf(savename, savegamename, savegameslot);
|
||||||
backup = va("%s",savename);
|
backup = va("%s",savename);
|
||||||
@@ -4012,6 +4007,12 @@ void G_InitNew(UINT8 pencoremode, const char *mapname, boolean resetplayer, bool
|
|||||||
automapactive = false;
|
automapactive = false;
|
||||||
imcontinuing = false;
|
imcontinuing = false;
|
||||||
|
|
||||||
|
// HACK: this doesent reset if you change the map from within a replay and may cause crashes or the replayhut to be non functional
|
||||||
|
if (!demo.playback && demo.inreplayhut)
|
||||||
|
{
|
||||||
|
M_ResetDemoList();
|
||||||
|
}
|
||||||
|
|
||||||
if (!skipprecutscene && mapheaderinfo[gamemap-1]->precutscenenum && !modeattacking) // Start a custom cutscene.
|
if (!skipprecutscene && mapheaderinfo[gamemap-1]->precutscenenum && !modeattacking) // Start a custom cutscene.
|
||||||
F_StartCustomCutscene(mapheaderinfo[gamemap-1]->precutscenenum-1, true, resetplayer);
|
F_StartCustomCutscene(mapheaderinfo[gamemap-1]->precutscenenum-1, true, resetplayer);
|
||||||
else
|
else
|
||||||
|
|||||||
+1
-1
@@ -160,7 +160,7 @@ typedef enum
|
|||||||
const char *G_BuildMapName(INT32 map);
|
const char *G_BuildMapName(INT32 map);
|
||||||
void G_BuildTiccmd(ticcmd_t *cmd, INT32 realtics, UINT8 ssplayer);
|
void G_BuildTiccmd(ticcmd_t *cmd, INT32 realtics, UINT8 ssplayer);
|
||||||
|
|
||||||
// copy ticcmd_t to and fro the normal way
|
// copy ticcmd_t to and from the normal way
|
||||||
ticcmd_t *G_CopyTiccmd(ticcmd_t* dest, const ticcmd_t* src, const size_t n);
|
ticcmd_t *G_CopyTiccmd(ticcmd_t* dest, const ticcmd_t* src, const size_t n);
|
||||||
// copy ticcmd_t to and fro network packets
|
// copy ticcmd_t to and fro network packets
|
||||||
ticcmd_t *G_MoveTiccmd(ticcmd_t* dest, const ticcmd_t* src, const size_t n);
|
ticcmd_t *G_MoveTiccmd(ticcmd_t* dest, const ticcmd_t* src, const size_t n);
|
||||||
|
|||||||
+186
-11
@@ -58,12 +58,21 @@ static void led_off_handle3(void);
|
|||||||
static void led_off_handle4(void);
|
static void led_off_handle4(void);
|
||||||
|
|
||||||
consvar_t cv_rumble[MAXSPLITSCREENPLAYERS] = {
|
consvar_t cv_rumble[MAXSPLITSCREENPLAYERS] = {
|
||||||
{"rumble", "Off", CV_SAVE|CV_CALL|CV_NOINIT, CV_OnOff, rumble_off_handle, 0, NULL, NULL, 0, 0, NULL},
|
{"rumble", "Off", CV_SAVE|CV_CALL|CV_NOINIT, CV_OnOff, rumble_off_handle, 0, NULL, NULL, 0, 0, NULL},
|
||||||
{"rumble2", "Off", CV_SAVE|CV_CALL|CV_NOINIT, CV_OnOff, rumble_off_handle2, 0, NULL, NULL, 0, 0, NULL},
|
{"rumble2", "Off", CV_SAVE|CV_CALL|CV_NOINIT, CV_OnOff, rumble_off_handle2, 0, NULL, NULL, 0, 0, NULL},
|
||||||
{"rumble3", "Off", CV_SAVE|CV_CALL|CV_NOINIT, CV_OnOff, rumble_off_handle3, 0, NULL, NULL, 0, 0, NULL},
|
{"rumble3", "Off", CV_SAVE|CV_CALL|CV_NOINIT, CV_OnOff, rumble_off_handle3, 0, NULL, NULL, 0, 0, NULL},
|
||||||
{"rumble4", "Off", CV_SAVE|CV_CALL|CV_NOINIT, CV_OnOff, rumble_off_handle4, 0, NULL, NULL, 0, 0, NULL}
|
{"rumble4", "Off", CV_SAVE|CV_CALL|CV_NOINIT, CV_OnOff, rumble_off_handle4, 0, NULL, NULL, 0, 0, NULL}
|
||||||
};
|
};
|
||||||
|
|
||||||
|
static CV_PossibleValue_t rumblestrength_cons_t[] = {{FRACUNIT/4, "MIN"}, {FRACUNIT*4, "MAX"}, {0, NULL}};
|
||||||
|
|
||||||
|
consvar_t cv_rumblestrength[MAXSPLITSCREENPLAYERS] = {
|
||||||
|
{"rumblestrength", "1.0", CV_SAVE|CV_FLOAT, rumblestrength_cons_t, NULL, 0, NULL, NULL, 0, 0, NULL},
|
||||||
|
{"rumblestrength2", "1.0", CV_SAVE|CV_FLOAT, rumblestrength_cons_t, NULL, 0, NULL, NULL, 0, 0, NULL},
|
||||||
|
{"rumblestrength3", "1.0", CV_SAVE|CV_FLOAT, rumblestrength_cons_t, NULL, 0, NULL, NULL, 0, 0, NULL},
|
||||||
|
{"rumblestrength4", "1.0", CV_SAVE|CV_FLOAT, rumblestrength_cons_t, NULL, 0, NULL, NULL, 0, 0, NULL}
|
||||||
|
};
|
||||||
|
|
||||||
static CV_PossibleValue_t gamepadled_cons_t[] = {{0, "Off"}, {1, "Skincolor"}, {2, "Mobjcolor"}, {0, NULL}};
|
static CV_PossibleValue_t gamepadled_cons_t[] = {{0, "Off"}, {1, "Skincolor"}, {2, "Mobjcolor"}, {0, NULL}};
|
||||||
consvar_t cv_gamepadled[MAXSPLITSCREENPLAYERS] = {
|
consvar_t cv_gamepadled[MAXSPLITSCREENPLAYERS] = {
|
||||||
{"gamepadled", "Skincolor", CV_SAVE|CV_CALL|CV_NOINIT, gamepadled_cons_t, led_off_handle, 0, NULL, NULL, 0, 0, NULL},
|
{"gamepadled", "Skincolor", CV_SAVE|CV_CALL|CV_NOINIT, gamepadled_cons_t, led_off_handle, 0, NULL, NULL, 0, 0, NULL},
|
||||||
@@ -875,11 +884,13 @@ static const char *gamecontrolname[num_gamecontrols] =
|
|||||||
|
|
||||||
#include "k_kart.h"
|
#include "k_kart.h"
|
||||||
|
|
||||||
UINT16 G_GetSkinColor(INT32 playernum)
|
UINT8 G_GetSkinColorForGamepad(INT32 playernum)
|
||||||
{
|
{
|
||||||
|
I_Assert(playernum >= 0 && playernum < MAXSPLITSCREENPLAYERS);
|
||||||
|
|
||||||
if (gamestate == GS_LEVEL)
|
if (gamestate == GS_LEVEL)
|
||||||
{
|
{
|
||||||
player_t *player = &players[displayplayers[playernum]];
|
const player_t *player = &players[displayplayers[playernum]];
|
||||||
|
|
||||||
if (player)
|
if (player)
|
||||||
{
|
{
|
||||||
@@ -897,13 +908,13 @@ UINT16 G_GetSkinColor(INT32 playernum)
|
|||||||
switch (playernum)
|
switch (playernum)
|
||||||
{
|
{
|
||||||
case 0:
|
case 0:
|
||||||
return cv_playercolor.value;
|
return (UINT8)cv_playercolor.value;
|
||||||
case 1:
|
case 1:
|
||||||
return cv_playercolor2.value;
|
return (UINT8)cv_playercolor2.value;
|
||||||
case 2:
|
case 2:
|
||||||
return cv_playercolor3.value;
|
return (UINT8)cv_playercolor3.value;
|
||||||
case 3:
|
case 3:
|
||||||
return cv_playercolor4.value;
|
return (UINT8)cv_playercolor4.value;
|
||||||
default:
|
default:
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
@@ -911,19 +922,23 @@ UINT16 G_GetSkinColor(INT32 playernum)
|
|||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
void G_SetPlayerGamepadIndicatorColor(INT32 playernum, UINT16 color)
|
// Sets the Indicator LED on supported gamepads to a desired skincolor
|
||||||
|
// pass SKINCOLOR_NONE/0 to set the players skin color
|
||||||
|
void G_SetPlayerGamepadIndicatorColor(INT32 playernum, UINT8 color)
|
||||||
{
|
{
|
||||||
UINT16 skincolor;
|
UINT8 skincolor;
|
||||||
byteColor_t byte_color;
|
byteColor_t byte_color;
|
||||||
|
|
||||||
I_Assert(playernum >= 0 && playernum < MAXSPLITSCREENPLAYERS);
|
I_Assert(playernum >= 0 && playernum < MAXSPLITSCREENPLAYERS);
|
||||||
|
|
||||||
if (cv_gamepadled[playernum].value == 0)
|
if (cv_gamepadled[playernum].value == 0
|
||||||
|
|| color >= MAXTRANSLATIONS)
|
||||||
{
|
{
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
skincolor = color ? color : G_GetSkinColor(playernum);
|
// so we can override this
|
||||||
|
skincolor = color ? color : G_GetSkinColorForGamepad(playernum);
|
||||||
byte_color = V_GetColor(colortranslations[skincolor][8]).s;
|
byte_color = V_GetColor(colortranslations[skincolor][8]).s;
|
||||||
|
|
||||||
I_SetGamepadIndicatorColor(playernum, byte_color.red, byte_color.green, byte_color.blue);
|
I_SetGamepadIndicatorColor(playernum, byte_color.red, byte_color.green, byte_color.blue);
|
||||||
@@ -936,7 +951,41 @@ static void G_ResetPlayerGamepadIndicatorColor(INT32 playernum)
|
|||||||
I_SetGamepadIndicatorColor(playernum, 0, 0, 255);
|
I_SetGamepadIndicatorColor(playernum, 0, 0, 255);
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
|
{
|
||||||
G_SetPlayerGamepadIndicatorColor(playernum, 0);
|
G_SetPlayerGamepadIndicatorColor(playernum, 0);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
static UINT8 curcolor[MAXSPLITSCREENPLAYERS] = {};
|
||||||
|
|
||||||
|
void G_DeviceLEDTick(void)
|
||||||
|
{
|
||||||
|
UINT8 i, newcolor;
|
||||||
|
|
||||||
|
if (numcontrollers == 0)
|
||||||
|
{
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
for (i = 0; i <= splitscreen; i++)
|
||||||
|
{
|
||||||
|
if (!cv_usejoystick[i].value || !cv_gamepadled[i].value)
|
||||||
|
continue;
|
||||||
|
|
||||||
|
newcolor = G_GetSkinColorForGamepad(i);
|
||||||
|
|
||||||
|
if (curcolor[i] == newcolor) // dont update if same colour
|
||||||
|
continue;
|
||||||
|
|
||||||
|
G_SetPlayerGamepadIndicatorColor(i, newcolor);
|
||||||
|
curcolor[i] = newcolor;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// ensures next call to G_DeviceLEDTick will refresh the gamepad led
|
||||||
|
void G_ResetDeviceLED(void)
|
||||||
|
{
|
||||||
|
memset(curcolor, 0, sizeof(curcolor));
|
||||||
}
|
}
|
||||||
|
|
||||||
static void G_ResetPlayerDeviceRumble(INT32 playernum)
|
static void G_ResetPlayerDeviceRumble(INT32 playernum)
|
||||||
@@ -963,9 +1012,135 @@ void G_PlayerDeviceRumble(INT32 playernum, UINT16 low_strength, UINT16 high_stre
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// doesent need to be super precise
|
||||||
|
// but ensure this is within range (0-65535)
|
||||||
|
// placed here so it applies to lua aswell
|
||||||
|
low_strength = (UINT16)min(FixedMul(low_strength, cv_rumblestrength[playernum].value), UINT16_MAX);
|
||||||
|
high_strength = (UINT16)min(FixedMul(high_strength, cv_rumblestrength[playernum].value), UINT16_MAX);
|
||||||
|
|
||||||
I_GamepadRumble(playernum, low_strength, high_strength, duration);
|
I_GamepadRumble(playernum, low_strength, high_strength, duration);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// rumble strengths
|
||||||
|
enum
|
||||||
|
{
|
||||||
|
RUMBLE_VERYSTRONG = FRACUNIT / 4, // 16384
|
||||||
|
RUMBLE_STRONG = FRACUNIT / 8, // 8192
|
||||||
|
RUMBLE_MODERATE = FRACUNIT / 64, // 1024
|
||||||
|
RUMBLE_WEAK = FRACUNIT / 128, // 512
|
||||||
|
RUMBLE_VERYWEAK = FRACUNIT / 256, // 256
|
||||||
|
};
|
||||||
|
|
||||||
|
// Controller rumble!
|
||||||
|
// this keeps track of a bunch of things
|
||||||
|
// and makes your controller rumble accordingly
|
||||||
|
void G_DeviceRumbleTick(void)
|
||||||
|
{
|
||||||
|
UINT8 i;
|
||||||
|
|
||||||
|
if (dedicated || numcontrollers == 0 || gamestate != GS_LEVEL)
|
||||||
|
{
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
for (i = 0; i <= splitscreen; i++)
|
||||||
|
{
|
||||||
|
if (!cv_usejoystick[i].value || !cv_rumble[i].value)
|
||||||
|
{
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (camera[i].freecam)
|
||||||
|
{
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
|
||||||
|
// SDL rumble strength goes from a range or 0-65535 respectively
|
||||||
|
// the higher, the stronger it is
|
||||||
|
UINT16 low = 0, high = 0;
|
||||||
|
// for how long the action should rumble, in ms
|
||||||
|
UINT16 lenght = 57; // 57ms is a short pulse, matches super well with this updating once per tic
|
||||||
|
|
||||||
|
const player_t *player = P_GetLocalPlayerForNum(i);
|
||||||
|
|
||||||
|
// allow lua to do some crap for spectators
|
||||||
|
if (player->spectator || !player->mo)
|
||||||
|
{
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
|
||||||
|
// reset the rumble if you exit or are ded lel
|
||||||
|
if (player->exiting ||
|
||||||
|
player->playerstate == PST_DEAD ||
|
||||||
|
player->kartstuff[k_respawn] > 1)
|
||||||
|
{
|
||||||
|
G_PlayerDeviceRumble(i, low, high, 0);
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (player->kartstuff[k_spinouttimer])
|
||||||
|
{
|
||||||
|
//low = high = FRACUNIT / 6;
|
||||||
|
low = high = FixedMul((RUMBLE_VERYSTRONG), (FixedDiv(player->kartstuff[k_spinouttimer], (3*TICRATE / 2)))); // try do some some kinda fadeout, 3*TICRATE / 2 is the "default" spinout time
|
||||||
|
}
|
||||||
|
else if (player->kartstuff[k_sneakertimer] > (sneakertime-(TICRATE/2)))
|
||||||
|
{
|
||||||
|
low = high = RUMBLE_STRONG;
|
||||||
|
}
|
||||||
|
else if ((player->kartstuff[k_offroad])
|
||||||
|
&& player->speed != 0
|
||||||
|
&& P_IsObjectOnGround(player->mo))
|
||||||
|
{
|
||||||
|
// weaken this depending on if you got hyu or invinc
|
||||||
|
if (player->kartstuff[k_hyudorotimer])
|
||||||
|
{
|
||||||
|
high = RUMBLE_WEAK;
|
||||||
|
}
|
||||||
|
else if (player->kartstuff[k_invincibilitytimer])
|
||||||
|
{
|
||||||
|
high = RUMBLE_MODERATE;
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
low = high = RUMBLE_MODERATE;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
else if ((player->kartstuff[k_bananadrag] > TICRATE)
|
||||||
|
&& player->speed != 0
|
||||||
|
&& P_IsObjectOnGround(player->mo))
|
||||||
|
{
|
||||||
|
if (leveltime & 1) // this is actually funny lel
|
||||||
|
high = RUMBLE_MODERATE;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (player->kartstuff[k_brakedrift])
|
||||||
|
{
|
||||||
|
high = CLAMP((high + RUMBLE_VERYWEAK), 0, UINT16_MAX);
|
||||||
|
}
|
||||||
|
|
||||||
|
// pulse when gettin new driftlevel
|
||||||
|
// let this come last
|
||||||
|
if (player->kartstuff[k_driftcharge]
|
||||||
|
&& player->driftlevel)
|
||||||
|
{
|
||||||
|
high = CLAMP((high + RUMBLE_VERYWEAK), 0, UINT16_MAX);
|
||||||
|
|
||||||
|
if (player->driftlevel == 2)
|
||||||
|
lenght = 114;
|
||||||
|
else if (player->driftlevel == 3)
|
||||||
|
lenght = 174;
|
||||||
|
}
|
||||||
|
|
||||||
|
// hack alert! i just dont want this thing constantly resetting the rumble lol
|
||||||
|
if (low == 0 && high == 0)
|
||||||
|
{
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
|
||||||
|
G_PlayerDeviceRumble(i, low, high, lenght);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
//
|
//
|
||||||
// Detach any keys associated to the given game control
|
// Detach any keys associated to the given game control
|
||||||
// - pass the pointer to the gamecontrol table for the player being edited
|
// - pass the pointer to the gamecontrol table for the player being edited
|
||||||
|
|||||||
+9
-4
@@ -113,6 +113,7 @@ extern consvar_t cv_mousesens, cv_mouseysens;
|
|||||||
extern consvar_t cv_controlperkey;
|
extern consvar_t cv_controlperkey;
|
||||||
extern consvar_t cv_turnsmooth[MAXSPLITSCREENPLAYERS];
|
extern consvar_t cv_turnsmooth[MAXSPLITSCREENPLAYERS];
|
||||||
extern consvar_t cv_rumble[MAXSPLITSCREENPLAYERS];
|
extern consvar_t cv_rumble[MAXSPLITSCREENPLAYERS];
|
||||||
|
extern consvar_t cv_rumblestrength[MAXSPLITSCREENPLAYERS];
|
||||||
extern consvar_t cv_gamepadled[MAXSPLITSCREENPLAYERS];
|
extern consvar_t cv_gamepadled[MAXSPLITSCREENPLAYERS];
|
||||||
|
|
||||||
extern INT32 mousex, mousey;
|
extern INT32 mousex, mousey;
|
||||||
@@ -131,13 +132,17 @@ extern INT32 gamecontrol[MAXSPLITSCREENPLAYERS][num_gamecontrols][2];
|
|||||||
#define PLAYER3INPUTDOWN(gc) (gamekeydown[gamecontrol[2][gc][0]] || gamekeydown[gamecontrol[2][gc][1]])
|
#define PLAYER3INPUTDOWN(gc) (gamekeydown[gamecontrol[2][gc][0]] || gamekeydown[gamecontrol[2][gc][1]])
|
||||||
#define PLAYER4INPUTDOWN(gc) (gamekeydown[gamecontrol[3][gc][0]] || gamekeydown[gamecontrol[3][gc][1]])
|
#define PLAYER4INPUTDOWN(gc) (gamekeydown[gamecontrol[3][gc][0]] || gamekeydown[gamecontrol[3][gc][1]])
|
||||||
|
|
||||||
// peace to my little coder fingers!
|
UINT8 G_GetSkinColorForGamepad(INT32 playernum);
|
||||||
// check a gamecontrol being active or not
|
void G_SetPlayerGamepadIndicatorColor(INT32 playernum, UINT8 color);
|
||||||
|
void G_DeviceLEDTick(void);
|
||||||
|
void G_ResetDeviceLED(void);
|
||||||
|
|
||||||
UINT16 G_GetSkinColor(INT32 playernum);
|
|
||||||
void G_SetPlayerGamepadIndicatorColor(INT32 playernum, UINT16 color);
|
|
||||||
void G_ResetAllDeviceRumbles(void);
|
void G_ResetAllDeviceRumbles(void);
|
||||||
void G_PlayerDeviceRumble(INT32 playernum, UINT16 low_strength, UINT16 high_strength, UINT32 duration);
|
void G_PlayerDeviceRumble(INT32 playernum, UINT16 low_strength, UINT16 high_strength, UINT32 duration);
|
||||||
|
void G_DeviceRumbleTick(void);
|
||||||
|
|
||||||
|
// peace to my little coder fingers!
|
||||||
|
// check a gamecontrol being active or not
|
||||||
|
|
||||||
// remaps the input event to a game control.
|
// remaps the input event to a game control.
|
||||||
void G_MapEventsToControls(event_t *ev);
|
void G_MapEventsToControls(event_t *ev);
|
||||||
|
|||||||
+42
-30
@@ -21,28 +21,28 @@
|
|||||||
|
|
||||||
// The texture for the next polygon given to HWR_ProcessPolygon.
|
// The texture for the next polygon given to HWR_ProcessPolygon.
|
||||||
// Set with HWR_SetCurrentTexture.
|
// Set with HWR_SetCurrentTexture.
|
||||||
GLMipmap_t *current_texture = NULL;
|
static GLMipmap_t *current_texture = NULL;
|
||||||
|
|
||||||
boolean currently_batching = false;
|
static boolean currently_batching = false;
|
||||||
|
|
||||||
FOutVector* finalVertexArray = NULL;// contains subset of sorted vertices and texture coordinates to be sent to gpu
|
static FOutVector* finalVertexArray = NULL;// contains subset of sorted vertices and texture coordinates to be sent to gpu
|
||||||
UINT32* finalVertexIndexArray = NULL;// contains indexes for glDrawElements, taking into account fan->triangles conversion
|
static UINT32* finalVertexIndexArray = NULL;// contains indexes for glDrawElements, taking into account fan->triangles conversion
|
||||||
// NOTE have this alloced as 3x finalVertexArray size
|
// NOTE have this alloced as 3x finalVertexArray size
|
||||||
int finalVertexArrayAllocSize = 65536;
|
static int finalVertexArrayAllocSize = 65536;
|
||||||
|
|
||||||
//GLubyte* colorArray = NULL;// contains color data to be sent to gpu, if needed
|
//GLubyte* colorArray = NULL;// contains color data to be sent to gpu, if needed
|
||||||
//int colorArrayAllocSize = 65536;
|
//int colorArrayAllocSize = 65536;
|
||||||
// not gonna use this for now, just sort by color and change state when it changes
|
// not gonna use this for now, just sort by color and change state when it changes
|
||||||
// later maybe when using vertex attributes if it's needed
|
// later maybe when using vertex attributes if it's needed
|
||||||
|
|
||||||
PolygonArrayEntry* polygonArray = NULL ;// contains the polygon data from DrawPolygon, waiting to be processed
|
static PolygonArrayEntry* polygonArray = NULL ;// contains the polygon data from DrawPolygon, waiting to be processed
|
||||||
PolygonArrayEntry **polygonArraySorted = NULL; // contains sorted pointers to polygonArray
|
static PolygonArrayEntry **polygonArraySorted = NULL; // contains sorted pointers to polygonArray
|
||||||
int polygonArraySize = 0;
|
static int polygonArraySize = 0;
|
||||||
int polygonArrayAllocSize = 65536;
|
static int polygonArrayAllocSize = 65536;
|
||||||
|
|
||||||
FOutVector* unsortedVertexArray = NULL; // contains unsorted vertices and texture coordinates from DrawPolygon
|
static FOutVector* unsortedVertexArray = NULL; // contains unsorted vertices and texture coordinates from DrawPolygon
|
||||||
int unsortedVertexArraySize = 0;
|
static int unsortedVertexArraySize = 0;
|
||||||
int unsortedVertexArrayAllocSize = 65536;
|
static int unsortedVertexArrayAllocSize = 65536;
|
||||||
|
|
||||||
// Enables batching mode. HWR_ProcessPolygon will collect polygons instead of passing them directly to the rendering backend.
|
// Enables batching mode. HWR_ProcessPolygon will collect polygons instead of passing them directly to the rendering backend.
|
||||||
// Call HWR_RenderBatches to render all the collected geometry.
|
// Call HWR_RenderBatches to render all the collected geometry.
|
||||||
@@ -126,8 +126,9 @@ void HWR_ProcessPolygon(FSurfaceInfo *pSurf, FOutVector *pOutVerts, FUINT iNumPt
|
|||||||
if (!(PolyFlags & PF_NoTexture) && !horizonSpecial)
|
if (!(PolyFlags & PF_NoTexture) && !horizonSpecial)
|
||||||
{
|
{
|
||||||
// use FNV-1a to hash polygons for later sorting.
|
// use FNV-1a to hash polygons for later sorting.
|
||||||
INT32 hash = 0x811c9dc5;
|
UINT32 hash = 0x811c9dc5;
|
||||||
#define DIGEST(h, x) h ^= (x); h *= 0x01000193
|
UINT32 prime = 0x1000193;
|
||||||
|
#define DIGEST(h, x) h ^= ((UINT32)(x)); h *= prime
|
||||||
if (current_texture)
|
if (current_texture)
|
||||||
{
|
{
|
||||||
DIGEST(hash, current_texture->downloaded);
|
DIGEST(hash, current_texture->downloaded);
|
||||||
@@ -148,7 +149,7 @@ void HWR_ProcessPolygon(FSurfaceInfo *pSurf, FOutVector *pOutVerts, FUINT iNumPt
|
|||||||
}
|
}
|
||||||
#undef DIGEST
|
#undef DIGEST
|
||||||
// remove the sign bit to ensure that skybox and horizon line comes first.
|
// remove the sign bit to ensure that skybox and horizon line comes first.
|
||||||
polygonArray[polygonArraySize-1].hash = (hash & INT32_MAX);
|
polygonArray[polygonArraySize-1].hash = (INT32)(hash & INT32_MAX);
|
||||||
}
|
}
|
||||||
|
|
||||||
memcpy(&unsortedVertexArray[unsortedVertexArraySize], pOutVerts, iNumPts * sizeof(FOutVector));
|
memcpy(&unsortedVertexArray[unsortedVertexArraySize], pOutVerts, iNumPts * sizeof(FOutVector));
|
||||||
@@ -168,8 +169,10 @@ static int comparePolygons(const void *p1, const void *p2)
|
|||||||
const PolygonArrayEntry *poly1 = *(PolygonArrayEntry *const *)p1;
|
const PolygonArrayEntry *poly1 = *(PolygonArrayEntry *const *)p1;
|
||||||
const PolygonArrayEntry *poly2 = *(PolygonArrayEntry *const *)p2;
|
const PolygonArrayEntry *poly2 = *(PolygonArrayEntry *const *)p2;
|
||||||
|
|
||||||
const int shader1 = (poly1->polyFlags & PF_NoTexture || poly1->horizonSpecial) ? -1 : poly1->shader;
|
// special case with signedness to prevent overflowing
|
||||||
const int shader2 = (poly2->polyFlags & PF_NoTexture || poly2->horizonSpecial) ? -1 : poly2->shader;
|
// FIXME: check for prediction slowdowns!
|
||||||
|
const int shader1 = poly1->hash & 0x80000000 ? -1 : poly1->shader;
|
||||||
|
const int shader2 = poly2->hash & 0x80000000 ? -1 : poly2->shader;
|
||||||
|
|
||||||
// skywalls and horizon lines must retain their order for horizon lines to work
|
// skywalls and horizon lines must retain their order for horizon lines to work
|
||||||
if (shader1 == -1 && shader2 == -1)
|
if (shader1 == -1 && shader2 == -1)
|
||||||
@@ -210,8 +213,8 @@ static int comparePolygonsNoShaders(const void *p1, const void *p2)
|
|||||||
const PolygonArrayEntry *poly1 = *(PolygonArrayEntry *const *)p1;
|
const PolygonArrayEntry *poly1 = *(PolygonArrayEntry *const *)p1;
|
||||||
const PolygonArrayEntry *poly2 = *(PolygonArrayEntry *const *)p2;
|
const PolygonArrayEntry *poly2 = *(PolygonArrayEntry *const *)p2;
|
||||||
|
|
||||||
const GLMipmap_t *texture1 = (poly1->polyFlags & PF_NoTexture || poly1->horizonSpecial) ? NULL : poly1->texture;
|
const GLMipmap_t *texture1 = poly1->hash & 0x80000000 ? NULL : poly1->texture;
|
||||||
const GLMipmap_t *texture2 = (poly2->polyFlags & PF_NoTexture || poly2->horizonSpecial) ? NULL : poly2->texture;
|
const GLMipmap_t *texture2 = poly1->hash & 0x80000000 ? NULL : poly2->texture;
|
||||||
|
|
||||||
// skywalls and horizon lines must retain their order for horizon lines to work
|
// skywalls and horizon lines must retain their order for horizon lines to work
|
||||||
if (!texture1 && !texture2)
|
if (!texture1 && !texture2)
|
||||||
@@ -219,6 +222,7 @@ static int comparePolygonsNoShaders(const void *p1, const void *p2)
|
|||||||
|
|
||||||
UINT32 downloaded1 = texture1 ? texture1->downloaded : 0; // there should be a opengl texture name here, usable for comparisons
|
UINT32 downloaded1 = texture1 ? texture1->downloaded : 0; // there should be a opengl texture name here, usable for comparisons
|
||||||
UINT32 downloaded2 = texture2 ? texture2->downloaded : 0;
|
UINT32 downloaded2 = texture2 ? texture2->downloaded : 0;
|
||||||
|
|
||||||
diff64 = downloaded1 - downloaded2;
|
diff64 = downloaded1 - downloaded2;
|
||||||
if (diff64 != 0) return diff64;
|
if (diff64 != 0) return diff64;
|
||||||
|
|
||||||
@@ -233,7 +237,7 @@ static int comparePolygonsNoShaders(const void *p1, const void *p2)
|
|||||||
|
|
||||||
// This function organizes the geometry collected by HWR_ProcessPolygon calls into batches and uses
|
// This function organizes the geometry collected by HWR_ProcessPolygon calls into batches and uses
|
||||||
// the rendering backend to draw them.
|
// the rendering backend to draw them.
|
||||||
void HWR_RenderBatches(void)
|
void HWR_RenderBatches(boolean sort)
|
||||||
{
|
{
|
||||||
int finalVertexWritePos = 0; // position in finalVertexArray
|
int finalVertexWritePos = 0; // position in finalVertexArray
|
||||||
int finalIndexWritePos = 0; // position in finalVertexIndexArray
|
int finalIndexWritePos = 0; // position in finalVertexIndexArray
|
||||||
@@ -260,7 +264,7 @@ void HWR_RenderBatches(void)
|
|||||||
nextSurfaceInfo.LightInfo.light_level = 0;
|
nextSurfaceInfo.LightInfo.light_level = 0;
|
||||||
nextSurfaceInfo.LightInfo.directional = false;
|
nextSurfaceInfo.LightInfo.directional = false;
|
||||||
|
|
||||||
currently_batching = false;// no longer collecting batches
|
currently_batching = false; // no longer collecting batches
|
||||||
|
|
||||||
if (!polygonArraySize)
|
if (!polygonArraySize)
|
||||||
{
|
{
|
||||||
@@ -270,6 +274,8 @@ void HWR_RenderBatches(void)
|
|||||||
return;// nothing to draw
|
return;// nothing to draw
|
||||||
}
|
}
|
||||||
|
|
||||||
|
const boolean useshader = HWR_UseShader();
|
||||||
|
|
||||||
// init stats vars
|
// init stats vars
|
||||||
ps_hw_numpolys.value.i = polygonArraySize;
|
ps_hw_numpolys.value.i = polygonArraySize;
|
||||||
ps_hw_numcalls.value.i = ps_hw_numverts.value.i = 0;
|
ps_hw_numcalls.value.i = ps_hw_numverts.value.i = 0;
|
||||||
@@ -282,10 +288,13 @@ void HWR_RenderBatches(void)
|
|||||||
polygonArraySorted[i] = &polygonArray[i];
|
polygonArraySorted[i] = &polygonArray[i];
|
||||||
}
|
}
|
||||||
|
|
||||||
// sort polygons
|
if (sort)
|
||||||
PS_START_TIMING(ps_hw_batchsorttime);
|
{
|
||||||
qs22j(polygonArraySorted, polygonArraySize, sizeof(PolygonArrayEntry *), (HWR_UseShader() ? comparePolygons : comparePolygonsNoShaders));
|
// sort polygons
|
||||||
PS_STOP_TIMING(ps_hw_batchsorttime);
|
PS_START_TIMING(ps_hw_batchsorttime);
|
||||||
|
qs22j(polygonArraySorted, polygonArraySize, sizeof(PolygonArrayEntry *), (useshader ? comparePolygons : comparePolygonsNoShaders));
|
||||||
|
PS_STOP_TIMING(ps_hw_batchsorttime);
|
||||||
|
}
|
||||||
|
|
||||||
// sort order
|
// sort order
|
||||||
// 1. shader
|
// 1. shader
|
||||||
@@ -294,7 +303,9 @@ void HWR_RenderBatches(void)
|
|||||||
// 4. colors + light level
|
// 4. colors + light level
|
||||||
// not sure about what order of the last 2 should be, or if it even matters
|
// not sure about what order of the last 2 should be, or if it even matters
|
||||||
|
|
||||||
PS_START_TIMING(ps_hw_batchdrawtime);
|
// dont overwrite this on consecutive calls
|
||||||
|
if (!sort)
|
||||||
|
PS_START_TIMING(ps_hw_batchdrawtime);
|
||||||
|
|
||||||
currentShader = polygonArraySorted[0]->shader;
|
currentShader = polygonArraySorted[0]->shader;
|
||||||
currentTexture = polygonArraySorted[0]->texture;
|
currentTexture = polygonArraySorted[0]->texture;
|
||||||
@@ -305,7 +316,7 @@ void HWR_RenderBatches(void)
|
|||||||
|
|
||||||
// set state for first batch
|
// set state for first batch
|
||||||
|
|
||||||
if (HWR_UseShader())
|
if (useshader)
|
||||||
{
|
{
|
||||||
GL_SetShader(currentShader);
|
GL_SetShader(currentShader);
|
||||||
}
|
}
|
||||||
@@ -387,7 +398,7 @@ void HWR_RenderBatches(void)
|
|||||||
if (nextPolyFlags & PF_NoTexture)
|
if (nextPolyFlags & PF_NoTexture)
|
||||||
nextTexture = 0;
|
nextTexture = 0;
|
||||||
|
|
||||||
if (currentShader != nextShader && HWR_UseShader())
|
if (useshader && currentShader != nextShader)
|
||||||
{
|
{
|
||||||
changeState = true;
|
changeState = true;
|
||||||
changeShader = true;
|
changeShader = true;
|
||||||
@@ -405,7 +416,7 @@ void HWR_RenderBatches(void)
|
|||||||
changePolyFlags = true;
|
changePolyFlags = true;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (HWR_UseShader())
|
if (useshader)
|
||||||
{
|
{
|
||||||
if (currentSurfaceInfo.PolyColor.rgba != nextSurfaceInfo.PolyColor.rgba ||
|
if (currentSurfaceInfo.PolyColor.rgba != nextSurfaceInfo.PolyColor.rgba ||
|
||||||
currentSurfaceInfo.TintColor.rgba != nextSurfaceInfo.TintColor.rgba ||
|
currentSurfaceInfo.TintColor.rgba != nextSurfaceInfo.TintColor.rgba ||
|
||||||
@@ -489,7 +500,8 @@ void HWR_RenderBatches(void)
|
|||||||
polygonArraySize = 0;
|
polygonArraySize = 0;
|
||||||
unsortedVertexArraySize = 0;
|
unsortedVertexArraySize = 0;
|
||||||
|
|
||||||
PS_STOP_TIMING(ps_hw_batchdrawtime);
|
if (!sort)
|
||||||
|
PS_STOP_TIMING(ps_hw_batchdrawtime);
|
||||||
}
|
}
|
||||||
|
|
||||||
#endif // HWRENDER
|
#endif // HWRENDER
|
||||||
@@ -37,7 +37,7 @@ typedef struct
|
|||||||
void HWR_StartBatching(void);
|
void HWR_StartBatching(void);
|
||||||
void HWR_SetCurrentTexture(GLMipmap_t *texture);
|
void HWR_SetCurrentTexture(GLMipmap_t *texture);
|
||||||
void HWR_ProcessPolygon(FSurfaceInfo *pSurf, FOutVector *pOutVerts, FUINT iNumPts, FBITFIELD PolyFlags, int shader, boolean horizonSpecial);
|
void HWR_ProcessPolygon(FSurfaceInfo *pSurf, FOutVector *pOutVerts, FUINT iNumPts, FBITFIELD PolyFlags, int shader, boolean horizonSpecial);
|
||||||
void HWR_RenderBatches(void);
|
void HWR_RenderBatches(boolean sort);
|
||||||
|
|
||||||
#ifdef __cplusplus
|
#ifdef __cplusplus
|
||||||
} // extern "C"
|
} // extern "C"
|
||||||
|
|||||||
@@ -538,7 +538,7 @@ static void loading_status(void)
|
|||||||
x = BASEVIDWIDTH/2;
|
x = BASEVIDWIDTH/2;
|
||||||
y = BASEVIDHEIGHT/2;
|
y = BASEVIDHEIGHT/2;
|
||||||
V_DrawFill(0, 0, BASEVIDWIDTH, BASEVIDHEIGHT, 31); // Black background to match fade in effect
|
V_DrawFill(0, 0, BASEVIDWIDTH, BASEVIDHEIGHT, 31); // Black background to match fade in effect
|
||||||
//V_DrawPatchFill(W_CachePatchName("SRB2BACK", PU_PATCH)); // SRB2 background, ehhh too bright.
|
//V_DrawPatchFill(srb2back); // SRB2 background, ehhh too bright.
|
||||||
M_DrawTextBox(x-58, y-8, 13, 1);
|
M_DrawTextBox(x-58, y-8, 13, 1);
|
||||||
V_DrawString(x-50, y, V_YELLOWMAP, "Loading...");
|
V_DrawString(x-50, y, V_YELLOWMAP, "Loading...");
|
||||||
V_DrawRightAlignedString(x+50, y, V_YELLOWMAP, s);
|
V_DrawRightAlignedString(x+50, y, V_YELLOWMAP, s);
|
||||||
|
|||||||
@@ -15,6 +15,8 @@
|
|||||||
|
|
||||||
#ifdef HWRENDER
|
#ifdef HWRENDER
|
||||||
|
|
||||||
|
#include <unordered_set>
|
||||||
|
|
||||||
#include "hw_main.h"
|
#include "hw_main.h"
|
||||||
#include "hw_glob.h"
|
#include "hw_glob.h"
|
||||||
#include "hw_gl.h"
|
#include "hw_gl.h"
|
||||||
@@ -36,7 +38,7 @@
|
|||||||
INT32 patchformat = GL_TEXFMT_AP_88; // use alpha for holes
|
INT32 patchformat = GL_TEXFMT_AP_88; // use alpha for holes
|
||||||
INT32 textureformat = GL_TEXFMT_P_8; // use chromakey for hole
|
INT32 textureformat = GL_TEXFMT_P_8; // use chromakey for hole
|
||||||
|
|
||||||
RGBA_t mapPalette[256] = {0}; // the palette for the currently loaded level or menu etc.
|
RGBA_t mapPalette[256] = {}; // the palette for the currently loaded level or menu etc.
|
||||||
|
|
||||||
static void HWR_FreeTextureColormaps(patch_t *patch);
|
static void HWR_FreeTextureColormaps(patch_t *patch);
|
||||||
|
|
||||||
@@ -98,7 +100,7 @@ static void HWR_DrawColumnInCache(const column_t *patchcol, UINT8 *block, GLMipm
|
|||||||
position = 0;
|
position = 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
position = max(((position * scale_y) + (FRACUNIT/2)) >> FRACBITS, 0);
|
position = std::max(((position * scale_y) + (FRACUNIT/2)) >> FRACBITS, 0);
|
||||||
|
|
||||||
if (position + count >= pblockheight)
|
if (position + count >= pblockheight)
|
||||||
count = pblockheight - position;
|
count = pblockheight - position;
|
||||||
@@ -162,7 +164,7 @@ static void HWR_DrawPatchInCache(GLMipmap_t *mipmap,
|
|||||||
fixed_t xfrac, xfracstep;
|
fixed_t xfrac, xfracstep;
|
||||||
fixed_t yfracstep, scale_y;
|
fixed_t yfracstep, scale_y;
|
||||||
const column_t *patchcol;
|
const column_t *patchcol;
|
||||||
UINT8 *block = mipmap->data;
|
UINT8 *block = static_cast<UINT8 *>(mipmap->data);
|
||||||
INT32 bpp;
|
INT32 bpp;
|
||||||
INT32 blockmodulo;
|
INT32 blockmodulo;
|
||||||
RGBA_t *palette;
|
RGBA_t *palette;
|
||||||
@@ -212,7 +214,7 @@ static void HWR_DrawTexturePatchInCache(GLMipmap_t *mipmap,
|
|||||||
fixed_t xfrac, xfracstep;
|
fixed_t xfrac, xfracstep;
|
||||||
fixed_t yfracstep, scale_y;
|
fixed_t yfracstep, scale_y;
|
||||||
const column_t *patchcol;
|
const column_t *patchcol;
|
||||||
UINT8 *block = mipmap->data;
|
UINT8 *block = static_cast<UINT8 *>(mipmap->data);
|
||||||
INT32 bpp;
|
INT32 bpp;
|
||||||
INT32 blockmodulo;
|
INT32 blockmodulo;
|
||||||
INT32 width, height;
|
INT32 width, height;
|
||||||
@@ -287,8 +289,8 @@ static UINT8 *MakeBlock(GLMipmap_t *glMipmap)
|
|||||||
UINT16 bu16 = ((0x00 <<8) | HWR_PATCHES_CHROMAKEY_COLORINDEX);
|
UINT16 bu16 = ((0x00 <<8) | HWR_PATCHES_CHROMAKEY_COLORINDEX);
|
||||||
INT32 blocksize = (glMipmap->width * glMipmap->height);
|
INT32 blocksize = (glMipmap->width * glMipmap->height);
|
||||||
|
|
||||||
bpp = format2bpp(glMipmap->format);
|
bpp = format2bpp(glMipmap->format);
|
||||||
block = Z_Malloc(blocksize*bpp, PU_HWRCACHE, &(glMipmap->data));
|
block = static_cast<UINT8 *>(Z_Malloc(blocksize*bpp, PU_HWRCACHE, &(glMipmap->data)));
|
||||||
|
|
||||||
switch (bpp)
|
switch (bpp)
|
||||||
{
|
{
|
||||||
@@ -325,7 +327,7 @@ static void HWR_GenerateTexture(INT32 texnum, GLMapTexture_t *gltex, boolean noe
|
|||||||
texture = textures[texnum];
|
texture = textures[texnum];
|
||||||
|
|
||||||
gltex->mipmap.flags = TF_CHROMAKEYED | TF_WRAPXY;
|
gltex->mipmap.flags = TF_CHROMAKEYED | TF_WRAPXY;
|
||||||
gltex->mipmap.format = textureformat;
|
gltex->mipmap.format = static_cast<GLTextureFormat_t>(textureformat);
|
||||||
|
|
||||||
// hack the Legacy skies..
|
// hack the Legacy skies..
|
||||||
if (UNLIKELY(memcmp(texture->name, "SKY", 3) == 0 &&
|
if (UNLIKELY(memcmp(texture->name, "SKY", 3) == 0 &&
|
||||||
@@ -344,7 +346,7 @@ static void HWR_GenerateTexture(INT32 texnum, GLMapTexture_t *gltex, boolean noe
|
|||||||
colormap += COLORMAP_REMAPOFFSET;
|
colormap += COLORMAP_REMAPOFFSET;
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
gltex->mipmap.colormap = Z_Calloc(sizeof(*gltex->mipmap.colormap), PU_HWRPATCHCOLMIPMAP, NULL);
|
gltex->mipmap.colormap = static_cast<GLColormap_t *>(Z_Calloc(sizeof(*gltex->mipmap.colormap), PU_HWRPATCHCOLMIPMAP, NULL));
|
||||||
gltex->mipmap.colormap->source = colormap;
|
gltex->mipmap.colormap->source = colormap;
|
||||||
memcpy(gltex->mipmap.colormap->data, colormap, 256 * sizeof(UINT8));
|
memcpy(gltex->mipmap.colormap->data, colormap, 256 * sizeof(UINT8));
|
||||||
|
|
||||||
@@ -377,7 +379,7 @@ static void HWR_GenerateTexture(INT32 texnum, GLMapTexture_t *gltex, boolean noe
|
|||||||
// Composite the columns together.
|
// Composite the columns together.
|
||||||
for (i = 0, patch = texture->patches; i < texture->patchcount; i++, patch++)
|
for (i = 0, patch = texture->patches; i < texture->patchcount; i++, patch++)
|
||||||
{
|
{
|
||||||
pdata = W_CacheLumpNumPwad(patch->wad, patch->lump, PU_LEVEL);
|
pdata = static_cast<UINT8 *>(W_CacheLumpNumPwad(patch->wad, patch->lump, PU_LEVEL));
|
||||||
realpatch = (softwarepatch_t *)pdata;
|
realpatch = (softwarepatch_t *)pdata;
|
||||||
|
|
||||||
HWR_DrawTexturePatchInCache(&gltex->mipmap, blockwidth, blockheight, texture, patch, realpatch);
|
HWR_DrawTexturePatchInCache(&gltex->mipmap, blockwidth, blockheight, texture, patch, realpatch);
|
||||||
@@ -413,7 +415,7 @@ void HWR_MakePatch(const patch_t *patch, GLPatch_t *glPatch, GLMipmap_t *glMipma
|
|||||||
glMipmap->flags = 0;
|
glMipmap->flags = 0;
|
||||||
|
|
||||||
// setup the texture info
|
// setup the texture info
|
||||||
glMipmap->format = patchformat;
|
glMipmap->format = static_cast<GLTextureFormat_t>(patchformat);
|
||||||
|
|
||||||
glPatch->max_s = (float)patch->width / (float)glMipmap->width;
|
glPatch->max_s = (float)patch->width / (float)glMipmap->width;
|
||||||
glPatch->max_t = (float)patch->height / (float)glMipmap->height;
|
glPatch->max_t = (float)patch->height / (float)glMipmap->height;
|
||||||
@@ -455,12 +457,13 @@ static void HWR_FreeTextureData(patch_t *patch)
|
|||||||
if (!patch || !patch->hardware)
|
if (!patch || !patch->hardware)
|
||||||
return;
|
return;
|
||||||
|
|
||||||
glPatch = patch->hardware;
|
glPatch = static_cast<GLPatch_t *>(patch->hardware);
|
||||||
|
|
||||||
if (vid.glstate == VID_GL_LIBRARY_LOADED)
|
if (vid.glstate == VID_GL_LIBRARY_LOADED)
|
||||||
GL_DeleteTexture(glPatch->mipmap);
|
GL_DeleteTexture(glPatch->mipmap);
|
||||||
|
|
||||||
Z_Free(glPatch->mipmap->data);
|
Z_Free(glPatch->mipmap->data);
|
||||||
|
glPatch->mipmap->data = NULL;
|
||||||
}
|
}
|
||||||
|
|
||||||
void HWR_FreeTexture(patch_t *patch)
|
void HWR_FreeTexture(patch_t *patch)
|
||||||
@@ -470,7 +473,7 @@ void HWR_FreeTexture(patch_t *patch)
|
|||||||
|
|
||||||
if (patch->hardware)
|
if (patch->hardware)
|
||||||
{
|
{
|
||||||
GLPatch_t *glPatch = patch->hardware;
|
GLPatch_t *glPatch = static_cast<GLPatch_t *>(patch->hardware);
|
||||||
|
|
||||||
HWR_FreeTextureColormaps(patch);
|
HWR_FreeTextureColormaps(patch);
|
||||||
|
|
||||||
@@ -478,6 +481,7 @@ void HWR_FreeTexture(patch_t *patch)
|
|||||||
{
|
{
|
||||||
HWR_FreeTextureData(patch);
|
HWR_FreeTextureData(patch);
|
||||||
Z_Free(glPatch->mipmap);
|
Z_Free(glPatch->mipmap);
|
||||||
|
glPatch->mipmap = NULL;
|
||||||
}
|
}
|
||||||
|
|
||||||
Z_Free(patch->hardware);
|
Z_Free(patch->hardware);
|
||||||
@@ -495,7 +499,7 @@ static void HWR_FreeTextureColormaps(patch_t *patch)
|
|||||||
if (!patch)
|
if (!patch)
|
||||||
return;
|
return;
|
||||||
|
|
||||||
pat = patch->hardware;
|
pat = static_cast<GLPatch_t *>(patch->hardware);
|
||||||
if (!pat)
|
if (!pat)
|
||||||
return;
|
return;
|
||||||
|
|
||||||
@@ -577,6 +581,9 @@ void HWR_InitMapTextures(void)
|
|||||||
|
|
||||||
static void FreeMapTexture(GLMapTexture_t *tex)
|
static void FreeMapTexture(GLMapTexture_t *tex)
|
||||||
{
|
{
|
||||||
|
if (!tex)
|
||||||
|
return;
|
||||||
|
|
||||||
GL_DeleteTexture(&tex->mipmap);
|
GL_DeleteTexture(&tex->mipmap);
|
||||||
Z_Free(tex->mipmap.data);
|
Z_Free(tex->mipmap.data);
|
||||||
tex->mipmap.data = NULL;
|
tex->mipmap.data = NULL;
|
||||||
@@ -586,6 +593,12 @@ void HWR_FreeMapTextures(void)
|
|||||||
{
|
{
|
||||||
size_t i;
|
size_t i;
|
||||||
|
|
||||||
|
if (!gl_textures)
|
||||||
|
{
|
||||||
|
gl_numtextures = 0;
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
for (i = 0; i < gl_numtextures; i++)
|
for (i = 0; i < gl_numtextures; i++)
|
||||||
{
|
{
|
||||||
FreeMapTexture(&gl_textures[i].normal);
|
FreeMapTexture(&gl_textures[i].normal);
|
||||||
@@ -596,18 +609,30 @@ void HWR_FreeMapTextures(void)
|
|||||||
|
|
||||||
// now the heap don't have any 'user' pointing to our
|
// now the heap don't have any 'user' pointing to our
|
||||||
// texturecache info, we can free it
|
// texturecache info, we can free it
|
||||||
if (gl_textures)
|
free(gl_textures);
|
||||||
free(gl_textures);
|
|
||||||
gl_textures = NULL;
|
gl_textures = NULL;
|
||||||
gl_numtextures = 0;
|
gl_numtextures = 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
static void HWR_PrecacheLevelFlats(void)
|
static void HWR_PrecacheLevelFlats(void)
|
||||||
{
|
{
|
||||||
|
// lookup for flats that may´ve been already loaded
|
||||||
|
// too lazy to make a hashtable or smth so unordered set will do :carbuncle:
|
||||||
|
std::unordered_set<UINT32> flatpresent;
|
||||||
lumpnum_t lump;
|
lumpnum_t lump;
|
||||||
size_t i, j;
|
size_t i, j;
|
||||||
INT32 k;
|
INT32 k;
|
||||||
|
|
||||||
|
auto load_flat = [&](lumpnum_t lump, boolean noencoremap)
|
||||||
|
{
|
||||||
|
// flat already loaded?
|
||||||
|
if (flatpresent.count(lump) == 0)
|
||||||
|
{
|
||||||
|
HWR_GetFlat(lump, noencoremap);
|
||||||
|
flatpresent.insert(lump);
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
// special case for encore
|
// special case for encore
|
||||||
#ifdef GLENCORE
|
#ifdef GLENCORE
|
||||||
if (encoremap)
|
if (encoremap)
|
||||||
@@ -624,16 +649,16 @@ static void HWR_PrecacheLevelFlats(void)
|
|||||||
const INT32 pic = ceiling ? sec->ceilingpic : sec->floorpic;
|
const INT32 pic = ceiling ? sec->ceilingpic : sec->floorpic;
|
||||||
|
|
||||||
const levelflat_t *levelflat = &levelflats[pic];
|
const levelflat_t *levelflat = &levelflats[pic];
|
||||||
|
|
||||||
lump = levelflat->lumpnum;
|
lump = levelflat->lumpnum;
|
||||||
HWR_GetFlat(lump, R_NoEncore(sec, ceiling));
|
|
||||||
|
|
||||||
if (levelflat->speed) // it is an animated flat
|
load_flat(lump, R_NoEncore(sec, ceiling));
|
||||||
|
|
||||||
|
if (levelflat->speed) // is it an animated flat ?
|
||||||
{
|
{
|
||||||
for (k = 1; k < levelflat->numpics; k++)
|
// start from 0, occasionally basenumlump != flat->lumpnum
|
||||||
|
for (k = 0; k < levelflat->numpics; k++)
|
||||||
{
|
{
|
||||||
lump = levelflat->baselumpnum + k;
|
load_flat(levelflat->baselumpnum + k, R_NoEncore(sec, ceiling));
|
||||||
HWR_GetFlat(lump, R_NoEncore(sec, ceiling));
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -649,15 +674,15 @@ static void HWR_PrecacheLevelFlats(void)
|
|||||||
const levelflat_t *levelflat = &levelflats[i];
|
const levelflat_t *levelflat = &levelflats[i];
|
||||||
lump = levelflat->lumpnum;
|
lump = levelflat->lumpnum;
|
||||||
|
|
||||||
HWR_GetFlat(lump, false);
|
load_flat(lump, false);
|
||||||
|
|
||||||
if (!levelflat->speed) // is it an animated flat ?
|
if (levelflat->speed) // is it an animated flat ?
|
||||||
continue;
|
|
||||||
|
|
||||||
for (k = 1; k < levelflat->numpics; k++)
|
|
||||||
{
|
{
|
||||||
lump = levelflat->baselumpnum + k;
|
// start from 0, occasionally basenumlump != flat->lumpnum
|
||||||
HWR_GetFlat(lump, false);
|
for (k = 0; k < levelflat->numpics; k++)
|
||||||
|
{
|
||||||
|
load_flat(levelflat->baselumpnum + k, false);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -670,7 +695,7 @@ static void HWR_PrecacheLevelTextures(void)
|
|||||||
size_t i, j, f;
|
size_t i, j, f;
|
||||||
INT32 h;
|
INT32 h;
|
||||||
|
|
||||||
texturepresent = calloc(numtextures, sizeof (*texturepresent));
|
texturepresent = static_cast<char *>(calloc(gl_numtextures, sizeof(*texturepresent)));
|
||||||
if (texturepresent == NULL)
|
if (texturepresent == NULL)
|
||||||
I_Error("%s: Out of memory looking up textures", "HWR_PrecacheLevel");
|
I_Error("%s: Out of memory looking up textures", "HWR_PrecacheLevel");
|
||||||
|
|
||||||
@@ -701,7 +726,10 @@ static void HWR_PrecacheLevelTextures(void)
|
|||||||
{
|
{
|
||||||
const INT32 texnum = sidetex[f];
|
const INT32 texnum = sidetex[f];
|
||||||
|
|
||||||
if (texnum < 0 || texnum >= numtextures || texturepresent[texnum])
|
if (texnum < 0 || texnum >= (signed)gl_numtextures)
|
||||||
|
continue;
|
||||||
|
|
||||||
|
if (texturepresent[texnum])
|
||||||
continue;
|
continue;
|
||||||
#ifdef GLENCORE
|
#ifdef GLENCORE
|
||||||
texturepresent[texnum] = 1|noencoremap;
|
texturepresent[texnum] = 1|noencoremap;
|
||||||
@@ -729,14 +757,16 @@ static void HWR_PrecacheLevelTextures(void)
|
|||||||
|
|
||||||
for (h = 1; h < anim->numpics; h++)
|
for (h = 1; h < anim->numpics; h++)
|
||||||
{
|
{
|
||||||
|
const INT32 animtexnum = anim->basepic+h;
|
||||||
|
|
||||||
if (texpresent & 1)
|
if (texpresent & 1)
|
||||||
{
|
{
|
||||||
HWR_GetTexture(anim->basepic+h, false);
|
HWR_GetTexture(animtexnum, false);
|
||||||
}
|
}
|
||||||
#ifdef GLENCORE
|
#ifdef GLENCORE
|
||||||
if (texpresent & 2)
|
if (texpresent & 2)
|
||||||
{
|
{
|
||||||
HWR_GetTexture(anim->basepic+h, true);
|
HWR_GetTexture(animtexnum, true);
|
||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
}
|
}
|
||||||
@@ -840,7 +870,7 @@ void HWR_LoadMapTextures(size_t pnumtextures)
|
|||||||
HWR_FreeMapTextures();
|
HWR_FreeMapTextures();
|
||||||
|
|
||||||
gl_numtextures = pnumtextures;
|
gl_numtextures = pnumtextures;
|
||||||
gl_textures = calloc(gl_numtextures, sizeof(*gl_textures)); // *2 - 1 for encore-remapped texture and another for noencore texture (unused when not in encore), see: GLMapTextureSet_t
|
gl_textures = static_cast<GLMapTextureSet_t *>(calloc(gl_numtextures, sizeof(*gl_textures))); // *2 - 1 for encore-remapped texture and another for noencore texture (unused when not in encore), see: GLMapTextureSet_t
|
||||||
|
|
||||||
if (gl_textures == NULL)
|
if (gl_textures == NULL)
|
||||||
I_Error("HWR_LoadMapTextures: ran out of memory for OpenGL textures. Sad!");
|
I_Error("HWR_LoadMapTextures: ran out of memory for OpenGL textures. Sad!");
|
||||||
@@ -852,6 +882,7 @@ void HWR_LoadMapTextures(size_t pnumtextures)
|
|||||||
GLMapTexture_t *HWR_GetTexture(INT32 tex, boolean noencore)
|
GLMapTexture_t *HWR_GetTexture(INT32 tex, boolean noencore)
|
||||||
{
|
{
|
||||||
GLMapTexture_t *gltex;
|
GLMapTexture_t *gltex;
|
||||||
|
GLMipmap_t *glMipmap;
|
||||||
|
|
||||||
if (tex < 0 || tex >= (signed)gl_numtextures)
|
if (tex < 0 || tex >= (signed)gl_numtextures)
|
||||||
{
|
{
|
||||||
@@ -870,19 +901,22 @@ GLMapTexture_t *HWR_GetTexture(INT32 tex, boolean noencore)
|
|||||||
gltex = &gl_textures[tex];
|
gltex = &gl_textures[tex];
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
glMipmap = &gltex->mipmap;
|
||||||
|
|
||||||
// Generate texture if missing from the cache
|
// Generate texture if missing from the cache
|
||||||
if (!gltex->mipmap.downloaded)
|
if (!glMipmap->downloaded)
|
||||||
{
|
{
|
||||||
if (!gltex->mipmap.data)
|
if (!gltex->mipmap.data)
|
||||||
HWR_GenerateTexture(tex, gltex, noencore);
|
HWR_GenerateTexture(tex, gltex, noencore);
|
||||||
|
|
||||||
// If hardware does not have the texture, then call GL_SetTexture to upload it
|
// If hardware does not have the texture, then call GL_SetTexture to upload it
|
||||||
GL_SetTexture(&gltex->mipmap);
|
GL_SetTexture(glMipmap);
|
||||||
}
|
}
|
||||||
HWR_SetCurrentTexture(&gltex->mipmap);
|
|
||||||
|
HWR_SetCurrentTexture(glMipmap);
|
||||||
|
|
||||||
// The system-memory data can be purged now.
|
// The system-memory data can be purged now.
|
||||||
Z_ChangeTag(gltex->mipmap.data, PU_HWRCACHE_UNLOCKED);
|
Z_ChangeTag(glMipmap->data, PU_HWRCACHE_UNLOCKED);
|
||||||
|
|
||||||
return gltex;
|
return gltex;
|
||||||
}
|
}
|
||||||
@@ -933,7 +967,7 @@ static void HWR_CacheFlat(GLMipmap_t *glMipmap, lumpnum_t flatlumpnum)
|
|||||||
W_ReadLump(flatlumpnum, Z_Malloc(size, PU_HWRCACHE, &glMipmap->data));
|
W_ReadLump(flatlumpnum, Z_Malloc(size, PU_HWRCACHE, &glMipmap->data));
|
||||||
|
|
||||||
#ifdef GLENCORE
|
#ifdef GLENCORE
|
||||||
flat = glMipmap->data;
|
flat = static_cast<UINT8 *>(glMipmap->data);
|
||||||
for (steppy = 0; steppy < size; steppy++)
|
for (steppy = 0; steppy < size; steppy++)
|
||||||
{
|
{
|
||||||
if (flat[steppy] == HWR_PATCHES_CHROMAKEY_COLORINDEX)
|
if (flat[steppy] == HWR_PATCHES_CHROMAKEY_COLORINDEX)
|
||||||
@@ -977,7 +1011,7 @@ void HWR_GetFlat(lumpnum_t flatlumpnum, boolean noencoremap)
|
|||||||
if (!noencoremap && encoremap)
|
if (!noencoremap && encoremap)
|
||||||
colormap += COLORMAP_REMAPOFFSET;
|
colormap += COLORMAP_REMAPOFFSET;
|
||||||
#endif
|
#endif
|
||||||
glMipmap->colormap = Z_Calloc(sizeof(*glMipmap->colormap), PU_HWRPATCHCOLMIPMAP, NULL);
|
glMipmap->colormap = static_cast<GLColormap_t *>(Z_Calloc(sizeof(*glMipmap->colormap), PU_HWRPATCHCOLMIPMAP, NULL));
|
||||||
glMipmap->colormap->source = colormap;
|
glMipmap->colormap->source = colormap;
|
||||||
memcpy(glMipmap->colormap->data, colormap, 256 * sizeof(UINT8));
|
memcpy(glMipmap->colormap->data, colormap, 256 * sizeof(UINT8));
|
||||||
}
|
}
|
||||||
@@ -1001,7 +1035,7 @@ void HWR_GetFlat(lumpnum_t flatlumpnum, boolean noencoremap)
|
|||||||
// --------------------+
|
// --------------------+
|
||||||
static void HWR_LoadPatchMipmap(patch_t *patch, GLMipmap_t *glMipmap)
|
static void HWR_LoadPatchMipmap(patch_t *patch, GLMipmap_t *glMipmap)
|
||||||
{
|
{
|
||||||
GLPatch_t *glPatch = patch->hardware;
|
GLPatch_t *glPatch = static_cast<GLPatch_t *>(patch->hardware);
|
||||||
|
|
||||||
if (!glMipmap->downloaded)
|
if (!glMipmap->downloaded)
|
||||||
{
|
{
|
||||||
@@ -1022,8 +1056,8 @@ static void HWR_LoadPatchMipmap(patch_t *patch, GLMipmap_t *glMipmap)
|
|||||||
// ----------------------+
|
// ----------------------+
|
||||||
static void HWR_UpdatePatchMipmap(patch_t *patch, GLMipmap_t *glMipmap)
|
static void HWR_UpdatePatchMipmap(patch_t *patch, GLMipmap_t *glMipmap)
|
||||||
{
|
{
|
||||||
GLPatch_t *grPatch = patch->hardware;
|
GLPatch_t *glPatch = static_cast<GLPatch_t *>(patch->hardware);
|
||||||
HWR_MakePatch(patch, grPatch, glMipmap, true);
|
HWR_MakePatch(patch, glPatch, glMipmap, true);
|
||||||
|
|
||||||
// If hardware does not have the texture, then call GL_SetTexture to upload it
|
// If hardware does not have the texture, then call GL_SetTexture to upload it
|
||||||
// If it does have the texture, then call GL_UpdateTexture to update it
|
// If it does have the texture, then call GL_UpdateTexture to update it
|
||||||
@@ -1031,6 +1065,7 @@ static void HWR_UpdatePatchMipmap(patch_t *patch, GLMipmap_t *glMipmap)
|
|||||||
GL_SetTexture(glMipmap);
|
GL_SetTexture(glMipmap);
|
||||||
else
|
else
|
||||||
GL_UpdateTexture(glMipmap);
|
GL_UpdateTexture(glMipmap);
|
||||||
|
|
||||||
HWR_SetCurrentTexture(glMipmap);
|
HWR_SetCurrentTexture(glMipmap);
|
||||||
|
|
||||||
// The system-memory data can be purged now.
|
// The system-memory data can be purged now.
|
||||||
@@ -1057,7 +1092,7 @@ void HWR_GetMappedPatch(patch_t *patch, const UINT8 *colormap)
|
|||||||
|
|
||||||
if (!patch->hardware)
|
if (!patch->hardware)
|
||||||
Patch_CreateGL(patch);
|
Patch_CreateGL(patch);
|
||||||
glPatch = patch->hardware;
|
glPatch = static_cast<GLPatch_t *>(patch->hardware);
|
||||||
|
|
||||||
// Blatant hack for encore colormapping aside...
|
// Blatant hack for encore colormapping aside...
|
||||||
if (colormap == colormaps || colormap == NULL || colormap == (const UINT8*)(COLORMAP_REMAPOFFSET))
|
if (colormap == colormaps || colormap == NULL || colormap == (const UINT8*)(COLORMAP_REMAPOFFSET))
|
||||||
@@ -1093,12 +1128,12 @@ void HWR_GetMappedPatch(patch_t *patch, const UINT8 *colormap)
|
|||||||
// (it have a liste of mipmap)
|
// (it have a liste of mipmap)
|
||||||
// this malloc is cleared in HWR_FreeColormapCache
|
// this malloc is cleared in HWR_FreeColormapCache
|
||||||
// (...) unfortunately z_malloc fragment alot the memory :(so malloc is better
|
// (...) unfortunately z_malloc fragment alot the memory :(so malloc is better
|
||||||
newMipmap = calloc(1, sizeof (*newMipmap));
|
newMipmap = static_cast<GLMipmap_t *>(calloc(1, sizeof (*newMipmap)));
|
||||||
if (newMipmap == NULL)
|
if (newMipmap == NULL)
|
||||||
I_Error("%s: Out of memory", "HWR_GetMappedPatch");
|
I_Error("%s: Out of memory", "HWR_GetMappedPatch");
|
||||||
glMipmap->nextcolormap = newMipmap;
|
glMipmap->nextcolormap = newMipmap;
|
||||||
|
|
||||||
newMipmap->colormap = Z_Calloc(sizeof(*newMipmap->colormap), PU_HWRPATCHCOLMIPMAP, NULL);
|
newMipmap->colormap = static_cast<GLColormap_t *>(Z_Calloc(sizeof(*newMipmap->colormap), PU_HWRPATCHCOLMIPMAP, NULL));
|
||||||
newMipmap->colormap->source = colormap;
|
newMipmap->colormap->source = colormap;
|
||||||
memcpy(newMipmap->colormap->data, colormap, 256 * sizeof(UINT8));
|
memcpy(newMipmap->colormap->data, colormap, 256 * sizeof(UINT8));
|
||||||
|
|
||||||
@@ -1121,7 +1156,7 @@ patch_t *HWR_GetCachedGLPatchPwad(UINT16 wadnum, UINT16 lumpnum)
|
|||||||
{
|
{
|
||||||
void *ptr = Z_Calloc(sizeof(patch_t), PU_PATCH, &lumpcache[lumpnum]);
|
void *ptr = Z_Calloc(sizeof(patch_t), PU_PATCH, &lumpcache[lumpnum]);
|
||||||
Patch_Create(NULL, 0, ptr);
|
Patch_Create(NULL, 0, ptr);
|
||||||
Patch_AllocateHardwarePatch(ptr);
|
Patch_AllocateHardwarePatch(static_cast<patch_t *>(ptr));
|
||||||
}
|
}
|
||||||
|
|
||||||
return (patch_t *)(lumpcache[lumpnum]);
|
return (patch_t *)(lumpcache[lumpnum]);
|
||||||
@@ -1138,7 +1173,7 @@ static void HWR_DrawFadeMaskInCache(GLMipmap_t *mipmap, INT32 pblockwidth, INT32
|
|||||||
{
|
{
|
||||||
INT32 i,j;
|
INT32 i,j;
|
||||||
fixed_t posx, posy, stepx, stepy;
|
fixed_t posx, posy, stepx, stepy;
|
||||||
UINT8 *block = mipmap->data; // places the data directly into here
|
UINT8 *block = static_cast<UINT8 *>(mipmap->data); // places the data directly into here
|
||||||
UINT8 *flat;
|
UINT8 *flat;
|
||||||
UINT8 *dest, *src, texel;
|
UINT8 *dest, *src, texel;
|
||||||
RGBA_t col;
|
RGBA_t col;
|
||||||
@@ -1294,9 +1329,9 @@ void HWR_SetPalette(RGBA_t *palette)
|
|||||||
static void HWR_SetPaletteLookup(RGBA_t *palette)
|
static void HWR_SetPaletteLookup(RGBA_t *palette)
|
||||||
{
|
{
|
||||||
int r, g, b;
|
int r, g, b;
|
||||||
UINT8 *lut = Z_Malloc(
|
UINT8 *lut = static_cast<UINT8 *>(Z_Malloc(
|
||||||
HWR_PALETTE_LUT_SIZE*HWR_PALETTE_LUT_SIZE*HWR_PALETTE_LUT_SIZE*sizeof(UINT8),
|
HWR_PALETTE_LUT_SIZE*HWR_PALETTE_LUT_SIZE*HWR_PALETTE_LUT_SIZE*sizeof(UINT8),
|
||||||
PU_STATIC, NULL);
|
PU_STATIC, NULL));
|
||||||
#define STEP_SIZE (256/HWR_PALETTE_LUT_SIZE)
|
#define STEP_SIZE (256/HWR_PALETTE_LUT_SIZE)
|
||||||
for (b = 0; b < HWR_PALETTE_LUT_SIZE; b++)
|
for (b = 0; b < HWR_PALETTE_LUT_SIZE; b++)
|
||||||
{
|
{
|
||||||
@@ -1339,7 +1374,7 @@ void HWR_SetMapPalette(void)
|
|||||||
if (palsize < 768) // 256 * 3
|
if (palsize < 768) // 256 * 3
|
||||||
I_Error("HWR_SetMapPalette: A programmer assumed palette lumps are at least 768 bytes long, but apparently this was a wrong assumption!\n");
|
I_Error("HWR_SetMapPalette: A programmer assumed palette lumps are at least 768 bytes long, but apparently this was a wrong assumption!\n");
|
||||||
|
|
||||||
RGB_data = W_CacheLumpNum(lumpnum, PU_CACHE);
|
RGB_data = static_cast<UINT8 *>(W_CacheLumpNum(lumpnum, PU_CACHE));
|
||||||
// we got the RGB palette now, but we need it in RGBA format.
|
// we got the RGB palette now, but we need it in RGBA format.
|
||||||
for (i = 0; i < 256; i++)
|
for (i = 0; i < 256; i++)
|
||||||
{
|
{
|
||||||
@@ -1374,7 +1409,7 @@ static UINT32 HWR_CreateLightTable(UINT8 *lighttable)
|
|||||||
{
|
{
|
||||||
UINT32 i, id;
|
UINT32 i, id;
|
||||||
RGBA_t *palette = HWR_GetTexturePalette();
|
RGBA_t *palette = HWR_GetTexturePalette();
|
||||||
RGBA_t *hw_lighttable = Z_Malloc(256 * 32 * sizeof(RGBA_t), PU_STATIC, NULL);
|
RGBA_t *hw_lighttable = static_cast<RGBA_t *>(Z_Malloc(256 * 32 * sizeof(RGBA_t), PU_STATIC, NULL));
|
||||||
|
|
||||||
// To make the palette index -> RGBA mapping easier for the shader,
|
// To make the palette index -> RGBA mapping easier for the shader,
|
||||||
// the hardware lighttable is composed of RGBA colors instead of palette indices.
|
// the hardware lighttable is composed of RGBA colors instead of palette indices.
|
||||||
+20
-20
@@ -166,6 +166,7 @@ static void gld_clipper_RemoveRange(clipnode_t *range)
|
|||||||
{
|
{
|
||||||
range->prev->next = range->next;
|
range->prev->next = range->next;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (range->next)
|
if (range->next)
|
||||||
{
|
{
|
||||||
range->next->prev = range->prev;
|
range->next->prev = range->prev;
|
||||||
@@ -177,7 +178,7 @@ static void gld_clipper_RemoveRange(clipnode_t *range)
|
|||||||
|
|
||||||
void gld_clipper_SafeAddClipRange(angle_t startangle, angle_t endangle)
|
void gld_clipper_SafeAddClipRange(angle_t startangle, angle_t endangle)
|
||||||
{
|
{
|
||||||
if(startangle > endangle)
|
if (startangle > endangle)
|
||||||
{
|
{
|
||||||
// The range has to added in two parts.
|
// The range has to added in two parts.
|
||||||
gld_clipper_AddClipRange(startangle, ANGLE_MAX);
|
gld_clipper_AddClipRange(startangle, ANGLE_MAX);
|
||||||
@@ -319,7 +320,7 @@ angle_t gld_FrustumAngle(angle_t tiltangle)
|
|||||||
double floatangle;
|
double floatangle;
|
||||||
angle_t a1;
|
angle_t a1;
|
||||||
|
|
||||||
float tilt = (float)fabs(((double)(int)tiltangle) / ANG1);
|
float tilt = fabsf(((float)(int)tiltangle) / (float)ANG1);
|
||||||
|
|
||||||
if (tilt > 90.0f)
|
if (tilt > 90.0f)
|
||||||
tilt = 90.0f;
|
tilt = 90.0f;
|
||||||
@@ -330,7 +331,7 @@ angle_t gld_FrustumAngle(angle_t tiltangle)
|
|||||||
|
|
||||||
// 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_PIl;
|
clipfov = atan(1 / (GLdouble)projMatrix[0]) * 360.0 / M_PI;
|
||||||
floatangle = 2.0 + (45.0 + ((double)tilt / 1.9)) * clipfov / 90.0;
|
floatangle = 2.0 + (45.0 + ((double)tilt / 1.9)) * clipfov / 90.0;
|
||||||
if (floatangle >= 180.0)
|
if (floatangle >= 180.0)
|
||||||
return 0xffffffff;
|
return 0xffffffff;
|
||||||
@@ -348,33 +349,32 @@ angle_t gld_FrustumAngle(angle_t tiltangle)
|
|||||||
// gld_FrustumSetup
|
// gld_FrustumSetup
|
||||||
//
|
//
|
||||||
|
|
||||||
static GLdouble viewMatrix[16];
|
static float frustum[6][4];
|
||||||
static GLdouble projMatrix[16];
|
|
||||||
float frustum[6][4];
|
|
||||||
|
|
||||||
#define CALCMATRIX(a, b, c, d, e, f, g, h)\
|
#define CALCMATRIX(a, b, c, d, e, f, g, h)\
|
||||||
(float)(viewMatrix[a] * projMatrix[b] + \
|
(modelMatrix[a] * projMatrix[b] + \
|
||||||
viewMatrix[c] * projMatrix[d] + \
|
modelMatrix[c] * projMatrix[d] + \
|
||||||
viewMatrix[e] * projMatrix[f] + \
|
modelMatrix[e] * projMatrix[f] + \
|
||||||
viewMatrix[g] * projMatrix[h])
|
modelMatrix[g] * projMatrix[h])
|
||||||
|
|
||||||
#define NORMALIZE_PLANE(i)\
|
#define NORMALIZE_PLANE(i)\
|
||||||
t = (float)sqrt(\
|
t = sqrtf(\
|
||||||
frustum[i][0] * frustum[i][0] + \
|
frustum[i][0] * frustum[i][0] + \
|
||||||
frustum[i][1] * frustum[i][1] + \
|
frustum[i][1] * frustum[i][1] + \
|
||||||
frustum[i][2] * frustum[i][2]); \
|
frustum[i][2] * frustum[i][2]); \
|
||||||
frustum[i][0] /= t; \
|
frustum[i][0] /= t; \
|
||||||
frustum[i][1] /= t; \
|
frustum[i][1] /= t; \
|
||||||
frustum[i][2] /= t; \
|
frustum[i][2] /= t; \
|
||||||
frustum[i][3] /= t
|
frustum[i][3] /= t
|
||||||
|
|
||||||
void gld_FrustumSetup(void)
|
void gld_FrustumSetup(void)
|
||||||
{
|
{
|
||||||
float t;
|
float t;
|
||||||
float clip[16];
|
float clip[16];
|
||||||
|
|
||||||
pglGetFloatv(GL_PROJECTION_MATRIX, projMatrix);
|
// HWR_SetTransform will take care of this!
|
||||||
pglGetFloatv(GL_MODELVIEW_MATRIX, viewMatrix);
|
//pglGetFloatv(GL_PROJECTION_MATRIX, projMatrix);
|
||||||
|
//pglGetFloatv(GL_MODELVIEW_MATRIX, modelMatrix);
|
||||||
|
|
||||||
clip[0] = CALCMATRIX(0, 0, 1, 4, 2, 8, 3, 12);
|
clip[0] = CALCMATRIX(0, 0, 1, 4, 2, 8, 3, 12);
|
||||||
clip[1] = CALCMATRIX(0, 1, 1, 5, 2, 9, 3, 13);
|
clip[1] = CALCMATRIX(0, 1, 1, 5, 2, 9, 3, 13);
|
||||||
|
|||||||
@@ -16,7 +16,7 @@ extern "C" {
|
|||||||
#include "../tables.h"
|
#include "../tables.h"
|
||||||
#include "../doomtype.h"
|
#include "../doomtype.h"
|
||||||
|
|
||||||
//#define HAVE_SPHEREFRUSTRUM // enable if you want gld_SphereInFrustum and related code
|
#define HAVE_SPHEREFRUSTRUM // enable if you want gld_SphereInFrustum and related code
|
||||||
|
|
||||||
boolean gld_clipper_SafeCheckRange(angle_t startAngle, angle_t endAngle);
|
boolean gld_clipper_SafeCheckRange(angle_t startAngle, angle_t endAngle);
|
||||||
void gld_clipper_SafeAddClipRange(angle_t startangle, angle_t endangle);
|
void gld_clipper_SafeAddClipRange(angle_t startangle, angle_t endangle);
|
||||||
|
|||||||
@@ -65,7 +65,7 @@ typedef struct GLMipmap_s GLMipmap_t;
|
|||||||
struct GLMapTexture_s
|
struct GLMapTexture_s
|
||||||
{
|
{
|
||||||
GLMipmap_t mipmap;
|
GLMipmap_t mipmap;
|
||||||
float scaleX; //used for scaling textures on walls
|
float scaleX; // used for scaling textures on walls
|
||||||
float scaleY;
|
float scaleY;
|
||||||
};
|
};
|
||||||
typedef struct GLMapTexture_s GLMapTexture_t;
|
typedef struct GLMapTexture_s GLMapTexture_t;
|
||||||
@@ -74,7 +74,7 @@ typedef struct GLMapTexture_s GLMapTexture_t;
|
|||||||
struct GLPatch_s
|
struct GLPatch_s
|
||||||
{
|
{
|
||||||
GLMipmap_t *mipmap;
|
GLMipmap_t *mipmap;
|
||||||
float max_s,max_t;
|
float max_s, max_t;
|
||||||
};
|
};
|
||||||
typedef struct GLPatch_s GLPatch_t;
|
typedef struct GLPatch_s GLPatch_t;
|
||||||
|
|
||||||
|
|||||||
@@ -79,7 +79,7 @@ typedef struct FColorARGB FColorARGB;
|
|||||||
// Simple 2D coordinate
|
// Simple 2D coordinate
|
||||||
typedef struct
|
typedef struct
|
||||||
{
|
{
|
||||||
FLOAT x,y;
|
FLOAT x, y;
|
||||||
} F2DCoord, v2d_t;
|
} F2DCoord, v2d_t;
|
||||||
|
|
||||||
// ======================
|
// ======================
|
||||||
@@ -142,8 +142,8 @@ enum
|
|||||||
// Transformed vector, as passed to HWR API
|
// Transformed vector, as passed to HWR API
|
||||||
typedef struct
|
typedef struct
|
||||||
{
|
{
|
||||||
FLOAT x,y,z;
|
FLOAT x, y, z;
|
||||||
FLOAT s,t;
|
FLOAT s, t;
|
||||||
} FOutVector;
|
} FOutVector;
|
||||||
|
|
||||||
typedef struct vbo_vertex_s
|
typedef struct vbo_vertex_s
|
||||||
@@ -173,7 +173,7 @@ typedef struct
|
|||||||
int rows, columns;
|
int rows, columns;
|
||||||
int loopcount;
|
int loopcount;
|
||||||
|
|
||||||
int detail, vertex_count;
|
int vertex_count;
|
||||||
int texture, width, height;
|
int texture, width, height;
|
||||||
boolean rebuild; // VBO needs to be rebuilt
|
boolean rebuild; // VBO needs to be rebuilt
|
||||||
|
|
||||||
|
|||||||
@@ -1,67 +0,0 @@
|
|||||||
// Emacs style mode select -*- C++ -*-
|
|
||||||
//-----------------------------------------------------------------------------
|
|
||||||
//
|
|
||||||
// Copyright (C) 2005 by SRB2 Jr. Team.
|
|
||||||
//
|
|
||||||
// This program is free software; you can redistribute it and/or
|
|
||||||
// modify it under the terms of the GNU General Public License
|
|
||||||
// as published by the Free Software Foundation; either version 2
|
|
||||||
// of the License, or (at your option) any later version.
|
|
||||||
//
|
|
||||||
// This program is distributed in the hope that it will be useful,
|
|
||||||
// but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
||||||
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
||||||
// GNU General Public License for more details.
|
|
||||||
//-----------------------------------------------------------------------------
|
|
||||||
/// \file
|
|
||||||
/// \brief Win32 DLL and Shared Objects API definitions
|
|
||||||
|
|
||||||
#ifndef __HWR_DLL_H__
|
|
||||||
#define __HWR_DLL_H__
|
|
||||||
|
|
||||||
// Function declaration for exports from the DLL :
|
|
||||||
// EXPORT <return-type> HWRAPI(<function-name>) (<arguments>);
|
|
||||||
// If _CREATE_DLL_ is defined the above declaration translates to :
|
|
||||||
// __declspec(dllexport) <return-type> WINAPI <function-name> (<arguments>);
|
|
||||||
// If _CREATE_DLL_ is NOT DEFINED the above declaration translates to :
|
|
||||||
// __declspec(dllexport) <return->type> (WINAPI *<function-name>) (<arguments>);
|
|
||||||
|
|
||||||
#ifdef _CREATE_DLL_
|
|
||||||
#ifdef __cplusplus
|
|
||||||
#define EXPORT extern "C"
|
|
||||||
#else
|
|
||||||
#define EXPORT
|
|
||||||
#endif
|
|
||||||
#ifdef _WIN32
|
|
||||||
#define HWRAPI(fn) WINAPI fn
|
|
||||||
#else
|
|
||||||
#define HWRAPI(fn) fn
|
|
||||||
#endif
|
|
||||||
#else // _CREATE_DLL_
|
|
||||||
#define EXPORT typedef
|
|
||||||
#ifdef _WIN32
|
|
||||||
#define HWRAPI(fn) (WINAPI *fn)
|
|
||||||
#else
|
|
||||||
#define HWRAPI(fn) (*fn)
|
|
||||||
#endif
|
|
||||||
#endif
|
|
||||||
|
|
||||||
// ==========================================================================
|
|
||||||
// MATHS
|
|
||||||
// ==========================================================================
|
|
||||||
|
|
||||||
// Constants
|
|
||||||
#define DEGREE (0.017453292519943295769236907684883l) // 2*PI/360
|
|
||||||
|
|
||||||
void GL_DBG_Printf(const char *format, ...) /*FUNCPRINTF*/;
|
|
||||||
#define DBG_Printf GL_DBG_Printf
|
|
||||||
|
|
||||||
#if defined (__CYGWIN__)
|
|
||||||
void _init() __attribute__((constructor));
|
|
||||||
void _fini() __attribute__((destructor));
|
|
||||||
#else
|
|
||||||
void _init();
|
|
||||||
void _fini();
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#endif
|
|
||||||
+460
-305
File diff suppressed because it is too large.
Load diff
@@ -102,8 +102,7 @@ void HWR_SetViewSize(void);
|
|||||||
void HWR_AddCommands(void);
|
void HWR_AddCommands(void);
|
||||||
|
|
||||||
void HWR_RenderPlayerView(void);
|
void HWR_RenderPlayerView(void);
|
||||||
void HWR_RenderViewpoint(gl_portal_t *rootportal, player_t *player, int stencil_level, boolean allow_portals);
|
void HWR_RenderPortalViewpoint(gl_portal_t *rootportal, int stencil_level, boolean allow_portals);
|
||||||
void HWR_RenderPortalViewpoint(gl_portal_t *rootportal, player_t *player, int stencil_level, boolean allow_portals);
|
|
||||||
|
|
||||||
void HWR_ClearSkyDome(void);
|
void HWR_ClearSkyDome(void);
|
||||||
void HWR_BuildSkyDome(void);
|
void HWR_BuildSkyDome(void);
|
||||||
|
|||||||
@@ -38,7 +38,7 @@ void HWR_PortalClipping(gl_portal_t *portal)
|
|||||||
gld_clipper_SafeAddClipRange(portal->angle1, portal->angle2);
|
gld_clipper_SafeAddClipRange(portal->angle1, portal->angle2);
|
||||||
}
|
}
|
||||||
|
|
||||||
static gl_portal_t* HWR_Portal_Add (seg_t *seg)
|
static gl_portal_t* HWR_Portal_Add(seg_t *seg)
|
||||||
{
|
{
|
||||||
gl_portal_t *portal = Z_Malloc(sizeof(gl_portal_t), PU_STATIC, NULL);
|
gl_portal_t *portal = Z_Malloc(sizeof(gl_portal_t), PU_STATIC, NULL);
|
||||||
|
|
||||||
@@ -120,8 +120,8 @@ void HWR_PortalFrame(gl_portal_t* portal)
|
|||||||
viewz = portal->viewz;
|
viewz = portal->viewz;
|
||||||
|
|
||||||
viewangle = portal->viewangle;
|
viewangle = portal->viewangle;
|
||||||
//viewsin = FINESINE(viewangle>>ANGLETOFINESHIFT);
|
viewsin = FINESINE(viewangle>>ANGLETOFINESHIFT);
|
||||||
//viewcos = FINECOSINE(viewangle>>ANGLETOFINESHIFT);
|
viewcos = FINECOSINE(viewangle>>ANGLETOFINESHIFT);
|
||||||
|
|
||||||
if (portal->clipline != -1)
|
if (portal->clipline != -1)
|
||||||
{
|
{
|
||||||
@@ -157,7 +157,7 @@ static void HWR_RenderPortalSeg(gl_portal_t* portal, SINT8 state)
|
|||||||
}
|
}
|
||||||
|
|
||||||
// Renders a single portal from the current viewpoint.
|
// Renders a single portal from the current viewpoint.
|
||||||
void HWR_RenderPortal(gl_portal_t* portal, gl_portal_t* rootportal, const float fpov, player_t *player, int stencil_level)
|
void HWR_RenderPortal(gl_portal_t* portal, gl_portal_t* rootportal, const float fpov, int stencil_level)
|
||||||
{
|
{
|
||||||
// draw portal seg to stencil buffer with increment
|
// draw portal seg to stencil buffer with increment
|
||||||
HWR_SetTransform(fpov);
|
HWR_SetTransform(fpov);
|
||||||
@@ -170,7 +170,7 @@ void HWR_RenderPortal(gl_portal_t* portal, gl_portal_t* rootportal, const float
|
|||||||
HWR_PortalFrame(portal);
|
HWR_PortalFrame(portal);
|
||||||
|
|
||||||
// call HWR_RenderViewpoint
|
// call HWR_RenderViewpoint
|
||||||
HWR_RenderPortalViewpoint(portal, player, stencil_level + 1, true);
|
HWR_RenderPortalViewpoint(portal, stencil_level + 1, true);
|
||||||
|
|
||||||
// return to current frame
|
// return to current frame
|
||||||
if (rootportal)
|
if (rootportal)
|
||||||
|
|||||||
@@ -65,7 +65,7 @@ extern SINT8 gl_portal_state;
|
|||||||
// new thing
|
// new thing
|
||||||
extern gl_portallist_t *currentportallist;
|
extern gl_portallist_t *currentportallist;
|
||||||
|
|
||||||
static inline void HWR_SetPortalState (SINT8 state)
|
static inline void HWR_SetPortalState(SINT8 state)
|
||||||
{
|
{
|
||||||
gl_portal_state = state;
|
gl_portal_state = state;
|
||||||
}
|
}
|
||||||
@@ -75,7 +75,7 @@ void HWR_PortalClipping(gl_portal_t *portal);
|
|||||||
|
|
||||||
void HWR_Portal_Add2Lines(const INT32 line1, const INT32 line2, seg_t *seg);
|
void HWR_Portal_Add2Lines(const INT32 line1, const INT32 line2, seg_t *seg);
|
||||||
void HWR_PortalFrame(gl_portal_t* portal);
|
void HWR_PortalFrame(gl_portal_t* portal);
|
||||||
void HWR_RenderPortal(gl_portal_t* portal, gl_portal_t* rootportal, const float fpov, player_t *player, int stencil_level);
|
void HWR_RenderPortal(gl_portal_t* portal, gl_portal_t* rootportal, const float fpov, int stencil_level);
|
||||||
void HWR_FreePortalList(gl_portallist_t portallist);
|
void HWR_FreePortalList(gl_portallist_t portallist);
|
||||||
|
|
||||||
boolean HWR_PortalCheckPointSide(fixed_t x, fixed_t y);
|
boolean HWR_PortalCheckPointSide(fixed_t x, fixed_t y);
|
||||||
|
|||||||
+112
-157
@@ -25,7 +25,7 @@
|
|||||||
|
|
||||||
// Eeeeh not sure is this right way, but it works < sry :c < sry again it had to go :c
|
// Eeeeh not sure is this right way, but it works < sry :c < sry again it had to go :c
|
||||||
|
|
||||||
#if defined (HWRENDER) && !defined (NOROPENGL)
|
#if defined (HWRENDER)
|
||||||
|
|
||||||
#include "../../r_fps.h" // For R_GetTimeFrac, used for the leveltime shader uniform
|
#include "../../r_fps.h" // For R_GetTimeFrac, used for the leveltime shader uniform
|
||||||
|
|
||||||
@@ -101,7 +101,7 @@ static LTListItem *LightTablesHead = NULL;
|
|||||||
static RGBA_t screenPalette[256] = {0}; // the palette for the postprocessing step in palette rendering
|
static RGBA_t screenPalette[256] = {0}; // the palette for the postprocessing step in palette rendering
|
||||||
static GLuint screenPaletteTex = 0; // 1D texture containing the screen palette
|
static GLuint screenPaletteTex = 0; // 1D texture containing the screen palette
|
||||||
static GLuint paletteLookupTex = 0; // 3D texture containing RGB -> palette index lookup table
|
static GLuint paletteLookupTex = 0; // 3D texture containing RGB -> palette index lookup table
|
||||||
RGBA_t myPaletteData[256]; // the palette for converting textures to RGBA
|
RGBA_t myPaletteData[256] = {0}; // the palette for converting textures to RGBA
|
||||||
|
|
||||||
static GLint gltexformat = GL_RGB5_A1;
|
static GLint gltexformat = GL_RGB5_A1;
|
||||||
GLint screen_width = 0; // used by Draw2DLine()
|
GLint screen_width = 0; // used by Draw2DLine()
|
||||||
@@ -127,8 +127,8 @@ GLuint gl_num_extensions;
|
|||||||
int majorGL = 0, minorGL = 0;
|
int majorGL = 0, minorGL = 0;
|
||||||
|
|
||||||
//Hurdler: 04/10/2000: added for the kick ass coronas as Boris wanted;-)
|
//Hurdler: 04/10/2000: added for the kick ass coronas as Boris wanted;-)
|
||||||
static GLfloat modelMatrix[16];
|
GLfloat modelMatrix[16] = {0};
|
||||||
GLfloat projMatrix[16];
|
GLfloat projMatrix[16] = {0};
|
||||||
static GLint viewport[4];
|
static GLint viewport[4];
|
||||||
|
|
||||||
#ifdef USE_FBO_OGL
|
#ifdef USE_FBO_OGL
|
||||||
@@ -173,41 +173,7 @@ boolean supportstencil = false;
|
|||||||
// can know when the textures aren't there, as textures are always considered resident in their virtual memory
|
// can know when the textures aren't there, as textures are always considered resident in their virtual memory
|
||||||
static GLuint screenTextures[NUMSCREENTEXTURES] = {0};
|
static GLuint screenTextures[NUMSCREENTEXTURES] = {0};
|
||||||
|
|
||||||
// shortcut for ((float)1/i)
|
#define byte2float(byte) (GLfloat)(byte / 255.0f)
|
||||||
static const GLfloat byte2float[256] = {
|
|
||||||
0.000000f, 0.003922f, 0.007843f, 0.011765f, 0.015686f, 0.019608f, 0.023529f, 0.027451f,
|
|
||||||
0.031373f, 0.035294f, 0.039216f, 0.043137f, 0.047059f, 0.050980f, 0.054902f, 0.058824f,
|
|
||||||
0.062745f, 0.066667f, 0.070588f, 0.074510f, 0.078431f, 0.082353f, 0.086275f, 0.090196f,
|
|
||||||
0.094118f, 0.098039f, 0.101961f, 0.105882f, 0.109804f, 0.113725f, 0.117647f, 0.121569f,
|
|
||||||
0.125490f, 0.129412f, 0.133333f, 0.137255f, 0.141176f, 0.145098f, 0.149020f, 0.152941f,
|
|
||||||
0.156863f, 0.160784f, 0.164706f, 0.168627f, 0.172549f, 0.176471f, 0.180392f, 0.184314f,
|
|
||||||
0.188235f, 0.192157f, 0.196078f, 0.200000f, 0.203922f, 0.207843f, 0.211765f, 0.215686f,
|
|
||||||
0.219608f, 0.223529f, 0.227451f, 0.231373f, 0.235294f, 0.239216f, 0.243137f, 0.247059f,
|
|
||||||
0.250980f, 0.254902f, 0.258824f, 0.262745f, 0.266667f, 0.270588f, 0.274510f, 0.278431f,
|
|
||||||
0.282353f, 0.286275f, 0.290196f, 0.294118f, 0.298039f, 0.301961f, 0.305882f, 0.309804f,
|
|
||||||
0.313726f, 0.317647f, 0.321569f, 0.325490f, 0.329412f, 0.333333f, 0.337255f, 0.341176f,
|
|
||||||
0.345098f, 0.349020f, 0.352941f, 0.356863f, 0.360784f, 0.364706f, 0.368627f, 0.372549f,
|
|
||||||
0.376471f, 0.380392f, 0.384314f, 0.388235f, 0.392157f, 0.396078f, 0.400000f, 0.403922f,
|
|
||||||
0.407843f, 0.411765f, 0.415686f, 0.419608f, 0.423529f, 0.427451f, 0.431373f, 0.435294f,
|
|
||||||
0.439216f, 0.443137f, 0.447059f, 0.450980f, 0.454902f, 0.458824f, 0.462745f, 0.466667f,
|
|
||||||
0.470588f, 0.474510f, 0.478431f, 0.482353f, 0.486275f, 0.490196f, 0.494118f, 0.498039f,
|
|
||||||
0.501961f, 0.505882f, 0.509804f, 0.513726f, 0.517647f, 0.521569f, 0.525490f, 0.529412f,
|
|
||||||
0.533333f, 0.537255f, 0.541177f, 0.545098f, 0.549020f, 0.552941f, 0.556863f, 0.560784f,
|
|
||||||
0.564706f, 0.568627f, 0.572549f, 0.576471f, 0.580392f, 0.584314f, 0.588235f, 0.592157f,
|
|
||||||
0.596078f, 0.600000f, 0.603922f, 0.607843f, 0.611765f, 0.615686f, 0.619608f, 0.623529f,
|
|
||||||
0.627451f, 0.631373f, 0.635294f, 0.639216f, 0.643137f, 0.647059f, 0.650980f, 0.654902f,
|
|
||||||
0.658824f, 0.662745f, 0.666667f, 0.670588f, 0.674510f, 0.678431f, 0.682353f, 0.686275f,
|
|
||||||
0.690196f, 0.694118f, 0.698039f, 0.701961f, 0.705882f, 0.709804f, 0.713726f, 0.717647f,
|
|
||||||
0.721569f, 0.725490f, 0.729412f, 0.733333f, 0.737255f, 0.741177f, 0.745098f, 0.749020f,
|
|
||||||
0.752941f, 0.756863f, 0.760784f, 0.764706f, 0.768627f, 0.772549f, 0.776471f, 0.780392f,
|
|
||||||
0.784314f, 0.788235f, 0.792157f, 0.796078f, 0.800000f, 0.803922f, 0.807843f, 0.811765f,
|
|
||||||
0.815686f, 0.819608f, 0.823529f, 0.827451f, 0.831373f, 0.835294f, 0.839216f, 0.843137f,
|
|
||||||
0.847059f, 0.850980f, 0.854902f, 0.858824f, 0.862745f, 0.866667f, 0.870588f, 0.874510f,
|
|
||||||
0.878431f, 0.882353f, 0.886275f, 0.890196f, 0.894118f, 0.898039f, 0.901961f, 0.905882f,
|
|
||||||
0.909804f, 0.913726f, 0.917647f, 0.921569f, 0.925490f, 0.929412f, 0.933333f, 0.937255f,
|
|
||||||
0.941177f, 0.945098f, 0.949020f, 0.952941f, 0.956863f, 0.960784f, 0.964706f, 0.968628f,
|
|
||||||
0.972549f, 0.976471f, 0.980392f, 0.984314f, 0.988235f, 0.992157f, 0.996078f, 1.000000f
|
|
||||||
};
|
|
||||||
|
|
||||||
// -----------------+
|
// -----------------+
|
||||||
// GL_DBG_Printf : Output debug messages to debug log if DEBUG_TO_FILE is defined,
|
// GL_DBG_Printf : Output debug messages to debug log if DEBUG_TO_FILE is defined,
|
||||||
@@ -216,7 +182,7 @@ static const GLfloat byte2float[256] = {
|
|||||||
// -----------------+
|
// -----------------+
|
||||||
|
|
||||||
#ifdef DEBUG_TO_FILE
|
#ifdef DEBUG_TO_FILE
|
||||||
FILE *gllogstream;
|
FILE *gllogstream = NULL;
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
FUNCPRINTF void GL_DBG_Printf(const char *format, ...)
|
FUNCPRINTF void GL_DBG_Printf(const char *format, ...)
|
||||||
@@ -1023,11 +989,9 @@ boolean GL_CompileShader(int slot)
|
|||||||
{
|
{
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
else
|
|
||||||
{
|
gl_shaders[slot].program = 0;
|
||||||
gl_shaders[slot].program = 0;
|
return false;
|
||||||
return false;
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
//
|
//
|
||||||
@@ -1069,6 +1033,7 @@ void GL_SetShader(int slot)
|
|||||||
GL_UnSetShader();
|
GL_UnSetShader();
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (gl_allowshaders)
|
if (gl_allowshaders)
|
||||||
{
|
{
|
||||||
gl_shader_t *next_shader = &gl_shaders[slot]; // the gl_shader_t we are going to switch to
|
gl_shader_t *next_shader = &gl_shaders[slot]; // the gl_shader_t we are going to switch to
|
||||||
@@ -1130,7 +1095,7 @@ static void GL_SetNoTexture(void)
|
|||||||
// -----------------+
|
// -----------------+
|
||||||
static void GL_Perspective(GLfloat fovy, GLfloat aspect)
|
static void GL_Perspective(GLfloat fovy, GLfloat aspect)
|
||||||
{
|
{
|
||||||
GLfloat m[4][4] =
|
static GLfloat m[4][4] =
|
||||||
{
|
{
|
||||||
{ 1.0f, 0.0f, 0.0f, 0.0f},
|
{ 1.0f, 0.0f, 0.0f, 0.0f},
|
||||||
{ 0.0f, 1.0f, 0.0f, 0.0f},
|
{ 0.0f, 1.0f, 0.0f, 0.0f},
|
||||||
@@ -1138,7 +1103,6 @@ static void GL_Perspective(GLfloat fovy, GLfloat aspect)
|
|||||||
{ 0.0f, 0.0f, 0.0f, 0.0f},
|
{ 0.0f, 0.0f, 0.0f, 0.0f},
|
||||||
};
|
};
|
||||||
|
|
||||||
const GLfloat focallength = (GLfloat)(1.0f / (GLfloat)tan(fovy * (GLfloat)M_PIl / 360.0f));
|
|
||||||
const GLfloat deltaZ = FAR_CLIPPING_PLANE - NEAR_CLIPPING_PLANE;
|
const GLfloat deltaZ = FAR_CLIPPING_PLANE - NEAR_CLIPPING_PLANE;
|
||||||
|
|
||||||
if ((fabsf((float)deltaZ) < 1.0E-36f) || fpclassify(aspect) == FP_ZERO)
|
if ((fabsf((float)deltaZ) < 1.0E-36f) || fpclassify(aspect) == FP_ZERO)
|
||||||
@@ -1146,6 +1110,8 @@ static void GL_Perspective(GLfloat fovy, GLfloat aspect)
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
const GLfloat focallength = (1.0f / tanf(fovy * M_PIf / 360.0f));
|
||||||
|
|
||||||
m[0][0] = focallength / aspect;
|
m[0][0] = focallength / aspect;
|
||||||
m[1][1] = focallength;
|
m[1][1] = focallength;
|
||||||
m[2][2] = -(FAR_CLIPPING_PLANE + NEAR_CLIPPING_PLANE) / deltaZ;
|
m[2][2] = -(FAR_CLIPPING_PLANE + NEAR_CLIPPING_PLANE) / deltaZ;
|
||||||
@@ -1159,7 +1125,7 @@ static void GL_Perspective(GLfloat fovy, GLfloat aspect)
|
|||||||
// -----------------+
|
// -----------------+
|
||||||
void GL_SetModelView(GLint w, GLint h)
|
void GL_SetModelView(GLint w, GLint h)
|
||||||
{
|
{
|
||||||
GLint maxtexsize = 0;
|
static GLint maxtexsize = 0;
|
||||||
//GL_DBG_Printf("SetModelView(): %dx%d\n", (int)w, (int)h);
|
//GL_DBG_Printf("SetModelView(): %dx%d\n", (int)w, (int)h);
|
||||||
|
|
||||||
// The screen textures need to be flushed if the width or height change so that they be remade for the correct size
|
// The screen textures need to be flushed if the width or height change so that they be remade for the correct size
|
||||||
@@ -1192,7 +1158,9 @@ void GL_SetModelView(GLint w, GLint h)
|
|||||||
screen_texsizeh <<= 1;
|
screen_texsizeh <<= 1;
|
||||||
}
|
}
|
||||||
|
|
||||||
pglGetIntegerv(GL_MAX_TEXTURE_SIZE, &maxtexsize); // Get the maximum supported texture size
|
if (!maxtexsize)
|
||||||
|
pglGetIntegerv(GL_MAX_TEXTURE_SIZE, &maxtexsize); // Get the maximum supported texture size
|
||||||
|
|
||||||
if ((screen_texsizew > maxtexsize || screen_texsizeh > maxtexsize) && maxtexsize > 0)
|
if ((screen_texsizew > maxtexsize || screen_texsizeh > maxtexsize) && maxtexsize > 0)
|
||||||
{
|
{
|
||||||
// The desired screen texture resolution is too big for the player's GPU!
|
// The desired screen texture resolution is too big for the player's GPU!
|
||||||
@@ -1338,7 +1306,8 @@ void GL_DeleteTexture(GLMipmap_t *pTexInfo)
|
|||||||
|
|
||||||
if (!pTexInfo)
|
if (!pTexInfo)
|
||||||
return;
|
return;
|
||||||
else if (pTexInfo->downloaded)
|
|
||||||
|
if (pTexInfo->downloaded)
|
||||||
pglDeleteTextures(1, (GLuint *)&pTexInfo->downloaded);
|
pglDeleteTextures(1, (GLuint *)&pTexInfo->downloaded);
|
||||||
|
|
||||||
while (head)
|
while (head)
|
||||||
@@ -1392,7 +1361,8 @@ void GL_Flush(void)
|
|||||||
TexCacheTail = TexCacheHead = NULL; //Hurdler: well, TexCacheHead is already NULL
|
TexCacheTail = TexCacheHead = NULL; //Hurdler: well, TexCacheHead is already NULL
|
||||||
tex_downloaded = 0;
|
tex_downloaded = 0;
|
||||||
|
|
||||||
free(textureBuffer);
|
if (textureBuffer)
|
||||||
|
free(textureBuffer);
|
||||||
textureBuffer = NULL;
|
textureBuffer = NULL;
|
||||||
textureBufferSize = 0;
|
textureBufferSize = 0;
|
||||||
}
|
}
|
||||||
@@ -1498,14 +1468,14 @@ void GL_ReadScreenTexture(int tex, UINT8 *restrict dest, INT32 scale)
|
|||||||
// -----------------+
|
// -----------------+
|
||||||
void GL_SetPalette(RGBA_t *palette)
|
void GL_SetPalette(RGBA_t *palette)
|
||||||
{
|
{
|
||||||
INT32 i;
|
const size_t palsize = (sizeof(RGBA_t) * 256);
|
||||||
|
|
||||||
for (i = 0; i < 256; i++)
|
// on a palette change, you have to reload all of the textures
|
||||||
|
if (memcmp(myPaletteData, palette, palsize))
|
||||||
{
|
{
|
||||||
myPaletteData[i].s = palette[i].s;
|
memcpy(myPaletteData, palette, palsize);
|
||||||
|
GL_Flush();
|
||||||
}
|
}
|
||||||
|
|
||||||
GL_Flush();
|
|
||||||
}
|
}
|
||||||
|
|
||||||
// -----------------+
|
// -----------------+
|
||||||
@@ -1546,6 +1516,7 @@ void GL_ClearBuffer(FBOOLEAN ColorMask, FBOOLEAN DepthMask, FBOOLEAN StencilMask
|
|||||||
|
|
||||||
ClearMask |= GL_COLOR_BUFFER_BIT;
|
ClearMask |= GL_COLOR_BUFFER_BIT;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (DepthMask)
|
if (DepthMask)
|
||||||
{
|
{
|
||||||
pglClearDepth(1.0f); //Hurdler: all that are permanen states
|
pglClearDepth(1.0f); //Hurdler: all that are permanen states
|
||||||
@@ -1557,7 +1528,7 @@ void GL_ClearBuffer(FBOOLEAN ColorMask, FBOOLEAN DepthMask, FBOOLEAN StencilMask
|
|||||||
GL_SetBlend(DepthMask ? PF_Occlude | CurrentPolyFlags : CurrentPolyFlags&~PF_Occlude);
|
GL_SetBlend(DepthMask ? PF_Occlude | CurrentPolyFlags : CurrentPolyFlags&~PF_Occlude);
|
||||||
|
|
||||||
if (StencilMask)
|
if (StencilMask)
|
||||||
ClearMask |= GL_STENCIL_BUFFER_BIT;// looks like sometimes stencil buffer needs clearing? had a problem with random black screens
|
ClearMask |= GL_STENCIL_BUFFER_BIT; // looks like sometimes stencil buffer needs clearing? had a problem with random black screens
|
||||||
|
|
||||||
pglClear(ClearMask);
|
pglClear(ClearMask);
|
||||||
pglEnableClientState(GL_VERTEX_ARRAY); // We always use this one
|
pglEnableClientState(GL_VERTEX_ARRAY); // We always use this one
|
||||||
@@ -1582,11 +1553,11 @@ void GL_Draw2DLine(F2DCoord * v1, F2DCoord * v2, RGBA_t Color)
|
|||||||
|
|
||||||
// This is the preferred, 'modern' way of rendering lines -- creating a polygon.
|
// This is the preferred, 'modern' way of rendering lines -- creating a polygon.
|
||||||
if (fabsf(v2->x - v1->x) > FLT_EPSILON)
|
if (fabsf(v2->x - v1->x) > FLT_EPSILON)
|
||||||
angle = (float)atan((v2->y-v1->y)/(v2->x-v1->x));
|
angle = atanf((v2->y-v1->y)/(v2->x-v1->x));
|
||||||
else
|
else
|
||||||
angle = (float)N_PI_DEMI;
|
angle = (float)N_PI_DEMI;
|
||||||
dx = (float)sin(angle) / (float)screen_width;
|
dx = sinf(angle) / (float)screen_width;
|
||||||
dy = (float)cos(angle) / (float)screen_height;
|
dy = cosf(angle) / (float)screen_height;
|
||||||
|
|
||||||
p[0] = v1->x - dx; p[1] = -(v1->y + dy); p[2] = 1;
|
p[0] = v1->x - dx; p[1] = -(v1->y + dy); p[2] = 1;
|
||||||
p[3] = v2->x - dx; p[4] = -(v2->y + dy); p[5] = 1;
|
p[3] = v2->x - dx; p[4] = -(v2->y + dy); p[5] = 1;
|
||||||
@@ -1601,18 +1572,21 @@ void GL_Draw2DLine(F2DCoord * v1, F2DCoord * v2, RGBA_t Color)
|
|||||||
pglEnableClientState(GL_TEXTURE_COORD_ARRAY);
|
pglEnableClientState(GL_TEXTURE_COORD_ARRAY);
|
||||||
pglEnable(GL_TEXTURE_2D);
|
pglEnable(GL_TEXTURE_2D);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
static inline void Clamp2D(GLenum pname)
|
||||||
|
{
|
||||||
|
#ifdef GL_CLAMP_TO_EDGE
|
||||||
|
pglTexParameteri(GL_TEXTURE_2D, pname, GL_CLAMP_TO_EDGE);
|
||||||
|
#else
|
||||||
|
pglTexParameteri(GL_TEXTURE_2D, pname, GL_CLAMP); // fallback clamp
|
||||||
|
#endif
|
||||||
|
}
|
||||||
|
|
||||||
// -----------------+
|
// -----------------+
|
||||||
// SetBlend : Set render mode
|
// SetBlend : Set render mode
|
||||||
// -----------------+
|
// -----------------+
|
||||||
// PF_Masked - we could use an ALPHA_TEST of GL_EQUAL, and alpha ref of 0,
|
// PF_Masked - we could use an ALPHA_TEST of GL_EQUAL, and alpha ref of 0,
|
||||||
// is it faster when pixels are discarded ?
|
// is it faster when pixels are discarded ?
|
||||||
static void Clamp2D(GLenum pname)
|
|
||||||
{
|
|
||||||
pglTexParameteri(GL_TEXTURE_2D, pname, GL_CLAMP); // fallback clamp
|
|
||||||
#ifdef GL_CLAMP_TO_EDGE
|
|
||||||
pglTexParameteri(GL_TEXTURE_2D, pname, GL_CLAMP_TO_EDGE);
|
|
||||||
#endif
|
|
||||||
}
|
|
||||||
|
|
||||||
static void GL_SetBlendEquation(GLenum mode)
|
static void GL_SetBlendEquation(GLenum mode)
|
||||||
{
|
{
|
||||||
@@ -1761,14 +1735,6 @@ void GL_SetBlend(FBITFIELD PolyFlags)
|
|||||||
|
|
||||||
if (Xor & PF_Modulated)
|
if (Xor & PF_Modulated)
|
||||||
{
|
{
|
||||||
#if defined (__unix__) || defined (UNIXCOMMON)
|
|
||||||
if (oglflags & GLF_NOTEXENV)
|
|
||||||
{
|
|
||||||
if (!(PolyFlags & PF_Modulated))
|
|
||||||
pglColor4ubv(white);
|
|
||||||
}
|
|
||||||
else
|
|
||||||
#endif
|
|
||||||
if (PolyFlags & PF_Modulated)
|
if (PolyFlags & PF_Modulated)
|
||||||
{ // mix texture colour with Surface->PolyColor
|
{ // mix texture colour with Surface->PolyColor
|
||||||
pglTexEnvi(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
|
pglTexEnvi(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
|
||||||
@@ -2004,7 +1970,7 @@ void GL_UpdateTexture(GLMipmap_t *pTexInfo)
|
|||||||
{
|
{
|
||||||
if (chromakeyed && (*pImgData == HWR_PATCHES_CHROMAKEY_COLORINDEX))
|
if (chromakeyed && (*pImgData == HWR_PATCHES_CHROMAKEY_COLORINDEX))
|
||||||
{
|
{
|
||||||
tex[idx].s = (byteColor_t){0, 0, 0, 0};
|
memset(&tex[idx].s, 0, sizeof(byteColor_t));
|
||||||
pTexInfo->flags |= TF_TRANSPARENT; // there is a hole in it
|
pTexInfo->flags |= TF_TRANSPARENT; // there is a hole in it
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
@@ -2016,10 +1982,9 @@ void GL_UpdateTexture(GLMipmap_t *pTexInfo)
|
|||||||
|
|
||||||
if (texinfoformat != GL_TEXFMT_AP_88)
|
if (texinfoformat != GL_TEXFMT_AP_88)
|
||||||
continue;
|
continue;
|
||||||
if (chromakeyed)
|
|
||||||
continue;
|
|
||||||
|
|
||||||
tex[idx].s.alpha = *pImgData;
|
if (!chromakeyed)
|
||||||
|
tex[idx].s.alpha = *pImgData;
|
||||||
pImgData++;
|
pImgData++;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -2054,9 +2019,9 @@ void GL_UpdateTexture(GLMipmap_t *pTexInfo)
|
|||||||
{
|
{
|
||||||
for (i = 0; i < w; i++, idx++)
|
for (i = 0; i < w; i++, idx++)
|
||||||
{
|
{
|
||||||
tex[idx].s.red = *pImgData;
|
tex[idx].s.red =
|
||||||
tex[idx].s.green = *pImgData;
|
tex[idx].s.green =
|
||||||
tex[idx].s.blue = *pImgData;
|
tex[idx].s.blue = *pImgData;
|
||||||
pImgData++;
|
pImgData++;
|
||||||
tex[idx].s.alpha = *pImgData;
|
tex[idx].s.alpha = *pImgData;
|
||||||
pImgData++;
|
pImgData++;
|
||||||
@@ -2143,7 +2108,8 @@ void GL_SetTexture(GLMipmap_t *pTexInfo)
|
|||||||
GL_SetNoTexture();
|
GL_SetNoTexture();
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
else if (pTexInfo->downloaded)
|
|
||||||
|
if (pTexInfo->downloaded)
|
||||||
{
|
{
|
||||||
if (pTexInfo->downloaded != tex_downloaded)
|
if (pTexInfo->downloaded != tex_downloaded)
|
||||||
{
|
{
|
||||||
@@ -2419,38 +2385,38 @@ static void GL_PreparePolygon(FSurfaceInfo *pSurf, FBITFIELD PolyFlags)
|
|||||||
|
|
||||||
if (pSurf)
|
if (pSurf)
|
||||||
{
|
{
|
||||||
// If modulated, mix the surface colour to the texture
|
|
||||||
if (CurrentPolyFlags & PF_Modulated)
|
|
||||||
pglColor4ubv((GLubyte*)&pSurf->PolyColor.s);
|
|
||||||
|
|
||||||
// If the surface is either modulated or colormapped, or both
|
// If the surface is either modulated or colormapped, or both
|
||||||
if (CurrentPolyFlags & (PF_Modulated | PF_ColorMapped))
|
if (CurrentPolyFlags & (PF_Modulated | PF_ColorMapped))
|
||||||
{
|
{
|
||||||
poly.red = byte2float[pSurf->PolyColor.s.red];
|
// If modulated, mix the surface colour to the texture
|
||||||
poly.green = byte2float[pSurf->PolyColor.s.green];
|
if (CurrentPolyFlags & PF_Modulated)
|
||||||
poly.blue = byte2float[pSurf->PolyColor.s.blue];
|
pglColor4ubv((GLubyte*)&pSurf->PolyColor.s);
|
||||||
poly.alpha = byte2float[pSurf->PolyColor.s.alpha];
|
|
||||||
}
|
|
||||||
|
|
||||||
// Only if the surface is colormapped
|
poly.red = byte2float(pSurf->PolyColor.s.red);
|
||||||
if (CurrentPolyFlags & PF_ColorMapped)
|
poly.green = byte2float(pSurf->PolyColor.s.green);
|
||||||
{
|
poly.blue = byte2float(pSurf->PolyColor.s.blue);
|
||||||
tint.red = byte2float[pSurf->TintColor.s.red];
|
poly.alpha = byte2float(pSurf->PolyColor.s.alpha);
|
||||||
tint.green = byte2float[pSurf->TintColor.s.green];
|
|
||||||
tint.blue = byte2float[pSurf->TintColor.s.blue];
|
|
||||||
tint.alpha = byte2float[pSurf->TintColor.s.alpha];
|
|
||||||
|
|
||||||
fade.red = byte2float[pSurf->FadeColor.s.red];
|
// Only if the surface is colormapped
|
||||||
fade.green = byte2float[pSurf->FadeColor.s.green];
|
if (CurrentPolyFlags & PF_ColorMapped)
|
||||||
fade.blue = byte2float[pSurf->FadeColor.s.blue];
|
|
||||||
fade.alpha = byte2float[pSurf->FadeColor.s.alpha];
|
|
||||||
|
|
||||||
if (pSurf->LightTableId && pSurf->LightTableId != lt_downloaded)
|
|
||||||
{
|
{
|
||||||
pglActiveTexture(GL_TEXTURE2);
|
tint.red = byte2float(pSurf->TintColor.s.red);
|
||||||
pglBindTexture(GL_TEXTURE_2D, pSurf->LightTableId);
|
tint.green = byte2float(pSurf->TintColor.s.green);
|
||||||
pglActiveTexture(GL_TEXTURE0);
|
tint.blue = byte2float(pSurf->TintColor.s.blue);
|
||||||
lt_downloaded = pSurf->LightTableId;
|
tint.alpha = byte2float(pSurf->TintColor.s.alpha);
|
||||||
|
|
||||||
|
fade.red = byte2float(pSurf->FadeColor.s.red);
|
||||||
|
fade.green = byte2float(pSurf->FadeColor.s.green);
|
||||||
|
fade.blue = byte2float(pSurf->FadeColor.s.blue);
|
||||||
|
fade.alpha = byte2float(pSurf->FadeColor.s.alpha);
|
||||||
|
|
||||||
|
if (pSurf->LightTableId && pSurf->LightTableId != lt_downloaded)
|
||||||
|
{
|
||||||
|
pglActiveTexture(GL_TEXTURE2);
|
||||||
|
pglBindTexture(GL_TEXTURE_2D, pSurf->LightTableId);
|
||||||
|
pglActiveTexture(GL_TEXTURE0);
|
||||||
|
lt_downloaded = pSurf->LightTableId;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -2962,24 +2928,24 @@ void GL_DrawModelEx(model_t *model, INT32 frameIndex, float duration, float tics
|
|||||||
pol = 0.0f;
|
pol = 0.0f;
|
||||||
}
|
}
|
||||||
|
|
||||||
poly.red = byte2float[Surface->PolyColor.s.red];
|
poly.red = byte2float(Surface->PolyColor.s.red);
|
||||||
poly.green = byte2float[Surface->PolyColor.s.green];
|
poly.green = byte2float(Surface->PolyColor.s.green);
|
||||||
poly.blue = byte2float[Surface->PolyColor.s.blue];
|
poly.blue = byte2float(Surface->PolyColor.s.blue);
|
||||||
poly.alpha = byte2float[Surface->PolyColor.s.alpha];
|
poly.alpha = byte2float(Surface->PolyColor.s.alpha);
|
||||||
|
|
||||||
pglColor4ubv((GLubyte*)&Surface->PolyColor.s);
|
pglColor4ubv((GLubyte*)&Surface->PolyColor.s);
|
||||||
|
|
||||||
GL_SetBlend(((poly.alpha < 1) ? Surface->PolyFlags : (PF_Masked|PF_Occlude))|PF_Modulated);
|
GL_SetBlend(((poly.alpha < 1) ? Surface->PolyFlags : (PF_Masked|PF_Occlude))|PF_Modulated);
|
||||||
|
|
||||||
tint.red = byte2float[Surface->TintColor.s.red];
|
tint.red = byte2float(Surface->TintColor.s.red);
|
||||||
tint.green = byte2float[Surface->TintColor.s.green];
|
tint.green = byte2float(Surface->TintColor.s.green);
|
||||||
tint.blue = byte2float[Surface->TintColor.s.blue];
|
tint.blue = byte2float(Surface->TintColor.s.blue);
|
||||||
tint.alpha = byte2float[Surface->TintColor.s.alpha];
|
tint.alpha = byte2float(Surface->TintColor.s.alpha);
|
||||||
|
|
||||||
fade.red = byte2float[Surface->FadeColor.s.red];
|
fade.red = byte2float(Surface->FadeColor.s.red);
|
||||||
fade.green = byte2float[Surface->FadeColor.s.green];
|
fade.green = byte2float(Surface->FadeColor.s.green);
|
||||||
fade.blue = byte2float[Surface->FadeColor.s.blue];
|
fade.blue = byte2float(Surface->FadeColor.s.blue);
|
||||||
fade.alpha = byte2float[Surface->FadeColor.s.alpha];
|
fade.alpha = byte2float(Surface->FadeColor.s.alpha);
|
||||||
|
|
||||||
if (Surface->LightTableId && Surface->LightTableId != lt_downloaded)
|
if (Surface->LightTableId && Surface->LightTableId != lt_downloaded)
|
||||||
{
|
{
|
||||||
@@ -3136,8 +3102,8 @@ void GL_DrawModelEx(model_t *model, INT32 frameIndex, float duration, float tics
|
|||||||
void GL_SetTransform(FTransform *stransform)
|
void GL_SetTransform(FTransform *stransform)
|
||||||
{
|
{
|
||||||
static boolean special_splitscreen;
|
static boolean special_splitscreen;
|
||||||
GLdouble used_fov;
|
|
||||||
boolean shearing = false;
|
boolean shearing = false;
|
||||||
|
float used_fov;
|
||||||
|
|
||||||
pglLoadIdentity();
|
pglLoadIdentity();
|
||||||
|
|
||||||
@@ -3187,7 +3153,8 @@ void GL_SetTransform(FTransform *stransform)
|
|||||||
{
|
{
|
||||||
float dy = stransform->viewaiming * 2;
|
float dy = stransform->viewaiming * 2;
|
||||||
|
|
||||||
if (stransform->fliptype == TRANSFORM_FLIP || stransform->fliptype == TRANSFORM_MIRRORFLIP)
|
if (stransform->fliptype == TRANSFORM_FLIP
|
||||||
|
|| stransform->fliptype == TRANSFORM_MIRRORFLIP)
|
||||||
dy *= -1.0f;
|
dy *= -1.0f;
|
||||||
|
|
||||||
pglTranslatef(0.0f, -dy/BASEVIDHEIGHT, 0.0f);
|
pglTranslatef(0.0f, -dy/BASEVIDHEIGHT, 0.0f);
|
||||||
@@ -3195,11 +3162,13 @@ void GL_SetTransform(FTransform *stransform)
|
|||||||
|
|
||||||
if (special_splitscreen)
|
if (special_splitscreen)
|
||||||
{
|
{
|
||||||
used_fov = (float)(atan(tan(used_fov * M_PIl / 360) * 0.8) * 360 / M_PIl);
|
used_fov = (atanf(tanf(used_fov * M_PIf / 360.0f) * 0.8f) * 360.0f / M_PIf);
|
||||||
GL_Perspective((GLfloat)used_fov, 2*ASPECT_RATIO);
|
GL_Perspective(used_fov, 2*ASPECT_RATIO);
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
GL_Perspective((GLfloat)used_fov, ASPECT_RATIO);
|
{
|
||||||
|
GL_Perspective(used_fov, ASPECT_RATIO);
|
||||||
|
}
|
||||||
|
|
||||||
pglGetFloatv(GL_PROJECTION_MATRIX, projMatrix); // added for new coronas' code (without depth buffer)
|
pglGetFloatv(GL_PROJECTION_MATRIX, projMatrix); // added for new coronas' code (without depth buffer)
|
||||||
pglMatrixMode(GL_MODELVIEW);
|
pglMatrixMode(GL_MODELVIEW);
|
||||||
@@ -3333,8 +3302,8 @@ void GL_Framebuffer_Disable(void)
|
|||||||
// delet our fbo
|
// delet our fbo
|
||||||
if (framebufferobject.fboobj)
|
if (framebufferobject.fboobj)
|
||||||
pglDeleteFramebuffers(1, &framebufferobject.fboobj);
|
pglDeleteFramebuffers(1, &framebufferobject.fboobj);
|
||||||
|
|
||||||
framebufferobject.fboobj = 0;
|
framebufferobject.fboobj = 0;
|
||||||
|
|
||||||
GL_Framebuffer_DeleteAttachments();
|
GL_Framebuffer_DeleteAttachments();
|
||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
@@ -3464,7 +3433,7 @@ void GL_FlushScreenTextures(void)
|
|||||||
|
|
||||||
void GL_DrawScreenTexture(int tex, FSurfaceInfo *surf, FBITFIELD polyflags)
|
void GL_DrawScreenTexture(int tex, FSurfaceInfo *surf, FBITFIELD polyflags)
|
||||||
{
|
{
|
||||||
float fix[8];
|
static float fix[8];
|
||||||
float xfix, yfix;
|
float xfix, yfix;
|
||||||
|
|
||||||
if (gl_enable_screen_textures != 2)
|
if (gl_enable_screen_textures != 2)
|
||||||
@@ -3473,14 +3442,8 @@ void GL_DrawScreenTexture(int tex, FSurfaceInfo *surf, FBITFIELD polyflags)
|
|||||||
xfix = 1/((float)screen_texsizew/(float)screen_width);
|
xfix = 1/((float)screen_texsizew/(float)screen_width);
|
||||||
yfix = 1/((float)screen_texsizeh/(float)screen_height);
|
yfix = 1/((float)screen_texsizeh/(float)screen_height);
|
||||||
|
|
||||||
fix[0] = 0.0f;
|
fix[3] = fix[5] = yfix;
|
||||||
fix[1] = 0.0f;
|
fix[4] = fix[6] = xfix;
|
||||||
fix[2] = 0.0f;
|
|
||||||
fix[3] = yfix;
|
|
||||||
fix[4] = xfix;
|
|
||||||
fix[5] = yfix;
|
|
||||||
fix[6] = xfix;
|
|
||||||
fix[7] = 0.0f;
|
|
||||||
|
|
||||||
pglClear(GL_COLOR_BUFFER_BIT|GL_DEPTH_BUFFER_BIT);
|
pglClear(GL_COLOR_BUFFER_BIT|GL_DEPTH_BUFFER_BIT);
|
||||||
|
|
||||||
@@ -3714,7 +3677,13 @@ void GL_DrawScreenFinalTexture(int tex, INT32 width, INT32 height, boolean usesh
|
|||||||
float origaspect, newaspect;
|
float origaspect, newaspect;
|
||||||
float xoff = 1, yoff = 1; // xoffset and yoffset for the polygon to have black bars around the screen
|
float xoff = 1, yoff = 1; // xoffset and yoffset for the polygon to have black bars around the screen
|
||||||
|
|
||||||
static float off[12];
|
static float off[12] =
|
||||||
|
{
|
||||||
|
1.0f, 1.0f, 1.0f, 1.0f,
|
||||||
|
1.0f, 1.0f, 1.0f, 1.0f,
|
||||||
|
1.0f, 1.0f, 1.0f, 1.0f
|
||||||
|
};
|
||||||
|
|
||||||
static float fix[8];
|
static float fix[8];
|
||||||
|
|
||||||
if (gl_enable_screen_textures != 2)
|
if (gl_enable_screen_textures != 2)
|
||||||
@@ -3738,28 +3707,14 @@ void GL_DrawScreenFinalTexture(int tex, INT32 width, INT32 height, boolean usesh
|
|||||||
}
|
}
|
||||||
|
|
||||||
// float off[12];
|
// float off[12];
|
||||||
off[0] = -xoff;
|
off[0] = off[3] = -xoff;
|
||||||
off[1] = -yoff;
|
off[1] = off[10] = -yoff;
|
||||||
off[2] = 1.0f;
|
off[4] = off[7] = yoff;
|
||||||
off[3] = -xoff;
|
off[6] = off[9] = xoff;
|
||||||
off[4] = yoff;
|
|
||||||
off[5] = 1.0f;
|
|
||||||
off[6] = xoff;
|
|
||||||
off[7] = yoff;
|
|
||||||
off[8] = 1.0f;
|
|
||||||
off[9] = xoff;
|
|
||||||
off[10] = -yoff;
|
|
||||||
off[11] = 1.0f;
|
|
||||||
|
|
||||||
// float fix[8];
|
// float fix[8];
|
||||||
fix[0] = 0.0f;
|
fix[3] = fix[5] = yfix;
|
||||||
fix[1] = 0.0f;
|
fix[4] = fix[6] = xfix;
|
||||||
fix[2] = 0.0f;
|
|
||||||
fix[3] = yfix;
|
|
||||||
fix[4] = xfix;
|
|
||||||
fix[5] = yfix;
|
|
||||||
fix[6] = xfix;
|
|
||||||
fix[7] = 0.0f;
|
|
||||||
|
|
||||||
pglViewport(0, 0, width, height);
|
pglViewport(0, 0, width, height);
|
||||||
|
|
||||||
|
|||||||
@@ -27,7 +27,7 @@ extern "C" {
|
|||||||
#ifdef HAVE_SDL
|
#ifdef HAVE_SDL
|
||||||
#define _MATH_DEFINES_DEFINED
|
#define _MATH_DEFINES_DEFINED
|
||||||
|
|
||||||
#include "SDL_opengl.h" //Alam_GBC: Simple, yes?
|
#include <SDL3/SDL_opengl.h> //Alam_GBC: Simple, yes?
|
||||||
|
|
||||||
#else
|
#else
|
||||||
#include <GL/gl.h>
|
#include <GL/gl.h>
|
||||||
@@ -38,8 +38,6 @@ extern "C" {
|
|||||||
#endif
|
#endif
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#define _CREATE_DLL_ // necessary for Unix AND Windows
|
|
||||||
|
|
||||||
#include "../../doomdef.h"
|
#include "../../doomdef.h"
|
||||||
#include "../hw_gl.h"
|
#include "../hw_gl.h"
|
||||||
#include "../../z_zone.h"
|
#include "../../z_zone.h"
|
||||||
@@ -69,7 +67,6 @@ extern boolean supportstencil;
|
|||||||
void *GetGLFunc(const char *proc);
|
void *GetGLFunc(const char *proc);
|
||||||
boolean SetupGLfunc(void);
|
boolean SetupGLfunc(void);
|
||||||
void SetupGLFunc4(void);
|
void SetupGLFunc4(void);
|
||||||
void GL_Flush(void);
|
|
||||||
INT32 GL_isExtAvailable(const char *extension, const GLubyte *start);
|
INT32 GL_isExtAvailable(const char *extension, const GLubyte *start);
|
||||||
void GL_SetModelView(GLint w, GLint h);
|
void GL_SetModelView(GLint w, GLint h);
|
||||||
void GL_SetStates(void);
|
void GL_SetStates(void);
|
||||||
@@ -127,18 +124,9 @@ extern GLint maximumAnisotropy;
|
|||||||
extern boolean supportNPO2tex;
|
extern boolean supportNPO2tex;
|
||||||
extern boolean supportMipMap;
|
extern boolean supportMipMap;
|
||||||
|
|
||||||
/** \brief OpenGL flags for video driver
|
extern GLfloat modelMatrix[16];
|
||||||
*/
|
|
||||||
extern INT32 oglflags;
|
|
||||||
|
|
||||||
extern GLfloat projMatrix[16];
|
extern GLfloat projMatrix[16];
|
||||||
|
|
||||||
typedef enum
|
|
||||||
{
|
|
||||||
GLF_NOZBUFREAD = 0x01,
|
|
||||||
GLF_NOTEXENV = 0x02,
|
|
||||||
} oglflags_t;
|
|
||||||
|
|
||||||
#ifdef __cplusplus
|
#ifdef __cplusplus
|
||||||
} // extern "C"
|
} // extern "C"
|
||||||
#endif
|
#endif
|
||||||
|
|||||||
+123
-74
@@ -68,47 +68,48 @@
|
|||||||
//-------------------------------------------
|
//-------------------------------------------
|
||||||
// heads up font
|
// heads up font
|
||||||
//-------------------------------------------
|
//-------------------------------------------
|
||||||
patch_t *hu_font[HU_FONTSIZE];
|
patch_t *hu_font[HU_FONTSIZE] = {};
|
||||||
patch_t *kart_font[KART_FONTSIZE]; // SRB2kart
|
patch_t *kart_font[KART_FONTSIZE] = {}; // SRB2kart
|
||||||
patch_t *tny_font[HU_FONTSIZE];
|
patch_t *tny_font[HU_FONTSIZE] = {};
|
||||||
patch_t *tallnum[10]; // 0-9
|
patch_t *tallnum[10] = {}; // 0-9
|
||||||
|
|
||||||
// Level title and credits fonts
|
// Level title and credits fonts
|
||||||
patch_t *lt_font[LT_FONTSIZE];
|
patch_t *lt_font[LT_FONTSIZE] = {};
|
||||||
patch_t *cred_font[CRED_FONTSIZE];
|
patch_t *cred_font[CRED_FONTSIZE] = {};
|
||||||
|
|
||||||
// ping font
|
// ping font
|
||||||
// Note: I'd like to adress that at this point we might *REALLY* want to work towards a common drawString function that can take any font we want because this is really turning into a MESS. :V -Lat'
|
// Note: I'd like to adress that at this point we might *REALLY* want to work towards a common drawString function that can take any font we want because this is really turning into a MESS. :V -Lat'
|
||||||
patch_t *pingnum[10];
|
patch_t *pingnum[10] = {};
|
||||||
patch_t *pinggfx[5]; // small ping graphic
|
patch_t *pinggfx[5] = {}; // small ping graphic
|
||||||
patch_t *pingmeasure[2]; // ping measurement graphic
|
patch_t *pingmeasure[2] = {}; // ping measurement graphic
|
||||||
|
|
||||||
patch_t *ranknum[10]; // rank numbers
|
patch_t *ranknum[10] = {}; // rank numbers
|
||||||
|
|
||||||
patch_t *framecounter;
|
patch_t *framecounter = NULL;
|
||||||
patch_t *frameslash; // framerate stuff. Used in screen.c
|
patch_t *frameslash = NULL; // framerate stuff. Used in screen.c
|
||||||
|
|
||||||
static player_t *plr;
|
patch_t *srb2back = NULL;
|
||||||
boolean chat_on; // entering a chat message?
|
|
||||||
|
static player_t *plr = NULL;
|
||||||
|
boolean chat_on = false; // entering a chat message?
|
||||||
static char w_chat_buf[HU_MAXMSGLEN + 1];
|
static char w_chat_buf[HU_MAXMSGLEN + 1];
|
||||||
static textinput_t w_chat;
|
static textinput_t w_chat;
|
||||||
static boolean headsupactive = false;
|
static boolean headsupactive = false;
|
||||||
boolean hu_showscores; // draw rankings
|
boolean hu_showscores = false; // draw rankings
|
||||||
static char hu_tick;
|
static char hu_tick;
|
||||||
static tic_t hu_emoteanim = 0;
|
static tic_t hu_emoteanim = 0;
|
||||||
#define MAXEMOTESUGGESTIONS 8
|
emote_autocomplete_t emote_autocomplete = {0};
|
||||||
static emote_t *emote_suggestions[MAXEMOTESUGGESTIONS] = {0};
|
|
||||||
|
|
||||||
static huddrawlist_h luahuddrawlist_scores;
|
static huddrawlist_h luahuddrawlist_scores = NULL;
|
||||||
|
|
||||||
patch_t *rflagico;
|
patch_t *rflagico = NULL;
|
||||||
patch_t *bflagico;
|
patch_t *bflagico = NULL;
|
||||||
patch_t *rmatcico;
|
patch_t *rmatcico = NULL;
|
||||||
patch_t *bmatcico;
|
patch_t *bmatcico = NULL;
|
||||||
patch_t *tallminus;
|
patch_t *tallminus = NULL;
|
||||||
|
|
||||||
// song credits
|
// song credits
|
||||||
static patch_t *songcreditbg;
|
static patch_t *songcreditbg = NULL;
|
||||||
|
|
||||||
// -------
|
// -------
|
||||||
// protos.
|
// protos.
|
||||||
@@ -122,7 +123,7 @@ consvar_t cv_showspecstuff = {"showspecstuff", "No", CV_SAVE, CV_YesNo, NULL, 0,
|
|||||||
// KEYBOARD LAYOUTS FOR ENTERING TEXT
|
// KEYBOARD LAYOUTS FOR ENTERING TEXT
|
||||||
//======================================================================
|
//======================================================================
|
||||||
|
|
||||||
char *shiftxform;
|
char *shiftxform = NULL;
|
||||||
|
|
||||||
char english_shiftxform[] =
|
char english_shiftxform[] =
|
||||||
{
|
{
|
||||||
@@ -291,6 +292,7 @@ void HU_LoadGraphics(void)
|
|||||||
return;
|
return;
|
||||||
|
|
||||||
j = HU_FONTSTART;
|
j = HU_FONTSTART;
|
||||||
|
|
||||||
for (i = 0; i < HU_FONTSIZE; i++, j++)
|
for (i = 0; i < HU_FONTSIZE; i++, j++)
|
||||||
{
|
{
|
||||||
// cache the heads-up font for entire game execution
|
// cache the heads-up font for entire game execution
|
||||||
@@ -361,21 +363,21 @@ void HU_LoadGraphics(void)
|
|||||||
cred_font[i] = (patch_t *)W_CachePatchName(buffer, PU_HUDGFX);
|
cred_font[i] = (patch_t *)W_CachePatchName(buffer, PU_HUDGFX);
|
||||||
}
|
}
|
||||||
|
|
||||||
//cache numbers too!
|
// cache numbers too!
|
||||||
for (i = 0; i < 10; i++)
|
for (i = 0; i < 10; i++)
|
||||||
{
|
{
|
||||||
sprintf(buffer, "STTNUM%d", i);
|
sprintf(buffer, "STTNUM%d", i);
|
||||||
tallnum[i] = (patch_t *)W_CachePatchName(buffer, PU_HUDGFX);
|
tallnum[i] = (patch_t *)W_CachePatchName(buffer, PU_HUDGFX);
|
||||||
sprintf(buffer, "PINGN%d", i);
|
sprintf(buffer, "PINGN%d", i);
|
||||||
pingnum[i] = (patch_t *) W_CachePatchName(buffer, PU_HUDGFX);
|
pingnum[i] = (patch_t *)W_CachePatchName(buffer, PU_HUDGFX);
|
||||||
sprintf(buffer, "OPPRNK0%d", i);
|
sprintf(buffer, "OPPRNK0%d", i);
|
||||||
ranknum[i] = (patch_t *) W_CachePatchName(buffer, PU_HUDGFX);
|
ranknum[i] = (patch_t *)W_CachePatchName(buffer, PU_HUDGFX);
|
||||||
}
|
}
|
||||||
|
|
||||||
// minus for negative tallnums
|
// minus for negative tallnums
|
||||||
tallminus = (patch_t *)W_CachePatchName("STTMINUS", PU_HUDGFX);
|
tallminus = (patch_t *)W_CachePatchName("STTMINUS", PU_HUDGFX);
|
||||||
|
|
||||||
songcreditbg = W_CachePatchName("K_SONGCR", PU_HUDGFX);
|
songcreditbg = (patch_t *)W_CachePatchName("K_SONGCR", PU_HUDGFX);
|
||||||
|
|
||||||
// cache ping gfx:
|
// cache ping gfx:
|
||||||
for (i = 0; i < 5; i++)
|
for (i = 0; i < 5; i++)
|
||||||
@@ -384,12 +386,15 @@ void HU_LoadGraphics(void)
|
|||||||
pinggfx[i] = (patch_t *)W_CachePatchName(buffer, PU_HUDGFX);
|
pinggfx[i] = (patch_t *)W_CachePatchName(buffer, PU_HUDGFX);
|
||||||
}
|
}
|
||||||
|
|
||||||
pingmeasure[0] = W_CachePatchName("PINGD", PU_HUDGFX);
|
pingmeasure[0] = (patch_t *)W_CachePatchName("PINGD", PU_HUDGFX);
|
||||||
pingmeasure[1] = W_CachePatchName("PINGMS", PU_HUDGFX);
|
pingmeasure[1] = (patch_t *)W_CachePatchName("PINGMS", PU_HUDGFX);
|
||||||
|
|
||||||
// fps stuff
|
// fps stuff
|
||||||
framecounter = W_CachePatchName("FRAMER", PU_HUDGFX);
|
framecounter = (patch_t *)W_CachePatchName("FRAMER", PU_HUDGFX);
|
||||||
frameslash = W_CachePatchName("FRAMESL", PU_HUDGFX);;
|
frameslash = (patch_t *)W_CachePatchName("FRAMESL", PU_HUDGFX);
|
||||||
|
|
||||||
|
// idk where else to put this lul
|
||||||
|
srb2back = (patch_t *)W_CachePatchName("SRB2BACK", PU_HUDGFX);
|
||||||
}
|
}
|
||||||
|
|
||||||
// Initialise Heads up
|
// Initialise Heads up
|
||||||
@@ -406,8 +411,10 @@ void HU_Init(void)
|
|||||||
// set shift translation table
|
// set shift translation table
|
||||||
shiftxform = english_shiftxform;
|
shiftxform = english_shiftxform;
|
||||||
|
|
||||||
luahuddrawlist_scores = LUA_HUD_CreateDrawList();
|
if (dedicated || rendermode == render_none)
|
||||||
|
return;
|
||||||
|
|
||||||
|
luahuddrawlist_scores = LUA_HUD_CreateDrawList();
|
||||||
HU_LoadGraphics();
|
HU_LoadGraphics();
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -589,12 +596,12 @@ static void DoSayCommand(SINT8 target, size_t usedargs, UINT8 flags)
|
|||||||
}
|
}
|
||||||
|
|
||||||
// Only servers/admins can CSAY.
|
// Only servers/admins can CSAY.
|
||||||
if(!server && !(IsPlayerAdmin(consoleplayer)))
|
if (!server && !(IsPlayerAdmin(consoleplayer)))
|
||||||
flags &= ~HU_CSAY;
|
flags &= ~HU_CSAY;
|
||||||
|
|
||||||
// We handle HU_SERVER_SAY, not the caller.
|
// We handle HU_SERVER_SAY, not the caller.
|
||||||
flags &= ~HU_SERVER_SAY;
|
flags &= ~HU_SERVER_SAY;
|
||||||
if(dedicated && !(flags & HU_CSAY))
|
if (dedicated && !(flags & HU_CSAY))
|
||||||
flags |= HU_SERVER_SAY;
|
flags |= HU_SERVER_SAY;
|
||||||
|
|
||||||
buf[0] = target;
|
buf[0] = target;
|
||||||
@@ -608,17 +615,20 @@ static void DoSayCommand(SINT8 target, size_t usedargs, UINT8 flags)
|
|||||||
strlcat(msg, COM_Argv(ix + usedargs), msgspace);
|
strlcat(msg, COM_Argv(ix + usedargs), msgspace);
|
||||||
}
|
}
|
||||||
|
|
||||||
if (strlen(msg) > 4 && strnicmp(msg, "/pm", 3) == 0) // used /pm
|
const size_t msglength = strlen(msg);
|
||||||
|
|
||||||
|
if (msglength > 4 && strnicmp(msg, "/pm", 3) == 0) // used /pm
|
||||||
{
|
{
|
||||||
// what we're gonna do now is check if the node exists
|
// what we're gonna do now is check if the node exists
|
||||||
// with that logic, characters 4 and 5 are our numbers:
|
// with that logic, characters 4 and 5 are our numbers:
|
||||||
const char *newmsg;
|
const char *newmsg;
|
||||||
INT32 spc = 1; // used if nodenum[1] is a space.
|
INT32 spc = 1; // used if nodenum[1] is a space.
|
||||||
char *nodenum = (char*) malloc(3);
|
CLEANUP(pfree) char *nodenum = (char*) malloc(3);
|
||||||
memcpy(nodenum, msg+3, 2);
|
memcpy(nodenum, msg+3, 2);
|
||||||
nodenum[2] = '\0';
|
nodenum[2] = '\0';
|
||||||
|
|
||||||
// check for undesirable characters in our "number"
|
// check for undesirable characters in our "number"
|
||||||
if (((nodenum[0] < '0') || (nodenum[0] > '9')) || ((nodenum[1] < '0') || (nodenum[1] > '9')))
|
if (((nodenum[0] < '0') || (nodenum[0] > '9')) || ((nodenum[1] < '0') || (nodenum[1] > '9')))
|
||||||
{
|
{
|
||||||
// check if nodenum[1] is a space
|
// check if nodenum[1] is a space
|
||||||
if (nodenum[1] == ' ')
|
if (nodenum[1] == ' ')
|
||||||
@@ -627,23 +637,21 @@ static void DoSayCommand(SINT8 target, size_t usedargs, UINT8 flags)
|
|||||||
else
|
else
|
||||||
{
|
{
|
||||||
HU_AddChatText("\x82NOTICE: \x80Invalid command format. Correct format is \'/pm<node> \'.", false);
|
HU_AddChatText("\x82NOTICE: \x80Invalid command format. Correct format is \'/pm<node> \'.", false);
|
||||||
free(nodenum);
|
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
// I'm very bad at C, I swear I am, additional checks eww!
|
// I'm very bad at C, I swear I am, additional checks eww!
|
||||||
if (spc != 0)
|
if (spc != 0)
|
||||||
{
|
{
|
||||||
if (msg[5] != ' ')
|
if (msg[5] != ' ')
|
||||||
{
|
{
|
||||||
HU_AddChatText("\x82NOTICE: \x80Invalid command format. Correct format is \'/pm<node> \'.", false);
|
HU_AddChatText("\x82NOTICE: \x80Invalid command format. Correct format is \'/pm<node> \'.", false);
|
||||||
free(nodenum);
|
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
target = atoi((const char*) nodenum); // turn that into a number
|
target = atoi((const char*) nodenum); // turn that into a number
|
||||||
free(nodenum);
|
|
||||||
//CONS_Printf("%d\n", target);
|
//CONS_Printf("%d\n", target);
|
||||||
|
|
||||||
// check for target player, if it doesn't exist then we can't send the message!
|
// check for target player, if it doesn't exist then we can't send the message!
|
||||||
@@ -654,12 +662,13 @@ static void DoSayCommand(SINT8 target, size_t usedargs, UINT8 flags)
|
|||||||
HU_AddChatText(va("\x82NOTICE: \x80Player %d does not exist.", target), false); // same
|
HU_AddChatText(va("\x82NOTICE: \x80Player %d does not exist.", target), false); // same
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
buf[0] = target;
|
buf[0] = target;
|
||||||
newmsg = msg+5+spc;
|
newmsg = msg+5+spc;
|
||||||
strlcpy(msg, newmsg, HU_MAXMSGLEN + 1);
|
strlcpy(msg, newmsg, HU_MAXMSGLEN + 1);
|
||||||
}
|
}
|
||||||
|
|
||||||
SendNetXCmd(XD_SAY, buf, strlen(msg) + 1 + msg-buf);
|
SendNetXCmd(XD_SAY, buf, msglength + 1 + msg-buf);
|
||||||
}
|
}
|
||||||
|
|
||||||
/** Send a message to everyone.
|
/** Send a message to everyone.
|
||||||
@@ -910,10 +919,12 @@ static void Got_Saycmd(const UINT8 **p, INT32 playernum)
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
const size_t msglength = strlen(msg);
|
||||||
|
|
||||||
//check for invalid characters (0x80 or above)
|
//check for invalid characters (0x80 or above)
|
||||||
{
|
{
|
||||||
size_t i;
|
size_t i;
|
||||||
const size_t j = strlen(msg);
|
const size_t j = msglength;
|
||||||
for (i = 0; i < j; i++)
|
for (i = 0; i < j; i++)
|
||||||
{
|
{
|
||||||
if (msg[i] & 0x80)
|
if (msg[i] & 0x80)
|
||||||
@@ -960,7 +971,7 @@ static void Got_Saycmd(const UINT8 **p, INT32 playernum)
|
|||||||
}
|
}
|
||||||
|
|
||||||
// Handle "/me" actions, but only in messages to everyone.
|
// Handle "/me" actions, but only in messages to everyone.
|
||||||
if (target == 0 && strlen(msg) > 4 && strnicmp(msg, "/me ", 4) == 0)
|
if (target == 0 && msglength > 4 && strnicmp(msg, "/me ", 4) == 0)
|
||||||
{
|
{
|
||||||
msg += 4;
|
msg += 4;
|
||||||
action = true;
|
action = true;
|
||||||
@@ -1142,10 +1153,12 @@ static boolean HU_clearChatSpaces(void)
|
|||||||
size_t i = 0; // Used to just check our message
|
size_t i = 0; // Used to just check our message
|
||||||
char c; // current character we're iterating.
|
char c; // current character we're iterating.
|
||||||
boolean nothingbutspaces = true;
|
boolean nothingbutspaces = true;
|
||||||
|
const size_t chatlength = strlen(w_chat_buf);
|
||||||
|
|
||||||
for (; i < strlen(w_chat_buf); i++) // iterate through message and eradicate all spaces that don't belong.
|
for (; i < chatlength; i++) // iterate through message and eradicate all spaces that don't belong.
|
||||||
{
|
{
|
||||||
c = w_chat_buf[i];
|
c = w_chat_buf[i];
|
||||||
|
|
||||||
if (!c)
|
if (!c)
|
||||||
break; // if there's nothing, it's safe to assume our message has ended, so let's not waste any more time here.
|
break; // if there's nothing, it's safe to assume our message has ended, so let's not waste any more time here.
|
||||||
|
|
||||||
@@ -1154,6 +1167,7 @@ static boolean HU_clearChatSpaces(void)
|
|||||||
nothingbutspaces = false;
|
nothingbutspaces = false;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
return nothingbutspaces;
|
return nothingbutspaces;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -1200,11 +1214,11 @@ static void HU_SendChatMessage(void)
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
size_t len = strlen(msg);
|
const size_t msglength = strlen(msg);
|
||||||
|
|
||||||
if (len >= 5 && strnicmp(msg, "/mute", 5) == 0) // Used /mute
|
if (msglength >= 5 && strnicmp(msg, "/mute", 5) == 0) // Used /mute
|
||||||
{
|
{
|
||||||
if (len > 6)
|
if (msglength > 6)
|
||||||
DoMute(msg+6);
|
DoMute(msg+6);
|
||||||
else
|
else
|
||||||
HU_AddChatText("\x82NOTICE: \x80Usage: /mute <name|node>", false);
|
HU_AddChatText("\x82NOTICE: \x80Usage: /mute <name|node>", false);
|
||||||
@@ -1212,7 +1226,7 @@ static void HU_SendChatMessage(void)
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (len > 4 && strnicmp(msg, "/pm", 3) == 0) // used /pm
|
if (msglength > 4 && strnicmp(msg, "/pm", 3) == 0) // used /pm
|
||||||
{
|
{
|
||||||
INT32 spc = 1; // used if nodenum[1] is a space.
|
INT32 spc = 1; // used if nodenum[1] is a space.
|
||||||
const char *newmsg;
|
const char *newmsg;
|
||||||
@@ -1334,6 +1348,7 @@ boolean HU_Responder(event_t *ev)
|
|||||||
chat_on = true;
|
chat_on = true;
|
||||||
w_chat_buf[0] = 0;
|
w_chat_buf[0] = 0;
|
||||||
M_TextInputInit(&w_chat, w_chat_buf, sizeof w_chat_buf);
|
M_TextInputInit(&w_chat, w_chat_buf, sizeof w_chat_buf);
|
||||||
|
memset(&emote_autocomplete, 0, sizeof(emote_autocomplete));
|
||||||
teamtalk = false;
|
teamtalk = false;
|
||||||
chat_scrollmedown = true;
|
chat_scrollmedown = true;
|
||||||
typelines = 1;
|
typelines = 1;
|
||||||
@@ -1346,6 +1361,7 @@ boolean HU_Responder(event_t *ev)
|
|||||||
chat_on = true;
|
chat_on = true;
|
||||||
w_chat_buf[0] = 0;
|
w_chat_buf[0] = 0;
|
||||||
M_TextInputInit(&w_chat, w_chat_buf, sizeof w_chat_buf);
|
M_TextInputInit(&w_chat, w_chat_buf, sizeof w_chat_buf);
|
||||||
|
memset(&emote_autocomplete, 0, sizeof(emote_autocomplete));
|
||||||
teamtalk = G_GametypeHasTeams(); // Don't teamtalk if we don't have teams.
|
teamtalk = G_GametypeHasTeams(); // Don't teamtalk if we don't have teams.
|
||||||
chat_scrollmedown = true;
|
chat_scrollmedown = true;
|
||||||
typelines = 1;
|
typelines = 1;
|
||||||
@@ -1371,9 +1387,9 @@ boolean HU_Responder(event_t *ev)
|
|||||||
&& ev->data1 != gamecontrol[0][gc_talkkey][1]))
|
&& ev->data1 != gamecontrol[0][gc_talkkey][1]))
|
||||||
return false;
|
return false;
|
||||||
|
|
||||||
M_TextInputHandleEmotes(&w_chat, c, emote_suggestions, MAXEMOTESUGGESTIONS);
|
if (M_TextInputHandleEmotes(&w_chat, c, &emote_autocomplete))
|
||||||
|
; // Do nothing
|
||||||
if (c == KEY_ENTER)
|
else if (c == KEY_ENTER)
|
||||||
{
|
{
|
||||||
chat_on = false;
|
chat_on = false;
|
||||||
chat_scrollmedown = true; // you hit enter, so you might wanna autoscroll to see what you just sent. :)
|
chat_scrollmedown = true; // you hit enter, so you might wanna autoscroll to see what you just sent. :)
|
||||||
@@ -1410,8 +1426,6 @@ boolean HU_Responder(event_t *ev)
|
|||||||
// HEADS UP DRAWING
|
// HEADS UP DRAWING
|
||||||
//======================================================================
|
//======================================================================
|
||||||
|
|
||||||
#define HU_DrawEmote(x, y, emote, flags) M_DrawEmote((x), (y), (emote), hu_emoteanim, (flags))
|
|
||||||
|
|
||||||
// Precompile a wordwrapped string to any given width.
|
// Precompile a wordwrapped string to any given width.
|
||||||
// This is a muuuch better method than V_WORDWRAP.
|
// This is a muuuch better method than V_WORDWRAP.
|
||||||
// again stolen and modified a bit from video.c, don't mind me, will need to rearrange this one day.
|
// again stolen and modified a bit from video.c, don't mind me, will need to rearrange this one day.
|
||||||
@@ -1614,7 +1628,7 @@ static void HU_drawMiniChat(void)
|
|||||||
if (cv_chatbacktint.value) // on request of wolfy
|
if (cv_chatbacktint.value) // on request of wolfy
|
||||||
V_DrawFillConsoleMap(x + dx + 2, y+dy, EMOTEWIDTH, charheight, 239|V_SNAPTOBOTTOM|V_SNAPTOLEFT);
|
V_DrawFillConsoleMap(x + dx + 2, y+dy, EMOTEWIDTH, charheight, 239|V_SNAPTOBOTTOM|V_SNAPTOLEFT);
|
||||||
|
|
||||||
HU_DrawEmote(x+dx+2, y+dy, emote, V_SNAPTOBOTTOM|V_SNAPTOLEFT|transflag);
|
M_DrawEmote(x+dx+2, y+dy, emote, V_SNAPTOBOTTOM|V_SNAPTOLEFT|transflag);
|
||||||
dx += EMOTEWIDTH - charwidth;
|
dx += EMOTEWIDTH - charwidth;
|
||||||
|
|
||||||
j += emotelen;
|
j += emotelen;
|
||||||
@@ -1724,7 +1738,7 @@ static void HU_drawChatLog(INT32 offset)
|
|||||||
{
|
{
|
||||||
if ((y+dy+2 >= chat_topy) && (y+dy < (chat_bottomy)))
|
if ((y+dy+2 >= chat_topy) && (y+dy < (chat_bottomy)))
|
||||||
{
|
{
|
||||||
HU_DrawEmote(x+dx+2, y+dy, emote, V_SNAPTOBOTTOM|V_SNAPTOLEFT);
|
M_DrawEmote(x+dx+2, y+dy, emote, V_SNAPTOBOTTOM|V_SNAPTOLEFT);
|
||||||
dx += EMOTEWIDTH - charwidth;
|
dx += EMOTEWIDTH - charwidth;
|
||||||
}
|
}
|
||||||
j += emotelen;
|
j += emotelen;
|
||||||
@@ -1864,7 +1878,7 @@ static void HU_DrawChat(void)
|
|||||||
|
|
||||||
if ((emote = M_VerifyEmote(w_chat_buf+i, &emotelen)))
|
if ((emote = M_VerifyEmote(w_chat_buf+i, &emotelen)))
|
||||||
{
|
{
|
||||||
HU_DrawEmote(chatx + c + 2, y-1, emote, V_SNAPTOBOTTOM|V_SNAPTOLEFT|t);
|
M_DrawEmote(chatx + c + 2, y-1, emote, V_SNAPTOBOTTOM|V_SNAPTOLEFT|t);
|
||||||
c += EMOTEWIDTH - charwidth;
|
c += EMOTEWIDTH - charwidth;
|
||||||
i += emotelen-1;
|
i += emotelen-1;
|
||||||
drawwidth = EMOTEWIDTH;
|
drawwidth = EMOTEWIDTH;
|
||||||
@@ -1901,17 +1915,37 @@ static void HU_DrawChat(void)
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if (emote_suggestions[0])
|
if (emote_autocomplete.emotestart != -1 && (emote_autocomplete.complete[0] || (w_chat.cursor - emote_autocomplete.emotestart) > 1))
|
||||||
{
|
{
|
||||||
|
emote_t *suggest;
|
||||||
|
int skip = 0;
|
||||||
|
|
||||||
|
const char *complete;
|
||||||
|
int complete_len;
|
||||||
|
|
||||||
|
if (emote_autocomplete.complete[0])
|
||||||
|
{
|
||||||
|
complete = emote_autocomplete.complete;
|
||||||
|
complete_len = strlen(complete);
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
complete = &w_chat_buf[emote_autocomplete.emotestart];
|
||||||
|
complete_len = w_chat.cursor - emote_autocomplete.emotestart;
|
||||||
|
}
|
||||||
|
|
||||||
// A bit of copy-paste from /pm code :p
|
// A bit of copy-paste from /pm code :p
|
||||||
INT32 suggesty = chaty - charheight - 1;
|
INT32 suggesty = chaty - charheight - 1;
|
||||||
size_t longest_suggestion_length = 0;
|
size_t longest_suggestion_length = 0;
|
||||||
|
|
||||||
for (i = 0; i < MAXEMOTESUGGESTIONS && emote_suggestions[i]; ++i)
|
while ((suggest = M_FindEmote(complete, complete_len, skip)) != NULL)
|
||||||
{
|
{
|
||||||
longest_suggestion_length = max(longest_suggestion_length, strlen(emote_suggestions[i]->name));
|
longest_suggestion_length = max(longest_suggestion_length, strlen(suggest->name));
|
||||||
|
++skip;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
skip = 0;
|
||||||
|
|
||||||
#ifdef NETSPLITSCREEN
|
#ifdef NETSPLITSCREEN
|
||||||
if (splitscreen)
|
if (splitscreen)
|
||||||
{
|
{
|
||||||
@@ -1923,11 +1957,19 @@ static void HU_DrawChat(void)
|
|||||||
#endif
|
#endif
|
||||||
suggesty -= (cv_kartspeedometer.value ? 16 : 0);
|
suggesty -= (cv_kartspeedometer.value ? 16 : 0);
|
||||||
|
|
||||||
for (i = 0; i < MAXEMOTESUGGESTIONS && emote_suggestions[i]; ++i)
|
while ((suggest = M_FindEmote(complete, complete_len, skip)) != NULL)
|
||||||
{
|
{
|
||||||
V_DrawFillConsoleMap(chatx + boxw + 2, suggesty - (7*i), (longest_suggestion_length+2)*4 + EMOTEWIDTH, 6, 239|V_SNAPTOBOTTOM|V_SNAPTOLEFT);
|
V_DrawFillConsoleMap(chatx + boxw + 2, suggesty - (7*skip), (longest_suggestion_length+2)*4 + EMOTEWIDTH, 6, V_SNAPTOBOTTOM|V_SNAPTOLEFT);
|
||||||
V_DrawSmallString(chatx + boxw + 4 + EMOTEWIDTH, suggesty - (7*i), V_SNAPTOBOTTOM|V_SNAPTOLEFT|V_ALLOWLOWERCASE, va(":%s:", emote_suggestions[i]->name));
|
|
||||||
HU_DrawEmote(chatx + boxw + 2, suggesty - i*7, emote_suggestions[i], V_SNAPTOBOTTOM|V_SNAPTOLEFT);
|
// Highlight currently suggested emote
|
||||||
|
int hlflag = 0;
|
||||||
|
if (skip == emote_autocomplete.skip && emote_autocomplete.complete[0])
|
||||||
|
hlflag = V_YELLOWMAP;
|
||||||
|
|
||||||
|
V_DrawSmallString(chatx + boxw + 4 + EMOTEWIDTH, suggesty - (7*skip), hlflag|V_SNAPTOBOTTOM|V_SNAPTOLEFT|V_ALLOWLOWERCASE, va(":%s:", suggest->name));
|
||||||
|
M_DrawEmote(chatx + boxw + 2, suggesty - skip*7, suggest, V_SNAPTOBOTTOM|V_SNAPTOLEFT);
|
||||||
|
|
||||||
|
++skip;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -1956,7 +1998,7 @@ static void HU_DrawChat(void)
|
|||||||
longest_name_length = max(longest_name_length, strlen(player_names[i]));
|
longest_name_length = max(longest_name_length, strlen(player_names[i]));
|
||||||
}
|
}
|
||||||
|
|
||||||
for(i = 0; i < MAXPLAYERS; i++)
|
for (i = 0; i < MAXPLAYERS; i++)
|
||||||
{
|
{
|
||||||
if (!playeringame[i])
|
if (!playeringame[i])
|
||||||
continue;
|
continue;
|
||||||
@@ -2062,15 +2104,15 @@ static void HU_DrawChat_Old(void)
|
|||||||
i = 0;
|
i = 0;
|
||||||
while (w_chat_buf[i])
|
while (w_chat_buf[i])
|
||||||
{
|
{
|
||||||
if (w_chat.cursor == (i+1) && hu_tick < 4)
|
int emotelen;
|
||||||
{
|
emote_t *emote;
|
||||||
INT32 cursorx = (HU_INPUTX+c+charwidth < vid.width) ? (HU_INPUTX + c + charwidth) : (HU_INPUTX); // we may have to go down.
|
|
||||||
INT32 cursory = (cursorx != HU_INPUTX) ? (y) : (y+charheight);
|
|
||||||
V_DrawCharacter(cursorx, cursory+2*con_scalefactor, '_' |cv_constextsize.value | V_NOSCALESTART|t, !cv_allcaps.value);
|
|
||||||
}
|
|
||||||
|
|
||||||
//Hurdler: isn't it better like that?
|
if ((emote = M_VerifyEmote(w_chat_buf+i, &emotelen)))
|
||||||
if (w_chat_buf[i] >= HU_FONTSTART)
|
{
|
||||||
|
M_DrawScaledEmote((HU_INPUTX + c)<<FRACBITS, (y+con_scalefactor*2)<<FRACBITS, charwidth*FRACUNIT/EMOTEWIDTH, emote, V_NOSCALESTART | V_NOSCALEPATCH | t);
|
||||||
|
i += emotelen-1;
|
||||||
|
}
|
||||||
|
else if (w_chat_buf[i] >= HU_FONTSTART) //Hurdler: isn't it better like that?
|
||||||
{
|
{
|
||||||
//charwidth = hu_font[w_chat[i]-HU_FONTSTART]->width * con_scalefactor;
|
//charwidth = hu_font[w_chat[i]-HU_FONTSTART]->width * con_scalefactor;
|
||||||
V_DrawCharacter(HU_INPUTX + c, y, w_chat_buf[i] | cv_constextsize.value | V_NOSCALESTART | t, !cv_allcaps.value);
|
V_DrawCharacter(HU_INPUTX + c, y, w_chat_buf[i] | cv_constextsize.value | V_NOSCALESTART | t, !cv_allcaps.value);
|
||||||
@@ -2082,6 +2124,13 @@ static void HU_DrawChat_Old(void)
|
|||||||
|
|
||||||
++i;
|
++i;
|
||||||
|
|
||||||
|
if (w_chat.cursor == i && hu_tick < 4)
|
||||||
|
{
|
||||||
|
INT32 cursorx = (HU_INPUTX+c+charwidth < vid.width) ? (HU_INPUTX + c + charwidth) : (HU_INPUTX); // we may have to go down.
|
||||||
|
INT32 cursory = (cursorx != HU_INPUTX) ? (y) : (y+charheight);
|
||||||
|
V_DrawCharacter(cursorx, cursory+2*con_scalefactor, '_' |cv_constextsize.value | V_NOSCALESTART|t, !cv_allcaps.value);
|
||||||
|
}
|
||||||
|
|
||||||
c += charwidth;
|
c += charwidth;
|
||||||
if (c >= vid.width)
|
if (c >= vid.width)
|
||||||
{
|
{
|
||||||
|
|||||||
@@ -90,6 +90,7 @@ extern patch_t *pinggfx[5];
|
|||||||
extern patch_t *ranknum[10];
|
extern patch_t *ranknum[10];
|
||||||
extern patch_t *framecounter;
|
extern patch_t *framecounter;
|
||||||
extern patch_t *frameslash;
|
extern patch_t *frameslash;
|
||||||
|
extern patch_t *srb2back;
|
||||||
extern patch_t *lt_font[LT_FONTSIZE];
|
extern patch_t *lt_font[LT_FONTSIZE];
|
||||||
extern patch_t *cred_font[CRED_FONTSIZE];
|
extern patch_t *cred_font[CRED_FONTSIZE];
|
||||||
extern patch_t *rflagico;
|
extern patch_t *rflagico;
|
||||||
|
|||||||
@@ -41,11 +41,6 @@ typedef enum {
|
|||||||
*/
|
*/
|
||||||
extern UINT8 sound_started;
|
extern UINT8 sound_started;
|
||||||
|
|
||||||
/** \brief info of samplerate
|
|
||||||
*/
|
|
||||||
#if defined(HAVE_SDL) && SOUND==SOUND_SDL
|
|
||||||
extern consvar_t cv_samplerate;
|
|
||||||
#endif
|
|
||||||
|
|
||||||
/** \brief The I_GetSfx function
|
/** \brief The I_GetSfx function
|
||||||
|
|
||||||
@@ -163,8 +158,6 @@ UINT32 I_GetSongLoopPoint(void);
|
|||||||
boolean I_SetSongPosition(UINT32 position);
|
boolean I_SetSongPosition(UINT32 position);
|
||||||
UINT32 I_GetSongPosition(void);
|
UINT32 I_GetSongPosition(void);
|
||||||
|
|
||||||
void I_UpdateSongLagThreshold (void);
|
|
||||||
|
|
||||||
/// ------------------------
|
/// ------------------------
|
||||||
// MUSIC PLAYBACK
|
// MUSIC PLAYBACK
|
||||||
/// ------------------------
|
/// ------------------------
|
||||||
|
|||||||
@@ -61,10 +61,6 @@ precise_t I_GetPreciseTime(void);
|
|||||||
*/
|
*/
|
||||||
UINT64 I_GetPrecisePrecision(void);
|
UINT64 I_GetPrecisePrecision(void);
|
||||||
|
|
||||||
/** \brief Get the current time in rendering tics, including fractions.
|
|
||||||
*/
|
|
||||||
double I_GetFrameTime(void);
|
|
||||||
|
|
||||||
/** \brief Sleeps for the given duration in milliseconds. Depending on the
|
/** \brief Sleeps for the given duration in milliseconds. Depending on the
|
||||||
operating system's scheduler, the calling thread may give up its
|
operating system's scheduler, the calling thread may give up its
|
||||||
time slice for a longer duration. The implementation should give a
|
time slice for a longer duration. The implementation should give a
|
||||||
|
|||||||
+1
-2
@@ -635,7 +635,7 @@ static boolean SOCK_Get(void)
|
|||||||
c = recvfrom(mysockets[n], (char *)&doomcom->data, MAXPACKETLENGTH, 0,
|
c = recvfrom(mysockets[n], (char *)&doomcom->data, MAXPACKETLENGTH, 0,
|
||||||
(void *)&fromaddress, &fromlen);
|
(void *)&fromaddress, &fromlen);
|
||||||
|
|
||||||
if (c != ERRSOCKET)
|
if (c > 0)
|
||||||
{
|
{
|
||||||
#ifdef USE_STUN
|
#ifdef USE_STUN
|
||||||
if (STUN_got_response(doomcom->data, c))
|
if (STUN_got_response(doomcom->data, c))
|
||||||
@@ -649,7 +649,6 @@ static boolean SOCK_Get(void)
|
|||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
// find remote node number
|
// find remote node number
|
||||||
for (j = 1; j <= MAXNETNODES; j++) // include LAN
|
for (j = 1; j <= MAXNETNODES; j++) // include LAN
|
||||||
{
|
{
|
||||||
|
|||||||
+4
-1
@@ -63,7 +63,10 @@ void I_UpdateTime(fixed_t timescale)
|
|||||||
ticratescaled = (double)((float)TICRATE * FixedToFloat(timescale));
|
ticratescaled = (double)((float)TICRATE * FixedToFloat(timescale));
|
||||||
|
|
||||||
enterprecise = I_GetPreciseTime();
|
enterprecise = I_GetPreciseTime();
|
||||||
elapsedseconds = (double)(enterprecise - oldenterprecise) / I_GetPrecisePrecision();
|
const precise_t elapsed = enterprecise - oldenterprecise;
|
||||||
|
const UINT64 precision = I_GetPrecisePrecision();
|
||||||
|
// explictily do this in double precision
|
||||||
|
elapsedseconds = (double)elapsed / (double)precision;
|
||||||
tictimer += elapsedseconds;
|
tictimer += elapsedseconds;
|
||||||
while (tictimer > 1.0/ticratescaled)
|
while (tictimer > 1.0/ticratescaled)
|
||||||
{
|
{
|
||||||
|
|||||||
+2
-18
@@ -95,16 +95,13 @@ INT32 VID_SetMode(INT32 modenum);
|
|||||||
*/
|
*/
|
||||||
const char *VID_GetModeName(INT32 modenum);
|
const char *VID_GetModeName(INT32 modenum);
|
||||||
|
|
||||||
|
void VID_RefreshModeList(void);
|
||||||
void VID_PrepareModeList(void);
|
void VID_PrepareModeList(void);
|
||||||
|
|
||||||
/** \brief can video system do fullscreen
|
/** \brief can video system do fullscreen
|
||||||
*/
|
*/
|
||||||
extern boolean allow_fullscreen;
|
extern boolean allow_fullscreen;
|
||||||
|
|
||||||
/** \brief Update video system without updating frame
|
|
||||||
*/
|
|
||||||
void I_UpdateNoBlit(void);
|
|
||||||
|
|
||||||
/** \brief Update video system with updating frame
|
/** \brief Update video system with updating frame
|
||||||
*/
|
*/
|
||||||
void I_FinishUpdate(void);
|
void I_FinishUpdate(void);
|
||||||
@@ -113,13 +110,6 @@ void I_FinishUpdate(void);
|
|||||||
*/
|
*/
|
||||||
void I_UpdateNoVsync(void);
|
void I_UpdateNoVsync(void);
|
||||||
|
|
||||||
/** \brief Wait for vertical retrace or pause a bit.
|
|
||||||
|
|
||||||
\param count max wait
|
|
||||||
|
|
||||||
\return void
|
|
||||||
*/
|
|
||||||
void I_WaitVBL(INT32 count);
|
|
||||||
|
|
||||||
/** \brief The I_ReadScreen function
|
/** \brief The I_ReadScreen function
|
||||||
|
|
||||||
@@ -129,16 +119,10 @@ void I_WaitVBL(INT32 count);
|
|||||||
*/
|
*/
|
||||||
void I_ReadScreen(UINT8 * restrict scr, INT32 scale);
|
void I_ReadScreen(UINT8 * restrict scr, INT32 scale);
|
||||||
|
|
||||||
/** \brief Start disk icon
|
|
||||||
*/
|
|
||||||
void I_BeginRead(void);
|
|
||||||
|
|
||||||
/** \brief Stop disk icon
|
|
||||||
*/
|
|
||||||
void I_EndRead(void);
|
|
||||||
|
|
||||||
UINT32 I_GetRefreshRate(void);
|
UINT32 I_GetRefreshRate(void);
|
||||||
|
|
||||||
|
boolean I_CheckAboveDesktopRes(INT32 width, INT32 height);
|
||||||
boolean I_CheckNativeRes(void);
|
boolean I_CheckNativeRes(void);
|
||||||
|
|
||||||
void I_SetBorderlessWindow(void);
|
void I_SetBorderlessWindow(void);
|
||||||
|
|||||||
+51
-4
@@ -1076,6 +1076,49 @@ static void K_initKartHUD(void)
|
|||||||
R_InterpolateView(R_GetTimeFrac(RTF_CAMERA), !cv_uncappedhud.value);
|
R_InterpolateView(R_GetTimeFrac(RTF_CAMERA), !cv_uncappedhud.value);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
void K_KartPlayerHUDUpdate(player_t *player)
|
||||||
|
{
|
||||||
|
if (player->kartstuff[k_lapanimation])
|
||||||
|
player->kartstuff[k_lapanimation]--;
|
||||||
|
|
||||||
|
if (player->kartstuff[k_yougotem])
|
||||||
|
player->kartstuff[k_yougotem]--;
|
||||||
|
|
||||||
|
if (G_BattleGametype() && (player->exiting || player->kartstuff[k_comebacktimer]))
|
||||||
|
{
|
||||||
|
if (player->exiting)
|
||||||
|
{
|
||||||
|
if (player->exiting < 6*TICRATE)
|
||||||
|
player->kartstuff[k_cardanimation] += ((164-player->kartstuff[k_cardanimation])/8)+1;
|
||||||
|
else if (player->exiting == 6*TICRATE)
|
||||||
|
player->kartstuff[k_cardanimation] = 0;
|
||||||
|
else if (player->kartstuff[k_cardanimation] < 2*TICRATE)
|
||||||
|
player->kartstuff[k_cardanimation]++;
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
if (player->kartstuff[k_comebacktimer] < 6*TICRATE)
|
||||||
|
player->kartstuff[k_cardanimation] -= ((164-player->kartstuff[k_cardanimation])/8)+1;
|
||||||
|
else if (player->kartstuff[k_comebacktimer] < 9*TICRATE)
|
||||||
|
player->kartstuff[k_cardanimation] += ((164-player->kartstuff[k_cardanimation])/8)+1;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (player->kartstuff[k_cardanimation] > 164)
|
||||||
|
player->kartstuff[k_cardanimation] = 164;
|
||||||
|
if (player->kartstuff[k_cardanimation] < 0)
|
||||||
|
player->kartstuff[k_cardanimation] = 0;
|
||||||
|
}
|
||||||
|
else if (G_RaceGametype() && player->exiting)
|
||||||
|
{
|
||||||
|
if (player->kartstuff[k_cardanimation] < 2*TICRATE)
|
||||||
|
player->kartstuff[k_cardanimation]++;
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
player->kartstuff[k_cardanimation] = 0;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
UINT8 K_GetHudColor(void)
|
UINT8 K_GetHudColor(void)
|
||||||
{
|
{
|
||||||
if (cv_colorizedhud.value && cv_colorizedhudcolor.value)
|
if (cv_colorizedhud.value && cv_colorizedhudcolor.value)
|
||||||
@@ -2860,7 +2903,7 @@ static boolean K_GetScreenCoords(vector2_t *vec, player_t *player, mobj_t *targe
|
|||||||
|
|
||||||
// X coordinate
|
// X coordinate
|
||||||
// get difference between camangle and angle towards target
|
// get difference between camangle and angle towards target
|
||||||
x = (INT32)viewangle - (INT32)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;
|
||||||
@@ -4387,8 +4430,10 @@ static void K_drawLapStartAnim(void)
|
|||||||
UINT8 *colormap = R_GetTranslationColormap(TC_DEFAULT, K_GetHudColor(), GTC_CACHE);
|
UINT8 *colormap = R_GetTranslationColormap(TC_DEFAULT, K_GetHudColor(), GTC_CACHE);
|
||||||
INT32 vflags = V_SNAPTOTOP|V_HUDTRANS;
|
INT32 vflags = V_SNAPTOTOP|V_HUDTRANS;
|
||||||
|
|
||||||
fixed_t slideout = max(0, 32*(((progress - 76)*FRACUNIT) + R_GetTimeFrac(RTF_LEVEL)));
|
fixed_t slideout = 32*(((progress - 76)*FRACUNIT) + R_GetTimeFrac(RTF_LEVEL));
|
||||||
fixed_t slidein = max(0, 32*(((stplyr->kartstuff[k_lapanimation] - 76)*FRACUNIT) - R_GetTimeFrac(RTF_LEVEL)));
|
slideout = max(0, slideout);
|
||||||
|
fixed_t slidein = 32*(((stplyr->kartstuff[k_lapanimation] - 76)*FRACUNIT) - R_GetTimeFrac(RTF_LEVEL));
|
||||||
|
slidein = max(0, slidein);
|
||||||
|
|
||||||
// First, draw the emblem and hand
|
// First, draw the emblem and hand
|
||||||
INT32 emblemx = (BASEVIDWIDTH << (FRACBITS - 1)) + slidein;
|
INT32 emblemx = (BASEVIDWIDTH << (FRACBITS - 1)) + slidein;
|
||||||
@@ -4423,7 +4468,9 @@ static void K_drawLapStartAnim(void)
|
|||||||
V_DrawFixedPatch(leftx, y, FRACUNIT, vflags, kp_lapanim_lap[min(progress/2, 6)], NULL);
|
V_DrawFixedPatch(leftx, y, FRACUNIT, vflags, kp_lapanim_lap[min(progress/2, 6)], NULL);
|
||||||
|
|
||||||
char *lapnum = va("%02d", stplyr->laps + 1);
|
char *lapnum = va("%02d", stplyr->laps + 1);
|
||||||
for (int i = 0; i < (int)strlen(lapnum); i++)
|
const size_t laplength = strlen(lapnum);
|
||||||
|
|
||||||
|
for (int i = 0; i < (int)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));
|
||||||
|
|||||||
+2
-2
@@ -24,7 +24,6 @@ extern "C" {
|
|||||||
UINT8 K_GetHudColor(void);
|
UINT8 K_GetHudColor(void);
|
||||||
boolean K_UseColorHud(void);
|
boolean K_UseColorHud(void);
|
||||||
boolean K_UseHighResPortraits(void);
|
boolean K_UseHighResPortraits(void);
|
||||||
patch_t *K_GetFacePrefix(player_t *player, INT32 skinnum);
|
|
||||||
|
|
||||||
void K_RegisterKartHudStuff(void);
|
void K_RegisterKartHudStuff(void);
|
||||||
|
|
||||||
@@ -35,7 +34,6 @@ extern consvar_t cv_colorizedhud,
|
|||||||
extern consvar_t cv_darkitembox;
|
extern consvar_t cv_darkitembox;
|
||||||
extern consvar_t cv_biglaps;
|
extern consvar_t cv_biglaps;
|
||||||
extern consvar_t cv_highresportrait;
|
extern consvar_t cv_highresportrait;
|
||||||
extern consvar_t cv_stat_xoffset, cv_stat_yoffset;
|
|
||||||
extern consvar_t cv_showstats;
|
extern consvar_t cv_showstats;
|
||||||
extern consvar_t cv_fancyroulette;
|
extern consvar_t cv_fancyroulette;
|
||||||
extern consvar_t cv_showlaptimes;
|
extern consvar_t cv_showlaptimes;
|
||||||
@@ -52,6 +50,8 @@ extern CV_PossibleValue_t inputdisplay_cons_t[NUMINPUTDISPLAYSTUFF];
|
|||||||
#define NUMMINIMAPDOTSTUFF 5
|
#define NUMMINIMAPDOTSTUFF 5
|
||||||
extern CV_PossibleValue_t minimapdot_cons_t[NUMMINIMAPDOTSTUFF];
|
extern CV_PossibleValue_t minimapdot_cons_t[NUMMINIMAPDOTSTUFF];
|
||||||
|
|
||||||
|
void K_KartPlayerHUDUpdate(player_t *player);
|
||||||
|
|
||||||
const char *K_GetItemPatch(UINT8 item, boolean tiny);
|
const char *K_GetItemPatch(UINT8 item, boolean tiny);
|
||||||
INT32 K_calcSplitFlags(INT32 snapflags);
|
INT32 K_calcSplitFlags(INT32 snapflags);
|
||||||
void K_LoadKartHUDGraphics(void);
|
void K_LoadKartHUDGraphics(void);
|
||||||
|
|||||||
+48
-72
@@ -98,8 +98,6 @@ static void saltyhop_onchange(void)
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
static boolean K_SpeedLinesShouldBlend(player_t *player);
|
|
||||||
|
|
||||||
// SOME IMPORTANT VARIABLES DEFINED IN DOOMDEF.H:
|
// SOME IMPORTANT VARIABLES DEFINED IN DOOMDEF.H:
|
||||||
// gamespeed is cc (0 for easy, 1 for normal, 2 for hard)
|
// gamespeed is cc (0 for easy, 1 for normal, 2 for hard)
|
||||||
// franticitems is Frantic Mode items, bool
|
// franticitems is Frantic Mode items, bool
|
||||||
@@ -811,8 +809,10 @@ boolean K_IsPlayerLosing(player_t *player)
|
|||||||
boolean K_IsPlayerWanted(player_t *player)
|
boolean K_IsPlayerWanted(player_t *player)
|
||||||
{
|
{
|
||||||
UINT8 i;
|
UINT8 i;
|
||||||
if (!(G_BattleGametype()))
|
|
||||||
|
if (!G_BattleGametype())
|
||||||
return false;
|
return false;
|
||||||
|
|
||||||
for (i = 0; i < 4; i++)
|
for (i = 0; i < 4; i++)
|
||||||
{
|
{
|
||||||
if (battlewanted[i] == -1)
|
if (battlewanted[i] == -1)
|
||||||
@@ -820,6 +820,7 @@ boolean K_IsPlayerWanted(player_t *player)
|
|||||||
if (player == &players[battlewanted[i]])
|
if (player == &players[battlewanted[i]])
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -1244,7 +1245,9 @@ static void K_KartItemRoulette(player_t *player, ticcmd_t *cmd)
|
|||||||
{
|
{
|
||||||
if (!playeringame[i] || players[i].spectator)
|
if (!playeringame[i] || players[i].spectator)
|
||||||
continue;
|
continue;
|
||||||
|
|
||||||
pingame++;
|
pingame++;
|
||||||
|
|
||||||
if (players[i].exiting)
|
if (players[i].exiting)
|
||||||
dontforcespb = true;
|
dontforcespb = true;
|
||||||
if (players[i].kartstuff[k_bumper] > bestbumper)
|
if (players[i].kartstuff[k_bumper] > bestbumper)
|
||||||
@@ -1258,13 +1261,11 @@ static void K_KartItemRoulette(player_t *player, ticcmd_t *cmd)
|
|||||||
// This makes the roulette produce the random noises.
|
// This makes the roulette produce the random noises.
|
||||||
if ((player->kartstuff[k_itemroulette] % 3) == 1 && P_IsDisplayPlayer(player))
|
if ((player->kartstuff[k_itemroulette] % 3) == 1 && P_IsDisplayPlayer(player))
|
||||||
{
|
{
|
||||||
#define PLAYROULETTESND S_StartSound(NULL, sfx_itrol1 + ((player->kartstuff[k_itemroulette] / 3) % 8))
|
|
||||||
for (i = 0; i <= splitscreen; i++)
|
for (i = 0; i <= splitscreen; i++)
|
||||||
{
|
{
|
||||||
if (player == &players[displayplayers[i]] && players[displayplayers[i]].kartstuff[k_itemroulette])
|
if (player == &players[displayplayers[i]] && players[displayplayers[i]].kartstuff[k_itemroulette])
|
||||||
PLAYROULETTESND;
|
S_StartSound(NULL, sfx_itrol1 + ((player->kartstuff[k_itemroulette] / 3) % 8));
|
||||||
}
|
}
|
||||||
#undef PLAYROULETTESND
|
|
||||||
}
|
}
|
||||||
|
|
||||||
roulettestop = TICRATE + (3*(pingame - player->kartstuff[k_position]));
|
roulettestop = TICRATE + (3*(pingame - player->kartstuff[k_position]));
|
||||||
@@ -1363,8 +1364,9 @@ static fixed_t K_GetMobjWeight(mobj_t *mobj, mobj_t *against)
|
|||||||
else
|
else
|
||||||
{
|
{
|
||||||
weight = (mobj->player->kartweight)<<FRACBITS;
|
weight = (mobj->player->kartweight)<<FRACBITS;
|
||||||
if (mobj->player->speed > K_GetKartSpeed(mobj->player, false))
|
const fixed_t kartspeed = K_GetKartSpeed(mobj->player, false);
|
||||||
weight += (mobj->player->speed - K_GetKartSpeed(mobj->player, false))/8;
|
if (mobj->player->speed > kartspeed)
|
||||||
|
weight += (mobj->player->speed - kartspeed)/8;
|
||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
case MT_FALLINGROCK:
|
case MT_FALLINGROCK:
|
||||||
@@ -1486,9 +1488,9 @@ void K_KartBouncing(mobj_t *mobj1, mobj_t *mobj2, boolean bounce, boolean solid)
|
|||||||
}
|
}
|
||||||
|
|
||||||
// if the speed difference is less than this let's assume they're going proportionately faster from each other
|
// if the speed difference is less than this let's assume they're going proportionately faster from each other
|
||||||
if (P_AproxDistance(momdifx, momdify) < (25*mapobjectscale))
|
const fixed_t momdiflength = P_AproxDistance(momdifx, momdify);
|
||||||
|
if (momdiflength < (25*mapobjectscale))
|
||||||
{
|
{
|
||||||
fixed_t momdiflength = P_AproxDistance(momdifx, momdify);
|
|
||||||
fixed_t normalisedx = FixedDiv(momdifx, momdiflength);
|
fixed_t normalisedx = FixedDiv(momdifx, momdiflength);
|
||||||
fixed_t normalisedy = FixedDiv(momdify, momdiflength);
|
fixed_t normalisedy = FixedDiv(momdify, momdiflength);
|
||||||
momdifx = FixedMul((25*mapobjectscale), normalisedx);
|
momdifx = FixedMul((25*mapobjectscale), normalisedx);
|
||||||
@@ -1652,7 +1654,7 @@ static void K_UpdateOffroad(player_t *player)
|
|||||||
// If you are in offroad, a timer starts.
|
// If you are in offroad, a timer starts.
|
||||||
if (offroadstrength)
|
if (offroadstrength)
|
||||||
{
|
{
|
||||||
if (/*K_CheckOffroadCollide(player->mo) &&*/ player->kartstuff[k_offroad] == 0) // With the way offroad is detected now that first check is no longer necessary. -Lat'
|
if (/*K_CheckOffroadCollide(player->mo) &&*/ player->kartstuff[k_offroad] == 0) // With the way offroad is detected now that first check is no longer necessary. -Lat'
|
||||||
player->kartstuff[k_offroad] = (TICRATE/2);
|
player->kartstuff[k_offroad] = (TICRATE/2);
|
||||||
|
|
||||||
if (player->kartstuff[k_offroad] > 0)
|
if (player->kartstuff[k_offroad] > 0)
|
||||||
@@ -2396,7 +2398,7 @@ void K_SpinPlayer(player_t *player, mobj_t *source, INT32 type, mobj_t *inflicto
|
|||||||
|| player->kartstuff[k_invincibilitytimer] > 0 || player->kartstuff[k_growshrinktimer] > 0 || player->kartstuff[k_hyudorotimer] > 0
|
|| player->kartstuff[k_invincibilitytimer] > 0 || player->kartstuff[k_growshrinktimer] > 0 || player->kartstuff[k_hyudorotimer] > 0
|
||||||
|| (G_BattleGametype() && ((player->kartstuff[k_bumper] <= 0 && player->kartstuff[k_comebacktimer]) || player->kartstuff[k_comebackmode] == 1)))
|
|| (G_BattleGametype() && ((player->kartstuff[k_bumper] <= 0 && player->kartstuff[k_comebacktimer]) || player->kartstuff[k_comebackmode] == 1)))
|
||||||
{
|
{
|
||||||
if (!force) // if shoulddamage force, we go THROUGH that.
|
if (!force) // if shoulddamage force, we go THROUGH that.
|
||||||
{
|
{
|
||||||
K_DoInstashield(player);
|
K_DoInstashield(player);
|
||||||
return;
|
return;
|
||||||
@@ -2441,6 +2443,7 @@ void K_SpinPlayer(player_t *player, mobj_t *source, INT32 type, mobj_t *inflicto
|
|||||||
P_SetScale(karmahitbox, player->mo->scale);
|
P_SetScale(karmahitbox, player->mo->scale);
|
||||||
CONS_Printf(M_GetText("%s lost all of their bumpers!\n"), player_names[player-players]);
|
CONS_Printf(M_GetText("%s lost all of their bumpers!\n"), player_names[player-players]);
|
||||||
}
|
}
|
||||||
|
|
||||||
player->kartstuff[k_bumper]--;
|
player->kartstuff[k_bumper]--;
|
||||||
if (K_IsPlayerWanted(player))
|
if (K_IsPlayerWanted(player))
|
||||||
K_CalculateBattleWanted();
|
K_CalculateBattleWanted();
|
||||||
@@ -2575,6 +2578,7 @@ void K_SquishPlayer(player_t *player, mobj_t *source, mobj_t *inflictor)
|
|||||||
P_SetScale(karmahitbox, player->mo->scale);
|
P_SetScale(karmahitbox, player->mo->scale);
|
||||||
CONS_Printf(M_GetText("%s lost all of their bumpers!\n"), player_names[player-players]);
|
CONS_Printf(M_GetText("%s lost all of their bumpers!\n"), player_names[player-players]);
|
||||||
}
|
}
|
||||||
|
|
||||||
player->kartstuff[k_bumper]--;
|
player->kartstuff[k_bumper]--;
|
||||||
if (K_IsPlayerWanted(player))
|
if (K_IsPlayerWanted(player))
|
||||||
K_CalculateBattleWanted();
|
K_CalculateBattleWanted();
|
||||||
@@ -2694,6 +2698,7 @@ void K_ExplodePlayer(player_t *player, mobj_t *source, mobj_t *inflictor) // A b
|
|||||||
P_SetScale(karmahitbox, player->mo->scale);
|
P_SetScale(karmahitbox, player->mo->scale);
|
||||||
CONS_Printf(M_GetText("%s lost all of their bumpers!\n"), player_names[player-players]);
|
CONS_Printf(M_GetText("%s lost all of their bumpers!\n"), player_names[player-players]);
|
||||||
}
|
}
|
||||||
|
|
||||||
player->kartstuff[k_bumper]--;
|
player->kartstuff[k_bumper]--;
|
||||||
if (K_IsPlayerWanted(player))
|
if (K_IsPlayerWanted(player))
|
||||||
K_CalculateBattleWanted();
|
K_CalculateBattleWanted();
|
||||||
@@ -2854,9 +2859,9 @@ void K_SpawnKartExplosion(fixed_t x, fixed_t y, fixed_t z, fixed_t radius, INT32
|
|||||||
for (i = 0; i < number; i++)
|
for (i = 0; i < number; i++)
|
||||||
{
|
{
|
||||||
fa = (i*degrees);
|
fa = (i*degrees);
|
||||||
v[0] = FixedMul(FINECOSINE(fa),radius);
|
v[0] = FixedMul(FINECOSINE(fa), radius);
|
||||||
v[1] = 0;
|
v[1] = 0;
|
||||||
v[2] = FixedMul(FINESINE(fa),radius);
|
v[2] = FixedMul(FINESINE(fa), radius);
|
||||||
v[3] = FRACUNIT;
|
v[3] = FRACUNIT;
|
||||||
|
|
||||||
res = VectorMatrixMultiply(v, *RotateXMatrix(rotangle));
|
res = VectorMatrixMultiply(v, *RotateXMatrix(rotangle));
|
||||||
@@ -3425,7 +3430,7 @@ boolean K_CheckSlopeRollDist(mobj_t *mobj)
|
|||||||
return true;
|
return true;
|
||||||
|
|
||||||
const fixed_t rolldist = (cv_sloperolldist.value * mapobjectscale);
|
const fixed_t rolldist = (cv_sloperolldist.value * mapobjectscale);
|
||||||
const fixed_t m_dist = (R_QuickCamDist(mobj->x, mobj->y) << FRACBITS);
|
const fixed_t m_dist = R_QuickCamDist(mobj->x, mobj->y);
|
||||||
|
|
||||||
return (m_dist <= rolldist);
|
return (m_dist <= rolldist);
|
||||||
}
|
}
|
||||||
@@ -3606,7 +3611,7 @@ void K_SpawnSparkleTrail(mobj_t *mo)
|
|||||||
|
|
||||||
sparkle->color = mo->color;
|
sparkle->color = mo->color;
|
||||||
|
|
||||||
if (cv_playerblendeffects.value && mo->player && K_SpeedLinesShouldBlend(mo->player))
|
if (mo->player && K_PlayerEffectsShouldBlend(mo->player))
|
||||||
sparkle->blendmode = AST_ADD;
|
sparkle->blendmode = AST_ADD;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -3980,15 +3985,19 @@ void K_PuntMine(mobj_t *thismine, mobj_t *punter)
|
|||||||
mine->floorz = thismine->floorz;
|
mine->floorz = thismine->floorz;
|
||||||
mine->ceilingz = thismine->ceilingz;
|
mine->ceilingz = thismine->ceilingz;
|
||||||
|
|
||||||
//Since we aren't using P_KillMobj, we need to clean up the hnext reference
|
// Copy interp data
|
||||||
{
|
mine->old_angle = thismine->old_angle;
|
||||||
P_SetTarget(&thismine->target->hnext, NULL); //target is the player who owns the mine
|
mine->old_x = thismine->old_x;
|
||||||
thismine->target->player->kartstuff[k_bananadrag] = 0;
|
mine->old_y = thismine->old_y;
|
||||||
thismine->target->player->kartstuff[k_itemheld] = 0;
|
mine->old_z = thismine->old_z;
|
||||||
|
|
||||||
if (--thismine->target->player->kartstuff[k_itemamount] <= 0)
|
// Since we aren't using P_KillMobj, we need to clean up the hnext reference
|
||||||
thismine->target->player->kartstuff[k_itemtype] = KITEM_NONE;
|
P_SetTarget(&thismine->target->hnext, NULL); // target is the player who owns the mine
|
||||||
}
|
thismine->target->player->kartstuff[k_bananadrag] = 0;
|
||||||
|
thismine->target->player->kartstuff[k_itemheld] = 0;
|
||||||
|
|
||||||
|
if (--thismine->target->player->kartstuff[k_itemamount] <= 0)
|
||||||
|
thismine->target->player->kartstuff[k_itemtype] = KITEM_NONE;
|
||||||
|
|
||||||
P_RemoveMobj(thismine);
|
P_RemoveMobj(thismine);
|
||||||
|
|
||||||
@@ -4424,6 +4433,12 @@ void K_DropHnextList(player_t *player)
|
|||||||
dropwork->floorz = work->floorz;
|
dropwork->floorz = work->floorz;
|
||||||
dropwork->ceilingz = work->ceilingz;
|
dropwork->ceilingz = work->ceilingz;
|
||||||
|
|
||||||
|
// Copy interp data
|
||||||
|
dropwork->old_angle = work->old_angle;
|
||||||
|
dropwork->old_x = work->old_x;
|
||||||
|
dropwork->old_y = work->old_y;
|
||||||
|
dropwork->old_z = work->old_z;
|
||||||
|
|
||||||
if (ponground)
|
if (ponground)
|
||||||
{
|
{
|
||||||
// floorz and ceilingz aren't properly set to account for FOFs and Polyobjects on spawn
|
// floorz and ceilingz aren't properly set to account for FOFs and Polyobjects on spawn
|
||||||
@@ -4506,7 +4521,7 @@ void K_DropItems(player_t *player)
|
|||||||
{
|
{
|
||||||
mobj_t *drop = P_SpawnMobj(player->mo->x, player->mo->y, player->mo->z + player->mo->height/2, MT_FLOATINGITEM);
|
mobj_t *drop = P_SpawnMobj(player->mo->x, player->mo->y, player->mo->z + player->mo->height/2, MT_FLOATINGITEM);
|
||||||
P_SetScale(drop, drop->scale>>4);
|
P_SetScale(drop, drop->scale>>4);
|
||||||
drop->destscale = (3*drop->destscale)/2;;
|
drop->destscale = (3*drop->destscale)/2;
|
||||||
|
|
||||||
drop->angle = player->mo->angle + ANGLE_90;
|
drop->angle = player->mo->angle + ANGLE_90;
|
||||||
P_Thrust(drop,
|
P_Thrust(drop,
|
||||||
@@ -5329,53 +5344,13 @@ static void K_UpdateInvincibilitySounds(player_t *player)
|
|||||||
#undef STOPTHIS
|
#undef STOPTHIS
|
||||||
}
|
}
|
||||||
|
|
||||||
void K_KartPlayerHUDUpdate(player_t *player)
|
boolean K_PlayerEffectsShouldBlend(player_t *player)
|
||||||
{
|
|
||||||
if (player->kartstuff[k_lapanimation])
|
|
||||||
player->kartstuff[k_lapanimation]--;
|
|
||||||
|
|
||||||
if (player->kartstuff[k_yougotem])
|
|
||||||
player->kartstuff[k_yougotem]--;
|
|
||||||
|
|
||||||
if (G_BattleGametype() && (player->exiting || player->kartstuff[k_comebacktimer]))
|
|
||||||
{
|
|
||||||
if (player->exiting)
|
|
||||||
{
|
|
||||||
if (player->exiting < 6*TICRATE)
|
|
||||||
player->kartstuff[k_cardanimation] += ((164-player->kartstuff[k_cardanimation])/8)+1;
|
|
||||||
else if (player->exiting == 6*TICRATE)
|
|
||||||
player->kartstuff[k_cardanimation] = 0;
|
|
||||||
else if (player->kartstuff[k_cardanimation] < 2*TICRATE)
|
|
||||||
player->kartstuff[k_cardanimation]++;
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
if (player->kartstuff[k_comebacktimer] < 6*TICRATE)
|
|
||||||
player->kartstuff[k_cardanimation] -= ((164-player->kartstuff[k_cardanimation])/8)+1;
|
|
||||||
else if (player->kartstuff[k_comebacktimer] < 9*TICRATE)
|
|
||||||
player->kartstuff[k_cardanimation] += ((164-player->kartstuff[k_cardanimation])/8)+1;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (player->kartstuff[k_cardanimation] > 164)
|
|
||||||
player->kartstuff[k_cardanimation] = 164;
|
|
||||||
if (player->kartstuff[k_cardanimation] < 0)
|
|
||||||
player->kartstuff[k_cardanimation] = 0;
|
|
||||||
}
|
|
||||||
else if (G_RaceGametype() && player->exiting)
|
|
||||||
{
|
|
||||||
if (player->kartstuff[k_cardanimation] < 2*TICRATE)
|
|
||||||
player->kartstuff[k_cardanimation]++;
|
|
||||||
}
|
|
||||||
else
|
|
||||||
player->kartstuff[k_cardanimation] = 0;
|
|
||||||
}
|
|
||||||
|
|
||||||
static boolean K_SpeedLinesShouldBlend(player_t *player)
|
|
||||||
{
|
{
|
||||||
if (!cv_playerblendeffects.value || !player->mo)
|
if (!cv_playerblendeffects.value || !player->mo)
|
||||||
return false;
|
return false;
|
||||||
|
|
||||||
if (player->kartstuff[k_sneakertimer])
|
if (player->kartstuff[k_sneakertimer] ||
|
||||||
|
player->kartstuff[k_invincibilitytimer])
|
||||||
return true;
|
return true;
|
||||||
|
|
||||||
// this is how the percentage speedometer calcs, i suck at maths so this was the easiest thing to do lmao
|
// this is how the percentage speedometer calcs, i suck at maths so this was the easiest thing to do lmao
|
||||||
@@ -5460,7 +5435,7 @@ FUNCINLINE static ATTRINLINE void K_SpawnNormalSpeedLines(player_t *player, bool
|
|||||||
fast->colorized = true;
|
fast->colorized = true;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (colorSpeed && K_SpeedLinesShouldBlend(player))
|
if (colorSpeed && K_PlayerEffectsShouldBlend(player))
|
||||||
fast->blendmode = AST_ADD;
|
fast->blendmode = AST_ADD;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -6128,6 +6103,7 @@ static void K_KartDrift(player_t *player, boolean onground)
|
|||||||
else
|
else
|
||||||
player->kartstuff[k_brakedrift] = 0;
|
player->kartstuff[k_brakedrift] = 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
//
|
//
|
||||||
// K_KartUpdatePosition
|
// K_KartUpdatePosition
|
||||||
//
|
//
|
||||||
@@ -6316,7 +6292,7 @@ void K_MoveKartPlayer(player_t *player, boolean onground)
|
|||||||
|
|
||||||
K_KartUpdatePosition(player);
|
K_KartUpdatePosition(player);
|
||||||
|
|
||||||
if (LIKELY(!player->exiting))
|
if (!player->exiting)
|
||||||
{
|
{
|
||||||
if (player->kartstuff[k_oldposition] < player->kartstuff[k_position]) // But first, if you lost a place,
|
if (player->kartstuff[k_oldposition] < player->kartstuff[k_position]) // But first, if you lost a place,
|
||||||
{
|
{
|
||||||
@@ -6479,7 +6455,7 @@ void K_MoveKartPlayer(player_t *player, boolean onground)
|
|||||||
}
|
}
|
||||||
player->kartstuff[k_invincibilitytimer] = itemtime+(2*TICRATE); // 10 seconds
|
player->kartstuff[k_invincibilitytimer] = itemtime+(2*TICRATE); // 10 seconds
|
||||||
|
|
||||||
if (P_IsLocalPlayer(player) && cv_supermusic.value == 1 && cv_birdmusic.value)
|
if (cv_supermusic.value == 1 && P_IsLocalPlayer(player))
|
||||||
S_ChangeMusicSpecial("kinvnc");
|
S_ChangeMusicSpecial("kinvnc");
|
||||||
|
|
||||||
P_RestoreMusic(player);
|
P_RestoreMusic(player);
|
||||||
@@ -6683,7 +6659,7 @@ void K_MoveKartPlayer(player_t *player, boolean onground)
|
|||||||
if (cv_kartdebugshrink.value && !modeattacking && !player->bot)
|
if (cv_kartdebugshrink.value && !modeattacking && !player->bot)
|
||||||
player->mo->destscale = (6*player->mo->destscale)/8;
|
player->mo->destscale = (6*player->mo->destscale)/8;
|
||||||
player->kartstuff[k_growshrinktimer] = itemtime+(4*TICRATE); // 12 seconds
|
player->kartstuff[k_growshrinktimer] = itemtime+(4*TICRATE); // 12 seconds
|
||||||
if (P_IsLocalPlayer(player) && cv_growmusic.value == 1 && cv_birdmusic.value )
|
if (cv_growmusic.value == 1 && P_IsLocalPlayer(player))
|
||||||
S_ChangeMusicSpecial("kgrow");
|
S_ChangeMusicSpecial("kgrow");
|
||||||
P_RestoreMusic(player);
|
P_RestoreMusic(player);
|
||||||
S_StartSound(player->mo, sfx_kc5a);
|
S_StartSound(player->mo, sfx_kc5a);
|
||||||
|
|||||||
+1
-1
@@ -41,7 +41,7 @@ void K_FlipFromObject(mobj_t *mo, mobj_t *master);
|
|||||||
void K_MatchGenericExtraFlags(mobj_t *mo, mobj_t *master);
|
void K_MatchGenericExtraFlags(mobj_t *mo, mobj_t *master);
|
||||||
void K_RespawnChecker(player_t *player);
|
void K_RespawnChecker(player_t *player);
|
||||||
void K_KartMoveAnimation(player_t *player);
|
void K_KartMoveAnimation(player_t *player);
|
||||||
void K_KartPlayerHUDUpdate(player_t *player);
|
boolean K_PlayerEffectsShouldBlend(player_t *player);
|
||||||
void K_KartPlayerThink(player_t *player, ticcmd_t *cmd);
|
void K_KartPlayerThink(player_t *player, ticcmd_t *cmd);
|
||||||
void K_KartPlayerAfterThink(player_t *player);
|
void K_KartPlayerAfterThink(player_t *player);
|
||||||
void K_DoInstashield(player_t *player);
|
void K_DoInstashield(player_t *player);
|
||||||
|
|||||||
+31
-8
@@ -384,7 +384,9 @@ static int lib_pSpawnMobj(lua_State *L)
|
|||||||
NOHUD
|
NOHUD
|
||||||
if (type >= NUMMOBJTYPES)
|
if (type >= NUMMOBJTYPES)
|
||||||
return luaL_error(L, "mobj type %d out of range (0 - %d)", type, NUMMOBJTYPES-1);
|
return luaL_error(L, "mobj type %d out of range (0 - %d)", type, NUMMOBJTYPES-1);
|
||||||
LUA_PushUserdata(L, P_SpawnMobj(x, y, z, type), META_MOBJ);
|
mobj_t *th = P_SpawnMobj(x, y, z, type);
|
||||||
|
if (!P_MobjWasRemoved(th)) th->islocal = !hook_important;
|
||||||
|
LUA_PushUserdata(L, th, META_MOBJ);
|
||||||
return 1;
|
return 1;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -410,7 +412,9 @@ static int lib_pSpawnMissile(lua_State *L)
|
|||||||
return LUA_ErrInvalid(L, "mobj_t");
|
return LUA_ErrInvalid(L, "mobj_t");
|
||||||
if (type >= NUMMOBJTYPES)
|
if (type >= NUMMOBJTYPES)
|
||||||
return luaL_error(L, "mobj type %d out of range (0 - %d)", type, NUMMOBJTYPES-1);
|
return luaL_error(L, "mobj type %d out of range (0 - %d)", type, NUMMOBJTYPES-1);
|
||||||
LUA_PushUserdata(L, P_SpawnMissile(source, dest, type), META_MOBJ);
|
mobj_t *th = P_SpawnMissile(source, dest, type);
|
||||||
|
if (!P_MobjWasRemoved(th)) th->islocal = !hook_important;
|
||||||
|
LUA_PushUserdata(L, th, META_MOBJ);
|
||||||
return 1;
|
return 1;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -427,7 +431,9 @@ static int lib_pSpawnXYZMissile(lua_State *L)
|
|||||||
return LUA_ErrInvalid(L, "mobj_t");
|
return LUA_ErrInvalid(L, "mobj_t");
|
||||||
if (type >= NUMMOBJTYPES)
|
if (type >= NUMMOBJTYPES)
|
||||||
return luaL_error(L, "mobj type %d out of range (0 - %d)", type, NUMMOBJTYPES-1);
|
return luaL_error(L, "mobj type %d out of range (0 - %d)", type, NUMMOBJTYPES-1);
|
||||||
LUA_PushUserdata(L, P_SpawnXYZMissile(source, dest, type, x, y, z), META_MOBJ);
|
mobj_t *th = P_SpawnXYZMissile(source, dest, type, x, y, z);
|
||||||
|
if (!P_MobjWasRemoved(th)) th->islocal = !hook_important;
|
||||||
|
LUA_PushUserdata(L, th, META_MOBJ);
|
||||||
return 1;
|
return 1;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -446,7 +452,9 @@ static int lib_pSpawnPointMissile(lua_State *L)
|
|||||||
return LUA_ErrInvalid(L, "mobj_t");
|
return LUA_ErrInvalid(L, "mobj_t");
|
||||||
if (type >= NUMMOBJTYPES)
|
if (type >= NUMMOBJTYPES)
|
||||||
return luaL_error(L, "mobj type %d out of range (0 - %d)", type, NUMMOBJTYPES-1);
|
return luaL_error(L, "mobj type %d out of range (0 - %d)", type, NUMMOBJTYPES-1);
|
||||||
LUA_PushUserdata(L, P_SpawnPointMissile(source, xa, ya, za, type, x, y, z), META_MOBJ);
|
mobj_t *th = P_SpawnPointMissile(source, xa, ya, za, type, x, y, z);
|
||||||
|
if (!P_MobjWasRemoved(th)) th->islocal = !hook_important;
|
||||||
|
LUA_PushUserdata(L, th, META_MOBJ);
|
||||||
return 1;
|
return 1;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -463,7 +471,9 @@ static int lib_pSpawnAlteredDirectionMissile(lua_State *L)
|
|||||||
return LUA_ErrInvalid(L, "mobj_t");
|
return LUA_ErrInvalid(L, "mobj_t");
|
||||||
if (type >= NUMMOBJTYPES)
|
if (type >= NUMMOBJTYPES)
|
||||||
return luaL_error(L, "mobj type %d out of range (0 - %d)", type, NUMMOBJTYPES-1);
|
return luaL_error(L, "mobj type %d out of range (0 - %d)", type, NUMMOBJTYPES-1);
|
||||||
LUA_PushUserdata(L, P_SpawnAlteredDirectionMissile(source, type, x, y, z, shiftingAngle), META_MOBJ);
|
mobj_t *th = P_SpawnAlteredDirectionMissile(source, type, x, y, z, shiftingAngle);
|
||||||
|
if (!P_MobjWasRemoved(th)) th->islocal = !hook_important;
|
||||||
|
LUA_PushUserdata(L, th, META_MOBJ);
|
||||||
return 1;
|
return 1;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -492,7 +502,9 @@ static int lib_pSPMAngle(lua_State *L)
|
|||||||
return LUA_ErrInvalid(L, "mobj_t");
|
return LUA_ErrInvalid(L, "mobj_t");
|
||||||
if (type >= NUMMOBJTYPES)
|
if (type >= NUMMOBJTYPES)
|
||||||
return luaL_error(L, "mobj type %d out of range (0 - %d)", type, NUMMOBJTYPES-1);
|
return luaL_error(L, "mobj type %d out of range (0 - %d)", type, NUMMOBJTYPES-1);
|
||||||
LUA_PushUserdata(L, P_SPMAngle(source, type, angle, allowaim, flags2), META_MOBJ);
|
mobj_t *th = P_SPMAngle(source, type, angle, allowaim, flags2);
|
||||||
|
if (!P_MobjWasRemoved(th)) th->islocal = !hook_important;
|
||||||
|
LUA_PushUserdata(L, th, META_MOBJ);
|
||||||
return 1;
|
return 1;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -506,7 +518,9 @@ static int lib_pSpawnPlayerMissile(lua_State *L)
|
|||||||
return LUA_ErrInvalid(L, "mobj_t");
|
return LUA_ErrInvalid(L, "mobj_t");
|
||||||
if (type >= NUMMOBJTYPES)
|
if (type >= NUMMOBJTYPES)
|
||||||
return luaL_error(L, "mobj type %d out of range (0 - %d)", type, NUMMOBJTYPES-1);
|
return luaL_error(L, "mobj type %d out of range (0 - %d)", type, NUMMOBJTYPES-1);
|
||||||
LUA_PushUserdata(L, P_SpawnPlayerMissile(source, type, flags2), META_MOBJ);
|
mobj_t *th = P_SpawnPlayerMissile(source, type, flags2);
|
||||||
|
if (!P_MobjWasRemoved(th)) th->islocal = !hook_important;
|
||||||
|
LUA_PushUserdata(L, th, META_MOBJ);
|
||||||
return 1;
|
return 1;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -3042,7 +3056,13 @@ static int lib_gSetPlayerGamepadIndicatorColor(lua_State *L)
|
|||||||
{
|
{
|
||||||
INT32 player = -1;
|
INT32 player = -1;
|
||||||
player_t *plr = *((player_t **)luaL_checkudata(L, 1, META_PLAYER)); // retrieve player
|
player_t *plr = *((player_t **)luaL_checkudata(L, 1, META_PLAYER)); // retrieve player
|
||||||
UINT16 color = (UINT16)luaL_checkinteger(L, 2); // skincolor
|
UINT8 color = (UINT8)luaL_checkinteger(L, 2); // skincolor
|
||||||
|
|
||||||
|
if (!plr)
|
||||||
|
return LUA_ErrInvalid(L, "player_t");
|
||||||
|
|
||||||
|
if (color >= MAXTRANSLATIONS)
|
||||||
|
return luaL_error(L, "color %d out of range (0 - %d).", color, MAXTRANSLATIONS-1);
|
||||||
|
|
||||||
for (int i = 0; i < MAXSPLITSCREENPLAYERS; ++i)
|
for (int i = 0; i < MAXSPLITSCREENPLAYERS; ++i)
|
||||||
{
|
{
|
||||||
@@ -3070,6 +3090,9 @@ static int lib_gPlayerDeviceRumble(lua_State *L)
|
|||||||
UINT16 high_strength = (UINT16)luaL_checkinteger(L, 3); // high frequency rumble motor strenght
|
UINT16 high_strength = (UINT16)luaL_checkinteger(L, 3); // high frequency rumble motor strenght
|
||||||
UINT32 duration = (UINT32)luaL_optinteger(L, 4, 84); // duration of rumble in ms
|
UINT32 duration = (UINT32)luaL_optinteger(L, 4, 84); // duration of rumble in ms
|
||||||
|
|
||||||
|
if (!plr)
|
||||||
|
return LUA_ErrInvalid(L, "player_t");
|
||||||
|
|
||||||
for (int i = 0; i < MAXSPLITSCREENPLAYERS; ++i)
|
for (int i = 0; i < MAXSPLITSCREENPLAYERS; ++i)
|
||||||
{
|
{
|
||||||
if (plr - players == displayplayers[i])
|
if (plr - players == displayplayers[i])
|
||||||
|
|||||||
@@ -109,6 +109,7 @@ ENUM (STRING_HOOK);
|
|||||||
|
|
||||||
extern boolean hook_cmd_running; // This is used by PlayerCmd and lua_playerlib to prevent anything from being wirtten to player while we run PlayerCmd.
|
extern boolean hook_cmd_running; // This is used by PlayerCmd and lua_playerlib to prevent anything from being wirtten to player while we run PlayerCmd.
|
||||||
extern int hook_defrosting;
|
extern int hook_defrosting;
|
||||||
|
extern bool hook_important;
|
||||||
|
|
||||||
void LUA_HookVoid(int hook);
|
void LUA_HookVoid(int hook);
|
||||||
void LUA_HookHUD(int hook, huddrawlist_h drawlist);
|
void LUA_HookHUD(int hook, huddrawlist_h drawlist);
|
||||||
|
|||||||
+26
-4
@@ -19,6 +19,7 @@
|
|||||||
#include "b_bot.h"
|
#include "b_bot.h"
|
||||||
#include "z_zone.h"
|
#include "z_zone.h"
|
||||||
#include "m_perfstats.h"
|
#include "m_perfstats.h"
|
||||||
|
#include "w_wad.h"
|
||||||
|
|
||||||
#include "lua_script.h"
|
#include "lua_script.h"
|
||||||
#include "lua_libs.h"
|
#include "lua_libs.h"
|
||||||
@@ -39,14 +40,20 @@ LIST (stringHookNames, STRING_HOOK_LIST);
|
|||||||
|
|
||||||
#undef LIST
|
#undef LIST
|
||||||
|
|
||||||
|
typedef struct {
|
||||||
|
int id;
|
||||||
|
bool important;
|
||||||
|
} hookinfo_t;
|
||||||
|
|
||||||
typedef struct {
|
typedef struct {
|
||||||
int numHooks;
|
int numHooks;
|
||||||
int *ids;
|
hookinfo_t *ids;
|
||||||
} hook_t;
|
} hook_t;
|
||||||
|
|
||||||
typedef struct {
|
typedef struct {
|
||||||
int numGeneric;
|
int numGeneric;
|
||||||
int ref;
|
int ref;
|
||||||
|
bool important;
|
||||||
} stringhook_t;
|
} stringhook_t;
|
||||||
|
|
||||||
static hook_t hookIds[HOOK(MAX)];
|
static hook_t hookIds[HOOK(MAX)];
|
||||||
@@ -56,6 +63,8 @@ static hook_t mobjHookIds[NUMMOBJTYPES][MOBJ_HOOK(MAX)];
|
|||||||
// Lua tables are used to lookup string hook ids.
|
// Lua tables are used to lookup string hook ids.
|
||||||
static stringhook_t stringHooks[STRING_HOOK(MAX)];
|
static stringhook_t stringHooks[STRING_HOOK(MAX)];
|
||||||
|
|
||||||
|
bool hook_important = true;
|
||||||
|
|
||||||
// This will be indexed by hook id, the value of which fetches the registry.
|
// This will be indexed by hook id, the value of which fetches the registry.
|
||||||
static int * hookRefs;
|
static int * hookRefs;
|
||||||
static int nextid;
|
static int nextid;
|
||||||
@@ -109,7 +118,11 @@ static void get_table(lua_State *L)
|
|||||||
|
|
||||||
FUNCINLINE static ATTRINLINE void add_hook_to_table(lua_State *L, int n)
|
FUNCINLINE static ATTRINLINE void add_hook_to_table(lua_State *L, int n)
|
||||||
{
|
{
|
||||||
|
lua_newtable(L);
|
||||||
lua_pushnumber(L, nextid);
|
lua_pushnumber(L, nextid);
|
||||||
|
lua_rawseti(L, -2, 1);
|
||||||
|
lua_pushboolean(L, wadfiles[numwadfiles-1]->important);
|
||||||
|
lua_rawseti(L, -2, 2);
|
||||||
lua_rawseti(L, -2, n);
|
lua_rawseti(L, -2, n);
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -180,7 +193,8 @@ FUNCINLINE static ATTRINLINE void add_hook(hook_t *map)
|
|||||||
{
|
{
|
||||||
Z_Realloc(map->ids, (map->numHooks + 1) * sizeof *map->ids,
|
Z_Realloc(map->ids, (map->numHooks + 1) * sizeof *map->ids,
|
||||||
PU_STATIC, &map->ids);
|
PU_STATIC, &map->ids);
|
||||||
map->ids[map->numHooks++] = nextid;
|
map->ids[map->numHooks].important = wadfiles[numwadfiles-1]->important;
|
||||||
|
map->ids[map->numHooks++].id = nextid;
|
||||||
}
|
}
|
||||||
|
|
||||||
FUNCINLINE static ATTRINLINE void add_mobj_hook(lua_State *L, int hook_type)
|
FUNCINLINE static ATTRINLINE void add_mobj_hook(lua_State *L, int hook_type)
|
||||||
@@ -287,6 +301,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 */
|
||||||
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 */
|
||||||
@@ -416,22 +431,29 @@ FUNCINLINE static ATTRINLINE void init_hook_call
|
|||||||
hook->results_handler = results_handler;
|
hook->results_handler = results_handler;
|
||||||
}
|
}
|
||||||
|
|
||||||
FUNCINLINE static ATTRINLINE void get_hook(Hook_State *hook, const int *ids, int n)
|
FUNCINLINE static ATTRINLINE void get_hook(Hook_State *hook, const hookinfo_t *ids, int n)
|
||||||
{
|
{
|
||||||
hook->id = ids[n];
|
hook->id = ids[n].id;
|
||||||
|
hook->important = ids[n].important;
|
||||||
lua_getref(gL, hookRefs[hook->id]);
|
lua_getref(gL, hookRefs[hook->id]);
|
||||||
}
|
}
|
||||||
|
|
||||||
FUNCINLINE static ATTRINLINE void get_hook_from_table(Hook_State *hook, int n)
|
FUNCINLINE static ATTRINLINE void get_hook_from_table(Hook_State *hook, int n)
|
||||||
{
|
{
|
||||||
lua_rawgeti(gL, -1, n);
|
lua_rawgeti(gL, -1, n);
|
||||||
|
lua_rawgeti(gL, -1, 1);
|
||||||
hook->id = lua_tonumber(gL, -1);
|
hook->id = lua_tonumber(gL, -1);
|
||||||
lua_pop(gL, 1);
|
lua_pop(gL, 1);
|
||||||
|
lua_rawgeti(gL, -2, 2);
|
||||||
|
hook->important = lua_toboolean(gL, -1);
|
||||||
|
lua_pop(gL, 2);
|
||||||
lua_getref(gL, hookRefs[hook->id]);
|
lua_getref(gL, hookRefs[hook->id]);
|
||||||
}
|
}
|
||||||
|
|
||||||
static int call_single_hook_no_copy(Hook_State *hook)
|
static int call_single_hook_no_copy(Hook_State *hook)
|
||||||
{
|
{
|
||||||
|
hook_important = hook->important;
|
||||||
|
|
||||||
if (lua_pcall(gL, hook->values, hook->results, EINDEX) == 0)
|
if (lua_pcall(gL, hook->values, hook->results, EINDEX) == 0)
|
||||||
{
|
{
|
||||||
if (hook->results > 0)
|
if (hook->results > 0)
|
||||||
|
|||||||
+2
-8
@@ -251,14 +251,8 @@ int mobj_angle_setter(lua_State *L)
|
|||||||
mobj_t *mo = GETMO();
|
mobj_t *mo = GETMO();
|
||||||
|
|
||||||
mo->angle = luaL_checkangle(L, 2);
|
mo->angle = luaL_checkangle(L, 2);
|
||||||
for (UINT8 i = 0; i <= splitscreen; i++)
|
if (mo->player)
|
||||||
{
|
P_ForceLocalAngle(mo->player, mo->angle);
|
||||||
if (mo->player == P_GetLocalPlayerForNum(i))
|
|
||||||
{
|
|
||||||
localangle[i] = mo->angle;
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|||||||
+1
-1
@@ -41,7 +41,7 @@ lua_State *gL = NULL;
|
|||||||
// Mathlib global state
|
// Mathlib global state
|
||||||
static lua_State *mL = NULL;
|
static lua_State *mL = NULL;
|
||||||
|
|
||||||
int hook_defrosting;
|
int hook_defrosting = 0;
|
||||||
|
|
||||||
// List of internal libraries to load from SRB2
|
// List of internal libraries to load from SRB2
|
||||||
static lua_CFunction liblist[] = {
|
static lua_CFunction liblist[] = {
|
||||||
|
|||||||
+6
-4
@@ -49,17 +49,19 @@ aatree_t *M_AATreeAlloc(UINT32 flags)
|
|||||||
return aatree;
|
return aatree;
|
||||||
}
|
}
|
||||||
|
|
||||||
static void M_AATreeFree_Node(aatree_node_t *node)
|
static void M_AATreeFree_Node(aatree_node_t *node, bool is_string)
|
||||||
{
|
{
|
||||||
if (node->left) M_AATreeFree_Node(node->left);
|
if (node->left) M_AATreeFree_Node(node->left, is_string);
|
||||||
if (node->right) M_AATreeFree_Node(node->right);
|
if (node->right) M_AATreeFree_Node(node->right, is_string);
|
||||||
|
if (is_string)
|
||||||
|
Z_Free(node->value);
|
||||||
Z_Free(node);
|
Z_Free(node);
|
||||||
}
|
}
|
||||||
|
|
||||||
void M_AATreeFree(aatree_t *aatree)
|
void M_AATreeFree(aatree_t *aatree)
|
||||||
{
|
{
|
||||||
if (aatree->root)
|
if (aatree->root)
|
||||||
M_AATreeFree_Node(aatree->root);
|
M_AATreeFree_Node(aatree->root, (aatree->flags & AATREE_STRING) == AATREE_STRING);
|
||||||
|
|
||||||
Z_Free(aatree);
|
Z_Free(aatree);
|
||||||
}
|
}
|
||||||
|
|||||||
+2
-2
@@ -20,11 +20,11 @@
|
|||||||
|
|
||||||
/** \brief number of arg
|
/** \brief number of arg
|
||||||
*/
|
*/
|
||||||
INT32 myargc;
|
INT32 myargc = 0;
|
||||||
|
|
||||||
/** \brief string table
|
/** \brief string table
|
||||||
*/
|
*/
|
||||||
char **myargv;
|
char **myargv = NULL;
|
||||||
|
|
||||||
/** \brief did we alloc myargv ourselves?
|
/** \brief did we alloc myargv ourselves?
|
||||||
*/
|
*/
|
||||||
|
|||||||
+2
-2
@@ -25,10 +25,10 @@
|
|||||||
|
|
||||||
// Map triggers for linedef executors
|
// Map triggers for linedef executors
|
||||||
// 32 triggers, one bit each
|
// 32 triggers, one bit each
|
||||||
UINT32 unlocktriggers;
|
UINT32 unlocktriggers = 0;
|
||||||
|
|
||||||
// The meat of this system lies in condition sets
|
// The meat of this system lies in condition sets
|
||||||
conditionset_t conditionSets[MAXCONDITIONSETS];
|
conditionset_t conditionSets[MAXCONDITIONSETS] = {};
|
||||||
|
|
||||||
// Default Emblem locations
|
// Default Emblem locations
|
||||||
emblem_t emblemlocations[MAXEMBLEMS] =
|
emblem_t emblemlocations[MAXEMBLEMS] =
|
||||||
|
|||||||
+57
-20
@@ -10,20 +10,25 @@
|
|||||||
/// \brief Chat emotes handling
|
/// \brief Chat emotes handling
|
||||||
|
|
||||||
#include <map>
|
#include <map>
|
||||||
|
#include <list>
|
||||||
#include <string>
|
#include <string>
|
||||||
#include <sstream>
|
#include <sstream>
|
||||||
#include <cstring>
|
#include <cstring>
|
||||||
|
|
||||||
#include "m_emotes.h"
|
#include "m_emotes.h"
|
||||||
|
#include "i_time.h" // I_GetTime
|
||||||
|
|
||||||
extern "C" {
|
extern "C" {
|
||||||
#include "w_wad.h"
|
#include "w_wad.h"
|
||||||
#include "z_zone.h"
|
#include "z_zone.h"
|
||||||
#include "hu_stuff.h"
|
#include "hu_stuff.h"
|
||||||
#include "v_video.h"
|
#include "v_video.h"
|
||||||
|
#include "command.h"
|
||||||
}
|
}
|
||||||
|
|
||||||
consvar_t cv_emotes = {"emotes", "On", CV_SAVE, CV_OnOff, NULL, 0, NULL, NULL, 0, 0, NULL};;
|
static void Command_ListEmotes_f(void);
|
||||||
|
|
||||||
|
consvar_t cv_emotes = {"emotes", "On", CV_SAVE, CV_OnOff, NULL, 0, NULL, NULL, 0, 0, NULL};
|
||||||
|
|
||||||
static std::map<std::string, emote_t> emotes;
|
static std::map<std::string, emote_t> emotes;
|
||||||
|
|
||||||
@@ -117,12 +122,6 @@ void M_LoadEmotes(UINT16 wadnum)
|
|||||||
UINT8 numframes = 0;
|
UINT8 numframes = 0;
|
||||||
|
|
||||||
auto copy_frame = [&] {
|
auto copy_frame = [&] {
|
||||||
if (numframes == MAXEMOTEFRAMES)
|
|
||||||
{
|
|
||||||
CONS_Alert(CONS_WARNING, "EMOTES: Too many frames. (file %s, line %d)", wadfiles[wadnum]->filename, linenum);
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
|
|
||||||
size_t list_split = value.find(',');
|
size_t list_split = value.find(',');
|
||||||
std::string framelumpname = value.substr(0, list_split);
|
std::string framelumpname = value.substr(0, list_split);
|
||||||
trim(framelumpname);
|
trim(framelumpname);
|
||||||
@@ -136,9 +135,16 @@ void M_LoadEmotes(UINT16 wadnum)
|
|||||||
if (framelumpname.size() == 0)
|
if (framelumpname.size() == 0)
|
||||||
return false;
|
return false;
|
||||||
|
|
||||||
|
// Only print this warning if we actually got new frame
|
||||||
|
if (numframes == MAXEMOTEFRAMES)
|
||||||
|
{
|
||||||
|
CONS_Alert(CONS_WARNING, "EMOTES: Too many frames. (file %s, line %d)\n", wadfiles[wadnum]->filename, linenum);
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
if (framelumpname.size() > 8)
|
if (framelumpname.size() > 8)
|
||||||
{
|
{
|
||||||
CONS_Alert(CONS_WARNING, "EMOTES: Frame %d name is too long. (file %s, line %d)", numframes, wadfiles[wadnum]->filename, linenum);
|
CONS_Alert(CONS_WARNING, "EMOTES: Frame %d name is too long. (file %s, line %d)\n", numframes, wadfiles[wadnum]->filename, linenum);
|
||||||
framelumpname.resize(8);
|
framelumpname.resize(8);
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -153,7 +159,7 @@ void M_LoadEmotes(UINT16 wadnum)
|
|||||||
|
|
||||||
if (numframes == 0)
|
if (numframes == 0)
|
||||||
{
|
{
|
||||||
CONS_Alert(CONS_WARNING, "EMOTES: Expected list of frames. (file %s, line %d)", wadfiles[wadnum]->filename, linenum);
|
CONS_Alert(CONS_WARNING, "EMOTES: Expected list of frames. (file %s, line %d)\n", wadfiles[wadnum]->filename, linenum);
|
||||||
}
|
}
|
||||||
|
|
||||||
emote->numframes = numframes;
|
emote->numframes = numframes;
|
||||||
@@ -165,12 +171,12 @@ void M_LoadEmotes(UINT16 wadnum)
|
|||||||
if (emote->timeperframe <= 0)
|
if (emote->timeperframe <= 0)
|
||||||
{
|
{
|
||||||
emote->timeperframe = 1;
|
emote->timeperframe = 1;
|
||||||
CONS_Alert(CONS_WARNING, "EMOTES: Bad value for 'timeperframe'. (file %s, line %d)", wadfiles[wadnum]->filename, linenum);
|
CONS_Alert(CONS_WARNING, "EMOTES: Bad value for 'timeperframe'. (file %s, line %d)\n", wadfiles[wadnum]->filename, linenum);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
CONS_Alert(CONS_WARNING, "EMOTES: Unrecognized field '%s'. (file %s, line %d)", field.c_str(), wadfiles[wadnum]->filename, linenum);
|
CONS_Alert(CONS_WARNING, "EMOTES: Unrecognized field '%s'. (file %s, line %d)\n", field.c_str(), wadfiles[wadnum]->filename, linenum);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
@@ -187,6 +193,8 @@ void M_InitEmotes(void)
|
|||||||
UINT16 i;
|
UINT16 i;
|
||||||
for (i = 0; i < numwadfiles; i++)
|
for (i = 0; i < numwadfiles; i++)
|
||||||
M_LoadEmotes(i);
|
M_LoadEmotes(i);
|
||||||
|
|
||||||
|
COM_AddCommand("listemotes", Command_ListEmotes_f);
|
||||||
}
|
}
|
||||||
|
|
||||||
emote_t *M_FindEmote(const char *name, int len, int skip)
|
emote_t *M_FindEmote(const char *name, int len, int skip)
|
||||||
@@ -199,7 +207,7 @@ emote_t *M_FindEmote(const char *name, int len, int skip)
|
|||||||
|
|
||||||
for (auto &pair: emotes)
|
for (auto &pair: emotes)
|
||||||
{
|
{
|
||||||
if (pair.first.rfind(query, 0, std::min(len, MAXEMOTENAME)) != 0)
|
if (strcasestr(pair.first.c_str(), query) == NULL)
|
||||||
continue;
|
continue;
|
||||||
|
|
||||||
if (skip > 0)
|
if (skip > 0)
|
||||||
@@ -247,23 +255,18 @@ emote_t *M_VerifyEmote(const char *name, int *emotelen)
|
|||||||
return match;
|
return match;
|
||||||
}
|
}
|
||||||
|
|
||||||
void M_DrawEmote(INT32 x, INT32 y, emote_t *emote, tic_t anim, INT32 flags)
|
void M_DrawScaledEmote(fixed_t x, fixed_t y, fixed_t scale, emote_t *emote, INT32 flags)
|
||||||
{
|
{
|
||||||
if (emote->numframes == 0)
|
if (emote->numframes == 0)
|
||||||
return;
|
return;
|
||||||
|
|
||||||
const char *lumpname = emote->frames[(anim/emote->timeperframe) % emote->numframes];
|
const char *lumpname = emote->frames[(I_GetTime()/emote->timeperframe) % emote->numframes];
|
||||||
patch_t *emotepatch = (patch_t*)W_CachePatchName(lumpname, PU_CACHE);
|
patch_t *emotepatch = (patch_t*)W_CachePatchName(lumpname, PU_CACHE);
|
||||||
|
|
||||||
const int CHARHEIGHT = 6;
|
const int CHARHEIGHT = 6;
|
||||||
|
|
||||||
fixed_t scale = FRACUNIT;
|
|
||||||
|
|
||||||
x *= FRACUNIT;
|
|
||||||
y *= FRACUNIT;
|
|
||||||
|
|
||||||
if (emotepatch->width > EMOTEWIDTH)
|
if (emotepatch->width > EMOTEWIDTH)
|
||||||
scale = (FRACUNIT/emotepatch->width)*EMOTEWIDTH;
|
scale = FixedMul(scale, (FRACUNIT/emotepatch->width)*EMOTEWIDTH);
|
||||||
else if (emotepatch->width < EMOTEWIDTH)
|
else if (emotepatch->width < EMOTEWIDTH)
|
||||||
x += (EMOTEWIDTH-emotepatch->width)*FRACUNIT/2;
|
x += (EMOTEWIDTH-emotepatch->width)*FRACUNIT/2;
|
||||||
|
|
||||||
@@ -271,3 +274,37 @@ void M_DrawEmote(INT32 x, INT32 y, emote_t *emote, tic_t anim, INT32 flags)
|
|||||||
|
|
||||||
V_DrawFixedPatch(x, y, scale, flags, emotepatch, NULL);
|
V_DrawFixedPatch(x, y, scale, flags, emotepatch, NULL);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
static void Command_ListEmotes_f(void)
|
||||||
|
{
|
||||||
|
const int EMOTES_PER_PAGE = 24;
|
||||||
|
const int NUMPAGES = std::max<int>(emotes.size()/EMOTES_PER_PAGE, 1);
|
||||||
|
int page = 1;
|
||||||
|
|
||||||
|
if (COM_Argc() > 1)
|
||||||
|
page = std::atoi(COM_Argv(1));
|
||||||
|
|
||||||
|
if (page <= 0 || page > NUMPAGES)
|
||||||
|
{
|
||||||
|
if (NUMPAGES > 1)
|
||||||
|
CONS_Printf("Enter page number between 1 and %d\n", NUMPAGES);
|
||||||
|
else
|
||||||
|
CONS_Printf("Bad page number, try using this command without arguments\n");
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
int i = 0;
|
||||||
|
for (auto &pair: emotes)
|
||||||
|
{
|
||||||
|
++i;
|
||||||
|
|
||||||
|
if (i <= (page-1)*EMOTES_PER_PAGE)
|
||||||
|
continue;
|
||||||
|
if (i > page*EMOTES_PER_PAGE)
|
||||||
|
break;
|
||||||
|
|
||||||
|
CONS_Printf("%s - :%s:\n", pair.first.c_str(), pair.first.c_str());
|
||||||
|
}
|
||||||
|
|
||||||
|
CONS_Printf("Page %d/%d\n", page, NUMPAGES);
|
||||||
|
}
|
||||||
+4
-3
@@ -17,6 +17,7 @@ extern "C" {
|
|||||||
#endif
|
#endif
|
||||||
|
|
||||||
#include "doomdef.h"
|
#include "doomdef.h"
|
||||||
|
#include "m_fixed.h"
|
||||||
#include "command.h"
|
#include "command.h"
|
||||||
|
|
||||||
extern consvar_t cv_emotes;
|
extern consvar_t cv_emotes;
|
||||||
@@ -48,9 +49,9 @@ emote_t *M_FindEmote(const char *name, int len, int skips);
|
|||||||
// needs to be skipped to get past emote name
|
// needs to be skipped to get past emote name
|
||||||
emote_t *M_VerifyEmote(const char *name, int *emotelen);
|
emote_t *M_VerifyEmote(const char *name, int *emotelen);
|
||||||
|
|
||||||
// Draw the emote, anim should be some kind of timer ticking every game tic
|
// Draw the emote, animation for animated emotes is done via I_GetTime
|
||||||
// for animated emotes
|
#define M_DrawEmote(x, y, emote, flags) M_DrawScaledEmote((x)<<FRACBITS, (y)<<FRACBITS, FRACUNIT, emote, flags)
|
||||||
void M_DrawEmote(INT32 x, INT32 y, emote_t *emote, tic_t anim, INT32 flags);
|
void M_DrawScaledEmote(fixed_t x, fixed_t y, fixed_t scale, emote_t *emote, INT32 flags);
|
||||||
|
|
||||||
#ifdef __cplusplus
|
#ifdef __cplusplus
|
||||||
} // extern "C"
|
} // extern "C"
|
||||||
|
|||||||
+402
-206
File diff suppressed because it is too large.
Load diff
+15
-3
@@ -204,6 +204,7 @@ typedef struct menu_s
|
|||||||
struct menu_s *prevMenu; // previous menu
|
struct menu_s *prevMenu; // previous menu
|
||||||
menuitem_t *menuitems; // menu items
|
menuitem_t *menuitems; // menu items
|
||||||
void (*drawroutine)(void); // draw routine
|
void (*drawroutine)(void); // draw routine
|
||||||
|
void (*tickroutine)(void); // ticker routine
|
||||||
INT16 x, y; // x, y of menu
|
INT16 x, y; // x, y of menu
|
||||||
INT16 lastOn; // last item user was on in menu
|
INT16 lastOn; // last item user was on in menu
|
||||||
boolean (*quitroutine)(void); // called before quit a menu return true if we can
|
boolean (*quitroutine)(void); // called before quit a menu return true if we can
|
||||||
@@ -222,6 +223,11 @@ extern menu_t *currentMenu;
|
|||||||
extern menu_t MainDef;
|
extern menu_t MainDef;
|
||||||
extern menu_t SP_LoadDef;
|
extern menu_t SP_LoadDef;
|
||||||
|
|
||||||
|
#define MAXCOLUMNMODES 12 //max modes displayed in one column
|
||||||
|
#define MAXMODEDESCS (MAXCOLUMNMODES*3)
|
||||||
|
extern menu_t OP_VideoModeDef;
|
||||||
|
void M_VideoModeMenu(INT32 choice);
|
||||||
|
|
||||||
// Call upon joystick hotplug
|
// Call upon joystick hotplug
|
||||||
void M_SetupJoystickMenu(INT32 choice);
|
void M_SetupJoystickMenu(INT32 choice);
|
||||||
extern menu_t OP_JoystickSetDef;
|
extern menu_t OP_JoystickSetDef;
|
||||||
@@ -272,9 +278,6 @@ extern CV_PossibleValue_t gametype_cons_t[];
|
|||||||
|
|
||||||
extern char dummystaffname[22];
|
extern char dummystaffname[22];
|
||||||
|
|
||||||
extern INT16 startmap;
|
|
||||||
extern INT32 ultimate_selectable;
|
|
||||||
|
|
||||||
#define MAXSAVEGAMES 31 //note: last save game is "no save"
|
#define MAXSAVEGAMES 31 //note: last save game is "no save"
|
||||||
#define NOSAVESLOT MAXSAVEGAMES-1 //slot where Play Without Saving appears
|
#define NOSAVESLOT MAXSAVEGAMES-1 //slot where Play Without Saving appears
|
||||||
|
|
||||||
@@ -311,6 +314,8 @@ void M_ResetDemoList(void);
|
|||||||
void M_ReplayHut(INT32 choice);
|
void M_ReplayHut(INT32 choice);
|
||||||
void M_SetPlaybackMenuPointer(void);
|
void M_SetPlaybackMenuPointer(void);
|
||||||
|
|
||||||
|
void Nextmap_OnChange(void);
|
||||||
|
|
||||||
void M_RefreshPauseMenu(void);
|
void M_RefreshPauseMenu(void);
|
||||||
|
|
||||||
INT32 HU_GetHighlightColor(void);
|
INT32 HU_GetHighlightColor(void);
|
||||||
@@ -331,6 +336,7 @@ void M_SlotCvarIntoModMenu(consvar_t* cvar, const char* category, const char* na
|
|||||||
prev,\
|
prev,\
|
||||||
source,\
|
source,\
|
||||||
M_DrawGenericMenu,\
|
M_DrawGenericMenu,\
|
||||||
|
NULL,\
|
||||||
x, y,\
|
x, y,\
|
||||||
0,\
|
0,\
|
||||||
NULL,\
|
NULL,\
|
||||||
@@ -344,6 +350,7 @@ void M_SlotCvarIntoModMenu(consvar_t* cvar, const char* category, const char* na
|
|||||||
prev,\
|
prev,\
|
||||||
source,\
|
source,\
|
||||||
M_DrawGenericScrollMenu,\
|
M_DrawGenericScrollMenu,\
|
||||||
|
NULL,\
|
||||||
x, y,\
|
x, y,\
|
||||||
0,\
|
0,\
|
||||||
NULL,\
|
NULL,\
|
||||||
@@ -358,6 +365,7 @@ void M_SlotCvarIntoModMenu(consvar_t* cvar, const char* category, const char* na
|
|||||||
NULL,\
|
NULL,\
|
||||||
source,\
|
source,\
|
||||||
M_DrawPauseMenu,\
|
M_DrawPauseMenu,\
|
||||||
|
NULL,\
|
||||||
x, y,\
|
x, y,\
|
||||||
0,\
|
0,\
|
||||||
NULL,\
|
NULL,\
|
||||||
@@ -371,6 +379,7 @@ void M_SlotCvarIntoModMenu(consvar_t* cvar, const char* category, const char* na
|
|||||||
prev,\
|
prev,\
|
||||||
source,\
|
source,\
|
||||||
M_DrawCenteredMenu,\
|
M_DrawCenteredMenu,\
|
||||||
|
NULL,\
|
||||||
BASEVIDWIDTH/2, y,\
|
BASEVIDWIDTH/2, y,\
|
||||||
0,\
|
0,\
|
||||||
NULL,\
|
NULL,\
|
||||||
@@ -384,6 +393,7 @@ void M_SlotCvarIntoModMenu(consvar_t* cvar, const char* category, const char* na
|
|||||||
prev,\
|
prev,\
|
||||||
source,\
|
source,\
|
||||||
M_DrawServerMenu,\
|
M_DrawServerMenu,\
|
||||||
|
NULL,\
|
||||||
24,40,\
|
24,40,\
|
||||||
0,\
|
0,\
|
||||||
NULL,\
|
NULL,\
|
||||||
@@ -397,6 +407,7 @@ void M_SlotCvarIntoModMenu(consvar_t* cvar, const char* category, const char* na
|
|||||||
prev,\
|
prev,\
|
||||||
source,\
|
source,\
|
||||||
M_DrawControl,\
|
M_DrawControl,\
|
||||||
|
NULL,\
|
||||||
26, 40,\
|
26, 40,\
|
||||||
0,\
|
0,\
|
||||||
NULL,\
|
NULL,\
|
||||||
@@ -410,6 +421,7 @@ void M_SlotCvarIntoModMenu(consvar_t* cvar, const char* category, const char* na
|
|||||||
NULL,\
|
NULL,\
|
||||||
source,\
|
source,\
|
||||||
M_DrawImageDef,\
|
M_DrawImageDef,\
|
||||||
|
NULL,\
|
||||||
0, 0,\
|
0, 0,\
|
||||||
0,\
|
0,\
|
||||||
NULL,\
|
NULL,\
|
||||||
|
|||||||
+61
-230
@@ -735,26 +735,27 @@ static menuitem_t OP_AllControlsMenu[] =
|
|||||||
|
|
||||||
#define OP_JOYMENU(pnum) \
|
#define OP_JOYMENU(pnum) \
|
||||||
{IT_HEADER, NULL, "Gameplay Controls", NULL, 7}, \
|
{IT_HEADER, NULL, "Gameplay Controls", NULL, 7}, \
|
||||||
{IT_STRING | IT_CVAR, NULL, "Aim Forward/Back" , &cv_aimaxis[pnum] , 15}, \
|
{IT_STRING | IT_CVAR, NULL, "Aim Forward/Back" , &cv_aimaxis[pnum] , 15}, \
|
||||||
{IT_STRING | IT_CVAR, NULL, "Turn Left/Right" , &cv_turnaxis[pnum] , 20}, \
|
{IT_STRING | IT_CVAR, NULL, "Turn Left/Right" , &cv_turnaxis[pnum] , 20}, \
|
||||||
{IT_STRING | IT_CVAR, NULL, "Accelerate" , &cv_moveaxis[pnum] , 25}, \
|
{IT_STRING | IT_CVAR, NULL, "Accelerate" , &cv_moveaxis[pnum] , 25}, \
|
||||||
{IT_STRING | IT_CVAR, NULL, "Brake" , &cv_brakeaxis[pnum] , 30}, \
|
{IT_STRING | IT_CVAR, NULL, "Brake" , &cv_brakeaxis[pnum] , 30}, \
|
||||||
{IT_STRING | IT_CVAR, NULL, "Drift" , &cv_driftaxis[pnum] , 35}, \
|
{IT_STRING | IT_CVAR, NULL, "Drift" , &cv_driftaxis[pnum] , 35}, \
|
||||||
{IT_STRING | IT_CVAR, NULL, "Use Item" , &cv_fireaxis[pnum] , 40}, \
|
{IT_STRING | IT_CVAR, NULL, "Use Item" , &cv_fireaxis[pnum] , 40}, \
|
||||||
{IT_STRING | IT_CVAR, NULL, "Look Backward" , &cv_lookbackaxis[pnum] , 45}, \
|
{IT_STRING | IT_CVAR, NULL, "Look Backward" , &cv_lookbackaxis[pnum] , 45}, \
|
||||||
{IT_STRING | IT_CVAR, NULL, "Custom Button 1" , &cv_custom1axis[pnum] , 50}, \
|
{IT_STRING | IT_CVAR, NULL, "Custom Button 1" , &cv_custom1axis[pnum] , 50}, \
|
||||||
{IT_STRING | IT_CVAR, NULL, "Custom Button 2" , &cv_custom2axis[pnum] , 55}, \
|
{IT_STRING | IT_CVAR, NULL, "Custom Button 2" , &cv_custom2axis[pnum] , 55}, \
|
||||||
{IT_STRING | IT_CVAR, NULL, "Custom Button 3" , &cv_custom3axis[pnum] , 60}, \
|
{IT_STRING | IT_CVAR, NULL, "Custom Button 3" , &cv_custom3axis[pnum] , 60}, \
|
||||||
{IT_HEADER, NULL, "Camera Controls", NULL, 67}, \
|
{IT_HEADER, NULL, "Camera Controls", NULL, 67}, \
|
||||||
{IT_STRING | IT_CVAR, NULL, "Look Up/Down" , &cv_lookaxis[pnum] , 75}, \
|
{IT_STRING | IT_CVAR, NULL, "Look Up/Down" , &cv_lookaxis[pnum] , 75}, \
|
||||||
{IT_STRING | IT_CVAR, NULL, "Turn Left/Right" , &cv_camturnaxis[pnum] , 80}, \
|
{IT_STRING | IT_CVAR, NULL, "Turn Left/Right" , &cv_camturnaxis[pnum] , 80}, \
|
||||||
{IT_STRING | IT_CVAR, NULL, "Strafe Left/Right" , &cv_camstrafeaxis[pnum] , 85}, \
|
{IT_STRING | IT_CVAR, NULL, "Strafe Left/Right" , &cv_camstrafeaxis[pnum] , 85}, \
|
||||||
{IT_HEADER, NULL, "Deadzones", NULL, 92}, \
|
{IT_HEADER, NULL, "Deadzones", NULL, 92}, \
|
||||||
{IT_STRING | IT_CVAR, NULL, "X deadzone" , &cv_xdeadzone[pnum] , 100}, \
|
{IT_STRING | IT_CVAR, NULL, "X deadzone" , &cv_xdeadzone[pnum] , 100}, \
|
||||||
{IT_STRING | IT_CVAR, NULL, "Y deadzone" , &cv_ydeadzone[pnum] , 105}, \
|
{IT_STRING | IT_CVAR, NULL, "Y deadzone" , &cv_ydeadzone[pnum] , 105}, \
|
||||||
{IT_HEADER, NULL, "Miscellaneous", NULL, 112}, \
|
{IT_HEADER, NULL, "Miscellaneous", NULL, 112}, \
|
||||||
{IT_STRING | IT_CVAR, NULL, "Controller Rumble" , &cv_rumble[pnum] , 120}, \
|
{IT_STRING | IT_CVAR, NULL, "Controller Rumble" , &cv_rumble[pnum] , 120}, \
|
||||||
{IT_STRING | IT_CVAR, NULL, "Set LED to Player color", &cv_gamepadled[pnum] , 125},
|
{IT_STRING | IT_CVAR, NULL, "Controller Rumble Strength" , &cv_rumblestrength[pnum] , 125}, \
|
||||||
|
{IT_STRING | IT_CVAR, NULL, "Set LED to Player color" , &cv_gamepadled[pnum] , 130},
|
||||||
|
|
||||||
static menuitem_t OP_Joystick1Menu[] =
|
static menuitem_t OP_Joystick1Menu[] =
|
||||||
{
|
{
|
||||||
@@ -1152,6 +1153,13 @@ static menuitem_t OP_SoundAdvancedMenu[] =
|
|||||||
{IT_STRING | IT_CVAR, NULL, "Stereo Seperation", &cv_stereosep, 35},
|
{IT_STRING | IT_CVAR, NULL, "Stereo Seperation", &cv_stereosep, 35},
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
#ifdef HAVE_FLUIDSYNTH
|
||||||
|
{IT_HEADER, NULL, "MIDI Settings", NULL, NULL, OPENMPT_MENUOFFSET},
|
||||||
|
{IT_STRING | IT_CVAR | IT_CV_STRING, NULL, "Sound Font File", NULL, &cv_midisoundfontpath, OPENMPT_MENUOFFSET+12},
|
||||||
|
{IT_STRING | IT_CVAR | IT_CV_SLIDER, NULL, "Chorus", NULL, &cv_midichorus, OPENMPT_MENUOFFSET+40},
|
||||||
|
{IT_STRING | IT_CVAR | IT_CV_SLIDER, NULL, "Reverb", NULL, &cv_midireverb, OPENMPT_MENUOFFSET+50},
|
||||||
|
#endif
|
||||||
|
|
||||||
{IT_HEADER, NULL, "Misc", NULL, 45},
|
{IT_HEADER, NULL, "Misc", NULL, 45},
|
||||||
|
|
||||||
{IT_STRING | IT_CVAR, NULL, "Same Sound Limit", &cv_samesoundlimit, 55},
|
{IT_STRING | IT_CVAR, NULL, "Same Sound Limit", &cv_samesoundlimit, 55},
|
||||||
@@ -1179,6 +1187,11 @@ static const char* OP_SoundAdvancedTooltips[] =
|
|||||||
"Which Amiga should be used for .mod playback?",
|
"Which Amiga should be used for .mod playback?",
|
||||||
#endif
|
#endif
|
||||||
"How far should the four channels in .mod be panned?",
|
"How far should the four channels in .mod be panned?",
|
||||||
|
#endif
|
||||||
|
#ifdef HAVE_FLUIDSYNTH
|
||||||
|
"Which MIDI soundfont to use",
|
||||||
|
"Controls the chorus of MIDI playback\n setting this too high might cause some instruments to be overexposed",
|
||||||
|
"Controls the reverb of MIDI playback\n setting this too high might cause notes to be drawn out",
|
||||||
#endif
|
#endif
|
||||||
NULL,
|
NULL,
|
||||||
"How many times is the same sound allowed to play at once?\nIf 0 theres no limit.",
|
"How many times is the same sound allowed to play at once?\nIf 0 theres no limit.",
|
||||||
@@ -1873,7 +1886,7 @@ static const char* OP_SaturnHudTooltips[] =
|
|||||||
"Disable the animation of the Positionnumber\nwhen overtaking someone.",
|
"Disable the animation of the Positionnumber\nwhen overtaking someone.",
|
||||||
"Flash current Lap Time when doing a Lap on the Timer.",
|
"Flash current Lap Time when doing a Lap on the Timer.",
|
||||||
"Use extra graphics for multiple sneakers, bananas and jawz.",
|
"Use extra graphics for multiple sneakers, bananas and jawz.",
|
||||||
"Change when the item amount is to be displayed\nMultiple will always display the number.\nwhen you have multiple of the same Item.\nAlways will always display the number regardless of Item amount.",
|
"Change when the item amount is to be displayed.\nMultiple will always display the number.\nWhen you have multiple of the same Item.\nAlways will always display the number regardless of Item amount.",
|
||||||
"Enables an animation while the roulette is active.",
|
"Enables an animation while the roulette is active.",
|
||||||
"Show the big 'LAP' text on a lap change.",
|
"Show the big 'LAP' text on a lap change.",
|
||||||
"Show the big Cecho Messages.",
|
"Show the big Cecho Messages.",
|
||||||
@@ -2026,11 +2039,10 @@ static menuitem_t OP_BirdMenu[] =
|
|||||||
//{IT_STRING | IT_CVAR, NULL, "Encore Choices", &cv_encorevotes, 90},
|
//{IT_STRING | IT_CVAR, NULL, "Encore Choices", &cv_encorevotes, 90},
|
||||||
|
|
||||||
{IT_HEADER, NULL, "Music", NULL, 70},
|
{IT_HEADER, NULL, "Music", NULL, 70},
|
||||||
{IT_STRING | IT_CVAR, NULL, "Music Features", &cv_birdmusic, 80},
|
{IT_STRING | IT_CVAR, NULL, "Resume Level Music", &cv_resume, 80},
|
||||||
{IT_STRING | IT_CVAR, NULL, "Resume Level Music", &cv_resume, 95},
|
{IT_STRING | IT_CVAR, NULL, "Restart Special Music", &cv_resetspecialmusic, 95},
|
||||||
{IT_STRING | IT_CVAR, NULL, "Restart Special Music", &cv_resetspecialmusic, 105},
|
|
||||||
|
|
||||||
{IT_STRING | IT_SUBMENU, NULL, "Advanced Music Options...", &OP_AdvancedBirdDef, 130},
|
{IT_STRING | IT_SUBMENU, NULL, "Advanced Music Options...", &OP_AdvancedBirdDef, 120},
|
||||||
};
|
};
|
||||||
|
|
||||||
static const char* OP_BirdTooltips[] =
|
static const char* OP_BirdTooltips[] =
|
||||||
@@ -2044,7 +2056,6 @@ static const char* OP_BirdTooltips[] =
|
|||||||
//"Only show one battle choice in map vote",
|
//"Only show one battle choice in map vote",
|
||||||
//"Amount of encore choices in map vote.",
|
//"Amount of encore choices in map vote.",
|
||||||
NULL,
|
NULL,
|
||||||
"Global toggle for all bird music features.",
|
|
||||||
"Resume level music from last position after music change.",
|
"Resume level music from last position after music change.",
|
||||||
"Restart Special music if item is used again.",
|
"Restart Special music if item is used again.",
|
||||||
"Options for advanced music settings.",
|
"Options for advanced music settings.",
|
||||||
@@ -2058,7 +2069,6 @@ enum
|
|||||||
viewpointext,
|
viewpointext,
|
||||||
freeplaytext,
|
freeplaytext,
|
||||||
headermusic,
|
headermusic,
|
||||||
birdmusic,
|
|
||||||
lvlresum,
|
lvlresum,
|
||||||
spclresum,
|
spclresum,
|
||||||
advmusic,
|
advmusic,
|
||||||
@@ -2182,9 +2192,6 @@ static menuitem_t OP_AdvancedBirdMenu[] =
|
|||||||
{IT_STRING | IT_CVAR, NULL, "Fade Back from Grow", &cv_growmusicfade, 20},
|
{IT_STRING | IT_CVAR, NULL, "Fade Back from Grow", &cv_growmusicfade, 20},
|
||||||
{IT_STRING | IT_CVAR, NULL, "Fade Out Before Respawning", &cv_respawnfademusicout, 30},
|
{IT_STRING | IT_CVAR, NULL, "Fade Out Before Respawning", &cv_respawnfademusicout, 30},
|
||||||
{IT_STRING | IT_CVAR, NULL, "Fade Back In While Respawning", &cv_respawnfademusicback, 40},
|
{IT_STRING | IT_CVAR, NULL, "Fade Back In While Respawning", &cv_respawnfademusicback, 40},
|
||||||
|
|
||||||
{IT_STRING | IT_CVAR, NULL, "Resync Threshold", &cv_music_resync_threshold, 60},
|
|
||||||
{IT_STRING | IT_CVAR, NULL, "Resync Special Music Only", &cv_music_resync_powerups_only, 70},
|
|
||||||
};
|
};
|
||||||
|
|
||||||
static const char* OP_AdvancedBirdTooltips[] =
|
static const char* OP_AdvancedBirdTooltips[] =
|
||||||
@@ -2194,8 +2201,6 @@ static const char* OP_AdvancedBirdTooltips[] =
|
|||||||
"Fade in music after Grow.",
|
"Fade in music after Grow.",
|
||||||
"Fade out music before respawning.",
|
"Fade out music before respawning.",
|
||||||
"Fade in music while respawning.",
|
"Fade in music while respawning.",
|
||||||
"Threshold for syncing music.",
|
|
||||||
"Only sync special music.",
|
|
||||||
};
|
};
|
||||||
|
|
||||||
enum
|
enum
|
||||||
@@ -2205,8 +2210,6 @@ enum
|
|||||||
fadegrow,
|
fadegrow,
|
||||||
respawnfadeout,
|
respawnfadeout,
|
||||||
respawnfadein,
|
respawnfadein,
|
||||||
syncthreshold,
|
|
||||||
syncspecialonly,
|
|
||||||
};
|
};
|
||||||
|
|
||||||
menuitem_t OP_CustomCvarMenu[MAXMENUCCVARS];
|
menuitem_t OP_CustomCvarMenu[MAXMENUCCVARS];
|
||||||
@@ -2225,6 +2228,7 @@ menu_t MISC_AddonsDef =
|
|||||||
&OP_DataOptionsDef,
|
&OP_DataOptionsDef,
|
||||||
MISC_AddonsMenu,
|
MISC_AddonsMenu,
|
||||||
M_DrawAddons,
|
M_DrawAddons,
|
||||||
|
M_AddonsRefresh,
|
||||||
50, 28,
|
50, 28,
|
||||||
0,
|
0,
|
||||||
NULL,
|
NULL,
|
||||||
@@ -2238,6 +2242,7 @@ menu_t MISC_ReplayHutDef =
|
|||||||
NULL,
|
NULL,
|
||||||
MISC_ReplayHutMenu,
|
MISC_ReplayHutMenu,
|
||||||
M_DrawReplayHut,
|
M_DrawReplayHut,
|
||||||
|
NULL,
|
||||||
30, 80,
|
30, 80,
|
||||||
0,
|
0,
|
||||||
M_QuitReplayHut,
|
M_QuitReplayHut,
|
||||||
@@ -2251,6 +2256,7 @@ menu_t MISC_ReplayOptionsDef =
|
|||||||
&OP_DataOptionsDef,
|
&OP_DataOptionsDef,
|
||||||
MISC_ReplayOptionsMenu,
|
MISC_ReplayOptionsMenu,
|
||||||
M_DrawGenericMenu,
|
M_DrawGenericMenu,
|
||||||
|
NULL,
|
||||||
27, 40,
|
27, 40,
|
||||||
0,
|
0,
|
||||||
NULL,
|
NULL,
|
||||||
@@ -2264,6 +2270,7 @@ menu_t MISC_ReplayStartDef =
|
|||||||
&MISC_ReplayHutDef,
|
&MISC_ReplayHutDef,
|
||||||
MISC_ReplayStartMenu,
|
MISC_ReplayStartMenu,
|
||||||
M_DrawReplayStartMenu,
|
M_DrawReplayStartMenu,
|
||||||
|
NULL,
|
||||||
30, 90,
|
30, 90,
|
||||||
0,
|
0,
|
||||||
NULL,
|
NULL,
|
||||||
@@ -2276,6 +2283,7 @@ menu_t PlaybackMenuDef = {
|
|||||||
NULL,
|
NULL,
|
||||||
PlaybackMenu,
|
PlaybackMenu,
|
||||||
M_DrawPlaybackMenu,
|
M_DrawPlaybackMenu,
|
||||||
|
NULL,
|
||||||
//BASEVIDWIDTH/2 - 94, 2,
|
//BASEVIDWIDTH/2 - 94, 2,
|
||||||
BASEVIDWIDTH/2 - 88, 2,
|
BASEVIDWIDTH/2 - 88, 2,
|
||||||
0,
|
0,
|
||||||
@@ -2294,6 +2302,7 @@ menu_t MISC_DiscordRequestsDef = {
|
|||||||
&MPauseDef,
|
&MPauseDef,
|
||||||
MISC_DiscordRequestsMenu,
|
MISC_DiscordRequestsMenu,
|
||||||
M_DrawDiscordRequests,
|
M_DrawDiscordRequests,
|
||||||
|
NULL,
|
||||||
0, 0,
|
0, 0,
|
||||||
0,
|
0,
|
||||||
NULL,
|
NULL,
|
||||||
@@ -2318,6 +2327,7 @@ menu_t SR_UnlockChecklistDef =
|
|||||||
&SR_MainDef,
|
&SR_MainDef,
|
||||||
SR_UnlockChecklistMenu,
|
SR_UnlockChecklistMenu,
|
||||||
M_DrawChecklist,
|
M_DrawChecklist,
|
||||||
|
NULL,
|
||||||
280, 185,
|
280, 185,
|
||||||
0,
|
0,
|
||||||
NULL,
|
NULL,
|
||||||
@@ -2331,6 +2341,7 @@ menu_t SR_MusicTestDef =
|
|||||||
&OP_SoundOptionsDef,
|
&OP_SoundOptionsDef,
|
||||||
SR_MusicTestMenu,
|
SR_MusicTestMenu,
|
||||||
M_DrawMusicTest,
|
M_DrawMusicTest,
|
||||||
|
NULL,
|
||||||
60, 150,
|
60, 150,
|
||||||
0,
|
0,
|
||||||
NULL,
|
NULL,
|
||||||
@@ -2347,6 +2358,7 @@ menu_t SP_LevelStatsDef =
|
|||||||
&SR_MainDef,
|
&SR_MainDef,
|
||||||
SP_LevelStatsMenu,
|
SP_LevelStatsMenu,
|
||||||
M_DrawLevelStats,
|
M_DrawLevelStats,
|
||||||
|
NULL,
|
||||||
280, 185,
|
280, 185,
|
||||||
0,
|
0,
|
||||||
NULL,
|
NULL,
|
||||||
@@ -2360,6 +2372,7 @@ static menu_t SP_TimeAttackDef =
|
|||||||
&MainDef, // Doesn't matter.
|
&MainDef, // Doesn't matter.
|
||||||
SP_TimeAttackMenu,
|
SP_TimeAttackMenu,
|
||||||
M_DrawTimeAttackMenu,
|
M_DrawTimeAttackMenu,
|
||||||
|
NULL,
|
||||||
34, 40,
|
34, 40,
|
||||||
0,
|
0,
|
||||||
M_QuitTimeAttackMenu,
|
M_QuitTimeAttackMenu,
|
||||||
@@ -2372,6 +2385,7 @@ static menu_t SP_ReplayDef =
|
|||||||
&SP_TimeAttackDef,
|
&SP_TimeAttackDef,
|
||||||
SP_ReplayMenu,
|
SP_ReplayMenu,
|
||||||
M_DrawTimeAttackMenu,
|
M_DrawTimeAttackMenu,
|
||||||
|
NULL,
|
||||||
34, 40,
|
34, 40,
|
||||||
0,
|
0,
|
||||||
NULL,
|
NULL,
|
||||||
@@ -2384,6 +2398,7 @@ static menu_t SP_GuestReplayDef =
|
|||||||
&SP_TimeAttackDef,
|
&SP_TimeAttackDef,
|
||||||
SP_GuestReplayMenu,
|
SP_GuestReplayMenu,
|
||||||
M_DrawTimeAttackMenu,
|
M_DrawTimeAttackMenu,
|
||||||
|
NULL,
|
||||||
34, 40,
|
34, 40,
|
||||||
0,
|
0,
|
||||||
NULL,
|
NULL,
|
||||||
@@ -2396,6 +2411,7 @@ static menu_t SP_GhostDef =
|
|||||||
&SP_TimeAttackDef,
|
&SP_TimeAttackDef,
|
||||||
SP_GhostMenu,
|
SP_GhostMenu,
|
||||||
M_DrawTimeAttackMenu,
|
M_DrawTimeAttackMenu,
|
||||||
|
NULL,
|
||||||
34, 40,
|
34, 40,
|
||||||
0,
|
0,
|
||||||
NULL,
|
NULL,
|
||||||
@@ -2410,6 +2426,7 @@ menu_t MP_MainDef =
|
|||||||
&MainDef,
|
&MainDef,
|
||||||
MP_MainMenu,
|
MP_MainMenu,
|
||||||
M_DrawMPMainMenu,
|
M_DrawMPMainMenu,
|
||||||
|
NULL,
|
||||||
42, 30,
|
42, 30,
|
||||||
0,
|
0,
|
||||||
M_CancelConnect,
|
M_CancelConnect,
|
||||||
@@ -2427,6 +2444,7 @@ menu_t MP_ConnectDef =
|
|||||||
&MP_MainDef,
|
&MP_MainDef,
|
||||||
MP_ConnectMenu,
|
MP_ConnectMenu,
|
||||||
M_DrawConnectMenu,
|
M_DrawConnectMenu,
|
||||||
|
NULL,
|
||||||
27,24,
|
27,24,
|
||||||
0,
|
0,
|
||||||
M_CancelConnect,
|
M_CancelConnect,
|
||||||
@@ -2440,6 +2458,7 @@ menu_t MP_PlayerSetupDef =
|
|||||||
&MP_MainDef,
|
&MP_MainDef,
|
||||||
MP_PlayerSetupMenu,
|
MP_PlayerSetupMenu,
|
||||||
M_DrawSetupMultiPlayerMenu,
|
M_DrawSetupMultiPlayerMenu,
|
||||||
|
NULL,
|
||||||
36, 14,
|
36, 14,
|
||||||
0,
|
0,
|
||||||
M_QuitMultiPlayerMenu,
|
M_QuitMultiPlayerMenu,
|
||||||
@@ -2454,6 +2473,7 @@ menu_t OP_MainDef =
|
|||||||
&MainDef,
|
&MainDef,
|
||||||
OP_MainMenu,
|
OP_MainMenu,
|
||||||
M_DrawGenericMenu,
|
M_DrawGenericMenu,
|
||||||
|
NULL,
|
||||||
60, 25,
|
60, 25,
|
||||||
0,
|
0,
|
||||||
NULL,
|
NULL,
|
||||||
@@ -2476,6 +2496,7 @@ menu_t OP_JoystickSetDef =
|
|||||||
&OP_Joystick1Def,
|
&OP_Joystick1Def,
|
||||||
OP_JoystickSetMenu,
|
OP_JoystickSetMenu,
|
||||||
M_DrawJoystick,
|
M_DrawJoystick,
|
||||||
|
NULL,
|
||||||
50, 40,
|
50, 40,
|
||||||
0,
|
0,
|
||||||
NULL,
|
NULL,
|
||||||
@@ -2489,6 +2510,7 @@ menu_t OP_VideoOptionsDef =
|
|||||||
&OP_MainDef,
|
&OP_MainDef,
|
||||||
OP_VideoOptionsMenu,
|
OP_VideoOptionsMenu,
|
||||||
M_DrawVideoMenu,
|
M_DrawVideoMenu,
|
||||||
|
NULL,
|
||||||
30, 15,
|
30, 15,
|
||||||
0,
|
0,
|
||||||
NULL,
|
NULL,
|
||||||
@@ -2502,6 +2524,7 @@ menu_t OP_VideoModeDef =
|
|||||||
&OP_VideoOptionsDef,
|
&OP_VideoOptionsDef,
|
||||||
OP_VideoModeMenu,
|
OP_VideoModeMenu,
|
||||||
M_DrawVideoMode,
|
M_DrawVideoMode,
|
||||||
|
NULL,
|
||||||
48, 26,
|
48, 26,
|
||||||
0,
|
0,
|
||||||
NULL,
|
NULL,
|
||||||
@@ -2515,6 +2538,7 @@ menu_t OP_ColorOptionsDef =
|
|||||||
&OP_VideoOptionsDef,
|
&OP_VideoOptionsDef,
|
||||||
OP_ColorOptionsMenu,
|
OP_ColorOptionsMenu,
|
||||||
M_DrawColorMenu,
|
M_DrawColorMenu,
|
||||||
|
NULL,
|
||||||
30, 30,
|
30, 30,
|
||||||
0,
|
0,
|
||||||
NULL,
|
NULL,
|
||||||
@@ -2528,6 +2552,7 @@ menu_t OP_SoundOptionsDef =
|
|||||||
&OP_MainDef,
|
&OP_MainDef,
|
||||||
OP_SoundOptionsMenu,
|
OP_SoundOptionsMenu,
|
||||||
M_DrawSkyRoom,
|
M_DrawSkyRoom,
|
||||||
|
NULL,
|
||||||
30, 20,
|
30, 20,
|
||||||
0,
|
0,
|
||||||
NULL,
|
NULL,
|
||||||
@@ -2542,6 +2567,7 @@ menu_t OP_HUDOptionsDef =
|
|||||||
&OP_MainDef,
|
&OP_MainDef,
|
||||||
OP_HUDOptionsMenu,
|
OP_HUDOptionsMenu,
|
||||||
M_DrawHUDOptions,
|
M_DrawHUDOptions,
|
||||||
|
NULL,
|
||||||
30, 20,
|
30, 20,
|
||||||
0,
|
0,
|
||||||
NULL,
|
NULL,
|
||||||
@@ -2571,6 +2597,7 @@ menu_t OP_MonitorToggleDef =
|
|||||||
&OP_GameOptionsDef,
|
&OP_GameOptionsDef,
|
||||||
OP_MonitorToggleMenu,
|
OP_MonitorToggleMenu,
|
||||||
M_DrawMonitorToggles,
|
M_DrawMonitorToggles,
|
||||||
|
NULL,
|
||||||
47, 30,
|
47, 30,
|
||||||
0,
|
0,
|
||||||
NULL,
|
NULL,
|
||||||
@@ -2618,6 +2645,7 @@ menu_t OP_ForkedBirdDef = {
|
|||||||
&OP_MainDef,
|
&OP_MainDef,
|
||||||
OP_ForkedBirdMenu,
|
OP_ForkedBirdMenu,
|
||||||
M_DrawLocalSkinMenu,
|
M_DrawLocalSkinMenu,
|
||||||
|
NULL,
|
||||||
30, 6,
|
30, 6,
|
||||||
0,
|
0,
|
||||||
NULL,
|
NULL,
|
||||||
@@ -2626,191 +2654,7 @@ menu_t OP_ForkedBirdDef = {
|
|||||||
|
|
||||||
menu_t OP_LocalSkinDef = DEFAULTMENUSTYLE(NULL, OP_TiltMenu, &OP_ForkedBirdDef, 30, 60, NULL);
|
menu_t OP_LocalSkinDef = DEFAULTMENUSTYLE(NULL, OP_TiltMenu, &OP_ForkedBirdDef, 30, 60, NULL);
|
||||||
|
|
||||||
|
// Onchange functions to show/hide/move things in menus
|
||||||
// ==========================================================================
|
|
||||||
// CVAR ONCHANGE EVENTS GO HERE
|
|
||||||
// ==========================================================================
|
|
||||||
// (there's only a couple anyway)
|
|
||||||
|
|
||||||
// Nextmap. Used for Time Attack.
|
|
||||||
static void Nextmap_OnChange(void)
|
|
||||||
{
|
|
||||||
char *leveltitle;
|
|
||||||
UINT8 active;
|
|
||||||
|
|
||||||
// Update the string in the consvar.
|
|
||||||
Z_Free(cv_nextmap.zstring);
|
|
||||||
leveltitle = G_BuildMapTitle(cv_nextmap.value);
|
|
||||||
cv_nextmap.string = cv_nextmap.zstring = leveltitle ? leveltitle : Z_StrDup(G_BuildMapName(cv_nextmap.value));
|
|
||||||
|
|
||||||
if (currentMenu == &SP_TimeAttackDef)
|
|
||||||
{
|
|
||||||
// see also p_setup.c's P_LoadRecordGhosts
|
|
||||||
const size_t glen = strlen(srb2home)+1+strlen("replay")+1+strlen(timeattackfolder)+1+strlen("MAPXX")+1;
|
|
||||||
char *gpath = malloc(glen);
|
|
||||||
INT32 i;
|
|
||||||
|
|
||||||
if (!gpath)
|
|
||||||
return;
|
|
||||||
|
|
||||||
sprintf(gpath,"%s"PATHSEP"replay"PATHSEP"%s"PATHSEP"%s", srb2home, timeattackfolder, G_BuildMapName(cv_nextmap.value));
|
|
||||||
|
|
||||||
CV_StealthSetValue(&cv_dummystaff, 0);
|
|
||||||
|
|
||||||
active = false;
|
|
||||||
SP_TimeAttackMenu[taguest].status = IT_DISABLED;
|
|
||||||
SP_TimeAttackMenu[tareplay].status = IT_DISABLED;
|
|
||||||
|
|
||||||
// Check if file exists, if not, disable REPLAY option
|
|
||||||
for (i = 0; i < 4; i++)
|
|
||||||
{
|
|
||||||
SP_ReplayMenu[i].status = IT_DISABLED;
|
|
||||||
SP_GuestReplayMenu[i].status = IT_DISABLED;
|
|
||||||
}
|
|
||||||
SP_ReplayMenu[4].status = IT_DISABLED;
|
|
||||||
|
|
||||||
SP_GhostMenu[3].status = IT_DISABLED;
|
|
||||||
SP_GhostMenu[4].status = IT_DISABLED;
|
|
||||||
|
|
||||||
if (FIL_FileExists(va("%s-%s-time-best.lmp", gpath, cv_chooseskin.string))) {
|
|
||||||
SP_ReplayMenu[0].status = IT_WHITESTRING|IT_CALL;
|
|
||||||
SP_GuestReplayMenu[0].status = IT_WHITESTRING|IT_CALL;
|
|
||||||
active |= 3;
|
|
||||||
}
|
|
||||||
if (FIL_FileExists(va("%s-%s-lap-best.lmp", gpath, cv_chooseskin.string))) {
|
|
||||||
SP_ReplayMenu[1].status = IT_WHITESTRING|IT_CALL;
|
|
||||||
SP_GuestReplayMenu[1].status = IT_WHITESTRING|IT_CALL;
|
|
||||||
active |= 3;
|
|
||||||
}
|
|
||||||
if (FIL_FileExists(va("%s-%s-last.lmp", gpath, cv_chooseskin.string))) {
|
|
||||||
SP_ReplayMenu[2].status = IT_WHITESTRING|IT_CALL;
|
|
||||||
SP_GuestReplayMenu[2].status = IT_WHITESTRING|IT_CALL;
|
|
||||||
active |= 3;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (FIL_FileExists(va("%s-guest.lmp", gpath)))
|
|
||||||
{
|
|
||||||
SP_ReplayMenu[3].status = IT_WHITESTRING|IT_CALL;
|
|
||||||
SP_GuestReplayMenu[3].status = IT_WHITESTRING|IT_CALL;
|
|
||||||
SP_GhostMenu[3].status = IT_STRING|IT_CVAR;
|
|
||||||
active |= 3;
|
|
||||||
}
|
|
||||||
|
|
||||||
CV_SetValue(&cv_dummystaff, 1);
|
|
||||||
if (cv_dummystaff.value)
|
|
||||||
{
|
|
||||||
SP_ReplayMenu[4].status = IT_WHITESTRING|IT_KEYHANDLER;
|
|
||||||
SP_GhostMenu[4].status = IT_STRING|IT_CVAR;
|
|
||||||
CV_StealthSetValue(&cv_dummystaff, 1);
|
|
||||||
active |= 1;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (active) {
|
|
||||||
if (active & 1)
|
|
||||||
SP_TimeAttackMenu[tareplay].status = IT_WHITESTRING|IT_SUBMENU;
|
|
||||||
if (active & 2)
|
|
||||||
SP_TimeAttackMenu[taguest].status = IT_WHITESTRING|IT_SUBMENU;
|
|
||||||
}
|
|
||||||
else if (itemOn == tareplay) // Reset lastOn so replay isn't still selected when not available.
|
|
||||||
{
|
|
||||||
currentMenu->lastOn = itemOn;
|
|
||||||
itemOn = tastart;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (mapheaderinfo[cv_nextmap.value-1] && mapheaderinfo[cv_nextmap.value-1]->forcecharacter[0] != '\0')
|
|
||||||
CV_Set(&cv_chooseskin, mapheaderinfo[cv_nextmap.value-1]->forcecharacter);
|
|
||||||
|
|
||||||
free(gpath);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
static void Dummymenuplayer_OnChange(void)
|
|
||||||
{
|
|
||||||
if (cv_dummymenuplayer.value < 1)
|
|
||||||
CV_StealthSetValue(&cv_dummymenuplayer, splitscreen+1);
|
|
||||||
else if (cv_dummymenuplayer.value > splitscreen+1)
|
|
||||||
CV_StealthSetValue(&cv_dummymenuplayer, 1);
|
|
||||||
}
|
|
||||||
|
|
||||||
char dummystaffname[22];
|
|
||||||
|
|
||||||
static void Dummystaff_OnChange(void)
|
|
||||||
{
|
|
||||||
lumpnum_t l;
|
|
||||||
|
|
||||||
dummystaffname[0] = '\0';
|
|
||||||
|
|
||||||
if ((l = W_CheckNumForName(va("%sS01",G_BuildMapName(cv_nextmap.value)))) == LUMPERROR)
|
|
||||||
{
|
|
||||||
CV_StealthSetValue(&cv_dummystaff, 0);
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
char *temp = dummystaffname;
|
|
||||||
UINT8 numstaff = 1;
|
|
||||||
while (numstaff < 99 && (l = W_CheckNumForName(va("%sS%02u",G_BuildMapName(cv_nextmap.value),numstaff+1))) != LUMPERROR)
|
|
||||||
numstaff++;
|
|
||||||
|
|
||||||
if (cv_dummystaff.value < 1)
|
|
||||||
CV_StealthSetValue(&cv_dummystaff, numstaff);
|
|
||||||
else if (cv_dummystaff.value > numstaff)
|
|
||||||
CV_StealthSetValue(&cv_dummystaff, 1);
|
|
||||||
|
|
||||||
if ((l = W_CheckNumForName(va("%sS%02u",G_BuildMapName(cv_nextmap.value), cv_dummystaff.value))) == LUMPERROR)
|
|
||||||
return; // shouldn't happen but might as well check...
|
|
||||||
|
|
||||||
G_UpdateStaffGhostName(l);
|
|
||||||
|
|
||||||
while (*temp)
|
|
||||||
temp++;
|
|
||||||
|
|
||||||
sprintf(temp, " - %d", cv_dummystaff.value);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
// Newgametype. Used for gametype changes.
|
|
||||||
static void Newgametype_OnChange(void)
|
|
||||||
{
|
|
||||||
if (cv_nextmap.value && menuactive)
|
|
||||||
{
|
|
||||||
if (!mapheaderinfo[cv_nextmap.value-1])
|
|
||||||
P_AllocMapHeader((INT16)(cv_nextmap.value-1));
|
|
||||||
|
|
||||||
if ((cv_newgametype.value == GT_RACE && !(mapheaderinfo[cv_nextmap.value-1]->typeoflevel & TOL_RACE)) || // SRB2kart
|
|
||||||
((cv_newgametype.value == GT_MATCH || cv_newgametype.value == GT_TEAMMATCH) && !(mapheaderinfo[cv_nextmap.value-1]->typeoflevel & TOL_MATCH)))
|
|
||||||
{
|
|
||||||
INT32 value = 0;
|
|
||||||
|
|
||||||
switch (cv_newgametype.value)
|
|
||||||
{
|
|
||||||
case GT_COOP:
|
|
||||||
value = TOL_RACE; // SRB2kart
|
|
||||||
break;
|
|
||||||
case GT_COMPETITION:
|
|
||||||
value = TOL_COMPETITION;
|
|
||||||
break;
|
|
||||||
case GT_RACE:
|
|
||||||
value = TOL_RACE;
|
|
||||||
break;
|
|
||||||
case GT_MATCH:
|
|
||||||
case GT_TEAMMATCH:
|
|
||||||
value = TOL_MATCH;
|
|
||||||
break;
|
|
||||||
case GT_TAG:
|
|
||||||
case GT_HIDEANDSEEK:
|
|
||||||
value = TOL_TAG;
|
|
||||||
break;
|
|
||||||
case GT_CTF:
|
|
||||||
value = TOL_CTF;
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
|
|
||||||
CV_SetValue(&cv_nextmap, M_FindFirstMap(value));
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
void Screenshot_option_Onchange(void)
|
void Screenshot_option_Onchange(void)
|
||||||
{
|
{
|
||||||
OP_ScreenshotOptionsMenu[op_screenshot_folder].status =
|
OP_ScreenshotOptionsMenu[op_screenshot_folder].status =
|
||||||
@@ -2885,22 +2729,9 @@ void Bird_menu_Onchange(void)
|
|||||||
OP_AdvancedBirdMenu[fadegrow].status = status;
|
OP_AdvancedBirdMenu[fadegrow].status = status;
|
||||||
OP_AdvancedBirdMenu[respawnfadeout].status = status;
|
OP_AdvancedBirdMenu[respawnfadeout].status = status;
|
||||||
OP_AdvancedBirdMenu[respawnfadein].status = status;
|
OP_AdvancedBirdMenu[respawnfadein].status = status;
|
||||||
|
|
||||||
if (cv_birdmusic.value)
|
|
||||||
{
|
|
||||||
OP_BirdMenu[lvlresum].status = IT_STRING | IT_CVAR;
|
|
||||||
OP_BirdMenu[spclresum].status = IT_STRING | IT_CVAR;
|
|
||||||
OP_BirdMenu[advmusic].status = IT_STRING | IT_SUBMENU;
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
OP_BirdMenu[lvlresum].status = IT_GRAYEDOUT;
|
|
||||||
OP_BirdMenu[spclresum].status = IT_GRAYEDOUT;
|
|
||||||
OP_BirdMenu[advmusic].status = IT_GRAYEDOUT;
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
//menu code is nice
|
// menu code is nice
|
||||||
void SaturnHud_menu_Onchange(void)
|
void SaturnHud_menu_Onchange(void)
|
||||||
{
|
{
|
||||||
UINT16 status;
|
UINT16 status;
|
||||||
|
|||||||
+7
-6
@@ -1693,22 +1693,23 @@ char *M_GetToken(const char *inputString)
|
|||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
const char * M_Ftrim (double f)
|
const char * M_Ftrim(double f)
|
||||||
{
|
{
|
||||||
static char dig[9];/* "0." + 6 digits (6 is printf's default) */
|
static char dig[9];/* "0." + 6 digits (6 is printf's default) */
|
||||||
int i;
|
int i;
|
||||||
|
|
||||||
/* I know I said it's the default, but just in case... */
|
/* I know I said it's the default, but just in case... */
|
||||||
sprintf(dig, "%.6f", fabs(modf(f, &f)));
|
sprintf(dig, "%.6f", fabs(modf(f, &f)));
|
||||||
|
|
||||||
/* trim trailing zeroes */
|
/* trim trailing zeroes */
|
||||||
for (i = strlen(dig)-1; dig[i] == '0'; --i)
|
for (i = strlen(dig)-1; dig[i] == '0'; --i)
|
||||||
;
|
;
|
||||||
|
|
||||||
if (dig[i] == '.')/* :NOTHING: */
|
if (dig[i] == '.')/* :NOTHING: */
|
||||||
return "";
|
return "";
|
||||||
else
|
|
||||||
{
|
dig[i + 1] = '\0';
|
||||||
dig[i + 1] = '\0';
|
return &dig[1];/* skip the 0 */
|
||||||
return &dig[1];/* skip the 0 */
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/** Count bits in a number.
|
/** Count bits in a number.
|
||||||
|
|||||||
+79
-56
@@ -411,21 +411,13 @@ boolean M_TextInputHandle(textinput_t *input, INT32 key)
|
|||||||
return M_TextInputHandleBase(input, key, false);
|
return M_TextInputHandleBase(input, key, false);
|
||||||
}
|
}
|
||||||
|
|
||||||
boolean M_TextInputHandleEmotes(textinput_t *input, INT32 key, emote_t *suggestions[], int maxsuggestions)
|
static int M_TextInputEmoteStart(textinput_t *input)
|
||||||
{
|
{
|
||||||
boolean ret = M_TextInputHandleBase(input, key, true);
|
if (input->cursor == 0)
|
||||||
|
return -1;
|
||||||
|
|
||||||
// After this handled key we ended up inside an emote, lets fix that
|
int emotestart = -1;
|
||||||
if (M_TextInputCheckEmote(input))
|
|
||||||
M_TextInputToWordEnd(input, !shiftdown);
|
|
||||||
|
|
||||||
// Always clear the first entry
|
|
||||||
suggestions[0] = NULL;
|
|
||||||
|
|
||||||
// For autocomplete
|
|
||||||
int emotestart = 0;
|
|
||||||
|
|
||||||
// Try find suggestions for emote names
|
|
||||||
for (int i = input->cursor-1; i >= 0 && input->cursor-i <= MAXEMOTENAME; --i)
|
for (int i = input->cursor-1; i >= 0 && input->cursor-i <= MAXEMOTENAME; --i)
|
||||||
{
|
{
|
||||||
// Space can't be part of emote name
|
// Space can't be part of emote name
|
||||||
@@ -436,62 +428,93 @@ boolean M_TextInputHandleEmotes(textinput_t *input, INT32 key, emote_t *suggesti
|
|||||||
if (input->buffer[i] == ':')
|
if (input->buffer[i] == ':')
|
||||||
{
|
{
|
||||||
emotestart = i+1;
|
emotestart = i+1;
|
||||||
// ...But only if we typed at least something
|
|
||||||
if ((int)input->cursor-(i-1) < 3)
|
|
||||||
break;
|
|
||||||
|
|
||||||
for (int skip = 0; skip < maxsuggestions; ++skip)
|
|
||||||
{
|
|
||||||
suggestions[skip] = M_FindEmote(input->buffer+i+1, input->cursor-i-1, skip);
|
|
||||||
|
|
||||||
// No more suggestions
|
|
||||||
if (!suggestions[skip])
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
|
|
||||||
// In any case, we found what we wanted, can exit the loop now
|
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
// If we suggest emotes, try autocomplete
|
return emotestart;
|
||||||
if (key == '\t' && suggestions[0])
|
}
|
||||||
|
|
||||||
|
static boolean M_TextInputCompleteEmote(textinput_t *input, emote_autocomplete_t *autocomplete)
|
||||||
|
{
|
||||||
|
if (input->cursor == 0)
|
||||||
|
return false;
|
||||||
|
|
||||||
|
// If we're in "autocomplete" state, delete ':' for latest autocompleted emote
|
||||||
|
if (autocomplete->complete[0])
|
||||||
{
|
{
|
||||||
int pos = (input->cursor-emotestart);
|
if (input->buffer[input->cursor-1] == ':')
|
||||||
boolean autocomplete = true;
|
|
||||||
|
|
||||||
while (autocomplete)
|
|
||||||
{
|
{
|
||||||
// Check if current character matches for all suggestions
|
M_TextInputDelChar(input);
|
||||||
char c = suggestions[0]->name[pos];
|
|
||||||
|
|
||||||
// End of string reached
|
|
||||||
if (!c)
|
|
||||||
break;
|
|
||||||
|
|
||||||
for (int i = 1; i < maxsuggestions && suggestions[i]; ++i)
|
|
||||||
{
|
|
||||||
if (suggestions[i]->name[pos] != c)
|
|
||||||
{
|
|
||||||
autocomplete = false;
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
++pos;
|
|
||||||
|
|
||||||
if (autocomplete)
|
|
||||||
M_TextInputAddChar(input, c);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
// This was the only suggestion, finish autocomplete with a ':' and clear suggestions
|
autocomplete->skip++;
|
||||||
if (maxsuggestions == 1 || !suggestions[1])
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
// Try to find emote to autocomplete
|
||||||
|
|
||||||
|
int emotestart = autocomplete->emotestart;
|
||||||
|
|
||||||
|
// No emote - no autocomplete
|
||||||
|
if (emotestart == -1 || input->cursor - emotestart < 2)
|
||||||
|
return false;
|
||||||
|
|
||||||
|
strlcpy(autocomplete->complete, &input->buffer[emotestart], input->cursor-emotestart+1);
|
||||||
|
}
|
||||||
|
|
||||||
|
emote_t *completed = M_FindEmote(autocomplete->complete, strlen(autocomplete->complete), autocomplete->skip);
|
||||||
|
|
||||||
|
// We hit end of list of suggested emotes
|
||||||
|
if (completed == NULL)
|
||||||
|
{
|
||||||
|
autocomplete->skip = 0;
|
||||||
|
completed = M_FindEmote(autocomplete->complete, strlen(autocomplete->complete), autocomplete->skip);
|
||||||
|
|
||||||
|
// NULL again, list was empty to begin with
|
||||||
|
if (completed == NULL)
|
||||||
{
|
{
|
||||||
M_TextInputAddChar(input, ':');
|
// Clear autocompletion state
|
||||||
suggestions[0] = NULL;
|
autocomplete->complete[0] = 0;
|
||||||
|
return false;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// Erase previously typed emote. Not really efficent but too lazy to count chars and do M_TextInputDel()
|
||||||
|
while (input->buffer[input->cursor-1] != ':')
|
||||||
|
{
|
||||||
|
M_TextInputDelChar(input);
|
||||||
|
}
|
||||||
|
|
||||||
|
M_TextInputAddString(input, completed->name);
|
||||||
|
M_TextInputAddChar(input, ':');
|
||||||
|
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
|
||||||
|
boolean M_TextInputHandleEmotes(textinput_t *input, INT32 key, emote_autocomplete_t *autocomplete)
|
||||||
|
{
|
||||||
|
boolean ret = M_TextInputHandleBase(input, key, true);
|
||||||
|
|
||||||
|
// After this handled key we ended up inside an emote, lets fix that
|
||||||
|
if (M_TextInputCheckEmote(input))
|
||||||
|
M_TextInputToWordEnd(input, !shiftdown);
|
||||||
|
|
||||||
|
// Always update it
|
||||||
|
autocomplete->emotestart = M_TextInputEmoteStart(input);
|
||||||
|
|
||||||
|
if (key == '\t' || (autocomplete->complete[0] == 0 && key == KEY_ENTER))
|
||||||
|
{
|
||||||
|
if (M_TextInputCompleteEmote(input, autocomplete) && key == KEY_ENTER) // Don't send message if we've autocompleted an emote
|
||||||
|
ret = true;
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
// Reset state just in case
|
||||||
|
autocomplete->complete[0] = 0;
|
||||||
|
autocomplete->skip = 0;
|
||||||
|
}
|
||||||
|
|
||||||
return ret;
|
return ret;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
+7
-1
@@ -26,6 +26,12 @@ typedef struct textinput_s {
|
|||||||
unsigned skull;
|
unsigned skull;
|
||||||
} textinput_t;
|
} textinput_t;
|
||||||
|
|
||||||
|
typedef struct emote_autocomplete_s {
|
||||||
|
char complete[MAXEMOTENAME+1];
|
||||||
|
int skip;
|
||||||
|
int emotestart;
|
||||||
|
} emote_autocomplete_t;
|
||||||
|
|
||||||
void M_TextInputInit(textinput_t *input, char *buffer, size_t buffer_size);
|
void M_TextInputInit(textinput_t *input, char *buffer, size_t buffer_size);
|
||||||
|
|
||||||
void M_TextInputClear(textinput_t *input);
|
void M_TextInputClear(textinput_t *input);
|
||||||
@@ -36,7 +42,7 @@ boolean M_TextInputHandle(textinput_t *input, INT32 key);
|
|||||||
|
|
||||||
// Does everything same as M_TextInputHandle, but also handles emotes in input string
|
// Does everything same as M_TextInputHandle, but also handles emotes in input string
|
||||||
// If currently typing something that looks like an existing emote, return suggestions for it
|
// If currently typing something that looks like an existing emote, return suggestions for it
|
||||||
boolean M_TextInputHandleEmotes(textinput_t *input, INT32 key, emote_t *suggestions[], int maxsuggestions);
|
boolean M_TextInputHandleEmotes(textinput_t *input, INT32 key, emote_autocomplete_t *autocomplete);
|
||||||
|
|
||||||
#define M_DrawTextInput(x, y, input, flags) M_DrawTextInputScroll((x), (y), (input), (flags), ((input)->buffer_size-1)*8)
|
#define M_DrawTextInput(x, y, input, flags) M_DrawTextInputScroll((x), (y), (input), (flags), ((input)->buffer_size-1)*8)
|
||||||
void M_DrawTextInputScroll(INT32 x, INT32 y, textinput_t *input, INT32 flags, INT32 MAXINPUTWIDTH);
|
void M_DrawTextInputScroll(INT32 x, INT32 y, textinput_t *input, INT32 flags, INT32 MAXINPUTWIDTH);
|
||||||
|
|||||||
+10
-3
@@ -89,10 +89,10 @@ consvar_t cv_masterserver_nagattempts = {"masterserver_nagattempts", "5", CV_SAV
|
|||||||
|
|
||||||
|
|
||||||
#if defined (MASTERSERVER) && defined (HAVE_THREADS)
|
#if defined (MASTERSERVER) && defined (HAVE_THREADS)
|
||||||
int ms_QueryId;
|
int ms_QueryId = 0;
|
||||||
I_mutex ms_QueryId_mutex;
|
I_mutex ms_QueryId_mutex;
|
||||||
|
|
||||||
msg_server_t *ms_ServerList;
|
msg_server_t *ms_ServerList = NULL;
|
||||||
I_mutex ms_ServerList_mutex;
|
I_mutex ms_ServerList_mutex;
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
@@ -608,10 +608,17 @@ Update_parameters (void)
|
|||||||
}
|
}
|
||||||
#endif/*MASTERSERVER*/
|
#endif/*MASTERSERVER*/
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#ifdef MASTERSERVER
|
||||||
|
void Update_MS(void)
|
||||||
|
{
|
||||||
|
Update_parameters();
|
||||||
|
}
|
||||||
|
#endif
|
||||||
|
|
||||||
#ifdef MASTERSERVER
|
#ifdef MASTERSERVER
|
||||||
static void MasterServer_OnChange(void)
|
static void MasterServer_OnChange(void)
|
||||||
{
|
{
|
||||||
|
|
||||||
UnregisterServer();
|
UnregisterServer();
|
||||||
|
|
||||||
Set_api(cv_masterserver.string);
|
Set_api(cv_masterserver.string);
|
||||||
|
|||||||
@@ -88,6 +88,8 @@ char *GetMODVersion(int id);
|
|||||||
#endif
|
#endif
|
||||||
|
|
||||||
char *GetMasterServerRules(void);
|
char *GetMasterServerRules(void);
|
||||||
|
|
||||||
|
void Update_MS(void);
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
void AddMServCommands(void);
|
void AddMServCommands(void);
|
||||||
|
|||||||
@@ -24,9 +24,6 @@
|
|||||||
// CEILINGS
|
// CEILINGS
|
||||||
// ==========================================================================
|
// ==========================================================================
|
||||||
|
|
||||||
// the list of ceilings moving currently, including crushers
|
|
||||||
INT32 ceilmovesound = sfx_None;
|
|
||||||
|
|
||||||
/** Moves a moving ceiling.
|
/** Moves a moving ceiling.
|
||||||
*
|
*
|
||||||
* \param ceiling Thinker for the ceiling to be moved.
|
* \param ceiling Thinker for the ceiling to be moved.
|
||||||
@@ -36,7 +33,6 @@ INT32 ceilmovesound = sfx_None;
|
|||||||
void T_MoveCeiling(ceiling_t *ceiling)
|
void T_MoveCeiling(ceiling_t *ceiling)
|
||||||
{
|
{
|
||||||
result_e res;
|
result_e res;
|
||||||
boolean dontupdate = false;
|
|
||||||
|
|
||||||
if (ceiling->delaytimer)
|
if (ceiling->delaytimer)
|
||||||
{
|
{
|
||||||
@@ -72,9 +68,7 @@ void T_MoveCeiling(ceiling_t *ceiling)
|
|||||||
case instantMoveCeilingByFrontSector:
|
case instantMoveCeilingByFrontSector:
|
||||||
ceiling->sector->ceilingpic = ceiling->texture;
|
ceiling->sector->ceilingpic = ceiling->texture;
|
||||||
ceiling->sector->ceilingdata = NULL;
|
ceiling->sector->ceilingdata = NULL;
|
||||||
ceiling->sector->ceilspeed = 0;
|
|
||||||
P_RemoveThinker(&ceiling->thinker);
|
P_RemoveThinker(&ceiling->thinker);
|
||||||
dontupdate = true;
|
|
||||||
break;
|
break;
|
||||||
case moveCeilingByFrontSector:
|
case moveCeilingByFrontSector:
|
||||||
if (ceiling->texture < -1) // chained linedef executing
|
if (ceiling->texture < -1) // chained linedef executing
|
||||||
@@ -86,9 +80,7 @@ void T_MoveCeiling(ceiling_t *ceiling)
|
|||||||
// case raiseCeilingByLine:
|
// case raiseCeilingByLine:
|
||||||
case moveCeilingByFrontTexture:
|
case moveCeilingByFrontTexture:
|
||||||
ceiling->sector->ceilingdata = NULL;
|
ceiling->sector->ceilingdata = NULL;
|
||||||
ceiling->sector->ceilspeed = 0;
|
|
||||||
P_RemoveThinker(&ceiling->thinker);
|
P_RemoveThinker(&ceiling->thinker);
|
||||||
dontupdate = true;
|
|
||||||
break;
|
break;
|
||||||
|
|
||||||
case fastCrushAndRaise:
|
case fastCrushAndRaise:
|
||||||
@@ -192,9 +184,7 @@ void T_MoveCeiling(ceiling_t *ceiling)
|
|||||||
case instantMoveCeilingByFrontSector:
|
case instantMoveCeilingByFrontSector:
|
||||||
ceiling->sector->ceilingpic = ceiling->texture;
|
ceiling->sector->ceilingpic = ceiling->texture;
|
||||||
ceiling->sector->ceilingdata = NULL;
|
ceiling->sector->ceilingdata = NULL;
|
||||||
ceiling->sector->ceilspeed = 0;
|
|
||||||
P_RemoveThinker(&ceiling->thinker);
|
P_RemoveThinker(&ceiling->thinker);
|
||||||
dontupdate = true;
|
|
||||||
break;
|
break;
|
||||||
|
|
||||||
case moveCeilingByFrontSector:
|
case moveCeilingByFrontSector:
|
||||||
@@ -212,9 +202,7 @@ void T_MoveCeiling(ceiling_t *ceiling)
|
|||||||
// case lowerCeilingByLine:
|
// case lowerCeilingByLine:
|
||||||
case moveCeilingByFrontTexture:
|
case moveCeilingByFrontTexture:
|
||||||
ceiling->sector->ceilingdata = NULL;
|
ceiling->sector->ceilingdata = NULL;
|
||||||
ceiling->sector->ceilspeed = 0;
|
|
||||||
P_RemoveThinker(&ceiling->thinker);
|
P_RemoveThinker(&ceiling->thinker);
|
||||||
dontupdate = true;
|
|
||||||
break;
|
break;
|
||||||
case bounceCeiling:
|
case bounceCeiling:
|
||||||
{
|
{
|
||||||
@@ -293,10 +281,6 @@ void T_MoveCeiling(ceiling_t *ceiling)
|
|||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
if (!dontupdate)
|
|
||||||
ceiling->sector->ceilspeed = ceiling->speed*ceiling->direction;
|
|
||||||
else
|
|
||||||
ceiling->sector->ceilspeed = 0;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/** Moves a ceiling crusher.
|
/** Moves a ceiling crusher.
|
||||||
@@ -338,12 +322,9 @@ void T_CrushCeiling(ceiling_t *ceiling)
|
|||||||
switch(ceiling->type)
|
switch(ceiling->type)
|
||||||
{
|
{
|
||||||
case crushCeilOnce:
|
case crushCeilOnce:
|
||||||
ceiling->sector->ceilspeed = 0;
|
|
||||||
ceiling->sector->ceilingdata = NULL;
|
ceiling->sector->ceilingdata = NULL;
|
||||||
break;
|
break;
|
||||||
case crushBothOnce:
|
case crushBothOnce:
|
||||||
ceiling->sector->floorspeed = 0;
|
|
||||||
ceiling->sector->ceilspeed = 0;
|
|
||||||
ceiling->sector->ceilingdata = NULL;
|
ceiling->sector->ceilingdata = NULL;
|
||||||
break;
|
break;
|
||||||
default:
|
default:
|
||||||
@@ -380,11 +361,6 @@ void T_CrushCeiling(ceiling_t *ceiling)
|
|||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (ceiling->type == crushBothOnce)
|
|
||||||
ceiling->sector->floorspeed = ceiling->speed*(-ceiling->direction);
|
|
||||||
|
|
||||||
ceiling->sector->ceilspeed = ceiling->speed*ceiling->direction;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/** Starts a ceiling mover.
|
/** Starts a ceiling mover.
|
||||||
|
|||||||
+19
-8
@@ -8176,13 +8176,16 @@ void A_SPBChase(void *thing)
|
|||||||
// Smoothly rotate horz angle
|
// Smoothly rotate horz angle
|
||||||
angle_t input = hang - actor->angle;
|
angle_t input = hang - actor->angle;
|
||||||
boolean invert = (input > ANGLE_180);
|
boolean invert = (input > ANGLE_180);
|
||||||
|
fixed_t fixedinput;
|
||||||
if (invert)
|
if (invert)
|
||||||
input = InvAngle(input);
|
input = InvAngle(input);
|
||||||
|
fixedinput = AngleFixed(input);
|
||||||
|
|
||||||
// Slow down when turning; it looks better and makes U-turns not unfair
|
// Slow down when turning; it looks better and makes U-turns not unfair
|
||||||
xyspeed = FixedMul(actor->cvmem, max(0, (((180<<FRACBITS) - AngleFixed(input)) / 90) - FRACUNIT));
|
xyspeed = (((180<<FRACBITS) - fixedinput) / 90) - FRACUNIT;
|
||||||
|
xyspeed = FixedMul(actor->cvmem, max(0, xyspeed));
|
||||||
|
|
||||||
input = FixedAngle(AngleFixed(input)/4);
|
input = FixedAngle(fixedinput/4);
|
||||||
if (invert)
|
if (invert)
|
||||||
input = InvAngle(input);
|
input = InvAngle(input);
|
||||||
|
|
||||||
@@ -8193,11 +8196,13 @@ void A_SPBChase(void *thing)
|
|||||||
invert = (input > ANGLE_180);
|
invert = (input > ANGLE_180);
|
||||||
if (invert)
|
if (invert)
|
||||||
input = InvAngle(input);
|
input = InvAngle(input);
|
||||||
|
fixedinput = AngleFixed(input);
|
||||||
|
|
||||||
// Slow down when turning; might as well do it for momz, since we do it above too
|
// Slow down when turning; might as well do it for momz, since we do it above too
|
||||||
zspeed = FixedMul(actor->cvmem, max(0, (((180<<FRACBITS) - AngleFixed(input)) / 90) - FRACUNIT));
|
zspeed = (((180<<FRACBITS) - fixedinput) / 90) - FRACUNIT;
|
||||||
|
zspeed = FixedMul(actor->cvmem, max(0, zspeed));
|
||||||
|
|
||||||
input = FixedAngle(AngleFixed(input)/4);
|
input = FixedAngle(fixedinput/4);
|
||||||
if (invert)
|
if (invert)
|
||||||
input = InvAngle(input);
|
input = InvAngle(input);
|
||||||
|
|
||||||
@@ -8301,13 +8306,17 @@ void A_SPBChase(void *thing)
|
|||||||
// Smoothly rotate horz angle
|
// Smoothly rotate horz angle
|
||||||
angle_t input = hang - actor->angle;
|
angle_t input = hang - actor->angle;
|
||||||
boolean invert = (input > ANGLE_180);
|
boolean invert = (input > ANGLE_180);
|
||||||
|
fixed_t fixedinput;
|
||||||
|
|
||||||
if (invert)
|
if (invert)
|
||||||
input = InvAngle(input);
|
input = InvAngle(input);
|
||||||
|
fixedinput = AngleFixed(input);
|
||||||
|
|
||||||
// Slow down when turning; it looks better and makes U-turns not unfair
|
// Slow down when turning; it looks better and makes U-turns not unfair
|
||||||
xyspeed = FixedMul(wspeed, max(0, (((180<<FRACBITS) - AngleFixed(input)) / 90) - FRACUNIT));
|
xyspeed = (((180<<FRACBITS) - fixedinput) / 90) - FRACUNIT;
|
||||||
|
xyspeed = FixedMul(wspeed, max(0, xyspeed));
|
||||||
|
|
||||||
input = FixedAngle(AngleFixed(input)/4);
|
input = FixedAngle(fixedinput/4);
|
||||||
if (invert)
|
if (invert)
|
||||||
input = InvAngle(input);
|
input = InvAngle(input);
|
||||||
|
|
||||||
@@ -8318,11 +8327,13 @@ void A_SPBChase(void *thing)
|
|||||||
invert = (input > ANGLE_180);
|
invert = (input > ANGLE_180);
|
||||||
if (invert)
|
if (invert)
|
||||||
input = InvAngle(input);
|
input = InvAngle(input);
|
||||||
|
fixedinput = AngleFixed(input);
|
||||||
|
|
||||||
// Slow down when turning; might as well do it for momz, since we do it above too
|
// Slow down when turning; might as well do it for momz, since we do it above too
|
||||||
zspeed = FixedMul(wspeed, max(0, (((180<<FRACBITS) - AngleFixed(input)) / 90) - FRACUNIT));
|
zspeed = max(0, (((180<<FRACBITS) - fixedinput) / 90) - FRACUNIT);
|
||||||
|
zspeed = FixedMul(wspeed, zspeed);
|
||||||
|
|
||||||
input = FixedAngle(AngleFixed(input)/4);
|
input = FixedAngle(fixedinput/4);
|
||||||
if (invert)
|
if (invert)
|
||||||
input = InvAngle(input);
|
input = InvAngle(input);
|
||||||
|
|
||||||
|
|||||||
+2
-90
@@ -279,7 +279,6 @@ result_e T_MovePlane(sector_t *sector, fixed_t speed, fixed_t dest, boolean crus
|
|||||||
void T_MoveFloor(floormove_t *movefloor)
|
void T_MoveFloor(floormove_t *movefloor)
|
||||||
{
|
{
|
||||||
result_e res = 0;
|
result_e res = 0;
|
||||||
boolean dontupdate = false;
|
|
||||||
|
|
||||||
if (movefloor->delaytimer)
|
if (movefloor->delaytimer)
|
||||||
{
|
{
|
||||||
@@ -325,7 +324,6 @@ void T_MoveFloor(floormove_t *movefloor)
|
|||||||
else
|
else
|
||||||
movefloor->floordestheight = lines[movefloor->texture].frontsector->floorheight;
|
movefloor->floordestheight = lines[movefloor->texture].frontsector->floorheight;
|
||||||
movefloor->direction = (movefloor->floordestheight < movefloor->sector->floorheight) ? -1 : 1;
|
movefloor->direction = (movefloor->floordestheight < movefloor->sector->floorheight) ? -1 : 1;
|
||||||
movefloor->sector->floorspeed = movefloor->speed * movefloor->direction;
|
|
||||||
movefloor->delaytimer = movefloor->delay;
|
movefloor->delaytimer = movefloor->delay;
|
||||||
movefloor->sector->moved = true;
|
movefloor->sector->moved = true;
|
||||||
return; // not break, why did this work? Graue 04-03-2004
|
return; // not break, why did this work? Graue 04-03-2004
|
||||||
@@ -341,7 +339,6 @@ void T_MoveFloor(floormove_t *movefloor)
|
|||||||
movefloor->speed = movefloor->origspeed = FixedDiv(abs(lines[movefloor->texture].dx),4*FRACUNIT); // forward again, use dx
|
movefloor->speed = movefloor->origspeed = FixedDiv(abs(lines[movefloor->texture].dx),4*FRACUNIT); // forward again, use dx
|
||||||
}
|
}
|
||||||
movefloor->direction = (movefloor->floordestheight < movefloor->sector->floorheight) ? -1 : 1;
|
movefloor->direction = (movefloor->floordestheight < movefloor->sector->floorheight) ? -1 : 1;
|
||||||
movefloor->sector->floorspeed = movefloor->speed * movefloor->direction;
|
|
||||||
movefloor->delaytimer = movefloor->delay;
|
movefloor->delaytimer = movefloor->delay;
|
||||||
movefloor->sector->moved = true;
|
movefloor->sector->moved = true;
|
||||||
return; // not break, why did this work? Graue 04-03-2004
|
return; // not break, why did this work? Graue 04-03-2004
|
||||||
@@ -374,7 +371,6 @@ void T_MoveFloor(floormove_t *movefloor)
|
|||||||
else
|
else
|
||||||
movefloor->floordestheight = lines[movefloor->texture].frontsector->floorheight;
|
movefloor->floordestheight = lines[movefloor->texture].frontsector->floorheight;
|
||||||
movefloor->direction = (movefloor->floordestheight < movefloor->sector->floorheight) ? -1 : 1;
|
movefloor->direction = (movefloor->floordestheight < movefloor->sector->floorheight) ? -1 : 1;
|
||||||
movefloor->sector->floorspeed = movefloor->speed * movefloor->direction;
|
|
||||||
movefloor->delaytimer = movefloor->delay;
|
movefloor->delaytimer = movefloor->delay;
|
||||||
movefloor->sector->moved = true;
|
movefloor->sector->moved = true;
|
||||||
return; // not break, why did this work? Graue 04-03-2004
|
return; // not break, why did this work? Graue 04-03-2004
|
||||||
@@ -390,14 +386,12 @@ void T_MoveFloor(floormove_t *movefloor)
|
|||||||
movefloor->speed = movefloor->origspeed = FixedDiv(abs(lines[movefloor->texture].dx),4*FRACUNIT); // forward again, use dx
|
movefloor->speed = movefloor->origspeed = FixedDiv(abs(lines[movefloor->texture].dx),4*FRACUNIT); // forward again, use dx
|
||||||
}
|
}
|
||||||
movefloor->direction = (movefloor->floordestheight < movefloor->sector->floorheight) ? -1 : 1;
|
movefloor->direction = (movefloor->floordestheight < movefloor->sector->floorheight) ? -1 : 1;
|
||||||
movefloor->sector->floorspeed = movefloor->speed * movefloor->direction;
|
|
||||||
movefloor->delaytimer = movefloor->delay;
|
movefloor->delaytimer = movefloor->delay;
|
||||||
movefloor->sector->moved = true;
|
movefloor->sector->moved = true;
|
||||||
return; // not break, why did this work? Graue 04-03-2004
|
return; // not break, why did this work? Graue 04-03-2004
|
||||||
case crushFloorOnce:
|
case crushFloorOnce:
|
||||||
movefloor->sector->floordata = NULL; // Clear up the thinker so others can use it
|
movefloor->sector->floordata = NULL; // Clear up the thinker so others can use it
|
||||||
P_RemoveThinker(&movefloor->thinker);
|
P_RemoveThinker(&movefloor->thinker);
|
||||||
movefloor->sector->floorspeed = 0;
|
|
||||||
movefloor->sector->moved = true;
|
movefloor->sector->moved = true;
|
||||||
return;
|
return;
|
||||||
default:
|
default:
|
||||||
@@ -406,14 +400,8 @@ void T_MoveFloor(floormove_t *movefloor)
|
|||||||
}
|
}
|
||||||
|
|
||||||
movefloor->sector->floordata = NULL; // Clear up the thinker so others can use it
|
movefloor->sector->floordata = NULL; // Clear up the thinker so others can use it
|
||||||
movefloor->sector->floorspeed = 0;
|
|
||||||
P_RemoveThinker(&movefloor->thinker);
|
P_RemoveThinker(&movefloor->thinker);
|
||||||
dontupdate = true;
|
|
||||||
}
|
}
|
||||||
if (!dontupdate)
|
|
||||||
movefloor->sector->floorspeed = movefloor->speed*movefloor->direction;
|
|
||||||
else
|
|
||||||
movefloor->sector->floorspeed = 0;
|
|
||||||
|
|
||||||
movefloor->sector->moved = true;
|
movefloor->sector->moved = true;
|
||||||
}
|
}
|
||||||
@@ -623,22 +611,13 @@ void T_MoveElevator(elevator_t *elevator)
|
|||||||
{
|
{
|
||||||
elevator->sector->floordata = NULL; //jff 2/22/98
|
elevator->sector->floordata = NULL; //jff 2/22/98
|
||||||
elevator->sector->ceilingdata = NULL; //jff 2/22/98
|
elevator->sector->ceilingdata = NULL; //jff 2/22/98
|
||||||
elevator->sector->ceilspeed = 0;
|
|
||||||
elevator->sector->floorspeed = 0;
|
|
||||||
P_RemoveThinker(&elevator->thinker); // remove elevator from actives
|
P_RemoveThinker(&elevator->thinker); // remove elevator from actives
|
||||||
dontupdate = true;
|
dontupdate = true;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if (!dontupdate)
|
if (dontupdate)
|
||||||
{
|
{
|
||||||
elevator->sector->floorspeed = elevator->speed*elevator->direction;
|
|
||||||
elevator->sector->ceilspeed = 42;
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
elevator->sector->floorspeed = 0;
|
|
||||||
elevator->sector->ceilspeed = 0;
|
|
||||||
elevator->sector->floordata = NULL;
|
elevator->sector->floordata = NULL;
|
||||||
elevator->sector->ceilingdata = NULL;
|
elevator->sector->ceilingdata = NULL;
|
||||||
}
|
}
|
||||||
@@ -695,8 +674,6 @@ void T_ContinuousFalling(levelspecthink_t *faller)
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
faller->sector->floorspeed = faller->speed*faller->direction;
|
|
||||||
faller->sector->ceilspeed = 42;
|
|
||||||
faller->sector->moved = true;
|
faller->sector->moved = true;
|
||||||
#undef speed
|
#undef speed
|
||||||
#undef direction
|
#undef direction
|
||||||
@@ -767,9 +744,7 @@ void T_BounceCheese(levelspecthink_t *bouncer)
|
|||||||
{
|
{
|
||||||
bouncer->sector->crumblestate = 1;
|
bouncer->sector->crumblestate = 1;
|
||||||
bouncer->sector->ceilingdata = NULL;
|
bouncer->sector->ceilingdata = NULL;
|
||||||
bouncer->sector->ceilspeed = 0;
|
|
||||||
bouncer->sector->floordata = NULL;
|
bouncer->sector->floordata = NULL;
|
||||||
bouncer->sector->floorspeed = 0;
|
|
||||||
P_RemoveThinker(&bouncer->thinker); // remove bouncer from actives
|
P_RemoveThinker(&bouncer->thinker); // remove bouncer from actives
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
@@ -795,8 +770,6 @@ void T_BounceCheese(levelspecthink_t *bouncer)
|
|||||||
T_MovePlane(bouncer->sector, 0, bouncer->sector->floorheight, 0, 0, -1); // update things on floor
|
T_MovePlane(bouncer->sector, 0, bouncer->sector->floorheight, 0, 0, -1); // update things on floor
|
||||||
bouncer->sector->ceilingdata = NULL;
|
bouncer->sector->ceilingdata = NULL;
|
||||||
bouncer->sector->floordata = NULL;
|
bouncer->sector->floordata = NULL;
|
||||||
bouncer->sector->floorspeed = 0;
|
|
||||||
bouncer->sector->ceilspeed = 0;
|
|
||||||
bouncer->sector->moved = true;
|
bouncer->sector->moved = true;
|
||||||
P_RemoveThinker(&bouncer->thinker); // remove bouncer from actives
|
P_RemoveThinker(&bouncer->thinker); // remove bouncer from actives
|
||||||
return;
|
return;
|
||||||
@@ -810,8 +783,6 @@ void T_BounceCheese(levelspecthink_t *bouncer)
|
|||||||
T_MovePlane(bouncer->sector, 0, bouncer->sector->floorheight, 0, 0, -1); // update things on floor
|
T_MovePlane(bouncer->sector, 0, bouncer->sector->floorheight, 0, 0, -1); // update things on floor
|
||||||
bouncer->sector->ceilingdata = NULL;
|
bouncer->sector->ceilingdata = NULL;
|
||||||
bouncer->sector->floordata = NULL;
|
bouncer->sector->floordata = NULL;
|
||||||
bouncer->sector->floorspeed = 0;
|
|
||||||
bouncer->sector->ceilspeed = 0;
|
|
||||||
bouncer->sector->moved = true;
|
bouncer->sector->moved = true;
|
||||||
P_RemoveThinker(&bouncer->thinker); // remove bouncer from actives
|
P_RemoveThinker(&bouncer->thinker); // remove bouncer from actives
|
||||||
return;
|
return;
|
||||||
@@ -827,9 +798,6 @@ void T_BounceCheese(levelspecthink_t *bouncer)
|
|||||||
T_MovePlane(bouncer->sector, bouncer->speed/2, bouncer->sector->floorheight - 70*FRACUNIT,
|
T_MovePlane(bouncer->sector, bouncer->speed/2, bouncer->sector->floorheight - 70*FRACUNIT,
|
||||||
0, 0, -1); // move floor
|
0, 0, -1); // move floor
|
||||||
|
|
||||||
bouncer->sector->floorspeed = -bouncer->speed/2;
|
|
||||||
bouncer->sector->ceilspeed = 42;
|
|
||||||
|
|
||||||
if (bouncer->sector->ceilingheight < bouncer->ceilingwasheight && bouncer->low == 0) // Down
|
if (bouncer->sector->ceilingheight < bouncer->ceilingwasheight && bouncer->low == 0) // Down
|
||||||
{
|
{
|
||||||
if (abs(bouncer->speed) < 6*FRACUNIT)
|
if (abs(bouncer->speed) < 6*FRACUNIT)
|
||||||
@@ -878,9 +846,7 @@ void T_BounceCheese(levelspecthink_t *bouncer)
|
|||||||
T_MovePlane(bouncer->sector, 0, bouncer->sector->ceilingheight, 0, 1, -1); // update things on ceiling
|
T_MovePlane(bouncer->sector, 0, bouncer->sector->ceilingheight, 0, 1, -1); // update things on ceiling
|
||||||
T_MovePlane(bouncer->sector, 0, bouncer->sector->floorheight, 0, 0, -1); // update things on floor
|
T_MovePlane(bouncer->sector, 0, bouncer->sector->floorheight, 0, 0, -1); // update things on floor
|
||||||
bouncer->sector->ceilingdata = NULL;
|
bouncer->sector->ceilingdata = NULL;
|
||||||
bouncer->sector->floordata = NULL;
|
bouncer->sector->floordata = NULL;;
|
||||||
bouncer->sector->floorspeed = 0;
|
|
||||||
bouncer->sector->ceilspeed = 0;
|
|
||||||
bouncer->sector->moved = true;
|
bouncer->sector->moved = true;
|
||||||
P_RemoveThinker(&bouncer->thinker); // remove bouncer from actives
|
P_RemoveThinker(&bouncer->thinker); // remove bouncer from actives
|
||||||
}
|
}
|
||||||
@@ -920,8 +886,6 @@ void T_StartCrumble(elevator_t *elevator)
|
|||||||
|| (elevator->floordestheight == 0 && elevator->direction == 1))
|
|| (elevator->floordestheight == 0 && elevator->direction == 1))
|
||||||
&& elevator->type == elevateContinuous) // No return crumbler
|
&& elevator->type == elevateContinuous) // No return crumbler
|
||||||
{
|
{
|
||||||
elevator->sector->ceilspeed = 0;
|
|
||||||
elevator->sector->floorspeed = 0;
|
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -934,9 +898,6 @@ void T_StartCrumble(elevator_t *elevator)
|
|||||||
elevator->distance = -15*TICRATE; // Timer until platform returns to original position.
|
elevator->distance = -15*TICRATE; // Timer until platform returns to original position.
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
// Timer isn't up yet, so just keep waiting.
|
|
||||||
elevator->sector->ceilspeed = 0;
|
|
||||||
elevator->sector->floorspeed = 0;
|
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -965,8 +926,6 @@ void T_StartCrumble(elevator_t *elevator)
|
|||||||
else
|
else
|
||||||
elevator->direction = 1;
|
elevator->direction = 1;
|
||||||
|
|
||||||
elevator->sector->ceilspeed = 0;
|
|
||||||
elevator->sector->floorspeed = 0;
|
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -1050,9 +1009,6 @@ void T_StartCrumble(elevator_t *elevator)
|
|||||||
0, // move ceiling
|
0, // move ceiling
|
||||||
elevator->direction
|
elevator->direction
|
||||||
);
|
);
|
||||||
|
|
||||||
elevator->sector->ceilspeed = 42;
|
|
||||||
elevator->sector->floorspeed = elevator->speed*elevator->direction;
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -1063,8 +1019,6 @@ void T_StartCrumble(elevator_t *elevator)
|
|||||||
elevator->sector->floorheight = elevator->floorwasheight;
|
elevator->sector->floorheight = elevator->floorwasheight;
|
||||||
elevator->sector->floordata = NULL;
|
elevator->sector->floordata = NULL;
|
||||||
elevator->sector->ceilingdata = NULL;
|
elevator->sector->ceilingdata = NULL;
|
||||||
elevator->sector->ceilspeed = 0;
|
|
||||||
elevator->sector->floorspeed = 0;
|
|
||||||
elevator->sector->moved = true;
|
elevator->sector->moved = true;
|
||||||
P_RemoveThinker(&elevator->thinker);
|
P_RemoveThinker(&elevator->thinker);
|
||||||
}
|
}
|
||||||
@@ -1121,8 +1075,6 @@ void T_MarioBlock(levelspecthink_t *block)
|
|||||||
P_RemoveThinker(&block->thinker);
|
P_RemoveThinker(&block->thinker);
|
||||||
block->sector->floordata = NULL;
|
block->sector->floordata = NULL;
|
||||||
block->sector->ceilingdata = NULL;
|
block->sector->ceilingdata = NULL;
|
||||||
block->sector->floorspeed = 0;
|
|
||||||
block->sector->ceilspeed = 0;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
for (i = -1; (i = P_FindSectorFromTag((INT16)block->vars[0], i)) >= 0 ;)
|
for (i = -1; (i = P_FindSectorFromTag((INT16)block->vars[0], i)) >= 0 ;)
|
||||||
@@ -1365,8 +1317,6 @@ wegotit:
|
|||||||
{
|
{
|
||||||
bridge->sector->floorheight = LOWCEILINGHEIGHT - (bridge->sector->ceilingheight - bridge->sector->floorheight);
|
bridge->sector->floorheight = LOWCEILINGHEIGHT - (bridge->sector->ceilingheight - bridge->sector->floorheight);
|
||||||
bridge->sector->ceilingheight = LOWCEILINGHEIGHT;
|
bridge->sector->ceilingheight = LOWCEILINGHEIGHT;
|
||||||
bridge->sector->ceilspeed = 0;
|
|
||||||
bridge->sector->floorspeed = 0;
|
|
||||||
goto dorest;
|
goto dorest;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -1422,9 +1372,6 @@ wegotit:
|
|||||||
DIRECTION // direction
|
DIRECTION // direction
|
||||||
);
|
);
|
||||||
|
|
||||||
bridge->sector->ceilspeed = 42;
|
|
||||||
bridge->sector->floorspeed = CURSPEED*DIRECTION;
|
|
||||||
|
|
||||||
dorest:
|
dorest:
|
||||||
// Adjust joined sector heights
|
// Adjust joined sector heights
|
||||||
{
|
{
|
||||||
@@ -1463,8 +1410,6 @@ wegotit:
|
|||||||
{
|
{
|
||||||
bridge->sector->floorheight = ORIGCEILINGHEIGHT - (bridge->sector->ceilingheight - bridge->sector->floorheight);
|
bridge->sector->floorheight = ORIGCEILINGHEIGHT - (bridge->sector->ceilingheight - bridge->sector->floorheight);
|
||||||
bridge->sector->ceilingheight = ORIGCEILINGHEIGHT;
|
bridge->sector->ceilingheight = ORIGCEILINGHEIGHT;
|
||||||
bridge->sector->ceilspeed = 0;
|
|
||||||
bridge->sector->floorspeed = 0;
|
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -1519,9 +1464,6 @@ wegotit:
|
|||||||
0, // floor or ceiling (0 for floor)
|
0, // floor or ceiling (0 for floor)
|
||||||
DIRECTION // direction
|
DIRECTION // direction
|
||||||
);
|
);
|
||||||
|
|
||||||
bridge->sector->ceilspeed = 42;
|
|
||||||
bridge->sector->floorspeed = CURSPEED*DIRECTION;
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -1558,8 +1500,6 @@ wegotit:
|
|||||||
{
|
{
|
||||||
bridge->sector->floorheight = ORIGCEILINGHEIGHT - (bridge->sector->ceilingheight - bridge->sector->floorheight);
|
bridge->sector->floorheight = ORIGCEILINGHEIGHT - (bridge->sector->ceilingheight - bridge->sector->floorheight);
|
||||||
bridge->sector->ceilingheight = ORIGCEILINGHEIGHT;
|
bridge->sector->ceilingheight = ORIGCEILINGHEIGHT;
|
||||||
bridge->sector->ceilspeed = 0;
|
|
||||||
bridge->sector->floorspeed = 0;
|
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -1614,9 +1554,6 @@ wegotit:
|
|||||||
0, // floor or ceiling (0 for floor)
|
0, // floor or ceiling (0 for floor)
|
||||||
DIRECTION // direction
|
DIRECTION // direction
|
||||||
);
|
);
|
||||||
|
|
||||||
bridge->sector->ceilspeed = 42;
|
|
||||||
bridge->sector->floorspeed = CURSPEED*DIRECTION;
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -1642,8 +1579,6 @@ wegotit:
|
|||||||
{
|
{
|
||||||
bridge->sector->floorheight = ORIGCEILINGHEIGHT - (bridge->sector->ceilingheight - bridge->sector->floorheight);
|
bridge->sector->floorheight = ORIGCEILINGHEIGHT - (bridge->sector->ceilingheight - bridge->sector->floorheight);
|
||||||
bridge->sector->ceilingheight = ORIGCEILINGHEIGHT;
|
bridge->sector->ceilingheight = ORIGCEILINGHEIGHT;
|
||||||
bridge->sector->ceilspeed = 0;
|
|
||||||
bridge->sector->floorspeed = 0;
|
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -1698,9 +1633,6 @@ wegotit:
|
|||||||
0, // floor or ceiling (0 for floor)
|
0, // floor or ceiling (0 for floor)
|
||||||
DIRECTION // direction
|
DIRECTION // direction
|
||||||
);
|
);
|
||||||
|
|
||||||
bridge->sector->ceilspeed = 42;
|
|
||||||
bridge->sector->floorspeed = CURSPEED*DIRECTION;
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
// Update precip
|
// Update precip
|
||||||
@@ -1875,9 +1807,6 @@ void T_ThwompSector(levelspecthink_t *thwomp)
|
|||||||
|
|
||||||
if (res == pastdest)
|
if (res == pastdest)
|
||||||
thwomp->direction = 0; // stop moving
|
thwomp->direction = 0; // stop moving
|
||||||
|
|
||||||
thwomp->sector->ceilspeed = 42;
|
|
||||||
thwomp->sector->floorspeed = thwomp->speed*thwomp->direction;
|
|
||||||
}
|
}
|
||||||
else if (thwomp->direction < 0) // Crashing down!
|
else if (thwomp->direction < 0) // Crashing down!
|
||||||
{
|
{
|
||||||
@@ -1932,16 +1861,10 @@ void T_ThwompSector(levelspecthink_t *thwomp)
|
|||||||
thwomp->direction = 1; // start heading back up
|
thwomp->direction = 1; // start heading back up
|
||||||
thwomp->distance = TICRATE; // but only after a small delay
|
thwomp->distance = TICRATE; // but only after a small delay
|
||||||
}
|
}
|
||||||
|
|
||||||
thwomp->sector->ceilspeed = 42;
|
|
||||||
thwomp->sector->floorspeed = thwomp->speed*thwomp->direction;
|
|
||||||
}
|
}
|
||||||
else // Not going anywhere, so look for players.
|
else // Not going anywhere, so look for players.
|
||||||
{
|
{
|
||||||
thwomp->direction = -1;
|
thwomp->direction = -1;
|
||||||
|
|
||||||
thwomp->sector->ceilspeed = 0;
|
|
||||||
thwomp->sector->floorspeed = 0;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
actionsector->moved = true;
|
actionsector->moved = true;
|
||||||
@@ -2355,8 +2278,6 @@ void T_RaiseSector(levelspecthink_t *raise)
|
|||||||
{
|
{
|
||||||
raise->sector->floorheight = raise->vars[7] - (raise->sector->ceilingheight - raise->sector->floorheight);
|
raise->sector->floorheight = raise->vars[7] - (raise->sector->ceilingheight - raise->sector->floorheight);
|
||||||
raise->sector->ceilingheight = raise->vars[7];
|
raise->sector->ceilingheight = raise->vars[7];
|
||||||
raise->sector->ceilspeed = 0;
|
|
||||||
raise->sector->floorspeed = 0;
|
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -2370,8 +2291,6 @@ void T_RaiseSector(levelspecthink_t *raise)
|
|||||||
{
|
{
|
||||||
raise->sector->floorheight = raise->vars[5] - (raise->sector->ceilingheight - raise->sector->floorheight);
|
raise->sector->floorheight = raise->vars[5] - (raise->sector->ceilingheight - raise->sector->floorheight);
|
||||||
raise->sector->ceilingheight = raise->vars[5];
|
raise->sector->ceilingheight = raise->vars[5];
|
||||||
raise->sector->ceilspeed = 0;
|
|
||||||
raise->sector->floorspeed = 0;
|
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -2390,8 +2309,6 @@ void T_RaiseSector(levelspecthink_t *raise)
|
|||||||
{
|
{
|
||||||
raise->sector->floorheight = raise->vars[5] - (raise->sector->ceilingheight - raise->sector->floorheight);
|
raise->sector->floorheight = raise->vars[5] - (raise->sector->ceilingheight - raise->sector->floorheight);
|
||||||
raise->sector->ceilingheight = raise->vars[5];
|
raise->sector->ceilingheight = raise->vars[5];
|
||||||
raise->sector->ceilspeed = 0;
|
|
||||||
raise->sector->floorspeed = 0;
|
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
raise->vars[8] = 1;
|
raise->vars[8] = 1;
|
||||||
@@ -2404,8 +2321,6 @@ void T_RaiseSector(levelspecthink_t *raise)
|
|||||||
{
|
{
|
||||||
raise->sector->floorheight = raise->vars[7] - (raise->sector->ceilingheight - raise->sector->floorheight);
|
raise->sector->floorheight = raise->vars[7] - (raise->sector->ceilingheight - raise->sector->floorheight);
|
||||||
raise->sector->ceilingheight = raise->vars[7];
|
raise->sector->ceilingheight = raise->vars[7];
|
||||||
raise->sector->ceilspeed = 0;
|
|
||||||
raise->sector->floorspeed = 0;
|
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
raise->vars[8] = -1;
|
raise->vars[8] = -1;
|
||||||
@@ -2460,9 +2375,6 @@ void T_RaiseSector(levelspecthink_t *raise)
|
|||||||
raise->vars[8] // direction
|
raise->vars[8] // direction
|
||||||
);
|
);
|
||||||
|
|
||||||
raise->sector->ceilspeed = 42;
|
|
||||||
raise->sector->floorspeed = raise->vars[3]*raise->vars[8];
|
|
||||||
|
|
||||||
for (i = -1; (i = P_FindSectorFromTag(raise->sourceline->tag, i)) >= 0 ;)
|
for (i = -1; (i = P_FindSectorFromTag(raise->sourceline->tag, i)) >= 0 ;)
|
||||||
sectors[i].moved = true;
|
sectors[i].moved = true;
|
||||||
}
|
}
|
||||||
|
|||||||
+4
-9
@@ -869,14 +869,7 @@ void P_TouchSpecialThing(mobj_t *special, mobj_t *toucher, boolean heightcheck)
|
|||||||
|
|
||||||
toucher->angle = special->angle;
|
toucher->angle = special->angle;
|
||||||
|
|
||||||
for (UINT8 i = 0; i <= splitscreen; i++)
|
P_ForceLocalAngle(player, toucher->angle);
|
||||||
{
|
|
||||||
if (player == P_GetLocalPlayerForNum(i))
|
|
||||||
{
|
|
||||||
localangle[i] = toucher->angle;
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
P_ResetPlayer(player);
|
P_ResetPlayer(player);
|
||||||
|
|
||||||
@@ -1605,7 +1598,7 @@ void P_KillMobj(mobj_t *target, mobj_t *inflictor, mobj_t *source)
|
|||||||
|
|
||||||
target->player->playerstate = PST_DEAD;
|
target->player->playerstate = PST_DEAD;
|
||||||
|
|
||||||
if (cv_birdmusic.value && cv_fading.value && P_IsLocalPlayer(target->player))
|
if (cv_fading.value && P_IsLocalPlayer(target->player))
|
||||||
{
|
{
|
||||||
if (netgame || multiplayer)
|
if (netgame || multiplayer)
|
||||||
ms = cv_respawntime.value * 1000;
|
ms = cv_respawntime.value * 1000;
|
||||||
@@ -2171,7 +2164,9 @@ static void P_KillPlayer(player_t *player, mobj_t *source)
|
|||||||
P_SetScale(karmahitbox, player->mo->scale);
|
P_SetScale(karmahitbox, player->mo->scale);
|
||||||
CONS_Printf(M_GetText("%s lost all of their bumpers!\n"), player_names[player-players]);
|
CONS_Printf(M_GetText("%s lost all of their bumpers!\n"), player_names[player-players]);
|
||||||
}
|
}
|
||||||
|
|
||||||
player->kartstuff[k_bumper]--;
|
player->kartstuff[k_bumper]--;
|
||||||
|
|
||||||
if (K_IsPlayerWanted(player))
|
if (K_IsPlayerWanted(player))
|
||||||
K_CalculateBattleWanted();
|
K_CalculateBattleWanted();
|
||||||
}
|
}
|
||||||
|
|||||||
+7
-3
@@ -192,6 +192,7 @@ void P_DoPlayerPain(player_t *player, mobj_t *source, mobj_t *inflictor);
|
|||||||
void P_ResetPlayer(player_t *player);
|
void P_ResetPlayer(player_t *player);
|
||||||
player_t *P_GetLocalPlayerForNum(UINT8 pnum);
|
player_t *P_GetLocalPlayerForNum(UINT8 pnum);
|
||||||
INT32 P_GetLocalPlayerNumForNum(UINT8 pnum);
|
INT32 P_GetLocalPlayerNumForNum(UINT8 pnum);
|
||||||
|
INT32 P_GetLocalPlayerNumForPlayer(const player_t *player);
|
||||||
boolean P_IsLocalPlayer(const player_t *player);
|
boolean P_IsLocalPlayer(const player_t *player);
|
||||||
boolean P_IsLocalPlayerNum(UINT8 pnum);
|
boolean P_IsLocalPlayerNum(UINT8 pnum);
|
||||||
boolean P_IsDisplayPlayer(const player_t *player);
|
boolean P_IsDisplayPlayer(const player_t *player);
|
||||||
@@ -226,7 +227,9 @@ void P_PlayerThink(player_t *player);
|
|||||||
void P_PlayerAfterThink(player_t *player);
|
void P_PlayerAfterThink(player_t *player);
|
||||||
void P_DoPlayerExit(player_t *player);
|
void P_DoPlayerExit(player_t *player);
|
||||||
void P_DoTimeOver(player_t *player);
|
void P_DoTimeOver(player_t *player);
|
||||||
//void P_NightserizePlayer(player_t *player, INT32 ptime);
|
|
||||||
|
angle_t P_GetLocalAngle(player_t *player);
|
||||||
|
void P_ForceLocalAngle(player_t *player, angle_t angle);
|
||||||
|
|
||||||
void P_InstaThrust(mobj_t *mo, angle_t angle, fixed_t move);
|
void P_InstaThrust(mobj_t *mo, angle_t angle, fixed_t move);
|
||||||
fixed_t P_ReturnThrustX(mobj_t *mo, angle_t angle, fixed_t move);
|
fixed_t P_ReturnThrustX(mobj_t *mo, angle_t angle, fixed_t move);
|
||||||
@@ -269,6 +272,9 @@ extern consvar_t cv_gravity;
|
|||||||
|
|
||||||
void P_RespawnSpecials(void);
|
void P_RespawnSpecials(void);
|
||||||
|
|
||||||
|
extern mobjtype_t g_doomednum_to_mobjtype[UINT16_MAX];
|
||||||
|
void CalculateDoomednumToMobjtype(void);
|
||||||
|
|
||||||
mobj_t *P_AllocateMobj(void);
|
mobj_t *P_AllocateMobj(void);
|
||||||
mobj_t *P_SpawnMobj(fixed_t x, fixed_t y, fixed_t z, mobjtype_t type);
|
mobj_t *P_SpawnMobj(fixed_t x, fixed_t y, fixed_t z, mobjtype_t type);
|
||||||
|
|
||||||
@@ -474,8 +480,6 @@ void P_DoNightsScore(player_t *player);
|
|||||||
//
|
//
|
||||||
#include "p_spec.h"
|
#include "p_spec.h"
|
||||||
|
|
||||||
extern INT32 ceilmovesound;
|
|
||||||
|
|
||||||
// Factor to scale scrolling effect into mobj-carrying properties = 3/32.
|
// Factor to scale scrolling effect into mobj-carrying properties = 3/32.
|
||||||
// (This is so scrolling floors and objects on them can move at same speed.)
|
// (This is so scrolling floors and objects on them can move at same speed.)
|
||||||
#define CARRYFACTOR (FRACUNIT-ORIG_FRICTION)
|
#define CARRYFACTOR (FRACUNIT-ORIG_FRICTION)
|
||||||
|
|||||||
+1
-8
@@ -223,14 +223,7 @@ boolean P_DoSpring(mobj_t *spring, mobj_t *object)
|
|||||||
|
|
||||||
if (!demo.playback || P_AnalogMove(object->player))
|
if (!demo.playback || P_AnalogMove(object->player))
|
||||||
{
|
{
|
||||||
for (UINT8 j = 0; j <= splitscreen; ++j)
|
P_ForceLocalAngle(object->player, spring->angle);
|
||||||
{
|
|
||||||
if (object->player == P_GetLocalPlayerForNum(j))
|
|
||||||
{
|
|
||||||
localangle[j] = spring->angle;
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
+3
-3
@@ -230,8 +230,8 @@ PUREFUNC fixed_t P_InterceptVector(divline_t *v2, divline_t *v1)
|
|||||||
// Sets opentop and openbottom to the window through a two sided line.
|
// Sets opentop and openbottom to the window through a two sided line.
|
||||||
// OPTIMIZE: keep this precalculated
|
// OPTIMIZE: keep this precalculated
|
||||||
//
|
//
|
||||||
fixed_t opentop, openbottom, openrange, lowfloor, highceiling;
|
fixed_t opentop = 0, openbottom = 0, openrange = 0, lowfloor = 0, highceiling = 0;
|
||||||
pslope_t *opentopslope, *openbottomslope;
|
pslope_t *opentopslope = NULL, *openbottomslope = NULL;
|
||||||
|
|
||||||
// P_CameraLineOpening
|
// P_CameraLineOpening
|
||||||
// P_LineOpening, but for camera
|
// P_LineOpening, but for camera
|
||||||
@@ -985,7 +985,7 @@ boolean P_BlockThingsIterator(INT32 x, INT32 y, boolean (*func)(mobj_t *))
|
|||||||
static intercept_t *intercepts = NULL;
|
static intercept_t *intercepts = NULL;
|
||||||
static intercept_t *intercept_p = NULL;
|
static intercept_t *intercept_p = NULL;
|
||||||
|
|
||||||
divline_t trace;
|
divline_t trace = {};
|
||||||
static boolean earlyout;
|
static boolean earlyout;
|
||||||
|
|
||||||
//SoM: 4/6/2000: Remove limit on intercepts.
|
//SoM: 4/6/2000: Remove limit on intercepts.
|
||||||
|
|||||||
+1110
-1108
File diff suppressed because it is too large.
Load diff
+8
-11
@@ -90,14 +90,14 @@
|
|||||||
//
|
//
|
||||||
|
|
||||||
// The Polyobjects
|
// The Polyobjects
|
||||||
polyobj_t *PolyObjects;
|
polyobj_t *PolyObjects = NULL;
|
||||||
INT32 numPolyObjects;
|
INT32 numPolyObjects = 0;
|
||||||
|
|
||||||
// Polyobject Blockmap -- initialized in P_LoadBlockMap
|
// Polyobject Blockmap -- initialized in P_LoadBlockMap
|
||||||
polymaplink_t **polyblocklinks;
|
polymaplink_t **polyblocklinks = NULL;
|
||||||
|
|
||||||
static size_t *KnownPolySides;
|
static size_t *KnownPolySides = NULL;
|
||||||
static size_t KnownPolySidesCount;
|
static size_t KnownPolySidesCount = 0;
|
||||||
|
|
||||||
//
|
//
|
||||||
// Static Data
|
// Static Data
|
||||||
@@ -1383,13 +1383,10 @@ static void Polyobj_rotateThings(polyobj_t *po, vector2_t origin, angle_t delta,
|
|||||||
{
|
{
|
||||||
mo->angle += delta;
|
mo->angle += delta;
|
||||||
|
|
||||||
for (UINT8 i = 0; i <= splitscreen; i++)
|
if (mo->player)
|
||||||
{
|
{
|
||||||
if (mo->player == P_GetLocalPlayerForNum(i))
|
angle_t localangle = P_GetLocalAngle(mo->player);
|
||||||
{
|
P_ForceLocalAngle(mo->player, localangle + delta);
|
||||||
localangle[i] += delta;
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
+7
-32
@@ -339,7 +339,7 @@ static void P_NetUnArchivePlayers(savebuffer_t *save, boolean reloading)
|
|||||||
for (j = 0; j < NUMKARTSTUFF; j++)
|
for (j = 0; j < NUMKARTSTUFF; j++)
|
||||||
player->kartstuff[j] = READINT32(save->p);
|
player->kartstuff[j] = READINT32(save->p);
|
||||||
|
|
||||||
player->frameangle = READANGLE(save->p);
|
player->frameangle = player->old_frameangle = READANGLE(save->p);
|
||||||
|
|
||||||
player->playerstate = READUINT8(save->p);
|
player->playerstate = READUINT8(save->p);
|
||||||
player->pflags = READUINT32(save->p);
|
player->pflags = READUINT32(save->p);
|
||||||
@@ -1965,21 +1965,6 @@ FUNCINLINE static ATTRINLINE player_t *LoadPlayer(UINT32 player)
|
|||||||
// Loads a mobj_t from a save game
|
// Loads a mobj_t from a save game
|
||||||
//
|
//
|
||||||
|
|
||||||
static mobjtype_t g_doomednum_to_mobjtype[UINT16_MAX];
|
|
||||||
|
|
||||||
static void CalculateDoomednumToMobjtype(void)
|
|
||||||
{
|
|
||||||
memset(g_doomednum_to_mobjtype, MT_NULL, sizeof(g_doomednum_to_mobjtype));
|
|
||||||
|
|
||||||
for (size_t i = MT_NULL+1; i < NUMMOBJTYPES; i++)
|
|
||||||
{
|
|
||||||
if (mobjinfo[i].doomednum > 0 && mobjinfo[i].doomednum <= UINT16_MAX)
|
|
||||||
{
|
|
||||||
g_doomednum_to_mobjtype[ mobjinfo[i].doomednum ] = i;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
static void LoadMobjThinker(savebuffer_t *save, actionf_p1 thinker)
|
static void LoadMobjThinker(savebuffer_t *save, actionf_p1 thinker)
|
||||||
{
|
{
|
||||||
mobj_t *mobj;
|
mobj_t *mobj;
|
||||||
@@ -2052,15 +2037,15 @@ static void LoadMobjThinker(savebuffer_t *save, actionf_p1 thinker)
|
|||||||
|
|
||||||
if (diff & MD_POS)
|
if (diff & MD_POS)
|
||||||
{
|
{
|
||||||
mobj->x = READFIXED(save->p);
|
mobj->x = mobj->old_x = READFIXED(save->p);
|
||||||
mobj->y = READFIXED(save->p);
|
mobj->y = mobj->old_y = READFIXED(save->p);
|
||||||
mobj->angle = READANGLE(save->p);
|
mobj->angle = mobj->old_angle = READANGLE(save->p);
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
mobj->x = mobj->spawnpoint->x << FRACBITS;
|
mobj->x = mobj->old_x = mobj->spawnpoint->x << FRACBITS;
|
||||||
mobj->y = mobj->spawnpoint->y << FRACBITS;
|
mobj->y = mobj->old_y = mobj->spawnpoint->y << FRACBITS;
|
||||||
mobj->angle = FixedAngle(mobj->spawnpoint->angle*FRACUNIT);
|
mobj->angle = mobj->old_angle = FixedAngle(mobj->spawnpoint->angle*FRACUNIT);
|
||||||
}
|
}
|
||||||
|
|
||||||
if (diff & MD_MOM)
|
if (diff & MD_MOM)
|
||||||
@@ -2122,12 +2107,6 @@ static void LoadMobjThinker(savebuffer_t *save, actionf_p1 thinker)
|
|||||||
i = READUINT8(save->p);
|
i = READUINT8(save->p);
|
||||||
mobj->player = &players[i];
|
mobj->player = &players[i];
|
||||||
mobj->player->mo = mobj;
|
mobj->player->mo = mobj;
|
||||||
|
|
||||||
// added for angle prediction
|
|
||||||
if (i == P_GetLocalPlayerNumForNum(i))
|
|
||||||
{
|
|
||||||
localangle[i] = mobj->angle;
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
if (diff & MD_MOVEDIR)
|
if (diff & MD_MOVEDIR)
|
||||||
mobj->movedir = READANGLE(save->p);
|
mobj->movedir = READANGLE(save->p);
|
||||||
@@ -2885,10 +2864,6 @@ static void P_NetUnArchiveThinkers(savebuffer_t *save)
|
|||||||
if (READUINT32(save->p) != ARCHIVEBLOCK_THINKERS)
|
if (READUINT32(save->p) != ARCHIVEBLOCK_THINKERS)
|
||||||
I_Error("Bad $$$.sav at archive block Thinkers");
|
I_Error("Bad $$$.sav at archive block Thinkers");
|
||||||
|
|
||||||
// Pre-calculate this lookup, because it was wasting
|
|
||||||
// a shit ton of time loading mobj thinkers.
|
|
||||||
CalculateDoomednumToMobjtype();
|
|
||||||
|
|
||||||
// remove all the current thinkers
|
// remove all the current thinkers
|
||||||
for (currentthinker = thinkercap.next; currentthinker != &thinkercap; currentthinker = next)
|
for (currentthinker = thinkercap.next; currentthinker != &thinkercap; currentthinker = next)
|
||||||
{
|
{
|
||||||
|
|||||||
+26
-19
@@ -15,6 +15,7 @@
|
|||||||
#include "d_main.h"
|
#include "d_main.h"
|
||||||
#include "byteptr.h"
|
#include "byteptr.h"
|
||||||
#include "g_game.h"
|
#include "g_game.h"
|
||||||
|
#include "g_input.h"
|
||||||
|
|
||||||
#include "p_local.h"
|
#include "p_local.h"
|
||||||
#include "p_setup.h"
|
#include "p_setup.h"
|
||||||
@@ -596,8 +597,8 @@ FUNCINLINE static ATTRINLINE void P_LoadSubsectors(void *data)
|
|||||||
//
|
//
|
||||||
#define MAXLEVELFLATS 256
|
#define MAXLEVELFLATS 256
|
||||||
|
|
||||||
size_t numlevelflats;
|
size_t numlevelflats = 0;
|
||||||
levelflat_t *levelflats;
|
levelflat_t *levelflats = NULL;
|
||||||
|
|
||||||
//SoM: Other files want this info.
|
//SoM: Other files want this info.
|
||||||
size_t P_PrecacheLevelFlats(void)
|
size_t P_PrecacheLevelFlats(void)
|
||||||
@@ -811,6 +812,8 @@ static void P_LoadSectors(UINT8 *data)
|
|||||||
ss->tag = SHORT(ms->tag);
|
ss->tag = SHORT(ms->tag);
|
||||||
|
|
||||||
ss->flags |= SF_FLIPSPECIAL_FLOOR;
|
ss->flags |= SF_FLIPSPECIAL_FLOOR;
|
||||||
|
|
||||||
|
ss->soundorg.thinker.function = (actionf_p1)P_MobjThinker;
|
||||||
}
|
}
|
||||||
|
|
||||||
// set the sky flat num
|
// set the sky flat num
|
||||||
@@ -1021,7 +1024,7 @@ void P_WriteThings(lumpnum_t lumpnum)
|
|||||||
size_t i, length;
|
size_t i, length;
|
||||||
mapthing_t *mt;
|
mapthing_t *mt;
|
||||||
UINT8 *data;
|
UINT8 *data;
|
||||||
savebuffer_t save;
|
savebuffer_t save = {0};
|
||||||
INT16 temp;
|
INT16 temp;
|
||||||
|
|
||||||
data = W_CacheLumpNum(lumpnum, PU_LEVEL);
|
data = W_CacheLumpNum(lumpnum, PU_LEVEL);
|
||||||
@@ -2029,8 +2032,8 @@ void P_SetupLevelSky(INT32 skynum, boolean global)
|
|||||||
R_SetupSkyDraw();
|
R_SetupSkyDraw();
|
||||||
}
|
}
|
||||||
|
|
||||||
static const char *maplumpname;
|
static const char *maplumpname = NULL;
|
||||||
lumpnum_t lastloadedmaplumpnum; // for comparative savegame
|
lumpnum_t lastloadedmaplumpnum = LUMPERROR; // for comparative savegame
|
||||||
|
|
||||||
//
|
//
|
||||||
// P_LevelInitStuff
|
// P_LevelInitStuff
|
||||||
@@ -2414,7 +2417,7 @@ static void P_InitCamera(void)
|
|||||||
displayplayers[0] = consoleplayer; // Start with your OWN view, please!
|
displayplayers[0] = consoleplayer; // Start with your OWN view, please!
|
||||||
}
|
}
|
||||||
|
|
||||||
struct minimapinfo minimapinfo;
|
struct minimapinfo minimapinfo = {};
|
||||||
static void P_InitMinimapInfo(void)
|
static void P_InitMinimapInfo(void)
|
||||||
{
|
{
|
||||||
lumpnum_t lumpnum;
|
lumpnum_t lumpnum;
|
||||||
@@ -2653,7 +2656,8 @@ static void P_SetupPlayer(void)
|
|||||||
spbplace = -1;
|
spbplace = -1;
|
||||||
|
|
||||||
startedInFreePlay = true;
|
startedInFreePlay = true;
|
||||||
for (UINT8 nump = 0, i = 0; i < MAXPLAYERS; i++)
|
UINT8 nump = 0;
|
||||||
|
for (i = 0; i < MAXPLAYERS; i++)
|
||||||
{
|
{
|
||||||
if (!playeringame[i] || players[i].spectator)
|
if (!playeringame[i] || players[i].spectator)
|
||||||
{
|
{
|
||||||
@@ -2707,8 +2711,12 @@ void P_FreeLevelState(void)
|
|||||||
|
|
||||||
G_FreeGhosts(); // ghosts are allocated with PU_LEVEL
|
G_FreeGhosts(); // ghosts are allocated with PU_LEVEL
|
||||||
|
|
||||||
Patch_FreeTag(PU_PATCH_LOWPRIORITY);
|
if (rendermode != render_none)
|
||||||
//Patch_FreeTag(PU_PATCH_ROTATED); // we keep those ty!
|
{
|
||||||
|
Patch_FreeTag(PU_PATCH_LOWPRIORITY);
|
||||||
|
//Patch_FreeTag(PU_PATCH_ROTATED); // we keep those ty!
|
||||||
|
}
|
||||||
|
|
||||||
Z_FreeTags(PU_LEVEL, PU_PURGELEVEL - 1);
|
Z_FreeTags(PU_LEVEL, PU_PURGELEVEL - 1);
|
||||||
|
|
||||||
Y_VoteClear();
|
Y_VoteClear();
|
||||||
@@ -2717,6 +2725,9 @@ void P_FreeLevelState(void)
|
|||||||
// clear the splats from previous level
|
// clear the splats from previous level
|
||||||
R_ClearLevelSplats();
|
R_ClearLevelSplats();
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
R_InitMobjInterpolators();
|
||||||
|
R_InitializeLevelInterpolators();
|
||||||
}
|
}
|
||||||
|
|
||||||
/** Loads a level from a lump or external wad.
|
/** Loads a level from a lump or external wad.
|
||||||
@@ -2734,13 +2745,8 @@ boolean P_SetupLevel(boolean fromnetsave, boolean reloadinggamestate)
|
|||||||
lumpnum_t encoreLump = LUMPERROR;
|
lumpnum_t encoreLump = LUMPERROR;
|
||||||
UINT8 levelfadecol;
|
UINT8 levelfadecol;
|
||||||
|
|
||||||
// HACK: this doesent reset if you change the map from within a replay and may cause crashes or the replayhut to be non functional
|
|
||||||
if (!demo.playback && demo.inreplayhut)
|
|
||||||
{
|
|
||||||
M_ResetDemoList();
|
|
||||||
}
|
|
||||||
|
|
||||||
midgamejoin = fromnetsave; // makes dynslopes run in P_Ticker/P_PreTicker to avoid synch issues and other stuff
|
midgamejoin = fromnetsave; // makes dynslopes run in P_Ticker to avoid synch issues and other stuff
|
||||||
|
|
||||||
levelloading = true;
|
levelloading = true;
|
||||||
|
|
||||||
@@ -2826,10 +2832,7 @@ boolean P_SetupLevel(boolean fromnetsave, boolean reloadinggamestate)
|
|||||||
|
|
||||||
P_FreeLevelState();
|
P_FreeLevelState();
|
||||||
|
|
||||||
R_InitializeLevelInterpolators();
|
|
||||||
|
|
||||||
P_InitThinkers();
|
P_InitThinkers();
|
||||||
R_InitMobjInterpolators();
|
|
||||||
P_InitCachedActions();
|
P_InitCachedActions();
|
||||||
|
|
||||||
// internal game map
|
// internal game map
|
||||||
@@ -2860,6 +2863,10 @@ boolean P_SetupLevel(boolean fromnetsave, boolean reloadinggamestate)
|
|||||||
|
|
||||||
P_ResetDynamicSlopes();
|
P_ResetDynamicSlopes();
|
||||||
|
|
||||||
|
// Pre-calculate this lookup, because it was wasting
|
||||||
|
// a shit ton of time loading mobj thinkers.
|
||||||
|
CalculateDoomednumToMobjtype();
|
||||||
|
|
||||||
P_SpawnMapThings();
|
P_SpawnMapThings();
|
||||||
|
|
||||||
P_SpawnEmblems(!fromnetsave);
|
P_SpawnEmblems(!fromnetsave);
|
||||||
@@ -2978,7 +2985,7 @@ boolean P_SetupLevel(boolean fromnetsave, boolean reloadinggamestate)
|
|||||||
|
|
||||||
G_AddMapToBuffer(gamemap-1);
|
G_AddMapToBuffer(gamemap-1);
|
||||||
|
|
||||||
D_ResetDeviceLED();
|
G_ResetDeviceLED();
|
||||||
|
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|||||||
+14
-15
@@ -38,7 +38,6 @@ static void P_UpdateSlopeLightOffset(pslope_t *slope)
|
|||||||
fixed_t light = FRACUNIT;
|
fixed_t light = FRACUNIT;
|
||||||
fixed_t extralight = 0;
|
fixed_t extralight = 0;
|
||||||
|
|
||||||
|
|
||||||
if (slope->normal.z == 0)
|
if (slope->normal.z == 0)
|
||||||
{
|
{
|
||||||
slope->lightOffset = 0;
|
slope->lightOffset = 0;
|
||||||
@@ -296,7 +295,7 @@ static fixed_t P_GetExtent(sector_t *sector, line_t *line)
|
|||||||
|
|
||||||
// Find furthest vertex from the reference line. It, along with the two ends
|
// Find furthest vertex from the reference line. It, along with the two ends
|
||||||
// of the line, will define the plane.
|
// of the line, will define the plane.
|
||||||
for(i = 0; i < sector->linecount; i++)
|
for (i = 0; i < sector->linecount; i++)
|
||||||
{
|
{
|
||||||
line_t *li = sector->lines[i];
|
line_t *li = sector->lines[i];
|
||||||
vertex_t tempv;
|
vertex_t tempv;
|
||||||
@@ -339,19 +338,12 @@ void P_SpawnSlope_Line(int linenum)
|
|||||||
vector3_t origin, point;
|
vector3_t origin, point;
|
||||||
vector2_t direction;
|
vector2_t direction;
|
||||||
fixed_t nx, ny, dz, extent;
|
fixed_t nx, ny, dz, extent;
|
||||||
|
|
||||||
boolean frontfloor = (special == 700 || special == 702 || special == 703);
|
|
||||||
boolean backfloor = (special == 710 || special == 712 || special == 713);
|
|
||||||
boolean frontceil = (special == 701 || special == 702 || special == 713);
|
|
||||||
boolean backceil = (special == 711 || special == 712 || special == 703);
|
|
||||||
|
|
||||||
UINT8 flags = 0; // Slope flags
|
UINT8 flags = 0; // Slope flags
|
||||||
if (line->flags & ML_NOSONIC)
|
|
||||||
flags |= SL_NOPHYSICS;
|
const boolean frontfloor = (special == 700 || special == 702 || special == 703);
|
||||||
if (!(line->flags & ML_NOTAILS))
|
const boolean backfloor = (special == 710 || special == 712 || special == 713);
|
||||||
flags |= SL_NODYNAMIC;
|
const boolean frontceil = (special == 701 || special == 702 || special == 713);
|
||||||
if (line->flags & ML_NOKNUX)
|
const boolean backceil = (special == 711 || special == 712 || special == 703);
|
||||||
flags |= SL_ANCHORVERTEX;
|
|
||||||
|
|
||||||
if (!frontfloor && !backfloor && !frontceil && !backceil)
|
if (!frontfloor && !backfloor && !frontceil && !backceil)
|
||||||
{
|
{
|
||||||
@@ -365,6 +357,13 @@ void P_SpawnSlope_Line(int linenum)
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if (line->flags & ML_NOSONIC)
|
||||||
|
flags |= SL_NOPHYSICS;
|
||||||
|
if (!(line->flags & ML_NOTAILS))
|
||||||
|
flags |= SL_NODYNAMIC;
|
||||||
|
if (line->flags & ML_NOKNUX)
|
||||||
|
flags |= SL_ANCHORVERTEX;
|
||||||
|
|
||||||
fixed_t len = R_PointToDist2(0, 0, line->dx, line->dy);
|
fixed_t len = R_PointToDist2(0, 0, line->dx, line->dy);
|
||||||
nx = FixedDiv(line->dy, len);
|
nx = FixedDiv(line->dy, len);
|
||||||
ny = -FixedDiv(line->dx, len);
|
ny = -FixedDiv(line->dx, len);
|
||||||
@@ -810,7 +809,7 @@ void P_ResetDynamicSlopes(void)
|
|||||||
|
|
||||||
if (lines[i].flags & ML_NOKNUX)
|
if (lines[i].flags & ML_NOKNUX)
|
||||||
*slopetoset = P_NewVertexSlope(lines[i].tag, sides[lines[i].sidenum[which]].textureoffset >> FRACBITS,
|
*slopetoset = P_NewVertexSlope(lines[i].tag, sides[lines[i].sidenum[which]].textureoffset >> FRACBITS,
|
||||||
sides[lines[i].sidenum[which]].rowoffset >> FRACBITS, flags);
|
sides[lines[i].sidenum[which]].rowoffset >> FRACBITS, flags);
|
||||||
else
|
else
|
||||||
*slopetoset = P_NewVertexSlope(lines[i].tag, lines[i].tag, lines[i].tag, flags);
|
*slopetoset = P_NewVertexSlope(lines[i].tag, lines[i].tag, lines[i].tag, flags);
|
||||||
|
|
||||||
|
|||||||
+24
-30
@@ -1978,13 +1978,11 @@ static void P_ProcessLineSpecial(line_t *line, mobj_t *mo, sector_t *callsec)
|
|||||||
{
|
{
|
||||||
P_RemoveThinker(&((elevator_t *)sectors[secnum].floordata)->thinker);
|
P_RemoveThinker(&((elevator_t *)sectors[secnum].floordata)->thinker);
|
||||||
sectors[secnum].floordata = sectors[secnum].ceilingdata = NULL;
|
sectors[secnum].floordata = sectors[secnum].ceilingdata = NULL;
|
||||||
sectors[secnum].floorspeed = sectors[secnum].ceilspeed = 0;
|
|
||||||
}
|
}
|
||||||
else // floormove
|
else // floormove
|
||||||
{
|
{
|
||||||
P_RemoveThinker(&((floormove_t *)sectors[secnum].floordata)->thinker);
|
P_RemoveThinker(&((floormove_t *)sectors[secnum].floordata)->thinker);
|
||||||
sectors[secnum].floordata = NULL;
|
sectors[secnum].floordata = NULL;
|
||||||
sectors[secnum].floorspeed = 0;
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -1992,7 +1990,6 @@ static void P_ProcessLineSpecial(line_t *line, mobj_t *mo, sector_t *callsec)
|
|||||||
{
|
{
|
||||||
P_RemoveThinker(&((ceiling_t *)sectors[secnum].ceilingdata)->thinker);
|
P_RemoveThinker(&((ceiling_t *)sectors[secnum].ceilingdata)->thinker);
|
||||||
sectors[secnum].ceilingdata = NULL;
|
sectors[secnum].ceilingdata = NULL;
|
||||||
sectors[secnum].ceilspeed = 0;
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
@@ -2087,13 +2084,17 @@ static void P_ProcessLineSpecial(line_t *line, mobj_t *mo, sector_t *callsec)
|
|||||||
// Seek offset from current song position
|
// Seek offset from current song position
|
||||||
if (line->flags & ML_EFFECT1)
|
if (line->flags & ML_EFFECT1)
|
||||||
{
|
{
|
||||||
|
const UINT32 muslength = S_GetMusicLength();
|
||||||
|
const UINT32 muspos = S_GetMusicPosition();
|
||||||
|
const UINT32 muslooppoint = S_GetMusicLoopPoint();
|
||||||
|
|
||||||
// adjust for loop point if subtracting
|
// adjust for loop point if subtracting
|
||||||
if (position < 0 && S_GetMusicLength() &&
|
if (position < 0 && muslength &&
|
||||||
S_GetMusicPosition() > S_GetMusicLoopPoint() &&
|
muspos > muslooppoint &&
|
||||||
S_GetMusicPosition() + position < S_GetMusicLoopPoint())
|
muspos + position < muslooppoint)
|
||||||
position = max(S_GetMusicLength() - (S_GetMusicLoopPoint() - (S_GetMusicPosition() + position)), 0);
|
position = max(muslength - (muslooppoint - (muspos + position)), 0);
|
||||||
else
|
else
|
||||||
position = max(S_GetMusicPosition() + position, 0);
|
position = max(muspos + position, 0);
|
||||||
}
|
}
|
||||||
|
|
||||||
// Fade current music to target volume (if music won't be changed)
|
// Fade current music to target volume (if music won't be changed)
|
||||||
@@ -2160,11 +2161,13 @@ static void P_ProcessLineSpecial(line_t *line, mobj_t *mo, sector_t *callsec)
|
|||||||
|
|
||||||
if (sfxnum == sfx_None)
|
if (sfxnum == sfx_None)
|
||||||
return; // Do nothing!
|
return; // Do nothing!
|
||||||
|
|
||||||
if (sfxnum < sfx_None || sfxnum >= NUMSFX)
|
if (sfxnum < sfx_None || sfxnum >= NUMSFX)
|
||||||
{
|
{
|
||||||
CONS_Debug(DBG_GAMELOGIC, "Line type 414 Executor: sfx number %d is invalid!\n", sfxnum);
|
CONS_Debug(DBG_GAMELOGIC, "Line type 414 Executor: sfx number %d is invalid!\n", sfxnum);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (line->tag != 0) // Do special stuff only if a non-zero linedef tag is set
|
if (line->tag != 0) // Do special stuff only if a non-zero linedef tag is set
|
||||||
{
|
{
|
||||||
if (line->flags & ML_EFFECT5) // Repeat Midtexture
|
if (line->flags & ML_EFFECT5) // Repeat Midtexture
|
||||||
@@ -3553,14 +3556,7 @@ DoneSection2:
|
|||||||
|
|
||||||
if (!demo.playback || P_AnalogMove(player))
|
if (!demo.playback || P_AnalogMove(player))
|
||||||
{
|
{
|
||||||
for (UINT8 j = 0; j <= splitscreen; ++j)
|
P_ForceLocalAngle(player, player->mo->angle);
|
||||||
{
|
|
||||||
if (player == P_GetLocalPlayerForNum(j))
|
|
||||||
{
|
|
||||||
localangle[j] = player->mo->angle;
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
if (!(lines[i].flags & ML_EFFECT4))
|
if (!(lines[i].flags & ML_EFFECT4))
|
||||||
@@ -3990,7 +3986,12 @@ DoneSection2:
|
|||||||
|
|
||||||
player->tossdelay = 3;
|
player->tossdelay = 3;
|
||||||
}
|
}
|
||||||
|
#if 0
|
||||||
|
// Event - Final Lap
|
||||||
|
// Still works for GME, but disabled for consistency
|
||||||
|
if (G_RaceGametype() && player->laps >= (UINT8)(cv_numlaps.value - 1))
|
||||||
|
S_SpeedMusic(1.2f);
|
||||||
|
#endif
|
||||||
if (player->laps >= (unsigned)cv_numlaps.value)
|
if (player->laps >= (unsigned)cv_numlaps.value)
|
||||||
{
|
{
|
||||||
if (P_IsLocalPlayer(player))
|
if (P_IsLocalPlayer(player))
|
||||||
@@ -4798,7 +4799,6 @@ static ffloor_t *P_AddFakeFloor(sector_t *sec, sector_t *sec2, line_t *master, f
|
|||||||
ffloor->master = master;
|
ffloor->master = master;
|
||||||
ffloor->norender = INFTICS;
|
ffloor->norender = INFTICS;
|
||||||
|
|
||||||
|
|
||||||
// Scan the thinkers to check for special conditions applying to this FOF.
|
// Scan the thinkers to check for special conditions applying to this FOF.
|
||||||
// If we have thinkers sorted by sector, just check the relevant ones;
|
// If we have thinkers sorted by sector, just check the relevant ones;
|
||||||
// otherwise, check them all. Apologies for the ugly loop...
|
// otherwise, check them all. Apologies for the ugly loop...
|
||||||
@@ -7512,22 +7512,16 @@ void T_Pusher(pusher_t *p)
|
|||||||
thing->player->pflags |= PF_JUMPED;
|
thing->player->pflags |= PF_JUMPED;
|
||||||
|
|
||||||
thing->player->pflags |= PF_SLIDING;
|
thing->player->pflags |= PF_SLIDING;
|
||||||
thing->angle = R_PointToAngle2 (0, 0, xspeed<<(FRACBITS-PUSH_FACTOR), yspeed<<(FRACBITS-PUSH_FACTOR));
|
thing->angle = R_PointToAngle2(0, 0, xspeed<<(FRACBITS-PUSH_FACTOR), yspeed<<(FRACBITS-PUSH_FACTOR));
|
||||||
|
|
||||||
if (!demo.playback || P_AnalogMove(thing->player))
|
if (!demo.playback || P_AnalogMove(thing->player))
|
||||||
{
|
{
|
||||||
for (UINT8 i = 0; i <= splitscreen; ++i)
|
angle_t angle = P_GetLocalAngle(thing->player);
|
||||||
{
|
|
||||||
if (thing->player == P_GetLocalPlayerForNum(i))
|
|
||||||
{
|
|
||||||
if (thing->angle - localangle[i] > ANGLE_180)
|
|
||||||
localangle[i] -= (localangle[i] - thing->angle) / 8;
|
|
||||||
else
|
|
||||||
localangle[i] += (thing->angle - localangle[i]) / 8;
|
|
||||||
|
|
||||||
break;
|
if (thing->angle - angle > ANGLE_180)
|
||||||
}
|
P_ForceLocalAngle(thing->player, angle - (angle - thing->angle) / 8);
|
||||||
}
|
else
|
||||||
|
P_ForceLocalAngle(thing->player, angle + (thing->angle - angle) / 8);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
+4
-10
@@ -65,14 +65,7 @@ void P_MixUp(mobj_t *thing, fixed_t x, fixed_t y, fixed_t z, angle_t angle,
|
|||||||
thing->reactiontime = TICRATE/2; // don't move for about half a second
|
thing->reactiontime = TICRATE/2; // don't move for about half a second
|
||||||
|
|
||||||
// absolute angle position
|
// absolute angle position
|
||||||
for (i = 0; i <= splitscreen; i++)
|
P_ForceLocalAngle(thing->player, angle);
|
||||||
{
|
|
||||||
if (thing == P_GetLocalPlayerForNum(i)->mo)
|
|
||||||
{
|
|
||||||
localangle[i] = angle;
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
// move chasecam at new player location
|
// move chasecam at new player location
|
||||||
for (i = 0; i <= splitscreen; i++)
|
for (i = 0; i <= splitscreen; i++)
|
||||||
@@ -106,6 +99,7 @@ void P_MixUp(mobj_t *thing, fixed_t x, fixed_t y, fixed_t z, angle_t angle,
|
|||||||
P_FlashPal(thing->player, PAL_MIXUP, 10);
|
P_FlashPal(thing->player, PAL_MIXUP, 10);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
thing->old_angle += (angle-thing->angle);
|
||||||
thing->angle = angle;
|
thing->angle = angle;
|
||||||
|
|
||||||
thing->momx = thing->momy = thing->momz = 0;
|
thing->momx = thing->momy = thing->momz = 0;
|
||||||
@@ -150,18 +144,18 @@ boolean P_Teleport(mobj_t *thing, fixed_t x, fixed_t y, fixed_t z, angle_t angle
|
|||||||
thing->reactiontime = TICRATE/2; // don't move for about half a second
|
thing->reactiontime = TICRATE/2; // don't move for about half a second
|
||||||
|
|
||||||
// absolute angle position
|
// absolute angle position
|
||||||
|
P_ForceLocalAngle(thing->player, angle);
|
||||||
|
|
||||||
// move chasecam at new player location
|
// move chasecam at new player location
|
||||||
for (i = 0; i <= splitscreen; i++)
|
for (i = 0; i <= splitscreen; i++)
|
||||||
{
|
{
|
||||||
if (thing->player != &players[displayplayers[i]])
|
if (thing->player != &players[displayplayers[i]])
|
||||||
continue;
|
continue;
|
||||||
|
|
||||||
localangle[i] = angle;
|
|
||||||
if (camera[i].chase)
|
if (camera[i].chase)
|
||||||
P_ResetCamera(thing->player, &camera[i]);
|
P_ResetCamera(thing->player, &camera[i]);
|
||||||
|
|
||||||
R_ResetViewInterpolation(i + 1);
|
R_ResetViewInterpolation(i + 1);
|
||||||
break;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
// don't run in place after a teleport
|
// don't run in place after a teleport
|
||||||
|
|||||||
+1
-112
@@ -457,113 +457,6 @@ static inline void P_RunThinkers(void)
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
// Controller rumble!
|
|
||||||
// this keeps track of a bunch of things
|
|
||||||
// and makes your controller rumble accordingly
|
|
||||||
static void P_DeviceRumbleTick(void)
|
|
||||||
{
|
|
||||||
UINT8 i;
|
|
||||||
|
|
||||||
if (dedicated || numcontrollers == 0 || gamestate != GS_LEVEL)
|
|
||||||
{
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
for (i = 0; i <= splitscreen; i++)
|
|
||||||
{
|
|
||||||
if (!cv_usejoystick[i].value || !cv_rumble[i].value)
|
|
||||||
{
|
|
||||||
continue;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (camera[i].freecam)
|
|
||||||
{
|
|
||||||
continue;
|
|
||||||
}
|
|
||||||
|
|
||||||
UINT16 low = 0, high = 0;
|
|
||||||
UINT16 lenght = 57; // in ms
|
|
||||||
|
|
||||||
const player_t *player = P_GetLocalPlayerForNum(i);
|
|
||||||
|
|
||||||
// allow lua to do some crap for spectators
|
|
||||||
if (player->spectator || !player->mo)
|
|
||||||
{
|
|
||||||
continue;
|
|
||||||
}
|
|
||||||
|
|
||||||
// reset the rumble if you exit or are ded lel
|
|
||||||
if (player->exiting ||
|
|
||||||
player->playerstate == PST_DEAD ||
|
|
||||||
player->kartstuff[k_respawn] > 1)
|
|
||||||
{
|
|
||||||
G_PlayerDeviceRumble(i, low, high, 0);
|
|
||||||
continue;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (player->kartstuff[k_spinouttimer])
|
|
||||||
{
|
|
||||||
//low = high = FRACUNIT / 6;
|
|
||||||
low = high = FixedMul((FRACUNIT / 4), (FixedDiv(player->kartstuff[k_spinouttimer], (3*TICRATE / 2)))); // try do some some kinda fadeout
|
|
||||||
}
|
|
||||||
else if (player->kartstuff[k_sneakertimer] > (sneakertime-(TICRATE/2)))
|
|
||||||
{
|
|
||||||
low = high = FRACUNIT / 8;
|
|
||||||
}
|
|
||||||
else if ((player->kartstuff[k_offroad])
|
|
||||||
&& player->speed != 0
|
|
||||||
&& P_IsObjectOnGround(player->mo))
|
|
||||||
{
|
|
||||||
// weaken this depending on if you got hyu or invinc
|
|
||||||
if (player->kartstuff[k_hyudorotimer])
|
|
||||||
{
|
|
||||||
high = FRACUNIT / 128;
|
|
||||||
}
|
|
||||||
else if (player->kartstuff[k_invincibilitytimer])
|
|
||||||
{
|
|
||||||
high = FRACUNIT / 64;
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
low = high = FRACUNIT / 64;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
else if ((player->kartstuff[k_bananadrag] > TICRATE)
|
|
||||||
&& player->speed != 0
|
|
||||||
&& P_IsObjectOnGround(player->mo))
|
|
||||||
{
|
|
||||||
if (leveltime & 1) // this is actually funny lel
|
|
||||||
high = FRACUNIT / 64;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (player->kartstuff[k_brakedrift])
|
|
||||||
{
|
|
||||||
high = CLAMP((high + FRACUNIT / 256), 0, UINT16_MAX);
|
|
||||||
}
|
|
||||||
|
|
||||||
// pulse when gettin new driftlevel
|
|
||||||
// let this come last
|
|
||||||
if (player->kartstuff[k_driftcharge]
|
|
||||||
&& player->driftlevel)
|
|
||||||
{
|
|
||||||
high = CLAMP((high + FRACUNIT / 256), 0, UINT16_MAX);
|
|
||||||
|
|
||||||
if (player->driftlevel == 2)
|
|
||||||
lenght = 114;
|
|
||||||
else if (player->driftlevel == 3)
|
|
||||||
lenght = 174;
|
|
||||||
}
|
|
||||||
|
|
||||||
// hack alert! i just dont want this thing constantly resetting the rumble lol
|
|
||||||
if (low == 0 && high == 0)
|
|
||||||
{
|
|
||||||
continue;
|
|
||||||
}
|
|
||||||
|
|
||||||
G_PlayerDeviceRumble(i, low, high, lenght);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
void P_RunChaseCameras(void)
|
void P_RunChaseCameras(void)
|
||||||
{
|
{
|
||||||
UINT8 i;
|
UINT8 i;
|
||||||
@@ -763,7 +656,7 @@ void P_Ticker(boolean run)
|
|||||||
// Apply rumble to local players
|
// Apply rumble to local players
|
||||||
if (!demo.playback)
|
if (!demo.playback)
|
||||||
{
|
{
|
||||||
P_DeviceRumbleTick();
|
G_DeviceRumbleTick();
|
||||||
}
|
}
|
||||||
|
|
||||||
PS_START_TIMING(ps_lua_thinkframe_time);
|
PS_START_TIMING(ps_lua_thinkframe_time);
|
||||||
@@ -943,10 +836,6 @@ void P_PreTicker(INT32 frames)
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
// Dynamic slopeness
|
|
||||||
if (midgamejoin)
|
|
||||||
P_RunDynamicSlopes();
|
|
||||||
|
|
||||||
P_RunThinkers();
|
P_RunThinkers();
|
||||||
|
|
||||||
// Run any "after all the other thinkers" stuff
|
// Run any "after all the other thinkers" stuff
|
||||||
|
|||||||
+70
-40
@@ -47,6 +47,7 @@
|
|||||||
// SRB2kart
|
// SRB2kart
|
||||||
#include "m_cond.h" // M_UpdateUnlockablesAndExtraEmblems
|
#include "m_cond.h" // M_UpdateUnlockablesAndExtraEmblems
|
||||||
#include "k_kart.h"
|
#include "k_kart.h"
|
||||||
|
#include "k_hud.h"
|
||||||
#include "console.h" // CON_LogMessage
|
#include "console.h" // CON_LogMessage
|
||||||
#include "m_menu.h"
|
#include "m_menu.h"
|
||||||
|
|
||||||
@@ -213,12 +214,11 @@ UINT8 P_GetNextEmerald(void)
|
|||||||
if (!(emeralds & EMERALD6)) return 5;
|
if (!(emeralds & EMERALD6)) return 5;
|
||||||
return 6;
|
return 6;
|
||||||
}
|
}
|
||||||
else // Depends on stage
|
|
||||||
{
|
// Depends on stage
|
||||||
if (gamemap < sstage_start || gamemap > sstage_end)
|
if (gamemap < sstage_start || gamemap > sstage_end)
|
||||||
return 0;
|
return 0;
|
||||||
return (UINT8)(gamemap - sstage_start);
|
return (UINT8)(gamemap - sstage_start);
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
//
|
//
|
||||||
@@ -434,8 +434,8 @@ void P_GivePlayerRings(player_t *player, INT32 num_rings)
|
|||||||
if (!player->mo)
|
if (!player->mo)
|
||||||
return;
|
return;
|
||||||
|
|
||||||
player->mo->health += num_rings;
|
//player->mo->health += num_rings;
|
||||||
player->health += num_rings;
|
//player->health += num_rings;
|
||||||
player->totalring += num_rings;
|
player->totalring += num_rings;
|
||||||
|
|
||||||
//{ SRB2kart - rings don't really do anything, but we don't want the player spilling them later.
|
//{ SRB2kart - rings don't really do anything, but we don't want the player spilling them later.
|
||||||
@@ -581,7 +581,8 @@ static boolean isPlayerLosing(player_t *player)
|
|||||||
if (players[i].marescore > player->marescore)
|
if (players[i].marescore > player->marescore)
|
||||||
++pos;
|
++pos;
|
||||||
|
|
||||||
maxpos = max(getPlayerPos(&players[i]), maxpos);
|
const UINT8 playerpos = getPlayerPos(&players[i]);
|
||||||
|
maxpos = max(playerpos, maxpos);
|
||||||
}
|
}
|
||||||
|
|
||||||
if (maxpos == 1)
|
if (maxpos == 1)
|
||||||
@@ -700,6 +701,7 @@ void P_RestoreMusic(player_t *player)
|
|||||||
if (P_EndingMusic(player))
|
if (P_EndingMusic(player))
|
||||||
return;
|
return;
|
||||||
|
|
||||||
|
// Event - Level Start
|
||||||
if (leveltime < MUSICSTARTTIME)
|
if (leveltime < MUSICSTARTTIME)
|
||||||
S_StartMapMusic();
|
S_StartMapMusic();
|
||||||
else // see also where time overs are handled - search for "lives = 2" in this file
|
else // see also where time overs are handled - search for "lives = 2" in this file
|
||||||
@@ -994,6 +996,19 @@ INT32 P_GetLocalPlayerNumForNum(UINT8 pnum)
|
|||||||
return (pnum == 0 ? consoleplayer : displayplayers[pnum]);
|
return (pnum == 0 ? consoleplayer : displayplayers[pnum]);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
INT32 P_GetLocalPlayerNumForPlayer(const player_t *player)
|
||||||
|
{
|
||||||
|
for (UINT8 i = 0; i <= splitscreen; i++)
|
||||||
|
{
|
||||||
|
if (player == P_GetLocalPlayerForNum(i))
|
||||||
|
{
|
||||||
|
return i;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
return -1;
|
||||||
|
}
|
||||||
|
|
||||||
//
|
//
|
||||||
// P_IsLocalPlayer
|
// P_IsLocalPlayer
|
||||||
//
|
//
|
||||||
@@ -1160,6 +1175,9 @@ mobj_t *P_SpawnGhostMobj(mobj_t *mobj)
|
|||||||
|
|
||||||
ghost = P_SpawnMobj(mobj->x, mobj->y, mobj->z, MT_GHOST);
|
ghost = P_SpawnMobj(mobj->x, mobj->y, mobj->z, MT_GHOST);
|
||||||
|
|
||||||
|
// not sure if this is safe to do...........
|
||||||
|
//P_SetTarget(&ghost->target, mobj);
|
||||||
|
|
||||||
P_SetScale(ghost, mobj->scale);
|
P_SetScale(ghost, mobj->scale);
|
||||||
ghost->scalespeed = mobj->scalespeed;
|
ghost->scalespeed = mobj->scalespeed;
|
||||||
ghost->destscale = mobj->scale;
|
ghost->destscale = mobj->scale;
|
||||||
@@ -1173,10 +1191,7 @@ mobj_t *P_SpawnGhostMobj(mobj_t *mobj)
|
|||||||
ghost->color = mobj->color;
|
ghost->color = mobj->color;
|
||||||
ghost->colorized = mobj->colorized; // Kart: they should also be colorized if their origin is
|
ghost->colorized = mobj->colorized; // Kart: they should also be colorized if their origin is
|
||||||
|
|
||||||
if (mobj->player)
|
ghost->angle = (mobj->player ? mobj->player->frameangle : mobj->angle);
|
||||||
ghost->angle = mobj->player->frameangle;
|
|
||||||
else
|
|
||||||
ghost->angle = mobj->angle;
|
|
||||||
|
|
||||||
ghost->sprite = mobj->sprite;
|
ghost->sprite = mobj->sprite;
|
||||||
ghost->frame = mobj->frame;
|
ghost->frame = mobj->frame;
|
||||||
@@ -1189,11 +1204,17 @@ mobj_t *P_SpawnGhostMobj(mobj_t *mobj)
|
|||||||
ghost->localskin = mobj->localskin;
|
ghost->localskin = mobj->localskin;
|
||||||
ghost->skinlocal = mobj->skinlocal;
|
ghost->skinlocal = mobj->skinlocal;
|
||||||
|
|
||||||
|
// same deal...
|
||||||
|
//ghost->standingslope = mobj->standingslope;
|
||||||
|
|
||||||
ghost->spritexscale = mobj->spritexscale;
|
ghost->spritexscale = mobj->spritexscale;
|
||||||
ghost->spriteyscale = mobj->spriteyscale;
|
ghost->spriteyscale = mobj->spriteyscale;
|
||||||
ghost->spritexoffset = mobj->spritexoffset;
|
ghost->spritexoffset = mobj->spritexoffset;
|
||||||
ghost->spriteyoffset = mobj->spriteyoffset;
|
ghost->spriteyoffset = mobj->spriteyoffset;
|
||||||
|
|
||||||
|
if (mobj->player && K_PlayerEffectsShouldBlend(mobj->player))
|
||||||
|
ghost->blendmode = AST_ADD;
|
||||||
|
|
||||||
ghost->pitch = mobj->pitch;
|
ghost->pitch = mobj->pitch;
|
||||||
ghost->roll = mobj->roll;
|
ghost->roll = mobj->roll;
|
||||||
ghost->sloperoll = mobj->sloperoll;
|
ghost->sloperoll = mobj->sloperoll;
|
||||||
@@ -1858,7 +1879,6 @@ boolean P_AnalogMove(player_t *player)
|
|||||||
return player->pflags & PF_ANALOGMODE;
|
return player->pflags & PF_ANALOGMODE;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
//#define OLD_MOVEMENT_CODE 1
|
//#define OLD_MOVEMENT_CODE 1
|
||||||
static void P_3dMovement(player_t *player)
|
static void P_3dMovement(player_t *player)
|
||||||
{
|
{
|
||||||
@@ -2596,15 +2616,7 @@ static void P_DoZoomTube(player_t *player)
|
|||||||
if (player->mo->tracer)
|
if (player->mo->tracer)
|
||||||
{
|
{
|
||||||
player->mo->angle = R_PointToAngle2(player->mo->x, player->mo->y, player->mo->tracer->x, player->mo->tracer->y);
|
player->mo->angle = R_PointToAngle2(player->mo->x, player->mo->y, player->mo->tracer->x, player->mo->tracer->y);
|
||||||
|
P_ForceLocalAngle(player, player->mo->angle);
|
||||||
for (UINT8 i = 0; i <= splitscreen; i++)
|
|
||||||
{
|
|
||||||
if (player == P_GetLocalPlayerForNum(i))
|
|
||||||
{
|
|
||||||
localangle[i] = player->mo->angle;
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -2790,14 +2802,7 @@ void P_HomingAttack(mobj_t *source, mobj_t *enemy) // Home in on your target
|
|||||||
|
|
||||||
if (source->player)
|
if (source->player)
|
||||||
{
|
{
|
||||||
for (UINT8 i = 0; i <= splitscreen; i++)
|
P_ForceLocalAngle(source->player, source->angle);
|
||||||
{
|
|
||||||
if (source->player == P_GetLocalPlayerForNum(i))
|
|
||||||
{
|
|
||||||
localangle[i] = source->angle;
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
// change slope
|
// change slope
|
||||||
@@ -2926,7 +2931,7 @@ notrealplayer:
|
|||||||
// P_MoveCamera: make sure the camera is not outside the world and looks at the player avatar
|
// P_MoveCamera: make sure the camera is not outside the world and looks at the player avatar
|
||||||
//
|
//
|
||||||
|
|
||||||
camera_t camera[MAXSPLITSCREENPLAYERS]; // Four cameras, three for splitscreen
|
camera_t camera[MAXSPLITSCREENPLAYERS] = {}; // Four cameras, three for splitscreen
|
||||||
|
|
||||||
static void CV_CamRotate_OnChange(void)
|
static void CV_CamRotate_OnChange(void)
|
||||||
{
|
{
|
||||||
@@ -5193,14 +5198,8 @@ void P_PlayerAfterThink(player_t *player)
|
|||||||
player->mo->tracer->target->health += cmd->sidemove;
|
player->mo->tracer->target->health += cmd->sidemove;
|
||||||
player->mo->angle += cmd->sidemove << ANGLETOFINESHIFT; // 2048 --> ANGLE_MAX
|
player->mo->angle += cmd->sidemove << ANGLETOFINESHIFT; // 2048 --> ANGLE_MAX
|
||||||
|
|
||||||
for (UINT8 i = 0; i <= splitscreen; i++)
|
// Adjust the local control angle.
|
||||||
{
|
P_ForceLocalAngle(player, player->mo->angle);
|
||||||
if (player == P_GetLocalPlayerForNum(i))
|
|
||||||
{
|
|
||||||
localangle[i] = player->mo->angle; // Adjust the local control angle.
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -5239,3 +5238,34 @@ void P_PlayerAfterThink(player_t *player)
|
|||||||
|
|
||||||
K_KartPlayerAfterThink(player);
|
K_KartPlayerAfterThink(player);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
angle_t P_GetLocalAngle(player_t *player)
|
||||||
|
{
|
||||||
|
// this function is from vanilla srb2. can you tell?
|
||||||
|
// (hint: they have separate variables for all of this shit instead of arrays)
|
||||||
|
UINT8 i;
|
||||||
|
|
||||||
|
for (i = 0; i <= splitscreen; i++)
|
||||||
|
{
|
||||||
|
if (player == &players[displayplayers[i]])
|
||||||
|
return localangle[i];
|
||||||
|
}
|
||||||
|
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
void P_ForceLocalAngle(player_t *player, angle_t angle)
|
||||||
|
{
|
||||||
|
UINT8 i;
|
||||||
|
|
||||||
|
angle = angle & ~UINT16_MAX;
|
||||||
|
|
||||||
|
for (i = 0; i <= splitscreen; i++)
|
||||||
|
{
|
||||||
|
if (player == &players[displayplayers[i]])
|
||||||
|
{
|
||||||
|
localangle[i] = angle;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
+19
-11
@@ -322,9 +322,6 @@ static void R_AddLine(seg_t *line)
|
|||||||
|
|
||||||
g_portal = NULL;
|
g_portal = NULL;
|
||||||
|
|
||||||
if (line->polyseg && !(line->polyseg->flags & POF_RENDERSIDES))
|
|
||||||
return;
|
|
||||||
|
|
||||||
// big room fix
|
// big room fix
|
||||||
angle1 = R_PointToAngle64(line->v1->x, line->v1->y);
|
angle1 = R_PointToAngle64(line->v1->x, line->v1->y);
|
||||||
angle2 = R_PointToAngle64(line->v2->x, line->v2->y);
|
angle2 = R_PointToAngle64(line->v2->x, line->v2->y);
|
||||||
@@ -500,7 +497,7 @@ clipsolid:
|
|||||||
// 0 | 0 | 1 | 2
|
// 0 | 0 | 1 | 2
|
||||||
// 1 | 4 | 5 | 6
|
// 1 | 4 | 5 | 6
|
||||||
// 2 | 8 | 9 | A
|
// 2 | 8 | 9 | A
|
||||||
INT32 checkcoord[12][4] =
|
const INT32 checkcoord[12][4] =
|
||||||
{
|
{
|
||||||
{3, 0, 2, 1},
|
{3, 0, 2, 1},
|
||||||
{3, 0, 2, 0},
|
{3, 0, 2, 0},
|
||||||
@@ -722,6 +719,8 @@ static void R_AddPolyObjects(subsector_t *sub)
|
|||||||
po = (polyobj_t *)(po->link.next);
|
po = (polyobj_t *)(po->link.next);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
g_portal = NULL;
|
||||||
|
|
||||||
// for render stats
|
// for render stats
|
||||||
ps_numpolyobjects.value.i += numpolys;
|
ps_numpolyobjects.value.i += numpolys;
|
||||||
|
|
||||||
@@ -732,8 +731,16 @@ static void R_AddPolyObjects(subsector_t *sub)
|
|||||||
for (i = 0; i < numpolys; ++i)
|
for (i = 0; i < numpolys; ++i)
|
||||||
{
|
{
|
||||||
qs22j(po_ptrs[i]->segs, po_ptrs[i]->segCount, sizeof(seg_t *), R_PolysegCompare);
|
qs22j(po_ptrs[i]->segs, po_ptrs[i]->segCount, sizeof(seg_t *), R_PolysegCompare);
|
||||||
|
|
||||||
for (j = 0; j < po_ptrs[i]->segCount; ++j)
|
for (j = 0; j < po_ptrs[i]->segCount; ++j)
|
||||||
R_AddLine(po_ptrs[i]->segs[j]);
|
{
|
||||||
|
seg_t *seg = po_ptrs[i]->segs[j];
|
||||||
|
|
||||||
|
if (!(seg->polyseg->flags & POF_RENDERSIDES))
|
||||||
|
continue;
|
||||||
|
|
||||||
|
R_AddLine(seg);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -805,7 +812,7 @@ static void R_Subsector(size_t num)
|
|||||||
if (anyMoved == true)
|
if (anyMoved == true)
|
||||||
{
|
{
|
||||||
frontsector->numlights = sub->sector->numlights = 0;
|
frontsector->numlights = sub->sector->numlights = 0;
|
||||||
R_Prep3DFloors(frontsector);
|
R_Prep3DFloors(frontsector, ceilingcenterz);
|
||||||
sub->sector->lightlist = frontsector->lightlist;
|
sub->sector->lightlist = frontsector->lightlist;
|
||||||
sub->sector->numlights = frontsector->numlights;
|
sub->sector->numlights = frontsector->numlights;
|
||||||
sub->sector->moved = frontsector->moved = false;
|
sub->sector->moved = frontsector->moved = false;
|
||||||
@@ -1055,7 +1062,7 @@ static void R_Subsector(size_t num)
|
|||||||
//
|
//
|
||||||
// This function creates the lightlists that the given sector uses to light
|
// This function creates the lightlists that the given sector uses to light
|
||||||
// floors/ceilings/walls according to the 3D floors.
|
// floors/ceilings/walls according to the 3D floors.
|
||||||
void R_Prep3DFloors(sector_t *sector)
|
void R_Prep3DFloors(sector_t *sector, fixed_t secceilz)
|
||||||
{
|
{
|
||||||
ffloor_t *rover;
|
ffloor_t *rover;
|
||||||
ffloor_t *best;
|
ffloor_t *best;
|
||||||
@@ -1081,13 +1088,13 @@ void R_Prep3DFloors(sector_t *sector)
|
|||||||
if (count != sector->numlights)
|
if (count != sector->numlights)
|
||||||
{
|
{
|
||||||
Z_Free(sector->lightlist);
|
Z_Free(sector->lightlist);
|
||||||
sector->lightlist = static_cast<lightlist_t*>(Z_Calloc(sizeof (*sector->lightlist) * count, PU_LEVEL, NULL));
|
sector->lightlist = static_cast<lightlist_t*>(Z_Malloc(sizeof(*sector->lightlist) * count, PU_LEVEL, NULL));
|
||||||
sector->numlights = count;
|
sector->numlights = count;
|
||||||
}
|
}
|
||||||
else
|
|
||||||
memset(sector->lightlist, 0, sizeof (lightlist_t) * count);
|
|
||||||
|
|
||||||
heighttest = P_GetSectorCeilingZAt(sector, sector->soundorg.x, sector->soundorg.y);
|
memset(sector->lightlist, 0, sizeof(lightlist_t) * count);
|
||||||
|
|
||||||
|
heighttest = secceilz; // sector ceiling z
|
||||||
|
|
||||||
sector->lightlist[0].height = heighttest + 1;
|
sector->lightlist[0].height = heighttest + 1;
|
||||||
sector->lightlist[0].slope = sector->c_slope;
|
sector->lightlist[0].slope = sector->c_slope;
|
||||||
@@ -1117,6 +1124,7 @@ void R_Prep3DFloors(sector_t *sector)
|
|||||||
bestslope = *rover->t_slope;
|
bestslope = *rover->t_slope;
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (rover->flags & FF_DOUBLESHADOW)
|
if (rover->flags & FF_DOUBLESHADOW)
|
||||||
{
|
{
|
||||||
heighttest = P_GetFFloorBottomZAt(rover, sector->soundorg.x, sector->soundorg.y);
|
heighttest = P_GetFFloorBottomZAt(rover, sector->soundorg.x, sector->soundorg.y);
|
||||||
|
|||||||
+2
-2
@@ -34,7 +34,7 @@ extern portal_t *g_portal; // is curline a portal seg?
|
|||||||
|
|
||||||
// drawsegs are allocated on the fly... see r_segs.c
|
// drawsegs are allocated on the fly... see r_segs.c
|
||||||
|
|
||||||
extern INT32 checkcoord[12][4];
|
extern const INT32 checkcoord[12][4];
|
||||||
|
|
||||||
extern drawseg_t *curdrawsegs;
|
extern drawseg_t *curdrawsegs;
|
||||||
extern drawseg_t *drawsegs;
|
extern drawseg_t *drawsegs;
|
||||||
@@ -65,7 +65,7 @@ sector_t *R_FakeFlat(sector_t *sec, sector_t *tempsec, INT32 *floorlightlevel,
|
|||||||
boolean R_IsEmptyLine(seg_t *line, const sector_t *front, const sector_t *back);
|
boolean R_IsEmptyLine(seg_t *line, const sector_t *front, const sector_t *back);
|
||||||
|
|
||||||
INT32 R_GetPlaneLight(sector_t *sector, fixed_t planeheight, boolean underside);
|
INT32 R_GetPlaneLight(sector_t *sector, fixed_t planeheight, boolean underside);
|
||||||
void R_Prep3DFloors(sector_t *sector);
|
void R_Prep3DFloors(sector_t *sector, fixed_t secceilz);
|
||||||
|
|
||||||
#ifdef __cplusplus
|
#ifdef __cplusplus
|
||||||
} // extern "C"
|
} // extern "C"
|
||||||
|
|||||||
+14
-113
@@ -307,10 +307,10 @@ static boolean R_CheckTextureLumpLength(texture_t *texture, size_t patch)
|
|||||||
CONS_Alert(
|
CONS_Alert(
|
||||||
CONS_ERROR,
|
CONS_ERROR,
|
||||||
"%.8s: texture lump data is too small. Expected %s bytes, got %s. (%s)\n",
|
"%.8s: texture lump data is too small. Expected %s bytes, got %s. (%s)\n",
|
||||||
texture->name,
|
texture->name,
|
||||||
sizeu1(offsetof(softwarepatch_t, columnofs)),
|
sizeu1(offsetof(softwarepatch_t, columnofs)),
|
||||||
sizeu2(lumplength),
|
sizeu2(lumplength),
|
||||||
wadfiles[wadnum]->lumpinfo[lumpnum].fullname
|
wadfiles[wadnum]->lumpinfo[lumpnum].fullname
|
||||||
);
|
);
|
||||||
|
|
||||||
return false;
|
return false;
|
||||||
@@ -717,38 +717,25 @@ static INT32 R_CountTextures(UINT16 wadnum)
|
|||||||
return count;
|
return count;
|
||||||
}
|
}
|
||||||
|
|
||||||
static void
|
|
||||||
recallocuser
|
|
||||||
( void * user,
|
|
||||||
size_t old,
|
|
||||||
size_t new)
|
|
||||||
{
|
|
||||||
char *p = Z_Realloc(*(void**)user,
|
|
||||||
new, PU_STATIC, user);
|
|
||||||
|
|
||||||
if (new > old)
|
|
||||||
memset(&p[old], 0, (new - old));
|
|
||||||
}
|
|
||||||
|
|
||||||
static void R_AllocateTextures(INT32 add)
|
static void R_AllocateTextures(INT32 add)
|
||||||
{
|
{
|
||||||
const INT32 newtextures = (numtextures + add);
|
const INT32 newtextures = (numtextures + add);
|
||||||
const size_t newsize = newtextures * sizeof (void*);
|
const size_t newsize = newtextures * sizeof (void*);
|
||||||
const size_t oldsize = numtextures * sizeof (void*);
|
//const size_t oldsize = numtextures * sizeof (void*);
|
||||||
|
|
||||||
INT32 i;
|
INT32 i;
|
||||||
|
|
||||||
// Allocate memory and initialize to 0 for all the textures we are initialising.
|
// Allocate memory and initialize to 0 for all the textures we are initialising.
|
||||||
recallocuser(&textures, oldsize, newsize);
|
Z_Realloc(textures, newsize, PU_STATIC, &textures);
|
||||||
|
|
||||||
// Allocate texture column offset table.
|
// Allocate texture column offset table.
|
||||||
recallocuser(&texturecolumnofs, oldsize, newsize);
|
Z_Realloc(texturecolumnofs, newsize, PU_STATIC, &texturecolumnofs);
|
||||||
// Allocate texture referencing cache.
|
// Allocate texture referencing cache.
|
||||||
recallocuser(&texturecache, oldsize, newsize);
|
Z_Realloc(texturecache, newsize, PU_STATIC, &texturecache);
|
||||||
// Allocate texture width table.
|
// Allocate texture width table.
|
||||||
recallocuser(&texturewidth, oldsize, newsize);
|
Z_Realloc(texturewidth, newsize, PU_STATIC, &texturewidth);
|
||||||
// Allocate texture height table.
|
// Allocate texture height table.
|
||||||
recallocuser(&textureheight, oldsize, newsize);
|
Z_Realloc(textureheight, newsize, PU_STATIC, &textureheight);
|
||||||
// Create translation table for global animation.
|
// Create translation table for global animation.
|
||||||
Z_Realloc(texturetranslation, (newtextures + 1) * sizeof(*texturetranslation), PU_STATIC, &texturetranslation);
|
Z_Realloc(texturetranslation, (newtextures + 1) * sizeof(*texturetranslation), PU_STATIC, &texturetranslation);
|
||||||
|
|
||||||
@@ -853,6 +840,7 @@ static texpatch_t *R_ParsePatch(boolean actuallyLoadPatch)
|
|||||||
{
|
{
|
||||||
Z_Free(patchName);
|
Z_Free(patchName);
|
||||||
}
|
}
|
||||||
|
|
||||||
patchName = (char *)Z_Malloc((texturesTokenLength+1)*sizeof(char),PU_STATIC,NULL);
|
patchName = (char *)Z_Malloc((texturesTokenLength+1)*sizeof(char),PU_STATIC,NULL);
|
||||||
memcpy(patchName,texturesToken,texturesTokenLength*sizeof(char));
|
memcpy(patchName,texturesToken,texturesTokenLength*sizeof(char));
|
||||||
patchName[texturesTokenLength] = '\0';
|
patchName[texturesTokenLength] = '\0';
|
||||||
@@ -1249,60 +1237,6 @@ void R_ParseTEXTURESLump(UINT16 wadNum, UINT16 lumpNum, INT32 *texindex)
|
|||||||
Z_Free((void *)texturesText);
|
Z_Free((void *)texturesText);
|
||||||
}
|
}
|
||||||
|
|
||||||
/*
|
|
||||||
static inline lumpnum_t R_CheckNumForNameList(const char *name, lumplist_t *list, size_t listsize) // SRB2kart - unused.
|
|
||||||
{
|
|
||||||
size_t i;
|
|
||||||
UINT16 lump;
|
|
||||||
|
|
||||||
for (i = listsize - 1; i < INT16_MAX; i--)
|
|
||||||
{
|
|
||||||
lump = W_CheckNumForNamePwad(name, list[i].wadfile, list[i].firstlump);
|
|
||||||
if (lump == INT16_MAX || lump > (list[i].firstlump + list[i].numlumps))
|
|
||||||
continue;
|
|
||||||
else
|
|
||||||
return (list[i].wadfile<<16)+lump;
|
|
||||||
}
|
|
||||||
return LUMPERROR;
|
|
||||||
}
|
|
||||||
*/
|
|
||||||
|
|
||||||
/*static lumplist_t *colormaplumps = NULL; ///\todo free leak
|
|
||||||
static size_t numcolormaplumps = 0;
|
|
||||||
|
|
||||||
static void R_InitExtraColormaps(void)
|
|
||||||
{
|
|
||||||
lumpnum_t startnum, endnum;
|
|
||||||
UINT16 cfile, clump;
|
|
||||||
static size_t maxcolormaplumps = 16;
|
|
||||||
|
|
||||||
for (cfile = clump = 0; cfile < numwadfiles; cfile++, clump = 0)
|
|
||||||
{
|
|
||||||
startnum = W_CheckNumForNamePwad("C_START", cfile, clump);
|
|
||||||
if (startnum == INT16_MAX)
|
|
||||||
continue;
|
|
||||||
|
|
||||||
endnum = W_CheckNumForNamePwad("C_END", cfile, clump);
|
|
||||||
|
|
||||||
if (endnum == INT16_MAX)
|
|
||||||
I_Error("R_InitExtraColormaps: C_START without C_END\n");
|
|
||||||
|
|
||||||
// This shouldn't be possible when you use the Pwad function, silly
|
|
||||||
//if (WADFILENUM(startnum) != WADFILENUM(endnum))
|
|
||||||
//I_Error("R_InitExtraColormaps: C_START and C_END in different wad files!\n");
|
|
||||||
|
|
||||||
if (numcolormaplumps >= maxcolormaplumps)
|
|
||||||
maxcolormaplumps *= 2;
|
|
||||||
colormaplumps = Z_Realloc(colormaplumps,
|
|
||||||
sizeof (*colormaplumps) * maxcolormaplumps, PU_STATIC, NULL);
|
|
||||||
colormaplumps[numcolormaplumps].wadfile = cfile;
|
|
||||||
colormaplumps[numcolormaplumps].firstlump = startnum+1;
|
|
||||||
colormaplumps[numcolormaplumps].numlumps = endnum - (startnum + 1);
|
|
||||||
numcolormaplumps++;
|
|
||||||
}
|
|
||||||
CONS_Printf(M_GetText("Number of Extra Colormaps: %s\n"), sizeu1(numcolormaplumps));
|
|
||||||
}*/
|
|
||||||
|
|
||||||
// Search for flat name.
|
// Search for flat name.
|
||||||
lumpnum_t R_GetFlatNumForName(const char *name)
|
lumpnum_t R_GetFlatNumForName(const char *name)
|
||||||
{
|
{
|
||||||
@@ -1430,7 +1364,7 @@ void R_ReInitColormaps(UINT16 num, lumpnum_t newencoremap)
|
|||||||
encoremap = Z_Malloc(256 + 10, PU_LEVEL, NULL);
|
encoremap = Z_Malloc(256 + 10, PU_LEVEL, NULL);
|
||||||
W_ReadLump(newencoremap, encoremap);
|
W_ReadLump(newencoremap, encoremap);
|
||||||
colormap_p = colormap_p2 = colormaps;
|
colormap_p = colormap_p2 = colormaps;
|
||||||
colormap_p += (256 * 32);
|
colormap_p += COLORMAP_REMAPOFFSET;
|
||||||
|
|
||||||
for (p = 0; p < 32; p++)
|
for (p = 0; p < 32; p++)
|
||||||
{
|
{
|
||||||
@@ -1439,6 +1373,7 @@ void R_ReInitColormaps(UINT16 num, lumpnum_t newencoremap)
|
|||||||
*colormap_p = colormap_p2[encoremap[i]];
|
*colormap_p = colormap_p2[encoremap[i]];
|
||||||
colormap_p++;
|
colormap_p++;
|
||||||
}
|
}
|
||||||
|
|
||||||
colormap_p2 += 256;
|
colormap_p2 += 256;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -1465,43 +1400,9 @@ void R_ClearColormaps(void)
|
|||||||
for (i = 0; i < MAXCOLORMAPS; i++)
|
for (i = 0; i < MAXCOLORMAPS; i++)
|
||||||
foundcolormaps[i] = LUMPERROR;
|
foundcolormaps[i] = LUMPERROR;
|
||||||
|
|
||||||
memset(extra_colormaps, 0, sizeof (extra_colormaps));
|
memset(extra_colormaps, 0, sizeof(extra_colormaps));
|
||||||
}
|
}
|
||||||
|
|
||||||
/*INT32 R_ColormapNumForName(char *name)
|
|
||||||
{
|
|
||||||
lumpnum_t lump, i;
|
|
||||||
|
|
||||||
if (num_extra_colormaps == MAXCOLORMAPS)
|
|
||||||
I_Error("R_ColormapNumForName: Too many colormaps! the limit is %d\n", MAXCOLORMAPS);
|
|
||||||
|
|
||||||
lump = R_CheckNumForNameList(name, colormaplumps, numcolormaplumps);
|
|
||||||
if (lump == LUMPERROR)
|
|
||||||
I_Error("R_ColormapNumForName: Cannot find colormap lump %.8s\n", name);
|
|
||||||
|
|
||||||
for (i = 0; i < num_extra_colormaps; i++)
|
|
||||||
if (lump == foundcolormaps[i])
|
|
||||||
return i;
|
|
||||||
|
|
||||||
foundcolormaps[num_extra_colormaps] = lump;
|
|
||||||
|
|
||||||
// aligned on 8 bit for asm code
|
|
||||||
extra_colormaps[num_extra_colormaps].colormap = Z_Malloc(W_LumpLength(lump), PU_LEVEL, NULL);
|
|
||||||
W_ReadLump(lump, extra_colormaps[num_extra_colormaps].colormap);
|
|
||||||
|
|
||||||
// We set all params of the colormap to normal because there
|
|
||||||
// is no real way to tell how GL should handle a colormap lump anyway..
|
|
||||||
extra_colormaps[num_extra_colormaps].maskcolor = 0xffff;
|
|
||||||
extra_colormaps[num_extra_colormaps].fadecolor = 0x0;
|
|
||||||
extra_colormaps[num_extra_colormaps].maskamt = 0x0;
|
|
||||||
extra_colormaps[num_extra_colormaps].fadestart = 0;
|
|
||||||
extra_colormaps[num_extra_colormaps].fadeend = 31;
|
|
||||||
extra_colormaps[num_extra_colormaps].fog = 0;
|
|
||||||
|
|
||||||
num_extra_colormaps++;
|
|
||||||
return (INT32)num_extra_colormaps - 1;
|
|
||||||
}*/
|
|
||||||
|
|
||||||
//
|
//
|
||||||
// R_CreateColormap
|
// R_CreateColormap
|
||||||
//
|
//
|
||||||
|
|||||||
+2
-7
@@ -397,9 +397,6 @@ typedef struct sector_s
|
|||||||
// Sprite culling feature
|
// Sprite culling feature
|
||||||
struct line_s *cullheight;
|
struct line_s *cullheight;
|
||||||
|
|
||||||
// Current speed of ceiling/floor. For Knuckles to hold onto stuff.
|
|
||||||
fixed_t floorspeed, ceilspeed;
|
|
||||||
|
|
||||||
// Eternity engine slope
|
// Eternity engine slope
|
||||||
boolean hasslope; // The sector, or one of its visible FOFs, contains a slope
|
boolean hasslope; // The sector, or one of its visible FOFs, contains a slope
|
||||||
} sector_t;
|
} sector_t;
|
||||||
@@ -549,12 +546,10 @@ typedef struct seg_s
|
|||||||
sector_t *backsector;
|
sector_t *backsector;
|
||||||
|
|
||||||
fixed_t length; // precalculated seg length
|
fixed_t length; // precalculated seg length
|
||||||
|
|
||||||
#ifdef HWRENDER
|
#ifdef HWRENDER
|
||||||
floatvertex_t fv1;
|
floatvertex_t fv1; // v1 in floats - precalculated
|
||||||
floatvertex_t fv2;
|
floatvertex_t fv2; // v2 in floats - precalculated
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
polyobj_t *polyseg;
|
polyobj_t *polyseg;
|
||||||
|
|
||||||
// Fake contrast calculated on level load
|
// Fake contrast calculated on level load
|
||||||
|
|||||||
+29
-17
@@ -355,13 +355,14 @@ UINT8 *R_GetBlendTable(int style, INT32 alphalevel)
|
|||||||
// Return a normal translucency table
|
// Return a normal translucency table
|
||||||
if (--alphalevel >= 0)
|
if (--alphalevel >= 0)
|
||||||
return transtables + (ClipTransLevel(alphalevel) << FF_TRANSSHIFT);
|
return transtables + (ClipTransLevel(alphalevel) << FF_TRANSSHIFT);
|
||||||
else
|
|
||||||
return NULL;
|
return NULL;
|
||||||
}
|
}
|
||||||
|
|
||||||
boolean R_BlendLevelVisible(INT32 blendmode, INT32 alphalevel)
|
boolean R_BlendLevelVisible(INT32 blendmode, INT32 alphalevel)
|
||||||
{
|
{
|
||||||
if (blendmode <= AST_COPY || blendmode == AST_SUBTRACT || blendmode == AST_MODULATE || blendmode >= AST_OVERLAY)
|
if (blendmode <= AST_COPY || blendmode == AST_SUBTRACT ||
|
||||||
|
blendmode == AST_MODULATE || blendmode >= AST_OVERLAY)
|
||||||
return true;
|
return true;
|
||||||
|
|
||||||
return (alphalevel < BlendTab_Count[BlendTab_FromStyle[blendmode]]);
|
return (alphalevel < BlendTab_Count[BlendTab_FromStyle[blendmode]]);
|
||||||
@@ -412,7 +413,8 @@ static UINT8* RGetTranslationColormap(INT32 skinnum, skincolors_t color, UINT8 f
|
|||||||
// Get colormap
|
// Get colormap
|
||||||
ret = tt[skintableindex][color];
|
ret = tt[skintableindex][color];
|
||||||
}
|
}
|
||||||
else ret = NULL;
|
else
|
||||||
|
ret = NULL;
|
||||||
|
|
||||||
// Generate the colormap if necessary
|
// Generate the colormap if necessary
|
||||||
if (!ret)
|
if (!ret)
|
||||||
@@ -435,36 +437,46 @@ UINT8* R_GetTranslationColormap(INT32 skinnum, skincolors_t color, UINT8 flags)
|
|||||||
|
|
||||||
UINT8* R_GetLocalTranslationColormap(skin_t *skin, skin_t *localskin, skincolors_t color, UINT8 flags, boolean local)
|
UINT8* R_GetLocalTranslationColormap(skin_t *skin, skin_t *localskin, skincolors_t color, UINT8 flags, boolean local)
|
||||||
{
|
{
|
||||||
if (localskin)
|
const INT32 skinnum = localskin ? (localskin - K_GetSkinArray(local)) : (skin - skins);
|
||||||
return RGetTranslationColormap(localskin - K_GetSkinArray(local), color, flags, local);
|
return RGetTranslationColormap(skinnum, color, flags, (localskin && local));
|
||||||
else
|
|
||||||
return RGetTranslationColormap((skin - skins), color, flags, false);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
patch_t* R_GetSkinFaceRank(player_t* ply)
|
patch_t* R_GetSkinFaceRank(player_t* ply)
|
||||||
{
|
{
|
||||||
if (ply->skinlocal && ply->localskin)
|
if (ply->localskin)
|
||||||
return localfacerankprefix[ply->localskin - 1];
|
{
|
||||||
else if (ply->localskin)
|
if (ply->skinlocal)
|
||||||
|
return localfacerankprefix[ply->localskin - 1];
|
||||||
|
|
||||||
return facerankprefix[ply->localskin - 1];
|
return facerankprefix[ply->localskin - 1];
|
||||||
|
}
|
||||||
|
|
||||||
return facerankprefix[ply->skin];
|
return facerankprefix[ply->skin];
|
||||||
}
|
}
|
||||||
|
|
||||||
patch_t* R_GetSkinFaceWant(player_t* ply)
|
patch_t* R_GetSkinFaceWant(player_t* ply)
|
||||||
{
|
{
|
||||||
if (ply->skinlocal && ply->localskin)
|
if (ply->localskin)
|
||||||
return localfacewantprefix[ply->localskin - 1];
|
{
|
||||||
else if (ply->localskin)
|
if (ply->skinlocal)
|
||||||
|
return localfacewantprefix[ply->localskin - 1];
|
||||||
|
|
||||||
return facewantprefix[ply->localskin - 1];
|
return facewantprefix[ply->localskin - 1];
|
||||||
|
}
|
||||||
|
|
||||||
return facewantprefix[ply->skin];
|
return facewantprefix[ply->skin];
|
||||||
}
|
}
|
||||||
|
|
||||||
patch_t* R_GetSkinFaceMini(player_t* ply)
|
patch_t* R_GetSkinFaceMini(player_t* ply)
|
||||||
{
|
{
|
||||||
if (ply->skinlocal && ply->localskin)
|
if (ply->localskin)
|
||||||
return localfacemmapprefix[ply->localskin - 1];
|
{
|
||||||
else if (ply->localskin)
|
if (ply->skinlocal)
|
||||||
|
return localfacemmapprefix[ply->localskin - 1];
|
||||||
|
|
||||||
return facemmapprefix[ply->localskin - 1];
|
return facemmapprefix[ply->localskin - 1];
|
||||||
|
}
|
||||||
|
|
||||||
return facemmapprefix[ply->skin];
|
return facemmapprefix[ply->skin];
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
+2
-12
@@ -14,13 +14,7 @@
|
|||||||
/// \note no includes because this is included as part of r_draw.cpp
|
/// \note no includes because this is included as part of r_draw.cpp
|
||||||
|
|
||||||
#ifdef HAVE_THREADS
|
#ifdef HAVE_THREADS
|
||||||
#ifdef _WIN32
|
#define local_for_thread static thread_local
|
||||||
#include <windows.h>
|
|
||||||
#define local_for_thread static __thread
|
|
||||||
#else
|
|
||||||
#include <threads.h>
|
|
||||||
#define local_for_thread thread_local static
|
|
||||||
#endif
|
|
||||||
#else
|
#else
|
||||||
#define local_for_thread static
|
#define local_for_thread static
|
||||||
#endif
|
#endif
|
||||||
@@ -221,11 +215,7 @@ static void R_GetTiltedLighting(std::vector<INT32>& tiltlighting, const drawspan
|
|||||||
const float planelightfloat = PLANELIGHTFLOAT;
|
const float planelightfloat = PLANELIGHTFLOAT;
|
||||||
const fixed_t lightstart = FloatToFixed(iz * planelightfloat);
|
const fixed_t lightstart = FloatToFixed(iz * planelightfloat);
|
||||||
const fixed_t lightend = FloatToFixed((iz + ds->szp.x * width) * planelightfloat);
|
const fixed_t lightend = FloatToFixed((iz + ds->szp.x * width) * planelightfloat);
|
||||||
|
tiltlighting.resize((size_t)viewwidth);
|
||||||
if (tiltlighting.size() != (size_t)viewwidth)
|
|
||||||
{
|
|
||||||
tiltlighting.resize(viewwidth);
|
|
||||||
}
|
|
||||||
|
|
||||||
R_CalcTiltedLighting(tiltlighting, ds->x1, ds->x2, lightstart, lightend);
|
R_CalcTiltedLighting(tiltlighting, ds->x1, ds->x2, lightstart, lightend);
|
||||||
//CONS_Printf("tilted lighting %f to %f (foc %f)\n", FixedToFloat(lightstart), FixedToFloat(lightend), focallengthf);
|
//CONS_Printf("tilted lighting %f to %f (foc %f)\n", FixedToFloat(lightstart), FixedToFloat(lightend), focallengthf);
|
||||||
|
|||||||
+2
-6
@@ -75,15 +75,11 @@ typedef struct {
|
|||||||
fixed_t y;
|
fixed_t y;
|
||||||
fixed_t z;
|
fixed_t z;
|
||||||
boolean sky;
|
boolean sky;
|
||||||
sector_t *sector;
|
|
||||||
player_t *player;
|
player_t *player;
|
||||||
|
|
||||||
angle_t angle;
|
angle_t angle;
|
||||||
angle_t aim;
|
angle_t aim;
|
||||||
angle_t roll;
|
angle_t roll;
|
||||||
fixed_t cos;
|
|
||||||
fixed_t sin;
|
|
||||||
mobj_t *mobj;
|
|
||||||
} viewvars_t;
|
} viewvars_t;
|
||||||
|
|
||||||
extern viewvars_t *newview;
|
extern viewvars_t *newview;
|
||||||
@@ -142,12 +138,12 @@ typedef struct levelinterpolator_s {
|
|||||||
fixed_t oldcx, oldcy, bakcx, bakcy;
|
fixed_t oldcx, oldcy, bakcx, bakcy;
|
||||||
angle_t oldangle, bakangle;
|
angle_t oldangle, bakangle;
|
||||||
} polyobj;
|
} polyobj;
|
||||||
struct {
|
/*struct {
|
||||||
pslope_t *slope;
|
pslope_t *slope;
|
||||||
vector3_t oldo, bako;
|
vector3_t oldo, bako;
|
||||||
vector2_t oldd, bakd;
|
vector2_t oldd, bakd;
|
||||||
fixed_t oldzdelta, bakzdelta;
|
fixed_t oldzdelta, bakzdelta;
|
||||||
} dynslope;
|
} dynslope;*/
|
||||||
};
|
};
|
||||||
} levelinterpolator_t;
|
} levelinterpolator_t;
|
||||||
|
|
||||||
|
|||||||
+46
-43
@@ -433,15 +433,34 @@ fixed_t R_ScaleFromGlobalAngle(angle_t visangle)
|
|||||||
if (den > num>>16)
|
if (den > num>>16)
|
||||||
{
|
{
|
||||||
num = FixedDiv(num, den);
|
num = FixedDiv(num, den);
|
||||||
if (num > 64*FRACUNIT)
|
num = CLAMP(num, 256, 64*FRACUNIT);
|
||||||
return 64*FRACUNIT;
|
|
||||||
if (num < 256)
|
|
||||||
return 256;
|
|
||||||
return num;
|
return num;
|
||||||
}
|
}
|
||||||
return 64*FRACUNIT;
|
return 64*FRACUNIT;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
line_t *R_GetFFloorLine(const line_t *line, const ffloor_t *pfloor, const sector_t *sector)
|
||||||
|
{
|
||||||
|
if (pfloor->master->flags & ML_TFERLINE)
|
||||||
|
{
|
||||||
|
size_t linenum = std::min<size_t>((size_t)(line - sector->lines[0]), pfloor->master->frontsector->linecount);
|
||||||
|
return pfloor->master->frontsector->lines[0] + linenum;
|
||||||
|
}
|
||||||
|
|
||||||
|
return pfloor->master;
|
||||||
|
}
|
||||||
|
|
||||||
|
side_t *R_GetFFloorSide(const line_t *line, const ffloor_t *pfloor, const sector_t *sector)
|
||||||
|
{
|
||||||
|
if (pfloor->master->flags & ML_TFERLINE)
|
||||||
|
{
|
||||||
|
line_t *newline = R_GetFFloorLine(line, pfloor, sector);
|
||||||
|
return &sides[newline->sidenum[0]];
|
||||||
|
}
|
||||||
|
|
||||||
|
return &sides[pfloor->master->sidenum[0]];
|
||||||
|
}
|
||||||
|
|
||||||
//
|
//
|
||||||
// R_DoCulling
|
// R_DoCulling
|
||||||
// Checks viewz and top/bottom heights of an item against culling planes
|
// Checks viewz and top/bottom heights of an item against culling planes
|
||||||
@@ -1073,9 +1092,9 @@ subsector_t *R_IsPointInSubsector(fixed_t x, fixed_t y)
|
|||||||
// R_SetupFrame
|
// R_SetupFrame
|
||||||
//
|
//
|
||||||
|
|
||||||
mobj_t *viewmobj;
|
mobj_t *viewmobj = NULL;
|
||||||
|
|
||||||
static void R_SetupCommonFrame(player_t * player, sector_t * sector)
|
static void R_SetupCommonFrame(player_t * player)
|
||||||
{
|
{
|
||||||
newview->player = player;
|
newview->player = player;
|
||||||
|
|
||||||
@@ -1085,11 +1104,6 @@ static void R_SetupCommonFrame(player_t * player, sector_t * sector)
|
|||||||
|
|
||||||
newview->roll = R_ViewRollAngle(player);
|
newview->roll = R_ViewRollAngle(player);
|
||||||
|
|
||||||
if (sector != NULL)
|
|
||||||
newview->sector = sector;
|
|
||||||
else
|
|
||||||
newview->sector = R_PointInSubsectorFast(newview->x, newview->y)->sector;
|
|
||||||
|
|
||||||
R_InterpolateView(R_GetTimeFrac(RTF_CAMERA), false);
|
R_InterpolateView(R_GetTimeFrac(RTF_CAMERA), false);
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -1188,7 +1202,6 @@ void R_SkyboxFrame(UINT8 pnum)
|
|||||||
{
|
{
|
||||||
player_t *player = &players[displayplayers[pnum]];
|
player_t *player = &players[displayplayers[pnum]];
|
||||||
camera_t *thiscam = &camera[pnum];
|
camera_t *thiscam = &camera[pnum];
|
||||||
sector_t *viewsec = NULL;
|
|
||||||
mapheader_t *mh = mapheaderinfo[gamemap-1];
|
mapheader_t *mh = mapheaderinfo[gamemap-1];
|
||||||
|
|
||||||
R_SetViewContext(static_cast<viewcontext_e>(VIEWCONTEXT_SKY1 + pnum));
|
R_SetViewContext(static_cast<viewcontext_e>(VIEWCONTEXT_SKY1 + pnum));
|
||||||
@@ -1214,9 +1227,6 @@ void R_SkyboxFrame(UINT8 pnum)
|
|||||||
newview->x = viewmobj->x;
|
newview->x = viewmobj->x;
|
||||||
newview->y = viewmobj->y;
|
newview->y = viewmobj->y;
|
||||||
newview->z = (viewmobj->spawnpoint) ? (((fixed_t)viewmobj->spawnpoint->angle) << FRACBITS) : 0;
|
newview->z = (viewmobj->spawnpoint) ? (((fixed_t)viewmobj->spawnpoint->angle) << FRACBITS) : 0;
|
||||||
|
|
||||||
if (viewmobj->subsector)
|
|
||||||
viewsec = viewmobj->subsector->sector;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
if (mh)
|
if (mh)
|
||||||
@@ -1224,7 +1234,7 @@ void R_SkyboxFrame(UINT8 pnum)
|
|||||||
R_SetupSkyScale(player, thiscam, mh);
|
R_SetupSkyScale(player, thiscam, mh);
|
||||||
}
|
}
|
||||||
|
|
||||||
R_SetupCommonFrame(player, viewsec);
|
R_SetupCommonFrame(player);
|
||||||
}
|
}
|
||||||
|
|
||||||
void R_SetupFrame(UINT8 pnum, boolean skybox)
|
void R_SetupFrame(UINT8 pnum, boolean skybox)
|
||||||
@@ -1232,17 +1242,10 @@ void R_SetupFrame(UINT8 pnum, boolean skybox)
|
|||||||
player_t *player = &players[displayplayers[pnum]];
|
player_t *player = &players[displayplayers[pnum]];
|
||||||
camera_t *thiscam = &camera[pnum];
|
camera_t *thiscam = &camera[pnum];
|
||||||
boolean chasecam = (cv_chasecam[pnum].value);
|
boolean chasecam = (cv_chasecam[pnum].value);
|
||||||
sector_t *viewsec = NULL;
|
|
||||||
|
|
||||||
R_SetViewContext(static_cast<viewcontext_e>(VIEWCONTEXT_PLAYER1 + pnum));
|
R_SetViewContext(static_cast<viewcontext_e>(VIEWCONTEXT_PLAYER1 + pnum));
|
||||||
|
|
||||||
if (thiscam->reset)
|
if (player->spectator || (thiscam && thiscam->freecam))
|
||||||
{
|
|
||||||
R_ResetViewInterpolation(pnum);
|
|
||||||
thiscam->reset = false;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (player->spectator || thiscam->freecam)
|
|
||||||
{
|
{
|
||||||
// Free flying spectator uses demo freecam. This
|
// Free flying spectator uses demo freecam. This
|
||||||
// requires chasecam to be enabled.
|
// requires chasecam to be enabled.
|
||||||
@@ -1252,13 +1255,22 @@ void R_SetupFrame(UINT8 pnum, boolean skybox)
|
|||||||
if (player->playerstate == PST_DEAD || player->exiting)
|
if (player->playerstate == PST_DEAD || player->exiting)
|
||||||
chasecam = true; // force chasecam on
|
chasecam = true; // force chasecam on
|
||||||
|
|
||||||
if (chasecam && (thiscam && !thiscam->chase))
|
if (thiscam)
|
||||||
{
|
{
|
||||||
P_ResetCamera(player, thiscam);
|
if (thiscam->reset)
|
||||||
thiscam->chase = true;
|
{
|
||||||
|
R_ResetViewInterpolation(pnum);
|
||||||
|
thiscam->reset = false;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (chasecam && !thiscam->chase)
|
||||||
|
{
|
||||||
|
P_ResetCamera(player, thiscam);
|
||||||
|
thiscam->chase = true;
|
||||||
|
}
|
||||||
|
else if (!chasecam)
|
||||||
|
thiscam->chase = false;
|
||||||
}
|
}
|
||||||
else if (thiscam && !chasecam)
|
|
||||||
thiscam->chase = false;
|
|
||||||
|
|
||||||
newview->sky = !skybox;
|
newview->sky = !skybox;
|
||||||
|
|
||||||
@@ -1273,10 +1285,7 @@ void R_SetupFrame(UINT8 pnum, boolean skybox)
|
|||||||
newview->y = viewmobj->y;
|
newview->y = viewmobj->y;
|
||||||
newview->z = viewmobj->z + 20*FRACUNIT;
|
newview->z = viewmobj->z + 20*FRACUNIT;
|
||||||
|
|
||||||
if (viewmobj->subsector)
|
R_SetupCommonFrame(player);
|
||||||
viewsec = viewmobj->subsector->sector;
|
|
||||||
|
|
||||||
R_SetupCommonFrame(player, viewsec);
|
|
||||||
}
|
}
|
||||||
else if (thiscam && chasecam) // use outside cam view
|
else if (thiscam && chasecam) // use outside cam view
|
||||||
{
|
{
|
||||||
@@ -1287,10 +1296,7 @@ void R_SetupFrame(UINT8 pnum, boolean skybox)
|
|||||||
newview->y = thiscam->y;
|
newview->y = thiscam->y;
|
||||||
newview->z = thiscam->z + (thiscam->height>>1);
|
newview->z = thiscam->z + (thiscam->height>>1);
|
||||||
|
|
||||||
if (thiscam->subsector)
|
R_SetupCommonFrame(player);
|
||||||
viewsec = thiscam->subsector->sector;
|
|
||||||
|
|
||||||
R_SetupCommonFrame(player, viewsec);
|
|
||||||
}
|
}
|
||||||
else if (player->mo) // use the player's eyes view
|
else if (player->mo) // use the player's eyes view
|
||||||
{
|
{
|
||||||
@@ -1301,10 +1307,7 @@ void R_SetupFrame(UINT8 pnum, boolean skybox)
|
|||||||
newview->y = viewmobj->y;
|
newview->y = viewmobj->y;
|
||||||
newview->z = player->viewz;
|
newview->z = player->viewz;
|
||||||
|
|
||||||
if (viewmobj->subsector)
|
R_SetupCommonFrame(player);
|
||||||
viewsec = viewmobj->subsector->sector;
|
|
||||||
|
|
||||||
R_SetupCommonFrame(player, viewsec);
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -1315,8 +1318,8 @@ static void R_PortalFrame(portal_t *portal)
|
|||||||
viewz = portal->viewz;
|
viewz = portal->viewz;
|
||||||
|
|
||||||
viewangle = portal->viewangle;
|
viewangle = portal->viewangle;
|
||||||
//viewsin = FINESINE(viewangle>>ANGLETOFINESHIFT);
|
viewsin = FINESINE(viewangle>>ANGLETOFINESHIFT);
|
||||||
//viewcos = FINECOSINE(viewangle>>ANGLETOFINESHIFT);
|
viewcos = FINECOSINE(viewangle>>ANGLETOFINESHIFT);
|
||||||
|
|
||||||
portalclipstart = portal->start;
|
portalclipstart = portal->start;
|
||||||
portalclipend = portal->end;
|
portalclipend = portal->end;
|
||||||
|
|||||||
@@ -150,6 +150,29 @@ subsector_t *R_IsPointInSubsector(fixed_t x, fixed_t y);
|
|||||||
#define R_PointToDist(x, y) R_PointToDist2(viewx, viewy, x, y)
|
#define R_PointToDist(x, y) R_PointToDist2(viewx, viewy, x, y)
|
||||||
#define R_PointToDist2(px2, py2, px1, py1) FixedHypot((px1) - (px2), (py1) - (py2))
|
#define R_PointToDist2(px2, py2, px1, py1) FixedHypot((px1) - (px2), (py1) - (py2))
|
||||||
|
|
||||||
|
FUNCMATH FUNCINLINE static ATTRINLINE fixed_t R_QuickDist(fixed_t x1, fixed_t y1, fixed_t x, fixed_t y)
|
||||||
|
{
|
||||||
|
const fixed_t absx = abs(x - x1);
|
||||||
|
const fixed_t absy = abs(y - y1);
|
||||||
|
#ifdef __cplusplus
|
||||||
|
return std::max<fixed_t>(absx, absy);
|
||||||
|
#else
|
||||||
|
return max(absx, absy);
|
||||||
|
#endif
|
||||||
|
}
|
||||||
|
|
||||||
|
// Takes 2 fixed-point coordinates, returns "distance" between them and camera,
|
||||||
|
// as an fixed-point integer.
|
||||||
|
// It is very rough, tho it is used only for optimizing out unnecessary
|
||||||
|
// interpolation, so it is kinda ok on big distances.
|
||||||
|
FUNCINLINE static ATTRINLINE PUREFUNC fixed_t R_QuickCamDist(fixed_t x, fixed_t y)
|
||||||
|
{
|
||||||
|
return R_QuickDist(viewx, viewy, x, y);
|
||||||
|
}
|
||||||
|
|
||||||
|
line_t *R_GetFFloorLine(const line_t *line, const ffloor_t *pfloor, const sector_t *sector);
|
||||||
|
side_t *R_GetFFloorSide(const line_t *line, const ffloor_t *pfloor, const sector_t *sector);
|
||||||
|
|
||||||
boolean R_DoCulling(line_t *cullheight, line_t *viewcullheight, fixed_t vz, fixed_t bottomh, fixed_t toph);
|
boolean R_DoCulling(line_t *cullheight, line_t *viewcullheight, fixed_t vz, fixed_t bottomh, fixed_t toph);
|
||||||
void R_GetRenderBlockMapDimensions(fixed_t drawdist, INT32 *xl, INT32 *xh, INT32 *yl, INT32 *yh);
|
void R_GetRenderBlockMapDimensions(fixed_t drawdist, INT32 *xl, INT32 *xh, INT32 *yl, INT32 *yh);
|
||||||
|
|
||||||
|
|||||||
+2
-8
@@ -487,11 +487,8 @@ void *R_PixelsToPatch(UINT8 *raw, INT16 width, INT16 height, INT16 leftoffset, I
|
|||||||
size_t maxoutsize = maxcolumnsize * width + (8 + 4 * width);
|
size_t maxoutsize = maxcolumnsize * width + (8 + 4 * width);
|
||||||
// so, a 512x512 flat should maximally need 393,760 (384.53 KiB) bytes.
|
// so, a 512x512 flat should maximally need 393,760 (384.53 KiB) bytes.
|
||||||
// quite a bit smaller than 64 megabytes, and much less annoying to the windows debug allocator!
|
// quite a bit smaller than 64 megabytes, and much less annoying to the windows debug allocator!
|
||||||
while (imgbuf.size() < maxoutsize)
|
|
||||||
{
|
|
||||||
imgbuf.resize(imgbuf.size() * 2);
|
|
||||||
}
|
|
||||||
|
|
||||||
|
imgbuf.resize(maxoutsize);
|
||||||
imgptr = imgbuf.data();
|
imgptr = imgbuf.data();
|
||||||
|
|
||||||
// Write image size and offset
|
// Write image size and offset
|
||||||
@@ -621,11 +618,8 @@ void *R_MaskedFlatToPatch(UINT16 *raw, INT16 width, INT16 height, INT16 leftoffs
|
|||||||
size_t maxoutsize = maxcolumnsize * width + (8 + 4 * width);
|
size_t maxoutsize = maxcolumnsize * width + (8 + 4 * width);
|
||||||
// so, a 512x512 flat should maximally need 393,760 (384.53 KiB) bytes.
|
// so, a 512x512 flat should maximally need 393,760 (384.53 KiB) bytes.
|
||||||
// quite a bit smaller than 64 megabytes, and much less annoying to the windows debug allocator!
|
// quite a bit smaller than 64 megabytes, and much less annoying to the windows debug allocator!
|
||||||
while (imgbuf.size() < maxoutsize)
|
|
||||||
{
|
|
||||||
imgbuf.resize(imgbuf.size() * 2);
|
|
||||||
}
|
|
||||||
|
|
||||||
|
imgbuf.resize(maxoutsize);
|
||||||
imgptr = imgbuf.data();
|
imgptr = imgbuf.data();
|
||||||
|
|
||||||
// Write image size and offset
|
// Write image size and offset
|
||||||
|
|||||||
Loaded 100 of 129 files, more files were not shown because too many files have changed in this diff.
Show more
Reference in new issue
Block a user