Compare commits
340
Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
6039dae85b | ||
|
|
cc9a24e979 | ||
|
|
9b9bf70ab8 | ||
|
|
be2b7ebfcc | ||
|
|
091c6e37dd | ||
|
|
694e82d4f6 | ||
|
|
530116cd76 | ||
|
|
84b60dadce | ||
|
|
f82d138482 | ||
|
|
e7332a3efe | ||
|
|
bd27a62769 | ||
|
|
2b650e4b61 | ||
|
|
8e82256827 | ||
|
|
4fa937728b | ||
|
|
9f9e6450f2 | ||
|
|
1c75dd0401 | ||
|
|
e854096ca0 | ||
|
|
83a60ea857 | ||
|
|
3d9d14b353 | ||
|
|
24c9f88262 | ||
|
|
b652d802f5 | ||
|
|
459beeb000 | ||
|
|
a28d798189 | ||
|
|
e75a696ee5 | ||
|
|
e113027ce6 | ||
|
|
2ce4e866e3 | ||
|
|
55a57a1036 | ||
|
|
6aabdc86c0 | ||
|
|
9aaa7cc5bf | ||
|
|
d6946d4d44 | ||
|
|
a868844bdf | ||
|
|
39fd31c4b9 | ||
|
|
54f3d7b5e0 | ||
|
|
88116368bb | ||
|
|
9328825a7c | ||
|
|
f825ca32cc | ||
|
|
ce982d170f | ||
|
|
1b3050028e | ||
|
|
2344552ba8 | ||
|
|
50c1263e7d | ||
|
|
f1ded99262 | ||
|
|
b1620a3fce | ||
|
|
d0ea4d20d0 | ||
|
|
7f4804f98c | ||
|
|
4fe3495652 | ||
|
|
3c409b4a46 | ||
|
|
45067e00a5 | ||
|
|
370ed1583b | ||
|
|
535c2073f1 | ||
|
|
6460ae94f1 | ||
|
|
093ed023ef | ||
|
|
1bada2810a | ||
|
|
9df7f3cd3f | ||
|
|
010b6c0361 | ||
|
|
dbf67a9670 | ||
|
|
8868445c3c | ||
|
|
568cb8b8c7 | ||
|
|
3b00a69615 | ||
|
|
6949ce82ab | ||
|
|
c343c52477 | ||
|
|
7931a82b23 | ||
|
|
31ccf9c34a | ||
|
|
ff3b73c49e | ||
|
|
64bed71509 | ||
|
|
eed5943b0b | ||
|
|
4f9ddffe2a | ||
|
|
a73f3a073c | ||
|
|
a59928221b | ||
|
|
b46e5cb577 | ||
|
|
bb62fbfc12 | ||
|
|
81f46224e1 | ||
|
|
6c58c0de41 | ||
|
|
4edc102d67 | ||
|
|
e0bf663157 | ||
|
|
eccc3eb33f | ||
|
|
1217089d81 | ||
|
|
e5c0967a3f | ||
|
|
27f22e4b5b | ||
|
|
c039d14efc | ||
|
|
71a0b25e32 | ||
|
|
8c2132a98c | ||
|
|
898bcd336d | ||
|
|
5461a6dcbe | ||
|
|
d957bddc1f | ||
|
|
7177a9f57f | ||
|
|
4ccf3dfaf9 | ||
|
|
489a58f9fd | ||
|
|
b26effa241 | ||
|
|
efd8c20d26 | ||
|
|
03b85aa00e | ||
|
|
e6434c24ec | ||
|
|
52e23e7b08 | ||
|
|
b84e6d89e2 | ||
|
|
42fa435a0b | ||
|
|
873cff4474 | ||
|
|
e543599598 | ||
|
|
9d75bb1405 | ||
|
|
7b0e3269b3 | ||
|
|
12169bfb38 | ||
|
|
4dd5957f19 | ||
|
|
0fadfe0f72 | ||
|
|
621df7e296 | ||
|
|
17d72e02fe | ||
|
|
cd76660314 | ||
|
|
06a9ab785e | ||
|
|
6760546bcd | ||
|
|
b44e003ab9 | ||
|
|
6a1c907aa4 | ||
|
|
fded8cc562 | ||
|
|
43465c0e3f | ||
|
|
7fb21c35ba | ||
|
|
f6a0430a40 | ||
|
|
ab209448d1 | ||
|
|
9334b86f6e | ||
|
|
6022966d69 | ||
|
|
6c7db705c7 | ||
|
|
ce3d17de68 | ||
|
|
404d88a536 | ||
|
|
4f28f574bb | ||
|
|
654895dcff | ||
|
|
8af43a55c9 | ||
|
|
0d20ebb01f | ||
|
|
1c74b37026 | ||
|
|
6721f534cc | ||
|
|
bb3414d603 | ||
|
|
e13cb1ca92 | ||
|
|
a0dffd0670 | ||
|
|
7684e6aa07 | ||
|
|
0fb752b745 | ||
|
|
c418fe3ef8 | ||
|
|
fdccc80260 | ||
|
|
84be9096b1 | ||
|
|
e4e51f0f80 | ||
|
|
9087fd8377 | ||
|
|
1aa37be676 | ||
|
|
04f63b23ff | ||
|
|
d6ed923f83 | ||
|
|
c7845118c0 | ||
|
|
ffc6adde4c | ||
|
|
fed7020da1 | ||
|
|
1a4255d9df | ||
|
|
f6ead71f0c | ||
|
|
966f60f590 | ||
|
|
9afc018a45 | ||
|
|
43608810da | ||
|
|
90b5f9050a | ||
|
|
edc10a35a1 | ||
|
|
91435fe1b2 | ||
|
|
a7ebc7e745 | ||
|
|
3cf3c1bb99 | ||
|
|
2c170f1956 | ||
|
|
98da654e02 | ||
|
|
af84105e40 | ||
|
|
a1666704e5 | ||
|
|
7b408a33d7 | ||
|
|
9ee535066e | ||
|
|
6430150b63 | ||
|
|
16cf4ede89 | ||
|
|
efe8732188 | ||
|
|
07fc0eb03a | ||
|
|
f2b46fd148 | ||
|
|
8247133966 | ||
|
|
397fb071e5 | ||
|
|
1a9fa94cbd | ||
|
|
e8c7cc6a9b | ||
|
|
5ca3ab5966 | ||
|
|
1cf04514b3 | ||
|
|
5577ba4c7a | ||
|
|
6ff1cbf4b0 | ||
|
|
db4cd73912 | ||
|
|
3c70598aea | ||
|
|
1ec29c1c94 | ||
|
|
fedccd25b9 | ||
|
|
1e51365cad | ||
|
|
94026e4331 | ||
|
|
2084cdc6d5 | ||
|
|
1b22c3af19 | ||
|
|
3e327263c9 | ||
|
|
7c24d92613 | ||
|
|
ba808307e9 | ||
|
|
014a22e933 | ||
|
|
3f3ba9e993 | ||
|
|
2f684bba95 | ||
|
|
a287a6419f | ||
|
|
6f2aba7ee3 | ||
|
|
a9a0d4bed8 | ||
|
|
355c78e075 | ||
|
|
4623f8aff2 | ||
|
|
1265bbba2e | ||
|
|
fdccf868cc | ||
|
|
3204b5c3b4 | ||
|
|
cd02242a01 | ||
|
|
e35dc9e097 | ||
|
|
f4dc161831 | ||
|
|
1d6c27baca | ||
|
|
009df228d6 | ||
|
|
7746e494cf | ||
|
|
90a88983f1 | ||
|
|
22a4fe63db | ||
|
|
d77508f481 | ||
|
|
53321d33d5 | ||
|
|
5c28f6afd8 | ||
|
|
d49001143f | ||
|
|
513e5a7e3f | ||
|
|
6f75fab7ff | ||
|
|
38fc6d6ba1 | ||
|
|
02f2464a00 | ||
|
|
c84724da37 | ||
|
|
86b286fb0b | ||
|
|
ecef8913b1 | ||
|
|
277b202020 | ||
|
|
6ba97bc43c | ||
|
|
0fbde146a9 | ||
|
|
16e0c6f0f6 | ||
|
|
8cab07a4b2 | ||
|
|
55c8546d68 | ||
|
|
1762f18116 | ||
|
|
e4dbf1ce11 | ||
|
|
10b9d96259 | ||
|
|
b23154fd93 | ||
|
|
b0ee972178 | ||
|
|
544e1d3b21 | ||
|
|
0ca6947f99 | ||
|
|
3122c08039 | ||
|
|
7a279a6fd9 | ||
|
|
00bc8bc149 | ||
|
|
f12b55f63b | ||
|
|
3e476d7658 | ||
|
|
c4581bd9a6 | ||
|
|
bb47b976a7 | ||
|
|
6c419ff22e | ||
|
|
522904527f | ||
|
|
30539371c2 | ||
|
|
e2ecc315b4 | ||
|
|
eb2f186205 | ||
|
|
bbf06b3376 | ||
|
|
a1f70b0b31 | ||
|
|
2e0f5c02a4 | ||
|
|
0f7001ef5c | ||
|
|
4600da5782 | ||
|
|
a3557fadef | ||
|
|
d9a67faf47 | ||
|
|
96eaf8850e | ||
|
|
e7efd46419 | ||
|
|
346b1456cd | ||
|
|
9f5a5a735b | ||
|
|
8e4b304bed | ||
|
|
6cbb8a36cf | ||
|
|
7dbb08315c | ||
|
|
b1ff1bb531 | ||
|
|
8eaf4a73f4 | ||
|
|
607fbc54fc | ||
|
|
276cf0a8cb | ||
|
|
59c9af97c2 | ||
|
|
4e75d99026 | ||
|
|
8e91c16e97 | ||
|
|
186421fe85 | ||
|
|
af952870c3 | ||
|
|
4eeb0b4b20 | ||
|
|
cb2c65e9d9 | ||
|
|
f7bbde3982 | ||
|
|
c9fc3b4820 | ||
|
|
f5195dd137 | ||
|
|
5289f13891 | ||
|
|
073b35690b | ||
|
|
43d3ac102d | ||
|
|
aa96f9ceb3 | ||
|
|
104b8260fb | ||
|
|
edebc728ef | ||
|
|
08e7ce3b5b | ||
|
|
29f187b751 | ||
|
|
ac3a1ad5eb | ||
|
|
1b8d7b1541 | ||
|
|
b812d61da2 | ||
|
|
6fd64383d3 | ||
|
|
e984e7a6c8 | ||
|
|
96f90ff9c4 | ||
|
|
51aec0e012 | ||
|
|
faadd3e89f | ||
|
|
0c091256f4 | ||
|
|
7a0fb01626 | ||
|
|
c01818e2e3 | ||
|
|
e17a8a505c | ||
|
|
ab654deba7 | ||
|
|
b145d7fd0e | ||
|
|
264c9e38ad | ||
|
|
e88773da4e | ||
|
|
310f67a06c | ||
|
|
0914d5b8e2 | ||
|
|
bf1aa47854 | ||
|
|
291a4dbb25 | ||
|
|
8fe3d13935 | ||
|
|
bdc326b14e | ||
|
|
d938e38ad3 | ||
|
|
3d4772455b | ||
|
|
e1f0089627 | ||
|
|
be423b2910 | ||
|
|
3bf3bdf641 | ||
|
|
e923777eb6 | ||
|
|
cf6eb0010e | ||
|
|
5184115216 | ||
|
|
edbebbf082 | ||
|
|
242dee499d | ||
|
|
39a46e8f79 | ||
|
|
a2de1e24c5 | ||
|
|
c0cce90e60 | ||
|
|
d9712cf85e | ||
|
|
9ccd62b5cb | ||
|
|
67e74b5874 | ||
|
|
9639ace28a | ||
|
|
a2616778cc | ||
|
|
0691e2d9e2 | ||
|
|
495c34dd40 | ||
|
|
f38ca9aa28 | ||
|
|
8e67e0bace | ||
|
|
b0bf588c27 | ||
|
|
35e4f35f6e | ||
|
|
7866b769cc | ||
|
|
1af1e42dab | ||
|
|
40bd3e5e19 | ||
|
|
08864e27b2 | ||
|
|
4a3c9ccfbb | ||
|
|
cedd789a27 | ||
|
|
fd2c208612 | ||
|
|
8f91707164 | ||
|
|
37eba186f5 | ||
|
|
8f3b7158e3 | ||
|
|
b76ce836a0 | ||
|
|
fd1e415731 | ||
|
|
41c887f2bf | ||
|
|
8091d825d5 | ||
|
|
699113fb25 | ||
|
|
3996abef36 | ||
|
|
7eb2ad1e35 | ||
|
|
f49e57a38c | ||
|
|
265f4a50ef | ||
|
|
e83e2659a7 | ||
|
|
c680dd3222 | ||
|
|
96aaaf5261 | ||
|
|
efb29e6be5 |
No files matched your search
+74
-146
@@ -1,25 +1,20 @@
|
|||||||
cmake_minimum_required(VERSION 3.14 FATAL_ERROR)
|
cmake_minimum_required(VERSION 3.5)
|
||||||
|
|
||||||
if("${CMAKE_CURRENT_BINARY_DIR}" STREQUAL "${CMAKE_CURRENT_SOURCE_DIR}")
|
if(${PROJECT_SOURCE_DIR} MATCHES ${PROJECT_BINARY_DIR})
|
||||||
message(FATAL_ERROR "In-source builds are blocked. Please build from a separate directory.")
|
message(FATAL_ERROR "In-source builds will bring you a world of pain. Please make a separate directory to invoke CMake from.")
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
# Set up CMAKE path
|
|
||||||
set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_SOURCE_DIR}/cmake/Modules/")
|
|
||||||
|
|
||||||
include(CMakeDependentOption)
|
|
||||||
#include(cmake/CPM.cmake)
|
|
||||||
|
|
||||||
# DO NOT CHANGE THIS SRB2 STRING! Some variable names depend on this string.
|
# DO NOT CHANGE THIS SRB2 STRING! Some variable names depend on this string.
|
||||||
# Version change is fine.
|
# Version change is fine.
|
||||||
project(SRB2
|
project(SRB2
|
||||||
VERSION 1.6
|
VERSION 1.6
|
||||||
LANGUAGES C CXX)
|
LANGUAGES C CXX)
|
||||||
|
|
||||||
if(APPLE)
|
set(CMAKE_CXX_STANDARD 17)
|
||||||
# DiscordRPC needs but does not properly specify ObjC
|
set(CMAKE_CXX_STANDARD_REQUIRED ON)
|
||||||
enable_language(OBJC)
|
#set(CMAKE_CXX_EXTENSIONS OFF) # optional but recommended: disables GNU extensions, forces pure ISO C++
|
||||||
endif()
|
set(CMAKE_CXX_EXTENSIONS ON)
|
||||||
|
set(CMAKE_C_EXTENSIONS ON)
|
||||||
|
|
||||||
##### PACKAGE CONFIGURATION #####
|
##### PACKAGE CONFIGURATION #####
|
||||||
|
|
||||||
@@ -36,7 +31,7 @@ if("${SRB2_CPACK_GENERATOR}" STREQUAL "")
|
|||||||
endif()
|
endif()
|
||||||
|
|
||||||
set(CPACK_GENERATOR ${SRB2_CPACK_GENERATOR})
|
set(CPACK_GENERATOR ${SRB2_CPACK_GENERATOR})
|
||||||
set(CPACK_PACKAGE_DESCRIPTION_SUMMARY "SRB2Kart" CACHE STRING "Program name for display purposes")
|
set(CPACK_PACKAGE_DESCRIPTION_SUMMARY "Sonic Robo Blast 2 Kart" CACHE STRING "Program name for display purposes")
|
||||||
set(CPACK_PACKAGE_VENDOR "Kart Krew" CACHE STRING "Vendor name for display purposes")
|
set(CPACK_PACKAGE_VENDOR "Kart Krew" CACHE STRING "Vendor name for display purposes")
|
||||||
#set(CPACK_PACKAGE_DESCRIPTION_FILE )
|
#set(CPACK_PACKAGE_DESCRIPTION_FILE )
|
||||||
set(CPACK_RESOURCE_FILE_LICENSE "${CMAKE_CURRENT_SOURCE_DIR}/LICENSE")
|
set(CPACK_RESOURCE_FILE_LICENSE "${CMAKE_CURRENT_SOURCE_DIR}/LICENSE")
|
||||||
@@ -44,126 +39,55 @@ set(CPACK_PACKAGE_VERSION_MAJOR ${SRB2_VERSION_MAJOR})
|
|||||||
set(CPACK_PACKAGE_VERSION_MINOR ${SRB2_VERSION_MINOR})
|
set(CPACK_PACKAGE_VERSION_MINOR ${SRB2_VERSION_MINOR})
|
||||||
set(CPACK_PACKAGE_VERSION_PATCH ${SRB2_VERSION_PATCH})
|
set(CPACK_PACKAGE_VERSION_PATCH ${SRB2_VERSION_PATCH})
|
||||||
set(CPACK_PACKAGE_INSTALL_DIRECTORY "CMake ${CMAKE_VERSION_MAJOR}.${CMAKE_VERSION_MINOR}")
|
set(CPACK_PACKAGE_INSTALL_DIRECTORY "CMake ${CMAKE_VERSION_MAJOR}.${CMAKE_VERSION_MINOR}")
|
||||||
SET(CPACK_OUTPUT_FILE_PREFIX package)
|
|
||||||
include(CPack)
|
include(CPack)
|
||||||
|
|
||||||
# Options
|
# Set up CMAKE path
|
||||||
|
set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_SOURCE_DIR}/cmake/Modules/")
|
||||||
|
|
||||||
if("${CMAKE_SYSTEM_NAME}" MATCHES Linux)
|
### Useful functions
|
||||||
set(SRB2_CONFIG_SYSTEM_LIBRARIES_DEFAULT ON)
|
|
||||||
else()
|
|
||||||
set(SRB2_CONFIG_SYSTEM_LIBRARIES_DEFAULT OFF)
|
|
||||||
endif()
|
|
||||||
|
|
||||||
option(
|
# Prepend sources with current source directory
|
||||||
SRB2_CONFIG_SYSTEM_LIBRARIES
|
function(prepend_sources SOURCE_FILES)
|
||||||
"Link dependencies using CMake's find_package and do not use internal builds"
|
foreach(SOURCE_FILE ${${SOURCE_FILES}})
|
||||||
${SRB2_CONFIG_SYSTEM_LIBRARIES_DEFAULT}
|
set(MODIFIED ${MODIFIED} ${CMAKE_CURRENT_SOURCE_DIR}/${SOURCE_FILE})
|
||||||
)
|
endforeach()
|
||||||
option(SRB2_CONFIG_ENABLE_TESTS "Build the test suite" OFF)
|
set(${SOURCE_FILES} ${MODIFIED} PARENT_SCOPE)
|
||||||
# This option isn't recommended for distribution builds and probably won't work (yet).
|
|
||||||
cmake_dependent_option(
|
|
||||||
SRB2_CONFIG_SHARED_INTERNAL_LIBRARIES
|
|
||||||
"Use dynamic libraries when compiling internal dependencies"
|
|
||||||
OFF "NOT SRB2_CONFIG_SYSTEM_LIBRARIES"
|
|
||||||
OFF
|
|
||||||
)
|
|
||||||
option(SRB2_CONFIG_ENABLE_DISCORDRPC "Enable Discord RPC features" ON)
|
|
||||||
option(SRB2_CONFIG_STATIC_STDLIB "Link static version of standard library. All dependencies must also be static" ON)
|
|
||||||
option(SRB2_CONFIG_HWRENDER "Enable hardware render (OpenGL) support" ON)
|
|
||||||
option(SRB2_CONFIG_STATIC_OPENGL "Enable static linking GL (do not do this)" OFF)
|
|
||||||
option(SRB2_CONFIG_ERRORMODE "Compile C code with warnings treated as errors." OFF)
|
|
||||||
option(SRB2_CONFIG_DEBUGMODE "Compile with PARANOIA, ZDEBUG, RANGECHECK and PACKETDROP defined." OFF)
|
|
||||||
option(SRB2_CONFIG_MOBJCONSISTANCY "Compile with MOBJCONSISTANCY defined." OFF)
|
|
||||||
option(SRB2_CONFIG_PACKETDROP "Compile with PACKETDROP defined." OFF)
|
|
||||||
option(SRB2_CONFIG_ZDEBUG "Compile with ZDEBUG defined." OFF)
|
|
||||||
# SRB2_CONFIG_PROFILEMODE is probably superceded by some CMake setting.
|
|
||||||
option(SRB2_CONFIG_PROFILEMODE "Compile for profiling (GCC only)." OFF)
|
|
||||||
option(SRB2_CONFIG_TRACY "Compile with Tracy profiling enabled" OFF)
|
|
||||||
option(SRB2_CONFIG_ASAN "Compile with AddressSanitizer (libasan)." OFF)
|
|
||||||
option(SRB2_CONFIG_UBSAN "Compile with UndefinedBehaviorSanitizer (libubsan)." OFF)
|
|
||||||
set(SRB2_CONFIG_ASSET_DIRECTORY "" CACHE PATH "Path to directory that contains all asset files for the installer. If set, assets will be part of installation and cpack.")
|
|
||||||
option(SRB2_CONFIG_LTO "Enable link time optimizations, improves performance at the cost of longer link times." ON)
|
|
||||||
option(SRB2_CONFIG_TIDY "Enable clang tiny, checks compiled code for issues at the cost of longer compile times." OFF)
|
|
||||||
|
|
||||||
# man i suck at explaining lmao
|
|
||||||
option(SRB2_CONFIG_SATURNPAK "Enable Saturn specific special packet. Required for using the newer resynch system" ON)
|
|
||||||
option(SRB2_CONFIG_SATURNJOIN "Enable Saturn specific allowjoin toggle." ON)
|
|
||||||
option(SRB2_CONFIG_SCREENFBO "Enable hardware render (OpenGL) FBO downsampling support" ON)
|
|
||||||
option(SRB2_CONFIG_LIBBACKTRACE "Enable using libbacktrace for crashlogs" ON)
|
|
||||||
|
|
||||||
#if(SRB2_CONFIG_ENABLE_TESTS)
|
|
||||||
# https://github.com/catchorg/Catch2
|
|
||||||
# CPMAddPackage(
|
|
||||||
# NAME Catch2
|
|
||||||
# VERSION 3.1.1
|
|
||||||
# GITHUB_REPOSITORY catchorg/Catch2
|
|
||||||
# OPTIONS
|
|
||||||
# "CATCH_INSTALL_DOCS OFF"
|
|
||||||
# )
|
|
||||||
# list(APPEND CMAKE_MODULE_PATH "${Catch2_SOURCE_DIR}/extras")
|
|
||||||
# include(CTest)
|
|
||||||
# include(Catch)
|
|
||||||
# add_executable(srb2tests)
|
|
||||||
# # To add tests, use target_sources to add individual test files to the target in subdirs.
|
|
||||||
# target_link_libraries(srb2tests PRIVATE Catch2::Catch2 Catch2::Catch2WithMain)
|
|
||||||
# target_compile_features(srb2tests PRIVATE c_std_11 cxx_std_17)
|
|
||||||
# catch_discover_tests(srb2tests)
|
|
||||||
#endif()
|
|
||||||
|
|
||||||
# Enable CCache
|
|
||||||
# (Set USE_CCACHE=ON to use, CCACHE_OPTIONS for options)
|
|
||||||
if("${CMAKE_HOST_SYSTEM_NAME}" STREQUAL Windows)
|
|
||||||
option(USE_CCACHE "Enable ccache support" OFF)
|
|
||||||
|
|
||||||
if(USE_CCACHE)
|
|
||||||
find_program(CCACHE_TOOL_PATH ccache)
|
|
||||||
if(CCACHE_TOOL_PATH)
|
|
||||||
set(CMAKE_C_COMPILER_LAUNCHER ${CCACHE_TOOL_PATH} CACHE STRING "" FORCE)
|
|
||||||
set(CMAKE_CXX_COMPILER_LAUNCHER ${CCACHE_TOOL_PATH} CACHE STRING "" FORCE)
|
|
||||||
else()
|
|
||||||
message(WARNING "USE_CCACHE was set but ccache is not found (set CCACHE_TOOL_PATH)")
|
|
||||||
endif()
|
|
||||||
endif()
|
|
||||||
else()
|
|
||||||
# TODO: fix windoze crap, i dont want cpm lol
|
|
||||||
#CPMAddPackage(
|
|
||||||
# NAME Ccache.cmake
|
|
||||||
# GITHUB_REPOSITORY TheLartians/Ccache.cmake
|
|
||||||
# VERSION 1.2.5
|
|
||||||
#)
|
|
||||||
endif()
|
|
||||||
|
|
||||||
# Dependencies
|
|
||||||
#add_subdirectory(thirdparty)
|
|
||||||
|
|
||||||
if("${SRB2_CONFIG_SYSTEM_LIBRARIES}")
|
|
||||||
find_package(ZLIB REQUIRED)
|
|
||||||
find_package(PNG REQUIRED)
|
|
||||||
find_package(SDL2 REQUIRED)
|
|
||||||
find_package(SDL2_mixer REQUIRED)
|
|
||||||
find_package(CURL REQUIRED)
|
|
||||||
find_package(OPENMPT OPTIONAL)
|
|
||||||
find_package(GME REQUIRED)
|
|
||||||
find_package(DiscordRPC OPTIONAL)
|
|
||||||
find_package(libbacktrace OPTIONAL)
|
|
||||||
endif()
|
|
||||||
|
|
||||||
if(${PROJECT_SOURCE_DIR} MATCHES ${PROJECT_BINARY_DIR})
|
|
||||||
message(FATAL_ERROR "In-source builds will bring you a world of pain. Please make a separate directory to invoke CMake from.")
|
|
||||||
endif()
|
|
||||||
|
|
||||||
if ((${SRB2_USE_CCACHE}) AND (${CMAKE_C_COMPILER} MATCHES "clang"))
|
|
||||||
message(WARNING "Using clang and CCache: You may want to set environment variable CCACHE_CPP2=yes to prevent include errors during compile.")
|
|
||||||
endif()
|
|
||||||
|
|
||||||
# Add sources from Sourcefile
|
|
||||||
function(target_sourcefile type)
|
|
||||||
file(STRINGS Sourcefile list
|
|
||||||
REGEX "[-0-9A-Za-z_]+\.${type}")
|
|
||||||
target_sources(SRB2SDL2 PRIVATE ${list})
|
|
||||||
endfunction()
|
endfunction()
|
||||||
|
|
||||||
|
# Macro to add OSX framework
|
||||||
|
macro(add_framework fwname appname)
|
||||||
|
find_library(FRAMEWORK_${fwname}
|
||||||
|
NAMES ${fwname}
|
||||||
|
PATHS ${CMAKE_OSX_SYSROOT}/System/Library
|
||||||
|
${CMAKE_OSX_SYSROOT}/Library
|
||||||
|
/System/Library
|
||||||
|
/Library
|
||||||
|
ATH_SUFFIXES Frameworks
|
||||||
|
NO_DEFAULT_PATH)
|
||||||
|
if( ${FRAMEWORK_${fwname}} STREQUAL FRAMEWORK_${fwname}-NOTFOUND)
|
||||||
|
MESSAGE(ERROR ": Framework ${fwname} not found")
|
||||||
|
else()
|
||||||
|
TARGET_LINK_LIBRARIES(${appname} PRIVATE "${FRAMEWORK_${fwname}}/${fwname}")
|
||||||
|
MESSAGE(STATUS "Framework ${fwname} found at ${FRAMEWORK_${fwname}}")
|
||||||
|
endif()
|
||||||
|
endmacro()
|
||||||
|
|
||||||
|
# Macro to copy Windows DLLs to Debug/Release folder for easy debugging
|
||||||
|
# Note: this is general purpose, we could copy anything. Just using for DLLs on MSVC though
|
||||||
|
macro(copy_files_to_build_dir target dlllist_var)
|
||||||
|
if(MSVC)
|
||||||
|
# http://stackoverflow.com/a/26983405/3064195
|
||||||
|
foreach(dlllist_item ${${dlllist_var}})
|
||||||
|
get_filename_component(dllname ${dlllist_item} NAME)
|
||||||
|
add_custom_command(TARGET ${target} POST_BUILD
|
||||||
|
COMMAND ${CMAKE_COMMAND} -E copy_if_different
|
||||||
|
${dlllist_item}
|
||||||
|
$<TARGET_FILE_DIR:${target}>/${dllname}
|
||||||
|
)
|
||||||
|
endforeach()
|
||||||
|
endif()
|
||||||
|
endmacro()
|
||||||
|
|
||||||
# bitness check
|
# bitness check
|
||||||
set(SRB2_SYSTEM_BITS 0)
|
set(SRB2_SYSTEM_BITS 0)
|
||||||
if(CMAKE_SIZEOF_VOID_P EQUAL 8)
|
if(CMAKE_SIZEOF_VOID_P EQUAL 8)
|
||||||
@@ -178,12 +102,32 @@ if(${SRB2_SYSTEM_BITS} EQUAL 0)
|
|||||||
message(STATUS "Target bitness is unknown")
|
message(STATUS "Target bitness is unknown")
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
|
# OS macros
|
||||||
|
if (UNIX)
|
||||||
|
add_definitions(-DUNIXCOMMON)
|
||||||
|
add_link_options(-rdynamic) # Use -rdynamic so a backtrace log shows function names
|
||||||
|
endif()
|
||||||
|
|
||||||
|
if(CMAKE_COMPILER_IS_GNUCC)
|
||||||
|
find_program(OBJCOPY objcopy)
|
||||||
|
endif()
|
||||||
|
|
||||||
|
if(${CMAKE_SYSTEM} MATCHES "Linux")
|
||||||
|
add_definitions(-DLINUX)
|
||||||
|
if(${SRB2_SYSTEM_BITS} EQUAL 64)
|
||||||
|
add_definitions(-DLINUX64)
|
||||||
|
endif()
|
||||||
|
endif()
|
||||||
|
|
||||||
|
if(${CMAKE_SYSTEM} MATCHES "Darwin")
|
||||||
|
add_definitions(-DMACOSX)
|
||||||
|
endif()
|
||||||
|
|
||||||
set(CMAKE_RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/bin")
|
set(CMAKE_RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/bin")
|
||||||
set(CMAKE_PDB_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/bin")
|
set(CMAKE_PDB_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/bin")
|
||||||
|
|
||||||
# Set EXE names so the assets CMakeLists can refer to its target
|
# Set EXE names so the assets CMakeLists can refer to its target
|
||||||
set(SRB2_SDL2_EXE_NAME "" CACHE STRING "Override executable binary output name")
|
set(SRB2_SDL2_EXE_NAME srb2kart CACHE STRING "Executable binary output name")
|
||||||
set(SRB2_SDL2_EXE_SUFFIX "" CACHE STRING "Optional executable suffix, separated by an underscore")
|
|
||||||
|
|
||||||
include_directories(${CMAKE_CURRENT_BINARY_DIR}/src)
|
include_directories(${CMAKE_CURRENT_BINARY_DIR}/src)
|
||||||
|
|
||||||
@@ -195,22 +139,6 @@ set(GIT_EXECUTABLE "git" CACHE FILEPATH "Path to git binary")
|
|||||||
include(GitUtilities)
|
include(GitUtilities)
|
||||||
git_latest_commit(SRB2_COMP_COMMIT "${CMAKE_SOURCE_DIR}")
|
git_latest_commit(SRB2_COMP_COMMIT "${CMAKE_SOURCE_DIR}")
|
||||||
git_current_branch(SRB2_GIT_BRANCH "${CMAKE_SOURCE_DIR}")
|
git_current_branch(SRB2_GIT_BRANCH "${CMAKE_SOURCE_DIR}")
|
||||||
#git_working_tree_dirty(SRB2_COMP_UNCOMMITTED "${CMAKE_SOURCE_DIR}") #TODO: fix this
|
|
||||||
set(SRB2_COMP_BRANCH "${SRB2_GIT_BRANCH}")
|
set(SRB2_COMP_BRANCH "${SRB2_GIT_BRANCH}")
|
||||||
set(SRB2_COMP_REVISION "${SRB2_COMP_COMMIT}")
|
set(SRB2_COMP_REVISION "${SRB2_COMP_COMMIT}")
|
||||||
configure_file(${CMAKE_CURRENT_SOURCE_DIR}/src/config.h.in ${CMAKE_CURRENT_BINARY_DIR}/src/config.h)
|
configure_file(${CMAKE_CURRENT_SOURCE_DIR}/src/config.h.in ${CMAKE_CURRENT_BINARY_DIR}/src/config.h)
|
||||||
|
|
||||||
if("${SRB2_SDL2_EXE_NAME}" STREQUAL "")
|
|
||||||
list(APPEND EXE_NAME_PARTS "srb2kart-saturn")
|
|
||||||
|
|
||||||
if(NOT "${SRB2_GIT_BRANCH}" STREQUAL "master")
|
|
||||||
list(APPEND EXE_NAME_PARTS ${SRB2_GIT_BRANCH})
|
|
||||||
endif()
|
|
||||||
else()
|
|
||||||
list(APPEND EXE_NAME_PARTS ${SRB2_SDL2_EXE_NAME})
|
|
||||||
endif()
|
|
||||||
|
|
||||||
list(APPEND EXE_NAME_PARTS ${SRB2_SDL2_EXE_SUFFIX})
|
|
||||||
|
|
||||||
list(JOIN EXE_NAME_PARTS "_" EXE_NAME)
|
|
||||||
set_target_properties(SRB2SDL2 PROPERTIES OUTPUT_NAME ${EXE_NAME})
|
|
||||||
@@ -22,14 +22,14 @@ 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.
|
For Windows 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.
|
||||||
|
|
||||||
64-bit Windows builds are supported and recommended over 32-bit builds, they will build automatically when using the MSYS2 MinGW 64-bit executable (requires the mingw-w64-x86_64-gcc package), no extra flags needed!
|
64-bit Windows builds are supported and recommended over 32-bit builds, they will build automatically when using the MSYS2 MinGW 64-bit executable (requires the mingw-w64-x86_64-gcc package), no extra flags needed!
|
||||||
The specific DLLs can be found under /libs/dll-binaries/(i686 for 32bit/x86_64 for 64-bit)/ or in the Release packages
|
The specific DLLs can be found under /libs/dll-binaries/(i686 for 32bit/x86_64 for 64-bit)/ or in the Release packages
|
||||||
|
|
||||||
|
MacOS and Linux can be build with CMake, but it is recommended to use the Makefile for Linux over CMake
|
||||||
|
|
||||||
Alternatively the [srb2bld](https://github.com/Bijman/srb2bld) script by Bijman can be used aswell!
|
Alternatively the [srb2bld](https://github.com/Bijman/srb2bld) script by Bijman can be used aswell!
|
||||||
|
|
||||||
## Disclaimer
|
## Disclaimer
|
||||||
|
|||||||
+44
-32
@@ -5,48 +5,60 @@ if(${CMAKE_SYSTEM} MATCHES Linux)
|
|||||||
return()
|
return()
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
if("${SRB2_CONFIG_ASSET_DIRECTORY}" STREQUAL "")
|
# For prepending the current source path, later
|
||||||
message(WARNING "SRB2_CONFIG_ASSET_DIRECTORY is not set, so installation will not contain data files.")
|
FUNCTION(PREPEND var prefix)
|
||||||
return()
|
SET(listVar "")
|
||||||
endif()
|
FOREACH(f ${ARGN})
|
||||||
|
LIST(APPEND listVar "${prefix}/${f}")
|
||||||
|
ENDFOREACH(f)
|
||||||
|
SET(${var} "${listVar}" PARENT_SCOPE)
|
||||||
|
ENDFUNCTION(PREPEND)
|
||||||
|
|
||||||
get_filename_component(SRB2_ASSET_DIRECTORY_ABSOLUTE "${SRB2_CONFIG_ASSET_DIRECTORY}" ABSOLUTE)
|
set(SRB2_ASSET_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/installer"
|
||||||
|
CACHE STRING "Path to directory that contains all asset files for the installer.")
|
||||||
|
|
||||||
set(SRB2_ASSETS_DOCS
|
set(SRB2_ASSET_HASHED
|
||||||
"README.txt"
|
"srb2.srb;\
|
||||||
"HISTORY.txt"
|
gfx.kart;\
|
||||||
"README-SDL.txt"
|
textures.kart;\
|
||||||
"LICENSE.txt"
|
chars.kart;\
|
||||||
"LICENSE-3RD-PARTY.txt"
|
maps.kart"
|
||||||
|
CACHE STRING "Asset filenames to apply MD5 checks. No spaces between entries!"
|
||||||
)
|
)
|
||||||
list(TRANSFORM SRB2_ASSETS_DOCS PREPEND "/")
|
|
||||||
list(TRANSFORM SRB2_ASSETS_DOCS PREPEND "${SRB2_ASSET_DIRECTORY_ABSOLUTE}")
|
|
||||||
|
|
||||||
####################
|
set(SRB2_ASSET_DOCS
|
||||||
# POST-V2.2 NOTE: Do not forget to add patch.pk3 to the end of this list!
|
"README.txt;\
|
||||||
####################
|
HISTORY.txt;\
|
||||||
|
LICENSE.txt;\
|
||||||
set(SRB2_ASSETS_GAME
|
LICENSE-3RD-PARTY.txt"
|
||||||
"srb2.srb"
|
CACHE STRING "Documentation filenames. In OS X, these are packaged separately from other assets. No spaces between entries!"
|
||||||
"gfx.kart"
|
|
||||||
"textures.kart"
|
|
||||||
"chars.kart"
|
|
||||||
"maps.kart"
|
|
||||||
)
|
)
|
||||||
list(TRANSFORM SRB2_ASSETS_GAME PREPEND "/")
|
|
||||||
list(TRANSFORM SRB2_ASSETS_GAME PREPEND "${SRB2_ASSET_DIRECTORY_ABSOLUTE}")
|
|
||||||
|
|
||||||
set(SRB2_ASSETS ${SRB2_ASSET_DOCS} ${SRB2_ASSETS_GAME})
|
PREPEND(SRB2_ASSET_DOCS ${SRB2_ASSET_DIRECTORY} ${SRB2_ASSET_DOCS})
|
||||||
|
|
||||||
|
foreach(SRB2_ASSET ${SRB2_ASSET_HASHED})
|
||||||
|
file(MD5 ${SRB2_ASSET_DIRECTORY}/${SRB2_ASSET} "SRB2_ASSET_${SRB2_ASSET}_HASH")
|
||||||
|
set(SRB2_ASSET_${SRB2_ASSET}_HASH ${SRB2_ASSET_${SRB2_ASSET}_HASH} PARENT_SCOPE)
|
||||||
|
endforeach()
|
||||||
|
|
||||||
# Installation
|
# Installation
|
||||||
|
|
||||||
if(${CMAKE_SYSTEM} MATCHES Darwin)
|
if(${CMAKE_SYSTEM} MATCHES Darwin)
|
||||||
get_target_property(outname SRB2SDL2 OUTPUT_NAME)
|
get_target_property(outname SRB2SDL2 OUTPUT_NAME)
|
||||||
install(FILES ${SRB2_ASSETS} DESTINATION "${outname}.app/Contents/Resources")
|
install(DIRECTORY "${SRB2_ASSET_DIRECTORY}/"
|
||||||
install(DIRECTORY "${SRB2_ASSET_DIRECTORY_ABSOLUTE}/models" DESTINATION "${outname}.app/Contents/Resources")
|
DESTINATION "${outname}.app/Contents/Resources"
|
||||||
install(FILES ${SRB2_ASSETS_DOCS} DESTINATION .)
|
)
|
||||||
|
install(FILES ${SRB2_ASSET_DOCS}
|
||||||
|
DESTINATION .
|
||||||
|
OPTIONAL
|
||||||
|
)
|
||||||
else()
|
else()
|
||||||
install(FILES ${SRB2_ASSETS} DESTINATION .)
|
install(DIRECTORY "${SRB2_ASSET_DIRECTORY}/"
|
||||||
install(DIRECTORY "${SRB2_ASSET_DIRECTORY_ABSOLUTE}/models" DESTINATION .)
|
DESTINATION .
|
||||||
|
)
|
||||||
|
# Docs are assumed to be located in SRB2_ASSET_DIRECTORY, so don't install again
|
||||||
|
#install(FILES ${SRB2_ASSET_DOCS}
|
||||||
|
# DESTINATION .
|
||||||
|
# OPTIONAL
|
||||||
|
#)
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
@@ -1,19 +0,0 @@
|
|||||||
cmake_minimum_required(VERSION 3.5 FATAL_ERROR)
|
|
||||||
|
|
||||||
set(CMAKE_BINARY_DIR "${BINARY_DIR}")
|
|
||||||
set(CMAKE_CURRENT_BINARY_DIR "${BINARY_DIR}")
|
|
||||||
|
|
||||||
# Set up CMAKE path
|
|
||||||
set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_CURRENT_SOURCE_DIR}/cmake/Modules/")
|
|
||||||
|
|
||||||
include(GitUtilities)
|
|
||||||
|
|
||||||
git_current_branch(SRB2_COMP_BRANCH)
|
|
||||||
git_working_tree_dirty(SRB2_COMP_UNCOMMITTED)
|
|
||||||
|
|
||||||
git_latest_commit(SRB2_COMP_REVISION)
|
|
||||||
git_subject(subject)
|
|
||||||
string(REGEX REPLACE "([\"\\])" "\\\\\\1" SRB2_COMP_LASTCOMMIT "${subject}")
|
|
||||||
|
|
||||||
configure_file("${CMAKE_CURRENT_SOURCE_DIR}/src/config.h.in" "${CMAKE_CURRENT_SOURCE_DIR}/src/config.h")
|
|
||||||
configure_file("${CMAKE_CURRENT_SOURCE_DIR}/src/config.h.in" "${CMAKE_CURRENT_SOURCE_DIR}/build/src/config.h")
|
|
||||||
@@ -21,13 +21,3 @@ find_library(DISCORDRPC_LIBRARY
|
|||||||
set(DISCORDRPC_PROCESS_INCLUDES DISCORDRPC_INCLUDE_DIR)
|
set(DISCORDRPC_PROCESS_INCLUDES DISCORDRPC_INCLUDE_DIR)
|
||||||
set(DISCORDRPC_PROCESS_LIBS DISCORDRPC_LIBRARY)
|
set(DISCORDRPC_PROCESS_LIBS DISCORDRPC_LIBRARY)
|
||||||
libfind_process(DISCORDRPC)
|
libfind_process(DISCORDRPC)
|
||||||
|
|
||||||
if(DISCORDRPC_FOUND AND NOT TARGET DiscordRPC::DiscordRPC)
|
|
||||||
add_library(DiscordRPC::DiscordRPC UNKNOWN IMPORTED)
|
|
||||||
set_target_properties(
|
|
||||||
DiscordRPC::DiscordRPC
|
|
||||||
PROPERTIES
|
|
||||||
IMPORTED_LOCATION "${DISCORDRPC_LIBRARY}"
|
|
||||||
INTERFACE_INCLUDE_DIRECTORIES "${DISCORDRPC_INCLUDE_DIR}"
|
|
||||||
)
|
|
||||||
endif()
|
|
||||||
@@ -1,6 +1,6 @@
|
|||||||
include(LibFindMacros)
|
include(LibFindMacros)
|
||||||
|
|
||||||
libfind_pkg_check_modules(GME_PKGCONF GME)
|
libfind_pkg_check_modules(GME_PKGCONF LIBGME)
|
||||||
|
|
||||||
find_path(GME_INCLUDE_DIR
|
find_path(GME_INCLUDE_DIR
|
||||||
NAMES gme.h
|
NAMES gme.h
|
||||||
@@ -8,6 +8,7 @@ find_path(GME_INCLUDE_DIR
|
|||||||
${GME_PKGCONF_INCLUDE_DIRS}
|
${GME_PKGCONF_INCLUDE_DIRS}
|
||||||
"/usr/include/gme"
|
"/usr/include/gme"
|
||||||
"/usr/local/include/gme"
|
"/usr/local/include/gme"
|
||||||
|
PATH_SUFFIXES gme
|
||||||
)
|
)
|
||||||
|
|
||||||
find_library(GME_LIBRARY
|
find_library(GME_LIBRARY
|
||||||
@@ -21,13 +22,3 @@ find_library(GME_LIBRARY
|
|||||||
set(GME_PROCESS_INCLUDES GME_INCLUDE_DIR)
|
set(GME_PROCESS_INCLUDES GME_INCLUDE_DIR)
|
||||||
set(GME_PROCESS_LIBS GME_LIBRARY)
|
set(GME_PROCESS_LIBS GME_LIBRARY)
|
||||||
libfind_process(GME)
|
libfind_process(GME)
|
||||||
|
|
||||||
if(GME_FOUND AND NOT TARGET gme)
|
|
||||||
add_library(gme UNKNOWN IMPORTED)
|
|
||||||
set_target_properties(
|
|
||||||
gme
|
|
||||||
PROPERTIES
|
|
||||||
IMPORTED_LOCATION "${GME_LIBRARY}"
|
|
||||||
INTERFACE_INCLUDE_DIRECTORIES "${GME_INCLUDE_DIR}"
|
|
||||||
)
|
|
||||||
endif()
|
|
||||||
@@ -1,6 +1,6 @@
|
|||||||
include(LibFindMacros)
|
include(LibFindMacros)
|
||||||
|
|
||||||
libfind_pkg_check_modules(OPENMPT_PKGCONF OPENMPT)
|
libfind_pkg_check_modules(OPENMPT_PKGCONF LIBOPENMPT)
|
||||||
|
|
||||||
find_path(OPENMPT_INCLUDE_DIR
|
find_path(OPENMPT_INCLUDE_DIR
|
||||||
NAMES libopenmpt.h
|
NAMES libopenmpt.h
|
||||||
@@ -8,6 +8,7 @@ find_path(OPENMPT_INCLUDE_DIR
|
|||||||
${OPENMPT_PKGCONF_INCLUDE_DIRS}
|
${OPENMPT_PKGCONF_INCLUDE_DIRS}
|
||||||
"/usr/include/libopenmpt"
|
"/usr/include/libopenmpt"
|
||||||
"/usr/local/include/libopenmpt"
|
"/usr/local/include/libopenmpt"
|
||||||
|
PATH_SUFFIXES libopenmpt
|
||||||
)
|
)
|
||||||
|
|
||||||
find_library(OPENMPT_LIBRARY
|
find_library(OPENMPT_LIBRARY
|
||||||
@@ -21,13 +22,3 @@ find_library(OPENMPT_LIBRARY
|
|||||||
set(OPENMPT_PROCESS_INCLUDES OPENMPT_INCLUDE_DIR)
|
set(OPENMPT_PROCESS_INCLUDES OPENMPT_INCLUDE_DIR)
|
||||||
set(OPENMPT_PROCESS_LIBS OPENMPT_LIBRARY)
|
set(OPENMPT_PROCESS_LIBS OPENMPT_LIBRARY)
|
||||||
libfind_process(OPENMPT)
|
libfind_process(OPENMPT)
|
||||||
|
|
||||||
if(OPENMPT_FOUND AND NOT TARGET openmpt)
|
|
||||||
add_library(openmpt UNKNOWN IMPORTED)
|
|
||||||
set_target_properties(
|
|
||||||
openmpt
|
|
||||||
PROPERTIES
|
|
||||||
IMPORTED_LOCATION "${OPENMPT_LIBRARY}"
|
|
||||||
INTERFACE_INCLUDE_DIRECTORIES "${OPENMPT_INCLUDE_DIR}"
|
|
||||||
)
|
|
||||||
endif()
|
|
||||||
@@ -31,13 +31,3 @@ find_library(SDL2_LIBRARY
|
|||||||
set(SDL2_PROCESS_INCLUDES SDL2_INCLUDE_DIR)
|
set(SDL2_PROCESS_INCLUDES SDL2_INCLUDE_DIR)
|
||||||
set(SDL2_PROCESS_LIBS SDL2_LIBRARY)
|
set(SDL2_PROCESS_LIBS SDL2_LIBRARY)
|
||||||
libfind_process(SDL2)
|
libfind_process(SDL2)
|
||||||
|
|
||||||
if(SDL2_FOUND AND NOT TARGET SDL2::SDL2)
|
|
||||||
add_library(SDL2::SDL2 UNKNOWN IMPORTED)
|
|
||||||
set_target_properties(
|
|
||||||
SDL2::SDL2
|
|
||||||
PROPERTIES
|
|
||||||
IMPORTED_LOCATION "${SDL2_LIBRARY}"
|
|
||||||
INTERFACE_INCLUDE_DIRECTORIES "${SDL2_INCLUDE_DIR}"
|
|
||||||
)
|
|
||||||
endif()
|
|
||||||
@@ -32,13 +32,3 @@ find_library(SDL2_MIXER_LIBRARY
|
|||||||
set(SDL2_MIXER_PROCESS_INCLUDES SDL2_MIXER_INCLUDE_DIR)
|
set(SDL2_MIXER_PROCESS_INCLUDES SDL2_MIXER_INCLUDE_DIR)
|
||||||
set(SDL2_MIXER_PROCESS_LIBS SDL2_MIXER_LIBRARY)
|
set(SDL2_MIXER_PROCESS_LIBS SDL2_MIXER_LIBRARY)
|
||||||
libfind_process(SDL2_MIXER)
|
libfind_process(SDL2_MIXER)
|
||||||
|
|
||||||
if(SDL2_MIXER_FOUND AND NOT TARGET SDL2_mixer::SDL2_mixer)
|
|
||||||
add_library(SDL2_mixer::SDL2_mixer UNKNOWN IMPORTED)
|
|
||||||
set_target_properties(
|
|
||||||
SDL2_mixer::SDL2_mixer
|
|
||||||
PROPERTIES
|
|
||||||
IMPORTED_LOCATION "${SDL2_MIXER_LIBRARY}"
|
|
||||||
INTERFACE_INCLUDE_DIRECTORIES "${SDL2_MIXER_INCLUDE_DIR}"
|
|
||||||
)
|
|
||||||
endif()
|
|
||||||
@@ -6,54 +6,38 @@ endif()
|
|||||||
|
|
||||||
set(__GitUtilities ON)
|
set(__GitUtilities ON)
|
||||||
|
|
||||||
macro(_git_command)
|
function(git_describe variable path)
|
||||||
execute_process(
|
execute_process(COMMAND "${GIT_EXECUTABLE}" "describe"
|
||||||
COMMAND "${GIT_EXECUTABLE}" ${ARGN}
|
WORKING_DIRECTORY "${path}"
|
||||||
WORKING_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}"
|
RESULT_VARIABLE result
|
||||||
OUTPUT_VARIABLE output
|
OUTPUT_VARIABLE output
|
||||||
ERROR_QUIET
|
ERROR_QUIET
|
||||||
OUTPUT_STRIP_TRAILING_WHITESPACE
|
OUTPUT_STRIP_TRAILING_WHITESPACE
|
||||||
)
|
)
|
||||||
endmacro()
|
|
||||||
|
|
||||||
macro(_git_easy_command)
|
|
||||||
_git_command(${ARGN})
|
|
||||||
set(${variable} "${output}" PARENT_SCOPE)
|
|
||||||
endmacro()
|
|
||||||
|
|
||||||
function(git_current_branch variable)
|
|
||||||
_git_command(symbolic-ref -q --short HEAD)
|
|
||||||
|
|
||||||
# If a detached head, a ref could still be resolved.
|
|
||||||
if("${output}" STREQUAL "")
|
|
||||||
_git_command(describe --all --exact-match)
|
|
||||||
|
|
||||||
# Get the ref, in the form heads/master or
|
|
||||||
# remotes/origin/master so isolate the final part.
|
|
||||||
string(REGEX REPLACE ".*/" "" output "${output}")
|
|
||||||
endif()
|
|
||||||
|
|
||||||
set(${variable} "${output}" PARENT_SCOPE)
|
set(${variable} "${output}" PARENT_SCOPE)
|
||||||
endfunction()
|
endfunction()
|
||||||
|
|
||||||
function(git_latest_commit variable)
|
function(git_current_branch variable path)
|
||||||
_git_easy_command(rev-parse --short HEAD)
|
execute_process(COMMAND ${GIT_EXECUTABLE} "symbolic-ref" "--short" "HEAD"
|
||||||
|
WORKING_DIRECTORY "${path}"
|
||||||
|
RESULT_VARIABLE result
|
||||||
|
OUTPUT_VARIABLE output
|
||||||
|
ERROR_QUIET
|
||||||
|
OUTPUT_STRIP_TRAILING_WHITESPACE
|
||||||
|
)
|
||||||
|
|
||||||
|
set(${variable} "${output}" PARENT_SCOPE)
|
||||||
endfunction()
|
endfunction()
|
||||||
|
|
||||||
function(git_working_tree_dirty variable)
|
function(git_latest_commit variable path)
|
||||||
_git_command(status --porcelain -uno)
|
execute_process(COMMAND ${GIT_EXECUTABLE} "rev-parse" "--short" "HEAD"
|
||||||
|
WORKING_DIRECTORY "${path}"
|
||||||
|
RESULT_VARIABLE result
|
||||||
|
OUTPUT_VARIABLE output
|
||||||
|
ERROR_QUIET
|
||||||
|
OUTPUT_STRIP_TRAILING_WHITESPACE
|
||||||
|
)
|
||||||
|
|
||||||
if(output STREQUAL "")
|
set(${variable} "${output}" PARENT_SCOPE)
|
||||||
set(${variable} FALSE PARENT_SCOPE)
|
|
||||||
else()
|
|
||||||
set(${variable} TRUE PARENT_SCOPE)
|
|
||||||
endif()
|
|
||||||
endfunction()
|
|
||||||
|
|
||||||
function(git_subject variable)
|
|
||||||
_git_easy_command(log -1 "--format=%h %s")
|
|
||||||
endfunction()
|
|
||||||
|
|
||||||
function(get_git_dir variable)
|
|
||||||
_git_easy_command(rev-parse --git-dir)
|
|
||||||
endfunction()
|
endfunction()
|
||||||
@@ -1,4 +1,4 @@
|
|||||||
# Version 2.2
|
# Version 2.4
|
||||||
# Public Domain, originally written by Lasse Kärkkäinen <tronic>
|
# Public Domain, originally written by Lasse Kärkkäinen <tronic>
|
||||||
# Maintained at https://github.com/Tronic/cmake-modules
|
# Maintained at https://github.com/Tronic/cmake-modules
|
||||||
# Please send your improvements as pull requests on Github.
|
# Please send your improvements as pull requests on Github.
|
||||||
@@ -52,6 +52,10 @@ function (libfind_pkg_detect PREFIX)
|
|||||||
if (libraryargs)
|
if (libraryargs)
|
||||||
find_library(${PREFIX}_LIBRARY NAMES ${libraryargs} HINTS ${${PREFIX}_PKGCONF_LIBRARY_DIRS})
|
find_library(${PREFIX}_LIBRARY NAMES ${libraryargs} HINTS ${${PREFIX}_PKGCONF_LIBRARY_DIRS})
|
||||||
endif()
|
endif()
|
||||||
|
# Read pkg-config version
|
||||||
|
if (${PREFIX}_PKGCONF_VERSION)
|
||||||
|
set(${PREFIX}_VERSION ${${PREFIX}_PKGCONF_VERSION} PARENT_SCOPE)
|
||||||
|
endif()
|
||||||
endfunction()
|
endfunction()
|
||||||
|
|
||||||
# Extracts a version #define from a version.h file, output stored to <PREFIX>_VERSION.
|
# Extracts a version #define from a version.h file, output stored to <PREFIX>_VERSION.
|
||||||
@@ -125,24 +129,39 @@ function (libfind_process PREFIX)
|
|||||||
|
|
||||||
# Process deps to add to
|
# Process deps to add to
|
||||||
foreach (i ${PREFIX} ${${PREFIX}_DEPENDENCIES})
|
foreach (i ${PREFIX} ${${PREFIX}_DEPENDENCIES})
|
||||||
if (DEFINED ${i}_INCLUDE_OPTS OR DEFINED ${i}_LIBRARY_OPTS)
|
if (DEFINED ${i}_INCLUDE_OPTS)
|
||||||
# The package seems to export option lists that we can use, woohoo!
|
# The package seems to export option lists that we can use, woohoo!
|
||||||
list(APPEND includeopts ${${i}_INCLUDE_OPTS})
|
list(APPEND includeopts ${${i}_INCLUDE_OPTS})
|
||||||
|
else()
|
||||||
|
if (DEFINED ${i}_INCLUDE_DIR)
|
||||||
|
# Singular forms can be used
|
||||||
|
list(APPEND includeopts ${i}_INCLUDE_DIR)
|
||||||
|
else()
|
||||||
|
if (DEFINED ${i}_INCLUDE_DIRS)
|
||||||
|
# Plural forms can be used
|
||||||
|
list(APPEND includeopts ${i}_INCLUDE_DIRS)
|
||||||
|
else()
|
||||||
|
# Oh no, we don't know the option names
|
||||||
|
message(FATAL_ERROR "We couldn't determine config variable names for ${i} includes. Aieeh!")
|
||||||
|
endif()
|
||||||
|
endif()
|
||||||
|
endif()
|
||||||
|
|
||||||
|
if (DEFINED ${i}_LIBRARY_OPTS)
|
||||||
|
# The package seems to export option lists that we can use, woohoo!
|
||||||
list(APPEND libraryopts ${${i}_LIBRARY_OPTS})
|
list(APPEND libraryopts ${${i}_LIBRARY_OPTS})
|
||||||
else()
|
else()
|
||||||
# If plural forms don't exist or they equal singular forms
|
if (DEFINED ${i}_LIBRARY)
|
||||||
if ((NOT DEFINED ${i}_INCLUDE_DIRS AND NOT DEFINED ${i}_LIBRARIES) OR
|
|
||||||
({i}_INCLUDE_DIR STREQUAL ${i}_INCLUDE_DIRS AND ${i}_LIBRARY STREQUAL ${i}_LIBRARIES))
|
|
||||||
# Singular forms can be used
|
# Singular forms can be used
|
||||||
if (DEFINED ${i}_INCLUDE_DIR)
|
list(APPEND libraryopts ${i}_LIBRARY)
|
||||||
list(APPEND includeopts ${i}_INCLUDE_DIR)
|
|
||||||
endif()
|
|
||||||
if (DEFINED ${i}_LIBRARY)
|
|
||||||
list(APPEND libraryopts ${i}_LIBRARY)
|
|
||||||
endif()
|
|
||||||
else()
|
else()
|
||||||
# Oh no, we don't know the option names
|
if (DEFINED ${i}_LIBRARIES)
|
||||||
message(FATAL_ERROR "We couldn't determine config variable names for ${i} includes and libs. Aieeh!")
|
# Plural forms can be used
|
||||||
|
list(APPEND libraryopts ${i}_LIBRARIES)
|
||||||
|
else()
|
||||||
|
# Oh no, we don't know the option names
|
||||||
|
message(FATAL_ERROR "We couldn't determine config variable names for ${i} libraries. Aieeh!")
|
||||||
|
endif()
|
||||||
endif()
|
endif()
|
||||||
endif()
|
endif()
|
||||||
endforeach()
|
endforeach()
|
||||||
@@ -209,12 +228,12 @@ function (libfind_process PREFIX)
|
|||||||
message(STATUS " ${PREFIX}_LIBRARY_OPTS=${libraryopts}")
|
message(STATUS " ${PREFIX}_LIBRARY_OPTS=${libraryopts}")
|
||||||
message(STATUS " ${PREFIX}_LIBRARIES=${libs}")
|
message(STATUS " ${PREFIX}_LIBRARIES=${libs}")
|
||||||
endif()
|
endif()
|
||||||
set (${PREFIX}_INCLUDE_OPTS ${includeopts} PARENT_SCOPE)
|
|
||||||
set (${PREFIX}_LIBRARY_OPTS ${libraryopts} PARENT_SCOPE)
|
|
||||||
set (${PREFIX}_INCLUDE_DIRS ${includes} PARENT_SCOPE)
|
|
||||||
set (${PREFIX}_LIBRARIES ${libs} PARENT_SCOPE)
|
|
||||||
set (${PREFIX}_FOUND TRUE PARENT_SCOPE)
|
|
||||||
endif()
|
endif()
|
||||||
|
set (${PREFIX}_INCLUDE_OPTS ${includeopts} PARENT_SCOPE)
|
||||||
|
set (${PREFIX}_LIBRARY_OPTS ${libraryopts} PARENT_SCOPE)
|
||||||
|
set (${PREFIX}_INCLUDE_DIRS ${includes} PARENT_SCOPE)
|
||||||
|
set (${PREFIX}_LIBRARIES ${libs} PARENT_SCOPE)
|
||||||
|
set (${PREFIX}_FOUND TRUE PARENT_SCOPE)
|
||||||
return()
|
return()
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
|
|||||||
@@ -1,5 +1,4 @@
|
|||||||
/cscope.out
|
/cscope.out
|
||||||
*.json
|
*.json
|
||||||
*.idx
|
*.idx
|
||||||
config.h
|
|
||||||
*.gdb_history
|
*.gdb_history
|
||||||
+541
-381
@@ -1,146 +1,436 @@
|
|||||||
add_executable(SRB2SDL2 MACOSX_BUNDLE WIN32)
|
# SRB2 Core
|
||||||
|
|
||||||
if(("${CMAKE_COMPILER_IS_GNUCC}" OR CMAKE_CXX_COMPILER_ID STREQUAL "Clang") AND "${CMAKE_SYSTEM_NAME}" MATCHES "Windows")
|
|
||||||
target_link_options(SRB2SDL2 PRIVATE "-Wl,--disable-dynamicbase")
|
|
||||||
if("${SRB2_CONFIG_STATIC_STDLIB}")
|
|
||||||
# On MinGW with internal libraries, link the standard library statically
|
|
||||||
if(CMAKE_LINKER_TYPE STREQUAL "LLD")
|
|
||||||
target_link_options(SRB2SDL2 PRIVATE -Wl, -static-libgcc -static-libstdc++ -static -lpthread)
|
|
||||||
else()
|
|
||||||
target_link_options(SRB2SDL2 PRIVATE -Wl,--add-stdcall-alias -static-libgcc -static-libstdc++ -static -lpthread)
|
|
||||||
endif()
|
|
||||||
set(THREADS_PREFER_PTHREAD_FLAG TRUE)
|
|
||||||
find_package(Threads REQUIRED)
|
|
||||||
target_link_libraries(SRB2SDL2 PRIVATE Threads::Threads)
|
|
||||||
endif()
|
|
||||||
if(CMAKE_SIZEOF_VOID_P EQUAL 4)
|
|
||||||
target_link_options(SRB2SDL2 PRIVATE "-Wl,--large-address-aware")
|
|
||||||
endif()
|
|
||||||
endif()
|
|
||||||
|
|
||||||
set(SRB2_CONFIG_STD23 OFF CACHE BOOL
|
|
||||||
"Compiles the game under c23 and cxx23 instead c11 and cxx17.")
|
|
||||||
|
|
||||||
if(SRB2_CONFIG_STD23)
|
|
||||||
message("-- Compiling game with C23 and CXX23.")
|
|
||||||
target_compile_features(SRB2SDL2 PRIVATE c_std_23 cxx_std_23)
|
|
||||||
set_property(TARGET SRB2SDL2 PROPERTY C_STANDARD 23)
|
|
||||||
set_property(TARGET SRB2SDL2 PROPERTY CXX_STANDARD 23)
|
|
||||||
else()
|
|
||||||
message("-- Compiling game with C11 and CXX17.")
|
|
||||||
target_compile_features(SRB2SDL2 PRIVATE c_std_11 cxx_std_17)
|
|
||||||
set_property(TARGET SRB2SDL2 PROPERTY C_STANDARD 11)
|
|
||||||
set_property(TARGET SRB2SDL2 PROPERTY CXX_STANDARD 17)
|
|
||||||
endif()
|
|
||||||
|
|
||||||
# Core sources
|
# Core sources
|
||||||
target_sourcefile(c)
|
set(SRB2_CORE_SOURCES
|
||||||
target_sources(SRB2SDL2 PRIVATE comptime.c config.h.in)
|
core/memory.cpp
|
||||||
|
core/thread_pool.cpp
|
||||||
|
am_map.c
|
||||||
|
b_bot.c
|
||||||
|
command.c
|
||||||
|
comptime.c
|
||||||
|
console.c
|
||||||
|
d_clisrv.c
|
||||||
|
d_main.c
|
||||||
|
d_net.c
|
||||||
|
d_netcmd.c
|
||||||
|
d_netfil.c
|
||||||
|
d_protocol.c
|
||||||
|
dehacked.c
|
||||||
|
f_finale.c
|
||||||
|
f_wipe.c
|
||||||
|
filesrch.c
|
||||||
|
g_game.c
|
||||||
|
g_demo.c
|
||||||
|
g_input.c
|
||||||
|
hu_stuff.c
|
||||||
|
i_tcp.c
|
||||||
|
info.c
|
||||||
|
k_hud.c
|
||||||
|
lzf.c
|
||||||
|
m_aatree.c
|
||||||
|
m_anigif.c
|
||||||
|
m_argv.c
|
||||||
|
m_bbox.c
|
||||||
|
m_cheat.c
|
||||||
|
m_curl.c
|
||||||
|
m_cond.c
|
||||||
|
m_emotes.cpp
|
||||||
|
m_fixed.c
|
||||||
|
m_menu.c
|
||||||
|
m_textinput.c
|
||||||
|
m_misc.c
|
||||||
|
m_perfstats.c
|
||||||
|
m_queue.c
|
||||||
|
m_random.c
|
||||||
|
md5.c
|
||||||
|
mserv.c
|
||||||
|
http-mserv.c
|
||||||
|
qs22j.c
|
||||||
|
r_skins.c
|
||||||
|
s_sound.c
|
||||||
|
screen.c
|
||||||
|
sounds.c
|
||||||
|
st_stuff.c
|
||||||
|
string.c
|
||||||
|
tables.c
|
||||||
|
v_video.c
|
||||||
|
w_wad.cpp
|
||||||
|
y_inter.c
|
||||||
|
z_zone.cpp
|
||||||
|
)
|
||||||
|
|
||||||
target_sources(SRB2SDL2 PRIVATE md5.c md5.h)
|
set(SRB2_CORE_HEADERS
|
||||||
|
core/memory.h
|
||||||
|
core/thread_pool.h
|
||||||
|
m_curl.h
|
||||||
|
m_emotes.h
|
||||||
|
k_hud.h
|
||||||
|
am_map.h
|
||||||
|
b_bot.h
|
||||||
|
byteptr.h
|
||||||
|
command.h
|
||||||
|
console.h
|
||||||
|
d_clisrv.h
|
||||||
|
d_event.h
|
||||||
|
d_main.h
|
||||||
|
d_net.h
|
||||||
|
d_netcmd.h
|
||||||
|
d_netfil.h
|
||||||
|
d_player.h
|
||||||
|
d_protocol.h
|
||||||
|
d_think.h
|
||||||
|
d_ticcmd.h
|
||||||
|
dehacked.h
|
||||||
|
doomdata.h
|
||||||
|
doomdef.h
|
||||||
|
doomstat.h
|
||||||
|
doomtype.h
|
||||||
|
endian.h
|
||||||
|
f_finale.h
|
||||||
|
fastcmp.h
|
||||||
|
filesrch.h
|
||||||
|
g_game.h
|
||||||
|
g_demo.h
|
||||||
|
g_input.h
|
||||||
|
g_state.h
|
||||||
|
hu_stuff.h
|
||||||
|
i_joy.h
|
||||||
|
i_net.h
|
||||||
|
i_sound.h
|
||||||
|
i_system.h
|
||||||
|
i_tcp.h
|
||||||
|
i_time.h
|
||||||
|
i_video.h
|
||||||
|
info.h
|
||||||
|
keys.h
|
||||||
|
lzf.h
|
||||||
|
m_aatree.h
|
||||||
|
m_anigif.h
|
||||||
|
m_argv.h
|
||||||
|
m_bbox.h
|
||||||
|
m_cheat.h
|
||||||
|
m_cond.h
|
||||||
|
m_dllist.h
|
||||||
|
m_fixed.h
|
||||||
|
m_menu.h
|
||||||
|
m_textinput.h
|
||||||
|
m_misc.h
|
||||||
|
m_queue.h
|
||||||
|
m_perfstats.h
|
||||||
|
m_random.h
|
||||||
|
m_swap.h
|
||||||
|
md5.h
|
||||||
|
mserv.h
|
||||||
|
qs22j.h
|
||||||
|
r_skins.h
|
||||||
|
s_sound.h
|
||||||
|
screen.h
|
||||||
|
sounds.h
|
||||||
|
st_stuff.h
|
||||||
|
tables.h
|
||||||
|
v_video.h
|
||||||
|
w_wad.h
|
||||||
|
y_inter.h
|
||||||
|
z_zone.h
|
||||||
|
|
||||||
|
config.h.in
|
||||||
|
)
|
||||||
|
|
||||||
|
set(SRB2_CORE_RENDER_SOURCES
|
||||||
|
r_bsp.cpp
|
||||||
|
r_data.c
|
||||||
|
r_draw.cpp
|
||||||
|
r_fps.cpp
|
||||||
|
r_main.cpp
|
||||||
|
r_patch.cpp
|
||||||
|
r_patchrotation.cpp
|
||||||
|
r_plane.cpp
|
||||||
|
r_segs.cpp
|
||||||
|
r_sky.c
|
||||||
|
r_splats.c
|
||||||
|
r_things.cpp
|
||||||
|
r_portal.c
|
||||||
|
|
||||||
|
r_bsp.h
|
||||||
|
r_data.h
|
||||||
|
r_defs.h
|
||||||
|
r_draw.h
|
||||||
|
r_fps.h
|
||||||
|
r_local.h
|
||||||
|
r_main.h
|
||||||
|
r_patch.h
|
||||||
|
r_patchrotation.h
|
||||||
|
r_plane.h
|
||||||
|
r_segs.h
|
||||||
|
r_sky.h
|
||||||
|
r_splats.h
|
||||||
|
r_state.h
|
||||||
|
r_things.h
|
||||||
|
r_portal.h
|
||||||
|
)
|
||||||
|
|
||||||
|
set(SRB2_CORE_GAME_SOURCES
|
||||||
|
p_ceilng.c
|
||||||
|
p_enemy.c
|
||||||
|
p_floor.c
|
||||||
|
p_inter.c
|
||||||
|
p_lights.c
|
||||||
|
p_map.c
|
||||||
|
p_maputl.cpp
|
||||||
|
p_mobj.c
|
||||||
|
p_polyobj.c
|
||||||
|
p_saveg.c
|
||||||
|
p_setup.c
|
||||||
|
p_sight.c
|
||||||
|
p_slopes.c
|
||||||
|
p_spec.c
|
||||||
|
p_telept.c
|
||||||
|
p_tick.c
|
||||||
|
p_user.c
|
||||||
|
k_director.c
|
||||||
|
k_kart.c
|
||||||
|
k_stats.c
|
||||||
|
i_time.c
|
||||||
|
|
||||||
|
p_local.h
|
||||||
|
p_maputl.h
|
||||||
|
p_mobj.h
|
||||||
|
p_polyobj.h
|
||||||
|
p_pspr.h
|
||||||
|
p_saveg.h
|
||||||
|
p_setup.h
|
||||||
|
p_slopes.h
|
||||||
|
p_spec.h
|
||||||
|
p_tick.h
|
||||||
|
k_director.h
|
||||||
|
k_kart.h
|
||||||
|
k_stats.h
|
||||||
|
)
|
||||||
|
|
||||||
|
prepend_sources(SRB2_CORE_SOURCES)
|
||||||
|
prepend_sources(SRB2_CORE_HEADERS)
|
||||||
|
prepend_sources(SRB2_CORE_RENDER_SOURCES)
|
||||||
|
prepend_sources(SRB2_CORE_GAME_SOURCES)
|
||||||
|
|
||||||
|
set(SRB2_CORE_HEADERS ${SRB2_CORE_HEADERS} ${CMAKE_CURRENT_BINARY_DIR}/config.h)
|
||||||
|
source_group("Main" FILES ${SRB2_CORE_SOURCES} ${SRB2_CORE_HEADERS})
|
||||||
|
source_group("Renderer" FILES ${SRB2_CORE_RENDER_SOURCES})
|
||||||
|
source_group("Game" FILES ${SRB2_CORE_GAME_SOURCES})
|
||||||
|
|
||||||
### Configuration
|
### Configuration
|
||||||
set(SRB2_CONFIG_DEV_BUILD OFF CACHE BOOL
|
set(SRB2_CONFIG_HAVE_BLUA ON CACHE BOOL
|
||||||
"Compile a development build of SRB2Kart.")
|
"Enable Lua interpreter support")
|
||||||
|
set(SRB2_CONFIG_HAVE_PNG ON CACHE BOOL
|
||||||
|
"Enable PNG support. Depends on zlib, so will be disabled if you don't enable that too.")
|
||||||
|
set(SRB2_CONFIG_HAVE_ZLIB ON CACHE BOOL
|
||||||
|
"Enable zlib support.")
|
||||||
|
set(SRB2_CONFIG_HAVE_GME ON CACHE BOOL
|
||||||
|
"Enable GME support.")
|
||||||
|
set(SRB2_CONFIG_HAVE_OPENMPT ON CACHE BOOL
|
||||||
|
"Enable OpenMPT support.")
|
||||||
|
set(SRB2_CONFIG_HAVE_DISCORDRPC OFF CACHE BOOL
|
||||||
|
"Enable Discord rich presence support.")
|
||||||
|
set(SRB2_CONFIG_HAVE_CURL ON CACHE BOOL
|
||||||
|
"Enable curl support, used for downloading files via HTTP.")
|
||||||
|
set(SRB2_CONFIG_HWRENDER ON CACHE BOOL
|
||||||
|
"Enable hardware rendering through OpenGL.")
|
||||||
|
set(SRB2_CONFIG_STATIC_OPENGL OFF CACHE BOOL
|
||||||
|
"Use statically linked OpenGL. NOT RECOMMENDED.")
|
||||||
|
set(SRB2_CONFIG_DEDICATED OFF CACHE BOOL
|
||||||
|
"Build a dedicated server.")
|
||||||
|
set(SRB2_CONFIG_LIBBACKTRACE ON CACHE BOOL
|
||||||
|
"Enable using libbacktrace for crashlogs.")
|
||||||
|
set(SRB2_CONFIG_LTO ON CACHE BOOL
|
||||||
|
"Enable link time optimizations, improves performance at the cost of longer link times.")
|
||||||
|
set(SRB2_CONFIG_ASAN OFF CACHE BOOL
|
||||||
|
"Compile with AddressSanitizer (libasan).")
|
||||||
|
set(SRB2_CONFIG_UBSAN OFF CACHE BOOL
|
||||||
|
"Compile with UndefinedBehaviorSanitizer (libubsan).")
|
||||||
|
|
||||||
set(SRB2_CONFIG_SKIP_COMPTIME OFF CACHE BOOL
|
set(SRB2_CONFIG_SATURNPAK ON CACHE BOOL
|
||||||
"Skip Comptime rebuild.")
|
"Enable Saturn specific special packet. Required for using the newer resynch system")
|
||||||
|
set(SRB2_CONFIG_SATURNJOIN ON CACHE BOOL
|
||||||
|
"Enable Saturn specific allowjoin toggle.")
|
||||||
|
set(SRB2_CONFIG_SCREENFBO ON CACHE BOOL
|
||||||
|
"Enable hardware renderer (OpenGL) FBO downsampling support")
|
||||||
|
|
||||||
if(NOT SRB2_CONFIG_SKIP_COMPTIME)
|
if(${SRB2_CONFIG_DEDICATED})
|
||||||
# This updates the modification time for comptime.c at the
|
set(SRB2_CONFIG_HAVE_GME NO)
|
||||||
# end of building so when the build system is ran next time,
|
set(SRB2_CONFIG_HAVE_OPENMPT NO)
|
||||||
# that file gets flagged. comptime.c will always be rebuilt.
|
set(SRB2_CONFIG_HWRENDER NO)
|
||||||
#
|
endif()
|
||||||
# This begs the question, why always rebuild comptime.c?
|
|
||||||
# Some things like the git commit must be checked each time
|
### use internal libraries?
|
||||||
# the program is built. But the build system determines which
|
if(${CMAKE_SYSTEM} MATCHES "Windows") ###set on Windows only
|
||||||
# files should be rebuilt before anything else. So
|
set(SRB2_CONFIG_USE_INTERNAL_LIBRARIES OFF CACHE BOOL
|
||||||
# comptime.c, which only needs to be rebuilt based on
|
"Use SRB2Kart's internal copies of required dependencies (SDL2, PNG, zlib, GME, OpenMPT).")
|
||||||
# information known at build time, must be told to rebuild
|
endif()
|
||||||
# before that information can be ascertained.
|
|
||||||
add_custom_command(
|
if(${SRB2_CONFIG_HAVE_BLUA})
|
||||||
TARGET SRB2SDL2
|
add_definitions(-DHAVE_BLUA)
|
||||||
POST_BUILD
|
set(SRB2_LUA_SOURCES
|
||||||
COMMAND ${CMAKE_COMMAND} -E touch_nocreate ${CMAKE_CURRENT_SOURCE_DIR}/comptime.c
|
lua_baselib.c
|
||||||
|
lua_blockmaplib.c
|
||||||
|
lua_consolelib.c
|
||||||
|
lua_hooklib.c
|
||||||
|
lua_hudlib.c
|
||||||
|
lua_hudlib_drawlist.c
|
||||||
|
lua_infolib.c
|
||||||
|
lua_maplib.c
|
||||||
|
lua_mathlib.c
|
||||||
|
lua_mobjlib.c
|
||||||
|
lua_playerlib.c
|
||||||
|
lua_script.c
|
||||||
|
lua_skinlib.c
|
||||||
|
lua_thinkerlib.c
|
||||||
|
lua_udatalib.c
|
||||||
|
lua_glib.c
|
||||||
)
|
)
|
||||||
|
set(SRB2_LUA_HEADERS
|
||||||
|
lua_hook.h
|
||||||
|
lua_hud.h
|
||||||
|
lua_hudlib_drawlist.h
|
||||||
|
lua_libs.h
|
||||||
|
lua_script.h
|
||||||
|
lua_udatalib.h
|
||||||
|
lua_glib.h
|
||||||
|
)
|
||||||
|
|
||||||
|
prepend_sources(SRB2_LUA_SOURCES)
|
||||||
|
prepend_sources(SRB2_LUA_HEADERS)
|
||||||
|
|
||||||
|
source_group("LUA" FILES ${SRB2_LUA_SOURCES} ${SRB2_LUA_HEADERS})
|
||||||
|
|
||||||
|
set(SRB2_BLUA_SOURCES
|
||||||
|
blua/lapi.c
|
||||||
|
blua/lauxlib.c
|
||||||
|
blua/lbaselib.c
|
||||||
|
blua/ldblib.c
|
||||||
|
blua/lcode.c
|
||||||
|
blua/ldebug.c
|
||||||
|
blua/ldo.c
|
||||||
|
blua/ldump.c
|
||||||
|
blua/lfunc.c
|
||||||
|
blua/lgc.c
|
||||||
|
blua/linit.c
|
||||||
|
blua/liolib.c
|
||||||
|
blua/llex.c
|
||||||
|
blua/lmem.c
|
||||||
|
blua/lobject.c
|
||||||
|
blua/lopcodes.c
|
||||||
|
blua/lparser.c
|
||||||
|
blua/lstate.c
|
||||||
|
blua/lstring.c
|
||||||
|
blua/lstrlib.c
|
||||||
|
blua/ltable.c
|
||||||
|
blua/ltablib.c
|
||||||
|
blua/ltm.c
|
||||||
|
blua/lundump.c
|
||||||
|
blua/lvm.c
|
||||||
|
blua/lzio.c
|
||||||
|
)
|
||||||
|
set(SRB2_BLUA_HEADERS
|
||||||
|
blua/lapi.h
|
||||||
|
blua/lauxlib.h
|
||||||
|
blua/lcode.h
|
||||||
|
blua/ldebug.h
|
||||||
|
blua/ldo.h
|
||||||
|
blua/lfunc.h
|
||||||
|
blua/lgc.h
|
||||||
|
blua/llex.h
|
||||||
|
blua/llimits.h
|
||||||
|
blua/lmem.h
|
||||||
|
blua/lobject.h
|
||||||
|
blua/lopcodes.h
|
||||||
|
blua/lparser.h
|
||||||
|
blua/lstate.h
|
||||||
|
blua/lstring.h
|
||||||
|
blua/ltable.h
|
||||||
|
blua/ltm.h
|
||||||
|
blua/lua.h
|
||||||
|
blua/luaconf.h
|
||||||
|
blua/lualib.h
|
||||||
|
blua/lundump.h
|
||||||
|
blua/lvm.h
|
||||||
|
blua/lzio.h
|
||||||
|
)
|
||||||
|
|
||||||
|
prepend_sources(SRB2_BLUA_SOURCES)
|
||||||
|
prepend_sources(SRB2_BLUA_HEADERS)
|
||||||
|
|
||||||
|
source_group("LUA\\Interpreter" FILES ${SRB2_BLUA_SOURCES} ${SRB2_BLUA_HEADERS})
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
set(GIT_EXECUTABLE "git" CACHE FILEPATH "Path to git binary")
|
if(${SRB2_CONFIG_HAVE_GME})
|
||||||
add_custom_target(_SRB2_reconf ALL
|
if(${SRB2_CONFIG_USE_INTERNAL_LIBRARIES})
|
||||||
COMMAND ${CMAKE_COMMAND} -DGIT_EXECUTABLE=${GIT_EXECUTABLE} -DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE} -DBINARY_DIR=${CMAKE_CURRENT_BINARY_DIR}/.. -P ${CMAKE_CURRENT_SOURCE_DIR}/../cmake/Comptime.cmake
|
set(GME_FOUND ON)
|
||||||
WORKING_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/.."
|
set(GME_INCLUDE_DIRS ${CMAKE_SOURCE_DIR}/libs/gme/include)
|
||||||
)
|
if(${SRB2_SYSTEM_BITS} EQUAL 64)
|
||||||
add_dependencies(SRB2SDL2 _SRB2_reconf)
|
set(GME_LIBRARIES "-L${CMAKE_SOURCE_DIR}/libs/gme/win64 -lgme")
|
||||||
|
else() # 32-bit
|
||||||
if(SRB2_CONFIG_ASAN)
|
set(GME_LIBRARIES "-L${CMAKE_SOURCE_DIR}/libs/gme/win32 -lgme")
|
||||||
target_compile_options(SRB2SDL2 PRIVATE -fsanitize=address)
|
endif()
|
||||||
target_link_options(SRB2SDL2 PRIVATE -fsanitize=address)
|
else()
|
||||||
endif()
|
find_package(GME)
|
||||||
|
endif()
|
||||||
if(SRB2_CONFIG_UBSAN)
|
if(${GME_FOUND})
|
||||||
target_compile_options(SRB2SDL2 PRIVATE -fsanitize=undefined)
|
set(SRB2_HAVE_GME ON)
|
||||||
target_link_options(SRB2SDL2 PRIVATE -fsanitize=undefined)
|
add_definitions(-DHAVE_LIBGME)
|
||||||
endif()
|
else()
|
||||||
|
message(WARNING "You have specified that GME is available but it was not found.")
|
||||||
if(SRB2_CONFIG_TIDY)
|
|
||||||
set(CMAKE_CXX_CLANG_TIDY "clang-tidy;-checks=*")
|
|
||||||
endif()
|
|
||||||
|
|
||||||
add_subdirectory(blua)
|
|
||||||
add_subdirectory(sdl)
|
|
||||||
add_subdirectory(core)
|
|
||||||
|
|
||||||
# OS macros
|
|
||||||
if (UNIX)
|
|
||||||
target_compile_definitions(SRB2SDL2 PRIVATE -DUNIXCOMMON)
|
|
||||||
target_link_libraries(SRB2SDL2 PRIVATE -rdynamic) # Use -rdynamic so a backtrace log shows function names
|
|
||||||
endif()
|
|
||||||
|
|
||||||
if(CMAKE_COMPILER_IS_GNUCC)
|
|
||||||
find_program(OBJCOPY objcopy)
|
|
||||||
endif()
|
|
||||||
|
|
||||||
if("${CMAKE_SYSTEM_NAME}" MATCHES "Linux")
|
|
||||||
target_compile_definitions(SRB2SDL2 PRIVATE -DLINUX)
|
|
||||||
if(${SRB2_SYSTEM_BITS} EQUAL 64)
|
|
||||||
target_compile_definitions(SRB2SDL2 PRIVATE -DLINUX64)
|
|
||||||
endif()
|
endif()
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
if("${CMAKE_SYSTEM_NAME}" MATCHES "Darwin")
|
if(${SRB2_CONFIG_HAVE_DISCORDRPC})
|
||||||
target_compile_definitions(SRB2SDL2 PRIVATE -DMACOSX)
|
if(${SRB2_CONFIG_USE_INTERNAL_LIBRARIES})
|
||||||
|
set(DISCORDRPC_FOUND ON)
|
||||||
|
if(${SRB2_SYSTEM_BITS} EQUAL 64)
|
||||||
|
set(DISCORDRPC_INCLUDE_DIRS ${CMAKE_SOURCE_DIR}/libs/discord-rpc/win64-dynamic/include)
|
||||||
|
set(DISCORDRPC_LIBRARIES "-L${CMAKE_SOURCE_DIR}/libs/discord-rpc/win64-dynamic/lib -ldiscord-rpc")
|
||||||
|
else() # 32-bit
|
||||||
|
set(DISCORDRPC_INCLUDE_DIRS ${CMAKE_SOURCE_DIR}/libs/discord-rpc/win32-dynamic/include)
|
||||||
|
set(DISCORDRPC_LIBRARIES "-L${CMAKE_SOURCE_DIR}/libs/discord-rpc/win32-dynamic/lib -ldiscord-rpc")
|
||||||
|
endif()
|
||||||
|
else()
|
||||||
|
find_package(DiscordRPC)
|
||||||
|
endif()
|
||||||
|
if(${DISCORDRPC_FOUND})
|
||||||
|
set(SRB2_HAVE_DISCORDRPC ON)
|
||||||
|
add_definitions(-DHAVE_DISCORDRPC)
|
||||||
|
add_definitions(-DUSE_STUN)
|
||||||
|
set(SRB2_DISCORDRPC_SOURCES discord.c stun.c)
|
||||||
|
set(SRB2_DISCORDRPC_HEADERS discord.h stun.h)
|
||||||
|
prepend_sources(SRB2_DISCORDRPC_SOURCES)
|
||||||
|
prepend_sources(SRB2_DISCORDRPC_HEADERS)
|
||||||
|
source_group("Discord Rich Presence" FILES ${SRB2_DISCORDRPC_SOURCES} ${SRB2_DISCORDRPC_HEADERS})
|
||||||
|
else()
|
||||||
|
message(WARNING "You have specified that Discord Rich Presence is available but it was not found.")
|
||||||
|
endif()
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
# add toggle for this
|
if(${SRB2_CONFIG_HAVE_OPENMPT})
|
||||||
target_link_libraries(SRB2SDL2 PRIVATE openmpt)
|
if(${SRB2_CONFIG_USE_INTERNAL_LIBRARIES})
|
||||||
target_compile_definitions(SRB2SDL2 PRIVATE -DHAVE_OPENMPT)
|
set(OPENMPT_FOUND ON)
|
||||||
|
set(OPENMPT_INCLUDE_DIRS ${CMAKE_SOURCE_DIR}/libs/libopenmpt/inc)
|
||||||
target_link_libraries(SRB2SDL2 PRIVATE ZLIB::ZLIB PNG::PNG CURL::libcurl)
|
if(${SRB2_SYSTEM_BITS} EQUAL 64)
|
||||||
target_compile_definitions(SRB2SDL2 PRIVATE -DHAVE_ZLIB -DHAVE_PNG -DHAVE_CURL -D_LARGEFILE64_SOURCE)
|
set(OPENMPT_LIBRARIES "-L${CMAKE_SOURCE_DIR}/libs/libopenmpt/lib/x86_64/mingw -lopenmpt")
|
||||||
|
else() # 32-bit
|
||||||
target_compile_definitions(SRB2SDL2 PRIVATE -DUSE_STUN)
|
set(OPENMPT_LIBRARIES "-L${CMAKE_SOURCE_DIR}/libs/libopenmpt/lib/x86/mingw -lopenmpt")
|
||||||
if(SRB2_CONFIG_ENABLE_DISCORDRPC)
|
endif()
|
||||||
target_link_libraries(SRB2SDL2 PRIVATE DiscordRPC::DiscordRPC)
|
else()
|
||||||
target_compile_definitions(SRB2SDL2 PRIVATE -DHAVE_DISCORDRPC)
|
find_package(OPENMPT)
|
||||||
target_sources(SRB2SDL2 PRIVATE discord.c)
|
endif()
|
||||||
endif()
|
if(${OPENMPT_FOUND})
|
||||||
|
set(SRB2_HAVE_OPENMPT ON)
|
||||||
if(${SRB2_CONFIG_LIBBACKTRACE})
|
add_definitions(-DHAVE_OPENMPT)
|
||||||
target_link_libraries(SRB2SDL2 PRIVATE libbacktrace)
|
else()
|
||||||
target_compile_definitions(SRB2SDL2 PRIVATE -DHAVE_LIBBACKTRACE)
|
message(WARNING "You have specified that OpenMPT is available but it was not found.")
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
# FIXME macOS does not support C11 threads.h
|
|
||||||
if(NOT "${CMAKE_SYSTEM_NAME}" MATCHES "Darwin")
|
|
||||||
set(SRB2_HAVE_THREADS ON)
|
|
||||||
target_compile_definitions(SRB2SDL2 PRIVATE -DHAVE_THREADS)
|
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
if(${SRB2_CONFIG_HAVE_ZLIB})
|
if(${SRB2_CONFIG_HAVE_ZLIB})
|
||||||
if(${SRB2_CONFIG_USE_INTERNAL_LIBRARIES})
|
if(${SRB2_CONFIG_USE_INTERNAL_LIBRARIES})
|
||||||
set(ZLIB_FOUND ON)
|
set(ZLIB_FOUND ON)
|
||||||
set(ZLIB_COMPAT ON)
|
|
||||||
set(WITH_GTEST OFF)
|
|
||||||
set(ZLIB_INCLUDE_DIRS ${CMAKE_SOURCE_DIR}/libs/zlib)
|
set(ZLIB_INCLUDE_DIRS ${CMAKE_SOURCE_DIR}/libs/zlib)
|
||||||
if(${SRB2_SYSTEM_BITS} EQUAL 64)
|
if(${SRB2_SYSTEM_BITS} EQUAL 64)
|
||||||
set(ZLIB_LIBRARIES "-L${CMAKE_SOURCE_DIR}/libs/zlib/win32 -lz64")
|
set(ZLIB_LIBRARIES "-L${CMAKE_SOURCE_DIR}/libs/zlib/win32 -lz64")
|
||||||
@@ -152,9 +442,9 @@ if(${SRB2_CONFIG_HAVE_ZLIB})
|
|||||||
endif()
|
endif()
|
||||||
if(${ZLIB_FOUND})
|
if(${ZLIB_FOUND})
|
||||||
set(SRB2_HAVE_ZLIB ON)
|
set(SRB2_HAVE_ZLIB ON)
|
||||||
target_compile_definitions(SRB2SDL2 PRIVATE -DHAVE_ZLIB)
|
add_definitions(-DHAVE_ZLIB)
|
||||||
else()
|
else()
|
||||||
message(WARNING "You have specified that ZLIB is available but it was not found. SRB2Kart-Saturn may not compile correctly.")
|
message(WARNING "You have specified that ZLIB is available but it was not found. SRB2Kart may not compile correctly.")
|
||||||
endif()
|
endif()
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
@@ -173,292 +463,162 @@ if(${SRB2_CONFIG_HAVE_PNG} AND ${SRB2_CONFIG_HAVE_ZLIB})
|
|||||||
endif()
|
endif()
|
||||||
if(${PNG_FOUND})
|
if(${PNG_FOUND})
|
||||||
set(SRB2_HAVE_PNG ON)
|
set(SRB2_HAVE_PNG ON)
|
||||||
target_compile_definitions(SRB2SDL2 PRIVATE -DHAVE_PNG)
|
add_definitions(-DHAVE_PNG)
|
||||||
target_compile_definitions(SRB2SDL2 PRIVATE -D_LARGEFILE64_SOURCE)
|
add_definitions(-D_LARGEFILE64_SOURCE)
|
||||||
|
source_group("Main" FILES ${SRB2_CORE_SOURCES} ${SRB2_CORE_HEADERS})
|
||||||
else()
|
else()
|
||||||
message(WARNING "You have specified that PNG is available but it was not found. SRB2Kart-Saturn may not compile correctly.")
|
message(WARNING "You have specified that PNG is available but it was not found. SRB2Kart may not compile correctly.")
|
||||||
endif()
|
endif()
|
||||||
endif()
|
endif()
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
if("${SRB2_CONFIG_HWRENDER}")
|
if(${SRB2_CONFIG_HAVE_CURL})
|
||||||
target_compile_definitions(SRB2SDL2 PRIVATE -DHWRENDER)
|
if(${SRB2_CONFIG_USE_INTERNAL_LIBRARIES})
|
||||||
add_subdirectory(hardware)
|
set(CURL_FOUND ON)
|
||||||
|
set(CURL_INCLUDE_DIRS ${CMAKE_SOURCE_DIR}/libs/curl/include)
|
||||||
if("${SRB2_CONFIG_STATIC_OPENGL}")
|
if(${SRB2_SYSTEM_BITS} EQUAL 64)
|
||||||
find_package(OpenGL)
|
set(CURL_LIBRARIES "-L${CMAKE_SOURCE_DIR}/libs/curl/lib64 -lcurl")
|
||||||
if(${OPENGL_FOUND})
|
else() # 32-bit
|
||||||
target_compile_definitions(SRB2SDL2 PRIVATE -DSTATIC_OPENGL)
|
set(CURL_LIBRARIES "-L${CMAKE_SOURCE_DIR}/libs/curl/lib32 -lcurl")
|
||||||
else()
|
|
||||||
message(WARNING "You have specified static opengl but opengl was not found. Not setting HWRENDER.")
|
|
||||||
endif()
|
endif()
|
||||||
|
else()
|
||||||
|
find_package(CURL)
|
||||||
|
endif()
|
||||||
|
if(${CURL_FOUND})
|
||||||
|
set(SRB2_HAVE_CURL ON)
|
||||||
|
add_definitions(-DHAVE_CURL)
|
||||||
|
else()
|
||||||
|
message(WARNING "You have specified that CURL is available but it was not found. SRB2Kart may not compile correctly.")
|
||||||
endif()
|
endif()
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
# TODO: build this with the game
|
if(${SRB2_CONFIG_LIBBACKTRACE})
|
||||||
if(${CMAKE_SYSTEM} MATCHES Windows AND ${CMAKE_C_COMPILER_ID} MATCHES "GNU" AND ${SRB2_SYSTEM_BITS} EQUAL 32)
|
if(${SRB2_CONFIG_USE_INTERNAL_LIBRARIES})
|
||||||
target_link_libraries(SRB2SDL2 PRIVATE
|
if(${SRB2_SYSTEM_BITS} EQUAL 64)
|
||||||
"${CMAKE_CURRENT_SOURCE_DIR}/../libs/drmingw/lib/win32/libexchndl.a"
|
set(LIBBACKTRACE_FOUND ON)
|
||||||
"${CMAKE_CURRENT_SOURCE_DIR}/../libs/drmingw/lib/win32/libmgwhelp.a"
|
set(LIBBACKTRACE_INCLUDE_DIRS ${CMAKE_SOURCE_DIR}/libs/libbacktrace/include)
|
||||||
|
set(LIBBACKTRACE_LIBRARIES "-L${CMAKE_SOURCE_DIR}/libs/libbacktrace/lib/x86_64 -lbacktrace")
|
||||||
|
else() # 32-bit
|
||||||
|
message(WARNING "libbacktrace is unsupported on 32-bit builds.")
|
||||||
|
endif()
|
||||||
|
else()
|
||||||
|
find_package(libbacktrace)
|
||||||
|
endif()
|
||||||
|
if(${LIBBACKTRACE_FOUND})
|
||||||
|
set(SRB2_HAVE_LIBBACKTRACE ON)
|
||||||
|
add_definitions(-DHAVE_LIBBACKTRACE)
|
||||||
|
else()
|
||||||
|
message(WARNING "You have specified that libbacktrace is available but it was not found.")
|
||||||
|
endif()
|
||||||
|
endif()
|
||||||
|
|
||||||
|
if(${SRB2_CONFIG_HWRENDER})
|
||||||
|
add_definitions(-DHWRENDER)
|
||||||
|
set(SRB2_HWRENDER_SOURCES
|
||||||
|
${CMAKE_CURRENT_SOURCE_DIR}/hardware/hw_batching.c
|
||||||
|
${CMAKE_CURRENT_SOURCE_DIR}/hardware/hw_shaders.c
|
||||||
|
${CMAKE_CURRENT_SOURCE_DIR}/hardware/hw_bsp.c
|
||||||
|
${CMAKE_CURRENT_SOURCE_DIR}/hardware/hw_cache.cpp
|
||||||
|
${CMAKE_CURRENT_SOURCE_DIR}/hardware/hw_clip.c
|
||||||
|
${CMAKE_CURRENT_SOURCE_DIR}/hardware/hw_draw.c
|
||||||
|
${CMAKE_CURRENT_SOURCE_DIR}/hardware/hw_main.cpp
|
||||||
|
${CMAKE_CURRENT_SOURCE_DIR}/hardware/hw_portal.c
|
||||||
|
${CMAKE_CURRENT_SOURCE_DIR}/hardware/hw_md2.c
|
||||||
|
${CMAKE_CURRENT_SOURCE_DIR}/hardware/hw_md2load.c
|
||||||
|
${CMAKE_CURRENT_SOURCE_DIR}/hardware/hw_md3load.c
|
||||||
|
${CMAKE_CURRENT_SOURCE_DIR}/hardware/hw_model.c
|
||||||
|
${CMAKE_CURRENT_SOURCE_DIR}/hardware/u_list.c
|
||||||
)
|
)
|
||||||
target_include_directories(SRB2SDL2 PRIVATE "${CMAKE_CURRENT_SOURCE_DIR}/../libs/drmingw/include")
|
|
||||||
|
set (SRB2_HWRENDER_HEADERS
|
||||||
|
${CMAKE_CURRENT_SOURCE_DIR}/hardware/hw_batching.h
|
||||||
|
${CMAKE_CURRENT_SOURCE_DIR}/hardware/hw_shaders.h
|
||||||
|
${CMAKE_CURRENT_SOURCE_DIR}/hardware/hw_clip.h
|
||||||
|
${CMAKE_CURRENT_SOURCE_DIR}/hardware/hw_data.h
|
||||||
|
${CMAKE_CURRENT_SOURCE_DIR}/hardware/hw_defs.h
|
||||||
|
${CMAKE_CURRENT_SOURCE_DIR}/hardware/hw_gl.h
|
||||||
|
${CMAKE_CURRENT_SOURCE_DIR}/hardware/hw_glob.h
|
||||||
|
${CMAKE_CURRENT_SOURCE_DIR}/hardware/hw_main.h
|
||||||
|
${CMAKE_CURRENT_SOURCE_DIR}/hardware/hw_portal.h
|
||||||
|
${CMAKE_CURRENT_SOURCE_DIR}/hardware/hw_md2.h
|
||||||
|
${CMAKE_CURRENT_SOURCE_DIR}/hardware/hw_md2load.h
|
||||||
|
${CMAKE_CURRENT_SOURCE_DIR}/hardware/hw_md3load.h
|
||||||
|
${CMAKE_CURRENT_SOURCE_DIR}/hardware/hw_model.h
|
||||||
|
${CMAKE_CURRENT_SOURCE_DIR}/hardware/u_list.h
|
||||||
|
)
|
||||||
|
|
||||||
|
set(SRB2_R_OPENGL_SOURCES
|
||||||
|
${CMAKE_CURRENT_SOURCE_DIR}/hardware/r_opengl/r_opengl.c
|
||||||
|
)
|
||||||
|
|
||||||
|
set(SRB2_R_OPENGL_HEADERS
|
||||||
|
${CMAKE_CURRENT_SOURCE_DIR}/hardware/r_opengl/r_opengl.h
|
||||||
|
)
|
||||||
|
endif()
|
||||||
|
|
||||||
|
if(${SRB2_CONFIG_HWRENDER} AND ${SRB2_CONFIG_STATIC_OPENGL})
|
||||||
|
find_package(OpenGL)
|
||||||
|
if(${OPENGL_FOUND})
|
||||||
|
add_definitions(-DHWRENDER)
|
||||||
|
add_definitions(-DSTATIC_OPENGL)
|
||||||
|
else()
|
||||||
|
message(WARNING "You have specified static opengl but opengl was not found. Not setting HWRENDER.")
|
||||||
|
endif()
|
||||||
|
endif()
|
||||||
|
|
||||||
|
if(${SRB2_CONFIG_HWRENDER} AND ${SRB2_CONFIG_SCREENFBO})
|
||||||
|
add_definitions(-DUSE_FBO_OGL)
|
||||||
|
endif()
|
||||||
|
|
||||||
|
if(${SRB2_CONFIG_SATURNPAK})
|
||||||
|
add_definitions(-DDOSATURNPAK)
|
||||||
|
endif()
|
||||||
|
|
||||||
|
if(${SRB2_CONFIG_SATURNJOIN})
|
||||||
|
add_definitions(-DDOSATURNJOIN)
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
# Targets
|
# Targets
|
||||||
|
|
||||||
# If using CCACHE, then force it.
|
|
||||||
# https://github.com/Cockatrice/Cockatrice/pull/3052/files
|
|
||||||
if ("${CMAKE_SYSTEM_NAME}" MATCHES "Darwin")
|
|
||||||
get_property(RULE_LAUNCH_COMPILE GLOBAL PROPERTY RULE_LAUNCH_COMPILE)
|
|
||||||
if(RULE_LAUNCH_COMPILE)
|
|
||||||
MESSAGE(STATUS "Force enabling CCache usage under macOS")
|
|
||||||
# Set up wrapper scripts
|
|
||||||
configure_file(${CMAKE_CURRENT_SOURCE_DIR}/../cmake/launch-c.in ${CMAKE_BINARY_DIR}/launch-c)
|
|
||||||
configure_file(${CMAKE_CURRENT_SOURCE_DIR}/../cmake/launch-cxx.in ${CMAKE_BINARY_DIR}/launch-cxx)
|
|
||||||
execute_process(COMMAND chmod a+rx
|
|
||||||
"${CMAKE_BINARY_DIR}/launch-c"
|
|
||||||
"${CMAKE_BINARY_DIR}/launch-cxx")
|
|
||||||
|
|
||||||
# Set Xcode project attributes to route compilation through our scripts
|
|
||||||
set(CMAKE_XCODE_ATTRIBUTE_CC "${CMAKE_BINARY_DIR}/launch-c")
|
|
||||||
set(CMAKE_XCODE_ATTRIBUTE_CXX "${CMAKE_BINARY_DIR}/launch-cxx")
|
|
||||||
set(CMAKE_XCODE_ATTRIBUTE_LD "${CMAKE_BINARY_DIR}/launch-c")
|
|
||||||
set(CMAKE_XCODE_ATTRIBUTE_LDPLUSPLUS "${CMAKE_BINARY_DIR}/launch-cxx")
|
|
||||||
endif()
|
|
||||||
endif()
|
|
||||||
|
|
||||||
# Compatibility flag with later versions of GCC
|
# Compatibility flag with later versions of GCC
|
||||||
# We should really fix our code to not need this
|
# We should really fix our code to not need this
|
||||||
if ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU" OR "${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang")
|
if ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU" OR "${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang")
|
||||||
if (CMAKE_SYSTEM_PROCESSOR MATCHES "^(x86_64|x64|amd64|AMD64|em64t|EM64T)")
|
if (CMAKE_SYSTEM_PROCESSOR MATCHES "^(x86_64|x64|amd64|AMD64|em64t|EM64T)")
|
||||||
target_compile_options(SRB2SDL2 PRIVATE -mno-ms-bitfields)
|
add_compile_options(-mno-ms-bitfields)
|
||||||
endif()
|
endif()
|
||||||
target_compile_options(SRB2SDL2 PRIVATE -Wno-trigraphs)
|
add_compile_options(-Wno-trigraphs)
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
# TODO: fix prng and P_CreateBlockmap overflow at some point
|
# TODO: fix prng and P_CreateBlockmap overflow at some point
|
||||||
target_compile_options(SRB2SDL2 PRIVATE -fwrapv)
|
add_compile_options(-fwrapv)
|
||||||
|
|
||||||
if (${CMAKE_BUILD_TYPE} MATCHES Debug)
|
if (${CMAKE_BUILD_TYPE} MATCHES Debug)
|
||||||
target_compile_options(SRB2SDL2 PRIVATE -O0)
|
add_compile_options(-O0)
|
||||||
target_compile_options(SRB2SDL2 PRIVATE -g)
|
|
||||||
else()
|
else()
|
||||||
target_compile_options(SRB2SDL2 PRIVATE -O3)
|
add_compile_options(-O3)
|
||||||
target_compile_options(SRB2SDL2 PRIVATE -g1) #should be enough for libbacktrace
|
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
# Compiler warnings configuration
|
add_compile_options(-g)
|
||||||
target_compile_options(SRB2SDL2 PRIVATE
|
|
||||||
# Using generator expressions to handle per-language compile options
|
|
||||||
|
|
||||||
# C, GNU
|
add_definitions(-DCMAKECONFIG)
|
||||||
# This is a direct translation from versions.mk
|
|
||||||
$<$<AND:$<COMPILE_LANGUAGE:C>,$<C_COMPILER_ID:GNU>>:
|
|
||||||
-Wall
|
|
||||||
-Wextra
|
|
||||||
-Wno-trigraphs
|
|
||||||
-W # Was controlled by RELAXWARNINGS
|
|
||||||
-Wfloat-equal
|
|
||||||
-Wundef
|
|
||||||
-Wpointer-arith
|
|
||||||
-Wbad-function-cast
|
|
||||||
-Wcast-qual
|
|
||||||
-Wcast-align # Was controlled by NOCASTALIGNWARN
|
|
||||||
-Wwrite-strings
|
|
||||||
-Wsign-compare
|
|
||||||
-Wno-comment
|
|
||||||
-Wno-alloc-size-larger-than # holy shit, be quiet up GCC
|
|
||||||
-Wmissing-prototypes
|
|
||||||
-Wmissing-declarations
|
|
||||||
-Wmissing-noreturn
|
|
||||||
-Wnested-externs
|
|
||||||
-Wformat-y2k
|
|
||||||
-Wformat-security
|
|
||||||
|
|
||||||
$<$<VERSION_LESS:$<C_COMPILER_VERSION>,2.9.5>:
|
#add_library(SRB2Core STATIC
|
||||||
-Wno-div-by-zero
|
# ${SRB2_CORE_SOURCES}
|
||||||
-Wendif-labels
|
# ${SRB2_CORE_HEADERS}
|
||||||
-Wdisabled-optimization
|
# ${SRB2_CORE_RENDER_SOURCES}
|
||||||
>
|
# ${SRB2_CORE_GAME_SOURCES}
|
||||||
|
# ${SRB2_LUA_SOURCES}
|
||||||
|
# ${SRB2_LUA_HEADERS}
|
||||||
|
# ${SRB2_BLUA_SOURCES}
|
||||||
|
# ${SRB2_BLUA_HEADERS}
|
||||||
|
#)
|
||||||
|
|
||||||
$<$<VERSION_GREATER_EQUAL:$<C_COMPILER_VERSION>,4.0.0>:
|
if(${SRB2_CONFIG_DEDICATED})
|
||||||
-Wold-style-definition
|
add_subdirectory(dedicated)
|
||||||
-Wmissing-field-initializers
|
else()
|
||||||
>
|
add_subdirectory(sdl)
|
||||||
|
|
||||||
$<$<VERSION_GREATER_EQUAL:$<C_COMPILER_VERSION>,4.1.0>:
|
|
||||||
-Wshadow
|
|
||||||
>
|
|
||||||
|
|
||||||
$<$<VERSION_GREATER_EQUAL:$<C_COMPILER_VERSION>,4.3.0>:
|
|
||||||
-funit-at-a-time
|
|
||||||
-Wlogical-op
|
|
||||||
>
|
|
||||||
|
|
||||||
$<$<VERSION_GREATER_EQUAL:$<C_COMPILER_VERSION>,4.5.0>:
|
|
||||||
-Wlogical-op
|
|
||||||
-Wno-error=array-bounds
|
|
||||||
>
|
|
||||||
|
|
||||||
$<$<VERSION_GREATER_EQUAL:$<C_COMPILER_VERSION>,4.6.0>:
|
|
||||||
-Wno-suggest-attribute=noreturn
|
|
||||||
-Wno-error=suggest-attribute=noreturn
|
|
||||||
>
|
|
||||||
|
|
||||||
$<$<VERSION_GREATER_EQUAL:$<C_COMPILER_VERSION>,5.4.0>:
|
|
||||||
-Wno-logical-op
|
|
||||||
-Wno-error=logical-op
|
|
||||||
>
|
|
||||||
|
|
||||||
$<$<VERSION_GREATER_EQUAL:$<C_COMPILER_VERSION>,6.1.0>:
|
|
||||||
-Wno-tautological-compare
|
|
||||||
-Wno-error=tautological-compare
|
|
||||||
>
|
|
||||||
|
|
||||||
$<$<VERSION_GREATER_EQUAL:$<C_COMPILER_VERSION>,7.1.0>:
|
|
||||||
-Wno-error=format-overflow=2
|
|
||||||
-Wimplicit-fallthrough=4
|
|
||||||
>
|
|
||||||
|
|
||||||
$<$<VERSION_GREATER_EQUAL:$<C_COMPILER_VERSION>,8.1.0>:
|
|
||||||
-Wno-error=format-overflow
|
|
||||||
-Wno-error=stringop-truncation
|
|
||||||
-Wno-error=stringop-overflow
|
|
||||||
-Wno-format-overflow
|
|
||||||
-Wno-stringop-truncation
|
|
||||||
-Wno-stringop-overflow
|
|
||||||
-Wno-error=multistatement-macros
|
|
||||||
>
|
|
||||||
|
|
||||||
$<$<VERSION_GREATER_EQUAL:$<C_COMPILER_VERSION>,9.1.0>:
|
|
||||||
-Wno-error=address-of-packed-member
|
|
||||||
>
|
|
||||||
>
|
|
||||||
|
|
||||||
# C, Clang and Apple Clang
|
|
||||||
$<$<AND:$<COMPILE_LANGUAGE:C>,$<OR:$<C_COMPILER_ID:AppleClang>,$<C_COMPILER_ID:Clang>>>:
|
|
||||||
-Wall
|
|
||||||
-Wextra
|
|
||||||
-Wno-absolute-value
|
|
||||||
-Wno-trigraphs
|
|
||||||
-Wno-error=non-literal-null-conversion
|
|
||||||
-Wno-error=constant-conversion
|
|
||||||
-Wno-unused-but-set-variable
|
|
||||||
-Wno-error=unused-but-set-variable
|
|
||||||
>
|
|
||||||
|
|
||||||
# C++, GNU, Clang and Apple Clang
|
|
||||||
$<$<AND:$<COMPILE_LANGUAGE:CXX>,$<OR:$<C_COMPILER_ID:GNU>,$<C_COMPILER_ID:AppleClang>,$<C_COMPILER_ID:Clang>>>:
|
|
||||||
-Wall
|
|
||||||
-Wno-unused-function
|
|
||||||
-Wno-unused-but-set-variable
|
|
||||||
-Wno-unused-private-field
|
|
||||||
>
|
|
||||||
|
|
||||||
# GNU
|
|
||||||
$<$<C_COMPILER_ID:GNU>:
|
|
||||||
-fmax-errors=5
|
|
||||||
>
|
|
||||||
)
|
|
||||||
if(SRB2_CONFIG_ERRORMODE)
|
|
||||||
target_compile_options(SRB2SDL2 PRIVATE
|
|
||||||
$<$<OR:$<C_COMPILER_ID:GNU>,$<C_COMPILER_ID:AppleClang>,$<C_COMPILER_ID:Clang>>:
|
|
||||||
-Werror
|
|
||||||
>
|
|
||||||
)
|
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
# Link warnings configuration
|
if(NOT ${SRB2_SDL2_AVAILABLE} AND NOT ${SRB2_WIN32_AVAILABLE})
|
||||||
target_link_options(SRB2SDL2 PRIVATE
|
message(FATAL_ERROR "There are no targets available to build an SRB2Kart executable. :(")
|
||||||
$<$<C_COMPILER_ID:GNU>:
|
|
||||||
# -Wl,--as-needed - Was controlled by NOLDWARNING
|
|
||||||
>
|
|
||||||
)
|
|
||||||
|
|
||||||
if(${SRB2_CONFIG_DEV_BUILD})
|
|
||||||
target_compile_definitions(SRB2SDL2 PRIVATE -DDEVELOP)
|
|
||||||
endif()
|
|
||||||
target_compile_definitions(SRB2SDL2 PRIVATE -DCMAKECONFIG)
|
|
||||||
|
|
||||||
# Misc. build options from Makefiles
|
|
||||||
if(SRB2_CONFIG_DEBUGMODE)
|
|
||||||
target_compile_definitions(SRB2SDL2 PRIVATE -D_DEBUG -DZDEBUG -DPARANOIA -DRANGECHECK -DPACKETDROP)
|
|
||||||
endif()
|
|
||||||
if(SRB2_CONFIG_MOBJCONSISTANCY)
|
|
||||||
target_compile_definitions(SRB2SDL2 PRIVATE -DMOBJCONSISTANCY)
|
|
||||||
endif()
|
|
||||||
if(SRB2_CONFIG_PACKETDROP)
|
|
||||||
target_compile_definitions(SRB2SDL2 PRIVATE -DPACKETDROP)
|
|
||||||
endif()
|
|
||||||
if(SRB2_CONFIG_ZDEBUG)
|
|
||||||
target_compile_definitions(SRB2SDL2 PRIVATE -DZDEBUG)
|
|
||||||
endif()
|
|
||||||
if(SRB2_CONFIG_PROFILEMODE AND "${CMAKE_C_COMPILER_ID}" STREQUAL "GNU")
|
|
||||||
target_compile_options(SRB2SDL2 PRIVATE -pg)
|
|
||||||
target_link_options(SRB2SDL2 PRIVATE -pg)
|
|
||||||
endif()
|
|
||||||
|
|
||||||
if(SRB2_CONFIG_LTO AND NOT SRB2_CONFIG_DEBUGMODE)
|
|
||||||
set_property(TARGET SRB2SDL2 PROPERTY INTERPROCEDURAL_OPTIMIZATION TRUE)
|
|
||||||
endif()
|
|
||||||
|
|
||||||
if(${SRB2_CONFIG_SCREENFBO} AND NOT ${SRB2_CONFIG_STATIC_OPENGL})
|
|
||||||
target_compile_definitions(SRB2SDL2 PRIVATE -DUSE_FBO_OGL)
|
|
||||||
endif()
|
|
||||||
|
|
||||||
if(${SRB2_CONFIG_SATURNPAK})
|
|
||||||
target_compile_definitions(SRB2SDL2 PRIVATE -DDOSATURNPAK)
|
|
||||||
endif()
|
|
||||||
|
|
||||||
if(${SRB2_CONFIG_SATURNJOIN})
|
|
||||||
target_compile_definitions(SRB2SDL2 PRIVATE -DDOSATURNJOIN)
|
|
||||||
endif()
|
|
||||||
|
|
||||||
# strip debug symbols into separate file when using gcc or clang.
|
|
||||||
# to be consistent with Makefile, don't generate for OS X.
|
|
||||||
if((CMAKE_COMPILER_IS_GNUCC OR CMAKE_CXX_COMPILER_ID STREQUAL "Clang") AND NOT ("${CMAKE_SYSTEM_NAME}" MATCHES Darwin))
|
|
||||||
if((${CMAKE_BUILD_TYPE} MATCHES Debug) OR (${CMAKE_BUILD_TYPE} MATCHES RelWithDebInfo))
|
|
||||||
if(${CMAKE_BUILD_TYPE} MATCHES Debug)
|
|
||||||
set(OBJCOPY_ONLY_KEEP_DEBUG "--only-keep-debug")
|
|
||||||
endif()
|
|
||||||
message(STATUS "Will make separate debug symbols in *.debug")
|
|
||||||
add_custom_command(TARGET SRB2SDL2 POST_BUILD
|
|
||||||
COMMAND ${CMAKE_OBJCOPY} ${OBJCOPY_ONLY_KEEP_DEBUG} $<TARGET_FILE:SRB2SDL2> $<TARGET_FILE:SRB2SDL2>.debug
|
|
||||||
# mold linker: .gnu_debuglink is present by default, so --add-gnu-debuglink would fail
|
|
||||||
COMMAND ${CMAKE_OBJCOPY} --strip-debug --remove-section=.gnu_debuglink $<TARGET_FILE:SRB2SDL2>
|
|
||||||
COMMAND ${CMAKE_OBJCOPY} --add-gnu-debuglink=$<TARGET_FILE:SRB2SDL2>.debug $<TARGET_FILE:SRB2SDL2>
|
|
||||||
)
|
|
||||||
endif()
|
|
||||||
endif()
|
|
||||||
|
|
||||||
# copy DLLs to bin/ directory if building internal shared on windows
|
|
||||||
if("${CMAKE_SYSTEM_NAME}" STREQUAL Windows AND NOT "${SRB2_CONFIG_INTERNAL_LIBRARIES}" AND "${SRB2_CONFIG_SHARED_INTERNAL_LIBRARIES}")
|
|
||||||
set(ADDITIONAL_DLLS "")
|
|
||||||
if("${CMAKE_C_COMPILER_ID}" STREQUAL GNU OR CMAKE_CXX_COMPILER_ID STREQUAL "Clang")
|
|
||||||
# also copy implicitly linked system libraries
|
|
||||||
get_filename_component(MINGW_BIN_PATH ${CMAKE_CXX_COMPILER} PATH)
|
|
||||||
if("${CMAKE_C_COMPILER_ID}" STREQUAL GNU)
|
|
||||||
list(APPEND ADDITIONAL_DLLS
|
|
||||||
"libgcc_s_dw2-1.dll"
|
|
||||||
"libstdc++-6.dll"
|
|
||||||
"libwinpthread-1.dll"
|
|
||||||
)
|
|
||||||
else()
|
|
||||||
list(APPEND ADDITIONAL_DLLS
|
|
||||||
"libunwind.dll"
|
|
||||||
"libc++.dll"
|
|
||||||
"libwinpthread-1.dll"
|
|
||||||
)
|
|
||||||
endif()
|
|
||||||
list(TRANSFORM ADDITIONAL_DLLS PREPEND "${MINGW_BIN_PATH}/")
|
|
||||||
endif()
|
|
||||||
add_custom_command(TARGET SRB2SDL2 POST_BUILD
|
|
||||||
COMMAND ${CMAKE_COMMAND} -E copy_if_different
|
|
||||||
$<TARGET_RUNTIME_DLLS:SRB2SDL2>
|
|
||||||
${ADDITIONAL_DLLS}
|
|
||||||
|
|
||||||
$<TARGET_FILE_DIR:SRB2SDL2>
|
|
||||||
COMMAND_EXPAND_LISTS
|
|
||||||
COMMENT "Copying runtime DLLs"
|
|
||||||
)
|
|
||||||
endif()
|
endif()
|
||||||
+11
-5
@@ -93,7 +93,8 @@
|
|||||||
# NOLDWARNING=1 - ?
|
# NOLDWARNING=1 - ?
|
||||||
# NOSDLMAIN=1 - ?
|
# NOSDLMAIN=1 - ?
|
||||||
# SDLMAIN=1 - ?
|
# SDLMAIN=1 - ?
|
||||||
# USELTO=1 - Enable building with LTO.
|
# NOLTO=1 - Disable link time optimizations
|
||||||
|
# USEJEMALLOC=1 Enable building with jemalloc Allocator to replace GLibc malloc, might improve performance
|
||||||
#
|
#
|
||||||
# Library configuration flags:
|
# Library configuration flags:
|
||||||
# Everything here is an override.
|
# Everything here is an override.
|
||||||
@@ -260,7 +261,7 @@ debug_opts=-D_DEBUG
|
|||||||
else # build a normal optimized version
|
else # build a normal optimized version
|
||||||
debug_opts=-DNDEBUG
|
debug_opts=-DNDEBUG
|
||||||
opts+=-O3
|
opts+=-O3
|
||||||
ifdef USELTO
|
ifndef NOLTO
|
||||||
# compile with LTO
|
# compile with LTO
|
||||||
opts+=-flto=auto
|
opts+=-flto=auto
|
||||||
libs+=-flto=auto
|
libs+=-flto=auto
|
||||||
@@ -269,16 +270,20 @@ endif
|
|||||||
|
|
||||||
ifdef USEASAN
|
ifdef USEASAN
|
||||||
# compile with asan
|
# compile with asan
|
||||||
opts+=-fsanitize=address
|
opts+=-O1 -fsanitize=address -fno-omit-frame-pointer -fno-common
|
||||||
libs+=-fsanitize=address
|
libs+=-fsanitize=address
|
||||||
endif
|
endif
|
||||||
|
|
||||||
ifdef USEUBSAN
|
ifdef USEUBSAN
|
||||||
# compile with asan
|
# compile with ubsan
|
||||||
opts+=-fsanitize=undefined
|
opts+=-O1 -fsanitize=undefined -fno-omit-frame-pointer
|
||||||
libs+=-fsanitize=undefined
|
libs+=-fsanitize=undefined
|
||||||
endif
|
endif
|
||||||
|
|
||||||
|
ifdef USEJEMALLOC
|
||||||
|
libs+=-ljemalloc
|
||||||
|
endif
|
||||||
|
|
||||||
ifneq (,$(filter $(CC) $(CXX),clang clang++))
|
ifneq (,$(filter $(CC) $(CXX),clang clang++))
|
||||||
libs+=-fuse-ld=lld
|
libs+=-fuse-ld=lld
|
||||||
endif
|
endif
|
||||||
@@ -295,6 +300,7 @@ opts+=$(debug_opts)
|
|||||||
|
|
||||||
opts+=$(foreach v,$(passthru_opts),$(if $($(v)),-D$(v)))
|
opts+=$(foreach v,$(passthru_opts),$(if $($(v)),-D$(v)))
|
||||||
|
|
||||||
|
CWFLAGS+=-std=gnu17
|
||||||
CXXFLAGS+=-std=c++17 # force c17 for c++ since most vpss run older ubuntu versions with old compilers
|
CXXFLAGS+=-std=c++17 # force c17 for c++ since most vpss run older ubuntu versions with old compilers
|
||||||
|
|
||||||
opts+=$(WFLAGS) $(CFLAGS)
|
opts+=$(WFLAGS) $(CFLAGS)
|
||||||
|
|||||||
@@ -64,9 +64,10 @@ endif
|
|||||||
|
|
||||||
# This must have high to low order.
|
# This must have high to low order.
|
||||||
gcc_versions:=\
|
gcc_versions:=\
|
||||||
151 150 15\
|
161 160 16\
|
||||||
|
152 151 150 15\
|
||||||
142 141 140 14\
|
142 141 140 14\
|
||||||
132 131 130 13\
|
133 132 131 130 13\
|
||||||
123 122 121 120 12\
|
123 122 121 120 12\
|
||||||
114 113 112 111 110 11\
|
114 113 112 111 110 11\
|
||||||
105 104 103 102 101 100 10\
|
105 104 103 102 101 100 10\
|
||||||
@@ -77,7 +78,7 @@ gcc_versions:=\
|
|||||||
55 54 53 52 51 50\
|
55 54 53 52 51 50\
|
||||||
49 48 47 46 45 44 43 42 41 40
|
49 48 47 46 45 44 43 42 41 40
|
||||||
|
|
||||||
latest_gcc_version:=15.1.1
|
latest_gcc_version:=16.1
|
||||||
|
|
||||||
# Automatically set version flag, but not if one was
|
# Automatically set version flag, but not if one was
|
||||||
# manually set. And don't bother if this is a clean only
|
# manually set. And don't bother if this is a clean only
|
||||||
|
|||||||
@@ -8,6 +8,7 @@ passthru_opts+=\
|
|||||||
HAVE_MINIUPNPC\
|
HAVE_MINIUPNPC\
|
||||||
HAVE_DISCORDRPC DEVELOP\
|
HAVE_DISCORDRPC DEVELOP\
|
||||||
NOHOLEPUNCH\
|
NOHOLEPUNCH\
|
||||||
|
HAVE_IPV6\
|
||||||
|
|
||||||
# build with debugging information
|
# build with debugging information
|
||||||
ifdef DEBUGMODE
|
ifdef DEBUGMODE
|
||||||
|
|||||||
+16
-12
@@ -20,7 +20,11 @@ $(foreach v,$(join $(wordlist 2,$(_n),- $(gcc_versions)),\
|
|||||||
CXXFLAGS+= -Wno-aggregate-return
|
CXXFLAGS+= -Wno-aggregate-return
|
||||||
|
|
||||||
# -W -Wno-unused
|
# -W -Wno-unused
|
||||||
WFLAGS:=-Wall -Wno-trigraphs
|
WFLAGS:=-Wall -Wnull-dereference
|
||||||
|
#WFLAGS+=-Wno-trigraphs
|
||||||
|
ifdef GCC152
|
||||||
|
WFLAGS+=-Wzero-as-null-pointer-constant
|
||||||
|
endif
|
||||||
ifndef GCC295
|
ifndef GCC295
|
||||||
#WFLAGS+=-Wno-packed
|
#WFLAGS+=-Wno-packed
|
||||||
endif
|
endif
|
||||||
@@ -28,7 +32,7 @@ ifndef RELAXWARNINGS
|
|||||||
WFLAGS+=-W
|
WFLAGS+=-W
|
||||||
#WFLAGS+=-Wno-sign-compare
|
#WFLAGS+=-Wno-sign-compare
|
||||||
ifndef GCC295
|
ifndef GCC295
|
||||||
WFLAGS+=-Wno-div-by-zero
|
# WFLAGS+=-Wno-div-by-zero
|
||||||
endif
|
endif
|
||||||
#WFLAGS+=-Wsystem-headers
|
#WFLAGS+=-Wsystem-headers
|
||||||
WFLAGS+=-Wfloat-equal
|
WFLAGS+=-Wfloat-equal
|
||||||
@@ -59,7 +63,7 @@ endif
|
|||||||
endif
|
endif
|
||||||
WFLAGS+=-Wsign-compare
|
WFLAGS+=-Wsign-compare
|
||||||
ifdef GCC91
|
ifdef GCC91
|
||||||
WFLAGS+=-Wno-error=address-of-packed-member
|
# WFLAGS+=-Wno-error=address-of-packed-member
|
||||||
endif
|
endif
|
||||||
ifdef GCC45
|
ifdef GCC45
|
||||||
WFLAGS+=-Wlogical-op
|
WFLAGS+=-Wlogical-op
|
||||||
@@ -102,14 +106,14 @@ endif
|
|||||||
endif
|
endif
|
||||||
WFLAGS+=-Wformat-y2k
|
WFLAGS+=-Wformat-y2k
|
||||||
ifdef GCC71
|
ifdef GCC71
|
||||||
WFLAGS+=-Wno-error=format-overflow=2
|
#WFLAGS+=-Wno-error=format-overflow=2
|
||||||
endif
|
endif
|
||||||
WFLAGS+=-Wformat-security
|
WFLAGS+=-Wformat-security
|
||||||
ifndef GCC29
|
ifndef GCC29
|
||||||
#WFLAGS+=-Winit-self
|
#WFLAGS+=-Winit-self
|
||||||
endif
|
endif
|
||||||
ifdef GCC46
|
ifdef GCC46
|
||||||
WFLAGS+=-Wno-suggest-attribute=noreturn
|
#WFLAGS+=-Wno-suggest-attribute=noreturn
|
||||||
endif
|
endif
|
||||||
|
|
||||||
ifdef NOLDWARNING
|
ifdef NOLDWARNING
|
||||||
@@ -127,21 +131,21 @@ ifdef GCC44
|
|||||||
#WFLAGS+=-Wno-error=array-bounds
|
#WFLAGS+=-Wno-error=array-bounds
|
||||||
endif
|
endif
|
||||||
ifdef GCC46
|
ifdef GCC46
|
||||||
WFLAGS+=-Wno-error=suggest-attribute=noreturn
|
# WFLAGS+=-Wno-error=suggest-attribute=noreturn
|
||||||
endif
|
endif
|
||||||
ifdef GCC54
|
ifdef GCC54
|
||||||
WFLAGS+=-Wno-logical-op -Wno-error=logical-op
|
# WFLAGS+=-Wno-logical-op -Wno-error=logical-op
|
||||||
endif
|
endif
|
||||||
ifdef GCC61
|
ifdef GCC61
|
||||||
WFLAGS+=-Wno-tautological-compare -Wno-error=tautological-compare
|
# WFLAGS+=-Wno-tautological-compare -Wno-error=tautological-compare
|
||||||
endif
|
endif
|
||||||
ifdef GCC71
|
ifdef GCC71
|
||||||
WFLAGS+=-Wimplicit-fallthrough=4
|
WFLAGS+=-Wimplicit-fallthrough=4
|
||||||
endif
|
endif
|
||||||
ifdef GCC81
|
ifdef GCC81
|
||||||
WFLAGS+=-Wno-error=format-overflow
|
# WFLAGS+=-Wno-error=format-overflow
|
||||||
WFLAGS+=-Wno-format-overflow
|
# WFLAGS+=-Wno-format-overflow
|
||||||
WFLAGS+=-Wno-error=multistatement-macros
|
# WFLAGS+=-Wno-error=multistatement-macros
|
||||||
endif
|
endif
|
||||||
|
|
||||||
ifneq (,$(filter $(CC) $(CXX),clang clang++))
|
ifneq (,$(filter $(CC) $(CXX),clang clang++))
|
||||||
@@ -180,6 +184,6 @@ endif
|
|||||||
# Lua
|
# Lua
|
||||||
ifdef GCC43
|
ifdef GCC43
|
||||||
ifndef GCC44
|
ifndef GCC44
|
||||||
WFLAGS+=-Wno-logical-op
|
#WFLAGS+=-Wno-logical-op
|
||||||
endif
|
endif
|
||||||
endif
|
endif
|
||||||
@@ -226,10 +226,6 @@ const char *I_LocateWad(void)
|
|||||||
return "/sdcard/srb2";
|
return "/sdcard/srb2";
|
||||||
}
|
}
|
||||||
|
|
||||||
void I_GetJoystickEvents(void){}
|
|
||||||
|
|
||||||
void I_GetJoystick2Events(void){}
|
|
||||||
|
|
||||||
char *I_GetEnv(const char *name)
|
char *I_GetEnv(const char *name)
|
||||||
{
|
{
|
||||||
LOGW("I_GetEnv() called?!");
|
LOGW("I_GetEnv() called?!");
|
||||||
|
|||||||
@@ -1 +0,0 @@
|
|||||||
target_sourcefile(c)
|
|
||||||
+18
-9
@@ -434,7 +434,7 @@ LUA_API void lua_pushnumber (lua_State *L, lua_Number n) {
|
|||||||
LUA_API void lua_pushlstring (lua_State *L, const char *s, size_t len) {
|
LUA_API void lua_pushlstring (lua_State *L, const char *s, size_t len) {
|
||||||
lua_lock(L);
|
lua_lock(L);
|
||||||
luaC_checkGC(L);
|
luaC_checkGC(L);
|
||||||
setsvalue2s(L, L->top, (len == 0) ? luaS_new(L, "") : luaS_newlstr(L, s, len));
|
setsvalue2s(L, L->top, (len == 0) ? luaS_newlstr(L, "", 0) : luaS_newlstr(L, s, len));
|
||||||
api_incr_top(L);
|
api_incr_top(L);
|
||||||
lua_unlock(L);
|
lua_unlock(L);
|
||||||
}
|
}
|
||||||
@@ -519,6 +519,22 @@ LUA_API int lua_pushthread (lua_State *L) {
|
|||||||
** get functions (Lua -> stack)
|
** get functions (Lua -> stack)
|
||||||
*/
|
*/
|
||||||
|
|
||||||
|
static void auxgetstr (lua_State *L, TValue *t, const char *k) {
|
||||||
|
TValue *slot;
|
||||||
|
TValue key;
|
||||||
|
TString *str = luaS_new(L, k);
|
||||||
|
api_checkvalidindex(L, t);
|
||||||
|
if (luaV_fastget(L, t, str, slot, luaH_getstr)) {
|
||||||
|
setobj2s(L, L->top, slot);
|
||||||
|
}
|
||||||
|
else {
|
||||||
|
setsvalue(L, &key, str);
|
||||||
|
luaV_finishget(L, t, &key, L->top, slot);
|
||||||
|
}
|
||||||
|
api_incr_top(L);
|
||||||
|
lua_unlock(L);
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
LUA_API void lua_gettable (lua_State *L, int idx) {
|
LUA_API void lua_gettable (lua_State *L, int idx) {
|
||||||
StkId t;
|
StkId t;
|
||||||
@@ -531,15 +547,8 @@ LUA_API void lua_gettable (lua_State *L, int idx) {
|
|||||||
|
|
||||||
|
|
||||||
LUA_API void lua_getfield (lua_State *L, int idx, const char *k) {
|
LUA_API void lua_getfield (lua_State *L, int idx, const char *k) {
|
||||||
StkId t;
|
|
||||||
TValue key;
|
|
||||||
lua_lock(L);
|
lua_lock(L);
|
||||||
t = index2adr(L, idx);
|
auxgetstr(L, index2adr(L, idx), k);
|
||||||
api_checkvalidindex(L, t);
|
|
||||||
setsvalue(L, &key, luaS_new(L, k));
|
|
||||||
luaV_gettable(L, t, &key, L->top);
|
|
||||||
api_incr_top(L);
|
|
||||||
lua_unlock(L);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
+15
-3
@@ -20,6 +20,7 @@
|
|||||||
#define lauxlib_c
|
#define lauxlib_c
|
||||||
#define LUA_LIB
|
#define LUA_LIB
|
||||||
|
|
||||||
|
#include "ldebug.h"
|
||||||
#include "lua.h"
|
#include "lua.h"
|
||||||
|
|
||||||
#include "lauxlib.h"
|
#include "lauxlib.h"
|
||||||
@@ -468,8 +469,19 @@ LUALIB_API char *luaL_prepbuffer (luaL_Buffer *B) {
|
|||||||
|
|
||||||
|
|
||||||
LUALIB_API void luaL_addlstring (luaL_Buffer *B, const char *s, size_t l) {
|
LUALIB_API void luaL_addlstring (luaL_Buffer *B, const char *s, size_t l) {
|
||||||
while (l--)
|
while (l) {
|
||||||
luaL_addchar(B, *s++);
|
size_t space = bufffree(B);
|
||||||
|
if (space == 0) {
|
||||||
|
luaL_prepbuffer(B);
|
||||||
|
lua_assert(bufffree(B) == LUAL_BUFFERSIZE);
|
||||||
|
space = LUAL_BUFFERSIZE;
|
||||||
|
}
|
||||||
|
if (space > l) space = l;
|
||||||
|
memcpy(B->p, s, space);
|
||||||
|
B->p += space;
|
||||||
|
s += space;
|
||||||
|
l -= space;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
@@ -686,6 +698,6 @@ static int panic (lua_State *L) {
|
|||||||
|
|
||||||
LUALIB_API lua_State *luaL_newstate (void) {
|
LUALIB_API lua_State *luaL_newstate (void) {
|
||||||
lua_State *L = lua_newstate(l_alloc, NULL);
|
lua_State *L = lua_newstate(l_alloc, NULL);
|
||||||
if (L) lua_atpanic(L, &panic);
|
if (l_likely(L)) lua_atpanic(L, &panic);
|
||||||
return L;
|
return L;
|
||||||
}
|
}
|
||||||
+13
-12
@@ -790,18 +790,19 @@ void luaK_posfix (FuncState *fs, BinOpr op, expdesc *e1, expdesc *e2) {
|
|||||||
case OPR_BXOR: codearith(fs, OP_BXOR, e1, e2); break;
|
case OPR_BXOR: codearith(fs, OP_BXOR, e1, e2); break;
|
||||||
case OPR_BSHL: codearith(fs, OP_BSHL, e1, e2); break;
|
case OPR_BSHL: codearith(fs, OP_BSHL, e1, e2); break;
|
||||||
case OPR_BSHR: codearith(fs, OP_BSHR, e1, e2); break;
|
case OPR_BSHR: codearith(fs, OP_BSHR, e1, e2); break;
|
||||||
case OPR_ADD: codearith(fs, OP_ADD, e1, e2); break;
|
case OPR_ADD: case OPR_SUB: case OPR_MUL: case OPR_DIV:
|
||||||
case OPR_SUB: codearith(fs, OP_SUB, e1, e2); break;
|
case OPR_MOD: case OPR_POW: {
|
||||||
case OPR_MUL: codearith(fs, OP_MUL, e1, e2); break;
|
codearith(fs, op - OPR_ADD + OP_ADD, e1, e2);
|
||||||
case OPR_DIV: codearith(fs, OP_DIV, e1, e2); break;
|
break;
|
||||||
case OPR_MOD: codearith(fs, OP_MOD, e1, e2); break;
|
}
|
||||||
case OPR_POW: codearith(fs, OP_POW, e1, e2); break;
|
case OPR_EQ: case OPR_LT: case OPR_LE: {
|
||||||
case OPR_EQ: codecomp(fs, OP_EQ, 1, e1, e2); break;
|
codecomp(fs, op - OPR_EQ + OP_EQ, 1, e1, e2);
|
||||||
case OPR_NE: codecomp(fs, OP_EQ, 0, e1, e2); break;
|
break;
|
||||||
case OPR_LT: codecomp(fs, OP_LT, 1, e1, e2); break;
|
}
|
||||||
case OPR_LE: codecomp(fs, OP_LE, 1, e1, e2); break;
|
case OPR_NE: case OPR_GT: case OPR_GE: {
|
||||||
case OPR_GT: codecomp(fs, OP_LT, 0, e1, e2); break;
|
codecomp(fs, op - OPR_NE + OP_EQ, 0, e1, e2);
|
||||||
case OPR_GE: codecomp(fs, OP_LE, 0, e1, e2); break;
|
break;
|
||||||
|
}
|
||||||
default: lua_assert(0);
|
default: lua_assert(0);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
+3
-3
@@ -21,13 +21,13 @@
|
|||||||
|
|
||||||
|
|
||||||
/*
|
/*
|
||||||
** grep "ORDER OPR" if you change these enums
|
** grep "ORDER OPR" if you change these enums (ORDER OP)
|
||||||
*/
|
*/
|
||||||
typedef enum BinOpr {
|
typedef enum BinOpr {
|
||||||
OPR_ADD, OPR_SUB, OPR_MUL, OPR_DIV, OPR_MOD, OPR_POW,
|
OPR_ADD, OPR_SUB, OPR_MUL, OPR_DIV, OPR_MOD, OPR_POW,
|
||||||
OPR_CONCAT,
|
OPR_CONCAT,
|
||||||
OPR_NE, OPR_EQ,
|
OPR_EQ, OPR_LT, OPR_LE,
|
||||||
OPR_LT, OPR_LE, OPR_GT, OPR_GE,
|
OPR_NE, OPR_GT, OPR_GE,
|
||||||
OPR_AND, OPR_OR,
|
OPR_AND, OPR_OR,
|
||||||
OPR_BAND, OPR_BOR, OPR_BXOR,
|
OPR_BAND, OPR_BOR, OPR_BXOR,
|
||||||
OPR_BSHL, OPR_BSHR,
|
OPR_BSHL, OPR_BSHR,
|
||||||
|
|||||||
+28
-5
@@ -542,16 +542,39 @@ static const char *getobjname (lua_State *L, CallInfo *ci, int stackpos,
|
|||||||
|
|
||||||
|
|
||||||
static const char *getfuncname (lua_State *L, CallInfo *ci, const char **name) {
|
static const char *getfuncname (lua_State *L, CallInfo *ci, const char **name) {
|
||||||
|
TMS tm = 0;
|
||||||
Instruction i;
|
Instruction i;
|
||||||
if ((isLua(ci) && ci->tailcalls > 0) || !isLua(ci - 1))
|
if ((isLua(ci) && ci->tailcalls > 0) || !isLua(ci - 1))
|
||||||
return NULL; /* calling function is not Lua (or is unknown) */
|
return NULL; /* calling function is not Lua (or is unknown) */
|
||||||
ci--; /* calling function */
|
ci--; /* calling function */
|
||||||
i = ci_func(ci)->l.p->code[currentpc(L, ci)];
|
i = ci_func(ci)->l.p->code[currentpc(L, ci)];
|
||||||
if (GET_OPCODE(i) == OP_CALL || GET_OPCODE(i) == OP_TAILCALL ||
|
switch (GET_OPCODE(i)) {
|
||||||
GET_OPCODE(i) == OP_TFORLOOP)
|
case OP_CALL:
|
||||||
return getobjname(L, ci, GETARG_A(i), name);
|
case OP_TAILCALL:
|
||||||
else
|
case OP_TFORLOOP:
|
||||||
return NULL; /* no useful name can be found */
|
return getobjname(L, ci, GETARG_A(i), name);
|
||||||
|
case OP_GETGLOBAL:
|
||||||
|
case OP_SELF:
|
||||||
|
case OP_GETTABLE: tm = TM_INDEX; break;
|
||||||
|
case OP_SETGLOBAL:
|
||||||
|
case OP_SETTABLE: tm = TM_NEWINDEX; break;
|
||||||
|
case OP_EQ: tm = TM_EQ; break;
|
||||||
|
case OP_ADD: tm = TM_ADD; break;
|
||||||
|
case OP_SUB: tm = TM_SUB; break;
|
||||||
|
case OP_MUL: tm = TM_MUL; break;
|
||||||
|
case OP_DIV: tm = TM_DIV; break;
|
||||||
|
case OP_MOD: tm = TM_MOD; break;
|
||||||
|
case OP_POW: tm = TM_POW; break;
|
||||||
|
case OP_UNM: tm = TM_UNM; break;
|
||||||
|
case OP_LEN: tm = TM_LEN; break;
|
||||||
|
case OP_LT: tm = TM_LT; break;
|
||||||
|
case OP_LE: tm = TM_LE; break;
|
||||||
|
case OP_CONCAT: tm = TM_CONCAT; break;
|
||||||
|
default:
|
||||||
|
return NULL; /* else no useful name can be found */
|
||||||
|
}
|
||||||
|
*name = getstr(G(L)->tmname[tm]);
|
||||||
|
return "metamethod";
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
+4
-4
@@ -55,8 +55,8 @@ struct lua_longjmp {
|
|||||||
|
|
||||||
void luaD_seterrorobj (lua_State *L, int lerrcode, StkId oldtop) {
|
void luaD_seterrorobj (lua_State *L, int lerrcode, StkId oldtop) {
|
||||||
switch (lerrcode) {
|
switch (lerrcode) {
|
||||||
case LUA_ERRMEM: {
|
case LUA_ERRMEM: { /* memory error? */
|
||||||
setsvalue2s(L, oldtop, luaS_newliteral(L, MEMERRMSG));
|
setsvalue2s(L, oldtop, G(L)->memerrmsg); /* reuse preregistered msg. */
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
case LUA_ERRERR: {
|
case LUA_ERRERR: {
|
||||||
@@ -164,7 +164,7 @@ void luaD_reallocCI (lua_State *L, int newsize) {
|
|||||||
|
|
||||||
|
|
||||||
void luaD_growstack (lua_State *L, int n) {
|
void luaD_growstack (lua_State *L, int n) {
|
||||||
if (l_likely(n <= L->stacksize)) /* double size is enough? */
|
if (n <= L->stacksize) /* double size is enough? */
|
||||||
luaD_reallocstack(L, 2*L->stacksize);
|
luaD_reallocstack(L, 2*L->stacksize);
|
||||||
else
|
else
|
||||||
luaD_reallocstack(L, L->stacksize + n);
|
luaD_reallocstack(L, L->stacksize + n);
|
||||||
@@ -318,7 +318,7 @@ int luaD_precall (lua_State *L, StkId func, int nresults) {
|
|||||||
ci->top = L->top + LUA_MINSTACK;
|
ci->top = L->top + LUA_MINSTACK;
|
||||||
lua_assert(ci->top <= L->stack_last);
|
lua_assert(ci->top <= L->stack_last);
|
||||||
ci->nresults = nresults;
|
ci->nresults = nresults;
|
||||||
if (L->hookmask & LUA_MASKCALL)
|
if (l_unlikely(L->hookmask & LUA_MASKCALL))
|
||||||
luaD_callhook(L, LUA_HOOKCALL, -1);
|
luaD_callhook(L, LUA_HOOKCALL, -1);
|
||||||
lua_unlock(L);
|
lua_unlock(L);
|
||||||
n = (*curr_func(L)->c.f)(L); /* do the actual call */
|
n = (*curr_func(L)->c.f)(L); /* do the actual call */
|
||||||
|
|||||||
@@ -544,6 +544,7 @@ static void atomic (lua_State *L) {
|
|||||||
marktmu(g); /* mark `preserved' userdata */
|
marktmu(g); /* mark `preserved' userdata */
|
||||||
udsize += propagateall(g); /* remark, to propagate `preserveness' */
|
udsize += propagateall(g); /* remark, to propagate `preserveness' */
|
||||||
cleartable(g->weak); /* remove collected objects from weak tables */
|
cleartable(g->weak); /* remove collected objects from weak tables */
|
||||||
|
luaS_clearcache(g);
|
||||||
/* flip current white */
|
/* flip current white */
|
||||||
g->currentwhite = cast_byte(otherwhite(g));
|
g->currentwhite = cast_byte(otherwhite(g));
|
||||||
g->sweepstrgc = 0;
|
g->sweepstrgc = 0;
|
||||||
|
|||||||
+10
-9
@@ -356,20 +356,21 @@ static int read_line (lua_State *L, FILE *f) {
|
|||||||
|
|
||||||
|
|
||||||
static int read_chars (lua_State *L, FILE *f, size_t n) {
|
static int read_chars (lua_State *L, FILE *f, size_t n) {
|
||||||
size_t rlen; /* how much to read */
|
size_t tbr = n; /* number of chars to be read */
|
||||||
size_t nr; /* number of chars actually read */
|
size_t rlen; /* how much to read in each cycle */
|
||||||
|
size_t nr; /* number of chars actually read in each cycle */
|
||||||
luaL_Buffer b;
|
luaL_Buffer b;
|
||||||
luaL_buffinit(L, &b);
|
luaL_buffinit(L, &b);
|
||||||
rlen = LUAL_BUFFERSIZE; /* try to read that much each time */
|
rlen = LUAL_BUFFERSIZE; /* try to read that much each time */
|
||||||
do {
|
do {
|
||||||
char *p = luaL_prepbuffer(&b);
|
char *p = luaL_prepbuffer(&b);
|
||||||
if (rlen > n) rlen = n; /* cannot read more than asked */
|
if (rlen > tbr) rlen = tbr; /* cannot read more than asked */
|
||||||
nr = fread(p, sizeof(char), rlen, f);
|
nr = fread(p, sizeof(char), rlen, f);
|
||||||
luaL_addsize(&b, nr);
|
luaL_addsize(&b, nr);
|
||||||
n -= nr; /* still have to read `n' chars */
|
tbr -= nr; /* still have to read 'tbr' chars */
|
||||||
} while (n > 0 && nr == rlen); /* until end of count or eof */
|
} while (tbr > 0 && nr == rlen); /* until end of count or eof */
|
||||||
luaL_pushresult(&b); /* close buffer */
|
luaL_pushresult(&b); /* close buffer */
|
||||||
return (n == 0 || lua_objlen(L, -1) > 0);
|
return (tbr == 0 || tbr < n); /* true iff read something */
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
@@ -432,13 +433,13 @@ static int f_read (lua_State *L) {
|
|||||||
|
|
||||||
static int io_readline (lua_State *L) {
|
static int io_readline (lua_State *L) {
|
||||||
FILE *f = *(FILE **)lua_touserdata(L, lua_upvalueindex(1));
|
FILE *f = *(FILE **)lua_touserdata(L, lua_upvalueindex(1));
|
||||||
int sucess;
|
int success;
|
||||||
if (f == NULL) /* file is already closed? */
|
if (f == NULL) /* file is already closed? */
|
||||||
luaL_error(L, "file is already closed");
|
luaL_error(L, "file is already closed");
|
||||||
sucess = read_line(L, f);
|
success = read_line(L, f);
|
||||||
if (ferror(f))
|
if (ferror(f))
|
||||||
return luaL_error(L, "%s", strerror(errno));
|
return luaL_error(L, "%s", strerror(errno));
|
||||||
if (sucess) return 1;
|
if (success) return 1;
|
||||||
else { /* EOF */
|
else { /* EOF */
|
||||||
if (lua_toboolean(L, lua_upvalueindex(2))) { /* generator created file? */
|
if (lua_toboolean(L, lua_upvalueindex(2))) { /* generator created file? */
|
||||||
lua_settop(L, 0);
|
lua_settop(L, 0);
|
||||||
|
|||||||
@@ -41,6 +41,25 @@ typedef unsigned char lu_byte;
|
|||||||
*/
|
*/
|
||||||
#define IntPoint(p) ((unsigned int)(lu_mem)(p))
|
#define IntPoint(p) ((unsigned int)(lu_mem)(p))
|
||||||
|
|
||||||
|
/*
|
||||||
|
** conversion of pointer to unsigned integer: this is for hashing only;
|
||||||
|
** there is no problem if the integer cannot hold the whole pointer
|
||||||
|
** value. (In strict ISO C this may cause undefined behavior, but no
|
||||||
|
** actual machine seems to bother.)
|
||||||
|
*/
|
||||||
|
#if !defined(LUA_USE_C89) && defined(__STDC_VERSION__) && \
|
||||||
|
__STDC_VERSION__ >= 199901L
|
||||||
|
#include <stdint.h>
|
||||||
|
#if defined(UINTPTR_MAX) /* even in C99 this type is optional */
|
||||||
|
#define L_P2I uintptr_t
|
||||||
|
#else /* no 'intptr'? */
|
||||||
|
#define L_P2I uintmax_t /* use the largest available integer */
|
||||||
|
#endif
|
||||||
|
#else /* C89 option */
|
||||||
|
#define L_P2I size_t
|
||||||
|
#endif
|
||||||
|
|
||||||
|
#define point2uint(p) ((unsigned int)((L_P2I)(p) & UINT_MAX))
|
||||||
|
|
||||||
|
|
||||||
/* type to ensure maximum alignment */
|
/* type to ensure maximum alignment */
|
||||||
@@ -100,6 +119,17 @@ typedef lu_int32 Instruction;
|
|||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
|
||||||
|
/*
|
||||||
|
** Size of cache for strings in the API. 'N' is the number of
|
||||||
|
** sets (better be a prime) and "M" is the size of each set (M == 1
|
||||||
|
** makes a direct cache.)
|
||||||
|
*/
|
||||||
|
#ifndef STRCACHE_N
|
||||||
|
#define STRCACHE_N 53
|
||||||
|
#define STRCACHE_M 2
|
||||||
|
#endif
|
||||||
|
|
||||||
|
|
||||||
/* minimum size for string buffer */
|
/* minimum size for string buffer */
|
||||||
#ifndef LUA_MINBUFFER
|
#ifndef LUA_MINBUFFER
|
||||||
#define LUA_MINBUFFER 32
|
#define LUA_MINBUFFER 32
|
||||||
|
|||||||
@@ -13,8 +13,6 @@
|
|||||||
#include "llimits.h"
|
#include "llimits.h"
|
||||||
#include "lua.h"
|
#include "lua.h"
|
||||||
|
|
||||||
#define MEMERRMSG "not enough memory"
|
|
||||||
|
|
||||||
|
|
||||||
#define luaM_reallocv(L,b,on,n,e) \
|
#define luaM_reallocv(L,b,on,n,e) \
|
||||||
((cast(size_t, (n)+1) <= MAX_SIZET/(e)) ? /* +1 to avoid warnings */ \
|
((cast(size_t, (n)+1) <= MAX_SIZET/(e)) ? /* +1 to avoid warnings */ \
|
||||||
|
|||||||
+4
-4
@@ -881,10 +881,10 @@ static const struct {
|
|||||||
lu_byte right; /* right priority */
|
lu_byte right; /* right priority */
|
||||||
} priority[] = { /* ORDER OPR */
|
} priority[] = { /* ORDER OPR */
|
||||||
{6, 6}, {6, 6}, {7, 7}, {7, 7}, {7, 7}, /* `+' `-' `/' `%' */
|
{6, 6}, {6, 6}, {7, 7}, {7, 7}, {7, 7}, /* `+' `-' `/' `%' */
|
||||||
{10, 9}, {5, 4}, /* power and concat (right associative) */
|
{10, 9}, {5, 4}, /* ^, .. (right associative) */
|
||||||
{3, 3}, {3, 3}, /* equality and inequality */
|
{3, 3}, {3, 3}, {3, 3}, /* ==, <, <= */
|
||||||
{3, 3}, {3, 3}, {3, 3}, {3, 3}, /* order */
|
{3, 3}, {3, 3}, {3, 3}, /* ~=, >, >= */
|
||||||
{2, 2}, {1, 1} /* logical (and/or) */
|
{2, 2}, {1, 1} /* and, or */
|
||||||
,{6, 6}, {6, 6}, {6, 6}, /* bit-wise (band/bor/bxor) */
|
,{6, 6}, {6, 6}, {6, 6}, /* bit-wise (band/bor/bxor) */
|
||||||
{7, 7}, {7, 7} /* shl/shr */
|
{7, 7}, {7, 7} /* shl/shr */
|
||||||
};
|
};
|
||||||
|
|||||||
+1
-2
@@ -73,10 +73,9 @@ static void f_luaopen (lua_State *L, void *ud) {
|
|||||||
stack_init(L, L); /* init stack */
|
stack_init(L, L); /* init stack */
|
||||||
sethvalue(L, gt(L), luaH_new(L, 0, 2)); /* table of globals */
|
sethvalue(L, gt(L), luaH_new(L, 0, 2)); /* table of globals */
|
||||||
sethvalue(L, registry(L), luaH_new(L, 0, 2)); /* registry */
|
sethvalue(L, registry(L), luaH_new(L, 0, 2)); /* registry */
|
||||||
luaS_resize(L, MINSTRTABSIZE); /* initial size of string table */
|
luaS_init(L);
|
||||||
luaT_init(L);
|
luaT_init(L);
|
||||||
luaX_init(L);
|
luaX_init(L);
|
||||||
luaS_fix(luaS_newliteral(L, MEMERRMSG));
|
|
||||||
g->GCthreshold = 4*g->totalbytes;
|
g->GCthreshold = 4*g->totalbytes;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -88,9 +88,11 @@ typedef struct global_State {
|
|||||||
lua_CFunction panic; /* to be called in unprotected errors */
|
lua_CFunction panic; /* to be called in unprotected errors */
|
||||||
TValue l_registry;
|
TValue l_registry;
|
||||||
struct lua_State *mainthread;
|
struct lua_State *mainthread;
|
||||||
|
TString *memerrmsg; /* memory-error message */
|
||||||
UpVal uvhead; /* head of double-linked list of all open upvalues */
|
UpVal uvhead; /* head of double-linked list of all open upvalues */
|
||||||
struct Table *mt[NUM_TAGS]; /* metatables for basic types */
|
struct Table *mt[NUM_TAGS]; /* metatables for basic types */
|
||||||
TString *tmname[TM_N]; /* array with tag-method names */
|
TString *tmname[TM_N]; /* array with tag-method names */
|
||||||
|
TString *strcache[STRCACHE_N][STRCACHE_M]; /* cache for strings in API */
|
||||||
} global_State;
|
} global_State;
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
+118
-4
@@ -18,6 +18,9 @@
|
|||||||
#include "lstring.h"
|
#include "lstring.h"
|
||||||
|
|
||||||
|
|
||||||
|
#define MEMERRMSG "not enough memory"
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
void luaS_resize (lua_State *L, int newsize) {
|
void luaS_resize (lua_State *L, int newsize) {
|
||||||
GCObject **newhash;
|
GCObject **newhash;
|
||||||
@@ -51,7 +54,7 @@ static TString *newlstr (lua_State *L, const char *str, size_t l,
|
|||||||
unsigned int h) {
|
unsigned int h) {
|
||||||
TString *ts;
|
TString *ts;
|
||||||
stringtable *tb;
|
stringtable *tb;
|
||||||
if (l+1 > (MAX_SIZET - sizeof(TString))/sizeof(char))
|
if (l_unlikely(l+1 > (MAX_SIZET - sizeof(TString))/sizeof(char)))
|
||||||
luaM_toobig(L);
|
luaM_toobig(L);
|
||||||
ts = cast(TString *, luaM_malloc(L, (l+1)*sizeof(char)+sizeof(TString)));
|
ts = cast(TString *, luaM_malloc(L, (l+1)*sizeof(char)+sizeof(TString)));
|
||||||
ts->tsv.len = l;
|
ts->tsv.len = l;
|
||||||
@@ -72,18 +75,106 @@ static TString *newlstr (lua_State *L, const char *str, size_t l,
|
|||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
TString *luaS_newlstr (lua_State *L, const char *str, size_t l) {
|
/*
|
||||||
GCObject *o;
|
** Clear API string cache. (Entries cannot be empty, so fill them with
|
||||||
|
** a non-collectable string.)
|
||||||
|
*/
|
||||||
|
void luaS_clearcache (global_State *g) {
|
||||||
|
int i, j;
|
||||||
|
for (i = 0; i < STRCACHE_N; i++)
|
||||||
|
for (j = 0; j < STRCACHE_M; j++) {
|
||||||
|
if (luaS_iswhite(g->strcache[i][j])) /* will entry be collected? */
|
||||||
|
g->strcache[i][j] = g->memerrmsg; /* replace it with something fixed */
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
/*
|
||||||
|
** Initialize the string table and the string cache
|
||||||
|
*/
|
||||||
|
void luaS_init (lua_State *L) {
|
||||||
|
global_State *g = G(L);
|
||||||
|
int i, j;
|
||||||
|
luaS_resize(L, MINSTRTABSIZE); /* initial size of string table */
|
||||||
|
/* pre-create memory-error message */
|
||||||
|
g->memerrmsg = luaS_newliteral(L, MEMERRMSG);
|
||||||
|
luaS_fix(g->memerrmsg); /* it should never be collected */
|
||||||
|
for (i = 0; i < STRCACHE_N; i++) /* fill cache with valid strings */
|
||||||
|
for (j = 0; j < STRCACHE_M; j++)
|
||||||
|
g->strcache[i][j] = g->memerrmsg;
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
// string hash taken from luaJIT
|
||||||
|
|
||||||
|
/* Unaligned load of uint32_t. */
|
||||||
|
static inline __attribute__((always_inline)) uint32_t getu32(const void* ptr)
|
||||||
|
{
|
||||||
|
uint32_t result;
|
||||||
|
memcpy(&result, ptr, 4);
|
||||||
|
return result;
|
||||||
|
}
|
||||||
|
|
||||||
|
// smol macro to look a little less messy lul
|
||||||
|
#define getu8(p) *cast(const uint8_t *, p)
|
||||||
|
|
||||||
|
/* Keyed sparse ARX string hash. Constant time. */
|
||||||
|
static unsigned hash_sparse(const char *str, size_t len)
|
||||||
|
{
|
||||||
|
/* Constants taken from lookup3 hash by Bob Jenkins. */
|
||||||
|
unsigned int a, b, h = cast(unsigned int, len);
|
||||||
|
#define rol(x, n) (((x)<<(n)) | ((x)>>(-cast(int, n)&(8*sizeof(x)-1))))
|
||||||
|
if (len >= 4) { /* Caveat: unaligned access! */
|
||||||
|
a = getu32(str);
|
||||||
|
h ^= getu32(str+len-4);
|
||||||
|
b = getu32(str+(len>>1)-2);
|
||||||
|
h ^= b; h -= rol(b, 14);
|
||||||
|
b += getu32(str+(len>>2)-1);
|
||||||
|
} else if (len > 0) {
|
||||||
|
a = getu8(str);
|
||||||
|
h ^= getu8(str+len-1);
|
||||||
|
b = getu8(str+(len>>1));
|
||||||
|
h ^= b; h -= rol(b, 14);
|
||||||
|
} else {
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
|
a ^= h; a -= rol(h, 11);
|
||||||
|
b ^= a; b -= rol(a, 25);
|
||||||
|
h ^= b; h -= rol(b, 16);
|
||||||
|
#undef rol
|
||||||
|
return h;
|
||||||
|
}
|
||||||
|
|
||||||
|
#undef getu8
|
||||||
|
|
||||||
|
|
||||||
|
static inline __attribute__((always_inline)) unsigned luaS_hash (const char *str, size_t l) {
|
||||||
|
#if 0
|
||||||
unsigned int h = cast(unsigned int, l); /* seed */
|
unsigned int h = cast(unsigned int, l); /* seed */
|
||||||
size_t step = (l>>5)+1; /* if string is too long, don't hash all its chars */
|
size_t step = (l>>5)+1; /* if string is too long, don't hash all its chars */
|
||||||
size_t l1;
|
size_t l1;
|
||||||
for (l1=l; l1>=step; l1-=step) /* compute hash */
|
for (l1=l; l1>=step; l1-=step) /* compute hash */
|
||||||
h = h ^ ((h<<5)+(h>>2)+cast(unsigned char, str[l1-1]));
|
h = h ^ ((h<<5)+(h>>2)+cast(unsigned char, str[l1-1]));
|
||||||
|
return h;
|
||||||
|
#else
|
||||||
|
return hash_sparse(str, l);
|
||||||
|
#endif
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
/*
|
||||||
|
** new string (with explicit length)
|
||||||
|
*/
|
||||||
|
TString *luaS_newlstr (lua_State *L, const char *str, size_t l) {
|
||||||
|
GCObject *o;
|
||||||
|
unsigned int h = luaS_hash(str, l);
|
||||||
for (o = G(L)->strt.hash[lmod(h, G(L)->strt.size)];
|
for (o = G(L)->strt.hash[lmod(h, G(L)->strt.size)];
|
||||||
o != NULL;
|
o != NULL;
|
||||||
o = o->gch.next) {
|
o = o->gch.next) {
|
||||||
TString *ts = rawgco2ts(o);
|
TString *ts = rawgco2ts(o);
|
||||||
if (l_unlikely(ts->tsv.len == l && (memcmp(str, getstr(ts), l) == 0))) {
|
if (ts->tsv.hash == h &&
|
||||||
|
ts->tsv.len == l &&
|
||||||
|
(memcmp(str, getstr(ts), l) == 0)) {
|
||||||
/* string may be dead */
|
/* string may be dead */
|
||||||
if (isdead(G(L), o)) changewhite(o);
|
if (isdead(G(L), o)) changewhite(o);
|
||||||
return ts;
|
return ts;
|
||||||
@@ -93,6 +184,29 @@ TString *luaS_newlstr (lua_State *L, const char *str, size_t l) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
/*
|
||||||
|
** Create or reuse a zero-terminated string, first checking in the
|
||||||
|
** cache (using the string address as a key). The cache can contain
|
||||||
|
** only zero-terminated strings, so it is safe to use 'strcmp' to
|
||||||
|
** check hits.
|
||||||
|
*/
|
||||||
|
TString *luaS_new (lua_State *L, const char *str) {
|
||||||
|
unsigned int i = point2uint(str) % STRCACHE_N; /* hash */
|
||||||
|
int j;
|
||||||
|
TString **p = G(L)->strcache[i];
|
||||||
|
for (j = 0; j < STRCACHE_M; j++) {
|
||||||
|
if (strcmp(str, getstr(p[j])) == 0) /* hit? */
|
||||||
|
return p[j]; /* that is it */
|
||||||
|
}
|
||||||
|
/* normal route */
|
||||||
|
for (j = STRCACHE_M - 1; j > 0; j--)
|
||||||
|
p[j] = p[j - 1]; /* move out last element */
|
||||||
|
/* new element is first in the list */
|
||||||
|
p[0] = luaS_newlstr(L, str, strlen(str));
|
||||||
|
return p[0];
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
Udata *luaS_newudata (lua_State *L, size_t s, Table *e) {
|
Udata *luaS_newudata (lua_State *L, size_t s, Table *e) {
|
||||||
Udata *u;
|
Udata *u;
|
||||||
if (l_unlikely(s > MAX_SIZET - sizeof(Udata)))
|
if (l_unlikely(s > MAX_SIZET - sizeof(Udata)))
|
||||||
|
|||||||
+6
-2
@@ -17,15 +17,19 @@
|
|||||||
|
|
||||||
#define sizeudata(u) (sizeof(union Udata)+(u)->len)
|
#define sizeudata(u) (sizeof(union Udata)+(u)->len)
|
||||||
|
|
||||||
#define luaS_new(L, s) (luaS_newlstr(L, s, strlen(s)))
|
//#define luaS_new(L, s) (luaS_newlstr(L, s, strlen(s)))
|
||||||
#define luaS_newliteral(L, s) (luaS_newlstr(L, "" s, \
|
#define luaS_newliteral(L, s) (luaS_newlstr(L, "" s, \
|
||||||
(sizeof(s)/sizeof(char))-1))
|
(sizeof(s)/sizeof(char))-1))
|
||||||
|
|
||||||
#define luaS_fix(s) l_setbit((s)->tsv.marked, FIXEDBIT)
|
#define luaS_iswhite(x) test2bits((x)->tsv.marked, WHITE0BIT, WHITE1BIT)
|
||||||
|
#define luaS_fix(s) l_setbit((s)->tsv.marked, FIXEDBIT)
|
||||||
|
|
||||||
LUAI_FUNC void luaS_resize (lua_State *L, int newsize);
|
LUAI_FUNC void luaS_resize (lua_State *L, int newsize);
|
||||||
|
LUAI_FUNC void luaS_clearcache (global_State *g);
|
||||||
|
LUAI_FUNC void luaS_init (lua_State *L);
|
||||||
LUAI_FUNC Udata *luaS_newudata (lua_State *L, size_t s, Table *e);
|
LUAI_FUNC Udata *luaS_newudata (lua_State *L, size_t s, Table *e);
|
||||||
LUAI_FUNC TString *luaS_newlstr (lua_State *L, const char *str, size_t l);
|
LUAI_FUNC TString *luaS_newlstr (lua_State *L, const char *str, size_t l);
|
||||||
|
LUAI_FUNC TString *luaS_new (lua_State *L, const char *str);
|
||||||
|
|
||||||
|
|
||||||
#endif
|
#endif
|
||||||
+1
-1
@@ -527,7 +527,7 @@ static int str_find_aux (lua_State *L, int find) {
|
|||||||
if (find) {
|
if (find) {
|
||||||
lua_pushinteger(L, s1-s+1); /* start */
|
lua_pushinteger(L, s1-s+1); /* start */
|
||||||
lua_pushinteger(L, res-s); /* end */
|
lua_pushinteger(L, res-s); /* end */
|
||||||
return push_captures(&ms, NULL, 0) + 2;
|
return push_captures(&ms, NULL, NULL) + 2;
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
return push_captures(&ms, s1, res);
|
return push_captures(&ms, s1, res);
|
||||||
|
|||||||
@@ -81,6 +81,7 @@ static /*const*/ Node dummynode_ = {
|
|||||||
/*
|
/*
|
||||||
** hash for lua_Numbers
|
** hash for lua_Numbers
|
||||||
*/
|
*/
|
||||||
|
#if 0
|
||||||
static Node *hashnum (const Table *t, lua_Number n) {
|
static Node *hashnum (const Table *t, lua_Number n) {
|
||||||
unsigned int a[numints];
|
unsigned int a[numints];
|
||||||
int i;
|
int i;
|
||||||
@@ -90,6 +91,12 @@ static Node *hashnum (const Table *t, lua_Number n) {
|
|||||||
for (i = 1; i < numints; i++) a[0] += a[i];
|
for (i = 1; i < numints; i++) a[0] += a[i];
|
||||||
return hashmod(t, a[0]);
|
return hashmod(t, a[0]);
|
||||||
}
|
}
|
||||||
|
#else
|
||||||
|
// our lua_Number is just typedef´d int32 so no need to do any of the above
|
||||||
|
static inline Node *hashnum (const Table *t, lua_Number n) {
|
||||||
|
return hashmod(t, cast(unsigned int, n));
|
||||||
|
}
|
||||||
|
#endif
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
+3
-3
@@ -772,10 +772,10 @@ union luai_Cast { double l_d; long l_l; };
|
|||||||
|
|
||||||
#include <stdio.h>
|
#include <stdio.h>
|
||||||
#if defined(__GNUC__)
|
#if defined(__GNUC__)
|
||||||
#define l_likely(x) (__builtin_expect(((x) != 0), 1))
|
#define l_likely(x) (__builtin_expect(!!(x), 1))
|
||||||
#define l_unlikely(x) (__builtin_expect(((x) != 0), 0))
|
#define l_unlikely(x) (__builtin_expect(!!(x), 0))
|
||||||
#else
|
#else
|
||||||
#define l_likely(x) (x)
|
#define l_likely(x) (x)
|
||||||
#define l_unlikely(x) (x)
|
#define l_unlikely(x) (x)
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
|||||||
+98
-38
@@ -28,7 +28,7 @@
|
|||||||
|
|
||||||
|
|
||||||
|
|
||||||
/* limit for table tag-method chains (to avoid loops) */
|
/* limit for table tag-method chains (to avoid infinite loops) */
|
||||||
#define MAXTAGLOOP 100
|
#define MAXTAGLOOP 100
|
||||||
|
|
||||||
|
|
||||||
@@ -105,27 +105,42 @@ static void callTM (lua_State *L, const TValue *f, const TValue *p1,
|
|||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
void luaV_gettable (lua_State *L, TValue *t, TValue *key, StkId val) {
|
/*
|
||||||
int loop;
|
** Finish the table access 'val = t[key]'.
|
||||||
|
** if 'slot' is NULL, 't' is not a table; otherwise, 'slot' points to
|
||||||
|
** t[k] entry (which must be nil).
|
||||||
|
*/
|
||||||
|
void luaV_finishget (lua_State *L, TValue *t, TValue *key, StkId val,
|
||||||
|
TValue *slot) {
|
||||||
|
int loop; /* counter to avoid infinite loops */
|
||||||
|
TValue *tm; /* metamethod */
|
||||||
for (loop = 0; loop < MAXTAGLOOP; loop++) {
|
for (loop = 0; loop < MAXTAGLOOP; loop++) {
|
||||||
TValue *tm;
|
if (slot == NULL) { /* 't' is not a table? */
|
||||||
if (ttistable(t)) { /* `t' is a table? */
|
lua_assert(!ttistable(t));
|
||||||
Table *h = hvalue(t);
|
tm = luaT_gettmbyobj(L, t, TM_INDEX);
|
||||||
const TValue *res = luaH_get(h, key); /* do a primitive get */
|
if (l_unlikely(ttisnil(tm)))
|
||||||
if (!ttisnil(res) || /* result is no nil? */
|
luaG_typeerror(L, t, "index"); /* no metamethod */
|
||||||
(tm = fasttm(L, h->metatable, TM_INDEX)) == NULL) { /* or no TM? */
|
/* else will try the metamethod */
|
||||||
setobj2s(L, val, res);
|
}
|
||||||
|
else { /* 't' is a table */
|
||||||
|
lua_assert(ttisnil(slot));
|
||||||
|
tm = fasttm(L, hvalue(t)->metatable, TM_INDEX); /* table's metamethod */
|
||||||
|
if (tm == NULL) { /* no metamethod? */
|
||||||
|
setnilvalue(val); /* result is nil */
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
/* else will try the tag method */
|
/* else will try the metamethod */
|
||||||
}
|
}
|
||||||
else if (l_unlikely(ttisnil(tm = luaT_gettmbyobj(L, t, TM_INDEX))))
|
if (ttisfunction(tm)) { /* is metamethod a function? */
|
||||||
luaG_typeerror(L, t, "index");
|
callTMres(L, val, tm, t, key); /* call it */
|
||||||
if (ttisfunction(tm)) {
|
|
||||||
callTMres(L, val, tm, t, key);
|
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
t = tm; /* else repeat with `tm' */
|
t = tm; /* else try to access 'tm[key]' */
|
||||||
|
if (luaV_fastget(L, t, key, slot, luaH_get)) { /* fast track? */
|
||||||
|
setobj2s(L, val, slot); /* done */
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
/* else repeat (tail call 'luaV_finishget') */
|
||||||
}
|
}
|
||||||
luaG_runerror(L, "loop in gettable");
|
luaG_runerror(L, "loop in gettable");
|
||||||
}
|
}
|
||||||
@@ -139,8 +154,12 @@ void luaV_settable (lua_State *L, TValue *t, TValue *key, StkId val) {
|
|||||||
Table *h = hvalue(t);
|
Table *h = hvalue(t);
|
||||||
TValue *oldval = luaH_set(L, h, key); /* do a primitive set */
|
TValue *oldval = luaH_set(L, h, key); /* do a primitive set */
|
||||||
/* oldval is nil=> look for newindex, oldval is not nil => look for usedindex */
|
/* oldval is nil=> look for newindex, oldval is not nil => look for usedindex */
|
||||||
if (!((ttisnil(oldval) && ((tm = fasttm(L, h->metatable, TM_NEWINDEX)) != NULL)) ||
|
if (ttisnil(oldval)) {
|
||||||
((!ttisnil(oldval)) && ((tm = fasttm(L, h->metatable, TM_USEDINDEX)) != NULL)))) {
|
tm = fasttm(L, h->metatable, TM_NEWINDEX); /* get metamethod */
|
||||||
|
} else {
|
||||||
|
tm = fasttm(L, h->metatable, TM_USEDINDEX);
|
||||||
|
}
|
||||||
|
if (tm == NULL) { /* no metamethod? */
|
||||||
setobj2t(L, oldval, val);
|
setobj2t(L, oldval, val);
|
||||||
luaC_barriert(L, h, val);
|
luaC_barriert(L, h, val);
|
||||||
return;
|
return;
|
||||||
@@ -366,6 +385,7 @@ static void Arith (lua_State *L, StkId ra, TValue *rb,
|
|||||||
|
|
||||||
|
|
||||||
#define arith_op(op,tm) { \
|
#define arith_op(op,tm) { \
|
||||||
|
StkId ra = RA(i); \
|
||||||
TValue *rb = RKB(i); \
|
TValue *rb = RKB(i); \
|
||||||
TValue *rc = RKC(i); \
|
TValue *rc = RKC(i); \
|
||||||
if (ttisnumber(rb) && ttisnumber(rc)) { \
|
if (ttisnumber(rb) && ttisnumber(rc)) { \
|
||||||
@@ -377,6 +397,14 @@ static void Arith (lua_State *L, StkId ra, TValue *rb,
|
|||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
/*
|
||||||
|
** copy of 'luaV_gettable', but protecting call to potential metamethod
|
||||||
|
** (which can reallocate the stack)
|
||||||
|
*/
|
||||||
|
#define gettableProtected(L,t,k,v) { TValue *slot; \
|
||||||
|
if (luaV_fastget(L,t,k,slot,luaH_get)) { setobj2s(L, v, slot); } \
|
||||||
|
else Protect(luaV_finishget(L,t,k,v,slot)); }
|
||||||
|
|
||||||
|
|
||||||
void luaV_execute (lua_State *L, int nexeccalls) {
|
void luaV_execute (lua_State *L, int nexeccalls) {
|
||||||
LClosure *cl;
|
LClosure *cl;
|
||||||
@@ -386,13 +414,12 @@ void luaV_execute (lua_State *L, int nexeccalls) {
|
|||||||
reentry: /* entry point */
|
reentry: /* entry point */
|
||||||
lua_assert(isLua(L->ci));
|
lua_assert(isLua(L->ci));
|
||||||
pc = L->savedpc;
|
pc = L->savedpc;
|
||||||
cl = &clvalue(L->ci->func)->l;
|
cl = &clvalue(L->ci->func)->l; /* local reference to function's closure */
|
||||||
base = L->base;
|
k = cl->p->k; /* local reference to function's constant table */
|
||||||
k = cl->p->k;
|
base = L->base; /* local copy of function's base */
|
||||||
/* main loop of interpreter */
|
/* main loop of interpreter */
|
||||||
for (;;) {
|
for (;;) {
|
||||||
const Instruction i = *pc++;
|
const Instruction i = *pc++;
|
||||||
StkId ra;
|
|
||||||
if ((L->hookmask & (LUA_MASKLINE | LUA_MASKCOUNT)) &&
|
if ((L->hookmask & (LUA_MASKLINE | LUA_MASKCOUNT)) &&
|
||||||
(--L->hookcount == 0 || L->hookmask & LUA_MASKLINE)) {
|
(--L->hookcount == 0 || L->hookmask & LUA_MASKLINE)) {
|
||||||
traceexec(L, pc);
|
traceexec(L, pc);
|
||||||
@@ -402,26 +429,28 @@ void luaV_execute (lua_State *L, int nexeccalls) {
|
|||||||
}
|
}
|
||||||
base = L->base;
|
base = L->base;
|
||||||
}
|
}
|
||||||
/* warning!! several calls may realloc the stack and invalidate `ra' */
|
|
||||||
ra = RA(i);
|
|
||||||
lua_assert(base == L->base && L->base == L->ci->base);
|
lua_assert(base == L->base && L->base == L->ci->base);
|
||||||
lua_assert(base <= L->top && L->top <= L->stack + L->stacksize);
|
lua_assert(base <= L->top && L->top <= L->stack + L->stacksize);
|
||||||
lua_assert(L->top == L->ci->top || luaG_checkopenop(i));
|
lua_assert(L->top == L->ci->top || luaG_checkopenop(i));
|
||||||
switch (GET_OPCODE(i)) {
|
switch (GET_OPCODE(i)) {
|
||||||
case OP_MOVE: {
|
case OP_MOVE: {
|
||||||
|
StkId ra = RA(i);
|
||||||
setobjs2s(L, ra, RB(i));
|
setobjs2s(L, ra, RB(i));
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
case OP_LOADK: {
|
case OP_LOADK: {
|
||||||
|
StkId ra = RA(i);
|
||||||
setobj2s(L, ra, KBx(i));
|
setobj2s(L, ra, KBx(i));
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
case OP_LOADBOOL: {
|
case OP_LOADBOOL: {
|
||||||
|
StkId ra = RA(i);
|
||||||
setbvalue(ra, GETARG_B(i));
|
setbvalue(ra, GETARG_B(i));
|
||||||
if (GETARG_C(i)) pc++; /* skip next instruction (if C) */
|
if (GETARG_C(i)) pc++; /* skip next instruction (if C) */
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
case OP_LOADNIL: {
|
case OP_LOADNIL: {
|
||||||
|
StkId ra = RA(i);
|
||||||
TValue *rb = RB(i);
|
TValue *rb = RB(i);
|
||||||
do {
|
do {
|
||||||
setnilvalue(rb--);
|
setnilvalue(rb--);
|
||||||
@@ -429,11 +458,13 @@ void luaV_execute (lua_State *L, int nexeccalls) {
|
|||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
case OP_GETUPVAL: {
|
case OP_GETUPVAL: {
|
||||||
|
StkId ra = RA(i);
|
||||||
int b = GETARG_B(i);
|
int b = GETARG_B(i);
|
||||||
setobj2s(L, ra, cl->upvals[b]->v);
|
setobj2s(L, ra, cl->upvals[b]->v);
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
case OP_GETGLOBAL: {
|
case OP_GETGLOBAL: {
|
||||||
|
StkId ra = RA(i);
|
||||||
TValue g;
|
TValue g;
|
||||||
TValue *rb = KBx(i);
|
TValue *rb = KBx(i);
|
||||||
sethvalue(L, &g, cl->env);
|
sethvalue(L, &g, cl->env);
|
||||||
@@ -442,10 +473,14 @@ void luaV_execute (lua_State *L, int nexeccalls) {
|
|||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
case OP_GETTABLE: {
|
case OP_GETTABLE: {
|
||||||
Protect(luaV_gettable(L, RB(i), RKC(i), ra));
|
StkId ra = RA(i);
|
||||||
|
StkId rb = RB(i);
|
||||||
|
TValue *rc = RKC(i);
|
||||||
|
gettableProtected(L, rb, rc, ra);
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
case OP_SETGLOBAL: {
|
case OP_SETGLOBAL: {
|
||||||
|
StkId ra = RA(i);
|
||||||
TValue g;
|
TValue g;
|
||||||
sethvalue(L, &g, cl->env);
|
sethvalue(L, &g, cl->env);
|
||||||
lua_assert(ttisstring(KBx(i)));
|
lua_assert(ttisstring(KBx(i)));
|
||||||
@@ -453,16 +488,21 @@ void luaV_execute (lua_State *L, int nexeccalls) {
|
|||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
case OP_SETUPVAL: {
|
case OP_SETUPVAL: {
|
||||||
|
StkId ra = RA(i);
|
||||||
UpVal *uv = cl->upvals[GETARG_B(i)];
|
UpVal *uv = cl->upvals[GETARG_B(i)];
|
||||||
setobj(L, uv->v, ra);
|
setobj(L, uv->v, ra);
|
||||||
luaC_barrier(L, uv, ra);
|
luaC_barrier(L, uv, ra);
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
case OP_SETTABLE: {
|
case OP_SETTABLE: {
|
||||||
Protect(luaV_settable(L, ra, RKB(i), RKC(i)));
|
StkId ra = RA(i);
|
||||||
|
TValue *rb = RKB(i);
|
||||||
|
TValue *rc = RKC(i);
|
||||||
|
Protect(luaV_settable(L, ra, rb, rc));
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
case OP_NEWTABLE: {
|
case OP_NEWTABLE: {
|
||||||
|
StkId ra = RA(i);
|
||||||
int b = GETARG_B(i);
|
int b = GETARG_B(i);
|
||||||
int c = GETARG_C(i);
|
int c = GETARG_C(i);
|
||||||
sethvalue(L, ra, luaH_new(L, luaO_fb2int(b), luaO_fb2int(c)));
|
sethvalue(L, ra, luaH_new(L, luaO_fb2int(b), luaO_fb2int(c)));
|
||||||
@@ -470,9 +510,11 @@ void luaV_execute (lua_State *L, int nexeccalls) {
|
|||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
case OP_SELF: {
|
case OP_SELF: {
|
||||||
|
StkId ra = RA(i);
|
||||||
StkId rb = RB(i);
|
StkId rb = RB(i);
|
||||||
setobjs2s(L, ra+1, rb);
|
TValue *rc = RKC(i);
|
||||||
Protect(luaV_gettable(L, rb, RKC(i), ra));
|
setobjs2s(L, ra + 1, rb);
|
||||||
|
gettableProtected(L, rb, rc, ra);
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
case OP_ADD: {
|
case OP_ADD: {
|
||||||
@@ -488,6 +530,7 @@ void luaV_execute (lua_State *L, int nexeccalls) {
|
|||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
case OP_DIV: {
|
case OP_DIV: {
|
||||||
|
StkId ra = RA(i);
|
||||||
TValue *rb = RKB(i);
|
TValue *rb = RKB(i);
|
||||||
TValue *rc = RKC(i);
|
TValue *rc = RKC(i);
|
||||||
if (ttisnumber(rb) && ttisnumber(rc)) {
|
if (ttisnumber(rb) && ttisnumber(rc)) {
|
||||||
@@ -503,6 +546,7 @@ void luaV_execute (lua_State *L, int nexeccalls) {
|
|||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
case OP_MOD: {
|
case OP_MOD: {
|
||||||
|
StkId ra = RA(i);
|
||||||
TValue *rb = RKB(i);
|
TValue *rb = RKB(i);
|
||||||
TValue *rc = RKC(i);
|
TValue *rc = RKC(i);
|
||||||
if (ttisnumber(rb) && ttisnumber(rc)) {
|
if (ttisnumber(rb) && ttisnumber(rc)) {
|
||||||
@@ -522,26 +566,27 @@ void luaV_execute (lua_State *L, int nexeccalls) {
|
|||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
case OP_BAND: {
|
case OP_BAND: {
|
||||||
arith_op(luai_numand, TM_AND);
|
arith_op(luai_numand, TM_AND);
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
case OP_BOR: {
|
case OP_BOR: {
|
||||||
arith_op(luai_numor, TM_OR);
|
arith_op(luai_numor, TM_OR);
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
case OP_BXOR: {
|
case OP_BXOR: {
|
||||||
arith_op(luai_numxor, TM_XOR);
|
arith_op(luai_numxor, TM_XOR);
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
case OP_BSHL: {
|
case OP_BSHL: {
|
||||||
arith_op(luai_numshl, TM_SHL);
|
arith_op(luai_numshl, TM_SHL);
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
case OP_BSHR: {
|
case OP_BSHR: {
|
||||||
arith_op(luai_numshr, TM_SHR);
|
arith_op(luai_numshr, TM_SHR);
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
case OP_BNOT: {
|
case OP_BNOT: {
|
||||||
|
StkId ra = RA(i);
|
||||||
TValue *rb = RB(i);
|
TValue *rb = RB(i);
|
||||||
if (ttisnumber(rb)) {
|
if (ttisnumber(rb)) {
|
||||||
lua_Number nb = nvalue(rb);
|
lua_Number nb = nvalue(rb);
|
||||||
@@ -553,6 +598,7 @@ void luaV_execute (lua_State *L, int nexeccalls) {
|
|||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
case OP_UNM: {
|
case OP_UNM: {
|
||||||
|
StkId ra = RA(i);
|
||||||
TValue *rb = RB(i);
|
TValue *rb = RB(i);
|
||||||
if (ttisnumber(rb)) {
|
if (ttisnumber(rb)) {
|
||||||
lua_Number nb = nvalue(rb);
|
lua_Number nb = nvalue(rb);
|
||||||
@@ -564,11 +610,13 @@ void luaV_execute (lua_State *L, int nexeccalls) {
|
|||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
case OP_NOT: {
|
case OP_NOT: {
|
||||||
|
StkId ra = RA(i);
|
||||||
int res = l_isfalse(RB(i)); /* next assignment may change this value */
|
int res = l_isfalse(RB(i)); /* next assignment may change this value */
|
||||||
setbvalue(ra, res);
|
setbvalue(ra, res);
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
case OP_LEN: {
|
case OP_LEN: {
|
||||||
|
StkId ra = RA(i);
|
||||||
TValue *rb = RB(i);
|
TValue *rb = RB(i);
|
||||||
switch (ttype(rb)) {
|
switch (ttype(rb)) {
|
||||||
case LUA_TTABLE: {
|
case LUA_TTABLE: {
|
||||||
@@ -626,12 +674,14 @@ void luaV_execute (lua_State *L, int nexeccalls) {
|
|||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
case OP_TEST: {
|
case OP_TEST: {
|
||||||
|
StkId ra = RA(i);
|
||||||
if (l_isfalse(ra) != GETARG_C(i))
|
if (l_isfalse(ra) != GETARG_C(i))
|
||||||
dojump(L, pc, GETARG_sBx(*pc));
|
dojump(L, pc, GETARG_sBx(*pc));
|
||||||
pc++;
|
pc++;
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
case OP_TESTSET: {
|
case OP_TESTSET: {
|
||||||
|
StkId ra = RA(i);
|
||||||
TValue *rb = RB(i);
|
TValue *rb = RB(i);
|
||||||
if (l_isfalse(rb) != GETARG_C(i)) {
|
if (l_isfalse(rb) != GETARG_C(i)) {
|
||||||
setobjs2s(L, ra, rb);
|
setobjs2s(L, ra, rb);
|
||||||
@@ -641,6 +691,7 @@ void luaV_execute (lua_State *L, int nexeccalls) {
|
|||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
case OP_CALL: {
|
case OP_CALL: {
|
||||||
|
StkId ra = RA(i);
|
||||||
int b = GETARG_B(i);
|
int b = GETARG_B(i);
|
||||||
int nresults = GETARG_C(i) - 1;
|
int nresults = GETARG_C(i) - 1;
|
||||||
if (b != 0) L->top = ra+b; /* else previous instruction set top */
|
if (b != 0) L->top = ra+b; /* else previous instruction set top */
|
||||||
@@ -662,6 +713,7 @@ void luaV_execute (lua_State *L, int nexeccalls) {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
case OP_TAILCALL: {
|
case OP_TAILCALL: {
|
||||||
|
StkId ra = RA(i);
|
||||||
int b = GETARG_B(i);
|
int b = GETARG_B(i);
|
||||||
if (b != 0) L->top = ra+b; /* else previous instruction set top */
|
if (b != 0) L->top = ra+b; /* else previous instruction set top */
|
||||||
L->savedpc = pc;
|
L->savedpc = pc;
|
||||||
@@ -694,6 +746,7 @@ void luaV_execute (lua_State *L, int nexeccalls) {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
case OP_RETURN: {
|
case OP_RETURN: {
|
||||||
|
StkId ra = RA(i);
|
||||||
int b = GETARG_B(i);
|
int b = GETARG_B(i);
|
||||||
if (b != 0) L->top = ra+b-1;
|
if (b != 0) L->top = ra+b-1;
|
||||||
if (L->openupval) luaF_close(L, base);
|
if (L->openupval) luaF_close(L, base);
|
||||||
@@ -709,6 +762,7 @@ void luaV_execute (lua_State *L, int nexeccalls) {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
case OP_FORLOOP: {
|
case OP_FORLOOP: {
|
||||||
|
StkId ra = RA(i);
|
||||||
lua_Number step = nvalue(ra+2);
|
lua_Number step = nvalue(ra+2);
|
||||||
lua_Number idx = luai_numadd(nvalue(ra), step); /* increment index */
|
lua_Number idx = luai_numadd(nvalue(ra), step); /* increment index */
|
||||||
lua_Number limit = nvalue(ra+1);
|
lua_Number limit = nvalue(ra+1);
|
||||||
@@ -721,6 +775,7 @@ void luaV_execute (lua_State *L, int nexeccalls) {
|
|||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
case OP_FORPREP: {
|
case OP_FORPREP: {
|
||||||
|
StkId ra = RA(i);
|
||||||
const TValue *init = ra;
|
const TValue *init = ra;
|
||||||
const TValue *plimit = ra+1;
|
const TValue *plimit = ra+1;
|
||||||
const TValue *pstep = ra+2;
|
const TValue *pstep = ra+2;
|
||||||
@@ -737,6 +792,7 @@ void luaV_execute (lua_State *L, int nexeccalls) {
|
|||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
case OP_TFORLOOP: {
|
case OP_TFORLOOP: {
|
||||||
|
StkId ra = RA(i);
|
||||||
StkId cb = ra + 3; /* call base */
|
StkId cb = ra + 3; /* call base */
|
||||||
setobjs2s(L, cb+2, ra+2);
|
setobjs2s(L, cb+2, ra+2);
|
||||||
setobjs2s(L, cb+1, ra+1);
|
setobjs2s(L, cb+1, ra+1);
|
||||||
@@ -753,6 +809,7 @@ void luaV_execute (lua_State *L, int nexeccalls) {
|
|||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
case OP_SETLIST: {
|
case OP_SETLIST: {
|
||||||
|
StkId ra = RA(i);
|
||||||
int n = GETARG_B(i);
|
int n = GETARG_B(i);
|
||||||
int c = GETARG_C(i);
|
int c = GETARG_C(i);
|
||||||
int last;
|
int last;
|
||||||
@@ -775,10 +832,12 @@ void luaV_execute (lua_State *L, int nexeccalls) {
|
|||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
case OP_CLOSE: {
|
case OP_CLOSE: {
|
||||||
|
StkId ra = RA(i);
|
||||||
luaF_close(L, ra);
|
luaF_close(L, ra);
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
case OP_CLOSURE: {
|
case OP_CLOSURE: {
|
||||||
|
StkId ra = RA(i);
|
||||||
Proto *p;
|
Proto *p;
|
||||||
Closure *ncl;
|
Closure *ncl;
|
||||||
int nup, j;
|
int nup, j;
|
||||||
@@ -799,6 +858,7 @@ void luaV_execute (lua_State *L, int nexeccalls) {
|
|||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
case OP_VARARG: {
|
case OP_VARARG: {
|
||||||
|
StkId ra = RA(i);
|
||||||
int b = GETARG_B(i) - 1;
|
int b = GETARG_B(i) - 1;
|
||||||
int j;
|
int j;
|
||||||
CallInfo *ci = L->ci;
|
CallInfo *ci = L->ci;
|
||||||
|
|||||||
+24
-2
@@ -22,12 +22,34 @@
|
|||||||
(ttype(o1) == ttype(o2) && luaV_equalval(L, o1, o2))
|
(ttype(o1) == ttype(o2) && luaV_equalval(L, o1, o2))
|
||||||
|
|
||||||
|
|
||||||
|
/*
|
||||||
|
** fast track for 'gettable': if 't' is a table and 't[k]' is not nil,
|
||||||
|
** return 1 with 'slot' pointing to 't[k]' (final result). Otherwise,
|
||||||
|
** return 0 (meaning it will have to check metamethod) with 'slot'
|
||||||
|
** pointing to a nil 't[k]' (if 't' is a table) or NULL (otherwise).
|
||||||
|
** 'f' is the raw get function to use.
|
||||||
|
*/
|
||||||
|
#define luaV_fastget(L,t,k,slot,f) \
|
||||||
|
(!ttistable(t) \
|
||||||
|
? (slot = NULL, 0) /* not a table; 'slot' is NULL and result is 0 */ \
|
||||||
|
: (slot = f(hvalue(t), k), /* else, do raw access */ \
|
||||||
|
!ttisnil(slot))) /* result not nil? */
|
||||||
|
|
||||||
|
/*
|
||||||
|
** standard implementation for 'gettable'
|
||||||
|
*/
|
||||||
|
#define luaV_gettable(L,t,k,v) { TValue *slot; \
|
||||||
|
if (luaV_fastget(L,t,k,slot,luaH_get)) { setobj2s(L, v, slot); } \
|
||||||
|
else luaV_finishget(L,t,k,v,slot); }
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
LUAI_FUNC int luaV_lessthan (lua_State *L, TValue *l, TValue *r);
|
LUAI_FUNC int luaV_lessthan (lua_State *L, TValue *l, TValue *r);
|
||||||
LUAI_FUNC int luaV_equalval (lua_State *L, const TValue *t1, const TValue *t2);
|
LUAI_FUNC int luaV_equalval (lua_State *L, const TValue *t1, const TValue *t2);
|
||||||
LUAI_FUNC const TValue *luaV_tonumber (const TValue *obj, TValue *n);
|
LUAI_FUNC const TValue *luaV_tonumber (const TValue *obj, TValue *n);
|
||||||
LUAI_FUNC int luaV_tostring (lua_State *L, StkId obj);
|
LUAI_FUNC int luaV_tostring (lua_State *L, StkId obj);
|
||||||
LUAI_FUNC void luaV_gettable (lua_State *L, TValue *t, TValue *key,
|
LUAI_FUNC void luaV_finishget (lua_State *L, TValue *t, TValue *key,
|
||||||
StkId val);
|
StkId val, TValue *tm);
|
||||||
LUAI_FUNC void luaV_settable (lua_State *L, TValue *t, TValue *key,
|
LUAI_FUNC void luaV_settable (lua_State *L, TValue *t, TValue *key,
|
||||||
StkId val);
|
StkId val);
|
||||||
LUAI_FUNC void luaV_execute (lua_State *L, int nexeccalls);
|
LUAI_FUNC void luaV_execute (lua_State *L, int nexeccalls);
|
||||||
|
|||||||
+66
-4
@@ -1165,6 +1165,39 @@ void VS_Print(vsbuf_t *buf, const char *data)
|
|||||||
//
|
//
|
||||||
// =========================================================================
|
// =========================================================================
|
||||||
|
|
||||||
|
#define NAME cvar_map_t
|
||||||
|
#define KEY_TY const char *
|
||||||
|
#define VAL_TY consvar_t *
|
||||||
|
#define HASH_FN FNV1a_HashLowercaseString
|
||||||
|
#define CMPR_FN vt_cmpr_casestring
|
||||||
|
#include "verstable.h"
|
||||||
|
|
||||||
|
#define NAME netvar_map_t
|
||||||
|
#define KEY_TY UINT16
|
||||||
|
#define VAL_TY consvar_t *
|
||||||
|
#define HASH_FN vt_hash_integer
|
||||||
|
#define CMPR_FN vt_cmpr_integer
|
||||||
|
#include "verstable.h"
|
||||||
|
|
||||||
|
static cvar_map_t cvar_map;
|
||||||
|
static netvar_map_t netvar_map;
|
||||||
|
|
||||||
|
CONSTRUCTOR static void CV_InitMap(void)
|
||||||
|
{
|
||||||
|
// ensure the map is initialized
|
||||||
|
cvar_map_t_init(&cvar_map);
|
||||||
|
cvar_map_t_reserve(&cvar_map, 512);
|
||||||
|
|
||||||
|
netvar_map_t_init(&netvar_map);
|
||||||
|
netvar_map_t_reserve(&netvar_map, 256);
|
||||||
|
}
|
||||||
|
|
||||||
|
DESTRUCTOR static void CV_DestroyMap(void)
|
||||||
|
{
|
||||||
|
cvar_map_t_cleanup(&cvar_map);
|
||||||
|
netvar_map_t_cleanup(&netvar_map);
|
||||||
|
}
|
||||||
|
|
||||||
static const char *cv_null_string = "";
|
static const char *cv_null_string = "";
|
||||||
|
|
||||||
/** Searches if a variable has been registered.
|
/** Searches if a variable has been registered.
|
||||||
@@ -1175,11 +1208,17 @@ static const char *cv_null_string = "";
|
|||||||
*/
|
*/
|
||||||
consvar_t *CV_FindVar(const char *name)
|
consvar_t *CV_FindVar(const char *name)
|
||||||
{
|
{
|
||||||
consvar_t *cvar;
|
cvar_map_t_itr it = cvar_map_t_get(&cvar_map, name);
|
||||||
|
if (!cvar_map_t_is_end(it))
|
||||||
|
return it.data->val;
|
||||||
|
|
||||||
|
// fallback linear search
|
||||||
|
/*
|
||||||
|
consvar_t *cvar;
|
||||||
for (cvar = consvar_vars; cvar; cvar = cvar->next)
|
for (cvar = consvar_vars; cvar; cvar = cvar->next)
|
||||||
if (fasticmp(name,cvar->name))
|
if (fasticmp(name, cvar->name))
|
||||||
return cvar;
|
return cvar;
|
||||||
|
*/
|
||||||
|
|
||||||
return NULL;
|
return NULL;
|
||||||
}
|
}
|
||||||
@@ -1194,7 +1233,7 @@ consvar_t *CV_FindVar(const char *name)
|
|||||||
static inline UINT16 CV_ComputeNetid(const char *s)
|
static inline UINT16 CV_ComputeNetid(const char *s)
|
||||||
{
|
{
|
||||||
UINT16 ret = 0, i = 0;
|
UINT16 ret = 0, i = 0;
|
||||||
static UINT16 premiers[16] = {2, 3, 5, 7, 11, 13, 17, 19, 23, 29, 31, 37, 41, 43, 47, 53};
|
static const UINT16 premiers[16] = {2, 3, 5, 7, 11, 13, 17, 19, 23, 29, 31, 37, 41, 43, 47, 53};
|
||||||
|
|
||||||
while (*s)
|
while (*s)
|
||||||
{
|
{
|
||||||
@@ -1213,11 +1252,17 @@ static inline UINT16 CV_ComputeNetid(const char *s)
|
|||||||
*/
|
*/
|
||||||
static consvar_t *CV_FindNetVar(UINT16 netid)
|
static consvar_t *CV_FindNetVar(UINT16 netid)
|
||||||
{
|
{
|
||||||
|
netvar_map_t_itr it = netvar_map_t_get(&netvar_map, netid);
|
||||||
|
if (!netvar_map_t_is_end(it))
|
||||||
|
return it.data->val;
|
||||||
|
|
||||||
|
/*
|
||||||
consvar_t *cvar;
|
consvar_t *cvar;
|
||||||
|
|
||||||
for (cvar = consvar_vars; cvar; cvar = cvar->next)
|
for (cvar = consvar_vars; cvar; cvar = cvar->next)
|
||||||
if (cvar->netid == netid)
|
if (cvar->netid == netid)
|
||||||
return cvar;
|
return cvar;
|
||||||
|
*/
|
||||||
|
|
||||||
if (netid == 44542) // ouch this hack
|
if (netid == 44542) // ouch this hack
|
||||||
return &cv_karteliminatelast;
|
return &cv_karteliminatelast;
|
||||||
@@ -1283,6 +1328,11 @@ void CV_RegisterVar(consvar_t *variable)
|
|||||||
|
|
||||||
// the SetValue will set this bit
|
// the SetValue will set this bit
|
||||||
variable->flags &= ~CV_MODIFIED;
|
variable->flags &= ~CV_MODIFIED;
|
||||||
|
|
||||||
|
cvar_map_t_insert(&cvar_map, variable->name, variable);
|
||||||
|
|
||||||
|
if (variable->flags & CV_NETVAR)
|
||||||
|
netvar_map_t_insert(&netvar_map, variable->netid, variable);
|
||||||
}
|
}
|
||||||
|
|
||||||
/** Finds the string value of a console variable.
|
/** Finds the string value of a console variable.
|
||||||
@@ -1588,9 +1638,21 @@ size_t CV_LoadNetVars(const UINT8 *bufstart)
|
|||||||
// prevent "invalid command received"
|
// prevent "invalid command received"
|
||||||
serverloading = true;
|
serverloading = true;
|
||||||
|
|
||||||
|
// we can use our netvar map instead of going through all cvars each time
|
||||||
|
netvar_map_t_itr it;
|
||||||
|
for (it = netvar_map_t_first(&netvar_map);
|
||||||
|
!netvar_map_t_is_end(it);
|
||||||
|
it = netvar_map_t_next(it))
|
||||||
|
{
|
||||||
|
cvar = it.data->val;
|
||||||
|
Setvalue(cvar, cvar->defaultvalue, true);
|
||||||
|
}
|
||||||
|
|
||||||
|
/*
|
||||||
for (cvar = consvar_vars; cvar; cvar = cvar->next)
|
for (cvar = consvar_vars; cvar; cvar = cvar->next)
|
||||||
if (cvar->flags & CV_NETVAR)
|
if (cvar->flags & CV_NETVAR)
|
||||||
Setvalue(cvar, cvar->defaultvalue, true);
|
Setvalue(cvar, cvar->defaultvalue, true);
|
||||||
|
*/
|
||||||
|
|
||||||
count = READUINT16(p);
|
count = READUINT16(p);
|
||||||
while (count--)
|
while (count--)
|
||||||
@@ -1793,7 +1855,7 @@ void CV_AddValue(consvar_t *var, INT32 increment)
|
|||||||
if (newvalue == oldvalue)
|
if (newvalue == oldvalue)
|
||||||
break; // don't loop forever if there's none of a certain gametype
|
break; // don't loop forever if there's none of a certain gametype
|
||||||
|
|
||||||
if (newvalue >= 0 && !mapheaderinfo[newvalue])
|
if (newvalue >= 0 && newvalue < NUMMAPS && !mapheaderinfo[newvalue])
|
||||||
continue; // Don't allocate the header. That just makes memory usage skyrocket.
|
continue; // Don't allocate the header. That just makes memory usage skyrocket.
|
||||||
|
|
||||||
} while (!M_CanShowLevelInList(newvalue, gt));
|
} while (!M_CanShowLevelInList(newvalue, gt));
|
||||||
|
|||||||
+196
-83
@@ -46,16 +46,16 @@
|
|||||||
#ifdef HAVE_THREADS
|
#ifdef HAVE_THREADS
|
||||||
I_mutex con_mutex;
|
I_mutex con_mutex;
|
||||||
|
|
||||||
// g_in_exiting_signal_handler is an evil hack
|
// I_In_Exiting_Signal_Handler is an evil hack
|
||||||
// to avoid infinite SIGABRT recursion in the signal handler
|
// to avoid infinite SIGABRT recursion in the signal handler
|
||||||
// due to poisoned locks or mach-o kernel not supporting locks in signals
|
// due to poisoned locks or mach-o kernel not supporting locks in signals
|
||||||
// or something like that. idk
|
// or something like that. idk
|
||||||
# define Lock_state() if (!g_in_exiting_signal_handler) { I_lock_mutex(&con_mutex); }
|
# define Lock_state() if (!I_In_Exiting_Signal_Handler()) { I_lock_mutex(&con_mutex); }
|
||||||
# define Unlock_state() if (!g_in_exiting_signal_handler) { I_unlock_mutex(con_mutex); }
|
# define Unlock_state() if (!I_In_Exiting_Signal_Handler()) { I_unlock_mutex(con_mutex); }
|
||||||
#else/*HAVE_THREADS*/
|
#else /*HAVE_THREADS*/
|
||||||
# define Lock_state()
|
# define Lock_state()
|
||||||
# define Unlock_state()
|
# define Unlock_state()
|
||||||
#endif/*HAVE_THREADS*/
|
#endif /*HAVE_THREADS*/
|
||||||
|
|
||||||
static boolean con_started = false; // console has been initialised
|
static boolean con_started = false; // console has been initialised
|
||||||
boolean con_startup = false; // true at game startup, screen need refreshing
|
boolean con_startup = false; // true at game startup, screen need refreshing
|
||||||
@@ -208,14 +208,6 @@ static void CONS_Clear_f(void)
|
|||||||
Unlock_state();
|
Unlock_state();
|
||||||
}
|
}
|
||||||
|
|
||||||
// Choose english keymap
|
|
||||||
//
|
|
||||||
/*static void CONS_English_f(void)
|
|
||||||
{
|
|
||||||
shiftxform = english_shiftxform;
|
|
||||||
CONS_Printf(M_GetText("%s keymap.\n"), M_GetText("English"));
|
|
||||||
}*/
|
|
||||||
|
|
||||||
static char *bindtable[NUMINPUTS];
|
static char *bindtable[NUMINPUTS];
|
||||||
|
|
||||||
static void CONS_Bind_f(void)
|
static void CONS_Bind_f(void)
|
||||||
@@ -633,72 +625,191 @@ void CON_MoveConsole(void)
|
|||||||
Unlock_state();
|
Unlock_state();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
//======================================================================
|
||||||
|
// KEYBOARD LAYOUTS FOR ENTERING TEXT
|
||||||
|
//======================================================================
|
||||||
|
|
||||||
|
static char english_shiftxform[] =
|
||||||
|
{
|
||||||
|
0,
|
||||||
|
1, 2, 3, 4, 5, 6, 7, 8, 9, 10,
|
||||||
|
11, 12, 13, 14, 15, 16, 17, 18, 19, 20,
|
||||||
|
21, 22, 23, 24, 25, 26, 27, 28, 29, 30,
|
||||||
|
31,
|
||||||
|
' ', '!', '"', '#', '$', '%', '&',
|
||||||
|
'"', // shift-'
|
||||||
|
'(', ')', '*', '+',
|
||||||
|
'<', // shift-,
|
||||||
|
'_', // shift--
|
||||||
|
'>', // shift-.
|
||||||
|
'?', // shift-/
|
||||||
|
')', // shift-0
|
||||||
|
'!', // shift-1
|
||||||
|
'@', // shift-2
|
||||||
|
'#', // shift-3
|
||||||
|
'$', // shift-4
|
||||||
|
'%', // shift-5
|
||||||
|
'^', // shift-6
|
||||||
|
'&', // shift-7
|
||||||
|
'*', // shift-8
|
||||||
|
'(', // shift-9
|
||||||
|
':',
|
||||||
|
':', // shift-;
|
||||||
|
'<',
|
||||||
|
'+', // shift-=
|
||||||
|
'>', '?', '@',
|
||||||
|
'A', 'B', 'C', 'D', 'E', 'F', 'G', 'H', 'I', 'J', 'K', 'L', 'M', 'N',
|
||||||
|
'O', 'P', 'Q', 'R', 'S', 'T', 'U', 'V', 'W', 'X', 'Y', 'Z',
|
||||||
|
'{', // shift-[
|
||||||
|
'|', // shift-backslash - OH MY GOD DOES WATCOM SUCK
|
||||||
|
'}', // shift-]
|
||||||
|
'"', '_',
|
||||||
|
'~', // shift-`
|
||||||
|
'A', 'B', 'C', 'D', 'E', 'F', 'G', 'H', 'I', 'J', 'K', 'L', 'M', 'N',
|
||||||
|
'O', 'P', 'Q', 'R', 'S', 'T', 'U', 'V', 'W', 'X', 'Y', 'Z',
|
||||||
|
'{', '|', '}', '~', 127
|
||||||
|
};
|
||||||
|
|
||||||
|
static char french_shiftxform[] =
|
||||||
|
{
|
||||||
|
0,
|
||||||
|
1, 2, 3, 4, 5, 6, 7, 8, 9, 10,
|
||||||
|
11, 12, 13, 14, 15, 16, 17, 18, 19, 20,
|
||||||
|
21, 22, 23, 24, 25, 26, 27, 28, 29, 30,
|
||||||
|
31,
|
||||||
|
' ','$', //shift-!
|
||||||
|
'3', //shift-"
|
||||||
|
'#', '$', '%',
|
||||||
|
'1', //shift-&
|
||||||
|
'4', // shift-'
|
||||||
|
'5', // shift-(
|
||||||
|
')', // shift-)
|
||||||
|
'*', '+',
|
||||||
|
'?', // shift-,
|
||||||
|
'6', // shift--
|
||||||
|
'.', '/',
|
||||||
|
'0', '1', '2', '3', '4', '5',
|
||||||
|
'6', '7', '8', '9',
|
||||||
|
'/', // shitf-:
|
||||||
|
'.', // shift-;
|
||||||
|
'>', // shift-<
|
||||||
|
'+', // shift-=
|
||||||
|
'>', '?', '@',
|
||||||
|
'A', 'B', 'C', 'D', 'E', 'F', 'G', 'H', 'I', 'J', 'K', 'L', 'M', 'N',
|
||||||
|
'O', 'P', 'Q', 'R', 'S', 'T', 'U', 'V', 'W', 'X', 'Y', 'Z',
|
||||||
|
'[', '\\', ']', '^',
|
||||||
|
'8', //shift-_
|
||||||
|
'`',
|
||||||
|
'A', 'B', 'C', 'D', 'E', 'F', 'G', 'H', 'I', 'J', 'K', 'L', 'M', 'N',
|
||||||
|
'O', 'P', 'Q', 'R', 'S', 'T', 'U', 'V', 'W', 'X', 'Y', 'Z',
|
||||||
|
'{', '|', '}', '~', 127,
|
||||||
|
128, 129,
|
||||||
|
'2',
|
||||||
|
131, 132,
|
||||||
|
'0',
|
||||||
|
134,
|
||||||
|
'9',
|
||||||
|
136, 137,
|
||||||
|
'7',
|
||||||
|
139, 140,
|
||||||
|
'%'
|
||||||
|
};
|
||||||
|
|
||||||
|
static char french_altgrxform[] =
|
||||||
|
{
|
||||||
|
0,
|
||||||
|
1, 2, 3, 4, 5, 6, 7, 8, 9, 10,
|
||||||
|
11, 12, 13, 14, 15, 16, 17, 18, 19, 20,
|
||||||
|
21, 22, 23, 24, 25, 26, 27, 28, 29, 30,
|
||||||
|
31,
|
||||||
|
' ', '!',
|
||||||
|
'#', //altgr-"
|
||||||
|
'#', '$', '%', '&',
|
||||||
|
'{', //altgr-'
|
||||||
|
'[', //altgr-(
|
||||||
|
']', //altgr-)
|
||||||
|
'*', '+', ',',
|
||||||
|
'|', //altg--
|
||||||
|
'.', '/',
|
||||||
|
'0', '1', '2', '3', '4', '5',
|
||||||
|
'6', '7', '8', '9',
|
||||||
|
':', ';', '<',
|
||||||
|
'}', //altgr-=
|
||||||
|
'>', '?', '@',
|
||||||
|
'A', 'B', 'C', 'D', 'E', 'F', 'G', 'H', 'I', 'J', 'K', 'L', 'M', 'N',
|
||||||
|
'O', 'P', 'Q', 'R', 'S', 'T', 'U', 'V', 'W', 'X', 'Y', 'Z',
|
||||||
|
'[', '\\', ']', '^',
|
||||||
|
'\\', //altgr-backslash
|
||||||
|
'`',
|
||||||
|
'a', 'b', 'c', 'd', 'E', 'f', 'g', 'h', 'i', 'j', 'k', 'l', 'm', 'n',
|
||||||
|
'o', 'p', 'q', 'r', 's', 't', 'u', 'v', 'w', 'x', 'y', 'z',
|
||||||
|
'{', '|', '}', '~', 127,
|
||||||
|
128, 129,
|
||||||
|
'~',
|
||||||
|
131, 132,
|
||||||
|
'@',
|
||||||
|
134,
|
||||||
|
'^',
|
||||||
|
136, 137,
|
||||||
|
'`',
|
||||||
|
139, 140,
|
||||||
|
KEY_FR_U_GRAVE
|
||||||
|
};
|
||||||
|
|
||||||
|
// fallback for special letter non displayable in the game (i.e.: 'é','à',etc.)
|
||||||
|
static INT32 CON_FallBackFrSpecialLetter(INT32 key)
|
||||||
|
{
|
||||||
|
switch (key)
|
||||||
|
{
|
||||||
|
case KEY_FR_E_AIGUE: return 'e';
|
||||||
|
case KEY_FR_E_GRAVE: return 'e';
|
||||||
|
case KEY_FR_C_CEDILLE: return 'c';
|
||||||
|
case KEY_FR_A_GRAVE: return 'a';
|
||||||
|
case KEY_FR_U_GRAVE: return 'u';
|
||||||
|
default: return key;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// goddang AZERTY
|
||||||
|
static size_t CON_GetShiftSize(void)
|
||||||
|
{
|
||||||
|
return ((cv_keyboardlayout.value == 3) ? sizeof(french_shiftxform) : sizeof(english_shiftxform));
|
||||||
|
}
|
||||||
|
|
||||||
|
static char *CON_Shiftform(void)
|
||||||
|
{
|
||||||
|
return (cv_keyboardlayout.value == 3) ? french_shiftxform : english_shiftxform;
|
||||||
|
}
|
||||||
|
|
||||||
INT32 CON_ShiftChar(INT32 ch)
|
INT32 CON_ShiftChar(INT32 ch)
|
||||||
{
|
{
|
||||||
if (I_UseNativeKeyboard())
|
if (I_UseNativeKeyboard() || ch >= (INT32)CON_GetShiftSize())
|
||||||
return ch;
|
return ch;
|
||||||
|
|
||||||
|
// warning: shiftdown is NOT a boolean, it's 1 or 2 for lshift/rshift
|
||||||
if ((ch >= 'a' && ch <= 'z') || (ch >= 'A' && ch <= 'Z'))
|
if ((ch >= 'a' && ch <= 'z') || (ch >= 'A' && ch <= 'Z'))
|
||||||
{
|
{
|
||||||
if (cv_keyboardlayout.value == 3)
|
return !!shiftdown != capslock ? CON_Shiftform()[ch] : ch;
|
||||||
{
|
|
||||||
if (shiftdown ^ capslock)
|
|
||||||
ch = shiftxform[ch];
|
|
||||||
else if (altdown & 0x2)
|
|
||||||
ch = french_altgrxform[ch];
|
|
||||||
else
|
|
||||||
ch = HU_FallBackFrSpecialLetter(ch);
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
if (shiftdown ^ capslock)
|
|
||||||
ch = shiftxform[ch];
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
else // if we're holding shift we should still shift non letter symbols
|
|
||||||
|
// if we're holding shift we should still shift non letter symbols
|
||||||
|
if (shiftdown)
|
||||||
{
|
{
|
||||||
if (cv_keyboardlayout.value == 3)
|
return CON_Shiftform()[ch];
|
||||||
{
|
}
|
||||||
if (shiftdown)
|
|
||||||
ch = shiftxform[ch];
|
// AZERTY
|
||||||
else if (altdown & 0x2)
|
if (cv_keyboardlayout.value == 3)
|
||||||
ch = french_altgrxform[ch];
|
{
|
||||||
else
|
if (altdown & 0x2)
|
||||||
ch = HU_FallBackFrSpecialLetter(ch);
|
return french_altgrxform[ch];
|
||||||
}
|
|
||||||
else
|
return CON_FallBackFrSpecialLetter(ch);
|
||||||
{
|
|
||||||
if (shiftdown)
|
|
||||||
ch = shiftxform[ch];
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
return ch;
|
return ch;
|
||||||
}
|
}
|
||||||
|
|
||||||
INT32 CON_ShitAndAltGrChar(INT32 ch)
|
|
||||||
{
|
|
||||||
if ((ch >= 'a' && ch <= 'z') || (ch >= 'A' && ch <= 'Z'))
|
|
||||||
{
|
|
||||||
if (shiftdown ^ capslock)
|
|
||||||
ch = shiftxform[ch];
|
|
||||||
}
|
|
||||||
else // if we're holding shift we should still shift non letter symbols
|
|
||||||
{
|
|
||||||
if (shiftdown)
|
|
||||||
ch = shiftxform[ch];
|
|
||||||
else if (altdown & 0x2)
|
|
||||||
{
|
|
||||||
ch = french_altgrxform[ch];
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
ch = HU_FallBackFrSpecialLetter(ch);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
return ch;
|
|
||||||
}
|
|
||||||
|
|
||||||
// Clear time of console heads up messages
|
// Clear time of console heads up messages
|
||||||
//
|
//
|
||||||
@@ -892,7 +1003,7 @@ boolean CON_Responder(event_t *ev)
|
|||||||
return true;
|
return true;
|
||||||
|
|
||||||
// ctrl modifier -- changes behavior, adds shortcuts
|
// ctrl modifier -- changes behavior, adds shortcuts
|
||||||
if ((cv_keyboardlayout.value != 3 && ctrldown) || (cv_keyboardlayout.value == 3 && ctrldown && !altdown))
|
if (ctrldown && (cv_keyboardlayout.value != 3 || !altdown))
|
||||||
{
|
{
|
||||||
// show all cvars/commands that match what we have inputted
|
// show all cvars/commands that match what we have inputted
|
||||||
if (key == KEY_TAB)
|
if (key == KEY_TAB)
|
||||||
@@ -1222,19 +1333,10 @@ void CON_LogMessage(const char *msg)
|
|||||||
// Console print! Wahooo! Lots o fun!
|
// Console print! Wahooo! Lots o fun!
|
||||||
//
|
//
|
||||||
|
|
||||||
void CONS_Printf(const char *fmt, ...)
|
static inline void CONS_PrintMsg(char *txt)
|
||||||
{
|
{
|
||||||
va_list argptr;
|
|
||||||
static char *txt = NULL;
|
|
||||||
boolean startup;
|
boolean startup;
|
||||||
|
|
||||||
if (txt == NULL)
|
|
||||||
txt = malloc(8192);
|
|
||||||
|
|
||||||
va_start(argptr, fmt);
|
|
||||||
vsnprintf(txt, 8192, fmt, argptr);
|
|
||||||
va_end(argptr);
|
|
||||||
|
|
||||||
// echo console prints to log file
|
// echo console prints to log file
|
||||||
DEBFILE(txt);
|
DEBFILE(txt);
|
||||||
|
|
||||||
@@ -1260,6 +1362,21 @@ void CONS_Printf(const char *fmt, ...)
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
void CONS_Printf(const char *fmt, ...)
|
||||||
|
{
|
||||||
|
va_list argptr;
|
||||||
|
static char *txt = NULL;
|
||||||
|
|
||||||
|
if (txt == NULL)
|
||||||
|
txt = malloc(8192);
|
||||||
|
|
||||||
|
va_start(argptr, fmt);
|
||||||
|
vsnprintf(txt, 8192, fmt, argptr);
|
||||||
|
va_end(argptr);
|
||||||
|
|
||||||
|
CONS_PrintMsg(txt);
|
||||||
|
}
|
||||||
|
|
||||||
void CONS_Alert(alerttype_t level, const char *fmt, ...)
|
void CONS_Alert(alerttype_t level, const char *fmt, ...)
|
||||||
{
|
{
|
||||||
va_list argptr;
|
va_list argptr;
|
||||||
@@ -1288,9 +1405,7 @@ void CONS_Alert(alerttype_t level, const char *fmt, ...)
|
|||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
|
||||||
// I am lazy and I feel like just letting CONS_Printf take care of things.
|
CONS_PrintMsg(txt);
|
||||||
// Is that okay?
|
|
||||||
CONS_Printf("%s", txt);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
void CONS_Debug(INT32 debugflags, const char *fmt, ...)
|
void CONS_Debug(INT32 debugflags, const char *fmt, ...)
|
||||||
@@ -1308,11 +1423,9 @@ void CONS_Debug(INT32 debugflags, const char *fmt, ...)
|
|||||||
vsnprintf(txt, 8192, fmt, argptr);
|
vsnprintf(txt, 8192, fmt, argptr);
|
||||||
va_end(argptr);
|
va_end(argptr);
|
||||||
|
|
||||||
// Again I am lazy, oh well
|
CONS_PrintMsg(txt);
|
||||||
CONS_Printf("%s", txt);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
// Print an error message, and wait for ENTER key to continue.
|
// Print an error message, and wait for ENTER key to continue.
|
||||||
// To make sure the user has seen the message
|
// To make sure the user has seen the message
|
||||||
//
|
//
|
||||||
|
|||||||
+8
-1
@@ -13,6 +13,10 @@
|
|||||||
#ifndef __CONSOLE__
|
#ifndef __CONSOLE__
|
||||||
#define __CONSOLE__
|
#define __CONSOLE__
|
||||||
|
|
||||||
|
#ifdef __cplusplus
|
||||||
|
extern "C" {
|
||||||
|
#endif
|
||||||
|
|
||||||
#include "d_event.h"
|
#include "d_event.h"
|
||||||
#include "command.h"
|
#include "command.h"
|
||||||
#include "i_threads.h"
|
#include "i_threads.h"
|
||||||
@@ -45,7 +49,6 @@ extern UINT8 *yellowmap, *purplemap, *greenmap, *bluemap, *graymap, *redmap, *or
|
|||||||
extern UINT8 *consolebgmap;
|
extern UINT8 *consolebgmap;
|
||||||
|
|
||||||
INT32 CON_ShiftChar(INT32 ch);
|
INT32 CON_ShiftChar(INT32 ch);
|
||||||
INT32 CON_ShitAndAltGrChar(INT32 ch);
|
|
||||||
|
|
||||||
void CON_SetupBackColormap(void);
|
void CON_SetupBackColormap(void);
|
||||||
void CON_ClearHUD(void); // clear heads up messages
|
void CON_ClearHUD(void); // clear heads up messages
|
||||||
@@ -63,4 +66,8 @@ boolean CON_Ready(void);
|
|||||||
|
|
||||||
void CON_LogMessage(const char *msg);
|
void CON_LogMessage(const char *msg);
|
||||||
|
|
||||||
|
#ifdef __cplusplus
|
||||||
|
} // extern "C"
|
||||||
|
#endif
|
||||||
|
|
||||||
#endif
|
#endif
|
||||||
+557
-404
File diff suppressed because it is too large.
Load diff
+7
-3
@@ -600,6 +600,8 @@ extern consvar_t cv_discordinvites;
|
|||||||
|
|
||||||
extern consvar_t cv_serverinfoscreen;
|
extern consvar_t cv_serverinfoscreen;
|
||||||
|
|
||||||
|
extern consvar_t cv_serveraddoninfo;
|
||||||
|
|
||||||
// Used in d_net, the only dependence
|
// Used in d_net, the only dependence
|
||||||
//tic_t ExpandTics(INT32 low, tic_t basetic);
|
//tic_t ExpandTics(INT32 low, tic_t basetic);
|
||||||
void D_ClientServerInit(void);
|
void D_ClientServerInit(void);
|
||||||
@@ -654,15 +656,17 @@ void D_ResetTiccmds(void);
|
|||||||
|
|
||||||
tic_t GetLag(INT32 node);
|
tic_t GetLag(INT32 node);
|
||||||
|
|
||||||
extern UINT8 hu_resynching;
|
extern boolean hu_resynching;
|
||||||
#ifdef SATURNPAK
|
#ifdef SATURNPAK
|
||||||
extern UINT8 hu_redownloadinggamestate;
|
extern boolean hu_redownloadinggamestate;
|
||||||
#endif
|
#endif
|
||||||
extern boolean hu_stopped; // kart, true when the game is stopped for players due to a disconnecting or connecting player
|
extern boolean hu_stopped; // kart, true when the game is stopped for players due to a disconnecting or connecting player
|
||||||
|
|
||||||
|
#define SAVEGAMESIZE (768*1024)
|
||||||
|
|
||||||
typedef struct rewind_s
|
typedef struct rewind_s
|
||||||
{
|
{
|
||||||
UINT8 savebuffer[(768*1024)];
|
UINT8 savebuffer[SAVEGAMESIZE];
|
||||||
tic_t leveltime;
|
tic_t leveltime;
|
||||||
size_t demopos;
|
size_t demopos;
|
||||||
|
|
||||||
|
|||||||
+116
-97
@@ -130,14 +130,15 @@ static size_t startuppwadcount = 0;
|
|||||||
// autoloading
|
// autoloading
|
||||||
static char *autoloadwadfiles[MAX_WADFILES];
|
static char *autoloadwadfiles[MAX_WADFILES];
|
||||||
static char *autoloadwadfilespost[MAX_WADFILES];
|
static char *autoloadwadfilespost[MAX_WADFILES];
|
||||||
static size_t autoloadcount = 0;
|
static size_t autoloadwadcount = 0;
|
||||||
static size_t postloadcount = 0;
|
static size_t postloadwadcount = 0;
|
||||||
//
|
//
|
||||||
|
|
||||||
boolean devparm = false; // started game with -devparm
|
boolean devparm = false; // started game with -devparm
|
||||||
|
|
||||||
boolean singletics = false; // timedemo
|
boolean singletics = false; // timedemo
|
||||||
boolean lastdraw = false;
|
boolean lastdraw = false;
|
||||||
|
boolean intermissionbginit = false;
|
||||||
|
|
||||||
#ifdef MOTIONBLUR
|
#ifdef MOTIONBLUR
|
||||||
INT32 postimgparam[MAXSPLITSCREENPLAYERS];
|
INT32 postimgparam[MAXSPLITSCREENPLAYERS];
|
||||||
@@ -274,21 +275,17 @@ static void D_Renderview(void)
|
|||||||
|
|
||||||
R_ApplyLevelInterpolators(R_GetTimeFrac(RTF_LEVEL));
|
R_ApplyLevelInterpolators(R_GetTimeFrac(RTF_LEVEL));
|
||||||
|
|
||||||
if (rendermode == render_soft)
|
if (rendermode == render_soft && cv_homremoval.value)
|
||||||
{
|
{
|
||||||
// if this is display player 1
|
if (cv_homremoval.value == 1)
|
||||||
if (cv_homremoval.value)
|
|
||||||
{
|
{
|
||||||
if (cv_homremoval.value == 1)
|
// Clear the software screen buffer to remove HOM
|
||||||
{
|
memset(vid.screens[0], 31, vid.width * vid.height);
|
||||||
// Clear the software screen buffer to remove HOM
|
}
|
||||||
memset(vid.screens[0], 31, vid.width * vid.height);
|
else if (cv_homremoval.value == 2)
|
||||||
}
|
{
|
||||||
else if (cv_homremoval.value == 2)
|
//'development' HOM removal -- makes it blindingly obvious if HOM is spotted.
|
||||||
{
|
memset(vid.screens[0], 32+(timeinmap&15), vid.width * vid.height);
|
||||||
//'development' HOM removal -- makes it blindingly obvious if HOM is spotted.
|
|
||||||
memset(vid.screens[0], 32+(timeinmap&15), vid.width * vid.height);
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -322,7 +319,6 @@ static void D_Renderview(void)
|
|||||||
break;
|
break;
|
||||||
default: // Initialize for P1
|
default: // Initialize for P1
|
||||||
viewwindowy = viewwindowx = 0;
|
viewwindowy = viewwindowx = 0;
|
||||||
objectsdrawn = 0;
|
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -333,19 +329,17 @@ static void D_Renderview(void)
|
|||||||
}
|
}
|
||||||
else if (rendermode == render_soft)
|
else if (rendermode == render_soft)
|
||||||
#endif
|
#endif
|
||||||
|
{
|
||||||
R_RenderPlayerView(&players[displayplayers[i]]);
|
R_RenderPlayerView(&players[displayplayers[i]]);
|
||||||
}
|
|
||||||
|
|
||||||
if (rendermode == render_soft)
|
|
||||||
{
|
|
||||||
if (i == 0)
|
|
||||||
R_ApplyViewMorph();
|
|
||||||
|
|
||||||
|
if (i == 0)
|
||||||
|
R_ApplyViewMorph();
|
||||||
#ifdef MOTIONBLUR
|
#ifdef MOTIONBLUR
|
||||||
V_DoPostProcessor(i, postimgparam[i]);
|
V_DoPostProcessor(i, postimgparam[i]);
|
||||||
#else
|
#else
|
||||||
V_DoPostProcessor(i, 0);
|
V_DoPostProcessor(i, 0);
|
||||||
#endif
|
#endif
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -369,6 +363,33 @@ static void D_Renderview(void)
|
|||||||
// added comment : there is a wipe eatch change of the gamestate
|
// added comment : there is a wipe eatch change of the gamestate
|
||||||
gamestate_t wipegamestate = GS_LEVEL;
|
gamestate_t wipegamestate = GS_LEVEL;
|
||||||
|
|
||||||
|
static void D_MakeIntermissionBG(void)
|
||||||
|
{
|
||||||
|
if (!lastdraw)
|
||||||
|
return;
|
||||||
|
|
||||||
|
if (rendermode == render_none)
|
||||||
|
{
|
||||||
|
lastdraw = false;
|
||||||
|
intermissionbginit = false;
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
#ifdef HWRENDER
|
||||||
|
if (rendermode == render_opengl)
|
||||||
|
{
|
||||||
|
HWR_MakeScreenTexture();
|
||||||
|
}
|
||||||
|
else
|
||||||
|
#endif
|
||||||
|
{
|
||||||
|
VID_BlitLinearScreen(vid.screens[0], vid.screens[1], vid.width, vid.height, vid.width, vid.width);
|
||||||
|
}
|
||||||
|
|
||||||
|
lastdraw = false;
|
||||||
|
intermissionbginit = true;
|
||||||
|
}
|
||||||
|
|
||||||
static boolean D_Display(void)
|
static boolean D_Display(void)
|
||||||
{
|
{
|
||||||
boolean ranwipe = false;
|
boolean ranwipe = false;
|
||||||
@@ -534,16 +555,8 @@ static boolean D_Display(void)
|
|||||||
PS_START_TIMING(ps_rendercalltime);
|
PS_START_TIMING(ps_rendercalltime);
|
||||||
D_Renderview();
|
D_Renderview();
|
||||||
PS_STOP_TIMING(ps_rendercalltime);
|
PS_STOP_TIMING(ps_rendercalltime);
|
||||||
}
|
|
||||||
|
|
||||||
if (lastdraw)
|
D_MakeIntermissionBG();
|
||||||
{
|
|
||||||
if (rendermode == render_soft)
|
|
||||||
{
|
|
||||||
VID_BlitLinearScreen(vid.screens[0], vid.screens[1], vid.width, vid.height, vid.width, vid.width);
|
|
||||||
}
|
|
||||||
|
|
||||||
lastdraw = false;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
PS_START_TIMING(ps_uitime);
|
PS_START_TIMING(ps_uitime);
|
||||||
@@ -664,7 +677,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;
|
UINT64 precision = 0;
|
||||||
|
|
||||||
boolean interp = false;
|
boolean interp = false;
|
||||||
boolean doDisplay = false;
|
boolean doDisplay = false;
|
||||||
@@ -709,8 +722,15 @@ void D_SRB2Loop(void)
|
|||||||
precise_t elapsed;
|
precise_t elapsed;
|
||||||
precise_t enterprecise, finishprecise;
|
precise_t enterprecise, finishprecise;
|
||||||
|
|
||||||
|
boolean ranwipe = false;
|
||||||
|
|
||||||
enterprecise = I_GetPreciseTime();
|
enterprecise = I_GetPreciseTime();
|
||||||
|
|
||||||
|
if (I_Interrupted())
|
||||||
|
{
|
||||||
|
I_Quit();
|
||||||
|
}
|
||||||
|
|
||||||
memset(&g_dc, 0, sizeof(g_dc));
|
memset(&g_dc, 0, sizeof(g_dc));
|
||||||
Z_Frame_Reset();
|
Z_Frame_Reset();
|
||||||
|
|
||||||
@@ -718,8 +738,6 @@ void D_SRB2Loop(void)
|
|||||||
const UINT32 framecap = R_GetFramerateCap();
|
const UINT32 framecap = R_GetFramerateCap();
|
||||||
capbudget = (framecap == 0) ? 0 : (precise_t)((double)precision / (double)framecap + 0.5); // + 0.5 instead of round
|
capbudget = (framecap == 0) ? 0 : (precise_t)((double)precision / (double)framecap + 0.5); // + 0.5 instead of round
|
||||||
|
|
||||||
boolean ranwipe = false;
|
|
||||||
|
|
||||||
I_UpdateTime(cv_timescale.value);
|
I_UpdateTime(cv_timescale.value);
|
||||||
|
|
||||||
if (lastwipetic)
|
if (lastwipetic)
|
||||||
@@ -783,11 +801,6 @@ void D_SRB2Loop(void)
|
|||||||
|
|
||||||
doDisplay = true;
|
doDisplay = true;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (!dedicated)
|
|
||||||
{
|
|
||||||
G_DeviceLEDTick();
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
if (interp)
|
if (interp)
|
||||||
@@ -829,6 +842,13 @@ void D_SRB2Loop(void)
|
|||||||
if (takescreenshot)
|
if (takescreenshot)
|
||||||
M_DoScreenShot();
|
M_DoScreenShot();
|
||||||
|
|
||||||
|
#ifndef DEDICATED
|
||||||
|
if (!dedicated && renderisnewtic)
|
||||||
|
{
|
||||||
|
G_DeviceLEDTick();
|
||||||
|
}
|
||||||
|
#endif
|
||||||
|
|
||||||
// consoleplayer -> displayplayers (hear sounds from viewpoint)
|
// consoleplayer -> displayplayers (hear sounds from viewpoint)
|
||||||
S_UpdateSounds(); // move positional sounds
|
S_UpdateSounds(); // move positional sounds
|
||||||
|
|
||||||
@@ -907,7 +927,9 @@ void D_ClearState(void)
|
|||||||
|
|
||||||
// okay, stop now
|
// okay, stop now
|
||||||
// (otherwise the game still thinks we're playing!)
|
// (otherwise the game still thinks we're playing!)
|
||||||
|
#ifdef HAVE_CURL
|
||||||
CURLAbortFile();
|
CURLAbortFile();
|
||||||
|
#endif
|
||||||
SV_StopServer();
|
SV_StopServer();
|
||||||
SV_ResetServer();
|
SV_ResetServer();
|
||||||
|
|
||||||
@@ -971,6 +993,9 @@ void D_ClearState(void)
|
|||||||
//
|
//
|
||||||
void D_StartTitle(void)
|
void D_StartTitle(void)
|
||||||
{
|
{
|
||||||
|
if (dedicated)
|
||||||
|
I_Error("D_StartTitle is called on dedicated server");
|
||||||
|
|
||||||
D_ClearState();
|
D_ClearState();
|
||||||
multiplayer = netgame = false; // title menu shouldnt be a netgame or multiplayer lmao
|
multiplayer = netgame = false; // title menu shouldnt be a netgame or multiplayer lmao
|
||||||
F_StartTitleScreen();
|
F_StartTitleScreen();
|
||||||
@@ -1032,25 +1057,38 @@ static INT32 D_DetectFileType(const char* filename)
|
|||||||
}
|
}
|
||||||
|
|
||||||
// autoload that shit
|
// autoload that shit
|
||||||
static void D_AutoloadFile(const char *file, char **filearray, size_t index)
|
static void D_AutoloadFile(const char *file, char **filearray, size_t *index)
|
||||||
{
|
{
|
||||||
char *newfile;
|
char *newfile;
|
||||||
INT32 fileType = D_DetectFileType(file);
|
INT32 fileType = D_DetectFileType(file);
|
||||||
|
|
||||||
|
if (*index >= MAX_WADFILES)
|
||||||
|
{
|
||||||
|
CONS_Printf("D_AutoloadFile: Failed to add file %s! Too many autoloaded files\n", file);
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
if (!fileType)
|
if (!fileType)
|
||||||
{
|
{
|
||||||
CONS_Printf("D_AutoloadFile: File %s is unknown or invalid\n", file);
|
CONS_Printf("D_AutoloadFile: File %s is unknown or invalid\n", file);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if (fileType == 1)
|
||||||
|
{
|
||||||
|
CONS_Printf("D_AutoloadFile: File %s is a directory\n", file);
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
if (fileType <= 6)
|
if (fileType <= 6)
|
||||||
{
|
{
|
||||||
newfile = malloc(strlen(file) + 1);
|
newfile = malloc(strlen(file) + 1);
|
||||||
if (!newfile)
|
if (!newfile)
|
||||||
I_Error("No more free memory to AutoloadFile %s",file);
|
I_Error("D_AutoloadFile: No more free memory to autoload file %s", file);
|
||||||
|
|
||||||
strcpy(newfile, file);
|
strcpy(newfile, file);
|
||||||
filearray[index] = newfile;
|
filearray[*index] = newfile;
|
||||||
|
(*index)++;
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
@@ -1093,7 +1131,7 @@ static void D_FindAddonsToAutoload(void)
|
|||||||
// If the file is found, run our shit
|
// If the file is found, run our shit
|
||||||
if (!autoloadconfigfile) // nope outta here
|
if (!autoloadconfigfile) // nope outta here
|
||||||
{
|
{
|
||||||
autoloadcount = postloadcount = 0; // so D_AddAutoloadFiles can skip everything since nothings there to autoload
|
autoloadwadcount = postloadwadcount = 0; // so D_AddAutoloadFiles can skip everything since nothings there to autoload
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -1119,27 +1157,34 @@ static void D_FindAddonsToAutoload(void)
|
|||||||
if (newline)
|
if (newline)
|
||||||
*newline = '\0';
|
*newline = '\0';
|
||||||
|
|
||||||
|
// ok so theres still issues with players adding stuff to autoload by accident
|
||||||
|
// sometimes this stuff contains maps
|
||||||
|
// you can probably imagine how that goes in a netgame....
|
||||||
|
if (W_CheckAutoLoadContainsMap(wadsToAutoload))
|
||||||
|
{
|
||||||
|
CONS_Printf("Autoload: file %s contains map data! skipping...", wadsToAutoload);
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
|
||||||
if (!postload && W_CheckPostLoadList(wadsToAutoload))
|
if (!postload && W_CheckPostLoadList(wadsToAutoload))
|
||||||
{
|
{
|
||||||
CONS_Printf("forcing postload for file %s\n", wadsToAutoload);
|
CONS_Printf("Autoload: forcing postload for file %s\n", wadsToAutoload);
|
||||||
postload = true;
|
postload = true;
|
||||||
}
|
}
|
||||||
|
|
||||||
// LOAD IT
|
// LOAD IT
|
||||||
if (!postload)
|
if (!postload)
|
||||||
{
|
{
|
||||||
D_AutoloadFile(wadsToAutoload, autoloadwadfiles, autoloadcount);
|
D_AutoloadFile(wadsToAutoload, autoloadwadfiles, &autoloadwadcount);
|
||||||
autoloadcount++;
|
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
D_AutoloadFile(wadsToAutoload, autoloadwadfilespost, postloadcount);
|
D_AutoloadFile(wadsToAutoload, autoloadwadfilespost, &postloadwadcount);
|
||||||
postloadcount++;
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
autoloadwadfiles[autoloadcount] = NULL;
|
autoloadwadfiles[autoloadwadcount] = NULL;
|
||||||
autoloadwadfilespost[postloadcount] = NULL;
|
autoloadwadfilespost[postloadwadcount] = NULL;
|
||||||
|
|
||||||
// we dont want memory leaks around here do we?
|
// we dont want memory leaks around here do we?
|
||||||
fclose(autoloadconfigfile);
|
fclose(autoloadconfigfile);
|
||||||
@@ -1148,7 +1193,7 @@ static void D_FindAddonsToAutoload(void)
|
|||||||
static void D_AddAutoloadFiles(void)
|
static void D_AddAutoloadFiles(void)
|
||||||
{
|
{
|
||||||
// nothing to autoload
|
// nothing to autoload
|
||||||
if (autoloadcount == 0)
|
if (autoloadwadcount == 0)
|
||||||
return;
|
return;
|
||||||
|
|
||||||
CONS_Printf("D_AutoloadFile(): Loading autoloaded addons...\n");
|
CONS_Printf("D_AutoloadFile(): Loading autoloaded addons...\n");
|
||||||
@@ -1156,15 +1201,15 @@ static void D_AddAutoloadFiles(void)
|
|||||||
if (W_AddAutoloadedLocalFiles(autoloadwadfiles) == 0)
|
if (W_AddAutoloadedLocalFiles(autoloadwadfiles) == 0)
|
||||||
CONS_Printf("D_AutoloadFile(): Are you sure you put in valid files or what?\n");
|
CONS_Printf("D_AutoloadFile(): Are you sure you put in valid files or what?\n");
|
||||||
|
|
||||||
D_CleanFile(autoloadwadfiles, autoloadcount);
|
D_CleanFile(autoloadwadfiles, autoloadwadcount);
|
||||||
|
|
||||||
autoloadcount = 0;
|
autoloadwadcount = 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
void D_AddPostloadFiles(void)
|
void D_AddPostloadFiles(void)
|
||||||
{
|
{
|
||||||
// nothing to postload
|
// nothing to postload
|
||||||
if (postloadcount == 0 || !netgame)
|
if (postloadwadcount == 0 || !netgame)
|
||||||
return;
|
return;
|
||||||
|
|
||||||
CONS_Printf("D_AddPostloadFiles(): Loading postloaded addons...\n");
|
CONS_Printf("D_AddPostloadFiles(): Loading postloaded addons...\n");
|
||||||
@@ -1172,9 +1217,9 @@ void D_AddPostloadFiles(void)
|
|||||||
if (W_AddAutoloadedLocalFiles(autoloadwadfilespost) == 0)
|
if (W_AddAutoloadedLocalFiles(autoloadwadfilespost) == 0)
|
||||||
CONS_Printf("D_AddPostloadFiles(): Are you sure you put in valid files or what?\n");
|
CONS_Printf("D_AddPostloadFiles(): Are you sure you put in valid files or what?\n");
|
||||||
|
|
||||||
D_CleanFile(autoloadwadfilespost, postloadcount);
|
D_CleanFile(autoloadwadfilespost, postloadwadcount);
|
||||||
|
|
||||||
postloadcount = 0;
|
postloadwadcount = 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
// ==========================================================================
|
// ==========================================================================
|
||||||
@@ -1183,7 +1228,7 @@ void D_AddPostloadFiles(void)
|
|||||||
|
|
||||||
static boolean AddIWAD(const char * file, const char *dir)
|
static boolean AddIWAD(const char * file, const char *dir)
|
||||||
{
|
{
|
||||||
char * path = va(pandf, dir, file);
|
char *path = va(pandf, dir, file);
|
||||||
|
|
||||||
if (FIL_ReadFileOK(path))
|
if (FIL_ReadFileOK(path))
|
||||||
{
|
{
|
||||||
@@ -1211,17 +1256,13 @@ static void IdentifyVersion(void)
|
|||||||
#endif
|
#endif
|
||||||
|
|
||||||
char tempsrb2path[256] = ".";
|
char tempsrb2path[256] = ".";
|
||||||
getcwd(tempsrb2path, 256);
|
if (getcwd(tempsrb2path, 256) == NULL)
|
||||||
|
strcpy(tempsrb2path, ".");
|
||||||
|
|
||||||
// get the current directory (possible problem on NT with "." as current dir)
|
// get the current directory (possible problem on NT with "." as current dir)
|
||||||
if (!srb2waddir)
|
if (!srb2waddir)
|
||||||
{
|
{
|
||||||
if (tempsrb2path[0])
|
srb2waddir = tempsrb2path;
|
||||||
srb2waddir = tempsrb2path;
|
|
||||||
else
|
|
||||||
{
|
|
||||||
srb2waddir = ".";
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
#if (1) // reduce the amount of findfile by only using full cwd in this func
|
#if (1) // reduce the amount of findfile by only using full cwd in this func
|
||||||
@@ -1364,8 +1405,6 @@ static inline void D_MakeTitleString(char *s)
|
|||||||
// extra graphic patches for saturn specific thingies
|
// extra graphic patches for saturn specific thingies
|
||||||
boolean xtra_speedo = false; // extra speedometer check
|
boolean xtra_speedo = false; // extra speedometer check
|
||||||
boolean xtra_speedo_clr = false; // extra speedometer colour check
|
boolean xtra_speedo_clr = false; // extra speedometer colour check
|
||||||
boolean xtra_speedo3 = false; // 80x 11 extra speedometer check
|
|
||||||
boolean xtra_speedo_clr3 = false; // 80x 11 extra speedometer colour check
|
|
||||||
boolean achi_speedo = false; // achiiro speedometer check
|
boolean achi_speedo = false; // achiiro speedometer check
|
||||||
boolean achi_speedo_clr = false; // extra speedometer colour check
|
boolean achi_speedo_clr = false; // extra speedometer colour check
|
||||||
boolean dial_speedo = false; // dial speedometer check
|
boolean dial_speedo = false; // dial speedometer check
|
||||||
@@ -1395,7 +1434,6 @@ static void D_CheckSaturnExtraFiles(void)
|
|||||||
CV_PossibleValue_t minimapdot_cons_temp[NUMMINIMAPDOTSTUFF] = {{0, "Off"}, {0, NULL}, {0, NULL}, {0, NULL}, {0, NULL}};
|
CV_PossibleValue_t minimapdot_cons_temp[NUMMINIMAPDOTSTUFF] = {{0, "Off"}, {0, NULL}, {0, NULL}, {0, NULL}, {0, NULL}};
|
||||||
|
|
||||||
unsigned last_speedo_i = 0;
|
unsigned last_speedo_i = 0;
|
||||||
unsigned last_driftgauge_i = 3;
|
|
||||||
unsigned last_inputdisplay_i = 2;
|
unsigned last_inputdisplay_i = 2;
|
||||||
unsigned last_minimapdot_i = 0;
|
unsigned last_minimapdot_i = 0;
|
||||||
#define PUSHCONS(cons, i, id, name) { ++i; cons[i].value = id; cons[i].strvalue = name; }
|
#define PUSHCONS(cons, i, id, name) { ++i; cons[i].value = id; cons[i].strvalue = name; }
|
||||||
@@ -1554,20 +1592,6 @@ static void D_CheckSaturnExtraFiles(void)
|
|||||||
if (found_extra3_kart)
|
if (found_extra3_kart)
|
||||||
{
|
{
|
||||||
mainwads++;
|
mainwads++;
|
||||||
|
|
||||||
// 80x11 speedometer crap
|
|
||||||
if (W_LumpExists("SP_SM3TC"))
|
|
||||||
{
|
|
||||||
xtra_speedo3 = true;
|
|
||||||
PUSHCONS(speedo_cons_temp, last_speedo_i, 7, "Extra");
|
|
||||||
PUSHCONS(driftgaugestyle_cons_temp, last_driftgauge_i, 5, "Extra");
|
|
||||||
}
|
|
||||||
|
|
||||||
// 80x11 speedometer crap but colour
|
|
||||||
if (W_LumpExists("SC_SM3TC"))
|
|
||||||
{
|
|
||||||
xtra_speedo_clr3 = true;
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
#undef PUSHCONS
|
#undef PUSHCONS
|
||||||
@@ -1642,12 +1666,6 @@ void D_SRB2Main(void)
|
|||||||
strcpy(srb2, "SRB2Kart");
|
strcpy(srb2, "SRB2Kart");
|
||||||
D_MakeTitleString(srb2);
|
D_MakeTitleString(srb2);
|
||||||
|
|
||||||
#if defined (__OS2__) && !defined (HAVE_SDL)
|
|
||||||
// set PM window title
|
|
||||||
snprintf(pmData->title, sizeof (pmData->title), "SRB2Kart" VERSIONSTRING ": %s", title);
|
|
||||||
pmData->title[sizeof (pmData->title) - 1] = '\0';
|
|
||||||
#endif
|
|
||||||
|
|
||||||
if (devparm)
|
if (devparm)
|
||||||
CONS_Printf(M_GetText("Development mode ON.\n"));
|
CONS_Printf(M_GetText("Development mode ON.\n"));
|
||||||
|
|
||||||
@@ -1771,10 +1789,6 @@ void D_SRB2Main(void)
|
|||||||
// Setup default unlockable conditions
|
// Setup default unlockable conditions
|
||||||
M_SetupDefaultConditionSets();
|
M_SetupDefaultConditionSets();
|
||||||
|
|
||||||
// Setup character tables
|
|
||||||
// Have to be done here before files are loaded
|
|
||||||
M_InitCharacterTables();
|
|
||||||
|
|
||||||
// load wad, including the main wad file
|
// load wad, including the main wad file
|
||||||
CONS_Printf("W_InitMultipleFiles(): Adding IWAD and main PWADs.\n");
|
CONS_Printf("W_InitMultipleFiles(): Adding IWAD and main PWADs.\n");
|
||||||
|
|
||||||
@@ -1894,7 +1908,8 @@ void D_SRB2Main(void)
|
|||||||
if (M_CheckParm("-warp") && M_IsNextParm())
|
if (M_CheckParm("-warp") && M_IsNextParm())
|
||||||
{
|
{
|
||||||
const char *word = M_GetNextParm();
|
const char *word = M_GetNextParm();
|
||||||
pstartmap = G_FindMapByNameOrCode(word, 0);
|
pstartmap = G_FindMapByNameOrCode(word, NULL);
|
||||||
|
|
||||||
if (! pstartmap)
|
if (! pstartmap)
|
||||||
I_Error("Cannot find a map remotely named '%s'\n", word);
|
I_Error("Cannot find a map remotely named '%s'\n", word);
|
||||||
else
|
else
|
||||||
@@ -2027,9 +2042,13 @@ void D_SRB2Main(void)
|
|||||||
if (M_CheckProtoParam("replay"))
|
if (M_CheckProtoParam("replay"))
|
||||||
{
|
{
|
||||||
const char *replayurl = M_GetProtoParam();
|
const char *replayurl = M_GetProtoParam();
|
||||||
char *replayname = strrchr(replayurl, '/');
|
|
||||||
|
|
||||||
if (!replayname || !replayurl)
|
if (!replayurl)
|
||||||
|
I_Error("REPLAY: Invalid URL.");
|
||||||
|
|
||||||
|
gconst char *replayname = strrchr(replayurl, '/');
|
||||||
|
|
||||||
|
if (!replayname)
|
||||||
I_Error("REPLAY: Invalid URL.");
|
I_Error("REPLAY: Invalid URL.");
|
||||||
|
|
||||||
#define REPLAYDIR "/DownloadedReplays/"
|
#define REPLAYDIR "/DownloadedReplays/"
|
||||||
@@ -2143,8 +2162,8 @@ void D_SRB2Main(void)
|
|||||||
|
|
||||||
if (dedicated && server)
|
if (dedicated && server)
|
||||||
{
|
{
|
||||||
levelstarttic = gametic;
|
|
||||||
G_SetGamestate(GS_LEVEL);
|
G_SetGamestate(GS_LEVEL);
|
||||||
|
|
||||||
if (!P_SetupLevel(false, false))
|
if (!P_SetupLevel(false, false))
|
||||||
I_Quit(); // fail so reset game stuff
|
I_Quit(); // fail so reset game stuff
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -38,8 +38,6 @@ extern boolean found_extra3_kart; // for use in k_kart.c
|
|||||||
|
|
||||||
extern boolean xtra_speedo; // extra speedometer check
|
extern boolean xtra_speedo; // extra speedometer check
|
||||||
extern boolean xtra_speedo_clr; // extra speedometer colour check
|
extern boolean xtra_speedo_clr; // extra speedometer colour check
|
||||||
extern boolean xtra_speedo3; // 80x11 extra speedometer check
|
|
||||||
extern boolean xtra_speedo_clr3; // 80x11 extra speedometer colour check
|
|
||||||
extern boolean achi_speedo; // achiiro speedometer check
|
extern boolean achi_speedo; // achiiro speedometer check
|
||||||
extern boolean achi_speedo_clr; // extra speedometer colour check
|
extern boolean achi_speedo_clr; // extra speedometer colour check
|
||||||
extern boolean dial_speedo; // dial speedometer check
|
extern boolean dial_speedo; // dial speedometer check
|
||||||
|
|||||||
+3
-7
@@ -59,7 +59,7 @@ static INT16 reboundsize[MAXREBOUND];
|
|||||||
static INT32 rebound_head, rebound_tail;
|
static INT32 rebound_head, rebound_tail;
|
||||||
|
|
||||||
/// \brief max length per packet
|
/// \brief max length per packet
|
||||||
INT16 hardware_MAXPACKETLENGTH;
|
INT16 hardware_MAXPACKETLENGTH = 0;
|
||||||
|
|
||||||
boolean (*I_NetGet)(void) = NULL;
|
boolean (*I_NetGet)(void) = NULL;
|
||||||
void (*I_NetSend)(void) = NULL;
|
void (*I_NetSend)(void) = NULL;
|
||||||
@@ -96,7 +96,7 @@ INT32 ticruned = 0, ticmiss = 0;
|
|||||||
|
|
||||||
// globals
|
// globals
|
||||||
INT32 getbps = 0, sendbps = 0;
|
INT32 getbps = 0, sendbps = 0;
|
||||||
float lostpercent = 0, duppercent = 0, gamelostpercent = 0;
|
float lostpercent = 0.0f, duppercent = 0.0f, gamelostpercent = 0.0f;
|
||||||
INT32 packetheaderlength = 0;
|
INT32 packetheaderlength = 0;
|
||||||
|
|
||||||
boolean Net_GetNetStat(void)
|
boolean Net_GetNetStat(void)
|
||||||
@@ -612,12 +612,8 @@ void Net_WaitAllAckReceived(UINT32 timeout)
|
|||||||
|
|
||||||
static void InitNode(node_t *node)
|
static void InitNode(node_t *node)
|
||||||
{
|
{
|
||||||
node->acktosend_head = node->acktosend_tail = 0;
|
memset(node, 0, sizeof(node_t));
|
||||||
memset(node->acktosend, 0, sizeof(node->acktosend));
|
|
||||||
node->firstacktosend = 0;
|
|
||||||
node->nextacknum = 1;
|
node->nextacknum = 1;
|
||||||
node->remotefirstack = 0;
|
|
||||||
node->flags = 0;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
static void InitAck(void)
|
static void InitAck(void)
|
||||||
|
|||||||
@@ -27,7 +27,6 @@ extern "C" {
|
|||||||
// SINT8 is used for nodes sometimes >:(
|
// SINT8 is used for nodes sometimes >:(
|
||||||
#define MAXNETNODES 127
|
#define MAXNETNODES 127
|
||||||
#define BROADCASTADDR MAXNETNODES
|
#define BROADCASTADDR MAXNETNODES
|
||||||
#define NETSPLITSCREEN // Kart's splitscreen netgame feature
|
|
||||||
|
|
||||||
#define STATLENGTH (TICRATE*2)
|
#define STATLENGTH (TICRATE*2)
|
||||||
|
|
||||||
|
|||||||
+210
-510
File diff suppressed because it is too large.
Load diff
+3
-10
@@ -21,10 +21,7 @@ extern "C" {
|
|||||||
|
|
||||||
#include "command.h"
|
#include "command.h"
|
||||||
|
|
||||||
void SendWeaponPref(void);
|
void SendWeaponPref(UINT8 splitplayer);
|
||||||
void SendWeaponPref2(void);
|
|
||||||
void SendWeaponPref3(void);
|
|
||||||
void SendWeaponPref4(void);
|
|
||||||
|
|
||||||
// console vars
|
// console vars
|
||||||
extern consvar_t cv_playername;
|
extern consvar_t cv_playername;
|
||||||
@@ -96,11 +93,6 @@ extern consvar_t cv_pause;
|
|||||||
extern consvar_t cv_restrictskinchange, cv_allowteamchange, cv_ingamecap, cv_respawntime;
|
extern consvar_t cv_restrictskinchange, cv_allowteamchange, cv_ingamecap, cv_respawntime;
|
||||||
extern consvar_t cv_spectatorreentry, cv_antigrief;
|
extern consvar_t cv_spectatorreentry, cv_antigrief;
|
||||||
|
|
||||||
/*extern consvar_t cv_teleporters, cv_superring, cv_supersneakers, cv_invincibility;
|
|
||||||
extern consvar_t cv_jumpshield, cv_watershield, cv_ringshield, cv_forceshield, cv_bombshield;
|
|
||||||
extern consvar_t cv_1up, cv_eggmanbox;
|
|
||||||
extern consvar_t cv_recycler;*/
|
|
||||||
|
|
||||||
// SRB2kart items
|
// SRB2kart items
|
||||||
extern consvar_t cv_sneaker, cv_rocketsneaker, cv_invincibility, cv_banana;
|
extern consvar_t cv_sneaker, cv_rocketsneaker, cv_invincibility, cv_banana;
|
||||||
extern consvar_t cv_eggmanmonitor, cv_orbinaut, cv_jawz, cv_mine;
|
extern consvar_t cv_eggmanmonitor, cv_orbinaut, cv_jawz, cv_mine;
|
||||||
@@ -158,6 +150,7 @@ extern consvar_t cv_pingstyle;
|
|||||||
|
|
||||||
//extern consvar_t cv_smallpos;
|
//extern consvar_t cv_smallpos;
|
||||||
extern consvar_t cv_showminimapnames;
|
extern consvar_t cv_showminimapnames;
|
||||||
|
extern consvar_t cv_showminimapfinished;
|
||||||
extern consvar_t cv_minihead;
|
extern consvar_t cv_minihead;
|
||||||
extern consvar_t cv_showminimapangle;
|
extern consvar_t cv_showminimapangle;
|
||||||
|
|
||||||
@@ -295,7 +288,7 @@ typedef union {
|
|||||||
// add game commands, needs cleanup
|
// add game commands, needs cleanup
|
||||||
void D_RegisterServerCommands(void);
|
void D_RegisterServerCommands(void);
|
||||||
void D_RegisterClientCommands(void);
|
void D_RegisterClientCommands(void);
|
||||||
void D_SendPlayerConfig(void);
|
void D_SendPlayerConfig(UINT8 splitplayer);
|
||||||
void Command_ExitGame_f(void);
|
void Command_ExitGame_f(void);
|
||||||
void Command_Retry_f(void);
|
void Command_Retry_f(void);
|
||||||
void D_GameTypeChanged(INT32 lastgametype); // not a real _OnChange function anymore
|
void D_GameTypeChanged(INT32 lastgametype); // not a real _OnChange function anymore
|
||||||
|
|||||||
+74
-20
@@ -116,6 +116,8 @@ static I_mutex downloadmutex;
|
|||||||
#endif
|
#endif
|
||||||
char downloaddir[512] = "DOWNLOAD";
|
char downloaddir[512] = "DOWNLOAD";
|
||||||
|
|
||||||
|
INT32 addontypes[NUMADDONTYPES] = {0};
|
||||||
|
|
||||||
file_download_t filedownload = {};
|
file_download_t filedownload = {};
|
||||||
|
|
||||||
#ifdef HAVE_CURL
|
#ifdef HAVE_CURL
|
||||||
@@ -131,8 +133,12 @@ static UINT32 curl_origtotalfilesize;
|
|||||||
static char *curl_realname = NULL;
|
static char *curl_realname = NULL;
|
||||||
fileneeded_t *curl_curfile = NULL;
|
fileneeded_t *curl_curfile = NULL;
|
||||||
HTTP_login *curl_logins = NULL;
|
HTTP_login *curl_logins = NULL;
|
||||||
|
|
||||||
|
static void CURLGetFile(void);
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
static addontype_t GetAddonType(const char *name);
|
||||||
|
|
||||||
/** Fills a serverinfo packet with information about wad files loaded.
|
/** Fills a serverinfo packet with information about wad files loaded.
|
||||||
*
|
*
|
||||||
* \todo Give this function a better name since it is in global scope.
|
* \todo Give this function a better name since it is in global scope.
|
||||||
@@ -223,8 +229,11 @@ void D_ParseFileneeded(INT32 fileneedednum_parm, UINT8 *fileneededstr, UINT16 fi
|
|||||||
fileneeded[i].willsend = (UINT8)(filestatus >> 4);
|
fileneeded[i].willsend = (UINT8)(filestatus >> 4);
|
||||||
fileneeded[i].totalsize = READUINT32(p); // The four next bytes are the file size
|
fileneeded[i].totalsize = READUINT32(p); // The four next bytes are the file size
|
||||||
fileneeded[i].file = NULL; // The file isn't open yet
|
fileneeded[i].file = NULL; // The file isn't open yet
|
||||||
READSTRINGN(p, fileneeded[i].filename, MAX_WADPATH); // The next bytes are the file name
|
READSTRINGL(p, fileneeded[i].filename, MAX_WADPATH); // The next bytes are the file name
|
||||||
READMEM(p, fileneeded[i].md5sum, 16); // The last 16 bytes are the file checksum
|
READMEM(p, fileneeded[i].md5sum, 16); // The last 16 bytes are the file checksum
|
||||||
|
|
||||||
|
// Should be good place to calculate that?
|
||||||
|
fileneeded[i].type = GetAddonType(fileneeded[i].filename);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -573,6 +582,48 @@ INT32 CL_CheckFiles(void)
|
|||||||
return 1; //everything is FS_OPEN or FS_FOUND, proceed to loading
|
return 1; //everything is FS_OPEN or FS_FOUND, proceed to loading
|
||||||
}
|
}
|
||||||
|
|
||||||
|
static addontype_t GetAddonType(const char *name)
|
||||||
|
{
|
||||||
|
const char *prefix = strchr(name, '_');
|
||||||
|
|
||||||
|
// Doesn't have prefix (no '_' character or it is too far and is probably not for prefix but for something like version)
|
||||||
|
// KRBCL_ is longest prefix i can think of so this should be enough
|
||||||
|
if (prefix == NULL || prefix - name > 5)
|
||||||
|
return ADDON_MISC;
|
||||||
|
|
||||||
|
// Skip 'K'
|
||||||
|
if (*name == 'K')
|
||||||
|
++name;
|
||||||
|
|
||||||
|
switch (*name)
|
||||||
|
{
|
||||||
|
case 'L':
|
||||||
|
return ADDON_SCRIPT;
|
||||||
|
break;
|
||||||
|
|
||||||
|
case 'R':
|
||||||
|
case 'B':
|
||||||
|
return ADDON_MAP;
|
||||||
|
break;
|
||||||
|
|
||||||
|
case 'C':
|
||||||
|
return ADDON_CHARACTER;
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
|
||||||
|
return ADDON_MISC;
|
||||||
|
}
|
||||||
|
|
||||||
|
void CL_CheckAddonTypes(void)
|
||||||
|
{
|
||||||
|
memset(&addontypes, 0, sizeof(addontypes));
|
||||||
|
|
||||||
|
for (INT32 i = 0; i < fileneedednum; i++)
|
||||||
|
{
|
||||||
|
addontypes[fileneeded[i].type]++;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
// Load it now
|
// Load it now
|
||||||
boolean CL_LoadServerFiles(void)
|
boolean CL_LoadServerFiles(void)
|
||||||
{
|
{
|
||||||
@@ -958,7 +1009,7 @@ void Got_Filetxpak(void)
|
|||||||
|| fastcmp(filename, "music.kart")
|
|| fastcmp(filename, "music.kart")
|
||||||
|| fastcmp(filename, "patch.kart")
|
|| fastcmp(filename, "patch.kart")
|
||||||
))
|
))
|
||||||
I_Error("Tried to download \"%s\"", filename);
|
I_Error("Tried to download base-game file: \"%s\"", filename);
|
||||||
|
|
||||||
if (filenum >= fileneedednum)
|
if (filenum >= fileneedednum)
|
||||||
{
|
{
|
||||||
@@ -1017,21 +1068,21 @@ void Got_Filetxpak(void)
|
|||||||
|
|
||||||
switch(file->status)
|
switch(file->status)
|
||||||
{
|
{
|
||||||
case FS_NOTFOUND:
|
case FS_NOTFOUND:
|
||||||
s = "FS_NOTFOUND";
|
s = "FS_NOTFOUND";
|
||||||
break;
|
break;
|
||||||
case FS_FOUND:
|
case FS_FOUND:
|
||||||
s = "FS_FOUND";
|
s = "FS_FOUND";
|
||||||
break;
|
break;
|
||||||
case FS_OPEN:
|
case FS_OPEN:
|
||||||
s = "FS_OPEN";
|
s = "FS_OPEN";
|
||||||
break;
|
break;
|
||||||
case FS_MD5SUMBAD:
|
case FS_MD5SUMBAD:
|
||||||
s = "FS_MD5SUMBAD";
|
s = "FS_MD5SUMBAD";
|
||||||
break;
|
break;
|
||||||
default:
|
default:
|
||||||
s = "unknown";
|
s = "unknown";
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
|
||||||
I_Error("Received a file not requested (file id: %d, file status: %s)\n", filenum, s);
|
I_Error("Received a file not requested (file id: %d, file status: %s)\n", filenum, s);
|
||||||
@@ -1305,6 +1356,7 @@ void CURLPrepareFile(const char* url, int dfilenum)
|
|||||||
if (!multi_handle)
|
if (!multi_handle)
|
||||||
{
|
{
|
||||||
cc = curl_global_init(CURL_GLOBAL_ALL);
|
cc = curl_global_init(CURL_GLOBAL_ALL);
|
||||||
|
|
||||||
if (cc < 0)
|
if (cc < 0)
|
||||||
{
|
{
|
||||||
I_OutputMsg("libcurl: curl_global_init() returned %d\n", cc);
|
I_OutputMsg("libcurl: curl_global_init() returned %d\n", cc);
|
||||||
@@ -1313,6 +1365,7 @@ void CURLPrepareFile(const char* url, int dfilenum)
|
|||||||
{
|
{
|
||||||
multi_handle = curl_multi_init();
|
multi_handle = curl_multi_init();
|
||||||
}
|
}
|
||||||
|
|
||||||
if (!multi_handle)
|
if (!multi_handle)
|
||||||
{
|
{
|
||||||
I_OutputMsg("libcurl: curl_multi_init() failed\n");
|
I_OutputMsg("libcurl: curl_multi_init() failed\n");
|
||||||
@@ -1441,7 +1494,7 @@ void CURLAbortFile(void)
|
|||||||
#endif
|
#endif
|
||||||
}
|
}
|
||||||
|
|
||||||
void CURLGetFile(void)
|
static void CURLGetFile(void)
|
||||||
{
|
{
|
||||||
#ifdef HAVE_THREADS
|
#ifdef HAVE_THREADS
|
||||||
I_lock_mutex(&downloadmutex);
|
I_lock_mutex(&downloadmutex);
|
||||||
@@ -1483,7 +1536,8 @@ void CURLGetFile(void)
|
|||||||
e = m->easy_handle;
|
e = m->easy_handle;
|
||||||
easyres = m->data.result;
|
easyres = m->data.result;
|
||||||
|
|
||||||
char *filename = Z_StrDup(curl_realname);
|
char *filename = malloc(strlen(curl_realname)+1);
|
||||||
|
strcpy(filename, curl_realname);
|
||||||
nameonly(filename);
|
nameonly(filename);
|
||||||
|
|
||||||
if (easyres != CURLE_OK)
|
if (easyres != CURLE_OK)
|
||||||
@@ -1521,7 +1575,7 @@ void CURLGetFile(void)
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
Z_Free(filename);
|
free(filename);
|
||||||
curl_curfile->file = NULL;
|
curl_curfile->file = NULL;
|
||||||
filedownload.remaining--;
|
filedownload.remaining--;
|
||||||
mc = curl_multi_remove_handle(multi_handle, e);
|
mc = curl_multi_remove_handle(multi_handle, e);
|
||||||
|
|||||||
+12
-1
@@ -40,6 +40,15 @@ typedef enum
|
|||||||
FS_FALLBACK, // HTTP failed
|
FS_FALLBACK, // HTTP failed
|
||||||
} filestatus_t;
|
} filestatus_t;
|
||||||
|
|
||||||
|
typedef enum addontype_e
|
||||||
|
{
|
||||||
|
ADDON_SCRIPT,
|
||||||
|
ADDON_MAP,
|
||||||
|
ADDON_CHARACTER,
|
||||||
|
ADDON_MISC,
|
||||||
|
NUMADDONTYPES,
|
||||||
|
} addontype_t;
|
||||||
|
|
||||||
typedef struct
|
typedef struct
|
||||||
{
|
{
|
||||||
UINT8 willsend; // Is the server willing to send it?
|
UINT8 willsend; // Is the server willing to send it?
|
||||||
@@ -51,11 +60,13 @@ typedef struct
|
|||||||
UINT32 totalsize;
|
UINT32 totalsize;
|
||||||
filestatus_t status; // The value returned by recsearch
|
filestatus_t status; // The value returned by recsearch
|
||||||
boolean justdownloaded; // To prevent late fragments from causing an I_Error
|
boolean justdownloaded; // To prevent late fragments from causing an I_Error
|
||||||
|
addontype_t type;
|
||||||
} fileneeded_t;
|
} fileneeded_t;
|
||||||
|
|
||||||
extern INT32 fileneedednum;
|
extern INT32 fileneedednum;
|
||||||
extern fileneeded_t fileneeded[MAX_WADFILES];
|
extern fileneeded_t fileneeded[MAX_WADFILES];
|
||||||
extern char downloaddir[512];
|
extern char downloaddir[512];
|
||||||
|
extern INT32 addontypes[NUMADDONTYPES];
|
||||||
|
|
||||||
typedef struct
|
typedef struct
|
||||||
{
|
{
|
||||||
@@ -91,6 +102,7 @@ void D_ParseFileneeded(INT32 fileneedednum_parm, UINT8 *fileneededstr, UINT16 fi
|
|||||||
void CL_PrepareDownloadSaveGame(const char *tmpsave);
|
void CL_PrepareDownloadSaveGame(const char *tmpsave);
|
||||||
|
|
||||||
INT32 CL_CheckFiles(void);
|
INT32 CL_CheckFiles(void);
|
||||||
|
void CL_CheckAddonTypes(void);
|
||||||
boolean CL_LoadServerFiles(void);
|
boolean CL_LoadServerFiles(void);
|
||||||
void SV_SendRam(INT32 node, void *data, size_t size, freemethod_t freemethod,
|
void SV_SendRam(INT32 node, void *data, size_t size, freemethod_t freemethod,
|
||||||
UINT8 fileid);
|
UINT8 fileid);
|
||||||
@@ -119,7 +131,6 @@ size_t nameonlylength(const char *s);
|
|||||||
#ifdef HAVE_CURL
|
#ifdef HAVE_CURL
|
||||||
void CURLPrepareFile(const char* url, int dfilenum);
|
void CURLPrepareFile(const char* url, int dfilenum);
|
||||||
void CURLAbortFile(void);
|
void CURLAbortFile(void);
|
||||||
void CURLGetFile(void);
|
|
||||||
HTTP_login * CURLGetLogin (const char *url, HTTP_login ***return_prev_next);
|
HTTP_login * CURLGetLogin (const char *url, HTTP_login ***return_prev_next);
|
||||||
size_t curlwrite_data(void *ptr, size_t size, size_t nmemb, FILE *stream);
|
size_t curlwrite_data(void *ptr, size_t size, size_t nmemb, FILE *stream);
|
||||||
#endif
|
#endif
|
||||||
|
|||||||
@@ -1,21 +1,75 @@
|
|||||||
# Declare dedicated interface sources
|
# Declare dedicated interface sources
|
||||||
|
|
||||||
target_sourcefile(c)
|
set(SRB2_DEDICATED_SOURCES
|
||||||
|
i_system.c
|
||||||
|
i_main.c
|
||||||
|
i_video.c
|
||||||
|
i_sound.c
|
||||||
|
i_threads.c
|
||||||
|
dosstr.c
|
||||||
|
endtxt.c
|
||||||
|
)
|
||||||
|
|
||||||
target_sources(SRB2SDL2 PRIVATE)
|
set(SRB2_DEDICATED_HEADERS
|
||||||
|
endtxt.h
|
||||||
|
)
|
||||||
|
|
||||||
|
source_group("Interface Code" FILES ${SRB2_DEDICATED_SOURCES} ${SRB2_DEDICATED_HEADERS})
|
||||||
|
|
||||||
|
set(SRB2_DEDICATED_TOTAL_SOURCES
|
||||||
|
${SRB2_CORE_SOURCES}
|
||||||
|
${SRB2_CORE_HEADERS}
|
||||||
|
${SRB2_PNG_SOURCES}
|
||||||
|
${SRB2_PNG_HEADERS}
|
||||||
|
${SRB2_CORE_RENDER_SOURCES}
|
||||||
|
${SRB2_CORE_GAME_SOURCES}
|
||||||
|
${SRB2_LUA_SOURCES}
|
||||||
|
${SRB2_LUA_HEADERS}
|
||||||
|
${SRB2_BLUA_SOURCES}
|
||||||
|
${SRB2_BLUA_HEADERS}
|
||||||
|
${SRB2_DEDICATED_SOURCES}
|
||||||
|
${SRB2_DEDICATED_HEADERS}
|
||||||
|
)
|
||||||
|
|
||||||
|
source_group("Main" FILES ${SRB2_CORE_SOURCES} ${SRB2_CORE_HEADERS})
|
||||||
|
source_group("Renderer" FILES ${SRB2_CORE_RENDER_SOURCES})
|
||||||
|
source_group("Game" FILES ${SRB2_CORE_GAME_SOURCES})
|
||||||
|
source_group("LUA" FILES ${SRB2_LUA_SOURCES} ${SRB2_LUA_HEADERS})
|
||||||
|
source_group("LUA\\Interpreter" FILES ${SRB2_BLUA_SOURCES} ${SRB2_BLUA_HEADERS})
|
||||||
|
|
||||||
if(${CMAKE_SYSTEM} MATCHES Windows)
|
if(${CMAKE_SYSTEM} MATCHES Windows)
|
||||||
target_sources(SRB2SDL2 PRIVATE
|
set(SRB2_DEDICATED_TOTAL_SOURCES ${SRB2_DEDICATED_TOTAL_SOURCES}
|
||||||
../win32/win_dbg.c
|
${CMAKE_SOURCE_DIR}/src/win32/win_dbg.c
|
||||||
../win32/Srb2win.rc)
|
${CMAKE_SOURCE_DIR}/src/win32/Srb2win.rc
|
||||||
|
)
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
|
add_executable(SRB2SDL2 MACOSX_BUNDLE WIN32 ${SRB2_DEDICATED_TOTAL_SOURCES})
|
||||||
|
|
||||||
if(${CMAKE_SYSTEM} MATCHES Windows)
|
if(${CMAKE_SYSTEM} MATCHES Windows)
|
||||||
set_target_properties(SRB2SDL2 PROPERTIES OUTPUT_NAME srb2legacy)
|
set_target_properties(SRB2SDL2 PROPERTIES OUTPUT_NAME srb2kartd)
|
||||||
elseif(${CMAKE_SYSTEM} MATCHES Linux)
|
elseif(${CMAKE_SYSTEM} MATCHES Linux)
|
||||||
set_target_properties(SRB2SDL2 PROPERTIES OUTPUT_NAME lsrb2dlegacy)
|
set_target_properties(SRB2SDL2 PROPERTIES OUTPUT_NAME lsrb2kartd)
|
||||||
else()
|
else()
|
||||||
set_target_properties(SRB2SDL2 PROPERTIES OUTPUT_NAME srb2legacy)
|
set_target_properties(SRB2SDL2 PROPERTIES OUTPUT_NAME srb2kartd)
|
||||||
|
endif()
|
||||||
|
|
||||||
|
if(${CMAKE_SYSTEM} MATCHES Darwin)
|
||||||
|
find_library(CORE_FOUNDATION_LIBRARY "CoreFoundation")
|
||||||
|
target_link_libraries(SRB2SDL2 PRIVATE
|
||||||
|
${CORE_FOUNDATION_LIBRARY}
|
||||||
|
)
|
||||||
|
set_target_properties(SRB2SDL2 PROPERTIES OUTPUT_NAME "${CPACK_PACKAGE_DESCRIPTION_SUMMARY}")
|
||||||
|
|
||||||
|
# Configure the app bundle icon and plist properties
|
||||||
|
target_sources(SRB2SDL2 PRIVATE "${CMAKE_CURRENT_SOURCE_DIR}/macosx/Srb2mac.icns")
|
||||||
|
set_target_properties(SRB2SDL2 PROPERTIES
|
||||||
|
MACOSX_BUNDLE_ICON_FILE "Srb2mac"
|
||||||
|
MACOSX_BUNDLE_BUNDLE_NAME "Sonic Robo Blast 2"
|
||||||
|
MACOSX_BUNDLE_BUNDLE_VERSION ${SRB2_VERSION}
|
||||||
|
|
||||||
|
RESOURCE "${CMAKE_CURRENT_SOURCE_DIR}/macosx/Srb2mac.icns"
|
||||||
|
)
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
if(${CMAKE_SYSTEM} MATCHES Darwin)
|
if(${CMAKE_SYSTEM} MATCHES Darwin)
|
||||||
@@ -24,25 +78,27 @@ if(${CMAKE_SYSTEM} MATCHES Darwin)
|
|||||||
${CORE_LIB}
|
${CORE_LIB}
|
||||||
${PNG_LIBRARIES}
|
${PNG_LIBRARIES}
|
||||||
${ZLIB_LIBRARIES}
|
${ZLIB_LIBRARIES}
|
||||||
|
${CURL_LIBRARIES}
|
||||||
)
|
)
|
||||||
set_target_properties(SRB2SDL2 PROPERTIES OUTPUT_NAME "${CPACK_PACKAGE_DESCRIPTION_SUMMARY}")
|
set_target_properties(SRB2SDL2 PROPERTIES OUTPUT_NAME "${CPACK_PACKAGE_DESCRIPTION_SUMMARY}")
|
||||||
else()
|
else()
|
||||||
target_link_libraries(SRB2SDL2 PRIVATE
|
target_link_libraries(SRB2SDL2 PRIVATE
|
||||||
${PNG_LIBRARIES}
|
${PNG_LIBRARIES}
|
||||||
${ZLIB_LIBRARIES}
|
${ZLIB_LIBRARIES}
|
||||||
|
${CURL_LIBRARIES}
|
||||||
)
|
)
|
||||||
|
|
||||||
if(${CMAKE_SYSTEM} MATCHES Linux)
|
if(${CMAKE_SYSTEM} MATCHES Linux)
|
||||||
target_link_libraries(SRB2SDL2 PRIVATE
|
target_link_libraries(SRB2SDL2 PRIVATE
|
||||||
m
|
m
|
||||||
rt
|
rt
|
||||||
|
pthread
|
||||||
)
|
)
|
||||||
endif()
|
endif()
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
#target_link_libraries(SRB2SDL2 PRIVATE SRB2Core)
|
if(${SRB2_HAVE_LIBBACKTRACE})
|
||||||
|
target_link_libraries(SRB2SDL2 PRIVATE ${LIBBACKTRACE_LIBRARIES})
|
||||||
set_target_properties(SRB2SDL2 PROPERTIES VERSION ${SRB2_VERSION})
|
endif()
|
||||||
|
|
||||||
if(${CMAKE_SYSTEM} MATCHES Windows)
|
if(${CMAKE_SYSTEM} MATCHES Windows)
|
||||||
target_link_libraries(SRB2SDL2 PRIVATE
|
target_link_libraries(SRB2SDL2 PRIVATE
|
||||||
@@ -60,20 +116,35 @@ target_include_directories(SRB2SDL2 PRIVATE
|
|||||||
|
|
||||||
target_compile_definitions(SRB2SDL2 PRIVATE
|
target_compile_definitions(SRB2SDL2 PRIVATE
|
||||||
-DDEDICATED
|
-DDEDICATED
|
||||||
|
-DHAVE_THREADS
|
||||||
)
|
)
|
||||||
|
|
||||||
## strip debug symbols into separate file when using gcc
|
if(SRB2_CONFIG_LTO AND NOT SRB2_CONFIG_DEBUGMODE)
|
||||||
if(CMAKE_COMPILER_IS_GNUCC)
|
set_property(TARGET SRB2SDL2 PROPERTY INTERPROCEDURAL_OPTIMIZATION TRUE)
|
||||||
if(${CMAKE_BUILD_TYPE} MATCHES Debug)
|
|
||||||
message(STATUS "Will make separate debug symbols in *.debug")
|
|
||||||
add_custom_command(TARGET SRB2SDL2 POST_BUILD
|
|
||||||
COMMAND ${OBJCOPY} --only-keep-debug $<TARGET_FILE:SRB2SDL2> $<TARGET_FILE:SRB2SDL2>.debug
|
|
||||||
COMMAND ${OBJCOPY} --strip-debug $<TARGET_FILE:SRB2SDL2>
|
|
||||||
COMMAND ${OBJCOPY} --add-gnu-debuglink=$<TARGET_FILE_NAME:SRB2SDL2>.debug $<TARGET_FILE:SRB2SDL2>
|
|
||||||
)
|
|
||||||
endif()
|
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
|
if(SRB2_CONFIG_ASAN)
|
||||||
|
target_compile_options(SRB2SDL2 PRIVATE -fsanitize=address)
|
||||||
|
target_link_options(SRB2SDL2 PRIVATE -fsanitize=address)
|
||||||
|
endif()
|
||||||
|
|
||||||
|
if(SRB2_CONFIG_UBSAN)
|
||||||
|
target_compile_options(SRB2SDL2 PRIVATE -fsanitize=undefined)
|
||||||
|
target_link_options(SRB2SDL2 PRIVATE -fsanitize=undefined)
|
||||||
|
endif()
|
||||||
|
|
||||||
|
## strip debug symbols into separate file when using gcc
|
||||||
|
# if(CMAKE_COMPILER_IS_GNUCC)
|
||||||
|
# if(${CMAKE_BUILD_TYPE} MATCHES Debug)
|
||||||
|
# message(STATUS "Will make separate debug symbols in *.debug")
|
||||||
|
# add_custom_command(TARGET SRB2SDL2 POST_BUILD
|
||||||
|
# COMMAND ${OBJCOPY} --only-keep-debug $<TARGET_FILE:SRB2SDL2> $<TARGET_FILE:SRB2SDL2>.debug
|
||||||
|
# COMMAND ${OBJCOPY} --strip-debug $<TARGET_FILE:SRB2SDL2>
|
||||||
|
# COMMAND ${OBJCOPY} --add-gnu-debuglink=$<TARGET_FILE_NAME:SRB2SDL2>.debug $<TARGET_FILE:SRB2SDL2>
|
||||||
|
# )
|
||||||
|
# endif()
|
||||||
|
# endif()
|
||||||
|
|
||||||
#### Installation ####
|
#### Installation ####
|
||||||
if(${CMAKE_SYSTEM} MATCHES Darwin)
|
if(${CMAKE_SYSTEM} MATCHES Darwin)
|
||||||
install(TARGETS SRB2SDL2
|
install(TARGETS SRB2SDL2
|
||||||
|
|||||||
+61
-25
@@ -167,6 +167,8 @@ static char returnWadPath[256];
|
|||||||
#include "../i_video.h"
|
#include "../i_video.h"
|
||||||
#include "../i_sound.h"
|
#include "../i_sound.h"
|
||||||
#include "../i_system.h"
|
#include "../i_system.h"
|
||||||
|
#include "../i_time.h"
|
||||||
|
#include "../i_net.h"
|
||||||
#include "../screen.h" //vid.WndParent
|
#include "../screen.h" //vid.WndParent
|
||||||
#include "../d_net.h"
|
#include "../d_net.h"
|
||||||
#include "../g_game.h"
|
#include "../g_game.h"
|
||||||
@@ -192,8 +194,6 @@ UINT8 keyboard_started = false;
|
|||||||
|
|
||||||
#ifdef HAVE_TERMIOS
|
#ifdef HAVE_TERMIOS
|
||||||
// TERMIOS console code from Quake3: thank you!
|
// TERMIOS console code from Quake3: thank you!
|
||||||
boolean stdin_active = true;
|
|
||||||
|
|
||||||
typedef struct
|
typedef struct
|
||||||
{
|
{
|
||||||
size_t cursor;
|
size_t cursor;
|
||||||
@@ -695,11 +695,7 @@ void I_JoyScale4(void)
|
|||||||
|
|
||||||
|
|
||||||
*/
|
*/
|
||||||
void I_ShutdownJoystick(void)
|
void I_ShutdownJoystick(UINT8 index)
|
||||||
{
|
|
||||||
}
|
|
||||||
|
|
||||||
void I_GetJoystickEvents(UINT8 index)
|
|
||||||
{
|
{
|
||||||
(void)index;
|
(void)index;
|
||||||
}
|
}
|
||||||
@@ -739,6 +735,22 @@ const char *I_GetJoyName(INT32 joyindex)
|
|||||||
return NULL;
|
return NULL;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
void I_SetJoystickFocus(void)
|
||||||
|
{
|
||||||
|
}
|
||||||
|
|
||||||
|
boolean I_GamepadHasLED(INT32 playernum)
|
||||||
|
{
|
||||||
|
(void)playernum;
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
|
boolean I_GamepadHasRumble(INT32 playernum)
|
||||||
|
{
|
||||||
|
(void)playernum;
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
void I_GamepadRumble(INT32 playernum, UINT16 low_strength, UINT16 high_strength, UINT32 duration)
|
void I_GamepadRumble(INT32 playernum, UINT16 low_strength, UINT16 high_strength, UINT32 duration)
|
||||||
{
|
{
|
||||||
(void)playernum;
|
(void)playernum;
|
||||||
@@ -988,7 +1000,7 @@ void I_SleepDuration(precise_t duration)
|
|||||||
#endif
|
#endif
|
||||||
}
|
}
|
||||||
|
|
||||||
boolean g_in_exiting_signal_handler = false;
|
static volatile sig_atomic_t g_in_exiting_signal_handler = false;
|
||||||
|
|
||||||
static void I_PrintSignal(INT32 signal_num, boolean core_dumped, char *signal_msg)
|
static void I_PrintSignal(INT32 signal_num, boolean core_dumped, char *signal_msg)
|
||||||
{
|
{
|
||||||
@@ -1011,8 +1023,13 @@ static void I_PrintSignal(INT32 signal_num, boolean core_dumped, char *signal_ms
|
|||||||
sigmsg = ("SIGSEGV - SRB2Kart-Saturn has attempted to access a memory location that it shouldn't and needs to close.");
|
sigmsg = ("SIGSEGV - SRB2Kart-Saturn has attempted to access a memory location that it shouldn't and needs to close.");
|
||||||
break;
|
break;
|
||||||
#ifdef SIGTERM
|
#ifdef SIGTERM
|
||||||
case SIGTERM: // Software termination signal from kill
|
case SIGTERM: // Software termination signal from terminate
|
||||||
sigmsg = ("SIGTERM - SRB2Kart-Saturn was terminated by a kill signal.");
|
sigmsg = ("SIGTERM - SRB2Kart-Saturn was terminated by a terminate signal.");
|
||||||
|
break;
|
||||||
|
#endif
|
||||||
|
#ifdef SIGKILL
|
||||||
|
case SIGKILL: // Software termination signal from kill
|
||||||
|
sigmsg = ("SIGKILL - SRB2Kart-Saturn was terminated by a kill signal.");
|
||||||
break;
|
break;
|
||||||
#endif
|
#endif
|
||||||
#ifdef SIGBREAK
|
#ifdef SIGBREAK
|
||||||
@@ -1052,6 +1069,11 @@ static void I_ReportSignal(int num, int coredumped)
|
|||||||
I_OutputMsg("\nProcess killed by signal: %s\n\n", sigmsg);
|
I_OutputMsg("\nProcess killed by signal: %s\n\n", sigmsg);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
boolean I_In_Exiting_Signal_Handler(void)
|
||||||
|
{
|
||||||
|
return g_in_exiting_signal_handler;
|
||||||
|
}
|
||||||
|
|
||||||
#ifndef NEWSIGNALHANDLER
|
#ifndef NEWSIGNALHANDLER
|
||||||
FUNCNORETURN static ATTRNORETURN void signal_handler(INT32 num)
|
FUNCNORETURN static ATTRNORETURN void signal_handler(INT32 num)
|
||||||
{
|
{
|
||||||
@@ -1071,11 +1093,17 @@ FUNCNORETURN static ATTRNORETURN void signal_handler(INT32 num)
|
|||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
FUNCNORETURN static ATTRNORETURN void quit_handler(int num)
|
static volatile sig_atomic_t interrupted = 0;
|
||||||
|
|
||||||
|
boolean I_Interrupted(void)
|
||||||
{
|
{
|
||||||
signal(num, SIG_DFL); //default signal action
|
return interrupted;
|
||||||
raise(num);
|
}
|
||||||
I_Quit();
|
|
||||||
|
static void quit_handler(int num)
|
||||||
|
{
|
||||||
|
(void)num;
|
||||||
|
interrupted = 1;
|
||||||
}
|
}
|
||||||
|
|
||||||
#ifdef HAVE_LIBBACKTRACE
|
#ifdef HAVE_LIBBACKTRACE
|
||||||
@@ -1334,18 +1362,28 @@ static void I_Fork(void)
|
|||||||
I_RegisterChildSignals();
|
I_RegisterChildSignals();
|
||||||
break;
|
break;
|
||||||
default:
|
default:
|
||||||
|
// ignore those, those are handled by child process
|
||||||
|
// otherwise parent might exit before it
|
||||||
|
// and the below stuff wont run and your terminal will be left in an awkward state
|
||||||
|
#ifdef SIGINT
|
||||||
|
signal(SIGINT, SIG_IGN);
|
||||||
|
#endif
|
||||||
|
#ifdef SIGBREAK
|
||||||
|
signal(SIGBREAK, SIG_IGN);
|
||||||
|
#endif
|
||||||
|
#ifdef SIGTERM
|
||||||
|
signal(SIGTERM, SIG_IGN);
|
||||||
|
#endif
|
||||||
if (logstream)
|
if (logstream)
|
||||||
fclose(logstream);/* the child has this */
|
fclose(logstream);/* the child has this */
|
||||||
|
|
||||||
c = wait(&status);
|
c = wait(&status);
|
||||||
|
|
||||||
#ifdef LOGMESSAGES
|
#ifdef LOGMESSAGES
|
||||||
/* By the way, exit closes files. */
|
/* By the way, exit closes files. */
|
||||||
logstream = fopen(logfilename, "at");
|
logstream = fopen(logfilename, "at");
|
||||||
#else
|
#else
|
||||||
logstream = 0;
|
logstream = 0;
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
if (c == -1)
|
if (c == -1)
|
||||||
{
|
{
|
||||||
kill(child, SIGKILL);
|
kill(child, SIGKILL);
|
||||||
@@ -1405,8 +1443,8 @@ void I_Quit(void)
|
|||||||
/* prevent recursive I_Quit() */
|
/* prevent recursive I_Quit() */
|
||||||
if (quiting)
|
if (quiting)
|
||||||
goto death;
|
goto death;
|
||||||
|
|
||||||
quiting = false;
|
quiting = false;
|
||||||
I_ShutdownConsole();
|
|
||||||
M_SaveConfig(NULL); //save game config, cvars..
|
M_SaveConfig(NULL); //save game config, cvars..
|
||||||
D_SaveBan(); // save the ban list
|
D_SaveBan(); // save the ban list
|
||||||
G_SaveGameData(false); // Tails 12-08-2002
|
G_SaveGameData(false); // Tails 12-08-2002
|
||||||
@@ -1422,16 +1460,18 @@ void I_Quit(void)
|
|||||||
// use this for 1.28 19990220 by Kin
|
// use this for 1.28 19990220 by Kin
|
||||||
I_ShutdownGraphics();
|
I_ShutdownGraphics();
|
||||||
I_ShutdownSystem();
|
I_ShutdownSystem();
|
||||||
|
|
||||||
/* if option -noendtxt is set, don't print the text */
|
/* if option -noendtxt is set, don't print the text */
|
||||||
if (!M_CheckParm("-noendtxt") && W_CheckNumForName("ENDOOM") != LUMPERROR)
|
if (!M_CheckParm("-noendtxt") && W_CheckNumForName("ENDOOM") != LUMPERROR)
|
||||||
{
|
{
|
||||||
printf("\r");
|
printf("\r");
|
||||||
ShowEndTxt();
|
ShowEndTxt();
|
||||||
}
|
}
|
||||||
|
|
||||||
if (myargmalloc)
|
if (myargmalloc)
|
||||||
free(myargv); // Deallocate allocated memory
|
free(myargv); // Deallocate allocated memory
|
||||||
|
|
||||||
death:
|
death:
|
||||||
W_Shutdown();
|
|
||||||
exit(0);
|
exit(0);
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -1477,7 +1517,6 @@ FUNCIERROR void ATTRNORETURN I_Error(const char *error, ...)
|
|||||||
|
|
||||||
I_OutputMsg("SRB2Kart %s Recursive Error", buffer);
|
I_OutputMsg("SRB2Kart %s Recursive Error", buffer);
|
||||||
|
|
||||||
W_Shutdown();
|
|
||||||
exit(-1); // recursive errors detected
|
exit(-1); // recursive errors detected
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -1495,8 +1534,6 @@ FUNCIERROR void ATTRNORETURN I_Error(const char *error, ...)
|
|||||||
#endif
|
#endif
|
||||||
// ---
|
// ---
|
||||||
|
|
||||||
I_ShutdownConsole();
|
|
||||||
|
|
||||||
M_SaveConfig(NULL); // save game config, cvars..
|
M_SaveConfig(NULL); // save game config, cvars..
|
||||||
D_SaveBan(); // save the ban list
|
D_SaveBan(); // save the ban list
|
||||||
G_SaveGameData(false); // Tails 12-08-2002
|
G_SaveGameData(false); // Tails 12-08-2002
|
||||||
@@ -1512,8 +1549,6 @@ FUNCIERROR void ATTRNORETURN I_Error(const char *error, ...)
|
|||||||
I_ShutdownGraphics();
|
I_ShutdownGraphics();
|
||||||
I_ShutdownSystem();
|
I_ShutdownSystem();
|
||||||
|
|
||||||
W_Shutdown();
|
|
||||||
|
|
||||||
#if defined (PARANOIA) && defined (__CYGWIN__)
|
#if defined (PARANOIA) && defined (__CYGWIN__)
|
||||||
*(INT32 *)2 = 4; //Alam: Debug!
|
*(INT32 *)2 = 4; //Alam: Debug!
|
||||||
#endif
|
#endif
|
||||||
@@ -1619,9 +1654,10 @@ void I_ShutdownSystem(void)
|
|||||||
{
|
{
|
||||||
INT32 c;
|
INT32 c;
|
||||||
|
|
||||||
#ifndef NEWSIGNALHANDLER
|
#ifdef NEWSIGNALHANDLER
|
||||||
I_ShutdownConsole();
|
if (M_CheckParm("-nofork"))
|
||||||
#endif
|
#endif
|
||||||
|
I_ShutdownConsole();
|
||||||
|
|
||||||
for (c = MAX_QUIT_FUNCS-1; c >= 0; c--)
|
for (c = MAX_QUIT_FUNCS-1; c >= 0; c--)
|
||||||
if (quit_funcs[c])
|
if (quit_funcs[c])
|
||||||
|
|||||||
+209
-287
File diff suppressed because it is too large.
Load diff
@@ -13,6 +13,10 @@
|
|||||||
#ifndef __DEHACKED_H__
|
#ifndef __DEHACKED_H__
|
||||||
#define __DEHACKED_H__
|
#define __DEHACKED_H__
|
||||||
|
|
||||||
|
#ifdef __cplusplus
|
||||||
|
extern "C" {
|
||||||
|
#endif
|
||||||
|
|
||||||
#include "m_fixed.h" // for get_number
|
#include "m_fixed.h" // for get_number
|
||||||
#include "info.h"
|
#include "info.h"
|
||||||
|
|
||||||
@@ -71,4 +75,9 @@ typedef struct
|
|||||||
} MYFILE;
|
} MYFILE;
|
||||||
#define myfeof(a) (a->data + a->size <= a->curpos)
|
#define myfeof(a) (a->data + a->size <= a->curpos)
|
||||||
char *myfgets(char *buf, size_t bufsize, MYFILE *f);
|
char *myfgets(char *buf, size_t bufsize, MYFILE *f);
|
||||||
|
|
||||||
|
#ifdef __cplusplus
|
||||||
|
} // extern "C"
|
||||||
|
#endif
|
||||||
|
|
||||||
#endif
|
#endif
|
||||||
+1
-1
@@ -61,7 +61,7 @@ enum
|
|||||||
typedef struct
|
typedef struct
|
||||||
{
|
{
|
||||||
INT16 x, y;
|
INT16 x, y;
|
||||||
}ATTRPACK mapvertex_t;
|
} ATTRPACK mapvertex_t;
|
||||||
|
|
||||||
// A SideDef, defining the visual appearance of a wall,
|
// A SideDef, defining the visual appearance of a wall,
|
||||||
// by setting textures and offsets.
|
// by setting textures and offsets.
|
||||||
|
|||||||
+43
-29
@@ -40,24 +40,47 @@
|
|||||||
#define ASMCALL
|
#define ASMCALL
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#define _USE_MATH_DEFINES // fixes M_PI errors in r_plane.c for Visual Studio
|
|
||||||
#ifdef __cplusplus
|
|
||||||
#include <cmath>
|
|
||||||
#else
|
|
||||||
#include <math.h>
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#ifdef __cplusplus
|
|
||||||
extern "C" {
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#include "doomtype.h"
|
#include "doomtype.h"
|
||||||
|
|
||||||
|
#ifdef __cplusplus /* Only when compiled as C++ */
|
||||||
|
#include <algorithm> /* std::min, std::max, std::sort, … */
|
||||||
|
#endif
|
||||||
|
|
||||||
|
#ifdef __cplusplus
|
||||||
|
// Force libc++ to expose std::min/std::max even when <cmath> is included first (Apple clang quirk)
|
||||||
|
#ifndef _LIBCPP_ENABLE_CXX17_REMOVED_FEATURES
|
||||||
|
#define _LIBCPP_ENABLE_CXX17_REMOVED_FEATURES
|
||||||
|
#endif
|
||||||
|
#ifndef _LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS
|
||||||
|
#define _LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS
|
||||||
|
#endif
|
||||||
|
|
||||||
|
// Optional: only try <version> if it actually exists (newer Xcode)
|
||||||
|
#if __has_include(<version>)
|
||||||
|
#include <version>
|
||||||
|
#endif
|
||||||
|
|
||||||
|
#define _USE_MATH_DEFINES
|
||||||
|
#include <cmath>
|
||||||
|
#include <cstdarg>
|
||||||
|
#include <cstdio>
|
||||||
|
#include <cstdlib>
|
||||||
|
#include <cstddef>
|
||||||
|
#include <cstring>
|
||||||
|
#include <climits>
|
||||||
|
|
||||||
|
extern "C" {
|
||||||
|
#else
|
||||||
|
#include <math.h>
|
||||||
#include <stdarg.h>
|
#include <stdarg.h>
|
||||||
#include <stdio.h>
|
#include <stdio.h>
|
||||||
#include <stdlib.h>
|
#include <stdlib.h>
|
||||||
|
#include <stddef.h>
|
||||||
#include <string.h>
|
#include <string.h>
|
||||||
|
|
||||||
|
#include <limits.h>
|
||||||
|
#endif
|
||||||
|
|
||||||
#include <sys/types.h>
|
#include <sys/types.h>
|
||||||
#include <sys/stat.h>
|
#include <sys/stat.h>
|
||||||
#include <ctype.h>
|
#include <ctype.h>
|
||||||
@@ -107,8 +130,8 @@ extern char logfilename[1024];
|
|||||||
#else
|
#else
|
||||||
#define VERSION 1 // Game version
|
#define VERSION 1 // Game version
|
||||||
#define SUBVERSION 6 // more precise version number
|
#define SUBVERSION 6 // more precise version number
|
||||||
#define VERSIONSTRING "Saturn v9.2"
|
#define VERSIONSTRING "Saturn v9.3"
|
||||||
#define VERSIONSTRINGW L"Saturn v9.2"
|
#define VERSIONSTRINGW L"Saturn v9.3"
|
||||||
|
|
||||||
#define SATURN_TESTING // comment out for saturn release builds!
|
#define SATURN_TESTING // comment out for saturn release builds!
|
||||||
|
|
||||||
@@ -493,22 +516,6 @@ extern boolean capslock;
|
|||||||
// i_system.c, replace getchar() once the keyboard has been appropriated
|
// i_system.c, replace getchar() once the keyboard has been appropriated
|
||||||
INT32 I_GetKey(void);
|
INT32 I_GetKey(void);
|
||||||
|
|
||||||
/* http://www.cse.yorku.ca/~oz/hash.html */
|
|
||||||
static inline
|
|
||||||
UINT32 quickncasehash (const char *p, size_t n)
|
|
||||||
{
|
|
||||||
size_t i = 0;
|
|
||||||
UINT32 x = 5381;
|
|
||||||
|
|
||||||
while (i < n && p[i])
|
|
||||||
{
|
|
||||||
x = (x * 33) ^ tolower(p[i]);
|
|
||||||
i++;
|
|
||||||
}
|
|
||||||
|
|
||||||
return x;
|
|
||||||
}
|
|
||||||
|
|
||||||
#ifndef __cplusplus
|
#ifndef __cplusplus
|
||||||
#ifndef min // Double-Check with WATTCP-32's cdefs.h
|
#ifndef min // Double-Check with WATTCP-32's cdefs.h
|
||||||
#define min(x, y) (((x) < (y)) ? (x) : (y))
|
#define min(x, y) (((x) < (y)) ? (x) : (y))
|
||||||
@@ -566,6 +573,13 @@ UINT32 quickncasehash (const char *p, size_t n)
|
|||||||
// NOTE: you WILL have nasal troubles if the variable is not initialized
|
// NOTE: you WILL have nasal troubles if the variable is not initialized
|
||||||
#define CLEANUP(f) __attribute__((__cleanup__(f)))
|
#define CLEANUP(f) __attribute__((__cleanup__(f)))
|
||||||
|
|
||||||
|
// the GNU constructor and destructor attributes
|
||||||
|
// The constructor attribute causes the function to be called automatically before execution enters main ().
|
||||||
|
// Similarly, the destructor attribute causes the function to be called automatically after main () has completed or exit () has been called.
|
||||||
|
// Functions with these attributes are useful for initializing data that will be used implicitly during the execution of the program.
|
||||||
|
#define CONSTRUCTOR __attribute__((constructor, used))
|
||||||
|
#define DESTRUCTOR __attribute__((destructor, used))
|
||||||
|
|
||||||
// An assert-type mechanism.
|
// An assert-type mechanism.
|
||||||
#ifdef PARANOIA
|
#ifdef PARANOIA
|
||||||
#define I_Assert(e) ((e) ? (void)0 : I_Error("assert failed: %s, file %s, line %d", #e, __FILE__, __LINE__))
|
#define I_Assert(e) ((e) ? (void)0 : I_Error("assert failed: %s, file %s, line %d", #e, __FILE__, __LINE__))
|
||||||
|
|||||||
+4
-46
@@ -54,7 +54,6 @@ extern INT16 maptol;
|
|||||||
extern UINT8 globalweather;
|
extern UINT8 globalweather;
|
||||||
extern INT32 curWeather;
|
extern INT32 curWeather;
|
||||||
extern INT32 cursaveslot;
|
extern INT32 cursaveslot;
|
||||||
extern INT16 lastmapsaved;
|
|
||||||
extern boolean gamecomplete;
|
extern boolean gamecomplete;
|
||||||
|
|
||||||
#define PRECIP_NONE 0
|
#define PRECIP_NONE 0
|
||||||
@@ -78,7 +77,6 @@ extern boolean imcontinuing; // Temporary flag while continuing
|
|||||||
extern UINT8 modeattacking;
|
extern UINT8 modeattacking;
|
||||||
|
|
||||||
// menu demo things
|
// menu demo things
|
||||||
extern UINT8 numDemos;
|
|
||||||
extern UINT32 demoDelayTime;
|
extern UINT32 demoDelayTime;
|
||||||
extern UINT32 demoIdleTime;
|
extern UINT32 demoIdleTime;
|
||||||
|
|
||||||
@@ -114,8 +112,8 @@ extern UINT8 paused; // Game paused?
|
|||||||
extern UINT8 window_notinfocus; // are we in focus? (backend independant -- handles auto pausing and display of "focus lost" message)
|
extern UINT8 window_notinfocus; // are we in focus? (backend independant -- handles auto pausing and display of "focus lost" message)
|
||||||
|
|
||||||
extern boolean nodrawers;
|
extern boolean nodrawers;
|
||||||
extern boolean noblit;
|
|
||||||
extern boolean lastdraw;
|
extern boolean lastdraw;
|
||||||
|
extern boolean intermissionbginit;
|
||||||
|
|
||||||
#ifdef MOTIONBLUR
|
#ifdef MOTIONBLUR
|
||||||
extern INT32 postimgparam[MAXSPLITSCREENPLAYERS];
|
extern INT32 postimgparam[MAXSPLITSCREENPLAYERS];
|
||||||
@@ -205,12 +203,6 @@ extern struct quake
|
|||||||
fixed_t radius, intensity;
|
fixed_t radius, intensity;
|
||||||
} quake;
|
} quake;
|
||||||
|
|
||||||
// NiGHTS grades
|
|
||||||
typedef struct
|
|
||||||
{
|
|
||||||
UINT32 grade[6]; // D, C, B, A, S, X (F: failed to reach any of these)
|
|
||||||
} nightsgrades_t;
|
|
||||||
|
|
||||||
// Custom Lua values
|
// Custom Lua values
|
||||||
// (This is not ifdeffed so the map header structure can stay identical, just in case.)
|
// (This is not ifdeffed so the map header structure can stay identical, just in case.)
|
||||||
typedef struct
|
typedef struct
|
||||||
@@ -261,28 +253,16 @@ typedef struct
|
|||||||
UINT8 numlaps; ///< Number of laps in circuit mode, unless overridden.
|
UINT8 numlaps; ///< Number of laps in circuit mode, unless overridden.
|
||||||
SINT8 unlockrequired; ///< Is an unlockable required to play this level? -1 if no.
|
SINT8 unlockrequired; ///< Is an unlockable required to play this level? -1 if no.
|
||||||
UINT8 levelselect; ///< Is this map available in the level select? If so, which map list is it available in?
|
UINT8 levelselect; ///< Is this map available in the level select? If so, which map list is it available in?
|
||||||
SINT8 bonustype; ///< What type of bonus does this level have? (-1 for null.)
|
|
||||||
SINT8 saveoverride; ///< Set how the game is allowed to save (1 for always, -1 for never, 0 is 2.1 default)
|
|
||||||
|
|
||||||
UINT8 levelflags; ///< LF_flags: merged eight booleans into one UINT8 for space, see below
|
UINT8 levelflags; ///< LF_flags: merged eight booleans into one UINT8 for space, see below
|
||||||
UINT8 menuflags; ///< LF2_flags: options that affect record attack / nights mode menus
|
UINT8 menuflags; ///< LF2_flags: options that affect record attack / nights mode menus
|
||||||
|
|
||||||
// NiGHTS stuff.
|
|
||||||
UINT8 numGradedMares; ///< Internal. For grade support.
|
|
||||||
nightsgrades_t *grades; ///< NiGHTS grades. Allocated dynamically for space reasons. Be careful.
|
|
||||||
|
|
||||||
// SRB2kart
|
// SRB2kart
|
||||||
//boolean automap; ///< Displays a level's white map outline in modified games
|
|
||||||
fixed_t mobj_scale; ///< Replacement for TOL_ERZ3
|
fixed_t mobj_scale; ///< Replacement for TOL_ERZ3
|
||||||
|
|
||||||
mapheader_lighting_t lighting; ///< Wall and sprite lighting
|
mapheader_lighting_t lighting; ///< Wall and sprite lighting
|
||||||
mapheader_lighting_t lighting_encore; ///< Alternative lighting for Encore mode
|
mapheader_lighting_t lighting_encore; ///< Alternative lighting for Encore mode
|
||||||
boolean use_encore_lighting; ///< Whether to use separate Encore lighting
|
boolean use_encore_lighting; ///< Whether to use separate Encore lighting
|
||||||
|
|
||||||
// Music stuff.
|
|
||||||
UINT32 musinterfadeout; ///< Fade out level music on intermission screen in milliseconds
|
|
||||||
char musintername[7]; ///< Intermission screen music.
|
|
||||||
|
|
||||||
// Lua stuff.
|
// Lua stuff.
|
||||||
// (This is not ifdeffed so the map header structure can stay identical, just in case.)
|
// (This is not ifdeffed so the map header structure can stay identical, just in case.)
|
||||||
UINT8 numCustomOptions; ///< Internal. For Lua custom value support.
|
UINT8 numCustomOptions; ///< Internal. For Lua custom value support.
|
||||||
@@ -379,8 +359,6 @@ typedef struct
|
|||||||
{
|
{
|
||||||
tic_t time; ///< Time in which the level was finished.
|
tic_t time; ///< Time in which the level was finished.
|
||||||
tic_t lap; ///< Best lap time for this level.
|
tic_t lap; ///< Best lap time for this level.
|
||||||
//UINT32 score; ///< Score when the level was finished.
|
|
||||||
//UINT16 rings; ///< Rings when the level was finished.
|
|
||||||
} recorddata_t;
|
} recorddata_t;
|
||||||
|
|
||||||
/** Setup for one NiGHTS map.
|
/** Setup for one NiGHTS map.
|
||||||
@@ -394,34 +372,19 @@ typedef struct
|
|||||||
#define GRADE_A 5
|
#define GRADE_A 5
|
||||||
#define GRADE_S 6
|
#define GRADE_S 6
|
||||||
|
|
||||||
/*typedef struct
|
|
||||||
{
|
|
||||||
// 8 mares, 1 overall (0)
|
|
||||||
UINT8 nummares;
|
|
||||||
UINT32 score[9];
|
|
||||||
UINT8 grade[9];
|
|
||||||
tic_t time[9];
|
|
||||||
} nightsdata_t;*/
|
|
||||||
|
|
||||||
//extern nightsdata_t *nightsrecords[NUMMAPS];
|
|
||||||
extern recorddata_t *mainrecords[NUMMAPS];
|
extern recorddata_t *mainrecords[NUMMAPS];
|
||||||
|
|
||||||
// mapvisited is now a set of flags that says what we've done in the map.
|
// mapvisited is now a set of flags that says what we've done in the map.
|
||||||
#define MV_VISITED 1
|
#define MV_VISITED 1
|
||||||
#define MV_BEATEN 2
|
#define MV_BEATEN 2
|
||||||
#define MV_ALLEMERALDS 4
|
#define MV_ALLEMERALDS 4
|
||||||
//#define MV_ULTIMATE 8
|
|
||||||
//#define MV_PERFECT 16
|
|
||||||
#define MV_MAX 7 // used in gamedata check
|
#define MV_MAX 7 // used in gamedata check
|
||||||
extern UINT8 mapvisited[NUMMAPS];
|
extern UINT8 mapvisited[NUMMAPS];
|
||||||
|
|
||||||
// Temporary holding place for nights data for the current map
|
extern UINT32 token; ///< Number of tokens collected in a level
|
||||||
//nightsdata_t ntemprecords;
|
|
||||||
|
|
||||||
extern UINT32 token; ///< Number of tokens collected in a level
|
|
||||||
extern UINT32 tokenlist; ///< List of tokens collected
|
extern UINT32 tokenlist; ///< List of tokens collected
|
||||||
extern INT32 tokenbits; ///< Used for setting token bits
|
extern INT32 tokenbits; ///< Used for setting token bits
|
||||||
extern INT32 sstimer; ///< Time allotted in the special stage
|
extern INT32 sstimer; ///< Time allotted in the special stage
|
||||||
extern UINT32 bluescore; ///< Blue Team Scores
|
extern UINT32 bluescore; ///< Blue Team Scores
|
||||||
extern UINT32 redscore; ///< Red Team Scores
|
extern UINT32 redscore; ///< Red Team Scores
|
||||||
|
|
||||||
@@ -437,9 +400,6 @@ extern boolean CheckForReverseGravity;
|
|||||||
extern UINT16 invulntics;
|
extern UINT16 invulntics;
|
||||||
extern UINT16 sneakertics;
|
extern UINT16 sneakertics;
|
||||||
extern UINT16 flashingtics;
|
extern UINT16 flashingtics;
|
||||||
extern UINT16 tailsflytics;
|
|
||||||
extern UINT16 underwatertics;
|
|
||||||
extern UINT16 spacetimetics;
|
|
||||||
extern UINT16 extralifetics;
|
extern UINT16 extralifetics;
|
||||||
|
|
||||||
// SRB2kart
|
// SRB2kart
|
||||||
@@ -461,7 +421,6 @@ extern UINT8 introtoplay;
|
|||||||
extern UINT8 creditscutscene;
|
extern UINT8 creditscutscene;
|
||||||
|
|
||||||
extern UINT8 use1upSound;
|
extern UINT8 use1upSound;
|
||||||
extern UINT8 maxXtraLife; // Max extra lives from rings
|
|
||||||
|
|
||||||
extern mobj_t *hunt1, *hunt2, *hunt3; // Emerald hunt locations
|
extern mobj_t *hunt1, *hunt2, *hunt3; // Emerald hunt locations
|
||||||
|
|
||||||
@@ -526,7 +485,6 @@ extern UINT32 timesBeatenWithEmeralds;
|
|||||||
// WAD, partly set at startup time.
|
// WAD, partly set at startup time.
|
||||||
|
|
||||||
extern tic_t gametic;
|
extern tic_t gametic;
|
||||||
#define localgametic leveltime
|
|
||||||
|
|
||||||
// Player spawn spots.
|
// Player spawn spots.
|
||||||
extern mapthing_t *playerstarts[MAXPLAYERS]; // Cooperative
|
extern mapthing_t *playerstarts[MAXPLAYERS]; // Cooperative
|
||||||
|
|||||||
+16
-5
@@ -68,8 +68,21 @@ extern "C" {
|
|||||||
#define strnicmp(x,y,n) strncasecmp(x,y,n)
|
#define strnicmp(x,y,n) strncasecmp(x,y,n)
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
char *nongnu_strcasestr(const char *in, const char *what);
|
// glibc 2.43 made alot of standard lib functions propagate the constness of its input pointers
|
||||||
|
// to not cause warnings or compile issues on older glibc versions we do this silly thing
|
||||||
|
// to not have a gazillion glibc version checks
|
||||||
|
#if defined(__GLIBC_PREREQ)
|
||||||
|
#if __GLIBC_PREREQ(2, 43)
|
||||||
|
#define gconst const
|
||||||
|
#else
|
||||||
|
#define gconst
|
||||||
|
#endif
|
||||||
|
#else
|
||||||
|
#define gconst
|
||||||
|
#endif
|
||||||
|
|
||||||
#ifndef _GNU_SOURCE
|
#ifndef _GNU_SOURCE
|
||||||
|
char *nongnu_strcasestr(const char *in, const char *what);
|
||||||
#define strcasestr nongnu_strcasestr
|
#define strcasestr nongnu_strcasestr
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
@@ -127,9 +140,9 @@ size_t strlcpy(char *dst, const char *src, size_t dsize);
|
|||||||
#define STRBUFCPY(dst,src) strlcpy(dst, src, sizeof dst)
|
#define STRBUFCPY(dst,src) strlcpy(dst, src, sizeof dst)
|
||||||
|
|
||||||
/* Boolean type definition */
|
/* Boolean type definition */
|
||||||
|
#include <stdbool.h>
|
||||||
|
|
||||||
#ifndef _WIN32
|
#ifndef _WIN32
|
||||||
#include <stdbool.h>
|
|
||||||
// dont use stdbools _BOOL type
|
// dont use stdbools _BOOL type
|
||||||
// its smaller (1 byte) than the old interger bool (4 bytes)
|
// its smaller (1 byte) than the old interger bool (4 bytes)
|
||||||
// which results in packed struct sizes being mismatched between vanilla and this
|
// which results in packed struct sizes being mismatched between vanilla and this
|
||||||
@@ -137,9 +150,7 @@ size_t strlcpy(char *dst, const char *src, size_t dsize);
|
|||||||
// which we cant use as enumeration constants
|
// which we cant use as enumeration constants
|
||||||
typedef int32_t boolean;
|
typedef int32_t boolean;
|
||||||
#else
|
#else
|
||||||
#define false FALSE
|
#define boolean int32_t
|
||||||
#define true TRUE
|
|
||||||
#define boolean BOOL
|
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
/* 7.18.2.1 Limits of exact-width integer types */
|
/* 7.18.2.1 Limits of exact-width integer types */
|
||||||
|
|||||||
+2
-12
@@ -1110,14 +1110,6 @@ void F_TitleScreenTicker(boolean run)
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
// Replay intro when done cycling through demos
|
|
||||||
/*if (curDemo == numDemos) -- uuuh... we have a LOT of maps AND a big devteam... probably not gonna see a repeat unless you're super unlucky :V
|
|
||||||
{
|
|
||||||
curDemo = 0;
|
|
||||||
F_StartIntro();
|
|
||||||
return;
|
|
||||||
}*/
|
|
||||||
|
|
||||||
mapname = G_BuildMapName(G_RandMap(TOL_RACE, -2, false, 0, false, NULL)+1);
|
mapname = G_BuildMapName(G_RandMap(TOL_RACE, -2, false, 0, false, NULL)+1);
|
||||||
|
|
||||||
numstaff = 1;
|
numstaff = 1;
|
||||||
@@ -1172,9 +1164,7 @@ void F_StartWaitingPlayers(void)
|
|||||||
randskin = M_RandomKey(numskins);
|
randskin = M_RandomKey(numskins);
|
||||||
boolean waithires = skins[randskin].flags && SF_HIRES;
|
boolean waithires = skins[randskin].flags && SF_HIRES;
|
||||||
|
|
||||||
if (waitcolormap)
|
Z_Free(waitcolormap);
|
||||||
Z_Free(waitcolormap);
|
|
||||||
|
|
||||||
waitcolormap = R_GetTranslationColormap(randskin, skins[randskin].prefcolor, 0);
|
waitcolormap = R_GetTranslationColormap(randskin, skins[randskin].prefcolor, 0);
|
||||||
|
|
||||||
if (waithires)
|
if (waithires)
|
||||||
@@ -1318,7 +1308,7 @@ boolean F_ContinueResponder(event_t *event)
|
|||||||
keypressed = true;
|
keypressed = true;
|
||||||
imcontinuing = true;
|
imcontinuing = true;
|
||||||
continuetime = TICRATE;
|
continuetime = TICRATE;
|
||||||
S_StartSound(0, sfx_itemup);
|
S_StartSound(NULL, sfx_itemup);
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -361,6 +361,11 @@ void F_RunWipe(UINT8 wipetype, boolean drawMenu)
|
|||||||
// on for fade-to-black
|
// on for fade-to-black
|
||||||
for (;;)
|
for (;;)
|
||||||
{
|
{
|
||||||
|
if (I_Interrupted())
|
||||||
|
{
|
||||||
|
I_Quit();
|
||||||
|
}
|
||||||
|
|
||||||
// get fademask first so we can tell if it exists or not
|
// get fademask first so we can tell if it exists or not
|
||||||
fmask = F_GetFadeMask(wipetype, wipeframe++);
|
fmask = F_GetFadeMask(wipetype, wipeframe++);
|
||||||
|
|
||||||
|
|||||||
+14
-11
@@ -49,7 +49,7 @@ 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 = NULL, **coredirmenu = NULL; // core only local for this file
|
char **dirmenu = NULL, **coredirmenu = NULL; // core only local for this file
|
||||||
size_t sizedirmenu = 0, sizecoredirmenu = 0; // ditto
|
size_t sizedirmenu = 0, sizecoredirmenu = 0; // ditto
|
||||||
@@ -111,10 +111,12 @@ filestatus_t filesearch(char *filename, const char *startpath, const UINT8 *want
|
|||||||
char *searchname;
|
char *searchname;
|
||||||
int depthleft = maxsearchdepth;
|
int depthleft = maxsearchdepth;
|
||||||
char searchpath[MAXFILEPATH];
|
char searchpath[MAXFILEPATH];
|
||||||
size_t *searchpathindex;
|
size_t *searchpathindex = NULL;
|
||||||
|
|
||||||
dirhandle = (DIR**)malloc(maxsearchdepth * sizeof(DIR*));
|
dirhandle = (DIR**)malloc(maxsearchdepth * sizeof(DIR*));
|
||||||
searchpathindex = (size_t *)malloc(maxsearchdepth * sizeof(size_t));
|
searchpathindex = (size_t *)malloc(maxsearchdepth * sizeof(size_t));
|
||||||
|
if (!searchpathindex)
|
||||||
|
I_Error("out of memory while searching for file %s\n", filename);
|
||||||
|
|
||||||
strcpy(searchpath, startpath);
|
strcpy(searchpath, startpath);
|
||||||
searchpathindex[--depthleft] = strlen(searchpath) + 1;
|
searchpathindex[--depthleft] = strlen(searchpath) + 1;
|
||||||
@@ -271,10 +273,13 @@ static boolean filemenucmp(char *haystack, char *needle)
|
|||||||
{
|
{
|
||||||
static char localhaystack[128];
|
static char localhaystack[128];
|
||||||
strlcpy(localhaystack, haystack, 128);
|
strlcpy(localhaystack, haystack, 128);
|
||||||
|
|
||||||
if (!cv_addons_search_case.value)
|
if (!cv_addons_search_case.value)
|
||||||
strupr(localhaystack);
|
strupr(localhaystack);
|
||||||
|
|
||||||
if (cv_addons_search_type.value)
|
if (cv_addons_search_type.value)
|
||||||
return (strstr(localhaystack, needle) != 0);
|
return (strstr(localhaystack, needle) != NULL);
|
||||||
|
|
||||||
return (!strncmp(localhaystack, needle, menusearch.length));
|
return (!strncmp(localhaystack, needle, menusearch.length));
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -314,8 +319,7 @@ void closefilemenu(boolean validsize)
|
|||||||
coredirmenu = NULL;
|
coredirmenu = NULL;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (refreshdirname)
|
Z_Free(refreshdirname);
|
||||||
Z_Free(refreshdirname);
|
|
||||||
refreshdirname = NULL;
|
refreshdirname = NULL;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -343,8 +347,7 @@ void searchfilemenu(char *tempname)
|
|||||||
|
|
||||||
if (!menusearch.length)
|
if (!menusearch.length)
|
||||||
{
|
{
|
||||||
if (dirmenu)
|
Z_Free(dirmenu);
|
||||||
Z_Free(dirmenu);
|
|
||||||
dirmenu = coredirmenu;
|
dirmenu = coredirmenu;
|
||||||
sizedirmenu = sizecoredirmenu;
|
sizedirmenu = sizecoredirmenu;
|
||||||
|
|
||||||
@@ -386,8 +389,8 @@ void searchfilemenu(char *tempname)
|
|||||||
I_Error("searchfilemenu(): could not create \"No results...\".");
|
I_Error("searchfilemenu(): could not create \"No results...\".");
|
||||||
sizedirmenu = 1;
|
sizedirmenu = 1;
|
||||||
dir_on[menudepthleft] = 0;
|
dir_on[menudepthleft] = 0;
|
||||||
if (tempname)
|
Z_Free(tempname);
|
||||||
Z_Free(tempname);
|
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -502,8 +505,8 @@ boolean preparefilemenu(boolean samedepth, boolean replayhut)
|
|||||||
{
|
{
|
||||||
closedir(dirhandle);
|
closedir(dirhandle);
|
||||||
closefilemenu(false);
|
closefilemenu(false);
|
||||||
if (tempname)
|
Z_Free(tempname);
|
||||||
Z_Free(tempname);
|
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
+43
-49
@@ -66,17 +66,15 @@
|
|||||||
#include <locale.h>
|
#include <locale.h>
|
||||||
|
|
||||||
// menu demo things
|
// menu demo things
|
||||||
UINT8 numDemos = 0; //3; -- i'm FED UP of losing my skincolour to a broken demo. change this back when we make new ones
|
|
||||||
UINT32 demoDelayTime = 15*TICRATE;
|
UINT32 demoDelayTime = 15*TICRATE;
|
||||||
UINT32 demoIdleTime = 3*TICRATE;
|
UINT32 demoIdleTime = 3*TICRATE;
|
||||||
|
|
||||||
boolean nodrawers = false; // for comparative timing purposes
|
boolean nodrawers = false; // for comparative timing purposes
|
||||||
boolean noblit = false; // for comparative timing purposes
|
|
||||||
static tic_t demostarttime; // for comparative timing purposes
|
static tic_t demostarttime; // for comparative timing purposes
|
||||||
|
|
||||||
//@TODO put these all in a struct for namespacing purposes?
|
//@TODO put these all in a struct for namespacing purposes?
|
||||||
static char demoname[128];
|
static char demoname[128];
|
||||||
savebuffer_t demobuf = {0};
|
savebuffer_t demobuf = {};
|
||||||
static UINT8 *demotime_p, *demoinfo_p;
|
static UINT8 *demotime_p, *demoinfo_p;
|
||||||
static UINT8 *demoend;
|
static UINT8 *demoend;
|
||||||
static UINT8 demoflags;
|
static UINT8 demoflags;
|
||||||
@@ -1653,10 +1651,12 @@ void G_RecordDemo(const char *name)
|
|||||||
maxsize = cv_maxdemosize.value*1024*1024;
|
maxsize = cv_maxdemosize.value*1024*1024;
|
||||||
|
|
||||||
demobuf.buffer = Z_Malloc(maxsize + 100*1024, PU_STATIC, NULL);
|
demobuf.buffer = Z_Malloc(maxsize + 100*1024, PU_STATIC, NULL);
|
||||||
demoend = demobuf.buffer + maxsize;
|
|
||||||
|
|
||||||
if (demobuf.buffer)
|
if (demobuf.buffer)
|
||||||
|
{
|
||||||
|
demoend = demobuf.buffer + maxsize;
|
||||||
demo.recording = true;
|
demo.recording = true;
|
||||||
|
}
|
||||||
else
|
else
|
||||||
CONS_Alert(CONS_ERROR, "Failed to allocate demo buffer\n");
|
CONS_Alert(CONS_ERROR, "Failed to allocate demo buffer\n");
|
||||||
}
|
}
|
||||||
@@ -1994,7 +1994,6 @@ static UINT8 G_CheckDemoExtraFiles(UINT8 **pp, boolean quick)
|
|||||||
UINT8 totalfiles, filesloaded, nmusfilecount;
|
UINT8 totalfiles, filesloaded, nmusfilecount;
|
||||||
char filename[MAX_WADPATH];
|
char filename[MAX_WADPATH];
|
||||||
UINT8 md5sum[16];
|
UINT8 md5sum[16];
|
||||||
boolean toomany = false;
|
|
||||||
boolean alreadyloaded;
|
boolean alreadyloaded;
|
||||||
UINT8 i, j;
|
UINT8 i, j;
|
||||||
UINT8 error = 0;
|
UINT8 error = 0;
|
||||||
@@ -2004,53 +2003,44 @@ static UINT8 G_CheckDemoExtraFiles(UINT8 **pp, boolean quick)
|
|||||||
|
|
||||||
for (i = 0; i < totalfiles; ++i)
|
for (i = 0; i < totalfiles; ++i)
|
||||||
{
|
{
|
||||||
if (toomany)
|
strlcpy(filename, (char *)(*pp), sizeof filename);
|
||||||
SKIPSTRING((*pp));
|
SKIPSTRING((*pp));
|
||||||
else
|
|
||||||
{
|
|
||||||
strlcpy(filename, (char *)(*pp), sizeof filename);
|
|
||||||
SKIPSTRING((*pp));
|
|
||||||
}
|
|
||||||
|
|
||||||
READMEM((*pp), md5sum, 16); // hue hue peepee
|
READMEM((*pp), md5sum, 16); // hue hue peepee
|
||||||
|
|
||||||
if (!toomany)
|
alreadyloaded = false;
|
||||||
|
nmusfilecount = 0;
|
||||||
|
|
||||||
|
for (j = 0; j < numwadfiles; ++j)
|
||||||
{
|
{
|
||||||
alreadyloaded = false;
|
if (wadfiles[j]->important && j > mainwads)
|
||||||
nmusfilecount = 0;
|
nmusfilecount++;
|
||||||
|
else
|
||||||
for (j = 0; j < numwadfiles; ++j)
|
|
||||||
{
|
|
||||||
if (wadfiles[j]->important && j > mainwads)
|
|
||||||
nmusfilecount++;
|
|
||||||
else
|
|
||||||
continue;
|
|
||||||
|
|
||||||
if (memcmp(md5sum, wadfiles[j]->md5sum, 16) == 0)
|
|
||||||
{
|
|
||||||
alreadyloaded = true;
|
|
||||||
|
|
||||||
if (i != nmusfilecount-1 && error < DFILE_ERROR_OUTOFORDER)
|
|
||||||
error |= DFILE_ERROR_OUTOFORDER;
|
|
||||||
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
if (alreadyloaded)
|
|
||||||
{
|
|
||||||
filesloaded++;
|
|
||||||
continue;
|
continue;
|
||||||
}
|
|
||||||
|
|
||||||
if (numwadfiles >= MAX_WADFILES)
|
if (memcmp(md5sum, wadfiles[j]->md5sum, 16) == 0)
|
||||||
error = DFILE_ERROR_CANNOTLOAD;
|
{
|
||||||
else if (!quick && findfile(filename, md5sum, false) != FS_FOUND)
|
alreadyloaded = true;
|
||||||
error = DFILE_ERROR_CANNOTLOAD;
|
|
||||||
else if (error < DFILE_ERROR_INCOMPLETEOUTOFORDER)
|
if (i != nmusfilecount-1 && error < DFILE_ERROR_OUTOFORDER)
|
||||||
error |= DFILE_ERROR_NOTLOADED;
|
error |= DFILE_ERROR_OUTOFORDER;
|
||||||
} else
|
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
if (alreadyloaded)
|
||||||
|
{
|
||||||
|
filesloaded++;
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (numwadfiles >= MAX_WADFILES)
|
||||||
error = DFILE_ERROR_CANNOTLOAD;
|
error = DFILE_ERROR_CANNOTLOAD;
|
||||||
|
else if (!quick && findfile(filename, md5sum, false) != FS_FOUND)
|
||||||
|
error = DFILE_ERROR_CANNOTLOAD;
|
||||||
|
else if (error < DFILE_ERROR_INCOMPLETEOUTOFORDER)
|
||||||
|
error |= DFILE_ERROR_NOTLOADED;
|
||||||
}
|
}
|
||||||
|
|
||||||
// Get final file count
|
// Get final file count
|
||||||
@@ -2605,7 +2595,7 @@ void G_DoPlayDemo(char *defdemoname)
|
|||||||
boolean skiperrors = false;
|
boolean skiperrors = false;
|
||||||
#endif
|
#endif
|
||||||
boolean spectator;
|
boolean spectator;
|
||||||
UINT8 slots[MAXPLAYERS], kartspeed[MAXPLAYERS], kartweight[MAXPLAYERS], numslots = 0;
|
UINT8 slots[MAXPLAYERS] = {}, kartspeed[MAXPLAYERS] = {}, kartweight[MAXPLAYERS] = {}, numslots = 0;
|
||||||
|
|
||||||
G_InitDemoRewind();
|
G_InitDemoRewind();
|
||||||
|
|
||||||
@@ -2616,7 +2606,7 @@ void G_DoPlayDemo(char *defdemoname)
|
|||||||
if (defdemoname == NULL)
|
if (defdemoname == NULL)
|
||||||
{
|
{
|
||||||
demobuf.p = demobuf.buffer;
|
demobuf.p = demobuf.buffer;
|
||||||
pdemoname = ZZ_Alloc(1); // Easier than adding checks for this everywhere it's freed
|
pdemoname = ZZ_Calloc(1); // Easier than adding checks for this everywhere it's freed
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
@@ -2628,7 +2618,7 @@ void G_DoPlayDemo(char *defdemoname)
|
|||||||
n++;
|
n++;
|
||||||
|
|
||||||
pdemoname = ZZ_Alloc(strlen(n)+1);
|
pdemoname = ZZ_Alloc(strlen(n)+1);
|
||||||
strcpy(pdemoname,n);
|
strcpy(pdemoname, n);
|
||||||
|
|
||||||
M_SetPlaybackMenuPointer();
|
M_SetPlaybackMenuPointer();
|
||||||
|
|
||||||
@@ -3090,6 +3080,9 @@ post_compat:
|
|||||||
if (cv_director.value)
|
if (cv_director.value)
|
||||||
CV_SetValue(&cv_director, 0);
|
CV_SetValue(&cv_director, 0);
|
||||||
|
|
||||||
|
if (demo.timing)
|
||||||
|
G_DoneLevelLoad();
|
||||||
|
|
||||||
demo.deferstart = true;
|
demo.deferstart = true;
|
||||||
}
|
}
|
||||||
#undef SKIPERRORS
|
#undef SKIPERRORS
|
||||||
@@ -3517,10 +3510,11 @@ static INT32 restorecv_vidwait;
|
|||||||
void G_TimeDemo(const char *name)
|
void G_TimeDemo(const char *name)
|
||||||
{
|
{
|
||||||
nodrawers = M_CheckParm("-nodraw");
|
nodrawers = M_CheckParm("-nodraw");
|
||||||
noblit = M_CheckParm("-noblit");
|
|
||||||
restorecv_vidwait = cv_vidwait.value;
|
restorecv_vidwait = cv_vidwait.value;
|
||||||
if (cv_vidwait.value)
|
if (cv_vidwait.value)
|
||||||
CV_Set(&cv_vidwait, "0");
|
CV_Set(&cv_vidwait, "0");
|
||||||
|
|
||||||
demo.timing = true;
|
demo.timing = true;
|
||||||
singletics = true;
|
singletics = true;
|
||||||
framecount = 0;
|
framecount = 0;
|
||||||
|
|||||||
+21
-49
@@ -61,7 +61,6 @@
|
|||||||
|
|
||||||
gameaction_t gameaction = 0;
|
gameaction_t gameaction = 0;
|
||||||
gamestate_t gamestate = GS_NULL;
|
gamestate_t gamestate = GS_NULL;
|
||||||
UINT8 ultimatemode = false;
|
|
||||||
|
|
||||||
boolean botingame = false;
|
boolean botingame = false;
|
||||||
UINT8 botskin = 0;
|
UINT8 botskin = 0;
|
||||||
@@ -69,9 +68,6 @@ UINT8 botcolor = 0;
|
|||||||
|
|
||||||
JoyType_t Joystick[MAXSPLITSCREENPLAYERS] = {};
|
JoyType_t Joystick[MAXSPLITSCREENPLAYERS] = {};
|
||||||
|
|
||||||
// 1024 bytes is plenty for a savegame
|
|
||||||
#define SAVEGAMESIZE (1024)
|
|
||||||
|
|
||||||
// SRB2kart
|
// SRB2kart
|
||||||
char gamedatafilename[64] = "kartdata.dat";
|
char gamedatafilename[64] = "kartdata.dat";
|
||||||
char timeattackfolder[64] = "kart";
|
char timeattackfolder[64] = "kart";
|
||||||
@@ -90,7 +86,6 @@ INT16 maptol = 0;
|
|||||||
UINT8 globalweather = 0;
|
UINT8 globalweather = 0;
|
||||||
INT32 curWeather = PRECIP_NONE;
|
INT32 curWeather = PRECIP_NONE;
|
||||||
INT32 cursaveslot = -1; // Auto-save 1p savegame slot
|
INT32 cursaveslot = -1; // Auto-save 1p savegame slot
|
||||||
INT16 lastmapsaved = 0; // Last map we auto-saved at
|
|
||||||
boolean gamecomplete = false;
|
boolean gamecomplete = false;
|
||||||
|
|
||||||
UINT16 mainwads = 0;
|
UINT16 mainwads = 0;
|
||||||
@@ -100,7 +95,6 @@ boolean savemoddata = false;
|
|||||||
UINT8 paused = 0;
|
UINT8 paused = 0;
|
||||||
UINT8 modeattacking = ATTACKING_NONE;
|
UINT8 modeattacking = ATTACKING_NONE;
|
||||||
boolean imcontinuing = false;
|
boolean imcontinuing = false;
|
||||||
boolean runemeraldmanager = false;
|
|
||||||
|
|
||||||
boolean netgame = false; // only true if packets are broadcast
|
boolean netgame = false; // only true if packets are broadcast
|
||||||
boolean multiplayer = false;
|
boolean multiplayer = false;
|
||||||
@@ -112,7 +106,6 @@ INT32 consoleplayer = 0; // player taking events and displaying
|
|||||||
INT32 displayplayers[MAXSPLITSCREENPLAYERS] = {}; // view being displayed
|
INT32 displayplayers[MAXSPLITSCREENPLAYERS] = {}; // view being displayed
|
||||||
|
|
||||||
tic_t gametic = 0;
|
tic_t gametic = 0;
|
||||||
tic_t levelstarttic = 0; // gametic at level start
|
|
||||||
UINT32 totalrings = 0; // for intermission
|
UINT32 totalrings = 0; // for intermission
|
||||||
INT16 lastmap = 0; // last level you were at (returning from special stages)
|
INT16 lastmap = 0; // last level you were at (returning from special stages)
|
||||||
tic_t timeinmap = 0; // Ticker for time spent in level (used for levelcard display)
|
tic_t timeinmap = 0; // Ticker for time spent in level (used for levelcard display)
|
||||||
@@ -132,7 +125,7 @@ UINT8 skincolor_bluering = SKINCOLOR_STEEL;
|
|||||||
tic_t countdowntimer = 0;
|
tic_t countdowntimer = 0;
|
||||||
boolean countdowntimeup = false;
|
boolean countdowntimeup = false;
|
||||||
|
|
||||||
cutscene_t *cutscenes[128];
|
cutscene_t *cutscenes[128] = {};
|
||||||
|
|
||||||
INT16 nextmapoverride = 0;
|
INT16 nextmapoverride = 0;
|
||||||
boolean skipstats = false;
|
boolean skipstats = false;
|
||||||
@@ -144,7 +137,7 @@ mobj_t *blueflag = NULL;
|
|||||||
mapthing_t *rflagpoint = NULL;
|
mapthing_t *rflagpoint = NULL;
|
||||||
mapthing_t *bflagpoint = NULL;
|
mapthing_t *bflagpoint = NULL;
|
||||||
|
|
||||||
struct quake quake;
|
struct quake quake = {};
|
||||||
|
|
||||||
// Map Header Information
|
// Map Header Information
|
||||||
mapheader_t* mapheaderinfo[NUMMAPS] = {};
|
mapheader_t* mapheaderinfo[NUMMAPS] = {};
|
||||||
@@ -190,9 +183,6 @@ boolean CheckForReverseGravity = false;
|
|||||||
UINT16 invulntics = 20*TICRATE;
|
UINT16 invulntics = 20*TICRATE;
|
||||||
UINT16 sneakertics = 20*TICRATE;
|
UINT16 sneakertics = 20*TICRATE;
|
||||||
UINT16 flashingtics = 3*TICRATE/2; // SRB2kart
|
UINT16 flashingtics = 3*TICRATE/2; // SRB2kart
|
||||||
UINT16 tailsflytics = 8*TICRATE;
|
|
||||||
UINT16 underwatertics = 30*TICRATE;
|
|
||||||
UINT16 spacetimetics = 11*TICRATE + (TICRATE/2);
|
|
||||||
UINT16 extralifetics = 4*TICRATE;
|
UINT16 extralifetics = 4*TICRATE;
|
||||||
|
|
||||||
// SRB2kart
|
// SRB2kart
|
||||||
@@ -210,10 +200,7 @@ const INT32 wipeoutslowtime = 20;
|
|||||||
const INT32 wantedreduce = 5*TICRATE;
|
const INT32 wantedreduce = 5*TICRATE;
|
||||||
const INT32 wantedfrequency = 10*TICRATE;
|
const INT32 wantedfrequency = 10*TICRATE;
|
||||||
|
|
||||||
INT32 gameovertics = 15*TICRATE;
|
|
||||||
|
|
||||||
UINT8 use1upSound = 0;
|
UINT8 use1upSound = 0;
|
||||||
UINT8 maxXtraLife = 2; // Max extra lives from rings
|
|
||||||
|
|
||||||
UINT8 introtoplay = 0;
|
UINT8 introtoplay = 0;
|
||||||
UINT8 creditscutscene = 0;
|
UINT8 creditscutscene = 0;
|
||||||
@@ -228,7 +215,7 @@ tic_t racecountdown = 0, exitcountdown = 0; // for racing
|
|||||||
fixed_t gravity = 0;
|
fixed_t gravity = 0;
|
||||||
fixed_t mapobjectscale = FRACUNIT;
|
fixed_t mapobjectscale = FRACUNIT;
|
||||||
|
|
||||||
struct maplighting maplighting;
|
struct maplighting maplighting = {};
|
||||||
|
|
||||||
INT16 autobalance = 0; //for CTF team balance
|
INT16 autobalance = 0; //for CTF team balance
|
||||||
INT16 teamscramble = 0; //for CTF team scramble
|
INT16 teamscramble = 0; //for CTF team scramble
|
||||||
@@ -456,10 +443,10 @@ consvar_t cv_litesteer[MAXSPLITSCREENPLAYERS] = {
|
|||||||
|
|
||||||
//static CV_PossibleValue_t autoaccelcons_t[] = {{0, "Off"}, {1, "Manual"}, {2, "Automatic"}, {0, NULL}};
|
//static CV_PossibleValue_t autoaccelcons_t[] = {{0, "Off"}, {1, "Manual"}, {2, "Automatic"}, {0, NULL}};
|
||||||
consvar_t cv_autoaccel[MAXSPLITSCREENPLAYERS] = {
|
consvar_t cv_autoaccel[MAXSPLITSCREENPLAYERS] = {
|
||||||
{"autoaccel", "Off", CV_SAVE, CV_OnOff, NULL, 0, NULL, NULL, 0, 0, NULL},
|
{"kartautoaccel", "Off", CV_SAVE, CV_OnOff, NULL, 0, NULL, NULL, 0, 0, NULL},
|
||||||
{"autoaccel2", "Off", CV_SAVE, CV_OnOff, NULL, 0, NULL, NULL, 0, 0, NULL},
|
{"kartautoaccel2", "Off", CV_SAVE, CV_OnOff, NULL, 0, NULL, NULL, 0, 0, NULL},
|
||||||
{"autoaccel3", "Off", CV_SAVE, CV_OnOff, NULL, 0, NULL, NULL, 0, 0, NULL},
|
{"kartautoaccel3", "Off", CV_SAVE, CV_OnOff, NULL, 0, NULL, NULL, 0, 0, NULL},
|
||||||
{"autoaccel4", "Off", CV_SAVE, CV_OnOff, NULL, 0, NULL, NULL, 0, 0, NULL}
|
{"kartautoaccel4", "Off", CV_SAVE, CV_OnOff, NULL, 0, NULL, NULL, 0, 0, NULL}
|
||||||
};
|
};
|
||||||
|
|
||||||
static CV_PossibleValue_t driftsparkpulse_t[] = {{0, "MIN"}, {FRACUNIT*3, "MAX"}, {0, NULL}};
|
static CV_PossibleValue_t driftsparkpulse_t[] = {{0, "MIN"}, {FRACUNIT*3, "MAX"}, {0, NULL}};
|
||||||
@@ -523,11 +510,8 @@ void G_ClearRecords(void)
|
|||||||
INT16 i;
|
INT16 i;
|
||||||
for (i = 0; i < NUMMAPS; ++i)
|
for (i = 0; i < NUMMAPS; ++i)
|
||||||
{
|
{
|
||||||
if (mainrecords[i])
|
Z_Free(mainrecords[i]);
|
||||||
{
|
mainrecords[i] = NULL;
|
||||||
Z_Free(mainrecords[i]);
|
|
||||||
mainrecords[i] = NULL;
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -1306,8 +1290,6 @@ static void G_DoLoadLevel(boolean resetplayer)
|
|||||||
// Make sure objectplace is OFF when you first start the level!
|
// Make sure objectplace is OFF when you first start the level!
|
||||||
OP_ResetObjectplace();
|
OP_ResetObjectplace();
|
||||||
|
|
||||||
levelstarttic = gametic; // for time calculation
|
|
||||||
|
|
||||||
if (wipegamestate == GS_LEVEL)
|
if (wipegamestate == GS_LEVEL)
|
||||||
wipegamestate = -1; // force a wipe
|
wipegamestate = -1; // force a wipe
|
||||||
|
|
||||||
@@ -3361,18 +3343,6 @@ static void G_DoStartVote(void)
|
|||||||
gameaction = ga_nothing;
|
gameaction = ga_nothing;
|
||||||
}
|
}
|
||||||
|
|
||||||
//
|
|
||||||
// G_UseContinue
|
|
||||||
//
|
|
||||||
void G_UseContinue(void)
|
|
||||||
{
|
|
||||||
if (gamestate == GS_LEVEL && !netgame && !multiplayer)
|
|
||||||
{
|
|
||||||
gameaction = ga_startcont;
|
|
||||||
lastdraw = true;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
static void G_DoStartContinue(void)
|
static void G_DoStartContinue(void)
|
||||||
{
|
{
|
||||||
I_Assert(!netgame && !multiplayer);
|
I_Assert(!netgame && !multiplayer);
|
||||||
@@ -3411,7 +3381,7 @@ static void G_DoContinued(void)
|
|||||||
token = 0;
|
token = 0;
|
||||||
|
|
||||||
// Reset # of lives
|
// Reset # of lives
|
||||||
pl->lives = (ultimatemode) ? 1 : 3;
|
pl->lives = 3;
|
||||||
|
|
||||||
D_MapChange(gamemap, gametype, false, false, 0, false, false);
|
D_MapChange(gamemap, gametype, false, false, 0, false, false);
|
||||||
|
|
||||||
@@ -3501,7 +3471,7 @@ void G_LoadGameData(void)
|
|||||||
INT32 i, j;
|
INT32 i, j;
|
||||||
UINT8 modded = false;
|
UINT8 modded = false;
|
||||||
UINT8 rtemp;
|
UINT8 rtemp;
|
||||||
savebuffer_t save = {0};
|
savebuffer_t save = {};
|
||||||
|
|
||||||
//For records
|
//For records
|
||||||
tic_t rectime;
|
tic_t rectime;
|
||||||
@@ -3634,7 +3604,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 = {0};
|
savebuffer_t save = {};
|
||||||
(void)force;
|
(void)force;
|
||||||
char backupfile[MAX_WADPATH+4];
|
char backupfile[MAX_WADPATH+4];
|
||||||
|
|
||||||
@@ -3805,7 +3775,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 = {0};
|
savebuffer_t save = {};
|
||||||
|
|
||||||
// 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));
|
||||||
@@ -3891,7 +3861,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 = {0};
|
savebuffer_t save = {};
|
||||||
|
|
||||||
sprintf(savename, savegamename, savegameslot);
|
sprintf(savename, savegamename, savegameslot);
|
||||||
backup = va("%s",savename);
|
backup = va("%s",savename);
|
||||||
@@ -3905,7 +3875,7 @@ void G_SaveGame(UINT32 savegameslot)
|
|||||||
char name[VERSIONSIZE];
|
char name[VERSIONSIZE];
|
||||||
size_t length;
|
size_t length;
|
||||||
|
|
||||||
save.p = save.buffer = (UINT8 *)Z_Malloc(SAVEGAMESIZE, PU_STATIC, NULL);
|
save.p = save.buffer = (UINT8 *)Z_Malloc(1024, PU_STATIC, NULL); // 1024 bytes is plenty for a savegame
|
||||||
if (!save.p)
|
if (!save.p)
|
||||||
{
|
{
|
||||||
CONS_Alert(CONS_ERROR, M_GetText("No more free memory for saving game data\n"));
|
CONS_Alert(CONS_ERROR, M_GetText("No more free memory for saving game data\n"));
|
||||||
@@ -4055,7 +4025,6 @@ void G_InitNew(UINT8 pencoremode, const char *mapname, boolean resetplayer, bool
|
|||||||
if (W_CheckNumForName(mapname) == LUMPERROR)
|
if (W_CheckNumForName(mapname) == LUMPERROR)
|
||||||
{
|
{
|
||||||
I_Error("Internal game map '%s' not found\n", mapname);
|
I_Error("Internal game map '%s' not found\n", mapname);
|
||||||
Command_ExitGame_f();
|
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -4156,12 +4125,13 @@ static void measurekeywords(mapsearchfreq_t *fr,
|
|||||||
{
|
{
|
||||||
char *qp;
|
char *qp;
|
||||||
char *sp;
|
char *sp;
|
||||||
|
|
||||||
if (wanttable)
|
if (wanttable)
|
||||||
(*dimp) = Z_Realloc((*dimp), 255 * sizeof (struct searchdim),
|
(*dimp) = Z_Realloc((*dimp), 255 * sizeof (struct searchdim),
|
||||||
PU_STATIC, NULL);
|
PU_STATIC, NULL);
|
||||||
for (qp = strtok(va("%s", q), " ");
|
for (qp = strtok(va("%s", q), " ");
|
||||||
qp && fr->total < 255;
|
qp && fr->total < 255;
|
||||||
qp = strtok(0, " "))
|
qp = strtok(NULL, " "))
|
||||||
{
|
{
|
||||||
if (( sp = strcasestr(s, qp) ))
|
if (( sp = strcasestr(s, qp) ))
|
||||||
{
|
{
|
||||||
@@ -4170,10 +4140,12 @@ static void measurekeywords(mapsearchfreq_t *fr,
|
|||||||
(*dimp)[(*cuntp)].pos = sp - s;
|
(*dimp)[(*cuntp)].pos = sp - s;
|
||||||
(*dimp)[(*cuntp)].siz = strlen(qp);
|
(*dimp)[(*cuntp)].siz = strlen(qp);
|
||||||
}
|
}
|
||||||
|
|
||||||
(*cuntp)++;
|
(*cuntp)++;
|
||||||
fr->total++;
|
fr->total++;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if (wanttable)
|
if (wanttable)
|
||||||
(*dimp) = Z_Realloc((*dimp), (*cuntp) * sizeof (struct searchdim),
|
(*dimp) = Z_Realloc((*dimp), (*cuntp) * sizeof (struct searchdim),
|
||||||
PU_STATIC, NULL);
|
PU_STATIC, NULL);
|
||||||
@@ -4242,7 +4214,7 @@ INT32 G_FindMap(const char *mapname, char **foundmapnamep,
|
|||||||
{
|
{
|
||||||
newmapnum = mapnum;
|
newmapnum = mapnum;
|
||||||
newmapname = realmapname;
|
newmapname = realmapname;
|
||||||
realmapname = 0;
|
realmapname = NULL;
|
||||||
Z_Free(apromapname);
|
Z_Free(apromapname);
|
||||||
if (!wanttable)
|
if (!wanttable)
|
||||||
break;
|
break;
|
||||||
@@ -4263,7 +4235,7 @@ INT32 G_FindMap(const char *mapname, char **foundmapnamep,
|
|||||||
{
|
{
|
||||||
apromapnum = mapnum;
|
apromapnum = mapnum;
|
||||||
apromapname = realmapname;
|
apromapname = realmapname;
|
||||||
realmapname = 0;
|
realmapname = NULL;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
else/* ...match individual keywords */
|
else/* ...match individual keywords */
|
||||||
|
|||||||
+1
-5
@@ -39,12 +39,8 @@ extern INT32 player_name_changes[MAXPLAYERS];
|
|||||||
extern player_t players[MAXPLAYERS];
|
extern player_t players[MAXPLAYERS];
|
||||||
extern boolean playeringame[MAXPLAYERS];
|
extern boolean playeringame[MAXPLAYERS];
|
||||||
|
|
||||||
// gametic at level start
|
|
||||||
extern tic_t levelstarttic;
|
|
||||||
|
|
||||||
// for modding?
|
// for modding?
|
||||||
extern INT16 prevmap, nextmap;
|
extern INT16 prevmap, nextmap;
|
||||||
extern INT32 gameovertics;
|
|
||||||
extern tic_t timeinmap; // Ticker for time spent in level (used for levelcard display)
|
extern tic_t timeinmap; // Ticker for time spent in level (used for levelcard display)
|
||||||
extern INT16 rw_maximums[NUM_WEAPONS];
|
extern INT16 rw_maximums[NUM_WEAPONS];
|
||||||
|
|
||||||
@@ -130,6 +126,7 @@ extern consvar_t cv_spinoutroll;
|
|||||||
extern consvar_t cv_squishdance, cv_squishdancespeed;
|
extern consvar_t cv_squishdance, cv_squishdancespeed;
|
||||||
|
|
||||||
extern consvar_t cv_playerblendeffects;
|
extern consvar_t cv_playerblendeffects;
|
||||||
|
extern consvar_t cv_reducevfx;
|
||||||
|
|
||||||
extern consvar_t cv_cechotoggle;
|
extern consvar_t cv_cechotoggle;
|
||||||
|
|
||||||
@@ -251,7 +248,6 @@ UINT8 G_GetGametypeColor(INT16 gt);
|
|||||||
void G_ExitLevel(void);
|
void G_ExitLevel(void);
|
||||||
void G_NextLevel(void);
|
void G_NextLevel(void);
|
||||||
void G_Continue(void);
|
void G_Continue(void);
|
||||||
void G_UseContinue(void);
|
|
||||||
void G_AfterIntermission(void);
|
void G_AfterIntermission(void);
|
||||||
void G_EndGame(void); // moved from y_inter.c/h and renamed
|
void G_EndGame(void); // moved from y_inter.c/h and renamed
|
||||||
|
|
||||||
|
|||||||
+30
-7
@@ -81,6 +81,10 @@ consvar_t cv_gamepadled[MAXSPLITSCREENPLAYERS] = {
|
|||||||
{"gamepadled4", "Skincolor", CV_SAVE|CV_CALL|CV_NOINIT, gamepadled_cons_t, led_off_handle4, 0, NULL, NULL, 0, 0, NULL}
|
{"gamepadled4", "Skincolor", CV_SAVE|CV_CALL|CV_NOINIT, gamepadled_cons_t, led_off_handle4, 0, NULL, NULL, 0, 0, NULL}
|
||||||
};
|
};
|
||||||
|
|
||||||
|
consvar_t cv_gamepadifunfocused = {"gamepadunfocused", "Off", CV_SAVE|CV_CALL, CV_OnOff, I_SetJoystickFocus, 0, NULL, NULL, 0, 0, NULL};
|
||||||
|
consvar_t cv_gamepadledifunfocused = {"gamepadledunfocused", "Off", CV_SAVE, CV_OnOff, NULL, 0, NULL, NULL, 0, 0, NULL};
|
||||||
|
consvar_t cv_rumbleifunfocused = {"rumbleifunfocused", "Off", CV_SAVE, CV_OnOff, NULL, 0, NULL, NULL, 0, 0, NULL};
|
||||||
|
|
||||||
static void rumble_off_handle(void)
|
static void rumble_off_handle(void)
|
||||||
{
|
{
|
||||||
if (!cv_rumble[0].value)
|
if (!cv_rumble[0].value)
|
||||||
@@ -930,12 +934,17 @@ void G_SetPlayerGamepadIndicatorColor(INT32 playernum, UINT8 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 || (window_notinfocus && cv_gamepadledifunfocused.value == 0)
|
||||||
|| color >= MAXTRANSLATIONS)
|
|| color >= MAXTRANSLATIONS)
|
||||||
{
|
{
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if (!I_GamepadHasLED(playernum))
|
||||||
|
{
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
// so we can override this
|
// so we can override this
|
||||||
skincolor = color ? color : G_GetSkinColorForGamepad(playernum);
|
skincolor = color ? color : G_GetSkinColorForGamepad(playernum);
|
||||||
byte_color = V_GetColor(colortranslations[skincolor][8]).s;
|
byte_color = V_GetColor(colortranslations[skincolor][8]).s;
|
||||||
@@ -945,6 +954,8 @@ void G_SetPlayerGamepadIndicatorColor(INT32 playernum, UINT8 color)
|
|||||||
|
|
||||||
static void G_ResetPlayerGamepadIndicatorColor(INT32 playernum)
|
static void G_ResetPlayerGamepadIndicatorColor(INT32 playernum)
|
||||||
{
|
{
|
||||||
|
I_Assert(playernum >= 0 && playernum < MAXSPLITSCREENPLAYERS);
|
||||||
|
|
||||||
if (cv_gamepadled[playernum].value == 0)
|
if (cv_gamepadled[playernum].value == 0)
|
||||||
{
|
{
|
||||||
I_SetGamepadIndicatorColor(playernum, 0, 0, 255);
|
I_SetGamepadIndicatorColor(playernum, 0, 0, 255);
|
||||||
@@ -969,17 +980,22 @@ void G_DeviceLEDTick(void)
|
|||||||
for (i = 0; i <= splitscreen; i++)
|
for (i = 0; i <= splitscreen; i++)
|
||||||
{
|
{
|
||||||
if (!cv_usejoystick[i].value || !cv_gamepadled[i].value)
|
if (!cv_usejoystick[i].value || !cv_gamepadled[i].value)
|
||||||
|
{
|
||||||
continue;
|
continue;
|
||||||
|
}
|
||||||
|
|
||||||
|
// does not have a configurable led! :c
|
||||||
|
if (!I_GamepadHasLED(i))
|
||||||
|
{
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
|
||||||
newcolor = G_GetSkinColorForGamepad(i);
|
newcolor = G_GetSkinColorForGamepad(i);
|
||||||
|
|
||||||
// compiler be absolutely tripping
|
|
||||||
// delet this if this gets fixed within gcc
|
|
||||||
#pragma GCC diagnostic push
|
|
||||||
#pragma GCC diagnostic ignored "-Warray-bounds"
|
|
||||||
if (curcolor[i] == newcolor) // dont update if same colour
|
if (curcolor[i] == newcolor) // dont update if same colour
|
||||||
|
{
|
||||||
continue;
|
continue;
|
||||||
#pragma GCC diagnostic pop
|
}
|
||||||
|
|
||||||
G_SetPlayerGamepadIndicatorColor(i, newcolor);
|
G_SetPlayerGamepadIndicatorColor(i, newcolor);
|
||||||
curcolor[i] = newcolor;
|
curcolor[i] = newcolor;
|
||||||
@@ -994,6 +1010,7 @@ void G_ResetDeviceLED(void)
|
|||||||
|
|
||||||
static void G_ResetPlayerDeviceRumble(INT32 playernum)
|
static void G_ResetPlayerDeviceRumble(INT32 playernum)
|
||||||
{
|
{
|
||||||
|
I_Assert(playernum >= 0 && playernum < MAXSPLITSCREENPLAYERS);
|
||||||
I_GamepadRumble(playernum, 0, 0, 0);
|
I_GamepadRumble(playernum, 0, 0, 0);
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -1011,7 +1028,7 @@ void G_PlayerDeviceRumble(INT32 playernum, UINT16 low_strength, UINT16 high_stre
|
|||||||
{
|
{
|
||||||
I_Assert(playernum >= 0 && playernum < MAXSPLITSCREENPLAYERS);
|
I_Assert(playernum >= 0 && playernum < MAXSPLITSCREENPLAYERS);
|
||||||
|
|
||||||
if (cv_rumble[playernum].value == 0)
|
if (cv_rumble[playernum].value == 0 || (window_notinfocus && cv_rumbleifunfocused.value == 0))
|
||||||
{
|
{
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
@@ -1054,6 +1071,12 @@ void G_DeviceRumbleTick(void)
|
|||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// does not support rumble! :c
|
||||||
|
if (!I_GamepadHasRumble(i))
|
||||||
|
{
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
|
||||||
if (camera[i].freecam)
|
if (camera[i].freecam)
|
||||||
{
|
{
|
||||||
continue;
|
continue;
|
||||||
|
|||||||
@@ -116,6 +116,10 @@ extern consvar_t cv_rumble[MAXSPLITSCREENPLAYERS];
|
|||||||
extern consvar_t cv_rumblestrength[MAXSPLITSCREENPLAYERS];
|
extern consvar_t cv_rumblestrength[MAXSPLITSCREENPLAYERS];
|
||||||
extern consvar_t cv_gamepadled[MAXSPLITSCREENPLAYERS];
|
extern consvar_t cv_gamepadled[MAXSPLITSCREENPLAYERS];
|
||||||
|
|
||||||
|
extern consvar_t cv_gamepadifunfocused;
|
||||||
|
extern consvar_t cv_gamepadledifunfocused;
|
||||||
|
extern consvar_t cv_rumbleifunfocused;
|
||||||
|
|
||||||
extern INT32 mousex, mousey;
|
extern INT32 mousex, mousey;
|
||||||
|
|
||||||
extern INT32 joyxmove[MAXSPLITSCREENPLAYERS][JOYAXISSET], joyymove[MAXSPLITSCREENPLAYERS][JOYAXISSET];
|
extern INT32 joyxmove[MAXSPLITSCREENPLAYERS][JOYAXISSET], joyymove[MAXSPLITSCREENPLAYERS][JOYAXISSET];
|
||||||
|
|||||||
@@ -52,7 +52,6 @@ typedef enum
|
|||||||
} gameaction_t;
|
} gameaction_t;
|
||||||
|
|
||||||
extern gamestate_t gamestate;
|
extern gamestate_t gamestate;
|
||||||
extern UINT8 ultimatemode; // was sk_insane
|
|
||||||
extern gameaction_t gameaction;
|
extern gameaction_t gameaction;
|
||||||
|
|
||||||
extern boolean botingame;
|
extern boolean botingame;
|
||||||
|
|||||||
@@ -1 +0,0 @@
|
|||||||
target_sourcefile(c)
|
|
||||||
@@ -391,7 +391,7 @@ void HWR_RenderBatches(void)
|
|||||||
nextSurfaceInfo = nextEntry->surf;
|
nextSurfaceInfo = nextEntry->surf;
|
||||||
|
|
||||||
if (nextPolyFlags & PF_NoTexture)
|
if (nextPolyFlags & PF_NoTexture)
|
||||||
nextTexture = 0;
|
nextTexture = NULL;
|
||||||
|
|
||||||
if (useshader && currentShader != nextShader)
|
if (useshader && currentShader != nextShader)
|
||||||
{
|
{
|
||||||
|
|||||||
@@ -15,8 +15,6 @@
|
|||||||
|
|
||||||
#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"
|
||||||
@@ -100,7 +98,7 @@ static void HWR_DrawColumnInCache(const column_t *patchcol, UINT8 *block, GLMipm
|
|||||||
position = 0;
|
position = 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
position = std::max(((position * scale_y) + (FRACUNIT/2)) >> FRACBITS, 0);
|
position = max(((position * scale_y) + (FRACUNIT/2)) >> FRACBITS, 0);
|
||||||
|
|
||||||
if (position + count >= pblockheight)
|
if (position + count >= pblockheight)
|
||||||
count = pblockheight - position;
|
count = pblockheight - position;
|
||||||
@@ -164,7 +162,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 = static_cast<UINT8 *>(mipmap->data);
|
UINT8 *block = (UINT8 *)(mipmap->data);
|
||||||
INT32 bpp;
|
INT32 bpp;
|
||||||
INT32 blockmodulo;
|
INT32 blockmodulo;
|
||||||
RGBA_t *palette;
|
RGBA_t *palette;
|
||||||
@@ -214,7 +212,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 = static_cast<UINT8 *>(mipmap->data);
|
UINT8 *block = (UINT8 *)(mipmap->data);
|
||||||
INT32 bpp;
|
INT32 bpp;
|
||||||
INT32 blockmodulo;
|
INT32 blockmodulo;
|
||||||
INT32 width, height;
|
INT32 width, height;
|
||||||
@@ -290,7 +288,7 @@ static UINT8 *MakeBlock(GLMipmap_t *glMipmap)
|
|||||||
INT32 blocksize = (glMipmap->width * glMipmap->height);
|
INT32 blocksize = (glMipmap->width * glMipmap->height);
|
||||||
|
|
||||||
bpp = format2bpp(glMipmap->format);
|
bpp = format2bpp(glMipmap->format);
|
||||||
block = static_cast<UINT8 *>(Z_Malloc(blocksize*bpp, PU_HWRCACHE, &(glMipmap->data)));
|
block = (UINT8 *)(Z_Malloc(blocksize*bpp, PU_HWRCACHE, &(glMipmap->data)));
|
||||||
|
|
||||||
switch (bpp)
|
switch (bpp)
|
||||||
{
|
{
|
||||||
@@ -327,7 +325,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 = static_cast<GLTextureFormat_t>(textureformat);
|
gltex->mipmap.format = (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 &&
|
||||||
@@ -346,7 +344,7 @@ static void HWR_GenerateTexture(INT32 texnum, GLMapTexture_t *gltex, boolean noe
|
|||||||
colormap += COLORMAP_REMAPOFFSET;
|
colormap += COLORMAP_REMAPOFFSET;
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
gltex->mipmap.colormap = static_cast<GLColormap_t *>(Z_Calloc(sizeof(*gltex->mipmap.colormap), PU_HWRPATCHCOLMIPMAP, NULL));
|
gltex->mipmap.colormap = (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));
|
||||||
|
|
||||||
@@ -379,7 +377,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 = static_cast<UINT8 *>(W_CacheLumpNumPwad(patch->wad, patch->lump, PU_LEVEL));
|
pdata = (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);
|
||||||
@@ -415,7 +413,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 = static_cast<GLTextureFormat_t>(patchformat);
|
glMipmap->format = (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;
|
||||||
@@ -457,7 +455,7 @@ static void HWR_FreeTextureData(patch_t *patch)
|
|||||||
if (!patch || !patch->hardware)
|
if (!patch || !patch->hardware)
|
||||||
return;
|
return;
|
||||||
|
|
||||||
glPatch = static_cast<GLPatch_t *>(patch->hardware);
|
glPatch = (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);
|
||||||
@@ -473,7 +471,7 @@ void HWR_FreeTexture(patch_t *patch)
|
|||||||
|
|
||||||
if (patch->hardware)
|
if (patch->hardware)
|
||||||
{
|
{
|
||||||
GLPatch_t *glPatch = static_cast<GLPatch_t *>(patch->hardware);
|
GLPatch_t *glPatch = (GLPatch_t *)(patch->hardware);
|
||||||
|
|
||||||
HWR_FreeTextureColormaps(patch);
|
HWR_FreeTextureColormaps(patch);
|
||||||
|
|
||||||
@@ -499,7 +497,7 @@ static void HWR_FreeTextureColormaps(patch_t *patch)
|
|||||||
if (!patch)
|
if (!patch)
|
||||||
return;
|
return;
|
||||||
|
|
||||||
pat = static_cast<GLPatch_t *>(patch->hardware);
|
pat = (GLPatch_t *)(patch->hardware);
|
||||||
if (!pat)
|
if (!pat)
|
||||||
return;
|
return;
|
||||||
|
|
||||||
@@ -614,25 +612,20 @@ void HWR_FreeMapTextures(void)
|
|||||||
gl_numtextures = 0;
|
gl_numtextures = 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#define NAME flatcheck
|
||||||
|
#define KEY_TY UINT32
|
||||||
|
#define HASH_FN vt_hash_integer
|
||||||
|
#define CMPR_FN vt_cmpr_integer
|
||||||
|
#include "../verstable.h"
|
||||||
|
|
||||||
static void HWR_PrecacheLevelFlats(void)
|
static void HWR_PrecacheLevelFlats(void)
|
||||||
{
|
{
|
||||||
// lookup for flats that may´ve been already loaded
|
// lookup for flats that may´ve been already loaded
|
||||||
// too lazy to make a hashtable or smth so unordered set will do :carbuncle:
|
flatcheck flatpresent;
|
||||||
std::unordered_set<UINT32> flatpresent;
|
flatcheck_init(&flatpresent);
|
||||||
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)
|
||||||
@@ -649,16 +642,24 @@ 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;
|
|
||||||
|
|
||||||
load_flat(lump, R_NoEncore(sec, ceiling));
|
if (flatcheck_is_end(flatcheck_get(&flatpresent, levelflat->lumpnum)))
|
||||||
|
{
|
||||||
|
HWR_GetFlat(levelflat->lumpnum, R_NoEncore(sec, ceiling));
|
||||||
|
flatcheck_insert(&flatpresent, levelflat->lumpnum);
|
||||||
|
}
|
||||||
|
|
||||||
if (levelflat->speed) // is it an animated flat ?
|
if (levelflat->speed) // is it an animated flat ?
|
||||||
{
|
{
|
||||||
// start from 0, occasionally basenumlump != flat->lumpnum
|
// start from 0, occasionally basenumlump != flat->lumpnum
|
||||||
for (k = 0; k < levelflat->numpics; k++)
|
for (k = 0; k < levelflat->numpics; k++)
|
||||||
{
|
{
|
||||||
load_flat(levelflat->baselumpnum + k, R_NoEncore(sec, ceiling));
|
lumpnum_t lump = levelflat->baselumpnum + k;
|
||||||
|
if (flatcheck_is_end(flatcheck_get(&flatpresent, lump)))
|
||||||
|
{
|
||||||
|
HWR_GetFlat(lump, R_NoEncore(sec, ceiling));
|
||||||
|
flatcheck_insert(&flatpresent, lump);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -672,20 +673,30 @@ static void HWR_PrecacheLevelFlats(void)
|
|||||||
for (i = 0; i < numlevelflats; i++)
|
for (i = 0; i < numlevelflats; i++)
|
||||||
{
|
{
|
||||||
const levelflat_t *levelflat = &levelflats[i];
|
const levelflat_t *levelflat = &levelflats[i];
|
||||||
lump = levelflat->lumpnum;
|
|
||||||
|
|
||||||
load_flat(lump, false);
|
if (flatcheck_is_end(flatcheck_get(&flatpresent, levelflat->lumpnum)))
|
||||||
|
{
|
||||||
|
HWR_GetFlat(levelflat->lumpnum, false);
|
||||||
|
flatcheck_insert(&flatpresent, levelflat->lumpnum);
|
||||||
|
}
|
||||||
|
|
||||||
if (levelflat->speed) // is it an animated flat ?
|
if (levelflat->speed) // is it an animated flat ?
|
||||||
{
|
{
|
||||||
// start from 0, occasionally basenumlump != flat->lumpnum
|
// start from 0, occasionally basenumlump != flat->lumpnum
|
||||||
for (k = 0; k < levelflat->numpics; k++)
|
for (k = 0; k < levelflat->numpics; k++)
|
||||||
{
|
{
|
||||||
load_flat(levelflat->baselumpnum + k, false);
|
lumpnum_t lump = levelflat->baselumpnum + k;
|
||||||
|
if (flatcheck_is_end(flatcheck_get(&flatpresent, lump)))
|
||||||
|
{
|
||||||
|
HWR_GetFlat(lump, false);
|
||||||
|
flatcheck_insert(&flatpresent, lump);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
flatcheck_cleanup(&flatpresent);
|
||||||
}
|
}
|
||||||
|
|
||||||
static void HWR_PrecacheLevelTextures(void)
|
static void HWR_PrecacheLevelTextures(void)
|
||||||
@@ -695,7 +706,7 @@ static void HWR_PrecacheLevelTextures(void)
|
|||||||
size_t i, j, f;
|
size_t i, j, f;
|
||||||
INT32 h;
|
INT32 h;
|
||||||
|
|
||||||
texturepresent = static_cast<char *>(calloc(gl_numtextures, sizeof(*texturepresent)));
|
texturepresent = (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");
|
||||||
|
|
||||||
@@ -870,7 +881,7 @@ void HWR_LoadMapTextures(size_t pnumtextures)
|
|||||||
HWR_FreeMapTextures();
|
HWR_FreeMapTextures();
|
||||||
|
|
||||||
gl_numtextures = pnumtextures;
|
gl_numtextures = pnumtextures;
|
||||||
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
|
gl_textures = (GLMapTextureSet_t *)(calloc(gl_numtextures, sizeof(*gl_textures))); // *2 - 1 for encore-remapped texture and another for noencore texture (unused when not in encore), see: GLMapTextureSet_t
|
||||||
|
|
||||||
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!");
|
||||||
@@ -967,7 +978,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 = static_cast<UINT8 *>(glMipmap->data);
|
flat = (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)
|
||||||
@@ -1011,7 +1022,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 = static_cast<GLColormap_t *>(Z_Calloc(sizeof(*glMipmap->colormap), PU_HWRPATCHCOLMIPMAP, NULL));
|
glMipmap->colormap = (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));
|
||||||
}
|
}
|
||||||
@@ -1035,7 +1046,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 = static_cast<GLPatch_t *>(patch->hardware);
|
GLPatch_t *glPatch = (GLPatch_t *)(patch->hardware);
|
||||||
|
|
||||||
if (!glMipmap->downloaded)
|
if (!glMipmap->downloaded)
|
||||||
{
|
{
|
||||||
@@ -1056,7 +1067,7 @@ static void HWR_LoadPatchMipmap(patch_t *patch, GLMipmap_t *glMipmap)
|
|||||||
// ----------------------+
|
// ----------------------+
|
||||||
static void HWR_UpdatePatchMipmap(patch_t *patch, GLMipmap_t *glMipmap)
|
static void HWR_UpdatePatchMipmap(patch_t *patch, GLMipmap_t *glMipmap)
|
||||||
{
|
{
|
||||||
GLPatch_t *glPatch = static_cast<GLPatch_t *>(patch->hardware);
|
GLPatch_t *glPatch = (GLPatch_t *)(patch->hardware);
|
||||||
HWR_MakePatch(patch, glPatch, glMipmap, true);
|
HWR_MakePatch(patch, glPatch, glMipmap, true);
|
||||||
|
|
||||||
// If hardware does not have the texture, then call GL_SetTexture to upload it
|
// If hardware does not have the texture, then call GL_SetTexture to upload it
|
||||||
@@ -1092,7 +1103,7 @@ void HWR_GetMappedPatch(patch_t *patch, const UINT8 *colormap)
|
|||||||
|
|
||||||
if (!patch->hardware)
|
if (!patch->hardware)
|
||||||
Patch_CreateGL(patch);
|
Patch_CreateGL(patch);
|
||||||
glPatch = static_cast<GLPatch_t *>(patch->hardware);
|
glPatch = (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))
|
||||||
@@ -1128,12 +1139,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 = static_cast<GLMipmap_t *>(calloc(1, sizeof (*newMipmap)));
|
newMipmap = (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 = static_cast<GLColormap_t *>(Z_Calloc(sizeof(*newMipmap->colormap), PU_HWRPATCHCOLMIPMAP, NULL));
|
newMipmap->colormap = (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));
|
||||||
|
|
||||||
@@ -1156,7 +1167,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(static_cast<patch_t *>(ptr));
|
Patch_AllocateHardwarePatch((patch_t *)(ptr));
|
||||||
}
|
}
|
||||||
|
|
||||||
return (patch_t *)(lumpcache[lumpnum]);
|
return (patch_t *)(lumpcache[lumpnum]);
|
||||||
@@ -1173,7 +1184,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 = static_cast<UINT8 *>(mipmap->data); // places the data directly into here
|
UINT8 *block = (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;
|
||||||
@@ -1329,7 +1340,7 @@ void HWR_SetPalette(RGBA_t *palette)
|
|||||||
static void HWR_SetPaletteLookup(RGBA_t *palette)
|
static void HWR_SetPaletteLookup(RGBA_t *palette)
|
||||||
{
|
{
|
||||||
int r, g, b;
|
int r, g, b;
|
||||||
UINT8 *lut = static_cast<UINT8 *>(Z_Malloc(
|
UINT8 *lut = (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)
|
||||||
@@ -1374,7 +1385,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 = static_cast<UINT8 *>(W_CacheLumpNum(lumpnum, PU_CACHE));
|
RGB_data = (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++)
|
||||||
{
|
{
|
||||||
@@ -1409,7 +1420,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 = static_cast<RGBA_t *>(Z_Malloc(256 * 32 * sizeof(RGBA_t), PU_STATIC, NULL));
|
RGBA_t *hw_lighttable = (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.
|
||||||
@@ -319,23 +319,24 @@ angle_t gld_FrustumAngle(angle_t tiltangle)
|
|||||||
double clipfov;
|
double clipfov;
|
||||||
double floatangle;
|
double floatangle;
|
||||||
angle_t a1;
|
angle_t a1;
|
||||||
|
float tilt;
|
||||||
float tilt = fabsf(((float)(int)tiltangle) / (float)ANG1);
|
|
||||||
|
|
||||||
if (tilt > 90.0f)
|
|
||||||
tilt = 90.0f;
|
|
||||||
|
|
||||||
// If the pitch is larger than this you can look all around at a FOV of 90
|
// If the pitch is larger than this you can look all around at a FOV of 90
|
||||||
if (abs((signed)tiltangle) > 46 * ANG1)
|
if (abs((signed)tiltangle) > 46 * ANG1)
|
||||||
return 0xffffffff;
|
return 0xffffffff;
|
||||||
|
|
||||||
|
tilt = fabsf(((float)(int)tiltangle) / (float)ANG1);
|
||||||
|
|
||||||
|
if (tilt > 90.0f)
|
||||||
|
tilt = 90.0f;
|
||||||
|
|
||||||
// ok, this is a gross hack that barely works...
|
// ok, this is a gross hack that barely works...
|
||||||
// but at least it doesn't overestimate too much...
|
// but at least it doesn't overestimate too much...
|
||||||
clipfov = atan(1 / (GLdouble)projMatrix[0]) * 360.0 / M_PI;
|
clipfov = atan(1 / (GLdouble)projMatrix[0]) * 360.0 / M_PI;
|
||||||
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;
|
||||||
a1 = (angle_t)xs_CRoundToInt(ANG1 * floatangle);
|
a1 = (angle_t)lrint(ANG1 * floatangle);
|
||||||
return a1;
|
return a1;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -54,7 +54,7 @@ struct GLMipmap_s
|
|||||||
UINT16 width, height;
|
UINT16 width, height;
|
||||||
UINT32 downloaded; // The GPU has this texture.
|
UINT32 downloaded; // The GPU has this texture.
|
||||||
|
|
||||||
struct GLMipmap_s *nextcolormap;
|
struct GLMipmap_s *nextcolormap;
|
||||||
struct GLColormap_s *colormap;
|
struct GLColormap_s *colormap;
|
||||||
};
|
};
|
||||||
typedef struct GLMipmap_s GLMipmap_t;
|
typedef struct GLMipmap_s GLMipmap_t;
|
||||||
|
|||||||
+31
-27
@@ -32,20 +32,6 @@
|
|||||||
|
|
||||||
#include <fcntl.h>
|
#include <fcntl.h>
|
||||||
|
|
||||||
typedef struct
|
|
||||||
{
|
|
||||||
UINT8 id_field_length ; // 1
|
|
||||||
UINT8 color_map_type ; // 2
|
|
||||||
UINT8 image_type ; // 3
|
|
||||||
UINT8 dummy[5] ; // 4, 8
|
|
||||||
INT16 x_origin ; // 9, 10
|
|
||||||
INT16 y_origin ; //11, 12
|
|
||||||
INT16 width ; //13, 14
|
|
||||||
INT16 height ; //15, 16
|
|
||||||
UINT8 image_pix_size ; //17
|
|
||||||
UINT8 image_descriptor; //18
|
|
||||||
} ATTRPACK TGAHeader; // sizeof is 18
|
|
||||||
|
|
||||||
static const UINT8 softwaretranstogl[11] = { 0, 25, 51, 76,102,127,153,178,204,229,255};
|
static const UINT8 softwaretranstogl[11] = { 0, 25, 51, 76,102,127,153,178,204,229,255};
|
||||||
static const UINT8 softwaretranstogl_hi[11] = { 0, 51,102,153,204,255,255,255,255,255,255};
|
static const UINT8 softwaretranstogl_hi[11] = { 0, 51,102,153,204,255,255,255,255,255,255};
|
||||||
static const UINT8 softwaretranstogl_lo[11] = { 0, 12, 24, 36, 48, 60, 71, 83, 95,111,127};
|
static const UINT8 softwaretranstogl_lo[11] = { 0, 12, 24, 36, 48, 60, 71, 83, 95,111,127};
|
||||||
@@ -57,8 +43,7 @@ void HWR_DrawStretchyFixedPatch(patch_t *gpatch, fixed_t x, fixed_t y, fixed_t p
|
|||||||
{
|
{
|
||||||
FOutVector v[4];
|
FOutVector v[4];
|
||||||
FBITFIELD flags;
|
FBITFIELD flags;
|
||||||
float cx = FIXED_TO_FLOAT(x);
|
float cx, cy;
|
||||||
float cy = FIXED_TO_FLOAT(y);
|
|
||||||
UINT8 alphalevel = ((option & V_ALPHAMASK) >> V_ALPHASHIFT);
|
UINT8 alphalevel = ((option & V_ALPHAMASK) >> V_ALPHASHIFT);
|
||||||
UINT8 blendmode = ((bflags & V_BLENDMASK) >> V_BLENDSHIFT);
|
UINT8 blendmode = ((bflags & V_BLENDMASK) >> V_BLENDSHIFT);
|
||||||
GLPatch_t *hwrPatch;
|
GLPatch_t *hwrPatch;
|
||||||
@@ -72,6 +57,9 @@ void HWR_DrawStretchyFixedPatch(patch_t *gpatch, fixed_t x, fixed_t y, fixed_t p
|
|||||||
if (alphalevel >= 10 && alphalevel < 13)
|
if (alphalevel >= 10 && alphalevel < 13)
|
||||||
return;
|
return;
|
||||||
|
|
||||||
|
cx = FIXED_TO_FLOAT(x);
|
||||||
|
cy = FIXED_TO_FLOAT(y);
|
||||||
|
|
||||||
const float fvw = (float)vid.width;
|
const float fvw = (float)vid.width;
|
||||||
const float fvh = (float)vid.height;
|
const float fvh = (float)vid.height;
|
||||||
|
|
||||||
@@ -150,7 +138,7 @@ void HWR_DrawStretchyFixedPatch(patch_t *gpatch, fixed_t x, fixed_t y, fixed_t p
|
|||||||
if (!column->topdelta)
|
if (!column->topdelta)
|
||||||
{
|
{
|
||||||
const UINT8 *source = (const UINT8 *)(column) + 3;
|
const UINT8 *source = (const UINT8 *)(column) + 3;
|
||||||
HWR_DrawFill(0, 0, BASEVIDWIDTH, BASEVIDHEIGHT, (column->topdelta == 0xff ? 31 : source[0]));
|
HWR_DrawFill(0, 0, BASEVIDWIDTH, BASEVIDHEIGHT, source[0]);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -222,7 +210,7 @@ void HWR_DrawStretchyFixedPatch(patch_t *gpatch, fixed_t x, fixed_t y, fixed_t p
|
|||||||
|
|
||||||
if (alphalevel)
|
if (alphalevel)
|
||||||
{
|
{
|
||||||
FSurfaceInfo Surf;
|
FSurfaceInfo Surf = {};
|
||||||
Surf.PolyColor.s.red = Surf.PolyColor.s.green = Surf.PolyColor.s.blue = 0xff;
|
Surf.PolyColor.s.red = Surf.PolyColor.s.green = Surf.PolyColor.s.blue = 0xff;
|
||||||
|
|
||||||
switch (alphalevel)
|
switch (alphalevel)
|
||||||
@@ -244,8 +232,7 @@ void HWR_DrawCroppedPatch(patch_t *gpatch, fixed_t x, fixed_t y, fixed_t pscale,
|
|||||||
{
|
{
|
||||||
FOutVector v[4];
|
FOutVector v[4];
|
||||||
FBITFIELD flags;
|
FBITFIELD flags;
|
||||||
float cx = FIXED_TO_FLOAT(x);
|
float cx, cy;
|
||||||
float cy = FIXED_TO_FLOAT(y);
|
|
||||||
UINT8 alphalevel = ((option & V_ALPHAMASK) >> V_ALPHASHIFT);
|
UINT8 alphalevel = ((option & V_ALPHAMASK) >> V_ALPHASHIFT);
|
||||||
GLPatch_t *hwrPatch;
|
GLPatch_t *hwrPatch;
|
||||||
|
|
||||||
@@ -258,6 +245,9 @@ void HWR_DrawCroppedPatch(patch_t *gpatch, fixed_t x, fixed_t y, fixed_t pscale,
|
|||||||
if (alphalevel >= 10 && alphalevel < 13)
|
if (alphalevel >= 10 && alphalevel < 13)
|
||||||
return;
|
return;
|
||||||
|
|
||||||
|
cx = FIXED_TO_FLOAT(x);
|
||||||
|
cy = FIXED_TO_FLOAT(y);
|
||||||
|
|
||||||
const float fvw = (float)vid.width;
|
const float fvw = (float)vid.width;
|
||||||
const float fvh = (float)vid.height;
|
const float fvh = (float)vid.height;
|
||||||
|
|
||||||
@@ -302,7 +292,7 @@ void HWR_DrawCroppedPatch(patch_t *gpatch, fixed_t x, fixed_t y, fixed_t pscale,
|
|||||||
if (!column->topdelta)
|
if (!column->topdelta)
|
||||||
{
|
{
|
||||||
const UINT8 *source = (const UINT8 *)(column) + 3;
|
const UINT8 *source = (const UINT8 *)(column) + 3;
|
||||||
HWR_DrawFill(0, 0, BASEVIDWIDTH, BASEVIDHEIGHT, (column->topdelta == 0xff ? 31 : source[0]));
|
HWR_DrawFill(0, 0, BASEVIDWIDTH, BASEVIDHEIGHT, source[0]);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -385,7 +375,7 @@ void HWR_DrawCroppedPatch(patch_t *gpatch, fixed_t x, fixed_t y, fixed_t pscale,
|
|||||||
// clip it since it is used for bunny scroll in doom I
|
// clip it since it is used for bunny scroll in doom I
|
||||||
if (alphalevel)
|
if (alphalevel)
|
||||||
{
|
{
|
||||||
FSurfaceInfo Surf;
|
FSurfaceInfo Surf = {};
|
||||||
Surf.PolyColor.s.red = Surf.PolyColor.s.green = Surf.PolyColor.s.blue = 0xff;
|
Surf.PolyColor.s.red = Surf.PolyColor.s.green = Surf.PolyColor.s.blue = 0xff;
|
||||||
|
|
||||||
switch (alphalevel)
|
switch (alphalevel)
|
||||||
@@ -490,7 +480,7 @@ void HWR_DrawFlatFill(INT32 x, INT32 y, INT32 w, INT32 h, lumpnum_t flatlumpnum)
|
|||||||
void HWR_FadeScreenMenuBack(UINT16 color, UINT8 strength)
|
void HWR_FadeScreenMenuBack(UINT16 color, UINT8 strength)
|
||||||
{
|
{
|
||||||
FOutVector v[4];
|
FOutVector v[4];
|
||||||
FSurfaceInfo Surf;
|
FSurfaceInfo Surf = {};
|
||||||
FBITFIELD poly_flags = PF_NoTexture|PF_Modulated|PF_NoDepthTest;
|
FBITFIELD poly_flags = PF_NoTexture|PF_Modulated|PF_NoDepthTest;
|
||||||
|
|
||||||
v[0].x = v[3].x = -1.0f;
|
v[0].x = v[3].x = -1.0f;
|
||||||
@@ -543,7 +533,7 @@ void HWR_FadeScreenMenuBack(UINT16 color, UINT8 strength)
|
|||||||
void HWR_DrawConsoleBack(UINT32 color, INT32 height)
|
void HWR_DrawConsoleBack(UINT32 color, INT32 height)
|
||||||
{
|
{
|
||||||
FOutVector v[4];
|
FOutVector v[4];
|
||||||
FSurfaceInfo Surf;
|
FSurfaceInfo Surf = {};
|
||||||
|
|
||||||
// setup some neat-o translucency effect
|
// setup some neat-o translucency effect
|
||||||
if (!height) //cool hack 0 height is full height
|
if (!height) //cool hack 0 height is full height
|
||||||
@@ -598,7 +588,7 @@ void HWR_drawAMline(const fline_t *fl, INT32 color)
|
|||||||
void HWR_DrawDiag(INT32 x, INT32 y, INT32 wh, INT32 color)
|
void HWR_DrawDiag(INT32 x, INT32 y, INT32 wh, INT32 color)
|
||||||
{
|
{
|
||||||
FOutVector v[4];
|
FOutVector v[4];
|
||||||
FSurfaceInfo Surf;
|
FSurfaceInfo Surf = {};
|
||||||
float fx, fy, fw, fh, fwait = 0;
|
float fx, fy, fw, fh, fwait = 0;
|
||||||
RGBA_t *palette;
|
RGBA_t *palette;
|
||||||
|
|
||||||
@@ -702,7 +692,7 @@ void HWR_DrawDiag(INT32 x, INT32 y, INT32 wh, INT32 color)
|
|||||||
void HWR_DrawConsoleFill(INT32 x, INT32 y, INT32 w, INT32 h, UINT32 color, INT32 options)
|
void HWR_DrawConsoleFill(INT32 x, INT32 y, INT32 w, INT32 h, UINT32 color, INT32 options)
|
||||||
{
|
{
|
||||||
FOutVector v[4];
|
FOutVector v[4];
|
||||||
FSurfaceInfo Surf;
|
FSurfaceInfo Surf = {};
|
||||||
float fx, fy, fw, fh;
|
float fx, fy, fw, fh;
|
||||||
|
|
||||||
if (w < 0 || h < 0)
|
if (w < 0 || h < 0)
|
||||||
@@ -820,7 +810,7 @@ void HWR_DrawConsoleFill(INT32 x, INT32 y, INT32 w, INT32 h, UINT32 color, INT32
|
|||||||
void HWR_DrawFill(INT32 x, INT32 y, INT32 w, INT32 h, INT32 color)
|
void HWR_DrawFill(INT32 x, INT32 y, INT32 w, INT32 h, INT32 color)
|
||||||
{
|
{
|
||||||
FOutVector v[4];
|
FOutVector v[4];
|
||||||
FSurfaceInfo Surf;
|
FSurfaceInfo Surf = {};
|
||||||
float fx, fy, fw, fh;
|
float fx, fy, fw, fh;
|
||||||
|
|
||||||
if (w < 0 || h < 0)
|
if (w < 0 || h < 0)
|
||||||
@@ -964,6 +954,20 @@ void HWR_DrawFill(INT32 x, INT32 y, INT32 w, INT32 h, INT32 color)
|
|||||||
#endif
|
#endif
|
||||||
|
|
||||||
#ifndef USE_PNG
|
#ifndef USE_PNG
|
||||||
|
typedef struct
|
||||||
|
{
|
||||||
|
UINT8 id_field_length ; // 1
|
||||||
|
UINT8 color_map_type ; // 2
|
||||||
|
UINT8 image_type ; // 3
|
||||||
|
UINT8 dummy[5] ; // 4, 8
|
||||||
|
INT16 x_origin ; // 9, 10
|
||||||
|
INT16 y_origin ; //11, 12
|
||||||
|
INT16 width ; //13, 14
|
||||||
|
INT16 height ; //15, 16
|
||||||
|
UINT8 image_pix_size ; //17
|
||||||
|
UINT8 image_descriptor; //18
|
||||||
|
} ATTRPACK TGAHeader; // sizeof is 18
|
||||||
|
|
||||||
// --------------------------------------------------------------------------
|
// --------------------------------------------------------------------------
|
||||||
// save screenshots with TGA format
|
// save screenshots with TGA format
|
||||||
// --------------------------------------------------------------------------
|
// --------------------------------------------------------------------------
|
||||||
|
|||||||
@@ -32,8 +32,12 @@ void GL_SetSpecialState(hwdspecialstate_t IdState, INT32 Value);
|
|||||||
void GL_SetTransform(FTransform *stransform);
|
void GL_SetTransform(FTransform *stransform);
|
||||||
void GL_SetBlend(FBITFIELD PolyFlags);
|
void GL_SetBlend(FBITFIELD PolyFlags);
|
||||||
void GL_SetPalette(RGBA_t *palette);
|
void GL_SetPalette(RGBA_t *palette);
|
||||||
|
|
||||||
void GL_ClearBuffer(FBOOLEAN ColorMask, FBOOLEAN DepthMask, FBOOLEAN StencilMask, FRGBAFloat * ClearColor);
|
void GL_ClearBuffer(FBOOLEAN ColorMask, FBOOLEAN DepthMask, FBOOLEAN StencilMask, FRGBAFloat * ClearColor);
|
||||||
|
|
||||||
|
void GL_EnableStencilTest(void);
|
||||||
|
void GL_DisableStencilTest(void);
|
||||||
|
|
||||||
void GL_DrawPolygon(FSurfaceInfo *pSurf, FOutVector *pOutVerts, FUINT iNumPts, FBITFIELD PolyFlags);
|
void GL_DrawPolygon(FSurfaceInfo *pSurf, FOutVector *pOutVerts, FUINT iNumPts, FBITFIELD PolyFlags);
|
||||||
void GL_DrawIndexedTriangles(FSurfaceInfo *pSurf, FOutVector *pOutVerts, FUINT iNumPts, FBITFIELD PolyFlags, unsigned int *IndexArray);
|
void GL_DrawIndexedTriangles(FSurfaceInfo *pSurf, FOutVector *pOutVerts, FUINT iNumPts, FBITFIELD PolyFlags, unsigned int *IndexArray);
|
||||||
void GL_Draw2DLine(F2DCoord *v1, F2DCoord *v2, RGBA_t Color);
|
void GL_Draw2DLine(F2DCoord *v1, F2DCoord *v2, RGBA_t Color);
|
||||||
@@ -63,7 +67,7 @@ void GL_FlushScreenTextures(void);
|
|||||||
void GL_DrawScreenTexture(int tex, FSurfaceInfo *surf, FBITFIELD polyflags);
|
void GL_DrawScreenTexture(int tex, FSurfaceInfo *surf, FBITFIELD polyflags);
|
||||||
void GL_DoScreenWipe(int wipeStart, int wipeEnd);
|
void GL_DoScreenWipe(int wipeStart, int wipeEnd);
|
||||||
void GL_RenderVhsEffect(fixed_t upbary, fixed_t downbary, UINT8 updistort, UINT8 downdistort, UINT8 barsize);
|
void GL_RenderVhsEffect(fixed_t upbary, fixed_t downbary, UINT8 updistort, UINT8 downdistort, UINT8 barsize);
|
||||||
void GL_DrawScreenFinalTexture(int tex, INT32 width, INT32 height, boolean useshader);
|
void GL_DrawScreenFinalTexture(int tex, INT32 width, INT32 height);
|
||||||
|
|
||||||
void GL_PostImgRedraw(float points[SCREENVERTS][SCREENVERTS][2]);
|
void GL_PostImgRedraw(float points[SCREENVERTS][SCREENVERTS][2]);
|
||||||
|
|
||||||
@@ -72,6 +76,7 @@ void GL_LoadShader(int slot, char *code, hwdshaderstage_t stage);
|
|||||||
boolean GL_CompileShader(int slot);
|
boolean GL_CompileShader(int slot);
|
||||||
void GL_SetShader(int slot);
|
void GL_SetShader(int slot);
|
||||||
void GL_UnSetShader(void);
|
void GL_UnSetShader(void);
|
||||||
|
void GL_EnableShader(void);
|
||||||
|
|
||||||
void GL_SetShaderInfo(hwdshaderinfo_t info, INT32 value);
|
void GL_SetShaderInfo(hwdshaderinfo_t info, INT32 value);
|
||||||
|
|
||||||
@@ -80,6 +85,9 @@ UINT32 GL_CreateLightTable(RGBA_t *hw_lighttable);
|
|||||||
void GL_ClearLightTables(void);
|
void GL_ClearLightTables(void);
|
||||||
void GL_SetScreenPalette(RGBA_t *palette);
|
void GL_SetScreenPalette(RGBA_t *palette);
|
||||||
|
|
||||||
|
void GL_Draw2DModel(model_t *model, INT32 frameIndex, INT32 duration, INT32 tics, INT32 nextFrameIndex,
|
||||||
|
FTransform *pos, float hscale, float vscale, UINT8 flipped, UINT8 hflipped, FSurfaceInfo *Surface);
|
||||||
|
|
||||||
#ifdef __cplusplus
|
#ifdef __cplusplus
|
||||||
} // extern "C"
|
} // extern "C"
|
||||||
#endif
|
#endif
|
||||||
|
|||||||
@@ -34,8 +34,8 @@ typedef struct gl_vissprite_s
|
|||||||
float gz, gzt;
|
float gz, gzt;
|
||||||
float tz;
|
float tz;
|
||||||
float scale;
|
float scale;
|
||||||
float spritexscale, spriteyscale;
|
//float spritexscale, spriteyscale;
|
||||||
float spritexoffset, spriteyoffset;
|
//float spritexoffset, spriteyoffset;
|
||||||
patch_t *gpatch;
|
patch_t *gpatch;
|
||||||
boolean flip;
|
boolean flip;
|
||||||
UINT8 translucency; //alpha level 0-255
|
UINT8 translucency; //alpha level 0-255
|
||||||
|
|||||||
+170
-164
@@ -101,7 +101,8 @@ sector_t *gl_backsector = NULL;
|
|||||||
static constexpr float clipping_distances[] = {1024.0f, 2048.0f, 4096.0f, 6144.0f, 8192.0f, 12288.0f, 16384.0f};
|
static constexpr float clipping_distances[] = {1024.0f, 2048.0f, 4096.0f, 6144.0f, 8192.0f, 12288.0f, 16384.0f};
|
||||||
// values for bsp culling
|
// values for bsp culling
|
||||||
// slightly higher than the far clipping plane to compensate for impreciseness
|
// slightly higher than the far clipping plane to compensate for impreciseness
|
||||||
static constexpr INT32 bsp_culling_distances[] = {(1024+512)*FRACUNIT, (2048+512)*FRACUNIT, (4096+512)*FRACUNIT,
|
static constexpr INT32 bsp_culling_distances[] = {
|
||||||
|
(1024+512)*FRACUNIT, (2048+512)*FRACUNIT, (4096+512)*FRACUNIT,
|
||||||
(6144+512)*FRACUNIT, (8192+512)*FRACUNIT, (12288+512)*FRACUNIT, (16384+512)*FRACUNIT};
|
(6144+512)*FRACUNIT, (8192+512)*FRACUNIT, (12288+512)*FRACUNIT, (16384+512)*FRACUNIT};
|
||||||
|
|
||||||
// Performance stats
|
// Performance stats
|
||||||
@@ -241,7 +242,6 @@ consvar_t cv_glportals = {"gr_portals", "On", CV_SAVE, CV_OnOff, NULL, 0, NULL,
|
|||||||
|
|
||||||
consvar_t cv_glpaletterendering = {"gr_paletteshader", "Off", CV_CALL|CV_SAVE, CV_OnOff, CV_glpaletterendering_OnChange, 0, NULL, NULL, 0, 0, NULL};
|
consvar_t cv_glpaletterendering = {"gr_paletteshader", "Off", CV_CALL|CV_SAVE, CV_OnOff, CV_glpaletterendering_OnChange, 0, NULL, NULL, 0, 0, NULL};
|
||||||
consvar_t cv_glpalettedepth = {"gr_palettedepth", "16 bits", CV_SAVE|CV_CALL, glpalettedepth_cons_t, CV_glpalettedepth_OnChange, 0, NULL, NULL, 0, 0, NULL};
|
consvar_t cv_glpalettedepth = {"gr_palettedepth", "16 bits", CV_SAVE|CV_CALL, glpalettedepth_cons_t, CV_glpalettedepth_OnChange, 0, NULL, NULL, 0, 0, NULL};
|
||||||
consvar_t cv_glflashpal = {"gr_flashpal", "On", CV_CALL|CV_SAVE, CV_OnOff, CV_glpaletterendering_OnChange, 0, NULL, NULL, 0, 0, NULL};
|
|
||||||
|
|
||||||
consvar_t cv_gltexturedepth = {"gr_texturedepth", "32 bits", CV_CALL|CV_SAVE, gltexdepth_cons_t, CV_gltextureformat_OnChange, 0, NULL, NULL, 0, 0, NULL};
|
consvar_t cv_gltexturedepth = {"gr_texturedepth", "32 bits", CV_CALL|CV_SAVE, gltexdepth_cons_t, CV_gltextureformat_OnChange, 0, NULL, NULL, 0, 0, NULL};
|
||||||
|
|
||||||
@@ -254,11 +254,11 @@ static void CV_screentextures_OnChange(void)
|
|||||||
{
|
{
|
||||||
if (cv_glpaletterendering.value != 0)
|
if (cv_glpaletterendering.value != 0)
|
||||||
CV_SetValue(&cv_glpaletterendering, 0);
|
CV_SetValue(&cv_glpaletterendering, 0);
|
||||||
|
|
||||||
#ifdef USE_FBO_OGL
|
#ifdef USE_FBO_OGL
|
||||||
if (cv_glframebuffer.value != 0)
|
if (cv_glframebuffer.value != 0)
|
||||||
CV_SetValue(&cv_glframebuffer, 0);
|
CV_SetValue(&cv_glframebuffer, 0);
|
||||||
#endif
|
#endif
|
||||||
|
intermissionbginit = false;
|
||||||
}
|
}
|
||||||
GL_SetSpecialState(HWD_SET_SCREEN_TEXTURES, cv_glscreentextures.value);
|
GL_SetSpecialState(HWD_SET_SCREEN_TEXTURES, cv_glscreentextures.value);
|
||||||
M_UpdateOGLMenu();
|
M_UpdateOGLMenu();
|
||||||
@@ -275,6 +275,7 @@ static void CV_glframebuffer_OnChange(void)
|
|||||||
I_DownSample();
|
I_DownSample();
|
||||||
RefreshOGLSDLSurface();
|
RefreshOGLSDLSurface();
|
||||||
M_UpdateOGLMenu();
|
M_UpdateOGLMenu();
|
||||||
|
intermissionbginit = false;
|
||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
@@ -388,11 +389,11 @@ void HWR_ObjectLightLevelPost(gl_vissprite_t *spr, const sector_t *sector, INT32
|
|||||||
extralight = FixedMul(extralight, std::min(std::max(0, *lightlevel), 255) * FRACUNIT / 255);
|
extralight = FixedMul(extralight, std::min(std::max(0, *lightlevel), 255) * FRACUNIT / 255);
|
||||||
|
|
||||||
// simple OGL approximation
|
// simple OGL approximation
|
||||||
fixed_t tr = R_QuickCamDist(spr->mobj->x, spr->mobj->y);
|
const fixed_t tr = R_QuickCamDist(spr->mobj->x, spr->mobj->y);
|
||||||
fixed_t xscale = FixedDiv((vid.width / 2) << FRACBITS, tr);
|
const fixed_t xscale = FixedDiv((vid.width / 2) << FRACBITS, tr);
|
||||||
|
|
||||||
// Less change in contrast at further distances, to counteract DOOM diminished light
|
// Less change in contrast at further distances, to counteract DOOM diminished light
|
||||||
fixed_t n = FixedDiv(FixedMul(xscale, LIGHTRESOLUTIONFIX), ((MAXLIGHTSCALE-1) << LIGHTSCALESHIFT));
|
const fixed_t n = FixedDiv(FixedMul(xscale, LIGHTRESOLUTIONFIX), ((MAXLIGHTSCALE-1) << LIGHTSCALESHIFT));
|
||||||
extralight = FixedMul(extralight, std::min(n, FRACUNIT));
|
extralight = FixedMul(extralight, std::min(n, FRACUNIT));
|
||||||
|
|
||||||
// Contrast is stronger for normal sprites, stronger than wall lighting is at the same distance
|
// Contrast is stronger for normal sprites, stronger than wall lighting is at the same distance
|
||||||
@@ -510,12 +511,12 @@ static FUINT HWR_CalcWallLight(FUINT lightnum, seg_t *seg, extracolormap_t *colo
|
|||||||
{
|
{
|
||||||
INT16 finallight = lightnum;
|
INT16 finallight = lightnum;
|
||||||
|
|
||||||
if (cv_glfakecontrast.value == 0 || (HWR_ShouldUsePaletteRendering() && colormap))
|
if (cv_glfakecontrast.value == 0 || (colormap && HWR_ShouldUsePaletteRendering()))
|
||||||
return (FUINT)finallight;
|
return (FUINT)finallight;
|
||||||
|
|
||||||
if (seg != NULL && P_ApplyLightOffsetFine(lightnum, seg->frontsector))
|
if (seg != NULL && P_ApplyLightOffsetFine(lightnum, seg->frontsector))
|
||||||
{
|
{
|
||||||
INT16 offset = (cv_glfakecontrast.value == 2) ? seg->hwLightOffset : ((INT16)seg->lightOffset * 8);
|
const INT16 offset = (cv_glfakecontrast.value == 2) ? seg->hwLightOffset : ((INT16)seg->lightOffset * 8);
|
||||||
|
|
||||||
finallight += offset;
|
finallight += offset;
|
||||||
finallight = CLAMP(finallight, 0 , 255);
|
finallight = CLAMP(finallight, 0 , 255);
|
||||||
@@ -533,7 +534,7 @@ static FUINT HWR_CalcSlopeLight(FUINT lightnum, pslope_t *slope, const sector_t
|
|||||||
|
|
||||||
if (slope != NULL && sector != NULL && P_ApplyLightOffsetFine(lightnum, sector))
|
if (slope != NULL && sector != NULL && P_ApplyLightOffsetFine(lightnum, sector))
|
||||||
{
|
{
|
||||||
INT16 offset = (cv_glfakecontrast.value == 2) ? slope->hwLightOffset : ((INT16)slope->lightOffset * 8);
|
const INT16 offset = (cv_glfakecontrast.value == 2) ? slope->hwLightOffset : ((INT16)slope->lightOffset * 8);
|
||||||
|
|
||||||
finallight += (fof ? -offset : offset);
|
finallight += (fof ? -offset : offset);
|
||||||
finallight = CLAMP(finallight, 0 , 255);
|
finallight = CLAMP(finallight, 0 , 255);
|
||||||
@@ -550,7 +551,7 @@ static FUINT HWR_CalcSlopeLight(FUINT lightnum, pslope_t *slope, const sector_t
|
|||||||
// Render a floor or ceiling convex polygon
|
// Render a floor or ceiling convex polygon
|
||||||
static void HWR_RenderPlane(subsector_t *subsector, extrasubsector_t *xsub, boolean isceiling, fixed_t fixedheight, FBITFIELD PolyFlags, INT32 lightlevel, lumpnum_t lumpnum, sector_t *FOFsector, UINT8 alpha, extracolormap_t *planecolormap)
|
static void HWR_RenderPlane(subsector_t *subsector, extrasubsector_t *xsub, boolean isceiling, fixed_t fixedheight, FBITFIELD PolyFlags, INT32 lightlevel, lumpnum_t lumpnum, sector_t *FOFsector, UINT8 alpha, extracolormap_t *planecolormap)
|
||||||
{
|
{
|
||||||
FSurfaceInfo Surf;
|
FSurfaceInfo Surf = {};
|
||||||
FOutVector *v3d;
|
FOutVector *v3d;
|
||||||
polyvertex_t *pv;
|
polyvertex_t *pv;
|
||||||
pslope_t *slope = NULL;
|
pslope_t *slope = NULL;
|
||||||
@@ -587,15 +588,11 @@ static void HWR_RenderPlane(subsector_t *subsector, extrasubsector_t *xsub, bool
|
|||||||
const sector_t *sec = FOFsector ? FOFsector : gl_frontsector;
|
const sector_t *sec = FOFsector ? FOFsector : gl_frontsector;
|
||||||
|
|
||||||
// Get the slope pointer to simplify future code
|
// Get the slope pointer to simplify future code
|
||||||
if (sec->f_slope && !isceiling)
|
if (!isceiling && sec->f_slope)
|
||||||
slope = sec->f_slope;
|
slope = sec->f_slope;
|
||||||
else if (sec->c_slope && isceiling)
|
else if (isceiling && sec->c_slope)
|
||||||
slope = sec->c_slope;
|
slope = sec->c_slope;
|
||||||
|
|
||||||
// Set fixedheight to the slope's height from our viewpoint, if we have a slope
|
|
||||||
if (slope)
|
|
||||||
fixedheight = P_GetSlopeZAt(slope, viewx, viewy);
|
|
||||||
|
|
||||||
height = FixedToFloat(fixedheight);
|
height = FixedToFloat(fixedheight);
|
||||||
|
|
||||||
// Allocate plane-vertex buffer if we need to
|
// Allocate plane-vertex buffer if we need to
|
||||||
@@ -687,18 +684,19 @@ static void HWR_RenderPlane(subsector_t *subsector, extrasubsector_t *xsub, bool
|
|||||||
vert->s = (tempxsow * cosangf) - (tempytow * sinangf);\
|
vert->s = (tempxsow * cosangf) - (tempytow * sinangf);\
|
||||||
vert->t = (tempxsow * sinangf) + (tempytow * cosangf);\
|
vert->t = (tempxsow * sinangf) + (tempytow * cosangf);\
|
||||||
}\
|
}\
|
||||||
|
\
|
||||||
|
if (slope)\
|
||||||
|
{\
|
||||||
|
fixedheight = P_GetSlopeZAt(slope, FloatToFixed((vx)), FloatToFixed((vy)));\
|
||||||
|
height = FixedToFloat(fixedheight);\
|
||||||
|
}\
|
||||||
\
|
\
|
||||||
vert->x = (vx);\
|
vert->x = (vx);\
|
||||||
vert->y = height;\
|
vert->y = height;\
|
||||||
vert->z = (vy);\
|
vert->z = (vy);\
|
||||||
\
|
\
|
||||||
if (slope)\
|
|
||||||
{\
|
|
||||||
fixedheight = P_GetSlopeZAt(slope, FloatToFixed((vx)), FloatToFixed((vy)));\
|
|
||||||
vert->y = FixedToFloat(fixedheight);\
|
|
||||||
}\
|
|
||||||
}
|
}
|
||||||
for (i = 0, v3d = planeVerts; i < (INT32)nrPlaneVerts; i++,v3d++,pv++)
|
for (i = 0, v3d = planeVerts; i < (INT32)nrPlaneVerts; i++, v3d++, pv++)
|
||||||
SETUP3DVERT(v3d, pv->x, pv->y);
|
SETUP3DVERT(v3d, pv->x, pv->y);
|
||||||
|
|
||||||
if (slope)
|
if (slope)
|
||||||
@@ -1378,10 +1376,9 @@ void HWR_ProcessSeg(void) // Sort of like GLWall::Process in GZDoom
|
|||||||
extracolormap_t *colormap = gl_frontsector->extra_colormap;
|
extracolormap_t *colormap = gl_frontsector->extra_colormap;
|
||||||
lightnum = HWR_CalcWallLight(lightnum, gl_curline, colormap);
|
lightnum = HWR_CalcWallLight(lightnum, gl_curline, colormap);
|
||||||
|
|
||||||
FSurfaceInfo Surf;
|
FSurfaceInfo Surf = {};
|
||||||
|
|
||||||
if (gl_frontsector)
|
Surf.PolyColor.s.alpha = 255;
|
||||||
Surf.PolyColor.s.alpha = 255;
|
|
||||||
|
|
||||||
const INT32 gl_midtexture = R_GetTextureNum(gl_sidedef->midtexture);
|
const INT32 gl_midtexture = R_GetTextureNum(gl_sidedef->midtexture);
|
||||||
GLMapTexture_t *glTex = NULL;
|
GLMapTexture_t *glTex = NULL;
|
||||||
@@ -1424,6 +1421,11 @@ void HWR_ProcessSeg(void) // Sort of like GLWall::Process in GZDoom
|
|||||||
{
|
{
|
||||||
draw_sky_walls(0, 1, worldhigh, worldhighslope);
|
draw_sky_walls(0, 1, worldhigh, worldhighslope);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// hack to allow height changes in outdoor areas
|
||||||
|
// This is what gets rid of the upper textures if there should be sky
|
||||||
|
worldtop = worldhigh;
|
||||||
|
worldtopslope = worldhighslope;
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
@@ -1468,15 +1470,6 @@ void HWR_ProcessSeg(void) // Sort of like GLWall::Process in GZDoom
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
// hack to allow height changes in outdoor areas
|
|
||||||
// This is what gets rid of the upper textures if there should be sky
|
|
||||||
if (gl_frontsector->ceilingpic == skyflatnum
|
|
||||||
&& gl_backsector->ceilingpic == skyflatnum)
|
|
||||||
{
|
|
||||||
worldtop = worldhigh;
|
|
||||||
worldtopslope = worldhighslope;
|
|
||||||
}
|
|
||||||
|
|
||||||
gl_toptexture = R_GetTextureNum(gl_sidedef->toptexture);
|
gl_toptexture = R_GetTextureNum(gl_sidedef->toptexture);
|
||||||
|
|
||||||
// check TOP TEXTURE
|
// check TOP TEXTURE
|
||||||
@@ -1785,10 +1778,10 @@ void HWR_ProcessSeg(void) // Sort of like GLWall::Process in GZDoom
|
|||||||
// Single sided line... Deal only with the middletexture (if one exists)
|
// Single sided line... Deal only with the middletexture (if one exists)
|
||||||
if (gl_midtexture && gl_linedef->special != HORIZONSPECIAL) // Ignore horizon line for OGL
|
if (gl_midtexture && gl_linedef->special != HORIZONSPECIAL) // Ignore horizon line for OGL
|
||||||
{
|
{
|
||||||
glTex = HWR_GetTexture(gl_midtexture, noencore);
|
|
||||||
|
|
||||||
fixed_t texturevpeg;
|
fixed_t texturevpeg;
|
||||||
|
|
||||||
|
glTex = HWR_GetTexture(gl_midtexture, noencore);
|
||||||
|
|
||||||
// PEGGING
|
// PEGGING
|
||||||
if ((gl_linedef->flags & (ML_DONTPEGBOTTOM|ML_EFFECT2)) == (ML_DONTPEGBOTTOM|ML_EFFECT2))
|
if ((gl_linedef->flags & (ML_DONTPEGBOTTOM|ML_EFFECT2)) == (ML_DONTPEGBOTTOM|ML_EFFECT2))
|
||||||
texturevpeg = gl_frontsector->floorheight + textureheight[gl_sidedef->midtexture] - gl_frontsector->ceilingheight + gl_sidedef->rowoffset;
|
texturevpeg = gl_frontsector->floorheight + textureheight[gl_sidedef->midtexture] - gl_frontsector->ceilingheight + gl_sidedef->rowoffset;
|
||||||
@@ -1875,8 +1868,8 @@ void HWR_ProcessSeg(void) // Sort of like GLWall::Process in GZDoom
|
|||||||
//Hurdler: 3d-floors test
|
//Hurdler: 3d-floors test
|
||||||
if (!gl_drawing_stencil && gl_backsector && gl_frontsector->tag != gl_backsector->tag && (gl_backsector->ffloors || gl_frontsector->ffloors))
|
if (!gl_drawing_stencil && gl_backsector && gl_frontsector->tag != gl_backsector->tag && (gl_backsector->ffloors || gl_frontsector->ffloors))
|
||||||
{
|
{
|
||||||
ffloor_t * rover;
|
ffloor_t *rover;
|
||||||
fixed_t highcut = 0, lowcut = 0;
|
fixed_t highcut = 0, lowcut = 0;
|
||||||
fixed_t lowcutslope = 0, highcutslope = 0;
|
fixed_t lowcutslope = 0, highcutslope = 0;
|
||||||
|
|
||||||
// Used for height comparisons and etc across FOFs and slopes
|
// Used for height comparisons and etc across FOFs and slopes
|
||||||
@@ -2267,7 +2260,7 @@ void HWR_ProcessSeg(void) // Sort of like GLWall::Process in GZDoom
|
|||||||
|
|
||||||
static inline boolean HWR_UsePortals(void)
|
static inline boolean HWR_UsePortals(void)
|
||||||
{
|
{
|
||||||
return supportstencil && cv_glportals.value && gl_maphasportals;
|
return supportstencil && gl_maphasportals && cv_glportals.value;
|
||||||
}
|
}
|
||||||
|
|
||||||
// From PrBoom:
|
// From PrBoom:
|
||||||
@@ -2411,7 +2404,8 @@ static inline void DoAddLine(seg_t* line, angle_t angle1, angle_t angle2)
|
|||||||
// SoM: Backsector needs to be run through R_FakeFlat
|
// SoM: Backsector needs to be run through R_FakeFlat
|
||||||
static sector_t tempsec;
|
static sector_t tempsec;
|
||||||
|
|
||||||
auto do_addline = [&](bool dontdraw) {
|
auto do_addline = [&](bool dontdraw)
|
||||||
|
{
|
||||||
// Single sided line?
|
// Single sided line?
|
||||||
if (!line->backsector)
|
if (!line->backsector)
|
||||||
{
|
{
|
||||||
@@ -2678,8 +2672,8 @@ static void HWR_RenderPolyObjectPlane(polyobj_t *polysector, boolean isceiling,
|
|||||||
float scrollx = 0.0f, scrolly = 0.0f;
|
float scrollx = 0.0f, scrolly = 0.0f;
|
||||||
float anglef = 0.0f, cosangf = 0.0f, sinangf = 0.0f;
|
float anglef = 0.0f, cosangf = 0.0f, sinangf = 0.0f;
|
||||||
angle_t angle = 0;
|
angle_t angle = 0;
|
||||||
FSurfaceInfo Surf;
|
FSurfaceInfo Surf = {};
|
||||||
fixed_t tempxsow, tempytow;
|
float tempxsow, tempytow;
|
||||||
size_t nrPlaneVerts;
|
size_t nrPlaneVerts;
|
||||||
|
|
||||||
static FOutVector *planeVerts = NULL;
|
static FOutVector *planeVerts = NULL;
|
||||||
@@ -2692,14 +2686,6 @@ static void HWR_RenderPolyObjectPlane(polyobj_t *polysector, boolean isceiling,
|
|||||||
if (nrPlaneVerts < 3) // not even a triangle ?
|
if (nrPlaneVerts < 3) // not even a triangle ?
|
||||||
return;
|
return;
|
||||||
|
|
||||||
if (nrPlaneVerts > INT16_MAX) // FIXME: exceeds plVerts size
|
|
||||||
{
|
|
||||||
CONS_Debug(DBG_RENDER, "polygon size of %s exceeds max value of %d vertices\n", sizeu1(nrPlaneVerts), UINT16_MAX);
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
const sector_t *sec = FOFsector ? FOFsector : gl_frontsector;
|
|
||||||
|
|
||||||
// Allocate plane-vertex buffer if we need to
|
// Allocate plane-vertex buffer if we need to
|
||||||
if (!planeVerts || nrPlaneVerts > numAllocedPlaneVerts)
|
if (!planeVerts || nrPlaneVerts > numAllocedPlaneVerts)
|
||||||
{
|
{
|
||||||
@@ -2708,6 +2694,8 @@ static void HWR_RenderPolyObjectPlane(polyobj_t *polysector, boolean isceiling,
|
|||||||
Z_Malloc(numAllocedPlaneVerts * sizeof(FOutVector), PU_LEVEL, &planeVerts);
|
Z_Malloc(numAllocedPlaneVerts * sizeof(FOutVector), PU_LEVEL, &planeVerts);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
const sector_t *sec = FOFsector ? FOFsector : gl_frontsector;
|
||||||
|
|
||||||
height = FixedToFloat(fixedheight);
|
height = FixedToFloat(fixedheight);
|
||||||
|
|
||||||
len = W_LumpLength(lumpnum);
|
len = W_LumpLength(lumpnum);
|
||||||
@@ -2845,9 +2833,8 @@ static void HWR_AddPolyObjectPlanes(void)
|
|||||||
light = R_GetPlaneLight(gl_frontsector, polyobjsector->floorheight, true);
|
light = R_GetPlaneLight(gl_frontsector, polyobjsector->floorheight, true);
|
||||||
if (po_ptrs[i]->translucency > 0)
|
if (po_ptrs[i]->translucency > 0)
|
||||||
{
|
{
|
||||||
FSurfaceInfo Surf;
|
FSurfaceInfo Surf = {};
|
||||||
FBITFIELD blendmode;
|
FBITFIELD blendmode;
|
||||||
memset(&Surf, 0x00, sizeof(Surf));
|
|
||||||
blendmode = HWR_TranstableToAlpha(po_ptrs[i]->translucency, &Surf);
|
blendmode = HWR_TranstableToAlpha(po_ptrs[i]->translucency, &Surf);
|
||||||
HWR_AddTransparentPolyobjectFloor(levelflats[polyobjsector->floorpic].lumpnum, po_ptrs[i], false, polyobjsector->floorheight,
|
HWR_AddTransparentPolyobjectFloor(levelflats[polyobjsector->floorpic].lumpnum, po_ptrs[i], false, polyobjsector->floorheight,
|
||||||
(light == -1 ? gl_frontsector->lightlevel : *gl_frontsector->lightlist[light].lightlevel), Surf.PolyColor.s.alpha, polyobjsector, blendmode, (light == -1 ? gl_frontsector->extra_colormap : gl_frontsector->lightlist[light].extra_colormap));
|
(light == -1 ? gl_frontsector->lightlevel : *gl_frontsector->lightlist[light].lightlevel), Surf.PolyColor.s.alpha, polyobjsector, blendmode, (light == -1 ? gl_frontsector->extra_colormap : gl_frontsector->lightlist[light].extra_colormap));
|
||||||
@@ -2868,9 +2855,8 @@ static void HWR_AddPolyObjectPlanes(void)
|
|||||||
light = R_GetPlaneLight(gl_frontsector, polyobjsector->ceilingheight, true);
|
light = R_GetPlaneLight(gl_frontsector, polyobjsector->ceilingheight, true);
|
||||||
if (po_ptrs[i]->translucency > 0)
|
if (po_ptrs[i]->translucency > 0)
|
||||||
{
|
{
|
||||||
FSurfaceInfo Surf;
|
FSurfaceInfo Surf = {};
|
||||||
FBITFIELD blendmode;
|
FBITFIELD blendmode;
|
||||||
memset(&Surf, 0x00, sizeof(Surf));
|
|
||||||
blendmode = HWR_TranstableToAlpha(po_ptrs[i]->translucency, &Surf);
|
blendmode = HWR_TranstableToAlpha(po_ptrs[i]->translucency, &Surf);
|
||||||
HWR_AddTransparentPolyobjectFloor(levelflats[polyobjsector->ceilingpic].lumpnum, po_ptrs[i], true, polyobjsector->ceilingheight,
|
HWR_AddTransparentPolyobjectFloor(levelflats[polyobjsector->ceilingpic].lumpnum, po_ptrs[i], true, polyobjsector->ceilingheight,
|
||||||
(light == -1 ? gl_frontsector->lightlevel : *gl_frontsector->lightlist[light].lightlevel), Surf.PolyColor.s.alpha, polyobjsector, blendmode, (light == -1 ? gl_frontsector->extra_colormap : gl_frontsector->lightlist[light].extra_colormap));
|
(light == -1 ? gl_frontsector->lightlevel : *gl_frontsector->lightlist[light].lightlevel), Surf.PolyColor.s.alpha, polyobjsector, blendmode, (light == -1 ? gl_frontsector->extra_colormap : gl_frontsector->lightlist[light].extra_colormap));
|
||||||
@@ -2947,7 +2933,7 @@ static void HWR_Subsector(size_t num)
|
|||||||
static sector_t tempsec; //SoM: 4/7/2000
|
static sector_t tempsec; //SoM: 4/7/2000
|
||||||
INT32 floorlightlevel;
|
INT32 floorlightlevel;
|
||||||
INT32 ceilinglightlevel;
|
INT32 ceilinglightlevel;
|
||||||
INT32 locFloorHeight, locCeilingHeight;
|
INT32 locFloorHeight = 0, locCeilingHeight = 0;
|
||||||
INT32 cullFloorHeight, cullCeilingHeight;
|
INT32 cullFloorHeight, cullCeilingHeight;
|
||||||
INT32 light = 0;
|
INT32 light = 0;
|
||||||
extracolormap_t *floorcolormap;
|
extracolormap_t *floorcolormap;
|
||||||
@@ -2993,11 +2979,12 @@ static void HWR_Subsector(size_t num)
|
|||||||
|
|
||||||
cullFloorHeight = P_GetSectorFloorZAt (gl_frontsector, viewx, viewy);
|
cullFloorHeight = P_GetSectorFloorZAt (gl_frontsector, viewx, viewy);
|
||||||
cullCeilingHeight = P_GetSectorCeilingZAt(gl_frontsector, viewx, viewy);
|
cullCeilingHeight = P_GetSectorCeilingZAt(gl_frontsector, viewx, viewy);
|
||||||
locFloorHeight = P_GetSectorFloorZAt (gl_frontsector, gl_frontsector->soundorg.x, gl_frontsector->soundorg.y);
|
|
||||||
locCeilingHeight = P_GetSectorCeilingZAt(gl_frontsector, gl_frontsector->soundorg.x, gl_frontsector->soundorg.y);
|
|
||||||
|
|
||||||
if (gl_frontsector->ffloors)
|
if (gl_frontsector->ffloors)
|
||||||
{
|
{
|
||||||
|
locFloorHeight = P_GetSectorFloorZAt (gl_frontsector, gl_frontsector->soundorg.x, gl_frontsector->soundorg.y);
|
||||||
|
locCeilingHeight = P_GetSectorCeilingZAt(gl_frontsector, gl_frontsector->soundorg.x, gl_frontsector->soundorg.y);
|
||||||
|
|
||||||
boolean anyMoved = gl_frontsector->moved;
|
boolean anyMoved = gl_frontsector->moved;
|
||||||
|
|
||||||
if (anyMoved == false)
|
if (anyMoved == false)
|
||||||
@@ -3052,8 +3039,7 @@ static void HWR_Subsector(size_t num)
|
|||||||
{
|
{
|
||||||
HWR_GetFlat(levelflats[gl_frontsector->floorpic].lumpnum, R_NoEncore(gl_frontsector, false));
|
HWR_GetFlat(levelflats[gl_frontsector->floorpic].lumpnum, R_NoEncore(gl_frontsector, false));
|
||||||
HWR_RenderPlane(sub, &extrasubsectors[num], false,
|
HWR_RenderPlane(sub, &extrasubsectors[num], false,
|
||||||
// Hack to make things continue to work around slopes.
|
gl_frontsector->floorheight,
|
||||||
locFloorHeight == cullFloorHeight ? locFloorHeight : gl_frontsector->floorheight,
|
|
||||||
// We now return you to your regularly scheduled rendering.
|
// We now return you to your regularly scheduled rendering.
|
||||||
PF_Occlude, floorlightlevel, levelflats[gl_frontsector->floorpic].lumpnum, NULL, 255, floorcolormap);
|
PF_Occlude, floorlightlevel, levelflats[gl_frontsector->floorpic].lumpnum, NULL, 255, floorcolormap);
|
||||||
}
|
}
|
||||||
@@ -3068,8 +3054,7 @@ static void HWR_Subsector(size_t num)
|
|||||||
{
|
{
|
||||||
HWR_GetFlat(levelflats[gl_frontsector->ceilingpic].lumpnum, R_NoEncore(gl_frontsector, true));
|
HWR_GetFlat(levelflats[gl_frontsector->ceilingpic].lumpnum, R_NoEncore(gl_frontsector, true));
|
||||||
HWR_RenderPlane(sub, &extrasubsectors[num], true,
|
HWR_RenderPlane(sub, &extrasubsectors[num], true,
|
||||||
// Hack to make things continue to work around slopes.
|
gl_frontsector->ceilingheight,
|
||||||
locCeilingHeight == cullCeilingHeight ? locCeilingHeight : gl_frontsector->ceilingheight,
|
|
||||||
// We now return you to your regularly scheduled rendering.
|
// We now return you to your regularly scheduled rendering.
|
||||||
PF_Occlude, ceilinglightlevel, levelflats[gl_frontsector->ceilingpic].lumpnum, NULL, 255, ceilingcolormap);
|
PF_Occlude, ceilinglightlevel, levelflats[gl_frontsector->ceilingpic].lumpnum, NULL, 255, ceilingcolormap);
|
||||||
}
|
}
|
||||||
@@ -3423,7 +3408,7 @@ static void HWR_DrawSpriteShadow(gl_vissprite_t *spr, patch_t *gpatch, GLPatch_t
|
|||||||
{
|
{
|
||||||
float this_scale = 1.0f;
|
float this_scale = 1.0f;
|
||||||
FOutVector swallVerts[4];
|
FOutVector swallVerts[4];
|
||||||
FSurfaceInfo sSurf;
|
FSurfaceInfo sSurf = {};
|
||||||
FBITFIELD blendmode = 0;
|
FBITFIELD blendmode = 0;
|
||||||
fixed_t floorheight, mobjfloor;
|
fixed_t floorheight, mobjfloor;
|
||||||
pslope_t *floorslope;
|
pslope_t *floorslope;
|
||||||
@@ -3659,7 +3644,7 @@ static void HWR_SplitSprite(gl_vissprite_t *spr, const boolean papersprite)
|
|||||||
FOutVector baseWallVerts[4]; // This is what the verts should end up as
|
FOutVector baseWallVerts[4]; // This is what the verts should end up as
|
||||||
patch_t *gpatch;
|
patch_t *gpatch;
|
||||||
GLPatch_t *hwrpatch;
|
GLPatch_t *hwrpatch;
|
||||||
FSurfaceInfo Surf;
|
FSurfaceInfo Surf = {};
|
||||||
extracolormap_t *colormap;
|
extracolormap_t *colormap;
|
||||||
INT32 lightlevel;
|
INT32 lightlevel;
|
||||||
boolean lightset = true;
|
boolean lightset = true;
|
||||||
@@ -3688,7 +3673,7 @@ static void HWR_SplitSprite(gl_vissprite_t *spr, const boolean papersprite)
|
|||||||
//Hurdler: 25/04/2000: now support colormap in hardware mode
|
//Hurdler: 25/04/2000: now support colormap in hardware mode
|
||||||
HWR_GetMappedPatch(gpatch, spr->colormap);
|
HWR_GetMappedPatch(gpatch, spr->colormap);
|
||||||
|
|
||||||
hwrpatch = ((GLPatch_t *)gpatch->hardware);
|
hwrpatch = static_cast<GLPatch_t *>(gpatch->hardware);
|
||||||
|
|
||||||
// Draw shadow BEFORE sprite
|
// Draw shadow BEFORE sprite
|
||||||
if (UNLIKELY(cv_shadow.value // Shadows enabled
|
if (UNLIKELY(cv_shadow.value // Shadows enabled
|
||||||
@@ -3786,8 +3771,15 @@ static void HWR_SplitSprite(gl_vissprite_t *spr, const boolean papersprite)
|
|||||||
blend = HWR_GetBlendModeFlag(blendmode)|PF_Occlude;
|
blend = HWR_GetBlendModeFlag(blendmode)|PF_Occlude;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (cv_playerfade.value && sprmo->player)
|
if (sprmo->player)
|
||||||
Surf.PolyColor.s.alpha = FixedMul(R_DoPlayerFade(sprmo), Surf.PolyColor.s.alpha);
|
{
|
||||||
|
// make hyu´d players translucent with reducevfx, could be done better, but im lazy as crap
|
||||||
|
if (cv_reducevfx.value && sprmo->player->kartstuff[k_hyudorotimer] > 0)
|
||||||
|
Surf.PolyColor.s.alpha = static_cast<UINT8>(FixedMul(FRACUNIT/2, static_cast<fixed_t>(Surf.PolyColor.s.alpha)));
|
||||||
|
|
||||||
|
if (cv_playerfade.value)
|
||||||
|
Surf.PolyColor.s.alpha = static_cast<UINT8>(FixedMul(R_DoPlayerFade(sprmo), static_cast<fixed_t>(Surf.PolyColor.s.alpha)));
|
||||||
|
}
|
||||||
|
|
||||||
if (HWR_UseShader())
|
if (HWR_UseShader())
|
||||||
{
|
{
|
||||||
@@ -3809,7 +3801,7 @@ static void HWR_SplitSprite(gl_vissprite_t *spr, const boolean papersprite)
|
|||||||
{
|
{
|
||||||
const fixed_t h = P_GetLightZAt(§or->lightlist[i], sprmo->x, sprmo->y);
|
const fixed_t h = P_GetLightZAt(§or->lightlist[i], sprmo->x, sprmo->y);
|
||||||
|
|
||||||
if (!(h <= temp))
|
if (h > temp)
|
||||||
continue;
|
continue;
|
||||||
|
|
||||||
if (!lightset)
|
if (!lightset)
|
||||||
@@ -3871,7 +3863,7 @@ static void HWR_SplitSprite(gl_vissprite_t *spr, const boolean papersprite)
|
|||||||
wallVerts[1].y = endbot;
|
wallVerts[1].y = endbot;
|
||||||
|
|
||||||
// The x and y only need to be adjusted in the case that it's not a papersprite
|
// The x and y only need to be adjusted in the case that it's not a papersprite
|
||||||
if (cv_glspritebillboarding.value && sprmo && !papersprite)
|
if (cv_glspritebillboarding.value && !cv_glshearing.value && !papersprite)
|
||||||
{
|
{
|
||||||
// Get the x and z of the vertices so billboarding draws correctly
|
// Get the x and z of the vertices so billboarding draws correctly
|
||||||
realheight = realbot - realtop;
|
realheight = realbot - realtop;
|
||||||
@@ -3937,14 +3929,14 @@ static void HWR_DrawSprite(gl_vissprite_t *spr)
|
|||||||
FOutVector wallVerts[4];
|
FOutVector wallVerts[4];
|
||||||
patch_t *gpatch; // sprite patch converted to hardware
|
patch_t *gpatch; // sprite patch converted to hardware
|
||||||
GLPatch_t *hwrpatch;
|
GLPatch_t *hwrpatch;
|
||||||
FSurfaceInfo Surf;
|
FSurfaceInfo Surf = {};
|
||||||
FBITFIELD blend = 0;
|
FBITFIELD blend = 0;
|
||||||
|
|
||||||
INT32 shader = SHADER_NONE;
|
INT32 shader = SHADER_NONE;
|
||||||
|
|
||||||
mobj_t *sprmo = spr->mobj;
|
mobj_t *sprmo = spr->mobj;
|
||||||
|
|
||||||
if (UNLIKELY(!sprmo->subsector))
|
if (!sprmo->subsector)
|
||||||
return;
|
return;
|
||||||
|
|
||||||
const boolean papersprite = (sprmo->frame & FF_PAPERSPRITE);
|
const boolean papersprite = (sprmo->frame & FF_PAPERSPRITE);
|
||||||
@@ -3969,7 +3961,7 @@ static void HWR_DrawSprite(gl_vissprite_t *spr)
|
|||||||
//Hurdler: 25/04/2000: now support colormap in hardware mode
|
//Hurdler: 25/04/2000: now support colormap in hardware mode
|
||||||
HWR_GetMappedPatch(gpatch, spr->colormap);
|
HWR_GetMappedPatch(gpatch, spr->colormap);
|
||||||
|
|
||||||
hwrpatch = ((GLPatch_t *)gpatch->hardware);
|
hwrpatch = static_cast<GLPatch_t *>(gpatch->hardware);
|
||||||
|
|
||||||
// create the sprite billboard
|
// create the sprite billboard
|
||||||
//
|
//
|
||||||
@@ -4076,8 +4068,15 @@ static void HWR_DrawSprite(gl_vissprite_t *spr)
|
|||||||
blend = HWR_GetBlendModeFlag(blendmode)|PF_Occlude;
|
blend = HWR_GetBlendModeFlag(blendmode)|PF_Occlude;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (cv_playerfade.value && sprmo->player)
|
if (sprmo->player)
|
||||||
Surf.PolyColor.s.alpha = FixedMul(R_DoPlayerFade(sprmo), Surf.PolyColor.s.alpha);
|
{
|
||||||
|
// make hyu´d players translucent with reducevfx, could be done better, but im lazy as crap
|
||||||
|
if (cv_reducevfx.value && sprmo->player->kartstuff[k_hyudorotimer] > 0)
|
||||||
|
Surf.PolyColor.s.alpha = static_cast<UINT8>(FixedMul(FRACUNIT/2, static_cast<fixed_t>(Surf.PolyColor.s.alpha)));
|
||||||
|
|
||||||
|
if (cv_playerfade.value)
|
||||||
|
Surf.PolyColor.s.alpha = static_cast<UINT8>(FixedMul(R_DoPlayerFade(sprmo), static_cast<fixed_t>(Surf.PolyColor.s.alpha)));
|
||||||
|
}
|
||||||
|
|
||||||
if (HWR_UseShader())
|
if (HWR_UseShader())
|
||||||
{
|
{
|
||||||
@@ -4095,13 +4094,13 @@ static void HWR_DrawPrecipitationSprite(gl_vissprite_t *spr)
|
|||||||
FOutVector wallVerts[4];
|
FOutVector wallVerts[4];
|
||||||
patch_t *gpatch; // sprite patch converted to hardware
|
patch_t *gpatch; // sprite patch converted to hardware
|
||||||
GLPatch_t *hwrpatch;
|
GLPatch_t *hwrpatch;
|
||||||
FSurfaceInfo Surf;
|
FSurfaceInfo Surf = {};
|
||||||
|
|
||||||
INT32 shader = SHADER_NONE;
|
INT32 shader = SHADER_NONE;
|
||||||
|
|
||||||
const precipmobj_t *sprmo = spr->precip;
|
const precipmobj_t *sprmo = spr->precip;
|
||||||
|
|
||||||
if (UNLIKELY(!sprmo->subsector))
|
if (!sprmo->subsector)
|
||||||
return;
|
return;
|
||||||
|
|
||||||
// cache sprite graphics
|
// cache sprite graphics
|
||||||
@@ -4112,7 +4111,7 @@ static void HWR_DrawPrecipitationSprite(gl_vissprite_t *spr)
|
|||||||
//Hurdler: 25/04/2000: now support colormap in hardware mode
|
//Hurdler: 25/04/2000: now support colormap in hardware mode
|
||||||
HWR_GetMappedPatch(gpatch, spr->colormap);
|
HWR_GetMappedPatch(gpatch, spr->colormap);
|
||||||
|
|
||||||
hwrpatch = ((GLPatch_t *)gpatch->hardware);
|
hwrpatch = static_cast<GLPatch_t *>(gpatch->hardware);
|
||||||
|
|
||||||
// create the sprite billboard
|
// create the sprite billboard
|
||||||
//
|
//
|
||||||
@@ -4301,22 +4300,23 @@ static std::vector<gl_drawnode_t> drawnodes;
|
|||||||
|
|
||||||
static void *HWR_CreateDrawNode(gl_drawnode_type_t type)
|
static void *HWR_CreateDrawNode(gl_drawnode_type_t type)
|
||||||
{
|
{
|
||||||
// if we didnt alloc anything yet, reserve atleast 64 nodes
|
gl_drawnode_t *drawnode;
|
||||||
// dont declare with it as we want our size to be 0!
|
|
||||||
drawnodes.reserve(DRAWNODES_INIT_SIZE);
|
drawnodes.reserve(DRAWNODES_INIT_SIZE);
|
||||||
|
|
||||||
drawnodes.emplace_back();
|
drawnodes.emplace_back();
|
||||||
drawnodes.back().type = type;
|
|
||||||
|
drawnode = &drawnodes.back();
|
||||||
|
drawnode->type = type;
|
||||||
|
|
||||||
// not sure if returning different pointers to a union is necessary
|
// not sure if returning different pointers to a union is necessary
|
||||||
switch (type)
|
switch (type)
|
||||||
{
|
{
|
||||||
case DRAWNODE_PLANE:
|
case DRAWNODE_PLANE:
|
||||||
return &drawnodes.back().u.plane;
|
return &drawnode->u.plane;
|
||||||
case DRAWNODE_POLYOBJECT_PLANE:
|
case DRAWNODE_POLYOBJECT_PLANE:
|
||||||
return &drawnodes.back().u.polyplane;
|
return &drawnode->u.polyplane;
|
||||||
case DRAWNODE_WALL:
|
case DRAWNODE_WALL:
|
||||||
return &drawnodes.back().u.wall;
|
return &drawnode->u.wall;
|
||||||
}
|
}
|
||||||
|
|
||||||
return NULL;
|
return NULL;
|
||||||
@@ -4383,9 +4383,7 @@ static int CompareDrawNodePlanes(const void *p1, const void *p2)
|
|||||||
static void HWR_RenderDrawNodes(void)
|
static void HWR_RenderDrawNodes(void)
|
||||||
{
|
{
|
||||||
size_t i = 0, run_start = 0;
|
size_t i = 0, run_start = 0;
|
||||||
static std::vector<INT32> sortindex;
|
static std::vector<INT32> sortindex(DRAWNODES_INIT_SIZE);
|
||||||
|
|
||||||
sortindex.reserve(DRAWNODES_INIT_SIZE);
|
|
||||||
|
|
||||||
// Array for storing the rendering order.
|
// Array for storing the rendering order.
|
||||||
// A list of indices into the drawnodes array.
|
// A list of indices into the drawnodes array.
|
||||||
@@ -4503,7 +4501,6 @@ static void HWR_RenderDrawNodes(void)
|
|||||||
drawnodes.clear(); // clear so our size is 0 again!
|
drawnodes.clear(); // clear so our size is 0 again!
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
// --------------------------------------------------------------------------
|
// --------------------------------------------------------------------------
|
||||||
// Draw all vissprites
|
// Draw all vissprites
|
||||||
// --------------------------------------------------------------------------
|
// --------------------------------------------------------------------------
|
||||||
@@ -4821,11 +4818,9 @@ static void HWR_ProjectSprite(mobj_t *thing)
|
|||||||
)
|
)
|
||||||
{
|
{
|
||||||
ang = R_PointToAngle(interp.x, interp.y);
|
ang = R_PointToAngle(interp.x, interp.y);
|
||||||
|
|
||||||
#ifdef ROTSPRITE
|
#ifdef ROTSPRITE
|
||||||
camang = ang;
|
camang = ang;
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
ang -= interp.angle;
|
ang -= interp.angle;
|
||||||
|
|
||||||
if (mirrored)
|
if (mirrored)
|
||||||
@@ -4840,7 +4835,7 @@ static void HWR_ProjectSprite(mobj_t *thing)
|
|||||||
flip = sprframe->flip; // Will only be 0x00 or 0xFF
|
flip = sprframe->flip; // Will only be 0x00 or 0xFF
|
||||||
|
|
||||||
if (papersprite && ang < ANGLE_180)
|
if (papersprite && ang < ANGLE_180)
|
||||||
flip ^= 0xFFFF;
|
flip ^= 0xFF;
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
@@ -4860,9 +4855,9 @@ static void HWR_ProjectSprite(mobj_t *thing)
|
|||||||
flip ^= (1<<rot);
|
flip ^= (1<<rot);
|
||||||
}
|
}
|
||||||
|
|
||||||
spr_width = spritecachedinfo[lumpoff].width;
|
spr_width = spritecachedinfo[lumpoff].width;
|
||||||
spr_height = spritecachedinfo[lumpoff].height;
|
spr_height = spritecachedinfo[lumpoff].height;
|
||||||
spr_offset = spritecachedinfo[lumpoff].offset;
|
spr_offset = spritecachedinfo[lumpoff].offset;
|
||||||
spr_topoffset = spritecachedinfo[lumpoff].topoffset;
|
spr_topoffset = spritecachedinfo[lumpoff].topoffset;
|
||||||
|
|
||||||
#ifdef ROTSPRITE
|
#ifdef ROTSPRITE
|
||||||
@@ -4948,11 +4943,11 @@ static void HWR_ProjectSprite(mobj_t *thing)
|
|||||||
// if the sprite is out of our view, dont need to draw it X)
|
// if the sprite is out of our view, dont need to draw it X)
|
||||||
if (!gld_SphereInFrustum(
|
if (!gld_SphereInFrustum(
|
||||||
(FixedToFloat(interp.x)) + cos_inv_yaw * (x1 + x2) / 2.0f,
|
(FixedToFloat(interp.x)) + cos_inv_yaw * (x1 + x2) / 2.0f,
|
||||||
FixedToFloat(interp.z) + (y1 + y2) / 2.0f,
|
FixedToFloat(interp.z) + (y1 + y2) / 2.0f,
|
||||||
FixedToFloat(interp.y) - sin_inv_yaw * (x1 + x2) / 2.0f,
|
FixedToFloat(interp.y) - sin_inv_yaw * (x1 + x2) / 2.0f,
|
||||||
//1.5 == sqrt(2) + small delta for MF_FOREGROUND
|
//1.5 == sqrt(2) + small delta for MF_FOREGROUND
|
||||||
std::max<float>(FixedToFloat(spr_width) * spritexscale,
|
std::max<float>(FixedToFloat(spr_width) * spritexscale,
|
||||||
FixedToFloat(spr_height) * spriteyscale) / 2.0f * 1.5f))
|
FixedToFloat(spr_height) * spriteyscale) / 2.0f * 1.5f))
|
||||||
{
|
{
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
@@ -5011,10 +5006,10 @@ static void HWR_ProjectSprite(mobj_t *thing)
|
|||||||
vis->flip = flip;
|
vis->flip = flip;
|
||||||
|
|
||||||
vis->scale = thing_scale;
|
vis->scale = thing_scale;
|
||||||
vis->spritexscale = spritexscale;
|
/*vis->spritexscale = spritexscale;
|
||||||
vis->spriteyscale = spriteyscale;
|
vis->spriteyscale = spriteyscale;
|
||||||
vis->spritexoffset = FixedToFloat(spr_offset);
|
vis->spritexoffset = FixedToFloat(spr_offset);
|
||||||
vis->spriteyoffset = FixedToFloat(spr_topoffset);
|
vis->spriteyoffset = FixedToFloat(spr_topoffset);*/
|
||||||
|
|
||||||
#ifdef ROTSPRITE
|
#ifdef ROTSPRITE
|
||||||
if (rotsprite != NULL)
|
if (rotsprite != NULL)
|
||||||
@@ -5143,9 +5138,9 @@ static void HWR_ProjectPrecipitationSprite(precipmobj_t *thing)
|
|||||||
lumpoff = sprframe->lumpid[0];
|
lumpoff = sprframe->lumpid[0];
|
||||||
flip = sprframe->flip; // Will only be 0x00 or 0xFF
|
flip = sprframe->flip; // Will only be 0x00 or 0xFF
|
||||||
|
|
||||||
spr_width = spritecachedinfo[lumpoff].width;
|
spr_width = spritecachedinfo[lumpoff].width;
|
||||||
spr_height = spritecachedinfo[lumpoff].height;
|
spr_height = spritecachedinfo[lumpoff].height;
|
||||||
spr_offset = spritecachedinfo[lumpoff].offset;
|
spr_offset = spritecachedinfo[lumpoff].offset;
|
||||||
spr_topoffset = spritecachedinfo[lumpoff].topoffset;
|
spr_topoffset = spritecachedinfo[lumpoff].topoffset;
|
||||||
|
|
||||||
if (flip)
|
if (flip)
|
||||||
@@ -5168,11 +5163,11 @@ static void HWR_ProjectPrecipitationSprite(precipmobj_t *thing)
|
|||||||
|
|
||||||
if (!gld_SphereInFrustum(
|
if (!gld_SphereInFrustum(
|
||||||
(FixedToFloat(interp.x)) + cos_inv_yaw * (x1 + x2) / 2.0f,
|
(FixedToFloat(interp.x)) + cos_inv_yaw * (x1 + x2) / 2.0f,
|
||||||
FixedToFloat(interp.z) + (y1 + y2) / 2.0f,
|
FixedToFloat(interp.z) + (y1 + y2) / 2.0f,
|
||||||
FixedToFloat(interp.y) - sin_inv_yaw * (x1 + x2) / 2.0f,
|
FixedToFloat(interp.y) - sin_inv_yaw * (x1 + x2) / 2.0f,
|
||||||
//1.5 == sqrt(2) + small delta for MF_FOREGROUND
|
//1.5 == sqrt(2) + small delta for MF_FOREGROUND
|
||||||
std::max<float>(FixedToFloat(spr_width) * thing_scale,
|
std::max<float>(FixedToFloat(spr_width) * thing_scale,
|
||||||
FixedToFloat(spr_height) * thing_scale) / 2.0f * 1.5f))
|
FixedToFloat(spr_height) * thing_scale) / 2.0f * 1.5f))
|
||||||
{
|
{
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
@@ -5285,7 +5280,6 @@ void HWR_ClearSkyDome(void)
|
|||||||
sky->loops = NULL;
|
sky->loops = NULL;
|
||||||
sky->data = NULL;
|
sky->data = NULL;
|
||||||
|
|
||||||
sky->vbo = 0;
|
|
||||||
sky->rows = sky->columns = 0;
|
sky->rows = sky->columns = 0;
|
||||||
sky->loopcount = 0;
|
sky->loopcount = 0;
|
||||||
|
|
||||||
@@ -5433,7 +5427,7 @@ static void HWR_SetTransformAiming(FTransform *trans)
|
|||||||
fixed_t fixedaiming = AIMINGTODY(aimingangle);
|
fixed_t fixedaiming = AIMINGTODY(aimingangle);
|
||||||
trans->viewaiming = FixedToFloat(fixedaiming) * (static_cast<float>(vid.width) / static_cast<float>(vid.height)) / (static_cast<float>(BASEVIDWIDTH) / static_cast<float>(BASEVIDHEIGHT));
|
trans->viewaiming = FixedToFloat(fixedaiming) * (static_cast<float>(vid.width) / static_cast<float>(vid.height)) / (static_cast<float>(BASEVIDWIDTH) / static_cast<float>(BASEVIDHEIGHT));
|
||||||
if (splitscreen == 1) // only for 2 player splitscreen
|
if (splitscreen == 1) // only for 2 player splitscreen
|
||||||
trans->viewaiming *= 2.125; // splitscreen adjusts fov with 0.8, so compensate (but only halfway, since splitscreen means only half the screen is used)
|
trans->viewaiming *= 2.125f; // splitscreen adjusts fov with 0.8, so compensate (but only halfway, since splitscreen means only half the screen is used)
|
||||||
trans->shearing = true;
|
trans->shearing = true;
|
||||||
gl_aimingangle = 0;
|
gl_aimingangle = 0;
|
||||||
}
|
}
|
||||||
@@ -5538,7 +5532,7 @@ static void HWR_RenderViewpoint(gl_portal_t *rootportal, int stencil_level, bool
|
|||||||
player_t *viewplayer = &players[displayplayers[viewssnum]];
|
player_t *viewplayer = &players[displayplayers[viewssnum]];
|
||||||
const float fpov = FixedToFloat(R_GetPlayerFov(viewplayer));
|
const float fpov = FixedToFloat(R_GetPlayerFov(viewplayer));
|
||||||
|
|
||||||
auto reset_viewstate = [&](const float fpov)
|
auto reset_viewstate = [&]()
|
||||||
{
|
{
|
||||||
HWR_SetTransform(fpov);
|
HWR_SetTransform(fpov);
|
||||||
HWR_ClearSprites();
|
HWR_ClearSprites();
|
||||||
@@ -5558,7 +5552,7 @@ static void HWR_RenderViewpoint(gl_portal_t *rootportal, int stencil_level, bool
|
|||||||
currentportallist = &portallist;
|
currentportallist = &portallist;
|
||||||
HWR_SetPortalState(GLPORTAL_SEARCH);
|
HWR_SetPortalState(GLPORTAL_SEARCH);
|
||||||
|
|
||||||
reset_viewstate(fpov);
|
reset_viewstate();
|
||||||
|
|
||||||
if (rootportal)
|
if (rootportal)
|
||||||
{
|
{
|
||||||
@@ -5584,7 +5578,7 @@ static void HWR_RenderViewpoint(gl_portal_t *rootportal, int stencil_level, bool
|
|||||||
// draw normal things in current frame in current incremented stencil buffer area
|
// draw normal things in current frame in current incremented stencil buffer area
|
||||||
HWR_SetStencilState(HWR_STENCIL_NORMAL, stencil_level);
|
HWR_SetStencilState(HWR_STENCIL_NORMAL, stencil_level);
|
||||||
|
|
||||||
reset_viewstate(fpov);
|
reset_viewstate();
|
||||||
|
|
||||||
if constexpr (Type == RenderViewpointType::kPortal)
|
if constexpr (Type == RenderViewpointType::kPortal)
|
||||||
{
|
{
|
||||||
@@ -5697,6 +5691,12 @@ extern "C" {
|
|||||||
// ==========================================================================
|
// ==========================================================================
|
||||||
static void HWR_RenderFrame(boolean skybox, boolean drawsky)
|
static void HWR_RenderFrame(boolean skybox, boolean drawsky)
|
||||||
{
|
{
|
||||||
|
// NetUpdate below may cause this to be false midrender if toggled
|
||||||
|
const boolean useportals = HWR_UsePortals();
|
||||||
|
|
||||||
|
if (useportals)
|
||||||
|
GL_EnableStencilTest();
|
||||||
|
|
||||||
// Clear view, set viewport (glViewport), set perspective...
|
// Clear view, set viewport (glViewport), set perspective...
|
||||||
HWR_ClearView();
|
HWR_ClearView();
|
||||||
|
|
||||||
@@ -5714,7 +5714,7 @@ static void HWR_RenderFrame(boolean skybox, boolean drawsky)
|
|||||||
viewwindowy,
|
viewwindowy,
|
||||||
(viewwindowx + viewwidth),
|
(viewwindowx + viewwidth),
|
||||||
(viewwindowy + viewheight),
|
(viewwindowy + viewheight),
|
||||||
ZCLIP_PLANE, clipping_distances[renderdist - 1]);
|
ZCLIP_PLANE, clipping_distances[renderdist - 1]);
|
||||||
current_bsp_culling_distance = bsp_culling_distances[renderdist- 1];
|
current_bsp_culling_distance = bsp_culling_distances[renderdist- 1];
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -5722,11 +5722,14 @@ static void HWR_RenderFrame(boolean skybox, boolean drawsky)
|
|||||||
NetUpdate();
|
NetUpdate();
|
||||||
|
|
||||||
portalclipline = NULL;
|
portalclipline = NULL;
|
||||||
if (UNLIKELY(HWR_UsePortals()))
|
if (useportals)
|
||||||
HWR_RenderViewpoint<RenderViewpointType::kPortal>(NULL, 0, !skybox);
|
HWR_RenderViewpoint<RenderViewpointType::kPortal>(NULL, 0, !skybox);
|
||||||
else
|
else
|
||||||
HWR_RenderViewpoint<RenderViewpointType::kNormal>(NULL, 0, !skybox);
|
HWR_RenderViewpoint<RenderViewpointType::kNormal>(NULL, 0, !skybox);
|
||||||
|
|
||||||
|
if (useportals)
|
||||||
|
GL_DisableStencilTest();
|
||||||
|
|
||||||
// Check for new console commands.
|
// Check for new console commands.
|
||||||
NetUpdate();
|
NetUpdate();
|
||||||
}
|
}
|
||||||
@@ -5903,7 +5906,6 @@ void HWR_AddCommands(void)
|
|||||||
|
|
||||||
CV_RegisterVar(&cv_glpaletterendering);
|
CV_RegisterVar(&cv_glpaletterendering);
|
||||||
CV_RegisterVar(&cv_glpalettedepth);
|
CV_RegisterVar(&cv_glpalettedepth);
|
||||||
CV_RegisterVar(&cv_glflashpal);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
// --------------------------------------------------------------------------
|
// --------------------------------------------------------------------------
|
||||||
@@ -5983,7 +5985,7 @@ static void COM_HWR_glinfo(void)
|
|||||||
// if the GPU is super new and supports a bajillion extensions - xyzzy
|
// if the GPU is super new and supports a bajillion extensions - xyzzy
|
||||||
|
|
||||||
char *copy = strdup((const char*)gl_extensions);
|
char *copy = strdup((const char*)gl_extensions);
|
||||||
char *ext = strtok(copy, " ");
|
char *ext;
|
||||||
|
|
||||||
if (copy == NULL)
|
if (copy == NULL)
|
||||||
{
|
{
|
||||||
@@ -5991,6 +5993,8 @@ static void COM_HWR_glinfo(void)
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
ext = strtok(copy, " ");
|
||||||
|
|
||||||
do
|
do
|
||||||
{
|
{
|
||||||
CONS_Printf(" - %s\n", ext);
|
CONS_Printf(" - %s\n", ext);
|
||||||
@@ -6060,7 +6064,7 @@ static void HWR_DoPostProcessor(void)
|
|||||||
{
|
{
|
||||||
// Armageddon Blast Flash!
|
// Armageddon Blast Flash!
|
||||||
// Could this even be considered postprocessor?
|
// Could this even be considered postprocessor?
|
||||||
if (!HWR_PalRenderFlashpal())
|
if (!HWR_ShouldUsePaletteRendering())
|
||||||
{
|
{
|
||||||
const player_t *player = &players[displayplayers[viewssnum]];
|
const player_t *player = &players[displayplayers[viewssnum]];
|
||||||
|
|
||||||
@@ -6073,7 +6077,7 @@ static void HWR_DoPostProcessor(void)
|
|||||||
{-4.0f, -4.0f, 4.0f, 0.0f, 0.0f}
|
{-4.0f, -4.0f, 4.0f, 0.0f, 0.0f}
|
||||||
};
|
};
|
||||||
|
|
||||||
FSurfaceInfo Surf;
|
FSurfaceInfo Surf = {};
|
||||||
|
|
||||||
// This won't change if the flash palettes are changed unfortunately, but it works for its purpose
|
// This won't change if the flash palettes are changed unfortunately, but it works for its purpose
|
||||||
if (player->flashpal == PAL_NUKE)
|
if (player->flashpal == PAL_NUKE)
|
||||||
@@ -6092,64 +6096,66 @@ static void HWR_DoPostProcessor(void)
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if (cv_glscreentextures.value != 2) // screen textures are needed for the rest of the effects
|
// screen textures are needed for the rest of the effects
|
||||||
|
if (cv_glscreentextures.value != 2)
|
||||||
return;
|
return;
|
||||||
|
|
||||||
//UINT8 viewnum = R_GetViewNumber(); // see below
|
// Not supported in splitscreen - someone want to add support?
|
||||||
|
if (splitscreen || cv_reducevfx.value)
|
||||||
|
return;
|
||||||
|
|
||||||
|
//UINT8 viewnum = R_GetViewNumber();
|
||||||
//camera_t *thiscam = &camera[viewnum];
|
//camera_t *thiscam = &camera[viewnum];
|
||||||
const camera_t *thiscam = &camera[0];
|
const camera_t *thiscam = &camera[0];
|
||||||
|
|
||||||
// Not supported in splitscreen - someone want to add support?
|
if (!(thiscam->postimg & POSTIMG_WATER || thiscam->postimg & POSTIMG_HEAT))
|
||||||
const boolean screenwave = (!splitscreen && (thiscam->postimg & POSTIMG_WATER || thiscam->postimg & POSTIMG_HEAT));
|
return;
|
||||||
|
|
||||||
// Capture the screen for intermission and screen waving
|
// Capture the screen for intermission and screen waving
|
||||||
if ((lastdraw || screenwave) && gamestate != GS_INTERMISSION)
|
if (gamestate != GS_INTERMISSION)
|
||||||
GL_MakeScreenTexture(HWD_SCREENTEXTURE_GENERIC1);
|
GL_MakeScreenTexture(HWD_SCREENTEXTURE_GENERIC1);
|
||||||
|
|
||||||
// Drunken vision! WooOOooo~
|
// Drunken vision! WooOOooo~
|
||||||
if (screenwave)
|
// 10 by 10 grid. 2 coordinates (xy)
|
||||||
|
float v[SCREENVERTS][SCREENVERTS][2];
|
||||||
|
float disStart = (leveltime-1) + FixedToFloat(R_GetTimeFrac(RTF_LEVEL));
|
||||||
|
|
||||||
|
UINT8 x, y;
|
||||||
|
float WAVELENGTH;
|
||||||
|
float AMPLITUDE;
|
||||||
|
float FREQUENCY;
|
||||||
|
|
||||||
|
// Modifies the wave.
|
||||||
|
if (thiscam->postimg & POSTIMG_WATER)
|
||||||
{
|
{
|
||||||
// 10 by 10 grid. 2 coordinates (xy)
|
WAVELENGTH = 5.0f;
|
||||||
float v[SCREENVERTS][SCREENVERTS][2];
|
AMPLITUDE = 40.0f;
|
||||||
float disStart = (leveltime-1) + FixedToFloat(R_GetTimeFrac(RTF_LEVEL));
|
FREQUENCY = 8.0f;
|
||||||
|
|
||||||
UINT8 x, y;
|
|
||||||
float WAVELENGTH;
|
|
||||||
float AMPLITUDE;
|
|
||||||
float FREQUENCY;
|
|
||||||
|
|
||||||
// Modifies the wave.
|
|
||||||
if (thiscam->postimg & POSTIMG_WATER)
|
|
||||||
{
|
|
||||||
WAVELENGTH = 5.0f;
|
|
||||||
AMPLITUDE = 40.0f;
|
|
||||||
FREQUENCY = 8.0f;
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
WAVELENGTH = 10.0f;
|
|
||||||
AMPLITUDE = 60.0f;
|
|
||||||
FREQUENCY = 4.0f;
|
|
||||||
}
|
|
||||||
|
|
||||||
//static constexpr float scale = ((float)SCREENVERTS - 1.0f) / 9.0f; // well this evals to just 1.0f and what is x / 1? kek
|
|
||||||
|
|
||||||
for (x = 0; x < SCREENVERTS; x++)
|
|
||||||
{
|
|
||||||
for (y = 0; y < SCREENVERTS; y++)
|
|
||||||
{
|
|
||||||
// Change X position based on its Y position.
|
|
||||||
v[x][y][0] = x-4.5f + sinf(((disStart+(static_cast<float>(y) * WAVELENGTH)) / FREQUENCY)) / AMPLITUDE; // (x / scale)
|
|
||||||
v[x][y][1] = y-4.5f; // (y / scale)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
GL_PostImgRedraw(v);
|
|
||||||
|
|
||||||
// Capture the screen again for screen waving on the intermission
|
|
||||||
if (gamestate != GS_INTERMISSION)
|
|
||||||
GL_MakeScreenTexture(HWD_SCREENTEXTURE_GENERIC1);
|
|
||||||
}
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
WAVELENGTH = 10.0f;
|
||||||
|
AMPLITUDE = 60.0f;
|
||||||
|
FREQUENCY = 4.0f;
|
||||||
|
}
|
||||||
|
|
||||||
|
//static constexpr float scale = ((float)SCREENVERTS - 1.0f) / 9.0f; // well this evals to just 1.0f and what is x / 1? kek
|
||||||
|
|
||||||
|
for (x = 0; x < SCREENVERTS; x++)
|
||||||
|
{
|
||||||
|
for (y = 0; y < SCREENVERTS; y++)
|
||||||
|
{
|
||||||
|
// Change X position based on its Y position.
|
||||||
|
v[x][y][0] = x-4.5f + sinf(((disStart+(static_cast<float>(y) * WAVELENGTH)) / FREQUENCY)) / AMPLITUDE; // (x / scale)
|
||||||
|
v[x][y][1] = y-4.5f; // (y / scale)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
GL_PostImgRedraw(v);
|
||||||
|
|
||||||
|
// Capture the screen again for screen waving on the intermission
|
||||||
|
if (gamestate != GS_INTERMISSION)
|
||||||
|
GL_MakeScreenTexture(HWD_SCREENTEXTURE_GENERIC1);
|
||||||
// Flipping of the screen isn't done here anymore
|
// Flipping of the screen isn't done here anymore
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -151,14 +151,19 @@ FUNCINLINE static ATTRINLINE void HWR_RenderVhsEffect(fixed_t upbary, fixed_t do
|
|||||||
GL_RenderVhsEffect(upbary, downbary, updistort, downdistort, barsize);
|
GL_RenderVhsEffect(upbary, downbary, updistort, downdistort, barsize);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
FUNCINLINE static ATTRINLINE void HWR_MakeScreenTexture(void)
|
||||||
|
{
|
||||||
|
GL_MakeScreenTexture(HWD_SCREENTEXTURE_GENERIC1);
|
||||||
|
}
|
||||||
|
|
||||||
FUNCINLINE static ATTRINLINE void HWR_MakeScreenFinalTexture(void)
|
FUNCINLINE static ATTRINLINE void HWR_MakeScreenFinalTexture(void)
|
||||||
{
|
{
|
||||||
GL_MakeScreenTexture(HWD_SCREENTEXTURE_GENERIC2);
|
GL_MakeScreenTexture(HWD_SCREENTEXTURE_GENERIC2);
|
||||||
}
|
}
|
||||||
|
|
||||||
FUNCINLINE static ATTRINLINE void HWR_DrawScreenFinalTexture(INT32 width, INT32 height, boolean useshader)
|
FUNCINLINE static ATTRINLINE void HWR_DrawScreenFinalTexture(INT32 width, INT32 height)
|
||||||
{
|
{
|
||||||
GL_DrawScreenFinalTexture(HWD_SCREENTEXTURE_GENERIC2, width, height, useshader);
|
GL_DrawScreenFinalTexture(HWD_SCREENTEXTURE_GENERIC2, width, height);
|
||||||
}
|
}
|
||||||
|
|
||||||
// hw_main.c: Segs
|
// hw_main.c: Segs
|
||||||
@@ -208,7 +213,6 @@ extern consvar_t cv_glportals;
|
|||||||
|
|
||||||
extern consvar_t cv_glpaletterendering;
|
extern consvar_t cv_glpaletterendering;
|
||||||
extern consvar_t cv_glpalettedepth;
|
extern consvar_t cv_glpalettedepth;
|
||||||
extern consvar_t cv_glflashpal;
|
|
||||||
|
|
||||||
FUNCINLINE static ATTRINLINE boolean HWR_UseShader(void)
|
FUNCINLINE static ATTRINLINE boolean HWR_UseShader(void)
|
||||||
{
|
{
|
||||||
@@ -220,11 +224,6 @@ FUNCINLINE static ATTRINLINE boolean HWR_ShouldUsePaletteRendering(void)
|
|||||||
return (cv_glpaletterendering.value && (pLocalPalette != NULL) && HWR_UseShader());
|
return (cv_glpaletterendering.value && (pLocalPalette != NULL) && HWR_UseShader());
|
||||||
}
|
}
|
||||||
|
|
||||||
FUNCINLINE static ATTRINLINE boolean HWR_PalRenderFlashpal(void)
|
|
||||||
{
|
|
||||||
return (cv_glflashpal.value && HWR_ShouldUsePaletteRendering());
|
|
||||||
}
|
|
||||||
|
|
||||||
// Returns a pointer to the palette which should be used for caching textures.
|
// Returns a pointer to the palette which should be used for caching textures.
|
||||||
FUNCINLINE static ATTRINLINE RGBA_t *HWR_GetTexturePalette(void)
|
FUNCINLINE static ATTRINLINE RGBA_t *HWR_GetTexturePalette(void)
|
||||||
{
|
{
|
||||||
|
|||||||
+133
-22
@@ -579,7 +579,7 @@ md2found:
|
|||||||
fclose(f);
|
fclose(f);
|
||||||
}
|
}
|
||||||
|
|
||||||
void HWR_AddPlayerMD2(int skin, boolean local) // For MD2's that were added after startup
|
void HWR_AddPlayerMD2(INT32 skin, boolean local) // For MD2's that were added after startup
|
||||||
{
|
{
|
||||||
FILE *f;
|
FILE *f;
|
||||||
char name[20], filename[32];
|
char name[20], filename[32];
|
||||||
@@ -693,17 +693,15 @@ static void HWR_CreateBlendedTexture(patch_t *gpatch, patch_t *blendgpatch, GLMi
|
|||||||
GLPatch_t *hwrBlendPatch = blendgpatch->hardware;
|
GLPatch_t *hwrBlendPatch = blendgpatch->hardware;
|
||||||
UINT16 w = gpatch->width, h = gpatch->height;
|
UINT16 w = gpatch->width, h = gpatch->height;
|
||||||
UINT32 size = w*h;
|
UINT32 size = w*h;
|
||||||
RGBA_t *image, *blendimage, *cur, blendcolor;
|
RGBA_t *image, *blendimage, *cur;
|
||||||
|
RGBA_t blendcolor = {};
|
||||||
RGBA_t *palette = HWR_GetTexturePalette();
|
RGBA_t *palette = HWR_GetTexturePalette();
|
||||||
UINT8 translation[17]; // First the color index
|
UINT8 translation[17] = {}; // First the color index
|
||||||
UINT8 cutoff[17]; // Brightness cutoff before using the next color
|
UINT8 cutoff[17] = {}; // Brightness cutoff before using the next color
|
||||||
UINT8 translen = 0;
|
UINT8 translen = 0;
|
||||||
UINT8 i;
|
UINT8 i;
|
||||||
UINT8 colorbrightnesses[17];
|
UINT8 colorbrightnesses[17] = {};
|
||||||
UINT8 color_match_lookup[256]; // optimization attempt
|
UINT8 color_match_lookup[256] = {}; // optimization attempt
|
||||||
|
|
||||||
memset(translation, 0, sizeof(translation));
|
|
||||||
memset(cutoff, 0, sizeof(cutoff));
|
|
||||||
|
|
||||||
if (glMipmap->width == 0)
|
if (glMipmap->width == 0)
|
||||||
{
|
{
|
||||||
@@ -716,14 +714,10 @@ static void HWR_CreateBlendedTexture(patch_t *gpatch, patch_t *blendgpatch, GLMi
|
|||||||
glMipmap->format = GL_TEXFMT_RGBA;
|
glMipmap->format = GL_TEXFMT_RGBA;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (glMipmap->data)
|
Z_Free(glMipmap->data);
|
||||||
{
|
glMipmap->data = NULL;
|
||||||
Z_Free(glMipmap->data);
|
|
||||||
glMipmap->data = NULL;
|
|
||||||
}
|
|
||||||
|
|
||||||
cur = Z_Malloc(size*4, PU_HWRMODELTEXTURE, &glMipmap->data);
|
cur = Z_Calloc(size*4, PU_HWRMODELTEXTURE, &glMipmap->data);
|
||||||
memset(cur, 0x00, size*4);
|
|
||||||
|
|
||||||
image = hwrPatch->mipmap->data;
|
image = hwrPatch->mipmap->data;
|
||||||
blendimage = hwrBlendPatch->mipmap->data;
|
blendimage = hwrBlendPatch->mipmap->data;
|
||||||
@@ -1037,7 +1031,6 @@ static void HWR_GetBlendedTexture(patch_t *patch, patch_t *blendgpatch, INT32 sk
|
|||||||
GLPatch_t *glPatch = patch->hardware;
|
GLPatch_t *glPatch = patch->hardware;
|
||||||
GLMipmap_t *glMipmap, *newMipmap;
|
GLMipmap_t *glMipmap, *newMipmap;
|
||||||
|
|
||||||
|
|
||||||
if (blendgpatch == NULL || colormap == colormaps || colormap == NULL)
|
if (blendgpatch == NULL || colormap == colormaps || colormap == NULL)
|
||||||
{
|
{
|
||||||
// Don't do any blending
|
// Don't do any blending
|
||||||
@@ -1106,7 +1099,7 @@ void HWR_DrawMD2(gl_vissprite_t *spr)
|
|||||||
INT32 frame = 0;
|
INT32 frame = 0;
|
||||||
INT32 nextFrame = -1;
|
INT32 nextFrame = -1;
|
||||||
FTransform p;
|
FTransform p;
|
||||||
FSurfaceInfo Surf;
|
FSurfaceInfo Surf = {};
|
||||||
|
|
||||||
if (!cv_glmdls.value || spr->precip)
|
if (!cv_glmdls.value || spr->precip)
|
||||||
return;
|
return;
|
||||||
@@ -1198,8 +1191,15 @@ void HWR_DrawMD2(gl_vissprite_t *spr)
|
|||||||
Surf.PolyFlags = HWR_GetBlendModeFlag(blendmode);
|
Surf.PolyFlags = HWR_GetBlendModeFlag(blendmode);
|
||||||
}
|
}
|
||||||
|
|
||||||
if (cv_playerfade.value && spr->mobj->player)
|
if (spr->mobj->player)
|
||||||
Surf.PolyColor.s.alpha = FixedMul(R_DoPlayerFade(spr->mobj), Surf.PolyColor.s.alpha);
|
{
|
||||||
|
// make hyu´d players translucent with reducevfx, could be done better, but im lazy as crap
|
||||||
|
if (cv_reducevfx.value && spr->mobj->player->kartstuff[k_hyudorotimer] > 0)
|
||||||
|
Surf.PolyColor.s.alpha = FixedMul(FRACUNIT/2, Surf.PolyColor.s.alpha);
|
||||||
|
|
||||||
|
if (cv_playerfade.value)
|
||||||
|
Surf.PolyColor.s.alpha = FixedMul(R_DoPlayerFade(spr->mobj), Surf.PolyColor.s.alpha);
|
||||||
|
}
|
||||||
|
|
||||||
// dont forget to enabled the depth test because we can't do this like
|
// dont forget to enabled the depth test because we can't do this like
|
||||||
// before: polygons models are not sorted
|
// before: polygons models are not sorted
|
||||||
@@ -1336,8 +1336,8 @@ void HWR_DrawMD2(gl_vissprite_t *spr)
|
|||||||
if (spr->mobj->frame & FF_ANIMATE)
|
if (spr->mobj->frame & FF_ANIMATE)
|
||||||
{
|
{
|
||||||
// set duration and tics to be the correct values for FF_ANIMATE states
|
// set duration and tics to be the correct values for FF_ANIMATE states
|
||||||
durs = (float)spr->mobj->state->var2;
|
durs = spr->mobj->state->var2;
|
||||||
tics = (float)spr->mobj->anim_duration;
|
tics = (INT32)spr->mobj->anim_duration;
|
||||||
}
|
}
|
||||||
|
|
||||||
//FIXME: this is not yet correct
|
//FIXME: this is not yet correct
|
||||||
@@ -1468,4 +1468,115 @@ void HWR_DrawMD2(gl_vissprite_t *spr)
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// mostly copy paste of HWR_DrawMD2
|
||||||
|
// very ugly but our model code kinda sucks
|
||||||
|
void HWR_Draw2DModel(md2_t *md2, INT32 x, INT32 y, INT32 skinnum, skincolors_t color, const UINT8 *colormap, fixed_t scale, INT32 frame, angle_t angle)
|
||||||
|
{
|
||||||
|
patch_t *gpatch, *blendgpatch;
|
||||||
|
GLPatch_t *hwrPatch = NULL, *hwrBlendPatch = NULL;
|
||||||
|
FTransform p;
|
||||||
|
FSurfaceInfo Surf = {};
|
||||||
|
|
||||||
|
if (!md2->model)
|
||||||
|
{
|
||||||
|
char filename[64];
|
||||||
|
CONS_Debug(DBG_RENDER, "Loading model... (%s)\n", md2->filename);
|
||||||
|
sprintf(filename, "mdls/%s", md2->filename);
|
||||||
|
md2->model = md2_readModel(filename);
|
||||||
|
|
||||||
|
if (md2->model)
|
||||||
|
{
|
||||||
|
md2_printModelInfo(md2->model);
|
||||||
|
GL_CreateModelVBOs(md2->model);
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
md2->error = true;
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
if (md2->model->meshes[0].numFrames > 0)
|
||||||
|
frame = frame % md2->model->meshes[0].numFrames;
|
||||||
|
else
|
||||||
|
frame = 0;
|
||||||
|
|
||||||
|
gpatch = (patch_t *)(md2->glpatch);
|
||||||
|
if (gpatch)
|
||||||
|
hwrPatch = ((GLPatch_t *)gpatch->hardware);
|
||||||
|
|
||||||
|
if (!gpatch || !hwrPatch ||
|
||||||
|
((!hwrPatch->mipmap->format || !hwrPatch->mipmap->downloaded) && !md2->notexturefile))
|
||||||
|
md2_loadTexture(md2);
|
||||||
|
|
||||||
|
gpatch = (patch_t*)(md2->glpatch);
|
||||||
|
if (gpatch)
|
||||||
|
hwrPatch = ((GLPatch_t *)gpatch->hardware);
|
||||||
|
|
||||||
|
blendgpatch = (patch_t*)(md2->blendglpatch);
|
||||||
|
if (blendgpatch)
|
||||||
|
hwrBlendPatch = ((GLPatch_t *)blendgpatch->hardware);
|
||||||
|
|
||||||
|
if ((gpatch && hwrPatch && hwrPatch->mipmap->format) &&
|
||||||
|
(!blendgpatch || !hwrBlendPatch ||
|
||||||
|
((!hwrBlendPatch->mipmap->format || !hwrBlendPatch->mipmap->downloaded) && !md2->noblendfile)))
|
||||||
|
md2_loadBlendTexture(md2);
|
||||||
|
|
||||||
|
blendgpatch = (patch_t*)(md2->blendglpatch);
|
||||||
|
if (blendgpatch)
|
||||||
|
hwrBlendPatch = ((GLPatch_t *)blendgpatch->hardware);
|
||||||
|
|
||||||
|
Surf.PolyColor.rgba = 0xFFFFFFFF;
|
||||||
|
Surf.PolyFlags = PF_Occlude | PF_Modulated;
|
||||||
|
|
||||||
|
Surf.LightInfo.light_level = 255;
|
||||||
|
Surf.LightInfo.fade_start = 0;
|
||||||
|
Surf.LightInfo.fade_end = 31;
|
||||||
|
|
||||||
|
if (color != SKINCOLOR_NONE &&
|
||||||
|
blendgpatch && hwrBlendPatch->mipmap->format &&
|
||||||
|
gpatch->width == blendgpatch->width && gpatch->height == blendgpatch->height)
|
||||||
|
{
|
||||||
|
INT32 tcskinnum = TC_DEFAULT;
|
||||||
|
|
||||||
|
if (color)
|
||||||
|
tcskinnum = skinnum;
|
||||||
|
|
||||||
|
HWR_GetBlendedTexture(gpatch, blendgpatch, tcskinnum, colormap, color);
|
||||||
|
}
|
||||||
|
else if (hwrPatch && hwrPatch->mipmap->format)
|
||||||
|
{
|
||||||
|
GL_SetTexture(hwrPatch->mipmap);
|
||||||
|
}
|
||||||
|
|
||||||
|
memset(&p, 0x00, sizeof(FTransform));
|
||||||
|
|
||||||
|
p.x = x*vid.dup + (float)(vid.width - BASEVIDWIDTH*vid.dup)/2.f;
|
||||||
|
p.y = -420.f; // push it back to prevent wonky culling, idk lul
|
||||||
|
p.z = y*vid.dup + (float)(vid.height - BASEVIDHEIGHT*vid.dup)/2.f;
|
||||||
|
|
||||||
|
p.angley = FixedToFloat(AngleFixed(angle));
|
||||||
|
p.anglex = 0.f;
|
||||||
|
p.anglez = 0.f;
|
||||||
|
|
||||||
|
p.roll = false;
|
||||||
|
p.fliptype = TRANSFORM_NONE;
|
||||||
|
|
||||||
|
const float fscale = FixedToFloat(scale*vid.dup);
|
||||||
|
|
||||||
|
GL_Draw2DModel(
|
||||||
|
md2->model,
|
||||||
|
frame,
|
||||||
|
0.f,
|
||||||
|
0.f,
|
||||||
|
-1,
|
||||||
|
&p,
|
||||||
|
fscale,
|
||||||
|
fscale,
|
||||||
|
true, // flip it vertically lul
|
||||||
|
false,
|
||||||
|
&Surf
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
#endif //HWRENDER
|
#endif //HWRENDER
|
||||||
@@ -45,6 +45,9 @@ void HWR_InitMD2(void);
|
|||||||
void HWR_DrawMD2(gl_vissprite_t *spr);
|
void HWR_DrawMD2(gl_vissprite_t *spr);
|
||||||
void HWR_AddPlayerMD2(INT32 skin, boolean local);
|
void HWR_AddPlayerMD2(INT32 skin, boolean local);
|
||||||
void HWR_AddSpriteMD2(size_t spritenum);
|
void HWR_AddSpriteMD2(size_t spritenum);
|
||||||
|
void HWR_Draw2DModel(md2_t *md2, INT32 x, INT32 y, INT32 skinnum,
|
||||||
|
skincolors_t color, const UINT8 *colormap,
|
||||||
|
fixed_t scale, INT32 frame, angle_t angle);
|
||||||
|
|
||||||
#ifdef __cplusplus
|
#ifdef __cplusplus
|
||||||
} // extern "C"
|
} // extern "C"
|
||||||
|
|||||||
+14
-14
@@ -274,7 +274,7 @@ model_t *MD2_LoadModel(const char *fileName, int ztag, boolean useFloat)
|
|||||||
if (!f)
|
if (!f)
|
||||||
return NULL;
|
return NULL;
|
||||||
|
|
||||||
retModel = (model_t*)Z_Calloc(sizeof(model_t), ztag, 0);
|
retModel = (model_t*)Z_Calloc(sizeof(model_t), ztag, NULL);
|
||||||
|
|
||||||
//size_t fileLen;
|
//size_t fileLen;
|
||||||
|
|
||||||
@@ -288,13 +288,13 @@ model_t *MD2_LoadModel(const char *fileName, int ztag, boolean useFloat)
|
|||||||
{
|
{
|
||||||
texPos++;
|
texPos++;
|
||||||
namelen = strlen(texPos) + 1;
|
namelen = strlen(texPos) + 1;
|
||||||
texturefilename = (char*)Z_Malloc(namelen, PU_CACHE, 0);
|
texturefilename = (char*)Z_Malloc(namelen, PU_CACHE, NULL);
|
||||||
strcpy(texturefilename, texPos);
|
strcpy(texturefilename, texPos);
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
namelen = strlen(fileName) + 1;
|
namelen = strlen(fileName) + 1;
|
||||||
texturefilename = (char*)Z_Malloc(namelen, PU_CACHE, 0);
|
texturefilename = (char*)Z_Malloc(namelen, PU_CACHE, NULL);
|
||||||
strcpy(texturefilename, fileName);
|
strcpy(texturefilename, fileName);
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -316,7 +316,7 @@ model_t *MD2_LoadModel(const char *fileName, int ztag, boolean useFloat)
|
|||||||
header = (md2header_t*)buffer;
|
header = (md2header_t*)buffer;
|
||||||
|
|
||||||
retModel->numMeshes = 1; // MD2 only has one mesh
|
retModel->numMeshes = 1; // MD2 only has one mesh
|
||||||
retModel->meshes = (mesh_t*)Z_Calloc(sizeof(mesh_t) * retModel->numMeshes, ztag, 0);
|
retModel->meshes = (mesh_t*)Z_Calloc(sizeof(mesh_t) * retModel->numMeshes, ztag, NULL);
|
||||||
retModel->meshes[0].numFrames = header->numFrames;
|
retModel->meshes[0].numFrames = header->numFrames;
|
||||||
// const float WUNITS = 1.0f;
|
// const float WUNITS = 1.0f;
|
||||||
// float dataScale = WUNITS;
|
// float dataScale = WUNITS;
|
||||||
@@ -332,7 +332,7 @@ model_t *MD2_LoadModel(const char *fileName, int ztag, boolean useFloat)
|
|||||||
if (retModel->numMaterials <= 0) // Always at least one skin, duh
|
if (retModel->numMaterials <= 0) // Always at least one skin, duh
|
||||||
retModel->numMaterials = 1;
|
retModel->numMaterials = 1;
|
||||||
|
|
||||||
retModel->materials = (material_t*)Z_Calloc(sizeof(material_t)*retModel->numMaterials, ztag, 0);
|
retModel->materials = (material_t*)Z_Calloc(sizeof(material_t)*retModel->numMaterials, ztag, NULL);
|
||||||
|
|
||||||
// int t;
|
// int t;
|
||||||
for (t = 0; t < retModel->numMaterials; t++)
|
for (t = 0; t < retModel->numMaterials; t++)
|
||||||
@@ -409,9 +409,9 @@ model_t *MD2_LoadModel(const char *fileName, int ztag, boolean useFloat)
|
|||||||
float *uvptr;
|
float *uvptr;
|
||||||
|
|
||||||
dataScale = 0.015624f; // 1 / 64.0f
|
dataScale = 0.015624f; // 1 / 64.0f
|
||||||
retModel->meshes[0].tinyframes = (tinyframe_t*)Z_Calloc(sizeof(tinyframe_t)*header->numFrames, ztag, 0);
|
retModel->meshes[0].tinyframes = (tinyframe_t*)Z_Calloc(sizeof(tinyframe_t)*header->numFrames, ztag, NULL);
|
||||||
retModel->meshes[0].numVertices = header->numXYZ;
|
retModel->meshes[0].numVertices = header->numXYZ;
|
||||||
retModel->meshes[0].uvs = (float*)Z_Malloc(sizeof(float) * 2 * retModel->meshes[0].numVertices, ztag, 0);
|
retModel->meshes[0].uvs = (float*)Z_Malloc(sizeof(float) * 2 * retModel->meshes[0].numVertices, ztag, NULL);
|
||||||
|
|
||||||
ptr = (char*)frames;
|
ptr = (char*)frames;
|
||||||
for (i = 0; i < header->numFrames; i++, ptr += header->framesize)
|
for (i = 0; i < header->numFrames; i++, ptr += header->framesize)
|
||||||
@@ -423,12 +423,12 @@ model_t *MD2_LoadModel(const char *fileName, int ztag, boolean useFloat)
|
|||||||
md2vertex_t *vertex;
|
md2vertex_t *vertex;
|
||||||
|
|
||||||
md2frame_t *framePtr = (md2frame_t*)ptr;
|
md2frame_t *framePtr = (md2frame_t*)ptr;
|
||||||
retModel->meshes[0].tinyframes[i].vertices = (short*)Z_Malloc(sizeof(short) * 3 * header->numXYZ, ztag, 0);
|
retModel->meshes[0].tinyframes[i].vertices = (short*)Z_Malloc(sizeof(short) * 3 * header->numXYZ, ztag, NULL);
|
||||||
retModel->meshes[0].tinyframes[i].normals = (char*)Z_Malloc(sizeof(char) * 3 * header->numXYZ, ztag, 0);
|
retModel->meshes[0].tinyframes[i].normals = (char*)Z_Malloc(sizeof(char) * 3 * header->numXYZ, ztag, NULL);
|
||||||
|
|
||||||
// if (retModel->materials[0].lightmap)
|
// if (retModel->materials[0].lightmap)
|
||||||
// retModel->meshes[0].tinyframes[i].tangents = (char*)malloc(sizeof(char));//(char*)Z_Malloc(sizeof(char)*3*header->numVerts, ztag);
|
// retModel->meshes[0].tinyframes[i].tangents = (char*)malloc(sizeof(char));//(char*)Z_Malloc(sizeof(char)*3*header->numVerts, ztag);
|
||||||
retModel->meshes[0].indices = (unsigned short*)Z_Malloc(sizeof(unsigned short) * 3 * header->numTris, ztag, 0);
|
retModel->meshes[0].indices = (unsigned short*)Z_Malloc(sizeof(unsigned short) * 3 * header->numTris, ztag, NULL);
|
||||||
|
|
||||||
vertptr = retModel->meshes[0].tinyframes[i].vertices;
|
vertptr = retModel->meshes[0].tinyframes[i].vertices;
|
||||||
normptr = retModel->meshes[0].tinyframes[i].normals;
|
normptr = retModel->meshes[0].tinyframes[i].normals;
|
||||||
@@ -484,8 +484,8 @@ model_t *MD2_LoadModel(const char *fileName, int ztag, boolean useFloat)
|
|||||||
char *ptr;
|
char *ptr;
|
||||||
|
|
||||||
retModel->meshes[0].numVertices = header->numTris * 3;
|
retModel->meshes[0].numVertices = header->numTris * 3;
|
||||||
retModel->meshes[0].frames = (mdlframe_t*)Z_Calloc(sizeof(mdlframe_t)*header->numFrames, ztag, 0);
|
retModel->meshes[0].frames = (mdlframe_t*)Z_Calloc(sizeof(mdlframe_t)*header->numFrames, ztag, NULL);
|
||||||
retModel->meshes[0].uvs = (float*)Z_Malloc(sizeof(float) * 2 * retModel->meshes[0].numVertices, ztag, 0);
|
retModel->meshes[0].uvs = (float*)Z_Malloc(sizeof(float) * 2 * retModel->meshes[0].numVertices, ztag, NULL);
|
||||||
|
|
||||||
trisPtr = tris;
|
trisPtr = tris;
|
||||||
uvptr = retModel->meshes[0].uvs;
|
uvptr = retModel->meshes[0].uvs;
|
||||||
@@ -507,8 +507,8 @@ model_t *MD2_LoadModel(const char *fileName, int ztag, boolean useFloat)
|
|||||||
md2vertex_t *vertex;
|
md2vertex_t *vertex;
|
||||||
|
|
||||||
md2frame_t *framePtr = (md2frame_t*)ptr;
|
md2frame_t *framePtr = (md2frame_t*)ptr;
|
||||||
retModel->meshes[0].frames[i].normals = (float*)Z_Malloc(sizeof(float) * 3 * header->numTris * 3, ztag, 0);
|
retModel->meshes[0].frames[i].normals = (float*)Z_Malloc(sizeof(float) * 3 * header->numTris * 3, ztag, NULL);
|
||||||
retModel->meshes[0].frames[i].vertices = (float*)Z_Malloc(sizeof(float) * 3 * header->numTris * 3, ztag, 0);
|
retModel->meshes[0].frames[i].vertices = (float*)Z_Malloc(sizeof(float) * 3 * header->numTris * 3, ztag, NULL);
|
||||||
// if (retModel->materials[0].lightmap)
|
// if (retModel->materials[0].lightmap)
|
||||||
// retModel->meshes[0].frames[i].tangents = (float*)malloc(sizeof(float));//(float*)Z_Malloc(sizeof(float)*3*header->numTris*3, ztag);
|
// retModel->meshes[0].frames[i].tangents = (float*)malloc(sizeof(float));//(float*)Z_Malloc(sizeof(float)*3*header->numTris*3, ztag);
|
||||||
//float *vertptr, *normptr;
|
//float *vertptr, *normptr;
|
||||||
|
|||||||
+15
-16
@@ -154,7 +154,7 @@ model_t *MD3_LoadModel(const char *fileName, int ztag, boolean useFloat)
|
|||||||
char *buffer;
|
char *buffer;
|
||||||
int surfEnd;
|
int surfEnd;
|
||||||
int i, t;
|
int i, t;
|
||||||
int matCount;
|
//int matCount;
|
||||||
FILE *f;
|
FILE *f;
|
||||||
|
|
||||||
if (!latlnginit)
|
if (!latlnginit)
|
||||||
@@ -168,7 +168,7 @@ model_t *MD3_LoadModel(const char *fileName, int ztag, boolean useFloat)
|
|||||||
if (!f)
|
if (!f)
|
||||||
return NULL;
|
return NULL;
|
||||||
|
|
||||||
retModel = (model_t*)Z_Calloc(sizeof(model_t), ztag, 0);
|
retModel = (model_t*)Z_Calloc(sizeof(model_t), ztag, NULL);
|
||||||
|
|
||||||
// find length of file
|
// find length of file
|
||||||
fseek(f, 0, SEEK_END);
|
fseek(f, 0, SEEK_END);
|
||||||
@@ -201,7 +201,7 @@ model_t *MD3_LoadModel(const char *fileName, int ztag, boolean useFloat)
|
|||||||
if (retModel->numMaterials <= 0) // Always at least one skin, duh
|
if (retModel->numMaterials <= 0) // Always at least one skin, duh
|
||||||
retModel->numMaterials = 1;
|
retModel->numMaterials = 1;
|
||||||
|
|
||||||
retModel->materials = (material_t*)Z_Calloc(sizeof(material_t)*retModel->numMaterials, ztag, 0);
|
retModel->materials = (material_t*)Z_Calloc(sizeof(material_t)*retModel->numMaterials, ztag, NULL);
|
||||||
|
|
||||||
for (t = 0; t < retModel->numMaterials; t++)
|
for (t = 0; t < retModel->numMaterials; t++)
|
||||||
{
|
{
|
||||||
@@ -225,9 +225,9 @@ model_t *MD3_LoadModel(const char *fileName, int ztag, boolean useFloat)
|
|||||||
retModel->materials[t].spheremap = false;
|
retModel->materials[t].spheremap = false;
|
||||||
}
|
}
|
||||||
|
|
||||||
retModel->meshes = (mesh_t*)Z_Calloc(sizeof(mesh_t)*retModel->numMeshes, ztag, 0);
|
retModel->meshes = (mesh_t*)Z_Calloc(sizeof(mesh_t)*retModel->numMeshes, ztag, NULL);
|
||||||
|
|
||||||
matCount = 0;
|
//matCount = 0;
|
||||||
for (i = 0, surfEnd = 0; i < mdh->numSurfaces; i++)
|
for (i = 0, surfEnd = 0; i < mdh->numSurfaces; i++)
|
||||||
{
|
{
|
||||||
int j;
|
int j;
|
||||||
@@ -237,7 +237,7 @@ model_t *MD3_LoadModel(const char *fileName, int ztag, boolean useFloat)
|
|||||||
|
|
||||||
mdShader = (md3Shader*)((char*)mdS + mdS->offsetShaders);
|
mdShader = (md3Shader*)((char*)mdS + mdS->offsetShaders);
|
||||||
|
|
||||||
for (j = 0; j < mdS->numShaders; j++, matCount++)
|
for (j = 0; j < mdS->numShaders; j++ /*, matCount++*/)
|
||||||
{
|
{
|
||||||
size_t len = strlen(mdShader[j].name);
|
size_t len = strlen(mdShader[j].name);
|
||||||
mdShader[j].name[len-1] = 'z';
|
mdShader[j].name[len-1] = 'z';
|
||||||
@@ -298,9 +298,9 @@ model_t *MD3_LoadModel(const char *fileName, int ztag, boolean useFloat)
|
|||||||
unsigned short *indexptr;
|
unsigned short *indexptr;
|
||||||
md3Triangle *mdT;
|
md3Triangle *mdT;
|
||||||
|
|
||||||
retModel->meshes[i].tinyframes = (tinyframe_t*)Z_Calloc(sizeof(tinyframe_t)*mdS->numFrames, ztag, 0);
|
retModel->meshes[i].tinyframes = (tinyframe_t*)Z_Calloc(sizeof(tinyframe_t)*mdS->numFrames, ztag, NULL);
|
||||||
retModel->meshes[i].numVertices = mdS->numVerts;
|
retModel->meshes[i].numVertices = mdS->numVerts;
|
||||||
retModel->meshes[i].uvs = (float*)Z_Malloc(sizeof(float)*2*mdS->numVerts, ztag, 0);
|
retModel->meshes[i].uvs = (float*)Z_Malloc(sizeof(float)*2*mdS->numVerts, ztag, NULL);
|
||||||
for (j = 0; j < mdS->numFrames; j++)
|
for (j = 0; j < mdS->numFrames; j++)
|
||||||
{
|
{
|
||||||
short *vertptr;
|
short *vertptr;
|
||||||
@@ -308,12 +308,12 @@ model_t *MD3_LoadModel(const char *fileName, int ztag, boolean useFloat)
|
|||||||
// char *tanptr;
|
// char *tanptr;
|
||||||
int k;
|
int k;
|
||||||
md3Vertex *mdV = (md3Vertex*)((char*)mdS + mdS->offsetXYZNormal + (mdS->numVerts*j*sizeof(md3Vertex)));
|
md3Vertex *mdV = (md3Vertex*)((char*)mdS + mdS->offsetXYZNormal + (mdS->numVerts*j*sizeof(md3Vertex)));
|
||||||
retModel->meshes[i].tinyframes[j].vertices = (short*)Z_Malloc(sizeof(short)*3*mdS->numVerts, ztag, 0);
|
retModel->meshes[i].tinyframes[j].vertices = (short*)Z_Malloc(sizeof(short)*3*mdS->numVerts, ztag, NULL);
|
||||||
retModel->meshes[i].tinyframes[j].normals = (char*)Z_Malloc(sizeof(char)*3*mdS->numVerts, ztag, 0);
|
retModel->meshes[i].tinyframes[j].normals = (char*)Z_Malloc(sizeof(char)*3*mdS->numVerts, ztag, NULL);
|
||||||
|
|
||||||
// if (retModel->materials[0].lightmap)
|
// if (retModel->materials[0].lightmap)
|
||||||
// retModel->meshes[i].tinyframes[j].tangents = (char*)malloc(sizeof(char));//(char*)Z_Malloc(sizeof(char)*3*mdS->numVerts, ztag);
|
// retModel->meshes[i].tinyframes[j].tangents = (char*)malloc(sizeof(char));//(char*)Z_Malloc(sizeof(char)*3*mdS->numVerts, ztag);
|
||||||
retModel->meshes[i].indices = (unsigned short*)Z_Malloc(sizeof(unsigned short) * 3 * mdS->numTriangles, ztag, 0);
|
retModel->meshes[i].indices = (unsigned short*)Z_Malloc(sizeof(unsigned short) * 3 * mdS->numTriangles, ztag, NULL);
|
||||||
vertptr = retModel->meshes[i].tinyframes[j].vertices;
|
vertptr = retModel->meshes[i].tinyframes[j].vertices;
|
||||||
normptr = retModel->meshes[i].tinyframes[j].normals;
|
normptr = retModel->meshes[i].tinyframes[j].normals;
|
||||||
|
|
||||||
@@ -374,16 +374,16 @@ model_t *MD3_LoadModel(const char *fileName, int ztag, boolean useFloat)
|
|||||||
int k;
|
int k;
|
||||||
|
|
||||||
retModel->meshes[i].numVertices = mdS->numTriangles * 3;//mdS->numVerts;
|
retModel->meshes[i].numVertices = mdS->numTriangles * 3;//mdS->numVerts;
|
||||||
retModel->meshes[i].frames = (mdlframe_t*)Z_Calloc(sizeof(mdlframe_t)*mdS->numFrames, ztag, 0);
|
retModel->meshes[i].frames = (mdlframe_t*)Z_Calloc(sizeof(mdlframe_t)*mdS->numFrames, ztag, NULL);
|
||||||
retModel->meshes[i].uvs = (float*)Z_Malloc(sizeof(float)*2*mdS->numTriangles*3, ztag, 0);
|
retModel->meshes[i].uvs = (float*)Z_Malloc(sizeof(float)*2*mdS->numTriangles*3, ztag, NULL);
|
||||||
|
|
||||||
for (j = 0; j < mdS->numFrames; j++)
|
for (j = 0; j < mdS->numFrames; j++)
|
||||||
{
|
{
|
||||||
float *vertptr;
|
float *vertptr;
|
||||||
float *normptr;
|
float *normptr;
|
||||||
md3Vertex *mdV = (md3Vertex*)((char*)mdS + mdS->offsetXYZNormal + (mdS->numVerts*j*sizeof(md3Vertex)));
|
md3Vertex *mdV = (md3Vertex*)((char*)mdS + mdS->offsetXYZNormal + (mdS->numVerts*j*sizeof(md3Vertex)));
|
||||||
retModel->meshes[i].frames[j].vertices = (float*)Z_Malloc(sizeof(float)*3*mdS->numTriangles*3, ztag, 0);
|
retModel->meshes[i].frames[j].vertices = (float*)Z_Malloc(sizeof(float)*3*mdS->numTriangles*3, ztag, NULL);
|
||||||
retModel->meshes[i].frames[j].normals = (float*)Z_Malloc(sizeof(float)*3*mdS->numTriangles*3, ztag, 0);
|
retModel->meshes[i].frames[j].normals = (float*)Z_Malloc(sizeof(float)*3*mdS->numTriangles*3, ztag, NULL);
|
||||||
// if (retModel->materials[i].lightmap)
|
// if (retModel->materials[i].lightmap)
|
||||||
// retModel->meshes[i].frames[j].tangents = (float*)malloc(sizeof(float));//(float*)Z_Malloc(sizeof(float)*3*mdS->numTriangles*3, ztag);
|
// retModel->meshes[i].frames[j].tangents = (float*)malloc(sizeof(float));//(float*)Z_Malloc(sizeof(float)*3*mdS->numTriangles*3, ztag);
|
||||||
vertptr = retModel->meshes[i].frames[j].vertices;
|
vertptr = retModel->meshes[i].frames[j].vertices;
|
||||||
@@ -503,7 +503,6 @@ model_t *MD3_LoadModel(const char *fileName, int ztag, boolean useFloat)
|
|||||||
}
|
}
|
||||||
}*/
|
}*/
|
||||||
|
|
||||||
|
|
||||||
free(buffer);
|
free(buffer);
|
||||||
|
|
||||||
return retModel;
|
return retModel;
|
||||||
|
|||||||
@@ -189,7 +189,7 @@ model_t *LoadModel(const char *filename, int ztag)
|
|||||||
return NULL;
|
return NULL;
|
||||||
}
|
}
|
||||||
|
|
||||||
model->mdlFilename = (char*)Z_Malloc(strlen(filename)+1, ztag, 0);
|
model->mdlFilename = (char*)Z_Malloc(strlen(filename)+1, ztag, NULL);
|
||||||
strcpy(model->mdlFilename, filename);
|
strcpy(model->mdlFilename, filename);
|
||||||
|
|
||||||
Optimize(model);
|
Optimize(model);
|
||||||
@@ -237,7 +237,7 @@ void GenerateVertexNormals(model_t *model)
|
|||||||
{
|
{
|
||||||
mdlframe_t *frame = &mesh->frames[j];
|
mdlframe_t *frame = &mesh->frames[j];
|
||||||
int memTag = PU_STATIC;
|
int memTag = PU_STATIC;
|
||||||
float *newNormals = (float*)Z_Malloc(sizeof(float)*3*mesh->numTriangles*3, memTag, 0);
|
float *newNormals = (float*)Z_Malloc(sizeof(float)*3*mesh->numTriangles*3, memTag, NULL);
|
||||||
int k;
|
int k;
|
||||||
float *vertPtr = frame->vertices;
|
float *vertPtr = frame->vertices;
|
||||||
float *oldNormals;
|
float *oldNormals;
|
||||||
@@ -309,7 +309,7 @@ static boolean AddMaterialToList(materiallist_t **head, material_t *material)
|
|||||||
}
|
}
|
||||||
|
|
||||||
// Didn't find it, so add to the list
|
// Didn't find it, so add to the list
|
||||||
newMatNode = (materiallist_t*)Z_Malloc(sizeof(materiallist_t), PU_CACHE, 0);
|
newMatNode = (materiallist_t*)Z_Malloc(sizeof(materiallist_t), PU_CACHE, NULL);
|
||||||
newMatNode->material = material;
|
newMatNode->material = material;
|
||||||
ListAdd(newMatNode, (listitem_t**)head);
|
ListAdd(newMatNode, (listitem_t**)head);
|
||||||
return true;
|
return true;
|
||||||
@@ -351,7 +351,7 @@ void Optimize(model_t *model)
|
|||||||
}
|
}
|
||||||
|
|
||||||
memTag = PU_STATIC;
|
memTag = PU_STATIC;
|
||||||
newMeshes = (mesh_t*)Z_Calloc(sizeof(mesh_t) * numMeshes, memTag, 0);
|
newMeshes = (mesh_t*)Z_Calloc(sizeof(mesh_t) * numMeshes, memTag, NULL);
|
||||||
|
|
||||||
i = 0;
|
i = 0;
|
||||||
for (node = matListHead; node; node = node->next)
|
for (node = matListHead; node; node = node->next)
|
||||||
@@ -377,14 +377,14 @@ void Optimize(model_t *model)
|
|||||||
newMesh->numFrames = 1;
|
newMesh->numFrames = 1;
|
||||||
newMesh->numTriangles = numTriangles;
|
newMesh->numTriangles = numTriangles;
|
||||||
newMesh->numVertices = numTriangles * 3;
|
newMesh->numVertices = numTriangles * 3;
|
||||||
newMesh->uvs = (float*)Z_Malloc(sizeof(float)*2*numTriangles*3, memTag, 0);
|
newMesh->uvs = (float*)Z_Malloc(sizeof(float)*2*numTriangles*3, memTag, NULL);
|
||||||
newMesh->frames = (mdlframe_t*)Z_Calloc(sizeof(mdlframe_t), memTag, 0);
|
newMesh->frames = (mdlframe_t*)Z_Calloc(sizeof(mdlframe_t), memTag, NULL);
|
||||||
curFrame = &newMesh->frames[0];
|
curFrame = &newMesh->frames[0];
|
||||||
|
|
||||||
curFrame->material = curMat;
|
curFrame->material = curMat;
|
||||||
curFrame->normals = (float*)Z_Malloc(sizeof(float)*3*numTriangles*3, memTag, 0);
|
curFrame->normals = (float*)Z_Malloc(sizeof(float)*3*numTriangles*3, memTag, NULL);
|
||||||
curFrame->vertices = (float*)Z_Malloc(sizeof(float)*3*numTriangles*3, memTag, 0);
|
curFrame->vertices = (float*)Z_Malloc(sizeof(float)*3*numTriangles*3, memTag, NULL);
|
||||||
curFrame->colors = (char*)Z_Malloc(sizeof(char)*4*numTriangles*3, memTag, 0);
|
curFrame->colors = (char*)Z_Malloc(sizeof(char)*4*numTriangles*3, memTag, NULL);
|
||||||
|
|
||||||
// Now traverse the meshes of the model, adding in
|
// Now traverse the meshes of the model, adding in
|
||||||
// vertices/normals/uvs that match the current material
|
// vertices/normals/uvs that match the current material
|
||||||
|
|||||||
@@ -109,7 +109,7 @@ boolean HWR_InitShaders(void)
|
|||||||
// returns INT32_MAX if not found
|
// returns INT32_MAX if not found
|
||||||
static INT32 strstr_int(const char *str1, const char *str2)
|
static INT32 strstr_int(const char *str1, const char *str2)
|
||||||
{
|
{
|
||||||
char *location = strstr(str1, str2);
|
gconst char *location = strstr(str1, str2);
|
||||||
if (location)
|
if (location)
|
||||||
return location - str1;
|
return location - str1;
|
||||||
else
|
else
|
||||||
@@ -365,13 +365,17 @@ static void HWR_CompileShader(int index)
|
|||||||
if (vertex_source)
|
if (vertex_source)
|
||||||
{
|
{
|
||||||
char *preprocessed = HWR_PreprocessShader(vertex_source);
|
char *preprocessed = HWR_PreprocessShader(vertex_source);
|
||||||
if (!preprocessed) return;
|
if (!preprocessed)
|
||||||
|
return;
|
||||||
|
|
||||||
GL_LoadShader(index, preprocessed, HWD_SHADERSTAGE_VERTEX);
|
GL_LoadShader(index, preprocessed, HWD_SHADERSTAGE_VERTEX);
|
||||||
}
|
}
|
||||||
if (fragment_source)
|
if (fragment_source)
|
||||||
{
|
{
|
||||||
char *preprocessed = HWR_PreprocessShader(fragment_source);
|
char *preprocessed = HWR_PreprocessShader(fragment_source);
|
||||||
if (!preprocessed) return;
|
if (!preprocessed)
|
||||||
|
return;
|
||||||
|
|
||||||
GL_LoadShader(index, preprocessed, HWD_SHADERSTAGE_FRAGMENT);
|
GL_LoadShader(index, preprocessed, HWD_SHADERSTAGE_FRAGMENT);
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -387,8 +391,10 @@ void HWR_CompileShaders(void)
|
|||||||
{
|
{
|
||||||
int custom_index = gl_shadertargets[i].custom_shader;
|
int custom_index = gl_shadertargets[i].custom_shader;
|
||||||
HWR_CompileShader(i);
|
HWR_CompileShader(i);
|
||||||
|
|
||||||
if (!gl_shaders[i].compiled)
|
if (!gl_shaders[i].compiled)
|
||||||
CONS_Alert(CONS_ERROR, "HWR_CompileShaders: Compilation failed for base %s shader!\n", shaderxlat[i].type);
|
CONS_Alert(CONS_ERROR, "HWR_CompileShaders: Compilation failed for base %s shader!\n", shaderxlat[i].type);
|
||||||
|
|
||||||
if (custom_index != -1)
|
if (custom_index != -1)
|
||||||
{
|
{
|
||||||
HWR_CompileShader(custom_index);
|
HWR_CompileShader(custom_index);
|
||||||
|
|||||||
@@ -78,33 +78,23 @@
|
|||||||
// Include GLSL_FLOOR_FUDGES or GLSL_WALL_FUDGES or define the fudges in shaders that use this macro.
|
// Include GLSL_FLOOR_FUDGES or GLSL_WALL_FUDGES or define the fudges in shaders that use this macro.
|
||||||
#define GLSL_DOOM_COLORMAP_DITHER \
|
#define GLSL_DOOM_COLORMAP_DITHER \
|
||||||
"float baseValue = max(startmap * STARTMAP_FUDGE - scale * 0.5 * SCALE_FUDGE, cap);\n" \
|
"float baseValue = max(startmap * STARTMAP_FUDGE - scale * 0.5 * SCALE_FUDGE, cap);\n" \
|
||||||
"float endResolutionx = scr_resolution.x;\n" \
|
"float patscale = min(scr_resolution.x / 1280.0, scr_resolution.y / 720.0);\n" \
|
||||||
"float endResolutiony = scr_resolution.y;\n" \
|
"patscale = max(floor(patscale + 0.5), 1.0);\n" \
|
||||||
"if (scr_resolution.x > 1280.0) {\n" \
|
"patscale = 1.0 / patscale;\n" \
|
||||||
"endResolutionx = scr_resolution.x * 0.5;\n" \
|
"ivec2 p = ivec2(mod(floor(position * patscale), 4.0));\n" \
|
||||||
"}\n" \
|
"float depthfactor = clamp((z - 192.0) / (6144.0 - 192.0), 0.0, 1.0);\n" \
|
||||||
"if (scr_resolution.y > 720.0) {\n" \
|
|
||||||
"endResolutiony = scr_resolution.y * 0.5;\n" \
|
|
||||||
"}\n" \
|
|
||||||
"float zFactor = clamp((z - 192.0) / (6144.0 - 192.0), 0.0, 1.0);\n" \
|
|
||||||
"int scaleFactor = int(mix(1.0, 8.0, zFactor));\n" \
|
|
||||||
"endResolutionx = endResolutionx * scaleFactor;\n" \
|
|
||||||
"endResolutiony = endResolutiony * scaleFactor;\n" \
|
|
||||||
"vec2 normalizedPosition = position * vec2(endResolutionx / scr_resolution.x, endResolutiony / scr_resolution.y);\n" \
|
|
||||||
"int x = int(mod(normalizedPosition.x, 4.0));\n" \
|
|
||||||
"int y = int(mod(normalizedPosition.y, 4.0));\n" \
|
|
||||||
"float bayerMatrix[4*4] = float[4*4](\n" \
|
"float bayerMatrix[4*4] = float[4*4](\n" \
|
||||||
"0.0, 8.0, 2.0, 10.0,\n" \
|
"0.0, 8.0, 2.0, 10.0,\n" \
|
||||||
"12.0, 4.0, 14.0, 6.0,\n" \
|
"12.0, 4.0, 14.0, 6.0,\n" \
|
||||||
"3.0, 11.0, 1.0, 9.0,\n" \
|
"3.0, 11.0, 1.0, 9.0,\n" \
|
||||||
"15.0, 7.0, 13.0, 5.0\n" \
|
"15.0, 7.0, 13.0, 5.0\n" \
|
||||||
");\n" \
|
");\n" \
|
||||||
|
"float threshold = 16.0;\n" \
|
||||||
"#ifdef SRB2_PALETTE_RENDERING\n" \
|
"#ifdef SRB2_PALETTE_RENDERING\n" \
|
||||||
"float threshold = (1.0 - pow(zFactor, 2.0)) * (bayerMatrix[y*4 + x] / 11.0);\n" \
|
"threshold = 11.0;\n" \
|
||||||
"#else\n" \
|
|
||||||
"float threshold = (1.0 - pow(zFactor, 2.0)) * (bayerMatrix[y*4 + x] / 16.0);\n" \
|
|
||||||
"#endif\n" \
|
"#endif\n" \
|
||||||
"return mix(baseValue + threshold - 0.5 / 16.0, baseValue, zFactor);\n"
|
"threshold = (1.0 - pow(depthfactor, 2.0)) * (bayerMatrix[p.y*4 + p.x] / threshold);\n" \
|
||||||
|
"return mix(baseValue + threshold - 0.5 / 16.0, baseValue, depthfactor);\n"
|
||||||
|
|
||||||
#define GLSL_DOOM_COLORMAP_NODITHER \
|
#define GLSL_DOOM_COLORMAP_NODITHER \
|
||||||
"return max(startmap * STARTMAP_FUDGE - scale * 0.5 * SCALE_FUDGE, cap);\n" \
|
"return max(startmap * STARTMAP_FUDGE - scale * 0.5 * SCALE_FUDGE, cap);\n" \
|
||||||
|
|||||||
@@ -98,10 +98,10 @@ static size_t textureBufferSize = 0;
|
|||||||
static LTListItem *LightTablesTail = NULL;
|
static LTListItem *LightTablesTail = NULL;
|
||||||
static LTListItem *LightTablesHead = NULL;
|
static LTListItem *LightTablesHead = NULL;
|
||||||
|
|
||||||
static RGBA_t screenPalette[256] = {0}; // the palette for the postprocessing step in palette rendering
|
static RGBA_t screenPalette[256] = {}; // 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] = {0}; // the palette for converting textures to RGBA
|
RGBA_t myPaletteData[256] = {}; // 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,9 +127,9 @@ 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;-)
|
||||||
GLfloat modelMatrix[16] = {0};
|
GLfloat modelMatrix[16] = {};
|
||||||
GLfloat projMatrix[16] = {0};
|
GLfloat projMatrix[16] = {};
|
||||||
static GLint viewport[4];
|
static GLint viewport[4];
|
||||||
|
|
||||||
#ifdef USE_FBO_OGL
|
#ifdef USE_FBO_OGL
|
||||||
enum
|
enum
|
||||||
@@ -171,7 +171,7 @@ boolean supportstencil = false;
|
|||||||
// flush all of the stored textures, leaving them unavailable at times such as between levels
|
// flush all of the stored textures, leaving them unavailable at times such as between levels
|
||||||
// These need to start at 0 and be set to their number, and be reset to 0 when deleted so that Intel GPUs
|
// These need to start at 0 and be set to their number, and be reset to 0 when deleted so that Intel GPUs
|
||||||
// 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] = {};
|
||||||
|
|
||||||
#define byte2float(byte) (GLfloat)(byte / 255.0f)
|
#define byte2float(byte) (GLfloat)(byte / 255.0f)
|
||||||
|
|
||||||
@@ -404,6 +404,14 @@ static PFNglEnableClientState pglEnableClientState;
|
|||||||
typedef void (APIENTRY * PFNglDisableClientState) (GLenum cap);
|
typedef void (APIENTRY * PFNglDisableClientState) (GLenum cap);
|
||||||
static PFNglDisableClientState pglDisableClientState;
|
static PFNglDisableClientState pglDisableClientState;
|
||||||
|
|
||||||
|
typedef void (APIENTRY * PFNglOrtho) (GLdouble left,
|
||||||
|
GLdouble right,
|
||||||
|
GLdouble bottom,
|
||||||
|
GLdouble top,
|
||||||
|
GLdouble nearVal,
|
||||||
|
GLdouble farVal);
|
||||||
|
static PFNglOrtho pglOrtho;
|
||||||
|
|
||||||
/* Lighting */
|
/* Lighting */
|
||||||
typedef void (APIENTRY * PFNglShadeModel) (GLenum mode);
|
typedef void (APIENTRY * PFNglShadeModel) (GLenum mode);
|
||||||
static PFNglShadeModel pglShadeModel;
|
static PFNglShadeModel pglShadeModel;
|
||||||
@@ -745,7 +753,7 @@ typedef struct gl_shaderstate_s
|
|||||||
static gl_shaderstate_t gl_shaderstate;
|
static gl_shaderstate_t gl_shaderstate;
|
||||||
|
|
||||||
// Shader info
|
// Shader info
|
||||||
static float shader_leveltime = 0;
|
static float shader_leveltime = 0.0f;
|
||||||
static float shader_light_x = 0.0f;
|
static float shader_light_x = 0.0f;
|
||||||
static float shader_light_y = 0.0f;
|
static float shader_light_y = 0.0f;
|
||||||
static float shader_light_z = 0.0f;
|
static float shader_light_z = 0.0f;
|
||||||
@@ -858,6 +866,8 @@ void SetupGLFunc4(void)
|
|||||||
GetGLfunc(glUniform3fv);
|
GetGLfunc(glUniform3fv);
|
||||||
GetGLfunc(glGetUniformLocation);
|
GetGLfunc(glGetUniformLocation);
|
||||||
|
|
||||||
|
GetGLfunc(glOrtho);
|
||||||
|
|
||||||
#ifdef GLDEBUGMESSAGE
|
#ifdef GLDEBUGMESSAGE
|
||||||
GetGLfunc(glDebugMessageCallback);
|
GetGLfunc(glDebugMessageCallback);
|
||||||
#endif
|
#endif
|
||||||
@@ -1058,6 +1068,13 @@ void GL_SetShader(int slot)
|
|||||||
gl_shadersenabled = false;
|
gl_shadersenabled = false;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
void GL_EnableShader(void)
|
||||||
|
{
|
||||||
|
// we can just use GL_Shader_SetUniforms as itll enable the shader for us
|
||||||
|
// and handle any failures
|
||||||
|
GL_Shader_SetUniforms(NULL, NULL, NULL, NULL);
|
||||||
|
}
|
||||||
|
|
||||||
void GL_UnSetShader(void)
|
void GL_UnSetShader(void)
|
||||||
{
|
{
|
||||||
if (gl_shadersenabled) // don't repeatedly call glUseProgram if not needed
|
if (gl_shadersenabled) // don't repeatedly call glUseProgram if not needed
|
||||||
@@ -1267,7 +1284,7 @@ void GL_SetStates(void)
|
|||||||
|
|
||||||
pglColorMask(GL_TRUE, GL_TRUE, GL_TRUE, GL_TRUE);
|
pglColorMask(GL_TRUE, GL_TRUE, GL_TRUE, GL_TRUE);
|
||||||
|
|
||||||
pglEnable(GL_STENCIL_TEST);
|
pglDisable(GL_STENCIL_TEST);
|
||||||
pglEnable(GL_DEPTH_TEST); // check the depth buffer
|
pglEnable(GL_DEPTH_TEST); // check the depth buffer
|
||||||
pglDepthMask(GL_TRUE); // enable writing to depth buffer
|
pglDepthMask(GL_TRUE); // enable writing to depth buffer
|
||||||
pglClearDepth(1.0f);
|
pglClearDepth(1.0f);
|
||||||
@@ -1297,6 +1314,16 @@ void GL_SetStates(void)
|
|||||||
#endif
|
#endif
|
||||||
}
|
}
|
||||||
|
|
||||||
|
void GL_EnableStencilTest(void)
|
||||||
|
{
|
||||||
|
pglEnable(GL_STENCIL_TEST);
|
||||||
|
}
|
||||||
|
|
||||||
|
void GL_DisableStencilTest(void)
|
||||||
|
{
|
||||||
|
pglDisable(GL_STENCIL_TEST);
|
||||||
|
}
|
||||||
|
|
||||||
// -----------------+
|
// -----------------+
|
||||||
// DeleteTexture : Deletes a texture from the GPU and frees its data
|
// DeleteTexture : Deletes a texture from the GPU and frees its data
|
||||||
// -----------------+
|
// -----------------+
|
||||||
@@ -1373,19 +1400,19 @@ void GL_Flush(void)
|
|||||||
// -----------------+
|
// -----------------+
|
||||||
INT32 GL_isExtAvailable(const char *extension, const GLubyte *start)
|
INT32 GL_isExtAvailable(const char *extension, const GLubyte *start)
|
||||||
{
|
{
|
||||||
GLubyte *where, *terminator;
|
gconst GLubyte *where, *terminator;
|
||||||
|
|
||||||
if (!extension || !start)
|
if (!extension || !start)
|
||||||
return 0;
|
return 0;
|
||||||
|
|
||||||
where = (GLubyte *) strchr(extension, ' ');
|
where = (gconst GLubyte *)strchr(extension, ' ');
|
||||||
|
|
||||||
if (where || *extension == '\0')
|
if (where || *extension == '\0')
|
||||||
return 0;
|
return 0;
|
||||||
|
|
||||||
for (;;)
|
for (;;)
|
||||||
{
|
{
|
||||||
where = (GLubyte *) strstr((const char *) start, extension);
|
where = (gconst GLubyte *)strstr((const char *)start, extension);
|
||||||
|
|
||||||
if (!where)
|
if (!where)
|
||||||
break;
|
break;
|
||||||
@@ -3090,6 +3117,39 @@ void GL_DrawModelEx(model_t *model, INT32 frameIndex, float duration, float tics
|
|||||||
pglDisable(GL_NORMALIZE);
|
pglDisable(GL_NORMALIZE);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
void GL_Draw2DModel(model_t *model, INT32 frameIndex, INT32 duration, INT32 tics, INT32 nextFrameIndex,
|
||||||
|
FTransform *pos, float hscale, float vscale, UINT8 flipped, UINT8 hflipped, FSurfaceInfo *Surface)
|
||||||
|
{
|
||||||
|
// save our matrix´s
|
||||||
|
pglMatrixMode(GL_PROJECTION);
|
||||||
|
pglPushMatrix();
|
||||||
|
pglMatrixMode(GL_MODELVIEW);
|
||||||
|
pglPushMatrix();
|
||||||
|
|
||||||
|
pglMatrixMode(GL_PROJECTION);
|
||||||
|
pglLoadIdentity();
|
||||||
|
|
||||||
|
// switch to ortho mode to make our lives easier
|
||||||
|
// thisll make sure our coords will be remapped to pixel coords
|
||||||
|
pglOrtho(0.0f, (float)vid.width, (float)vid.height, 0.0f, NZCLIP_PLANE, FAR_ZCLIP_DEFAULT);
|
||||||
|
|
||||||
|
pglMatrixMode(GL_MODELVIEW);
|
||||||
|
pglLoadIdentity();
|
||||||
|
|
||||||
|
pglEnable(GL_DEPTH_TEST);
|
||||||
|
pglDepthMask(GL_TRUE);
|
||||||
|
pglClear(GL_DEPTH_BUFFER_BIT);
|
||||||
|
|
||||||
|
GL_DrawModelEx(model, frameIndex, duration, tics, nextFrameIndex,
|
||||||
|
pos, hscale, vscale, flipped, hflipped, Surface);
|
||||||
|
|
||||||
|
// restore the matrix´s
|
||||||
|
pglMatrixMode(GL_PROJECTION);
|
||||||
|
pglPopMatrix();
|
||||||
|
pglMatrixMode(GL_MODELVIEW);
|
||||||
|
pglPopMatrix();
|
||||||
|
}
|
||||||
|
|
||||||
// -----------------+
|
// -----------------+
|
||||||
// SetTransform :
|
// SetTransform :
|
||||||
// -----------------+
|
// -----------------+
|
||||||
@@ -3200,14 +3260,6 @@ static void GL_Framebuffer_Generate(void)
|
|||||||
if (!framebufferobject.fboobj)
|
if (!framebufferobject.fboobj)
|
||||||
pglGenFramebuffers(1, &framebufferobject.fboobj);
|
pglGenFramebuffers(1, &framebufferobject.fboobj);
|
||||||
|
|
||||||
if (pglCheckFramebufferStatus(GL_FRAMEBUFFER_EXT) != GL_FRAMEBUFFER_COMPLETE_EXT)
|
|
||||||
{
|
|
||||||
// if this fails, dont retry it a gazillion times
|
|
||||||
// this wouldnt recover
|
|
||||||
supportFBO = false;
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
// Bind the framebuffer
|
// Bind the framebuffer
|
||||||
pglBindFramebuffer(GL_FRAMEBUFFER_EXT, framebufferobject.fboobj);
|
pglBindFramebuffer(GL_FRAMEBUFFER_EXT, framebufferobject.fboobj);
|
||||||
|
|
||||||
@@ -3259,6 +3311,18 @@ static void GL_Framebuffer_Generate(void)
|
|||||||
pglBindRenderbuffer(GL_RENDERBUFFER_EXT, 0);
|
pglBindRenderbuffer(GL_RENDERBUFFER_EXT, 0);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if (pglCheckFramebufferStatus(GL_FRAMEBUFFER_EXT) != GL_FRAMEBUFFER_COMPLETE_EXT)
|
||||||
|
{
|
||||||
|
//pglGetError(); TODO:implement this or smth
|
||||||
|
GL_MSG_Error("GL_Framebuffer_Generate: Failed to create Framebuffer Object");
|
||||||
|
|
||||||
|
// if this fails, dont retry it a gazillion times
|
||||||
|
// this wouldnt recover
|
||||||
|
supportFBO = false;
|
||||||
|
pglBindFramebuffer(GL_FRAMEBUFFER_EXT, 0);
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
// Unbind the framebuffer
|
// Unbind the framebuffer
|
||||||
pglBindFramebuffer(GL_FRAMEBUFFER_EXT, 0);
|
pglBindFramebuffer(GL_FRAMEBUFFER_EXT, 0);
|
||||||
|
|
||||||
@@ -3281,6 +3345,10 @@ void GL_Framebuffer_Enable(void)
|
|||||||
|
|
||||||
GL_Framebuffer_Generate();
|
GL_Framebuffer_Generate();
|
||||||
|
|
||||||
|
// failed
|
||||||
|
if (!supportFBO || !framebufferobject.init)
|
||||||
|
return;
|
||||||
|
|
||||||
pglBindFramebuffer(GL_FRAMEBUFFER_EXT, framebufferobject.fboobj);
|
pglBindFramebuffer(GL_FRAMEBUFFER_EXT, framebufferobject.fboobj);
|
||||||
pglBindRenderbuffer(GL_RENDERBUFFER_EXT, framebufferobject.rboobj);
|
pglBindRenderbuffer(GL_RENDERBUFFER_EXT, framebufferobject.rboobj);
|
||||||
}
|
}
|
||||||
@@ -3548,22 +3616,30 @@ void GL_RenderVhsEffect(fixed_t upbary, fixed_t downbary, UINT8 updistort, UINT8
|
|||||||
1.0f, -1.0f, 1.0f
|
1.0f, -1.0f, 1.0f
|
||||||
};
|
};
|
||||||
|
|
||||||
xfix = 1/((float)screen_texsizew/(float)screen_width);
|
|
||||||
yfix = 1/((float)screen_texsizeh/(float)screen_height);
|
|
||||||
|
|
||||||
const GLfloat scrwf = (float)screen_width;
|
const GLfloat scrwf = (float)screen_width;
|
||||||
const GLfloat scrwh = (float)screen_height;
|
const GLfloat scrwh = (float)screen_height;
|
||||||
|
|
||||||
|
xfix = 1/((float)screen_texsizew/scrwf);
|
||||||
|
yfix = 1/((float)screen_texsizeh/scrwh);
|
||||||
|
|
||||||
|
GL_SetBlend(PF_Modulated|PF_Translucent|PF_NoDepthTest);
|
||||||
|
|
||||||
// Slight fuzziness
|
// Slight fuzziness
|
||||||
GL_MakeScreenTexture(HWD_SCREENTEXTURE_VHS);
|
GL_MakeScreenTexture(HWD_SCREENTEXTURE_VHS);
|
||||||
GL_SetBlend(PF_Modulated|PF_Translucent|PF_NoDepthTest);
|
|
||||||
pglBindTexture(GL_TEXTURE_2D, screenTextures[HWD_SCREENTEXTURE_VHS]);
|
pglBindTexture(GL_TEXTURE_2D, screenTextures[HWD_SCREENTEXTURE_VHS]);
|
||||||
|
|
||||||
const float stride = 2.f/scrwh;
|
uint32_t r = rand();
|
||||||
|
|
||||||
for (i = 0; i < 1; i += stride)
|
const float ystep = 2.f/scrwh * (float)vid.udup/4.f;
|
||||||
|
|
||||||
|
for (i = 0; i < 1; i += ystep)
|
||||||
{
|
{
|
||||||
fix[2] = (float)(rand() % 128) / -22000.f * xfix;
|
// avoid calling rand thousands of times
|
||||||
|
r ^= r >> 13;
|
||||||
|
r ^= r >> 11;
|
||||||
|
r ^= r << 21;
|
||||||
|
|
||||||
|
fix[2] = (float)(r & 127) / -22000.f * xfix;
|
||||||
fix[0] = fix[2];
|
fix[0] = fix[2];
|
||||||
fix[6] = fix[0] + xfix;
|
fix[6] = fix[0] + xfix;
|
||||||
fix[4] = fix[2] + xfix;
|
fix[4] = fix[2] + xfix;
|
||||||
@@ -3581,8 +3657,8 @@ void GL_RenderVhsEffect(fixed_t upbary, fixed_t downbary, UINT8 updistort, UINT8
|
|||||||
}
|
}
|
||||||
|
|
||||||
// Upward bar
|
// Upward bar
|
||||||
//GL_MakeScreenTexture(HWD_SCREENTEXTURE_VHS);
|
GL_MakeScreenTexture(HWD_SCREENTEXTURE_VHS);
|
||||||
//pglBindTexture(GL_TEXTURE_2D, screenTextures[HWD_SCREENTEXTURE_VHS]);
|
pglBindTexture(GL_TEXTURE_2D, screenTextures[HWD_SCREENTEXTURE_VHS]);
|
||||||
|
|
||||||
color[0] = color[1] = color[2] = 190;
|
color[0] = color[1] = color[2] = 190;
|
||||||
color[3] = 250;
|
color[3] = 250;
|
||||||
@@ -3605,13 +3681,14 @@ void GL_RenderVhsEffect(fixed_t upbary, fixed_t downbary, UINT8 updistort, UINT8
|
|||||||
|
|
||||||
fix[1] = fix[7] += (fix[3] - fix[7])*2;
|
fix[1] = fix[7] += (fix[3] - fix[7])*2;
|
||||||
screenVerts[1] = screenVerts[10] += (screenVerts[4] - screenVerts[1])*2;
|
screenVerts[1] = screenVerts[10] += (screenVerts[4] - screenVerts[1])*2;
|
||||||
|
|
||||||
pglTexCoordPointer(2, GL_FLOAT, 0, fix);
|
pglTexCoordPointer(2, GL_FLOAT, 0, fix);
|
||||||
pglVertexPointer(3, GL_FLOAT, 0, screenVerts);
|
pglVertexPointer(3, GL_FLOAT, 0, screenVerts);
|
||||||
pglDrawArrays(GL_TRIANGLE_FAN, 0, 4);
|
pglDrawArrays(GL_TRIANGLE_FAN, 0, 4);
|
||||||
|
|
||||||
// Downward bar
|
// Downward bar
|
||||||
//GL_MakeScreenTexture(HWD_SCREENTEXTURE_VHS);
|
GL_MakeScreenTexture(HWD_SCREENTEXTURE_VHS);
|
||||||
//pglBindTexture(GL_TEXTURE_2D, screenTextures[HWD_SCREENTEXTURE_VHS]);
|
pglBindTexture(GL_TEXTURE_2D, screenTextures[HWD_SCREENTEXTURE_VHS]);
|
||||||
|
|
||||||
fix[0] = 0.0f;
|
fix[0] = 0.0f;
|
||||||
fix[6] = xfix;
|
fix[6] = xfix;
|
||||||
@@ -3630,6 +3707,7 @@ void GL_RenderVhsEffect(fixed_t upbary, fixed_t downbary, UINT8 updistort, UINT8
|
|||||||
|
|
||||||
fix[1] = fix[7] += (fix[3] - fix[7])*2;
|
fix[1] = fix[7] += (fix[3] - fix[7])*2;
|
||||||
screenVerts[1] = screenVerts[10] += (screenVerts[4] - screenVerts[1])*2;
|
screenVerts[1] = screenVerts[10] += (screenVerts[4] - screenVerts[1])*2;
|
||||||
|
|
||||||
pglTexCoordPointer(2, GL_FLOAT, 0, fix);
|
pglTexCoordPointer(2, GL_FLOAT, 0, fix);
|
||||||
pglVertexPointer(3, GL_FLOAT, 0, screenVerts);
|
pglVertexPointer(3, GL_FLOAT, 0, screenVerts);
|
||||||
pglDrawArrays(GL_TRIANGLE_FAN, 0, 4);
|
pglDrawArrays(GL_TRIANGLE_FAN, 0, 4);
|
||||||
@@ -3665,11 +3743,11 @@ void GL_MakeScreenTexture(int tex)
|
|||||||
tex_downloaded = screenTextures[tex];
|
tex_downloaded = screenTextures[tex];
|
||||||
}
|
}
|
||||||
|
|
||||||
void GL_DrawScreenFinalTexture(int tex, INT32 width, INT32 height, boolean useshader)
|
void GL_DrawScreenFinalTexture(int tex, INT32 width, INT32 height)
|
||||||
{
|
{
|
||||||
float xfix, yfix;
|
float xfix, yfix;
|
||||||
float origaspect, newaspect;
|
float origaspect, newaspect;
|
||||||
float xoff = 1, yoff = 1; // xoffset and yoffset for the polygon to have black bars around the screen
|
float xoff = 1.0f, yoff = 1.0f; // xoffset and yoffset for the polygon to have black bars around the screen
|
||||||
|
|
||||||
static float off[12] =
|
static float off[12] =
|
||||||
{
|
{
|
||||||
@@ -3692,19 +3770,19 @@ void GL_DrawScreenFinalTexture(int tex, INT32 width, INT32 height, boolean usesh
|
|||||||
if (origaspect < newaspect)
|
if (origaspect < newaspect)
|
||||||
{
|
{
|
||||||
xoff = origaspect / newaspect;
|
xoff = origaspect / newaspect;
|
||||||
yoff = 1;
|
yoff = 1.0f;
|
||||||
}
|
}
|
||||||
else if (origaspect > newaspect)
|
else if (origaspect > newaspect)
|
||||||
{
|
{
|
||||||
xoff = 1;
|
xoff = 1.0f;
|
||||||
yoff = newaspect / origaspect;
|
yoff = newaspect / origaspect;
|
||||||
}
|
}
|
||||||
|
|
||||||
// float off[12];
|
// float off[12];
|
||||||
off[0] = off[3] = -xoff;
|
off[0] = off[3] = -xoff;
|
||||||
off[1] = off[10] = -yoff;
|
off[1] = off[10] = -yoff;
|
||||||
off[4] = off[7] = yoff;
|
off[4] = off[7] = yoff;
|
||||||
off[6] = off[9] = xoff;
|
off[6] = off[9] = xoff;
|
||||||
|
|
||||||
// float fix[8];
|
// float fix[8];
|
||||||
fix[3] = fix[5] = yfix;
|
fix[3] = fix[5] = yfix;
|
||||||
@@ -3718,9 +3796,6 @@ void GL_DrawScreenFinalTexture(int tex, INT32 width, INT32 height, boolean usesh
|
|||||||
|
|
||||||
pglBindTexture(GL_TEXTURE_2D, screenTextures[tex]);
|
pglBindTexture(GL_TEXTURE_2D, screenTextures[tex]);
|
||||||
|
|
||||||
if (useshader)
|
|
||||||
pglUseProgram(gl_shaders[SHADER_PALETTE_POSTPROCESS].program); // Final postprocess step of palette rendering, after everything else has been drawn.
|
|
||||||
|
|
||||||
pglColor4ubv(white);
|
pglColor4ubv(white);
|
||||||
|
|
||||||
pglTexCoordPointer(2, GL_FLOAT, 0, fix);
|
pglTexCoordPointer(2, GL_FLOAT, 0, fix);
|
||||||
@@ -3728,9 +3803,6 @@ void GL_DrawScreenFinalTexture(int tex, INT32 width, INT32 height, boolean usesh
|
|||||||
|
|
||||||
pglDrawArrays(GL_TRIANGLE_FAN, 0, 4);
|
pglDrawArrays(GL_TRIANGLE_FAN, 0, 4);
|
||||||
|
|
||||||
if (useshader)
|
|
||||||
pglUseProgram(0);
|
|
||||||
|
|
||||||
tex_downloaded = screenTextures[tex];
|
tex_downloaded = screenTextures[tex];
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
+7
-5
@@ -189,7 +189,7 @@ HMS_connect (const char *format, ...)
|
|||||||
seek = strlen(hms_api) + 1;/* + '/' */
|
seek = strlen(hms_api) + 1;/* + '/' */
|
||||||
|
|
||||||
va_start (ap, format);
|
va_start (ap, format);
|
||||||
url = malloc(seek + vsnprintf(0, 0, format, ap) + sizeof HMS_QUERY_VERSION - 1 + token_length + 1);
|
url = malloc(seek + vsnprintf(NULL, 0, format, ap) + sizeof HMS_QUERY_VERSION - 1 + token_length + 1);
|
||||||
va_end (ap);
|
va_end (ap);
|
||||||
|
|
||||||
sprintf(url, "%s/", hms_api);
|
sprintf(url, "%s/", hms_api);
|
||||||
@@ -225,9 +225,10 @@ HMS_connect (const char *format, ...)
|
|||||||
{
|
{
|
||||||
cc = curl_easy_setopt(curl, CURLOPT_VERBOSE, 1L);
|
cc = curl_easy_setopt(curl, CURLOPT_VERBOSE, 1L);
|
||||||
if (cc != CURLE_OK) I_OutputMsg("libcurl: %s\n", buffer->errbuf);
|
if (cc != CURLE_OK) I_OutputMsg("libcurl: %s\n", buffer->errbuf);
|
||||||
|
#ifdef LOGMESSAGES
|
||||||
cc = curl_easy_setopt(curl, CURLOPT_STDERR, logstream);
|
cc = curl_easy_setopt(curl, CURLOPT_STDERR, logstream);
|
||||||
if (cc != CURLE_OK) I_OutputMsg("libcurl: %s\n", buffer->errbuf);
|
if (cc != CURLE_OK) I_OutputMsg("libcurl: %s\n", buffer->errbuf);
|
||||||
|
#endif
|
||||||
}
|
}
|
||||||
|
|
||||||
if (M_CheckParm("-bindaddr") && M_IsNextParm())
|
if (M_CheckParm("-bindaddr") && M_IsNextParm())
|
||||||
@@ -317,6 +318,7 @@ static void
|
|||||||
HMS_end (struct HMS_buffer *buffer)
|
HMS_end (struct HMS_buffer *buffer)
|
||||||
{
|
{
|
||||||
curl_easy_cleanup(buffer->curl);
|
curl_easy_cleanup(buffer->curl);
|
||||||
|
free(buffer->errbuf);
|
||||||
free(buffer->buffer);
|
free(buffer->buffer);
|
||||||
free(buffer);
|
free(buffer);
|
||||||
}
|
}
|
||||||
@@ -471,8 +473,8 @@ HMS_fetch_servers (msg_server_t *list, int query_id)
|
|||||||
*end = '\0';
|
*end = '\0';
|
||||||
|
|
||||||
address = strtok(p, " ");
|
address = strtok(p, " ");
|
||||||
port = strtok(0, " ");
|
port = strtok(NULL, " ");
|
||||||
contact = strtok(0, "");
|
contact = strtok(NULL, "");
|
||||||
|
|
||||||
if (address && port)
|
if (address && port)
|
||||||
{
|
{
|
||||||
@@ -539,7 +541,7 @@ HMS_compare_mod_version (char *buffer, size_t buffer_size)
|
|||||||
if (HMS_do(hms))
|
if (HMS_do(hms))
|
||||||
{
|
{
|
||||||
version = strtok(hms->buffer, " ");
|
version = strtok(hms->buffer, " ");
|
||||||
version_name = strtok(0, "\n");
|
version_name = strtok(NULL, "\n");
|
||||||
|
|
||||||
if (version && version_name)
|
if (version && version_name)
|
||||||
{
|
{
|
||||||
|
|||||||
+97
-242
@@ -97,7 +97,6 @@ static textinput_t w_chat;
|
|||||||
static boolean headsupactive = false;
|
static boolean headsupactive = false;
|
||||||
boolean hu_showscores = false; // draw rankings
|
boolean hu_showscores = false; // draw rankings
|
||||||
static char hu_tick;
|
static char hu_tick;
|
||||||
static tic_t hu_emoteanim = 0;
|
|
||||||
emote_autocomplete_t emote_autocomplete = {0};
|
emote_autocomplete_t emote_autocomplete = {0};
|
||||||
|
|
||||||
static huddrawlist_h luahuddrawlist_scores = NULL;
|
static huddrawlist_h luahuddrawlist_scores = NULL;
|
||||||
@@ -116,155 +115,8 @@ static patch_t *songcreditbg = NULL;
|
|||||||
// -------
|
// -------
|
||||||
static void HU_DrawRankings(void);
|
static void HU_DrawRankings(void);
|
||||||
|
|
||||||
|
|
||||||
consvar_t cv_showspecstuff = {"showspecstuff", "No", CV_SAVE, CV_YesNo, NULL, 0, NULL, NULL, 0, 0, NULL};
|
consvar_t cv_showspecstuff = {"showspecstuff", "No", CV_SAVE, CV_YesNo, NULL, 0, NULL, NULL, 0, 0, NULL};
|
||||||
|
|
||||||
//======================================================================
|
|
||||||
// KEYBOARD LAYOUTS FOR ENTERING TEXT
|
|
||||||
//======================================================================
|
|
||||||
|
|
||||||
char *shiftxform = NULL;
|
|
||||||
|
|
||||||
char english_shiftxform[] =
|
|
||||||
{
|
|
||||||
0,
|
|
||||||
1, 2, 3, 4, 5, 6, 7, 8, 9, 10,
|
|
||||||
11, 12, 13, 14, 15, 16, 17, 18, 19, 20,
|
|
||||||
21, 22, 23, 24, 25, 26, 27, 28, 29, 30,
|
|
||||||
31,
|
|
||||||
' ', '!', '"', '#', '$', '%', '&',
|
|
||||||
'"', // shift-'
|
|
||||||
'(', ')', '*', '+',
|
|
||||||
'<', // shift-,
|
|
||||||
'_', // shift--
|
|
||||||
'>', // shift-.
|
|
||||||
'?', // shift-/
|
|
||||||
')', // shift-0
|
|
||||||
'!', // shift-1
|
|
||||||
'@', // shift-2
|
|
||||||
'#', // shift-3
|
|
||||||
'$', // shift-4
|
|
||||||
'%', // shift-5
|
|
||||||
'^', // shift-6
|
|
||||||
'&', // shift-7
|
|
||||||
'*', // shift-8
|
|
||||||
'(', // shift-9
|
|
||||||
':',
|
|
||||||
':', // shift-;
|
|
||||||
'<',
|
|
||||||
'+', // shift-=
|
|
||||||
'>', '?', '@',
|
|
||||||
'A', 'B', 'C', 'D', 'E', 'F', 'G', 'H', 'I', 'J', 'K', 'L', 'M', 'N',
|
|
||||||
'O', 'P', 'Q', 'R', 'S', 'T', 'U', 'V', 'W', 'X', 'Y', 'Z',
|
|
||||||
'{', // shift-[
|
|
||||||
'|', // shift-backslash - OH MY GOD DOES WATCOM SUCK
|
|
||||||
'}', // shift-]
|
|
||||||
'"', '_',
|
|
||||||
'~', // shift-`
|
|
||||||
'A', 'B', 'C', 'D', 'E', 'F', 'G', 'H', 'I', 'J', 'K', 'L', 'M', 'N',
|
|
||||||
'O', 'P', 'Q', 'R', 'S', 'T', 'U', 'V', 'W', 'X', 'Y', 'Z',
|
|
||||||
'{', '|', '}', '~', 127
|
|
||||||
};
|
|
||||||
|
|
||||||
char french_shiftxform[] =
|
|
||||||
{
|
|
||||||
0,
|
|
||||||
1, 2, 3, 4, 5, 6, 7, 8, 9, 10,
|
|
||||||
11, 12, 13, 14, 15, 16, 17, 18, 19, 20,
|
|
||||||
21, 22, 23, 24, 25, 26, 27, 28, 29, 30,
|
|
||||||
31,
|
|
||||||
' ','$', //shift-!
|
|
||||||
'3', //shift-"
|
|
||||||
'#', '$', '%',
|
|
||||||
'1', //shift-&
|
|
||||||
'4', // shift-'
|
|
||||||
'5', // shift-(
|
|
||||||
')', // shift-)
|
|
||||||
'*', '+',
|
|
||||||
'?', // shift-,
|
|
||||||
'6', // shift--
|
|
||||||
'.', '/',
|
|
||||||
'0', '1', '2', '3', '4', '5',
|
|
||||||
'6', '7', '8', '9',
|
|
||||||
'/', // shitf-:
|
|
||||||
'.', // shift-;
|
|
||||||
'>', // shift-<
|
|
||||||
'+', // shift-=
|
|
||||||
'>', '?', '@',
|
|
||||||
'A', 'B', 'C', 'D', 'E', 'F', 'G', 'H', 'I', 'J', 'K', 'L', 'M', 'N',
|
|
||||||
'O', 'P', 'Q', 'R', 'S', 'T', 'U', 'V', 'W', 'X', 'Y', 'Z',
|
|
||||||
'[', '\\', ']', '^',
|
|
||||||
'8', //shift-_
|
|
||||||
'`',
|
|
||||||
'A', 'B', 'C', 'D', 'E', 'F', 'G', 'H', 'I', 'J', 'K', 'L', 'M', 'N',
|
|
||||||
'O', 'P', 'Q', 'R', 'S', 'T', 'U', 'V', 'W', 'X', 'Y', 'Z',
|
|
||||||
'{', '|', '}', '~', 127,
|
|
||||||
128, 129,
|
|
||||||
'2',
|
|
||||||
131, 132,
|
|
||||||
'0',
|
|
||||||
134,
|
|
||||||
'9',
|
|
||||||
136, 137,
|
|
||||||
'7',
|
|
||||||
139, 140,
|
|
||||||
'%'
|
|
||||||
};
|
|
||||||
|
|
||||||
char french_altgrxform[] =
|
|
||||||
{
|
|
||||||
0,
|
|
||||||
1, 2, 3, 4, 5, 6, 7, 8, 9, 10,
|
|
||||||
11, 12, 13, 14, 15, 16, 17, 18, 19, 20,
|
|
||||||
21, 22, 23, 24, 25, 26, 27, 28, 29, 30,
|
|
||||||
31,
|
|
||||||
' ', '!',
|
|
||||||
'#', //altgr-"
|
|
||||||
'#', '$', '%', '&',
|
|
||||||
'{', //altgr-'
|
|
||||||
'[', //altgr-(
|
|
||||||
']', //altgr-)
|
|
||||||
'*', '+', ',',
|
|
||||||
'|', //altg--
|
|
||||||
'.', '/',
|
|
||||||
'0', '1', '2', '3', '4', '5',
|
|
||||||
'6', '7', '8', '9',
|
|
||||||
':', ';', '<',
|
|
||||||
'}', //altgr-=
|
|
||||||
'>', '?', '@',
|
|
||||||
'A', 'B', 'C', 'D', 'E', 'F', 'G', 'H', 'I', 'J', 'K', 'L', 'M', 'N',
|
|
||||||
'O', 'P', 'Q', 'R', 'S', 'T', 'U', 'V', 'W', 'X', 'Y', 'Z',
|
|
||||||
'[', '\\', ']', '^',
|
|
||||||
'\\', //altgr-backslash
|
|
||||||
'`',
|
|
||||||
'a', 'b', 'c', 'd', 'E', 'f', 'g', 'h', 'i', 'j', 'k', 'l', 'm', 'n',
|
|
||||||
'o', 'p', 'q', 'r', 's', 't', 'u', 'v', 'w', 'x', 'y', 'z',
|
|
||||||
'{', '|', '}', '~', 127,
|
|
||||||
128, 129,
|
|
||||||
'~',
|
|
||||||
131, 132,
|
|
||||||
'@',
|
|
||||||
134,
|
|
||||||
'^',
|
|
||||||
136, 137,
|
|
||||||
'`',
|
|
||||||
139, 140,
|
|
||||||
KEY_FR_U_GRAVE
|
|
||||||
};
|
|
||||||
|
|
||||||
//fallback for special letter non displayable in the game (i.e.: 'é','à',etc.)
|
|
||||||
INT32 HU_FallBackFrSpecialLetter(INT32 key)
|
|
||||||
{
|
|
||||||
switch(key){
|
|
||||||
case KEY_FR_E_AIGUE: return 'e';
|
|
||||||
case KEY_FR_E_GRAVE: return 'e';
|
|
||||||
case KEY_FR_C_CEDILLE: return 'c';
|
|
||||||
case KEY_FR_A_GRAVE: return 'a';
|
|
||||||
case KEY_FR_U_GRAVE: return 'u';
|
|
||||||
default: return key;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
static char cechotext[1024];
|
static char cechotext[1024];
|
||||||
static tic_t cechotimer = 0;
|
static tic_t cechotimer = 0;
|
||||||
static tic_t cechoduration = 5*TICRATE;
|
static tic_t cechoduration = 5*TICRATE;
|
||||||
@@ -408,9 +260,6 @@ void HU_Init(void)
|
|||||||
COM_AddCommand("csay", Command_CSay_f);
|
COM_AddCommand("csay", Command_CSay_f);
|
||||||
RegisterNetXCmd(XD_SAY, Got_Saycmd);
|
RegisterNetXCmd(XD_SAY, Got_Saycmd);
|
||||||
|
|
||||||
// set shift translation table
|
|
||||||
shiftxform = english_shiftxform;
|
|
||||||
|
|
||||||
if (dedicated || rendermode == render_none)
|
if (dedicated || rendermode == render_none)
|
||||||
return;
|
return;
|
||||||
|
|
||||||
@@ -436,11 +285,6 @@ void HU_Start(void)
|
|||||||
headsupactive = true;
|
headsupactive = true;
|
||||||
}
|
}
|
||||||
|
|
||||||
void HU_Shiftform(void)
|
|
||||||
{
|
|
||||||
shiftxform = (cv_keyboardlayout.value == 3) ? french_shiftxform : english_shiftxform;
|
|
||||||
}
|
|
||||||
|
|
||||||
//======================================================================
|
//======================================================================
|
||||||
// EXECUTION
|
// EXECUTION
|
||||||
//======================================================================
|
//======================================================================
|
||||||
@@ -497,7 +341,9 @@ static void HU_removeChatText_Log(void)
|
|||||||
{
|
{
|
||||||
chat_log[i] = chat_log[i+1];
|
chat_log[i] = chat_log[i+1];
|
||||||
}
|
}
|
||||||
|
|
||||||
chat_nummsg_log--; // lost 1 msg.
|
chat_nummsg_log--; // lost 1 msg.
|
||||||
|
chat_log[chat_nummsg_log] = NULL;
|
||||||
}
|
}
|
||||||
|
|
||||||
static void Chatlogsize_OnChange(void)
|
static void Chatlogsize_OnChange(void)
|
||||||
@@ -516,6 +362,7 @@ static void Chatlogsize_OnChange(void)
|
|||||||
if (new_chat_log == NULL)
|
if (new_chat_log == NULL)
|
||||||
{
|
{
|
||||||
free(chat_log);
|
free(chat_log);
|
||||||
|
chat_log = NULL;
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
chat_log = new_chat_log;
|
chat_log = new_chat_log;
|
||||||
@@ -541,6 +388,8 @@ void HU_AddChatText(const char *text, boolean playsound)
|
|||||||
HU_removeChatText_Log();
|
HU_removeChatText_Log();
|
||||||
|
|
||||||
chat_log[chat_nummsg_log] = malloc(HU_MSGBUFSIZE);
|
chat_log[chat_nummsg_log] = malloc(HU_MSGBUFSIZE);
|
||||||
|
if (!chat_log[chat_nummsg_log])
|
||||||
|
I_Error("HU_AddChatText: out of memory for chat log\n");
|
||||||
strcpy(chat_log[chat_nummsg_log], text);
|
strcpy(chat_log[chat_nummsg_log], text);
|
||||||
++chat_nummsg_log;
|
++chat_nummsg_log;
|
||||||
|
|
||||||
@@ -623,7 +472,10 @@ static void DoSayCommand(SINT8 target, size_t usedargs, UINT8 flags)
|
|||||||
// with that logic, characters 4 and 5 are our numbers:
|
// with that logic, characters 4 and 5 are our numbers:
|
||||||
const char *newmsg;
|
const char *newmsg;
|
||||||
INT32 spc = 1; // used if nodenum[1] is a space.
|
INT32 spc = 1; // used if nodenum[1] is a space.
|
||||||
CLEANUP(pfree) char *nodenum = (char*) malloc(3);
|
CLEANUP(pfree) char *nodenum = (char*)malloc(3);
|
||||||
|
if (!nodenum)
|
||||||
|
I_Error("DoSayCommand: out of memory for sending pm\n");
|
||||||
|
|
||||||
memcpy(nodenum, msg+3, 2);
|
memcpy(nodenum, msg+3, 2);
|
||||||
nodenum[2] = '\0';
|
nodenum[2] = '\0';
|
||||||
|
|
||||||
@@ -904,7 +756,7 @@ static void Got_Saycmd(const UINT8 **p, INT32 playernum)
|
|||||||
target = READSINT8(*p);
|
target = READSINT8(*p);
|
||||||
flags = READUINT8(*p);
|
flags = READUINT8(*p);
|
||||||
msg = buf;
|
msg = buf;
|
||||||
READSTRINGL(*p, msg, HU_MAXMSGLEN + 1);
|
READSTRINGN(*p, msg, HU_MAXMSGLEN + 1);
|
||||||
|
|
||||||
if ((cv_mute.value || flags & (HU_CSAY|HU_SERVER_SAY)) && playernum != serverplayer && !(IsPlayerAdmin(playernum)))
|
if ((cv_mute.value || flags & (HU_CSAY|HU_SERVER_SAY)) && playernum != serverplayer && !(IsPlayerAdmin(playernum)))
|
||||||
{
|
{
|
||||||
@@ -1072,8 +924,7 @@ static void Got_Saycmd(const UINT8 **p, INT32 playernum)
|
|||||||
|
|
||||||
HU_AddChatText(va(fmt2, prefix, cstart, dispname, textcolor, msg), cv_chatnotifications.value); // add to chat
|
HU_AddChatText(va(fmt2, prefix, cstart, dispname, textcolor, msg), cv_chatnotifications.value); // add to chat
|
||||||
|
|
||||||
if (tempchar)
|
Z_Free(tempchar);
|
||||||
Z_Free(tempchar);
|
|
||||||
}
|
}
|
||||||
#ifdef _DEBUG
|
#ifdef _DEBUG
|
||||||
// I just want to point out while I'm here that because the data is still
|
// I just want to point out while I'm here that because the data is still
|
||||||
@@ -1093,7 +944,6 @@ void HU_Ticker(void)
|
|||||||
return;
|
return;
|
||||||
|
|
||||||
hu_tick++;
|
hu_tick++;
|
||||||
hu_emoteanim++;
|
|
||||||
hu_tick &= 7; // currently only to blink chat input cursor
|
hu_tick &= 7; // currently only to blink chat input cursor
|
||||||
|
|
||||||
if (PLAYER1INPUTDOWN(gc_scores))
|
if (PLAYER1INPUTDOWN(gc_scores))
|
||||||
@@ -1129,7 +979,8 @@ void HU_Ticker(void)
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if (cechotimer > 0) --cechotimer;
|
if (cechotimer > 0)
|
||||||
|
--cechotimer;
|
||||||
|
|
||||||
// Animate the desynch dots
|
// Animate the desynch dots
|
||||||
if (hu_resynching
|
if (hu_resynching
|
||||||
@@ -1230,7 +1081,9 @@ static void HU_SendChatMessage(void)
|
|||||||
{
|
{
|
||||||
INT32 spc = 1; // used if nodenum[1] is a space.
|
INT32 spc = 1; // used if nodenum[1] is a space.
|
||||||
const char *newmsg;
|
const char *newmsg;
|
||||||
CLEANUP(pfree) char *nodenum = (char*) malloc(3);
|
CLEANUP(pfree) char *nodenum = (char*)malloc(3);
|
||||||
|
if (!nodenum)
|
||||||
|
I_Error("HU_SendChatMessage: out of memory for sending pm\n");
|
||||||
|
|
||||||
// what we're gonna do now is check if the node exists
|
// what we're gonna do now is check if the node exists
|
||||||
// with that logic, characters 4 and 5 are our numbers:
|
// with that logic, characters 4 and 5 are our numbers:
|
||||||
@@ -1484,6 +1337,7 @@ static char *CHAT_WordWrap(INT32 x, INT32 w, INT32 option, const char *string)
|
|||||||
x = 0;
|
x = 0;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
return newstring;
|
return newstring;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -1522,7 +1376,7 @@ static void HU_drawMiniChat(void)
|
|||||||
emote_t *emote = NULL;
|
emote_t *emote = NULL;
|
||||||
int emotelen = 0;
|
int emotelen = 0;
|
||||||
|
|
||||||
while(msg[j]) // iterate through msg
|
while (msg[j]) // iterate through msg
|
||||||
{
|
{
|
||||||
if (msg[j] < HU_FONTSTART) // don't draw
|
if (msg[j] < HU_FONTSTART) // don't draw
|
||||||
{
|
{
|
||||||
@@ -1554,24 +1408,25 @@ static void HU_drawMiniChat(void)
|
|||||||
{
|
{
|
||||||
j++;
|
j++;
|
||||||
}
|
}
|
||||||
|
|
||||||
prev_linereturn = false;
|
prev_linereturn = false;
|
||||||
dx += charwidth;
|
dx += charwidth;
|
||||||
|
|
||||||
if (dx >= boxw)
|
if (dx >= boxw)
|
||||||
{
|
{
|
||||||
dx = 0;
|
dx = 0;
|
||||||
linescount += 1;
|
linescount += 1;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
dy = 0;
|
dy = 0;
|
||||||
dx = 0;
|
dx = 0;
|
||||||
msglines += linescount+1;
|
msglines += linescount+1;
|
||||||
if (msg)
|
Z_Free(msg);
|
||||||
Z_Free(msg);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
y = chaty - charheight*(msglines+1);
|
y = chaty - charheight*(msglines+1);
|
||||||
|
|
||||||
#ifdef NETSPLITSCREEN
|
|
||||||
if (splitscreen)
|
if (splitscreen)
|
||||||
{
|
{
|
||||||
y -= BASEVIDHEIGHT/2;
|
y -= BASEVIDHEIGHT/2;
|
||||||
@@ -1579,7 +1434,6 @@ static void HU_drawMiniChat(void)
|
|||||||
y += 16;
|
y += 16;
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
#endif
|
|
||||||
y -= (cv_kartspeedometer.value ? 16 : 0);
|
y -= (cv_kartspeedometer.value ? 16 : 0);
|
||||||
|
|
||||||
dx = 0;
|
dx = 0;
|
||||||
@@ -1598,7 +1452,7 @@ static void HU_drawMiniChat(void)
|
|||||||
emote_t *emote = NULL;
|
emote_t *emote = NULL;
|
||||||
int emotelen = 0;
|
int emotelen = 0;
|
||||||
|
|
||||||
while(msg[j]) // iterate through msg
|
while (msg[j]) // iterate through msg
|
||||||
{
|
{
|
||||||
if (msg[j] < HU_FONTSTART) // don't draw
|
if (msg[j] < HU_FONTSTART) // don't draw
|
||||||
{
|
{
|
||||||
@@ -1643,16 +1497,17 @@ static void HU_drawMiniChat(void)
|
|||||||
|
|
||||||
dx += charwidth;
|
dx += charwidth;
|
||||||
prev_linereturn = false;
|
prev_linereturn = false;
|
||||||
|
|
||||||
if (dx >= boxw)
|
if (dx >= boxw)
|
||||||
{
|
{
|
||||||
dx = 0;
|
dx = 0;
|
||||||
dy += charheight;
|
dy += charheight;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
dy += charheight;
|
dy += charheight;
|
||||||
dx = 0;
|
dx = 0;
|
||||||
if (msg)
|
Z_Free(msg);
|
||||||
Z_Free(msg);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
// decrement addy and make that shit smooth:
|
// decrement addy and make that shit smooth:
|
||||||
@@ -1676,18 +1531,15 @@ static void HU_drawChatLog(INT32 offset)
|
|||||||
if (chat_scroll > chat_maxscroll)
|
if (chat_scroll > chat_maxscroll)
|
||||||
chat_scroll = chat_maxscroll;
|
chat_scroll = chat_maxscroll;
|
||||||
|
|
||||||
#ifdef NETSPLITSCREEN
|
|
||||||
if (splitscreen)
|
if (splitscreen)
|
||||||
{
|
{
|
||||||
boxh = max(6, boxh/2);
|
boxh = max(6, boxh/2);
|
||||||
if (splitscreen > 1)
|
if (splitscreen > 1)
|
||||||
boxw = max(64, boxw/2);
|
boxw = max(64, boxw/2);
|
||||||
}
|
}
|
||||||
#endif
|
|
||||||
|
|
||||||
y = chaty - offset*charheight - (chat_scroll*charheight) - boxh*charheight - 12;
|
y = chaty - offset*charheight - (chat_scroll*charheight) - boxh*charheight - 12;
|
||||||
|
|
||||||
#ifdef NETSPLITSCREEN
|
|
||||||
if (splitscreen)
|
if (splitscreen)
|
||||||
{
|
{
|
||||||
y -= BASEVIDHEIGHT/2;
|
y -= BASEVIDHEIGHT/2;
|
||||||
@@ -1695,7 +1547,6 @@ static void HU_drawChatLog(INT32 offset)
|
|||||||
y += 16;
|
y += 16;
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
#endif
|
|
||||||
y -= (cv_kartspeedometer.value ? 16 : 0);
|
y -= (cv_kartspeedometer.value ? 16 : 0);
|
||||||
|
|
||||||
|
|
||||||
@@ -1704,7 +1555,7 @@ static void HU_drawChatLog(INT32 offset)
|
|||||||
|
|
||||||
V_DrawFillConsoleMap(chatx, chat_topy, boxw, boxh*charheight +2, 239|V_SNAPTOBOTTOM|V_SNAPTOLEFT); // log box
|
V_DrawFillConsoleMap(chatx, chat_topy, boxw, boxh*charheight +2, 239|V_SNAPTOBOTTOM|V_SNAPTOLEFT); // log box
|
||||||
|
|
||||||
for (i=0; i<chat_nummsg_log; i++) // iterate through our chatlog
|
for (i = 0; i < chat_nummsg_log; i++) // iterate through our chatlog
|
||||||
{
|
{
|
||||||
INT32 clrflag = 0;
|
INT32 clrflag = 0;
|
||||||
INT32 j = 0;
|
INT32 j = 0;
|
||||||
@@ -1713,7 +1564,7 @@ static void HU_drawChatLog(INT32 offset)
|
|||||||
emote_t *emote = NULL;
|
emote_t *emote = NULL;
|
||||||
int emotelen = 0;
|
int emotelen = 0;
|
||||||
|
|
||||||
while(msg[j]) // iterate through msg
|
while (msg[j]) // iterate through msg
|
||||||
{
|
{
|
||||||
if (msg[j] < HU_FONTSTART) // don't draw
|
if (msg[j] < HU_FONTSTART) // don't draw
|
||||||
{
|
{
|
||||||
@@ -1758,10 +1609,10 @@ static void HU_drawChatLog(INT32 offset)
|
|||||||
dy += charheight;
|
dy += charheight;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
dy += charheight;
|
dy += charheight;
|
||||||
dx = 0;
|
dx = 0;
|
||||||
if (msg)
|
Z_Free(msg);
|
||||||
Z_Free(msg);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
if (((chat_scroll >= chat_maxscroll) || (chat_scrollmedown)) && !(justscrolleddown || justscrolledup || chat_scrolltime)) // was already at the bottom of the page before new maxscroll calculation and was NOT scrolling.
|
if (((chat_scroll >= chat_maxscroll) || (chat_scrollmedown)) && !(justscrolleddown || justscrolledup || chat_scrolltime)) // was already at the bottom of the page before new maxscroll calculation and was NOT scrolling.
|
||||||
@@ -1804,12 +1655,12 @@ static void HU_DrawChat(void)
|
|||||||
INT32 t = 0, c = 0, y = chaty - (typelines*charheight);
|
INT32 t = 0, c = 0, y = chaty - (typelines*charheight);
|
||||||
UINT32 i = 0, saylen = strlen(w_chat_buf); // You learn new things everyday!
|
UINT32 i = 0, saylen = strlen(w_chat_buf); // You learn new things everyday!
|
||||||
INT32 cflag = 0;
|
INT32 cflag = 0;
|
||||||
|
INT32 pm_offset = 0; // for cases when you type emote while also doing /pm
|
||||||
size_t select_start = 0, select_end = 0;
|
size_t select_start = 0, select_end = 0;
|
||||||
const char *ntalk = "Say: ", *ttalk = "Team: ";
|
const char *ntalk = "Say: ", *ttalk = "Team: ";
|
||||||
const char *talk = ntalk;
|
const char *talk = ntalk;
|
||||||
const char *mute = "Chat has been muted.";
|
const char *mute = "Chat has been muted.";
|
||||||
|
|
||||||
#ifdef NETSPLITSCREEN
|
|
||||||
if (splitscreen)
|
if (splitscreen)
|
||||||
{
|
{
|
||||||
y -= BASEVIDHEIGHT/2;
|
y -= BASEVIDHEIGHT/2;
|
||||||
@@ -1820,7 +1671,6 @@ static void HU_DrawChat(void)
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
#endif
|
|
||||||
y -= (cv_kartspeedometer.value ? 16 : 0);
|
y -= (cv_kartspeedometer.value ? 16 : 0);
|
||||||
|
|
||||||
if (teamtalk)
|
if (teamtalk)
|
||||||
@@ -1915,71 +1765,13 @@ static void HU_DrawChat(void)
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if (emote_autocomplete.emotestart != -1 && (emote_autocomplete.complete[0] || (w_chat.cursor - emote_autocomplete.emotestart) > 1))
|
|
||||||
{
|
|
||||||
emote_t *suggest;
|
|
||||||
int skip = 0;
|
|
||||||
|
|
||||||
const char *complete;
|
|
||||||
int complete_len;
|
|
||||||
|
|
||||||
if (emote_autocomplete.complete[0])
|
|
||||||
{
|
|
||||||
complete = emote_autocomplete.complete;
|
|
||||||
complete_len = strlen(complete);
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
complete = &w_chat_buf[emote_autocomplete.emotestart];
|
|
||||||
complete_len = w_chat.cursor - emote_autocomplete.emotestart;
|
|
||||||
}
|
|
||||||
|
|
||||||
// A bit of copy-paste from /pm code :p
|
|
||||||
INT32 suggesty = chaty - charheight - 1;
|
|
||||||
size_t longest_suggestion_length = 0;
|
|
||||||
|
|
||||||
while ((suggest = M_FindEmote(complete, complete_len, skip)) != NULL)
|
|
||||||
{
|
|
||||||
longest_suggestion_length = max(longest_suggestion_length, strlen(suggest->name));
|
|
||||||
++skip;
|
|
||||||
}
|
|
||||||
|
|
||||||
skip = 0;
|
|
||||||
|
|
||||||
#ifdef NETSPLITSCREEN
|
|
||||||
if (splitscreen)
|
|
||||||
{
|
|
||||||
suggesty -= BASEVIDHEIGHT/2;
|
|
||||||
if (splitscreen > 1)
|
|
||||||
suggesty += 16;
|
|
||||||
}
|
|
||||||
else
|
|
||||||
#endif
|
|
||||||
suggesty -= (cv_kartspeedometer.value ? 16 : 0);
|
|
||||||
|
|
||||||
while ((suggest = M_FindEmote(complete, complete_len, skip)) != NULL)
|
|
||||||
{
|
|
||||||
V_DrawFillConsoleMap(chatx + boxw + 2, suggesty - (7*skip), (longest_suggestion_length+2)*4 + EMOTEWIDTH, 6, V_SNAPTOBOTTOM|V_SNAPTOLEFT);
|
|
||||||
|
|
||||||
// Highlight currently suggested emote
|
|
||||||
int hlflag = 0;
|
|
||||||
if (skip == emote_autocomplete.skip && emote_autocomplete.complete[0])
|
|
||||||
hlflag = V_YELLOWMAP;
|
|
||||||
|
|
||||||
V_DrawSmallString(chatx + boxw + 4 + EMOTEWIDTH, suggesty - (7*skip), hlflag|V_SNAPTOBOTTOM|V_SNAPTOLEFT|V_ALLOWLOWERCASE, va(":%s:", suggest->name));
|
|
||||||
M_DrawEmote(chatx + boxw + 2, suggesty - skip*7, suggest, V_SNAPTOBOTTOM|V_SNAPTOLEFT);
|
|
||||||
|
|
||||||
++skip;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
// handle /pm list. It's messy, horrible and I don't care.
|
// handle /pm list. It's messy, horrible and I don't care.
|
||||||
if (strnicmp(w_chat_buf, "/pm", 3) == 0 && vid.width >= 400 && !teamtalk) // 320x200 unsupported kthxbai
|
if (strnicmp(w_chat_buf, "/pm", 3) == 0 && vid.width >= 400 && !teamtalk) // 320x200 unsupported kthxbai
|
||||||
{
|
{
|
||||||
INT32 count = 0;
|
INT32 count = 0;
|
||||||
INT32 p_dispy = chaty - charheight - 1;
|
INT32 p_dispy = chaty - charheight - 1;
|
||||||
size_t longest_name_length = 0;
|
size_t longest_name_length = 0;
|
||||||
#ifdef NETSPLITSCREEN
|
|
||||||
if (splitscreen)
|
if (splitscreen)
|
||||||
{
|
{
|
||||||
p_dispy -= BASEVIDHEIGHT/2;
|
p_dispy -= BASEVIDHEIGHT/2;
|
||||||
@@ -1987,13 +1779,13 @@ static void HU_DrawChat(void)
|
|||||||
p_dispy += 16;
|
p_dispy += 16;
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
#endif
|
|
||||||
p_dispy -= (cv_kartspeedometer.value ? 16 : 0);
|
p_dispy -= (cv_kartspeedometer.value ? 16 : 0);
|
||||||
|
|
||||||
// Find longest player name, for drawing background for /pm list later
|
// Find longest player name, for drawing background for /pm list later
|
||||||
for (i = 0; i < MAXPLAYERS; i++)
|
for (i = 0; i < MAXPLAYERS; i++)
|
||||||
{
|
{
|
||||||
if (!playeringame[i]) continue;
|
if (!playeringame[i])
|
||||||
|
continue;
|
||||||
|
|
||||||
longest_name_length = max(longest_name_length, strlen(player_names[i]));
|
longest_name_length = max(longest_name_length, strlen(player_names[i]));
|
||||||
}
|
}
|
||||||
@@ -2053,9 +1845,72 @@ static void HU_DrawChat(void)
|
|||||||
|
|
||||||
if (count == 0) // no results.
|
if (count == 0) // no results.
|
||||||
{
|
{
|
||||||
|
pm_offset = 48 + 2;
|
||||||
V_DrawFillConsoleMap(chatx + boxw + 2, p_dispy - (6*count), 48, 6, 239 | V_SNAPTOBOTTOM | V_SNAPTOLEFT); // fill it like the chat so the text doesn't become hard to read because of the hud.
|
V_DrawFillConsoleMap(chatx + boxw + 2, p_dispy - (6*count), 48, 6, 239 | V_SNAPTOBOTTOM | V_SNAPTOLEFT); // fill it like the chat so the text doesn't become hard to read because of the hud.
|
||||||
V_DrawSmallString(chatx + boxw + 4, p_dispy - (6*count), V_SNAPTOBOTTOM|V_SNAPTOLEFT|V_ALLOWLOWERCASE, "NO RESULT.");
|
V_DrawSmallString(chatx + boxw + 4, p_dispy - (6*count), V_SNAPTOBOTTOM|V_SNAPTOLEFT|V_ALLOWLOWERCASE, "NO RESULT.");
|
||||||
}
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
pm_offset = (longest_name_length+4)*4 + 2;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
if (emote_autocomplete.emotestart != -1 && (emote_autocomplete.complete[0] || (w_chat.cursor - emote_autocomplete.emotestart) > 1))
|
||||||
|
{
|
||||||
|
emote_t *suggest;
|
||||||
|
int skip = 0;
|
||||||
|
|
||||||
|
const char *complete;
|
||||||
|
int complete_len;
|
||||||
|
|
||||||
|
if (emote_autocomplete.complete[0])
|
||||||
|
{
|
||||||
|
complete = emote_autocomplete.complete;
|
||||||
|
complete_len = strlen(complete);
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
complete = &w_chat_buf[emote_autocomplete.emotestart];
|
||||||
|
complete_len = w_chat.cursor - emote_autocomplete.emotestart;
|
||||||
|
}
|
||||||
|
|
||||||
|
// A bit of copy-paste from /pm code :p
|
||||||
|
INT32 suggesty = chaty - charheight - 1;
|
||||||
|
size_t longest_suggestion_length = 0;
|
||||||
|
|
||||||
|
while ((suggest = M_FindEmote(complete, complete_len, skip)) != NULL)
|
||||||
|
{
|
||||||
|
longest_suggestion_length = max(longest_suggestion_length, strlen(suggest->name));
|
||||||
|
++skip;
|
||||||
|
}
|
||||||
|
|
||||||
|
INT32 emote_suggest_boxw = (longest_suggestion_length+2)*4 + EMOTEWIDTH;
|
||||||
|
|
||||||
|
skip = 0;
|
||||||
|
|
||||||
|
if (splitscreen)
|
||||||
|
{
|
||||||
|
suggesty -= BASEVIDHEIGHT/2;
|
||||||
|
if (splitscreen > 1)
|
||||||
|
suggesty += 16;
|
||||||
|
}
|
||||||
|
else
|
||||||
|
suggesty -= (cv_kartspeedometer.value ? 16 : 0);
|
||||||
|
|
||||||
|
while ((suggest = M_FindEmote(complete, complete_len, skip)) != NULL)
|
||||||
|
{
|
||||||
|
V_DrawFillConsoleMap(chatx + boxw + pm_offset + 2, suggesty - (7*skip), emote_suggest_boxw, 6, V_SNAPTOBOTTOM|V_SNAPTOLEFT);
|
||||||
|
|
||||||
|
// Highlight currently suggested emote
|
||||||
|
int hlflag = 0;
|
||||||
|
if (skip == emote_autocomplete.skip && emote_autocomplete.complete[0])
|
||||||
|
hlflag = V_YELLOWMAP;
|
||||||
|
|
||||||
|
V_DrawSmallString(chatx + boxw + pm_offset + 4 + EMOTEWIDTH, suggesty - (7*skip), hlflag|V_SNAPTOBOTTOM|V_SNAPTOLEFT|V_ALLOWLOWERCASE, va(":%s:", suggest->name));
|
||||||
|
M_DrawEmote(chatx + boxw + pm_offset + 2, suggesty - skip*7, suggest, V_SNAPTOBOTTOM|V_SNAPTOLEFT);
|
||||||
|
|
||||||
|
++skip;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
HU_drawChatLog(typelines - 1); // typelines is the # of lines we're typing. If there's more than 1 then the log should scroll up to give us more space.
|
HU_drawChatLog(typelines - 1); // typelines is the # of lines we're typing. If there's more than 1 then the log should scroll up to give us more space.
|
||||||
|
|||||||
@@ -42,15 +42,6 @@
|
|||||||
#define CRED_FONTEND 'Z' // the last font character
|
#define CRED_FONTEND 'Z' // the last font character
|
||||||
#define CRED_FONTSIZE (CRED_FONTEND - CRED_FONTSTART + 1)
|
#define CRED_FONTSIZE (CRED_FONTEND - CRED_FONTSTART + 1)
|
||||||
|
|
||||||
extern char *shiftxform; // english translation shift table
|
|
||||||
extern char english_shiftxform[];
|
|
||||||
|
|
||||||
extern char french_shiftxform[];
|
|
||||||
extern char french_altgrxform[];
|
|
||||||
|
|
||||||
//fallback for special letter non displayable in the game (i.e.: 'é','à',etc.)
|
|
||||||
INT32 HU_FallBackFrSpecialLetter(INT32 key);
|
|
||||||
|
|
||||||
//------------------------------------
|
//------------------------------------
|
||||||
// sorted player lines
|
// sorted player lines
|
||||||
//------------------------------------
|
//------------------------------------
|
||||||
@@ -68,12 +59,7 @@ typedef struct
|
|||||||
#define HU_MAXMSGLEN 223
|
#define HU_MAXMSGLEN 223
|
||||||
#define HU_MSGBUFSIZE 255
|
#define HU_MSGBUFSIZE 255
|
||||||
#define MAX_CHAT_BUFSIZE 256 // that's enough messages, right? We'll delete the older ones when that gets out of hand.
|
#define MAX_CHAT_BUFSIZE 256 // that's enough messages, right? We'll delete the older ones when that gets out of hand.
|
||||||
#define NETSPLITSCREEN // why the hell WOULDN'T we want this?
|
|
||||||
#ifdef NETSPLITSCREEN
|
|
||||||
#define OLDCHAT (cv_consolechat.value == 1 || dedicated || vid.width < 640)
|
#define OLDCHAT (cv_consolechat.value == 1 || dedicated || vid.width < 640)
|
||||||
#else
|
|
||||||
#define OLDCHAT (cv_consolechat.value == 1 || dedicated || vid.width < 640)
|
|
||||||
#endif
|
|
||||||
#define CHAT_MUTE (cv_mute.value && !(server || IsPlayerAdmin(consoleplayer))) // this still allows to open the chat but not to type. That's used for scrolling and whatnot.
|
#define CHAT_MUTE (cv_mute.value && !(server || IsPlayerAdmin(consoleplayer))) // this still allows to open the chat but not to type. That's used for scrolling and whatnot.
|
||||||
#define OLD_MUTE (OLDCHAT && cv_mute.value && !(server || IsPlayerAdmin(consoleplayer))) // this is used to prevent oldchat from opening when muted.
|
#define OLD_MUTE (OLDCHAT && cv_mute.value && !(server || IsPlayerAdmin(consoleplayer))) // this is used to prevent oldchat from opening when muted.
|
||||||
|
|
||||||
@@ -110,8 +96,6 @@ void HU_LoadGraphics(void);
|
|||||||
// reset heads up when consoleplayer respawns.
|
// reset heads up when consoleplayer respawns.
|
||||||
void HU_Start(void);
|
void HU_Start(void);
|
||||||
|
|
||||||
void HU_Shiftform(void);
|
|
||||||
|
|
||||||
boolean HU_Responder(event_t *ev);
|
boolean HU_Responder(event_t *ev);
|
||||||
void HU_Ticker(void);
|
void HU_Ticker(void);
|
||||||
void HU_TickSongCredits(void);
|
void HU_TickSongCredits(void);
|
||||||
@@ -120,8 +104,6 @@ void HU_Drawer(void);
|
|||||||
char HU_dequeueChatChar(void);
|
char HU_dequeueChatChar(void);
|
||||||
void HU_clearChatChars(void);
|
void HU_clearChatChars(void);
|
||||||
void HU_drawPlayerPing(INT32 x, INT32 y, INT32 pnum, INT32 flags); // Lat': Ping drawer for scoreboard.
|
void HU_drawPlayerPing(INT32 x, INT32 y, INT32 pnum, INT32 flags); // Lat': Ping drawer for scoreboard.
|
||||||
//void HU_DrawTeamTabRankings(playersort_t *tab, INT32 whiteplayer);
|
|
||||||
//void HU_DrawDualTabRankings(INT32 x, INT32 y, playersort_t *tab, INT32 scorelines, INT32 whiteplayer);
|
|
||||||
void HU_DrawTabRankings(INT32 x, INT32 y, playersort_t *tab, INT32 scorelines, INT32 hilicol);
|
void HU_DrawTabRankings(INT32 x, INT32 y, playersort_t *tab, INT32 scorelines, INT32 hilicol);
|
||||||
void HU_DrawEmeralds(INT32 x, INT32 y, INT32 pemeralds);
|
void HU_DrawEmeralds(INT32 x, INT32 y, INT32 pemeralds);
|
||||||
const char *HU_SkinColorToConsoleColor(skincolors_t color);
|
const char *HU_SkinColorToConsoleColor(skincolors_t color);
|
||||||
|
|||||||
@@ -44,9 +44,6 @@ extern "C" {
|
|||||||
|
|
||||||
struct JoyType_s
|
struct JoyType_s
|
||||||
{
|
{
|
||||||
/*! if true, we MUST Poll() to get new joystick data,
|
|
||||||
that is: we NEED the DIRECTINPUTDEVICE2 ! (watchout NT compatibility) */
|
|
||||||
INT32 bJoyNeedPoll;
|
|
||||||
/*! this joystick is a gamepad, read: digital axes
|
/*! this joystick is a gamepad, read: digital axes
|
||||||
if FALSE, interpret the joystick event data as JOYAXISRANGE (see above) */
|
if FALSE, interpret the joystick event data as JOYAXISRANGE (see above) */
|
||||||
INT32 bGamepadStyle;
|
INT32 bGamepadStyle;
|
||||||
|
|||||||
+14
-1
@@ -29,6 +29,10 @@ extern "C" {
|
|||||||
*/
|
*/
|
||||||
#define MAX_QUIT_FUNCS 16
|
#define MAX_QUIT_FUNCS 16
|
||||||
|
|
||||||
|
void I_GetConsoleEvents(void);
|
||||||
|
|
||||||
|
extern boolean consolevent;
|
||||||
|
extern boolean framebuffer;
|
||||||
|
|
||||||
/** \brief Graphic system had started up
|
/** \brief Graphic system had started up
|
||||||
*/
|
*/
|
||||||
@@ -39,7 +43,7 @@ extern UINT8 graphics_started;
|
|||||||
extern UINT8 keyboard_started;
|
extern UINT8 keyboard_started;
|
||||||
|
|
||||||
/** \brief Set to true when inside a signal handler that will exit the program. */
|
/** \brief Set to true when inside a signal handler that will exit the program. */
|
||||||
extern boolean g_in_exiting_signal_handler;
|
boolean I_In_Exiting_Signal_Handler(void);
|
||||||
|
|
||||||
/** \brief The I_GetFreeMem function
|
/** \brief The I_GetFreeMem function
|
||||||
|
|
||||||
@@ -144,6 +148,11 @@ extern INT32 numcontrollers;
|
|||||||
*/
|
*/
|
||||||
const char *I_GetJoyName(INT32 joyindex);
|
const char *I_GetJoyName(INT32 joyindex);
|
||||||
|
|
||||||
|
void I_SetJoystickFocus(void);
|
||||||
|
|
||||||
|
boolean I_GamepadHasLED(INT32 playernum);
|
||||||
|
boolean I_GamepadHasRumble(INT32 playernum);
|
||||||
|
|
||||||
void I_GamepadRumble(INT32 playernum, UINT16 low_strength, UINT16 high_strength, UINT32 duration);
|
void I_GamepadRumble(INT32 playernum, UINT16 low_strength, UINT16 high_strength, UINT32 duration);
|
||||||
void I_SetGamepadIndicatorColor(INT32 playernum, UINT8 red, UINT8 green, UINT8 blue);
|
void I_SetGamepadIndicatorColor(INT32 playernum, UINT8 red, UINT8 green, UINT8 blue);
|
||||||
|
|
||||||
@@ -191,6 +200,10 @@ INT32 I_StartupSystem(void);
|
|||||||
*/
|
*/
|
||||||
void I_ShutdownSystem(void);
|
void I_ShutdownSystem(void);
|
||||||
|
|
||||||
|
/** \brief To check if a Interrupt or Terminate Signal was fired
|
||||||
|
*/
|
||||||
|
boolean I_Interrupted(void);
|
||||||
|
|
||||||
/** \brief The I_GetDiskFreeSpace function
|
/** \brief The I_GetDiskFreeSpace function
|
||||||
|
|
||||||
\param freespace a INT64 pointer to hold the free space amount
|
\param freespace a INT64 pointer to hold the free space amount
|
||||||
|
|||||||
+16
-17
@@ -392,6 +392,9 @@ static const char *SOCK_GetNodeAddress(INT32 node)
|
|||||||
if (node == 0)
|
if (node == 0)
|
||||||
return "self";
|
return "self";
|
||||||
|
|
||||||
|
if (node < 0 || node > MAXNETNODES)
|
||||||
|
return NULL;
|
||||||
|
|
||||||
if (!nodeconnected[node])
|
if (!nodeconnected[node])
|
||||||
return NULL;
|
return NULL;
|
||||||
|
|
||||||
@@ -496,8 +499,10 @@ static void cleanupnodes(void)
|
|||||||
|
|
||||||
// Why can't I start at zero?
|
// Why can't I start at zero?
|
||||||
for (j = 1; j < MAXNETNODES; j++)
|
for (j = 1; j < MAXNETNODES; j++)
|
||||||
|
{
|
||||||
if (!(nodeingame[j] || SV_SendingFile(j)))
|
if (!(nodeingame[j] || SV_SendingFile(j)))
|
||||||
nodeconnected[j] = false;
|
nodeconnected[j] = false;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
static SINT8 getfreenode(void)
|
static SINT8 getfreenode(void)
|
||||||
@@ -507,11 +512,13 @@ static SINT8 getfreenode(void)
|
|||||||
cleanupnodes();
|
cleanupnodes();
|
||||||
|
|
||||||
for (j = 0; j < MAXNETNODES; j++)
|
for (j = 0; j < MAXNETNODES; j++)
|
||||||
|
{
|
||||||
if (!nodeconnected[j])
|
if (!nodeconnected[j])
|
||||||
{
|
{
|
||||||
nodeconnected[j] = true;
|
nodeconnected[j] = true;
|
||||||
return j;
|
return j;
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
|
||||||
/** \warning No free node? Just in case a node might not have been freed properly,
|
/** \warning No free node? Just in case a node might not have been freed properly,
|
||||||
* look if there are connected nodes that aren't in game, and forget them.
|
* look if there are connected nodes that aren't in game, and forget them.
|
||||||
@@ -812,7 +819,7 @@ static void SOCK_Send(void)
|
|||||||
static void SOCK_FreeNodenum(INT32 numnode)
|
static void SOCK_FreeNodenum(INT32 numnode)
|
||||||
{
|
{
|
||||||
// can't disconnect from self :)
|
// can't disconnect from self :)
|
||||||
if (!numnode || numnode > MAXNETNODES)
|
if (numnode <= 0 || numnode > MAXNETNODES)
|
||||||
return;
|
return;
|
||||||
|
|
||||||
DEBFILE(va("Free node %d (%s)\n", numnode, SOCK_GetNodeAddress(numnode)));
|
DEBFILE(va("Free node %d (%s)\n", numnode, SOCK_GetNodeAddress(numnode)));
|
||||||
@@ -1432,14 +1439,12 @@ static void SOCK_RegisterHolePunch(void)
|
|||||||
|
|
||||||
static boolean SOCK_OpenSocket(void)
|
static boolean SOCK_OpenSocket(void)
|
||||||
{
|
{
|
||||||
size_t i;
|
memset(clientaddress, 0, sizeof(clientaddress));
|
||||||
|
|
||||||
memset(clientaddress, 0, sizeof (clientaddress));
|
|
||||||
|
|
||||||
|
memset(nodeconnected, false, sizeof(nodeconnected));
|
||||||
nodeconnected[0] = true; // always connected to self
|
nodeconnected[0] = true; // always connected to self
|
||||||
for (i = 1; i < MAXNETNODES; i++)
|
|
||||||
nodeconnected[i] = false;
|
|
||||||
nodeconnected[BROADCASTADDR] = true;
|
nodeconnected[BROADCASTADDR] = true;
|
||||||
|
|
||||||
I_NetSend = SOCK_Send;
|
I_NetSend = SOCK_Send;
|
||||||
I_NetGet = SOCK_Get;
|
I_NetGet = SOCK_Get;
|
||||||
I_NetCloseSocket = SOCK_CloseSocket;
|
I_NetCloseSocket = SOCK_CloseSocket;
|
||||||
@@ -1479,7 +1484,7 @@ static boolean SOCK_Ban(INT32 node)
|
|||||||
{
|
{
|
||||||
INT32 ban;
|
INT32 ban;
|
||||||
|
|
||||||
if (node > MAXNETNODES)
|
if (node < 0 || node > MAXNETNODES)
|
||||||
return false;
|
return false;
|
||||||
|
|
||||||
ban = numbans;
|
ban = numbans;
|
||||||
@@ -1510,11 +1515,8 @@ static boolean SOCK_SetBanUsername(const char *username)
|
|||||||
username = "Direct IP ban";
|
username = "Direct IP ban";
|
||||||
}
|
}
|
||||||
|
|
||||||
if (banned[numbans - 1].username)
|
Z_Free(banned[numbans - 1].username);
|
||||||
{
|
banned[numbans - 1].username = NULL;
|
||||||
Z_Free(banned[numbans - 1].username);
|
|
||||||
banned[numbans - 1].username = NULL;
|
|
||||||
}
|
|
||||||
|
|
||||||
banned[numbans - 1].username = Z_StrDup(username);
|
banned[numbans - 1].username = Z_StrDup(username);
|
||||||
|
|
||||||
@@ -1528,11 +1530,8 @@ static boolean SOCK_SetBanReason(const char *reason)
|
|||||||
reason = "No reason given";
|
reason = "No reason given";
|
||||||
}
|
}
|
||||||
|
|
||||||
if (banned[numbans - 1].reason)
|
Z_Free(banned[numbans - 1].reason);
|
||||||
{
|
banned[numbans - 1].reason = NULL;
|
||||||
Z_Free(banned[numbans - 1].reason);
|
|
||||||
banned[numbans - 1].reason = NULL;
|
|
||||||
}
|
|
||||||
|
|
||||||
banned[numbans - 1].reason = Z_StrDup(reason);
|
banned[numbans - 1].reason = Z_StrDup(reason);
|
||||||
|
|
||||||
|
|||||||
+1
-1
@@ -21,7 +21,7 @@
|
|||||||
#include "m_fixed.h"
|
#include "m_fixed.h"
|
||||||
#include "i_system.h"
|
#include "i_system.h"
|
||||||
|
|
||||||
timestate_t g_time;
|
timestate_t g_time = {};
|
||||||
|
|
||||||
static CV_PossibleValue_t timescale_cons_t[] = {{FRACUNIT/20, "MIN"}, {20*FRACUNIT, "MAX"}, {0, NULL}};
|
static CV_PossibleValue_t timescale_cons_t[] = {{FRACUNIT/20, "MIN"}, {20*FRACUNIT, "MAX"}, {0, NULL}};
|
||||||
consvar_t cv_timescale = {"timescale", "1.0", CV_NETVAR|CV_CHEAT|CV_FLOAT, timescale_cons_t, NULL, FRACUNIT, NULL, NULL, 0, 0, NULL};
|
consvar_t cv_timescale = {"timescale", "1.0", CV_NETVAR|CV_CHEAT|CV_FLOAT, timescale_cons_t, NULL, FRACUNIT, NULL, NULL, 0, 0, NULL};
|
||||||
|
|||||||
+9
-2
@@ -125,8 +125,6 @@ boolean I_CheckNativeRes(void);
|
|||||||
|
|
||||||
void I_SetBorderlessWindow(void);
|
void I_SetBorderlessWindow(void);
|
||||||
|
|
||||||
void I_HandleControllerHatRepeat(void);
|
|
||||||
|
|
||||||
#ifdef USE_FBO_OGL
|
#ifdef USE_FBO_OGL
|
||||||
|
|
||||||
void RefreshOGLSDLSurface(void);
|
void RefreshOGLSDLSurface(void);
|
||||||
@@ -135,6 +133,15 @@ boolean UseScreenFBO(void);
|
|||||||
extern boolean downsample;
|
extern boolean downsample;
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
// So we can call this from i_video event loop
|
||||||
|
void I_ShutdownJoystick(UINT8 index);
|
||||||
|
|
||||||
|
// Quick thing to make SDL_JOYDEVICEADDED events less of an abomination
|
||||||
|
void I_UpdateJoystickDeviceIndex(UINT8 player);
|
||||||
|
void I_UpdateJoystickDeviceIndices(UINT8 excludePlayer);
|
||||||
|
|
||||||
|
void I_HandleControllerHatRepeat(void);
|
||||||
|
|
||||||
#ifdef __cplusplus
|
#ifdef __cplusplus
|
||||||
} // extern "C"
|
} // extern "C"
|
||||||
#endif
|
#endif
|
||||||
|
|||||||
@@ -446,6 +446,12 @@ void K_UpdateDirector(void)
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// not sure if we should just stop here?
|
||||||
|
if (targetposition == MAXPLAYERS)
|
||||||
|
{
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
|
||||||
target = directorinfo.sortedplayers[targetposition];
|
target = directorinfo.sortedplayers[targetposition];
|
||||||
|
|
||||||
// stop here since we're already viewing this player
|
// stop here since we're already viewing this player
|
||||||
|
|||||||
+136
-154
@@ -83,6 +83,7 @@ IMPL_HUD_OFFSET(stat); // Stats
|
|||||||
|
|
||||||
// extra hud things
|
// extra hud things
|
||||||
consvar_t cv_showstats = {"showstats", "Off", CV_SAVE, CV_OnOff, NULL, 0, NULL, NULL, 0, 0, NULL};
|
consvar_t cv_showstats = {"showstats", "Off", CV_SAVE, CV_OnOff, NULL, 0, NULL, NULL, 0, 0, NULL};
|
||||||
|
consvar_t cv_showstats_skinname = {"showstats_skinname", "On", CV_SAVE, CV_OnOff, NULL, 0, NULL, NULL, 0, 0, NULL};
|
||||||
|
|
||||||
consvar_t cv_highresportrait = {"highresportrait", "Off", CV_SAVE, CV_OnOff, NULL, 0, NULL, NULL, 0, 0, NULL}; // make char potraits use their high-res version instead
|
consvar_t cv_highresportrait = {"highresportrait", "Off", CV_SAVE, CV_OnOff, NULL, 0, NULL, NULL, 0, 0, NULL}; // make char potraits use their high-res version instead
|
||||||
|
|
||||||
@@ -92,6 +93,7 @@ consvar_t cv_showinput = {"showinput", "Off", CV_SAVE, inputdisplay_cons_t, NULL
|
|||||||
static CV_PossibleValue_t minihead_cons_t[] = {{0, "Off"}, {1, "On"}, {2, "Others"}, {0, NULL}};
|
static CV_PossibleValue_t minihead_cons_t[] = {{0, "Off"}, {1, "On"}, {2, "Others"}, {0, NULL}};
|
||||||
consvar_t cv_minihead = {"smallminimapplayers", "Off", CV_SAVE, minihead_cons_t, NULL, 0, NULL, NULL, 0, 0, NULL};
|
consvar_t cv_minihead = {"smallminimapplayers", "Off", CV_SAVE, minihead_cons_t, NULL, 0, NULL, NULL, 0, 0, NULL};
|
||||||
consvar_t cv_showminimapnames = {"showminimapnames", "Off", CV_SAVE, CV_OnOff, NULL, 0, NULL, NULL, 0, 0, NULL};
|
consvar_t cv_showminimapnames = {"showminimapnames", "Off", CV_SAVE, CV_OnOff, NULL, 0, NULL, NULL, 0, 0, NULL};
|
||||||
|
consvar_t cv_showminimapfinished = {"showminimapfinished", "On", CV_SAVE, CV_OnOff, NULL, 0, NULL, NULL, 0, 0, NULL};
|
||||||
|
|
||||||
CV_PossibleValue_t minimapdot_cons_t[NUMMINIMAPDOTSTUFF];
|
CV_PossibleValue_t minimapdot_cons_t[NUMMINIMAPDOTSTUFF];
|
||||||
consvar_t cv_showminimapangle = {"showminimapangle", "Off", CV_SAVE, minimapdot_cons_t, NULL, 0, NULL, NULL, 0, 0, NULL};
|
consvar_t cv_showminimapangle = {"showminimapangle", "Off", CV_SAVE, minimapdot_cons_t, NULL, 0, NULL, NULL, 0, 0, NULL};
|
||||||
@@ -207,6 +209,7 @@ void K_RegisterKartHudStuff(void)
|
|||||||
CV_RegisterVar(&cv_kartspeedometer);
|
CV_RegisterVar(&cv_kartspeedometer);
|
||||||
|
|
||||||
CV_RegisterVar(&cv_showstats);
|
CV_RegisterVar(&cv_showstats);
|
||||||
|
CV_RegisterVar(&cv_showstats_skinname);
|
||||||
CV_RegisterVar(&cv_showinput);
|
CV_RegisterVar(&cv_showinput);
|
||||||
|
|
||||||
CV_RegisterVar(&cv_posanim);
|
CV_RegisterVar(&cv_posanim);
|
||||||
@@ -221,6 +224,7 @@ void K_RegisterKartHudStuff(void)
|
|||||||
|
|
||||||
CV_RegisterVar(&cv_minihead);
|
CV_RegisterVar(&cv_minihead);
|
||||||
CV_RegisterVar(&cv_showminimapnames);
|
CV_RegisterVar(&cv_showminimapnames);
|
||||||
|
CV_RegisterVar(&cv_showminimapfinished);
|
||||||
CV_RegisterVar(&cv_showminimapangle);
|
CV_RegisterVar(&cv_showminimapangle);
|
||||||
|
|
||||||
CV_RegisterVar(&cv_showlapemblem);
|
CV_RegisterVar(&cv_showlapemblem);
|
||||||
@@ -270,7 +274,6 @@ void K_RegisterKartHudStuff(void)
|
|||||||
|
|
||||||
// Smol speedo
|
// Smol speedo
|
||||||
static patch_t *skp_smallsticker = NULL;
|
static patch_t *skp_smallsticker = NULL;
|
||||||
static patch_t *skp_smallsticker3 = NULL;
|
|
||||||
|
|
||||||
static patch_t *skp_speedpatches[5] = {NULL};
|
static patch_t *skp_speedpatches[5] = {NULL};
|
||||||
|
|
||||||
@@ -308,7 +311,6 @@ static patch_t *kp_bumperstickerwideclr = NULL;
|
|||||||
static patch_t *kp_karmastickerclr = NULL;
|
static patch_t *kp_karmastickerclr = NULL;
|
||||||
static patch_t *kp_timeoutstickerclr = NULL;
|
static patch_t *kp_timeoutstickerclr = NULL;
|
||||||
static patch_t *skp_smallstickerclr = NULL;
|
static patch_t *skp_smallstickerclr = NULL;
|
||||||
static patch_t *skp_smallstickerclr3 = NULL;
|
|
||||||
static patch_t *kp_itemmulstickerclr[2] = {NULL};
|
static patch_t *kp_itemmulstickerclr[2] = {NULL};
|
||||||
static patch_t *kp_itembgclr[4] = {NULL};
|
static patch_t *kp_itembgclr[4] = {NULL};
|
||||||
|
|
||||||
@@ -474,11 +476,6 @@ static void K_LoadSaturnHUDGraphics(void)
|
|||||||
skp_smallstickerclr = (patch_t *)W_CachePatchName("SC_SMSTC", PU_HUDGFX);
|
skp_smallstickerclr = (patch_t *)W_CachePatchName("SC_SMSTC", PU_HUDGFX);
|
||||||
}
|
}
|
||||||
|
|
||||||
if (xtra_speedo_clr3)
|
|
||||||
{
|
|
||||||
skp_smallstickerclr3 = (patch_t *)W_CachePatchName("SC_SM3TC", PU_HUDGFX);
|
|
||||||
}
|
|
||||||
|
|
||||||
if (achi_speedo_clr)
|
if (achi_speedo_clr)
|
||||||
{
|
{
|
||||||
skp_smallstickerachiclr = (patch_t *)W_CachePatchName("SC_AMSTC", PU_HUDGFX);
|
skp_smallstickerachiclr = (patch_t *)W_CachePatchName("SC_AMSTC", PU_HUDGFX);
|
||||||
@@ -533,14 +530,6 @@ static void K_LoadSaturnHUDGraphics(void)
|
|||||||
kp_itemmulstickerclr[0] = (patch_t *)W_CachePatchName("K_ITMULC", PU_HUDGFX);
|
kp_itemmulstickerclr[0] = (patch_t *)W_CachePatchName("K_ITMULC", PU_HUDGFX);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if (found_extra3_kart)
|
|
||||||
{
|
|
||||||
if (xtra_speedo3) // 80x11 patch scaled to size
|
|
||||||
{
|
|
||||||
skp_smallsticker3 = (patch_t *)W_CachePatchName("SP_SM3TC", PU_HUDGFX);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
// -- Kart patches --
|
// -- Kart patches --
|
||||||
@@ -568,7 +557,7 @@ static patch_t *kp_racefinish[6];
|
|||||||
static patch_t *kp_positionnum[NUMPOSNUMS][NUMPOSFRAMES];
|
static patch_t *kp_positionnum[NUMPOSNUMS][NUMPOSFRAMES];
|
||||||
static patch_t *kp_winnernum[NUMPOSFRAMES];
|
static patch_t *kp_winnernum[NUMPOSFRAMES];
|
||||||
|
|
||||||
patch_t *kp_facenum[MAXPLAYERS+1];
|
patch_t *kp_facenum[MAXPLAYERS+1] = {};
|
||||||
static patch_t *kp_facehighlight[8];
|
static patch_t *kp_facehighlight[8];
|
||||||
|
|
||||||
static patch_t *kp_rankbumper;
|
static patch_t *kp_rankbumper;
|
||||||
@@ -875,7 +864,7 @@ void K_LoadKartHUDGraphics(void)
|
|||||||
|
|
||||||
kp_yougotem = (patch_t *)W_CachePatchName("YOUGOTEM", PU_HUDGFX);
|
kp_yougotem = (patch_t *)W_CachePatchName("YOUGOTEM", PU_HUDGFX);
|
||||||
|
|
||||||
if (found_extra_kart || found_extra2_kart || found_extra3_kart)
|
if (found_extra_kart || found_extra2_kart)
|
||||||
K_LoadSaturnHUDGraphics();
|
K_LoadSaturnHUDGraphics();
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -931,21 +920,21 @@ const char *K_GetItemPatch(UINT8 item, boolean tiny)
|
|||||||
|
|
||||||
//}
|
//}
|
||||||
|
|
||||||
INT32 ITEM_X, ITEM_Y; // Item Window
|
static INT32 ITEM_X, ITEM_Y; // Item Window
|
||||||
INT32 TIME_X, TIME_Y; // Time Sticker
|
static INT32 TIME_X, TIME_Y; // Time Sticker
|
||||||
INT32 LAPS_X, LAPS_Y; // Lap Sticker
|
static INT32 LAPS_X, LAPS_Y; // Lap Sticker
|
||||||
INT32 SPDM_X, SPDM_Y; // Speedometer
|
static INT32 SPDM_X, SPDM_Y; // Speedometer
|
||||||
INT32 POSI_X, POSI_Y; // Position Number
|
static INT32 POSI_X, POSI_Y; // Position Number
|
||||||
INT32 FACE_X, FACE_Y; // Top-four Faces
|
static INT32 FACE_X, FACE_Y; // Top-four Faces
|
||||||
INT32 STCD_X, STCD_Y; // Starting countdown
|
static INT32 STCD_X, STCD_Y; // Starting countdown
|
||||||
INT32 CHEK_Y; // CHECK graphic
|
static INT32 CHEK_Y; // CHECK graphic
|
||||||
INT32 MINI_X, MINI_Y; // Minimap
|
static INT32 MINI_X, MINI_Y; // Minimap
|
||||||
INT32 WANT_X, WANT_Y; // Battle WANTED poster
|
static INT32 WANT_X, WANT_Y; // Battle WANTED poster
|
||||||
|
|
||||||
// This is for the P2 and P4 side of splitscreen. Then we'll flip P1's and P2's to the bottom with V_SPLITSCREEN.
|
// This is for the P2 and P4 side of splitscreen. Then we'll flip P1's and P2's to the bottom with V_SPLITSCREEN.
|
||||||
INT32 ITEM2_X, ITEM2_Y;
|
static INT32 ITEM2_X, ITEM2_Y;
|
||||||
INT32 LAPS2_X, LAPS2_Y;
|
static INT32 LAPS2_X, LAPS2_Y;
|
||||||
INT32 POSI2_X, POSI2_Y;
|
static INT32 POSI2_X, POSI2_Y;
|
||||||
|
|
||||||
static void K_initKartHUD(void)
|
static void K_initKartHUD(void)
|
||||||
{
|
{
|
||||||
@@ -1065,7 +1054,7 @@ static void K_initKartHUD(void)
|
|||||||
}
|
}
|
||||||
|
|
||||||
if (timeinmap > 113 || forceshowhud)
|
if (timeinmap > 113 || forceshowhud)
|
||||||
hudtrans = cv_translucenthud.value;
|
hudtrans = (UINT8)cv_translucenthud.value;
|
||||||
else if (timeinmap > 105)
|
else if (timeinmap > 105)
|
||||||
hudtrans = ((((INT32)timeinmap) - 105)*cv_translucenthud.value)/(113-105);
|
hudtrans = ((((INT32)timeinmap) - 105)*cv_translucenthud.value)/(113-105);
|
||||||
else
|
else
|
||||||
@@ -1122,9 +1111,9 @@ void K_KartPlayerHUDUpdate(player_t *player)
|
|||||||
UINT8 K_GetHudColor(void)
|
UINT8 K_GetHudColor(void)
|
||||||
{
|
{
|
||||||
if (cv_colorizedhud.value && cv_colorizedhudcolor.value)
|
if (cv_colorizedhud.value && cv_colorizedhudcolor.value)
|
||||||
return cv_colorizedhudcolor.value;
|
return (UINT8)cv_colorizedhudcolor.value;
|
||||||
|
|
||||||
return ((stplyr && gamestate == GS_LEVEL) ? stplyr->skincolor : cv_playercolor.value);
|
return ((stplyr && gamestate == GS_LEVEL) ? stplyr->skincolor : (UINT8)cv_playercolor.value);
|
||||||
}
|
}
|
||||||
|
|
||||||
boolean K_UseColorHud(void)
|
boolean K_UseColorHud(void)
|
||||||
@@ -1145,7 +1134,6 @@ enum
|
|||||||
SPEEDO_DIAL,
|
SPEEDO_DIAL,
|
||||||
SPEEDO_PMETER,
|
SPEEDO_PMETER,
|
||||||
SPEEDO_PMETERSMOL,
|
SPEEDO_PMETERSMOL,
|
||||||
SPEEDO_EXTRA3,
|
|
||||||
};
|
};
|
||||||
|
|
||||||
static SINT8 K_GetSpeedometerStyle(void)
|
static SINT8 K_GetSpeedometerStyle(void)
|
||||||
@@ -1160,8 +1148,6 @@ static SINT8 K_GetSpeedometerStyle(void)
|
|||||||
return SPEEDO_PMETER;
|
return SPEEDO_PMETER;
|
||||||
else if (cv_newspeedometer.value == 6 && kartz_speedo_smol)
|
else if (cv_newspeedometer.value == 6 && kartz_speedo_smol)
|
||||||
return SPEEDO_PMETERSMOL;
|
return SPEEDO_PMETERSMOL;
|
||||||
else if (cv_newspeedometer.value == 7 && xtra_speedo3)
|
|
||||||
return SPEEDO_EXTRA3;
|
|
||||||
else
|
else
|
||||||
return SPEEDO_VANILLA;
|
return SPEEDO_VANILLA;
|
||||||
}
|
}
|
||||||
@@ -1179,8 +1165,6 @@ static boolean K_UseColorSpeedo(int speedostyle)
|
|||||||
return achi_speedo_clr;
|
return achi_speedo_clr;
|
||||||
case SPEEDO_DIAL:
|
case SPEEDO_DIAL:
|
||||||
return dial_speedo_clr;
|
return dial_speedo_clr;
|
||||||
case SPEEDO_EXTRA3:
|
|
||||||
return xtra_speedo_clr3;
|
|
||||||
default:
|
default:
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
@@ -1192,7 +1176,6 @@ enum
|
|||||||
GAUGE_SMALL,
|
GAUGE_SMALL,
|
||||||
GAUGE_BIGNUM,
|
GAUGE_BIGNUM,
|
||||||
GAUGE_NUMONLY,
|
GAUGE_NUMONLY,
|
||||||
GAUGE_EXTRA,
|
|
||||||
};
|
};
|
||||||
|
|
||||||
static SINT8 K_GetDriftgaugeStyle(void)
|
static SINT8 K_GetDriftgaugeStyle(void)
|
||||||
@@ -1205,8 +1188,6 @@ static SINT8 K_GetDriftgaugeStyle(void)
|
|||||||
return GAUGE_SMALL;
|
return GAUGE_SMALL;
|
||||||
else if (cv_driftgaugestyle.value == 3)
|
else if (cv_driftgaugestyle.value == 3)
|
||||||
return GAUGE_BIGNUM;
|
return GAUGE_BIGNUM;
|
||||||
else if (cv_driftgaugestyle.value == 5 && xtra_speedo3)
|
|
||||||
return GAUGE_EXTRA;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
// Fallback
|
// Fallback
|
||||||
@@ -1358,10 +1339,12 @@ INT32 K_getMinimapTrans(void)
|
|||||||
return -1;
|
return -1;
|
||||||
|
|
||||||
if (timeinmap <= 113)
|
if (timeinmap <= 113)
|
||||||
|
{
|
||||||
minimaptrans = ((((INT32)timeinmap) - 105)*minimaptrans)/(113-105);
|
minimaptrans = ((((INT32)timeinmap) - 105)*minimaptrans)/(113-105);
|
||||||
|
|
||||||
if (!minimaptrans)
|
if (!minimaptrans)
|
||||||
return -1;
|
return -1;
|
||||||
|
}
|
||||||
|
|
||||||
return (10-minimaptrans)<<FF_TRANSSHIFT;
|
return (10-minimaptrans)<<FF_TRANSSHIFT;
|
||||||
}
|
}
|
||||||
@@ -1403,7 +1386,6 @@ static void K_drawKartStats(void)
|
|||||||
{
|
{
|
||||||
case SPEEDO_EXTRA:
|
case SPEEDO_EXTRA:
|
||||||
case SPEEDO_ACHII:
|
case SPEEDO_ACHII:
|
||||||
case SPEEDO_EXTRA3:
|
|
||||||
spdoffset = -10;
|
spdoffset = -10;
|
||||||
break;
|
break;
|
||||||
case SPEEDO_DIAL:
|
case SPEEDO_DIAL:
|
||||||
@@ -1415,8 +1397,6 @@ static void K_drawKartStats(void)
|
|||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
else
|
|
||||||
spdoffset = 0;
|
|
||||||
|
|
||||||
if (G_BattleGametype() && ((speedostyle != SPEEDO_DIAL) || splitscreen))
|
if (G_BattleGametype() && ((speedostyle != SPEEDO_DIAL) || splitscreen))
|
||||||
spdoffset += ((stplyr->kartstuff[k_bumper] ? -5 : -8));
|
spdoffset += ((stplyr->kartstuff[k_bumper] ? -5 : -8));
|
||||||
@@ -1436,13 +1416,16 @@ static void K_drawKartStats(void)
|
|||||||
fakeskin = K_GetPlayerSkin(stplyr);
|
fakeskin = K_GetPlayerSkin(stplyr);
|
||||||
|
|
||||||
// Skin name
|
// Skin name
|
||||||
if (K_IsHighResolution()) // V_DrawSmallString becomes a mess at low resolutions lel
|
if (cv_showstats_skinname.value)
|
||||||
{
|
{
|
||||||
V_DrawSmallString(x+20, y+12, flags2, fakeskin->realname);
|
if (K_IsHighResolution()) // V_DrawSmallString becomes a mess at low resolutions lel
|
||||||
}
|
{
|
||||||
else
|
V_DrawSmallString(x+20, y+12, flags2, fakeskin->realname);
|
||||||
{
|
}
|
||||||
V_DrawThinString(x+20, y+7, flags2, fakeskin->realname);
|
else
|
||||||
|
{
|
||||||
|
V_DrawThinString(x+20, y+7, flags2, fakeskin->realname);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
// Icon and stats
|
// Icon and stats
|
||||||
@@ -1526,7 +1509,7 @@ static void K_drawKartItem(void)
|
|||||||
{
|
{
|
||||||
localcolor = K_GetHudColor();
|
localcolor = K_GetHudColor();
|
||||||
|
|
||||||
switch((stplyr->kartstuff[k_itemroulette] % (14*3)) / 3)
|
switch ((stplyr->kartstuff[k_itemroulette] % (14*3)) / 3)
|
||||||
{
|
{
|
||||||
// Each case is handled in threes, to give three frames of in-game time to see the item on the roulette
|
// Each case is handled in threes, to give three frames of in-game time to see the item on the roulette
|
||||||
case 0: // Sneaker
|
case 0: // Sneaker
|
||||||
@@ -2096,7 +2079,7 @@ static void K_DrawKartPositionNum(INT32 num)
|
|||||||
fy = POSI_Y;
|
fy = POSI_Y;
|
||||||
fflags = V_SNAPTOLEFT|((stplyrnum == 2) ? V_SPLITSCREEN|V_SNAPTOBOTTOM : 0); // flip P3 to the bottom.
|
fflags = V_SNAPTOLEFT|((stplyrnum == 2) ? V_SPLITSCREEN|V_SNAPTOBOTTOM : 0); // flip P3 to the bottom.
|
||||||
flipdraw = true;
|
flipdraw = true;
|
||||||
if (num && num >= 10)
|
if (num >= 10)
|
||||||
fx += W; // this seems dumb, but we need to do this in order for positions above 10 going off screen.
|
fx += W; // this seems dumb, but we need to do this in order for positions above 10 going off screen.
|
||||||
}
|
}
|
||||||
else // else, that means we're P2 or P4.
|
else // else, that means we're P2 or P4.
|
||||||
@@ -2178,8 +2161,9 @@ static boolean K_drawKartPositionFaces(void)
|
|||||||
UINT8 *colormap;
|
UINT8 *colormap;
|
||||||
|
|
||||||
ranklines = 0;
|
ranklines = 0;
|
||||||
memset(completed, 0, sizeof (completed));
|
|
||||||
memset(rankplayer, 0, sizeof (rankplayer));
|
if (!LUA_HudEnabled(hud_minirankings))
|
||||||
|
return false; // Don't proceed but still return true for free play above if HUD is disabled.
|
||||||
|
|
||||||
for (i = 0; i < MAXPLAYERS; i++)
|
for (i = 0; i < MAXPLAYERS; i++)
|
||||||
{
|
{
|
||||||
@@ -2194,8 +2178,7 @@ static boolean K_drawKartPositionFaces(void)
|
|||||||
if (numplayersingame <= 1)
|
if (numplayersingame <= 1)
|
||||||
return true;
|
return true;
|
||||||
|
|
||||||
if (!LUA_HudEnabled(hud_minirankings))
|
memset(completed, 0, sizeof (completed));
|
||||||
return false; // Don't proceed but still return true for free play above if HUD is disabled.
|
|
||||||
|
|
||||||
for (j = 0; j < numplayersingame; j++)
|
for (j = 0; j < numplayersingame; j++)
|
||||||
{
|
{
|
||||||
@@ -2252,6 +2235,7 @@ static boolean K_drawKartPositionFaces(void)
|
|||||||
|
|
||||||
if (!playeringame[rankplayer[i]])
|
if (!playeringame[rankplayer[i]])
|
||||||
continue;
|
continue;
|
||||||
|
|
||||||
if (player->spectator || !player->mo)
|
if (player->spectator || !player->mo)
|
||||||
continue;
|
continue;
|
||||||
|
|
||||||
@@ -2429,7 +2413,7 @@ void HU_DrawTabRankings(INT32 x, INT32 y, playersort_t *tab, INT32 scorelines, I
|
|||||||
|
|
||||||
static boolean K_BigLap(void)
|
static boolean K_BigLap(void)
|
||||||
{
|
{
|
||||||
return (cv_biglaps.value && (cv_numlaps.value > 9) && (K_UseColorHud() ? big_lap_color : big_lap) && (!stplyr->exiting));
|
return (cv_biglaps.value && (cv_numlaps.value > 9) && !stplyr->exiting && (K_UseColorHud() ? big_lap_color : big_lap));
|
||||||
}
|
}
|
||||||
|
|
||||||
static void K_drawKartLaps(void)
|
static void K_drawKartLaps(void)
|
||||||
@@ -2638,7 +2622,7 @@ static void K_drawKartSpeedometer(void)
|
|||||||
return;
|
return;
|
||||||
|
|
||||||
// index 0 is the raw value, index 1 is the converted value
|
// index 0 is the raw value, index 1 is the converted value
|
||||||
fixed_t convSpeed[2] = {0,0};
|
fixed_t convSpeed[2] = {0, 0};
|
||||||
#ifdef ROTSPRITE
|
#ifdef ROTSPRITE
|
||||||
fixed_t dial_divisor = DIALSPDDIV;
|
fixed_t dial_divisor = DIALSPDDIV;
|
||||||
#endif
|
#endif
|
||||||
@@ -2707,34 +2691,28 @@ static void K_drawKartSpeedometer(void)
|
|||||||
|
|
||||||
V_DrawKartString(SPDM_X, SPDM_Y, V_HUDTRANS|splitflags, metric);
|
V_DrawKartString(SPDM_X, SPDM_Y, V_HUDTRANS|splitflags, metric);
|
||||||
}
|
}
|
||||||
else if (speedostyle == SPEEDO_EXTRA) // why bother if we dont?
|
else if (speedostyle == SPEEDO_EXTRA || speedostyle == SPEEDO_ACHII) // why bother if we dont?
|
||||||
{
|
{
|
||||||
if (K_UseColorSpeedo(SPEEDO_EXTRA)) //Colourized hud
|
patch_t *speedopat;
|
||||||
|
UINT8 *colormap = NULL;
|
||||||
|
|
||||||
|
if (K_UseColorSpeedo(speedostyle)) //Colourized hud
|
||||||
{
|
{
|
||||||
UINT8 *colormap = R_GetTranslationColormap(TC_DEFAULT, K_GetHudColor(), GTC_CACHE);
|
colormap = R_GetTranslationColormap(TC_DEFAULT, K_GetHudColor(), GTC_CACHE);
|
||||||
V_DrawMappedPatch(SPDM_X + 1, SPDM_Y + 4, V_HUDTRANS|splitflags, skp_smallstickerclr, colormap);
|
|
||||||
|
speedopat = ((speedostyle == SPEEDO_EXTRA) ? skp_smallstickerclr : skp_smallstickerachiclr);
|
||||||
|
V_DrawMappedPatch(SPDM_X + 1, SPDM_Y + 4, V_HUDTRANS|splitflags, speedopat, colormap);
|
||||||
|
speedopat = ((speedostyle == SPEEDO_EXTRA) ? skp_speedpatches[cv_kartspeedometer.value] : skp_speedpatchesachiclr[cv_kartspeedometer.value]);
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
V_DrawScaledPatch(SPDM_X + 1, SPDM_Y + 4, V_HUDTRANS|splitflags, skp_smallsticker);
|
{
|
||||||
|
speedopat = ((speedostyle == SPEEDO_EXTRA) ? skp_smallsticker : skp_smallstickerachi);
|
||||||
|
V_DrawScaledPatch(SPDM_X + 1, SPDM_Y + 4, V_HUDTRANS|splitflags, speedopat);
|
||||||
|
speedopat = ((speedostyle == SPEEDO_EXTRA) ? skp_speedpatches[cv_kartspeedometer.value] : skp_speedpatchesachi[cv_kartspeedometer.value]);
|
||||||
|
}
|
||||||
|
|
||||||
V_DrawRankNum(SPDM_X + 26, SPDM_Y + 4, V_HUDTRANS|splitflags, convSpeed[1], 3, NULL);
|
V_DrawRankNum(SPDM_X + 26, SPDM_Y + 4, V_HUDTRANS|splitflags, convSpeed[1], 3, NULL);
|
||||||
V_DrawScaledPatch(SPDM_X + 31, SPDM_Y + 4, V_HUDTRANS|splitflags, skp_speedpatches[cv_kartspeedometer.value]);
|
V_DrawMappedPatch(SPDM_X + 31, SPDM_Y + 4, V_HUDTRANS|splitflags, speedopat, colormap);
|
||||||
}
|
|
||||||
else if (speedostyle == SPEEDO_ACHII) // why bother if we dont?
|
|
||||||
{
|
|
||||||
if (K_UseColorSpeedo(SPEEDO_ACHII)) //Colourized hud
|
|
||||||
{
|
|
||||||
UINT8 *colormap = R_GetTranslationColormap(TC_DEFAULT, K_GetHudColor(), GTC_CACHE);
|
|
||||||
V_DrawMappedPatch(SPDM_X + 1, SPDM_Y + 4, V_HUDTRANS|splitflags, skp_smallstickerachiclr, colormap);
|
|
||||||
V_DrawRankNum(SPDM_X + 26, SPDM_Y + 4, V_HUDTRANS|splitflags, convSpeed[1], 3, NULL);
|
|
||||||
V_DrawMappedPatch(SPDM_X + 31, SPDM_Y + 4, V_HUDTRANS|splitflags, skp_speedpatchesachiclr[cv_kartspeedometer.value], colormap);
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
V_DrawScaledPatch(SPDM_X + 1, SPDM_Y + 4, V_HUDTRANS|splitflags, skp_smallstickerachi);
|
|
||||||
V_DrawRankNum(SPDM_X + 26, SPDM_Y + 4, V_HUDTRANS|splitflags, convSpeed[1], 3, NULL);
|
|
||||||
V_DrawScaledPatch(SPDM_X + 31, SPDM_Y + 4, V_HUDTRANS|splitflags, skp_speedpatchesachi[cv_kartspeedometer.value]);
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
#ifdef ROTSPRITE
|
#ifdef ROTSPRITE
|
||||||
else if (speedostyle == SPEEDO_DIAL) // why bother if we dont?
|
else if (speedostyle == SPEEDO_DIAL) // why bother if we dont?
|
||||||
@@ -2747,46 +2725,36 @@ static void K_drawKartSpeedometer(void)
|
|||||||
(K_UseColorSpeedo(SPEEDO_DIAL)));
|
(K_UseColorSpeedo(SPEEDO_DIAL)));
|
||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
else if (speedostyle == SPEEDO_EXTRA3) // why bother if we dont?
|
|
||||||
{
|
|
||||||
if (K_UseColorSpeedo(SPEEDO_EXTRA3)) //Colourized hud
|
|
||||||
{
|
|
||||||
UINT8 *colormap = R_GetTranslationColormap(TC_DEFAULT, K_GetHudColor(), GTC_CACHE);
|
|
||||||
V_DrawStretchyFixedPatch((SPDM_X-1)<<FRACBITS, (SPDM_Y + 5)<<FRACBITS, XTRA3PSCALE, XTRA3VSCALE, V_HUDTRANS|splitflags, skp_smallstickerclr3, colormap, 0);
|
|
||||||
}
|
|
||||||
else
|
|
||||||
V_DrawStretchyFixedPatch((SPDM_X-1)<<FRACBITS, (SPDM_Y + 5)<<FRACBITS, XTRA3PSCALE, XTRA3VSCALE, V_HUDTRANS|splitflags, skp_smallsticker3, NULL, 0);
|
|
||||||
|
|
||||||
V_DrawRankNum(SPDM_X + 26, SPDM_Y + 4, V_HUDTRANS|splitflags, convSpeed[1], 3, NULL);
|
|
||||||
V_DrawScaledPatch(SPDM_X + 31, SPDM_Y + 4, V_HUDTRANS|splitflags, skp_speedpatches[cv_kartspeedometer.value]);
|
|
||||||
}
|
|
||||||
// Kart Z speedo bullshit...
|
// Kart Z speedo bullshit...
|
||||||
// Draw the Speed counter.
|
// Draw the Speed counter.
|
||||||
else if ((speedostyle == SPEEDO_PMETER) || (speedostyle == SPEEDO_PMETERSMOL))
|
else if ((speedostyle == SPEEDO_PMETER) || (speedostyle == SPEEDO_PMETERSMOL))
|
||||||
{
|
{
|
||||||
fixed_t fuspeed = 0;
|
|
||||||
INT32 spdpatch = 0;
|
INT32 spdpatch = 0;
|
||||||
static const INT32 speedIntervals[22] = {2, 5, 7, 10, 12, 15, 17,
|
static const INT32 spdinterval[22] = { 2, 5, 7, 10,
|
||||||
20, 22, 25, 27, 30, 32,
|
12, 15, 17, 20,
|
||||||
35, 37, 40, 42, 45, 47,
|
22, 25, 27, 30,
|
||||||
50, 52, 55};
|
32, 35, 37, 40,
|
||||||
|
42, 45, 47, 50,
|
||||||
|
52, 55};
|
||||||
|
|
||||||
fuspeed = FixedDiv(stplyr->speed, mapobjectscale)/FRACUNIT;
|
const fixed_t spd = FixedDiv(stplyr->speed, mapobjectscale) / FRACUNIT;
|
||||||
|
|
||||||
for (INT32 i = 0; i < 22; ++i)
|
if (spd > 54)
|
||||||
{
|
{
|
||||||
if (fuspeed < speedIntervals[i])
|
spdpatch = (leveltime & 4) ? 24 : 23;
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
for (INT32 i = 0; i < 22; ++i)
|
||||||
{
|
{
|
||||||
spdpatch = i;
|
if (spd < spdinterval[i])
|
||||||
break;
|
{
|
||||||
|
spdpatch = i;
|
||||||
|
break;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if (((fuspeed < 57 && fuspeed > 54) || (fuspeed < 60 && fuspeed > 56) || (fuspeed > 59)) && (leveltime & 4))
|
|
||||||
spdpatch = 24;
|
|
||||||
else if (((fuspeed < 57 && fuspeed > 54) || (fuspeed < 60 && fuspeed > 56) || (fuspeed > 59)) && !(leveltime & 4))
|
|
||||||
spdpatch = 23;
|
|
||||||
|
|
||||||
V_DrawScaledPatch(SPDM_X, SPDM_Y, V_HUDTRANS|splitflags, (speedostyle == SPEEDO_PMETER) ? kp_kartzspeedo[spdpatch] : kp_kartzspeedo_smol[spdpatch]);
|
V_DrawScaledPatch(SPDM_X, SPDM_Y, V_HUDTRANS|splitflags, (speedostyle == SPEEDO_PMETER) ? kp_kartzspeedo[spdpatch] : kp_kartzspeedo_smol[spdpatch]);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -2814,7 +2782,7 @@ static void K_drawKartBumpersOrKarma(void)
|
|||||||
{
|
{
|
||||||
const UINT8 speedostyle = K_GetSpeedometerStyle();
|
const UINT8 speedostyle = K_GetSpeedometerStyle();
|
||||||
|
|
||||||
if ((speedostyle == SPEEDO_EXTRA) || (speedostyle == SPEEDO_ACHII) || (speedostyle == SPEEDO_EXTRA3))
|
if ((speedostyle == SPEEDO_EXTRA) || (speedostyle == SPEEDO_ACHII))
|
||||||
fy += 5;
|
fy += 5;
|
||||||
else
|
else
|
||||||
fy += 7;
|
fy += 7;
|
||||||
@@ -2906,10 +2874,12 @@ static boolean K_GetScreenCoords(vector2_t *vec, player_t *player, mobj_t *targe
|
|||||||
x = (fixed_t)(viewangle - R_PointToAngle(targx, targy));
|
x = (fixed_t)(viewangle - R_PointToAngle(targx, targy));
|
||||||
|
|
||||||
distfact = FINECOSINE((x>>ANGLETOFINESHIFT) & FINEMASK);
|
distfact = FINECOSINE((x>>ANGLETOFINESHIFT) & FINEMASK);
|
||||||
if (!distfact) distfact = 1;
|
if (!distfact)
|
||||||
|
distfact = 1;
|
||||||
|
|
||||||
if (encoremode)
|
if (encoremode)
|
||||||
x = -x;
|
x = -x;
|
||||||
|
|
||||||
if (x < (fixed_t)ANGLE_270 || x > (fixed_t)ANGLE_90)
|
if (x < (fixed_t)ANGLE_270 || x > (fixed_t)ANGLE_90)
|
||||||
return false;
|
return false;
|
||||||
|
|
||||||
@@ -2991,7 +2961,7 @@ static boolean K_GetScreenCoords(vector2_t *vec, player_t *player, mobj_t *targe
|
|||||||
if (stplyrnum > 0)
|
if (stplyrnum > 0)
|
||||||
y = y + yres;
|
y = y + yres;
|
||||||
}
|
}
|
||||||
if (splitscreen >= 2) // 3P or 4P
|
else if (splitscreen >= 2) // 3P or 4P
|
||||||
{
|
{
|
||||||
x = x>>1;
|
x = x>>1;
|
||||||
y = y>>1;
|
y = y>>1;
|
||||||
@@ -3051,9 +3021,11 @@ static void K_drawNameTags(void)
|
|||||||
if (players[i].kartstuff[k_hyudorotimer]) // player is invisible
|
if (players[i].kartstuff[k_hyudorotimer]) // player is invisible
|
||||||
continue;
|
continue;
|
||||||
if (maxdistance)
|
if (maxdistance)
|
||||||
|
{
|
||||||
distance = R_PointToDist(players[i].mo->x, players[i].mo->y);
|
distance = R_PointToDist(players[i].mo->x, players[i].mo->y);
|
||||||
if (distance > maxdistance)
|
if (distance > maxdistance)
|
||||||
continue;
|
continue;
|
||||||
|
}
|
||||||
if (!P_CheckSightFast(stplyr->mo, players[i].mo))
|
if (!P_CheckSightFast(stplyr->mo, players[i].mo))
|
||||||
continue;
|
continue;
|
||||||
|
|
||||||
@@ -3262,13 +3234,12 @@ static void K_drawDriftGauge(void)
|
|||||||
if (!splitscreen && !camera->chase)
|
if (!splitscreen && !camera->chase)
|
||||||
return;
|
return;
|
||||||
|
|
||||||
if (forceshowhud)
|
// i will skip the drift early return and you cant stop me!
|
||||||
goto skipcrap; // i will skip the drift early return and you cant stop me!
|
if (!forceshowhud)
|
||||||
|
{
|
||||||
if (!stplyr->kartstuff[k_drift])
|
if (!stplyr->kartstuff[k_drift])
|
||||||
return;
|
return;
|
||||||
|
}
|
||||||
skipcrap:
|
|
||||||
|
|
||||||
if (P_MobjWasRemoved(stplyr->mo))
|
if (P_MobjWasRemoved(stplyr->mo))
|
||||||
return;
|
return;
|
||||||
@@ -3293,12 +3264,11 @@ skipcrap:
|
|||||||
{
|
{
|
||||||
case GAUGE_DEFAULT:
|
case GAUGE_DEFAULT:
|
||||||
case GAUGE_SMALL:
|
case GAUGE_SMALL:
|
||||||
case GAUGE_EXTRA:
|
|
||||||
case GAUGE_BIGNUM:
|
case GAUGE_BIGNUM:
|
||||||
{
|
{
|
||||||
patch_t *driftpatch = NULL;
|
patch_t *driftpatch = NULL;
|
||||||
|
|
||||||
if (gaugestyle == GAUGE_DEFAULT || gaugestyle == GAUGE_BIGNUM || gaugestyle == GAUGE_EXTRA)
|
if (gaugestyle == GAUGE_DEFAULT || gaugestyle == GAUGE_BIGNUM)
|
||||||
{
|
{
|
||||||
barx = basex - vid.dup*23;
|
barx = basex - vid.dup*23;
|
||||||
BAR_WIDTH = vid.dup*47;
|
BAR_WIDTH = vid.dup*47;
|
||||||
@@ -3311,30 +3281,15 @@ skipcrap:
|
|||||||
|
|
||||||
bary = basey - vid.dup*2;
|
bary = basey - vid.dup*2;
|
||||||
|
|
||||||
if (gaugestyle == GAUGE_EXTRA) // i hate hud code i hate hud code i hate hud code i hate hud code i hate hud code.....
|
if (K_UseColorHud()) // Colourized hud
|
||||||
{
|
{
|
||||||
if (K_UseColorSpeedo(SPEEDO_EXTRA3)) // We reuse the extra speedometer patch hence this check
|
colormap = R_GetTranslationColormap(TC_DEFAULT, K_GetHudColor(), GTC_CACHE);
|
||||||
{
|
driftpatch = (gaugestyle == GAUGE_SMALL ? driftgaugesmallcolor : driftgaugecolor);
|
||||||
colormap = R_GetTranslationColormap(TC_DEFAULT, K_GetHudColor(), GTC_CACHE);
|
|
||||||
driftpatch = skp_smallstickerclr3;
|
|
||||||
}
|
|
||||||
else
|
|
||||||
driftpatch = skp_smallsticker3;
|
|
||||||
|
|
||||||
V_DrawStretchyFixedPatch((basex - vid.dup*30)<<FRACBITS, ((basey<<FRACBITS) - FixedMul(vid.dup<<FRACBITS, 21*FRACUNIT/10)), XTRA3PSCALE, XTRA3VSCALE, V_NOSCALESTART|V_OFFSET|drifttrans, driftpatch, colormap, 0);
|
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
driftpatch = (gaugestyle == GAUGE_SMALL ? driftgaugesmall : driftgauge);
|
||||||
if (K_UseColorHud()) // Colourized hud
|
|
||||||
{
|
|
||||||
colormap = R_GetTranslationColormap(TC_DEFAULT, K_GetHudColor(), GTC_CACHE);
|
|
||||||
driftpatch = (gaugestyle == GAUGE_SMALL ? driftgaugesmallcolor : driftgaugecolor);
|
|
||||||
}
|
|
||||||
else
|
|
||||||
driftpatch = (gaugestyle == GAUGE_SMALL ? driftgaugesmall : driftgauge);
|
|
||||||
|
|
||||||
V_DrawMappedPatch(gaugestyle == GAUGE_SMALL ? basex + vid.dup*11 : basex, basey, V_NOSCALESTART|V_OFFSET|drifttrans, driftpatch, colormap);
|
V_DrawMappedPatch(gaugestyle == GAUGE_SMALL ? basex + vid.dup*11 : basex, basey, V_NOSCALESTART|V_OFFSET|drifttrans, driftpatch, colormap);
|
||||||
}
|
|
||||||
|
|
||||||
if (driftcharge >= driftval*4) // rainbow sparks
|
if (driftcharge >= driftval*4) // rainbow sparks
|
||||||
{
|
{
|
||||||
@@ -3632,7 +3587,7 @@ static void K_drawKartMinimapHead(mobj_t *mo, INT32 x, INT32 y, INT32 flags)
|
|||||||
V_DrawCenteredSmallStringAtFixed(amxpos + (4*FRACUNIT), amypos - (3*FRACUNIT), V_ALLOWLOWERCASE|flags|V_SkinColorToHighlightcolor(mo->color), player_names[player - players]);
|
V_DrawCenteredSmallStringAtFixed(amxpos + (4*FRACUNIT), amypos - (3*FRACUNIT), V_ALLOWLOWERCASE|flags|V_SkinColorToHighlightcolor(mo->color), player_names[player - players]);
|
||||||
}
|
}
|
||||||
|
|
||||||
const boolean minihead = K_useSmallMinimapHead(mo->player);
|
const boolean minihead = K_useSmallMinimapHead(player);
|
||||||
|
|
||||||
// thx wanted reticle for having weird offsets very cool
|
// thx wanted reticle for having weird offsets very cool
|
||||||
wntdamxpos = minihead ? amxpos + (1<<FRACBITS) : amxpos - (4<<FRACBITS);
|
wntdamxpos = minihead ? amxpos + (1<<FRACBITS) : amxpos - (4<<FRACBITS);
|
||||||
@@ -3774,6 +3729,9 @@ static void K_drawKartMinimap(void)
|
|||||||
if (!players[i].mo || players[i].spectator)
|
if (!players[i].mo || players[i].spectator)
|
||||||
continue;
|
continue;
|
||||||
|
|
||||||
|
if (!cv_showminimapfinished.value && players[i].exiting)
|
||||||
|
continue;
|
||||||
|
|
||||||
if (P_IsDisplayPlayer(&players[i]))
|
if (P_IsDisplayPlayer(&players[i]))
|
||||||
{
|
{
|
||||||
// Draw display players on top of everything else
|
// Draw display players on top of everything else
|
||||||
@@ -3818,7 +3776,7 @@ static void K_drawKartMinimap(void)
|
|||||||
|
|
||||||
if (cv_showminimapangle.value && (minidoticon || minilighticon) && !playertimedout)
|
if (cv_showminimapangle.value && (minidoticon || minilighticon) && !playertimedout)
|
||||||
{
|
{
|
||||||
UINT8 *colormap;
|
UINT8 *colormap = NULL;
|
||||||
drawinfo_t dims;
|
drawinfo_t dims;
|
||||||
fixed_t interpx, interpy;
|
fixed_t interpx, interpy;
|
||||||
fixed_t xoff = 0, yoff = 0;
|
fixed_t xoff = 0, yoff = 0;
|
||||||
@@ -3829,10 +3787,27 @@ static void K_drawKartMinimap(void)
|
|||||||
if (encoremode)
|
if (encoremode)
|
||||||
ang = ANGLE_180 - ang;
|
ang = ANGLE_180 - ang;
|
||||||
|
|
||||||
if (mobj->colorized)
|
if (mobj->color)
|
||||||
colormap = R_GetTranslationColormap(TC_RAINBOW, mobj->color, GTC_CACHE);
|
{
|
||||||
else
|
if (mobj->colorized)
|
||||||
colormap = R_GetLocalTranslationColormap(mobj->skin, mobj->localskin, mobj->color, GTC_CACHE, mobj->skinlocal);
|
{
|
||||||
|
colormap = R_GetTranslationColormap(TC_RAINBOW, mobj->color, GTC_CACHE);
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
const INT32 skinnum = K_GetMobjLocalSkinNum(mobj->skin, mobj->localskin, mobj->skinlocal);
|
||||||
|
|
||||||
|
// special case if startcolor is not the default (160 / Green)
|
||||||
|
if (skinnum && skins[skinnum].starttranscolor != skins[0].starttranscolor)
|
||||||
|
{
|
||||||
|
colormap = R_GetTranslationColormap(TC_DEFAULT, mobj->color, GTC_CACHE);
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
colormap = R_GetLocalTranslationColormap(mobj->skin, mobj->localskin, mobj->color, GTC_CACHE, mobj->skinlocal);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
interpx = lerp(mobj->old_x, mobj->x);
|
interpx = lerp(mobj->old_x, mobj->x);
|
||||||
interpy = lerp(mobj->old_y, mobj->y);
|
interpy = lerp(mobj->old_y, mobj->y);
|
||||||
@@ -3997,6 +3972,7 @@ static void K_drawBattleFullscreen(void)
|
|||||||
{
|
{
|
||||||
if (stplyrnum == 0)
|
if (stplyrnum == 0)
|
||||||
V_DrawFadeScreen(0xFF00, 16);
|
V_DrawFadeScreen(0xFF00, 16);
|
||||||
|
|
||||||
if (stplyr->exiting < 6*TICRATE && !stplyr->spectator)
|
if (stplyr->exiting < 6*TICRATE && !stplyr->spectator)
|
||||||
{
|
{
|
||||||
if (stplyr->kartstuff[k_position] == 1)
|
if (stplyr->kartstuff[k_position] == 1)
|
||||||
@@ -4061,7 +4037,7 @@ static void K_drawBattleFullscreen(void)
|
|||||||
{
|
{
|
||||||
if (i == displayplayers[0])
|
if (i == displayplayers[0])
|
||||||
continue;
|
continue;
|
||||||
if (playeringame[i] && !stplyr->spectator)
|
if (playeringame[i])
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -4312,7 +4288,7 @@ static void K_drawInput(void)
|
|||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
const boolean analogjoystickmove = cv_usejoystick[stplyrnum].value && !Joystick[stplyrnum].bGamepadStyle;
|
const boolean analogjoystickmove = cv_usejoystick[stplyrnum].value && !Joystick[stplyrnum].bGamepadStyle;
|
||||||
const boolean gamepadjoystickmove = cv_usejoystick[stplyrnum].value && Joystick[stplyrnum].bGamepadStyle;
|
const boolean gamepadjoystickmove = cv_usejoystick[stplyrnum].value && Joystick[stplyrnum].bGamepadStyle;
|
||||||
const UINT8 ssplayer = stplyrnum+1;
|
const UINT8 ssplayer = stplyrnum+1;
|
||||||
|
|
||||||
@@ -4329,9 +4305,10 @@ static void K_drawInput(void)
|
|||||||
{
|
{
|
||||||
hudforward += KART_FULLTURN;
|
hudforward += KART_FULLTURN;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (InputDown(gc_aimbackward, ssplayer) || (gamepadjoystickmove && axis > 0))
|
if (InputDown(gc_aimbackward, ssplayer) || (gamepadjoystickmove && axis > 0))
|
||||||
{
|
{
|
||||||
hudforward-= KART_FULLTURN;
|
hudforward -= KART_FULLTURN;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -4417,6 +4394,7 @@ static void K_drawChallengerScreen(void)
|
|||||||
19,20,19,20,19,20,19,20,19,20, // frame 20-21, 1 tic, 5 alternating: all text vibrates from impact
|
19,20,19,20,19,20,19,20,19,20, // frame 20-21, 1 tic, 5 alternating: all text vibrates from impact
|
||||||
21,22,23,24 // frame 22-25, 1 tic: CHALLENGER turns gold
|
21,22,23,24 // frame 22-25, 1 tic: CHALLENGER turns gold
|
||||||
};
|
};
|
||||||
|
|
||||||
const UINT8 offset = min(52-1, (3*TICRATE)-mapreset);
|
const UINT8 offset = min(52-1, (3*TICRATE)-mapreset);
|
||||||
|
|
||||||
V_DrawFadeScreen(0xFF00, 16); // Fade out
|
V_DrawFadeScreen(0xFF00, 16); // Fade out
|
||||||
@@ -4470,7 +4448,7 @@ static void K_drawLapStartAnim(void)
|
|||||||
char *lapnum = va("%02d", stplyr->laps + 1);
|
char *lapnum = va("%02d", stplyr->laps + 1);
|
||||||
const size_t laplength = strlen(lapnum);
|
const size_t laplength = strlen(lapnum);
|
||||||
|
|
||||||
for (int i = 0; i < (int)laplength; i++)
|
for (size_t i = 0; i < laplength; i++)
|
||||||
{
|
{
|
||||||
int digit = lapnum[i] - '0';
|
int digit = lapnum[i] - '0';
|
||||||
int frame = min(2, progress/2 - 8 - (i*2));
|
int frame = min(2, progress/2 - 8 - (i*2));
|
||||||
@@ -4518,6 +4496,7 @@ static void K_drawDistributionDebugger(void)
|
|||||||
kp_orbinaut[4],
|
kp_orbinaut[4],
|
||||||
kp_jawz[1]
|
kp_jawz[1]
|
||||||
};
|
};
|
||||||
|
|
||||||
INT32 useodds = 0;
|
INT32 useodds = 0;
|
||||||
INT32 pingame = 0, bestbumper = 0;
|
INT32 pingame = 0, bestbumper = 0;
|
||||||
INT32 i;
|
INT32 i;
|
||||||
@@ -4534,8 +4513,10 @@ static void K_drawDistributionDebugger(void)
|
|||||||
if (!playeringame[i] || players[i].spectator)
|
if (!playeringame[i] || players[i].spectator)
|
||||||
continue;
|
continue;
|
||||||
pingame++;
|
pingame++;
|
||||||
|
|
||||||
if (players[i].exiting)
|
if (players[i].exiting)
|
||||||
dontforcespb = true;
|
dontforcespb = true;
|
||||||
|
|
||||||
if (players[i].kartstuff[k_bumper] > bestbumper)
|
if (players[i].kartstuff[k_bumper] > bestbumper)
|
||||||
bestbumper = players[i].kartstuff[k_bumper];
|
bestbumper = players[i].kartstuff[k_bumper];
|
||||||
}
|
}
|
||||||
@@ -4689,6 +4670,7 @@ void K_drawKartHUD(void)
|
|||||||
{
|
{
|
||||||
if (LUA_HudEnabled(hud_battlefullscreen))
|
if (LUA_HudEnabled(hud_battlefullscreen))
|
||||||
K_drawBattleFullscreen();
|
K_drawBattleFullscreen();
|
||||||
|
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -35,6 +35,7 @@ extern consvar_t cv_darkitembox;
|
|||||||
extern consvar_t cv_biglaps;
|
extern consvar_t cv_biglaps;
|
||||||
extern consvar_t cv_highresportrait;
|
extern consvar_t cv_highresportrait;
|
||||||
extern consvar_t cv_showstats;
|
extern consvar_t cv_showstats;
|
||||||
|
extern consvar_t cv_showstats_skinname;
|
||||||
extern consvar_t cv_fancyroulette;
|
extern consvar_t cv_fancyroulette;
|
||||||
extern consvar_t cv_showlaptimes;
|
extern consvar_t cv_showlaptimes;
|
||||||
extern consvar_t cv_battlespeedo;
|
extern consvar_t cv_battlespeedo;
|
||||||
|
|||||||
+108
-62
@@ -47,6 +47,8 @@ consvar_t cv_airsparks = {"airdriftsparks", "Off", CV_SAVE, CV_OnOff, NULL, 0, N
|
|||||||
|
|
||||||
consvar_t cv_playerblendeffects = {"playerblendeffects", "Off", CV_SAVE, CV_OnOff, NULL, 0, NULL, NULL, 0, 0, NULL};
|
consvar_t cv_playerblendeffects = {"playerblendeffects", "Off", CV_SAVE, CV_OnOff, NULL, 0, NULL, NULL, 0, 0, NULL};
|
||||||
|
|
||||||
|
consvar_t cv_reducevfx = {"reducevfx", "Off", CV_SAVE, CV_OnOff, NULL, 0, NULL, NULL, 0, 0, NULL};
|
||||||
|
|
||||||
// funn-E streeetch
|
// funn-E streeetch
|
||||||
static CV_PossibleValue_t stretchfactor_t[] = {{0, "MIN"}, {FRACUNIT, "MAX"}, {0, NULL}};
|
static CV_PossibleValue_t stretchfactor_t[] = {{0, "MIN"}, {FRACUNIT, "MAX"}, {0, NULL}};
|
||||||
consvar_t cv_gravstretch = {"gravstretch", "MIN", CV_SAVE|CV_FLOAT, stretchfactor_t, NULL, 0, NULL, NULL, 0, 0, NULL};
|
consvar_t cv_gravstretch = {"gravstretch", "MIN", CV_SAVE|CV_FLOAT, stretchfactor_t, NULL, 0, NULL, NULL, 0, 0, NULL};
|
||||||
@@ -482,7 +484,8 @@ UINT8 colortranslations[MAXTRANSLATIONS][16] = {
|
|||||||
//
|
//
|
||||||
UINT8 K_RainbowColor(void)
|
UINT8 K_RainbowColor(void)
|
||||||
{
|
{
|
||||||
return (UINT8)(1 + (leveltime % (MAXSKINCOLORS-1)));
|
const tic_t time = cv_reducevfx.value ? (leveltime >> 3) : leveltime;
|
||||||
|
return (UINT8)(1 + (time % (MAXSKINCOLORS-1)));
|
||||||
}
|
}
|
||||||
|
|
||||||
// Define for getting accurate color brightness readings according to how the human eye sees them.
|
// Define for getting accurate color brightness readings according to how the human eye sees them.
|
||||||
@@ -657,13 +660,22 @@ INT32 K_GetSkinNum(player_t *player)
|
|||||||
|
|
||||||
//
|
//
|
||||||
// returns the mobj skinnumber
|
// returns the mobj skinnumber
|
||||||
// accounts for localskins
|
// accounts for localskins ?
|
||||||
//
|
//
|
||||||
INT32 K_GetMobjSkinNum(const skin_t *skin, boolean local)
|
INT32 K_GetMobjSkinNum(const skin_t *skin, boolean local)
|
||||||
{
|
{
|
||||||
return skin - K_GetSkinArray(local);
|
return skin - K_GetSkinArray(local);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
//
|
||||||
|
// returns the mobj skinnumber
|
||||||
|
// accounts for localskins
|
||||||
|
//
|
||||||
|
INT32 K_GetMobjLocalSkinNum(const skin_t *skin, const skin_t *localskin, boolean local)
|
||||||
|
{
|
||||||
|
return localskin ? (localskin - K_GetSkinArray(local)) : (skin - skins);
|
||||||
|
}
|
||||||
|
|
||||||
//
|
//
|
||||||
// returns the players skinnumber
|
// returns the players skinnumber
|
||||||
// accounts for localskins
|
// accounts for localskins
|
||||||
@@ -764,6 +776,8 @@ void K_RegisterClientKartStuff(void)
|
|||||||
|
|
||||||
CV_RegisterVar(&cv_playerblendeffects);
|
CV_RegisterVar(&cv_playerblendeffects);
|
||||||
|
|
||||||
|
CV_RegisterVar(&cv_reducevfx);
|
||||||
|
|
||||||
CV_RegisterVar(&cv_saltyhop);
|
CV_RegisterVar(&cv_saltyhop);
|
||||||
CV_RegisterVar(&cv_saltyhopsfx);
|
CV_RegisterVar(&cv_saltyhopsfx);
|
||||||
CV_RegisterVar(&cv_saltysquish);
|
CV_RegisterVar(&cv_saltysquish);
|
||||||
@@ -1475,7 +1489,6 @@ void K_KartBouncing(mobj_t *mobj1, mobj_t *mobj2, boolean bounce, boolean solid)
|
|||||||
fixed_t nx = FixedDiv(distx, dist);
|
fixed_t nx = FixedDiv(distx, dist);
|
||||||
fixed_t ny = FixedDiv(disty, dist);
|
fixed_t ny = FixedDiv(disty, dist);
|
||||||
|
|
||||||
dist = dist ? dist : 1;
|
|
||||||
distx = FixedMul(mobj1->radius+mobj2->radius, nx);
|
distx = FixedMul(mobj1->radius+mobj2->radius, nx);
|
||||||
disty = FixedMul(mobj1->radius+mobj2->radius, ny);
|
disty = FixedMul(mobj1->radius+mobj2->radius, ny);
|
||||||
|
|
||||||
@@ -1587,57 +1600,78 @@ static UINT8 K_CheckOffroadCollide(mobj_t *mo)
|
|||||||
sector_t *s2; // FOF sector shortcut
|
sector_t *s2; // FOF sector shortcut
|
||||||
ffloor_t *rover; // FOF
|
ffloor_t *rover; // FOF
|
||||||
|
|
||||||
fixed_t flr;
|
fixed_t flr, cel; // floor & ceiling for height checks to make sure we're touching the offroad sector.
|
||||||
fixed_t cel; // floor & ceiling for height checks to make sure we're touching the offroad sector.
|
INT32 special;
|
||||||
|
|
||||||
I_Assert(mo != NULL);
|
|
||||||
I_Assert(!P_MobjWasRemoved(mo));
|
I_Assert(!P_MobjWasRemoved(mo));
|
||||||
|
|
||||||
for (node = mo->touching_sectorlist; node; node = node->m_sectorlist_next)
|
for (node = mo->touching_sectorlist; node; node = node->m_sectorlist_next)
|
||||||
{
|
{
|
||||||
if (!node->m_sector)
|
if (!node->m_sector)
|
||||||
break; // shouldn't happen.
|
break; // shouldn't happen.
|
||||||
|
|
||||||
s = node->m_sector;
|
s = node->m_sector;
|
||||||
|
|
||||||
// 1: Check for the main sector, make sure we're on the floor of that sector and see if we can apply offroad.
|
// 1: Check for the main sector, make sure we're on the floor of that sector and see if we can apply offroad.
|
||||||
// Make arbitrary Z checks because we want to check for 1 sector in particular, we don't want to affect the player if the offroad sector is way below them and they're lineriding a normal sector above.
|
// Make arbitrary Z checks because we want to check for 1 sector in particular, we don't want to affect the player if the offroad sector is way below them and they're lineriding a normal sector above.
|
||||||
|
|
||||||
flr = P_MobjFloorZ(mo, s, s, mo->x, mo->y, NULL, false, true);
|
special = GETSECSPECIAL(s->special, 1);
|
||||||
cel = P_MobjCeilingZ(mo, s, s, mo->x, mo->y, NULL, true, true); // get Z coords of both floors and ceilings for this sector (this accounts for slopes properly.)
|
for (i = 2; i < 5; i++) // check for sector special
|
||||||
// NOTE: we don't use P_GetZAt with our x/y directly because the mobj won't have the same height because of its hitbox on the slope. Complex garbage but tldr it doesn't work.
|
{
|
||||||
|
if (special != i)
|
||||||
|
continue;
|
||||||
|
|
||||||
if ( ((s->flags & SF_FLIPSPECIAL_FLOOR) && mo->z == flr) // floor check
|
if (s->flags & SF_FLIPSPECIAL_FLOOR)
|
||||||
|| ((mo->eflags & MFE_VERTICALFLIP && (s->flags & SF_FLIPSPECIAL_CEILING) && (mo->z + mo->height) == cel)) ) // ceiling check.
|
{
|
||||||
|
flr = P_MobjFloorZ(mo, s, s, mo->x, mo->y, NULL, false, true);
|
||||||
|
if (mo->z == flr) // floor check
|
||||||
|
return i-1; // return offroad type
|
||||||
|
}
|
||||||
|
|
||||||
for (i = 2; i < 5; i++) // check for sector special
|
if (mo->eflags & MFE_VERTICALFLIP && (s->flags & SF_FLIPSPECIAL_CEILING))
|
||||||
|
{
|
||||||
if (GETSECSPECIAL(s->special, 1) == i)
|
cel = P_MobjCeilingZ(mo, s, s, mo->x, mo->y, NULL, true, true);
|
||||||
return i-1; // return offroad type
|
// NOTE: we don't use P_GetZAt with our x/y directly because the mobj won't have the same height because of its hitbox on the slope. Complex garbage but tldr it doesn't work.
|
||||||
|
if ((mo->z + mo->height) == cel) // ceiling check
|
||||||
|
return i-1; // return offroad type
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
// 2: If we're here, we haven't found anything. So let's try looking for FOFs in the sectors using the same logic.
|
// 2: If we're here, we haven't found anything. So let's try looking for FOFs in the sectors using the same logic.
|
||||||
for (rover = s->ffloors; rover; rover = rover->next)
|
for (rover = s->ffloors; rover; rover = rover->next)
|
||||||
{
|
{
|
||||||
if (!(rover->flags & FF_EXISTS)) // This FOF doesn't exist anymore.
|
if (!(rover->flags & FF_EXISTS)) // This FOF doesn't exist anymore.
|
||||||
continue;
|
continue;
|
||||||
|
|
||||||
s2 = §ors[rover->secnum]; // makes things easier for us
|
s2 = §ors[rover->secnum]; // makes things easier for us
|
||||||
|
|
||||||
flr = P_GetFOFBottomZ(mo, s, rover, mo->x, mo->y, NULL);
|
special = GETSECSPECIAL(s2->special, 1);
|
||||||
cel = P_GetFOFTopZ(mo, s, rover, mo->x, mo->y, NULL); // Z coords for fof top/bottom.
|
for (i = 2; i < 5; i++) // check for sector special
|
||||||
|
{
|
||||||
|
if (special != i)
|
||||||
|
continue;
|
||||||
|
|
||||||
// we will do essentially the same checks as above instead of bothering with top/bottom height of the FOF.
|
// we will do essentially the same checks as above instead of bothering with top/bottom height of the FOF.
|
||||||
// Reminder that an FOF's floor is its bottom, silly!
|
// Reminder that an FOF's floor is its bottom, silly!
|
||||||
if ( ((s2->flags & SF_FLIPSPECIAL_FLOOR) && mo->z == cel) // "floor" check
|
|
||||||
|| ((s2->flags & SF_FLIPSPECIAL_CEILING) && (mo->z + mo->height) == flr) ) // "ceiling" check.
|
|
||||||
|
|
||||||
for (i = 2; i < 5; i++) // check for sector special
|
if (s2->flags & SF_FLIPSPECIAL_FLOOR)
|
||||||
|
{
|
||||||
if (GETSECSPECIAL(s2->special, 1) == i)
|
cel = P_GetFOFTopZ(mo, s, rover, mo->x, mo->y, NULL); // Z coords for fof top/bottom.
|
||||||
return i-1; // return offroad type
|
if (mo->z == cel) // "floor" check
|
||||||
|
return i-1; // return offroad type
|
||||||
|
}
|
||||||
|
|
||||||
|
if (s2->flags & SF_FLIPSPECIAL_CEILING)
|
||||||
|
{
|
||||||
|
flr = P_GetFOFBottomZ(mo, s, rover, mo->x, mo->y, NULL);
|
||||||
|
if ((mo->z + mo->height) == flr) // "ceiling" check
|
||||||
|
return i-1; // return offroad type
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
return 0; // couldn't find any offroad
|
|
||||||
|
return 0; // couldn't find any offroad
|
||||||
}
|
}
|
||||||
|
|
||||||
/** \brief Updates the Player's offroad value once per frame
|
/** \brief Updates the Player's offroad value once per frame
|
||||||
@@ -1708,7 +1742,6 @@ static void K_SpawnDashDustRelease(player_t *player)
|
|||||||
INT32 i;
|
INT32 i;
|
||||||
|
|
||||||
I_Assert(player != NULL);
|
I_Assert(player != NULL);
|
||||||
I_Assert(player->mo != NULL);
|
|
||||||
I_Assert(!P_MobjWasRemoved(player->mo));
|
I_Assert(!P_MobjWasRemoved(player->mo));
|
||||||
|
|
||||||
if (!player->speed && !player->kartstuff[k_startboost])
|
if (!player->speed && !player->kartstuff[k_startboost])
|
||||||
@@ -1746,7 +1779,6 @@ static void K_SpawnBrakeDriftSparks(player_t *player) // Be sure to update the m
|
|||||||
mobj_t *sparks;
|
mobj_t *sparks;
|
||||||
|
|
||||||
I_Assert(player != NULL);
|
I_Assert(player != NULL);
|
||||||
I_Assert(player->mo != NULL);
|
|
||||||
I_Assert(!P_MobjWasRemoved(player->mo));
|
I_Assert(!P_MobjWasRemoved(player->mo));
|
||||||
|
|
||||||
// Position & etc are handled in its thinker, and its spawned invisible.
|
// Position & etc are handled in its thinker, and its spawned invisible.
|
||||||
@@ -1942,11 +1974,9 @@ static void K_PlayGenericCombatSound(mobj_t *source, mobj_t *other, sfxenum_t sf
|
|||||||
if (!skin)
|
if (!skin)
|
||||||
return;
|
return;
|
||||||
|
|
||||||
boolean alwaysHear = false;
|
|
||||||
|
|
||||||
if (cv_kartvoices.value && !P_MobjWasRemoved(other) && other->player != NULL)
|
if (cv_kartvoices.value && !P_MobjWasRemoved(other) && other->player != NULL)
|
||||||
{
|
{
|
||||||
alwaysHear = P_IsDisplayPlayer(other->player);
|
boolean alwaysHear = P_IsDisplayPlayer(other->player);
|
||||||
S_StartSound(alwaysHear ? NULL : source, skin->soundsid[S_sfx[sfx_id].skinsound]);
|
S_StartSound(alwaysHear ? NULL : source, skin->soundsid[S_sfx[sfx_id].skinsound]);
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -2146,7 +2176,13 @@ static void K_GetKartBoostPower(player_t *player)
|
|||||||
&& player->speed > 0
|
&& player->speed > 0
|
||||||
&& !player->spectator)
|
&& !player->spectator)
|
||||||
{
|
{
|
||||||
K_SpawnWipeoutTrail(player->mo, true);
|
mobj_t *dust = K_SpawnWipeoutTrail(player->mo, true);
|
||||||
|
|
||||||
|
// Technically, all mobjs that think can cause desynchs if they are spawned conditionally, so best we can do
|
||||||
|
// is to hide them if you are in saltyhop jump
|
||||||
|
if (dust && player->mo->salty.jump)
|
||||||
|
dust->flags2 |= MF2_DONTDRAW;
|
||||||
|
|
||||||
if (leveltime % 6 == 0)
|
if (leveltime % 6 == 0)
|
||||||
S_StartSound(player->mo, sfx_cdfm70);
|
S_StartSound(player->mo, sfx_cdfm70);
|
||||||
}
|
}
|
||||||
@@ -2300,10 +2336,13 @@ fixed_t K_3dKartMovement(player_t *player, boolean onground, fixed_t forwardmove
|
|||||||
finalspeed *= forwardmove/25;
|
finalspeed *= forwardmove/25;
|
||||||
finalspeed /= 2;
|
finalspeed /= 2;
|
||||||
|
|
||||||
if (forwardmove < 0 && finalspeed > mapobjectscale*2)
|
if (forwardmove < 0)
|
||||||
return finalspeed/2;
|
{
|
||||||
else if (forwardmove < 0)
|
if (finalspeed > mapobjectscale*2)
|
||||||
|
return finalspeed/2;
|
||||||
|
|
||||||
return -mapobjectscale/2;
|
return -mapobjectscale/2;
|
||||||
|
}
|
||||||
|
|
||||||
if (finalspeed < 0)
|
if (finalspeed < 0)
|
||||||
finalspeed = 0;
|
finalspeed = 0;
|
||||||
@@ -2353,6 +2392,7 @@ void K_SpawnBattlePoints(player_t *source, player_t *victim, UINT8 amount)
|
|||||||
break;
|
break;
|
||||||
case 3:
|
case 3:
|
||||||
st = S_BATTLEPOINT3A;
|
st = S_BATTLEPOINT3A;
|
||||||
|
break;
|
||||||
default:
|
default:
|
||||||
return; // NO STATE!
|
return; // NO STATE!
|
||||||
}
|
}
|
||||||
@@ -3103,17 +3143,18 @@ static mobj_t *K_SpawnKartMissile(mobj_t *source, mobjtype_t type, angle_t an, I
|
|||||||
return NULL;
|
return NULL;
|
||||||
}
|
}
|
||||||
|
|
||||||
static UINT16 K_DriftSparkColor(player_t *player, INT32 charge)
|
static UINT8 K_DriftSparkColor(player_t *player, INT32 charge)
|
||||||
{
|
{
|
||||||
UINT16 color = SKINCOLOR_NONE;
|
UINT8 color = SKINCOLOR_NONE;
|
||||||
|
const INT32 sparkval = K_GetKartDriftSparkValue(player);
|
||||||
|
|
||||||
if (charge >= K_GetKartDriftSparkValue(player)*4)
|
if (charge >= sparkval*4)
|
||||||
{
|
{
|
||||||
color = K_RainbowColor();
|
color = K_RainbowColor();
|
||||||
}
|
}
|
||||||
else if (charge >= K_GetKartDriftSparkValue(player)*2)
|
else if (charge >= sparkval*2)
|
||||||
{
|
{
|
||||||
if (charge <= (K_GetKartDriftSparkValue(player)*2)+(24*3))
|
if (charge <= (sparkval*2)+(24*3))
|
||||||
color = SKINCOLOR_RASPBERRY; // transition
|
color = SKINCOLOR_RASPBERRY; // transition
|
||||||
else
|
else
|
||||||
color = SKINCOLOR_KETCHUP;
|
color = SKINCOLOR_KETCHUP;
|
||||||
@@ -3137,7 +3178,6 @@ static void K_SpawnDriftSparks(player_t *player)
|
|||||||
INT32 i;
|
INT32 i;
|
||||||
|
|
||||||
I_Assert(player != NULL);
|
I_Assert(player != NULL);
|
||||||
I_Assert(player->mo != NULL);
|
|
||||||
I_Assert(!P_MobjWasRemoved(player->mo));
|
I_Assert(!P_MobjWasRemoved(player->mo));
|
||||||
|
|
||||||
if (leveltime % 2 == 1)
|
if (leveltime % 2 == 1)
|
||||||
@@ -3401,7 +3441,7 @@ static void K_QuiteSaltyHop(player_t *player)
|
|||||||
pmo->spritexscale -= (FRACUNIT/8);
|
pmo->spritexscale -= (FRACUNIT/8);
|
||||||
}
|
}
|
||||||
|
|
||||||
pmo->spriteyoffset = FixedMul(psalt->zoffset, cv_saltyheight.value);
|
pmo->spriteyoffset += FixedMul(psalt->zoffset, cv_saltyheight.value);
|
||||||
|
|
||||||
if (cv_saltyhopsfx.value)
|
if (cv_saltyhopsfx.value)
|
||||||
{
|
{
|
||||||
@@ -3509,7 +3549,6 @@ void K_SpawnBoostTrail(player_t *player)
|
|||||||
INT32 i;
|
INT32 i;
|
||||||
|
|
||||||
I_Assert(player != NULL);
|
I_Assert(player != NULL);
|
||||||
I_Assert(player->mo != NULL);
|
|
||||||
I_Assert(!P_MobjWasRemoved(player->mo));
|
I_Assert(!P_MobjWasRemoved(player->mo));
|
||||||
|
|
||||||
if (!P_IsObjectOnGround(player->mo)
|
if (!P_IsObjectOnGround(player->mo)
|
||||||
@@ -3591,9 +3630,10 @@ void K_SpawnSparkleTrail(mobj_t *mo)
|
|||||||
mobj_t *sparkle;
|
mobj_t *sparkle;
|
||||||
INT32 i;
|
INT32 i;
|
||||||
|
|
||||||
I_Assert(mo != NULL);
|
|
||||||
I_Assert(!P_MobjWasRemoved(mo));
|
I_Assert(!P_MobjWasRemoved(mo));
|
||||||
|
|
||||||
|
const boolean shouldblend = (mo->player && K_PlayerEffectsShouldBlend(mo->player));
|
||||||
|
|
||||||
for (i = 0; i < 3; i++)
|
for (i = 0; i < 3; i++)
|
||||||
{
|
{
|
||||||
fixed_t newx = mo->x + mo->momx + (P_RandomRange(-rad, rad)<<FRACBITS);
|
fixed_t newx = mo->x + mo->momx + (P_RandomRange(-rad, rad)<<FRACBITS);
|
||||||
@@ -3611,19 +3651,18 @@ void K_SpawnSparkleTrail(mobj_t *mo)
|
|||||||
|
|
||||||
sparkle->color = mo->color;
|
sparkle->color = mo->color;
|
||||||
|
|
||||||
if (mo->player && K_PlayerEffectsShouldBlend(mo->player))
|
if (shouldblend)
|
||||||
sparkle->blendmode = AST_ADD;
|
sparkle->blendmode = AST_ADD;
|
||||||
}
|
}
|
||||||
|
|
||||||
P_SetMobjState(sparkle, S_KARTINVULN_LARGE1);
|
P_SetMobjState(sparkle, S_KARTINVULN_LARGE1);
|
||||||
}
|
}
|
||||||
|
|
||||||
void K_SpawnWipeoutTrail(mobj_t *mo, boolean translucent)
|
mobj_t *K_SpawnWipeoutTrail(mobj_t *mo, boolean translucent)
|
||||||
{
|
{
|
||||||
mobj_t *dust;
|
mobj_t *dust;
|
||||||
angle_t aoff;
|
angle_t aoff;
|
||||||
|
|
||||||
I_Assert(mo != NULL);
|
|
||||||
I_Assert(!P_MobjWasRemoved(mo));
|
I_Assert(!P_MobjWasRemoved(mo));
|
||||||
|
|
||||||
if (mo->player)
|
if (mo->player)
|
||||||
@@ -3655,10 +3694,10 @@ void K_SpawnWipeoutTrail(mobj_t *mo, boolean translucent)
|
|||||||
dust->momx = mo->momx/2;
|
dust->momx = mo->momx/2;
|
||||||
dust->momy = mo->momy/2;
|
dust->momy = mo->momy/2;
|
||||||
dust->momz = mo->momz/2;
|
dust->momz = mo->momz/2;
|
||||||
|
dust->flags2 |= MF2_SHADOW;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (translucent)
|
return dust;
|
||||||
dust->flags2 |= MF2_SHADOW;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
// K_DriftDustHandling
|
// K_DriftDustHandling
|
||||||
@@ -3672,7 +3711,7 @@ void K_DriftDustHandling(mobj_t *spawner)
|
|||||||
{
|
{
|
||||||
angle_t anglediff;
|
angle_t anglediff;
|
||||||
|
|
||||||
if (!P_IsObjectOnGround(spawner) || leveltime % 2 != 0)
|
if (leveltime % 2 != 0 || !P_IsObjectOnGround(spawner))
|
||||||
return;
|
return;
|
||||||
|
|
||||||
if (spawner->player)
|
if (spawner->player)
|
||||||
@@ -4055,7 +4094,7 @@ static void K_DoThunderShield(player_t *player)
|
|||||||
mo->scale = player->mo->scale*3 + (player->mo->scale/2);
|
mo->scale = player->mo->scale*3 + (player->mo->scale/2);
|
||||||
|
|
||||||
// spawn horizontal bolts;
|
// spawn horizontal bolts;
|
||||||
for (i=0; i<7; i++)
|
for (i = 0; i < 7; i++)
|
||||||
{
|
{
|
||||||
mo = P_SpawnMobj(player->mo->x, player->mo->y, player->mo->z, MT_THOK);
|
mo = P_SpawnMobj(player->mo->x, player->mo->y, player->mo->z, MT_THOK);
|
||||||
mo->angle = P_RandomRange(0, 359)*ANG1;
|
mo->angle = P_RandomRange(0, 359)*ANG1;
|
||||||
@@ -4066,7 +4105,7 @@ static void K_DoThunderShield(player_t *player)
|
|||||||
|
|
||||||
// spawn the radius thing:
|
// spawn the radius thing:
|
||||||
an = ANGLE_22h;
|
an = ANGLE_22h;
|
||||||
for (i=0; i<15; i++)
|
for (i = 0; i < 15; i++)
|
||||||
{
|
{
|
||||||
sx = player->mo->x + FixedMul((player->mo->scale*THUNDERRADIUS), FINECOSINE((an*i)>>ANGLETOFINESHIFT));
|
sx = player->mo->x + FixedMul((player->mo->scale*THUNDERRADIUS), FINECOSINE((an*i)>>ANGLETOFINESHIFT));
|
||||||
sy = player->mo->y + FixedMul((player->mo->scale*THUNDERRADIUS), FINESINE((an*i)>>ANGLETOFINESHIFT));
|
sy = player->mo->y + FixedMul((player->mo->scale*THUNDERRADIUS), FINESINE((an*i)>>ANGLETOFINESHIFT));
|
||||||
@@ -4158,12 +4197,12 @@ static void K_DoHyudoroSteal(player_t *player)
|
|||||||
|
|
||||||
void K_DoSneaker(player_t *player, INT32 type)
|
void K_DoSneaker(player_t *player, INT32 type)
|
||||||
{
|
{
|
||||||
const fixed_t intendedboost = K_GetSneakerBoostSpeed();
|
|
||||||
|
|
||||||
if (!player->kartstuff[k_floorboost] || player->kartstuff[k_floorboost] == 3)
|
if (!player->kartstuff[k_floorboost] || player->kartstuff[k_floorboost] == 3)
|
||||||
{
|
{
|
||||||
S_StartSound(player->mo, sfx_cdfm01);
|
S_StartSound(player->mo, sfx_cdfm01);
|
||||||
K_SpawnDashDustRelease(player);
|
K_SpawnDashDustRelease(player);
|
||||||
|
|
||||||
|
const fixed_t intendedboost = K_GetSneakerBoostSpeed();
|
||||||
if (intendedboost > player->kartstuff[k_speedboost])
|
if (intendedboost > player->kartstuff[k_speedboost])
|
||||||
player->kartstuff[k_destboostcam] = FixedMul(FRACUNIT, FixedDiv((intendedboost - player->kartstuff[k_speedboost]), intendedboost));
|
player->kartstuff[k_destboostcam] = FixedMul(FRACUNIT, FixedDiv((intendedboost - player->kartstuff[k_speedboost]), intendedboost));
|
||||||
}
|
}
|
||||||
@@ -4633,8 +4672,7 @@ void K_RepairOrbitChain(mobj_t *orbit)
|
|||||||
prev->movedir = num;
|
prev->movedir = num;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (player->kartstuff[k_itemamount] != num)
|
player->kartstuff[k_itemamount] = num;
|
||||||
player->kartstuff[k_itemamount] = num;
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -6159,6 +6197,13 @@ void K_KartUpdatePosition(player_t *player)
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// the player should NOT be checked against themselves! lol
|
||||||
|
// otherwise prevcheck will effectively be halved
|
||||||
|
// sadly this stuff is exposed to lua and atleast one script uses those so we cant fix it
|
||||||
|
// oh well
|
||||||
|
//if (player == &players[i])
|
||||||
|
//continue;
|
||||||
|
|
||||||
const boolean isprevcheckpointi = mo->health == players[i].starpostnum;
|
const boolean isprevcheckpointi = mo->health == players[i].starpostnum;
|
||||||
const boolean isnextcheckpointi = mo->health == (players[i].starpostnum + 1);
|
const boolean isnextcheckpointi = mo->health == (players[i].starpostnum + 1);
|
||||||
|
|
||||||
@@ -6173,7 +6218,8 @@ void K_KartUpdatePosition(player_t *player)
|
|||||||
players[i].kartstuff[k_prevcheck] += imo;
|
players[i].kartstuff[k_prevcheck] += imo;
|
||||||
ipcd++;
|
ipcd++;
|
||||||
}
|
}
|
||||||
if (isnextcheckpointi )
|
|
||||||
|
if (isnextcheckpointi)
|
||||||
{
|
{
|
||||||
players[i].kartstuff[k_nextcheck] += imo;
|
players[i].kartstuff[k_nextcheck] += imo;
|
||||||
incd++;
|
incd++;
|
||||||
@@ -6765,7 +6811,7 @@ void K_MoveKartPlayer(player_t *player, boolean onground)
|
|||||||
{
|
{
|
||||||
if (splitscreen)
|
if (splitscreen)
|
||||||
{
|
{
|
||||||
if (leveltime & 1)
|
if (!cv_reducevfx.value && leveltime & 1)
|
||||||
player->mo->flags2 |= MF2_DONTDRAW;
|
player->mo->flags2 |= MF2_DONTDRAW;
|
||||||
else
|
else
|
||||||
player->mo->flags2 &= ~MF2_DONTDRAW;
|
player->mo->flags2 &= ~MF2_DONTDRAW;
|
||||||
@@ -6791,7 +6837,7 @@ void K_MoveKartPlayer(player_t *player, boolean onground)
|
|||||||
if (P_IsDisplayPlayer(player)
|
if (P_IsDisplayPlayer(player)
|
||||||
|| (!P_IsDisplayPlayer(player) && (player->kartstuff[k_hyudorotimer] < (1*TICRATE/2) || player->kartstuff[k_hyudorotimer] > hyudorotime-(1*TICRATE/2))))
|
|| (!P_IsDisplayPlayer(player) && (player->kartstuff[k_hyudorotimer] < (1*TICRATE/2) || player->kartstuff[k_hyudorotimer] > hyudorotime-(1*TICRATE/2))))
|
||||||
{
|
{
|
||||||
if (leveltime & 1)
|
if (!cv_reducevfx.value && leveltime & 1)
|
||||||
player->mo->flags2 |= MF2_DONTDRAW;
|
player->mo->flags2 |= MF2_DONTDRAW;
|
||||||
else
|
else
|
||||||
player->mo->flags2 &= ~MF2_DONTDRAW;
|
player->mo->flags2 &= ~MF2_DONTDRAW;
|
||||||
|
|||||||
+1
-1
@@ -57,7 +57,7 @@ boolean K_ShouldSlopeRoll(mobj_t *mobj);
|
|||||||
void K_RollMobjBySlopes(mobj_t *mo, pslope_t *slope);
|
void K_RollMobjBySlopes(mobj_t *mo, pslope_t *slope);
|
||||||
void K_SpawnBoostTrail(player_t *player);
|
void K_SpawnBoostTrail(player_t *player);
|
||||||
void K_SpawnSparkleTrail(mobj_t *mo);
|
void K_SpawnSparkleTrail(mobj_t *mo);
|
||||||
void K_SpawnWipeoutTrail(mobj_t *mo, boolean translucent);
|
mobj_t *K_SpawnWipeoutTrail(mobj_t *mo, boolean translucent);
|
||||||
void K_DriftDustHandling(mobj_t *spawner);
|
void K_DriftDustHandling(mobj_t *spawner);
|
||||||
void K_PuntMine(mobj_t *mine, mobj_t *punter);
|
void K_PuntMine(mobj_t *mine, mobj_t *punter);
|
||||||
void K_DoSneaker(player_t *player, INT32 type);
|
void K_DoSneaker(player_t *player, INT32 type);
|
||||||
|
|||||||
Loaded 100 of 187 files, more files were not shown because too many files have changed in this diff.
Show more
Reference in new issue
Block a user